fix really dumb bug

* start of scoped tags

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* add the tags to the sketch group context

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* scoped tags

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* update docs

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* fix tests

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* updates

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* updates

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* scoped

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* updates

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* fix;

Signed-off-by: Jess Frazelle <github@jessfraz.com>

---------

Signed-off-by: Jess Frazelle <github@jessfraz.com>

.github/workflows/ci.yml

@@ -138,6 +138,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - uses: actions/download-artifact@v3
+        if: github.event_name == 'schedule'
 
       - name: Copy updated .json files
         if: github.event_name == 'schedule'

README.md

@@ -124,36 +124,20 @@ Before you submit a contribution PR to this repo, please ensure that:
 
 ## Release a new version
 
-1. Bump the versions in the .json files by creating a `Cut release v{x}.{y}.{z}` PR, committing the changes from
+1. Bump the versions by running `./make-realease.sh` while on a fresh pull of main
 
-```bash
+That will create the branch with the updated json files for you.
-VERSION=x.y.z yarn run bump-jsons
-```
-
-Alternatively you can try the experimental `make-release.sh` bash script that will create the branch with the updated json files for you.
 run `./make-release.sh` for a patch update
 run `./make-release.sh "minor"` for minor
 run `./make-release.sh "major"` for major
 
-The PR may serve as a place to discuss the human-readable changelog and extra QA. A quick way of getting PR's merged since the last bump is to [use this PR filter](https://github.com/KittyCAD/modeling-app/pulls?q=is%3Apr+sort%3Aupdated-desc+is%3Amerged+), open up the browser console and paste in the following
+After it runs you should just need to push the push the branch and open a PR (it will suggest a changelog for you too, delete any that are not user facing)
 
-```typescript
+The PR may serve as a place to discuss the human-readable changelog and extra QA. 
-console.log(
-  '- ' +
-    Array.from(
-      document.querySelectorAll('[data-hovercard-type="pull_request"]')
-    ).map((a) => `[${a.innerText}](${a.href})`).join(`
-- `)
-)
-```
-
-grab the md list and delete any that are older than the last bump
 
 2. Merge the PR
 
-3. Create a new release and tag pointing to the bump version commit using semantic versioning `v{x}.{y}.{z}`
+3. Profit (A new Action kicks in at https://github.com/KittyCAD/modeling-app/actions if the PR was correctly named)
-
-4. A new Action kicks in at https://github.com/KittyCAD/modeling-app/actions, uploading artifacts to the release
 
 ## Fuzzing the parser
 

docs/kcl/angleToMatchLengthX.md

@@ -121,6 +121,9 @@ 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: [{
@@ -282,6 +285,9 @@ 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,6 +125,9 @@ 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: [{
@@ -286,6 +289,9 @@ 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,6 +126,9 @@ 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: [{
@@ -287,6 +290,9 @@ 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: [{
@@ -476,6 +482,9 @@ 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,6 +646,9 @@ 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,6 +125,9 @@ 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: [{
@@ -286,6 +289,9 @@ 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: [{
@@ -475,6 +481,9 @@ 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: [{
@@ -636,6 +645,9 @@ 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,6 +133,9 @@ 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,6 +297,9 @@ 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: [{
@@ -483,6 +489,9 @@ 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,6 +653,9 @@ 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,6 +124,9 @@ 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: [{
@@ -285,6 +288,9 @@ 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: [{
@@ -474,6 +480,9 @@ 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: [{
@@ -635,6 +644,9 @@ 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,6 +124,9 @@ 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: [{
@@ -285,6 +288,9 @@ 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: [{
@@ -474,6 +480,9 @@ 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: [{
@@ -635,6 +644,9 @@ 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,6 +135,9 @@ 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: [{
@@ -296,6 +299,9 @@ 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: [{
@@ -485,6 +491,9 @@ 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: [{
@@ -646,6 +655,9 @@ 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,6 +130,9 @@ 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: [{
@@ -291,6 +294,9 @@ 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,6 +486,9 @@ 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: [{
@@ -641,6 +650,9 @@ 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,6 +225,9 @@ 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: [{
@@ -532,6 +535,9 @@ 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,6 +123,9 @@ 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: [{
@@ -410,6 +413,9 @@ 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: [{
@@ -599,6 +605,9 @@ 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: [{
@@ -760,6 +769,9 @@ 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,6 +125,9 @@ 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: [{
@@ -286,6 +289,9 @@ 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,6 +481,9 @@ 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,6 +645,9 @@ 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,6 +150,9 @@ 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: [{
@@ -311,6 +314,9 @@ 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.
@@ -580,6 +586,9 @@ 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,6 +225,9 @@ 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: [{
@@ -524,6 +527,9 @@ 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,6 +215,9 @@ 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,6 +211,9 @@ 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,6 +211,9 @@ 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,6 +213,9 @@ 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,6 +213,9 @@ 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: [{
@@ -512,6 +515,9 @@ 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,6 +136,9 @@ 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: [{
@@ -297,6 +300,9 @@ 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.
@@ -479,6 +485,9 @@ 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: [{
@@ -640,6 +649,9 @@ 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: [{
@@ -821,6 +833,9 @@ 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: [{
@@ -982,6 +997,9 @@ 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,6 +116,9 @@ 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: [{
@@ -277,6 +280,9 @@ 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,6 +116,9 @@ 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: [{
@@ -277,6 +280,9 @@ 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,6 +129,9 @@ 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: [{
@@ -290,6 +293,9 @@ 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: [{
@@ -479,6 +485,9 @@ 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: [{
@@ -640,6 +649,9 @@ 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,6 +116,9 @@ 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: [{
@@ -277,6 +280,9 @@ 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: [{
@@ -466,6 +472,9 @@ 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: [{
@@ -627,6 +636,9 @@ 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,6 +134,9 @@ 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: [{
@@ -295,6 +298,9 @@ 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,6 +217,9 @@ 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,6 +127,9 @@ 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: [{
@@ -288,6 +291,9 @@ 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,6 +215,9 @@ 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,6 +217,9 @@ 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,6 +117,9 @@ 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: [{
@@ -278,6 +281,9 @@ 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,6 +112,9 @@ 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: [{
@@ -273,6 +276,9 @@ 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,6 +111,9 @@ 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: [{
@@ -272,6 +275,9 @@ 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,6 +247,9 @@ 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: [{
@@ -408,6 +411,9 @@ 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: [{
@@ -673,6 +679,9 @@ 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,6 +124,9 @@ 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: [{
@@ -285,6 +288,9 @@ 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,6 +122,9 @@ 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: [{
@@ -283,6 +286,9 @@ 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,6 +123,9 @@ 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: [{
@@ -284,6 +287,9 @@ 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,6 +121,9 @@ 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: [{
@@ -282,6 +285,9 @@ 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,6 +213,9 @@ 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: [{
@@ -512,6 +515,9 @@ 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,6 +195,9 @@ 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: [{
@@ -442,6 +445,9 @@ 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: [{
@@ -603,6 +609,9 @@ 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,6 +142,9 @@ 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: [{
@@ -303,6 +306,9 @@ 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,6 +264,9 @@ 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: [{
@@ -539,6 +542,9 @@ 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,6 +125,9 @@ 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: [{
@@ -286,6 +289,9 @@ 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,6 +481,9 @@ 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,6 +645,9 @@ 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,6 +116,9 @@ 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: [{
@@ -277,6 +280,9 @@ 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: [{
@@ -466,6 +472,9 @@ 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: [{
@@ -627,6 +636,9 @@ 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,6 +74,107 @@ You can nest expressions in parenthesis as well:
 let myMathExpression = 3 + (1 * 2 / (3 - 7))
 ```
 
-Please if you find any issues using any of the above expressions or syntax
+## Tags
+
+Tags are used to give a name (tag) to a specific path.
+
+### 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 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,6 +119,9 @@ 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,6 +283,9 @@ 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: [{
@@ -469,6 +475,9 @@ 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: [{
@@ -630,6 +639,9 @@ 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,6 +119,9 @@ 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,6 +283,9 @@ 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: [{
@@ -469,6 +475,9 @@ 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: [{
@@ -630,6 +639,9 @@ 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,6 +117,9 @@ 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: [{
@@ -278,6 +281,9 @@ 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: [{
@@ -467,6 +473,9 @@ 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: [{
@@ -628,6 +637,9 @@ 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,6 +115,9 @@ 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: [{
@@ -276,6 +279,9 @@ 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: [{
@@ -465,6 +471,9 @@ 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: [{
@@ -626,6 +635,9 @@ 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

@@ -600,7 +600,11 @@ test.describe('Editor tests', () => {
     // TODO: Jess needs to fix this but you have to mod the code to get them to show
     // up, its an annoying codemirror thing.
     await page.locator('.cm-content').click()
-    await page.keyboard.press('End')
+    await page.keyboard.press('ArrowDown')
+    await page.keyboard.press('ArrowDown')
+    await page.keyboard.press('ArrowDown')
+    await page.keyboard.press('ArrowDown')
+    await page.keyboard.press('ArrowDown')
     await page.keyboard.press('Enter')
 
     const foldGutterFoldLine = page.locator('[title="Fold line"]')
@@ -746,12 +750,12 @@ test.describe('Editor tests', () => {
     await page.keyboard.press('ArrowRight')
 
     // error in guter
-    await expect(page.locator('.cm-lint-marker-info')).toBeVisible()
+    await expect(page.locator('.cm-lint-marker-info').first()).toBeVisible()
 
     // error text on hover
     await page.hover('.cm-lint-marker-info')
     await expect(
-      page.getByText('Identifiers must be lowerCamelCase')
+      page.getByText('Identifiers must be lowerCamelCase').first()
     ).toBeVisible()
 
     // select the line that's causing the error and delete it
@@ -856,16 +860,19 @@ test.describe('Editor tests', () => {
     await page.keyboard.press('Enter')
     await page.keyboard.type('const topAng = 42')
     await page.keyboard.press('ArrowLeft')
-    await page.keyboard.press('ArrowRight')
 
     await expect(page.locator('.cm-lint-marker-error')).toBeVisible()
-    await expect(page.locator('.cm-lintRange.cm-lintRange-error')).toBeVisible()
+    await expect(
+      page.locator('.cm-lintRange.cm-lintRange-error').first()
+    ).toBeVisible()
 
     await page.locator('.cm-lintRange.cm-lintRange-error').hover()
-    await expect(page.locator('.cm-diagnosticText')).toBeVisible()
+    await expect(page.locator('.cm-diagnosticText').first()).toBeVisible()
-    await expect(page.getByText('Cannot redefine `topAng`')).toBeVisible()
+    await expect(
+      page.getByText('Cannot redefine `topAng`').first()
+    ).toBeVisible()
 
-    const secondTopAng = await page.getByText('topAng').first()
+    const secondTopAng = page.getByText('topAng').first()
     await secondTopAng?.dblclick()
     await page.keyboard.type('otherAng')
 
@@ -929,7 +936,9 @@ test.describe('Editor tests', () => {
     // error in gutter
     await expect(page.locator('.cm-lint-marker-error').first()).toBeVisible()
     await page.hover('.cm-lint-marker-error:first-child')
-    await expect(page.getByText('Expected 2 arguments, got 3')).toBeVisible()
+    await expect(
+      page.getByText('Expected 2 arguments, got 3').first()
+    ).toBeVisible()
 
     // Make sure there are two diagnostics
     await expect(page.locator('.cm-lint-marker-error')).toHaveCount(2)
@@ -965,22 +974,16 @@ test.describe('Editor tests', () => {
 
     await page.setViewportSize({ width: 1000, height: 500 })
 
-    await u.waitForAuthSkipAppStart()
+    await page.goto('/')
+    await u.waitForPageLoad()
 
-    await u.openDebugPanel()
-    await u.expectCmdLog('[data-message-type="execution-done"]')
-    await u.closeDebugPanel()
-
-    // error in guter
     await expect(page.locator('.cm-lint-marker-error')).toBeVisible()
 
     // error text on hover
     await page.hover('.cm-lint-marker-error')
-    await expect(
+    const searchText =
-      page.getByText(
       'sketch profile must lie entirely on one side of the revolution axis'
-      )
+    await expect(page.getByText(searchText).first()).toBeVisible()
-    ).toBeVisible()
   })
   test.describe('Autocomplete works', () => {
     test('with enter/click to accept the completion', async ({ page }) => {
@@ -1831,7 +1834,6 @@ test.describe('Copilot ghost text', () => {
     // We wanna make sure the code saves.
     await page.waitForTimeout(800)
 
-    await expect(page.locator('.cm-ghostText')).not.toBeVisible()
     await page.waitForTimeout(500)
     await page.keyboard.press('Enter')
     await expect(page.locator('.cm-ghostText').first()).toBeVisible()
@@ -1854,7 +1856,8 @@ test.describe('Copilot ghost text', () => {
 
     await expect(page.locator('.cm-ghostText').first()).not.toBeVisible()
 
-    await expect(page.locator('.cm-content')).toHaveText(``)
+    // TODO when we make codemirror a widget, we can test this.
+    //await expect(page.locator('.cm-content')).toHaveText(``)
   })
 
   test('delete in code rejects the suggestion', async ({ page }) => {
@@ -2921,7 +2924,7 @@ const sketch002 = startSketchOn(launderExtrudeThroughVar, seg02)
     await expect(page.getByTestId('hover-highlight').first()).not.toBeVisible()
 
     await page.mouse.move(flatExtrusionFace[0], flatExtrusionFace[1])
-    await expect(page.getByTestId('hover-highlight')).toHaveCount(19) // multiple lines
+    await expect(page.getByTestId('hover-highlight')).toHaveCount(5) // multiple lines
     await page.mouse.move(nothing[0], nothing[1])
     await page.waitForTimeout(100)
     await expect(page.getByTestId('hover-highlight').first()).not.toBeVisible()
@@ -3061,7 +3064,7 @@ const part001 = startSketchOn('XZ')
       await page.mouse.move(pos[0], pos[1], { steps: 5 })
       await expect(page.getByTestId('hover-highlight').first()).toBeVisible()
       await expect(page.getByTestId('hover-highlight').first()).toHaveText(
-        removeAfterFirstParenthesis(expectedCode)
+        expectedCode
       )
       // hover over segment, click it and check the cursor has move to the right place
       await page.mouse.click(pos[0], pos[1])
@@ -3703,9 +3706,7 @@ test.describe('Regression tests', () => {
     // Make sure it's not a link
     await expect(zooLogo).not.toHaveAttribute('href')
   })
-  test.fixme(
+  test('Position _ Is Out Of Range... regression test', async ({ page }) => {
-    'Position _ Is Out Of Range... regression test',
-    async ({ page }) => {
     const u = await getUtils(page)
     // const PUR = 400 / 37.5 //pixeltoUnitRatio
     await page.setViewportSize({ width: 1200, height: 500 })
@@ -3724,10 +3725,16 @@ test.describe('Regression tests', () => {
       )
     })
 
-      await u.waitForAuthSkipAppStart()
+    await page.goto('/')
+    await u.waitForPageLoad()
 
     // error in guter
     await expect(page.locator('.cm-lint-marker-error')).toBeVisible()
+    await page.waitForTimeout(200)
+    // expect it still to be there (sometimes it just clears for a bit?)
+    await expect(page.locator('.cm-lint-marker-error')).toBeVisible({
+      timeout: 10_000,
+    })
 
     // error text on hover
     await page.hover('.cm-lint-marker-error')
@@ -3745,6 +3752,8 @@ test.describe('Regression tests', () => {
     await page.keyboard.press('ArrowUp')
     await page.keyboard.press('ArrowUp')
     await page.keyboard.press('ArrowUp')
+    await page.keyboard.press('ArrowUp')
+    await page.keyboard.press('End')
     await page.keyboard.up('Shift')
     await page.keyboard.press('Backspace')
     await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
@@ -3753,9 +3762,10 @@ test.describe('Regression tests', () => {
     await page.keyboard.press('Enter')
     await page.keyboard.type('thing: "blah"', { delay: 100 })
     await page.keyboard.press('Enter')
+    await page.keyboard.press('ArrowLeft')
 
     await expect(page.locator('.cm-content'))
-        .toHaveText(`const exampleSketch = startSketchOn("XZ")
+      .toContainText(`const exampleSketch = startSketchOn("XZ")
     |> startProfileAt([0, 0], %)
     |> angledLine({ angle: 50, length: 45 }, %)
     |> yLineTo(0, %)
@@ -3764,8 +3774,7 @@ test.describe('Regression tests', () => {
     thing: "blah"`)
 
     await expect(page.locator('.cm-lint-marker-error')).toBeVisible()
-    }
+  })
-  )
 })
 
 test.describe('Sketch tests', () => {
@@ -3856,6 +3865,31 @@ test.describe('Sketch tests', () => {
       page.getByRole('button', { name: 'Edit Sketch' })
     ).toBeVisible()
   })
+  test('Can exit selection of face', async ({ page }) => {
+    // Load the app with the code panes
+    await page.addInitScript(async () => {
+      localStorage.setItem('persistCode', ``)
+    })
+
+    const u = await getUtils(page)
+    await page.setViewportSize({ width: 1200, height: 500 })
+
+    await u.waitForAuthSkipAppStart()
+
+    await page.getByRole('button', { name: 'Start Sketch' }).click()
+    await expect(
+      page.getByRole('button', { name: 'Exit Sketch' })
+    ).toBeVisible()
+
+    await expect(
+      page.getByText('click plane or face to sketch on')
+    ).toBeVisible()
+
+    await page.keyboard.press('Escape')
+    await expect(
+      page.getByRole('button', { name: 'Start Sketch' })
+    ).toBeVisible()
+  })
   test.describe('Can edit segments by dragging their handles', () => {
     const doEditSegmentsByDraggingHandle = async (
       page: Page,
@@ -7100,6 +7134,40 @@ 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

@@ -232,6 +232,7 @@ export async function getUtils(page: Page) {
 
   return {
     waitForAuthSkipAppStart: () => waitForAuthAndLsp(page),
+    waitForPageLoad: () => waitForPageLoad(page),
     removeCurrentCode: () => removeCurrentCode(page),
     sendCustomCmd: (cmd: EngineCommand) => sendCustomCmd(page, cmd),
     updateCamPosition: async (xyz: [number, number, number]) => {

package.json

@@ -1,14 +1,15 @@
 {
   "name": "untitled-app",
-  "version": "0.23.0",
+  "version": "0.23.1",
   "private": true,
   "dependencies": {
-    "@codemirror/autocomplete": "^6.16.3",
+    "@codemirror/autocomplete": "^6.17.0",
     "@codemirror/commands": "^6.6.0",
     "@codemirror/language": "^6.10.2",
     "@codemirror/lint": "^6.8.1",
     "@codemirror/search": "^6.5.6",
     "@codemirror/state": "^6.4.1",
+    "@codemirror/theme-one-dark": "^6.1.2",
     "@csstools/postcss-oklab-function": "^3.0.16",
     "@fortawesome/fontawesome-svg-core": "^6.5.2",
     "@fortawesome/free-brands-svg-icons": "^6.5.2",
@@ -19,23 +20,22 @@
     "@kittycad/lib": "^0.0.69",
     "@react-hook/resize-observer": "^2.0.1",
     "@replit/codemirror-interact": "^6.3.1",
-    "@tauri-apps/api": "2.0.0-beta.12",
+    "@tauri-apps/api": "^2.0.0-beta.14",
-    "@tauri-apps/plugin-dialog": "^2.0.0-beta.2",
+    "@tauri-apps/plugin-dialog": "^2.0.0-beta.6",
-    "@tauri-apps/plugin-fs": "^2.0.0-beta.5",
+    "@tauri-apps/plugin-fs": "^2.0.0-beta.6",
-    "@tauri-apps/plugin-http": "^2.0.0-beta.2",
+    "@tauri-apps/plugin-http": "^2.0.0-beta.7",
-    "@tauri-apps/plugin-os": "^2.0.0-beta.3",
+    "@tauri-apps/plugin-os": "^2.0.0-beta.6",
-    "@tauri-apps/plugin-process": "^2.0.0-beta.2",
+    "@tauri-apps/plugin-process": "^2.0.0-beta.6",
-    "@tauri-apps/plugin-shell": "^2.0.0-beta.2",
+    "@tauri-apps/plugin-shell": "^2.0.0-beta.7",
-    "@tauri-apps/plugin-updater": "^2.0.0-beta.3",
+    "@tauri-apps/plugin-updater": "^2.0.0-beta.6",
     "@ts-stack/markdown": "^1.5.0",
     "@tweenjs/tween.js": "^23.1.1",
-    "@uiw/react-codemirror": "^4.21.25",
     "@xstate/inspect": "^0.8.0",
     "@xstate/react": "^3.2.2",
     "codemirror": "^6.0.1",
     "decamelize": "^6.0.0",
     "fuse.js": "^7.0.0",
-    "html2canvas-pro": "^1.5.1",
+    "html2canvas-pro": "^1.5.2",
     "json-rpc-2.0": "^1.6.0",
     "jszip": "^3.10.1",
     "re-resizable": "^6.9.11",

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

@@ -1,10 +1,7 @@
-import { autocompletion } from '@codemirror/autocomplete'
+import { foldService } from '@codemirror/language'
-import { foldService, syntaxTree } from '@codemirror/language'
 import { Extension, EditorState } from '@codemirror/state'
 import { ViewPlugin } from '@codemirror/view'
 
-import { CompletionTriggerKind } from 'vscode-languageserver-protocol'
-
 import {
   docPathFacet,
   LanguageServerPlugin,
@@ -13,7 +10,6 @@ import {
   workspaceFolders,
   LanguageServerOptions,
 } from './plugin/lsp'
-import { offsetToPos } from './plugin/util'
 
 export type { LanguageServerClientOptions } from './client'
 export { LanguageServerClient } from './client'
@@ -24,14 +20,15 @@ export {
   LspWorkerEventType,
 } from './client/codec'
 export type { LanguageServerOptions } from './plugin/lsp'
-export type { TransactionInfo, RelevantUpdate } from './plugin/annotations'
-export { updateInfo, TransactionAnnotation } from './plugin/annotations'
 export {
   LanguageServerPlugin,
   LanguageServerPluginSpec,
   docPathFacet,
   languageId,
   workspaceFolders,
+  lspSemanticTokensEvent,
+  lspDiagnosticsEvent,
+  lspFormatCodeEvent,
 } from './plugin/lsp'
 export { posToOffset, offsetToPos } from './plugin/util'
 
@@ -51,63 +48,10 @@ export function lspPlugin(options: LanguageServerOptions): Extension {
       if (plugin == null) return null
       // Get the folding ranges from the language server.
       // Since this is async we directly need to update the folding ranges after.
-      return plugin?.foldingRange(lineStart, lineEnd)
+      const range = plugin?.foldingRange(lineStart, lineEnd)
+      return range
     }),
   ]
 
-  if (options.client.getServerCapabilities().completionProvider) {
-    ext.push(
-      autocompletion({
-        defaultKeymap: false,
-        override: [
-          async (context) => {
-            if (plugin === null) {
-              return null
-            }
-
-            const { state, pos, explicit } = context
-
-            let nodeBefore = syntaxTree(state).resolveInner(pos, -1)
-            if (
-              nodeBefore.name === 'BlockComment' ||
-              nodeBefore.name === 'LineComment'
-            )
-              return null
-
-            const line = state.doc.lineAt(pos)
-            let trigKind: CompletionTriggerKind = CompletionTriggerKind.Invoked
-            let trigChar: string | undefined
-            if (
-              !explicit &&
-              plugin.client
-                .getServerCapabilities()
-                .completionProvider?.triggerCharacters?.includes(
-                  line.text[pos - line.from - 1]
-                )
-            ) {
-              trigKind = CompletionTriggerKind.TriggerCharacter
-              trigChar = line.text[pos - line.from - 1]
-            }
-            if (
-              trigKind === CompletionTriggerKind.Invoked &&
-              !context.matchBefore(/\w+$/)
-            ) {
-              return null
-            }
-
-            return await plugin.requestCompletion(
-              context,
-              offsetToPos(state.doc, pos),
-              {
-                triggerKind: trigKind,
-                triggerCharacter: trigChar,
-              }
-            )
-          },
-        ],
-      })
-    )
-  }
-
   return ext
 }

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

@@ -1,131 +0,0 @@
-import { hasNextSnippetField, pickedCompletion } from '@codemirror/autocomplete'
-import { Annotation, Transaction } from '@codemirror/state'
-import type { ViewUpdate } from '@codemirror/view'
-
-export enum LspAnnotation {
-  SemanticTokens = 'semantic-tokens',
-  FormatCode = 'format-code',
-  Diagnostics = 'diagnostics',
-}
-
-const lspEvent = Annotation.define<LspAnnotation>()
-export const lspSemanticTokensEvent = lspEvent.of(LspAnnotation.SemanticTokens)
-export const lspFormatCodeEvent = lspEvent.of(LspAnnotation.FormatCode)
-export const lspDiagnosticsEvent = lspEvent.of(LspAnnotation.Diagnostics)
-
-export enum TransactionAnnotation {
-  Remote = 'remote',
-  UserSelect = 'user.select',
-  UserInput = 'user.input',
-  UserMove = 'user.move',
-  UserDelete = 'user.delete',
-  UserUndo = 'user.undo',
-  UserRedo = 'user.redo',
-
-  SemanticTokens = 'SemanticTokens',
-  FormatCode = 'FormatCode',
-  Diagnostics = 'Diagnostics',
-
-  PickedCompletion = 'PickedCompletion',
-}
-
-export interface TransactionInfo {
-  annotations: TransactionAnnotation[]
-  time: number | null
-  docChanged: boolean
-  addToHistory: boolean
-  inSnippet: boolean
-  transaction: Transaction
-}
-
-export const updateInfo = (update: ViewUpdate): TransactionInfo[] => {
-  let transactionInfos: TransactionInfo[] = []
-
-  for (const tr of update.transactions) {
-    let annotations: TransactionAnnotation[] = []
-
-    if (tr.isUserEvent('select')) {
-      annotations.push(TransactionAnnotation.UserSelect)
-    }
-
-    if (tr.isUserEvent('input')) {
-      annotations.push(TransactionAnnotation.UserInput)
-    }
-    if (tr.isUserEvent('delete')) {
-      annotations.push(TransactionAnnotation.UserDelete)
-    }
-    if (tr.isUserEvent('undo')) {
-      annotations.push(TransactionAnnotation.UserUndo)
-    }
-    if (tr.isUserEvent('redo')) {
-      annotations.push(TransactionAnnotation.UserRedo)
-    }
-    if (tr.isUserEvent('move')) {
-      annotations.push(TransactionAnnotation.UserMove)
-    }
-
-    if (tr.annotation(pickedCompletion) !== undefined) {
-      annotations.push(TransactionAnnotation.PickedCompletion)
-    }
-
-    if (tr.annotation(lspSemanticTokensEvent.type) !== undefined) {
-      annotations.push(TransactionAnnotation.SemanticTokens)
-    }
-
-    if (tr.annotation(lspFormatCodeEvent.type) !== undefined) {
-      annotations.push(TransactionAnnotation.FormatCode)
-    }
-
-    if (tr.annotation(lspDiagnosticsEvent.type) !== undefined) {
-      annotations.push(TransactionAnnotation.Diagnostics)
-    }
-
-    if (tr.annotation(Transaction.remote) !== undefined) {
-      annotations.push(TransactionAnnotation.Remote)
-    }
-
-    transactionInfos.push({
-      annotations,
-      time: tr.annotation(Transaction.time) || null,
-      docChanged: tr.docChanged,
-      addToHistory: tr.annotation(Transaction.addToHistory) || false,
-      inSnippet: hasNextSnippetField(update.state),
-      transaction: tr,
-    })
-  }
-
-  return transactionInfos
-}
-
-export interface RelevantUpdate {
-  overall: boolean
-  userSelect: boolean
-  time: number | null
-}
-
-export const relevantUpdate = (update: ViewUpdate): RelevantUpdate => {
-  const infos = updateInfo(update)
-  // Make sure we are not in a snippet
-  if (infos.some((info) => info.inSnippet)) {
-    return {
-      overall: false,
-      userSelect: false,
-      time: null,
-    }
-  }
-  return {
-    overall: infos.some(
-      (info) =>
-        info.docChanged ||
-        info.annotations.includes(TransactionAnnotation.UserInput) ||
-        info.annotations.includes(TransactionAnnotation.UserDelete) ||
-        info.annotations.includes(TransactionAnnotation.UserUndo) ||
-        info.annotations.includes(TransactionAnnotation.UserRedo) ||
-        info.annotations.includes(TransactionAnnotation.UserMove)
-    ),
-    userSelect: infos.some((info) =>
-      info.annotations.includes(TransactionAnnotation.UserSelect)
-    ),
-    time: infos.length ? infos[0].time : null,
-  }
-}

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

@@ -1,5 +1,6 @@
 import {
   acceptCompletion,
+  autocompletion,
   clearSnippet,
   closeCompletion,
   hasNextSnippetField,
@@ -8,10 +9,17 @@ import {
   prevSnippetField,
   startCompletion,
 } from '@codemirror/autocomplete'
-import { Prec } from '@codemirror/state'
+import { Prec, Extension } from '@codemirror/state'
-import { EditorView, keymap, KeyBinding } from '@codemirror/view'
+import { EditorView, keymap, KeyBinding, ViewPlugin } from '@codemirror/view'
 
-import { CompletionItemKind } from 'vscode-languageserver-protocol'
+import {
+  CompletionItemKind,
+  CompletionTriggerKind,
+} from 'vscode-languageserver-protocol'
+
+import { LanguageServerPlugin } from './lsp'
+import { offsetToPos } from './util'
+import { syntaxTree } from '@codemirror/language'
 
 export const CompletionItemKindMap = Object.fromEntries(
   Object.entries(CompletionItemKind).map(([key, value]) => [value, key])
@@ -46,6 +54,59 @@ const lspAutocompleteKeymap: readonly KeyBinding[] = [
   },
 ]
 
-export const lspAutocompleteKeymapExt = Prec.highest(
+const lspAutocompleteKeymapExt = Prec.highest(keymap.of(lspAutocompleteKeymap))
-  keymap.computeN([], () => [lspAutocompleteKeymap])
+
-)
+export default function lspAutocompleteExt(
+  plugin: ViewPlugin<LanguageServerPlugin>
+): Extension {
+  return [
+    lspAutocompleteKeymapExt,
+    autocompletion({
+      defaultKeymap: false,
+      override: [
+        async (context) => {
+          const { state, pos, explicit, view } = context
+          let value = view?.plugin(plugin)
+          if (!value) return null
+
+          let nodeBefore = syntaxTree(state).resolveInner(pos, -1)
+          if (
+            nodeBefore.name === 'BlockComment' ||
+            nodeBefore.name === 'LineComment'
+          )
+            return null
+
+          const line = state.doc.lineAt(pos)
+          let trigKind: CompletionTriggerKind = CompletionTriggerKind.Invoked
+          let trigChar: string | undefined
+          if (
+            !explicit &&
+            value.client
+              .getServerCapabilities()
+              .completionProvider?.triggerCharacters?.includes(
+                line.text[pos - line.from - 1]
+              )
+          ) {
+            trigKind = CompletionTriggerKind.TriggerCharacter
+            trigChar = line.text[pos - line.from - 1]
+          }
+          if (
+            trigKind === CompletionTriggerKind.Invoked &&
+            !context.matchBefore(/\w+$/)
+          ) {
+            return null
+          }
+
+          return await value.requestCompletion(
+            context,
+            offsetToPos(state.doc, pos),
+            {
+              triggerKind: trigKind,
+              triggerCharacter: trigChar,
+            }
+          )
+        },
+      ],
+    }),
+  ]
+}

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

@@ -4,7 +4,13 @@ import type {
   CompletionResult,
 } from '@codemirror/autocomplete'
 import { completeFromList, snippetCompletion } from '@codemirror/autocomplete'
-import { Facet, StateEffect, Extension, Transaction } from '@codemirror/state'
+import {
+  Facet,
+  StateEffect,
+  Extension,
+  Transaction,
+  Annotation,
+} from '@codemirror/state'
 import type {
   ViewUpdate,
   PluginValue,
@@ -22,15 +28,10 @@ import {
 import { URI } from 'vscode-uri'
 
 import { LanguageServerClient } from '../client'
-import {
-  lspSemanticTokensEvent,
-  lspFormatCodeEvent,
-  relevantUpdate,
-} from './annotations'
 import { CompletionItemKindMap } from './autocomplete'
 import { addToken, SemanticToken } from './semantic-tokens'
 import { deferExecution, posToOffset, formatMarkdownContents } from './util'
-import { lspAutocompleteKeymapExt } from './autocomplete'
+import lspAutocompleteExt from './autocomplete'
 import lspHoverExt from './hover'
 import lspFormatExt from './format'
 import lspIndentExt from './indent'
@@ -47,6 +48,17 @@ export const workspaceFolders = Facet.define<
   LSP.WorkspaceFolder[]
 >({ combine: useLast })
 
+export enum LspAnnotation {
+  SemanticTokens = 'semantic-tokens',
+  FormatCode = 'format-code',
+  Diagnostics = 'diagnostics',
+}
+
+const lspEvent = Annotation.define<LspAnnotation>()
+export const lspSemanticTokensEvent = lspEvent.of(LspAnnotation.SemanticTokens)
+export const lspFormatCodeEvent = lspEvent.of(LspAnnotation.FormatCode)
+export const lspDiagnosticsEvent = lspEvent.of(LspAnnotation.Diagnostics)
+
 export interface LanguageServerOptions {
   // We assume this is the main project directory, we are currently working in.
   workspaceFolders: LSP.WorkspaceFolder[]
@@ -131,11 +143,6 @@ export class LanguageServerPlugin implements PluginValue {
   }
 
   update(viewUpdate: ViewUpdate) {
-    const isRelevant = relevantUpdate(viewUpdate)
-    if (!isRelevant.overall) {
-      return
-    }
-
     // If the doc didn't change we can return early.
     if (!viewUpdate.docChanged) {
       return
@@ -284,20 +291,17 @@ export class LanguageServerPlugin implements PluginValue {
       },
     })
 
-    if (!result) return null
+    if (!result || !result.length) return null
 
-    for (let i = 0; i < result.length; i++) {
-      const { range, newText } = result[i]
     this.view.dispatch({
-        changes: {
+      changes: result.map(({ range, newText }) => ({
         from: posToOffset(this.view.state.doc, range.start)!,
         to: posToOffset(this.view.state.doc, range.end)!,
         insert: newText,
-        },
+      })),
-        annotations: [lspFormatCodeEvent, Transaction.addToHistory.of(true)],
+      annotations: lspFormatCodeEvent,
     })
   }
-  }
 
   async requestCompletion(
     context: CompletionContext,
@@ -552,7 +556,7 @@ export class LanguageServerPluginSpec
 {
   provide(plugin: ViewPlugin<LanguageServerPlugin>): Extension {
     return [
-      lspAutocompleteKeymapExt,
+      lspAutocompleteExt(plugin),
       lspFormatExt(plugin),
       lspHoverExt(plugin),
       lspIndentExt(),

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

@@ -4,7 +4,7 @@ import { EditorView, Decoration, DecorationSet } from '@codemirror/view'
 
 import { Tag, tags } from '@lezer/highlight'
 
-import { lspSemanticTokensEvent } from './annotations'
+import { lspSemanticTokensEvent } from './lsp'
 
 export interface SemanticToken {
   from: number

src-tauri/Cargo.toml

@@ -11,27 +11,27 @@ rust-version = "1.70"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = { version = "2.0.0-beta.13", features = [] }
+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.5"
+kittycad = "0.3.7"
 log = "0.4.21"
 oauth2 = "4.4.2"
 serde_json = "1.0"
-tauri = { version = "2.0.0-beta.15", features = [ "devtools", "unstable"] }
+tauri = { version = "2.0.0-beta.23", features = [ "devtools", "unstable"] }
-tauri-plugin-cli = { version = "2.0.0-beta.3" }
+tauri-plugin-cli = { version = "2.0.0-beta.7" }
-tauri-plugin-deep-link = { version = "2.0.0-beta.3" }
+tauri-plugin-deep-link = { version = "2.0.0-beta.8" }
 tauri-plugin-dialog = { version = "2.0.0-beta.6" }
-tauri-plugin-fs = { version = "2.0.0-beta.9" }
+tauri-plugin-fs = { version = "2.0.0-beta.10" }
-tauri-plugin-http = { version = "2.0.0-beta.6" }
+tauri-plugin-http = { version = "2.0.0-beta.11" }
-tauri-plugin-log = { version = "2.0.0-beta.4" }
+tauri-plugin-log = { version = "2.0.0-beta.7" }
-tauri-plugin-os = { version = "2.0.0-beta.2" }
+tauri-plugin-os = { version = "2.0.0-beta.7" }
-tauri-plugin-persisted-scope = { version = "2.0.0-beta.7" }
+tauri-plugin-persisted-scope = { version = "2.0.0-beta.10" }
-tauri-plugin-process = { version = "2.0.0-beta.2" }
+tauri-plugin-process = { version = "2.0.0-beta.7" }
-tauri-plugin-shell = { version = "2.0.0-beta.2" }
+tauri-plugin-shell = { version = "2.0.0-beta.8" }
-tauri-plugin-updater = { version = "2.0.0-beta.4" }
+tauri-plugin-updater = { version = "2.0.0-beta.9" }
 tokio = { version = "1.37.0", features = ["time", "fs", "process"] }
 toml = "0.8.2"
 url = "2.5.0"

src-tauri/tauri.conf.json

@@ -63,16 +63,22 @@
       "subcommands": {}
     },
     "deep-link": {
-      "domains": [
+      "mobile": [
         {
           "host": "app.zoo.dev"
         }
+      ],
+      "desktop": {
+        "schemes": [
+          "zoo",
+          "zoo-modeling-app"
         ]
+      }
     },
     "shell": {
       "open": true
     }
   },
   "productName": "Zoo Modeling App",
-  "version": "0.23.0"
+  "version": "0.23.1"
 }

src/App.tsx

@@ -25,7 +25,7 @@ import ModalContainer from 'react-modal-promise'
 import useHotkeyWrapper from 'lib/hotkeyWrapper'
 import Gizmo from 'components/Gizmo'
 import { CoreDumpManager } from 'lib/coredump'
-import { useAppState } from 'AppState'
+import { UnitsMenu } from 'components/UnitsMenu'
 
 export function App() {
   useRefreshSettings(paths.FILE + 'SETTINGS')
@@ -45,17 +45,12 @@ export function App() {
 
   useHotKeyListener()
   const { context } = useModelingContext()
-  const { setAppState } = useAppState()
-
-  useEffect(() => {
-    setAppState({ htmlRef: ref })
-  }, [ref])
 
   const { auth, settings } = useSettingsAuthContext()
   const token = auth?.context?.token
 
   const coreDumpManager = useMemo(
-    () => new CoreDumpManager(engineCommandManager, ref, token),
+    () => new CoreDumpManager(engineCommandManager, token),
     []
   )
 
@@ -133,6 +128,7 @@ export function App() {
       <Stream />
       {/* <CamToggle /> */}
       <LowerRightControls coreDumpManager={coreDumpManager}>
+        <UnitsMenu />
         <Gizmo />
       </LowerRightControls>
     </div>

src/AppState.tsx

@@ -10,12 +10,10 @@ Please do not fill this up with junk.
 
 interface AppState {
   isStreamReady: boolean
-  htmlRef: React.RefObject<HTMLDivElement> | null
   setAppState: (newAppState: Partial<AppState>) => void
 }
 
 const AppStateContext = createContext<AppState>({
-  htmlRef: null,
   isStreamReady: false,
   setAppState: () => {},
 })
@@ -24,7 +22,6 @@ export const useAppState = () => useContext(AppStateContext)
 
 export const AppStateProvider = ({ children }: { children: ReactNode }) => {
   const [appState, _setAppState] = useState<AppState>({
-    htmlRef: null,
     isStreamReady: false,
     setAppState: () => {},
   })
@@ -34,7 +31,6 @@ export const AppStateProvider = ({ children }: { children: ReactNode }) => {
   return (
     <AppStateContext.Provider
       value={{
-        htmlRef: appState.htmlRef,
         isStreamReady: appState.isStreamReady,
         setAppState,
       }}

src/Router.tsx

@@ -40,7 +40,7 @@ import useHotkeyWrapper from 'lib/hotkeyWrapper'
 import toast from 'react-hot-toast'
 import { coreDump } from 'lang/wasm'
 import { useMemo } from 'react'
-import { AppStateProvider, useAppState } from 'AppState'
+import { AppStateProvider } from 'AppState'
 
 const router = createBrowserRouter([
   {
@@ -180,9 +180,8 @@ export const Router = () => {
 function CoreDump() {
   const { auth } = useSettingsAuthContext()
   const token = auth?.context?.token
-  const { htmlRef } = useAppState()
   const coreDumpManager = useMemo(
-    () => new CoreDumpManager(engineCommandManager, htmlRef, token),
+    () => new CoreDumpManager(engineCommandManager, token),
     []
   )
   useHotkeyWrapper(['meta + shift + .'], () => {

src/Toolbar.tsx

@@ -12,6 +12,10 @@ import { ActionButtonDropdown } from 'components/ActionButtonDropdown'
 import { useHotkeys } from 'react-hotkeys-hook'
 import Tooltip from 'components/Tooltip'
 import { useAppState } from 'AppState'
+import {
+  canRectangleTool,
+  isEditingExistingSketch,
+} from 'machines/modelingMachine'
 
 export function Toolbar({
   className = '',
@@ -46,29 +50,48 @@ export function Toolbar({
     isExecuting ||
     !isStreamReady
 
+  const disableLineButton =
+    state.matches('Sketch.Rectangle tool.Awaiting second corner') ||
+    disableAllButtons
   useHotkeys(
     'l',
     () =>
       state.matches('Sketch.Line tool')
         ? send('CancelSketch')
-        : send('Equip Line tool'),
+        : send({
-    { enabled: !disableAllButtons, scopes: ['sketch'] }
+            type: 'change tool',
+            data: 'line',
+          }),
+    { enabled: !disableLineButton, scopes: ['sketch'] }
   )
+  const disableTangentialArc =
+    (!isEditingExistingSketch(context) &&
+      !state.matches('Sketch.Tangential arc to')) ||
+    disableAllButtons
   useHotkeys(
     'a',
     () =>
       state.matches('Sketch.Tangential arc to')
         ? send('CancelSketch')
-        : send('Equip tangential arc to'),
+        : send({
-    { enabled: !disableAllButtons, scopes: ['sketch'] }
+            type: 'change tool',
+            data: 'tangentialArc',
+          }),
+    { enabled: !disableTangentialArc, scopes: ['sketch'] }
   )
+  const disableRectangle =
+    (!canRectangleTool(context) && !state.matches('Sketch.Rectangle tool')) ||
+    disableAllButtons
   useHotkeys(
     'r',
     () =>
       state.matches('Sketch.Rectangle tool')
         ? send('CancelSketch')
-        : send('Equip rectangle tool'),
+        : send({
-    { enabled: !disableAllButtons, scopes: ['sketch'] }
+            type: 'change tool',
+            data: 'rectangle',
+          }),
+    { enabled: !disableRectangle, scopes: ['sketch'] }
   )
   useHotkeys(
     's',
@@ -81,7 +104,7 @@ export function Toolbar({
   useHotkeys(
     'esc',
     () =>
-      state.matches('Sketch.SketchIdle')
+      ['Sketch no face', 'Sketch.SketchIdle'].some(state.matches)
         ? send('Cancel')
         : send('CancelSketch'),
     { enabled: !disableAllButtons, scopes: ['sketch'] }
@@ -224,6 +247,11 @@ export function Toolbar({
             </ActionButton>
           </li>
         )}
+        {state.matches('Sketch no face') && (
+          <li className="contents">
+            <div className="mx-2 text-sm">click plane or face to sketch on</div>
+          </li>
+        )}
         {state.matches('Sketch') && !state.matches('idle') && (
           <>
             <li className="contents" key="line-button">
@@ -233,7 +261,10 @@ export function Toolbar({
                 onClick={() =>
                   state?.matches('Sketch.Line tool')
                     ? send('CancelSketch')
-                    : send('Equip Line tool')
+                    : send({
+                        type: 'change tool',
+                        data: 'line',
+                      })
                 }
                 aria-pressed={state?.matches('Sketch.Line tool')}
                 iconStart={{
@@ -241,7 +272,7 @@ export function Toolbar({
                   iconClassName,
                   bgClassName,
                 }}
-                disabled={disableAllButtons}
+                disabled={disableLineButton}
               >
                 Line
                 <Tooltip
@@ -260,7 +291,10 @@ export function Toolbar({
                 onClick={() =>
                   state.matches('Sketch.Tangential arc to')
                     ? send('CancelSketch')
-                    : send('Equip tangential arc to')
+                    : send({
+                        type: 'change tool',
+                        data: 'tangentialArc',
+                      })
                 }
                 aria-pressed={state.matches('Sketch.Tangential arc to')}
                 iconStart={{
@@ -268,11 +302,7 @@ export function Toolbar({
                   iconClassName,
                   bgClassName,
                 }}
-                disabled={
+                disabled={disableTangentialArc}
-                  (!state.can('Equip tangential arc to') &&
-                    !state.matches('Sketch.Tangential arc to')) ||
-                  disableAllButtons
-                }
               >
                 Tangential Arc
                 <Tooltip
@@ -291,7 +321,10 @@ export function Toolbar({
                 onClick={() =>
                   state.matches('Sketch.Rectangle tool')
                     ? send('CancelSketch')
-                    : send('Equip rectangle tool')
+                    : send({
+                        type: 'change tool',
+                        data: 'rectangle',
+                      })
                 }
                 aria-pressed={state.matches('Sketch.Rectangle tool')}
                 iconStart={{
@@ -299,13 +332,9 @@ export function Toolbar({
                   iconClassName,
                   bgClassName,
                 }}
-                disabled={
+                disabled={disableRectangle}
-                  (!state.can('Equip rectangle tool') &&
-                    !state.matches('Sketch.Rectangle tool')) ||
-                  disableAllButtons
-                }
                 title={
-                  state.can('Equip rectangle tool')
+                  canRectangleTool(context)
                     ? 'Rectangle'
                     : 'Can only be used when a sketch is empty currently'
                 }

src/clientSideScene/ClientSideSceneComp.tsx

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

src/clientSideScene/sceneCallbacks.ts

@@ -0,0 +1,362 @@
+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,12 +22,8 @@ import {
 import {
   ARROWHEAD,
   AXIS_GROUP,
-  DEFAULT_PLANES,
-  DefaultPlane,
-  defaultPlaneColor,
   getSceneScale,
   INTERSECTION_PLANE_LAYER,
-  OnMouseEnterLeaveArgs,
   RAYCASTABLE_PLANE,
   SKETCH_GROUP_SEGMENTS,
   SKETCH_LAYER,
@@ -82,16 +78,16 @@ import {
   createPipeSubstitution,
   findUniqueName,
 } from 'lang/modifyAst'
-import {
+import { Selections, sendSelectEventToEngine } from 'lib/selections'
-  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 } from 'machines/modelingMachine'
+import {
+  SegmentOverlayPayload,
+  SketchDetails,
+  ModelingMachineContext,
+} from 'machines/modelingMachine'
 import {
   ArtifactMapCommand,
   EngineCommandManager,
@@ -102,6 +98,7 @@ import {
 } from 'lib/rectangleTool'
 import { getThemeColorForThreeJs } from 'lib/theme'
 import { err, trap } from 'lib/trap'
+import { OnMouseEnterLeaveArgs, idleCallbacks } from './sceneCallbacks'
 
 type DraftSegment = 'line' | 'tangentialArcTo'
 
@@ -499,31 +496,23 @@ export class SceneEntities {
       variableDeclarationName,
     }
   }
-  updateAstAndRejigSketch = async (
+  updateAstAndRejigSketch: (
-    sketchPathToNode: PathToNode,
     modifiedAst: Program | Error,
-    forward: [number, number, number],
+    context: ModelingMachineContext
-    up: [number, number, number],
+  ) => Promise<any> = async (modifiedAst, context) => {
-    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,
+      sketchPathToNode: context.sketchDetails?.sketchPathToNode || [],
-      forward,
+      forward: context.sketchDetails?.zAxis || [0, 0, 1],
-      up,
+      up: context.sketchDetails?.yAxis || [0, 1, 0],
-      position: origin,
+      position: context.sketchDetails?.origin || [0, 0, 0],
       maybeModdedAst: nextAst.newAst,
     })
-    this.setupSketchIdleCallbacks({
+    this.setupSketchIdleCallbacks(context)
-      forward,
-      up,
-      position: origin,
-      pathToNode: sketchPathToNode,
-    })
     return nextAst
   }
   setUpDraftSegment = async (
@@ -804,7 +793,7 @@ export class SceneEntities {
 
           // Update the primary AST and unequip the rectangle tool
           await kclManager.executeAstMock(_ast)
-          sceneInfra.modelingSend({ type: 'CancelSketch' })
+          sceneInfra.modelingSend({ type: 'Finish rectangle' })
 
           const { programMemory } = await executeAst({
             ast: _ast,
@@ -838,128 +827,8 @@ export class SceneEntities {
       },
     })
   }
-  setupSketchIdleCallbacks = ({
+  setupSketchIdleCallbacks = (context: ModelingMachineContext) => {
-    pathToNode,
+    sceneInfra.setCallbacks(idleCallbacks(context))
-    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,
@@ -1429,150 +1298,6 @@ 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) => {
@@ -1863,6 +1588,7 @@ 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,
-  GridHelper,
-  LineBasicMaterial,
-  OrthographicCamera,
-  PerspectiveCamera,
-  Scene,
-  Vector3,
-  WebGLRenderer,
-  Raycaster,
-  Vector2,
-  Group,
-  PlaneGeometry,
-  MeshBasicMaterial,
-  Mesh,
   DoubleSide,
+  GridHelper,
+  Group,
   Intersection,
+  LineBasicMaterial,
+  Mesh,
+  MeshBasicMaterial,
   Object3D,
   Object3DEventMap,
-  TextureLoader,
+  OrthographicCamera,
+  PerspectiveCamera,
+  PlaneGeometry,
+  Raycaster,
+  Scene,
   Texture,
+  TextureLoader,
+  Vector2,
+  Vector3,
+  WebGLRenderer,
 } from 'three'
 import { Coords2d, compareVec2Epsilon2 } from 'lang/std/sketch'
 import { useModelingContext } from 'hooks/useModelingContext'
@@ -31,6 +31,12 @@ 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']
 
@@ -55,39 +61,6 @@ 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
@@ -618,59 +591,6 @@ 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
@@ -728,28 +648,3 @@ 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/CommandBar/CommandBarKclInput.tsx

@@ -1,5 +1,6 @@
 import { Completion } from '@codemirror/autocomplete'
-import { EditorState, EditorView, useCodeMirror } from '@uiw/react-codemirror'
+import { EditorView, ViewUpdate } from '@codemirror/view'
+import { EditorState } from '@codemirror/state'
 import { CustomIcon } from 'components/CustomIcon'
 import { useCommandsContext } from 'hooks/useCommandsContext'
 import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
@@ -12,6 +13,7 @@ import { useEffect, useRef, useState } from 'react'
 import { useHotkeys } from 'react-hotkeys-hook'
 import styles from './CommandBarKclInput.module.css'
 import { createIdentifier, createVariableDeclaration } from 'lang/modifyAst'
+import { useCodeMirror } from 'components/ModelingSidebar/ModelingPanes/CodeEditor'
 
 function CommandBarKclInput({
   arg,
@@ -63,9 +65,7 @@ function CommandBarKclInput({
 
   const { setContainer } = useCodeMirror({
     container: editorRef.current,
-    value,
+    initialDocValue: value,
-    indentWithTab: false,
-    basicSetup: false,
     autoFocus: true,
     selection: {
       anchor: 0,
@@ -74,7 +74,6 @@ function CommandBarKclInput({
           ? previouslySetValue.valueText.length
           : defaultValue.length,
     },
-    accessKey: 'command-bar',
     theme:
       settings.context.app.theme.current === 'system'
         ? getSystemTheme()
@@ -96,8 +95,12 @@ function CommandBarKclInput({
         }
         return tr
       }),
+      EditorView.updateListener.of((vu: ViewUpdate) => {
+        if (vu.docChanged) {
+          setValue(vu.state.doc.toString())
+        }
+      }),
     ],
-    onChange: (newValue) => setValue(newValue),
   })
 
   useEffect(() => {

src/components/FileTree.tsx

@@ -175,7 +175,11 @@ const FileTreeItem = ({
           codeManager.code
       )
       codeManager.writeToFile()
-      kclManager.executeCode(true, true)
+
+      kclManager.isFirstRender = true
+      kclManager.executeCode(true, true).then(() => {
+        kclManager.isFirstRender = false
+      })
     } else {
       // Let the lsp servers know we closed a file.
       onFileClose(currentFile?.path || null, project?.path || null)

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"
+        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"
       >
         <canvas ref={canvasRef} />
         <ContextMenu

src/components/ModelingMachineProvider.tsx

@@ -53,9 +53,8 @@ import {
   sketchOnExtrudedFace,
   startSketchOnDefault,
 } from 'lang/modifyAst'
-import { Program, VariableDeclaration, parse, recast } from 'lang/wasm'
+import { Program, parse, recast } from 'lang/wasm'
 import {
-  getNodeFromPath,
   getNodePathFromSourceRange,
   hasExtrudableGeometry,
   isSingleCursorInPipe,
@@ -64,7 +63,7 @@ import { TEST } from 'env'
 import { exportFromEngine } from 'lib/exportFromEngine'
 import { Models } from '@kittycad/lib/dist/types/src'
 import toast from 'react-hot-toast'
-import { EditorSelection, Transaction } from '@uiw/react-codemirror'
+import { EditorSelection, Transaction } from '@codemirror/state'
 import { useSearchParams } from 'react-router-dom'
 import { letEngineAnimateAndSyncCamAfter } from 'clientSideScene/CameraControls'
 import { getVarNameModal } from 'hooks/useToolbarGuards'
@@ -128,7 +127,7 @@ export const ModelingMachineProvider = ({
         'enable copilot': () => {
           editorManager.setCopilotEnabled(true)
         },
-        'sketch exit execute': () => {
+        'sketch exit execute': ({ store }) => {
           ;(async () => {
             await sceneInfra.camControls.snapToPerspectiveBeforeHandingBackControlToEngine()
 
@@ -162,7 +161,10 @@ export const ModelingMachineProvider = ({
               })
             }
 
-            kclManager.executeCode(true)
+            store.videoElement?.pause()
+            kclManager.executeCode(true).then(() => {
+              store.videoElement?.play()
+            })
           })()
         },
         'Set mouse state': assign({
@@ -438,17 +440,6 @@ export const ModelingMachineProvider = ({
           if (selectionRanges.codeBasedSelections.length <= 0) return false
           return true
         },
-        'Sketch is empty': ({ sketchDetails }) => {
-          const node = getNodeFromPath<VariableDeclaration>(
-            kclManager.ast,
-            sketchDetails?.sketchPathToNode || [],
-            'VariableDeclaration'
-          )
-          // This should not be returning false, and it should be caught
-          // but we need to simulate old behavior to move on.
-          if (err(node)) return false
-          return node.node?.declarations?.[0]?.init.type !== 'PipeExpression'
-        },
         'Selection is on face': ({ selectionRanges }, { data }) => {
           if (data?.forceNewSketch) return false
           if (!isSingleCursorInPipe(selectionRanges, kclManager.ast))
@@ -558,10 +549,8 @@ export const ModelingMachineProvider = ({
             ) as [number, number, number],
           }
         },
-        'Get horizontal info': async ({
+        'Get horizontal info': async (context): Promise<SetSelections> => {
-          selectionRanges,
+          const { selectionRanges, sketchDetails } = context
-          sketchDetails,
-        }): Promise<SetSelections> => {
           const { modifiedAst, pathToNodeMap } =
             await applyConstraintHorzVertDistance({
               constraint: 'setHorzDistance',
@@ -575,11 +564,8 @@ export const ModelingMachineProvider = ({
             pathToNodeMap
           )
           const updatedAst = await sceneEntitiesManager.updateAstAndRejigSketch(
-            updatedPathToNode,
             _modifiedAst,
-            sketchDetails.zAxis,
+            context
-            sketchDetails.yAxis,
-            sketchDetails.origin
           )
           if (err(updatedAst)) return Promise.reject(updatedAst)
           const selection = updateSelections(
@@ -594,10 +580,8 @@ export const ModelingMachineProvider = ({
             updatedPathToNode,
           }
         },
-        'Get vertical info': async ({
+        'Get vertical info': async (context): Promise<SetSelections> => {
-          selectionRanges,
+          const { selectionRanges, sketchDetails } = context
-          sketchDetails,
-        }): Promise<SetSelections> => {
           const { modifiedAst, pathToNodeMap } =
             await applyConstraintHorzVertDistance({
               constraint: 'setVertDistance',
@@ -611,11 +595,8 @@ export const ModelingMachineProvider = ({
             pathToNodeMap
           )
           const updatedAst = await sceneEntitiesManager.updateAstAndRejigSketch(
-            updatedPathToNode,
             _modifiedAst,
-            sketchDetails.zAxis,
+            context
-            sketchDetails.yAxis,
-            sketchDetails.origin
           )
           if (err(updatedAst)) return Promise.reject(updatedAst)
           const selection = updateSelections(
@@ -630,10 +611,8 @@ export const ModelingMachineProvider = ({
             updatedPathToNode,
           }
         },
-        'Get angle info': async ({
+        'Get angle info': async (context): Promise<SetSelections> => {
-          selectionRanges,
+          const { selectionRanges, sketchDetails } = context
-          sketchDetails,
-        }): Promise<SetSelections> => {
           const info = angleBetweenInfo({
             selectionRanges,
           })
@@ -656,11 +635,8 @@ export const ModelingMachineProvider = ({
             pathToNodeMap
           )
           const updatedAst = await sceneEntitiesManager.updateAstAndRejigSketch(
-            updatedPathToNode,
             _modifiedAst,
-            sketchDetails.zAxis,
+            context
-            sketchDetails.yAxis,
-            sketchDetails.origin
           )
           if (err(updatedAst)) return Promise.reject(updatedAst)
           const selection = updateSelections(
@@ -675,10 +651,8 @@ export const ModelingMachineProvider = ({
             updatedPathToNode,
           }
         },
-        'Get length info': async ({
+        'Get length info': async (context): Promise<SetSelections> => {
-          selectionRanges,
+          const { selectionRanges, sketchDetails } = context
-          sketchDetails,
-        }): Promise<SetSelections> => {
           const { modifiedAst, pathToNodeMap } =
             await applyConstraintAngleLength({ selectionRanges })
           const _modifiedAst = parse(recast(modifiedAst))
@@ -689,11 +663,8 @@ export const ModelingMachineProvider = ({
             pathToNodeMap
           )
           const updatedAst = await sceneEntitiesManager.updateAstAndRejigSketch(
-            updatedPathToNode,
             _modifiedAst,
-            sketchDetails.zAxis,
+            context
-            sketchDetails.yAxis,
-            sketchDetails.origin
           )
           if (err(updatedAst)) return Promise.reject(updatedAst)
           const selection = updateSelections(
@@ -708,10 +679,10 @@ export const ModelingMachineProvider = ({
             updatedPathToNode,
           }
         },
-        'Get perpendicular distance info': async ({
+        'Get perpendicular distance info': async (
-          selectionRanges,
+          context
-          sketchDetails,
+        ): Promise<SetSelections> => {
-        }): Promise<SetSelections> => {
+          const { selectionRanges, sketchDetails } = context
           const { modifiedAst, pathToNodeMap } = await applyConstraintIntersect(
             {
               selectionRanges,
@@ -725,11 +696,8 @@ export const ModelingMachineProvider = ({
             pathToNodeMap
           )
           const updatedAst = await sceneEntitiesManager.updateAstAndRejigSketch(
-            updatedPathToNode,
             _modifiedAst,
-            sketchDetails.zAxis,
+            context
-            sketchDetails.yAxis,
-            sketchDetails.origin
           )
           if (err(updatedAst)) return Promise.reject(updatedAst)
           const selection = updateSelections(
@@ -744,10 +712,8 @@ export const ModelingMachineProvider = ({
             updatedPathToNode,
           }
         },
-        'Get ABS X info': async ({
+        'Get ABS X info': async (context): Promise<SetSelections> => {
-          selectionRanges,
+          const { selectionRanges, sketchDetails } = context
-          sketchDetails,
-        }): Promise<SetSelections> => {
           const { modifiedAst, pathToNodeMap } =
             await applyConstraintAbsDistance({
               constraint: 'xAbs',
@@ -761,11 +727,8 @@ export const ModelingMachineProvider = ({
             pathToNodeMap
           )
           const updatedAst = await sceneEntitiesManager.updateAstAndRejigSketch(
-            updatedPathToNode,
             _modifiedAst,
-            sketchDetails.zAxis,
+            context
-            sketchDetails.yAxis,
-            sketchDetails.origin
           )
           if (err(updatedAst)) return Promise.reject(updatedAst)
           const selection = updateSelections(
@@ -780,10 +743,8 @@ export const ModelingMachineProvider = ({
             updatedPathToNode,
           }
         },
-        'Get ABS Y info': async ({
+        'Get ABS Y info': async (context): Promise<SetSelections> => {
-          selectionRanges,
+          const { selectionRanges, sketchDetails } = context
-          sketchDetails,
-        }): Promise<SetSelections> => {
           const { modifiedAst, pathToNodeMap } =
             await applyConstraintAbsDistance({
               constraint: 'yAbs',
@@ -797,11 +758,8 @@ export const ModelingMachineProvider = ({
             pathToNodeMap
           )
           const updatedAst = await sceneEntitiesManager.updateAstAndRejigSketch(
-            updatedPathToNode,
             _modifiedAst,
-            sketchDetails.zAxis,
+            context
-            sketchDetails.yAxis,
-            sketchDetails.origin
           )
           if (err(updatedAst)) return Promise.reject(updatedAst)
           const selection = updateSelections(
@@ -817,9 +775,10 @@ export const ModelingMachineProvider = ({
           }
         },
         'Get convert to variable info': async (
-          { sketchDetails, selectionRanges },
+          context,
           { data }
         ): Promise<SetSelections> => {
+          const { selectionRanges, sketchDetails } = context
           if (!sketchDetails)
             return Promise.reject(new Error('No sketch details'))
           const { variableName } = await getVarNameModal({
@@ -843,11 +802,8 @@ export const ModelingMachineProvider = ({
             return Promise.reject(new Error('No path to replaced node'))
 
           const updatedAst = await sceneEntitiesManager.updateAstAndRejigSketch(
-            pathToReplacedNode || [],
             parsed,
-            sketchDetails.zAxis,
+            context
-            sketchDetails.yAxis,
-            sketchDetails.origin
           )
           if (err(updatedAst)) return Promise.reject(updatedAst)
           const selection = updateSelections(

src/components/ModelingSidebar/ModelingPanes/CodeEditor.tsx

@@ -0,0 +1,171 @@
+import React, {
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+  forwardRef,
+  useImperativeHandle,
+} from 'react'
+import {
+  EditorState,
+  EditorStateConfig,
+  Extension,
+  StateEffect,
+} from '@codemirror/state'
+import { EditorView } from '@codemirror/view'
+import { oneDark } from '@codemirror/theme-one-dark'
+
+//reference: https://github.com/sachinraja/rodemirror/blob/main/src/use-first-render.ts
+const useFirstRender = () => {
+  const firstRender = useRef(true)
+
+  useEffect(() => {
+    firstRender.current = false
+  }, [])
+
+  return firstRender.current
+}
+
+const defaultLightThemeOption = EditorView.theme(
+  {
+    '&': {
+      backgroundColor: '#fff',
+    },
+  },
+  {
+    dark: false,
+  }
+)
+
+interface CodeEditorRef {
+  editor?: HTMLDivElement | null
+  view?: EditorView
+  state?: EditorState
+}
+
+interface CodeEditorProps {
+  onCreateEditor?: (view: EditorView | null) => void
+  initialDocValue?: EditorStateConfig['doc']
+  extensions?: Extension
+  theme: 'light' | 'dark'
+  autoFocus?: boolean
+  selection?: EditorStateConfig['selection']
+}
+
+interface UseCodeMirror extends CodeEditorProps {
+  container?: HTMLDivElement | null
+}
+
+const CodeEditor = forwardRef<CodeEditorRef, CodeEditorProps>((props, ref) => {
+  const {
+    onCreateEditor,
+    extensions = [],
+    initialDocValue,
+    theme,
+    autoFocus = false,
+    selection,
+  } = props
+  const editor = useRef<HTMLDivElement>(null)
+
+  const { view, state, container } = useCodeMirror({
+    container: editor.current,
+    onCreateEditor,
+    extensions,
+    initialDocValue,
+    theme,
+    autoFocus,
+    selection,
+  })
+
+  useImperativeHandle(
+    ref,
+    () => ({ editor: editor.current, view: view, state: state }),
+    [editor, container, view, state]
+  )
+
+  return <div ref={editor}></div>
+})
+
+export function useCodeMirror(props: UseCodeMirror) {
+  const {
+    onCreateEditor,
+    extensions = [],
+    initialDocValue,
+    theme,
+    autoFocus = false,
+    selection,
+  } = props
+
+  const [container, setContainer] = useState<HTMLDivElement | null>()
+  const [view, setView] = useState<EditorView>()
+  const [state, setState] = useState<EditorState>()
+
+  const isFirstRender = useFirstRender()
+
+  const targetExtensions = useMemo(() => {
+    let exts = Array.isArray(extensions) ? extensions : []
+    if (theme === 'dark') {
+      exts = [...exts, oneDark]
+    } else if (theme === 'light') {
+      exts = [...exts, defaultLightThemeOption]
+    }
+
+    return exts
+  }, [extensions, theme])
+
+  useEffect(() => {
+    if (container && !state) {
+      const config = {
+        doc: initialDocValue,
+        selection,
+        extensions: [...Array.of(extensions)],
+      }
+      const stateCurrent = EditorState.create(config)
+      setState(stateCurrent)
+      if (!view) {
+        const viewCurrent = new EditorView({
+          state: stateCurrent,
+          parent: container,
+        })
+        setView(viewCurrent)
+        onCreateEditor && onCreateEditor(viewCurrent)
+      }
+    }
+    return () => {
+      if (view) {
+        setState(undefined)
+        setView(undefined)
+      }
+    }
+  }, [container, state])
+
+  useEffect(() => setContainer(props.container), [props.container])
+
+  useEffect(
+    () => () => {
+      if (view) {
+        view.destroy()
+        setView(undefined)
+      }
+    },
+    [view]
+  )
+
+  useEffect(() => {
+    if (autoFocus && view) {
+      view.focus()
+    }
+  }, [autoFocus, view])
+
+  useEffect(() => {
+    if (view && !isFirstRender) {
+      view.dispatch({
+        effects: StateEffect.reconfigure.of(targetExtensions),
+      })
+    }
+  }, [targetExtensions])
+
+  return { view, setView, container, setContainer, state, setState }
+}
+
+export default CodeEditor

src/components/ModelingSidebar/ModelingPanes/KclEditorPane.tsx

@@ -1,4 +1,3 @@
-import ReactCodeMirror from '@uiw/react-codemirror'
 import { TEST } from 'env'
 import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
 import { Themes, getSystemTheme } from 'lib/theme'
@@ -43,6 +42,7 @@ import {
   closeBracketsKeymap,
   completionKeymap,
 } from '@codemirror/autocomplete'
+import CodeEditor from './CodeEditor'
 
 export const editorShortcutMeta = {
   formatCode: {
@@ -185,15 +185,15 @@ export const KclEditorPane = () => {
       id="code-mirror-override"
       className={'absolute inset-0 ' + (cursorBlinking.current ? 'blink' : '')}
     >
-      <ReactCodeMirror
+      <CodeEditor
-        value={initialCode.current}
+        initialDocValue={initialCode.current}
         extensions={editorExtensions}
         theme={theme}
         onCreateEditor={(_editorView) => {
+          if (_editorView === null) return
+
           editorManager.setEditorView(_editorView)
         }}
-        indentWithTab={false}
-        basicSetup={false}
       />
     </div>
   )

src/components/RefreshButton.tsx

@@ -6,14 +6,12 @@ import React, { useMemo } from 'react'
 import toast from 'react-hot-toast'
 import Tooltip from './Tooltip'
 import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
-import { useAppState } from 'AppState'
 
 export const RefreshButton = ({ children }: React.PropsWithChildren) => {
   const { auth } = useSettingsAuthContext()
   const token = auth?.context?.token
-  const { htmlRef } = useAppState()
   const coreDumpManager = useMemo(
-    () => new CoreDumpManager(engineCommandManager, htmlRef, token),
+    () => new CoreDumpManager(engineCommandManager, token),
     []
   )
 

src/components/SettingsAuthProvider.tsx

@@ -175,7 +175,12 @@ export const SettingsAuthProviderBase = ({
             id: `${event.type}.success`,
           })
         },
-        'Execute AST': () => kclManager.executeCode(true, true),
+        'Execute AST': () => {
+          kclManager.isFirstRender = true
+          kclManager.executeCode(true, true).then(() => {
+            kclManager.isFirstRender = false
+          })
+        },
       },
       services: {
         'Persist settings': (context) =>

src/components/Stream.tsx

@@ -8,9 +8,11 @@ import { NetworkHealthState } from 'hooks/useNetworkStatus'
 import { ClientSideScene } from 'clientSideScene/ClientSideSceneComp'
 import { butName } from 'lib/cameraControls'
 import { sendSelectEventToEngine } from 'lib/selections'
+import { kclManager } from 'lib/singletons'
 
 export const Stream = () => {
   const [isLoading, setIsLoading] = useState(true)
+  const [isFirstRender, setIsFirstRender] = useState(kclManager.isFirstRender)
   const [clickCoords, setClickCoords] = useState<{ x: number; y: number }>()
   const videoRef = useRef<HTMLVideoElement>(null)
   const { settings } = useSettingsAuthContext()
@@ -53,6 +55,10 @@ export const Stream = () => {
       })
   }, [])
 
+  useEffect(() => {
+    setIsFirstRender(kclManager.isFirstRender)
+  }, [kclManager.isFirstRender])
+
   useEffect(() => {
     if (
       typeof window === 'undefined' ||
@@ -62,6 +68,13 @@ export const Stream = () => {
     if (!videoRef.current) return
     if (!context.store?.mediaStream) return
     videoRef.current.srcObject = context.store.mediaStream
+
+    send({
+      type: 'Set context',
+      data: {
+        videoElement: videoRef.current,
+      },
+    })
   }, [context.store?.mediaStream])
 
   const handleMouseDown: MouseEventHandler<HTMLDivElement> = (e) => {
@@ -96,7 +109,6 @@ export const Stream = () => {
       },
     })
     if (state.matches('Sketch')) return
-    if (state.matches('Sketch no face')) return
 
     if (!context.store?.didDragInStream && butName(e).left) {
       sendSelectEventToEngine(
@@ -166,10 +178,14 @@ export const Stream = () => {
           </Loading>
         </div>
       )}
-      {isLoading && (
+      {(isLoading || isFirstRender) && (
-        <div className="text-center absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2">
+        <div className="text-center absolute inset-0">
           <Loading>
+            {!isLoading && isFirstRender ? (
+              <span data-testid="loading-stream">Building scene...</span>
+            ) : (
               <span data-testid="loading-stream">Loading stream...</span>
+            )}
           </Loading>
         </div>
       )}

src/components/UnitsMenu.tsx

@@ -0,0 +1,54 @@
+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/editor/manager.ts

@@ -222,11 +222,7 @@ export default class EditorManager {
       return
     }
 
-    const ignoreEvents: ModelingMachineEvent['type'][] = [
+    const ignoreEvents: ModelingMachineEvent['type'][] = ['change tool']
-      'Equip Line tool',
-      'Equip tangential arc to',
-      'Equip rectangle tool',
-    ]
 
     if (!this._modelingEvent) {
       return