Command ids are SolveCraft's own: 173 ids that were another product's internal command ids become dotted, lower-case ids (<area>.<thing>[.<variant>]: solid.extrude, sketch.rectangle.two_point, sheet.flange, joint.drive, ...), in the registry, toolbar, dialogs, shortcuts, palette, control channel, MCP, examples, scenarios and docs

The old ids live only in crates/engine/src/legacy_ids.rs (the legacy migration table): find_command maps them, so old scripts, recipes and control calls keep working, and saved shortcuts, recent and pinned commands are migrated on load (designs store no command ids). Parity maps the observed catalog ids to ours through xtask/data/fusion-ids.tsv. The agent rule now reads: our own dotted id, never another product's. Cargo.toml's repository points at github.com/bherbruck/solvecraft.

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

apps/solvecraft-cli/src/main.rs

@@ -150,13 +150,13 @@ fn cmd_run(args: &[String]) -> Result<(), String> {
         _ => {}
     }
     for out in flags(args, "--out") {
-        s.execute("ExportCommand", &json!({"path": out})).map_err(|e| e.to_string())?;
+        s.execute("file.export", &json!({"path": out})).map_err(|e| e.to_string())?;
     }
     if let Some(p) = flag(args, "--save") {
-        s.execute("SaveDocumentAsCommand", &json!({"path": p})).map_err(|e| e.to_string())?;
+        s.execute("file.save_as", &json!({"path": p})).map_err(|e| e.to_string())?;
     }
     if !args.iter().any(|a| a == "--quiet") {
-        let m = s.execute("MeasureCommand", &json!({})).map_err(|e| e.to_string())?;
+        let m = s.execute("inspect.measure", &json!({})).map_err(|e| e.to_string())?;
         println!("{}", pretty(&m));
     }
     Ok(())
@@ -165,7 +165,7 @@ fn cmd_run(args: &[String]) -> Result<(), String> {
 fn cmd_eval(args: &[String]) -> Result<(), String> {
     let path = flag(args, "--in").or_else(|| positional(args).map(String::as_str)).ok_or_else(|| USAGE.to_string())?;
     let mut s = load(path)?;
-    let m = s.execute("MeasureCommand", &json!({})).map_err(|e| e.to_string())?;
+    let m = s.execute("inspect.measure", &json!({})).map_err(|e| e.to_string())?;
     let d = s.execute("document.inspect", &json!({})).map_err(|e| e.to_string())?;
     let out = json!({
         "body_count": m["body_count"],
@@ -239,7 +239,7 @@ fn cmd_save_stress(args: &[String]) -> Result<(), String> {
     s.doc_mut().params.extend(filler);
     for r in 0..rounds {
         s.doc_mut().set_param("save_round", &r.to_string(), None, None).map_err(|e| e.to_string())?;
-        s.execute("SaveDocumentCommand", &json!({ "path": path })).map_err(|e| e.to_string())?;
+        s.execute("file.save", &json!({ "path": path })).map_err(|e| e.to_string())?;
     }
     Ok(())
 }
@@ -266,10 +266,10 @@ fn cmd_bench_edit(args: &[String]) -> Result<(), String> {
         Ok(())
     };
     let expr = expr.replace("{old}", &old);
-    time(&mut s, "edit", "ChangeParameterCommand", json!({"name": param, "expression": expr}))?;
-    time(&mut s, "set back", "ChangeParameterCommand", json!({"name": param, "expression": old}))?;
-    time(&mut s, "undo", "UndoCommand", json!({}))?;
-    time(&mut s, "redo", "RedoCommand", json!({}))?;
+    time(&mut s, "edit", "parameters.change", json!({"name": param, "expression": expr}))?;
+    time(&mut s, "set back", "parameters.change", json!({"name": param, "expression": old}))?;
+    time(&mut s, "undo", "edit.undo", json!({}))?;
+    time(&mut s, "redo", "edit.redo", json!({}))?;
     println!("{}", pretty(&json!(out)));
     Ok(())
 }

apps/solvecraft-cli/src/oracle.rs

@@ -31,7 +31,7 @@ fn check_case(dir: &str) -> Value {
     if let Err(e) = s.run_script(&script) {
         return json!({"case": name, "pass": false, "error": e.to_string()});
     }
-    let got = match s.execute("MeasureCommand", &json!({})) {
+    let got = match s.execute("inspect.measure", &json!({})) {
         Ok(m) => m,
         Err(e) => return json!({"case": name, "pass": false, "error": e.to_string()}),
     };
@@ -183,7 +183,7 @@ fn check_step_case(dir: &str) -> Value {
         Ok(v) => v,
         Err(e) => return json!({"case": name, "pass": false, "error": e.to_string()}),
     };
-    let got = match s.execute("MeasureCommand", &json!({})) {
+    let got = match s.execute("inspect.measure", &json!({})) {
         Ok(m) => m,
         Err(e) => return json!({"case": name, "pass": false, "error": e.to_string()}),
     };

apps/solvecraft-cli/src/recipe.rs

@@ -44,23 +44,23 @@ fn sketch_cmds(f: &Value, out: &mut Vec<Value>) -> Result<(), String> {
     if let Some(n) = f.get("name") {
         p["name"] = n.clone();
     }
-    out.push(json!({"command": "SketchCreate", "params": p}));
+    out.push(json!({"command": "sketch.create", "params": p}));
     for e in f.get("entities").and_then(Value::as_array).into_iter().flatten() {
         let id = e.get("id").cloned().unwrap_or(Value::Null);
         let construction = e.get("construction").cloned().unwrap_or(json!(false));
         match e.get("type").and_then(Value::as_str) {
-            Some("line") => out.push(json!({"command": "DrawPolyline", "params": {"points": [parg(e.get("start")), parg(e.get("end"))], "ids": [id], "construction": construction}})),
-            Some("circle") => out.push(json!({"command": "CircleCenterRadius", "params": {"center": parg(e.get("center")), "radius": e.get("radius"), "id": id, "construction": construction}})),
-            Some("arc_three_point") => out.push(json!({"command": "ArcThreePoint", "params": {"start": parg(e.get("start")), "end": parg(e.get("end")), "through": e.get("mid").or(e.get("through")), "id": id}})),
-            Some("arc_center_start_sweep") => out.push(json!({"command": "ArcCenterTwoPoint", "params": {"center": parg(e.get("center")), "start": parg(e.get("start")), "sweep": e.get("sweep_deg").or(e.get("sweep")), "id": id}})),
+            Some("line") => out.push(json!({"command": "sketch.line", "params": {"points": [parg(e.get("start")), parg(e.get("end"))], "ids": [id], "construction": construction}})),
+            Some("circle") => out.push(json!({"command": "sketch.circle.center", "params": {"center": parg(e.get("center")), "radius": e.get("radius"), "id": id, "construction": construction}})),
+            Some("arc_three_point") => out.push(json!({"command": "sketch.arc.three_point", "params": {"start": parg(e.get("start")), "end": parg(e.get("end")), "through": e.get("mid").or(e.get("through")), "id": id}})),
+            Some("arc_center_start_sweep") => out.push(json!({"command": "sketch.arc.center_point", "params": {"center": parg(e.get("center")), "start": parg(e.get("start")), "sweep": e.get("sweep_deg").or(e.get("sweep")), "id": id}})),
             Some("arc") => {
                 if e.get("center").is_some() {
-                    out.push(json!({"command": "ArcCenterTwoPoint", "params": {"center": parg(e.get("center")), "start": parg(e.get("start")), "end": parg(e.get("end")), "id": id}}))
+                    out.push(json!({"command": "sketch.arc.center_point", "params": {"center": parg(e.get("center")), "start": parg(e.get("start")), "end": parg(e.get("end")), "id": id}}))
                 } else {
-                    out.push(json!({"command": "ArcThreePoint", "params": {"start": parg(e.get("start")), "end": parg(e.get("end")), "through": parg(e.get("through").or(e.get("mid"))), "id": id}}))
+                    out.push(json!({"command": "sketch.arc.three_point", "params": {"start": parg(e.get("start")), "end": parg(e.get("end")), "through": parg(e.get("through").or(e.get("mid"))), "id": id}}))
                 }
             }
-            Some("point") => out.push(json!({"command": "DrawPoint", "params": {"point": parg(e.get("at").map(|a| json!({"at": a})).as_ref().or(Some(e))), "id": id}})),
+            Some("point") => out.push(json!({"command": "sketch.point", "params": {"point": parg(e.get("at").map(|a| json!({"at": a})).as_ref().or(Some(e))), "id": id}})),
             // A 3D helix fit: the sweep along it becomes a coil (see `helix_path`).
             Some("fitted_spline") if e.get("fit_points").and_then(Value::as_array).is_some_and(|a| a.iter().any(|p| p.get(2).is_some())) => {}
             Some(other) => return Err(format!("recipe: sketch entity type `{other}` is not supported yet")),
@@ -77,9 +77,9 @@ fn sketch_cmds(f: &Value, out: &mut Vec<Value>) -> Result<(), String> {
                 p[k] = v.clone();
             }
         }
-        out.push(json!({"command": "SketchDimension", "params": p}));
+        out.push(json!({"command": "sketch.dimension", "params": p}));
     }
-    out.push(json!({"command": "SketchStop", "params": {}}));
+    out.push(json!({"command": "sketch.finish", "params": {}}));
     Ok(())
 }
 
@@ -138,33 +138,33 @@ fn constraint_cmd(c: &Value) -> Result<Value, String> {
     let at = |i: usize| r.get(i).cloned().unwrap_or(Value::Null);
     let is_point = |v: &Value| v.as_str().is_some_and(|s| s.contains('.') || s == "origin" || s.starts_with('p'));
     let (cmd, p) = match ty.as_str() {
-        "horizontal" | "vertical" if r.len() >= 2 => ("ConstraintHorizontalVertical", json!({"points": [at(0), at(1)], "mode": ty})),
-        "horizontal" | "vertical" => ("ConstraintHorizontalVertical", json!({"line": at(0), "mode": ty})),
-        "horizontal_points" => ("ConstraintHorizontalVertical", json!({"points": [at(0), at(1)], "mode": "horizontal"})),
-        "vertical_points" => ("ConstraintHorizontalVertical", json!({"points": [at(0), at(1)], "mode": "vertical"})),
+        "horizontal" | "vertical" if r.len() >= 2 => ("sketch.constraint.horizontal_vertical", json!({"points": [at(0), at(1)], "mode": ty})),
+        "horizontal" | "vertical" => ("sketch.constraint.horizontal_vertical", json!({"line": at(0), "mode": ty})),
+        "horizontal_points" => ("sketch.constraint.horizontal_vertical", json!({"points": [at(0), at(1)], "mode": "horizontal"})),
+        "vertical_points" => ("sketch.constraint.horizontal_vertical", json!({"points": [at(0), at(1)], "mode": "vertical"})),
         "coincident" | "point_on_curve" => {
             // The point goes first.
             if is_point(&at(0)) {
-                ("ConstraintCoincident", json!({"a": at(0), "b": at(1)}))
+                ("sketch.constraint.coincident", json!({"a": at(0), "b": at(1)}))
             } else {
-                ("ConstraintCoincident", json!({"a": at(1), "b": at(0)}))
+                ("sketch.constraint.coincident", json!({"a": at(1), "b": at(0)}))
             }
         }
         "midpoint" => {
             if is_point(&at(0)) {
-                ("ConstraintMidPoint", json!({"point": at(0), "line": at(1)}))
+                ("sketch.constraint.midpoint", json!({"point": at(0), "line": at(1)}))
             } else {
-                ("ConstraintMidPoint", json!({"point": at(1), "line": at(0)}))
+                ("sketch.constraint.midpoint", json!({"point": at(1), "line": at(0)}))
             }
         }
-        "symmetric" | "symmetry" => ("ConstraintSymmetry", json!({"a": at(0), "b": at(1), "line": at(2)})),
-        "fix" => ("ConstraintFix", json!({"entity": at(0), "fixed": true})),
-        "tangent" => ("ConstraintTangent", json!({"a": at(0), "b": at(1)})),
-        "equal" => ("ConstraintEqual", json!({"a": at(0), "b": at(1)})),
-        "parallel" => ("ConstraintParallel", json!({"a": at(0), "b": at(1)})),
-        "perpendicular" => ("ConstraintPerpendicular", json!({"a": at(0), "b": at(1)})),
-        "concentric" => ("ConstraintConcentric", json!({"a": at(0), "b": at(1)})),
-        "collinear" => ("ConstraintCollinear", json!({"a": at(0), "b": at(1)})),
+        "symmetric" | "symmetry" => ("sketch.constraint.symmetry", json!({"a": at(0), "b": at(1), "line": at(2)})),
+        "fix" => ("sketch.constraint.fix", json!({"entity": at(0), "fixed": true})),
+        "tangent" => ("sketch.constraint.tangent", json!({"a": at(0), "b": at(1)})),
+        "equal" => ("sketch.constraint.equal", json!({"a": at(0), "b": at(1)})),
+        "parallel" => ("sketch.constraint.parallel", json!({"a": at(0), "b": at(1)})),
+        "perpendicular" => ("sketch.constraint.perpendicular", json!({"a": at(0), "b": at(1)})),
+        "concentric" => ("sketch.constraint.concentric", json!({"a": at(0), "b": at(1)})),
+        "collinear" => ("sketch.constraint.collinear", json!({"a": at(0), "b": at(1)})),
         other => return Err(format!("recipe: constraint `{other}` is not supported yet")),
     };
     Ok(json!({"command": cmd, "params": p}))
@@ -294,7 +294,7 @@ fn circle_fit(pts: &[[f64; 3]]) -> Option<(f64, f64)> {
 pub fn to_script(recipe: &Value) -> Result<Value, String> {
     let mut out: Vec<Value> = Vec::new();
     for p in recipe.get("parameters").and_then(Value::as_array).into_iter().flatten() {
-        out.push(json!({"command": "ChangeParameterCommand", "params": {"name": p.get("name"), "expression": p.get("expression").or(p.get("value")), "unit": p.get("unit").cloned().unwrap_or(json!("mm"))}}));
+        out.push(json!({"command": "parameters.change", "params": {"name": p.get("name"), "expression": p.get("expression").or(p.get("value")), "unit": p.get("unit").cloned().unwrap_or(json!("mm"))}}));
     }
     let features = recipe.get("features").and_then(Value::as_array).ok_or("recipe: missing `features`")?;
     for f in features {
@@ -305,9 +305,9 @@ pub fn to_script(recipe: &Value) -> Result<Value, String> {
             Some("extrude") => {
                 let mut p = json!({"sketch": profile_sketch(f), "profiles": profiles_of(f), "operation": op(f), "name": name, "body_names": bodies});
                 extent(f, &mut p);
-                out.push(json!({"command": "Extrude", "params": p}));
+                out.push(json!({"command": "solid.extrude", "params": p}));
             }
-            Some("combine") => out.push(json!({"command": "FusionCombineCommand", "params": {
+            Some("combine") => out.push(json!({"command": "solid.combine", "params": {
                 "target": f.get("target_body").or(f.get("target")), "tools": f.get("tool_bodies").or(f.get("tools")),
                 "operation": op(f), "keep_tools": f.get("keep_tools").cloned().unwrap_or(json!(false)), "name": name}})),
             Some("revolve") => {
@@ -316,7 +316,7 @@ pub fn to_script(recipe: &Value) -> Result<Value, String> {
                     Some(a) => a.get("line").or(a.get("ref")).cloned().unwrap_or_else(|| a.clone()),
                     None => Value::Null,
                 };
-                out.push(json!({"command": "Revolve", "params": {
+                out.push(json!({"command": "solid.revolve", "params": {
                     "sketch": profile_sketch(f), "profiles": profiles_of(f), "axis": axis,
                     "angle": f.get("angle").cloned().unwrap_or(json!("360 deg")), "operation": op(f), "name": name, "body_names": bodies}}));
             }
@@ -329,11 +329,11 @@ pub fn to_script(recipe: &Value) -> Result<Value, String> {
                     p["count2"] = d2.get("count").cloned().unwrap_or(Value::Null);
                     p["spacing2"] = d2.get("spacing").cloned().unwrap_or(Value::Null);
                 }
-                out.push(json!({"command": "PatternRectangular", "params": p}));
+                out.push(json!({"command": "solid.pattern.rectangular", "params": p}));
             }
             Some("circular_pattern") => {
                 let axis = f.get("axis").map(|a| json!({"origin": a.get("origin").cloned().unwrap_or(json!([0, 0, 0])), "dir": a.get("dir")})).unwrap_or(Value::Null);
-                out.push(json!({"command": "PatternCircular", "params": {"features": feature_refs(f.get("features")), "axis": axis, "count": f.get("count"), "angle": f.get("total_angle").cloned().unwrap_or(json!(360)), "name": name}}));
+                out.push(json!({"command": "solid.pattern.circular", "params": {"features": feature_refs(f.get("features")), "axis": axis, "count": f.get("count"), "angle": f.get("total_angle").cloned().unwrap_or(json!(360)), "name": name}}));
             }
             Some("sm_flange") => match f.get("type").and_then(Value::as_str) {
                 Some("edge") => {
@@ -344,11 +344,11 @@ pub fn to_script(recipe: &Value) -> Result<Value, String> {
                     if f.get("flip").and_then(Value::as_bool) == Some(true) {
                         p["flip"] = json!(true);
                     }
-                    out.push(json!({"command": "FusionSheetMetalFlangeCommand", "params": p}));
+                    out.push(json!({"command": "sheet.flange", "params": p}));
                 }
-                Some("contour") => out.push(json!({"command": "FusionSheetMetalFlangeCommand", "params": {
+                Some("contour") => out.push(json!({"command": "sheet.flange", "params": {
                     "type": "contour", "sketch": f.get("profile_sketch"), "curves": f.get("profile_curves"), "distance": f.get("distance"), "name": name}})),
-                _ => out.push(json!({"command": "FusionSheetMetalFlangeCommand", "params": {
+                _ => out.push(json!({"command": "sheet.flange", "params": {
                     "type": "base", "sketch": profile_sketch(f), "profiles": profiles_of(f), "name": name, "body_names": bodies}})),
             },
             Some("sheet_metal_rule_edit") => {
@@ -368,7 +368,7 @@ pub fn to_script(recipe: &Value) -> Result<Value, String> {
                         p["thickness"] = json!(format!("{v} {u}"));
                     }
                 }
-                out.push(json!({"command": "FusionSheetMetalRulesCommand", "params": p}));
+                out.push(json!({"command": "sheet.manage_rules", "params": p}));
             }
             Some("sm_hem") => {
                 let e = f.get("edge").and_then(|e| e.get("point")).cloned().unwrap_or(Value::Null);
@@ -376,9 +376,9 @@ pub fn to_script(recipe: &Value) -> Result<Value, String> {
                 if f.get("flipped").and_then(Value::as_bool) == Some(true) {
                     p["flip"] = json!(true);
                 }
-                out.push(json!({"command": "FusionSheetMetalHemFlangeCommand", "params": p}));
+                out.push(json!({"command": "sheet.hem", "params": p}));
             }
-            Some("sm_unfold") => out.push(json!({"command": "FusionSheetmetalUnfoldCommand", "params": {"name": name}})),
+            Some("sm_unfold") => out.push(json!({"command": "sheet.unfold", "params": {"name": name}})),
             Some("sm_refold") => out.push(json!({"command": "sheet.refold", "params": {"name": name}})),
             Some("path_pattern") => {
                 let path = f.get("path").cloned().unwrap_or(Value::Null);
@@ -392,7 +392,7 @@ pub fn to_script(recipe: &Value) -> Result<Value, String> {
                 } else {
                     p["features"] = feature_refs(f.get("features"));
                 }
-                out.push(json!({"command": "PatternOnPath", "params": p}));
+                out.push(json!({"command": "solid.pattern.path", "params": p}));
             }
             Some("loft") => {
                 let sections: Vec<Value> = f
@@ -405,24 +405,24 @@ pub fn to_script(recipe: &Value) -> Result<Value, String> {
                         None => json!({"sketch": sec.get("sketch"), "profiles": [sec]}),
                     })
                     .collect();
-                out.push(json!({"command": "SolidLoft", "params": {"sections": sections, "operation": op(f), "name": name, "body_names": bodies}}));
+                out.push(json!({"command": "solid.loft", "params": {"sections": sections, "operation": op(f), "name": name, "body_names": bodies}}));
             }
             Some("sweep") if helix_path(features, f).is_some() => {
                 // A swept circle along a fitted 3D helix: a coil (the true helix).
                 let Some((base, diameter, pitch, turns, start, cw, size)) = helix_path(features, f) else { continue };
-                out.push(json!({"command": "PrimitiveCoil", "params": {
+                out.push(json!({"command": "solid.coil", "params": {
                     "base": base, "diameter": diameter, "pitch": pitch, "revolutions": turns, "section_size": size,
                     "start_angle": format!("{start} rad"), "clockwise": cw, "operation": op(f), "name": name, "body_names": bodies}}));
             }
             Some("sweep") => {
                 let path = f.get("path").cloned().unwrap_or(Value::Null);
-                out.push(json!({"command": "Sweep", "params": {
+                out.push(json!({"command": "solid.sweep", "params": {
                     "sketch": profile_sketch(f), "profiles": profiles_of(f), "path_sketch": path.get("sketch"), "path": path.get("curves"),
                     "operation": op(f), "name": name, "body_names": bodies}}));
             }
             Some("shell") => {
                 let faces: Vec<Value> = f.get("faces_removed").and_then(Value::as_array).into_iter().flatten().filter_map(|x| x.get("point").cloned()).collect();
-                out.push(json!({"command": "FusionShellBodyCommand", "params": {"faces": faces, "thickness": f.get("inside_thickness"), "name": name}}));
+                out.push(json!({"command": "solid.shell", "params": {"faces": faces, "thickness": f.get("inside_thickness"), "name": name}}));
             }
             Some("draft") => {
                 let faces: Vec<Value> = f.get("faces").and_then(Value::as_array).into_iter().flatten().filter_map(|x| x.get("point").cloned()).collect();
@@ -433,7 +433,7 @@ pub fn to_script(recipe: &Value) -> Result<Value, String> {
                 if f.get("flipped").and_then(Value::as_bool).unwrap_or(false) {
                     angle = -angle;
                 }
-                out.push(json!({"command": "FusionDraftCommand", "params": {"faces": faces, "angle": angle, "neutral": neutral, "pull": n, "name": name}}));
+                out.push(json!({"command": "solid.draft", "params": {"faces": faces, "angle": angle, "neutral": neutral, "pull": n, "name": name}}));
             }
             Some("thread") => {
                 let face = f.get("face").and_then(|x| x.get("point")).cloned().unwrap_or(Value::Null);
@@ -443,7 +443,7 @@ pub fn to_script(recipe: &Value) -> Result<Value, String> {
                 {
                     p["length"] = l.clone();
                 }
-                out.push(json!({"command": "FusionThreadCommand", "params": p}));
+                out.push(json!({"command": "solid.thread", "params": p}));
             }
             Some("hole") => {
                 let n = f.get("face").and_then(|fc| fc.get("plane_normal_outward").or(fc.get("normal_at_point_on_face"))).cloned();
@@ -495,20 +495,20 @@ pub fn to_script(recipe: &Value) -> Result<Value, String> {
                         p[k] = v.clone();
                     }
                 }
-                out.push(json!({"command": "FusionHoleCommand", "params": p}));
+                out.push(json!({"command": "solid.hole", "params": p}));
             }
             Some("construction_plane") => match f.get("method").and_then(Value::as_str) {
-                Some("offset") => out.push(json!({"command": "ConstructionPlaneOffsetFromPlaneCommand", "params": {"base": f.get("base"), "offset": f.get("offset"), "name": name}})),
+                Some("offset") => out.push(json!({"command": "construct.plane.offset", "params": {"base": f.get("base"), "offset": f.get("offset"), "name": name}})),
                 _ => {
                     // Use the resulting plane as recorded.
                     let (o, n) = (f.get("result_origin").cloned().unwrap_or(json!([0, 0, 0])), f.get("result_normal").cloned().unwrap_or(Value::Null));
                     if n.is_null() {
                         return Err(format!("recipe: construction plane method {:?} without result_normal", f.get("method")));
                     }
-                    out.push(json!({"command": "ConstructionPlaneOffsetFromPlaneCommand", "params": {"base": {"origin": o, "normal": n}, "offset": 0, "name": name}}));
+                    out.push(json!({"command": "construct.plane.offset", "params": {"base": {"origin": o, "normal": n}, "offset": 0, "name": name}}));
                 }
             },
-            Some("split_body") => out.push(json!({"command": "FusionSplitBodyCommand", "params": {"body": f.get("body"), "plane": f.get("tool"), "name": name}})),
+            Some("split_body") => out.push(json!({"command": "solid.split_body", "params": {"body": f.get("body"), "plane": f.get("tool"), "name": name}})),
             Some("mirror") => {
                 let pl = f.get("plane").cloned().unwrap_or(Value::Null);
                 let plane = match pl.get("ref").and_then(Value::as_str) {
@@ -519,13 +519,13 @@ pub fn to_script(recipe: &Value) -> Result<Value, String> {
                 if f.get("mirror_of").and_then(Value::as_str) == Some("bodies") {
                     p = json!({"bodies": f.get("bodies"), "combine": f.get("combine").cloned().unwrap_or(json!(false)), "plane": plane, "name": name});
                 }
-                out.push(json!({"command": "MirrorCommand", "params": p}));
+                out.push(json!({"command": "solid.mirror", "params": p}));
             }
             Some("fillet") => {
-                out.push(json!({"command": "FusionFilletEdgesCommand", "params": {"edges": edge_points(f), "radius": f.get("radius"), "name": name}}))
+                out.push(json!({"command": "solid.fillet", "params": {"edges": edge_points(f), "radius": f.get("radius"), "name": name}}))
             }
             Some("chamfer") => {
-                out.push(json!({"command": "FusionChamferCommand", "params": {"edges": edge_points(f), "distance": f.get("distance"), "name": name}}))
+                out.push(json!({"command": "solid.chamfer", "params": {"edges": edge_points(f), "distance": f.get("distance"), "name": name}}))
             }
             Some(other) => return Err(format!("recipe: feature op `{other}` is not supported yet")),
             None => return Err("recipe: feature without `op`".into()),

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

@@ -1,15 +1,15 @@
 {"commands": [
- {"command": "PrimitiveBox", "params": {"length": 10, "width": 10, "height": 10, "body_name": "Base"}},
- {"command": "FusionCreateNewComponentCommand", "params": {"name": "Arm"}},
- {"command": "PrimitiveBox", "params": {"corner": [20, 0, 0], "length": 10, "width": 4, "height": 4, "body_name": "ArmBody"}},
- {"command": "FusionFilletEdgesCommand", "params": {"edges": [[25, 4, 4]], "radius": 1}},
+ {"command": "solid.box", "params": {"length": 10, "width": 10, "height": 10, "body_name": "Base"}},
+ {"command": "component.create", "params": {"name": "Arm"}},
+ {"command": "solid.box", "params": {"corner": [20, 0, 0], "length": 10, "width": 4, "height": 4, "body_name": "ArmBody"}},
+ {"command": "solid.fillet", "params": {"edges": [[25, 4, 4]], "radius": 1}},
  {"command": "component.activate", "params": {"component": 0}},
  {"command": "occurrence.move", "params": {"occurrence": 3, "translate": [0, 50, 0]}},
  {"command": "occurrence.copy", "params": {"component": "Arm", "translate": [0, 20, 0]}},
  {"command": "component.paste_new", "params": {"component": "Arm", "translate": [0, -30, 0]}},
  {"command": "occurrence.ground", "params": {"occurrence": 3}},
- {"command": "SketchCreate", "params": {"plane": "XY", "name": "S1"}},
- {"command": "CircleCenterRadius", "params": {"center": [5, 5], "radius": 2}},
- {"command": "SketchStop", "params": {}},
- {"command": "Extrude", "params": {"distance": 10, "operation": "cut"}}
+ {"command": "sketch.create", "params": {"plane": "XY", "name": "S1"}},
+ {"command": "sketch.circle.center", "params": {"center": [5, 5], "radius": 2}},
+ {"command": "sketch.finish", "params": {}},
+ {"command": "solid.extrude", "params": {"distance": 10, "operation": "cut"}}
 ]}

apps/solvecraft-cli/tests/corpus/scripts/joints-hinge.json

@@ -1,14 +1,14 @@
 {"commands": [
- {"command": "ChangeParameterCommand", "params": {"name": "open_angle", "expression": "90 deg"}},
- {"command": "FusionCreateNewComponentCommand", "params": {"name": "LeafA"}},
- {"command": "PrimitiveBox", "params": {"length": 40, "width": 30, "height": 3, "corner": [0, 0, 0]}},
- {"command": "PrimitiveCylinder", "params": {"base": [0, 33, 4], "axis": [1, 0, 0], "radius": 4, "height": 40, "operation": "new"}},
+ {"command": "parameters.change", "params": {"name": "open_angle", "expression": "90 deg"}},
+ {"command": "component.create", "params": {"name": "LeafA"}},
+ {"command": "solid.box", "params": {"length": 40, "width": 30, "height": 3, "corner": [0, 0, 0]}},
+ {"command": "solid.cylinder", "params": {"base": [0, 33, 4], "axis": [1, 0, 0], "radius": 4, "height": 40, "operation": "new"}},
  {"command": "component.activate", "params": {"component": "root"}},
- {"command": "FusionCreateNewComponentCommand", "params": {"name": "LeafB"}},
- {"command": "PrimitiveBox", "params": {"length": 40, "width": 30, "height": 3, "corner": [0, 0, 0]}},
- {"command": "PrimitiveCylinder", "params": {"base": [0, 33, 4], "axis": [1, 0, 0], "radius": 4, "height": 40, "operation": "new"}},
+ {"command": "component.create", "params": {"name": "LeafB"}},
+ {"command": "solid.box", "params": {"length": 40, "width": 30, "height": 3, "corner": [0, 0, 0]}},
+ {"command": "solid.cylinder", "params": {"base": [0, 33, 4], "axis": [1, 0, 0], "radius": 4, "height": 40, "operation": "new"}},
  {"command": "component.activate", "params": {"component": "root"}},
  {"command": "occurrence.ground", "params": {"occurrence": 2, "grounded": true}},
- {"command": "JointAssembleCmdNew", "params": {"type": "revolute", "a": {"occurrence": "LeafA", "circle": [1, 37, 4]}, "b": {"occurrence": "LeafB", "circle": [1, 37, 4]}, "name": "Hinge"}},
- {"command": "FusionMoveJointsCommand", "params": {"joint": "Hinge", "value": "open_angle"}}
+ {"command": "joint.create", "params": {"type": "revolute", "a": {"occurrence": "LeafA", "circle": [1, 37, 4]}, "b": {"occurrence": "LeafB", "circle": [1, 37, 4]}, "name": "Hinge"}},
+ {"command": "joint.drive", "params": {"joint": "Hinge", "value": "open_angle"}}
 ]}

apps/solvecraft-cli/tests/corpus/scripts/m0-box-fillet-hole.json

@@ -1,12 +1,12 @@
 {"commands": [
- {"command": "ChangeParameterCommand", "params": {"name": "width", "expression": "40 mm"}},
- {"command": "SketchCreate", "params": {"plane": "XY"}},
- {"command": "ShapeRectangleTwoPoint", "params": {"p0": [0, 0], "p1": [40, 30]}},
- {"command": "SketchStop", "params": {}},
- {"command": "Extrude", "params": {"distance": "width / 2"}},
- {"command": "FusionFilletEdgesCommand", "params": {"edges": [[0, 0, 10]], "radius": 3}},
- {"command": "SketchCreate", "params": {"plane": "XY"}},
- {"command": "CircleCenterRadius", "params": {"center": [20, 15], "radius": 5}},
- {"command": "SketchStop", "params": {}},
- {"command": "Extrude", "params": {"distance": 20, "operation": "cut"}}
+ {"command": "parameters.change", "params": {"name": "width", "expression": "40 mm"}},
+ {"command": "sketch.create", "params": {"plane": "XY"}},
+ {"command": "sketch.rectangle.two_point", "params": {"p0": [0, 0], "p1": [40, 30]}},
+ {"command": "sketch.finish", "params": {}},
+ {"command": "solid.extrude", "params": {"distance": "width / 2"}},
+ {"command": "solid.fillet", "params": {"edges": [[0, 0, 10]], "radius": 3}},
+ {"command": "sketch.create", "params": {"plane": "XY"}},
+ {"command": "sketch.circle.center", "params": {"center": [20, 15], "radius": 5}},
+ {"command": "sketch.finish", "params": {}},
+ {"command": "solid.extrude", "params": {"distance": 20, "operation": "cut"}}
 ]}

apps/solvecraft-cli/tests/corpus/scripts/m0-revolve-primitives.json

@@ -1,11 +1,11 @@
 {"commands": [
- {"command": "SketchCreate", "params": {"plane": "XZ"}},
- {"command": "DrawPolyline", "params": {"points": [[10, 0], [15, 0], [15, 5], [10, 5]], "closed": true}},
- {"command": "SketchStop", "params": {}},
- {"command": "Revolve", "params": {"axis": "y"}},
- {"command": "PrimitiveBox", "params": {"length": 10, "width": 10, "height": 10, "corner": [30, 0, 0]}},
- {"command": "PrimitiveCylinder", "params": {"diameter": 4, "height": 20, "base": [35, 5, -5]}},
- {"command": "FusionCombineCommand", "params": {"target": "Body2", "tools": ["Body3"], "operation": "cut"}},
- {"command": "FusionChamferCommand", "params": {"edges": [[30, 5, 10]], "distance": 1}},
+ {"command": "sketch.create", "params": {"plane": "XZ"}},
+ {"command": "sketch.line", "params": {"points": [[10, 0], [15, 0], [15, 5], [10, 5]], "closed": true}},
+ {"command": "sketch.finish", "params": {}},
+ {"command": "solid.revolve", "params": {"axis": "y"}},
+ {"command": "solid.box", "params": {"length": 10, "width": 10, "height": 10, "corner": [30, 0, 0]}},
+ {"command": "solid.cylinder", "params": {"diameter": 4, "height": 20, "base": [35, 5, -5]}},
+ {"command": "solid.combine", "params": {"target": "Body2", "tools": ["Body3"], "operation": "cut"}},
+ {"command": "solid.chamfer", "params": {"edges": [[30, 5, 10]], "distance": 1}},
  {"command": "timeline.edit", "params": {"feature": "Revolve1", "set": {"angle": "180 deg"}}}
 ]}

apps/solvecraft-cli/tests/corpus/scripts/modern-path-pattern.json

@@ -1,14 +1,14 @@
 {
   "commands": [
     {
-      "command": "SketchCreate",
+      "command": "sketch.create",
       "params": {
         "name": "Plate_sketch",
         "plane": "XY"
       }
     },
     {
-      "command": "DrawPolyline",
+      "command": "sketch.line",
       "params": {
         "construction": false,
         "ids": [
@@ -27,7 +27,7 @@
       }
     },
     {
-      "command": "DrawPolyline",
+      "command": "sketch.line",
       "params": {
         "construction": false,
         "ids": [
@@ -43,7 +43,7 @@
       }
     },
     {
-      "command": "DrawPolyline",
+      "command": "sketch.line",
       "params": {
         "construction": false,
         "ids": [
@@ -59,7 +59,7 @@
       }
     },
     {
-      "command": "DrawPolyline",
+      "command": "sketch.line",
       "params": {
         "construction": false,
         "ids": [
@@ -72,11 +72,11 @@
       }
     },
     {
-      "command": "SketchStop",
+      "command": "sketch.finish",
       "params": {}
     },
     {
-      "command": "Extrude",
+      "command": "solid.extrude",
       "params": {
         "body_names": [
           "Plate"
@@ -110,14 +110,14 @@
       }
     },
     {
-      "command": "SketchCreate",
+      "command": "sketch.create",
       "params": {
         "name": "PathSketch",
         "plane": "XY"
       }
     },
     {
-      "command": "ArcThreePoint",
+      "command": "sketch.arc.three_point",
       "params": {
         "end": [
           20,
@@ -135,7 +135,7 @@
       }
     },
     {
-      "command": "CircleCenterRadius",
+      "command": "sketch.circle.center",
       "params": {
         "center": "a1.start",
         "construction": false,
@@ -144,11 +144,11 @@
       }
     },
     {
-      "command": "SketchStop",
+      "command": "sketch.finish",
       "params": {}
     },
     {
-      "command": "Extrude",
+      "command": "solid.extrude",
       "params": {
         "body_names": [
           "Plate"
@@ -179,7 +179,7 @@
       }
     },
     {
-      "command": "PatternOnPath",
+      "command": "solid.pattern.path",
       "params": {
         "count": 7,
         "features": [

apps/solvecraft-cli/tests/corpus/scripts/modern-plastic.json

@@ -1,10 +1,10 @@
 {"commands": [
- {"command": "ChangeParameterCommand", "params": {"name": "wall", "expression": "2 mm"}},
- {"command": "PrimitiveBox", "params": {"length": 80, "width": 50, "height": 30}},
- {"command": "FusionShellBodyCommand", "params": {"faces": [[40, 25, 30]], "thickness": "wall"}},
- {"command": "FusionLipCommand", "params": {"face": [1, 25, 30], "width": 1, "height": 2}},
- {"command": "FusionBossCommand", "params": {"position": [20, 20, 2], "diameter": 6, "height": 10, "hole_diameter": 2.5, "draft": "1 deg"}},
- {"command": "FusionRestCommand", "params": {"position": [60, 30, 2], "width": 8, "length": 12, "height": 3, "thickness": 1}},
- {"command": "FusionSnapFitCommand", "params": {"position": [40, 12, 2], "direction": [0, 0, 1], "hook": [0, 1, 0], "length": 12, "thickness": 1.5, "width": 6, "catch_depth": 1, "catch_length": 2}},
- {"command": "FusionManagePlasticRuleCommand", "params": {"name": "ABS (1.5mm)", "active": true}}
+ {"command": "parameters.change", "params": {"name": "wall", "expression": "2 mm"}},
+ {"command": "solid.box", "params": {"length": 80, "width": 50, "height": 30}},
+ {"command": "solid.shell", "params": {"faces": [[40, 25, 30]], "thickness": "wall"}},
+ {"command": "plastic.lip", "params": {"face": [1, 25, 30], "width": 1, "height": 2}},
+ {"command": "plastic.boss", "params": {"position": [20, 20, 2], "diameter": 6, "height": 10, "hole_diameter": 2.5, "draft": "1 deg"}},
+ {"command": "plastic.rest", "params": {"position": [60, 30, 2], "width": 8, "length": 12, "height": 3, "thickness": 1}},
+ {"command": "plastic.snap_fit", "params": {"position": [40, 12, 2], "direction": [0, 0, 1], "hook": [0, 1, 0], "length": 12, "thickness": 1.5, "width": 6, "catch_depth": 1, "catch_length": 2}},
+ {"command": "plastic.manage_rules", "params": {"name": "ABS (1.5mm)", "active": true}}
 ]}

apps/solvecraft-cli/tests/corpus/scripts/modern-sheet-metal.json

@@ -1,7 +1,7 @@
 {
   "commands": [
     {
-      "command": "SketchCreate",
+      "command": "sketch.create",
       "params": {
         "name": "Contour",
         "plane": {
@@ -24,7 +24,7 @@
       }
     },
     {
-      "command": "DrawPolyline",
+      "command": "sketch.line",
       "params": {
         "construction": false,
         "ids": [
@@ -43,7 +43,7 @@
       }
     },
     {
-      "command": "DrawPolyline",
+      "command": "sketch.line",
       "params": {
         "construction": false,
         "ids": [
@@ -59,7 +59,7 @@
       }
     },
     {
-      "command": "DrawPolyline",
+      "command": "sketch.line",
       "params": {
         "construction": false,
         "ids": [
@@ -75,11 +75,11 @@
       }
     },
     {
-      "command": "SketchStop",
+      "command": "sketch.finish",
       "params": {}
     },
     {
-      "command": "FusionSheetMetalFlangeCommand",
+      "command": "sheet.flange",
       "params": {
         "curves": [
           "l1",

apps/solvecraft-cli/tests/design_corpus.rs

@@ -57,7 +57,7 @@ fn old_designs_open_and_evaluate_as_saved() {
             }
         }
         assert_eq!(s.doc.format, solvecraft_engine::doc::format::format_string(solvecraft_engine::doc::format::FORMAT), "{name}: upgraded");
-        let got = s.execute("MeasureCommand", &json!({})).unwrap();
+        let got = s.execute("inspect.measure", &json!({})).unwrap();
         if got["body_count"] != want["body_count"] && !known(&name, "body_count") {
             problems.push(format!("{name}: {} bodies, saved with {}", got["body_count"], want["body_count"]));
         }
@@ -145,7 +145,7 @@ fn at_mut<'a>(v: &'a mut Value, path: &[Value]) -> Option<&'a mut Value> {
 fn try_bytes(bytes: &[u8]) {
     if let Ok(doc) = solvecraft_engine::io::read_design(bytes) {
         let mut s = Session::new(doc);
-        let _ = s.execute("MeasureCommand", &json!({}));
+        let _ = s.execute("inspect.measure", &json!({}));
         let _ = s.execute("document.inspect", &json!({}));
     }
 }

apps/solvecraft/src/main.rs

@@ -6,7 +6,7 @@
 //! `.3mf`/`.stl` file as a new design holding mesh bodies.
 //!
 //! `--control <port>` (or `SOLVECRAFT_CONTROL_PORT`) starts a localhost JSON-lines control
-//! server: `{"id":1,"method":"engine.execute","params":{"command":"PrimitiveBox","params":{…}}}`.
+//! server: `{"id":1,"method":"engine.execute","params":{"command":"solid.box","params":{…}}}`.
 //! See `solvecraft_ui_egui::control` and docs/control-protocol.md.
 #![cfg_attr(all(target_os = "windows", not(debug_assertions)), windows_subsystem = "windows")]
 #![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]