Really fix up derive docs

.codespellrc

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

.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=https://a814f2f66734989a90367f48feee28ca@o1042111.ingest.sentry.io/4505789425844224

.eslintrc

@@ -1,8 +1,4 @@
 {
-    "parser": "@typescript-eslint/parser",
-    "parserOptions": {
-      "project": "./tsconfig.json"
-    },
     "plugins": [
       "css-modules"
     ],
@@ -15,16 +11,6 @@
       "semi": [
         "error",
         "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": {
-          "testing-library/prefer-screen-queries": "off"
-        }
-      }
-    ]
+      ]
+    }
 }

.github/workflows/cargo-build.yml

@@ -15,9 +15,6 @@ on:
       - '**/Cargo.lock'
       - '**/rust-toolchain.toml'
       - .github/workflows/cargo-build.yml
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
 name: cargo build
 jobs:
   cargobuild:

.github/workflows/cargo-clippy.yml

@@ -15,9 +15,6 @@ on:
       - '**/rust-toolchain.toml'
       - '**.rs'
       - .github/workflows/cargo-build.yml
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
 name: cargo clippy
 jobs:
   cargoclippy:
@@ -43,7 +40,18 @@ 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 }}"
-          cargo clippy --all --tests --benches -- -D warnings
+          cargo clippy --all --tests -- -D warnings

.github/workflows/cargo-criterion.yml

@@ -1,40 +0,0 @@
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - '**.rs'
-      - '**/Cargo.toml'
-      - '**/Cargo.lock'
-      - '**/rust-toolchain.toml'
-      - .github/workflows/cargo-criterion.yml
-  pull_request:
-    paths:
-      - '**.rs'
-      - '**/Cargo.toml'
-      - '**/Cargo.lock'
-      - '**/rust-toolchain.toml'
-      - .github/workflows/cargo-criterion.yml
-  workflow_dispatch:
-permissions: read-all
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-name: cargo criterion
-jobs:
-  cargocriterion:
-    name: cargo criterion
-    runs-on: ubuntu-latest-8-cores
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
-      - name: Install dependencies
-        run: |
-          cargo install cargo-criterion
-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2.6.1
-      - name: Benchmark kcl library
-        shell: bash
-        run: |-
-          cd src/wasm-lib/kcl; cargo criterion
-

.github/workflows/cargo-fmt.yml

@@ -18,9 +18,6 @@ on:
 permissions:
   packages: read
   contents: read
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
 name: cargo fmt
 jobs:
   cargofmt:

.github/workflows/cargo-test.yml

@@ -17,9 +17,6 @@ on:
       - .github/workflows/cargo-test.yml
   workflow_dispatch:
 permissions: read-all
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
 name: cargo test
 jobs:
   cargotest:
@@ -44,6 +41,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: |-
@@ -51,5 +58,4 @@ jobs:
           cargo nextest run --workspace --no-fail-fast -P ci
         env:
           KITTYCAD_API_TOKEN: ${{secrets.KITTYCAD_API_TOKEN}}
-          RUST_MIN_STACK: 10485760000
 

.github/workflows/ci.yml

@@ -7,24 +7,13 @@ on:
       - main
   release:
     types: [published]
-  schedule:
-    - cron: '0 4 * * *'
-  # Daily at 04:00 AM UTC
-  # Will checkout the last commit from the default branch (main as of 2023-10-04)
-
-env:
-  BUILD_RELEASE: ${{ github.event_name == 'release' || github.event_name == 'schedule' || github.event_name == 'pull_request' && contains(github.event.pull_request.title, 'Cut release v') }}
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
 
 jobs:
   check-format:
-    runs-on: 'ubuntu-latest'
+    runs-on: 'ubuntu-20.04'
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v3
         with:
           node-version-file: '.nvmrc'
           cache: 'yarn'
@@ -32,11 +21,11 @@ jobs:
       - run: yarn fmt-check
 
   check-types:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v3
         with:
           node-version-file: '.nvmrc'
           cache: 'yarn'
@@ -48,27 +37,14 @@ jobs:
       - run: yarn build:wasm
       - run: yarn tsc
 
-
-  check-typos: 
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up Python
-        uses: actions/setup-python@v5
-      - name: Install codespell
-        run: |
-            python -m pip install codespell
-      - name: Run codespell
-        run: codespell --config .codespellrc # Edit this file to tweak the typo list and other configuration.
-
-
   build-test-web:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
+    outputs:
+      version: ${{ steps.export_version.outputs.version }}
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v3
         with:
           node-version-file: '.nvmrc'
           cache: 'yarn'
@@ -87,82 +63,36 @@ jobs:
 
       - run: yarn test:cov
 
-
-  prepare-json-files:
-    runs-on: ubuntu-latest  # seperate job on Ubuntu for easy string manipulations (compared to Windows)
-    outputs:
-      version: ${{ steps.export_version.outputs.version }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'yarn'
-          
-      - name: Set nightly version
-        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' \
-            '.tauri.updater.endpoints[]=$url' src-tauri/tauri.release.conf.json --indent 2)" > src-tauri/tauri.release.conf.json
-
-      - uses: actions/upload-artifact@v3
-        if: github.event_name == 'schedule'
-        with:
-          path: |
-            package.json
-            src-tauri/tauri.conf.json
-            src-tauri/tauri.release.conf.json
-
       - id: export_version
         run: echo "version=`cat package.json | jq -r '.version'`" >> "$GITHUB_OUTPUT"
 
-
-  build-test-apps:
-    needs: [prepare-json-files]
+  build-apps:
+    needs: [check-format, build-test-web, check-types]
     runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: false
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
+        os: [macos-latest, ubuntu-20.04, windows-latest]
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/download-artifact@v3
-
-      - name: Copy updated .json files
-        if: github.event_name == 'schedule'
+      - name: install ubuntu system dependencies
+        if: matrix.os == 'ubuntu-20.04'
         run: |
-          ls -l artifact
-          cp artifact/package.json package.json
-          cp artifact/src-tauri/tauri.conf.json src-tauri/tauri.conf.json
-          cp artifact/src-tauri/tauri.release.conf.json src-tauri/tauri.release.conf.json 
-
-      - name: Install ubuntu system dependencies
-        if: matrix.os == 'ubuntu-latest'
-        run: >
-          sudo apt-get update &&
-          sudo apt-get install -y
-          libgtk-3-dev
-          libgtksourceview-3.0-dev
-          webkit2gtk-4.0
-          libappindicator3-dev
-          webkit2gtk-driver
-          xvfb
+          sudo apt-get update
+          sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev
 
       - name: Sync node version and setup cache
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
         with:
           node-version-file: '.nvmrc'
           cache: 'yarn' # Set this to npm, yarn or pnpm.
 
       - run: yarn install
 
-      - name: Setup Rust
+      - name: Rust setup
         uses: dtolnay/rust-toolchain@stable
 
-      - name: Setup Rust cache
+      - name: Rust cache
         uses: swatinem/rust-cache@v2
         with:
           workspaces: './src-tauri -> target'
@@ -171,30 +101,24 @@ jobs:
         with:
           workspaces: './src/wasm-lib'
 
-      - name: Run build:wasm manually
+      - name: wasm prep
         shell: bash
-        env:
-          MODE: ${{ env.BUILD_RELEASE == 'true' && '--release' || '--debug' }}
         run: |
           mkdir src/wasm-lib/pkg; cd src/wasm-lib
-          echo "building with ${{ env.MODE }}"
-          npx wasm-pack build --target web --out-dir pkg ${{ env.MODE }}
+          npx wasm-pack build --target web --out-dir pkg
           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 Universal target (MacOS only)
+      - name: install apple silicon target mac
         if: matrix.os == 'macos-latest'
         run: |
           rustup target add aarch64-apple-darwin
 
-      - name: Prepare certificate and variables (Windows only)
-        if: ${{ matrix.os == 'windows-latest' && env.BUILD_RELEASE == 'true' }}
+      - name: Prepare Windows certificate and variables
+        if: matrix.os == 'windows-latest'
         run: |
           echo "${{secrets.SM_CLIENT_CERT_FILE_B64 }}" | base64 --decode > /d/Certificate_pkcs12.p12
           cat /d/Certificate_pkcs12.p12
@@ -208,8 +132,8 @@ jobs:
           echo "C:\Program Files\DigiCert\DigiCert One Signing Manager Tools" >> $GITHUB_PATH
         shell: bash
 
-      - name: Setup certicate with SSM KSP (Windows only)
-        if: ${{ matrix.os == 'windows-latest' && env.BUILD_RELEASE == 'true' }}
+      - name: Setup Windows certicate with SSM KSP
+        if: matrix.os == 'windows-latest'
         run: |
           curl -X GET  https://one.digicert.com/signingmanager/api-ui/v1/releases/smtools-windows-x64.msi/download -H "x-api-key:%SM_API_KEY%" -o smtools-windows-x64.msi
           msiexec /i smtools-windows-x64.msi /quiet /qn
@@ -219,17 +143,8 @@ jobs:
           smksp_cert_sync.exe
         shell: cmd
 
-      - name: Build the app (debug)
+      - name: Build and sign the app for the current platform
         uses: tauri-apps/tauri-action@v0
-        if: ${{ env.BUILD_RELEASE == 'false' }}
-        with:
-          includeRelease: false
-          includeDebug: true
-          args: ${{ matrix.os == 'macos-latest' && '--target universal-apple-darwin' || '' }}
-
-      - name: Build the app (release) and sign
-        uses: tauri-apps/tauri-action@v0
-        if: ${{ env.BUILD_RELEASE == 'true' }}
         env:
           TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
           TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
@@ -238,59 +153,41 @@ jobs:
           APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
-          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-          TAURI_CONF_ARGS: "--config ${{ matrix.os == 'windows-latest' && 'src-tauri\\tauri.release.conf.json' || 'src-tauri/tauri.release.conf.json' }}"
         with:
-          args: "${{ matrix.os == 'macos-latest' && '--target universal-apple-darwin' || '' }} ${{ env.TAURI_CONF_ARGS }}"
+          args: ${{ matrix.os == 'macos-latest' && '--target universal-apple-darwin' || '' }}
 
       - uses: actions/upload-artifact@v3
-        if: matrix.os != 'ubuntu-latest'
-        env:
-          PREFIX: ${{ matrix.os == 'macos-latest' && 'src-tauri/target/universal-apple-darwin' || 'src-tauri/target' }}
-          MODE: ${{ env.BUILD_RELEASE == 'true' && 'release' || 'debug' }}
         with:
-          path: "${{ env.PREFIX }}/${{ env.MODE }}/bundle/*/*"
-
-      - name: Run e2e tests (linux only)
-        if: matrix.os == 'ubuntu-latest'
-        run: |
-          cargo install tauri-driver
-          source .env.${{ env.BUILD_RELEASE == 'true' && 'production' || 'development' }}
-          export VITE_KC_API_BASE_URL
-          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 }}
-
+          path: ${{ matrix.os == 'macos-latest' && 'src-tauri/target/universal-apple-darwin/release/bundle/*/*' || 'src-tauri/target/release/bundle/*/*' }}
 
   publish-apps-release:
-    runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'release' || github.event_name == 'schedule' }}
-    needs: [check-format, check-types, check-typos, build-test-web, prepare-json-files, build-test-apps]
+    runs-on: ubuntu-20.04
+    if: github.event_name == 'release'
+    needs: [build-test-web, build-apps]
     env:
-      VERSION_NO_V: ${{ needs.prepare-json-files.outputs.version }}
-      VERSION: ${{ github.event_name == 'release' && format('v{0}', needs.prepare-json-files.outputs.version) || needs.prepare-json-files.outputs.version }}
-      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' }}
+      VERSION_NO_V: ${{ needs.build-test-web.outputs.version }}
+      PUB_DATE: ${{ github.event.release.created_at }}
+      NOTES: ${{ github.event.release.body }}
     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://dl.kittycad.io/releases/modeling-app/v${VERSION_NO_V}
           jq --null-input \
-            --arg version "${VERSION}" \
+            --arg version "v${VERSION_NO_V}" \
             --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,
@@ -304,6 +201,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
@@ -314,13 +215,14 @@ jobs:
 
       - name: Generate the download static endpoint
         run: |
-          RELEASE_DIR=https://${WEBSITE_DIR}/${VERSION}
+          RELEASE_DIR=https://dl.kittycad.io/releases/modeling-app/v${VERSION_NO_V}
           jq --null-input \
-            --arg version "${VERSION}" \
+            --arg version "v${VERSION_NO_V}" \
             --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,
@@ -329,6 +231,9 @@ jobs:
                 "dmg-universal": {
                   "url": $darwin_url
                 },
+                "appimage-x86_64": {
+                  "url": $linux_url
+                },
                 "msi-x86_64": {
                   "url": $windows_url
                 }
@@ -337,37 +242,36 @@ jobs:
             cat last_download.json
 
       - name: Authenticate to Google Cloud
-        uses: 'google-github-actions/auth@v2.0.0'
+        uses: 'google-github-actions/auth@v1.1.1'
         with:
           credentials_json: '${{ secrets.GOOGLE_CLOUD_DL_SA }}'
 
       - name: Set up Google Cloud SDK
-        uses: google-github-actions/setup-gcloud@v2.0.0
+        uses: google-github-actions/setup-gcloud@v1.1.1
         with:
           project_id: kittycadapi
 
       - name: Upload release files to public bucket
-        uses: google-github-actions/upload-cloud-storage@v2.0.0
+        uses: google-github-actions/upload-cloud-storage@v1.0.3
         with:
           path: artifact
-          glob: '*/Zoo*'
+          glob: '*/*itty*'
           parent: false
-          destination: ${{ env.BUCKET_DIR }}/${{ env.VERSION }}
+          destination: dl.kittycad.io/releases/modeling-app/v${{ env.VERSION_NO_V }}
 
       - name: Upload update endpoint to public bucket
-        uses: google-github-actions/upload-cloud-storage@v2.0.0
+        uses: google-github-actions/upload-cloud-storage@v1.0.3
         with:
           path: last_update.json
-          destination: ${{ env.BUCKET_DIR }}
+          destination: dl.kittycad.io/releases/modeling-app
 
       - name: Upload download endpoint to public bucket
-        uses: google-github-actions/upload-cloud-storage@v2.0.0
+        uses: google-github-actions/upload-cloud-storage@v1.0.3
         with:
           path: last_download.json
-          destination: ${{ env.BUCKET_DIR }}
+          destination: dl.kittycad.io/releases/modeling-app
 
       - name: Upload release files to Github
-        if: ${{ github.event_name == 'release' }}
         uses: softprops/action-gh-release@v1
         with:
-          files: 'artifact/*/Zoo*'
+          files: artifact/*/*itty*

.github/workflows/playwright.yml

@@ -1,116 +0,0 @@
-name: Playwright Tests
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-jobs:
-  playwright-ubuntu:
-    timeout-minutes: 60
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
-      with:
-        node-version-file: '.nvmrc'
-        cache: 'yarn'
-    - uses: KittyCAD/action-install-cli@v0.2.16
-    - name: Install dependencies
-      run: yarn
-    - name: Install Playwright Browsers
-      run: yarn playwright install --with-deps
-    - name: Setup Rust
-      uses: dtolnay/rust-toolchain@stable
-    - name: Cache wasm
-      uses: Swatinem/rust-cache@v2
-      with:
-        workspaces: './src/wasm-lib'
-    - name: build wasm
-      run: yarn build:wasm
-    - name: build web
-      run: yarn build:local
-    - name: Run ubuntu/chrome snapshots
-      run: yarn playwright test --project="Google Chrome" --update-snapshots e2e/playwright/snapshot-tests.spec.ts
-      env:
-        CI: true
-        token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
-        snapshottoken: ${{ secrets.KITTYCAD_API_TOKEN }}
-    - uses: actions/upload-artifact@v3
-      if: always()
-      with:
-        name: playwright-report
-        path: playwright-report/
-        retention-days: 30
-    - name: check for changes
-      id: git-check
-      run: |
-          git add .
-          if git status | grep -q "Changes to be committed"
-          then
-            echo "::set-output name=modified::true"
-          else
-            echo "::set-output name=modified::false"
-          fi
-    - name: Commit changes, if any
-      if: steps.git-check.outputs.modified == 'true'
-      run: |
-        git add .
-        git config --local user.email "github-actions[bot]@users.noreply.github.com"
-        git config --local user.name "github-actions[bot]"
-        git remote set-url origin https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git
-        git fetch origin
-        echo ${{ github.head_ref }}
-        git checkout ${{ github.head_ref }}
-        # TODO when safari works on ubuntu remove the os part of the commit message
-        git commit -am "A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu)" || true
-        git push
-        git push origin ${{ github.head_ref }}
-    - name: Run ubuntu/chrome flow
-      run: yarn playwright test --project="Google Chrome" e2e/playwright/flow-tests.spec.ts
-      env:
-        CI: true
-        token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
-    - uses: actions/upload-artifact@v3
-      if: always()
-      with:
-        name: playwright-report
-        path: playwright-report/
-        retention-days: 30
-
-  playwright-macos:
-    timeout-minutes: 60
-    runs-on: macos-latest
-    needs: playwright-ubuntu
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
-      with:
-        node-version-file: '.nvmrc'
-        cache: 'yarn'
-    - name: Install dependencies
-      run: yarn
-    - name: Install Playwright Browsers
-      run: yarn playwright install --with-deps
-    - name: Setup Rust
-      uses: dtolnay/rust-toolchain@stable
-    - name: Cache wasm
-      uses: Swatinem/rust-cache@v2
-      with:
-        workspaces: './src/wasm-lib'
-    - name: build wasm
-      run: yarn build:wasm
-    - name: build web
-      run: yarn build:local
-    - name: Run macos/safari flow
-      # safari doesn't work on Ubuntu because of the same reason tauri doesn't (webRTC issues)
-      # TODO remove this and the matrix and run all tests on ubuntu when this is fixed
-      run: yarn playwright test --project="webkit" e2e/playwright/flow-tests.spec.ts
-      env:
-        CI: true
-        token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
-    - uses: actions/upload-artifact@v3
-      if: always()
-      with:
-        name: playwright-report
-        path: playwright-report/
-        retention-days: 30

.gitignore

@@ -22,31 +22,9 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 
-.idea
-.vscode
-src/wasm-lib/.idea
-src/wasm-lib/.vscode
-
 # rust
 src/wasm-lib/target
 src/wasm-lib/bindings
 src/wasm-lib/kcl/bindings
 public/wasm_lib_bg.wasm
 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/

.prettierignore

@@ -7,7 +7,3 @@ coverage
 target
 src/wasm-lib/pkg
 src/wasm-lib/kcl/bindings
-e2e/playwright/export-snapshots
-
-# XState generated files
-src/machines/modelingMachine.typegen.ts

LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2023 The Zoo 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
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

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
 
@@ -29,7 +29,6 @@ The 3D view in Modeling App is just a video stream from our hosted geometry engi
   - [React](https://react.dev/)
   - [Headless UI](https://headlessui.com/)
   - [TailwindCSS](https://tailwindcss.com/)
-  - [XState](https://xstate.js.org/)
 - Networking
   - WebSockets (via [KittyCAD TS client](https://github.com/KittyCAD/kittycad.ts))
 - Code Editor
@@ -48,7 +47,7 @@ We recommend downloading the latest application binary from [our Releases page](
 
 ## Running a development build
 
-First, [install Rust via `rustup`](https://www.rust-lang.org/tools/install). This project uses a lot of Rust compiled to [WASM](https://webassembly.org/) within it. We always use the latest stable version of Rust, so you may need to run `rustup update stable`. Then, run:
+First, [install Rust via `rustup`](https://www.rust-lang.org/tools/install). This project uses a lot of Rust compiled to [WASM](https://webassembly.org/) within it. Then, run:
 
 ```
 yarn install
@@ -57,7 +56,7 @@ yarn install
 followed by:
 
 ```
-yarn build:wasm-dev
+yarn build:wasm
 ```
 
 That will build the WASM binary and put in the `public` dir (though gitignored)
@@ -89,21 +88,15 @@ yarn test
 
 Which will run our suite of [Vitest unit](https://vitest.dev/) and [React Testing Library E2E](https://testing-library.com/docs/react-testing-library/intro/) tests, in interactive mode by default.
 
-For running the rust (not tauri rust though) only, you can
-```bash
-cd src/wasm-lib
-cargo test
-```
-
 ## Tauri
 
-To spin up up tauri dev, `yarn install` and `yarn build:wasm-dev` need to have been done before hand then
+To spin up up tauri dev, `yarn install` and `yarn build:wasm` need to have been done before hand then
 
 ```
 yarn tauri dev
 ```
 
-Will spin up the web app before opening up the tauri dev desktop app. Note that it's probably a good idea to close the browser tab that gets opened since at the time of writing they can conflict.
+Will spin up the web app before opening up the tauri dev desktop app. Note that it's probably a good idea to close the browser tab that gets opened since at the time of writting they can conflict.
 
 The dev instance automatically opens up the browser devtools which can be disabled by [commenting it out](https://github.com/KittyCAD/modeling-app/blob/main/src-tauri/src/main.rs#L92.)
 
@@ -130,24 +123,13 @@ Before you submit a contribution PR to this repo, please ensure that:
 
 ## Release a new version
 
-1. Bump the versions in the .json files by creating a `Cut release v{x}.{y}.{z}` PR, committing the changes from
+1. Bump the versions in the .json files by creating a `Bump to v{x}.{y}.{z}` PR, committing the changes from
 
 ```bash
 VERSION=x.y.z yarn run bump-jsons
 ```
 
-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
-console.log(
-  '- ' +
-    Array.from(
-      document.querySelectorAll('[data-hovercard-type="pull_request"]')
-    ).map((a) => `[${a.innerText}](${a.href})`).join(`
-- `)
-)
-```
-grab the md list and delete any that are older than the last bump
+The PR may serve as a place to discuss the human-readable changelog and extra QA.
 
 2. Merge the PR
 
@@ -175,112 +157,3 @@ $ cargo +nightly fuzz run parser
 
 For more information on fuzzing you can check out
 [this guide](https://rust-fuzz.github.io/book/cargo-fuzz.html).
-
-
-### Playwright
-
-First time running plawright locally, you'll need to add the secrets file
-```bash
-touch ./e2e/playwright/playwright-secrets.env
-echo 'token="your-token"\nsnapshottoken="your-snapshot-token"' > ./e2e/playwright/playwright-secrets2.env
-```
-then replace "your-token" with a dev token from dev.zoo.dev/account/api-tokens
-
-then:
-run playwright
-```
-yarn playwright test
-```
-
-run a specific test suite
-```
-yarn playwright test src/e2e-tests/example.spec.ts
-```
-
-run a specific test change the test from `test('...` to `test.only('...`
-(note if you commit this, the tests will instantly fail without running any of the tests)
-
-run headed
-```
-yarn playwright test --headed
-```
-
-run with step through debugger
-```
-PWDEBUG=1 yarn playwright test
-```
-However, if you want a debugger I recommend using VSCode and the `playwright` extension, as the above command is a cruder debugger that steps into every function call which is annoying.
-With the extension you can set a breakpoint after `waitForDefaultPlanesVisibilityChange` in order to skip app loading, then the vscode debugger's "step over" is much better for being able to stay at the right level of abstraction as you debug the code.
-
-If you want to limit to a single browser use `--project="webkit"` or `firefox`, `Google Chrome`
-Or comment out browsers in `playwright.config.ts`.
-
-note chromium has encoder compat issues which is why were testing against the branded 'Google Chrome'
-
-You may consider using the VSCode extension, it's useful for running individual threads, but some some reason the "record a test" is locked to chromium with we can't use. A work around is to us the CI `yarn playwright codegen -b wk --load-storage ./store localhost:3000`
-
-<details>
-<summary>
-
-Where `./store` should look like this
-
-</summary>
-
-```JSON
-{
-  "cookies": [],
-  "origins": [
-    {
-      "origin": "http://localhost:3000",
-      "localStorage": [
-        {
-          "name": "store",
-          "value": "{\"state\":{\"openPanes\":[\"code\"]},\"version\":0}"
-        },
-        {
-          "name": "persistCode",
-          "value": ""
-        },
-        {
-          "name": "TOKEN_PERSIST_KEY",
-          "value": "your-token"
-        }
-      ]
-    }
-  ]
-}
-```
-
-</details>
-
-
-However because much of our tests involve clicking in the stream at specific locations, it's code-gen looks `await page.locator('video').click();` when really we need to use a pixel coord, so I think it's of limited use.
-
-#### Some notes on CI
-
-The tests are broken into snapshot tests and non-snapshot tests, and they run in that order, they automatically commit new snap shots, so if you see an image commit check it was an intended change. If we have non-determinism in the snapshots such that they are always committing new images, hopefully this annoyance makes us fix them asap, if you notice this happening let Kurt know. But for the odd occasion  `git reset --hard HEAD~ && git push -f` is your friend.
-
-How to interpret failing playwright tests?
-If your tests fail, click through to the action and see that the tests failed on a line that includes `await page.getByTestId('loading').waitFor({ state: 'detached' })`, this means the test fail because the stream never started. It's you choice if you want to re-run the test, or ignore the failure.
-
-We run on ubuntu and macos, because safari doesn't work on linux because of the dreaded "no RTCPeerConnection variable" error. But linux runs first and then macos for the same reason that we limit the number of parallel tests to 1 because we limit stream connections per user, so tests would start failing we if let them run together.
-
-If something fails on CI you can download the artifact, unzip it and then open `playwright-report/data/<UUID>.zip` with https://trace.playwright.dev/ to see what happened.
-
-#### Getting started writing a playwright test in our app
-
-Besides following the instructions above and using the playwright docs, our app is weird because of the whole stream thing, which means our testing is weird. Because we've just figured out this stuff and therefore docs might go stale quick here's a 15min vid/tutorial
-
-https://github.com/KittyCAD/modeling-app/assets/29681384/6f5e8e85-1003-4fd9-be7f-f36ce833942d
-
-<details>
-
-<summary>
-Ps for the debug panel, the following JSON is useful for snapping the camera
-</summary>
-
-```JSON
-{"type":"modeling_cmd_req","cmd_id":"054e5472-e5e9-4071-92d7-1ce3bac61956","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}}}
-```
-
-</details>

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

@@ -1,494 +0,0 @@
-ISO-10303-21;
-HEADER;
-FILE_DESCRIPTION((('kittycad.io export')), '2;1');
-FILE_NAME('dump.step', '1970-01-01T00:00:00.0+00:00', ('Author unknown'), ('Organization unknown'), 'kittycad.io beta', 'kittycad.io', 'Authorization unknown');
-FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
-ENDSEC;
-DATA;
-#1 = (
-  LENGTH_UNIT()
-  NAMED_UNIT(*)
-  SI_UNIT($, .METRE.)
-);
-#2 = UNCERTAINTY_MEASURE_WITH_UNIT(0.00001, #1, 'DISTANCE_ACCURACY_VALUE', $);
-#3 = (
-  GEOMETRIC_REPRESENTATION_CONTEXT(3)
-  GLOBAL_UNCERTAINTY_ASSIGNED_CONTEXT((#2))
-  GLOBAL_UNIT_ASSIGNED_CONTEXT((#1))
-  REPRESENTATION_CONTEXT('', '3D')
-);
-#4 = CARTESIAN_POINT('NONE', (0, 0, -0));
-#5 = VERTEX_POINT('NONE', #4);
-#6 = CARTESIAN_POINT('NONE', (0, -0.0254, -0));
-#7 = VERTEX_POINT('NONE', #6);
-#8 = CARTESIAN_POINT('NONE', (0, -0.0254, 0.1016));
-#9 = VERTEX_POINT('NONE', #8);
-#10 = CARTESIAN_POINT('NONE', (0, 0, 0.1016));
-#11 = VERTEX_POINT('NONE', #10);
-#12 = CARTESIAN_POINT('NONE', (0.07861346939195568, -0.0254, -0));
-#13 = VERTEX_POINT('NONE', #12);
-#14 = CARTESIAN_POINT('NONE', (0.07861346939195568, -0.0254, 0.1016));
-#15 = VERTEX_POINT('NONE', #14);
-#16 = CARTESIAN_POINT('NONE', (0.1511633881344551, -0.07619999999999998, -0));
-#17 = VERTEX_POINT('NONE', #16);
-#18 = CARTESIAN_POINT('NONE', (0.1511633881344551, -0.07619999999999998, 0.1016));
-#19 = VERTEX_POINT('NONE', #18);
-#20 = CARTESIAN_POINT('NONE', (0.2413, -0.0762, -0));
-#21 = VERTEX_POINT('NONE', #20);
-#22 = CARTESIAN_POINT('NONE', (0.2413, -0.0762, 0.1016));
-#23 = VERTEX_POINT('NONE', #22);
-#24 = CARTESIAN_POINT('NONE', (0.2413, -0.0635, -0));
-#25 = VERTEX_POINT('NONE', #24);
-#26 = CARTESIAN_POINT('NONE', (0.2413, -0.0635, 0.1016));
-#27 = VERTEX_POINT('NONE', #26);
-#28 = CARTESIAN_POINT('NONE', (0.1551676827532182, -0.0635, -0));
-#29 = VERTEX_POINT('NONE', #28);
-#30 = CARTESIAN_POINT('NONE', (0.1551676827532182, -0.0635, 0.1016));
-#31 = VERTEX_POINT('NONE', #30);
-#32 = CARTESIAN_POINT('NONE', (0.06448028432509392, 0, -0));
-#33 = VERTEX_POINT('NONE', #32);
-#34 = CARTESIAN_POINT('NONE', (0.06448028432509392, 0, 0.1016));
-#35 = VERTEX_POINT('NONE', #34);
-#36 = CARTESIAN_POINT('NONE', (0.14618599799650817, 0.03810000000000001, -0));
-#37 = VERTEX_POINT('NONE', #36);
-#38 = CARTESIAN_POINT('NONE', (0.14618599799650817, 0.03810000000000001, 0.1016));
-#39 = VERTEX_POINT('NONE', #38);
-#40 = CARTESIAN_POINT('NONE', (0.2413, 0.0381, -0));
-#41 = VERTEX_POINT('NONE', #40);
-#42 = CARTESIAN_POINT('NONE', (0.2413, 0.0381, 0.1016));
-#43 = VERTEX_POINT('NONE', #42);
-#44 = CARTESIAN_POINT('NONE', (0.2413, 0.0508, -0));
-#45 = VERTEX_POINT('NONE', #44);
-#46 = CARTESIAN_POINT('NONE', (0.2413, 0.0508, 0.1016));
-#47 = VERTEX_POINT('NONE', #46);
-#48 = CARTESIAN_POINT('NONE', (0.14337047578094278, 0.0508, -0));
-#49 = VERTEX_POINT('NONE', #48);
-#50 = CARTESIAN_POINT('NONE', (0.14337047578094278, 0.0508, 0.1016));
-#51 = VERTEX_POINT('NONE', #50);
-#52 = CARTESIAN_POINT('NONE', (0.08889999999999999, 0.0254, -0));
-#53 = VERTEX_POINT('NONE', #52);
-#54 = CARTESIAN_POINT('NONE', (0.08889999999999999, 0.0254, 0.1016));
-#55 = VERTEX_POINT('NONE', #54);
-#56 = CARTESIAN_POINT('NONE', (0, 0.0254, -0));
-#57 = VERTEX_POINT('NONE', #56);
-#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);
-#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.0254, -0));
-#67 = LINE('NONE', #66, #65);
-#68 = DIRECTION('NONE', (0, -1, 0));
-#69 = VECTOR('NONE', #68, 1);
-#70 = CARTESIAN_POINT('NONE', (0, 0, 0.1016));
-#71 = LINE('NONE', #70, #69);
-#72 = DIRECTION('NONE', (0, 0, 1));
-#73 = VECTOR('NONE', #72, 1);
-#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.0254, -0));
-#79 = LINE('NONE', #78, #77);
-#80 = DIRECTION('NONE', (0, 0, 1));
-#81 = VECTOR('NONE', #80, 1);
-#82 = CARTESIAN_POINT('NONE', (0.07861346939195568, -0.0254, -0));
-#83 = LINE('NONE', #82, #81);
-#84 = DIRECTION('NONE', (1, 0, 0));
-#85 = VECTOR('NONE', #84, 1);
-#86 = CARTESIAN_POINT('NONE', (0, -0.0254, 0.1016));
-#87 = LINE('NONE', #86, #85);
-#88 = DIRECTION('NONE', (0.8191520442889919, -0.5735764363510459, 0));
-#89 = VECTOR('NONE', #88, 1);
-#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', (0.1511633881344551, -0.07619999999999998, -0));
-#95 = LINE('NONE', #94, #93);
-#96 = DIRECTION('NONE', (0.8191520442889919, -0.5735764363510459, 0));
-#97 = VECTOR('NONE', #96, 1);
-#98 = CARTESIAN_POINT('NONE', (0.07861346939195568, -0.0254, 0.1016));
-#99 = LINE('NONE', #98, #97);
-#100 = DIRECTION('NONE', (1, -0.0000000000000003079278779307945, 0));
-#101 = VECTOR('NONE', #100, 1);
-#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', (0.2413, -0.0762, -0));
-#107 = LINE('NONE', #106, #105);
-#108 = DIRECTION('NONE', (1, -0.0000000000000003079278779307945, 0));
-#109 = VECTOR('NONE', #108, 1);
-#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', (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', (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', (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', (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', (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', (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', (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', (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', (0.1551676827532182, -0.0635, 0.1016));
-#147 = LINE('NONE', #146, #145);
-#148 = DIRECTION('NONE', (0.90630778703665, 0.4226182617406993, 0));
-#149 = VECTOR('NONE', #148, 1);
-#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', (0.14618599799650817, 0.03810000000000001, -0));
-#155 = LINE('NONE', #154, #153);
-#156 = DIRECTION('NONE', (0.90630778703665, 0.4226182617406993, 0));
-#157 = VECTOR('NONE', #156, 1);
-#158 = CARTESIAN_POINT('NONE', (0.06448028432509392, 0, 0.1016));
-#159 = LINE('NONE', #158, #157);
-#160 = DIRECTION('NONE', (1, -0.00000000000000007295344279228718, 0));
-#161 = VECTOR('NONE', #160, 1);
-#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', (0.2413, 0.0381, -0));
-#167 = LINE('NONE', #166, #165);
-#168 = DIRECTION('NONE', (1, -0.00000000000000007295344279228718, 0));
-#169 = VECTOR('NONE', #168, 1);
-#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', (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', (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', (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', (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', (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', (0.2413, 0.0508, 0.1016));
-#195 = LINE('NONE', #194, #193);
-#196 = DIRECTION('NONE', (-0.90630778703665, -0.42261826174069944, 0));
-#197 = VECTOR('NONE', #196, 1);
-#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', (0.08889999999999999, 0.0254, -0));
-#203 = LINE('NONE', #202, #201);
-#204 = DIRECTION('NONE', (-0.90630778703665, -0.42261826174069944, 0));
-#205 = VECTOR('NONE', #204, 1);
-#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', (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.0254, -0));
-#215 = LINE('NONE', #214, #213);
-#216 = DIRECTION('NONE', (-1, 0, 0));
-#217 = VECTOR('NONE', #216, 1);
-#218 = CARTESIAN_POINT('NONE', (0.08889999999999999, 0.0254, 0.1016));
-#219 = LINE('NONE', #218, #217);
-#220 = DIRECTION('NONE', (0, -1, 0));
-#221 = VECTOR('NONE', #220, 1);
-#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.0254, 0.1016));
-#227 = LINE('NONE', #226, #225);
-#228 = EDGE_CURVE('NONE', #5, #7, #63, .T.);
-#229 = EDGE_CURVE('NONE', #7, #9, #67, .T.);
-#230 = EDGE_CURVE('NONE', #11, #9, #71, .T.);
-#231 = EDGE_CURVE('NONE', #5, #11, #75, .T.);
-#232 = EDGE_CURVE('NONE', #7, #13, #79, .T.);
-#233 = EDGE_CURVE('NONE', #13, #15, #83, .T.);
-#234 = EDGE_CURVE('NONE', #9, #15, #87, .T.);
-#235 = EDGE_CURVE('NONE', #13, #17, #91, .T.);
-#236 = EDGE_CURVE('NONE', #17, #19, #95, .T.);
-#237 = EDGE_CURVE('NONE', #15, #19, #99, .T.);
-#238 = EDGE_CURVE('NONE', #17, #21, #103, .T.);
-#239 = EDGE_CURVE('NONE', #21, #23, #107, .T.);
-#240 = EDGE_CURVE('NONE', #19, #23, #111, .T.);
-#241 = EDGE_CURVE('NONE', #21, #25, #115, .T.);
-#242 = EDGE_CURVE('NONE', #25, #27, #119, .T.);
-#243 = EDGE_CURVE('NONE', #23, #27, #123, .T.);
-#244 = EDGE_CURVE('NONE', #25, #29, #127, .T.);
-#245 = EDGE_CURVE('NONE', #29, #31, #131, .T.);
-#246 = EDGE_CURVE('NONE', #27, #31, #135, .T.);
-#247 = EDGE_CURVE('NONE', #29, #33, #139, .T.);
-#248 = EDGE_CURVE('NONE', #33, #35, #143, .T.);
-#249 = EDGE_CURVE('NONE', #31, #35, #147, .T.);
-#250 = EDGE_CURVE('NONE', #33, #37, #151, .T.);
-#251 = EDGE_CURVE('NONE', #37, #39, #155, .T.);
-#252 = EDGE_CURVE('NONE', #35, #39, #159, .T.);
-#253 = EDGE_CURVE('NONE', #37, #41, #163, .T.);
-#254 = EDGE_CURVE('NONE', #41, #43, #167, .T.);
-#255 = EDGE_CURVE('NONE', #39, #43, #171, .T.);
-#256 = EDGE_CURVE('NONE', #41, #45, #175, .T.);
-#257 = EDGE_CURVE('NONE', #45, #47, #179, .T.);
-#258 = EDGE_CURVE('NONE', #43, #47, #183, .T.);
-#259 = EDGE_CURVE('NONE', #45, #49, #187, .T.);
-#260 = EDGE_CURVE('NONE', #49, #51, #191, .T.);
-#261 = EDGE_CURVE('NONE', #47, #51, #195, .T.);
-#262 = EDGE_CURVE('NONE', #49, #53, #199, .T.);
-#263 = EDGE_CURVE('NONE', #53, #55, #203, .T.);
-#264 = EDGE_CURVE('NONE', #51, #55, #207, .T.);
-#265 = EDGE_CURVE('NONE', #53, #57, #211, .T.);
-#266 = EDGE_CURVE('NONE', #57, #59, #215, .T.);
-#267 = EDGE_CURVE('NONE', #55, #59, #219, .T.);
-#268 = EDGE_CURVE('NONE', #57, #5, #223, .T.);
-#269 = EDGE_CURVE('NONE', #59, #11, #227, .T.);
-#270 = ORIENTED_EDGE('NONE', *, *, #228, .T.);
-#271 = ORIENTED_EDGE('NONE', *, *, #229, .T.);
-#272 = ORIENTED_EDGE('NONE', *, *, #230, .F.);
-#273 = ORIENTED_EDGE('NONE', *, *, #231, .F.);
-#274 = EDGE_LOOP('NONE', (#270, #271, #272, #273));
-#275 = ORIENTED_EDGE('NONE', *, *, #232, .T.);
-#276 = ORIENTED_EDGE('NONE', *, *, #233, .T.);
-#277 = ORIENTED_EDGE('NONE', *, *, #234, .F.);
-#278 = ORIENTED_EDGE('NONE', *, *, #229, .F.);
-#279 = EDGE_LOOP('NONE', (#275, #276, #277, #278));
-#280 = ORIENTED_EDGE('NONE', *, *, #235, .T.);
-#281 = ORIENTED_EDGE('NONE', *, *, #236, .T.);
-#282 = ORIENTED_EDGE('NONE', *, *, #237, .F.);
-#283 = ORIENTED_EDGE('NONE', *, *, #233, .F.);
-#284 = EDGE_LOOP('NONE', (#280, #281, #282, #283));
-#285 = ORIENTED_EDGE('NONE', *, *, #238, .T.);
-#286 = ORIENTED_EDGE('NONE', *, *, #239, .T.);
-#287 = ORIENTED_EDGE('NONE', *, *, #240, .F.);
-#288 = ORIENTED_EDGE('NONE', *, *, #236, .F.);
-#289 = EDGE_LOOP('NONE', (#285, #286, #287, #288));
-#290 = ORIENTED_EDGE('NONE', *, *, #241, .T.);
-#291 = ORIENTED_EDGE('NONE', *, *, #242, .T.);
-#292 = ORIENTED_EDGE('NONE', *, *, #243, .F.);
-#293 = ORIENTED_EDGE('NONE', *, *, #239, .F.);
-#294 = EDGE_LOOP('NONE', (#290, #291, #292, #293));
-#295 = ORIENTED_EDGE('NONE', *, *, #244, .T.);
-#296 = ORIENTED_EDGE('NONE', *, *, #245, .T.);
-#297 = ORIENTED_EDGE('NONE', *, *, #246, .F.);
-#298 = ORIENTED_EDGE('NONE', *, *, #242, .F.);
-#299 = EDGE_LOOP('NONE', (#295, #296, #297, #298));
-#300 = ORIENTED_EDGE('NONE', *, *, #247, .T.);
-#301 = ORIENTED_EDGE('NONE', *, *, #248, .T.);
-#302 = ORIENTED_EDGE('NONE', *, *, #249, .F.);
-#303 = ORIENTED_EDGE('NONE', *, *, #245, .F.);
-#304 = EDGE_LOOP('NONE', (#300, #301, #302, #303));
-#305 = ORIENTED_EDGE('NONE', *, *, #250, .T.);
-#306 = ORIENTED_EDGE('NONE', *, *, #251, .T.);
-#307 = ORIENTED_EDGE('NONE', *, *, #252, .F.);
-#308 = ORIENTED_EDGE('NONE', *, *, #248, .F.);
-#309 = EDGE_LOOP('NONE', (#305, #306, #307, #308));
-#310 = ORIENTED_EDGE('NONE', *, *, #253, .T.);
-#311 = ORIENTED_EDGE('NONE', *, *, #254, .T.);
-#312 = ORIENTED_EDGE('NONE', *, *, #255, .F.);
-#313 = ORIENTED_EDGE('NONE', *, *, #251, .F.);
-#314 = EDGE_LOOP('NONE', (#310, #311, #312, #313));
-#315 = ORIENTED_EDGE('NONE', *, *, #256, .T.);
-#316 = ORIENTED_EDGE('NONE', *, *, #257, .T.);
-#317 = ORIENTED_EDGE('NONE', *, *, #258, .F.);
-#318 = ORIENTED_EDGE('NONE', *, *, #254, .F.);
-#319 = EDGE_LOOP('NONE', (#315, #316, #317, #318));
-#320 = ORIENTED_EDGE('NONE', *, *, #259, .T.);
-#321 = ORIENTED_EDGE('NONE', *, *, #260, .T.);
-#322 = ORIENTED_EDGE('NONE', *, *, #261, .F.);
-#323 = ORIENTED_EDGE('NONE', *, *, #257, .F.);
-#324 = EDGE_LOOP('NONE', (#320, #321, #322, #323));
-#325 = ORIENTED_EDGE('NONE', *, *, #262, .T.);
-#326 = ORIENTED_EDGE('NONE', *, *, #263, .T.);
-#327 = ORIENTED_EDGE('NONE', *, *, #264, .F.);
-#328 = ORIENTED_EDGE('NONE', *, *, #260, .F.);
-#329 = EDGE_LOOP('NONE', (#325, #326, #327, #328));
-#330 = ORIENTED_EDGE('NONE', *, *, #265, .T.);
-#331 = ORIENTED_EDGE('NONE', *, *, #266, .T.);
-#332 = ORIENTED_EDGE('NONE', *, *, #267, .F.);
-#333 = ORIENTED_EDGE('NONE', *, *, #263, .F.);
-#334 = EDGE_LOOP('NONE', (#330, #331, #332, #333));
-#335 = ORIENTED_EDGE('NONE', *, *, #268, .T.);
-#336 = ORIENTED_EDGE('NONE', *, *, #231, .T.);
-#337 = ORIENTED_EDGE('NONE', *, *, #269, .F.);
-#338 = ORIENTED_EDGE('NONE', *, *, #266, .F.);
-#339 = EDGE_LOOP('NONE', (#335, #336, #337, #338));
-#340 = ORIENTED_EDGE('NONE', *, *, #228, .T.);
-#341 = ORIENTED_EDGE('NONE', *, *, #232, .T.);
-#342 = ORIENTED_EDGE('NONE', *, *, #235, .T.);
-#343 = ORIENTED_EDGE('NONE', *, *, #238, .T.);
-#344 = ORIENTED_EDGE('NONE', *, *, #241, .T.);
-#345 = ORIENTED_EDGE('NONE', *, *, #244, .T.);
-#346 = ORIENTED_EDGE('NONE', *, *, #247, .T.);
-#347 = ORIENTED_EDGE('NONE', *, *, #250, .T.);
-#348 = ORIENTED_EDGE('NONE', *, *, #253, .T.);
-#349 = ORIENTED_EDGE('NONE', *, *, #256, .T.);
-#350 = ORIENTED_EDGE('NONE', *, *, #259, .T.);
-#351 = ORIENTED_EDGE('NONE', *, *, #262, .T.);
-#352 = ORIENTED_EDGE('NONE', *, *, #265, .T.);
-#353 = ORIENTED_EDGE('NONE', *, *, #268, .T.);
-#354 = EDGE_LOOP('NONE', (#340, #341, #342, #343, #344, #345, #346, #347, #348, #349, #350, #351, #352, #353));
-#355 = ORIENTED_EDGE('NONE', *, *, #230, .T.);
-#356 = ORIENTED_EDGE('NONE', *, *, #234, .T.);
-#357 = ORIENTED_EDGE('NONE', *, *, #237, .T.);
-#358 = ORIENTED_EDGE('NONE', *, *, #240, .T.);
-#359 = ORIENTED_EDGE('NONE', *, *, #243, .T.);
-#360 = ORIENTED_EDGE('NONE', *, *, #246, .T.);
-#361 = ORIENTED_EDGE('NONE', *, *, #249, .T.);
-#362 = ORIENTED_EDGE('NONE', *, *, #252, .T.);
-#363 = ORIENTED_EDGE('NONE', *, *, #255, .T.);
-#364 = ORIENTED_EDGE('NONE', *, *, #258, .T.);
-#365 = ORIENTED_EDGE('NONE', *, *, #261, .T.);
-#366 = ORIENTED_EDGE('NONE', *, *, #264, .T.);
-#367 = ORIENTED_EDGE('NONE', *, *, #267, .T.);
-#368 = ORIENTED_EDGE('NONE', *, *, #269, .T.);
-#369 = EDGE_LOOP('NONE', (#355, #356, #357, #358, #359, #360, #361, #362, #363, #364, #365, #366, #367, #368));
-#370 = CARTESIAN_POINT('NONE', (0, -0.0127, 0.0508));
-#371 = DIRECTION('NONE', (-1, 0, -0));
-#372 = AXIS2_PLACEMENT_3D('NONE', #370, #371, $);
-#373 = PLANE('NONE', #372);
-#374 = CARTESIAN_POINT('NONE', (0.039306734695977924, -0.025399999999999995, 0.0508));
-#375 = DIRECTION('NONE', (0, -1, -0));
-#376 = AXIS2_PLACEMENT_3D('NONE', #374, #375, $);
-#377 = PLANE('NONE', #376);
-#378 = CARTESIAN_POINT('NONE', (0.11488842876320533, -0.05079999999999996, 0.05079999999999999));
-#379 = DIRECTION('NONE', (-0.5735764363510459, -0.819152044288992, 0));
-#380 = AXIS2_PLACEMENT_3D('NONE', #378, #379, $);
-#381 = PLANE('NONE', #380);
-#382 = CARTESIAN_POINT('NONE', (0.19623169406722757, -0.07619999999999999, 0.0508));
-#383 = DIRECTION('NONE', (0, -1, -0));
-#384 = AXIS2_PLACEMENT_3D('NONE', #382, #383, $);
-#385 = PLANE('NONE', #384);
-#386 = CARTESIAN_POINT('NONE', (0.2413, -0.06985, 0.0508));
-#387 = DIRECTION('NONE', (1, 0, -0));
-#388 = AXIS2_PLACEMENT_3D('NONE', #386, #387, $);
-#389 = PLANE('NONE', #388);
-#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', (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', (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', (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', (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', (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', (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', (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.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, 0.1016));
-#431 = DIRECTION('NONE', (0, 0, 1));
-#432 = AXIS2_PLACEMENT_3D('NONE', #430, #431, $);
-#433 = PLANE('NONE', #432);
-#434 = FACE_OUTER_BOUND('NONE', #274, .T.);
-#435 = ADVANCED_FACE('NONE', (#434), #373, .T.);
-#436 = FACE_OUTER_BOUND('NONE', #279, .T.);
-#437 = ADVANCED_FACE('NONE', (#436), #377, .T.);
-#438 = FACE_OUTER_BOUND('NONE', #284, .T.);
-#439 = ADVANCED_FACE('NONE', (#438), #381, .T.);
-#440 = FACE_OUTER_BOUND('NONE', #289, .T.);
-#441 = ADVANCED_FACE('NONE', (#440), #385, .T.);
-#442 = FACE_OUTER_BOUND('NONE', #294, .T.);
-#443 = ADVANCED_FACE('NONE', (#442), #389, .T.);
-#444 = FACE_OUTER_BOUND('NONE', #299, .T.);
-#445 = ADVANCED_FACE('NONE', (#444), #393, .T.);
-#446 = FACE_OUTER_BOUND('NONE', #304, .T.);
-#447 = ADVANCED_FACE('NONE', (#446), #397, .T.);
-#448 = FACE_OUTER_BOUND('NONE', #309, .T.);
-#449 = ADVANCED_FACE('NONE', (#448), #401, .T.);
-#450 = FACE_OUTER_BOUND('NONE', #314, .T.);
-#451 = ADVANCED_FACE('NONE', (#450), #405, .T.);
-#452 = FACE_OUTER_BOUND('NONE', #319, .T.);
-#453 = ADVANCED_FACE('NONE', (#452), #409, .T.);
-#454 = FACE_OUTER_BOUND('NONE', #324, .T.);
-#455 = ADVANCED_FACE('NONE', (#454), #413, .T.);
-#456 = FACE_OUTER_BOUND('NONE', #329, .T.);
-#457 = ADVANCED_FACE('NONE', (#456), #417, .T.);
-#458 = FACE_OUTER_BOUND('NONE', #334, .T.);
-#459 = ADVANCED_FACE('NONE', (#458), #421, .T.);
-#460 = FACE_OUTER_BOUND('NONE', #339, .T.);
-#461 = ADVANCED_FACE('NONE', (#460), #425, .T.);
-#462 = FACE_OUTER_BOUND('NONE', #354, .T.);
-#463 = ADVANCED_FACE('NONE', (#462), #429, .F.);
-#464 = FACE_OUTER_BOUND('NONE', #369, .T.);
-#465 = ADVANCED_FACE('NONE', (#464), #433, .T.);
-#466 = CLOSED_SHELL('NONE', (#435, #437, #439, #441, #443, #445, #447, #449, #451, #453, #455, #457, #459, #461, #463, #465));
-#467 = ORIENTED_CLOSED_SHELL('NONE', *, #466, .T.);
-#468 = MANIFOLD_SOLID_BREP('NONE', #467);
-#469 = APPLICATION_CONTEXT('configuration controlled 3D design of mechanical parts and assemblies');
-#470 = PRODUCT_DEFINITION_CONTEXT('part definition', #469, 'design');
-#471 = PRODUCT('UNIDENTIFIED_PRODUCT', 'NONE', $, ());
-#472 = PRODUCT_DEFINITION_FORMATION('', $, #471);
-#473 = PRODUCT_DEFINITION('design', $, #472, #470);
-#474 = PRODUCT_DEFINITION_SHAPE('NONE', $, #473);
-#475 = ADVANCED_BREP_SHAPE_REPRESENTATION('NONE', (#468), #3);
-#476 = SHAPE_DEFINITION_REPRESENTATION(#474, #475);
-ENDSEC;
-END-ISO-10303-21;

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

@@ -1,478 +0,0 @@
-solid unnamed
-facet normal -1 0 0
-    outer loop
-        vertex 0 -4 0
-        vertex 0 -0 0
-        vertex 0 -4 -1
-    endloop
-endfacet
-facet normal -1 0 0
-    outer loop
-        vertex 0 -4 -1
-        vertex 0 -0 0
-        vertex 0 -0 -1
-    endloop
-endfacet
-facet normal 0 0 -1
-    outer loop
-        vertex 0 -4 -1
-        vertex 0 -0 -1
-        vertex 3.0950184 -4 -1
-    endloop
-endfacet
-facet normal 0 0 -1
-    outer loop
-        vertex 3.0950184 -4 -1
-        vertex 0 -0 -1
-        vertex 3.0950184 -0 -1
-    endloop
-endfacet
-facet normal -0.57357645 0 -0.81915206
-    outer loop
-        vertex 3.0950184 -4 -1
-        vertex 3.0950184 -0 -1
-        vertex 5.9513144 -4 -3
-    endloop
-endfacet
-facet normal -0.57357645 0 -0.81915206
-    outer loop
-        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 5.9513144 -4 -3
-        vertex 5.9513144 -0 -3
-        vertex 9.5 -4 -3
-    endloop
-endfacet
-facet normal 0 0 -1
-    outer loop
-        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 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 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 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 6.108964 -4 -2.5
-        vertex 9.5 -0 -2.5
-        vertex 6.108964 -0 -2.5
-    endloop
-endfacet
-facet normal 0.5735763 0 0.8191522
-    outer loop
-        vertex 3.4311862 -4 -0.625
-        vertex 4.323779 -4 -1.25
-        vertex 4.323779 -0 -1.25
-    endloop
-endfacet
-facet normal 0.57357645 0 0.819152
-    outer loop
-        vertex 4.323779 -4 -1.25
-        vertex 6.108964 -4 -2.5
-        vertex 6.108964 -0 -2.5
-    endloop
-endfacet
-facet normal 0.57357645 0 0.819152
-    outer loop
-        vertex 3.4311862 -0 -0.625
-        vertex 2.5385938 -0 0
-        vertex 2.5385938 -4 0
-    endloop
-endfacet
-facet normal 0.57357645 -0 0.819152
-    outer loop
-        vertex 3.4311862 -4 -0.625
-        vertex 3.4311862 -0 -0.625
-        vertex 2.5385938 -4 0
-    endloop
-endfacet
-facet normal 0.57357645 -0 0.819152
-    outer loop
-        vertex 4.323779 -4 -1.25
-        vertex 6.108964 -0 -2.5
-        vertex 4.323779 -0 -1.25
-    endloop
-endfacet
-facet normal 0.5735763 0 0.8191522
-    outer loop
-        vertex 3.4311862 -0 -0.625
-        vertex 3.4311862 -4 -0.625
-        vertex 4.323779 -0 -1.25
-    endloop
-endfacet
-facet normal 0.42261824 0 -0.9063078
-    outer loop
-        vertex 3.342784 -4 0.375
-        vertex 2.5385938 -4 0
-        vertex 2.5385938 -0 0
-    endloop
-endfacet
-facet normal 0.42261824 0 -0.9063078
-    outer loop
-        vertex 4.146974 -4 0.75
-        vertex 3.342784 -4 0.375
-        vertex 3.342784 -0 0.375
-    endloop
-endfacet
-facet normal 0.42261824 0 -0.9063078
-    outer loop
-        vertex 3.342784 -0 0.375
-        vertex 4.146974 -0 0.75
-        vertex 4.146974 -4 0.75
-    endloop
-endfacet
-facet normal 0.42261833 0 -0.90630776
-    outer loop
-        vertex 4.146974 -0 0.75
-        vertex 5.755354 -0 1.5
-        vertex 5.755354 -4 1.5
-    endloop
-endfacet
-facet normal 0.42261824 0 -0.9063078
-    outer loop
-        vertex 3.342784 -4 0.375
-        vertex 2.5385938 -0 0
-        vertex 3.342784 -0 0.375
-    endloop
-endfacet
-facet normal 0.42261833 0 -0.90630776
-    outer loop
-        vertex 5.755354 -4 1.5
-        vertex 4.146974 -4 0.75
-        vertex 4.146974 -0 0.75
-    endloop
-endfacet
-facet normal 0 0 -1
-    outer loop
-        vertex 5.755354 -4 1.5
-        vertex 5.755354 -0 1.5
-        vertex 9.5 -4 1.5
-    endloop
-endfacet
-facet normal 0 0 -1
-    outer loop
-        vertex 9.5 -4 1.5
-        vertex 5.755354 -0 1.5
-        vertex 9.5 -0 1.5
-    endloop
-endfacet
-facet normal 1 0 0
-    outer loop
-        vertex 9.5 -4 1.5
-        vertex 9.5 -0 1.5
-        vertex 9.5 -4 2
-    endloop
-endfacet
-facet normal 1 -0 0
-    outer loop
-        vertex 9.5 -4 2
-        vertex 9.5 -0 1.5
-        vertex 9.5 -0 2
-    endloop
-endfacet
-facet normal 0 -0 1
-    outer loop
-        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 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 -4 1
-        vertex 0 -0 1
-        vertex 0 -4 0
-    endloop
-endfacet
-facet normal -1 0 0
-    outer loop
-        vertex 0 -4 0
-        vertex 0 -0 1
-        vertex 0 -0 0
-    endloop
-endfacet
-facet normal 0 1 -0
-    outer loop
-        vertex 3.342784 -0 0.375
-        vertex 2.5385938 -0 0
-        vertex 3.5 -0 1
-    endloop
-endfacet
-facet normal 0 1 0
-    outer loop
-        vertex 3.4311862 -0 -0.625
-        vertex 4.323779 -0 -1.25
-        vertex 3.0950184 -0 -1
-    endloop
-endfacet
-facet normal 0 1 0
-    outer loop
-        vertex 3.342784 -0 0.375
-        vertex 3.5 -0 1
-        vertex 4.146974 -0 0.75
-    endloop
-endfacet
-facet normal 0 0.99999994 0
-    outer loop
-        vertex 4.323779 -0 -1.25
-        vertex 5.9513144 -0 -3
-        vertex 3.0950184 -0 -1
-    endloop
-endfacet
-facet normal 0 1 0
-    outer loop
-        vertex 0 -0 -1
-        vertex 2.5385938 -0 0
-        vertex 3.0950184 -0 -1
-    endloop
-endfacet
-facet normal 0 1 0
-    outer loop
-        vertex 0 -0 -1
-        vertex 0 -0 0
-        vertex 2.5385938 -0 0
-    endloop
-endfacet
-facet normal 0 0.99999994 -0
-    outer loop
-        vertex 9.5 -0 -3
-        vertex 6.108964 -0 -2.5
-        vertex 9.5 -0 -2.5
-    endloop
-endfacet
-facet normal 0 1 0
-    outer loop
-        vertex 9.5 -0 -3
-        vertex 5.9513144 -0 -3
-        vertex 6.108964 -0 -2.5
-    endloop
-endfacet
-facet normal 0 1 -0
-    outer loop
-        vertex 5.9513144 -0 -3
-        vertex 4.323779 -0 -1.25
-        vertex 6.108964 -0 -2.5
-    endloop
-endfacet
-facet normal 0 1 0
-    outer loop
-        vertex 5.644507 -0 2
-        vertex 5.755354 -0 1.5
-        vertex 4.146974 -0 0.75
-    endloop
-endfacet
-facet normal 0 0.99999994 -0
-    outer loop
-        vertex 3.0950184 -0 -1
-        vertex 2.5385938 -0 0
-        vertex 3.4311862 -0 -0.625
-    endloop
-endfacet
-facet normal 0 1 -0
-    outer loop
-        vertex 4.146974 -0 0.75
-        vertex 3.5 -0 1
-        vertex 5.644507 -0 2
-    endloop
-endfacet
-facet normal 0 1 -0
-    outer loop
-        vertex 9.5 -0 1.5
-        vertex 5.755354 -0 1.5
-        vertex 9.5 -0 2
-    endloop
-endfacet
-facet normal 0 1 -0
-    outer loop
-        vertex 5.755354 -0 1.5
-        vertex 5.644507 -0 2
-        vertex 9.5 -0 2
-    endloop
-endfacet
-facet normal 0 1 0
-    outer loop
-        vertex 2.5385938 -0 0
-        vertex 0 -0 0
-        vertex 0 -0 1
-    endloop
-endfacet
-facet normal 0 1 0
-    outer loop
-        vertex 3.5 -0 1
-        vertex 2.5385938 -0 0
-        vertex 0 -0 1
-    endloop
-endfacet
-facet normal -0 -1 0
-    outer loop
-        vertex 3.342784 -4 0.375
-        vertex 3.5 -4 1
-        vertex 2.5385938 -4 0
-    endloop
-endfacet
-facet normal -0 -1 0
-    outer loop
-        vertex 4.146974 -4 0.75
-        vertex 3.5 -4 1
-        vertex 3.342784 -4 0.375
-    endloop
-endfacet
-facet normal 0 -1 -0
-    outer loop
-        vertex 3.4311862 -4 -0.625
-        vertex 3.0950184 -4 -1
-        vertex 4.323779 -4 -1.25
-    endloop
-endfacet
-facet normal 0 -0.99999994 0
-    outer loop
-        vertex 4.146974 -4 0.75
-        vertex 5.755354 -4 1.5
-        vertex 5.644507 -4 2
-    endloop
-endfacet
-facet normal 0 -1 0
-    outer loop
-        vertex 0 -4 1
-        vertex 2.5385938 -4 0
-        vertex 3.5 -4 1
-    endloop
-endfacet
-facet normal 0 -1 0
-    outer loop
-        vertex 0 -4 1
-        vertex 0 -4 0
-        vertex 2.5385938 -4 0
-    endloop
-endfacet
-facet normal 0 -1 0
-    outer loop
-        vertex 5.644507 -4 2
-        vertex 5.755354 -4 1.5
-        vertex 9.5 -4 2
-    endloop
-endfacet
-facet normal 0 -1 -0
-    outer loop
-        vertex 9.5 -4 2
-        vertex 5.755354 -4 1.5
-        vertex 9.5 -4 1.5
-    endloop
-endfacet
-facet normal 0 -1 0
-    outer loop
-        vertex 4.146974 -4 0.75
-        vertex 5.644507 -4 2
-        vertex 3.5 -4 1
-    endloop
-endfacet
-facet normal 0 -0.99999994 0
-    outer loop
-        vertex 2.5385938 -4 0
-        vertex 3.0950184 -4 -1
-        vertex 3.4311862 -4 -0.625
-    endloop
-endfacet
-facet normal -0 -0.99999994 -0
-    outer loop
-        vertex 4.323779 -4 -1.25
-        vertex 3.0950184 -4 -1
-        vertex 5.9513144 -4 -3
-    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,737 +0,0 @@
-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'
-
-/*
-debug helper: unfortunately we do rely on exact coord mouse clicks in a few places
-just from the nature of the stream, running the test with debugger and pasting the below
-into the console can be useful to get coords
-
-document.addEventListener('mousemove', (e) =>
-  console.log(`await page.mouse.click(${e.clientX}, ${e.clientY})`)
-)
-*/
-
-test.beforeEach(async ({ context, page }) => {
-  // wait for Vite preview server to be up
-  await waitOn({
-    resources: ['tcp:3000'],
-    timeout: 5000,
-  })
-  await context.addInitScript(async (token) => {
-    localStorage.setItem('TOKEN_PERSIST_KEY', token)
-    localStorage.setItem('persistCode', ``)
-    localStorage.setItem(
-      'SETTINGS_PERSIST_KEY',
-      JSON.stringify({
-        baseUnit: 'in',
-        cameraControls: 'KittyCAD',
-        defaultDirectory: '',
-        defaultProjectName: 'project-$nnn',
-        onboardingStatus: 'dismissed',
-        showDebugPanel: true,
-        textWrapping: 'On',
-        theme: 'system',
-        unitSystem: 'imperial',
-      })
-    )
-  }, secrets.token)
-  // kill animations, speeds up tests and reduced flakiness
-  await page.emulateMedia({ reducedMotion: 'reduce' })
-})
-
-test.setTimeout(60000)
-
-test('Basic sketch', 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 u.waitForDefaultPlanesVisibilityChange()
-
-  await expect(page.getByRole('button', { name: 'Start Sketch' })).toBeVisible()
-
-  // click on "Start Sketch" button
-  await u.clearCommandLogs()
-  await Promise.all([
-    u.doAndWaitForImageDiff(
-      () => page.getByRole('button', { name: 'Start Sketch' }).click(),
-      200
-    ),
-    u.waitForDefaultPlanesVisibilityChange(),
-  ])
-
-  // select a plane
-  await u.doAndWaitForCmd(() => page.mouse.click(700, 200), 'edit_mode_enter')
-  await u.waitForCmdReceive('set_tool')
-
-  await u.doAndWaitForCmd(
-    () => page.getByRole('button', { name: 'Line' }).click(),
-    'set_tool'
-  )
-
-  const startXPx = 600
-  await u.doAndWaitForCmd(
-    () => page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10),
-    'mouse_click',
-    false
-  )
-
-  await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 10)
-
-  const startAt = '[18.26, -24.63]'
-  const num = '18.43'
-  await expect(page.locator('.cm-content'))
-    .toHaveText(`const part001 = startSketchOn('-XZ')
-  |> startProfileAt(${startAt}, %)
-  |> line([${num}, 0], %)`)
-
-  await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 20)
-  await expect(page.locator('.cm-content'))
-    .toHaveText(`const part001 = startSketchOn('-XZ')
-  |> startProfileAt(${startAt}, %)
-  |> line([${num}, 0], %)
-  |> line([0, ${num}], %)`)
-  await page.mouse.click(startXPx, 500 - PUR * 20)
-  await expect(page.locator('.cm-content'))
-    .toHaveText(`const part001 = startSketchOn('-XZ')
-  |> startProfileAt(${startAt}, %)
-  |> line([${num}, 0], %)
-  |> line([0, ${num}], %)
-  |> line([-36.69, 0], %)`)
-
-  // deselect line tool
-  await u.doAndWaitForCmd(
-    () => page.getByRole('button', { name: 'Line' }).click(),
-    'set_tool'
-  )
-
-  // click between first two clicks to get center of the line
-  await u.doAndWaitForCmd(
-    () => page.mouse.click(startXPx + PUR * 15, 500 - PUR * 10),
-    'select_with_point'
-  )
-  await u.closeDebugPanel()
-
-  // hold down shift
-  await page.keyboard.down('Shift')
-  // click between the latest two clicks to get center of the line
-  await page.mouse.click(startXPx + PUR * 10, 500 - PUR * 20)
-
-  // selected two lines therefore there should be two cursors
-  await expect(page.locator('.cm-cursor')).toHaveCount(2)
-
-  await page.getByRole('button', { name: 'Equal Length' }).click()
-
-  await expect(page.locator('.cm-content'))
-    .toHaveText(`const part001 = startSketchOn('-XZ')
-  |> startProfileAt(${startAt}, %)
-  |> line({ to: [${num}, 0], tag: 'seg01' }, %)
-  |> line([0, ${num}], %)
-  |> angledLine([180, segLen('seg01', %)], %)`)
-})
-
-test('if you write invalid kcl you get inlined errors', async ({ page }) => {
-  const u = getUtils(page)
-  await page.setViewportSize({ width: 1000, height: 500 })
-  await page.goto('/')
-
-  await u.waitForAuthSkipAppStart()
-
-  // check no error to begin with
-  await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
-
-  /* add the following code to the editor (# error is not a valid line)
-    # error
-    const topAng = 30
-    const bottomAng = 25
-   */
-  await page.click('.cm-content')
-  await page.keyboard.type('# error')
-
-  // press arrows to clear autocomplete
-  await page.keyboard.press('ArrowLeft')
-  await page.keyboard.press('ArrowRight')
-
-  await page.keyboard.press('Enter')
-  await page.keyboard.type('const topAng = 30')
-  await page.keyboard.press('Enter')
-  await page.keyboard.type('const bottomAng = 25')
-  await page.keyboard.press('Enter')
-
-  // error in guter
-  await expect(page.locator('.cm-lint-marker-error')).toBeVisible()
-
-  // error text on hover
-  await page.hover('.cm-lint-marker-error')
-  await expect(page.getByText("found unknown token '#'")).toBeVisible()
-
-  // select the line that's causing the error and delete it
-  await page.getByText('# error').click()
-  await page.keyboard.press('End')
-  await page.keyboard.down('Shift')
-  await page.keyboard.press('Home')
-  await page.keyboard.up('Shift')
-  await page.keyboard.press('Backspace')
-
-  // 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 (token) => {
-    localStorage.setItem(
-      'persistCode',
-      `const part001 = startSketchOn('-XZ')
-  |> startProfileAt([-6.95, 4.98], %)
-  |> line([25.1, 0.41], %)
-  |> line([0.73, -14.93], %)
-  |> line([-23.44, 0.52], %)`
-    )
-  })
-  await page.setViewportSize({ width: 1000, height: 500 })
-  await page.goto('/')
-  await u.waitForAuthSkipAppStart()
-
-  // expand variables section
-  await page.getByText('Variables').click()
-
-  // can find part001 in the variables summary (pretty-json-container, makes sure we're not looking in the code editor)
-  // part001 only shows up in the variables summary if it's been executed
-  await page.waitForFunction(() => {
-    const variablesElement = document.querySelector(
-      '.pretty-json-container'
-    ) as HTMLDivElement
-    return variablesElement.innerHTML.includes('part001')
-  })
-  await expect(
-    page.locator('.pretty-json-container >> text=part001')
-  ).toBeVisible()
-})
-
-test('re-executes', async ({ page, context }) => {
-  const u = getUtils(page)
-  await context.addInitScript(async (token) => {
-    localStorage.setItem('persistCode', `const myVar = 5`)
-  })
-  await page.setViewportSize({ width: 1000, height: 500 })
-  await page.goto('/')
-  await u.waitForAuthSkipAppStart()
-
-  await page.getByText('Variables').click()
-  // expect to see "myVar:5"
-  await expect(
-    page.locator('.pretty-json-container >> text=myVar:5')
-  ).toBeVisible()
-
-  // change 5 to 67
-  await page.getByText('const myVar').click()
-  await page.keyboard.press('End')
-  await page.keyboard.press('Backspace')
-  await page.keyboard.type('67')
-
-  await expect(
-    page.locator('.pretty-json-container >> text=myVar:67')
-  ).toBeVisible()
-})
-
-test('Can create sketches on all planes and their back sides', async ({
-  page,
-}) => {
-  const u = getUtils(page)
-  const PUR = 400 / 37.5 //pixeltoUnitRatio
-  await page.setViewportSize({ width: 1200, height: 500 })
-  await page.goto('/')
-  await u.waitForAuthSkipAppStart()
-  await u.openDebugPanel()
-  await u.waitForDefaultPlanesVisibilityChange()
-
-  const camCmd: EngineCommand = {
-    type: 'modeling_cmd_req',
-    cmd_id: uuidv4(),
-    cmd: {
-      type: 'default_camera_look_at',
-      center: { x: 15, y: 0, z: 0 },
-      up: { x: 0, y: 0, z: 1 },
-      vantage: { x: 30, y: 30, z: 30 },
-    },
-  }
-
-  const TestSinglePlane = async ({
-    viewCmd,
-    expectedCode,
-    clickCoords,
-  }: {
-    viewCmd: EngineCommand
-    expectedCode: string
-    clickCoords: { x: number; y: number }
-  }) => {
-    await u.openDebugPanel()
-    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 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.clearCommandLogs()
-    await page.getByRole('button', { name: 'Exit Sketch' }).click()
-    await u.expectCmdLog('[data-message-type="execution-done"]')
-
-    await u.clearCommandLogs()
-    await u.removeCurrentCode()
-  }
-
-  const codeTemplate = (
-    plane = 'XY',
-    sign = ''
-  ) => `const part001 = startSketchOn('${plane}')
-  |> startProfileAt([${sign}6.88, -9.29], %)
-  |> line([${sign}6.95, 0], %)`
-  await TestSinglePlane({
-    viewCmd: camCmd,
-    expectedCode: codeTemplate('XY'),
-    clickCoords: { x: 700, y: 350 }, // red plane
-  })
-  await TestSinglePlane({
-    viewCmd: camCmd,
-    expectedCode: codeTemplate('YZ'),
-    clickCoords: { x: 1000, y: 200 }, // green plane
-  })
-  await TestSinglePlane({
-    viewCmd: camCmd,
-    expectedCode: codeTemplate('XZ', '-'),
-    clickCoords: { x: 630, y: 130 }, // blue plane
-  })
-
-  // new camera angle to click the back side of all three planes
-  const camCmdBackSide: EngineCommand = {
-    type: 'modeling_cmd_req',
-    cmd_id: uuidv4(),
-    cmd: {
-      type: 'default_camera_look_at',
-      center: { x: -15, y: 0, z: 0 },
-      up: { x: 0, y: 0, z: 1 },
-      vantage: { x: -30, y: -30, z: -30 },
-    },
-  }
-  await TestSinglePlane({
-    viewCmd: camCmdBackSide,
-    expectedCode: codeTemplate('-XY', '-'),
-    clickCoords: { x: 705, y: 136 }, // back of red plane
-  })
-  await TestSinglePlane({
-    viewCmd: camCmdBackSide,
-    expectedCode: codeTemplate('-YZ', '-'),
-    clickCoords: { x: 1000, y: 350 }, // back of green plane
-  })
-  await TestSinglePlane({
-    viewCmd: camCmdBackSide,
-    expectedCode: codeTemplate('-XZ'),
-    clickCoords: { x: 600, y: 400 }, // back of blue plane
-  })
-})
-
-test('Auto complete works', async ({ page }) => {
-  const u = getUtils(page)
-  // const PUR = 400 / 37.5 //pixeltoUnitRatio
-  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.
-  // tests clicking on an option, selection the first option
-  // and arrowing down to an option
-
-  await page.click('.cm-content')
-  await page.keyboard.type('const part001 = start')
-
-  // expect there to be three auto complete options
-  await expect(page.locator('.cm-completionLabel')).toHaveCount(3)
-  await page.getByText('startSketchOn').click()
-  await page.keyboard.type("('XY')")
-  await page.keyboard.press('Enter')
-  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.keyboard.press('Enter') // accepting the auto complete, not a new line
-
-  await page.keyboard.type('([0,0], %)')
-  await page.keyboard.press('Enter')
-  await page.keyboard.type('  |> lin')
-
-  await expect(page.locator('.cm-tooltip-autocomplete')).toBeVisible()
-  // press arrow down twice then enter to accept xLine
-  await page.keyboard.press('ArrowDown')
-  await page.keyboard.press('ArrowDown')
-  await page.keyboard.press('Enter')
-  await page.keyboard.type('(5, %)')
-
-  await expect(page.locator('.cm-content'))
-    .toHaveText(`const part001 = startSketchOn('XY')
-  |> startProfileAt([0,0], %)
-  |> xLine(5, %)`)
-})
-
-// Onboarding tests
-test('Onboarding redirects and code updating', async ({ page, context }) => {
-  const u = getUtils(page)
-
-  // Override beforeEach test setup
-  await context.addInitScript(async () => {
-    // Give some initial code, so we can test that it's cleared
-    localStorage.setItem('persistCode', 'const sigmaAllow = 15000')
-
-    const storedSettings = JSON.parse(
-      localStorage.getItem('SETTINGS_PERSIST_KEY') || '{}'
-    )
-    storedSettings.onboardingStatus = '/export'
-    localStorage.setItem('SETTINGS_PERSIST_KEY', JSON.stringify(storedSettings))
-  })
-
-  await page.setViewportSize({ width: 1200, height: 500 })
-  await page.goto('/')
-  await u.waitForAuthSkipAppStart()
-
-  // Test that the redirect happened
-  await expect(page.url().split(':3000').slice(-1)[0]).toBe(
-    `/file/new/onboarding/export`
-  )
-
-  // Test that you come back to this page when you refresh
-  await page.reload()
-  await expect(page.url().split(':3000').slice(-1)[0]).toBe(
-    `/file/new/onboarding/export`
-  )
-
-  // Test that the onboarding pane loaded
-  const title = page.locator('[data-testid="onboarding-content"]')
-  await expect(title).toBeAttached()
-
-  // Test that the code changes when you advance to the next step
-  await page.locator('[data-testid="onboarding-next"]').click()
-  await expect(page.locator('.cm-content')).toHaveText('')
-
-  // Test that the code is not empty when you click on the next step
-  await page.locator('[data-testid="onboarding-next"]').click()
-  await expect(page.locator('.cm-content')).toHaveText(/.+/)
-})
-
-test('Selections work on fresh and edited sketch', async ({ page }) => {
-  // tests mapping works on fresh sketch and edited sketch
-  // tests using hovers which is the same as selections, because if
-  // source ranges are wrong, hovers won't work
-  const u = getUtils(page)
-  const PUR = 400 / 37.5 //pixeltoUnitRatio
-  await page.setViewportSize({ width: 1200, height: 500 })
-  await page.goto('/')
-  await u.waitForAuthSkipAppStart()
-  await u.openDebugPanel()
-  await u.waitForDefaultPlanesVisibilityChange()
-
-  const xAxisClick = () => page.mouse.click(700, 250)
-  const emptySpaceClick = () => page.mouse.click(700, 300)
-  const topHorzSegmentClick = () => page.mouse.click(700, 285)
-  const bottomHorzSegmentClick = () => page.mouse.click(750, 393)
-
-  await u.clearCommandLogs()
-  await page.getByRole('button', { name: 'Start Sketch' }).click()
-  await u.waitForDefaultPlanesVisibilityChange()
-
-  // select a plane
-  await u.doAndWaitForCmd(() => page.mouse.click(700, 200), 'edit_mode_enter')
-  await u.waitForCmdReceive('set_tool')
-
-  await u.doAndWaitForCmd(
-    () => page.getByRole('button', { name: 'Line' }).click(),
-    'set_tool'
-  )
-
-  const startXPx = 600
-  await u.doAndWaitForCmd(
-    () => page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10),
-    'mouse_click',
-    false
-  )
-
-  await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 10)
-
-  const startAt = '[18.26, -24.63]'
-  const num = '18.43'
-  const num2 = '36.69'
-  await expect(page.locator('.cm-content'))
-    .toHaveText(`const part001 = startSketchOn('-XZ')
-  |> startProfileAt(${startAt}, %)
-  |> line([${num}, 0], %)`)
-
-  await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 20)
-  await expect(page.locator('.cm-content'))
-    .toHaveText(`const part001 = startSketchOn('-XZ')
-  |> startProfileAt(${startAt}, %)
-  |> line([${num}, 0], %)
-  |> line([0, ${num}], %)`)
-  await page.mouse.click(startXPx, 500 - PUR * 20)
-  await expect(page.locator('.cm-content'))
-    .toHaveText(`const part001 = startSketchOn('-XZ')
-  |> startProfileAt(${startAt}, %)
-  |> line([${num}, 0], %)
-  |> line([0, ${num}], %)
-  |> line([-${num2}, 0], %)`)
-
-  // deselect line tool
-  await u.doAndWaitForCmd(
-    () => page.getByRole('button', { name: 'Line' }).click(),
-    'set_tool'
-  )
-
-  await u.closeDebugPanel()
-  const selectionSequence = async () => {
-    await expect(page.getByTestId('hover-highlight')).not.toBeVisible()
-
-    await page.mouse.move(startXPx + PUR * 15, 500 - PUR * 10)
-
-    await expect(page.getByTestId('hover-highlight')).toBeVisible()
-    // bg-yellow-200 is more brittle than hover-highlight, but is closer to the user experience
-    // and will be an easy fix if it breaks because we change the colour
-    await expect(page.locator('.bg-yellow-200')).toBeVisible()
-
-    // check mousing off, than mousing onto another line
-    await page.mouse.move(startXPx + PUR * 10, 500 - PUR * 15) // mouse off
-    await expect(page.getByTestId('hover-highlight')).not.toBeVisible()
-    await page.mouse.move(startXPx + PUR * 10, 500 - PUR * 20) // mouse onto another line
-    await expect(page.getByTestId('hover-highlight')).toBeVisible()
-
-    // now check clicking works including axis
-
-    // click a segment hold shift and click an axis, see that a relevant constraint is enabled
-    await u.doAndWaitForCmd(topHorzSegmentClick, 'select_with_point', false)
-    await page.keyboard.down('Shift')
-    const absYButton = page.getByRole('button', { name: 'ABS Y' })
-    await expect(absYButton).toBeDisabled()
-    await u.doAndWaitForCmd(xAxisClick, 'select_with_point', false)
-    await page.keyboard.up('Shift')
-    await absYButton.and(page.locator(':not([disabled])')).waitFor()
-    await expect(absYButton).not.toBeDisabled()
-
-    // clear selection by clicking on nothing
-    await u.doAndWaitForCmd(emptySpaceClick, 'select_clear', false)
-
-    // same selection but click the axis first
-    await u.doAndWaitForCmd(xAxisClick, 'select_with_point', false)
-    await expect(absYButton).toBeDisabled()
-    await page.keyboard.down('Shift')
-    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 u.doAndWaitForCmd(emptySpaceClick, 'select_clear', false)
-
-    // check the same selection again by putting cursor in code first then selecting axis
-    await u.doAndWaitForCmd(
-      () => page.getByText(`  |> line([-${num2}, 0], %)`).click(),
-      'select_clear',
-      false
-    )
-    await page.keyboard.down('Shift')
-    await expect(absYButton).toBeDisabled()
-    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 u.doAndWaitForCmd(emptySpaceClick, 'select_clear', false)
-
-    // select segment in editor than another segment in scene and check there are two cursors
-    await u.doAndWaitForCmd(
-      () => page.getByText(`  |> line([-${num2}, 0], %)`).click(),
-      'select_clear',
-      false
-    )
-    await page.keyboard.down('Shift')
-    await expect(page.locator('.cm-cursor')).toHaveCount(1)
-    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 u.doAndWaitForCmd(emptySpaceClick, 'select_clear', false)
-  }
-
-  await selectionSequence()
-
-  // hovering in fresh sketch worked, lets try exiting and re-entering
-  await u.doAndWaitForCmd(
-    () => page.getByRole('button', { name: 'Exit Sketch' }).click(),
-    'edit_mode_exit'
-  )
-  // wait for execution done
-  await u.expectCmdLog('[data-message-type="execution-done"]')
-
-  // select a line
-  await u.doAndWaitForCmd(topHorzSegmentClick, 'select_clear', false)
-
-  // enter sketch again
-  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 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()
-
-  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 u.openAndClearDebugPanel()
-  await page.getByText('|> startProfileAt([-6.95, 4.98], %)').click()
-  await u.waitForCmdReceive('select_add')
-  await u.closeDebugPanel()
-  await page.getByRole('button', { name: 'Continue' }).click()
-  await expect(page.getByRole('button', { name: 'distance' })).toBeDisabled()
-  await page.keyboard.press('Enter')
-
-  // Review step and argument hotkeys
-  await page.keyboard.press('2')
-  await expect(page.getByRole('button', { name: '5' })).toBeDisabled()
-  await page.keyboard.press('Enter')
-
-  // Check that the code was updated
-  await page.keyboard.press('Enter')
-  await expect(page.locator('.cm-content')).toHaveText(
-    `const part001 = startSketchOn('-XZ')
-    |> startProfileAt([-6.95, 4.98], %)
-    |> line([25.1, 0.41], %)
-    |> line([0.73, -14.93], %)
-    |> line([-23.44, 0.52], %)
-    |> close(%)
-    |> extrude(5, %)`
-  )
-})

e2e/playwright/secrets.ts

@@ -1,21 +0,0 @@
-import { readFileSync } from 'fs'
-
-const secrets: Record<string, string> = {}
-try {
-  const file = readFileSync('./e2e/playwright/playwright-secrets.env', 'utf8')
-  file
-    .split('\n')
-    .filter((line) => line && line.length > 1)
-    .forEach((line) => {
-      const [key, value] = line.split('=')
-      // prefer env vars over secrets file
-      secrets[key] = process.env[key] || (value as any).replaceAll('"', '')
-    })
-} 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
-}
-
-export { secrets }

e2e/playwright/snapshot-tests.spec.ts

@@ -1,388 +0,0 @@
-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) => {
-    localStorage.setItem('TOKEN_PERSIST_KEY', token)
-    localStorage.setItem('persistCode', ``)
-    localStorage.setItem(
-      'SETTINGS_PERSIST_KEY',
-      JSON.stringify({
-        baseUnit: 'in',
-        cameraControls: 'KittyCAD',
-        defaultDirectory: '',
-        defaultProjectName: 'project-$nnn',
-        onboardingStatus: 'dismissed',
-        showDebugPanel: true,
-        textWrapping: 'On',
-        theme: 'system',
-        unitSystem: 'imperial',
-      })
-    )
-  }, secrets.token)
-  // reducedMotion kills animations, which speeds up tests and reduces flakiness
-  await page.emulateMedia({ reducedMotion: 'reduce' })
-})
-
-test.setTimeout(60000)
-
-test('change camera, show planes', async ({ page, context }) => {
-  const u = getUtils(page)
-  await page.setViewportSize({ width: 1200, height: 500 })
-  await page.goto('/')
-  await u.waitForAuthSkipAppStart()
-  await u.openAndClearDebugPanel()
-
-  const camCmd: EngineCommand = {
-    type: 'modeling_cmd_req',
-    cmd_id: uuidv4(),
-    cmd: {
-      type: 'default_camera_look_at',
-      center: { x: 0, y: 0, z: 0 },
-      up: { x: 0, y: 0, z: 1 },
-      vantage: { x: 0, y: 85, z: 85 },
-    },
-  }
-
-  await u.sendCustomCmd(camCmd)
-  await u.waitForCmdReceive('default_camera_look_at')
-
-  // rotate
-  await u.closeDebugPanel()
-  await page.mouse.move(700, 200)
-  await page.mouse.down({ button: 'right' })
-  await page.mouse.move(600, 300)
-  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({
-    maxDiffPixels: 100,
-  })
-
-  await u.openAndClearDebugPanel()
-  await page.getByRole('button', { name: 'Exit Sketch' }).click()
-  await u.waitForDefaultPlanesVisibilityChange()
-
-  await u.sendCustomCmd(camCmd)
-  await u.waitForCmdReceive('default_camera_look_at')
-
-  await u.clearCommandLogs()
-  await u.closeDebugPanel()
-  // pan
-  await page.keyboard.down('Shift')
-  await page.mouse.move(600, 200)
-  await page.mouse.down({ button: 'right' })
-  await page.mouse.move(700, 200)
-  await page.mouse.up({ button: 'right' })
-  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({
-    maxDiffPixels: 100,
-  })
-
-  await u.openAndClearDebugPanel()
-  await page.getByRole('button', { name: 'Exit Sketch' }).click()
-  await u.waitForDefaultPlanesVisibilityChange()
-
-  await u.sendCustomCmd(camCmd)
-  await u.waitForCmdReceive('default_camera_look_at')
-
-  await u.clearCommandLogs()
-  await u.closeDebugPanel()
-
-  // zoom
-  await page.keyboard.down('Control')
-  await page.mouse.move(700, 400)
-  await page.mouse.down({ button: 'right' })
-  await page.mouse.move(700, 350)
-  await page.mouse.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({
-    maxDiffPixels: 100,
-  })
-})
-
-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
-    localStorage.setItem(
-      'persistCode',
-      `const topAng = 25
-const bottomAng = 35
-const baseLen = 3.5
-const baseHeight = 1
-const totalHeightHalf = 2
-const armThick = 0.5
-const totalLen = 9.5
-const part001 = startSketchOn('-XZ')
-  |> startProfileAt([0, 0], %)
-  |> yLine(baseHeight, %)
-  |> xLine(baseLen, %)
-  |> angledLineToY({
-        angle: topAng,
-        to: totalHeightHalf,
-        tag: 'seg04'
-      }, %)
-  |> xLineTo({ to: totalLen, tag: 'seg03' }, %)
-  |> yLine({ length: -armThick, tag: 'seg01' }, %)
-  |> angledLineThatIntersects({
-        angle: _180,
-        offset: -armThick,
-        intersectTag: 'seg04'
-      }, %)
-  |> angledLineToY([segAng('seg04', %) + 180, _0], %)
-  |> angledLineToY({
-        angle: -bottomAng,
-        to: -totalHeightHalf - armThick,
-        tag: 'seg02'
-      }, %)
-  |> xLineTo(segEndX('seg03', %) + 0, %)
-  |> yLine(-segLen('seg01', %), %)
-  |> angledLineThatIntersects({
-        angle: _180,
-        offset: -armThick,
-        intersectTag: 'seg02'
-      }, %)
-  |> angledLineToY([segAng('seg02', %) + 180, -baseHeight], %)
-  |> xLineTo(_0, %)
-  |> close(%) 
-  |> extrude(4, %)`
-    )
-  })
-  await page.setViewportSize({ width: 1200, height: 500 })
-  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()
-
-  interface Paths {
-    modelPath: string
-    imagePath: string
-    outputType: string
-  }
-  const doExport = async (
-    output: Models['OutputFormat_type']
-  ): Promise<Paths> => {
-    await page.getByRole('button', { name: 'Export Model' }).click()
-
-    const exportSelect = page.getByTestId('export-type')
-    await exportSelect.selectOption({ label: output.type })
-
-    if ('storage' in output) {
-      const storageSelect = page.getByTestId('export-storage')
-      await storageSelect.selectOption({ label: output.storage })
-    }
-
-    const downloadPromise = page.waitForEvent('download')
-    await page.getByRole('button', { name: 'Export', exact: true }).click()
-    const download = await downloadPromise
-    const downloadLocationer = (extra = '', isImage = false) =>
-      `./e2e/playwright/export-snapshots/${output.type}-${
-        'storage' in output ? output.storage : ''
-      }${extra}.${isImage ? 'png' : output.type}`
-    const downloadLocation = downloadLocationer()
-    const downloadLocation2 = downloadLocationer('-2')
-
-    if (output.type === 'gltf' && output.storage === 'standard') {
-      // wait for second download
-      const download2 = await page.waitForEvent('download')
-      await download.saveAs(downloadLocation)
-      await download2.saveAs(downloadLocation2)
-
-      // rewrite uri to reference our file name
-      const fileContents = await fsp.readFile(downloadLocation, 'utf-8')
-      const isJson = fileContents.includes('buffers')
-      let contents = fileContents
-      let reWriteLocation = downloadLocation
-      let uri = downloadLocation2.split('/').pop()
-      if (!isJson) {
-        contents = await fsp.readFile(downloadLocation2, 'utf-8')
-        reWriteLocation = downloadLocation2
-        uri = downloadLocation.split('/').pop()
-      }
-      contents = contents.replace(/"uri": ".*"/g, `"uri": "${uri}"`)
-      await fsp.writeFile(reWriteLocation, contents)
-    } else {
-      await download.saveAs(downloadLocation)
-    }
-
-    if (output.type === 'step') {
-      // stable timestamps for step files
-      const fileContents = await fsp.readFile(downloadLocation, 'utf-8')
-      const newFileContents = fileContents.replace(
-        /[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9]+[0-9]+[0-9]\+[0-9]{2}:[0-9]{2}/g,
-        '1970-01-01T00:00:00.0+00:00'
-      )
-      await fsp.writeFile(downloadLocation, newFileContents)
-    }
-    return {
-      modelPath: downloadLocation,
-      imagePath: downloadLocationer('', true),
-      outputType: output.type,
-    }
-  }
-  const axisDirectionPair: Models['AxisDirectionPair_type'] = {
-    axis: 'z',
-    direction: 'positive',
-  }
-  const sysType: Models['System_type'] = {
-    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: '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) {
-    const cliCommand = `export KITTYCAD_TOKEN=${secrets.snapshottoken} && kittycad file snapshot --output-format=png --src-format=${outputType} ${modelPath} ${imagePath}`
-    const child = spawn(cliCommand, { shell: true })
-    await new Promise((resolve, reject) => {
-      child.on('error', (code: any, msg: any) => {
-        console.log('error', code, msg)
-        reject()
-      })
-      child.on('exit', (code, msg) => {
-        console.log('exit', code, msg)
-        if (code !== 0) {
-          reject(`exit code ${code} for model ${modelPath}`)
-        } else {
-          resolve(true)
-        }
-      })
-      child.stderr.on('data', (data) => console.log(`stderr: ${data}`))
-      child.stdout.on('data', (data) => console.log(`stdout: ${data}`))
-    })
-  }
-})

e2e/playwright/test-utils.ts

@@ -1,156 +0,0 @@
-import { expect, Page } from '@playwright/test'
-import { EngineCommand } from '../../src/lang/std/engineConnection'
-import fsp from 'fs/promises'
-import pixelMatch from 'pixelmatch'
-import { PNG } from 'pngjs'
-
-async function waitForPageLoad(page: Page) {
-  // wait for 'Loading stream...' spinner
-  await page.getByTestId('loading-stream').waitFor()
-  // wait for all spinners to be gone
-  await page.getByTestId('loading').waitFor({ state: 'detached' })
-
-  await page.getByTestId('start-sketch').waitFor()
-}
-
-async function removeCurrentCode(page: Page) {
-  const hotkey = process.platform === 'darwin' ? 'Meta' : 'Control'
-  await page.click('.cm-content')
-  await page.keyboard.down(hotkey)
-  await page.keyboard.press('a')
-  await page.keyboard.up(hotkey)
-  await page.keyboard.press('Backspace')
-  await expect(page.locator('.cm-content')).toHaveText('')
-}
-
-async function sendCustomCmd(page: Page, cmd: EngineCommand) {
-  await page.fill('[data-testid="custom-cmd-input"]', JSON.stringify(cmd))
-  await page.click('[data-testid="custom-cmd-send-button"]')
-}
-
-async function clearCommandLogs(page: Page) {
-  await page.click('[data-testid="clear-commands"]')
-}
-
-async function expectCmdLog(page: Page, locatorStr: string) {
-  await expect(page.locator(locatorStr)).toBeVisible()
-}
-
-async function waitForDefaultPlanesToBeVisible(page: Page) {
-  await page.waitForFunction(
-    () =>
-      document.querySelectorAll('[data-receive-command-type="object_visible"]')
-        .length >= 3
-  )
-}
-
-async function openDebugPanel(page: Page) {
-  const isOpen =
-    (await page
-      .locator('[data-testid="debug-panel"]')
-      ?.getAttribute('open')) === ''
-
-  if (!isOpen) {
-    await page.getByText('Debug').click()
-    await page.getByTestId('debug-panel').and(page.locator('[open]')).waitFor()
-  }
-}
-
-async function closeDebugPanel(page: Page) {
-  const isOpen =
-    (await page.getByTestId('debug-panel')?.getAttribute('open')) === ''
-  if (isOpen) {
-    await page.getByText('Debug').click()
-    await page
-      .getByTestId('debug-panel')
-      .and(page.locator(':not([open])'))
-      .waitFor()
-  }
-}
-
-async function waitForCmdReceive(page: Page, commandType: string) {
-  return page
-    .locator(`[data-receive-command-type="${commandType}"]`)
-    .first()
-    .waitFor()
-}
-
-export function getUtils(page: Page) {
-  return {
-    waitForAuthSkipAppStart: () => waitForPageLoad(page),
-    removeCurrentCode: () => removeCurrentCode(page),
-    sendCustomCmd: (cmd: EngineCommand) => sendCustomCmd(page, cmd),
-    clearCommandLogs: () => clearCommandLogs(page),
-    expectCmdLog: (locatorStr: string) => expectCmdLog(page, locatorStr),
-    waitForDefaultPlanesVisibilityChange: () =>
-      waitForDefaultPlanesToBeVisible(page),
-    openDebugPanel: () => openDebugPanel(page),
-    closeDebugPanel: () => closeDebugPanel(page),
-    openAndClearDebugPanel: async () => {
-      await openDebugPanel(page)
-      return clearCommandLogs(page)
-    },
-    clearAndCloseDebugPanel: async () => {
-      await clearCommandLogs(page)
-      return closeDebugPanel(page)
-    },
-    waitForCmdReceive: (commandType: string) =>
-      waitForCmdReceive(page, commandType),
-    doAndWaitForCmd: async (
-      fn: () => Promise<void>,
-      commandType: string,
-      endWithDebugPanelOpen = true
-    ) => {
-      await openDebugPanel(page)
-      await clearCommandLogs(page)
-      await closeDebugPanel(page)
-      await fn()
-      await openDebugPanel(page)
-      await waitForCmdReceive(page, commandType)
-      if (!endWithDebugPanelOpen) {
-        await closeDebugPanel(page)
-      }
-    },
-    doAndWaitForImageDiff: (fn: () => Promise<any>, diffCount = 200) =>
-      new Promise(async (resolve) => {
-        await page.screenshot({
-          path: './e2e/playwright/temp1.png',
-          fullPage: true,
-        })
-        await fn()
-        const isImageDiff = async () => {
-          await page.screenshot({
-            path: './e2e/playwright/temp2.png',
-            fullPage: true,
-          })
-          const screenshot1 = PNG.sync.read(
-            await fsp.readFile('./e2e/playwright/temp1.png')
-          )
-          const screenshot2 = PNG.sync.read(
-            await fsp.readFile('./e2e/playwright/temp2.png')
-          )
-          const actualDiffCount = pixelMatch(
-            screenshot1.data,
-            screenshot2.data,
-            null,
-            screenshot1.width,
-            screenshot2.height
-          )
-          return actualDiffCount > diffCount
-        }
-
-        // run isImageDiff every 50ms until it returns true or 5 seconds have passed (100 times)
-        let count = 0
-        const interval = setInterval(async () => {
-          count++
-          if (await isImageDiff()) {
-            clearInterval(interval)
-            resolve(true)
-          } else if (count > 100) {
-            clearInterval(interval)
-            resolve(false)
-          }
-        }, 50)
-      }),
-  }
-}

e2e/tauri/specs/auth.e2e.ts

@@ -1,107 +0,0 @@
-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
-    await new Promise((resolve) => setTimeout(resolve, 100))
-    await fs.rm(defaultDir, { force: true, recursive: true })
-    await fs.rm(userCodeDir, { force: true })
-
-    const signInButton = await $('[data-testid="sign-in-button"]')
-    expect(await signInButton.getText()).toEqual('Sign in')
-
-    await click(signInButton)
-    await new Promise((resolve) => setTimeout(resolve, 2000))
-
-    // Get from main.rs
-    const userCode = await (
-      await fs.readFile('/tmp/kittycad_user_code')
-    ).toString()
-    console.log(`Found user code ${userCode}`)
-
-    // Device flow: verify
-    const token = process.env.KITTYCAD_API_TOKEN
-    const headers = {
-      Authorization: `Bearer ${token}`,
-      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}`
-    console.log(`GET ${verifyUrl}`)
-    const vr = await fetch(verifyUrl, { headers })
-    console.log(vr.status)
-
-    // Device flow: confirm
-    const confirmUrl = `${apiBaseUrl}/oauth2/device/confirm`
-    const data = JSON.stringify({ user_code: userCode })
-    console.log(`POST ${confirmUrl} ${data}`)
-    const cr = await fetch(confirmUrl, {
-      headers,
-      method: 'POST',
-      body: data,
-    })
-    console.log(cr.status)
-
-    // 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 () => {
-    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 an error on Linux', async () => {
-    const projectLink = await $('[data-testid="project-link"]')
-    await click(projectLink)
-    const error = await $('h3')
-    expect(await error.getText()).toContain(
-      "Can't find variable: RTCPeerConnection"
-    )
-    await browser.execute('window.location.href = "tauri://localhost/home"')
-  })
-
-  it('signs out', async () => {
-    const menuButton = await $('[data-testid="user-sidebar-toggle"]')
-    await click(menuButton)
-    const signoutButton = await $('[data-testid="user-sidebar-sign-out"]')
-    await 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>

package.json

@@ -1,39 +1,37 @@
 {
   "name": "untitled-app",
-  "version": "0.14.0",
+  "version": "0.8.2",
   "private": true,
   "dependencies": {
-    "@codemirror/autocomplete": "^6.10.2",
+    "@codemirror/autocomplete": "^6.9.0",
     "@fortawesome/fontawesome-svg-core": "^6.4.2",
     "@fortawesome/free-brands-svg-icons": "^6.4.2",
     "@fortawesome/free-solid-svg-icons": "^6.4.2",
     "@fortawesome/react-fontawesome": "^0.2.0",
-    "@headlessui/react": "^1.7.17",
+    "@headlessui/react": "^1.7.13",
     "@headlessui/tailwindcss": "^0.2.0",
-    "@kittycad/lib": "^0.0.46",
-    "@lezer/javascript": "^1.4.9",
+    "@kittycad/lib": "^0.0.37",
+    "@lezer/javascript": "^1.4.7",
     "@open-rpc/client-js": "^1.8.1",
     "@react-hook/resize-observer": "^1.2.6",
     "@replit/codemirror-interact": "^6.3.0",
-    "@sentry/react": "^7.77.0",
-    "@tauri-apps/api": "^1.5.1",
+    "@sentry/react": "^7.65.0",
+    "@tauri-apps/api": "^1.3.0",
     "@testing-library/jest-dom": "^5.14.1",
-    "@testing-library/react": "^14.0.0",
-    "@testing-library/user-event": "^14.5.1",
+    "@testing-library/react": "^13.0.0",
+    "@testing-library/user-event": "^13.2.1",
     "@ts-stack/markdown": "^1.5.0",
     "@types/node": "^16.7.13",
-    "@types/react": "^18.2.41",
+    "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
-    "@uiw/react-codemirror": "^4.21.20",
-    "@xstate/inspect": "^0.8.0",
+    "@uiw/react-codemirror": "^4.21.13",
     "@xstate/react": "^3.2.2",
-    "crypto-js": "^4.2.0",
-    "debounce-promise": "^3.1.2",
+    "crypto-js": "^4.1.1",
     "formik": "^2.4.3",
-    "fuse.js": "^7.0.0",
+    "fuse.js": "^6.6.2",
     "http-server": "^14.1.1",
     "json-rpc-2.0": "^1.6.0",
-    "re-resizable": "^6.9.11",
+    "re-resizable": "^6.9.9",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-hot-toast": "^2.4.1",
@@ -43,25 +41,23 @@
     "react-modal-promise": "^1.0.2",
     "react-router-dom": "^6.14.2",
     "sketch-helpers": "^0.0.4",
-    "swr": "^2.2.2",
+    "swr": "^2.0.4",
     "tauri-plugin-fs-extra-api": "https://github.com/tauri-apps/tauri-plugin-fs-extra#v1",
     "toml": "^3.0.0",
     "ts-node": "^10.9.1",
-    "typescript": "^5.2.2",
-    "uuid": "^9.0.1",
-    "vitest": "^0.34.6",
+    "typescript": "^4.4.2",
+    "uuid": "^9.0.0",
+    "vitest": "^0.34.1",
     "vscode-jsonrpc": "^8.1.0",
-    "vscode-languageserver-protocol": "^3.17.5",
+    "vscode-languageserver-protocol": "^3.17.3",
     "wasm-pack": "^0.12.1",
-    "web-vitals": "^3.5.0",
+    "web-vitals": "^2.1.0",
     "ws": "^8.13.0",
     "xstate": "^4.38.2",
-    "zustand": "^4.4.5"
+    "zustand": "^4.1.4"
   },
   "scripts": {
-    "start": "vite",
-    "start:prod": "vite preview --port=3000",
-    "serve": "vite serve --port=3000",
+    "start": "BROWSER=none vite",
     "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",
     "build:both": "vite build",
@@ -69,14 +65,12 @@
     "pretest": "yarn remove-importmeta",
     "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:rust": "(cd src/wasm-lib && cargo test --all && cargo clippy --all --tests)",
     "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",
-    "fmt": "prettier --write ./src && prettier --write ./e2e",
-    "fmt-check": "prettier --check ./src && prettier --check ./e2e",
-    "build:wasm-dev": "(cd src/wasm-lib && wasm-pack build --dev --target web --out-dir pkg && cargo test -p kcl-lib export_bindings) && cp src/wasm-lib/pkg/wasm_lib_bg.wasm public && yarn fmt",
+    "fmt": "prettier --write ./src",
+    "fmt-check": "prettier --check ./src",
     "build:wasm": "(cd src/wasm-lib && wasm-pack build --target web --out-dir pkg && cargo test -p kcl-lib export_bindings) && cp src/wasm-lib/pkg/wasm_lib_bg.wasm public && yarn fmt",
     "build:wasm-clean": "yarn wasm-prep && yarn build:wasm",
     "remove-importmeta": "sed -i 's/import.meta.url/window.location.origin/g' \"./src/wasm-lib/pkg/wasm_lib.js\"; sed -i '' 's/import.meta.url/window.location.origin/g' \"./src/wasm-lib/pkg/wasm_lib.js\" || echo \"sed for both mac and linux\"",
@@ -104,42 +98,30 @@
   },
   "devDependencies": {
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
-    "@babel/preset-env": "^7.23.3",
-    "@playwright/test": "^1.39.0",
-    "@tauri-apps/cli": "^1.5.6",
+    "@babel/preset-env": "^7.22.9",
+    "@tauri-apps/cli": "^1.3.1",
     "@types/crypto-js": "^4.1.1",
-    "@types/debounce-promise": "^3.1.8",
+    "@types/debounce": "^1.2.1",
     "@types/isomorphic-fetch": "^0.0.36",
-    "@types/pixelmatch": "^5.2.6",
-    "@types/pngjs": "^6.0.4",
-    "@types/react-modal": "^3.16.3",
-    "@types/uuid": "^9.0.4",
-    "@types/wait-on": "^5.3.4",
+    "@types/react-modal": "^3.16.0",
+    "@types/uuid": "^9.0.1",
     "@types/wicg-file-system-access": "^2020.9.6",
     "@types/ws": "^8.5.5",
-    "@vitejs/plugin-react": "^4.1.1",
-    "@vitest/coverage-istanbul": "^0.34.6",
-    "@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",
+    "@vitejs/plugin-react": "^4.0.3",
+    "@vitest/coverage-istanbul": "^0.34.1",
     "autoprefixer": "^10.4.13",
-    "eslint": "^8.53.0",
+    "eslint": "^8.44.0",
     "eslint-config-react-app": "^7.0.1",
-    "eslint-plugin-css-modules": "^2.12.0",
+    "eslint-plugin-css-modules": "^2.11.0",
     "happy-dom": "^10.8.0",
     "husky": "^8.0.3",
-    "pixelmatch": "^5.3.0",
-    "pngjs": "^7.0.0",
-    "postcss": "^8.4.31",
+    "postcss": "^8.4.19",
     "prettier": "^2.8.0",
     "setimmediate": "^1.0.5",
-    "tailwindcss": "^3.3.6",
-    "vite": "^4.5.2",
+    "tailwindcss": "^3.2.4",
+    "vite": "^4.4.3",
     "vite-plugin-eslint": "^1.8.1",
-    "vite-tsconfig-paths": "^4.2.1",
-    "wait-on": "^7.2.0",
+    "vite-tsconfig-paths": "^4.2.0",
     "yarn": "^1.22.19"
   }
 }

playwright.config.ts

@@ -1,82 +0,0 @@
-import { defineConfig, devices } from '@playwright/test';
-
-/**
- * Read environment variables from file.
- * https://github.com/motdotla/dotenv
- */
-// require('dotenv').config();
-
-/**
- * See https://playwright.dev/docs/test-configuration.
- */
-export default defineConfig({
-  testDir: './e2e/playwright',
-  /* Run tests in files in parallel */
-  fullyParallel: true,
-  /* Fail the build on CI if you accidentally left test.only in the source code. */
-  forbidOnly: !!process.env.CI,
-  /* Retry on CI only */
-  retries: process.env.CI ? 3 : 0,
-  /* Opt out of parallel tests on CI. */
-  workers: process.env.CI ? 1 : 1,
-  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-  reporter: 'html',
-  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
-  use: {
-    /* Base URL to use in actions like `await page.goto('/')`. */
-    baseURL: 'http://localhost:3000',
-
-    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-    trace: 'on-first-retry',
-  },
-
-  /* Configure projects for major browsers */
-  projects: [
-    {
-      name: 'Google Chrome',
-      use: { ...devices['Desktop Chrome'], channel: 'chrome' }, // or 'chrome-beta'
-    },
-    {
-      name: 'webkit',
-      use: { ...devices['Desktop Safari'] },
-    },
-    // {
-    //   name: 'firefox',
-    //   use: { ...devices['Desktop Firefox'] },
-    // },
-    // {
-    //   name: 'chromium', // compat issue with encoding atm, so we're using the branded 'Google Chrome' instead
-    //   use: { ...devices['Desktop Chrome'] },
-    // },
-
-
-
-    /* Test against mobile viewports. */
-    // {
-    //   name: 'Mobile Chrome',
-    //   use: { ...devices['Pixel 5'] },
-    // },
-    // {
-    //   name: 'Mobile Safari',
-    //   use: { ...devices['iPhone 12'] },
-    // },
-
-    /* Test against branded browsers. */
-    // {
-    //   name: 'Microsoft Edge',
-    //   use: { ...devices['Desktop Edge'], channel: 'msedge' },
-    // },
-    // {
-    //   name: 'Google Chrome',
-    //   use: { ...devices['Desktop Chrome'], channel: 'chrome' },
-    // },
-  ],
-
-  /* Run your local dev server before starting the tests */
-  webServer: {
-    command: 'yarn serve',
-    // url: 'http://127.0.0.1:3000',
-    reuseExistingServer: !process.env.CI,
-  },
-});
-

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/kcl-icon.svg

@@ -1,3 +0,0 @@
-<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M40 0H0V40H40V0ZM7.34715 27.2143V15.6577L2.976 15.987V36.7949H7.34715V32.0645L8.00582 31.5256C8.24533 31.326 8.47487 31.1264 8.69442 30.9268L12.1075 36.7949H17.0475C16.1893 35.3978 15.311 33.9906 14.4128 32.5735C13.5346 31.1563 12.6664 29.7392 11.8081 28.3221L15.8499 24.9389C15.4308 24.4399 15.0017 23.931 14.5625 23.412L13.3051 21.8552L7.34715 27.2143ZM22.2581 26.6754C22.8769 25.9169 23.6753 25.5377 24.6533 25.5377C25.272 25.5377 25.8309 25.6175 26.3299 25.7772C26.8289 25.9169 27.4177 26.1465 28.0963 26.4658L29.3238 23.3521C28.5853 22.7933 27.7371 22.4041 26.779 22.1845C25.8409 21.9649 25.0625 21.8552 24.4437 21.8552C22.0885 21.8552 20.2223 22.5537 18.845 23.9509C17.4878 25.3281 16.8092 27.1944 16.8092 29.5496C16.8092 31.9048 17.4878 33.7611 18.845 35.1183C20.2223 36.4756 22.0885 37.1542 24.4437 37.1542C25.0625 37.1542 25.8509 37.0444 26.8089 36.8249C27.767 36.6053 28.6053 36.2161 29.3238 35.6572L28.0963 32.5435C27.4177 32.8629 26.8289 33.0924 26.3299 33.2321C25.8309 33.3718 25.272 33.4417 24.6533 33.4417C23.6753 33.4417 22.8769 33.0924 22.2581 32.3938C21.6594 31.6753 21.36 30.7272 21.36 29.5496C21.36 28.372 21.6594 27.4139 22.2581 26.6754ZM36.2796 36.7949V15.6577L31.9085 15.987V36.7949H36.2796Z" fill="#D0FF00"/>
-</svg>

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

@@ -84,7 +84,7 @@ dependencies = [
  "tauri-build",
  "tauri-plugin-fs-extra",
  "tokio",
- "toml 0.8.2",
+ "toml 0.8.0",
 ]
 
 [[package]]
@@ -122,12 +122,6 @@ dependencies = [
  "system-deps 6.1.0",
 ]
 
-[[package]]
-name = "atomic"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba"
-
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -161,20 +155,6 @@ version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
 
-[[package]]
-name = "bigdecimal"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "454bca3db10617b88b566f205ed190aedb0e0e6dd4cad61d3988a72e8c5594cb"
-dependencies = [
- "autocfg",
- "libm",
- "num-bigint",
- "num-integer",
- "num-traits",
- "serde",
-]
-
 [[package]]
 name = "bincode"
 version = "1.3.3"
@@ -547,12 +527,12 @@ dependencies = [
 
 [[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.33",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -1242,9 +1222,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 +1232,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http",
- "indexmap 2.0.0",
+ "indexmap 1.9.3",
  "slab",
  "tokio",
  "tokio-util",
@@ -1315,21 +1295,7 @@ checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148"
 dependencies = [
  "log",
  "mac",
- "markup5ever 0.10.1",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "html5ever"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7"
-dependencies = [
- "log",
- "mac",
- "markup5ever 0.11.0",
+ "markup5ever",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -1530,9 +1496,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",
 ]
@@ -1573,7 +1539,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
  "hermit-abi 0.3.1",
- "rustix 0.38.21",
+ "rustix 0.38.13",
  "windows-sys 0.48.0",
 ]
 
@@ -1652,9 +1618,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,14 +1630,13 @@ dependencies = [
 
 [[package]]
 name = "kittycad"
-version = "0.2.42"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6aa554d86b6dbbd976a659c912ae25ce817b4378eb12a5684907e263410f0a7b"
+checksum = "d9cf962b1e81a0b4eb923a727e761b40672cbacc7f5f0b75e13579d346352bc7"
 dependencies = [
  "anyhow",
  "async-trait",
  "base64 0.21.2",
- "bigdecimal",
  "bytes",
  "chrono",
  "data-encoding",
@@ -1706,20 +1671,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358"
 dependencies = [
  "cssparser",
- "html5ever 0.25.2",
- "matches",
- "selectors",
-]
-
-[[package]]
-name = "kuchikiki"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8"
-dependencies = [
- "cssparser",
- "html5ever 0.26.0",
- "indexmap 1.9.3",
+ "html5ever",
  "matches",
  "selectors",
 ]
@@ -1732,15 +1684,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.150"
+version = "0.2.148"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
-
-[[package]]
-name = "libm"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
+checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
 
 [[package]]
 name = "line-wrap"
@@ -1765,9 +1711,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.10"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
+checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128"
 
 [[package]]
 name = "lock_api"
@@ -1781,9 +1727,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.20"
+version = "0.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de"
 dependencies = [
  "serde",
 ]
@@ -1835,21 +1781,7 @@ checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd"
 dependencies = [
  "log",
  "phf 0.8.0",
- "phf_codegen 0.8.0",
- "string_cache",
- "string_cache_codegen",
- "tendril",
-]
-
-[[package]]
-name = "markup5ever"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016"
-dependencies = [
- "log",
- "phf 0.10.1",
- "phf_codegen 0.10.0",
+ "phf_codegen",
  "string_cache",
  "string_cache_codegen",
  "tendril",
@@ -1913,6 +1845,12 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
+[[package]]
+name = "minisign-verify"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881"
+
 [[package]]
 name = "miniz_oxide"
 version = "0.6.2"
@@ -1934,9 +1872,9 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.9"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
+checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
 dependencies = [
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
@@ -2021,17 +1959,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "num-bigint"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
 [[package]]
 name = "num-integer"
 version = "0.1.45"
@@ -2055,9 +1982,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.16"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
+checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
 dependencies = [
  "autocfg",
 ]
@@ -2194,11 +2121,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",
@@ -2226,9 +2153,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",
@@ -2400,17 +2327,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]]
@@ -2423,16 +2342,6 @@ dependencies = [
  "phf_shared 0.8.0",
 ]
 
-[[package]]
-name = "phf_codegen"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd"
-dependencies = [
- "phf_generator 0.10.0",
- "phf_shared 0.10.0",
-]
-
 [[package]]
 name = "phf_generator"
 version = "0.8.0"
@@ -2453,16 +2362,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 +2378,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.33",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -2508,20 +2408,11 @@ 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"
+version = "0.3.2+8.13.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "635f3e6288e4f01c049d89332a031bd74f25d64b6fb94703ca966e819488cd06"
+checksum = "34749f64ea9d76f10cdc8a859588b57775f59177c7dd91f744d620bd62982d6f"
 dependencies = [
  "bincode",
  "either",
@@ -2534,7 +2425,6 @@ dependencies = [
  "regex-cache",
  "serde",
  "serde_derive",
- "strum",
  "thiserror",
 ]
 
@@ -2859,9 +2749,9 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
 
 [[package]]
 name = "reqwest"
-version = "0.11.22"
+version = "0.11.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
+checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1"
 dependencies = [
  "base64 0.21.2",
  "bytes",
@@ -2888,7 +2778,6 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded",
- "system-configuration",
  "tokio",
  "tokio-native-tls",
  "tokio-rustls",
@@ -3038,9 +2927,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.37.27"
+version = "0.37.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2"
+checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d"
 dependencies = [
  "bitflags 1.3.2",
  "errno",
@@ -3052,14 +2941,14 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.21"
+version = "0.38.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3"
+checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662"
 dependencies = [
  "bitflags 2.4.0",
  "errno",
  "libc",
- "linux-raw-sys 0.4.10",
+ "linux-raw-sys 0.4.7",
  "windows-sys 0.48.0",
 ]
 
@@ -3132,11 +3021,10 @@ dependencies = [
 
 [[package]]
 name = "schemars"
-version = "0.8.16"
+version = "0.8.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29"
+checksum = "763f8cd0d4c71ed8389c90cb8100cba87e763bd01a8e614d4f0af97bcd50a161"
 dependencies = [
- "bigdecimal",
  "bytes",
  "chrono",
  "dyn-clone",
@@ -3149,9 +3037,9 @@ dependencies = [
 
 [[package]]
 name = "schemars_derive"
-version = "0.8.16"
+version = "0.8.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967"
+checksum = "ec0f696e21e10fa546b7ffb1c9672c6de8fbc7a81acf59524386d8639bf12737"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3217,7 +3105,7 @@ dependencies = [
  "log",
  "matches",
  "phf 0.8.0",
- "phf_codegen 0.8.0",
+ "phf_codegen",
  "precomputed-hash",
  "servo_arc",
  "smallvec",
@@ -3235,9 +3123,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.193"
+version = "1.0.188"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
+checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
 dependencies = [
  "serde_derive",
 ]
@@ -3253,9 +3141,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.193"
+version = "1.0.188"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
+checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3275,9 +3163,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.108"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
+checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
 dependencies = [
  "itoa 1.0.6",
  "ryu",
@@ -3458,9 +3346,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.5"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e"
 dependencies = [
  "libc",
  "windows-sys 0.48.0",
@@ -3570,28 +3458,6 @@ dependencies = [
  "syn 2.0.33",
 ]
 
-[[package]]
-name = "strum"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
-dependencies = [
- "strum_macros",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.24.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
-dependencies = [
- "heck 0.4.1",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "syn"
 version = "1.0.109"
@@ -3627,27 +3493,6 @@ dependencies = [
  "windows-sys 0.45.0",
 ]
 
-[[package]]
-name = "system-configuration"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "system-configuration-sys",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
 [[package]]
 name = "system-deps"
 version = "5.0.0"
@@ -3760,11 +3605,12 @@ dependencies = [
 
 [[package]]
 name = "tauri"
-version = "1.5.3"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32d563b672acde8d0cc4c1b1f5b855976923f67e8d6fe1eba51df0211e197be2"
+checksum = "7fbe522898e35407a8e60dc3870f7579fea2fc262a6a6072eccdd37ae1e1d91e"
 dependencies = [
  "anyhow",
+ "base64 0.21.2",
  "bytes",
  "cocoa",
  "dirs-next",
@@ -3778,6 +3624,7 @@ dependencies = [
  "heck 0.4.1",
  "http",
  "ignore",
+ "minisign-verify",
  "objc",
  "once_cell",
  "open",
@@ -3802,23 +3649,24 @@ dependencies = [
  "tauri-utils",
  "tempfile",
  "thiserror",
+ "time",
  "tokio",
  "url",
  "uuid",
  "webkit2gtk",
  "webview2-com",
  "windows 0.39.0",
+ "zip",
 ]
 
 [[package]]
 name = "tauri-build"
-version = "1.5.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defbfc551bd38ab997e5f8e458f87396d2559d05ce32095076ad6c30f7fc5f9c"
+checksum = "7d2edd6a259b5591c8efdeb9d5702cb53515b82a6affebd55c7fd6d3a27b7d1b"
 dependencies = [
  "anyhow",
  "cargo_toml",
- "dirs-next",
  "heck 0.4.1",
  "json-patch",
  "semver",
@@ -3826,14 +3674,13 @@ dependencies = [
  "serde_json",
  "tauri-utils",
  "tauri-winres",
- "walkdir",
 ]
 
 [[package]]
 name = "tauri-codegen"
-version = "1.4.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b3475e55acec0b4a50fb96435f19631fb58cbcd31923e1a213de5c382536bbb"
+checksum = "54ad2d49fdeab4a08717f5b49a163bdc72efc3b1950b6758245fcde79b645e1a"
 dependencies = [
  "base64 0.21.2",
  "brotli",
@@ -3857,9 +3704,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-macros"
-version = "1.4.2"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acea6445eececebd72ed7720cfcca46eee3b5bad8eb408be8f7ef2e3f7411500"
+checksum = "8eb12a2454e747896929338d93b0642144bb51e0dddbb36e579035731f0d76b7"
 dependencies = [
  "heck 0.4.1",
  "proc-macro2",
@@ -3872,7 +3719,7 @@ dependencies = [
 [[package]]
 name = "tauri-plugin-fs-extra"
 version = "0.0.0"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#537053d3171a7374a1a86fed422523e7b45a4fb8"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5b814f56e6368fdec46c4ddb04a07e0923ff995a"
 dependencies = [
  "log",
  "serde",
@@ -3883,9 +3730,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime"
-version = "0.14.1"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07f8e9e53e00e9f41212c115749e87d5cd2a9eebccafca77a19722eeecd56d43"
+checksum = "108683199cb18f96d2d4134187bb789964143c845d2d154848dda209191fd769"
 dependencies = [
  "gtk",
  "http",
@@ -3904,9 +3751,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime-wry"
-version = "0.14.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "803a01101bc611ba03e13329951a1bde44287a54234189b9024b78619c1bc206"
+checksum = "0b7aa256a1407a3a091b5d843eccc1a5042289baf0a43d1179d9f0fcfea37c1b"
 dependencies = [
  "cocoa",
  "gtk",
@@ -3924,22 +3771,21 @@ dependencies = [
 
 [[package]]
 name = "tauri-utils"
-version = "1.5.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a52165bb340e6f6a75f1f5eeeab1bb49f861c12abe3a176067d53642b5454986"
+checksum = "03fc02bb6072bb397e1d473c6f76c953cda48b4a2d0cce605df284aa74a12e84"
 dependencies = [
  "brotli",
  "ctor",
  "dunce",
  "glob",
  "heck 0.4.1",
- "html5ever 0.26.0",
+ "html5ever",
  "infer",
  "json-patch",
- "kuchikiki",
- "log",
+ "kuchiki",
  "memchr",
- "phf 0.11.2",
+ "phf 0.10.1",
  "proc-macro2",
  "quote",
  "semver",
@@ -3949,7 +3795,7 @@ dependencies = [
  "thiserror",
  "url",
  "walkdir",
- "windows-version",
+ "windows 0.39.0",
 ]
 
 [[package]]
@@ -3971,7 +3817,7 @@ dependencies = [
  "cfg-if",
  "fastrand",
  "redox_syscall 0.3.5",
- "rustix 0.37.27",
+ "rustix 0.37.19",
  "windows-sys 0.45.0",
 ]
 
@@ -4051,9 +3897,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.34.0"
+version = "1.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9"
+checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
 dependencies = [
  "backtrace",
  "bytes",
@@ -4061,7 +3907,7 @@ dependencies = [
  "mio",
  "num_cpus",
  "pin-project-lite",
- "socket2 0.5.5",
+ "socket2 0.5.4",
  "windows-sys 0.48.0",
 ]
 
@@ -4122,14 +3968,14 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.2"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d"
+checksum = "c226a7bba6d859b63c92c4b4fe69c5b6b72d0cb897dbc8e6012298e6154cb56e"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.20.2",
+ "toml_edit 0.20.0",
 ]
 
 [[package]]
@@ -4156,9 +4002,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.20.2"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
+checksum = "8ff63e60a958cefbb518ae1fd6566af80d9d4be430a33f3723dfc47d1d411d95"
 dependencies = [
  "indexmap 2.0.0",
  "serde",
@@ -4336,7 +4182,6 @@ version = "1.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2"
 dependencies = [
- "atomic",
  "getrandom 0.2.9",
  "serde",
 ]
@@ -4773,36 +4618,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 +4636,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 +4660,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 +4684,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 +4708,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 +4732,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 +4744,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 +4768,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 +4799,9 @@ dependencies = [
 
 [[package]]
 name = "wry"
-version = "0.24.6"
+version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64a70547e8f9d85da0f5af609143f7bde3ac7457a6e1073104d9b73d6c5ac744"
+checksum = "33748f35413c8a98d45f7a08832d848c0c5915501803d1faade5a4ebcd258cea"
 dependencies = [
  "base64 0.13.1",
  "block",
@@ -5034,7 +4813,7 @@ dependencies = [
  "gio",
  "glib",
  "gtk",
- "html5ever 0.25.2",
+ "html5ever",
  "http",
  "kuchiki",
  "libc",
@@ -5094,3 +4873,14 @@ checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
 dependencies = [
  "linked-hash-map",
 ]
+
+[[package]]
+name = "zip"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
+dependencies = [
+ "byteorder",
+ "crc32fast",
+ "crossbeam-utils",
+]

src-tauri/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 description = "A Tauri App"
 authors = ["you"]
 license = ""
-repository = "https://github.com/KittyCAD/modeling-app"
+repository = ""
 default-run = "app"
 edition = "2021"
 rust-version = "1.60"
@@ -12,18 +12,18 @@ rust-version = "1.60"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = { version = "1.5.0", features = [] }
+tauri-build = { version = "1.4.0", features = [] }
 
 [dependencies]
 anyhow = "1"
-kittycad = "0.2.42"
+kittycad = "0.2.25"
 oauth2 = "4.4.2"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-tauri = { version = "1.5.3", features = [ "os-all", "dialog-all", "fs-all", "http-request", "path-all", "shell-open", "shell-open-api", "devtools"] }
+tauri = { version = "1.4.1", features = [ "os-all", "dialog-all", "fs-all", "http-request", "path-all", "shell-open", "shell-open-api", "updater", "devtools"] }
 tauri-plugin-fs-extra = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
-tokio = { version = "1.34.0", features = ["time"] }
-toml = "0.8.2"
+tokio = { version = "1.32.0", features = ["time"] }
+toml = "0.8.0"
 
 [features]
 # this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled.

src-tauri/src/main.rs

@@ -1,8 +1,6 @@
 // Prevents additional console window on Windows in release, DO NOT REMOVE!!
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
-use std::env;
-use std::fs;
 use std::io::Read;
 
 use anyhow::Result;
@@ -70,23 +68,10 @@ async fn login(app: tauri::AppHandle, host: &str) -> Result<String, InvokeError>
     };
 
     // Open the system browser with the auth_uri.
-    // We do this in the browser and not a separate window because we want 1password and
+    // We do this in the browser and not a seperate window because we want 1password and
     // other crap to work well.
-    // TODO: find a better way to share this value with tauri e2e tests
-    // 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 {
-        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");
-    } else {
-        tauri::api::shell::open(&app.shell_scope(), auth_uri.secret(), None)
-            .map_err(|e| InvokeError::from_anyhow(e.into()))?;
-    }
+    tauri::api::shell::open(&app.shell_scope(), auth_uri.secret(), None)
+        .map_err(|e| InvokeError::from_anyhow(e.into()))?;
 
     // Wait for the user to login.
     let token = auth_client
@@ -144,10 +129,10 @@ async fn get_user(
 
 fn main() {
     tauri::Builder::default()
-        .setup(|_app| {
+        .setup(|app| {
             #[cfg(debug_assertions)] // only include this code on debug builds
             {
-                let window = _app.get_window("main").unwrap();
+                let window = app.get_window("main").unwrap();
                 // comment out the below if you don't devtools to open everytime.
                 // it's useful because otherwise devtools shuts everytime rust code changes.
                 window.open_devtools();

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.14.0"
+    "productName": "kittycad-modeling",
+    "version": "0.8.2"
   },
   "tauri": {
     "allowlist": {
@@ -71,20 +72,30 @@
       },
       "resources": [],
       "shortDescription": "",
-      "targets": "all"
+      "targets": "all",
+      "windows": {
+        "certificateThumbprint": "F4C9A52FF7BC26EE5E054946F6B11DEEA94C748D",
+        "digestAlgorithm": "sha256",
+        "timestampUrl": "http://timestamp.digicert.com"
+      }
     },
     "security": {
       "csp": null
     },
     "updater": {
-      "active": false
+      "active": true,
+      "endpoints": [
+        "https://dl.kittycad.io/releases/modeling-app/last_update.json"
+      ],
+      "dialog": true,
+      "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEUzNzA4MjBEQjFBRTY4NzYKUldSMmFLNnhEWUp3NCtsT21Jd05wQktOaGVkOVp6MUFma0hNTDRDSnI2RkJJTEZOWG1ncFhqcU8K"
     },
     "windows": [
       {
         "fullscreen": false,
         "height": 1200,
         "resizable": true,
-        "title": "Zoo Modeling App",
+        "title": "KittyCAD Modeling",
         "width": 1800
       }
     ]

src-tauri/tauri.macos.conf.json

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

src-tauri/tauri.release.conf.json

@@ -1,21 +0,0 @@
-{
-  "$schema": "../node_modules/@tauri-apps/cli/schema.json",
-  "tauri": {
-    "updater": {
-      "active": true,
-      "endpoints": [
-        "https://dl.zoo.dev/releases/modeling-app/last_update.json"
-      ],
-      "dialog": true,
-      "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEUzNzA4MjBEQjFBRTY4NzYKUldSMmFLNnhEWUp3NCtsT21Jd05wQktOaGVkOVp6MUFma0hNTDRDSnI2RkJJTEZOWG1ncFhqcU8K"
-    },
-    "bundle": {
-      "identifier": "io.kittycad.modeling-app",
-      "windows": {
-        "certificateThumbprint": "F4C9A52FF7BC26EE5E054946F6B11DEEA94C748D",
-        "digestAlgorithm": "sha256",
-        "timestampUrl": "http://timestamp.digicert.com"
-      }
-    }
-  }
-}

src-tauri/tauri.windows.conf.json

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

src/App.test.tsx

@@ -1,16 +1,9 @@
 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 { BrowserRouter } from 'react-router-dom'
 import { GlobalStateProvider } from './components/GlobalStateProvider'
-import CommandBarProvider from 'components/CommandBar/CommandBar'
-import ModelingMachineProvider from 'components/ModelingMachineProvider'
-import { BROWSER_FILE_NAME } from 'Router'
+import CommandBarProvider from 'components/CommandBar'
 
 let listener: ((rect: any) => void) | undefined = undefined
 ;(global as any).ResizeObserver = class ResizeObserver {
@@ -31,7 +24,7 @@ describe('App tests', () => {
       >
       return {
         ...actual,
-        useParams: () => ({ id: BROWSER_FILE_NAME }),
+        useParams: () => ({ id: 'new' }),
         useLoaderData: () => ({ code: null }),
       }
     })
@@ -48,26 +41,12 @@ describe('App tests', () => {
 })
 
 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,
-    }
+  // wrap in router and xState context
+  return (
+    <BrowserRouter>
+      <CommandBarProvider>
+        <GlobalStateProvider>{children}</GlobalStateProvider>
+      </CommandBarProvider>
+    </BrowserRouter>
   )
-  return <RouterProvider router={router} />
 }

src/App.tsx

@@ -1,4 +1,4 @@
-import { useCallback, MouseEventHandler } from 'react'
+import { useRef, useEffect, useCallback, MouseEventHandler } from 'react'
 import { DebugPanel } from './components/DebugPanel'
 import { v4 as uuidv4 } from 'uuid'
 import { PaneType, useStore } from './useStore'
@@ -19,6 +19,7 @@ import {
 } from '@fortawesome/free-solid-svg-icons'
 import { useHotkeys } from 'react-hotkeys-hook'
 import { getNormalisedCoordinates } from './lib/utils'
+import { isTauri } from './lib/isTauri'
 import { useLoaderData } from 'react-router-dom'
 import { IndexLoaderData } from './Router'
 import { useGlobalStateContext } from 'hooks/useGlobalStateContext'
@@ -28,32 +29,46 @@ import { CameraDragInteractionType_type } from '@kittycad/lib/dist/types/src/mod
 import { CodeMenu } from 'components/CodeMenu'
 import { TextEditor } from 'components/TextEditor'
 import { Themes, getSystemTheme } from 'lib/theme'
+import { useSetupEngineManager } from 'hooks/useSetupEngineManager'
 import { useEngineConnectionSubscriptions } from 'hooks/useEngineConnectionSubscriptions'
-import { engineCommandManager } from './lang/std/engineConnection'
-import { useModelingContext } from 'hooks/useModelingContext'
 
 export function App() {
-  const { project, file } = useLoaderData() as IndexLoaderData
+  const { code: loadedCode, project } = useLoaderData() as IndexLoaderData
 
+  const streamRef = useRef<HTMLDivElement>(null)
   useHotKeyListener()
   const {
+    setCode,
+    engineCommandManager,
     buttonDownInStream,
     openPanes,
     setOpenPanes,
     didDragInStream,
     streamDimensions,
+    guiMode,
+    setGuiMode,
+    executeAst,
   } = useStore((s) => ({
+    guiMode: s.guiMode,
+    setGuiMode: s.setGuiMode,
+    setCode: s.setCode,
+    engineCommandManager: s.engineCommandManager,
     buttonDownInStream: s.buttonDownInStream,
     openPanes: s.openPanes,
     setOpenPanes: s.setOpenPanes,
     didDragInStream: s.didDragInStream,
     streamDimensions: s.streamDimensions,
+    executeAst: s.executeAst,
   }))
 
-  const { settings } = useGlobalStateContext()
-  const { showDebugPanel, onboardingStatus, cameraControls, theme } =
-    settings?.context || {}
-  const { state, send } = useModelingContext()
+  const {
+    auth: {
+      context: { token },
+    },
+    settings: {
+      context: { showDebugPanel, onboardingStatus, cameraControls, theme },
+    },
+  } = useGlobalStateContext()
 
   const editorTheme = theme === Themes.System ? getSystemTheme() : theme
 
@@ -70,7 +85,50 @@ export function App() {
   useHotkeys('shift + l', () => togglePane('logs'))
   useHotkeys('shift + e', () => togglePane('kclErrors'))
   useHotkeys('shift + d', () => togglePane('debug'))
-  useHotkeys('esc', () => send('Cancel'))
+  useHotkeys('esc', () => {
+    if (guiMode.mode === 'sketch') {
+      if (guiMode.sketchMode === 'selectFace') return
+      if (guiMode.sketchMode === 'sketchEdit') {
+        // TODO: share this with Toolbar's "Exit sketch" button
+        // exiting sketch should be done consistently across all exits
+        engineCommandManager?.sendSceneCommand({
+          type: 'modeling_cmd_req',
+          cmd_id: uuidv4(),
+          cmd: { type: 'edit_mode_exit' },
+        })
+        engineCommandManager?.sendSceneCommand({
+          type: 'modeling_cmd_req',
+          cmd_id: uuidv4(),
+          cmd: { type: 'default_camera_disable_sketch_mode' },
+        })
+        setGuiMode({ mode: 'default' })
+        // this is necessary to get the UI back into a consistent
+        // state right now, hopefully won't need to rerender
+        // when exiting sketch mode in the future
+        executeAst()
+      } else {
+        engineCommandManager?.sendSceneCommand({
+          type: 'modeling_cmd_req',
+          cmd_id: uuidv4(),
+          cmd: {
+            type: 'set_tool',
+            tool: 'select',
+          },
+        })
+        setGuiMode({
+          mode: 'sketch',
+          sketchMode: 'sketchEdit',
+          rotation: guiMode.rotation,
+          position: guiMode.position,
+          pathToNode: guiMode.pathToNode,
+          pathId: guiMode.pathId,
+          // todo: ...guiMod is adding isTooltip: true, will probably just fix with xstate migtaion
+        })
+      }
+    } else {
+      setGuiMode({ mode: 'default' })
+    }
+  })
 
   const paneOpacity = [onboardingPaths.CAMERA, onboardingPaths.STREAMING].some(
     (p) => p === onboardingStatus
@@ -80,10 +138,25 @@ export function App() {
     ? 'opacity-40'
     : ''
 
+  // Use file code loaded from disk
+  // on mount, and overwrite any locally-stored code
+  useEffect(() => {
+    if (isTauri() && loadedCode !== null) {
+      setCode(loadedCode)
+    }
+    return () => {
+      // Clear code on unmount if in desktop app
+      if (isTauri()) {
+        setCode('')
+      }
+    }
+  }, [loadedCode, setCode])
+
+  useSetupEngineManager(streamRef, token)
   useEngineConnectionSubscriptions()
 
   const debounceSocketSend = throttle<EngineCommand>((message) => {
-    engineCommandManager.sendSceneCommand(message)
+    engineCommandManager?.sendSceneCommand(message)
   }, 16)
   const handleMouseMove: MouseEventHandler<HTMLDivElement> = (e) => {
     e.nativeEvent.preventDefault()
@@ -97,7 +170,10 @@ export function App() {
 
     const newCmdId = uuidv4()
     if (buttonDownInStream === undefined) {
-      if (state.matches('Sketch.Line Tool')) {
+      if (
+        guiMode.mode === 'sketch' &&
+        guiMode.sketchMode === ('sketch_line' as any)
+      ) {
         debounceSocketSend({
           type: 'modeling_cmd_req',
           cmd_id: newCmdId,
@@ -117,7 +193,7 @@ export function App() {
         })
       }
     } else {
-      if (state.matches('Sketch.Move Tool')) {
+      if (guiMode.mode === 'sketch' && guiMode.sketchMode === ('move' as any)) {
         debounceSocketSend({
           type: 'modeling_cmd_req',
           cmd_id: newCmdId,
@@ -140,6 +216,7 @@ export function App() {
       } else if (interactionGuards.zoom.dragCallback(eWithButton)) {
         interaction = 'zoom'
       } else {
+        console.log('none')
         return
       }
 
@@ -157,8 +234,9 @@ export function App() {
 
   return (
     <div
-      className="relative h-full flex flex-col"
+      className="h-screen overflow-hidden relative flex flex-col cursor-pointer select-none"
       onMouseMove={handleMouseMove}
+      ref={streamRef}
     >
       <AppHeader
         className={
@@ -166,14 +244,17 @@ export function App() {
           paneOpacity +
           (buttonDownInStream ? ' pointer-events-none' : '')
         }
-        project={{ project, file }}
+        project={project}
         enableMenu={true}
       />
       <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',
@@ -185,16 +266,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}

src/Auth.tsx

@@ -3,13 +3,13 @@ import { useGlobalStateContext } from 'hooks/useGlobalStateContext'
 
 // Wrapper around protected routes, used in src/Router.tsx
 export const Auth = ({ children }: React.PropsWithChildren) => {
-  const { auth } = useGlobalStateContext()
-  const isLoggingIn = auth?.state.matches('checkIfLoggedIn')
+  const {
+    auth: { state },
+  } = useGlobalStateContext()
+  const isLoggingIn = state.matches('checkIfLoggedIn')
 
   return isLoggingIn ? (
-    <Loading>
-      <span data-testid="initial-load">Loading Modeling App...</span>
-    </Loading>
+    <Loading>Loading KittyCAD Modeling App...</Loading>
   ) : (
     <>{children}</>
   )

src/Router.tsx

@@ -31,20 +31,15 @@ import {
 } from './lib/tauriFS'
 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'
 import {
   SETTINGS_PERSIST_KEY,
   settingsMachine,
 } from './machines/settingsMachine'
 import { ContextFrom } from 'xstate'
-import CommandBarProvider 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/KclSinglton'
-import FileMachineProvider from 'components/FileMachineProvider'
-import { sep } from '@tauri-apps/api/path'
 
 if (VITE_KC_SENTRY_DSN && !TEST) {
   Sentry.init({
@@ -99,20 +94,16 @@ export const paths = {
   ) 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
+  entrypoint_metadata: Metadata
 }
 export type HomeLoaderData = {
   projects: ProjectWithEntryPointMetadata[]
-  newDefaultDirectory?: string
 }
 
 type CreateBrowserRouterArg = Parameters<typeof createBrowserRouter>[0]
@@ -138,24 +129,15 @@ const router = createBrowserRouter(
     {
       path: paths.INDEX,
       loader: () =>
-        isTauri()
-          ? redirect(paths.HOME)
-          : redirect(paths.FILE + '/' + BROWSER_FILE_NAME),
+        isTauri() ? redirect(paths.HOME) : redirect(paths.FILE + '/new'),
       errorElement: <ErrorPage />,
     },
     {
       path: paths.FILE + '/:id',
       element: (
         <Auth>
-          <FileMachineProvider>
-            <KclContextProvider>
-              <ModelingMachineProvider>
-                <Outlet />
-                <App />
-              </ModelingMachineProvider>
-              <WasmErrBanner />
-            </KclContextProvider>
-          </FileMachineProvider>
+          <Outlet />
+          <App />
           {!isTauri() && import.meta.env.PROD && <DownloadAppBanner />}
         </Auth>
       ),
@@ -185,42 +167,21 @@ const router = createBrowserRouter(
           )
         }
 
-        const defaultDir = persistedSettings.defaultDirectory || ''
-
-        if (params.id && params.id !== BROWSER_FILE_NAME) {
-          const decodedId = decodeURIComponent(params.id)
-          const projectAndFile = decodedId.replace(defaultDir + sep, '')
-          const firstSlashIndex = projectAndFile.indexOf(sep)
-          const projectName = projectAndFile.slice(0, firstSlashIndex)
-          const projectPath = defaultDir + sep + projectName
-          const currentFileName = projectAndFile.slice(firstSlashIndex + 1)
-
-          if (firstSlashIndex === -1 || !currentFileName)
-            return redirect(
-              `${paths.FILE}/${encodeURIComponent(
-                `${params.id}${sep}${PROJECT_ENTRYPOINT}`
-              )}`
-            )
-
+        if (params.id && params.id !== 'new') {
           // Note that PROJECT_ENTRYPOINT is hardcoded until we support multiple files
-          const code = await readTextFile(decodedId)
-          const entrypointMetadata = await metadata(
-            projectPath + sep + PROJECT_ENTRYPOINT
+          const code = await readTextFile(params.id + '/' + PROJECT_ENTRYPOINT)
+          const entrypoint_metadata = await metadata(
+            params.id + '/' + PROJECT_ENTRYPOINT
           )
-          const children = await readDir(projectPath, { recursive: true })
-          kclManager.setCodeAndExecute(code, false)
+          const children = await readDir(params.id)
 
           return {
             code,
             project: {
-              name: projectName,
-              path: projectPath,
-              children,
-              entrypointMetadata,
-            },
-            file: {
-              name: currentFileName,
+              name: params.id.slice(params.id.lastIndexOf('/') + 1),
               path: params.id,
+              children,
+              entrypoint_metadata,
             },
           }
         }
@@ -251,7 +212,7 @@ const router = createBrowserRouter(
       ),
       loader: async () => {
         if (!isTauri()) {
-          return redirect(paths.FILE + '/' + BROWSER_FILE_NAME)
+          return redirect(paths.FILE + '/new')
         }
         const fetchedStorage = localStorage?.getItem(SETTINGS_PERSIST_KEY)
         const persistedSettings = JSON.parse(fetchedStorage || '{}') as Partial<
@@ -260,7 +221,6 @@ const router = createBrowserRouter(
         const projectDir = await initializeProjectDirectory(
           persistedSettings.defaultDirectory || ''
         )
-        let newDefaultDirectory: string | undefined = undefined
         if (projectDir !== persistedSettings.defaultDirectory) {
           localStorage.setItem(
             SETTINGS_PERSIST_KEY,
@@ -269,15 +229,14 @@ const router = createBrowserRouter(
               defaultDirectory: projectDir,
             })
           )
-          newDefaultDirectory = projectDir
         }
         const projectsNoMeta = (await readDir(projectDir)).filter(
           isProjectDirectory
         )
         const projects = await Promise.all(
-          projectsNoMeta.map(async (p: FileEntry) => ({
-            entrypointMetadata: await metadata(
-              p.path + sep + PROJECT_ENTRYPOINT
+          projectsNoMeta.map(async (p) => ({
+            entrypoint_metadata: await metadata(
+              p.path + '/' + PROJECT_ENTRYPOINT
             ),
             ...p,
           }))
@@ -285,7 +244,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,221 +1,335 @@
-import { WheelEvent, useRef, useMemo } from 'react'
-import { isCursorInSketchCommandRange } from 'lang/util'
-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 { useStore, toolTips, ToolTip } from './useStore'
+import { extrudeSketch, sketchOnExtrudedFace } from './lang/modifyAst'
+import { getNodePathFromSourceRange } from './lang/queryAst'
+import { HorzVert } from './components/Toolbar/HorzVert'
+import { RemoveConstrainingValues } from './components/Toolbar/RemoveConstrainingValues'
+import { EqualLength } from './components/Toolbar/EqualLength'
+import { EqualAngle } from './components/Toolbar/EqualAngle'
+import { Intersect } from './components/Toolbar/Intersect'
+import { SetHorzVertDistance } from './components/Toolbar/SetHorzVertDistance'
+import { SetAngleLength } from './components/Toolbar/setAngleLength'
+import { SetAbsDistance } from './components/Toolbar/SetAbsDistance'
+import { SetAngleBetween } from './components/Toolbar/SetAngleBetween'
+import { Fragment, useEffect } 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 { v4 as uuidv4 } from 'uuid'
+import { useAppMode } from 'hooks/useAppMode'
+import { ActionIcon } from 'components/ActionIcon'
+
+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',
+}
+
+const sketchFnLabels: Record<ToolTip | 'sketch_line' | 'move', string> = {
+  sketch_line: 'Line',
+  line: 'Line',
+  move: 'Move',
+  angledLine: 'Angled Line',
+  angledLineThatIntersects: 'Angled Line That Intersects',
+  angledLineOfXLength: 'Angled Line Of X Length',
+  angledLineOfYLength: 'Angled Line Of Y Length',
+  angledLineToX: 'Angled Line To X',
+  angledLineToY: 'Angled Line To Y',
+  lineTo: 'Line to Point',
+  xLine: 'Horizontal Line',
+  yLine: 'Vertical Line',
+  xLineTo: 'Horizontal Line to Point',
+  yLineTo: 'Vertical Line to Point',
+}
 
 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(
-    () =>
-      isCursorInSketchCommandRange(
-        engineCommandManager.artifactMap,
-        context.selectionRanges
-      ),
-    [engineCommandManager.artifactMap, context.selectionRanges]
-  )
+  const {
+    setGuiMode,
+    guiMode,
+    selectionRanges,
+    ast,
+    updateAst,
+    programMemory,
+    engineCommandManager,
+    executeAst,
+  } = useStore((s) => ({
+    guiMode: s.guiMode,
+    setGuiMode: s.setGuiMode,
+    selectionRanges: s.selectionRanges,
+    ast: s.ast,
+    updateAst: s.updateAst,
+    programMemory: s.programMemory,
+    engineCommandManager: s.engineCommandManager,
+    executeAst: s.executeAst,
+  }))
+  useAppMode()
 
-  function handleToolbarButtonsWheelEvent(ev: WheelEvent<HTMLSpanElement>) {
-    const span = toolbarButtonsRef.current
-    if (!span) {
-      return
-    }
+  useEffect(() => {
+    console.log('guiMode', guiMode)
+  }, [guiMode])
 
-    span.scrollLeft = span.scrollLeft += ev.deltaY
-  }
-
-  function ToolbarButtons({
-    className = '',
-    ...props
-  }: React.HTMLAttributes<HTMLElement>) {
+  function ToolbarButtons({ className }: React.HTMLAttributes<HTMLElement>) {
     return (
-      <ul
-        {...props}
-        ref={toolbarButtonsRef}
-        onWheel={handleToolbarButtonsWheelEvent}
-        className={
-          'm-0 py-1 rounded-l-sm flex gap-2 items-center overflow-x-auto ' +
-          className
-        }
-        style={{ scrollbarWidth: 'thin' }}
-      >
-        {state.nextEvents.includes('Enter sketch') && (
-          <li className="contents">
-            <ActionButton
-              Element="button"
-              onClick={() => send({ type: 'Enter sketch' })}
-              icon={{
-                icon: 'sketch',
-                bgClassName,
-              }}
-            >
-              <span data-testid="start-sketch">Start Sketch</span>
-            </ActionButton>
-          </li>
+      <span className={styles.toolbarButtons + ' ' + className}>
+        {guiMode.mode === 'default' && (
+          <button
+            onClick={() => {
+              setGuiMode({
+                mode: 'sketch',
+                sketchMode: 'selectFace',
+              })
+            }}
+            className="group"
+          >
+            <ActionIcon icon="sketch" className="!p-0.5" size="md" />
+            Start Sketch
+          </button>
         )}
-        {state.nextEvents.includes('Enter sketch') && pathId && (
-          <li className="contents">
-            <ActionButton
-              Element="button"
-              onClick={() => send({ type: 'Enter sketch' })}
-              icon={{
-                icon: 'sketch',
-                bgClassName,
-              }}
-            >
-              Edit Sketch
-            </ActionButton>
-          </li>
+        {guiMode.mode === 'canEditExtrude' && (
+          <button
+            onClick={() => {
+              if (!ast) return
+              const pathToNode = getNodePathFromSourceRange(
+                ast,
+                selectionRanges.codeBasedSelections[0].range
+              )
+              const { modifiedAst } = sketchOnExtrudedFace(
+                ast,
+                pathToNode,
+                programMemory
+              )
+              updateAst(modifiedAst, true)
+            }}
+            className="group"
+          >
+            <ActionIcon icon="sketch" className="!p-0.5" size="md" />
+            Sketch on Face
+          </button>
         )}
-        {state.nextEvents.includes('Cancel') && !state.matches('idle') && (
-          <li className="contents">
-            <ActionButton
-              Element="button"
-              onClick={() => send({ type: 'Cancel' })}
-              icon={{
-                icon: 'arrowLeft',
-                bgClassName,
-              }}
-            >
-              Exit Sketch
-            </ActionButton>
-          </li>
+        {guiMode.mode === 'canEditSketch' && (
+          <button
+            onClick={() => {
+              const pathToNode = getNodePathFromSourceRange(
+                ast,
+                selectionRanges.codeBasedSelections[0].range
+              )
+              setGuiMode({
+                mode: 'sketch',
+                sketchMode: 'enterSketchEdit',
+                pathToNode: pathToNode,
+                rotation: [0, 0, 0, 1],
+                position: [0, 0, 0],
+                pathId: guiMode.pathId,
+              })
+            }}
+            className="group"
+          >
+            <ActionIcon icon="sketch" className="!p-0.5" size="md" />
+            Edit Sketch
+          </button>
         )}
-        {state.matches('Sketch') && !state.matches('idle') && (
-          <li className="contents">
-            <ActionButton
-              Element="button"
-              onClick={() =>
-                state.matches('Sketch.Line Tool')
-                  ? send('CancelSketch')
-                  : send('Equip tool')
-              }
-              aria-pressed={state.matches('Sketch.Line Tool')}
-              className="pressed:bg-energy-10/20 dark:pressed:bg-energy-80"
-              icon={{
-                icon: 'line',
-                bgClassName,
-              }}
-            >
-              Line
-            </ActionButton>
-          </li>
-        )}
-        {state.matches('Sketch') && (
-          <li className="contents">
-            <ActionButton
-              Element="button"
-              onClick={() =>
-                state.matches('Sketch.Move Tool')
-                  ? send('CancelSketch')
-                  : send('Equip move tool')
-              }
-              aria-pressed={state.matches('Sketch.Move Tool')}
-              className="pressed:bg-energy-10/20 dark:pressed:bg-energy-80"
-              icon={{
-                icon: 'move',
-                bgClassName,
-              }}
-            >
-              Move
-            </ActionButton>
-          </li>
-        )}
-        {state.matches('Sketch.SketchIdle') &&
-          state.nextEvents
-            .filter(
-              (eventName) =>
-                eventName.includes('Make segment') ||
-                eventName.includes('Constrain')
-            )
-            .sort((a, b) => {
-              const aisEnabled = state.nextEvents
-                .filter((event) => state.can(event as any))
-                .includes(a)
-              const bIsEnabled = state.nextEvents
-                .filter((event) => state.can(event as any))
-                .includes(b)
-              if (aisEnabled && !bIsEnabled) {
-                return -1
-              }
-              if (!aisEnabled && bIsEnabled) {
-                return 1
-              }
-              return 0
-            })
-            .map((eventName) => (
-              <li className="contents">
-                <ActionButton
-                  Element="button"
-                  className="text-sm"
-                  key={eventName}
-                  onClick={() => send(eventName)}
-                  disabled={
-                    !state.nextEvents
-                      .filter((event) => state.can(event as any))
-                      .includes(eventName)
-                  }
-                  title={eventName}
-                  icon={{
-                    icon: 'line',
-                    bgClassName,
-                  }}
-                >
-                  {eventName
-                    .replace('Make segment ', '')
-                    .replace('Constrain ', '')}
-                </ActionButton>
-              </li>
-            ))}
-        {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')}
-              title={
-                state.can('Extrude')
-                  ? 'extrude'
-                  : 'sketches need to be closed, or not already extruded'
-              }
-              icon={{
-                icon: 'extrude',
-                bgClassName,
+        {guiMode.mode === 'canEditSketch' && (
+          <>
+            <button
+              onClick={() => {
+                if (!ast) return
+                const pathToNode = getNodePathFromSourceRange(
+                  ast,
+                  selectionRanges.codeBasedSelections[0].range
+                )
+                const { modifiedAst, pathToExtrudeArg } = extrudeSketch(
+                  ast,
+                  pathToNode
+                )
+                updateAst(modifiedAst, true, { focusPath: pathToExtrudeArg })
               }}
+              className="group"
             >
+              <ActionIcon icon="extrude" className="!p-0.5" size="md" />
               Extrude
-            </ActionButton>
-          </li>
+            </button>
+            <button
+              onClick={() => {
+                if (!ast) return
+                const pathToNode = getNodePathFromSourceRange(
+                  ast,
+                  selectionRanges.codeBasedSelections[0].range
+                )
+                const { modifiedAst, pathToExtrudeArg } = extrudeSketch(
+                  ast,
+                  pathToNode,
+                  false
+                )
+                updateAst(modifiedAst, true, { focusPath: pathToExtrudeArg })
+              }}
+              className="group"
+            >
+              <ActionIcon icon="extrude" className="!p-0.5" size="md" />
+              Extrude as new
+            </button>
+          </>
         )}
-      </ul>
+
+        {guiMode.mode === 'sketch' && (
+          <button
+            onClick={() => {
+              engineCommandManager?.sendSceneCommand({
+                type: 'modeling_cmd_req',
+                cmd_id: uuidv4(),
+                cmd: { type: 'edit_mode_exit' },
+              })
+              engineCommandManager?.sendSceneCommand({
+                type: 'modeling_cmd_req',
+                cmd_id: uuidv4(),
+                cmd: { type: 'default_camera_disable_sketch_mode' },
+              })
+
+              setGuiMode({ mode: 'default' })
+              executeAst()
+            }}
+            className="group"
+          >
+            <ActionIcon
+              icon="exit"
+              className="!p-0.5"
+              bgClassName={sketchButtonClassnames.background}
+              iconClassName={sketchButtonClassnames.icon}
+              size="md"
+            />
+            Exit sketch
+          </button>
+        )}
+        {toolTips
+          .filter(
+            // (sketchFnName) => !['angledLineThatIntersects'].includes(sketchFnName)
+            (sketchFnName) => ['sketch_line', 'move'].includes(sketchFnName)
+          )
+          .map((sketchFnName) => {
+            if (
+              guiMode.mode !== 'sketch' ||
+              !('isTooltip' in guiMode || guiMode.sketchMode === 'sketchEdit')
+            )
+              return null
+            return (
+              <button
+                key={sketchFnName}
+                onClick={() => {
+                  engineCommandManager?.sendSceneCommand({
+                    type: 'modeling_cmd_req',
+                    cmd_id: uuidv4(),
+                    cmd: {
+                      type: 'set_tool',
+                      tool:
+                        guiMode.sketchMode === sketchFnName
+                          ? 'select'
+                          : (sketchFnName as any),
+                    },
+                  })
+                  setGuiMode({
+                    ...guiMode,
+                    ...(guiMode.sketchMode === sketchFnName
+                      ? {
+                          sketchMode: 'sketchEdit',
+                          // todo: ...guiMod is adding isTooltip: true, will probably just fix with xstate migtaion
+                        }
+                      : {
+                          sketchMode: sketchFnName,
+                          waitingFirstClick: true,
+                          isTooltip: true,
+                          pathId: guiMode.pathId,
+                        }),
+                  })
+                }}
+                className={
+                  'group ' +
+                  (guiMode.sketchMode === sketchFnName
+                    ? '!text-fern-70 !bg-fern-10 !dark:text-fern-20 !border-fern-50'
+                    : '')
+                }
+              >
+                <ActionIcon
+                  icon={sketchFnName.includes('line') ? 'line' : 'move'}
+                  className="!p-0.5"
+                  bgClassName={sketchButtonClassnames.background}
+                  iconClassName={sketchButtonClassnames.icon}
+                  size="md"
+                />
+                {sketchFnLabels[sketchFnName]}
+              </button>
+            )
+          })}
+        <HorzVert horOrVert="horizontal" />
+        <HorzVert horOrVert="vertical" />
+        <EqualLength />
+        <EqualAngle />
+        <SetHorzVertDistance buttonType="alignEndsVertically" />
+        <SetHorzVertDistance buttonType="setHorzDistance" />
+        <SetAbsDistance buttonType="snapToYAxis" />
+        <SetAbsDistance buttonType="xAbs" />
+        <SetHorzVertDistance buttonType="alignEndsHorizontally" />
+        <SetAbsDistance buttonType="snapToXAxis" />
+        <SetHorzVertDistance buttonType="setVertDistance" />
+        <SetAbsDistance buttonType="yAbs" />
+        <SetAngleLength angleOrLength="setAngle" />
+        <SetAngleLength angleOrLength="setLength" />
+        <Intersect />
+        <RemoveConstrainingValues />
+        <SetAngleBetween />
+      </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 + ' ' + guiMode.mode}>
+      <div className={styles.toolbar}>
+        <span className={styles.toolbarCap + ' ' + styles.label}>
+          {guiMode.mode === '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 {guiMode.mode === '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>
   )
 }

src/components/ActionButton.tsx

@@ -23,7 +23,10 @@ type ActionButtonAsLink = BaseActionButtonProps &
   }
 
 type ActionButtonAsExternal = BaseActionButtonProps &
-  Omit<LinkProps, keyof BaseActionButtonProps> & {
+  Omit<
+    React.AnchorHTMLAttributes<HTMLAnchorElement>,
+    keyof BaseActionButtonProps
+  > & {
     Element: 'externalLink'
   }
 
@@ -39,16 +42,16 @@ type ActionButtonProps =
   | ActionButtonAsElement
 
 export const ActionButton = (props: ActionButtonProps) => {
-  const classNames = `action-button m-0 group mono text-sm flex items-center gap-2 rounded-sm border-solid border border-chalkboard-30 hover:border-chalkboard-40 dark:border-chalkboard-70 dark:hover:border-chalkboard-60 dark:bg-chalkboard-90/50 p-[3px] text-chalkboard-100 dark:text-chalkboard-10 ${
+  const classNames = `group mono text-base flex items-center gap-2 rounded-sm border border-chalkboard-40 dark:border-chalkboard-60 hover:border-liquid-40 dark:hover:bg-chalkboard-90 p-[3px] text-chalkboard-110 dark:text-chalkboard-10 hover:text-chalkboard-110 hover:dark:text-chalkboard-10 ${
     props.icon ? 'pr-2' : 'px-2'
-  } ${props.className ? props.className : ''}`
+  } ${props.className || ''}`
 
   switch (props.Element) {
     case 'button': {
       // Note we have to destructure 'className' and 'Element' out of props
       // because we don't want to pass them to the button element;
       // the same is true for the other cases below.
-      const { Element, icon, children, className: _className, ...rest } = props
+      const { Element, icon, children, className, ...rest } = props
       return (
         <button className={classNames} {...rest}>
           {props.icon && <ActionIcon {...icon} />}
@@ -57,14 +60,7 @@ export const ActionButton = (props: ActionButtonProps) => {
       )
     }
     case 'link': {
-      const {
-        Element,
-        to,
-        icon,
-        children,
-        className: _className,
-        ...rest
-      } = props
+      const { Element, to, icon, children, className, ...rest } = props
       return (
         <Link to={to || paths.INDEX} className={classNames} {...rest}>
           {icon && <ActionIcon {...icon} />}
@@ -73,28 +69,16 @@ export const ActionButton = (props: ActionButtonProps) => {
       )
     }
     case 'externalLink': {
-      const {
-        Element,
-        to,
-        icon,
-        children,
-        className: _className,
-        ...rest
-      } = props
+      const { Element, icon, children, className, ...rest } = props
       return (
-        <Link
-          to={to || paths.INDEX}
-          className={classNames}
-          {...rest}
-          target="_blank"
-        >
+        <a className={classNames} {...rest}>
           {icon && <ActionIcon {...icon} />}
           {children}
-        </Link>
+        </a>
       )
     }
     default: {
-      const { Element, icon, children, className: _className, ...rest } = props
+      const { Element, icon, children, className, ...rest } = props
       if (!Element) throw new Error('Element is required')
 
       return (

src/components/ActionIcon.tsx

@@ -7,10 +7,10 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { CustomIcon, CustomIconName } from './CustomIcon'
 
 const iconSizes = {
-  xs: 12,
-  sm: 14,
-  md: 20,
-  lg: 24,
+  sm: 12,
+  md: 14.4,
+  lg: 20,
+  xl: 28,
 }
 
 export interface ActionIconProps extends React.PropsWithChildren {
@@ -30,14 +30,20 @@ export const ActionIcon = ({
   children,
 }: ActionIconProps) => {
   // By default, we reverse the icon color and background color in dark mode
-  const computedIconClassName = `h-auto dark:text-energy-10 !group-disabled:text-chalkboard-60 !group-disabled:text-chalkboard-60 ${iconClassName}`
+  const computedIconClassName =
+    iconClassName ||
+    `text-liquid-20 h-auto group-hover:text-liquid-10 hover:text-liquid-10 dark:text-chalkboard-100 dark:group-hover:text-chalkboard-100 dark:hover:text-chalkboard-100 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`
 
-  const computedBgClassName = `bg-chalkboard-20 dark:bg-chalkboard-90 !group-disabled:bg-chalkboard-30 !dark:group-disabled:bg-chalkboard-80 ${bgClassName}`
+  const computedBgClassName =
+    bgClassName ||
+    `bg-chalkboard-100 group-hover:bg-chalkboard-90 hover:bg-chalkboard-90 dark:bg-liquid-20 dark:group-hover:bg-liquid-10 dark:hover:bg-liquid-10 group-disabled:bg-chalkboard-80 dark:group-disabled:bg-chalkboard-80`
 
   return (
     <div
       className={
-        `w-fit inline-grid place-content-center ${className} ` +
+        `p-${
+          size === 'xl' ? '2' : '1'
+        } w-fit inline-grid place-content-center ${className} ` +
         computedBgClassName
       }
     >

src/components/AppHeader.tsx

@@ -1,17 +1,14 @@
 import { Toolbar } from '../Toolbar'
 import UserSidebarMenu from './UserSidebarMenu'
-import { IndexLoaderData } from '../Router'
+import { ProjectWithEntryPointMetadata } from '../Router'
 import ProjectSidebarMenu from './ProjectSidebarMenu'
 import { useGlobalStateContext } from 'hooks/useGlobalStateContext'
 import styles from './AppHeader.module.css'
 import { NetworkHealthIndicator } from './NetworkHealthIndicator'
-import { useCommandsContext } from 'hooks/useCommandsContext'
-import { ActionButton } from './ActionButton'
-import usePlatform from 'hooks/usePlatform'
 
 interface AppHeaderProps extends React.PropsWithChildren {
   showToolbar?: boolean
-  project?: Omit<IndexLoaderData, 'code'>
+  project?: ProjectWithEntryPointMetadata
   className?: string
   enableMenu?: boolean
 }
@@ -23,51 +20,35 @@ export const AppHeader = ({
   className = '',
   enableMenu = false,
 }: AppHeaderProps) => {
-  const platform = usePlatform()
-  const { commandBarSend } = useCommandsContext()
-  const { auth } = useGlobalStateContext()
-  const user = auth?.context?.user
+  const {
+    auth: {
+      context: { user },
+    },
+  } = useGlobalStateContext()
 
   return (
     <header
       className={
-        'w-full grid ' +
+        (showToolbar ? 'w-full grid ' : 'flex justify-between ') +
         styles.header +
-        ' overlaid-panes sticky top-0 z-20 py-1 px-2 bg-chalkboard-10/70 dark:bg-chalkboard-100/50 border-b dark:border-b-2 border-chalkboard-30 dark:border-chalkboard-90 items-center ' +
+        ' overlaid-panes sticky top-0 z-20 py-1 px-5 bg-chalkboard-10/70 dark:bg-chalkboard-100/50 border-b dark:border-b-2 border-chalkboard-30 dark:border-chalkboard-90 items-center ' +
         className
       }
     >
-      <ProjectSidebarMenu
-        renderAsLink={!enableMenu}
-        project={project?.project}
-        file={project?.file}
-      />
+      <ProjectSidebarMenu renderAsLink={!enableMenu} project={project} />
       {/* Toolbar if the context deems it */}
-      <div className="flex-grow flex justify-center max-w-lg md:max-w-xl lg:max-w-2xl xl:max-w-4xl 2xl:max-w-5xl">
-        {showToolbar ? (
+      {showToolbar && (
+        <div className="max-w-lg md:max-w-xl lg:max-w-2xl xl:max-w-4xl 2xl:max-w-5xl">
           <Toolbar />
-        ) : (
-          <ActionButton
-            Element="button"
-            onClick={() => commandBarSend({ type: 'Open' })}
-            className="text-sm self-center flex items-center w-fit gap-3"
-          >
-            Command Palette{' '}
-            <kbd className="bg-energy-10/50 dark:bg-chalkboard-100 dark:text-energy-10 inline-block px-1 py-0.5 border-energy-10 dark:border-chalkboard-90">
-              {platform === 'darwin' ? '⌘K' : 'Ctrl+/'}
-            </kbd>
-          </ActionButton>
-        )}
-      </div>
-      <div className="flex items-center gap-1 ml-auto">
-        {/* If there are children, show them, otherwise show User menu */}
-        {children || (
-          <>
-            <NetworkHealthIndicator />
-            <UserSidebarMenu user={user} />
-          </>
-        )}
-      </div>
+        </div>
+      )}
+      {/* If there are children, show them, otherwise show User menu */}
+      {children || (
+        <div className="ml-auto flex items-center gap-1">
+          <NetworkHealthIndicator />
+          <UserSidebarMenu user={user} />
+        </div>
+      )}
     </header>
   )
 }

src/components/AstExplorer.tsx

@@ -1,18 +1,18 @@
-import { useModelingContext } from 'hooks/useModelingContext'
-import { kclManager } from 'lang/KclSinglton'
 import { getNodeFromPath, getNodePathFromSourceRange } from 'lang/queryAst'
 import { useEffect, useRef, useState } from 'react'
 import { useStore } from 'useStore'
 
 export function AstExplorer() {
-  const setHighlightRange = useStore((s) => s.setHighlightRange)
-  const { context } = useModelingContext()
+  const { ast, setHighlightRange, selectionRanges } = useStore((s) => ({
+    ast: s.ast,
+    setHighlightRange: s.setHighlightRange,
+    selectionRanges: s.selectionRanges,
+  }))
   const pathToNode = getNodePathFromSourceRange(
-    // TODO maybe need to have callback to make sure it stays in sync
-    kclManager.ast,
-    context.selectionRanges.codeBasedSelections?.[0]?.range
+    ast,
+    selectionRanges.codeBasedSelections?.[0]?.range
   )
-  const node = getNodeFromPath(kclManager.ast, pathToNode).node
+  const node = getNodeFromPath(ast, pathToNode).node
   const [filterKeys, setFilterKeys] = useState<string[]>(['start', 'end'])
 
   return (
@@ -46,11 +46,7 @@ export function AstExplorer() {
         }}
       >
         <pre className=" text-xs overflow-y-auto" style={{ width: '300px' }}>
-          <DisplayObj
-            obj={kclManager.ast}
-            filterKeys={filterKeys}
-            node={node}
-          />
+          <DisplayObj obj={ast} filterKeys={filterKeys} node={node} />
         </pre>
       </div>
     </div>
@@ -88,8 +84,10 @@ function DisplayObj({
   filterKeys: string[]
   node: any
 }) {
-  const setHighlightRange = useStore((s) => s.setHighlightRange)
-  const { send } = useModelingContext()
+  const { setHighlightRange, setCursor2 } = useStore((s) => ({
+    setHighlightRange: s.setHighlightRange,
+    setCursor2: s.setCursor2,
+  }))
   const ref = useRef<HTMLPreElement>(null)
   const [hasCursor, setHasCursor] = useState(false)
   const [isCollapsed, setIsCollapsed] = useState(false)
@@ -120,16 +118,7 @@ function DisplayObj({
         setHighlightRange([obj?.start || 0, obj.end])
       }}
       onClick={(e) => {
-        send({
-          type: 'Set selection',
-          data: {
-            selectionType: 'singleCodeCursor',
-            selection: {
-              type: 'default',
-              range: [obj?.start || 0, obj.end || 0],
-            },
-          },
-        })
+        setCursor2({ type: 'default', range: [obj?.start || 0, obj.end || 0] })
         e.stopPropagation()
       }}
     >
@@ -184,7 +173,6 @@ function DisplayObj({
                   </li>
                 )
               }
-              return null
             })}
           </ul>
         </span>

src/components/AvailableVarsHelpers.tsx

@@ -1,5 +1,7 @@
 import { useEffect, useState, useRef } from 'react'
-import { parse, BinaryPart, Value } from '../lang/wasm'
+import { parser_wasm } from '../lang/abstractSyntaxTree'
+import { BinaryPart, Value } from '../lang/abstractSyntaxTreeTypes'
+import { executor } from '../lang/executor'
 import {
   createIdentifier,
   createLiteral,
@@ -7,10 +9,7 @@ import {
   findUniqueName,
 } from '../lang/modifyAst'
 import { findAllPreviousVariables, PrevVariable } from '../lang/queryAst'
-import { engineCommandManager } from '../lang/std/engineConnection'
-import { kclManager, useKclContext } from 'lang/KclSinglton'
-import { useModelingContext } from 'hooks/useModelingContext'
-import { executeAst } from 'useStore'
+import { useStore } from '../useStore'
 
 export const AvailableVars = ({
   onVarClick,
@@ -93,9 +92,14 @@ export function useCalc({
   newVariableInsertIndex: number
   setNewVariableName: (a: string) => void
 } {
-  const { programMemory } = useKclContext()
-  const { context } = useModelingContext()
-  const selectionRange = context.selectionRanges.codeBasedSelections[0].range
+  const { ast, programMemory, selectionRange, engineCommandManager } = useStore(
+    (s) => ({
+      ast: s.ast,
+      programMemory: s.programMemory,
+      selectionRange: s.selectionRanges.codeBasedSelections[0].range,
+      engineCommandManager: s.engineCommandManager,
+    })
+  )
   const inputRef = useRef<HTMLInputElement>(null)
   const [availableVarInfo, setAvailableVarInfo] = useState<
     ReturnType<typeof findAllPreviousVariables>
@@ -115,7 +119,9 @@ export function useCalc({
       inputRef.current &&
         inputRef.current.setSelectionRange(0, String(value).length)
     }, 100)
-    setNewVariableName(findUniqueName(kclManager.ast, valueName))
+    if (ast) {
+      setNewVariableName(findUniqueName(ast, valueName))
+    }
   }, [])
 
   useEffect(() => {
@@ -128,32 +134,21 @@ export function useCalc({
   }, [newVariableName])
 
   useEffect(() => {
-    if (!programMemory || !selectionRange) return
-    const varInfo = findAllPreviousVariables(
-      kclManager.ast,
-      kclManager.programMemory,
-      selectionRange
-    )
+    if (!ast || !programMemory || !selectionRange) return
+    const varInfo = findAllPreviousVariables(ast, programMemory, selectionRange)
     setAvailableVarInfo(varInfo)
-  }, [kclManager.ast, kclManager.programMemory, selectionRange])
+  }, [ast, programMemory, selectionRange])
 
   useEffect(() => {
+    if (!engineCommandManager) return
     try {
-      const code = `const __result__ = ${value}`
-      const ast = parse(code)
+      const code = `const __result__ = ${value}\nshow(__result__)`
+      const ast = parser_wasm(code)
       const _programMem: any = { root: {}, return: null }
       availableVarInfo.variables.forEach(({ key, value }) => {
         _programMem.root[key] = { type: 'userVal', value, __meta: [] }
       })
-      executeAst({
-        ast,
-        engineCommandManager,
-        defaultPlanes: kclManager.defaultPlanes,
-        useFakeExecutor: true,
-        programMemoryOverride: JSON.parse(
-          JSON.stringify(kclManager.programMemory)
-        ),
-      }).then(({ programMemory }) => {
+      executor(ast, _programMem, engineCommandManager).then((programMemory) => {
         const resultDeclaration = ast.body.find(
           (a) =>
             a.type === 'VariableDeclaration' &&
@@ -170,7 +165,7 @@ export function useCalc({
       setCalcResult('NAN')
       setValueNode(null)
     }
-  }, [value, availableVarInfo])
+  }, [value])
 
   return {
     valueNode,
@@ -215,10 +210,7 @@ export const CreateNewVariable = ({
 }) => {
   return (
     <>
-      <label
-        htmlFor="create-new-variable"
-        className="block mt-3 font-mono text-gray-900"
-      >
+      <label htmlFor="create-new-variable" className="block mt-3 font-mono">
         Create new variable
       </label>
       <div className="mt-1 flex gap-2 items-center">
@@ -229,7 +221,6 @@ export const CreateNewVariable = ({
             onChange={(e) => {
               setShouldCreateVariable(e.target.checked)
             }}
-            className="bg-white text-gray-900"
           />
         )}
         <input

src/components/CodeMenu.module.css

@@ -1,13 +1,13 @@
 .button {
   @apply flex justify-between items-center gap-2 px-2 py-1 text-left border-none rounded-sm;
   @apply font-mono text-xs font-bold select-none text-chalkboard-90;
-  @apply ui-active:bg-energy-10/50 ui-active:text-inherit;
+  @apply ui-active:bg-liquid-10/50 ui-active:text-liquid-90;
   @apply transition-colors ease-out;
 }
 
 :global(.dark) .button {
   @apply text-chalkboard-30;
-  @apply ui-active:bg-chalkboard-80 ui-active:text-energy-10;
+  @apply ui-active:bg-chalkboard-80 ui-active:text-liquid-10;
 }
 
 .button small {

src/components/CodeMenu.tsx

@@ -5,13 +5,16 @@ import {
   faEllipsis,
 } from '@fortawesome/free-solid-svg-icons'
 import { ActionIcon } from './ActionIcon'
+import { useStore } from 'useStore'
 import styles from './CodeMenu.module.css'
 import { useConvertToVariable } from 'hooks/useToolbarGuards'
 import { editorShortcutMeta } from './TextEditor'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import { kclManager } from 'lang/KclSinglton'
 
 export const CodeMenu = ({ children }: PropsWithChildren) => {
+  const { formatCode } = useStore((s) => ({
+    formatCode: s.formatCode,
+  }))
   const { enable: convertToVarEnabled, handleClick: handleConvertToVarClick } =
     useConvertToVariable()
 
@@ -30,20 +33,15 @@ export const CodeMenu = ({ children }: PropsWithChildren) => {
         <Menu.Button className="p-0 border-none relative">
           <ActionIcon
             icon={faEllipsis}
-            className="p-1"
-            size="sm"
             bgClassName={
-              'bg-chalkboard-20 dark:bg-chalkboard-110 hover:bg-energy-10/50 hover:dark:bg-chalkboard-90 ui-active:bg-chalkboard-80 ui-active:dark:bg-chalkboard-90 rounded-sm'
+              'bg-chalkboard-20 dark:bg-chalkboard-110 hover:bg-liquid-10/50 hover:dark:bg-chalkboard-90 ui-active:bg-chalkboard-80 ui-active:dark:bg-chalkboard-90  rounded'
             }
             iconClassName={'text-chalkboard-90 dark:text-chalkboard-40'}
           />
         </Menu.Button>
         <Menu.Items className="absolute right-0 left-auto w-72 flex flex-col gap-1 divide-y divide-chalkboard-20 dark:divide-chalkboard-70 align-stretch px-0 py-1 bg-chalkboard-10 dark:bg-chalkboard-90 rounded-sm shadow-lg border border-solid border-chalkboard-20/50 dark:border-chalkboard-80/50">
           <Menu.Item>
-            <button
-              onClick={() => kclManager.format()}
-              className={styles.button}
-            >
+            <button onClick={() => formatCode()} className={styles.button}>
               <span>Format code</span>
               <small>{editorShortcutMeta.formatCode.display}</small>
             </button>

src/components/CollapsiblePanel.tsx

@@ -9,7 +9,6 @@ export interface CollapsiblePanelProps
   icon?: IconDefinition
   open?: boolean
   menu?: React.ReactNode
-  detailsTestId?: string
   iconClassNames?: {
     bg?: string
     icon?: string
@@ -24,17 +23,16 @@ export const PanelHeader = ({
 }: CollapsiblePanelProps) => {
   return (
     <summary className={styles.header}>
-      <div className="flex gap-2 items-center flex-1">
+      <div className="flex gap-2 align-center flex-1">
         <ActionIcon
           icon={icon}
-          className="p-1"
-          size="sm"
           bgClassName={
-            'dark:!bg-chalkboard-100 group-open:bg-chalkboard-80 dark:group-open:!bg-chalkboard-90 border border-transparent dark:group-open:border-chalkboard-60 rounded-sm ' +
+            'bg-chalkboard-30 dark:bg-chalkboard-90 group-open:bg-chalkboard-80 rounded ' +
             (iconClassNames?.bg || '')
           }
           iconClassName={
-            'group-open:text-energy-10 ' + (iconClassNames?.icon || '')
+            'text-chalkboard-90 dark:text-chalkboard-40 group-open:text-liquid-10 ' +
+            (iconClassNames?.icon || '')
           }
         />
         {title}
@@ -53,16 +51,12 @@ export const CollapsiblePanel = ({
   className,
   iconClassNames,
   menu,
-  detailsTestId,
   ...props
 }: CollapsiblePanelProps) => {
   return (
     <details
       {...props}
-      data-testid={detailsTestId}
-      className={
-        styles.panel + ' pointer-events-auto group ' + (className || '')
-      }
+      className={styles.panel + ' group ' + (className || '')}
     >
       <PanelHeader
         title={title}

src/components/CommandBar.tsx

@@ -0,0 +1,290 @@
+import { Combobox, Dialog, Transition } from '@headlessui/react'
+import {
+  Dispatch,
+  Fragment,
+  SetStateAction,
+  createContext,
+  useState,
+} from 'react'
+import { useHotkeys } from 'react-hotkeys-hook'
+import { ActionIcon } from './ActionIcon'
+import { faSearch } from '@fortawesome/free-solid-svg-icons'
+import Fuse from 'fuse.js'
+import { Command, SubCommand } from '../lib/commands'
+import { useCommandsContext } from 'hooks/useCommandsContext'
+
+export type SortedCommand = {
+  item: Partial<Command | SubCommand> & { name: string }
+}
+
+export const CommandsContext = createContext(
+  {} as {
+    commands: Command[]
+    addCommands: (commands: Command[]) => void
+    removeCommands: (commands: Command[]) => void
+    commandBarOpen: boolean
+    setCommandBarOpen: Dispatch<SetStateAction<boolean>>
+  }
+)
+
+export const CommandBarProvider = ({
+  children,
+}: {
+  children: React.ReactNode
+}) => {
+  const [commands, internalSetCommands] = useState([] as Command[])
+  const [commandBarOpen, setCommandBarOpen] = useState(false)
+
+  const addCommands = (newCommands: Command[]) => {
+    internalSetCommands((prevCommands) => [...newCommands, ...prevCommands])
+  }
+  const removeCommands = (newCommands: Command[]) => {
+    internalSetCommands((prevCommands) =>
+      prevCommands.filter((command) => !newCommands.includes(command))
+    )
+  }
+
+  return (
+    <CommandsContext.Provider
+      value={{
+        commands,
+        addCommands,
+        removeCommands,
+        commandBarOpen,
+        setCommandBarOpen,
+      }}
+    >
+      {children}
+      <CommandBar />
+    </CommandsContext.Provider>
+  )
+}
+
+const CommandBar = () => {
+  const { commands, commandBarOpen, setCommandBarOpen } = useCommandsContext()
+  useHotkeys(['meta+k', 'meta+/'], () => {
+    if (commands.length === 0) return
+    setCommandBarOpen(!commandBarOpen)
+  })
+
+  const [selectedCommand, setSelectedCommand] = useState<SortedCommand | null>(
+    null
+  )
+  // keep track of the current subcommand index
+  const [subCommandIndex, setSubCommandIndex] = useState<number>()
+  const [subCommandData, setSubCommandData] = useState<{
+    [key: string]: string
+  }>({})
+
+  // if the subcommand index is null, we're not in a subcommand
+  const inSubCommand =
+    selectedCommand &&
+    'meta' in selectedCommand.item &&
+    selectedCommand.item.meta?.args !== undefined &&
+    subCommandIndex !== undefined
+  const currentSubCommand =
+    inSubCommand && 'meta' in selectedCommand.item
+      ? selectedCommand.item.meta?.args[subCommandIndex]
+      : undefined
+
+  const [query, setQuery] = useState('')
+
+  const availableCommands =
+    inSubCommand && currentSubCommand
+      ? currentSubCommand.type === 'string'
+        ? query
+          ? [{ name: query }]
+          : currentSubCommand.options
+        : currentSubCommand.options
+      : commands
+
+  const fuse = new Fuse(availableCommands || [], {
+    keys: ['name', 'description'],
+  })
+
+  const filteredCommands = query
+    ? fuse.search(query)
+    : availableCommands?.map((c) => ({ item: c } as SortedCommand))
+
+  function clearState() {
+    setQuery('')
+    setCommandBarOpen(false)
+    setSelectedCommand(null)
+    setSubCommandIndex(undefined)
+    setSubCommandData({})
+  }
+
+  function handleCommandSelection(entry: SortedCommand) {
+    // If we have subcommands and have not yet gathered all the
+    // data required from them, set the selected command to the
+    // current command and increment the subcommand index
+    if (selectedCommand === null && 'meta' in entry.item && entry.item.meta) {
+      setSelectedCommand(entry)
+      setSubCommandIndex(0)
+      setQuery('')
+      return
+    }
+
+    const { item } = entry
+    // If we have just selected a command with no subcommands, run it
+    const isCommandWithoutSubcommands =
+      'callback' in item && !('meta' in item && item.meta)
+    if (isCommandWithoutSubcommands) {
+      if (item.callback === undefined) return
+      item.callback()
+      setCommandBarOpen(false)
+      return
+    }
+
+    // If we have subcommands and have not yet gathered all the
+    // data required from them, set the selected command to the
+    // current command and increment the subcommand index
+    if (
+      selectedCommand &&
+      subCommandIndex !== undefined &&
+      'meta' in selectedCommand.item
+    ) {
+      const subCommand = selectedCommand.item.meta?.args[subCommandIndex]
+
+      if (subCommand) {
+        const newSubCommandData = {
+          ...subCommandData,
+          [subCommand.name]: item.name,
+        }
+        const newSubCommandIndex = subCommandIndex + 1
+
+        // If we have subcommands and have gathered all the data required
+        // from them, run the command with the gathered data
+        if (
+          selectedCommand.item.callback &&
+          selectedCommand.item.meta?.args.length === newSubCommandIndex
+        ) {
+          selectedCommand.item.callback(newSubCommandData)
+          setCommandBarOpen(false)
+        } else {
+          // Otherwise, set the subcommand data and increment the subcommand index
+          setSubCommandData(newSubCommandData)
+          setSubCommandIndex(newSubCommandIndex)
+          setQuery('')
+        }
+      }
+    }
+  }
+
+  function getDisplayValue(command: Command) {
+    if (command.meta?.displayValue === undefined || !command.meta.args)
+      return command.name
+    return command.meta?.displayValue(
+      command.meta.args.map((c) =>
+        subCommandData[c.name] ? subCommandData[c.name] : `<${c.name}>`
+      )
+    )
+  }
+
+  return (
+    <Transition.Root
+      show={
+        commandBarOpen &&
+        availableCommands?.length !== undefined &&
+        availableCommands.length > 0
+      }
+      as={Fragment}
+      afterLeave={() => clearState()}
+    >
+      <Dialog
+        onClose={() => {
+          setCommandBarOpen(false)
+          clearState()
+        }}
+        className="fixed inset-0 z-40 overflow-y-auto p-4 pt-[25vh]"
+      >
+        <Transition.Child
+          enter="duration-100 ease-out"
+          enterFrom="opacity-0"
+          enterTo="opacity-100"
+          leave="duration-75 ease-in"
+          leaveFrom="opacity-100"
+          leaveTo="opacity-0"
+          as={Fragment}
+        >
+          <Dialog.Overlay className="fixed inset-0 bg-chalkboard-10/70 dark:bg-chalkboard-110/50" />
+        </Transition.Child>
+        <Transition.Child
+          enter="duration-100 ease-out"
+          enterFrom="opacity-0 scale-95"
+          enterTo="opacity-100 scale-100"
+          leave="duration-75 ease-in"
+          leaveFrom="opacity-100 scale-100"
+          leaveTo="opacity-0 scale-95"
+          as={Fragment}
+        >
+          <Combobox
+            value={selectedCommand}
+            onChange={handleCommandSelection}
+            className="relative w-full max-w-xl p-2 mx-auto border rounded shadow-lg bg-chalkboard-10 dark:bg-chalkboard-100 dark:border-chalkboard-70"
+            as="div"
+          >
+            <div className="flex items-center gap-2">
+              <ActionIcon icon={faSearch} size="xl" className="rounded-sm" />
+              <div>
+                {inSubCommand && (
+                  <p className="text-liquid-70 dark:text-liquid-30">
+                    {selectedCommand.item &&
+                      getDisplayValue(selectedCommand.item as Command)}
+                  </p>
+                )}
+                <Combobox.Input
+                  onChange={(event) => setQuery(event.target.value)}
+                  className="w-full bg-transparent focus:outline-none"
+                  onKeyDown={(event) => {
+                    if (event.metaKey && event.key === 'k')
+                      setCommandBarOpen(false)
+                    if (
+                      inSubCommand &&
+                      event.key === 'Backspace' &&
+                      !event.currentTarget.value
+                    ) {
+                      setSubCommandIndex(subCommandIndex - 1)
+                      setSelectedCommand(null)
+                    }
+                  }}
+                  displayValue={(command: SortedCommand) =>
+                    command !== null ? command.item.name : ''
+                  }
+                  placeholder={
+                    inSubCommand
+                      ? `Enter <${currentSubCommand?.name}>`
+                      : 'Search for a command'
+                  }
+                  value={query}
+                  autoCapitalize="off"
+                  autoComplete="off"
+                  autoCorrect="off"
+                  spellCheck="false"
+                />
+              </div>
+            </div>
+            <Combobox.Options static className="overflow-y-auto max-h-96">
+              {filteredCommands?.map((commandResult) => (
+                <Combobox.Option
+                  key={commandResult.item.name}
+                  value={commandResult}
+                  className="px-2 py-1 my-2 first:mt-4 last:mb-4 ui-active:bg-liquid-10 dark:ui-active:bg-liquid-90"
+                >
+                  <p>{commandResult.item.name}</p>
+                  {(commandResult.item as SubCommand).description && (
+                    <p className="mt-0.5 text-liquid-70 dark:text-liquid-30 text-sm">
+                      {(commandResult.item as SubCommand).description}
+                    </p>
+                  )}
+                </Combobox.Option>
+              ))}
+            </Combobox.Options>
+          </Combobox>
+        </Transition.Child>
+      </Dialog>
+    </Transition.Root>
+  )
+}
+
+export default CommandBarProvider

src/components/CommandBar/CommandArgOptionInput.tsx

@@ -1,114 +0,0 @@
-import { Combobox } from '@headlessui/react'
-import Fuse from 'fuse.js'
-import { useCommandsContext } from 'hooks/useCommandsContext'
-import { CommandArgumentOption } from 'lib/commandTypes'
-import { useEffect, useRef, useState } from 'react'
-
-function CommandArgOptionInput({
-  options,
-  argName,
-  stepBack,
-  onSubmit,
-  placeholder,
-}: {
-  options: CommandArgumentOption<unknown>[]
-  argName: string
-  stepBack: () => void
-  onSubmit: (data: unknown) => void
-  placeholder?: string
-}) {
-  const { commandBarSend, commandBarState } = useCommandsContext()
-  const inputRef = useRef<HTMLInputElement>(null)
-  const formRef = useRef<HTMLFormElement>(null)
-  const [argValue, setArgValue] = useState<(typeof options)[number]['value']>(
-    options.find((o) => 'isCurrent' in o && o.isCurrent)?.value ||
-      commandBarState.context.argumentsToSubmit[argName] ||
-      options[0].value
-  )
-  const [query, setQuery] = useState('')
-  const [filteredOptions, setFilteredOptions] = useState<typeof options>()
-
-  const fuse = new Fuse(options, {
-    keys: ['name', 'description'],
-    threshold: 0.3,
-  })
-
-  useEffect(() => {
-    inputRef.current?.focus()
-    inputRef.current?.select()
-  }, [inputRef])
-
-  useEffect(() => {
-    const results = fuse.search(query).map((result) => result.item)
-    setFilteredOptions(query.length > 0 ? results : options)
-  }, [query])
-
-  function handleSelectOption(option: CommandArgumentOption<unknown>) {
-    setArgValue(option)
-    onSubmit(option.value)
-  }
-
-  function handleSubmit(e: React.FormEvent<HTMLFormElement>) {
-    e.preventDefault()
-    onSubmit(argValue)
-  }
-
-  return (
-    <form id="arg-form" onSubmit={handleSubmit} ref={formRef}>
-      <Combobox value={argValue} onChange={handleSelectOption} name="options">
-        <div className="flex items-center mx-4 mt-4 mb-2">
-          <label
-            htmlFor="option-input"
-            className="capitalize px-2 py-1 rounded-l bg-chalkboard-100 dark:bg-chalkboard-80 text-chalkboard-10 border-b border-b-chalkboard-100 dark:border-b-chalkboard-80"
-          >
-            {argName}
-          </label>
-          <Combobox.Input
-            id="option-input"
-            ref={inputRef}
-            onChange={(event) => setQuery(event.target.value)}
-            className="flex-grow px-2 py-1 border-b border-b-chalkboard-100 dark:border-b-chalkboard-80 !bg-transparent focus:outline-none"
-            onKeyDown={(event) => {
-              if (event.metaKey && event.key === 'k')
-                commandBarSend({ type: 'Close' })
-              if (event.key === 'Backspace' && !event.currentTarget.value) {
-                stepBack()
-              }
-            }}
-            placeholder={
-              (argValue as CommandArgumentOption<unknown>)?.name ||
-              placeholder ||
-              'Select an option for ' + argName
-            }
-            autoCapitalize="off"
-            autoComplete="off"
-            autoCorrect="off"
-            spellCheck="false"
-            autoFocus
-          />
-        </div>
-        <Combobox.Options
-          static
-          className="overflow-y-auto max-h-96 cursor-pointer"
-        >
-          {filteredOptions?.map((option) => (
-            <Combobox.Option
-              key={option.name}
-              value={option}
-              className="flex items-center gap-2 px-4 py-1 first:mt-2 last:mb-2 ui-active:bg-energy-10/50 dark:ui-active:bg-chalkboard-90"
-            >
-              <p className="flex-grow">{option.name} </p>
-              {'isCurrent' in option && option.isCurrent && (
-                <small className="text-chalkboard-70 dark:text-chalkboard-50">
-                  current
-                </small>
-              )}
-            </Combobox.Option>
-          ))}
-        </Combobox.Options>
-      </Combobox>
-    </form>
-  )
-}
-
-export default CommandArgOptionInput

src/components/CommandBar/CommandBar.tsx

@@ -1,166 +0,0 @@
-import { Dialog, Popover, Transition } from '@headlessui/react'
-import { Fragment, createContext, useEffect } from 'react'
-import { useHotkeys } from 'react-hotkeys-hook'
-import { useCommandsContext } from 'hooks/useCommandsContext'
-import { useMachine } from '@xstate/react'
-import { commandBarMachine } from 'machines/commandBarMachine'
-import { EventFrom, StateFrom } from 'xstate'
-import CommandBarArgument from './CommandBarArgument'
-import CommandComboBox from '../CommandComboBox'
-import { useLocation } from 'react-router-dom'
-import CommandBarReview from './CommandBarReview'
-
-type CommandsContextType = {
-  commandBarState: StateFrom<typeof commandBarMachine>
-  commandBarSend: (event: EventFrom<typeof commandBarMachine>) => void
-}
-
-export const CommandsContext = createContext<CommandsContextType>({
-  commandBarState: commandBarMachine.initialState,
-  commandBarSend: () => {},
-})
-
-export const CommandBarProvider = ({
-  children,
-}: {
-  children: React.ReactNode
-}) => {
-  const { pathname } = useLocation()
-  const [commandBarState, commandBarSend] = useMachine(commandBarMachine, {
-    guards: {
-      'Arguments are ready': (context, _) => {
-        return context.selectedCommand?.args
-          ? context.argumentsToSubmit.length ===
-              Object.keys(context.selectedCommand.args)?.length
-          : false
-      },
-      'Command has no arguments': (context, _event) => {
-        return (
-          !context.selectedCommand?.args ||
-          Object.keys(context.selectedCommand?.args).length === 0
-        )
-      },
-    },
-  })
-
-  // Close the command bar when navigating
-  useEffect(() => {
-    commandBarSend({ type: 'Close' })
-  }, [pathname])
-
-  return (
-    <CommandsContext.Provider
-      value={{
-        commandBarState,
-        commandBarSend,
-      }}
-    >
-      {children}
-      <CommandBar />
-    </CommandsContext.Provider>
-  )
-}
-
-const CommandBar = () => {
-  const { commandBarState, commandBarSend } = useCommandsContext()
-  const {
-    context: { selectedCommand, currentArgument, commands },
-  } = commandBarState
-  const isSelectionArgument = currentArgument?.inputType === 'selection'
-  const WrapperComponent = isSelectionArgument ? Popover : Dialog
-
-  useHotkeys(['mod+k', 'mod+/'], () => {
-    if (commandBarState.context.commands.length === 0) return
-    if (commandBarState.matches('Closed')) {
-      commandBarSend({ type: 'Open' })
-    } else {
-      commandBarSend({ type: 'Close' })
-    }
-  })
-
-  function stepBack() {
-    if (!currentArgument) {
-      if (commandBarState.matches('Review')) {
-        const entries = Object.entries(selectedCommand?.args || {})
-
-        commandBarSend({
-          type: commandBarState.matches('Review')
-            ? 'Edit argument'
-            : 'Change current argument',
-          data: {
-            arg: {
-              name: entries[entries.length - 1][0],
-              ...entries[entries.length - 1][1],
-            },
-          },
-        })
-      } else {
-        commandBarSend({ type: 'Deselect command' })
-      }
-    } else {
-      const entries = Object.entries(selectedCommand?.args || {})
-      const index = entries.findIndex(
-        ([key, _]) => key === currentArgument.name
-      )
-
-      if (index === 0) {
-        commandBarSend({ type: 'Deselect command' })
-      } else {
-        commandBarSend({
-          type: 'Change current argument',
-          data: {
-            arg: { name: entries[index - 1][0], ...entries[index - 1][1] },
-          },
-        })
-      }
-    }
-  }
-
-  return (
-    <Transition.Root
-      show={!commandBarState.matches('Closed') || false}
-      afterLeave={() => {
-        if (selectedCommand?.onCancel) selectedCommand.onCancel()
-        commandBarSend({ type: 'Clear' })
-      }}
-      as={Fragment}
-    >
-      <WrapperComponent
-        open={!commandBarState.matches('Closed') || isSelectionArgument}
-        onClose={() => {
-          commandBarSend({ type: 'Close' })
-        }}
-        className={
-          'fixed inset-0 z-50 overflow-y-auto pb-4 pt-1 ' +
-          (isSelectionArgument ? 'pointer-events-none' : '')
-        }
-      >
-        <Transition.Child
-          enter="duration-100 ease-out"
-          enterFrom="opacity-0 scale-95"
-          enterTo="opacity-100 scale-100"
-          leave="duration-75 ease-in"
-          leaveFrom="opacity-100 scale-100"
-          leaveTo="opacity-0 scale-95"
-        >
-          <WrapperComponent.Panel
-            className="relative z-50 pointer-events-auto w-full max-w-xl py-2 mx-auto border rounded shadow-lg bg-chalkboard-10 dark:bg-chalkboard-100 dark:border-chalkboard-70"
-            as="div"
-          >
-            {commandBarState.matches('Selecting command') ? (
-              <CommandComboBox options={commands} />
-            ) : commandBarState.matches('Gathering arguments') ? (
-              <CommandBarArgument stepBack={stepBack} />
-            ) : (
-              commandBarState.matches('Review') && (
-                <CommandBarReview stepBack={stepBack} />
-              )
-            )}
-          </WrapperComponent.Panel>
-        </Transition.Child>
-      </WrapperComponent>
-    </Transition.Root>
-  )
-}
-
-export default CommandBarProvider

src/components/CommandBar/CommandBarArgument.tsx

@@ -1,80 +0,0 @@
-import CommandArgOptionInput from './CommandArgOptionInput'
-import CommandBarBasicInput from './CommandBarBasicInput'
-import CommandBarSelectionInput from './CommandBarSelectionInput'
-import { CommandArgument } from 'lib/commandTypes'
-import { useCommandsContext } from 'hooks/useCommandsContext'
-import CommandBarHeader from './CommandBarHeader'
-
-function CommandBarArgument({ stepBack }: { stepBack: () => void }) {
-  const { commandBarState, commandBarSend } = useCommandsContext()
-  const {
-    context: { currentArgument },
-  } = commandBarState
-
-  function onSubmit(data: unknown) {
-    if (!currentArgument) return
-
-    commandBarSend({
-      type: 'Submit argument',
-      data: {
-        [currentArgument.name]:
-          currentArgument.inputType === 'number'
-            ? parseFloat((data as string) || '0')
-            : data,
-      },
-    })
-  }
-
-  return (
-    currentArgument && (
-      <CommandBarHeader>
-        <ArgumentInput
-          arg={currentArgument}
-          stepBack={stepBack}
-          onSubmit={onSubmit}
-        />
-      </CommandBarHeader>
-    )
-  )
-}
-
-export default CommandBarArgument
-
-function ArgumentInput({
-  arg,
-  stepBack,
-  onSubmit,
-}: {
-  arg: CommandArgument<unknown> & { name: string }
-  stepBack: () => void
-  onSubmit: (event: any) => void
-}) {
-  switch (arg.inputType) {
-    case 'options':
-      return (
-        <CommandArgOptionInput
-          options={arg.options}
-          argName={arg.name}
-          stepBack={stepBack}
-          onSubmit={onSubmit}
-          placeholder="Select an option"
-        />
-      )
-    case 'selection':
-      return (
-        <CommandBarSelectionInput
-          arg={arg}
-          stepBack={stepBack}
-          onSubmit={onSubmit}
-        />
-      )
-    default:
-      return (
-        <CommandBarBasicInput
-          arg={arg}
-          stepBack={stepBack}
-          onSubmit={onSubmit}
-        />
-      )
-  }
-}

src/components/CommandBar/CommandBarBasicInput.tsx

@@ -1,66 +0,0 @@
-import { useCommandsContext } from 'hooks/useCommandsContext'
-import { CommandArgument } from 'lib/commandTypes'
-import { useEffect, useRef } from 'react'
-import { useHotkeys } from 'react-hotkeys-hook'
-
-function CommandBarBasicInput({
-  arg,
-  stepBack,
-  onSubmit,
-}: {
-  arg: CommandArgument<unknown> & {
-    inputType: 'number' | 'string'
-    name: string
-  }
-  stepBack: () => void
-  onSubmit: (event: unknown) => void
-}) {
-  const { commandBarSend, commandBarState } = useCommandsContext()
-  useHotkeys('mod + k, mod + /', () => commandBarSend({ type: 'Close' }))
-  const inputRef = useRef<HTMLInputElement>(null)
-  const inputType = arg.inputType === 'number' ? 'number' : 'text'
-
-  useEffect(() => {
-    if (inputRef.current) {
-      inputRef.current.focus()
-      inputRef.current.select()
-    }
-  }, [arg, inputRef])
-
-  function handleSubmit(e: React.FormEvent<HTMLFormElement>) {
-    e.preventDefault()
-    onSubmit(inputRef.current?.value)
-  }
-
-  return (
-    <form id="arg-form" onSubmit={handleSubmit}>
-      <label className="flex items-center mx-4 my-4">
-        <span className="capitalize px-2 py-1 rounded-l bg-chalkboard-100 dark:bg-chalkboard-80 text-chalkboard-10 border-b border-b-chalkboard-100 dark:border-b-chalkboard-80">
-          {arg.name}
-        </span>
-        <input
-          id="arg-form"
-          name={inputType}
-          ref={inputRef}
-          type={inputType}
-          required
-          className="flex-grow px-2 py-1 border-b border-b-chalkboard-100 dark:border-b-chalkboard-80 !bg-transparent focus:outline-none"
-          placeholder="Enter a value"
-          defaultValue={
-            (commandBarState.context.argumentsToSubmit[arg.name] as
-              | string
-              | undefined) || (arg.defaultValue as string)
-          }
-          onKeyDown={(event) => {
-            if (event.key === 'Backspace' && !event.currentTarget.value) {
-              stepBack()
-            }
-          }}
-          autoFocus
-        />
-      </label>
-    </form>
-  )
-}
-
-export default CommandBarBasicInput

src/components/CommandBar/CommandBarHeader.tsx

@@ -1,171 +0,0 @@
-import { useCommandsContext } from 'hooks/useCommandsContext'
-import { CustomIcon } from '../CustomIcon'
-import React, { useState } from 'react'
-import { ActionButton } from '../ActionButton'
-import { Selections, getSelectionTypeDisplayText } from 'lib/selections'
-import { useHotkeys } from 'react-hotkeys-hook'
-
-function CommandBarHeader({ children }: React.PropsWithChildren<{}>) {
-  const { commandBarState, commandBarSend } = useCommandsContext()
-  const {
-    context: { selectedCommand, currentArgument, argumentsToSubmit },
-  } = commandBarState
-  const isReviewing = commandBarState.matches('Review')
-  const [showShortcuts, setShowShortcuts] = useState(false)
-
-  useHotkeys(
-    'alt',
-    () => setShowShortcuts(true),
-    { enableOnFormTags: true, enableOnContentEditable: true },
-    [showShortcuts]
-  )
-  useHotkeys(
-    'alt',
-    () => setShowShortcuts(false),
-    { keyup: true, enableOnFormTags: true, enableOnContentEditable: true },
-    [showShortcuts]
-  )
-  useHotkeys(
-    [
-      'alt+1',
-      'alt+2',
-      'alt+3',
-      'alt+4',
-      'alt+5',
-      'alt+6',
-      'alt+7',
-      'alt+8',
-      'alt+9',
-      'alt+0',
-    ],
-    (_, b) => {
-      if (b.keys && !Number.isNaN(parseInt(b.keys[0], 10))) {
-        if (!selectedCommand?.args) return
-        const argName = Object.keys(selectedCommand.args)[
-          parseInt(b.keys[0], 10) - 1
-        ]
-        const arg = selectedCommand?.args[argName]
-        commandBarSend({
-          type: 'Change current argument',
-          data: { arg: { ...arg, name: argName } },
-        })
-      }
-    },
-    { keyup: true, enableOnFormTags: true, enableOnContentEditable: true },
-    [argumentsToSubmit, selectedCommand]
-  )
-
-  return (
-    selectedCommand &&
-    argumentsToSubmit && (
-      <>
-        <div className="px-4 text-sm flex gap-4 items-start">
-          <div className="flex flex-1 flex-wrap gap-2">
-            <p
-              data-command-name={selectedCommand?.name}
-              className="pr-4 flex gap-2 items-center"
-            >
-              {selectedCommand &&
-                'icon' in selectedCommand &&
-                selectedCommand.icon && (
-                  <CustomIcon name={selectedCommand.icon} className="w-5 h-5" />
-                )}
-              {selectedCommand?.name}
-            </p>
-            {Object.entries(selectedCommand?.args || {}).map(
-              ([argName, arg], i) => (
-                <button
-                  disabled={!isReviewing && currentArgument?.name === argName}
-                  onClick={() => {
-                    commandBarSend({
-                      type: isReviewing
-                        ? 'Edit argument'
-                        : 'Change current argument',
-                      data: { arg: { ...arg, name: argName } },
-                    })
-                  }}
-                  key={argName}
-                  className={`relative w-fit px-2 py-1 rounded-sm flex gap-2 items-center border ${
-                    argName === currentArgument?.name
-                      ? 'disabled:bg-energy-10/50 dark:disabled:bg-energy-10/20 disabled:border-energy-10 dark:disabled:border-energy-10 disabled:text-chalkboard-100 dark:disabled:text-chalkboard-10'
-                      : 'bg-chalkboard-20/50 dark:bg-chalkboard-80/50 border-chalkboard-20 dark:border-chalkboard-80'
-                  }`}
-                >
-                  {argumentsToSubmit[argName] ? (
-                    arg.inputType === 'selection' ? (
-                      getSelectionTypeDisplayText(
-                        argumentsToSubmit[argName] as Selections
-                      )
-                    ) : typeof argumentsToSubmit[argName] === 'object' ? (
-                      JSON.stringify(argumentsToSubmit[argName])
-                    ) : (
-                      argumentsToSubmit[argName]
-                    )
-                  ) : arg.payload ? (
-                    arg.inputType === 'selection' ? (
-                      getSelectionTypeDisplayText(arg.payload as Selections)
-                    ) : typeof arg.payload === 'object' ? (
-                      JSON.stringify(arg.payload)
-                    ) : (
-                      arg.payload
-                    )
-                  ) : (
-                    <em>{argName}</em>
-                  )}
-                  {showShortcuts && (
-                    <small className="absolute -top-[1px] right-full translate-x-1/2 px-0.5 rounded-sm bg-chalkboard-80 text-chalkboard-10 dark:bg-energy-10 dark:text-chalkboard-100">
-                      <span className="sr-only">Hotkey: </span>
-                      {i + 1}
-                    </small>
-                  )}
-                </button>
-              )
-            )}
-          </div>
-          {isReviewing ? <ReviewingButton /> : <GatheringArgsButton />}
-        </div>
-        <div className="block w-full my-2 h-[1px] bg-chalkboard-20 dark:bg-chalkboard-80" />
-        {children}
-      </>
-    )
-  )
-}
-
-function ReviewingButton() {
-  return (
-    <ActionButton
-      Element="button"
-      autoFocus
-      type="submit"
-      form="review-form"
-      className="w-fit !p-0 rounded-sm border !border-chalkboard-100 dark:!border-energy-10 hover:shadow"
-      icon={{
-        icon: 'checkmark',
-        bgClassName:
-          'p-1 rounded-sm !bg-chalkboard-100 hover:!bg-chalkboard-110 dark:!bg-energy-20 dark:hover:!bg-energy-10',
-        iconClassName: '!text-energy-10 dark:!text-chalkboard-100',
-      }}
-    >
-      <span className="sr-only">Submit command</span>
-    </ActionButton>
-  )
-}
-
-function GatheringArgsButton() {
-  return (
-    <ActionButton
-      Element="button"
-      type="submit"
-      form="arg-form"
-      className="w-fit !p-0 rounded-sm"
-      icon={{
-        icon: 'arrowRight',
-        bgClassName: 'p-1 rounded-sm',
-      }}
-    >
-      <span className="sr-only">Continue</span>
-    </ActionButton>
-  )
-}
-
-export default CommandBarHeader

src/components/CommandBar/CommandBarReview.tsx

@@ -1,81 +0,0 @@
-import { useCommandsContext } from 'hooks/useCommandsContext'
-import CommandBarHeader from './CommandBarHeader'
-import { useHotkeys } from 'react-hotkeys-hook'
-
-function CommandBarReview({ stepBack }: { stepBack: () => void }) {
-  const { commandBarState, commandBarSend } = useCommandsContext()
-  const {
-    context: { argumentsToSubmit, selectedCommand },
-  } = commandBarState
-
-  useHotkeys('backspace', stepBack, {
-    enableOnFormTags: true,
-    enableOnContentEditable: true,
-  })
-
-  useHotkeys(
-    '1, 2, 3, 4, 5, 6, 7, 8, 9, 0',
-    (_, b) => {
-      if (b.keys && !Number.isNaN(parseInt(b.keys[0], 10))) {
-        if (!selectedCommand?.args) return
-        const argName = Object.keys(selectedCommand.args)[
-          parseInt(b.keys[0], 10) - 1
-        ]
-        const arg = selectedCommand?.args[argName]
-        commandBarSend({
-          type: 'Edit argument',
-          data: { arg: { ...arg, name: argName } },
-        })
-      }
-    },
-    { keyup: true, enableOnFormTags: true, enableOnContentEditable: true },
-    [argumentsToSubmit, selectedCommand]
-  )
-
-  Object.keys(argumentsToSubmit).forEach((key, i) => {
-    const arg = selectedCommand?.args ? selectedCommand?.args[key] : undefined
-    if (!arg) return
-  })
-
-  function submitCommand() {
-    commandBarSend({
-      type: 'Submit command',
-      data: argumentsToSubmit,
-    })
-  }
-
-  return (
-    <CommandBarHeader>
-      <p className="px-4">Confirm {selectedCommand?.name}</p>
-      <form
-        id="review-form"
-        className="absolute opacity-0 inset-0 pointer-events-none"
-        onSubmit={submitCommand}
-      >
-        {Object.entries(argumentsToSubmit).map(([key, value], i) => {
-          const arg = selectedCommand?.args
-            ? selectedCommand?.args[key]
-            : undefined
-          if (!arg) return null
-
-          return (
-            <input
-              id={key}
-              name={key}
-              key={key}
-              type="text"
-              defaultValue={
-                typeof value === 'object'
-                  ? JSON.stringify(value)
-                  : (value as string)
-              }
-              hidden
-            />
-          )
-        })}
-      </form>
-    </CommandBarHeader>
-  )
-}
-
-export default CommandBarReview

src/components/CommandBar/CommandBarSelectionInput.tsx

@@ -1,114 +0,0 @@
-import { useSelector } from '@xstate/react'
-import { useCommandsContext } from 'hooks/useCommandsContext'
-import { useKclContext } from 'lang/KclSinglton'
-import { CommandArgument } from 'lib/commandTypes'
-import {
-  ResolvedSelectionType,
-  canSubmitSelectionArg,
-  getSelectionType,
-  getSelectionTypeDisplayText,
-} from 'lib/selections'
-import { modelingMachine } from 'machines/modelingMachine'
-import { useEffect, useRef, useState } from 'react'
-import { useHotkeys } from 'react-hotkeys-hook'
-import { StateFrom } from 'xstate'
-
-const selectionSelector = (snapshot: StateFrom<typeof modelingMachine>) =>
-  snapshot.context.selectionRanges
-
-function CommandBarSelectionInput({
-  arg,
-  stepBack,
-  onSubmit,
-}: {
-  arg: CommandArgument<unknown> & { inputType: 'selection'; name: string }
-  stepBack: () => void
-  onSubmit: (data: unknown) => void
-}) {
-  const { code } = useKclContext()
-  const inputRef = useRef<HTMLInputElement>(null)
-  const { commandBarSend } = useCommandsContext()
-  const [hasSubmitted, setHasSubmitted] = useState(false)
-  const selection = useSelector(arg.actor, selectionSelector)
-  const [selectionsByType, setSelectionsByType] = useState<
-    'none' | ResolvedSelectionType[]
-  >(
-    selection.codeBasedSelections[0]?.range[1] === code.length
-      ? 'none'
-      : getSelectionType(selection)
-  )
-  const [canSubmitSelection, setCanSubmitSelection] = useState<boolean>(
-    canSubmitSelectionArg(selectionsByType, arg)
-  )
-
-  useHotkeys('tab', () => onSubmit(selection), {
-    enableOnFormTags: true,
-    enableOnContentEditable: true,
-    keyup: true,
-  })
-
-  useEffect(() => {
-    inputRef.current?.focus()
-  }, [selection, inputRef])
-
-  useEffect(() => {
-    setSelectionsByType(
-      selection.codeBasedSelections[0]?.range[1] === code.length
-        ? 'none'
-        : getSelectionType(selection)
-    )
-  }, [selection])
-
-  useEffect(() => {
-    setCanSubmitSelection(canSubmitSelectionArg(selectionsByType, arg))
-  }, [selectionsByType, arg])
-
-  function handleChange() {
-    inputRef.current?.focus()
-  }
-
-  function handleSubmit(e: React.FormEvent<HTMLFormElement>) {
-    e.preventDefault()
-
-    if (!canSubmitSelection) {
-      setHasSubmitted(true)
-      return
-    }
-
-    onSubmit(selection)
-  }
-
-  return (
-    <form id="arg-form" onSubmit={handleSubmit}>
-      <label
-        className={
-          'relative flex items-center mx-4 my-4 ' +
-          (!hasSubmitted || canSubmitSelection || 'text-destroy-50')
-        }
-      >
-        {canSubmitSelection
-          ? getSelectionTypeDisplayText(selection) + ' selected'
-          : `Please select ${arg.multiple ? 'one or more faces' : 'one face'}`}
-        <input
-          id="selection"
-          name="selection"
-          ref={inputRef}
-          required
-          placeholder="Select an entity with your mouse"
-          className="absolute inset-0 w-full h-full opacity-0 cursor-pointer"
-          onKeyDown={(event) => {
-            if (event.key === 'Backspace') {
-              stepBack()
-            } else if (event.key === 'Escape') {
-              commandBarSend({ type: 'Close' })
-            }
-          }}
-          onChange={handleChange}
-          value={JSON.stringify(selection || {})}
-        />
-      </label>
-    </form>
-  )
-}
-
-export default CommandBarSelectionInput

src/components/CommandComboBox.tsx

@@ -1,90 +0,0 @@
-import { Combobox } from '@headlessui/react'
-import Fuse from 'fuse.js'
-import { useCommandsContext } from 'hooks/useCommandsContext'
-import { Command } from 'lib/commandTypes'
-import { useEffect, useState } from 'react'
-import { CustomIcon } from './CustomIcon'
-
-function CommandComboBox({
-  options,
-  placeholder,
-}: {
-  options: Command[]
-  placeholder?: string
-}) {
-  const { commandBarSend } = useCommandsContext()
-  const [query, setQuery] = useState('')
-  const [filteredOptions, setFilteredOptions] = useState<typeof options>()
-
-  const defaultOption =
-    options.find((o) => 'isCurrent' in o && o.isCurrent) || null
-
-  const fuse = new Fuse(options, {
-    keys: ['name', 'description'],
-    threshold: 0.3,
-  })
-
-  useEffect(() => {
-    const results = fuse.search(query).map((result) => result.item)
-    setFilteredOptions(query.length > 0 ? results : options)
-  }, [query])
-
-  function handleSelection(command: Command) {
-    commandBarSend({ type: 'Select command', data: { command } })
-  }
-
-  return (
-    <Combobox defaultValue={defaultOption} onChange={handleSelection}>
-      <div className="flex items-center gap-2 px-4 pb-2 border-solid border-0 border-b border-b-chalkboard-20 dark:border-b-chalkboard-80">
-        <CustomIcon
-          name="search"
-          className="w-5 h-5 bg-energy-10/50 dark:bg-chalkboard-90 dark:text-energy-10"
-        />
-        <Combobox.Input
-          onChange={(event) => setQuery(event.target.value)}
-          className="w-full bg-transparent focus:outline-none selection:bg-energy-10/50 dark:selection:bg-energy-10/20 dark:focus:outline-none"
-          onKeyDown={(event) => {
-            if (
-              (event.metaKey && event.key === 'k') ||
-              (event.key === 'Backspace' && !event.currentTarget.value)
-            ) {
-              commandBarSend({ type: 'Close' })
-            }
-          }}
-          placeholder={
-            (defaultOption && defaultOption.name) ||
-            placeholder ||
-            'Search commands'
-          }
-          autoCapitalize="off"
-          autoComplete="off"
-          autoCorrect="off"
-          spellCheck="false"
-          autoFocus
-        />
-      </div>
-      <Combobox.Options
-        static
-        className="overflow-y-auto max-h-96 cursor-pointer"
-      >
-        {filteredOptions?.map((option) => (
-          <Combobox.Option
-            key={option.name}
-            value={option}
-            className="flex items-center gap-2 px-4 py-1 first:mt-2 last:mb-2 ui-active:bg-energy-10/50 dark:ui-active:bg-chalkboard-90"
-          >
-            {'icon' in option && option.icon && (
-              <CustomIcon
-                name={option.icon}
-                className="w-5 h-5 dark:text-energy-10"
-              />
-            )}
-            <p className="flex-grow">{option.name} </p>
-          </Combobox.Option>
-        ))}
-      </Combobox.Options>
-    </Combobox>
-  )
-}
-
-export default CommandComboBox

src/components/CustomIcon.tsx

@@ -1,22 +1,11 @@
 export type CustomIconName =
-  | 'arrowDown'
-  | 'arrowLeft'
-  | 'arrowRight'
-  | 'arrowUp'
-  | 'checkmark'
-  | 'close'
   | 'equal'
+  | 'exit'
   | 'extrude'
-  | 'file'
-  | 'filePlus'
-  | 'folder'
-  | 'folderPlus'
-  | 'gear'
   | 'horizontal'
   | 'line'
   | 'move'
   | 'parallel'
-  | 'search'
   | 'sketch'
   | 'vertical'
 
@@ -27,102 +16,6 @@ export const CustomIcon = ({
   name: CustomIconName
 } & React.SVGProps<SVGSVGElement>) => {
   switch (name) {
-    case 'arrowDown':
-      return (
-        <svg
-          {...props}
-          viewBox="0 0 20 20"
-          fill="none"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            fillRule="evenodd"
-            clipRule="evenodd"
-            d="M10 17.7071L9.64648 17.3535L6.14648 13.8535L6.85359 13.1464L9.50004 15.7929V2.99997H10.5V15.7929L13.1465 13.1464L13.8536 13.8535L10.3536 17.3535L10 17.7071Z"
-            fill="currentColor"
-          />
-        </svg>
-      )
-    case 'arrowLeft':
-      return (
-        <svg
-          {...props}
-          viewBox="0 0 20 20"
-          fill="none"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            fillRule="evenodd"
-            clipRule="evenodd"
-            d="M2.29291 10L2.64646 9.64645L6.14646 6.14645L6.85357 6.85356L4.20712 9.50001L17 9.50001V10.5L4.20712 10.5L6.85357 13.1465L6.14646 13.8536L2.64646 10.3536L2.29291 10Z"
-            fill="currentColor"
-          />
-        </svg>
-      )
-    case 'arrowRight':
-      return (
-        <svg
-          {...props}
-          viewBox="0 0 20 20"
-          fill="none"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            fillRule="evenodd"
-            clipRule="evenodd"
-            d="M17.7071 10L17.3536 10.3536L13.8536 13.8536L13.1464 13.1465L15.7929 10.5H3V9.50001H15.7929L13.1464 6.85356L13.8536 6.14645L17.3536 9.64645L17.7071 10Z"
-            fill="currentColor"
-          />
-        </svg>
-      )
-    case 'arrowUp':
-      return (
-        <svg
-          {...props}
-          viewBox="0 0 20 20"
-          fill="none"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            fillRule="evenodd"
-            clipRule="evenodd"
-            d="M10 2.29288L10.3536 2.64643L13.8536 6.14643L13.1465 6.85354L10.5 4.20709V17H9.50004V4.20709L6.85359 6.85354L6.14648 6.14643L9.64648 2.64643L10 2.29288Z"
-            fill="currentColor"
-          />
-        </svg>
-      )
-    case 'checkmark':
-      return (
-        <svg
-          {...props}
-          viewBox="0 0 20 20"
-          fill="none"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            fillRule="evenodd"
-            clipRule="evenodd"
-            d="M8.29956 13.5388L13.9537 6L14.7537 6.6L8.75367 14.6L8.00012 14.6536L5 11.6536L5.70709 10.9465L8.29956 13.5388Z"
-            fill="currentColor"
-          />
-        </svg>
-      )
-    case 'close':
-      return (
-        <svg
-          {...props}
-          viewBox="0 0 20 20"
-          fill="none"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            fillRule="evenodd"
-            clipRule="evenodd"
-            d="M9.2929 10L6.46448 7.17158L7.17158 6.46448L10 9.2929L12.8284 6.46448L13.5355 7.17158L10.7071 10L13.5355 12.8284L12.8284 13.5355L10 10.7071L7.17158 13.5355L6.46448 12.8284L9.2929 10Z"
-            fill="currentColor"
-          />
-        </svg>
-      )
     case 'equal':
       return (
         <svg
@@ -137,6 +30,21 @@ export const CustomIcon = ({
           />
         </svg>
       )
+    case 'exit':
+      return (
+        <svg
+          {...props}
+          viewBox="0 0 20 20"
+          fill="none"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M17 10L3 10M3 10L6.5 6.5M3 10L6.5 13.5"
+            stroke="currentColor"
+          />
+        </svg>
+      )
+
     case 'extrude':
       return (
         <svg
@@ -153,86 +61,6 @@ export const CustomIcon = ({
           />
         </svg>
       )
-    case 'file':
-      return (
-        <svg
-          {...props}
-          viewBox="0 0 20 20"
-          fill="none"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            fillRule="evenodd"
-            clipRule="evenodd"
-            d="M4 3H4.5H11H11.2071L11.3536 3.14645L15.8536 7.64646L16 7.7929V8.00001V16.5V17H15.5H4.5H4V16.5V3.5V3ZM5 4V16H15V8.50001H11H10.5V8.00001V4H5ZM11.5 4.70711L14.2929 7.50001H11.5V4.70711Z"
-            fill="currentColor"
-          />
-        </svg>
-      )
-    case 'filePlus':
-      return (
-        <svg
-          {...props}
-          viewBox="0 0 20 20"
-          fill="none"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            fillRule="evenodd"
-            clipRule="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="currentColor"
-          />
-        </svg>
-      )
-    case 'folder':
-      return (
-        <svg
-          {...props}
-          viewBox="0 0 20 20"
-          fill="none"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            fillRule="evenodd"
-            clipRule="evenodd"
-            d="M3.5 3.5H4H7H7.16667L7.3 3.6L9.16667 5H16H16.5V5.5V7.5V16V16.5H16H4H3.5V16V7.5V4V3.5ZM4.5 4.5V7H15.5V6H9H8.83333L8.7 5.9L6.83333 4.5H4.5ZM15.5 8H4.5V15.5H15.5V8Z"
-            fill="currentColor"
-          />
-        </svg>
-      )
-    case 'folderPlus':
-      return (
-        <svg
-          {...props}
-          viewBox="0 0 20 20"
-          fill="none"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            fillRule="evenodd"
-            clipRule="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="currentColor"
-          />
-        </svg>
-      )
-    case 'gear':
-      return (
-        <svg
-          {...props}
-          viewBox="0 0 20 20"
-          fill="none"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            fillRule="evenodd"
-            clipRule="evenodd"
-            d="M8.61477 3.0884L5.87402 4.67077L6.50004 5.75505L5.25004 7.92011H4.0047V11.07H5.25004L6.50004 13.2351L5.86973 14.3268L8.62776 15.9191L9.24503 14.85H11.745L12.3647 15.9234L15.1416 14.3202L14.5151 13.2351L15.7651 11.07H16.9951V7.92011H15.7651L14.5151 5.75505L15.1373 4.67741L12.3778 3.08423L11.7451 4.18012H9.24508L8.61477 3.0884ZM10.4999 13C12.4329 13 13.9999 11.433 13.9999 9.50003C13.9999 7.56703 12.4329 6.00003 10.4999 6.00003C8.56687 6.00003 6.99986 7.56703 6.99986 9.50003C6.99986 11.433 8.56687 13 10.4999 13Z"
-            fill="currentColor"
-          />
-        </svg>
-      )
     case 'horizontal':
       return (
         <svg
@@ -297,22 +125,6 @@ export const CustomIcon = ({
           />
         </svg>
       )
-    case 'search':
-      return (
-        <svg
-          {...props}
-          viewBox="0 0 20 20"
-          fill="none"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            fillRule="evenodd"
-            clipRule="evenodd"
-            d="M14.016 9.00482C14.016 10.662 12.6731 12.0048 11.0172 12.0048C9.3613 12.0048 8.01841 10.662 8.01841 9.00482C8.01841 7.34768 9.3613 6.00482 11.0172 6.00482C12.6731 6.00482 14.016 7.34768 14.016 9.00482ZM15.016 9.00482C15.016 11.214 13.2257 13.0048 11.0172 13.0048C10.082 13.0048 9.22178 12.6837 8.54074 12.1456L5.6912 14.9952L4.98409 14.2881L7.83921 11.433C7.32431 10.7597 7.01841 9.91799 7.01841 9.00482C7.01841 6.79568 8.80873 5.00482 11.0172 5.00482C13.2257 5.00482 15.016 6.79568 15.016 9.00482Z"
-            fill="currentColor"
-          />
-        </svg>
-      )
     case 'sketch':
       return (
         <svg

src/components/DebugPanel.tsx

@@ -1,20 +1,104 @@
 import { CollapsiblePanel, CollapsiblePanelProps } from './CollapsiblePanel'
+import { useStore } from '../useStore'
+import { v4 as uuidv4 } from 'uuid'
+import { EngineCommand } from '../lang/std/engineConnection'
+import { useState } from 'react'
+import { ActionButton } from '../components/ActionButton'
+import { faCheck } from '@fortawesome/free-solid-svg-icons'
+import { isReducedMotion } from 'lang/util'
 import { AstExplorer } from './AstExplorer'
-import { EngineCommands } from './EngineCommands'
+
+type SketchModeCmd = Extract<
+  Extract<EngineCommand, { type: 'modeling_cmd_req' }>['cmd'],
+  { type: 'default_camera_enable_sketch_mode' }
+>
 
 export const DebugPanel = ({ className, ...props }: CollapsiblePanelProps) => {
+  const { engineCommandManager } = useStore((s) => ({
+    engineCommandManager: s.engineCommandManager,
+  }))
+  const [sketchModeCmd, setSketchModeCmd] = useState<SketchModeCmd>({
+    type: 'default_camera_enable_sketch_mode',
+    origin: { x: 0, y: 0, z: 0 },
+    x_axis: { x: 1, y: 0, z: 0 },
+    y_axis: { x: 0, y: 1, z: 0 },
+    distance_to_plane: 100,
+    ortho: true,
+    animated: !isReducedMotion(),
+  })
+  if (!sketchModeCmd) return null
   return (
     <CollapsiblePanel
       {...props}
       className={
-        '!absolute overflow-auto !h-auto bottom-5 right-5 ' + className
+        '!absolute overflow-hidden !h-auto bottom-5 right-5 ' + className
       }
       // header height, top-5, and bottom-5
       style={{ maxHeight: 'calc(100% - 3rem - 1.25rem - 1.25rem)' }}
-      detailsTestId="debug-panel"
     >
       <section className="p-4 flex flex-col gap-4">
-        <EngineCommands />
+        <Xyz
+          onChange={setSketchModeCmd}
+          pointKey="origin"
+          data={sketchModeCmd}
+        />
+        <Xyz
+          onChange={setSketchModeCmd}
+          pointKey="x_axis"
+          data={sketchModeCmd}
+        />
+        <Xyz
+          onChange={setSketchModeCmd}
+          pointKey="y_axis"
+          data={sketchModeCmd}
+        />
+        <div className="flex">
+          <div className="pr-4">distance_to_plane</div>
+          <input
+            className="w-16 dark:bg-chalkboard-90"
+            type="number"
+            value={sketchModeCmd.distance_to_plane}
+            onChange={({ target }) => {
+              setSketchModeCmd({
+                ...sketchModeCmd,
+                distance_to_plane: Number(target.value),
+              })
+            }}
+          />
+          <div className="pr-4">ortho</div>
+          <input
+            className="w-16"
+            type="checkbox"
+            checked={sketchModeCmd.ortho}
+            onChange={(a) => {
+              console.log(a, (a as any).checked)
+              setSketchModeCmd({
+                ...sketchModeCmd,
+                ortho: a.target.checked,
+              })
+            }}
+          />
+        </div>
+        <ActionButton
+          Element="button"
+          onClick={() => {
+            engineCommandManager?.sendSceneCommand({
+              type: 'modeling_cmd_req',
+              cmd: sketchModeCmd,
+              cmd_id: uuidv4(),
+            })
+          }}
+          className="hover:border-succeed-50"
+          icon={{
+            icon: faCheck,
+            bgClassName:
+              'bg-succeed-80 group-hover:bg-succeed-70 hover:bg-succeed-70',
+            iconClassName:
+              'text-succeed-20 group-hover:text-succeed-10 hover:text-succeed-10',
+          }}
+        >
+          Send sketch mode command
+        </ActionButton>
         <div style={{ height: '400px' }} className="overflow-y-auto">
           <AstExplorer />
         </div>
@@ -22,3 +106,41 @@ export const DebugPanel = ({ className, ...props }: CollapsiblePanelProps) => {
     </CollapsiblePanel>
   )
 }
+
+const Xyz = ({
+  pointKey,
+  data,
+  onChange,
+}: {
+  pointKey: 'origin' | 'y_axis' | 'x_axis'
+  data: SketchModeCmd
+  onChange: (a: SketchModeCmd) => void
+}) => {
+  if (!data) return null
+  return (
+    <div className="flex">
+      <div className="pr-4">{pointKey}</div>
+      {Object.entries(data[pointKey]).map(([axis, val]) => {
+        return (
+          <div key={axis} className="flex">
+            <div className="w-4">{axis}</div>
+            <input
+              className="w-16 dark:bg-chalkboard-90"
+              type="number"
+              value={val}
+              onChange={({ target }) => {
+                onChange({
+                  ...data,
+                  [pointKey]: {
+                    ...data[pointKey],
+                    [axis]: Number(target.value),
+                  },
+                })
+              }}
+            />
+          </div>
+        )
+      })}
+    </div>
+  )
+}