Trigger shutdown operations after each test

docs/kcl/angleToMatchLengthX.md

@@ -121,9 +121,6 @@ const extrusion = extrude(5, sketch001)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -285,9 +282,6 @@ const extrusion = extrude(5, sketch001)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/angleToMatchLengthY.md

@@ -125,9 +125,6 @@ const extrusion = extrude(5, sketch001)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -289,9 +286,6 @@ const extrusion = extrude(5, sketch001)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/angledLine.md

@@ -126,9 +126,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -290,9 +287,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -482,9 +476,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -646,9 +637,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/angledLineOfXLength.md

@@ -125,9 +125,6 @@ const extrusion = extrude(10, sketch001)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -289,9 +286,6 @@ const extrusion = extrude(10, sketch001)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -481,9 +475,6 @@ const extrusion = extrude(10, sketch001)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -645,9 +636,6 @@ const extrusion = extrude(10, sketch001)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/angledLineThatIntersects.md

@@ -133,9 +133,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -297,9 +294,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -489,9 +483,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -653,9 +644,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/angledLineToX.md

@@ -124,9 +124,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -288,9 +285,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -480,9 +474,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -644,9 +635,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/angledLineToY.md

@@ -124,9 +124,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -288,9 +285,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -480,9 +474,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -644,9 +635,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/arc.md

@@ -135,9 +135,6 @@ const exampleSketch = startSketchOn('XZ')
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -299,9 +296,6 @@ const exampleSketch = startSketchOn('XZ')
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -491,9 +485,6 @@ const exampleSketch = startSketchOn('XZ')
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -655,9 +646,6 @@ const exampleSketch = startSketchOn('XZ')
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/bezierCurve.md

@@ -130,9 +130,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -294,9 +291,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -486,9 +480,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -650,9 +641,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/chamfer.md

@@ -225,9 +225,6 @@ const mountingPlate = extrude(thickness, mountingPlateSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -535,9 +532,6 @@ const mountingPlate = extrude(thickness, mountingPlateSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/circle.md

@@ -123,9 +123,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -413,9 +410,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -605,9 +599,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -769,9 +760,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/close.md

@@ -125,9 +125,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -289,9 +286,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -481,9 +475,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -645,9 +636,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/extrude.md

@@ -150,9 +150,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -314,9 +311,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	type: "sketchGroup",
 	// The paths in the sketch group.
@@ -586,9 +580,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/fillet.md

@@ -225,9 +225,6 @@ const mountingPlate = extrude(thickness, mountingPlateSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -527,9 +524,6 @@ const mountingPlate = extrude(thickness, mountingPlateSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/getEdge.md

@@ -215,9 +215,6 @@ const revolution = startSketchOn(box, "revolveAxis")
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/getNextAdjacentEdge.md

@@ -211,9 +211,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/getOppositeEdge.md

@@ -211,9 +211,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/getPreviousAdjacentEdge.md

@@ -213,9 +213,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/helix.md

@@ -213,9 +213,6 @@ const part001 = startSketchOn('XY')
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -515,9 +512,6 @@ const part001 = startSketchOn('XY')
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/hole.md

@@ -136,9 +136,6 @@ const example = extrude(1, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -300,9 +297,6 @@ const example = extrude(1, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	type: "sketchGroup",
 	// The paths in the sketch group.
@@ -485,9 +479,6 @@ const example = extrude(1, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -649,9 +640,6 @@ const example = extrude(1, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -833,9 +821,6 @@ const example = extrude(1, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -997,9 +982,6 @@ const example = extrude(1, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/lastSegX.md

@@ -116,9 +116,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -280,9 +277,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/lastSegY.md

@@ -116,9 +116,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -280,9 +277,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/line.md

@@ -129,9 +129,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -293,9 +290,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -485,9 +479,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -649,9 +640,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/lineTo.md

@@ -116,9 +116,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -280,9 +277,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -472,9 +466,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -636,9 +627,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/patternCircular2d.md

@@ -134,9 +134,6 @@ const example = extrude(1, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -298,9 +295,6 @@ const example = extrude(1, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	type: "sketchGroup",
 	// The paths in the sketch group.

docs/kcl/patternCircular3d.md

@@ -217,9 +217,6 @@ const example = extrude(-5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/patternLinear2d.md

@@ -127,9 +127,6 @@ const example = extrude(1, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -291,9 +288,6 @@ const example = extrude(1, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	type: "sketchGroup",
 	// The paths in the sketch group.

docs/kcl/patternLinear3d.md

@@ -215,9 +215,6 @@ const example = extrude(1, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/patternTransform.md

@@ -217,9 +217,6 @@ let vase = layer()
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/profileStart.md

@@ -117,9 +117,6 @@ const sketch001 = startSketchOn('XY')
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -281,9 +278,6 @@ const sketch001 = startSketchOn('XY')
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/profileStartX.md

@@ -112,9 +112,6 @@ const sketch001 = startSketchOn('XY')
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -276,9 +273,6 @@ const sketch001 = startSketchOn('XY')
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/profileStartY.md

@@ -111,9 +111,6 @@ const sketch001 = startSketchOn('XY')
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -275,9 +272,6 @@ const sketch001 = startSketchOn('XY')
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/revolve.md

@@ -247,9 +247,6 @@ uuid |
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -411,9 +408,6 @@ uuid |
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -679,9 +673,6 @@ uuid |
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/segAng.md

@@ -124,9 +124,6 @@ const example = extrude(4, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -288,9 +285,6 @@ const example = extrude(4, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/segEndX.md

@@ -122,9 +122,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -286,9 +283,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/segEndY.md

@@ -123,9 +123,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -287,9 +284,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/segLen.md

@@ -121,9 +121,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -285,9 +282,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/shell.md

@@ -213,9 +213,6 @@ shell({ faces: ['end'], thickness: 0.25 }, firstSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -515,9 +512,6 @@ shell({ faces: ['end'], thickness: 0.25 }, firstSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/startProfileAt.md

@@ -195,9 +195,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -445,9 +442,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -609,9 +603,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/startSketchAt.md

@@ -142,9 +142,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -306,9 +303,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/startSketchOn.md

@@ -264,9 +264,6 @@ const a1 = startSketchOn({
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -542,9 +539,6 @@ const a1 = startSketchOn({
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/tangentialArc.md

@@ -125,9 +125,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -289,9 +286,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -481,9 +475,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -645,9 +636,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/tangentialArcTo.md

@@ -116,9 +116,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -280,9 +277,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -472,9 +466,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -636,9 +627,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/types.md

@@ -74,107 +74,10 @@ You can nest expressions in parenthesis as well:
 let myMathExpression = 3 + (1 * 2 / (3 - 7))
 ```
 
-## Tags
+## Tag Declaration and Tag Identifiers
 
-Tags are used to give a name (tag) to a specific path.
+The syntax for tags is now `$myTag` to declare a tag and `myTag` to then use it later. 
 
-### Tag Declaration
-
-The syntax for declaring a tag is `$myTag` you would use it in the following
-way:
-
-```
-startSketchOn('XZ')
-  |> startProfileAt(origin, %)
-  |> angledLine([0, 191.26], %, $rectangleSegmentA001)
-  |> angledLine([
-       segAng(rectangleSegmentA001, %) - 90,
-       196.99
-     ], %, $rectangleSegmentB001)
-  |> angledLine([
-       segAng(rectangleSegmentA001, %),
-       -segLen(rectangleSegmentA001, %)
-     ], %, $rectangleSegmentC001)
-  |> lineTo([profileStartX(%), profileStartY(%)], %)
-  |> close(%)
-```
-
-### Tag Identifier
-
-As per the example above you can use the tag identifier to get a reference to the 
-tagged object. The syntax for this is `myTag`.
-
-In the example above we use the tag identifier to get the angle of the segment
-`segAng(rectangleSegmentA001, %)`.
-
-
-### Tag Scope
-
-Tags are scoped globally if in the root context meaning in this example you can 
-use the tag `rectangleSegmentA001` in any function or expression in the file.
-
-However if the code was written like this:
-
-```
-fn rect = (origin) => {
-  return startSketchOn('XZ')
-  |> startProfileAt(origin, %)
-  |> angledLine([0, 191.26], %, $rectangleSegmentA001)
-  |> angledLine([
-       segAng(rectangleSegmentA001, %) - 90,
-       196.99
-     ], %, $rectangleSegmentB001)
-  |> angledLine([
-       segAng(rectangleSegmentA001, %),
-       -segLen(rectangleSegmentA001, %)
-     ], %, $rectangleSegmentC001)
-  |> lineTo([profileStartX(%), profileStartY(%)], %)
-  |> close(%)
-}
-
-rect([0, 0])
-rect([20, 0])
-``` 
-
-Those tags would only be available in the `rect` function and not globally.
-
-However you likely want to use those tags somewhere outside the `rect` function.
-
-Tags are accessible through the sketch group they are declared in.
-For example the following code works.
-
-```
-fn rect = (origin) => {
-  return startSketchOn('XZ')
-  |> startProfileAt(origin, %)
-  |> angledLine([0, 191.26], %, $rectangleSegmentA001)
-  |> angledLine([
-       segAng(rectangleSegmentA001, %) - 90,
-       196.99
-     ], %, $rectangleSegmentB001)
-  |> angledLine([
-       segAng(rectangleSegmentA001, %),
-       -segLen(rectangleSegmentA001, %)
-     ], %, $rectangleSegmentC001)
-  |> lineTo([profileStartX(%), profileStartY(%)], %)
-  |> close(%)
-}
-
-rect([0, 0])
-const myRect = rect([20, 0])
-
-myRect 
-  |> extrude(10, %)
-  |> fillet({radius: 0.5, tags: [myRect.tags.rectangleSegmentA001]}, %)
-```
-
-See how we use the tag `rectangleSegmentA001` in the `fillet` function outside
-the `rect` function. This is because the `rect` function is returning the
-sketch group that contains the tags.
-
-
----
-
-If you find any issues using any of the above expressions or syntax,
+Please if you find any issues using any of the above expressions or syntax
 please file an issue with the `ast` label on the [modeling-app
 repo](https://github.com/KittyCAD/modeling-app/issues/new).

docs/kcl/xLine.md

@@ -119,9 +119,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -283,9 +280,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -475,9 +469,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -639,9 +630,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/xLineTo.md

@@ -119,9 +119,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -283,9 +280,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -475,9 +469,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -639,9 +630,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/yLine.md

@@ -117,9 +117,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -281,9 +278,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -473,9 +467,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -637,9 +628,6 @@ const example = extrude(10, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

docs/kcl/yLineTo.md

@@ -115,9 +115,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -279,9 +276,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -471,9 +465,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{
@@ -635,9 +626,6 @@ const example = extrude(5, exampleSketch)
 },
 	// The to point.
 	to: [number, number],
-},
-	// Tag identifiers that have been declared in this sketch group.
-	tags: {
 },
 	// The paths in the sketch group.
 	value: [{

e2e/playwright/flow-tests.spec.ts

@@ -52,7 +52,24 @@ const commonPoints = {
   // num2: 19.19,
 }
 
-// Utilities for writing tests that depend on test values
+test.afterEach(async ({ context, page }, testInfo) => {
+  if (testInfo.status === 'skipped') return
+  if (testInfo.status === 'failed') return
+
+  const u = await getUtils(page)
+  // Kill the network so shutdown happens properly
+  await u.emulateNetworkConditions({
+    offline: true,
+    // values of 0 remove any active throttling. crbug.com/456324#c9
+    latency: 0,
+    downloadThroughput: -1,
+    uploadThroughput: -1,
+  })
+
+  // It seems it's best to give the browser about 3s to close things
+  // It's not super reliable but we have no real other choice for now
+  await page.waitForTimeout(3000)
+})
 
 test.beforeEach(async ({ context, page }) => {
   // wait for Vite preview server to be up
@@ -78,7 +95,7 @@ test.beforeEach(async ({ context, page }) => {
   await page.emulateMedia({ reducedMotion: 'reduce' })
 })
 
-test.setTimeout(60000)
+test.setTimeout(120000)
 
 async function doBasicSketch(page: Page, openPanes: string[]) {
   const u = await getUtils(page)
@@ -7134,40 +7151,6 @@ test.describe('Testing Gizmo', () => {
   })
 })
 
-test('Units menu', async ({ page }) => {
-  const u = await getUtils(page)
-  await page.setViewportSize({ width: 1200, height: 500 })
-  await page.goto('/')
-  await page.waitForURL('**/file/**', { waitUntil: 'domcontentloaded' })
-
-  await u.waitForAuthSkipAppStart()
-
-  const unitsMenuButton = page.getByRole('button', {
-    name: 'Current Units',
-    exact: false,
-  })
-  await expect(unitsMenuButton).toBeVisible()
-  await expect(unitsMenuButton).toContainText('in')
-
-  await unitsMenuButton.click()
-  const millimetersButton = page.getByRole('button', { name: 'Millimeters' })
-
-  await expect(millimetersButton).toBeVisible()
-  await millimetersButton.click()
-
-  // Look out for the toast message
-  const toastMessage = page.getByText(
-    `Set default unit to "mm" for this project`
-  )
-  await expect(toastMessage).toBeVisible()
-
-  // Verify that the popover has closed
-  await expect(millimetersButton).not.toBeAttached()
-
-  // Verify that the button label has updated
-  await expect(unitsMenuButton).toContainText('mm')
-})
-
 test('Successful export shows a success toast', async ({ page }) => {
   // FYI this test doesn't work with only engine running locally
   // And you will need to have the KittyCAD CLI installed

e2e/playwright/test-utils.ts

@@ -312,9 +312,9 @@ export async function getUtils(page: Page) {
         fullPage: true,
       })
       const screenshot = await PNG.sync.read(buffer)
-      // most likely related to pixel density but the screenshots for webkit are 2x the size
-      // there might be a more robust way of doing this.
-      const pixMultiplier = browserType === 'webkit' ? 2 : 1
+      const pixMultiplier: number = await page.evaluate(
+        'window.devicePixelRatio'
+      )
       const index =
         (screenshot.width * coords.y * pixMultiplier +
           coords.x * pixMultiplier) *
@@ -377,11 +377,10 @@ export async function getUtils(page: Page) {
     emulateNetworkConditions: async (
       networkOptions: Protocol.Network.emulateNetworkConditionsParameters
     ) => {
-      // Skip on non-Chromium browsers, since we need to use the CDP.
-      test.skip(
-        cdpSession === null,
-        'Network emulation is only supported in Chromium'
-      )
+      if (cdpSession === null) {
+        // Use a fail safe if we can't simulate disconnect (on Safari)
+        return page.evaluate('window.tearDown()')
+      }
 
       cdpSession?.send('Network.emulateNetworkConditions', networkOptions)
     },

src-tauri/Cargo.lock

@@ -2571,7 +2571,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-lib"
-version = "0.1.70"
+version = "0.1.69"
 dependencies = [
  "anyhow",
  "approx",
@@ -2628,9 +2628,9 @@ dependencies = [
 
 [[package]]
 name = "kittycad"
-version = "0.3.7"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1777b503442fa4666564cc3ab237d456df853a09648a4b2bb09622d25d021a5"
+checksum = "af3de9bb4b1441f198689a9f64a8163a518377e30b348a784680e738985b95eb"
 dependencies = [
  "anyhow",
  "async-trait",

src-tauri/Cargo.toml

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

src/App.tsx

@@ -25,7 +25,6 @@ import ModalContainer from 'react-modal-promise'
 import useHotkeyWrapper from 'lib/hotkeyWrapper'
 import Gizmo from 'components/Gizmo'
 import { CoreDumpManager } from 'lib/coredump'
-import { UnitsMenu } from 'components/UnitsMenu'
 
 export function App() {
   useRefreshSettings(paths.FILE + 'SETTINGS')
@@ -128,7 +127,6 @@ export function App() {
       <Stream />
       {/* <CamToggle /> */}
       <LowerRightControls coreDumpManager={coreDumpManager}>
-        <UnitsMenu />
         <Gizmo />
       </LowerRightControls>
     </div>

src/clientSideScene/ClientSideSceneComp.tsx

@@ -19,10 +19,7 @@ import {
   PROFILE_START,
   getParentGroup,
 } from './sceneEntities'
-import {
-  SegmentOverlay,
-  ModelingMachineContext as ModelingContextType,
-} from 'machines/modelingMachine'
+import { SegmentOverlay, SketchDetails } from 'machines/modelingMachine'
 import { findUsesOfTagInPipe, getNodeFromPath } from 'lang/queryAst'
 import {
   CallExpression,
@@ -356,12 +353,11 @@ export const confirmModal = create<ConfirmModalProps, boolean, boolean>(
 
 export async function deleteSegment({
   pathToNode,
-  context,
+  sketchDetails,
 }: {
   pathToNode: PathToNode
-  context: ModelingContextType
+  sketchDetails: SketchDetails | null
 }) {
-  const { sketchDetails } = context
   let modifiedAst: Program | Error = kclManager.ast
   const dependentRanges = findUsesOfTagInPipe(modifiedAst, pathToNode)
 
@@ -398,7 +394,13 @@ export async function deleteSegment({
   }
 
   if (!sketchDetails) return
-  await sceneEntitiesManager.updateAstAndRejigSketch(modifiedAst, context)
+  await sceneEntitiesManager.updateAstAndRejigSketch(
+    pathToNode,
+    modifiedAst,
+    sketchDetails.zAxis,
+    sketchDetails.yAxis,
+    sketchDetails.origin
+  )
 
   // Now 'Set sketchDetails' is called with the modified pathToNode
 }

src/clientSideScene/sceneCallbacks.ts

@@ -1,362 +0,0 @@
-import { getEventForSegmentSelection } from 'lib/selections'
-import {
-  editorManager,
-  kclManager,
-  sceneEntitiesManager,
-  sceneInfra,
-} from 'lib/singletons'
-import {
-  Intersection,
-  Mesh,
-  MeshBasicMaterial,
-  Object3D,
-  Object3DEventMap,
-  OrthographicCamera,
-  Points,
-  Vector2,
-  Vector3,
-} from 'three'
-import {
-  EXTRA_SEGMENT_HANDLE,
-  PROFILE_START,
-  STRAIGHT_SEGMENT,
-  TANGENTIAL_ARC_TO_SEGMENT,
-  getParentGroup,
-  sketchGroupFromPathToNode,
-} from './sceneEntities'
-import { trap } from 'lib/trap'
-import { addNewSketchLn } from 'lang/std/sketch'
-import { CallExpression, PathToNode, parse, recast } from 'lang/wasm'
-import { ARROWHEAD, X_AXIS, Y_AXIS } from './sceneInfra'
-import { getNodeFromPath } from 'lang/queryAst'
-import { getThemeColorForThreeJs } from 'lib/theme'
-import { orthoScale, perspScale, quaternionFromUpNForward } from './helpers'
-import { ModelingMachineContext } from 'machines/modelingMachine'
-import { addStartProfileAt } from 'lang/modifyAst'
-
-export interface OnMouseEnterLeaveArgs {
-  selected: Object3D<Object3DEventMap>
-  dragSelected?: Object3D<Object3DEventMap>
-  mouseEvent: MouseEvent
-}
-
-export interface OnDragCallbackArgs extends OnMouseEnterLeaveArgs {
-  intersectionPoint: {
-    twoD: Vector2
-    threeD: Vector3
-  }
-  intersects: Intersection<Object3D<Object3DEventMap>>[]
-}
-export interface OnClickCallbackArgs {
-  mouseEvent: MouseEvent
-  intersectionPoint?: {
-    twoD: Vector2
-    threeD: Vector3
-  }
-  intersects: Intersection<Object3D<Object3DEventMap>>[]
-  selected?: Object3D<Object3DEventMap>
-}
-
-export interface OnMoveCallbackArgs {
-  mouseEvent: MouseEvent
-  intersectionPoint: {
-    twoD: Vector2
-    threeD: Vector3
-  }
-  intersects: Intersection<Object3D<Object3DEventMap>>[]
-  selected?: Object3D<Object3DEventMap>
-}
-
-interface Callbacks {
-  onDragStart: (arg: OnDragCallbackArgs) => void
-  onDragEnd: (arg: OnDragCallbackArgs) => void
-  onDrag: (arg: OnDragCallbackArgs) => void
-  onMove: (arg: OnMoveCallbackArgs) => void
-  onClick: (arg: OnClickCallbackArgs) => void
-  onMouseEnter: (arg: OnMouseEnterLeaveArgs) => void
-  onMouseLeave: (arg: OnMouseEnterLeaveArgs) => void
-}
-
-type SetCallbacksWithCtx = (context: ModelingMachineContext) => Callbacks
-
-const dummyListenersAll: Callbacks = {
-  onDragStart: () => {},
-  onDragEnd: () => {},
-  onDrag: () => {},
-  onMove: () => {},
-  onClick: () => {},
-  onMouseEnter: () => {},
-  onMouseLeave: () => {},
-}
-
-const onMousEnterLeaveCallbacks = {
-  onMouseEnter: ({ selected, dragSelected }: OnMouseEnterLeaveArgs) => {
-    if ([X_AXIS, Y_AXIS].includes(selected?.userData?.type)) {
-      const obj = selected as Mesh
-      const mat = obj.material as MeshBasicMaterial
-      mat.color.set(obj.userData.baseColor)
-      mat.color.offsetHSL(0, 0, 0.5)
-    }
-    const parent = getParentGroup(selected, [
-      STRAIGHT_SEGMENT,
-      TANGENTIAL_ARC_TO_SEGMENT,
-      PROFILE_START,
-    ])
-    if (parent?.userData?.pathToNode) {
-      const updatedAst = parse(recast(kclManager.ast))
-      if (trap(updatedAst)) return
-      const _node = getNodeFromPath<CallExpression>(
-        updatedAst,
-        parent.userData.pathToNode,
-        'CallExpression'
-      )
-      if (trap(_node, { suppress: true })) return
-      const node = _node.node
-      editorManager.setHighlightRange([node.start, node.end])
-      const yellow = 0xffff00
-      colorSegment(selected, yellow)
-      const extraSegmentGroup = parent.getObjectByName(EXTRA_SEGMENT_HANDLE)
-      if (extraSegmentGroup) {
-        extraSegmentGroup.traverse((child) => {
-          if (child instanceof Points || child instanceof Mesh) {
-            child.material.opacity = dragSelected ? 0 : 1
-          }
-        })
-      }
-      const orthoFactor = orthoScale(sceneInfra.camControls.camera)
-
-      const factor =
-        (sceneInfra.camControls.camera instanceof OrthographicCamera
-          ? orthoFactor
-          : perspScale(sceneInfra.camControls.camera, parent)) /
-        sceneInfra._baseUnitMultiplier
-      if (parent.name === STRAIGHT_SEGMENT) {
-        sceneEntitiesManager.updateStraightSegment({
-          from: parent.userData.from,
-          to: parent.userData.to,
-          group: parent,
-          scale: factor,
-        })
-      } else if (parent.name === TANGENTIAL_ARC_TO_SEGMENT) {
-        sceneEntitiesManager.updateTangentialArcToSegment({
-          prevSegment: parent.userData.prevSegment,
-          from: parent.userData.from,
-          to: parent.userData.to,
-          group: parent,
-          scale: factor,
-        })
-      }
-      return
-    }
-    editorManager.setHighlightRange([0, 0])
-  },
-  onMouseLeave: ({ selected, ...rest }: OnMouseEnterLeaveArgs) => {
-    editorManager.setHighlightRange([0, 0])
-    const parent = getParentGroup(selected, [
-      STRAIGHT_SEGMENT,
-      TANGENTIAL_ARC_TO_SEGMENT,
-      PROFILE_START,
-    ])
-    if (parent) {
-      const orthoFactor = orthoScale(sceneInfra.camControls.camera)
-
-      const factor =
-        (sceneInfra.camControls.camera instanceof OrthographicCamera
-          ? orthoFactor
-          : perspScale(sceneInfra.camControls.camera, parent)) /
-        sceneInfra._baseUnitMultiplier
-      if (parent.name === STRAIGHT_SEGMENT) {
-        sceneEntitiesManager.updateStraightSegment({
-          from: parent.userData.from,
-          to: parent.userData.to,
-          group: parent,
-          scale: factor,
-        })
-      } else if (parent.name === TANGENTIAL_ARC_TO_SEGMENT) {
-        sceneEntitiesManager.updateTangentialArcToSegment({
-          prevSegment: parent.userData.prevSegment,
-          from: parent.userData.from,
-          to: parent.userData.to,
-          group: parent,
-          scale: factor,
-        })
-      }
-    }
-    const isSelected = parent?.userData?.isSelected
-    colorSegment(
-      selected,
-      isSelected
-        ? 0x0000ff
-        : parent?.userData?.baseColor ||
-            getThemeColorForThreeJs(sceneInfra._theme)
-    )
-    const extraSegmentGroup = parent?.getObjectByName(EXTRA_SEGMENT_HANDLE)
-    if (extraSegmentGroup) {
-      extraSegmentGroup.traverse((child) => {
-        if (child instanceof Points || child instanceof Mesh) {
-          child.material.opacity = 0
-        }
-      })
-    }
-    if ([X_AXIS, Y_AXIS].includes(selected?.userData?.type)) {
-      const obj = selected as Mesh
-      const mat = obj.material as MeshBasicMaterial
-      mat.color.set(obj.userData.baseColor)
-      if (obj.userData.isSelected) mat.color.offsetHSL(0, 0, 0.2)
-    }
-  },
-} as const
-
-export const idleCallbacks: SetCallbacksWithCtx = (context) => {
-  let addingNewSegmentStatus: 'nothing' | 'pending' | 'added' = 'nothing'
-  return {
-    onDragStart: () => {},
-    onDragEnd: () => {},
-    onMove: () => {},
-    ...onMousEnterLeaveCallbacks,
-    onClick: (args) => {
-      if (args?.mouseEvent.which !== 1) return
-      if (!args || !args.selected) {
-        sceneInfra.modelingSend({
-          type: 'Set selection',
-          data: {
-            selectionType: 'singleCodeCursor',
-          },
-        })
-        return
-      }
-      const { selected } = args
-      const event = getEventForSegmentSelection(selected)
-      if (!event) return
-      sceneInfra.modelingSend(event)
-    },
-    onDrag: async ({ selected, intersectionPoint, mouseEvent, intersects }) => {
-      if (mouseEvent.which !== 1) return
-
-      const group = getParentGroup(selected, [EXTRA_SEGMENT_HANDLE])
-      if (group?.name === EXTRA_SEGMENT_HANDLE) {
-        const segGroup = getParentGroup(selected)
-        const pathToNode: PathToNode = segGroup?.userData?.pathToNode
-        const pathToNodeIndex = pathToNode.findIndex(
-          (x) => x[1] === 'PipeExpression'
-        )
-
-        const sketchGroup = sketchGroupFromPathToNode({
-          pathToNode,
-          ast: kclManager.ast,
-          programMemory: kclManager.programMemory,
-        })
-        if (trap(sketchGroup)) return
-
-        const pipeIndex = pathToNode[pathToNodeIndex + 1][0] as number
-        if (addingNewSegmentStatus === 'nothing') {
-          const prevSegment = sketchGroup.value[pipeIndex - 2]
-          const mod = addNewSketchLn({
-            node: kclManager.ast,
-            programMemory: kclManager.programMemory,
-            to: [intersectionPoint.twoD.x, intersectionPoint.twoD.y],
-            from: [prevSegment.from[0], prevSegment.from[1]],
-            // TODO assuming it's always a straight segments being added
-            // as this is easiest, and we'll need to add "tabbing" behavior
-            // to support other segment types
-            fnName: 'line',
-            pathToNode: pathToNode,
-            spliceBetween: true,
-          })
-          addingNewSegmentStatus = 'pending'
-          if (trap(mod)) return
-
-          await kclManager.executeAstMock(mod.modifiedAst)
-          await sceneEntitiesManager.tearDownSketch({ removeAxis: false })
-          sceneEntitiesManager.setupSketch({
-            sketchPathToNode: pathToNode,
-            maybeModdedAst: kclManager.ast,
-            up: context.sketchDetails?.yAxis || [0, 1, 0],
-            forward: context.sketchDetails?.zAxis || [0, 0, 1],
-            position: context.sketchDetails?.origin || [0, 0, 0],
-          })
-          addingNewSegmentStatus = 'added'
-        } else if (addingNewSegmentStatus === 'added') {
-          const pathToNodeForNewSegment = pathToNode.slice(0, pathToNodeIndex)
-          pathToNodeForNewSegment.push([pipeIndex - 2, 'index'])
-          sceneEntitiesManager.onDragSegment({
-            sketchPathToNode: pathToNodeForNewSegment,
-            object: selected,
-            intersection2d: intersectionPoint.twoD,
-            intersects,
-          })
-        }
-        return
-      }
-
-      sceneEntitiesManager.onDragSegment({
-        object: selected,
-        intersection2d: intersectionPoint.twoD,
-        intersects,
-        sketchPathToNode: context.sketchDetails?.sketchPathToNode || [],
-      })
-    },
-  }
-}
-
-export const Sketch_LineTool_NoPoints: SetCallbacksWithCtx = ({
-  sketchDetails,
-}) => {
-  if (!sketchDetails) return dummyListenersAll
-  sceneEntitiesManager.createIntersectionPlane()
-  const quaternion = quaternionFromUpNForward(
-    new Vector3(...sketchDetails.yAxis),
-    new Vector3(...sketchDetails.zAxis)
-  )
-  sceneEntitiesManager.intersectionPlane &&
-    sceneEntitiesManager.intersectionPlane.setRotationFromQuaternion(quaternion)
-  sceneEntitiesManager.intersectionPlane &&
-    sceneEntitiesManager.intersectionPlane.position.copy(
-      new Vector3(...(sketchDetails?.origin || [0, 0, 0]))
-    )
-  return {
-    ...dummyListenersAll,
-    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)
-      sceneEntitiesManager.removeIntersectionPlane()
-      sceneInfra.modelingSend('Add start point')
-    },
-  }
-}
-
-function colorSegment(object: any, color: number) {
-  const segmentHead = getParentGroup(object, [ARROWHEAD, PROFILE_START])
-  if (segmentHead) {
-    segmentHead.traverse((child) => {
-      if (child instanceof Mesh) {
-        child.material.color.set(color)
-      }
-    })
-    return
-  }
-  const straightSegmentBody = getParentGroup(object, [
-    STRAIGHT_SEGMENT,
-    TANGENTIAL_ARC_TO_SEGMENT,
-  ])
-  if (straightSegmentBody) {
-    straightSegmentBody.traverse((child) => {
-      if (child instanceof Mesh && !child.userData.ignoreColorChange) {
-        child.material.color.set(color)
-      }
-    })
-    return
-  }
-}

src/clientSideScene/sceneEntities.ts

@@ -22,8 +22,12 @@ import {
 import {
   ARROWHEAD,
   AXIS_GROUP,
+  DEFAULT_PLANES,
+  DefaultPlane,
+  defaultPlaneColor,
   getSceneScale,
   INTERSECTION_PLANE_LAYER,
+  OnMouseEnterLeaveArgs,
   RAYCASTABLE_PLANE,
   SKETCH_GROUP_SEGMENTS,
   SKETCH_LAYER,
@@ -78,16 +82,16 @@ import {
   createPipeSubstitution,
   findUniqueName,
 } from 'lang/modifyAst'
-import { Selections, sendSelectEventToEngine } from 'lib/selections'
+import {
+  Selections,
+  getEventForSegmentSelection,
+  sendSelectEventToEngine,
+} from 'lib/selections'
 import { getTangentPointFromPreviousArc } from 'lib/utils2d'
 import { createGridHelper, orthoScale, perspScale } from './helpers'
 import { Models } from '@kittycad/lib'
 import { uuidv4 } from 'lib/utils'
-import {
-  SegmentOverlayPayload,
-  SketchDetails,
-  ModelingMachineContext,
-} from 'machines/modelingMachine'
+import { SegmentOverlayPayload, SketchDetails } from 'machines/modelingMachine'
 import {
   ArtifactMapCommand,
   EngineCommandManager,
@@ -98,7 +102,6 @@ import {
 } from 'lib/rectangleTool'
 import { getThemeColorForThreeJs } from 'lib/theme'
 import { err, trap } from 'lib/trap'
-import { OnMouseEnterLeaveArgs, idleCallbacks } from './sceneCallbacks'
 
 type DraftSegment = 'line' | 'tangentialArcTo'
 
@@ -496,23 +499,31 @@ export class SceneEntities {
       variableDeclarationName,
     }
   }
-  updateAstAndRejigSketch: (
+  updateAstAndRejigSketch = async (
+    sketchPathToNode: PathToNode,
     modifiedAst: Program | Error,
-    context: ModelingMachineContext
-  ) => Promise<any> = async (modifiedAst, context) => {
+    forward: [number, number, number],
+    up: [number, number, number],
+    origin: [number, number, number]
+  ) => {
     if (err(modifiedAst)) return modifiedAst
 
     const nextAst = await kclManager.updateAst(modifiedAst, false)
     await this.tearDownSketch({ removeAxis: false })
     sceneInfra.resetMouseListeners()
     await this.setupSketch({
-      sketchPathToNode: context.sketchDetails?.sketchPathToNode || [],
-      forward: context.sketchDetails?.zAxis || [0, 0, 1],
-      up: context.sketchDetails?.yAxis || [0, 1, 0],
-      position: context.sketchDetails?.origin || [0, 0, 0],
+      sketchPathToNode,
+      forward,
+      up,
+      position: origin,
       maybeModdedAst: nextAst.newAst,
     })
-    this.setupSketchIdleCallbacks(context)
+    this.setupSketchIdleCallbacks({
+      forward,
+      up,
+      position: origin,
+      pathToNode: sketchPathToNode,
+    })
     return nextAst
   }
   setUpDraftSegment = async (
@@ -827,8 +838,128 @@ export class SceneEntities {
       },
     })
   }
-  setupSketchIdleCallbacks = (context: ModelingMachineContext) => {
-    sceneInfra.setCallbacks(idleCallbacks(context))
+  setupSketchIdleCallbacks = ({
+    pathToNode,
+    up,
+    forward,
+    position,
+  }: {
+    pathToNode: PathToNode
+    forward: [number, number, number]
+    up: [number, number, number]
+    position?: [number, number, number]
+  }) => {
+    let addingNewSegmentStatus: 'nothing' | 'pending' | 'added' = 'nothing'
+    sceneInfra.setCallbacks({
+      onDragEnd: async () => {
+        if (addingNewSegmentStatus !== 'nothing') {
+          await this.tearDownSketch({ removeAxis: false })
+          this.setupSketch({
+            sketchPathToNode: pathToNode,
+            maybeModdedAst: kclManager.ast,
+            up,
+            forward,
+            position,
+          })
+          // setting up the callbacks again resets value in closures
+          this.setupSketchIdleCallbacks({
+            pathToNode,
+            up,
+            forward,
+            position,
+          })
+        }
+      },
+      onDrag: async ({
+        selected,
+        intersectionPoint,
+        mouseEvent,
+        intersects,
+      }) => {
+        if (mouseEvent.which !== 1) return
+
+        const group = getParentGroup(selected, [EXTRA_SEGMENT_HANDLE])
+        if (group?.name === EXTRA_SEGMENT_HANDLE) {
+          const segGroup = getParentGroup(selected)
+          const pathToNode: PathToNode = segGroup?.userData?.pathToNode
+          const pathToNodeIndex = pathToNode.findIndex(
+            (x) => x[1] === 'PipeExpression'
+          )
+
+          const sketchGroup = sketchGroupFromPathToNode({
+            pathToNode,
+            ast: kclManager.ast,
+            programMemory: kclManager.programMemory,
+          })
+          if (trap(sketchGroup)) return
+
+          const pipeIndex = pathToNode[pathToNodeIndex + 1][0] as number
+          if (addingNewSegmentStatus === 'nothing') {
+            const prevSegment = sketchGroup.value[pipeIndex - 2]
+            const mod = addNewSketchLn({
+              node: kclManager.ast,
+              programMemory: kclManager.programMemory,
+              to: [intersectionPoint.twoD.x, intersectionPoint.twoD.y],
+              from: [prevSegment.from[0], prevSegment.from[1]],
+              // TODO assuming it's always a straight segments being added
+              // as this is easiest, and we'll need to add "tabbing" behavior
+              // to support other segment types
+              fnName: 'line',
+              pathToNode: pathToNode,
+              spliceBetween: true,
+            })
+            addingNewSegmentStatus = 'pending'
+            if (trap(mod)) return
+
+            await kclManager.executeAstMock(mod.modifiedAst)
+            await this.tearDownSketch({ removeAxis: false })
+            this.setupSketch({
+              sketchPathToNode: pathToNode,
+              maybeModdedAst: kclManager.ast,
+              up,
+              forward,
+              position,
+            })
+            addingNewSegmentStatus = 'added'
+          } else if (addingNewSegmentStatus === 'added') {
+            const pathToNodeForNewSegment = pathToNode.slice(0, pathToNodeIndex)
+            pathToNodeForNewSegment.push([pipeIndex - 2, 'index'])
+            this.onDragSegment({
+              sketchPathToNode: pathToNodeForNewSegment,
+              object: selected,
+              intersection2d: intersectionPoint.twoD,
+              intersects,
+            })
+          }
+          return
+        }
+
+        this.onDragSegment({
+          object: selected,
+          intersection2d: intersectionPoint.twoD,
+          intersects,
+          sketchPathToNode: pathToNode,
+        })
+      },
+      onMove: () => {},
+      onClick: (args) => {
+        if (args?.mouseEvent.which !== 1) return
+        if (!args || !args.selected) {
+          sceneInfra.modelingSend({
+            type: 'Set selection',
+            data: {
+              selectionType: 'singleCodeCursor',
+            },
+          })
+          return
+        }
+        const { selected } = args
+        const event = getEventForSegmentSelection(selected)
+        if (!event) return
+        sceneInfra.modelingSend(event)
+      },
+      ...this.mouseEnterLeaveCallbacks(),
+    })
   }
   prepareTruncatedMemoryAndAst = (
     sketchPathToNode: PathToNode,
@@ -1298,6 +1429,150 @@ export class SceneEntities {
       this._tearDownSketch(0, resolve, reject, { removeAxis })
     })
   }
+  setupDefaultPlaneHover() {
+    sceneInfra.setCallbacks({
+      onMouseEnter: ({ selected }) => {
+        if (!(selected instanceof Mesh && selected.parent)) return
+        if (selected.parent.userData.type !== DEFAULT_PLANES) return
+        const type: DefaultPlane = selected.userData.type
+        selected.material.color = defaultPlaneColor(type, 0.5, 1)
+      },
+      onMouseLeave: ({ selected }) => {
+        if (!(selected instanceof Mesh && selected.parent)) return
+        if (selected.parent.userData.type !== DEFAULT_PLANES) return
+        const type: DefaultPlane = selected.userData.type
+        selected.material.color = defaultPlaneColor(type)
+      },
+      onClick: async (args) => {
+        const { entity_id } = await sendSelectEventToEngine(
+          args?.mouseEvent,
+          document.getElementById('video-stream') as HTMLVideoElement,
+          sceneInfra._streamDimensions
+        )
+
+        let _entity_id = entity_id
+        if (!_entity_id) return
+        if (
+          engineCommandManager.defaultPlanes?.xy === _entity_id ||
+          engineCommandManager.defaultPlanes?.xz === _entity_id ||
+          engineCommandManager.defaultPlanes?.yz === _entity_id ||
+          engineCommandManager.defaultPlanes?.negXy === _entity_id ||
+          engineCommandManager.defaultPlanes?.negXz === _entity_id ||
+          engineCommandManager.defaultPlanes?.negYz === _entity_id
+        ) {
+          const defaultPlaneStrMap: Record<string, DefaultPlaneStr> = {
+            [engineCommandManager.defaultPlanes.xy]: 'XY',
+            [engineCommandManager.defaultPlanes.xz]: 'XZ',
+            [engineCommandManager.defaultPlanes.yz]: 'YZ',
+            [engineCommandManager.defaultPlanes.negXy]: '-XY',
+            [engineCommandManager.defaultPlanes.negXz]: '-XZ',
+            [engineCommandManager.defaultPlanes.negYz]: '-YZ',
+          }
+          // TODO can we get this information from rust land when it creates the default planes?
+          // maybe returned from make_default_planes (src/wasm-lib/src/wasm.rs)
+          let zAxis: [number, number, number] = [0, 0, 1]
+          let yAxis: [number, number, number] = [0, 1, 0]
+
+          // get unit vector from camera position to target
+          const camVector = sceneInfra.camControls.camera.position
+            .clone()
+            .sub(sceneInfra.camControls.target)
+
+          if (engineCommandManager.defaultPlanes?.xy === _entity_id) {
+            zAxis = [0, 0, 1]
+            yAxis = [0, 1, 0]
+            if (camVector.z < 0) {
+              zAxis = [0, 0, -1]
+              _entity_id = engineCommandManager.defaultPlanes?.negXy || ''
+            }
+          } else if (engineCommandManager.defaultPlanes?.yz === _entity_id) {
+            zAxis = [1, 0, 0]
+            yAxis = [0, 0, 1]
+            if (camVector.x < 0) {
+              zAxis = [-1, 0, 0]
+              _entity_id = engineCommandManager.defaultPlanes?.negYz || ''
+            }
+          } else if (engineCommandManager.defaultPlanes?.xz === _entity_id) {
+            zAxis = [0, 1, 0]
+            yAxis = [0, 0, 1]
+            _entity_id = engineCommandManager.defaultPlanes?.negXz || ''
+            if (camVector.y < 0) {
+              zAxis = [0, -1, 0]
+              _entity_id = engineCommandManager.defaultPlanes?.xz || ''
+            }
+          }
+
+          sceneInfra.modelingSend({
+            type: 'Select default plane',
+            data: {
+              type: 'defaultPlane',
+              planeId: _entity_id,
+              plane: defaultPlaneStrMap[_entity_id],
+              zAxis,
+              yAxis,
+            },
+          })
+          return
+        }
+        const artifact = this.engineCommandManager.artifactMap[_entity_id]
+        // 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 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 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?.[target?.extrusions?.[0] || '']
+
+        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
+        const { z_axis, y_axis, origin } = faceInfo
+        const sketchPathToNode = getNodePathFromSourceRange(
+          kclManager.ast,
+          artifact.range
+        )
+
+        const extrudePathToNode = extrusions?.range
+          ? getNodePathFromSourceRange(kclManager.ast, extrusions.range)
+          : []
+
+        sceneInfra.modelingSend({
+          type: 'Select default plane',
+          data: {
+            type: 'extrudeFace',
+            zAxis: [z_axis.x, z_axis.y, z_axis.z],
+            yAxis: [y_axis.x, y_axis.y, y_axis.z],
+            position: [origin.x, origin.y, origin.z].map(
+              (num) => num / sceneInfra._baseUnitMultiplier
+            ) as [number, number, number],
+            sketchPathToNode,
+            extrudePathToNode,
+            cap:
+              artifact?.additionalData?.type === 'cap'
+                ? artifact.additionalData.info
+                : 'none',
+            faceId: _entity_id,
+          },
+        })
+        return
+      },
+    })
+  }
   mouseEnterLeaveCallbacks() {
     return {
       onMouseEnter: ({ selected, dragSelected }: OnMouseEnterLeaveArgs) => {
@@ -1588,7 +1863,6 @@ export function sketchGroupFromPathToNode({
   return result as SketchGroup
 }
 
-// TODO delete
 function colorSegment(object: any, color: number) {
   const segmentHead = getParentGroup(object, [ARROWHEAD, PROFILE_START])
   if (segmentHead) {

src/clientSideScene/sceneInfra.ts

@@ -1,25 +1,25 @@
 import {
   AmbientLight,
   Color,
-  DoubleSide,
   GridHelper,
-  Group,
-  Intersection,
   LineBasicMaterial,
-  Mesh,
-  MeshBasicMaterial,
-  Object3D,
-  Object3DEventMap,
   OrthographicCamera,
   PerspectiveCamera,
-  PlaneGeometry,
-  Raycaster,
   Scene,
-  Texture,
-  TextureLoader,
-  Vector2,
   Vector3,
   WebGLRenderer,
+  Raycaster,
+  Vector2,
+  Group,
+  PlaneGeometry,
+  MeshBasicMaterial,
+  Mesh,
+  DoubleSide,
+  Intersection,
+  Object3D,
+  Object3DEventMap,
+  TextureLoader,
+  Texture,
 } from 'three'
 import { Coords2d, compareVec2Epsilon2 } from 'lang/std/sketch'
 import { useModelingContext } from 'hooks/useModelingContext'
@@ -31,12 +31,6 @@ import { EngineCommandManager } from 'lang/std/engineConnection'
 import { MouseState, SegmentOverlayPayload } from 'machines/modelingMachine'
 import { getAngle, throttle } from 'lib/utils'
 import { Themes } from 'lib/theme'
-import {
-  OnClickCallbackArgs,
-  OnDragCallbackArgs,
-  OnMouseEnterLeaveArgs,
-  OnMoveCallbackArgs,
-} from './sceneCallbacks'
 
 type SendType = ReturnType<typeof useModelingContext>['send']
 
@@ -61,6 +55,39 @@ export const AXIS_GROUP = 'axisGroup'
 export const SKETCH_GROUP_SEGMENTS = 'sketch-group-segments'
 export const ARROWHEAD = 'arrowhead'
 
+export interface OnMouseEnterLeaveArgs {
+  selected: Object3D<Object3DEventMap>
+  dragSelected?: Object3D<Object3DEventMap>
+  mouseEvent: MouseEvent
+}
+
+interface OnDragCallbackArgs extends OnMouseEnterLeaveArgs {
+  intersectionPoint: {
+    twoD: Vector2
+    threeD: Vector3
+  }
+  intersects: Intersection<Object3D<Object3DEventMap>>[]
+}
+interface OnClickCallbackArgs {
+  mouseEvent: MouseEvent
+  intersectionPoint?: {
+    twoD: Vector2
+    threeD: Vector3
+  }
+  intersects: Intersection<Object3D<Object3DEventMap>>[]
+  selected?: Object3D<Object3DEventMap>
+}
+
+interface OnMoveCallbackArgs {
+  mouseEvent: MouseEvent
+  intersectionPoint: {
+    twoD: Vector2
+    threeD: Vector3
+  }
+  intersects: Intersection<Object3D<Object3DEventMap>>[]
+  selected?: Object3D<Object3DEventMap>
+}
+
 // This singleton class is responsible for all of the under the hood setup for the client side scene.
 // That is the cameras and switching between them, raycasters for click mouse events and their abstractions (onClick etc), setting up controls.
 // Anything that added the the scene for the user to interact with is probably in SceneEntities.ts
@@ -591,6 +618,59 @@ export class SceneInfra {
       this.onClickCallback({ mouseEvent, intersects })
     }
   }
+  showDefaultPlanes() {
+    const addPlane = (
+      rotation: { x: number; y: number; z: number }, //
+      type: DefaultPlane
+    ): Mesh => {
+      const planeGeometry = new PlaneGeometry(100, 100)
+      const planeMaterial = new MeshBasicMaterial({
+        color: defaultPlaneColor(type),
+        transparent: true,
+        opacity: 0.0,
+        side: DoubleSide,
+        depthTest: false, // needed to avoid transparency issues
+      })
+      const plane = new Mesh(planeGeometry, planeMaterial)
+      plane.rotation.x = rotation.x
+      plane.rotation.y = rotation.y
+      plane.rotation.z = rotation.z
+      plane.userData.type = type
+      plane.name = type
+      return plane
+    }
+    const planes = [
+      addPlane({ x: 0, y: Math.PI / 2, z: 0 }, YZ_PLANE),
+      addPlane({ x: 0, y: 0, z: 0 }, XY_PLANE),
+      addPlane({ x: -Math.PI / 2, y: 0, z: 0 }, XZ_PLANE),
+    ]
+    const planesGroup = new Group()
+    planesGroup.userData.type = DEFAULT_PLANES
+    planesGroup.name = DEFAULT_PLANES
+    planesGroup.add(...planes)
+    planesGroup.traverse((child) => {
+      if (child instanceof Mesh) {
+        child.layers.enable(SKETCH_LAYER)
+      }
+    })
+    planesGroup.layers.enable(SKETCH_LAYER)
+    const sceneScale = getSceneScale(
+      this.camControls.camera,
+      this.camControls.target
+    )
+    planesGroup.scale.set(
+      sceneScale / this._baseUnitMultiplier,
+      sceneScale / this._baseUnitMultiplier,
+      sceneScale / this._baseUnitMultiplier
+    )
+    this.scene.add(planesGroup)
+  }
+  removeDefaultPlanes() {
+    const planesGroup = this.scene.children.find(
+      ({ userData }) => userData.type === DEFAULT_PLANES
+    )
+    if (planesGroup) this.scene.remove(planesGroup)
+  }
   updateOtherSelectionColors = (otherSelections: Axis[]) => {
     const axisGroup = this.scene.children.find(
       ({ userData }) => userData?.type === AXIS_GROUP
@@ -648,3 +728,28 @@ function baseUnitTomm(baseUnit: BaseUnit) {
       return 914.4
   }
 }
+
+export type DefaultPlane =
+  | 'xy-default-plane'
+  | 'xz-default-plane'
+  | 'yz-default-plane'
+
+export const XY_PLANE: DefaultPlane = 'xy-default-plane'
+export const XZ_PLANE: DefaultPlane = 'xz-default-plane'
+export const YZ_PLANE: DefaultPlane = 'yz-default-plane'
+
+export function defaultPlaneColor(
+  plane: DefaultPlane,
+  lowCh = 0.1,
+  highCh = 0.7
+): Color {
+  switch (plane) {
+    case XY_PLANE:
+      return new Color(highCh, lowCh, lowCh)
+    case XZ_PLANE:
+      return new Color(lowCh, lowCh, highCh)
+    case YZ_PLANE:
+      return new Color(lowCh, highCh, lowCh)
+  }
+  return new Color(lowCh, lowCh, lowCh)
+}

src/components/Gizmo.tsx

@@ -119,7 +119,7 @@ export default function Gizmo() {
       <div
         ref={wrapperRef}
         aria-label="View orientation gizmo"
-        className="grid place-content-center rounded-full overflow-hidden border border-solid border-primary/50 pointer-events-auto bg-chalkboard-10/70 dark:bg-chalkboard-100/80 backdrop-blur-sm"
+        className="grid place-content-center rounded-full overflow-hidden border border-solid border-primary/50 pointer-events-auto"
       >
         <canvas ref={canvasRef} />
         <ContextMenu

src/components/ModelingMachineProvider.tsx

@@ -53,8 +53,9 @@ import {
   sketchOnExtrudedFace,
   startSketchOnDefault,
 } from 'lang/modifyAst'
-import { Program, parse, recast } from 'lang/wasm'
+import { Program, VariableDeclaration, parse, recast } from 'lang/wasm'
 import {
+  getNodeFromPath,
   getNodePathFromSourceRange,
   hasExtrudableGeometry,
   isSingleCursorInPipe,
@@ -549,8 +550,10 @@ export const ModelingMachineProvider = ({
             ) as [number, number, number],
           }
         },
-        'Get horizontal info': async (context): Promise<SetSelections> => {
-          const { selectionRanges, sketchDetails } = context
+        'Get horizontal info': async ({
+          selectionRanges,
+          sketchDetails,
+        }): Promise<SetSelections> => {
           const { modifiedAst, pathToNodeMap } =
             await applyConstraintHorzVertDistance({
               constraint: 'setHorzDistance',
@@ -564,8 +567,11 @@ export const ModelingMachineProvider = ({
             pathToNodeMap
           )
           const updatedAst = await sceneEntitiesManager.updateAstAndRejigSketch(
+            updatedPathToNode,
             _modifiedAst,
-            context
+            sketchDetails.zAxis,
+            sketchDetails.yAxis,
+            sketchDetails.origin
           )
           if (err(updatedAst)) return Promise.reject(updatedAst)
           const selection = updateSelections(
@@ -580,8 +586,10 @@ export const ModelingMachineProvider = ({
             updatedPathToNode,
           }
         },
-        'Get vertical info': async (context): Promise<SetSelections> => {
-          const { selectionRanges, sketchDetails } = context
+        'Get vertical info': async ({
+          selectionRanges,
+          sketchDetails,
+        }): Promise<SetSelections> => {
           const { modifiedAst, pathToNodeMap } =
             await applyConstraintHorzVertDistance({
               constraint: 'setVertDistance',
@@ -595,8 +603,11 @@ export const ModelingMachineProvider = ({
             pathToNodeMap
           )
           const updatedAst = await sceneEntitiesManager.updateAstAndRejigSketch(
+            updatedPathToNode,
             _modifiedAst,
-            context
+            sketchDetails.zAxis,
+            sketchDetails.yAxis,
+            sketchDetails.origin
           )
           if (err(updatedAst)) return Promise.reject(updatedAst)
           const selection = updateSelections(
@@ -611,8 +622,10 @@ export const ModelingMachineProvider = ({
             updatedPathToNode,
           }
         },
-        'Get angle info': async (context): Promise<SetSelections> => {
-          const { selectionRanges, sketchDetails } = context
+        'Get angle info': async ({
+          selectionRanges,
+          sketchDetails,
+        }): Promise<SetSelections> => {
           const info = angleBetweenInfo({
             selectionRanges,
           })
@@ -635,8 +648,11 @@ export const ModelingMachineProvider = ({
             pathToNodeMap
           )
           const updatedAst = await sceneEntitiesManager.updateAstAndRejigSketch(
+            updatedPathToNode,
             _modifiedAst,
-            context
+            sketchDetails.zAxis,
+            sketchDetails.yAxis,
+            sketchDetails.origin
           )
           if (err(updatedAst)) return Promise.reject(updatedAst)
           const selection = updateSelections(
@@ -651,8 +667,10 @@ export const ModelingMachineProvider = ({
             updatedPathToNode,
           }
         },
-        'Get length info': async (context): Promise<SetSelections> => {
-          const { selectionRanges, sketchDetails } = context
+        'Get length info': async ({
+          selectionRanges,
+          sketchDetails,
+        }): Promise<SetSelections> => {
           const { modifiedAst, pathToNodeMap } =
             await applyConstraintAngleLength({ selectionRanges })
           const _modifiedAst = parse(recast(modifiedAst))
@@ -663,8 +681,11 @@ export const ModelingMachineProvider = ({
             pathToNodeMap
           )
           const updatedAst = await sceneEntitiesManager.updateAstAndRejigSketch(
+            updatedPathToNode,
             _modifiedAst,
-            context
+            sketchDetails.zAxis,
+            sketchDetails.yAxis,
+            sketchDetails.origin
           )
           if (err(updatedAst)) return Promise.reject(updatedAst)
           const selection = updateSelections(
@@ -679,10 +700,10 @@ export const ModelingMachineProvider = ({
             updatedPathToNode,
           }
         },
-        'Get perpendicular distance info': async (
-          context
-        ): Promise<SetSelections> => {
-          const { selectionRanges, sketchDetails } = context
+        'Get perpendicular distance info': async ({
+          selectionRanges,
+          sketchDetails,
+        }): Promise<SetSelections> => {
           const { modifiedAst, pathToNodeMap } = await applyConstraintIntersect(
             {
               selectionRanges,
@@ -696,8 +717,11 @@ export const ModelingMachineProvider = ({
             pathToNodeMap
           )
           const updatedAst = await sceneEntitiesManager.updateAstAndRejigSketch(
+            updatedPathToNode,
             _modifiedAst,
-            context
+            sketchDetails.zAxis,
+            sketchDetails.yAxis,
+            sketchDetails.origin
           )
           if (err(updatedAst)) return Promise.reject(updatedAst)
           const selection = updateSelections(
@@ -712,8 +736,10 @@ export const ModelingMachineProvider = ({
             updatedPathToNode,
           }
         },
-        'Get ABS X info': async (context): Promise<SetSelections> => {
-          const { selectionRanges, sketchDetails } = context
+        'Get ABS X info': async ({
+          selectionRanges,
+          sketchDetails,
+        }): Promise<SetSelections> => {
           const { modifiedAst, pathToNodeMap } =
             await applyConstraintAbsDistance({
               constraint: 'xAbs',
@@ -727,8 +753,11 @@ export const ModelingMachineProvider = ({
             pathToNodeMap
           )
           const updatedAst = await sceneEntitiesManager.updateAstAndRejigSketch(
+            updatedPathToNode,
             _modifiedAst,
-            context
+            sketchDetails.zAxis,
+            sketchDetails.yAxis,
+            sketchDetails.origin
           )
           if (err(updatedAst)) return Promise.reject(updatedAst)
           const selection = updateSelections(
@@ -743,8 +772,10 @@ export const ModelingMachineProvider = ({
             updatedPathToNode,
           }
         },
-        'Get ABS Y info': async (context): Promise<SetSelections> => {
-          const { selectionRanges, sketchDetails } = context
+        'Get ABS Y info': async ({
+          selectionRanges,
+          sketchDetails,
+        }): Promise<SetSelections> => {
           const { modifiedAst, pathToNodeMap } =
             await applyConstraintAbsDistance({
               constraint: 'yAbs',
@@ -758,8 +789,11 @@ export const ModelingMachineProvider = ({
             pathToNodeMap
           )
           const updatedAst = await sceneEntitiesManager.updateAstAndRejigSketch(
+            updatedPathToNode,
             _modifiedAst,
-            context
+            sketchDetails.zAxis,
+            sketchDetails.yAxis,
+            sketchDetails.origin
           )
           if (err(updatedAst)) return Promise.reject(updatedAst)
           const selection = updateSelections(
@@ -775,10 +809,9 @@ export const ModelingMachineProvider = ({
           }
         },
         'Get convert to variable info': async (
-          context,
+          { sketchDetails, selectionRanges },
           { data }
         ): Promise<SetSelections> => {
-          const { selectionRanges, sketchDetails } = context
           if (!sketchDetails)
             return Promise.reject(new Error('No sketch details'))
           const { variableName } = await getVarNameModal({
@@ -802,8 +835,11 @@ export const ModelingMachineProvider = ({
             return Promise.reject(new Error('No path to replaced node'))
 
           const updatedAst = await sceneEntitiesManager.updateAstAndRejigSketch(
+            pathToReplacedNode || [],
             parsed,
-            context
+            sketchDetails.zAxis,
+            sketchDetails.yAxis,
+            sketchDetails.origin
           )
           if (err(updatedAst)) return Promise.reject(updatedAst)
           const selection = updateSelections(

src/components/Stream.tsx

@@ -109,6 +109,7 @@ export const Stream = () => {
       },
     })
     if (state.matches('Sketch')) return
+    if (state.matches('Sketch no face')) return
 
     if (!context.store?.didDragInStream && butName(e).left) {
       sendSelectEventToEngine(

src/components/UnitsMenu.tsx

@@ -1,54 +0,0 @@
-import { Popover } from '@headlessui/react'
-import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
-import { baseUnitLabels, baseUnitsUnion } from 'lib/settings/settingsTypes'
-
-export function UnitsMenu() {
-  const { settings } = useSettingsAuthContext()
-  return (
-    <Popover className="relative pointer-events-auto">
-      {({ close }) => (
-        <>
-          <Popover.Button
-            className={`flex items-center gap-2 px-3 py-1 
-        text-xs text-primary bg-chalkboard-10/70 dark:bg-chalkboard-100/80 backdrop-blur-sm 
-        border !border-primary/50 rounded-full`}
-          >
-            <div className="w-4 h-[1px] bg-primary relative">
-              <div className="absolute w-[1px] h-[1em] bg-primary left-0 top-1/2 -translate-y-1/2"></div>
-              <div className="absolute w-[1px] h-[1em] bg-primary right-0 top-1/2 -translate-y-1/2"></div>
-            </div>
-            <span className="sr-only">Current units are:&nbsp;</span>
-            {settings.context.modeling.defaultUnit.current}
-          </Popover.Button>
-          <Popover.Panel
-            className={`absolute bottom-full right-0 mb-2 w-48 bg-chalkboard-10 dark:bg-chalkboard-90
-          border border-solid border-chalkboard-10 dark:border-chalkboard-90 rounded
-          shadow-lg`}
-          >
-            <ul className="relative flex flex-col gap-0.5 items-stretch content-stretch">
-              {baseUnitsUnion.map((unit) => (
-                <li key={unit} className="contents">
-                  <button
-                    className="flex items-center gap-2 py-1 px-2 cursor-pointer hover:bg-chalkboard-20 dark:hover:bg-chalkboard-80 border-none text-left"
-                    onClick={() => {
-                      settings.send({
-                        type: 'set.modeling.defaultUnit',
-                        data: {
-                          level: 'project',
-                          value: unit,
-                        },
-                      })
-                      close()
-                    }}
-                  >
-                    {baseUnitLabels[unit]}
-                  </button>
-                </li>
-              ))}
-            </ul>
-          </Popover.Panel>
-        </>
-      )}
-    </Popover>
-  )
-}

src/hooks/useEngineConnectionSubscriptions.ts

@@ -4,7 +4,7 @@ import { useModelingContext } from './useModelingContext'
 import { getEventForSelectWithPoint } from 'lib/selections'
 
 export function useEngineConnectionSubscriptions() {
-  const { send, state } = useModelingContext()
+  const { send, context } = useModelingContext()
 
   useEffect(() => {
     if (!engineCommandManager) return
@@ -29,7 +29,9 @@ export function useEngineConnectionSubscriptions() {
     const unSubClick = engineCommandManager.subscribeTo({
       event: 'select_with_point',
       callback: async (engineEvent) => {
-        const event = await getEventForSelectWithPoint(engineEvent, state)
+        const event = await getEventForSelectWithPoint(engineEvent, {
+          sketchEnginePathId: context.sketchEnginePathId,
+        })
         event && send(event)
       },
     })
@@ -37,5 +39,5 @@ export function useEngineConnectionSubscriptions() {
       unSubHover()
       unSubClick()
     }
-  }, [engineCommandManager, state])
+  }, [engineCommandManager, context?.sketchEnginePathId])
 }

src/lang/artifact.test.ts

@@ -185,17 +185,6 @@ const sk2 = startSketchOn('XY')
           on: expect.any(Object),
           start: expect.any(Object),
           type: 'SketchGroup',
-          tags: {
-            p: {
-              __meta: [
-                {
-                  sourceRange: [114, 116],
-                },
-              ],
-              type: 'TagIdentifier',
-              value: 'p',
-            },
-          },
           value: [
             {
               type: 'ToPoint',
@@ -276,17 +265,6 @@ const sk2 = startSketchOn('XY')
           on: expect.any(Object),
           start: expect.any(Object),
           type: 'SketchGroup',
-          tags: {
-            o: {
-              __meta: [
-                {
-                  sourceRange: [417, 419],
-                },
-              ],
-              type: 'TagIdentifier',
-              value: 'o',
-            },
-          },
           value: [
             {
               type: 'ToPoint',

src/lang/executor.test.ts

@@ -155,17 +155,6 @@ const newVar = myVar + 1`
           sourceRange: [39, 63],
         },
       },
-      tags: {
-        myPath: {
-          __meta: [
-            {
-              sourceRange: [109, 117],
-            },
-          ],
-          type: 'TagIdentifier',
-          value: 'myPath',
-        },
-      },
       value: [
         {
           type: 'ToPoint',

src/lang/std/engineConnection.ts

@@ -1200,6 +1200,15 @@ export class EngineCommandManager extends EventTarget {
       token,
     })
 
+    // Teardown everything if we go hidden or reconnect
+    document.onvisibilitychange = () => {
+      if (document.visibilityState === 'hidden') {
+        this.engineConnection?.tearDown()
+      } else {
+        this.engineConnection?.connect(true)
+      }
+    }
+
     this.dispatchEvent(
       new CustomEvent(EngineCommandManagerEvents.EngineAvailable, {
         detail: this.engineConnection,
@@ -1619,7 +1628,15 @@ export class EngineCommandManager extends EventTarget {
     }
   }
   tearDown() {
-    this.engineConnection?.tearDown()
+    if (this.engineConnection) {
+      this.engineConnection?.tearDown()
+      // Our window.tearDown assignment causes this case to happen which is
+      // only really for tests.
+      // @ts-ignore
+    } else if (this.engineCommandManager?.engineConnection) {
+      // @ts-ignore
+      this.engineCommandManager?.engineConnection?.tearDown()
+    }
   }
   async startNewSession() {
     this.lastArtifactMap = this.artifactMap

src/lib/selections.ts

@@ -4,7 +4,6 @@ import {
   engineCommandManager,
   kclManager,
   sceneEntitiesManager,
-  sceneInfra,
 } from 'lib/singletons'
 import { CallExpression, SourceRange, Value, parse, recast } from 'lang/wasm'
 import { ModelingMachineEvent } from 'machines/modelingMachine'
@@ -16,7 +15,6 @@ import { Program } from 'lang/wasm'
 import {
   doesPipeHaveCallExp,
   getNodeFromPath,
-  getNodePathFromSourceRange,
   hasSketchPipeBeenExtruded,
   isSingleCursorInPipe,
 } from 'lang/queryAst'
@@ -26,15 +24,11 @@ import {
   TANGENTIAL_ARC_TO_SEGMENT,
   getParentGroup,
   PROFILE_START,
-  getFaceDetails,
-  DefaultPlaneStr,
 } from 'clientSideScene/sceneEntities'
 import { Mesh, Object3D, Object3DEventMap } from 'three'
 import { AXIS_GROUP, X_AXIS } from 'clientSideScene/sceneInfra'
 import { PathToNodeMap } from 'lang/std/sketchcombos'
 import { err } from 'lib/trap'
-import { useModelingContext } from 'hooks/useModelingContext'
-import { ArtifactMapCommand } from 'lang/std/engineConnection'
 
 export const X_AXIS_UUID = 'ad792545-7fd3-482a-a602-a93924e3055b'
 export const Y_AXIS_UUID = '680fd157-266f-4b8a-984f-cdf46b8bdf01'
@@ -68,12 +62,8 @@ export async function getEventForSelectWithPoint(
     Models['OkModelingCmdResponse_type'],
     { type: 'select_with_point' }
   >,
-  state: ReturnType<typeof useModelingContext>['state']
+  { sketchEnginePathId }: { sketchEnginePathId?: string }
 ): Promise<ModelingMachineEvent | null> {
-  if (state.matches('Sketch no face'))
-    return handleSelectionInSketchNoFace(data?.entity_id || '')
-
-  // assumes XState state is `idle` from this point
   if (!data?.entity_id) {
     return {
       type: 'Set selection',
@@ -153,128 +143,6 @@ export async function getEventForSelectWithPoint(
   }
 }
 
-async function handleSelectionInSketchNoFace(
-  entity_id: string
-): Promise<ModelingMachineEvent | null> {
-  let _entity_id = entity_id
-  if (!_entity_id) return Promise.resolve(null)
-  if (
-    engineCommandManager.defaultPlanes?.xy === _entity_id ||
-    engineCommandManager.defaultPlanes?.xz === _entity_id ||
-    engineCommandManager.defaultPlanes?.yz === _entity_id ||
-    engineCommandManager.defaultPlanes?.negXy === _entity_id ||
-    engineCommandManager.defaultPlanes?.negXz === _entity_id ||
-    engineCommandManager.defaultPlanes?.negYz === _entity_id
-  ) {
-    const defaultPlaneStrMap: Record<string, DefaultPlaneStr> = {
-      [engineCommandManager.defaultPlanes.xy]: 'XY',
-      [engineCommandManager.defaultPlanes.xz]: 'XZ',
-      [engineCommandManager.defaultPlanes.yz]: 'YZ',
-      [engineCommandManager.defaultPlanes.negXy]: '-XY',
-      [engineCommandManager.defaultPlanes.negXz]: '-XZ',
-      [engineCommandManager.defaultPlanes.negYz]: '-YZ',
-    }
-    // TODO can we get this information from rust land when it creates the default planes?
-    // maybe returned from make_default_planes (src/wasm-lib/src/wasm.rs)
-    let zAxis: [number, number, number] = [0, 0, 1]
-    let yAxis: [number, number, number] = [0, 1, 0]
-
-    // get unit vector from camera position to target
-    const camVector = sceneInfra.camControls.camera.position
-      .clone()
-      .sub(sceneInfra.camControls.target)
-
-    if (engineCommandManager.defaultPlanes?.xy === _entity_id) {
-      zAxis = [0, 0, 1]
-      yAxis = [0, 1, 0]
-      if (camVector.z < 0) {
-        zAxis = [0, 0, -1]
-        _entity_id = engineCommandManager.defaultPlanes?.negXy || ''
-      }
-    } else if (engineCommandManager.defaultPlanes?.yz === _entity_id) {
-      zAxis = [1, 0, 0]
-      yAxis = [0, 0, 1]
-      if (camVector.x < 0) {
-        zAxis = [-1, 0, 0]
-        _entity_id = engineCommandManager.defaultPlanes?.negYz || ''
-      }
-    } else if (engineCommandManager.defaultPlanes?.xz === _entity_id) {
-      zAxis = [0, 1, 0]
-      yAxis = [0, 0, 1]
-      _entity_id = engineCommandManager.defaultPlanes?.negXz || ''
-      if (camVector.y < 0) {
-        zAxis = [0, -1, 0]
-        _entity_id = engineCommandManager.defaultPlanes?.xz || ''
-      }
-    }
-
-    return {
-      type: 'Select default plane',
-      data: {
-        type: 'defaultPlane',
-        planeId: _entity_id,
-        plane: defaultPlaneStrMap[_entity_id],
-        zAxis,
-        yAxis,
-      },
-    }
-  }
-  const artifact = engineCommandManager.artifactMap[_entity_id]
-  // 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 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 target = 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 =
-    engineCommandManager.artifactMap?.[target?.extrusions?.[0] || '']
-
-  if (artifact?.commandType !== 'solid3d_get_extrusion_face_info') return null
-
-  const faceInfo = await getFaceDetails(_entity_id)
-  if (!faceInfo?.origin || !faceInfo?.z_axis || !faceInfo?.y_axis) return null
-  const { z_axis, y_axis, origin } = faceInfo
-  const sketchPathToNode = getNodePathFromSourceRange(
-    kclManager.ast,
-    artifact.range
-  )
-
-  const extrudePathToNode = extrusions?.range
-    ? getNodePathFromSourceRange(kclManager.ast, extrusions.range)
-    : []
-
-  return {
-    type: 'Select default plane',
-    data: {
-      type: 'extrudeFace',
-      zAxis: [z_axis.x, z_axis.y, z_axis.z],
-      yAxis: [y_axis.x, y_axis.y, y_axis.z],
-      position: [origin.x, origin.y, origin.z].map(
-        (num) => num / sceneInfra._baseUnitMultiplier
-      ) as [number, number, number],
-      sketchPathToNode,
-      extrudePathToNode,
-      cap:
-        artifact?.additionalData?.type === 'cap'
-          ? artifact.additionalData.info
-          : 'none',
-      faceId: _entity_id,
-    },
-  }
-}
-
 export function getEventForSegmentSelection(
   obj: Object3D<Object3DEventMap>
 ): ModelingMachineEvent | null {

src/lib/settings/settingsTypes.ts

@@ -16,14 +16,6 @@ export const baseUnits = {
 export type BaseUnit = Models['UnitLength_type']
 
 export const baseUnitsUnion = Object.values(baseUnits).flatMap((v) => v)
-export const baseUnitLabels = {
-  in: 'Inches',
-  ft: 'Feet',
-  yd: 'Yards',
-  mm: 'Millimeters',
-  cm: 'Centimeters',
-  m: 'Meters',
-} as const
 
 export type Toggle = 'On' | 'Off'
 export const toggleAsArray = ['On', 'Off'] as const

src/lib/singletons.ts

@@ -9,6 +9,10 @@ export const codeManager = new CodeManager()
 
 export const engineCommandManager = new EngineCommandManager()
 
+// Accessible for tests mostly
+// @ts-ignore
+window.tearDown = engineCommandManager.tearDown
+
 // This needs to be after codeManager is created.
 export const kclManager = new KclManager(engineCommandManager)
 kclManager.isFirstRender = true

src/wasm-lib/Cargo.lock

@@ -1385,7 +1385,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-lib"
-version = "0.1.71"
+version = "0.1.69"
 dependencies = [
  "anyhow",
  "approx",
@@ -1453,7 +1453,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-test-server"
-version = "0.1.2"
+version = "0.1.1"
 dependencies = [
  "anyhow",
  "hyper",
@@ -1466,9 +1466,9 @@ dependencies = [
 
 [[package]]
 name = "kittycad"
-version = "0.3.7"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1777b503442fa4666564cc3ab237d456df853a09648a4b2bb09622d25d021a5"
+checksum = "af3de9bb4b1441f198689a9f64a8163a518377e30b348a784680e738985b95eb"
 dependencies = [
  "anyhow",
  "async-trait",

src/wasm-lib/Cargo.toml

@@ -69,7 +69,7 @@ members = [
 ]
 
 [workspace.dependencies]
-kittycad = { version = "0.3.7", default-features = false, features = ["js", "requests"] }
+kittycad = { version = "0.3.6", default-features = false, features = ["js", "requests"] }
 kittycad-modeling-session = "0.1.4"
 
 [[test]]

src/wasm-lib/kcl-test-server/Cargo.toml

@@ -1,14 +1,14 @@
 [package]
 name = "kcl-test-server"
 description = "A test server for KCL"
-version = "0.1.2"
+version = "0.1.1"
 edition = "2021"
 license = "MIT"
 
 [dependencies]
 anyhow = "1.0.86"
 hyper = { version = "0.14.29", features = ["server"] }
-kcl-lib = { version = "0.1.70", path = "../kcl" }
+kcl-lib = { version = "0.1.62", path = "../kcl" }
 pico-args = "0.5.0"
 serde = { version = "1.0.203", features = ["derive"] }
 serde_json = "1.0.120"

src/wasm-lib/kcl/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "kcl-lib"
 description = "KittyCAD Language implementation and tools"
-version = "0.1.71"
+version = "0.1.69"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/KittyCAD/modeling-app"

src/wasm-lib/kcl/src/ast/types.rs

@@ -1238,10 +1238,11 @@ impl CallExpression {
             }
             FunctionKind::UserDefined => {
                 let func = memory.get(&fn_name, self.into())?;
-                let result = func.call_fn(fn_args, memory.clone(), ctx.clone()).await.map_err(|e| {
-                    // Add the call expression to the source ranges.
-                    e.add_source_ranges(vec![self.into()])
-                })?;
+                let (result, global_memory_items) =
+                    func.call_fn(fn_args, memory.clone(), ctx.clone()).await.map_err(|e| {
+                        // Add the call expression to the source ranges.
+                        e.add_source_ranges(vec![self.into()])
+                    })?;
 
                 let result = result.ok_or_else(|| {
                     KclError::UndefinedValue(KclErrorDetails {
@@ -1251,6 +1252,14 @@ impl CallExpression {
                 })?;
                 let result = result.get_value()?;
 
+                // Add the global memory items to the memory.
+                for (key, item) in global_memory_items {
+                    // We don't care about errors here because any collisions
+                    // would happened in the function call itself and already
+                    // errored out.
+                    memory.add(&key, item, self.into()).unwrap_or_default();
+                }
+
                 Ok(result)
             }
         }
@@ -1778,17 +1787,6 @@ impl From<&TagDeclarator> for MemoryItem {
     }
 }
 
-impl From<&TagDeclarator> for TagIdentifier {
-    fn from(tag: &TagDeclarator) -> Self {
-        TagIdentifier {
-            value: tag.name.clone(),
-            meta: vec![Metadata {
-                source_range: tag.into(),
-            }],
-        }
-    }
-}
-
 impl From<&TagDeclarator> for CompletionItem {
     fn from(tag: &TagDeclarator) -> Self {
         CompletionItem {

src/wasm-lib/kcl/src/executor.rs

@@ -537,14 +537,17 @@ impl std::hash::Hash for TagIdentifier {
     }
 }
 
-pub type MemoryFunction =
-    fn(
-        s: Vec<MemoryItem>,
-        memory: ProgramMemory,
-        expression: Box<FunctionExpression>,
-        metadata: Vec<Metadata>,
-        ctx: ExecutorContext,
-    ) -> std::pin::Pin<Box<dyn std::future::Future<Output = Result<Option<ProgramReturn>, KclError>> + Send>>;
+pub type MemoryFunction = fn(
+    s: Vec<MemoryItem>,
+    memory: ProgramMemory,
+    expression: Box<FunctionExpression>,
+    metadata: Vec<Metadata>,
+    ctx: ExecutorContext,
+) -> std::pin::Pin<
+    Box<
+        dyn std::future::Future<Output = Result<(Option<ProgramReturn>, HashMap<String, MemoryItem>), KclError>> + Send,
+    >,
+>;
 
 fn force_memory_function<
     F: Fn(
@@ -553,7 +556,12 @@ fn force_memory_function<
         Box<FunctionExpression>,
         Vec<Metadata>,
         ExecutorContext,
-    ) -> std::pin::Pin<Box<dyn std::future::Future<Output = Result<Option<ProgramReturn>, KclError>> + Send>>,
+    ) -> std::pin::Pin<
+        Box<
+            dyn std::future::Future<Output = Result<(Option<ProgramReturn>, HashMap<String, MemoryItem>), KclError>>
+                + Send,
+        >,
+    >,
 >(
     f: F,
 ) -> F {
@@ -683,15 +691,11 @@ impl MemoryItem {
         match self {
             MemoryItem::TagIdentifier(t) => Ok(*t.clone()),
             MemoryItem::UserVal(u) => {
-                if let Some(identifier) = self.get_json_opt::<TagIdentifier>()? {
-                    Ok(identifier)
-                } else {
-                    let name: String = self.get_json()?;
-                    Ok(TagIdentifier {
-                        value: name,
-                        meta: u.meta.clone(),
-                    })
-                }
+                let name: String = self.get_json()?;
+                Ok(TagIdentifier {
+                    value: name,
+                    meta: u.meta.clone(),
+                })
             }
             _ => Err(KclError::Semantic(KclErrorDetails {
                 message: format!("Not a tag identifier: {:?}", self),
@@ -748,7 +752,7 @@ impl MemoryItem {
         args: Vec<MemoryItem>,
         memory: ProgramMemory,
         ctx: ExecutorContext,
-    ) -> Result<Option<ProgramReturn>, KclError> {
+    ) -> Result<(Option<ProgramReturn>, HashMap<String, MemoryItem>), KclError> {
         let MemoryItem::Function { func, expression, meta } = &self else {
             return Err(KclError::Semantic(KclErrorDetails {
                 message: "not a in memory function".to_string(),
@@ -778,9 +782,6 @@ pub struct SketchGroup {
     pub on: SketchSurface,
     /// The starting path.
     pub start: BasePath,
-    /// Tag identifiers that have been declared in this sketch group.
-    #[serde(default, skip_serializing_if = "HashMap::is_empty")]
-    pub tags: HashMap<String, TagIdentifier>,
     /// Metadata.
     #[serde(rename = "__meta")]
     pub meta: Vec<Metadata>,
@@ -1358,8 +1359,6 @@ pub struct ExecutorSettings {
     pub highlight_edges: bool,
     /// Whether or not Screen Space Ambient Occlusion (SSAO) is enabled.
     pub enable_ssao: bool,
-    // Show grid?
-    pub show_grid: bool,
 }
 
 impl Default for ExecutorSettings {
@@ -1368,7 +1367,6 @@ impl Default for ExecutorSettings {
             units: Default::default(),
             highlight_edges: true,
             enable_ssao: false,
-            show_grid: false,
         }
     }
 }
@@ -1379,7 +1377,6 @@ impl From<crate::settings::types::Configuration> for ExecutorSettings {
             units: config.settings.modeling.base_unit,
             highlight_edges: config.settings.modeling.highlight_edges.into(),
             enable_ssao: config.settings.modeling.enable_ssao.into(),
-            show_grid: config.settings.modeling.show_scale_grid,
         }
     }
 }
@@ -1390,7 +1387,6 @@ impl From<crate::settings::types::project::ProjectConfiguration> for ExecutorSet
             units: config.settings.modeling.base_unit,
             highlight_edges: config.settings.modeling.highlight_edges.into(),
             enable_ssao: config.settings.modeling.enable_ssao.into(),
-            show_grid: config.settings.modeling.show_scale_grid,
         }
     }
 }
@@ -1401,7 +1397,6 @@ impl From<crate::settings::types::ModelingSettings> for ExecutorSettings {
             units: modeling.base_unit,
             highlight_edges: modeling.highlight_edges.into(),
             enable_ssao: modeling.enable_ssao.into(),
-            show_grid: modeling.show_scale_grid,
         }
     }
 }
@@ -1420,7 +1415,6 @@ impl ExecutorContext {
                 } else {
                     None
                 },
-                if settings.show_grid { Some(true) } else { None },
                 None,
                 None,
                 None,
@@ -1484,7 +1478,6 @@ impl ExecutorContext {
                 units,
                 highlight_edges: true,
                 enable_ssao: false,
-                show_grid: false,
             },
         )
         .await?;
@@ -1571,7 +1564,16 @@ impl ExecutorContext {
                             }
                             FunctionKind::UserDefined => {
                                 if let Some(func) = memory.clone().root.get(&fn_name) {
-                                    let result = func.call_fn(args.clone(), memory.clone(), self.clone()).await?;
+                                    let (result, global_memory_items) =
+                                        func.call_fn(args.clone(), memory.clone(), self.clone()).await?;
+
+                                    // Add the global memory items to the memory.
+                                    for (key, item) in global_memory_items {
+                                        // We don't care about errors here because any collisions
+                                        // would happened in the function call itself and already
+                                        // errored out.
+                                        memory.add(&key, item, call_expr.into()).unwrap_or_default();
+                                    }
 
                                     memory.return_ = result;
                                 } else {
@@ -1696,7 +1698,7 @@ impl ExecutorContext {
                                 .inner_execute(&function_expression.body, &mut fn_memory, BodyType::Block)
                                 .await?;
 
-                            Ok(result.return_)
+                            Ok((result.return_, fn_memory.get_tags()))
                         })
                     },
                 );

src/wasm-lib/kcl/src/function_param.rs

@@ -1,3 +1,5 @@
+use std::collections::HashMap;
+
 use schemars::JsonSchema;
 
 use crate::{
@@ -16,7 +18,10 @@ pub struct FunctionParam<'a> {
 }
 
 impl<'a> FunctionParam<'a> {
-    pub async fn call(&self, args: Vec<MemoryItem>) -> Result<Option<ProgramReturn>, KclError> {
+    pub async fn call(
+        &self,
+        args: Vec<MemoryItem>,
+    ) -> Result<(Option<ProgramReturn>, HashMap<String, MemoryItem>), KclError> {
         (self.inner)(
             args,
             self.memory.clone(),

src/wasm-lib/kcl/src/parser/parser_impl.rs

@@ -1542,7 +1542,6 @@ fn fn_call(i: TokenSlice) -> PResult<CallExpression> {
                             // Replace the literal with the tag.
                             args[i] = Value::Identifier(Box::new(tag));
                         }
-                        Value::MemberExpression(_) => {}
                         e => {
                             return Err(ErrMode::Cut(
                                 KclError::Syntax(KclErrorDetails {

src/wasm-lib/kcl/src/std/extrude.rs

@@ -77,15 +77,6 @@ async fn inner_extrude(length: f64, sketch_group_set: SketchGroupSet, args: Args
     let sketch_groups: Vec<Box<SketchGroup>> = sketch_group_set.into();
     let mut extrude_groups = Vec::new();
     for sketch_group in &sketch_groups {
-        // Make sure we exited sketch mode if sketching on a plane.
-        if let SketchSurface::Plane(_) = sketch_group.on {
-            // Disable the sketch mode.
-            // This is necessary for when people don't close the sketch explicitly.
-            // The sketch mode will mess up the extrude direction if still active.
-            args.batch_modeling_cmd(uuid::Uuid::new_v4(), kittycad::types::ModelingCmd::SketchModeDisable {})
-                .await?;
-        }
-
         args.send_modeling_cmd(
             id,
             kittycad::types::ModelingCmd::Extrude {

src/wasm-lib/kcl/src/std/patterns.rs

@@ -207,7 +207,7 @@ async fn make_transform<'a>(
         meta: vec![source_range.into()],
     });
     let transform_fn_args = vec![repetition_num];
-    let transform_fn_return = transform_function.call(transform_fn_args).await?;
+    let transform_fn_return = transform_function.call(transform_fn_args).await?.0;
 
     // Unpack the returned transform object.
     let source_ranges = vec![source_range];

src/wasm-lib/kcl/src/std/sketch.rs

@@ -1,7 +1,5 @@
 //! Functions related to sketching.
 
-use std::collections::HashMap;
-
 use anyhow::Result;
 use derive_docs::stdlib;
 use kittycad::types::{Angle, ModelingCmd, Point3D};
@@ -129,11 +127,6 @@ async fn inner_line_to(
     )
     .await?;
 
-    let mut new_sketch_group = sketch_group.clone();
-    if let Some(tag) = &tag {
-        new_sketch_group.tags.insert(tag.name.to_string(), tag.into());
-    }
-
     let current_path = Path::ToPoint {
         base: BasePath {
             from: from.into(),
@@ -146,6 +139,7 @@ async fn inner_line_to(
         },
     };
 
+    let mut new_sketch_group = sketch_group.clone();
     new_sketch_group.value.push(current_path);
 
     Ok(new_sketch_group)
@@ -297,11 +291,6 @@ async fn inner_line(
     )
     .await?;
 
-    let mut new_sketch_group = sketch_group.clone();
-    if let Some(tag) = &tag {
-        new_sketch_group.tags.insert(tag.name.to_string(), tag.into());
-    }
-
     let current_path = Path::ToPoint {
         base: BasePath {
             from: from.into(),
@@ -314,6 +303,7 @@ async fn inner_line(
         },
     };
 
+    let mut new_sketch_group = sketch_group.clone();
     new_sketch_group.value.push(current_path);
 
     Ok(new_sketch_group)
@@ -465,6 +455,18 @@ async fn inner_angled_line(
 
     let id = uuid::Uuid::new_v4();
 
+    let current_path = Path::ToPoint {
+        base: BasePath {
+            from: from.into(),
+            to,
+            tag,
+            geo_meta: GeoMeta {
+                id,
+                metadata: args.source_range.into(),
+            },
+        },
+    };
+
     args.batch_modeling_cmd(
         id,
         ModelingCmd::ExtendPath {
@@ -482,22 +484,6 @@ async fn inner_angled_line(
     .await?;
 
     let mut new_sketch_group = sketch_group.clone();
-    if let Some(tag) = &tag {
-        new_sketch_group.tags.insert(tag.name.to_string(), tag.into());
-    }
-
-    let current_path = Path::ToPoint {
-        base: BasePath {
-            from: from.into(),
-            to,
-            tag,
-            geo_meta: GeoMeta {
-                id,
-                metadata: args.source_range.into(),
-            },
-        },
-    };
-
     new_sketch_group.value.push(current_path);
     Ok(new_sketch_group)
 }
@@ -1220,7 +1206,7 @@ pub(crate) async fn inner_start_profile_at(
     let current_path = BasePath {
         from: to,
         to,
-        tag: tag.clone(),
+        tag,
         geo_meta: GeoMeta {
             id,
             metadata: args.source_range.into(),
@@ -1233,11 +1219,6 @@ pub(crate) async fn inner_start_profile_at(
         value: vec![],
         start: current_path,
         meta: vec![args.source_range.into()],
-        tags: if let Some(tag) = &tag {
-            HashMap::from([(tag.name.to_string(), tag.into())])
-        } else {
-            Default::default()
-        },
     };
     Ok(Box::new(sketch_group))
 }
@@ -1372,9 +1353,6 @@ pub(crate) async fn inner_close(
     }
 
     let mut new_sketch_group = sketch_group.clone();
-    if let Some(ref tag) = tag {
-        new_sketch_group.tags.insert(tag.name.to_string(), tag.into());
-    }
     new_sketch_group.value.push(Path::ToPoint {
         base: BasePath {
             from: from.into(),
@@ -1483,11 +1461,6 @@ pub(crate) async fn inner_arc(
     )
     .await?;
 
-    let mut new_sketch_group = sketch_group.clone();
-    if let Some(tag) = &tag {
-        new_sketch_group.tags.insert(tag.name.to_string(), tag.into());
-    }
-
     let current_path = Path::ToPoint {
         base: BasePath {
             from: from.into(),
@@ -1500,6 +1473,7 @@ pub(crate) async fn inner_arc(
         },
     };
 
+    let mut new_sketch_group = sketch_group.clone();
     new_sketch_group.value.push(current_path);
 
     Ok(new_sketch_group)
@@ -1593,11 +1567,6 @@ async fn inner_tangential_arc(
 
     let to = [from.x + to[0], from.y + to[1]];
 
-    let mut new_sketch_group = sketch_group.clone();
-    if let Some(tag) = &tag {
-        new_sketch_group.tags.insert(tag.name.to_string(), tag.into());
-    }
-
     let current_path = Path::TangentialArc {
         base: BasePath {
             from: from.into(),
@@ -1610,6 +1579,7 @@ async fn inner_tangential_arc(
         },
     };
 
+    let mut new_sketch_group = sketch_group.clone();
     new_sketch_group.value.push(current_path);
 
     Ok(new_sketch_group)
@@ -1701,11 +1671,6 @@ async fn inner_tangential_arc_to(
     let id = uuid::Uuid::new_v4();
     args.batch_modeling_cmd(id, tan_arc_to(&sketch_group, &delta)).await?;
 
-    let mut new_sketch_group = sketch_group.clone();
-    if let Some(tag) = &tag {
-        new_sketch_group.tags.insert(tag.name.to_string(), tag.into());
-    }
-
     let current_path = Path::TangentialArcTo {
         base: BasePath {
             from: from.into(),
@@ -1720,6 +1685,7 @@ async fn inner_tangential_arc_to(
         ccw: result.ccw > 0,
     };
 
+    let mut new_sketch_group = sketch_group.clone();
     new_sketch_group.value.push(current_path);
 
     Ok(new_sketch_group)
@@ -1806,11 +1772,6 @@ async fn inner_bezier_curve(
     )
     .await?;
 
-    let mut new_sketch_group = sketch_group.clone();
-    if let Some(tag) = &tag {
-        new_sketch_group.tags.insert(tag.name.to_string(), tag.into());
-    }
-
     let current_path = Path::ToPoint {
         base: BasePath {
             from: from.into(),
@@ -1823,6 +1784,7 @@ async fn inner_bezier_curve(
         },
     };
 
+    let mut new_sketch_group = sketch_group.clone();
     new_sketch_group.value.push(current_path);
 
     Ok(new_sketch_group)