add segment proof of concept

* add issue template

* change report a bug link

* add issue form and delete issue template, update link

.codespellrc

@@ -1,3 +1,3 @@
 [codespell]
-ignore-words-list: crate,everytime
+ignore-words-list: crate,everytime,inout,co-ordinate,ot,nwo
 skip: **/target,node_modules,build,**/Cargo.lock

.env.production

@@ -3,4 +3,4 @@ VITE_KC_API_BASE_URL=https://api.zoo.dev
 VITE_KC_SITE_BASE_URL=https://zoo.dev
 VITE_KC_SKIP_AUTH=false
 VITE_KC_CONNECTION_TIMEOUT_MS=15000
-VITE_KC_SENTRY_DSN=https://a814f2f66734989a90367f48feee28ca@o1042111.ingest.sentry.io/4505789425844224
+VITE_KC_SENTRY_DSN=

.eslintignore

@@ -1 +1,2 @@
 src/wasm-lib/*
+*.typegen.ts

.eslintrc

@@ -17,12 +17,12 @@
         "never"
       ],
       "react-hooks/exhaustive-deps": "off",
-      "@typescript-eslint/no-floating-promises": "warn"
     },
     "overrides": [
       {
         "files": ["e2e/**/*.ts"], // Update the pattern based on your file structure
         "rules": {
+          "@typescript-eslint/no-floating-promises": "warn",
           "testing-library/prefer-screen-queries": "off"
         }
       }

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,85 @@
+name: Bug Report
+description: File a bug report for the Zoo Modeling App
+title: "[BUG]: "
+labels: ["bug"]
+assignees: []
+body:
+  - type: markdown
+    attributes:
+      value: "Thank you for taking the time to report a bug. Please provide as much information as possible to help us resolve it."
+
+  - type: textarea
+    id: describe-bug
+    attributes:
+      label: Describe the bug
+      description: A clear and concise description of what the bug is.
+      placeholder: "Explain the bug..."
+    validations:
+      required: true
+
+  - type: textarea
+    id: reproduce-bug
+    attributes:
+      label: Steps to Reproduce
+      description: Steps to reproduce the behavior.
+      placeholder: |
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. See error
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected Behavior
+      description: Description of what you expected to happen.
+      placeholder: "I expected that..."
+    validations:
+      required: true
+
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots and Recordings 
+      description: If applicable, add screenshots to help explain your problem. Maximum upload size is 10MB.
+      placeholder: "You can attach images or video recordings here."
+    validations:
+      required: false
+
+  - type: input
+    id: desktop-os
+    attributes:
+      label: Desktop OS
+      description: "Your operating system"
+      placeholder: "example: Windows 10, MacOS Big Sur"
+    validations:
+      required: true
+
+  - type: input
+    id: browser
+    attributes:
+      label: Browser
+      description: "If you are using the web version, please specify the browser you are using."
+      placeholder: "example: Chrome, Safari"
+    validations:
+      required: false
+
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: "The version of the Zoo Modeling App you're using."
+      placeholder: "example: v0.15.0. You can find this in the settings."
+    validations:
+      required: true
+
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional Context
+      description: Add any other context about the problem here.
+      placeholder: "Anything else you want to add..."
+    validations:
+      required: false

.github/workflows/ci.yml

@@ -46,6 +46,7 @@ jobs:
           workspaces: './src/wasm-lib'
 
       - run: yarn build:wasm
+      - run: yarn xstate:typegen
       - run: yarn tsc
 
 
@@ -85,8 +86,6 @@ jobs:
 
       - run: yarn test:nowatch
 
-      - run: yarn test:cov
-
 
   prepare-json-files:
     runs-on: ubuntu-latest  # seperate job on Ubuntu for easy string manipulations (compared to Windows)
@@ -125,7 +124,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
+        os: [macos-14, ubuntu-latest, windows-latest]
     steps:
       - uses: actions/checkout@v4
 
@@ -188,10 +187,10 @@ jobs:
       - name: Fix format
         run: yarn fmt
 
-      - name: Install Universal target (MacOS only)
-        if: matrix.os == 'macos-latest'
+      - name: Install x86 target for Universal builds (MacOS only)
+        if: matrix.os == 'macos-14'
         run: |
-          rustup target add aarch64-apple-darwin
+          rustup target add x86_64-apple-darwin
 
       - name: Prepare certificate and variables (Windows only)
         if: ${{ matrix.os == 'windows-latest' && env.BUILD_RELEASE == 'true' }}
@@ -225,7 +224,7 @@ jobs:
         with:
           includeRelease: false
           includeDebug: true
-          args: ${{ matrix.os == 'macos-latest' && '--target universal-apple-darwin' || '' }}
+          args: ${{ matrix.os == 'macos-14' && '--target universal-apple-darwin' || '' }}
 
       - name: Build the app (release) and sign
         uses: tauri-apps/tauri-action@v0
@@ -241,12 +240,12 @@ jobs:
           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' }}"
         with:
-          args: "${{ matrix.os == 'macos-latest' && '--target universal-apple-darwin' || '' }} ${{ env.TAURI_CONF_ARGS }}"
+          args: "${{ matrix.os == 'macos-14' && '--target universal-apple-darwin' || '' }} ${{ env.TAURI_CONF_ARGS }}"
 
       - uses: actions/upload-artifact@v3
         if: matrix.os != 'ubuntu-latest'
         env:
-          PREFIX: ${{ matrix.os == 'macos-latest' && 'src-tauri/target/universal-apple-darwin' || 'src-tauri/target' }}
+          PREFIX: ${{ matrix.os == 'macos-14' && 'src-tauri/target/universal-apple-darwin' || 'src-tauri/target' }}
           MODE: ${{ env.BUILD_RELEASE == 'true' && 'release' || 'debug' }}
         with:
           path: "${{ env.PREFIX }}/${{ env.MODE }}/bundle/*/*"
@@ -254,7 +253,7 @@ jobs:
       - name: Run e2e tests (linux only)
         if: matrix.os == 'ubuntu-latest'
         run: |
-          cargo install tauri-driver
+          cargo install tauri-driver@0.1.3
           source .env.${{ env.BUILD_RELEASE == 'true' && 'production' || 'development' }}
           export VITE_KC_API_BASE_URL
           xvfb-run yarn test:e2e:tauri
@@ -337,17 +336,17 @@ jobs:
             cat last_download.json
 
       - name: Authenticate to Google Cloud
-        uses: 'google-github-actions/auth@v2.0.0'
+        uses: 'google-github-actions/auth@v2.1.1'
         with:
           credentials_json: '${{ secrets.GOOGLE_CLOUD_DL_SA }}'
 
       - name: Set up Google Cloud SDK
-        uses: google-github-actions/setup-gcloud@v2.0.0
+        uses: google-github-actions/setup-gcloud@v2.1.0
         with:
           project_id: kittycadapi
 
       - name: Upload release files to public bucket
-        uses: google-github-actions/upload-cloud-storage@v2.0.0
+        uses: google-github-actions/upload-cloud-storage@v2.1.0
         with:
           path: artifact
           glob: '*/Zoo*'
@@ -355,13 +354,13 @@ jobs:
           destination: ${{ env.BUCKET_DIR }}/${{ env.VERSION }}
 
       - name: Upload update endpoint to public bucket
-        uses: google-github-actions/upload-cloud-storage@v2.0.0
+        uses: google-github-actions/upload-cloud-storage@v2.1.0
         with:
           path: last_update.json
           destination: ${{ env.BUCKET_DIR }}
 
       - name: Upload download endpoint to public bucket
-        uses: google-github-actions/upload-cloud-storage@v2.0.0
+        uses: google-github-actions/upload-cloud-storage@v2.1.0
         with:
           path: last_download.json
           destination: ${{ env.BUCKET_DIR }}
@@ -371,3 +370,28 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           files: 'artifact/*/Zoo*'
+          
+  announce_release:
+    needs: [publish-apps-release]
+    runs-on: ubuntu-latest
+    if: github.event_name == 'release'
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+          
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+  
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install requests
+  
+      - name: Announce Release
+        env:
+          DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
+          RELEASE_VERSION: ${{ github.event.release.tag_name }}
+          RELEASE_BODY: ${{ github.event.release.body}}
+        run: python public/announce_release.py

.github/workflows/playwright.yml

@@ -14,7 +14,7 @@ jobs:
       with:
         node-version-file: '.nvmrc'
         cache: 'yarn'
-    - uses: KittyCAD/action-install-cli@v0.2.16
+    - uses: KittyCAD/action-install-cli@v0.2.21
     - name: Install dependencies
       run: yarn
     - name: Install Playwright Browsers
@@ -79,7 +79,7 @@ jobs:
 
   playwright-macos:
     timeout-minutes: 60
-    runs-on: macos-latest
+    runs-on: macos-14
     needs: playwright-ubuntu
     steps:
     - uses: actions/checkout@v4

.gitignore

@@ -50,3 +50,7 @@ e2e/playwright/export-snapshots/*embedded.gltf
 /playwright-report/
 /blob-report/
 /playwright/.cache/
+
+
+## generated files
+src/**/*.typegen.ts

.prettierignore

@@ -10,4 +10,4 @@ src/wasm-lib/kcl/bindings
 e2e/playwright/export-snapshots
 
 # XState generated files
-src/machines/modelingMachine.typegen.ts
+src/machines/**.typegen.ts

README.md

@@ -136,6 +136,11 @@ Before you submit a contribution PR to this repo, please ensure that:
 VERSION=x.y.z yarn run bump-jsons
 ```
 
+Alternatively you can try the experimental `make-release.sh` bash script that will create the branch with the updated json files for you.
+run `./make-release.sh` for a patch update
+run `./make-release.sh "minor"` for minor
+run `./make-release.sh "major"` for major
+
 The PR may serve as a place to discuss the human-readable changelog and extra QA. A quick way of getting PR's merged since the last bump is to [use this PR filter](https://github.com/KittyCAD/modeling-app/pulls?q=is%3Apr+sort%3Aupdated-desc+is%3Amerged+), open up the browser console and past in the following
 
 ```typescript
@@ -182,7 +187,7 @@ For more information on fuzzing you can check out
 First time running plawright locally, you'll need to add the secrets file
 ```bash
 touch ./e2e/playwright/playwright-secrets.env
-echo 'token="your-token"\nsnapshottoken="your-snapshot-token"' > ./e2e/playwright/playwright-secrets2.env
+printf 'token="your-token"\nsnapshottoken="your-snapshot-token"' > ./e2e/playwright/playwright-secrets.env
 ```
 then replace "your-token" with a dev token from dev.zoo.dev/account/api-tokens
 

docs/kcl/KNOWN-ISSUES.md

@@ -0,0 +1,18 @@
+# Known Issues
+
+The following are bugs that are not in modeling-app or kcl itself. These bugs
+once fixed in engine will just start working here with no language changes.
+
+- **Sketch on Face**: If your sketch is outside the edges of the face (on which you
+    are sketching) you will get multiple models returned instead of one single
+    model for that sketch and its underlying 3D object.
+    If you see a red line around your model, it means this is happening.
+
+- **Patterns**: If you try and pass a pattern to `hole` currently only the first
+    item in the pattern is being subtracted. This is an engine bug that is being
+    worked on.
+  
+- **Import**: Right now you can import a file, even if that file has brep data
+    you cannot edit it, after v1, the engine will account for this. You also cannot
+    currently move or transform the imported objects at all, once we have assemblies
+    this will work.

e2e/playwright/export-snapshots/step-.step

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
-FILE_DESCRIPTION((('kittycad.io export')), '2;1');
-FILE_NAME('dump.step', '1970-01-01T00:00:00.0+00:00', ('Author unknown'), ('Organization unknown'), 'kittycad.io beta', 'kittycad.io', 'Authorization unknown');
+FILE_DESCRIPTION((('zoo.dev export')), '2;1');
+FILE_NAME('dump.step', '1970-01-01T00:00:00.0+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;
@@ -19,59 +19,59 @@ DATA;
 );
 #4 = CARTESIAN_POINT('NONE', (0, 0, -0));
 #5 = VERTEX_POINT('NONE', #4);
-#6 = CARTESIAN_POINT('NONE', (0, -0.0254, -0));
+#6 = CARTESIAN_POINT('NONE', (0, -0.64516, -0));
 #7 = VERTEX_POINT('NONE', #6);
-#8 = CARTESIAN_POINT('NONE', (0, -0.0254, 0.1016));
+#8 = CARTESIAN_POINT('NONE', (0, -0.64516, 2.58064));
 #9 = VERTEX_POINT('NONE', #8);
-#10 = CARTESIAN_POINT('NONE', (0, 0, 0.1016));
+#10 = CARTESIAN_POINT('NONE', (0, 0, 2.58064));
 #11 = VERTEX_POINT('NONE', #10);
-#12 = CARTESIAN_POINT('NONE', (0.07861346939195568, -0.0254, -0));
+#12 = CARTESIAN_POINT('NONE', (1.996782122555674, -0.64516, -0));
 #13 = VERTEX_POINT('NONE', #12);
-#14 = CARTESIAN_POINT('NONE', (0.07861346939195568, -0.0254, 0.1016));
+#14 = CARTESIAN_POINT('NONE', (1.996782122555674, -0.64516, 2.58064));
 #15 = VERTEX_POINT('NONE', #14);
-#16 = CARTESIAN_POINT('NONE', (0.1511633881344551, -0.07619999999999998, -0));
+#16 = CARTESIAN_POINT('NONE', (3.839550058615159, -1.9354799999999992, -0));
 #17 = VERTEX_POINT('NONE', #16);
-#18 = CARTESIAN_POINT('NONE', (0.1511633881344551, -0.07619999999999998, 0.1016));
+#18 = CARTESIAN_POINT('NONE', (3.839550058615159, -1.9354799999999992, 2.58064));
 #19 = VERTEX_POINT('NONE', #18);
-#20 = CARTESIAN_POINT('NONE', (0.2413, -0.0762, -0));
+#20 = CARTESIAN_POINT('NONE', (6.12902, -1.93548, -0));
 #21 = VERTEX_POINT('NONE', #20);
-#22 = CARTESIAN_POINT('NONE', (0.2413, -0.0762, 0.1016));
+#22 = CARTESIAN_POINT('NONE', (6.12902, -1.93548, 2.58064));
 #23 = VERTEX_POINT('NONE', #22);
-#24 = CARTESIAN_POINT('NONE', (0.2413, -0.0635, -0));
+#24 = CARTESIAN_POINT('NONE', (6.12902, -1.6129, -0));
 #25 = VERTEX_POINT('NONE', #24);
-#26 = CARTESIAN_POINT('NONE', (0.2413, -0.0635, 0.1016));
+#26 = CARTESIAN_POINT('NONE', (6.12902, -1.6129, 2.58064));
 #27 = VERTEX_POINT('NONE', #26);
-#28 = CARTESIAN_POINT('NONE', (0.1551676827532182, -0.0635, -0));
+#28 = CARTESIAN_POINT('NONE', (3.9412591419317424, -1.6129, -0));
 #29 = VERTEX_POINT('NONE', #28);
-#30 = CARTESIAN_POINT('NONE', (0.1551676827532182, -0.0635, 0.1016));
+#30 = CARTESIAN_POINT('NONE', (3.9412591419317424, -1.6129, 2.58064));
 #31 = VERTEX_POINT('NONE', #30);
-#32 = CARTESIAN_POINT('NONE', (0.06448028432509392, 0, -0));
+#32 = CARTESIAN_POINT('NONE', (1.6377992218573856, 0, -0));
 #33 = VERTEX_POINT('NONE', #32);
-#34 = CARTESIAN_POINT('NONE', (0.06448028432509392, 0, 0.1016));
+#34 = CARTESIAN_POINT('NONE', (1.6377992218573856, 0, 2.58064));
 #35 = VERTEX_POINT('NONE', #34);
-#36 = CARTESIAN_POINT('NONE', (0.14618599799650817, 0.03810000000000001, -0));
+#36 = CARTESIAN_POINT('NONE', (3.7131243491113075, 0.9677400000000002, -0));
 #37 = VERTEX_POINT('NONE', #36);
-#38 = CARTESIAN_POINT('NONE', (0.14618599799650817, 0.03810000000000001, 0.1016));
+#38 = CARTESIAN_POINT('NONE', (3.7131243491113075, 0.9677400000000002, 2.58064));
 #39 = VERTEX_POINT('NONE', #38);
-#40 = CARTESIAN_POINT('NONE', (0.2413, 0.0381, -0));
+#40 = CARTESIAN_POINT('NONE', (6.12902, 0.9677399999999998, -0));
 #41 = VERTEX_POINT('NONE', #40);
-#42 = CARTESIAN_POINT('NONE', (0.2413, 0.0381, 0.1016));
+#42 = CARTESIAN_POINT('NONE', (6.12902, 0.9677399999999998, 2.58064));
 #43 = VERTEX_POINT('NONE', #42);
-#44 = CARTESIAN_POINT('NONE', (0.2413, 0.0508, -0));
+#44 = CARTESIAN_POINT('NONE', (6.12902, 1.29032, -0));
 #45 = VERTEX_POINT('NONE', #44);
-#46 = CARTESIAN_POINT('NONE', (0.2413, 0.0508, 0.1016));
+#46 = CARTESIAN_POINT('NONE', (6.12902, 1.29032, 2.58064));
 #47 = VERTEX_POINT('NONE', #46);
-#48 = CARTESIAN_POINT('NONE', (0.14337047578094278, 0.0508, -0));
+#48 = CARTESIAN_POINT('NONE', (3.6416100848359463, 1.29032, -0));
 #49 = VERTEX_POINT('NONE', #48);
-#50 = CARTESIAN_POINT('NONE', (0.14337047578094278, 0.0508, 0.1016));
+#50 = CARTESIAN_POINT('NONE', (3.6416100848359463, 1.29032, 2.58064));
 #51 = VERTEX_POINT('NONE', #50);
-#52 = CARTESIAN_POINT('NONE', (0.08889999999999999, 0.0254, -0));
+#52 = CARTESIAN_POINT('NONE', (2.2580599999999995, 0.64516, -0));
 #53 = VERTEX_POINT('NONE', #52);
-#54 = CARTESIAN_POINT('NONE', (0.08889999999999999, 0.0254, 0.1016));
+#54 = CARTESIAN_POINT('NONE', (2.2580599999999995, 0.64516, 2.58064));
 #55 = VERTEX_POINT('NONE', #54);
-#56 = CARTESIAN_POINT('NONE', (0, 0.0254, -0));
+#56 = CARTESIAN_POINT('NONE', (0, 0.64516, -0));
 #57 = VERTEX_POINT('NONE', #56);
-#58 = CARTESIAN_POINT('NONE', (0, 0.0254, 0.1016));
+#58 = CARTESIAN_POINT('NONE', (0, 0.64516, 2.58064));
 #59 = VERTEX_POINT('NONE', #58);
 #60 = DIRECTION('NONE', (0, -1, 0));
 #61 = VECTOR('NONE', #60, 1);
@@ -79,11 +79,11 @@ DATA;
 #63 = LINE('NONE', #62, #61);
 #64 = DIRECTION('NONE', (0, 0, 1));
 #65 = VECTOR('NONE', #64, 1);
-#66 = CARTESIAN_POINT('NONE', (0, -0.0254, -0));
+#66 = CARTESIAN_POINT('NONE', (0, -0.64516, -0));
 #67 = LINE('NONE', #66, #65);
 #68 = DIRECTION('NONE', (0, -1, 0));
 #69 = VECTOR('NONE', #68, 1);
-#70 = CARTESIAN_POINT('NONE', (0, 0, 0.1016));
+#70 = CARTESIAN_POINT('NONE', (0, 0, 2.58064));
 #71 = LINE('NONE', #70, #69);
 #72 = DIRECTION('NONE', (0, 0, 1));
 #73 = VECTOR('NONE', #72, 1);
@@ -91,155 +91,155 @@ DATA;
 #75 = LINE('NONE', #74, #73);
 #76 = DIRECTION('NONE', (1, 0, 0));
 #77 = VECTOR('NONE', #76, 1);
-#78 = CARTESIAN_POINT('NONE', (0, -0.0254, -0));
+#78 = CARTESIAN_POINT('NONE', (0, -0.64516, -0));
 #79 = LINE('NONE', #78, #77);
 #80 = DIRECTION('NONE', (0, 0, 1));
 #81 = VECTOR('NONE', #80, 1);
-#82 = CARTESIAN_POINT('NONE', (0.07861346939195568, -0.0254, -0));
+#82 = CARTESIAN_POINT('NONE', (1.996782122555674, -0.64516, -0));
 #83 = LINE('NONE', #82, #81);
 #84 = DIRECTION('NONE', (1, 0, 0));
 #85 = VECTOR('NONE', #84, 1);
-#86 = CARTESIAN_POINT('NONE', (0, -0.0254, 0.1016));
+#86 = CARTESIAN_POINT('NONE', (0, -0.64516, 2.58064));
 #87 = LINE('NONE', #86, #85);
-#88 = DIRECTION('NONE', (0.8191520442889919, -0.5735764363510459, 0));
+#88 = DIRECTION('NONE', (0.819152044288992, -0.5735764363510459, 0));
 #89 = VECTOR('NONE', #88, 1);
-#90 = CARTESIAN_POINT('NONE', (0.07861346939195568, -0.0254, -0));
+#90 = CARTESIAN_POINT('NONE', (1.996782122555674, -0.64516, -0));
 #91 = LINE('NONE', #90, #89);
 #92 = DIRECTION('NONE', (0, 0, 1));
 #93 = VECTOR('NONE', #92, 1);
-#94 = CARTESIAN_POINT('NONE', (0.1511633881344551, -0.07619999999999998, -0));
+#94 = CARTESIAN_POINT('NONE', (3.839550058615159, -1.9354799999999992, -0));
 #95 = LINE('NONE', #94, #93);
-#96 = DIRECTION('NONE', (0.8191520442889919, -0.5735764363510459, 0));
+#96 = DIRECTION('NONE', (0.819152044288992, -0.5735764363510459, 0));
 #97 = VECTOR('NONE', #96, 1);
-#98 = CARTESIAN_POINT('NONE', (0.07861346939195568, -0.0254, 0.1016));
+#98 = CARTESIAN_POINT('NONE', (1.996782122555674, -0.64516, 2.58064));
 #99 = LINE('NONE', #98, #97);
-#100 = DIRECTION('NONE', (1, -0.0000000000000003079278779307945, 0));
+#100 = DIRECTION('NONE', (1, -0.00000000000000038794063361359933, 0));
 #101 = VECTOR('NONE', #100, 1);
-#102 = CARTESIAN_POINT('NONE', (0.1511633881344551, -0.07619999999999998, -0));
+#102 = CARTESIAN_POINT('NONE', (3.839550058615159, -1.9354799999999992, -0));
 #103 = LINE('NONE', #102, #101);
 #104 = DIRECTION('NONE', (0, 0, 1));
 #105 = VECTOR('NONE', #104, 1);
-#106 = CARTESIAN_POINT('NONE', (0.2413, -0.0762, -0));
+#106 = CARTESIAN_POINT('NONE', (6.12902, -1.93548, -0));
 #107 = LINE('NONE', #106, #105);
-#108 = DIRECTION('NONE', (1, -0.0000000000000003079278779307945, 0));
+#108 = DIRECTION('NONE', (1, -0.00000000000000038794063361359933, 0));
 #109 = VECTOR('NONE', #108, 1);
-#110 = CARTESIAN_POINT('NONE', (0.1511633881344551, -0.07619999999999998, 0.1016));
+#110 = CARTESIAN_POINT('NONE', (3.839550058615159, -1.9354799999999992, 2.58064));
 #111 = LINE('NONE', #110, #109);
 #112 = DIRECTION('NONE', (0, 1, 0));
 #113 = VECTOR('NONE', #112, 1);
-#114 = CARTESIAN_POINT('NONE', (0.2413, -0.0762, -0));
+#114 = CARTESIAN_POINT('NONE', (6.12902, -1.93548, -0));
 #115 = LINE('NONE', #114, #113);
 #116 = DIRECTION('NONE', (0, 0, 1));
 #117 = VECTOR('NONE', #116, 1);
-#118 = CARTESIAN_POINT('NONE', (0.2413, -0.0635, -0));
+#118 = CARTESIAN_POINT('NONE', (6.12902, -1.6129, -0));
 #119 = LINE('NONE', #118, #117);
 #120 = DIRECTION('NONE', (0, 1, 0));
 #121 = VECTOR('NONE', #120, 1);
-#122 = CARTESIAN_POINT('NONE', (0.2413, -0.0762, 0.1016));
+#122 = CARTESIAN_POINT('NONE', (6.12902, -1.93548, 2.58064));
 #123 = LINE('NONE', #122, #121);
 #124 = DIRECTION('NONE', (-1, 0, 0));
 #125 = VECTOR('NONE', #124, 1);
-#126 = CARTESIAN_POINT('NONE', (0.2413, -0.0635, -0));
+#126 = CARTESIAN_POINT('NONE', (6.12902, -1.6129, -0));
 #127 = LINE('NONE', #126, #125);
 #128 = DIRECTION('NONE', (0, 0, 1));
 #129 = VECTOR('NONE', #128, 1);
-#130 = CARTESIAN_POINT('NONE', (0.1551676827532182, -0.0635, -0));
+#130 = CARTESIAN_POINT('NONE', (3.9412591419317424, -1.6129, -0));
 #131 = LINE('NONE', #130, #129);
 #132 = DIRECTION('NONE', (-1, 0, 0));
 #133 = VECTOR('NONE', #132, 1);
-#134 = CARTESIAN_POINT('NONE', (0.2413, -0.0635, 0.1016));
+#134 = CARTESIAN_POINT('NONE', (6.12902, -1.6129, 2.58064));
 #135 = LINE('NONE', #134, #133);
 #136 = DIRECTION('NONE', (-0.8191520442889919, 0.573576436351046, 0));
 #137 = VECTOR('NONE', #136, 1);
-#138 = CARTESIAN_POINT('NONE', (0.1551676827532182, -0.0635, -0));
+#138 = CARTESIAN_POINT('NONE', (3.9412591419317424, -1.6129, -0));
 #139 = LINE('NONE', #138, #137);
 #140 = DIRECTION('NONE', (0, 0, 1));
 #141 = VECTOR('NONE', #140, 1);
-#142 = CARTESIAN_POINT('NONE', (0.06448028432509392, 0, -0));
+#142 = CARTESIAN_POINT('NONE', (1.6377992218573856, 0, -0));
 #143 = LINE('NONE', #142, #141);
 #144 = DIRECTION('NONE', (-0.8191520442889919, 0.573576436351046, 0));
 #145 = VECTOR('NONE', #144, 1);
-#146 = CARTESIAN_POINT('NONE', (0.1551676827532182, -0.0635, 0.1016));
+#146 = CARTESIAN_POINT('NONE', (3.9412591419317424, -1.6129, 2.58064));
 #147 = LINE('NONE', #146, #145);
-#148 = DIRECTION('NONE', (0.90630778703665, 0.4226182617406993, 0));
+#148 = DIRECTION('NONE', (0.90630778703665, 0.4226182617406992, 0));
 #149 = VECTOR('NONE', #148, 1);
-#150 = CARTESIAN_POINT('NONE', (0.06448028432509392, 0, -0));
+#150 = CARTESIAN_POINT('NONE', (1.6377992218573856, 0, -0));
 #151 = LINE('NONE', #150, #149);
 #152 = DIRECTION('NONE', (0, 0, 1));
 #153 = VECTOR('NONE', #152, 1);
-#154 = CARTESIAN_POINT('NONE', (0.14618599799650817, 0.03810000000000001, -0));
+#154 = CARTESIAN_POINT('NONE', (3.7131243491113075, 0.9677400000000002, -0));
 #155 = LINE('NONE', #154, #153);
-#156 = DIRECTION('NONE', (0.90630778703665, 0.4226182617406993, 0));
+#156 = DIRECTION('NONE', (0.90630778703665, 0.4226182617406992, 0));
 #157 = VECTOR('NONE', #156, 1);
-#158 = CARTESIAN_POINT('NONE', (0.06448028432509392, 0, 0.1016));
+#158 = CARTESIAN_POINT('NONE', (1.6377992218573856, 0, 2.58064));
 #159 = LINE('NONE', #158, #157);
-#160 = DIRECTION('NONE', (1, -0.00000000000000007295344279228718, 0));
+#160 = DIRECTION('NONE', (1, -0.0000000000000001378647737807002, 0));
 #161 = VECTOR('NONE', #160, 1);
-#162 = CARTESIAN_POINT('NONE', (0.14618599799650817, 0.03810000000000001, -0));
+#162 = CARTESIAN_POINT('NONE', (3.7131243491113075, 0.9677400000000002, -0));
 #163 = LINE('NONE', #162, #161);
 #164 = DIRECTION('NONE', (0, 0, 1));
 #165 = VECTOR('NONE', #164, 1);
-#166 = CARTESIAN_POINT('NONE', (0.2413, 0.0381, -0));
+#166 = CARTESIAN_POINT('NONE', (6.12902, 0.9677399999999998, -0));
 #167 = LINE('NONE', #166, #165);
-#168 = DIRECTION('NONE', (1, -0.00000000000000007295344279228718, 0));
+#168 = DIRECTION('NONE', (1, -0.0000000000000001378647737807002, 0));
 #169 = VECTOR('NONE', #168, 1);
-#170 = CARTESIAN_POINT('NONE', (0.14618599799650817, 0.03810000000000001, 0.1016));
+#170 = CARTESIAN_POINT('NONE', (3.7131243491113075, 0.9677400000000002, 2.58064));
 #171 = LINE('NONE', #170, #169);
 #172 = DIRECTION('NONE', (0, 1, 0));
 #173 = VECTOR('NONE', #172, 1);
-#174 = CARTESIAN_POINT('NONE', (0.2413, 0.0381, -0));
+#174 = CARTESIAN_POINT('NONE', (6.12902, 0.9677399999999998, -0));
 #175 = LINE('NONE', #174, #173);
 #176 = DIRECTION('NONE', (0, 0, 1));
 #177 = VECTOR('NONE', #176, 1);
-#178 = CARTESIAN_POINT('NONE', (0.2413, 0.0508, -0));
+#178 = CARTESIAN_POINT('NONE', (6.12902, 1.29032, -0));
 #179 = LINE('NONE', #178, #177);
 #180 = DIRECTION('NONE', (0, 1, 0));
 #181 = VECTOR('NONE', #180, 1);
-#182 = CARTESIAN_POINT('NONE', (0.2413, 0.0381, 0.1016));
+#182 = CARTESIAN_POINT('NONE', (6.12902, 0.9677399999999998, 2.58064));
 #183 = LINE('NONE', #182, #181);
 #184 = DIRECTION('NONE', (-1, 0, 0));
 #185 = VECTOR('NONE', #184, 1);
-#186 = CARTESIAN_POINT('NONE', (0.2413, 0.0508, -0));
+#186 = CARTESIAN_POINT('NONE', (6.12902, 1.29032, -0));
 #187 = LINE('NONE', #186, #185);
 #188 = DIRECTION('NONE', (0, 0, 1));
 #189 = VECTOR('NONE', #188, 1);
-#190 = CARTESIAN_POINT('NONE', (0.14337047578094278, 0.0508, -0));
+#190 = CARTESIAN_POINT('NONE', (3.6416100848359463, 1.29032, -0));
 #191 = LINE('NONE', #190, #189);
 #192 = DIRECTION('NONE', (-1, 0, 0));
 #193 = VECTOR('NONE', #192, 1);
-#194 = CARTESIAN_POINT('NONE', (0.2413, 0.0508, 0.1016));
+#194 = CARTESIAN_POINT('NONE', (6.12902, 1.29032, 2.58064));
 #195 = LINE('NONE', #194, #193);
-#196 = DIRECTION('NONE', (-0.90630778703665, -0.42261826174069944, 0));
+#196 = DIRECTION('NONE', (-0.90630778703665, -0.4226182617406995, 0));
 #197 = VECTOR('NONE', #196, 1);
-#198 = CARTESIAN_POINT('NONE', (0.14337047578094278, 0.0508, -0));
+#198 = CARTESIAN_POINT('NONE', (3.6416100848359463, 1.29032, -0));
 #199 = LINE('NONE', #198, #197);
 #200 = DIRECTION('NONE', (0, 0, 1));
 #201 = VECTOR('NONE', #200, 1);
-#202 = CARTESIAN_POINT('NONE', (0.08889999999999999, 0.0254, -0));
+#202 = CARTESIAN_POINT('NONE', (2.2580599999999995, 0.64516, -0));
 #203 = LINE('NONE', #202, #201);
-#204 = DIRECTION('NONE', (-0.90630778703665, -0.42261826174069944, 0));
+#204 = DIRECTION('NONE', (-0.90630778703665, -0.4226182617406995, 0));
 #205 = VECTOR('NONE', #204, 1);
-#206 = CARTESIAN_POINT('NONE', (0.14337047578094278, 0.0508, 0.1016));
+#206 = CARTESIAN_POINT('NONE', (3.6416100848359463, 1.29032, 2.58064));
 #207 = LINE('NONE', #206, #205);
 #208 = DIRECTION('NONE', (-1, 0, 0));
 #209 = VECTOR('NONE', #208, 1);
-#210 = CARTESIAN_POINT('NONE', (0.08889999999999999, 0.0254, -0));
+#210 = CARTESIAN_POINT('NONE', (2.2580599999999995, 0.64516, -0));
 #211 = LINE('NONE', #210, #209);
 #212 = DIRECTION('NONE', (0, 0, 1));
 #213 = VECTOR('NONE', #212, 1);
-#214 = CARTESIAN_POINT('NONE', (0, 0.0254, -0));
+#214 = CARTESIAN_POINT('NONE', (0, 0.64516, -0));
 #215 = LINE('NONE', #214, #213);
 #216 = DIRECTION('NONE', (-1, 0, 0));
 #217 = VECTOR('NONE', #216, 1);
-#218 = CARTESIAN_POINT('NONE', (0.08889999999999999, 0.0254, 0.1016));
+#218 = CARTESIAN_POINT('NONE', (2.2580599999999995, 0.64516, 2.58064));
 #219 = LINE('NONE', #218, #217);
 #220 = DIRECTION('NONE', (0, -1, 0));
 #221 = VECTOR('NONE', #220, 1);
-#222 = CARTESIAN_POINT('NONE', (0, 0.0254, -0));
+#222 = CARTESIAN_POINT('NONE', (0, 0.64516, -0));
 #223 = LINE('NONE', #222, #221);
 #224 = DIRECTION('NONE', (0, -1, 0));
 #225 = VECTOR('NONE', #224, 1);
-#226 = CARTESIAN_POINT('NONE', (0, 0.0254, 0.1016));
+#226 = CARTESIAN_POINT('NONE', (0, 0.64516, 2.58064));
 #227 = LINE('NONE', #226, #225);
 #228 = EDGE_CURVE('NONE', #5, #7, #63, .T.);
 #229 = EDGE_CURVE('NONE', #7, #9, #67, .T.);
@@ -383,67 +383,67 @@ DATA;
 #367 = ORIENTED_EDGE('NONE', *, *, #267, .T.);
 #368 = ORIENTED_EDGE('NONE', *, *, #269, .T.);
 #369 = EDGE_LOOP('NONE', (#355, #356, #357, #358, #359, #360, #361, #362, #363, #364, #365, #366, #367, #368));
-#370 = CARTESIAN_POINT('NONE', (0, -0.0127, 0.0508));
-#371 = DIRECTION('NONE', (-1, 0, -0));
+#370 = CARTESIAN_POINT('NONE', (0, -0.3225799999999985, 1.2903199999999995));
+#371 = DIRECTION('NONE', (-1, -0, 0));
 #372 = AXIS2_PLACEMENT_3D('NONE', #370, #371, $);
 #373 = PLANE('NONE', #372);
-#374 = CARTESIAN_POINT('NONE', (0.039306734695977924, -0.025399999999999995, 0.0508));
-#375 = DIRECTION('NONE', (0, -1, -0));
+#374 = CARTESIAN_POINT('NONE', (0.9983910612778368, -0.6451599999999998, 1.2903199999999997));
+#375 = DIRECTION('NONE', (0, -1, 0));
 #376 = AXIS2_PLACEMENT_3D('NONE', #374, #375, $);
 #377 = PLANE('NONE', #376);
-#378 = CARTESIAN_POINT('NONE', (0.11488842876320533, -0.05079999999999996, 0.05079999999999999));
-#379 = DIRECTION('NONE', (-0.5735764363510459, -0.819152044288992, 0));
+#378 = CARTESIAN_POINT('NONE', (2.918166090585415, -1.2903199999999988, 1.2903199999999997));
+#379 = DIRECTION('NONE', (-0.5735764363510459, -0.8191520442889919, 0));
 #380 = AXIS2_PLACEMENT_3D('NONE', #378, #379, $);
 #381 = PLANE('NONE', #380);
-#382 = CARTESIAN_POINT('NONE', (0.19623169406722757, -0.07619999999999999, 0.0508));
-#383 = DIRECTION('NONE', (0, -1, -0));
+#382 = CARTESIAN_POINT('NONE', (4.984285029307579, -1.9354799999999992, 1.2903199999999997));
+#383 = DIRECTION('NONE', (0, -1, 0));
 #384 = AXIS2_PLACEMENT_3D('NONE', #382, #383, $);
 #385 = PLANE('NONE', #384);
-#386 = CARTESIAN_POINT('NONE', (0.2413, -0.06985, 0.0508));
-#387 = DIRECTION('NONE', (1, 0, -0));
+#386 = CARTESIAN_POINT('NONE', (6.129019999999999, -1.7741899999999997, 1.2903199999999997));
+#387 = DIRECTION('NONE', (1, -0, 0));
 #388 = AXIS2_PLACEMENT_3D('NONE', #386, #387, $);
 #389 = PLANE('NONE', #388);
-#390 = CARTESIAN_POINT('NONE', (0.19823384137660915, -0.0635, 0.0508));
+#390 = CARTESIAN_POINT('NONE', (5.035139570965871, -1.6128999999999998, 1.2903199999999997));
 #391 = DIRECTION('NONE', (0, 1, -0));
 #392 = AXIS2_PLACEMENT_3D('NONE', #390, #391, $);
 #393 = PLANE('NONE', #392);
-#394 = CARTESIAN_POINT('NONE', (0.10982398353915601, -0.03174999999999997, 0.0508));
-#395 = DIRECTION('NONE', (0.573576436351046, 0.8191520442889918, -0));
+#394 = CARTESIAN_POINT('NONE', (2.7895291818945633, -0.8064499999999998, 1.2903199999999995));
+#395 = DIRECTION('NONE', (0.5735764363510459, 0.8191520442889918, -0));
 #396 = AXIS2_PLACEMENT_3D('NONE', #394, #395, $);
 #397 = PLANE('NONE', #396);
-#398 = CARTESIAN_POINT('NONE', (0.105333141160801, 0.019049999999999987, 0.0508));
-#399 = DIRECTION('NONE', (0.4226182617406993, -0.90630778703665, -0));
+#398 = CARTESIAN_POINT('NONE', (2.6754617854843468, 0.4838700000000003, 1.2903199999999997));
+#399 = DIRECTION('NONE', (0.4226182617406992, -0.90630778703665, 0));
 #400 = AXIS2_PLACEMENT_3D('NONE', #398, #399, $);
 #401 = PLANE('NONE', #400);
-#402 = CARTESIAN_POINT('NONE', (0.19374299899825406, 0.0381, 0.0508));
-#403 = DIRECTION('NONE', (0, -1, -0));
+#402 = CARTESIAN_POINT('NONE', (4.921072174555653, 0.9677399999999998, 1.2903199999999995));
+#403 = DIRECTION('NONE', (0, -1, 0));
 #404 = AXIS2_PLACEMENT_3D('NONE', #402, #403, $);
 #405 = PLANE('NONE', #404);
-#406 = CARTESIAN_POINT('NONE', (0.2413, 0.044449999999999996, 0.0508));
-#407 = DIRECTION('NONE', (1, 0, -0));
+#406 = CARTESIAN_POINT('NONE', (6.129019999999998, 1.1290299999999989, 1.2903199999999995));
+#407 = DIRECTION('NONE', (1, -0, 0));
 #408 = AXIS2_PLACEMENT_3D('NONE', #406, #407, $);
 #409 = PLANE('NONE', #408);
-#410 = CARTESIAN_POINT('NONE', (0.19233523789047138, 0.0508, 0.0508));
+#410 = CARTESIAN_POINT('NONE', (4.8853150424179725, 1.2903199999999997, 1.2903199999999997));
 #411 = DIRECTION('NONE', (0, 1, -0));
 #412 = AXIS2_PLACEMENT_3D('NONE', #410, #411, $);
 #413 = PLANE('NONE', #412);
-#414 = CARTESIAN_POINT('NONE', (0.11613523789047137, 0.0381, 0.05079999999999999));
-#415 = DIRECTION('NONE', (-0.42261826174069966, 0.90630778703665, -0));
+#414 = CARTESIAN_POINT('NONE', (2.9498350424179733, 0.9677399999999998, 1.2903199999999997));
+#415 = DIRECTION('NONE', (-0.42261826174069933, 0.9063077870366499, -0));
 #416 = AXIS2_PLACEMENT_3D('NONE', #414, #415, $);
 #417 = PLANE('NONE', #416);
-#418 = CARTESIAN_POINT('NONE', (0.044449999999999996, 0.0254, 0.0508));
+#418 = CARTESIAN_POINT('NONE', (1.1290299999999998, 0.6451599999999998, 1.29032));
 #419 = DIRECTION('NONE', (0, 1, -0));
 #420 = AXIS2_PLACEMENT_3D('NONE', #418, #419, $);
 #421 = PLANE('NONE', #420);
-#422 = CARTESIAN_POINT('NONE', (0, 0.0127, 0.0508));
-#423 = DIRECTION('NONE', (-1, 0, -0));
+#422 = CARTESIAN_POINT('NONE', (0, 0.32257999999999987, 1.2903199999999995));
+#423 = DIRECTION('NONE', (-1, -0, 0));
 #424 = AXIS2_PLACEMENT_3D('NONE', #422, #423, $);
 #425 = PLANE('NONE', #424);
 #426 = CARTESIAN_POINT('NONE', (0, 0, -0));
 #427 = DIRECTION('NONE', (0, 0, 1));
 #428 = AXIS2_PLACEMENT_3D('NONE', #426, #427, $);
 #429 = PLANE('NONE', #428);
-#430 = CARTESIAN_POINT('NONE', (0, 0, 0.1016));
+#430 = CARTESIAN_POINT('NONE', (0, 0, 2.58064));
 #431 = DIRECTION('NONE', (0, 0, 1));
 #432 = AXIS2_PLACEMENT_3D('NONE', #430, #431, $);
 #433 = PLANE('NONE', #432);
@@ -475,7 +475,7 @@ DATA;
 #459 = ADVANCED_FACE('NONE', (#458), #421, .T.);
 #460 = FACE_OUTER_BOUND('NONE', #339, .T.);
 #461 = ADVANCED_FACE('NONE', (#460), #425, .T.);
-#462 = FACE_OUTER_BOUND('NONE', #354, .T.);
+#462 = FACE_OUTER_BOUND('NONE', #354, .F.);
 #463 = ADVANCED_FACE('NONE', (#462), #429, .F.);
 #464 = FACE_OUTER_BOUND('NONE', #369, .T.);
 #465 = ADVANCED_FACE('NONE', (#464), #433, .T.);

e2e/playwright/export-snapshots/stl-ascii.stl

@@ -1,478 +1,478 @@
 solid unnamed
 facet normal -1 0 0
     outer loop
-        vertex 0 -4 0
+        vertex 0 -101.600006 0
         vertex 0 -0 0
-        vertex 0 -4 -1
+        vertex 0 -101.600006 -25.400002
     endloop
 endfacet
 facet normal -1 0 0
     outer loop
-        vertex 0 -4 -1
+        vertex 0 -101.600006 -25.400002
         vertex 0 -0 0
-        vertex 0 -0 -1
+        vertex 0 -0 -25.400002
     endloop
 endfacet
 facet normal 0 0 -1
     outer loop
-        vertex 0 -4 -1
-        vertex 0 -0 -1
-        vertex 3.0950184 -4 -1
+        vertex 0 -101.600006 -25.400002
+        vertex 0 -0 -25.400002
+        vertex 78.613464 -101.600006 -25.400002
     endloop
 endfacet
 facet normal 0 0 -1
     outer loop
-        vertex 3.0950184 -4 -1
-        vertex 0 -0 -1
-        vertex 3.0950184 -0 -1
+        vertex 78.613464 -101.600006 -25.400002
+        vertex 0 -0 -25.400002
+        vertex 78.613464 -0 -25.400002
     endloop
 endfacet
-facet normal -0.57357645 0 -0.81915206
+facet normal -0.5735764 0 -0.8191522
     outer loop
-        vertex 3.0950184 -4 -1
-        vertex 3.0950184 -0 -1
-        vertex 5.9513144 -4 -3
+        vertex 78.613464 -101.600006 -25.400002
+        vertex 78.613464 -0 -25.400002
+        vertex 151.16339 -101.600006 -76.2
     endloop
 endfacet
-facet normal -0.57357645 0 -0.81915206
+facet normal -0.5735764 0 -0.8191522
     outer loop
-        vertex 5.9513144 -4 -3
-        vertex 3.0950184 -0 -1
-        vertex 5.9513144 -0 -3
+        vertex 151.16339 -101.600006 -76.2
+        vertex 78.613464 -0 -25.400002
+        vertex 151.16339 -0 -76.2
     endloop
 endfacet
 facet normal 0 0 -1
     outer loop
-        vertex 5.9513144 -4 -3
-        vertex 5.9513144 -0 -3
-        vertex 9.5 -4 -3
+        vertex 151.16339 -101.600006 -76.2
+        vertex 151.16339 -0 -76.2
+        vertex 241.3 -101.600006 -76.2
     endloop
 endfacet
 facet normal 0 0 -1
     outer loop
-        vertex 9.5 -4 -3
-        vertex 5.9513144 -0 -3
-        vertex 9.5 -0 -3
+        vertex 241.3 -101.600006 -76.2
+        vertex 151.16339 -0 -76.2
+        vertex 241.3 -0 -76.2
     endloop
 endfacet
 facet normal 1 0 0
     outer loop
-        vertex 9.5 -4 -3
-        vertex 9.5 -0 -3
-        vertex 9.5 -4 -2.5
+        vertex 241.3 -101.600006 -76.2
+        vertex 241.3 -0 -76.2
+        vertex 241.3 -101.600006 -63.5
     endloop
 endfacet
 facet normal 1 -0 0
     outer loop
-        vertex 9.5 -4 -2.5
-        vertex 9.5 -0 -3
-        vertex 9.5 -0 -2.5
+        vertex 241.3 -101.600006 -63.5
+        vertex 241.3 -0 -76.2
+        vertex 241.3 -0 -63.5
+    endloop
+endfacet
+facet normal 0 -0 1
+    outer loop
+        vertex 241.3 -101.600006 -63.5
+        vertex 241.3 -0 -63.5
+        vertex 155.16768 -101.600006 -63.5
+    endloop
+endfacet
+facet normal 0 0 1
+    outer loop
+        vertex 155.16768 -101.600006 -63.5
+        vertex 241.3 -0 -63.5
+        vertex 155.16768 -0 -63.5
+    endloop
+endfacet
+facet normal 0.5735765 0 0.81915194
+    outer loop
+        vertex 87.15214 -101.600006 -15.875
+        vertex 109.82398 -101.600006 -31.75
+        vertex 109.82398 -0 -31.75
+    endloop
+endfacet
+facet normal 0.57357645 0 0.819152
+    outer loop
+        vertex 109.82398 -101.600006 -31.75
+        vertex 155.16768 -101.600006 -63.5
+        vertex 155.16768 -0 -63.5
+    endloop
+endfacet
+facet normal 0.57357645 0 0.81915206
+    outer loop
+        vertex 87.15214 -0 -15.875
+        vertex 64.480286 -101.600006 0
+        vertex 87.15214 -101.600006 -15.875
+    endloop
+endfacet
+facet normal 0.5735765 0 0.81915194
+    outer loop
+        vertex 109.82398 -0 -31.75
+        vertex 87.15214 -0 -15.875
+        vertex 87.15214 -101.600006 -15.875
+    endloop
+endfacet
+facet normal 0.57357645 -0 0.819152
+    outer loop
+        vertex 109.82398 -101.600006 -31.75
+        vertex 155.16768 -0 -63.5
+        vertex 109.82398 -0 -31.75
+    endloop
+endfacet
+facet normal 0.57357645 -0 0.81915206
+    outer loop
+        vertex 64.480286 -101.600006 0
+        vertex 87.15214 -0 -15.875
+        vertex 64.480286 -0 0
+    endloop
+endfacet
+facet normal 0.4226182 0 -0.9063078
+    outer loop
+        vertex 84.906715 -101.600006 9.525
+        vertex 64.480286 -101.600006 0
+        vertex 64.480286 -0 0
+    endloop
+endfacet
+facet normal 0.42261833 0 -0.90630776
+    outer loop
+        vertex 105.33314 -101.600006 19.05
+        vertex 84.906715 -101.600006 9.525
+        vertex 84.906715 -0 9.525
+    endloop
+endfacet
+facet normal 0.4226182 0 -0.9063078
+    outer loop
+        vertex 84.906715 -0 9.525
+        vertex 84.906715 -101.600006 9.525
+        vertex 64.480286 -0 0
+    endloop
+endfacet
+facet normal 0.4226183 0 -0.9063078
+    outer loop
+        vertex 105.33314 -0 19.05
+        vertex 146.18599 -101.600006 38.1
+        vertex 105.33314 -101.600006 19.05
+    endloop
+endfacet
+facet normal 0.42261833 0 -0.90630776
+    outer loop
+        vertex 105.33314 -101.600006 19.05
+        vertex 84.906715 -0 9.525
+        vertex 105.33314 -0 19.05
+    endloop
+endfacet
+facet normal 0.4226183 0 -0.9063078
+    outer loop
+        vertex 146.18599 -101.600006 38.1
+        vertex 105.33314 -0 19.05
+        vertex 146.18599 -0 38.1
+    endloop
+endfacet
+facet normal 0 0 -1
+    outer loop
+        vertex 146.18599 -101.600006 38.1
+        vertex 146.18599 -0 38.1
+        vertex 241.3 -101.600006 38.1
+    endloop
+endfacet
+facet normal 0 0 -1
+    outer loop
+        vertex 241.3 -101.600006 38.1
+        vertex 146.18599 -0 38.1
+        vertex 241.3 -0 38.1
+    endloop
+endfacet
+facet normal 1 0 0
+    outer loop
+        vertex 241.3 -101.600006 38.1
+        vertex 241.3 -0 38.1
+        vertex 241.3 -101.600006 50.800003
+    endloop
+endfacet
+facet normal 1 -0 0
+    outer loop
+        vertex 241.3 -101.600006 50.800003
+        vertex 241.3 -0 38.1
+        vertex 241.3 -0 50.800003
     endloop
 endfacet
 facet normal 0 -0 0.99999994
     outer loop
-        vertex 9.5 -4 -2.5
-        vertex 9.5 -0 -2.5
-        vertex 6.108964 -4 -2.5
+        vertex 241.3 -101.600006 50.800003
+        vertex 241.3 -0 50.800003
+        vertex 143.37048 -101.600006 50.800003
     endloop
 endfacet
 facet normal 0 0 0.99999994
     outer loop
-        vertex 6.108964 -4 -2.5
-        vertex 9.5 -0 -2.5
-        vertex 6.108964 -0 -2.5
+        vertex 143.37048 -101.600006 50.800003
+        vertex 241.3 -0 50.800003
+        vertex 143.37048 -0 50.800003
     endloop
 endfacet
-facet normal 0.5735763 0 0.8191522
+facet normal -0.42261827 0 0.9063078
     outer loop
-        vertex 3.4311862 -4 -0.625
-        vertex 4.323779 -4 -1.25
-        vertex 4.323779 -0 -1.25
+        vertex 143.37048 -101.600006 50.800003
+        vertex 143.37048 -0 50.800003
+        vertex 88.9 -101.600006 25.400002
     endloop
 endfacet
-facet normal 0.57357645 0 0.819152
+facet normal -0.42261827 0 0.9063078
     outer loop
-        vertex 4.323779 -4 -1.25
-        vertex 6.108964 -4 -2.5
-        vertex 6.108964 -0 -2.5
-    endloop
-endfacet
-facet normal 0.57357645 0 0.819152
-    outer loop
-        vertex 3.4311862 -0 -0.625
-        vertex 2.5385938 -0 0
-        vertex 2.5385938 -4 0
-    endloop
-endfacet
-facet normal 0.57357645 -0 0.819152
-    outer loop
-        vertex 3.4311862 -4 -0.625
-        vertex 3.4311862 -0 -0.625
-        vertex 2.5385938 -4 0
-    endloop
-endfacet
-facet normal 0.57357645 -0 0.819152
-    outer loop
-        vertex 4.323779 -4 -1.25
-        vertex 6.108964 -0 -2.5
-        vertex 4.323779 -0 -1.25
-    endloop
-endfacet
-facet normal 0.5735763 0 0.8191522
-    outer loop
-        vertex 3.4311862 -0 -0.625
-        vertex 3.4311862 -4 -0.625
-        vertex 4.323779 -0 -1.25
-    endloop
-endfacet
-facet normal 0.42261824 0 -0.9063078
-    outer loop
-        vertex 3.342784 -4 0.375
-        vertex 2.5385938 -4 0
-        vertex 2.5385938 -0 0
-    endloop
-endfacet
-facet normal 0.42261824 0 -0.9063078
-    outer loop
-        vertex 4.146974 -4 0.75
-        vertex 3.342784 -4 0.375
-        vertex 3.342784 -0 0.375
-    endloop
-endfacet
-facet normal 0.42261824 0 -0.9063078
-    outer loop
-        vertex 3.342784 -0 0.375
-        vertex 4.146974 -0 0.75
-        vertex 4.146974 -4 0.75
-    endloop
-endfacet
-facet normal 0.42261833 0 -0.90630776
-    outer loop
-        vertex 4.146974 -0 0.75
-        vertex 5.755354 -0 1.5
-        vertex 5.755354 -4 1.5
-    endloop
-endfacet
-facet normal 0.42261824 0 -0.9063078
-    outer loop
-        vertex 3.342784 -4 0.375
-        vertex 2.5385938 -0 0
-        vertex 3.342784 -0 0.375
-    endloop
-endfacet
-facet normal 0.42261833 0 -0.90630776
-    outer loop
-        vertex 5.755354 -4 1.5
-        vertex 4.146974 -4 0.75
-        vertex 4.146974 -0 0.75
-    endloop
-endfacet
-facet normal 0 0 -1
-    outer loop
-        vertex 5.755354 -4 1.5
-        vertex 5.755354 -0 1.5
-        vertex 9.5 -4 1.5
-    endloop
-endfacet
-facet normal 0 0 -1
-    outer loop
-        vertex 9.5 -4 1.5
-        vertex 5.755354 -0 1.5
-        vertex 9.5 -0 1.5
-    endloop
-endfacet
-facet normal 1 0 0
-    outer loop
-        vertex 9.5 -4 1.5
-        vertex 9.5 -0 1.5
-        vertex 9.5 -4 2
-    endloop
-endfacet
-facet normal 1 -0 0
-    outer loop
-        vertex 9.5 -4 2
-        vertex 9.5 -0 1.5
-        vertex 9.5 -0 2
+        vertex 88.9 -101.600006 25.400002
+        vertex 143.37048 -0 50.800003
+        vertex 88.9 -0 25.400002
     endloop
 endfacet
 facet normal 0 -0 1
     outer loop
-        vertex 9.5 -4 2
-        vertex 9.5 -0 2
-        vertex 5.644507 -4 2
+        vertex 88.9 -101.600006 25.400002
+        vertex 88.9 -0 25.400002
+        vertex 0 -101.600006 25.400002
     endloop
 endfacet
 facet normal 0 0 1
     outer loop
-        vertex 5.644507 -4 2
-        vertex 9.5 -0 2
-        vertex 5.644507 -0 2
-    endloop
-endfacet
-facet normal -0.42261824 0 0.90630776
-    outer loop
-        vertex 5.644507 -4 2
-        vertex 5.644507 -0 2
-        vertex 3.5 -4 1
-    endloop
-endfacet
-facet normal -0.42261824 0 0.90630776
-    outer loop
-        vertex 3.5 -4 1
-        vertex 5.644507 -0 2
-        vertex 3.5 -0 1
-    endloop
-endfacet
-facet normal 0 -0 1
-    outer loop
-        vertex 3.5 -4 1
-        vertex 3.5 -0 1
-        vertex 0 -4 1
-    endloop
-endfacet
-facet normal 0 0 1
-    outer loop
-        vertex 0 -4 1
-        vertex 3.5 -0 1
-        vertex 0 -0 1
+        vertex 0 -101.600006 25.400002
+        vertex 88.9 -0 25.400002
+        vertex 0 -0 25.400002
     endloop
 endfacet
 facet normal -1 0 0
     outer loop
-        vertex 0 -4 1
-        vertex 0 -0 1
-        vertex 0 -4 0
+        vertex 0 -101.600006 25.400002
+        vertex 0 -0 25.400002
+        vertex 0 -101.600006 0
     endloop
 endfacet
 facet normal -1 0 0
     outer loop
-        vertex 0 -4 0
-        vertex 0 -0 1
+        vertex 0 -101.600006 0
+        vertex 0 -0 25.400002
         vertex 0 -0 0
     endloop
 endfacet
 facet normal 0 1 -0
     outer loop
-        vertex 3.342784 -0 0.375
-        vertex 2.5385938 -0 0
-        vertex 3.5 -0 1
+        vertex 84.906715 -0 9.525
+        vertex 64.480286 -0 0
+        vertex 88.9 -0 25.400002
     endloop
 endfacet
 facet normal 0 1 0
     outer loop
-        vertex 3.4311862 -0 -0.625
-        vertex 4.323779 -0 -1.25
-        vertex 3.0950184 -0 -1
+        vertex 105.33314 -0 19.05
+        vertex 84.906715 -0 9.525
+        vertex 88.9 -0 25.400002
     endloop
 endfacet
 facet normal 0 1 0
     outer loop
-        vertex 3.342784 -0 0.375
-        vertex 3.5 -0 1
-        vertex 4.146974 -0 0.75
+        vertex 87.15214 -0 -15.875
+        vertex 109.82398 -0 -31.75
+        vertex 78.613464 -0 -25.400002
+    endloop
+endfacet
+facet normal 0 1 0
+    outer loop
+        vertex 105.33314 -0 19.05
+        vertex 143.37048 -0 50.800003
+        vertex 146.18599 -0 38.1
+    endloop
+endfacet
+facet normal -0 1 0
+    outer loop
+        vertex 0 -0 25.400002
+        vertex 88.9 -0 25.400002
+        vertex 64.480286 -0 0
+    endloop
+endfacet
+facet normal 0 1 0
+    outer loop
+        vertex 0 -0 25.400002
+        vertex 64.480286 -0 0
+        vertex 0 -0 0
+    endloop
+endfacet
+facet normal -0 1 0
+    outer loop
+        vertex 143.37048 -0 50.800003
+        vertex 241.3 -0 50.800003
+        vertex 146.18599 -0 38.1
+    endloop
+endfacet
+facet normal 0 1 0
+    outer loop
+        vertex 241.3 -0 50.800003
+        vertex 241.3 -0 38.1
+        vertex 146.18599 -0 38.1
+    endloop
+endfacet
+facet normal 0 1 -0
+    outer loop
+        vertex 105.33314 -0 19.05
+        vertex 88.9 -0 25.400002
+        vertex 143.37048 -0 50.800003
     endloop
 endfacet
 facet normal 0 0.99999994 0
     outer loop
-        vertex 4.323779 -0 -1.25
-        vertex 5.9513144 -0 -3
-        vertex 3.0950184 -0 -1
+        vertex 64.480286 -0 0
+        vertex 87.15214 -0 -15.875
+        vertex 78.613464 -0 -25.400002
     endloop
 endfacet
 facet normal 0 1 0
     outer loop
-        vertex 0 -0 -1
-        vertex 2.5385938 -0 0
-        vertex 3.0950184 -0 -1
+        vertex 109.82398 -0 -31.75
+        vertex 151.16339 -0 -76.2
+        vertex 78.613464 -0 -25.400002
     endloop
 endfacet
 facet normal 0 1 0
     outer loop
-        vertex 0 -0 -1
+        vertex 155.16768 -0 -63.5
+        vertex 151.16339 -0 -76.2
+        vertex 109.82398 -0 -31.75
+    endloop
+endfacet
+facet normal 0 1 0
+    outer loop
+        vertex 241.3 -0 -63.5
+        vertex 241.3 -0 -76.2
+        vertex 155.16768 -0 -63.5
+    endloop
+endfacet
+facet normal 0 1 0
+    outer loop
+        vertex 155.16768 -0 -63.5
+        vertex 241.3 -0 -76.2
+        vertex 151.16339 -0 -76.2
+    endloop
+endfacet
+facet normal 0 1 0
+    outer loop
+        vertex 64.480286 -0 0
+        vertex 78.613464 -0 -25.400002
+        vertex 0 -0 -25.400002
+    endloop
+endfacet
+facet normal 0 1 0
+    outer loop
+        vertex 0 -0 -25.400002
         vertex 0 -0 0
-        vertex 2.5385938 -0 0
-    endloop
-endfacet
-facet normal 0 0.99999994 -0
-    outer loop
-        vertex 9.5 -0 -3
-        vertex 6.108964 -0 -2.5
-        vertex 9.5 -0 -2.5
-    endloop
-endfacet
-facet normal 0 1 0
-    outer loop
-        vertex 9.5 -0 -3
-        vertex 5.9513144 -0 -3
-        vertex 6.108964 -0 -2.5
-    endloop
-endfacet
-facet normal 0 1 -0
-    outer loop
-        vertex 5.9513144 -0 -3
-        vertex 4.323779 -0 -1.25
-        vertex 6.108964 -0 -2.5
-    endloop
-endfacet
-facet normal 0 1 0
-    outer loop
-        vertex 5.644507 -0 2
-        vertex 5.755354 -0 1.5
-        vertex 4.146974 -0 0.75
-    endloop
-endfacet
-facet normal 0 0.99999994 -0
-    outer loop
-        vertex 3.0950184 -0 -1
-        vertex 2.5385938 -0 0
-        vertex 3.4311862 -0 -0.625
-    endloop
-endfacet
-facet normal 0 1 -0
-    outer loop
-        vertex 4.146974 -0 0.75
-        vertex 3.5 -0 1
-        vertex 5.644507 -0 2
-    endloop
-endfacet
-facet normal 0 1 -0
-    outer loop
-        vertex 9.5 -0 1.5
-        vertex 5.755354 -0 1.5
-        vertex 9.5 -0 2
-    endloop
-endfacet
-facet normal 0 1 -0
-    outer loop
-        vertex 5.755354 -0 1.5
-        vertex 5.644507 -0 2
-        vertex 9.5 -0 2
-    endloop
-endfacet
-facet normal 0 1 0
-    outer loop
-        vertex 2.5385938 -0 0
-        vertex 0 -0 0
-        vertex 0 -0 1
-    endloop
-endfacet
-facet normal 0 1 0
-    outer loop
-        vertex 3.5 -0 1
-        vertex 2.5385938 -0 0
-        vertex 0 -0 1
+        vertex 64.480286 -0 0
     endloop
 endfacet
 facet normal -0 -1 0
     outer loop
-        vertex 3.342784 -4 0.375
-        vertex 3.5 -4 1
-        vertex 2.5385938 -4 0
+        vertex 84.906715 -101.600006 9.525
+        vertex 88.9 -101.600006 25.400002
+        vertex 64.480286 -101.600006 0
     endloop
 endfacet
 facet normal -0 -1 0
     outer loop
-        vertex 4.146974 -4 0.75
-        vertex 3.5 -4 1
-        vertex 3.342784 -4 0.375
+        vertex 105.33314 -101.600006 19.05
+        vertex 88.9 -101.600006 25.400002
+        vertex 84.906715 -101.600006 9.525
     endloop
 endfacet
 facet normal 0 -1 -0
     outer loop
-        vertex 3.4311862 -4 -0.625
-        vertex 3.0950184 -4 -1
-        vertex 4.323779 -4 -1.25
+        vertex 87.15214 -101.600006 -15.875
+        vertex 78.613464 -101.600006 -25.400002
+        vertex 109.82398 -101.600006 -31.75
+    endloop
+endfacet
+facet normal 0 -1 0
+    outer loop
+        vertex 105.33314 -101.600006 19.05
+        vertex 146.18599 -101.600006 38.1
+        vertex 143.37048 -101.600006 50.800003
+    endloop
+endfacet
+facet normal 0 -1 0
+    outer loop
+        vertex 0 -101.600006 25.400002
+        vertex 64.480286 -101.600006 0
+        vertex 88.9 -101.600006 25.400002
+    endloop
+endfacet
+facet normal 0 -1 0
+    outer loop
+        vertex 0 -101.600006 25.400002
+        vertex 0 -101.600006 0
+        vertex 64.480286 -101.600006 0
+    endloop
+endfacet
+facet normal 0 -1 0
+    outer loop
+        vertex 143.37048 -101.600006 50.800003
+        vertex 146.18599 -101.600006 38.1
+        vertex 241.3 -101.600006 50.800003
+    endloop
+endfacet
+facet normal 0 -1 -0
+    outer loop
+        vertex 241.3 -101.600006 50.800003
+        vertex 146.18599 -101.600006 38.1
+        vertex 241.3 -101.600006 38.1
+    endloop
+endfacet
+facet normal 0 -1 0
+    outer loop
+        vertex 105.33314 -101.600006 19.05
+        vertex 143.37048 -101.600006 50.800003
+        vertex 88.9 -101.600006 25.400002
     endloop
 endfacet
 facet normal 0 -0.99999994 0
     outer loop
-        vertex 4.146974 -4 0.75
-        vertex 5.755354 -4 1.5
-        vertex 5.644507 -4 2
+        vertex 64.480286 -101.600006 0
+        vertex 78.613464 -101.600006 -25.400002
+        vertex 87.15214 -101.600006 -15.875
     endloop
 endfacet
-facet normal 0 -1 0
+facet normal -0 -1 -0
     outer loop
-        vertex 0 -4 1
-        vertex 2.5385938 -4 0
-        vertex 3.5 -4 1
-    endloop
-endfacet
-facet normal 0 -1 0
-    outer loop
-        vertex 0 -4 1
-        vertex 0 -4 0
-        vertex 2.5385938 -4 0
-    endloop
-endfacet
-facet normal 0 -1 0
-    outer loop
-        vertex 5.644507 -4 2
-        vertex 5.755354 -4 1.5
-        vertex 9.5 -4 2
-    endloop
-endfacet
-facet normal 0 -1 -0
-    outer loop
-        vertex 9.5 -4 2
-        vertex 5.755354 -4 1.5
-        vertex 9.5 -4 1.5
-    endloop
-endfacet
-facet normal 0 -1 0
-    outer loop
-        vertex 4.146974 -4 0.75
-        vertex 5.644507 -4 2
-        vertex 3.5 -4 1
-    endloop
-endfacet
-facet normal 0 -0.99999994 0
-    outer loop
-        vertex 2.5385938 -4 0
-        vertex 3.0950184 -4 -1
-        vertex 3.4311862 -4 -0.625
-    endloop
-endfacet
-facet normal -0 -0.99999994 -0
-    outer loop
-        vertex 4.323779 -4 -1.25
-        vertex 3.0950184 -4 -1
-        vertex 5.9513144 -4 -3
+        vertex 109.82398 -101.600006 -31.75
+        vertex 78.613464 -101.600006 -25.400002
+        vertex 151.16339 -101.600006 -76.2
     endloop
 endfacet
 facet normal -0 -1 0
     outer loop
-        vertex 6.108964 -4 -2.5
-        vertex 4.323779 -4 -1.25
-        vertex 5.9513144 -4 -3
+        vertex 155.16768 -101.600006 -63.5
+        vertex 109.82398 -101.600006 -31.75
+        vertex 151.16339 -101.600006 -76.2
     endloop
 endfacet
-facet normal -0 -0.99999994 -0
+facet normal -0 -1 -0
     outer loop
-        vertex 9.5 -4 -2.5
-        vertex 6.108964 -4 -2.5
-        vertex 9.5 -4 -3
+        vertex 241.3 -101.600006 -63.5
+        vertex 155.16768 -101.600006 -63.5
+        vertex 241.3 -101.600006 -76.2
     endloop
 endfacet
 facet normal 0 -1 -0
     outer loop
-        vertex 6.108964 -4 -2.5
-        vertex 5.9513144 -4 -3
-        vertex 9.5 -4 -3
+        vertex 155.16768 -101.600006 -63.5
+        vertex 151.16339 -101.600006 -76.2
+        vertex 241.3 -101.600006 -76.2
     endloop
 endfacet
 facet normal 0 -1 -0
     outer loop
-        vertex 2.5385938 -4 0
-        vertex 0 -4 -1
-        vertex 3.0950184 -4 -1
+        vertex 64.480286 -101.600006 0
+        vertex 0 -101.600006 -25.400002
+        vertex 78.613464 -101.600006 -25.400002
     endloop
 endfacet
 facet normal 0 -1 0
     outer loop
-        vertex 0 -4 -1
-        vertex 2.5385938 -4 0
-        vertex 0 -4 0
+        vertex 0 -101.600006 -25.400002
+        vertex 64.480286 -101.600006 0
+        vertex 0 -101.600006 0
     endloop
 endfacet
 endsolid unnamed

e2e/playwright/flow-tests.spec.ts

@@ -1,7 +1,5 @@
 import { test, expect } from '@playwright/test'
 import { secrets } from './secrets'
-import { EngineCommand } from '../../src/lang/std/engineConnection'
-import { v4 as uuidv4 } from 'uuid'
 import { getUtils } from './test-utils'
 import waitOn from 'wait-on'
 import { Themes } from '../../src/lib/theme'
@@ -16,6 +14,12 @@ document.addEventListener('mousemove', (e) =>
 )
 */
 
+const commonPoints = {
+  startAt: '[26.38, -35.59]',
+  num1: 26.63,
+  num2: 53.01,
+}
+
 test.beforeEach(async ({ context, page }) => {
   // wait for Vite preview server to be up
   await waitOn({
@@ -53,71 +57,66 @@ test('Basic sketch', async ({ page }) => {
   await page.goto('/')
   await u.waitForAuthSkipAppStart()
   await u.openDebugPanel()
-  await u.waitForDefaultPlanesVisibilityChange()
 
+  await expect(
+    page.getByRole('button', { name: 'Start Sketch' })
+  ).not.toBeDisabled()
   await expect(page.getByRole('button', { name: 'Start Sketch' })).toBeVisible()
 
   // click on "Start Sketch" button
   await u.clearCommandLogs()
-  await Promise.all([
-    u.doAndWaitForImageDiff(
-      () => page.getByRole('button', { name: 'Start Sketch' }).click(),
-      200
-    ),
-    u.waitForDefaultPlanesVisibilityChange(),
-  ])
+  await u.doAndWaitForImageDiff(
+    () => page.getByRole('button', { name: 'Start Sketch' }).click(),
+    200
+  )
 
   // select a plane
-  await u.doAndWaitForCmd(() => page.mouse.click(700, 200), 'edit_mode_enter')
-  await u.waitForCmdReceive('set_tool')
+  await page.mouse.click(700, 200)
 
-  await u.doAndWaitForCmd(
-    () => page.getByRole('button', { name: 'Line' }).click(),
-    'set_tool'
+  await expect(page.locator('.cm-content')).toHaveText(
+    `const part001 = startSketchOn('-XZ')`
   )
 
+  await page.waitForTimeout(300) // TODO detect animation ending, or disable animation
+
   const startXPx = 600
-  await u.doAndWaitForCmd(
-    () => page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10),
-    'mouse_click',
-    false
-  )
-
-  await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 10)
-
-  const startAt = '[18.26, -24.63]'
-  const num = '18.43'
+  await page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10)
   await expect(page.locator('.cm-content'))
     .toHaveText(`const part001 = startSketchOn('-XZ')
-  |> startProfileAt(${startAt}, %)
-  |> line([${num}, 0], %)`)
+  |> startProfileAt(${commonPoints.startAt}, %)`)
+  await page.waitForTimeout(100)
+
+  await u.closeDebugPanel()
+  await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 10)
+  await page.waitForTimeout(100)
+
+  const num = 26.63
+  await expect(page.locator('.cm-content'))
+    .toHaveText(`const part001 = startSketchOn('-XZ')
+  |> startProfileAt(${commonPoints.startAt}, %)
+  |> line([${commonPoints.num1}, 0], %)`)
 
   await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 20)
   await expect(page.locator('.cm-content'))
     .toHaveText(`const part001 = startSketchOn('-XZ')
-  |> startProfileAt(${startAt}, %)
-  |> line([${num}, 0], %)
-  |> line([0, ${num}], %)`)
+  |> startProfileAt(${commonPoints.startAt}, %)
+  |> line([${commonPoints.num1}, 0], %)
+  |> line([0, ${commonPoints.num1}], %)`)
   await page.mouse.click(startXPx, 500 - PUR * 20)
   await expect(page.locator('.cm-content'))
     .toHaveText(`const part001 = startSketchOn('-XZ')
-  |> startProfileAt(${startAt}, %)
-  |> line([${num}, 0], %)
-  |> line([0, ${num}], %)
-  |> line([-36.69, 0], %)`)
+  |> startProfileAt(${commonPoints.startAt}, %)
+  |> line([${commonPoints.num1}, 0], %)
+  |> line([0, ${commonPoints.num1}], %)
+  |> line([-${commonPoints.num2}, 0], %)`)
 
   // deselect line tool
-  await u.doAndWaitForCmd(
-    () => page.getByRole('button', { name: 'Line' }).click(),
-    'set_tool'
-  )
+  await page.getByRole('button', { name: 'Line' }).click()
+  await page.waitForTimeout(100)
 
   // click between first two clicks to get center of the line
-  await u.doAndWaitForCmd(
-    () => page.mouse.click(startXPx + PUR * 15, 500 - PUR * 10),
-    'select_with_point'
-  )
-  await u.closeDebugPanel()
+  await page.mouse.click(startXPx + PUR * 15, 500 - PUR * 10)
+  await page.waitForTimeout(100)
 
   // hold down shift
   await page.keyboard.down('Shift')
@@ -131,9 +130,9 @@ test('Basic sketch', async ({ page }) => {
 
   await expect(page.locator('.cm-content'))
     .toHaveText(`const part001 = startSketchOn('-XZ')
-  |> startProfileAt(${startAt}, %)
-  |> line({ to: [${num}, 0], tag: 'seg01' }, %)
-  |> line([0, ${num}], %)
+  |> startProfileAt(${commonPoints.startAt}, %)
+  |> line({ to: [${commonPoints.num1}, 0], tag: 'seg01' }, %)
+  |> line([0, ${commonPoints.num1}], %)
   |> angledLine([180, segLen('seg01', %)], %)`)
 })
 
@@ -206,7 +205,7 @@ test('if you write invalid kcl you get inlined errors', async ({ page }) => {
 
 test('executes on load', async ({ page, context }) => {
   const u = getUtils(page)
-  await context.addInitScript(async (token) => {
+  await context.addInitScript(async () => {
     localStorage.setItem(
       'persistCode',
       `const part001 = startSketchOn('-XZ')
@@ -271,59 +270,41 @@ test('Can create sketches on all planes and their back sides', async ({
   await page.goto('/')
   await u.waitForAuthSkipAppStart()
   await u.openDebugPanel()
-  await u.waitForDefaultPlanesVisibilityChange()
 
-  const camCmd: EngineCommand = {
-    type: 'modeling_cmd_req',
-    cmd_id: uuidv4(),
-    cmd: {
-      type: 'default_camera_look_at',
-      center: { x: 15, y: 0, z: 0 },
-      up: { x: 0, y: 0, z: 1 },
-      vantage: { x: 30, y: 30, z: 30 },
-    },
-  }
+  const camPos: [number, number, number] = [100, 100, 100]
 
   const TestSinglePlane = async ({
     viewCmd,
     expectedCode,
     clickCoords,
   }: {
-    viewCmd: EngineCommand
+    viewCmd: [number, number, number]
     expectedCode: string
     clickCoords: { x: number; y: number }
   }) => {
     await u.openDebugPanel()
-    await u.sendCustomCmd(viewCmd)
+
+    await u.updateCamPosition(viewCmd)
+
     await u.clearCommandLogs()
-    // await page.waitForTimeout(200)
     await page.getByRole('button', { name: 'Start Sketch' }).click()
-    await u.waitForDefaultPlanesVisibilityChange()
 
     await u.closeDebugPanel()
     await page.mouse.click(clickCoords.x, clickCoords.y)
-    await u.openDebugPanel()
+    await page.waitForTimeout(300) // wait for animation
 
     await expect(page.getByRole('button', { name: 'Line' })).toBeVisible()
 
     // draw a line
     const startXPx = 600
-    await u.clearCommandLogs()
-    await page.getByRole('button', { name: 'Line' }).click()
-    await u.waitForCmdReceive('set_tool')
-    await u.clearCommandLogs()
+
     await u.closeDebugPanel()
     await page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10)
-    await u.openDebugPanel()
-    await u.waitForCmdReceive('mouse_click')
-    await u.closeDebugPanel()
-    await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 10)
-    await u.openDebugPanel()
 
     await expect(page.locator('.cm-content')).toHaveText(expectedCode)
 
     await page.getByRole('button', { name: 'Line' }).click()
-    await u.clearCommandLogs()
+    await u.openAndClearDebugPanel()
     await page.getByRole('button', { name: 'Exit Sketch' }).click()
     await u.expectCmdLog('[data-message-type="execution-done"]')
 
@@ -332,52 +313,40 @@ test('Can create sketches on all planes and their back sides', async ({
   }
 
   const codeTemplate = (
-    plane = 'XY',
-    sign = ''
+    plane = 'XY'
   ) => `const part001 = startSketchOn('${plane}')
-  |> startProfileAt([${sign}6.88, -9.29], %)
-  |> line([${sign}6.95, 0], %)`
+  |> startProfileAt([32.13, -43.34], %)`
   await TestSinglePlane({
-    viewCmd: camCmd,
+    viewCmd: camPos,
     expectedCode: codeTemplate('XY'),
-    clickCoords: { x: 700, y: 350 }, // red plane
+    clickCoords: { x: 600, y: 388 }, // red plane
+    // clickCoords: { x: 600, y: 400 }, // red plane // clicks grid helper and that causes problems, should fix so that these coords work too.
   })
   await TestSinglePlane({
-    viewCmd: camCmd,
+    viewCmd: camPos,
     expectedCode: codeTemplate('YZ'),
-    clickCoords: { x: 1000, y: 200 }, // green plane
+    clickCoords: { x: 700, y: 300 }, // green plane
   })
   await TestSinglePlane({
-    viewCmd: camCmd,
-    expectedCode: codeTemplate('XZ', '-'),
-    clickCoords: { x: 630, y: 130 }, // blue plane
+    viewCmd: camPos,
+    expectedCode: codeTemplate('XZ'),
+    clickCoords: { x: 700, y: 80 }, // blue plane
   })
-
-  // new camera angle to click the back side of all three planes
-  const camCmdBackSide: EngineCommand = {
-    type: 'modeling_cmd_req',
-    cmd_id: uuidv4(),
-    cmd: {
-      type: 'default_camera_look_at',
-      center: { x: -15, y: 0, z: 0 },
-      up: { x: 0, y: 0, z: 1 },
-      vantage: { x: -30, y: -30, z: -30 },
-    },
-  }
+  const camCmdBackSide: [number, number, number] = [-100, -100, -100]
   await TestSinglePlane({
     viewCmd: camCmdBackSide,
-    expectedCode: codeTemplate('-XY', '-'),
-    clickCoords: { x: 705, y: 136 }, // back of red plane
+    expectedCode: codeTemplate('-XY'),
+    clickCoords: { x: 601, y: 118 }, // back of red plane
   })
   await TestSinglePlane({
     viewCmd: camCmdBackSide,
-    expectedCode: codeTemplate('-YZ', '-'),
-    clickCoords: { x: 1000, y: 350 }, // back of green plane
+    expectedCode: codeTemplate('-YZ'),
+    clickCoords: { x: 730, y: 219 }, // back of green plane
   })
   await TestSinglePlane({
     viewCmd: camCmdBackSide,
     expectedCode: codeTemplate('-XZ'),
-    clickCoords: { x: 600, y: 400 }, // back of blue plane
+    clickCoords: { x: 680, y: 427 }, // back of blue plane
   })
 })
 
@@ -387,7 +356,6 @@ test('Auto complete works', async ({ page }) => {
   await page.setViewportSize({ width: 1200, height: 500 })
   await page.goto('/')
   await u.waitForAuthSkipAppStart()
-  await u.waitForDefaultPlanesVisibilityChange()
 
   // this test might be brittle as we add and remove functions
   // but should also be easy to update.
@@ -405,6 +373,7 @@ test('Auto complete works', async ({ page }) => {
   await page.keyboard.type('  |> startProfi')
   // expect there be a single auto complete option that we can just hit enter on
   await expect(page.locator('.cm-completionLabel')).toBeVisible()
+  await page.waitForTimeout(100)
   await page.keyboard.press('Enter') // accepting the auto complete, not a new line
 
   await page.keyboard.type('([0,0], %)')
@@ -412,6 +381,7 @@ test('Auto complete works', async ({ page }) => {
   await page.keyboard.type('  |> lin')
 
   await expect(page.locator('.cm-tooltip-autocomplete')).toBeVisible()
+  await page.waitForTimeout(100)
   // press arrow down twice then enter to accept xLine
   await page.keyboard.press('ArrowDown')
   await page.keyboard.press('ArrowDown')
@@ -478,62 +448,57 @@ test('Selections work on fresh and edited sketch', async ({ page }) => {
   await page.goto('/')
   await u.waitForAuthSkipAppStart()
   await u.openDebugPanel()
-  await u.waitForDefaultPlanesVisibilityChange()
 
-  const xAxisClick = () => page.mouse.click(700, 250)
-  const emptySpaceClick = () => page.mouse.click(700, 300)
-  const topHorzSegmentClick = () => page.mouse.click(700, 285)
-  const bottomHorzSegmentClick = () => page.mouse.click(750, 393)
+  const xAxisClick = () =>
+    page.mouse.click(700, 250).then(() => page.waitForTimeout(100))
+  const emptySpaceClick = () =>
+    page.mouse.click(728, 343).then(() => page.waitForTimeout(100))
+  const topHorzSegmentClick = () =>
+    page.mouse.click(709, 289).then(() => page.waitForTimeout(100))
+  const bottomHorzSegmentClick = () =>
+    page.mouse.click(767, 396).then(() => page.waitForTimeout(100))
 
   await u.clearCommandLogs()
+  await expect(
+    page.getByRole('button', { name: 'Start Sketch' })
+  ).not.toBeDisabled()
   await page.getByRole('button', { name: 'Start Sketch' }).click()
-  await u.waitForDefaultPlanesVisibilityChange()
 
   // select a plane
-  await u.doAndWaitForCmd(() => page.mouse.click(700, 200), 'edit_mode_enter')
-  await u.waitForCmdReceive('set_tool')
-
-  await u.doAndWaitForCmd(
-    () => page.getByRole('button', { name: 'Line' }).click(),
-    'set_tool'
-  )
+  await page.mouse.click(700, 200)
+  await page.waitForTimeout(700) // wait for animation
 
   const startXPx = 600
-  await u.doAndWaitForCmd(
-    () => page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10),
-    'mouse_click',
-    false
-  )
+  await page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10)
+  await expect(page.locator('.cm-content'))
+    .toHaveText(`const part001 = startSketchOn('-XZ')
+  |> startProfileAt(${commonPoints.startAt}, %)`)
+
+  await u.closeDebugPanel()
 
   await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 10)
 
-  const startAt = '[18.26, -24.63]'
-  const num = '18.43'
-  const num2 = '36.69'
   await expect(page.locator('.cm-content'))
     .toHaveText(`const part001 = startSketchOn('-XZ')
-  |> startProfileAt(${startAt}, %)
-  |> line([${num}, 0], %)`)
+  |> startProfileAt(${commonPoints.startAt}, %)
+  |> line([${commonPoints.num1}, 0], %)`)
 
   await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 20)
   await expect(page.locator('.cm-content'))
     .toHaveText(`const part001 = startSketchOn('-XZ')
-  |> startProfileAt(${startAt}, %)
-  |> line([${num}, 0], %)
-  |> line([0, ${num}], %)`)
+  |> startProfileAt(${commonPoints.startAt}, %)
+  |> line([${commonPoints.num1}, 0], %)
+  |> line([0, ${commonPoints.num1}], %)`)
   await page.mouse.click(startXPx, 500 - PUR * 20)
   await expect(page.locator('.cm-content'))
     .toHaveText(`const part001 = startSketchOn('-XZ')
-  |> startProfileAt(${startAt}, %)
-  |> line([${num}, 0], %)
-  |> line([0, ${num}], %)
-  |> line([-${num2}, 0], %)`)
+  |> startProfileAt(${commonPoints.startAt}, %)
+  |> line([${commonPoints.num1}, 0], %)
+  |> line([0, ${commonPoints.num1}], %)
+  |> line([-${commonPoints.num2}, 0], %)`)
 
   // deselect line tool
-  await u.doAndWaitForCmd(
-    () => page.getByRole('button', { name: 'Line' }).click(),
-    'set_tool'
-  )
+  await page.getByRole('button', { name: 'Line' }).click()
 
   await u.closeDebugPanel()
   const selectionSequence = async () => {
@@ -555,79 +520,73 @@ test('Selections work on fresh and edited sketch', async ({ page }) => {
     // now check clicking works including axis
 
     // click a segment hold shift and click an axis, see that a relevant constraint is enabled
-    await u.doAndWaitForCmd(topHorzSegmentClick, 'select_with_point', false)
+    await topHorzSegmentClick()
     await page.keyboard.down('Shift')
     const absYButton = page.getByRole('button', { name: 'ABS Y' })
     await expect(absYButton).toBeDisabled()
-    await u.doAndWaitForCmd(xAxisClick, 'select_with_point', false)
+    await xAxisClick()
     await page.keyboard.up('Shift')
     await absYButton.and(page.locator(':not([disabled])')).waitFor()
     await expect(absYButton).not.toBeDisabled()
 
     // clear selection by clicking on nothing
-    await u.doAndWaitForCmd(emptySpaceClick, 'select_clear', false)
+    await emptySpaceClick()
 
     // same selection but click the axis first
-    await u.doAndWaitForCmd(xAxisClick, 'select_with_point', false)
+    await xAxisClick()
     await expect(absYButton).toBeDisabled()
     await page.keyboard.down('Shift')
-    await u.doAndWaitForCmd(topHorzSegmentClick, 'select_with_point', false)
+    await topHorzSegmentClick()
+
     await page.keyboard.up('Shift')
     await expect(absYButton).not.toBeDisabled()
 
     // clear selection by clicking on nothing
-    await u.doAndWaitForCmd(emptySpaceClick, 'select_clear', false)
+    await emptySpaceClick()
 
     // check the same selection again by putting cursor in code first then selecting axis
-    await u.doAndWaitForCmd(
-      () => page.getByText(`  |> line([-${num2}, 0], %)`).click(),
-      'select_clear',
-      false
-    )
+    await page.getByText(`  |> line([-${commonPoints.num2}, 0], %)`).click()
     await page.keyboard.down('Shift')
     await expect(absYButton).toBeDisabled()
-    await u.doAndWaitForCmd(xAxisClick, 'select_with_point', false)
+    await xAxisClick()
     await page.keyboard.up('Shift')
     await expect(absYButton).not.toBeDisabled()
 
     // clear selection by clicking on nothing
-    await u.doAndWaitForCmd(emptySpaceClick, 'select_clear', false)
+    await emptySpaceClick()
 
     // select segment in editor than another segment in scene and check there are two cursors
-    await u.doAndWaitForCmd(
-      () => page.getByText(`  |> line([-${num2}, 0], %)`).click(),
-      'select_clear',
-      false
-    )
+    await page.getByText(`  |> line([-${commonPoints.num2}, 0], %)`).click()
+    await page.waitForTimeout(300)
     await page.keyboard.down('Shift')
     await expect(page.locator('.cm-cursor')).toHaveCount(1)
-    await u.doAndWaitForCmd(bottomHorzSegmentClick, 'select_with_point', false) // another segment, bottom one
+    await bottomHorzSegmentClick()
     await page.keyboard.up('Shift')
     await expect(page.locator('.cm-cursor')).toHaveCount(2)
 
     // clear selection by clicking on nothing
-    await u.doAndWaitForCmd(emptySpaceClick, 'select_clear', false)
+    await emptySpaceClick()
   }
 
   await selectionSequence()
 
   // hovering in fresh sketch worked, lets try exiting and re-entering
-  await u.doAndWaitForCmd(
-    () => page.getByRole('button', { name: 'Exit Sketch' }).click(),
-    'edit_mode_exit'
-  )
+  await u.openAndClearDebugPanel()
+  await page.getByRole('button', { name: 'Exit Sketch' }).click()
+  await page.waitForTimeout(200)
   // wait for execution done
+
   await u.expectCmdLog('[data-message-type="execution-done"]')
+  await u.closeDebugPanel()
 
   // select a line
-  await u.doAndWaitForCmd(topHorzSegmentClick, 'select_clear', false)
+  // await topHorzSegmentClick()
+  await page.getByText(commonPoints.startAt).click() // TODO remove this and reinstate // await topHorzSegmentClick()
+  await page.waitForTimeout(100)
 
   // enter sketch again
-  await u.doAndWaitForCmd(
-    () => page.getByRole('button', { name: 'Start Sketch' }).click(),
-    'edit_mode_enter',
-    false
-  )
+  await page.getByRole('button', { name: 'Edit Sketch' }).click()
+  await page.waitForTimeout(300) // wait for animation
 
   // hover again and check it works
   await selectionSequence()
@@ -684,12 +643,15 @@ test('Can extrude from the command bar', async ({ page, context }) => {
   await context.addInitScript(async (token) => {
     localStorage.setItem(
       'persistCode',
-      `const part001 = startSketchOn('-XZ')
-    |> startProfileAt([-6.95, 4.98], %)
-    |> line([25.1, 0.41], %)
-    |> line([0.73, -14.93], %)
-    |> line([-23.44, 0.52], %)
-    |> close(%)`
+      `
+      const distance = sqrt(20)
+      const part001 = startSketchOn('-XZ')
+        |> startProfileAt([-6.95, 4.98], %)
+        |> line([25.1, 0.41], %)
+        |> line([0.73, -14.93], %)
+        |> line([-23.44, 0.52], %)
+        |> close(%)
+      `
     )
   })
 
@@ -697,6 +659,8 @@ test('Can extrude from the command bar', async ({ page, context }) => {
   await page.setViewportSize({ width: 1200, height: 500 })
   await page.goto('/')
   await u.waitForAuthSkipAppStart()
+  await u.openDebugPanel()
+  await u.expectCmdLog('[data-message-type="execution-done"]')
 
   let cmdSearchBar = page.getByPlaceholder('Search commands')
   await page.keyboard.press('Meta+K')
@@ -710,28 +674,379 @@ test('Can extrude from the command bar', async ({ page, context }) => {
   await expect(page.getByRole('button', { name: 'selection' })).toBeDisabled()
 
   // Click to select face and set distance
-  await u.openAndClearDebugPanel()
   await page.getByText('|> startProfileAt([-6.95, 4.98], %)').click()
-  await u.waitForCmdReceive('select_add')
-  await u.closeDebugPanel()
   await page.getByRole('button', { name: 'Continue' }).click()
+
+  // Assert that we're on the distance step
   await expect(page.getByRole('button', { name: 'distance' })).toBeDisabled()
-  await page.keyboard.press('Enter')
+
+  // Assert that the an alternative variable name is chosen,
+  // since the default variable name is already in use (distance)
+  await page.getByRole('button', { name: 'Create new variable' }).click()
+  await expect(page.getByPlaceholder('Variable name')).toHaveValue(
+    'distance001'
+  )
+  await expect(page.getByRole('button', { name: 'Continue' })).toBeEnabled()
+  await page.getByRole('button', { name: 'Continue' }).click()
 
   // Review step and argument hotkeys
-  await page.keyboard.press('2')
-  await expect(page.getByRole('button', { name: '5' })).toBeDisabled()
+  await expect(
+    page.getByRole('button', { name: 'Submit command' })
+  ).toBeEnabled()
+  await page.keyboard.press('Backspace')
+  await expect(
+    page.getByRole('button', { name: 'Distance 12', exact: false })
+  ).toBeDisabled()
   await page.keyboard.press('Enter')
 
   // Check that the code was updated
   await page.keyboard.press('Enter')
+  // Unfortunately this indentation seems to matter for the test
   await expect(page.locator('.cm-content')).toHaveText(
-    `const part001 = startSketchOn('-XZ')
-    |> startProfileAt([-6.95, 4.98], %)
-    |> line([25.1, 0.41], %)
-    |> line([0.73, -14.93], %)
-    |> line([-23.44, 0.52], %)
-    |> close(%)
-    |> extrude(5, %)`
+    `const distance = sqrt(20)
+const distance001 = 5 + 7
+const part001 = startSketchOn('-XZ')
+  |> startProfileAt([-6.95, 4.98], %)
+  |> line([25.1, 0.41], %)
+  |> line([0.73, -14.93], %)
+  |> line([-23.44, 0.52], %)
+  |> close(%)
+  |> extrude(distance001, %)`.replace(/(\r\n|\n|\r)/gm, '') // remove newlines
   )
 })
+
+test('Can add multiple sketches', async ({ page }) => {
+  const u = 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(
+    page.getByRole('button', { name: 'Start Sketch' })
+  ).not.toBeDisabled()
+  await expect(page.getByRole('button', { name: 'Start Sketch' })).toBeVisible()
+
+  // click on "Start Sketch" button
+  await u.clearCommandLogs()
+  await u.doAndWaitForImageDiff(
+    () => page.getByRole('button', { name: 'Start Sketch' }).click(),
+    200
+  )
+
+  // select a plane
+  await page.mouse.click(700, 200)
+
+  await expect(page.locator('.cm-content')).toHaveText(
+    `const part001 = startSketchOn('-XZ')`
+  )
+
+  await page.waitForTimeout(500) // TODO detect animation ending, or disable animation
+
+  const startXPx = 600
+  await page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10)
+  await expect(page.locator('.cm-content'))
+    .toHaveText(`const part001 = startSketchOn('-XZ')
+  |> startProfileAt(${commonPoints.startAt}, %)`)
+  await page.waitForTimeout(100)
+
+  await u.closeDebugPanel()
+  await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 10)
+  await page.waitForTimeout(100)
+
+  await expect(page.locator('.cm-content'))
+    .toHaveText(`const part001 = startSketchOn('-XZ')
+  |> startProfileAt(${commonPoints.startAt}, %)
+  |> line([${commonPoints.num1}, 0], %)`)
+
+  await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 20)
+  await expect(page.locator('.cm-content'))
+    .toHaveText(`const part001 = startSketchOn('-XZ')
+  |> startProfileAt(${commonPoints.startAt}, %)
+  |> line([${commonPoints.num1}, 0], %)
+  |> line([0, ${commonPoints.num1}], %)`)
+  await page.mouse.click(startXPx, 500 - PUR * 20)
+  const finalCodeFirstSketch = `const part001 = startSketchOn('-XZ')
+  |> startProfileAt(${commonPoints.startAt}, %)
+  |> line([${commonPoints.num1}, 0], %)
+  |> line([0, ${commonPoints.num1}], %)
+  |> line([-${commonPoints.num2}, 0], %)`
+  await expect(page.locator('.cm-content')).toHaveText(finalCodeFirstSketch)
+
+  // exit the sketch
+
+  await u.openAndClearDebugPanel()
+  await page.getByRole('button', { name: 'Exit Sketch' }).click()
+
+  await u.expectCmdLog('[data-message-type="execution-done"]')
+
+  await u.updateCamPosition([0, 100, 100])
+
+  // start a new sketch
+  await u.clearCommandLogs()
+  await page.getByRole('button', { name: 'Start Sketch' }).click()
+  await page.waitForTimeout(100)
+  await page.mouse.click(673, 384)
+
+  await page.waitForTimeout(500) // TODO detect animation ending, or disable animation
+  await u.clearAndCloseDebugPanel()
+
+  await page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10)
+  const startAt2 = '[26.23, -35.39]'
+  await expect(
+    (await page.locator('.cm-content').innerText()).replace(/\s/g, '')
+  ).toBe(
+    `${finalCodeFirstSketch}
+const part002 = startSketchOn('XY')
+  |> startProfileAt(${startAt2}, %)`.replace(/\s/g, '')
+  )
+  await page.waitForTimeout(100)
+
+  await u.closeDebugPanel()
+  await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 10)
+  await page.waitForTimeout(100)
+
+  const num2 = 26.48
+  await expect(
+    (await page.locator('.cm-content').innerText()).replace(/\s/g, '')
+  ).toBe(
+    `${finalCodeFirstSketch}
+const part002 = startSketchOn('XY')
+  |> startProfileAt(${startAt2}, %)
+  |> line([${num2}, 0], %)`.replace(/\s/g, '')
+  )
+
+  await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 20)
+  await expect(
+    (await page.locator('.cm-content').innerText()).replace(/\s/g, '')
+  ).toBe(
+    `${finalCodeFirstSketch}
+const part002 = startSketchOn('XY')
+  |> startProfileAt(${startAt2}, %)
+  |> line([${num2}, 0], %)
+  |> line([0, ${num2}], %)`.replace(/\s/g, '')
+  )
+  await page.mouse.click(startXPx, 500 - PUR * 20)
+  await expect(
+    (await page.locator('.cm-content').innerText()).replace(/\s/g, '')
+  ).toBe(
+    `${finalCodeFirstSketch}
+const part002 = startSketchOn('XY')
+  |> startProfileAt(${startAt2}, %)
+  |> line([${num2}, 0], %)
+  |> line([0, ${num2}], %)
+  |> line([-52.71, 0], %)`.replace(/\s/g, '')
+  )
+})
+
+test('ProgramMemory can be serialised', async ({ page, context }) => {
+  const u = getUtils(page)
+  await context.addInitScript(async () => {
+    localStorage.setItem(
+      'persistCode',
+      `const part = startSketchOn('XY')
+  |> startProfileAt([0, 0], %)
+  |> line([0, 1], %)
+  |> line([1, 0], %)
+  |> line([0, -1], %)
+  |> close(%)
+  |> extrude(1, %)
+  |> patternLinear({
+        axis: [1, 0, 1],
+        repetitions: 3,
+        distance: 6
+      }, %)`
+    )
+  })
+  await page.setViewportSize({ width: 1000, height: 500 })
+  await page.goto('/')
+  const messages: string[] = []
+
+  // Listen for all console events and push the message text to an array
+  page.on('console', (message) => messages.push(message.text()))
+  await u.waitForAuthSkipAppStart()
+
+  // wait for execution done
+  await u.openDebugPanel()
+  await u.expectCmdLog('[data-message-type="execution-done"]')
+
+  const forbiddenMessages = ['cannot serialize tagged newtype variant']
+  forbiddenMessages.forEach((forbiddenMessage) => {
+    messages.forEach((message) => {
+      expect(message).not.toContain(forbiddenMessage)
+    })
+  })
+})
+
+test("Various pipe expressions should and shouldn't allow edit and or extrude", async ({
+  page,
+  context,
+}) => {
+  const u = getUtils(page)
+  const selectionsSnippets = {
+    extrudeAndEditBlocked: '|> startProfileAt([10.81, 32.99], %)',
+    extrudeAndEditBlockedInFunction: '|> startProfileAt(pos, %)',
+    extrudeAndEditAllowed: '|> startProfileAt([15.72, 4.7], %)',
+    editOnly: '|> startProfileAt([15.79, -14.6], %)',
+  }
+  await context.addInitScript(
+    async ({
+      extrudeAndEditBlocked,
+      extrudeAndEditBlockedInFunction,
+      extrudeAndEditAllowed,
+      editOnly,
+    }: any) => {
+      localStorage.setItem(
+        'persistCode',
+        `const part001 = startSketchOn('-XZ')
+  ${extrudeAndEditBlocked}
+  |> line([25.96, 2.93], %)
+  |> line([5.25, -5.72], %)
+  |> line([-2.01, -10.35], %)
+  |> line([-27.65, -2.78], %)
+  |> close(%)
+  |> extrude(5, %)
+const part002 = startSketchOn('-XZ')
+  ${extrudeAndEditAllowed}
+  |> line([10.32, 6.47], %)
+  |> line([9.71, -6.16], %)
+  |> line([-3.08, -9.86], %)
+  |> line([-12.02, -1.54], %)
+  |> close(%)
+const part003 = startSketchOn('-XZ')
+  ${editOnly}
+  |> line([27.55, -1.65], %)
+  |> line([4.95, -8], %)
+  |> line([-20.38, -10.12], %)
+  |> line([-15.79, 17.08], %)
+
+fn yohey = (pos) => {
+  const part004 = startSketchOn('-XZ')
+  ${extrudeAndEditBlockedInFunction}
+  |> line([27.55, -1.65], %)
+  |> line([4.95, -10.53], %)
+  |> line([-20.38, -8], %)
+  |> line([-15.79, 17.08], %)
+  return ''
+}
+    
+    yohey([15.79, -34.6])
+`
+      )
+    },
+    selectionsSnippets
+  )
+  await page.setViewportSize({ width: 1200, height: 500 })
+  await page.goto('/')
+  await u.waitForAuthSkipAppStart()
+
+  // wait for execution done
+  await u.openDebugPanel()
+  await u.expectCmdLog('[data-message-type="execution-done"]')
+  await u.closeDebugPanel()
+
+  // wait for start sketch as a proxy for the stream being ready
+  await expect(
+    page.getByRole('button', { name: 'Start Sketch' })
+  ).not.toBeDisabled()
+
+  await page.getByText(selectionsSnippets.extrudeAndEditBlocked).click()
+  await expect(page.getByRole('button', { name: 'Extrude' })).toBeDisabled()
+  await expect(
+    page.getByRole('button', { name: 'Edit Sketch' })
+  ).not.toBeVisible()
+
+  await page.getByText(selectionsSnippets.extrudeAndEditAllowed).click()
+  await expect(page.getByRole('button', { name: 'Extrude' })).not.toBeDisabled()
+  await expect(
+    page.getByRole('button', { name: 'Edit Sketch' })
+  ).not.toBeDisabled()
+
+  await page.getByText(selectionsSnippets.editOnly).click()
+  await expect(page.getByRole('button', { name: 'Extrude' })).toBeDisabled()
+  await expect(
+    page.getByRole('button', { name: 'Edit Sketch' })
+  ).not.toBeDisabled()
+
+  await page
+    .getByText(selectionsSnippets.extrudeAndEditBlockedInFunction)
+    .click()
+  await expect(page.getByRole('button', { name: 'Extrude' })).toBeDisabled()
+  await expect(
+    page.getByRole('button', { name: 'Edit Sketch' })
+  ).not.toBeVisible()
+
+  // selecting an editable sketch but clicking "start sktech" should start a new sketch and not edit the existing one
+  await page.getByText(selectionsSnippets.extrudeAndEditAllowed).click()
+  await page.getByRole('button', { name: 'Start Sketch' }).click()
+  await page.mouse.click(700, 200)
+  // expect main content to contain `part005` i.e. started a new sketch
+  await expect(page.locator('.cm-content')).toHaveText(
+    /part005 = startSketchOn\('-XZ'\)/
+  )
+})
+
+test('Deselecting line tool should mean nothing happens on click', async ({
+  page,
+}) => {
+  const u = 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(
+    page.getByRole('button', { name: 'Start Sketch' })
+  ).not.toBeDisabled()
+  await expect(page.getByRole('button', { name: 'Start Sketch' })).toBeVisible()
+
+  // click on "Start Sketch" button
+  await u.clearCommandLogs()
+  await u.doAndWaitForImageDiff(
+    () => page.getByRole('button', { name: 'Start Sketch' }).click(),
+    200
+  )
+
+  await page.mouse.click(700, 200)
+
+  await expect(page.locator('.cm-content')).toHaveText(
+    `const part001 = startSketchOn('-XZ')`
+  )
+
+  await page.waitForTimeout(300)
+
+  let previousCodeContent = await page.locator('.cm-content').innerText()
+
+  // deselect the line tool by clicking it
+  await page.getByRole('button', { name: 'Line' }).click()
+
+  await page.mouse.click(700, 200)
+  await page.waitForTimeout(100)
+  await page.mouse.click(700, 250)
+  await page.waitForTimeout(100)
+  await page.mouse.click(750, 200)
+  await page.waitForTimeout(100)
+
+  // expect no change
+  await expect(page.locator('.cm-content')).toHaveText(previousCodeContent)
+
+  // select line tool again
+  await page.getByRole('button', { name: 'Line' }).click()
+
+  await u.closeDebugPanel()
+
+  // line tool should work as expected again
+  await page.mouse.click(700, 200)
+  await expect(page.locator('.cm-content')).not.toHaveText(previousCodeContent)
+  previousCodeContent = await page.locator('.cm-content').innerText()
+
+  await page.mouse.click(700, 300)
+  await expect(page.locator('.cm-content')).not.toHaveText(previousCodeContent)
+  previousCodeContent = await page.locator('.cm-content').innerText()
+
+  await page.mouse.click(750, 300)
+  await expect(page.locator('.cm-content')).not.toHaveText(previousCodeContent)
+  previousCodeContent = await page.locator('.cm-content').innerText()
+})

e2e/playwright/snapshot-tests.spec.ts

@@ -1,7 +1,5 @@
 import { test, expect } from '@playwright/test'
 import { secrets } from './secrets'
-import { EngineCommand } from '../../src/lang/std/engineConnection'
-import { v4 as uuidv4 } from 'uuid'
 import { getUtils } from './test-utils'
 import { Models } from '@kittycad/lib'
 import fsp from 'fs/promises'
@@ -33,6 +31,12 @@ test.beforeEach(async ({ context, page }) => {
 
 test.setTimeout(60000)
 
+const commonPoints = {
+  startAt: '[26.38, -35.59]',
+  num1: 26.63,
+  num2: 53.01,
+}
+
 test('change camera, show planes', async ({ page, context }) => {
   const u = getUtils(page)
   await page.setViewportSize({ width: 1200, height: 500 })
@@ -40,19 +44,8 @@ test('change camera, show planes', async ({ page, context }) => {
   await u.waitForAuthSkipAppStart()
   await u.openAndClearDebugPanel()
 
-  const camCmd: EngineCommand = {
-    type: 'modeling_cmd_req',
-    cmd_id: uuidv4(),
-    cmd: {
-      type: 'default_camera_look_at',
-      center: { x: 0, y: 0, z: 0 },
-      up: { x: 0, y: 0, z: 1 },
-      vantage: { x: 0, y: 85, z: 85 },
-    },
-  }
-
-  await u.sendCustomCmd(camCmd)
-  await u.waitForCmdReceive('default_camera_look_at')
+  const camPos: [number, number, number] = [0, 85, 85]
+  await u.updateCamPosition(camPos)
 
   // rotate
   await u.closeDebugPanel()
@@ -62,13 +55,11 @@ test('change camera, show planes', async ({ page, context }) => {
   await page.mouse.up({ button: 'right' })
 
   await u.openDebugPanel()
-  await u.waitForCmdReceive('camera_drag_end')
   await page.waitForTimeout(500)
   await u.clearCommandLogs()
 
   await page.getByRole('button', { name: 'Start Sketch' }).click()
 
-  await u.waitForDefaultPlanesVisibilityChange()
   await u.closeDebugPanel()
 
   await expect(page).toHaveScreenshot({
@@ -77,10 +68,8 @@ test('change camera, show planes', async ({ page, context }) => {
 
   await u.openAndClearDebugPanel()
   await page.getByRole('button', { name: 'Exit Sketch' }).click()
-  await u.waitForDefaultPlanesVisibilityChange()
 
-  await u.sendCustomCmd(camCmd)
-  await u.waitForCmdReceive('default_camera_look_at')
+  await u.updateCamPosition(camPos)
 
   await u.clearCommandLogs()
   await u.closeDebugPanel()
@@ -93,12 +82,10 @@ test('change camera, show planes', async ({ page, context }) => {
   await page.keyboard.up('Shift')
 
   await u.openDebugPanel()
-  await u.waitForCmdReceive('camera_drag_end')
   await page.waitForTimeout(300)
   await u.clearCommandLogs()
 
   await page.getByRole('button', { name: 'Start Sketch' }).click()
-  await u.waitForDefaultPlanesVisibilityChange()
   await u.closeDebugPanel()
 
   await expect(page).toHaveScreenshot({
@@ -107,10 +94,8 @@ test('change camera, show planes', async ({ page, context }) => {
 
   await u.openAndClearDebugPanel()
   await page.getByRole('button', { name: 'Exit Sketch' }).click()
-  await u.waitForDefaultPlanesVisibilityChange()
 
-  await u.sendCustomCmd(camCmd)
-  await u.waitForCmdReceive('default_camera_look_at')
+  await u.updateCamPosition(camPos)
 
   await u.clearCommandLogs()
   await u.closeDebugPanel()
@@ -119,17 +104,15 @@ test('change camera, show planes', async ({ page, context }) => {
   await page.keyboard.down('Control')
   await page.mouse.move(700, 400)
   await page.mouse.down({ button: 'right' })
-  await page.mouse.move(700, 350)
+  await page.mouse.move(700, 300)
   await page.mouse.up({ button: 'right' })
   await page.keyboard.up('Control')
 
   await u.openDebugPanel()
-  await u.waitForCmdReceive('camera_drag_end')
   await page.waitForTimeout(300)
   await u.clearCommandLogs()
 
   await page.getByRole('button', { name: 'Start Sketch' }).click()
-  await u.waitForDefaultPlanesVisibilityChange()
   await u.closeDebugPanel()
 
   await expect(page).toHaveScreenshot({
@@ -164,11 +147,11 @@ const part001 = startSketchOn('-XZ')
   |> xLineTo({ to: totalLen, tag: 'seg03' }, %)
   |> yLine({ length: -armThick, tag: 'seg01' }, %)
   |> angledLineThatIntersects({
-        angle: _180,
+        angle: HALF_TURN,
         offset: -armThick,
         intersectTag: 'seg04'
       }, %)
-  |> angledLineToY([segAng('seg04', %) + 180, _0], %)
+  |> angledLineToY([segAng('seg04', %) + 180, ZERO], %)
   |> angledLineToY({
         angle: -bottomAng,
         to: -totalHeightHalf - armThick,
@@ -177,13 +160,13 @@ const part001 = startSketchOn('-XZ')
   |> xLineTo(segEndX('seg03', %) + 0, %)
   |> yLine(-segLen('seg01', %), %)
   |> angledLineThatIntersects({
-        angle: _180,
+        angle: HALF_TURN,
         offset: -armThick,
         intersectTag: 'seg02'
       }, %)
   |> angledLineToY([segAng('seg02', %) + 180, -baseHeight], %)
-  |> xLineTo(_0, %)
-  |> close(%) 
+  |> xLineTo(ZERO, %)
+  |> close(%)
   |> extrude(4, %)`
     )
   })
@@ -191,7 +174,6 @@ const part001 = startSketchOn('-XZ')
   await page.goto('/')
   await u.waitForAuthSkipAppStart()
   await u.openDebugPanel()
-  await u.waitForDefaultPlanesVisibilityChange()
   await u.expectCmdLog('[data-message-type="execution-done"]')
   await u.waitForCmdReceive('extrude')
   await page.waitForTimeout(1000)
@@ -366,23 +348,148 @@ const part001 = startSketchOn('-XZ')
   // snapshot exports, good compromise to capture that exports are healthy without getting bogged down in "did the formatting change" changes
   // context: https://github.com/KittyCAD/modeling-app/issues/1222
   for (const { modelPath, imagePath, outputType } of exportLocations) {
-    const cliCommand = `export KITTYCAD_TOKEN=${secrets.snapshottoken} && kittycad file snapshot --output-format=png --src-format=${outputType} ${modelPath} ${imagePath}`
+    console.log(
+      `taking snapshot of using: "zoo file snapshot --output-format=png --src-format=${outputType} ${modelPath} ${imagePath}"`
+    )
+    const cliCommand = `export ZOO_TOKEN=${secrets.snapshottoken} && zoo file snapshot --output-format=png --src-format=${outputType} ${modelPath} ${imagePath}`
     const child = spawn(cliCommand, { shell: true })
-    await new Promise((resolve, reject) => {
+    const result = await new Promise<string>((resolve, reject) => {
       child.on('error', (code: any, msg: any) => {
         console.log('error', code, msg)
-        reject()
+        reject('error')
       })
       child.on('exit', (code, msg) => {
         console.log('exit', code, msg)
         if (code !== 0) {
           reject(`exit code ${code} for model ${modelPath}`)
         } else {
-          resolve(true)
+          resolve('success')
         }
       })
       child.stderr.on('data', (data) => console.log(`stderr: ${data}`))
       child.stdout.on('data', (data) => console.log(`stdout: ${data}`))
     })
+    expect(result).toBe('success')
+    if (result === 'success') {
+      console.log(`snapshot taken for ${modelPath}`)
+    } else {
+      console.log(`snapshot failed for ${modelPath}`)
+    }
   }
 })
+
+test('extrude on each default plane should be stable', async ({
+  page,
+  context,
+}) => {
+  const u = getUtils(page)
+  const makeCode = (plane = 'XY') => `const part001 = startSketchOn('${plane}')
+  |> startProfileAt([0.70, 0.44], %)
+  |> line([0.66, -0.02], %)
+  |> line([0.28, 0.50], %)
+  |> line([-0.56, 0.44], %)
+  |> line([-0.54, -0.38], %)
+  |> close(%)
+  |> extrude(1.00, %)
+`
+  await context.addInitScript(async (code) => {
+    localStorage.setItem('persistCode', code)
+  }, makeCode('XY'))
+  await page.setViewportSize({ width: 1200, height: 500 })
+  await page.goto('/')
+  await u.waitForAuthSkipAppStart()
+
+  // wait for execution done
+  await u.openDebugPanel()
+  await u.expectCmdLog('[data-message-type="execution-done"]')
+  await u.clearAndCloseDebugPanel()
+
+  await page.getByText('Code').click()
+  await expect(page).toHaveScreenshot({
+    maxDiffPixels: 100,
+  })
+  await page.getByText('Code').click()
+
+  const runSnapshotsForOtherPlanes = async (plane = 'XY') => {
+    // clear code
+    await u.removeCurrentCode()
+    // add makeCode('XZ')
+    await page.locator('.cm-content').fill(makeCode(plane))
+    // wait for execution done
+    await u.openDebugPanel()
+    await u.expectCmdLog('[data-message-type="execution-done"]')
+    await u.clearAndCloseDebugPanel()
+
+    await page.getByText('Code').click()
+    await expect(page).toHaveScreenshot({
+      maxDiffPixels: 100,
+    })
+    await page.getByText('Code').click()
+  }
+  await runSnapshotsForOtherPlanes('-XY')
+
+  await runSnapshotsForOtherPlanes('XZ')
+  await runSnapshotsForOtherPlanes('-XZ')
+
+  await runSnapshotsForOtherPlanes('YZ')
+  await runSnapshotsForOtherPlanes('-YZ')
+})
+
+test('Draft segments should look right', async ({ page }) => {
+  const u = 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(
+    page.getByRole('button', { name: 'Start Sketch' })
+  ).not.toBeDisabled()
+  await expect(page.getByRole('button', { name: 'Start Sketch' })).toBeVisible()
+
+  // click on "Start Sketch" button
+  await u.clearCommandLogs()
+  await u.doAndWaitForImageDiff(
+    () => page.getByRole('button', { name: 'Start Sketch' }).click(),
+    200
+  )
+
+  // select a plane
+  await page.mouse.click(700, 200)
+
+  await expect(page.locator('.cm-content')).toHaveText(
+    `const part001 = startSketchOn('-XZ')`
+  )
+
+  await page.waitForTimeout(300) // TODO detect animation ending, or disable animation
+
+  const startXPx = 600
+  await page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10)
+  await expect(page.locator('.cm-content'))
+    .toHaveText(`const part001 = startSketchOn('-XZ')
+  |> startProfileAt(${commonPoints.startAt}, %)`)
+  await page.waitForTimeout(100)
+
+  await u.closeDebugPanel()
+  await page.mouse.move(startXPx + PUR * 20, 500 - PUR * 10)
+  await expect(page).toHaveScreenshot({
+    maxDiffPixels: 100,
+  })
+
+  await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 10)
+  await page.waitForTimeout(100)
+
+  await expect(page.locator('.cm-content'))
+    .toHaveText(`const part001 = startSketchOn('-XZ')
+  |> startProfileAt(${commonPoints.startAt}, %)
+  |> line([${commonPoints.num1}, 0], %)`)
+
+  await page.getByRole('button', { name: 'Tangential Arc' }).click()
+
+  await page.mouse.move(startXPx + PUR * 30, 500 - PUR * 20, { steps: 10 })
+
+  await expect(page).toHaveScreenshot({
+    maxDiffPixels: 100,
+  })
+})

e2e/playwright/test-utils.ts

@@ -80,10 +80,21 @@ export function getUtils(page: Page) {
     waitForAuthSkipAppStart: () => waitForPageLoad(page),
     removeCurrentCode: () => removeCurrentCode(page),
     sendCustomCmd: (cmd: EngineCommand) => sendCustomCmd(page, cmd),
+    updateCamPosition: async (xyz: [number, number, number]) => {
+      const fillInput = async () => {
+        await page.fill('[data-testid="cam-x-position"]', String(xyz[0]))
+        await page.fill('[data-testid="cam-y-position"]', String(xyz[1]))
+        await page.fill('[data-testid="cam-z-position"]', String(xyz[2]))
+      }
+      await fillInput()
+      await page.waitForTimeout(100)
+      await fillInput()
+      await page.waitForTimeout(100)
+      await fillInput()
+      await page.waitForTimeout(100)
+    },
     clearCommandLogs: () => clearCommandLogs(page),
     expectCmdLog: (locatorStr: string) => expectCmdLog(page, locatorStr),
-    waitForDefaultPlanesVisibilityChange: () =>
-      waitForDefaultPlanesToBeVisible(page),
     openDebugPanel: () => openDebugPanel(page),
     closeDebugPanel: () => closeDebugPanel(page),
     openAndClearDebugPanel: async () => {

e2e/tauri/specs/auth.e2e.ts

@@ -86,13 +86,11 @@ describe('ZMA (Tauri, Linux)', () => {
     expect(await homeSection.getText()).toContain('project-000')
   })
 
-  it('opens the new file and expects an error on Linux', async () => {
+  it('opens the new file and expects a loading stream', async () => {
     const projectLink = await $('[data-testid="project-link"]')
     await click(projectLink)
-    const error = await $('h3')
-    expect(await error.getText()).toContain(
-      "Can't find variable: RTCPeerConnection"
-    )
+    const loadingText = await $('[data-testid="loading-stream"]')
+    expect(await loadingText.getText()).toContain('Loading stream...')
     await browser.execute('window.location.href = "tauri://localhost/home"')
   })
 

make-release.sh

@@ -0,0 +1,69 @@
+#!/bin/bash
+
+if ! git diff-index --quiet HEAD --; then
+  echo "Please stash uncommitted changes before running release script"
+  exit 1
+fi
+
+git checkout main
+git pull
+git fetch --all
+
+# Get the latest semver tag from git
+latest_tag=$(jq -r '.version' package.json)
+latest_tag="v$latest_tag"
+
+# Print the latest semver tag
+echo "Latest semver tag: $latest_tag"
+
+# Function to bump version numbers
+bump_version() {
+  local version=$1
+  local bump_type=$2
+  local major=$(echo $version | cut -d '.' -f 1 | sed 's/v//')
+  local minor=$(echo $version | cut -d '.' -f 2)
+  local patch=$(echo $version | cut -d '.' -f 3)
+
+  case "$bump_type" in
+    major)
+      major=$((major + 1))
+      minor=0
+      patch=0
+      ;;
+    minor)
+      minor=$((minor + 1))
+      patch=0
+      ;;
+    *)
+      patch=$((patch + 1))
+      ;;
+  esac
+
+  echo "v${major}.${minor}.${patch}"
+}
+
+# Determine the type of bump based on the argument
+bump_type=${1:-patch}
+
+# Bump the version
+new_version=$(bump_version $latest_tag $bump_type)
+
+# Print the new semver tag
+echo "New semver tag: $new_version"
+new_version_number=${new_version:1}
+echo "New version number without 'v': $new_version_number"
+
+
+git checkout -b "cut-release-$new_version"
+
+echo "$(jq --arg v "$new_version_number" '.version=$v' package.json --indent 2)" > package.json
+echo "$(jq --arg v "$new_version_number" '.package.version=$v' src-tauri/tauri.conf.json --indent 2)" > src-tauri/tauri.conf.json
+
+git add package.json src-tauri/tauri.conf.json
+git commit -m "Cut release $new_version"
+
+echo ""
+echo "Versions has been bumped in relevant json files, a branch has been created and committed to."
+echo ""
+echo "What's left for you to do is, push the branch and make the release PR."
+echo ""

package.json

@@ -1,6 +1,6 @@
 {
   "name": "untitled-app",
-  "version": "0.14.0",
+  "version": "0.15.2",
   "private": true,
   "dependencies": {
     "@codemirror/autocomplete": "^6.10.2",
@@ -10,7 +10,7 @@
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@headlessui/react": "^1.7.17",
     "@headlessui/tailwindcss": "^0.2.0",
-    "@kittycad/lib": "^0.0.46",
+    "@kittycad/lib": "^0.0.53",
     "@lezer/javascript": "^1.4.9",
     "@open-rpc/client-js": "^1.8.1",
     "@react-hook/resize-observer": "^1.2.6",
@@ -21,6 +21,7 @@
     "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.5.1",
     "@ts-stack/markdown": "^1.5.0",
+    "@tweenjs/tween.js": "^23.1.1",
     "@types/node": "^16.7.13",
     "@types/react": "^18.2.41",
     "@types/react-dom": "^18.0.0",
@@ -33,6 +34,7 @@
     "fuse.js": "^7.0.0",
     "http-server": "^14.1.1",
     "json-rpc-2.0": "^1.6.0",
+    "node-fetch": "^3.3.2",
     "re-resizable": "^6.9.11",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
@@ -45,11 +47,12 @@
     "sketch-helpers": "^0.0.4",
     "swr": "^2.2.2",
     "tauri-plugin-fs-extra-api": "https://github.com/tauri-apps/tauri-plugin-fs-extra#v1",
+    "three": "^0.160.0",
     "toml": "^3.0.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.2.2",
     "uuid": "^9.0.1",
-    "vitest": "^0.34.6",
+    "vitest": "^1.3.1",
     "vscode-jsonrpc": "^8.1.0",
     "vscode-languageserver-protocol": "^3.17.5",
     "wasm-pack": "^0.12.1",
@@ -70,7 +73,6 @@
     "test": "vitest --mode development",
     "test:nowatch": "vitest run --mode development",
     "test:rust": "(cd src/wasm-lib && cargo test --all && cargo clippy --all --tests --benches)",
-    "test:cov": "vitest run --coverage --mode development",
     "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",
@@ -82,7 +84,9 @@
     "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",
     "lint": "eslint --fix src",
-    "bump-jsons": "echo \"$(jq --arg v \"$VERSION\" '.version=$v' package.json --indent 2)\" > package.json && echo \"$(jq --arg v \"$VERSION\" '.package.version=$v' src-tauri/tauri.conf.json --indent 2)\" > src-tauri/tauri.conf.json"
+    "bump-jsons": "echo \"$(jq --arg v \"$VERSION\" '.version=$v' package.json --indent 2)\" > package.json && echo \"$(jq --arg v \"$VERSION\" '.package.version=$v' src-tauri/tauri.conf.json --indent 2)\" > src-tauri/tauri.conf.json",
+    "postinstall": "yarn xstate:typegen",
+    "xstate:typegen": "yarn xstate typegen \"src/**/*.ts?(x)\""
   },
   "prettier": {
     "trailingComma": "es5",
@@ -109,21 +113,21 @@
     "@tauri-apps/cli": "^1.5.6",
     "@types/crypto-js": "^4.1.1",
     "@types/debounce-promise": "^3.1.8",
-    "@types/isomorphic-fetch": "^0.0.36",
     "@types/pixelmatch": "^5.2.6",
     "@types/pngjs": "^6.0.4",
     "@types/react-modal": "^3.16.3",
+    "@types/three": "^0.160.0",
     "@types/uuid": "^9.0.4",
     "@types/wait-on": "^5.3.4",
     "@types/wicg-file-system-access": "^2020.9.6",
     "@types/ws": "^8.5.5",
-    "@vitejs/plugin-react": "^4.1.1",
-    "@vitest/coverage-istanbul": "^0.34.6",
+    "@vitejs/plugin-react": "^4.2.1",
     "@wdio/cli": "^8.24.3",
     "@wdio/globals": "^8.24.3",
     "@wdio/local-runner": "^8.24.3",
     "@wdio/mocha-framework": "^8.24.3",
     "@wdio/spec-reporter": "^8.24.2",
+    "@xstate/cli": "^0.5.17",
     "autoprefixer": "^10.4.13",
     "eslint": "^8.53.0",
     "eslint-config-react-app": "^7.0.1",
@@ -133,12 +137,15 @@
     "pixelmatch": "^5.3.0",
     "pngjs": "^7.0.0",
     "postcss": "^8.4.31",
+    "postinstall-postinstall": "^2.1.0",
     "prettier": "^2.8.0",
     "setimmediate": "^1.0.5",
     "tailwindcss": "^3.3.6",
-    "vite": "^4.5.1",
+    "vite": "^5.1.3",
     "vite-plugin-eslint": "^1.8.1",
-    "vite-tsconfig-paths": "^4.2.1",
+    "vite-plugin-package-version": "^1.1.0",
+    "vite-tsconfig-paths": "^4.3.1",
+    "vitest-webgl-canvas-mock": "^1.1.0",
     "wait-on": "^7.2.0",
     "yarn": "^1.22.19"
   }

playwright.config.ts

@@ -1,4 +1,4 @@
-import { defineConfig, devices } from '@playwright/test';
+import { defineConfig, devices } from '@playwright/test'
 
 /**
  * Read environment variables from file.
@@ -78,5 +78,4 @@ export default defineConfig({
     // url: 'http://127.0.0.1:3000',
     reuseExistingServer: !process.env.CI,
   },
-});
-
+})

public/announce_release.py

@@ -0,0 +1,26 @@
+import requests
+import os
+
+webhook_url = os.getenv('DISCORD_WEBHOOK_URL')
+release_version = os.getenv('RELEASE_VERSION')
+release_body = os.getenv('RELEASE_BODY')
+
+# message to send to Discord
+data = {
+    "content": 
+        f'''
+        **{release_version}** is now available! Check out the latest features and improvements here: https://zoo.dev/modeling-app/download
+        {release_body}
+        ''',
+    "username": "Modeling App Release Updates",
+    "avatar_url": "https://raw.githubusercontent.com/KittyCAD/modeling-app/main/public/discord-avatar.png"
+}
+
+# POST request to the Discord webhook
+response = requests.post(webhook_url, json=data)
+
+# Check for success
+if response.status_code == 204:
+    print("Successfully sent the message to Discord.")
+else:
+    print("Failed to send the message to Discord.")

src-tauri/Cargo.lock

@@ -67,9 +67,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.75"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
+checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
 
 [[package]]
 name = "app"
@@ -95,7 +95,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.33",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -542,7 +542,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
 dependencies = [
  "quote",
- "syn 2.0.33",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -552,7 +552,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e"
 dependencies = [
  "quote",
- "syn 2.0.33",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -582,7 +582,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.33",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -593,7 +593,7 @@ checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.33",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -899,7 +899,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.33",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -1242,9 +1242,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.20"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049"
+checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9"
 dependencies = [
  "bytes",
  "fnv",
@@ -1252,7 +1252,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http",
- "indexmap 1.9.3",
+ "indexmap 2.0.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -1664,9 +1664,9 @@ dependencies = [
 
 [[package]]
 name = "kittycad"
-version = "0.2.42"
+version = "0.2.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6aa554d86b6dbbd976a659c912ae25ce817b4378eb12a5684907e263410f0a7b"
+checksum = "a086e1a1bbddb3b38959c0f0ce6de6b3a3b7566e38e0b7d5fb101e91911beed4"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2215,7 +2215,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.33",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -2368,7 +2368,7 @@ dependencies = [
  "regex",
  "regex-syntax 0.7.5",
  "structmeta",
- "syn 2.0.33",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -2487,7 +2487,7 @@ dependencies = [
  "phf_shared 0.11.2",
  "proc-macro2",
  "quote",
- "syn 2.0.33",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -2555,7 +2555,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.33",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -2657,9 +2657,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.67"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
 dependencies = [
  "unicode-ident",
 ]
@@ -2675,9 +2675,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -3235,9 +3235,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.193"
+version = "1.0.196"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
+checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
 dependencies = [
  "serde_derive",
 ]
@@ -3253,13 +3253,13 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.193"
+version = "1.0.196"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
+checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.33",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -3275,9 +3275,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.108"
+version = "1.0.113"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
+checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
 dependencies = [
  "itoa 1.0.6",
  "ryu",
@@ -3302,7 +3302,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.33",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -3352,7 +3352,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.33",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -3556,7 +3556,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "structmeta-derive",
- "syn 2.0.33",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -3567,7 +3567,7 @@ checksum = "a60bcaff7397072dca0017d1db428e30d5002e00b6847703e2e42005c95fbe00"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.33",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -3605,9 +3605,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.33"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9caece70c63bfba29ec2fed841a09851b14a235c60010fa4de58089b6c025668"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3760,9 +3760,9 @@ dependencies = [
 
 [[package]]
 name = "tauri"
-version = "1.5.3"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32d563b672acde8d0cc4c1b1f5b855976923f67e8d6fe1eba51df0211e197be2"
+checksum = "fd27c04b9543776a972c86ccf70660b517ecabbeced9fb58d8b961a13ad129af"
 dependencies = [
  "anyhow",
  "bytes",
@@ -3812,9 +3812,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-build"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defbfc551bd38ab997e5f8e458f87396d2559d05ce32095076ad6c30f7fc5f9c"
+checksum = "e9914a4715e0b75d9f387a285c7e26b5bbfeb1249ad9f842675a82481565c532"
 dependencies = [
  "anyhow",
  "cargo_toml",
@@ -3831,9 +3831,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-codegen"
-version = "1.4.1"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b3475e55acec0b4a50fb96435f19631fb58cbcd31923e1a213de5c382536bbb"
+checksum = "a1554c5857f65dbc377cefb6b97c8ac77b1cb2a90d30d3448114d5d6b48a77fc"
 dependencies = [
  "base64 0.21.2",
  "brotli",
@@ -3857,9 +3857,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-macros"
-version = "1.4.2"
+version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acea6445eececebd72ed7720cfcca46eee3b5bad8eb408be8f7ef2e3f7411500"
+checksum = "277abf361a3a6993ec16bcbb179de0d6518009b851090a01adfea12ac89fa875"
 dependencies = [
  "heck 0.4.1",
  "proc-macro2",
@@ -3872,7 +3872,7 @@ dependencies = [
 [[package]]
 name = "tauri-plugin-fs-extra"
 version = "0.0.0"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#537053d3171a7374a1a86fed422523e7b45a4fb8"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#01211ff0759d578e0e9ac8c98c31fdf09077eb34"
 dependencies = [
  "log",
  "serde",
@@ -3883,9 +3883,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime"
-version = "0.14.1"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07f8e9e53e00e9f41212c115749e87d5cd2a9eebccafca77a19722eeecd56d43"
+checksum = "cf2d0652aa2891ff3e9caa2401405257ea29ab8372cce01f186a5825f1bd0e76"
 dependencies = [
  "gtk",
  "http",
@@ -3904,9 +3904,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime-wry"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "803a01101bc611ba03e13329951a1bde44287a54234189b9024b78619c1bc206"
+checksum = "6cae61fbc731f690a4899681c9052dde6d05b159b44563ace8186fc1bfb7d158"
 dependencies = [
  "cocoa",
  "gtk",
@@ -3924,9 +3924,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-utils"
-version = "1.5.1"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a52165bb340e6f6a75f1f5eeeab1bb49f861c12abe3a176067d53642b5454986"
+checksum = "ece74810b1d3d44f29f732a7ae09a63183d63949bbdd59c61f8ed2a1b70150db"
 dependencies = [
  "brotli",
  "ctor",
@@ -4009,7 +4009,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.33",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -4051,9 +4051,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.34.0"
+version = "1.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9"
+checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
 dependencies = [
  "backtrace",
  "bytes",
@@ -4193,7 +4193,7 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.33",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -4443,7 +4443,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.33",
+ "syn 2.0.48",
  "wasm-bindgen-shared",
 ]
 
@@ -4477,7 +4477,7 @@ checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.33",
+ "syn 2.0.48",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]

src-tauri/Cargo.toml

@@ -12,17 +12,17 @@ rust-version = "1.60"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = { version = "1.5.0", features = [] }
+tauri-build = { version = "1.5.1", features = [] }
 
 [dependencies]
 anyhow = "1"
-kittycad = "0.2.42"
+kittycad = "0.2.53"
 oauth2 = "4.4.2"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-tauri = { version = "1.5.3", features = [ "os-all", "dialog-all", "fs-all", "http-request", "path-all", "shell-open", "shell-open-api", "devtools"] }
+tauri = { version = "1.5.4", features = [ "os-all", "dialog-all", "fs-all", "http-request", "path-all", "shell-open", "shell-open-api", "devtools"] }
 tauri-plugin-fs-extra = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
-tokio = { version = "1.34.0", features = ["time"] }
+tokio = { version = "1.36.0", features = ["time"] }
 toml = "0.8.2"
 
 [features]

src-tauri/src/main.rs

@@ -7,6 +7,7 @@ use std::io::Read;
 
 use anyhow::Result;
 use oauth2::TokenResponse;
+use std::process::Command;
 use tauri::{InvokeError, Manager};
 const DEFAULT_HOST: &str = "https://api.kittycad.io";
 

src-tauri/tauri.conf.json

@@ -7,7 +7,7 @@
   },
   "package": {
     "productName": "zoo-modeling-app",
-    "version": "0.14.0"
+    "version": "0.15.2"
   },
   "tauri": {
     "allowlist": {

src/App.test.tsx

@@ -1,73 +0,0 @@
-import { render, screen } from '@testing-library/react'
-import { App } from './App'
-import { describe, test, vi } from 'vitest'
-import {
-  Route,
-  RouterProvider,
-  createMemoryRouter,
-  createRoutesFromElements,
-} from 'react-router-dom'
-import { GlobalStateProvider } from './components/GlobalStateProvider'
-import CommandBarProvider from 'components/CommandBar/CommandBar'
-import ModelingMachineProvider from 'components/ModelingMachineProvider'
-import { BROWSER_FILE_NAME } from 'Router'
-
-let listener: ((rect: any) => void) | undefined = undefined
-;(global as any).ResizeObserver = class ResizeObserver {
-  constructor(ls: ((rect: any) => void) | undefined) {
-    listener = ls
-  }
-  observe() {}
-  unobserve() {}
-  disconnect() {}
-}
-
-describe('App tests', () => {
-  test('Renders the modeling app screen, including "Variables" pane.', () => {
-    vi.mock('react-router-dom', async () => {
-      const actual = (await vi.importActual('react-router-dom')) as Record<
-        string,
-        any
-      >
-      return {
-        ...actual,
-        useParams: () => ({ id: BROWSER_FILE_NAME }),
-        useLoaderData: () => ({ code: null }),
-      }
-    })
-    render(
-      <TestWrap>
-        <App />
-      </TestWrap>
-    )
-    const linkElement = screen.getByText(/Variables/i)
-    expect(linkElement).toBeInTheDocument()
-
-    vi.restoreAllMocks()
-  })
-})
-
-function TestWrap({ children }: { children: React.ReactNode }) {
-  // We have to use a memory router in the testing environment,
-  // and we have to use the createMemoryRouter function instead of <MemoryRouter /> as of react-router v6.4:
-  // https://reactrouter.com/en/6.16.0/routers/picking-a-router#using-v64-data-apis
-  const router = createMemoryRouter(
-    createRoutesFromElements(
-      <Route
-        path="/file/:id"
-        element={
-          <CommandBarProvider>
-            <GlobalStateProvider>
-              <ModelingMachineProvider>{children}</ModelingMachineProvider>
-            </GlobalStateProvider>
-          </CommandBarProvider>
-        }
-      />
-    ),
-    {
-      initialEntries: ['/file/new'],
-      initialIndex: 0,
-    }
-  )
-  return <RouterProvider router={router} />
-}

src/App.tsx

@@ -19,21 +19,24 @@ import {
 } from '@fortawesome/free-solid-svg-icons'
 import { useHotkeys } from 'react-hotkeys-hook'
 import { getNormalisedCoordinates } from './lib/utils'
-import { useLoaderData } from 'react-router-dom'
-import { IndexLoaderData } from './Router'
+import { useLoaderData, useNavigate } from 'react-router-dom'
+import { type IndexLoaderData } from 'lib/types'
+import { paths } from 'lib/paths'
 import { useGlobalStateContext } from 'hooks/useGlobalStateContext'
-import { onboardingPaths } from 'routes/Onboarding'
-import { cameraMouseDragGuards } from 'lib/cameraControls'
-import { CameraDragInteractionType_type } from '@kittycad/lib/dist/types/src/models'
+import { onboardingPaths } from 'routes/Onboarding/paths'
 import { CodeMenu } from 'components/CodeMenu'
 import { TextEditor } from 'components/TextEditor'
 import { Themes, getSystemTheme } from 'lib/theme'
 import { useEngineConnectionSubscriptions } from 'hooks/useEngineConnectionSubscriptions'
 import { engineCommandManager } from './lang/std/engineConnection'
 import { useModelingContext } from 'hooks/useModelingContext'
+import { useAbsoluteFilePath } from 'hooks/useAbsoluteFilePath'
+import { isTauri } from 'lib/isTauri'
 
 export function App() {
   const { project, file } = useLoaderData() as IndexLoaderData
+  const navigate = useNavigate()
+  const filePath = useAbsoluteFilePath()
 
   useHotKeyListener()
   const {
@@ -51,8 +54,7 @@ export function App() {
   }))
 
   const { settings } = useGlobalStateContext()
-  const { showDebugPanel, onboardingStatus, cameraControls, theme } =
-    settings?.context || {}
+  const { showDebugPanel, onboardingStatus, theme } = settings?.context || {}
   const { state, send } = useModelingContext()
 
   const editorTheme = theme === Themes.System ? getSystemTheme() : theme
@@ -71,6 +73,16 @@ export function App() {
   useHotkeys('shift + e', () => togglePane('kclErrors'))
   useHotkeys('shift + d', () => togglePane('debug'))
   useHotkeys('esc', () => send('Cancel'))
+  useHotkeys('backspace', (e) => {
+    e.preventDefault()
+  })
+  useHotkeys(
+    isTauri() ? 'mod + ,' : 'shift + mod + ,',
+    () => navigate(filePath + paths.SETTINGS),
+    {
+      splitKey: '|',
+    }
+  )
 
   const paneOpacity = [onboardingPaths.CAMERA, onboardingPaths.STREAMING].some(
     (p) => p === onboardingStatus
@@ -84,9 +96,11 @@ export function App() {
 
   const debounceSocketSend = throttle<EngineCommand>((message) => {
     engineCommandManager.sendSceneCommand(message)
-  }, 16)
+  }, 1000 / 15)
   const handleMouseMove: MouseEventHandler<HTMLDivElement> = (e) => {
-    e.nativeEvent.preventDefault()
+    if (state.matches('Sketch')) {
+      return
+    }
 
     const { x, y } = getNormalisedCoordinates({
       clientX: e.clientX,
@@ -97,58 +111,11 @@ export function App() {
 
     const newCmdId = uuidv4()
     if (buttonDownInStream === undefined) {
-      if (state.matches('Sketch.Line Tool')) {
-        debounceSocketSend({
-          type: 'modeling_cmd_req',
-          cmd_id: newCmdId,
-          cmd: {
-            type: 'mouse_move',
-            window: { x, y },
-          },
-        })
-      } else {
-        debounceSocketSend({
-          type: 'modeling_cmd_req',
-          cmd: {
-            type: 'highlight_set_entity',
-            selected_at_window: { x, y },
-          },
-          cmd_id: newCmdId,
-        })
-      }
-    } else {
-      if (state.matches('Sketch.Move Tool')) {
-        debounceSocketSend({
-          type: 'modeling_cmd_req',
-          cmd_id: newCmdId,
-          cmd: {
-            type: 'handle_mouse_drag_move',
-            window: { x, y },
-          },
-        })
-        return
-      }
-      const interactionGuards = cameraMouseDragGuards[cameraControls]
-      let interaction: CameraDragInteractionType_type
-
-      const eWithButton = { ...e, button: buttonDownInStream }
-
-      if (interactionGuards.pan.callback(eWithButton)) {
-        interaction = 'pan'
-      } else if (interactionGuards.rotate.callback(eWithButton)) {
-        interaction = 'rotate'
-      } else if (interactionGuards.zoom.dragCallback(eWithButton)) {
-        interaction = 'zoom'
-      } else {
-        return
-      }
-
       debounceSocketSend({
         type: 'modeling_cmd_req',
         cmd: {
-          type: 'camera_drag_move',
-          interaction,
-          window: { x, y },
+          type: 'highlight_set_entity',
+          selected_at_window: { x, y },
         },
         cmd_id: newCmdId,
       })
@@ -238,6 +205,7 @@ export function App() {
           open={openPanes.includes('debug')}
         />
       )}
+      {/* <CamToggle /> */}
     </div>
   )
 }

src/Router.tsx

@@ -14,10 +14,7 @@ import {
 import { useEffect } from 'react'
 import { ErrorPage } from './components/ErrorPage'
 import { Settings } from './routes/Settings'
-import Onboarding, {
-  onboardingRoutes,
-  onboardingPaths,
-} from './routes/Onboarding'
+import Onboarding, { onboardingRoutes } from './routes/Onboarding'
 import SignIn from './routes/SignIn'
 import { Auth } from './Auth'
 import { isTauri } from './lib/isTauri'
@@ -29,7 +26,7 @@ import {
   isProjectDirectory,
   PROJECT_ENTRYPOINT,
 } from './lib/tauriFS'
-import { metadata, type Metadata } from 'tauri-plugin-fs-extra-api'
+import { metadata } from 'tauri-plugin-fs-extra-api'
 import DownloadAppBanner from './components/DownloadAppBanner'
 import { WasmErrBanner } from './components/WasmErrBanner'
 import { GlobalStateProvider } from './components/GlobalStateProvider'
@@ -38,13 +35,18 @@ import {
   settingsMachine,
 } from './machines/settingsMachine'
 import { ContextFrom } from 'xstate'
-import CommandBarProvider from 'components/CommandBar/CommandBar'
+import CommandBarProvider, {
+  CommandBar,
+} from 'components/CommandBar/CommandBar'
 import { TEST, VITE_KC_SENTRY_DSN } from './env'
 import * as Sentry from '@sentry/react'
 import ModelingMachineProvider from 'components/ModelingMachineProvider'
-import { KclContextProvider, kclManager } from 'lang/KclSinglton'
+import { KclContextProvider, kclManager } from 'lang/KclSingleton'
 import FileMachineProvider from 'components/FileMachineProvider'
 import { sep } from '@tauri-apps/api/path'
+import { paths } from 'lib/paths'
+import { IndexLoaderData, HomeLoaderData } from 'lib/types'
+import { fileSystemManager } from 'lang/std/fileSystemManager'
 
 if (VITE_KC_SENTRY_DSN && !TEST) {
   Sentry.init({
@@ -78,43 +80,8 @@ if (VITE_KC_SENTRY_DSN && !TEST) {
   })
 }
 
-const prependRoutes =
-  (routesObject: Record<string, string>) => (prepend: string) => {
-    return Object.fromEntries(
-      Object.entries(routesObject).map(([constName, path]) => [
-        constName,
-        prepend + path,
-      ])
-    )
-  }
-
-export const paths = {
-  INDEX: '/',
-  HOME: '/home',
-  FILE: '/file',
-  SETTINGS: '/settings',
-  SIGN_IN: '/signin',
-  ONBOARDING: prependRoutes(onboardingPaths)(
-    '/onboarding'
-  ) as typeof onboardingPaths,
-}
-
 export const BROWSER_FILE_NAME = 'new'
 
-export type IndexLoaderData = {
-  code: string | null
-  project?: ProjectWithEntryPointMetadata
-  file?: FileEntry
-}
-
-export type ProjectWithEntryPointMetadata = FileEntry & {
-  entrypointMetadata: Metadata
-}
-export type HomeLoaderData = {
-  projects: ProjectWithEntryPointMetadata[]
-  newDefaultDirectory?: string
-}
-
 type CreateBrowserRouterArg = Parameters<typeof createBrowserRouter>[0]
 
 const addGlobalContextToElements = (
@@ -146,18 +113,19 @@ const router = createBrowserRouter(
     {
       path: paths.FILE + '/:id',
       element: (
-        <Auth>
-          <FileMachineProvider>
-            <KclContextProvider>
+        <KclContextProvider>
+          <Auth>
+            <FileMachineProvider>
               <ModelingMachineProvider>
                 <Outlet />
                 <App />
+                <CommandBar />
               </ModelingMachineProvider>
               <WasmErrBanner />
-            </KclContextProvider>
-          </FileMachineProvider>
-          {!isTauri() && import.meta.env.PROD && <DownloadAppBanner />}
-        </Auth>
+            </FileMachineProvider>
+            {!isTauri() && import.meta.env.PROD && <DownloadAppBanner />}
+          </Auth>
+        </KclContextProvider>
       ),
       id: paths.FILE,
       loader: async ({
@@ -210,6 +178,10 @@ const router = createBrowserRouter(
           const children = await readDir(projectPath, { recursive: true })
           kclManager.setCodeAndExecute(code, false)
 
+          // Set the file system manager to the project path
+          // So that WASM gets an updated path for operations
+          fileSystemManager.dir = projectPath
+
           return {
             code,
             project: {
@@ -247,9 +219,10 @@ const router = createBrowserRouter(
         <Auth>
           <Outlet />
           <Home />
+          <CommandBar />
         </Auth>
       ),
-      loader: async () => {
+      loader: async (): Promise<HomeLoaderData | Response> => {
         if (!isTauri()) {
           return redirect(paths.FILE + '/' + BROWSER_FILE_NAME)
         }

src/Toolbar.tsx

@@ -5,6 +5,13 @@ import { useModelingContext } from 'hooks/useModelingContext'
 import { useCommandsContext } from 'hooks/useCommandsContext'
 import { ActionButton } from 'components/ActionButton'
 import usePlatform from 'hooks/usePlatform'
+import { isSingleCursorInPipe } from 'lang/queryAst'
+import { kclManager, useKclContext } from 'lang/KclSingleton'
+import {
+  NetworkHealthState,
+  useNetworkStatus,
+} from 'components/NetworkHealthIndicator'
+import { useStore } from 'useStore'
 
 export const Toolbar = () => {
   const platform = usePlatform()
@@ -13,14 +20,22 @@ export const Toolbar = () => {
   const toolbarButtonsRef = useRef<HTMLUListElement>(null)
   const bgClassName =
     'group-enabled:group-hover:bg-energy-10 group-pressed:bg-energy-10 dark:group-enabled:group-hover:bg-chalkboard-80 dark:group-pressed:bg-chalkboard-80'
-  const pathId = useMemo(
-    () =>
-      isCursorInSketchCommandRange(
-        engineCommandManager.artifactMap,
-        context.selectionRanges
-      ),
-    [engineCommandManager.artifactMap, context.selectionRanges]
-  )
+  const pathId = useMemo(() => {
+    if (!isSingleCursorInPipe(context.selectionRanges, kclManager.ast)) {
+      return false
+    }
+    return isCursorInSketchCommandRange(
+      engineCommandManager.artifactMap,
+      context.selectionRanges
+    )
+  }, [engineCommandManager.artifactMap, context.selectionRanges])
+  const { overallState } = useNetworkStatus()
+  const { isExecuting } = useKclContext()
+  const { isStreamReady } = useStore((s) => ({
+    isStreamReady: s.isStreamReady,
+  }))
+  const disableAllButtons =
+    overallState !== NetworkHealthState.Ok || isExecuting || !isStreamReady
 
   function handleToolbarButtonsWheelEvent(ev: WheelEvent<HTMLSpanElement>) {
     const span = toolbarButtonsRef.current
@@ -50,11 +65,14 @@ export const Toolbar = () => {
           <li className="contents">
             <ActionButton
               Element="button"
-              onClick={() => send({ type: 'Enter sketch' })}
+              onClick={() =>
+                send({ type: 'Enter sketch', data: { forceNewSketch: true } })
+              }
               icon={{
                 icon: 'sketch',
                 bgClassName,
               }}
+              disabled={disableAllButtons}
             >
               <span data-testid="start-sketch">Start Sketch</span>
             </ActionButton>
@@ -69,6 +87,7 @@ export const Toolbar = () => {
                 icon: 'sketch',
                 bgClassName,
               }}
+              disabled={disableAllButtons}
             >
               Edit Sketch
             </ActionButton>
@@ -83,50 +102,57 @@ export const Toolbar = () => {
                 icon: 'arrowLeft',
                 bgClassName,
               }}
+              disabled={disableAllButtons}
             >
               Exit Sketch
             </ActionButton>
           </li>
         )}
         {state.matches('Sketch') && !state.matches('idle') && (
-          <li className="contents">
-            <ActionButton
-              Element="button"
-              onClick={() =>
-                state.matches('Sketch.Line Tool')
-                  ? send('CancelSketch')
-                  : send('Equip tool')
-              }
-              aria-pressed={state.matches('Sketch.Line Tool')}
-              className="pressed:bg-energy-10/20 dark:pressed:bg-energy-80"
-              icon={{
-                icon: 'line',
-                bgClassName,
-              }}
-            >
-              Line
-            </ActionButton>
-          </li>
-        )}
-        {state.matches('Sketch') && (
-          <li className="contents">
-            <ActionButton
-              Element="button"
-              onClick={() =>
-                state.matches('Sketch.Move Tool')
-                  ? send('CancelSketch')
-                  : send('Equip move tool')
-              }
-              aria-pressed={state.matches('Sketch.Move Tool')}
-              className="pressed:bg-energy-10/20 dark:pressed:bg-energy-80"
-              icon={{
-                icon: 'move',
-                bgClassName,
-              }}
-            >
-              Move
-            </ActionButton>
-          </li>
+          <>
+            <li className="contents" key="line-button">
+              <ActionButton
+                Element="button"
+                onClick={() =>
+                  state?.matches('Sketch.Line tool')
+                    ? send('CancelSketch')
+                    : send('Equip Line tool')
+                }
+                aria-pressed={state?.matches('Sketch.Line tool')}
+                className="pressed:bg-energy-10/20 dark:pressed:bg-energy-80"
+                icon={{
+                  icon: 'line',
+                  bgClassName,
+                }}
+                disabled={disableAllButtons}
+              >
+                Line
+              </ActionButton>
+            </li>
+            <li className="contents" key="tangential-arc-button">
+              <ActionButton
+                Element="button"
+                onClick={() =>
+                  state.matches('Sketch.Tangential arc to')
+                    ? send('CancelSketch')
+                    : send('Equip tangential arc to')
+                }
+                aria-pressed={state.matches('Sketch.Tangential arc to')}
+                className="pressed:bg-energy-10/20 dark:pressed:bg-energy-80"
+                icon={{
+                  icon: 'arc',
+                  bgClassName,
+                }}
+                disabled={
+                  (!state.can('Equip tangential arc to') &&
+                    !state.matches('Sketch.Tangential arc to')) ||
+                  disableAllButtons
+                }
+              >
+                Tangential Arc
+              </ActionButton>
+            </li>
+          </>
         )}
         {state.matches('Sketch.SketchIdle') &&
           state.nextEvents
@@ -151,7 +177,7 @@ export const Toolbar = () => {
               return 0
             })
             .map((eventName) => (
-              <li className="contents">
+              <li className="contents" key={eventName}>
                 <ActionButton
                   Element="button"
                   className="text-sm"
@@ -160,7 +186,7 @@ export const Toolbar = () => {
                   disabled={
                     !state.nextEvents
                       .filter((event) => state.can(event as any))
-                      .includes(eventName)
+                      .includes(eventName) || disableAllButtons
                   }
                   title={eventName}
                   icon={{
@@ -185,7 +211,7 @@ export const Toolbar = () => {
                   data: { name: 'Extrude', ownerMachine: 'modeling' },
                 })
               }
-              disabled={!state.can('Extrude')}
+              disabled={!state.can('Extrude') || disableAllButtons}
               title={
                 state.can('Extrude')
                   ? 'extrude'

src/clientSideScene/CameraControls.ts

@@ -0,0 +1,879 @@
+import { MouseGuard } from 'lib/cameraControls'
+import {
+  Euler,
+  MathUtils,
+  Matrix4,
+  OrthographicCamera,
+  PerspectiveCamera,
+  Quaternion,
+  Spherical,
+  Vector2,
+  Vector3,
+} from 'three'
+import {
+  DEBUG_SHOW_INTERSECTION_PLANE,
+  INTERSECTION_PLANE_LAYER,
+  SKETCH_LAYER,
+  ZOOM_MAGIC_NUMBER,
+} from './sceneInfra'
+import { EngineCommand, engineCommandManager } from 'lang/std/engineConnection'
+import { v4 as uuidv4 } from 'uuid'
+import { deg2Rad } from 'lib/utils2d'
+import { isReducedMotion, roundOff, throttle } from 'lib/utils'
+import * as TWEEN from '@tweenjs/tween.js'
+import { isQuaternionVertical } from './helpers'
+
+const ORTHOGRAPHIC_CAMERA_SIZE = 20
+const FRAMES_TO_ANIMATE_IN = 30
+
+const tempQuaternion = new Quaternion() // just used for maths
+
+interface ThreeCamValues {
+  position: Vector3
+  quaternion: Quaternion
+  zoom: number
+  isPerspective: boolean
+  target: Vector3
+}
+
+export type ReactCameraProperties =
+  | {
+      type: 'perspective'
+      fov?: number
+      position: [number, number, number]
+      quaternion: [number, number, number, number]
+    }
+  | {
+      type: 'orthographic'
+      zoom?: number
+      position: [number, number, number]
+      quaternion: [number, number, number, number]
+    }
+
+const lastCmdDelay = 50
+
+const throttledUpdateEngineCamera = throttle((threeValues: ThreeCamValues) => {
+  const cmd: EngineCommand = {
+    type: 'modeling_cmd_req',
+    cmd_id: uuidv4(),
+    cmd: {
+      type: 'default_camera_look_at',
+      ...convertThreeCamValuesToEngineCam(threeValues),
+    },
+  }
+  engineCommandManager.sendSceneCommand(cmd)
+}, 1000 / 15)
+
+let lastPerspectiveCmd: EngineCommand | null = null
+let lastPerspectiveCmdTime: number = Date.now()
+let lastPerspectiveCmdTimeoutId: number | null = null
+
+const sendLastPerspectiveReliableChannel = () => {
+  if (
+    lastPerspectiveCmd &&
+    Date.now() - lastPerspectiveCmdTime >= lastCmdDelay
+  ) {
+    engineCommandManager.sendSceneCommand(lastPerspectiveCmd, true)
+    lastPerspectiveCmdTime = Date.now()
+  }
+}
+
+const throttledUpdateEngineFov = throttle(
+  (vals: {
+    position: Vector3
+    quaternion: Quaternion
+    zoom: number
+    fov: number
+    target: Vector3
+  }) => {
+    const cmd: EngineCommand = {
+      type: 'modeling_cmd_req',
+      cmd_id: uuidv4(),
+      cmd: {
+        type: 'default_camera_perspective_settings',
+        ...convertThreeCamValuesToEngineCam({
+          ...vals,
+          isPerspective: true,
+        }),
+        fov_y: vals.fov,
+        ...calculateNearFarFromFOV(vals.fov),
+      },
+    }
+    engineCommandManager.sendSceneCommand(cmd)
+    lastPerspectiveCmd = cmd
+    lastPerspectiveCmdTime = Date.now()
+    if (lastPerspectiveCmdTimeoutId !== null) {
+      clearTimeout(lastPerspectiveCmdTimeoutId)
+    }
+    lastPerspectiveCmdTimeoutId = setTimeout(
+      sendLastPerspectiveReliableChannel,
+      lastCmdDelay
+    ) as any as number
+  },
+  1000 / 15
+)
+
+export class CameraControls {
+  camera: PerspectiveCamera | OrthographicCamera
+  target: Vector3
+  domElement: HTMLCanvasElement
+  isDragging: boolean
+  mouseDownPosition: Vector2
+  mouseNewPosition: Vector2
+  rotationSpeed = 0.3
+  enableRotate = true
+  enablePan = true
+  enableZoom = true
+  lastPerspectiveFov: number = 45
+  pendingZoom: number | null = null
+  pendingRotation: Vector2 | null = null
+  pendingPan: Vector2 | null = null
+  interactionGuards: MouseGuard = {
+    pan: {
+      description: 'Right click + Shift + drag or middle click + drag',
+      callback: (e) => !!(e.buttons & 4) && !e.ctrlKey,
+    },
+    zoom: {
+      description: 'Scroll wheel or Right click + Ctrl + drag',
+      dragCallback: (e) => e.button === 2 && e.ctrlKey,
+      scrollCallback: () => true,
+    },
+    rotate: {
+      description: 'Right click + drag',
+      callback: (e) => {
+        console.log('event', e)
+        return !!(e.buttons & 2)
+      },
+    },
+  }
+  isFovAnimationInProgress = false
+  fovBeforeOrtho = 45
+  get isPerspective() {
+    return this.camera instanceof PerspectiveCamera
+  }
+
+  // reacts hooks into some of this singleton's properties
+  reactCameraProperties: ReactCameraProperties = {
+    type: 'perspective',
+    fov: 12,
+    position: [0, 0, 0],
+    quaternion: [0, 0, 0, 1],
+  }
+
+  setCam = (camProps: ReactCameraProperties) => {
+    if (
+      camProps.type === 'perspective' &&
+      this.camera instanceof OrthographicCamera
+    ) {
+      this.usePerspectiveCamera()
+    } else if (
+      camProps.type === 'orthographic' &&
+      this.camera instanceof PerspectiveCamera
+    ) {
+      this.useOrthographicCamera()
+    }
+    this.camera.position.set(...camProps.position)
+    this.camera.quaternion.set(...camProps.quaternion)
+    if (
+      camProps.type === 'perspective' &&
+      this.camera instanceof PerspectiveCamera
+    ) {
+      // not sure what to do here, calling dollyZoom here is buggy because it updates the position
+      // at the same time
+    } else if (
+      camProps.type === 'orthographic' &&
+      this.camera instanceof OrthographicCamera
+    ) {
+      this.camera.zoom = camProps.zoom || 1
+    }
+    this.camera.updateProjectionMatrix()
+    this.update(true)
+  }
+
+  constructor(isOrtho = false, domElement: HTMLCanvasElement) {
+    this.camera = isOrtho ? new OrthographicCamera() : new PerspectiveCamera()
+    this.camera.up.set(0, 0, 1)
+    this.camera.far = 20000
+    this.target = new Vector3()
+    this.domElement = domElement
+    this.isDragging = false
+    this.mouseDownPosition = new Vector2()
+    this.mouseNewPosition = new Vector2()
+
+    this.domElement.addEventListener('pointerdown', this.onMouseDown)
+    this.domElement.addEventListener('pointermove', this.onMouseMove)
+    this.domElement.addEventListener('pointerup', this.onMouseUp)
+    this.domElement.addEventListener('wheel', this.onMouseWheel)
+
+    window.addEventListener('resize', this.onWindowResize)
+    this.onWindowResize()
+
+    this.update()
+  }
+
+  private _isCamMovingCallback: (isMoving: boolean, isTween: boolean) => void =
+    () => {}
+  setIsCamMovingCallback(cb: (isMoving: boolean, isTween: boolean) => void) {
+    this._isCamMovingCallback = cb
+  }
+  private _camChangeCallbacks: { [key: string]: () => void } = {}
+  subscribeToCamChange(cb: () => void) {
+    const cbId = uuidv4()
+    this._camChangeCallbacks[cbId] = cb
+    const unsubscribe = () => {
+      delete this._camChangeCallbacks[cbId]
+    }
+    return unsubscribe
+  }
+
+  onWindowResize = () => {
+    if (this.camera instanceof PerspectiveCamera) {
+      this.camera.aspect = window.innerWidth / window.innerHeight
+    } else if (this.camera instanceof OrthographicCamera) {
+      const aspect = window.innerWidth / window.innerHeight
+      this.camera.left = -ORTHOGRAPHIC_CAMERA_SIZE * aspect
+      this.camera.right = ORTHOGRAPHIC_CAMERA_SIZE * aspect
+      this.camera.top = ORTHOGRAPHIC_CAMERA_SIZE
+      this.camera.bottom = -ORTHOGRAPHIC_CAMERA_SIZE
+    }
+    this.camera.updateProjectionMatrix()
+  }
+
+  onMouseDown = (event: MouseEvent) => {
+    this.isDragging = true
+    this.mouseDownPosition.set(event.clientX, event.clientY)
+  }
+
+  onMouseMove = (event: MouseEvent) => {
+    if (this.isDragging) {
+      this.mouseNewPosition.set(event.clientX, event.clientY)
+      const deltaMove = this.mouseNewPosition
+        .clone()
+        .sub(this.mouseDownPosition)
+      this.mouseDownPosition.copy(this.mouseNewPosition)
+
+      let state: 'pan' | 'rotate' | 'zoom' = 'pan'
+
+      if (this.interactionGuards.pan.callback(event as any)) {
+        if (this.enablePan === false) return
+        // handleMouseDownPan(event)
+        state = 'pan'
+      } else if (this.interactionGuards.rotate.callback(event as any)) {
+        if (this.enableRotate === false) return
+        // handleMouseDownRotate(event)
+        state = 'rotate'
+      } else if (this.interactionGuards.zoom.dragCallback(event as any)) {
+        if (this.enableZoom === false) return
+        // handleMouseDownDolly(event)
+        state = 'zoom'
+      } else {
+        return
+      }
+
+      // Implement camera movement logic here based on deltaMove
+      // For example, for rotating the camera around the target:
+      if (state === 'rotate') {
+        this.pendingRotation = this.pendingRotation
+          ? this.pendingRotation
+          : new Vector2()
+        this.pendingRotation.x += deltaMove.x
+        this.pendingRotation.y += deltaMove.y
+      } else if (state === 'zoom') {
+        this.pendingZoom = this.pendingZoom ? this.pendingZoom : 1
+        this.pendingZoom *= 1 + deltaMove.y * 0.01
+      } else if (state === 'pan') {
+        this.pendingPan = this.pendingPan ? this.pendingPan : new Vector2()
+        let distance = this.camera.position.distanceTo(this.target)
+        if (this.camera instanceof OrthographicCamera) {
+          const zoomFudgeFactor = 2280
+          distance = zoomFudgeFactor / (this.camera.zoom * 45)
+        }
+        const panSpeed = (distance / 1000 / 45) * this.fovBeforeOrtho
+        this.pendingPan.x += -deltaMove.x * panSpeed
+        this.pendingPan.y += deltaMove.y * panSpeed
+      }
+    }
+  }
+
+  onMouseUp = (event: MouseEvent) => {
+    this.isDragging = false
+  }
+
+  onMouseWheel = (event: WheelEvent) => {
+    // Assume trackpad if the deltas are small and integers
+    const isTrackpad = Math.abs(event.deltaY) <= 1 || event.deltaY % 1 === 0
+
+    const zoomSpeed = isTrackpad ? 0.02 : 0.1 // Reduced zoom speed for trackpad
+    this.pendingZoom = this.pendingZoom ? this.pendingZoom : 1
+    this.pendingZoom *= 1 + (event.deltaY > 0 ? zoomSpeed : -zoomSpeed)
+  }
+
+  useOrthographicCamera = () => {
+    if (this.camera instanceof OrthographicCamera) return
+    const { x: px, y: py, z: pz } = this.camera.position
+    const { x: qx, y: qy, z: qz, w: qw } = this.camera.quaternion
+    const aspect = window.innerWidth / window.innerHeight
+    this.lastPerspectiveFov = this.camera.fov
+    const { z_near, z_far } = calculateNearFarFromFOV(this.lastPerspectiveFov)
+    this.camera = new OrthographicCamera(
+      -ORTHOGRAPHIC_CAMERA_SIZE * aspect,
+      ORTHOGRAPHIC_CAMERA_SIZE * aspect,
+      ORTHOGRAPHIC_CAMERA_SIZE,
+      -ORTHOGRAPHIC_CAMERA_SIZE,
+      z_near,
+      z_far
+    )
+    this.camera.up.set(0, 0, 1)
+    this.camera.layers.enable(SKETCH_LAYER)
+    if (DEBUG_SHOW_INTERSECTION_PLANE)
+      this.camera.layers.enable(INTERSECTION_PLANE_LAYER)
+    this.camera.position.set(px, py, pz)
+    const distance = this.camera.position.distanceTo(this.target.clone())
+    const fovFactor = 45 / this.lastPerspectiveFov
+    this.camera.zoom = (ZOOM_MAGIC_NUMBER * fovFactor * 0.8) / distance
+
+    this.camera.quaternion.set(qx, qy, qz, qw)
+    this.camera.updateProjectionMatrix()
+    engineCommandManager.sendSceneCommand({
+      type: 'modeling_cmd_req',
+      cmd_id: uuidv4(),
+      cmd: {
+        type: 'default_camera_set_orthographic',
+      },
+    })
+    this.onCameraChange()
+  }
+  private createPerspectiveCamera = () => {
+    const { z_near, z_far } = calculateNearFarFromFOV(this.lastPerspectiveFov)
+    this.camera = new PerspectiveCamera(
+      this.lastPerspectiveFov,
+      window.innerWidth / window.innerHeight,
+      z_near,
+      z_far
+    )
+    this.camera.up.set(0, 0, 1)
+    this.camera.layers.enable(SKETCH_LAYER)
+    if (DEBUG_SHOW_INTERSECTION_PLANE)
+      this.camera.layers.enable(INTERSECTION_PLANE_LAYER)
+
+    return this.camera
+  }
+  usePerspectiveCamera = () => {
+    const { x: px, y: py, z: pz } = this.camera.position
+    const { x: qx, y: qy, z: qz, w: qw } = this.camera.quaternion
+    const zoom = this.camera.zoom
+    this.camera = this.createPerspectiveCamera()
+
+    this.camera.position.set(px, py, pz)
+    this.camera.quaternion.set(qx, qy, qz, qw)
+    const zoomFudgeFactor = 2280
+    const distance = zoomFudgeFactor / (zoom * this.lastPerspectiveFov)
+    const direction = new Vector3().subVectors(
+      this.camera.position,
+      this.target
+    )
+    direction.normalize()
+    this.camera.position.copy(this.target).addScaledVector(direction, distance)
+
+    engineCommandManager.sendSceneCommand({
+      type: 'modeling_cmd_req',
+      cmd_id: uuidv4(),
+      cmd: {
+        type: 'default_camera_set_perspective',
+        parameters: {
+          fov_y: this.camera.fov,
+          ...calculateNearFarFromFOV(this.lastPerspectiveFov),
+        },
+      },
+    })
+    this.onCameraChange()
+    this.update()
+    return this.camera
+  }
+
+  dollyZoom = (newFov: number) => {
+    if (!(this.camera instanceof PerspectiveCamera)) {
+      console.warn('Dolly zoom is only applicable to perspective cameras.')
+      return
+    }
+    this.lastPerspectiveFov = newFov
+
+    // Calculate the direction vector from the camera towards the controls target
+    const direction = new Vector3()
+      .subVectors(this.target, this.camera.position)
+      .normalize()
+
+    // Calculate the distance to the controls target before changing the FOV
+    const distanceBefore = this.camera.position.distanceTo(this.target)
+
+    // Calculate the scale factor for the new FOV compared to the old one
+    // This needs to be calculated before updating the camera's FOV
+    const oldFov = this.camera.fov
+
+    const viewHeightFactor = (fov: number) => {
+      /*       * 
+              /|
+             / |
+            /  |
+           /   |
+          /    | viewHeight/2
+         /     |
+        /      |
+       /↙️fov/2 |
+      /________|
+      \        |
+       \._._._.|
+      */
+      return Math.tan(deg2Rad(fov / 2))
+    }
+    const scaleFactor = viewHeightFactor(oldFov) / viewHeightFactor(newFov)
+
+    this.camera.fov = newFov
+    this.camera.updateProjectionMatrix()
+
+    const distanceAfter = distanceBefore * scaleFactor
+
+    const newPosition = this.target
+      .clone()
+      .add(direction.multiplyScalar(-distanceAfter))
+    this.camera.position.copy(newPosition)
+
+    const { z_near, z_far } = calculateNearFarFromFOV(this.lastPerspectiveFov)
+    this.camera.near = z_near
+    this.camera.far = z_far
+
+    throttledUpdateEngineFov({
+      fov: newFov,
+      position: newPosition,
+      quaternion: this.camera.quaternion,
+      zoom: this.camera.zoom,
+      target: this.target,
+    })
+  }
+
+  update = (forceUpdate = false) => {
+    // If there are any changes that need to be applied to the camera, apply them here.
+
+    let didChange = forceUpdate
+    if (this.pendingRotation) {
+      this.rotateCamera(this.pendingRotation.x, this.pendingRotation.y)
+      this.pendingRotation = null // Clear the pending rotation after applying it
+      didChange = true
+    }
+
+    if (this.pendingZoom) {
+      if (this.camera instanceof PerspectiveCamera) {
+        // move camera towards or away from the target
+        const distance = this.camera.position.distanceTo(this.target)
+        const newDistance = distance * this.pendingZoom
+        const direction = this.camera.position
+          .clone()
+          .sub(this.target)
+          .normalize()
+        const newPosition = this.target
+          .clone()
+          .add(direction.multiplyScalar(newDistance))
+        this.camera.position.copy(newPosition)
+
+        this.camera.updateProjectionMatrix()
+        this.pendingZoom = null // Clear the pending zoom after applying it
+      } else {
+        // TODO change ortho zoom
+        this.camera.zoom = this.camera.zoom / this.pendingZoom
+        this.pendingZoom = null
+      }
+      didChange = true
+    }
+
+    if (this.pendingPan) {
+      // move camera left/right and up/down
+      const offset = this.camera.position.clone().sub(this.target)
+      const direction = offset.clone().normalize()
+      const cameraQuaternion = this.camera.quaternion
+      const up = new Vector3(0, 1, 0).applyQuaternion(cameraQuaternion)
+      const right = new Vector3().crossVectors(up, direction)
+      right.multiplyScalar(this.pendingPan.x)
+      up.multiplyScalar(this.pendingPan.y)
+      const newPosition = this.camera.position.clone().add(right).add(up)
+      this.target.add(right)
+      this.target.add(up)
+      this.camera.position.copy(newPosition)
+      this.pendingPan = null
+      didChange = true
+    }
+
+    this.safeLookAtTarget()
+
+    // Update the camera's matrices
+    this.camera.updateMatrixWorld()
+    if (didChange) {
+      this.onCameraChange()
+    }
+
+    // damping would be implemented here in update if we choose to add it.
+  }
+
+  rotateCamera = (deltaX: number, deltaY: number) => {
+    const quat = new Quaternion().setFromUnitVectors(
+      new Vector3(0, 0, 1),
+      new Vector3(0, 1, 0)
+    )
+    const quatInverse = quat.clone().invert()
+
+    const angleX = deltaX * this.rotationSpeed // rotationSpeed is a constant that defines how fast the camera rotates
+    const angleY = deltaY * this.rotationSpeed
+
+    // Convert angles to radians
+    const radianX = MathUtils.degToRad(angleX)
+    const radianY = MathUtils.degToRad(angleY)
+
+    // Get the offset from the camera to the target
+    const offset = new Vector3().subVectors(this.camera.position, this.target)
+
+    // spherical is a y-up paradigm, need to conform to that for now
+    offset.applyQuaternion(quat)
+
+    // Convert offset to spherical coordinates
+    const spherical = new Spherical().setFromVector3(offset)
+
+    // Apply the rotations
+    spherical.theta -= radianX
+    spherical.phi -= radianY
+
+    // Restrict the phi angle to avoid the camera flipping at the poles
+    spherical.phi = Math.max(0.1, Math.min(Math.PI - 0.1, spherical.phi))
+
+    // Convert back to Cartesian coordinates
+    offset.setFromSpherical(spherical)
+
+    // put the offset back into the z-up paradigm
+    offset.applyQuaternion(quatInverse)
+
+    // Update the camera's position
+    this.camera.position.copy(this.target).add(offset)
+
+    // Look at the target
+    this.camera.updateMatrixWorld()
+  }
+
+  safeLookAtTarget(up = new Vector3(0, 0, 1)) {
+    const quaternion = _lookAt(this.camera.position, this.target, up)
+    this.camera.quaternion.copy(quaternion)
+    this.camera.updateMatrixWorld()
+  }
+
+  tweenCamToNegYAxis(
+    // -90 degrees from the x axis puts the camera on the negative y axis
+    targetAngle = -Math.PI / 2,
+    duration = 500
+  ): Promise<void> {
+    // should tween the camera so that it has an xPosition of 0, and forcing it's yPosition to be negative
+    // zPosition should stay the same
+    const xyRadius = Math.sqrt(
+      (this.target.x - this.camera.position.x) ** 2 +
+        (this.target.y - this.camera.position.y) ** 2
+    )
+    const xyAngle = Math.atan2(
+      this.camera.position.y - this.target.y,
+      this.camera.position.x - this.target.x
+    )
+    this._isCamMovingCallback(true, true)
+    return new Promise((resolve) => {
+      new TWEEN.Tween({ angle: xyAngle })
+        .to({ angle: targetAngle }, duration)
+        .onUpdate((obj) => {
+          const x = xyRadius * Math.cos(obj.angle)
+          const y = xyRadius * Math.sin(obj.angle)
+          this.camera.position.set(
+            this.target.x + x,
+            this.target.y + y,
+            this.camera.position.z
+          )
+          this.update()
+          this.onCameraChange()
+        })
+        .onComplete((obj) => {
+          const x = xyRadius * Math.cos(obj.angle)
+          const y = xyRadius * Math.sin(obj.angle)
+          this.camera.position.set(
+            this.target.x + x,
+            this.target.y + y,
+            this.camera.position.z
+          )
+          this.update()
+          this.onCameraChange()
+          this._isCamMovingCallback(false, true)
+
+          // resolve after a couple of frames
+          requestAnimationFrame(() => {
+            requestAnimationFrame(() => resolve())
+          })
+        })
+        .start()
+    })
+  }
+
+  async tweenCameraToQuaternion(
+    targetQuaternion: Quaternion,
+    duration = 500,
+    toOrthographic = true
+  ): Promise<void> {
+    const isVertical = isQuaternionVertical(targetQuaternion)
+    let remainingDuration = duration
+    if (isVertical) {
+      remainingDuration = duration * 0.5
+      const orbitRotationDuration = duration * 0.65
+      let targetAngle = -Math.PI / 2
+      const v = new Vector3(0, 0, 1).applyQuaternion(targetQuaternion)
+      if (v.z < 0) targetAngle = Math.PI / 2
+      await this.tweenCamToNegYAxis(targetAngle, orbitRotationDuration)
+    }
+    await this._tweenCameraToQuaternion(
+      targetQuaternion,
+      remainingDuration,
+      toOrthographic
+    )
+  }
+  _tweenCameraToQuaternion(
+    targetQuaternion: Quaternion,
+    duration = 500,
+    toOrthographic = false
+  ): Promise<void> {
+    return new Promise((resolve) => {
+      const camera = this.camera
+      this._isCamMovingCallback(true, true)
+      const initialQuaternion = camera.quaternion.clone()
+      const isVertical = isQuaternionVertical(targetQuaternion)
+      let tweenEnd = isVertical ? 0.99 : 1
+      const controlsTarget = this.target.clone()
+      const initialDistance = controlsTarget.distanceTo(camera.position.clone())
+
+      const cameraAtTime = (animationProgress: number /* 0 - 1 */) => {
+        const currentQ = tempQuaternion.slerpQuaternions(
+          initialQuaternion,
+          targetQuaternion,
+          animationProgress
+        )
+        if (this.camera instanceof PerspectiveCamera)
+          // changing the camera position back when it's orthographic doesn't do anything
+          // and it messes up animating back to perspective later
+          this.camera.position
+            .set(0, 0, 1)
+            .applyQuaternion(currentQ)
+            .multiplyScalar(initialDistance)
+            .add(controlsTarget)
+
+        this.camera.up.set(0, 1, 0).applyQuaternion(currentQ).normalize()
+        this.camera.quaternion.copy(currentQ)
+        this.target.copy(controlsTarget)
+        // this.controls.update()
+        this.camera.updateProjectionMatrix()
+        this.update()
+        this.onCameraChange()
+      }
+
+      const onComplete = async () => {
+        if (isReducedMotion() && toOrthographic) {
+          cameraAtTime(0.99)
+          this.useOrthographicCamera()
+        } else if (toOrthographic) {
+          await this.animateToOrthographic()
+        }
+        this.enableRotate = false
+        this._isCamMovingCallback(false, true)
+        resolve()
+      }
+
+      if (isReducedMotion()) {
+        onComplete()
+        return
+      }
+
+      new TWEEN.Tween({ t: 0 })
+        .to({ t: tweenEnd }, duration)
+        .easing(TWEEN.Easing.Quadratic.InOut)
+        .onUpdate(({ t }) => cameraAtTime(t))
+        .onComplete(onComplete)
+        .start()
+    })
+  }
+
+  animateToOrthographic = () =>
+    new Promise((resolve) => {
+      this.isFovAnimationInProgress = true
+      let currentFov = this.lastPerspectiveFov
+      this.fovBeforeOrtho = currentFov
+
+      const targetFov = 4
+      const fovAnimationStep = (currentFov - targetFov) / FRAMES_TO_ANIMATE_IN
+      let frameWaitOnFinish = 10
+
+      const animateFovChange = () => {
+        if (this.camera instanceof PerspectiveCamera) {
+          if (this.camera.fov > targetFov) {
+            // Decrease the FOV
+            currentFov = Math.max(currentFov - fovAnimationStep, targetFov)
+            this.camera.updateProjectionMatrix()
+            this.dollyZoom(currentFov)
+            requestAnimationFrame(animateFovChange) // Continue the animation
+          } else if (frameWaitOnFinish > 0) {
+            frameWaitOnFinish--
+            requestAnimationFrame(animateFovChange) // Continue the animation
+          } else {
+            // Once the target FOV is reached, switch to the orthographic camera
+            // Needs to wait a couple frames after the FOV animation is complete
+            this.useOrthographicCamera()
+            this.isFovAnimationInProgress = false
+            resolve(true)
+          }
+        }
+      }
+
+      animateFovChange() // Start the animation
+    })
+  animateToPerspective = () =>
+    new Promise((resolve) => {
+      this.isFovAnimationInProgress = true
+      // Immediately set the camera to perspective with a very low FOV
+      const targetFov = this.fovBeforeOrtho // Target FOV for perspective
+      this.lastPerspectiveFov = 4
+      let currentFov = 4
+      this.camera.updateProjectionMatrix()
+      const fovAnimationStep = (targetFov - currentFov) / FRAMES_TO_ANIMATE_IN
+      this.usePerspectiveCamera()
+
+      const animateFovChange = () => {
+        if (this.camera instanceof OrthographicCamera) return
+        if (this.camera.fov < targetFov) {
+          // Increase the FOV
+          currentFov = Math.min(currentFov + fovAnimationStep, targetFov)
+          // this.camera.fov = currentFov
+          this.camera.updateProjectionMatrix()
+          this.dollyZoom(currentFov)
+          requestAnimationFrame(animateFovChange) // Continue the animation
+        } else {
+          // Set the flag to false as the FOV animation is complete
+          this.isFovAnimationInProgress = false
+          resolve(true)
+        }
+      }
+      animateFovChange() // Start the animation
+    })
+
+  reactCameraPropertiesCallback: (a: ReactCameraProperties) => void = () => {}
+  setReactCameraPropertiesCallback = (
+    cb: (a: ReactCameraProperties) => void
+  ) => {
+    this.reactCameraPropertiesCallback = cb
+  }
+
+  deferReactUpdate = throttle((a: ReactCameraProperties) => {
+    this.reactCameraPropertiesCallback(a)
+  }, 200)
+
+  onCameraChange = () => {
+    const distance = this.target.distanceTo(this.camera.position)
+    if (this.camera.far / 2.1 < distance || this.camera.far / 1.9 > distance) {
+      this.camera.far = distance * 2
+      this.camera.near = distance / 10
+      this.camera.updateProjectionMatrix()
+    }
+
+    throttledUpdateEngineCamera({
+      quaternion: this.camera.quaternion,
+      position: this.camera.position,
+      zoom: this.camera.zoom,
+      isPerspective: this.isPerspective,
+      target: this.target,
+    })
+    this.deferReactUpdate({
+      type: this.isPerspective ? 'perspective' : 'orthographic',
+      [this.isPerspective ? 'fov' : 'zoom']:
+        this.camera instanceof PerspectiveCamera
+          ? this.camera.fov
+          : this.camera.zoom,
+      position: [
+        roundOff(this.camera.position.x, 2),
+        roundOff(this.camera.position.y, 2),
+        roundOff(this.camera.position.z, 2),
+      ],
+      quaternion: [
+        roundOff(this.camera.quaternion.x, 2),
+        roundOff(this.camera.quaternion.y, 2),
+        roundOff(this.camera.quaternion.z, 2),
+        roundOff(this.camera.quaternion.w, 2),
+      ],
+    })
+    Object.values(this._camChangeCallbacks).forEach((cb) => cb())
+  }
+}
+
+// currently duplicated, delete one
+function calculateNearFarFromFOV(fov: number) {
+  const nearFarRatio = (fov - 3) / (45 - 3)
+  // const z_near = 0.1 + nearFarRatio * (5 - 0.1)
+  const z_far = 1000 + nearFarRatio * (100000 - 1000)
+  return { z_near: 0.1, z_far }
+}
+
+// currently duplicated, delete one
+function convertThreeCamValuesToEngineCam({
+  target,
+  position,
+  quaternion,
+  zoom,
+  isPerspective,
+}: ThreeCamValues): {
+  center: Vector3
+  up: Vector3
+  vantage: Vector3
+} {
+  // Something to consider is that the orbit controls have a target,
+  // we're kind of deriving the target/lookAtVector here when it might not be needed
+  // leaving for now since it's working but maybe revisit later
+  const euler = new Euler().setFromQuaternion(quaternion, 'XYZ')
+
+  const lookAtVector = new Vector3(0, 0, -1)
+    .applyEuler(euler)
+    .normalize()
+    .add(position)
+
+  const upVector = new Vector3(0, 1, 0).applyEuler(euler).normalize()
+  if (isPerspective) {
+    return {
+      center: target,
+      up: upVector,
+      vantage: position,
+    }
+  }
+  const fudgeFactor2 = zoom * 0.9979224466814468 - 0.03473692325839295
+  const zoomFactor = (-ZOOM_MAGIC_NUMBER + fudgeFactor2) / zoom
+  const direction = lookAtVector.clone().sub(position).normalize()
+  const newVantage = position.clone().add(direction.multiplyScalar(zoomFactor))
+  return {
+    center: lookAtVector,
+    up: upVector,
+    vantage: newVantage,
+  }
+}
+
+// Pure function helpers
+
+function _lookAt(position: Vector3, target: Vector3, up: Vector3): Quaternion {
+  // Direction from position to target, normalized.
+  let direction = new Vector3().subVectors(target, position).normalize()
+
+  // Calculate a new "effective" up vector that is orthogonal to the direction.
+  // This step ensures that the up vector does not affect the direction the camera is looking.
+  let right = new Vector3().crossVectors(direction, up).normalize()
+  let orthogonalUp = new Vector3().crossVectors(right, direction).normalize()
+
+  // Create a lookAt matrix using the position, and the recalculated orthogonal up vector.
+  let lookAtMatrix = new Matrix4()
+  lookAtMatrix.lookAt(position, target, orthogonalUp)
+
+  // Create a quaternion from the lookAt matrix.
+  let quaternion = new Quaternion().setFromRotationMatrix(lookAtMatrix)
+
+  return quaternion
+}

src/clientSideScene/ClientSideSceneComp.tsx

@@ -0,0 +1,250 @@
+import { useRef, useEffect, useState } from 'react'
+import { useModelingContext } from 'hooks/useModelingContext'
+
+import { cameraMouseDragGuards } from 'lib/cameraControls'
+import { useGlobalStateContext } from 'hooks/useGlobalStateContext'
+import { useStore } from 'useStore'
+import { DEBUG_SHOW_BOTH_SCENES, sceneInfra } from './sceneInfra'
+import { ReactCameraProperties } from './CameraControls'
+import { throttle } from 'lib/utils'
+
+function useShouldHideScene(): { hideClient: boolean; hideServer: boolean } {
+  const [isCamMoving, setIsCamMoving] = useState(false)
+  const [isTween, setIsTween] = useState(false)
+
+  const { state } = useModelingContext()
+
+  useEffect(() => {
+    sceneInfra.camControls.setIsCamMovingCallback((isMoving, isTween) => {
+      setIsCamMoving(isMoving)
+      setIsTween(isTween)
+    })
+  }, [])
+
+  if (DEBUG_SHOW_BOTH_SCENES || !isCamMoving)
+    return { hideClient: false, hideServer: false }
+  let hideServer = state.matches('Sketch')
+  if (isTween) {
+    hideServer = false
+  }
+
+  return { hideClient: !hideServer, hideServer }
+}
+
+export const ClientSideScene = ({
+  cameraControls,
+}: {
+  cameraControls: ReturnType<
+    typeof useGlobalStateContext
+  >['settings']['context']['cameraControls']
+}) => {
+  const canvasRef = useRef<HTMLDivElement>(null)
+  const { state, send } = useModelingContext()
+  const { hideClient, hideServer } = useShouldHideScene()
+  const { setHighlightRange } = useStore((s) => ({
+    setHighlightRange: s.setHighlightRange,
+    highlightRange: s.highlightRange,
+  }))
+
+  // Listen for changes to the camera controls setting
+  // and update the client-side scene's controls accordingly.
+  useEffect(() => {
+    sceneInfra.camControls.interactionGuards =
+      cameraMouseDragGuards[cameraControls]
+  }, [cameraControls])
+  useEffect(() => {
+    sceneInfra.updateOtherSelectionColors(
+      state?.context?.selectionRanges?.otherSelections || []
+    )
+  }, [state?.context?.selectionRanges?.otherSelections])
+
+  useEffect(() => {
+    if (!canvasRef.current) return
+    const canvas = canvasRef.current
+    canvas.appendChild(sceneInfra.renderer.domElement)
+    sceneInfra.animate()
+    sceneInfra.setHighlightCallback(setHighlightRange)
+    canvas.addEventListener('mousemove', sceneInfra.onMouseMove, false)
+    canvas.addEventListener('mousedown', sceneInfra.onMouseDown, false)
+    canvas.addEventListener('mouseup', sceneInfra.onMouseUp, false)
+    sceneInfra.setSend(send)
+    return () => {
+      canvas?.removeEventListener('mousemove', sceneInfra.onMouseMove)
+      canvas?.removeEventListener('mousedown', sceneInfra.onMouseDown)
+      canvas?.removeEventListener('mouseup', sceneInfra.onMouseUp)
+    }
+  }, [])
+
+  return (
+    <div
+      ref={canvasRef}
+      className={`absolute inset-0 h-full w-full transition-all duration-300 ${
+        hideClient ? 'opacity-0' : 'opacity-100'
+      } ${hideServer ? 'bg-black' : ''} ${
+        !hideClient && !hideServer && state.matches('Sketch')
+          ? 'bg-black/80'
+          : ''
+      }`}
+    ></div>
+  )
+}
+
+const throttled = throttle((a: ReactCameraProperties) => {
+  if (a.type === 'perspective' && a.fov) {
+    sceneInfra.camControls.dollyZoom(a.fov)
+  }
+}, 1000 / 15)
+
+export const CamDebugSettings = () => {
+  const [camSettings, setCamSettings] = useState<ReactCameraProperties>({
+    type: 'perspective',
+    fov: 12,
+    position: [0, 0, 0],
+    quaternion: [0, 0, 0, 1],
+  })
+  const [fov, setFov] = useState(12)
+
+  useEffect(() => {
+    sceneInfra.camControls.setReactCameraPropertiesCallback(setCamSettings)
+  }, [sceneInfra])
+  useEffect(() => {
+    if (camSettings.type === 'perspective' && camSettings.fov) {
+      setFov(camSettings.fov)
+    }
+  }, [(camSettings as any)?.fov])
+
+  return (
+    <div>
+      <h3>cam settings</h3>
+      perspective cam
+      <input
+        type="checkbox"
+        checked={camSettings.type === 'perspective'}
+        onChange={(e) => {
+          if (camSettings.type === 'perspective') {
+            sceneInfra.camControls.useOrthographicCamera()
+          } else {
+            sceneInfra.camControls.usePerspectiveCamera()
+          }
+        }}
+      />
+      {camSettings.type === 'perspective' && (
+        <input
+          type="range"
+          min="4"
+          max="90"
+          step={0.5}
+          value={fov}
+          onChange={(e) => {
+            setFov(parseFloat(e.target.value))
+
+            throttled({
+              ...camSettings,
+              fov: parseFloat(e.target.value),
+            })
+          }}
+          className="w-full cursor-pointer pointer-events-auto"
+        />
+      )}
+      {camSettings.type === 'perspective' && (
+        <div>
+          <span>fov</span>
+          <input
+            type="number"
+            value={camSettings.fov}
+            className="text-black w-16"
+            onChange={(e) => {
+              sceneInfra.camControls.setCam({
+                ...camSettings,
+                fov: parseFloat(e.target.value),
+              })
+            }}
+          />
+        </div>
+      )}
+      {camSettings.type === 'orthographic' && (
+        <>
+          <div>
+            <span>fov</span>
+            <input
+              type="number"
+              value={camSettings.zoom}
+              className="text-black w-16"
+              onChange={(e) => {
+                sceneInfra.camControls.setCam({
+                  ...camSettings,
+                  zoom: parseFloat(e.target.value),
+                })
+              }}
+            />
+          </div>
+        </>
+      )}
+      <div>
+        Position
+        <ul className="flex">
+          <li>
+            <span className="pl-2 pr-1">x:</span>
+            <input
+              type="number"
+              step={5}
+              data-testid="cam-x-position"
+              value={camSettings.position[0]}
+              className="text-black w-16"
+              onChange={(e) => {
+                sceneInfra.camControls.setCam({
+                  ...camSettings,
+                  position: [
+                    parseFloat(e.target.value),
+                    camSettings.position[1],
+                    camSettings.position[2],
+                  ],
+                })
+              }}
+            />
+          </li>
+          <li>
+            <span className="pl-2 pr-1">y:</span>
+            <input
+              type="number"
+              step={5}
+              data-testid="cam-y-position"
+              value={camSettings.position[1]}
+              className="text-black w-16"
+              onChange={(e) => {
+                sceneInfra.camControls.setCam({
+                  ...camSettings,
+                  position: [
+                    camSettings.position[0],
+                    parseFloat(e.target.value),
+                    camSettings.position[2],
+                  ],
+                })
+              }}
+            />
+          </li>
+          <li>
+            <span className="pl-2 pr-1">z:</span>
+            <input
+              type="number"
+              step={5}
+              data-testid="cam-z-position"
+              value={camSettings.position[2]}
+              className="text-black w-16"
+              onChange={(e) => {
+                sceneInfra.camControls.setCam({
+                  ...camSettings,
+                  position: [
+                    camSettings.position[0],
+                    camSettings.position[1],
+                    parseFloat(e.target.value),
+                  ],
+                })
+              }}
+            />
+          </li>
+        </ul>
+      </div>
+    </div>
+  )
+}

src/clientSideScene/helpers.test.ts

@@ -0,0 +1,28 @@
+import { Quaternion } from 'three'
+import { isQuaternionVertical } from './helpers'
+
+describe('isQuaternionVertical', () => {
+  it('should identify vertical quaternions', () => {
+    const verticalQuaternions = [
+      new Quaternion(1, 0, 0, 0).normalize(), // bottom
+      new Quaternion(-0.7, 0.7, 0, 0).normalize(), // bottom 2
+      new Quaternion(0, 1, 0, 0).normalize(), // bottom 3
+      new Quaternion(0, 0, 0, 1).normalize(), // look from top
+    ]
+    verticalQuaternions.forEach((quaternion) => {
+      expect(isQuaternionVertical(quaternion)).toBe(true)
+    })
+  })
+
+  it('should identify non-vertical quaternions', () => {
+    const nonVerticalQuaternions = [
+      new Quaternion(0.7, 0, 0, 0.7).normalize(), // front
+      new Quaternion(0, 0.7, 0.7, 0).normalize(), // back
+      new Quaternion(-0.5, 0.5, 0.5, -0.5).normalize(), // left side
+      new Quaternion(0.5, 0.5, 0.5, 0.5).normalize(), // right side
+    ]
+    nonVerticalQuaternions.forEach((quaternion) => {
+      expect(isQuaternionVertical(quaternion)).toBe(false)
+    })
+  })
+})

src/clientSideScene/helpers.ts

@@ -0,0 +1,42 @@
+import { compareVec2Epsilon2 } from 'lang/std/sketch'
+import {
+  GridHelper,
+  LineBasicMaterial,
+  OrthographicCamera,
+  PerspectiveCamera,
+  Group,
+  Mesh,
+  Quaternion,
+  Vector3,
+} from 'three'
+
+export function createGridHelper({
+  size,
+  divisions,
+}: {
+  size: number
+  divisions: number
+}) {
+  const gridHelperMaterial = new LineBasicMaterial({
+    color: 0xaaaaaa,
+    transparent: true,
+    opacity: 0.5,
+    depthTest: false,
+  })
+  const gridHelper = new GridHelper(size, divisions, 0x0000ff, 0xffffff)
+  gridHelper.material = gridHelperMaterial
+  gridHelper.rotation.x = Math.PI / 2
+  return gridHelper
+}
+
+export const orthoScale = (cam: OrthographicCamera | PerspectiveCamera) =>
+  0.55 / cam.zoom
+
+export const perspScale = (cam: PerspectiveCamera, group: Group | Mesh) =>
+  (group.position.distanceTo(cam.position) * cam.fov) / 4000
+
+export function isQuaternionVertical(q: Quaternion) {
+  const v = new Vector3(0, 0, 1).applyQuaternion(q)
+  // no x or y components means it's vertical
+  return compareVec2Epsilon2([v.x, v.y], [0, 0])
+}

src/clientSideScene/sceneInfra.ts

@@ -0,0 +1,592 @@
+import {
+  AmbientLight,
+  Color,
+  GridHelper,
+  LineBasicMaterial,
+  OrthographicCamera,
+  PerspectiveCamera,
+  Scene,
+  Vector3,
+  WebGLRenderer,
+  Raycaster,
+  Vector2,
+  Group,
+  PlaneGeometry,
+  MeshBasicMaterial,
+  Mesh,
+  DoubleSide,
+  Intersection,
+  Object3D,
+  Object3DEventMap,
+  BoxGeometry,
+} from 'three'
+import { compareVec2Epsilon2 } from 'lang/std/sketch'
+import { useModelingContext } from 'hooks/useModelingContext'
+import * as TWEEN from '@tweenjs/tween.js'
+import { SourceRange } from 'lang/wasm'
+import { Axis } from 'lib/selections'
+import { BaseUnit, SETTINGS_PERSIST_KEY } from 'machines/settingsMachine'
+import { CameraControls } from './CameraControls'
+
+type SendType = ReturnType<typeof useModelingContext>['send']
+
+// 63.5 is definitely a bit of a magic number, play with it until it looked right
+// if it were 64, that would feel like it's something in the engine where a random
+// power of 2 is used, but it's the 0.5 seems to make things look much more correct
+export const ZOOM_MAGIC_NUMBER = 63.5
+
+export const INTERSECTION_PLANE_LAYER = 1
+export const SKETCH_LAYER = 2
+export const DEBUG_SHOW_INTERSECTION_PLANE = false
+export const DEBUG_SHOW_BOTH_SCENES = false
+
+export const RAYCASTABLE_PLANE = 'raycastable-plane'
+export const DEFAULT_PLANES = 'default-planes'
+
+export const X_AXIS = 'xAxis'
+export const Y_AXIS = 'yAxis'
+export const AXIS_GROUP = 'axisGroup'
+export const SKETCH_GROUP_SEGMENTS = 'sketch-group-segments'
+export const ARROWHEAD = 'arrowhead'
+
+interface BaseCallbackArgs2 {
+  object: any
+  event: any
+}
+interface BaseCallbackArgs {
+  event: any
+}
+interface OnDragCallbackArgs extends BaseCallbackArgs {
+  object: any
+  intersection2d: Vector2
+  intersectPoint: Vector3
+  intersection: Intersection<Object3D<Object3DEventMap>>
+}
+interface OnClickCallbackArgs extends BaseCallbackArgs {
+  intersection2d?: Vector2
+  intersectPoint: Vector3
+  intersection: Intersection<Object3D<Object3DEventMap>>
+  object?: any
+}
+
+interface onMoveCallbackArgs {
+  event: any
+  intersection2d: Vector2
+  intersectPoint: Vector3
+  intersection: Intersection<Object3D<Object3DEventMap>>
+}
+
+// This singleton class is responsible for all of the under the hood setup for the client side scene.
+// That is the cameras and switching between them, raycasters for click mouse events and their abstractions (onClick etc), setting up controls.
+// Anything that added the the scene for the user to interact with is probably in SceneEntities.ts
+class SceneInfra {
+  static instance: SceneInfra
+  scene: Scene
+  renderer: WebGLRenderer
+  camControls: CameraControls
+  isPerspective = true
+  fov = 45
+  fovBeforeAnimate = 45
+  isFovAnimationInProgress = false
+  onDragStartCallback: (arg: OnDragCallbackArgs) => void = () => {}
+  onDragEndCallback: (arg: OnDragCallbackArgs) => void = () => {}
+  onDragCallback: (arg: OnDragCallbackArgs) => void = () => {}
+  onMoveCallback: (arg: onMoveCallbackArgs) => void = () => {}
+  onClickCallback: (arg?: OnClickCallbackArgs) => void = () => {}
+  onMouseEnter: (arg: BaseCallbackArgs2) => void = () => {}
+  onMouseLeave: (arg: BaseCallbackArgs2) => void = () => {}
+  setCallbacks = (callbacks: {
+    onDragStart?: (arg: OnDragCallbackArgs) => void
+    onDragEnd?: (arg: OnDragCallbackArgs) => void
+    onDrag?: (arg: OnDragCallbackArgs) => void
+    onMove?: (arg: onMoveCallbackArgs) => void
+    onClick?: (arg?: OnClickCallbackArgs) => void
+    onMouseEnter?: (arg: BaseCallbackArgs2) => void
+    onMouseLeave?: (arg: BaseCallbackArgs2) => void
+  }) => {
+    console.trace('setting callbacks')
+    this.onDragStartCallback = callbacks.onDragStart || this.onDragStartCallback
+    this.onDragEndCallback = callbacks.onDragEnd || this.onDragEndCallback
+    this.onDragCallback = callbacks.onDrag || this.onDragCallback
+    this.onMoveCallback = callbacks.onMove || this.onMoveCallback
+    this.onClickCallback = callbacks.onClick || this.onClickCallback
+    this.onMouseEnter = callbacks.onMouseEnter || this.onMouseEnter
+    this.onMouseLeave = callbacks.onMouseLeave || this.onMouseLeave
+    this.selected = null // following selections between callbacks being set is too tricky
+  }
+  resetMouseListeners = () => {
+    sceneInfra.setCallbacks({
+      onDragStart: () => {},
+      onDragEnd: () => {},
+      onDrag: () => {},
+      onMove: () => {},
+      onClick: () => {},
+      onMouseEnter: () => {},
+      onMouseLeave: () => {},
+    })
+  }
+  highlightCallback: (a: SourceRange) => void = () => {}
+  setHighlightCallback(cb: (a: SourceRange) => void) {
+    this.highlightCallback = cb
+  }
+
+  modelingSend: SendType = (() => {}) as any
+  setSend(send: SendType) {
+    this.modelingSend = send
+  }
+
+  hoveredObject: null | any = null
+  raycaster = new Raycaster()
+  planeRaycaster = new Raycaster()
+  currentMouseVector = new Vector2()
+  selected: {
+    mouseDownVector: Vector2
+    object: any
+    hasBeenDragged: boolean
+  } | null = null
+  selectedObject: null | any = null
+  mouseDownVector: null | Vector2 = null
+
+  constructor() {
+    // SCENE
+    this.scene = new Scene()
+    this.scene.background = new Color(0x000000)
+    this.scene.background = null
+
+    // RENDERER
+    this.renderer = new WebGLRenderer({ antialias: true, alpha: true }) // Enable transparency
+    this.renderer.setSize(window.innerWidth, window.innerHeight)
+    this.renderer.setClearColor(0x000000, 0) // Set clear color to black with 0 alpha (fully transparent)
+    window.addEventListener('resize', this.onWindowResize)
+
+    // CAMERA
+    const camHeightDistanceRatio = 0.5
+    const baseUnit: BaseUnit =
+      JSON.parse(localStorage?.getItem(SETTINGS_PERSIST_KEY) || ('{}' as any))
+        .baseUnit || 'mm'
+    const baseRadius = 5.6
+    const length = baseUnitTomm(baseUnit) * baseRadius
+    const ang = Math.atan(camHeightDistanceRatio)
+    const x = Math.cos(ang) * length
+    const y = Math.sin(ang) * length
+
+    this.camControls = new CameraControls(false, this.renderer.domElement)
+    this.camControls.subscribeToCamChange(() => this.onCameraChange())
+    this.camControls.camera.layers.enable(SKETCH_LAYER)
+    this.camControls.camera.position.set(0, -x, y)
+    if (DEBUG_SHOW_INTERSECTION_PLANE)
+      this.camControls.camera.layers.enable(INTERSECTION_PLANE_LAYER)
+
+    // RAYCASTERS
+    this.raycaster.layers.enable(SKETCH_LAYER)
+    this.raycaster.layers.disable(0)
+    this.planeRaycaster.layers.enable(INTERSECTION_PLANE_LAYER)
+
+    // GRID
+    const size = 100
+    const divisions = 10
+    const gridHelperMaterial = new LineBasicMaterial({
+      color: 0x0000ff,
+      transparent: true,
+      opacity: 0.5,
+    })
+
+    const gridHelper = new GridHelper(size, divisions, 0x0000ff, 0xffffff)
+    gridHelper.material = gridHelperMaterial
+    gridHelper.rotation.x = Math.PI / 2
+    // this.scene.add(gridHelper) // more of a debug thing, but maybe useful
+
+    const light = new AmbientLight(0x505050) // soft white light
+    this.scene.add(light)
+
+    SceneInfra.instance = this
+  }
+
+  onCameraChange = () => {
+    const scale = getSceneScale(
+      this.camControls.camera,
+      this.camControls.target
+    )
+    const planesGroup = this.scene.getObjectByName(DEFAULT_PLANES)
+    const axisGroup = this.scene
+      .getObjectByName(AXIS_GROUP)
+      ?.getObjectByName('gridHelper')
+    planesGroup && planesGroup.scale.set(scale, scale, scale)
+    axisGroup?.name === 'gridHelper' && axisGroup.scale.set(scale, scale, scale)
+  }
+
+  onWindowResize = () => {
+    this.renderer.setSize(window.innerWidth, window.innerHeight)
+  }
+
+  animate = () => {
+    requestAnimationFrame(this.animate)
+    TWEEN.update() // This will update all tweens during the animation loop
+    if (!this.isFovAnimationInProgress) {
+      // console.log('animation frame', this.cameraControls.camera)
+      this.camControls.update()
+      this.renderer.render(this.scene, this.camControls.camera)
+    }
+  }
+
+  dispose = () => {
+    // Dispose of scene resources, renderer, and controls
+    this.renderer.dispose()
+    window.removeEventListener('resize', this.onWindowResize)
+    // Dispose of any other resources like geometries, materials, textures
+  }
+  getPlaneIntersectPoint = (): {
+    intersection2d?: Vector2
+    intersectPoint: Vector3
+    intersection: Intersection<Object3D<Object3DEventMap>>
+  } | null => {
+    this.planeRaycaster.setFromCamera(
+      this.currentMouseVector,
+      sceneInfra.camControls.camera
+    )
+    const planeIntersects = this.planeRaycaster.intersectObjects(
+      this.scene.children,
+      true
+    )
+    if (
+      planeIntersects.length > 0 &&
+      planeIntersects[0].object.userData.type !== RAYCASTABLE_PLANE
+    ) {
+      const intersect = planeIntersects[0]
+      return {
+        intersectPoint: intersect.point,
+        intersection: intersect,
+      }
+    }
+    if (
+      !(
+        planeIntersects.length > 0 &&
+        planeIntersects[0].object.userData.type === RAYCASTABLE_PLANE
+      )
+    )
+      return null
+    const planePosition = planeIntersects[0].object.position
+    const inversePlaneQuaternion = planeIntersects[0].object.quaternion
+      .clone()
+      .invert()
+    const intersectPoint = planeIntersects[0].point
+    let transformedPoint = intersectPoint.clone()
+    if (transformedPoint) {
+      transformedPoint.applyQuaternion(inversePlaneQuaternion)
+      transformedPoint?.sub(
+        new Vector3(...planePosition).applyQuaternion(inversePlaneQuaternion)
+      )
+    }
+
+    return {
+      intersection2d: new Vector2(transformedPoint.x, transformedPoint.y), // z should be 0
+      intersectPoint,
+      intersection: planeIntersects[0],
+    }
+  }
+  onMouseMove = (event: MouseEvent) => {
+    this.currentMouseVector.x = (event.clientX / window.innerWidth) * 2 - 1
+    this.currentMouseVector.y = -(event.clientY / window.innerHeight) * 2 + 1
+
+    const planeIntersectPoint = this.getPlaneIntersectPoint()
+
+    if (this.selected) {
+      const hasBeenDragged = !compareVec2Epsilon2(
+        [this.currentMouseVector.x, this.currentMouseVector.y],
+        [this.selected.mouseDownVector.x, this.selected.mouseDownVector.y],
+        0.02
+      )
+      if (!this.selected.hasBeenDragged && hasBeenDragged) {
+        this.selected.hasBeenDragged = true
+        // this is where we could fire a onDragStart event
+        // console.log('onDragStart', this.selected)
+      }
+      if (
+        hasBeenDragged &&
+        planeIntersectPoint &&
+        planeIntersectPoint.intersection2d
+      ) {
+        // // console.log('onDrag', this.selected)
+
+        this.onDragCallback({
+          object: this.selected.object,
+          event,
+          intersection2d: planeIntersectPoint.intersection2d,
+          ...planeIntersectPoint,
+        })
+      }
+    } else if (planeIntersectPoint && planeIntersectPoint.intersection2d) {
+      this.onMoveCallback({
+        event,
+        intersection2d: planeIntersectPoint.intersection2d,
+        ...planeIntersectPoint,
+      })
+    }
+
+    const intersect = this.raycastRing()
+
+    if (intersect) {
+      const firstIntersectObject = intersect.object
+      if (this.hoveredObject !== firstIntersectObject) {
+        if (this.hoveredObject) {
+          this.onMouseLeave({
+            object: this.hoveredObject,
+            event,
+          })
+        }
+        this.hoveredObject = firstIntersectObject
+        this.onMouseEnter({
+          object: this.hoveredObject,
+          event,
+        })
+      }
+    } else {
+      if (this.hoveredObject) {
+        this.onMouseLeave({
+          object: this.hoveredObject,
+          event,
+        })
+        this.hoveredObject = null
+      }
+    }
+  }
+
+  raycastRing = (
+    pixelRadius = 8,
+    rayRingCount = 32
+  ): Intersection<Object3D<Object3DEventMap>> | undefined => {
+    const mouseDownVector = this.currentMouseVector.clone()
+    let closestIntersection:
+      | Intersection<Object3D<Object3DEventMap>>
+      | undefined = undefined
+    let closestDistance = Infinity
+
+    const updateClosestIntersection = (
+      intersections: Intersection<Object3D<Object3DEventMap>>[]
+    ) => {
+      let intersection = null
+      for (let i = 0; i < intersections.length; i++) {
+        if (intersections[i].object.type !== 'GridHelper') {
+          intersection = intersections[i]
+          break
+        }
+      }
+      if (!intersection) return
+
+      if (intersection.distance < closestDistance) {
+        closestDistance = intersection.distance
+        closestIntersection = intersection
+      }
+    }
+
+    // Check the center point
+    this.raycaster.setFromCamera(mouseDownVector, this.camControls.camera)
+    updateClosestIntersection(
+      this.raycaster.intersectObjects(this.scene.children, true)
+    )
+
+    // Check the ring points
+    for (let i = 0; i < rayRingCount; i++) {
+      const angle = (i / rayRingCount) * Math.PI * 2
+
+      const offsetX = ((pixelRadius * Math.cos(angle)) / window.innerWidth) * 2
+      const offsetY = ((pixelRadius * Math.sin(angle)) / window.innerHeight) * 2
+      const ringVector = new Vector2(
+        mouseDownVector.x + offsetX,
+        mouseDownVector.y - offsetY
+      )
+      this.raycaster.setFromCamera(ringVector, this.camControls.camera)
+      updateClosestIntersection(
+        this.raycaster.intersectObjects(this.scene.children, true)
+      )
+    }
+    return closestIntersection
+  }
+
+  onMouseDown = (event: MouseEvent) => {
+    this.currentMouseVector.x = (event.clientX / window.innerWidth) * 2 - 1
+    this.currentMouseVector.y = -(event.clientY / window.innerHeight) * 2 + 1
+
+    const mouseDownVector = this.currentMouseVector.clone()
+    const intersect = this.raycastRing()
+
+    if (intersect) {
+      const intersectParent = intersect?.object?.parent as Group
+      this.selected = intersectParent.isGroup
+        ? {
+            mouseDownVector,
+            object: intersect?.object,
+            hasBeenDragged: false,
+          }
+        : null
+    }
+  }
+
+  onMouseUp = (event: MouseEvent) => {
+    this.currentMouseVector.x = (event.clientX / window.innerWidth) * 2 - 1
+    this.currentMouseVector.y = -(event.clientY / window.innerHeight) * 2 + 1
+    const planeIntersectPoint = this.getPlaneIntersectPoint()
+
+    if (this.selected) {
+      if (this.selected.hasBeenDragged) {
+        // TODO do the types properly here
+        this.onDragEndCallback({
+          object: this.selected.object,
+          event,
+          intersection2d: planeIntersectPoint?.intersection2d,
+          ...planeIntersectPoint,
+        } as any)
+      } else if (planeIntersectPoint) {
+        // fire onClick event as there was no drags
+        this.onClickCallback({
+          object: this.selected?.object,
+          event,
+          ...planeIntersectPoint,
+        })
+      } else {
+        this.onClickCallback()
+      }
+      // Clear the selected state whether it was dragged or not
+      this.selected = null
+    } else if (planeIntersectPoint) {
+      this.onClickCallback({
+        event,
+        ...planeIntersectPoint,
+      })
+    } else {
+      this.onClickCallback()
+    }
+  }
+  showDefaultPlanes() {
+    const addPlane = (
+      rotation: { x: number; y: number; z: number }, //
+      type: DefaultPlane
+    ): Mesh => {
+      const planeGeometry = new PlaneGeometry(100, 100)
+      const planeMaterial = new MeshBasicMaterial({
+        color: defaultPlaneColor(type),
+        transparent: true,
+        opacity: 0.0,
+        side: DoubleSide,
+        depthTest: false, // needed to avoid transparency issues
+      })
+      const plane = new Mesh(planeGeometry, planeMaterial)
+      plane.rotation.x = rotation.x
+      plane.rotation.y = rotation.y
+      plane.rotation.z = rotation.z
+      plane.userData.type = type
+      plane.name = type
+      return plane
+    }
+    const planes = [
+      addPlane({ x: 0, y: Math.PI / 2, z: 0 }, YZ_PLANE),
+      addPlane({ x: 0, y: 0, z: 0 }, XY_PLANE),
+      addPlane({ x: -Math.PI / 2, y: 0, z: 0 }, XZ_PLANE),
+    ]
+    const planesGroup = new Group()
+    planesGroup.userData.type = DEFAULT_PLANES
+    planesGroup.name = DEFAULT_PLANES
+    planesGroup.add(...planes)
+    planesGroup.traverse((child) => {
+      if (child instanceof Mesh) {
+        child.layers.enable(SKETCH_LAYER)
+      }
+    })
+    planesGroup.layers.enable(SKETCH_LAYER)
+    const sceneScale = getSceneScale(
+      this.camControls.camera,
+      this.camControls.target
+    )
+    planesGroup.scale.set(sceneScale, sceneScale, sceneScale)
+    this.scene.add(planesGroup)
+  }
+  removeDefaultPlanes() {
+    const planesGroup = this.scene.children.find(
+      ({ userData }) => userData.type === DEFAULT_PLANES
+    )
+    if (planesGroup) this.scene.remove(planesGroup)
+  }
+  updateOtherSelectionColors = (otherSelections: Axis[]) => {
+    const axisGroup = sceneInfra.scene.children.find(
+      ({ userData }) => userData?.type === AXIS_GROUP
+    )
+    const axisMap: { [key: string]: Axis } = {
+      [X_AXIS]: 'x-axis',
+      [Y_AXIS]: 'y-axis',
+    }
+    axisGroup?.children.forEach((_mesh) => {
+      const mesh = _mesh as Mesh
+      const mat = mesh.material as MeshBasicMaterial
+      if (otherSelections.includes(axisMap[mesh.userData?.type])) {
+        mat.color.set(mesh?.userData?.baseColor)
+        mat.color.offsetHSL(0, 0, 0.2)
+        mesh.userData.isSelected = true
+      } else {
+        mat.color.set(mesh?.userData?.baseColor)
+        mesh.userData.isSelected = false
+      }
+    })
+  }
+}
+
+export const sceneInfra = new SceneInfra()
+
+export function getSceneScale(
+  camera: PerspectiveCamera | OrthographicCamera,
+  target: Vector3
+): number {
+  const distance =
+    camera instanceof PerspectiveCamera
+      ? camera.position.distanceTo(target)
+      : 63.7942123 / camera.zoom
+
+  if (distance <= 20) return 0.1
+  else if (distance > 20 && distance <= 200) return 1
+  else if (distance > 200 && distance <= 2000) return 10
+  else if (distance > 2000 && distance <= 20000) return 100
+  else if (distance > 20000) return 1000
+
+  return 1
+}
+
+function baseUnitTomm(baseUnit: BaseUnit) {
+  switch (baseUnit) {
+    case 'mm':
+      return 1
+    case 'cm':
+      return 10
+    case 'm':
+      return 1000
+    case 'in':
+      return 25.4
+    case 'ft':
+      return 304.8
+    case 'yd':
+      return 914.4
+  }
+}
+
+export type DefaultPlane =
+  | 'xy-default-plane'
+  | 'xz-default-plane'
+  | 'yz-default-plane'
+
+export const XY_PLANE: DefaultPlane = 'xy-default-plane'
+export const XZ_PLANE: DefaultPlane = 'xz-default-plane'
+export const YZ_PLANE: DefaultPlane = 'yz-default-plane'
+
+export function defaultPlaneColor(
+  plane: DefaultPlane,
+  lowCh = 0.1,
+  highCh = 0.7
+): Color {
+  switch (plane) {
+    case XY_PLANE:
+      return new Color(highCh, lowCh, lowCh)
+    case XZ_PLANE:
+      return new Color(lowCh, lowCh, highCh)
+    case YZ_PLANE:
+      return new Color(lowCh, highCh, lowCh)
+  }
+  return new Color(lowCh, lowCh, lowCh)
+}

src/clientSideScene/segments.ts

@@ -0,0 +1,360 @@
+import { Coords2d } from 'lang/std/sketch'
+import {
+  BufferGeometry,
+  CatmullRomCurve3,
+  ConeGeometry,
+  CurvePath,
+  EllipseCurve,
+  ExtrudeGeometry,
+  Group,
+  LineCurve3,
+  Mesh,
+  MeshBasicMaterial,
+  NormalBufferAttributes,
+  Shape,
+  SphereGeometry,
+  Vector2,
+  Vector3,
+} from 'three'
+import { mergeGeometries } from 'three/examples/jsm/utils/BufferGeometryUtils.js'
+import { PathToNode, SketchGroup, getTangentialArcToInfo } from 'lang/wasm'
+import {
+  STRAIGHT_SEGMENT,
+  STRAIGHT_SEGMENT_BODY,
+  STRAIGHT_SEGMENT_DASH,
+  TANGENTIAL_ARC_TO_SEGMENT,
+  TANGENTIAL_ARC_TO_SEGMENT_BODY,
+  TANGENTIAL_ARC_TO__SEGMENT_DASH,
+} from './sceneEntities'
+import { getTangentPointFromPreviousArc } from 'lib/utils2d'
+import { ARROWHEAD } from './sceneInfra'
+
+export function straightSegment({
+  from,
+  to,
+  id,
+  pathToNode,
+  isDraftSegment,
+  scale = 1,
+}: {
+  from: Coords2d
+  to: Coords2d
+  id: string
+  pathToNode: PathToNode
+  isDraftSegment?: boolean
+  scale?: number
+}): Group {
+  const group = new Group()
+
+  const shape = new Shape()
+  shape.moveTo(0, -0.08 * scale)
+  shape.lineTo(0, 0.08 * scale) // The width of the line
+
+  let geometry
+  if (isDraftSegment) {
+    geometry = dashedStraight(from, to, shape, scale)
+  } else {
+    const line = new LineCurve3(
+      new Vector3(from[0], from[1], 0),
+      new Vector3(to[0], to[1], 0)
+    )
+
+    geometry = new ExtrudeGeometry(shape, {
+      steps: 2,
+      bevelEnabled: false,
+      extrudePath: line,
+    })
+  }
+
+  const body = new MeshBasicMaterial({ color: 0xffffff })
+  const mesh = new Mesh(geometry, body)
+  mesh.userData.type = isDraftSegment
+    ? STRAIGHT_SEGMENT_DASH
+    : STRAIGHT_SEGMENT_BODY
+  mesh.name = STRAIGHT_SEGMENT_BODY
+
+  group.userData = {
+    type: STRAIGHT_SEGMENT,
+    id,
+    from,
+    to,
+    pathToNode,
+    isSelected: false,
+  }
+  group.name = STRAIGHT_SEGMENT
+
+  const arrowGroup = createArrowhead(scale)
+  arrowGroup.position.set(to[0], to[1], 0)
+  const dir = new Vector3()
+    .subVectors(new Vector3(to[0], to[1], 0), new Vector3(from[0], from[1], 0))
+    .normalize()
+  arrowGroup.quaternion.setFromUnitVectors(new Vector3(0, 1, 0), dir)
+
+  group.add(mesh, arrowGroup)
+
+  return group
+}
+
+function createArrowhead(scale = 1): Group {
+  const arrowMaterial = new MeshBasicMaterial({ color: 0xffffff })
+  const arrowheadMesh = new Mesh(new ConeGeometry(0.31, 1.5, 12), arrowMaterial)
+  arrowheadMesh.position.set(0, -0.6, 0)
+  const sphereMesh = new Mesh(new SphereGeometry(0.27, 12, 12), arrowMaterial)
+
+  const arrowGroup = new Group()
+  arrowGroup.userData.type = ARROWHEAD
+  arrowGroup.name = ARROWHEAD
+  arrowGroup.add(arrowheadMesh, sphereMesh)
+  arrowGroup.lookAt(new Vector3(0, 1, 0))
+  arrowGroup.scale.set(scale, scale, scale)
+  return arrowGroup
+}
+
+export function tangentialArcToSegment({
+  prevSegment,
+  from,
+  to,
+  id,
+  pathToNode,
+  isDraftSegment,
+  scale = 1,
+}: {
+  prevSegment: SketchGroup['value'][number]
+  from: Coords2d
+  to: Coords2d
+  id: string
+  pathToNode: PathToNode
+  isDraftSegment?: boolean
+  scale?: number
+}): Group {
+  const group = new Group()
+
+  const previousPoint =
+    prevSegment?.type === 'TangentialArcTo'
+      ? getTangentPointFromPreviousArc(
+          prevSegment.center,
+          prevSegment.ccw,
+          prevSegment.to
+        )
+      : prevSegment.from
+
+  const { center, radius, startAngle, endAngle, ccw } = getTangentialArcToInfo({
+    arcStartPoint: from,
+    arcEndPoint: to,
+    tanPreviousPoint: previousPoint,
+    obtuse: true,
+  })
+
+  const geometry = createArcGeometry({
+    center,
+    radius,
+    startAngle,
+    endAngle,
+    ccw,
+    isDashed: isDraftSegment,
+    scale,
+  })
+
+  const body = new MeshBasicMaterial({ color: 0xffffff })
+  const mesh = new Mesh(geometry, body)
+  mesh.userData.type = isDraftSegment
+    ? TANGENTIAL_ARC_TO__SEGMENT_DASH
+    : TANGENTIAL_ARC_TO_SEGMENT_BODY
+
+  group.userData = {
+    type: TANGENTIAL_ARC_TO_SEGMENT,
+    id,
+    from,
+    to,
+    prevSegment,
+    pathToNode,
+    isSelected: false,
+  }
+  group.name = TANGENTIAL_ARC_TO_SEGMENT
+
+  const arrowGroup = createArrowhead(scale)
+  arrowGroup.position.set(to[0], to[1], 0)
+  const arrowheadAngle = endAngle + (Math.PI / 2) * (ccw ? 1 : -1)
+  arrowGroup.quaternion.setFromUnitVectors(
+    new Vector3(0, 1, 0),
+    new Vector3(Math.cos(arrowheadAngle), Math.sin(arrowheadAngle), 0)
+  )
+
+  group.add(mesh, arrowGroup)
+
+  return group
+}
+
+export function createArcGeometry({
+  center,
+  radius,
+  startAngle,
+  endAngle,
+  ccw,
+  isDashed = false,
+  scale = 1,
+}: {
+  center: Coords2d
+  radius: number
+  startAngle: number
+  endAngle: number
+  ccw: boolean
+  isDashed?: boolean
+  scale?: number
+}): BufferGeometry {
+  const dashSize = 1.2 * scale
+  const gapSize = 1.2 * scale
+  const arcStart = new EllipseCurve(
+    center[0],
+    center[1],
+    radius,
+    radius,
+    startAngle,
+    endAngle,
+    !ccw,
+    0
+  )
+  const arcEnd = new EllipseCurve(
+    center[0],
+    center[1],
+    radius,
+    radius,
+    endAngle,
+    startAngle,
+    ccw,
+    0
+  )
+  const shape = new Shape()
+  shape.moveTo(0, -0.08 * scale)
+  shape.lineTo(0, 0.08 * scale) // The width of the line
+
+  if (!isDashed) {
+    const points = arcStart.getPoints(50)
+    const path = new CurvePath<Vector3>()
+    path.add(new CatmullRomCurve3(points.map((p) => new Vector3(p.x, p.y, 0))))
+
+    return new ExtrudeGeometry(shape, {
+      steps: 100,
+      bevelEnabled: false,
+      extrudePath: path,
+    })
+  }
+
+  const length = arcStart.getLength()
+  const totalDashes = length / (dashSize + gapSize) // rounding makes the dashes jittery since the new dash is suddenly appears instead of growing into place
+  const dashesAtEachEnd = Math.min(100, totalDashes / 2) // Assuming we want 50 dashes total, 25 at each end
+
+  const dashGeometries = []
+
+  // Function to create a dash at a specific t value (0 to 1 along the curve)
+  const createDashAt = (t: number, curve: EllipseCurve) => {
+    const startVec = curve.getPoint(t)
+    const endVec = curve.getPoint(Math.min(0.5, t + dashSize / length))
+    const midVec = curve.getPoint(Math.min(0.5, t + dashSize / length / 2))
+    const dashCurve = new CurvePath<Vector3>()
+    dashCurve.add(
+      new CatmullRomCurve3([
+        new Vector3(startVec.x, startVec.y, 0),
+        new Vector3(midVec.x, midVec.y, 0),
+        new Vector3(endVec.x, endVec.y, 0),
+      ])
+    )
+    return new ExtrudeGeometry(shape, {
+      steps: 3,
+      bevelEnabled: false,
+      extrudePath: dashCurve,
+    })
+  }
+
+  // Create dashes at the start of the arc
+  for (let i = 0; i < dashesAtEachEnd; i++) {
+    const t = i / totalDashes
+    dashGeometries.push(createDashAt(t, arcStart))
+    dashGeometries.push(createDashAt(t, arcEnd))
+  }
+
+  // fill in the remaining arc
+  const remainingArcLength = length - dashesAtEachEnd * 2 * (dashSize + gapSize)
+  if (remainingArcLength > 0) {
+    const remainingArcStartT = dashesAtEachEnd / totalDashes
+    const remainingArcEndT = 1 - remainingArcStartT
+    const centerVec = new Vector2(center[0], center[1])
+    const remainingArcStartVec = arcStart.getPoint(remainingArcStartT)
+    const remainingArcEndVec = arcStart.getPoint(remainingArcEndT)
+    const remainingArcCurve = new EllipseCurve(
+      arcStart.aX,
+      arcStart.aY,
+      arcStart.xRadius,
+      arcStart.yRadius,
+      new Vector2().subVectors(centerVec, remainingArcStartVec).angle() +
+        Math.PI,
+      new Vector2().subVectors(centerVec, remainingArcEndVec).angle() + Math.PI,
+      !ccw
+    )
+    const remainingArcPoints = remainingArcCurve.getPoints(50)
+    const remainingArcPath = new CurvePath<Vector3>()
+    remainingArcPath.add(
+      new CatmullRomCurve3(
+        remainingArcPoints.map((p) => new Vector3(p.x, p.y, 0))
+      )
+    )
+    const remainingArcGeometry = new ExtrudeGeometry(shape, {
+      steps: 50,
+      bevelEnabled: false,
+      extrudePath: remainingArcPath,
+    })
+    dashGeometries.push(remainingArcGeometry)
+  }
+
+  const geo = dashGeometries.length
+    ? mergeGeometries(dashGeometries)
+    : new BufferGeometry()
+  geo.userData.type = 'dashed'
+  return geo
+}
+
+export function dashedStraight(
+  from: Coords2d,
+  to: Coords2d,
+  shape: Shape,
+  scale = 1
+): BufferGeometry<NormalBufferAttributes> {
+  const dashSize = 1.2 * scale
+  const gapSize = 1.2 * scale // todo: gabSize is not respected
+  const dashLine = new LineCurve3(
+    new Vector3(from[0], from[1], 0),
+    new Vector3(to[0], to[1], 0)
+  )
+  const length = dashLine.getLength()
+  const numberOfPoints = (length / (dashSize + gapSize)) * 2
+  const startOfLine = new Vector3(from[0], from[1], 0)
+  const endOfLine = new Vector3(to[0], to[1], 0)
+  const dashGeometries = []
+  const dashComponent = (xOrY: number, pointIndex: number) =>
+    ((to[xOrY] - from[xOrY]) / numberOfPoints) * pointIndex + from[xOrY]
+  for (let i = 0; i < numberOfPoints; i += 2) {
+    const dashStart = new Vector3(dashComponent(0, i), dashComponent(1, i), 0)
+    let dashEnd = new Vector3(
+      dashComponent(0, i + 1),
+      dashComponent(1, i + 1),
+      0
+    )
+    if (startOfLine.distanceTo(dashEnd) > startOfLine.distanceTo(endOfLine))
+      dashEnd = endOfLine
+
+    if (dashEnd) {
+      const dashCurve = new LineCurve3(dashStart, dashEnd)
+      const dashGeometry = new ExtrudeGeometry(shape, {
+        steps: 1,
+        bevelEnabled: false,
+        extrudePath: dashCurve,
+      })
+      dashGeometries.push(dashGeometry)
+    }
+  }
+  const geo = dashGeometries.length
+    ? mergeGeometries(dashGeometries)
+    : new BufferGeometry()
+  geo.userData.type = 'dashed'
+  return geo
+}

src/components/ActionButton.tsx

@@ -1,6 +1,6 @@
 import { ActionIcon, ActionIconProps } from './ActionIcon'
 import React from 'react'
-import { paths } from '../Router'
+import { paths } from 'lib/paths'
 import { Link } from 'react-router-dom'
 import type { LinkProps } from 'react-router-dom'
 

src/components/AppHeader.tsx

@@ -1,6 +1,6 @@
 import { Toolbar } from '../Toolbar'
 import UserSidebarMenu from './UserSidebarMenu'
-import { IndexLoaderData } from '../Router'
+import { type IndexLoaderData } from 'lib/types'
 import ProjectSidebarMenu from './ProjectSidebarMenu'
 import { useGlobalStateContext } from 'hooks/useGlobalStateContext'
 import styles from './AppHeader.module.css'

src/components/AstExplorer.tsx

@@ -1,5 +1,5 @@
 import { useModelingContext } from 'hooks/useModelingContext'
-import { kclManager } from 'lang/KclSinglton'
+import { kclManager } from 'lang/KclSingleton'
 import { getNodeFromPath, getNodePathFromSourceRange } from 'lang/queryAst'
 import { useEffect, useRef, useState } from 'react'
 import { useStore } from 'useStore'

src/components/AvailableVarsHelpers.tsx

@@ -8,7 +8,7 @@ import {
 } from '../lang/modifyAst'
 import { findAllPreviousVariables, PrevVariable } from '../lang/queryAst'
 import { engineCommandManager } from '../lang/std/engineConnection'
-import { kclManager, useKclContext } from 'lang/KclSinglton'
+import { kclManager, useKclContext } from 'lang/KclSingleton'
 import { useModelingContext } from 'hooks/useModelingContext'
 import { executeAst } from 'useStore'
 
@@ -87,7 +87,7 @@ export function useCalc({
   inputRef: React.RefObject<HTMLInputElement>
   valueNode: Value | null
   calcResult: string
-  prevVariables: PrevVariable<any>[]
+  prevVariables: PrevVariable<unknown>[]
   newVariableName: string
   isNewVariableNameUnique: boolean
   newVariableInsertIndex: number
@@ -148,7 +148,6 @@ export function useCalc({
       executeAst({
         ast,
         engineCommandManager,
-        defaultPlanes: kclManager.defaultPlanes,
         useFakeExecutor: true,
         programMemoryOverride: JSON.parse(
           JSON.stringify(kclManager.programMemory)

src/components/CamToggle.tsx

@@ -0,0 +1,75 @@
+import { useState, useEffect } from 'react'
+import { sceneInfra } from '../clientSideScene/sceneInfra'
+import { engineCommandManager } from 'lang/std/engineConnection'
+import { throttle, isReducedMotion } from 'lib/utils'
+
+const updateDollyZoom = throttle(
+  (newFov: number) => sceneInfra.camControls.dollyZoom(newFov),
+  1000 / 15
+)
+
+export const CamToggle = () => {
+  const [isPerspective, setIsPerspective] = useState(true)
+  const [fov, setFov] = useState(40)
+  const [enableRotate, setEnableRotate] = useState(true)
+
+  useEffect(() => {
+    engineCommandManager.waitForReady.then(async () => {
+      sceneInfra.camControls.dollyZoom(fov)
+    })
+  }, [])
+
+  const toggleCamera = () => {
+    if (isPerspective) {
+      isReducedMotion()
+        ? sceneInfra.camControls.useOrthographicCamera()
+        : sceneInfra.camControls.animateToOrthographic()
+    } else {
+      isReducedMotion()
+        ? sceneInfra.camControls.usePerspectiveCamera()
+        : sceneInfra.camControls.animateToPerspective()
+    }
+    setIsPerspective(!isPerspective)
+  }
+
+  const handleFovChange = (newFov: number) => {
+    setFov(newFov)
+    updateDollyZoom(newFov)
+  }
+
+  return (
+    <div className="absolute right-14 bottom-3">
+      {isPerspective && (
+        <div className="">
+          <input
+            type="range"
+            min="4"
+            max="90"
+            step={0.5}
+            value={fov}
+            onChange={(e) => handleFovChange(Number(e.target.value))}
+            className="w-full cursor-pointer pointer-events-auto"
+          />
+        </div>
+      )}
+      <button onClick={toggleCamera} className="">
+        {isPerspective
+          ? 'Switch to Orthographic Camera'
+          : 'Switch to Perspective Camera'}
+      </button>
+      <button
+        onClick={() => {
+          if (enableRotate) {
+            sceneInfra.camControls.enableRotate = false
+          } else {
+            sceneInfra.camControls.enableRotate = true
+          }
+          setEnableRotate(!enableRotate)
+        }}
+        className=""
+      >
+        {enableRotate ? 'Disable Rotation' : 'Enable Rotation'}
+      </button>
+    </div>
+  )
+}

src/components/CodeMenu.tsx

@@ -9,7 +9,7 @@ import styles from './CodeMenu.module.css'
 import { useConvertToVariable } from 'hooks/useToolbarGuards'
 import { editorShortcutMeta } from './TextEditor'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import { kclManager } from 'lang/KclSinglton'
+import { kclManager } from 'lang/KclSingleton'
 
 export const CodeMenu = ({ children }: PropsWithChildren) => {
   const { enable: convertToVarEnabled, handleClick: handleConvertToVarClick } =
@@ -77,6 +77,24 @@ export const CodeMenu = ({ children }: PropsWithChildren) => {
               </small>
             </a>
           </Menu.Item>
+          <Menu.Item>
+            <a
+              className={styles.button}
+              href="https://github.com/KittyCAD/kcl-samples"
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              <span>KCL samples</span>
+              <small>
+                On GitHub
+                <FontAwesomeIcon
+                  icon={faArrowUpRightFromSquare}
+                  className="ml-1 align-text-top"
+                  width={12}
+                />
+              </small>
+            </a>
+          </Menu.Item>
         </Menu.Items>
       </div>
     </Menu>

src/components/CommandBar/CommandBar.tsx

@@ -27,6 +27,7 @@ export const CommandBarProvider = ({
 }) => {
   const { pathname } = useLocation()
   const [commandBarState, commandBarSend] = useMachine(commandBarMachine, {
+    devTools: true,
     guards: {
       'Arguments are ready': (context, _) => {
         return context.selectedCommand?.args
@@ -56,12 +57,11 @@ export const CommandBarProvider = ({
       }}
     >
       {children}
-      <CommandBar />
     </CommandsContext.Provider>
   )
 }
 
-const CommandBar = () => {
+export const CommandBar = () => {
   const { commandBarState, commandBarSend } = useCommandsContext()
   const {
     context: { selectedCommand, currentArgument, commands },
@@ -83,17 +83,25 @@ const CommandBar = () => {
       if (commandBarState.matches('Review')) {
         const entries = Object.entries(selectedCommand?.args || {})
 
-        commandBarSend({
-          type: commandBarState.matches('Review')
-            ? 'Edit argument'
-            : 'Change current argument',
-          data: {
-            arg: {
-              name: entries[entries.length - 1][0],
-              ...entries[entries.length - 1][1],
+        const currentArgName = entries[entries.length - 1][0]
+        const currentArg = {
+          name: currentArgName,
+          ...entries[entries.length - 1][1],
+        }
+
+        if (commandBarState.matches('Review')) {
+          commandBarSend({
+            type: 'Edit argument',
+            data: {
+              arg: currentArg,
             },
-          },
-        })
+          })
+        } else {
+          commandBarSend({
+            type: 'Remove argument',
+            data: { [currentArgName]: currentArg },
+          })
+        }
       } else {
         commandBarSend({ type: 'Deselect command' })
       }
@@ -116,6 +124,11 @@ const CommandBar = () => {
     }
   }
 
+  useEffect(
+    () => console.log(commandBarState.context.argumentsToSubmit),
+    [commandBarState.context.argumentsToSubmit]
+  )
+
   return (
     <Transition.Root
       show={!commandBarState.matches('Closed') || false}

src/components/CommandBar/CommandBarArgument.tsx

@@ -4,6 +4,7 @@ import CommandBarSelectionInput from './CommandBarSelectionInput'
 import { CommandArgument } from 'lib/commandTypes'
 import { useCommandsContext } from 'hooks/useCommandsContext'
 import CommandBarHeader from './CommandBarHeader'
+import CommandBarKclInput from './CommandBarKclInput'
 
 function CommandBarArgument({ stepBack }: { stepBack: () => void }) {
   const { commandBarState, commandBarSend } = useCommandsContext()
@@ -17,10 +18,7 @@ function CommandBarArgument({ stepBack }: { stepBack: () => void }) {
     commandBarSend({
       type: 'Submit argument',
       data: {
-        [currentArgument.name]:
-          currentArgument.inputType === 'number'
-            ? parseFloat((data as string) || '0')
-            : data,
+        [currentArgument.name]: data,
       },
     })
   }
@@ -68,6 +66,10 @@ function ArgumentInput({
           onSubmit={onSubmit}
         />
       )
+    case 'kcl':
+      return (
+        <CommandBarKclInput arg={arg} stepBack={stepBack} onSubmit={onSubmit} />
+      )
     default:
       return (
         <CommandBarBasicInput

src/components/CommandBar/CommandBarBasicInput.tsx

@@ -9,7 +9,7 @@ function CommandBarBasicInput({
   onSubmit,
 }: {
   arg: CommandArgument<unknown> & {
-    inputType: 'number' | 'string'
+    inputType: 'string'
     name: string
   }
   stepBack: () => void
@@ -18,7 +18,6 @@ function CommandBarBasicInput({
   const { commandBarSend, commandBarState } = useCommandsContext()
   useHotkeys('mod + k, mod + /', () => commandBarSend({ type: 'Close' }))
   const inputRef = useRef<HTMLInputElement>(null)
-  const inputType = arg.inputType === 'number' ? 'number' : 'text'
 
   useEffect(() => {
     if (inputRef.current) {
@@ -40,9 +39,9 @@ function CommandBarBasicInput({
         </span>
         <input
           id="arg-form"
-          name={inputType}
+          name={arg.inputType}
           ref={inputRef}
-          type={inputType}
+          type={arg.inputType}
           required
           className="flex-grow px-2 py-1 border-b border-b-chalkboard-100 dark:border-b-chalkboard-80 !bg-transparent focus:outline-none"
           placeholder="Enter a value"

src/components/CommandBar/CommandBarHeader.tsx

@@ -1,9 +1,12 @@
 import { useCommandsContext } from 'hooks/useCommandsContext'
 import { CustomIcon } from '../CustomIcon'
-import React, { useState } from 'react'
+import React, { ReactNode, useState } from 'react'
 import { ActionButton } from '../ActionButton'
 import { Selections, getSelectionTypeDisplayText } from 'lib/selections'
 import { useHotkeys } from 'react-hotkeys-hook'
+import { KclCommandValue, KclExpressionWithVariable } from 'lib/commandTypes'
+import Tooltip from 'components/Tooltip'
+import { roundOff } from 'lib/utils'
 
 function CommandBarHeader({ children }: React.PropsWithChildren<{}>) {
   const { commandBarState, commandBarSend } = useCommandsContext()
@@ -45,6 +48,7 @@ function CommandBarHeader({ children }: React.PropsWithChildren<{}>) {
           parseInt(b.keys[0], 10) - 1
         ]
         const arg = selectedCommand?.args[argName]
+        if (!argName || !arg) return
         commandBarSend({
           type: 'Change current argument',
           data: { arg: { ...arg, name: argName } },
@@ -59,7 +63,7 @@ function CommandBarHeader({ children }: React.PropsWithChildren<{}>) {
     selectedCommand &&
     argumentsToSubmit && (
       <>
-        <div className="px-4 text-sm flex gap-4 items-start">
+        <div className="group px-4 text-sm flex gap-4 items-start">
           <div className="flex flex-1 flex-wrap gap-2">
             <p
               data-command-name={selectedCommand?.name}
@@ -91,33 +95,50 @@ function CommandBarHeader({ children }: React.PropsWithChildren<{}>) {
                       : 'bg-chalkboard-20/50 dark:bg-chalkboard-80/50 border-chalkboard-20 dark:border-chalkboard-80'
                   }`}
                 >
+                  <span className="capitalize">{argName}</span>
                   {argumentsToSubmit[argName] ? (
                     arg.inputType === 'selection' ? (
                       getSelectionTypeDisplayText(
                         argumentsToSubmit[argName] as Selections
                       )
+                    ) : arg.inputType === 'kcl' ? (
+                      roundOff(
+                        Number(
+                          (argumentsToSubmit[argName] as KclCommandValue)
+                            .valueCalculated
+                        ),
+                        4
+                      )
                     ) : typeof argumentsToSubmit[argName] === 'object' ? (
                       JSON.stringify(argumentsToSubmit[argName])
                     ) : (
-                      argumentsToSubmit[argName]
+                      <em>{argumentsToSubmit[argName] as ReactNode}</em>
                     )
-                  ) : arg.payload ? (
-                    arg.inputType === 'selection' ? (
-                      getSelectionTypeDisplayText(arg.payload as Selections)
-                    ) : typeof arg.payload === 'object' ? (
-                      JSON.stringify(arg.payload)
-                    ) : (
-                      arg.payload
-                    )
-                  ) : (
-                    <em>{argName}</em>
-                  )}
+                  ) : null}
                   {showShortcuts && (
                     <small className="absolute -top-[1px] right-full translate-x-1/2 px-0.5 rounded-sm bg-chalkboard-80 text-chalkboard-10 dark:bg-energy-10 dark:text-chalkboard-100">
                       <span className="sr-only">Hotkey: </span>
                       {i + 1}
                     </small>
                   )}
+                  {arg.inputType === 'kcl' &&
+                    !!argumentsToSubmit[argName] &&
+                    'variableName' in
+                      (argumentsToSubmit[argName] as KclCommandValue) && (
+                      <>
+                        <CustomIcon name="make-variable" className="w-4 h-4" />
+                        <Tooltip position="blockEnd">
+                          New variable:{' '}
+                          {
+                            (
+                              argumentsToSubmit[
+                                argName
+                              ] as KclExpressionWithVariable
+                            ).variableName
+                          }
+                        </Tooltip>
+                      </>
+                    )}
                 </button>
               )
             )}

src/components/CommandBar/CommandBarKclInput.module.css

@@ -0,0 +1,17 @@
+.editor {
+  @apply text-base flex-1;
+}
+
+.editor :global(.cm-editor) {
+  @apply bg-transparent;
+}
+
+.editor :global(.cm-line)::selection {
+  @apply px-1;
+  @apply text-chalkboard-100;
+  @apply bg-energy-10/50;
+}
+:global(.dark) .editor :global(.cm-line)::selection {
+  @apply text-energy-10;
+  @apply bg-energy-10/20;
+}

src/components/CommandBar/CommandBarKclInput.tsx

@@ -0,0 +1,221 @@
+import { Completion } from '@codemirror/autocomplete'
+import { EditorState, EditorView, useCodeMirror } from '@uiw/react-codemirror'
+import { CustomIcon } from 'components/CustomIcon'
+import { useCommandsContext } from 'hooks/useCommandsContext'
+import { useGlobalStateContext } from 'hooks/useGlobalStateContext'
+import { CommandArgument, KclCommandValue } from 'lib/commandTypes'
+import { getSystemTheme } from 'lib/theme'
+import { useCalculateKclExpression } from 'lib/useCalculateKclExpression'
+import { roundOff } from 'lib/utils'
+import { varMentions } from 'lib/varCompletionExtension'
+import { useEffect, useRef, useState } from 'react'
+import { useHotkeys } from 'react-hotkeys-hook'
+import styles from './CommandBarKclInput.module.css'
+import { createIdentifier, createVariableDeclaration } from 'lang/modifyAst'
+
+function CommandBarKclInput({
+  arg,
+  stepBack,
+  onSubmit,
+}: {
+  arg: CommandArgument<unknown> & {
+    inputType: 'kcl'
+    name: string
+  }
+  stepBack: () => void
+  onSubmit: (event: unknown) => void
+}) {
+  const { commandBarSend, commandBarState } = useCommandsContext()
+  const previouslySetValue = commandBarState.context.argumentsToSubmit[
+    arg.name
+  ] as KclCommandValue | undefined
+  const { settings } = useGlobalStateContext()
+  const defaultValue = (arg.defaultValue as string) || ''
+  const [value, setValue] = useState(
+    previouslySetValue?.valueText || defaultValue || ''
+  )
+  const [createNewVariable, setCreateNewVariable] = useState(
+    previouslySetValue && 'variableName' in previouslySetValue
+  )
+  const [canSubmit, setCanSubmit] = useState(true)
+  useHotkeys('mod + k, mod + /', () => commandBarSend({ type: 'Close' }))
+  const editorRef = useRef<HTMLDivElement>(null)
+
+  const {
+    prevVariables,
+    calcResult,
+    newVariableInsertIndex,
+    valueNode,
+    newVariableName,
+    setNewVariableName,
+    isNewVariableNameUnique,
+  } = useCalculateKclExpression({
+    value,
+    initialVariableName:
+      previouslySetValue && 'variableName' in previouslySetValue
+        ? previouslySetValue.variableName
+        : arg.name,
+  })
+  const varMentionData: Completion[] = prevVariables.map((v) => ({
+    label: v.key,
+    detail: String(roundOff(v.value as number)),
+  }))
+
+  const { setContainer } = useCodeMirror({
+    container: editorRef.current,
+    value,
+    indentWithTab: false,
+    basicSetup: false,
+    autoFocus: true,
+    selection: {
+      anchor: 0,
+      head:
+        previouslySetValue && 'valueText' in previouslySetValue
+          ? previouslySetValue.valueText.length
+          : defaultValue.length,
+    },
+    accessKey: 'command-bar',
+    theme:
+      settings.context.theme === 'system'
+        ? getSystemTheme()
+        : settings.context.theme,
+    extensions: [
+      EditorView.domEventHandlers({
+        keydown: (event) => {
+          if (event.key === 'Backspace' && value === '') {
+            event.preventDefault()
+            stepBack()
+          }
+        },
+      }),
+      varMentions(varMentionData),
+      EditorState.transactionFilter.of((tr) => {
+        if (tr.newDoc.lines > 1) {
+          handleSubmit()
+          return []
+        }
+        return tr
+      }),
+    ],
+    onChange: (newValue) => setValue(newValue),
+  })
+
+  useEffect(() => {
+    if (editorRef.current) {
+      setContainer(editorRef.current)
+    }
+  }, [arg, editorRef])
+
+  useEffect(() => {
+    setCanSubmit(
+      calcResult !== 'NAN' && (!createNewVariable || isNewVariableNameUnique)
+    )
+  }, [calcResult, createNewVariable, isNewVariableNameUnique])
+
+  function handleSubmit(e?: React.FormEvent<HTMLFormElement>) {
+    e?.preventDefault()
+    if (!canSubmit || valueNode === null) return
+
+    onSubmit(
+      createNewVariable
+        ? ({
+            valueAst: valueNode,
+            valueText: value,
+            valueCalculated: calcResult,
+            variableName: newVariableName,
+            insertIndex: newVariableInsertIndex,
+            variableIdentifierAst: createIdentifier(newVariableName),
+            variableDeclarationAst: createVariableDeclaration(
+              newVariableName,
+              valueNode
+            ),
+          } satisfies KclCommandValue)
+        : ({
+            valueAst: valueNode,
+            valueText: value,
+            valueCalculated: calcResult,
+          } satisfies KclCommandValue)
+    )
+  }
+
+  return (
+    <form id="arg-form" onSubmit={handleSubmit} data-can-submit={canSubmit}>
+      <label className="flex gap-4 items-center mx-4 my-4 border-solid border-b border-chalkboard-50">
+        <span className="capitalize text-chalkboard-80 dark:text-chalkboard-20">
+          {arg.name}
+        </span>
+        <div ref={editorRef} className={styles.editor} />
+        <CustomIcon
+          name="equal"
+          className="w-5 h-5 text-chalkboard-70 dark:text-chalkboard-40"
+        />
+        <span
+          className={
+            calcResult === 'NAN'
+              ? 'text-destroy-80 dark:text-destroy-40'
+              : 'text-energy-60 dark:text-energy-20'
+          }
+        >
+          {calcResult === 'NAN'
+            ? "Can't calculate"
+            : roundOff(Number(calcResult), 4)}
+        </span>
+      </label>
+      {createNewVariable ? (
+        <div className="flex items-baseline gap-4 mx-4 border-solid border-0 border-b border-chalkboard-50">
+          <label
+            htmlFor="variable-name"
+            className="text-base text-chalkboard-80 dark:text-chalkboard-20"
+          >
+            Variable name
+          </label>
+          <input
+            type="text"
+            id="variable-name"
+            name="variable-name"
+            className="flex-1 border-none bg-transparent"
+            placeholder="Variable name"
+            value={newVariableName}
+            autoCapitalize="off"
+            autoCorrect="off"
+            autoComplete="off"
+            spellCheck="false"
+            autoFocus
+            onChange={(e) => setNewVariableName(e.target.value)}
+            onKeyDown={(e) => {
+              if (e.currentTarget.value === '' && e.key === 'Backspace') {
+                setCreateNewVariable(false)
+              }
+            }}
+            onKeyUp={(e) => {
+              if (e.key === 'Enter') {
+                handleSubmit()
+              }
+            }}
+          />
+          <span
+            className={
+              isNewVariableNameUnique
+                ? 'text-energy-60 dark:text-energy-20'
+                : 'text-destroy-60 dark:text-destroy-40'
+            }
+          >
+            {isNewVariableNameUnique ? 'Available' : 'Unavailable'}
+          </span>
+        </div>
+      ) : (
+        <div className="flex justify-between gap-2 px-4">
+          <button
+            onClick={() => setCreateNewVariable(true)}
+            className="text-blue border-none bg-transparent font-sm flex gap-1 items-center pl-0 pr-1"
+          >
+            <CustomIcon name="plus" className="w-5 h-5" />
+            Create new variable
+          </button>
+        </div>
+      )}
+    </form>
+  )
+}
+
+export default CommandBarKclInput

src/components/CommandBar/CommandBarReview.tsx

@@ -14,7 +14,18 @@ function CommandBarReview({ stepBack }: { stepBack: () => void }) {
   })
 
   useHotkeys(
-    '1, 2, 3, 4, 5, 6, 7, 8, 9, 0',
+    [
+      'alt+1',
+      'alt+2',
+      'alt+3',
+      'alt+4',
+      'alt+5',
+      'alt+6',
+      'alt+7',
+      'alt+8',
+      'alt+9',
+      'alt+0',
+    ],
     (_, b) => {
       if (b.keys && !Number.isNaN(parseInt(b.keys[0], 10))) {
         if (!selectedCommand?.args) return

src/components/CommandBar/CommandBarSelectionInput.tsx

@@ -1,6 +1,6 @@
 import { useSelector } from '@xstate/react'
 import { useCommandsContext } from 'hooks/useCommandsContext'
-import { useKclContext } from 'lang/KclSinglton'
+import { useKclContext } from 'lang/KclSingleton'
 import { CommandArgument } from 'lib/commandTypes'
 import {
   ResolvedSelectionType,
@@ -27,7 +27,7 @@ function CommandBarSelectionInput({
 }) {
   const { code } = useKclContext()
   const inputRef = useRef<HTMLInputElement>(null)
-  const { commandBarSend } = useCommandsContext()
+  const { commandBarState, commandBarSend } = useCommandsContext()
   const [hasSubmitted, setHasSubmitted] = useState(false)
   const selection = useSelector(arg.actor, selectionSelector)
   const [selectionsByType, setSelectionsByType] = useState<
@@ -59,8 +59,16 @@ function CommandBarSelectionInput({
     )
   }, [selection])
 
+  // Fast-forward through this arg if it's marked as skippable
+  // and we have a valid selection already
   useEffect(() => {
     setCanSubmitSelection(canSubmitSelectionArg(selectionsByType, arg))
+    const argValue = commandBarState.context.argumentsToSubmit[arg.name]
+    if (canSubmitSelection && arg.skip && argValue === undefined) {
+      handleSubmit({
+        preventDefault: () => {},
+      } as React.FormEvent<HTMLFormElement>)
+    }
   }, [selectionsByType, arg])
 
   function handleChange() {

src/components/CommandComboBox.tsx

@@ -48,6 +48,7 @@ function CommandComboBox({
               (event.metaKey && event.key === 'k') ||
               (event.key === 'Backspace' && !event.currentTarget.value)
             ) {
+              event.preventDefault()
               commandBarSend({ type: 'Close' })
             }
           }}

src/components/CustomIcon.tsx

@@ -1,9 +1,12 @@
 export type CustomIconName =
+  | 'arc'
   | 'arrowDown'
   | 'arrowLeft'
   | 'arrowRight'
   | 'arrowUp'
   | 'checkmark'
+  | 'clipboardPlus'
+  | 'clipboardCheckmark'
   | 'close'
   | 'equal'
   | 'extrude'
@@ -13,10 +16,16 @@ export type CustomIconName =
   | 'folderPlus'
   | 'gear'
   | 'horizontal'
+  | 'horizontalDash'
   | 'line'
+  | 'make-variable'
   | 'move'
+  | 'network'
+  | 'networkCrossedOut'
   | 'parallel'
+  | 'plus'
   | 'search'
+  | 'settings'
   | 'sketch'
   | 'vertical'
 
@@ -27,6 +36,22 @@ export const CustomIcon = ({
   name: CustomIconName
 } & React.SVGProps<SVGSVGElement>) => {
   switch (name) {
+    case 'arc':
+      return (
+        <svg
+          {...props}
+          viewBox="0 0 20 20"
+          fill="none"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            fillRule="evenodd"
+            clipRule="evenodd"
+            d="M10 1.5C8.60217 1.5 7.22591 1.84474 5.99313 2.50367C4.76035 3.1626 3.70911 4.1154 2.93251 5.27765C2.15592 6.43991 1.67794 7.77575 1.54093 9.16685C1.40392 10.558 1.6121 11.9614 2.14703 13.2528C2.68195 14.5442 3.52712 15.6838 4.60766 16.5706C5.6882 17.4574 6.97076 18.064 8.34173 18.3367C9.71271 18.6094 11.1298 18.5398 12.4674 18.134C13.8051 17.7282 15.022 16.9988 16.0104 16.0104C16.3068 15.714 16.5796 15.3974 16.8273 15.0634L16.0241 14.4677C15.8055 14.7624 15.5648 15.0418 15.3033 15.3033C14.4312 16.1754 13.3574 16.819 12.1771 17.1771C10.9969 17.5351 9.74651 17.5965 8.53682 17.3559C7.32714 17.1153 6.19547 16.58 5.24205 15.7976C4.28863 15.0151 3.5429 14.0096 3.07091 12.8701C2.59891 11.7306 2.41522 10.4923 2.53612 9.26487C2.65701 8.03743 3.07875 6.85874 3.76398 5.83322C4.44921 4.8077 5.37678 3.967 6.46453 3.38559C7.55227 2.80418 8.76662 2.5 10 2.5C10.3699 2.5 10.7376 2.52734 11.1005 2.58117L11.2472 1.59199C10.836 1.53099 10.4192 1.5 10 1.5ZM13.2067 3.22008C13.5383 3.37691 13.8593 3.5585 14.1668 3.76398C14.4743 3.96946 14.7649 4.19652 15.0367 4.44286L15.7083 3.70191C15.4002 3.42271 15.0709 3.16538 14.7223 2.93251C14.3738 2.69964 14.0101 2.49384 13.6342 2.31609L13.2067 3.22008ZM16.433 6.14423C16.6216 6.45886 16.7876 6.78818 16.9291 7.12987C17.0706 7.47157 17.1861 7.82181 17.2752 8.17765L18.2453 7.93467C18.1443 7.53138 18.0134 7.13444 17.853 6.74719C17.6926 6.35995 17.5044 5.98672 17.2907 5.63012L16.433 6.14423ZM17.491 10.368C17.473 10.7344 17.428 11.1004 17.3559 11.4632C17.2837 11.8259 17.1852 12.1813 17.0616 12.5267L18.0031 12.8636C18.1432 12.4721 18.2549 12.0694 18.3367 11.6583C18.4184 11.2472 18.4694 10.8323 18.4898 10.4171L17.491 10.368Z"
+            fill="currentColor"
+          />
+        </svg>
+      )
     case 'arrowDown':
       return (
         <svg
@@ -107,6 +132,38 @@ export const CustomIcon = ({
           />
         </svg>
       )
+    case 'clipboardCheckmark':
+      return (
+        <svg
+          {...props}
+          viewBox="0 0 20 20"
+          fill="none"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            fillRule="evenodd"
+            clipRule="evenodd"
+            d="M6.5 3H7L13 3L13.5 3V3.5V4.00001L15.5 4.00002L16 4.00002V4.50002V10.0351C15.6905 9.85609 15.3548 9.71733 15 9.62602V5.00002L13.5 5.00001V6.50001V7.00001L13 7.00001L7 7.00001L6.5 7.00001V6.50001V5.00001L5 5.00001V16H10.8773C11.2024 16.4055 11.6047 16.7463 12.062 17H4.5H4V16.5V4.50001V4.00001L4.5 4.00001L6.5 4.00001V3.5V3ZM15.938 17C15.9588 16.9885 15.9794 16.9768 16 16.9649V17H15.938ZM7.5 4V4.50001V6.00001L12.5 6.00001V4.50001V4L7.5 4ZM13 9H7V8H13V9ZM15.6855 11.5L13.2101 14.8005L12.2071 13.7975L11.5 14.5046L12.9107 15.9153L13.6642 15.8617L16.4855 12.1L15.6855 11.5Z"
+            fill="currentColor"
+          />
+        </svg>
+      )
+    case 'clipboardPlus':
+      return (
+        <svg
+          {...props}
+          viewBox="0 0 20 20"
+          fill="none"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            fillRule="evenodd"
+            clipRule="evenodd"
+            d="M6.5 3H7L13 3L13.5 3V3.5V4.00001L15.5 4.00002L16 4.00002V4.50002V10.0351C15.6905 9.85609 15.3548 9.71733 15 9.62602V5.00002L13.5 5.00001V6.50001V7.00001L13 7.00001L7 7.00001L6.5 7.00001V6.50001V5.00001L5 5.00001V16H10.8773C11.2024 16.4055 11.6047 16.7463 12.062 17H4.5H4V16.5V4.50001V4.00001L4.5 4.00001L6.5 4.00001V3.5V3ZM15.938 17C15.9588 16.9885 15.9794 16.9768 16 16.9649V17H15.938ZM7.5 4V4.50001V6.00001L12.5 6.00001V4.50001V4L7.5 4ZM13 9H7V8H13V9ZM13.5 11V13H11.5V14H13.5V16H14.5V14H16.5V13H14.5V11H13.5Z"
+            fill="currentColor"
+          />
+        </svg>
+      )
     case 'close':
       return (
         <svg
@@ -249,6 +306,22 @@ export const CustomIcon = ({
           />
         </svg>
       )
+    case 'horizontalDash':
+      return (
+        <svg
+          {...props}
+          viewBox="0 0 20 20"
+          fill="none"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            fillRule="evenodd"
+            clipRule="evenodd"
+            d="M14 10.5H6V9.5H14V10.5Z"
+            fill="currentColor"
+          />
+        </svg>
+      )
     case 'line':
       return (
         <svg
@@ -265,6 +338,22 @@ export const CustomIcon = ({
           />
         </svg>
       )
+    case 'make-variable':
+      return (
+        <svg
+          {...props}
+          viewBox="0 0 20 20"
+          fill="none"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            fillRule="evenodd"
+            clipRule="evenodd"
+            d="M4.07178 6.57735L9.99998 3.1547L15.9282 6.57735V13.4227L9.99998 16.8453L4.07178 13.4227V6.57735ZM9.99998 2L16.9282 6V14L9.99998 18L3.07178 14V6L9.99998 2ZM9.45068 6.854C9.20802 6.798 8.97468 6.78867 8.75068 6.826C8.39602 6.90067 8.06468 7.04533 7.75668 7.26C7.73802 7.26933 7.72402 7.27867 7.71468 7.288C7.45335 7.484 7.24802 7.694 7.09868 7.918C6.96802 8.09533 6.86068 8.282 6.77668 8.478C6.69268 8.65533 6.63668 8.814 6.60868 8.954C6.60868 9.00067 6.62268 9.038 6.65068 9.066L6.69268 9.108H6.95868C7.13602 9.108 7.23402 9.09867 7.25268 9.08C7.28068 9.052 7.30868 8.982 7.33668 8.87C7.45802 8.52467 7.65402 8.212 7.92468 7.932C8.13002 7.72667 8.36802 7.58667 8.63868 7.512C8.83468 7.456 9.02602 7.456 9.21268 7.512C9.40868 7.57733 9.53002 7.68467 9.57668 7.834C9.62335 7.96467 9.61402 8.198 9.54868 8.534L8.77868 11.614C8.65735 11.9593 8.47535 12.216 8.23268 12.384C8.10202 12.4587 7.97602 12.4913 7.85468 12.482C7.68668 12.482 7.53735 12.4307 7.40668 12.328L7.36468 12.286L7.42068 12.272C7.50468 12.244 7.57002 12.216 7.61668 12.188C7.93402 12.02 8.10668 11.7493 8.13468 11.376C8.15335 11.1053 8.05535 10.9187 7.84068 10.816C7.60735 10.6853 7.34135 10.69 7.04268 10.83C6.73468 10.9793 6.54802 11.2547 6.48268 11.656C6.45468 11.8893 6.47335 12.1087 6.53868 12.314C6.56668 12.4073 6.60868 12.4913 6.66468 12.566C6.92602 12.986 7.32268 13.182 7.85468 13.154C8.31202 13.126 8.72268 12.8787 9.08668 12.412L9.12868 12.37L9.21268 12.496C9.44602 12.8133 9.80068 13.0233 10.2767 13.126C10.5474 13.1633 10.79 13.1633 11.0047 13.126C11.6954 12.9767 12.2507 12.58 12.6707 11.936C12.6894 11.9173 12.7034 11.894 12.7127 11.866C12.9553 11.474 13.0767 11.18 13.0767 10.984C13.0767 10.9373 13.0674 10.9047 13.0487 10.886C13.0207 10.8673 12.918 10.858 12.7407 10.858C12.61 10.858 12.526 10.8627 12.4887 10.872C12.442 10.8813 12.4047 10.9327 12.3767 11.026C12.2834 11.3807 12.092 11.7073 11.8027 12.006C11.56 12.23 11.3174 12.3793 11.0747 12.454C11.0094 12.4727 10.9067 12.482 10.7667 12.482C10.6174 12.482 10.5194 12.4727 10.4727 12.454C10.314 12.398 10.1974 12.3 10.1227 12.16C10.0667 12.0573 10.062 11.8613 10.1087 11.572C10.1087 11.5347 10.132 11.4367 10.1787 11.278C10.58 9.542 10.8274 8.55733 10.9207 8.324C11.0887 7.88533 11.3127 7.61467 11.5927 7.512C11.6114 7.50267 11.63 7.498 11.6487 7.498C11.8914 7.43267 12.0967 7.47467 12.2647 7.624L12.3207 7.68L12.2087 7.722C11.8354 7.85267 11.6207 8.128 11.5647 8.548C11.5367 8.76267 11.5927 8.94 11.7327 9.08C11.77 9.11733 11.8167 9.15 11.8727 9.178C12.1714 9.32733 12.4887 9.28067 12.8247 9.038C12.9367 8.954 13.03 8.83267 13.1047 8.674C13.282 8.26333 13.2774 7.87133 13.0907 7.498C12.9787 7.26467 12.7874 7.078 12.5167 6.938C12.162 6.77933 11.8074 6.76533 11.4527 6.896C11.1447 7.01733 10.8787 7.20867 10.6547 7.47L10.5707 7.582C10.552 7.582 10.524 7.554 10.4867 7.498C10.2627 7.17133 9.91735 6.95667 9.45068 6.854Z"
+            fill="currentColor"
+          />
+        </svg>
+      )
     case 'move':
       return (
         <svg
@@ -281,6 +370,38 @@ export const CustomIcon = ({
           />
         </svg>
       )
+    case 'network':
+      return (
+        <svg
+          {...props}
+          viewBox="0 0 20 20"
+          fill="none"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            fillRule="evenodd"
+            clipRule="evenodd"
+            d="M18 9.64741C17.1925 8.24871 16.0344 7.08457 14.6399 6.26971C13.2455 5.45486 11.6628 5.01742 10.0478 5.00051C8.4328 4.9836 6.84127 5.38779 5.43006 6.17326C4.01884 6.95873 2.83666 8.09837 2 9.47985L2.76881 9.94546C3.52456 8.69756 4.59243 7.66813 5.86718 6.95862C7.14193 6.2491 8.57955 5.88399 10.0384 5.89927C11.4972 5.91455 12.9269 6.30968 14.1865 7.04574C15.4461 7.7818 16.4922 8.83337 17.2216 10.0968L18 9.64741ZM15.2155 11.0953C14.6772 10.1628 13.9051 9.3867 12.9755 8.84347C12.0459 8.30023 10.9907 8.00861 9.91406 7.99733C8.8374 7.98606 7.77638 8.25552 6.83557 8.77917C5.89476 9.30281 5.10664 10.0626 4.54887 10.9836L5.34391 11.4651C5.81802 10.6822 6.48792 10.0364 7.28761 9.59132C8.0873 9.14622 8.98916 8.91718 9.90432 8.92676C10.8195 8.93635 11.7164 9.18423 12.5065 9.64598C13.2967 10.1077 13.953 10.7674 14.4106 11.56L15.2155 11.0953ZM10 14C10.8284 14 11.5 13.3284 11.5 12.5C11.5 11.6716 10.8284 11 10 11C9.17157 11 8.5 11.6716 8.5 12.5C8.5 13.3284 9.17157 14 10 14Z"
+            fill="currentColor"
+          />
+        </svg>
+      )
+    case 'networkCrossedOut':
+      return (
+        <svg
+          {...props}
+          viewBox="0 0 20 20"
+          fill="none"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            fillRule="evenodd"
+            clipRule="evenodd"
+            d="M4.35352 5.39647L14.253 15.296L14.9601 14.5889L5.06062 4.68936L4.35352 5.39647ZM12.5065 9.64599C11.9609 9.32713 11.3643 9.11025 10.746 9.00341L9.74058 7.99796C9.79835 7.99694 9.85618 7.99674 9.91406 7.99735C10.9907 8.00862 12.0459 8.30025 12.9755 8.84348C13.9051 9.38672 14.6772 10.1628 15.2155 11.0953L14.4106 11.56C13.953 10.7674 13.2967 10.1077 12.5065 9.64599ZM6.48788 8.98789L7.16295 9.66297C6.41824 10.1045 5.79317 10.7233 5.34391 11.4651L4.54887 10.9836C5.03646 10.1785 5.70009 9.49656 6.48788 8.98789ZM10.0384 5.89928C9.3134 5.89169 8.59366 5.97804 7.89655 6.15392L7.16867 5.42605C8.09637 5.13507 9.06776 4.99026 10.0478 5.00052C11.6628 5.01744 13.2455 5.45488 14.6399 6.26973C16.0344 7.08458 17.1925 8.24872 18 9.64742L17.2216 10.0968C16.4922 8.83338 15.4461 7.78181 14.1865 7.04575C12.9269 6.3097 11.4972 5.91456 10.0384 5.89928ZM5.00782 7.50783L4.36522 6.86524C3.42033 7.57557 2.61639 8.46208 2 9.47986L2.76881 9.94547C3.34775 8.98952 4.10986 8.16177 5.00782 7.50783ZM10 14C10.4142 14 10.7892 13.8321 11.0607 13.5607L8.93934 11.4394C8.66789 11.7108 8.5 12.0858 8.5 12.5C8.5 13.3284 9.17157 14 10 14Z"
+            fill="currentColor"
+          />
+        </svg>
+      )
     case 'parallel':
       return (
         <svg
@@ -297,6 +418,22 @@ export const CustomIcon = ({
           />
         </svg>
       )
+    case 'plus':
+      return (
+        <svg
+          {...props}
+          viewBox="0 0 20 20"
+          fill="none"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            fill-rule="evenodd"
+            clip-rule="evenodd"
+            d="M9.5 9.5V5.5H10.5V9.5H14.5V10.5H10.5V14.5H9.5V10.5H5.5V9.5H9.5Z"
+            fill="currentColor"
+          />
+        </svg>
+      )
     case 'search':
       return (
         <svg
@@ -313,6 +450,22 @@ export const CustomIcon = ({
           />
         </svg>
       )
+    case 'settings':
+      return (
+        <svg
+          {...props}
+          viewBox="0 0 20 20"
+          fill="none"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            fillRule="evenodd"
+            clipRule="evenodd"
+            d="M8 5.5C8 5.77614 7.77614 6 7.5 6C7.22386 6 7 5.77614 7 5.5C7 5.22386 7.22386 5 7.5 5C7.77614 5 8 5.22386 8 5.5ZM6.08535 6C6.29127 6.5826 6.84689 7 7.5 7C8.32843 7 9 6.32843 9 5.5C9 4.67157 8.32843 4 7.5 4C6.84689 4 6.29127 4.4174 6.08535 5H5V6H6.08535ZM15 6H9.94999C9.98278 5.83844 10 5.67123 10 5.5C10 5.32877 9.98278 5.16155 9.94999 5H15V6ZM11 14.5C11 14.7761 10.7761 15 10.5 15C10.2239 15 10 14.7761 10 14.5C10 14.2239 10.2239 14 10.5 14C10.7761 14 11 14.2239 11 14.5ZM9.08535 15C9.29127 15.5826 9.84689 16 10.5 16C11.3284 16 12 15.3284 12 14.5C12 13.6716 11.3284 13 10.5 13C9.84689 13 9.29127 13.4174 9.08535 14H5V15H9.08535ZM15 15H12.95C12.9828 14.8384 13 14.6712 13 14.5C13 14.3288 12.9828 14.1616 12.95 14H15V15ZM11.5 10.5C11.7761 10.5 12 10.2761 12 10C12 9.72386 11.7761 9.5 11.5 9.5C11.2239 9.5 11 9.72386 11 10C11 10.2761 11.2239 10.5 11.5 10.5ZM11.5 8.5C12.1531 8.5 12.7087 8.9174 12.9146 9.5H15V10.5H12.9146C12.7087 11.0826 12.1531 11.5 11.5 11.5C10.6716 11.5 10 10.8284 10 10C10 9.17157 10.6716 8.5 11.5 8.5ZM9.05001 10.5C9.01722 10.3384 9 10.1712 9 10C9 9.82877 9.01722 9.66155 9.05001 9.5H5V10.5H9.05001Z"
+            fill="currentColor"
+          />
+        </svg>
+      )
     case 'sketch':
       return (
         <svg

src/components/DebugPanel.tsx

@@ -1,6 +1,7 @@
 import { CollapsiblePanel, CollapsiblePanelProps } from './CollapsiblePanel'
 import { AstExplorer } from './AstExplorer'
 import { EngineCommands } from './EngineCommands'
+import { CamDebugSettings } from 'clientSideScene/ClientSideSceneComp'
 
 export const DebugPanel = ({ className, ...props }: CollapsiblePanelProps) => {
   return (
@@ -15,6 +16,7 @@ export const DebugPanel = ({ className, ...props }: CollapsiblePanelProps) => {
     >
       <section className="p-4 flex flex-col gap-4">
         <EngineCommands />
+        <CamDebugSettings />
         <div style={{ height: '400px' }} className="overflow-y-auto">
           <AstExplorer />
         </div>

src/components/DragWarningToast.tsx

@@ -0,0 +1,43 @@
+import { MoveDesc } from 'machines/modelingMachine'
+
+export const DragWarningToast = (moveDescs: MoveDesc[]) => {
+  if (moveDescs.length === 1) {
+    return (
+      <div className="flex items-center">
+        <div>🔒</div>
+        <div className="dark:bg-slate-950/50 bg-slate-400/50 p-1 px-3 rounded-xl text-sm">
+          move disabled: line{' '}
+          <span className="dark:text-energy-20 text-lime-600">
+            {moveDescs[0].line}
+          </span>
+          :{' '}
+          <pre>
+            <code className="dark:text-energy-20 text-lime-600">
+              {moveDescs[0].snippet}
+            </code>
+          </pre>{' '}
+          is fully constrained
+        </div>
+      </div>
+    )
+  } else if (moveDescs.length > 1) {
+    return (
+      <div className="dark:bg-slate-950/50 bg-slate-400/50 p-1 px-3 rounded-xl text-sm">
+        <div>Move disabled as The following lines are constrained</div>
+        {moveDescs.map((desc, i) => {
+          return (
+            <div key={i}>
+              line {desc.line}:{' '}
+              <pre className="inline-block">
+                <code className="dark:text-energy-20 text-lime-600">
+                  {moveDescs[0].snippet}
+                </code>
+              </pre>{' '}
+            </div>
+          )
+        })}
+      </div>
+    )
+  }
+  return null
+}

src/components/ExportButton.tsx

@@ -13,7 +13,7 @@ type OutputTypeKey = OutputFormat['type']
 type ExtractStorageTypes<T> = T extends { storage: infer U } ? U : never
 type StorageUnion = ExtractStorageTypes<OutputFormat>
 
-interface ExportButtonProps extends React.PropsWithChildren {
+export interface ExportButtonProps extends React.PropsWithChildren {
   className?: {
     button?: string
     icon?: string

src/components/FileMachineProvider.tsx

@@ -1,6 +1,7 @@
 import { useMachine } from '@xstate/react'
 import { useNavigate, useRouteLoaderData } from 'react-router-dom'
-import { IndexLoaderData, paths } from '../Router'
+import { type IndexLoaderData } from 'lib/types'
+import { paths } from 'lib/paths'
 import React, { createContext } from 'react'
 import { toast } from 'react-hot-toast'
 import {

src/components/FileTree.tsx

@@ -1,4 +1,5 @@
-import { IndexLoaderData, paths } from 'Router'
+import { type IndexLoaderData } from 'lib/types'
+import { paths } from 'lib/paths'
 import { ActionButton } from './ActionButton'
 import Tooltip from './Tooltip'
 import { FileEntry } from '@tauri-apps/api/fs'

src/components/GlobalStateProvider.tsx

@@ -1,6 +1,6 @@
 import { useMachine } from '@xstate/react'
 import { useNavigate } from 'react-router-dom'
-import { paths } from '../Router'
+import { paths } from 'lib/paths'
 import { authMachine, TOKEN_PERSIST_KEY } from '../machines/authMachine'
 import withBaseUrl from '../lib/withBaseURL'
 import React, { createContext, useEffect, useRef } from 'react'
@@ -30,6 +30,12 @@ type GlobalContext = {
   settings: MachineContext<typeof settingsMachine>
 }
 
+// a little hacky for sure, open to changing it
+// this implies that we should only even have one instance of this provider mounted at any one time
+// but I think that's a safe assumption
+let settingsStateRef: (typeof settingsMachine)['context'] | undefined
+export const getSettingsState = () => settingsStateRef
+
 export const GlobalStateContext = createContext({} as GlobalContext)
 
 export const GlobalStateProvider = ({
@@ -71,6 +77,7 @@ export const GlobalStateProvider = ({
       },
     },
   })
+  settingsStateRef = settingsState.context
 
   useStateMachineCommands({
     machineId: 'settings',

src/components/Logs.tsx

@@ -2,7 +2,7 @@ import ReactJson from 'react-json-view'
 import { useEffect } from 'react'
 import { CollapsiblePanel, CollapsiblePanelProps } from './CollapsiblePanel'
 import { Themes } from '../lib/theme'
-import { useKclContext } from 'lang/KclSinglton'
+import { useKclContext } from 'lang/KclSingleton'
 
 const ReactJsonTypeHack = ReactJson as any
 

src/components/MemoryPanel.test.tsx

@@ -41,9 +41,9 @@ describe('processMemory', () => {
       otherVar: 3,
       theExtrude: [],
       theSketch: [
-        { type: 'toPoint', to: [-3.35, 0.17], from: [0, 0], name: '' },
-        { type: 'toPoint', to: [0.98, 5.16], from: [-3.35, 0.17], name: '' },
-        { type: 'toPoint', to: [2.15, 4.32], from: [0.98, 5.16], name: '' },
+        { type: 'ToPoint', to: [-3.35, 0.17], from: [0, 0], name: '' },
+        { type: 'ToPoint', to: [0.98, 5.16], from: [-3.35, 0.17], name: '' },
+        { type: 'ToPoint', to: [2.15, 4.32], from: [0.98, 5.16], name: '' },
       ],
     })
   })

src/components/MemoryPanel.tsx

@@ -3,7 +3,7 @@ import { CollapsiblePanel, CollapsiblePanelProps } from './CollapsiblePanel'
 import { useMemo } from 'react'
 import { ProgramMemory, Path, ExtrudeSurface } from '../lang/wasm'
 import { Themes } from '../lib/theme'
-import { useKclContext } from 'lang/KclSinglton'
+import { useKclContext } from 'lang/KclSingleton'
 
 interface MemoryPanelProps extends CollapsiblePanelProps {
   theme?: Exclude<Themes, Themes.System>

src/components/ModelingMachineProvider.tsx

@@ -13,23 +13,7 @@ import { useSetupEngineManager } from 'hooks/useSetupEngineManager'
 import { useGlobalStateContext } from 'hooks/useGlobalStateContext'
 import { isCursorInSketchCommandRange } from 'lang/util'
 import { engineCommandManager } from 'lang/std/engineConnection'
-import { v4 as uuidv4 } from 'uuid'
-import { addStartSketch } from 'lang/modifyAst'
-import { roundOff } from 'lib/utils'
-import {
-  recast,
-  parse,
-  Program,
-  PipeExpression,
-  CallExpression,
-} from 'lang/wasm'
-import { getNodeFromPath } from 'lang/queryAst'
-import {
-  addCloseToPipe,
-  addNewSketchLn,
-  compareVec2Epsilon,
-} from 'lang/std/sketch'
-import { kclManager, useKclContext } from 'lang/KclSinglton'
+import { kclManager, useKclContext } from 'lang/KclSingleton'
 import { applyConstraintHorzVertDistance } from './Toolbar/SetHorzVertDistance'
 import {
   angleBetweenInfo,
@@ -49,6 +33,11 @@ import { applyConstraintIntersect } from './Toolbar/Intersect'
 import { applyConstraintAbsDistance } from './Toolbar/SetAbsDistance'
 import useStateMachineCommands from 'hooks/useStateMachineCommands'
 import { modelingMachineConfig } from 'lib/commandBarConfigs/modelingCommandConfig'
+import { sceneInfra } from 'clientSideScene/sceneInfra'
+import { getSketchQuaternion } from 'clientSideScene/sceneEntities'
+import { startSketchOnDefault } from 'lang/modifyAst'
+import { Program } from 'lang/wasm'
+import { isSingleCursorInPipe } from 'lang/queryAst'
 
 type MachineContext<T extends AnyStateMachine> = {
   state: StateFrom<T>
@@ -92,181 +81,10 @@ export const ModelingMachineProvider = ({
   const [modelingState, modelingSend, modelingActor] = useMachine(
     modelingMachine,
     {
-      // context: persistedSettings,
       actions: {
-        'Modify AST': () => {},
-        'Update code selection cursors': () => {},
-        'show default planes': () => {
-          kclManager.showPlanes()
-        },
-        'create path': assign({
-          sketchEnginePathId: () => {
-            const sketchUuid = uuidv4()
-            engineCommandManager.sendSceneCommand({
-              type: 'modeling_cmd_req',
-              cmd_id: sketchUuid,
-              cmd: {
-                type: 'start_path',
-              },
-            })
-            engineCommandManager.sendSceneCommand({
-              type: 'modeling_cmd_req',
-              cmd_id: uuidv4(),
-              cmd: {
-                type: 'edit_mode_enter',
-                target: sketchUuid,
-              },
-            })
-            return sketchUuid
-          },
-        }),
-        'AST start new sketch': assign(
-          ({ sketchEnginePathId }, { data: { coords, axis, segmentId } }) => {
-            if (!axis) {
-              // Something really weird must have happened for this to happen.
-              console.error('axis is undefined for starting a new sketch')
-              return {}
-            }
-            if (!segmentId) {
-              // Something really weird must have happened for this to happen.
-              console.error('segmentId is undefined for starting a new sketch')
-              return {}
-            }
-
-            const _addStartSketch = addStartSketch(
-              kclManager.ast,
-              axis,
-              [roundOff(coords[0].x), roundOff(coords[0].y)],
-              [
-                roundOff(coords[1].x - coords[0].x),
-                roundOff(coords[1].y - coords[0].y),
-              ]
-            )
-            const _modifiedAst = _addStartSketch.modifiedAst
-            const _pathToNode = _addStartSketch.pathToNode
-            const newCode = recast(_modifiedAst)
-            const astWithUpdatedSource = parse(newCode)
-            const updatedPipeNode = getNodeFromPath<PipeExpression>(
-              astWithUpdatedSource,
-              _pathToNode
-            ).node
-            const startProfileAtCallExp = updatedPipeNode.body.find(
-              (exp) =>
-                exp.type === 'CallExpression' &&
-                exp.callee.name === 'startProfileAt'
-            )
-            if (startProfileAtCallExp)
-              engineCommandManager.artifactMap[sketchEnginePathId] = {
-                type: 'result',
-                range: [startProfileAtCallExp.start, startProfileAtCallExp.end],
-                commandType: 'start_path',
-                data: null,
-                raw: {} as any,
-              }
-            const lineCallExp = updatedPipeNode.body.find(
-              (exp) =>
-                exp.type === 'CallExpression' && exp.callee.name === 'line'
-            )
-            if (lineCallExp)
-              engineCommandManager.artifactMap[segmentId] = {
-                type: 'result',
-                range: [lineCallExp.start, lineCallExp.end],
-                commandType: 'extend_path',
-                parentId: sketchEnginePathId,
-                data: null,
-                raw: {} as any,
-              }
-
-            kclManager.executeAstMock(astWithUpdatedSource, true)
-
-            return {
-              sketchPathToNode: _pathToNode,
-            }
-          }
-        ),
-        'AST add line segment': async (
-          { sketchPathToNode, sketchEnginePathId },
-          { data: { coords, segmentId } }
-        ) => {
-          if (!sketchPathToNode) return
-          const lastCoord = coords[coords.length - 1]
-
-          const pathInfo = await engineCommandManager.sendSceneCommand({
-            type: 'modeling_cmd_req',
-            cmd_id: uuidv4(),
-            cmd: {
-              type: 'path_get_info',
-              path_id: sketchEnginePathId,
-            },
-          })
-          const firstSegment = pathInfo?.data?.data?.segments.find(
-            (seg: any) => seg.command === 'line_to'
-          )
-          const firstSegCoords = await engineCommandManager.sendSceneCommand({
-            type: 'modeling_cmd_req',
-            cmd_id: uuidv4(),
-            cmd: {
-              type: 'curve_get_control_points',
-              curve_id: firstSegment.command_id,
-            },
-          })
-          const startPathCoord = firstSegCoords?.data?.data?.control_points[0]
-
-          const isClose = compareVec2Epsilon(
-            [startPathCoord.x, startPathCoord.y],
-            [lastCoord.x, lastCoord.y]
-          )
-
-          let _modifiedAst: Program
-          if (!isClose) {
-            const newSketchLn = addNewSketchLn({
-              node: kclManager.ast,
-              programMemory: kclManager.programMemory,
-              to: [lastCoord.x, lastCoord.y],
-              from: [coords[0].x, coords[0].y],
-              fnName: 'line',
-              pathToNode: sketchPathToNode,
-            })
-            const _modifiedAst = newSketchLn.modifiedAst
-            kclManager.executeAstMock(_modifiedAst, true).then(() => {
-              const lineCallExp = getNodeFromPath<CallExpression>(
-                kclManager.ast,
-                newSketchLn.pathToNode
-              ).node
-              if (segmentId)
-                engineCommandManager.artifactMap[segmentId] = {
-                  type: 'result',
-                  range: [lineCallExp.start, lineCallExp.end],
-                  commandType: 'extend_path',
-                  parentId: sketchEnginePathId,
-                  data: null,
-                  raw: {} as any,
-                }
-            })
-          } else {
-            _modifiedAst = addCloseToPipe({
-              node: kclManager.ast,
-              programMemory: kclManager.programMemory,
-              pathToNode: sketchPathToNode,
-            })
-            engineCommandManager.sendSceneCommand({
-              type: 'modeling_cmd_req',
-              cmd_id: uuidv4(),
-              cmd: { type: 'edit_mode_exit' },
-            })
-            engineCommandManager.sendSceneCommand({
-              type: 'modeling_cmd_req',
-              cmd_id: uuidv4(),
-              cmd: { type: 'default_camera_disable_sketch_mode' },
-            })
-            kclManager.executeAstMock(_modifiedAst, true)
-            // updateAst(_modifiedAst, true)
-          }
-        },
         'sketch exit execute': () => {
           kclManager.executeAst()
         },
-        'set tool': () => {}, // TODO
         'Set selection': assign(({ selectionRanges }, event) => {
           if (event.type !== 'Set selection') return {} // this was needed for ts after adding 'Set selection' action to on done modal events
           const setSelections = event.data
@@ -274,36 +92,6 @@ export const ModelingMachineProvider = ({
           if (setSelections.selectionType === 'mirrorCodeMirrorSelections')
             return { selectionRanges: setSelections.selection }
           else if (setSelections.selectionType === 'otherSelection') {
-            // TODO KittyCAD/engine/issues/1620: send axis highlight when it's working (if that's what we settle on)
-            // const axisAddCmd: EngineCommand = {
-            //   type: 'modeling_cmd_req',
-            //   cmd: {
-            //     type: 'highlight_set_entities',
-            //     entities: [
-            //       setSelections.selection === 'x-axis'
-            //         ? X_AXIS_UUID
-            //         : Y_AXIS_UUID,
-            //     ],
-            //   },
-            //   cmd_id: uuidv4(),
-            // }
-
-            // if (!isShiftDown) {
-            //   engineCommandManager
-            //     .sendSceneCommand({
-            //       type: 'modeling_cmd_req',
-            //       cmd: {
-            //         type: 'select_clear',
-            //       },
-            //       cmd_id: uuidv4(),
-            //     })
-            //     .then(() => {
-            //       engineCommandManager.sendSceneCommand(axisAddCmd)
-            //     })
-            // } else {
-            //   engineCommandManager.sendSceneCommand(axisAddCmd)
-            // }
-
             const {
               codeMirrorSelection,
               selectionRangeTypeMap,
@@ -384,12 +172,6 @@ export const ModelingMachineProvider = ({
         }),
       },
       guards: {
-        'Selection contains axis': () => true,
-        'Selection contains edge': () => true,
-        'Selection contains face': () => true,
-        'Selection contains line': () => true,
-        'Selection contains point': () => true,
-        'Selection is not empty': () => true,
         'has valid extrude selection': ({ selectionRanges }) => {
           // A user can begin extruding if they either have 1+ faces selected or nothing selected
           // TODO: I believe this guard only allows for extruding a single face at a time
@@ -401,7 +183,10 @@ export const ModelingMachineProvider = ({
 
           return canExtrudeSelection(selectionRanges)
         },
-        'Selection is one face': ({ selectionRanges }) => {
+        'Selection is on face': ({ selectionRanges }, { data }) => {
+          if (data?.forceNewSketch) return false
+          if (!isSingleCursorInPipe(selectionRanges, kclManager.ast))
+            return false
           return !!isCursorInSketchCommandRange(
             engineCommandManager.artifactMap,
             selectionRanges
@@ -409,6 +194,41 @@ export const ModelingMachineProvider = ({
         },
       },
       services: {
+        'AST-undo-startSketchOn': async ({ sketchPathToNode }) => {
+          if (!sketchPathToNode) return
+          const newAst: Program = JSON.parse(JSON.stringify(kclManager.ast))
+          const varDecIndex = sketchPathToNode[1][0]
+          // remove body item at varDecIndex
+          newAst.body = newAst.body.filter((_, i) => i !== varDecIndex)
+          await kclManager.executeAstMock(newAst, { updates: 'code' })
+          sceneInfra.setCallbacks({
+            onClick: () => {},
+            onDrag: () => {},
+          })
+        },
+        'animate-to-face': async (_, { data: { plane, normal } }) => {
+          const { modifiedAst, pathToNode } = startSketchOnDefault(
+            kclManager.ast,
+            plane
+          )
+          await kclManager.updateAst(modifiedAst, false)
+          const quaternion = getSketchQuaternion(pathToNode, normal)
+          await sceneInfra.camControls.tweenCameraToQuaternion(quaternion)
+          return {
+            sketchPathToNode: pathToNode,
+            sketchNormalBackUp: normal,
+          }
+        },
+        'animate-to-sketch': async ({
+          sketchPathToNode,
+          sketchNormalBackUp,
+        }) => {
+          const quaternion = getSketchQuaternion(
+            sketchPathToNode || [],
+            sketchNormalBackUp
+          )
+          await sceneInfra.camControls.tweenCameraToQuaternion(quaternion)
+        },
         'Get horizontal info': async ({
           selectionRanges,
         }): Promise<SetSelections> => {
@@ -542,17 +362,6 @@ export const ModelingMachineProvider = ({
     }
   )
 
-  useEffect(() => {
-    engineCommandManager.onPlaneSelected((plane_id: string) => {
-      if (modelingState.nextEvents.includes('Select default plane')) {
-        modelingSend({
-          type: 'Select default plane',
-          data: { planeId: plane_id },
-        })
-      }
-    })
-  }, [modelingSend, modelingState.nextEvents])
-
   useEffect(() => {
     kclManager.registerExecuteCallback(() => {
       modelingSend({ type: 'Re-execute' })
@@ -565,10 +374,8 @@ export const ModelingMachineProvider = ({
     send: modelingSend,
     actor: modelingActor,
     commandBarConfig: modelingMachineConfig,
-    onCancel: () => {
-      console.log('firing onCancel!!')
-      modelingSend({ type: 'Cancel' })
-    },
+    allCommandsRequireNetwork: true,
+    onCancel: () => modelingSend({ type: 'Cancel' }),
   })
 
   return (

src/components/NetworkHealthIndicator.test.tsx

@@ -3,8 +3,9 @@ import { BrowserRouter } from 'react-router-dom'
 import { GlobalStateProvider } from './GlobalStateProvider'
 import CommandBarProvider from './CommandBar/CommandBar'
 import {
-  NETWORK_CONTENT,
+  NETWORK_HEALTH_TEXT,
   NetworkHealthIndicator,
+  NetworkHealthState,
 } from './NetworkHealthIndicator'
 
 function TestWrap({ children }: { children: React.ReactNode }) {
@@ -28,8 +29,8 @@ describe('NetworkHealthIndicator tests', () => {
 
     fireEvent.click(screen.getByTestId('network-toggle'))
 
-    expect(screen.getByTestId('network-good')).toHaveTextContent(
-      NETWORK_CONTENT.good
+    expect(screen.getByTestId('network')).toHaveTextContent(
+      NETWORK_HEALTH_TEXT[NetworkHealthState.Ok]
     )
   })
 
@@ -43,8 +44,8 @@ describe('NetworkHealthIndicator tests', () => {
     fireEvent.offline(window)
     fireEvent.click(screen.getByTestId('network-toggle'))
 
-    expect(screen.getByTestId('network-bad')).toHaveTextContent(
-      NETWORK_CONTENT.bad
+    expect(screen.getByTestId('network')).toHaveTextContent(
+      NETWORK_HEALTH_TEXT[NetworkHealthState.Disconnected]
     )
   })
 })

src/components/NetworkHealthIndicator.tsx

@@ -1,42 +1,211 @@
-import { faExclamation, faWifi } from '@fortawesome/free-solid-svg-icons'
 import { Popover } from '@headlessui/react'
 import { useEffect, useState } from 'react'
-import { ActionIcon } from './ActionIcon'
+import { ActionIcon, ActionIconProps } from './ActionIcon'
+import {
+  ConnectingType,
+  ConnectingTypeGroup,
+  DisconnectingType,
+  engineCommandManager,
+  EngineConnectionState,
+  EngineConnectionStateType,
+  ErrorType,
+  initialConnectingTypeGroupState,
+} from '../lang/std/engineConnection'
+import Tooltip from './Tooltip'
 
-export const NETWORK_CONTENT = {
-  good: 'Network health is good',
-  bad: 'Network issue',
+export enum NetworkHealthState {
+  Ok,
+  Issue,
+  Disconnected,
 }
 
-const NETWORK_MESSAGES = {
-  offline: 'You are offline',
+export const NETWORK_HEALTH_TEXT: Record<NetworkHealthState, string> = {
+  [NetworkHealthState.Ok]: 'Connected',
+  [NetworkHealthState.Issue]: 'Problem',
+  [NetworkHealthState.Disconnected]: 'Offline',
+}
+
+type IconColorConfig = {
+  icon: string
+  bg: string
+}
+
+const hasIssueToIcon: Record<
+  string | number | symbol,
+  ActionIconProps['icon']
+> = {
+  true: 'close',
+  undefined: 'horizontalDash',
+  false: 'checkmark',
+}
+
+const hasIssueToIconColors: Record<string | number | symbol, IconColorConfig> =
+  {
+    true: {
+      icon: 'text-destroy-80 dark:text-destroy-10',
+      bg: 'bg-destroy-10 dark:bg-destroy-80',
+    },
+    undefined: {
+      icon: 'text-chalkboard-70 dark:text-chalkboard-30',
+      bg: 'bg-chalkboard-30 dark:bg-chalkboard-70',
+    },
+    false: {
+      icon: 'text-chalkboard-110 dark:!text-chalkboard-10',
+      bg: 'bg-transparent dark:bg-transparent',
+    },
+  }
+
+const overallConnectionStateColor: Record<NetworkHealthState, IconColorConfig> =
+  {
+    [NetworkHealthState.Ok]: {
+      icon: 'text-energy-80 dark:text-energy-10',
+      bg: 'bg-energy-10/30 dark:bg-energy-80/50',
+    },
+    [NetworkHealthState.Issue]: {
+      icon: 'text-destroy-80 dark:text-destroy-10',
+      bg: 'bg-destroy-10 dark:bg-destroy-80/80',
+    },
+    [NetworkHealthState.Disconnected]: {
+      icon: 'text-destroy-80 dark:text-destroy-10',
+      bg: 'bg-destroy-10 dark:bg-destroy-80',
+    },
+  }
+
+const overallConnectionStateIcon: Record<
+  NetworkHealthState,
+  ActionIconProps['icon']
+> = {
+  [NetworkHealthState.Ok]: 'network',
+  [NetworkHealthState.Issue]: 'networkCrossedOut',
+  [NetworkHealthState.Disconnected]: 'networkCrossedOut',
+}
+
+export function useNetworkStatus() {
+  const [steps, setSteps] = useState(initialConnectingTypeGroupState)
+  const [internetConnected, setInternetConnected] = useState<boolean>(true)
+  const [overallState, setOverallState] = useState<NetworkHealthState>(
+    NetworkHealthState.Ok
+  )
+  const [hasCopied, setHasCopied] = useState<boolean>(false)
+
+  const [error, setError] = useState<ErrorType | undefined>(undefined)
+
+  const issues: Record<ConnectingTypeGroup, boolean> = {
+    [ConnectingTypeGroup.WebSocket]: steps[ConnectingTypeGroup.WebSocket].some(
+      (a: [ConnectingType, boolean | undefined]) => a[1] === false
+    ),
+    [ConnectingTypeGroup.ICE]: steps[ConnectingTypeGroup.ICE].some(
+      (a: [ConnectingType, boolean | undefined]) => a[1] === false
+    ),
+    [ConnectingTypeGroup.WebRTC]: steps[ConnectingTypeGroup.WebRTC].some(
+      (a: [ConnectingType, boolean | undefined]) => a[1] === false
+    ),
+  }
+
+  const hasIssues: boolean =
+    issues[ConnectingTypeGroup.WebSocket] ||
+    issues[ConnectingTypeGroup.ICE] ||
+    issues[ConnectingTypeGroup.WebRTC]
+
+  useEffect(() => {
+    setOverallState(
+      !internetConnected
+        ? NetworkHealthState.Disconnected
+        : hasIssues
+        ? NetworkHealthState.Issue
+        : NetworkHealthState.Ok
+    )
+  }, [hasIssues, internetConnected])
+
+  useEffect(() => {
+    const onlineCallback = () => {
+      setSteps(initialConnectingTypeGroupState)
+      setInternetConnected(true)
+    }
+    const offlineCallback = () => {
+      setInternetConnected(false)
+    }
+    window.addEventListener('online', onlineCallback)
+    window.addEventListener('offline', offlineCallback)
+    return () => {
+      window.removeEventListener('online', onlineCallback)
+      window.removeEventListener('offline', offlineCallback)
+    }
+  }, [])
+
+  useEffect(() => {
+    engineCommandManager.onConnectionStateChange(
+      (engineConnectionState: EngineConnectionState) => {
+        let hasSetAStep = false
+
+        if (
+          engineConnectionState.type === EngineConnectionStateType.Connecting
+        ) {
+          const groups = Object.values(steps)
+          for (let group of groups) {
+            for (let step of group) {
+              if (step[0] !== engineConnectionState.value.type) continue
+              step[1] = true
+              hasSetAStep = true
+            }
+          }
+        }
+
+        if (
+          engineConnectionState.type === EngineConnectionStateType.Disconnecting
+        ) {
+          const groups = Object.values(steps)
+          for (let group of groups) {
+            for (let step of group) {
+              if (
+                engineConnectionState.value.type === DisconnectingType.Error
+              ) {
+                if (
+                  engineConnectionState.value.value.lastConnectingValue
+                    ?.type === step[0]
+                ) {
+                  step[1] = false
+                  hasSetAStep = true
+                }
+              }
+            }
+
+            if (engineConnectionState.value.type === DisconnectingType.Error) {
+              setError(engineConnectionState.value.value)
+            }
+          }
+        }
+
+        if (hasSetAStep) {
+          setSteps(steps)
+        }
+      }
+    )
+  }, [])
+
+  return {
+    hasIssues,
+    overallState,
+    internetConnected,
+    steps,
+    issues,
+    error,
+    setHasCopied,
+    hasCopied,
+  }
 }
 
 export const NetworkHealthIndicator = () => {
-  const [networkIssues, setNetworkIssues] = useState<string[]>([])
-  const hasIssues = [...networkIssues.values()].length > 0
-
-  useEffect(() => {
-    const offlineListener = () =>
-      setNetworkIssues((issues) => {
-        return [
-          ...issues.filter((issue) => issue !== NETWORK_MESSAGES.offline),
-          NETWORK_MESSAGES.offline,
-        ]
-      })
-    window.addEventListener('offline', offlineListener)
-
-    const onlineListener = () =>
-      setNetworkIssues((issues) => {
-        return [...issues.filter((issue) => issue !== NETWORK_MESSAGES.offline)]
-      })
-    window.addEventListener('online', onlineListener)
-
-    return () => {
-      window.removeEventListener('offline', offlineListener)
-      window.removeEventListener('online', onlineListener)
-    }
-  }, [])
+  const {
+    hasIssues,
+    overallState,
+    internetConnected,
+    steps,
+    issues,
+    error,
+    setHasCopied,
+    hasCopied,
+  } = useNetworkStatus()
 
   return (
     <Popover className="relative">
@@ -45,65 +214,94 @@ export const NetworkHealthIndicator = () => {
           'p-0 border-none bg-transparent dark:bg-transparent relative ' +
           (hasIssues
             ? 'focus-visible:outline-destroy-80'
-            : 'focus-visible:outline-succeed-80')
+            : 'focus-visible:outline-energy-80')
         }
         data-testid="network-toggle"
       >
         <span className="sr-only">Network Health</span>
         <ActionIcon
-          icon={faWifi}
+          icon={overallConnectionStateIcon[overallState]}
           className="p-1"
-          iconClassName={
-            hasIssues
-              ? 'text-destroy-80 dark:text-destroy-30'
-              : 'text-succeed-80 dark:text-succeed-30'
-          }
+          iconClassName={overallConnectionStateColor[overallState].icon}
           bgClassName={
-            'bg-transparent dark:bg-transparent ' +
-            (hasIssues
-              ? 'hover:bg-destroy-10/50 hover:dark:bg-destroy-80/50 rounded'
-              : 'hover:bg-succeed-10/50 hover:dark:bg-succeed-80/50 rounded')
+            'rounded-sm ' + overallConnectionStateColor[overallState].bg
           }
         />
+        <Tooltip position="blockEnd" delay={750} className="ui-open:hidden">
+          Network Health ({NETWORK_HEALTH_TEXT[overallState]})
+        </Tooltip>
       </Popover.Button>
-      <Popover.Panel className="absolute right-0 left-auto top-full mt-1 w-56 flex flex-col gap-1 divide-y divide-chalkboard-20 dark:divide-chalkboard-70 align-stretch py-2 bg-chalkboard-10 dark:bg-chalkboard-90 rounded shadow-lg border border-solid border-chalkboard-20/50 dark:border-chalkboard-80/50 text-sm">
-        {!hasIssues ? (
-          <span
-            className="flex items-center justify-center gap-1 px-4"
-            data-testid="network-good"
+      <Popover.Panel className="absolute right-0 left-auto top-full mt-1 w-64 flex flex-col gap-1 align-stretch bg-chalkboard-10 dark:bg-chalkboard-90 rounded shadow-lg border border-solid border-chalkboard-20/50 dark:border-chalkboard-80/50 text-sm">
+        <div
+          className={`flex items-center justify-between p-2 rounded-t-sm ${overallConnectionStateColor[overallState].bg} ${overallConnectionStateColor[overallState].icon}`}
+        >
+          <h2 className="text-sm font-sans font-normal">Network health</h2>
+          <p
+            data-testid="network"
+            className="font-bold text-xs uppercase px-2 py-1 rounded-sm"
           >
-            <ActionIcon
-              icon="checkmark"
-              bgClassName={'bg-succeed-10/50 dark:bg-succeed-80/50 rounded-sm'}
-              iconClassName={'text-succeed-80 dark:text-succeed-30'}
-            />
-            {NETWORK_CONTENT.good}
-          </span>
-        ) : (
-          <ul className="divide-y divide-chalkboard-20 dark:divide-chalkboard-80">
-            <span
-              className="font-bold text-xs uppercase text-destroy-60 dark:text-destroy-50 px-4"
-              data-testid="network-bad"
+            {NETWORK_HEALTH_TEXT[overallState]}
+          </p>
+        </div>
+        <ul className="divide-y divide-chalkboard-20 dark:divide-chalkboard-80">
+          {Object.keys(steps).map((name) => (
+            <li
+              key={name}
+              className={'flex flex-col px-2 py-4 gap-1 last:mb-0 '}
             >
-              {NETWORK_CONTENT.bad}
-              {networkIssues.length > 1 ? 's' : ''}
-            </span>
-            {networkIssues.map((issue) => (
-              <li
-                key={issue}
-                className="flex items-center gap-1 py-2 my-2 last:mb-0"
-              >
-                <ActionIcon
-                  icon={faExclamation}
-                  bgClassName={'bg-destroy-10/50 dark:bg-destroy-80/50 rounded'}
-                  iconClassName={'text-destroy-80 dark:text-destroy-30'}
-                  className="ml-4"
-                />
-                <p className="flex-1 mr-4">{issue}</p>
-              </li>
-            ))}
-          </ul>
-        )}
+              <div className="flex items-center text-left gap-1">
+                <p className="flex-1">{name}</p>
+                {internetConnected ? (
+                  <ActionIcon
+                    size="lg"
+                    icon={
+                      hasIssueToIcon[
+                        issues[name as ConnectingTypeGroup].toString()
+                      ]
+                    }
+                    iconClassName={
+                      hasIssueToIconColors[
+                        issues[name as ConnectingTypeGroup].toString()
+                      ].icon
+                    }
+                    bgClassName={
+                      'rounded-sm ' +
+                      hasIssueToIconColors[
+                        issues[name as ConnectingTypeGroup].toString()
+                      ].bg
+                    }
+                  />
+                ) : (
+                  <ActionIcon
+                    icon={hasIssueToIcon.true}
+                    bgClassName={hasIssueToIconColors.true.bg}
+                    iconClassName={hasIssueToIconColors.true.icon}
+                  />
+                )}
+              </div>
+              {issues[name as ConnectingTypeGroup] && (
+                <button
+                  onClick={async () => {
+                    await navigator.clipboard.writeText(
+                      JSON.stringify(error, null, 2) || ''
+                    )
+                    setHasCopied(true)
+                    setTimeout(() => setHasCopied(false), 5000)
+                  }}
+                  className="flex w-fit gap-2 items-center bg-transparent text-sm p-1 py-0 my-0 -mx-1 text-destroy-80 dark:text-destroy-10 hover:bg-transparent border-transparent dark:border-transparent hover:border-destroy-80 dark:hover:border-destroy-80 dark:hover:bg-destroy-80"
+                >
+                  {hasCopied ? 'Copied' : 'Copy Error'}
+                  <ActionIcon
+                    size="lg"
+                    icon={hasCopied ? 'clipboardCheckmark' : 'clipboardPlus'}
+                    iconClassName="text-inherit dark:text-inherit"
+                    bgClassName="!bg-transparent"
+                  />
+                </button>
+              )}
+            </li>
+          ))}
+        </ul>
       </Popover.Panel>
     </Popover>
   )

src/components/ProjectCard.tsx

@@ -1,5 +1,6 @@
 import { FormEvent, useEffect, useRef, useState } from 'react'
-import { type ProjectWithEntryPointMetadata, paths } from '../Router'
+import { type ProjectWithEntryPointMetadata } from 'lib/types'
+import { paths } from 'lib/paths'
 import { Link } from 'react-router-dom'
 import { ActionButton } from './ActionButton'
 import {

src/components/ProjectSidebarMenu.test.tsx

@@ -1,10 +1,11 @@
 import { fireEvent, render, screen } from '@testing-library/react'
 import { BrowserRouter } from 'react-router-dom'
 import ProjectSidebarMenu from './ProjectSidebarMenu'
-import { ProjectWithEntryPointMetadata } from '../Router'
+import { type ProjectWithEntryPointMetadata } from 'lib/types'
 import { GlobalStateProvider } from './GlobalStateProvider'
-import CommandBarProvider from './CommandBar/CommandBar'
 import { APP_NAME } from 'lib/constants'
+import { vi } from 'vitest'
+import { ExportButtonProps } from './ExportButton'
 
 const now = new Date()
 const projectWellFormed = {
@@ -37,15 +38,22 @@ const projectWellFormed = {
   },
 } satisfies ProjectWithEntryPointMetadata
 
+const mockExportButton = vi.fn()
+vi.mock('/src/components/ExportButton', () => ({
+  // engineCommandManager method call in ExportButton causes vitest to hang
+  ExportButton: (props: ExportButtonProps) => {
+    mockExportButton(props)
+    return <button>Fake export button</button>
+  },
+}))
+
 describe('ProjectSidebarMenu tests', () => {
   test('Renders the project name', () => {
     render(
       <BrowserRouter>
-        <CommandBarProvider>
-          <GlobalStateProvider>
-            <ProjectSidebarMenu project={projectWellFormed} />
-          </GlobalStateProvider>
-        </CommandBarProvider>
+        <GlobalStateProvider>
+          <ProjectSidebarMenu project={projectWellFormed} />
+        </GlobalStateProvider>
       </BrowserRouter>
     )
 
@@ -62,11 +70,9 @@ describe('ProjectSidebarMenu tests', () => {
   test('Renders app name if given no project', () => {
     render(
       <BrowserRouter>
-        <CommandBarProvider>
-          <GlobalStateProvider>
-            <ProjectSidebarMenu />
-          </GlobalStateProvider>
-        </CommandBarProvider>
+        <GlobalStateProvider>
+          <ProjectSidebarMenu />
+        </GlobalStateProvider>
       </BrowserRouter>
     )
 
@@ -78,14 +84,9 @@ describe('ProjectSidebarMenu tests', () => {
   test('Renders as a link if set to do so', () => {
     render(
       <BrowserRouter>
-        <CommandBarProvider>
-          <GlobalStateProvider>
-            <ProjectSidebarMenu
-              project={projectWellFormed}
-              renderAsLink={true}
-            />
-          </GlobalStateProvider>
-        </CommandBarProvider>
+        <GlobalStateProvider>
+          <ProjectSidebarMenu project={projectWellFormed} renderAsLink={true} />
+        </GlobalStateProvider>
       </BrowserRouter>
     )
 

src/components/ProjectSidebarMenu.tsx

@@ -1,7 +1,8 @@
 import { Popover, Transition } from '@headlessui/react'
 import { ActionButton } from './ActionButton'
 import { faHome } from '@fortawesome/free-solid-svg-icons'
-import { IndexLoaderData, paths } from '../Router'
+import { type IndexLoaderData } from 'lib/types'
+import { paths } from 'lib/paths'
 import { isTauri } from '../lib/isTauri'
 import { Link } from 'react-router-dom'
 import { ExportButton } from './ExportButton'

src/components/SetAngleLengthModal.tsx

@@ -5,10 +5,10 @@ import { Value } from '../lang/wasm'
 import {
   AvailableVars,
   addToInputHelper,
-  useCalc,
   CalcResult,
   CreateNewVariable,
 } from './AvailableVarsHelpers'
+import { useCalculateKclExpression } from 'lib/useCalculateKclExpression'
 
 type ModalResolve = {
   value: string
@@ -55,7 +55,7 @@ export const SetAngleLengthModal = ({
     setNewVariableName,
     inputRef,
     newVariableInsertIndex,
-  } = useCalc({
+  } = useCalculateKclExpression({
     value,
     initialVariableName: valueName,
   })

src/components/SetHorVertDistanceModal.tsx

@@ -5,10 +5,10 @@ import { Value } from '../lang/wasm'
 import {
   AvailableVars,
   addToInputHelper,
-  useCalc,
   CalcResult,
   CreateNewVariable,
 } from './AvailableVarsHelpers'
+import { useCalculateKclExpression } from 'lib/useCalculateKclExpression'
 
 type ModalResolve = {
   value: string
@@ -59,7 +59,7 @@ export const GetInfoModal = ({
     newVariableName,
     isNewVariableNameUnique,
     newVariableInsertIndex,
-  } = useCalc({ value: value, initialVariableName })
+  } = useCalculateKclExpression({ value: value, initialVariableName })
 
   return (
     <Transition appear show={isOpen} as={Fragment}>

src/components/SetVarNameModal.tsx

@@ -1,10 +1,11 @@
 import { Dialog, Transition } from '@headlessui/react'
 import { Fragment } from 'react'
-import { useCalc, CreateNewVariable } from './AvailableVarsHelpers'
+import { CreateNewVariable } from './AvailableVarsHelpers'
 import { ActionButton } from './ActionButton'
 import { faPlus } from '@fortawesome/free-solid-svg-icons'
 import { toast } from 'react-hot-toast'
 import { type InstanceProps, create } from 'react-modal-promise'
+import { useCalculateKclExpression } from 'lib/useCalculateKclExpression'
 
 type ModalResolve = { variableName: string }
 type ModalReject = boolean
@@ -25,7 +26,7 @@ export const SetVarNameModal = ({
   valueName,
 }: SetVarNameModalProps) => {
   const { isNewVariableNameUnique, newVariableName, setNewVariableName } =
-    useCalc({ value: '', initialVariableName: valueName })
+    useCalculateKclExpression({ value: '', initialVariableName: valueName })
 
   return (
     <Transition appear show={isOpen} as={Fragment}>

src/components/Stream.tsx

@@ -11,16 +11,14 @@ import { getNormalisedCoordinates, throttle } from '../lib/utils'
 import Loading from './Loading'
 import { cameraMouseDragGuards } from 'lib/cameraControls'
 import { useGlobalStateContext } from 'hooks/useGlobalStateContext'
-import { CameraDragInteractionType_type } from '@kittycad/lib/dist/types/src/models'
 import { Models } from '@kittycad/lib'
-import { getNodeFromPath } from 'lang/queryAst'
-import { VariableDeclarator, recast, CallExpression } from 'lang/wasm'
 import { engineCommandManager } from '../lang/std/engineConnection'
 import { useModelingContext } from 'hooks/useModelingContext'
-import { kclManager, useKclContext } from 'lang/KclSinglton'
-import { changeSketchArguments } from 'lang/std/sketch'
+import { useKclContext } from 'lang/KclSingleton'
+import { ClientSideScene } from 'clientSideScene/ClientSideSceneComp'
+import { NetworkHealthState, useNetworkStatus } from './NetworkHealthIndicator'
 
-export const Stream = ({ className = '' }) => {
+export const Stream = ({ className = '' }: { className?: string }) => {
   const [isLoading, setIsLoading] = useState(true)
   const [clickCoords, setClickCoords] = useState<{ x: number; y: number }>()
   const videoRef = useRef<HTMLVideoElement>(null)
@@ -39,8 +37,10 @@ export const Stream = ({ className = '' }) => {
   }))
   const { settings } = useGlobalStateContext()
   const cameraControls = settings?.context?.cameraControls
-  const { send, state, context } = useModelingContext()
+  const { state } = useModelingContext()
   const { isExecuting } = useKclContext()
+  const { overallState } = useNetworkStatus()
+  const isNetworkOkay = overallState === NetworkHealthState.Ok
 
   useEffect(() => {
     if (
@@ -53,8 +53,10 @@ export const Stream = ({ className = '' }) => {
     videoRef.current.srcObject = mediaStream
   }, [mediaStream])
 
-  const handleMouseDown: MouseEventHandler<HTMLVideoElement> = (e) => {
+  const handleMouseDown: MouseEventHandler<HTMLDivElement> = (e) => {
     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,
@@ -62,55 +64,6 @@ export const Stream = ({ className = '' }) => {
       ...streamDimensions,
     })
 
-    const newId = uuidv4()
-
-    const interactionGuards = cameraMouseDragGuards[cameraControls]
-    let interaction: CameraDragInteractionType_type = 'rotate'
-
-    if (
-      interactionGuards.pan.callback(e) ||
-      interactionGuards.pan.lenientDragStartButton === e.button
-    ) {
-      interaction = 'pan'
-    } else if (
-      interactionGuards.rotate.callback(e) ||
-      interactionGuards.rotate.lenientDragStartButton === e.button
-    ) {
-      interaction = 'rotate'
-    } else if (
-      interactionGuards.zoom.dragCallback(e) ||
-      interactionGuards.zoom.lenientDragStartButton === e.button
-    ) {
-      interaction = 'zoom'
-    }
-
-    if (state.matches('Sketch.Move Tool')) {
-      if (
-        state.matches('Sketch.Move Tool.No move') ||
-        state.matches('Sketch.Move Tool.Move with execute')
-      ) {
-        return
-      }
-      engineCommandManager.sendSceneCommand({
-        type: 'modeling_cmd_req',
-        cmd: {
-          type: 'handle_mouse_drag_start',
-          window: { x, y },
-        },
-        cmd_id: newId,
-      })
-    } else if (!state.matches('Sketch.Line Tool')) {
-      engineCommandManager.sendSceneCommand({
-        type: 'modeling_cmd_req',
-        cmd: {
-          type: 'camera_drag_start',
-          interaction,
-          window: { x, y },
-        },
-        cmd_id: newId,
-      })
-    }
-
     setButtonDownInStream(e.button)
     setClickCoords({ x, y })
   }
@@ -128,13 +81,15 @@ export const Stream = ({ className = '' }) => {
     })
   }, Math.round(1000 / fps))
 
-  const handleMouseUp: MouseEventHandler<HTMLVideoElement> = ({
+  const handleMouseUp: MouseEventHandler<HTMLDivElement> = ({
     clientX,
     clientY,
     ctrlKey,
   }) => {
     if (!videoRef.current) return
     setButtonDownInStream(undefined)
+    if (state.matches('Sketch')) return
+    if (state.matches('Sketch no face')) return
     const { x, y } = getNormalisedCoordinates({
       clientX,
       clientY,
@@ -155,206 +110,19 @@ export const Stream = ({ className = '' }) => {
       cmd_id: newCmdId,
     }
 
-    if (!didDragInStream && state.matches('Sketch no face')) {
-      command.cmd = {
-        type: 'select_with_point',
-        selection_type: 'add',
-        selected_at_window: { x, y },
-      }
-      engineCommandManager.sendSceneCommand(command)
-    } else if (!didDragInStream && state.matches('Sketch.Line Tool')) {
-      command.cmd = {
-        type: 'mouse_click',
-        window: { x, y },
-      }
-      engineCommandManager.sendSceneCommand(command).then(async (resp) => {
-        const entities_modified = resp?.data?.data?.entities_modified
-        if (!entities_modified) return
-        if (state.matches('Sketch.Line Tool.No Points')) {
-          send('Add point')
-        } else if (state.matches('Sketch.Line Tool.Point Added')) {
-          const curve = await engineCommandManager.sendSceneCommand({
-            type: 'modeling_cmd_req',
-            cmd_id: uuidv4(),
-            cmd: {
-              type: 'curve_get_control_points',
-              curve_id: entities_modified[0],
-            },
-          })
-          const coords: { x: number; y: number }[] =
-            curve.data.data.control_points
-          // We need the normal for the plane we are on.
-          const plane = await engineCommandManager.sendSceneCommand({
-            type: 'modeling_cmd_req',
-            cmd_id: uuidv4(),
-            cmd: {
-              type: 'get_sketch_mode_plane',
-            },
-          })
-          const z_axis = plane.data.data.z_axis
-
-          // Get the current axis.
-          let currentAxis: 'xy' | 'xz' | 'yz' | '-xy' | '-xz' | '-yz' | null =
-            null
-          if (context.sketchPlaneId === kclManager.getPlaneId('xy')) {
-            if (z_axis.z === -1) {
-              currentAxis = '-xy'
-            } else {
-              currentAxis = 'xy'
-            }
-          } else if (context.sketchPlaneId === kclManager.getPlaneId('yz')) {
-            if (z_axis.x === -1) {
-              currentAxis = '-yz'
-            } else {
-              currentAxis = 'yz'
-            }
-          } else if (context.sketchPlaneId === kclManager.getPlaneId('xz')) {
-            if (z_axis.y === -1) {
-              currentAxis = '-xz'
-            } else {
-              currentAxis = 'xz'
-            }
-          }
-
-          send({
-            type: 'Add point',
-            data: {
-              coords,
-              axis: currentAxis,
-              segmentId: entities_modified[0],
-            },
-          })
-        } else if (state.matches('Sketch.Line Tool.Segment Added')) {
-          const curve = await engineCommandManager.sendSceneCommand({
-            type: 'modeling_cmd_req',
-            cmd_id: uuidv4(),
-            cmd: {
-              type: 'curve_get_control_points',
-              curve_id: entities_modified[0],
-            },
-          })
-          const coords: { x: number; y: number }[] =
-            curve.data.data.control_points
-          send({
-            type: 'Add point',
-            data: { coords, axis: null, segmentId: entities_modified[0] },
-          })
-        }
-      })
-    } else if (
-      !didDragInStream &&
-      (state.matches('Sketch.SketchIdle') || state.matches('idle'))
-    ) {
-      command.cmd = {
-        type: 'select_with_point',
-        selected_at_window: { x, y },
-        selection_type: 'add',
-      }
-
-      engineCommandManager.sendSceneCommand(command)
-    } else if (!didDragInStream && state.matches('Sketch.Move Tool')) {
+    if (!didDragInStream) {
       command.cmd = {
         type: 'select_with_point',
         selected_at_window: { x, y },
         selection_type: 'add',
       }
       engineCommandManager.sendSceneCommand(command)
-    } else if (didDragInStream && state.matches('Sketch.Move Tool')) {
+    } else if (didDragInStream) {
       command.cmd = {
         type: 'handle_mouse_drag_end',
         window: { x, y },
       }
-      engineCommandManager.sendSceneCommand(command).then(async () => {
-        if (!context.sketchPathToNode) return
-        getNodeFromPath<VariableDeclarator>(
-          kclManager.ast,
-          context.sketchPathToNode,
-          'VariableDeclarator'
-        )
-        // Get the current plane string for plane we are on.
-        let currentPlaneString = ''
-        if (context.sketchPlaneId === kclManager.getPlaneId('xy')) {
-          currentPlaneString = 'XY'
-        } else if (context.sketchPlaneId === kclManager.getPlaneId('yz')) {
-          currentPlaneString = 'YZ'
-        } else if (context.sketchPlaneId === kclManager.getPlaneId('xz')) {
-          currentPlaneString = 'XZ'
-        }
-
-        // Do not supporting editing/moving lines on a non-default plane.
-        // Eventually we can support this but for now we will just throw an
-        // error.
-        if (currentPlaneString === '') return
-
-        const pathInfo = await engineCommandManager.sendSceneCommand({
-          type: 'modeling_cmd_req',
-          cmd_id: uuidv4(),
-          cmd: {
-            type: 'path_get_info',
-            path_id: context.sketchEnginePathId,
-          },
-        })
-        const segmentsWithMappings = (
-          pathInfo?.data?.data?.segments as { command_id: string }[]
-        )
-          .filter(({ command_id }) => {
-            return command_id && engineCommandManager.artifactMap[command_id]
-          })
-          .map(({ command_id }) => command_id)
-        const segment2dInfo = await Promise.all(
-          segmentsWithMappings.map(async (segmentId) => {
-            const response = await engineCommandManager.sendSceneCommand({
-              type: 'modeling_cmd_req',
-              cmd_id: uuidv4(),
-              cmd: {
-                type: 'curve_get_control_points',
-                curve_id: segmentId,
-              },
-            })
-            const controlPoints: [
-              { x: number; y: number },
-              { x: number; y: number }
-            ] = response.data.data.control_points
-            return {
-              controlPoints,
-              segmentId,
-            }
-          })
-        )
-
-        let modifiedAst = { ...kclManager.ast }
-        let code = kclManager.code
-        for (const controlPoint of segment2dInfo) {
-          const range =
-            engineCommandManager.artifactMap[controlPoint.segmentId].range
-          if (!range) continue
-          const from = controlPoint.controlPoints[0]
-          const to = controlPoint.controlPoints[1]
-          const modded = changeSketchArguments(
-            modifiedAst,
-            kclManager.programMemory,
-            range,
-            [to.x, to.y],
-            [from.x, from.y]
-          )
-          modifiedAst = modded.modifiedAst
-
-          // update artifact map ranges now that we have updated the ast.
-          code = recast(modded.modifiedAst)
-          const astWithCurrentRanges = kclManager.safeParse(code)
-          if (!astWithCurrentRanges) return
-          const updateNode = getNodeFromPath<CallExpression>(
-            astWithCurrentRanges,
-            modded.pathToNode
-          ).node
-          engineCommandManager.artifactMap[controlPoint.segmentId].range = [
-            updateNode.start,
-            updateNode.end,
-          ]
-        }
-
-        kclManager.executeAstMock(modifiedAst, true)
-      })
+      void engineCommandManager.sendSceneCommand(command)
     } else {
       engineCommandManager.sendSceneCommand(command)
     }
@@ -364,6 +132,8 @@ export const Stream = ({ className = '' }) => {
   }
 
   const handleMouseMove: MouseEventHandler<HTMLVideoElement> = (e) => {
+    if (state.matches('Sketch')) return
+    if (state.matches('Sketch no face')) return
     if (!clickCoords) return
 
     const delta =
@@ -376,16 +146,19 @@ export const Stream = ({ className = '' }) => {
   }
 
   return (
-    <div id="stream" className={className}>
+    <div
+      id="stream"
+      className={className}
+      onMouseUp={handleMouseUp}
+      onMouseDown={handleMouseDown}
+      onContextMenu={(e) => e.preventDefault()}
+      onContextMenuCapture={(e) => e.preventDefault()}
+    >
       <video
         ref={videoRef}
         muted
         autoPlay
         controls={false}
-        onMouseDown={handleMouseDown}
-        onMouseUp={handleMouseUp}
-        onContextMenu={(e) => e.preventDefault()}
-        onContextMenuCapture={(e) => e.preventDefault()}
         onWheel={handleScroll}
         onPlay={() => setIsLoading(false)}
         onMouseMoveCapture={handleMouseMove}
@@ -393,6 +166,14 @@ export const Stream = ({ className = '' }) => {
         disablePictureInPicture
         style={{ transitionDuration: '200ms', transitionProperty: 'filter' }}
       />
+      <ClientSideScene cameraControls={settings.context.cameraControls} />
+      {!isNetworkOkay && !isLoading && (
+        <div className="text-center absolute inset-0">
+          <Loading>
+            <span data-testid="loading-stream">Stream disconnected</span>
+          </Loading>
+        </div>
+      )}
       {isLoading && (
         <div className="text-center absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2">
           <Loading>

src/components/TextEditor.tsx

@@ -1,22 +1,23 @@
+import { undo, redo } from '@codemirror/commands'
 import ReactCodeMirror, {
   Extension,
   ViewUpdate,
   keymap,
 } from '@uiw/react-codemirror'
-import { FromServer, IntoServer } from 'editor/lsp/codec'
-import Server from '../editor/lsp/server'
-import Client from '../editor/lsp/client'
+import { FromServer, IntoServer } from 'editor/plugins/lsp/codec'
+import Server from '../editor/plugins/lsp/server'
+import Client from '../editor/plugins/lsp/client'
 import { TEST } from 'env'
 import { useCommandsContext } from 'hooks/useCommandsContext'
 import { useGlobalStateContext } from 'hooks/useGlobalStateContext'
 import { useConvertToVariable } from 'hooks/useToolbarGuards'
 import { Themes } from 'lib/theme'
-import { useMemo } from 'react'
+import { useEffect, useMemo, useRef } from 'react'
 import { linter, lintGutter } from '@codemirror/lint'
 import { useStore } from 'useStore'
 import { processCodeMirrorRanges } from 'lib/selections'
-import { LanguageServerClient } from 'editor/lsp'
-import kclLanguage from 'editor/lsp/language'
+import { LanguageServerClient } from 'editor/plugins/lsp'
+import kclLanguage from 'editor/plugins/lsp/kcl/language'
 import { EditorView, lineHighlightField } from 'editor/highlightextension'
 import { roundOff } from 'lib/utils'
 import { kclErrToDiagnostic } from 'lang/errors'
@@ -24,7 +25,15 @@ import { CSSRuleObject } from 'tailwindcss/types/config'
 import { useModelingContext } from 'hooks/useModelingContext'
 import interact from '@replit/codemirror-interact'
 import { engineCommandManager } from '../lang/std/engineConnection'
-import { kclManager, useKclContext } from 'lang/KclSinglton'
+import { kclManager, useKclContext } from 'lang/KclSingleton'
+import { useFileContext } from 'hooks/useFileContext'
+import { ModelingMachineEvent } from 'machines/modelingMachine'
+import { sceneInfra } from 'clientSideScene/sceneInfra'
+import { copilotPlugin } from 'editor/plugins/lsp/copilot'
+import { isTauri } from 'lib/isTauri'
+import type * as LSP from 'vscode-languageserver-protocol'
+import { NetworkHealthState, useNetworkStatus } from './NetworkHealthIndicator'
+import { useHotkeys } from 'react-hotkeys-hook'
 
 export const editorShortcutMeta = {
   formatCode: {
@@ -37,6 +46,15 @@ export const editorShortcutMeta = {
   },
 }
 
+function getWorkspaceFolders(): LSP.WorkspaceFolder[] {
+  // We only use workspace folders in Tauri since that is where we use more than
+  // one file.
+  if (isTauri()) {
+    return [{ uri: 'file://', name: 'ProjectRoot' }]
+  }
+  return []
+}
+
 export const TextEditor = ({
   theme,
 }: {
@@ -44,77 +62,153 @@ export const TextEditor = ({
 }) => {
   const {
     editorView,
-    isLSPServerReady,
+    isKclLspServerReady,
+    isCopilotLspServerReady,
     setEditorView,
-    setIsLSPServerReady,
+    setIsKclLspServerReady,
+    setIsCopilotLspServerReady,
     isShiftDown,
   } = useStore((s) => ({
     editorView: s.editorView,
-    isLSPServerReady: s.isLSPServerReady,
+    isKclLspServerReady: s.isKclLspServerReady,
+    isCopilotLspServerReady: s.isCopilotLspServerReady,
     setEditorView: s.setEditorView,
-    setIsLSPServerReady: s.setIsLSPServerReady,
+    setIsKclLspServerReady: s.setIsKclLspServerReady,
+    setIsCopilotLspServerReady: s.setIsCopilotLspServerReady,
     isShiftDown: s.isShiftDown,
   }))
   const { code, errors } = useKclContext()
+  const lastEvent = useRef({ event: '', time: Date.now() })
+  const { overallState } = useNetworkStatus()
+  const isNetworkOkay = overallState === NetworkHealthState.Ok
+
+  useEffect(() => {
+    if (typeof window === 'undefined') return
+    const onlineCallback = () => kclManager.setCodeAndExecute(kclManager.code)
+    window.addEventListener('online', onlineCallback)
+    return () => window.removeEventListener('online', onlineCallback)
+  }, [])
+
+  useHotkeys('mod+z', (e) => {
+    e.preventDefault()
+    if (editorView) {
+      undo(editorView)
+    }
+  })
+  useHotkeys('mod+shift+z', (e) => {
+    e.preventDefault()
+    if (editorView) {
+      redo(editorView)
+    }
+  })
 
   const {
     context: { selectionRanges, selectionRangeTypeMap },
     send,
+    state,
   } = useModelingContext()
 
-  const { settings: { context: { textWrapping } = {} } = {} } =
+  const { settings: { context: { textWrapping } = {} } = {}, auth } =
     useGlobalStateContext()
   const { commandBarSend } = useCommandsContext()
+  const {
+    context: { project },
+  } = useFileContext()
   const { enable: convertEnabled, handleClick: convertCallback } =
     useConvertToVariable()
 
   // 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.
   // Below is the client and server promise.
-  const { lspClient } = useMemo(() => {
+  const { lspClient: kclLspClient } = useMemo(() => {
     const intoServer: IntoServer = new IntoServer()
     const fromServer: FromServer = FromServer.create()
     const client = new Client(fromServer, intoServer)
     if (!TEST) {
       Server.initialize(intoServer, fromServer).then((lspServer) => {
-        lspServer.start()
-        setIsLSPServerReady(true)
+        lspServer.start('kcl')
+        setIsKclLspServerReady(true)
       })
     }
 
-    const lspClient = new LanguageServerClient({ client })
+    const lspClient = new LanguageServerClient({ client, name: 'kcl' })
     return { lspClient }
-  }, [setIsLSPServerReady])
+  }, [setIsKclLspServerReady])
+
+  // 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
+  // a good setup because it will restart the client but not the server :)
+  // We do not want to restart the server, its just wasteful.
+  const kclLSP = useMemo(() => {
+    let plugin = null
+    if (isKclLspServerReady && !TEST) {
+      // Set up the lsp plugin.
+      const lsp = kclLanguage({
+        // When we have more than one file, we'll need to change this.
+        documentUri: `file:///we-just-have-one-file-for-now.kcl`,
+        workspaceFolders: getWorkspaceFolders(),
+        client: kclLspClient,
+      })
+
+      plugin = lsp
+    }
+    return plugin
+  }, [kclLspClient, isKclLspServerReady])
+
+  const { lspClient: copilotLspClient } = useMemo(() => {
+    const intoServer: IntoServer = new IntoServer()
+    const fromServer: FromServer = FromServer.create()
+    const client = new Client(fromServer, intoServer)
+    if (!TEST) {
+      Server.initialize(intoServer, fromServer).then((lspServer) => {
+        const token = auth?.context?.token
+        lspServer.start('copilot', token)
+        setIsCopilotLspServerReady(true)
+      })
+    }
+
+    const lspClient = new LanguageServerClient({ client, name: 'copilot' })
+    return { lspClient }
+  }, [setIsCopilotLspServerReady])
 
   // Here we initialize the plugin which will start the client.
   // When we have multi-file support the name of the file will be a dep of
   // this use memo, as well as the directory structure, which I think is
   // a good setup because it will restart the client but not the server :)
   // We do not want to restart the server, its just wasteful.
-  const kclLSP = useMemo(() => {
+  const copilotLSP = useMemo(() => {
     let plugin = null
-    if (isLSPServerReady && !TEST) {
+    if (isCopilotLspServerReady && !TEST) {
       // Set up the lsp plugin.
-      const lsp = kclLanguage({
+      const lsp = copilotPlugin({
         // When we have more than one file, we'll need to change this.
         documentUri: `file:///we-just-have-one-file-for-now.kcl`,
-        workspaceFolders: null,
-        client: lspClient,
+        workspaceFolders: getWorkspaceFolders(),
+        client: copilotLspClient,
+        allowHTMLContent: true,
       })
 
       plugin = lsp
     }
     return plugin
-  }, [lspClient, isLSPServerReady])
+  }, [copilotLspClient, isCopilotLspServerReady, project])
 
   // const onChange = React.useCallback((value: string, viewUpdate: ViewUpdate) => {
-  const onChange = (newCode: string) => {
-    kclManager.setCodeAndExecute(newCode)
+  const onChange = async (newCode: string) => {
+    if (isNetworkOkay) kclManager.setCodeAndExecute(newCode)
+    else kclManager.setCode(newCode)
   } //, []);
   const onUpdate = (viewUpdate: ViewUpdate) => {
     if (!editorView) {
       setEditorView(viewUpdate.view)
     }
+    if (sceneInfra.selected) return // mid drag
+    const ignoreEvents: ModelingMachineEvent['type'][] = [
+      'Equip Line tool',
+      'Equip tangential arc to',
+    ]
+    if (ignoreEvents.includes(state.event.type)) return
     const eventInfo = processCodeMirrorRanges({
       codeMirrorRanges: viewUpdate.state.selection.ranges,
       selectionRanges,
@@ -122,7 +216,20 @@ export const TextEditor = ({
       isShiftDown,
     })
     if (!eventInfo) return
-
+    const deterministicEventInfo = {
+      ...eventInfo,
+      engineEvents: eventInfo.engineEvents.map((e) => ({
+        ...e,
+        cmd_id: 'static',
+      })),
+    }
+    const stringEvent = JSON.stringify(deterministicEventInfo)
+    if (
+      stringEvent === lastEvent.current.event &&
+      Date.now() - lastEvent.current.time < 500
+    )
+      return // don't repeat events
+    lastEvent.current = { event: stringEvent, time: Date.now() }
     send(eventInfo.modelingEvent)
     eventInfo.engineEvents.forEach((event) =>
       engineCommandManager.sendSceneCommand(event)
@@ -161,6 +268,7 @@ export const TextEditor = ({
     ] as Extension[]
 
     if (kclLSP) extensions.push(kclLSP)
+    if (copilotLSP) extensions.push(copilotLSP)
 
     // These extensions have proven to mess with vitest
     if (!TEST) {

src/components/Toolbar/EqualAngle.tsx

@@ -11,7 +11,7 @@ import {
   getTransformInfos,
   PathToNodeMap,
 } from '../../lang/std/sketchcombos'
-import { kclManager } from 'lang/KclSinglton'
+import { kclManager } from 'lang/KclSingleton'
 
 export function equalAngleInfo({
   selectionRanges,

src/components/Toolbar/EqualLength.tsx

@@ -11,7 +11,7 @@ import {
   getTransformInfos,
   PathToNodeMap,
 } from '../../lang/std/sketchcombos'
-import { kclManager } from 'lang/KclSinglton'
+import { kclManager } from 'lang/KclSingleton'
 
 export function setEqualLengthInfo({
   selectionRanges,