A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu)

Fixes #26103

.github/workflows/ci.yml

@@ -135,7 +135,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-14, ubuntu-latest, windows-latest]
+        os: [macos-14, windows-latest]
+        # TODO: add back ubuntu when https://github.com/KittyCAD/modeling-app/issues/625 is closed
+        # os: [macos-14, ubuntu-latest, windows-latest]
     env:
       # Specific Apple Universal target for macos
       TAURI_ARGS_MACOS: ${{ matrix.os == 'macos-14' && '--target universal-apple-darwin' || '' }}

docs/kcl/angleToMatchLengthX.md

@@ -9,7 +9,7 @@ Returns the angle to match the given length for x.
 
 
 ```js
-angleToMatchLengthX(tag: TagIdentifier, to: number, sketch_group: SketchGroup) -> number
+angleToMatchLengthX(segment_name: TagIdentifier, to: number, sketch_group: SketchGroup) -> number
 ```
 
 ### Examples
@@ -28,95 +28,9 @@ const extrusion = extrude(5, sketch001)
 
 ### Arguments
 
-* `tag`: `TagIdentifier` (REQUIRED)
+* `segment_name`: `TagIdentifier` (REQUIRED)
 ```js
 {
-	// Engine information for a tag.
-	info: {
-	// The id of the tagged object.
-	id: uuid,
-	// The path the tag is on.
-	path: {
-	// The from point.
-	from: [number, number],
-	// The tag of the path.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	// The to point.
-	to: [number, number],
-},
-	// The sketch group the tag is on.
-	sketchGroup: uuid,
-	// The surface information for the tag.
-	surface: {
-	// The face id for the extrude plane.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "extrudePlane",
-} |
-{
-	// The face id for the extrude plane.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
-},
-},
 	value: string,
 }
 ```
@@ -124,7 +38,7 @@ const extrusion = extrude(5, sketch001)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -166,21 +80,15 @@ const extrusion = extrude(5, sketch001)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -198,7 +106,7 @@ const extrusion = extrude(5, sketch001)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -349,38 +257,6 @@ const extrusion = extrude(5, sketch001)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.

docs/kcl/angleToMatchLengthY.md

@@ -9,7 +9,7 @@ Returns the angle to match the given length for y.
 
 
 ```js
-angleToMatchLengthY(tag: TagIdentifier, to: number, sketch_group: SketchGroup) -> number
+angleToMatchLengthY(segment_name: TagIdentifier, to: number, sketch_group: SketchGroup) -> number
 ```
 
 ### Examples
@@ -32,95 +32,9 @@ const extrusion = extrude(5, sketch001)
 
 ### Arguments
 
-* `tag`: `TagIdentifier` (REQUIRED)
+* `segment_name`: `TagIdentifier` (REQUIRED)
 ```js
 {
-	// Engine information for a tag.
-	info: {
-	// The id of the tagged object.
-	id: uuid,
-	// The path the tag is on.
-	path: {
-	// The from point.
-	from: [number, number],
-	// The tag of the path.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	// The to point.
-	to: [number, number],
-},
-	// The sketch group the tag is on.
-	sketchGroup: uuid,
-	// The surface information for the tag.
-	surface: {
-	// The face id for the extrude plane.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "extrudePlane",
-} |
-{
-	// The face id for the extrude plane.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
-},
-},
 	value: string,
 }
 ```
@@ -128,7 +42,7 @@ const extrusion = extrude(5, sketch001)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -170,21 +84,15 @@ const extrusion = extrude(5, sketch001)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -202,7 +110,7 @@ const extrusion = extrude(5, sketch001)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -353,38 +261,6 @@ const extrusion = extrude(5, sketch001)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.

docs/kcl/angledLine.md

@@ -33,7 +33,7 @@ const example = extrude(10, exampleSketch)
 * `data`: `AngledLineData` - Data to draw an angled line. (REQUIRED)
 ```js
 {
-	// The angle of the line (in degrees).
+	// The angle of the line.
 	angle: number,
 	// The length of the line.
 	length: number,
@@ -43,7 +43,7 @@ const example = extrude(10, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -85,21 +85,15 @@ const example = extrude(10, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -117,7 +111,7 @@ const example = extrude(10, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -268,38 +262,6 @@ const example = extrude(10, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -455,7 +417,7 @@ const example = extrude(10, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -497,21 +459,15 @@ const example = extrude(10, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -529,7 +485,7 @@ const example = extrude(10, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -680,38 +636,6 @@ const example = extrude(10, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.

docs/kcl/angledLineOfXLength.md

@@ -32,7 +32,7 @@ const extrusion = extrude(10, sketch001)
 * `data`: `AngledLineData` - Data to draw an angled line. (REQUIRED)
 ```js
 {
-	// The angle of the line (in degrees).
+	// The angle of the line.
 	angle: number,
 	// The length of the line.
 	length: number,
@@ -42,7 +42,7 @@ const extrusion = extrude(10, sketch001)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -84,21 +84,15 @@ const extrusion = extrude(10, sketch001)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -116,7 +110,7 @@ const extrusion = extrude(10, sketch001)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -267,38 +261,6 @@ const extrusion = extrude(10, sketch001)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -454,7 +416,7 @@ const extrusion = extrude(10, sketch001)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -496,21 +458,15 @@ const extrusion = extrude(10, sketch001)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -528,7 +484,7 @@ const extrusion = extrude(10, sketch001)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -679,38 +635,6 @@ const extrusion = extrude(10, sketch001)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.

docs/kcl/angledLineOfYLength.md

@@ -34,7 +34,7 @@ const example = extrude(10, exampleSketch)
 * `data`: `AngledLineData` - Data to draw an angled line. (REQUIRED)
 ```js
 {
-	// The angle of the line (in degrees).
+	// The angle of the line.
 	angle: number,
 	// The length of the line.
 	length: number,
@@ -44,7 +44,7 @@ const example = extrude(10, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -86,21 +86,15 @@ const example = extrude(10, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -118,7 +112,7 @@ const example = extrude(10, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -269,38 +263,6 @@ const example = extrude(10, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -456,7 +418,7 @@ const example = extrude(10, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -498,21 +460,15 @@ const example = extrude(10, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -530,7 +486,7 @@ const example = extrude(10, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -681,38 +637,6 @@ const example = extrude(10, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.

docs/kcl/angledLineThatIntersects.md

@@ -22,7 +22,7 @@ const exampleSketch = startSketchOn('XZ')
   |> lineTo([0, 20], %)
   |> angledLineThatIntersects({
        angle: 80,
-       intersectTag: lineToIntersect,
+       intersectTag: 'lineToIntersect',
        offset: 10
      }, %)
   |> close(%)
@@ -41,92 +41,6 @@ const example = extrude(10, exampleSketch)
 	angle: number,
 	// The tag of the line to intersect with.
 	intersectTag: {
-	// Engine information for a tag.
-	info: {
-	// The id of the tagged object.
-	id: uuid,
-	// The path the tag is on.
-	path: {
-	// The from point.
-	from: [number, number],
-	// The tag of the path.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	// The to point.
-	to: [number, number],
-},
-	// The sketch group the tag is on.
-	sketchGroup: uuid,
-	// The surface information for the tag.
-	surface: {
-	// The face id for the extrude plane.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "extrudePlane",
-} |
-{
-	// The face id for the extrude plane.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
-},
-},
 	value: string,
 },
 	// The offset from the intersecting line.
@@ -136,7 +50,7 @@ const example = extrude(10, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -178,21 +92,15 @@ const example = extrude(10, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -210,7 +118,7 @@ const example = extrude(10, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -361,38 +269,6 @@ const example = extrude(10, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -548,7 +424,7 @@ const example = extrude(10, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -590,21 +466,15 @@ const example = extrude(10, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -622,7 +492,7 @@ const example = extrude(10, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -773,38 +643,6 @@ const example = extrude(10, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.

docs/kcl/angledLineToX.md

@@ -41,7 +41,7 @@ const example = extrude(10, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -83,21 +83,15 @@ const example = extrude(10, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -115,7 +109,7 @@ const example = extrude(10, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -266,38 +260,6 @@ const example = extrude(10, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -453,7 +415,7 @@ const example = extrude(10, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -495,21 +457,15 @@ const example = extrude(10, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -527,7 +483,7 @@ const example = extrude(10, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -678,38 +634,6 @@ const example = extrude(10, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.

docs/kcl/angledLineToY.md

@@ -41,7 +41,7 @@ const example = extrude(10, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -83,21 +83,15 @@ const example = extrude(10, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -115,7 +109,7 @@ const example = extrude(10, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -266,38 +260,6 @@ const example = extrude(10, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -453,7 +415,7 @@ const example = extrude(10, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -495,21 +457,15 @@ const example = extrude(10, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -527,7 +483,7 @@ const example = extrude(10, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -678,38 +634,6 @@ const example = extrude(10, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.

docs/kcl/arc.md

@@ -19,8 +19,8 @@ const exampleSketch = startSketchOn('XZ')
   |> startProfileAt([0, 0], %)
   |> line([10, 0], %)
   |> arc({
-       angleStart: 0,
-       angleEnd: 280,
+       angle_start: 0,
+       angle_end: 280,
        radius: 16
      }, %)
   |> close(%)
@@ -34,9 +34,9 @@ const exampleSketch = startSketchOn('XZ')
 ```js
 {
 	// The end angle.
-	angleEnd: number,
+	angle_end: number,
 	// The start angle.
-	angleStart: number,
+	angle_start: number,
 	// The radius.
 	radius: number,
 } |
@@ -52,7 +52,7 @@ const exampleSketch = startSketchOn('XZ')
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -94,21 +94,15 @@ const exampleSketch = startSketchOn('XZ')
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -126,7 +120,7 @@ const exampleSketch = startSketchOn('XZ')
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -277,38 +271,6 @@ const exampleSketch = startSketchOn('XZ')
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -464,7 +426,7 @@ const exampleSketch = startSketchOn('XZ')
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -506,21 +468,15 @@ const exampleSketch = startSketchOn('XZ')
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -538,7 +494,7 @@ const exampleSketch = startSketchOn('XZ')
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -689,38 +645,6 @@ const exampleSketch = startSketchOn('XZ')
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.

docs/kcl/bezierCurve.md

@@ -47,7 +47,7 @@ const example = extrude(10, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -89,21 +89,15 @@ const example = extrude(10, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -121,7 +115,7 @@ const example = extrude(10, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -272,38 +266,6 @@ const example = extrude(10, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -459,7 +421,7 @@ const example = extrude(10, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -501,21 +463,15 @@ const example = extrude(10, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -533,7 +489,7 @@ const example = extrude(10, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -684,38 +640,6 @@ const example = extrude(10, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.

docs/kcl/chamfer.md

@@ -31,10 +31,10 @@ const mountingPlate = extrude(thickness, mountingPlateSketch)
   |> chamfer({
        length: chamferLength,
        tags: [
-         getNextAdjacentEdge(edge1),
-         getNextAdjacentEdge(edge2),
-         getNextAdjacentEdge(edge3),
-         getNextAdjacentEdge(edge4)
+         getNextAdjacentEdge(edge1, %),
+         getNextAdjacentEdge(edge2, %),
+         getNextAdjacentEdge(edge3, %),
+         getNextAdjacentEdge(edge4, %)
        ]
      }, %)
 ```
@@ -51,92 +51,6 @@ const mountingPlate = extrude(thickness, mountingPlateSketch)
 	// The tags of the paths you want to chamfer.
 	tags: [uuid |
 {
-	// Engine information for a tag.
-	info: {
-	// The id of the tagged object.
-	id: uuid,
-	// The path the tag is on.
-	path: {
-	// The from point.
-	from: [number, number],
-	// The tag of the path.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	// The to point.
-	to: [number, number],
-},
-	// The sketch group the tag is on.
-	sketchGroup: uuid,
-	// The surface information for the tag.
-	surface: {
-	// The face id for the extrude plane.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "extrudePlane",
-} |
-{
-	// The face id for the extrude plane.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
-},
-},
 	value: string,
 }],
 }
@@ -149,21 +63,15 @@ const mountingPlate = extrude(thickness, mountingPlateSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -181,7 +89,7 @@ const mountingPlate = extrude(thickness, mountingPlateSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -223,21 +131,15 @@ const mountingPlate = extrude(thickness, mountingPlateSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -289,38 +191,6 @@ const mountingPlate = extrude(thickness, mountingPlateSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -494,38 +364,6 @@ const mountingPlate = extrude(thickness, mountingPlateSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 }
 ```
@@ -549,21 +387,15 @@ const mountingPlate = extrude(thickness, mountingPlateSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -581,7 +413,7 @@ const mountingPlate = extrude(thickness, mountingPlateSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -623,21 +455,15 @@ const mountingPlate = extrude(thickness, mountingPlateSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -689,38 +515,6 @@ const mountingPlate = extrude(thickness, mountingPlateSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -894,38 +688,6 @@ const mountingPlate = extrude(thickness, mountingPlateSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 }
 ```

docs/kcl/circle.md

@@ -82,21 +82,15 @@ const example = extrude(5, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -114,7 +108,7 @@ const example = extrude(5, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -265,38 +259,6 @@ const example = extrude(5, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -324,7 +286,7 @@ const example = extrude(5, exampleSketch)
 },
 } |
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -366,21 +328,15 @@ const example = extrude(5, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -432,38 +388,6 @@ const example = extrude(5, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -619,7 +543,7 @@ const example = extrude(5, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -661,21 +585,15 @@ const example = extrude(5, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -693,7 +611,7 @@ const example = extrude(5, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -844,38 +762,6 @@ const example = extrude(5, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.

docs/kcl/close.md

@@ -42,7 +42,7 @@ const example = extrude(10, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -84,21 +84,15 @@ const example = extrude(10, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -116,7 +110,7 @@ const example = extrude(10, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -267,38 +261,6 @@ const example = extrude(10, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -454,7 +416,7 @@ const example = extrude(10, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -496,21 +458,15 @@ const example = extrude(10, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -528,7 +484,7 @@ const example = extrude(10, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -679,38 +635,6 @@ const example = extrude(10, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.

docs/kcl/extrude.md

@@ -19,8 +19,8 @@ const example = startSketchOn('XZ')
   |> startProfileAt([0, 0], %)
   |> line([10, 0], %)
   |> arc({
-       angleStart: 120,
-       angleEnd: 0,
+       angle_end: 0,
+       angle_start: 120,
        radius: 5
      }, %)
   |> line([5, 0], %)
@@ -41,8 +41,8 @@ const example = startSketchOn('XZ')
 const exampleSketch = startSketchOn('XZ')
   |> startProfileAt([-10, 0], %)
   |> arc({
-       angleStart: 120,
-       angleEnd: -60,
+       angle_end: -60,
+       angle_start: 120,
        radius: 5
      }, %)
   |> line([10, 0], %)
@@ -67,7 +67,7 @@ const example = extrude(10, exampleSketch)
 * `sketch_group_set`: `SketchGroupSet` - A sketch group or a group of sketch groups. (REQUIRED)
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -109,21 +109,15 @@ const example = extrude(10, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -141,7 +135,7 @@ const example = extrude(10, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -292,38 +286,6 @@ const example = extrude(10, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -479,21 +441,15 @@ const example = extrude(10, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -511,7 +467,7 @@ const example = extrude(10, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -553,21 +509,15 @@ const example = extrude(10, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -619,38 +569,6 @@ const example = extrude(10, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -825,38 +743,6 @@ const example = extrude(10, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 } |
 {

docs/kcl/helix.md

@@ -19,9 +19,10 @@ const part001 = startSketchOn('XY')
   |> circle([5, 5], 10, %)
   |> extrude(10, %)
   |> helix({
-       angleStart: 0,
+       angle_start: 0,
        ccw: true,
-       revolutions: 16
+       revolutions: 16,
+       angle_start: 0
      }, %)
 ```
 
@@ -33,7 +34,7 @@ const part001 = startSketchOn('XY')
 ```js
 {
 	// Start angle (in degrees).
-	angleStart: number,
+	angle_start: number,
 	// Is the helix rotation counter clockwise? The default is `false`.
 	ccw: string,
 	// Length of the helix. If this argument is not provided, the height of the extrude group is used.
@@ -50,21 +51,15 @@ const part001 = startSketchOn('XY')
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -82,7 +77,7 @@ const part001 = startSketchOn('XY')
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -124,21 +119,15 @@ const part001 = startSketchOn('XY')
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -190,38 +179,6 @@ const part001 = startSketchOn('XY')
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -395,38 +352,6 @@ const part001 = startSketchOn('XY')
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 }
 ```
@@ -441,21 +366,15 @@ const part001 = startSketchOn('XY')
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -473,7 +392,7 @@ const part001 = startSketchOn('XY')
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -515,21 +434,15 @@ const part001 = startSketchOn('XY')
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -581,38 +494,6 @@ const part001 = startSketchOn('XY')
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -786,38 +667,6 @@ const part001 = startSketchOn('XY')
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 }
 ```

docs/kcl/hole.md

@@ -53,7 +53,7 @@ const example = extrude(1, exampleSketch)
 * `hole_sketch_group`: `SketchGroupSet` - A sketch group or a group of sketch groups. (REQUIRED)
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -95,21 +95,15 @@ const example = extrude(1, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -127,7 +121,7 @@ const example = extrude(1, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -278,38 +272,6 @@ const example = extrude(1, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -457,7 +419,7 @@ const example = extrude(1, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -499,21 +461,15 @@ const example = extrude(1, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -531,7 +487,7 @@ const example = extrude(1, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -682,38 +638,6 @@ const example = extrude(1, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -860,7 +784,7 @@ const example = extrude(1, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -902,21 +826,15 @@ const example = extrude(1, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -934,7 +852,7 @@ const example = extrude(1, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -1085,38 +1003,6 @@ const example = extrude(1, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.

docs/kcl/index.md

@@ -20,11 +20,6 @@ layout: manual
 * [`angledLineToY`](kcl/angledLineToY)
 * [`arc`](kcl/arc)
 * [`asin`](kcl/asin)
-* [`assert`](kcl/assert)
-* [`assertGreaterThan`](kcl/assertGreaterThan)
-* [`assertGreaterThanOrEq`](kcl/assertGreaterThanOrEq)
-* [`assertLessThan`](kcl/assertLessThan)
-* [`assertLessThanOrEq`](kcl/assertLessThanOrEq)
 * [`atan`](kcl/atan)
 * [`bezierCurve`](kcl/bezierCurve)
 * [`ceil`](kcl/ceil)
@@ -36,13 +31,13 @@ layout: manual
 * [`extrude`](kcl/extrude)
 * [`fillet`](kcl/fillet)
 * [`floor`](kcl/floor)
+* [`getEdge`](kcl/getEdge)
 * [`getNextAdjacentEdge`](kcl/getNextAdjacentEdge)
 * [`getOppositeEdge`](kcl/getOppositeEdge)
 * [`getPreviousAdjacentEdge`](kcl/getPreviousAdjacentEdge)
 * [`helix`](kcl/helix)
 * [`hole`](kcl/hole)
 * [`import`](kcl/import)
-* [`int`](kcl/int)
 * [`lastSegX`](kcl/lastSegX)
 * [`lastSegY`](kcl/lastSegY)
 * [`legAngX`](kcl/legAngX)
@@ -62,7 +57,6 @@ layout: manual
 * [`patternLinear3d`](kcl/patternLinear3d)
 * [`patternTransform`](kcl/patternTransform)
 * [`pi`](kcl/pi)
-* [`polar`](kcl/polar)
 * [`pow`](kcl/pow)
 * [`profileStart`](kcl/profileStart)
 * [`profileStartX`](kcl/profileStartX)

docs/kcl/lastSegX.md

@@ -33,7 +33,7 @@ const example = extrude(5, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -75,21 +75,15 @@ const example = extrude(5, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -107,7 +101,7 @@ const example = extrude(5, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -258,38 +252,6 @@ const example = extrude(5, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.

docs/kcl/lastSegY.md

@@ -33,7 +33,7 @@ const example = extrude(5, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -75,21 +75,15 @@ const example = extrude(5, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -107,7 +101,7 @@ const example = extrude(5, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -258,38 +252,6 @@ const example = extrude(5, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.

docs/kcl/line.md

@@ -46,7 +46,7 @@ const example = extrude(5, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -88,21 +88,15 @@ const example = extrude(5, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -120,7 +114,7 @@ const example = extrude(5, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -271,38 +265,6 @@ const example = extrude(5, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -458,7 +420,7 @@ const example = extrude(5, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -500,21 +462,15 @@ const example = extrude(5, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -532,7 +488,7 @@ const example = extrude(5, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -683,38 +639,6 @@ const example = extrude(5, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.

docs/kcl/lineTo.md

@@ -33,7 +33,7 @@ const example = extrude(5, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -75,21 +75,15 @@ const example = extrude(5, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -107,7 +101,7 @@ const example = extrude(5, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -258,38 +252,6 @@ const example = extrude(5, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -445,7 +407,7 @@ const example = extrude(5, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -487,21 +449,15 @@ const example = extrude(5, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -519,7 +475,7 @@ const example = extrude(5, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -670,38 +626,6 @@ const example = extrude(5, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.

docs/kcl/patternCircular2d.md

@@ -51,7 +51,7 @@ const example = extrude(1, exampleSketch)
 * `sketch_group_set`: `SketchGroupSet` - A sketch group or a group of sketch groups. (REQUIRED)
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -93,21 +93,15 @@ const example = extrude(1, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -125,7 +119,7 @@ const example = extrude(1, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -276,38 +270,6 @@ const example = extrude(1, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.

docs/kcl/patternCircular3d.md

@@ -55,21 +55,15 @@ const example = extrude(-5, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -87,7 +81,7 @@ const example = extrude(-5, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -129,21 +123,15 @@ const example = extrude(-5, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -195,38 +183,6 @@ const example = extrude(-5, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -401,38 +357,6 @@ const example = extrude(-5, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 } |
 {

docs/kcl/patternLinear2d.md

@@ -44,7 +44,7 @@ const example = extrude(1, exampleSketch)
 * `sketch_group_set`: `SketchGroupSet` - A sketch group or a group of sketch groups. (REQUIRED)
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -86,21 +86,15 @@ const example = extrude(1, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -118,7 +112,7 @@ const example = extrude(1, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -269,38 +263,6 @@ const example = extrude(1, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.

docs/kcl/patternLinear3d.md

@@ -53,21 +53,15 @@ const example = extrude(1, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -85,7 +79,7 @@ const example = extrude(1, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -127,21 +121,15 @@ const example = extrude(1, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -193,38 +181,6 @@ const example = extrude(1, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -399,38 +355,6 @@ const example = extrude(1, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 } |
 {

docs/kcl/patternTransform.md

@@ -55,21 +55,15 @@ let vase = layer()
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -87,7 +81,7 @@ let vase = layer()
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -129,21 +123,15 @@ let vase = layer()
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -195,38 +183,6 @@ let vase = layer()
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -401,38 +357,6 @@ let vase = layer()
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 } |
 {

docs/kcl/profileStart.md

@@ -19,7 +19,7 @@ const sketch001 = startSketchOn('XY')
   |> startProfileAt([5, 2], %)
   |> angledLine({ angle: 120, length: 50 }, %, $seg01)
   |> angledLine({
-       angle: segAng(seg01) + 120,
+       angle: segAng(seg01, %) + 120,
        length: 50
      }, %)
   |> lineTo(profileStart(%), %)
@@ -34,7 +34,7 @@ const sketch001 = startSketchOn('XY')
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -76,21 +76,15 @@ const sketch001 = startSketchOn('XY')
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -108,7 +102,7 @@ const sketch001 = startSketchOn('XY')
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -259,38 +253,6 @@ const sketch001 = startSketchOn('XY')
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.

docs/kcl/profileStartX.md

@@ -29,7 +29,7 @@ const sketch001 = startSketchOn('XY')
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -71,21 +71,15 @@ const sketch001 = startSketchOn('XY')
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -103,7 +97,7 @@ const sketch001 = startSketchOn('XY')
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -254,38 +248,6 @@ const sketch001 = startSketchOn('XY')
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.

docs/kcl/profileStartY.md

@@ -28,7 +28,7 @@ const sketch001 = startSketchOn('XY')
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -70,21 +70,15 @@ const sketch001 = startSketchOn('XY')
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -102,7 +96,7 @@ const sketch001 = startSketchOn('XY')
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -253,38 +247,6 @@ const sketch001 = startSketchOn('XY')
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.

docs/kcl/revolve.md

@@ -107,7 +107,7 @@ const sketch001 = startSketchOn(box, "END")
   |> circle([10, 10], 4, %)
   |> revolve({
        angle: 90,
-       axis: getOppositeEdge(revolveAxis)
+       axis: getOppositeEdge(revolveAxis, box)
      }, %)
 ```
 
@@ -157,92 +157,6 @@ const part001 = revolve({
 } |
 uuid |
 {
-	// Engine information for a tag.
-	info: {
-	// The id of the tagged object.
-	id: uuid,
-	// The path the tag is on.
-	path: {
-	// The from point.
-	from: [number, number],
-	// The tag of the path.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	// The to point.
-	to: [number, number],
-},
-	// The sketch group the tag is on.
-	sketchGroup: uuid,
-	// The surface information for the tag.
-	surface: {
-	// The face id for the extrude plane.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "extrudePlane",
-} |
-{
-	// The face id for the extrude plane.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
-},
-},
 	value: string,
 },
 }
@@ -250,7 +164,7 @@ uuid |
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -292,21 +206,15 @@ uuid |
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -324,7 +232,7 @@ uuid |
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -475,38 +383,6 @@ uuid |
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -658,21 +534,15 @@ uuid |
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -690,7 +560,7 @@ uuid |
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -732,21 +602,15 @@ uuid |
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -798,38 +662,6 @@ uuid |
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -1003,38 +835,6 @@ uuid |
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 }
 ```

docs/kcl/segAng.md

@@ -9,7 +9,7 @@ Returns the angle of the segment.
 
 
 ```js
-segAng(tag: TagIdentifier) -> number
+segAng(segment_name: TagIdentifier, sketch_group: SketchGroup) -> number
 ```
 
 ### Examples
@@ -20,9 +20,9 @@ const exampleSketch = startSketchOn('XZ')
   |> line([10, 0], %)
   |> line([5, 10], %, $seg01)
   |> line([-10, 0], %)
-  |> angledLine([segAng(seg01), 10], %)
+  |> angledLine([segAng(seg01, %), 10], %)
   |> line([-10, 0], %)
-  |> angledLine([segAng(seg01), -15], %)
+  |> angledLine([segAng(seg01, %), -15], %)
   |> close(%)
 
 const example = extrude(4, exampleSketch)
@@ -32,15 +32,89 @@ const example = extrude(4, exampleSketch)
 
 ### Arguments
 
-* `tag`: `TagIdentifier` (REQUIRED)
+* `segment_name`: `TagIdentifier` (REQUIRED)
 ```js
 {
-	// Engine information for a tag.
-	info: {
-	// The id of the tagged object.
+	value: string,
+}
+```
+* `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
+```js
+{
+	// The id of the sketch group.
 	id: uuid,
-	// The path the tag is on.
-	path: {
+	// What the sketch is on (can be a plane or a face).
+	on: {
+	// The id of the plane.
+	id: uuid,
+	// Origin of the plane.
+	origin: {
+	x: number,
+	y: number,
+	z: number,
+},
+	type: "plane",
+	// Type for a plane.
+	value: "XY" | "XZ" | "YZ" | "Custom",
+	// What should the plane’s X axis be?
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// What should the plane’s Y axis be?
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis (normal).
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+} |
+{
+	// The extrude group the face is on.
+	extrudeGroup: {
+	// The id of the extrusion end cap
+	endCapId: uuid,
+	// Chamfers or fillets on this extrude group.
+	filletOrChamfers: [{
+	// The engine id of the edge to fillet.
+	edge_id: uuid,
+	// The id of the engine command that called this fillet.
+	id: uuid,
+	radius: number,
+	type: "fillet",
+} |
+{
+	// The engine id of the edge to chamfer.
+	edge_id: uuid,
+	// The id of the engine command that called this chamfer.
+	id: uuid,
+	length: number,
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	type: "chamfer",
+}],
+	// The height of the extrude group.
+	height: number,
+	// The id of the extrude group.
+	id: uuid,
+	// The sketch group.
+	sketchGroup: {
+	// The id of the sketch group.
+	id: uuid,
+	// What the sketch is on (can be a plane or a face).
+	on: SketchSurface,
+	// The starting path.
+	start: {
 	// The from point.
 	from: [number, number],
 	// The tag of the path.
@@ -53,10 +127,109 @@ const example = extrude(4, exampleSketch)
 	// The to point.
 	to: [number, number],
 },
-	// The sketch group the tag is on.
-	sketchGroup: uuid,
-	// The surface information for the tag.
-	surface: {
+	// Tag identifiers that have been declared in this sketch group.
+	tags: {
+},
+	// The paths in the sketch group.
+	value: [{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "ToPoint",
+} |
+{
+	// arc's direction
+	ccw: string,
+	// the arc's center
+	center: [number, number],
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "TangentialArcTo",
+} |
+{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "TangentialArc",
+} |
+{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "Horizontal",
+	// The x coordinate.
+	x: number,
+} |
+{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "AngledLineTo",
+	// The x coordinate.
+	x: number,
+	// The y coordinate.
+	y: number,
+} |
+{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "Base",
+}],
+},
+	// The id of the extrusion start cap
+	startCapId: uuid,
+	// The extrude surfaces.
+	value: [{
 	// The face id for the extrude plane.
 	faceId: uuid,
 	// The id of the geometry.
@@ -87,41 +260,144 @@ const example = extrude(4, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
+}],
+},
+	// The id of the face.
 	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
+	type: "face",
+	// The tag of the face.
+	value: string,
+	// What should the face’s X axis be?
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// What should the face’s Y axis be?
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis (normal).
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+},
+	// The starting path.
+	start: {
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
 	tag: {
 	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
 	end: number,
 	start: number,
 	value: string,
 },
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
+	// The to point.
+	to: [number, number],
+},
+	// Tag identifiers that have been declared in this sketch group.
+	tags: {
+},
+	// The paths in the sketch group.
+	value: [{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
 	tag: {
 	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
 	end: number,
 	start: number,
 	value: string,
 },
-	type: "fillet",
-},
-},
+	// The to point.
+	to: [number, number],
+	type: "ToPoint",
+} |
+{
+	// arc's direction
+	ccw: string,
+	// the arc's center
+	center: [number, number],
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
 	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "TangentialArcTo",
+} |
+{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "TangentialArc",
+} |
+{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "Horizontal",
+	// The x coordinate.
+	x: number,
+} |
+{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "AngledLineTo",
+	// The x coordinate.
+	x: number,
+	// The y coordinate.
+	y: number,
+} |
+{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "Base",
+}],
 }
 ```
 

docs/kcl/segEndX.md

@@ -9,7 +9,7 @@ Returns the segment end of x.
 
 
 ```js
-segEndX(tag: TagIdentifier) -> number
+segEndX(segment_name: TagIdentifier, sketch_group: SketchGroup) -> number
 ```
 
 ### Examples
@@ -19,7 +19,7 @@ const exampleSketch = startSketchOn('XZ')
   |> startProfileAt([0, 0], %)
   |> line([20, 0], %, $thing)
   |> line([0, 5], %)
-  |> line([segEndX(thing), 0], %)
+  |> line([segEndX(thing, %), 0], %)
   |> line([-20, 10], %)
   |> close(%)
 
@@ -30,15 +30,89 @@ const example = extrude(5, exampleSketch)
 
 ### Arguments
 
-* `tag`: `TagIdentifier` (REQUIRED)
+* `segment_name`: `TagIdentifier` (REQUIRED)
 ```js
 {
-	// Engine information for a tag.
-	info: {
-	// The id of the tagged object.
+	value: string,
+}
+```
+* `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
+```js
+{
+	// The id of the sketch group.
 	id: uuid,
-	// The path the tag is on.
-	path: {
+	// What the sketch is on (can be a plane or a face).
+	on: {
+	// The id of the plane.
+	id: uuid,
+	// Origin of the plane.
+	origin: {
+	x: number,
+	y: number,
+	z: number,
+},
+	type: "plane",
+	// Type for a plane.
+	value: "XY" | "XZ" | "YZ" | "Custom",
+	// What should the plane’s X axis be?
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// What should the plane’s Y axis be?
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis (normal).
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+} |
+{
+	// The extrude group the face is on.
+	extrudeGroup: {
+	// The id of the extrusion end cap
+	endCapId: uuid,
+	// Chamfers or fillets on this extrude group.
+	filletOrChamfers: [{
+	// The engine id of the edge to fillet.
+	edge_id: uuid,
+	// The id of the engine command that called this fillet.
+	id: uuid,
+	radius: number,
+	type: "fillet",
+} |
+{
+	// The engine id of the edge to chamfer.
+	edge_id: uuid,
+	// The id of the engine command that called this chamfer.
+	id: uuid,
+	length: number,
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	type: "chamfer",
+}],
+	// The height of the extrude group.
+	height: number,
+	// The id of the extrude group.
+	id: uuid,
+	// The sketch group.
+	sketchGroup: {
+	// The id of the sketch group.
+	id: uuid,
+	// What the sketch is on (can be a plane or a face).
+	on: SketchSurface,
+	// The starting path.
+	start: {
 	// The from point.
 	from: [number, number],
 	// The tag of the path.
@@ -51,10 +125,109 @@ const example = extrude(5, exampleSketch)
 	// The to point.
 	to: [number, number],
 },
-	// The sketch group the tag is on.
-	sketchGroup: uuid,
-	// The surface information for the tag.
-	surface: {
+	// Tag identifiers that have been declared in this sketch group.
+	tags: {
+},
+	// The paths in the sketch group.
+	value: [{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "ToPoint",
+} |
+{
+	// arc's direction
+	ccw: string,
+	// the arc's center
+	center: [number, number],
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "TangentialArcTo",
+} |
+{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "TangentialArc",
+} |
+{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "Horizontal",
+	// The x coordinate.
+	x: number,
+} |
+{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "AngledLineTo",
+	// The x coordinate.
+	x: number,
+	// The y coordinate.
+	y: number,
+} |
+{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "Base",
+}],
+},
+	// The id of the extrusion start cap
+	startCapId: uuid,
+	// The extrude surfaces.
+	value: [{
 	// The face id for the extrude plane.
 	faceId: uuid,
 	// The id of the geometry.
@@ -85,41 +258,144 @@ const example = extrude(5, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
+}],
+},
+	// The id of the face.
 	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
+	type: "face",
+	// The tag of the face.
+	value: string,
+	// What should the face’s X axis be?
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// What should the face’s Y axis be?
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis (normal).
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+},
+	// The starting path.
+	start: {
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
 	tag: {
 	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
 	end: number,
 	start: number,
 	value: string,
 },
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
+	// The to point.
+	to: [number, number],
+},
+	// Tag identifiers that have been declared in this sketch group.
+	tags: {
+},
+	// The paths in the sketch group.
+	value: [{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
 	tag: {
 	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
 	end: number,
 	start: number,
 	value: string,
 },
-	type: "fillet",
-},
-},
+	// The to point.
+	to: [number, number],
+	type: "ToPoint",
+} |
+{
+	// arc's direction
+	ccw: string,
+	// the arc's center
+	center: [number, number],
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
 	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "TangentialArcTo",
+} |
+{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "TangentialArc",
+} |
+{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "Horizontal",
+	// The x coordinate.
+	x: number,
+} |
+{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "AngledLineTo",
+	// The x coordinate.
+	x: number,
+	// The y coordinate.
+	y: number,
+} |
+{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "Base",
+}],
 }
 ```
 

docs/kcl/segEndY.md

@@ -9,7 +9,7 @@ Returns the segment end of y.
 
 
 ```js
-segEndY(tag: TagIdentifier) -> number
+segEndY(segment_name: TagIdentifier, sketch_group: SketchGroup) -> number
 ```
 
 ### Examples
@@ -20,7 +20,7 @@ const exampleSketch = startSketchOn('XZ')
   |> line([20, 0], %)
   |> line([0, 3], %, $thing)
   |> line([-10, 0], %)
-  |> line([0, segEndY(thing)], %)
+  |> line([0, segEndY(thing, %)], %)
   |> line([-10, 0], %)
   |> close(%)
 
@@ -31,15 +31,89 @@ const example = extrude(5, exampleSketch)
 
 ### Arguments
 
-* `tag`: `TagIdentifier` (REQUIRED)
+* `segment_name`: `TagIdentifier` (REQUIRED)
 ```js
 {
-	// Engine information for a tag.
-	info: {
-	// The id of the tagged object.
+	value: string,
+}
+```
+* `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
+```js
+{
+	// The id of the sketch group.
 	id: uuid,
-	// The path the tag is on.
-	path: {
+	// What the sketch is on (can be a plane or a face).
+	on: {
+	// The id of the plane.
+	id: uuid,
+	// Origin of the plane.
+	origin: {
+	x: number,
+	y: number,
+	z: number,
+},
+	type: "plane",
+	// Type for a plane.
+	value: "XY" | "XZ" | "YZ" | "Custom",
+	// What should the plane’s X axis be?
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// What should the plane’s Y axis be?
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis (normal).
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+} |
+{
+	// The extrude group the face is on.
+	extrudeGroup: {
+	// The id of the extrusion end cap
+	endCapId: uuid,
+	// Chamfers or fillets on this extrude group.
+	filletOrChamfers: [{
+	// The engine id of the edge to fillet.
+	edge_id: uuid,
+	// The id of the engine command that called this fillet.
+	id: uuid,
+	radius: number,
+	type: "fillet",
+} |
+{
+	// The engine id of the edge to chamfer.
+	edge_id: uuid,
+	// The id of the engine command that called this chamfer.
+	id: uuid,
+	length: number,
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	type: "chamfer",
+}],
+	// The height of the extrude group.
+	height: number,
+	// The id of the extrude group.
+	id: uuid,
+	// The sketch group.
+	sketchGroup: {
+	// The id of the sketch group.
+	id: uuid,
+	// What the sketch is on (can be a plane or a face).
+	on: SketchSurface,
+	// The starting path.
+	start: {
 	// The from point.
 	from: [number, number],
 	// The tag of the path.
@@ -52,10 +126,109 @@ const example = extrude(5, exampleSketch)
 	// The to point.
 	to: [number, number],
 },
-	// The sketch group the tag is on.
-	sketchGroup: uuid,
-	// The surface information for the tag.
-	surface: {
+	// Tag identifiers that have been declared in this sketch group.
+	tags: {
+},
+	// The paths in the sketch group.
+	value: [{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "ToPoint",
+} |
+{
+	// arc's direction
+	ccw: string,
+	// the arc's center
+	center: [number, number],
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "TangentialArcTo",
+} |
+{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "TangentialArc",
+} |
+{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "Horizontal",
+	// The x coordinate.
+	x: number,
+} |
+{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "AngledLineTo",
+	// The x coordinate.
+	x: number,
+	// The y coordinate.
+	y: number,
+} |
+{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "Base",
+}],
+},
+	// The id of the extrusion start cap
+	startCapId: uuid,
+	// The extrude surfaces.
+	value: [{
 	// The face id for the extrude plane.
 	faceId: uuid,
 	// The id of the geometry.
@@ -86,41 +259,144 @@ const example = extrude(5, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
+}],
+},
+	// The id of the face.
 	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
+	type: "face",
+	// The tag of the face.
+	value: string,
+	// What should the face’s X axis be?
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// What should the face’s Y axis be?
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis (normal).
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+},
+	// The starting path.
+	start: {
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
 	tag: {
 	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
 	end: number,
 	start: number,
 	value: string,
 },
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
+	// The to point.
+	to: [number, number],
+},
+	// Tag identifiers that have been declared in this sketch group.
+	tags: {
+},
+	// The paths in the sketch group.
+	value: [{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
 	tag: {
 	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
 	end: number,
 	start: number,
 	value: string,
 },
-	type: "fillet",
-},
-},
+	// The to point.
+	to: [number, number],
+	type: "ToPoint",
+} |
+{
+	// arc's direction
+	ccw: string,
+	// the arc's center
+	center: [number, number],
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
 	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "TangentialArcTo",
+} |
+{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "TangentialArc",
+} |
+{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "Horizontal",
+	// The x coordinate.
+	x: number,
+} |
+{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "AngledLineTo",
+	// The x coordinate.
+	x: number,
+	// The y coordinate.
+	y: number,
+} |
+{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "Base",
+}],
 }
 ```
 

docs/kcl/segLen.md

@@ -9,7 +9,7 @@ Returns the length of the segment.
 
 
 ```js
-segLen(tag: TagIdentifier) -> number
+segLen(segment_name: TagIdentifier, sketch_group: SketchGroup) -> number
 ```
 
 ### Examples
@@ -19,7 +19,7 @@ const exampleSketch = startSketchOn("XZ")
   |> startProfileAt([0, 0], %)
   |> angledLine({ angle: 60, length: 10 }, %, $thing)
   |> tangentialArc({ offset: -120, radius: 5 }, %)
-  |> angledLine({ angle: -60, length: segLen(thing) }, %)
+  |> angledLine({ angle: -60, length: segLen(thing, %) }, %)
   |> close(%)
 
 const example = extrude(5, exampleSketch)
@@ -29,15 +29,89 @@ const example = extrude(5, exampleSketch)
 
 ### Arguments
 
-* `tag`: `TagIdentifier` (REQUIRED)
+* `segment_name`: `TagIdentifier` (REQUIRED)
 ```js
 {
-	// Engine information for a tag.
-	info: {
-	// The id of the tagged object.
+	value: string,
+}
+```
+* `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
+```js
+{
+	// The id of the sketch group.
 	id: uuid,
-	// The path the tag is on.
-	path: {
+	// What the sketch is on (can be a plane or a face).
+	on: {
+	// The id of the plane.
+	id: uuid,
+	// Origin of the plane.
+	origin: {
+	x: number,
+	y: number,
+	z: number,
+},
+	type: "plane",
+	// Type for a plane.
+	value: "XY" | "XZ" | "YZ" | "Custom",
+	// What should the plane’s X axis be?
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// What should the plane’s Y axis be?
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis (normal).
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+} |
+{
+	// The extrude group the face is on.
+	extrudeGroup: {
+	// The id of the extrusion end cap
+	endCapId: uuid,
+	// Chamfers or fillets on this extrude group.
+	filletOrChamfers: [{
+	// The engine id of the edge to fillet.
+	edge_id: uuid,
+	// The id of the engine command that called this fillet.
+	id: uuid,
+	radius: number,
+	type: "fillet",
+} |
+{
+	// The engine id of the edge to chamfer.
+	edge_id: uuid,
+	// The id of the engine command that called this chamfer.
+	id: uuid,
+	length: number,
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	type: "chamfer",
+}],
+	// The height of the extrude group.
+	height: number,
+	// The id of the extrude group.
+	id: uuid,
+	// The sketch group.
+	sketchGroup: {
+	// The id of the sketch group.
+	id: uuid,
+	// What the sketch is on (can be a plane or a face).
+	on: SketchSurface,
+	// The starting path.
+	start: {
 	// The from point.
 	from: [number, number],
 	// The tag of the path.
@@ -50,10 +124,109 @@ const example = extrude(5, exampleSketch)
 	// The to point.
 	to: [number, number],
 },
-	// The sketch group the tag is on.
-	sketchGroup: uuid,
-	// The surface information for the tag.
-	surface: {
+	// Tag identifiers that have been declared in this sketch group.
+	tags: {
+},
+	// The paths in the sketch group.
+	value: [{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "ToPoint",
+} |
+{
+	// arc's direction
+	ccw: string,
+	// the arc's center
+	center: [number, number],
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "TangentialArcTo",
+} |
+{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "TangentialArc",
+} |
+{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "Horizontal",
+	// The x coordinate.
+	x: number,
+} |
+{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "AngledLineTo",
+	// The x coordinate.
+	x: number,
+	// The y coordinate.
+	y: number,
+} |
+{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "Base",
+}],
+},
+	// The id of the extrusion start cap
+	startCapId: uuid,
+	// The extrude surfaces.
+	value: [{
 	// The face id for the extrude plane.
 	faceId: uuid,
 	// The id of the geometry.
@@ -84,41 +257,144 @@ const example = extrude(5, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
+}],
+},
+	// The id of the face.
 	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
+	type: "face",
+	// The tag of the face.
+	value: string,
+	// What should the face’s X axis be?
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// What should the face’s Y axis be?
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis (normal).
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+},
+	// The starting path.
+	start: {
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
 	tag: {
 	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
 	end: number,
 	start: number,
 	value: string,
 },
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
+	// The to point.
+	to: [number, number],
+},
+	// Tag identifiers that have been declared in this sketch group.
+	tags: {
+},
+	// The paths in the sketch group.
+	value: [{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
 	tag: {
 	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
 	end: number,
 	start: number,
 	value: string,
 },
-	type: "fillet",
-},
-},
+	// The to point.
+	to: [number, number],
+	type: "ToPoint",
+} |
+{
+	// arc's direction
+	ccw: string,
+	// the arc's center
+	center: [number, number],
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
 	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "TangentialArcTo",
+} |
+{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "TangentialArc",
+} |
+{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "Horizontal",
+	// The x coordinate.
+	x: number,
+} |
+{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "AngledLineTo",
+	// The x coordinate.
+	x: number,
+	// The y coordinate.
+	y: number,
+} |
+{
+	// The from point.
+	from: [number, number],
+	// The tag of the path.
+	tag: {
+	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
+	end: number,
+	start: number,
+	value: string,
+},
+	// The to point.
+	to: [number, number],
+	type: "Base",
+}],
 }
 ```
 

docs/kcl/shell.md

@@ -37,92 +37,6 @@ shell({ faces: ['end'], thickness: 0.25 }, firstSketch)
 	// The faces you want removed.
 	faces: ["start" | "end" |
 {
-	// Engine information for a tag.
-	info: {
-	// The id of the tagged object.
-	id: uuid,
-	// The path the tag is on.
-	path: {
-	// The from point.
-	from: [number, number],
-	// The tag of the path.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	// The to point.
-	to: [number, number],
-},
-	// The sketch group the tag is on.
-	sketchGroup: uuid,
-	// The surface information for the tag.
-	surface: {
-	// The face id for the extrude plane.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "extrudePlane",
-} |
-{
-	// The face id for the extrude plane.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
-},
-},
 	value: string,
 }],
 	// The thickness of the shell.
@@ -137,21 +51,15 @@ shell({ faces: ['end'], thickness: 0.25 }, firstSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -169,7 +77,7 @@ shell({ faces: ['end'], thickness: 0.25 }, firstSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -211,21 +119,15 @@ shell({ faces: ['end'], thickness: 0.25 }, firstSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -277,38 +179,6 @@ shell({ faces: ['end'], thickness: 0.25 }, firstSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -482,38 +352,6 @@ shell({ faces: ['end'], thickness: 0.25 }, firstSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 }
 ```
@@ -528,21 +366,15 @@ shell({ faces: ['end'], thickness: 0.25 }, firstSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -560,7 +392,7 @@ shell({ faces: ['end'], thickness: 0.25 }, firstSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -602,21 +434,15 @@ shell({ faces: ['end'], thickness: 0.25 }, firstSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -668,38 +494,6 @@ shell({ faces: ['end'], thickness: 0.25 }, firstSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -873,38 +667,6 @@ shell({ faces: ['end'], thickness: 0.25 }, firstSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 }
 ```

docs/kcl/startProfileAt.md

@@ -97,21 +97,15 @@ const example = extrude(5, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -129,7 +123,7 @@ const example = extrude(5, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -337,38 +331,6 @@ const example = extrude(5, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -411,7 +373,7 @@ const example = extrude(5, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -453,21 +415,15 @@ const example = extrude(5, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -485,7 +441,7 @@ const example = extrude(5, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -636,38 +592,6 @@ const example = extrude(5, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.

docs/kcl/startSketchAt.md

@@ -59,7 +59,7 @@ const example = extrude(5, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -101,21 +101,15 @@ const example = extrude(5, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -133,7 +127,7 @@ const example = extrude(5, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -284,38 +278,6 @@ const example = extrude(5, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.

docs/kcl/startSketchOn.md

@@ -55,7 +55,7 @@ const exampleSketch = startSketchOn("XY")
 
 const example = extrude(10, exampleSketch)
 
-const exampleSketch002 = startSketchOn(example, sketchingFace)
+const exampleSketch002 = startSketchOn(example, 'sketchingFace')
   |> startProfileAt([1, 1], %)
   |> line([8, 0], %)
   |> line([0, 8], %)
@@ -64,7 +64,7 @@ const exampleSketch002 = startSketchOn(example, sketchingFace)
 
 const example002 = extrude(10, exampleSketch002)
 
-const exampleSketch003 = startSketchOn(example002, sketchingFace002)
+const exampleSketch003 = startSketchOn(example002, 'sketchingFace002')
   |> startProfileAt([-8, 12], %)
   |> line([0, 6], %)
   |> line([6, 0], %)
@@ -106,9 +106,9 @@ const example002 = extrude(5, exampleSketch002)
 const a1 = startSketchOn({
        plane: {
          origin: { x: 0, y: 0, z: 0 },
-         xAxis: { x: 1, y: 0, z: 0 },
-         yAxis: { x: 0, y: 1, z: 0 },
-         zAxis: { x: 0, y: 0, z: 1 }
+         x_axis: { x: 1, y: 0, z: 0 },
+         y_axis: { x: 0, y: 1, z: 0 },
+         z_axis: { x: 0, y: 0, z: 1 }
        }
      })
   |> startProfileAt([0, 0], %)
@@ -141,19 +141,19 @@ const a1 = startSketchOn({
 	z: number,
 },
 	// What should the plane’s X axis be?
-	xAxis: {
+	x_axis: {
 	x: number,
 	y: number,
 	z: number,
 },
 	// What should the plane’s Y axis be?
-	yAxis: {
+	y_axis: {
 	x: number,
 	y: number,
 	z: number,
 },
 	// The z-axis (normal).
-	zAxis: {
+	z_axis: {
 	x: number,
 	y: number,
 	z: number,
@@ -166,21 +166,15 @@ const a1 = startSketchOn({
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -198,7 +192,7 @@ const a1 = startSketchOn({
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -406,38 +400,6 @@ const a1 = startSketchOn({
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 }
 ```
@@ -445,92 +407,6 @@ const a1 = startSketchOn({
 ```js
 "start" | "end" |
 {
-	// Engine information for a tag.
-	info: {
-	// The id of the tagged object.
-	id: uuid,
-	// The path the tag is on.
-	path: {
-	// The from point.
-	from: [number, number],
-	// The tag of the path.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	// The to point.
-	to: [number, number],
-},
-	// The sketch group the tag is on.
-	sketchGroup: uuid,
-	// The surface information for the tag.
-	surface: {
-	// The face id for the extrude plane.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "extrudePlane",
-} |
-{
-	// The face id for the extrude plane.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
-},
-},
 	value: string,
 }
 ```
@@ -578,21 +454,15 @@ const a1 = startSketchOn({
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -610,7 +480,7 @@ const a1 = startSketchOn({
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -818,38 +688,6 @@ const a1 = startSketchOn({
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.

docs/kcl/tangentialArc.md

@@ -42,7 +42,7 @@ const example = extrude(10, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -84,21 +84,15 @@ const example = extrude(10, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -116,7 +110,7 @@ const example = extrude(10, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -267,38 +261,6 @@ const example = extrude(10, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -454,7 +416,7 @@ const example = extrude(10, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -496,21 +458,15 @@ const example = extrude(10, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -528,7 +484,7 @@ const example = extrude(10, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -679,38 +635,6 @@ const example = extrude(10, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.

docs/kcl/tangentialArcTo.md

@@ -33,7 +33,7 @@ const example = extrude(10, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -75,21 +75,15 @@ const example = extrude(10, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -107,7 +101,7 @@ const example = extrude(10, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -258,38 +252,6 @@ const example = extrude(10, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -445,7 +407,7 @@ const example = extrude(10, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -487,21 +449,15 @@ const example = extrude(10, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -519,7 +475,7 @@ const example = extrude(10, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -670,38 +626,6 @@ const example = extrude(10, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.

docs/kcl/xLine.md

@@ -36,7 +36,7 @@ const example = extrude(10, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -78,21 +78,15 @@ const example = extrude(10, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -110,7 +104,7 @@ const example = extrude(10, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -261,38 +255,6 @@ const example = extrude(10, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -448,7 +410,7 @@ const example = extrude(10, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -490,21 +452,15 @@ const example = extrude(10, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -522,7 +478,7 @@ const example = extrude(10, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -673,38 +629,6 @@ const example = extrude(10, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.

docs/kcl/xLineTo.md

@@ -36,7 +36,7 @@ const example = extrude(10, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -78,21 +78,15 @@ const example = extrude(10, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -110,7 +104,7 @@ const example = extrude(10, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -261,38 +255,6 @@ const example = extrude(10, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -448,7 +410,7 @@ const example = extrude(10, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -490,21 +452,15 @@ const example = extrude(10, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -522,7 +478,7 @@ const example = extrude(10, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -673,38 +629,6 @@ const example = extrude(10, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.

docs/kcl/yLine.md

@@ -34,7 +34,7 @@ const example = extrude(10, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -76,21 +76,15 @@ const example = extrude(10, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -108,7 +102,7 @@ const example = extrude(10, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -259,38 +253,6 @@ const example = extrude(10, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -446,7 +408,7 @@ const example = extrude(10, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -488,21 +450,15 @@ const example = extrude(10, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -520,7 +476,7 @@ const example = extrude(10, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -671,38 +627,6 @@ const example = extrude(10, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.

docs/kcl/yLineTo.md

@@ -32,7 +32,7 @@ const example = extrude(5, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -74,21 +74,15 @@ const example = extrude(5, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -106,7 +100,7 @@ const example = extrude(5, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -257,38 +251,6 @@ const example = extrude(5, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.
@@ -444,7 +406,7 @@ const example = extrude(5, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: {
@@ -486,21 +448,15 @@ const example = extrude(5, exampleSketch)
 	// Chamfers or fillets on this extrude group.
 	filletOrChamfers: [{
 	// The engine id of the edge to fillet.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this fillet.
 	id: uuid,
 	radius: number,
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
 	type: "fillet",
 } |
 {
 	// The engine id of the edge to chamfer.
-	edgeId: uuid,
+	edge_id: uuid,
 	// The id of the engine command that called this chamfer.
 	id: uuid,
 	length: number,
@@ -518,7 +474,7 @@ const example = extrude(5, exampleSketch)
 	id: uuid,
 	// The sketch group.
 	sketchGroup: {
-	// The id of the sketch group (this will change when the engine's reference to it changes.
+	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
 	on: SketchSurface,
@@ -669,38 +625,6 @@ const example = extrude(5, exampleSketch)
 	value: string,
 },
 	type: "extrudeArc",
-} |
-{
-	// The id for the chamfer surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "chamfer",
-} |
-{
-	// The id for the fillet surface.
-	faceId: uuid,
-	// The id of the geometry.
-	id: uuid,
-	// The source range.
-	sourceRange: [number, number],
-	// The tag.
-	tag: {
-	digest: [number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number, number],
-	end: number,
-	start: number,
-	value: string,
-},
-	type: "fillet",
 }],
 },
 	// The id of the face.

e2e/playwright/flow-tests.spec.ts

@@ -26,7 +26,7 @@ import * as TOML from '@iarna/toml'
 import { LineInputsType } from 'lang/std/sketchcombos'
 import { Coords2d } from 'lang/std/sketch'
 import { KCL_DEFAULT_LENGTH } from 'lib/constants'
-import { EngineCommand } from 'lang/std/artifactMap'
+import { EngineCommand } from 'lang/std/engineConnection'
 import { onboardingPaths } from 'routes/Onboarding/paths'
 import { bracket } from 'lib/exampleKcl'
 
@@ -48,6 +48,8 @@ const commonPoints = {
   startAt: '[7.19, -9.7]',
   num1: 7.25,
   num2: 14.44,
+  // num1: 9.64,
+  // num2: 19.19,
 }
 
 test.afterEach(async ({ context, page }, testInfo) => {
@@ -139,9 +141,8 @@ async function doBasicSketch(page: Page, openPanes: string[]) {
     await expect(u.codeLocator)
       .toHaveText(`const sketch001 = startSketchOn('XZ')
   |> startProfileAt(${commonPoints.startAt}, %)`)
-  } else {
-    await page.waitForTimeout(500)
   }
+  await page.waitForTimeout(500)
 
   await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 10)
   await page.waitForTimeout(500)
@@ -151,9 +152,8 @@ async function doBasicSketch(page: Page, openPanes: string[]) {
       .toHaveText(`const sketch001 = startSketchOn('XZ')
   |> startProfileAt(${commonPoints.startAt}, %)
   |> line([${commonPoints.num1}, 0], %)`)
-  } else {
-    await page.waitForTimeout(500)
   }
+  await page.waitForTimeout(500)
 
   await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 20)
   if (openPanes.includes('code')) {
@@ -162,9 +162,8 @@ async function doBasicSketch(page: Page, openPanes: string[]) {
   |> startProfileAt(${commonPoints.startAt}, %)
   |> line([${commonPoints.num1}, 0], %)
   |> line([0, ${commonPoints.num1 + 0.01}], %)`)
-  } else {
-    await page.waitForTimeout(500)
   }
+  await page.waitForTimeout(500)
   await page.mouse.click(startXPx, 500 - PUR * 20)
   if (openPanes.includes('code')) {
     await expect(u.codeLocator)
@@ -176,7 +175,7 @@ async function doBasicSketch(page: Page, openPanes: string[]) {
   }
 
   // deselect line tool
-  await page.getByRole('button', { name: 'Line', exact: true }).click()
+  await page.getByRole('button', { name: 'Line' }).click()
   await page.waitForTimeout(500)
 
   const line1 = await u.getSegmentBodyCoords(`[data-overlay-index="${0}"]`, 0)
@@ -204,7 +203,7 @@ async function doBasicSketch(page: Page, openPanes: string[]) {
     await expect(page.locator('.cm-cursor')).toHaveCount(2)
   }
 
-  await page.getByRole('button', { name: 'Length: open menu' }).click()
+  await page.getByRole('button', { name: 'Constraints' }).click()
   await page.getByRole('button', { name: 'Equal Length' }).click()
 
   // Open the code pane.
@@ -213,7 +212,7 @@ async function doBasicSketch(page: Page, openPanes: string[]) {
   |> startProfileAt(${commonPoints.startAt}, %)
   |> line([${commonPoints.num1}, 0], %, $seg01)
   |> line([0, ${commonPoints.num1 + 0.01}], %)
-  |> angledLine([180, segLen(seg01)], %)`)
+  |> angledLine([180, segLen(seg01, %)], %)`)
 }
 
 test.describe('Basic sketch', () => {
@@ -453,7 +452,7 @@ test.describe('Testing Camera Movement', () => {
     // await expect(u.codeLocator).toHaveText(code)
 
     // click the line button
-    await page.getByRole('button', { name: 'Line', exact: true }).click()
+    await page.getByRole('button', { name: 'Line' }).click()
 
     const hoverOverNothing = async () => {
       // await u.canvasLocator.hover({position: {x: 700, y: 325}})
@@ -925,10 +924,10 @@ test.describe('Editor tests', () => {
 
     await expect(page.locator('.cm-lint-marker-error')).toBeVisible()
     await expect(
-      page.locator('.cm-lint-marker.cm-lint-marker-error')
+      page.locator('.cm-lintRange.cm-lintRange-error').first()
     ).toBeVisible()
 
-    await page.locator('.cm-lint-marker.cm-lint-marker-error').hover()
+    await page.locator('.cm-lintRange.cm-lintRange-error').hover()
     await expect(page.locator('.cm-diagnosticText').first()).toBeVisible()
     await expect(
       page.getByText('Cannot redefine `topAng`').first()
@@ -1016,18 +1015,18 @@ test.describe('Editor tests', () => {
   |> startProfileAt([0, 0], %)
   |> line([0, 10], %)
   |> line([10, 0], %)
-  |> line([0, -10], %, $revolveAxis)
+  |> line([0, -10], %, 'revolveAxis')
   |> close(%)
   |> extrude(10, %)
   
-  const sketch001 = startSketchOn(box, revolveAxis)
+  const sketch001 = startSketchOn(box, "revolveAxis")
   |> startProfileAt([5, 10], %)
   |> line([0, -10], %)
   |> line([2, 0], %)
   |> line([0, -10], %)
   |> close(%)
   |> revolve({
-  axis: revolveAxis,
+  axis: getEdge('revolveAxis', box),
   angle: 90
   }, %)
       `
@@ -1045,7 +1044,7 @@ test.describe('Editor tests', () => {
     await page.hover('.cm-lint-marker-error')
     const searchText =
       'sketch profile must lie entirely on one side of the revolution axis'
-    await expect(page.getByText(searchText)).toBeVisible()
+    await expect(page.getByText(searchText).first()).toBeVisible()
   })
   test.describe('Autocomplete works', () => {
     test('with enter/click to accept the completion', async ({ page }) => {
@@ -1064,7 +1063,7 @@ test.describe('Editor tests', () => {
       await page.keyboard.type('const sketch001 = start')
 
       // expect there to be six auto complete options
-      await expect(page.locator('.cm-completionLabel')).toHaveCount(8)
+      await expect(page.locator('.cm-completionLabel')).toHaveCount(6)
       // this makes sure we can accept a completion with click
       await page.getByText('startSketchOn').click()
       await page.keyboard.type("'XZ'")
@@ -1463,9 +1462,7 @@ test.describe('Can create sketches on all planes and their back sides', () => {
     await page.mouse.click(clickCoords.x, clickCoords.y)
     await page.waitForTimeout(300) // wait for animation
 
-    await expect(
-      page.getByRole('button', { name: 'Line', exact: true })
-    ).toBeVisible()
+    await expect(page.getByRole('button', { name: 'Line' })).toBeVisible()
 
     // draw a line
     const startXPx = 600
@@ -1475,7 +1472,7 @@ test.describe('Can create sketches on all planes and their back sides', () => {
 
     await expect(page.locator('.cm-content')).toHaveText(code)
 
-    await page.getByRole('button', { name: 'Line', exact: true }).click()
+    await page.getByRole('button', { name: 'Line' }).click()
     await u.openAndClearDebugPanel()
     await page.getByRole('button', { name: 'Exit Sketch' }).click()
     await u.expectCmdLog('[data-message-type="execution-done"]')
@@ -1514,8 +1511,6 @@ test.describe('Can create sketches on all planes and their back sides', () => {
 })
 
 test.describe('Copilot ghost text', () => {
-  test.skip(true, 'Needs to get covered again')
-
   test('completes code in empty file', async ({ page }) => {
     const u = await getUtils(page)
     // const PUR = 400 / 37.5 //pixeltoUnitRatio
@@ -1554,9 +1549,7 @@ test.describe('Copilot ghost text', () => {
     await expect(page.locator('.cm-ghostText')).not.toBeVisible()
   })
 
-  test.skip('copilot disabled in sketch mode no select plane', async ({
-    page,
-  }) => {
+  test('copilot disabled in sketch mode no select plane', async ({ page }) => {
     const u = await getUtils(page)
     // const PUR = 400 / 37.5 //pixeltoUnitRatio
     await page.setViewportSize({ width: 1200, height: 500 })
@@ -2103,7 +2096,7 @@ test.describe('Testing settings', () => {
       .hover()
     await page
       .getByRole('button', {
-        name: 'Roll back theme',
+        name: 'Roll back theme ; Has tooltip: Roll back to match default',
       })
       .click()
     await expect(page.locator('select[name="app-theme"]')).toHaveValue('system')
@@ -2155,7 +2148,7 @@ test.describe('Testing settings', () => {
       .hover()
     await page
       .getByRole('button', {
-        name: 'Roll back theme',
+        name: 'Roll back theme ; Has tooltip: Roll back to match default',
       })
       .click()
     await expect(page.locator('select[name="app-theme"]')).toHaveValue('system')
@@ -2265,50 +2258,6 @@ test.describe('Onboarding tests', () => {
     await expect(page.locator('.cm-content')).toContainText('// Shelf Bracket')
   })
 
-  test('Code resets after confirmation', async ({ page }) => {
-    const initialCode = `const sketch001 = startSketchOn('XZ')`
-
-    // Load the page up with some code so we see the confirmation warning
-    // when we go to replay onboarding
-    await page.addInitScript((code) => {
-      localStorage.setItem('persistCode', code)
-    }, initialCode)
-
-    const u = await getUtils(page)
-    await page.setViewportSize({ width: 1200, height: 500 })
-    await u.waitForAuthSkipAppStart()
-
-    // Replay the onboarding
-    await page.getByRole('link', { name: 'Settings' }).last().click()
-    const replayButton = page.getByRole('button', { name: 'Replay onboarding' })
-    await expect(replayButton).toBeVisible()
-    await replayButton.click()
-
-    // Ensure we see the warning, and that the code has not yet updated
-    await expect(
-      page.getByText('Replaying onboarding resets your code')
-    ).toBeVisible()
-    await expect(page.locator('.cm-content')).toHaveText(initialCode)
-
-    const nextButton = page.getByTestId('onboarding-next')
-    await expect(nextButton).toBeVisible()
-    await nextButton.click()
-
-    // Ensure we see the introduction and that the code has been reset
-    await expect(page.getByText('Welcome to Modeling App!')).toBeVisible()
-    await expect(page.locator('.cm-content')).toContainText('// Shelf Bracket')
-
-    // Ensure we persisted the code to local storage.
-    // Playwright's addInitScript method unfortunately will reset
-    // this code if we try reloading the page as a test,
-    // so this is our best way to test persistence afaik.
-    expect(
-      await page.evaluate(() => {
-        return localStorage.getItem('persistCode')
-      })
-    ).toContain('// Shelf Bracket')
-  })
-
   test('Click through each onboarding step', async ({ page }) => {
     const u = await getUtils(page)
 
@@ -2613,7 +2562,7 @@ test.describe('Testing selections', () => {
     |> line([-${commonPoints.num2}, 0], %)`)
 
     // deselect line tool
-    await page.getByRole('button', { name: 'Line', exact: true }).click()
+    await page.getByRole('button', { name: 'Line' }).click()
 
     await u.closeDebugPanel()
     const selectionSequence = async () => {
@@ -2638,10 +2587,8 @@ test.describe('Testing selections', () => {
       // click a segment hold shift and click an axis, see that a relevant constraint is enabled
       await topHorzSegmentClick()
       await page.keyboard.down('Shift')
-      const constrainButton = page.getByRole('button', {
-        name: 'Length: open menu',
-      })
-      const absYButton = page.getByRole('button', { name: 'Absolute Y' })
+      const constrainButton = page.getByRole('button', { name: 'Constraints' })
+      const absYButton = page.getByRole('button', { name: 'ABS Y' })
       await constrainButton.click()
       await expect(absYButton).toBeDisabled()
       await page.waitForTimeout(100)
@@ -3213,7 +3160,7 @@ const extrude001 = extrude(10, sketch001)`
       },
       {
         pos: [816, 244],
-        expectedCode: 'angledLine([segAng(seg01), yo], %)',
+        expectedCode: 'angledLine([segAng(seg01, %), yo], %)',
       },
       {
         pos: [1107, 161],
@@ -3465,6 +3412,21 @@ const extrude001 = extrude(50, sketch001)
     await expect(
       page.getByRole('button', { name: 'Edit Sketch' })
     ).not.toBeVisible()
+
+    // selecting an editable sketch but clicking "start sketch" should start a new sketch and not edit the existing one
+    await page.getByText(selectionsSnippets.extrudeAndEditAllowed).click()
+    await page.getByRole('button', { name: 'Start Sketch' }).click()
+    await page.waitForTimeout(200)
+    await page.getByTestId('KCL Code').click()
+    await page.waitForTimeout(200)
+    await page.mouse.click(734, 134)
+    await page.waitForTimeout(100)
+    await page.getByTestId('KCL Code').click()
+    // expect main content to contain `sketch005` i.e. started a new sketch
+    await page.waitForTimeout(300)
+    await expect(page.locator('.cm-content')).toHaveText(
+      /sketch001 = startSketchOn\('XZ'\)/
+    )
   })
 
   test('Deselecting line tool should mean nothing happens on click', async ({
@@ -3501,7 +3463,7 @@ const extrude001 = extrude(50, sketch001)
     let previousCodeContent = await page.locator('.cm-content').innerText()
 
     // deselect the line tool by clicking it
-    await page.getByRole('button', { name: 'Line', exact: true }).click()
+    await page.getByRole('button', { name: 'Line' }).click()
 
     await page.mouse.click(700, 200)
     await page.waitForTimeout(100)
@@ -3514,7 +3476,7 @@ const extrude001 = extrude(50, sketch001)
     await expect(page.locator('.cm-content')).toHaveText(previousCodeContent)
 
     // select line tool again
-    await page.getByRole('button', { name: 'Line', exact: true }).click()
+    await page.getByRole('button', { name: 'Line' }).click()
 
     await u.closeDebugPanel()
 
@@ -3847,24 +3809,13 @@ const extrude001 = extrude(distance001, sketch001)`.replace(
     const sketchButton = page.getByRole('button', { name: 'Start Sketch' })
     const cmdBarButton = page.getByRole('button', { name: 'Commands' })
     const rectangleToolCommand = page.getByRole('option', {
-      name: 'rectangle',
-    })
-    const rectangleToolButton = page.getByRole('button', {
-      name: 'Corner rectangle',
-      exact: true,
-    })
-    const lineToolCommand = page.getByRole('option', {
-      name: 'Line',
-    })
-    const lineToolButton = page.getByRole('button', {
-      name: 'Line',
-      exact: true,
+      name: 'Rectangle',
     })
+    const rectangleToolButton = page.getByRole('button', { name: 'Rectangle' })
+    const lineToolCommand = page.getByRole('option', { name: 'Line' })
+    const lineToolButton = page.getByRole('button', { name: 'Line' })
     const arcToolCommand = page.getByRole('option', { name: 'Tangential Arc' })
-    const arcToolButton = page.getByRole('button', {
-      name: 'Tangential Arc',
-      exact: true,
-    })
+    const arcToolButton = page.getByRole('button', { name: 'Tangential Arc' })
 
     // Start a sketch
     await sketchButton.click()
@@ -3911,7 +3862,10 @@ test.describe('Regression tests', () => {
     await u.waitForAuthSkipAppStart()
 
     // expand variables section
-    const variablesTabButton = page.getByTestId('variables-pane-button')
+    const variablesTabButton = page.getByRole('tab', {
+      name: 'Variables',
+      exact: false,
+    })
     await variablesTabButton.click()
 
     // can find sketch001 in the variables summary (pretty-json-container, makes sure we're not looking in the code editor)
@@ -3936,7 +3890,10 @@ test.describe('Regression tests', () => {
 
     await u.waitForAuthSkipAppStart()
 
-    const variablesTabButton = page.getByTestId('variables-pane-button')
+    const variablesTabButton = page.getByRole('tab', {
+      name: 'Variables',
+      exact: false,
+    })
     await variablesTabButton.click()
     // expect to see "myVar:5"
     await expect(
@@ -4019,19 +3976,16 @@ test.describe('Regression tests', () => {
       )
     })
 
-    await expect(async () => {
-      await page.goto('/')
-      await u.waitForPageLoad()
-      // error in guter
-      await expect(page.locator('.cm-lint-marker-error')).toBeVisible({
-        timeout: 1_000,
-      })
-      await page.waitForTimeout(200)
-      // expect it still to be there (sometimes it just clears for a bit?)
-      await expect(page.locator('.cm-lint-marker-error')).toBeVisible({
-        timeout: 1_000,
-      })
-    }).toPass({ timeout: 40_000, intervals: [1_000] })
+    await page.goto('/')
+    await u.waitForPageLoad()
+
+    // error in guter
+    await expect(page.locator('.cm-lint-marker-error')).toBeVisible()
+    await page.waitForTimeout(200)
+    // expect it still to be there (sometimes it just clears for a bit?)
+    await expect(page.locator('.cm-lint-marker-error')).toBeVisible({
+      timeout: 10_000,
+    })
 
     // error text on hover
     await page.hover('.cm-lint-marker-error')
@@ -4179,15 +4133,12 @@ test.describe('Sketch tests', () => {
     await page.setViewportSize({ width: 1200, height: 500 })
 
     await u.waitForAuthSkipAppStart()
+    await page.getByText('tangentialArcTo([24.95, -5.38], %)').click()
 
-    await expect(async () => {
-      await page.mouse.click(700, 200)
-      await page.getByText('tangentialArcTo([24.95, -5.38], %)').click()
-      await expect(
-        page.getByRole('button', { name: 'Edit Sketch' })
-      ).toBeEnabled({ timeout: 1000 })
-      await page.getByRole('button', { name: 'Edit Sketch' }).click()
-    }).toPass({ timeout: 40_000, intervals: [1_000] })
+    await expect(
+      page.getByRole('button', { name: 'Edit Sketch' })
+    ).toBeEnabled()
+    await page.getByRole('button', { name: 'Edit Sketch' }).click()
 
     await page.waitForTimeout(600) // wait for animation
 
@@ -4203,7 +4154,7 @@ test.describe('Sketch tests', () => {
     await u.expectCmdLog('[data-message-type="execution-done"]', 10_000)
     await page.waitForTimeout(100)
 
-    await page.getByRole('button', { name: 'Line', exact: true }).click()
+    await page.getByRole('button', { name: 'Line' }).click()
     await page.waitForTimeout(100)
 
     await page.mouse.click(700, 200)
@@ -4230,7 +4181,9 @@ test.describe('Sketch tests', () => {
       page.getByRole('button', { name: 'Exit Sketch' })
     ).toBeVisible()
 
-    await expect(page.getByText('select a plane or face')).toBeVisible()
+    await expect(
+      page.getByText('click plane or face to sketch on')
+    ).toBeVisible()
 
     await page.keyboard.press('Escape')
     await expect(
@@ -4781,7 +4734,7 @@ test.describe('Sketch tests', () => {
       await expect(page.locator('.cm-content')).toHaveText(code)
       // Assert the tool was unequipped
       await expect(
-        page.getByRole('button', { name: 'Line', exact: true })
+        page.getByRole('button', { name: 'Line' })
       ).not.toHaveAttribute('aria-pressed', 'true')
 
       // exit sketch
@@ -4943,7 +4896,8 @@ test.describe('Testing constraints', () => {
     await page.mouse.click(834, 244)
     await page.keyboard.up('Shift')
 
-    await page.getByRole('button', { name: 'Length', exact: true }).click()
+    await page.getByRole('button', { name: 'Constraints', exact: true }).click()
+    await page.getByRole('button', { name: 'length', exact: true }).click()
     await page.getByText('Add constraining value').click()
 
     await expect(page.locator('.cm-content')).toHaveText(
@@ -4973,13 +4927,13 @@ const part001 = startSketchOn('XZ')
   |> startProfileAt([-7.54, -26.74], %)
   |> line([74.36, 130.4], %, $seg01)
   |> line([78.92, -120.11], %)
-  |> angledLine([segAng(seg01), yo], %)
+  |> angledLine([segAng(seg01, %), yo], %)
   |> line([41.19, 28.97 + 5], %)
 const part002 = startSketchOn('XZ')
   |> startProfileAt([299.05, 231.45], %)
   |> xLine(-425.34, %, $seg_what)
   |> yLine(-264.06, %)
-  |> xLine(segLen(seg_what), %)
+  |> xLine(segLen(seg_what, %), %)
   |> lineTo([profileStartX(%), profileStartY(%)], %)`
       )
     })
@@ -4997,10 +4951,12 @@ const part002 = startSketchOn('XZ')
     await page.waitForTimeout(100) // this wait is needed for webkit - not sure why
     await page
       .getByRole('button', {
-        name: 'Length: open menu',
+        name: 'Constraints',
       })
       .click()
-    await page.getByRole('button', { name: 'remove constraints' }).click()
+    await page
+      .getByRole('button', { name: 'remove constraints', exact: true })
+      .click()
 
     await page.getByText('line([39.13, 68.63], %)').click()
     const activeLinesContent = await page.locator('.cm-activeLine').all()
@@ -5031,13 +4987,13 @@ const part001 = startSketchOn('XZ')
   |> startProfileAt([-7.54, -26.74], %)
   |> line([74.36, 130.4], %, $seg01)
   |> line([78.92, -120.11], %)
-  |> angledLine([segAng(seg01), 78.33], %)
+  |> angledLine([segAng(seg01, %), 78.33], %)
   |> line([41.19, 28.97], %)
 const part002 = startSketchOn('XZ')
   |> startProfileAt([299.05, 231.45], %)
   |> xLine(-425.34, %, $seg_what)
   |> yLine(-264.06, %)
-  |> xLine(segLen(seg_what), %)
+  |> xLine(segLen(seg_what, %), %)
   |> lineTo([profileStartX(%), profileStartY(%)], %)`
           )
         })
@@ -5061,11 +5017,11 @@ const part002 = startSketchOn('XZ')
         await page.keyboard.up('Shift')
         await page
           .getByRole('button', {
-            name: 'Length: open menu',
+            name: 'Constraints',
           })
           .click()
         await page
-          .getByRole('button', { name: 'Perpendicular Distance' })
+          .getByRole('button', { name: 'perpendicular distance', exact: true })
           .click()
 
         const createNewVariableCheckbox = page.getByTestId(
@@ -5102,22 +5058,22 @@ const part002 = startSketchOn('XZ')
       {
         testName: 'Add variable',
         constraint: 'horizontal distance',
-        value: 'segEndX(seg01) + xDis001, 61.34',
+        value: 'segEndX(seg01, %) + xDis001, 61.34',
       },
       {
         testName: 'No variable',
         constraint: 'horizontal distance',
-        value: 'segEndX(seg01) + 88.08, 61.34',
+        value: 'segEndX(seg01, %) + 88.08, 61.34',
       },
       {
         testName: 'Add variable',
         constraint: 'vertical distance',
-        value: '154.9, segEndY(seg01) - yDis001',
+        value: '154.9, segEndY(seg01, %) - yDis001',
       },
       {
         testName: 'No variable',
         constraint: 'vertical distance',
-        value: '154.9, segEndY(seg01) - 42.32',
+        value: '154.9, segEndY(seg01, %) - 42.32',
       },
     ] as const
     for (const { testName, value, constraint } of cases) {
@@ -5136,7 +5092,7 @@ const part002 = startSketchOn('XZ')
   |> startProfileAt([299.05, 231.45], %)
   |> xLine(-425.34, %, $seg_what)
   |> yLine(-264.06, %)
-  |> xLine(segLen(seg_what), %)
+  |> xLine(segLen(seg_what, %), %)
   |> lineTo([profileStartX(%), profileStartY(%)], %)`
           )
         })
@@ -5160,10 +5116,12 @@ const part002 = startSketchOn('XZ')
         await page.keyboard.up('Shift')
         await page
           .getByRole('button', {
-            name: 'Length: open menu',
+            name: 'Constraints',
           })
           .click()
-        await page.getByRole('button', { name: constraint }).click()
+        await page
+          .getByRole('button', { name: constraint, exact: true })
+          .click()
 
         const createNewVariableCheckbox = page.getByTestId(
           'create-new-variable-checkbox'
@@ -5204,25 +5162,25 @@ const part002 = startSketchOn('XZ')
       {
         testName: 'Add variable',
         addVariable: true,
-        constraint: 'Absolute X',
+        constraint: 'ABS X',
         value: 'xDis001, 61.34',
       },
       {
         testName: 'No variable',
         addVariable: false,
-        constraint: 'Absolute X',
+        constraint: 'ABS X',
         value: '154.9, 61.34',
       },
       {
         testName: 'Add variable',
         addVariable: true,
-        constraint: 'Absolute Y',
+        constraint: 'ABS Y',
         value: '154.9, yDis001',
       },
       {
         testName: 'No variable',
         addVariable: false,
-        constraint: 'Absolute Y',
+        constraint: 'ABS Y',
         value: '154.9, 61.34',
       },
     ] as const
@@ -5242,7 +5200,7 @@ const part002 = startSketchOn('XZ')
   |> startProfileAt([299.05, 231.45], %)
   |> xLine(-425.34, %, $seg_what)
   |> yLine(-264.06, %)
-  |> xLine(segLen(seg_what), %)
+  |> xLine(segLen(seg_what, %), %)
   |> lineTo([profileStartX(%), profileStartY(%)], %)`
           )
         })
@@ -5258,7 +5216,7 @@ const part002 = startSketchOn('XZ')
           u.getSegmentBodyCoords(`[data-overlay-index="${2}"]`),
         ])
 
-        if (constraint === 'Absolute X') {
+        if (constraint === 'ABS X') {
           await page.mouse.click(600, 130)
         } else {
           await page.mouse.click(900, 250)
@@ -5269,7 +5227,7 @@ const part002 = startSketchOn('XZ')
         await page.keyboard.up('Shift')
         await page
           .getByRole('button', {
-            name: 'Length: open menu',
+            name: 'Constraints',
           })
           .click()
         await page
@@ -5312,13 +5270,13 @@ const part002 = startSketchOn('XZ')
         testName: 'Add variable',
         addVariable: true,
         axisSelect: false,
-        value: 'segAng(seg01) + angle001',
+        value: 'segAng(seg01, %) + angle001',
       },
       {
         testName: 'No variable',
         addVariable: false,
         axisSelect: false,
-        value: 'segAng(seg01) + 22.69',
+        value: 'segAng(seg01, %) + 22.69',
       },
       {
         testName: 'Add variable, selecting axis',
@@ -5349,7 +5307,7 @@ const part002 = startSketchOn('XZ')
   |> startProfileAt([299.05, 231.45], %)
   |> xLine(-425.34, %, $seg_what)
   |> yLine(-264.06, %)
-  |> xLine(segLen(seg_what), %)
+  |> xLine(segLen(seg_what, %), %)
   |> lineTo([profileStartX(%), profileStartY(%)], %)`
           )
         })
@@ -5377,10 +5335,10 @@ const part002 = startSketchOn('XZ')
         await page.keyboard.up('Shift')
         await page
           .getByRole('button', {
-            name: 'Length: open menu',
+            name: 'Constraints',
           })
           .click()
-        await page.getByTestId('dropdown-constraint-angle').click()
+        await page.getByTestId('angle').click()
 
         const createNewVariableCheckbox = page.getByTestId(
           'create-new-variable-checkbox'
@@ -5459,7 +5417,7 @@ const part002 = startSketchOn('XZ')
   |> startProfileAt([299.05, 231.45], %)
   |> xLine(-425.34, %, $seg_what)
   |> yLine(-264.06, %)
-  |> xLine(segLen(seg_what), %)
+  |> xLine(segLen(seg_what, %), %)
   |> lineTo([profileStartX(%), profileStartY(%)], %)`
           )
         })
@@ -5478,10 +5436,10 @@ const part002 = startSketchOn('XZ')
         await page.mouse.click(line3.x, line3.y)
         await page
           .getByRole('button', {
-            name: 'Length: open menu',
+            name: 'Constraints',
           })
           .click()
-        await page.getByTestId('dropdown-constraint-' + constraint).click()
+        await page.getByTestId(constraint).click()
 
         if (!addVariable) {
           await page.getByTestId('create-new-variable-checkbox').click()
@@ -5535,7 +5493,7 @@ const part002 = startSketchOn('XZ')
   |> startProfileAt([299.05, 231.45], %)
   |> xLine(-425.34, %, $seg_what)
   |> yLine(-264.06, %)
-  |> xLine(segLen(seg_what), %)
+  |> xLine(segLen(seg_what, %), %)
   |> lineTo([profileStartX(%), profileStartY(%)], %)`
           )
         })
@@ -5569,7 +5527,7 @@ const part002 = startSketchOn('XZ')
         await expect(activeLinesContent).toHaveLength(codeAfter.length)
 
         const constraintMenuButton = page.getByRole('button', {
-          name: 'Length: open menu',
+          name: 'Constraints',
         })
         const constraintButton = page
           .getByRole('button', {
@@ -5600,19 +5558,19 @@ const part002 = startSketchOn('XZ')
   test.describe('Two segment - no modal constraints', () => {
     const cases = [
       {
-        codeAfter: `|> angledLine([83, segLen(seg01)], %)`,
+        codeAfter: `|> angledLine([83, segLen(seg01, %)], %)`,
         constraintName: 'Equal Length',
       },
       {
-        codeAfter: `|> angledLine([segAng(seg01), 78.33], %)`,
+        codeAfter: `|> angledLine([segAng(seg01, %), 78.33], %)`,
         constraintName: 'Parallel',
       },
       {
-        codeAfter: `|> lineTo([segEndX(seg01), 61.34], %)`,
+        codeAfter: `|> lineTo([segEndX(seg01, %), 61.34], %)`,
         constraintName: 'Vertically Align',
       },
       {
-        codeAfter: `|> lineTo([154.9, segEndY(seg01)], %)`,
+        codeAfter: `|> lineTo([154.9, segEndY(seg01, %)], %)`,
         constraintName: 'Horizontally Align',
       },
     ] as const
@@ -5631,7 +5589,7 @@ const part002 = startSketchOn('XZ')
   |> startProfileAt([299.05, 231.45], %)
   |> xLine(-425.34, %, $seg_what)
   |> yLine(-264.06, %)
-  |> xLine(segLen(seg_what), %)
+  |> xLine(segLen(seg_what, %), %)
   |> lineTo([profileStartX(%), profileStartY(%)], %)`
           )
         })
@@ -5652,7 +5610,7 @@ const part002 = startSketchOn('XZ')
         await page.mouse.click(line3.x - 3, line3.y + 20)
         await page.keyboard.up('Shift')
         const constraintMenuButton = page.getByRole('button', {
-          name: 'Length: open menu',
+          name: 'Constraints',
         })
         const constraintButton = page.getByRole('button', {
           name: constraintName,
@@ -5708,7 +5666,7 @@ const part002 = startSketchOn('XZ')
   |> startProfileAt([299.05, 231.45], %)
   |> xLine(-425.34, %, $seg_what)
   |> yLine(-264.06, %)
-  |> xLine(segLen(seg_what), %)
+  |> xLine(segLen(seg_what, %), %)
   |> lineTo([profileStartX(%), profileStartY(%)], %)`
           )
         })
@@ -5729,7 +5687,7 @@ const part002 = startSketchOn('XZ')
         await page.mouse.click(axisClick.x, axisClick.y)
         await page.keyboard.up('Shift')
         const constraintMenuButton = page.getByRole('button', {
-          name: 'Length: open menu',
+          name: 'Constraints',
         })
         const constraintButton = page.getByRole('button', {
           name: constraintName,
@@ -5788,10 +5746,10 @@ const part002 = startSketchOn('XZ')
 
     await page
       .getByRole('button', {
-        name: 'Length: open menu',
+        name: 'Constraints',
       })
       .click()
-    await page.getByRole('button', { name: 'Horizontal', exact: true }).click()
+    await page.getByRole('button', { name: 'horizontal', exact: true }).click()
 
     let activeLinesContent = await page.locator('.cm-activeLine').all()
     await expect(activeLinesContent[0]).toHaveText(`|> xLine(3.13, %)`)
@@ -5812,13 +5770,13 @@ const part002 = startSketchOn('XZ')
     await page.waitForTimeout(300)
     await page
       .getByRole('button', {
-        name: 'Length: open menu',
+        name: 'Constraints',
       })
       .click()
     // await expect(page.getByRole('button', { name: 'length', exact: true })).toBeVisible()
     await page.waitForTimeout(200)
     // await page.getByRole('button', { name: 'length', exact: true }).click()
-    await page.getByTestId('dropdown-constraint-length').click()
+    await page.locator('[data-testid="length"]').click()
 
     await page.getByLabel('length Value').fill('10')
     await page.getByRole('button', { name: 'Add constraining value' }).click()
@@ -6876,8 +6834,8 @@ const part001 = startSketchOn('XZ')
   |> startProfileAt([5, 6], %)
   |> ${lineToBeDeleted}
   |> line([-10, -15], %)
-  |> angledLine([-176, segLen(seg01)], %)        
-${extraLine ? 'const myVar = segLen(seg01)' : ''}`
+  |> angledLine([-176, segLen(seg01, %)], %)        
+${extraLine ? 'const myVar = segLen(seg01, part001)' : ''}`
               )
             },
             {
@@ -7036,7 +6994,7 @@ ${extraLine ? 'const myVar = segLen(seg01)' : ''}`
   |> startProfileAt([5, 6], %)
   |> ${lineToBeDeleted}
   |> line([-10, -15], %)
-  |> angledLine([-176, segLen(seg01)], %)`
+  |> angledLine([-176, segLen(seg01, %)], %)`
             )
           },
           {
@@ -7110,8 +7068,6 @@ test.describe('Test network and connection issues', () => {
 
     await u.waitForAuthSkipAppStart()
 
-    const networkToggle = page.getByTestId('network-toggle')
-
     // This is how we wait until the stream is online
     await expect(
       page.getByRole('button', { name: 'Start Sketch' })
@@ -7125,7 +7081,7 @@ test.describe('Test network and connection issues', () => {
     await expect(networkPopover).not.toBeVisible()
 
     // (First check) Expect the network to be up
-    await expect(networkToggle).toContainText('Connected')
+    await expect(page.getByText('Network Health (Connected)')).toBeVisible()
 
     // Click the network widget
     await networkWidget.click()
@@ -7147,7 +7103,7 @@ test.describe('Test network and connection issues', () => {
     })
 
     // Expect the network to be down
-    await expect(networkToggle).toContainText('Offline')
+    await expect(page.getByText('Network Health (Offline)')).toBeVisible()
 
     // Click the network widget
     await networkWidget.click()
@@ -7173,7 +7129,7 @@ test.describe('Test network and connection issues', () => {
     ).not.toBeDisabled({ timeout: 15000 })
 
     // (Second check) expect the network to be up
-    await expect(networkToggle).toContainText('Connected')
+    await expect(page.getByText('Network Health (Connected)')).toBeVisible()
   })
 
   test('Engine disconnect & reconnect in sketch mode', async ({
@@ -7185,8 +7141,6 @@ test.describe('Test network and connection issues', () => {
       browserName === 'webkit',
       'Skip on Safari until `window.tearDown` is working there'
     )
-    const networkToggle = page.getByTestId('network-toggle')
-
     const u = await getUtils(page)
     await page.setViewportSize({ width: 1200, height: 500 })
     const PUR = 400 / 37.5 //pixeltoUnitRatio
@@ -7229,7 +7183,7 @@ test.describe('Test network and connection issues', () => {
     |> line([${commonPoints.num1}, 0], %)`)
 
     // Expect the network to be up
-    await expect(networkToggle).toContainText('Connected')
+    await expect(page.getByText('Network Health (Connected)')).toBeVisible()
 
     // simulate network down
     await u.emulateNetworkConditions({
@@ -7241,7 +7195,7 @@ test.describe('Test network and connection issues', () => {
     })
 
     // Expect the network to be down
-    await expect(networkToggle).toContainText('Offline')
+    await expect(page.getByText('Network Health (Offline)')).toBeVisible()
 
     // Ensure we are not in sketch mode
     await expect(
@@ -7266,7 +7220,7 @@ test.describe('Test network and connection issues', () => {
     ).not.toBeDisabled({ timeout: 15000 })
 
     // Expect the network to be up
-    await expect(networkToggle).toContainText('Connected')
+    await expect(page.getByText('Network Health (Connected)')).toBeVisible()
     await expect(page.getByTestId('loading-stream')).not.toBeAttached()
 
     // Click off the code pane.
@@ -7283,7 +7237,7 @@ test.describe('Test network and connection issues', () => {
     await page.waitForTimeout(150)
 
     // Click the line tool
-    await page.getByRole('button', { name: 'Line', exact: true }).click()
+    await page.getByRole('button', { name: 'Line' }).click()
 
     await page.waitForTimeout(150)
 
@@ -7293,15 +7247,15 @@ test.describe('Test network and connection issues', () => {
       .toHaveText(`const sketch001 = startSketchOn('XZ')
     |> startProfileAt(${commonPoints.startAt}, %)
     |> line([${commonPoints.num1}, 0], %)
-    |> line([-8.84, 8.75], %)`)
+    |> line([-9.16, 8.81], %)`)
     await page.waitForTimeout(100)
     await page.mouse.click(startXPx, 500 - PUR * 20)
     await expect(page.locator('.cm-content'))
       .toHaveText(`const sketch001 = startSketchOn('XZ')
     |> startProfileAt(${commonPoints.startAt}, %)
     |> line([${commonPoints.num1}, 0], %)
-    |> line([-8.84, 8.75], %)
-    |> line([-5.6, 0], %)`)
+    |> line([-9.16, 8.81], %)
+    |> line([-5.28, 0], %)`)
 
     // Unequip line tool
     await page.keyboard.press('Escape')
@@ -7310,7 +7264,7 @@ test.describe('Test network and connection issues', () => {
       page.getByRole('button', { name: 'Exit Sketch' })
     ).toBeVisible()
     await expect(
-      page.getByRole('button', { name: 'Line', exact: true })
+      page.getByRole('button', { name: 'Line' })
     ).not.toHaveAttribute('aria-pressed', 'true')
 
     // Exit sketch
@@ -7611,19 +7565,19 @@ const part001 = startSketchOn('-XZ')
         offset: -armThick,
         intersectTag: seg04
       }, %)
-  |> angledLineToY([segAng(seg04) + 180, ZERO], %)
+  |> angledLineToY([segAng(seg04, %) + 180, ZERO], %)
   |> angledLineToY({
         angle: -bottomAng,
         to: -totalHeightHalf - armThick,
       }, %, $seg02)
-  |> xLineTo(segEndX(seg03) + 0, %)
-  |> yLine(-segLen(seg01), %)
+  |> xLineTo(segEndX(seg03, %) + 0, %)
+  |> yLine(-segLen(seg01, %), %)
   |> angledLineThatIntersects({
         angle: HALF_TURN,
         offset: -armThick,
         intersectTag: seg02
       }, %)
-  |> angledLineToY([segAng(seg02) + 180, -baseHeight], %)
+  |> angledLineToY([segAng(seg02, %) + 180, -baseHeight], %)
   |> xLineTo(ZERO, %)
   |> close(%)
   |> extrude(4, %)`
@@ -7715,7 +7669,7 @@ test('Keyboard shortcuts can be viewed through the help menu', async ({
     .waitFor({ state: 'visible' })
 
   // Open the help menu
-  await page.getByRole('button', { name: 'Help and resources' }).click()
+  await page.getByRole('button', { name: 'Help', exact: false }).click()
 
   // Open the keyboard shortcuts
   await page.getByRole('button', { name: 'Keyboard Shortcuts' }).click()
@@ -7739,11 +7693,8 @@ test('First escape in tool pops you out of tool, second exits sketch mode', asyn
   await u.expectCmdLog('[data-message-type="execution-done"]')
   await u.closeDebugPanel()
 
-  const lineButton = page.getByRole('button', { name: 'Line', exact: true })
-  const arcButton = page.getByRole('button', {
-    name: 'Tangential Arc',
-    exact: true,
-  })
+  const lineButton = page.getByRole('button', { name: 'Line' })
+  const arcButton = page.getByRole('button', { name: 'Tangential Arc' })
 
   // Test these hotkeys perform actions when
   // focus is on the canvas
@@ -7755,7 +7706,6 @@ test('First escape in tool pops you out of tool, second exits sketch mode', asyn
   await page.mouse.move(800, 300)
   await page.mouse.click(800, 300)
   await page.waitForTimeout(1000)
-  await expect(lineButton).toBeVisible()
   await expect(lineButton).toHaveAttribute('aria-pressed', 'true')
 
   // Draw a line
@@ -7825,12 +7775,9 @@ test('Basic default modeling and sketch hotkeys work', async ({ page }) => {
   await u.closeDebugPanel()
 
   const codePane = page.getByRole('textbox').locator('div')
-  const codePaneButton = page.getByTestId('code-pane-button')
-  const lineButton = page.getByRole('button', { name: 'Line', exact: true })
-  const arcButton = page.getByRole('button', {
-    name: 'Tangential Arc',
-    exact: true,
-  })
+  const codePaneButton = page.getByRole('tab', { name: 'KCL Code' })
+  const lineButton = page.getByRole('button', { name: 'Line' })
+  const arcButton = page.getByRole('button', { name: 'Tangential Arc' })
   const extrudeButton = page.getByRole('button', { name: 'Extrude' })
 
   // Test that the hotkeys do nothing when
@@ -7851,7 +7798,7 @@ test('Basic default modeling and sketch hotkeys work', async ({ page }) => {
   await page.mouse.click(600, 250)
 
   // work-around: to stop "keyboard.press('s')" from typing in the editor even when it should be blurred
-  await page.getByRole('button', { name: 'Commands' }).click()
+  await page.getByRole('button', { name: 'Commands ⌘K' }).click()
   await page.waitForTimeout(100)
   await page.keyboard.press('Escape')
   await page.waitForTimeout(100)
@@ -8097,34 +8044,3 @@ test('Sketch on face', async ({ page }) => {
 const sketch002 = extrude(${[5, 5]} + 7, sketch002)`
   await expect(page.locator('.cm-content')).toHaveText(result2.regExp)
 })
-
-test('Typing KCL errors induces a badge on the error logs pane button', async ({
-  page,
-}) => {
-  const u = await getUtils(page)
-
-  // Load the app with the working starter code
-  await page.addInitScript((code) => {
-    localStorage.setItem('persistCode', code)
-  }, bracket)
-
-  await page.setViewportSize({ width: 1200, height: 500 })
-  await u.waitForAuthSkipAppStart()
-
-  // wait for execution done
-  await u.openDebugPanel()
-  await u.expectCmdLog('[data-message-type="execution-done"]')
-  await u.closeDebugPanel()
-
-  // Ensure no badge is present
-  const errorLogsButton = page.getByRole('button', { name: 'KCL Errors pane' })
-  await expect(errorLogsButton).not.toContainText('notification')
-
-  // Delete a character to break the KCL
-  await u.openKclCodePanel()
-  await page.getByText('extrude(').click()
-  await page.keyboard.press('Backspace')
-
-  // Ensure that a badge appears on the button
-  await expect(errorLogsButton).toContainText('notification')
-})

e2e/playwright/snapshot-tests.spec.ts

@@ -64,27 +64,27 @@ const part001 = startSketchOn('-XZ')
   |> angledLineToY({
         angle: topAng,
         to: totalHeightHalf,
-      }, %, $seg04)
-  |> xLineTo(totalLen, %, $seg03')
-  |> yLine(-armThick, %, $seg01)
+      }, %, 'seg04')
+  |> xLineTo(totalLen, %, 'seg03')
+  |> yLine(-armThick, %, 'seg01')
   |> angledLineThatIntersects({
         angle: HALF_TURN,
         offset: -armThick,
-        intersectTag: seg04
+        intersectTag: 'seg04'
       }, %)
-  |> angledLineToY([segAng(seg04, %) + 180, ZERO], %)
+  |> angledLineToY([segAng('seg04', %) + 180, ZERO], %)
   |> angledLineToY({
         angle: -bottomAng,
         to: -totalHeightHalf - armThick,
-      }, %, $seg02)
-  |> xLineTo(segEndX(seg03, %) + 0, %)
-  |> yLine(-segLen(seg01, %), %)
+      }, %, 'seg02')
+  |> xLineTo(segEndX('seg03', %) + 0, %)
+  |> yLine(-segLen('seg01', %), %)
   |> angledLineThatIntersects({
         angle: HALF_TURN,
         offset: -armThick,
-        intersectTag: seg02
+        intersectTag: 'seg02'
       }, %)
-  |> angledLineToY([segAng(seg02, %) + 180, -baseHeight], %)
+  |> angledLineToY([segAng('seg02', %) + 180, -baseHeight], %)
   |> xLineTo(ZERO, %)
   |> close(%)
   |> extrude(4, %)`
@@ -431,9 +431,7 @@ test('Draft segments should look right', async ({ page, context }) => {
   |> line([7.25, 0], %)`
   await expect(page.locator('.cm-content')).toHaveText(code)
 
-  await page
-    .getByRole('button', { name: 'Tangential Arc', exact: true })
-    .click()
+  await page.getByRole('button', { name: 'Tangential Arc' }).click()
 
   await page.mouse.move(startXPx + PUR * 30, 500 - PUR * 20, { steps: 10 })
 
@@ -477,10 +475,8 @@ test('Draft rectangles should look right', async ({ page, context }) => {
   const startXPx = 600
 
   // Equip the rectangle tool
-  await page.getByRole('button', { name: 'Line', exact: true }).click()
-  await page
-    .getByRole('button', { name: 'Corner rectangle', exact: true })
-    .click()
+  await page.getByRole('button', { name: 'Line' }).click()
+  await page.getByRole('button', { name: 'Rectangle' }).click()
 
   // Draw the rectangle
   await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 30)
@@ -539,9 +535,7 @@ test.describe('Client side scene scale should match engine scale', () => {
   |> line([7.25, 0], %)`
     await expect(u.codeLocator).toHaveText(code)
 
-    await page
-      .getByRole('button', { name: 'Tangential Arc', exact: true })
-      .click()
+    await page.getByRole('button', { name: 'Tangential Arc' }).click()
     await page.waitForTimeout(100)
 
     await page.mouse.click(startXPx + PUR * 30, 500 - PUR * 20)
@@ -551,9 +545,7 @@ test.describe('Client side scene scale should match engine scale', () => {
     await expect(u.codeLocator).toHaveText(code)
 
     // click tangential arc tool again to unequip it
-    await page
-      .getByRole('button', { name: 'Tangential Arc', exact: true })
-      .click()
+    await page.getByRole('button', { name: 'Tangential Arc' }).click()
     await page.waitForTimeout(100)
 
     // screen shot should show the sketch
@@ -642,9 +634,7 @@ test.describe('Client side scene scale should match engine scale', () => {
   |> line([184.3, 0], %)`
     await expect(u.codeLocator).toHaveText(code)
 
-    await page
-      .getByRole('button', { name: 'Tangential Arc', exact: true })
-      .click()
+    await page.getByRole('button', { name: 'Tangential Arc' }).click()
     await page.waitForTimeout(100)
 
     await page.mouse.click(startXPx + PUR * 30, 500 - PUR * 20)
@@ -653,9 +643,7 @@ test.describe('Client side scene scale should match engine scale', () => {
   |> tangentialArcTo([551.2, -62.01], %)`
     await expect(u.codeLocator).toHaveText(code)
 
-    await page
-      .getByRole('button', { name: 'Tangential Arc', exact: true })
-      .click()
+    await page.getByRole('button', { name: 'Tangential Arc' }).click()
     await page.waitForTimeout(100)
 
     // screen shot should show the sketch

e2e/playwright/storageStates.ts

@@ -71,7 +71,7 @@ export const TEST_CODE_GIZMO = `const part001 = startSketchOn('XZ')
 |> angledLine({ angle: 3 + 0, length: 3.14 + 0 }, %)
 |> lineTo([20.14 + 0, -0.14 + 0], %)
 |> xLineTo(29 + 0, %)
-|> yLine(-3.14 + 0, %, $a)
+|> yLine(-3.14 + 0, %, 'a')
 |> xLine(1.63, %)
 |> angledLineOfXLength({ angle: 3 + 0, length: 3.14 }, %)
 |> angledLineOfYLength({ angle: 30, length: 3 + 0 }, %)
@@ -79,7 +79,7 @@ export const TEST_CODE_GIZMO = `const part001 = startSketchOn('XZ')
 |> angledLineToY({ angle: 30, to: 11.14 }, %)
 |> angledLineThatIntersects({
   angle: 3.14,
-  intersectTag: a,
+  intersectTag: 'a',
   offset: 0
 }, %)
 |> tangentialArcTo([13.14 + 0, 13.14], %)

e2e/playwright/test-utils.ts

@@ -1,5 +1,5 @@
-import { expect, Page, Download } from '@playwright/test'
-import { EngineCommand } from 'lang/std/artifactMap'
+import { test, expect, Page, Download } from '@playwright/test'
+import { EngineCommand } from '../../src/lang/std/engineConnection'
 import os from 'os'
 import fsp from 'fs/promises'
 import pixelMatch from 'pixelmatch'
@@ -21,7 +21,7 @@ async function waitForPageLoad(page: Page) {
     timeout: 20_000,
   })
 
-  await expect(page.getByRole('button', { name: 'Start Sketch' })).toBeEnabled({
+  await expect(page.getByTestId('start-sketch')).toBeEnabled({
     timeout: 20_000,
   })
 }
@@ -58,45 +58,44 @@ async function waitForDefaultPlanesToBeVisible(page: Page) {
 }
 
 async function openKclCodePanel(page: Page) {
-  const paneLocator = page.getByTestId('code-pane-button')
-  const ariaSelected = await paneLocator?.getAttribute('aria-pressed')
-  const isOpen = ariaSelected === 'true'
+  const paneLocator = page.getByRole('tab', { name: 'KCL Code', exact: false })
+  const isOpen = (await paneLocator?.getAttribute('aria-selected')) === 'true'
 
   if (!isOpen) {
     await paneLocator.click()
-    await expect(paneLocator).toHaveAttribute('aria-pressed', 'true')
+    await paneLocator.and(page.locator('[aria-selected="true"]')).waitFor()
   }
 }
 
 async function closeKclCodePanel(page: Page) {
-  const paneLocator = page.getByTestId('code-pane-button')
-  const ariaSelected = await paneLocator?.getAttribute('aria-pressed')
-  const isOpen = ariaSelected === 'true'
-
+  const paneLocator = page.getByRole('tab', { name: 'KCL Code', exact: false })
+  const isOpen = (await paneLocator?.getAttribute('aria-selected')) === 'true'
   if (isOpen) {
     await paneLocator.click()
-    await expect(paneLocator).not.toHaveAttribute('aria-pressed', 'true')
+    await paneLocator
+      .and(page.locator(':not([aria-selected="true"])'))
+      .waitFor()
   }
 }
 
 async function openDebugPanel(page: Page) {
-  const debugLocator = page.getByTestId('debug-pane-button')
-  await expect(debugLocator).toBeVisible()
-  const isOpen = (await debugLocator?.getAttribute('aria-pressed')) === 'true'
+  const debugLocator = page.getByRole('tab', { name: 'Debug', exact: false })
+  const isOpen = (await debugLocator?.getAttribute('aria-selected')) === 'true'
 
   if (!isOpen) {
     await debugLocator.click()
-    await expect(debugLocator).toHaveAttribute('aria-pressed', 'true')
+    await debugLocator.and(page.locator('[aria-selected="true"]')).waitFor()
   }
 }
 
 async function closeDebugPanel(page: Page) {
-  const debugLocator = page.getByTestId('debug-pane-button')
-  await expect(debugLocator).toBeVisible()
-  const isOpen = (await debugLocator?.getAttribute('aria-pressed')) === 'true'
+  const debugLocator = page.getByRole('tab', { name: 'Debug', exact: false })
+  const isOpen = (await debugLocator?.getAttribute('aria-selected')) === 'true'
   if (isOpen) {
     await debugLocator.click()
-    await expect(debugLocator).not.toHaveAttribute('aria-pressed', 'true')
+    await debugLocator
+      .and(page.locator(':not([aria-selected="true"])'))
+      .waitFor()
   }
 }
 
@@ -266,7 +265,7 @@ export async function getUtils(page: Page) {
     getSegmentBodyCoords: async (locator: string, px = 30) => {
       const overlay = page.locator(locator)
       const bbox = await overlay
-        .boundingBox({ timeout: 5000 })
+        .boundingBox()
         .then((box) => ({ ...box, x: box?.x || 0, y: box?.y || 0 }))
       const angle = Number(await overlay.getAttribute('data-overlay-angle'))
       const angleXOffset = Math.cos(((angle - 180) * Math.PI) / 180) * px
@@ -472,11 +471,10 @@ export const doExport = async (
   page: Page
 ): Promise<Paths> => {
   await page.getByRole('button', { name: APP_NAME }).click()
-  const exportMenuButton = page.getByRole('button', {
-    name: 'Export current part',
-  })
-  await expect(exportMenuButton).toBeVisible()
-  await exportMenuButton.click()
+  await expect(
+    page.getByRole('button', { name: 'Export', exact: false })
+  ).toBeVisible()
+  await page.getByRole('button', { name: 'Export', exact: false }).click()
   await expect(page.getByTestId('command-bar')).toBeVisible()
 
   // Go through export via command bar

e2e/tauri/specs/app.spec.ts

@@ -5,6 +5,7 @@ import os from 'os'
 import { click, setDatasetValue } from '../utils'
 
 const isWin32 = os.platform() === 'win32'
+const tauriProtocol = isWin32 ? 'http://tauri.localhost' : 'tauri://localhost'
 const documentsDir = path.join(os.homedir(), 'Documents')
 const userSettingsDir = path.join(
   os.homedir(),
@@ -67,12 +68,24 @@ describe('ZMA sign in flow', () => {
     await new Promise((resolve) => setTimeout(resolve, 10000))
     const newFileButton = await $('[data-testid="home-new-file"]')
     expect(await newFileButton.getText()).toEqual('New project')
+
+    // Refresh once before the authorized user flows
+    await browser.execute(`window.location.href = "${tauriProtocol}/home"`)
+    await new Promise((resolve) => setTimeout(resolve, 10000))
   })
 })
 
 describe('ZMA authorized user flows', () => {
   // Note: each flow below is intended to start *and* end from the home page
 
+  it('checks the network indicator status', async () => {
+    const toggle = await $('[data-testid="network-toggle"]')
+    await click(toggle)
+    const status = await $('[data-testid="network"]')
+    expect(await status.getText()).toEqual('CONNECTED')
+    await click(toggle)
+  })
+
   it('opens the settings page, checks filesystem settings, and closes the settings page', async () => {
     const menuButton = await $('[data-testid="user-sidebar-toggle"]')
     await click(menuButton)
@@ -137,8 +150,7 @@ describe('ZMA authorized user flows', () => {
       const errorText = await $('[data-testid="unexpected-error"]')
       expect(await errorText.getText()).toContain('unexpected error')
     }
-    const base = isWin32 ? 'http://tauri.localhost' : 'tauri://localhost'
-    await browser.execute(`window.location.href = "${base}/home"`)
+    await browser.execute(`window.location.href = "${tauriProtocol}/home"`)
   })
 })
 

openapi/machine-api.json

@@ -1,340 +0,0 @@
-{
-  "components": {
-    "responses": {
-      "Error": {
-        "content": {
-          "application/json": {
-            "schema": {
-              "$ref": "#/components/schemas/Error"
-            }
-          }
-        },
-        "description": "Error"
-      }
-    },
-    "schemas": {
-      "Error": {
-        "description": "Error information from a response.",
-        "properties": {
-          "error_code": {
-            "type": "string"
-          },
-          "message": {
-            "type": "string"
-          },
-          "request_id": {
-            "type": "string"
-          }
-        },
-        "required": [
-          "message",
-          "request_id"
-        ],
-        "type": "object"
-      },
-      "Machine": {
-        "description": "Details for a 3d printer connected over USB.",
-        "oneOf": [
-          {
-            "description": "Details for a 3d printer connected over USB.",
-            "properties": {
-              "id": {
-                "type": "string"
-              },
-              "manufacturer": {
-                "type": "string"
-              },
-              "model": {
-                "type": "string"
-              },
-              "port": {
-                "type": "string"
-              },
-              "type": {
-                "enum": [
-                  "UsbPrinter"
-                ],
-                "type": "string"
-              }
-            },
-            "required": [
-              "id",
-              "manufacturer",
-              "model",
-              "port",
-              "type"
-            ],
-            "type": "object"
-          },
-          {
-            "description": "Details for a 3d printer connected over USB.",
-            "properties": {
-              "hostname": {
-                "description": "The hostname of the printer.",
-                "nullable": true,
-                "type": "string"
-              },
-              "ip": {
-                "description": "The IP address of the printer.",
-                "format": "ip",
-                "type": "string"
-              },
-              "manufacturer": {
-                "allOf": [
-                  {
-                    "$ref": "#/components/schemas/NetworkPrinterManufacturer"
-                  }
-                ],
-                "description": "The manufacturer of the printer."
-              },
-              "model": {
-                "description": "The model of the printer.",
-                "nullable": true,
-                "type": "string"
-              },
-              "port": {
-                "description": "The port of the printer.",
-                "format": "uint16",
-                "minimum": 0,
-                "nullable": true,
-                "type": "integer"
-              },
-              "serial": {
-                "description": "The serial number of the printer.",
-                "nullable": true,
-                "type": "string"
-              },
-              "type": {
-                "enum": [
-                  "NetworkPrinter"
-                ],
-                "type": "string"
-              }
-            },
-            "required": [
-              "ip",
-              "manufacturer",
-              "type"
-            ],
-            "type": "object"
-          }
-        ]
-      },
-      "NetworkPrinterManufacturer": {
-        "description": "Network printer manufacturer.",
-        "oneOf": [
-          {
-            "description": "Bambu.",
-            "enum": [
-              "Bambu"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Formlabs.",
-            "enum": [
-              "Formlabs"
-            ],
-            "type": "string"
-          }
-        ]
-      },
-      "Pong": {
-        "description": "The response from the `/ping` endpoint.",
-        "properties": {
-          "message": {
-            "description": "The pong response.",
-            "type": "string"
-          }
-        },
-        "required": [
-          "message"
-        ],
-        "type": "object"
-      },
-      "PrintJobResponse": {
-        "description": "The response from the `/print` endpoint.",
-        "properties": {
-          "job_id": {
-            "description": "The job id used for this print.",
-            "type": "string"
-          },
-          "parameters": {
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/PrintParameters"
-              }
-            ],
-            "description": "The parameters used for this print."
-          }
-        },
-        "required": [
-          "job_id",
-          "parameters"
-        ],
-        "type": "object"
-      },
-      "PrintParameters": {
-        "description": "Parameters for printing.",
-        "properties": {
-          "machine_id": {
-            "type": "string"
-          }
-        },
-        "required": [
-          "machine_id"
-        ],
-        "type": "object"
-      }
-    }
-  },
-  "info": {
-    "contact": {
-      "email": "machine-api@zoo.dev",
-      "url": "https://zoo.dev"
-    },
-    "description": "",
-    "title": "machine-api",
-    "version": "0.1.0"
-  },
-  "openapi": "3.0.3",
-  "paths": {
-    "/": {
-      "get": {
-        "operationId": "api_get_schema",
-        "responses": {
-          "200": {
-            "content": {
-              "application/json": {
-                "schema": {}
-              }
-            },
-            "description": "successful operation"
-          },
-          "4XX": {
-            "$ref": "#/components/responses/Error"
-          },
-          "5XX": {
-            "$ref": "#/components/responses/Error"
-          }
-        },
-        "summary": "Return the OpenAPI schema in JSON format.",
-        "tags": [
-          "meta"
-        ]
-      }
-    },
-    "/machines": {
-      "get": {
-        "operationId": "get_machines",
-        "responses": {
-          "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "additionalProperties": {
-                    "$ref": "#/components/schemas/Machine"
-                  },
-                  "title": "Map_of_Machine",
-                  "type": "object"
-                }
-              }
-            },
-            "description": "successful operation"
-          },
-          "4XX": {
-            "$ref": "#/components/responses/Error"
-          },
-          "5XX": {
-            "$ref": "#/components/responses/Error"
-          }
-        },
-        "summary": "List available machines and their statuses",
-        "tags": [
-          "print"
-        ]
-      }
-    },
-    "/ping": {
-      "get": {
-        "operationId": "ping",
-        "responses": {
-          "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/Pong"
-                }
-              }
-            },
-            "description": "successful operation"
-          },
-          "4XX": {
-            "$ref": "#/components/responses/Error"
-          },
-          "5XX": {
-            "$ref": "#/components/responses/Error"
-          }
-        },
-        "summary": "Return pong.",
-        "tags": [
-          "meta"
-        ]
-      }
-    },
-    "/print": {
-      "post": {
-        "operationId": "print_file",
-        "requestBody": {
-          "content": {
-            "multipart/form-data": {
-              "schema": {
-                "format": "binary",
-                "type": "string"
-              }
-            }
-          },
-          "required": true
-        },
-        "responses": {
-          "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/PrintJobResponse"
-                }
-              }
-            },
-            "description": "successful operation"
-          },
-          "4XX": {
-            "$ref": "#/components/responses/Error"
-          },
-          "5XX": {
-            "$ref": "#/components/responses/Error"
-          }
-        },
-        "summary": "Print a given file. File must be a sliceable 3D model.",
-        "tags": [
-          "print"
-        ]
-      }
-    }
-  },
-  "tags": [
-    {
-      "description": "Meta information about the API.",
-      "externalDocs": {
-        "url": "https://docs.zoo.dev/api/meta"
-      },
-      "name": "meta"
-    },
-    {
-      "description": "Utilities for printing and discovering printers.",
-      "externalDocs": {
-        "url": "https://docs.zoo.dev/api/print"
-      },
-      "name": "print"
-    }
-  ]
-}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "untitled-app",
-  "version": "0.24.6",
+  "version": "0.24.3",
   "private": true,
   "dependencies": {
     "@codemirror/autocomplete": "^6.17.0",
@@ -109,7 +109,7 @@
   },
   "devDependencies": {
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
-    "@babel/preset-env": "^7.25.0",
+    "@babel/preset-env": "^7.24.3",
     "@iarna/toml": "^2.2.5",
     "@lezer/generator": "^1.7.1",
     "@playwright/test": "^1.45.1",

packages/codemirror-lsp-client/src/client/server-capability-registration.ts

@@ -42,8 +42,8 @@ function registerServerCapability(
   serverCapabilities: ServerCapabilities,
   registration: Registration
 ): ServerCapabilities | Error {
-  const serverCapabilitiesCopy = structuredClone(
-    serverCapabilities
+  const serverCapabilitiesCopy = JSON.parse(
+    JSON.stringify(serverCapabilities)
   ) as IFlexibleServerCapabilities
   const { method, registerOptions } = registration
   const providerName = ServerCapabilitiesProviders[method]
@@ -54,7 +54,7 @@ function registerServerCapability(
     } else {
       serverCapabilitiesCopy[providerName] = Object.assign(
         {},
-        structuredClone(registerOptions)
+        JSON.parse(JSON.stringify(registerOptions))
       )
     }
   } else {
@@ -68,8 +68,8 @@ function unregisterServerCapability(
   serverCapabilities: ServerCapabilities,
   unregistration: Unregistration
 ): ServerCapabilities {
-  const serverCapabilitiesCopy = structuredClone(
-    serverCapabilities
+  const serverCapabilitiesCopy = JSON.parse(
+    JSON.stringify(serverCapabilities)
   ) as IFlexibleServerCapabilities
   const { method } = unregistration
   const providerName = ServerCapabilitiesProviders[method]

packages/codemirror-lsp-client/src/plugin/hover.ts

@@ -1,10 +1,5 @@
 import { Extension } from '@codemirror/state'
-import {
-  hoverTooltip,
-  tooltips,
-  ViewPlugin,
-  EditorView,
-} from '@codemirror/view'
+import { hoverTooltip, tooltips, ViewPlugin } from '@codemirror/view'
 
 import { LanguageServerPlugin } from './lsp'
 import { offsetToPos } from './util'
@@ -22,13 +17,6 @@ export default function lspHoverExt(
     }),
     tooltips({
       position: 'absolute',
-      parent: document.body,
-    }),
-    EditorView.baseTheme({
-      '.cm-tooltip': {
-        fontSize: '12px',
-        maxWidth: '400px',
-      },
     }),
   ]
 }

packages/codemirror-lsp-client/src/plugin/lint.ts

@@ -0,0 +1,12 @@
+import { Extension } from '@codemirror/state'
+import { linter, forEachDiagnostic, Diagnostic } from '@codemirror/lint'
+
+export default function lspLintExt(): Extension {
+  return linter((view) => {
+    let diagnostics: Diagnostic[] = []
+    forEachDiagnostic(view.state, (d: Diagnostic, from: number, to: number) => {
+      diagnostics.push(d)
+    })
+    return diagnostics
+  })
+}

packages/codemirror-lsp-client/src/plugin/lsp.ts

@@ -18,7 +18,6 @@ import type {
   ViewPlugin,
 } from '@codemirror/view'
 import { EditorView, Tooltip } from '@codemirror/view'
-import { linter } from '@codemirror/lint'
 
 import type { PublishDiagnosticsParams } from 'vscode-languageserver-protocol'
 import type * as LSP from 'vscode-languageserver-protocol'
@@ -36,6 +35,7 @@ import lspAutocompleteExt from './autocomplete'
 import lspHoverExt from './hover'
 import lspFormatExt from './format'
 import lspIndentExt from './indent'
+import lspLintExt from './lint'
 import lspSemanticTokensExt from './semantic-tokens'
 
 const useLast = (values: readonly any[]) => values.reduce((_, v) => v, '')
@@ -214,7 +214,6 @@ export class LanguageServerPlugin implements PluginValue {
     }
 
     if (!this.client.ready) return
-
     try {
       // Update the state (not the editor) with the new code.
       this.client.textDocumentDidChange({
@@ -572,8 +571,8 @@ export class LanguageServerPluginSpec
       lspFormatExt(plugin),
       lspHoverExt(plugin),
       lspIndentExt(),
+      lspLintExt(),
       lspSemanticTokensExt(),
-      linter(null),
     ]
   }
 }

src-tauri/Cargo.lock

@@ -188,7 +188,7 @@ dependencies = [
  "tauri-plugin-shell",
  "tauri-plugin-updater",
  "tokio",
- "toml 0.8.19",
+ "toml 0.8.14",
  "url",
 ]
 
@@ -332,7 +332,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -367,7 +367,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -407,7 +407,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -550,7 +550,7 @@ dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
  "syn_derive",
 ]
 
@@ -648,12 +648,6 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
-[[package]]
-name = "byteorder-lite"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
-
 [[package]]
 name = "bytes"
 version = "1.6.0"
@@ -727,7 +721,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a969e13a7589e9e3e4207e153bae624ade2b5622fb4684a4923b23ec3d57719"
 dependencies = [
  "serde",
- "toml 0.8.19",
+ "toml 0.8.14",
 ]
 
 [[package]]
@@ -798,9 +792,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.13"
+version = "4.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc"
+checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -808,9 +802,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.13"
+version = "4.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99"
+checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942"
 dependencies = [
  "anstream",
  "anstyle",
@@ -822,14 +816,14 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.13"
+version = "4.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
+checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -1079,7 +1073,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
 dependencies = [
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -1089,7 +1083,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f"
 dependencies = [
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -1113,7 +1107,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.10.0",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -1124,7 +1118,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -1185,7 +1179,7 @@ checksum = "4078275de501a61ceb9e759d37bdd3d7210e654dbc167ac1a3678ef4435ed57b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
  "synstructure",
 ]
 
@@ -1212,7 +1206,7 @@ dependencies = [
 
 [[package]]
 name = "derive-docs"
-version = "0.1.21"
+version = "0.1.20"
 dependencies = [
  "Inflector",
  "convert_case 0.6.0",
@@ -1222,7 +1216,7 @@ dependencies = [
  "regex",
  "serde",
  "serde_tokenstream",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -1233,7 +1227,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -1294,7 +1288,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -1326,7 +1320,7 @@ checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -1389,7 +1383,7 @@ dependencies = [
  "cc",
  "memchr",
  "rustc_version",
- "toml 0.8.19",
+ "toml 0.8.14",
  "vswhom",
  "winreg 0.52.0",
 ]
@@ -1433,7 +1427,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -1594,7 +1588,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -1710,7 +1704,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -1986,7 +1980,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -2014,7 +2008,7 @@ dependencies = [
  "inflections",
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -2089,7 +2083,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -2405,18 +2399,6 @@ dependencies = [
  "unicode-normalization",
 ]
 
-[[package]]
-name = "image"
-version = "0.25.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10"
-dependencies = [
- "bytemuck",
- "byteorder-lite",
- "num-traits",
- "png",
-]
-
 [[package]]
 name = "indexmap"
 version = "1.9.3"
@@ -2589,7 +2571,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-lib"
-version = "0.2.3"
+version = "0.1.72"
 dependencies = [
  "anyhow",
  "approx",
@@ -2599,7 +2581,6 @@ dependencies = [
  "bson",
  "chrono",
  "clap",
- "convert_case 0.6.0",
  "dashmap 6.0.1",
  "databake",
  "derive-docs",
@@ -2607,7 +2588,6 @@ dependencies = [
  "futures",
  "git_rev",
  "gltf-json",
- "image",
  "js-sys",
  "kittycad",
  "lazy_static",
@@ -2622,7 +2602,7 @@ dependencies = [
  "thiserror",
  "tokio",
  "tokio-tungstenite",
- "toml 0.8.19",
+ "toml 0.8.14",
  "tower-lsp",
  "ts-rs",
  "url",
@@ -2648,9 +2628,9 @@ dependencies = [
 
 [[package]]
 name = "kittycad"
-version = "0.3.9"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36b87a9cca545825ba18005c1944b8525fac28867d99984178bf22c79fb5ec25"
+checksum = "e1777b503442fa4666564cc3ab237d456df853a09648a4b2bb09622d25d021a5"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2950,14 +2930,13 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "1.0.1"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
- "hermit-abi",
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.52.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -3088,6 +3067,16 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
 [[package]]
 name = "num_enum"
 version = "0.5.11"
@@ -3388,7 +3377,7 @@ dependencies = [
  "regex",
  "regex-syntax 0.8.3",
  "structmeta",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -3507,7 +3496,7 @@ dependencies = [
  "phf_shared 0.11.2",
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -3539,9 +3528,9 @@ dependencies = [
 
 [[package]]
 name = "phonenumber"
-version = "0.3.6+8.13.36"
+version = "0.3.5+8.13.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11756237b57b8cc5e97dc8b1e70ea436324d30e7075de63b14fd15073a8f692a"
+checksum = "f174c8db59b620032bd52b655fc97000458850fec0db35fcd4e802b668517ec0"
 dependencies = [
  "bincode",
  "either",
@@ -3575,7 +3564,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -4449,7 +4438,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -4569,7 +4558,7 @@ checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -4580,18 +4569,17 @@ checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.121"
+version = "1.0.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ab380d7d9f22ef3f21ad3e6c1ebe8e4fc7a2000ccba2e4d71fc96f15b2cb609"
+checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
 dependencies = [
  "indexmap 2.2.6",
  "itoa 1.0.11",
- "memchr",
  "ryu",
  "serde",
 ]
@@ -4614,14 +4602,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.7"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
 dependencies = [
  "serde",
 ]
@@ -4635,7 +4623,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -4677,7 +4665,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -4945,7 +4933,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "structmeta-derive",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -4956,7 +4944,7 @@ checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -4978,7 +4966,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -5011,9 +4999,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5029,7 +5017,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -5046,7 +5034,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -5088,7 +5076,7 @@ dependencies = [
  "cfg-expr",
  "heck 0.5.0",
  "pkg-config",
- "toml 0.8.19",
+ "toml 0.8.14",
  "version-compare",
 ]
 
@@ -5241,7 +5229,7 @@ dependencies = [
  "serde_json",
  "tauri-utils",
  "tauri-winres",
- "toml 0.8.19",
+ "toml 0.8.14",
  "walkdir",
 ]
 
@@ -5263,7 +5251,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2",
- "syn 2.0.72",
+ "syn 2.0.71",
  "tauri-utils",
  "thiserror",
  "time",
@@ -5281,7 +5269,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
  "tauri-codegen",
  "tauri-utils",
 ]
@@ -5299,7 +5287,7 @@ dependencies = [
  "serde",
  "serde_json",
  "tauri-utils",
- "toml 0.8.19",
+ "toml 0.8.14",
  "walkdir",
 ]
 
@@ -5583,7 +5571,7 @@ dependencies = [
  "serde_with",
  "swift-rs",
  "thiserror",
- "toml 0.8.19",
+ "toml 0.8.14",
  "url",
  "urlpattern",
  "walkdir",
@@ -5639,22 +5627,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c"
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "1.0.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "f2675633b1499176c2dff06b0856a27976a8f9d436737b4cf4f312d4d91d8bbb"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -5726,32 +5714,33 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.39.2"
+version = "1.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1"
+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
 dependencies = [
  "backtrace",
  "bytes",
  "libc",
  "mio",
+ "num_cpus",
  "parking_lot 0.12.1",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2",
  "tokio-macros",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.4.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -5830,21 +5819,21 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.19"
+version = "0.8.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.20",
+ "toml_edit 0.22.14",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.8"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
 dependencies = [
  "serde",
 ]
@@ -5886,15 +5875,15 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.20"
+version = "0.22.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
 dependencies = [
  "indexmap 2.2.6",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.18",
+ "winnow 0.6.6",
 ]
 
 [[package]]
@@ -5951,7 +5940,7 @@ checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -5980,7 +5969,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -6110,7 +6099,7 @@ checksum = "c88cc88fd23b5a04528f3a8436024f20010a16ec18eb23c164b1242f65860130"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
  "termcolor",
 ]
 
@@ -6327,7 +6316,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -6426,7 +6415,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
  "wasm-bindgen-shared",
 ]
 
@@ -6460,7 +6449,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6601,7 +6590,7 @@ checksum = "ac1345798ecd8122468840bcdf1b95e5dc6d2206c5e4b0eafa078d061f59c9bc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -6707,7 +6696,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -6718,7 +6707,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -6965,9 +6954,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.6.18"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+checksum = "f0c976aaaa0e1f90dbb21e9587cdaf1d9679a1cde8875c0d6bd83ab96a208352"
 dependencies = [
  "memchr",
 ]
@@ -7170,7 +7159,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.71",
 ]
 
 [[package]]

src-tauri/Cargo.toml

@@ -15,7 +15,7 @@ tauri-build = { version = "2.0.0-beta.18", features = [] }
 
 [dependencies]
 anyhow = "1"
-kcl-lib = { version = "0.2", path = "../src/wasm-lib/kcl" }
+kcl-lib = { version = "0.1.53", path = "../src/wasm-lib/kcl" }
 kittycad = "0.3.7"
 log = "0.4.21"
 oauth2 = "4.4.2"

src-tauri/src/main.rs

@@ -218,7 +218,7 @@ async fn parse_project_route(configuration: Configuration, route: &str) -> Resul
 
 #[tauri::command]
 async fn read_dir_recursive(path: &str) -> Result<FileEntry, InvokeError> {
-    kcl_lib::settings::utils::walk_dir(Path::new(path).to_path_buf())
+    kcl_lib::settings::utils::walk_dir(&Path::new(path).to_path_buf())
         .await
         .map_err(InvokeError::from_anyhow)
 }

src-tauri/tauri.conf.json

@@ -80,5 +80,5 @@
     }
   },
   "productName": "Zoo Modeling App",
-  "version": "0.24.6"
+  "version": "0.24.3"
 }

src/App.tsx

@@ -2,7 +2,7 @@ import { MouseEventHandler, useEffect, useMemo, useRef } from 'react'
 import { uuidv4 } from 'lib/utils'
 import { useHotKeyListener } from './hooks/useHotKeyListener'
 import { Stream } from './components/Stream'
-import { EngineCommand } from 'lang/std/artifactMap'
+import { EngineCommand } from './lang/std/engineConnection'
 import { throttle } from './lib/utils'
 import { AppHeader } from './components/AppHeader'
 import { useHotkeys } from 'react-hotkeys-hook'

src/Router.tsx

@@ -134,9 +134,12 @@ const router = createBrowserRouter([
         path: paths.HOME,
         element: (
           <Auth>
-            <Outlet />
-            <Home />
-            <CommandBar />
+            <ModelingMachineProvider>
+              <Outlet />
+              <Home />
+              <CommandBar />
+            </ModelingMachineProvider>
+            <WasmErrBanner />
           </Auth>
         ),
         id: paths.HOME,

src/Toolbar.tsx

@@ -1,4 +1,4 @@
-import { useRef, useMemo, memo } from 'react'
+import { WheelEvent, useRef, useMemo } from 'react'
 import { isCursorInSketchCommandRange } from 'lang/util'
 import { engineCommandManager, kclManager } from 'lib/singletons'
 import { useModelingContext } from 'hooks/useModelingContext'
@@ -12,14 +12,11 @@ import { ActionButtonDropdown } from 'components/ActionButtonDropdown'
 import { useHotkeys } from 'react-hotkeys-hook'
 import Tooltip from 'components/Tooltip'
 import { useAppState } from 'AppState'
-import { CustomIcon } from 'components/CustomIcon'
 import {
-  toolbarConfig,
-  ToolbarItem,
-  ToolbarItemCallbackProps,
-  ToolbarItemResolved,
-  ToolbarModeName,
-} from 'lib/toolbar'
+  canRectangleTool,
+  isEditingExistingSketch,
+} from 'machines/modelingMachine'
+import { DEV } from 'env'
 
 export function Toolbar({
   className = '',
@@ -28,14 +25,12 @@ export function Toolbar({
   const { state, send, context } = useModelingContext()
   const { commandBarSend } = useCommandsContext()
   const iconClassName =
-    'group-disabled:text-chalkboard-50 !text-inherit dark:group-enabled:group-hover:!text-inherit'
-  const bgClassName = '!bg-transparent'
-  const buttonBgClassName =
-    'bg-chalkboard-transparent dark:bg-transparent disabled:bg-transparent dark:disabled:bg-transparent enabled:hover:bg-chalkboard-10 dark:enabled:hover:bg-chalkboard-100 pressed:!bg-primary pressed:enabled:hover:!text-chalkboard-10'
-  const buttonBorderClassName =
-    '!border-transparent hover:!border-chalkboard-20 dark:enabled:hover:!border-primary pressed:!border-primary ui-open:!border-primary'
-
-  const sketchPathId = useMemo(() => {
+    'group-disabled:text-chalkboard-50 group-enabled:group-hover:!text-primary dark:group-enabled:group-hover:!text-inherit group-pressed:!text-chalkboard-10 group-ui-open:!text-chalkboard-10 dark:group-ui-open:!text-chalkboard-10'
+  const bgClassName =
+    'group-disabled:!bg-transparent group-enabled:group-hover:bg-primary/10 dark:group-enabled:group-hover:bg-primary group-pressed:bg-primary group-ui-open:bg-primary'
+  const buttonClassName =
+    'bg-chalkboard-10 dark:bg-chalkboard-100 enabled:hover:bg-chalkboard-10 dark:enabled:hover:bg-chalkboard-100 pressed:!border-primary ui-open:!border-primary'
+  const pathId = useMemo(() => {
     if (!isSingleCursorInPipe(context.selectionRanges, kclManager.ast)) {
       return false
     }
@@ -56,289 +51,401 @@ export function Toolbar({
     isExecuting ||
     !isStreamReady
 
-  const currentMode =
-    (Object.entries(toolbarConfig).find(([_, mode]) =>
-      mode.check(state)
-    )?.[0] as ToolbarModeName) || 'modeling'
-
-  /** These are the props that will be passed to the callbacks in the toolbar config
-   * They are memoized to prevent unnecessary re-renders,
-   * but they still get a lot of churn from the state machine
-   * so I think there's a lot of room for improvement here
-   */
-  const configCallbackProps: ToolbarItemCallbackProps = useMemo(
-    () => ({
-      modelingStateMatches: state.matches,
-      modelingSend: send,
-      commandBarSend,
-      sketchPathId,
-    }),
-    [state.matches, send, commandBarSend, sketchPathId]
+  const disableLineButton =
+    state.matches('Sketch.Rectangle tool.Awaiting second corner') ||
+    disableAllButtons
+  useHotkeys(
+    'l',
+    () =>
+      state.matches('Sketch.Line tool')
+        ? send('CancelSketch')
+        : send({
+            type: 'change tool',
+            data: { tool: 'line' },
+          }),
+    { enabled: !disableLineButton, scopes: ['sketch'] }
+  )
+  const disableTangentialArc =
+    (!isEditingExistingSketch(context) &&
+      !state.matches('Sketch.Tangential arc to')) ||
+    disableAllButtons
+  useHotkeys(
+    'a',
+    () =>
+      state.matches('Sketch.Tangential arc to')
+        ? send('CancelSketch')
+        : send({
+            type: 'change tool',
+            data: { tool: 'tangentialArc' },
+          }),
+    { enabled: !disableTangentialArc, scopes: ['sketch'] }
+  )
+  const disableRectangle =
+    (!canRectangleTool(context) && !state.matches('Sketch.Rectangle tool')) ||
+    disableAllButtons
+  useHotkeys(
+    'r',
+    () =>
+      state.matches('Sketch.Rectangle tool')
+        ? send('CancelSketch')
+        : send({
+            type: 'change tool',
+            data: { tool: 'rectangle' },
+          }),
+    { enabled: !disableRectangle, scopes: ['sketch'] }
+  )
+  useHotkeys(
+    's',
+    () =>
+      state.nextEvents.includes('Enter sketch') && pathId
+        ? send({ type: 'Enter sketch' })
+        : send({ type: 'Enter sketch', data: { forceNewSketch: true } }),
+    { enabled: !disableAllButtons, scopes: ['modeling'] }
+  )
+  useHotkeys(
+    'esc',
+    () =>
+      ['Sketch no face', 'Sketch.SketchIdle'].some(state.matches)
+        ? send('Cancel')
+        : send('CancelSketch'),
+    { enabled: !disableAllButtons, scopes: ['sketch'] }
+  )
+  useHotkeys(
+    'e',
+    () =>
+      commandBarSend({
+        type: 'Find and select command',
+        data: { name: 'Extrude', groupId: 'modeling' },
+      }),
+    { enabled: !disableAllButtons, scopes: ['modeling'] }
+  )
+  const disableFillet = !state.can('Fillet') || disableAllButtons
+  useHotkeys(
+    'f',
+    () =>
+      commandBarSend({
+        type: 'Find and select command',
+        data: { name: 'Fillet', groupId: 'modeling' },
+      }),
+    { enabled: !disableFillet, scopes: ['modeling'] }
   )
 
-  /**
-   * Resolve all the callbacks and values for the current mode,
-   * so we don't need to worry about the other modes
-   */
-  const currentModeItems: (
-    | ToolbarItemResolved
-    | ToolbarItemResolved[]
-    | 'break'
-  )[] = useMemo(() => {
-    return toolbarConfig[currentMode].items.map((maybeIconConfig) => {
-      if (maybeIconConfig === 'break') {
-        return 'break'
-      } else if (Array.isArray(maybeIconConfig)) {
-        return maybeIconConfig.map(resolveItemConfig)
-      } else {
-        return resolveItemConfig(maybeIconConfig)
-      }
-    })
-
-    function resolveItemConfig(
-      maybeIconConfig: ToolbarItem
-    ): ToolbarItemResolved {
-      return {
-        ...maybeIconConfig,
-        title:
-          typeof maybeIconConfig.title === 'string'
-            ? maybeIconConfig.title
-            : maybeIconConfig.title(configCallbackProps),
-        description: maybeIconConfig.description,
-        links: maybeIconConfig.links || [],
-        isActive: maybeIconConfig.isActive?.(state),
-        hotkey:
-          typeof maybeIconConfig.hotkey === 'string'
-            ? maybeIconConfig.hotkey
-            : maybeIconConfig.hotkey?.(state),
-        disabled:
-          disableAllButtons ||
-          maybeIconConfig.status !== 'available' ||
-          maybeIconConfig.disabled?.(state) === true,
-        disableHotkey: maybeIconConfig.disableHotkey?.(state),
-        status: maybeIconConfig.status,
-      }
+  function handleToolbarButtonsWheelEvent(ev: WheelEvent<HTMLSpanElement>) {
+    const span = toolbarButtonsRef.current
+    if (!span) {
+      return
     }
-  }, [currentMode, disableAllButtons, configCallbackProps])
 
+    span.scrollLeft = span.scrollLeft += ev.deltaY
+  }
+  const nextEvents = useMemo(() => state.nextEvents, [state.nextEvents])
+  const splitMenuItems = useMemo(
+    () =>
+      nextEvents
+        .filter(
+          (eventName) =>
+            eventName.includes('Make segment') ||
+            eventName.includes('Constrain')
+        )
+        .sort((a, b) => {
+          const aisEnabled = nextEvents
+            .filter((event) => state.can(event as any))
+            .includes(a)
+          const bIsEnabled = nextEvents
+            .filter((event) => state.can(event as any))
+            .includes(b)
+          if (aisEnabled && !bIsEnabled) {
+            return -1
+          }
+          if (!aisEnabled && bIsEnabled) {
+            return 1
+          }
+          return 0
+        })
+        .map((eventName) => ({
+          label: eventName
+            .replace('Make segment ', '')
+            .replace('Constrain ', ''),
+          onClick: () => send(eventName),
+          disabled:
+            !nextEvents
+              .filter((event) => state.can(event as any))
+              .includes(eventName) || disableAllButtons,
+        })),
+
+    [JSON.stringify(nextEvents), state]
+  )
   return (
-    <menu className="max-w-full whitespace-nowrap rounded-b px-2 py-1 bg-chalkboard-10 dark:bg-chalkboard-90 relative border border-chalkboard-20 dark:border-chalkboard-80 border-t-0 shadow-sm">
+    <menu className="max-w-full whitespace-nowrap rounded px-1.5 py-0.5 backdrop-blur-sm bg-chalkboard-10/80 dark:bg-chalkboard-110/70 relative">
       <ul
         {...props}
         ref={toolbarButtonsRef}
-        className={
-          'has-[[aria-expanded=true]]:!pointer-events-none m-0 py-1 rounded-l-sm flex gap-1.5 items-center ' +
-          className
-        }
+        onWheel={handleToolbarButtonsWheelEvent}
+        className={'m-0 py-1 rounded-l-sm flex gap-2 items-center ' + className}
+        style={{ scrollbarWidth: 'thin' }}
       >
-        {/* A menu item will either be a vertical line break, a button with a dropdown, or a single button */}
-        {currentModeItems.map((maybeIconConfig, i) => {
-          if (maybeIconConfig === 'break') {
-            return (
-              <div
-                key={'break-' + i}
-                className="h-5 w-[1px] block bg-chalkboard-30 dark:bg-chalkboard-80"
-              />
-            )
-          } else if (Array.isArray(maybeIconConfig)) {
-            return (
-              <ActionButtonDropdown
-                Element="button"
-                key={maybeIconConfig[0].id}
-                data-testid={maybeIconConfig[0].id + '-dropdown'}
-                id={maybeIconConfig[0].id + '-dropdown'}
-                name={maybeIconConfig[0].title}
-                className={
-                  'group/wrapper ' +
-                  buttonBorderClassName +
-                  ' !bg-transparent relative group !gap-0'
-                }
-                splitMenuItems={maybeIconConfig.map((itemConfig) => ({
-                  id: itemConfig.id,
-                  label: itemConfig.title,
-                  hotkey: itemConfig.hotkey,
-                  onClick: () => itemConfig.onClick(configCallbackProps),
-                  disabled:
-                    disableAllButtons ||
-                    itemConfig.status !== 'available' ||
-                    itemConfig.disabled === true,
-                  status: itemConfig.status,
-                }))}
-              >
-                <ActionButton
-                  Element="button"
-                  id={maybeIconConfig[0].id}
-                  data-testid={maybeIconConfig[0].id}
-                  iconStart={{
-                    icon: maybeIconConfig[0].icon,
-                    className: iconClassName,
-                    bgClassName: bgClassName,
-                  }}
-                  className={
-                    '!border-transparent !px-0 pressed:!text-chalkboard-10 pressed:enabled:hovered:!text-chalkboard-10 ' +
-                    buttonBgClassName
-                  }
-                  aria-pressed={maybeIconConfig[0].isActive}
-                  disabled={
-                    disableAllButtons ||
-                    maybeIconConfig[0].status !== 'available' ||
-                    maybeIconConfig[0].disabled
-                  }
-                  name={maybeIconConfig[0].title}
-                  aria-description={maybeIconConfig[0].description}
-                  onClick={() =>
-                    maybeIconConfig[0].onClick(configCallbackProps)
-                  }
-                >
-                  <ToolbarItemContents
-                    itemConfig={maybeIconConfig[0]}
-                    configCallbackProps={configCallbackProps}
-                  />
-                </ActionButton>
-              </ActionButtonDropdown>
-            )
-          }
-          const itemConfig = maybeIconConfig
-
-          return (
+        {nextEvents.includes('Enter sketch') && (
+          <li className="contents">
             <ActionButton
+              className={buttonClassName}
               Element="button"
-              key={itemConfig.id}
-              id={itemConfig.id}
-              data-testid={itemConfig.id}
+              onClick={() =>
+                send({ type: 'Enter sketch', data: { forceNewSketch: true } })
+              }
               iconStart={{
-                icon: itemConfig.icon,
-                className: iconClassName,
-                bgClassName: bgClassName,
+                icon: 'sketch',
+                iconClassName,
+                bgClassName,
               }}
-              className={
-                'pressed:!text-chalkboard-10 pressed:enabled:hovered:!text-chalkboard-10 ' +
-                buttonBorderClassName +
-                ' ' +
-                buttonBgClassName +
-                (!itemConfig.showTitle ? ' !px-0' : '')
-              }
-              name={itemConfig.title}
-              aria-description={itemConfig.description}
-              aria-pressed={itemConfig.isActive}
-              disabled={
-                disableAllButtons ||
-                itemConfig.status !== 'available' ||
-                itemConfig.disabled
-              }
-              onClick={() => itemConfig.onClick(configCallbackProps)}
+              disabled={disableAllButtons}
             >
-              <ToolbarItemContents
-                itemConfig={itemConfig}
-                configCallbackProps={configCallbackProps}
-              />
+              <span data-testid="start-sketch">Start Sketch</span>
+              <Tooltip
+                delay={1250}
+                position="bottom"
+                className="!px-2 !text-xs"
+              >
+                Shortcut: S
+              </Tooltip>
             </ActionButton>
-          )
-        })}
+          </li>
+        )}
+        {nextEvents.includes('Enter sketch') && pathId && (
+          <li className="contents">
+            <ActionButton
+              className={buttonClassName}
+              Element="button"
+              onClick={() => send({ type: 'Enter sketch' })}
+              iconStart={{
+                icon: 'sketch',
+                iconClassName,
+                bgClassName,
+              }}
+              disabled={disableAllButtons}
+            >
+              Edit Sketch
+              <Tooltip
+                delay={1250}
+                position="bottom"
+                className="!px-2 !text-xs"
+              >
+                Shortcut: S
+              </Tooltip>
+            </ActionButton>
+          </li>
+        )}
+        {nextEvents.includes('Cancel') && !state.matches('idle') && (
+          <li className="contents">
+            <ActionButton
+              className={buttonClassName}
+              Element="button"
+              onClick={() => send({ type: 'Cancel' })}
+              iconStart={{
+                icon: 'arrowLeft',
+                iconClassName,
+                bgClassName,
+              }}
+              disabled={disableAllButtons}
+            >
+              Exit Sketch
+              <Tooltip
+                delay={1250}
+                position="bottom"
+                className="!px-2 !text-xs"
+              >
+                Shortcut: Esc
+              </Tooltip>
+            </ActionButton>
+          </li>
+        )}
+        {state.matches('Sketch no face') && (
+          <li className="contents">
+            <div className="mx-2 text-sm">click plane or face to sketch on</div>
+          </li>
+        )}
+        {state.matches('Sketch') && !state.matches('idle') && (
+          <>
+            <li className="contents" key="line-button">
+              <ActionButton
+                className={buttonClassName}
+                Element="button"
+                onClick={() =>
+                  state?.matches('Sketch.Line tool')
+                    ? send('CancelSketch')
+                    : send({
+                        type: 'change tool',
+                        data: { tool: 'line' },
+                      })
+                }
+                aria-pressed={state?.matches('Sketch.Line tool')}
+                iconStart={{
+                  icon: 'line',
+                  iconClassName,
+                  bgClassName,
+                }}
+                disabled={disableLineButton}
+              >
+                Line
+                <Tooltip
+                  delay={1250}
+                  position="bottom"
+                  className="!px-2 !text-xs"
+                >
+                  Shortcut: L
+                </Tooltip>
+              </ActionButton>
+            </li>
+            <li className="contents" key="tangential-arc-button">
+              <ActionButton
+                className={buttonClassName}
+                Element="button"
+                onClick={() =>
+                  state.matches('Sketch.Tangential arc to')
+                    ? send('CancelSketch')
+                    : send({
+                        type: 'change tool',
+                        data: { tool: 'tangentialArc' },
+                      })
+                }
+                aria-pressed={state.matches('Sketch.Tangential arc to')}
+                iconStart={{
+                  icon: 'arc',
+                  iconClassName,
+                  bgClassName,
+                }}
+                disabled={disableTangentialArc}
+              >
+                Tangential Arc
+                <Tooltip
+                  delay={1250}
+                  position="bottom"
+                  className="!px-2 !text-xs"
+                >
+                  Shortcut: A
+                </Tooltip>
+              </ActionButton>
+            </li>
+            <li className="contents" key="rectangle-button">
+              <ActionButton
+                className={buttonClassName}
+                Element="button"
+                onClick={() =>
+                  state.matches('Sketch.Rectangle tool')
+                    ? send('CancelSketch')
+                    : send({
+                        type: 'change tool',
+                        data: { tool: 'rectangle' },
+                      })
+                }
+                aria-pressed={state.matches('Sketch.Rectangle tool')}
+                iconStart={{
+                  icon: 'rectangle',
+                  iconClassName,
+                  bgClassName,
+                }}
+                disabled={disableRectangle}
+                title={
+                  canRectangleTool(context)
+                    ? 'Rectangle'
+                    : 'Can only be used when a sketch is empty currently'
+                }
+              >
+                Rectangle
+                <Tooltip
+                  delay={1250}
+                  position="bottom"
+                  className="!px-2 !text-xs"
+                >
+                  Shortcut: R
+                </Tooltip>
+              </ActionButton>
+            </li>
+          </>
+        )}
+        {state.matches('Sketch.SketchIdle') &&
+          nextEvents.filter(
+            (eventName) =>
+              eventName.includes('Make segment') ||
+              eventName.includes('Constrain')
+          ).length > 0 && (
+            <ActionButtonDropdown
+              splitMenuItems={splitMenuItems}
+              className={buttonClassName}
+              Element="button"
+              iconStart={{
+                icon: 'dimension',
+                iconClassName,
+                bgClassName,
+              }}
+            >
+              Constraints
+            </ActionButtonDropdown>
+          )}
+        {state.matches('idle') && (
+          <li className="contents">
+            <ActionButton
+              className={buttonClassName}
+              Element="button"
+              onClick={() =>
+                commandBarSend({
+                  type: 'Find and select command',
+                  data: { name: 'Extrude', groupId: 'modeling' },
+                })
+              }
+              disabled={!state.can('Extrude') || disableAllButtons}
+              title={
+                state.can('Extrude')
+                  ? 'extrude'
+                  : 'sketches need to be closed, or not already extruded'
+              }
+              iconStart={{
+                icon: 'extrude',
+                iconClassName,
+                bgClassName,
+              }}
+            >
+              Extrude
+              <Tooltip
+                delay={1250}
+                position="bottom"
+                className="!px-2 !text-xs"
+              >
+                Shortcut: E
+              </Tooltip>
+            </ActionButton>
+          </li>
+        )}
+        {state.matches('idle') && (DEV || (window as any)._enableFillet) && (
+          <li className="contents">
+            <ActionButton
+              className={buttonClassName}
+              Element="button"
+              onClick={() =>
+                commandBarSend({
+                  type: 'Find and select command',
+                  data: { name: 'Fillet', groupId: 'modeling' },
+                })
+              }
+              disabled={disableFillet}
+              title={disableFillet ? 'fillet' : "edge can't be filleted"}
+              iconStart={{
+                icon: 'fillet', // todo: add fillet icon
+                iconClassName,
+                bgClassName,
+              }}
+            >
+              Fillet
+              <Tooltip
+                delay={1250}
+                position="bottom"
+                className="!px-2 !text-xs"
+              >
+                Shortcut: F
+              </Tooltip>
+            </ActionButton>
+          </li>
+        )}
       </ul>
-      {state.matches('Sketch no face') && (
-        <div className="absolute top-full left-1/2 -translate-x-1/2 mt-2 py-1 px-2 bg-chalkboard-10 dark:bg-chalkboard-90 border border-chalkboard-20 dark:border-chalkboard-80 rounded shadow-lg">
-          <p className="text-xs">Select a plane or face to start sketching</p>
-        </div>
-      )}
     </menu>
   )
 }
-
-/**
- * The single button and dropdown button share content, so we extract it here
- * It contains a tooltip with the title, description, and links
- * and a hotkey listener
- */
-const ToolbarItemContents = memo(function ToolbarItemContents({
-  itemConfig,
-  configCallbackProps,
-}: {
-  itemConfig: ToolbarItemResolved
-  configCallbackProps: ToolbarItemCallbackProps
-}) {
-  useHotkeys(
-    itemConfig.hotkey || '',
-    () => {
-      itemConfig.onClick(configCallbackProps)
-    },
-    {
-      enabled:
-        itemConfig.status === 'available' &&
-        !!itemConfig.hotkey &&
-        !itemConfig.disabled &&
-        !itemConfig.disableHotkey,
-    }
-  )
-
-  return (
-    <>
-      <span className={!itemConfig.showTitle ? 'sr-only' : ''}>
-        {itemConfig.title}
-      </span>
-      <Tooltip
-        position="bottom"
-        wrapperClassName="!p-4 !pointer-events-auto"
-        contentClassName="!text-left text-wrap !text-xs !p-0 !pb-2 flex gap-2 !max-w-none !w-72 flex-col items-stretch"
-      >
-        <div className="rounded-top flex items-center gap-2 pt-3 pb-2 px-2 bg-chalkboard-20/50 dark:bg-chalkboard-80/50">
-          <span
-            className={`text-sm flex-1 ${
-              itemConfig.status !== 'available'
-                ? 'text-chalkboard-70 dark:text-chalkboard-40'
-                : ''
-            }`}
-          >
-            {itemConfig.title}
-          </span>
-          {itemConfig.status === 'available' && itemConfig.hotkey ? (
-            <kbd className="flex-none hotkey">{itemConfig.hotkey}</kbd>
-          ) : itemConfig.status === 'kcl-only' ? (
-            <>
-              <span className="text-wrap font-sans flex-0 text-chalkboard-70 dark:text-chalkboard-40">
-                KCL code only
-              </span>
-              <CustomIcon
-                name="code"
-                className="w-5 h-5 text-chalkboard-70 dark:text-chalkboard-40"
-              />
-            </>
-          ) : (
-            itemConfig.status === 'unavailable' && (
-              <>
-                <span className="text-wrap font-sans flex-0 text-chalkboard-70 dark:text-chalkboard-40">
-                  In development
-                </span>
-                <CustomIcon
-                  name="lockClosed"
-                  className="w-5 h-5 text-chalkboard-70 dark:text-chalkboard-40"
-                />
-              </>
-            )
-          )}
-        </div>
-        <p className="px-2 text-ch font-sans">{itemConfig.description}</p>
-        {itemConfig.links.length > 0 && (
-          <>
-            <hr className="border-chalkboard-20 dark:border-chalkboard-80" />
-            <ul className="p-0 px-1 m-0 flex flex-col">
-              {itemConfig.links.map((link) => (
-                <li key={link.label} className="contents">
-                  <a
-                    href={link.url}
-                    target="_blank"
-                    rel="noreferrer"
-                    className="flex items-center rounded-sm p-1 no-underline text-inherit hover:bg-primary/10 hover:text-primary dark:hover:bg-chalkboard-70 dark:hover:text-inherit"
-                  >
-                    <span className="flex-1">Open {link.label}</span>
-                    <CustomIcon name="link" className="w-4 h-4" />
-                  </a>
-                </li>
-              ))}
-            </ul>
-          </>
-        )}
-      </Tooltip>
-    </>
-  )
-})

src/clientSideScene/CameraControls.ts

@@ -17,11 +17,11 @@ import {
   ZOOM_MAGIC_NUMBER,
 } from './sceneInfra'
 import {
+  EngineCommand,
   Subscription,
   EngineCommandManager,
   UnreliableSubscription,
 } from 'lang/std/engineConnection'
-import { EngineCommand } from 'lang/std/artifactMap'
 import { uuidv4 } from 'lib/utils'
 import { deg2Rad } from 'lib/utils2d'
 import { isReducedMotion, roundOff, throttle } from 'lib/utils'
@@ -585,6 +585,10 @@ export class CameraControls {
       .add(direction.multiplyScalar(-distanceAfter))
     this.camera.position.copy(newPosition)
 
+    const { z_near, z_far } = calculateNearFarFromFOV(this.lastPerspectiveFov)
+    this.camera.near = z_near
+    this.camera.far = z_far
+
     if (splitEngineCalls) {
       await this.engineCommandManager.sendSceneCommand({
         type: 'modeling_cmd_req',
@@ -1140,6 +1144,9 @@ function convertThreeCamValuesToEngineCam({
   up: Vector3
   vantage: Vector3
 } {
+  // Something to consider is that the orbit controls have a target,
+  // we're kind of deriving the target/lookAtVector here when it might not be needed
+  // leaving for now since it's working but maybe revisit later
   const euler = new Euler().setFromQuaternion(quaternion, 'XYZ')
 
   const upVector = new Vector3(0, 1, 0).applyEuler(euler).normalize()
@@ -1150,50 +1157,18 @@ function convertThreeCamValuesToEngineCam({
       vantage: position,
     }
   }
-
-  // re-implementing stuff here, though this is a bunch of Mike's code
-  // if we need to pull him in again, at least it will be familiar to him
-  // and it's all simple functions.
-  interface Coord3d {
-    x: number
-    y: number
-    z: number
-  }
-
-  function buildLookAt(distance: number, center: Coord3d, eye: Coord3d) {
-    const eyeVector = normalized(sub(eye, center))
-    return { center: center, eye: add(center, mult(eyeVector, distance)) }
-  }
-
-  function mult(vecA: Coord3d, sc: number): Coord3d {
-    return { x: vecA.x * sc, y: vecA.y * sc, z: vecA.z * sc }
-  }
-
-  function add(vecA: Coord3d, vecB: Coord3d): Coord3d {
-    return { x: vecA.x + vecB.x, y: vecA.y + vecB.y, z: vecA.z + vecB.z }
-  }
-
-  function sub(vecA: Coord3d, vecB: Coord3d): Coord3d {
-    return { x: vecA.x - vecB.x, y: vecA.y - vecB.y, z: vecA.z - vecB.z }
-  }
-
-  function dot(vecA: Coord3d, vecB: Coord3d) {
-    return vecA.x * vecB.x + vecA.y * vecB.y + vecA.z * vecB.z
-  }
-
-  function length(vecA: Coord3d) {
-    return Math.sqrt(dot(vecA, vecA))
-  }
-
-  function normalized(vecA: Coord3d) {
-    return mult(vecA, 1.0 / length(vecA))
-  }
-
-  const lookAt = buildLookAt(64 / zoom, target, position)
+  const lookAtVector = new Vector3(0, 0, -1)
+    .applyEuler(euler)
+    .normalize()
+    .add(position)
+  const fudgeFactor2 = zoom * 0.9979224466814468 - 0.03473692325839295
+  const zoomFactor = (-ZOOM_MAGIC_NUMBER + fudgeFactor2) / zoom
+  const direction = lookAtVector.clone().sub(position).normalize()
+  const newVantage = position.clone().add(direction.multiplyScalar(zoomFactor))
   return {
-    center: new Vector3(lookAt.center.x, lookAt.center.y, lookAt.center.z),
-    up: new Vector3(0, 0, 1),
-    vantage: new Vector3(lookAt.eye.x, lookAt.eye.y, lookAt.eye.z),
+    center: lookAtVector,
+    up: upVector,
+    vantage: newVantage,
   }
 }
 
@@ -1249,7 +1224,7 @@ export async function letEngineAnimateAndSyncCamAfter(
       type: 'enable_sketch_mode',
       adjust_camera: true,
       animated: !isReducedMotion(),
-      ortho: true,
+      ortho: false,
       entity_id: entityId,
     },
   })
@@ -1266,4 +1241,25 @@ export async function letEngineAnimateAndSyncCamAfter(
       type: 'default_camera_get_settings',
     },
   })
+  await engineCommandManager.sendSceneCommand({
+    type: 'modeling_cmd_req',
+    cmd_id: uuidv4(),
+    cmd: {
+      type: 'enable_sketch_mode',
+      adjust_camera: true,
+      animated: false,
+      ortho: true,
+      entity_id: entityId,
+    },
+  })
+  await new Promise((resolve) => setTimeout(resolve, 50))
+  await engineCommandManager.sendSceneCommand({
+    // CameraControls subscribes to default_camera_get_settings response events
+    // firing this at connection ensure the camera's are synced initially
+    type: 'modeling_cmd_req',
+    cmd_id: uuidv4(),
+    cmd: {
+      type: 'default_camera_get_settings',
+    },
+  })
 }

src/clientSideScene/ClientSideSceneComp.tsx

@@ -5,7 +5,7 @@ import { cameraMouseDragGuards } from 'lib/cameraControls'
 import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
 import { ARROWHEAD, DEBUG_SHOW_BOTH_SCENES } from './sceneInfra'
 import { ReactCameraProperties } from './CameraControls'
-import { isArray, throttle } from 'lib/utils'
+import { throttle } from 'lib/utils'
 import {
   sceneInfra,
   kclManager,
@@ -20,17 +20,13 @@ import {
   getParentGroup,
 } from './sceneEntities'
 import { SegmentOverlay, SketchDetails } from 'machines/modelingMachine'
-import {
-  expectNodeOnPath,
-  findUsesOfTagInPipe,
-  getLastNodeFromPath,
-  getNodeFromPath,
-} from 'lang/queryAst'
+import { findUsesOfTagInPipe, getNodeFromPath } from 'lang/queryAst'
 import {
   CallExpression,
   PathToNode,
   Program,
   SourceRange,
+  Value,
   parse,
   recast,
 } from 'lang/wasm'
@@ -190,12 +186,13 @@ const Overlay = ({
   let xAlignment = overlay.angle < 0 ? '0%' : '-100%'
   let yAlignment = overlay.angle < -90 || overlay.angle >= 90 ? '0%' : '-100%'
 
-  const callExpression = expectNodeOnPath<CallExpression>(
+  const _node1 = getNodeFromPath<CallExpression>(
     kclManager.ast,
     overlay.pathToNode,
     'CallExpression'
   )
-  if (err(callExpression)) return
+  if (err(_node1)) return
+  const callExpression = _node1.node
 
   const constraints = getConstraintInfo(
     callExpression,
@@ -552,13 +549,13 @@ const ConstraintSymbol = ({
     varNameMap[_type as LineInputsType]?.implicitConstraintDesc
 
   const _node = useMemo(
-    () => getLastNodeFromPath(kclManager.ast, pathToNode),
+    () => getNodeFromPath<Value>(kclManager.ast, pathToNode),
     [kclManager.ast, pathToNode]
   )
   if (err(_node)) return
   const node = _node.node
 
-  const range: SourceRange = !isArray(node) ? [node.start, node.end] : [0, 0]
+  const range: SourceRange = node ? [node.start, node.end] : [0, 0]
 
   if (_type === 'intersectionTag') return null
 

src/clientSideScene/sceneEntities.ts

@@ -27,7 +27,6 @@ import {
   defaultPlaneColor,
   getSceneScale,
   INTERSECTION_PLANE_LAYER,
-  OnClickCallbackArgs,
   OnMouseEnterLeaveArgs,
   RAYCASTABLE_PLANE,
   SEGMENT_LENGTH_LABEL,
@@ -48,6 +47,7 @@ import {
   PipeExpression,
   Program,
   ProgramMemory,
+  programMemoryInit,
   recast,
   SketchGroup,
   ExtrudeGroup,
@@ -61,12 +61,7 @@ import {
   codeManager,
   editorManager,
 } from 'lib/singletons'
-import {
-  isNodeType,
-  expectNodeOnPath,
-  getNodeFromPath,
-  getNodePathFromSourceRange,
-} from 'lang/queryAst'
+import { getNodeFromPath, getNodePathFromSourceRange } from 'lang/queryAst'
 import { executeAst } from 'lang/langHelpers'
 import {
   createArcGeometry,
@@ -82,15 +77,8 @@ import {
   changeSketchArguments,
   updateStartProfileAtArgs,
 } from 'lang/std/sketch'
+import { isOverlap, normaliseAngle, roundOff, throttle } from 'lib/utils'
 import {
-  isArray,
-  isOverlap,
-  normaliseAngle,
-  roundOff,
-  throttle,
-} from 'lib/utils'
-import {
-  addStartProfileAt,
   createArrayExpression,
   createCallExpressionStdLib,
   createLiteral,
@@ -108,7 +96,10 @@ import { createGridHelper, orthoScale, perspScale } from './helpers'
 import { Models } from '@kittycad/lib'
 import { uuidv4 } from 'lib/utils'
 import { SegmentOverlayPayload, SketchDetails } from 'machines/modelingMachine'
-import { EngineCommandManager } from 'lang/std/engineConnection'
+import {
+  ArtifactMapCommand,
+  EngineCommandManager,
+} from 'lang/std/engineConnection'
 import {
   getRectangleCallExpressions,
   updateRectangleSketch,
@@ -139,7 +130,7 @@ export const HIDE_HOVER_SEGMENT_LENGTH = 60 // in pixels
 export class SceneEntities {
   engineCommandManager: EngineCommandManager
   scene: Scene
-  sceneProgramMemory: ProgramMemory = ProgramMemory.empty()
+  sceneProgramMemory: ProgramMemory = { root: {}, return: null }
   activeSegments: { [key: string]: Group } = {}
   intersectionPlane: Mesh | null = null
   axisGroup: Group | null = null
@@ -309,51 +300,6 @@ export class SceneEntities {
     if (intersectionPlane) this.scene.remove(intersectionPlane)
   }
 
-  setupNoPointsListener({
-    sketchDetails,
-    afterClick,
-  }: {
-    sketchDetails: SketchDetails
-    afterClick: (args: OnClickCallbackArgs) => void
-  }) {
-    // Create a THREEjs plane to raycast clicks onto
-    this.createIntersectionPlane()
-    const quaternion = quaternionFromUpNForward(
-      new Vector3(...sketchDetails.yAxis),
-      new Vector3(...sketchDetails.zAxis)
-    )
-
-    // Position the click raycast plane
-    if (this.intersectionPlane) {
-      this.intersectionPlane.setRotationFromQuaternion(quaternion)
-      this.intersectionPlane.position.copy(
-        new Vector3(...(sketchDetails?.origin || [0, 0, 0]))
-      )
-    }
-    sceneInfra.setCallbacks({
-      onClick: async (args) => {
-        if (!args) return
-        if (args.mouseEvent.which !== 1) return
-        const { intersectionPoint } = args
-        if (!intersectionPoint?.twoD || !sketchDetails?.sketchPathToNode) return
-        const addStartProfileAtRes = addStartProfileAt(
-          kclManager.ast,
-          sketchDetails.sketchPathToNode,
-          [intersectionPoint.twoD.x, intersectionPoint.twoD.y]
-        )
-
-        if (trap(addStartProfileAtRes)) return
-        const { modifiedAst } = addStartProfileAtRes
-
-        await kclManager.updateAst(modifiedAst, false)
-        this.removeIntersectionPlane()
-
-        // Now perform the caller-specified action
-        afterClick(args)
-      },
-    })
-  }
-
   async setupSketch({
     sketchPathToNode,
     forward,
@@ -474,18 +420,13 @@ export class SceneEntities {
       )
 
       let seg: Group
-      const callExp = getNodeFromPath<CallExpression>(
+      const _node1 = getNodeFromPath<CallExpression>(
         maybeModdedAst,
         segPathToNode,
         'CallExpression'
       )
-      if (err(callExp)) return
-      const callExpName = isNodeType<CallExpression>(
-        callExp.node,
-        'CallExpression'
-      )
-        ? callExp.node.callee.name
-        : ''
+      if (err(_node1)) return
+      const callExpName = _node1.node?.callee?.name
 
       if (segment.type === 'TangentialArcTo') {
         seg = tangentialArcToSegment({
@@ -598,7 +539,7 @@ export class SceneEntities {
     segmentName: 'line' | 'tangentialArcTo' = 'line',
     shouldTearDown = true
   ) => {
-    const _ast = structuredClone(kclManager.ast)
+    const _ast = JSON.parse(JSON.stringify(kclManager.ast))
 
     const _node1 = getNodeFromPath<VariableDeclaration>(
       _ast,
@@ -606,16 +547,12 @@ export class SceneEntities {
       'VariableDeclaration'
     )
     if (trap(_node1)) return Promise.reject(_node1)
-    const variableDeclarationName = isNodeType<VariableDeclaration>(
-      _node1.node,
-      'VariableDeclaration'
-    )
-      ? _node1.node.declarations[0]?.id?.name || ''
-      : ''
+    const variableDeclarationName =
+      _node1.node?.declarations?.[0]?.id?.name || ''
 
-    const sg = kclManager.programMemory.get(
+    const sg = kclManager.programMemory.root[
       variableDeclarationName
-    ) as SketchGroup
+    ] as SketchGroup
     const lastSeg = sg.value.slice(-1)[0] || sg.start
 
     const index = sg.value.length // because we've added a new segment that's not in the memory yet, no need for `-1`
@@ -739,6 +676,21 @@ export class SceneEntities {
       ...this.mouseEnterLeaveCallbacks(),
     })
   }
+  setupRectangleOriginListener = () => {
+    sceneInfra.setCallbacks({
+      onClick: (args) => {
+        const twoD = args.intersectionPoint?.twoD
+        if (!twoD) {
+          console.warn(`This click didn't have a 2D intersection`, args)
+          return
+        }
+        sceneInfra.modelingSend({
+          type: 'Add rectangle origin',
+          data: [twoD.x, twoD.y],
+        })
+      },
+    })
+  }
   setupDraftRectangle = async (
     sketchPathToNode: PathToNode,
     forward: [number, number, number],
@@ -746,17 +698,16 @@ export class SceneEntities {
     sketchOrigin: [number, number, number],
     rectangleOrigin: [x: number, y: number]
   ) => {
-    let _ast = structuredClone(kclManager.ast)
+    let _ast = JSON.parse(JSON.stringify(kclManager.ast))
 
-    const varDec = expectNodeOnPath<VariableDeclaration>(
+    const _node1 = getNodeFromPath<VariableDeclaration>(
       _ast,
       sketchPathToNode || [],
       'VariableDeclaration'
     )
-    if (trap(varDec)) return Promise.reject(varDec)
-    const variableDeclarationName = varDec.declarations?.[0]?.id?.name || ''
-    const startSketchOn = varDec.declarations
-    const startSketchOnInit = startSketchOn?.[0]?.init
+    if (trap(_node1)) return Promise.reject(_node1)
+    const variableDeclarationName =
+      _node1.node?.declarations?.[0]?.id?.name || ''
 
     const tags: [string, string, string] = [
       findUniqueName(_ast, 'rectangleSegmentA'),
@@ -764,14 +715,21 @@ export class SceneEntities {
       findUniqueName(_ast, 'rectangleSegmentC'),
     ]
 
+    const _node2 = getNodeFromPath<VariableDeclaration>(
+      _ast,
+      sketchPathToNode || [],
+      'VariableDeclaration'
+    )
+    if (trap(_node2)) return Promise.reject(_node2)
+    const startSketchOn = _node2.node?.declarations
+
+    const startSketchOnInit = startSketchOn?.[0]?.init
     startSketchOn[0].init = createPipeExpression([
       startSketchOnInit,
       ...getRectangleCallExpressions(rectangleOrigin, tags),
     ])
 
-    let _recastAst = parse(recast(_ast))
-    if (trap(_recastAst)) return Promise.reject(_recastAst)
-    _ast = _recastAst
+    _ast = parse(recast(_ast))
 
     const { programMemoryOverride, truncatedAst } = await this.setupSketch({
       sketchPathToNode,
@@ -785,7 +743,7 @@ export class SceneEntities {
     sceneInfra.setCallbacks({
       onMove: async (args) => {
         // Update the width and height of the draft rectangle
-        const pathToNodeTwo = structuredClone(sketchPathToNode)
+        const pathToNodeTwo = JSON.parse(JSON.stringify(sketchPathToNode))
         pathToNodeTwo[1][0] = 0
 
         const _node = getNodeFromPath<VariableDeclaration>(
@@ -794,17 +752,12 @@ export class SceneEntities {
           'VariableDeclaration'
         )
         if (trap(_node)) return Promise.reject(_node)
-        const sketchInit = isNodeType<VariableDeclaration>(
-          _node.node,
-          'VariableDeclaration'
-        )
-          ? _node.node.declarations[0]?.init
-          : null
+        const sketchInit = _node.node?.declarations?.[0]?.init
 
         const x = (args.intersectionPoint.twoD.x || 0) - rectangleOrigin[0]
         const y = (args.intersectionPoint.twoD.y || 0) - rectangleOrigin[1]
 
-        if (sketchInit?.type === 'PipeExpression') {
+        if (sketchInit.type === 'PipeExpression') {
           updateRectangleSketch(sketchInit, x, y, tags[0])
         }
 
@@ -815,9 +768,9 @@ export class SceneEntities {
           programMemoryOverride,
         })
         this.sceneProgramMemory = programMemory
-        const sketchGroup = programMemory.get(
+        const sketchGroup = programMemory.root[
           variableDeclarationName
-        ) as SketchGroup
+        ] as SketchGroup
         const sgPaths = sketchGroup.value
         const orthoFactor = orthoScale(sceneInfra.camControls.camera)
 
@@ -847,19 +800,12 @@ export class SceneEntities {
           'VariableDeclaration'
         )
         if (trap(_node)) return Promise.reject(_node)
-        const sketchInit = isNodeType<VariableDeclaration>(
-          _node.node,
-          'VariableDeclaration'
-        )
-          ? _node.node.declarations[0]?.init
-          : null
+        const sketchInit = _node.node?.declarations?.[0]?.init
 
-        if (sketchInit?.type === 'PipeExpression') {
+        if (sketchInit.type === 'PipeExpression') {
           updateRectangleSketch(sketchInit, x, y, tags[0])
 
-          let _recastAst = parse(recast(_ast))
-          if (trap(_recastAst)) return Promise.reject(_recastAst)
-          _ast = _recastAst
+          _ast = parse(recast(_ast))
 
           // Update the primary AST and unequip the rectangle tool
           await kclManager.executeAstMock(_ast)
@@ -874,9 +820,9 @@ export class SceneEntities {
 
           // Prepare to update the THREEjs scene
           this.sceneProgramMemory = programMemory
-          const sketchGroup = programMemory.get(
+          const sketchGroup = programMemory.root[
             variableDeclarationName
-          ) as SketchGroup
+          ] as SketchGroup
           const sgPaths = sketchGroup.value
           const orthoFactor = orthoScale(sceneInfra.camControls.camera)
 
@@ -1063,14 +1009,10 @@ export class SceneEntities {
       PROFILE_START,
     ])
     if (!group) return
-    const pathToNode: PathToNode = structuredClone(group.userData.pathToNode)
-    const varDecIndex = pathToNode[1][0]
-    if (typeof varDecIndex !== 'number') {
-      console.error(
-        `Expected varDecIndex to be a number, but found: ${typeof varDecIndex} ${varDecIndex}`
-      )
-      return
-    }
+    const pathToNode: PathToNode = JSON.parse(
+      JSON.stringify(group.userData.pathToNode)
+    )
+    const varDecIndex = JSON.parse(JSON.stringify(pathToNode[1][0]))
     if (draftInfo) {
       pathToNode[1][0] = 0
     }
@@ -1090,7 +1032,7 @@ export class SceneEntities {
     if (trap(_node)) return
     const node = _node.node
 
-    if (isArray(node) || node.type !== 'CallExpression') return
+    if (node.type !== 'CallExpression') return
 
     let modded:
       | {
@@ -1139,9 +1081,9 @@ export class SceneEntities {
       })
       this.sceneProgramMemory = programMemory
 
-      const maybeSketchGroup = programMemory.get(variableDeclarationName)
+      const maybeSketchGroup = programMemory.root[variableDeclarationName]
       let sketchGroup = undefined
-      if (maybeSketchGroup?.type === 'SketchGroup') {
+      if (maybeSketchGroup.type === 'SketchGroup') {
         sketchGroup = maybeSketchGroup
       } else if ((maybeSketchGroup as ExtrudeGroup).sketchGroup) {
         sketchGroup = (maybeSketchGroup as ExtrudeGroup).sketchGroup
@@ -1620,25 +1562,26 @@ export class SceneEntities {
         // If we clicked on an extrude wall, we climb up the parent Id
         // to get the sketch profile's face ID. If we clicked on an endcap,
         // we already have it.
-        const pathId =
-          artifact?.type === 'extrudeWall' || artifact?.type === 'extrudeCap'
-            ? artifact.pathId
-            : ''
+        const targetId =
+          'additionalData' in artifact &&
+          artifact.additionalData?.type === 'cap'
+            ? _entity_id
+            : artifact.parentId
 
         // tsc cannot infer that target can have extrusions
         // from the commandType (why?) so we need to cast it
-        const path = this.engineCommandManager.artifactMap?.[pathId || '']
-        const extrusionId =
-          path?.type === 'startPath' ? path.extrusionIds[0] : ''
+        const target = this.engineCommandManager.artifactMap?.[
+          targetId || ''
+        ] as ArtifactMapCommand & { extrusions?: string[] }
 
         // TODO: We get the first extrusion command ID,
         // which is fine while backend systems only support one extrusion.
         // but we need to more robustly handle resolving to the correct extrusion
         // if there are multiple.
-        const extrusions = this.engineCommandManager.artifactMap?.[extrusionId]
+        const extrusions =
+          this.engineCommandManager.artifactMap?.[target?.extrusions?.[0] || '']
 
-        if (artifact?.type !== 'extrudeCap' && artifact?.type !== 'extrudeWall')
-          return
+        if (artifact?.commandType !== 'solid3d_get_extrusion_face_info') return
 
         const faceInfo = await getFaceDetails(_entity_id)
         if (!faceInfo?.origin || !faceInfo?.z_axis || !faceInfo?.y_axis) return
@@ -1663,7 +1606,10 @@ export class SceneEntities {
             ) as [number, number, number],
             sketchPathToNode,
             extrudePathToNode,
-            cap: artifact.type === 'extrudeCap' ? artifact.cap : 'none',
+            cap:
+              artifact?.additionalData?.type === 'cap'
+                ? artifact.additionalData.info
+                : 'none',
             faceId: _entity_id,
           },
         })
@@ -1695,9 +1641,7 @@ export class SceneEntities {
           )
           if (trap(_node, { suppress: true })) return
           const node = _node.node
-          editorManager.setHighlightRange(
-            !isArray(node) ? [node.start, node.end] : [0, 0]
-          )
+          editorManager.setHighlightRange([node.start, node.end])
           const yellow = 0xffff00
           colorSegment(selected, yellow)
           const extraSegmentGroup = parent.getObjectByName(EXTRA_SEGMENT_HANDLE)
@@ -1819,7 +1763,7 @@ function prepareTruncatedMemoryAndAst(
     }
   | Error {
   const bodyIndex = Number(sketchPathToNode?.[1]?.[0]) || 0
-  const _ast = structuredClone(ast)
+  const _ast = JSON.parse(JSON.stringify(ast))
 
   const _node = getNodeFromPath<VariableDeclaration>(
     _ast,
@@ -1827,16 +1771,9 @@ function prepareTruncatedMemoryAndAst(
     'VariableDeclaration'
   )
   if (err(_node)) return _node
-  if (isArray(_node.node))
-    return new Error('Expected node to be an object, but found Array')
-  const variableDeclarationName = isNodeType<VariableDeclaration>(
-    _node.node,
-    'VariableDeclaration'
-  )
-    ? _node.node.declarations[0]?.id?.name || ''
-    : ''
+  const variableDeclarationName = _node.node?.declarations?.[0]?.id?.name || ''
   const lastSeg = (
-    programMemory.get(variableDeclarationName) as SketchGroup
+    programMemory.root[variableDeclarationName] as SketchGroup
   ).value.slice(-1)[0]
   if (draftSegment) {
     // truncatedAst needs to setup with another segment at the end
@@ -1885,29 +1822,35 @@ function prepareTruncatedMemoryAndAst(
   }
   const truncatedAst: Program = {
     ..._ast,
-    body: [structuredClone(_ast.body[bodyIndex])],
+    body: [JSON.parse(JSON.stringify(_ast.body[bodyIndex]))],
   }
+  const programMemoryOverride = programMemoryInit()
+  if (err(programMemoryOverride)) return programMemoryOverride
 
   // Grab all the TagDeclarators and TagIdentifiers from memory.
   let start = _node.node.start
-  const programMemoryOverride = programMemory.filterVariables(true, (value) => {
+  for (const key in programMemory.root) {
+    const value = programMemory.root[key]
+    if (!('__meta' in value)) {
+      continue
+    }
     if (
-      !('__meta' in value) ||
       value.__meta === undefined ||
       value.__meta.length === 0 ||
       value.__meta[0].sourceRange === undefined
     ) {
-      return false
+      continue
     }
 
     if (value.__meta[0].sourceRange[0] >= start) {
       // We only want things before our start point.
-      return false
+      continue
     }
 
-    return value.type === 'TagIdentifier'
-  })
-  if (err(programMemoryOverride)) return programMemoryOverride
+    if (value.type === 'TagIdentifier') {
+      programMemoryOverride.root[key] = JSON.parse(JSON.stringify(value))
+    }
+  }
 
   for (let i = 0; i < bodyIndex; i++) {
     const node = _ast.body[i]
@@ -1915,12 +1858,12 @@ function prepareTruncatedMemoryAndAst(
       continue
     }
     const name = node.declarations[0].id.name
-    const memoryItem = programMemory.get(name)
+    // const memoryItem = kclManager.programMemory.root[name]
+    const memoryItem = programMemory.root[name]
     if (!memoryItem) {
       continue
     }
-    const error = programMemoryOverride.set(name, structuredClone(memoryItem))
-    if (err(error)) return error
+    programMemoryOverride.root[name] = JSON.parse(JSON.stringify(memoryItem))
   }
   return {
     truncatedAst,
@@ -1957,12 +1900,7 @@ export function sketchGroupFromPathToNode({
   )
   if (err(_varDec)) return _varDec
   const varDec = _varDec.node
-  if (isArray(varDec))
-    return new Error('Expected node to be an object, but found Array')
-  const varName = isNodeType<VariableDeclarator>(varDec, 'VariableDeclarator')
-    ? varDec.id.name
-    : ''
-  const result = programMemory.get(varName)
+  const result = programMemory.root[varDec?.id?.name || '']
   if (result?.type === 'ExtrudeGroup') {
     return result.sketchGroup
   }
@@ -2088,17 +2026,13 @@ export async function getFaceDetails(
       entity_id: entityId,
     },
   })
-  const resp = await engineCommandManager.sendSceneCommand({
-    type: 'modeling_cmd_req',
-    cmd_id: uuidv4(),
-    cmd: { type: 'get_sketch_mode_plane' },
-  })
-  const faceInfo =
-    resp?.success &&
-    resp?.resp.type === 'modeling' &&
-    resp?.resp?.data?.modeling_response?.type === 'get_sketch_mode_plane'
-      ? resp?.resp?.data?.modeling_response.data
-      : ({} as Models['GetSketchModePlane_type'])
+  const faceInfo: Models['GetSketchModePlane_type'] = (
+    await engineCommandManager.sendSceneCommand({
+      type: 'modeling_cmd_req',
+      cmd_id: uuidv4(),
+      cmd: { type: 'get_sketch_mode_plane' },
+    })
+  )?.data?.data
   await engineCommandManager.sendSceneCommand({
     type: 'modeling_cmd_req',
     cmd_id: uuidv4(),

src/clientSideScene/sceneInfra.ts

@@ -72,7 +72,7 @@ interface OnDragCallbackArgs extends OnMouseEnterLeaveArgs {
   }
   intersects: Intersection<Object3D<Object3DEventMap>>[]
 }
-export interface OnClickCallbackArgs {
+interface OnClickCallbackArgs {
   mouseEvent: MouseEvent
   intersectionPoint?: {
     twoD: Vector2

src/components/ActionButtonDropdown.tsx

@@ -1,93 +1,56 @@
 import { Popover } from '@headlessui/react'
-import { ActionButtonProps } from './ActionButton'
-import { CustomIcon } from './CustomIcon'
+import { ActionButton, ActionButtonProps } from './ActionButton'
 
-type ActionButtonSplitProps = ActionButtonProps & { Element: 'button' } & {
-  name?: string
+type ActionButtonSplitProps = Omit<ActionButtonProps, 'iconEnd'> & {
   splitMenuItems: {
-    id: string
     label: string
     shortcut?: string
     onClick: () => void
     disabled?: boolean
-    status?: 'available' | 'unavailable' | 'kcl-only'
   }[]
 }
 
 export function ActionButtonDropdown({
   splitMenuItems,
   className,
-  children,
   ...props
 }: ActionButtonSplitProps) {
-  const baseClassNames = `action-button p-0 m-0 group mono text-xs leading-none flex items-center gap-2 rounded-sm border-solid border border-chalkboard-30 hover:border-chalkboard-40 enabled:dark:border-chalkboard-70 dark:hover:border-chalkboard-60 dark:bg-chalkboard-90/50 text-chalkboard-100 dark:text-chalkboard-10`
   return (
-    <Popover className={`${baseClassNames} ${className}`}>
-      {({ close }) => (
-        <>
-          {children}
-          <Popover.Button className="border-transparent dark:border-transparent p-0 m-0 rounded-none !outline-none ui-open:border-primary ui-open:bg-primary">
-            <CustomIcon
-              name="caretDown"
-              className={
-                'w-3.5 h-5 text-chalkboard-70 dark:text-chalkboard-40 rounded-none ' +
-                'ui-open:rotate-180 ui-open:!text-chalkboard-10'
-              }
-            />
-            <span className="sr-only">
-              {props.name ? props.name + ': ' : ''}open menu
-            </span>
-          </Popover.Button>
-          <Popover.Panel
-            as="ul"
-            className="!pointer-events-auto absolute z-20 left-1/2 -translate-x-1/2 top-full mt-4 w-fit max-w-[280px] max-h-[80vh] overflow-y-auto py-2 flex flex-col align-stretch text-inherit dark:text-chalkboard-10 bg-chalkboard-10 dark:bg-chalkboard-100 rounded shadow-lg border border-solid border-chalkboard-30 dark:border-chalkboard-80 text-sm m-0 p-0"
-          >
-            {splitMenuItems.map((item) => (
-              <li className="contents" key={item.label}>
-                <button
-                  onClick={() => {
-                    item.onClick()
-                    // Close the popover
-                    close()
-                  }}
-                  className="group/button flex items-center gap-6 px-3 py-1 font-sans text-xs hover:bg-primary/10 dark:hover:bg-chalkboard-80 border-0 m-0 w-full rounded-none text-left disabled:!bg-transparent dark:disabled:text-chalkboard-60"
-                  disabled={item.disabled}
-                  data-testid={'dropdown-' + item.id}
-                >
-                  <span className="capitalize flex-grow text-left">
-                    {item.label}
-                  </span>
-                  {item.status === 'unavailable' ? (
-                    <div className="flex flex-none items-center gap-1">
-                      <span className="text-chalkboard-70 dark:text-chalkboard-40">
-                        In development
-                      </span>
-                      <CustomIcon
-                        name="lockClosed"
-                        className="w-4 h-4 text-chalkboard-70 dark:text-chalkboard-40"
-                      />
-                    </div>
-                  ) : item.status === 'kcl-only' ? (
-                    <div className="flex flex-none items-center gap-1">
-                      <span className="text-chalkboard-70 dark:text-chalkboard-40">
-                        KCL code only
-                      </span>
-                      <CustomIcon
-                        name="code"
-                        className="w-4 h-4 text-chalkboard-70 dark:text-chalkboard-40"
-                      />
-                    </div>
-                  ) : item.shortcut ? (
-                    <kbd className="hotkey flex-none group-disabled/button:text-chalkboard-50 dark:group-disabled/button:text-chalkboard-70 group-disabled/button:border-chalkboard-20 dark:group-disabled/button:border-chalkboard-80">
-                      {item.shortcut}
-                    </kbd>
-                  ) : null}
-                </button>
-              </li>
-            ))}
-          </Popover.Panel>
-        </>
-      )}
+    <Popover className="relative">
+      <Popover.Button
+        as={ActionButton}
+        className={className}
+        {...props}
+        Element="button"
+        iconEnd={{
+          icon: 'caretDown',
+          className: 'ui-open:rotate-180',
+          bgClassName:
+            'bg-chalkboard-20 dark:bg-chalkboard-80 ui-open:bg-primary ui-open:text-chalkboard-10',
+        }}
+      />
+      <Popover.Panel
+        as="ul"
+        className="absolute z-20 left-1/2 -translate-x-1/2 top-full mt-1 w-fit max-h-[80vh] overflow-y-auto py-2 flex flex-col gap-1 align-stretch text-inherit dark:text-chalkboard-10 bg-chalkboard-10 dark:bg-chalkboard-100 rounded shadow-lg border border-solid border-chalkboard-30 dark:border-chalkboard-80 text-sm m-0 p-0"
+      >
+        {splitMenuItems.map((item) => (
+          <li className="contents" key={item.label}>
+            <button
+              onClick={item.onClick}
+              className="block px-3 py-1 hover:bg-primary/10 dark:hover:bg-chalkboard-80 border-0 m-0 text-sm w-full rounded-none text-left disabled:!bg-transparent dark:disabled:text-chalkboard-60"
+              disabled={item.disabled}
+              data-testid={item.label}
+            >
+              <span className="capitalize">{item.label}</span>
+              {item.shortcut && (
+                <kbd className="bg-primary/10 dark:bg-chalkboard-80 dark:group-hover:bg-primary font-mono rounded-sm dark:text-inherit inline-block px-1 border-primary dark:border-chalkboard-90">
+                  {item.shortcut}
+                </kbd>
+              )}
+            </button>
+          </li>
+        ))}
+      </Popover.Panel>
     </Popover>
   )
 }

src/components/AppHeader.tsx

@@ -30,7 +30,7 @@ export const AppHeader = ({
       className={
         'w-full grid ' +
         styles.header +
-        ' overlaid-panes sticky top-0 z-20 px-2 items-start ' +
+        ' overlaid-panes sticky top-0 z-20 px-2 items-center ' +
         className
       }
     >