Release 0.40.0-rc.2

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

.coderabbit.yaml

@@ -1,20 +0,0 @@
-# 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]"
-  path_instructions:
-    - path: "**"
-      instructions: |
-        Project rule: don't change anyone's existing defaults unless the change is purely additive and belongs in the application.
-        Flag any change to something a user already relies on: a default setting or preference value, what a command or tool does when used the usual way, the UI's default layout or behaviour, a keyboard or mouse shortcut, or the result an existing saved design rebuilds to.
-        Don't flag purely additive changes: a new command, a new setting whose default keeps today's behaviour, or a new option that appears only when someone chooses it. Don't flag bug fixes that only turn a crash or an error into the result the feature always promised.
-        When you flag one, start the comment with "Changes a default:", say what a user sees before and after, whether a setting keeps the old behaviour, and whether the PR description's `Changes a default:` line says so.
-  pre_merge_checks:
-    custom_checks:
-      - name: "Existing defaults unchanged"
-        mode: "warning"
-        instructions: |
-          Pass if the pull request changes no default a user already relies on (default setting or preference values, what a command or tool does when used the usual way, the UI's default layout or behaviour, shortcuts, or the result an existing saved design rebuilds to), or if its changes are purely additive.
-          Fail otherwise, naming each changed default and what a user sees before and after. Also fail if the description says `Changes a default: no` while the code changes one.

ATTRIBUTION.md

@@ -784,9 +784,6 @@ Original SolidCraft drawings, Open for owner review; no runtime assignments.
 | `assets/locales/pending/sketch-offset-instances.json` | SolidCraft contributors | Original offset instance-count label and translations | MIT OR Apache-2.0 |
 | assets/icons/ui/design/svg/flat/settings_profile.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original analytic head and shoulder geometry for settings profiles | MIT OR Apache-2.0 |
 | tests/kernel-cases/import/4561-convert-box-mesh-with-a-zero-area-triangle/box-degenerate.stl | SolidCraft contributors | synthetic ASCII STL written by hand: a box with one zero-area triangle, for the kernel regression case of tangency-labs/solidcraft#4561 | MIT OR Apache-2.0 |
-| assets/locales/pending/theme-blur-ui.json | SolidCraft contributors | Original blur controls, notices and translations | MIT OR Apache-2.0 |
-| crates/ui-egui/tests/fixtures/theme-blur.json | SolidCraft contributors | Original theme for blur option scenarios and manager review | MIT OR Apache-2.0 |
-| assets/locales/ka.json | David Machakhelidze (devius) | Original Georgian translation of SolidCraft's English catalog, written with Claude Code from the meaning of each English string; terminology and doubtful strings decided by a native Georgian speaker; no commercial CAD text used | MIT OR Apache-2.0 |
 
 ## Code adapted from sibling projects
 

Cargo.lock

@@ -4102,7 +4102,6 @@ dependencies = [
  "ureq",
  "windows-sys 0.61.2",
  "winit",
- "winreg",
  "x11rb",
  "zbus 5.19.0",
 ]

apps/solidcraft-web/src/main.rs

@@ -171,7 +171,6 @@ mod web {
 
     use solidcraft_engine::Session;
     use solidcraft_engine::io::vfs;
-    use solidcraft_ui_egui::ui_kit::BackingTooltipExt as _;
     use solidcraft_ui_egui::{Services, SolveApp, ui_kit};
     use wasm_bindgen::JsCast as _;
 
@@ -501,7 +500,7 @@ mod web {
                             files::pick_from_disk(&self.files, Intent::Open);
                         }
                         if ui_kit::button(ui, "Insert from computer…", ui_kit::Button::Normal)
-                            .backing_on_hover_text(solidcraft_ui_egui::i18n::tr("web.files.insert_drawings_hint"))
+                            .on_hover_text(solidcraft_ui_egui::i18n::tr("web.files.insert_drawings_hint"))
                             .clicked()
                         {
                             files::pick_from_disk(&self.files, Intent::Insert);
@@ -555,7 +554,7 @@ mod web {
                                         let design = solidcraft_engine::io::is_design_path(&e.name);
                                         if !design
                                             && ui_kit::button(ui, "Insert", ui_kit::Button::Small)
-                                                .backing_on_hover_text(solidcraft_ui_egui::i18n::tr("web.files.insert_stored_drawings_hint"))
+                                                .on_hover_text(solidcraft_ui_egui::i18n::tr("web.files.insert_stored_drawings_hint"))
                                                 .clicked()
                                         {
                                             act = Some(("insert", e.name.clone()));
@@ -565,7 +564,7 @@ mod web {
                                             self.rename_focus = true;
                                         }
                                         if ui_kit::button(ui, "Save to computer…", ui_kit::Button::Small)
-                                            .backing_on_hover_text("A copy in a file you choose; the stored design stays here")
+                                            .on_hover_text("A copy in a file you choose; the stored design stays here")
                                             .clicked()
                                         {
                                             act = Some(("save_copy", e.name.clone()));

apps/solidcraft/Cargo.toml

@@ -81,7 +81,6 @@ windows-sys = { version = "0.61", features = [
     "Win32_UI_HiDpi",
     "Win32_UI_WindowsAndMessaging",
 ] }
-winreg = "0.56"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 muda = { version = "0.21.2", default-features = false }
@@ -93,7 +92,7 @@ hidapi = { version = "2.6.7", default-features = false, features = ["macos-share
 # Files opened from Finder and the Dock (src/open_documents.rs), and the fullscreen title-bar
 # inset (src/main.rs); all already come with eframe and rfd.
 objc2 = "0.6"
-objc2-app-kit = { version = "0.3", default-features = false, features = ["std", "NSAccessibility", "NSApplication", "NSResponder", "NSWindow", "NSWorkspace"] }
+objc2-app-kit = { version = "0.3", default-features = false, features = ["std", "NSApplication", "NSResponder", "NSWindow"] }
 objc2-foundation = { version = "0.3", default-features = false, features = ["std", "block2", "NSArray", "NSNotification", "NSOperation", "NSProcessInfo", "NSString", "NSURL"] }
 block2 = "0.6"
 # Native crash capture (src/native_crash_macos.rs): the signal handler, the faulting module

apps/solidcraft/src/desktop_transparency.rs

@@ -1,63 +0,0 @@
-//! Cached accessibility signal, observed only while a theme offers blur. No UI-thread IO.
-use std::sync::{
-    Arc,
-    atomic::{AtomicBool, AtomicU8, Ordering},
-};
-
-#[derive(Default)]
-struct Reading {
-    needed: AtomicBool,
-    started: AtomicBool,
-    value: AtomicU8,
-}
-
-pub fn cached(ctx: &egui::Context) -> Box<dyn Fn(bool) -> Option<bool>> {
-    let state = Arc::new(Reading::default());
-    let ctx = ctx.clone();
-    Box::new(move |needed| {
-        state.needed.store(needed, Ordering::Relaxed);
-        if needed && !state.started.swap(true, Ordering::Relaxed) {
-            let weak = Arc::downgrade(&state);
-            let ctx = ctx.clone();
-            if let Err(error) = std::thread::Builder::new().name("desktop-transparency".into()).spawn(move || {
-                while let Some(state) = weak.upgrade() {
-                    if state.needed.load(Ordering::Relaxed) {
-                        let code = match read() {
-                            Some(true) => 1,
-                            Some(false) => 2,
-                            None => 0,
-                        };
-                        if state.value.swap(code, Ordering::Relaxed) != code {
-                            ctx.request_repaint();
-                        }
-                    }
-                    drop(state);
-                    std::thread::sleep(std::time::Duration::from_secs(5));
-                }
-            }) {
-                log::warn!("desktop transparency: could not observe accessibility setting: {error}");
-            }
-        }
-        match state.value.load(Ordering::Relaxed) {
-            1 => Some(true),
-            2 => Some(false),
-            _ => None,
-        }
-    })
-}
-
-#[cfg(target_os = "windows")]
-fn read() -> Option<bool> {
-    let key =
-        winreg::RegKey::predef(winreg::enums::HKEY_CURRENT_USER).open_subkey(r"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize").ok()?;
-    match key.get_value::<u32, _>("EnableTransparency").ok()? {
-        0 => Some(true),
-        1 => Some(false),
-        _ => None,
-    }
-}
-
-#[cfg(target_os = "macos")]
-fn read() -> Option<bool> {
-    objc2::rc::autoreleasepool(|_| Some(objc2_app_kit::NSWorkspace::sharedWorkspace().accessibilityDisplayShouldReduceTransparency()))
-}

apps/solidcraft/src/device_lost.rs

@@ -76,8 +76,7 @@ fn command(
     reason: &str,
 ) -> std::process::Command {
     let mut command = std::process::Command::new(exe);
-    // The notice of a hang that restarted this launch isn't the next one's (`App::watch_for_a_hang`).
-    command.args(args).env(LOST_ENV, lost_at.to_string()).env_remove(startup::HUNG_ENV);
+    command.args(args).env(LOST_ENV, lost_at.to_string());
     match self::reason(Some(reason)) {
         Some(reason) => command.env(REASON_ENV, reason),
         // Not one inherited from an earlier loss.

apps/solidcraft/src/main.rs

@@ -24,8 +24,6 @@ mod come_forward;
 mod control_server;
 #[cfg(target_os = "linux")]
 mod desktop_theme;
-#[cfg(any(target_os = "windows", target_os = "macos"))]
-mod desktop_transparency;
 mod device_lost;
 #[cfg(target_os = "windows")]
 mod native_crash;
@@ -93,12 +91,6 @@ struct App {
     come_forward: come_forward::ComeForward,
     /// The graphics device: lost, it can't draw again (`App::watch_device`, #4172).
     gpu: Option<LostWatch>,
-    /// The window's backend, and whether it is the software renderer.
-    renderer: Option<(eframe::wgpu::Backend, bool)>,
-    /// A GPU that hangs after the window is up (`App::watch_for_a_hang`).
-    hang: startup::HangWatch,
-    /// The GPU hung: how the next launch starts, once this one has closed.
-    restart: Option<startup::Restart>,
     #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
     space_mouse: space_mouse::SpaceMouse,
     #[cfg(target_os = "macos")]
@@ -219,14 +211,12 @@ impl eframe::App for App {
                     solidcraft_ui_egui::ai_connect::begin(&mut self.solve);
                     solidcraft_ui_egui::agent_chat::begin(&mut self.solve);
                 }
-                startup::first_frame_drawn();
                 if let Some(dir) = self.starting.take() {
                     startup::started(&dir);
                 }
             }
         }
         self.watch_device();
-        self.watch_for_a_hang(ctx);
         // The design on screen is the one whose commands a crash report replays.
         self.solve.session.crash_journal = solidcraft_engine::crash::enabled();
         // The OS closing the window (Alt+F4, Cmd+Q, the window manager): ask about unsaved
@@ -327,22 +317,11 @@ impl Drop for App {
             // The window's GPU surface is still to be dropped, and on a lost device that may
             // never return (#9044).
             device_lost::end();
-        } else if let Some((restart, (backend, _))) = self.restart.zip(self.renderer) {
-            restart_after_hang(restart, backend);
-        } else if self.solve.graphics.restart {
-            // Preferences: to try graphics settings, or to go back from them (#4015). The next
-            // start has begun: this one leaves at once. Tearing down a window's swap chain, device
-            // and pipelines can hang or crash in a graphics driver (#9044), on the very API that
-            // the user is leaving, and a crash here would be taken for one of the new start.
-            relaunch(None);
-            control_server::remove_token_file();
-            device_lost::end();
         }
         // An update asked to restart into the new version or to run its installer.
         if let Some((program, args)) = solidcraft_ui_egui::update::take_launch(&mut self.solve) {
             let mut command = std::process::Command::new(&program);
-            // This launch's notices aren't the new version's.
-            command.args(&args).env_remove(startup::HUNG_ENV);
+            command.args(&args);
             #[cfg(windows)]
             {
                 use std::os::windows::process::CommandExt;
@@ -383,109 +362,6 @@ impl App {
         gpu.reason = reason;
         self.solve.quit_requested = true;
     }
-
-    /// The GPU hung (frames wait out their acquire, or the surface refuses its configuration, while
-    /// the user is there, #3321): close, keeping unsaved changes for recovery as a forced quit
-    /// does (the window, white, can't ask about them), and start again on another renderer once
-    /// closed ([`restart_after_hang`]). Windows only: elsewhere a hidden window's frames can wait
-    /// as long (Wayland, macOS).
-    fn watch_for_a_hang(&mut self, ctx: &egui::Context) {
-        if !cfg!(target_os = "windows") {
-            return;
-        }
-        let (now, input) = ctx.input(|i| {
-            let input = i.events.iter().any(|e| {
-                matches!(
-                    e,
-                    egui::Event::PointerMoved(_) | egui::Event::PointerButton { .. } | egui::Event::Key { .. } | egui::Event::MouseWheel { .. }
-                )
-            });
-            (i.time, input)
-        });
-        let stalled = eframe::egui_wgpu::stalled_frames();
-        let refused = eframe::egui_wgpu::refused_for().map(|d| d.as_secs_f64());
-        if !self.hang.hung(now, input, stalled, refused) {
-            return;
-        }
-        let why = match refused {
-            Some(s) if s > 0.0 => format!("the surface refused its configuration for {s:.0} s"),
-            _ => format!("{stalled} frames in a row waited out their acquire"),
-        };
-        let trial = self.solve.graphics.trial.is_some();
-        let Some(restart) = self.renderer.and_then(|(backend, cpu)| startup::after_hang(backend, cpu, trial)) else {
-            log::error!("graphics: {why}, on the software renderer");
-            return;
-        };
-        log::error!("graphics: {why}; the GPU hung, restarting: {restart:?}");
-        eprintln!("SolidCraft graphics: the GPU stopped responding; restarting ({restart:?})");
-        if let startup::Restart::Backend(backend) = restart {
-            remember_backend(backend);
-        }
-        self.restart = Some(restart);
-        self.solve.quit_requested = true;
-    }
-}
-
-/// Start SolidCraft again after the GPU hung on `hung`: on the backend [`remember_backend`]
-/// saved, or as it was (settings on trial, which the next start drops).
-fn restart_after_hang(restart: startup::Restart, hung: eframe::wgpu::Backend) {
-    match restart {
-        startup::Restart::Backend(_) => relaunch(Some(hung)),
-        startup::Restart::Again => relaunch(None),
-    }
-}
-
-/// Start SolidCraft again once this one has closed, with the same arguments. `hung`: the backend
-/// the GPU hung on, which the new start's notice names; `WGPU_BACKEND` is then not passed on, as
-/// it would win over the backend [`remember_backend`] saved and start the one that hung again. A
-/// start-up retry's backend never is: it would win over the saved or tried settings.
-fn relaunch(hung: Option<eframe::wgpu::Backend>) {
-    let Ok(exe) = std::env::current_exe() else { return };
-    let mut command = std::process::Command::new(exe);
-    // This launch's notices and start-up retry aren't the next one's.
-    command
-        .args(std::env::args_os().skip(1))
-        .env_remove(startup::HUNG_ENV)
-        .env_remove(startup::RETRY_BACKEND_ENV)
-        .env_remove(startup::FALLBACK_NOTE_ENV)
-        .env_remove(device_lost::LOST_ENV);
-    if let Some(hung) = hung {
-        command.env(startup::HUNG_ENV, format!("{hung:?}")).env_remove(startup::WGPU_BACKEND_ENV);
-    }
-    #[cfg(windows)]
-    {
-        use std::os::windows::process::CommandExt;
-        // Not tied to this process: its own process group, no console.
-        command.creation_flags(0x0000_0200 | 0x0000_0008);
-    }
-    if let Err(e) = command.spawn() {
-        log::error!("graphics: starting again: {e}");
-    }
-}
-
-/// Keep `backend` as `graphics.json`'s `backend` (its other settings stay). Written to a new file
-/// that then replaces the old one: this runs as the GPU hangs, when the machine may reset next,
-/// and a half-written file would lose the anti-aliasing setting too.
-fn remember_backend(backend: &str) {
-    let Some(path) = graphics_path() else { return };
-    let mut graphics = graphics().filter(serde_json::Value::is_object).unwrap_or_else(|| serde_json::json!({}));
-    graphics["backend"] = serde_json::json!(backend);
-    if let Err(e) = write_replacing(&path, graphics.to_string().as_bytes()) {
-        log::error!("graphics: keeping the {backend} backend in {}: {e}", path.display());
-    }
-}
-
-/// Write `bytes` to `path` all at once: to a file next to it, flushed to disk, then renamed over it.
-fn write_replacing(path: &std::path::Path, bytes: &[u8]) -> std::io::Result<()> {
-    use std::io::Write;
-    let mut name = path.file_name().unwrap_or_default().to_os_string();
-    name.push(".new");
-    let new = path.with_file_name(name);
-    let mut file = std::fs::File::create(&new)?;
-    file.write_all(bytes)?;
-    file.sync_all()?;
-    drop(file);
-    std::fs::rename(&new, path)
 }
 
 /// Where the next file dialog opens (#7756): the folder of the file last chosen in one, or of the
@@ -663,10 +539,6 @@ fn services(cc: &eframe::CreationContext<'_>, folder: &DialogFolder) -> Services
         desktop_dark: Some(desktop_theme::start(&cc.egui_ctx)),
         #[cfg(not(target_os = "linux"))]
         desktop_dark: None,
-        #[cfg(any(target_os = "windows", target_os = "macos"))]
-        reduce_transparency: Some(desktop_transparency::cached(&cc.egui_ctx)),
-        #[cfg(not(any(target_os = "windows", target_os = "macos")))]
-        reduce_transparency: None,
         http_get: Some(std::sync::Arc::new(http_get)),
         http_download: Some(std::sync::Arc::new(http_download)),
         // Already an installed app: only the browser build offers to install.
@@ -907,8 +779,7 @@ fn graphics() -> Option<serde_json::Value> {
     graphics_path().and_then(|p| std::fs::read_to_string(p).ok()).and_then(|s| serde_json::from_str::<serde_json::Value>(&s).ok())
 }
 
-/// The graphics backend preference (`graphics.json`'s `backend`: `auto`, `dx12`, `vulkan`, `gl`,
-/// or `cpu`, the software renderer).
+/// The graphics backend preference (`graphics.json`'s `backend`: `auto`, `dx12`, `vulkan`, `gl`).
 fn backend_preference() -> Option<String> {
     graphics().and_then(|v| v.get("backend").and_then(serde_json::Value::as_str).map(str::to_string))
 }
@@ -972,7 +843,7 @@ const DEPTH_BITS: u8 = 24;
 const FLOAT_DEPTH_BITS: u8 = 32;
 /// The section cap marks where it shows in the stencil.
 const STENCIL_BITS: u8 = 8;
-const MSAA: u16 = startup::DEFAULT_MSAA;
+const MSAA: u16 = 4;
 
 /// `custom_titlebar`: no OS decorations, the application bar is the title bar.
 fn app_viewport(custom_titlebar: bool) -> Result<egui::ViewportBuilder, eframe::Error> {
@@ -1093,6 +964,28 @@ fn main() -> eframe::Result {
         safe_mode = true;
         notes.push(format!("The last {failed_starts} launches stopped before the window opened, so this one is in safe mode."));
     }
+    let cpu_renderer = safe_mode || startup::cpu_renderer_env(std::env::var(startup::RENDERER_ENV).ok().as_deref());
+    // The launch before this one closed because its graphics device was lost (`App::watch_device`).
+    let after_loss = device_lost::recent(std::env::var(device_lost::LOST_ENV).ok().as_deref(), device_lost::now_secs());
+    if after_loss {
+        let reason = std::env::var(device_lost::REASON_ENV).ok();
+        if let Some(reason) = device_lost::reason(reason.as_deref()) {
+            log::warn!("graphics: the last launch lost its device ({reason})");
+        }
+        notes.push(device_lost::note(cpu_renderer, reason.as_deref()));
+    }
+    if safe_mode {
+        notes.push("Safe mode: default settings (yours are kept for the next normal start), no recovery offer, software rendering.".into());
+    }
+    let fallback_note = std::env::var(startup::FALLBACK_NOTE_ENV).ok().map(|s| s.chars().take(4096).collect::<String>());
+    if let Some(note) = &fallback_note {
+        log::warn!("{note}");
+        eprintln!("SolidCraft: {note}");
+        notes.push(note.clone());
+    }
+    let saved_samples = if safe_mode { None } else { msaa() };
+    let wgpu_options = wgpu_options(cpu_renderer, if safe_mode { None } else { backend_preference() }.as_deref());
+    let depth_bits = if !safe_mode && startup::float_depth_everywhere(&wgpu_options) { FLOAT_DEPTH_BITS } else { DEPTH_BITS };
     // Crashes leave a report in the crash folder (solidcraft_engine::crash, docs/crash-reports.md).
     let crashed = solidcraft_engine::crash::default_dir()
         .map(|dir| {
@@ -1104,73 +997,6 @@ fn main() -> eframe::Result {
             solidcraft_engine::crash::install(dir, build)
         })
         .unwrap_or_default();
-    // The graphics API and anti-aliasing: the saved ones, or ones tried from Preferences (#4015).
-    let mut graphics = startup::graphics_start(graphics().as_ref(), safe_mode);
-    if let Some(file) = graphics.rewrite.take() {
-        let written = graphics_path().is_some_and(|path| match write_replacing(&path, file.to_string().as_bytes()) {
-            Ok(()) => true,
-            Err(e) => {
-                log::error!("graphics: writing {}: {e}", path.display());
-                false
-            }
-        });
-        // A trial that can't be marked as started would be tried at every start.
-        if !written && matches!(graphics.trial, startup::Trial::Trying(_)) {
-            graphics.trial = startup::Trial::None;
-        }
-    }
-    notes.extend(graphics.note());
-    // The last launch crashed on an API Preferences warns about on this system: back to Automatic.
-    let last_crashed = crashed.iter().any(|r| startup::launch_crashed(&r.kind));
-    if !safe_mode
-        && graphics.trial == startup::Trial::None
-        && let Some(auto) = startup::after_crash(&graphics.saved, last_crashed, || {
-            startup::apis_that_freeze(cfg!(target_os = "windows"), startup::hardware_adapters_once)
-        })
-    {
-        notes.push(startup::after_crash_note(&graphics.saved.backend));
-        remember_backend(&auto.backend);
-        graphics.saved = auto;
-    }
-    let current = graphics.current().clone();
-    let trying = matches!(graphics.trial, startup::Trial::Trying(_));
-    // The software renderer: safe mode, SOLIDCRAFT_RENDERER, or kept after the GPU hung on every
-    // API (`startup::after_hang`).
-    let cpu_renderer = safe_mode
-        || startup::cpu_renderer_env(std::env::var(startup::RENDERER_ENV).ok().as_deref())
-        || startup::cpu_renderer_env(Some(&current.backend));
-    // The launch before this one closed because its graphics device was lost (`App::watch_device`).
-    let after_loss = device_lost::recent(std::env::var(device_lost::LOST_ENV).ok().as_deref(), device_lost::now_secs());
-    if after_loss {
-        let reason = std::env::var(device_lost::REASON_ENV).ok();
-        if let Some(reason) = device_lost::reason(reason.as_deref()) {
-            log::warn!("graphics: the last launch lost its device ({reason})");
-        }
-        notes.push(device_lost::note(cpu_renderer, reason.as_deref()));
-    }
-    // The launch before this one closed because its GPU hung (`App::watch_for_a_hang`).
-    if let Some(hung) = std::env::var(startup::HUNG_ENV).ok().filter(|v| !v.trim().is_empty()) {
-        notes.push(startup::hang_note(&hung, safe_mode, backend_preference().as_deref()));
-    }
-    if safe_mode {
-        notes.push("Safe mode: default settings (yours are kept for the next normal start), no recovery offer, software rendering.".into());
-    }
-    let fallback_note = std::env::var(startup::FALLBACK_NOTE_ENV).ok().map(|s| s.chars().take(4096).collect::<String>());
-    if let Some(note) = &fallback_note {
-        log::warn!("{note}");
-        eprintln!("SolidCraft: {note}");
-        notes.push(note.clone());
-    }
-    // Anti-aliasing on trial is asked for; a saved one only once Graphics changed it (`msaa`).
-    let saved_samples = if safe_mode {
-        None
-    } else if trying {
-        Some(current.msaa)
-    } else {
-        msaa()
-    };
-    let wgpu_options = wgpu_options(cpu_renderer, (!safe_mode).then_some(current.backend.as_str()));
-    let depth_bits = if !safe_mode && startup::float_depth_everywhere(&wgpu_options) { FLOAT_DEPTH_BITS } else { DEPTH_BITS };
     // A crash in native code (a graphics driver) says where it happened: the exception or signal
     // and the module on Windows and macOS, and on every system the startup step the app was in.
     #[cfg(target_os = "windows")]
@@ -1242,15 +1068,6 @@ fn main() -> eframe::Result {
     #[cfg(target_os = "macos")]
     let _driver_client = DriverClient;
     mark("run_native");
-    if trying {
-        // A new graphics API that hangs before the window draws leaves nothing to click on.
-        startup::watch_trial_start(startup::TRIAL_START_LIMIT, || {
-            eprintln!("SolidCraft graphics: the settings on trial drew no window in {} s; starting again", startup::TRIAL_START_LIMIT.as_secs());
-            relaunch(None);
-            control_server::remove_token_file();
-            device_lost::end();
-        });
-    }
     let result = eframe::run_native(
         "SolidCraft",
         options,
@@ -1299,21 +1116,8 @@ fn main() -> eframe::Result {
             });
             if !safe_mode {
                 app.preferences.graphics_adapter =
-                    crate::graphics().and_then(|v| v.get("adapter").and_then(serde_json::Value::as_str).map(str::to_string)).unwrap_or_default();
+                    graphics().and_then(|v| v.get("adapter").and_then(serde_json::Value::as_str).map(str::to_string)).unwrap_or_default();
             }
-            // Preferences shows the graphics settings this start uses, saved or on trial (#4015).
-            app.preferences.graphics_api = current.backend.clone();
-            app.preferences.msaa = u32::from(current.msaa);
-            let saved = solidcraft_ui_egui::prefs::GraphicsChoice { api: graphics.saved.backend.clone(), msaa: u32::from(graphics.saved.msaa) };
-            app.graphics = solidcraft_ui_egui::prefs::Graphics {
-                apis: startup::GRAPHICS_APIS.to_vec(),
-                freezes: startup::apis_that_freeze(cfg!(target_os = "windows"), startup::hardware_adapters_once),
-                env_override: std::env::var(startup::WGPU_BACKEND_ENV).ok().filter(|v| !v.trim().is_empty()),
-                trial: trying.then(|| solidcraft_ui_egui::prefs::GraphicsTrial { previous: saved.clone(), shown: 0.0, last_frame: None }),
-                saved,
-                restart: false,
-            };
-            let mut renderer = None;
             if let Some(rs) = &cc.wgpu_render_state {
                 app.services.graphics_adapters = rs
                     .available_adapters
@@ -1337,7 +1141,6 @@ fn main() -> eframe::Result {
                 let scene_samples = scene_samples(info.backend, u32::from(samples), &supported);
                 eprintln!("SolidCraft graphics: {:?}, MSAA {scene_samples}x (requested {}x)", rs.adapter.get_info().backend, samples);
                 solidcraft_engine::crash::phase("viewport pipelines (shader compile)");
-                renderer = Some((rs.adapter.get_info().backend, cpu_renderer));
                 let scene_samples = app.set_wgpu_split(rs, depth_bits, STENCIL_BITS, scene_samples);
                 app.msaa_supported = supported;
                 app.preferences.msaa = u32::from(samples);
@@ -1443,9 +1246,6 @@ fn main() -> eframe::Result {
                 take_focus_unwanted: control_port.is_some(),
                 come_forward: come_forward::ComeForward::default(),
                 gpu,
-                renderer,
-                hang: startup::HangWatch::default(),
-                restart: None,
                 #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
                 space_mouse,
                 #[cfg(target_os = "macos")]
@@ -1457,7 +1257,7 @@ fn main() -> eframe::Result {
     );
     control_server::remove_token_file();
     match result {
-        Err(e) if !created.load(std::sync::atomic::Ordering::SeqCst) => no_window(e, cpu_renderer, started, trying, settings.as_deref()),
+        Err(e) if !created.load(std::sync::atomic::Ordering::SeqCst) => no_window(e, cpu_renderer, started, settings.as_deref()),
         r => r,
     }
 }
@@ -1473,8 +1273,8 @@ fn startup_step(step: &'static str, detail: &str) {
 }
 
 /// The renderer settings: with `cpu`, the software adapter (WARP, lavapipe, llvmpipe). The
-/// backends come from `startup::choose_backends` (on Windows D3D12 first, Vulkan on AMD
-/// integrated GPUs, and only the backend in use is started); `preference` is `graphics.json`'s `backend`.
+/// backends come from `startup::choose_backends` (on Windows D3D12 first, and only the backend
+/// in use is started); `preference` is `graphics.json`'s `backend`.
 fn wgpu_options(cpu: bool, preference: Option<&str>) -> eframe::egui_wgpu::WgpuConfiguration {
     let mut options = eframe::egui_wgpu::WgpuConfiguration::default();
     if let eframe::egui_wgpu::WgpuSetup::CreateNew(setup) = &mut options.wgpu_setup {
@@ -1482,7 +1282,7 @@ fn wgpu_options(cpu: bool, preference: Option<&str>) -> eframe::egui_wgpu::WgpuC
         // A retry applies only to this launch. WGPU_BACKEND always has priority.
         let retry = std::env::var(startup::RETRY_BACKEND_ENV).ok();
         let preference = if cpu { preference } else { retry.as_deref().or(preference) };
-        if let Some(backends) = startup::choose_backends(cfg!(target_os = "windows"), env_set, cpu, preference, startup::hardware_adapters_once) {
+        if let Some(backends) = startup::choose_backends(cfg!(target_os = "windows"), env_set, cpu, preference, startup::has_hardware_adapter) {
             eprintln!("SolidCraft graphics: starting {backends:?}");
             setup.instance_descriptor.backends = backends;
         }
@@ -1506,53 +1306,35 @@ fn wgpu_options(cpu: bool, preference: Option<&str>) -> eframe::egui_wgpu::WgpuC
 }
 
 /// A failed renderer returns here before app creation. A fresh process avoids reusing winit's
-/// event loop or a failed device; each retry advances through the APIs, then software once. With
-/// graphics settings on trial (`trial`), once more as usual instead: that start drops them and
-/// goes back to the saved ones.
-fn no_window(
-    error: eframe::Error,
-    tried_cpu: bool,
-    failed: eframe::wgpu::Backends,
-    trial: bool,
-    settings: Option<&std::path::Path>,
-) -> eframe::Result {
+/// event loop or a failed device; each retry advances through the APIs, then software once.
+fn no_window(error: eframe::Error, tried_cpu: bool, failed: eframe::wgpu::Backends, settings: Option<&std::path::Path>) -> eframe::Result {
     log::error!("the window could not open: {error}");
     eprintln!("SolidCraft: the window could not open: {error}");
-    // The retry below runs as a child that this process waits for, for as long as it runs: not a
-    // start that never draws.
-    startup::first_frame_drawn();
     // This failure was handled, so neither the marker nor the journal should call it a crash.
     if let Some(dir) = settings {
         startup::started(dir);
     }
     solidcraft_engine::crash::end_session();
     let explicit = std::env::var(startup::WGPU_BACKEND_ENV).is_ok_and(|v| !v.trim().is_empty());
-    let next = if trial { None } else { startup::fallback_backend(cfg!(target_os = "windows"), explicit, tried_cpu, failed) };
-    if (trial || next.is_some())
+    if let Some(next) = startup::fallback_backend(cfg!(target_os = "windows"), explicit, tried_cpu, failed)
         && let Ok(exe) = std::env::current_exe()
     {
+        let previous = std::env::var(startup::FALLBACK_NOTE_ENV).unwrap_or_default();
+        let note = startup::fallback_note(&previous, failed, next, &error.to_string());
+        log::warn!("{note}");
+        eprintln!("SolidCraft: {note}");
         let mut command = std::process::Command::new(exe);
-        command.args(std::env::args_os().skip(1)).env_remove(startup::HUNG_ENV);
-        if let Some(next) = next {
-            let previous = std::env::var(startup::FALLBACK_NOTE_ENV).unwrap_or_default();
-            let note = startup::fallback_note(&previous, failed, next, &error.to_string());
-            log::warn!("{note}");
-            eprintln!("SolidCraft: {note}");
-            command.env(startup::FALLBACK_NOTE_ENV, note);
-            if next == "cpu" {
-                command.env(startup::RENDERER_ENV, "cpu").env_remove(startup::RETRY_BACKEND_ENV);
-            } else {
-                command.env(startup::RETRY_BACKEND_ENV, next);
-            }
+        command.args(std::env::args_os().skip(1)).env(startup::FALLBACK_NOTE_ENV, note);
+        if next == "cpu" {
+            command.env(startup::RENDERER_ENV, "cpu").env_remove(startup::RETRY_BACKEND_ENV);
         } else {
-            eprintln!("SolidCraft: trying again with the saved graphics settings");
-            command.env_remove(startup::RETRY_BACKEND_ENV).env_remove(startup::FALLBACK_NOTE_ENV);
+            command.env(startup::RETRY_BACKEND_ENV, next);
         }
         match command.status() {
             Ok(status) if status.success() => return Ok(()),
             // The final try showed its own message.
             Ok(_) => return Err(error),
-            Err(e) => log::error!("could not start again on {}: {e}", next.unwrap_or("the saved graphics settings")),
+            Err(e) => log::error!("could not start again on {next}: {e}"),
         }
     }
     let message = if explicit {

apps/solidcraft/src/startup.rs

@@ -11,13 +11,6 @@
 //! - **A renderer that cannot start**: on Windows, try the remaining graphics APIs in order,
 //!   then the software renderer (`SOLIDCRAFT_RENDERER=cpu`). An explicit `WGPU_BACKEND` fails
 //!   cleanly without switching. Exhausted retries show a message box with the error.
-//! - **A GPU that hangs after the window is up** (Windows, [`HangWatch`]): frames that each wait
-//!   out their acquire while the user is there. The app closes, keeping unsaved changes for
-//!   recovery, and starts again on the next API (D3D12 → Vulkan → OpenGL → the software
-//!   renderer), kept in `graphics.json`.
-//! - **Graphics settings tried from Preferences** (the graphics API, anti-aliasing; [`graphics_start`]):
-//!   the start that tries them asks to keep them. One that never says so (a crash, a hang, the
-//!   question timed out) leaves the trial marked as started, and the next start drops it.
 
 use std::path::{Path, PathBuf};
 
@@ -116,46 +109,6 @@ pub fn begin(dir: &Path) -> u32 {
     before
 }
 
-/// How long a start that tries graphics settings has to draw its first frame (`watch_trial_start`).
-pub const TRIAL_START_LIMIT: std::time::Duration = std::time::Duration::from_secs(60);
-
-static FIRST_FRAME: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);
-
-/// The first frame was drawn (or the start handed over to a retry): `watch_trial_start` stands down.
-pub fn first_frame_drawn() {
-    FIRST_FRAME.store(true, std::sync::atomic::Ordering::SeqCst);
-}
-
-/// A start that tries a new graphics API can hang inside the driver before any window draws (a
-/// black or frozen window, no question, nothing to click). If [`first_frame_drawn`] isn't called
-/// within `limit`, run `give_up` once (it starts again with the saved settings: the trial is
-/// marked as started, so the next start drops it). Returns the thread, for tests.
-pub fn watch_trial_start(limit: std::time::Duration, give_up: impl FnOnce() + Send + 'static) -> Option<std::thread::JoinHandle<()>> {
-    watch_start(&FIRST_FRAME, limit, give_up)
-}
-
-fn watch_start(
-    drawn: &'static std::sync::atomic::AtomicBool,
-    limit: std::time::Duration,
-    give_up: impl FnOnce() + Send + 'static,
-) -> Option<std::thread::JoinHandle<()>> {
-    std::thread::Builder::new()
-        .name("solidcraft-trial-start".into())
-        .spawn(move || {
-            let begun = std::time::Instant::now();
-            while begun.elapsed() < limit {
-                if drawn.load(std::sync::atomic::Ordering::SeqCst) {
-                    return;
-                }
-                std::thread::sleep(std::time::Duration::from_millis(50).min(limit));
-            }
-            if !drawn.load(std::sync::atomic::Ordering::SeqCst) {
-                give_up();
-            }
-        })
-        .ok()
-}
-
 /// The window is up: this launch did not fail to start.
 pub fn started(dir: &Path) {
     let _ = std::fs::remove_file(dir.join(MARKER));
@@ -235,14 +188,8 @@ pub const WGPU_BACKEND_ENV: &str = "WGPU_BACKEND";
 /// together and prefer Vulkan, and starting Vulkan loads every installed Vulkan driver: Intel's
 /// (`igvk64.dll`) crashed SolidCraft at startup that way, inside the driver, before anything
 /// could be reported. D3D12 is Windows' own graphics API, the one its drivers are tested with.
-/// `hardware(backends)` lists those backends' adapters that aren't software (it is only asked
-/// about the backends being tried, one at a time).
-///
-/// One exception: when D3D12's only hardware adapters are AMD integrated GPUs and Vulkan has a
-/// hardware adapter, Vulkan. On those (Ryzen 5400U, 5600U, 5700G) D3D12 hung the driver a few
-/// seconds into the first frames and Windows reset it (a black screen, then a crash, #1789,
-/// #2806); 0.11.0, which preferred Vulkan, worked there, and `WGPU_BACKEND=vulkan` runs it
-/// smoothly (#3321).
+/// `has_hardware(backends)` says whether those backends have an adapter that isn't software
+/// (it is only asked about the backends being tried, one at a time).
 ///
 /// - `WGPU_BACKEND` set (`env_set`): `None`, whatever it says wins.
 /// - The software renderer (`cpu`, safe mode): D3D12 alone on Windows (WARP); `None` elsewhere.
@@ -255,7 +202,7 @@ pub fn choose_backends(
     env_set: bool,
     cpu: bool,
     preference: Option<&str>,
-    mut hardware: impl FnMut(eframe::wgpu::Backends) -> Vec<HardwareAdapter>,
+    mut has_hardware: impl FnMut(eframe::wgpu::Backends) -> bool,
 ) -> Option<eframe::wgpu::Backends> {
     use eframe::wgpu::Backends;
     if env_set {
@@ -274,150 +221,7 @@ pub fn choose_backends(
     if !windows {
         return None;
     }
-    for b in WINDOWS_ORDER {
-        let found = hardware(b);
-        if found.is_empty() {
-            continue;
-        }
-        if b == Backends::DX12 && found.iter().all(HardwareAdapter::hangs_on_d3d12) && !hardware(Backends::VULKAN).is_empty() {
-            log::warn!("graphics: Vulkan rather than D3D12 on an AMD integrated GPU (#3321)");
-            return Some(Backends::VULKAN);
-        }
-        return Some(b);
-    }
-    Some(Backends::DX12)
-}
-
-/// A hardware (not software) adapter a backend offers, as [`choose_backends`] needs it.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct HardwareAdapter {
-    /// The PCI vendor id.
-    pub vendor: u32,
-    pub device_type: eframe::wgpu::DeviceType,
-}
-
-/// AMD's PCI vendor id.
-const AMD: u32 = 0x1002;
-
-impl HardwareAdapter {
-    /// An AMD integrated GPU, whose D3D12 driver hung on SolidCraft's first frames (#3321).
-    pub fn hangs_on_d3d12(&self) -> bool {
-        self.vendor == AMD && self.device_type == eframe::wgpu::DeviceType::IntegratedGpu
-    }
-}
-
-/// Frames in a row that stalled ([`eframe::egui_wgpu::stalled_frames`]: each waited out wgpu's
-/// one-second acquire) after which the GPU is taken as hung.
-pub const STALLED_FRAMES_FOR_RESTART: u32 = 5;
-/// Seconds the window's surface may refuse its configuration ([`eframe::egui_wgpu::refused_for`])
-/// while the user is there before the GPU is taken as hung: after a reset, a surface that stays
-/// unsupported leaves a blank window. Refusals that clear up (a resize, a display waking up)
-/// take a moment, not this long.
-pub const REFUSED_S_FOR_RESTART: f64 = 10.0;
-/// Stalled frames count only this many seconds after the user's input: a hung GPU leaves a white
-/// window the user clicks at, while a switched-off display can hold frames back with nobody there.
-pub const STALL_INPUT_WINDOW_S: f64 = 10.0;
-/// Set on the launch that replaces one whose GPU hung: the hung backend, for the notice.
-pub const HUNG_ENV: &str = "SOLIDCRAFT_GPU_HUNG";
-
-/// Watches for a hung GPU after the window is up (#3321). The failed-start count misses it: frames
-/// still come, a second apart, so the start counts as good.
-#[derive(Debug, Default)]
-pub struct HangWatch {
-    last_input: Option<f64>,
-    /// When the user came back: the first input after none for [`STALL_INPUT_WINDOW_S`].
-    arrived: f64,
-    /// The stalled streak when the user came back. Those frames stalled with nobody there (a
-    /// display switched off holds them back too), and the input that wakes the display comes
-    /// before the next frame shows whether the GPU is fine, so only stalls after it count.
-    stalled_before: u32,
-    hung: bool,
-}
-
-impl HangWatch {
-    /// Per frame, at `now` seconds: whether the user gave input this frame, the frames in a row
-    /// that stalled, and the seconds the surface has refused its configuration. True once, the
-    /// frame the GPU is taken as hung.
-    pub fn hung(&mut self, now: f64, input: bool, stalled: u32, refused_s: Option<f64>) -> bool {
-        if stalled < self.stalled_before {
-            // The streak broke: every stall since came after the user was back.
-            self.stalled_before = 0;
-        }
-        if input {
-            if !self.user_there(now) {
-                self.arrived = now;
-                self.stalled_before = stalled;
-            }
-            self.last_input = Some(now);
-        }
-        if self.hung || !self.user_there(now) {
-            return false;
-        }
-        // A surface refused since before the user came back counts from then.
-        let refused = refused_s.map_or(0.0, |r| r.min(now - self.arrived));
-        self.hung = stalled.saturating_sub(self.stalled_before) >= STALLED_FRAMES_FOR_RESTART || refused >= REFUSED_S_FOR_RESTART;
-        self.hung
-    }
-
-    fn user_there(&self, now: f64) -> bool {
-        self.last_input.is_some_and(|t| (0.0..=STALL_INPUT_WINDOW_S).contains(&(now - t)))
-    }
-}
-
-/// How a launch whose GPU hung starts again.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum Restart {
-    /// On this backend (`graphics.json`'s `backend`), kept for later launches too.
-    Backend(&'static str),
-    /// As it was: the hang came with graphics settings on trial, which the next start drops
-    /// ([`graphics_start`]).
-    Again,
-}
-
-/// The restart after the GPU hung on `backend` (`cpu`: the software renderer, which has nothing
-/// to fall back to; `trial`: with graphics settings on trial, which the next start drops). Each
-/// hang moves on to the next of [`WINDOWS_ORDER`], then to the software renderer, kept in
-/// `graphics.json` for later launches too, so a GPU hangs at most once on each: a safe-mode
-/// restart would leave the backend that hung saved for the next normal start. D3D12 goes to
-/// Vulkan, which runs the GPUs whose D3D12 driver hung (#1789); it isn't probed here, as loading
-/// Vulkan's drivers into this process is what crashed once (`WINDOWS_ORDER`): the new launch
-/// finds out, and falls back to software if it has no GPU.
-pub fn after_hang(backend: eframe::wgpu::Backend, cpu: bool, trial: bool) -> Option<Restart> {
-    match backend {
-        _ if trial => Some(Restart::Again),
-        _ if cpu => None,
-        eframe::wgpu::Backend::Dx12 => Some(Restart::Backend("vulkan")),
-        eframe::wgpu::Backend::Vulkan => Some(Restart::Backend("gl")),
-        _ => Some(Restart::Backend(SOFTWARE_BACKEND)),
-    }
-}
-
-/// `graphics.json`'s `backend` for the software renderer, kept after the GPU hung on every API.
-pub const SOFTWARE_BACKEND: &str = "cpu";
-
-/// The notice on the launch after the GPU hung on `hung` (a backend's name): this one is in safe
-/// mode, or on the `backend` preference.
-pub fn hang_note(hung: &str, safe_mode: bool, backend: Option<&str>) -> String {
-    let now = match backend {
-        _ if safe_mode => "in safe mode".to_string(),
-        Some(b) => format!("on {}, which it keeps using (the backend in graphics.json)", api_name(b)),
-        None => "with another renderer".to_string(),
-    };
-    let unsaved = if safe_mode { "the next normal start offers unsaved changes" } else { "unsaved changes are offered for recovery" };
-    format!("The graphics driver stopped responding on {}, so SolidCraft restarted {now}; {unsaved}.", api_name(hung))
-}
-
-/// A backend's name (`Dx12`, `vulkan`, …) as people know the graphics API.
-fn api_name(backend: &str) -> &str {
-    match backend.trim().to_ascii_lowercase().as_str() {
-        "" | "auto" => "Automatic",
-        "dx12" => "Direct3D 12",
-        "vulkan" => "Vulkan",
-        "gl" => "OpenGL",
-        "metal" => "Metal",
-        "cpu" | "software" => "the software renderer",
-        _ => backend,
-    }
+    Some(WINDOWS_ORDER.into_iter().find(|b| has_hardware(*b)).unwrap_or(Backends::DX12))
 }
 
 /// Internal, process-local retry choice; never written to the graphics preference.
@@ -448,164 +252,6 @@ pub fn fallback_note(previous: &str, failed: eframe::wgpu::Backends, next: &str,
     line.split_whitespace().collect::<Vec<_>>().join(" ").chars().take(4096).collect()
 }
 
-/// The graphics APIs Preferences offers on this system besides Automatic, as `graphics.json`'s
-/// `backend` names them (#4015). None on macOS, which has Metal alone.
-pub const GRAPHICS_APIS: &[&str] = if cfg!(target_os = "windows") {
-    &["dx12", "vulkan", "gl"]
-} else if cfg!(target_os = "macos") {
-    &[]
-} else {
-    &["vulkan", "gl"]
-};
-
-/// The APIs Preferences warns about on this system: D3D12 when its GPUs are all AMD integrated
-/// ones, whose driver it froze, at times until the computer was restarted (#3321).
-pub fn apis_that_freeze(windows: bool, hardware: impl FnOnce(eframe::wgpu::Backends) -> Vec<HardwareAdapter>) -> Vec<&'static str> {
-    if !windows {
-        return Vec::new();
-    }
-    let found = hardware(eframe::wgpu::Backends::DX12);
-    if !found.is_empty() && found.iter().all(HardwareAdapter::hangs_on_d3d12) { vec!["dx12"] } else { Vec::new() }
-}
-
-/// The saved settings to start with after the last launch crashed (`crashed`) on `saved`: an API
-/// Preferences warns about on this system (`freezes`, [`apis_that_freeze`]) goes back to Automatic.
-/// AMD's integrated GPUs crashed on D3D12 once a design opened, after the start and its trial had
-/// gone fine and the user kept it (#4015). `None`: they stay.
-pub fn after_crash(saved: &GraphicsChoice, crashed: bool, freezes: impl FnOnce() -> Vec<&'static str>) -> Option<GraphicsChoice> {
-    let chosen: Vec<&str> = saved.backend.split(',').map(str::trim).filter(|b| !b.is_empty() && *b != "auto").collect();
-    if !crashed || chosen.is_empty() {
-        return None;
-    }
-    let freezes = freezes();
-    chosen.iter().any(|b| freezes.contains(b)).then(|| GraphicsChoice { backend: "auto".into(), msaa: saved.msaa })
-}
-
-/// The notice when [`after_crash`] put `backend` (a backend's name) back to Automatic.
-pub fn after_crash_note(backend: &str) -> String {
-    format!(
-        "SolidCraft closed unexpectedly on {}, which can freeze this computer's graphics, so it went back to Automatic. Preferences can choose it again.",
-        api_name(backend)
-    )
-}
-
-/// Whether a crash report `kind` ([`solidcraft_engine::crash::Summary`]) means the launch ended:
-/// a panic nothing caught or an unclean exit, not a command or kernel call recovered from.
-pub fn launch_crashed(kind: &str) -> bool {
-    matches!(kind, "panic" | "unclean_exit")
-}
-
-/// [`hardware_adapters`], keeping D3D12's: the start asks for them ([`choose_backends`]), then
-/// Preferences ([`apis_that_freeze`]).
-pub fn hardware_adapters_once(backends: eframe::wgpu::Backends) -> Vec<HardwareAdapter> {
-    static D3D12: std::sync::OnceLock<Vec<HardwareAdapter>> = std::sync::OnceLock::new();
-    if backends == eframe::wgpu::Backends::DX12 { D3D12.get_or_init(|| hardware_adapters(backends)).clone() } else { hardware_adapters(backends) }
-}
-
-/// Anti-aliasing samples when `graphics.json` has none (or one that isn't 1, 2, 4 or 8).
-pub const DEFAULT_MSAA: u16 = 4;
-
-/// Graphics settings a launch starts with (`graphics.json`'s `backend` and `msaa`).
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct GraphicsChoice {
-    /// `auto`, or the backends to start (`dx12`, `vulkan`, `gl`, or a comma list).
-    pub backend: String,
-    pub msaa: u16,
-}
-
-impl GraphicsChoice {
-    /// The choice in a JSON object, with `fallback`'s values where it has none (or a bad one).
-    fn read(json: Option<&serde_json::Value>, fallback: &GraphicsChoice) -> GraphicsChoice {
-        let backend = json.and_then(|v| v.get("backend")).and_then(serde_json::Value::as_str).map(str::trim).filter(|b| !b.is_empty());
-        let msaa = json
-            .and_then(|v| v.get("msaa"))
-            .and_then(serde_json::Value::as_u64)
-            .and_then(|m| u16::try_from(m).ok())
-            .filter(|m| [1, 2, 4, 8].contains(m));
-        GraphicsChoice { backend: backend.map_or_else(|| fallback.backend.clone(), str::to_string), msaa: msaa.unwrap_or(fallback.msaa) }
-    }
-
-    /// As the notice names it, with only what differs from `other` ("Vulkan, 8× anti-aliasing").
-    fn describe(&self, other: &GraphicsChoice) -> String {
-        let mut parts = Vec::new();
-        if self.backend != other.backend || self.msaa == other.msaa {
-            parts.push(api_name(&self.backend).to_string());
-        }
-        if self.msaa != other.msaa {
-            parts.push(format!("{}× anti-aliasing", self.msaa));
-        }
-        parts.join(", ")
-    }
-}
-
-/// Settings tried from Preferences, as a launch finds them (#4015).
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum Trial {
-    None,
-    /// This launch tries them: it starts with them and asks whether to keep them.
-    Trying(GraphicsChoice),
-    /// The launch that tried them ended without keeping them: they are dropped.
-    Failed(GraphicsChoice),
-}
-
-/// `graphics.json` as a launch reads it.
-#[derive(Clone, Debug, PartialEq)]
-pub struct GraphicsStart {
-    /// The settings kept for every launch.
-    pub saved: GraphicsChoice,
-    pub trial: Trial,
-    /// The file to write back before the window opens, when it changes: the trial marked as
-    /// started, or dropped.
-    pub rewrite: Option<serde_json::Value>,
-}
-
-impl GraphicsStart {
-    /// The settings this launch starts with.
-    pub fn current(&self) -> &GraphicsChoice {
-        match &self.trial {
-            Trial::Trying(tried) => tried,
-            _ => &self.saved,
-        }
-    }
-
-    /// The notice when a trial was dropped.
-    pub fn note(&self) -> Option<String> {
-        let Trial::Failed(tried) = &self.trial else { return None };
-        Some(format!(
-            "The graphics settings tried at the last start ({}) weren't kept, so SolidCraft went back to {}.",
-            tried.describe(&self.saved),
-            self.saved.describe(tried)
-        ))
-    }
-}
-
-/// Read `graphics.json` (`file`) at start. Preferences writes settings to try as its `trial`
-/// object, next to the saved `backend` and `msaa`. The first launch to find it tries them and
-/// marks it `started`; the app removes the trial when the user keeps the settings (they become
-/// the saved ones) or goes back. A trial already started belongs to a launch that never got
-/// that far, so it is dropped. Safe mode leaves a trial that hasn't started for the next start.
-pub fn graphics_start(file: Option<&serde_json::Value>, safe_mode: bool) -> GraphicsStart {
-    let defaults = GraphicsChoice { backend: "auto".into(), msaa: DEFAULT_MSAA };
-    let saved = GraphicsChoice::read(file, &defaults);
-    let Some(trial) = file.and_then(|f| f.get("trial")).filter(|t| t.is_object()) else {
-        return GraphicsStart { saved, trial: Trial::None, rewrite: None };
-    };
-    let tried = GraphicsChoice::read(Some(trial), &saved);
-    let started = trial.get("started").and_then(serde_json::Value::as_bool).unwrap_or(false);
-    let mut rewrite = file.cloned().unwrap_or_default();
-    if started {
-        if let Some(o) = rewrite.as_object_mut() {
-            o.remove("trial");
-        }
-        return GraphicsStart { saved, trial: Trial::Failed(tried), rewrite: Some(rewrite) };
-    }
-    if safe_mode {
-        return GraphicsStart { saved, trial: Trial::None, rewrite: None };
-    }
-    rewrite["trial"]["started"] = serde_json::json!(true);
-    GraphicsStart { saved, trial: Trial::Trying(tried), rewrite: Some(rewrite) }
-}
-
 /// The device feature for a 32-bit float depth buffer with a stencil (reversed depth, #1434).
 pub const FLOAT_DEPTH_STENCIL: eframe::wgpu::Features = eframe::wgpu::Features::DEPTH32FLOAT_STENCIL8;
 
@@ -626,8 +272,8 @@ pub fn float_depth_everywhere(options: &eframe::egui_wgpu::WgpuConfiguration) ->
 /// The order backends are tried in on Windows.
 pub const WINDOWS_ORDER: [eframe::wgpu::Backends; 3] = [eframe::wgpu::Backends::DX12, eframe::wgpu::Backends::VULKAN, eframe::wgpu::Backends::GL];
 
-/// The hardware adapters of `backends` (started on their own, nothing else).
-pub fn hardware_adapters(backends: eframe::wgpu::Backends) -> Vec<HardwareAdapter> {
+/// Whether `backends` (started on their own, nothing else) have a hardware adapter.
+pub fn has_hardware_adapter(backends: eframe::wgpu::Backends) -> bool {
     let mut desc = eframe::wgpu::InstanceDescriptor::new_without_display_handle();
     desc.backends = backends;
     desc.flags = eframe::wgpu::InstanceFlags::from_build_config().with_env();
@@ -636,12 +282,7 @@ pub fn hardware_adapters(backends: eframe::wgpu::Backends) -> Vec<HardwareAdapte
     let adapters = pollster::block_on(instance.enumerate_adapters(backends));
     let found: Vec<String> = adapters.iter().map(|a| format!("{} ({:?})", a.get_info().name, a.get_info().device_type)).collect();
     log::info!("graphics: {backends:?} adapters: {found:?}");
-    adapters
-        .iter()
-        .map(|a| a.get_info())
-        .filter(|i| i.device_type != eframe::wgpu::DeviceType::Cpu)
-        .map(|i| HardwareAdapter { vendor: i.vendor, device_type: i.device_type })
-        .collect()
+    adapters.iter().any(|a| a.get_info().device_type != eframe::wgpu::DeviceType::Cpu)
 }
 
 /// The environment variable that switches wgpu's indirect-call validation on or off.
@@ -762,34 +403,6 @@ mod tests {
         ["Integrated", "Discrete small", "Discrete large"].into_iter().map(|name| AdapterChoice { name: name.into(), compatible: true }).collect()
     }
 
-    /// A start on trial that draws no frame in time gives up once; one that draws stands down
-    /// (#4015).
-    #[test]
-    fn a_trial_start_that_draws_nothing_gives_up_once() {
-        use std::sync::atomic::{AtomicBool, AtomicU32, Ordering};
-        use std::time::Duration;
-        static HUNG: AtomicBool = AtomicBool::new(false);
-        static HUNG_GAVE_UP: AtomicU32 = AtomicU32::new(0);
-        watch_start(&HUNG, Duration::from_millis(150), || {
-            HUNG_GAVE_UP.fetch_add(1, Ordering::SeqCst);
-        })
-        .map(|t| t.join())
-        .unwrap()
-        .unwrap();
-        assert_eq!(HUNG_GAVE_UP.load(Ordering::SeqCst), 1);
-
-        static DRAWN: AtomicBool = AtomicBool::new(false);
-        static DRAWN_GAVE_UP: AtomicU32 = AtomicU32::new(0);
-        let watch = watch_start(&DRAWN, Duration::from_millis(400), || {
-            DRAWN_GAVE_UP.fetch_add(1, Ordering::SeqCst);
-        })
-        .unwrap();
-        std::thread::sleep(Duration::from_millis(60));
-        DRAWN.store(true, Ordering::SeqCst);
-        watch.join().unwrap();
-        assert_eq!(DRAWN_GAVE_UP.load(Ordering::SeqCst), 0, "the window drew: nothing to give up");
-    }
-
     #[test]
     fn max_file_size_parses_sizes_and_refuses_bad_ones() {
         assert_eq!(max_file_size(Some("2GB")), Ok(2 << 30));
@@ -949,32 +562,21 @@ mod tests {
         let _ = std::fs::remove_dir_all(&d);
     }
 
-    /// A discrete NVIDIA GPU, and AMD's integrated one (#3321).
-    const NVIDIA: HardwareAdapter = HardwareAdapter { vendor: 0x10de, device_type: eframe::wgpu::DeviceType::DiscreteGpu };
-    const AMD_IGPU: HardwareAdapter = HardwareAdapter { vendor: AMD, device_type: eframe::wgpu::DeviceType::IntegratedGpu };
-
-    /// A probe where the backends `with` have `gpus`, and the others none.
-    fn probe_with(
-        with: &'static [eframe::wgpu::Backends],
-        gpus: &'static [HardwareAdapter],
-    ) -> impl FnMut(eframe::wgpu::Backends) -> Vec<HardwareAdapter> {
-        use eframe::wgpu::Backends;
-        move |b: Backends| {
-            assert!(b == Backends::DX12 || b == Backends::VULKAN || b == Backends::GL, "one backend at a time: {b:?}");
-            if with.contains(&b) { gpus.to_vec() } else { Vec::new() }
-        }
-    }
-
     #[test]
     fn windows_starts_d3d12_first_and_vulkan_only_when_d3d12_has_no_gpu() {
         use eframe::wgpu::Backends;
-        let probe = |with: &'static [Backends]| probe_with(with, &[NVIDIA]);
+        let probe = |with: &'static [Backends]| {
+            move |b: Backends| {
+                assert!(b == Backends::DX12 || b == Backends::VULKAN || b == Backends::GL, "one backend at a time: {b:?}");
+                with.contains(&b)
+            }
+        };
         // D3D12 works: Vulkan and OpenGL are never even asked about (starting Vulkan loads
         // its drivers, which is what crashed).
         let mut asked = Vec::new();
         let chosen = choose_backends(true, false, false, None, |b| {
             asked.push(b);
-            if b == Backends::DX12 { vec![NVIDIA] } else { Vec::new() }
+            b == Backends::DX12
         });
         assert_eq!(chosen, Some(Backends::DX12));
         assert_eq!(asked, [Backends::DX12]);
@@ -989,158 +591,6 @@ mod tests {
         assert_eq!(choose_backends(true, false, false, Some(""), probe(&[Backends::GL])), Some(Backends::GL));
     }
 
-    /// AMD integrated GPUs hung under D3D12 at the first frames, the driver reset and the app
-    /// crashed (#1789, #2806); they run on Vulkan (#3321).
-    #[test]
-    fn an_amd_integrated_gpu_starts_vulkan_rather_than_d3d12() {
-        use eframe::wgpu::Backends;
-        let all = &[Backends::DX12, Backends::VULKAN, Backends::GL];
-        assert_eq!(choose_backends(true, false, false, None, probe_with(all, &[AMD_IGPU])), Some(Backends::VULKAN));
-        // Without a Vulkan GPU: D3D12 still, rather than OpenGL or software.
-        assert_eq!(choose_backends(true, false, false, None, probe_with(&[Backends::DX12], &[AMD_IGPU])), Some(Backends::DX12));
-        // Another GPU beside it (a laptop's discrete one): D3D12, which can pick that one.
-        assert_eq!(choose_backends(true, false, false, None, probe_with(all, &[AMD_IGPU, NVIDIA])), Some(Backends::DX12));
-        // A discrete AMD GPU keeps D3D12.
-        let discrete = &[HardwareAdapter { vendor: AMD, device_type: eframe::wgpu::DeviceType::DiscreteGpu }];
-        assert_eq!(choose_backends(true, false, false, None, probe_with(all, discrete)), Some(Backends::DX12));
-        // The preference and WGPU_BACKEND still win, and other systems are left to wgpu.
-        let never = |b: Backends| -> Vec<HardwareAdapter> { panic!("no probing expected, asked about {b:?}") };
-        assert_eq!(choose_backends(true, false, false, Some("dx12"), never), Some(Backends::DX12));
-        assert_eq!(choose_backends(true, true, false, None, never), None);
-        assert_eq!(choose_backends(false, false, false, None, never), None);
-    }
-
-    /// After the window was up, D3D12 hung the GPU: frames came a second apart and never showed,
-    /// a white window with no crash (#1789, #3321). Five such frames while the user is there
-    /// restart the app, D3D12 on Vulkan and anything else in safe mode.
-    #[test]
-    fn a_gpu_that_hangs_after_the_window_is_up_restarts_on_another_renderer() {
-        use eframe::wgpu::Backend;
-        let stalled = STALLED_FRAMES_FOR_RESTART;
-        let mut watch = HangWatch::default();
-        assert!(!watch.hung(0.0, true, 0, None));
-        assert!(!watch.hung(4.0, false, stalled - 1, None), "not yet");
-        assert!(watch.hung(5.0, false, stalled, None), "input 5 s ago");
-        assert!(!watch.hung(6.0, true, stalled + 1, None), "once");
-        // Nobody at the computer (a display switched off holds frames back too): no restart.
-        let mut away = HangWatch::default();
-        assert!(!away.hung(100.0, false, stalled, None));
-        assert!(!away.hung(200.0, false, 100, None));
-        // The input that wakes the display comes before a frame shows the GPU is fine: the
-        // stalls from before don't count, and the frames on time that follow end the streak.
-        let mut woke = HangWatch::default();
-        assert!(!woke.hung(0.0, true, 0, None));
-        assert!(!woke.hung(STALL_INPUT_WINDOW_S + 1.0, false, 30, None));
-        assert!(!woke.hung(STALL_INPUT_WINDOW_S + 2.0, true, 30, None), "back at a healthy app");
-        assert!(!woke.hung(STALL_INPUT_WINDOW_S + 3.0, true, 0, None));
-        let later: Vec<bool> = (1..=stalled).map(|n| woke.hung(STALL_INPUT_WINDOW_S + 3.0 + f64::from(n), true, n, None)).collect();
-        assert_eq!(later.last(), Some(&true), "then it hangs: {later:?}");
-        // Back at a GPU that hung while nobody was there: five more stalls.
-        let mut back = HangWatch::default();
-        assert!(!back.hung(100.0, true, 30, None));
-        assert!(!back.hung(103.0, true, 30 + stalled - 1, None));
-        assert!(back.hung(104.0, true, 30 + stalled, None));
-        // A surface refused for good after a reset never reaches the acquire: a blank window.
-        let mut refused = HangWatch::default();
-        assert!(!refused.hung(0.0, true, 0, Some(60.0)), "refused since before the user came");
-        assert!(!refused.hung(REFUSED_S_FOR_RESTART - 1.0, true, 0, Some(60.0 + REFUSED_S_FOR_RESTART - 1.0)));
-        assert!(refused.hung(REFUSED_S_FOR_RESTART, true, 0, Some(60.0 + REFUSED_S_FOR_RESTART)));
-        let mut resized = HangWatch::default();
-        assert!(!resized.hung(0.0, true, 0, Some(0.5)), "a moment's refusal");
-
-        // Each API hangs at most once: D3D12, then Vulkan, then OpenGL, then software.
-        assert_eq!(after_hang(Backend::Dx12, false, false), Some(Restart::Backend("vulkan")));
-        assert_eq!(after_hang(Backend::Vulkan, false, false), Some(Restart::Backend("gl")));
-        assert_eq!(after_hang(Backend::Gl, false, false), Some(Restart::Backend(SOFTWARE_BACKEND)));
-        assert_eq!(after_hang(Backend::Dx12, true, false), None, "software: nothing to fall back to");
-        assert!(cpu_renderer_env(Some(SOFTWARE_BACKEND)), "the saved software renderer starts as such");
-        // Settings on trial: start again as it was, and the next start drops them (#4015).
-        assert_eq!(after_hang(Backend::Vulkan, false, true), Some(Restart::Again));
-        assert_eq!(after_hang(Backend::Dx12, true, true), Some(Restart::Again));
-        let note = hang_note("Dx12", false, Some("vulkan"));
-        assert!(note.contains("on Direct3D 12") && note.contains("on Vulkan") && note.contains("recovery"), "{note}");
-        assert!(hang_note("Vulkan", true, Some("gl")).contains("in safe mode"));
-        assert!(hang_note("Gl", false, Some("cpu")).contains("on the software renderer, which it keeps using"));
-    }
-
-    /// Settings tried from Preferences (#4015): the first start tries them and marks the trial
-    /// started; one that finds it started drops it and says so; safe mode leaves it waiting.
-    #[test]
-    fn graphics_settings_on_trial_are_tried_once_and_dropped_unless_kept() {
-        use serde_json::json;
-        let saved = GraphicsChoice { backend: "dx12".into(), msaa: 4 };
-        let vulkan_8x = GraphicsChoice { backend: "vulkan".into(), msaa: 8 };
-        // No file, or one without a trial: the saved settings (defaults where missing), unchanged.
-        let none = graphics_start(None, false);
-        assert_eq!(none.current(), &GraphicsChoice { backend: "auto".into(), msaa: DEFAULT_MSAA });
-        assert_eq!((none.trial, none.rewrite), (Trial::None, None));
-        let plain = graphics_start(Some(&json!({"backend": "dx12", "msaa": 16})), false);
-        assert_eq!(plain.current(), &saved, "16 isn't a sample count: the default");
-        assert_eq!(plain.rewrite, None);
-
-        // The first start tries the trial and marks it started.
-        let file = json!({"backend": "dx12", "msaa": 4, "trial": {"backend": "vulkan", "msaa": 8}});
-        let first = graphics_start(Some(&file), false);
-        assert_eq!(first.trial, Trial::Trying(vulkan_8x.clone()));
-        assert_eq!(first.current(), &vulkan_8x);
-        assert_eq!(first.saved, saved);
-        assert_eq!(first.note(), None);
-        let marked = first.rewrite.clone().unwrap();
-        assert_eq!(marked["trial"]["started"], json!(true));
-        assert_eq!((marked["backend"].clone(), marked["msaa"].clone()), (json!("dx12"), json!(4)), "the saved settings stay");
-
-        // That start never kept them (it crashed, hung, or the question timed out): the next one
-        // drops the trial, starts with the saved settings and says what happened.
-        let next = graphics_start(Some(&marked), false);
-        assert_eq!(next.trial, Trial::Failed(vulkan_8x));
-        assert_eq!(next.current(), &saved);
-        assert_eq!(next.rewrite, Some(json!({"backend": "dx12", "msaa": 4})));
-        let note = next.note().unwrap();
-        assert!(note.contains("(Vulkan, 8× anti-aliasing)") && note.contains("back to Direct3D 12, 4× anti-aliasing"), "{note}");
-        // Only what differs is named; Automatic by name.
-        let api_only = graphics_start(Some(&json!({"msaa": 4, "trial": {"backend": "gl", "started": true}})), false);
-        assert_eq!(
-            api_only.note().unwrap(),
-            "The graphics settings tried at the last start (OpenGL) weren't kept, so SolidCraft went back to Automatic."
-        );
-
-        // Safe mode leaves a trial that hasn't started for the next normal start, but still drops
-        // one that has.
-        let safe = graphics_start(Some(&file), true);
-        assert_eq!((safe.current(), &safe.trial, &safe.rewrite), (&saved, &Trial::None, &None));
-        assert!(matches!(graphics_start(Some(&marked), true).trial, Trial::Failed(_)));
-        // Every API Preferences offers is a backend the start understands.
-        for api in GRAPHICS_APIS {
-            assert!(!eframe::wgpu::Backends::from_comma_list(api).is_empty(), "{api}");
-        }
-    }
-
-    #[test]
-    fn preferences_warn_about_d3d12_only_where_it_froze_the_gpu() {
-        let with = |adapters: Vec<HardwareAdapter>| move |_: eframe::wgpu::Backends| adapters;
-        assert_eq!(apis_that_freeze(true, with(vec![AMD_IGPU])), vec!["dx12"]);
-        assert!(apis_that_freeze(true, with(vec![AMD_IGPU, NVIDIA])).is_empty(), "a graphics card besides");
-        assert!(apis_that_freeze(true, with(vec![NVIDIA])).is_empty());
-        assert!(apis_that_freeze(true, with(Vec::new())).is_empty(), "WARP alone");
-        assert!(apis_that_freeze(false, |_| panic!("only Windows has D3D12")).is_empty());
-    }
-
-    #[test]
-    fn a_crash_on_an_api_that_freezes_this_gpu_goes_back_to_automatic() {
-        let d3d12 = GraphicsChoice { backend: "dx12".into(), msaa: 1 };
-        let freezes = || vec!["dx12"];
-        assert_eq!(after_crash(&d3d12, true, freezes), Some(GraphicsChoice { backend: "auto".into(), msaa: 1 }), "anti-aliasing stays");
-        assert_eq!(after_crash(&d3d12, false, freezes), None, "no crash");
-        assert_eq!(after_crash(&d3d12, true, Vec::new), None, "D3D12 doesn't freeze this GPU");
-        let vulkan = GraphicsChoice { backend: "vulkan".into(), msaa: 4 };
-        assert_eq!(after_crash(&vulkan, true, freezes), None);
-        let auto = GraphicsChoice { backend: "auto".into(), msaa: 4 };
-        assert_eq!(after_crash(&auto, true, || panic!("Automatic isn't probed")), None);
-        assert!(launch_crashed("unclean_exit") && launch_crashed("panic"));
-        assert!(!launch_crashed("command_panic") && !launch_crashed("kernel_panic_recovered"));
-        assert!(after_crash_note("dx12").contains("on Direct3D 12"));
-    }
-
     #[test]
     fn failed_windows_backends_fall_back_in_order_and_stop_after_software() {
         use eframe::wgpu::Backends as B;
@@ -1167,7 +617,7 @@ mod tests {
                     assert_eq!(
                         choose_backends(windows, true, cpu, Some("vulkan"), |_| {
                             probed = true;
-                            Vec::new()
+                            false
                         }),
                         None
                     );
@@ -1192,7 +642,7 @@ mod tests {
     #[test]
     fn wgpu_backend_the_preference_and_the_software_renderer_override_the_order() {
         use eframe::wgpu::Backends;
-        let never = |b: Backends| -> Vec<HardwareAdapter> { panic!("no probing expected, asked about {b:?}") };
+        let never = |b: Backends| -> bool { panic!("no probing expected, asked about {b:?}") };
         // WGPU_BACKEND: wgpu reads it itself, nothing is probed.
         assert_eq!(choose_backends(true, true, false, Some("gl"), never), None);
         assert_eq!(choose_backends(true, true, true, None, never), None);
@@ -1205,7 +655,7 @@ mod tests {
         assert_eq!(choose_backends(true, false, false, Some("dx12,vulkan"), never), Some(Backends::DX12 | Backends::VULKAN));
         assert_eq!(choose_backends(false, false, false, Some("vulkan"), never), Some(Backends::VULKAN));
         // An unknown preference is the default order.
-        assert_eq!(choose_backends(true, false, false, Some("glide"), probe_with(&[Backends::DX12], &[NVIDIA])), Some(Backends::DX12));
+        assert_eq!(choose_backends(true, false, false, Some("glide"), |b| b == Backends::DX12), Some(Backends::DX12));
         // Elsewhere: wgpu's own choice.
         assert_eq!(choose_backends(false, false, false, None, never), None);
         assert_eq!(choose_backends(false, false, false, Some("auto"), never), None);
@@ -1218,10 +668,10 @@ mod tests {
         // D3D12 never loads its OpenGL driver into the test process, and AMD's (`atio6axx.dll`)
         // aborted the process as it exited (#1156).
         if cfg!(target_os = "windows") {
-            let _ = choose_backends(true, false, false, None, hardware_adapters);
+            let _ = choose_backends(true, false, false, None, has_hardware_adapter);
         } else {
             for b in WINDOWS_ORDER {
-                let _ = hardware_adapters(b);
+                let _ = has_hardware_adapter(b);
             }
         }
     }

assets/locales/ar.json

@@ -744,22 +744,22 @@
   "ai.prefs.availability": "التوفر",
   "ai.prefs.background_commands": "تشغيل الأوامر البطيئة في الخلفية",
   "ai.prefs.connect_apps": "إضافة SolidCraft إلى تطبيقات الذكاء الاصطناعي",
-  "ai.prefs.connect_apps_note": "إيقافه يزيل الإدخالات مجددًا.\n\nعند بدء تشغيل SolidCraft، يُضاف كخادم MCP إلى تطبيقات الذكاء الاصطناعي الموجودة على هذا الحاسوب (OpenCode وClaude Desktop وClaude Code وCursor وCodex وGemini CLI وCopilot CLI وWindsurf وZed وVS Code)، ليتمكن الوكيل من استخدامه دون أي إعداد. لا يُضاف إلا مُدخل solidcraft أو يُحدَّث مساره؛ ويُترك المُدخل الذي غيّرته كما هو، ويُنسخ الملف احتياطيًا أولًا. عند الإيقاف تُزال المُدخلات التي أضافها. الأمر «المساعدة > ربط مساعدي الذكاء الاصطناعي…» يفعل ذلك يدويًا.",
+  "ai.prefs.connect_apps_note": "إيقافه يزيل الإدخالات مجدداً.\n\nعند بدء تشغيل SolidCraft، يُضاف كخادم MCP إلى تطبيقات الذكاء الاصطناعي الموجودة على هذا الحاسوب (OpenCode وClaude Desktop وClaude Code وCursor وCodex وGemini CLI وCopilot CLI وWindsurf وZed وVS Code)، ليتمكن الوكيل من استخدامه دون أي إعداد. لا يُضاف إلا مُدخل solidcraft أو يُحدَّث مساره؛ ويُترك المُدخل الذي غيّرته كما هو، ويُنسخ الملف احتياطيًا أولًا. عند الإيقاف تُزال المُدخلات التي أضافها. الأمر «المساعدة > ربط مساعدي الذكاء الاصطناعي…» يفعل ذلك يدويًا.",
   "ai.prefs.connect_at_start": "توصيل آخر وكيل عند البدء",
   "ai.prefs.connect_at_start_note": "يبدأ في الخلفية الوكيل الذي اتصلت به آخر مرة (أو الوكيل الافتراضي) في كل مرة يبدأ فيها SolidCraft، ليكون جاهزًا للمحادثة. لا يحدث ذلك عند بدء SolidCraft مع --control. إذا تعذّر الاتصال، يعرض المساعد «فشل الاتصال» وزر «إعادة المحاولة».",
-  "ai.prefs.follow_camera": "تتبّع الكاميرا",
+  "ai.prefs.follow_camera": "اتباع الكاميرا",
   "ai.prefs.follow_camera_off": "تتبّع الكاميرا التلقائي متوقف.",
   "ai.prefs.follow_camera_on": "تتجه الكاميرا نحو الرسومات التي ينشئها الوكيل.",
   "ai.prefs.intro": "وكلاء الذكاء الاصطناعي في SolidCraft.",
-  "ai.prefs.make_default": "تعيين افتراضيًا",
+  "ai.prefs.make_default": "تعيين كافتراضي",
   "ai.prefs.no_agents": "لا يوجد وكلاء بعد. أضف وكيلًا أو حدّث القائمة للعثور على الوكلاء المثبّتين.",
   "ai.prefs.no_saved_approvals": "لا توجد موافقات محفوظة.",
   "ai.prefs.open_at_start": "فتح المحادثة عند البدء",
   "ai.prefs.open_at_start_note": "يعرض لوحة المساعد (أو نافذتها المستقلة) في كل مرة يبدأ فيها SolidCraft. لا يحدث ذلك عند بدء SolidCraft مع --control.",
   "ai.prefs.override_all_warning": "قد يحفظ هذا الوكيل التصميم أو يكتب فوقه أو يصدّره أو يستبدله دون أن يسأل.",
-  "ai.prefs.permission_all": "تنفيذ كل شيء",
-  "ai.prefs.permission_all_summary": "لا يسأل أبدًا",
-  "ai.prefs.permission_ask": "السؤال أولًا",
+  "ai.prefs.permission_all": "فعل كل شيء",
+  "ai.prefs.permission_all_summary": "لا يسأل أبداً",
+  "ai.prefs.permission_ask": "السؤال أولاً",
   "ai.prefs.permission_ask_summary": "يسأل عن كل تغيير",
   "ai.prefs.permission_edits": "إجراء تعديلات",
   "ai.prefs.permission_edits_summary": "يعدّل بحرية ويسأل عن الباقي",
@@ -1396,9 +1396,6 @@
   "dialog.custom_axis": "↖ محور مخصص",
   "dialog.dimension_insert_hint": "انقر على بُعد قائد آخر لإدراج اسمه",
   "dialog.dimension_name": "البُعد: {name}",
-  "dialog.dimension_step_down": "إنقاص بمقدار {step}",
-  "dialog.dimension_step_expression": "يتغير الرقم فقط بالخطوات؛ يبقى التعبير كما كُتب",
-  "dialog.dimension_step_up": "زيادة بمقدار {step}",
   "dialog.edit_title": "تعديل {title}",
   "dialog.no_shown_body": "لا يوجد جسم ظاهر لتغييره: أظهر جسمًا، أو اختر «جسم جديد»",
   "dialog.pattern_sketch_not_object": "اختر أجسامًا أو ميزات: الرسم ليس أيًّا منهما. كرّر منحنياته بأداة النمط أو المرآة داخل الرسم، أو ابثقه أولًا.",
@@ -1406,7 +1403,6 @@
   "dialog.selected_count": "↖ {count} محدد",
   "dialog.selection_constraint": "قيد {id}",
   "dialog.selection_external_curve": "{sketch} · منحنى {id}",
-  "dialog.selection_external_point": "{point} · {sketch}",
   "dialog.selection_guidance": "حدد مُدخلًا لتغييره. انقر على العناصر المحددة لإزالتها؛ Ctrl/Cmd مع النقر يبدّل تحديدها أيضًا. راجع المعاينة ثم اضغط موافق.",
   "dialog.selection_midpoint": "نقطة المنتصف · {id}",
   "dialog.selection_profile": "{sketch} · مقطع {number}",
@@ -1424,7 +1420,6 @@
   "document.read_only_save": "فُتح هذا التصميم للقراءة فقط: احفظه كملف جديد",
   "document.save_changes": "حفظ التغييرات على {name}؟",
   "document.save_copy": "حفظ نسخة…",
-  "document.tab_unsaved_changes": "تغييرات غير محفوظة",
   "document.unsaved_changes": "في {name} تغييرات غير محفوظة. إن لم تحفظها فستضيع.",
   "drive.rigid": "{joint} مفصل صلب: يثبّت أجزاءه في مكانها، لذا لا يوجد ما يمكن تحريكه. لتتحرك الأجزاء، غيّر نوعه في «تعديل المفصل»: «دوراني» للدوران، «منزلق» للانزلاق، «أسطواني» لكليهما.",
   "drive.stopped_by_contact": "توقف عند {value}: سيخترق {a} الجسم {b}",
@@ -1923,7 +1918,7 @@
   "joint.limit_loop": "{side} {value}: لا يمكن لحلقة مغلقة أن تنغلق بعده",
   "joint.limit_range": "{side}: لا تلامس ضمن {range}، تُرك كما كان",
   "joint.limit_turn": "{side} {value}: لا تلامس ضمن دورة واحدة",
-  "joint.limits_overlapping": "متداخلة بالفعل هنا: {pairs}. لا توقف البحث إلا إذا ازداد تداخلها.",
+  "joint.limits_overlapping": "متداخلة بالفعل هنا: {pairs}. لا توقف البحث إلا إذا تداخلت أعمق.",
   "joint.one_body": "كلا الاختيارين على {body}. اختر الثاني على قطعة أخرى.",
   "joint.one_component": "هذه القطع أجسام لمكوّن واحد: {bodies}. المفصل يحرّك مكوّنًا مقابل آخر، لذا تحتاج كل قطعة إلى مكوّن خاص بها.",
   "joint.rigid_group_one_component": "هذه الأجسام وعددها {count} كلها في مكوّن واحد (أو في التصميم نفسه): استخدم {command} أولًا.",
@@ -1938,7 +1933,7 @@
   "joint_move.fine": "الخطوة بعيدًا عن المحور",
   "joint_move.fixed": "لا يملك هذا الجزء محور مفصل قابلًا للحركة.",
   "joint_move.help": "تحريك — اسحب سهمًا أو قوسًا. يلغى السحب الحالي بمفتاح Esc.",
-  "joint_move.legacy_hint": "عند الإيقاف: لوحة التحريك السابقة.",
+  "joint_move.legacy_hint": "إيقاف: لوحة التحريك السابقة.",
   "joint_move.precision": "اسحب خارج الدليل المتقطع للخطوة الدقيقة.",
   "joint_move.rotation": "الدوران من نقطة البداية",
   "joint_move.select": "اختر وجهًا أو جزءًا واحدًا من التجميع، ثم اختر تحريك.",
@@ -2004,7 +1999,6 @@
   "material.selection.mixed": "مواد مختلفة",
   "measure.at": "عند",
   "measure.item": "العنصر {number}",
-  "measure.line_to_centre": "من الخط إلى المركز",
   "measure.quick_copied": "تم نسخ القياس",
   "measure.quick_copy": "انقر لنسخ القياس",
   "measure.quick_edges": "{count} حواف",
@@ -2246,7 +2240,7 @@
   "prefs.anti_aliasing_amd_dx12": "يستخدم تنعيم الحواف 1× لأن فحص بدء التشغيل لم يرسم شيئًا مع أخذ العينات المتعددة ونجح عند 1×. يمكنك اختيار إعداد آخر أعلاه؛ أعد التشغيل لتطبيقه إن نجح الفحص.",
   "prefs.anti_aliasing_note": "ينعّم الحواف المسننة.",
   "prefs.appearance.colour_vision_help": "يغيّر الألوان ذات الدلالة: حالات الرسم والمحاور والثنيات والتحليلات والأيقونات.",
-  "prefs.appearance.desktop_only": "لتطبيق سطح المكتب فقط",
+  "prefs.appearance.desktop_only": "لسطح المكتب فقط",
   "prefs.appearance.follow_help": "يعيد التحميل عندما تعيد أداة أخرى كتابة الملف.",
   "prefs.appearance.interface_scale": "مقياس الواجهة",
   "prefs.appearance.next_themes": "السمات التالية",
@@ -2256,11 +2250,11 @@
   "prefs.appearance.theme_count": "{count} سمات",
   "prefs.appearance.theme_own": "ألوان السمة",
   "prefs.appearance.viewport_colours": "ألوان العرض ثلاثي الأبعاد",
-  "prefs.appearance.viewport_logo": "منطقة العرض والشعار",
+  "prefs.appearance.viewport_logo": "منفذ العرض والشعار",
   "prefs.applies_on_restart": "يُطبَّق عند إعادة التشغيل",
   "prefs.assistant": "المساعد",
   "prefs.assistant_connecting": "الاتصال",
-  "prefs.assistant_follow_help": "النظر إلى الرسومات يحرّك العرض مع المؤشر.",
+  "prefs.assistant_follow_help": "تحرّك عروض Look At للرسم المنظور مع المؤشر.",
   "prefs.assistant_limit": "الحد",
   "prefs.assistant_limited": "محدود",
   "prefs.assistant_pointer_speed": "سرعة المؤشر",
@@ -2268,21 +2262,13 @@
   "prefs.assistant_seconds_aria": "الثواني",
   "prefs.assistant_use_care": "استخدم بحذر",
   "prefs.auto_operation": "اختيار العملية تلقائيًا",
-  "prefs.auto_operation_note": "ضم أو جسم جديد أو قص، حسب ما تلامسه المادة.",
+  "prefs.auto_operation_note": "ضم أو جسم جديد أو قطع، حسب ما تلامسه المادة.",
   "prefs.axes": "المحاور",
   "prefs.axis": "المحور",
-  "prefs.blur_cost": "تكلفة العرض النسبية. زيادة الأشرطة تعني عادةً مزيدًا من العمل.",
-  "prefs.blur_device": "غير متاح على جهاز الرسوميات أو مسار العرض هذا",
-  "prefs.blur_guard": "خُفّضت جودة التمويه للحفاظ على استجابة الإطارات. لم يتغير نصف القطر.",
-  "prefs.blur_off": "إيقاف",
-  "prefs.blur_reduce_transparency": "معطّل بسبب إعداد تقليل الشفافية في النظام",
-  "prefs.blur_software": "غير متاح مع الرسوميات البرمجية (gpu-software)",
-  "prefs.blur_source": "غير متاح في عرض مساحة العمل هذا",
-  "prefs.blur_web": "غير متاح في مسار عرض الويب هذا",
   "prefs.bodies_folders": "مجلدات الأجسام",
   "prefs.bodies_folders_always": "دائمًا",
   "prefs.bodies_folders_never": "أبدًا",
-  "prefs.bodies_folders_several": "عند التعدد",
+  "prefs.bodies_folders_several": "عدة",
   "prefs.bottom": "أسفل",
   "prefs.bottom_centre": "أسفل الوسط",
   "prefs.bottom_right": "أسفل اليمين",
@@ -2337,13 +2323,6 @@
   "prefs.dialogs_edge": "عند حافة العرض",
   "prefs.dialogs_left_column": "في العمود الأيسر",
   "prefs.dialogs_note": "مكان فتح حوارات الأوامر: مثبتة عند حافة العرض، أو في العمود الأيسر مكان المستعرض والسجل، اللذين يعودان كما كانا عند إغلاق الحوار.",
-  "prefs.dimension_step_angle": "ما تضيفه أسهم النافذة وأعلى/أسفل والعجلة إلى الزاوية",
-  "prefs.dimension_step_length": "ما تضيفه أسهم النافذة وأعلى/أسفل والعجلة إلى الطول",
-  "prefs.dimension_steps": "خطوات النافذة",
-  "prefs.dimension_values": "قيم الأبعاد",
-  "prefs.dimension_values_note": "مكان كتابة قيمة البعد. للنافذة أسهم تغيّرها بخطوات؛ تضع أداة البعد النص أولًا.",
-  "prefs.dimension_values_view": "في العرض",
-  "prefs.dimension_values_window": "في نافذة",
   "prefs.display": "العرض",
   "prefs.edges": "الحواف والتظليل",
   "prefs.extend": "توسيع",
@@ -2381,7 +2360,7 @@
   "prefs.graphics_note": "وازن بين السرعة والنعومة. كل خيار يعرض أثره على عيّنة.",
   "prefs.graphics_page.current_view": "العرض الحالي",
   "prefs.graphics_page.fastest": "الأسرع",
-  "prefs.graphics_page.fold_items": "تلخيص العناصر",
+  "prefs.graphics_page.fold_items": "طي العناصر",
   "prefs.graphics_page.in_view": "داخل العرض",
   "prefs.graphics_page.live_details": "تفاصيل مباشرة",
   "prefs.graphics_page.own_mix": "مزيجك الخاص",
@@ -2390,7 +2369,7 @@
   "prefs.graphics_page.restart": "تلزم إعادة التشغيل",
   "prefs.graphics_page.sharpest": "الأكثر وضوحًا",
   "prefs.graphics_page.single_surface_analysis": "تحليل سطح واحد",
-  "prefs.graphics_page.status_chips": "شارات الحالة",
+  "prefs.graphics_page.status_chips": "شرائح الحالة",
   "prefs.graphics_page.subtitle": "وازن بين السرعة والنعومة.",
   "prefs.graphics_page.supersampling": "التنعيم الفائق",
   "prefs.graphics_page.supersampling_adaptive": "فقط أثناء سكون العرض",
@@ -2437,7 +2416,7 @@
   "prefs.layout_page.icons_labels": "الأيقونات + التسميات",
   "prefs.layout_page.ok_cancel": "موافق وإلغاء",
   "prefs.layout_page.on_hover": "عند مرور المؤشر",
-  "prefs.layout_page.open": "تُفتح",
+  "prefs.layout_page.open": "فتح",
   "prefs.layout_page.origin_bodies": "الأصل والأجسام في الأعلى",
   "prefs.layout_page.panels": "اللوحات",
   "prefs.layout_page.pinned_menus": "استبعاد الأوامر المثبتة من القوائم",
@@ -2477,8 +2456,8 @@
   "prefs.navigation.cube_compact": "المكعب",
   "prefs.navigation.device": "الجهاز",
   "prefs.navigation.free": "حر",
-  "prefs.navigation.orbit_style": "نمط التدوير",
-  "prefs.navigation.radial_help": "اضغط مطولًا أو انقر سريعًا بالزر الأيمن لعرض حلقة من الأدوات.",
+  "prefs.navigation.orbit_style": "نمط الدوران",
+  "prefs.navigation.radial_help": "اضغط مطولاً أو انقر سريعاً بالزر الأيمن لعرض حلقة من الأدوات.",
   "prefs.navigation.turntable": "طاولة دوارة",
   "prefs.navigation_note": "كيف تحرك الفأرة ولوحة اللمس والفأرة ثلاثية الأبعاد العرض.",
   "prefs.navigator_fit": "ملاءمة النموذج بعد تغيير العرض من متصفح العرض",
@@ -2496,7 +2475,7 @@
   "prefs.origin_plane_names_note": "الأسماء المعروضة في المستعرض والحوارات والقوائم. {top} هو XY و{front} هو XZ و{right} هو YZ، والمحور Z للأعلى. تحتفظ الأوامر والسكربتات والتصاميم المحفوظة بـ XY وXZ وYZ.",
   "prefs.overall_speed": "السرعة العامة",
   "prefs.parameter_list_rows": "صفوف قائمة المعاملات",
-  "prefs.parameter_list_rows_tip": "الحد الأقصى للمعاملات التي يسردها السهم لأسفل في مربع تعبير فارغ.",
+  "prefs.parameter_list_rows_tip": "الحد الأقصى للمعلمات التي يسردها السهم لأسفل في مربع تعبير فارغ.",
   "prefs.persistent_ribbon_pressed": "تمييز أوامر الشريط النشطة",
   "prefs.persistent_ribbon_pressed_help": "تمييز أوامر الشريط أثناء تفعيل تأثيراتها. أوقف هذا الخيار للاحتفاظ بالمظهر المحايد السابق ومساعدة الأوامر.",
   "prefs.perspective_fov": "مجال الرؤية",
@@ -2565,16 +2544,16 @@
   "prefs.shortcuts_import": "استيراد",
   "prefs.shortcuts_intro": "مفاتيح كل أمر.",
   "prefs.shortcuts_not_assigned": "غير معيّن",
-  "prefs.shortcuts_press": "اضغط مفتاحًا...",
+  "prefs.shortcuts_press": "اضغط مفتاحاً...",
   "prefs.single_surface_analysis": "استخدام تحليل سطح واحد",
   "prefs.single_surface_analysis_help": "عند إيقاف هذا الخيار، يمكن إبقاء تظليل السطح وتحليل الاستمرارية مفعّلين معًا. عند تشغيله، يبقى آخر تحليل تم بدؤه أو تغييره فقط.",
   "prefs.sketch.align_points": "المحاذاة مع نقاط الرسم الأخرى",
   "prefs.sketch.align_points_note": "تتحاذى الخطوط أثناء الرسم مع النقاط على المحورين معًا.",
   "prefs.sketch.auto_dimensions": "إضافة كل الأبعاد للأشكال الجديدة",
   "prefs.sketch.auto_dimensions_note": "القيم المدخلة وكل بُعد يثبّت الشكل.",
-  "prefs.sketch.auto_locate": "تحديد الموضع من أصل الرسم",
+  "prefs.sketch.auto_locate": "التحديد انطلاقًا من أصل الرسم",
   "prefs.sketch.auto_locate_note": "مع إضافة كل الأبعاد.",
-  "prefs.sketch.center_arc": "القوس بنقطة مركز يتبع المؤشر",
+  "prefs.sketch.center_arc": "قوس المركز يتبع المؤشر",
   "prefs.sketch.click_selects": "النقر يحدد",
   "prefs.sketch.conflict_colour": "لون التعارض",
   "prefs.sketch.drawing": "الرسم",
@@ -2589,7 +2568,7 @@
   "prefs.sketch.prefer_free_points": "تفضيل النقاط القابلة للتحريك عند تداخلها",
   "prefs.sketch.project_options": "السؤال عن خيارات الإسقاط أولًا",
   "prefs.sketch.recent_snap": "الالتقاط عند تقاطع دليلين",
-  "prefs.sketch.select_other_hidden": "تحديد آخر يشمل الهندسة المخفية",
+  "prefs.sketch.select_other_hidden": "اختيار آخر يشمل الهندسة المخفية",
   "prefs.sketch.shortcut_cycles_modes": "الاختصار مجددًا يبدّل الوضع",
   "prefs.sketch.shortcut_cycles_modes_tip": "عند الإيقاف: تبدأ الأداة مجددًا.",
   "prefs.sketch.snapping_guides": "الالتقاط والأدلة",
@@ -2671,10 +2650,6 @@
   "prefs.theme_follow_off": "إيقاف",
   "prefs.theme_follow_stop": "إيقاف الاتباع",
   "prefs.theme_import_hint": "انقر لاختيار ملف سمة، أو أفلت ملفًا هنا، أو اضغط Ctrl+V (Cmd+V على Mac) بعد نسخ سمة",
-  "prefs.theme_notice_dismiss": "إخفاء",
-  "prefs.theme_option_blur": "تمويه خلف اللوحات",
-  "prefs.theme_option_blur_help": "تمويه خلف اللوحات شبه الشفافة، بالبكسل الفعلي. الصفر يوقف التمويه.",
-  "prefs.theme_option_invalid": "القيمة المحفوظة للخيار {option} غير صالحة؛ تُستخدم القيمة الافتراضية للسمة. تبقى القيمة المحفوظة كما هي.",
   "prefs.theme_option_opacity": "العتامة",
   "prefs.theme_option_opacity_help": "اضبط عتامة اللوحات العائمة. يُطبّق حد أدنى للعتامة للحفاظ على وضوح النص فوق ألوان منطقة العرض.",
   "prefs.theme_option_tab_colours": "ألوان علامات التبويب",
@@ -2683,7 +2658,6 @@
   "prefs.theme_option_tab_fade_ms_help": "تتغيّر ألوان اللوحات ومنطقة العرض تدريجيًا عند تبديل علامات التبويب. القيمة صفر تبدّلها فورًا.",
   "prefs.theme_options_badge": "الخيارات",
   "prefs.theme_options_more": "المزيد · {count}",
-  "prefs.theme_options_newer": "تتطلب هذه السمة إصدارًا أحدث من SolidCraft. بعد الترقية، أعد استيراد السمة الأصلية لاستعادة تعريفات خياراتها.",
   "prefs.theme_options_reset": "إعادة تعيين",
   "prefs.theme_options_unavailable": "غير متاح على هذا الجهاز",
   "prefs.theme_paste": "لصق السمة",
@@ -2712,7 +2686,7 @@
   "prefs.validation.each_step": "بعد كل خطوة",
   "prefs.validation.label": "فحص النواة الكامل",
   "prefs.validation.off": "متوقف (تجريبي)",
-  "prefs.validation_note": "بعد كل خطوة: يفحص كل عملية كنس وعملية منطقية وتقويس.\nمرة لكل ميزة: يفحص ناتج كل ميزة مرة واحدة.\nمتوقف (تجريبي): لا فحص.",
+  "prefs.validation_note": "بعد كل خطوة: يفحص كل عملية سحب ودمج وتقويس.\nمرة لكل ميزة: يفحص ناتج كل ميزة مرة واحدة.\nمتوقف (تجريبي): لا فحص.",
   "prefs.value_boxes_in_view": "إظهار القيم بجانب مقابضها",
   "prefs.value_boxes_in_view_tip": "مسافة البثق ونصف قطر التدوير... في مربع داخل العرض.",
   "prefs.view": "سلوك العرض",
@@ -4227,13 +4201,13 @@
   "thread.automatic_size": "حجم تلقائي",
   "thread.chamfer_depth_needed": "مطلوب لهذا الشكل",
   "thread.designation": "التسمية",
-  "thread.drill_range": "مثقاب التسنين الذي يوصي به صانعو ذكور التسنين {drill} مم. القطر الأصغر القياسي للسن الداخلي {minor} مم. يُقبل مثقاب من {low} إلى {high} مم.",
+  "thread.drill_range": "مثقاب صانع اللقمة {drill} مم. القطر الأصغر القياسي للسن الداخلي {minor} مم. يُقبل مثقاب من {low} إلى {high} مم.",
   "thread.drill_range_custom": "المثقاب هو القطر الأكبر ناقص الخطوة، {drill} مم. القطر الأصغر القياسي للسن الداخلي {minor} مم. يُقبل مثقاب من {low} إلى {high} مم.",
-  "thread.drill_range_taper": "مثقاب التسنين الذي يوصي به صانعو ذكور التسنين {drill} مم. القطر الأصغر القياسي عند نهاية السن {minor} مم. يُقبل مثقاب من {low} إلى {high} مم.",
+  "thread.drill_range_taper": "مثقاب صانع اللقمة {drill} مم. القطر الأصغر القياسي عند نهاية السن {minor} مم. يُقبل مثقاب من {low} إلى {high} مم.",
   "thread.end_square": "قائمة",
   "thread.fade_short": "1.25 P (ISO 3508)",
   "thread.fade_standard": "2.5 P (ISO 3508)",
-  "thread.fits_the_face": "يناسب الوجه، مثلًا {example}",
+  "thread.fits_the_face": "يناسب الوجه، مثلاً {example}",
   "thread.form_bspp": "سن أنابيب G (ISO 228-1)",
   "thread.form_bspt": "سن أنابيب مخروطي R، Rc (ISO 7-1)",
   "thread.form_npt": "سن أنابيب مخروطي NPT (ASME B1.20.1)",
@@ -4490,7 +4464,7 @@
   "ui.agent_chat_no_images": "هذا الوكيل لا يقبل الصور",
   "ui.agent_chat_no_picture": "لا توجد صورة في الحافظة",
   "ui.agent_chat_no_tool_call": "لم يستخدم النموذج أدوات SolidCraft، لذا لم يتغيّر التصميم. اختر نموذجًا يدعم استدعاء الأدوات؛ راجع «النماذج المحلية» في دليل محادثة الوكيل.",
-  "ui.agent_chat_node_too_old": "إصدار Node.js {version} قديم جدًا لهذا الوكيل. ثبّت Node.js 20.10 أو أحدث، ثم اضغط تحديث.",
+  "ui.agent_chat_node_too_old": "إصدار Node.js ‏{version} قديم جدًا لهذا الوكيل. ثبّت Node.js 20.10 أو أحدث، ثم اضغط على تحديث.",
   "ui.agent_chat_none_found": "لم يُعثر على وكيل برمجي. ثبّت أحد هذه ثم اضغط تحديث:",
   "ui.agent_chat_none_found_short": "لم يُعثر على وكيل",
   "ui.agent_chat_not_installed": "غير مثبت",
@@ -4531,7 +4505,7 @@
   "ui.agent_chat_send_now_tip": "إيقاف خطوة الوكيل الحالية وإرسال هذه بعدها (Ctrl+Enter)",
   "ui.agent_chat_setup_body": "يتواصل SolidCraft مع وكيل برمجة مثبّت على هذا الحاسوب. اختر واحدًا من التفضيلات › الوكيل.",
   "ui.agent_chat_setup_title": "إعداد مساعد",
-  "ui.agent_chat_side": "تثبيت المحادثة",
+  "ui.agent_chat_side": "إرساء المحادثة",
   "ui.agent_chat_signed_in": "سجّل الدخول",
   "ui.agent_chat_state_auth": "يلزم تسجيل الدخول",
   "ui.agent_chat_state_busy": "جارٍ العمل…",
@@ -4596,10 +4570,10 @@
   "ui.ai_key_note": "يُخزّن في سلسلة مفاتيح النظام، وليس في إعدادات SolidCraft أبدًا. اتركه فارغًا لخادم محلي.",
   "ui.ai_keychain_error": "رفضت سلسلة مفاتيح النظام: {error}",
   "ui.ai_kind": "النوع",
-  "ui.ai_mode_all": "تنفيذ كل شيء",
+  "ui.ai_mode_all": "فعل كل شيء",
   "ui.ai_mode_all_note": "لا شيء يسأل أولًا. تبقى تقارير الأعطال محظورة وتظل حدود المجلدات سارية.",
   "ui.ai_mode_all_warning": "يمكن للوكيل حفظ تصميمك والكتابة فوقه وتصديره واستبداله دون سؤال. استخدم هذا فقط مع وكيل تثق به، وعلى تصاميم حفظتها.",
-  "ui.ai_mode_ask": "السؤال أولًا",
+  "ui.ai_mode_ask": "السؤال أولاً",
   "ui.ai_mode_ask_note": "كل تغيير في التصميم وكل إجراء على الملفات ينتظر سماحك.",
   "ui.ai_mode_edits": "إجراء تعديلات",
   "ui.ai_mode_edits_note": "أوامر النمذجة تعمل دون سؤال؛ أما الحفظ والفتح والتصدير وإجراءات الملفات أو الإجراءات الهدّامة الأخرى فتسأل.",
@@ -4770,21 +4744,21 @@
   "ui.construction.ribbon_label": "خطوط مساعدة",
   "ui.construction.side_hint": "خط إنشائي: انقر الجهة التي يمتد نحوها الخط؛ انقر بزر الفأرة الأيمن للبدء من جديد",
   "ui.context_menu": "القائمة السياقية",
-  "ui.continuity_crease": "ثنية",
+  "ui.continuity_crease": "تجعّد",
   "ui.continuity_curvature": "الانحناء",
   "ui.continuity_curvature_change": "تغيّر الانحناء",
   "ui.continuity_curvature_change_tip": "تغيّر الانحناء (G3): يتغير الانحناء أيضًا بسلاسة عبر خط الالتقاء.",
   "ui.continuity_curvature_tip": "متصل الانحناء (G2): تمر الانعكاسات دون انكسار.",
-  "ui.continuity_g0": "G0 ثنية",
+  "ui.continuity_g0": "G0 تجعّد",
   "ui.continuity_g1": "G1 مماس",
   "ui.continuity_g2": "G2 انحناء",
   "ui.continuity_gap": "فجوة",
   "ui.continuity_position": "الموضع",
-  "ui.continuity_position_tip": "الموضع (G0): تلتقي الأسطح، مع ثنية عند التقائها.",
+  "ui.continuity_position_tip": "الموضع (G0): تلتقي الأسطح، مع تجعّد عند التقائها.",
   "ui.continuity_smooth_curvature_change": "تغيّر انحناء سلس",
   "ui.continuity_smooth_curvature_change_tip": "تغيّر انحناء سلس (G4): حتى طريقة تغيّر الانحناء تستمر بسلاسة عبر خط الالتقاء.",
   "ui.continuity_tangent": "مماس",
-  "ui.continuity_tangent_tip": "مماس (G1): لا ثنية، لكن الانحناء يقفز عبر خط الالتقاء.",
+  "ui.continuity_tangent_tip": "مماس (G1): لا تجعّد، لكن الانحناء يقفز عبر خط الالتقاء.",
   "ui.copy": "نسخ",
   "ui.copy_details": "نسخ التفاصيل",
   "ui.copy_details_tip": "انسخ الرسالة كاملة للبحث عنها أو للإبلاغ عنها.",
@@ -4810,7 +4784,6 @@
   "ui.default_modelling_orientation": "اتجاه النمذجة الافتراضي",
   "ui.delete": "حذف",
   "ui.delete_select_first": "حدّد أولًا ما تريد حذفه: الميزات أو الأجسام أو المكوّنات أو هندسة الرسم",
-  "ui.dependents_select_first": "حدّد أولًا ما تريد سرد معتمداته",
   "ui.depth": "العمق",
   "ui.design": "التصميم",
   "ui.design_properties.author": "المؤلف",
@@ -4936,7 +4909,7 @@
   "ui.extract_done": "أصبح المكوّن تصميمًا مستقلًا، مرتبطًا هنا.",
   "ui.extrude": "بثق",
   "ui.extrude_auto_to_object": "البثق إلى هدف مختار",
-  "ui.extrude_auto_to_object_tip": "وجه أو رأس أو مستوى موازٍ يغيّر الامتداد إلى «إلى كائن».",
+  "ui.extrude_auto_to_object_tip": "وجه أو رأس أو مستوى موازٍ يغيّر المدى إلى «إلى كائن».",
   "ui.factor": "المعامل",
   "ui.fade": "تلاشٍ",
   "ui.fade_length": "طول التلاشي",
@@ -4966,13 +4939,9 @@
   "ui.fillet_setback": "مسافة الإرجاع",
   "ui.fillet_setback_hint": "{factor} × نصف القطر",
   "ui.fillet_setback_least": "أكثر من {least}",
-  "ui.fillet_setback_tip": "حيث تبدأ رقعة الزاوية الناعمة: المسافة على طول كل حافة من الزاوية. الافتراضي {factor} ضعف نصف القطر. يجب أن تكون أكبر من أقل مسافة إرجاع، وهي التي تلتقي عندها التقويسات دون إرجاع: نصف القطر حين تكون الأوجه متعامدة.",
+  "ui.fillet_setback_tip": "حيث تبدأ رقعة الزاوية الناعمة: المسافة على طول كل حافة من الزاوية. الافتراضي {factor} ضعف نصف القطر. يجب أن تكون أكبر من أقل مسافة إرجاع، حيث تلتقي الاستدارات بدونها: نصف القطر حيث تكون الأوجه متعامدة.",
   "ui.fillet_smooth_radius": "تغيّر ناعم لنصف القطر",
-  "ui.fillet_turn": "الالتفاف",
-  "ui.fillet_turn_mitre": "وصلة مائلة",
-  "ui.fillet_turn_swept": "ملتف",
-  "ui.fillet_turn_tip": "حيث يلتف تقويسان حول حافة ركن حادة بينهما، مثل التقويسات على قاعدة نتوء عند حوافه القائمة.\nوصلة مائلة: يمتد التقويسان حتى يلتقيا في وصلة مائلة.\nملتف: يتوقف التقويسان عند حافة الركن ويلتفان حولها، والركن طارة مماسة لكليهما. فقط لتقويسين بنصف قطر واحد حول حافة ركن مستقيمة ومحدبة.",
-  "ui.fillet_type_choices_tip": "نصف قطر ثابت: نصف قطر واحد على طول الحافة.\nطول الوتر: يبقى عرض التقويس نفسه مهما كانت الزاوية بين الوجوه.\nنصف قطر متغيّر: نصف قطر عند كل طرف، ومزيد على طول الحافة إن أضفته.\nمتصل الانحناء: مقطع بلا انكسار في الانعكاسات حيث يلتقي بالوجوه المستوية (G2).\nمنحنى شريحي: يتبع نصف القطر على طول الحافة أنصاف أقطار تحكّم تحدّدها.",
+  "ui.fillet_type_choices_tip": "نصف قطر ثابت: نصف قطر واحد على طول الحافة.\nطول الوتر: يبقى عرض التقويس نفسه مهما كانت الزاوية بين الوجوه.\nنصف قطر متغيّر: نصف قطر عند كل طرف، ومزيد على طول الحافة إن أضفته.\nمتصل الانحناء: مقطع بلا انكسار في الانعكاسات حيث يلتقي بالوجوه المستوية (G2).\nمنحنى: يتبع نصف القطر على طول الحافة أنصاف أقطار تحكّم تحدّدها.",
   "ui.fillet_type_curvature": "متصل الانحناء",
   "ui.fillet_type_tip": "المقطع عبر الحافة. متصل الانحناء: مقطع متصل الانحناء (G2) بين وجوه مستوية، فتمر الانعكاسات من الوجوه إلى التقويس دون انكسار.",
   "ui.filter_commands_or_keys": "تصفية الأوامر أو المفاتيح",
@@ -5084,7 +5053,7 @@
   "ui.hidePlanes": "إخفاء المستويات",
   "ui.hideProfile": "إخفاء المقطع",
   "ui.hide_component_history": "إخفاء سجله",
-  "ui.hide_origin_by_default": "إخفاء مجلد نقطة الأصل في التصاميم الجديدة",
+  "ui.hide_origin_by_default": "إخفاء مجلد الأصل في التصاميم الجديدة",
   "ui.hide_origin_note": "تبدأ التصاميم الجديدة ومجلد نقطة الأصل مخفي. يحتفظ كل تصميم بإعداد نقطة الأصل الخاص به بمجرد إظهارها أو إخفائها.",
   "ui.history_back": "الرجوع خطوة",
   "ui.history_below_browser": "أسفل المستعرض",

assets/locales/de.json

@@ -1391,9 +1391,6 @@
   "dialog.custom_axis": "↖ Eigene Achse",
   "dialog.dimension_insert_hint": "Doppelklicken Sie auf eine andere steuernde Bemaßung, um ihren Namen einzufügen",
   "dialog.dimension_name": "Bemaßung: {name}",
-  "dialog.dimension_step_down": "Um {step} verringern",
-  "dialog.dimension_step_expression": "Nur eine Zahl lässt sich schrittweise ändern; ein Ausdruck bleibt, wie er eingegeben ist",
-  "dialog.dimension_step_up": "Um {step} erhöhen",
   "dialog.edit_title": "{title} bearbeiten",
   "dialog.no_shown_body": "Kein sichtbarer Körper zum Ändern vorhanden. Blenden Sie einen Körper ein oder wählen Sie „Neuer Körper“.",
   "dialog.pattern_sketch_not_object": "Körper oder Funktionen wählen: Eine Skizze ist keines von beiden. Ihre Kurven mit Muster oder Spiegeln in der Skizze wiederholen oder sie zuerst extrudieren.",
@@ -1418,7 +1415,6 @@
   "document.read_only_save": "Dieses Design wurde schreibgeschützt geöffnet: Speichern Sie es als neue Datei",
   "document.save_changes": "Änderungen in {name} speichern?",
   "document.save_copy": "Kopie speichern…",
-  "document.tab_unsaved_changes": "Ungespeicherte Änderungen",
   "document.unsaved_changes": "{name} enthält ungespeicherte Änderungen. Wenn Sie nicht speichern, gehen sie verloren.",
   "drive.rigid": "{joint} ist ein starres Gelenk. Es hält die verbundenen Teile fest zusammen und ermöglicht daher keine Bewegung. Um die Teile beweglich zu machen, ändern Sie den Gelenktyp unter „Gelenk bearbeiten“: Drehgelenk für Drehbewegungen, Schubgelenk für lineare Bewegungen oder Zylindergelenk für beides.",
   "drive.stopped_by_contact": "Angehalten bei {value}: {a} würde {b} durchdringen",
@@ -1986,7 +1982,6 @@
   "material.selection.mixed": "Unterschiedliche Materialien",
   "measure.at": "Bei",
   "measure.item": "Element {number}",
-  "measure.line_to_centre": "Linie zum Mittelpunkt",
   "measure.quick_copied": "Messwert kopiert",
   "measure.quick_copy": "Klicken, um den Messwert zu kopieren",
   "measure.quick_edges": "{count} Kanten",
@@ -2253,14 +2248,6 @@
   "prefs.auto_operation_note": "Vereinigung, Neuer Körper oder Schnitt, je nachdem, was das Material berührt.",
   "prefs.axes": "Achsen",
   "prefs.axis": "Achse",
-  "prefs.blur_cost": "Relativer Renderaufwand. Mehr Balken bedeuten meist mehr Arbeit.",
-  "prefs.blur_device": "Auf diesem Grafikgerät oder Renderpfad nicht verfügbar",
-  "prefs.blur_guard": "Die Unschärfequalität wurde für flüssigere Bilder verringert. Der Radius bleibt unverändert.",
-  "prefs.blur_off": "Aus",
-  "prefs.blur_reduce_transparency": "Durch die Systemeinstellung zur Transparenzreduzierung deaktiviert",
-  "prefs.blur_software": "Mit Softwaregrafik nicht verfügbar (gpu-software)",
-  "prefs.blur_source": "In dieser Arbeitsbereichsansicht nicht verfügbar",
-  "prefs.blur_web": "Auf diesem Web-Renderpfad nicht verfügbar",
   "prefs.bodies_folders": "Körperordner",
   "prefs.bodies_folders_always": "Immer",
   "prefs.bodies_folders_never": "Nie",
@@ -2319,13 +2306,6 @@
   "prefs.dialogs_edge": "Am Rand der Ansicht",
   "prefs.dialogs_left_column": "In der linken Spalte",
   "prefs.dialogs_note": "Wo Befehlsdialoge öffnen: am Rand der Ansicht angedockt oder in der linken Spalte anstelle von Browser und Verlauf, die beim Schließen des Dialogs wie zuvor zurückkehren.",
-  "prefs.dimension_step_angle": "Was die Pfeile des Fensters, Auf/Ab und das Mausrad zu einem Winkel addieren",
-  "prefs.dimension_step_length": "Was die Pfeile des Fensters, Auf/Ab und das Mausrad zu einer Länge addieren",
-  "prefs.dimension_steps": "Schritte im Fenster",
-  "prefs.dimension_values": "Bemaßungswerte",
-  "prefs.dimension_values_note": "Wo der Wert einer Bemaßung eingegeben wird. Ein Fenster hat Pfeile, die ihn schrittweise ändern; das Bemaßungswerkzeug platziert zuerst den Text.",
-  "prefs.dimension_values_view": "In der Ansicht",
-  "prefs.dimension_values_window": "In einem Fenster",
   "prefs.display": "Anzeige",
   "prefs.edges": "Kanten und Schattierung",
   "prefs.extend": "Erweitern",
@@ -2648,10 +2628,6 @@
   "prefs.theme_follow_off": "Aus",
   "prefs.theme_follow_stop": "Nicht mehr folgen",
   "prefs.theme_import_hint": "Klicken, um eine Designdatei zu wählen, eine hierher ziehen oder mit kopiertem Design Strg+V (Cmd+V auf dem Mac) drücken",
-  "prefs.theme_notice_dismiss": "Ausblenden",
-  "prefs.theme_option_blur": "Unschärfe hinter Panels",
-  "prefs.theme_option_blur_help": "Unschärfe hinter durchscheinenden Panels in physischen Pixeln. Null bedeutet aus.",
-  "prefs.theme_option_invalid": "Der gespeicherte Wert für {option} ist ungültig; der Designstandard wird verwendet. Der gespeicherte Wert bleibt erhalten.",
   "prefs.theme_option_opacity": "Deckkraft",
   "prefs.theme_option_opacity_help": "Deckkraft schwebender Bedienfelder anpassen. Eine Mindestdeckkraft schützt die Lesbarkeit über den Ansichtsfarben.",
   "prefs.theme_option_tab_colours": "Tabfarben",
@@ -2660,7 +2636,6 @@
   "prefs.theme_option_tab_fade_ms_help": "Panel- und Ansichtsfarben beim Tabwechsel überblenden. Null wechselt sofort.",
   "prefs.theme_options_badge": "Optionen",
   "prefs.theme_options_more": "Mehr · {count}",
-  "prefs.theme_options_newer": "Dieses Design benötigt eine neuere Version von SolidCraft. Nach dem Upgrade das Originaldesign erneut importieren, um seine Optionsdefinitionen wiederherzustellen.",
   "prefs.theme_options_reset": "Zurücksetzen",
   "prefs.theme_options_unavailable": "Auf diesem Gerät nicht verfügbar",
   "prefs.theme_paste": "Design einfügen",
@@ -4784,7 +4759,6 @@
   "ui.default_modelling_orientation": "Standard-Modellierungsorientierung",
   "ui.delete": "Löschen",
   "ui.delete_select_first": "Wählen Sie zuerst aus, was gelöscht werden soll: Features, Körper, Komponenten oder Skizzengeometrie",
-  "ui.dependents_select_first": "Wählen Sie zuerst aus, wessen Abhängige aufgelistet werden sollen",
   "ui.depth": "Tiefe",
   "ui.design": "Design",
   "ui.design_properties.author": "Autor",
@@ -4940,10 +4914,6 @@
   "ui.fillet_setback_least": "Mehr als {least}",
   "ui.fillet_setback_tip": "Wo das glatte Eckflächenstück beginnt: wie weit von der Ecke entlang jeder Kante. Standard ist {factor} × der Radius. Er muss größer sein als der kleinste Rücksprung, wo sich die Rundungen ohne ihn treffen: der Radius, wo die Flächen rechtwinklig zueinander stehen.",
   "ui.fillet_smooth_radius": "Radius glatt ändern",
-  "ui.fillet_turn": "Wendungen",
-  "ui.fillet_turn_mitre": "Gehrung",
-  "ui.fillet_turn_swept": "Geschwenkt",
-  "ui.fillet_turn_tip": "Wo zwei Rundungen um eine scharfe Eckkante zwischen ihnen herumlaufen, etwa die Rundungen am Fuß eines Zapfens an seinen senkrechten Kanten.\nGehrung: Die Rundungen laufen weiter, bis sie sich in einer Gehrung treffen.\nGeschwenkt: Die Rundungen enden an der Eckkante und schwenken um sie herum; die Ecke ist ein Torus, tangential zu beiden. Nur für Rundungen mit einem Radius um eine gerade, konvexe Eckkante.",
   "ui.fillet_type_choices_tip": "Konstanter Radius: ein Radius entlang der ganzen Kante.\nSehnenlänge: die Breite der Rundung bleibt gleich, in welchem Winkel die Flächen auch aufeinandertreffen.\nVariabler Radius: ein Radius an jedem Ende und weitere entlang der Kante, wenn Sie sie hinzufügen.\nKrümmungsstetig: ein Querschnitt ohne Knick in den Spiegelungen, wo er auf ebene Flächen trifft (G2).\nSpline: der Radius entlang der Kante folgt Steuerradien, die Sie festlegen.",
   "ui.fillet_type_curvature": "Krümmungsstetig",
   "ui.fillet_type_tip": "Der Querschnitt über die Kante. Krümmungsstetig: ein krümmungsstetiger Querschnitt (G2) zwischen ebenen Flächen, sodass Spiegelungen ohne Knick von den Flächen in die Rundung laufen.",

assets/locales/en-GB.json

@@ -69,7 +69,6 @@
   "help.solid.split_face": "Divides the selected faces along a plane, the face of another body or sketch curves, without cutting the body. Use it to give part of a face its own draft, colour or offset.",
   "help.third_party": "Third-party licences",
   "home.new_mm_hint": "Millimetres · opens in Design",
-  "measure.line_to_centre": "Line to centre",
   "navbar.custom.anchor.bottom_centre": "Bottom centre",
   "navbar.custom.anchor.top_centre": "Top centre",
   "navbar.custom.customise": "Customise navigation bar…",

assets/locales/en.json

@@ -1396,9 +1396,6 @@
   "dialog.custom_axis": "↖ Custom Axis",
   "dialog.dimension_insert_hint": "Click another driving dimension to insert its name",
   "dialog.dimension_name": "Dimension: {name}",
-  "dialog.dimension_step_down": "Down by {step}",
-  "dialog.dimension_step_expression": "Only a number steps; an expression stays as typed",
-  "dialog.dimension_step_up": "Up by {step}",
   "dialog.edit_title": "EDIT {title}",
   "dialog.no_shown_body": "No shown body to change: show one, or choose New Body",
   "dialog.pattern_sketch_not_object": "Pick bodies or features: a sketch is neither. Repeat its curves with the sketch's own Pattern or Mirror, or extrude it first.",
@@ -1406,7 +1403,6 @@
   "dialog.selected_count": "↖ {count} selected",
   "dialog.selection_constraint": "Constraint {id}",
   "dialog.selection_external_curve": "{sketch} · curve {id}",
-  "dialog.selection_external_point": "{point} · {sketch}",
   "dialog.selection_guidance": "Select an input to change it. Click selected objects to remove them; Ctrl/Cmd-click also toggles them. Review the preview, then press OK.",
   "dialog.selection_midpoint": "Midpoint · {id}",
   "dialog.selection_profile": "{sketch} · profile {number}",
@@ -1424,7 +1420,6 @@
   "document.read_only_save": "This design was opened read-only: save it as a new file",
   "document.save_changes": "Save changes to {name}?",
   "document.save_copy": "Save a Copy…",
-  "document.tab_unsaved_changes": "Unsaved changes",
   "document.unsaved_changes": "{name} has unsaved changes. If you don't save, they are lost.",
   "drive.rigid": "{joint} is a rigid joint: it holds its parts still, so it has nothing to drive. To let them move, change its type in Edit Joint: Revolute to rotate, Slider to slide, Cylindrical for both.",
   "drive.stopped_by_contact": "Stopped at {value}: {a} would pass through {b}",
@@ -1605,7 +1600,7 @@
   "help.parts.resize": "Changes the size or length of an inserted standard part and rebuilds it; its joints keep it seated. Use it when a screw turns out too long or a hole needs another size.",
   "help.plastic.assign_rule": "Assigns a plastic rule to bodies, so their plastic features take its draft and clearance as defaults. Use it to set up a moulded part once for all its features.",
   "help.plastic.boss": "Adds a screw boss on a face: a post with an optional hole, draft, root fillet and supporting ribs. Use it for screw points in moulded or printed housings.",
-  "help.plastic.lip": "Adds a lip or a matching groove along the rim of a shelled body (Shell a face open first, then pick the rim around that opening). Use it so that two housing halves locate on each other and close tightly.",
+  "help.plastic.lip": "Adds a lip or a matching groove along the rim of a shelled body. Use it so that two housing halves locate on each other and close tightly.",
   "help.plastic.manage_rules": "Creates and edits plastic rules: material, wall thickness, radii, clearance and draft. Use them to keep the features of a moulded part consistent.",
   "help.plastic.rest": "Adds a rest on a face: a round or rectangular pad, solid or hollow, with draft. Use it as a support or standoff in a moulded housing.",
   "help.plastic.snap_fit": "Adds a snap-fit hook on a face, with its length, thickness and catch. Use it to clip parts together without screws.",
@@ -2004,7 +1999,6 @@
   "material.selection.mixed": "Different materials",
   "measure.at": "At",
   "measure.item": "Item {number}",
-  "measure.line_to_centre": "Line to center",
   "measure.quick_copied": "Measurement copied",
   "measure.quick_copy": "Click to copy the measurement",
   "measure.quick_edges": "{count} edges",
@@ -2271,14 +2265,6 @@
   "prefs.auto_operation_note": "Join, New Body or Cut, from what the material touches.",
   "prefs.axes": "Axes",
   "prefs.axis": "Axis",
-  "prefs.blur_cost": "Relative rendering cost. More bars usually mean more work.",
-  "prefs.blur_device": "Unavailable on this graphics device or rendering path",
-  "prefs.blur_guard": "Blur quality was reduced to keep frames responsive. The radius is unchanged.",
-  "prefs.blur_off": "Off",
-  "prefs.blur_reduce_transparency": "Disabled by the system's Reduce transparency setting",
-  "prefs.blur_software": "Unavailable with software graphics (gpu-software)",
-  "prefs.blur_source": "Unavailable in this workspace view",
-  "prefs.blur_web": "Unavailable on this web rendering path",
   "prefs.bodies_folders": "Bodies folders",
   "prefs.bodies_folders_always": "Always",
   "prefs.bodies_folders_never": "Never",
@@ -2337,13 +2323,6 @@
   "prefs.dialogs_edge": "At the view's edge",
   "prefs.dialogs_left_column": "In the left column",
   "prefs.dialogs_note": "Where command dialogs open: docked at the view's edge, or in the left column in place of the browser and the History, which come back as they were when the dialog closes.",
-  "prefs.dimension_step_angle": "What the window's arrows, Up/Down and the wheel add to an angle",
-  "prefs.dimension_step_length": "What the window's arrows, Up/Down and the wheel add to a length",
-  "prefs.dimension_steps": "Window steps",
-  "prefs.dimension_values": "Dimension values",
-  "prefs.dimension_values_note": "Where you type a dimension's value. A window has arrows that step it; the Dimension tool places the text first.",
-  "prefs.dimension_values_view": "In the view",
-  "prefs.dimension_values_window": "In a window",
   "prefs.display": "Display",
   "prefs.edges": "Edges and shading",
   "prefs.extend": "Extend",
@@ -2671,10 +2650,6 @@
   "prefs.theme_follow_off": "Off",
   "prefs.theme_follow_stop": "Stop following",
   "prefs.theme_import_hint": "Click to choose a theme file, drop one here, or press Ctrl+V (Cmd+V on a Mac) with a theme copied",
-  "prefs.theme_notice_dismiss": "Dismiss",
-  "prefs.theme_option_blur": "Blur behind panels",
-  "prefs.theme_option_blur_help": "Blur behind translucent panels, in physical pixels. Zero is off.",
-  "prefs.theme_option_invalid": "Saved value for {option} is invalid; using the theme default. The saved value is kept.",
   "prefs.theme_option_opacity": "Opacity",
   "prefs.theme_option_opacity_help": "Adjust floating panel opacity. A readability floor protects text over viewport colors.",
   "prefs.theme_option_tab_colours": "Tab colors",
@@ -2683,7 +2658,6 @@
   "prefs.theme_option_tab_fade_ms_help": "Fade panel and viewport colors when switching tabs. Zero switches instantly.",
   "prefs.theme_options_badge": "Options",
   "prefs.theme_options_more": "More · {count}",
-  "prefs.theme_options_newer": "This theme requires a newer SolidCraft. Upgrade, then reimport the original theme to recover its option definitions.",
   "prefs.theme_options_reset": "Reset",
   "prefs.theme_options_unavailable": "Unavailable on this device",
   "prefs.theme_paste": "Paste theme",
@@ -4810,7 +4784,6 @@
   "ui.default_modelling_orientation": "Default modeling orientation",
   "ui.delete": "Delete",
   "ui.delete_select_first": "Select what to delete first: features, bodies, components or sketch geometry",
-  "ui.dependents_select_first": "Select what to list the dependents of first",
   "ui.depth": "Depth",
   "ui.design": "Design",
   "ui.design_properties.author": "Author",
@@ -4968,10 +4941,6 @@
   "ui.fillet_setback_least": "More than {least}",
   "ui.fillet_setback_tip": "Where the smooth corner patch starts: how far along each edge from the corner. The default is {factor} × the radius. It must be more than the least setback, where the rounds meet without one: the radius where the faces are square to each other.",
   "ui.fillet_smooth_radius": "Smooth radius change",
-  "ui.fillet_turn": "Turns",
-  "ui.fillet_turn_mitre": "Mitre",
-  "ui.fillet_turn_swept": "Swept",
-  "ui.fillet_turn_tip": "Where two rounds turn round a sharp corner edge between them, such as the rounds along a boss's base at its upright edges.\nMitre: the rounds run on until they meet in a mitre.\nSwept: the rounds stop at the corner edge and turn round it, the corner a torus tangent to both. Only for rounds of one radius round a straight, convex corner edge.",
   "ui.fillet_type_choices_tip": "Constant radius: one radius all along the edge.\nChord length: the width across the round stays the same, whatever angle the faces meet at.\nVariable radius: a radius at each end, and more along the edge if you add them.\nCurvature continuous: a section without a kink in reflections where it meets flat faces (G2).\nSpline: the radius along the edge follows control radii you set.",
   "ui.fillet_type_curvature": "Curvature continuous",
   "ui.fillet_type_tip": "The section across the edge. Curvature continuous: a curvature-continuous (G2) section between planar faces, so reflections run from the faces into the round without a kink.",

assets/locales/es.json

@@ -1358,7 +1358,6 @@
   "document.read_only_save": "Este diseño se abrió en solo lectura: guárdalo como un archivo nuevo",
   "document.save_changes": "¿Guardar los cambios de {name}?",
   "document.save_copy": "Guardar una copia…",
-  "document.tab_unsaved_changes": "Cambios sin guardar",
   "document.unsaved_changes": "{name} tiene cambios sin guardar. Si no los guardas, se perderán.",
   "drive.rigid": "{joint} es una junta rígida: mantiene sus partes quietas, así que no tiene nada que impulsar.",
   "drive.stopped_by_contact": "Detenido en {value}: {a} atravesaría {b}",

assets/locales/fr.json

@@ -1391,7 +1391,6 @@
   "document.read_only_save": "Cette conception a été ouverte en lecture seule : enregistrez-la dans un nouveau fichier",
   "document.save_changes": "Enregistrer les modifications de {name} ?",
   "document.save_copy": "Enregistrer une copie…",
-  "document.tab_unsaved_changes": "Modifications non enregistrées",
   "document.unsaved_changes": "{name} contient des modifications non enregistrées. Si vous n'enregistrez pas, elles seront perdues.",
   "drive.rigid": "{joint} est une liaison rigide : elle maintient ses pièces immobiles, il n'y a donc rien à piloter. Pour les laisser bouger, changer son type dans Modifier la liaison : Revolute pour tourner, Slider pour coulisser, Cylindrical pour les deux.",
   "drive.stopped_by_contact": "Arrêté à {value} : {a} traverserait {b}",

assets/locales/he.json

@@ -1396,9 +1396,6 @@
   "dialog.custom_axis": "↖ ציר מותאם",
   "dialog.dimension_insert_hint": "יש ללחוץ על מידה מניעה אחרת כדי להוסיף את שמה",
   "dialog.dimension_name": "מידה: {name}",
-  "dialog.dimension_step_down": "הפחתה ב־{step}",
-  "dialog.dimension_step_expression": "רק מספר משתנה בצעדים; ביטוי נשאר כפי שנכתב",
-  "dialog.dimension_step_up": "הוספה של {step}",
   "dialog.edit_title": "עריכת {title}",
   "dialog.no_shown_body": "אין גוף מוצג לשינוי: הציגו גוף, או בחרו „גוף חדש”",
   "dialog.pattern_sketch_not_object": "בחרו גופים או פיצ'רים: סקיצה אינה אף אחד מהם. חזרו על העקומות שלה בעזרת המערך או השיקוף של הסקיצה עצמה, או בצעו לה שליפה קודם.",
@@ -1406,7 +1403,6 @@
   "dialog.selected_count": "↖ {count} נבחרו",
   "dialog.selection_constraint": "אילוץ {id}",
   "dialog.selection_external_curve": "{sketch} · עקומה {id}",
-  "dialog.selection_external_point": "{point} · {sketch}",
   "dialog.selection_guidance": "יש לבחור קלט כדי לשנות אותו. לחיצה על אובייקט שנבחר מסירה אותו; גם Ctrl/Cmd+לחיצה מחליפה את מצבו. לאחר בדיקת התצוגה המקדימה יש ללחוץ על אישור.",
   "dialog.selection_midpoint": "נקודת אמצע · {id}",
   "dialog.selection_profile": "{sketch} · פרופיל {number}",
@@ -1424,7 +1420,6 @@
   "document.read_only_save": "התכן הזה נפתח לקריאה בלבד: יש לשמור אותו כקובץ חדש",
   "document.save_changes": "לשמור את השינויים ב־{name}?",
   "document.save_copy": "שמירת עותק…",
-  "document.tab_unsaved_changes": "שינויים שלא נשמרו",
   "document.unsaved_changes": "ב־{name} יש שינויים שלא נשמרו. ללא שמירה, הם יאבדו.",
   "drive.rigid": "{joint} הוא מפרק קשיח: הוא מחזיק את החלקים שלו במקומם, ולכן אין מה להניע. כדי שהחלקים יזוזו, שנו את הסוג שלו ב״עריכת מפרק״: Revolute לסיבוב, Slider להחלקה, Cylindrical לשניהם.",
   "drive.stopped_by_contact": "נעצר ב־{value}: {a} היה עובר דרך {b}",
@@ -2004,7 +1999,6 @@
   "material.selection.mixed": "חומרים שונים",
   "measure.at": "מיקום",
   "measure.item": "פריט {number}",
-  "measure.line_to_centre": "מהקו למרכז",
   "measure.quick_copied": "המדידה הועתקה",
   "measure.quick_copy": "לחיצה מעתיקה את המדידה",
   "measure.quick_edges": "{count} מקצועות",
@@ -2271,14 +2265,6 @@
   "prefs.auto_operation_note": "איחוד, גוף חדש או חיתוך, לפי מה שהחומר נוגע בו.",
   "prefs.axes": "צירים",
   "prefs.axis": "ציר",
-  "prefs.blur_cost": "עלות עיבוד יחסית. יותר פסים מציינים בדרך כלל יותר עבודה.",
-  "prefs.blur_device": "לא זמין בהתקן הגרפי או בנתיב העיבוד הזה",
-  "prefs.blur_guard": "איכות הטשטוש הופחתה כדי לשמור על תגובתיות הפריימים. הרדיוס לא השתנה.",
-  "prefs.blur_off": "כבוי",
-  "prefs.blur_reduce_transparency": "מושבת עקב הגדרת הפחתת השקיפות של המערכת",
-  "prefs.blur_software": "לא זמין עם עיבוד גרפי בתוכנה (gpu-software)",
-  "prefs.blur_source": "לא זמין בתצוגת סביבת העבודה הזו",
-  "prefs.blur_web": "לא זמין בנתיב העיבוד הזה בדפדפן",
   "prefs.bodies_folders": "תיקיות גופים",
   "prefs.bodies_folders_always": "תמיד",
   "prefs.bodies_folders_never": "אף פעם",
@@ -2337,13 +2323,6 @@
   "prefs.dialogs_edge": "בקצה התצוגה",
   "prefs.dialogs_left_column": "בעמודה השמאלית",
   "prefs.dialogs_note": "היכן נפתחות תיבות הדו־שיח של הפקודות: מעוגנות בקצה התצוגה, או בעמודה השמאלית במקום הדפדפן וההיסטוריה, שחוזרים כפי שהיו כשהתיבה נסגרת.",
-  "prefs.dimension_step_angle": "מה שהחצים בחלון, למעלה/למטה והגלגלת מוסיפים לזווית",
-  "prefs.dimension_step_length": "מה שהחצים בחלון, למעלה/למטה והגלגלת מוסיפים לאורך",
-  "prefs.dimension_steps": "צעדי החלון",
-  "prefs.dimension_values": "ערכי מידות",
-  "prefs.dimension_values_note": "היכן מקלידים את ערך המידה. לחלון יש חצים שמשנים אותו בצעדים; כלי המידה מציב קודם את הטקסט.",
-  "prefs.dimension_values_view": "בתצוגה",
-  "prefs.dimension_values_window": "בחלון",
   "prefs.display": "תצוגה",
   "prefs.edges": "מקצועות והצללה",
   "prefs.extend": "הרחבה",
@@ -2671,10 +2650,6 @@
   "prefs.theme_follow_off": "כבוי",
   "prefs.theme_follow_stop": "הפסקת המעקב",
   "prefs.theme_import_hint": "לחצו כדי לבחור קובץ ערכת נושא, שחררו קובץ כאן, או הקישו Ctrl+V ‏(Cmd+V ב-Mac) אחרי שהעתקתם ערכת נושא",
-  "prefs.theme_notice_dismiss": "הסתרה",
-  "prefs.theme_option_blur": "טשטוש מאחורי לוחות",
-  "prefs.theme_option_blur_help": "טשטוש מאחורי לוחות שקופים למחצה, בפיקסלים פיזיים. אפס מכבה את הטשטוש.",
-  "prefs.theme_option_invalid": "הערך השמור עבור {option} אינו תקין; נעשה שימוש בברירת המחדל של ערכת הנושא. הערך השמור נשמר ללא שינוי.",
   "prefs.theme_option_opacity": "אטימות",
   "prefs.theme_option_opacity_help": "כוונון אטימות הלוחות הצפים. רמת אטימות מינימלית שומרת על קריאות הטקסט על רקע צבעי חלון התצוגה.",
   "prefs.theme_option_tab_colours": "צבעי כרטיסיות",
@@ -2683,7 +2658,6 @@
   "prefs.theme_option_tab_fade_ms_help": "שנה בהדרגה את צבעי הלוח ואזור התצוגה בעת מעבר בין כרטיסיות. ערך אפס מבצע את המעבר מיד.",
   "prefs.theme_options_badge": "אפשרויות",
   "prefs.theme_options_more": "עוד · {count}",
-  "prefs.theme_options_newer": "ערכת נושא זו דורשת גרסה חדשה יותר של SolidCraft. לאחר השדרוג יש לייבא שוב את ערכת הנושא המקורית כדי לשחזר את הגדרות האפשרויות שלה.",
   "prefs.theme_options_reset": "איפוס",
   "prefs.theme_options_unavailable": "לא זמין במכשיר זה",
   "prefs.theme_paste": "הדבקת ערכת נושא",
@@ -4810,7 +4784,6 @@
   "ui.default_modelling_orientation": "כיוון מידול ברירת מחדל",
   "ui.delete": "מחיקה",
   "ui.delete_select_first": "בחרו קודם מה למחוק: תכונות, גופים, רכיבים או גאומטריית סקיצה",
-  "ui.dependents_select_first": "בחרו קודם מה להציג את התלויים שלו",
   "ui.depth": "עומק",
   "ui.design": "תכן",
   "ui.design_properties.author": "מחבר",
@@ -4968,10 +4941,6 @@
   "ui.fillet_setback_least": "יותר מ-{least}",
   "ui.fillet_setback_tip": "היכן מתחיל טלאי הפינה החלק: המרחק לאורך כל קצה מהפינה. ברירת המחדל היא פי {factor} מהרדיוס. עליה להיות גדולה מהנסיגה המזערית, שבה העיגולים נפגשים בלעדיה: הרדיוס כשהפאות ניצבות זו לזו.",
   "ui.fillet_smooth_radius": "שינוי רדיוס חלק",
-  "ui.fillet_turn": "פניות",
-  "ui.fillet_turn_mitre": "מיטר",
-  "ui.fillet_turn_swept": "מסובב",
-  "ui.fillet_turn_tip": "היכן ששני עיגולים מסתובבים סביב קצה פינה חד ביניהם, כמו העיגולים בבסיס בליטה ליד הקצוות הזקופים שלה.\nמיטר: העיגולים נמשכים עד שהם נפגשים במיטר.\nמסובב: העיגולים נעצרים בקצה הפינה ומסתובבים סביבו, והפינה היא טורוס המשיק לשניהם. רק לעיגולים ברדיוס אחד סביב קצה פינה ישר וקמור.",
   "ui.fillet_type_choices_tip": "רדיוס קבוע: רדיוס אחד לכל אורך הקצה.\nאורך מיתר: רוחב העיגול נשאר זהה, בכל זווית שבה הפאות נפגשות.\nרדיוס משתנה: רדיוס בכל קצה, ועוד לאורך הקצה אם מוסיפים.\nרציף בעקמומיות: חתך בלי שבר בהשתקפויות היכן שהוא פוגש פאות מישוריות (G2).\nספליין: הרדיוס לאורך הקצה עוקב אחרי רדיוסי בקרה שאתם קובעים.",
   "ui.fillet_type_curvature": "רציף בעקמומיות",
   "ui.fillet_type_tip": "החתך לרוחב הקצה. רציף בעקמומיות: חתך רציף בעקמומיות (G2) בין פאות מישוריות, כך שההשתקפויות עוברות מהפאות אל העיגול בלי שבר.",

assets/locales/it.json

@@ -1392,7 +1392,6 @@
   "document.read_only_save": "Questa progettazione è stata aperta in sola lettura: salvala come nuovo file",
   "document.save_changes": "Salvare le modifiche a {name}?",
   "document.save_copy": "Salva una copia…",
-  "document.tab_unsaved_changes": "Modifiche non salvate",
   "document.unsaved_changes": "{name} contiene modifiche non salvate. Se non salvi, andranno perse.",
   "drive.rigid": "{joint} è un giunto rigido: tiene ferme le sue parti, quindi non c'è nulla da azionare. Per farle muovere, cambia il suo tipo in Modifica giunto: Rotante per ruotare, Scorrevole per scorrere, Cilindrico per entrambi.",
   "drive.stopped_by_contact": "Arrestato a {value}: {a} attraverserebbe {b}",

assets/locales/ja.json

@@ -1396,9 +1396,6 @@
   "dialog.custom_axis": "↖ カスタム軸",
   "dialog.dimension_insert_hint": "別の駆動寸法をクリックして名前を挿入",
   "dialog.dimension_name": "寸法: {name}",
-  "dialog.dimension_step_down": "{step} 減らす",
-  "dialog.dimension_step_expression": "増減できるのは数値だけです。式はそのまま残ります",
-  "dialog.dimension_step_up": "{step} 増やす",
   "dialog.edit_title": "{title}を編集",
   "dialog.no_shown_body": "変更できる表示中のボディがありません。ボディを表示するか、新規ボディを選択してください",
   "dialog.pattern_sketch_not_object": "ボディかフィーチャーを選んでください。スケッチはどちらでもありません。曲線はスケッチ内のパターンかミラーで繰り返すか、先に押し出してください。",
@@ -1406,7 +1403,6 @@
   "dialog.selected_count": "↖ {count} 個選択中",
   "dialog.selection_constraint": "拘束 {id}",
   "dialog.selection_external_curve": "{sketch} · 曲線 {id}",
-  "dialog.selection_external_point": "{point} · {sketch}",
   "dialog.selection_guidance": "入力欄を選んで変更します。選択済みのオブジェクトをクリックすると解除できます。Ctrl/Cmd を押しながらクリックしても切り替えられます。プレビューを確認してから OK を押してください。",
   "dialog.selection_midpoint": "中点 · {id}",
   "dialog.selection_profile": "{sketch} · プロファイル {number}",
@@ -1424,7 +1420,6 @@
   "document.read_only_save": "このデザインは読み取り専用で開かれています：新しいファイルとして保存してください",
   "document.save_changes": "{name} への変更を保存しますか？",
   "document.save_copy": "コピーを保存…",
-  "document.tab_unsaved_changes": "未保存の変更",
   "document.unsaved_changes": "{name} には保存されていない変更があります。保存しない場合、変更内容は失われます。",
   "drive.rigid": "{joint} は剛体ジョイントです。部品をその場に固定するため、駆動するものがありません。動かすには「ジョイントを編集」で種類を変更してください: 回転させるなら Revolute、スライドさせるなら Slider、両方なら Cylindrical。",
   "drive.stopped_by_contact": "{value} で停止: {a} が {b} を通り抜けてしまいます",
@@ -2004,7 +1999,6 @@
   "material.selection.mixed": "異なる材料",
   "measure.at": "位置",
   "measure.item": "項目 {number}",
-  "measure.line_to_centre": "線から中心まで",
   "measure.quick_copied": "測定値をコピーしました",
   "measure.quick_copy": "クリックで測定値をコピー",
   "measure.quick_edges": "エッジ {count} 本",
@@ -2271,14 +2265,6 @@
   "prefs.auto_operation_note": "材料が接触する対象に応じて結合、新規ボディ、切り取りを選びます。",
   "prefs.axes": "軸",
   "prefs.axis": "軸",
-  "prefs.blur_cost": "相対的な描画負荷です。バーが多いほど、通常は処理量が増えます。",
-  "prefs.blur_device": "このグラフィックスデバイスまたは描画経路では利用できません",
-  "prefs.blur_guard": "画面の応答性を保つため、ぼかしの品質を下げました。半径は変更されていません。",
-  "prefs.blur_off": "オフ",
-  "prefs.blur_reduce_transparency": "システムの透明度を下げる設定により無効です",
-  "prefs.blur_software": "ソフトウェア描画では利用できません (gpu-software)",
-  "prefs.blur_source": "このワークスペース表示では利用できません",
-  "prefs.blur_web": "このウェブ描画経路では利用できません",
   "prefs.bodies_folders": "ボディフォルダー",
   "prefs.bodies_folders_always": "常に表示",
   "prefs.bodies_folders_never": "表示しない",
@@ -2337,13 +2323,6 @@
   "prefs.dialogs_edge": "ビューの端",
   "prefs.dialogs_left_column": "左の列",
   "prefs.dialogs_note": "コマンドダイアログを開く場所：ビューの端にドッキングするか、左の列でブラウザーと履歴の代わりに表示します。ダイアログを閉じるとブラウザーと履歴は元どおりに戻ります。",
-  "prefs.dimension_step_angle": "ウィンドウの矢印、上下キー、ホイールで角度に加える量",
-  "prefs.dimension_step_length": "ウィンドウの矢印、上下キー、ホイールで長さに加える量",
-  "prefs.dimension_steps": "ウィンドウの増減量",
-  "prefs.dimension_values": "寸法値の入力",
-  "prefs.dimension_values_note": "寸法値を入力する場所です。ウィンドウでは矢印で値を増減でき、寸法ツールは先に文字を配置します。",
-  "prefs.dimension_values_view": "ビュー内",
-  "prefs.dimension_values_window": "ウィンドウ",
   "prefs.display": "表示",
   "prefs.edges": "エッジと陰影",
   "prefs.extend": "拡張",
@@ -2671,10 +2650,6 @@
   "prefs.theme_follow_off": "オフ",
   "prefs.theme_follow_stop": "追従を停止",
   "prefs.theme_import_hint": "クリックしてテーマファイルを選ぶか、ここにドロップするか、テーマをコピーした状態で Ctrl+V（Mac では Cmd+V）を押します",
-  "prefs.theme_notice_dismiss": "非表示",
-  "prefs.theme_option_blur": "パネル背面のぼかし",
-  "prefs.theme_option_blur_help": "半透明パネルの背面のぼかしを物理ピクセル単位で指定します。0でオフになります。",
-  "prefs.theme_option_invalid": "{option} の保存値が無効なため、テーマの既定値を使用します。保存値は保持されます。",
   "prefs.theme_option_opacity": "不透明度",
   "prefs.theme_option_opacity_help": "フローティングパネルの不透明度を調整します。ビューポートの色に重なっても文字が読めるように下限が適用されます。",
   "prefs.theme_option_tab_colours": "タブの色",
@@ -2683,7 +2658,6 @@
   "prefs.theme_option_tab_fade_ms_help": "タブの切り替え時にパネルとビューポートの色を徐々に変えます。0で即座に切り替えます。",
   "prefs.theme_options_badge": "オプション",
   "prefs.theme_options_more": "その他 · {count}",
-  "prefs.theme_options_newer": "このテーマには新しいバージョンの SolidCraft が必要です。更新後、元のテーマを再インポートしてオプション定義を復元してください。",
   "prefs.theme_options_reset": "リセット",
   "prefs.theme_options_unavailable": "このデバイスでは利用できません",
   "prefs.theme_paste": "テーマを貼り付け",
@@ -4810,7 +4784,6 @@
   "ui.default_modelling_orientation": "モデリングのデフォルト方向",
   "ui.delete": "削除",
   "ui.delete_select_first": "先に削除するものを選択してください: フィーチャ、ボディ、コンポーネント、スケッチ ジオメトリ",
-  "ui.dependents_select_first": "先に、依存先を表示する対象を選択してください",
   "ui.depth": "深さ",
   "ui.design": "デザイン",
   "ui.design_properties.author": "作成者",
@@ -4968,10 +4941,6 @@
   "ui.fillet_setback_least": "{least} より大きく",
   "ui.fillet_setback_tip": "なめらかなコーナーパッチが始まる位置: コーナーから各エッジに沿った距離。既定値は半径の {factor} 倍。最小セットバック (セットバックなしでラウンド同士が交わる位置。面どうしが直角なら半径) より大きくする必要があります。",
   "ui.fillet_smooth_radius": "半径をなめらかに変化",
-  "ui.fillet_turn": "曲がり角",
-  "ui.fillet_turn_mitre": "留め継ぎ",
-  "ui.fillet_turn_swept": "回転",
-  "ui.fillet_turn_tip": "2 つのフィレットが間にある鋭いコーナーエッジを回り込む所（ボスの根元のフィレットが立ち上がりエッジを回る所など）。\n留め継ぎ: フィレットは延びて留め継ぎで出会います。\n回転: フィレットはコーナーエッジで止まり、その周りを回ります。コーナーは両方に接するトーラスです。同じ半径のフィレットが、まっすぐな凸のコーナーエッジを回る場合のみ。",
   "ui.fillet_type_choices_tip": "一定の半径: エッジ全体で一つの半径。\n弦長: 面がどんな角度で交わっても、フィレットの幅が同じ。\n可変半径: 両端の半径と、追加すればエッジ沿いの半径。\n曲率連続: 平面と接する所で映り込みが折れない断面 (G2)。\nスプライン: エッジ沿いの半径が、設定した制御半径に従います。",
   "ui.fillet_type_curvature": "曲率連続",
   "ui.fillet_type_tip": "エッジを横切る断面。曲率連続: 平面の間の曲率連続 (G2) 断面で、映り込みが面からフィレットへ折れずにつながります。",

assets/locales/ko.json

@@ -1207,9 +1207,6 @@
   "dialog.custom_axis": "↖ 사용자 정의 축",
   "dialog.dimension_insert_hint": "다른 구동 치수를 두 번 클릭하여 이름 삽입",
   "dialog.dimension_name": "치수: {name}",
-  "dialog.dimension_step_down": "{step} 줄이기",
-  "dialog.dimension_step_expression": "숫자만 증감할 수 있으며 수식은 입력한 그대로 유지됩니다",
-  "dialog.dimension_step_up": "{step} 늘리기",
   "dialog.edit_title": "{title} 편집",
   "dialog.pattern_sketch_not_object": "바디나 피처를 선택하세요. 스케치는 둘 다 아닙니다. 곡선은 스케치 안의 패턴이나 대칭 복사로 반복하거나, 먼저 돌출하세요.",
   "dialog.select": "↖ 선택",
@@ -1434,7 +1431,6 @@
   "material.selection.mixed": "서로 다른 재질",
   "measure.at": "위치",
   "measure.item": "항목 {number}",
-  "measure.line_to_centre": "선에서 중심까지",
   "messages.ago_h": "{n}시간 전",
   "messages.ago_min": "{n}분 전",
   "messages.ago_s": "{n}초 전",
@@ -1661,14 +1657,6 @@
   "prefs.auto_operation_note": "재료가 닿는 대상에 따라 결합, 새 바디 또는 자르기를 선택합니다.",
   "prefs.axes": "축",
   "prefs.axis": "축",
-  "prefs.blur_cost": "상대적인 렌더링 비용입니다. 막대가 많을수록 일반적으로 더 많은 작업이 필요합니다.",
-  "prefs.blur_device": "이 그래픽 장치 또는 렌더링 경로에서는 사용할 수 없습니다",
-  "prefs.blur_guard": "화면의 원활한 응답을 위해 흐림 품질을 낮췄습니다. 반경은 변경되지 않습니다.",
-  "prefs.blur_off": "끄기",
-  "prefs.blur_reduce_transparency": "시스템의 투명도 줄이기 설정에 의해 비활성화됨",
-  "prefs.blur_software": "소프트웨어 그래픽에서는 사용할 수 없습니다 (gpu-software)",
-  "prefs.blur_source": "이 작업 공간 보기에서는 사용할 수 없습니다",
-  "prefs.blur_web": "이 웹 렌더링 경로에서는 사용할 수 없습니다",
   "prefs.bodies_folders": "바디 폴더",
   "prefs.bodies_folders_always": "항상 표시",
   "prefs.bodies_folders_never": "표시 안 함",
@@ -1724,13 +1712,6 @@
   "prefs.dialogs_edge": "뷰 가장자리",
   "prefs.dialogs_left_column": "왼쪽 열",
   "prefs.dialogs_note": "명령 대화 상자가 열리는 위치: 뷰 가장자리에 고정하거나, 왼쪽 열에서 브라우저와 이력 대신 표시합니다. 대화 상자를 닫으면 브라우저와 이력이 그대로 돌아옵니다.",
-  "prefs.dimension_step_angle": "창의 화살표, 위/아래 키와 휠이 각도에 더하는 값",
-  "prefs.dimension_step_length": "창의 화살표, 위/아래 키와 휠이 길이에 더하는 값",
-  "prefs.dimension_steps": "창의 증감 단위",
-  "prefs.dimension_values": "치수 값",
-  "prefs.dimension_values_note": "치수 값을 입력하는 위치입니다. 창에는 값을 증감하는 화살표가 있으며, 치수 도구는 텍스트를 먼저 배치합니다.",
-  "prefs.dimension_values_view": "뷰에서",
-  "prefs.dimension_values_window": "창에서",
   "prefs.display": "표시",
   "prefs.edges": "모서리 및 음영",
   "prefs.extend": "확장",
@@ -1994,10 +1975,6 @@
   "prefs.theme_follow_note": "다른 도구가 파일을 다시 쓸 때마다 다시 불러옵니다. 테마를 선택하면 따르기를 중지합니다.",
   "prefs.theme_follow_off": "끄기",
   "prefs.theme_follow_stop": "따르기 중지",
-  "prefs.theme_notice_dismiss": "닫기",
-  "prefs.theme_option_blur": "패널 뒤 흐림",
-  "prefs.theme_option_blur_help": "반투명 패널 뒤의 흐림을 물리적 픽셀 단위로 설정합니다. 0이면 꺼집니다.",
-  "prefs.theme_option_invalid": "{option}의 저장된 값이 유효하지 않아 테마 기본값을 사용합니다. 저장된 값은 유지됩니다.",
   "prefs.theme_option_opacity": "불투명도",
   "prefs.theme_option_opacity_help": "플로팅 패널의 불투명도를 조정합니다. 뷰포트 색상 위에서도 텍스트를 읽을 수 있도록 최솟값이 적용됩니다.",
   "prefs.theme_option_tab_colours": "탭 색상",
@@ -2006,7 +1983,6 @@
   "prefs.theme_option_tab_fade_ms_help": "탭을 전환할 때 패널 및 뷰포트 색상을 서서히 변경합니다. 0이면 즉시 전환합니다.",
   "prefs.theme_options_badge": "옵션",
   "prefs.theme_options_more": "더 보기 · {count}",
-  "prefs.theme_options_newer": "이 테마에는 더 최신 버전의 SolidCraft가 필요합니다. 업그레이드 후 원본 테마를 다시 가져와 옵션 정의를 복구하세요.",
   "prefs.theme_options_reset": "초기화",
   "prefs.theme_options_unavailable": "이 기기에서는 사용할 수 없음",
   "prefs.timeline_half_hour": "−30분",
@@ -3586,7 +3562,6 @@
   "ui.default_modelling_orientation": "기본 모델링 방향",
   "ui.delete": "삭제",
   "ui.delete_select_first": "먼저 삭제할 항목을 선택하세요: 피처, 바디, 컴포넌트 또는 스케치 형상",
-  "ui.dependents_select_first": "먼저 종속 항목을 표시할 대상을 선택하세요",
   "ui.depth": "깊이",
   "ui.design": "디자인",
   "ui.design_properties.author": "작성자",
@@ -3737,10 +3712,6 @@
   "ui.fillet_setback_least": "{least}보다 크게",
   "ui.fillet_setback_tip": "부드러운 코너 패치가 시작되는 위치: 코너에서 각 모서리를 따른 거리. 기본값은 반지름의 {factor}배. 최소 셋백(셋백 없이 라운드가 만나는 곳, 면이 서로 직각이면 반지름)보다 커야 합니다.",
   "ui.fillet_smooth_radius": "반지름 부드럽게 변화",
-  "ui.fillet_turn": "꺾임",
-  "ui.fillet_turn_mitre": "마이터",
-  "ui.fillet_turn_swept": "회전",
-  "ui.fillet_turn_tip": "두 라운드가 사이의 날카로운 코너 모서리를 돌아가는 곳(보스 밑동의 라운드가 세로 모서리를 도는 곳 등).\n마이터: 라운드가 계속 이어져 마이터로 만납니다.\n회전: 라운드가 코너 모서리에서 멈추고 그 둘레를 돕니다. 코너는 둘 모두에 접하는 토러스입니다. 반지름이 같은 라운드가 곧고 볼록한 코너 모서리를 돌 때만.",
   "ui.fillet_type_choices_tip": "일정한 반지름: 모서리 전체에 하나의 반지름.\n현 길이: 면이 어떤 각도로 만나든 라운드의 폭이 같습니다.\n가변 반지름: 양 끝의 반지름과, 추가하면 모서리를 따라 더.\n곡률 연속: 평면과 만나는 곳에서 반사가 꺾이지 않는 단면(G2).\n스플라인: 모서리를 따라 반지름이 설정한 제어 반지름을 따릅니다.",
   "ui.fillet_type_curvature": "곡률 연속",
   "ui.fillet_type_tip": "모서리를 가로지르는 단면. 곡률 연속: 평면 사이의 곡률 연속(G2) 단면으로, 반사가 면에서 라운드로 꺾임 없이 이어집니다.",

assets/locales/nl.json

@@ -1368,9 +1368,6 @@
   "dialog.custom_axis": "↖ Aangepaste as",
   "dialog.dimension_insert_hint": "Klik op een andere aandrijvende maat om de naam ervan in te voegen",
   "dialog.dimension_name": "Maat: {name}",
-  "dialog.dimension_step_down": "{step} omlaag",
-  "dialog.dimension_step_expression": "Alleen een getal verspringt; een uitdrukking blijft zoals ingevoerd",
-  "dialog.dimension_step_up": "{step} omhoog",
   "dialog.edit_title": "{title} BEWERKEN",
   "dialog.no_shown_body": "Geen zichtbaar lichaam om te wijzigen: toon er een of kies Nieuw lichaam",
   "dialog.pattern_sketch_not_object": "Kies lichamen of kenmerken: een schets is geen van beide. Herhaal de curven ervan met het eigen Patroon of Spiegelen van de schets, of extrudeer de schets eerst.",
@@ -1395,7 +1392,6 @@
   "document.read_only_save": "Dit ontwerp is alleen-lezen geopend: sla het op als nieuw bestand",
   "document.save_changes": "Wijzigingen in {name} opslaan?",
   "document.save_copy": "Kopie opslaan…",
-  "document.tab_unsaved_changes": "Niet-opgeslagen wijzigingen",
   "document.unsaved_changes": "{name} heeft niet-opgeslagen wijzigingen. Als u niet opslaat, gaan ze verloren.",
   "drive.rigid": "{joint} is een starre verbinding: die houdt zijn onderdelen vast en heeft dus niets om aan te sturen. Wijzig het type in Verbinding bewerken om ze te laten bewegen: Draaiend om te draaien, Schuivend om te schuiven, Cilindrisch voor beide.",
   "drive.stopped_by_contact": "Gestopt bij {value}: {a} zou door {b} heen gaan",
@@ -2198,13 +2194,6 @@
   "prefs.dialogs_edge": "Aan de rand van de weergave",
   "prefs.dialogs_left_column": "In de linkerkolom",
   "prefs.dialogs_note": "Waar opdrachtdialogen openen: vastgezet aan de rand van de weergave, of in de linkerkolom in plaats van de browser en de geschiedenis, die terugkomen zoals ze waren wanneer de dialoog sluit.",
-  "prefs.dimension_step_angle": "Wat de pijlen van het venster, Omhoog/Omlaag en het wieltje bij een hoek optellen",
-  "prefs.dimension_step_length": "Wat de pijlen van het venster, Omhoog/Omlaag en het wieltje bij een lengte optellen",
-  "prefs.dimension_steps": "Stappen in het venster",
-  "prefs.dimension_values": "Maatwaarden",
-  "prefs.dimension_values_note": "Waar de waarde van een maat wordt ingevoerd. Een venster heeft pijlen die de waarde laten verspringen; het maatgereedschap plaatst eerst de tekst.",
-  "prefs.dimension_values_view": "In de weergave",
-  "prefs.dimension_values_window": "In een venster",
   "prefs.display": "Weergave",
   "prefs.edges": "Randen en schaduwing",
   "prefs.extend": "Verlengen",

assets/locales/pending/graphics-api-trial.json

@@ -1,86 +0,0 @@
-{
-  "ar": {
-    "settings.graphics_api_env": "يحدده متغير البيئة WGPU_BACKEND ({value})",
-    "settings.graphics_api_freezes": "على بطاقات AMD الرسومية المدمجة، قد تؤدي {api} إلى تجمد الشاشة، وأحيانًا حتى إعادة تشغيل الكمبيوتر. يستخدم الخيار التلقائي Vulkan هنا.",
-    "settings.graphics_applies_on_restart": "تُطبّق هذه الإعدادات عند تشغيل SolidCraft مجددًا. سيسألك حينها إن كنت تريد الاحتفاظ بها، ويعود إلى الإعدادات الحالية إن لم توافق.",
-    "settings.graphics_msaa": "تنعيم الحواف بمقدار {samples}×",
-    "settings.graphics_restart_now": "إعادة التشغيل الآن",
-    "settings.graphics_trial_body": "بدأ SolidCraft باستخدام {settings}. دون إجابة، سيعود خلال {seconds} ثانية إلى {previous}.",
-    "settings.graphics_trial_first": "احتفظ بإعدادات الرسومات قيد التجربة أو ارجع عنها أولًا",
-    "settings.graphics_trial_keep": "احتفاظ",
-    "settings.graphics_trial_revert": "رجوع",
-    "settings.graphics_trial_title": "هل تريد الاحتفاظ بإعدادات الرسومات هذه؟",
-    "ui.graphics_api": "واجهة برمجة الرسومات",
-    "ui.graphics_api_auto": "تلقائي"
-  },
-  "en": {
-    "settings.graphics_api_env": "Set by the WGPU_BACKEND environment variable ({value})",
-    "settings.graphics_api_freezes": "On AMD integrated graphics, {api} can freeze the screen, sometimes until the computer is restarted. Automatic uses Vulkan here.",
-    "settings.graphics_applies_on_restart": "These apply when SolidCraft starts again. It then asks whether to keep them, and goes back to the current ones if you don't.",
-    "settings.graphics_msaa": "{samples}× anti-aliasing",
-    "settings.graphics_restart_now": "Restart now",
-    "settings.graphics_trial_body": "SolidCraft started with {settings}. Without an answer, in {seconds} s it goes back to {previous}.",
-    "settings.graphics_trial_first": "Keep or go back from the graphics settings being tried first",
-    "settings.graphics_trial_keep": "Keep",
-    "settings.graphics_trial_revert": "Go back",
-    "settings.graphics_trial_title": "Keep these graphics settings?",
-    "ui.graphics_api": "Graphics API",
-    "ui.graphics_api_auto": "Automatic"
-  },
-  "he": {
-    "settings.graphics_api_env": "נקבע על ידי משתנה הסביבה WGPU_BACKEND ({value})",
-    "settings.graphics_api_freezes": "בגרפיקה המשולבת של AMD, ‏{api} עלול להקפיא את המסך, לפעמים עד להפעלה מחדש של המחשב. האפשרות האוטומטית משתמשת כאן ב־Vulkan.",
-    "settings.graphics_applies_on_restart": "הגדרות אלה יחולו בהפעלה הבאה של SolidCraft. אז תופיע שאלה אם לשמור אותן, ואם לא, ההגדרות הנוכחיות ישוחזרו.",
-    "settings.graphics_msaa": "החלקת קצוות פי {samples}",
-    "settings.graphics_restart_now": "הפעלה מחדש כעת",
-    "settings.graphics_trial_body": "SolidCraft הופעל עם {settings}. ללא תשובה, בעוד {seconds} שניות הוא יחזור אל {previous}.",
-    "settings.graphics_trial_first": "יש לשמור את הגדרות הגרפיקה שבניסיון או לחזור מהן תחילה",
-    "settings.graphics_trial_keep": "שמירה",
-    "settings.graphics_trial_revert": "חזרה",
-    "settings.graphics_trial_title": "לשמור את הגדרות הגרפיקה האלה?",
-    "ui.graphics_api": "ממשק הגרפיקה",
-    "ui.graphics_api_auto": "אוטומטי"
-  },
-  "ja": {
-    "settings.graphics_api_env": "環境変数 WGPU_BACKEND で指定されています ({value})",
-    "settings.graphics_api_freezes": "AMD の内蔵グラフィックスでは、{api} で画面が固まり、コンピューターを再起動するまで戻らないことがあります。自動ではここで Vulkan を使います。",
-    "settings.graphics_applies_on_restart": "これらは SolidCraft の次回起動時に適用されます。起動後に設定を維持するか確認し、維持しない場合は現在の設定に戻ります。",
-    "settings.graphics_msaa": "アンチエイリアス {samples}×",
-    "settings.graphics_restart_now": "今すぐ再起動",
-    "settings.graphics_trial_body": "SolidCraft は {settings} で起動しました。応答がない場合、{seconds} 秒後に {previous} に戻ります。",
-    "settings.graphics_trial_first": "先に、試用中のグラフィックス設定を維持するか戻すかを選んでください",
-    "settings.graphics_trial_keep": "維持",
-    "settings.graphics_trial_revert": "元に戻す",
-    "settings.graphics_trial_title": "このグラフィックス設定を維持しますか？",
-    "ui.graphics_api": "グラフィックス API",
-    "ui.graphics_api_auto": "自動"
-  },
-  "vi": {
-    "settings.graphics_api_env": "Được đặt bởi biến môi trường WGPU_BACKEND ({value})",
-    "settings.graphics_api_freezes": "Trên đồ họa tích hợp AMD, {api} có thể làm màn hình bị treo, đôi khi cho đến khi khởi động lại máy tính. Tự động sử dụng Vulkan ở đây.",
-    "settings.graphics_applies_on_restart": "Các thiết lập này có hiệu lực khi SolidCraft khởi động lại. Khi đó ứng dụng sẽ hỏi có giữ chúng không và trở về thiết lập hiện tại nếu bạn không giữ.",
-    "settings.graphics_msaa": "Khử răng cưa {samples}×",
-    "settings.graphics_restart_now": "Khởi động lại ngay",
-    "settings.graphics_trial_body": "SolidCraft đã khởi động với {settings}. Nếu không trả lời, sau {seconds} giây ứng dụng sẽ trở về {previous}.",
-    "settings.graphics_trial_first": "Trước tiên hãy giữ hoặc quay lại từ các thiết lập đồ họa đang thử",
-    "settings.graphics_trial_keep": "Giữ",
-    "settings.graphics_trial_revert": "Quay lại",
-    "settings.graphics_trial_title": "Giữ các thiết lập đồ họa này?",
-    "ui.graphics_api": "API đồ họa",
-    "ui.graphics_api_auto": "Tự động"
-  },
-  "zh": {
-    "settings.graphics_api_env": "由环境变量 WGPU_BACKEND 设置（{value}）",
-    "settings.graphics_api_freezes": "在 AMD 集成显卡上，{api} 可能导致屏幕冻结，有时需要重启电脑才能恢复。自动选项在这里使用 Vulkan。",
-    "settings.graphics_applies_on_restart": "这些设置在 SolidCraft 下次启动时生效。启动后会询问是否保留；如果不保留，将恢复为当前设置。",
-    "settings.graphics_msaa": "{samples}× 抗锯齿",
-    "settings.graphics_restart_now": "立即重启",
-    "settings.graphics_trial_body": "SolidCraft 已使用 {settings} 启动。如果没有回应，将在 {seconds} 秒后恢复为 {previous}。",
-    "settings.graphics_trial_first": "请先决定保留还是撤销正在试用的图形设置",
-    "settings.graphics_trial_keep": "保留",
-    "settings.graphics_trial_revert": "恢复",
-    "settings.graphics_trial_title": "保留这些图形设置吗？",
-    "ui.graphics_api": "图形 API",
-    "ui.graphics_api_auto": "自动"
-  }
-}

assets/locales/pl.json

@@ -1347,7 +1347,6 @@
   "document.read_only_save": "Ten projekt otwarto tylko do odczytu: zapisz go jako nowy plik",
   "document.save_changes": "Zapisać zmiany w {name}?",
   "document.save_copy": "Zapisz kopię…",
-  "document.tab_unsaved_changes": "Niezapisane zmiany",
   "document.unsaved_changes": "{name} ma niezapisane zmiany. Jeśli ich nie zapiszesz, zostaną utracone.",
   "drive.rigid": "{joint} to złącze sztywne: utrzymuje swoje części nieruchomo, więc nie ma czym sterować. Aby mogły się poruszać, zmień jego typ w Edytuj złącze: Obrotowe do obrotu, Przesuwne do przesuwu, Walcowe do obu.",
   "drive.stopped_by_contact": "Zatrzymano przy {value}: {a} przeszedłby przez {b}",

assets/locales/ru.json

@@ -182,8 +182,6 @@
   "Designs you open or save appear here.": "Здесь появляются открытые и сохранённые дизайны.",
   "Determined by To Object. Choose Angle to edit the angular extent.": "Определяется параметром «До объекта». Выберите «Угол», чтобы задать угловой предел.",
   "Diameter": "Диаметр",
-  "Did this assembly open the wrong way up?": "Эта сборка открылась не той стороной вверх?",
-  "Did this part open the wrong way up?": "Эта деталь открылась не той стороной вверх?",
   "Dimension new shapes": "Проставлять размеры новых фигур",
   "Direction": "Направление",
   "Discard": "Отменить",
@@ -608,7 +606,6 @@
   "Square": "Квадрат",
   "Stand it up": "Поставить вертикально",
   "Stand it up: a quarter turn about X, as one Move feature you can undo.": "Поставить вертикально: четверть оборота вокруг X одной операцией «Переместить», которую можно отменить.",
-  "Stand this assembly up?": "Поставить эту сборку вертикально?",
   "Stand this part up?": "Поставить эту деталь вертикально?",
   "Start angle": "Начальный угол",
   "Start bulge": "Выпуклость в начале",
@@ -1359,7 +1356,6 @@
   "dialog.dimension_insert_hint": "Дважды щёлкните другой управляющий размер, чтобы вставить его имя",
   "dialog.dimension_name": "Размер: {name}",
   "dialog.edit_title": "ИЗМЕНИТЬ: {title}",
-  "dialog.no_shown_body": "Нет отображаемого тела для изменения: покажите тело или выберите «Новое тело»",
   "dialog.pattern_sketch_not_object": "Выберите тела или операции: эскиз — ни то, ни другое. Повторите его кривые собственным инструментом «Массив» или «Зеркало» в эскизе либо сначала выдавите его.",
   "dialog.select": "↖ Выбрать",
   "dialog.selected_count": "↖ Выбрано: {count}",
@@ -1721,8 +1717,6 @@
   "help.view.spin": "Непрерывно вращает вид вокруг модели до следующего щелчка или нажатия клавиши. Используйте, чтобы показать модель со всех сторон.",
   "help.view.tool": "Закрепляет инструмент камеры (орбиту, панорамирование или масштаб), так что перетаскивание левой кнопкой мыши двигает вид, пока вы его не отключите. Используйте на трекпаде или без средней кнопки мыши.",
   "help.view.visual_style": "Переключает способ отрисовки модели: тонированная с рёбрами или без них, каркас или со скрытыми рёбрами. Используйте каркас, чтобы заглянуть внутрь, а тонированный вид — для чистого вида.",
-  "history.sketch_under_constrained": "Недоопределён (степеней свободы: {count})",
-  "history.sketch_under_constrained_one": "Недоопределён (степеней свободы: {count})",
   "hole_presets.confirm_delete": "Подтвердить удаление",
   "hole_presets.delete": "Удалить",
   "hole_presets.delete_prompt": "Удалить этот личный пресет? Существующие отверстия не изменятся.",
@@ -2134,8 +2128,6 @@
   "prefs.anti_aliasing_note": "Сглаживает неровные края.",
   "prefs.applies_on_restart": "Применяется после перезапуска",
   "prefs.assistant": "Ассистент",
-  "prefs.auto_operation": "Выбирать операцию автоматически",
-  "prefs.auto_operation_note": "Окна операций сами выбирают «Объединить», «Новое тело» или «Вырезать» в зависимости от того, чего касается новый материал, пока вы не выберете операцию вручную. Выкл.: окна сохраняют ту операцию, с которой открылись.",
   "prefs.axes": "Оси",
   "prefs.axis": "Ось",
   "prefs.bodies_folders": "Папки тел",
@@ -2357,8 +2349,6 @@
   "prefs.sketch_selection": "Эскиз и выделение",
   "prefs.sketch_selection_heading": "Эскиз и выделение",
   "prefs.sketch_selection_note": "Как работает привязка в эскизах и как щелчки выделяют объекты.",
-  "prefs.sketch_state_icons": "Значки эскизов в цвете их состояния",
-  "prefs.sketch_state_icons_note": "В истории и браузере значок эскиза принимает цвет его состояния (недоопределён, полностью определён или с конфликтом), а подсказка называет это состояние. Выкл.: у всех эскизов одинаковый значок.",
   "prefs.sketch_tab_always": "Всегда показывать вкладку «Эскиз»",
   "prefs.sketch_tab_always_note": "Вкладка «Эскиз» остаётся на ленте сразу после «Модель», пока не открыт ни один эскиз. Её инструменты рисования создают эскиз на выбранной плоскости или грани либо на плоскости, которую вы выберете следом, и сразу включают нужный инструмент.",
   "prefs.sketch_tracking_guides": "Направляющие выравнивания по центру и середине",
@@ -2370,11 +2360,6 @@
   "prefs.source": "Источник",
   "prefs.speed": "Скорость",
   "prefs.stand_up_note": "После открытия файла STEP или IGES с осью Z вверх предлагать повернуть его на четверть оборота вокруг X.",
-  "prefs.stand_up_unknown": "Для файлов из неизвестных программ",
-  "prefs.stand_up_unknown.ask": "Спрашивать в диалоговом окне",
-  "prefs.stand_up_unknown.note": "Показывать уведомление",
-  "prefs.stand_up_unknown.off": "Не предлагать",
-  "prefs.stand_up_unknown_note": "Как делается предложение, когда в заголовке файла не указана программа, о которой известно, что она сохраняет с осью Y вверх. Уведомление показывается, только если файл, судя по всему, лежит на спине; «Спрашивать в диалоговом окне» спрашивает о каждом таком файле, как раньше.",
   "prefs.status_bar": "Строка состояния",
   "prefs.status_bar_note": "Тонкая полоса вдоль нижнего края окна показывает, что изменяется, состояние открытого эскиза его цветом и единицы дизайна; щелчок по единицам изменяет их. Состояние эскиза при этом больше не показывается в углу вида.",
   "prefs.status_done": "Готово",
@@ -3917,10 +3902,8 @@
   "timeline.move_to_group": "Переместить операции в папку",
   "timeline.rename_group": "Переименовать папку операций",
   "timeline.reorder_many": "Изменить порядок операций",
-  "timeline.suppress_features": "Подавить операции",
   "timeline.suppress_folders_tip": "Подавить или снять подавление со всех операций в папках и вложенных папках",
   "timeline.ungroup": "Убрать папки операций",
-  "timeline.unsuppress_features": "Снять подавление с операций",
   "to the face": "до грани",
   "to the next face": "до следующей грани",
   "toolbar.customize_note": "Вкладка {tab}. Отметьте команду, чтобы добавить её кнопку на панель инструментов. Можно также перетащить строку из выпадающего меню панели на панель инструментов, перетащить кнопку за пределы панели для удаления или использовать значок закрепления в строке выпадающего меню.",
@@ -4366,8 +4349,6 @@
   "ui.cancel": "Отмена",
   "ui.canvases": "Подложки",
   "ui.center": "Центр",
-  "ui.center_arc_follows_cursor": "Дуга из центра следует направлению курсора",
-  "ui.center_arc_follows_cursor_tip": "Дуга из центра идёт по часовой стрелке или против неё — в ту сторону, в которую курсор обходит её центр. Выкл.: всегда против часовой стрелки от начальной точки.",
   "ui.centerline": "Осевая линия",
   "ui.chain": "Цепочка",
   "ui.chamfer": "Фаска",
@@ -5179,13 +5160,11 @@
   "update.installed": "SolidCraft {version} установлен. Перезапустите, чтобы использовать его.",
   "update.installer_started": "Установщик запустится после закрытия SolidCraft.",
   "update.later": "Напомнить позже",
-  "update.managed": "Доступно обновление: обновите SolidCraft в {manager}",
   "update.no_notes": "У этого выпуска нет примечаний.",
   "update.package_hint": "Эта копия установлена из {kind}. Скачайте новый пакет, затем установите его командой:",
   "update.prefs_dev": "Это сборка для разработки ({version}): она не проверяет обновления.",
   "update.prefs_flatpak": "Эту копию ({version}) обновляет Flatpak: выполните {command} или воспользуйтесь центром приложений. SolidCraft не проверяет обновления.",
   "update.prefs_label": "Обновления",
-  "update.prefs_managed": "Это SolidCraft {version}, которым управляет {manager}. Проверка запрашивает у GitHub последний релиз и больше ничего не отправляет; обновляйте SolidCraft в {manager}.",
   "update.prefs_note": "Это SolidCraft {version} ({kind}). При проверке у GitHub запрашивается последний выпуск, больше ничего не отправляется.",
   "update.prefs_web": "Перезагрузите страницу, чтобы получить последнюю версию веб-приложения. Если сеть недоступна или обновление не успевает загрузиться, открывается сохранённая версия; незавершённая загрузка продолжится до следующей перезагрузки.",
   "update.refresh_checking": "Проверка наличия новейшего выпуска…",

assets/locales/sv.json

@@ -1392,7 +1392,6 @@
   "document.read_only_save": "Den här konstruktionen öppnades skrivskyddad: spara den som en ny fil",
   "document.save_changes": "Spara ändringar i {name}?",
   "document.save_copy": "Spara en kopia…",
-  "document.tab_unsaved_changes": "Osparade ändringar",
   "document.unsaved_changes": "{name} har osparade ändringar. Om du inte sparar går de förlorade.",
   "drive.rigid": "{joint} är ett stelt led: det håller sina delar stilla och har därför inget att driva. Om delarna ska kunna röra sig, ändra ledets typ i Redigera led: Roterande för att rotera, Glidande för att glida, Cylindrisk för båda.",
   "drive.stopped_by_contact": "Stoppade vid {value}: {a} skulle gå igenom {b}",

assets/locales/vi.json

@@ -1396,9 +1396,6 @@
   "dialog.custom_axis": "↖ Trục tùy chỉnh",
   "dialog.dimension_insert_hint": "Nhấp vào một kích thước điều khiển khác để chèn tên của nó",
   "dialog.dimension_name": "Kích thước: {name}",
-  "dialog.dimension_step_down": "Giảm {step}",
-  "dialog.dimension_step_expression": "Chỉ số mới thay đổi theo bước; biểu thức giữ nguyên như đã nhập",
-  "dialog.dimension_step_up": "Tăng {step}",
   "dialog.edit_title": "CHỈNH SỬA {title}",
   "dialog.no_shown_body": "Không có thân khối đang hiển thị để thay đổi: hãy hiển thị một thân khối, hoặc chọn “Tạo mới Thân khối”",
   "dialog.pattern_sketch_not_object": "Hãy chọn thân khối hoặc tính năng: bản phác thảo không phải là cả hai. Lặp lại các đường cong của nó bằng Mảng hoặc Lấy đối xứng trong chính bản phác thảo, hoặc đùn khối nó trước.",
@@ -1406,7 +1403,6 @@
   "dialog.selected_count": "↖ {count} đã chọn",
   "dialog.selection_constraint": "Ràng buộc {id}",
   "dialog.selection_external_curve": "{sketch} · đường cong {id}",
-  "dialog.selection_external_point": "{point} · {sketch}",
   "dialog.selection_guidance": "Chọn một mục đầu vào để thay đổi. Nhấp vào đối tượng đã chọn để bỏ chọn; Ctrl/Cmd-nhấp để bật/tắt chọn. Xem trước kết quả, sau đó nhấn OK.",
   "dialog.selection_midpoint": "Trung điểm · {id}",
   "dialog.selection_profile": "{sketch} · biên dạng {number}",
@@ -1424,7 +1420,6 @@
   "document.read_only_save": "Thiết kế này được mở ở chế độ chỉ đọc: hãy lưu thành tệp mới",
   "document.save_changes": "Lưu các thay đổi đối với {name}?",
   "document.save_copy": "Lưu bản sao…",
-  "document.tab_unsaved_changes": "Thay đổi chưa lưu",
   "document.unsaved_changes": "{name} có các thay đổi chưa lưu. Nếu không lưu, các thay đổi sẽ bị mất.",
   "drive.rigid": "{joint} là khớp nối cứng: nó giữ cố định các chi tiết, nên không có gì để dẫn động. Để các chi tiết chuyển động, hãy đổi loại khớp nối trong “Chỉnh sửa khớp nối”: Revolute để xoay, Slider để trượt, Cylindrical cho cả hai.",
   "drive.stopped_by_contact": "Đã dừng tại {value}: {a} sẽ xuyên qua {b}",
@@ -2004,7 +1999,6 @@
   "material.selection.mixed": "Các vật liệu khác nhau",
   "measure.at": "Tại",
   "measure.item": "Mục {number}",
-  "measure.line_to_centre": "Từ đường đến tâm",
   "measure.quick_copied": "Đã sao chép số đo",
   "measure.quick_copy": "Nhấp để sao chép số đo",
   "measure.quick_edges": "{count} cạnh",
@@ -2271,14 +2265,6 @@
   "prefs.auto_operation_note": "Nối, Vật thể mới hoặc Cắt, tùy vào phần vật liệu tiếp xúc.",
   "prefs.axes": "Các trục tọa độ",
   "prefs.axis": "Trục tọa độ",
-  "prefs.blur_cost": "Chi phí kết xuất tương đối. Nhiều thanh hơn thường có nghĩa là cần xử lý nhiều hơn.",
-  "prefs.blur_device": "Không khả dụng trên thiết bị đồ họa hoặc đường kết xuất này",
-  "prefs.blur_guard": "Chất lượng làm mờ đã giảm để duy trì độ phản hồi của khung hình. Bán kính không thay đổi.",
-  "prefs.blur_off": "Tắt",
-  "prefs.blur_reduce_transparency": "Bị tắt bởi cài đặt Giảm độ trong suốt của hệ thống",
-  "prefs.blur_software": "Không khả dụng với đồ họa phần mềm (gpu-software)",
-  "prefs.blur_source": "Không khả dụng trong chế độ xem không gian làm việc này",
-  "prefs.blur_web": "Không khả dụng trên đường kết xuất web này",
   "prefs.bodies_folders": "Thư mục thân khối",
   "prefs.bodies_folders_always": "Luôn luôn",
   "prefs.bodies_folders_never": "Không bao giờ",
@@ -2337,13 +2323,6 @@
   "prefs.dialogs_edge": "Ở cạnh khung nhìn",
   "prefs.dialogs_left_column": "Trong cột bên trái",
   "prefs.dialogs_note": "Nơi hộp thoại lệnh mở ra: gắn ở cạnh khung nhìn, hoặc trong cột bên trái thay cho trình duyệt và Lịch sử, hai phần này trở lại như cũ khi hộp thoại đóng.",
-  "prefs.dimension_step_angle": "Lượng mà mũi tên của cửa sổ, Lên/Xuống và con lăn cộng vào một góc",
-  "prefs.dimension_step_length": "Lượng mà mũi tên của cửa sổ, Lên/Xuống và con lăn cộng vào một độ dài",
-  "prefs.dimension_steps": "Bước của cửa sổ",
-  "prefs.dimension_values": "Giá trị kích thước",
-  "prefs.dimension_values_note": "Nơi bạn nhập giá trị kích thước. Cửa sổ có mũi tên để thay đổi theo bước; công cụ Kích thước đặt văn bản trước.",
-  "prefs.dimension_values_view": "Trong khung nhìn",
-  "prefs.dimension_values_window": "Trong một cửa sổ",
   "prefs.display": "Hiển thị",
   "prefs.edges": "Cạnh và đổ bóng",
   "prefs.extend": "Kéo dài",
@@ -2671,10 +2650,6 @@
   "prefs.theme_follow_off": "Tắt",
   "prefs.theme_follow_stop": "Dừng theo dõi",
   "prefs.theme_import_hint": "Nhấp để chọn tệp giao diện, thả tệp vào đây, hoặc nhấn Ctrl+V (Cmd+V trên Mac) khi đã sao chép một giao diện",
-  "prefs.theme_notice_dismiss": "Ẩn",
-  "prefs.theme_option_blur": "Làm mờ phía sau bảng",
-  "prefs.theme_option_blur_help": "Làm mờ phía sau các bảng bán trong suốt, tính bằng pixel vật lý. Giá trị 0 là tắt.",
-  "prefs.theme_option_invalid": "Giá trị đã lưu cho {option} không hợp lệ; đang dùng giá trị mặc định của giao diện. Giá trị đã lưu vẫn được giữ lại.",
   "prefs.theme_option_opacity": "Độ đục",
   "prefs.theme_option_opacity_help": "Điều chỉnh độ đục của các bảng nổi. Giới hạn độ đục tối thiểu giúp văn bản luôn dễ đọc trên nền màu của khung nhìn.",
   "prefs.theme_option_tab_colours": "Màu thẻ",
@@ -2683,7 +2658,6 @@
   "prefs.theme_option_tab_fade_ms_help": "Chuyển dần màu của bảng điều khiển và khung nhìn khi đổi thẻ. Đặt thành 0 để chuyển ngay lập tức.",
   "prefs.theme_options_badge": "Tùy chọn",
   "prefs.theme_options_more": "Thêm · {count}",
-  "prefs.theme_options_newer": "Giao diện này yêu cầu phiên bản SolidCraft mới hơn. Sau khi nâng cấp, hãy nhập lại giao diện gốc để khôi phục các định nghĩa tùy chọn.",
   "prefs.theme_options_reset": "Đặt lại",
   "prefs.theme_options_unavailable": "Không khả dụng trên thiết bị này",
   "prefs.theme_paste": "Dán giao diện",
@@ -4810,7 +4784,6 @@
   "ui.default_modelling_orientation": "Hướng mô hình hóa mặc định",
   "ui.delete": "Xóa",
   "ui.delete_select_first": "Hãy chọn trước những gì cần xóa: tính năng, khối, thành phần hoặc hình học phác thảo",
-  "ui.dependents_select_first": "Hãy chọn trước đối tượng để liệt kê các phần phụ thuộc của nó",
   "ui.depth": "Độ sâu",
   "ui.design": "Thiết kế",
   "ui.design_properties.author": "Tác giả",
@@ -4968,10 +4941,6 @@
   "ui.fillet_setback_least": "Lớn hơn {least}",
   "ui.fillet_setback_tip": "Nơi mảng góc trơn bắt đầu: khoảng cách dọc theo mỗi cạnh tính từ góc. Mặc định là {factor} × bán kính. Giá trị phải lớn hơn khoảng lùi nhỏ nhất, tại đó các đường bo gặp nhau mà không cần lùi: bằng bán kính khi các mặt vuông góc với nhau.",
   "ui.fillet_smooth_radius": "Thay đổi bán kính trơn",
-  "ui.fillet_turn": "Chỗ rẽ",
-  "ui.fillet_turn_mitre": "Vát góc",
-  "ui.fillet_turn_swept": "Quét vòng",
-  "ui.fillet_turn_tip": "Nơi hai góc lượn rẽ quanh một cạnh góc sắc nằm giữa chúng, ví dụ các góc lượn ở chân một khối lồi tại các cạnh đứng của nó.\nVát góc: các góc lượn kéo dài cho đến khi gặp nhau theo đường vát.\nQuét vòng: các góc lượn dừng ở cạnh góc và quay quanh nó, góc là một mặt xuyến tiếp xúc với cả hai. Chỉ cho các góc lượn cùng bán kính quanh một cạnh góc thẳng và lồi.",
   "ui.fillet_type_choices_tip": "Bán kính không đổi: một bán kính dọc suốt cạnh.\nĐộ dài dây cung: độ rộng ngang đường bo giữ nguyên, bất kể góc gặp nhau của các mặt.\nBán kính thay đổi: một bán kính ở mỗi đầu, và thêm dọc cạnh nếu bạn thêm vào.\nLiên tục độ cong: mặt cắt không làm gãy phản chiếu tại nơi gặp các mặt phẳng (G2).\nSpline: bán kính dọc cạnh theo các bán kính điều khiển bạn đặt.",
   "ui.fillet_type_curvature": "Liên tục độ cong",
   "ui.fillet_type_tip": "Mặt cắt ngang qua cạnh. Liên tục độ cong: mặt cắt liên tục độ cong (G2) giữa các mặt phẳng, nên phản chiếu đi từ các mặt vào đường bo mà không bị gãy.",

assets/locales/zh.json

@@ -1396,9 +1396,6 @@
   "dialog.custom_axis": "↖ 自定义轴",
   "dialog.dimension_insert_hint": "单击其他驱动尺寸以插入其名称",
   "dialog.dimension_name": "尺寸：{name}",
-  "dialog.dimension_step_down": "减少 {step}",
-  "dialog.dimension_step_expression": "只有数字可以增减；表达式保持不变",
-  "dialog.dimension_step_up": "增加 {step}",
   "dialog.edit_title": "编辑 {title}",
   "dialog.no_shown_body": "没有可更改的显示实体：请显示一个实体，或选择新建实体",
   "dialog.pattern_sketch_not_object": "请选择实体或特征：草图两者都不是。请用草图自身的阵列或镜像重复其曲线，或先将其拉伸。",
@@ -1406,7 +1403,6 @@
   "dialog.selected_count": "↖ 已选择 {count} 个",
   "dialog.selection_constraint": "约束 {id}",
   "dialog.selection_external_curve": "{sketch} · 曲线 {id}",
-  "dialog.selection_external_point": "{point} · {sketch}",
   "dialog.selection_guidance": "选择输入项进行修改。点击已选对象可取消选择；按住 Ctrl/Cmd 点击也可切换选择。检查预览后，再按“确定”。",
   "dialog.selection_midpoint": "中点 · {id}",
   "dialog.selection_profile": "{sketch} · 轮廓 {number}",
@@ -1424,7 +1420,6 @@
   "document.read_only_save": "此设计以只读方式打开：请另存为新文件",
   "document.save_changes": "保存对 {name} 的更改？",
   "document.save_copy": "保存副本…",
-  "document.tab_unsaved_changes": "未保存的更改",
   "document.unsaved_changes": "{name} 有未保存的更改。如果不保存，将丢失这些更改。",
   "drive.rigid": "{joint} 是刚性接头：它把零件固定在原位，因此没有可驱动的运动。要让零件运动，请在“编辑接头”中更改其类型：旋转用 Revolute，滑动用 Slider，两者兼有用 Cylindrical。",
   "drive.stopped_by_contact": "停在 {value}：{a} 会穿过 {b}",
@@ -2004,7 +1999,6 @@
   "material.selection.mixed": "不同材料",
   "measure.at": "位置",
   "measure.item": "项目 {number}",
-  "measure.line_to_centre": "线到圆心",
   "measure.quick_copied": "已复制测量值",
   "measure.quick_copy": "点击复制测量值",
   "measure.quick_edges": "{count} 条边",
@@ -2271,14 +2265,6 @@
   "prefs.auto_operation_note": "根据材料接触的对象选择合并、新建实体或切割。",
   "prefs.axes": "坐标轴",
   "prefs.axis": "轴",
-  "prefs.blur_cost": "相对渲染开销。条形越多，通常意味着处理工作越多。",
-  "prefs.blur_device": "此图形设备或渲染路径不支持此功能",
-  "prefs.blur_guard": "已降低模糊质量，以保持画面响应。模糊半径未改变。",
-  "prefs.blur_off": "关闭",
-  "prefs.blur_reduce_transparency": "已被系统的降低透明度设置禁用",
-  "prefs.blur_software": "软件图形渲染不支持此功能 (gpu-software)",
-  "prefs.blur_source": "此工作区视图不支持此功能",
-  "prefs.blur_web": "此网页渲染路径不支持此功能",
   "prefs.bodies_folders": "实体文件夹",
   "prefs.bodies_folders_always": "始终显示",
   "prefs.bodies_folders_never": "不显示",
@@ -2337,13 +2323,6 @@
   "prefs.dialogs_edge": "视图边缘",
   "prefs.dialogs_left_column": "左侧栏",
   "prefs.dialogs_note": "命令对话框的打开位置：停靠在视图边缘，或在左侧栏中替代浏览器和历史；关闭对话框后，浏览器和历史恢复原样。",
-  "prefs.dimension_step_angle": "窗口的箭头、上下方向键和滚轮给角度增减的量",
-  "prefs.dimension_step_length": "窗口的箭头、上下方向键和滚轮给长度增减的量",
-  "prefs.dimension_steps": "窗口步长",
-  "prefs.dimension_values": "尺寸值",
-  "prefs.dimension_values_note": "输入尺寸值的位置。窗口带有可增减数值的箭头；尺寸工具会先放置文字。",
-  "prefs.dimension_values_view": "在视图中",
-  "prefs.dimension_values_window": "在窗口中",
   "prefs.display": "显示",
   "prefs.edges": "边缘与着色",
   "prefs.extend": "扩展",
@@ -2671,10 +2650,6 @@
   "prefs.theme_follow_off": "关闭",
   "prefs.theme_follow_stop": "停止跟随",
   "prefs.theme_import_hint": "单击选择主题文件，拖放到此处，或复制主题后按 Ctrl+V（Mac 上为 Cmd+V）",
-  "prefs.theme_notice_dismiss": "忽略",
-  "prefs.theme_option_blur": "面板背后模糊",
-  "prefs.theme_option_blur_help": "半透明面板背后的模糊程度，以物理像素为单位。0 表示关闭。",
-  "prefs.theme_option_invalid": "{option} 的已保存值无效；正在使用主题默认值。已保存值将予以保留。",
   "prefs.theme_option_opacity": "不透明度",
   "prefs.theme_option_opacity_help": "调整浮动面板的不透明度。最低不透明度限制可确保文字在视口颜色上清晰可读。",
   "prefs.theme_option_tab_colours": "选项卡颜色",
@@ -2683,7 +2658,6 @@
   "prefs.theme_option_tab_fade_ms_help": "切换选项卡时渐变面板和视口颜色。设为零可立即切换。",
   "prefs.theme_options_badge": "选项",
   "prefs.theme_options_more": "更多 · {count}",
-  "prefs.theme_options_newer": "此主题需要更新版本的 SolidCraft。升级后，请重新导入原始主题以恢复其选项定义。",
   "prefs.theme_options_reset": "重置",
   "prefs.theme_options_unavailable": "此设备不支持",
   "prefs.theme_paste": "粘贴主题",
@@ -4810,7 +4784,6 @@
   "ui.default_modelling_orientation": "默认建模方向",
   "ui.delete": "删除",
   "ui.delete_select_first": "请先选择要删除的内容：特征、实体、组件或草图几何",
-  "ui.dependents_select_first": "请先选择要列出其依赖项的对象",
   "ui.depth": "深度",
   "ui.design": "设计",
   "ui.design_properties.author": "作者",
@@ -4968,10 +4941,6 @@
   "ui.fillet_setback_least": "须大于 {least}",
   "ui.fillet_setback_tip": "平滑角点曲面片开始的位置：从角点沿每条边的距离。默认值为半径的 {factor} 倍。必须大于最小后退距离（不后退时圆角相交之处；面相互垂直时即半径）。",
   "ui.fillet_smooth_radius": "半径平滑变化",
-  "ui.fillet_turn": "转角",
-  "ui.fillet_turn_mitre": "斜接",
-  "ui.fillet_turn_swept": "旋转",
-  "ui.fillet_turn_tip": "两个圆角绕过它们之间尖锐的角边处，例如凸台根部的圆角绕过其竖直边。\n斜接：圆角继续延伸，直到以斜接相遇。\n旋转：圆角止于角边并绕它旋转，转角是与两者相切的圆环面。仅用于同一半径的圆角绕过笔直的凸角边时。",
   "ui.fillet_type_choices_tip": "恒定半径：整条边一个半径。\n弦长：无论面以什么角度相交，圆角宽度都相同。\n可变半径：两端各一个半径，添加后沿边还有更多。\n曲率连续：与平面相接处反射没有折痕的截面 (G2)。\n样条：沿边的半径跟随您设置的控制半径。",
   "ui.fillet_type_curvature": "曲率连续",
   "ui.fillet_type_tip": "横跨边的截面。曲率连续：平面之间的曲率连续 (G2) 截面，反射从面平滑过渡到圆角，没有折痕。",

assets/shaders/viewport.wgsl

@@ -802,9 +802,7 @@ fn vs_line(@builtin(vertex_index) vi: u32, @location(0) a: vec3<f32>, @location(
     let sb = cb.xy / max(cb.w, 1e-6) * half;
     var dir = sb - sa;
     let len = length(dir);
-    // Intel OpenGL can miscompile vector/scalar division here (#8053). Scalar
-    // quotients keep the same direction and the fallback for a point.
-    if (len < 1e-6) { dir = vec2<f32>(1.0, 0.0); } else { dir = vec2<f32>(dir.x / len, dir.y / len); }
+    if (len < 1e-6) { dir = vec2<f32>(1.0, 0.0); } else { dir = dir / len; }
     let nrm = vec2<f32>(-dir.y, dir.x);
     // Two triangles: corners (t, side).
     var ts = array<f32, 6>(0.0, 1.0, 1.0, 0.0, 1.0, 0.0);

crates/doc/src/config_certificates.rs

@@ -393,8 +393,6 @@ pub(crate) struct ExactSketchCurves<'a> {
     /// Each analytic curve's id, whether it is projected (linked) reference geometry, and its
     /// segments.
     segments: Vec<(&'a str, bool, Vec<Seg2>)>,
-    /// Each free-form curve's id (ellipses, conics, splines) and its exact segments.
-    free_form: Vec<(&'a str, Vec<Seg2>)>,
 }
 
 impl<'a> ExactSketchCurves<'a> {
@@ -402,17 +400,10 @@ impl<'a> ExactSketchCurves<'a> {
     /// and segment allocation must not be repeated for every generated face.
     pub(crate) fn new(sketch: &'a SolvedSketch) -> Self {
         let mut segments = Vec::new();
-        let mut free_form = Vec::new();
         if sketch.sketch.curves.len() > 2000 {
-            return Self { segments, free_form };
+            return Self { segments };
         }
         for (index, curve) in sketch.sketch.curves.iter().enumerate() {
-            if !curve.construction
-                && let Some(exact) = sketch.sketch.exact_segs(index)
-            {
-                free_form.push((curve.id.as_str(), exact));
-                continue;
-            }
             if curve.construction
                 || !matches!(
                     curve.kind,
@@ -434,21 +425,7 @@ impl<'a> ExactSketchCurves<'a> {
             };
             segments.push((curve.id.as_str(), curve.link.is_some(), originals));
         }
-        Self { segments, free_form }
-    }
-
-    /// The one free-form sketch curve (an ellipse, conic or spline) a generated segment is a
-    /// whole piece of, either way round: one of the exact segments the curve is made of. A
-    /// segment two curves share stays ambiguous.
-    pub(crate) fn find_free_form(&self, generated: &Seg2) -> Option<String> {
-        let reversed = generated.reversed();
-        let mut found: Option<Option<&str>> = None;
-        for (id, originals) in &self.free_form {
-            if originals.iter().any(|original| *original == *generated || *original == reversed) {
-                found = Some(if found.is_some() { None } else { Some(*id) });
-            }
-        }
-        found.flatten().map(str::to_owned)
+        Self { segments }
     }
 
     /// The one sketch curve a generated segment lies on. A curve drawn over projected

crates/doc/src/document.rs

@@ -734,10 +734,6 @@ pub enum FeatureKind {
         /// from the vertex instead of where the rounds meet (a constant-radius fillet only).
         #[serde(default, skip_serializing_if = "Vec::is_empty")]
         setbacks: Vec<CornerSetback>,
-        /// How two rounds turn where they meet at a sharp side edge: in a mitre (the default) or
-        /// swept round it (a constant-radius, exact, rolling-corner fillet without setbacks only).
-        #[serde(default, skip_serializing_if = "FilletTurn::is_mitre")]
-        turn: FilletTurn,
         /// Round each picked edge's tangent chain with it (the default: edges continuing it
         /// smoothly at its ends, as far as they go), or only the picked edges.
         #[serde(default = "yes", skip_serializing_if = "is_yes")]
@@ -1975,38 +1971,6 @@ impl FilletCorner {
     }
 }
 
-/// How two constant rounds of one radius turn round a sharp, straight, convex side edge square to
-/// both on a plane, such as the rounds along a boss's base at its upright edges.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum FilletTurn {
-    /// The rounds run on to where they cross and meet in a mitre.
-    #[default]
-    Mitre,
-    /// The rounds end at the side edge and the corner is their section revolved about it, a
-    /// torus tangent to both (`solidcraft_kernel::FilletTurn::Swept`).
-    Swept,
-}
-
-/// Why a swept turn is refused with a fillet's other options: the kernel sweeps the turn of two
-/// constant rounds of one radius, at its own corners only.
-pub const SWEPT_TAKES: &str = "a swept corner turns two constant rounds of one radius: `turn: swept` takes `type: constant`, \
-`corner: rolling`, no `setbacks` and `fit: exact` or `reduce`";
-
-impl FilletTurn {
-    pub fn is_mitre(&self) -> bool {
-        *self == FilletTurn::Mitre
-    }
-
-    /// The kernel's turn.
-    pub fn kernel(self) -> solidcraft_kernel::FilletTurn {
-        match self {
-            FilletTurn::Mitre => solidcraft_kernel::FilletTurn::Mitre,
-            FilletTurn::Swept => solidcraft_kernel::FilletTurn::Swept,
-        }
-    }
-}
-
 /// How Extend continues a surface past its edges.
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]

crates/doc/src/eval.rs

@@ -409,14 +409,13 @@ fn fillet_fitted(
     edges: &[Vec3],
     r: f64,
     fit: crate::FilletFit,
-    turn: kernel::FilletTurn,
 ) -> std::result::Result<(kernel::Body, Option<Vec<f64>>, Vec<Vec3>), kernel::KernelError> {
-    match kernel::fillet_removing(body, edges, r, turn) {
+    match kernel::fillet_removing(body, edges, r) {
         Ok((b, gone)) => Ok((b, None, gone)),
         Err(kernel::KernelError::TooLarge(why)) if fit == crate::FilletFit::Exact => {
-            Err(with_largest_fit(why, "radius", || kernel::fillet_max(body, edges, r, turn)))
+            Err(with_largest_fit(why, "radius", || kernel::fillet_max(body, edges, r)))
         }
-        Err(kernel::KernelError::TooLarge(why)) if fit == crate::FilletFit::Reduce => match kernel::fillet_max_each(body, edges, r, turn)? {
+        Err(kernel::KernelError::TooLarge(why)) if fit == crate::FilletFit::Reduce => match kernel::fillet_max_each(body, edges, r)? {
             // Built at the radius asked for after all (the groups apart): nothing reduced.
             Some((used, b)) => Ok((b, used.iter().any(|u| *u < r).then_some(used), Vec::new())),
             None => Err(kernel::KernelError::TooLarge(why)),
@@ -4015,11 +4014,6 @@ fn blend_body(
 ) -> Result<(Traced, Option<Vec<f64>>, Tapered)> {
     let input = mb.traced();
     let (mut used, mut tapered) = (None, Vec::new());
-    if let FeatureKind::Fillet { turn: crate::FilletTurn::Swept, style, fit, corner, setbacks, .. } = &f.kind
-        && (!style.is_constant() || *fit == crate::FilletFit::Taper || !corner.is_rolling() || !setbacks.is_empty())
-    {
-        return Err(DocError::Invalid(crate::SWEPT_TAKES.into()));
-    }
     // The blended body, and the lineage of what the last blend started from.
     let (nb, from) = match &f.kind {
         // A curvature-continuous fillet's corners are G2 patches, whatever `corner` says: SMLib's
@@ -4067,8 +4061,8 @@ fn blend_body(
             tapered = edges.iter().copied().zip(tapers).filter_map(|(p, t)| Some((p, t?))).collect();
             (b, input)
         }
-        FeatureKind::Fillet { fit, turn, .. } => {
-            let (b, u, gone) = fillet_fitted(&mb.body, edges, r, *fit, turn.kernel())?;
+        FeatureKind::Fillet { fit, .. } => {
+            let (b, u, gone) = fillet_fitted(&mb.body, edges, r, *fit)?;
             if let Some(u) = &u {
                 append_warning(warning, reduced_note(u, r));
             }
@@ -4826,13 +4820,8 @@ fn centered_extrude(
     };
     // Fit cap surfaces in their own coordinates. Fitting a distant world-space
     // wire can tilt an otherwise exact planar cap through numeric cancellation.
-    // A side drawn in collinear pieces is one face (#1788), and so is a side along one ellipse
-    // or spline, whatever pieces the profile holds it in.
-    let curves = sketch.map(crate::config::ExactSketchCurves::new);
-    let one_curve = |s: &solidcore_record::Seg2, t: &solidcore_record::Seg2| {
-        curves.as_ref().is_some_and(|c| c.find_free_form(s).is_some_and(|id| c.find_free_form(t).is_some_and(|other| other == id)))
-    };
-    let bodies = kernel::extrude_whole_sides(&Plane::XY, std::slice::from_ref(region), start, end, &one_curve)?;
+    // A side drawn in collinear pieces is one face (#1788).
+    let bodies = kernel::extrude_whole_sides(&Plane::XY, std::slice::from_ref(region), start, end)?;
     if *plane == Plane::XY {
         return Ok(bodies.into_iter().map(|body| roles.tool(body, None)).collect());
     }
@@ -6329,12 +6318,12 @@ fn replay(
                     let nb = match &src.kind {
                         FeatureKind::Chamfer { distance2, angle, flip, .. } => chamfer_with(vals, &mb.body, &moved, r, distance2, angle, *flip)?,
                         // A copy is congruent to the original: the radius it was reduced to first.
-                        FeatureKind::Fillet { fit, turn, .. } => match st.fitted.get(&src.id) {
+                        FeatureKind::Fillet { fit, .. } => match st.fitted.get(&src.id) {
                             Some(used) => {
                                 let used: Vec<f64> = idx.iter().map(|i| used.get(*i).copied().unwrap_or(r)).collect();
-                                kernel::fillet_each(&mb.body, &moved, &used, turn.kernel())?
+                                kernel::fillet_each(&mb.body, &moved, &used)?
                             }
-                            None => fillet_fitted(&mb.body, &moved, r, *fit, turn.kernel())?.0,
+                            None => fillet_fitted(&mb.body, &moved, r, *fit)?.0,
                         },
                         _ => kernel::fillet(&mb.body, &moved, r)?,
                     };
@@ -8556,7 +8545,6 @@ mod chain_tests {
                 fit: Default::default(),
                 corner: Default::default(),
                 setbacks: Vec::new(),
-                turn: Default::default(),
                 tangent_chain: true,
             },
             None,
@@ -8585,7 +8573,6 @@ mod chain_tests {
             fit: Default::default(),
             corner: Default::default(),
             setbacks: Vec::new(),
-            turn: Default::default(),
             tangent_chain,
         }
     }

crates/doc/src/eval_more.rs

@@ -2318,16 +2318,11 @@ pub(super) fn plastic_eval(doc: &Document, vals: &BTreeMap<String, Value>, f: &F
                 _ => false,
             };
             let (Some(_), Some(_), false) = (outer, openings.first(), alike) else {
-                // A solid box top has no opening: Shell that face first, then pick the rim
-                // around the cavity (#10437).
                 let what = match (loops.len(), openings.len()) {
-                    (0 | 1, _) => "Lip needs the rim of a shelled body: Shell a face open first, then pick the rim around that opening (a face with an outer edge and an inner hole)"
+                    (0 | 1, _) => "pick the rim face of a shelled body (a face with an inner and an outer edge)".to_string(),
+                    (_, 0) => "pick the rim face of a shelled body: this face's inner edges are where other features stand on it, not an opening"
                         .to_string(),
-                    (_, 0) => "Lip needs a rim around an opening: this face's inner edges are where other features stand on it, not a shell cavity. Shell a face open, then pick that rim"
-                        .to_string(),
-                    (_, k) => format!(
-                        "Lip needs one clear opening as the rim: this face has {k} openings alike in size (for example a plate of holes). Shell one cavity, or pick a rim that rings a single opening"
-                    ),
+                    (_, k) => format!("pick the rim face of a shelled body (round one opening): this face has {k} openings alike in size"),
                 };
                 return Err(DocError::Invalid(what));
             };

crates/doc/src/eval_thread.rs

@@ -103,11 +103,6 @@ enum End {
     /// At (or within half a pitch of) an end of the face where material goes on past it, a
     /// shoulder, a head, a blind hole's bottom: the groove stops short, clear of it.
     Closed,
-    /// At an end of an external thread's face where a shoulder starts and stays beyond the face's
-    /// end: the groove runs on through the plane of that end and is trimmed there, so the root
-    /// reaches the shoulder at every angle, a nut bottoms out on it, and nothing past the plane
-    /// is cut.
-    Shoulder,
     /// Inside the face: the groove stops square there.
     Inside,
 }
@@ -126,9 +121,6 @@ pub(super) struct ThreadOn {
     /// A modelled internal thread in a hole wider than it needs: the radius the bore is narrowed
     /// to (the thread's minor radius) before the groove is cut, with the hole's own radius.
     narrow: Option<f64>,
-    /// A shoulder keeps the square stop because the kernel couldn't check whether it stays beyond
-    /// the face's end.
-    shoulder_unchecked: bool,
 }
 
 /// The free-end test of a face's two ends (`side` 0 at its start, 1 at its end), each made
@@ -168,22 +160,6 @@ impl FaceEnds<'_> {
         }
         Ok(free)
     }
-
-    /// Does the shoulder at this closed end stay beyond the plane of the face's end? Not where it
-    /// rises back along the face (a slanted plate, a boss on a round body), which a groove
-    /// running to that plane would cut into: there is material outside the face just inside it.
-    /// The caller keeps the square stop, and says so, when the kernel can't make the check.
-    fn clear_of_end_plane(&self, side: usize) -> Result<bool> {
-        #[cfg(test)]
-        if tests::FAIL_CLEARANCE.get() {
-            return Err(kernel::KernelError::Failed("clearance refused for the test".into()).into());
-        }
-        let (p, e) = (self.pitch, self.pitch * 1e-3);
-        let inside = if side == 0 { (self.cyl.start + e, self.cyl.start + p) } else { (self.cyl.end - p, self.cyl.end - e) };
-        // All the radii the groove cuts beyond the face; only touching their rims is not in its
-        // way, as in `free`.
-        kernel::material_in_ring(self.body, self.cyl, self.beyond.0 + e, self.beyond.1 - e, inside).map(|hit| !hit).map_err(DocError::from)
-    }
 }
 
 /// A thread on the cylindrical face at `p`: its size, and the part of the face it runs over.
@@ -357,23 +333,11 @@ pub(super) fn thread_on(st: &ModelState, feature: u64, p: Vec3, ask: &ThreadAsk)
     // How each end of the thread meets the face: at a face end, or within half a pitch (and its
     // runout) of one, where the groove would reach past it, that end's free-end test decides.
     let near = |at: f64, side: usize| if side == 0 { at - lo } else { hi - at } < pitch / 2.0 + ease.get(side).copied().unwrap_or(0.0);
-    // A shoulder whose check the kernel couldn't make keeps the square stop, and the feature says so.
-    let mut unchecked = false;
     let mut kind = |at: f64, side: usize| -> Result<End> {
         Ok(if !ask.modeled || !near(at, side) {
             End::Inside
         } else if !ends.free(side)? {
-            let at_end = (if side == 0 { at - lo } else { hi - at }) < pitch * 1e-3;
-            let square = ease.get(side).copied().unwrap_or(0.0) == 0.0;
-            let clear = at_end && square && !cyl.internal && !form.is_taper() && {
-                let check = ends.clear_of_end_plane(side);
-                unchecked |= matches!(check, Err(DocError::Kernel(_)));
-                match check {
-                    Err(DocError::Kernel(_)) => false,
-                    other => other?,
-                }
-            };
-            if clear { End::Shoulder } else { End::Closed }
+            End::Closed
         } else if (if side == 0 { at - lo } else { hi - at }) < pitch * 1e-3 {
             End::Free
         } else {
@@ -409,7 +373,7 @@ pub(super) fn thread_on(st: &ModelState, feature: u64, p: Vec3, ask: &ThreadAsk)
         .then(|| form.groove(major, pitch, true))
         .filter(|g| !(g.root_r - cyl.radius >= g.basic_depth / 4.0))
         .map(|g| g.crest_r);
-    Ok(ThreadOn { info, cyl, ends, steep: ask.steep, ease, from: side, narrow, shoulder_unchecked: unchecked })
+    Ok(ThreadOn { info, cyl, ends, steep: ask.steep, ease, from: side, narrow })
 }
 
 /// The end of the face (0: its start, 1: its end) a thread of limited length starts at: the end
@@ -572,9 +536,7 @@ fn thread_grooves(
     // Past a free end of the face the groove runs out into the air, a pitch beyond it. Before
     // a closed one it stops with its section clear of the face's end (its centre as far inside
     // as the section reaches that way), so it never cuts into the shoulder there; inside the
-    // face it stops square at the threaded length's end. At a shoulder it can be trimmed against
-    // ([`End::Shoulder`]) its whole section runs past the plane of the face's end, so every angle
-    // of the last turn is cut down to that plane ([`trim_at_shoulders`] takes off the rest).
+    // face it stops square at the threaded length's end.
     //
     // A runout `e` at an end (ISO 3508) fades the groove out over `e`: its section moves out of
     // the material (an external thread's away from the axis, past the surface; an internal
@@ -586,14 +548,12 @@ fn thread_grooves(
         (End::Free, false) => t.start - p,
         (End::Free, true) => t.start,
         (End::Closed, _) => (t.start - ease[0]).max(face.0 + w_lo),
-        (End::Shoulder, _) => face.0 - w_hi - 0.1 * p,
         (End::Inside, _) => t.start - ease[0],
     };
     let s1 = match (ends[1], ease[1] > 0.0) {
         (End::Free, false) => t.end + p,
         (End::Free, true) => t.end,
         (End::Closed, _) => (t.end + ease[1]).min(face.1 - w_hi),
-        (End::Shoulder, _) => face.1 + w_lo + 0.1 * p,
         (End::Inside, _) => t.end + ease[1],
     };
     if !(s1 - s0 > p * 1e-3) {
@@ -738,24 +698,6 @@ fn taper_envelope(t: &ThreadInfo, radius: f64, ends: [End; 2], (d0, from): (f64,
     Ok(ring.pop())
 }
 
-/// The groove with what runs past a shoulder's plane taken off ([`End::Shoulder`]), so cutting it
-/// leaves the shoulder whole.
-fn trim_at_shoulders(mut tool: Body, axis: Vec3, ends: [End; 2], face: (f64, f64), k: UnitVec3) -> Result<Body> {
-    for (end, at, keep_positive) in [(ends[0], face.0, true), (ends[1], face.1, false)] {
-        if end != End::Shoulder {
-            continue;
-        }
-        let plane = Plane::from_normal(axis + k * at, *k).ok_or_else(|| DocError::Invalid("thread axis".into()))?;
-        // An error of the cut, like the kernel's own: `cut` then falls back to the square stop.
-        let missed = || kernel::KernelError::Failed("the thread's groove misses its face".into());
-        let kept = kernel::half_space(&tool, &plane, keep_positive)?.0;
-        #[cfg(test)]
-        let kept = kept.filter(|_| !tests::EMPTY_TRIM.get());
-        tool = kept.ok_or_else(missed)?;
-    }
-    Ok(tool)
-}
-
 /// Evaluate a thread feature: a cosmetic thread is listed in the model's threads, a modelled
 /// one cut into its body.
 pub(super) fn eval(doc: &Document, vals: &BTreeMap<String, Value>, f: &Feature, st: &mut ModelState, warning: &mut Option<String>) -> Result<()> {
@@ -826,13 +768,7 @@ pub(super) fn eval(doc: &Document, vals: &BTreeMap<String, Value>, f: &Feature,
             None => note,
         });
     }
-    if let Some(note) = cut(st, on, (*tip, angle, depth))? {
-        *warning = Some(match warning.take() {
-            Some(w) => format!("{w}; {note}"),
-            None => note,
-        });
-    }
-    Ok(())
+    cut(st, on, (*tip, angle, depth))
 }
 
 /// A runout as (mm, pitches): ISO 3508's standard 2.5 P and short 1.25 P, or a length.
@@ -847,10 +783,9 @@ pub(super) fn runout(vals: &BTreeMap<String, Value>, e: &Option<crate::ThreadRun
 
 /// Cut a modelled thread resolved on its face into its body: the grooves (SMLib's exact screw
 /// sweeps, a taper's crests by its envelope) by one B-rep boolean, then the chamfered tip
-/// (`tip`, with its angle and depth when given). What the user should be told about the result, if
-/// anything, is returned.
-pub(super) fn cut(st: &mut ModelState, on: ThreadOn, (tip, angle, depth): (ThreadTip, Option<f64>, Option<f64>)) -> Result<Option<String>> {
-    let ThreadOn { info: t, cyl, ends, steep, ease, from: from_side, narrow, shoulder_unchecked } = on;
+/// (`tip`, with its angle and depth when given).
+pub(super) fn cut(st: &mut ModelState, on: ThreadOn, (tip, angle, depth): (ThreadTip, Option<f64>, Option<f64>)) -> Result<()> {
+    let ThreadOn { info: t, cyl, ends, steep, ease, from: from_side, narrow } = on;
     let i = st.bodies.iter().position(|b| b.name == t.body).ok_or_else(|| DocError::Invalid("threaded body".into()))?;
     let Some(mb) = st.bodies.get(i).cloned() else { return Err(DocError::Invalid("body".into())) };
     let (mut input, radius) = (mb.traced(), cyl.radius);
@@ -887,46 +822,21 @@ pub(super) fn cut(st: &mut ModelState, on: ThreadOn, (tip, angle, depth): (Threa
         }
         false => None,
     };
-    let cut_grooves = |ends: [End; 2]| -> Result<(Option<Body>, usize)> {
-        let mut grooves = Vec::new();
-        for g in thread_grooves(&t, groove_radius, (cyl.start, cyl.end), ends, steep, ease, taper)? {
-            let section = Region2 { outer: solidcore_record::Loop2::polygon(&g.section), holes: Vec::new() };
-            grooves.push(kernel::sweep_helix_radial(&g.plane, &section, g.base, g.axis, g.pitch, g.turns, &g.law)?);
-        }
-        if let Some(taper) = taper
-            && let Some(envelope) = taper_envelope(&t, radius, ends, taper)?
-        {
-            grooves.push(envelope);
-        }
-        let tool = match grooves.as_slice() {
-            [one] => one.clone(),
-            many => kernel::union_all(&many.iter().collect::<Vec<_>>())?,
-        };
-        let tool = trim_at_shoulders(tool, t.axis_point, ends, (cyl.start, cyl.end), t.axis)?;
-        let cut = kernel::boolean(&input.body, &tool, BoolOp::Cut)?;
-        // Now rather than at the feature's end, where it could only fail the feature.
-        if ends.contains(&End::Shoulder)
-            && let Some(body) = &cut
-        {
-            kernel::check_kept(body)?;
-        }
-        Ok((cut, tool.face_count()))
-    };
-    // A design that built with the square stop keeps building: where the kernel can't make the
-    // trimmed cut, the groove stops clear of the shoulder as it did, and the feature says so.
-    let mut made = cut_grooves(ends);
-    let mut square_stop = shoulder_unchecked;
-    if matches!(made, Err(DocError::Kernel(_))) && ends.contains(&End::Shoulder) {
-        made = cut_grooves(ends.map(|e| if e == End::Shoulder { End::Closed } else { e }));
-        square_stop = true;
+    let mut grooves = Vec::new();
+    for g in thread_grooves(&t, groove_radius, (cyl.start, cyl.end), ends, steep, ease, taper)? {
+        let section = Region2 { outer: solidcore_record::Loop2::polygon(&g.section), holes: Vec::new() };
+        grooves.push(kernel::sweep_helix_radial(&g.plane, &section, g.base, g.axis, g.pitch, g.turns, &g.law)?);
     }
-    let note = (square_stop && made.is_ok()).then(|| {
-        format!(
-            "the {} thread's groove could not be run down to the shoulder here, so it stops clear of it and its last turn is left uncut",
-            t.designation
-        )
-    });
-    let (nb, groove_faces) = made?;
+    if let Some(taper) = taper
+        && let Some(envelope) = taper_envelope(&t, radius, ends, taper)?
+    {
+        grooves.push(envelope);
+    }
+    let tool = match grooves.as_slice() {
+        [one] => one.clone(),
+        many => kernel::union_all(&many.iter().collect::<Vec<_>>())?,
+    };
+    let (nb, groove_faces) = (kernel::boolean(&input.body, &tool, BoolOp::Cut)?, tool.face_count());
     let nb = nb.ok_or_else(|| DocError::Invalid("the thread removed everything".into()))?;
     // The groove's faces have no role to name them by.
     let groove = crate::lineage::Lineage::unnamed_faces(groove_faces);
@@ -944,7 +854,7 @@ pub(super) fn cut(st: &mut ModelState, on: ThreadOn, (tip, angle, depth): (Threa
     if let Some(slot) = st.bodies.get_mut(i) {
         *slot = ModelBody::traced_new(mb.name, nb, mb.feature);
     }
-    Ok(note)
+    Ok(())
 }
 
 /// The chamfered tip of an external thread (ISO 4753, chamfered end CH) at the free ends `tip`
@@ -1027,99 +937,3 @@ fn tip_cones(
     }
     Ok(out)
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::cell::Cell;
-
-    thread_local! {
-        /// Make [`trim_at_shoulders`] find nothing of the groove left.
-        pub(super) static EMPTY_TRIM: Cell<bool> = const { Cell::new(false) };
-        /// Make the rising-shoulder check fail as the kernel would.
-        pub(super) static FAIL_CLEARANCE: Cell<bool> = const { Cell::new(false) };
-    }
-
-    fn ask() -> ThreadAsk<'static> {
-        ThreadAsk {
-            form: None,
-            designation: Some("M10"),
-            hand: ThreadHand::Right,
-            starts: 1,
-            steep: SteepFlank::default(),
-            extent: Extent::Full,
-            from: None,
-            modeled: true,
-            ease_out: (0.0, 0.0),
-            tapped: false,
-            old_auto_size: false,
-        }
-    }
-
-    /// How a thread's ends meet the face at (5, 0, z) of `body`.
-    fn ends_of(body: Body, z: f64) -> [End; 2] {
-        let mut st = ModelState::default();
-        st.bodies.push(ModelBody::new("Part".into(), body, 1));
-        thread_on(&st, 1, Vec3::new(5.0, 0.0, z), &ask()).unwrap().ends
-    }
-
-    /// A shoulder that stays beyond the face's end takes the trim. One rising back along the face
-    /// (a slanted plate, a boss on a round body) keeps the square stop.
-    #[test]
-    fn only_a_shoulder_that_stays_beyond_the_faces_end_takes_the_trim() {
-        let z = Vec3::new(0.0, 0.0, 1.0);
-        let join = |a: &Body, b: &Body| kernel::boolean(a, b, BoolOp::Union).unwrap().unwrap();
-        let boss = kernel::cylinder(Vec3::new(0.0, 0.0, 2.0), z, 5.0, 26.0).unwrap();
-        let plate = kernel::box_solid(Vec3::new(-20.0, -20.0, -6.0), Vec3::new(20.0, 20.0, 2.0)).unwrap();
-        let flat = ends_of(join(&plate, &boss), 20.0);
-        assert!(flat.contains(&End::Shoulder), "{flat:?}");
-        let tilted = kernel::cylinder(Vec3::new(0.0, 0.0, 0.0), Vec3::new(0.2, 0.0, 1.0), 20.0, 6.0).unwrap();
-        let slanted = ends_of(join(&tilted, &boss), 20.0);
-        assert!(slanted.contains(&End::Closed) && !slanted.contains(&End::Shoulder), "{slanted:?}");
-        let round = kernel::cylinder(Vec3::new(0.0, -20.0, 0.0), Vec3::new(0.0, 1.0, 0.0), 10.0, 40.0).unwrap();
-        let on_round = ends_of(join(&round, &boss), 20.0);
-        assert!(on_round.contains(&End::Closed) && !on_round.contains(&End::Shoulder), "{on_round:?}");
-    }
-
-    /// Where the kernel can't check the shoulder, the thread still builds with the square stop, and
-    /// the feature says its last turn is left uncut.
-    #[test]
-    fn a_shoulder_the_kernel_cannot_check_keeps_the_square_stop_and_says_so() {
-        let plate = kernel::box_solid(Vec3::new(-20.0, -20.0, 0.0), Vec3::new(20.0, 20.0, 6.0)).unwrap();
-        let boss = kernel::cylinder(Vec3::new(0.0, 0.0, 6.0), Vec3::new(0.0, 0.0, 1.0), 5.0, 16.0).unwrap();
-        let body = kernel::boolean(&plate, &boss, BoolOp::Union).unwrap().unwrap();
-        let mut st = ModelState::default();
-        st.bodies.push(ModelBody::new("Part".into(), body, 1));
-        FAIL_CLEARANCE.set(true);
-        let on = thread_on(&st, 1, Vec3::new(5.0, 0.0, 14.0), &ask());
-        FAIL_CLEARANCE.set(false);
-        let on = on.unwrap();
-        assert!(on.ends.contains(&End::Closed) && !on.ends.contains(&End::Shoulder), "{:?}", on.ends);
-        let note = cut(&mut st, on, (ThreadTip::None, None, None)).unwrap();
-        assert!(note.is_some_and(|n| n.contains("M10") && n.contains("left uncut")));
-    }
-
-    /// Where the trim leaves nothing of the groove, a thread at a shoulder that built with the
-    /// square stop still builds with it, and the feature says its last turn is left uncut.
-    #[test]
-    fn a_shoulder_cut_the_kernel_refuses_falls_back_to_the_square_stop_and_says_so() {
-        let plate = kernel::box_solid(Vec3::new(-20.0, -20.0, 0.0), Vec3::new(20.0, 20.0, 6.0)).unwrap();
-        let boss = kernel::cylinder(Vec3::new(0.0, 0.0, 6.0), Vec3::new(0.0, 0.0, 1.0), 5.0, 16.0).unwrap();
-        let body = kernel::boolean(&plate, &boss, BoolOp::Union).unwrap().unwrap();
-        let build = |fail: bool| {
-            let mut st = ModelState::default();
-            st.bodies.push(ModelBody::new("Part".into(), body.clone(), 1));
-            let on = thread_on(&st, 1, Vec3::new(5.0, 0.0, 14.0), &ask()).unwrap();
-            EMPTY_TRIM.set(fail);
-            let note = cut(&mut st, on, (ThreadTip::None, None, None));
-            EMPTY_TRIM.set(false);
-            (note.unwrap(), kernel::measure(&st.bodies[0].body).unwrap().volume)
-        };
-        let (none, trimmed) = build(false);
-        assert_eq!(none, None);
-        let (note, square) = build(true);
-        assert!(note.is_some_and(|n| n.contains("M10") && n.contains("left uncut")));
-        // The square stop leaves about half a pitch's worth of groove uncut: well over a mm³.
-        assert!(square > trimmed + 1.0, "{square} vs {trimmed}");
-    }
-}

crates/doc/src/format/pending/fillet-turn.rs

@@ -1,5 +0,0 @@
-//! A fillet saves `turn: "swept"` when two of its rounds that turn round a sharp side edge (the
-//! rounds along a boss's base, at its upright edges) are swept round that edge, their corner an
-//! exact torus; absent, the default `mitre`, they meet in a mitre, as designs before this change were
-//! built. An older design has none and keeps its mitres. The last release refuses a design with
-//! this change (the newer format number).

crates/doc/src/lineage.rs

@@ -239,10 +239,7 @@ impl<'a> ProfileRoles<'a> {
         // Every curve the segment is drawn on (one, or several coincident or collinear ones).
         let curve = |segment: usize| -> Vec<String> {
             let (Some(curves), Some(segment)) = (curves.as_ref(), segments.get(segment)) else { return Vec::new() };
-            let mut drawn: Vec<String> = curves.find_all_along(segment).into_iter().map(|id| format!("side:{id}")).collect();
-            if drawn.is_empty() {
-                drawn.extend(curves.find_free_form(segment).map(|id| format!("side:{id}")));
-            }
+            let drawn: Vec<String> = curves.find_all_along(segment).into_iter().map(|id| format!("side:{id}")).collect();
             match self.thin {
                 // A thin wall's side beside its curve (the other side may lie on it).
                 Some(thin) if drawn.is_empty() => curves.find_offset(segment, &thin.curves, thin.distances),
@@ -757,19 +754,10 @@ pub(crate) fn order_lumps(bodies: &mut [crate::ModelBody], origin: &Arc<crate::n
         // cut body's own feature's and the rest are the cut's, and `body.rename` stores a name in
         // the `body_names` of the feature a body says made it (#10438).
         let names: Vec<(String, u64)> = members.iter().filter_map(|i| bodies.get(*i).map(|b| (b.name.clone(), b.feature))).collect();
-        // The pieces take the family's places in that order too, so the state lists them as
-        // their names run. The session pins a feature's body names in state order, and the next
-        // evaluation hands them out in this order: listed in the kernel's order, the pieces
-        // swapped names once the design was evaluated again from its pinned names (opened).
-        let moved: Vec<crate::ModelBody> = keys.iter().filter_map(|(_, i)| bodies.get(*i).cloned()).collect();
-        if moved.len() != members.len() || names.len() != members.len() {
-            continue;
-        }
-        for ((mut b, (name, feature)), place) in moved.into_iter().zip(names).zip(&members) {
-            b.name = name;
-            b.feature = feature;
-            if let Some(slot) = bodies.get_mut(*place) {
-                *slot = b;
+        for ((name, feature), (_, i)) in names.into_iter().zip(keys) {
+            if let Some(b) = bodies.get_mut(i) {
+                b.name = name;
+                b.feature = feature;
             }
         }
     }

crates/doc/src/tests.rs

@@ -295,7 +295,6 @@ fn box_fillet_cut_timeline() {
             fit: Default::default(),
             corner: Default::default(),
             setbacks: Vec::new(),
-            turn: Default::default(),
             tangent_chain: true,
         },
         None,
@@ -371,7 +370,6 @@ fn errors_are_reported_not_fatal() {
             fit: Default::default(),
             corner: Default::default(),
             setbacks: Vec::new(),
-            turn: Default::default(),
             tangent_chain: true,
         },
         None,
@@ -869,39 +867,12 @@ fn fillet_setbacks_default_to_none_and_round_trip() {
         fit: Default::default(),
         corner: Default::default(),
         setbacks: vec![CornerSetback { vertex: Position(Vec3::new(60.0, 40.0, 20.0)), distance: "8 mm".into() }],
-        turn: Default::default(),
         tangent_chain: true,
     };
     let back: FeatureKind = serde_json::from_value(serde_json::to_value(&set).unwrap()).unwrap();
     assert_eq!(back, set);
 }
 
-/// A fillet saved before turns reads as mitred and writes no `turn`; a swept one saves
-/// `turn: "swept"` and keeps it through a save and an open; a turn of another name is refused.
-#[test]
-fn fillet_turn_defaults_to_mitre_round_trips_and_refuses_unknown_turns() {
-    let old = serde_json::json!({"type": "fillet", "edges": [[15.0, 0.0, 10.0]], "radius": "2"});
-    let kind: FeatureKind = serde_json::from_value(old.clone()).unwrap();
-    let FeatureKind::Fillet { turn, .. } = &kind else { panic!("{kind:?}") };
-    assert_eq!(*turn, crate::FilletTurn::Mitre);
-    assert!(serde_json::to_value(&kind).unwrap().get("turn").is_none());
-    let mut swept = old.clone();
-    swept["turn"] = serde_json::json!("swept");
-    let kind: FeatureKind = serde_json::from_value(swept).unwrap();
-    assert!(matches!(kind, FeatureKind::Fillet { turn: crate::FilletTurn::Swept, .. }), "{kind:?}");
-    assert_eq!(serde_json::to_value(&kind).unwrap()["turn"], "swept");
-    let mut doc = Document::new("turn");
-    doc.add_feature(kind.clone(), None).unwrap();
-    let saved = doc.to_json();
-    let opened = Document::from_json(&saved).unwrap();
-    assert_eq!(opened.features.last().map(|f| &f.kind), Some(&kind));
-    assert_eq!(opened.to_json(), saved);
-    let mut unknown = old;
-    unknown["turn"] = serde_json::json!("round");
-    let e = serde_json::from_value::<FeatureKind>(unknown).unwrap_err().to_string();
-    assert!(e.contains("unknown variant `round`") && e.contains("mitre") && e.contains("swept"), "{e}");
-}
-
 #[test]
 fn timeline_group_legacy_json_omits_empty_joint_membership() {
     let old = serde_json::json!({"id":100, "name":"Folder", "parent":null, "features":[]});
@@ -1085,68 +1056,3 @@ fn feature_kind_key_and_type_name_mappings() {
     assert_eq!(FeatureKind::type_name_to_kind_key("MeshFeature"), Some("mesh_import"));
     assert_eq!(FeatureKind::type_name_to_kind_key("NonExistent"), None);
 }
-
-/// An extruded ellipse has one side face, and a spline in a profile one wall, each named by its
-/// sketch curve alone (no piece number): the same names on a second build and after reopening.
-#[test]
-fn an_extruded_ellipse_or_spline_is_one_wall_named_by_its_curve() {
-    let extrude = |sketch: u64| FeatureKind::Extrude {
-        thin: None,
-        sketch: crate::SketchId(sketch),
-        profiles: ProfileSel::All,
-        extent: Extent {
-            convention: crate::ExtrudeConvention::LegacyPerSide,
-            distance: "20".into(),
-            direction: Direction::Positive,
-            distance2: None,
-            start_offset: None,
-            through_all: false,
-            taper: None,
-            corner: Default::default(),
-            to: None,
-            to_offset: None,
-            from: None,
-            to_body_apart: false,
-        },
-        operation: Operation::NewBody,
-        targets: vec![],
-    };
-    for spline in [false, true] {
-        let mut sk = Sketch::new();
-        let curve = if spline {
-            let pts: Vec<usize> =
-                [(0., 0.), (10., -3.), (20., 4.), (30., 0.)].iter().map(|&(x, y)| sk.add_point(Vec2::new(x, y), None).unwrap()).collect();
-            let (a, b) = (sk.add_point(Vec2::new(30., 20.), None).unwrap(), sk.add_point(Vec2::new(0., 20.), None).unwrap());
-            let curve = sk
-                .add_curve(solidcraft_sketch::CurveKind::Spline { pts: pts.clone(), control: false, degree: 3, periodic: false, nurbs: None }, None)
-                .unwrap();
-            sk.add_line_pts(pts[3], a, None).unwrap();
-            sk.add_line_pts(a, b, None).unwrap();
-            sk.add_line_pts(b, pts[0], None).unwrap();
-            curve
-        } else {
-            let m = sk.add_point(Vec2::new(10., 0.), None).unwrap();
-            sk.add_curve(solidcraft_sketch::CurveKind::Ellipse { c: 0, m, r: 5. }, None).unwrap()
-        };
-        let id = sk.curves[curve].id.clone();
-        let mut doc = Document::new("one wall");
-        let s = doc.add_feature(FeatureKind::Sketch { plane: PlaneRef::Origin { name: "XY".into() }, sketch: sk }, None).unwrap();
-        let f = doc.add_feature(extrude(s), None).unwrap();
-        let names = |doc: &Document| {
-            let mut m = Model::new();
-            m.evaluate(doc);
-            assert!(m.results.iter().all(|r| r.error.is_none()), "{:?}", m.results);
-            let st = m.state();
-            let mut names = crate::naming::face_names(&st.bodies[0]).as_ref().clone();
-            names.sort();
-            names
-        };
-        let first = names(&doc);
-        let wall = format!("F{f}:side:{id}");
-        assert_eq!(first.iter().filter(|n| **n == wall).count(), 1, "{first:?}");
-        assert_eq!(first.len(), if spline { 6 } else { 3 }, "{first:?}");
-        assert!(first.iter().all(|n| !n.contains('#')), "no piece names: {first:?}");
-        assert_eq!(names(&doc), first, "a second build");
-        assert_eq!(names(&Document::from_json(&doc.to_json()).unwrap()), first, "reopened");
-    }
-}

crates/doc/src/walk.rs

@@ -54,7 +54,6 @@ impl Walk for solidcraft_kernel::DraftCorner {}
 impl Walk for crate::document::Direction {}
 impl Walk for crate::document::FilletFit {}
 impl Walk for crate::document::FilletCorner {}
-impl Walk for crate::document::FilletTurn {}
 impl Walk for crate::document::MeshData {}
 impl Walk for crate::document::RevolveConvention {}
 impl Walk for crate::document::RailFit {}

crates/engine/src/agent_setup.rs

@@ -1,9 +1,9 @@
 //! `solidcraft-cli mcp setup` and Help > Connect AI assistants: add a `solidcraft` MCP server entry
 //! to the AI clients installed on this machine, using the `solidcraft-cli` path given.
 //!
-//! Only the `solidcraft` entries change; every other byte (other servers, other settings, comments,
-//! key order) stays as it was. Updates replace the file atomically, keeping the previous version
-//! as `<name>.bak`. A file that cannot be read as JSON (with comments) or TOML is
+//! The clients' own files are edited in place, not rewritten: only the `solidcraft` entries change,
+//! every other byte (other servers, other settings, comments, key order) stays as it was. The file
+//! is copied to `<name>.bak` first. A file that cannot be read as JSON (with comments) or TOML is
 //! left alone, and so is an entry the user changed (its command is not a SolidCraft CLI, or its
 //! arguments differ); an entry that only has an old path to the CLI is updated.
 //! A client counts as installed when its configuration folder exists; no client program is run.
@@ -606,7 +606,11 @@ fn toml_to_json(t: &toml_edit::Table) -> Value {
 /// One client's outcome, a line of the report.
 fn configure_file(t: &Target, exe: &str, live: bool, dry_run: bool, mode: Mode) -> Result<(String, Vec<(&'static str, Change)>), String> {
     let fail = |e: String| format!("{}: {e}; left unchanged", t.file.display());
-    let existing = read_config(&t.file).map_err(|e| format!("{}: {e}", t.file.display()))?;
+    let existing = match std::fs::read_to_string(&t.file) {
+        Ok(s) => Some(s),
+        Err(e) if e.kind() == std::io::ErrorKind::NotFound => None,
+        Err(e) => return Err(format!("{}: {e}", t.file.display())),
+    };
     let mut text = existing.clone().unwrap_or_default();
     let changes =
         if t.shape == Shape::Codex { edit_toml(&mut text, exe, live, mode) } else { edit_json(&mut text, t.shape, exe, live, mode) }.map_err(fail)?;
@@ -629,30 +633,20 @@ fn configure_file(t: &Target, exe: &str, live: bool, dry_run: bool, mode: Mode)
     if !changed {
         return done(said);
     }
-    write_config(&t.file, existing.as_deref(), &text).map_err(|e| format!("{}: {e}", t.file.display()))?;
+    if existing.is_some() {
+        let mut bak = t.file.clone().into_os_string();
+        bak.push(".bak");
+        // The first backup is the user's original: later runs keep it.
+        if !Path::new(&bak).exists() {
+            std::fs::copy(&t.file, &bak).map_err(|e| format!("{}: cannot back up: {e}", t.file.display()))?;
+        }
+    } else if let Some(dir) = t.file.parent() {
+        std::fs::create_dir_all(dir).map_err(|e| format!("{}: {e}", dir.display()))?;
+    }
+    std::fs::write(&t.file, text).map_err(|e| format!("{}: {e}", t.file.display()))?;
     done(format!("{said} ({})", t.file.display()))
 }
 
-fn read_config(path: &Path) -> std::io::Result<Option<String>> {
-    match std::fs::read_to_string(path) {
-        Ok(text) => Ok(Some(text)),
-        Err(e) if e.kind() == std::io::ErrorKind::NotFound => Ok(None),
-        Err(e) => Err(e),
-    }
-}
-
-/// Refuse a stale edit before writing. Other clients do not share a lock with SolidCraft, so
-/// this narrows the race with their writes; it cannot exclude a write after the comparison.
-fn write_config(path: &Path, expected: Option<&str>, text: &str) -> std::io::Result<()> {
-    if let Some(dir) = path.parent() {
-        std::fs::create_dir_all(dir)?;
-    }
-    if read_config(path)?.as_deref() != expected {
-        return Err(std::io::Error::other("configuration changed during setup; left unchanged, try again"));
-    }
-    solidcraft_io::safe_write::write_atomic(path, text.as_bytes(), true)
-}
-
 /// Set up every detected client (or `--client NAME`; flags `--dry-run`, `--live`) for the
 /// `solidcraft-cli` at `exe`. Returns the result lines, one per client file, and whether every
 /// client succeeded.
@@ -848,96 +842,6 @@ mod tests {
         assert!(toml.contains("[mcp_servers.other]") && !toml.contains("solidcraft"), "{toml}");
     }
 
-    fn config_dir(label: &str) -> PathBuf {
-        let dir = std::env::temp_dir().join(format!("solidcraft-agent-config-{label}-{}", std::process::id()));
-        let _ = std::fs::remove_dir_all(&dir);
-        std::fs::create_dir_all(&dir).unwrap();
-        dir
-    }
-
-    #[test]
-    fn configuration_backup_tracks_the_file_before_each_change() {
-        let dir = config_dir("backup");
-        let target = Target { client: "claude-code", file: dir.join("config.json"), shape: Shape::ClaudeCode };
-        let backup = dir.join("config.json.bak");
-        let original = "{\n  \"personal_setting\": true\n}\n";
-        std::fs::write(&target.file, original).unwrap();
-        configure_file(&target, EXE, false, false, Mode::Add).unwrap();
-        assert_eq!(std::fs::read_to_string(&backup).unwrap(), original);
-        let changed_by_client = std::fs::read_to_string(&target.file).unwrap().replace("true", "false");
-        std::fs::write(&target.file, &changed_by_client).unwrap();
-        configure_file(&target, "/new/solidcraft-cli", false, false, Mode::Add).unwrap();
-        assert_eq!(std::fs::read_to_string(&backup).unwrap(), changed_by_client);
-        let current = std::fs::read_to_string(&target.file).unwrap();
-        assert!(current.contains("false") && current.contains("/new/solidcraft-cli"));
-        // A no-op or dry run must leave both the file and its backup alone.
-        configure_file(&target, "/new/solidcraft-cli", false, false, Mode::Add).unwrap();
-        configure_file(&target, "/future/solidcraft-cli", false, true, Mode::Add).unwrap();
-        assert_eq!(std::fs::read_to_string(&target.file).unwrap(), current);
-        assert_eq!(std::fs::read_to_string(&backup).unwrap(), changed_by_client);
-        configure_file(&target, "/new/solidcraft-cli", false, false, Mode::Remove).unwrap();
-        assert_eq!(std::fs::read_to_string(&backup).unwrap(), current);
-        assert!(!std::fs::read_to_string(&target.file).unwrap().contains("solidcraft"));
-        std::fs::remove_dir_all(dir).unwrap();
-    }
-
-    #[test]
-    fn configuration_is_unchanged_when_its_backup_cannot_be_replaced() {
-        let dir = config_dir("backup-failure");
-        let target = Target { client: "codex", file: dir.join("config.toml"), shape: Shape::Codex };
-        let original = "# personal setting\nmodel = \"custom\"\n";
-        std::fs::write(&target.file, original).unwrap();
-        std::fs::create_dir(dir.join("config.toml.bak")).unwrap();
-        assert!(configure_file(&target, EXE, false, false, Mode::Add).is_err());
-        assert_eq!(std::fs::read_to_string(&target.file).unwrap(), original);
-        assert_eq!(std::fs::read_dir(&dir).unwrap().count(), 2, "no temporary files remain");
-        std::fs::remove_dir_all(dir).unwrap();
-    }
-
-    #[test]
-    fn configuration_refuses_an_edit_based_on_an_outdated_read() {
-        let dir = config_dir("concurrent");
-        let path = dir.join("config.json");
-        let backup = dir.join("config.json.bak");
-        std::fs::write(&backup, "previous backup").unwrap();
-        for (expected, current) in [(Some("old"), Some("new")), (Some("old"), None), (None, Some("new"))] {
-            if let Some(text) = current {
-                std::fs::write(&path, text).unwrap();
-            } else {
-                std::fs::remove_file(&path).unwrap();
-            }
-            let error = write_config(&path, expected, "stale edit").unwrap_err();
-            assert!(error.to_string().contains("configuration changed"), "{error}");
-            assert_eq!(read_config(&path).unwrap().as_deref(), current);
-            assert_eq!(std::fs::read_to_string(&backup).unwrap(), "previous backup");
-        }
-        std::fs::remove_dir_all(dir).unwrap();
-    }
-
-    #[cfg(unix)]
-    #[test]
-    fn configuration_replaces_a_complete_file_and_keeps_links_and_permissions() {
-        use std::io::Read;
-        use std::os::unix::fs::{PermissionsExt, symlink};
-        let dir = config_dir("atomic");
-        let real = dir.join("real.json");
-        let target = Target { client: "claude-code", file: dir.join("config.json"), shape: Shape::ClaudeCode };
-        let original = "{\"personal_setting\": true}\n";
-        std::fs::write(&real, original).unwrap();
-        std::fs::set_permissions(&real, std::fs::Permissions::from_mode(0o600)).unwrap();
-        symlink("real.json", &target.file).unwrap();
-        let mut reader = std::fs::File::open(&target.file).unwrap();
-        configure_file(&target, EXE, false, false, Mode::Add).unwrap();
-        let mut old = String::new();
-        reader.read_to_string(&mut old).unwrap();
-        assert_eq!(old, original, "an existing reader sees the complete old file");
-        assert!(std::fs::read_to_string(&target.file).unwrap().contains(EXE));
-        assert!(std::fs::symlink_metadata(&target.file).unwrap().file_type().is_symlink());
-        assert_eq!(std::fs::metadata(&real).unwrap().permissions().mode() & 0o777, 0o600);
-        assert_eq!(std::fs::read_to_string(dir.join("real.json.bak")).unwrap(), original);
-        std::fs::remove_dir_all(dir).unwrap();
-    }
-
     #[test]
     fn quiet_adds_only_the_plain_entry_and_names_new_clients_once() {
         let h = std::env::temp_dir().join(format!("solidcraft-quiet-{}", std::process::id()));

crates/engine/src/cmd/browser.rs

@@ -64,7 +64,7 @@ pub static COMMANDS: &[CommandSpec] = &[
          or features?: [feature id or name] (the bodies they made; path?: [occurrence ids] for only that placement's); \
          or folder?: bodies|sketches|construction|origin|joints|all (all of it; showing also shows its browser folders and groups, and `all` takes in the occurrence hides too); \
          or tree_folders?: [browser folder or group key: c0/bodies, o:4/sketches, c0/g7, c0/joints, c0/canvases, c0/point_clouds] (the folder or group itself: its items keep their own state); \
-         or paths?: [[occurrence ids]] (exact placements and descendants), isolate?: bool (with paths or items of bodies, and visible:true: everything else is hidden, other placements as placements). Saved with the design and undone like any other change (the camera is not)",
+         or paths?: [[occurrence ids]] (exact placements and descendants), isolate?: bool (requires paths and visible:true). Saved with the design and undone like any other change (the camera is not)",
     ),
     CommandSpec::new("browser.expand_all", "Expand All", expand_all).icon("folder").noundo().params(
         "path?: [occurrence ids] (that placement and its descendants); component?: id (that component's own folders); \
@@ -436,89 +436,6 @@ fn tree_folder_key(k: &str) -> bool {
     k.len() <= 2048 && scope_ok && last_ok
 }
 
-/// Isolate bodies (#7896): the picked bodies stay, and so do the placements that hold them, down
-/// to their own; those placements' other bodies and the root's other bodies are hidden one by
-/// one, and every other placement is hidden as a placement, so its Browser row shows it is off and
-/// its eye brings it back.
-fn isolate_bodies(s: &mut Session, p: &Value, visible: bool) -> Result<Value> {
-    let cmd = "browser.visibility";
-    if !visible {
-        return Err(bad(cmd, "isolate requires visible:true"));
-    }
-    if ["folder", "features", "joints"].iter().any(|k| p.get(*k).is_some()) {
-        return Err(bad(cmd, "isolate takes `paths` or `items` (bodies)"));
-    }
-    let keys = keys(p, "items", cmd)?;
-    if keys.is_empty() {
-        return Err(bad(cmd, "isolate needs `paths` or `items` (bodies)"));
-    }
-    let world = s.world_state()?;
-    let keep: Vec<String> = keys
-        .iter()
-        .map(|k| match shown_item(s, &world, k) {
-            Some(Shown::Body(name)) => Ok(name),
-            _ => Err(bad(cmd, format!("no body `{k}`"))),
-        })
-        .collect::<Result<_>>()?;
-    let mut hidden_bodies: Vec<String> =
-        s.model.state().bodies.iter().filter(|b| s.doc.model_body_component(b) == 0 && !keep.contains(&b.name)).map(|b| b.name.clone()).collect();
-    let mut hidden = Vec::new();
-    let mut stack = vec![Vec::<u64>::new()];
-    let mut count = 0;
-    while let Some(parent) = stack.pop() {
-        for child in s.occurrence_children(&parent)? {
-            count += 1;
-            if count > 100_000 {
-                return Err(bad(cmd, "isolate exceeds 100000 placements"));
-            }
-            if s.occurrence_bodies_shared(&child.path, true)?.iter().any(|b| keep.contains(b)) {
-                hidden_bodies.extend(child.bodies.into_iter().map(|b| b.world).filter(|b| !keep.contains(b)));
-                stack.push(child.path);
-            } else {
-                hidden.push(child.path);
-            }
-        }
-    }
-    // A hidden Bodies folder or group a picked body is in would keep it hidden: those show
-    // again. Their other bodies are hidden one by one above, as the root's are.
-    let shown_folders = folders_holding(s, &keep);
-    s.visibility.hidden_folders.retain(|k| !shown_folders.contains(k));
-    s.visibility.hidden_occurrences = hidden;
-    s.visibility.hidden_bodies = hidden_bodies;
-    s.refresh_display();
-    Ok(json!({"visible":true,"isolated":keep,"visibility":s.visibility}))
-}
-
-/// The tree keys of the Bodies folders and groups (with the groups they are in) that hold the
-/// bodies named `world` in some placement.
-fn folders_holding(s: &Session, world: &[String]) -> std::collections::BTreeSet<String> {
-    let mut keys = std::collections::BTreeSet::new();
-    if s.visibility.hidden_folders.is_empty() {
-        return keys;
-    }
-    let st = s.model.state();
-    let names = solidcraft_doc::WorldNames::new(&s.doc, &st);
-    // Each body's component, found once rather than once per placement.
-    let owned: Vec<(u64, &str)> = s.doc.model_body_components(&st).into_iter().zip(st.bodies.iter().map(|b| b.name.as_str())).collect();
-    for (component, path, _) in s.doc.placements() {
-        let scope = Session::folder_scope(&path);
-        for b in owned.iter().filter(|(c, _)| *c == component).map(|(_, name)| *name) {
-            if !world.contains(&names.name(b, component, &path)) {
-                continue;
-            }
-            keys.insert(format!("{scope}/bodies"));
-            for g in s.doc.browser_groups.iter().filter(|g| g.component == component && g.folder == "bodies" && g.has_item(b)) {
-                for id in std::iter::successors(Some(g.id), |id| s.doc.browser_group(*id).and_then(|g| g.parent))
-                    .take(solidcraft_doc::MAX_GROUP_NESTING + 1)
-                {
-                    keys.insert(format!("{scope}/g{id}"));
-                }
-            }
-        }
-    }
-    keys
-}
-
 fn visibility(s: &mut Session, p: &Value) -> Result<Value> {
     let cmd = "browser.visibility";
     let visible = bool_(p, "visible").ok_or_else(|| bad(cmd, "`visible` must be true or false"))?;
@@ -608,9 +525,6 @@ fn visibility(s: &mut Session, p: &Value) -> Result<Value> {
         s.refresh_display();
         return Ok(json!({"visible":visible,"changed":paths.len(),"visibility":s.visibility}));
     }
-    if bool_(p, "isolate").unwrap_or(false) {
-        return isolate_bodies(s, p, visible);
-    }
     let items: Vec<Shown> = match (str_(p, "folder"), p.get("items")) {
         _ if p.get("features").is_some() => {
             if ["items", "folder", "joints"].iter().any(|k| p.get(*k).is_some()) {

crates/engine/src/cmd/clearance.rs

@@ -9,7 +9,7 @@
 use std::collections::{BTreeMap, HashMap};
 use std::sync::Arc;
 
-use serde_json::Value;
+use serde_json::{Value, json};
 use solidcraft_geom::mesh_distance::box_gap;
 use solidcraft_geom::prelude::*;
 use solidcraft_geom::{Aabb3, Mesh};
@@ -17,20 +17,9 @@ use solidcraft_kernel::{BodyDistance, DistanceShape};
 
 use super::CommandSpec;
 use crate::params::{bad, num, str_, string_list};
-use crate::schema::clearance::{
-    Clearance as ClearanceReply, ClearanceParams, MAX_CLEARANCE, MAX_NEAREST, NearPair, Neighbour, Overlap, OverlapBounds, Unchecked,
-};
-use crate::schema::{TypedContract, output_schema_for};
 use crate::{Result, Session};
 
-const CONTRACT: TypedContract<ClearanceParams> = TypedContract::new();
-
-pub static COMMANDS: &[CommandSpec] = &[CommandSpec::new("inspect.clearance", "Clearance", crate::checked!("inspect.clearance", clearance))
-    .icon("interference")
-    .noundo()
-    .contract(&CONTRACT)
-    .output(output_schema_for::<ClearanceReply>)
-    .params(
+pub static COMMANDS: &[CommandSpec] = &[CommandSpec::new("inspect.clearance", "Clearance", clearance).icon("interference").noundo().params(
     "bodies?: [names] (default: every solid body, in world placement, but those in `against`; mesh bodies are not measured); against?: [names] (only pairs with one body in `bodies` and the other here); \
      min_volume?: mm³ (default 0.01: smaller overlaps count as contact); clearance?: mm (default 0: report pairs closer than this); \
      nearest?: n (each body of `bodies` gets its n nearest others); skip_within?: \"occurrence\" (pairs of bodies of one occurrence) | \
@@ -45,6 +34,10 @@ pub static COMMANDS: &[CommandSpec] = &[CommandSpec::new("inspect.clearance", "C
 const MAX_BODIES: usize = 20_000;
 /// Most pairs whose grown boxes meet that one call measures.
 const MAX_PAIRS: usize = 200_000;
+/// Most neighbours a body's `nearest` list holds.
+const MAX_NEAREST: usize = 1000;
+/// Largest clearance (mm).
+const MAX_CLEARANCE: f64 = 1e6;
 
 #[derive(Clone, Copy, PartialEq, Eq)]
 enum SkipWithin {
@@ -268,56 +261,48 @@ fn clearance(s: &mut Session, p: &Value) -> Result<Value> {
     for k in ["bodies", "against"] {
         asked.extend(string_list(cmd, p, k)?);
     }
-    let mut unchecked: Vec<Unchecked> = mesh_bodies
+    let mut unchecked: Vec<Value> = mesh_bodies
         .iter()
         .filter(|b| p.get("bodies").is_none_or(Value::is_null) || asked.contains(&b.name))
-        .map(|b| Unchecked { a: b.name.clone(), b: None, reason: super::interference::MESH_NOT_CHECKED.to_string() })
+        .map(|b| json!({"a": b.name, "b": null, "reason": super::interference::MESH_NOT_CHECKED}))
         .collect();
     let name = |i: usize| solid.get(i).map_or("", |b| b.name.as_str());
-    let pair = |i: usize, j: usize, reason: String| Unchecked { a: name(i).to_string(), b: Some(name(j).to_string()), reason };
     for (&(i, j), r) in close.iter().zip(results) {
         let r = match r {
             Ok(r) => r,
             Err(e) => {
-                unchecked.push(pair(i, j, e.to_string()));
+                unchecked.push(json!({"a": name(i), "b": name(j), "reason": e.to_string()}));
                 continue;
             }
         };
         if let Some(reason) = r.unchecked {
-            unchecked.push(pair(i, j, reason));
+            unchecked.push(json!({"a": name(i), "b": name(j), "reason": reason}));
             continue;
         }
         if let Some((volume, area, bbox, center)) = r.overlap
             && volume >= min_volume
         {
-            overlaps.push(Overlap {
-                a: name(i).to_string(),
-                b: name(j).to_string(),
-                volume_mm3: volume,
-                area_mm2: area,
-                bbox: OverlapBounds { min: bbox.min.into(), max: bbox.max.into() },
-                center: center.into(),
-            });
+            overlaps.push(json!({"a": name(i), "b": name(j), "volume_mm3": volume, "area_mm2": area,
+                "bbox": {"min": bbox.min, "max": bbox.max}, "center": center}));
             known.insert((i, j), 0.0);
             continue;
         }
         let Some(d) = r.distance else { continue };
         known.insert((i, j), d.distance);
         if d.distance < gap {
-            near.push(NearPair {
-                a: name(i).to_string(),
-                b: name(j).to_string(),
-                distance_mm: d.distance,
-                from: d.from.into(),
-                to: d.to.into(),
-                overlap_mm3: r.overlap.filter(|o| o.0 > 0.0).map(|o| o.0),
-                exact: (!d.exact).then_some(false),
-            });
+            let mut e = json!({"a": name(i), "b": name(j), "distance_mm": d.distance, "from": d.from, "to": d.to});
+            if let Some((v, ..)) = r.overlap.filter(|o| o.0 > 0.0) {
+                e["overlap_mm3"] = json!(v);
+            }
+            if !d.exact {
+                e["exact"] = json!(false);
+            }
+            near.push(e);
         }
     }
-    near.sort_by(|x, y| x.distance_mm.total_cmp(&y.distance_mm));
+    near.sort_by(|x, y| x["distance_mm"].as_f64().unwrap_or(0.0).total_cmp(&y["distance_mm"].as_f64().unwrap_or(0.0)));
 
-    let mut nearest_out = BTreeMap::new();
+    let mut nearest_out = serde_json::Map::new();
     if nearest > 0 {
         let lists = nearest_lists(&subjects, n, nearest, &boxes, &allowed, &mut known, |pairs| {
             solidcraft_kernel::map_with_local_pools(pairs, usize::MAX, |&(i, j)| {
@@ -326,25 +311,23 @@ fn clearance(s: &mut Session, p: &Value) -> Result<Value> {
             })
         });
         for (i, list) in lists {
-            let rows = list.iter().map(|&(j, d)| Neighbour { body: name(j).to_string(), distance_mm: d }).collect();
-            nearest_out.insert(name(i).to_string(), rows);
+            let rows: Vec<Value> = list.iter().map(|&(j, d)| json!({"body": name(j), "distance_mm": d})).collect();
+            nearest_out.insert(name(i).to_string(), Value::Array(rows));
         }
     }
 
-    let reply = ClearanceReply {
-        overlaps,
-        near,
-        nearest: nearest_out,
-        unchecked,
-        bodies: subjects.len(),
-        pairs_checked: close.len(),
-        pairs_reused: reused,
-        pairs_pruned: total.saturating_sub(close.len()),
-        truncated: truncated > 0,
-        ms: started.elapsed().as_secs_f64() * 1000.0,
-        param_warnings: Vec::new(),
-    };
-    serde_json::to_value(reply).map_err(|e| bad(cmd, e.to_string()))
+    Ok(json!({
+        "overlaps": overlaps,
+        "near": near,
+        "nearest": nearest_out,
+        "unchecked": unchecked,
+        "bodies": subjects.len(),
+        "pairs_checked": close.len(),
+        "pairs_reused": reused,
+        "pairs_pruned": total.saturating_sub(close.len()),
+        "truncated": truncated > 0,
+        "ms": started.elapsed().as_secs_f64() * 1000.0,
+    }))
 }
 
 /// One pair: its overlap when the meshes meet or one holds the other, otherwise its distance

crates/engine/src/cmd/compare.rs

@@ -5,7 +5,7 @@
 //! well as any; each place's volume, centre and box are then measured exactly, on the pieces of
 //! the two cuts a − b and b − a that lie there, as `inspect.measure` measures a body.
 
-use serde_json::Value;
+use serde_json::{Value, json};
 use solidcore_record::Vec3;
 use solidcraft_geom::Aabb3;
 use solidcraft_geom::compare::{self, CompareOptions, Side};
@@ -13,19 +13,9 @@ use solidcraft_geom::prelude::*;
 
 use super::CommandSpec;
 use crate::params::bad;
-use crate::schema::compare::{
-    Bounds, CompareParams, CompareSide, Comparison, Deviation, Deviations, Difference, MeasuredBy, Region, Resolution, Sampling, SideTotal,
-};
-use crate::schema::{TypedContract, output_schema_for};
 use crate::{Result, Sel, Session};
 
-const CONTRACT: TypedContract<CompareParams> = TypedContract::new();
-
-pub static COMMANDS: &[CommandSpec] = &[CommandSpec::new("inspect.compare", "Compare Bodies", crate::checked!("inspect.compare", compare_bodies))
-    .icon("compare")
-    .contract(&CONTRACT)
-    .output(output_schema_for::<Comparison>)
-    .params(
+pub static COMMANDS: &[CommandSpec] = &[CommandSpec::new("inspect.compare", "Compare Bodies", compare_bodies).icon("compare").params(
     "a, b: body names (default: the two selected bodies, or the design's only two), in world placement; tolerance?: mm (0.001 to 10, default 0.01): \
      surfaces closer than this agree; spacing?: mm (default 0.5): the largest piece of a face sampled as one point, coarser for a body that would need \
      more than max_points? (default 8 million, up to 50 million) samples; max_regions? (default 50); color?: true | {only_in_a?, only_in_b?: \"#rrggbb\"} \
@@ -42,10 +32,10 @@ pub static COMMANDS: &[CommandSpec] = &[CommandSpec::new("inspect.compare", "Com
 const ONLY_IN_A: [u8; 3] = [0xe0, 0x31, 0x31];
 const ONLY_IN_B: [u8; 3] = [0x2f, 0x9e, 0x44];
 
-fn side_of(s: Side) -> CompareSide {
+fn side_name(s: Side) -> &'static str {
     match s {
-        Side::OnlyInA => CompareSide::OnlyInA,
-        Side::OnlyInB => CompareSide::OnlyInB,
+        Side::OnlyInA => "only_in_a",
+        Side::OnlyInB => "only_in_b",
     }
 }
 
@@ -115,21 +105,21 @@ fn v3(v: &Value) -> Option<Vec3> {
 }
 
 /// b − a of the two bodies' measures.
-fn difference(ma: &Value, mb: &Value) -> Difference {
+fn difference(ma: &Value, mb: &Value) -> Value {
     let f = |m: &Value, k: &str| m.get(k).and_then(Value::as_f64);
     let sub = |x: Option<f64>, y: Option<f64>| x.zip(y).map(|(x, y)| y - x);
     let (va, vb) = (f(ma, "volume_mm3"), f(mb, "volume_mm3"));
     let com = v3(&ma["center_of_mass"]).zip(v3(&mb["center_of_mass"])).map(|(a, b)| b - a);
-    let corner = |k: &str| v3(&ma["bbox"][k]).zip(v3(&mb["bbox"][k])).map(|(a, b)| (b - a).into());
-    Difference {
-        volume_mm3: sub(va, vb),
-        volume_percent: va.zip(vb).filter(|(a, _)| a.abs() > 0.0).map(|(a, b)| 100.0 * (b - a) / a),
-        area_mm2: sub(f(ma, "area_mm2"), f(mb, "area_mm2")),
-        center_of_mass: com.map(Into::into),
-        center_of_mass_distance_mm: com.map(Vec3::len),
-        bbox_min: corner("min"),
-        bbox_max: corner("max"),
-    }
+    let corner = |k: &str| v3(&ma["bbox"][k]).zip(v3(&mb["bbox"][k])).map(|(a, b)| b - a);
+    json!({
+        "volume_mm3": sub(va, vb),
+        "volume_percent": va.zip(vb).filter(|(a, _)| a.abs() > 0.0).map(|(a, b)| 100.0 * (b - a) / a),
+        "area_mm2": sub(f(ma, "area_mm2"), f(mb, "area_mm2")),
+        "center_of_mass": com,
+        "center_of_mass_distance_mm": com.map(Vec3::len),
+        "bbox_min": corner("min"),
+        "bbox_max": corner("max"),
+    })
 }
 
 /// The volume a closed mesh encloses (divergence theorem, about its box's centre).
@@ -255,8 +245,8 @@ fn exact_regions(
     (measured, notes)
 }
 
-fn deviation(d: &compare::Deviation) -> Deviation {
-    Deviation { max_mm: d.max, mean_mm: d.mean, at: d.at.into(), area_beyond_mm2: d.beyond_area, area_mm2: d.area, points: d.points }
+fn deviation_json(d: &compare::Deviation) -> Value {
+    json!({"max_mm": d.max, "mean_mm": d.mean, "at": d.at, "area_beyond_mm2": d.beyond_area, "area_mm2": d.area, "points": d.points})
 }
 
 fn compare_bodies(s: &mut Session, p: &Value) -> Result<Value> {
@@ -318,36 +308,30 @@ fn compare_bodies(s: &mut Session, p: &Value) -> Result<Value> {
         exact_notes.iter().find(mine).or_else(|| exact_notes.last()).cloned().unwrap_or_else(|| "the exact cut gave no piece here".to_string())
     };
     let axis = |k: usize| ["X", "Y", "Z"].get(k).copied().unwrap_or("?");
-    let regions: Vec<Region> = order
+    let regions: Vec<Value> = order
         .iter()
         .enumerate()
         .filter_map(|(i, &k)| c.regions.get(k).map(|r| (i, k, r)))
         .map(|(i, k, r)| {
             let m = measured(k);
-            let bbox = m.map_or(r.bbox, |m| m.bbox);
-            Region {
-                index: i + 1,
-                side: side_of(r.side),
-                material_of: if r.side == Side::OnlyInA { na.clone() } else { nb.clone() },
-                volume_mm3: m.map(|m| m.volume),
-                measured_by: if m.is_some() { MeasuredBy::Boolean } else { MeasuredBy::NotMeasured },
-                not_measured: if m.is_some() { None } else { Some(reason(k)) },
-                area_mm2: r.area_a + r.area_b,
-                area_a_mm2: r.area_a,
-                area_b_mm2: r.area_b,
-                max_deviation_mm: r.max_deviation,
-                at: r.at.into(),
-                center: m.map(|m| m.center.into()),
-                bbox: Bounds { min: bbox.min.into(), max: bbox.max.into() },
-                faces_a: r.faces_a.iter().map(|x| x.0).collect(),
-                faces_b: r.faces_b.iter().map(|x| x.0).collect(),
-                resolution: Resolution {
-                    along: axis(r.lines.axis).to_string(),
-                    line_spacing_mm: r.lines.spacing,
-                    lines: r.lines.count,
-                    skipped_lines: r.lines.skipped,
-                },
-            }
+            json!({
+                "index": i + 1,
+                "side": side_name(r.side),
+                "material_of": if r.side == Side::OnlyInA { &na } else { &nb },
+                "volume_mm3": m.map(|m| m.volume),
+                "measured_by": if m.is_some() { "boolean" } else { "not measured" },
+                "not_measured": if m.is_some() { Value::Null } else { json!(reason(k)) },
+                "area_mm2": r.area_a + r.area_b,
+                "area_a_mm2": r.area_a,
+                "area_b_mm2": r.area_b,
+                "max_deviation_mm": r.max_deviation,
+                "at": r.at,
+                "center": m.map(|m| m.center),
+                "bbox": m.map(|m| json!({"min": m.bbox.min, "max": m.bbox.max})).unwrap_or_else(|| json!({"min": r.bbox.min, "max": r.bbox.max})),
+                "faces_a": r.faces_a.iter().map(|x| x.0).collect::<Vec<u32>>(),
+                "faces_b": r.faces_b.iter().map(|x| x.0).collect::<Vec<u32>>(),
+                "resolution": {"along": axis(r.lines.axis), "line_spacing_mm": r.lines.spacing, "lines": r.lines.count, "skipped_lines": r.lines.skipped},
+            })
         })
         .collect();
     // A side's total, or none when one of its regions is not measured.
@@ -377,28 +361,25 @@ fn compare_bodies(s: &mut Session, p: &Value) -> Result<Value> {
     if !warnings.is_empty() {
         verdict += &format!(" ({} warning{})", warnings.len(), if warnings.len() == 1 { "" } else { "s" });
     }
-    let colored_faces = match colors {
-        Some(colors) => Some(color_regions(s, &c, [&na, &nb], colors)?),
-        None => None,
-    };
-    let out = Comparison {
-        difference: difference(&measure_a, &measure_b),
-        a: measure_a.as_object().cloned().unwrap_or_default(),
-        b: measure_b.as_object().cloned().unwrap_or_default(),
-        tolerance_mm: tolerance,
-        deviation: Deviations { a_to_b: deviation(&c.a_to_b), b_to_a: deviation(&c.b_to_a), max_mm: worst },
-        identical,
-        verdict,
-        regions,
-        only_in_a: SideTotal { regions: ca, volume_mm3: va },
-        only_in_b: SideTotal { regions: cb, volume_mm3: vb },
-        unlisted_regions: c.unlisted,
-        warnings,
-        sampling: Sampling { spacing_mm: c.spacing, chord_mm: chord, triangles_a: mesh_a.triangles.len(), triangles_b: mesh_b.triangles.len() },
-        colored_faces,
-        param_warnings: Vec::new(),
-    };
-    serde_json::to_value(out).map_err(|e| bad(cmd, e.to_string()))
+    let mut out = json!({
+        "a": measure_a,
+        "b": measure_b,
+        "difference": difference(&measure_a, &measure_b),
+        "tolerance_mm": tolerance,
+        "deviation": {"a_to_b": deviation_json(&c.a_to_b), "b_to_a": deviation_json(&c.b_to_a), "max_mm": worst},
+        "identical": identical,
+        "verdict": verdict,
+        "regions": regions,
+        "only_in_a": {"regions": ca, "volume_mm3": va},
+        "only_in_b": {"regions": cb, "volume_mm3": vb},
+        "unlisted_regions": c.unlisted,
+        "warnings": warnings,
+        "sampling": {"spacing_mm": c.spacing, "chord_mm": chord, "triangles_a": mesh_a.triangles.len(), "triangles_b": mesh_b.triangles.len()},
+    });
+    if let Some(colors) = colors {
+        out["colored_faces"] = json!(color_regions(s, &c, [&na, &nb], colors)?);
+    }
+    Ok(out)
 }
 
 /// A face is coloured for a region when at least this share of it deviates there.

crates/engine/src/cmd/config.rs

@@ -331,11 +331,6 @@ fn row(s: &mut Session, p: &Value) -> Result<Value> {
     if rename.as_ref().is_some_and(|n| n != &name && s.doc.configs.rows.iter().any(|r| &r.name == n)) {
         return Err(bad(cmd, "configuration name already exists"));
     }
-    for (column, value) in s.doc.configs.columns.iter().zip(&cells) {
-        if matches!(column, Column::Suppress(_)) {
-            solidcraft_doc::config::suppression_cell(value).map_err(|e| bad(cmd, e.to_string()))?;
-        }
-    }
     let changes: Vec<_> = s
         .doc
         .configs
@@ -748,78 +743,6 @@ mod tests {
         }
     }
 
-    #[test]
-    fn configuration_rows_reject_invalid_suppression_without_changes() {
-        let mut s = Session::default();
-        run(&mut s, "sketch.create", json!({"plane":"XY", "name":"TestSketch"}));
-        run(&mut s, "sketch.finish", json!({}));
-        run(&mut s, "config.configure", json!({"features":["TestSketch"]}));
-        let before = s.doc.clone();
-        let undo_len = s.undo.len();
-        for value in [json!("banana"), json!(""), json!(2), json!(-1)] {
-            for params in [
-                json!({"name":"Bad", "values":{"suppress:TestSketch":value}}),
-                json!({"name":"Copy", "from":"Default", "values":{"TestSketch":value}}),
-                json!({"name":"Default", "rename":"Renamed", "values":{"TestSketch":value}}),
-            ] {
-                let error = s.execute("config.row", &params).expect_err("invalid suppression must be rejected when saving a row");
-                assert!(error.to_string().contains("suppression must be true or false"), "{params}: {error}");
-                assert_eq!(s.doc, before, "{params}");
-                assert_eq!(s.undo.len(), undo_len, "{params}");
-            }
-        }
-    }
-
-    #[test]
-    fn configuration_rows_validate_inherited_suppression_and_allow_repair() {
-        let mut s = Session::default();
-        run(&mut s, "sketch.create", json!({"plane":"XY", "name":"TestSketch"}));
-        run(&mut s, "sketch.finish", json!({}));
-        run(&mut s, "config.configure", json!({"features":["TestSketch"]}));
-        // A row saved by an older reader may already contain invalid suppression text.
-        s.doc_mut().configs.rows[0].cells[0] = "banana".into();
-        let before = s.doc.clone();
-        let undo_len = s.undo.len();
-        for params in [json!({"name":"Copy", "from":"Default"}), json!({"name":"Default", "rename":"Renamed"})] {
-            let error = s.execute("config.row", &params).expect_err("inherited invalid suppression must also be checked");
-            assert!(error.to_string().contains("suppression must be true or false"), "{params}: {error}");
-            assert_eq!(s.doc, before, "{params}");
-            assert_eq!(s.undo.len(), undo_len, "{params}");
-        }
-        run(&mut s, "config.row", json!({"name":"Default", "values":{"TestSketch":false}}));
-        assert_eq!(s.doc.configs.rows[0].cells[0], "false");
-        run(&mut s, "config.activate", json!({"row":"Default"}));
-        assert!(!s.doc.features[0].suppressed);
-    }
-
-    #[test]
-    fn configuration_rows_keep_supported_suppression_spellings() {
-        let mut s = Session::default();
-        run(&mut s, "sketch.create", json!({"plane":"XY", "name":"TestSketch"}));
-        run(&mut s, "sketch.finish", json!({}));
-        run(&mut s, "config.configure", json!({"features":["TestSketch"]}));
-        for (value, suppressed) in [
-            (json!(true), true),
-            (json!(false), false),
-            (json!(1), true),
-            (json!(0), false),
-            (json!("true"), true),
-            (json!("false"), false),
-            (json!(" YES "), true),
-            (json!(" No "), false),
-            (json!("1"), true),
-            (json!("0"), false),
-        ] {
-            let before = s.doc.features.clone();
-            run(&mut s, "config.row", json!({"name":"Accepted", "values":{"suppress:TestSketch":value}}));
-            assert_eq!(s.doc.features, before, "saving a row does not activate it");
-            let text = value.as_str().map(str::to_owned).unwrap_or_else(|| value.to_string());
-            assert_eq!(s.doc.configs.rows[1].cells[0], text, "accepted spellings are preserved");
-            run(&mut s, "config.activate", json!({"row":"Accepted"}));
-            assert_eq!(s.doc.features[0].suppressed, suppressed, "{value}");
-        }
-    }
-
     #[test]
     fn configuration_rows_validate_the_final_parameter_graph_without_activating_it() {
         let mut s = Session::default();

crates/engine/src/cmd/features.rs

@@ -13,8 +13,8 @@ use solidcraft_geom::prelude::*;
 use super::{CommandSpec, not_in_sketch};
 use crate::params::{UNKNOWN_COMMAND, bad, bool_, expr, expr_problem, req_expr, str_, string_list, string_list_or_default, vec2, vec3};
 use crate::schema::features::{
-    AppliedRadius, BoundingSolidParams, BoxParams, ConeParams, CylinderParams, ExtrudeParams, FeatureNotice, FeatureResult, FilletParams,
-    FilletResult, NoticeAction, OffsetPlaneParams, PipeParams, PlaneAtAngleParams, ScaleParams, SphereParams, TorusParams,
+    BoundingSolidParams, BoxParams, ConeParams, CylinderParams, ExtrudeParams, FeatureNotice, FeatureResult, NoticeAction, OffsetPlaneParams,
+    PipeParams, PlaneAtAngleParams, ScaleParams, SphereParams, TorusParams,
 };
 use crate::schema::{TypedContract, output_schema_for};
 use crate::{EngineError, Result, Session};
@@ -30,7 +30,6 @@ const BOUNDING_SOLID_CONTRACT: TypedContract<BoundingSolidParams> = TypedContrac
 const SCALE_CONTRACT: TypedContract<ScaleParams> = TypedContract::new();
 const OFFSET_PLANE_CONTRACT: TypedContract<OffsetPlaneParams> = TypedContract::new();
 const PLANE_AT_ANGLE_CONTRACT: TypedContract<PlaneAtAngleParams> = TypedContract::new();
-const FILLET_CONTRACT: TypedContract<FilletParams> = TypedContract::new();
 
 pub static COMMANDS: &[CommandSpec] = &[
     CommandSpec::new("solid.extrude", "Extrude", crate::checked!("solid.extrude", extrude))
@@ -79,13 +78,11 @@ pub static COMMANDS: &[CommandSpec] = &[
         .contract(&CONE_CONTRACT)
         .output(output_schema_for::<FeatureResult>)
         .params("radius | diameter, height: expr (the base circle, and the top's distance along the axis; a negative height goes the other way); top_radius? | top_diameter?: expr (the top circle; default 0: a full cone ending in an apex); base?: [x,y,z] (centre of the base circle: numbers in mm or length expressions; default: the origin); axis?: X|Y|Z|[x,y,z] (default Z); operation?, touching?, targets?: [body], name?, body_name?"),
-    CommandSpec::new("solid.fillet", "Fillet", crate::checked!("solid.fillet", fillet))
+    CommandSpec::new("solid.fillet", "Fillet", fillet)
         .at("SOLID", "MODIFY")
         .icon("fillet")
         .key("F")
-        .contract(&FILLET_CONTRACT)
-        .output(output_schema_for::<FilletResult>)
-        .params("edges: [[x,y,z] point on edge | {body, index}] ; radius: expr; tangent_chain?: bool (default true: each picked edge's tangent chain is rounded with it; false: exactly the picked edges); body?; type?: constant|curvature (alias g2: curvature-continuous quintic between planar faces along straight edges, one planar end face at each end (including sloped ends); radius sets the equivalent circular setback, not constant curvature; exact fit only)|chord (radius is the width across)|variable (radius at the end nearest start, radius2 at the other; one end may be 0, where the round closes to the corner)|spline (the radius along the edge is a clamped B-spline from the end nearest start: radius is its first control radius, radii the rest, knots its knot vector from 0 to 1; one end may be 0); radius2?; start?: [x,y,z]; radii?: [expr, …]; knots?: [number, …]; mid?: [[position 0…1 from start, radius expr], …] (variable radii between the ends); smooth?: bool (smooth instead of straight between the radii); corner?: rolling|g2 (rolling, the default: the corners where three blended edges meet are pieces of the rolling ball's sphere, tangent to each blend; a curvature round's corners are always g2 patches, between its own sections; g2: each corner where three or more rounded edges meet, and every edge there is rounded, is set back (1.5 × the radius along each edge unless `setbacks` names it) and filled with a patch meeting the rounds and the faces round it to the second order (curvature-continuous seams, clear of the points where a round's section ends on a face), constant-radius exact fillets only, refused where it cannot be built); setbacks?: [{vertex: [x,y,z], distance: expr}, …] (corner setbacks: the corner at the vertex nearest `vertex`, where every edge meeting it is rounded, starts its patch `distance` along each of those edges from the vertex, past where the rounds would meet (past the radius at a square corner), so the rounds blend through a larger patch; one distance for all of a corner's edges; constant-radius exact fillets only; with `corner: g2`, the G2 patch's corners); turn?: mitre|swept (where two rounds turn round a sharp, straight, convex side edge square to both on a plane, such as the rounds along a boss's base at its upright edges: mitre, the default, runs them on to meet in a mitre; swept ends them at the side edge and fills the corner with their section revolved about it, a torus; swept takes type: constant, corner: rolling, no setbacks and fit: exact or reduce, and is refused with the reason where the rounds are unequal or the side edge is concave, curved or tangent); fit?: exact|reduce|taper (exact, the default: a radius too large for the geometry around the edges is refused, naming the largest that fits; reduce: where it doesn't fit it is reduced to the largest that does, one radius for edges sharing a face; the smallest used is returned as `radius_applied`, each edge's as `radii_applied: [{edge: [x,y,z], radius}]`, and noted in the feature's warning; taper: along each straight edge between planar faces where it doesn't fit, the radius follows the room there as a smooth spline, down to 0 where a face closes to a point, noted in the feature's warning)"),
+        .params("edges: [[x,y,z] point on edge | {body, index}] ; radius: expr; tangent_chain?: bool (default true: each picked edge's tangent chain is rounded with it; false: exactly the picked edges); body?; type?: constant|curvature (alias g2: curvature-continuous quintic between planar faces along straight edges, one planar end face at each end (including sloped ends); radius sets the equivalent circular setback, not constant curvature; exact fit only)|chord (radius is the width across)|variable (radius at the end nearest start, radius2 at the other; one end may be 0, where the round closes to the corner)|spline (the radius along the edge is a clamped B-spline from the end nearest start: radius is its first control radius, radii the rest, knots its knot vector from 0 to 1; one end may be 0); radius2?; start?: [x,y,z]; radii?: [expr, …]; knots?: [number, …]; mid?: [[position 0…1 from start, radius expr], …] (variable radii between the ends); smooth?: bool (smooth instead of straight between the radii); corner?: rolling|g2 (rolling, the default: the corners where three blended edges meet are pieces of the rolling ball's sphere, tangent to each blend; a curvature round's corners are always g2 patches, between its own sections; g2: each corner where three or more rounded edges meet, and every edge there is rounded, is set back (1.5 × the radius along each edge unless `setbacks` names it) and filled with a patch meeting the rounds and the faces round it to the second order (curvature-continuous seams, clear of the points where a round's section ends on a face), constant-radius exact fillets only, refused where it cannot be built); setbacks?: [{vertex: [x,y,z], distance: expr}, …] (corner setbacks: the corner at the vertex nearest `vertex`, where every edge meeting it is rounded, starts its patch `distance` along each of those edges from the vertex, past where the rounds would meet (past the radius at a square corner), so the rounds blend through a larger patch; one distance for all of a corner's edges; constant-radius exact fillets only; with `corner: g2`, the G2 patch's corners); fit?: exact|reduce|taper (exact, the default: a radius too large for the geometry around the edges is refused, naming the largest that fits; reduce: where it doesn't fit it is reduced to the largest that does, one radius for edges sharing a face; the smallest used is returned as `radius_applied`, each edge's as `radii_applied: [{edge: [x,y,z], radius}]`, and noted in the feature's warning; taper: along each straight edge between planar faces where it doesn't fit, the radius follows the room there as a smooth spline, down to 0 where a face closes to a point, noted in the feature's warning)"),
     CommandSpec::new("solid.chamfer", "Chamfer", chamfer).at("SOLID", "MODIFY").icon("chamfer").params("edges: [[x,y,z] | {body, index}] ; distance: expr; tangent_chain?: bool (default true: each picked edge's tangent chain is cut with it; false: exactly the picked edges); distance2?: expr (along the second face) | angle?: expr (from the first face); flip?: bool (which face is first: by default the one facing up most); body?"),
     CommandSpec::new("solid.combine", "Combine", combine).at("SOLID", "MODIFY").icon("combine").params("target: body; tools: [body]; operation?: join|cut|intersect; touching?: separate|one_body (what a join makes of pieces that share no face: separate, the default, makes each piece that touches another only along an edge or at a point a body of its own and keeps pieces that touch nothing in one body; one_body keeps every piece in one body); keep_tools?: bool; new_component?: bool (the result goes into a new component; component_name?)"),
     CommandSpec::new("solid.pattern.rectangular", "Rectangular Pattern", pattern_rect)
@@ -1791,15 +1788,6 @@ fn fillet(s: &mut Session, p: &Value) -> Result<Value> {
             return Err(bad(cmd, "`setbacks` are built for a constant-radius fillet (`type: constant`, `fit: exact`) only"));
         }
     }
-    // How two rounds turn at a sharp side edge.
-    let turn = match str_(p, "turn").map(str::to_ascii_lowercase).as_deref() {
-        None | Some("mitre") => solidcraft_doc::FilletTurn::Mitre,
-        Some("swept") => solidcraft_doc::FilletTurn::Swept,
-        Some(o) => return Err(bad(cmd, format!("unknown turn `{o}` (mitre or swept)"))),
-    };
-    if !turn.is_mitre() && (!style.is_constant() || fit == solidcraft_doc::FilletFit::Taper || !corner.is_rolling() || !setbacks.is_empty()) {
-        return Err(bad(cmd, solidcraft_doc::SWEPT_TAKES));
-    }
     let mut out = add_feature(
         s,
         p,
@@ -1811,7 +1799,6 @@ fn fillet(s: &mut Session, p: &Value) -> Result<Value> {
             fit,
             corner,
             setbacks,
-            turn,
             tangent_chain: bool_(p, "tangent_chain").unwrap_or(true),
         },
     )?;
@@ -1821,9 +1808,9 @@ fn fillet(s: &mut Session, p: &Value) -> Result<Value> {
         && let Some(r) = state.fitted_radius(id)
     {
         out["radius_applied"] = serde_json::json!(r);
-        let each: Vec<AppliedRadius> =
-            state.fitted_edges(id).unwrap_or_default().into_iter().map(|(p, radius)| AppliedRadius { edge: [p.x, p.y, p.z], radius }).collect();
-        out["radii_applied"] = serde_json::to_value(each).map_err(|e| EngineError::Internal(cmd.into(), e.to_string()))?;
+        let each: Vec<Value> =
+            state.fitted_edges(id).unwrap_or_default().into_iter().map(|(p, r)| serde_json::json!({"edge": [p.x, p.y, p.z], "radius": r})).collect();
+        out["radii_applied"] = Value::Array(each);
     }
     Ok(out)
 }
@@ -3580,87 +3567,6 @@ mod corner_tests {
         eprintln!("mixed corner g2: {err}");
         assert!(err.contains("not supported yet") && err.contains("(40.000, 20.000, 20.000)") && err.contains("all convex or all concave"), "{err}");
     }
-
-    /// `solid.fillet turn?: mitre|swept` on the four base edges of a 10 x 10 x 5 boss on a
-    /// 40 x 30 x 10 plate, r 1: at each upright boss edge the two rounds turn round it. Each base
-    /// edge gains the spandrel A = (1 - π/4) r² along its 10, and the corners the rounds' part
-    /// beyond both walls, whose section's first moment about the upright edge is
-    /// M = (5/6 - π/4) r³: mitred (the default), 8 M; swept, that section revolved a quarter turn at
-    /// each corner, 2π M, the corner's face the horn torus of radii r, r about the upright edge,
-    /// centred r above the plate. The turn is saved; an unknown turn and a swept chord round are
-    /// refused as parameters, and swept rounds along a pocket's floor (its upright edges concave)
-    /// with the kernel's reason.
-    #[test]
-    fn rounds_turning_round_a_boss_edge_are_mitred_or_swept() {
-        use std::f64::consts::PI;
-        const BASE: [[f64; 3]; 4] = [[20.0, 10.0, 10.0], [25.0, 15.0, 10.0], [20.0, 20.0, 10.0], [15.0, 15.0, 10.0]];
-        let boss = || {
-            let mut s = Session::default();
-            run(&mut s, "solid.box", &json!({"length": 40, "width": 30, "height": 10, "body_name": "B"}));
-            run(&mut s, "solid.box", &json!({"corner": [15, 10, 10], "length": 10, "width": 10, "height": 5, "operation": "join"}));
-            s
-        };
-        let turned = |turn: Option<&str>| {
-            let mut s = boss();
-            let mut p = json!({"edges": BASE, "radius": 1});
-            if let Some(t) = turn {
-                p["turn"] = json!(t);
-            }
-            let reply = run(&mut s, "solid.fillet", &p);
-            assert_eq!(reply["warning"], json!(null), "{reply}");
-            let body = s.world_state().unwrap().body("B").unwrap().body.clone();
-            assert!(body.validity().is_empty(), "{:?}", body.validity());
-            (s, solidcraft_kernel::measure(&body).unwrap(), body)
-        };
-        let (mitred, mitre, _) = turned(None);
-        let (_, named, _) = turned(Some("mitre"));
-        let (swept_session, swept, body) = turned(Some("swept"));
-        eprintln!("mitre: {} faces, {:.9}; swept: {} faces, {:.9}", mitre.faces, mitre.volume, swept.faces, swept.volume);
-        let r: f64 = 1.0;
-        let (a, m) = ((1.0 - PI / 4.0) * r * r, (5.0 / 6.0 - PI / 4.0) * r * r * r);
-        let near = |v: f64, want: f64| (v - want).abs() < 1e-9 * want;
-        assert!(near(mitre.volume, 12500.0 + 40.0 * a + 8.0 * m), "{}", mitre.volume);
-        assert!(near(swept.volume, 12500.0 + 40.0 * a + 2.0 * PI * m), "{}", swept.volume);
-        assert_eq!(named.volume.to_bits(), mitre.volume.to_bits(), "mitre is the default");
-        assert_eq!((mitre.faces, swept.faces), (15, 19));
-        // The four corner faces (the record's torus is a ring torus, so a horn torus is its exact
-        // rational form): every point on the horn torus about its upright edge.
-        let mut corners = 0;
-        for f in &body.record().faces {
-            if !matches!(f.surface, solidcore_record::brep::Surface::RationalSpline { .. }) {
-                continue;
-            }
-            corners += 1;
-            let eval = solidcraft_geom::brep::eval::SurfaceEval::new(&f.surface).unwrap();
-            let [[u0, u1], [v0, v1]] = f.domain;
-            for i in 0..=4 {
-                for j in 0..=4 {
-                    let p = eval.point([u0 + (u1 - u0) * f64::from(i) / 4.0, v0 + (v1 - v0) * f64::from(j) / 4.0]).unwrap();
-                    let (cx, cy) = (if p.x < 20.0 { 15.0 } else { 25.0 }, if p.y < 15.0 { 10.0 } else { 20.0 });
-                    let rho = (p.x - cx).hypot(p.y - cy);
-                    let off = ((rho - r).powi(2) + (p.z - 10.0 - r).powi(2)).sqrt() - r;
-                    assert!(off.abs() < 1e-9, "{p:?} is {off} off the horn torus");
-                }
-            }
-        }
-        assert_eq!(corners, 4);
-        assert!(!mitred.doc.to_json().contains("\"turn\""));
-        assert!(swept_session.doc.to_json().contains("\"turn\": \"swept\""));
-        let mut s = boss();
-        let e = s.execute("solid.fillet", &json!({"edges": BASE, "radius": 1, "turn": "round"})).unwrap_err().to_string();
-        assert!(e.contains("unknown turn `round` (mitre or swept)"), "{e}");
-        let e = s.execute("solid.fillet", &json!({"edges": BASE, "radius": 1, "turn": "swept", "type": "chord"})).unwrap_err().to_string();
-        assert!(e.contains(solidcraft_doc::SWEPT_TAKES), "{e}");
-        // A pocket 5 deep in the plate, its floor's edges rounded: the rounds meet at its concave
-        // upright edges.
-        let mut s = Session::default();
-        run(&mut s, "solid.box", &json!({"length": 40, "width": 30, "height": 10, "body_name": "P"}));
-        run(&mut s, "solid.box", &json!({"corner": [10, 10, 5], "length": 20, "width": 10, "height": 6, "operation": "cut"}));
-        let rim = json!([[20, 10, 5], [30, 15, 5], [20, 20, 5], [10, 15, 5]]);
-        let e = s.execute("solid.fillet", &json!({"edges": rim, "radius": 1, "turn": "swept"})).unwrap_err().to_string();
-        eprintln!("swept along a pocket's rim: {e}");
-        assert!(e.contains("swept corner at (") && e.contains("round that edge at a radius of at least 1 first"), "{e}");
-    }
 }
 #[cfg(test)]
 #[path = "fillet_connected_rounds_tests.rs"]

crates/engine/src/cmd/joints_coupling_tests.rs

@@ -408,24 +408,3 @@ fn a_motion_link_takes_its_driven_joints_freedom_with_nothing_grounded() {
         }
     }
 }
-
-/// Rolling the marker back works a gear's ratio out from the faces as they were then, so the
-/// editor's pinned model and its source differ in the link's ratio, and the edit still goes
-/// through.
-#[test]
-fn an_editor_accepts_the_ratios_rolling_the_marker_works_out() {
-    let mut s = gear_train();
-    let before = s.doc.features.len();
-    // G1's wall moves out to a radius of 12, so the link's ratio goes from -0.5 to -0.6.
-    run(&mut s, "solid.offset_face", json!({"faces": [[10, 0, 2.5]], "distance": 2}));
-    let ratio = |s: &Session| s.doc.assembly.links.first().map(|l| l.ratio).unwrap_or(f64::NAN);
-    assert!(close_to(ratio(&s), -0.6), "{}", ratio(&s));
-    let original = s.scratch();
-    run(&mut s, "timeline.roll_to", json!({"position": before}));
-    let source = s.scratch();
-    assert!(close_to(ratio(&source), -0.5), "before the offset, the pitch radius is 10: {}", ratio(&source));
-    let prepared = s.scratch().compute_editor_commands(&[], &source, original).unwrap();
-    s.accept_commands(prepared).unwrap();
-    assert_eq!(s.doc.marker, None);
-    assert!(close_to(ratio(&s), -0.6), "{}", ratio(&s));
-}

crates/engine/src/cmd/material_properties.rs

@@ -1,24 +1,15 @@
 //! Read-only validation of candidate engineering data; no assignment or simulation.
 use super::CommandSpec;
 use crate::params::bad;
-use crate::schema::material_properties::{CardModulus, CardValidated, DirectionalModulusParams, ValidateCardParams};
-use crate::schema::{TypedContract, output_schema_for};
 use crate::{Result, Session};
-use serde_json::Value;
+use serde_json::{Value, json};
 
-const VALIDATE_CONTRACT: TypedContract<ValidateCardParams> = TypedContract::new();
-const DIRECTIONAL_CONTRACT: TypedContract<DirectionalModulusParams> = TypedContract::new();
-
-pub static COMMANDS: &[CommandSpec] = &[CommandSpec::new("material.properties.validate", "Validate Physical Material Data", crate::checked!("material.properties.validate", validate))
+pub static COMMANDS: &[CommandSpec] = &[CommandSpec::new("material.properties.validate", "Validate Physical Material Data", validate)
     .icon("material")
     .noundo()
     .doc_only()
-    .contract(&VALIDATE_CONTRACT)
-    .output(output_schema_for::<CardValidated>)
     .params("card: schema_version 1 engineering material card in SI units. Returns numerical consistency, derived isotropic moduli, missing conditions and sources needing review. Read-only; does not assign/save properties or provide an analysis solver. See docs/physical-material-cards.md"),
-    CommandSpec::new("material.properties.directional", "Directional Elastic Modulus", crate::checked!("material.properties.directional", directional)).icon("material").noundo().doc_only()
-        .contract(&DIRECTIONAL_CONTRACT)
-        .output(output_schema_for::<CardModulus>)
+    CommandSpec::new("material.properties.directional", "Directional Elastic Modulus", directional).icon("material").noundo().doc_only()
         .params("card: schema_version 1 engineering material card; direction: three finite nonzero-vector components in the card's material-local axes. Returns normalized direction, Young modulus in Pa and source/condition review. Read-only constitutive query; no structural solver, persistence or body-axis assignment. See docs/physical-material-cards.md")];
 
 fn directional(_: &mut Session, params: &Value) -> Result<Value> {
@@ -37,7 +28,7 @@ fn directional(_: &mut Session, params: &Value) -> Result<Value> {
     let direction = [component(0)?, component(1)?, component(2)?];
     let card = solidcraft_doc::physical_material::admit_card(value).map_err(|e| bad(cmd, e.to_string()))?;
     let response = card.directional_modulus(direction).map_err(|e| bad(cmd, e.to_string()))?;
-    serde_json::to_value(CardModulus::from(response)).map_err(|e| bad(cmd, e.to_string()))
+    serde_json::to_value(response).map_err(|e| bad(cmd, e.to_string()))
 }
 
 fn validate(_: &mut Session, params: &Value) -> Result<Value> {
@@ -47,15 +38,13 @@ fn validate(_: &mut Session, params: &Value) -> Result<Value> {
         .ok_or_else(|| bad("material.properties.validate", "expected {card: ...}"))?;
     let card = object.get("card").ok_or_else(|| bad("material.properties.validate", "missing card"))?;
     let result = solidcraft_doc::physical_material::validate_card(card).map_err(|e| bad("material.properties.validate", e.to_string()))?;
-    let reply = CardValidated { valid: true, validation: result.into(), param_warnings: Vec::new() };
-    serde_json::to_value(reply).map_err(|e| bad("material.properties.validate", e.to_string()))
+    Ok(json!({"valid":true,"validation":result}))
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
     use crate::doc::Document;
-    use serde_json::json;
     use std::sync::Arc;
 
     fn card() -> Value {

crates/engine/src/cmd/metadata.rs

@@ -10,52 +10,28 @@ use solidcraft_doc::metadata::{self, BOM_TYPE, MAX_KEYS, Owner};
 
 use super::CommandSpec;
 use crate::params::{bad, str_};
-use crate::schema::metadata::{MetadataParams, MetadataRemoveParams, MetadataRemoveResult, MetadataResult, MetadataSetParams, MetadataSetResult};
-use crate::schema::{TypedContract, output_schema_for};
 use crate::{Result, Session};
 
-const READ_CONTRACT: TypedContract<MetadataParams> = TypedContract::new();
-const SET_CONTRACT: TypedContract<MetadataSetParams> = TypedContract::new();
-const REMOVE_CONTRACT: TypedContract<MetadataRemoveParams> = TypedContract::new();
-
 pub static COMMANDS: &[CommandSpec] = &[
-    CommandSpec::new("document.metadata", "Design Properties", crate::checked!("document.metadata", read))
-        .icon("settings")
-        .noundo()
-        .doc_only()
-        .contract(&READ_CONTRACT)
-        .output(output_schema_for::<MetadataResult>)
-        .params(
-            "→ metadata: the design's metadata object as saved (other tools' keys too); properties: each of SolidCraft's design \
-             properties (project, part number, revision…), its text or null (absent, or not text)",
-        ),
-    CommandSpec::new("document.metadata.set", "Change Design Properties", crate::checked!("document.metadata.set", set))
-        .icon("settings")
-        .doc_only()
-        .contract(&SET_CONTRACT)
-        .output(output_schema_for::<MetadataSetResult>)
-        .params(
-            "key and value, or values: {key: value, …} (all or nothing, one undo step). SolidCraft's keys, the ones document.metadata's \
-             properties lists, take text (\"\" or null removes); another tool's data goes under its reverse-DNS key such as \
-             com.example.tool (an object; null removes) → metadata, changed: [keys]",
-        ),
-    CommandSpec::new("document.metadata.remove", "Remove Design Property", crate::checked!("document.metadata.remove", remove))
+    CommandSpec::new("document.metadata", "Design Properties", read).icon("settings").noundo().doc_only().params(
+        "→ metadata: the design's metadata object as saved (other tools' keys too); properties: each of SolidCraft's design \
+         properties (project, part number, revision…), its text or null (absent, or not text)",
+    ),
+    CommandSpec::new("document.metadata.set", "Change Design Properties", set).icon("settings").doc_only().params(
+        "key and value, or values: {key: value, …} (all or nothing, one undo step). SolidCraft's keys, the ones document.metadata's \
+         properties lists, take text (\"\" or null removes); another tool's data goes under its reverse-DNS key such as \
+         com.example.tool (an object; null removes) → metadata, changed: [keys]",
+    ),
+    CommandSpec::new("document.metadata.remove", "Remove Design Property", remove)
         .icon("delete")
         .doc_only()
-        .contract(&REMOVE_CONTRACT)
-        .output(output_schema_for::<MetadataRemoveResult>)
         .params("key, or keys: [keys] (any key, also one another tool wrote) → metadata, removed: [keys that were there]"),
 ];
 
-/// A reply built from its schema's type, so the two can't drift apart.
-fn reply(cmd: &str, r: impl serde::Serialize) -> Result<Value> {
-    serde_json::to_value(r).map_err(|e| bad(cmd, e.to_string()))
-}
-
 fn read(s: &mut Session, _: &Value) -> Result<Value> {
     let m = &s.doc.metadata;
     let properties: Map<String, Value> = metadata::keys(Owner::Design).map(|k| (k.name.to_string(), json!(m.text(k.name)))).collect();
-    reply("document.metadata", MetadataResult { metadata: m.0.clone(), properties })
+    Ok(json!({"metadata": m, "properties": properties}))
 }
 
 fn set(s: &mut Session, p: &Value) -> Result<Value> {
@@ -84,7 +60,7 @@ fn set(s: &mut Session, p: &Value) -> Result<Value> {
     if next != s.doc.metadata {
         s.doc_mut().metadata = next;
     }
-    reply(cmd, MetadataSetResult { metadata: s.doc.metadata.0.clone(), changed, param_warnings: Vec::new() })
+    Ok(json!({"metadata": s.doc.metadata, "changed": changed}))
 }
 
 fn remove(s: &mut Session, p: &Value) -> Result<Value> {
@@ -108,8 +84,7 @@ fn remove(s: &mut Session, p: &Value) -> Result<Value> {
             m.remove(k);
         }
     }
-    let removed = removed.into_iter().map(str::to_string).collect();
-    reply(cmd, MetadataRemoveResult { metadata: s.doc.metadata.0.clone(), removed, param_warnings: Vec::new() })
+    Ok(json!({"metadata": s.doc.metadata, "removed": removed}))
 }
 
 #[cfg(test)]

crates/engine/src/cmd/mod.rs

@@ -46,7 +46,6 @@ pub(crate) use features::profiles as feature_profiles;
 pub(crate) use features::{EdgeRefForm, PLANE_FORMS, axis_dir_form, axis_line_object, edge_ref_form, explicit_plane, plane_name_problem, sketch_key};
 pub use features::{auto_operation, extrude_reach, shown_scope};
 pub use file::open_steps::OpenSteps;
-pub(crate) use inspect::color_param;
 pub use join_pieces::{Addition, addition};
 pub use parts::part_length_label;
 pub use sketch::dimension_roles;

crates/engine/src/cmd/occurrence_tests.rs

@@ -541,84 +541,6 @@ fn isolate_nested_child_hides_ancestor_material_and_sibling() {
     }
 }
 
-/// #7896: isolating a body hides its own component's other bodies one by one and every other
-/// placement as a placement, so the Browser row of a component shows it is off and its eye
-/// brings it back. A second placement of the body's own component is another placement.
-/// #7896: isolating a body inside a hidden Bodies folder or group shows that folder and group
-/// again, so the body is visible; the folder's other bodies stay hidden.
-#[test]
-fn isolate_shows_the_hidden_folder_and_group_a_picked_body_is_in() {
-    let mut s = Session::default();
-    run(&mut s, "solid.box", json!({"length":10,"width":10,"height":10,"body_name":"Kept"}));
-    run(&mut s, "solid.box", json!({"length":10,"width":10,"height":10,"corner":[20,0,0],"body_name":"Other","operation":"new"}));
-    let group = run(&mut s, "browser.group", json!({"folder": "bodies", "items": ["Kept"], "name": "Held"}));
-    let group = group["group"].as_u64().or_else(|| group["id"].as_u64()).expect("the group's id");
-    run(&mut s, "browser.visibility", json!({"tree_folders": ["c0/bodies", format!("c0/g{group}")], "visible": false}));
-    assert!(!s.body_visible("Kept") && !s.body_visible("Other"));
-    run(&mut s, "browser.visibility", json!({"items": ["Kept"], "visible": true, "isolate": true}));
-    assert!(s.body_visible("Kept"), "the picked body shows: {:?}", s.visibility.hidden_folders);
-    assert!(!s.body_visible("Other"), "the folder's other body stays hidden");
-    assert!(s.visibility.hidden_folders.is_empty(), "{:?}", s.visibility.hidden_folders);
-}
-
-#[test]
-fn isolate_bodies_hides_other_components_as_components() {
-    let mut s = Session::default();
-    run(&mut s, "solid.box", json!({"length":10,"width":10,"height":10,"corner":[-20,0,0],"body_name":"Root"}));
-    let comp = |s: &mut Session, name: &str| {
-        let c = run(s, "component.create", json!({"name": name, "parent": "root", "grounded": false}));
-        c["occurrence"].as_u64().unwrap()
-    };
-    let a = comp(&mut s, "CompA");
-    run(&mut s, "solid.box", json!({"length":10,"width":10,"height":10,"body_name":"BoxA"}));
-    run(&mut s, "solid.box", json!({"length":2,"width":2,"height":2,"corner":[0,0,20],"body_name":"BoxA2"}));
-    let b = comp(&mut s, "CompB");
-    run(&mut s, "solid.box", json!({"length":10,"width":10,"height":10,"corner":[20,0,0],"body_name":"BoxB1"}));
-    run(&mut s, "solid.box", json!({"length":5,"width":5,"height":5,"corner":[40,0,0],"body_name":"BoxB2"}));
-    let a2 = run(&mut s, "occurrence.copy", json!({"occurrence":a,"translate":[0,40,0]}))["occurrence"].as_u64().unwrap();
-    let in_a = s.occurrence_bodies(&[a], false).unwrap();
-    let (box_a, box_a2) = (in_a.iter().find(|n| !n.contains("BoxA2")).unwrap().clone(), in_a.iter().find(|n| n.contains("BoxA2")).unwrap().clone());
-
-    let out = run(&mut s, "browser.visibility", json!({"visible":true,"items":[box_a],"isolate":true}));
-    assert_eq!(out["isolated"], json!([box_a]));
-    let mut occurrences = s.visibility.hidden_occurrences.clone();
-    occurrences.sort();
-    let mut others = vec![vec![b], vec![a2]];
-    others.sort();
-    assert_eq!(occurrences, others, "CompB and CompA's other placement go as placements");
-    let mut bodies = s.visibility.hidden_bodies.clone();
-    bodies.sort();
-    assert_eq!(bodies, vec![box_a2.clone(), "Root".to_string()], "only bodies beside BoxA go one by one");
-    assert!(s.body_visible(&box_a) && !s.body_visible(&box_a2) && !s.body_visible("Root"));
-    for name in s.occurrence_bodies(&[b], false).unwrap().iter().chain(&s.occurrence_bodies(&[a2], false).unwrap()) {
-        assert!(!s.body_visible(name), "{name}");
-    }
-    // CompB's eye brings it back whole.
-    run(&mut s, "browser.visibility", json!({"visible":true,"paths":[[b]]}));
-    assert!(s.occurrence_bodies(&[b], false).unwrap().iter().all(|n| s.body_visible(n)));
-
-    // Isolating a root body hides every placement as a placement and no body one by one.
-    run(&mut s, "browser.visibility", json!({"visible":true,"items":["Root"],"isolate":true}));
-    let mut occurrences = s.visibility.hidden_occurrences.clone();
-    occurrences.sort();
-    let mut all = vec![vec![a], vec![b], vec![a2]];
-    all.sort();
-    assert_eq!(occurrences, all);
-    assert!(s.visibility.hidden_bodies.is_empty() && s.body_visible("Root"), "{:?}", s.visibility.hidden_bodies);
-
-    // Only bodies isolate, and only shown; a refusal changes nothing.
-    let before = s.visibility.clone();
-    for p in [
-        json!({"visible":false,"items":["Root"],"isolate":true}),
-        json!({"visible":true,"items":["XY"],"isolate":true}),
-        json!({"visible":true,"items":["Nope"],"isolate":true}),
-        json!({"visible":true,"folder":"bodies","isolate":true}),
-    ] {
-        assert!(s.execute("browser.visibility", &p).is_err(), "{p}");
-    }
-    assert_eq!(s.visibility, before);
-}
-
 #[test]
 fn context_new_child_uses_inactive_parent_placement() {
     let mut s = Session::default();

crates/engine/src/cmd/plastic.rs

@@ -404,7 +404,7 @@ mod tests {
         s.run_script(&crate::sample::script()).unwrap();
         let lip = json!({"body": "Plate", "face": [51.89, 45.2, 8.0], "width": "1.5 mm", "height": "3.5 mm", "side": "inside", "type": "lip"});
         let e = s.execute("plastic.lip", &lip).unwrap_err().to_string();
-        assert!(e.contains("one clear opening") && e.contains("2 openings alike"), "{e}");
+        assert!(e.contains("rim face") && e.contains("2 openings alike"), "{e}");
         // The boss alone, no holes: its foot is not an opening either.
         let mut b = Session::default();
         run(&mut b, "solid.box", json!({"length": 80, "width": 50, "height": 8, "body_name": "Plate"}));

crates/engine/src/cmd/render.rs

@@ -91,17 +91,11 @@ CommandSpec::new("render.library.preview", "Inspect Original Surface Map", libra
     .params("id: SURF-*. Returns bounded hash-verified original base-color PNG bytes and source-map fidelity label, not a rendered material thumbnail. No external paths, rendering or document edits."),
 CommandSpec::new("render.library.physical.prepare", "Prepare Physical Reference", physical_library::prepare).icon("inspect").noundo().doc_only()
     .params("id: named built-in physical profile, name: proposed new material label, acknowledge_reference:true. Read-only loss-aware creation plan using native ValidatedCard admission and one point density; returns source receipts, extended fields and omissions. Does not execute material.create, assign bodies or infer effective-part physics."),
-CommandSpec::new("render.stage.ground", "Save Render Ground", crate::checked!("render.stage.ground", staging::ground)).icon("render_scene")
-    .contract(&staging::GROUND_CONTRACT)
-    .output(crate::schema::output_schema_for::<crate::schema::render_stage::StageSaved>)
+CommandSpec::new("render.stage.ground", "Save Render Ground", staging::ground).icon("render_scene")
     .params("name: typed raytrace setup, set?: setup patch, margin_fraction?:0.25, gap_mm?:0.1, reflectance_linear?:[0.18,0.18,0.18], replace_stage?:false. Fits one finite passive ground below the visible product once and saves its physical transforms in one undo. Product AABB separation is rechecked on every render."),
-CommandSpec::new("render.stage.backdrop", "Save Physical Render Background", crate::checked!("render.stage.backdrop", staging::backdrop)).icon("render_scene").doc_only()
-    .contract(&staging::BACKDROP_CONTRACT)
-    .output(crate::schema::output_schema_for::<crate::schema::render_stage::StageSaved>)
+CommandSpec::new("render.stage.backdrop", "Save Physical Render Background", staging::backdrop).icon("render_scene").doc_only()
     .params("name: typed raytrace setup, set?: setup patch, kind: floor_wall or cyclorama, reflectance_linear?: [0.18,0.18,0.18], expected_revision: reviewed revision, replace_stage?:false. Fits a finite floor/wall or a 24-strip polygonal cyclorama behind the visible subject using the saved camera azimuth; world +Z up and a minimum one-mm stage envelope. Preserves subject geometry, lighting, output, pose and engineering materials; one undo and rechecked product separation. Not an infinite/analytically smooth/terrain background."),
-CommandSpec::new("render.stage.clear", "Remove Render Stage", crate::checked!("render.stage.clear", staging::clear)).icon("render_scene").doc_only()
-    .contract(&staging::CLEAR_CONTRACT)
-    .output(crate::schema::output_schema_for::<crate::schema::render_stage::StageSaved>)
+CommandSpec::new("render.stage.clear", "Remove Render Stage", staging::clear).icon("render_scene").doc_only()
     .params("name: setup, set?: setup patch. Removes saved render-only panels atomically; CAD geometry and lighting are unchanged."),
 CommandSpec::new("render.library.surface.bind", "Save Surface Binding", surface_bindings::bind).icon("appearance")
     .params("name: GPU setup; set?: setup patch; surface: same input as render.library.surface.prepare; replace?: false. Pins exact source hashes and definition/feature/occurrence identity with local-mm mapping in one undo. No paths, mesh ordinals or physical material changes."),

crates/engine/src/cmd/render/staging.rs

@@ -1,8 +1,7 @@
 //! Explicit saved render-only ground. Does not add engineering bodies or material cards.
-use crate::schema::TypedContract;
-use crate::schema::render_stage::{BackdropKind, BackdropParams, ClearParams, GroundParams, StageSaved};
 use crate::{Result, Session, params::bad};
-use serde_json::Value;
+use serde::Deserialize;
+use serde_json::{Value, json};
 use solidcraft_doc::render_settings::{RenderJob, RenderSetup};
 use solidcraft_render::{
     ProductScene,
@@ -10,41 +9,49 @@ use solidcraft_render::{
     stage::{Stage, StagePanel},
 };
 use std::sync::Arc;
-
-pub(super) const GROUND_CONTRACT: TypedContract<GroundParams> = TypedContract::new();
-pub(super) const BACKDROP_CONTRACT: TypedContract<BackdropParams> = TypedContract::new();
-pub(super) const CLEAR_CONTRACT: TypedContract<ClearParams> = TypedContract::new();
-
+fn patch() -> Value {
+    json!({})
+}
+fn margin() -> f64 {
+    0.25
+}
+fn gap() -> f64 {
+    0.1
+}
+fn reflectance() -> [f64; 3] {
+    [0.18; 3]
+}
+#[derive(Deserialize)]
+#[serde(deny_unknown_fields)]
+struct Ground {
+    name: String,
+    #[serde(default = "patch")]
+    set: Value,
+    #[serde(default = "margin")]
+    margin_fraction: f64,
+    #[serde(default = "gap")]
+    gap_mm: f64,
+    #[serde(default = "reflectance")]
+    reflectance_linear: [f64; 3],
+    #[serde(default)]
+    replace_stage: bool,
+}
 pub(super) fn apply(scene: &mut ProductScene, setup: &RenderSetup, command: &str) -> Result<()> {
     setup.stage.append_to(scene, &CancelToken::default()).map_err(|e| bad(command, e.to_string()))
 }
-fn save(s: &mut Session, name: String, setup: RenderSetup, command: &str) -> Result<StageSaved> {
+fn save(s: &mut Session, name: String, setup: RenderSetup, command: &str) -> Result<Value> {
     let mut settings = (*s.doc.render).clone();
     settings.setups.insert(name.clone(), setup.clone());
     settings.validate().map_err(|e| bad(command, e.to_string()))?;
-    let setup = serde_json::to_value(&setup).map_err(|e| bad(command, e.to_string()))?;
     if settings != *s.doc.render {
         s.doc_mut().render = Arc::new(settings);
     }
-    Ok(StageSaved {
-        name,
-        setup,
-        engineering_geometry_unchanged: true,
-        stage_only: true,
-        clearance: "conservative product AABB separation; not a B-rep collision proof".into(),
-        geometry_kind: None,
-        light_transport: None,
-        camera_preserved: None,
-        limitations: None,
-        param_warnings: Vec::new(),
-    })
-}
-fn reply(command: &str, saved: StageSaved) -> Result<Value> {
-    serde_json::to_value(saved).map_err(|e| bad(command, e.to_string()))
+    Ok(json!({"name":name,"setup":setup,"engineering_geometry_unchanged":true,"stage_only":true,
+        "clearance":"conservative product AABB separation; not a B-rep collision proof"}))
 }
 pub(super) fn ground(s: &mut Session, params: &Value) -> Result<Value> {
     let command = "render.stage.ground";
-    let input: GroundParams = serde_json::from_value(params.clone()).map_err(|e| bad(command, e.to_string()))?;
+    let input: Ground = serde_json::from_value(params.clone()).map_err(|e| bad(command, e.to_string()))?;
     if !input.margin_fraction.is_finite()
         || !(0.0..=10.0).contains(&input.margin_fraction)
         || !input.gap_mm.is_finite()
@@ -81,22 +88,48 @@ pub(super) fn ground(s: &mut Session, params: &Value) -> Result<Value> {
     }])
     .map_err(|e| bad(command, e.to_string()))?;
     apply(&mut scene, &setup, command)?;
-    reply(command, save(s, input.name, setup, command)?)
+    save(s, input.name, setup, command)
+}
+#[derive(Deserialize)]
+#[serde(deny_unknown_fields)]
+struct Clear {
+    name: String,
+    #[serde(default = "patch")]
+    set: Value,
 }
 pub(super) fn clear(s: &mut Session, params: &Value) -> Result<Value> {
     let command = "render.stage.clear";
-    let input: ClearParams = serde_json::from_value(params.clone()).map_err(|e| bad(command, e.to_string()))?;
+    let input: Clear = serde_json::from_value(params.clone()).map_err(|e| bad(command, e.to_string()))?;
     let mut setup = super::patched_settings(s, &input.name, &input.set, command)?;
     setup.stage = Stage::default();
-    reply(command, save(s, input.name, setup, command)?)
+    save(s, input.name, setup, command)
 }
 
+#[derive(Clone, Copy, Debug, Deserialize)]
+#[serde(rename_all = "snake_case")]
+enum BackdropKind {
+    FloorWall,
+    Cyclorama,
+}
+#[derive(Deserialize)]
+#[serde(deny_unknown_fields)]
+struct BackdropInput {
+    name: String,
+    #[serde(default = "patch")]
+    set: Value,
+    kind: BackdropKind,
+    #[serde(default = "reflectance")]
+    reflectance_linear: [f64; 3],
+    #[serde(default)]
+    replace_stage: bool,
+    expected_revision: u64,
+}
 /// Original world-space stage derived from captured subject bounds and the chosen
 /// camera azimuth. Twenty-four explicit planar strips approximate the round cove;
 /// it is not an analytic smooth surface, terrain or engineering model operation.
 pub(super) fn backdrop(s: &mut Session, params: &Value) -> Result<Value> {
     let command = "render.stage.backdrop";
-    let input: BackdropParams = serde_json::from_value(params.clone()).map_err(|e| bad(command, e.to_string()))?;
+    let input: BackdropInput = serde_json::from_value(params.clone()).map_err(|e| bad(command, e.to_string()))?;
     if input.expected_revision != s.revision {
         return Err(bad(command, "the design changed; review the stage again"));
     }
@@ -171,20 +204,17 @@ pub(super) fn backdrop(s: &mut Session, params: &Value) -> Result<Value> {
     setup.stage = Stage::new(panels).map_err(|e| bad(command, e.to_string()))?;
     apply(&mut scene, &setup, command)?;
     let mut result = save(s, input.name, setup, command)?;
-    result.geometry_kind = Some(
-        match input.kind {
-            BackdropKind::FloorWall => "finite_floor_and_wall",
-            BackdropKind::Cyclorama => "24_segment_polygonal_cyclorama",
-        }
-        .into(),
-    );
-    result.light_transport =
-        Some("nonemissive world-space stage; receives native lighting and casts reflections/shadows supported by the selected executor".into());
-    result.camera_preserved = Some(true);
-    result.limitations = Some(vec![
-        "Finite background, not an infinite floor or a terrain mesh.".into(),
-        "Cyclorama is an explicit 24-strip polygonal approximation, not a smooth CAD face.".into(),
-        "No change to HDR, light energy, subject optics, pose or engineering properties.".into(),
+    result["geometry_kind"] = json!(match input.kind {
+        BackdropKind::FloorWall => "finite_floor_and_wall",
+        BackdropKind::Cyclorama => "24_segment_polygonal_cyclorama",
+    });
+    result["light_transport"] =
+        json!("nonemissive world-space stage; receives native lighting and casts reflections/shadows supported by the selected executor");
+    result["camera_preserved"] = json!(true);
+    result["limitations"] = json!([
+        "Finite background, not an infinite floor or a terrain mesh.",
+        "Cyclorama is an explicit 24-strip polygonal approximation, not a smooth CAD face.",
+        "No change to HDR, light energy, subject optics, pose or engineering properties."
     ]);
-    reply(command, result)
+    Ok(result)
 }

crates/engine/src/cmd/sheet_face_names_tests.rs

@@ -98,53 +98,8 @@ fn a_trays_faces_have_readable_sheet_names_that_follow_its_size() {
     assert_eq!(again, names);
     let right = point(&s, &format!("sheet:Body1:F{sd}.1:top"));
     assert!((right.x - 399.0).abs() < 1e-3, "{right:?}");
-    let rim = format!("sheet:Body1:F{fb}.1:rim.far");
-    let far = point(&s, &rim);
-    let st = s.model.state();
-    let hit = solidcraft_doc::naming::locate_one(&st, None, &rim).unwrap();
-    on_planar_face(&st.bodies[hit.body].body, hit.face, far);
-    assert!((far.z - 30.0).abs() < 1e-9 && (199.0..=200.0).contains(&far.y), "the back flange's far rim: {far:?}");
-}
-
-/// `p` lies on face `face` of `body`, on its exact geometry: within rounding at the part's scale
-/// of the plane the face lies on, and inside the boundary its edges trace there (each a line,
-/// counted by crossings).
-fn on_planar_face(body: &solidcraft_kernel::Body, face: usize, p: Vec3) {
-    use solidcore_record::brep::{Curve, Loop};
-    let rounding = 1e-12 * body.size().max(1.0);
-    let surface = solidcraft_kernel::face_surface(body, face).unwrap();
-    let on = surface.nearest(p).unwrap();
-    assert!(on.dist(p) <= rounding, "{p:?} is {} off face {face}'s surface", on.dist(p));
-    let solidcraft_kernel::FaceSurface::Plane { normal, .. } = surface else { panic!("face {face} is not planar: {surface:?}") };
-    // Coordinates in the plane: along `x` and `y`, square to its normal.
-    let x = if normal.cross(Vec3::X).len() > 0.5 { normal.cross(Vec3::X).normalized().unwrap() } else { normal.cross(Vec3::Y).normalized().unwrap() };
-    let y = normal.cross(x);
-    let local = |q: Vec3| ((q - p).dot(x), (q - p).dot(y));
-    let record = body.record();
-    let point = |v: u32| {
-        let q = record.vertices[v as usize].point;
-        Vec3::new(q[0], q[1], q[2])
-    };
-    // Crossings of the ray from `p` along +x with the face's boundary.
-    let mut crossings = 0;
-    for l in &record.faces[face].loops {
-        let Loop::Edges { edges } = l else { continue };
-        for e in edges {
-            let edge = &record.edges[e.edge as usize];
-            assert!(matches!(edge.parameters(), Curve::Line { .. }), "an edge of face {face} is not a line: {:?}", edge.parameters());
-            let [a, b] = edge.vertices.map(|v| local(point(v)));
-            let distance = {
-                let (dx, dy) = (b.0 - a.0, b.1 - a.1);
-                let t = (-(a.0 * dx + a.1 * dy) / (dx * dx + dy * dy)).clamp(0.0, 1.0);
-                (a.0 + t * dx).hypot(a.1 + t * dy)
-            };
-            assert!(distance > rounding, "{p:?} is on the boundary of face {face}");
-            if (a.1 > 0.0) != (b.1 > 0.0) && a.0 + (b.0 - a.0) * (0.0 - a.1) / (b.1 - a.1) > 0.0 {
-                crossings += 1;
-            }
-        }
-    }
-    assert_eq!(crossings % 2, 1, "{p:?} is outside face {face}'s boundary");
+    let far = point(&s, &format!("sheet:Body1:F{fb}.1:rim.far"));
+    assert!((199.0 - 1e-3..=200.0 + 1e-3).contains(&far.y) && (0.0..=400.0).contains(&far.x) && (far.z - 30.0).abs() < 1e-3, "{far:?}");
 }
 
 #[test]

crates/engine/src/cmd/sketch.rs

@@ -481,7 +481,7 @@ pub(super) mod solve_counts {
 }
 
 /// How close (mm) a new point must land to an existing one to be connected to it.
-pub(super) const CONNECT_TOL: f64 = 1e-6;
+const CONNECT_TOL: f64 = 1e-6;
 
 /// New points (index `first` on) that land on an existing point, the origin included, get a
 /// coincident constraint to it, as when a click snaps there; `connect: false` leaves them free.
@@ -1171,8 +1171,7 @@ fn draw_line(s: &mut Session, p: &Value) -> Result<Value> {
         for i in 0..segs {
             let j = (i + 1) % n;
             let (Some(a), Some(b)) = (args.get(i), args.get(j)) else { continue };
-            // Ends closer than this would both be connected to one point (#11001).
-            if a.pos().dist(b.pos()) < CONNECT_TOL {
+            if a.pos().dist(b.pos()) < 1e-9 {
                 return Err(bad(cmd, "zero-length line"));
             }
             let id = ids.get(i).map(String::as_str);

crates/engine/src/cmd/sketch_construction.rs

@@ -6,7 +6,7 @@ use solidcore_record::{Seg2, Vec2};
 use solidcraft_geom::prelude::*;
 use solidcraft_sketch::{ConstraintKind, CurveKind, Sketch};
 
-use super::sketch::{CONNECT_TOL, add_c, curve_ref, edit, ids_of, line_or_axis_ref, line_pts, req_parg, result};
+use super::sketch::{add_c, curve_ref, edit, ids_of, line_or_axis_ref, line_pts, req_parg, result};
 use super::{CommandSpec, in_sketch};
 use crate::params::{bad, expr, num, str_, vec2};
 use crate::schema::sketch_create::{ConstructionLineParams, ConstructionLineResult};
@@ -261,10 +261,6 @@ fn run(s: &mut Session, p: &Value, default_mode: &str) -> Result<Value> {
         let first_new = sk.points.len();
         let at = req_parg(sk, doc, &p, "at", CMD)?;
         let through = if mode == "free" { Some(req_parg(sk, doc, &p, "through", CMD)?) } else { None };
-        // A through-point next to the start leaves a line whose direction no constraint holds (#11001).
-        if through.as_ref().is_some_and(|q| q.pos().dist(at.pos()) < CONNECT_TOL) {
-            return Err(bad(CMD, "the through point must lie away from the start point"));
-        }
         let mut params = p.clone();
         params["at"] = json!([at.pos().x, at.pos().y]);
         let angle_expression = if mode == "angle" {

crates/engine/src/cmd/sketch_infinite_tests.rs

@@ -326,25 +326,6 @@ fn construction_tangents_respect_arc_sweeps_and_invalid_inputs_are_atomic() {
     }
 }
 
-#[test]
-fn a_second_point_next_to_the_first_is_refused() {
-    // #11001: a through-point 0.0000001 mm from the start made an infinite line whose direction
-    // Horizontal no longer held, and a line that short collapsed onto the origin.
-    let mut s = new_sketch();
-    for (id, p) in [
-        ("sketch.construction_line", json!({"at":[0,0],"through":[0.0000001,0]})),
-        ("sketch.construction_line", json!({"at":[5,5],"through":[5,5.0000005]})),
-        ("sketch.line", json!({"points":[[0,0],[0.0000001,0]]})),
-        ("sketch.line", json!({"points":[[5,5],[10,5],[10,5.0000005]]})),
-    ] {
-        let before = s.doc.to_json();
-        assert!(s.execute(id, &p).is_err(), "{id} {p}");
-        assert_eq!(s.doc.to_json(), before, "{id} {p}");
-    }
-    run(&mut s, "sketch.construction_line", json!({"at":[0,0],"through":[0.00001,0]}));
-    run(&mut s, "sketch.line", json!({"points":[[5,5],[5.00001,5]]}));
-}
-
 #[test]
 fn construction_relations_follow_source_edits_without_an_auxiliary_dimension() {
     let mut s = new_sketch();

crates/engine/src/cmd/sketch_modify.rs

@@ -3538,76 +3538,17 @@ fn transform(s: &mut Session, p: &Value) -> Result<Value> {
         None => 0.0,
     };
     let t = if p.get("translate").is_some() { req_vec2(cmd, p, "translate")? } else { Vec2::ZERO };
-    let (out, info) = edit(s, p, cmd, false, |sk, doc| {
+    let (out, info) = edit(s, p, cmd, false, |sk, _| {
         let (cs, ps) = entities(sk, p, cmd)?;
         let c = if p.get("center").is_some() { point_or_ref(sk, p, "center", cmd)? } else { Vec2::ZERO };
         let rot = rotate(c, ang);
         let f = move |q: Vec2| rot(c + (q - c) * k) + t;
         transform_in_place(sk, &cs, &ps, &f, k, cmd)?;
-        let moved = involved_points(sk, &cs, &ps);
-        rotate_axis_constraints(sk, doc, &moved, ang)?;
-        scale_dimensions(sk, doc, &cs, &moved, k)?;
         Ok(ids_of(sk, &cs))
     })?;
-    s.doc_mut().prune_model_params();
     Ok(json!({"curves": out, "sketch": info}))
 }
 
-/// The driving lengths wholly inside a transformed selection scale with it. Keep formulas
-/// tied to their user parameters, and compensate references between scaled dimensions so a
-/// dimension such as `d1 / 2` does not get the factor twice.
-fn scale_dimensions(sk: &mut Sketch, doc: &mut solidcraft_doc::Document, curves: &[usize], points: &[usize], factor: f64) -> Result<()> {
-    if factor == 1.0 {
-        return Ok(());
-    }
-    let selected: Vec<usize> = sk
-        .constraints
-        .iter()
-        .enumerate()
-        .filter(|(_, c)| {
-            let pts = sk.constraint_points(&c.kind);
-            !c.driven
-                && c.kind.is_dimension()
-                && !c.kind.is_angle()
-                && !pts.is_empty()
-                && pts.iter().all(|p| points.contains(p))
-                // A circle's centre may move with another curve while its radius stays put.
-                && c.kind.indices().1.iter().all(|i| {
-                    curves.contains(i)
-                        || !matches!(sk.curves.get(*i).map(|c| &c.kind), Some(CurveKind::Circle { .. } | CurveKind::Ellipse { .. }))
-                })
-        })
-        .map(|(i, _)| i)
-        .collect();
-    let mut expressions = std::collections::BTreeMap::new();
-    for i in selected {
-        let Some(c) = sk.constraints.get_mut(i) else { continue };
-        if let Some(value) = c.kind.value() {
-            c.kind.set_value(value * factor);
-        }
-        if let Some(name) = &c.param
-            && let Some(param) = doc.param(name)
-        {
-            let expression = if solidcraft_doc::expr::references(&param.expr).is_empty() {
-                format!("{} mm", doc.eval(name, solidcraft_doc::expr::Kind::Length)? * factor)
-            } else {
-                let formula = param.expr.trim().strip_prefix('=').unwrap_or(&param.expr);
-                format!("({formula}) * {factor}")
-            };
-            expressions.insert(name.clone(), expression);
-        }
-    }
-    for (name, mut expression) in expressions.clone() {
-        for reference in solidcraft_doc::expr::references(&expression) {
-            if expressions.contains_key(&reference) {
-                expression = solidcraft_doc::expr::rename_reference(&expression, &reference, &format!("({reference} / {factor})"));
-            }
-        }
-        doc.set_param(&name, &expression, None, None)?;
-    }
-    Ok(())
-}
-
 fn scale(s: &mut Session, p: &Value) -> Result<Value> {
     let cmd = "sketch.scale";
     let k = num(p, "factor").filter(|k| *k > 1e-9 && *k < 1e6).ok_or_else(|| bad(cmd, "`factor` must be a positive number"))?;

crates/engine/src/cmd/sketch_modify_tests.rs

@@ -1194,65 +1194,6 @@ fn transform_scales_turns_and_moves_in_one_step() {
     }
 }
 
-/// Transform must leave a dimensioned rectangle where its preview put it, rather than letting
-/// the old horizontal/vertical relations and size dimensions pull it back (#11617).
-#[test]
-fn transform_turns_and_scales_a_dimensioned_rectangle() {
-    for angle in [30.0_f64, 90.0, 180.0] {
-        let mut s = new_sketch();
-        let drawn = run(&mut s, "sketch.rectangle.center", json!({"center": [0, 0], "corner": [25, 12.5]}));
-        let curves = ids(&drawn["curves"]);
-        let width = run(&mut s, "sketch.dimension", json!({"entities": [curves[0]], "type": "length", "value": "50 mm"}));
-        let height = run(&mut s, "sketch.dimension", json!({"entities": [curves[1]], "type": "length", "value": "25 mm"}));
-        let before = sketch(&s);
-        let result = run(&mut s, "sketch.transform", json!({"entities": curves, "factor": 2, "angle": angle, "center": [0, 0]}));
-        assert_eq!(result["sketch"]["solved"], true);
-        let after = sketch(&s);
-        let (sin, cos) = angle.to_radians().sin_cos();
-        for id in ["p1", "p2", "p3", "p4"] {
-            let p = before.point(before.resolve_point(id).unwrap()).unwrap();
-            let expected = Vec2::new(p.x * cos - p.y * sin, p.x * sin + p.y * cos) * 2.0;
-            let actual = after.point(after.resolve_point(id).unwrap()).unwrap();
-            assert!(actual.dist(expected) < 1e-6, "{angle} degrees, {id}: {actual:?}, expected {expected:?}");
-        }
-        for (dimension, expected) in [(&width, 100.0), (&height, 50.0)] {
-            let name = dimension["param"].as_str().unwrap();
-            assert!(close(s.doc.eval(name, solidcraft_doc::expr::Kind::Length).unwrap(), expected));
-        }
-        assert!(close(profiles(&s)[0], 5000.0));
-        run(&mut s, "edit.undo", json!({}));
-        assert_eq!(sketch(&s).constraints, before.constraints);
-        assert!(close(profiles(&s)[0], 1250.0));
-        run(&mut s, "edit.redo", json!({}));
-        assert!(close(profiles(&s)[0], 5000.0));
-    }
-}
-
-#[test]
-fn transform_scales_dimension_formulas_once_and_keeps_unselected_dimensions() {
-    let mut s = new_sketch();
-    run(&mut s, "parameters.add", json!({"name": "width", "expression": "50 mm"}));
-    let rectangle = run(&mut s, "sketch.rectangle.two_point", json!({"p0": [10, 10], "p1": [60, 35]}));
-    let curves = ids(&rectangle["curves"]);
-    let width = run(&mut s, "sketch.dimension", json!({"entities": [curves[0]], "type": "length", "value": "=width"}));
-    let width_param = width["param"].as_str().unwrap();
-    let height = run(&mut s, "sketch.dimension", json!({"entities": [curves[1]], "type": "length", "value": format!("{width_param} / 2")}));
-    run(&mut s, "sketch.dimension", json!({"entities": [curves[2]], "type": "length", "driven": true}));
-    let circle = run(&mut s, "sketch.circle.center", json!({"center": [100, 100], "radius": 5}));
-    let radius = run(&mut s, "sketch.dimension", json!({"entities": [circle["curves"][0]], "type": "radius", "value": "5 mm"}));
-    let outside = s.doc.param(radius["param"].as_str().unwrap()).unwrap().clone();
-    run(&mut s, "sketch.transform", json!({"entities": curves, "factor": 2, "angle": 90, "center": [35, 22.5]}));
-    let length = solidcraft_doc::expr::Kind::Length;
-    assert!(close(s.doc.eval("width", length).unwrap(), 50.0), "the user parameter stays unchanged");
-    assert!(close(s.doc.eval(width_param, length).unwrap(), 100.0));
-    assert!(close(s.doc.eval(height["param"].as_str().unwrap(), length).unwrap(), 50.0));
-    assert_eq!(s.doc.param(&outside.name).unwrap(), &outside);
-    assert!(close(sketch(&s).radius(sketch(&s).curve_index(circle["curves"][0].as_str().unwrap()).unwrap()).unwrap(), 5.0));
-    run(&mut s, "parameters.change", json!({"name": "width", "expression": "60 mm"}));
-    assert!(close(s.doc.eval(width_param, length).unwrap(), 120.0), "the formula still follows its user parameter");
-    assert!(close(s.doc.eval(height["param"].as_str().unwrap(), length).unwrap(), 60.0), "dependent dimensions scale only once");
-}
-
 /// #1485: after a circle is trimmed between two construction lines, clicking the trimmed end
 /// picks the construction line's end lying there, not the arc's own; the tangent arc still starts
 /// from the trimmed arc, tangent to it.

crates/engine/src/cmd/surface_match.rs

@@ -10,19 +10,12 @@ use solidcraft_kernel::{Construction, Continuity};
 use super::CommandSpec;
 use super::features::add_feature;
 use crate::params::{bad, str_, vec3};
-use crate::schema::features::FeatureResult;
-use crate::schema::surface_match::MatchSurfaceParams;
-use crate::schema::{TypedContract, output_schema_for};
 use crate::{Result, Session};
 
-const CONTRACT: TypedContract<MatchSurfaceParams> = TypedContract::new();
-
 pub static COMMANDS: &[CommandSpec] = &[
-    CommandSpec::new("surface.match", "Match Surface", crate::checked!("surface.match", match_surface))
+    CommandSpec::new("surface.match", "Match Surface", match_surface)
         .at("SURFACE", "MODIFY")
         .icon("continuity")
-        .contract(&CONTRACT)
-        .output(output_schema_for::<FeatureResult>)
         .params(
             "body: surface name (the body whose face is rebuilt); faces?: [[x,y,z]] (points on that face, default: the body's first); target: body name (the body the seam must meet); edges: [[x,y,z]] (points on one edge chain of the target: the rebuilt boundary takes its place); order?: g1|g2|g3 (default g2: position and tangent plane, the curvature too, or how that curvature changes along the seam). The far boundary stays where it was and the body keeps its name",
         ),

crates/engine/src/computed_commands_tests.rs

@@ -280,41 +280,3 @@ fn cancelling_an_editor_with_visibility_changes_restores_an_existing_history_mar
     assert_eq!(session.doc.marker, Some(1));
     assert!(session.visibility.hidden_origin.is_empty());
 }
-
-/// Rolling the marker back before a move of the body a joint seats on solves the joints again,
-/// which puts the seated occurrence back where the body was: the editor's pinned model differs
-/// from its source there, and only there, and the edit still goes through.
-#[test]
-fn an_editor_accepts_the_placements_rolling_the_marker_solves() {
-    let mut session = Session::default();
-    for (name, x) in [("A", 0), ("B", 20)] {
-        session.execute("component.activate", &json!({"component": "root"})).unwrap();
-        session.execute("component.create", &json!({"name": name})).unwrap();
-        session.execute("solid.box", &json!({"length": 10, "width": 10, "height": 10, "corner": [x, 0, 0]})).unwrap();
-    }
-    let component = |s: &Session, name: &str| s.doc.components.iter().find(|c| c.name == name).map(|c| c.id).unwrap();
-    let occurrence = |s: &Session, name: &str| {
-        let component = component(s, name);
-        s.doc.occurrences.iter().find(|o| o.component == component).cloned().unwrap()
-    };
-    session.execute("occurrence.ground", &json!({"occurrence": occurrence(&session, "A").id, "grounded": true})).unwrap();
-    session
-        .execute("joint.create", &json!({"type": "rigid", "a": {"face": [5, 5, 10]}, "b": {"face": [25, 5, 0]}, "offset": 5, "name": "Seat"}))
-        .unwrap();
-    let seated = occurrence(&session, "B").transform;
-    // A's box moves along, and B, seated on it, with it.
-    session.execute("component.activate", &json!({"component": "A"})).unwrap();
-    let a = component(&session, "A");
-    let body = session.model.state().bodies.iter().find(|b| b.component == a).map(|b| b.name.clone()).unwrap();
-    session.execute("solid.move", &json!({"bodies": [body], "translate": [30, 0, 0]})).unwrap();
-    let moved = occurrence(&session, "B").transform;
-    assert_ne!(moved, seated, "B follows the box it is seated on");
-    let original = session.scratch();
-    session.execute("timeline.roll_to", &json!({"position": 2})).unwrap();
-    let source = session.scratch();
-    assert_eq!(occurrence(&session, "B").transform, seated, "before the move, B sits where the box was");
-    let prepared = session.scratch().compute_editor_commands(&[], &source, original).unwrap();
-    session.accept_commands(prepared).unwrap();
-    assert_eq!(session.doc.marker, None);
-    assert_eq!(occurrence(&session, "B").transform, moved);
-}

crates/engine/src/lib.rs

@@ -1961,23 +1961,6 @@ impl Session {
         }
         let mut expected = (*original.doc).clone();
         expected.marker = source.doc.marker;
-        // Rolling the marker solves the joints again and stores where that puts each occurrence.
-        if expected.occurrences.len() == source.doc.occurrences.len() {
-            for (e, s) in expected.occurrences.iter_mut().zip(&source.doc.occurrences) {
-                if e.id == s.id {
-                    e.transform = s.transform;
-                }
-            }
-        }
-        // ...and works out each coupled joint's ratio and lift from the faces at that marker.
-        if expected.assembly.links.len() == source.doc.assembly.links.len() {
-            for (e, s) in expected.assembly.links.iter_mut().zip(&source.doc.assembly.links) {
-                if (e.a, e.ia, e.b, e.ib) == (s.a, s.ia, s.b, s.ib) {
-                    e.ratio = s.ratio;
-                    e.lift = s.lift.clone();
-                }
-            }
-        }
         if expected != *source.doc {
             return Err(EngineError::Other("the original editor model does not match its source design".into()));
         }

crates/engine/src/measure_centre_tests.rs

@@ -517,7 +517,6 @@ fn open_surface_measurements_have_no_volume_properties() {
     assert_eq!(props["total"]["open_bodies_skipped"], 1);
     assert!(props["bodies"][0]["mass_g"].is_null());
     assert!(props["total"]["center_of_mass"].is_null());
-    assert!(s.execute("inspect.center_of_mass", &json!({"bodies": ["OpenTube"]})).is_err(), "an open surface has no centre of mass");
 }
 
 #[test]
@@ -546,43 +545,6 @@ fn volume_totals_skip_open_surfaces_and_keep_closed_box_properties() {
     for key in ["volume_mm3", "mass_g", "center_of_mass"] {
         assert_eq!(props_before["total"][key], props_after["total"][key]);
     }
-    let com = run(&mut s, "inspect.center_of_mass", json!({}));
-    assert_eq!(com["skipped"].as_array().map(Vec::len), Some(1), "{com}");
-    assert_eq!(com["bodies"].as_array().map(Vec::len), Some(1), "{com}");
-    assert!(close(&com["volume"], 6000.0, 1e-9), "{com}");
-    for (axis, expected) in [5.0, 10.0, 15.0].into_iter().enumerate() {
-        assert!(close(&com["center"][axis], expected, 1e-9), "{com}");
-    }
-}
-
-/// #6173: Center of Mass reports the volume and centre Measure does. It measured the display
-/// mesh, whose flat facets cut curved faces short: a sphere of radius 10 came out 0.13 % small.
-#[test]
-fn center_of_mass_reports_the_same_volume_and_centre_as_measure() {
-    let mut s = Session::default();
-    run(&mut s, "solid.sphere", json!({"radius": 10, "center": [0, 0, 0], "body_name": "Ball"}));
-    run(&mut s, "solid.cylinder", json!({"base": [50, 0, 0], "radius": 10, "height": 20, "body_name": "Cup"}));
-    run(&mut s, "solid.shell", json!({"faces": [[50, 0, 20]], "thickness": 2}));
-    let measured = run(&mut s, "inspect.measure", json!({}));
-    let com = run(&mut s, "inspect.center_of_mass", json!({}));
-    let entry = |list: &Value, key: &str, name: &str| -> Value {
-        list.as_array().and_then(|l| l.iter().find(|b| b[key] == name)).cloned().unwrap_or_else(|| panic!("{name} in {list}"))
-    };
-    for name in ["Ball", "Cup"] {
-        let (m, c) = (entry(&measured["bodies"], "name", name), entry(&com["bodies"], "body", name));
-        assert!(close(&c["volume"], m["volume_mm3"].as_f64().unwrap(), 1e-9), "{name}: {c} vs {m}");
-        for axis in 0..3 {
-            assert!(close(&c["center"][axis], m["center_of_mass"][axis].as_f64().unwrap(), 1e-9), "{name}: {c} vs {m}");
-        }
-    }
-    assert!(close(&com["volume"], measured["total"]["volume_mm3"].as_f64().unwrap(), 1e-6), "{com} vs {measured}");
-    assert_eq!(com["skipped"].as_array().map(Vec::len), Some(0), "{com}");
-    // Worked out by hand: the sphere is 4/3 pi r^3, the cup a cylinder less its 8 x 18 bore.
-    let ball = 4.0 / 3.0 * PI * 1000.0;
-    let cup = PI * (100.0 * 20.0 - 64.0 * 18.0);
-    let (b, c) = (entry(&com["bodies"], "body", "Ball"), entry(&com["bodies"], "body", "Cup"));
-    assert!(close(&b["volume"], ball, ball * 2e-4), "{b}: want {ball}");
-    assert!(close(&c["volume"], cup, cup * 2e-4), "{c}: want {cup}");
 }
 
 /// An ASCII STL of the tetrahedron (0,0,0), (10,0,0), (0,10,0), (0,0,10), outward facing; `open`

crates/engine/src/naming_history_tests.rs

@@ -264,40 +264,6 @@ fn pieces_of_a_cut_body_keep_their_body_names_when_the_cut_moves() {
     }
 }
 
-/// A hole that cuts a body in three pieces names them as the design names them when it is
-/// evaluated again from the names it pinned, as on opening it. Found by the model fuzzer: the two
-/// smaller pieces swapped names there, so a later feature naming one of them met the other.
-#[test]
-fn pieces_of_a_cut_keep_their_names_when_the_design_is_evaluated_again() {
-    let mut s = Session::default();
-    run(&mut s, "construct.plane.offset", json!({"base": "XZ", "name": "P8", "offset": 5}));
-    run(&mut s, "sketch.create", json!({"plane": "P8"}));
-    run(&mut s, "sketch.rectangle.two_point", json!({"p0": [-7, -9], "p1": [5, -7]}));
-    run(&mut s, "sketch.finish", json!({}));
-    run(&mut s, "solid.extrude", json!({"distance": 5, "operation": "join"}));
-    run(&mut s, "sketch.create", json!({"plane": "XZ"}));
-    run(&mut s, "sketch.circle.center", json!({"center": [7, -3], "radius": 4}));
-    run(&mut s, "sketch.finish", json!({}));
-    run(&mut s, "solid.extrude", json!({"distance": 5, "operation": "join"}));
-    run(&mut s, "solid.hole", json!({"depth": 14, "diameter": 5, "position": [-1, 10, 8]}));
-    // Each body by name, with where it is (two pieces have the same volume).
-    let pieces = |st: &solidcraft_doc::ModelState| -> Vec<(String, String)> {
-        st.bodies
-            .iter()
-            .map(|b| {
-                let m = solidcraft_kernel::measure(&b.body).unwrap();
-                (b.name.clone(), format!("{:.3} {:.3} {:.3} {:.3}", m.volume, m.centroid.x, m.centroid.y, m.centroid.z))
-            })
-            .collect()
-    };
-    let live = pieces(&s.model.state());
-    assert_eq!(live.len(), 3, "{live:?}");
-    let mut again = solidcraft_doc::Model::new();
-    again.no_cache = true;
-    again.evaluate(&s.doc);
-    assert_eq!(pieces(&again.state()), live);
-}
-
 #[test]
 fn a_name_of_a_body_without_history_is_found_by_geometry_and_says_so_once_it_moves() {
     let mut s = Session::default();

crates/engine/src/recovery.rs

@@ -466,19 +466,6 @@ mod tests {
         d
     }
 
-    /// Ticks (bounded) until the autosave a tick started has been written and taken up, as the
-    /// app's own frames would. A tick right after the one that started a write can find it still
-    /// running under load and take nothing up, so a test that then changes the session (marking
-    /// it saved) and checks the files would race the worker.
-    fn tick_until_caught_up(a: &mut Autosaver, s: &Session) {
-        let began = Instant::now();
-        while !a.caught_up(s) {
-            assert!(began.elapsed() < Duration::from_secs(30), "the autosave never caught up");
-            std::thread::sleep(Duration::from_millis(1));
-            a.tick(s, false).unwrap();
-        }
-    }
-
     #[test]
     fn autosave_only_unsaved_changes_and_recover_after_a_crash() {
         let d = dir("crash");
@@ -603,7 +590,6 @@ mod tests {
         let mut a = Autosaver::new(&d, Duration::ZERO).unwrap();
         s.execute("solid.box", &json!({"length": 10, "width": 10, "height": 10})).unwrap();
         assert!(a.tick(&s, false).unwrap());
-        tick_until_caught_up(&mut a, &s);
         s.mark_saved();
         a.tick(&s, false).unwrap();
         assert!(!file(&d, &a.id, solidcraft_io::DESIGN_EXT).exists());

crates/engine/src/schema/clearance.rs

@@ -1,197 +0,0 @@
-//! Contract and result types for `inspect.clearance` in `cmd/clearance.rs` (#11051).
-
-use std::borrow::Cow;
-use std::collections::BTreeMap;
-
-use schemars::{JsonSchema, Schema, SchemaGenerator, json_schema};
-use serde::de::Error as _;
-use serde::{Deserialize, Deserializer, Serialize};
-use serde_json::Value;
-
-use super::check::whole;
-use super::types::StringList;
-use crate::params;
-
-/// Most neighbours a body's `nearest` list holds.
-pub const MAX_NEAREST: usize = 1000;
-/// Largest clearance (mm).
-pub const MAX_CLEARANCE: f64 = 1e6;
-
-/// Find the solid bodies that overlap, and those closer than `clearance`, in world placement.
-/// Distances are measured on the exact faces and edges; the meshes only rule pairs out. Mesh
-/// bodies aren't measured: each is listed in `unchecked`.
-#[derive(Debug, Deserialize, JsonSchema)]
-#[schemars(deny_unknown_fields)]
-pub struct ClearanceParams {
-    /// The bodies to check (default: every solid body but those in `against`).
-    #[serde(default)]
-    pub bodies: Option<StringList>,
-    /// Only pairs with one body in `bodies` and the other here.
-    #[serde(default)]
-    pub against: Option<StringList>,
-    /// Smaller overlaps count as contact, in mm³ (default 0.01).
-    #[serde(default, deserialize_with = "min_volume")]
-    #[schemars(schema_with = "min_volume_schema")]
-    pub min_volume: Option<f64>,
-    /// Report pairs closer than this, in mm: 0 to 1 000 000 (default 0).
-    #[serde(default, deserialize_with = "clearance")]
-    #[schemars(schema_with = "clearance_schema")]
-    pub clearance: Option<f64>,
-    /// A gap below this is contact, 0, in mm: 0 to 1 (default 1e-6).
-    #[serde(default, deserialize_with = "tolerance")]
-    #[schemars(schema_with = "tolerance_schema")]
-    pub tolerance: Option<f64>,
-    /// Each body of `bodies` gets its this many nearest others, 0 to 1000 (default 0); a
-    /// fraction is rounded down.
-    #[serde(default, deserialize_with = "nearest")]
-    #[schemars(schema_with = "nearest_schema")]
-    pub nearest: Option<f64>,
-    #[serde(default)]
-    pub skip_within: Option<SkipWithin>,
-}
-
-/// A number from 0 to `max`, read as the handler reads it (`params::num`: finite, under 1e9 in
-/// size), with its message; `null` is the default.
-macro_rules! up_to {
-    ($read:ident, $schema:ident, $key:literal, $max:expr) => {
-        fn $read<'de, D: Deserializer<'de>>(d: D) -> Result<Option<f64>, D::Error> {
-            match Value::deserialize(d)? {
-                Value::Null => Ok(None),
-                v => v
-                    .as_f64()
-                    .and_then(params::finite)
-                    .filter(|x| (0.0..=$max).contains(x))
-                    .map(Some)
-                    .ok_or_else(|| D::Error::custom(whole(format!("`{}` must be a number from 0 to {}", $key, $max)))),
-            }
-        }
-
-        fn $schema(_: &mut SchemaGenerator) -> Schema {
-            json_schema!({"type": ["number", "null"], "minimum": 0, "maximum": f64::min($max, 1e9), "exclusiveMaximum": 1e9})
-        }
-    };
-}
-
-up_to!(min_volume, min_volume_schema, "min_volume", f64::MAX);
-up_to!(clearance, clearance_schema, "clearance", MAX_CLEARANCE);
-up_to!(tolerance, tolerance_schema, "tolerance", 1.0);
-up_to!(nearest, nearest_schema, "nearest", MAX_NEAREST as f64);
-
-/// Pairs not to check: of bodies of one occurrence (`occurrence`), or inside one placed
-/// component, its subcomponents included (`component`). `null` checks every pair.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum SkipWithin {
-    Occurrence,
-    Component,
-}
-
-impl<'de> Deserialize<'de> for SkipWithin {
-    fn deserialize<D: Deserializer<'de>>(d: D) -> Result<Self, D::Error> {
-        match Value::deserialize(d)?.as_str() {
-            Some("occurrence") => Ok(SkipWithin::Occurrence),
-            Some("component") => Ok(SkipWithin::Component),
-            _ => Err(D::Error::custom(whole("`skip_within` must be \"occurrence\", \"component\" or null"))),
-        }
-    }
-}
-
-impl JsonSchema for SkipWithin {
-    fn schema_name() -> Cow<'static, str> {
-        "SkipWithin".into()
-    }
-    fn inline_schema() -> bool {
-        true
-    }
-    fn json_schema(_: &mut SchemaGenerator) -> Schema {
-        json_schema!({
-            "description": "Pairs not to check: of bodies of one occurrence (`occurrence`), or inside one placed component, its subcomponents included (`component`). null checks every pair.",
-            "enum": ["occurrence", "component", null]
-        })
-    }
-}
-
-/// What `inspect.clearance` returns.
-#[derive(Debug, Serialize, JsonSchema)]
-pub struct Clearance {
-    /// Pairs that share at least `min_volume`.
-    pub overlaps: Vec<Overlap>,
-    /// Pairs closer than `clearance`, nearest first; a pair in contact is at 0.
-    pub near: Vec<NearPair>,
-    /// With `nearest`: each body of `bodies`, with its nearest others.
-    pub nearest: BTreeMap<String, Vec<Neighbour>>,
-    /// Pairs whose overlap couldn't be worked out, and each mesh body, which isn't measured
-    /// (`b` is then `null`).
-    pub unchecked: Vec<Unchecked>,
-    /// How many solid bodies were checked.
-    pub bodies: usize,
-    pub pairs_checked: usize,
-    /// Of those, the pairs measured by an earlier call: neither body changed or moved since.
-    pub pairs_reused: usize,
-    /// Pairs ruled out by their boxes.
-    pub pairs_pruned: usize,
-    /// Whether there were more pairs than one call measures.
-    pub truncated: bool,
-    /// How long it took (ms).
-    pub ms: f64,
-    /// In the warn parameter-check mode: what the call's parameters got wrong.
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub param_warnings: Vec<String>,
-}
-
-/// Two bodies that overlap.
-#[derive(Debug, Serialize, JsonSchema)]
-pub struct Overlap {
-    pub a: String,
-    pub b: String,
-    /// The volume they share (mm³).
-    pub volume_mm3: f64,
-    /// The area of the shared volume's surface (mm²).
-    pub area_mm2: f64,
-    pub bbox: OverlapBounds,
-    pub center: [f64; 3],
-}
-
-/// A box, by its corners.
-#[derive(Debug, Serialize, JsonSchema)]
-pub struct OverlapBounds {
-    pub min: [f64; 3],
-    pub max: [f64; 3],
-}
-
-/// Two bodies closer than `clearance`.
-#[derive(Debug, Serialize, JsonSchema)]
-pub struct NearPair {
-    pub a: String,
-    pub b: String,
-    pub distance_mm: f64,
-    /// The nearest point on `a`.
-    pub from: [f64; 3],
-    /// The nearest point on `b`.
-    pub to: [f64; 3],
-    /// For a contact: the volume they share, below `min_volume` (mm³).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub overlap_mm3: Option<f64>,
-    /// `false` when measured on the meshes; absent when measured on the exact faces and edges.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub exact: Option<bool>,
-}
-
-/// One of a body's nearest others.
-#[derive(Debug, Serialize, JsonSchema)]
-pub struct Neighbour {
-    pub body: String,
-    pub distance_mm: f64,
-}
-
-/// A pair, or a mesh body, that wasn't measured.
-#[derive(Debug, Serialize, JsonSchema)]
-pub struct Unchecked {
-    pub a: String,
-    /// The other body; `null` for a mesh body.
-    pub b: Option<String>,
-    pub reason: String,
-}
-
-#[cfg(test)]
-#[path = "clearance_tests.rs"]
-mod tests;

crates/engine/src/schema/clearance_tests.rs

@@ -1,62 +0,0 @@
-use serde_json::{Value, json};
-
-use super::{Clearance, ClearanceParams};
-use crate::Session;
-use crate::schema::tests::{assert_keys, assert_strict_keeps_todays_errors, conforms};
-use crate::schema::{ParamCheck, input_schema_for, output_schema_for};
-
-fn run(s: &mut Session, id: &str, p: Value) -> Value {
-    s.execute(id, &p).unwrap_or_else(|e| panic!("{id} {p}: {e}"))
-}
-
-#[test]
-fn schemas_and_the_key_check_agree() {
-    assert_keys(input_schema_for::<ClearanceParams>(), &["against", "bodies", "clearance", "min_volume", "nearest", "skip_within", "tolerance"]);
-}
-
-/// The handler reads the numbers and `skip_within` before the bodies, so each of these fails
-/// the same way on a design with no bodies.
-#[test]
-fn strict_keeps_todays_errors() {
-    assert_strict_keeps_todays_errors(&[
-        ("inspect.clearance", json!({"min_volume": -1})),
-        ("inspect.clearance", json!({"min_volume": "x"})),
-        ("inspect.clearance", json!({"min_volume": 2e9})),
-        ("inspect.clearance", json!({"clearance": 2e6})),
-        ("inspect.clearance", json!({"tolerance": 2})),
-        ("inspect.clearance", json!({"nearest": 1001})),
-        ("inspect.clearance", json!({"skip_within": "x"})),
-        ("inspect.clearance", json!({"skip_within": 5})),
-        ("inspect.clearance", json!({"bodies": ["Nope"]})),
-        ("inspect.clearance", json!({"against": "Nope"})),
-    ]);
-}
-
-/// #11051: a clearance check replies as its output schema says, in Warn without warnings for
-/// good calls and with them for a misspelt key: two overlapping boxes and a third 2 mm away,
-/// checked with every key, and with `against` alone.
-#[test]
-fn a_clearance_check_replies_with_its_schema() {
-    let schema = output_schema_for::<Clearance>();
-    let matches = |r: &Value, warned: bool| {
-        let schema = schema.as_value();
-        assert!(conforms(schema, schema, r), "{r} doesn't match {schema}");
-        assert_eq!(r.get("param_warnings").is_some(), warned, "{r}");
-    };
-    let mut s = Session { param_check: ParamCheck::Warn, ..Session::default() };
-    run(&mut s, "solid.box", json!({"length": 10, "width": 10, "height": 10, "body_name": "A"}));
-    run(&mut s, "solid.box", json!({"length": 10, "width": 10, "height": 10, "corner": [5, 5, 5], "body_name": "B", "operation": "new"}));
-    run(&mut s, "solid.box", json!({"length": 10, "width": 10, "height": 10, "corner": [12, -20, 0], "body_name": "C", "operation": "new"}));
-    let r = run(&mut s, "inspect.clearance", json!({}));
-    matches(&r, false);
-    assert_eq!(r["overlaps"].as_array().map(Vec::len), Some(1), "{r}");
-    let r = run(
-        &mut s,
-        "inspect.clearance",
-        json!({"bodies": ["A", "B"], "against": "C", "min_volume": 0.01, "clearance": 30, "tolerance": 1e-6, "nearest": 2, "skip_within": "occurrence"}),
-    );
-    matches(&r, false);
-    assert!(r["near"].as_array().is_some_and(|n| !n.is_empty()) && r["nearest"]["A"].is_array(), "{r}");
-    matches(&run(&mut s, "inspect.clearance", json!({"against": ["A"], "skip_within": null})), false);
-    matches(&run(&mut s, "inspect.clearance", json!({"clearence": 3})), true);
-}

crates/engine/src/schema/compare.rs

@@ -1,307 +0,0 @@
-//! Contract and result types for `inspect.compare` in `cmd/compare.rs` (#10994).
-
-use std::borrow::Cow;
-
-use schemars::{JsonSchema, Schema, SchemaGenerator, json_schema};
-use serde::de::Error as _;
-use serde::{Deserialize, Deserializer, Serialize};
-use serde_json::{Map, Value};
-
-use super::check::whole;
-
-/// Compare two bodies laid over each other, in world placement: measure both, sample each
-/// surface's distance to the other, and find, measure and (with `color`) colour the places where
-/// only one of them has material. It works from the two surfaces, without a boolean of the
-/// bodies, so near-identical bodies compare too.
-#[derive(Debug, Deserialize, JsonSchema)]
-#[schemars(deny_unknown_fields)]
-pub struct CompareParams {
-    /// The first body, by name. Give both `a` and `b`, or neither: then the two selected bodies,
-    /// or the design's only two.
-    #[serde(default, deserialize_with = "body_name")]
-    pub a: Option<String>,
-    /// The second body, by name.
-    #[serde(default, deserialize_with = "body_name")]
-    pub b: Option<String>,
-    /// Surfaces closer than this agree, in mm: 0.001 to 10 (default 0.01).
-    #[serde(default, deserialize_with = "tolerance")]
-    #[schemars(schema_with = "tolerance_schema")]
-    pub tolerance: Option<f64>,
-    /// The largest piece of a face sampled as one point, in mm: 0.01 to 1000 (default 0.5),
-    /// coarser for a body that would need more than `max_points` samples.
-    #[serde(default, deserialize_with = "spacing")]
-    #[schemars(schema_with = "spacing_schema")]
-    pub spacing: Option<f64>,
-    /// The most samples per body: 10 000 to 50 million (default 8 million).
-    #[serde(default, deserialize_with = "max_points")]
-    #[schemars(schema_with = "max_points_schema")]
-    pub max_points: Option<f64>,
-    /// The most regions measured: 1 to 1000 (default 50); more are counted in `unlisted_regions`.
-    #[serde(default, deserialize_with = "max_regions")]
-    #[schemars(schema_with = "max_regions_schema")]
-    pub max_regions: Option<f64>,
-    #[serde(default)]
-    pub color: Option<CompareColor>,
-}
-
-/// A body name, with the handler's message for anything else; `null` is none.
-fn body_name<'de, D: Deserializer<'de>>(d: D) -> Result<Option<String>, D::Error> {
-    match Value::deserialize(d)? {
-        Value::Null => Ok(None),
-        Value::String(s) => Ok(Some(s)),
-        _ => Err(D::Error::custom("must be a body name")),
-    }
-}
-
-/// A number in `lo..=hi` with the handler's message, `null` none, for each ranged key.
-macro_rules! ranged {
-    ($read:ident, $schema:ident, $lo:literal, $hi:literal) => {
-        fn $read<'de, D: Deserializer<'de>>(d: D) -> Result<Option<f64>, D::Error> {
-            match Value::deserialize(d)? {
-                Value::Null => Ok(None),
-                v => v
-                    .as_f64()
-                    .filter(|x| x.is_finite() && ($lo..=$hi).contains(x))
-                    .map(Some)
-                    .ok_or_else(|| D::Error::custom(format!("must be a number from {} to {}", $lo, $hi))),
-            }
-        }
-
-        fn $schema(_: &mut SchemaGenerator) -> Schema {
-            json_schema!({"type": ["number", "null"], "minimum": $lo, "maximum": $hi})
-        }
-    };
-}
-
-ranged!(tolerance, tolerance_schema, 0.001, 10.0);
-ranged!(spacing, spacing_schema, 0.01, 1000.0);
-ranged!(max_points, max_points_schema, 1e4, 5e7);
-ranged!(max_regions, max_regions_schema, 1.0, 1000.0);
-
-/// Colour the faces that hold a region: `true` for red where only `a` has material and green
-/// where only `b` has, or `{only_in_a?, only_in_b?}` to choose either colour (`"#rrggbb"` or
-/// `[r, g, b]`, 0 to 255). `false` colours nothing. One undo step.
-#[derive(Clone, Debug, PartialEq)]
-pub struct CompareColor(pub Value);
-
-impl<'de> Deserialize<'de> for CompareColor {
-    fn deserialize<D: Deserializer<'de>>(d: D) -> Result<Self, D::Error> {
-        let v = Value::deserialize(d)?;
-        match &v {
-            Value::Bool(_) => {}
-            Value::Object(o) => {
-                if o.keys().any(|k| k != "only_in_a" && k != "only_in_b") {
-                    return Err(D::Error::custom("must be true or {only_in_a, only_in_b}"));
-                }
-                for k in ["only_in_a", "only_in_b"] {
-                    if o.get(k).is_some_and(|c| !c.is_null() && crate::cmd::color_param(c).is_none()) {
-                        return Err(D::Error::custom(whole(format!("`color.{k}` must be \"#rrggbb\" or [r, g, b] with values 0–255"))));
-                    }
-                }
-            }
-            _ => return Err(D::Error::custom("must be true or {only_in_a, only_in_b}")),
-        }
-        Ok(CompareColor(v))
-    }
-}
-
-impl JsonSchema for CompareColor {
-    fn schema_name() -> Cow<'static, str> {
-        "CompareColor".into()
-    }
-    fn inline_schema() -> bool {
-        true
-    }
-    fn json_schema(_: &mut SchemaGenerator) -> Schema {
-        let color = || {
-            serde_json::json!({
-                "anyOf": [
-                    {"description": "\"#rrggbb\": six hex digits, the # optional.", "type": "string", "pattern": "^\\s*#?[0-9a-fA-F]{6}\\s*$"},
-                    {"type": "array", "items": {"type": "number", "minimum": 0, "maximum": 255}, "minItems": 3, "maxItems": 3},
-                    {"type": "null"}
-                ]
-            })
-        };
-        json_schema!({
-            "description": "Colour the faces that hold a region: true for red where only `a` has material and green where only `b` has, or {only_in_a?, only_in_b?} to choose either colour (\"#rrggbb\" or [r, g, b], 0 to 255). false colours nothing.",
-            "anyOf": [
-                {"type": "boolean"},
-                {"type": "object", "properties": {"only_in_a": color(), "only_in_b": color()}, "additionalProperties": false}
-            ]
-        })
-    }
-}
-
-/// What `inspect.compare` returns.
-#[derive(Debug, Serialize, JsonSchema)]
-pub struct Comparison {
-    /// `a`'s measures, as `inspect.measure` gives a body's.
-    pub a: Map<String, Value>,
-    /// `b`'s measures, as `inspect.measure` gives a body's.
-    pub b: Map<String, Value>,
-    /// `b` less `a`.
-    pub difference: Difference,
-    /// The tolerance used (mm).
-    pub tolerance_mm: f64,
-    /// How far each surface is from the other.
-    pub deviation: Deviations,
-    /// Whether no region differs by more than the tolerance.
-    pub identical: bool,
-    /// The comparison in a sentence.
-    pub verdict: String,
-    /// The regions where only one body has material, largest first.
-    pub regions: Vec<Region>,
-    /// The regions with material only in `a`, and their volume together.
-    pub only_in_a: SideTotal,
-    /// The regions with material only in `b`, and their volume together.
-    pub only_in_b: SideTotal,
-    /// Regions beyond `max_regions`, counted but not measured.
-    pub unlisted_regions: usize,
-    /// What makes the comparison less certain: a body whose surface doesn't enclose what it
-    /// measures, a cut that couldn't be made, a body that encloses no volume.
-    pub warnings: Vec<String>,
-    /// How the surfaces were sampled.
-    pub sampling: Sampling,
-    /// With `color`: how many faces were coloured.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub colored_faces: Option<usize>,
-    /// In the warn parameter-check mode: what the call's parameters got wrong.
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub param_warnings: Vec<String>,
-}
-
-/// `b` less `a`; `null` where either has no such measure.
-#[derive(Debug, Serialize, JsonSchema)]
-pub struct Difference {
-    pub volume_mm3: Option<f64>,
-    /// The volume difference as a share of `a`'s (%).
-    pub volume_percent: Option<f64>,
-    pub area_mm2: Option<f64>,
-    pub center_of_mass: Option<[f64; 3]>,
-    pub center_of_mass_distance_mm: Option<f64>,
-    pub bbox_min: Option<[f64; 3]>,
-    pub bbox_max: Option<[f64; 3]>,
-}
-
-/// How far each surface is from the other.
-#[derive(Debug, Serialize, JsonSchema)]
-pub struct Deviations {
-    /// From `a`'s surface to `b`'s.
-    pub a_to_b: Deviation,
-    /// From `b`'s surface to `a`'s.
-    pub b_to_a: Deviation,
-    /// The larger of the two maxima (mm).
-    pub max_mm: f64,
-}
-
-/// One surface's distance to the other, over its samples.
-#[derive(Debug, Serialize, JsonSchema)]
-pub struct Deviation {
-    pub max_mm: f64,
-    pub mean_mm: f64,
-    /// Where the largest is.
-    pub at: [f64; 3],
-    /// The area further than the tolerance (mm²).
-    pub area_beyond_mm2: f64,
-    /// The area sampled (mm²).
-    pub area_mm2: f64,
-    /// How many samples.
-    pub points: usize,
-}
-
-/// Which body alone has a region's material.
-#[derive(Clone, Copy, Debug, Serialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum CompareSide {
-    OnlyInA,
-    OnlyInB,
-}
-
-/// A region where only one body has material.
-#[derive(Debug, Serialize, JsonSchema)]
-pub struct Region {
-    /// Its number, from 1, largest first.
-    pub index: usize,
-    pub side: CompareSide,
-    /// The body that has the material.
-    pub material_of: String,
-    /// Its volume (mm³), measured exactly on the pieces of the cut on its side (a − b or b − a)
-    /// that lie there; `null` when it isn't measured, never an estimate.
-    pub volume_mm3: Option<f64>,
-    /// `boolean` when the volume, centre and box were measured on the cut, else `not measured`.
-    pub measured_by: MeasuredBy,
-    /// Why it isn't measured (the cut couldn't be made, a body encloses no volume, no piece fell
-    /// here); `null` when it is.
-    pub not_measured: Option<String>,
-    /// Its surface on both bodies (mm²).
-    pub area_mm2: f64,
-    pub area_a_mm2: f64,
-    pub area_b_mm2: f64,
-    /// How far the surfaces are apart there at most (mm).
-    pub max_deviation_mm: f64,
-    /// Where that is.
-    pub at: [f64; 3],
-    /// Its centre of volume, measured with the volume; `null` when it isn't measured.
-    pub center: Option<[f64; 3]>,
-    /// The measured pieces' box, or the box the region was found in when it isn't measured.
-    pub bbox: Bounds,
-    /// The faces of `a` it lies on, by index, as `model.faces` lists them.
-    pub faces_a: Vec<u32>,
-    /// The faces of `b` it lies on.
-    pub faces_b: Vec<u32>,
-    /// The lines through it the surfaces were sampled along.
-    pub resolution: Resolution,
-}
-
-/// How a region was measured.
-#[derive(Clone, Copy, Debug, Serialize, JsonSchema)]
-pub enum MeasuredBy {
-    /// Exactly, on the pieces of the cut that lie there.
-    #[serde(rename = "boolean")]
-    Boolean,
-    /// Not at all: see `not_measured`.
-    #[serde(rename = "not measured")]
-    NotMeasured,
-}
-
-/// A box, by its corners.
-#[derive(Debug, Serialize, JsonSchema)]
-pub struct Bounds {
-    pub min: [f64; 3],
-    pub max: [f64; 3],
-}
-
-/// The lines through a region the surfaces were sampled along.
-#[derive(Debug, Serialize, JsonSchema)]
-pub struct Resolution {
-    /// The axis they run along: `X`, `Y` or `Z`.
-    pub along: String,
-    /// Their spacing across the other two axes (mm).
-    pub line_spacing_mm: [f64; 2],
-    pub lines: usize,
-    /// Lines that crossed a gap in a surface and were left out.
-    pub skipped_lines: usize,
-}
-
-/// The regions on one side, and their volume together.
-#[derive(Debug, Serialize, JsonSchema)]
-pub struct SideTotal {
-    pub regions: usize,
-    /// Their volume together (mm³); `null` when one of them isn't measured.
-    pub volume_mm3: Option<f64>,
-}
-
-/// How the surfaces were sampled.
-#[derive(Debug, Serialize, JsonSchema)]
-pub struct Sampling {
-    /// The sample spacing used (mm).
-    pub spacing_mm: f64,
-    /// How closely the meshes follow the surfaces (mm): a quarter of the tolerance.
-    pub chord_mm: f64,
-    pub triangles_a: usize,
-    pub triangles_b: usize,
-}
-
-#[cfg(test)]
-#[path = "compare_tests.rs"]
-mod tests;

crates/engine/src/schema/compare_tests.rs

@@ -1,74 +0,0 @@
-use serde_json::{Value, json};
-
-use super::{CompareParams, Comparison};
-use crate::Session;
-use crate::schema::tests::{assert_keys, assert_strict_keeps_todays_errors, conforms};
-use crate::schema::{ParamCheck, input_schema_for, output_schema_for};
-
-fn run(s: &mut Session, id: &str, p: Value) -> Value {
-    s.execute(id, &p).unwrap_or_else(|e| panic!("{id} {p}: {e}"))
-}
-
-#[test]
-fn schemas_and_the_key_check_agree() {
-    assert_keys(input_schema_for::<CompareParams>(), &["a", "b", "color", "max_points", "max_regions", "spacing", "tolerance"]);
-}
-
-/// The handler reads the numbers and the colours before it looks for the bodies, so each of
-/// these fails the same way on a design with none.
-#[test]
-fn strict_keeps_todays_errors() {
-    assert_strict_keeps_todays_errors(&[
-        ("inspect.compare", json!({"tolerance": 0})),
-        ("inspect.compare", json!({"tolerance": "x"})),
-        ("inspect.compare", json!({"spacing": 2000})),
-        ("inspect.compare", json!({"max_points": 1})),
-        ("inspect.compare", json!({"max_regions": 0})),
-        ("inspect.compare", json!({"color": 5})),
-        ("inspect.compare", json!({"color": "red"})),
-        ("inspect.compare", json!({"color": {"only_in_a": "#zz0000"}})),
-        ("inspect.compare", json!({"color": {"only_in_b": [1, 2]}})),
-        ("inspect.compare", json!({"a": 5})),
-        ("inspect.compare", json!({"a": "A"})),
-        ("inspect.compare", json!({})),
-        ("inspect.compare", json!({"a": "X", "b": "Y"})),
-    ]);
-}
-
-/// #10994: a comparison replies as its output schema says, in Warn without warnings for good
-/// calls and with them for a misspelt key: a box and its copy (identical, no regions), and the
-/// copy with a boss, compared with every key and coloured both ways.
-#[test]
-fn a_comparison_replies_with_its_schema() {
-    let schema = output_schema_for::<Comparison>();
-    let matches = |r: &Value, warned: bool| {
-        let schema = schema.as_value();
-        assert!(conforms(schema, schema, r), "{r} doesn't match {schema}");
-        assert_eq!(r.get("param_warnings").is_some(), warned, "{r}");
-    };
-    let mut s = Session { param_check: ParamCheck::Warn, ..Session::default() };
-    run(&mut s, "solid.box", json!({"length": 40, "width": 30, "height": 10, "body_name": "A"}));
-    run(&mut s, "solid.move", json!({"bodies": ["A"], "translate": [0, 0, 0], "copy": true}));
-    let r = run(&mut s, "inspect.compare", json!({}));
-    matches(&r, false);
-    assert!(r["identical"] == true && r["regions"] == json!([]) && r.get("colored_faces").is_none(), "{r}");
-    run(&mut s, "solid.box", json!({"length": 6, "width": 5, "height": 2, "corner": [5, 5, 10], "operation": "join", "targets": ["A (2)"]}));
-    let r = run(
-        &mut s,
-        "inspect.compare",
-        json!({"a": "A", "b": "A (2)", "tolerance": 0.01, "spacing": 0.5, "max_points": 1e6, "max_regions": 10, "color": true}),
-    );
-    matches(&r, false);
-    assert_eq!((r["regions"][0]["side"].as_str(), r["identical"].as_bool()), (Some("only_in_b"), Some(false)), "{r}");
-    assert!(r["colored_faces"].as_u64().is_some_and(|n| n > 0), "{r}");
-    let r = run(&mut s, "inspect.compare", json!({"a": "A", "b": "A (2)", "color": {"only_in_b": "#123456", "only_in_a": null}}));
-    matches(&r, false);
-    matches(&run(&mut s, "inspect.compare", json!({"a": "A", "b": "A (2)", "color": false, "tolerence": 1})), true);
-}
-
-/// A `color` string in the published schema carries the same pattern the handler checks.
-#[test]
-fn the_color_string_has_a_pattern() {
-    let schema = serde_json::to_string(&input_schema_for::<CompareParams>()).unwrap();
-    assert!(schema.contains(r"^\\s*#?[0-9a-fA-F]{6}\\s*$"), "{schema}");
-}

crates/engine/src/schema/features.rs

@@ -10,10 +10,9 @@ use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
 use super::types::{
-    AngleExpr, AxisDir, AxisLine, ConventionParam, DirectionParam, EdgeRefs, ExtentKeyword, ExtrudeOperation, FacesParam, FeatureCommon,
-    FilletCornerParam, FilletFitParam, FilletTurnParam, FilletTypeParam, FromPoint, GeoRefParam, IdOrName, LengthExpr, NumberExpr, OperationParam,
-    PlaneCommon, PlaneOrFace, Point3, PointExpr3, ProfilesParam, ScaleFactors, SketchRef, StringList, ThinSideParam, ToPoint, TouchingParam,
-    feature_common, present,
+    AngleExpr, AxisDir, AxisLine, ConventionParam, DirectionParam, ExtentKeyword, ExtrudeOperation, FacesParam, FeatureCommon, FromPoint,
+    GeoRefParam, IdOrName, LengthExpr, NumberExpr, OperationParam, PlaneCommon, PlaneOrFace, Point3, PointExpr3, ProfilesParam, ScaleFactors,
+    SketchRef, StringList, ThinSideParam, ToPoint, TouchingParam, feature_common, present,
 };
 
 /// Add a box primitive.
@@ -433,92 +432,6 @@ pub struct PlaneAtAngleParams {
     pub common: PlaneCommon,
 }
 
-/// Round edges of a body: a constant radius by default, or a chord, a curvature-continuous
-/// section or a radius varying along each edge (`type`).
-#[derive(Debug, Deserialize, JsonSchema)]
-#[schemars(deny_unknown_fields)]
-pub struct FilletParams {
-    /// The edges to round: a point on each, or `{body, index}`.
-    pub edges: EdgeRefs,
-    /// The radius; the chord's width with `type: chord`, the equivalent circular setback with
-    /// `type: curvature`, the start radius with `type: variable` or `spline`.
-    pub radius: LengthExpr,
-    /// The body whose edges the points pick. Default: whichever body has an edge there.
-    #[serde(default)]
-    pub body: Option<String>,
-    /// Round each picked edge's tangent chain with it. Default: true; false rounds exactly the
-    /// picked edges.
-    #[serde(default)]
-    pub tangent_chain: Option<bool>,
-    #[serde(default, rename = "type")]
-    pub kind: Option<FilletTypeParam>,
-    /// `type: variable`: the radius at the end away from `start`; it or `radius` may be 0, where
-    /// the round closes to the corner.
-    #[serde(default)]
-    pub radius2: Option<LengthExpr>,
-    /// `type: variable` or `spline`: a point near the end the radius starts from.
-    #[serde(default)]
-    pub start: Option<Point3>,
-    /// `type: variable`: radii between the ends, each `[position, radius]`, the position between 0
-    /// and 1 from the start end. At most 100 are read.
-    #[serde(default)]
-    pub mid: Option<Vec<(f64, LengthExpr)>>,
-    /// `type: variable`: smooth instead of straight between the radii. Default: false.
-    #[serde(default)]
-    pub smooth: Option<bool>,
-    /// `type: spline`: the control radii after `radius`. At most 100 are read.
-    #[serde(default)]
-    pub radii: Option<Vec<LengthExpr>>,
-    /// `type: spline`: the knot vector from 0 to 1, as many knots as all control radii, the
-    /// degree (1 to 3) and one more.
-    #[serde(default)]
-    pub knots: Option<Vec<f64>>,
-    #[serde(default)]
-    pub fit: Option<FilletFitParam>,
-    #[serde(default)]
-    pub corner: Option<FilletCornerParam>,
-    /// Corner setbacks: the corner at the vertex nearest each `vertex`, where every edge meeting it
-    /// is rounded, starts its patch `distance` along each of those edges from the vertex, past
-    /// where the rounds would meet. Constant-radius exact fillets only.
-    #[serde(default)]
-    pub setbacks: Option<Vec<SetbackParam>>,
-    #[serde(default)]
-    pub turn: Option<FilletTurnParam>,
-    #[serde(flatten, deserialize_with = "feature_common")]
-    pub common: FeatureCommon,
-}
-
-/// A fillet corner set back.
-#[derive(Debug, Deserialize, JsonSchema)]
-pub struct SetbackParam {
-    /// A point at the corner's vertex.
-    pub vertex: Point3,
-    /// How far along each edge there the corner's patch starts.
-    pub distance: LengthExpr,
-}
-
-/// The radius `fit: reduce` gave one edge.
-#[derive(Debug, Serialize, JsonSchema)]
-pub struct AppliedRadius {
-    /// A point on the edge.
-    pub edge: [f64; 3],
-    /// The radius it was rounded at.
-    pub radius: f64,
-}
-
-/// What `solid.fillet` returns: a feature command's reply, with the radii `fit: reduce` used.
-#[derive(Debug, Serialize, JsonSchema)]
-pub struct FilletResult {
-    #[serde(flatten)]
-    pub feature: FeatureResult,
-    /// With `fit: reduce` where it reduced the radius: the smallest radius used.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub radius_applied: Option<f64>,
-    /// With `fit: reduce` where it reduced the radius: each edge's radius.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub radii_applied: Option<Vec<AppliedRadius>>,
-}
-
 /// What a feature command returns.
 #[derive(Debug, Serialize, JsonSchema)]
 pub struct FeatureResult {

crates/engine/src/schema/features_tests.rs

@@ -1,8 +1,8 @@
 use serde_json::{Value, json};
 
 use super::{
-    BoundingSolidParams, BoxParams, ConeParams, CylinderParams, ExtrudeParams, FeatureResult, FilletParams, FilletResult, OffsetPlaneParams,
-    PipeParams, PlaneAtAngleParams, ScaleParams, SphereParams, TorusParams,
+    BoundingSolidParams, BoxParams, ConeParams, CylinderParams, ExtrudeParams, FeatureResult, OffsetPlaneParams, PipeParams, PlaneAtAngleParams,
+    ScaleParams, SphereParams, TorusParams,
 };
 use crate::Session;
 use crate::schema::tests::{assert_keys, assert_strict_keeps_todays_errors, conforms, sketch_rectangle};
@@ -87,30 +87,6 @@ fn schemas_and_the_key_check_agree() {
     assert_keys(input_schema_for::<ScaleParams>(), &["bodies", "factor", "factors", "name", "origin", "participants"]);
     assert_keys(input_schema_for::<OffsetPlaneParams>(), &["base", "name", "offset", "participants", "through"]);
     assert_keys(input_schema_for::<PlaneAtAngleParams>(), &["angle", "axis", "base", "name", "participants"]);
-    assert_keys(
-        input_schema_for::<FilletParams>(),
-        &[
-            "body",
-            "body_name",
-            "body_names",
-            "corner",
-            "edges",
-            "fit",
-            "knots",
-            "mid",
-            "name",
-            "participants",
-            "radii",
-            "radius",
-            "radius2",
-            "setbacks",
-            "smooth",
-            "start",
-            "tangent_chain",
-            "turn",
-            "type",
-        ],
-    );
 }
 
 #[test]
@@ -181,13 +157,6 @@ fn strict_keeps_todays_errors() {
         ("construct.plane.at_angle", json!({"base": "XY", "axis": {"face": "x", "point": [0, 0, 0]}, "angle": 30})),
         ("construct.plane.at_angle", json!({"base": "XY", "axis": {"face": "x"}, "angle": 30})),
         ("construct.plane.at_angle", json!({"base": "XY", "axis": "X", "angle": true})),
-        ("solid.fillet", json!({"edges": [[0, 0, 0]], "radius": 1, "turn": "round"})),
-        ("solid.fillet", json!({"edges": [[0, 0, 0]], "radius": 1, "turn": "ROUND"})),
-        ("solid.fillet", json!({"edges": [[0, 0, 0]], "radius": 1, "type": "bogus"})),
-        ("solid.fillet", json!({"edges": [[0, 0, 0]], "radius": 1, "fit": "bogus"})),
-        ("solid.fillet", json!({"edges": [[0, 0, 0]], "radius": 1, "corner": "round"})),
-        ("solid.fillet", json!({"edges": [], "radius": 1})),
-        ("solid.fillet", json!({"edges": 5, "radius": 1})),
     ]);
 }
 
@@ -244,47 +213,6 @@ fn replies_match_the_output_schema() {
     assert!(!conforms(schema, schema, &bad), "{bad}");
 }
 
-/// `solid.fillet` replies with `FilletResult` in each of its forms, its contract taking each: a
-/// boss's base rounded with each turn and its options spelled out, a reduced round (with the radii
-/// it used), chord and curvature rounds, a smooth-patch corner with setbacks, and the variable and
-/// spline forms.
-#[test]
-fn fillet_replies_match_its_output_schema() {
-    let schema = output_schema_for::<FilletResult>();
-    let schema = schema.as_value();
-    // A 40 x 30 x 10 plate with a 10 x 10 x 5 boss on it, whose base edges `boss` are.
-    let run = |p: Value| {
-        let mut s = Session { param_check: ParamCheck::Warn, ..Session::default() };
-        s.execute("solid.box", &json!({"length": 40, "width": 30, "height": 10, "body_name": "B"})).unwrap_or_else(|e| panic!("{e}"));
-        s.execute("solid.box", &json!({"corner": [15, 10, 10], "length": 10, "width": 10, "height": 5, "operation": "join"}))
-            .unwrap_or_else(|e| panic!("{e}"));
-        let r = s.execute("solid.fillet", &p).unwrap_or_else(|e| panic!("{p}: {e}"));
-        assert!(conforms(schema, schema, &r), "{r} doesn't match {schema}");
-        assert!(r.get("param_warnings").is_none(), "{p}: {r}");
-        r
-    };
-    let boss = json!([[20, 10, 10], [25, 15, 10], [20, 20, 10], [15, 15, 10]]);
-    run(
-        json!({"edges": boss, "radius": 1, "turn": "mitre", "type": "constant", "fit": "exact", "corner": "rolling", "tangent_chain": true, "body": "B", "name": "Round"}),
-    );
-    run(json!({"edges": boss, "radius": "1 mm", "turn": "Swept"}));
-    run(json!({"edges": boss, "radius": 1, "turn": "swept", "fit": "reduce"}));
-    let reduced = run(json!({"edges": [[20, 0, 10]], "radius": 15, "fit": "reduce"}));
-    assert!(reduced.get("radius_applied").is_some_and(Value::is_number) && reduced.get("radii_applied").is_some_and(Value::is_array), "{reduced}");
-    run(json!({"edges": [[20, 0, 10]], "radius": 1, "type": "chord"}));
-    run(json!({"edges": [{"body": "B", "index": 0}], "radius": 0.5, "tangent_chain": false}));
-    run(json!({"edges": [[20, 0, 10]], "radius": 1, "type": "curvature"}));
-    // Variable and spline radii: solidcore fails a variable round on a box edge at this pin (status
-    // 1001, as `variable_radius_on_a_box_edge`), so their forms are checked against the contract.
-    for p in [
-        json!({"edges": [[20, 0, 10]], "radius": 1, "type": "variable", "radius2": 2, "start": [0, 0, 10], "mid": [[0.5, "1.5 mm"]], "smooth": true}),
-        json!({"edges": [[20, 0, 10]], "radius": 1, "type": "spline", "start": [0, 0, 10], "radii": [2], "knots": [0, 0, 1, 1]}),
-    ] {
-        assert!(crate::schema::Contract::check(&crate::schema::TypedContract::<FilletParams>::new(), &p).is_empty(), "{p}");
-    }
-    run(json!({"edges": [[20, 0, 10], [40, 15, 10], [40, 0, 5]], "radius": 2, "corner": "g2", "setbacks": [{"vertex": [40, 0, 10], "distance": 4}]}));
-}
-
 /// The feature commands converted after box and extrude answer with `FeatureResult` too, and
 /// their contracts take every form these calls use: in Warn, a contract that refused one would
 /// still run the command, so the replies are checked for warnings too.

crates/engine/src/schema/material_properties.rs

@@ -1,184 +0,0 @@
-//! Contracts and result types for the commands in `cmd/material_properties.rs`: checking an
-//! engineering material card, and its elastic modulus in a direction (#11036).
-
-use std::borrow::Cow;
-use std::collections::BTreeMap;
-
-use schemars::{JsonSchema, Schema, SchemaGenerator, json_schema};
-use serde::de::Error as _;
-use serde::{Deserialize, Deserializer, Serialize};
-use serde_json::Value;
-use solidcraft_doc::physical_material::{DirectionalModulus, IsotropicModuli, MaterialAxes, Validation};
-
-use super::check::whole;
-
-/// Check an engineering material card: its numbers' consistency, the isotropic moduli they
-/// imply, and the conditions and sources still to review. Read-only: nothing is assigned or
-/// saved, and there is no analysis solver.
-#[derive(Debug, Deserialize, JsonSchema)]
-#[schemars(deny_unknown_fields)]
-pub struct ValidateCardParams {
-    #[schemars(schema_with = "card_schema")]
-    pub card: Value,
-}
-
-/// The Young modulus of an engineering material card in one direction, in the card's own
-/// material axes. Read-only: no load case or structural solver.
-#[derive(Debug, Deserialize, JsonSchema)]
-#[schemars(deny_unknown_fields)]
-pub struct DirectionalModulusParams {
-    #[schemars(schema_with = "card_schema")]
-    pub card: Value,
-    pub direction: CardDirection,
-}
-
-/// The card, checked by the handler (`admit_card`), with its messages.
-fn card_schema(_: &mut SchemaGenerator) -> Schema {
-    json_schema!({
-        "description": "A schema_version 1 engineering material card in SI units (see docs/physical-material-cards.md).",
-        "type": "object"
-    })
-}
-
-/// A direction in the card's material axes: three numbers, not all zero, with the handler's
-/// messages.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct CardDirection(pub [f64; 3]);
-
-impl<'de> Deserialize<'de> for CardDirection {
-    fn deserialize<D: Deserializer<'de>>(d: D) -> Result<Self, D::Error> {
-        let v = Value::deserialize(d)?;
-        let a =
-            v.as_array().filter(|a| a.len() == 3).ok_or_else(|| D::Error::custom(whole("direction: expected exactly three numeric components")))?;
-        let c = |i: usize| a.get(i).and_then(Value::as_f64).ok_or_else(|| D::Error::custom(whole("direction: expected numeric components")));
-        Ok(CardDirection([c(0)?, c(1)?, c(2)?]))
-    }
-}
-
-impl JsonSchema for CardDirection {
-    fn schema_name() -> Cow<'static, str> {
-        "CardDirection".into()
-    }
-    fn inline_schema() -> bool {
-        true
-    }
-    fn json_schema(_: &mut SchemaGenerator) -> Schema {
-        json_schema!({
-            "description": "A direction in the card's material axes: three numbers, not all zero.",
-            "type": "array",
-            "items": {"type": "number"},
-            "minItems": 3,
-            "maxItems": 3
-        })
-    }
-}
-
-/// What `material.properties.validate` returns.
-#[derive(Debug, Serialize, JsonSchema)]
-pub struct CardValidated {
-    /// Always true: a card that isn't valid is refused.
-    pub valid: bool,
-    pub validation: CardValidation,
-    /// In the warn parameter-check mode: what the call's parameters got wrong.
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub param_warnings: Vec<String>,
-}
-
-/// What `material.properties.directional` returns.
-#[derive(Debug, Serialize, JsonSchema)]
-pub struct CardModulus {
-    /// The direction, made a unit vector.
-    pub direction: [f64; 3],
-    /// The card's material axes, when it has directional properties.
-    pub axes: Option<CardAxes>,
-    /// The Young modulus in that direction (Pa).
-    pub young_modulus_pa: f64,
-    pub validation: CardValidation,
-    /// In the warn parameter-check mode: what the call's parameters got wrong.
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub param_warnings: Vec<String>,
-}
-
-impl From<DirectionalModulus> for CardModulus {
-    fn from(m: DirectionalModulus) -> Self {
-        let DirectionalModulus { direction, axes, young_modulus_pa, validation } = m;
-        CardModulus { direction, axes: axes.map(CardAxes::from), young_modulus_pa, validation: validation.into(), param_warnings: Vec::new() }
-    }
-}
-
-/// A card's material axes.
-#[derive(Clone, Copy, Debug, Serialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum CardAxes {
-    /// The material's own axes 1, 2 and 3.
-    Material123,
-    /// Wood's longitudinal, radial and tangential axes.
-    WoodLrt,
-}
-
-impl From<MaterialAxes> for CardAxes {
-    fn from(a: MaterialAxes) -> Self {
-        match a {
-            MaterialAxes::Material123 => CardAxes::Material123,
-            MaterialAxes::WoodLrt => CardAxes::WoodLrt,
-        }
-    }
-}
-
-/// What checking a card found.
-#[derive(Debug, Serialize, JsonSchema)]
-pub struct CardValidation {
-    pub schema_version: u32,
-    /// The kinds of property the card gives.
-    pub property_kinds: Vec<String>,
-    /// The shear and bulk moduli an isotropic card's numbers imply.
-    pub isotropic_moduli: Option<CardModuli>,
-    /// The property kinds given without every condition they hold at (temperature, state, and
-    /// moisture for wood or strain rate for polymers).
-    pub unspecified_conditions: Vec<String>,
-    /// Per property kind: the condition fields it lacks.
-    pub missing_condition_fields: BTreeMap<String, Vec<String>>,
-    /// The sources the card's properties cite, which still need review.
-    pub source_review_required: Vec<String>,
-    /// Always false: there is no analysis solver.
-    pub analysis_solver_available: bool,
-    /// Always false: a card holds no rendering properties.
-    pub rendering_properties_available: bool,
-}
-
-impl From<Validation> for CardValidation {
-    fn from(v: Validation) -> Self {
-        // In full, so a field added to `Validation` fails here rather than going missing.
-        let Validation {
-            schema_version,
-            property_kinds,
-            isotropic_moduli,
-            unspecified_conditions,
-            missing_condition_fields,
-            source_review_required,
-            analysis_solver_available,
-            rendering_properties_available,
-        } = v;
-        CardValidation {
-            schema_version,
-            property_kinds,
-            isotropic_moduli: isotropic_moduli.map(|IsotropicModuli { shear_pa, bulk_pa }| CardModuli { shear_pa, bulk_pa }),
-            unspecified_conditions,
-            missing_condition_fields,
-            source_review_required,
-            analysis_solver_available,
-            rendering_properties_available,
-        }
-    }
-}
-
-/// The isotropic moduli a card's numbers imply.
-#[derive(Debug, Serialize, JsonSchema)]
-pub struct CardModuli {
-    pub shear_pa: f64,
-    pub bulk_pa: f64,
-}
-
-#[cfg(test)]
-#[path = "material_properties_tests.rs"]
-mod tests;

crates/engine/src/schema/material_properties_tests.rs

@@ -1,58 +0,0 @@
-use serde_json::{Value, json};
-
-use super::{CardModulus, CardValidated, DirectionalModulusParams, ValidateCardParams};
-use crate::Session;
-use crate::schema::tests::{assert_keys, assert_strict_keeps_todays_errors, conforms};
-use crate::schema::{ParamCheck, input_schema_for, output_schema_for};
-
-/// An isotropic card, as the command's own tests write one.
-fn card() -> Value {
-    json!({"schema_version":1,"designation":"Original synthetic card, not design data","family":"other",
-        "sources":[{"id":"fixture","title":"Original analytic constants","kind":"illustrative","license":"MIT OR Apache-2.0"}],
-        "properties":[{"source_id":"fixture","conditions":{"temperature_k":293.15,"state":"synthetic"},
-            "data":{"kind":"density","kg_m3":700.0}},
-            {"source_id":"fixture","data":{"kind":"elasticity","model":{
-                "symmetry":"isotropic","young_modulus_pa":12.25e9,"poisson_ratio":0.25}}}]})
-}
-
-#[test]
-fn schemas_and_the_key_check_agree() {
-    assert_keys(input_schema_for::<ValidateCardParams>(), &["card"]);
-    assert_keys(input_schema_for::<DirectionalModulusParams>(), &["card", "direction"]);
-}
-
-#[test]
-fn strict_keeps_todays_errors() {
-    assert_strict_keeps_todays_errors(&[
-        ("material.properties.validate", json!({"card": {}})),
-        ("material.properties.validate", json!({"card": null})),
-        ("material.properties.directional", json!({"card": {}, "direction": [1, 0, 0]})),
-        ("material.properties.directional", json!({"card": card(), "direction": [1, 0]})),
-        ("material.properties.directional", json!({"card": card(), "direction": "x"})),
-        ("material.properties.directional", json!({"card": card(), "direction": [1, "a", 0]})),
-        ("material.properties.directional", json!({"card": card(), "direction": [0, 0, 0]})),
-    ]);
-}
-
-/// #11036: both commands reply as their output schemas say, in Warn without warnings. Like the
-/// handlers, warn and strict refuse a key they don't take, so no reply carries a warning.
-#[test]
-fn card_commands_reply_with_their_schemas() {
-    let (validated, modulus) = (output_schema_for::<CardValidated>(), output_schema_for::<CardModulus>());
-    let matches = |schema: &schemars::Schema, r: &Value| {
-        let schema = schema.as_value();
-        assert!(conforms(schema, schema, r), "{r} doesn't match {schema}");
-        assert!(r.get("param_warnings").is_none(), "{r}");
-    };
-    let mut s = Session { param_check: ParamCheck::Warn, ..Session::default() };
-    let r = s.execute("material.properties.validate", &json!({"card": card()})).unwrap_or_else(|e| panic!("{e}"));
-    matches(&validated, &r);
-    assert!(r["valid"] == true && r["validation"]["isotropic_moduli"]["shear_pa"].is_number(), "{r}");
-    let r = s.execute("material.properties.directional", &json!({"card": card(), "direction": [1, 1, 0]})).unwrap_or_else(|e| panic!("{e}"));
-    matches(&modulus, &r);
-    assert!(r["axes"].is_null() && (r["young_modulus_pa"].as_f64().unwrap_or(0.0) - 12.25e9).abs() < 1.0, "{r}");
-    for level in [ParamCheck::Warn, ParamCheck::Strict] {
-        let mut s = Session { param_check: level, ..Session::default() };
-        assert!(s.execute("material.properties.validate", &json!({"card": card(), "crd": 1})).is_err(), "{level:?}");
-    }
-}

crates/engine/src/schema/metadata.rs

@@ -1,84 +0,0 @@
-//! Contracts and result types for the commands in `cmd/metadata.rs`.
-
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use serde_json::{Map, Value};
-
-/// Read the design's properties: its `metadata` object as saved, and SolidCraft's own design
-/// properties (project, part number, revision…) as text.
-#[derive(Debug, Deserialize, JsonSchema)]
-#[schemars(deny_unknown_fields)]
-pub struct MetadataParams {}
-
-/// What `document.metadata` returns.
-#[derive(Debug, Serialize, JsonSchema)]
-pub struct MetadataResult {
-    /// The design's metadata object as saved, other tools' keys included.
-    pub metadata: Map<String, Value>,
-    /// Each of SolidCraft's design properties, by key: its text, or null when it is absent or
-    /// not text.
-    pub properties: Map<String, Value>,
-}
-
-/// Change design properties in one undo step: `key` and `value`, or `values` for several at
-/// once (all or nothing). A change that sets what is already there makes no undo step.
-#[derive(Debug, Deserialize, JsonSchema)]
-#[schemars(deny_unknown_fields)]
-pub struct MetadataSetParams {
-    /// The property to set: one of SolidCraft's keys (the ones `document.metadata`'s
-    /// `properties` lists), which take text, or another tool's reverse-DNS key such as
-    /// `com.example.tool`, which takes an object. `bom_type` is a component's property and is
-    /// refused here. Needs `value`; not with `values`.
-    #[serde(default)]
-    pub key: Option<String>,
-    /// The value for `key`: text for SolidCraft's keys, an object for another tool's. `""` or
-    /// null removes the key. Required with `key`.
-    #[serde(default)]
-    #[schemars(with = "Value")]
-    pub value: Option<Value>,
-    /// Several properties at once, `{key: value, …}`, at most 256 keys, each as `key` and
-    /// `value` take them. Not with `key`.
-    #[serde(default)]
-    pub values: Option<Map<String, Value>>,
-}
-
-/// What `document.metadata.set` returns.
-#[derive(Debug, Serialize, JsonSchema)]
-pub struct MetadataSetResult {
-    /// The design's metadata object after the change.
-    pub metadata: Map<String, Value>,
-    /// The keys whose value changed, in key order.
-    pub changed: Vec<String>,
-    /// In the warn parameter-check mode: what the call's parameters got wrong.
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub param_warnings: Vec<String>,
-}
-
-/// Remove design properties in one undo step: `key`, or `keys` for several. Any key can go,
-/// also one another tool wrote; a key that isn't there is left out of `removed`.
-#[derive(Debug, Deserialize, JsonSchema)]
-#[schemars(deny_unknown_fields)]
-pub struct MetadataRemoveParams {
-    /// The property to remove. Not with `keys`.
-    #[serde(default)]
-    pub key: Option<String>,
-    /// The properties to remove, at most 256. Not with `key`.
-    #[serde(default)]
-    pub keys: Option<Vec<String>>,
-}
-
-/// What `document.metadata.remove` returns.
-#[derive(Debug, Serialize, JsonSchema)]
-pub struct MetadataRemoveResult {
-    /// The design's metadata object after the change.
-    pub metadata: Map<String, Value>,
-    /// The keys that were there and are removed, each once, in the order asked.
-    pub removed: Vec<String>,
-    /// In the warn parameter-check mode: what the call's parameters got wrong.
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub param_warnings: Vec<String>,
-}
-
-#[cfg(test)]
-#[path = "metadata_tests.rs"]
-mod tests;

crates/engine/src/schema/metadata_tests.rs

@@ -1,54 +0,0 @@
-use serde_json::{Value, json};
-
-use super::{MetadataParams, MetadataRemoveParams, MetadataRemoveResult, MetadataResult, MetadataSetParams, MetadataSetResult};
-use crate::Session;
-use crate::schema::tests::{assert_keys, assert_strict_keeps_todays_errors, conforms};
-use crate::schema::{ParamCheck, input_schema_for, output_schema_for};
-
-#[test]
-fn schemas_and_the_key_check_agree() {
-    assert_keys(input_schema_for::<MetadataParams>(), &[]);
-    assert_keys(input_schema_for::<MetadataSetParams>(), &["key", "value", "values"]);
-    assert_keys(input_schema_for::<MetadataRemoveParams>(), &["key", "keys"]);
-}
-
-#[test]
-fn strict_keeps_todays_errors() {
-    assert_strict_keeps_todays_errors(&[
-        ("document.metadata.set", json!({"key": 5, "value": "Gearbox"})),
-        ("document.metadata.remove", json!({"key": 5})),
-    ]);
-}
-
-/// Every form of the three commands, in Warn: each reply matches its output schema and carries
-/// no warning; a misspelt key's warning still matches.
-#[test]
-fn replies_match_the_output_schema() {
-    let mut s = Session { param_check: ParamCheck::Warn, ..Session::default() };
-    let mut run = |id: &str, p: Value| s.execute(id, &p).unwrap_or_else(|e| panic!("{id} {p}: {e}"));
-    let matches = |schema: schemars::Schema, reply: &Value| {
-        let schema = schema.as_value();
-        assert!(conforms(schema, schema, reply), "{reply} doesn't match {schema}");
-    };
-    let set = |reply: &Value| matches(output_schema_for::<MetadataSetResult>(), reply);
-    let remove = |reply: &Value| matches(output_schema_for::<MetadataRemoveResult>(), reply);
-    let calls = [
-        ("document.metadata.set", json!({"values": {"author": "Jane Doe", "com.acme.shop": {"shop_id": 88123}}})),
-        ("document.metadata.set", json!({"key": "project", "value": "Gearbox"})),
-        ("document.metadata.set", json!({"key": "project", "value": null})),
-        ("document.metadata.remove", json!({"keys": ["author", "author", "not.there"]})),
-        ("document.metadata.remove", json!({"key": "com.acme.shop"})),
-    ];
-    for (id, p) in calls {
-        let reply = run(id, p.clone());
-        assert!(reply.get("param_warnings").is_none(), "{id} {p}: {reply}");
-        if id == "document.metadata.set" { set(&reply) } else { remove(&reply) }
-    }
-    run("document.metadata.set", json!({"key": "part_number", "value": "ACME-1042"}));
-    let read = run("document.metadata", json!({}));
-    assert_eq!(read["properties"]["part_number"], "ACME-1042");
-    matches(output_schema_for::<MetadataResult>(), &read);
-    let warned = run("document.metadata.set", json!({"key": "author", "value": "J", "valeu": 1}));
-    assert!(warned["param_warnings"].as_array().is_some_and(|w| !w.is_empty()), "{warned}");
-    set(&warned);
-}

crates/engine/src/schema/mod.rs

@@ -57,8 +57,6 @@ mod tests;
 pub mod appearance;
 pub mod bom;
 pub mod browser;
-pub mod clearance;
-pub mod compare;
 pub mod component;
 pub mod config;
 pub mod construct;
@@ -70,14 +68,11 @@ pub mod inspect;
 pub mod joints;
 pub mod libraries;
 pub mod mass_properties;
-pub mod material_properties;
-pub mod metadata;
 pub mod motion;
 pub mod panels;
 pub mod print_face;
 pub mod render;
 pub mod render_lights;
-pub mod render_stage;
 pub mod render_ui;
 pub mod section;
 pub mod sheet;
@@ -89,7 +84,6 @@ pub mod sketch_equation;
 pub mod sketch_inspect;
 pub mod surface_analysis;
 pub mod surface_boundary;
-pub mod surface_match;
 pub mod ui_prefs;
 pub mod view_navigation;
 

crates/engine/src/schema/render_stage.rs

@@ -1,145 +0,0 @@
-//! Contracts and result type for the render stage commands in `cmd/render/staging.rs` (#11455).
-//! A stage is a set of render-only panels saved with a render setup. The handlers read these
-//! same parameter types, so each contract is exactly what its handler takes; like the handlers,
-//! a contract refuses unknown keys.
-
-use schemars::{JsonSchema, Schema, SchemaGenerator, json_schema};
-use serde::{Deserialize, Serialize};
-use serde_json::Value;
-
-fn patch() -> Value {
-    serde_json::json!({})
-}
-
-fn set_schema(_: &mut SchemaGenerator) -> Schema {
-    json_schema!({"type": "object", "maxProperties": 13, "default": {}})
-}
-
-fn margin() -> f64 {
-    0.25
-}
-
-fn gap() -> f64 {
-    0.1
-}
-
-fn reflectance() -> [f64; 3] {
-    [0.18; 3]
-}
-
-/// Fit one ground panel under the visible product, a little below its lowest point, and save
-/// it with a render setup in one undo step. The setup must render with the CPU raytracer or the
-/// GPU path tracer. The product's clearance from the panel is checked again on every render.
-#[derive(Debug, Deserialize, JsonSchema)]
-#[serde(deny_unknown_fields)]
-pub struct GroundParams {
-    /// The render setup, saved or new.
-    pub name: String,
-    /// Changes to the setup before the ground is fitted, as `render.settings.set` takes them:
-    /// an object of at most 13 setup fields. Default: none.
-    #[serde(default = "patch")]
-    #[schemars(schema_with = "set_schema")]
-    pub set: Value,
-    /// How far the ground reaches past the product on each side, as a share of the product's
-    /// largest size: 0 to 10. Default: 0.25.
-    #[serde(default = "margin")]
-    #[schemars(range(min = 0.0, max = 10.0))]
-    pub margin_fraction: f64,
-    /// The gap between the product's lowest point and the ground (mm): 0.0001 to 1000.
-    /// Default: 0.1.
-    #[serde(default = "gap")]
-    #[schemars(range(min = 0.0001, max = 1000.0))]
-    pub gap_mm: f64,
-    /// How much light the ground reflects, as linear red, green and blue: each 0 to 1.
-    /// Default: 0.18 each.
-    #[serde(default = "reflectance")]
-    pub reflectance_linear: [f64; 3],
-    /// Replace a stage the setup already has. Without it, such a setup is refused.
-    #[serde(default)]
-    pub replace_stage: bool,
-}
-
-/// Fit a floor and a wall, or a curved cyclorama of 24 flat strips, behind the visible product,
-/// facing the setup's camera, and save it with the render setup in one undo step. The setup
-/// must render with the CPU raytracer or the GPU path tracer. World +Z is up. This is a finite
-/// background, not an infinite floor or a smooth CAD face.
-#[derive(Debug, Deserialize, JsonSchema)]
-#[serde(deny_unknown_fields)]
-pub struct BackdropParams {
-    /// The render setup, saved or new.
-    pub name: String,
-    /// Changes to the setup before the backdrop is fitted, as `render.settings.set` takes them:
-    /// an object of at most 13 setup fields. Default: none.
-    #[serde(default = "patch")]
-    #[schemars(schema_with = "set_schema")]
-    pub set: Value,
-    pub kind: BackdropKind,
-    /// How much light the panels reflect, as linear red, green and blue: each 0 to 1.
-    /// Default: 0.18 each.
-    #[serde(default = "reflectance")]
-    pub reflectance_linear: [f64; 3],
-    /// Replace a stage the setup already has. Without it, such a setup is refused.
-    #[serde(default)]
-    pub replace_stage: bool,
-    /// The design's revision when the caller last read it, as `document.inspect` gives it. If
-    /// the design changed since, the call is refused: read it again and retry.
-    pub expected_revision: u64,
-}
-
-/// The backdrop's shape.
-#[derive(Clone, Copy, Debug, Deserialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum BackdropKind {
-    /// A floor and a flat wall.
-    FloorWall,
-    /// A floor that curves up into the wall, in 24 flat strips.
-    Cyclorama,
-}
-
-/// Remove the stage from a render setup in one undo step. The design's geometry and the
-/// setup's lighting stay as they are.
-#[derive(Debug, Deserialize, JsonSchema)]
-#[serde(deny_unknown_fields)]
-pub struct ClearParams {
-    /// The render setup, saved or new.
-    pub name: String,
-    /// Changes to the setup made with the removal, as `render.settings.set` takes them:
-    /// an object of at most 13 setup fields. Default: none.
-    #[serde(default = "patch")]
-    #[schemars(schema_with = "set_schema")]
-    pub set: Value,
-}
-
-/// What `render.stage.ground`, `render.stage.backdrop` and `render.stage.clear` return.
-#[derive(Debug, Serialize, JsonSchema)]
-pub struct StageSaved {
-    /// The render setup.
-    pub name: String,
-    /// The setup as saved, as the render settings commands give it.
-    pub setup: Value,
-    /// Always true: the design's bodies don't change.
-    pub engineering_geometry_unchanged: bool,
-    /// Always true: the panels exist only in renders.
-    pub stage_only: bool,
-    /// How the product's clearance from the panels is checked.
-    pub clearance: String,
-    /// A backdrop's shape: `finite_floor_and_wall` or `24_segment_polygonal_cyclorama`.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub geometry_kind: Option<String>,
-    /// A backdrop's part in the lighting.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub light_transport: Option<String>,
-    /// A backdrop: always true, the setup's camera stays as it is.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub camera_preserved: Option<bool>,
-    /// A backdrop's limits, in sentences.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub limitations: Option<Vec<String>>,
-    /// In the warn parameter-check mode: what the call's parameters got wrong.
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub param_warnings: Vec<String>,
-}
-
-#[cfg(test)]
-#[path = "render_stage_tests.rs"]
-mod tests;

crates/engine/src/schema/render_stage_tests.rs

@@ -1,99 +0,0 @@
-use serde_json::{Value, json};
-
-use super::{BackdropParams, ClearParams, GroundParams, StageSaved};
-use crate::Session;
-use crate::schema::tests::{assert_keys, conforms};
-use crate::schema::{ParamCheck, input_schema_for, output_schema_for};
-
-/// A design with a box and a saved render setup, `Shot`, that renders with the GPU path tracer,
-/// at the parameter-check level `level`.
-fn with_a_shot(level: ParamCheck) -> Session {
-    let mut s = Session { param_check: level, ..Session::default() };
-    for (id, p) in [
-        ("solid.box", json!({"length": 20, "width": 15, "height": 10, "body_name": "Subject"})),
-        ("render.settings.set", json!({"name": "Shot", "set": {"width": 96, "height": 64, "job": {"method": "gpu_path", "options": {}}}})),
-    ] {
-        s.execute(id, &p).unwrap_or_else(|e| panic!("{id} {p}: {e}"));
-    }
-    s
-}
-
-#[test]
-fn schemas_and_the_key_check_agree() {
-    assert_keys(input_schema_for::<GroundParams>(), &["gap_mm", "margin_fraction", "name", "reflectance_linear", "replace_stage", "set"]);
-    assert_keys(input_schema_for::<BackdropParams>(), &["expected_revision", "kind", "name", "reflectance_linear", "replace_stage", "set"]);
-    assert_keys(input_schema_for::<ClearParams>(), &["name", "set"]);
-}
-
-/// The handlers refuse these calls after reading them; strict refuses them with their message.
-/// They need a design with a body and a saved setup, and the design's revision, so the shared
-/// helper, which has a sketch only, doesn't fit.
-#[test]
-fn strict_keeps_todays_errors() {
-    let cases: [(&str, fn(u64) -> Value); 12] = [
-        ("render.stage.ground", |_| json!({"name": "Shot", "margin_fraction": 11})),
-        ("render.stage.ground", |_| json!({"name": "Shot", "gap_mm": 0})),
-        ("render.stage.ground", |_| json!({"name": "Shot", "reflectance_linear": [2, 0, 0]})),
-        ("render.stage.ground", |_| json!({"name": "Raster"})),
-        ("render.stage.ground", |_| json!({"name": " Shot"})),
-        ("render.stage.ground", |_| json!({"name": "Shot", "set": {"width": 0}})),
-        ("render.stage.backdrop", |_| json!({"name": "Shot", "kind": "cyclorama", "expected_revision": 999_999})),
-        ("render.stage.backdrop", |r| json!({"name": "Raster", "kind": "floor_wall", "expected_revision": r})),
-        ("render.stage.backdrop", |r| json!({"name": "Shot", "kind": "floor_wall", "reflectance_linear": [0, -1, 0], "expected_revision": r})),
-        ("render.stage.clear", |_| json!({"name": ""})),
-        ("render.stage.clear", |_| json!({"name": "Shot", "set": {"width": 0}})),
-        ("render.stage.clear", |_| json!({"name": "Shot", "set": 5})),
-    ];
-    for (id, p) in cases {
-        let error = |level: ParamCheck| {
-            let mut s = with_a_shot(level);
-            let p = p(s.revision);
-            s.execute(id, &p).err().map(|e| e.to_string())
-        };
-        let off = error(ParamCheck::Off);
-        assert!(off.is_some(), "{id} {} should fail today", p(0));
-        assert_eq!(error(ParamCheck::Strict), off, "{id} {}", p(0));
-    }
-    // A stage already there needs `replace_stage`, for a ground and a backdrop alike.
-    for level in [ParamCheck::Off, ParamCheck::Strict] {
-        let mut s = with_a_shot(level);
-        s.execute("render.stage.ground", &json!({"name": "Shot"})).unwrap_or_else(|e| panic!("{e}"));
-        let ground = s.execute("render.stage.ground", &json!({"name": "Shot"})).err().map(|e| e.to_string());
-        let p = json!({"name": "Shot", "kind": "floor_wall", "expected_revision": s.revision});
-        let backdrop = s.execute("render.stage.backdrop", &p).err().map(|e| e.to_string());
-        for error in [ground, backdrop] {
-            assert!(error.as_deref().is_some_and(|e| e.contains("replace_stage: true")), "{level:?}: {error:?}");
-        }
-    }
-}
-
-/// #11455: a ground, both backdrops and a clear reply as the output schema says, in Warn
-/// without warnings; only a backdrop carries its shape and limits. Like the handlers, warn and
-/// strict refuse a misspelt key.
-#[test]
-fn stage_commands_reply_with_their_schema() {
-    let schema = output_schema_for::<StageSaved>();
-    let schema = schema.as_value();
-    let mut s = with_a_shot(ParamCheck::Warn);
-    let run = |s: &mut Session, id: &str, p: Value| {
-        let r = s.execute(id, &p).unwrap_or_else(|e| panic!("{id} {p}: {e}"));
-        assert!(conforms(schema, schema, &r), "{r} doesn't match {schema}");
-        assert!(r.get("param_warnings").is_none(), "{r}");
-        r
-    };
-    let p = json!({"name": "Shot", "set": {}, "margin_fraction": 0.5, "gap_mm": 1, "reflectance_linear": [0.2, 0.2, 0.2], "replace_stage": false});
-    let r = run(&mut s, "render.stage.ground", p);
-    assert!(r["setup"].is_object() && r.get("geometry_kind").is_none(), "{r}");
-    for kind in ["floor_wall", "cyclorama"] {
-        let revision = s.revision;
-        let p = json!({"name": "Shot", "kind": kind, "replace_stage": true, "expected_revision": revision});
-        let r = run(&mut s, "render.stage.backdrop", p);
-        assert!(r["geometry_kind"].is_string() && r["limitations"].is_array(), "{r}");
-    }
-    run(&mut s, "render.stage.clear", json!({"name": "Shot", "set": {}}));
-    for level in [ParamCheck::Warn, ParamCheck::Strict] {
-        let mut s = with_a_shot(level);
-        let error = s.execute("render.stage.clear", &json!({"nme": "Shot"})).err().map(|e| e.to_string()).unwrap_or_default();
-        assert!(error.contains("nme"), "{level:?}: {error}");
-    }
-}

crates/engine/src/schema/surface_match.rs

@@ -1,165 +0,0 @@
-//! Contract for `surface.match` in `cmd/surface_match.rs` (#10981). It returns `add_feature`'s
-//! reply, a [`super::features::FeatureResult`].
-
-use std::borrow::Cow;
-
-use schemars::{JsonSchema, Schema, SchemaGenerator, json_schema};
-use serde::de::Error as _;
-use serde::{Deserialize, Deserializer};
-use serde_json::Value;
-use solidcore_record::Vec3;
-use solidcraft_kernel::{Construction, Continuity};
-
-use super::check::whole;
-use super::types::{Point3, StringList, present};
-use crate::params;
-
-/// Rebuild one face of a surface body so that its boundary nearest a picked edge chain of another
-/// body lies on that chain and repeats that body's shape there up to `order`, while the opposite
-/// boundary keeps its place. The body keeps its name: a match changes it rather than making one.
-#[derive(Debug, Deserialize, JsonSchema)]
-#[schemars(deny_unknown_fields)]
-pub struct MatchSurfaceParams {
-    /// The surface body whose face is rebuilt, by name.
-    #[serde(deserialize_with = "body")]
-    pub body: String,
-    #[serde(default)]
-    pub faces: Option<MatchFaces>,
-    /// The body the seam must meet, by name.
-    #[serde(deserialize_with = "target")]
-    pub target: String,
-    pub edges: MatchEdges,
-    /// How closely the seam follows the target: `g1` (tangent), `g2` (curvature, the default) or
-    /// `g3`, in any case.
-    #[serde(default, deserialize_with = "present")]
-    #[schemars(with = "MatchOrder")]
-    pub order: Option<MatchOrder>,
-    // Not `FeatureCommon`: a match makes no body, so `body_name` and `body_names` would do
-    // nothing. `participants` stays because `timeline.redefine` passes a feature's own back.
-    /// The feature's name in the timeline.
-    #[serde(default)]
-    pub name: Option<String>,
-    /// The bodies taking part, which every feature records; each an existing body or `*`. A match
-    /// changes only `body`, whatever this lists.
-    #[serde(default)]
-    pub participants: Option<StringList>,
-}
-
-/// A body name, with the handler's message for anything that isn't text.
-fn body<'de, D: Deserializer<'de>>(d: D) -> Result<String, D::Error> {
-    match Value::deserialize(d)? {
-        Value::String(s) => Ok(s),
-        _ => Err(D::Error::custom(whole("`body` is required"))),
-    }
-}
-
-/// The target's name, with the handler's message for anything that isn't text.
-fn target<'de, D: Deserializer<'de>>(d: D) -> Result<String, D::Error> {
-    match Value::deserialize(d)? {
-        Value::String(s) => Ok(s),
-        _ => Err(D::Error::custom(whole("`target` is required"))),
-    }
-}
-
-/// Points `params::vec3` reads, or none if any isn't one.
-fn points(v: &[Value]) -> Option<Vec<Vec3>> {
-    v.iter().map(params::vec3).collect()
-}
-
-/// Points on the face to rebuild, at most 64 (default: the body's first face).
-#[derive(Clone, Debug, PartialEq)]
-pub struct MatchFaces(pub Vec<Vec3>);
-
-impl<'de> Deserialize<'de> for MatchFaces {
-    fn deserialize<D: Deserializer<'de>>(d: D) -> Result<Self, D::Error> {
-        let faces =
-            Value::deserialize(d)?.as_array().and_then(|a| points(a)).ok_or_else(|| D::Error::custom("must be a list of points [x, y, z]"))?;
-        if faces.len() > 64 {
-            return Err(D::Error::custom(whole("too many points on the face to rebuild")));
-        }
-        Ok(MatchFaces(faces))
-    }
-}
-
-impl JsonSchema for MatchFaces {
-    fn schema_name() -> Cow<'static, str> {
-        "MatchFaces".into()
-    }
-    fn inline_schema() -> bool {
-        true
-    }
-    fn json_schema(generator: &mut SchemaGenerator) -> Schema {
-        let point = generator.subschema_for::<Point3>();
-        json_schema!({
-            "description": "Points on the face to rebuild, at most 64 (default: the body's first face).",
-            "type": "array",
-            "items": point,
-            "maxItems": 64
-        })
-    }
-}
-
-/// Points on one edge chain of the target: the rebuilt boundary takes its place. 1 to 10 000,
-/// with the handler's message for anything else.
-#[derive(Clone, Debug, PartialEq)]
-pub struct MatchEdges(pub Vec<Vec3>);
-
-impl<'de> Deserialize<'de> for MatchEdges {
-    fn deserialize<D: Deserializer<'de>>(d: D) -> Result<Self, D::Error> {
-        Value::deserialize(d)?
-            .as_array()
-            .and_then(|a| points(a))
-            .filter(|edges| !edges.is_empty() && edges.len() <= 10_000)
-            .map(MatchEdges)
-            .ok_or_else(|| D::Error::custom(whole("`edges` must list 1 to 10000 points on the target's edge chain")))
-    }
-}
-
-impl JsonSchema for MatchEdges {
-    fn schema_name() -> Cow<'static, str> {
-        "MatchEdges".into()
-    }
-    fn inline_schema() -> bool {
-        true
-    }
-    fn json_schema(generator: &mut SchemaGenerator) -> Schema {
-        let point = generator.subschema_for::<Point3>();
-        json_schema!({
-            "description": "Points on one edge chain of the target: the rebuilt boundary takes its place.",
-            "type": "array",
-            "items": point,
-            "minItems": 1,
-            "maxItems": 10000
-        })
-    }
-}
-
-/// A match's continuity, as `params::continuity` reads it for a match (g1 to g3), with its messages.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct MatchOrder(pub Continuity);
-
-impl<'de> Deserialize<'de> for MatchOrder {
-    fn deserialize<D: Deserializer<'de>>(d: D) -> Result<Self, D::Error> {
-        let v = Value::deserialize(d)?;
-        params::continuity("surface.match", Some(&v), "`order`", Construction::Match).map(MatchOrder).map_err(|e| match e {
-            crate::EngineError::BadParams { msg, .. } => D::Error::custom(whole(msg)),
-            other => D::Error::custom(whole(other.to_string())),
-        })
-    }
-}
-
-impl JsonSchema for MatchOrder {
-    fn schema_name() -> Cow<'static, str> {
-        "MatchOrder".into()
-    }
-    fn inline_schema() -> bool {
-        true
-    }
-    fn json_schema(_: &mut SchemaGenerator) -> Schema {
-        json_schema!({"type": "string", "pattern": "^[gG][123]$"})
-    }
-}
-
-#[cfg(test)]
-#[path = "surface_match_tests.rs"]
-mod tests;

crates/engine/src/schema/surface_match_tests.rs

@@ -1,121 +0,0 @@
-use serde_json::{Value, json};
-use solidcore_record::Vec3;
-
-use super::MatchSurfaceParams;
-use crate::Session;
-use crate::schema::features::FeatureResult;
-use crate::schema::tests::{assert_keys, conforms};
-use crate::schema::{ParamCheck, input_schema_for, output_schema_for};
-
-fn run(s: &mut Session, id: &str, p: Value) -> Value {
-    s.execute(id, &p).unwrap_or_else(|e| panic!("{id} {p}: {e}"))
-}
-
-/// Two points on the cylinder's straight vertical wall seam, as the command's own tests pick it.
-fn picks(s: &Session) -> Vec<Vec3> {
-    let boss = s.world_state().ok().and_then(|st| st.body("Boss").map(|b| b.body.clone())).unwrap_or_else(|| panic!("no Boss"));
-    let e = boss
-        .edges(boss.size() * 1e-2)
-        .unwrap_or_default()
-        .into_iter()
-        .find(|e| e.length > 25.0 && (e.mid.x.hypot(e.mid.y) - 10.0).abs() < 0.05 && e.mid.z > 5.0 && e.mid.z < 25.0)
-        .unwrap_or_else(|| panic!("the cylinder has a straight vertical wall seam"));
-    let (a, b) = (e.points.first().copied().unwrap_or(e.mid), e.points.last().copied().unwrap_or(e.mid));
-    vec![a + (b - a) * 0.25, a + (b - a) * 0.75]
-}
-
-/// A cylinder `Boss` of radius 10, 30 high, and a cylindrical surface `Skirt` of radius 11 from
-/// the cylinder's wall seam round 60 degrees, as in the command's own tests: a point on the skirt.
-fn boss_and_skirt(s: &mut Session) -> [f64; 3] {
-    run(s, "sketch.create", json!({"plane": "XY", "name": "Round"}));
-    run(s, "sketch.circle.center", json!({"center": [0, 0], "radius": 10}));
-    run(s, "sketch.finish", json!({}));
-    run(s, "solid.extrude", json!({"sketch": "Round", "distance": 30, "body_name": "Boss"}));
-    let seam = picks(s)[0];
-    let a = seam.y.atan2(seam.x);
-    let at = |t: f64| json!([11.0 * t.cos(), 11.0 * t.sin()]);
-    run(s, "sketch.create", json!({"plane": "XY", "name": "Skirt sketch"}));
-    let arc = run(s, "sketch.arc.three_point", json!({"start": at(a), "end": at(a + 60f64.to_radians()), "through": at(a + 30f64.to_radians())}))
-        ["created"]["curves"][0]
-        .clone();
-    run(s, "sketch.finish", json!({}));
-    run(s, "surface.extrude", json!({"sketch": "Skirt sketch", "curves": [arc], "distance": 30, "body_name": "Skirt"}));
-    let mid = a + 30f64.to_radians();
-    [11.0 * mid.cos(), 11.0 * mid.sin(), 15.0]
-}
-
-#[test]
-fn schemas_and_the_key_check_agree() {
-    assert_keys(input_schema_for::<MatchSurfaceParams>(), &["body", "edges", "faces", "name", "order", "participants", "target"]);
-}
-
-/// A call that fails today gets the same message in strict. The handler looks both bodies up
-/// before it reads the picks, so each call runs on a design with two (a missing `edges` is left
-/// out: strict says it is required, the handler what it must list).
-#[test]
-fn strict_keeps_todays_errors() {
-    let many = vec![[0, 0, 0]; 10_001];
-    let faces = vec![[0, 0, 0]; 65];
-    let e = json!([[0, 0, 0]]);
-    for p in [
-        json!({"target": "T", "edges": e}),
-        json!({"body": 5, "target": "T", "edges": e}),
-        json!({"body": "Nope", "target": "T", "edges": e}),
-        json!({"body": "B", "edges": e}),
-        json!({"body": "B", "target": [], "edges": e}),
-        json!({"body": "B", "target": "Nope", "edges": e}),
-        json!({"body": "B", "target": "T", "faces": faces, "edges": e}),
-        json!({"body": "B", "target": "T", "edges": []}),
-        json!({"body": "B", "target": "T", "edges": null}),
-        json!({"body": "B", "target": "T", "edges": 5}),
-        json!({"body": "B", "target": "T", "edges": [[1, 2]]}),
-        json!({"body": "B", "target": "T", "edges": many}),
-        json!({"body": "B", "target": "T", "edges": e, "order": "g5"}),
-        json!({"body": "B", "target": "T", "edges": e, "order": "g0"}),
-        json!({"body": "B", "target": "T", "edges": e, "order": null}),
-        json!({"body": "B", "target": "T", "edges": e, "order": 2}),
-        json!({"body": "B", "target": "T", "edges": e}),
-    ] {
-        let error = |level: ParamCheck| {
-            let mut s = Session::default();
-            run(&mut s, "solid.box", json!({"length": 4, "width": 4, "height": 4, "body_name": "B"}));
-            run(&mut s, "solid.box", json!({"length": 4, "width": 4, "height": 4, "corner": [10, 0, 0], "body_name": "T"}));
-            s.param_check = level;
-            s.execute("surface.match", &p).err().map(|e| e.to_string())
-        };
-        let off = error(ParamCheck::Off);
-        assert!(off.is_some(), "{p} should fail today");
-        assert_eq!(error(ParamCheck::Strict), off, "{p}");
-    }
-}
-
-/// #10981: a match replies with `FeatureResult`, in Warn without warnings for good calls (the
-/// body's first face, and a picked face with every other key) and with them for a misspelt key;
-/// strict refuses a face point the handler would drop.
-#[test]
-fn a_match_replies_with_the_feature_result() {
-    let schema = output_schema_for::<FeatureResult>();
-    let matches = |r: &Value, warned: bool| {
-        let schema = schema.as_value();
-        assert!(conforms(schema, schema, r), "{r} doesn't match {schema}");
-        assert_eq!(r.get("param_warnings").is_some(), warned, "{r}");
-    };
-    let mut s = Session { param_check: ParamCheck::Warn, ..Session::default() };
-    let on_skirt = boss_and_skirt(&mut s);
-    let chain = picks(&s);
-    let r = run(&mut s, "surface.match", json!({"body": "Skirt", "target": "Boss", "edges": chain, "order": "G2"}));
-    matches(&r, false);
-    assert_eq!(r["changed_bodies"], json!(["Skirt"]), "{r}");
-    let r = run(
-        &mut s,
-        "surface.match",
-        json!({"body": "Skirt", "faces": [on_skirt], "target": "Boss", "edges": chain, "order": "g1", "name": "Seam", "participants": ["*"]}),
-    );
-    matches(&r, false);
-    assert_eq!(r["name"], "Seam", "{r}");
-    matches(&run(&mut s, "surface.match", json!({"body": "Skirt", "target": "Boss", "edges": chain, "ordr": "g3"})), true);
-    s.param_check = ParamCheck::Strict;
-    let error = s.execute("surface.match", &json!({"body": "Skirt", "faces": [on_skirt, [1, 2]], "target": "Boss", "edges": chain}));
-    let error = error.err().map(|e| e.to_string());
-    assert!(error.as_deref().is_some_and(|e| e.contains("`faces` must be a list of points")), "{error:?}");
-}

crates/engine/src/schema/tests.rs

@@ -367,7 +367,7 @@ fn issues_are_read_from_the_commands_own_contract() {
     assert_eq!(messages(&issues), ["unknown key `operaton`; did you mean `operation`?"]);
     assert_eq!(issues, box_contract().check(&json!({"length": 1, "width": 1, "height": 1, "operaton": "cut"})));
     // No contract, or no such command: nothing to say.
-    assert!(super::issues("solid.chamfer", &json!({"nonsense": 1})).is_empty());
+    assert!(super::issues("solid.fillet", &json!({"nonsense": 1})).is_empty());
     assert!(super::issues("no.such", &json!({"nonsense": 1})).is_empty());
 }
 

crates/engine/src/schema/types.rs

@@ -464,66 +464,6 @@ fn enum_schema(values: &[&str], description: &str) -> Schema {
     json_schema!({"description": description, "type": "string", "enum": values})
 }
 
-/// A keyword a handler reads with `str_` and lowercases, refusing any other word with `unknown
-/// <what> `<word>` (<expected>)`; the lowercased word is kept for the handler.
-macro_rules! keyword_param {
-    ($(#[$doc:meta])* $name:ident, $what:literal, $values:expr, $expected:literal, $description:literal) => {
-        $(#[$doc])*
-        #[derive(Clone, Debug, PartialEq)]
-        pub struct $name(pub String);
-
-        impl<'de> Deserialize<'de> for $name {
-            fn deserialize<D: Deserializer<'de>>(d: D) -> Result<Self, D::Error> {
-                let ok = |s: &str| $values.contains(&s.to_ascii_lowercase().as_str());
-                let unknown = |s: &str| whole(format!(concat!("unknown ", $what, " `{}` (", $expected, ")"), s.to_ascii_lowercase()));
-                string_matching(d, ok, $expected, unknown).map(|s| $name(s.to_ascii_lowercase()))
-            }
-        }
-
-        impl JsonSchema for $name {
-            fn schema_name() -> Cow<'static, str> {
-                stringify!($name).into()
-            }
-            fn json_schema(_: &mut SchemaGenerator) -> Schema {
-                enum_schema($values, $description)
-            }
-        }
-    };
-}
-
-keyword_param!(
-    /// `solid.fillet`'s `type`.
-    FilletTypeParam,
-    "fillet type",
-    &["constant", "rolling_ball", "chord", "chord_length", "curvature", "g2", "variable", "spline"],
-    "constant, chord, variable, spline or curvature",
-    "The round's section: constant (the default; rolling_ball is an alias), chord (`radius` is the width across; alias chord_length), curvature (alias g2: curvature-continuous between planar faces along straight edges, `radius` the equivalent circular setback), variable (`radius` at the end nearest `start`, `radius2` at the other) or spline (the radius a clamped B-spline from `start`: `radius`, then `radii`, over `knots`). Matching ignores case."
-);
-keyword_param!(
-    /// `solid.fillet`'s `fit`.
-    FilletFitParam,
-    "fit",
-    &["exact", "reduce", "taper"],
-    "exact, reduce or taper",
-    "What a radius too large for the geometry around the edges does: exact (the default) refuses it naming the largest that fits, reduce reduces it where it doesn't fit, taper follows the room along straight edges between planar faces. reduce and taper take type: constant. Matching ignores case."
-);
-keyword_param!(
-    /// `solid.fillet`'s `corner`.
-    FilletCornerParam,
-    "corner",
-    &["rolling", "g2"],
-    "rolling or g2",
-    "What fills a corner where three rounded edges meet: rolling (the default), the rolling ball's sphere, or g2, a set-back patch meeting the rounds to the second order (type: constant, fit: exact only). Matching ignores case."
-);
-keyword_param!(
-    /// `solid.fillet`'s `turn`.
-    FilletTurnParam,
-    "turn",
-    &["mitre", "swept"],
-    "mitre or swept",
-    "How two rounds turn round a sharp, straight, convex side edge square to both on a plane (the rounds along a boss's base, at its upright edges): mitre (the default) runs them on to meet in a mitre; swept ends them at the side edge and fills the corner with their section revolved about it, a torus. swept takes type: constant, corner: rolling, no setbacks and fit: exact or reduce, and is refused with the reason where the rounds are unequal or the side edge is concave, curved or tangent. Matching ignores case."
-);
-
 /// How a feature combines with existing bodies, as `features::operation` reads it.
 #[derive(Clone, Debug, PartialEq)]
 pub struct OperationParam(pub Operation);

crates/engine/src/schema/unconverted.txt

@@ -55,6 +55,9 @@ doc.recover
 doc.recovery_discard
 doc.recovery_list
 document.inspect
+document.metadata
+document.metadata.remove
+document.metadata.set
 engine.commands
 explode.create
 explode.delete
@@ -75,6 +78,8 @@ frame.member
 frame.profile.insert
 frame.profile.list
 frame.profile.properties
+inspect.clearance
+inspect.compare
 inspect.interference
 inspect.measure
 inspect.parameter_sweep
@@ -102,6 +107,8 @@ material.delete
 material.edit
 material.inspect
 material.list
+material.properties.directional
+material.properties.validate
 mesh.convert
 motion.delete
 motion.export
@@ -180,6 +187,9 @@ render.settings.set
 render.shot.duplicate
 render.shot.remove
 render.shot.rename
+render.stage.backdrop
+render.stage.clear
+render.stage.ground
 render.start
 render.status
 select.clear
@@ -298,6 +308,7 @@ solid.coil
 solid.combine
 solid.draft
 solid.emboss
+solid.fillet
 solid.hole
 solid.loft
 solid.mirror
@@ -322,6 +333,7 @@ surface.extend
 surface.extrude
 surface.fair
 surface.loft
+surface.match
 surface.offset
 surface.patch
 surface.reverse_normal

crates/engine/src/tests.rs

@@ -3291,16 +3291,6 @@ fn unequal_chamfers_on_circular_rims() {
     assert!(rel(full - volume(&mut s), flipped) < 5e-3, "{} vs {flipped}", full - volume(&mut s));
 }
 
-/// A solid box top is not a rim: Lip says to Shell first (#10437).
-#[test]
-fn lip_on_a_solid_box_says_to_shell_first() {
-    let mut s = Session::default();
-    run(&mut s, "solid.box", json!({"length": 40, "width": 30, "height": 10}));
-    let err = s.execute("plastic.lip", &json!({"face": [20, 15, 10], "width": 1, "height": 2})).unwrap_err().to_string();
-    assert!(err.contains("Shell"), "{err}");
-    assert!(err.contains("rim") || err.contains("opening"), "{err}");
-}
-
 /// An enclosure built in the usual order: shell, bosses, then the lip on the rim.
 #[test]
 fn lip_after_boss() {

crates/engine/src/thread_tests.rs

@@ -512,127 +512,15 @@ fn shaft_on_collar() -> Session {
 }
 
 /// Rig 602, ladder 06/004: a thread on a shaft ran a pitch past both ends of its face, into the
-/// collar below as into the air above. It runs down to the shoulder and is trimmed at its plane
-/// (#11610): the collar keeps its whole π 8² 10, and the groove takes 25/P turns, each slice of
-/// the shaft along the axis losing the same.
+/// collar below as into the air above. At a shoulder it stops with its widest part clear of it:
+/// the collar keeps its whole π 8² 10, and the groove takes (25 - w)/P turns, w its half width
+/// (a square stop inside material takes exactly its length over P, the section being symmetric).
 #[test]
-fn a_thread_runs_down_to_a_shoulder_and_leaves_it_whole() {
+fn a_thread_stops_clear_of_a_shoulder() {
     let mut s = shaft_on_collar();
     run(&mut s, "solid.thread", json!({"face": [5, 0, 25], "designation": "M10", "modeled": true}));
-    let want = PI * 64.0 * 10.0 + PI * 25.0 * 25.0 - 25.0 / 1.5 * ext_turn(10.0, 1.5, 5.0);
-    let got = exact_volume(&s, "Part");
-    assert!((got - want).abs() < want * 2e-4, "{got} vs {want}");
-}
-
-/// The volume of a body's part between two heights along Z, within a quadrant of X and Y when
-/// given (their signs).
-fn volume_between(s: &Session, b: &str, (z0, z1): (f64, f64), quadrant: Option<(bool, bool)>) -> f64 {
-    let st = s.model.state();
-    let mut part = st.body(b).unwrap().body.clone();
-    let on = |origin: Vec3, normal: Vec3| solidcore_record::Plane::from_normal(origin, normal.normalized().unwrap()).unwrap();
-    let z = Vec3::new(0.0, 0.0, 1.0);
-    let mut cuts = vec![(on(Vec3::new(0.0, 0.0, z0), z), true), (on(Vec3::new(0.0, 0.0, z1), z), false)];
-    if let Some((x, y)) = quadrant {
-        cuts.push((on(Vec3::ZERO, Vec3::new(1.0, 0.0, 0.0)), x));
-        cuts.push((on(Vec3::ZERO, Vec3::new(0.0, 1.0, 0.0)), y));
-    }
-    for (plane, positive) in cuts {
-        part = solidcraft_kernel::half_space(&part, &plane, positive).unwrap().0.unwrap();
-    }
-    solidcraft_kernel::measure(&part).unwrap().volume
-}
-
-/// #11610: a boss standing on a flat plate. The groove reaches the plate at every angle of the
-/// last turn, wherever the helix lands on it (each height a different gap under a pitch): a thin
-/// slice on the plate has lost as much as any slice of the thread, a pitch's slice as much in each
-/// quadrant (the uncut block of the old stop sat in some of them), and the plate is whole. Before,
-/// the last pitch kept up to a whole turn's groove uncut.
-#[test]
-fn a_thread_reaches_a_flat_shoulder_at_every_angle_and_leaves_it_whole() {
-    let (p, t, turn) = (1.5, 6.0, ext_turn(10.0, 1.5, 5.0));
-    let per_mm = PI * 25.0 - turn / p;
-    for (h, extra) in [
-        (16.0, json!({})),
-        (16.45, json!({})),
-        (16.6, json!({})),
-        (16.9, json!({})),
-        (17.4, json!({})),
-        (16.0, json!({"hand": "left"})),
-        (16.6, json!({"tip": "both"})),
-    ] {
-        let mut s = Session::default();
-        run(&mut s, "solid.box", json!({"corner": [-20, -20, 0], "length": 40, "width": 40, "height": t, "body_name": "Part"}));
-        run(&mut s, "solid.cylinder", json!({"base": [0, 0, t], "radius": 5, "height": h, "operation": "join", "targets": ["Part"]}));
-        let mut ask = json!({"face": [5, 0, t + h / 2.0], "designation": "M10", "modeled": true});
-        if let (Some(a), Value::Object(e)) = (ask.as_object_mut(), &extra) {
-            a.extend(e.clone());
-        }
-        run(&mut s, "solid.thread", ask);
-        let name = format!("h {h} {extra}");
-        assert!(s.model.state().body("Part").unwrap().body.validity().is_empty(), "{name}");
-        let plate = volume_between(&s, "Part", (-1.0, t), None);
-        assert!((plate - 1600.0 * t).abs() < 1e-6 * 1600.0 * t, "{name}: the plate lost {} mm³", 1600.0 * t - plate);
-        let thin = volume_between(&s, "Part", (t, t + 0.1 * p), None);
-        let want = per_mm * 0.1 * p;
-        assert!((thin - want).abs() < want * 2e-3, "{name}: the slice on the plate is {thin}, not {want}");
-        for quadrant in [(true, true), (true, false), (false, true), (false, false)] {
-            let got = volume_between(&s, "Part", (t, t + p), Some(quadrant));
-            let want = per_mm * p / 4.0;
-            assert!((got - want).abs() < want * 2e-3, "{name}: {quadrant:?} of the last pitch is {got}, not {want}");
-        }
-    }
-}
-
-/// #11610: where a shoulder is not flat. A fillet or a chamfer at the shaft's base stays whole, the
-/// groove trimmed where the face ends above it. A shoulder that rises back along the face (a
-/// slanted plate, a boss on a round body) would be cut by a groove running to the plane of the
-/// face's lowest point, so the groove keeps its square stop there. Nothing here fails.
-#[test]
-fn a_thread_at_a_shoulder_that_is_not_flat_still_builds() {
-    let (p, turn) = (1.5, ext_turn(10.0, 1.5, 5.0));
-    let plate = |s: &mut Session| {
-        run(s, "solid.box", json!({"corner": [-20, -20, 0], "length": 40, "width": 40, "height": 6, "body_name": "Part"}));
-        run(s, "solid.cylinder", json!({"base": [0, 0, 6], "radius": 5, "height": 16, "operation": "join", "targets": ["Part"]}));
-    };
-    for finish in [("solid.fillet", json!({"edges": [[5, 0, 6]], "radius": 1})), ("solid.chamfer", json!({"edges": [[5, 0, 6]], "distance": 1}))] {
-        let mut s = Session::default();
-        plate(&mut s);
-        run(&mut s, finish.0, finish.1);
-        let (base, shaft) = (volume_between(&s, "Part", (-1.0, 7.0), None), exact_volume(&s, "Part"));
-        run(&mut s, "solid.thread", json!({"face": [5, 0, 15], "designation": "M10", "modeled": true}));
-        assert!(s.model.state().body("Part").unwrap().body.validity().is_empty(), "{}", finish.0);
-        let left = volume_between(&s, "Part", (-1.0, 7.0), None);
-        assert!((left - base).abs() < 1e-6 * base, "{}: the base lost {} mm³", finish.0, base - left);
-        let (got, want) = (exact_volume(&s, "Part"), shaft - 15.0 / p * turn);
-        assert!((got - want).abs() < want * 2e-4, "{}: {got} vs {want}", finish.0);
-    }
-    let rising = [
-        vec![("solid.cylinder", json!({"base": [0, 0, 0], "axis": [0.2, 0, 1], "radius": 20, "height": 6, "body_name": "Part"}))],
-        vec![("solid.cylinder", json!({"base": [0, -20, 0], "axis": [0, 1, 0], "radius": 10, "height": 40, "body_name": "Part"}))],
-    ];
-    for cmds in rising {
-        let mut s = Session::default();
-        for (c, ask) in cmds {
-            run(&mut s, c, ask);
-        }
-        run(&mut s, "solid.cylinder", json!({"base": [0, 0, 2], "radius": 5, "height": 26, "operation": "join", "targets": ["Part"]}));
-        let before = exact_volume(&s, "Part");
-        run(&mut s, "solid.thread", json!({"face": [5, 0, 20], "designation": "M10", "modeled": true}));
-        assert!(s.model.state().body("Part").unwrap().body.validity().is_empty());
-        assert!(exact_volume(&s, "Part") < before);
-    }
-}
-
-/// #11610: the trim is for a thread that runs the whole face. A length stopping short of the
-/// shoulder still stops there, however near.
-#[test]
-fn a_thread_of_some_length_stops_where_it_is_told_short_of_a_shoulder() {
     let (p, w) = (1.5, ext_half_width(10.0, 1.5));
-    let mut s = shaft_on_collar();
-    let before = exact_volume(&s, "Part");
-    run(&mut s, "solid.thread", json!({"face": [5, 0, 25], "designation": "M10", "length": 24.6, "modeled": true}));
-    // Its end is within half a pitch of the shoulder: the stop stays clear of it.
-    let want = before - (24.6f64).min(25.0 - w) / p * ext_turn(10.0, p, 5.0);
+    let want = PI * 64.0 * 10.0 + PI * 25.0 * 25.0 - (25.0 - w) / p * ext_turn(10.0, p, 5.0);
     let got = exact_volume(&s, "Part");
     assert!((got - want).abs() < want * 2e-4, "{got} vs {want}");
 }
@@ -640,7 +528,7 @@ fn a_thread_of_some_length_stops_where_it_is_told_short_of_a_shoulder() {
 /// A d10 boss (z t..t+16) on a plate t thick, threaded M10: the plate's top is the shoulder.
 /// The groove, with or without its runout, stays on the boss: the plate keeps all of itself
 /// (what lies below z = t after the boss is cut away), and without a runout the boss loses
-/// 16/P turns, as at a collar. The owner's bug: built as the app builds it (a rounded
+/// (16 - w)/P turns, as at a collar. The owner's bug: built as the app builds it (a rounded
 /// plate, a circle sketched on its top face and extruded with Join), a plate thinner than 1.5 P
 /// had no material where the free-end test looked (1 to 1.5 pitches past the face), so its top
 /// was taken for a free end and the overrun cut a pitch into it.
@@ -674,10 +562,10 @@ fn a_thread_on_a_boss_never_cuts_into_the_plate_below() {
         exact_volume(&s, "Body1")
     };
     let plate = |t: f64| (40.0 * 40.0 - (4.0 - PI) * 25.0) * t;
-    let p = 1.5;
+    let (p, w) = (1.5, ext_half_width(10.0, 1.5));
     for t in [6.0, 1.0] {
         let s = boss(t, json!({}));
-        let want = plate(t) + PI * 25.0 * 16.0 - 16.0 / p * ext_turn(10.0, p, 5.0);
+        let want = plate(t) + PI * 25.0 * 16.0 - (16.0 - w) / p * ext_turn(10.0, p, 5.0);
         let got = exact_volume(&s, "Body1");
         assert!((got - want).abs() < want * 2e-4, "plate {t}: {got} vs {want}");
         let left = plate_left(s, t);
@@ -1027,9 +915,10 @@ fn a_chamfered_tip_tapers_the_last_teeth() {
         "solid.thread",
         json!({"face": [5, 0, 25], "designation": "M10", "tip": "both", "chamfer_angle": "30 deg", "chamfer_depth": 0.5, "modeled": true}),
     );
+    let w = ext_half_width(10.0, 1.5);
     let rf = 4.5;
     let slope = 30f64.to_radians().tan();
-    let want = PI * 64.0 * 10.0 + m10_stock(10.0, 35.0, |z| 5f64.min(rf + (35.0 - z) * slope));
+    let want = PI * 64.0 * 10.0 + PI * 25.0 * w + m10_stock(10.0 + w, 35.0, |z| 5f64.min(rf + (35.0 - z) * slope));
     let got = exact_volume(&s, "Part");
     assert!((got - want).abs() < want * 1e-4, "{got} vs {want}");
     // Internal threads take a countersink instead.
@@ -1115,8 +1004,7 @@ fn a_runout_fades_the_groove_out_before_the_shoulder() {
     let (p, w) = (1.5, ext_half_width(10.0, 1.5));
     let root = 5.0 - 5.0 * p * 3f64.sqrt() / 16.0;
     let h = 5.0 - root + 0.05 * p;
-    // Trimmed at the bottom collar's plane, stopped clear of the top one for its runout.
-    let turns = (35.0 - 10.0 - w) / p;
+    let turns = (35.0 - 10.0 - 2.0 * w) / p;
     for (ease, r_out) in [(json!("short"), 1.25), (json!("standard"), 2.5), (json!("1 mm"), 1.0 / 1.5)] {
         let mut s = shaft_on_collar();
         run(&mut s, "solid.cylinder", json!({"base": [0, 0, 35], "radius": 8, "height": 10, "operation": "join", "targets": ["Part"]}));

crates/gpu/src/view.rs

@@ -4681,55 +4681,6 @@ mod tests {
 mod glass_tests {
     use super::*;
 
-    /// Intel UHD 620 OpenGL collapsed long line quads or expanded short ones across the
-    /// viewport with vector/scalar direction division (#8053). Exercise the actual
-    /// OpenGL shader rather than the native headless selector, which skips GL on Windows.
-    #[test]
-    fn opengl_draws_grid_lines_in_every_direction_and_at_a_point() {
-        let mut descriptor = crate::instance_descriptor_from_env();
-        descriptor.backends = wgpu::Backends::GL;
-        let instance = wgpu::Instance::new(descriptor);
-        let policy = crate::select::Policy::from_env().expect("a valid GPU test policy");
-        let Some((adapter, _)) = crate::select::pick_among(pollster::block_on(instance.enumerate_adapters(wgpu::Backends::GL)), policy) else {
-            eprintln!("skipped: no OpenGL adapter qualifies under {}", policy.name());
-            return;
-        };
-        eprintln!("OpenGL regression adapter: {:?}", adapter.get_info());
-        let (device, queue) = pollster::block_on(adapter.request_device(&wgpu::DeviceDescriptor {
-            required_limits: wgpu::Limits::downlevel_webgl2_defaults().using_resolution(adapter.limits()),
-            ..Default::default()
-        }))
-        .expect("the OpenGL adapter opens a device");
-        let window = GpuTarget { format: wgpu::TextureFormat::Rgba8Unorm, depth: None, samples: 1, tess: false, oit: false };
-        // Ten world units span 32 pixels here; a four-pixel line covers over 100 pixels.
-        // A point or a very short line stays a small cap, never a fill over the viewport.
-        let cases = [
-            ([-5.0, 0.0, 0.0], [5.0, 0.0, 0.0], 100..=256),
-            ([5.0, 0.0, 0.0], [-5.0, 0.0, 0.0], 100..=256),
-            ([0.0, -5.0, 0.0], [0.0, 5.0, 0.0], 100..=256),
-            ([0.0, 5.0, 0.0], [0.0, -5.0, 0.0], 100..=256),
-            ([-5.0, -5.0, 0.0], [5.0, 5.0, 0.0], 120..=256),
-            ([5.0, 5.0, 0.0], [-5.0, -5.0, 0.0], 120..=256),
-            ([-5.0, 5.0, 0.0], [5.0, -5.0, 0.0], 120..=256),
-            ([0.0; 3], [0.0; 3], 10..=64),
-            ([0.0; 3], [0.0001, 0.0001, 0.0], 10..=64),
-        ];
-        for offscreen in [false, true] {
-            let target = if offscreen { GpuTarget { depth: Some(wgpu::TextureFormat::Depth24PlusStencil8), ..window } } else { window };
-            let mut renderer = Renderer::with_window_target(&device, target, window, None);
-            for (index, (a, b, expected)) in cases.iter().enumerate() {
-                let mut scene = GpuScene::default();
-                let red = scene.color([255, 0, 0, 255]);
-                scene.under_line(*a, *b, red, 4.0);
-                let mut frame = test_frame(scene, 1.0);
-                frame.key = index as u64 + 1;
-                let pixels = render_frame(&mut renderer, &device, &queue, &frame, false);
-                let coloured = pixels.as_chunks::<4>().0.iter().filter(|p| p[0] > 240 && p[1] < 30 && p[2] < 30).count();
-                assert!(expected.contains(&coloured), "{a:?} to {b:?}, offscreen {offscreen}: {coloured} line pixels, expected {expected:?}");
-            }
-        }
-    }
-
     #[test]
     fn ground_shadow_does_not_require_order_independent_transparency() {
         let batch = || Some(Batch { parts: Vec::new(), chunk: TRI_SIZE * 6 });

crates/io/src/lib.rs

@@ -1296,7 +1296,6 @@ mod tests {
                 fit: Default::default(),
                 corner: Default::default(),
                 setbacks: Vec::new(),
-                turn: Default::default(),
                 tangent_chain: true,
             },
             None,
@@ -1419,7 +1418,6 @@ mod tests {
                 fit: Default::default(),
                 corner: Default::default(),
                 setbacks: Vec::new(),
-                turn: Default::default(),
                 tangent_chain: true,
             },
             None,

crates/kernel/src/blend.rs

@@ -234,40 +234,22 @@ fn closed(input: &Body, b: Body) -> Result<Body> {
     }
 }
 
-/// How two constant rounds of one radius turn round a sharp, straight, convex side edge square to
-/// both on a plane, such as the rounds along a boss's base at its upright edges.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
-pub enum FilletTurn {
-    /// The rounds run on to where they cross and meet in a mitre.
-    #[default]
-    Mitre,
-    /// The rounds end at the side edge and the corner is their section revolved about it, a
-    /// torus tangent to both. Refused where it is not built (unequal or variable rounds, a
-    /// concave, curved or tangent side edge, a corner of four edges), with the reason.
-    Swept,
-}
-
 /// Constant-radius fillet of the edges nearest to the given points. A radius too large for the
 /// faces around the edges is refused with [`KernelError::TooLarge`] ([`fillet_max`] finds the
 /// largest that works).
 pub fn fillet(body: &Body, edges: &[Vec3], radius: f64) -> Result<Body> {
-    fillet_turning(body, edges, radius, FilletTurn::Mitre)
-}
-
-/// [`fillet`], its rounds turning at side edges as `turn` says.
-fn fillet_turning(body: &Body, edges: &[Vec3], radius: f64, turn: FilletTurn) -> Result<Body> {
     let _span = solidcraft_profile::span("kernel", "fillet");
     body.require_brep("fillet")?;
-    crate::blend_smlib::fillet(body, edges, radius, turn).and_then(|b| closed(body, b))
+    crate::blend_smlib::fillet(body, edges, radius).and_then(|b| closed(body, b))
 }
 
-/// [`fillet`], its rounds turning at side edges as `turn` says, with the picks whose edges are
-/// gone: where some of the rounds overflow their faces, those are built first, and a picked edge
-/// one of them removes whole is not rounded (the others round what is left of their edges).
-pub fn fillet_removing(body: &Body, edges: &[Vec3], radius: f64, turn: FilletTurn) -> Result<(Body, Vec<Vec3>)> {
+/// [`fillet`], with the picks whose edges are gone: where some of the rounds overflow their
+/// faces, those are built first, and a picked edge one of them removes whole is not rounded (the
+/// others round what is left of their edges).
+pub fn fillet_removing(body: &Body, edges: &[Vec3], radius: f64) -> Result<(Body, Vec<Vec3>)> {
     let _span = solidcraft_profile::span("kernel", "fillet");
     body.require_brep("fillet")?;
-    let (b, gone) = crate::blend_smlib::fillet_removing(body, edges, radius, turn)?;
+    let (b, gone) = crate::blend_smlib::fillet_removing(body, edges, radius)?;
     Ok((closed(body, b)?, gone))
 }
 
@@ -533,11 +515,10 @@ fn radius_step(radius: f64) -> f64 {
 /// them (a refusal of a fillet feature's exact fit runs it to name the largest that fits, and
 /// so does `fit: reduce`). Only a refusal as too large
 /// ([`KernelError::TooLarge`]) narrows the search: any other failure of a candidate is the
-/// search's error, since a smaller radius would not be the largest that fits. The rounds turn at
-/// side edges as `turn` says.
-pub fn fillet_max(body: &Body, edges: &[Vec3], radius: f64, turn: FilletTurn) -> Result<Option<(f64, Body)>> {
+/// search's error, since a smaller radius would not be the largest that fits.
+pub fn fillet_max(body: &Body, edges: &[Vec3], radius: f64) -> Result<Option<(f64, Body)>> {
     let _span = solidcraft_profile::span("kernel", "fillet_max");
-    largest_that_fits(radius, |r| fillet_turning(body, edges, r, turn))
+    largest_that_fits(radius, |r| fillet(body, edges, r))
 }
 
 /// [`fillet_max`] for an equal-distance chamfer of these edges: the largest distance below
@@ -585,21 +566,21 @@ fn largest_that_fits(size: f64, blend: impl Fn(f64) -> Result<Body>) -> Result<O
 /// each reduced to fit, are too large together, or there are too many to search (each search is
 /// up to 16 fillets, and this runs in the live preview). Any failure other than a refusal as too
 /// large is the error.
-pub fn fillet_max_each(body: &Body, edges: &[Vec3], radius: f64, turn: FilletTurn) -> Result<Option<(Vec<f64>, Body)>> {
+pub fn fillet_max_each(body: &Body, edges: &[Vec3], radius: f64) -> Result<Option<(Vec<f64>, Body)>> {
     let _span = solidcraft_profile::span("kernel", "fillet_max_each");
     const MAX_GROUPS: usize = 8;
     const MAX_SEARCHES: usize = 2;
-    let one = || -> Result<Option<(Vec<f64>, Body)>> { Ok(fillet_max(body, edges, radius, turn)?.map(|(r, b)| (vec![r; edges.len()], b))) };
+    let one = || -> Result<Option<(Vec<f64>, Body)>> { Ok(fillet_max(body, edges, radius)?.map(|(r, b)| (vec![r; edges.len()], b))) };
     let Some(groups) = interacting_groups(body, edges).filter(|g| g.len() > 1 && g.len() <= MAX_GROUPS) else { return one() };
     let mut radii = vec![radius; edges.len()];
     let mut searches = 0;
     for g in &groups {
         let pts: Vec<Vec3> = g.iter().filter_map(|i| edges.get(*i).copied()).collect();
-        let r = match fillet_turning(body, &pts, radius, turn) {
+        let r = match fillet(body, &pts, radius) {
             Ok(_) => continue,
             Err(KernelError::TooLarge(_)) if searches < MAX_SEARCHES => {
                 searches += 1;
-                match fillet_max(body, &pts, radius, turn)? {
+                match fillet_max(body, &pts, radius)? {
                     Some((r, _)) => r,
                     None => return one(),
                 }
@@ -613,7 +594,7 @@ pub fn fillet_max_each(body: &Body, edges: &[Vec3], radius: f64, turn: FilletTur
             }
         }
     }
-    match fillet_each(body, edges, &radii, turn) {
+    match fillet_each(body, edges, &radii) {
         Ok(b) => Ok(Some((radii, b))),
         Err(KernelError::TooLarge(_)) => one(),
         Err(e) => Err(e),
@@ -622,16 +603,16 @@ pub fn fillet_max_each(body: &Body, edges: &[Vec3], radius: f64, turn: FilletTur
 
 /// The fillet of each edge at its own radius (`radii` in `edges`' order), all in one SMLib
 /// blend.
-pub fn fillet_each(body: &Body, edges: &[Vec3], radii: &[f64], turn: FilletTurn) -> Result<Body> {
+pub fn fillet_each(body: &Body, edges: &[Vec3], radii: &[f64]) -> Result<Body> {
     let _span = solidcraft_profile::span("kernel", "fillet_each");
     if radii.len() != edges.len() {
         return Err(KernelError::Invalid("one radius per edge".into()));
     }
     if let Some(r) = radii.first().filter(|r| radii.iter().all(|x| x.to_bits() == r.to_bits())) {
-        return fillet_turning(body, edges, *r, turn);
+        return fillet(body, edges, *r);
     }
     body.require_brep("fillet")?;
-    crate::blend_smlib::fillet_each(body, edges, radii, turn).and_then(|b| closed(body, b))
+    crate::blend_smlib::fillet_each(body, edges, radii).and_then(|b| closed(body, b))
 }
 
 /// The points' edges (each the edge a blend's pick there takes) grouped where they share a face
@@ -1618,7 +1599,7 @@ mod tests {
         assert!(matches!(e, KernelError::TooLarge(_)), "{e}");
         let e = e.to_string();
         assert!(e.contains("into the hollow at (0.000, 30.000, 40.000) and open the part"), "{e}");
-        let (largest, _) = fillet_max(&case, &[top], 7.0, FilletTurn::Mitre).unwrap().unwrap();
+        let (largest, _) = fillet_max(&case, &[top], 7.0).unwrap().unwrap();
         assert!((largest - 6.828).abs() < 1e-9, "{largest}");
 
         // Just short of the corner it rounds, its whole section along the 104.
@@ -1632,8 +1613,8 @@ mod tests {
         // inner R7's arc (centre (23, 33)) only at sqrt2 (r - 9) + 7 = r, r = 13.83.
         let inside = Vec3::new(0.0, 30.0, 40.0);
         assert!(fillet(&case, &[top, inside], 7.0).is_ok());
-        assert!(fillet_each(&case, &[top, inside], &[13.8, 7.0], FilletTurn::Mitre).is_ok());
-        let e = fillet_each(&case, &[top, inside], &[13.9, 7.0], FilletTurn::Mitre).unwrap_err().to_string();
+        assert!(fillet_each(&case, &[top, inside], &[13.8, 7.0]).is_ok());
+        let e = fillet_each(&case, &[top, inside], &[13.9, 7.0]).unwrap_err().to_string();
         assert!(e.contains("into the hollow at"), "{e}");
     }
 

crates/kernel/src/blend_corner.rs

@@ -261,7 +261,7 @@ pub fn fillet_radii(body: &Body, edges: &[(Vec3, f64)]) -> Result<Body> {
         return Err(KernelError::Invalid("fillet size must be positive".into()));
     }
     let (points, radii): (Vec<Vec3>, Vec<f64>) = edges.iter().copied().unzip();
-    crate::blend_smlib::fillet_each(body, &points, &radii, crate::FilletTurn::Mitre)
+    crate::blend_smlib::fillet_each(body, &points, &radii)
 }
 
 #[cfg(test)]

crates/kernel/src/blend_smlib.rs

@@ -17,7 +17,7 @@ use solidcore_record::Vec3;
 
 use crate::blend_variable::RadiusSpline;
 use crate::body::Body;
-use crate::{FilletTurn, KernelError, Result};
+use crate::{KernelError, Result};
 
 /// What SMLib cannot build yet.
 pub(crate) fn unsupported(what: &str) -> KernelError {
@@ -25,24 +25,22 @@ pub(crate) fn unsupported(what: &str) -> KernelError {
 }
 
 /// A constant-radius round of the edges nearest `edges` ([`crate::fillet`]).
-/// The rounds turn at side edges as `turn` says.
-pub(crate) fn fillet(body: &Body, edges: &[Vec3], radius: f64, turn: FilletTurn) -> Result<Body> {
-    imp::blend(body, "fillet", Kind::Round(turn), edges, &vec![radius; edges.len()])
+pub(crate) fn fillet(body: &Body, edges: &[Vec3], radius: f64) -> Result<Body> {
+    imp::blend(body, "fillet", Kind::Round, edges, &vec![radius; edges.len()])
 }
 
 /// [`fillet`], with the picks whose edges a larger, overflowing round removed whole.
-pub(crate) fn fillet_removing(body: &Body, edges: &[Vec3], radius: f64, turn: FilletTurn) -> Result<(Body, Vec<Vec3>)> {
-    let (b, dropped) = imp::blend_dropping(body, "fillet", Kind::Round(turn), edges, &vec![radius; edges.len()])?;
+pub(crate) fn fillet_removing(body: &Body, edges: &[Vec3], radius: f64) -> Result<(Body, Vec<Vec3>)> {
+    let (b, dropped) = imp::blend_dropping(body, "fillet", Kind::Round, edges, &vec![radius; edges.len()])?;
     Ok((b, edges.iter().zip(dropped).filter(|(_, d)| *d).map(|(p, _)| *p).collect()))
 }
 
-/// Each edge rounded at its own radius ([`crate::fillet_each`]), turning at side edges as `turn`
-/// says.
-pub(crate) fn fillet_each(body: &Body, edges: &[Vec3], radii: &[f64], turn: FilletTurn) -> Result<Body> {
+/// Each edge rounded at its own radius ([`crate::fillet_each`]).
+pub(crate) fn fillet_each(body: &Body, edges: &[Vec3], radii: &[f64]) -> Result<Body> {
     if radii.len() != edges.len() {
         return Err(KernelError::Invalid("one radius per edge".into()));
     }
-    imp::blend(body, "fillet", Kind::Round(turn), edges, radii)
+    imp::blend(body, "fillet", Kind::Round, edges, radii)
 }
 
 /// A constant-radius round whose corners at `setbacks` (a point at each corner's vertex, and the
@@ -65,7 +63,7 @@ pub(crate) struct OpenCorners {
 /// that would fill each corner, for the caller to fill.
 /// `curvature`: the rounds' sections are curvature-continuous ([`fillet_g2`]), else circular.
 pub(crate) fn fillet_setback_open(body: &Body, edges: &[Vec3], radius: f64, setbacks: &[(Vec3, f64)], curvature: bool) -> Result<OpenCorners> {
-    let kind = if curvature { Kind::Curvature } else { Kind::Round(FilletTurn::Mitre) };
+    let kind = if curvature { Kind::Curvature } else { Kind::Round };
     imp::blend_setback_open(body, kind, edges, &vec![radius; edges.len()], setbacks)
 }
 
@@ -106,8 +104,7 @@ pub(crate) fn picked_edges(body: &Body, picks: &[Vec3]) -> Result<(Vec<usize>, V
 
 #[derive(Clone, Copy)]
 enum Kind {
-    /// Constant-radius rounds, turning at side edges as the [`FilletTurn`] says.
-    Round(FilletTurn),
+    Round,
     Curvature,
     Chord,
     Chamfer,
@@ -118,7 +115,7 @@ mod imp {
     use std::collections::BTreeSet;
 
     use solidcore_record::Vec3;
-    use solidcraft_smlib::{Blend, Brep, ChamferSecond, CheckLevel, Error as SmError, Turn};
+    use solidcraft_smlib::{Blend, Brep, ChamferSecond, CheckLevel, Error as SmError};
 
     use super::Kind;
     use crate::blend_variable::RadiusSpline;
@@ -228,21 +225,13 @@ mod imp {
     /// SMLib's blend of each kind.
     fn blend_kind(kind: Kind) -> Blend {
         match kind {
-            Kind::Round(_) => Blend::Round,
+            Kind::Round => Blend::Round,
             Kind::Curvature => Blend::Curvature,
             Kind::Chord => Blend::Chord,
             Kind::Chamfer => Blend::Chamfer,
         }
     }
 
-    /// SMLib's turn of each kind of turn.
-    fn smlib_turn(turn: crate::FilletTurn) -> Turn {
-        match turn {
-            crate::FilletTurn::Mitre => Turn::Mitre,
-            crate::FilletTurn::Swept => Turn::Swept,
-        }
-    }
-
     pub(super) fn blend(body: &Body, what: &str, kind: Kind, edges: &[Vec3], sizes: &[f64]) -> Result<Body> {
         blend_dropping(body, what, kind, edges, sizes).map(|(b, _)| b)
     }
@@ -254,22 +243,21 @@ mod imp {
         sizes_ok(what, sizes)?;
         let picked = resolve(body, edges)?;
         let next = crate::blend::unfinished_chain(body, edges, &picked.edges, &picked.hidden)?;
-        if matches!(kind, Kind::Round(_)) {
+        if matches!(kind, Kind::Round) {
             crate::blend::rounds_too_small(body, edges, &picked.edges, sizes)?;
             crate::blend::rounds_into_hollow(body, edges, &picked.edges, sizes)?;
         }
         let tol = pick_tolerance(body);
-        let Kind::Round(turn) = kind else {
+        let Kind::Round = kind else {
             let kind = blend_kind(kind);
-            return run_with(body, what, &picked.edges, &[], |b| b.blend_dropping(kind, Turn::Mitre, &picked.points, sizes, tol))
+            return run_with(body, what, &picked.edges, &[], |b| b.blend_dropping(kind, &picked.points, sizes, tol))
                 .map(|(out, dropped, _)| (out, dropped))
                 .map_err(|e| crate::blend::with_continuation(e, next));
         };
         // Constant-radius rounds: the body keeps what they were made on, and a later round at a
         // corner where they meet blends them again with it (crate::blend_corner).
-        let turn = smlib_turn(turn);
         let out = match crate::blend_corner::later_corners(body, &picked.edges, sizes)? {
-            Some((later, new)) => reblend(body, what, &later, turn).map(|(b, dropped_new)| {
+            Some((later, new)) => reblend(body, what, &later).map(|(b, dropped_new)| {
                 // A picked seam has no round of its own: only the new edges can be removed.
                 let dropped = picked
                     .edges
@@ -278,7 +266,7 @@ mod imp {
                     .collect();
                 (b.with_rounds(body, new), dropped)
             }),
-            None => run_with(body, what, &picked.edges, &[], |b| b.blend_dropping(Blend::Round, turn, &picked.points, sizes, tol))
+            None => run_with(body, what, &picked.edges, &[], |b| b.blend_dropping(Blend::Round, &picked.points, sizes, tol))
                 .map(|(out, dropped, _)| (out.with_rounds(body, picked.edges.iter().copied().zip(sizes.iter().copied()).collect()), dropped)),
         };
         out.map_err(|e| crate::blend::with_continuation(e, next))
@@ -287,9 +275,8 @@ mod imp {
     /// The blend `later` makes of its base, every round from the earliest meeting the new edges'
     /// corners on and the new edges in one, with its history over `body`, the body the later
     /// round was given ([`crate::blend_corner::rebase`]), and whether each new edge (in
-    /// `later`'s order) was removed whole by a larger, overflowing round. The rounds turn at side
-    /// edges as `turn` says.
-    fn reblend(body: &Body, what: &str, later: &crate::blend_corner::Later, turn: Turn) -> Result<(Body, Vec<bool>)> {
+    /// `later`'s order) was removed whole by a larger, overflowing round.
+    fn reblend(body: &Body, what: &str, later: &crate::blend_corner::Later) -> Result<(Body, Vec<bool>)> {
         let base = &later.base;
         let mesh = base.mesh(&crate::MeshTolerance::chord((base.size() * 2e-3).max(1e-3)))?;
         let mut indices = Vec::with_capacity(later.edges.len());
@@ -304,7 +291,7 @@ mod imp {
         }
         sizes_ok(what, &radii)?;
         let tol = pick_tolerance(base);
-        let (out, dropped, _) = run_with(base, what, &indices, &[], |b| b.blend_dropping(Blend::Round, turn, &points, &radii, tol))?;
+        let (out, dropped, _) = run_with(base, what, &indices, &[], |b| b.blend_dropping(Blend::Round, &points, &radii, tol))?;
         // The new edges are the last of `later.edges`.
         let dropped_new = dropped.get(dropped.len().saturating_sub(later.new_count())..).map(<[bool]>::to_vec).unwrap_or_default();
         let history = out.history().and_then(|h| crate::blend_corner::rebase(h, later, body));
@@ -459,11 +446,6 @@ mod imp {
                      run on tangentially into each other, or meet in a way no blend corner builds)"
                 )),
                 SmError::NoRoom => KernelError::TooLarge(format!("the {what} is larger than the faces beside its edges allow")),
-                // Not a size a smaller radius fixes: solidcore builds no swept turn there.
-                SmError::TurnRefused { why, at, .. } => {
-                    let at = at.map(|[x, y, z]| format!(" at ({x:.3}, {y:.3}, {z:.3})")).unwrap_or_default();
-                    KernelError::Invalid(format!("the {what}'s swept corner{at} is not built: {why}"))
-                }
                 SmError::TooLarge { size, kind, at, why } => {
                     let mut beside = match at {
                         Some([x, y, z]) => format!(", at the edge at ({x:.3}, {y:.3}, {z:.3})"),
@@ -612,7 +594,7 @@ mod tests {
     fn a_round_loses_its_corner_and_its_face_comes_from_the_edge() {
         let b = cube();
         let at = Vec3::new(10.0, 20.0, 20.0);
-        let r = imp::blend(&b, "fillet", Kind::Round(FilletTurn::Mitre), &[at], &[2.0]).unwrap();
+        let r = imp::blend(&b, "fillet", Kind::Round, &[at], &[2.0]).unwrap();
         assert!(near(volume(&r), 8000.0 - QUARTER * 4.0 * 20.0), "{}", volume(&r));
         assert_eq!(r.face_count(), 7);
         let h = r.history().expect("a history");
@@ -626,8 +608,8 @@ mod tests {
         // (20, 20, 10) is on the vertical edge only; (20, 20, 20) is a corner of three edges, which
         // the body's own order resolves, never left to SMLib.
         let b = cube();
-        assert!(imp::blend(&b, "fillet", Kind::Round(FilletTurn::Mitre), &[Vec3::new(20.0, 20.0, 20.0)], &[1.0]).is_ok());
-        assert!(imp::blend(&b, "fillet", Kind::Round(FilletTurn::Mitre), &[Vec3::new(60.0, 60.0, 60.0)], &[1.0]).is_err());
+        assert!(imp::blend(&b, "fillet", Kind::Round, &[Vec3::new(20.0, 20.0, 20.0)], &[1.0]).is_ok());
+        assert!(imp::blend(&b, "fillet", Kind::Round, &[Vec3::new(60.0, 60.0, 60.0)], &[1.0]).is_err());
     }
 
     /// A ball's rim on a block's back face, tangent to the back face's bottom edge at (2.5, 22.5, 0).
@@ -695,7 +677,7 @@ mod tests {
     fn each_edge_takes_its_own_size() {
         let b = cube();
         let picks = [Vec3::new(10.0, 20.0, 20.0), Vec3::new(10.0, 0.0, 20.0)];
-        let r = imp::blend(&b, "fillet", Kind::Round(FilletTurn::Mitre), &picks, &[2.0, 3.0]).unwrap();
+        let r = imp::blend(&b, "fillet", Kind::Round, &picks, &[2.0, 3.0]).unwrap();
         assert!(near(volume(&r), 8000.0 - QUARTER * 13.0 * 20.0), "{}", volume(&r));
         let c = imp::blend(&b, "chamfer", Kind::Chamfer, &picks, &[2.0, 3.0]).unwrap();
         assert!(near(volume(&c), 8000.0 - 0.5 * 13.0 * 20.0), "{}", volume(&c));
@@ -768,9 +750,9 @@ mod tests {
         // A radius law down to zero inside the edge would pinch the round to a point.
         let pinch = RadiusSpline { degree: 1, knots: vec![0.0, 0.0, 0.5, 1.0, 1.0], radii: vec![4.0, 0.0, 4.0] };
         assert!(imp::variable(&b, Vec3::new(10.0, 20.0, 20.0), Vec3::new(0.0, 20.0, 20.0), &pinch).is_err());
-        assert!(imp::blend(&b, "fillet", Kind::Round(FilletTurn::Mitre), &[Vec3::new(10.0, 20.0, 20.0)], &[f64::NAN]).is_err());
-        assert!(imp::blend(&b, "fillet", Kind::Round(FilletTurn::Mitre), &[Vec3::new(f64::NAN, 20.0, 20.0)], &[1.0]).is_err());
-        assert!(imp::blend(&b, "fillet", Kind::Round(FilletTurn::Mitre), &[], &[]).is_err());
+        assert!(imp::blend(&b, "fillet", Kind::Round, &[Vec3::new(10.0, 20.0, 20.0)], &[f64::NAN]).is_err());
+        assert!(imp::blend(&b, "fillet", Kind::Round, &[Vec3::new(f64::NAN, 20.0, 20.0)], &[1.0]).is_err());
+        assert!(imp::blend(&b, "fillet", Kind::Round, &[], &[]).is_err());
     }
 
     /// A smooth edge (a round's seam with the face it runs into) has nothing to round: refused
@@ -782,30 +764,30 @@ mod tests {
     #[test]
     fn smooth_edges_and_unfinished_tangent_chains_are_refused_saying_why() {
         let b = cube();
-        let rounded = fillet(&b, &[Vec3::new(10.0, 20.0, 20.0)], 3.0, FilletTurn::Mitre).unwrap();
+        let rounded = fillet(&b, &[Vec3::new(10.0, 20.0, 20.0)], 3.0).unwrap();
         // the seam where the r3 round meets the top, 3 in from the old edge
-        let seam = imp::blend(&rounded, "fillet", Kind::Round(FilletTurn::Mitre), &[Vec3::new(10.0, 17.0, 20.0)], &[1.0]).unwrap_err().to_string();
+        let seam = imp::blend(&rounded, "fillet", Kind::Round, &[Vec3::new(10.0, 17.0, 20.0)], &[1.0]).unwrap_err().to_string();
         assert!(seam.contains("is smooth: its faces meet tangentially, so there is nothing to round"), "{seam}");
         // the end face's top edge runs on tangentially into the round's end arc: its r1 round
         // goes on along y through the r3 round until that drops below it, at y = 17 + sqrt(5)
         // (the rig case's closed form: 8000 - 20 (9 - 9 pi/4) - 17 (1 - pi/4) - 0.218236)
         let top = Vec3::new(0.0, 8.0, 20.0);
-        let alone = fillet(&rounded, &[top], 1.0, FilletTurn::Mitre).unwrap();
+        let alone = fillet(&rounded, &[top], 1.0).unwrap();
         assert!((volume(&alone) - 7957.505202).abs() < 1e-3, "{}", volume(&alone));
         let chain = crate::tangent_chain(&rounded, &[top]).unwrap();
         assert!(chain.len() > 1, "{chain:?}");
-        let whole = fillet(&rounded, &chain, 1.0, FilletTurn::Mitre).unwrap();
+        let whole = fillet(&rounded, &chain, 1.0).unwrap();
         assert!(volume(&whole) < volume(&rounded));
 
         // r5 and r3 on two top edges at a corner, then r2 on the vertical edge under them: it
         // runs on up the r5 round's end arc, and SMLib ends it there
         let b = box_solid(Vec3::new(0.0, 0.0, 0.0), Vec3::new(60.0, 40.0, 20.0)).unwrap();
-        let b = fillet(&b, &[Vec3::new(30.0, 40.0, 20.0)], 5.0, FilletTurn::Mitre).unwrap();
-        let b = fillet(&b, &[Vec3::new(60.0, 20.0, 20.0)], 3.0, FilletTurn::Mitre).unwrap();
+        let b = fillet(&b, &[Vec3::new(30.0, 40.0, 20.0)], 5.0).unwrap();
+        let b = fillet(&b, &[Vec3::new(60.0, 20.0, 20.0)], 3.0).unwrap();
         let vertical = Vec3::new(60.0, 40.0, 8.0);
         let chain = crate::tangent_chain(&b, &[vertical]).unwrap();
         assert!(chain.len() > 1, "{chain:?}");
-        let run_on = fillet(&b, &[vertical], 2.0, FilletTurn::Mitre).unwrap();
+        let run_on = fillet(&b, &[vertical], 2.0).unwrap();
         assert!(volume(&run_on) < volume(&b));
     }
 }

crates/kernel/src/build.rs

@@ -68,32 +68,20 @@ pub(crate) fn frame_ok(plane: &Plane) -> bool {
 /// Extrude each region from `start` to `end` along the plane normal (offsets in mm, `end > start`).
 pub fn extrude(plane: &Plane, regions: &[Region2], start: f64, end: f64) -> Result<Vec<Body>> {
     let _span = solidcraft_profile::span("kernel", "extrude");
-    extrude_with(plane, regions, start, end, None)
+    extrude_with(plane, regions, start, end, false)
 }
 
 /// [`extrude`] with each run of profile lines that continue one another in a straight line (a side
 /// drawn in two pieces, a mirrored half meeting its mirror image) swept into one side face over
-/// all its pieces, rather than coplanar faces with an edge between them (#1788), and each run of
-/// free-form segments (conics, Béziers) that `one_curve` says are pieces of one curve (an
-/// ellipse's four quarters, a spline's spans) swept as that one curve into one wall. The side's
+/// all its pieces, rather than coplanar faces with an edge between them (#1788). The side's
 /// history lists every piece under it. For the Extrude feature; other builders (sheet metal's
 /// flat pattern, tools) keep a face per segment.
-pub fn extrude_whole_sides(plane: &Plane, regions: &[Region2], start: f64, end: f64, one_curve: &dyn Fn(&Seg2, &Seg2) -> bool) -> Result<Vec<Body>> {
+pub fn extrude_whole_sides(plane: &Plane, regions: &[Region2], start: f64, end: f64) -> Result<Vec<Body>> {
     let _span = solidcraft_profile::span("kernel", "extrude_whole_sides");
-    extrude_with(plane, regions, start, end, Some(one_curve))
+    extrude_with(plane, regions, start, end, true)
 }
 
-/// The degree of a free-form segment (a conic or a Bézier), none for a line or an arc.
-fn free_form_degree(s: &Seg2) -> Option<u8> {
-    match *s {
-        Seg2::Conic { .. } => Some(2),
-        Seg2::Cubic { .. } => Some(3),
-        Seg2::Bezier { n, .. } => Some(n),
-        Seg2::Line { .. } | Seg2::Arc { .. } => None,
-    }
-}
-
-fn extrude_with(plane: &Plane, regions: &[Region2], start: f64, end: f64, one_curve: Option<&dyn Fn(&Seg2, &Seg2) -> bool>) -> Result<Vec<Body>> {
+fn extrude_with(plane: &Plane, regions: &[Region2], start: f64, end: f64, whole_sides: bool) -> Result<Vec<Body>> {
     if !frame_ok(plane) {
         return Err(KernelError::Invalid("extrude frame is not finite and orthonormal".into()));
     }
@@ -110,26 +98,8 @@ fn extrude_with(plane: &Plane, regions: &[Region2], start: f64, end: f64, one_cu
         .map(|r| {
             region_ok(r)?;
             let pieces = oriented(r)?;
-            let Some(one_curve) = one_curve else {
-                return crate::smlib_sweeps::extrude(plane, &crate::smlib_sweeps::region_pieces(&pieces, &pieces), Some(r), lo, hi - lo, 1.0, None);
-            };
-            // Pieces of one curve: free-form segments of one degree that the caller says are one
-            // curve. Each loop starts where such a run starts, so no run wraps round its end.
-            let joins = |s: &Seg2, t: &Seg2| free_form_degree(s).is_some_and(|d| free_form_degree(t) == Some(d)) && one_curve(s, t);
-            let numbered = pieces.map_loops(|l| l.merged_lines(continues_straight).starting_a_run(joins));
-            let mut swept = crate::smlib_sweeps::region_pieces(&numbered, &pieces);
-            let mut k = 0;
-            for l in numbered.loops() {
-                for i in 1..l.lp.segs.len() {
-                    if let (Some(s), Some(t)) = (l.lp.segs.get(i - 1), l.lp.segs.get(i))
-                        && let Some(x) = swept.get_mut(k + i)
-                    {
-                        x.joins_previous = joins(s, t);
-                    }
-                }
-                k += l.lp.segs.len();
-            }
-            crate::smlib_sweeps::extrude(plane, &swept, Some(r), lo, hi - lo, 1.0, None)
+            let numbered = if whole_sides { pieces.map_loops(|l| l.merged_lines(continues_straight)) } else { pieces.clone() };
+            crate::smlib_sweeps::extrude(plane, &crate::smlib_sweeps::region_pieces(&numbered, &pieces), Some(r), lo, hi - lo, 1.0, None)
         })
         .collect()
 }

crates/kernel/src/history_tests.rs

@@ -256,7 +256,7 @@ fn collinear_profile_lines_extrude_into_one_side_face() {
     let region = Region2 { outer: Loop2::polygon(&pts), holes: vec![] };
     // Plain `extrude` keeps a face per segment (sheet metal's flat pattern relies on it).
     assert_eq!(crate::extrude(&Plane::XY, std::slice::from_ref(&region), 0.0, 5.0).unwrap()[0].face_count(), 7);
-    let body = crate::extrude_whole_sides(&Plane::XY, &[region], 0.0, 5.0, &|_, _| false).unwrap().pop().unwrap();
+    let body = crate::extrude_whole_sides(&Plane::XY, &[region], 0.0, 5.0).unwrap().pop().unwrap();
     assert_eq!(body.face_count(), 6, "a box has six faces");
     assert!((crate::measure(&body).unwrap().volume - 1000.0).abs() < 1e-9);
     let h = body.history().unwrap();
@@ -276,75 +276,10 @@ fn collinear_profile_lines_extrude_into_one_side_face() {
     );
     // A corner is not a straight run: an L-shaped step keeps its faces.
     let step = [(0.0, 0.0), (10.0, 0.0), (10.0, 5.0), (20.0, 5.0), (20.0, 10.0), (0.0, 10.0)].map(|(x, y)| Vec2::new(x, y));
-    let body = crate::extrude_whole_sides(&Plane::XY, &[Region2 { outer: Loop2::polygon(&step), holes: vec![] }], 0.0, 5.0, &|_, _| false)
-        .unwrap()
-        .pop()
-        .unwrap();
+    let body = crate::extrude_whole_sides(&Plane::XY, &[Region2 { outer: Loop2::polygon(&step), holes: vec![] }], 0.0, 5.0).unwrap().pop().unwrap();
     assert_eq!(body.face_count(), 8);
 }
 
-/// The pieces of one ellipse (four conic quarters) or one spline (its cubic spans) that the
-/// caller calls one curve sweep into one wall generated by all of them, the same solid as a face
-/// per piece: the ellipse's volume is π a b h. Pieces not called one curve keep a face each.
-#[test]
-fn pieces_of_one_curve_extrude_into_one_wall() {
-    use solidcore_record::{Loop2, Plane, Region2, Seg2, Vec2};
-    let v = Vec2::new;
-    let (c, u, w) = (v(1.0, 2.0), v(10.0, 0.0), v(0.0, 5.0));
-    let corners = [c + u, c + w, c - u, c - w];
-    let ellipse: Vec<Seg2> = (0..4)
-        .map(|i| {
-            let (a, b) = (corners[i], corners[(i + 1) % 4]);
-            Seg2::Conic { a, apex: a + b - c, b, w: std::f64::consts::FRAC_1_SQRT_2 }
-        })
-        .collect();
-    // A cubic spline's three spans (C2 at its joints, on unequal knot spans), closed by lines.
-    let spline = vec![
-        Seg2::Cubic {
-            p0: v(0.0, 0.0),
-            p1: v(3.478154619431441, -1.9606112245268097),
-            p2: v(6.956309238862882, -3.921222449053619),
-            p3: v(10.0, -3.0),
-        },
-        Seg2::Cubic {
-            p0: v(10.0, -3.0),
-            p1: v(13.55861013478923, -1.9229288384169465),
-            p2: v(16.52332013301099, 3.0935296384274267),
-            p3: v(20.0, 4.0),
-        },
-        Seg2::Cubic {
-            p0: v(20.0, 4.0),
-            p1: v(23.067612954017893, 4.799814860722723),
-            p2: v(26.533806477008945, 2.3999074303613614),
-            p3: v(30.0, 0.0),
-        },
-        Seg2::Line { a: v(30.0, 0.0), b: v(30.0, 20.0) },
-        Seg2::Line { a: v(30.0, 20.0), b: v(0.0, 20.0) },
-        Seg2::Line { a: v(0.0, 20.0), b: v(0.0, 0.0) },
-    ];
-    for (segs, walls, pieces) in [(ellipse, 1, 4), (spline, 4, 3)] {
-        let region = Region2 { outer: Loop2 { segs }, holes: vec![] };
-        let apart = crate::extrude_whole_sides(&Plane::XY, std::slice::from_ref(&region), 0.0, 7.0, &|_, _| false).unwrap().remove(0);
-        let body = crate::extrude_whole_sides(&Plane::XY, std::slice::from_ref(&region), 0.0, 7.0, &|_, _| true).unwrap().remove(0);
-        assert_eq!(apart.face_count(), 2 + walls - 1 + pieces, "a face per piece when they are not one curve");
-        assert_eq!(body.face_count(), 2 + walls, "one wall over the curve's pieces");
-        let (joined, each) = (crate::measure(&body).unwrap().volume, crate::measure(&apart).unwrap().volume);
-        assert!((joined - each).abs() < 1e-9 * each, "{joined} vs {each}");
-        let h = body.history().unwrap();
-        h.check(&body, &[]).unwrap();
-        let curved: Vec<Vec<FaceOrigin>> = h.faces.iter().map(|f| f.origins.clone()).filter(|o| o.len() > 1).collect();
-        assert_eq!(curved.len(), 1, "{:?}", h.faces);
-        let mut segments: Vec<usize> =
-            curved[0].iter().filter_map(|o| if let FaceOrigin::Profile { segment } = o { Some(*segment) } else { None }).collect();
-        segments.sort();
-        assert_eq!(segments, (0..pieces).collect::<Vec<_>>(), "the wall is generated by every piece of the curve");
-        if walls == 1 {
-            let exact = std::f64::consts::PI * 10.0 * 5.0 * 7.0;
-            assert!((joined - exact).abs() < 1e-6 * exact, "{joined} vs π a b h = {exact}");
-        }
-    }
-}
-
 /// A tapered extrude joins a side drawn in collinear pieces as the straight extrude does
 /// (#1788): one sloped face generated by both pieces, and the same solid as a side in one piece.
 #[test]

crates/kernel/src/issue_1080_tests.rs

@@ -88,7 +88,7 @@ fn chamfers_crossing_each_other_are_refused() {
     too_large(crate::chamfer(&rib, &edges, 3.0));
     too_large(crate::fillet(&rib, &edges, 3.0));
     assert_eq!(crate::chamfer_max(&rib, &edges, 3.0).unwrap().map(|x| x.0), Some(2.0));
-    assert_eq!(crate::fillet_max(&rib, &edges, 3.0, crate::FilletTurn::Mitre).unwrap().map(|x| x.0), Some(2.0));
+    assert_eq!(crate::fillet_max(&rib, &edges, 3.0).unwrap().map(|x| x.0), Some(2.0));
     // Below half the width both build.
     let b = crate::chamfer(&rib, &edges, 1.5).unwrap();
     assert!((b.volume_at(0.01).unwrap() - (3200.0 - 2.0 * 0.5 * 1.5 * 1.5 * 40.0)).abs() < 1e-6);

crates/kernel/src/lib.rs

@@ -156,7 +156,7 @@ mod validity;
 pub mod watch;
 
 pub use blend::{
-    ChamferSide, FilletTurn, SETBACK_AT_LEAST, blend_edges, chamfer, chamfer_max, chamfer_sides, fillet, fillet_each, fillet_g2, fillet_g2_corners,
+    ChamferSide, SETBACK_AT_LEAST, blend_edges, chamfer, chamfer_max, chamfer_sides, fillet, fillet_each, fillet_g2, fillet_g2_corners,
     fillet_g2_with_g2_corners, fillet_least_setback, fillet_max, fillet_max_each, fillet_removing, fillet_setback, largest_fit_note,
     names_largest_fit, tangent_chain, with_fit_note,
 };

crates/kernel/src/numbered.rs

@@ -152,19 +152,6 @@ impl NumberedLoop {
         out
     }
 
-    /// The same loop started at a segment `joins` does not join to the one before it, so no run of
-    /// joined segments wraps round the loop's end (as it is when every segment joins the next).
-    pub(crate) fn starting_a_run(&self, joins: impl Fn(&Seg2, &Seg2) -> bool) -> NumberedLoop {
-        let segs = &self.lp.segs;
-        let n = segs.len();
-        let joined = |i: usize| matches!((segs.get((i + n - 1) % n), segs.get(i)), (Some(s), Some(t)) if joins(s, t));
-        let mut out = self.clone();
-        if let Some(k) = (0..n).find(|&i| !joined(i)) {
-            out.rotate_left(k);
-        }
-        out
-    }
-
     /// Split segment `k` in half, both halves over what it ran over.
     fn split_half(&mut self, k: usize) {
         if k >= self.lp.segs.len() || k >= self.from.len() {

crates/kernel/src/planar_sources.rs

@@ -172,119 +172,6 @@ pub(super) fn same_support(a: &Plane, b: &Plane, at: Resolution) -> bool {
         && (a.origin - b.origin).dot(nb).abs() <= at.linear
 }
 
-/// A source a face on its plane can take: the plane it names (for a shell's inner role, the
-/// source's plane moved in and turned round), the source, and whether it is that inner role.
-#[derive(Clone, Copy, Debug, PartialEq)]
-struct Candidate<'a> {
-    plane: Plane,
-    source: &'a FaceSource,
-    inner: bool,
-}
-
-/// What a mapping's inputs say of one plane of its result.
-#[derive(Debug, PartialEq)]
-enum Support<'a> {
-    /// A face without a role, or a competing tool face, lies on the plane.
-    Blocked,
-    /// Every candidate on the plane is one source, plane and role: the pieces of one logical face.
-    Source(Candidate<'a>),
-    /// No candidate lies on the plane, or candidates of distinct identities do.
-    Unnamed,
-}
-
-/// Planes partitioned into supports, in their order: a plane starts a group unless it is one
-/// support (`same_support`) with the first plane of an earlier group, which it then joins. Returns
-/// each plane's group and each group's first plane; `looked` counts the planes looked at.
-fn group_supports(planes: &[Plane], at: Resolution, looked: &mut usize) -> (Vec<usize>, Vec<usize>) {
-    let index = PlaneIndex::new(planes.iter(), at);
-    let mut group: Vec<Option<usize>> = vec![None; planes.len()];
-    let mut first = Vec::new();
-    for (i, plane) in planes.iter().enumerate() {
-        if group.get(i).is_some_and(Option::is_some) {
-            continue;
-        }
-        let g = first.len();
-        first.push(i);
-        let near = index.near(plane);
-        *looked += near.len();
-        for j in near {
-            if let Some(slot @ None) = group.get_mut(j)
-                && (j == i || planes.get(j).is_some_and(|other| same_support(plane, other, at)))
-            {
-                *slot = Some(g);
-            }
-        }
-    }
-    (group.into_iter().map(|g| g.unwrap_or(usize::MAX)).collect(), first)
-}
-
-/// The candidates and blocking planes of a mapping grouped by support once, so each result face
-/// looks up its plane's few groups instead of every candidate on that plane: with many coplanar
-/// faces the work grows with the faces plus the candidates, not with their product.
-struct SupportDecisions<'a> {
-    /// Each candidate group's first plane, and its decision: its first candidate, or none when
-    /// the group holds candidates of distinct identities.
-    groups: Vec<(Plane, Option<Candidate<'a>>)>,
-    group_index: PlaneIndex,
-    /// The first plane of each group of the faces without a role and the competing tool faces.
-    blocking: Vec<Plane>,
-    blocking_index: PlaneIndex,
-    at: Resolution,
-    /// The planes looked at, building the groups and deciding faces.
-    looked: usize,
-}
-
-impl<'a> SupportDecisions<'a> {
-    /// `candidates` in the order that decides between them.
-    fn new(candidates: &[Candidate<'a>], unknown: &[Plane], competing: &[Plane], at: Resolution) -> Self {
-        let mut looked = 0;
-        let planes: Vec<Plane> = candidates.iter().map(|c| c.plane).collect();
-        let (group, first) = group_supports(&planes, at, &mut looked);
-        let mut groups: Vec<(Plane, Option<Candidate<'a>>)> = first.iter().filter_map(|&i| candidates.get(i)).map(|c| (c.plane, Some(*c))).collect();
-        for (candidate, g) in candidates.iter().zip(&group) {
-            if let Some((_, decision)) = groups.get_mut(*g)
-                && decision.is_some_and(|d| d != *candidate)
-            {
-                *decision = None;
-            }
-        }
-        let group_index = PlaneIndex::new(groups.iter().map(|g| &g.0), at);
-        let all_blocking: Vec<Plane> = unknown.iter().chain(competing).copied().collect();
-        let (_, first) = group_supports(&all_blocking, at, &mut looked);
-        let blocking: Vec<Plane> = first.iter().filter_map(|&i| all_blocking.get(i).copied()).collect();
-        let blocking_index = PlaneIndex::new(blocking.iter(), at);
-        SupportDecisions { groups, group_index, blocking, blocking_index, at, looked }
-    }
-
-    /// What the inputs say of a face on `actual`.
-    fn at(&mut self, actual: &Plane) -> Support<'a> {
-        let at = self.at;
-        let near = self.blocking_index.near(actual);
-        self.looked += near.len();
-        if near.into_iter().any(|i| self.blocking.get(i).is_some_and(|plane| same_support(plane, actual, at))) {
-            return Support::Blocked;
-        }
-        let mut near = self.group_index.near(actual);
-        self.looked += near.len();
-        // Groups are numbered in the candidates' order, so the first matching group's first
-        // candidate is the first candidate on the plane.
-        near.sort_unstable();
-        let mut chosen: Option<Candidate<'a>> = None;
-        for (plane, decision) in near.into_iter().filter_map(|g| self.groups.get(g)) {
-            if !same_support(plane, actual, at) {
-                continue;
-            }
-            match (chosen, decision) {
-                (_, None) => return Support::Unnamed,
-                (None, Some(d)) => chosen = Some(*d),
-                (Some(c), Some(d)) if c != *d => return Support::Unnamed,
-                _ => {}
-            }
-        }
-        chosen.map_or(Support::Unnamed, Support::Source)
-    }
-}
-
 fn base_plane(source: &FaceSource, actual: &Plane) -> Option<Plane> {
     match source {
         FaceSource::CertifiedExtrudeSide { plane: Some(p), .. }
@@ -452,40 +339,98 @@ impl Body {
                     unknown_supports.push(actual);
                     continue;
                 }
-                if descriptor_cost(source).is_none() {
+                let Some(cost) = descriptor_cost(source) else {
                     unknown_supports.push(actual);
                     continue;
-                }
-                candidates.push(Candidate { plane, source, inner: false });
+                };
+                candidates.push((plane, source, false, cost));
                 if let Some(t) = shell {
                     let inner = Plane::new(plane.origin - plane.normal() * t, plane.x, -plane.y)
                         .ok_or_else(|| KernelError::Invalid("invalid shell inner source plane".into()))?;
-                    candidates.push(Candidate { plane: inner, source, inner: true });
+                    candidates.push((inner, source, true, cost));
                 }
             }
             // The candidates are taken in the order of their normal's x: where several match one
             // face, the first decides which the rest are compared with.
-            candidates.sort_by(|a, b| a.plane.normal().x.total_cmp(&b.plane.normal().x));
-            let mut decide = SupportDecisions::new(&candidates, &unknown_supports, &competing, at);
+            candidates.sort_by(|a, b| a.0.normal().x.total_cmp(&b.0.normal().x));
+            let unknown_index = PlaneIndex::new(unknown_supports.iter(), at);
+            let competing_index = PlaneIndex::new(competing.iter(), at);
+            let candidate_index = PlaneIndex::new(candidates.iter().map(|c| &c.0), at);
+            let mut metadata = 2_000_000usize;
+            let mut identity_bytes = 16_000_000usize;
             let mut result = Vec::new();
             for (index, actual) in actual_planes(&self)?.into_iter().enumerate() {
-                // A face no candidate names keeps what it had, where an operation could have left
-                // it a source no role describes.
-                let existing = || {
-                    self.face_sources()
+                let mut found = None;
+                if let Some(actual) = actual {
+                    let on = |planes: &[Plane], index: &PlaneIndex| {
+                        index.near(&actual).into_iter().any(|i| planes.get(i).is_some_and(|plane| same_support(plane, &actual, at)))
+                    };
+                    let blocked = on(&unknown_supports, &unknown_index) || on(&competing, &competing_index);
+                    if blocked {
+                        let existing = self
+                            .face_sources()
+                            .and_then(|sources| sources.get(index))
+                            .and_then(|s| s.as_ref())
+                            .filter(|s| (boolean || self.face_was_coalesced(index)) && !boolean_source(s, constructed));
+                        let keep = existing.and_then(|s| {
+                            descriptor_cost(s).and_then(|cost| {
+                                metadata.checked_sub(cost).map(|remaining| {
+                                    metadata = remaining;
+                                    s.clone()
+                                })
+                            })
+                        });
+                        result.push(keep);
+                        continue;
+                    }
+                    let mut chosen: Option<(Plane, &FaceSource, bool, usize)> = None;
+                    let mut near = candidate_index.near(&actual);
+                    near.sort_unstable();
+                    for (plane, source, inner, cost) in near.into_iter().filter_map(|i| candidates.get(i)) {
+                        if same_support(plane, &actual, at) {
+                            if let Some((previous_plane, previous_source, previous_inner, _)) = chosen {
+                                let Some(remaining) = identity_bytes.checked_sub(*cost) else {
+                                    chosen = None;
+                                    break;
+                                };
+                                identity_bytes = remaining;
+                                // Several current pieces of one exact source are one
+                                // logical face; distinct source identities remain ambiguous.
+                                if previous_plane != *plane || previous_source != *source || previous_inner != *inner {
+                                    chosen = None;
+                                    break;
+                                }
+                            } else {
+                                chosen = Some((*plane, *source, *inner, *cost));
+                            }
+                        }
+                    }
+                    if let Some((plane, source, inner, cost)) = chosen
+                        && let Some(remaining) = metadata.checked_sub(cost)
+                    {
+                        metadata = remaining;
+                        found = Some(if shell.is_some() {
+                            FaceSource::ShellPlanar { producer: None, source: Box::new(source.clone()), inner, plane }
+                        } else {
+                            source.clone()
+                        });
+                    }
+                }
+                if found.is_none() && (boolean || self.face_was_coalesced(index)) {
+                    found = self
+                        .face_sources()
                         .and_then(|sources| sources.get(index))
                         .and_then(|s| s.as_ref())
-                        .filter(|s| (boolean || self.face_was_coalesced(index)) && !boolean_source(s, constructed) && descriptor_cost(s).is_some())
-                        .cloned()
-                };
-                let found = match actual.map(|actual| decide.at(&actual)) {
-                    Some(Support::Source(Candidate { plane, source, inner })) => Some(if shell.is_some() {
-                        FaceSource::ShellPlanar { producer: None, source: Box::new(source.clone()), inner, plane }
-                    } else {
-                        source.clone()
-                    }),
-                    Some(Support::Blocked | Support::Unnamed) | None => existing(),
-                };
+                        .filter(|s| !boolean_source(s, constructed))
+                        .and_then(|s| {
+                            descriptor_cost(s).and_then(|cost| {
+                                metadata.checked_sub(cost).map(|remaining| {
+                                    metadata = remaining;
+                                    s.clone()
+                                })
+                            })
+                        });
+                }
                 result.push(found);
             }
             Ok(result)
@@ -629,90 +574,6 @@ mod tests {
         assert!(matches > 2 * planes.len(), "the planes meet each other, not only themselves: {matches}");
     }
 
-    /// Many faces on one plane are decided with work that grows with the faces plus the
-    /// candidates: each face looks at its plane's one group, never at every candidate on it.
-    #[test]
-    fn coplanar_faces_are_decided_by_group_in_linear_work() {
-        let body = box_solid(Vec3::ZERO, Vec3::new(1000., 1000., 10.)).unwrap();
-        let at = Resolution::of(&body);
-        let top = Plane::new(Vec3::new(0., 0., 10.), Vec3::X, Vec3::Y).unwrap();
-        let one = FaceSource::Box { producer: Some(1), axis: 2, high: true, plane: top };
-        let other = FaceSource::Box { producer: Some(2), axis: 2, high: true, plane: top };
-        for n in [100usize, 1000] {
-            // `n` pieces of one cap and `n` faces of the result on its plane, each a little moved
-            // along the plane (as a split face's pieces are).
-            let pieces: Vec<Plane> = (0..n).map(|k| Plane::new(Vec3::new(k as f64, 0., 10.), Vec3::X, Vec3::Y).unwrap()).collect();
-            let candidates: Vec<Candidate> = (0..n).map(|_| Candidate { plane: top, source: &one, inner: false }).collect();
-            let mut decide = SupportDecisions::new(&candidates, &[], &[], at);
-            for piece in &pieces {
-                assert_eq!(decide.at(piece), Support::Source(Candidate { plane: top, source: &one, inner: false }));
-            }
-            // One look per candidate to group them, one per face to find its group: a scan of
-            // every candidate per face would look n * n times.
-            assert_eq!(decide.looked, 2 * n);
-            // A second identity among the candidates leaves the plane unnamed; a face without a
-            // role on it blocks it.
-            let mut mixed = candidates.clone();
-            mixed[n / 2] = Candidate { plane: top, source: &other, inner: false };
-            assert_eq!(SupportDecisions::new(&mixed, &[], &[], at).at(&pieces[0]), Support::Unnamed);
-            let unknown = vec![top; n];
-            let mut blocked = SupportDecisions::new(&candidates, &unknown, &[], at);
-            assert!(pieces.iter().all(|piece| blocked.at(piece) == Support::Blocked));
-            assert_eq!(blocked.looked, 3 * n);
-        }
-    }
-
-    /// A plate with 300 holes whose top a comb of grooves cuts into 62 strips: every strip keeps
-    /// the top cap's source, every bottom face the bottom cap's, however many there are.
-    #[test]
-    fn many_coplanar_pieces_of_a_holed_plate_all_keep_their_cap_source() {
-        use solidcore_record::{Loop2, Region2, Vec2};
-        let holes: Vec<Loop2> =
-            (0..60).flat_map(|k| (0..5).map(move |r| Loop2::circle(Vec2::new(10. + 10. * k as f64, 5. + 10. * r as f64), 1.))).collect();
-        let outer = Loop2::polygon(&[Vec2::new(0., 0.), Vec2::new(610., 0.), Vec2::new(610., 50.), Vec2::new(0., 50.)]);
-        let region = Region2 { outer, holes };
-        let raw = crate::extrude(&Plane::XY, std::slice::from_ref(&region), 0., 10.).unwrap().remove(0);
-        let hole_ids: Vec<Vec<String>> = (0..300).map(|k| vec![format!("c{k}")]).collect();
-        let signatures: Vec<_> = raw
-            .face_sources()
-            .unwrap()
-            .iter()
-            .map(|s| matches!(s, Some(FaceSource::ExtrudeCap { .. })).then(|| (vec!["l1".to_string()], hole_ids.clone())))
-            .collect();
-        let plate = raw.with_extrude_cap_certificates(5, 3, &signatures).unwrap();
-        // A comb: 61 teeth 2 wide across the plate between the columns of holes, 2 deep.
-        let mut comb = vec![Vec2::new(-5., 55.), Vec2::new(-5., 60.), Vec2::new(615., 60.), Vec2::new(615., 55.)];
-        for k in (0..=60).rev() {
-            let x = 4. + 10. * k as f64;
-            comb.extend([Vec2::new(x + 2., 55.), Vec2::new(x + 2., -5.), Vec2::new(x, -5.), Vec2::new(x, 55.)]);
-        }
-        let comb = Region2 { outer: Loop2::polygon(&comb), holes: vec![] };
-        let tool = crate::extrude(&Plane::XY, std::slice::from_ref(&comb), 8., 12.).unwrap().remove(0);
-        let cut = crate::boolean(&plate, &tool, crate::BoolOp::Cut).unwrap().unwrap();
-        let sources = cut.face_sources().unwrap();
-        let (mut tops, mut bottoms) = (0, 0);
-        for (i, plane) in actual_planes(&cut).unwrap().into_iter().enumerate() {
-            let Some(plane) = plane else { continue };
-            let high = if plane.normal().dot(Vec3::Z) > 0.999999 && (plane.origin.z - 10.).abs() < 1e-9 {
-                true
-            } else if plane.normal().dot(Vec3::Z) < -0.999999 && plane.origin.z.abs() < 1e-9 {
-                false
-            } else {
-                continue;
-            };
-            let Some(FaceSource::CertifiedExtrudeCap { producer: 5, high: h, holes, .. }) = &sources[i] else {
-                panic!("face {i} on the {} cap lost its source: {:?}", if high { "top" } else { "bottom" }, sources[i]);
-            };
-            assert_eq!((*h, holes.len()), (high, 300));
-            if high {
-                tops += 1;
-            } else {
-                bottoms += 1;
-            }
-        }
-        assert_eq!((tops, bottoms), (62, 1));
-    }
-
     #[test]
     fn rounded_shell_planar_roles_are_exact_distinct_and_transformable() {
         for (width, thickness) in [(80., 2.), (100., 3.)] {

crates/kernel/src/smlib_sweeps.rs

@@ -31,17 +31,11 @@ pub(crate) struct Piece {
     /// The segment as drawn that names it: itself, or for collinear lines joined into one, the
     /// first of them.
     pub drawn: Seg2,
-    /// It carries on the piece before it as one curve (pieces of one ellipse or spline): SMLib
-    /// gets the run as one B-spline and sweeps one wall over it.
-    pub joins_previous: bool,
 }
 
 /// The segments of `loops` as pieces, loop after loop.
 pub(crate) fn pieces<'a>(loops: impl IntoIterator<Item = &'a NumberedLoop>) -> Vec<Piece> {
-    loops
-        .into_iter()
-        .flat_map(|l| l.lp.segs.iter().enumerate().map(|(i, s)| Piece { seg: *s, numbers: l.numbers(i).to_vec(), drawn: *s, joins_previous: false }))
-        .collect()
+    loops.into_iter().flat_map(|l| l.lp.segs.iter().enumerate().map(|(i, s)| Piece { seg: *s, numbers: l.numbers(i).to_vec(), drawn: *s })).collect()
 }
 
 /// The pieces of `joined` (`drawn` with collinear lines joined): outer loop, then holes, each
@@ -151,70 +145,8 @@ mod imp {
         })
     }
 
-    /// The pieces as SMLib's curves: one each, but one B-spline for each run of pieces that join
-    /// the one before them ([`Piece::joins_previous`]).
     fn curves(plane: &Plane, pieces: &[Piece]) -> Result<Vec<Curve>> {
-        let mut out = Vec::new();
-        let mut run = Vec::new();
-        for x in pieces {
-            if !x.joins_previous && !run.is_empty() {
-                out.push(joined(std::mem::take(&mut run))?);
-            }
-            run.push(curve(plane, &x.seg)?);
-        }
-        if !run.is_empty() {
-            out.push(joined(run)?);
-        }
-        Ok(out)
-    }
-
-    /// Bézier curves of one degree, each starting where the one before ends, as the one B-spline
-    /// they are, exactly: their control points in a row (each joint once) on knots repeated the
-    /// degree times at each joint. A rational piece's weights are scaled (which leaves it the same
-    /// curve) to meet the weight the piece before ends with. Each piece's knot span is as long as
-    /// keeps the speed through the joint the same on both sides, so pieces meeting tangentially
-    /// (the pieces of one ellipse or spline) join with a continuous first derivative: SMLib makes
-    /// one wall over a curve that is, and splits it where the derivative jumps.
-    fn joined(run: Vec<Curve>) -> Result<Curve> {
-        if run.len() == 1 {
-            return run.into_iter().next().ok_or_else(|| KernelError::Invalid("an empty run of curves".into()));
-        }
-        let not_one = || KernelError::Invalid("the pieces of one curve are not Béziers of one degree".into());
-        let xyz = |q: &[f64; 4]| Vec3::new(q[0], q[1], q[2]);
-        let mut degree = None;
-        let mut points: Vec<[f64; 4]> = Vec::new();
-        let mut knots = Vec::new();
-        // The knot at the last joint, and the length of the span before it.
-        let (mut at, mut span) = (0.0, 1.0);
-        for c in &run {
-            let Curve::Nurbs { degree: d, points: ps, .. } = c else { return Err(not_one()) };
-            if degree.is_some_and(|p| p != *d) || ps.len() != d + 1 || *d == 0 {
-                return Err(not_one());
-            }
-            degree = Some(*d);
-            let (Some(first), Some(second)) = (ps.first(), ps.get(1)) else { return Err(not_one()) };
-            let (Some(last), Some(before)) = (points.last(), points.len().checked_sub(2).and_then(|i| points.get(i))) else {
-                points.extend(ps.iter().copied());
-                knots.extend(std::iter::repeat_n(0.0, d + 1));
-                continue;
-            };
-            let scale = last[3] / first[3];
-            if !(scale.is_finite() && scale > 0.0) {
-                return Err(not_one());
-            }
-            // The derivative of a rational Bézier on a span of length h at its end is
-            // d (w[d-1] / w[d]) (P[d] - P[d-1]) / h, at its start d (w[1] / w[0]) (P[1] - P[0]) / h.
-            let ending = (xyz(last) - xyz(before)) * (before[3] / last[3]) * (1.0 / span);
-            let starting = (xyz(second) - xyz(first)) * (second[3] / first[3]);
-            let next = starting.len() / ending.len();
-            at += span;
-            span = if next.is_finite() && next > 0.0 { next } else { 1.0 };
-            points.extend(ps.iter().skip(1).map(|q| [q[0], q[1], q[2], q[3] * scale]));
-            knots.extend(std::iter::repeat_n(at, *d));
-        }
-        let degree = degree.ok_or_else(not_one)?;
-        knots.extend(std::iter::repeat_n(at + span, degree + 1));
-        Ok(Curve::Nurbs { degree, points, knots })
+        pieces.iter().map(|x| curve(plane, &x.seg)).collect()
     }
 
     /// A chain of sketch segments on `plane` as SMLib's curves, one each, exactly (lines, arcs,
@@ -632,26 +564,11 @@ mod imp {
                     };
                     crate::FaceSource::ExtrudeSide { segment: x.drawn, plane, coalesced: false }
                 }),
-                // The one wall over a whole run of pieces of one curve: named by its first piece.
-                Role::Wall(set) if run_starts(pieces, set).is_some() => run_starts(pieces, set)
-                    .and_then(|i| pieces.get(i))
-                    .map(|x| crate::FaceSource::ExtrudeSide { segment: x.drawn, plane: None, coalesced: false }),
                 _ => None,
             })
             .collect()
     }
 
-    /// The first piece of the run of joined pieces `set` is exactly (all of it, and nothing else).
-    fn run_starts(pieces: &[Piece], set: &BTreeSet<usize>) -> Option<usize> {
-        let (&first, &last) = (set.first()?, set.last()?);
-        let run = pieces.get(first..=last)?;
-        let whole = last - first + 1 == set.len()
-            && run.first().is_some_and(|x| !x.joins_previous)
-            && run.iter().skip(1).all(|x| x.joins_previous)
-            && pieces.get(last + 1).is_none_or(|x| !x.joins_previous);
-        (set.len() > 1 && whole).then_some(first)
-    }
-
     fn numbered_segments(r: &Region2) -> usize {
         r.outer.segs.len() + r.holes.iter().map(|h| h.segs.len()).sum::<usize>()
     }
@@ -678,7 +595,7 @@ mod imp {
         let walls: Vec<Piece> = pieces
             .iter()
             .filter(|x| [0.0, 0.5, 1.0].iter().any(|t| off_axis(plane.to_world(x.seg.point_at(*t)))))
-            .map(|x| Piece { seg: x.seg, numbers: x.numbers.clone(), drawn: x.drawn, joins_previous: false })
+            .map(|x| Piece { seg: x.seg, numbers: x.numbers.clone(), drawn: x.drawn })
             .collect();
         let about = |q: Vec3, a: f64| origin + turned(q - origin, k, a);
         let full = turn >= std::f64::consts::TAU - 1e-9;
@@ -1618,7 +1535,7 @@ mod imp {
                         all.extend(q.numbers.iter().copied());
                     }
                 }
-                Piece { seg: x.seg, numbers: all.into_iter().collect(), drawn: x.drawn, joins_previous: false }
+                Piece { seg: x.seg, numbers: all.into_iter().collect(), drawn: x.drawn }
             })
             .collect();
         let roles = roles(&body, start, Some(&last.0), &seeds(start, &columns, |q| q), &[], false)?;

crates/kernel/src/tests.rs

@@ -331,14 +331,14 @@ fn fillet_max_finds_the_largest_radius_that_works() {
     let b = box_solid(Vec3::new(14.0, 0.0, 0.0), Vec3::new(28.0, 6.0, 10.0)).unwrap();
     let mids = [Vec3::new(14.0, 0.0, 5.0), Vec3::new(28.0, 0.0, 5.0), Vec3::new(14.0, 6.0, 5.0), Vec3::new(28.0, 6.0, 5.0)];
     assert!(too_large(&b, &mids, 3.5));
-    let (r, body) = fillet_max(&b, &mids, 3.5, FilletTurn::Mitre).unwrap().unwrap();
+    let (r, body) = fillet_max(&b, &mids, 3.5).unwrap().unwrap();
     assert_eq!(r, 3.0);
     assert!(rel(measure(&body).unwrap().volume, 840.0 - (4.0 - PI) * 90.0) < 2e-4);
     // No edge there: the fillet's own error, not a smaller radius (only a refusal as too large
     // narrows the search).
     let e = fillet(&b, &[Vec3::new(500.0, 0.0, 5.0)], 1.0).unwrap_err();
     assert!(!matches!(e, KernelError::TooLarge(_)), "{e}");
-    assert_eq!(fillet_max(&b, &[Vec3::new(500.0, 0.0, 5.0)], 1.0, FilletTurn::Mitre).unwrap_err().to_string(), e.to_string());
+    assert_eq!(fillet_max(&b, &[Vec3::new(500.0, 0.0, 5.0)], 1.0).unwrap_err().to_string(), e.to_string());
 }
 
 /// Edges that share no face get their own largest radius: a 2 mm fin's top edge takes at most
@@ -360,7 +360,7 @@ fn fillet_max_each_reduces_only_where_the_radius_does_not_fit() {
     // at its edge less the quarter disc about (17, 26), inside the fin (x >= 19): 2 x 4 less the
     // disc's part, in closed form; the corner's round (1 − π/4)·16 along 20.
     let both = fillet(&body, &edges, 4.0).unwrap();
-    let (radii, b) = fillet_max_each(&body, &edges, 4.0, FilletTurn::Mitre).unwrap().unwrap();
+    let (radii, b) = fillet_max_each(&body, &edges, 4.0).unwrap().unwrap();
     assert_eq!(radii, vec![4.0, 4.0], "{radii:?}");
     assert!(b.validity().is_empty(), "{:?}", b.validity());
     let disc = |a: f64| 0.5 * (a * (16.0 - a * a).max(0.0).sqrt() + 16.0 * (a / 4.0).asin());
@@ -371,7 +371,7 @@ fn fillet_max_each_reduces_only_where_the_radius_does_not_fit() {
     // The post's four edges limit each other: one radius, as `fillet_max`.
     let post = box_solid(Vec3::new(14.0, 0.0, 0.0), Vec3::new(28.0, 6.0, 10.0)).unwrap();
     let mids = [Vec3::new(14.0, 0.0, 5.0), Vec3::new(28.0, 0.0, 5.0), Vec3::new(14.0, 6.0, 5.0), Vec3::new(28.0, 6.0, 5.0)];
-    assert_eq!(fillet_max_each(&post, &mids, 3.5, FilletTurn::Mitre).unwrap().map(|x| x.0), Some(vec![3.0; 4]));
+    assert_eq!(fillet_max_each(&post, &mids, 3.5).unwrap().map(|x| x.0), Some(vec![3.0; 4]));
 }
 
 /// R21 on an edge of a 20 mm cube overflows on its tangent sides, which a round may, taking all

crates/mcp/src/server.rs

@@ -38,7 +38,7 @@ ids, plane axes, worked examples and the known traps of this version; `file: \"S
 Plan: work the numbers out first (the parameters, the expected volume and bounding box after each stage, the world point you \
 will use for each edge or face pick). Then build in a few `batch` calls (all-or-nothing; the reply names the failing step; \
 `save`, `measure` and `set_parameter` can be steps). Use `verbose: false`. Name every feature. `list_commands {\"filter\": word}` \
-gives ids and one-line parameter docs (never unfiltered: it also takes prefix, panel, compact: true and limit); `describe_command` gives one command's docs and schemas.\n\n\
+gives ids and one-line parameter docs (never unfiltered); `describe_command` gives one command's docs and schemas.\n\n\
 Routes: a plate, block, boss, standoff or hole is cheapest as a primitive with expression fields (`solid.box`, `solid.cylinder`, \
 `solid.hole`, `solid.fillet`, `solid.shell`, patterns and mirror), no sketch. Sketch when the profile is not a box or a circle. \
 Fillet outside edges before shelling, build inside features after the shell, then the holes and cuts through walls. Give a blind \

crates/mcp/src/tests.rs

@@ -1741,75 +1741,6 @@ fn list_commands_filter_by_a_command_id_matches_ids() {
     assert!(ids.iter().all(|id| id.contains("sketch.delete")), "{} commands matched: {ids:?}", ids.len());
 }
 
-/// #11726: `list_commands` narrows by id prefix and by panel, shrinks each entry to id and label
-/// or to chosen keys, and pages; with none of these the reply is the whole catalog as before. A
-/// batch step narrows the same way, and a bad argument is a tool error that names it.
-#[test]
-fn list_commands_narrows_by_prefix_panel_fields_and_page() {
-    let mut s = server();
-    let all = tool(&mut s, "list_commands", json!({}));
-    let all = all.as_array().unwrap();
-    assert!(all.len() > 100 && all[0].get("params").is_some(), "the whole catalog, every key");
-    let ids = |v: &Value| v.as_array().unwrap().iter().map(|c| c["id"].as_str().unwrap().to_string()).collect::<Vec<_>>();
-    let sketch = tool(&mut s, "list_commands", json!({"prefix": "SKETCH."}));
-    assert!(!ids(&sketch).is_empty() && ids(&sketch).iter().all(|id| id.starts_with("sketch.")), "{:?}", ids(&sketch));
-    let want = all.iter().filter(|c| c["id"].as_str().unwrap().starts_with("sketch.")).count();
-    assert_eq!(ids(&sketch).len(), want, "every sketch command, not only those on a toolbar");
-    let modify = tool(&mut s, "list_commands", json!({"panel": "modify"}));
-    assert!(!ids(&modify).is_empty(), "{modify}");
-    assert!(
-        modify
-            .as_array()
-            .unwrap()
-            .iter()
-            .all(|c| c["panel"].as_str().unwrap().eq_ignore_ascii_case("modify") || c["tab"].as_str().unwrap().eq_ignore_ascii_case("modify")),
-        "only the whole panel name matches"
-    );
-    let compact = tool(&mut s, "list_commands", json!({"compact": true}));
-    assert_eq!(ids(&compact), ids(&Value::Array(all.clone())), "compact keeps every command");
-    assert!(compact.as_array().unwrap().iter().all(|c| c.as_object().unwrap().keys().eq(["id", "label"].iter())), "{}", compact[0]);
-    assert!(compact.to_string().len() * 5 < Value::Array(all.clone()).to_string().len(), "compact is far smaller");
-    let picked = tool(&mut s, "list_commands", json!({"prefix": "solid.fillet", "fields": ["id", "enabled"], "compact": true}));
-    assert_eq!(picked[0], json!({"id": "solid.fillet", "enabled": picked[0]["enabled"]}), "fields wins over compact");
-    // Pages: together they are the whole match list, in order.
-    let mut paged = Vec::new();
-    let mut offset = json!(0);
-    while let Some(at) = offset.as_u64() {
-        let page = tool(&mut s, "list_commands", json!({"prefix": "sketch.", "compact": true, "limit": 7, "offset": at}));
-        assert_eq!(page["total"], want, "{page}");
-        assert_eq!(page["offset"], at);
-        assert!(page["commands"].as_array().unwrap().len() <= 7);
-        paged.extend(ids(&page["commands"]));
-        offset = page["next_offset"].clone();
-    }
-    assert_eq!(paged, ids(&sketch));
-    let past = tool(&mut s, "list_commands", json!({"limit": 5, "offset": 1_000_000}));
-    assert_eq!((past["commands"].as_array().unwrap().len(), &past["next_offset"]), (0, &Value::Null), "{past}");
-    // A batch step narrows as the tool does.
-    let r = tool(&mut s, "batch", json!({"commands": [{"command": "list_commands", "params": {"prefix": "sketch.", "compact": true, "limit": 3}}]}));
-    let step = r["results"][0].clone();
-    assert_eq!(step["commands"].as_array().map(Vec::len), Some(3), "{r}");
-    assert_eq!(step["total"], want, "{r}");
-    for bad in [
-        json!({"limit": 0}),
-        json!({"limit": -1}),
-        json!({"offset": "x"}),
-        json!({"fields": ["nope"]}),
-        json!({"fields": "id"}),
-        json!({"compact": 1}),
-        json!({"prefix": 3}),
-    ] {
-        // The argument schema refuses a wrong type before the tool runs; the tool refuses the rest.
-        let r = raw_tool(&mut s, "list_commands", bad.clone());
-        let text = r["result"]["content"][0]["text"].as_str().or(r["error"]["message"].as_str()).unwrap_or_default().to_string();
-        assert!(r["result"]["isError"] == json!(true) || r["error"]["code"].is_i64(), "{bad}: {r}");
-        let key = bad.as_object().unwrap().keys().next().unwrap().clone();
-        assert!(text.contains(&format!("`{key}`")), "{bad}: the error names the argument: {text}");
-        let r = raw_tool(&mut s, "batch", json!({"commands": [{"command": "list_commands", "params": bad.clone()}]}));
-        assert!(r["result"]["isError"] == json!(true) || r.to_string().contains(&format!("`{key}`")), "{bad} as a step: {r}");
-    }
-}
-
 /// Compatibility shims (docs/compatibility.md): a design saved before the rename (legacy
 /// extension and format tag) opens through MCP, and the legacy resource URIs still read.
 #[test]
@@ -3549,9 +3480,9 @@ fn a_bridged_server_checks_calls_at_its_param_check_level() {
     assert_eq!(r["result"]["isError"], json!(true), "{r}");
     assert!(text(&r).contains(&format!("invalid parameters for `solid.box`: {warning}")), "{r}");
     assert_eq!(sent("engine.execute solid.box"), 0, "refused unsent");
-    let r = raw_tool(&mut s, "execute", json!({"command": "solid.chamfer", "params": {"nonsense": 1}}));
+    let r = raw_tool(&mut s, "execute", json!({"command": "solid.fillet", "params": {"nonsense": 1}}));
     assert_ne!(r["result"]["isError"], json!(true), "{r}");
-    assert_eq!(sent("engine.execute solid.chamfer"), 1, "no contract here: the app decides");
+    assert_eq!(sent("engine.execute solid.fillet"), 1, "no contract here: the app decides");
     let r = raw_tool(&mut s, "batch", json!({"commands": [good, misspelt]}));
     assert_eq!(r["result"]["isError"], json!(true), "{r}");
     let reply: Value = serde_json::from_str(&text(&r)).unwrap();

crates/mcp/src/tools.rs

@@ -102,26 +102,8 @@ pub fn tool_definitions() -> Vec<Value> {
              enabled right now. Ids are dotted and lower-case (solid.extrude, sketch.create, \
              solid.fillet, sketch.inspect, timeline.rollback). Optional case-insensitive \
              substring `filter` over id, label, tab and panel (not the parameter docs, so a command id \
-             finds that command rather than every command whose docs mention it). Narrow it further with `prefix` \
-             (start of the id) and `panel` (a whole panel or tab name); shrink each entry with `compact` (id and label) \
-             or `fields`; page it with `limit` and `offset`, which make the reply {commands, total, offset, next_offset}. \
-             With none of these the reply is the whole catalog, about 350 KB.",
-            obj(
-                json!({
-                    "filter": string("Substring to match, e.g. \"sketch\", \"fillet\", \"pattern\""),
-                    "prefix": string("Case-insensitive start of the command id, e.g. \"sketch.\""),
-                    "panel": string("A whole toolbar panel or tab name, case-insensitive, e.g. \"Modify\" or \"SKETCH\""),
-                    "compact": {"type": "boolean", "description": "Each entry is only {id, label} (default false)"},
-                    "fields": {
-                        "type": "array",
-                        "items": {"type": "string", "enum": COMMAND_FIELDS},
-                        "description": "Keep only these keys of each entry; overrides `compact`",
-                    },
-                    "limit": {"type": "integer", "minimum": 1, "description": "At most this many commands; the reply becomes {commands, total, offset, next_offset}"},
-                    "offset": {"type": "integer", "minimum": 0, "description": "Skip this many matches first (default 0); with it the reply is paged as with `limit`"},
-                }),
-                &[],
-            ),
+             finds that command rather than every command whose docs mention it).",
+            obj(json!({"filter": string("Substring to match, e.g. \"sketch\", \"fillet\", \"pattern\"")}), &[]),
             Effect::ReadOnly,
         ),
         tool(
@@ -164,7 +146,7 @@ pub fn tool_definitions() -> Vec<Value> {
             "Run commands in order, stopping at the first error. Each step is {command, params}: an engine command id \
              (as list_commands lists them). A step may also name one of these tools with that tool's arguments as params, \
              and runs the engine command it stands for: set_parameter (parameters.change; `value` or `expression`), \
-             list_commands (engine.commands, narrowed by its arguments), describe_command (engine.describe), execute ({command, params}), \
+             list_commands (engine.commands, with `filter`), describe_command (engine.describe), execute ({command, params}), \
              measure (inspect.measure), compare_picture (inspect.compare_picture, numbers only: no overlay PNG), \
              inspect_design (document.inspect), undo, redo, export, save, open, new_design, crash_reports; screenshot, \
              body_topology, batch and pending can't be steps. On an error the steps already run are undone (unless \
@@ -885,9 +867,8 @@ fn measure_summary_wanted(a: &Map<String, Value>) -> bool {
 fn dispatch(b: &mut dyn Backend, name: &str, a: &Map<String, Value>) -> Result<Value, String> {
     match name {
         "list_commands" => {
-            let query = CommandQuery::parse(a)?;
             let all = b.call("engine.commands", json!({}))?;
-            Ok(query.apply(all))
+            Ok(filter_commands(all, str_arg(a, "filter")))
         }
         "describe_command" => {
             let id = str_arg(a, "id").ok_or("`id` is required")?;
@@ -960,100 +941,11 @@ fn dispatch(b: &mut dyn Backend, name: &str, a: &Map<String, Value>) -> Result<V
 
 /// The command catalog filtered by a case-insensitive substring of id, label, panel or tab
 /// (`list_commands`; not the parameter docs, which name other commands, #269).
-/// The keys of a `list_commands` entry, which `fields` may keep.
-const COMMAND_FIELDS: &[&str] = &["id", "label", "tab", "panel", "icon", "shortcut", "params", "enabled", "disabled_reason", "planned"];
-
-/// How `list_commands` narrows the catalog (#11726): which commands, which keys of each, and
-/// which page. The default keeps the whole catalog as it is.
-#[derive(Clone, Debug, Default, PartialEq)]
-struct CommandQuery {
-    filter: Option<String>,
-    prefix: Option<String>,
-    panel: Option<String>,
-    fields: Option<Vec<String>>,
-    limit: Option<usize>,
-    offset: Option<usize>,
-}
-
-impl CommandQuery {
-    fn parse(a: &Map<String, Value>) -> Result<Self, String> {
-        let text = |k: &str| -> Result<Option<String>, String> {
-            match a.get(k) {
-                None | Some(Value::Null) => Ok(None),
-                Some(Value::String(s)) => Ok(Some(s.to_lowercase()).filter(|s| !s.is_empty())),
-                Some(_) => Err(format!("`{k}` must be a string")),
-            }
-        };
-        let count = |k: &str, least: u64| -> Result<Option<usize>, String> {
-            match a.get(k) {
-                None | Some(Value::Null) => Ok(None),
-                Some(v) => v
-                    .as_u64()
-                    .filter(|n| *n >= least)
-                    .map(|n| Some(usize::try_from(n).unwrap_or(usize::MAX)))
-                    .ok_or_else(|| format!("`{k}` must be a whole number of at least {least}")),
-            }
-        };
-        let compact = match a.get("compact") {
-            None | Some(Value::Null) => false,
-            Some(v) => v.as_bool().ok_or("`compact` must be true or false")?,
-        };
-        let fields = match a.get("fields") {
-            None | Some(Value::Null) => compact.then(|| vec!["id".to_string(), "label".to_string()]),
-            Some(Value::Array(v)) => {
-                let mut keep = Vec::new();
-                for f in v {
-                    let name = f.as_str().filter(|n| COMMAND_FIELDS.contains(n)).ok_or_else(|| {
-                        let shown: String = f.to_string().chars().take(64).collect();
-                        format!("`fields` takes the entry keys {}; not {shown}", COMMAND_FIELDS.join(", "))
-                    })?;
-                    if !keep.iter().any(|k| k == name) {
-                        keep.push(name.to_string());
-                    }
-                }
-                Some(keep)
-            }
-            Some(_) => return Err("`fields` must be a list of entry keys".into()),
-        };
-        Ok(Self {
-            filter: text("filter")?,
-            prefix: text("prefix")?,
-            panel: text("panel")?,
-            fields,
-            limit: count("limit", 1)?,
-            offset: count("offset", 0)?,
-        })
-    }
-
-    fn matches(&self, c: &Value) -> bool {
-        let field = |k: &str| c.get(k).and_then(Value::as_str).map(str::to_lowercase).unwrap_or_default();
-        self.filter.as_ref().is_none_or(|f| ["id", "label", "panel", "tab"].iter().any(|k| field(k).contains(f.as_str())))
-            && self.prefix.as_ref().is_none_or(|p| field("id").starts_with(p.as_str()))
-            && self.panel.as_ref().is_none_or(|p| field("panel") == *p || field("tab") == *p)
-    }
-
-    /// The catalog narrowed: a list, or `{commands, total, offset, next_offset}` when paged.
-    fn apply(&self, all: Value) -> Value {
-        let Value::Array(all) = all else { return all };
-        let hits: Vec<Value> = all.into_iter().filter(|c| self.matches(c)).collect();
-        let total = hits.len();
-        let offset = self.offset.unwrap_or(0).min(total);
-        let take = self.limit.unwrap_or(usize::MAX);
-        let page: Vec<Value> = hits
-            .into_iter()
-            .skip(offset)
-            .take(take)
-            .map(|c| match (&self.fields, c) {
-                (Some(keep), Value::Object(m)) => Value::Object(m.into_iter().filter(|(k, _)| keep.contains(k)).collect()),
-                (_, c) => c,
-            })
-            .collect();
-        if self.limit.is_none() && self.offset.is_none() {
-            return Value::Array(page);
-        }
-        let end = offset + page.len();
-        json!({"commands": page, "total": total, "offset": offset, "next_offset": (end < total).then_some(end)})
-    }
+fn filter_commands(all: Value, filter: Option<&str>) -> Value {
+    let Some(f) = filter.map(str::to_lowercase).filter(|f| !f.is_empty()) else { return all };
+    let hit =
+        |c: &Value| ["id", "label", "panel", "tab"].iter().any(|k| c.get(*k).and_then(Value::as_str).is_some_and(|s| s.to_lowercase().contains(&f)));
+    Value::Array(all.as_array().map(|v| v.iter().filter(|c| hit(c)).cloned().collect()).unwrap_or_default())
 }
 
 /// `pending`: the end of a request still running when its call returned (bridged only; a
@@ -1083,8 +975,8 @@ fn pending(b: &mut dyn Backend) -> Result<Value, String> {
 
 /// How a tool step's result is cut down to what the tool itself would reply.
 enum Narrow {
-    /// A `list_commands` step's catalog, narrowed as the tool narrows it.
-    Commands(CommandQuery),
+    /// A `list_commands` step's catalog, filtered as the tool filters it.
+    Commands(String),
     /// A `measure {summary: true}` step's reply, as `measure_summary` shapes it.
     MeasureSummary,
 }
@@ -1092,7 +984,7 @@ enum Narrow {
 impl Narrow {
     fn apply(&self, v: Value) -> Value {
         match self {
-            Narrow::Commands(q) => q.apply(v),
+            Narrow::Commands(f) => filter_commands(v, Some(f)),
             Narrow::MeasureSummary => measure_summary(v),
         }
     }
@@ -1118,10 +1010,7 @@ fn batch_step(step: &Value) -> Result<(String, Value, Option<Narrow>), String> {
     let a = params.as_object().unwrap_or(&empty);
     let mapped = |c: &str, p: Value| Ok((c.to_string(), p, None));
     match command {
-        "list_commands" => {
-            let query = CommandQuery::parse(a)?;
-            Ok(("engine.commands".into(), json!({}), (query != CommandQuery::default()).then_some(Narrow::Commands(query))))
-        }
+        "list_commands" => Ok(("engine.commands".into(), json!({}), str_arg(a, "filter").map(|f| Narrow::Commands(f.to_string())))),
         "set_parameter" => {
             let mut p = pick(a, &["name", "unit", "comment"]);
             p["expression"] = parameter_value(a)?;

crates/smlib/src/core/blend.rs

@@ -53,7 +53,7 @@ use solidcore::topology::topology_traverser::Marks;
 use solidcore::topology::{Brep, EdgeId, EdgeuseId, FaceId, FaceuseId, VertexId, edge, vertex};
 
 use super::{Body, answer};
-use crate::{Blend, ChamferSecond, Error, Hole, HoleEdge, MAX_POINTS, Result, Turn};
+use crate::{Blend, ChamferSecond, Error, Hole, HoleEdge, MAX_POINTS, Result};
 
 /// Why solidcore refuses the 3x2 mixed-convexity corner whose rails cross
 /// (`fixes.fillet_refuse_mixed_corner_crossing_rails`, [`MIXED_CORNER_RAILS_CROSS`]): it builds no
@@ -248,9 +248,7 @@ fn chamfer_radius(k: &Kernel, b: &mut Brep, e: EdgeId, distance: f64) -> solidco
 /// What `round_edges` makes: the capi's kinds less the chamfer, which `chamfer_offsets` makes.
 #[derive(Clone, Copy, PartialEq)]
 enum Section<'a> {
-    /// A circular section of constant radius (or of a variable radius's law), the turns of two
-    /// such rounds at a side edge as the [`Turn`] says (`SetSweptTurns`).
-    Round(Turn),
+    Round,
     /// The curvature-continuous section (`SM_FSG_BLEND_CURVE`): the Gⁿ generator's order 2 at the
     /// equal-area thumbweight (`SMLIB_BLEND_THUMBWEIGHT`, fork 6148773; solidcore#2261 under
     /// `fillet_gn_section_generator`), which takes off what the ball's circle does.
@@ -340,23 +338,6 @@ fn room_reason(r: NoRoomReason) -> Option<crate::RoomReason> {
     })
 }
 
-/// The refusal of a swept turn `CreateFilletCorners` noted at its vertex (`SmBlendCorner::Classify`
-/// with `GetSweptTurns()`): [`Error::TurnRefused`] with solidcore's reason, without its "Fillet
-/// Error: " prefix, and where it is; `None` for a note of another kind.
-fn turn_refusal(info: &ErrorInfo<FilletObject>) -> Option<Error> {
-    let room = match info.code {
-        c if c == FilletErrorType::NoRoom as i32 => true,
-        c if c == FilletErrorType::CornerUnsupported as i32 => false,
-        _ => return None,
-    };
-    let why = info.comment.trim();
-    if why.is_empty() {
-        return None;
-    }
-    let why = why.strip_prefix("Fillet Error:").map_or(why, str::trim_start).to_owned();
-    Some(Error::TurnRefused { room, why, at: info.location.map(|p| [p.x, p.y, p.z]) })
-}
-
 /// [`blend_failure`] where solidcore gives no size.
 fn blend_failure_unsized(info: &ErrorInfo<FilletObject>, e: SolidError, corner: bool) -> Error {
     if e.is_unported() {
@@ -452,16 +433,13 @@ fn blend_edges_stopping(
     let mut fit_edge = None;
     let done = {
         let mut s = FilletSession::new(k, b)?;
-        // `SetSweptTurns`: read as the corners are made (`fixes.fillet_blend_corner`).
-        let swept = section == Section::Round(Turn::Swept);
-        s.set_swept_turns(swept);
         // `SetFilletParameters(b, es, sections, solvers, values, laws, -1, -1, -1, -1,
         // continuity 1, thumbweight 1)`: the session sets the executive's global merge first, as
         // `SmApiFilletEdges` does, and `SetFilletParameters` resets it, as in the capi.
         let prepared = match (section, law) {
-            (Section::Round(_), None) => s.prepare_per_edge_constant_radius(k, edges, sizes, &[FilletSurfaceGeneratorType::Circular], 1, 1.0),
+            (Section::Round, None) => s.prepare_per_edge_constant_radius(k, edges, sizes, &[FilletSurfaceGeneratorType::Circular], 1, 1.0),
             // The size is the start radius (`smlib_fillet_variable`).
-            (Section::Round(_), Some(law)) => match sizes.first() {
+            (Section::Round, Some(law)) => match sizes.first() {
                 Some(&size) => s.prepare_variable_radius_edges(k, edges, size, law, 1, 1),
                 None => return Ok(Err(Err(Error::Argument))),
             },
@@ -481,10 +459,7 @@ fn blend_edges_stopping(
                 s.add_set_back_vertex(sb.vertex);
             }
         }
-        let prepared_ok = prepared.is_ok();
         let mut step = prepared.and_then(|()| s.create_corners(k, None)).map(|()| Ok(Vec::new()));
-        // A swept turn `CreateFilletCorners` refused, with solidcore's reason ([`turn_refusal`]).
-        let refused_turn = if swept && prepared_ok && step.is_err() { turn_refusal(s.error_info()) } else { None };
         // A vertex `CreateFilletCorners` made no corner for, noted before a later step notes its
         // own failure over it ([`blend_failure`]).
         let corner = step.is_ok() && s.error_info().code == FilletErrorType::CornerUnsupported as i32;
@@ -513,14 +488,11 @@ fn blend_edges_stopping(
                 }
             },
             Ok(Err(refusal)) => Ok(Err(refusal)),
-            Err(e) => match refused_turn {
-                Some(why) => Ok(Err(Err(why))),
-                None => {
-                    let (why, edge) = blend_failure(&s, e, corner);
-                    fit_edge = edge;
-                    Ok(Err(Err(why)))
-                }
-            },
+            Err(e) => {
+                let (why, edge) = blend_failure(&s, e, corner);
+                fit_edge = edge;
+                Ok(Err(Err(why)))
+            }
         }
     };
     let done: solidcore::Result<std::result::Result<(Vec<usize>, Vec<(usize, FaceId)>), std::result::Result<usize, Error>>> = done;
@@ -853,9 +825,9 @@ pub(crate) fn blend(
 
 /// `smlib_blend_dropping`: [`blend`] with one size per point, no corners, and per point whether it
 /// picked an edge that a larger round, overflowing its faces, removed whole.
-pub(crate) fn blend_dropping(body: &Body, kind: Blend, turn: Turn, points: &[[f64; 3]], sizes: &[f64], tolerance: f64) -> Result<(Body, Vec<bool>)> {
+pub(crate) fn blend_dropping(body: &Body, kind: Blend, points: &[[f64; 3]], sizes: &[f64], tolerance: f64) -> Result<(Body, Vec<bool>)> {
     let mut dropped = vec![false; points.len()];
-    let (b, _) = blend_call(body, kind, turn, points, sizes, tolerance, &[], &[], Corners::Filled, &mut dropped)?;
+    let (b, _) = blend_call(body, kind, points, sizes, tolerance, &[], &[], Corners::Filled, &mut dropped)?;
     Ok((b, dropped))
 }
 
@@ -874,17 +846,15 @@ pub(crate) fn blend_holes(
     setbacks: &[f64],
     open: Corners,
 ) -> Result<(Body, Vec<Hole>)> {
-    blend_call(body, kind, Turn::Mitre, points, sizes, tolerance, corners, setbacks, open, &mut vec![false; points.len()])
+    blend_call(body, kind, points, sizes, tolerance, corners, setbacks, open, &mut vec![false; points.len()])
 }
 
 /// `blend_call`: [`blend_holes`], with per point in `dropped` whether it picked an edge an
-/// overflowing round removed whole ([`overflow_first`]), and the rounds' turns at side edges as
-/// `turn` says (a swept turn is for [`Blend::Round`] only).
+/// overflowing round removed whole ([`overflow_first`]).
 #[allow(clippy::too_many_arguments)] // the capi's blend_call
 fn blend_call(
     body: &Body,
     kind: Blend,
-    turn: Turn,
     points: &[[f64; 3]],
     sizes: &[f64],
     tolerance: f64,
@@ -899,7 +869,6 @@ fn blend_call(
         || !(one_size || sizes.len() == points.len())
         || !points_ok(corners, true)
         || setbacks.len() != corners.len()
-        || (turn == Turn::Swept && kind != Blend::Round)
     {
         return Err(Error::Argument);
     }
@@ -929,7 +898,7 @@ fn blend_call(
         }
         let solid_in = brep_p2::is_manifold_solid(&w)?;
         let section = match kind {
-            Blend::Round => Section::Round(turn),
+            Blend::Round => Section::Round,
             // Every edge of one call takes the equal-area thumbweight of the first's wedge
             // (solidcore#2250's comment 6563419897): edges of other wedges would take off another
             // area than their own, so they are not built together.
@@ -1411,7 +1380,7 @@ pub(crate) fn fillet_variable(
         // (`NoRoomReason::BallsFold`), [`Error::NoRoom`].
         let solid_in = brep_p2::is_manifold_solid(&w)?;
         let (r0, r1) = (radii.first().copied().unwrap_or(0.0), radii.last().copied().unwrap_or(0.0));
-        Ok(match blend_edges(k, &mut w, &[e], &[r0.max(r1)], Section::Round(Turn::Mitre), Some(law), &[], None)? {
+        Ok(match blend_edges(k, &mut w, &[e], &[r0.max(r1)], Section::Round, Some(law), &[], None)? {
             Ok(()) => finish(w, solid_in)?,
             Err(Ok(_)) => Err(Error::Unsupported),
             Err(Err(e)) => Err(e),