Composite is now generic over size in memory.

Previously the Composite trait accepted a Vec<Value> for reading from memory, and returned a Vec<Value> for writing to memory. This meant the caller might provide the wrong size of Vec (e.g. a Point3d requires 3 memory addresses, so the code has to check and handle if the user only passes in 2).

Now those methods accept/return a [Value; N] which is statically guaranteed to be the right size! This means there's no more need for runtime checks that the Vec is the right size -- because the array is guaranteed to be the right size.

This involves removing the SIZE constant and instead changing it into a SIZE const generic.

.codespellrc

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

.env.development

@@ -1,6 +1,6 @@
-VITE_KC_API_WS_MODELING_URL=wss://api.dev.zoo.dev/ws/modeling/commands
-VITE_KC_API_BASE_URL=https://api.dev.zoo.dev
-VITE_KC_SITE_BASE_URL=https://dev.zoo.dev
+VITE_KC_API_WS_MODELING_URL=wss://api.dev.kittycad.io/ws/modeling/commands
+VITE_KC_API_BASE_URL=https://api.dev.kittycad.io
+VITE_KC_SITE_BASE_URL=https://dev.kittycad.io
 VITE_KC_SKIP_AUTH=false
 VITE_KC_CONNECTION_TIMEOUT_MS=5000
 VITE_KC_SENTRY_DSN=

.env.production

@@ -1,6 +1,6 @@
-VITE_KC_API_WS_MODELING_URL=wss://api.zoo.dev/ws/modeling/commands
-VITE_KC_API_BASE_URL=https://api.zoo.dev
-VITE_KC_SITE_BASE_URL=https://zoo.dev
+VITE_KC_API_WS_MODELING_URL=wss://api.kittycad.io/ws/modeling/commands
+VITE_KC_API_BASE_URL=https://api.kittycad.io
+VITE_KC_SITE_BASE_URL=https://kittycad.io
 VITE_KC_SKIP_AUTH=false
 VITE_KC_CONNECTION_TIMEOUT_MS=15000
-VITE_KC_SENTRY_DSN=
+VITE_KC_SENTRY_DSN=https://a814f2f66734989a90367f48feee28ca@o1042111.ingest.sentry.io/4505789425844224

.eslintignore

@@ -1,2 +1 @@
 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

@@ -1,85 +0,0 @@
-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/cargo-clippy.yml

@@ -43,6 +43,17 @@ jobs:
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2.6.1
 
+      - name: Install ffmpeg
+        run: |
+          sudo apt update
+          sudo apt install \
+            ffmpeg \
+            libavformat-dev \
+            libavutil-dev \
+            libclang-dev \
+            libswscale-dev \
+            --no-install-recommends
+
       - name: Run clippy
         run: |
           cd "${{ matrix.dir }}"

.github/workflows/cargo-test.yml

@@ -44,6 +44,16 @@ jobs:
       - uses: taiki-e/install-action@nextest
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2.6.1
+      - name: Install ffmpeg
+        run: |
+          sudo apt update
+          sudo apt install \
+            ffmpeg \
+            libavformat-dev \
+            libavutil-dev \
+            libclang-dev \
+            libswscale-dev \
+            --no-install-recommends
       - name: cargo test
         shell: bash
         run: |-

.github/workflows/ci.yml

@@ -46,7 +46,6 @@ jobs:
           workspaces: './src/wasm-lib'
 
       - run: yarn build:wasm
-      - run: yarn xstate:typegen
       - run: yarn tsc
 
 
@@ -56,7 +55,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v4
       - name: Install codespell
         run: |
             python -m pip install codespell
@@ -86,6 +85,8 @@ 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)
@@ -103,7 +104,7 @@ jobs:
         if: github.event_name == 'schedule'
         run: |
           VERSION=$(date +'%-y.%-m.%-d') yarn bump-jsons
-          echo "$(jq --arg url 'https://dl.zoo.dev/releases/modeling-app/nightly/last_update.json' \
+          echo "$(jq --arg url 'https://dl.kittycad.io/releases/modeling-app/nightly/last_update.json' \
             '.tauri.updater.endpoints[]=$url' src-tauri/tauri.release.conf.json --indent 2)" > src-tauri/tauri.release.conf.json
 
       - uses: actions/upload-artifact@v3
@@ -122,9 +123,8 @@ jobs:
     needs: [prepare-json-files]
     runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: false
       matrix:
-        os: [macos-14, ubuntu-latest, windows-latest]
+        os: [macos-latest, ubuntu-latest, windows-latest]
     steps:
       - uses: actions/checkout@v4
 
@@ -181,16 +181,13 @@ jobs:
           cd ../../
           cp src/wasm-lib/pkg/wasm_lib_bg.wasm public
 
-      - name: Run vite build (build:both)
-        run: yarn vite build --mode ${{ env.BUILD_RELEASE == 'true' && 'production' || 'development' }}
-
       - name: Fix format
         run: yarn fmt
 
-      - name: Install x86 target for Universal builds (MacOS only)
-        if: matrix.os == 'macos-14'
+      - name: Install Universal target (MacOS only)
+        if: matrix.os == 'macos-latest'
         run: |
-          rustup target add x86_64-apple-darwin
+          rustup target add aarch64-apple-darwin
 
       - name: Prepare certificate and variables (Windows only)
         if: ${{ matrix.os == 'windows-latest' && env.BUILD_RELEASE == 'true' }}
@@ -224,7 +221,7 @@ jobs:
         with:
           includeRelease: false
           includeDebug: true
-          args: ${{ matrix.os == 'macos-14' && '--target universal-apple-darwin' || '' }}
+          args: ${{ matrix.os == 'macos-latest' && '--target universal-apple-darwin' || '' }}
 
       - name: Build the app (release) and sign
         uses: tauri-apps/tauri-action@v0
@@ -240,12 +237,11 @@ 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-14' && '--target universal-apple-darwin' || '' }} ${{ env.TAURI_CONF_ARGS }}"
+          args: "${{ matrix.os == 'macos-latest' && '--target universal-apple-darwin' || '' }} ${{ env.TAURI_CONF_ARGS }}"
 
       - uses: actions/upload-artifact@v3
-        if: matrix.os != 'ubuntu-latest'
         env:
-          PREFIX: ${{ matrix.os == 'macos-14' && 'src-tauri/target/universal-apple-darwin' || 'src-tauri/target' }}
+          PREFIX: ${{ matrix.os == 'macos-latest' && 'src-tauri/target/universal-apple-darwin' || 'src-tauri/target' }}
           MODE: ${{ env.BUILD_RELEASE == 'true' && 'release' || 'debug' }}
         with:
           path: "${{ env.PREFIX }}/${{ env.MODE }}/bundle/*/*"
@@ -253,13 +249,11 @@ jobs:
       - name: Run e2e tests (linux only)
         if: matrix.os == 'ubuntu-latest'
         run: |
-          cargo install tauri-driver@0.1.3
-          source .env.${{ env.BUILD_RELEASE == 'true' && 'production' || 'development' }}
-          export VITE_KC_API_BASE_URL
+          cargo install tauri-driver
           xvfb-run yarn test:e2e:tauri
         env:
-          E2E_APPLICATION: "./src-tauri/target/${{ env.BUILD_RELEASE == 'true' && 'release' || 'debug' }}/zoo-modeling-app"
-          KITTYCAD_API_TOKEN: ${{ env.BUILD_RELEASE == 'true' && secrets.KITTYCAD_API_TOKEN || secrets.KITTYCAD_API_TOKEN_DEV }}
+          E2E_APPLICATION: "./src-tauri/target/${{ env.BUILD_RELEASE == 'true' && 'release' || 'debug' }}/kittycad-modeling"
+          KITTYCAD_API_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN }}
 
 
   publish-apps-release:
@@ -272,24 +266,26 @@ jobs:
       PUB_DATE: ${{ github.event_name == 'release' && github.event.release.created_at || github.event.repository.updated_at }}
       NOTES: ${{ github.event_name == 'release' && github.event.release.body || format('Nightly build, commit {0}', github.sha) }}
       BUCKET_DIR: ${{ github.event_name == 'release' && 'dl.kittycad.io/releases/modeling-app' || 'dl.kittycad.io/releases/modeling-app/nightly' }}
-      WEBSITE_DIR: ${{ github.event_name == 'release' && 'dl.zoo.dev/releases/modeling-app' || 'dl.zoo.dev/releases/modeling-app/nightly' }}
     steps:
       - uses: actions/download-artifact@v3
 
       - name: Generate the update static endpoint
         run: |
-          ls -l artifact/*/*oo*
+          ls -l artifact/*/*itty*
           DARWIN_SIG=`cat artifact/macos/*.app.tar.gz.sig`
+          LINUX_SIG=`cat artifact/appimage/*.AppImage.tar.gz.sig`
           WINDOWS_SIG=`cat artifact/msi/*.msi.zip.sig`
-          RELEASE_DIR=https://${WEBSITE_DIR}/${VERSION}
+          RELEASE_DIR=https://${BUCKET_DIR}/${VERSION}
           jq --null-input \
             --arg version "${VERSION}" \
             --arg pub_date "${PUB_DATE}" \
             --arg notes "${NOTES}" \
             --arg darwin_sig "$DARWIN_SIG" \
-            --arg darwin_url "$RELEASE_DIR/macos/Zoo%20Modeling%20App.app.tar.gz" \
+            --arg darwin_url "$RELEASE_DIR/macos/KittyCAD%20Modeling.app.tar.gz" \
+            --arg linux_sig "$LINUX_SIG" \
+            --arg linux_url "$RELEASE_DIR/appimage/kittycad-modeling_${VERSION_NO_V}_amd64.AppImage.tar.gz" \
             --arg windows_sig "$WINDOWS_SIG" \
-            --arg windows_url "$RELEASE_DIR/msi/Zoo%20Modeling%20App_${VERSION_NO_V}_x64_en-US.msi.zip" \
+            --arg windows_url "$RELEASE_DIR/msi/KittyCAD%20Modeling_${VERSION_NO_V}_x64_en-US.msi.zip" \
             '{
               "version": $version,
               "pub_date": $pub_date,
@@ -303,6 +299,10 @@ jobs:
                   "signature": $darwin_sig,
                   "url": $darwin_url
                 },
+                "linux-x86_64": {
+                  "signature": $linux_sig,
+                  "url": $linux_url
+                },
                 "windows-x86_64": {
                   "signature": $windows_sig,
                   "url": $windows_url
@@ -313,13 +313,14 @@ jobs:
 
       - name: Generate the download static endpoint
         run: |
-          RELEASE_DIR=https://${WEBSITE_DIR}/${VERSION}
+          RELEASE_DIR=https://${BUCKET_DIR}/${VERSION}
           jq --null-input \
             --arg version "${VERSION}" \
             --arg pub_date "${PUB_DATE}" \
             --arg notes "${NOTES}" \
-            --arg darwin_url "$RELEASE_DIR/dmg/Zoo%20Modeling%20App_${VERSION_NO_V}_universal.dmg" \
-            --arg windows_url "$RELEASE_DIR/msi/Zoo%20Modeling%20App_${VERSION_NO_V}_x64_en-US.msi" \
+            --arg darwin_url "$RELEASE_DIR/dmg/KittyCAD%20Modeling_${VERSION_NO_V}_universal.dmg" \
+            --arg linux_url "$RELEASE_DIR/appimage/kittycad-modeling_${VERSION_NO_V}_amd64.AppImage" \
+            --arg windows_url "$RELEASE_DIR/msi/KittyCAD%20Modeling_${VERSION_NO_V}_x64_en-US.msi" \
             '{
               "version": $version,
               "pub_date": $pub_date,
@@ -328,6 +329,9 @@ jobs:
                 "dmg-universal": {
                   "url": $darwin_url
                 },
+                "appimage-x86_64": {
+                  "url": $linux_url
+                },
                 "msi-x86_64": {
                   "url": $windows_url
                 }
@@ -336,31 +340,31 @@ jobs:
             cat last_download.json
 
       - name: Authenticate to Google Cloud
-        uses: 'google-github-actions/auth@v2.1.1'
+        uses: 'google-github-actions/auth@v2.0.0'
         with:
           credentials_json: '${{ secrets.GOOGLE_CLOUD_DL_SA }}'
 
       - name: Set up Google Cloud SDK
-        uses: google-github-actions/setup-gcloud@v2.1.0
+        uses: google-github-actions/setup-gcloud@v1.1.1
         with:
           project_id: kittycadapi
 
       - name: Upload release files to public bucket
-        uses: google-github-actions/upload-cloud-storage@v2.1.0
+        uses: google-github-actions/upload-cloud-storage@v1.0.3
         with:
           path: artifact
-          glob: '*/Zoo*'
+          glob: '*/*itty*'
           parent: false
           destination: ${{ env.BUCKET_DIR }}/${{ env.VERSION }}
 
       - name: Upload update endpoint to public bucket
-        uses: google-github-actions/upload-cloud-storage@v2.1.0
+        uses: google-github-actions/upload-cloud-storage@v1.0.3
         with:
           path: last_update.json
           destination: ${{ env.BUCKET_DIR }}
 
       - name: Upload download endpoint to public bucket
-        uses: google-github-actions/upload-cloud-storage@v2.1.0
+        uses: google-github-actions/upload-cloud-storage@v1.0.3
         with:
           path: last_download.json
           destination: ${{ env.BUCKET_DIR }}
@@ -369,29 +373,4 @@ jobs:
         if: ${{ github.event_name == 'release' }}
         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
+          files: artifact/*/*itty*

.github/workflows/playwright.yml

@@ -14,7 +14,6 @@ jobs:
       with:
         node-version-file: '.nvmrc'
         cache: 'yarn'
-    - uses: KittyCAD/action-install-cli@v0.2.21
     - name: Install dependencies
       run: yarn
     - name: Install Playwright Browsers
@@ -34,7 +33,6 @@ jobs:
       env:
         CI: true
         token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
-        snapshottoken: ${{ secrets.KITTYCAD_API_TOKEN }}
     - uses: actions/upload-artifact@v3
       if: always()
       with:
@@ -79,7 +77,7 @@ jobs:
 
   playwright-macos:
     timeout-minutes: 60
-    runs-on: macos-14
+    runs-on: macos-latest
     needs: playwright-ubuntu
     steps:
     - uses: actions/checkout@v4

.gitignore

@@ -37,22 +37,7 @@ src/wasm-lib/lcov.info
 e2e/playwright/playwright-secrets.env
 e2e/playwright/temp1.png
 e2e/playwright/temp2.png
-# exports from snapshot-tests.spec.ts
-e2e/playwright/export-snapshots/*.ply
-e2e/playwright/export-snapshots/*.obj
-e2e/playwright/export-snapshots/*.step
-e2e/playwright/export-snapshots/*.stl
-e2e/playwright/export-snapshots/*binary.gltf
-e2e/playwright/export-snapshots/*embedded.gltf
-
-
 /test-results/
 /playwright-report/
 /blob-report/
 /playwright/.cache/
-
-
-## generated files
-src/**/*.typegen.ts
-
-src/wasm-lib/grackle/stdlib_cube_partial.json

.prettierignore

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

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2023 The Zoo Authors
+Copyright (c) 2023 The KittyCAD Authors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,17 +1,17 @@
-![Zoo Modeling App](/public/zma-logomark-outlined.png)
+![KittyCAD Modeling App](/public/kcma-logomark.png)
 
-## Zoo Modeling App
+## KittyCAD Modeling App
 
-live at [app.zoo.dev](https://app.zoo.dev/)
+live at [app.kittycad.io](https://app.kittycad.io/)
 
-A CAD application from the future, brought to you by the [Zoo team](https://zoo.dev).
+A CAD application from the future, brought to you by the [KittyCAD team](https://kittycad.io).
 
-Modeling App is our take on what a modern modelling experience can be. It is applying several lessons learned in the decades since most major CAD tools came into existence:
+The KittyCAD modeling app is our take on what a modern modelling experience can be. It is applying several lessons learned in the decades since most major CAD tools came into existence:
 
 - All artifacts—including parts and assemblies—should be represented as human-readable code. At the end of the day, your CAD project should be "plain text"
   - This makes version control—which is a solved problem in software engineering—trivial for CAD
 - All GUI (or point-and-click) interactions should be actions performed on this code representation under the hood
-  - This unlocks a hybrid approach to modeling. Whether you point-and-click as you always have or you write your own KCL code, you are performing the same action in Modeling App
+  - This unlocks a hybrid approach to modeling. Whether you point-and-click as you always have or you write your own KCL code, you are performing the same action in KittyCAD Modeling App
 - Everything graphics _has_ to be built for the GPU
   - Most CAD applications have had to retrofit support for GPUs, but our geometry engine is made for GPUs (primarily Nvidia's Vulkan), getting the order of magnitude rendering performance boost with it
 - Make the resource-intensive pieces of an application auto-scaling
@@ -19,9 +19,9 @@ Modeling App is our take on what a modern modelling experience can be. It is app
 
 We are excited about what a small team of people could build in a short time with our API. We welcome you to try our API, build your own applications, or contribute to ours!
 
-Modeling App is a _hybrid_ user interface for CAD modeling. You can point-and-click to design parts (and soon assemblies), but everything you make is really just [`kcl` code](https://github.com/KittyCAD/kcl-experiments) under the hood. All of your CAD models can be checked into source control such as GitHub and responsibly versioned, rolled back, and more.
+KittyCAD Modeling App is a _hybrid_ user interface for CAD modeling. You can point-and-click to design parts (and soon assemblies), but everything you make is really just [`kcl` code](https://github.com/KittyCAD/kcl-experiments) under the hood. All of your CAD models can be checked into source control such as GitHub and responsibly versioned, rolled back, and more.
 
-The 3D view in Modeling App is just a video stream from our hosted geometry engine. The app sends new modeling commands to the engine via WebSockets, which returns back video frames of the view within the engine.
+The 3D view in KittyCAD Modeling App is just a video stream from our hosted geometry engine. The app sends new modeling commands to the engine via WebSockets, which returns back video frames of the view within the engine.
 
 ## Tools
 
@@ -94,6 +94,7 @@ For running the rust (not tauri rust though) only, you can
 cd src/wasm-lib
 cargo test
 ```
+but you will need to have install ffmpeg prior to.
 
 ## Tauri
 
@@ -136,11 +137,6 @@ 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
@@ -187,9 +183,9 @@ 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
-printf 'token="your-token"\nsnapshottoken="your-snapshot-token"' > ./e2e/playwright/playwright-secrets.env
+echo 'token="your-token"' > ./e2e/playwright/playwright-secrets.env
 ```
-then replace "your-token" with a dev token from dev.zoo.dev/account/api-tokens
+then replace "your-token" with a dev token from dev.kittycad.io/account/api-tokens
 
 then:
 run playwright

docs/kcl/KNOWN-ISSUES.md

@@ -1,14 +0,0 @@
-# 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.
-
-- **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/obj-.obj

@@ -0,0 +1,189 @@
+v 0 -4 0
+v 0 0 0
+v 0 -4 -1
+v 0 0 -1
+v 3.0950184 -4 -1
+v 3.0950184 0 -1
+v 5.9513144 -4 -3
+v 5.9513144 0 -3
+v 9.5 -4 -3
+v 9.5 0 -3
+v 9.5 -4 -2.5
+v 9.5 0 -2.5
+v 6.108964 -4 -2.5
+v 6.108964 0 -2.5
+v 3.4311862 -4 -0.625
+v 4.323779 -4 -1.25
+v 4.323779 -0 -1.25
+v 3.4311862 -0 -0.625
+v 2.5385938 0 0
+v 2.5385938 -4 0
+v 3.342784 -4 0.375
+v 4.146974 -4 0.75
+v 3.342784 -0 0.375
+v 4.146974 -0 0.75
+v 5.755354 0 1.5
+v 5.755354 -4 1.5
+v 9.5 -4 1.5
+v 9.5 0 1.5
+v 9.5 -4 2
+v 9.5 0 2
+v 5.644507 -4 2
+v 5.644507 0 2
+v 3.5 -4 1
+v 3.5 0 1
+v 0 -4 1
+v 0 0 1
+vt 0.0127 -0.0508
+vt 0.0127 0.0508
+vt -0.0127 -0.0508
+vt -0.0127 0.0508
+vt -0.039306734 0.0508
+vt -0.039306734 -0.0508
+vt 0.039306734 0.0508
+vt 0.039306734 -0.0508
+vt -0.04428355 0.0508
+vt -0.04428355 -0.0508
+vt 0.04428355 0.0508
+vt 0.04428355 -0.0508
+vt -0.045068305 0.0508
+vt -0.045068305 -0.0508
+vt 0.045068305 0.0508
+vt 0.045068305 -0.0508
+vt -0.00635 0.0508
+vt -0.00635 -0.0508
+vt 0.00635 0.0508
+vt 0.00635 -0.0508
+vt 0.04306616 -0.0508
+vt 0.04306616 0.0508
+vt -0.04306616 -0.0508
+vt -0.04306616 0.0508
+vt -0.027677217 -0.0508
+vt 0.000000000000000048572257 -0.0508
+vt 0.000000000000000048572257 0.0508
+vt 0.055354435 -0.0508
+vt 0.055354435 0.0508
+vt -0.027677217 0.0508
+vt -0.055354435 0.0508
+vt -0.055354435 -0.0508
+vt -0.02253807 0.0508
+vt -0.04507614 0.0508
+vt -0.04507614 -0.0508
+vt 0.00000000000000005551115 0.0508
+vt -0.02253807 -0.0508
+vt 0.00000000000000005551115 -0.0508
+vt 0.04507614 -0.0508
+vt 0.04507614 0.0508
+vt -0.047557 0.0508
+vt -0.047557 -0.0508
+vt 0.047557 0.0508
+vt 0.047557 -0.0508
+vt 0.04896476 -0.0508
+vt 0.04896476 0.0508
+vt -0.04896476 -0.0508
+vt -0.04896476 0.0508
+vt 0.03005076 -0.0508
+vt 0.03005076 0.0508
+vt -0.03005076 -0.0508
+vt -0.03005076 0.0508
+vt 0.04445 -0.0508
+vt 0.04445 0.0508
+vt -0.04445 -0.0508
+vt -0.04445 0.0508
+vt 0.08490671 0.009525
+vt 0.06448028 0
+vt 0.0889 0.0254
+vt 0.08715213 -0.015875
+vt 0.10982399 -0.03175
+vt 0.07861347 -0.0254
+vt 0.10533314 0.01905
+vt 0.15116338 -0.0762
+vt 0 -0.0254
+vt 0 0
+vt 0.2413 -0.0762
+vt 0.15516768 -0.0635
+vt 0.2413 -0.0635
+vt 0.14337048 0.0508
+vt 0.146186 0.0381
+vt 0.2413 0.0381
+vt 0.2413 0.0508
+vt 0 0.0254
+vn -1 -0 0
+vn 0 -0 -1
+vn -0.57357645 -0 -0.81915206
+vn 1 -0 0
+vn 0 -0 1
+vn 0.57357645 -0 0.81915206
+vn 0.42261827 -0 -0.9063078
+vn -0.42261827 -0 0.9063078
+vn -0 1 -0
+vn 0 -1 0
+o Unnamed-0
+f 1/1/1 2/2/1 3/3/1
+f 3/3/1 2/2/1 4/4/1
+f 3/5/2 4/6/2 5/7/2
+f 5/7/2 4/6/2 6/8/2
+f 5/9/3 6/10/3 7/11/3
+f 7/11/3 6/10/3 8/12/3
+f 7/13/2 8/14/2 9/15/2
+f 9/15/2 8/14/2 10/16/2
+f 9/17/4 10/18/4 11/19/4
+f 11/19/4 10/18/4 12/20/4
+f 11/21/5 12/22/5 13/23/5
+f 13/23/5 12/22/5 14/24/5
+f 15/25/6 16/26/6 17/27/6
+f 16/26/6 13/28/6 14/29/6
+f 18/30/6 19/31/6 20/32/6
+f 15/25/6 18/30/6 20/32/6
+f 16/26/6 14/29/6 17/27/6
+f 18/30/6 15/25/6 17/27/6
+f 21/33/7 20/34/7 19/35/7
+f 22/36/7 21/33/7 23/37/7
+f 23/37/7 24/38/7 22/36/7
+f 24/38/7 25/39/7 26/40/7
+f 21/33/7 19/35/7 23/37/7
+f 26/40/7 22/36/7 24/38/7
+f 26/41/2 25/42/2 27/43/2
+f 27/43/2 25/42/2 28/44/2
+f 27/17/4 28/18/4 29/19/4
+f 29/19/4 28/18/4 30/20/4
+f 29/45/5 30/46/5 31/47/5
+f 31/47/5 30/46/5 32/48/5
+f 31/49/8 32/50/8 33/51/8
+f 33/51/8 32/50/8 34/52/8
+f 33/53/5 34/54/5 35/55/5
+f 35/55/5 34/54/5 36/56/5
+f 35/1/1 36/2/1 1/3/1
+f 1/3/1 36/2/1 2/4/1
+f 23/57/9 19/58/9 34/59/9
+f 18/60/9 17/61/9 6/62/9
+f 23/57/9 34/59/9 24/63/9
+f 17/61/9 8/64/9 6/62/9
+f 4/65/9 19/58/9 6/62/9
+f 4/65/9 2/66/9 19/58/9
+f 10/67/9 14/68/9 12/69/9
+f 10/67/9 8/64/9 14/68/9
+f 8/64/9 17/61/9 14/68/9
+f 32/70/9 25/71/9 24/63/9
+f 6/62/9 19/58/9 18/60/9
+f 24/63/9 34/59/9 32/70/9
+f 28/72/9 25/71/9 30/73/9
+f 25/71/9 32/70/9 30/73/9
+f 19/58/9 2/66/9 36/74/9
+f 34/59/9 19/58/9 36/74/9
+f 21/57/10 33/59/10 20/58/10
+f 22/63/10 33/59/10 21/57/10
+f 15/60/10 5/62/10 16/61/10
+f 22/63/10 26/71/10 31/70/10
+f 35/74/10 20/58/10 33/59/10
+f 35/74/10 1/66/10 20/58/10
+f 31/70/10 26/71/10 29/73/10
+f 29/73/10 26/71/10 27/72/10
+f 22/63/10 31/70/10 33/59/10
+f 20/58/10 5/62/10 15/60/10
+f 16/61/10 5/62/10 7/64/10
+f 13/68/10 16/61/10 7/64/10
+f 11/69/10 13/68/10 9/67/10
+f 13/68/10 7/64/10 9/67/10
+f 20/58/10 3/65/10 5/62/10
+f 3/65/10 20/58/10 1/66/10

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

@@ -0,0 +1,282 @@
+ply
+format ascii 1.0
+comment Generated by kittycad.io
+element vertex 204
+property float x
+property float y
+property float z
+element face 68
+property list uchar uint vertex_indices
+end_header
+0 0 4 
+0 0 0 
+0 -1 4 
+0 -1 4 
+0 0 0 
+0 -1 0 
+0 -1 4 
+0 -1 0 
+3.0950184 -1 4 
+3.0950184 -1 4 
+0 -1 0 
+3.0950184 -1 0 
+3.0950184 -1 4 
+3.0950184 -1 0 
+5.9513144 -3 4 
+5.9513144 -3 4 
+3.0950184 -1 0 
+5.9513144 -3 0 
+5.9513144 -3 4 
+5.9513144 -3 0 
+9.5 -3 4 
+9.5 -3 4 
+5.9513144 -3 0 
+9.5 -3 0 
+9.5 -3 4 
+9.5 -3 0 
+9.5 -2.5 4 
+9.5 -2.5 4 
+9.5 -3 0 
+9.5 -2.5 0 
+9.5 -2.5 4 
+9.5 -2.5 0 
+6.108964 -2.5 4 
+6.108964 -2.5 4 
+9.5 -2.5 0 
+6.108964 -2.5 0 
+3.4311862 -0.625 4 
+4.323779 -1.25 4 
+4.323779 -1.25 0 
+4.323779 -1.25 4 
+6.108964 -2.5 4 
+6.108964 -2.5 0 
+3.4311862 -0.625 0 
+2.5385938 0 0 
+2.5385938 0 4 
+3.4311862 -0.625 4 
+3.4311862 -0.625 0 
+2.5385938 0 4 
+4.323779 -1.25 4 
+6.108964 -2.5 0 
+4.323779 -1.25 0 
+3.4311862 -0.625 0 
+3.4311862 -0.625 4 
+4.323779 -1.25 0 
+3.342784 0.375 4 
+2.5385938 0 4 
+2.5385938 0 0 
+4.146974 0.75 4 
+3.342784 0.375 4 
+3.342784 0.375 0 
+3.342784 0.375 0 
+4.146974 0.75 0 
+4.146974 0.75 4 
+4.146974 0.75 0 
+5.755354 1.5 0 
+5.755354 1.5 4 
+3.342784 0.375 4 
+2.5385938 0 0 
+3.342784 0.375 0 
+5.755354 1.5 4 
+4.146974 0.75 4 
+4.146974 0.75 0 
+5.755354 1.5 4 
+5.755354 1.5 0 
+9.5 1.5 4 
+9.5 1.5 4 
+5.755354 1.5 0 
+9.5 1.5 0 
+9.5 1.5 4 
+9.5 1.5 0 
+9.5 2 4 
+9.5 2 4 
+9.5 1.5 0 
+9.5 2 0 
+9.5 2 4 
+9.5 2 0 
+5.644507 2 4 
+5.644507 2 4 
+9.5 2 0 
+5.644507 2 0 
+5.644507 2 4 
+5.644507 2 0 
+3.5 1 4 
+3.5 1 4 
+5.644507 2 0 
+3.5 1 0 
+3.5 1 4 
+3.5 1 0 
+0 1 4 
+0 1 4 
+3.5 1 0 
+0 1 0 
+0 1 4 
+0 1 0 
+0 0 4 
+0 0 4 
+0 1 0 
+0 0 0 
+3.342784 0.375 0 
+2.5385938 0 0 
+3.5 1 0 
+3.4311862 -0.625 0 
+4.323779 -1.25 0 
+3.0950184 -1 0 
+3.342784 0.375 0 
+3.5 1 0 
+4.146974 0.75 0 
+4.323779 -1.25 0 
+5.9513144 -3 0 
+3.0950184 -1 0 
+0 -1 0 
+2.5385938 0 0 
+3.0950184 -1 0 
+0 -1 0 
+0 0 0 
+2.5385938 0 0 
+9.5 -3 0 
+6.108964 -2.5 0 
+9.5 -2.5 0 
+9.5 -3 0 
+5.9513144 -3 0 
+6.108964 -2.5 0 
+5.9513144 -3 0 
+4.323779 -1.25 0 
+6.108964 -2.5 0 
+5.644507 2 0 
+5.755354 1.5 0 
+4.146974 0.75 0 
+3.0950184 -1 0 
+2.5385938 0 0 
+3.4311862 -0.625 0 
+4.146974 0.75 0 
+3.5 1 0 
+5.644507 2 0 
+9.5 1.5 0 
+5.755354 1.5 0 
+9.5 2 0 
+5.755354 1.5 0 
+5.644507 2 0 
+9.5 2 0 
+2.5385938 0 0 
+0 0 0 
+0 1 0 
+3.5 1 0 
+2.5385938 0 0 
+0 1 0 
+3.342784 0.375 4 
+3.5 1 4 
+2.5385938 0 4 
+4.146974 0.75 4 
+3.5 1 4 
+3.342784 0.375 4 
+3.4311862 -0.625 4 
+3.0950184 -1 4 
+4.323779 -1.25 4 
+4.146974 0.75 4 
+5.755354 1.5 4 
+5.644507 2 4 
+0 1 4 
+2.5385938 0 4 
+3.5 1 4 
+0 1 4 
+0 0 4 
+2.5385938 0 4 
+5.644507 2 4 
+5.755354 1.5 4 
+9.5 2 4 
+9.5 2 4 
+5.755354 1.5 4 
+9.5 1.5 4 
+4.146974 0.75 4 
+5.644507 2 4 
+3.5 1 4 
+2.5385938 0 4 
+3.0950184 -1 4 
+3.4311862 -0.625 4 
+4.323779 -1.25 4 
+3.0950184 -1 4 
+5.9513144 -3 4 
+6.108964 -2.5 4 
+4.323779 -1.25 4 
+5.9513144 -3 4 
+9.5 -2.5 4 
+6.108964 -2.5 4 
+9.5 -3 4 
+6.108964 -2.5 4 
+5.9513144 -3 4 
+9.5 -3 4 
+2.5385938 0 4 
+0 -1 4 
+3.0950184 -1 4 
+0 -1 4 
+2.5385938 0 4 
+0 0 4 
+3 0 1 2 
+3 3 4 5 
+3 6 7 8 
+3 9 10 11 
+3 12 13 14 
+3 15 16 17 
+3 18 19 20 
+3 21 22 23 
+3 24 25 26 
+3 27 28 29 
+3 30 31 32 
+3 33 34 35 
+3 36 37 38 
+3 39 40 41 
+3 42 43 44 
+3 45 46 47 
+3 48 49 50 
+3 51 52 53 
+3 54 55 56 
+3 57 58 59 
+3 60 61 62 
+3 63 64 65 
+3 66 67 68 
+3 69 70 71 
+3 72 73 74 
+3 75 76 77 
+3 78 79 80 
+3 81 82 83 
+3 84 85 86 
+3 87 88 89 
+3 90 91 92 
+3 93 94 95 
+3 96 97 98 
+3 99 100 101 
+3 102 103 104 
+3 105 106 107 
+3 108 109 110 
+3 111 112 113 
+3 114 115 116 
+3 117 118 119 
+3 120 121 122 
+3 123 124 125 
+3 126 127 128 
+3 129 130 131 
+3 132 133 134 
+3 135 136 137 
+3 138 139 140 
+3 141 142 143 
+3 144 145 146 
+3 147 148 149 
+3 150 151 152 
+3 153 154 155 
+3 156 157 158 
+3 159 160 161 
+3 162 163 164 
+3 165 166 167 
+3 168 169 170 
+3 171 172 173 
+3 174 175 176 
+3 177 178 179 
+3 180 181 182 
+3 183 184 185 
+3 186 187 188 
+3 189 190 191 
+3 192 193 194 
+3 195 196 197 
+3 198 199 200 
+3 201 202 203 

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

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
-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_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_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;
@@ -19,227 +19,227 @@ DATA;
 );
 #4 = CARTESIAN_POINT('NONE', (0, 0, -0));
 #5 = VERTEX_POINT('NONE', #4);
-#6 = CARTESIAN_POINT('NONE', (0, -0.64516, -0));
+#6 = CARTESIAN_POINT('NONE', (0, -0.0254, -0));
 #7 = VERTEX_POINT('NONE', #6);
-#8 = CARTESIAN_POINT('NONE', (0, -0.64516, 2.58064));
+#8 = CARTESIAN_POINT('NONE', (0, -0.0254, 0.1016));
 #9 = VERTEX_POINT('NONE', #8);
-#10 = CARTESIAN_POINT('NONE', (0, 0, 2.58064));
+#10 = CARTESIAN_POINT('NONE', (0, 0, 0.1016));
 #11 = VERTEX_POINT('NONE', #10);
-#12 = CARTESIAN_POINT('NONE', (1.996782122555674, -0.64516, -0));
+#12 = CARTESIAN_POINT('NONE', (0.07861346939195568, -0.0254, -0));
 #13 = VERTEX_POINT('NONE', #12);
-#14 = CARTESIAN_POINT('NONE', (1.996782122555674, -0.64516, 2.58064));
+#14 = CARTESIAN_POINT('NONE', (0.07861346939195568, -0.0254, 0.1016));
 #15 = VERTEX_POINT('NONE', #14);
-#16 = CARTESIAN_POINT('NONE', (3.839550058615159, -1.9354799999999992, -0));
+#16 = CARTESIAN_POINT('NONE', (0.1511633881344551, -0.07619999999999998, -0));
 #17 = VERTEX_POINT('NONE', #16);
-#18 = CARTESIAN_POINT('NONE', (3.839550058615159, -1.9354799999999992, 2.58064));
+#18 = CARTESIAN_POINT('NONE', (0.1511633881344551, -0.07619999999999998, 0.1016));
 #19 = VERTEX_POINT('NONE', #18);
-#20 = CARTESIAN_POINT('NONE', (6.12902, -1.93548, -0));
+#20 = CARTESIAN_POINT('NONE', (0.2413, -0.0762, -0));
 #21 = VERTEX_POINT('NONE', #20);
-#22 = CARTESIAN_POINT('NONE', (6.12902, -1.93548, 2.58064));
+#22 = CARTESIAN_POINT('NONE', (0.2413, -0.0762, 0.1016));
 #23 = VERTEX_POINT('NONE', #22);
-#24 = CARTESIAN_POINT('NONE', (6.12902, -1.6129, -0));
+#24 = CARTESIAN_POINT('NONE', (0.2413, -0.0635, -0));
 #25 = VERTEX_POINT('NONE', #24);
-#26 = CARTESIAN_POINT('NONE', (6.12902, -1.6129, 2.58064));
+#26 = CARTESIAN_POINT('NONE', (0.2413, -0.0635, 0.1016));
 #27 = VERTEX_POINT('NONE', #26);
-#28 = CARTESIAN_POINT('NONE', (3.9412591419317424, -1.6129, -0));
+#28 = CARTESIAN_POINT('NONE', (0.1551676827532182, -0.0635, -0));
 #29 = VERTEX_POINT('NONE', #28);
-#30 = CARTESIAN_POINT('NONE', (3.9412591419317424, -1.6129, 2.58064));
+#30 = CARTESIAN_POINT('NONE', (0.1551676827532182, -0.0635, 0.1016));
 #31 = VERTEX_POINT('NONE', #30);
-#32 = CARTESIAN_POINT('NONE', (1.6377992218573856, 0, -0));
+#32 = CARTESIAN_POINT('NONE', (0.06448028432509392, 0, -0));
 #33 = VERTEX_POINT('NONE', #32);
-#34 = CARTESIAN_POINT('NONE', (1.6377992218573856, 0, 2.58064));
+#34 = CARTESIAN_POINT('NONE', (0.06448028432509392, 0, 0.1016));
 #35 = VERTEX_POINT('NONE', #34);
-#36 = CARTESIAN_POINT('NONE', (3.7131243491113075, 0.9677400000000002, -0));
+#36 = CARTESIAN_POINT('NONE', (0.14618599799650817, 0.03810000000000001, -0));
 #37 = VERTEX_POINT('NONE', #36);
-#38 = CARTESIAN_POINT('NONE', (3.7131243491113075, 0.9677400000000002, 2.58064));
+#38 = CARTESIAN_POINT('NONE', (0.14618599799650817, 0.03810000000000001, 0.1016));
 #39 = VERTEX_POINT('NONE', #38);
-#40 = CARTESIAN_POINT('NONE', (6.12902, 0.9677399999999998, -0));
+#40 = CARTESIAN_POINT('NONE', (0.2413, 0.0381, -0));
 #41 = VERTEX_POINT('NONE', #40);
-#42 = CARTESIAN_POINT('NONE', (6.12902, 0.9677399999999998, 2.58064));
+#42 = CARTESIAN_POINT('NONE', (0.2413, 0.0381, 0.1016));
 #43 = VERTEX_POINT('NONE', #42);
-#44 = CARTESIAN_POINT('NONE', (6.12902, 1.29032, -0));
+#44 = CARTESIAN_POINT('NONE', (0.2413, 0.0508, -0));
 #45 = VERTEX_POINT('NONE', #44);
-#46 = CARTESIAN_POINT('NONE', (6.12902, 1.29032, 2.58064));
+#46 = CARTESIAN_POINT('NONE', (0.2413, 0.0508, 0.1016));
 #47 = VERTEX_POINT('NONE', #46);
-#48 = CARTESIAN_POINT('NONE', (3.6416100848359463, 1.29032, -0));
+#48 = CARTESIAN_POINT('NONE', (0.14337047578094278, 0.0508, -0));
 #49 = VERTEX_POINT('NONE', #48);
-#50 = CARTESIAN_POINT('NONE', (3.6416100848359463, 1.29032, 2.58064));
+#50 = CARTESIAN_POINT('NONE', (0.14337047578094278, 0.0508, 0.1016));
 #51 = VERTEX_POINT('NONE', #50);
-#52 = CARTESIAN_POINT('NONE', (2.2580599999999995, 0.64516, -0));
+#52 = CARTESIAN_POINT('NONE', (0.08889999999999999, 0.0254, -0));
 #53 = VERTEX_POINT('NONE', #52);
-#54 = CARTESIAN_POINT('NONE', (2.2580599999999995, 0.64516, 2.58064));
+#54 = CARTESIAN_POINT('NONE', (0.08889999999999999, 0.0254, 0.1016));
 #55 = VERTEX_POINT('NONE', #54);
-#56 = CARTESIAN_POINT('NONE', (0, 0.64516, -0));
+#56 = CARTESIAN_POINT('NONE', (0, 0.0254, -0));
 #57 = VERTEX_POINT('NONE', #56);
-#58 = CARTESIAN_POINT('NONE', (0, 0.64516, 2.58064));
+#58 = CARTESIAN_POINT('NONE', (0, 0.0254, 0.1016));
 #59 = VERTEX_POINT('NONE', #58);
 #60 = DIRECTION('NONE', (0, -1, 0));
-#61 = VECTOR('NONE', #60, 1);
+#61 = VECTOR('NONE', #60, 0.0254);
 #62 = CARTESIAN_POINT('NONE', (0, 0, -0));
 #63 = LINE('NONE', #62, #61);
 #64 = DIRECTION('NONE', (0, 0, 1));
-#65 = VECTOR('NONE', #64, 1);
-#66 = CARTESIAN_POINT('NONE', (0, -0.64516, -0));
+#65 = VECTOR('NONE', #64, 0.1016);
+#66 = CARTESIAN_POINT('NONE', (0, -0.0254, -0));
 #67 = LINE('NONE', #66, #65);
 #68 = DIRECTION('NONE', (0, -1, 0));
-#69 = VECTOR('NONE', #68, 1);
-#70 = CARTESIAN_POINT('NONE', (0, 0, 2.58064));
+#69 = VECTOR('NONE', #68, 0.0254);
+#70 = CARTESIAN_POINT('NONE', (0, 0, 0.1016));
 #71 = LINE('NONE', #70, #69);
 #72 = DIRECTION('NONE', (0, 0, 1));
-#73 = VECTOR('NONE', #72, 1);
+#73 = VECTOR('NONE', #72, 0.1016);
 #74 = CARTESIAN_POINT('NONE', (0, 0, -0));
 #75 = LINE('NONE', #74, #73);
 #76 = DIRECTION('NONE', (1, 0, 0));
-#77 = VECTOR('NONE', #76, 1);
-#78 = CARTESIAN_POINT('NONE', (0, -0.64516, -0));
+#77 = VECTOR('NONE', #76, 0.07861346939195568);
+#78 = CARTESIAN_POINT('NONE', (0, -0.0254, -0));
 #79 = LINE('NONE', #78, #77);
 #80 = DIRECTION('NONE', (0, 0, 1));
-#81 = VECTOR('NONE', #80, 1);
-#82 = CARTESIAN_POINT('NONE', (1.996782122555674, -0.64516, -0));
+#81 = VECTOR('NONE', #80, 0.1016);
+#82 = CARTESIAN_POINT('NONE', (0.07861346939195568, -0.0254, -0));
 #83 = LINE('NONE', #82, #81);
 #84 = DIRECTION('NONE', (1, 0, 0));
-#85 = VECTOR('NONE', #84, 1);
-#86 = CARTESIAN_POINT('NONE', (0, -0.64516, 2.58064));
+#85 = VECTOR('NONE', #84, 0.07861346939195568);
+#86 = CARTESIAN_POINT('NONE', (0, -0.0254, 0.1016));
 #87 = LINE('NONE', #86, #85);
-#88 = DIRECTION('NONE', (0.819152044288992, -0.5735764363510459, 0));
-#89 = VECTOR('NONE', #88, 1);
-#90 = CARTESIAN_POINT('NONE', (1.996782122555674, -0.64516, -0));
+#88 = DIRECTION('NONE', (0.8191520442889919, -0.5735764363510459, 0));
+#89 = VECTOR('NONE', #88, 0.08856709721755177);
+#90 = CARTESIAN_POINT('NONE', (0.07861346939195568, -0.0254, -0));
 #91 = LINE('NONE', #90, #89);
 #92 = DIRECTION('NONE', (0, 0, 1));
-#93 = VECTOR('NONE', #92, 1);
-#94 = CARTESIAN_POINT('NONE', (3.839550058615159, -1.9354799999999992, -0));
+#93 = VECTOR('NONE', #92, 0.1016);
+#94 = CARTESIAN_POINT('NONE', (0.1511633881344551, -0.07619999999999998, -0));
 #95 = LINE('NONE', #94, #93);
-#96 = DIRECTION('NONE', (0.819152044288992, -0.5735764363510459, 0));
-#97 = VECTOR('NONE', #96, 1);
-#98 = CARTESIAN_POINT('NONE', (1.996782122555674, -0.64516, 2.58064));
+#96 = DIRECTION('NONE', (0.8191520442889919, -0.5735764363510459, 0));
+#97 = VECTOR('NONE', #96, 0.08856709721755177);
+#98 = CARTESIAN_POINT('NONE', (0.07861346939195568, -0.0254, 0.1016));
 #99 = LINE('NONE', #98, #97);
-#100 = DIRECTION('NONE', (1, -0.00000000000000038794063361359933, 0));
-#101 = VECTOR('NONE', #100, 1);
-#102 = CARTESIAN_POINT('NONE', (3.839550058615159, -1.9354799999999992, -0));
+#100 = DIRECTION('NONE', (1, -0.0000000000000003079278779307945, 0));
+#101 = VECTOR('NONE', #100, 0.09013661186554489);
+#102 = CARTESIAN_POINT('NONE', (0.1511633881344551, -0.07619999999999998, -0));
 #103 = LINE('NONE', #102, #101);
 #104 = DIRECTION('NONE', (0, 0, 1));
-#105 = VECTOR('NONE', #104, 1);
-#106 = CARTESIAN_POINT('NONE', (6.12902, -1.93548, -0));
+#105 = VECTOR('NONE', #104, 0.1016);
+#106 = CARTESIAN_POINT('NONE', (0.2413, -0.0762, -0));
 #107 = LINE('NONE', #106, #105);
-#108 = DIRECTION('NONE', (1, -0.00000000000000038794063361359933, 0));
-#109 = VECTOR('NONE', #108, 1);
-#110 = CARTESIAN_POINT('NONE', (3.839550058615159, -1.9354799999999992, 2.58064));
+#108 = DIRECTION('NONE', (1, -0.0000000000000003079278779307945, 0));
+#109 = VECTOR('NONE', #108, 0.09013661186554489);
+#110 = CARTESIAN_POINT('NONE', (0.1511633881344551, -0.07619999999999998, 0.1016));
 #111 = LINE('NONE', #110, #109);
 #112 = DIRECTION('NONE', (0, 1, 0));
-#113 = VECTOR('NONE', #112, 1);
-#114 = CARTESIAN_POINT('NONE', (6.12902, -1.93548, -0));
+#113 = VECTOR('NONE', #112, 0.012700000000000003);
+#114 = CARTESIAN_POINT('NONE', (0.2413, -0.0762, -0));
 #115 = LINE('NONE', #114, #113);
 #116 = DIRECTION('NONE', (0, 0, 1));
-#117 = VECTOR('NONE', #116, 1);
-#118 = CARTESIAN_POINT('NONE', (6.12902, -1.6129, -0));
+#117 = VECTOR('NONE', #116, 0.1016);
+#118 = CARTESIAN_POINT('NONE', (0.2413, -0.0635, -0));
 #119 = LINE('NONE', #118, #117);
 #120 = DIRECTION('NONE', (0, 1, 0));
-#121 = VECTOR('NONE', #120, 1);
-#122 = CARTESIAN_POINT('NONE', (6.12902, -1.93548, 2.58064));
+#121 = VECTOR('NONE', #120, 0.012700000000000003);
+#122 = CARTESIAN_POINT('NONE', (0.2413, -0.0762, 0.1016));
 #123 = LINE('NONE', #122, #121);
 #124 = DIRECTION('NONE', (-1, 0, 0));
-#125 = VECTOR('NONE', #124, 1);
-#126 = CARTESIAN_POINT('NONE', (6.12902, -1.6129, -0));
+#125 = VECTOR('NONE', #124, 0.08613231724678178);
+#126 = CARTESIAN_POINT('NONE', (0.2413, -0.0635, -0));
 #127 = LINE('NONE', #126, #125);
 #128 = DIRECTION('NONE', (0, 0, 1));
-#129 = VECTOR('NONE', #128, 1);
-#130 = CARTESIAN_POINT('NONE', (3.9412591419317424, -1.6129, -0));
+#129 = VECTOR('NONE', #128, 0.1016);
+#130 = CARTESIAN_POINT('NONE', (0.1551676827532182, -0.0635, -0));
 #131 = LINE('NONE', #130, #129);
 #132 = DIRECTION('NONE', (-1, 0, 0));
-#133 = VECTOR('NONE', #132, 1);
-#134 = CARTESIAN_POINT('NONE', (6.12902, -1.6129, 2.58064));
+#133 = VECTOR('NONE', #132, 0.08613231724678178);
+#134 = CARTESIAN_POINT('NONE', (0.2413, -0.0635, 0.1016));
 #135 = LINE('NONE', #134, #133);
-#136 = DIRECTION('NONE', (-0.8191520442889919, 0.573576436351046, 0));
-#137 = VECTOR('NONE', #136, 1);
-#138 = CARTESIAN_POINT('NONE', (3.9412591419317424, -1.6129, -0));
+#136 = DIRECTION('NONE', (-0.8191520442889918, 0.573576436351046, 0));
+#137 = VECTOR('NONE', #136, 0.11070887152193974);
+#138 = CARTESIAN_POINT('NONE', (0.1551676827532182, -0.0635, -0));
 #139 = LINE('NONE', #138, #137);
 #140 = DIRECTION('NONE', (0, 0, 1));
-#141 = VECTOR('NONE', #140, 1);
-#142 = CARTESIAN_POINT('NONE', (1.6377992218573856, 0, -0));
+#141 = VECTOR('NONE', #140, 0.1016);
+#142 = CARTESIAN_POINT('NONE', (0.06448028432509392, 0, -0));
 #143 = LINE('NONE', #142, #141);
-#144 = DIRECTION('NONE', (-0.8191520442889919, 0.573576436351046, 0));
-#145 = VECTOR('NONE', #144, 1);
-#146 = CARTESIAN_POINT('NONE', (3.9412591419317424, -1.6129, 2.58064));
+#144 = DIRECTION('NONE', (-0.8191520442889918, 0.573576436351046, 0));
+#145 = VECTOR('NONE', #144, 0.11070887152193974);
+#146 = CARTESIAN_POINT('NONE', (0.1551676827532182, -0.0635, 0.1016));
 #147 = LINE('NONE', #146, #145);
-#148 = DIRECTION('NONE', (0.90630778703665, 0.4226182617406992, 0));
-#149 = VECTOR('NONE', #148, 1);
-#150 = CARTESIAN_POINT('NONE', (1.6377992218573856, 0, -0));
+#148 = DIRECTION('NONE', (0.90630778703665, 0.4226182617406993, 0));
+#149 = VECTOR('NONE', #148, 0.09015228031811025);
+#150 = CARTESIAN_POINT('NONE', (0.06448028432509392, 0, -0));
 #151 = LINE('NONE', #150, #149);
 #152 = DIRECTION('NONE', (0, 0, 1));
-#153 = VECTOR('NONE', #152, 1);
-#154 = CARTESIAN_POINT('NONE', (3.7131243491113075, 0.9677400000000002, -0));
+#153 = VECTOR('NONE', #152, 0.1016);
+#154 = CARTESIAN_POINT('NONE', (0.14618599799650817, 0.03810000000000001, -0));
 #155 = LINE('NONE', #154, #153);
-#156 = DIRECTION('NONE', (0.90630778703665, 0.4226182617406992, 0));
-#157 = VECTOR('NONE', #156, 1);
-#158 = CARTESIAN_POINT('NONE', (1.6377992218573856, 0, 2.58064));
+#156 = DIRECTION('NONE', (0.90630778703665, 0.4226182617406993, 0));
+#157 = VECTOR('NONE', #156, 0.09015228031811025);
+#158 = CARTESIAN_POINT('NONE', (0.06448028432509392, 0, 0.1016));
 #159 = LINE('NONE', #158, #157);
-#160 = DIRECTION('NONE', (1, -0.0000000000000001378647737807002, 0));
-#161 = VECTOR('NONE', #160, 1);
-#162 = CARTESIAN_POINT('NONE', (3.7131243491113075, 0.9677400000000002, -0));
+#160 = DIRECTION('NONE', (1, -0.00000000000000007295344279228718, 0));
+#161 = VECTOR('NONE', #160, 0.09511400200349182);
+#162 = CARTESIAN_POINT('NONE', (0.14618599799650817, 0.03810000000000001, -0));
 #163 = LINE('NONE', #162, #161);
 #164 = DIRECTION('NONE', (0, 0, 1));
-#165 = VECTOR('NONE', #164, 1);
-#166 = CARTESIAN_POINT('NONE', (6.12902, 0.9677399999999998, -0));
+#165 = VECTOR('NONE', #164, 0.1016);
+#166 = CARTESIAN_POINT('NONE', (0.2413, 0.0381, -0));
 #167 = LINE('NONE', #166, #165);
-#168 = DIRECTION('NONE', (1, -0.0000000000000001378647737807002, 0));
-#169 = VECTOR('NONE', #168, 1);
-#170 = CARTESIAN_POINT('NONE', (3.7131243491113075, 0.9677400000000002, 2.58064));
+#168 = DIRECTION('NONE', (1, -0.00000000000000007295344279228718, 0));
+#169 = VECTOR('NONE', #168, 0.09511400200349182);
+#170 = CARTESIAN_POINT('NONE', (0.14618599799650817, 0.03810000000000001, 0.1016));
 #171 = LINE('NONE', #170, #169);
 #172 = DIRECTION('NONE', (0, 1, 0));
-#173 = VECTOR('NONE', #172, 1);
-#174 = CARTESIAN_POINT('NONE', (6.12902, 0.9677399999999998, -0));
+#173 = VECTOR('NONE', #172, 0.012699999999999996);
+#174 = CARTESIAN_POINT('NONE', (0.2413, 0.0381, -0));
 #175 = LINE('NONE', #174, #173);
 #176 = DIRECTION('NONE', (0, 0, 1));
-#177 = VECTOR('NONE', #176, 1);
-#178 = CARTESIAN_POINT('NONE', (6.12902, 1.29032, -0));
+#177 = VECTOR('NONE', #176, 0.1016);
+#178 = CARTESIAN_POINT('NONE', (0.2413, 0.0508, -0));
 #179 = LINE('NONE', #178, #177);
 #180 = DIRECTION('NONE', (0, 1, 0));
-#181 = VECTOR('NONE', #180, 1);
-#182 = CARTESIAN_POINT('NONE', (6.12902, 0.9677399999999998, 2.58064));
+#181 = VECTOR('NONE', #180, 0.012699999999999996);
+#182 = CARTESIAN_POINT('NONE', (0.2413, 0.0381, 0.1016));
 #183 = LINE('NONE', #182, #181);
 #184 = DIRECTION('NONE', (-1, 0, 0));
-#185 = VECTOR('NONE', #184, 1);
-#186 = CARTESIAN_POINT('NONE', (6.12902, 1.29032, -0));
+#185 = VECTOR('NONE', #184, 0.0979295242190572);
+#186 = CARTESIAN_POINT('NONE', (0.2413, 0.0508, -0));
 #187 = LINE('NONE', #186, #185);
 #188 = DIRECTION('NONE', (0, 0, 1));
-#189 = VECTOR('NONE', #188, 1);
-#190 = CARTESIAN_POINT('NONE', (3.6416100848359463, 1.29032, -0));
+#189 = VECTOR('NONE', #188, 0.1016);
+#190 = CARTESIAN_POINT('NONE', (0.14337047578094278, 0.0508, -0));
 #191 = LINE('NONE', #190, #189);
 #192 = DIRECTION('NONE', (-1, 0, 0));
-#193 = VECTOR('NONE', #192, 1);
-#194 = CARTESIAN_POINT('NONE', (6.12902, 1.29032, 2.58064));
+#193 = VECTOR('NONE', #192, 0.0979295242190572);
+#194 = CARTESIAN_POINT('NONE', (0.2413, 0.0508, 0.1016));
 #195 = LINE('NONE', #194, #193);
-#196 = DIRECTION('NONE', (-0.90630778703665, -0.4226182617406995, 0));
-#197 = VECTOR('NONE', #196, 1);
-#198 = CARTESIAN_POINT('NONE', (3.6416100848359463, 1.29032, -0));
+#196 = DIRECTION('NONE', (-0.9063077870366499, -0.42261826174069944, 0));
+#197 = VECTOR('NONE', #196, 0.06010152021207346);
+#198 = CARTESIAN_POINT('NONE', (0.14337047578094278, 0.0508, -0));
 #199 = LINE('NONE', #198, #197);
 #200 = DIRECTION('NONE', (0, 0, 1));
-#201 = VECTOR('NONE', #200, 1);
-#202 = CARTESIAN_POINT('NONE', (2.2580599999999995, 0.64516, -0));
+#201 = VECTOR('NONE', #200, 0.1016);
+#202 = CARTESIAN_POINT('NONE', (0.08889999999999999, 0.0254, -0));
 #203 = LINE('NONE', #202, #201);
-#204 = DIRECTION('NONE', (-0.90630778703665, -0.4226182617406995, 0));
-#205 = VECTOR('NONE', #204, 1);
-#206 = CARTESIAN_POINT('NONE', (3.6416100848359463, 1.29032, 2.58064));
+#204 = DIRECTION('NONE', (-0.9063077870366499, -0.42261826174069944, 0));
+#205 = VECTOR('NONE', #204, 0.06010152021207346);
+#206 = CARTESIAN_POINT('NONE', (0.14337047578094278, 0.0508, 0.1016));
 #207 = LINE('NONE', #206, #205);
 #208 = DIRECTION('NONE', (-1, 0, 0));
-#209 = VECTOR('NONE', #208, 1);
-#210 = CARTESIAN_POINT('NONE', (2.2580599999999995, 0.64516, -0));
+#209 = VECTOR('NONE', #208, 0.08889999999999999);
+#210 = CARTESIAN_POINT('NONE', (0.08889999999999999, 0.0254, -0));
 #211 = LINE('NONE', #210, #209);
 #212 = DIRECTION('NONE', (0, 0, 1));
-#213 = VECTOR('NONE', #212, 1);
-#214 = CARTESIAN_POINT('NONE', (0, 0.64516, -0));
+#213 = VECTOR('NONE', #212, 0.1016);
+#214 = CARTESIAN_POINT('NONE', (0, 0.0254, -0));
 #215 = LINE('NONE', #214, #213);
 #216 = DIRECTION('NONE', (-1, 0, 0));
-#217 = VECTOR('NONE', #216, 1);
-#218 = CARTESIAN_POINT('NONE', (2.2580599999999995, 0.64516, 2.58064));
+#217 = VECTOR('NONE', #216, 0.08889999999999999);
+#218 = CARTESIAN_POINT('NONE', (0.08889999999999999, 0.0254, 0.1016));
 #219 = LINE('NONE', #218, #217);
 #220 = DIRECTION('NONE', (0, -1, 0));
-#221 = VECTOR('NONE', #220, 1);
-#222 = CARTESIAN_POINT('NONE', (0, 0.64516, -0));
+#221 = VECTOR('NONE', #220, 0.0254);
+#222 = CARTESIAN_POINT('NONE', (0, 0.0254, -0));
 #223 = LINE('NONE', #222, #221);
 #224 = DIRECTION('NONE', (0, -1, 0));
-#225 = VECTOR('NONE', #224, 1);
-#226 = CARTESIAN_POINT('NONE', (0, 0.64516, 2.58064));
+#225 = VECTOR('NONE', #224, 0.0254);
+#226 = CARTESIAN_POINT('NONE', (0, 0.0254, 0.1016));
 #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.3225799999999985, 1.2903199999999995));
-#371 = DIRECTION('NONE', (-1, -0, 0));
+#370 = CARTESIAN_POINT('NONE', (0, -0.0127, 0.0508));
+#371 = DIRECTION('NONE', (-1, 0, -0));
 #372 = AXIS2_PLACEMENT_3D('NONE', #370, #371, $);
 #373 = PLANE('NONE', #372);
-#374 = CARTESIAN_POINT('NONE', (0.9983910612778368, -0.6451599999999998, 1.2903199999999997));
-#375 = DIRECTION('NONE', (0, -1, 0));
+#374 = CARTESIAN_POINT('NONE', (0.039306734695977924, -0.025399999999999995, 0.0508));
+#375 = DIRECTION('NONE', (0, -1, -0));
 #376 = AXIS2_PLACEMENT_3D('NONE', #374, #375, $);
 #377 = PLANE('NONE', #376);
-#378 = CARTESIAN_POINT('NONE', (2.918166090585415, -1.2903199999999988, 1.2903199999999997));
-#379 = DIRECTION('NONE', (-0.5735764363510459, -0.8191520442889919, 0));
+#378 = CARTESIAN_POINT('NONE', (0.11488842876320533, -0.05079999999999996, 0.05079999999999999));
+#379 = DIRECTION('NONE', (-0.5735764363510459, -0.819152044288992, 0));
 #380 = AXIS2_PLACEMENT_3D('NONE', #378, #379, $);
 #381 = PLANE('NONE', #380);
-#382 = CARTESIAN_POINT('NONE', (4.984285029307579, -1.9354799999999992, 1.2903199999999997));
-#383 = DIRECTION('NONE', (0, -1, 0));
+#382 = CARTESIAN_POINT('NONE', (0.19623169406722757, -0.07619999999999999, 0.0508));
+#383 = DIRECTION('NONE', (0, -1, -0));
 #384 = AXIS2_PLACEMENT_3D('NONE', #382, #383, $);
 #385 = PLANE('NONE', #384);
-#386 = CARTESIAN_POINT('NONE', (6.129019999999999, -1.7741899999999997, 1.2903199999999997));
-#387 = DIRECTION('NONE', (1, -0, 0));
+#386 = CARTESIAN_POINT('NONE', (0.2413, -0.06985, 0.0508));
+#387 = DIRECTION('NONE', (1, 0, -0));
 #388 = AXIS2_PLACEMENT_3D('NONE', #386, #387, $);
 #389 = PLANE('NONE', #388);
-#390 = CARTESIAN_POINT('NONE', (5.035139570965871, -1.6128999999999998, 1.2903199999999997));
+#390 = CARTESIAN_POINT('NONE', (0.19823384137660915, -0.0635, 0.0508));
 #391 = DIRECTION('NONE', (0, 1, -0));
 #392 = AXIS2_PLACEMENT_3D('NONE', #390, #391, $);
 #393 = PLANE('NONE', #392);
-#394 = CARTESIAN_POINT('NONE', (2.7895291818945633, -0.8064499999999998, 1.2903199999999995));
-#395 = DIRECTION('NONE', (0.5735764363510459, 0.8191520442889918, -0));
+#394 = CARTESIAN_POINT('NONE', (0.10982398353915601, -0.03174999999999997, 0.0508));
+#395 = DIRECTION('NONE', (0.573576436351046, 0.8191520442889918, -0));
 #396 = AXIS2_PLACEMENT_3D('NONE', #394, #395, $);
 #397 = PLANE('NONE', #396);
-#398 = CARTESIAN_POINT('NONE', (2.6754617854843468, 0.4838700000000003, 1.2903199999999997));
-#399 = DIRECTION('NONE', (0.4226182617406992, -0.90630778703665, 0));
+#398 = CARTESIAN_POINT('NONE', (0.105333141160801, 0.019049999999999987, 0.0508));
+#399 = DIRECTION('NONE', (0.4226182617406993, -0.90630778703665, -0));
 #400 = AXIS2_PLACEMENT_3D('NONE', #398, #399, $);
 #401 = PLANE('NONE', #400);
-#402 = CARTESIAN_POINT('NONE', (4.921072174555653, 0.9677399999999998, 1.2903199999999995));
-#403 = DIRECTION('NONE', (0, -1, 0));
+#402 = CARTESIAN_POINT('NONE', (0.19374299899825406, 0.0381, 0.0508));
+#403 = DIRECTION('NONE', (0, -1, -0));
 #404 = AXIS2_PLACEMENT_3D('NONE', #402, #403, $);
 #405 = PLANE('NONE', #404);
-#406 = CARTESIAN_POINT('NONE', (6.129019999999998, 1.1290299999999989, 1.2903199999999995));
-#407 = DIRECTION('NONE', (1, -0, 0));
+#406 = CARTESIAN_POINT('NONE', (0.2413, 0.044449999999999996, 0.0508));
+#407 = DIRECTION('NONE', (1, 0, -0));
 #408 = AXIS2_PLACEMENT_3D('NONE', #406, #407, $);
 #409 = PLANE('NONE', #408);
-#410 = CARTESIAN_POINT('NONE', (4.8853150424179725, 1.2903199999999997, 1.2903199999999997));
+#410 = CARTESIAN_POINT('NONE', (0.19233523789047138, 0.0508, 0.0508));
 #411 = DIRECTION('NONE', (0, 1, -0));
 #412 = AXIS2_PLACEMENT_3D('NONE', #410, #411, $);
 #413 = PLANE('NONE', #412);
-#414 = CARTESIAN_POINT('NONE', (2.9498350424179733, 0.9677399999999998, 1.2903199999999997));
-#415 = DIRECTION('NONE', (-0.42261826174069933, 0.9063077870366499, -0));
+#414 = CARTESIAN_POINT('NONE', (0.11613523789047137, 0.0381, 0.05079999999999999));
+#415 = DIRECTION('NONE', (-0.42261826174069966, 0.90630778703665, -0));
 #416 = AXIS2_PLACEMENT_3D('NONE', #414, #415, $);
 #417 = PLANE('NONE', #416);
-#418 = CARTESIAN_POINT('NONE', (1.1290299999999998, 0.6451599999999998, 1.29032));
+#418 = CARTESIAN_POINT('NONE', (0.044449999999999996, 0.0254, 0.0508));
 #419 = DIRECTION('NONE', (0, 1, -0));
 #420 = AXIS2_PLACEMENT_3D('NONE', #418, #419, $);
 #421 = PLANE('NONE', #420);
-#422 = CARTESIAN_POINT('NONE', (0, 0.32257999999999987, 1.2903199999999995));
-#423 = DIRECTION('NONE', (-1, -0, 0));
+#422 = CARTESIAN_POINT('NONE', (0, 0.0127, 0.0508));
+#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, 2.58064));
+#430 = CARTESIAN_POINT('NONE', (0, 0, 0.1016));
 #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, .F.);
+#462 = FACE_OUTER_BOUND('NONE', #354, .T.);
 #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 -101.600006 0
+        vertex 0 -4 0
         vertex 0 -0 0
-        vertex 0 -101.600006 -25.400002
+        vertex 0 -4 -1
     endloop
 endfacet
 facet normal -1 0 0
     outer loop
-        vertex 0 -101.600006 -25.400002
+        vertex 0 -4 -1
         vertex 0 -0 0
-        vertex 0 -0 -25.400002
+        vertex 0 -0 -1
     endloop
 endfacet
 facet normal 0 0 -1
     outer loop
-        vertex 0 -101.600006 -25.400002
-        vertex 0 -0 -25.400002
-        vertex 78.613464 -101.600006 -25.400002
+        vertex 0 -4 -1
+        vertex 0 -0 -1
+        vertex 3.0950184 -4 -1
     endloop
 endfacet
 facet normal 0 0 -1
     outer loop
-        vertex 78.613464 -101.600006 -25.400002
-        vertex 0 -0 -25.400002
-        vertex 78.613464 -0 -25.400002
+        vertex 3.0950184 -4 -1
+        vertex 0 -0 -1
+        vertex 3.0950184 -0 -1
     endloop
 endfacet
-facet normal -0.5735764 0 -0.8191522
+facet normal -0.57357645 0 -0.81915206
     outer loop
-        vertex 78.613464 -101.600006 -25.400002
-        vertex 78.613464 -0 -25.400002
-        vertex 151.16339 -101.600006 -76.2
+        vertex 3.0950184 -4 -1
+        vertex 3.0950184 -0 -1
+        vertex 5.9513144 -4 -3
     endloop
 endfacet
-facet normal -0.5735764 0 -0.8191522
+facet normal -0.57357645 0 -0.81915206
     outer loop
-        vertex 151.16339 -101.600006 -76.2
-        vertex 78.613464 -0 -25.400002
-        vertex 151.16339 -0 -76.2
+        vertex 5.9513144 -4 -3
+        vertex 3.0950184 -0 -1
+        vertex 5.9513144 -0 -3
     endloop
 endfacet
 facet normal 0 0 -1
     outer loop
-        vertex 151.16339 -101.600006 -76.2
-        vertex 151.16339 -0 -76.2
-        vertex 241.3 -101.600006 -76.2
+        vertex 5.9513144 -4 -3
+        vertex 5.9513144 -0 -3
+        vertex 9.5 -4 -3
     endloop
 endfacet
 facet normal 0 0 -1
     outer loop
-        vertex 241.3 -101.600006 -76.2
-        vertex 151.16339 -0 -76.2
-        vertex 241.3 -0 -76.2
+        vertex 9.5 -4 -3
+        vertex 5.9513144 -0 -3
+        vertex 9.5 -0 -3
     endloop
 endfacet
 facet normal 1 0 0
     outer loop
-        vertex 241.3 -101.600006 -76.2
-        vertex 241.3 -0 -76.2
-        vertex 241.3 -101.600006 -63.5
+        vertex 9.5 -4 -3
+        vertex 9.5 -0 -3
+        vertex 9.5 -4 -2.5
     endloop
 endfacet
 facet normal 1 -0 0
     outer loop
-        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
+        vertex 9.5 -4 -2.5
+        vertex 9.5 -0 -3
+        vertex 9.5 -0 -2.5
     endloop
 endfacet
 facet normal 0 -0 0.99999994
     outer loop
-        vertex 241.3 -101.600006 50.800003
-        vertex 241.3 -0 50.800003
-        vertex 143.37048 -101.600006 50.800003
+        vertex 9.5 -4 -2.5
+        vertex 9.5 -0 -2.5
+        vertex 6.108964 -4 -2.5
     endloop
 endfacet
 facet normal 0 0 0.99999994
     outer loop
-        vertex 143.37048 -101.600006 50.800003
-        vertex 241.3 -0 50.800003
-        vertex 143.37048 -0 50.800003
+        vertex 6.108964 -4 -2.5
+        vertex 9.5 -0 -2.5
+        vertex 6.108964 -0 -2.5
     endloop
 endfacet
-facet normal -0.42261827 0 0.9063078
+facet normal 0.5735763 0 0.8191522
     outer loop
-        vertex 143.37048 -101.600006 50.800003
-        vertex 143.37048 -0 50.800003
-        vertex 88.9 -101.600006 25.400002
+        vertex 3.4311862 -4 -0.625
+        vertex 4.323779 -4 -1.25
+        vertex 4.323779 -0 -1.25
     endloop
 endfacet
-facet normal -0.42261827 0 0.9063078
+facet normal 0.57357645 0 0.819152
     outer loop
-        vertex 88.9 -101.600006 25.400002
-        vertex 143.37048 -0 50.800003
-        vertex 88.9 -0 25.400002
+        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
     endloop
 endfacet
 facet normal 0 -0 1
     outer loop
-        vertex 88.9 -101.600006 25.400002
-        vertex 88.9 -0 25.400002
-        vertex 0 -101.600006 25.400002
+        vertex 9.5 -4 2
+        vertex 9.5 -0 2
+        vertex 5.644507 -4 2
     endloop
 endfacet
 facet normal 0 0 1
     outer loop
-        vertex 0 -101.600006 25.400002
-        vertex 88.9 -0 25.400002
-        vertex 0 -0 25.400002
+        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
     endloop
 endfacet
 facet normal -1 0 0
     outer loop
-        vertex 0 -101.600006 25.400002
-        vertex 0 -0 25.400002
-        vertex 0 -101.600006 0
+        vertex 0 -4 1
+        vertex 0 -0 1
+        vertex 0 -4 0
     endloop
 endfacet
 facet normal -1 0 0
     outer loop
-        vertex 0 -101.600006 0
-        vertex 0 -0 25.400002
+        vertex 0 -4 0
+        vertex 0 -0 1
         vertex 0 -0 0
     endloop
 endfacet
 facet normal 0 1 -0
     outer loop
-        vertex 84.906715 -0 9.525
-        vertex 64.480286 -0 0
-        vertex 88.9 -0 25.400002
+        vertex 3.342784 -0 0.375
+        vertex 2.5385938 -0 0
+        vertex 3.5 -0 1
     endloop
 endfacet
 facet normal 0 1 0
     outer loop
-        vertex 105.33314 -0 19.05
-        vertex 84.906715 -0 9.525
-        vertex 88.9 -0 25.400002
+        vertex 3.4311862 -0 -0.625
+        vertex 4.323779 -0 -1.25
+        vertex 3.0950184 -0 -1
     endloop
 endfacet
 facet normal 0 1 0
     outer loop
-        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
+        vertex 3.342784 -0 0.375
+        vertex 3.5 -0 1
+        vertex 4.146974 -0 0.75
     endloop
 endfacet
 facet normal 0 0.99999994 0
     outer loop
-        vertex 64.480286 -0 0
-        vertex 87.15214 -0 -15.875
-        vertex 78.613464 -0 -25.400002
+        vertex 4.323779 -0 -1.25
+        vertex 5.9513144 -0 -3
+        vertex 3.0950184 -0 -1
     endloop
 endfacet
 facet normal 0 1 0
     outer loop
-        vertex 109.82398 -0 -31.75
-        vertex 151.16339 -0 -76.2
-        vertex 78.613464 -0 -25.400002
+        vertex 0 -0 -1
+        vertex 2.5385938 -0 0
+        vertex 3.0950184 -0 -1
     endloop
 endfacet
 facet normal 0 1 0
     outer loop
-        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 -1
         vertex 0 -0 0
-        vertex 64.480286 -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
     endloop
 endfacet
 facet normal -0 -1 0
     outer loop
-        vertex 84.906715 -101.600006 9.525
-        vertex 88.9 -101.600006 25.400002
-        vertex 64.480286 -101.600006 0
+        vertex 3.342784 -4 0.375
+        vertex 3.5 -4 1
+        vertex 2.5385938 -4 0
     endloop
 endfacet
 facet normal -0 -1 0
     outer loop
-        vertex 105.33314 -101.600006 19.05
-        vertex 88.9 -101.600006 25.400002
-        vertex 84.906715 -101.600006 9.525
+        vertex 4.146974 -4 0.75
+        vertex 3.5 -4 1
+        vertex 3.342784 -4 0.375
     endloop
 endfacet
 facet normal 0 -1 -0
     outer loop
-        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
+        vertex 3.4311862 -4 -0.625
+        vertex 3.0950184 -4 -1
+        vertex 4.323779 -4 -1.25
     endloop
 endfacet
 facet normal 0 -0.99999994 0
     outer loop
-        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
-    outer loop
-        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 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 -1 -0
-    outer loop
-        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 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 64.480286 -101.600006 0
-        vertex 0 -101.600006 -25.400002
-        vertex 78.613464 -101.600006 -25.400002
+        vertex 4.146974 -4 0.75
+        vertex 5.755354 -4 1.5
+        vertex 5.644507 -4 2
     endloop
 endfacet
 facet normal 0 -1 0
     outer loop
-        vertex 0 -101.600006 -25.400002
-        vertex 64.480286 -101.600006 0
-        vertex 0 -101.600006 0
+        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
+    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
+    endloop
+endfacet
+facet normal -0 -0.99999994 -0
+    outer loop
+        vertex 9.5 -4 -2.5
+        vertex 6.108964 -4 -2.5
+        vertex 9.5 -4 -3
+    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
+    endloop
+endfacet
+facet normal 0 -1 -0
+    outer loop
+        vertex 2.5385938 -4 0
+        vertex 0 -4 -1
+        vertex 3.0950184 -4 -1
+    endloop
+endfacet
+facet normal 0 -1 0
+    outer loop
+        vertex 0 -4 -1
+        vertex 2.5385938 -4 0
+        vertex 0 -4 0
     endloop
 endfacet
 endsolid unnamed

e2e/playwright/flow-tests.spec.ts

@@ -1,8 +1,11 @@
 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'
+import { Models } from '@kittycad/lib'
+import fsp from 'fs/promises'
 
 /*
 debug helper: unfortunately we do rely on exact coord mouse clicks in a few places
@@ -14,12 +17,6 @@ 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({
@@ -57,66 +54,71 @@ 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 u.doAndWaitForImageDiff(
-    () => page.getByRole('button', { name: 'Start Sketch' }).click(),
-    200
-  )
+  await Promise.all([
+    u.doAndWaitForImageDiff(
+      () => page.getByRole('button', { name: 'Start Sketch' }).click(),
+      200
+    ),
+    u.waitForDefaultPlanesVisibilityChange(),
+  ])
 
   // select a plane
-  await page.mouse.click(700, 200)
+  await u.doAndWaitForCmd(() => page.mouse.click(700, 200), 'edit_mode_enter')
+  await u.waitForCmdReceive('set_tool')
 
-  await expect(page.locator('.cm-content')).toHaveText(
-    `const part001 = startSketchOn('-XZ')`
+  await u.doAndWaitForCmd(
+    () => page.getByRole('button', { name: 'Line' }).click(),
+    'set_tool'
   )
 
-  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.doAndWaitForCmd(
+    () => page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10),
+    'mouse_click',
+    false
+  )
 
-  await u.closeDebugPanel()
   await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 10)
-  await page.waitForTimeout(100)
 
-  const num = 26.63
+  const startAt = '[10.97, -14.79]'
+  const tenish = '11.07'
   await expect(page.locator('.cm-content'))
     .toHaveText(`const part001 = startSketchOn('-XZ')
-  |> startProfileAt(${commonPoints.startAt}, %)
-  |> line([${commonPoints.num1}, 0], %)`)
+  |> startProfileAt(${startAt}, %)
+  |> line([${tenish}, 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}], %)`)
+  |> startProfileAt(${startAt}, %)
+  |> line([${tenish}, 0], %)
+  |> line([0, ${tenish}], %)`)
   await page.mouse.click(startXPx, 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}], %)
-  |> line([-${commonPoints.num2}, 0], %)`)
+  |> startProfileAt(${startAt}, %)
+  |> line([${tenish}, 0], %)
+  |> line([0, ${tenish}], %)
+  |> line([-22.04, 0], %)`)
 
   // deselect line tool
-  await page.getByRole('button', { name: 'Line' }).click()
-  await page.waitForTimeout(100)
+  await u.doAndWaitForCmd(
+    () => page.getByRole('button', { name: 'Line' }).click(),
+    'set_tool'
+  )
 
   // click between first two clicks to get center of the line
-  await page.mouse.click(startXPx + PUR * 15, 500 - PUR * 10)
-  await page.waitForTimeout(100)
+  await u.doAndWaitForCmd(
+    () => page.mouse.click(startXPx + PUR * 15, 500 - PUR * 10),
+    'select_with_point'
+  )
+  await u.closeDebugPanel()
 
   // hold down shift
   await page.keyboard.down('Shift')
@@ -130,9 +132,9 @@ test('Basic sketch', async ({ page }) => {
 
   await expect(page.locator('.cm-content'))
     .toHaveText(`const part001 = startSketchOn('-XZ')
-  |> startProfileAt(${commonPoints.startAt}, %)
-  |> line({ to: [${commonPoints.num1}, 0], tag: 'seg01' }, %)
-  |> line([0, ${commonPoints.num1}], %)
+  |> startProfileAt(${startAt}, %)
+  |> line({ to: [${tenish}, 0], tag: 'seg01' }, %)
+  |> line([0, ${tenish}], %)
   |> angledLine([180, segLen('seg01', %)], %)`)
 })
 
@@ -181,31 +183,11 @@ test('if you write invalid kcl you get inlined errors', async ({ page }) => {
 
   // wait for .cm-lint-marker-error not to be visible
   await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
-
-  // let's check we get an error when defining the same variable twice
-  await page.getByText('const bottomAng = 25').click()
-  await page.keyboard.press('Enter')
-  await page.keyboard.type("// Let's define the same thing twice")
-  await page.keyboard.press('Enter')
-  await page.keyboard.type('const topAng = 42')
-
-  await expect(page.locator('.cm-lint-marker-error')).toBeVisible()
-  await expect(page.locator('.cm-lintRange.cm-lintRange-error')).toBeVisible()
-
-  await page.locator('.cm-lintRange.cm-lintRange-error').hover()
-  await expect(page.locator('.cm-diagnosticText')).toBeVisible()
-  await expect(page.getByText('Cannot redefine topAng')).toBeVisible()
-
-  const secondTopAng = await page.getByText('topAng').first()
-  await secondTopAng?.dblclick()
-  await page.keyboard.type('otherAng')
-
-  await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
 })
 
 test('executes on load', async ({ page, context }) => {
   const u = getUtils(page)
-  await context.addInitScript(async () => {
+  await context.addInitScript(async (token) => {
     localStorage.setItem(
       'persistCode',
       `const part001 = startSketchOn('-XZ')
@@ -270,41 +252,59 @@ 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 camPos: [number, number, number] = [100, 100, 100]
+  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 TestSinglePlane = async ({
     viewCmd,
     expectedCode,
     clickCoords,
   }: {
-    viewCmd: [number, number, number]
+    viewCmd: EngineCommand
     expectedCode: string
     clickCoords: { x: number; y: number }
   }) => {
     await u.openDebugPanel()
-
-    await u.updateCamPosition(viewCmd)
-
+    await u.sendCustomCmd(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 page.waitForTimeout(300) // wait for animation
+    await u.openDebugPanel()
 
     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.openAndClearDebugPanel()
+    await u.clearCommandLogs()
     await page.getByRole('button', { name: 'Exit Sketch' }).click()
     await u.expectCmdLog('[data-message-type="execution-done"]')
 
@@ -313,40 +313,52 @@ test('Can create sketches on all planes and their back sides', async ({
   }
 
   const codeTemplate = (
-    plane = 'XY'
+    plane = 'XY',
+    sign = ''
   ) => `const part001 = startSketchOn('${plane}')
-  |> startProfileAt([32.13, -43.34], %)`
+  |> startProfileAt([${sign}6.88, -9.29], %)
+  |> line([${sign}6.95, 0], %)`
   await TestSinglePlane({
-    viewCmd: camPos,
+    viewCmd: camCmd,
     expectedCode: codeTemplate('XY'),
-    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.
+    clickCoords: { x: 700, y: 350 }, // red plane
   })
   await TestSinglePlane({
-    viewCmd: camPos,
+    viewCmd: camCmd,
     expectedCode: codeTemplate('YZ'),
-    clickCoords: { x: 700, y: 300 }, // green plane
+    clickCoords: { x: 1000, y: 200 }, // green plane
   })
   await TestSinglePlane({
-    viewCmd: camPos,
-    expectedCode: codeTemplate('XZ'),
-    clickCoords: { x: 700, y: 80 }, // blue plane
+    viewCmd: camCmd,
+    expectedCode: codeTemplate('XZ', '-'),
+    clickCoords: { x: 630, y: 130 }, // blue plane
   })
-  const camCmdBackSide: [number, number, number] = [-100, -100, -100]
+
+  // 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 },
+    },
+  }
   await TestSinglePlane({
     viewCmd: camCmdBackSide,
-    expectedCode: codeTemplate('-XY'),
-    clickCoords: { x: 601, y: 118 }, // back of red plane
+    expectedCode: codeTemplate('-XY', '-'),
+    clickCoords: { x: 705, y: 136 }, // back of red plane
   })
   await TestSinglePlane({
     viewCmd: camCmdBackSide,
-    expectedCode: codeTemplate('-YZ'),
-    clickCoords: { x: 730, y: 219 }, // back of green plane
+    expectedCode: codeTemplate('-YZ', '-'),
+    clickCoords: { x: 1000, y: 350 }, // back of green plane
   })
   await TestSinglePlane({
     viewCmd: camCmdBackSide,
     expectedCode: codeTemplate('-XZ'),
-    clickCoords: { x: 680, y: 427 }, // back of blue plane
+    clickCoords: { x: 600, y: 400 }, // back of blue plane
   })
 })
 
@@ -356,6 +368,7 @@ 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.
@@ -373,7 +386,6 @@ 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], %)')
@@ -381,7 +393,6 @@ 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')
@@ -448,57 +459,62 @@ 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).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))
+  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)
 
   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 page.mouse.click(700, 200)
-  await page.waitForTimeout(700) // wait for animation
+  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'
+  )
 
   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 u.closeDebugPanel()
+  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 = '[10.97, -14.79]'
+  const tenish = '11.07'
+  const twentyish = '22.04'
   await expect(page.locator('.cm-content'))
     .toHaveText(`const part001 = startSketchOn('-XZ')
-  |> startProfileAt(${commonPoints.startAt}, %)
-  |> line([${commonPoints.num1}, 0], %)`)
+  |> startProfileAt(${startAt}, %)
+  |> line([${tenish}, 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}], %)`)
+  |> startProfileAt(${startAt}, %)
+  |> line([${tenish}, 0], %)
+  |> line([0, ${tenish}], %)`)
   await page.mouse.click(startXPx, 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}], %)
-  |> line([-${commonPoints.num2}, 0], %)`)
+  |> startProfileAt(${startAt}, %)
+  |> line([${tenish}, 0], %)
+  |> line([0, ${tenish}], %)
+  |> line([-${twentyish}, 0], %)`)
 
   // deselect line tool
-  await page.getByRole('button', { name: 'Line' }).click()
+  await u.doAndWaitForCmd(
+    () => page.getByRole('button', { name: 'Line' }).click(),
+    'set_tool'
+  )
 
   await u.closeDebugPanel()
   const selectionSequence = async () => {
@@ -520,533 +536,80 @@ 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 topHorzSegmentClick()
+    await u.doAndWaitForCmd(topHorzSegmentClick, 'select_with_point', false)
     await page.keyboard.down('Shift')
     const absYButton = page.getByRole('button', { name: 'ABS Y' })
     await expect(absYButton).toBeDisabled()
-    await xAxisClick()
+    await u.doAndWaitForCmd(xAxisClick, 'select_with_point', false)
     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 emptySpaceClick()
+    await u.doAndWaitForCmd(emptySpaceClick, 'select_clear', false)
 
     // same selection but click the axis first
-    await xAxisClick()
+    await u.doAndWaitForCmd(xAxisClick, 'select_with_point', false)
     await expect(absYButton).toBeDisabled()
     await page.keyboard.down('Shift')
-    await topHorzSegmentClick()
-
+    await u.doAndWaitForCmd(topHorzSegmentClick, 'select_with_point', false)
     await page.keyboard.up('Shift')
     await expect(absYButton).not.toBeDisabled()
 
     // clear selection by clicking on nothing
-    await emptySpaceClick()
+    await u.doAndWaitForCmd(emptySpaceClick, 'select_clear', false)
 
     // check the same selection again by putting cursor in code first then selecting axis
-    await page.getByText(`  |> line([-${commonPoints.num2}, 0], %)`).click()
+    await u.doAndWaitForCmd(
+      () => page.getByText(`  |> line([-${twentyish}, 0], %)`).click(),
+      'select_clear',
+      false
+    )
     await page.keyboard.down('Shift')
     await expect(absYButton).toBeDisabled()
-    await xAxisClick()
+    await u.doAndWaitForCmd(xAxisClick, 'select_with_point', false)
     await page.keyboard.up('Shift')
     await expect(absYButton).not.toBeDisabled()
 
     // clear selection by clicking on nothing
-    await emptySpaceClick()
+    await u.doAndWaitForCmd(emptySpaceClick, 'select_clear', false)
 
     // select segment in editor than another segment in scene and check there are two cursors
-    await page.getByText(`  |> line([-${commonPoints.num2}, 0], %)`).click()
-    await page.waitForTimeout(300)
+    await u.doAndWaitForCmd(
+      () => page.getByText(`  |> line([-${twentyish}, 0], %)`).click(),
+      'select_clear',
+      false
+    )
     await page.keyboard.down('Shift')
     await expect(page.locator('.cm-cursor')).toHaveCount(1)
-    await bottomHorzSegmentClick()
+    await u.doAndWaitForCmd(bottomHorzSegmentClick, 'select_with_point', false) // another segment, bottom one
     await page.keyboard.up('Shift')
     await expect(page.locator('.cm-cursor')).toHaveCount(2)
 
     // clear selection by clicking on nothing
-    await emptySpaceClick()
+    await u.doAndWaitForCmd(emptySpaceClick, 'select_clear', false)
   }
 
   await selectionSequence()
 
   // hovering in fresh sketch worked, lets try exiting and re-entering
-  await u.openAndClearDebugPanel()
-  await page.getByRole('button', { name: 'Exit Sketch' }).click()
-  await page.waitForTimeout(200)
+  await u.doAndWaitForCmd(
+    () => page.getByRole('button', { name: 'Exit Sketch' }).click(),
+    'edit_mode_exit'
+  )
   // wait for execution done
-
   await u.expectCmdLog('[data-message-type="execution-done"]')
-  await u.closeDebugPanel()
 
   // select a line
-  // await topHorzSegmentClick()
-  await page.getByText(commonPoints.startAt).click() // TODO remove this and reinstate // await topHorzSegmentClick()
-  await page.waitForTimeout(100)
+  await u.doAndWaitForCmd(topHorzSegmentClick, 'select_clear', false)
 
   // enter sketch again
-  await page.getByRole('button', { name: 'Edit Sketch' }).click()
-  await page.waitForTimeout(300) // wait for animation
+  await u.doAndWaitForCmd(
+    () => page.getByRole('button', { name: 'Start Sketch' }).click(),
+    'edit_mode_enter',
+    false
+  )
 
   // hover again and check it works
   await selectionSequence()
 })
-
-test('Command bar works and can change a setting', async ({ page }) => {
-  // Brief boilerplate
-  const u = getUtils(page)
-  await page.setViewportSize({ width: 1200, height: 500 })
-  await page.goto('/')
-  await u.waitForAuthSkipAppStart()
-
-  let cmdSearchBar = page.getByPlaceholder('Search commands')
-
-  // First try opening the command bar and closing it
-  // It has a different label on mac and windows/linux, "Meta+K" and "Ctrl+/" respectively
-  await page
-    .getByRole('button', { name: 'Ctrl+/' })
-    .or(page.getByRole('button', { name: '⌘K' }))
-    .click()
-  await expect(cmdSearchBar).toBeVisible()
-  await page.keyboard.press('Escape')
-  await expect(cmdSearchBar).not.toBeVisible()
-
-  // Now try the same, but with the keyboard shortcut, check focus
-  await page.keyboard.press('Meta+K')
-  await expect(cmdSearchBar).toBeVisible()
-  await expect(cmdSearchBar).toBeFocused()
-
-  // Try typing in the command bar
-  await page.keyboard.type('theme')
-  const themeOption = page.getByRole('option', { name: 'Set Theme' })
-  await expect(themeOption).toBeVisible()
-  await themeOption.click()
-  const themeInput = page.getByPlaceholder('Select an option')
-  await expect(themeInput).toBeVisible()
-  await expect(themeInput).toBeFocused()
-  // Select dark theme
-  await page.keyboard.press('ArrowDown')
-  await page.keyboard.press('ArrowDown')
-  await expect(page.getByRole('option', { name: Themes.Dark })).toHaveAttribute(
-    'data-headlessui-state',
-    'active'
-  )
-  await page.keyboard.press('Enter')
-
-  // Check the toast appeared
-  await expect(page.getByText(`Set Theme to "${Themes.Dark}"`)).toBeVisible()
-  // Check that the theme changed
-  await expect(page.locator('body')).toHaveClass(`body-bg ${Themes.Dark}`)
-})
-
-test('Can extrude from the command bar', async ({ page, context }) => {
-  await context.addInitScript(async (token) => {
-    localStorage.setItem(
-      'persistCode',
-      `
-      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(%)
-      `
-    )
-  })
-
-  const u = getUtils(page)
-  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')
-  await expect(cmdSearchBar).toBeVisible()
-
-  // Search for extrude command and choose it
-  await page.getByRole('option', { name: 'Extrude' }).click()
-  await expect(page.locator('#arg-form > label')).toContainText(
-    'Please select one face'
-  )
-  await expect(page.getByRole('button', { name: 'selection' })).toBeDisabled()
-
-  // Click to select face and set distance
-  await page.getByText('|> startProfileAt([-6.95, 4.98], %)').click()
-  await page.getByRole('button', { name: 'Continue' }).click()
-
-  // Assert that we're on the distance step
-  await expect(page.getByRole('button', { name: 'distance' })).toBeDisabled()
-
-  // 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 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 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/secrets.ts

@@ -14,7 +14,6 @@ try {
 } catch (err) {
   // probably running in CI
   secrets.token = process.env.token || ''
-  secrets.snapshottoken = process.env.snapshottoken || ''
   // add more env vars here to make them available in CI
 }
 

e2e/playwright/snapshot-tests.spec.ts

@@ -1,10 +1,10 @@
 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'
-import { spawn } from 'child_process'
-import { APP_NAME } from 'lib/constants'
 
 test.beforeEach(async ({ context, page }) => {
   await context.addInitScript(async (token) => {
@@ -31,12 +31,6 @@ 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 })
@@ -44,8 +38,19 @@ test('change camera, show planes', async ({ page, context }) => {
   await u.waitForAuthSkipAppStart()
   await u.openAndClearDebugPanel()
 
-  const camPos: [number, number, number] = [0, 85, 85]
-  await u.updateCamPosition(camPos)
+  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: 50, z: 50 },
+    },
+  }
+
+  await u.sendCustomCmd(camCmd)
+  await u.waitForCmdReceive('default_camera_look_at')
 
   // rotate
   await u.closeDebugPanel()
@@ -55,11 +60,13 @@ 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({
@@ -68,8 +75,10 @@ test('change camera, show planes', async ({ page, context }) => {
 
   await u.openAndClearDebugPanel()
   await page.getByRole('button', { name: 'Exit Sketch' }).click()
+  await u.waitForDefaultPlanesVisibilityChange()
 
-  await u.updateCamPosition(camPos)
+  await u.sendCustomCmd(camCmd)
+  await u.waitForCmdReceive('default_camera_look_at')
 
   await u.clearCommandLogs()
   await u.closeDebugPanel()
@@ -82,10 +91,12 @@ 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({
@@ -94,8 +105,10 @@ test('change camera, show planes', async ({ page, context }) => {
 
   await u.openAndClearDebugPanel()
   await page.getByRole('button', { name: 'Exit Sketch' }).click()
+  await u.waitForDefaultPlanesVisibilityChange()
 
-  await u.updateCamPosition(camPos)
+  await u.sendCustomCmd(camCmd)
+  await u.waitForCmdReceive('default_camera_look_at')
 
   await u.clearCommandLogs()
   await u.closeDebugPanel()
@@ -104,15 +117,17 @@ 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, 300)
+  await page.mouse.move(700, 350)
   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({
@@ -122,7 +137,6 @@ test('change camera, show planes', async ({ page, context }) => {
 
 test('exports of each format should work', async ({ page, context }) => {
   // FYI this test doesn't work with only engine running locally
-  // And you will need to have the KittyCAD CLI installed
   const u = getUtils(page)
   await context.addInitScript(async () => {
     ;(window as any).playwrightSkipFilePicker = true
@@ -147,11 +161,11 @@ const part001 = startSketchOn('-XZ')
   |> xLineTo({ to: totalLen, tag: 'seg03' }, %)
   |> yLine({ length: -armThick, tag: 'seg01' }, %)
   |> angledLineThatIntersects({
-        angle: HALF_TURN,
+        angle: _180,
         offset: -armThick,
         intersectTag: 'seg04'
       }, %)
-  |> angledLineToY([segAng('seg04', %) + 180, ZERO], %)
+  |> angledLineToY([segAng('seg04', %) + 180, _0], %)
   |> angledLineToY({
         angle: -bottomAng,
         to: -totalHeightHalf - armThick,
@@ -160,13 +174,13 @@ const part001 = startSketchOn('-XZ')
   |> xLineTo(segEndX('seg03', %) + 0, %)
   |> yLine(-segLen('seg01', %), %)
   |> angledLineThatIntersects({
-        angle: HALF_TURN,
+        angle: _180,
         offset: -armThick,
         intersectTag: 'seg02'
       }, %)
   |> angledLineToY([segAng('seg02', %) + 180, -baseHeight], %)
-  |> xLineTo(ZERO, %)
-  |> close(%)
+  |> xLineTo(_0, %)
+  |> close(%) 
   |> extrude(4, %)`
     )
   })
@@ -174,21 +188,15 @@ 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)
   await u.clearAndCloseDebugPanel()
 
-  await page.getByRole('button', { name: APP_NAME }).click()
+  await page.getByRole('button', { name: 'KittyCAD Modeling App' }).click()
 
-  interface Paths {
-    modelPath: string
-    imagePath: string
-    outputType: string
-  }
-  const doExport = async (
-    output: Models['OutputFormat_type']
-  ): Promise<Paths> => {
+  const doExport = async (output: Models['OutputFormat_type']) => {
     await page.getByRole('button', { name: 'Export Model' }).click()
 
     const exportSelect = page.getByTestId('export-type')
@@ -202,10 +210,10 @@ const part001 = startSketchOn('-XZ')
     const downloadPromise = page.waitForEvent('download')
     await page.getByRole('button', { name: 'Export', exact: true }).click()
     const download = await downloadPromise
-    const downloadLocationer = (extra = '', isImage = false) =>
+    const downloadLocationer = (extra = '') =>
       `./e2e/playwright/export-snapshots/${output.type}-${
         'storage' in output ? output.storage : ''
-      }${extra}.${isImage ? 'png' : output.type}`
+      }${extra}.${output.type}`
     const downloadLocation = downloadLocationer()
     const downloadLocation2 = downloadLocationer('-2')
 
@@ -241,11 +249,6 @@ const part001 = startSketchOn('-XZ')
       )
       await fsp.writeFile(downloadLocation, newFileContents)
     }
-    return {
-      modelPath: downloadLocation,
-      imagePath: downloadLocationer('', true),
-      outputType: output.type,
-    }
   }
   const axisDirectionPair: Models['AxisDirectionPair_type'] = {
     axis: 'z',
@@ -255,241 +258,67 @@ const part001 = startSketchOn('-XZ')
     forward: axisDirectionPair,
     up: axisDirectionPair,
   }
-
-  const exportLocations: Paths[] = []
-
   // NOTE it was easiest to leverage existing types and have doExport take Models['OutputFormat_type'] as in input
   // just note that only `type` and `storage` are used for selecting the drop downs is the app
   // the rest are only there to make typescript happy
-  exportLocations.push(
-    await doExport({
-      type: 'step',
-      coords: sysType,
-    })
-  )
-  exportLocations.push(
-    await doExport({
-      type: 'ply',
-      coords: sysType,
-      selection: { type: 'default_scene' },
-      storage: 'ascii',
-      units: 'in',
-    })
-  )
-  exportLocations.push(
-    await doExport({
-      type: 'ply',
-      storage: 'binary_little_endian',
-      coords: sysType,
-      selection: { type: 'default_scene' },
-      units: 'in',
-    })
-  )
-  exportLocations.push(
-    await doExport({
-      type: 'ply',
-      storage: 'binary_big_endian',
-      coords: sysType,
-      selection: { type: 'default_scene' },
-      units: 'in',
-    })
-  )
-  exportLocations.push(
-    await doExport({
-      type: 'stl',
-      storage: 'ascii',
-      coords: sysType,
-      units: 'in',
-      selection: { type: 'default_scene' },
-    })
-  )
-  exportLocations.push(
-    await doExport({
-      type: 'stl',
-      storage: 'binary',
-      coords: sysType,
-      units: 'in',
-      selection: { type: 'default_scene' },
-    })
-  )
-  exportLocations.push(
-    await doExport({
-      // obj seems to be a little flaky, times out tests sometimes
-      type: 'obj',
-      coords: sysType,
-      units: 'in',
-    })
-  )
-  exportLocations.push(
-    await doExport({
-      type: 'gltf',
-      storage: 'embedded',
-      presentation: 'pretty',
-    })
-  )
-  exportLocations.push(
-    await doExport({
-      type: 'gltf',
-      storage: 'binary',
-      presentation: 'pretty',
-    })
-  )
-
-  // TODO: gltfs don't seem to work with snap shots. push onto exportLocations once it's figured out
+  await doExport({
+    type: 'step',
+    coords: sysType,
+  })
+  await doExport({
+    type: 'gltf',
+    storage: 'embedded',
+    presentation: 'pretty',
+  })
+  await doExport({
+    type: 'gltf',
+    storage: 'binary',
+    presentation: 'pretty',
+  })
   await doExport({
     type: 'gltf',
     storage: 'standard',
     presentation: 'pretty',
   })
-
-  // close page to disconnect websocket since we can only have one open atm
-  await page.close()
-
-  // 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) {
-    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 })
-    const result = await new Promise<string>((resolve, reject) => {
-      child.on('error', (code: any, msg: any) => {
-        console.log('error', code, msg)
-        reject('error')
-      })
-      child.on('exit', (code, msg) => {
-        console.log('exit', code, msg)
-        if (code !== 0) {
-          reject(`exit code ${code} for model ${modelPath}`)
-        } else {
-          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 doExport({
+    type: 'ply',
+    coords: sysType,
+    selection: { type: 'default_scene' },
+    storage: 'ascii',
+    units: 'in',
   })
-  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 doExport({
+    type: 'ply',
+    storage: 'binary_little_endian',
+    coords: sysType,
+    selection: { type: 'default_scene' },
+    units: 'in',
   })
-
-  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,
+  await doExport({
+    type: 'ply',
+    storage: 'binary_big_endian',
+    coords: sysType,
+    selection: { type: 'default_scene' },
+    units: 'in',
+  })
+  await doExport({
+    type: 'stl',
+    storage: 'ascii',
+    coords: sysType,
+    units: 'in',
+    selection: { type: 'default_scene' },
+  })
+  await doExport({
+    type: 'stl',
+    storage: 'binary',
+    coords: sysType,
+    units: 'in',
+    selection: { type: 'default_scene' },
+  })
+  await doExport({
+    // obj seems to be a little flaky, times out tests sometimes
+    type: 'obj',
+    coords: sysType,
+    units: 'in',
   })
 })

e2e/playwright/test-utils.ts

@@ -80,21 +80,10 @@ 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

@@ -1,26 +1,19 @@
 import { browser, $, expect } from '@wdio/globals'
 import fs from 'fs/promises'
 
-const defaultDir = `${process.env.HOME}/Documents/zoo-modeling-app-projects`
-const userCodeDir = '/tmp/kittycad_user_code'
-
-async function click(element: WebdriverIO.Element): Promise<void> {
-  // Workaround for .click(), see https://github.com/tauri-apps/tauri/issues/6541
-  await element.waitForClickable()
-  await browser.execute('arguments[0].click();', element)
-}
-
-describe('ZMA (Tauri, Linux)', () => {
-  it('opens the auth page and signs in', async () => {
-    // Clean up filesystem from previous tests
+describe('KCMA (Tauri, Linux)', () => {
+  it('opens the auth page, signs in, and signs out', async () => {
+    // Clean up previous tests
     await new Promise((resolve) => setTimeout(resolve, 100))
-    await fs.rm(defaultDir, { force: true, recursive: true })
-    await fs.rm(userCodeDir, { force: true })
+    await fs.rm('/tmp/kittycad_user_code', { force: true })
+    await browser.execute('window.localStorage.clear()')
 
     const signInButton = await $('[data-testid="sign-in-button"]')
     expect(await signInButton.getText()).toEqual('Sign in')
 
-    await click(signInButton)
+    // Workaround for .click(), see https://github.com/tauri-apps/tauri/issues/6541
+    await signInButton.waitForClickable()
+    await browser.execute('arguments[0].click();', signInButton)
     await new Promise((resolve) => setTimeout(resolve, 2000))
 
     // Get from main.rs
@@ -36,14 +29,13 @@ describe('ZMA (Tauri, Linux)', () => {
       Accept: 'application/json',
       'Content-Type': 'application/json',
     }
-    const apiBaseUrl = process.env.VITE_KC_API_BASE_URL
-    const verifyUrl = `${apiBaseUrl}/oauth2/device/verify?user_code=${userCode}`
+    const verifyUrl = `https://api.kittycad.io/oauth2/device/verify?user_code=${userCode}`
     console.log(`GET ${verifyUrl}`)
     const vr = await fetch(verifyUrl, { headers })
     console.log(vr.status)
 
     // Device flow: confirm
-    const confirmUrl = `${apiBaseUrl}/oauth2/device/confirm`
+    const confirmUrl = 'https://api.kittycad.io/oauth2/device/confirm'
     const data = JSON.stringify({ user_code: userCode })
     console.log(`POST ${confirmUrl} ${data}`)
     const cr = await fetch(confirmUrl, {
@@ -56,49 +48,14 @@ describe('ZMA (Tauri, Linux)', () => {
     // Now should be signed in
     const newFileButton = await $('[data-testid="home-new-file"]')
     expect(await newFileButton.getText()).toEqual('New file')
-  })
 
-  it('opens the settings page, checks filesystem settings, and closes the settings page', async () => {
+    // So let's sign out!
     const menuButton = await $('[data-testid="user-sidebar-toggle"]')
-    await click(menuButton)
-
-    const settingsButton = await $('[data-testid="settings-button"]')
-    await click(settingsButton)
-
-    const defaultDirInput = await $('[data-testid="default-directory-input"]')
-    expect(await defaultDirInput.getValue()).toEqual(defaultDir)
-
-    const nameInput = await $('[data-testid="name-input"]')
-    expect(await nameInput.getValue()).toEqual('project-$nnn')
-
-    const closeButton = await $('[data-testid="close-button"]')
-    await click(closeButton)
-  })
-
-  it('checks that no file exists, creates a new file', async () => {
-    const homeSection = await $('[data-testid="home-section"]')
-    expect(await homeSection.getText()).toContain('No Projects found')
-
-    const newFileButton = await $('[data-testid="home-new-file"]')
-    await click(newFileButton)
-    await new Promise((resolve) => setTimeout(resolve, 1000))
-
-    expect(await homeSection.getText()).toContain('project-000')
-  })
-
-  it('opens the new file and expects a loading stream', async () => {
-    const projectLink = await $('[data-testid="project-link"]')
-    await click(projectLink)
-    const loadingText = await $('[data-testid="loading-stream"]')
-    expect(await loadingText.getText()).toContain('Loading stream...')
-    await browser.execute('window.location.href = "tauri://localhost/home"')
-  })
-
-  it('signs out', async () => {
-    const menuButton = await $('[data-testid="user-sidebar-toggle"]')
-    await click(menuButton)
+    await menuButton.waitForClickable()
+    await browser.execute('arguments[0].click();', menuButton)
     const signoutButton = await $('[data-testid="user-sidebar-sign-out"]')
-    await click(signoutButton)
+    await signoutButton.waitForClickable()
+    await browser.execute('arguments[0].click();', signoutButton)
     const newSignInButton = await $('[data-testid="sign-in-button"]')
     expect(await newSignInButton.getText()).toEqual('Sign in')
   })

index.html

@@ -7,17 +7,12 @@
     <meta name="theme-color" content="#000000" />
     <meta
       name="description"
-      content="An open-source CAD modeling tool from the future by Zoo."
+      content="An open-source CAD modeling tool from the future by KittyCAD."
     />
     <link rel="apple-touch-icon" href="/logo192.png" />
     <link rel="manifest" href="/manifest.json" />
-    <link rel="stylesheet" href="https://use.typekit.net/zzv8rvm.css" />
-    <script
-      defer
-      data-domain="app.zoo.dev"
-      src="https://plausible.corp.zoo.dev/js/script.js"
-    ></script>
-    <title>Zoo Modeling App</title>
+    <script defer data-domain="app.kittycad.io" src="https://plausible.corp.kittycad.io/js/script.js"></script>
+    <title>KittyCAD Modeling App</title>
   </head>
   <body class="body-bg">
     <noscript>You need to enable JavaScript to run this app.</noscript>

make-release.sh

@@ -1,69 +0,0 @@
-#!/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.15.3",
+  "version": "0.12.0",
   "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.54",
+    "@kittycad/lib": "^0.0.46",
     "@lezer/javascript": "^1.4.9",
     "@open-rpc/client-js": "^1.8.1",
     "@react-hook/resize-observer": "^1.2.6",
@@ -21,7 +21,6 @@
     "@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",
@@ -34,7 +33,6 @@
     "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",
@@ -47,12 +45,11 @@
     "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": "^1.3.1",
+    "vitest": "^0.34.6",
     "vscode-jsonrpc": "^8.1.0",
     "vscode-languageserver-protocol": "^3.17.5",
     "wasm-pack": "^0.12.1",
@@ -63,7 +60,6 @@
   },
   "scripts": {
     "start": "vite",
-    "start:prod": "vite preview --port=3000",
     "serve": "vite serve --port=3000",
     "build": "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && source \"$HOME/.cargo/env\" && curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh -s -- -y && yarn build:wasm && vite build",
     "build:local": "vite build",
@@ -73,6 +69,7 @@
     "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",
@@ -84,9 +81,7 @@
     "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",
-    "postinstall": "yarn xstate:typegen",
-    "xstate:typegen": "yarn xstate typegen \"src/**/*.ts?(x)\""
+    "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"
   },
   "prettier": {
     "trailingComma": "es5",
@@ -113,21 +108,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.2.1",
+    "@vitejs/plugin-react": "^4.1.1",
+    "@vitest/coverage-istanbul": "^0.34.6",
     "@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",
@@ -137,15 +132,12 @@
     "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": "^5.1.3",
+    "tailwindcss": "^3.3.5",
+    "vite": "^4.5.0",
     "vite-plugin-eslint": "^1.8.1",
-    "vite-plugin-package-version": "^1.1.0",
-    "vite-tsconfig-paths": "^4.3.1",
-    "vitest-webgl-canvas-mock": "^1.1.0",
+    "vite-tsconfig-paths": "^4.2.1",
     "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,4 +78,5 @@ export default defineConfig({
     // url: 'http://127.0.0.1:3000',
     reuseExistingServer: !process.env.CI,
   },
-})
+});
+

public/Icon/Icon/Projects/Create File.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4 3H4.5H11H11.2071L11.3536 3.14645L15.8536 7.64646L16 7.7929V8.00001V11.3773C15.6992 11.1362 15.3628 10.9376 15 10.7908V8.50001H11H10.5V8.00001V4H5V16H9.79076C9.93763 16.3628 10.1362 16.6992 10.3773 17H4.5H4V16.5V3.5V3ZM11.5 4.70711L14.2929 7.50001H11.5V4.70711ZM13 12V14H11V15H13V17H14V15H16V14H14V12H13Z" fill="black"/>
+</svg>

public/Icon/Icon/Projects/Create Folder.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.5 3.5H4H7H7.16667L7.3 3.6L9.16667 5H16H16.5V5.5V7.5V10.3773C16.1992 10.1362 15.8628 9.93763 15.5 9.79076V8H4.5V15.5H10.5351C10.7529 15.8764 11.0302 16.2141 11.3542 16.5H4H3.5V16V7.5V4V3.5ZM4.5 4.5V7H15.5V6H9H8.83333L8.7 5.9L6.83333 4.5H4.5ZM13.5 11V13H11.5V14H13.5V16H14.5V14H16.5V13H14.5V11H13.5Z" fill="black"/>
+</svg>

public/Icon/Icon/Projects/File.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11 3.5H4.5V16.5H15.5V8.00001M11 3.5L15.5 8.00001M11 3.5V8.00001H15.5" stroke="black"/>
+</svg>

public/announce_release.py

@@ -1,26 +0,0 @@
-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.")

public/expectations.md

@@ -4,9 +4,9 @@
 
 First off, thank you so much for your interest in being a part of the closed Alpha program! We are thrilled to have others use our product and see what you build with it (and truthfully, how you break it too).
 
-### Zoo Modeling App (ZMA)
+### KittyCAD Modeling App (KCMA)
 
-What we are introducing to you is our Zoo Modeling App (ZMA). ZMA is a CAD application that expresses a hybrid style of traditional CAD interface along with a code-CAD interface. ZMA is a great way for us to test our own APIs as well as inspire others to develop their own applications.
+What we are introducing to you is our KittyCAD Modeling App (KCMA). KCMA is a CAD application that expresses a hybrid style of traditional CAD interface along with a code-CAD interface. KCMA is a great way for us to test our own APIs as well as inspire others to develop their own applications.
 
 ### Why Code?
 
@@ -18,11 +18,11 @@ Plenty of you have professional CAD experience, and may not understand why codin
 - Reproducibility
 - Easier integration with other tools
 
-### Before You Use ZMA
+### Before You Use KCMA
 
 Before you dive straight into the app, we wanted to lay some expectations out for you. 
 
-- ZMA is in early development. Kurt pitched the idea back in January, and the team has been working hard on it since then. ZMA has really basic CAD features for now, but we have plenty of features on our roadmap. Most of the features that you may be currently used to in your CAD workflow today will be available down the road.
+- KCMA is in early development. Kurt pitched the idea back in January, and the team has been working hard on it since then. KCMA has really basic CAD features for now, but we have plenty of features on our roadmap. Most of the features that you may be currently used to in your CAD workflow today will be available down the road.
 - For a list of all scripting functions, please reference our [documentation](https://github.com/KittyCAD/modeling-app/blob/main/docs/kcl/std.md). For a basic rundown of our types, please reference [this document](https://github.com/KittyCAD/modeling-app/blob/main/docs/kcl/types.md).
 - With that being said, we have created an external new features list in [GH Discussions](https://github.com/KittyCAD/modeling-app/discussions). For our current priority list, please click [here](https://github.com/KittyCAD/modeling-app/blob/main/public/roadmap.md). Please upvote any features in the GH Discussions page that you would like to see implemented first. We will prioritize the highest upvoted items or items that are foundational for other features on the list. You can also add your own, but we will review it to make sure it’s not a duplicate or it’s feasible for the current state of the app.
 - Please report any and all bugs/issues you find. Even the smallest bugs are important! You can report them in a GH Issue [here](https://github.com/KittyCAD/modeling-app/issues/new). You are more than welcome to link your GH Issue in the **bugs** section of our Discord, but if you want to discuss the bug further, please keep that in the GH Issue thread. Please include the severity of the bug in your GH Issue ticket (High, Medium, or Low). If you are having trouble deciding what severity the bug is, use this guideline:

public/manifest.json

@@ -1,6 +1,6 @@
 {
-  "short_name": "ZMA",
-  "name": "Zoo Modeling App",
+  "short_name": "KCMA",
+  "name": "KittyCAD Modeling App",
   "icons": [
     {
       "src": "favicon.ico",

public/roadmap.md

@@ -1,4 +1,4 @@
-## Zoo Modeling App Roadmap
+## KittyCAD Modeling App Roadmap
 
 This document ties into our [GH Discussions Feature List](https://github.com/KittyCAD/modeling-app/discussions). Please upvote any features that you want to see next, or add ones that are not listed and we will review. 
 

public/zoo-logo.svg

@@ -1,7 +0,0 @@
-<svg width="438" height="145" viewBox="0 0 438 145" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M88.2136 25.3021V3.12744H0.595269V34.3994H79.827L0.609484 120.312H0.595269V120.326L0.581055 120.34L0.595269 120.355V141.364H20.8936L41.3341 119.189V141.364H128.952V110.092H49.7349L128.952 24.1649V3.12744L108.64 3.15587L88.2136 25.3021Z" fill="white"/>
-<path d="M167.36 72.4372C167.36 49.7366 185.824 31.2719 208.525 31.2719C216.514 31.2719 223.976 33.5605 230.288 37.5121L251.78 14.3709C239.698 5.34466 224.73 0 208.525 0C168.582 0 136.088 32.4944 136.088 72.4372C136.088 90.5465 142.769 107.135 153.828 119.857L175.32 96.7156C170.316 89.9069 167.36 81.5061 167.36 72.4372Z" fill="white"/>
-<path d="M241.745 48.1442C246.734 54.9671 249.691 63.3679 249.691 72.4368C249.691 95.1232 231.226 113.588 208.525 113.588C200.537 113.588 193.088 111.299 186.777 107.348L165.271 130.503C177.353 139.515 192.321 144.86 208.525 144.86C248.468 144.86 280.963 112.365 280.963 72.4368C280.963 54.3133 274.282 37.7249 263.223 25.0029L241.745 48.1442Z" fill="white"/>
-<path d="M419.312 25.0029L397.834 48.1442C402.823 54.9671 405.779 63.3679 405.779 72.4368C405.779 95.1232 387.315 113.588 364.614 113.588C356.626 113.588 349.177 111.299 342.866 107.348L321.359 130.503C333.442 139.515 348.41 144.86 364.614 144.86C404.557 144.86 437.051 112.365 437.051 72.4368C437.051 54.3133 430.371 37.7249 419.312 25.0029Z" fill="white"/>
-<path d="M323.449 72.4372C323.449 49.7366 341.913 31.2719 364.614 31.2719C372.603 31.2719 380.065 33.5605 386.376 37.5121L407.869 14.3709C395.786 5.34466 380.819 0 364.614 0C324.671 0 292.177 32.4944 292.177 72.4372C292.177 90.5465 298.858 107.135 309.916 119.857L331.409 96.7156C326.405 89.9069 323.449 81.5061 323.449 72.4372Z" fill="white"/>
-</svg>

src-tauri/Cargo.lock

@@ -67,9 +67,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.79"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
+checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
 
 [[package]]
 name = "app"
@@ -95,7 +95,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.33",
 ]
 
 [[package]]
@@ -542,17 +542,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
 dependencies = [
  "quote",
- "syn 2.0.48",
+ "syn 2.0.33",
 ]
 
 [[package]]
 name = "ctor"
-version = "0.2.6"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e"
+checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
 dependencies = [
  "quote",
- "syn 2.0.48",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -582,7 +582,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.48",
+ "syn 2.0.33",
 ]
 
 [[package]]
@@ -593,7 +593,7 @@ checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.33",
 ]
 
 [[package]]
@@ -899,7 +899,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.33",
 ]
 
 [[package]]
@@ -1242,9 +1242,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.24"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9"
+checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049"
 dependencies = [
  "bytes",
  "fnv",
@@ -1252,7 +1252,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http",
- "indexmap 2.0.0",
+ "indexmap 1.9.3",
  "slab",
  "tokio",
  "tokio-util",
@@ -1530,9 +1530,9 @@ dependencies = [
 
 [[package]]
 name = "infer"
-version = "0.13.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f551f8c3a39f68f986517db0d1759de85881894fdc7db798bd2a9df9cb04b7fc"
+checksum = "a898e4b7951673fce96614ce5751d13c40fc5674bc2d759288e46c3ab62598b3"
 dependencies = [
  "cfb",
 ]
@@ -1652,9 +1652,9 @@ dependencies = [
 
 [[package]]
 name = "json-patch"
-version = "1.2.0"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55ff1e1486799e3f64129f8ccad108b38290df9cd7015cd31bed17239f0789d6"
+checksum = "1f54898088ccb91df1b492cc80029a6fdf1c48ca0db7c6822a8babad69c94658"
 dependencies = [
  "serde",
  "serde_json",
@@ -1664,9 +1664,9 @@ dependencies = [
 
 [[package]]
 name = "kittycad"
-version = "0.2.53"
+version = "0.2.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a086e1a1bbddb3b38959c0f0ce6de6b3a3b7566e38e0b7d5fb101e91911beed4"
+checksum = "6aa554d86b6dbbd976a659c912ae25ce817b4378eb12a5684907e263410f0a7b"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2194,11 +2194,11 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.61"
+version = "0.10.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45"
+checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d"
 dependencies = [
- "bitflags 2.4.0",
+ "bitflags 1.3.2",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -2215,7 +2215,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.33",
 ]
 
 [[package]]
@@ -2226,9 +2226,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.97"
+version = "0.9.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b"
+checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6"
 dependencies = [
  "cc",
  "libc",
@@ -2368,7 +2368,7 @@ dependencies = [
  "regex",
  "regex-syntax 0.7.5",
  "structmeta",
- "syn 2.0.48",
+ "syn 2.0.33",
 ]
 
 [[package]]
@@ -2400,17 +2400,9 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
 dependencies = [
+ "phf_macros 0.10.0",
  "phf_shared 0.10.0",
-]
-
-[[package]]
-name = "phf"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
-dependencies = [
- "phf_macros 0.11.2",
- "phf_shared 0.11.2",
+ "proc-macro-hack",
 ]
 
 [[package]]
@@ -2453,16 +2445,6 @@ dependencies = [
  "rand 0.8.5",
 ]
 
-[[package]]
-name = "phf_generator"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
-dependencies = [
- "phf_shared 0.11.2",
- "rand 0.8.5",
-]
-
 [[package]]
 name = "phf_macros"
 version = "0.8.0"
@@ -2479,15 +2461,16 @@ dependencies = [
 
 [[package]]
 name = "phf_macros"
-version = "0.11.2"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
+checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0"
 dependencies = [
- "phf_generator 0.11.2",
- "phf_shared 0.11.2",
+ "phf_generator 0.10.0",
+ "phf_shared 0.10.0",
+ "proc-macro-hack",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -2508,15 +2491,6 @@ dependencies = [
  "siphasher",
 ]
 
-[[package]]
-name = "phf_shared"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
-dependencies = [
- "siphasher",
-]
-
 [[package]]
 name = "phonenumber"
 version = "0.3.3+8.13.9"
@@ -2555,7 +2529,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.33",
 ]
 
 [[package]]
@@ -2657,9 +2631,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
 dependencies = [
  "unicode-ident",
 ]
@@ -2675,9 +2649,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
 dependencies = [
  "proc-macro2",
 ]
@@ -3235,9 +3209,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.196"
+version = "1.0.193"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
+checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
 dependencies = [
  "serde_derive",
 ]
@@ -3253,13 +3227,13 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.196"
+version = "1.0.193"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
+checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.33",
 ]
 
 [[package]]
@@ -3275,9 +3249,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.113"
+version = "1.0.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
+checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
 dependencies = [
  "itoa 1.0.6",
  "ryu",
@@ -3302,7 +3276,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.33",
 ]
 
 [[package]]
@@ -3352,7 +3326,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.33",
 ]
 
 [[package]]
@@ -3556,7 +3530,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "structmeta-derive",
- "syn 2.0.48",
+ "syn 2.0.33",
 ]
 
 [[package]]
@@ -3567,7 +3541,7 @@ checksum = "a60bcaff7397072dca0017d1db428e30d5002e00b6847703e2e42005c95fbe00"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.33",
 ]
 
 [[package]]
@@ -3605,9 +3579,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "9caece70c63bfba29ec2fed841a09851b14a235c60010fa4de58089b6c025668"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3760,9 +3734,9 @@ dependencies = [
 
 [[package]]
 name = "tauri"
-version = "1.5.4"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd27c04b9543776a972c86ccf70660b517ecabbeced9fb58d8b961a13ad129af"
+checksum = "9bfe673cf125ef364d6f56b15e8ce7537d9ca7e4dae1cf6fbbdeed2e024db3d9"
 dependencies = [
  "anyhow",
  "bytes",
@@ -3812,9 +3786,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-build"
-version = "1.5.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9914a4715e0b75d9f387a285c7e26b5bbfeb1249ad9f842675a82481565c532"
+checksum = "defbfc551bd38ab997e5f8e458f87396d2559d05ce32095076ad6c30f7fc5f9c"
 dependencies = [
  "anyhow",
  "cargo_toml",
@@ -3831,9 +3805,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-codegen"
-version = "1.4.2"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1554c5857f65dbc377cefb6b97c8ac77b1cb2a90d30d3448114d5d6b48a77fc"
+checksum = "7b3475e55acec0b4a50fb96435f19631fb58cbcd31923e1a213de5c382536bbb"
 dependencies = [
  "base64 0.21.2",
  "brotli",
@@ -3857,9 +3831,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-macros"
-version = "1.4.3"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "277abf361a3a6993ec16bcbb179de0d6518009b851090a01adfea12ac89fa875"
+checksum = "613740228de92d9196b795ac455091d3a5fbdac2654abb8bb07d010b62ab43af"
 dependencies = [
  "heck 0.4.1",
  "proc-macro2",
@@ -3872,7 +3846,7 @@ dependencies = [
 [[package]]
 name = "tauri-plugin-fs-extra"
 version = "0.0.0"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#01211ff0759d578e0e9ac8c98c31fdf09077eb34"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#537053d3171a7374a1a86fed422523e7b45a4fb8"
 dependencies = [
  "log",
  "serde",
@@ -3883,9 +3857,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime"
-version = "0.14.2"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf2d0652aa2891ff3e9caa2401405257ea29ab8372cce01f186a5825f1bd0e76"
+checksum = "07f8e9e53e00e9f41212c115749e87d5cd2a9eebccafca77a19722eeecd56d43"
 dependencies = [
  "gtk",
  "http",
@@ -3904,9 +3878,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime-wry"
-version = "0.14.3"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cae61fbc731f690a4899681c9052dde6d05b159b44563ace8186fc1bfb7d158"
+checksum = "8141d72b6b65f2008911e9ef5b98a68d1e3413b7a1464e8f85eb3673bb19a895"
 dependencies = [
  "cocoa",
  "gtk",
@@ -3924,9 +3898,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-utils"
-version = "1.5.2"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ece74810b1d3d44f29f732a7ae09a63183d63949bbdd59c61f8ed2a1b70150db"
+checksum = "34d55e185904a84a419308d523c2c6891d5e2dbcee740c4997eb42e75a7b0f46"
 dependencies = [
  "brotli",
  "ctor",
@@ -3939,7 +3913,7 @@ dependencies = [
  "kuchikiki",
  "log",
  "memchr",
- "phf 0.11.2",
+ "phf 0.10.1",
  "proc-macro2",
  "quote",
  "semver",
@@ -3949,7 +3923,7 @@ dependencies = [
  "thiserror",
  "url",
  "walkdir",
- "windows-version",
+ "windows 0.39.0",
 ]
 
 [[package]]
@@ -4009,7 +3983,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.33",
 ]
 
 [[package]]
@@ -4051,9 +4025,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.36.0"
+version = "1.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
+checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9"
 dependencies = [
  "backtrace",
  "bytes",
@@ -4193,7 +4167,7 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.33",
 ]
 
 [[package]]
@@ -4443,7 +4417,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.33",
  "wasm-bindgen-shared",
 ]
 
@@ -4477,7 +4451,7 @@ checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.33",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -4773,36 +4747,12 @@ dependencies = [
  "windows_x86_64_msvc 0.48.0",
 ]
 
-[[package]]
-name = "windows-targets"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
-dependencies = [
- "windows_aarch64_gnullvm 0.52.0",
- "windows_aarch64_msvc 0.52.0",
- "windows_i686_gnu 0.52.0",
- "windows_i686_msvc 0.52.0",
- "windows_x86_64_gnu 0.52.0",
- "windows_x86_64_gnullvm 0.52.0",
- "windows_x86_64_msvc 0.52.0",
-]
-
 [[package]]
 name = "windows-tokens"
 version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597"
 
-[[package]]
-name = "windows-version"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75aa004c988e080ad34aff5739c39d0312f4684699d6d71fc8a198d057b8b9b4"
-dependencies = [
- "windows-targets 0.52.0",
-]
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.42.2"
@@ -4815,12 +4765,6 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.37.0"
@@ -4845,12 +4789,6 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.37.0"
@@ -4875,12 +4813,6 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.37.0"
@@ -4905,12 +4837,6 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.37.0"
@@ -4935,12 +4861,6 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.2"
@@ -4953,12 +4873,6 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.37.0"
@@ -4983,12 +4897,6 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
-
 [[package]]
 name = "winnow"
 version = "0.5.15"
@@ -5020,9 +4928,9 @@ dependencies = [
 
 [[package]]
 name = "wry"
-version = "0.24.6"
+version = "0.24.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64a70547e8f9d85da0f5af609143f7bde3ac7457a6e1073104d9b73d6c5ac744"
+checksum = "88ef04bdad49eba2e01f06e53688c8413bd6a87b0bc14b72284465cf96e3578e"
 dependencies = [
  "base64 0.13.1",
  "block",

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.1", features = [] }
+tauri-build = { version = "1.5.0", features = [] }
 
 [dependencies]
 anyhow = "1"
-kittycad = "0.2.53"
+kittycad = "0.2.42"
 oauth2 = "4.4.2"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-tauri = { version = "1.5.4", features = [ "os-all", "dialog-all", "fs-all", "http-request", "path-all", "shell-open", "shell-open-api", "devtools"] }
+tauri = { version = "1.5.2", 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.36.0", features = ["time"] }
+tokio = { version = "1.34.0", features = ["time"] }
 toml = "0.8.2"
 
 [features]

src-tauri/src/main.rs

@@ -7,7 +7,6 @@ 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";
 
@@ -77,13 +76,16 @@ async fn login(app: tauri::AppHandle, host: &str) -> Result<String, InvokeError>
     // Here we're using an env var to enable the /tmp file (windows not supported for now)
     // and bypass the shell::open call as it fails on GitHub Actions.
     let e2e_tauri_enabled = env::var("E2E_TAURI_ENABLED").is_ok();
-    if e2e_tauri_enabled {
+    if (e2e_tauri_enabled) {
         println!(
             "E2E_TAURI_ENABLED is set, won't open {} externally",
             auth_uri.secret()
         );
-        fs::write("/tmp/kittycad_user_code", details.user_code().secret())
-            .expect("Unable to write /tmp/kittycad_user_code file");
+        fs::write(
+            "/tmp/kittycad_user_code",
+            details.user_code().secret().to_string(),
+        )
+        .expect("Unable to write /tmp/kittycad_user_code file");
     } else {
         tauri::api::shell::open(&app.shell_scope(), auth_uri.secret(), None)
             .map_err(|e| InvokeError::from_anyhow(e.into()))?;

src-tauri/tauri.conf.json

@@ -1,13 +1,14 @@
 {
   "$schema": "../node_modules/@tauri-apps/cli/schema.json",
   "build": {
+    "beforeBuildCommand": "yarn build:both",
     "beforeDevCommand": "yarn start",
     "devPath": "http://localhost:3000",
     "distDir": "../build"
   },
   "package": {
-    "productName": "zoo-modeling-app",
-    "version": "0.15.3"
+    "productName": "kittycad-modeling",
+    "version": "0.12.0"
   },
   "tauri": {
     "allowlist": {
@@ -84,7 +85,7 @@
         "fullscreen": false,
         "height": 1200,
         "resizable": true,
-        "title": "Zoo Modeling App",
+        "title": "KittyCAD Modeling",
         "width": 1800
       }
     ]

src-tauri/tauri.macos.conf.json

@@ -1,6 +1,6 @@
 {
   "$schema": "../node_modules/@tauri-apps/cli/schema.json",
   "package": {
-    "productName": "Zoo Modeling App"
+    "productName": "KittyCAD Modeling"
   }
 }

src-tauri/tauri.release.conf.json

@@ -4,7 +4,7 @@
     "updater": {
       "active": true,
       "endpoints": [
-        "https://dl.zoo.dev/releases/modeling-app/last_update.json"
+        "https://dl.kittycad.io/releases/modeling-app/last_update.json"
       ],
       "dialog": true,
       "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEUzNzA4MjBEQjFBRTY4NzYKUldSMmFLNnhEWUp3NCtsT21Jd05wQktOaGVkOVp6MUFma0hNTDRDSnI2RkJJTEZOWG1ncFhqcU8K"

src-tauri/tauri.windows.conf.json

@@ -1,6 +1,6 @@
 {
   "$schema": "../node_modules/@tauri-apps/cli/schema.json",
   "package": {
-    "productName": "Zoo Modeling App"
+    "productName": "KittyCAD Modeling"
   }
 }

src/App.test.tsx

@@ -0,0 +1,73 @@
+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'
+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,24 +19,21 @@ import {
 } from '@fortawesome/free-solid-svg-icons'
 import { useHotkeys } from 'react-hotkeys-hook'
 import { getNormalisedCoordinates } from './lib/utils'
-import { useLoaderData, useNavigate } from 'react-router-dom'
-import { type IndexLoaderData } from 'lib/types'
-import { paths } from 'lib/paths'
+import { useLoaderData } from 'react-router-dom'
+import { IndexLoaderData } from './Router'
 import { useGlobalStateContext } from 'hooks/useGlobalStateContext'
-import { onboardingPaths } from 'routes/Onboarding/paths'
+import { onboardingPaths } from 'routes/Onboarding'
+import { cameraMouseDragGuards } from 'lib/cameraControls'
+import { CameraDragInteractionType_type } from '@kittycad/lib/dist/types/src/models'
 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 {
@@ -54,7 +51,8 @@ export function App() {
   }))
 
   const { settings } = useGlobalStateContext()
-  const { showDebugPanel, onboardingStatus, theme } = settings?.context || {}
+  const { showDebugPanel, onboardingStatus, cameraControls, theme } =
+    settings?.context || {}
   const { state, send } = useModelingContext()
 
   const editorTheme = theme === Themes.System ? getSystemTheme() : theme
@@ -73,16 +71,6 @@ 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
@@ -96,11 +84,9 @@ export function App() {
 
   const debounceSocketSend = throttle<EngineCommand>((message) => {
     engineCommandManager.sendSceneCommand(message)
-  }, 1000 / 15)
+  }, 16)
   const handleMouseMove: MouseEventHandler<HTMLDivElement> = (e) => {
-    if (state.matches('Sketch')) {
-      return
-    }
+    e.nativeEvent.preventDefault()
 
     const { x, y } = getNormalisedCoordinates({
       clientX: e.clientX,
@@ -111,11 +97,58 @@ 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: 'highlight_set_entity',
-          selected_at_window: { x, y },
+          type: 'camera_drag_move',
+          interaction,
+          window: { x, y },
         },
         cmd_id: newCmdId,
       })
@@ -139,8 +172,11 @@ export function App() {
       <ModalContainer />
       <Resizable
         className={
-          'pointer-events-none h-full flex flex-col flex-1 z-10 my-5 ml-5 pr-1 transition-opacity transition-duration-75 ' +
-          +paneOpacity
+          'h-full flex flex-col flex-1 z-10 my-5 ml-5 pr-1 transition-opacity transition-duration-75 ' +
+          (buttonDownInStream || onboardingStatus === 'camera'
+            ? ' pointer-events-none '
+            : ' ') +
+          paneOpacity
         }
         defaultSize={{
           width: '550px',
@@ -152,16 +188,10 @@ export function App() {
         maxHeight={'auto'}
         handleClasses={{
           right:
-            'hover:bg-chalkboard-10/50 bg-transparent transition-colors duration-75 transition-ease-out delay-100 ' +
-            (buttonDownInStream || onboardingStatus === 'camera'
-              ? 'pointer-events-none '
-              : 'pointer-events-auto'),
+            'hover:bg-liquid-30/40 dark:hover:bg-liquid-10/40 bg-transparent transition-colors duration-100 transition-ease-out delay-100',
         }}
       >
-        <div
-          id="code-pane"
-          className="h-full flex flex-col justify-between pointer-events-none"
-        >
+        <div id="code-pane" className="h-full flex flex-col justify-between">
           <CollapsiblePanel
             title="Code"
             icon={faCode}
@@ -205,7 +235,6 @@ export function App() {
           open={openPanes.includes('debug')}
         />
       )}
-      {/* <CamToggle /> */}
     </div>
   )
 }

src/Auth.tsx

@@ -8,7 +8,7 @@ export const Auth = ({ children }: React.PropsWithChildren) => {
 
   return isLoggingIn ? (
     <Loading>
-      <span data-testid="initial-load">Loading Modeling App...</span>
+      <span data-testid="initial-load">Loading KittyCAD Modeling App...</span>
     </Loading>
   ) : (
     <>{children}</>

src/Router.tsx

@@ -14,7 +14,10 @@ import {
 import { useEffect } from 'react'
 import { ErrorPage } from './components/ErrorPage'
 import { Settings } from './routes/Settings'
-import Onboarding, { onboardingRoutes } from './routes/Onboarding'
+import Onboarding, {
+  onboardingRoutes,
+  onboardingPaths,
+} from './routes/Onboarding'
 import SignIn from './routes/SignIn'
 import { Auth } from './Auth'
 import { isTauri } from './lib/isTauri'
@@ -26,7 +29,7 @@ import {
   isProjectDirectory,
   PROJECT_ENTRYPOINT,
 } from './lib/tauriFS'
-import { metadata } from 'tauri-plugin-fs-extra-api'
+import { metadata, type Metadata } from 'tauri-plugin-fs-extra-api'
 import DownloadAppBanner from './components/DownloadAppBanner'
 import { WasmErrBanner } from './components/WasmErrBanner'
 import { GlobalStateProvider } from './components/GlobalStateProvider'
@@ -35,18 +38,13 @@ import {
   settingsMachine,
 } from './machines/settingsMachine'
 import { ContextFrom } from 'xstate'
-import CommandBarProvider, {
-  CommandBar,
-} from 'components/CommandBar/CommandBar'
+import CommandBarProvider from 'components/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/KclSingleton'
+import { KclContextProvider, kclManager } from 'lang/KclSinglton'
 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({
@@ -80,8 +78,42 @@ 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[]
+}
+
 type CreateBrowserRouterArg = Parameters<typeof createBrowserRouter>[0]
 
 const addGlobalContextToElements = (
@@ -113,19 +145,18 @@ const router = createBrowserRouter(
     {
       path: paths.FILE + '/:id',
       element: (
-        <KclContextProvider>
-          <Auth>
-            <FileMachineProvider>
+        <Auth>
+          <FileMachineProvider>
+            <KclContextProvider>
               <ModelingMachineProvider>
                 <Outlet />
                 <App />
-                <CommandBar />
               </ModelingMachineProvider>
               <WasmErrBanner />
-            </FileMachineProvider>
-            {!isTauri() && import.meta.env.PROD && <DownloadAppBanner />}
-          </Auth>
-        </KclContextProvider>
+            </KclContextProvider>
+          </FileMachineProvider>
+          {!isTauri() && import.meta.env.PROD && <DownloadAppBanner />}
+        </Auth>
       ),
       id: paths.FILE,
       loader: async ({
@@ -178,10 +209,6 @@ 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: {
@@ -219,10 +246,9 @@ const router = createBrowserRouter(
         <Auth>
           <Outlet />
           <Home />
-          <CommandBar />
         </Auth>
       ),
-      loader: async (): Promise<HomeLoaderData | Response> => {
+      loader: async () => {
         if (!isTauri()) {
           return redirect(paths.FILE + '/' + BROWSER_FILE_NAME)
         }
@@ -233,7 +259,6 @@ const router = createBrowserRouter(
         const projectDir = await initializeProjectDirectory(
           persistedSettings.defaultDirectory || ''
         )
-        let newDefaultDirectory: string | undefined = undefined
         if (projectDir !== persistedSettings.defaultDirectory) {
           localStorage.setItem(
             SETTINGS_PERSIST_KEY,
@@ -242,7 +267,6 @@ const router = createBrowserRouter(
               defaultDirectory: projectDir,
             })
           )
-          newDefaultDirectory = projectDir
         }
         const projectsNoMeta = (await readDir(projectDir)).filter(
           isProjectDirectory
@@ -258,7 +282,6 @@ const router = createBrowserRouter(
 
         return {
           projects,
-          newDefaultDirectory,
         }
       },
       children: [

src/Toolbar.module.css

@@ -0,0 +1,106 @@
+.toolbarWrapper {
+  @apply relative;
+}
+
+.toolbar {
+  @apply flex gap-4 items-center rounded-full;
+  @apply border border-cool-20/30 bg-cool-10/50;
+}
+
+:global(.dark) .toolbar {
+  @apply border-cool-100/50 bg-cool-120/50;
+}
+
+:global(.sketch) .toolbar {
+  @apply border-fern-20/20 bg-fern-10/20;
+}
+
+:global(.dark .sketch) .toolbar {
+  @apply border-fern-120/50 bg-fern-100/30;
+}
+
+.toolbarCap {
+  @apply text-sm font-bold;
+  @apply bg-cool-20/50 text-cool-100;
+}
+
+:global(.dark) .toolbarCap {
+  @apply bg-cool-90/50 text-cool-30;
+}
+
+:global(.sketch) .toolbarCap {
+  @apply bg-fern-20/50 text-fern-100;
+}
+
+:global(.dark .sketch) .toolbarCap {
+  @apply bg-fern-90/50 text-fern-30;
+}
+
+.label {
+  @apply self-stretch flex items-center px-4 py-1;
+  @apply rounded-l-full;
+}
+
+.popoverToggle {
+  @apply self-stretch m-0 flex items-center px-4 py-1;
+  @apply rounded-r-full border-none;
+  @apply hover:bg-cool-20;
+}
+
+.toolbarButtons::-webkit-scrollbar {
+  @apply h-0.5;
+}
+
+.toolbarButtons {
+  @apply flex items-center overflow-x-auto;
+  scrollbar-width: thin;
+}
+
+.toolbarButtons button {
+  @apply text-chalkboard-90 bg-chalkboard-10/50 border-chalkboard-50 whitespace-nowrap;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  @apply gap-1.5 p-0.5 pr-1;
+  @apply rounded-sm;
+}
+:global(.dark) .toolbarButtons button {
+  @apply text-chalkboard-30 bg-chalkboard-90/50 border-chalkboard-50;
+}
+.toolbarButtons button:hover {
+  @apply text-cool-90 bg-cool-10;
+}
+:global(.sketch) .toolbarButtons button:hover {
+  @apply text-fern-90 bg-fern-10;
+}
+.toolbarButtons button:disabled {
+  @apply text-chalkboard-70 bg-chalkboard-30;
+}
+.toolbarButtons button:disabled:hover {
+  @apply !bg-inherit !text-inherit cursor-not-allowed;
+}
+
+:global(.dark) .toolbarButtons button {
+  @apply text-chalkboard-20 border-chalkboard-50;
+}
+:global(.dark) .toolbarButtons button:hover {
+  @apply text-cool-10 border-chalkboard-50 bg-cool-90;
+}
+:global(.dark .sketch) .toolbarButtons button:hover {
+  @apply text-fern-10 border-chalkboard-50 bg-fern-90;
+}
+:global(.dark) .toolbarButtons button:disabled {
+  @apply text-chalkboard-40 bg-chalkboard-80;
+}
+
+:global(.dark) .popoverToggle {
+  @apply hover:bg-cool-90;
+}
+
+:global(.sketch) .popoverToggle {
+  @apply hover:bg-fern-20;
+}
+
+:global(.dark .sketch) .popoverToggle {
+  @apply hover:bg-fern-90;
+}

src/Toolbar.tsx

@@ -1,41 +1,30 @@
-import { WheelEvent, useRef, useMemo } from 'react'
+import { Fragment, WheelEvent, useRef, useMemo } from 'react'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faSearch, faX } from '@fortawesome/free-solid-svg-icons'
+import { Popover, Transition } from '@headlessui/react'
+import styles from './Toolbar.module.css'
 import { isCursorInSketchCommandRange } from 'lang/util'
+import { ActionIcon } from 'components/ActionIcon'
 import { engineCommandManager } from './lang/std/engineConnection'
 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 sketchButtonClassnames = {
+  background:
+    'bg-chalkboard-100 group-hover:bg-chalkboard-90 hover:bg-chalkboard-90 dark:bg-fern-20 dark:group-hover:bg-fern-10 dark:hover:bg-fern-10 group-disabled:bg-chalkboard-50 dark:group-disabled:bg-chalkboard-60 group-hover:group-disabled:bg-chalkboard-50 dark:group-hover:group-disabled:bg-chalkboard-50',
+  icon: 'text-fern-20 h-auto group-hover:text-fern-10 hover:text-fern-10 dark:text-chalkboard-100 dark:group-hover:text-chalkboard-100 dark:hover:text-chalkboard-100 group-disabled:bg-chalkboard-60 hover:group-disabled:text-inherit',
+}
 
 export const Toolbar = () => {
-  const platform = usePlatform()
-  const { commandBarSend } = useCommandsContext()
   const { state, send, context } = useModelingContext()
-  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(() => {
-    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
+  const toolbarButtonsRef = useRef<HTMLSpanElement>(null)
+  const pathId = useMemo(
+    () =>
+      isCursorInSketchCommandRange(
+        engineCommandManager.artifactMap,
+        context.selectionRanges
+      ),
+    [engineCommandManager.artifactMap, context.selectionRanges]
+  )
 
   function handleToolbarButtonsWheelEvent(ev: WheelEvent<HTMLSpanElement>) {
     const span = toolbarButtonsRef.current
@@ -46,113 +35,72 @@ export const Toolbar = () => {
     span.scrollLeft = span.scrollLeft += ev.deltaY
   }
 
-  function ToolbarButtons({
-    className = '',
-    ...props
-  }: React.HTMLAttributes<HTMLElement>) {
+  function ToolbarButtons({ className }: React.HTMLAttributes<HTMLElement>) {
     return (
-      <ul
-        {...props}
+      <span
         ref={toolbarButtonsRef}
         onWheel={handleToolbarButtonsWheelEvent}
-        className={
-          'm-0 py-1 rounded-l-sm flex gap-2 items-center overflow-x-auto ' +
-          className
-        }
-        style={{ scrollbarWidth: 'thin' }}
+        className={styles.toolbarButtons + ' ' + className}
       >
         {state.nextEvents.includes('Enter sketch') && (
-          <li className="contents">
-            <ActionButton
-              Element="button"
-              onClick={() =>
-                send({ type: 'Enter sketch', data: { forceNewSketch: true } })
-              }
-              icon={{
-                icon: 'sketch',
-                bgClassName,
-              }}
-              disabled={disableAllButtons}
-            >
-              <span data-testid="start-sketch">Start Sketch</span>
-            </ActionButton>
-          </li>
+          <button
+            onClick={() => send({ type: 'Enter sketch' })}
+            className="group"
+          >
+            <ActionIcon icon="sketch" className="!p-0.5" size="md" />
+            <span data-testid="start-sketch">Start Sketch</span>
+          </button>
         )}
         {state.nextEvents.includes('Enter sketch') && pathId && (
-          <li className="contents">
-            <ActionButton
-              Element="button"
-              onClick={() => send({ type: 'Enter sketch' })}
-              icon={{
-                icon: 'sketch',
-                bgClassName,
-              }}
-              disabled={disableAllButtons}
-            >
-              Edit Sketch
-            </ActionButton>
-          </li>
+          <button
+            onClick={() => send({ type: 'Enter sketch' })}
+            className="group"
+          >
+            <ActionIcon icon="sketch" className="!p-0.5" size="md" />
+            Edit Sketch
+          </button>
         )}
         {state.nextEvents.includes('Cancel') && !state.matches('idle') && (
-          <li className="contents">
-            <ActionButton
-              Element="button"
-              onClick={() => send({ type: 'Cancel' })}
-              icon={{
-                icon: 'arrowLeft',
-                bgClassName,
-              }}
-              disabled={disableAllButtons}
-            >
-              Exit Sketch
-            </ActionButton>
-          </li>
+          <button onClick={() => send({ type: 'Cancel' })} className="group">
+            <ActionIcon icon="exit" className="!p-0.5" size="md" />
+            Exit Sketch
+          </button>
         )}
         {state.matches('Sketch') && !state.matches('idle') && (
-          <>
-            <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>
-          </>
+          <button
+            onClick={() =>
+              state.matches('Sketch.Line Tool')
+                ? send('CancelSketch')
+                : send('Equip tool')
+            }
+            className={
+              'group ' +
+              (state.matches('Sketch.Line Tool')
+                ? '!text-fern-70 !bg-fern-10 !dark:text-fern-20 !border-fern-50'
+                : '')
+            }
+          >
+            <ActionIcon icon="line" className="!p-0.5" size="md" />
+            Line
+          </button>
+        )}
+        {state.matches('Sketch') && (
+          <button
+            onClick={() =>
+              state.matches('Sketch.Move Tool')
+                ? send('CancelSketch')
+                : send('Equip move tool')
+            }
+            className={
+              'group ' +
+              (state.matches('Sketch.Move Tool')
+                ? '!text-fern-70 !bg-fern-10 !dark:text-fern-20 !border-fern-50'
+                : '')
+            }
+          >
+            <ActionIcon icon="move" className="!p-0.5" size="md" />
+            Move
+          </button>
         )}
         {state.matches('Sketch.SketchIdle') &&
           state.nextEvents
@@ -177,71 +125,102 @@ export const Toolbar = () => {
               return 0
             })
             .map((eventName) => (
-              <li className="contents" key={eventName}>
-                <ActionButton
-                  Element="button"
-                  className="text-sm"
-                  key={eventName}
-                  onClick={() => send(eventName)}
-                  disabled={
-                    !state.nextEvents
-                      .filter((event) => state.can(event as any))
-                      .includes(eventName) || disableAllButtons
-                  }
-                  title={eventName}
-                  icon={{
-                    icon: 'line',
-                    bgClassName,
-                  }}
-                >
-                  {eventName
-                    .replace('Make segment ', '')
-                    .replace('Constrain ', '')}
-                </ActionButton>
-              </li>
+              <button
+                key={eventName}
+                onClick={() => send(eventName)}
+                className="group"
+                disabled={
+                  !state.nextEvents
+                    .filter((event) => state.can(event as any))
+                    .includes(eventName)
+                }
+                title={eventName}
+              >
+                <ActionIcon
+                  icon={'line'} // TODO
+                  bgClassName={sketchButtonClassnames.background}
+                  iconClassName={sketchButtonClassnames.icon}
+                  size="md"
+                />
+                {eventName
+                  .replace('Make segment ', '')
+                  .replace('Constrain ', '')}
+              </button>
             ))}
         {state.matches('idle') && (
-          <li className="contents">
-            <ActionButton
-              Element="button"
-              className="text-sm"
-              onClick={() =>
-                commandBarSend({
-                  type: 'Find and select command',
-                  data: { name: 'Extrude', ownerMachine: 'modeling' },
-                })
-              }
-              disabled={!state.can('Extrude') || disableAllButtons}
-              title={
-                state.can('Extrude')
-                  ? 'extrude'
-                  : 'sketches need to be closed, or not already extruded'
-              }
-              icon={{
-                icon: 'extrude',
-                bgClassName,
-              }}
-            >
-              Extrude
-            </ActionButton>
-          </li>
+          <button
+            onClick={() => send('extrude intent')}
+            disabled={!state.can('extrude intent')}
+            className="group"
+            title={
+              state.can('extrude intent')
+                ? 'extrude'
+                : 'sketches need to be closed, or not already extruded'
+            }
+          >
+            <ActionIcon icon="extrude" className="!p-0.5" size="md" />
+            Extrude
+          </button>
         )}
-      </ul>
+      </span>
     )
   }
 
   return (
-    <div className="max-w-full flex items-stretch rounded-l-sm rounded-r-full bg-chalkboard-10 dark:bg-chalkboard-100 relative">
-      <menu className="flex-1 pl-1 pr-2 py-0 overflow-hidden rounded-l-sm whitespace-nowrap bg-chalkboard-10 dark:bg-chalkboard-100 border-solid border border-energy-10 dark:border-chalkboard-90 border-r-0">
-        <ToolbarButtons />
-      </menu>
-      <ActionButton
-        Element="button"
-        onClick={() => commandBarSend({ type: 'Open' })}
-        className="rounded-r-full pr-4 self-stretch border-energy-10 hover:border-energy-10 dark:border-chalkboard-80 bg-energy-10/50 hover:bg-energy-10 dark:bg-chalkboard-80 dark:text-energy-10"
+    <Popover
+      className={
+        styles.toolbarWrapper + state.matches('Sketch') ? ' sketch' : ''
+      }
+    >
+      <div className={styles.toolbar}>
+        <span className={styles.toolbarCap + ' ' + styles.label}>
+          {state.matches('Sketch') ? '2D' : '3D'}
+        </span>
+        <menu className="flex-1 gap-2 py-0.5 overflow-hidden whitespace-nowrap">
+          <ToolbarButtons />
+        </menu>
+        <Popover.Button
+          className={styles.toolbarCap + ' ' + styles.popoverToggle}
+        >
+          <FontAwesomeIcon icon={faSearch} />
+        </Popover.Button>
+      </div>
+      <Transition
+        as={Fragment}
+        enter="transition ease-out duration-200"
+        enterFrom="opacity-0"
+        enterTo="opacity-100"
+        leave="transition ease-out duration-100"
+        leaveFrom="opacity-100"
+        leaveTo="opacity-0"
       >
-        {platform === 'darwin' ? '⌘K' : 'Ctrl+/'}
-      </ActionButton>
-    </div>
+        <Popover.Overlay className="fixed inset-0 bg-chalkboard-110/20 dark:bg-chalkboard-110/50" />
+      </Transition>
+      <Transition
+        as={Fragment}
+        enter="transition ease-out duration-100"
+        enterFrom="opacity-0 translate-y-1 scale-95"
+        enterTo="opacity-100 translate-y-0 scale-100"
+        leave="transition ease-out duration-75"
+        leaveFrom="opacity-100 translate-y-0"
+        leaveTo="opacity-0 translate-y-2"
+      >
+        <Popover.Panel className="absolute top-0 w-screen max-w-xl left-1/2 -translate-x-1/2 flex flex-col gap-8 bg-chalkboard-10 dark:bg-chalkboard-100 p-5 rounded border border-chalkboard-20/30 dark:border-chalkboard-70/50">
+          <section className="flex justify-between items-center">
+            <p
+              className={`${styles.toolbarCap} ${styles.label} !self-center rounded-r-full w-fit`}
+            >
+              You're in {state.matches('Sketch') ? '2D' : '3D'}
+            </p>
+            <Popover.Button className="p-2 flex items-center justify-center rounded-sm bg-chalkboard-20 text-chalkboard-110 dark:bg-chalkboard-70 dark:text-chalkboard-20 border-none hover:bg-chalkboard-30 dark:hover:bg-chalkboard-60">
+              <FontAwesomeIcon icon={faX} className="w-4 h-4" />
+            </Popover.Button>
+          </section>
+          <section>
+            <ToolbarButtons className="flex-wrap" />
+          </section>
+        </Popover.Panel>
+      </Transition>
+    </Popover>
   )
 }