failing test

Signed-off-by: Jess Frazelle <github@jessfraz.com>
2024-06-24 17:35:36 -07:00
235 changed files with 6492 additions and 16560 deletions
--- a/.github/workflows/cargo-bench.yml
+++ b/.github/workflows/cargo-bench.yml
@ -38,7 +38,5 @@ jobs:
      - name: Benchmark kcl library
        shell: bash
        run: |-
-          cd src/wasm-lib/kcl; cargo bench --all-features -- iai
-        env:
-          KITTYCAD_API_TOKEN: ${{secrets.KITTYCAD_API_TOKEN}}
+          cd src/wasm-lib/kcl; cargo bench -- iai

--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -238,8 +238,12 @@ jobs:
        shell: cmd

      - name: Build the app (debug)
+        uses: tauri-apps/tauri-action@v0
        if: ${{ env.BUILD_RELEASE == 'false' }}
-        run: "yarn tauri build --debug ${{ env.TAURI_ARGS_MACOS }} ${{ env.TAURI_ARGS_UBUNTU }}"
+        with:
+          includeRelease: false
+          includeDebug: true
+          args: "${{ env.TAURI_ARGS_MACOS }} ${{ env.TAURI_ARGS_UBUNTU }}"

      - name: Build for Mac TestFlight (nightly)
        if: ${{ github.event_name == 'schedule' && matrix.os == 'macos-14' }}
@ -332,6 +336,7 @@ jobs:
      # specific and we want to overwrite it with the this new build after and
      # not upload the apple store build to the public bucket
      - name: Build the app (release) and sign
+        uses: tauri-apps/tauri-action@v0
        if: ${{ env.BUILD_RELEASE == 'true' }}
        env:
          TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
@ -343,7 +348,8 @@ jobs:
          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
          TAURI_CONF_ARGS: "--config ${{ matrix.os == 'windows-latest' && 'src-tauri\\tauri.release.conf.json' || 'src-tauri/tauri.release.conf.json' }}"
-        run: "yarn tauri build ${{ env.TAURI_CONF_ARGS }} ${{ env.TAURI_ARGS_MACOS }} ${{ env.TAURI_ARGS_UBUNTU }}"
+        with:
+          args: "${{ env.TAURI_CONF_ARGS }} ${{ env.TAURI_ARGS_MACOS }} ${{ env.TAURI_ARGS_UBUNTU }}"

      - uses: actions/upload-artifact@v3
        if: matrix.os != 'ubuntu-latest'
@ -377,8 +383,6 @@ jobs:
          TS_NODE_COMPILER_OPTIONS: '{"module": "commonjs"}'

  publish-apps-release:
-    permissions:
-      contents: write
    runs-on: ubuntu-latest
    if: ${{ github.event_name == 'release' || github.event_name == 'schedule' }}
    needs: [check-format, check-types, check-typos, build-test-web, prepare-json-files, build-test-apps]
--- a/.github/workflows/playwright.yml
+++ b/.github/workflows/playwright.yml
@ -38,8 +38,6 @@ jobs:
    runs-on: ubuntu-latest-8-cores
    needs: check-rust-changes
    steps:
-    - name: Tune GitHub-hosted runner network
-      uses: smorimoto/tune-github-hosted-runner-network@v1
    - uses: actions/checkout@v4
    - uses: actions/setup-node@v4
      with:
@ -92,17 +90,11 @@ jobs:
    - name: build web
      run: yarn build:local
    - name: Run ubuntu/chrome snapshots
-      continue-on-error: true
-      run: |
-        yarn playwright test --project="Google Chrome" --update-snapshots e2e/playwright/snapshot-tests.spec.ts
+      run: yarn playwright test --project="Google Chrome" --update-snapshots e2e/playwright/snapshot-tests.spec.ts
      env:
        CI: true
        token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
        snapshottoken: ${{ secrets.KITTYCAD_API_TOKEN }}
-    - name: Clean up test-results
-      if: always()
-      continue-on-error: true
-      run: rm -r test-results
    - name: check for changes
      id: git-check
      run: |
@ -129,7 +121,7 @@ jobs:
    - uses: actions/upload-artifact@v4
      if: steps.git-check.outputs.modified == 'true'
      with:
-        name: playwright-report-ubuntu-${{ github.sha }}
+        name: playwright-report
        path: playwright-report/
        retention-days: 30
    # if have previous run results, use them
@ -137,18 +129,16 @@ jobs:
      if: always()
      continue-on-error: true
      with:
-        name: test-results-ubuntu-${{ github.sha }}
+        name: test-results
        path: test-results/
    - name: Run ubuntu/chrome flow retry failures
      id: retry
      if: always()
      run: |
-        if [[ -d "test-results" ]];
-        then if [[ $(ls -1 "test-results" | wc -l) != "0" ]];
-          then echo "retried=true" >> $GITHUB_OUTPUT;
-          else echo "retried=false" >> $GITHUB_OUTPUT; exit 0;
-          fi;
-        else echo "retried=false" >> $GITHUB_OUTPUT; exit 0;
+        ls -1 "test-results"
+        if [[ $(ls -1 "test-results" | wc -l) == "0" ]];
+        then echo "retried=false" >> $GITHUB_OUTPUT; exit 0;
+        else echo "retried=true" >> $GITHUB_OUTPUT;
        fi;
        yarn playwright test --project="Google Chrome" --last-failed e2e/playwright/flow-tests.spec.ts
      env:
@ -163,25 +153,23 @@ jobs:
    - uses: actions/upload-artifact@v4
      if: always()
      with:
-        name: test-results-ubuntu-${{ github.sha }}
+        name: test-results
        path: test-results/
        retention-days: 30
        overwrite: true
    - uses: actions/upload-artifact@v4
      if: always()
      with:
-        name: playwright-report-ubuntu-${{ github.sha }}
+        name: playwright-report
        path: playwright-report/
        retention-days: 30
        overwrite: true

  playwright-macos:
    timeout-minutes: 60
-    runs-on: macos-14-large
+    runs-on: macos-14
    needs: check-rust-changes
    steps:
-    - name: Tune GitHub-hosted runner network
-      uses: smorimoto/tune-github-hosted-runner-network@v1
    - uses: actions/checkout@v4
    - uses: actions/setup-node@v4
      with:
@ -239,25 +227,23 @@ jobs:
      if: ${{ always() }}
      continue-on-error: true
      with:
-        name: test-results-macos-${{ github.sha }}
+        name: test-results
        path: test-results/
    - name: Run macos/safari flow retry failures
      id: retry
-      if: always()
+      continue-on-error: true
+      if: ${{ success() }}
      run: |
-        if [[ -d "test-results" ]];
-        then if [[ $(ls -1 "test-results" | wc -l) != "0" ]];
-          then echo "retried=true" >> $GITHUB_OUTPUT;
-          else echo "retried=false" >> $GITHUB_OUTPUT; exit 0;
-          fi;
-        else echo "retried=false" >> $GITHUB_OUTPUT; exit 0;
+        if [ -d "test-results" ];
+        then echo "retried=true" >> $GITHUB_OUTPUT;
+        else echo "retried=false" >> $GITHUB_OUTPUT;
        fi;
        yarn playwright test --project="webkit" --last-failed e2e/playwright/flow-tests.spec.ts
      env:
        CI: true
        token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
    - name: Run macos/safari flow
-      if: steps.retry.outputs.retried == 'false'
+      if: ${{ steps.retry.outputs.retried != 'true' }}
      # webkit doesn't work on Ubuntu because of the same reason tauri doesn't (webRTC issues)
      # TODO remove this and the matrix and run all tests on ubuntu when this is fixed
      run: yarn playwright test --project="webkit" e2e/playwright/flow-tests.spec.ts
@ -267,14 +253,14 @@ jobs:
    - uses: actions/upload-artifact@v4
      if: ${{ always() }}
      with:
-        name: test-results-macos-${{ github.sha }}
+        name: test-results
        path: test-results/
        retention-days: 30
        overwrite: true
    - uses: actions/upload-artifact@v4
      if: ${{ always() }}
      with:
-        name: playwright-report-macos-${{ github.sha }}
+        name: playwright-report
        path: playwright-report/
        retention-days: 30
        overwrite: true
--- a/.gitignore
+++ b/.gitignore
@ -56,5 +56,3 @@ src-tauri/gen

 src/wasm-lib/grackle/stdlib_cube_partial.json
 Mac_App_Distribution.provisionprofile
-
-*.tsbuildinfo
--- a/.prettierignore
+++ b/.prettierignore
@ -1,6 +1,5 @@
 # Ignore artifacts:
 build
-dist
 coverage

 # Ignore Rust projects:
@ -10,6 +9,5 @@ src/wasm-lib/pkg
 src/wasm-lib/kcl/bindings
 e2e/playwright/export-snapshots

-
 # XState generated files
 src/machines/**.typegen.ts
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -0,0 +1,7 @@
+{
+    "cSpell.words": [
+        "geos"
+    ],
+    "editor.tabSize": 2,
+    "editor.insertSpaces": true,
+}
--- a/docs/kcl/angleToMatchLengthX.md
+++ b/docs/kcl/angleToMatchLengthX.md
@ -17,8 +17,11 @@ angleToMatchLengthX(segment_name: TagIdentifier, to: number, sketch_group: Sketc
 ```js
 const sketch001 = startSketchOn('XZ')
  |> startProfileAt([0, 0], %)
-  |> line([2, 5], %, $seg01)
-  |> angledLineToX([-angleToMatchLengthX(seg01, 7, %), 10], %)
+  |> line([2, 5], %, 'seg01')
+  |> angledLineToX([
+       -angleToMatchLengthX('seg01', 7, %),
+       10
+     ], %)
  |> close(%)

 const extrusion = extrude(5, sketch001)
--- a/docs/kcl/angleToMatchLengthY.md
+++ b/docs/kcl/angleToMatchLengthY.md
@ -17,9 +17,9 @@ angleToMatchLengthY(segment_name: TagIdentifier, to: number, sketch_group: Sketc
 ```js
 const sketch001 = startSketchOn('XZ')
  |> startProfileAt([0, 0], %)
-  |> line([1, 2], %, $seg01)
+  |> line([1, 2], %, 'seg01')
  |> angledLine({
-       angle: angleToMatchLengthY(seg01, 15, %),
+       angle: angleToMatchLengthY('seg01', 15, %),
       length: 5
     }, %)
  |> yLineTo(0, %)
--- a/docs/kcl/angledLineOfXLength.md
+++ b/docs/kcl/angledLineOfXLength.md
@ -17,10 +17,10 @@ angledLineOfXLength(data: AngledLineData, sketch_group: SketchGroup, tag?: TagDe
 ```js
 const sketch001 = startSketchOn('XZ')
  |> startProfileAt([0, 0], %)
-  |> angledLineOfXLength({ angle: 45, length: 10 }, %, $edge1)
-  |> angledLineOfXLength({ angle: -15, length: 20 }, %, $edge2)
+  |> angledLineOfXLength({ angle: 45, length: 10 }, %, "edge1")
+  |> angledLineOfXLength({ angle: -15, length: 20 }, %, "edge2")
  |> line([0, -5], %)
-  |> close(%, $edge3)
+  |> close(%, "edge3")

 const extrusion = extrude(10, sketch001)
 ```
--- a/docs/kcl/angledLineThatIntersects.md
+++ b/docs/kcl/angledLineThatIntersects.md
@ -18,7 +18,7 @@ angledLineThatIntersects(data: AngledLineThatIntersectsData, sketch_group: Sketc
 const exampleSketch = startSketchOn('XZ')
  |> startProfileAt([0, 0], %)
  |> lineTo([5, 10], %)
-  |> lineTo([-10, 10], %, $lineToIntersect)
+  |> lineTo([-10, 10], %, "lineToIntersect")
  |> lineTo([0, 20], %)
  |> angledLineThatIntersects({
       angle: 80,
--- a/docs/kcl/chamfer.md
+++ b/docs/kcl/chamfer.md
@ -22,19 +22,19 @@ const chamferLength = 2

 const mountingPlateSketch = startSketchOn("XY")
  |> startProfileAt([-width / 2, -length / 2], %)
-  |> lineTo([width / 2, -length / 2], %, $edge1)
-  |> lineTo([width / 2, length / 2], %, $edge2)
-  |> lineTo([-width / 2, length / 2], %, $edge3)
-  |> close(%, $edge4)
+  |> lineTo([width / 2, -length / 2], %, 'edge1')
+  |> lineTo([width / 2, length / 2], %, 'edge2')
+  |> lineTo([-width / 2, length / 2], %, 'edge3')
+  |> close(%, 'edge4')

 const mountingPlate = extrude(thickness, mountingPlateSketch)
  |> chamfer({
       length: chamferLength,
       tags: [
-         getNextAdjacentEdge(edge1, %),
-         getNextAdjacentEdge(edge2, %),
-         getNextAdjacentEdge(edge3, %),
-         getNextAdjacentEdge(edge4, %)
+         getNextAdjacentEdge('edge1', %),
+         getNextAdjacentEdge('edge2', %),
+         getNextAdjacentEdge('edge3', %),
+         getNextAdjacentEdge('edge4', %)
       ]
     }, %)
 ```
--- a/docs/kcl/circle.md
+++ b/docs/kcl/circle.md
@ -9,7 +9,7 @@ Sketch a circle.


 ```js
-circle(center: [number], radius: number, sketch_surface_or_group: SketchSurfaceOrGroup, tag?: TagDeclarator) -> SketchGroup
+circle(center: [number], radius: number, tag?: TagDeclarator, sketch_surface_or_group: SketchSurfaceOrGroup) -> SketchGroup
 ```

 ### Examples
@ -41,6 +41,14 @@ const example = extrude(5, exampleSketch)

 * `center`: `[number]` (REQUIRED)
 * `radius`: `number` (REQUIRED)
+* `tag`: `TagDeclarator` (OPTIONAL)
+```js
+{
+	end: number,
+	start: number,
+	value: string,
+}
+```
 * `sketch_surface_or_group`: `SketchSurfaceOrGroup` - A sketch surface or a sketch group. (REQUIRED)
 ```js
 {
@ -502,14 +510,6 @@ const example = extrude(5, exampleSketch)
 }],
 }
 ```
-* `tag`: `TagDeclarator` (OPTIONAL)
-```js
-{
-	end: number,
-	start: number,
-	value: string,
-}
-```

 ### Returns

--- a/docs/kcl/fillet.md
+++ b/docs/kcl/fillet.md
@ -22,19 +22,19 @@ const filletRadius = 2

 const mountingPlateSketch = startSketchOn("XY")
  |> startProfileAt([-width / 2, -length / 2], %)
-  |> lineTo([width / 2, -length / 2], %, $edge1)
-  |> lineTo([width / 2, length / 2], %, $edge2)
-  |> lineTo([-width / 2, length / 2], %, $edge3)
-  |> close(%, $edge4)
+  |> lineTo([width / 2, -length / 2], %, 'edge1')
+  |> lineTo([width / 2, length / 2], %, 'edge2')
+  |> lineTo([-width / 2, length / 2], %, 'edge3')
+  |> close(%, 'edge4')

 const mountingPlate = extrude(thickness, mountingPlateSketch)
  |> fillet({
       radius: filletRadius,
       tags: [
-         getNextAdjacentEdge(edge1, %),
-         getNextAdjacentEdge(edge2, %),
-         getNextAdjacentEdge(edge3, %),
-         getNextAdjacentEdge(edge4, %)
+         getNextAdjacentEdge('edge1', %),
+         getNextAdjacentEdge('edge2', %),
+         getNextAdjacentEdge('edge3', %),
+         getNextAdjacentEdge('edge4', %)
       ]
     }, %)
 ```
--- a/docs/kcl/getEdge.md
+++ b/docs/kcl/getEdge.md
@ -17,7 +17,7 @@ getEdge(tag: TagIdentifier, extrude_group: ExtrudeGroup) -> Uuid
 ```js
 const box = startSketchOn('XZ')
  |> startProfileAt([0, 0], %)
-  |> line([0, 10], %, $revolveAxis)
+  |> line([0, 10], %, 'revolveAxis')
  |> line([10, 0], %)
  |> line([0, -10], %)
  |> close(%)
@ -30,7 +30,7 @@ const revolution = startSketchOn(box, "revolveAxis")
  |> line([0, -10], %)
  |> close(%)
  |> revolve({
-       axis: getEdge(revolveAxis, box),
+       axis: getEdge('revolveAxis', box),
       angle: 90
     }, %)
 ```
--- a/docs/kcl/getNextAdjacentEdge.md
+++ b/docs/kcl/getNextAdjacentEdge.md
@ -21,13 +21,15 @@ const exampleSketch = startSketchOn('XZ')
  |> angledLine({ angle: 60, length: 10 }, %)
  |> angledLine({ angle: 120, length: 10 }, %)
  |> line([-10, 0], %)
-  |> angledLine({ angle: 240, length: 10 }, %, $referenceEdge)
+  |> angledLine({ angle: 240, length: 10 }, %, 'referenceEdge')
  |> close(%)

 const example = extrude(5, exampleSketch)
  |> fillet({
       radius: 3,
-       tags: [getNextAdjacentEdge(referenceEdge, %)]
+       tags: [
+         getNextAdjacentEdge("referenceEdge", %)
+       ]
     }, %)
 ```

--- a/docs/kcl/getOppositeEdge.md
+++ b/docs/kcl/getOppositeEdge.md
@ -21,13 +21,13 @@ const exampleSketch = startSketchOn('XZ')
  |> angledLine({ angle: 60, length: 10 }, %)
  |> angledLine({ angle: 120, length: 10 }, %)
  |> line([-10, 0], %)
-  |> angledLine({ angle: 240, length: 10 }, %, $referenceEdge)
+  |> angledLine({ angle: 240, length: 10 }, %, 'referenceEdge')
  |> close(%)

 const example = extrude(5, exampleSketch)
  |> fillet({
       radius: 3,
-       tags: [getOppositeEdge(referenceEdge, %)]
+       tags: [getOppositeEdge("referenceEdge", %)]
     }, %)
 ```

--- a/docs/kcl/getPreviousAdjacentEdge.md
+++ b/docs/kcl/getPreviousAdjacentEdge.md
@ -21,14 +21,14 @@ const exampleSketch = startSketchOn('XZ')
  |> angledLine({ angle: 60, length: 10 }, %)
  |> angledLine({ angle: 120, length: 10 }, %)
  |> line([-10, 0], %)
-  |> angledLine({ angle: 240, length: 10 }, %, $referenceEdge)
+  |> angledLine({ angle: 240, length: 10 }, %, 'referenceEdge')
  |> close(%)

 const example = extrude(5, exampleSketch)
  |> fillet({
       radius: 3,
       tags: [
-         getPreviousAdjacentEdge(referenceEdge, %)
+         getPreviousAdjacentEdge("referenceEdge", %)
       ]
     }, %)
 ```
--- a/docs/kcl/index.md
+++ b/docs/kcl/index.md
@ -55,7 +55,6 @@ layout: manual
 * [`patternCircular3d`](kcl/patternCircular3d)
 * [`patternLinear2d`](kcl/patternLinear2d)
 * [`patternLinear3d`](kcl/patternLinear3d)
-* [`patternTransform`](kcl/patternTransform)
 * [`pi`](kcl/pi)
 * [`pow`](kcl/pow)
 * [`profileStart`](kcl/profileStart)
--- a/docs/kcl/patternTransform.md
+++ b/docs/kcl/patternTransform.md
--- a/docs/kcl/profileStart.md
+++ b/docs/kcl/profileStart.md
@ -17,9 +17,9 @@ profileStart(sketch_group: SketchGroup) -> [number]
 ```js
 const sketch001 = startSketchOn('XY')
  |> startProfileAt([5, 2], %)
-  |> angledLine({ angle: 120, length: 50 }, %, $seg01)
+  |> angledLine({ angle: 120, length: 50 }, %, 'seg01')
  |> angledLine({
-       angle: segAng(seg01, %) + 120,
+       angle: segAng('seg01', %) + 120,
       length: 50
     }, %)
  |> lineTo(profileStart(%), %)
--- a/docs/kcl/revolve.md
+++ b/docs/kcl/revolve.md
@ -99,7 +99,7 @@ const box = startSketchOn('XY')
  |> startProfileAt([0, 0], %)
  |> line([0, 20], %)
  |> line([20, 0], %)
-  |> line([0, -20], %, $revolveAxis)
+  |> line([0, -20], %, 'revolveAxis')
  |> close(%)
  |> extrude(20, %)

@ -107,7 +107,7 @@ const sketch001 = startSketchOn(box, "END")
  |> circle([10, 10], 4, %)
  |> revolve({
       angle: 90,
-       axis: getOppositeEdge(revolveAxis, box)
+       axis: getOppositeEdge('revolveAxis', box)
     }, %)
 ```

--- a/docs/kcl/segAng.md
+++ b/docs/kcl/segAng.md
@ -18,11 +18,11 @@ segAng(segment_name: TagIdentifier, sketch_group: SketchGroup) -> number
 const exampleSketch = startSketchOn('XZ')
  |> startProfileAt([0, 0], %)
  |> line([10, 0], %)
-  |> line([5, 10], %, $seg01)
+  |> line([5, 10], %, 'seg01')
  |> line([-10, 0], %)
-  |> angledLine([segAng(seg01, %), 10], %)
+  |> angledLine([segAng('seg01', %), 10], %)
  |> line([-10, 0], %)
-  |> angledLine([segAng(seg01, %), -15], %)
+  |> angledLine([segAng('seg01', %), -15], %)
  |> close(%)

 const example = extrude(4, exampleSketch)
--- a/docs/kcl/segEndX.md
+++ b/docs/kcl/segEndX.md
@ -17,9 +17,9 @@ segEndX(segment_name: TagIdentifier, sketch_group: SketchGroup) -> number
 ```js
 const exampleSketch = startSketchOn('XZ')
  |> startProfileAt([0, 0], %)
-  |> line([20, 0], %, $thing)
+  |> line([20, 0], %, "thing")
  |> line([0, 5], %)
-  |> line([segEndX(thing, %), 0], %)
+  |> line([segEndX("thing", %), 0], %)
  |> line([-20, 10], %)
  |> close(%)

--- a/docs/kcl/segEndY.md
+++ b/docs/kcl/segEndY.md
@ -18,9 +18,9 @@ segEndY(segment_name: TagIdentifier, sketch_group: SketchGroup) -> number
 const exampleSketch = startSketchOn('XZ')
  |> startProfileAt([0, 0], %)
  |> line([20, 0], %)
-  |> line([0, 3], %, $thing)
+  |> line([0, 3], %, "thing")
  |> line([-10, 0], %)
-  |> line([0, segEndY(thing, %)], %)
+  |> line([0, segEndY("thing", %)], %)
  |> line([-10, 0], %)
  |> close(%)

--- a/docs/kcl/segLen.md
+++ b/docs/kcl/segLen.md
@ -17,9 +17,12 @@ segLen(segment_name: TagIdentifier, sketch_group: SketchGroup) -> number
 ```js
 const exampleSketch = startSketchOn("XZ")
  |> startProfileAt([0, 0], %)
-  |> angledLine({ angle: 60, length: 10 }, %, $thing)
+  |> angledLine({ angle: 60, length: 10 }, %, "thing")
  |> tangentialArc({ offset: -120, radius: 5 }, %)
-  |> angledLine({ angle: -60, length: segLen(thing, %) }, %)
+  |> angledLine({
+       angle: -60,
+       length: segLen("thing", %)
+     }, %)
  |> close(%)

 const example = extrude(5, exampleSketch)
--- a/docs/kcl/startSketchOn.md
+++ b/docs/kcl/startSketchOn.md
@ -49,7 +49,7 @@ const example003 = extrude(5, exampleSketch003)
 const exampleSketch = startSketchOn("XY")
  |> startProfileAt([0, 0], %)
  |> line([10, 0], %)
-  |> line([0, 10], %, $sketchingFace)
+  |> line([0, 10], %, 'sketchingFace')
  |> line([-10, 0], %)
  |> close(%)

@ -60,7 +60,7 @@ const exampleSketch002 = startSketchOn(example, 'sketchingFace')
  |> line([8, 0], %)
  |> line([0, 8], %)
  |> line([-8, 0], %)
-  |> close(%, $sketchingFace002)
+  |> close(%, 'sketchingFace002')

 const example002 = extrude(10, exampleSketch002)

--- a/docs/kcl/std.json
+++ b/docs/kcl/std.json
--- a/e2e/playwright/flow-tests.spec.ts
+++ b/e2e/playwright/flow-tests.spec.ts
--- a/e2e/playwright/snapshot-tests.spec.ts
+++ b/e2e/playwright/snapshot-tests.spec.ts
@ -91,9 +91,8 @@ const part001 = startSketchOn('-XZ')
    )
  })
  await page.setViewportSize({ width: 1200, height: 500 })
-
+  await page.goto('/')
  await u.waitForAuthSkipAppStart()
-
  await u.openDebugPanel()
  await u.expectCmdLog('[data-message-type="execution-done"]')
  await u.waitForCmdReceive('extrude')
@ -331,7 +330,7 @@ const extrudeDefaultPlane = async (context: any, page: any, plane: string) => {

  const u = await getUtils(page)
  await page.setViewportSize({ width: 1200, height: 500 })
-
+  await page.goto('/')
  await u.waitForAuthSkipAppStart()

  // wait for execution done
@ -387,8 +386,8 @@ test('Draft segments should look right', async ({ page, context }) => {
  const u = await getUtils(page)
  await page.setViewportSize({ width: 1200, height: 500 })
  const PUR = 400 / 37.5 //pixeltoUnitRatio
+  await page.goto('/')
  await u.waitForAuthSkipAppStart()
-
  await u.openDebugPanel()

  await expect(
@ -444,7 +443,7 @@ test('Draft rectangles should look right', async ({ page, context }) => {
  const u = await getUtils(page)
  await page.setViewportSize({ width: 1200, height: 500 })
  const PUR = 400 / 37.5 //pixeltoUnitRatio
-
+  await page.goto('/')
  await u.waitForAuthSkipAppStart()
  await u.openDebugPanel()

@ -491,7 +490,7 @@ test.describe('Client side scene scale should match engine scale', () => {
    const u = await getUtils(page)
    await page.setViewportSize({ width: 1200, height: 500 })
    const PUR = 400 / 37.5 //pixeltoUnitRatio
-
+    await page.goto('/')
    await u.waitForAuthSkipAppStart()
    await u.openDebugPanel()

@ -590,7 +589,7 @@ test.describe('Client side scene scale should match engine scale', () => {
    const u = await getUtils(page)
    await page.setViewportSize({ width: 1200, height: 500 })
    const PUR = 400 / 37.5 //pixeltoUnitRatio
-
+    await page.goto('/')
    await u.waitForAuthSkipAppStart()
    await u.openDebugPanel()

@ -690,7 +689,7 @@ const part002 = startSketchOn(part001, 'seg01')
  }, KCL_DEFAULT_LENGTH)

  await page.setViewportSize({ width: 1200, height: 500 })
-
+  await page.goto('/')
  await u.waitForAuthSkipAppStart()

  await u.openDebugPanel()
@ -740,7 +739,7 @@ test('Zoom to fit on load - solid 2d', async ({ page, context }) => {
  }, KCL_DEFAULT_LENGTH)

  await page.setViewportSize({ width: 1200, height: 500 })
-
+  await page.goto('/')
  await u.waitForAuthSkipAppStart()

  await u.openDebugPanel()
@ -777,7 +776,7 @@ test('Zoom to fit on load - solid 3d', async ({ page, context }) => {
  }, KCL_DEFAULT_LENGTH)

  await page.setViewportSize({ width: 1200, height: 500 })
-
+  await page.goto('/')
  await u.waitForAuthSkipAppStart()

  await u.openDebugPanel()
@ -796,83 +795,3 @@ test('Zoom to fit on load - solid 3d', async ({ page, context }) => {
    maxDiffPixels: 100,
  })
 })
-
-test.describe('Grid visibility', () => {
-  test('Grid turned off', async ({ page }) => {
-    const u = await getUtils(page)
-    const stream = page.getByTestId('stream')
-    const mask = [
-      page.locator('#app-header'),
-      page.locator('#sidebar-top-ribbon'),
-      page.locator('#sidebar-bottom-ribbon'),
-    ]
-
-    await page.setViewportSize({ width: 1200, height: 500 })
-    await page.goto('/')
-    await u.waitForAuthSkipAppStart()
-
-    await u.openDebugPanel()
-    // wait for execution done
-    await expect(
-      page.locator('[data-message-type="execution-done"]')
-    ).toHaveCount(2)
-    await u.closeDebugPanel()
-    await u.closeKclCodePanel()
-    // TODO: Find a way to truly know that the objects have finished
-    // rendering, because an execution-done message is not sufficient.
-    await page.waitForTimeout(1000)
-
-    await expect(stream).toHaveScreenshot({
-      maxDiffPixels: 100,
-      mask,
-    })
-  })
-
-  test('Grid turned on', async ({ page }) => {
-    await page.addInitScript(
-      async ({ settingsKey, settings }) => {
-        localStorage.setItem(settingsKey, settings)
-      },
-      {
-        settingsKey: TEST_SETTINGS_KEY,
-        settings: TOML.stringify({
-          settings: {
-            ...TEST_SETTINGS,
-            modeling: {
-              ...TEST_SETTINGS.modeling,
-              showScaleGrid: true,
-            },
-          },
-        }),
-      }
-    )
-
-    const u = await getUtils(page)
-    const stream = page.getByTestId('stream')
-    const mask = [
-      page.locator('#app-header'),
-      page.locator('#sidebar-top-ribbon'),
-      page.locator('#sidebar-bottom-ribbon'),
-    ]
-
-    await page.setViewportSize({ width: 1200, height: 500 })
-    await page.goto('/')
-    await u.waitForAuthSkipAppStart()
-
-    await u.openDebugPanel()
-    // wait for execution done
-    await expect(
-      page.locator('[data-message-type="execution-done"]')
-    ).toHaveCount(2)
-    await u.closeDebugPanel()
-    await u.closeKclCodePanel()
-    // TODO: Find a way to truly know that the objects have finished
-    // rendering, because an execution-done message is not sufficient.
-    await page.waitForTimeout(1000)
-
-    await expect(stream).toHaveScreenshot({
-      maxDiffPixels: 100,
-      mask,
-    })
-  })
-})
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Client-side-scene-scale-should-match-engine-scale-Inch-scale-1-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Client-side-scene-scale-should-match-engine-scale-Inch-scale-1-Google-Chrome-linux.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Client-side-scene-scale-should-match-engine-scale-Inch-scale-2-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Client-side-scene-scale-should-match-engine-scale-Inch-scale-2-Google-Chrome-linux.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Client-side-scene-scale-should-match-engine-scale-Millimeter-scale-1-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Client-side-scene-scale-should-match-engine-scale-Millimeter-scale-1-Google-Chrome-linux.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Client-side-scene-scale-should-match-engine-scale-Millimeter-scale-2-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Client-side-scene-scale-should-match-engine-scale-Millimeter-scale-2-Google-Chrome-linux.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-1-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-1-Google-Chrome-linux.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-2-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-2-Google-Chrome-linux.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Grid-visibility-Grid-turned-off-1-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Grid-visibility-Grid-turned-off-1-Google-Chrome-linux.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Grid-visibility-Grid-turned-on-1-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Grid-visibility-Grid-turned-on-1-Google-Chrome-linux.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Sketch-on-face-with-none-z-up-1-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Sketch-on-face-with-none-z-up-1-Google-Chrome-linux.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Zoom-to-fit-on-load---solid-2d-1-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Zoom-to-fit-on-load---solid-2d-1-Google-Chrome-linux.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Zoom-to-fit-on-load---solid-3d-1-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Zoom-to-fit-on-load---solid-3d-1-Google-Chrome-linux.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable--XY-1-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable--XY-1-Google-Chrome-linux.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable--XZ-1-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable--XZ-1-Google-Chrome-linux.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable--YZ-1-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable--YZ-1-Google-Chrome-linux.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable-XY-1-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable-XY-1-Google-Chrome-linux.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable-XZ-1-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable-XZ-1-Google-Chrome-linux.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable-YZ-1-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable-YZ-1-Google-Chrome-linux.png
--- a/e2e/playwright/test-utils.ts
+++ b/e2e/playwright/test-utils.ts
@ -45,8 +45,8 @@ async function clearCommandLogs(page: Page) {
  await page.getByTestId('clear-commands').click()
 }

-async function expectCmdLog(page: Page, locatorStr: string, timeout = 5000) {
-  await expect(page.locator(locatorStr).last()).toBeVisible({ timeout })
+async function expectCmdLog(page: Page, locatorStr: string) {
+  await expect(page.locator(locatorStr).last()).toBeVisible()
 }

 async function waitForDefaultPlanesToBeVisible(page: Page) {
@ -207,23 +207,6 @@ export const getMovementUtils = (opts: any) => {
  return { toSU, click00r }
 }

-async function waitForAuthAndLsp(page: Page) {
-  const waitForLspPromise = page.waitForEvent('console', async (message) => {
-    // it would be better to wait for a message that the kcl lsp has started by looking for the message  message.text().includes('[lsp] [window/logMessage]')
-    // but that doesn't seem to make it to the console for macos/safari :(
-    if (message.text().includes('start kcl lsp')) {
-      await new Promise((resolve) => setTimeout(resolve, 200))
-      return true
-    }
-    return false
-  })
-
-  await page.goto('/')
-  await waitForPageLoad(page)
-
-  return waitForLspPromise
-}
-
 export async function getUtils(page: Page) {
  // Chrome devtools protocol session only works in Chromium
  const browserType = page.context().browser()?.browserType().name()
@ -231,7 +214,7 @@ export async function getUtils(page: Page) {
    browserType !== 'chromium' ? null : await page.context().newCDPSession(page)

  return {
-    waitForAuthSkipAppStart: () => waitForAuthAndLsp(page),
+    waitForAuthSkipAppStart: () => waitForPageLoad(page),
    removeCurrentCode: () => removeCurrentCode(page),
    sendCustomCmd: (cmd: EngineCommand) => sendCustomCmd(page, cmd),
    updateCamPosition: async (xyz: [number, number, number]) => {
@ -245,8 +228,7 @@ export async function getUtils(page: Page) {
      await fillInput('z', xyz[2])
    },
    clearCommandLogs: () => clearCommandLogs(page),
-    expectCmdLog: (locatorStr: string, timeout = 5000) =>
-      expectCmdLog(page, locatorStr, timeout),
+    expectCmdLog: (locatorStr: string) => expectCmdLog(page, locatorStr),
    openKclCodePanel: () => openKclCodePanel(page),
    closeKclCodePanel: () => closeKclCodePanel(page),
    openDebugPanel: () => openDebugPanel(page),
@ -318,19 +300,11 @@ export async function getUtils(page: Page) {
        (screenshot.width * coords.y * pixMultiplier +
          coords.x * pixMultiplier) *
        4 // rbga is 4 channels
-      const maxDiff = Math.max(
+      return Math.max(
        Math.abs(screenshot.data[index] - expected[0]),
        Math.abs(screenshot.data[index + 1] - expected[1]),
        Math.abs(screenshot.data[index + 2] - expected[2])
      )
-      if (maxDiff > 4) {
-        console.log(
-          `Expected: ${expected} Actual: [${screenshot.data[index]}, ${
-            screenshot.data[index + 1]
-          }, ${screenshot.data[index + 2]}]`
-        )
-      }
-      return maxDiff
    },
    doAndWaitForImageDiff: (fn: () => Promise<any>, diffCount = 200) =>
      new Promise(async (resolve) => {
--- a/examples/addition.cado
+++ b/examples/addition.cado
@ -0,0 +1,3 @@
+// comment
+
+const hi = 5 + 4
--- a/package.json
+++ b/package.json
@ -1,43 +1,50 @@
 {
  "name": "untitled-app",
-  "version": "0.23.0",
+  "version": "0.22.6",
  "private": true,
  "dependencies": {
-    "@codemirror/autocomplete": "^6.16.3",
-    "@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",
-    "@csstools/postcss-oklab-function": "^3.0.16",
+    "@codemirror/autocomplete": "^6.16.0",
    "@fortawesome/fontawesome-svg-core": "^6.5.2",
    "@fortawesome/free-brands-svg-icons": "^6.5.2",
    "@fortawesome/free-solid-svg-icons": "^6.4.2",
    "@fortawesome/react-fontawesome": "^0.2.0",
    "@headlessui/react": "^1.7.19",
    "@headlessui/tailwindcss": "^0.2.0",
-    "@kittycad/lib": "^0.0.69",
+    "@kittycad/lib": "^0.0.67",
+    "@lezer/javascript": "^1.4.9",
+    "@open-rpc/client-js": "^1.8.1",
    "@react-hook/resize-observer": "^2.0.1",
    "@replit/codemirror-interact": "^6.3.1",
    "@tauri-apps/api": "2.0.0-beta.12",
    "@tauri-apps/plugin-dialog": "^2.0.0-beta.2",
-    "@tauri-apps/plugin-fs": "^2.0.0-beta.5",
+    "@tauri-apps/plugin-fs": "^2.0.0-beta.3",
    "@tauri-apps/plugin-http": "^2.0.0-beta.2",
    "@tauri-apps/plugin-os": "^2.0.0-beta.3",
    "@tauri-apps/plugin-process": "^2.0.0-beta.2",
    "@tauri-apps/plugin-shell": "^2.0.0-beta.2",
    "@tauri-apps/plugin-updater": "^2.0.0-beta.3",
+    "@testing-library/jest-dom": "^5.14.1",
+    "@testing-library/react": "^15.0.2",
+    "@testing-library/user-event": "^14.5.2",
    "@ts-stack/markdown": "^1.5.0",
    "@tweenjs/tween.js": "^23.1.1",
+    "@types/node": "^18.19.31",
+    "@types/react": "^18.3.2",
+    "@types/react-dom": "^18.2.25",
    "@uiw/react-codemirror": "^4.21.25",
    "@xstate/inspect": "^0.8.0",
    "@xstate/react": "^3.2.2",
-    "codemirror": "^6.0.1",
+    "crypto-js": "^4.2.0",
+    "debounce-promise": "^3.1.2",
    "decamelize": "^6.0.0",
+    "eslint-plugin-suggest-no-throw": "^1.0.0",
+    "formik": "^2.4.6",
    "fuse.js": "^7.0.0",
-    "html2canvas-pro": "^1.5.1",
+    "html2canvas-pro": "^1.4.3",
+    "http-server": "^14.1.1",
    "json-rpc-2.0": "^1.6.0",
    "jszip": "^3.10.1",
+    "node-fetch": "^3.3.2",
    "re-resizable": "^6.9.11",
    "react": "^18.3.1",
    "react-dom": "^18.2.0",
@ -48,15 +55,20 @@
    "react-modal-promise": "^1.0.2",
    "react-router-dom": "^6.23.1",
    "sketch-helpers": "^0.0.4",
-    "three": "^0.166.1",
+    "swr": "^2.2.5",
+    "three": "^0.164.1",
+    "ts-node": "^10.9.2",
    "typescript": "^5.4.5",
    "ua-parser-js": "^1.0.37",
    "uuid": "^9.0.1",
+    "vitest": "^1.6.0",
    "vscode-jsonrpc": "^8.2.1",
    "vscode-languageserver-protocol": "^3.17.5",
-    "vscode-uri": "^3.0.8",
+    "wasm-pack": "^0.12.1",
    "web-vitals": "^3.5.2",
-    "xstate": "^4.38.2"
+    "ws": "^8.17.0",
+    "xstate": "^4.38.2",
+    "zustand": "^4.5.2"
  },
  "scripts": {
    "start": "vite",
@ -73,11 +85,11 @@
    "test:e2e:tauri": "E2E_TAURI_ENABLED=true TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\"}' wdio run wdio.conf.ts",
    "simpleserver:ci": "yarn pretest && http-server ./public --cors -p 3000 &",
    "simpleserver": "yarn pretest && http-server ./public --cors -p 3000",
-    "fmt": "prettier --write ./src *.ts *.json *.js ./e2e ./packages",
-    "fmt-check": "prettier --check ./src *.ts *.json *.js ./e2e ./packages",
+    "fmt": "prettier --write ./src *.ts *.json *.js ./e2e",
+    "fmt-check": "prettier --check ./src *.ts *.json *.js ./e2e",
    "fetch:wasm": "./get-latest-wasm-bundle.sh",
    "build:wasm-dev": "(cd src/wasm-lib && wasm-pack build --dev --target web --out-dir pkg && cargo test -p kcl-lib export_bindings) && cp src/wasm-lib/pkg/wasm_lib_bg.wasm public && yarn fmt",
-    "build:wasm": "(cd src/wasm-lib && wasm-pack build --release --target web --out-dir pkg && cargo test -p kcl-lib export_bindings) && cp src/wasm-lib/pkg/wasm_lib_bg.wasm public && yarn fmt",
+    "build:wasm": "(cd src/wasm-lib && wasm-pack build --target web --out-dir pkg && cargo test -p kcl-lib export_bindings) && cp src/wasm-lib/pkg/wasm_lib_bg.wasm public && yarn fmt",
    "build:wasm-clean": "yarn wasm-prep && yarn build:wasm",
    "remove-importmeta": "sed -i 's/import.meta.url/window.location.origin/g' \"./src/wasm-lib/pkg/wasm_lib.js\"; sed -i '' 's/import.meta.url/window.location.origin/g' \"./src/wasm-lib/pkg/wasm_lib.js\" || echo \"sed for both mac and linux\"",
    "wasm-prep": "rm -rf src/wasm-lib/pkg && mkdir src/wasm-lib/pkg && rm -rf src/wasm-lib/kcl/bindings",
@ -109,16 +121,13 @@
    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
    "@babel/preset-env": "^7.24.3",
    "@iarna/toml": "^2.2.5",
-    "@playwright/test": "^1.45.1",
-    "@tauri-apps/cli": "==2.0.0-beta.13",
-    "@testing-library/jest-dom": "^5.14.1",
-    "@testing-library/react": "^15.0.2",
+    "@playwright/test": "^1.44.1",
+    "@tauri-apps/cli": "^2.0.0-beta.13",
+    "@types/crypto-js": "^4.2.2",
+    "@types/debounce-promise": "^3.1.9",
    "@types/mocha": "^10.0.6",
-    "@types/node": "^18.19.31",
    "@types/pixelmatch": "^5.2.6",
    "@types/pngjs": "^6.0.4",
-    "@types/react": "^18.3.2",
-    "@types/react-dom": "^18.2.25",
    "@types/react-modal": "^3.16.3",
    "@types/three": "^0.163.0",
    "@types/ua-parser-js": "^0.7.39",
@ -138,27 +147,21 @@
    "eslint": "^8.57.0",
    "eslint-config-react-app": "^7.0.1",
    "eslint-plugin-css-modules": "^2.12.0",
-    "eslint-plugin-suggest-no-throw": "^1.0.0",
    "happy-dom": "^14.3.10",
-    "http-server": "^14.1.1",
    "husky": "^9.0.11",
-    "node-fetch": "^3.3.2",
    "pixelmatch": "^5.3.0",
    "pngjs": "^7.0.0",
    "postcss": "^8.4.31",
    "postinstall-postinstall": "^2.1.0",
-    "prettier": "^2.8.8",
+    "prettier": "^2.8.0",
    "setimmediate": "^1.0.5",
    "tailwindcss": "^3.4.1",
    "vite": "^5.2.9",
    "vite-plugin-eslint": "^1.8.1",
    "vite-plugin-package-version": "^1.1.0",
    "vite-tsconfig-paths": "^4.3.2",
-    "vitest": "^1.6.0",
    "vitest-webgl-canvas-mock": "^1.1.0",
    "wait-on": "^7.2.0",
-    "wasm-pack": "^0.13.0",
-    "ws": "^8.17.0",
    "yarn": "^1.22.22"
  }
 }
--- a/packages/codemirror-lsp-client/.gitignore
+++ b/packages/codemirror-lsp-client/.gitignore
@ -1,6 +0,0 @@
-node_modules
-build
-dist
-tsconfig.tsbuildinfo
-*.d.ts
-*.js
--- a/packages/codemirror-lsp-client/package.json
+++ b/packages/codemirror-lsp-client/package.json
@ -1,35 +0,0 @@
-{
-  "name": "@kittycad/codemirror-lsp-client",
-  "version": "1.0.0",
-  "description": "An LSP client for the codemirror editor.",
-  "main": "src/index.ts",
-  "exports": {
-    "import": "./dist/index.js",
-    "require": "./dist/index.js"
-  },
-  "scripts": {
-    "build": "tsc"
-  },
-  "types": "dist/index.d.ts",
-  "module": "dist/index.js",
-  "type": "module",
-  "repository": "https://github.com/KittyCAD/modeling-app",
-  "author": "Zoo Engineering Team",
-  "license": "MIT",
-  "private": false,
-  "dependencies": {
-    "@codemirror/autocomplete": "^6.16.3",
-    "@codemirror/language": "^6.10.2",
-    "@codemirror/state": "^6.4.1",
-    "@lezer/highlight": "^1.2.0",
-    "@ts-stack/markdown": "^1.5.0",
-    "json-rpc-2.0": "^1.7.0",
-    "typescript": "^5.5.2",
-    "vscode-languageserver-protocol": "^3.17.5",
-    "vscode-uri": "^3.0.8"
-  },
-  "devDependencies": {
-    "@types/node": "^20.14.9",
-    "ts-node": "^10.9.2"
-  }
-}
--- a/packages/codemirror-lsp-client/src/client/codec/tracer.ts
+++ b/packages/codemirror-lsp-client/src/client/codec/tracer.ts
@ -1,13 +0,0 @@
-import { Message } from 'vscode-languageserver-protocol'
-
-export default class Tracer {
-  static client(message: string): void {
-    console.log('lsp client message', message)
-  }
-
-  static server(input: string | Message): void {
-    const message: string =
-      typeof input === 'string' ? input : JSON.stringify(input)
-    console.log('lsp server message', message)
-  }
-}
--- a/packages/codemirror-lsp-client/src/index.ts
+++ b/packages/codemirror-lsp-client/src/index.ts
@ -1,113 +0,0 @@
-import { autocompletion } from '@codemirror/autocomplete'
-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,
-  LanguageServerPluginSpec,
-  languageId,
-  workspaceFolders,
-  LanguageServerOptions,
-} from './plugin/lsp'
-import { offsetToPos } from './plugin/util'
-
-export type { LanguageServerClientOptions } from './client'
-export { LanguageServerClient } from './client'
-export {
-  Codec,
-  FromServer,
-  IntoServer,
-  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,
-} from './plugin/lsp'
-export { posToOffset, offsetToPos } from './plugin/util'
-
-export function lspPlugin(options: LanguageServerOptions): Extension {
-  let plugin: LanguageServerPlugin | null = null
-  const viewPlugin = ViewPlugin.define(
-    (view) => (plugin = new LanguageServerPlugin(options, view)),
-    new LanguageServerPluginSpec()
-  )
-
-  let ext = [
-    docPathFacet.of(options.documentUri),
-    languageId.of('kcl'),
-    workspaceFolders.of(options.workspaceFolders),
-    viewPlugin,
-    foldService.of((state: EditorState, lineStart: number, lineEnd: number) => {
-      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)
-    }),
-  ]
-
-  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
-}
--- a/packages/codemirror-lsp-client/src/plugin/annotations.ts
+++ b/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,
-  }
-}
--- a/packages/codemirror-lsp-client/src/plugin/autocomplete.ts
+++ b/packages/codemirror-lsp-client/src/plugin/autocomplete.ts
@ -1,51 +0,0 @@
-import {
-  acceptCompletion,
-  clearSnippet,
-  closeCompletion,
-  hasNextSnippetField,
-  moveCompletionSelection,
-  nextSnippetField,
-  prevSnippetField,
-  startCompletion,
-} from '@codemirror/autocomplete'
-import { Prec } from '@codemirror/state'
-import { EditorView, keymap, KeyBinding } from '@codemirror/view'
-
-import { CompletionItemKind } from 'vscode-languageserver-protocol'
-
-export const CompletionItemKindMap = Object.fromEntries(
-  Object.entries(CompletionItemKind).map(([key, value]) => [value, key])
-) as Record<CompletionItemKind, string>
-
-const lspAutocompleteKeymap: readonly KeyBinding[] = [
-  { key: 'Ctrl-Space', run: startCompletion },
-  {
-    key: 'Escape',
-    run: (view: EditorView): boolean => {
-      if (clearSnippet(view)) return true
-
-      return closeCompletion(view)
-    },
-  },
-  { key: 'ArrowDown', run: moveCompletionSelection(true) },
-  { key: 'ArrowUp', run: moveCompletionSelection(false) },
-  { key: 'PageDown', run: moveCompletionSelection(true, 'page') },
-  { key: 'PageUp', run: moveCompletionSelection(false, 'page') },
-  { key: 'Enter', run: acceptCompletion },
-  {
-    key: 'Tab',
-    run: (view: EditorView): boolean => {
-      if (hasNextSnippetField(view.state)) {
-        const result = nextSnippetField(view)
-        return result
-      }
-
-      return acceptCompletion(view)
-    },
-    shift: prevSnippetField,
-  },
-]
-
-export const lspAutocompleteKeymapExt = Prec.highest(
-  keymap.computeN([], () => [lspAutocompleteKeymap])
-)
--- a/packages/codemirror-lsp-client/src/plugin/format.ts
+++ b/packages/codemirror-lsp-client/src/plugin/format.ts
@ -1,27 +0,0 @@
-import { Extension, Prec } from '@codemirror/state'
-import { EditorView, keymap, KeyBinding, ViewPlugin } from '@codemirror/view'
-
-import { LanguageServerPlugin } from './lsp'
-
-export default function lspFormatExt(
-  plugin: ViewPlugin<LanguageServerPlugin>
-): Extension {
-  const formatKeymap: readonly KeyBinding[] = [
-    {
-      key: 'Alt-Shift-f',
-      run: (view: EditorView) => {
-        let value = view.plugin(plugin)
-        if (!value) return false
-        value.requestFormatting()
-        return true
-      },
-    },
-  ]
-
-  // Create an extension for the key mappings.
-  const formatKeymapExt = Prec.highest(
-    keymap.computeN([], () => [formatKeymap])
-  )
-
-  return formatKeymapExt
-}
--- a/packages/codemirror-lsp-client/src/plugin/hover.ts
+++ b/packages/codemirror-lsp-client/src/plugin/hover.ts
@ -1,22 +0,0 @@
-import { Extension } from '@codemirror/state'
-import { hoverTooltip, tooltips, ViewPlugin } from '@codemirror/view'
-
-import { LanguageServerPlugin } from './lsp'
-import { offsetToPos } from './util'
-
-export default function lspHoverExt(
-  plugin: ViewPlugin<LanguageServerPlugin>
-): Extension {
-  return [
-    hoverTooltip((view, pos) => {
-      const value = view.plugin(plugin)
-      return (
-        value?.requestHoverTooltip(view, offsetToPos(view.state.doc, pos)) ??
-        null
-      )
-    }),
-    tooltips({
-      position: 'absolute',
-    }),
-  ]
-}
--- a/packages/codemirror-lsp-client/src/plugin/indent.ts
+++ b/packages/codemirror-lsp-client/src/plugin/indent.ts
@ -1,21 +0,0 @@
-import { indentService } from '@codemirror/language'
-import { Extension } from '@codemirror/state'
-
-export default function lspIndentExt(): Extension {
-  // Match the indentation of the previous line (if present).
-  return indentService.of((context, pos) => {
-    try {
-      const previousLine = context.lineAt(pos, -1)
-      const previousLineText = previousLine.text.replaceAll(
-        '\t',
-        ' '.repeat(context.state.tabSize)
-      )
-      const match = previousLineText.match(/^(\s)*/)
-      if (match === null || match.length <= 0) return null
-      return match[0].length
-    } catch (err) {
-      console.error('Error in codemirror indentService', err)
-    }
-    return null
-  })
-}
--- a/packages/codemirror-lsp-client/src/plugin/lint.ts
+++ b/packages/codemirror-lsp-client/src/plugin/lint.ts
@ -1,12 +0,0 @@
-import { Extension } from '@codemirror/state'
-import { linter, forEachDiagnostic, Diagnostic } from '@codemirror/lint'
-
-export default function lspLintExt(): Extension {
-  return linter((view) => {
-    let diagnostics: Diagnostic[] = []
-    forEachDiagnostic(view.state, (d: Diagnostic, from: number, to: number) => {
-      diagnostics.push(d)
-    })
-    return diagnostics
-  })
-}
--- a/packages/codemirror-lsp-client/src/plugin/semantic-tokens.ts
+++ b/packages/codemirror-lsp-client/src/plugin/semantic-tokens.ts
@ -1,175 +0,0 @@
-import { highlightingFor } from '@codemirror/language'
-import { StateEffect, StateField, Extension } from '@codemirror/state'
-import { EditorView, Decoration, DecorationSet } from '@codemirror/view'
-
-import { Tag, tags } from '@lezer/highlight'
-
-import { lspSemanticTokensEvent } from './annotations'
-
-export interface SemanticToken {
-  from: number
-  to: number
-  type: string
-  modifiers: string[]
-}
-
-export const addToken = StateEffect.define<SemanticToken>({
-  map: (token: SemanticToken, change) => ({
-    ...token,
-    from: change.mapPos(token.from),
-    to: change.mapPos(token.to),
-  }),
-})
-
-export default function lspSemanticTokenExt(): Extension {
-  return StateField.define<DecorationSet>({
-    create() {
-      return Decoration.none
-    },
-    update(highlights, tr) {
-      // Nothing can come before this line, this is very important!
-      // It makes sure the highlights are updated correctly for the changes.
-      highlights = highlights.map(tr.changes)
-
-      const isSemanticTokensEvent = tr.annotation(lspSemanticTokensEvent.type)
-      if (!isSemanticTokensEvent) {
-        return highlights
-      }
-
-      // Check if any of the changes are addToken
-      const hasAddToken = tr.effects.some((e) => e.is(addToken))
-      if (hasAddToken) {
-        highlights = highlights.update({
-          filter: (from, to) => false,
-        })
-      }
-
-      for (const e of tr.effects)
-        if (e.is(addToken)) {
-          const tag = getTag(e.value)
-          const className = tag
-            ? highlightingFor(tr.startState, [tag])
-            : undefined
-
-          if (e.value.from < e.value.to && tag) {
-            if (className) {
-              highlights = highlights.update({
-                add: [
-                  Decoration.mark({ class: className }).range(
-                    e.value.from,
-                    e.value.to
-                  ),
-                ],
-              })
-            }
-          }
-        }
-      return highlights
-    },
-    provide: (f) => EditorView.decorations.from(f),
-  })
-}
-
-export function getTag(semanticToken: SemanticToken): Tag | null {
-  let tokenType = convertSemanticTokenTypeToCodeMirrorTag(semanticToken.type)
-
-  if (
-    semanticToken.modifiers === undefined ||
-    semanticToken.modifiers === null ||
-    semanticToken.modifiers.length === 0
-  ) {
-    return tokenType
-  }
-
-  for (let modifier of semanticToken.modifiers) {
-    tokenType = convertSemanticTokenToCodeMirrorTag(
-      '',
-      modifier,
-      tokenType || undefined
-    )
-  }
-
-  return tokenType
-}
-
-export function getTagName(semanticToken: SemanticToken): string {
-  let tokenType = semanticToken.type
-
-  if (
-    semanticToken.modifiers === undefined ||
-    semanticToken.modifiers === null ||
-    semanticToken.modifiers.length === 0
-  ) {
-    return tokenType
-  }
-
-  for (let modifier of semanticToken.modifiers) {
-    tokenType = `${tokenType}.${modifier}`
-  }
-
-  return tokenType
-}
-
-function convertSemanticTokenTypeToCodeMirrorTag(
-  tokenType: string
-): Tag | null {
-  switch (tokenType) {
-    case 'keyword':
-      return tags.keyword
-    case 'variable':
-      return tags.variableName
-    case 'string':
-      return tags.string
-    case 'number':
-      return tags.number
-    case 'comment':
-      return tags.comment
-    case 'operator':
-      return tags.operator
-    case 'function':
-      return tags.function(tags.name)
-    case 'type':
-      return tags.typeName
-    case 'property':
-      return tags.propertyName
-    case 'parameter':
-      return tags.local(tags.name)
-    default:
-      console.error('Unknown token type:', tokenType)
-      return null
-  }
-}
-
-function convertSemanticTokenToCodeMirrorTag(
-  tokenType: string,
-  tokenModifier: string,
-  givenTag?: Tag
-): Tag | null {
-  let tag = givenTag
-    ? givenTag
-    : convertSemanticTokenTypeToCodeMirrorTag(tokenType)
-
-  if (!tag) {
-    return null
-  }
-
-  if (tokenModifier) {
-    switch (tokenModifier) {
-      case 'definition':
-        return tags.definition(tag)
-      case 'declaration':
-        return tags.definition(tag)
-      case 'readonly':
-        return tags.constant(tag)
-      case 'static':
-        return tags.constant(tag)
-      case 'defaultLibrary':
-        return tags.standard(tag)
-      default:
-        console.error('Unknown token modifier:', tokenModifier)
-        return tag
-    }
-  }
-
-  return tag
-}
--- a/packages/codemirror-lsp-client/src/plugin/util.ts
+++ b/packages/codemirror-lsp-client/src/plugin/util.ts
@ -1,55 +0,0 @@
-import { Text } from '@codemirror/state'
-import { Marked } from '@ts-stack/markdown'
-
-import type * as LSP from 'vscode-languageserver-protocol'
-
-// takes a function and executes it after the wait time, if the function is called again before the wait time is up, the timer is reset
-export function deferExecution<T>(func: (args: T) => any, wait: number) {
-  let timeout: ReturnType<typeof setTimeout> | null
-  let latestArgs: T
-
-  function later() {
-    timeout = null
-    func(latestArgs)
-  }
-
-  function deferred(args: T) {
-    latestArgs = args
-    if (timeout) {
-      clearTimeout(timeout)
-    }
-    timeout = setTimeout(later, wait)
-  }
-
-  return deferred
-}
-
-export function posToOffset(
-  doc: Text,
-  pos: { line: number; character: number }
-): number | undefined {
-  if (pos.line >= doc.lines) return
-  const offset = doc.line(pos.line + 1).from + pos.character
-  if (offset > doc.length) return
-  return offset
-}
-
-export function offsetToPos(doc: Text, offset: number) {
-  const line = doc.lineAt(offset)
-  return {
-    line: line.number - 1,
-    character: offset - line.from,
-  }
-}
-
-export function formatMarkdownContents(
-  contents: LSP.MarkupContent | LSP.MarkedString | LSP.MarkedString[]
-): string {
-  if (Array.isArray(contents)) {
-    return contents.map((c) => formatMarkdownContents(c) + '\n\n').join('')
-  } else if (typeof contents === 'string') {
-    return Marked.parse(contents)
-  } else {
-    return Marked.parse(contents.value)
-  }
-}
--- a/packages/codemirror-lsp-client/tsconfig.json
+++ b/packages/codemirror-lsp-client/tsconfig.json
@ -1,18 +0,0 @@
-{
-  "compilerOptions": {
-    "composite": true,
-    "rootDir": "src",
-    "outDir": "dist",
-    "target": "esnext",
-    "lib": ["dom", "dom.iterable", "esnext"],
-    "module": "commonjs",
-    "esModuleInterop": true,
-    "forceConsistentCasingInFileNames": true,
-    "strict": true,
-    "noImplicitAny": true,
-    "skipLibCheck": true,
-    "declaration": true
-  },
-  "include": ["src", "./*.ts"],
-  "exclude": ["node_modules"]
-}
--- a/packages/codemirror-lsp-client/yarn.lock
+++ b/packages/codemirror-lsp-client/yarn.lock
@ -1,231 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@codemirror/autocomplete@^6.16.3":
-  version "6.16.3"
-  resolved "https://registry.yarnpkg.com/@codemirror/autocomplete/-/autocomplete-6.16.3.tgz#04d5a4e4e44ccae1ba525d47db53a5479bf46338"
-  integrity sha512-Vl/tIeRVVUCRDuOG48lttBasNQu8usGgXQawBXI7WJAiUDSFOfzflmEsZFZo48mAvAaa4FZ/4/yLLxFtdJaKYA==
-  dependencies:
-    "@codemirror/language" "^6.0.0"
-    "@codemirror/state" "^6.0.0"
-    "@codemirror/view" "^6.17.0"
-    "@lezer/common" "^1.0.0"
-
-"@codemirror/language@^6.0.0", "@codemirror/language@^6.10.2":
-  version "6.10.2"
-  resolved "https://registry.yarnpkg.com/@codemirror/language/-/language-6.10.2.tgz#4056dc219619627ffe995832eeb09cea6060be61"
-  integrity sha512-kgbTYTo0Au6dCSc/TFy7fK3fpJmgHDv1sG1KNQKJXVi+xBTEeBPY/M30YXiU6mMXeH+YIDLsbrT4ZwNRdtF+SA==
-  dependencies:
-    "@codemirror/state" "^6.0.0"
-    "@codemirror/view" "^6.23.0"
-    "@lezer/common" "^1.1.0"
-    "@lezer/highlight" "^1.0.0"
-    "@lezer/lr" "^1.0.0"
-    style-mod "^4.0.0"
-
-"@codemirror/state@^6.0.0", "@codemirror/state@^6.4.0", "@codemirror/state@^6.4.1":
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/@codemirror/state/-/state-6.4.1.tgz#da57143695c056d9a3c38705ed34136e2b68171b"
-  integrity sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A==
-
-"@codemirror/view@^6.17.0", "@codemirror/view@^6.23.0":
-  version "6.28.2"
-  resolved "https://registry.yarnpkg.com/@codemirror/view/-/view-6.28.2.tgz#026d5d2bd315aa015c1a1573b6358eeba7acd004"
-  integrity sha512-A3DmyVfjgPsGIjiJqM/zvODUAPQdQl3ci0ghehYNnbt5x+o76xq+dL5+mMBuysDXnI3kapgOkoeJ0sbtL/3qPw==
-  dependencies:
-    "@codemirror/state" "^6.4.0"
-    style-mod "^4.1.0"
-    w3c-keyname "^2.2.4"
-
-"@cspotcode/source-map-support@^0.8.0":
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
-  integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
-  dependencies:
-    "@jridgewell/trace-mapping" "0.3.9"
-
-"@jridgewell/resolve-uri@^3.0.3":
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
-  integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
-
-"@jridgewell/sourcemap-codec@^1.4.10":
-  version "1.4.15"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
-  integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
-
-"@jridgewell/trace-mapping@0.3.9":
-  version "0.3.9"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
-  integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.0.3"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-
-"@lezer/common@^1.0.0", "@lezer/common@^1.1.0":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@lezer/common/-/common-1.2.1.tgz#198b278b7869668e1bebbe687586e12a42731049"
-  integrity sha512-yemX0ZD2xS/73llMZIK6KplkjIjf2EvAHcinDi/TfJ9hS25G0388+ClHt6/3but0oOxinTcQHJLDXh6w1crzFQ==
-
-"@lezer/highlight@^1.0.0", "@lezer/highlight@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@lezer/highlight/-/highlight-1.2.0.tgz#e5898c3644208b4b589084089dceeea2966f7780"
-  integrity sha512-WrS5Mw51sGrpqjlh3d4/fOwpEV2Hd3YOkp9DBt4k8XZQcoTHZFB7sx030A6OcahF4J1nDQAa3jXlTVVYH50IFA==
-  dependencies:
-    "@lezer/common" "^1.0.0"
-
-"@lezer/lr@^1.0.0":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@lezer/lr/-/lr-1.4.1.tgz#fe25f051880a754e820b28148d90aa2a96b8bdd2"
-  integrity sha512-CHsKq8DMKBf9b3yXPDIU4DbH+ZJd/sJdYOW2llbW/HudP5u0VS6Bfq1hLYfgU7uAYGFIyGGQIsSOXGPEErZiJw==
-  dependencies:
-    "@lezer/common" "^1.0.0"
-
-"@ts-stack/markdown@^1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@ts-stack/markdown/-/markdown-1.5.0.tgz#5dc298a20dc3dc040143c5a5948201eb6bf5419d"
-  integrity sha512-ntVX2Kmb2jyTdH94plJohokvDVPvp6CwXHqsa9NVZTK8cOmHDCYNW0j6thIadUVRTStJhxhfdeovLd0owqDxLw==
-  dependencies:
-    tslib "^2.3.0"
-
-"@tsconfig/node10@^1.0.7":
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.11.tgz#6ee46400685f130e278128c7b38b7e031ff5b2f2"
-  integrity sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==
-
-"@tsconfig/node12@^1.0.7":
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
-  integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
-
-"@tsconfig/node14@^1.0.0":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
-  integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
-
-"@tsconfig/node16@^1.0.2":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
-  integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==
-
-"@types/node@^20.14.9":
-  version "20.14.9"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.9.tgz#12e8e765ab27f8c421a1820c99f5f313a933b420"
-  integrity sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==
-  dependencies:
-    undici-types "~5.26.4"
-
-acorn-walk@^8.1.1:
-  version "8.3.3"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.3.tgz#9caeac29eefaa0c41e3d4c65137de4d6f34df43e"
-  integrity sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==
-  dependencies:
-    acorn "^8.11.0"
-
-acorn@^8.11.0, acorn@^8.4.1:
-  version "8.12.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.0.tgz#1627bfa2e058148036133b8d9b51a700663c294c"
-  integrity sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==
-
-arg@^4.1.0:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
-  integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
-
-create-require@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
-  integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
-
-diff@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
-  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
-
-json-rpc-2.0@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/json-rpc-2.0/-/json-rpc-2.0-1.7.0.tgz#840deb0bc168463e12bceb462f7fe225e793fc17"
-  integrity sha512-asnLgC1qD5ytP+fvBP8uL0rvj+l8P6iYICbzZ8dVxCpESffVjzA7KkYkbKCIbavs7cllwH1ZUaNtJwphdeRqpg==
-
-make-error@^1.1.1:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
-  integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
-
-style-mod@^4.0.0, style-mod@^4.1.0:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/style-mod/-/style-mod-4.1.2.tgz#ca238a1ad4786520f7515a8539d5a63691d7bf67"
-  integrity sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==
-
-ts-node@^10.9.2:
-  version "10.9.2"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.2.tgz#70f021c9e185bccdca820e26dc413805c101c71f"
-  integrity sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==
-  dependencies:
-    "@cspotcode/source-map-support" "^0.8.0"
-    "@tsconfig/node10" "^1.0.7"
-    "@tsconfig/node12" "^1.0.7"
-    "@tsconfig/node14" "^1.0.0"
-    "@tsconfig/node16" "^1.0.2"
-    acorn "^8.4.1"
-    acorn-walk "^8.1.1"
-    arg "^4.1.0"
-    create-require "^1.1.0"
-    diff "^4.0.1"
-    make-error "^1.1.1"
-    v8-compile-cache-lib "^3.0.1"
-    yn "3.1.1"
-
-tslib@^2.3.0:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
-  integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==
-
-typescript@^5.5.2:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.2.tgz#c26f023cb0054e657ce04f72583ea2d85f8d0507"
-  integrity sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
-
-v8-compile-cache-lib@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
-  integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
-
-vscode-jsonrpc@8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz#f43dfa35fb51e763d17cd94dcca0c9458f35abf9"
-  integrity sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==
-
-vscode-languageserver-protocol@^3.17.5:
-  version "3.17.5"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz#864a8b8f390835572f4e13bd9f8313d0e3ac4bea"
-  integrity sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==
-  dependencies:
-    vscode-jsonrpc "8.2.0"
-    vscode-languageserver-types "3.17.5"
-
-vscode-languageserver-types@3.17.5:
-  version "3.17.5"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz#3273676f0cf2eab40b3f44d085acbb7f08a39d8a"
-  integrity sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==
-
-vscode-uri@^3.0.8:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.8.tgz#1770938d3e72588659a172d0fd4642780083ff9f"
-  integrity sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==
-
-w3c-keyname@^2.2.4:
-  version "2.2.8"
-  resolved "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.8.tgz#7b17c8c6883d4e8b86ac8aba79d39e880f8869c5"
-  integrity sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==
-
-yn@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
-  integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
--- a/playwright.config.ts
+++ b/playwright.config.ts
@ -12,13 +12,13 @@ import { defineConfig, devices } from '@playwright/test'
 export default defineConfig({
  testDir: './e2e/playwright',
  /* Run tests in files in parallel */
-  fullyParallel: true,
+  fullyParallel: false,
  /* Fail the build on CI if you accidentally left test.only in the source code. */
  forbidOnly: !!process.env.CI,
-  /* Do not retry */
-  retries: process.env.CI ? 0 : 0,
+  /* Retry on CI only */
+  retries: process.env.CI ? 3 : 0,
  /* Different amount of parallelism on CI and local. */
-  workers: process.env.CI ? 4 : 4,
+  workers: process.env.CI ? 1 : 4,
  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
  reporter: 'html',
  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
--- a/postcss.config.js
+++ b/postcss.config.js
@ -1,7 +1,6 @@
 module.exports = {
  plugins: {
    tailwindcss: {},
-    '@csstools/postcss-oklab-function': { preserve: true },
    autoprefixer: {},
  },
 }
--- a/public/cat.jpg
+++ b/public/cat.jpg
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@ -405,6 +405,12 @@ dependencies = [
 "system-deps",
 ]

+[[package]]
+name = "atomic"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba"
+
 [[package]]
 name = "atomic-waker"
 version = "1.1.2"
@ -1140,20 +1146,6 @@ dependencies = [
 "parking_lot_core 0.9.9",
 ]

-[[package]]
-name = "dashmap"
-version = "6.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
- "hashbrown 0.14.3",
- "lock_api",
- "once_cell",
- "parking_lot_core 0.9.9",
-]
-
 [[package]]
 name = "data-encoding"
 version = "2.5.0"
@ -1212,7 +1204,7 @@ dependencies = [

 [[package]]
 name = "derive-docs"
-version = "0.1.20"
+version = "0.1.18"
 dependencies = [
 "Inflector",
 "convert_case 0.6.0",
@ -1260,15 +1252,6 @@ dependencies = [
 "subtle",
 ]

-[[package]]
-name = "dirs"
-version = "5.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
-dependencies = [
- "dirs-sys",
-]
-
 [[package]]
 name = "dirs-next"
 version = "2.0.0"
@ -1279,18 +1262,6 @@ dependencies = [
 "dirs-sys-next",
 ]

-[[package]]
-name = "dirs-sys"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
-dependencies = [
- "libc",
- "option-ext",
- "redox_users",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "dirs-sys-next"
 version = "0.1.2"
@ -2597,7 +2568,7 @@ dependencies = [

 [[package]]
 name = "kcl-lib"
-version = "0.1.69"
+version = "0.1.65"
 dependencies = [
 "anyhow",
 "approx",
@ -2607,7 +2578,7 @@ dependencies = [
 "bson",
 "chrono",
 "clap",
- "dashmap 6.0.1",
+ "dashmap",
 "databake",
 "derive-docs",
 "form_urlencoded",
@ -2967,9 +2938,9 @@ dependencies = [

 [[package]]
 name = "muda"
-version = "0.13.5"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b959f97c97044e4c96e32e1db292a7d594449546a3c6b77ae613dc3a5b5145"
+checksum = "f428b4e9db3d17e2f809dfb1ff9ddfbbf16c71790d1656d10aee320877e1392f"
 dependencies = [
 "cocoa",
 "crossbeam-channel",
@ -3249,12 +3220,6 @@ dependencies = [
 "thiserror",
 ]

-[[package]]
-name = "option-ext"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
-
 [[package]]
 name = "ordered-stream"
 version = "0.2.0"
@ -4423,9 +4388,9 @@ dependencies = [

 [[package]]
 name = "schemars"
-version = "0.8.21"
+version = "0.8.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92"
+checksum = "7f55c82c700538496bdc329bb4918a81f87cc8888811bd123cf325a0f2f8d309"
 dependencies = [
 "bigdecimal",
 "bytes",
@ -4441,9 +4406,9 @@ dependencies = [

 [[package]]
 name = "schemars_derive"
-version = "0.8.21"
+version = "0.8.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e"
+checksum = "83263746fe5e32097f06356968a077f96089739c927a61450efa069905eec108"
 dependencies = [
 "proc-macro2",
 "quote",
@ -4573,9 +4538,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.118"
+version = "1.0.116"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4"
+checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
 dependencies = [
 "indexmap 2.2.6",
 "itoa 1.0.11",
@ -5081,9 +5046,9 @@ dependencies = [

 [[package]]
 name = "tao"
-version = "0.28.1"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea538df05fbc2dcbbd740ba0cfe8607688535f4798d213cbbfa13ce494f3451f"
+checksum = "92bcf8885e147b56d6e26751263b45876284f32ca404703f6d3b8f80d16ff4dd"
 dependencies = [
 "bitflags 2.5.0",
 "cocoa",
@ -5112,8 +5077,8 @@ dependencies = [
 "tao-macros",
 "unicode-segmentation",
 "url",
- "windows 0.57.0",
- "windows-core 0.57.0",
+ "windows 0.56.0",
+ "windows-core 0.56.0",
 "windows-version",
 "x11-dl",
 ]
@ -5163,9 +5128,9 @@ dependencies = [

 [[package]]
 name = "tauri"
-version = "2.0.0-beta.22"
+version = "2.0.0-beta.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a258ecc5ac7ddade525f512c4962fd01cd0f5265e917b4572579c32c027bb31"
+checksum = "5fedd5490eddf117253945f0baedafded43474c971cba546a818f527d5c26266"
 dependencies = [
 "anyhow",
 "bytes",
@ -5212,9 +5177,9 @@ dependencies = [

 [[package]]
 name = "tauri-build"
-version = "2.0.0-beta.17"
+version = "2.0.0-beta.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82b964bb6d03d97e24e12f896aab463b02a3c2ff76a60f728cc37b5548eb470e"
+checksum = "abcf98a9b4527567c3e5ca9723431d121e001c2145651b3fa044d22b5e025a7e"
 dependencies = [
 "anyhow",
 "cargo_toml",
@ -5234,9 +5199,9 @@ dependencies = [

 [[package]]
 name = "tauri-codegen"
-version = "2.0.0-beta.17"
+version = "2.0.0-beta.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3529cfa977ed7c097f2a5e8da19ecffbe61982450a6c819e6165b6d0cfd3dd3a"
+checksum = "b383f341efb803852b0235a2f330ca90c4c113f422dd6d646b888685b372cace"
 dependencies = [
 "base64 0.22.1",
 "brotli",
@ -5261,11 +5226,11 @@ dependencies = [

 [[package]]
 name = "tauri-macros"
-version = "2.0.0-beta.17"
+version = "2.0.0-beta.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36f97dd80334f29314aa5f40b5fad10cb9feffd08e5a5324fd728613841e5d33"
+checksum = "71be71718cfe48b149507157bfbad0e2ba0e98ea51658be26c7c677eb188fb0c"
 dependencies = [
- "heck 0.5.0",
+ "heck 0.4.1",
 "proc-macro2",
 "quote",
 "syn 2.0.68",
@ -5275,9 +5240,9 @@ dependencies = [

 [[package]]
 name = "tauri-plugin"
-version = "2.0.0-beta.17"
+version = "2.0.0-beta.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c8385fd0a4f661f5652b0d9e2d7256187d553bb174f88564d10ebcfa6a3af53"
+checksum = "6baaee0a083db1e04a1b7a3b0670d86a4d95dd2a54e7cbfb5547762b8ed098d9"
 dependencies = [
 "anyhow",
 "glob",
@ -5340,9 +5305,9 @@ dependencies = [

 [[package]]
 name = "tauri-plugin-fs"
-version = "2.0.0-beta.9"
+version = "2.0.0-beta.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3aa91955751f329e0aa431b87c199b7378b6f91ec0765d2ad9d4c64e017c3cda"
+checksum = "35377195c6923beda5f29482a16b492d431de964389fca9aaf81a0f7e908023f"
 dependencies = [
 "anyhow",
 "glob",
@ -5493,9 +5458,9 @@ dependencies = [

 [[package]]
 name = "tauri-runtime"
-version = "2.0.0-beta.18"
+version = "2.0.0-beta.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7dc96172a43536236ab55b7da7b8461bf75810985e668589e2395cb476937cb"
+checksum = "148b6e6aff8e63fe5d4ae1d50159d50cfc0b4309abdeca64833c887c6b5631ef"
 dependencies = [
 "dpi",
 "gtk",
@ -5512,9 +5477,9 @@ dependencies = [

 [[package]]
 name = "tauri-runtime-wry"
-version = "2.0.0-beta.18"
+version = "2.0.0-beta.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d4fd913b1f14a9b618c7f3ae35656d3aa759767fcb95b72006357c12b9d0b09"
+checksum = "398d065c6e0fbf3c4304583759b6e153bc1e0daeb033bede6834ebe4df371fc3"
 dependencies = [
 "cocoa",
 "gtk",
@ -5536,15 +5501,16 @@ dependencies = [

 [[package]]
 name = "tauri-utils"
-version = "2.0.0-beta.17"
+version = "2.0.0-beta.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f24a9c20d676a3f025331cc1c3841256ba88c9f25fb7fae709d2b3089c50d90"
+checksum = "d4709765385f035338ecc330f3fba753b8ee283c659c235da9768949cdb25469"
 dependencies = [
 "brotli",
 "cargo_metadata",
 "ctor",
 "dunce",
 "glob",
+ "heck 0.5.0",
 "html5ever",
 "infer",
 "json-patch",
@ -5900,7 +5866,7 @@ dependencies = [
 "async-trait",
 "auto_impl",
 "bytes",
- "dashmap 5.5.3",
+ "dashmap",
 "futures",
 "httparse",
 "lsp-types",
@ -6020,14 +5986,14 @@ dependencies = [

 [[package]]
 name = "tray-icon"
-version = "0.14.3"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ad8319cca93189ea9ab1b290de0595960529750b6b8b501a399ed1ec3775d60"
+checksum = "a97ec55956c54569e74209ae9d29a7a79193b252d17a6ac28bcffd4c11a384ad"
 dependencies = [
 "cocoa",
 "core-graphics",
 "crossbeam-channel",
- "dirs",
+ "dirs-next",
 "libappindicator",
 "muda",
 "objc",
@ -6055,9 +6021,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"

 [[package]]
 name = "ts-rs"
-version = "9.0.1"
+version = "9.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b44017f9f875786e543595076374b9ef7d13465a518dd93d6ccdbf5b432dde8c"
+checksum = "5e2dcf58e612adda9a83800731e8e4aba04d8a302b9029617b0b6e4b021d5357"
 dependencies = [
 "chrono",
 "serde_json",
@ -6069,9 +6035,9 @@ dependencies = [

 [[package]]
 name = "ts-rs-macros"
-version = "9.0.1"
+version = "9.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c88cc88fd23b5a04528f3a8436024f20010a16ec18eb23c164b1242f65860130"
+checksum = "cbdee324e50a7402416d9c25270d3df4241ed528af5d36dda18b6f219551c577"
 dependencies = [
 "proc-macro2",
 "quote",
@ -6250,10 +6216,11 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"

 [[package]]
 name = "uuid"
-version = "1.9.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439"
+checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
 dependencies = [
+ "atomic",
 "getrandom 0.2.14",
 "serde",
 "wasm-bindgen",
@ -6548,8 +6515,8 @@ dependencies = [
 "webview2-com-sys",
 "windows 0.56.0",
 "windows-core 0.56.0",
- "windows-implement 0.56.0",
- "windows-interface 0.56.0",
+ "windows-implement",
+ "windows-interface",
 ]

 [[package]]
@ -6637,16 +6604,6 @@ dependencies = [
 "windows-targets 0.52.5",
 ]

-[[package]]
-name = "windows"
-version = "0.57.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
-dependencies = [
- "windows-core 0.57.0",
- "windows-targets 0.52.5",
-]
-
 [[package]]
 name = "windows-core"
 version = "0.52.0"
@ -6662,20 +6619,8 @@ version = "0.56.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6"
 dependencies = [
- "windows-implement 0.56.0",
- "windows-interface 0.56.0",
- "windows-result",
- "windows-targets 0.52.5",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.57.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
-dependencies = [
- "windows-implement 0.57.0",
- "windows-interface 0.57.0",
+ "windows-implement",
+ "windows-interface",
 "windows-result",
 "windows-targets 0.52.5",
 ]
@ -6691,17 +6636,6 @@ dependencies = [
 "syn 2.0.68",
 ]

-[[package]]
-name = "windows-implement"
-version = "0.57.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.68",
-]
-
 [[package]]
 name = "windows-interface"
 version = "0.56.0"
@ -6713,17 +6647,6 @@ dependencies = [
 "syn 2.0.68",
 ]

-[[package]]
-name = "windows-interface"
-version = "0.57.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.68",
-]
-
 [[package]]
 name = "windows-result"
 version = "0.1.1"
@ -6987,9 +6910,9 @@ dependencies = [

 [[package]]
 name = "wry"
-version = "0.40.1"
+version = "0.39.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fa597526af53f310a8e6218630c5024fdde8271f229e70d7d2fc70b52b8fb1e"
+checksum = "6e180ac2740d6cb4d5cec0abf63eacbea90f1b7e5e3803043b13c1c84c4b7884"
 dependencies = [
 "base64 0.22.1",
 "block",
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@ -24,7 +24,7 @@ tauri = { version = "2.0.0-beta.15", features = [ "devtools", "unstable"] }
 tauri-plugin-cli = { version = "2.0.0-beta.3" }
 tauri-plugin-deep-link = { version = "2.0.0-beta.3" }
 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.6" }
 tauri-plugin-http = { version = "2.0.0-beta.6" }
 tauri-plugin-log = { version = "2.0.0-beta.4" }
 tauri-plugin-os = { version = "2.0.0-beta.2" }
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@ -74,5 +74,5 @@
    }
  },
  "productName": "Zoo Modeling App",
-  "version": "0.23.0"
+  "version": "0.22.6"
 }
--- a/src/App.tsx
+++ b/src/App.tsx
@ -1,5 +1,6 @@
-import { MouseEventHandler, useEffect, useMemo, useRef } from 'react'
+import { MouseEventHandler, useEffect, useRef } from 'react'
 import { uuidv4 } from 'lib/utils'
+import { useStore } from './useStore'
 import { useHotKeyListener } from './hooks/useHotKeyListener'
 import { Stream } from './components/Stream'
 import { EngineCommand } from './lang/std/engineConnection'
@ -24,8 +25,6 @@ import { LowerRightControls } from 'components/LowerRightControls'
 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'

 export function App() {
  useRefreshSettings(paths.FILE + 'SETTINGS')
@ -44,21 +43,19 @@ export function App() {
  }, [projectName, projectPath])

  useHotKeyListener()
-  const { context } = useModelingContext()
-  const { setAppState } = useAppState()
+  const { buttonDownInStream, didDragInStream, streamDimensions, setHtmlRef } =
+    useStore((s) => ({
+      buttonDownInStream: s.buttonDownInStream,
+      didDragInStream: s.didDragInStream,
+      streamDimensions: s.streamDimensions,
+      setHtmlRef: s.setHtmlRef,
+    }))

  useEffect(() => {
-    setAppState({ htmlRef: ref })
+    setHtmlRef(ref)
  }, [ref])

-  const { auth, settings } = useSettingsAuthContext()
-  const token = auth?.context?.token
-
-  const coreDumpManager = useMemo(
-    () => new CoreDumpManager(engineCommandManager, ref, token),
-    []
-  )
-
+  const { settings } = useSettingsAuthContext()
  const {
    app: { onboardingStatus },
  } = settings.context
@ -79,7 +76,7 @@ export function App() {
    (p) => p === onboardingStatus.current
  )
    ? 'opacity-20'
-    : context.store?.didDragInStream
+    : didDragInStream
    ? 'opacity-40'
    : ''

@ -97,11 +94,11 @@ export function App() {
      clientX: e.clientX,
      clientY: e.clientY,
      el: e.currentTarget,
-      ...context.store?.streamDimensions,
+      ...streamDimensions,
    })

    const newCmdId = uuidv4()
-    if (context.store?.buttonDownInStream === undefined) {
+    if (buttonDownInStream === undefined) {
      debounceSocketSend({
        type: 'modeling_cmd_req',
        cmd: {
@ -123,7 +120,7 @@ export function App() {
        className={
          'transition-opacity transition-duration-75 ' +
          paneOpacity +
-          (context.store?.buttonDownInStream ? ' pointer-events-none' : '')
+          (buttonDownInStream ? ' pointer-events-none' : '')
        }
        project={{ project, file }}
        enableMenu={true}
@ -132,7 +129,7 @@ export function App() {
      <ModelingSidebar paneOpacity={paneOpacity} />
      <Stream />
      {/* <CamToggle /> */}
-      <LowerRightControls coreDumpManager={coreDumpManager}>
+      <LowerRightControls>
        <Gizmo />
      </LowerRightControls>
    </div>
--- a/src/AppState.tsx
+++ b/src/AppState.tsx
@ -1,45 +0,0 @@
-import { createContext, useContext, useState, ReactNode } from 'react'
-
-/*
-
-This is for a very small handful of global state we need that doesn't fit into
-any of the Xstate machines.
-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: () => {},
-})
-
-export const useAppState = () => useContext(AppStateContext)
-
-export const AppStateProvider = ({ children }: { children: ReactNode }) => {
-  const [appState, _setAppState] = useState<AppState>({
-    htmlRef: null,
-    isStreamReady: false,
-    setAppState: () => {},
-  })
-  const setAppState = (newAppState: Partial<AppState>) =>
-    _setAppState({ ...appState, ...newAppState })
-
-  return (
-    <AppStateContext.Provider
-      value={{
-        htmlRef: appState.htmlRef,
-        isStreamReady: appState.isStreamReady,
-        setAppState,
-      }}
-    >
-      {children}
-    </AppStateContext.Provider>
-  )
-}
--- a/src/Router.tsx
+++ b/src/Router.tsx
@ -33,14 +33,6 @@ import LspProvider from 'components/LspProvider'
 import { KclContextProvider } from 'lang/KclProvider'
 import { BROWSER_PROJECT_NAME } from 'lib/constants'
 import { getState, setState } from 'lib/tauri'
-import { CoreDumpManager } from 'lib/coredump'
-import { engineCommandManager } from 'lib/singletons'
-import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
-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'

 const router = createBrowserRouter([
  {
@ -53,9 +45,7 @@ const router = createBrowserRouter([
        <SettingsAuthProvider>
          <LspProvider>
            <KclContextProvider>
-              <AppStateProvider>
-                <Outlet />
-              </AppStateProvider>
+              <Outlet />
            </KclContextProvider>
          </LspProvider>
        </SettingsAuthProvider>
@ -97,7 +87,6 @@ const router = createBrowserRouter([
          <Auth>
            <FileMachineProvider>
              <ModelingMachineProvider>
-                <CoreDump />
                <Outlet />
                <App />
                <CommandBar />
@ -176,31 +165,3 @@ export const Router = () => {
    </NetworkContext.Provider>
  )
 }
-
-function CoreDump() {
-  const { auth } = useSettingsAuthContext()
-  const token = auth?.context?.token
-  const { htmlRef } = useAppState()
-  const coreDumpManager = useMemo(
-    () => new CoreDumpManager(engineCommandManager, htmlRef, token),
-    []
-  )
-  useHotkeyWrapper(['meta + shift + .'], () => {
-    toast.promise(
-      coreDump(coreDumpManager, true),
-      {
-        loading: 'Starting core dump...',
-        success: 'Core dump completed successfully',
-        error: 'Error while exporting core dump',
-      },
-      {
-        success: {
-          // Note: this extended duration is especially important for Playwright e2e testing
-          // default duration is 2000 - https://react-hot-toast.com/docs/toast#default-durations
-          duration: 6000,
-        },
-      }
-    )
-  })
-  return null
-}
--- a/src/Toolbar.tsx
+++ b/src/Toolbar.tsx
@ -8,10 +8,10 @@ import { NetworkHealthState } from 'hooks/useNetworkStatus'
 import { ActionButton } from 'components/ActionButton'
 import { isSingleCursorInPipe } from 'lang/queryAst'
 import { useKclContext } from 'lang/KclProvider'
+import { useStore } from 'useStore'
 import { ActionButtonDropdown } from 'components/ActionButtonDropdown'
 import { useHotkeys } from 'react-hotkeys-hook'
 import Tooltip from 'components/Tooltip'
-import { useAppState } from 'AppState'

 export function Toolbar({
  className = '',
@ -38,8 +38,9 @@ export function Toolbar({
  const toolbarButtonsRef = useRef<HTMLUListElement>(null)
  const { overallState } = useNetworkContext()
  const { isExecuting } = useKclContext()
-  const { isStreamReady } = useAppState()
-
+  const { isStreamReady } = useStore((s) => ({
+    isStreamReady: s.isStreamReady,
+  }))
  const disableAllButtons =
    (overallState !== NetworkHealthState.Ok &&
      overallState !== NetworkHealthState.Weak) ||
--- a/src/clientSideScene/CameraControls.ts
+++ b/src/clientSideScene/CameraControls.ts
@ -74,9 +74,6 @@ export class CameraControls {
  enableRotate = true
  enablePan = true
  enableZoom = true
-  zoomDataFromLastFrame?: number = undefined
-  // holds coordinates, and interaction
-  moveDataFromLastFrame?: [number, number, string] = undefined
  lastPerspectiveFov: number = 45
  pendingZoom: number | null = null
  pendingRotation: Vector2 | null = null
@ -104,12 +101,16 @@ export class CameraControls {
  get isPerspective() {
    return this.camera instanceof PerspectiveCamera
  }
+  private debounceTimer = 0

  handleStart = () => {
+    if (this.debounceTimer) clearTimeout(this.debounceTimer)
    this._isCamMovingCallback(true, false)
  }
  handleEnd = () => {
-    this._isCamMovingCallback(false, false)
+    this.debounceTimer = setTimeout(() => {
+      this._isCamMovingCallback(false, false)
+    }, 400) as any as number
  }

  setCam = (camProps: ReactCameraProperties) => {
@ -229,7 +230,6 @@ export class CameraControls {
        camSettings.orientation.z,
        camSettings.orientation.w
      ).invert()
-
      this.camera.up.copy(new Vector3(0, 1, 0).applyQuaternion(quat))
      if (this.camera instanceof PerspectiveCamera && camSettings.ortho) {
        this.useOrthographicCamera()
@ -258,48 +258,6 @@ export class CameraControls {
      }
      this.onCameraChange()
    }
-
-    // Our stream is never more than 60fps.
-    // We can get away with capping our "virtual fps" to 60 then.
-    const FPS_VIRTUAL = 60
-
-    const doZoom = () => {
-      if (this.zoomDataFromLastFrame !== undefined) {
-        this.handleStart()
-        this.engineCommandManager.sendSceneCommand({
-          type: 'modeling_cmd_req',
-          cmd: {
-            type: 'default_camera_zoom',
-            magnitude:
-              (-1 * this.zoomDataFromLastFrame) / window.devicePixelRatio,
-          },
-          cmd_id: uuidv4(),
-        })
-        this.handleEnd()
-      }
-      this.zoomDataFromLastFrame = undefined
-    }
-    setInterval(doZoom, 1000 / FPS_VIRTUAL)
-
-    const doMove = () => {
-      if (this.moveDataFromLastFrame !== undefined) {
-        this.engineCommandManager.sendSceneCommand({
-          type: 'modeling_cmd_req',
-          cmd: {
-            type: 'camera_drag_move',
-            interaction: this.moveDataFromLastFrame[2] as any,
-            window: {
-              x: this.moveDataFromLastFrame[0],
-              y: this.moveDataFromLastFrame[1],
-            },
-          },
-          cmd_id: uuidv4(),
-        })
-      }
-      this.moveDataFromLastFrame = undefined
-    }
-    setInterval(doMove, 1000 / FPS_VIRTUAL)
-
    setTimeout(() => {
      this.engineCommandManager.subscribeTo({
        event: 'camera_drag_end',
@ -384,7 +342,15 @@ export class CameraControls {
      if (interaction === 'none') return

      if (this.syncDirection === 'engineToClient') {
-        this.moveDataFromLastFrame = [event.clientX, event.clientY, interaction]
+        this.throttledEngCmd({
+          type: 'modeling_cmd_req',
+          cmd: {
+            type: 'camera_drag_move',
+            interaction,
+            window: { x: event.clientX, y: event.clientY },
+          },
+          cmd_id: uuidv4(),
+        })
        return
      }

@ -432,19 +398,34 @@ export class CameraControls {
  }

  onMouseWheel = (event: WheelEvent) => {
+    // Assume trackpad if the deltas are small and integers
+    this.handleStart()
+
    if (this.syncDirection === 'engineToClient') {
-      this.zoomDataFromLastFrame = event.deltaY
+      const interactions = this.interactionGuards.zoom.scrollCallback(
+        event as any
+      )
+      if (!interactions) {
+        this.handleEnd()
+        return
+      }
+      this.engineCommandManager.sendSceneCommand({
+        type: 'modeling_cmd_req',
+        cmd: {
+          type: 'default_camera_zoom',
+          magnitude: -event.deltaY * 0.4,
+        },
+        cmd_id: uuidv4(),
+      })
+      this.handleEnd()
      return
    }

-    // else "clientToEngine" (Sketch Mode) or forceUpdate
+    // Else "clientToEngine" (Sketch Mode) or forceUpdate

-    // We need to simulate similar behavior as when we send
-    // zoom commands to engine. This means dropping some zoom
-    // commands too.
    // From onMouseMove zoom handling which seems to be really smooth
-    this.handleStart()
-    this.pendingZoom = 1 + (event.deltaY / window.devicePixelRatio) * 0.001
+    this.pendingZoom = this.pendingZoom ? this.pendingZoom : 1
+    this.pendingZoom *= 1 + event.deltaY * 0.01
    this.handleEnd()
  }

--- a/src/clientSideScene/ClientSideSceneComp.tsx
+++ b/src/clientSideScene/ClientSideSceneComp.tsx
@ -37,7 +37,7 @@ import { Dialog, Popover, Transition } from '@headlessui/react'
 import { LineInputsType } from 'lang/std/sketchcombos'
 import toast from 'react-hot-toast'
 import { InstanceProps, create } from 'react-modal-promise'
-import { executeAst } from 'lang/langHelpers'
+import { executeAst } from 'useStore'
 import {
  deleteSegmentFromPipeExpression,
  makeRemoveSingleConstraintInput,
--- a/src/clientSideScene/sceneEntities.ts
+++ b/src/clientSideScene/sceneEntities.ts
@ -58,7 +58,7 @@ import {
  editorManager,
 } from 'lib/singletons'
 import { getNodeFromPath, getNodePathFromSourceRange } from 'lang/queryAst'
-import { executeAst } from 'lang/langHelpers'
+import { executeAst, useStore } from 'useStore'
 import {
  createArcGeometry,
  dashedStraight,
@ -568,7 +568,6 @@ export class SceneEntities {

    if (shouldTearDown) await this.tearDownSketch({ removeAxis: false })
    sceneInfra.resetMouseListeners()
-
    const { truncatedAst, programMemoryOverride, sketchGroup } =
      await this.setupSketch({
        sketchPathToNode,
@ -1444,10 +1443,11 @@ export class SceneEntities {
        selected.material.color = defaultPlaneColor(type)
      },
      onClick: async (args) => {
+        const { streamDimensions } = useStore.getState()
        const { entity_id } = await sendSelectEventToEngine(
          args?.mouseEvent,
          document.getElementById('video-stream') as HTMLVideoElement,
-          sceneInfra._streamDimensions
+          streamDimensions
        )

        let _entity_id = entity_id
@ -1783,31 +1783,6 @@ function prepareTruncatedMemoryAndAst(
  const programMemoryOverride = programMemoryInit()
  if (err(programMemoryOverride)) return programMemoryOverride

-  // Grab all the TagDeclarators and TagIdentifiers from memory.
-  let start = _node.node.start
-  for (const key in programMemory.root) {
-    const value = programMemory.root[key]
-    if (!('__meta' in value)) {
-      continue
-    }
-    if (
-      value.__meta === undefined ||
-      value.__meta.length === 0 ||
-      value.__meta[0].sourceRange === undefined
-    ) {
-      continue
-    }
-
-    if (value.__meta[0].sourceRange[0] >= start) {
-      // We only want things before our start point.
-      continue
-    }
-
-    if (value.type === 'TagIdentifier') {
-      programMemoryOverride.root[key] = JSON.parse(JSON.stringify(value))
-    }
-  }
-
  for (let i = 0; i < bodyIndex; i++) {
    const node = _ast.body[i]
    if (node.type !== 'VariableDeclaration') {
@ -1967,9 +1942,9 @@ export async function getSketchOrientationDetails(
 * @param  entityId - The ID of the entity for which orientation details are being fetched.
 * @returns A promise that resolves with the orientation details of the face.
 */
-export async function getFaceDetails(
+async function getFaceDetails(
  entityId: string
-): Promise<Models['GetSketchModePlane_type']> {
+): Promise<Models['FaceIsPlanar_type']> {
  // TODO mode engine connection to allow batching returns and batch the following
  await engineCommandManager.sendSceneCommand({
    type: 'modeling_cmd_req',
@ -1982,7 +1957,8 @@ export async function getFaceDetails(
      entity_id: entityId,
    },
  })
-  const faceInfo: Models['GetSketchModePlane_type'] = (
+  // TODO change typing to get_sketch_mode_plane once lib is updated
+  const faceInfo: Models['FaceIsPlanar_type'] = (
    await engineCommandManager.sendSceneCommand({
      type: 'modeling_cmd_req',
      cmd_id: uuidv4(),
--- a/src/clientSideScene/sceneInfra.ts
+++ b/src/clientSideScene/sceneInfra.ts
@ -103,10 +103,6 @@ export class SceneInfra {
  _baseUnit: BaseUnit = 'mm'
  _baseUnitMultiplier = 1
  _theme: Themes = Themes.System
-  _streamDimensions: { streamWidth: number; streamHeight: number } = {
-    streamWidth: 1280,
-    streamHeight: 720,
-  }
  extraSegmentTexture: Texture
  lastMouseState: MouseState = { type: 'idle' }
  onDragStartCallback: (arg: OnDragCallbackArgs) => void = () => {}
--- a/src/components/AppHeader.tsx
+++ b/src/components/AppHeader.tsx
@ -26,7 +26,6 @@ export const AppHeader = ({

  return (
    <header
-      id="app-header"
      className={
        'w-full grid ' +
        styles.header +
--- a/src/components/AvailableVarsHelpers.tsx
+++ b/src/components/AvailableVarsHelpers.tsx
@ -10,7 +10,7 @@ import { findAllPreviousVariables, PrevVariable } from '../lang/queryAst'
 import { engineCommandManager, kclManager } from 'lib/singletons'
 import { useKclContext } from 'lang/KclProvider'
 import { useModelingContext } from 'hooks/useModelingContext'
-import { executeAst } from 'lang/langHelpers'
+import { executeAst } from 'useStore'
 import { trap } from 'lib/trap'

 export const AvailableVars = ({
--- a/src/components/CommandBar/CommandBar.tsx
+++ b/src/components/CommandBar/CommandBar.tsx
@ -24,7 +24,7 @@ export const CommandBar = () => {
  }, [pathname])

  // Hook up keyboard shortcuts
-  useHotkeyWrapper(['mod+k'], () => {
+  useHotkeyWrapper(['mod+k', 'ctrl+c'], () => {
    if (commandBarState.context.commands.length === 0) return
    if (commandBarState.matches('Closed')) {
      commandBarSend({ type: 'Open' })
--- a/src/components/LowerRightControls.tsx
+++ b/src/components/LowerRightControls.tsx
@ -6,18 +6,8 @@ import { NetworkHealthIndicator } from 'components/NetworkHealthIndicator'
 import { HelpMenu } from './HelpMenu'
 import { Link, useLocation } from 'react-router-dom'
 import { useAbsoluteFilePath } from 'hooks/useAbsoluteFilePath'
-import { coreDump } from 'lang/wasm'
-import toast from 'react-hot-toast'
-import { CoreDumpManager } from 'lib/coredump'
-import openWindow from 'lib/openWindow'

-export function LowerRightControls({
-  children,
-  coreDumpManager,
-}: {
-  children?: React.ReactNode
-  coreDumpManager?: CoreDumpManager
-}) {
+export function LowerRightControls(props: React.PropsWithChildren) {
  const location = useLocation()
  const filePath = useAbsoluteFilePath()
  const linkOverrideClassName =
@ -25,42 +15,9 @@ export function LowerRightControls({

  const isPlayWright = window?.localStorage.getItem('playwright') === 'true'

-  async function reportbug(event: { preventDefault: () => void }) {
-    event?.preventDefault()
-
-    if (!coreDumpManager) {
-      // open default reporting option
-      openWindow('https://github.com/KittyCAD/modeling-app/issues/new/choose')
-    } else {
-      toast
-        .promise(
-          coreDump(coreDumpManager, true),
-          {
-            loading: 'Preparing bug report...',
-            success: 'Bug report opened in new window',
-            error: 'Unable to export a core dump. Using default reporting.',
-          },
-          {
-            success: {
-              // Note: this extended duration is especially important for Playwright e2e testing
-              // default duration is 2000 - https://react-hot-toast.com/docs/toast#default-durations
-              duration: 6000,
-            },
-          }
-        )
-        .catch((err: Error) => {
-          if (err) {
-            openWindow(
-              'https://github.com/KittyCAD/modeling-app/issues/new/choose'
-            )
-          }
-        })
-    }
-  }
-
  return (
    <section className="fixed bottom-2 right-2 flex flex-col items-end gap-3 pointer-events-none">
-      {children}
+      {props.children}
      <menu className="flex items-center justify-end gap-3 pointer-events-auto">
        <a
          href={`https://github.com/KittyCAD/modeling-app/releases/tag/v${APP_VERSION}`}
@ -71,7 +28,6 @@ export function LowerRightControls({
          v{isPlayWright ? '11.22.33' : APP_VERSION}
        </a>
        <a
-          onClick={reportbug}
          href="https://github.com/KittyCAD/modeling-app/issues/new/choose"
          target="_blank"
          rel="noopener noreferrer"
--- a/src/components/LspProvider.tsx
+++ b/src/components/LspProvider.tsx
@ -1,15 +1,18 @@
+import { LanguageServerClient } from 'editor/plugins/lsp'
 import type * as LSP from 'vscode-languageserver-protocol'
-import React, { createContext, useMemo, useContext, useState } from 'react'
-import {
-  LanguageServerClient,
-  FromServer,
-  IntoServer,
-  LspWorkerEventType,
-  LanguageServerPlugin,
-} from '@kittycad/codemirror-lsp-client'
+import React, {
+  createContext,
+  useMemo,
+  useEffect,
+  useContext,
+  useState,
+} from 'react'
+import { FromServer, IntoServer } from 'editor/plugins/lsp/codec'
+import Client from '../editor/plugins/lsp/client'
 import { TEST, VITE_KC_API_BASE_URL } from 'env'
-import KclLanguageSupport from 'editor/plugins/lsp/kcl/language'
+import kclLanguage from 'editor/plugins/lsp/kcl/language'
 import { copilotPlugin } from 'editor/plugins/lsp/copilot'
+import { useStore } from 'useStore'
 import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
 import { Extension } from '@codemirror/state'
 import { LanguageSupport } from '@codemirror/language'
@ -18,15 +21,16 @@ import { paths } from 'lib/paths'
 import { FileEntry } from 'lib/types'
 import Worker from 'editor/plugins/lsp/worker.ts?worker'
 import {
+  LspWorkerEventType,
  KclWorkerOptions,
  CopilotWorkerOptions,
  LspWorker,
 } from 'editor/plugins/lsp/types'
 import { wasmUrl } from 'lang/wasm'
 import { PROJECT_ENTRYPOINT } from 'lib/constants'
-import { err } from 'lib/trap'
-import { isTauri } from 'lib/isTauri'
-import { codeManager } from 'lib/singletons'
+import { useNetworkContext } from 'hooks/useNetworkContext'
+import { NetworkHealthState } from 'hooks/useNetworkStatus'
+import { err, trap } from 'lib/trap'

 function getWorkspaceFolders(): LSP.WorkspaceFolder[] {
  return []
@ -66,8 +70,21 @@ type LspContext = {

 export const LspStateContext = createContext({} as LspContext)
 export const LspProvider = ({ children }: { children: React.ReactNode }) => {
-  const [isKclLspReady, setIsKclLspReady] = useState(false)
-  const [isCopilotLspReady, setIsCopilotLspReady] = useState(false)
+  const {
+    isKclLspServerReady,
+    isCopilotLspServerReady,
+    setIsKclLspServerReady,
+    setIsCopilotLspServerReady,
+    isStreamReady,
+  } = useStore((s) => ({
+    isKclLspServerReady: s.isKclLspServerReady,
+    isCopilotLspServerReady: s.isCopilotLspServerReady,
+    setIsKclLspServerReady: s.setIsKclLspServerReady,
+    setIsCopilotLspServerReady: s.setIsCopilotLspServerReady,
+    isStreamReady: s.isStreamReady,
+  }))
+  const [isLspReady, setIsLspReady] = useState(false)
+  const [isCopilotReady, setIsCopilotReady] = useState(false)

  const {
    auth,
@ -79,6 +96,8 @@ export const LspProvider = ({ children }: { children: React.ReactNode }) => {
  } = useSettingsAuthContext()
  const token = auth?.context.token
  const navigate = useNavigate()
+  const { overallState } = useNetworkContext()
+  const isNetworkOkay = overallState === NetworkHealthState.Ok

  // So this is a bit weird, we need to initialize the lsp server and client.
  // But the server happens async so we break this into two parts.
@ -109,34 +128,17 @@ export const LspProvider = ({ children }: { children: React.ReactNode }) => {
    const fromServer: FromServer | Error = FromServer.create()
    if (err(fromServer)) return { lspClient: null }

-    const lspClient = new LanguageServerClient({
-      name: LspWorker.Kcl,
-      fromServer,
-      intoServer,
-      initializedCallback: () => {
-        setIsKclLspReady(true)
-      },
-    })
+    const client = new Client(fromServer, intoServer)

+    setIsLspReady(true)
+
+    const lspClient = new LanguageServerClient({ client, name: LspWorker.Kcl })
    return { lspClient }
  }, [
    // We need a token for authenticating the server.
    token,
  ])

-  useMemo(() => {
-    if (!isTauri() && isKclLspReady && kclLspClient && codeManager.code) {
-      kclLspClient.textDocumentDidOpen({
-        textDocument: {
-          uri: `file:///${PROJECT_ENTRYPOINT}`,
-          languageId: 'kcl',
-          version: 1,
-          text: codeManager.code,
-        },
-      })
-    }
-  }, [kclLspClient, isKclLspReady])
-
  // Here we initialize the plugin which will start the client.
  // Now that we have multi-file support the name of the file is a dep of
  // this use memo, as well as the directory structure, which I think is
@ -144,38 +146,39 @@ export const LspProvider = ({ children }: { children: React.ReactNode }) => {
  // We do not want to restart the server, its just wasteful.
  const kclLSP = useMemo(() => {
    let plugin = null
-    if (isKclLspReady && !TEST && kclLspClient) {
+    if (isKclLspServerReady && !TEST && kclLspClient) {
      // Set up the lsp plugin.
-      const lsp = new KclLanguageSupport({
+      const lsp = kclLanguage({
        documentUri: `file:///${PROJECT_ENTRYPOINT}`,
        workspaceFolders: getWorkspaceFolders(),
        client: kclLspClient,
-        processLspNotification: (
-          plugin: LanguageServerPlugin,
-          notification: LSP.NotificationMessage
-        ) => {
-          try {
-            switch (notification.method) {
-              case 'kcl/astUpdated':
-                // Update the folding ranges, since the AST has changed.
-                // This is a hack since codemirror does not support async foldService.
-                // When they do we can delete this.
-                plugin.updateFoldingRanges()
-                plugin.requestSemanticTokens()
-                break
-              case 'kcl/memoryUpdated':
-                break
-            }
-          } catch (error) {
-            console.error(error)
-          }
-        },
      })

      plugin = lsp
    }
    return plugin
-  }, [kclLspClient, isKclLspReady])
+  }, [kclLspClient, isKclLspServerReady])
+
+  // Re-execute the scene when the units change.
+  useEffect(() => {
+    if (kclLspClient) {
+      let plugins = kclLspClient.plugins
+      for (let plugin of plugins) {
+        if (plugin.updateUnits && isStreamReady && isNetworkOkay) {
+          plugin.updateUnits(defaultUnit.current)
+        }
+      }
+    }
+  }, [
+    kclLspClient,
+    defaultUnit.current,
+
+    // We want to re-execute the scene if the network comes back online.
+    // The lsp server will only re-execute if there were previous errors or
+    // changes, so it's fine to send it thru here.
+    isStreamReady,
+    isNetworkOkay,
+  ])

  const { lspClient: copilotLspClient } = useMemo(() => {
    if (!token || token === '' || TEST) {
@ -202,13 +205,13 @@ export const LspProvider = ({ children }: { children: React.ReactNode }) => {
    const fromServer: FromServer | Error = FromServer.create()
    if (err(fromServer)) return { lspClient: null }

+    const client = new Client(fromServer, intoServer)
+
+    setIsCopilotReady(true)
+
    const lspClient = new LanguageServerClient({
+      client,
      name: LspWorker.Copilot,
-      fromServer,
-      intoServer,
-      initializedCallback: () => {
-        setIsCopilotLspReady(true)
-      },
    })
    return { lspClient }
  }, [token])
@ -220,7 +223,7 @@ export const LspProvider = ({ children }: { children: React.ReactNode }) => {
  // We do not want to restart the server, its just wasteful.
  const copilotLSP = useMemo(() => {
    let plugin = null
-    if (isCopilotLspReady && !TEST && copilotLspClient) {
+    if (isCopilotLspServerReady && !TEST && copilotLspClient) {
      // Set up the lsp plugin.
      const lsp = copilotPlugin({
        documentUri: `file:///${PROJECT_ENTRYPOINT}`,
@ -232,7 +235,7 @@ export const LspProvider = ({ children }: { children: React.ReactNode }) => {
      plugin = lsp
    }
    return plugin
-  }, [copilotLspClient, isCopilotLspReady])
+  }, [copilotLspClient, isCopilotLspServerReady])

  let lspClients: LanguageServerClient[] = []
  if (kclLspClient) {
@ -242,6 +245,13 @@ export const LspProvider = ({ children }: { children: React.ReactNode }) => {
    lspClients.push(copilotLspClient)
  }

+  useEffect(() => {
+    setIsKclLspServerReady(isLspReady)
+  }, [isLspReady])
+  useEffect(() => {
+    setIsCopilotLspServerReady(isCopilotReady)
+  }, [isCopilotReady])
+
  const onProjectClose = (
    file: FileEntry | null,
    projectPath: string | null,
--- a/src/components/ModelingMachineProvider.tsx
+++ b/src/components/ModelingMachineProvider.tsx
@ -23,13 +23,13 @@ import {
  editorManager,
  sceneEntitiesManager,
 } from 'lib/singletons'
-import { useHotkeys } from 'react-hotkeys-hook'
 import { applyConstraintHorzVertDistance } from './Toolbar/SetHorzVertDistance'
 import {
  angleBetweenInfo,
  applyConstraintAngleBetween,
 } from './Toolbar/SetAngleBetween'
 import { applyConstraintAngleLength } from './Toolbar/setAngleLength'
+import { useStore } from 'useStore'
 import {
  Selections,
  canExtrudeSelection,
@ -53,7 +53,13 @@ import {
  sketchOnExtrudedFace,
  startSketchOnDefault,
 } from 'lang/modifyAst'
-import { Program, VariableDeclaration, parse, recast } from 'lang/wasm'
+import {
+  Program,
+  VariableDeclaration,
+  coreDump,
+  parse,
+  recast,
+} from 'lang/wasm'
 import {
  getNodeFromPath,
  getNodePathFromSourceRange,
@ -64,14 +70,14 @@ 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 } from '@uiw/react-codemirror'
+import { CoreDumpManager } from 'lib/coredump'
 import { useSearchParams } from 'react-router-dom'
 import { letEngineAnimateAndSyncCamAfter } from 'clientSideScene/CameraControls'
 import { getVarNameModal } from 'hooks/useToolbarGuards'
+import useHotkeyWrapper from 'lib/hotkeyWrapper'
 import { uuidv4 } from 'lib/utils'
 import { err, trap } from 'lib/trap'
-import { useCommandsContext } from 'hooks/useCommandsContext'
-import { modelingMachineEvent } from 'editor/manager'

 type MachineContext<T extends AnyStateMachine> = {
  state: StateFrom<T>
@ -93,7 +99,7 @@ export const ModelingMachineProvider = ({
    settings: {
      context: {
        app: { theme, enableSSAO },
-        modeling: { defaultUnit, highlightEdges, showScaleGrid },
+        modeling: { defaultUnit, highlightEdges },
      },
    },
  } = useSettingsAuthContext()
@ -103,7 +109,38 @@ export const ModelingMachineProvider = ({
  let [searchParams] = useSearchParams()
  const pool = searchParams.get('pool')

-  const { commandBarState } = useCommandsContext()
+  useSetupEngineManager(streamRef, token, {
+    pool: pool,
+    theme: theme.current,
+    highlightEdges: highlightEdges.current,
+    enableSSAO: enableSSAO.current,
+  })
+  const { htmlRef } = useStore((s) => ({
+    htmlRef: s.htmlRef,
+  }))
+  const coreDumpManager = new CoreDumpManager(
+    engineCommandManager,
+    htmlRef,
+    token
+  )
+  useHotkeyWrapper(['meta + shift + .'], () => {
+    console.warn('CoreDump: Initializing core dump')
+    toast.promise(
+      coreDump(coreDumpManager, true),
+      {
+        loading: 'Starting core dump...',
+        success: 'Core dump completed successfully',
+        error: 'Error while exporting core dump',
+      },
+      {
+        success: {
+          // Note: this extended duration is especially important for Playwright e2e testing
+          // default duration is 2000 - https://react-hot-toast.com/docs/toast#default-durations
+          duration: 6000,
+        },
+      }
+    )
+  })

  // Settings machine setup
  // const retrievedSettings = useRef(
@ -122,12 +159,6 @@ export const ModelingMachineProvider = ({
    modelingMachine,
    {
      actions: {
-        'disable copilot': () => {
-          editorManager.setCopilotEnabled(false)
-        },
-        'enable copilot': () => {
-          editorManager.setCopilotEnabled(true)
-        },
        'sketch exit execute': () => {
          ;(async () => {
            await sceneInfra.camControls.snapToPerspectiveBeforeHandingBackControlToEngine()
@ -248,15 +279,11 @@ export const ModelingMachineProvider = ({
          const dispatchSelection = (selection?: EditorSelection) => {
            if (!selection) return // TODO less of hack for the below please
            if (!editorManager.editorView) return
+            editorManager.lastSelectionEvent = Date.now()
            setTimeout(() => {
-              if (!editorManager.editorView) return
-              editorManager.editorView.dispatch({
-                selection,
-                annotations: [
-                  modelingMachineEvent,
-                  Transaction.addToHistory.of(false),
-                ],
-              })
+              if (editorManager.editorView) {
+                editorManager.editorView.dispatch({ selection })
+              }
            })
          }
          let selections: Selections = {
@ -433,11 +460,6 @@ export const ModelingMachineProvider = ({

          return canExtrudeSelection(selectionRanges)
        },
-        'has valid selection for deletion': ({ selectionRanges }) => {
-          if (!commandBarState.matches('Closed')) return false
-          if (selectionRanges.codeBasedSelections.length <= 0) return false
-          return true
-        },
        'Sketch is empty': ({ sketchDetails }) => {
          const node = getNodeFromPath<VariableDeclaration>(
            kclManager.ast,
@ -479,15 +501,11 @@ export const ModelingMachineProvider = ({
      services: {
        'AST-undo-startSketchOn': async ({ sketchDetails }) => {
          if (!sketchDetails) return
-          if (kclManager.ast.body.length) {
-            // this assumes no changes have been made to the sketch besides what we did when entering the sketch
-            // i.e. doesn't account for user's adding code themselves, maybe we need store a flag userEditedSinceSketchMode?
-            const newAst: Program = JSON.parse(JSON.stringify(kclManager.ast))
-            const varDecIndex = sketchDetails.sketchPathToNode[1][0]
-            // remove body item at varDecIndex
-            newAst.body = newAst.body.filter((_, i) => i !== varDecIndex)
-            await kclManager.executeAstMock(newAst)
-          }
+          const newAst: Program = JSON.parse(JSON.stringify(kclManager.ast))
+          const varDecIndex = sketchDetails.sketchPathToNode[1][0]
+          // remove body item at varDecIndex
+          newAst.body = newAst.body.filter((_, i) => i !== varDecIndex)
+          await kclManager.executeAstMock(newAst)
          sceneInfra.setCallbacks({
            onClick: () => {},
            onDrag: () => {},
@ -867,16 +885,6 @@ export const ModelingMachineProvider = ({
    }
  )

-  useSetupEngineManager(streamRef, token, {
-    pool: pool,
-    theme: theme.current,
-    highlightEdges: highlightEdges.current,
-    enableSSAO: enableSSAO.current,
-    modelingSend,
-    modelingContext: modelingState.context,
-    showScaleGrid: showScaleGrid.current,
-  })
-
  useEffect(() => {
    kclManager.registerExecuteCallback(() => {
      modelingSend({ type: 'Re-execute' })
@ -915,11 +923,6 @@ export const ModelingMachineProvider = ({
    }
  }, [modelingSend])

-  // Allow using the delete key to delete solids
-  useHotkeys(['backspace', 'delete', 'del'], () => {
-    modelingSend({ type: 'Delete selection' })
-  })
-
  useStateMachineCommands({
    machineId: 'modeling',
    state: modelingState,
--- a/src/components/ModelingSidebar/ModelingPane.tsx
+++ b/src/components/ModelingSidebar/ModelingPane.tsx
@ -1,6 +1,6 @@
+import { useStore } from 'useStore'
 import styles from './ModelingPane.module.css'
 import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
-import { useModelingContext } from 'hooks/useModelingContext'

 export interface ModelingPaneProps
  extends React.PropsWithChildren,
@ -33,9 +33,11 @@ export const ModelingPane = ({
 }: ModelingPaneProps) => {
  const { settings } = useSettingsAuthContext()
  const onboardingStatus = settings.context.app.onboardingStatus
-  const { context } = useModelingContext()
+  const { buttonDownInStream } = useStore((s) => ({
+    buttonDownInStream: s.buttonDownInStream,
+  }))
  const pointerEventsCssClass =
-    context.store?.buttonDownInStream || onboardingStatus.current === 'camera'
+    buttonDownInStream || onboardingStatus.current === 'camera'
      ? 'pointer-events-none '
      : 'pointer-events-auto '
  return (
--- a/src/components/ModelingSidebar/ModelingPanes/KclEditorPane.tsx
+++ b/src/components/ModelingSidebar/ModelingPanes/KclEditorPane.tsx
@ -84,10 +84,6 @@ export const KclEditorPane = () => {

  const textWrapping = context.textEditor.textWrapping
  const cursorBlinking = context.textEditor.blinkingCursor
-  // DO NOT ADD THE CODEMIRROR HOTKEYS HERE TO THE DEPENDENCY ARRAY
-  // It reloads the editor every time we do _anything_ in the editor
-  // I have no idea why.
-  // Instead, hot load hotkeys via code mirror native.
  const codeMirrorHotkeys = codeManager.getCodemirrorHotkeys()

  const editorExtensions = useMemo(() => {
@ -138,6 +134,7 @@ export const KclEditorPane = () => {
        highlightSelectionMatches(),
        syntaxHighlighting(defaultHighlightStyle, { fallback: true }),
        rectangularSelection(),
+        drawSelection(),
        dropCursor(),
        interact({
          rules: [
@ -176,7 +173,13 @@ export const KclEditorPane = () => {
    }

    return extensions
-  }, [kclLSP, copilotLSP, textWrapping.current, cursorBlinking.current])
+  }, [
+    kclLSP,
+    copilotLSP,
+    textWrapping.current,
+    cursorBlinking.current,
+    codeMirrorHotkeys,
+  ])

  const initialCode = useRef(codeManager.code)

@ -189,9 +192,9 @@ export const KclEditorPane = () => {
        value={initialCode.current}
        extensions={editorExtensions}
        theme={theme}
-        onCreateEditor={(_editorView) => {
+        onCreateEditor={(_editorView) =>
          editorManager.setEditorView(_editorView)
-        }}
+        }
        indentWithTab={false}
        basicSetup={false}
      />
--- a/src/components/ModelingSidebar/ModelingSidebar.tsx
+++ b/src/components/ModelingSidebar/ModelingSidebar.tsx
@ -1,7 +1,8 @@
 import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
 import { Resizable } from 're-resizable'
-import { HTMLAttributes, useCallback, useEffect, useState } from 'react'
+import { useCallback, useEffect, useState } from 'react'
 import { useHotkeys } from 'react-hotkeys-hook'
+import { useStore } from 'useStore'
 import { Tab } from '@headlessui/react'
 import {
  SidebarPane,
@ -14,7 +15,6 @@ import { ActionIcon } from 'components/ActionIcon'
 import styles from './ModelingSidebar.module.css'
 import { ModelingPane } from './ModelingPane'
 import { isTauri } from 'lib/isTauri'
-import { useModelingContext } from 'hooks/useModelingContext'

 interface ModelingSidebarProps {
  paneOpacity: '' | 'opacity-20' | 'opacity-40'
@ -23,11 +23,14 @@ interface ModelingSidebarProps {
 export function ModelingSidebar({ paneOpacity }: ModelingSidebarProps) {
  const { settings } = useSettingsAuthContext()
  const onboardingStatus = settings.context.app.onboardingStatus
-  const { context } = useModelingContext()
+  const { openPanes, buttonDownInStream } = useStore((s) => ({
+    buttonDownInStream: s.buttonDownInStream,
+    openPanes: s.openPanes,
+  }))
  const pointerEventsCssClass =
-    context.store?.buttonDownInStream ||
+    buttonDownInStream ||
    onboardingStatus.current === 'camera' ||
-    context.store?.openPanes.length === 0
+    openPanes.length === 0
      ? 'pointer-events-none '
      : 'pointer-events-auto '

@ -42,7 +45,7 @@ export function ModelingSidebar({ paneOpacity }: ModelingSidebarProps) {
      maxWidth={800}
      handleClasses={{
        right:
-          (context.store?.openPanes.length === 0 ? 'hidden ' : 'block ') +
+          (openPanes.length === 0 ? 'hidden ' : 'block ') +
          'translate-x-1/2 hover:bg-chalkboard-10 hover:dark:bg-chalkboard-110 bg-transparent transition-colors duration-75 transition-ease-out delay-100 ',
        left: 'hidden',
        top: 'hidden',
@ -53,19 +56,15 @@ export function ModelingSidebar({ paneOpacity }: ModelingSidebarProps) {
        bottomRight: 'hidden',
      }}
    >
-      <div id="app-sidebar" className={styles.grid + ' flex-1'}>
-        <ModelingSidebarSection id="sidebar-top" panes={topPanes} />
-        <ModelingSidebarSection
-          id="sidebar-bottom"
-          panes={bottomPanes}
-          alignButtons="end"
-        />
+      <div className={styles.grid + ' flex-1'}>
+        <ModelingSidebarSection panes={topPanes} />
+        <ModelingSidebarSection panes={bottomPanes} alignButtons="end" />
      </div>
    </Resizable>
  )
 }

-interface ModelingSidebarSectionProps extends HTMLAttributes<HTMLDivElement> {
+interface ModelingSidebarSectionProps {
  panes: SidebarPane[]
  alignButtons?: 'start' | 'end'
 }
@ -73,16 +72,15 @@ interface ModelingSidebarSectionProps extends HTMLAttributes<HTMLDivElement> {
 function ModelingSidebarSection({
  panes,
  alignButtons = 'start',
-  className,
-  ...props
 }: ModelingSidebarSectionProps) {
  const { settings } = useSettingsAuthContext()
  const showDebugPanel = settings.context.modeling.showDebugPanel
  const paneIds = panes.map((pane) => pane.id)
-  const { send, context } = useModelingContext()
-  const foundOpenPane = context.store?.openPanes.find((pane) =>
-    paneIds.includes(pane)
-  )
+  const { openPanes, setOpenPanes } = useStore((s) => ({
+    openPanes: s.openPanes,
+    setOpenPanes: s.setOpenPanes,
+  }))
+  const foundOpenPane = openPanes.find((pane) => paneIds.includes(pane))
  const [currentPane, setCurrentPane] = useState(
    foundOpenPane || ('none' as SidebarType | 'none')
  )
@ -90,37 +88,17 @@ function ModelingSidebarSection({
  const togglePane = useCallback(
    (newPane: SidebarType | 'none') => {
      if (newPane === 'none') {
-        send({
-          type: 'Set context',
-          data: {
-            openPanes: context.store?.openPanes.filter(
-              (p) => p !== currentPane
-            ),
-          },
-        })
+        setOpenPanes(openPanes.filter((p) => p !== currentPane))
        setCurrentPane('none')
      } else if (newPane === currentPane) {
        setCurrentPane('none')
-        send({
-          type: 'Set context',
-          data: {
-            openPanes: context.store?.openPanes.filter((p) => p !== newPane),
-          },
-        })
+        setOpenPanes(openPanes.filter((p) => p !== newPane))
      } else {
-        send({
-          type: 'Set context',
-          data: {
-            openPanes: [
-              ...context.store?.openPanes.filter((p) => p !== currentPane),
-              newPane,
-            ],
-          },
-        })
+        setOpenPanes([...openPanes.filter((p) => p !== currentPane), newPane])
        setCurrentPane(newPane)
      }
    },
-    [context.store?.openPanes, send, currentPane, setCurrentPane]
+    [openPanes, setOpenPanes, currentPane, setCurrentPane]
  )

  // Filter out the debug panel if it's not supposed to be shown
@ -138,14 +116,14 @@ function ModelingSidebarSection({
    if (
      !showDebugPanel.current &&
      currentPane === 'debug' &&
-      context.store?.openPanes.includes('debug')
+      openPanes.includes('debug')
    ) {
      togglePane('debug')
    }
-  }, [showDebugPanel.current, togglePane, context.store?.openPanes])
+  }, [showDebugPanel.current, togglePane, openPanes])

  return (
-    <div className={'group contents ' + className} {...props}>
+    <div className="group contents">
      <Tab.Group
        vertical
        selectedIndex={
@ -157,7 +135,6 @@ function ModelingSidebarSection({
        }}
      >
        <Tab.List
-          id={`${props.id}-ribbon`}
          className={
            'pointer-events-auto ' +
            (alignButtons === 'start'
@ -168,9 +145,7 @@ function ModelingSidebarSection({
              : ' border-r-0') +
            ' p-2 col-start-1 col-span-1 h-fit w-fit flex flex-col items-start gap-2 ' +
            'bg-chalkboard-10 border border-solid border-chalkboard-20 dark:bg-chalkboard-90 dark:border-chalkboard-80 group-focus-within:border-primary dark:group-focus-within:border-chalkboard-50 ' +
-            (context.store?.openPanes.length === 1 && currentPane === 'none'
-              ? 'pr-0.5'
-              : '')
+            (openPanes.length === 1 && currentPane === 'none' ? 'pr-0.5' : '')
          }
        >
          <Tab key="none" className="sr-only">
@ -186,11 +161,10 @@ function ModelingSidebarSection({
          ))}
        </Tab.List>
        <Tab.Panels
-          id={`${props.id}-pane`}
          as="article"
          className={
            'col-start-2 col-span-1 ' +
-            (context.store?.openPanes.length === 1
+            (openPanes.length === 1
              ? currentPane !== 'none'
                ? `row-start-1 row-end-3`
                : `hidden`
--- a/src/components/RefreshButton.tsx
+++ b/src/components/RefreshButton.tsx
@ -1,22 +1,7 @@
-import { coreDump } from 'lang/wasm'
-import { CoreDumpManager } from 'lib/coredump'
 import { CustomIcon } from './CustomIcon'
-import { engineCommandManager } from 'lib/singletons'
-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),
-    []
-  )

+export function RefreshButton() {
  async function refresh() {
    if (window && 'plausible' in window) {
      const p = window.plausible as (
@ -32,26 +17,8 @@ export const RefreshButton = ({ children }: React.PropsWithChildren) => {
      })
    }

-    toast
-      .promise(
-        coreDump(coreDumpManager, true),
-        {
-          loading: 'Starting core dump...',
-          success: 'Core dump completed successfully',
-          error: 'Error while exporting core dump',
-        },
-        {
-          success: {
-            // Note: this extended duration is especially important for Playwright e2e testing
-            // default duration is 2000 - https://react-hot-toast.com/docs/toast#default-durations
-            duration: 6000,
-          },
-        }
-      )
-      .then(() => {
-        // Window may not be available in some environments
-        window?.location.reload()
-      })
+    // Window may not be available in some environments
+    window?.location.reload()
  }

  return (
--- a/src/components/SettingsAuthProvider.tsx
+++ b/src/components/SettingsAuthProvider.tsx
@ -134,11 +134,6 @@ export const SettingsAuthProviderBase = ({
            },
          })
        },
-        setEngineScaleGridVisibility: (context) => {
-          engineCommandManager.setScaleGridVisibility(
-            context.modeling.showScaleGrid.current
-          )
-        },
        setClientTheme: (context) => {
          const opposingTheme = getOppositeTheme(context.app.theme.current)
          sceneInfra.theme = opposingTheme
--- a/src/components/Stream.tsx
+++ b/src/components/Stream.tsx
@ -1,4 +1,5 @@
 import { MouseEventHandler, useEffect, useRef, useState } from 'react'
+import { useStore } from '../useStore'
 import { getNormalisedCoordinates } from '../lib/utils'
 import Loading from './Loading'
 import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
@ -9,12 +10,25 @@ import { ClientSideScene } from 'clientSideScene/ClientSideSceneComp'
 import { butName } from 'lib/cameraControls'
 import { sendSelectEventToEngine } from 'lib/selections'

-export const Stream = () => {
+export const Stream = ({ className = '' }: { className?: string }) => {
  const [isLoading, setIsLoading] = useState(true)
  const [clickCoords, setClickCoords] = useState<{ x: number; y: number }>()
  const videoRef = useRef<HTMLVideoElement>(null)
+  const {
+    mediaStream,
+    setButtonDownInStream,
+    didDragInStream,
+    setDidDragInStream,
+    streamDimensions,
+  } = useStore((s) => ({
+    mediaStream: s.mediaStream,
+    setButtonDownInStream: s.setButtonDownInStream,
+    didDragInStream: s.didDragInStream,
+    setDidDragInStream: s.setDidDragInStream,
+    streamDimensions: s.streamDimensions,
+  }))
  const { settings } = useSettingsAuthContext()
-  const { state, send, context } = useModelingContext()
+  const { state } = useModelingContext()
  const { overallState } = useNetworkContext()

  const isNetworkOkay =
@ -60,58 +74,38 @@ export const Stream = () => {
    )
      return
    if (!videoRef.current) return
-    if (!context.store?.mediaStream) return
-    videoRef.current.srcObject = context.store.mediaStream
-  }, [context.store?.mediaStream])
+    if (!mediaStream) return
+    videoRef.current.srcObject = mediaStream
+  }, [mediaStream])

  const handleMouseDown: MouseEventHandler<HTMLDivElement> = (e) => {
    if (!isNetworkOkay) return
    if (!videoRef.current) return
    if (state.matches('Sketch')) return
    if (state.matches('Sketch no face')) return
-
    const { x, y } = getNormalisedCoordinates({
      clientX: e.clientX,
      clientY: e.clientY,
      el: videoRef.current,
-      ...context.store?.streamDimensions,
+      ...streamDimensions,
    })

-    send({
-      type: 'Set context',
-      data: {
-        buttonDownInStream: e.button,
-      },
-    })
+    setButtonDownInStream(e.button)
    setClickCoords({ x, y })
  }

  const handleMouseUp: MouseEventHandler<HTMLDivElement> = (e) => {
    if (!isNetworkOkay) return
    if (!videoRef.current) return
-    send({
-      type: 'Set context',
-      data: {
-        buttonDownInStream: undefined,
-      },
-    })
+    setButtonDownInStream(undefined)
    if (state.matches('Sketch')) return
    if (state.matches('Sketch no face')) return

-    if (!context.store?.didDragInStream && butName(e).left) {
-      sendSelectEventToEngine(
-        e,
-        videoRef.current,
-        context.store?.streamDimensions
-      )
+    if (!didDragInStream && butName(e).left) {
+      sendSelectEventToEngine(e, videoRef.current, streamDimensions)
    }

-    send({
-      type: 'Set context',
-      data: {
-        didDragInStream: false,
-      },
-    })
+    setDidDragInStream(false)
    setClickCoords(undefined)
  }

@ -125,20 +119,14 @@ export const Stream = () => {
      ((clickCoords.x - e.clientX) ** 2 + (clickCoords.y - e.clientY) ** 2) **
      0.5

-    if (delta > 5 && !context.store?.didDragInStream) {
-      send({
-        type: 'Set context',
-        data: {
-          didDragInStream: true,
-        },
-      })
+    if (delta > 5 && !didDragInStream) {
+      setDidDragInStream(true)
    }
  }

  return (
    <div
      className="absolute inset-0 z-0"
-      id="stream"
      data-testid="stream"
      onMouseUp={handleMouseUp}
      onMouseDown={handleMouseDown}
--- a/src/components/Toolbar/EqualAngle.tsx
+++ b/src/components/Toolbar/EqualAngle.tsx
@ -1,4 +1,4 @@
-import { toolTips } from 'lang/langHelpers'
+import { toolTips } from '../../useStore'
 import { Selections } from 'lib/selections'
 import { Program, Value, VariableDeclarator } from '../../lang/wasm'
 import {
--- a/src/components/Toolbar/EqualLength.tsx
+++ b/src/components/Toolbar/EqualLength.tsx
@ -1,4 +1,4 @@
-import { toolTips } from 'lang/langHelpers'
+import { toolTips } from '../../useStore'
 import { Selections } from 'lib/selections'
 import { Program, Value, VariableDeclarator } from '../../lang/wasm'
 import {
--- a/src/components/Toolbar/HorzVert.tsx
+++ b/src/components/Toolbar/HorzVert.tsx
@ -1,4 +1,4 @@
-import { toolTips } from 'lang/langHelpers'
+import { toolTips } from '../../useStore'
 import { Selections } from 'lib/selections'
 import { Program, ProgramMemory, Value } from '../../lang/wasm'
 import {
--- a/src/components/Toolbar/Intersect.tsx
+++ b/src/components/Toolbar/Intersect.tsx
@ -1,4 +1,4 @@
-import { toolTips } from 'lang/langHelpers'
+import { toolTips } from '../../useStore'
 import { Selections } from 'lib/selections'
 import { BinaryPart, Program, Value, VariableDeclarator } from '../../lang/wasm'
 import {
--- a/src/components/Toolbar/RemoveConstrainingValues.tsx
+++ b/src/components/Toolbar/RemoveConstrainingValues.tsx
@ -1,4 +1,4 @@
-import { toolTips } from 'lang/langHelpers'
+import { toolTips } from '../../useStore'
 import { Selection, Selections } from 'lib/selections'
 import { PathToNode, Program, Value } from '../../lang/wasm'
 import {
--- a/src/components/Toolbar/SetAbsDistance.tsx
+++ b/src/components/Toolbar/SetAbsDistance.tsx
@ -1,4 +1,4 @@
-import { toolTips } from 'lang/langHelpers'
+import { toolTips } from '../../useStore'
 import { Selections } from 'lib/selections'
 import { BinaryPart, Program, Value } from '../../lang/wasm'
 import {
--- a/src/components/Toolbar/SetAngleBetween.tsx
+++ b/src/components/Toolbar/SetAngleBetween.tsx
@ -1,4 +1,4 @@
-import { toolTips } from 'lang/langHelpers'
+import { toolTips } from '../../useStore'
 import { Selections } from 'lib/selections'
 import { BinaryPart, Program, Value, VariableDeclarator } from '../../lang/wasm'
 import {
--- a/src/components/Toolbar/SetHorzVertDistance.tsx
+++ b/src/components/Toolbar/SetHorzVertDistance.tsx
@ -1,4 +1,4 @@
-import { toolTips } from 'lang/langHelpers'
+import { toolTips } from '../../useStore'
 import { BinaryPart, Program, Value, VariableDeclarator } from '../../lang/wasm'
 import {
  getNodePathFromSourceRange,
--- a/src/components/Toolbar/setAngleLength.tsx
+++ b/src/components/Toolbar/setAngleLength.tsx
@ -1,4 +1,4 @@
-import { toolTips } from 'lang/langHelpers'
+import { toolTips } from '../../useStore'
 import { Selections } from 'lib/selections'
 import { BinaryPart, Program, Value } from '../../lang/wasm'
 import {
--- a/src/components/UserSidebarMenu.tsx
+++ b/src/components/UserSidebarMenu.tsx
@ -20,12 +20,6 @@ const UserSidebarMenu = ({ user }: { user?: User }) => {
  const navigate = useNavigate()
  const send = useSettingsAuthContext()?.auth?.send

-  // This image host goes down sometimes. We will instead rewrite the
-  // resource to be a local one.
-  if (user?.image === 'https://placekitten.com/200/200') {
-    user.image = '/cat.jpg'
-  }
-
  // Fallback logic for displaying user's "name":
  // 1. user.name
  // 2. user.first_name + ' ' + user.last_name
--- a/src/editor/highlightextension.ts
+++ b/src/editor/highlightextension.ts
@ -1,25 +1,16 @@
-import { StateField, StateEffect, Annotation } from '@codemirror/state'
+import { StateField, StateEffect } from '@codemirror/state'
 import { EditorView, Decoration } from '@codemirror/view'

 export { EditorView }

 export const addLineHighlight = StateEffect.define<[number, number]>()

-const addLineHighlightAnnotation = Annotation.define<null>()
-export const addLineHighlightEvent = addLineHighlightAnnotation.of(null)
-
 export const lineHighlightField = StateField.define({
  create() {
    return Decoration.none
  },
  update(lines, tr) {
    lines = lines.map(tr.changes)
-
-    const isLineHighlightEvent = tr.annotation(addLineHighlightEvent.type)
-    if (isLineHighlightEvent === undefined) {
-      return lines
-    }
-
    const deco = []
    for (let e of tr.effects) {
      if (e.is(addLineHighlight)) {
--- a/Show More
+++ b/Show More