Bump to v0.4.0 (#413)

* Add macOS universal release builds
Fixes #397

* Change macos to universal-apple-darwin

* Upload universal-apple-darwin/release

* Clean up

* Clean up

.env.development

@@ -0,0 +1,7 @@
+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_CONNECTION_WEBRTC_REPORT_STATS_MS=0
+VITE_KC_SENTRY_DSN=

.env.production

@@ -0,0 +1,7 @@
+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_CONNECTION_WEBRTC_REPORT_STATS_MS=30000
+VITE_KC_SENTRY_DSN=https://a814f2f66734989a90367f48feee28ca@o1042111.ingest.sentry.io/4505789425844224

.eslintignore

@@ -0,0 +1 @@
+src/wasm-lib/*

.eslintrc

@@ -0,0 +1,16 @@
+{
+    "plugins": [
+      "css-modules"
+    ],
+    "extends": [
+      "react-app",
+      "react-app/jest",
+      "plugin:css-modules/recommended"
+    ],
+    "rules": {
+      "semi": [
+        "error",
+        "never"
+      ]
+    }
+}

.github/dependabot.yml

@@ -0,0 +1,23 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+    - package-ecosystem: 'npm' # See documentation for possible values
+      directory: '/' # Location of package manifests
+      schedule:
+          interval: 'daily'
+    - package-ecosystem: 'github-actions' # See documentation for possible values
+      directory: '/' # Location of package manifests
+      schedule:
+          interval: 'daily'
+    - package-ecosystem: 'cargo' # See documentation for possible values
+      directory: '/src/wasm-lib/' # Location of package manifests
+      schedule:
+          interval: 'daily'
+    - package-ecosystem: 'cargo' # See documentation for possible values
+      directory: '/src-tauri/' # Location of package manifests
+      schedule:
+          interval: 'daily'

.github/workflows/build.yml

@@ -1,73 +0,0 @@
-name: Build
-
-on:
-  push:
-    tags:
-      - 'v*'
-  pull_request:
-
-jobs:
-  build:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
-    steps:
-      - uses: actions/checkout@v2
-      - name: install ubuntu system dependencies
-        if: matrix.os == 'ubuntu-latest'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev libwebkit2gtk-4.0-dev patchelf
-        # libgdk-pixbuf2.0-dev libsoup2.4-dev libjavascriptcoregtk-4.0-dev
-      - name: Sync node version and setup cache
-        uses: actions/setup-node@v3
-        with:
-          node-version: '18.x'
-          cache: 'yarn' # Set this to npm, yarn or pnpm.
-      - run: yarn install
-      - name: Rust setup
-        uses: dtolnay/rust-toolchain@stable
-      - name: wasm prep
-        shell: bash
-        run: |
-          mkdir src/wasm-lib/pkg; cd src/wasm-lib
-          npx wasm-pack build --target web --out-dir pkg
-          cd ../../
-          cp src/wasm-lib/pkg/wasm_lib_bg.wasm public
-      - name: macos sed
-        if: matrix.os == 'macos-latest'
-        shell: bash
-        run: |
-          sed -i '' 's/import.meta.url//g' "./src/wasm-lib/pkg/wasm_lib.js"
-      - name: ubuntu and windows sed
-        if: matrix.os != 'macos-latest'
-        shell: bash
-        run: |
-          sed -i 's/import.meta.url//g' "./src/wasm-lib/pkg/wasm_lib.js"
-      - name: add missing import
-        shell: bash
-        run: |
-          yarn add-missing-import
-          pwd
-          ls -la
-          yarn fmt
-      # - name: tauri build
-      #   shell: bash
-      #   run: yarn tauri build
-      # - uses: actions/upload-artifact@v2
-      #   with:
-      #     name: tauri-app
-      #     path: src-tauri/target/release/bundle
-      - name: Build the app
-        uses: tauri-apps/tauri-action@v0
-
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CI: false
-        with:
-          tagName: ${{ github.ref_name }} # This only works if your workflow triggers on new tags.
-          releaseName: 'Paraffin v__VERSION__' # tauri-action replaces \_\_VERSION\_\_ with the app version.
-          releaseBody: 'See the assets to download and install this version.'
-          releaseDraft: true
-          prerelease: false

.github/workflows/cargo-build.yml

@@ -0,0 +1,47 @@
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - '**.rs'
+      - '**/Cargo.toml'
+      - '**/Cargo.lock'
+      - '**/rust-toolchain.toml'
+      - .github/workflows/cargo-build.yml
+  pull_request:
+    paths:
+      - '**.rs'
+      - '**/Cargo.toml'
+      - '**/Cargo.lock'
+      - '**/rust-toolchain.toml'
+      - .github/workflows/cargo-build.yml
+name: cargo build
+jobs:
+  cargobuild:
+    name: cargo build
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        dir: ['src/wasm-lib']
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install latest rust
+        uses: actions-rs/toolchain@v1
+        with:
+            toolchain: stable
+            override: true
+
+      - name: install dependencies
+        if: matrix.dir ==  'src-tauri'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v2.6.1
+
+      - name: Run cargo build
+        run: |
+          cd "${{ matrix.dir }}"
+          cargo build --all
+        shell: bash

.github/workflows/cargo-clippy.yml

@@ -0,0 +1,46 @@
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - '**/Cargo.toml'
+      - '**/Cargo.lock'
+      - '**/rust-toolchain.toml'
+      - '**.rs'
+      - .github/workflows/cargo-clippy.yml
+  pull_request:
+    paths:
+      - '**/Cargo.toml'
+      - '**/Cargo.lock'
+      - '**/rust-toolchain.toml'
+      - '**.rs'
+      - .github/workflows/cargo-build.yml
+name: cargo clippy
+jobs:
+  cargoclippy:
+    name: cargo clippy
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        dir: ['src/wasm-lib']
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install latest rust
+        uses: actions-rs/toolchain@v1
+        with:
+            toolchain: stable
+            override: true
+            components: clippy
+
+      - name: install dependencies
+        if: matrix.dir ==  'src-tauri'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v2.6.1
+
+      - name: Run clippy
+        run: |
+          cd "${{ matrix.dir }}"
+          cargo clippy --all --tests -- -D warnings

.github/workflows/cargo-fmt.yml

@@ -0,0 +1,45 @@
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - '**/Cargo.toml'
+      - '**/Cargo.lock'
+      - '**/rust-toolchain.toml'
+      - '**.rs'
+      - .github/workflows/cargo-fmt.yml
+  pull_request:
+    paths:
+      - '**/Cargo.toml'
+      - '**/Cargo.lock'
+      - '**/rust-toolchain.toml'
+      - '**.rs'
+      - .github/workflows/cargo-fmt.yml
+permissions:
+  packages: read
+  contents: read
+name: cargo fmt
+jobs:
+  cargofmt:
+    name: cargo fmt
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        dir: ['src/wasm-lib', 'src-tauri']
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install latest rust
+        uses: actions-rs/toolchain@v1
+        with:
+            toolchain: stable
+            override: true
+            components: rustfmt
+
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v2.6.1
+
+      - name: Run cargo fmt
+        run: |
+          cd "${{ matrix.dir }}"
+          cargo fmt -- --check
+        shell: bash

.github/workflows/cargo-test.yml

@@ -0,0 +1,51 @@
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - '**.rs'
+      - '**/Cargo.toml'
+      - '**/Cargo.lock'
+      - '**/rust-toolchain.toml'
+      - .github/workflows/cargo-test.yml
+  pull_request:
+    paths:
+      - '**.rs'
+      - '**/Cargo.toml'
+      - '**/Cargo.lock'
+      - '**/rust-toolchain.toml'
+      - .github/workflows/cargo-test.yml
+  workflow_dispatch:
+permissions: read-all
+name: cargo test
+jobs:
+  cargotest:
+    name: cargo test
+    runs-on: ubuntu-latest-8-cores
+    strategy:
+      matrix:
+        dir: ['src/wasm-lib']
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install latest rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+      - name: install dependencies
+        if: matrix.dir ==  'src-tauri'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
+      - uses: taiki-e/install-action@cargo-llvm-cov
+      - uses: taiki-e/install-action@nextest
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v2.6.1
+      - name: cargo test
+        shell: bash
+        run: |-
+          cd "${{ matrix.dir }}"
+          cargo test --all
+        env:
+          KITTYCAD_API_TOKEN: ${{secrets.KITTYCAD_API_TOKEN}}
+

.github/workflows/ci.yml

@@ -0,0 +1,225 @@
+name: CI
+
+on:
+  pull_request:
+  push:
+    branches:
+        - main
+  release:
+    types: [published]
+
+jobs:
+
+  check-format:
+    runs-on: 'ubuntu-20.04'
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version-file: '.nvmrc'
+          cache: 'yarn'
+      - run: yarn install
+      - run: yarn fmt-check
+
+  check-types:
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version-file: '.nvmrc'
+          cache: 'yarn'
+      - run: yarn install
+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: "./src/wasm-lib"
+
+      - run: yarn build:wasm
+      - run: yarn tsc
+
+
+  build-test-web:
+    runs-on: ubuntu-20.04
+    outputs:
+      version: ${{ steps.export_version.outputs.version }}
+    steps:
+
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version-file: '.nvmrc'
+          cache: 'yarn'
+
+      - run: yarn install
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: "./src/wasm-lib"
+
+      - run: yarn build:wasm
+
+      - run: yarn simpleserver:ci
+
+      - run: yarn test:nowatch
+
+      - run: yarn test:cov
+
+      - id: export_version
+        run: echo "version=`cat package.json | jq -r '.version'`" >> "$GITHUB_OUTPUT"
+
+
+  build-apps:
+    needs: [check-format, build-test-web, check-types]
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-latest, ubuntu-20.04, windows-latest]
+    steps:
+
+      - uses: actions/checkout@v3
+
+      - name: install ubuntu system dependencies
+        if: matrix.os == 'ubuntu-20.04'
+        run: |
+          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@v3
+        with:
+          node-version-file: '.nvmrc'
+          cache: 'yarn' # Set this to npm, yarn or pnpm.
+
+      - run: yarn install
+
+      - name: Rust setup
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Rust cache
+        uses: swatinem/rust-cache@v2
+        with:
+          workspaces: './src-tauri -> target'
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: "./src/wasm-lib"
+
+      - name: wasm prep
+        shell: bash
+        run: |
+          mkdir src/wasm-lib/pkg; cd src/wasm-lib
+          npx wasm-pack build --target web --out-dir pkg
+          cd ../../
+          cp src/wasm-lib/pkg/wasm_lib_bg.wasm public
+
+      - name: macos sed
+        if: matrix.os == 'macos-latest'
+        shell: bash
+        run: |
+          sed -i '' 's/import.meta.url//g' "./src/wasm-lib/pkg/wasm_lib.js"
+
+      - name: ubuntu and windows sed
+        if: matrix.os != 'macos-latest'
+        shell: bash
+        run: |
+          sed -i 's/import.meta.url//g' "./src/wasm-lib/pkg/wasm_lib.js"
+
+      - name: Fix format
+        run: yarn fmt
+
+      - name: install apple silicon target mac
+        if: matrix.os == 'macos-latest'
+        run: |
+          rustup target add aarch64-apple-darwin
+
+      - name: Build the app for the current platform (no upload)
+        uses: tauri-apps/tauri-action@v0
+        env:
+          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
+          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+        with:
+          args: ${{ matrix.os == 'macos-latest' && '--target universal-apple-darwin' || '' }}
+
+      - uses: actions/upload-artifact@v3
+        with:
+          path: ${{ matrix.os == 'macos-latest' && 'src-tauri/target/universal-apple-darwin/release/bundle/*/*' || 'src-tauri/target/release/bundle/*/*' }}
+
+
+  publish-apps-release:
+    runs-on: ubuntu-20.04
+    if: github.event_name == 'release'
+    needs: [build-test-web, build-apps]
+    env:
+      VERSION_NO_V: ${{ needs.build-test-web.outputs.version }}
+    steps:
+
+      - uses: actions/download-artifact@v3
+
+      - name: Generate the update static endpoint
+        run: |
+          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/nsis/*.nsis.zip.sig`
+          RELEASE_DIR=https://dl.kittycad.io/releases/modeling-app/v${VERSION_NO_V}
+          jq --null-input \
+            --arg version "v${VERSION_NO_V}" \
+            --arg darwin_sig "$DARWIN_SIG" \
+            --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/nsis/KittyCAD%20Modeling_${VERSION_NO_V}_x64-setup.nsis.zip" \
+            '{
+              "version": $version,
+              "platforms": {
+                "darwin-x86_64": {
+                  "signature": $darwin_sig,
+                  "url": $darwin_url
+                },
+                "darwin-aarch64": {
+                  "signature": $darwin_sig,
+                  "url": $darwin_url
+                },
+                "linux-x86_64": {
+                  "signature": $linux_sig,
+                  "url": $linux_url
+                },
+                "windows-x86_64": {
+                  "signature": $windows_sig,
+                  "url": $windows_url
+                }
+              }
+            }' > last_update.json
+            cat last_update.json
+
+      - name: Authenticate to Google Cloud
+        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@v1.1.1
+        with:
+          project_id: kittycadapi
+
+      - name: Upload release files to public bucket
+        uses: google-github-actions/upload-cloud-storage@v1.0.3
+        with:
+          path: artifact
+          glob: '*/*itty*'
+          parent: false
+          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@v1.0.3
+        with:
+          path: last_update.json
+          destination: dl.kittycad.io/releases/modeling-app
+
+      - name: Upload release files to Github
+        uses: softprops/action-gh-release@v1
+        with:
+          files: artifact/*/*itty*

.github/workflows/test.yml

@@ -1,20 +0,0 @@
-# on pull requests, setup node, run `yarn install` and `yarn test:nowatch`
-
-name: Test
-
-on: [pull_request]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
-        with:
-          node-version: '16.x'
-      - run: yarn install
-      - run: yarn build:wasm:ci
-      - run: yarn simpleserver:ci
-      - run: yarn test:nowatch
-      - run: yarn test:cov
-      - run: yarn test:rust

.github/workflows/update-dev-branch.yml

@@ -0,0 +1,29 @@
+name: update-dev-branch
+
+on:
+  push:
+    branches:
+      - main
+    pull_request:
+      paths:
+        - .github/workflows/update-dev-branch.yml
+
+permissions:
+  contents: write
+
+jobs:
+  update-branch:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3.5.0
+      - shell: bash
+        run: |
+          # checkout our branch
+          git checkout dev || git checkout -b dev
+          # fetch origin
+          git fetch origin
+          # reset to main
+          git reset --hard origin/main
+          # force push it
+          git push -f origin dev

.gitignore

@@ -24,4 +24,7 @@ yarn-error.log*
 
 # rust
 src/wasm-lib/target
+src/wasm-lib/bindings
+src/wasm-lib/kcl/bindings
 public/wasm_lib_bg.wasm
+src/wasm-lib/lcov.info

.husky/pre-push

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+yarn fmt-check

.nvmrc

@@ -0,0 +1 @@
+v20.5.0

.prettierignore

@@ -0,0 +1,9 @@
+# Ignore artifacts:
+build
+coverage
+
+# Ignore Rust projects:
+*.rs
+target
+src/wasm-lib/pkg
+src/wasm-lib/kcl/bindings

.vscode/settings.json

@@ -1,5 +1,7 @@
 {
     "cSpell.words": [
         "geos"
-    ]
+    ],
+    "editor.tabSize": 2,
+    "editor.insertSpaces": true,
 }

README.md

@@ -1,6 +1,6 @@
 ## Kurt demo project
 
-live at [untitled-app.kittycad.io](https://untitled-app.kittycad.io/)
+live at [app.kittycad.io](https://app.kittycad.io/)
 
 Not sure what to call this, it's both a language/interpreter and a UI that uses the language as the source of truth model the user build with direct-manipulation with the UI.
 
@@ -43,6 +43,67 @@ If you want to edit the rust files, you can cd into `src/wasm-lib` and then use
 
 Worth noting that the integration of the WASM into this project is very hacky because I'm really pushing create-react-app further than what's practical, but focusing on features atm rather than the setup.
 
+## Developing in Chrome
+
+Chrome is in the process of rolling out a new default which
+[blocks Third-Party Cookies](https://developer.chrome.com/en/docs/privacy-sandbox/third-party-cookie-phase-out/).
+If you're having trouble logging into the `modeling-app`, you may need to
+enable third-party cookies. You can enable third-party cookies by clicking on
+the eye with a slash through it in the URL bar, and clicking on "Enable
+Third-Party Cookies".
+
+## Tauri
+
+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 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.)
+
+To build, run `yarn tauri build`, or `yarn tauri build --debug` to keep access to the devtools.
+
+Note that these became separate apps on Macos, so make sure you open the right one after a build 😉
+![image](https://github.com/KittyCAD/modeling-app/assets/29681384/a08762c5-8d16-42d8-a02f-a5efc9ae5551)
+
+
 <img width="1232" alt="image" src="https://user-images.githubusercontent.com/29681384/211947063-46164bb4-7bdd-45cb-9a76-2f40c71a24aa.png">
 
 <img width="1232" alt="image (1)" src="https://user-images.githubusercontent.com/29681384/211947073-e76b4933-bef5-4636-bc4d-e930ac8e290f.png">
+
+## Release a new version
+
+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.
+
+2. Merge the PR
+
+3. Create a new release and tag pointing to the bump version commit using semantic versioning `v{x}.{y}.{z}`
+
+4. A new Action kicks in at https://github.com/KittyCAD/modeling-app/actions, uploading artifacts to the release
+
+## Fuzzing the parser
+
+Make sure you install cargo fuzz:
+
+```bash
+$ cargo install cargo-fuzz
+```
+
+```bash
+$ cd src/wasm-lib/kcl
+
+# list the fuzz targets
+$ cargo fuzz list
+
+# run the parser fuzzer
+$ 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).

babel.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  presets: ["@babel/preset-env"],
+}

index.html

@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <link rel="icon" href="/favicon.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#000000" />
+    <meta
+      name="description"
+      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" />
+    <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>
+    <div id="root" class="h-screen overflow-y-auto"></div>
+    <script type="module" src="/src/index.tsx"></script>
+  </body>
+</html>

package.json

@@ -1,61 +1,79 @@
 {
   "name": "untitled-app",
-  "version": "0.1.0",
+  "version": "0.4.0",
   "private": true,
   "dependencies": {
-    "@codemirror/lang-javascript": "^6.1.1",
+    "@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.13",
-    "@react-three/drei": "^9.42.0",
-    "@react-three/fiber": "^8.9.1",
+    "@headlessui/tailwindcss": "^0.2.0",
+    "@kittycad/lib": "^0.0.36",
+    "@lezer/javascript": "^1.4.7",
+    "@open-rpc/client-js": "^1.8.1",
+    "@react-hook/resize-observer": "^1.2.6",
+    "@sentry/react": "^7.65.0",
+    "@tauri-apps/api": "^1.3.0",
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^13.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@types/jest": "^27.0.1",
+    "@ts-stack/markdown": "^1.5.0",
     "@types/node": "^16.7.13",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
-    "@uiw/react-codemirror": "^4.15.1",
-    "allotment": "^1.17.0",
+    "@uiw/react-codemirror": "^4.21.13",
+    "@xstate/react": "^3.2.2",
+    "crypto-js": "^4.1.1",
+    "formik": "^2.4.3",
+    "fuse.js": "^6.6.2",
     "http-server": "^14.1.1",
+    "json-rpc-2.0": "^1.6.0",
+    "re-resizable": "^6.9.9",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
+    "react-hot-toast": "^2.4.1",
+    "react-hotkeys-hook": "^4.4.1",
     "react-json-view": "^1.21.3",
+    "react-modal": "^3.16.1",
     "react-modal-promise": "^1.0.2",
-    "react-scripts": "5.0.1",
-    "sketch-helpers": "^0.0.2",
+    "react-router-dom": "^6.14.2",
+    "sketch-helpers": "^0.0.4",
     "swr": "^2.0.4",
-    "three": "^0.146.0",
+    "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": "^4.4.2",
-    "util": "^0.12.5",
     "uuid": "^9.0.0",
-    "wasm-pack": "^0.11.1",
+    "vitest": "^0.34.1",
+    "vscode-jsonrpc": "^8.1.0",
+    "vscode-languageserver-protocol": "^3.17.3",
+    "wasm-pack": "^0.12.1",
     "web-vitals": "^2.1.0",
+    "ws": "^8.13.0",
+    "xstate": "^4.38.2",
     "zustand": "^4.1.4"
   },
   "scripts": {
-    "start": "react-scripts start",
-    "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:ci && react-scripts build",
-    "build:local": "react-scripts build",
-    "build:both": "react-scripts build",
-    "build:both:local": "yarn build:wasm && react-scripts build",
-    "test": "react-scripts test",
-    "test:nowatch": "react-scripts test --watchAll=false",
-    "test:rust": "(cd src/wasm-lib && cargo test && cargo clippy)",
-    "test:cov": "react-scripts test --watchAll=false --coverage=true",
+    "start": "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",
+    "build:both:local": "yarn build:wasm && vite build",
+    "test": "vitest --mode development",
+    "test:nowatch": "vitest run --mode development",
+    "test:rust": "(cd src/wasm-lib && cargo test --all && cargo clippy --all --tests)",
+    "test:cov": "vitest run --coverage --mode development",
     "simpleserver:ci": "http-server ./public --cors -p 3000 &",
     "simpleserver": "http-server ./public --cors -p 3000",
-    "eject": "react-scripts eject",
-    "fmt": "prettier --write ./src/**/*.{ts,tsx,js}",
-    "remove-importmeta": "sed -i '' 's/import.meta.url//g' \"./src/wasm-lib/pkg/wasm_lib.js\"",
-    "remove-importmeta:ci": "sed -i 's/import.meta.url//g' \"./src/wasm-lib/pkg/wasm_lib.js\"",
-    "add-missing-import": "echo \"import util from 'util'; if (typeof window !== 'undefined' && !window.TextEncoder) { window.TextEncoder = util.TextEncoder; window.TextDecoder = util.TextDecoder}\" | cat - ./src/wasm-lib/pkg/wasm_lib.js > temp && mv temp ./src/wasm-lib/pkg/wasm_lib.js",
-    "build:wasm:ci": "mkdir src/wasm-lib/pkg; cd src/wasm-lib && wasm-pack build --target web --out-dir pkg && cd ../../ && cp src/wasm-lib/pkg/wasm_lib_bg.wasm public && yarn remove-importmeta:ci && yarn add-missing-import && yarn fmt",
-    "build:wasm": "mkdir src/wasm-lib/pkg; cd src/wasm-lib && wasm-pack build --target web --out-dir pkg && cd ../../ && cp src/wasm-lib/pkg/wasm_lib_bg.wasm public && yarn remove-importmeta && yarn add-missing-import && yarn fmt"
-  },
-  "jest": {
-    "transformIgnorePatterns": [
-      "node_modules/(?!(three|allotment)/)"
-    ]
+    "fmt": "prettier --write ./src",
+    "fmt-check": "prettier --check ./src",
+    "build:wasm": "yarn wasm-prep && (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 && yarn remove-importmeta",
+    "remove-importmeta": "sed -i 's/import.meta.url//g' \"./src/wasm-lib/pkg/wasm_lib.js\"; sed -i '' 's/import.meta.url//g' \"./src/wasm-lib/pkg/wasm_lib.js\" || echo \"sed for both mac and linux\"",
+    "wasm-prep": "rm -rf src/wasm-lib/pkg && mkdir src/wasm-lib/pkg && rm -rf src/wasm-lib/kcl/bindings",
+    "lint": "eslint --fix src",
+    "bump-jsons": "echo \"$(jq --arg v \"$VERSION\" '.version=$v' package.json --indent 2)\" > package.json && echo \"$(jq --arg v \"$VERSION\" '.package.version=$v' src-tauri/tauri.conf.json --indent 2)\" > src-tauri/tauri.conf.json"
   },
   "prettier": {
     "trailingComma": "es5",
@@ -63,18 +81,6 @@
     "semi": false,
     "singleQuote": true
   },
-  "eslintConfig": {
-    "extends": [
-      "react-app",
-      "react-app/jest"
-    ],
-    "rules": {
-      "semi": [
-        "error",
-        "never"
-      ]
-    }
-  },
   "browserslist": {
     "production": [
       ">0.2%",
@@ -88,14 +94,31 @@
     ]
   },
   "devDependencies": {
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
+    "@babel/preset-env": "^7.22.9",
     "@tauri-apps/cli": "^1.3.1",
     "@types/crypto-js": "^4.1.1",
-    "@types/three": "^0.146.0",
+    "@types/debounce": "^1.2.1",
+    "@types/isomorphic-fetch": "^0.0.36",
+    "@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.0.3",
+    "@vitest/coverage-istanbul": "^0.34.1",
     "autoprefixer": "^10.4.13",
+    "eslint": "^8.44.0",
+    "eslint-config-react-app": "^7.0.1",
+    "eslint-plugin-css-modules": "^2.11.0",
+    "happy-dom": "^10.8.0",
+    "husky": "^8.0.3",
     "postcss": "^8.4.19",
     "prettier": "^2.8.0",
     "setimmediate": "^1.0.5",
     "tailwindcss": "^3.2.4",
+    "vite": "^4.4.3",
+    "vite-plugin-eslint": "^1.8.1",
+    "vite-tsconfig-paths": "^4.2.0",
     "yarn": "^1.22.19"
   }
 }

public/index.html

@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#000000" />
-    <meta
-      name="description"
-      content="Web site created using create-react-app"
-    />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
-    <!--
-      manifest.json provides metadata used when your web app is installed on a
-      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-    -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-    <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
-      It will be replaced with the URL of the `public` folder during the build.
-      Only files inside the `public` folder can be referenced from the HTML.
-
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      work correctly both with client-side routing and a non-root public URL.
-      Learn how to configure a non-root public URL by running `npm run build`.
-    -->
-    <title>React App</title>
-  </head>
-  <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root"></div>
-    <!--
-      This HTML file is a template.
-      If you open it directly in the browser, you will see an empty page.
-
-      You can add webfonts, meta tags, or analytics to this file.
-      The build step will place the bundled scripts into the <body> tag.
-
-      To begin the development, run `npm start` or `yarn start`.
-      To create a production bundle, use `npm run build` or `yarn build`.
-    -->
-  </body>
-</html>

public/kitt-8bit-winking.svg

@@ -0,0 +1,37 @@
+<svg width="25" height="34" viewBox="0 0 25 34" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3 31V30H1V29H0V8H1V7H2V6H3V5H4V4H21V5H22V6H23V7H24V8H25V29H24V30H22V31H19V32H20V34H14V32H15V31H10V32H11V34H5V32H6V31H3Z" fill="#101412"/>
+<path d="M6 31V29.5H10V31H9V32H10V33H6V32H7V31H6Z" fill="#4B4862"/>
+<path d="M15 31V29.5H19V31H18V32H19V33H15V32H16V31H15Z" fill="#4B4862"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1 24.5V29H3V30H22V29H24V24.5H1ZM9 29V27H16V29H9Z" fill="#9BADB7"/>
+<path d="M1 25V23H24V25H1Z" fill="#BECAD0"/>
+<path d="M2 27V26H7V27H2Z" fill="#2B3E48"/>
+<path d="M4 29V28H7V29H4Z" fill="#2B3E48"/>
+<path d="M18 27V26H19V27H18Z" fill="#2B3E48"/>
+<path d="M20 27V26H21V27H20Z" fill="#2B3E48"/>
+<path d="M22 27V26H23V27H22Z" fill="#2B3E48"/>
+<path d="M18 29V28H21V29H18Z" fill="#2B3E48"/>
+<path d="M22 7V6H21V5H4V6H3V7H2V8H1V10H24V8H23V7H22Z" fill="#FBF580"/>
+<path d="M1 24V22H24V24H1Z" fill="#AEAA4C"/>
+<path d="M24 9H1V23H24V9Z" fill="#E5E3A1"/>
+<path d="M4 12V11H21V12H22V20H21V21H4V20H3V12H4Z" fill="#1F2320"/>
+<rect x="10" y="5" width="5" height="2" fill="#AEAA4C"/>
+<path d="M16 13V12H18V16H17L16 13Z" fill="#DBFF3C"/>
+<path d="M11 16H14V17H13V19H16V18H17V19H16V20H9V19H8V18H9V19H12V17H11V16Z" fill="#DBFF3C"/>
+<path d="M9 15V14H6V15H5V14H6V13H9V14H10V15H9Z" fill="#DBFF3C"/>
+<path d="M4 7V6H5V4H6V2H7V1H8V2H9V4H10V6H11V7H4Z" fill="#DBFF3C"/>
+<path d="M21 6V7H14V6H15V4H16V2H17V1H18V2H19V4H20V6H21Z" fill="#DBFF3C"/>
+<path d="M16 2V0H19V2H20V4H21V5.5H20V4H19V2H18V1H17V2H16V4H15V5.5H14V4H15V2H16Z" fill="#92C51B"/>
+<path d="M6 2V0H9V2H10V4H11V5.5H10V4H9V2H8V1H7V2H6V4H5V5.5H4V4H5V2H6Z" fill="#92C51B"/>
+<rect x="11" y="6" width="3" height="1" fill="#D0CC6A"/>
+<path d="M16 7V6H17V5H18V6H19V7H16Z" fill="#76AA1D"/>
+<path d="M7 6V5H8V6H9V7H6V6H7Z" fill="#76AA1D"/>
+<path d="M21 7V6H20V5H21V6H22V7H21Z" fill="#76AA1D"/>
+<path d="M4 6V7H3V6H4V5H5V6H4Z" fill="#76AA1D"/>
+<path d="M10 5H11V6H12V7H11V6H10V5Z" fill="#76AA1D"/>
+<path d="M14 5H15V6H14V7H13V6H14V5Z" fill="#76AA1D"/>
+<path d="M17 13H16V16H17V13Z" fill="#92C51B"/>
+<path d="M2 25V23H1V25H2Z" fill="#D0CC6A"/>
+<path d="M23 25V23H24V25H23Z" fill="#D0CC6A"/>
+<path d="M4 24V23H7V24H4Z" fill="#D56161"/>
+<path d="M4 25V24H7V25H4Z" fill="#AC3232"/>
+</svg>

public/kitt-arcade-winking.svg

@@ -0,0 +1,18 @@
+<svg width="25" height="34" viewBox="0 0 25 34" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3 31V30H1V29H0V8H1V7H2V6H3V5H4V3H5V2H6V1H7V0H8V1H9V2H10V3H11V4H14V3H15V2H16V1H17V0H18V1H19V2H20V3H21V5H22V6H23V7H24V8H25V29H24V30H22V31H19V32H20V34H14V32H15V31H10V32H11V34H5V32H6V31H3Z" fill="#101412"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11 5H14V4H15V3H16V2H17V1H18V2H19V3H20V5H21V6H22V7H23V8H24V9V10V23V24V25V29H22V30H18V31V32H19V33H15V32H16V31V30H9V31V32H10V33H6V32H7V31V30H3V29H1V25V24V23V10V9V8H2V7H3V6H4V5H5V3H6V2H7V1H8V2H9V3H10V4H11V5ZM2 26V27H7V26H2ZM4 28V29H7V28H4ZM18 27V26H19V27H18ZM20 26V27H21V26H20ZM22 27V26H23V27H22ZM18 28V29H21V28H18ZM9 27H16V29H9V27Z" fill="#D0FF00"/>
+<path d="M1 24V23H24V24H1Z" fill="#B1E515"/>
+<path d="M4 12V11H21V12H22V20H21V21H4V20H3V12H4Z" fill="#1F2320"/>
+<path d="M16 16V12H18V16H16Z" fill="#D0FF00"/>
+<path d="M11 16H14V17H13V19H16V18H17V19H16V20H9V19H8V18H9V19H12V17H11V16Z" fill="#D0FF00"/>
+<path d="M9 15V14H6V15H5V14H6V13H9V14H10V15H9Z" fill="#D0FF00"/>
+<path d="M22 8V7H23V8H22Z" fill="#B1E515"/>
+<path d="M3 8V7H2V8H3Z" fill="#B1E515"/>
+<path d="M21 7V6H22V7H21Z" fill="#92C51B"/>
+<path d="M4 7V6H3V7H4Z" fill="#92C51B"/>
+<rect x="12" y="5" width="1" height="2" fill="#B1E515"/>
+<path d="M16 7V6H17V5H18V6H19V7H16Z" fill="#101412"/>
+<path d="M7 6V5H8V6H9V7H6V6H7Z" fill="#101412"/>
+<path d="M4 24V23H7V24H4Z" fill="#92C51B"/>
+<rect x="11" y="5" width="3" height="1" fill="#92C51B"/>
+</svg>

public/kittycad-logomark-light.svg

@@ -0,0 +1,45 @@
+<svg width="123" height="29" viewBox="0 0 123 29" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.52 26.04V25.2H0.84V24.36H0V6.72H0.84V5.88H1.68V5.04H2.52V4.2H3.36V3.36H17.64V4.2H18.48V5.04H19.32V5.88H20.16V6.72H21V24.36H20.16V25.2H18.48V26.04H15.96V26.88H16.8V28.56H11.76V26.88H12.6V26.04H8.4V26.88H9.24V28.56H4.2V26.88H5.04V26.04H2.52Z" fill="#101412"/>
+<path d="M5.04 26.04V24.78H8.4V26.04H7.56V26.88H8.4V27.72H5.04V26.88H5.88V26.04H5.04Z" fill="#4B4862"/>
+<path d="M12.6 26.04V24.78H15.96V26.04H15.12V26.88H15.96V27.72H12.6V26.88H13.44V26.04H12.6Z" fill="#4B4862"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0.839996 20.58V24.36H2.52V25.2H18.48V24.36H20.16V20.58H0.839996ZM7.56 24.36V22.68H13.44V24.36H7.56Z" fill="#9BADB7"/>
+<path d="M0.839996 21V19.32H20.16V21H0.839996Z" fill="#BECAD0"/>
+<path d="M1.68 22.68V21.84H5.88V22.68H1.68Z" fill="#2B3E48"/>
+<path d="M3.36 24.36V23.52H5.88V24.36H3.36Z" fill="#2B3E48"/>
+<path d="M15.12 22.68V21.84H15.96V22.68H15.12Z" fill="#2B3E48"/>
+<path d="M16.8 22.68V21.84H17.64V22.68H16.8Z" fill="#2B3E48"/>
+<path d="M18.48 22.68V21.84H19.32V22.68H18.48Z" fill="#2B3E48"/>
+<path d="M15.12 24.36V23.52H17.64V24.36H15.12Z" fill="#2B3E48"/>
+<path d="M18.48 5.88V5.04H17.64V4.2H3.36V5.04H2.52V5.88H1.68V6.72H0.839996V8.4H20.16V6.72H19.32V5.88H18.48Z" fill="#FBF580"/>
+<path d="M0.839996 20.16V18.48H20.16V20.16H0.839996Z" fill="#AEAA4C"/>
+<path d="M20.16 7.56H0.839996V19.32H20.16V7.56Z" fill="#E5E3A1"/>
+<path d="M3.36 10.08V9.24001H17.64V10.08H18.48V16.8H17.64V17.64H3.36V16.8H2.52V10.08H3.36Z" fill="#1F2320"/>
+<rect x="8.4" y="4.2" width="4.2" height="1.68" fill="#AEAA4C"/>
+<path d="M13.44 10.92V10.08H15.12V13.44H14.28L13.44 10.92Z" fill="#DBFF3C"/>
+<path d="M9.24 13.44H11.76V14.28H10.92V15.96H13.44V15.12H14.28V15.96H13.44V16.8H7.56V15.96H6.72V15.12H7.56V15.96H10.08V14.28H9.24V13.44Z" fill="#DBFF3C"/>
+<path d="M7.56 12.6V11.76H5.04V12.6H4.2V11.76H5.04V10.92H7.56V11.76H8.4V12.6H7.56Z" fill="#DBFF3C"/>
+<path d="M3.36 5.88V5.04H4.2V3.36H5.04V1.68H5.88V0.839996H6.72V1.68H7.56V3.36H8.4V5.04H9.24V5.88H3.36Z" fill="#DBFF3C"/>
+<path d="M17.64 5.04V5.88H11.76V5.04H12.6V3.36H13.44V1.68H14.28V0.839996H15.12V1.68H15.96V3.36H16.8V5.04H17.64Z" fill="#DBFF3C"/>
+<path d="M13.44 1.68V0H15.96V1.68H16.8V3.36H17.64V4.62H16.8V3.36H15.96V1.68H15.12V0.84H14.28V1.68H13.44V3.36H12.6V4.62H11.76V3.36H12.6V1.68H13.44Z" fill="#92C51B"/>
+<path d="M5.04 1.68V0H7.56V1.68H8.4V3.36H9.24V4.62H8.4V3.36H7.56V1.68H6.72V0.84H5.88V1.68H5.04V3.36H4.2V4.62H3.36V3.36H4.2V1.68H5.04Z" fill="#92C51B"/>
+<rect x="9.24" y="5.03999" width="2.52" height="0.84" fill="#D0CC6A"/>
+<path d="M13.44 5.88V5.04H14.28V4.2H15.12V5.04H15.96V5.88H13.44Z" fill="#76AA1D"/>
+<path d="M5.88 5.04V4.2H6.72V5.04H7.56V5.88H5.04V5.04H5.88Z" fill="#76AA1D"/>
+<path d="M17.64 5.88V5.04H16.8V4.2H17.64V5.04H18.48V5.88H17.64Z" fill="#76AA1D"/>
+<path d="M3.36 5.04V5.88H2.52V5.04H3.36V4.2H4.2V5.04H3.36Z" fill="#76AA1D"/>
+<path d="M8.4 4.2H9.24V5.04H10.08V5.88H9.24V5.04H8.4V4.2Z" fill="#76AA1D"/>
+<path d="M11.76 4.2H12.6V5.04H11.76V5.88H10.92V5.04H11.76V4.2Z" fill="#76AA1D"/>
+<path d="M14.28 10.92H13.44V13.44H14.28V10.92Z" fill="#92C51B"/>
+<path d="M1.68 21V19.32H0.839996V21H1.68Z" fill="#D0CC6A"/>
+<path d="M19.32 21V19.32H20.16V21H19.32Z" fill="#D0CC6A"/>
+<path d="M3.36 20.16V19.32H5.88V20.16H3.36Z" fill="#D56161"/>
+<path d="M3.36 21V20.16H5.88V21H3.36Z" fill="#AC3232"/>
+<path d="M29.991 6.64V12.827L35.994 6.295L38.547 8.227L33.694 13.471L40.157 22.28H35.902L31.394 15.932L29.991 17.45V22.28H26.61V6.64H29.991Z" fill="#FFFFFA"/>
+<path d="M44.6921 7.698C44.6921 8.21933 44.5005 8.664 44.1171 9.032C43.7491 9.38466 43.3045 9.561 42.7831 9.561C42.2618 9.561 41.8248 9.38466 41.4721 9.032C41.1195 8.664 40.9431 8.21933 40.9431 7.698C40.9431 7.17666 41.1195 6.732 41.4721 6.364C41.8248 5.996 42.2618 5.812 42.7831 5.812C43.3045 5.812 43.7491 5.996 44.1171 6.364C44.5005 6.732 44.6921 7.17666 44.6921 7.698ZM44.4851 11.125V22.28H41.1041V11.125H44.4851Z" fill="#FFFFFA"/>
+<path d="M51.9943 22.671C50.6143 22.671 49.4719 22.3183 48.5673 21.613C47.6779 20.9077 47.2333 19.8727 47.2333 18.508V13.908H45.6463V11.286H47.2333V8.526L50.5913 7.974V11.286H52.8453L53.5813 13.908H50.5913V18.002C50.5913 18.5387 50.7293 18.9833 51.0053 19.336C51.2813 19.6733 51.6799 19.842 52.2013 19.842C52.4006 19.842 52.6153 19.8113 52.8453 19.75C53.0753 19.6887 53.3053 19.6043 53.5353 19.497L54.5243 21.889C54.2636 22.1037 53.8803 22.2877 53.3743 22.441C52.8683 22.5943 52.4083 22.671 51.9943 22.671Z" fill="#FFFFFA"/>
+<path d="M60.8106 22.671C59.4306 22.671 58.2883 22.3183 57.3836 21.613C56.4943 20.9077 56.0496 19.8727 56.0496 18.508V13.908H54.4626V11.286H56.0496V8.526L59.4076 7.974V11.286H61.6616L62.3976 13.908H59.4076V18.002C59.4076 18.5387 59.5456 18.9833 59.8216 19.336C60.0976 19.6733 60.4963 19.842 61.0176 19.842C61.217 19.842 61.4316 19.8113 61.6616 19.75C61.8916 19.6887 62.1216 19.6043 62.3516 19.497L63.3406 21.889C63.08 22.1037 62.6966 22.2877 62.1906 22.441C61.6846 22.5943 61.2246 22.671 60.8106 22.671Z" fill="#FFFFFA"/>
+<path d="M66.936 22.648L67.327 21.705L63.279 11.539L66.683 11.125C67.097 12.229 67.511 13.333 67.925 14.437C68.339 15.541 68.7453 16.645 69.144 17.749L71.49 11.125H74.986L70.018 23.683C69.65 24.5877 69.0137 25.362 68.109 26.006C67.2043 26.6653 66.2383 27.1177 65.211 27.363L64.038 24.626C64.59 24.4113 65.165 24.143 65.763 23.821C66.361 23.499 66.752 23.108 66.936 22.648Z" fill="#FFFFFA"/>
+<path d="M79.3491 22.28L76.8771 19.808V7.952L79.3491 5.48H86.8011L89.2851 7.952V11.816H85.8891V9.608L85.1571 8.876H81.0051L80.2731 9.608V18.152L81.0051 18.884H85.1571L85.8891 18.152V15.944H89.2851V19.808L86.8011 22.28H79.3491Z" fill="#FFFFFA"/>
+<path d="M91.9268 22.28V7.952L94.3988 5.48H102.151L104.623 7.952V22.28H101.239V17.336H95.3108V22.28H91.9268ZM95.3108 13.952H101.239V9.608L100.507 8.876H96.0428L95.3108 9.608V13.952Z" fill="#FFFFFA"/>
+<path d="M107.492 22.28V5.48H117.488L119.96 7.952V19.808L117.488 22.28H107.492ZM110.888 18.884H115.844L116.576 18.152V9.608L115.844 8.876H110.888V18.884Z" fill="#FFFFFA"/>
+</svg>

public/kittycad-logomark.svg

@@ -0,0 +1,45 @@
+<svg width="123" height="29" viewBox="0 0 123 29" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.52 26.04V25.2H0.84V24.36H0V6.72H0.84V5.88H1.68V5.04H2.52V4.2H3.36V3.36H17.64V4.2H18.48V5.04H19.32V5.88H20.16V6.72H21V24.36H20.16V25.2H18.48V26.04H15.96V26.88H16.8V28.56H11.76V26.88H12.6V26.04H8.4V26.88H9.24V28.56H4.2V26.88H5.04V26.04H2.52Z" fill="#101412"/>
+<path d="M5.04 26.04V24.78H8.4V26.04H7.56V26.88H8.4V27.72H5.04V26.88H5.88V26.04H5.04Z" fill="#4B4862"/>
+<path d="M12.6 26.04V24.78H15.96V26.04H15.12V26.88H15.96V27.72H12.6V26.88H13.44V26.04H12.6Z" fill="#4B4862"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0.839996 20.58V24.36H2.52V25.2H18.48V24.36H20.16V20.58H0.839996ZM7.56 24.36V22.68H13.44V24.36H7.56Z" fill="#9BADB7"/>
+<path d="M0.839996 21V19.32H20.16V21H0.839996Z" fill="#BECAD0"/>
+<path d="M1.68 22.68V21.84H5.88V22.68H1.68Z" fill="#2B3E48"/>
+<path d="M3.36 24.36V23.52H5.88V24.36H3.36Z" fill="#2B3E48"/>
+<path d="M15.12 22.68V21.84H15.96V22.68H15.12Z" fill="#2B3E48"/>
+<path d="M16.8 22.68V21.84H17.64V22.68H16.8Z" fill="#2B3E48"/>
+<path d="M18.48 22.68V21.84H19.32V22.68H18.48Z" fill="#2B3E48"/>
+<path d="M15.12 24.36V23.52H17.64V24.36H15.12Z" fill="#2B3E48"/>
+<path d="M18.48 5.88V5.04H17.64V4.2H3.36V5.04H2.52V5.88H1.68V6.72H0.839996V8.4H20.16V6.72H19.32V5.88H18.48Z" fill="#FBF580"/>
+<path d="M0.839996 20.16V18.48H20.16V20.16H0.839996Z" fill="#AEAA4C"/>
+<path d="M20.16 7.56H0.839996V19.32H20.16V7.56Z" fill="#E5E3A1"/>
+<path d="M3.36 10.08V9.24001H17.64V10.08H18.48V16.8H17.64V17.64H3.36V16.8H2.52V10.08H3.36Z" fill="#1F2320"/>
+<rect x="8.4" y="4.2" width="4.2" height="1.68" fill="#AEAA4C"/>
+<path d="M13.44 10.92V10.08H15.12V13.44H14.28L13.44 10.92Z" fill="#DBFF3C"/>
+<path d="M9.24 13.44H11.76V14.28H10.92V15.96H13.44V15.12H14.28V15.96H13.44V16.8H7.56V15.96H6.72V15.12H7.56V15.96H10.08V14.28H9.24V13.44Z" fill="#DBFF3C"/>
+<path d="M7.56 12.6V11.76H5.04V12.6H4.2V11.76H5.04V10.92H7.56V11.76H8.4V12.6H7.56Z" fill="#DBFF3C"/>
+<path d="M3.36 5.88V5.04H4.2V3.36H5.04V1.68H5.88V0.839996H6.72V1.68H7.56V3.36H8.4V5.04H9.24V5.88H3.36Z" fill="#DBFF3C"/>
+<path d="M17.64 5.04V5.88H11.76V5.04H12.6V3.36H13.44V1.68H14.28V0.839996H15.12V1.68H15.96V3.36H16.8V5.04H17.64Z" fill="#DBFF3C"/>
+<path d="M13.44 1.68V0H15.96V1.68H16.8V3.36H17.64V4.62H16.8V3.36H15.96V1.68H15.12V0.84H14.28V1.68H13.44V3.36H12.6V4.62H11.76V3.36H12.6V1.68H13.44Z" fill="#92C51B"/>
+<path d="M5.04 1.68V0H7.56V1.68H8.4V3.36H9.24V4.62H8.4V3.36H7.56V1.68H6.72V0.84H5.88V1.68H5.04V3.36H4.2V4.62H3.36V3.36H4.2V1.68H5.04Z" fill="#92C51B"/>
+<rect x="9.24" y="5.03999" width="2.52" height="0.84" fill="#D0CC6A"/>
+<path d="M13.44 5.88V5.04H14.28V4.2H15.12V5.04H15.96V5.88H13.44Z" fill="#76AA1D"/>
+<path d="M5.88 5.04V4.2H6.72V5.04H7.56V5.88H5.04V5.04H5.88Z" fill="#76AA1D"/>
+<path d="M17.64 5.88V5.04H16.8V4.2H17.64V5.04H18.48V5.88H17.64Z" fill="#76AA1D"/>
+<path d="M3.36 5.04V5.88H2.52V5.04H3.36V4.2H4.2V5.04H3.36Z" fill="#76AA1D"/>
+<path d="M8.4 4.2H9.24V5.04H10.08V5.88H9.24V5.04H8.4V4.2Z" fill="#76AA1D"/>
+<path d="M11.76 4.2H12.6V5.04H11.76V5.88H10.92V5.04H11.76V4.2Z" fill="#76AA1D"/>
+<path d="M14.28 10.92H13.44V13.44H14.28V10.92Z" fill="#92C51B"/>
+<path d="M1.68 21V19.32H0.839996V21H1.68Z" fill="#D0CC6A"/>
+<path d="M19.32 21V19.32H20.16V21H19.32Z" fill="#D0CC6A"/>
+<path d="M3.36 20.16V19.32H5.88V20.16H3.36Z" fill="#D56161"/>
+<path d="M3.36 21V20.16H5.88V21H3.36Z" fill="#AC3232"/>
+<path d="M29.991 6.64V12.827L35.994 6.295L38.547 8.227L33.694 13.471L40.157 22.28H35.902L31.394 15.932L29.991 17.45V22.28H26.61V6.64H29.991Z" fill="#08110D"/>
+<path d="M44.6921 7.698C44.6921 8.21933 44.5005 8.664 44.1171 9.032C43.7491 9.38466 43.3045 9.561 42.7831 9.561C42.2618 9.561 41.8248 9.38466 41.4721 9.032C41.1195 8.664 40.9431 8.21933 40.9431 7.698C40.9431 7.17666 41.1195 6.732 41.4721 6.364C41.8248 5.996 42.2618 5.812 42.7831 5.812C43.3045 5.812 43.7491 5.996 44.1171 6.364C44.5005 6.732 44.6921 7.17666 44.6921 7.698ZM44.4851 11.125V22.28H41.1041V11.125H44.4851Z" fill="#08110D"/>
+<path d="M51.9943 22.671C50.6143 22.671 49.4719 22.3183 48.5673 21.613C47.6779 20.9077 47.2333 19.8727 47.2333 18.508V13.908H45.6463V11.286H47.2333V8.526L50.5913 7.974V11.286H52.8453L53.5813 13.908H50.5913V18.002C50.5913 18.5387 50.7293 18.9833 51.0053 19.336C51.2813 19.6733 51.6799 19.842 52.2013 19.842C52.4006 19.842 52.6153 19.8113 52.8453 19.75C53.0753 19.6887 53.3053 19.6043 53.5353 19.497L54.5243 21.889C54.2636 22.1037 53.8803 22.2877 53.3743 22.441C52.8683 22.5943 52.4083 22.671 51.9943 22.671Z" fill="#08110D"/>
+<path d="M60.8106 22.671C59.4306 22.671 58.2883 22.3183 57.3836 21.613C56.4943 20.9077 56.0496 19.8727 56.0496 18.508V13.908H54.4626V11.286H56.0496V8.526L59.4076 7.974V11.286H61.6616L62.3976 13.908H59.4076V18.002C59.4076 18.5387 59.5456 18.9833 59.8216 19.336C60.0976 19.6733 60.4963 19.842 61.0176 19.842C61.217 19.842 61.4316 19.8113 61.6616 19.75C61.8916 19.6887 62.1216 19.6043 62.3516 19.497L63.3406 21.889C63.08 22.1037 62.6966 22.2877 62.1906 22.441C61.6846 22.5943 61.2246 22.671 60.8106 22.671Z" fill="#08110D"/>
+<path d="M66.936 22.648L67.327 21.705L63.279 11.539L66.683 11.125C67.097 12.229 67.511 13.333 67.925 14.437C68.339 15.541 68.7453 16.645 69.144 17.749L71.49 11.125H74.986L70.018 23.683C69.65 24.5877 69.0137 25.362 68.109 26.006C67.2043 26.6653 66.2383 27.1177 65.211 27.363L64.038 24.626C64.59 24.4113 65.165 24.143 65.763 23.821C66.361 23.499 66.752 23.108 66.936 22.648Z" fill="#08110D"/>
+<path d="M79.3491 22.28L76.8771 19.808V7.952L79.3491 5.48H86.8011L89.2851 7.952V11.816H85.8891V9.608L85.1571 8.876H81.0051L80.2731 9.608V18.152L81.0051 18.884H85.1571L85.8891 18.152V15.944H89.2851V19.808L86.8011 22.28H79.3491Z" fill="#08110D"/>
+<path d="M91.9268 22.28V7.952L94.3988 5.48H102.151L104.623 7.952V22.28H101.239V17.336H95.3108V22.28H91.9268ZM95.3108 13.952H101.239V9.608L100.507 8.876H96.0428L95.3108 9.608V13.952Z" fill="#08110D"/>
+<path d="M107.492 22.28V5.48H117.488L119.96 7.952V19.808L117.488 22.28H107.492ZM110.888 18.884H115.844L116.576 18.152V9.608L115.844 8.876H110.888V18.884Z" fill="#08110D"/>
+</svg>

public/manifest.json

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

src-tauri/Cargo.toml

@@ -12,15 +12,20 @@ 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.3.0", features = [] }
+tauri-build = { version = "1.4.0", features = [] }
 
 [dependencies]
-serde_json = "1.0"
+anyhow = "1"
+oauth2 = "4.4.1"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.3.0", features = [] }
+serde_json = "1.0"
+tauri = { version = "1.3.0", features = [ "updater", "path-all", "dialog-all", "fs-all", "http-request", "shell-open", "shell-open-api"] }
+tokio = { version = "1.29.1", features = ["time"] }
+toml = "0.6.0"
+tauri-plugin-fs-extra = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
 
 [features]
 # this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled.
 # If you use cargo directly instead of tauri's cli you can use this feature flag to switch between tauri's `dev` and `build` modes.
 # DO NOT REMOVE!!
-custom-protocol = [ "tauri/custom-protocol" ]
+custom-protocol = ["tauri/custom-protocol"]

src-tauri/build.rs

@@ -1,3 +1,3 @@
 fn main() {
-  tauri_build::build()
+    tauri_build::build()
 }

src-tauri/src/main.rs

@@ -1,8 +1,104 @@
 // Prevents additional console window on Windows in release, DO NOT REMOVE!!
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
-fn main() {
-  tauri::Builder::default()
-    .run(tauri::generate_context!())
-    .expect("error while running tauri application");
+use std::io::Read;
+
+use anyhow::Result;
+use oauth2::TokenResponse;
+use tauri::{InvokeError, Manager};
+
+/// This command returns the a json string parse from a toml file at the path.
+#[tauri::command]
+fn read_toml(path: &str) -> Result<String, InvokeError> {
+    let mut file = std::fs::File::open(path).map_err(|e| InvokeError::from_anyhow(e.into()))?;
+    let mut contents = String::new();
+    file.read_to_string(&mut contents)
+        .map_err(|e| InvokeError::from_anyhow(e.into()))?;
+    let value =
+        toml::from_str::<toml::Value>(&contents).map_err(|e| InvokeError::from_anyhow(e.into()))?;
+    let value = serde_json::to_string(&value).map_err(|e| InvokeError::from_anyhow(e.into()))?;
+    Ok(value)
+}
+
+/// This command returns a string that is the contents of a file at the path.
+#[tauri::command]
+fn read_txt_file(path: &str) -> Result<String, InvokeError> {
+    let mut file = std::fs::File::open(path).map_err(|e| InvokeError::from_anyhow(e.into()))?;
+    let mut contents = String::new();
+    file.read_to_string(&mut contents)
+        .map_err(|e| InvokeError::from_anyhow(e.into()))?;
+    Ok(contents)
+}
+
+/// This command instantiates a new window with auth.
+/// The string returned from this method is the access token.
+#[tauri::command]
+async fn login(app: tauri::AppHandle, host: &str) -> Result<String, InvokeError> {
+    println!("Logging in...");
+    // Do an OAuth 2.0 Device Authorization Grant dance to get a token.
+    let device_auth_url = oauth2::DeviceAuthorizationUrl::new(format!("{host}/oauth2/device/auth"))
+        .map_err(|e| InvokeError::from_anyhow(e.into()))?;
+    // We can hardcode the client ID.
+    // This value is safe to be embedded in version control.
+    // This is the client ID of the KittyCAD app.
+    let client_id = "2af127fb-e14e-400a-9c57-a9ed08d1a5b7".to_string();
+    let auth_client = oauth2::basic::BasicClient::new(
+        oauth2::ClientId::new(client_id),
+        None,
+        oauth2::AuthUrl::new(format!("{host}/authorize"))
+            .map_err(|e| InvokeError::from_anyhow(e.into()))?,
+        Some(
+            oauth2::TokenUrl::new(format!("{host}/oauth2/device/token"))
+                .map_err(|e| InvokeError::from_anyhow(e.into()))?,
+        ),
+    )
+    .set_auth_type(oauth2::AuthType::RequestBody)
+    .set_device_authorization_url(device_auth_url);
+
+    let details: oauth2::devicecode::StandardDeviceAuthorizationResponse = auth_client
+        .exchange_device_code()
+        .map_err(|e| InvokeError::from_anyhow(e.into()))?
+        .request_async(oauth2::reqwest::async_http_client)
+        .await
+        .map_err(|e| InvokeError::from_anyhow(e.into()))?;
+
+    let Some(auth_uri) = details.verification_uri_complete() else {
+        return Err(InvokeError::from("getting the verification uri failed"));
+    };
+
+    // Open the system browser with the auth_uri.
+    // We do this in the browser and not a seperate window because we want 1password and
+    // other crap to work well.
+    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
+        .exchange_device_access_token(&details)
+        .request_async(oauth2::reqwest::async_http_client, tokio::time::sleep, None)
+        .await
+        .map_err(|e| InvokeError::from_anyhow(e.into()))?
+        .access_token()
+        .secret()
+        .to_string();
+
+    Ok(token)
+}
+
+fn main() {
+    tauri::Builder::default()
+        .setup(|app| {
+            #[cfg(debug_assertions)] // only include this code on debug builds
+            {
+                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();
+            }
+            Ok(())
+        })
+        .invoke_handler(tauri::generate_handler![login, read_toml, read_txt_file])
+        .plugin(tauri_plugin_fs_extra::init())
+        .run(tauri::generate_context!())
+        .expect("error while running tauri application");
 }

src-tauri/tauri.conf.json

@@ -7,12 +7,41 @@
     "distDir": "../build"
   },
   "package": {
-    "productName": "untitled-app",
-    "version": "0.1.0"
+    "productName": "kittycad-modeling",
+    "version": "0.4.0"
   },
   "tauri": {
     "allowlist": {
-      "all": false
+      "all": false,
+      "dialog": {
+        "all": true,
+        "ask": true,
+        "confirm": true,
+        "message": true,
+        "open": true,
+        "save": true
+      },
+      "fs": {
+        "scope": [
+          "$HOME/**/*",
+          "$APPDATA/**/*"
+        ],
+        "all": true
+      },
+      "http": {
+        "request": true,
+        "scope": [
+          "https://dev.kittycad.io/*",
+          "https://kittycad.io/*",
+          "https://api.dev.kittycad.io/*"
+        ]
+      },
+      "shell": {
+        "open": true
+      },
+      "path": {
+        "all": true
+      }
     },
     "bundle": {
       "active": true,
@@ -29,7 +58,7 @@
         "icons/icon.icns",
         "icons/icon.ico"
       ],
-      "identifier": "untitled-app",
+      "identifier": "io.kittycad.modeling-app",
       "longDescription": "",
       "macOS": {
         "entitlements": null,
@@ -51,15 +80,20 @@
       "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": 600,
+        "height": 1200,
         "resizable": true,
-        "title": "untitled-app",
-        "width": 800
+        "title": "KittyCAD Modeling",
+        "width": 1800
       }
     ]
   }

src-tauri/tauri.macos.conf.json

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

src-tauri/tauri.windows.conf.json

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

src/App.test.tsx

@@ -1,6 +1,9 @@
-import React from 'react'
 import { render, screen } from '@testing-library/react'
-import App from './App'
+import { App } from './App'
+import { describe, test, vi } from 'vitest'
+import { BrowserRouter } from 'react-router-dom'
+import { GlobalStateProvider } from './components/GlobalStateProvider'
+import CommandBarProvider from 'components/CommandBar'
 
 let listener: ((rect: any) => void) | undefined = undefined
 ;(global as any).ResizeObserver = class ResizeObserver {
@@ -12,8 +15,38 @@ let listener: ((rect: any) => void) | undefined = undefined
   disconnect() {}
 }
 
-test('renders learn react link', () => {
-  render(<App />)
-  const linkElement = screen.getByText(/Variables/i)
-  expect(linkElement).toBeInTheDocument()
+describe('App tests', () => {
+  test('Renders the modeling app screen, including "Variables" pane.', () => {
+    vi.mock('react-router-dom', async () => {
+      const actual = (await vi.importActual('react-router-dom')) as Record<
+        string,
+        any
+      >
+      return {
+        ...actual,
+        useParams: () => ({ id: 'new' }),
+        useLoaderData: () => ({ code: null }),
+      }
+    })
+    render(
+      <TestWrap>
+        <App />
+      </TestWrap>
+    )
+    const linkElement = screen.getByText(/Variables/i)
+    expect(linkElement).toBeInTheDocument()
+
+    vi.restoreAllMocks()
+  })
 })
+
+function TestWrap({ children }: { children: React.ReactNode }) {
+  // wrap in router and xState context
+  return (
+    <BrowserRouter>
+      <CommandBarProvider>
+        <GlobalStateProvider>{children}</GlobalStateProvider>
+      </CommandBarProvider>
+    </BrowserRouter>
+  )
+}

src/App.tsx

@@ -1,72 +1,199 @@
-import { useRef, useState, useEffect } from 'react'
-import { Canvas } from '@react-three/fiber'
-import { Allotment } from 'allotment'
-import { OrbitControls, OrthographicCamera } from '@react-three/drei'
-import { asyncLexer } from './lang/tokeniser'
-import { abstractSyntaxTree } from './lang/abstractSyntaxTree'
-import { executor, ExtrudeGroup, SketchGroup } from './lang/executor'
-import CodeMirror from '@uiw/react-codemirror'
-import { javascript } from '@codemirror/lang-javascript'
-import { ViewUpdate } from '@codemirror/view'
+import {
+  useRef,
+  useEffect,
+  useLayoutEffect,
+  useMemo,
+  useCallback,
+  MouseEventHandler,
+} from 'react'
+import { DebugPanel } from './components/DebugPanel'
+import { v4 as uuidv4 } from 'uuid'
+import { asyncParser } from './lang/abstractSyntaxTree'
+import { _executor } from './lang/executor'
+import CodeMirror, { Extension } from '@uiw/react-codemirror'
+import { linter, lintGutter } from '@codemirror/lint'
+import { ViewUpdate, EditorView } from '@codemirror/view'
 import {
   lineHighlightField,
   addLineHighlight,
 } from './editor/highlightextension'
-import { useStore } from './useStore'
-import { Toolbar } from './Toolbar'
-import { BasePlanes } from './components/BasePlanes'
-import { SketchPlane } from './components/SketchPlane'
-import { Logs } from './components/Logs'
-import { AxisIndicator } from './components/AxisIndicator'
-import { RenderViewerArtifacts } from './components/RenderViewerArtifacts'
-import { PanelHeader } from './components/PanelHeader'
+import { PaneType, Selections, useStore } from './useStore'
+import Server from './editor/lsp/server'
+import Client from './editor/lsp/client'
+import { Logs, KCLErrors } from './components/Logs'
+import { CollapsiblePanel } from './components/CollapsiblePanel'
 import { MemoryPanel } from './components/MemoryPanel'
 import { useHotKeyListener } from './hooks/useHotKeyListener'
 import { Stream } from './components/Stream'
 import ModalContainer from 'react-modal-promise'
+import { FromServer, IntoServer } from './editor/lsp/codec'
+import {
+  EngineCommand,
+  EngineCommandManager,
+} from './lang/std/engineConnection'
+import { isOverlap, throttle } from './lib/utils'
+import { AppHeader } from './components/AppHeader'
+import { KCLError, kclErrToDiagnostic } from './lang/errors'
+import { Resizable } from 're-resizable'
+import {
+  faCode,
+  faCodeCommit,
+  faSquareRootVariable,
+} from '@fortawesome/free-solid-svg-icons'
+import { useHotkeys } from 'react-hotkeys-hook'
+import { TEST } from './env'
+import { getNormalisedCoordinates } from './lib/utils'
+import { Themes, getSystemTheme } from './lib/theme'
+import { isTauri } from './lib/isTauri'
+import { useLoaderData, useParams } from 'react-router-dom'
+import { writeTextFile } from '@tauri-apps/api/fs'
+import { PROJECT_ENTRYPOINT } from './lib/tauriFS'
+import { IndexLoaderData } from './Router'
+import { toast } from 'react-hot-toast'
+import { useGlobalStateContext } from 'hooks/useGlobalStateContext'
+import { onboardingPaths } from 'routes/Onboarding'
+import { LanguageServerClient } from 'editor/lsp'
+import kclLanguage from 'editor/lsp/language'
+import { CSSRuleObject } from 'tailwindcss/types/config'
 
-const OrrthographicCamera = OrthographicCamera as any
-
-function App() {
-  const cam = useRef()
+export function App() {
+  const { code: loadedCode, project } = useLoaderData() as IndexLoaderData
+  const pathParams = useParams()
+  const streamRef = useRef<HTMLDivElement>(null)
   useHotKeyListener()
   const {
     editorView,
     setEditorView,
     setSelectionRanges,
-    selectionRanges: selectionRange,
-    guiMode,
-    lastGuiMode,
+    selectionRanges,
     addLog,
+    addKCLError,
     code,
     setCode,
     setAst,
     setError,
-    errorState,
     setProgramMemory,
     resetLogs,
+    resetKCLErrors,
     selectionRangeTypeMap,
+    setArtifactMap,
+    engineCommandManager,
+    setEngineCommandManager,
+    highlightRange,
+    setHighlightRange,
+    setCursor2,
+    sourceRangeMap,
+    setMediaStream,
+    setIsStreamReady,
+    isStreamReady,
+    isLSPServerReady,
+    setIsLSPServerReady,
+    isMouseDownInStream,
+    formatCode,
+    openPanes,
+    setOpenPanes,
+    didDragInStream,
+    setStreamDimensions,
+    streamDimensions,
   } = useStore((s) => ({
     editorView: s.editorView,
     setEditorView: s.setEditorView,
     setSelectionRanges: s.setSelectionRanges,
     selectionRanges: s.selectionRanges,
-    guiMode: s.guiMode,
     setGuiMode: s.setGuiMode,
     addLog: s.addLog,
     code: s.code,
     setCode: s.setCode,
     setAst: s.setAst,
-    lastGuiMode: s.lastGuiMode,
     setError: s.setError,
-    errorState: s.errorState,
     setProgramMemory: s.setProgramMemory,
     resetLogs: s.resetLogs,
+    resetKCLErrors: s.resetKCLErrors,
     selectionRangeTypeMap: s.selectionRangeTypeMap,
+    setArtifactMap: s.setArtifactNSourceRangeMaps,
+    engineCommandManager: s.engineCommandManager,
+    setEngineCommandManager: s.setEngineCommandManager,
+    highlightRange: s.highlightRange,
+    setHighlightRange: s.setHighlightRange,
+    isShiftDown: s.isShiftDown,
+    setCursor: s.setCursor,
+    setCursor2: s.setCursor2,
+    sourceRangeMap: s.sourceRangeMap,
+    setMediaStream: s.setMediaStream,
+    isStreamReady: s.isStreamReady,
+    setIsStreamReady: s.setIsStreamReady,
+    isLSPServerReady: s.isLSPServerReady,
+    setIsLSPServerReady: s.setIsLSPServerReady,
+    isMouseDownInStream: s.isMouseDownInStream,
+    formatCode: s.formatCode,
+    addKCLError: s.addKCLError,
+    openPanes: s.openPanes,
+    setOpenPanes: s.setOpenPanes,
+    didDragInStream: s.didDragInStream,
+    setStreamDimensions: s.setStreamDimensions,
+    streamDimensions: s.streamDimensions,
   }))
+
+  const {
+    auth: {
+      context: { token },
+    },
+    settings: {
+      context: { showDebugPanel, theme, onboardingStatus, textWrapping },
+    },
+  } = useGlobalStateContext()
+
+  const editorTheme = theme === Themes.System ? getSystemTheme() : theme
+
+  // Pane toggling keyboard shortcuts
+  const togglePane = useCallback(
+    (newPane: PaneType) =>
+      openPanes.includes(newPane)
+        ? setOpenPanes(openPanes.filter((p) => p !== newPane))
+        : setOpenPanes([...openPanes, newPane]),
+    [openPanes, setOpenPanes]
+  )
+  useHotkeys('shift + c', () => togglePane('code'))
+  useHotkeys('shift + v', () => togglePane('variables'))
+  useHotkeys('shift + l', () => togglePane('logs'))
+  useHotkeys('shift + e', () => togglePane('kclErrors'))
+  useHotkeys('shift + d', () => togglePane('debug'))
+
+  const paneOpacity =
+    onboardingStatus === onboardingPaths.CAMERA
+      ? 'opacity-20'
+      : didDragInStream
+      ? '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])
+
   // const onChange = React.useCallback((value: string, viewUpdate: ViewUpdate) => {
   const onChange = (value: string, viewUpdate: ViewUpdate) => {
     setCode(value)
+    if (isTauri() && pathParams.id) {
+      // Save the file to disk
+      // Note that PROJECT_ENTRYPOINT is hardcoded until we support multiple files
+      writeTextFile(pathParams.id + '/' + PROJECT_ENTRYPOINT, value).catch(
+        (err) => {
+          // TODO: add Sentry per GH issue #254 (https://github.com/KittyCAD/modeling-app/issues/254)
+          console.error('error saving file', err)
+          toast.error('Error saving file, please check file permissions')
+        }
+      )
+    }
     if (editorView) {
       editorView?.dispatch({ effects: addLineHighlight.of([0, 0]) })
     }
@@ -78,18 +205,17 @@ function App() {
     const ranges = viewUpdate.state.selection.ranges
 
     const isChange =
-      ranges.length !== selectionRange.codeBasedSelections.length ||
+      ranges.length !== selectionRanges.codeBasedSelections.length ||
       ranges.some(({ from, to }, i) => {
         return (
-          from !== selectionRange.codeBasedSelections[i].range[0] ||
-          to !== selectionRange.codeBasedSelections[i].range[1]
+          from !== selectionRanges.codeBasedSelections[i].range[0] ||
+          to !== selectionRanges.codeBasedSelections[i].range[1]
         )
       })
 
     if (!isChange) return
-    setSelectionRanges({
-      otherSelections: [],
-      codeBasedSelections: ranges.map(({ from, to }, i) => {
+    const codeBasedSelections: Selections['codeBasedSelections'] = ranges.map(
+      ({ from, to }) => {
         if (selectionRangeTypeMap[to]) {
           return {
             type: selectionRangeTypeMap[to],
@@ -100,167 +226,364 @@ function App() {
           type: 'default',
           range: [from, to],
         }
-      }),
+      }
+    )
+    const idBasedSelections = codeBasedSelections
+      .map(({ type, range }) => {
+        const hasOverlap = Object.entries(sourceRangeMap).filter(
+          ([_, sourceRange]) => {
+            return isOverlap(sourceRange, range)
+          }
+        )
+        if (hasOverlap.length) {
+          return {
+            type,
+            id: hasOverlap[0][0],
+          }
+        }
+      })
+      .filter(Boolean) as any
+
+    engineCommandManager?.cusorsSelected({
+      otherSelections: [],
+      idBasedSelections,
+    })
+
+    setSelectionRanges({
+      otherSelections: [],
+      codeBasedSelections,
     })
   }
-  const [geoArray, setGeoArray] = useState<(ExtrudeGroup | SketchGroup)[]>([])
+  const streamWidth = streamRef?.current?.offsetWidth
+  const streamHeight = streamRef?.current?.offsetHeight
+
+  const width = streamWidth ? streamWidth : 0
+  const quadWidth = Math.round(width / 4) * 4
+  const height = streamHeight ? streamHeight : 0
+  const quadHeight = Math.round(height / 4) * 4
+
+  useLayoutEffect(() => {
+    setStreamDimensions({
+      streamWidth: quadWidth,
+      streamHeight: quadHeight,
+    })
+    if (!width || !height) return
+    const eng = new EngineCommandManager({
+      setMediaStream,
+      setIsStreamReady,
+      width: quadWidth,
+      height: quadHeight,
+      token,
+    })
+    setEngineCommandManager(eng)
+    return () => {
+      eng?.tearDown()
+    }
+  }, [quadWidth, quadHeight])
+
   useEffect(() => {
+    if (!isStreamReady) return
+    if (!engineCommandManager) return
+    let unsubFn: any[] = []
     const asyncWrap = async () => {
       try {
         if (!code) {
-          setGeoArray([])
           setAst(null)
           return
         }
-        const tokens = await asyncLexer(code)
-        const _ast = abstractSyntaxTree(tokens)
+        const _ast = await asyncParser(code)
         setAst(_ast)
         resetLogs()
-        const programMemory = executor(_ast, {
-          root: {
-            log: {
-              type: 'userVal',
-              value: (a: any) => {
-                addLog(a)
+        resetKCLErrors()
+        engineCommandManager.endSession()
+        engineCommandManager.startNewSession()
+        const programMemory = await _executor(
+          _ast,
+          {
+            root: {
+              _0: {
+                type: 'userVal',
+                value: 0,
+                __meta: [],
+              },
+              _90: {
+                type: 'userVal',
+                value: 90,
+                __meta: [],
+              },
+              _180: {
+                type: 'userVal',
+                value: 180,
+                __meta: [],
+              },
+              _270: {
+                type: 'userVal',
+                value: 270,
+                __meta: [],
               },
-              __meta: [
-                {
-                  pathToNode: [],
-                  sourceRange: [0, 0],
-                },
-              ],
-            },
-            _0: {
-              type: 'userVal',
-              value: 0,
-              __meta: [],
-            },
-            _90: {
-              type: 'userVal',
-              value: 90,
-              __meta: [],
-            },
-            _180: {
-              type: 'userVal',
-              value: 180,
-              __meta: [],
-            },
-            _270: {
-              type: 'userVal',
-              value: 270,
-              __meta: [],
             },
           },
-          _sketch: [],
-        })
-        setProgramMemory(programMemory)
-        const geos = programMemory?.return
-          ?.map(({ name }: { name: string }) => {
-            const artifact = programMemory?.root?.[name]
-            if (
-              artifact.type === 'extrudeGroup' ||
-              artifact.type === 'sketchGroup'
-            ) {
-              return artifact
-            }
-            return null
-          })
-          .filter((a) => a) as (ExtrudeGroup | SketchGroup)[]
+          engineCommandManager
+        )
+
+        const { artifactMap, sourceRangeMap } =
+          await engineCommandManager.waitForAllCommands()
+
+        setArtifactMap({ artifactMap, sourceRangeMap })
+        const unSubHover = engineCommandManager.subscribeToUnreliable({
+          event: 'highlight_set_entity',
+          callback: ({ data }) => {
+            if (data?.entity_id) {
+              const sourceRange = sourceRangeMap[data.entity_id]
+              setHighlightRange(sourceRange)
+            } else if (
+              !highlightRange ||
+              (highlightRange[0] !== 0 && highlightRange[1] !== 0)
+            ) {
+              setHighlightRange([0, 0])
+            }
+          },
+        })
+        const unSubClick = engineCommandManager.subscribeTo({
+          event: 'select_with_point',
+          callback: ({ data }) => {
+            if (!data?.entity_id) {
+              setCursor2()
+              return
+            }
+            const sourceRange = sourceRangeMap[data.entity_id]
+            setCursor2({ range: sourceRange, type: 'default' })
+          },
+        })
+        unsubFn.push(unSubHover, unSubClick)
+        if (programMemory !== undefined) {
+          setProgramMemory(programMemory)
+        }
 
-        setGeoArray(geos)
-        console.log(programMemory)
         setError()
       } catch (e: any) {
-        setError('problem')
-        console.log(e)
-        addLog(e)
+        if (e instanceof KCLError) {
+          addKCLError(e)
+        } else {
+          setError('problem')
+          console.log(e)
+          addLog(e)
+        }
       }
     }
     asyncWrap()
-  }, [code])
+    return () => {
+      unsubFn.forEach((fn) => fn())
+    }
+  }, [code, isStreamReady, engineCommandManager])
+
+  const debounceSocketSend = throttle<EngineCommand>((message) => {
+    engineCommandManager?.sendSceneCommand(message)
+  }, 16)
+  const handleMouseMove: MouseEventHandler<HTMLDivElement> = ({
+    clientX,
+    clientY,
+    ctrlKey,
+    shiftKey,
+    currentTarget,
+    nativeEvent,
+  }) => {
+    nativeEvent.preventDefault()
+
+    const { x, y } = getNormalisedCoordinates({
+      clientX,
+      clientY,
+      el: currentTarget,
+      ...streamDimensions,
+    })
+
+    const interaction = ctrlKey ? 'zoom' : shiftKey ? 'pan' : 'rotate'
+
+    const newCmdId = uuidv4()
+
+    if (isMouseDownInStream) {
+      debounceSocketSend({
+        type: 'modeling_cmd_req',
+        cmd: {
+          type: 'camera_drag_move',
+          interaction,
+          window: { x, y },
+        },
+        cmd_id: newCmdId,
+      })
+    } else {
+      debounceSocketSend({
+        type: 'modeling_cmd_req',
+        cmd: {
+          type: 'highlight_set_entity',
+          selected_at_window: { x, y },
+        },
+        cmd_id: newCmdId,
+      })
+    }
+  }
+
+  // So this is a bit weird, we need to initialize the lsp server and client.
+  // But the server happens async so we break this into two parts.
+  // Below is the client and server promise.
+  const { lspClient } = useMemo(() => {
+    const intoServer: IntoServer = new IntoServer()
+    const fromServer: FromServer = FromServer.create()
+    const client = new Client(fromServer, intoServer)
+    if (!TEST) {
+      Server.initialize(intoServer, fromServer).then((lspServer) => {
+        lspServer.start()
+        setIsLSPServerReady(true)
+      })
+    }
+
+    const lspClient = new LanguageServerClient({ client })
+    return { lspClient }
+  }, [setIsLSPServerReady])
+
+  // Here we initialize the plugin which will start the client.
+  // When we have multi-file support the name of the file will be a dep of
+  // this use memo, as well as the directory structure, which I think is
+  // a good setup becuase it will restart the client but not the server :)
+  // We do not want to restart the server, its just wasteful.
+  const kclLSP = useMemo(() => {
+    let plugin = null
+    if (isLSPServerReady && !TEST) {
+      // Set up the lsp plugin.
+      const lsp = kclLanguage({
+        // When we have more than one file, we'll need to change this.
+        documentUri: `file:///we-just-have-one-file-for-now.kcl`,
+        workspaceFolders: null,
+        client: lspClient,
+      })
+
+      plugin = lsp
+    }
+    return plugin
+  }, [lspClient, isLSPServerReady])
+
+  const editorExtensions = useMemo(() => {
+    const extensions = [lineHighlightField] as Extension[]
+
+    if (kclLSP) extensions.push(kclLSP)
+
+    // These extensions have proven to mess with vitest
+    if (!TEST) {
+      extensions.push(
+        lintGutter(),
+        linter((_view) => {
+          return kclErrToDiagnostic(useStore.getState().kclErrors)
+        })
+      )
+      if (textWrapping === 'On') extensions.push(EditorView.lineWrapping)
+    }
+
+    return extensions
+  }, [kclLSP, textWrapping])
+
   return (
-    <div className="h-screen">
+    <div
+      className="h-screen overflow-hidden relative flex flex-col cursor-pointer select-none"
+      onMouseMove={handleMouseMove}
+      ref={streamRef}
+    >
+      <AppHeader
+        className={
+          'transition-opacity transition-duration-75 ' +
+          paneOpacity +
+          (isMouseDownInStream ? ' pointer-events-none' : '')
+        }
+        project={project}
+        enableMenu={true}
+      />
       <ModalContainer />
-      <Allotment snap={true}>
-        <Allotment vertical defaultSizes={[400, 1, 1]} minSize={20}>
-          <div className="h-full flex flex-col items-start">
-            <PanelHeader title="Editor" />
-            {/* <button
-              disabled={!shouldFormat}
-              onClick={formatCode}
-              className={`${!shouldFormat && 'text-gray-300'}`}
-            >
-              format
-            </button> */}
+      <Resizable
+        className={
+          'h-full flex flex-col flex-1 z-10 my-5 ml-5 pr-1 transition-opacity transition-duration-75 ' +
+          (isMouseDownInStream || onboardingStatus === 'camera'
+            ? ' pointer-events-none '
+            : ' ') +
+          paneOpacity
+        }
+        defaultSize={{
+          width: '400px',
+          height: 'auto',
+        }}
+        minWidth={200}
+        maxWidth={600}
+        minHeight={'auto'}
+        maxHeight={'auto'}
+        handleClasses={{
+          right:
+            'hover:bg-liquid-30/40 dark:hover:bg-liquid-10/40 bg-transparent transition-colors duration-100 transition-ease-out delay-100',
+        }}
+      >
+        <div className="h-full flex flex-col justify-between">
+          <CollapsiblePanel
+            title="Code"
+            icon={faCode}
+            className="open:!mb-2"
+            open={openPanes.includes('code')}
+          >
+            <div className="px-2 py-1">
+              <button
+                // disabled={!shouldFormat}
+                onClick={formatCode}
+                // className={`${!shouldFormat && 'text-gray-300'}`}
+              >
+                format
+              </button>
+            </div>
             <div
-              className="bg-red h-full w-full overflow-auto"
               id="code-mirror-override"
+              className="full-height-subtract"
+              style={{ '--height-subtract': '4.25rem' } as CSSRuleObject}
             >
               <CodeMirror
                 className="h-full"
                 value={code}
-                extensions={[javascript({ jsx: true }), lineHighlightField]}
+                extensions={editorExtensions}
                 onChange={onChange}
                 onUpdate={onUpdate}
+                theme={editorTheme}
                 onCreateEditor={(_editorView) => setEditorView(_editorView)}
               />
             </div>
-          </div>
-          <MemoryPanel />
-          <Logs />
-        </Allotment>
-        <Allotment vertical defaultSizes={[400, 1]} minSize={20}>
-          <div className="h-full">
-            <PanelHeader title="Drafting Board" />
-            <Toolbar />
-            <div className="border h-full border-gray-300 relative">
-              <div className="absolute inset-0">
-                <Canvas>
-                  <OrbitControls
-                    enableDamping={false}
-                    enablePan
-                    enableRotate={
-                      !(
-                        guiMode.mode === 'canEditSketch' ||
-                        guiMode.mode === 'sketch'
-                      )
-                    }
-                    enableZoom
-                    reverseOrbit={false}
-                  />
-                  <OrrthographicCamera
-                    ref={cam}
-                    makeDefault
-                    position={[0, 0, 1000]}
-                    zoom={100}
-                    rotation={[0, 0, 0]}
-                    far={2000}
-                  />
-                  <ambientLight />
-                  <pointLight position={[10, 10, 10]} />
-                  <RenderViewerArtifacts artifacts={geoArray} />
-                  <BasePlanes />
-                  <SketchPlane />
-                  <AxisIndicator />
-                </Canvas>
-              </div>
-              {errorState.isError && (
-                <div className="absolute inset-0 bg-gray-700/20">
-                  <pre>
-                    {'last first: \n\n' +
-                      JSON.stringify(lastGuiMode, null, 2) +
-                      '\n\n' +
-                      JSON.stringify(guiMode)}
-                  </pre>
-                </div>
-              )}
-            </div>
-          </div>
-          <Stream />
-        </Allotment>
-      </Allotment>
+          </CollapsiblePanel>
+          <section className="flex flex-col">
+            <MemoryPanel
+              theme={editorTheme}
+              open={openPanes.includes('variables')}
+              title="Variables"
+              icon={faSquareRootVariable}
+            />
+            <Logs
+              theme={editorTheme}
+              open={openPanes.includes('logs')}
+              title="Logs"
+              icon={faCodeCommit}
+            />
+            <KCLErrors
+              theme={editorTheme}
+              open={openPanes.includes('kclErrors')}
+              title="KCL Errors"
+              iconClassNames={{ icon: 'group-open:text-destroy-30' }}
+            />
+          </section>
+        </div>
+      </Resizable>
+      <Stream className="absolute inset-0 z-0" />
+      {showDebugPanel && (
+        <DebugPanel
+          title="Debug"
+          className={
+            'transition-opacity transition-duration-75 ' +
+            paneOpacity +
+            (isMouseDownInStream ? ' pointer-events-none' : '')
+          }
+          open={openPanes.includes('debug')}
+        />
+      )}
     </div>
   )
 }
-
-export default App

src/Auth.tsx

@@ -1,31 +1,16 @@
-import useSWR from 'swr'
-import fetcher from './lib/fetcher'
-import withBaseUrl from './lib/withBaseURL'
-import App from './App'
+import Loading from './components/Loading'
+import { useGlobalStateContext } from 'hooks/useGlobalStateContext'
 
-export const Auth = () => {
-  const { data: user } = useSWR(withBaseUrl('/user'), fetcher) as any
-  const isLocalHost =
-    typeof window !== 'undefined' && window.location.hostname === 'localhost'
+// Wrapper around protected routes, used in src/Router.tsx
+export const Auth = ({ children }: React.PropsWithChildren) => {
+  const {
+    auth: { state },
+  } = useGlobalStateContext()
+  const isLoggedIn = state.matches('checkIfLoggedIn')
 
-  if (!user && !isLocalHost) {
-    return (
-      <>
-        <div className=" bg-gray-800 p-1 px-4 rounded-r-lg pointer-events-auto flex items-center">
-          <a
-            className="font-bold mr-2 text-purple-400"
-            rel="noopener noreferrer"
-            target={'_self'}
-            href={`https://dev.kittycad.io/signin?callbackUrl=${encodeURIComponent(
-              typeof window !== 'undefined' && window.location.href
-            )}`}
-          >
-            Sign in
-          </a>
-        </div>
-      </>
-    )
-  }
-
-  return <App />
+  return isLoggedIn ? (
+    <Loading>Loading KittyCAD Modeling App...</Loading>
+  ) : (
+    <>{children}</>
+  )
 }

src/Router.tsx

@@ -0,0 +1,269 @@
+import { App } from './App'
+import {
+  createBrowserRouter,
+  Outlet,
+  redirect,
+  useLocation,
+  RouterProvider,
+} from 'react-router-dom'
+import {
+  matchRoutes,
+  createRoutesFromChildren,
+  useNavigationType,
+} from 'react-router'
+import { useEffect } from 'react'
+import { ErrorPage } from './components/ErrorPage'
+import { Settings } from './routes/Settings'
+import Onboarding, {
+  onboardingRoutes,
+  onboardingPaths,
+} from './routes/Onboarding'
+import SignIn from './routes/SignIn'
+import { Auth } from './Auth'
+import { isTauri } from './lib/isTauri'
+import Home from './routes/Home'
+import { FileEntry, readDir, readTextFile } from '@tauri-apps/api/fs'
+import makeUrlPathRelative from './lib/makeUrlPathRelative'
+import {
+  initializeProjectDirectory,
+  isProjectDirectory,
+  PROJECT_ENTRYPOINT,
+} from './lib/tauriFS'
+import { metadata, type Metadata } from 'tauri-plugin-fs-extra-api'
+import DownloadAppBanner from './components/DownloadAppBanner'
+import { GlobalStateProvider } from './components/GlobalStateProvider'
+import {
+  SETTINGS_PERSIST_KEY,
+  settingsMachine,
+} from './machines/settingsMachine'
+import { ContextFrom } from 'xstate'
+import CommandBarProvider from 'components/CommandBar'
+import { TEST, VITE_KC_SENTRY_DSN } from './env'
+import * as Sentry from '@sentry/react'
+
+if (VITE_KC_SENTRY_DSN && !TEST) {
+  Sentry.init({
+    dsn: VITE_KC_SENTRY_DSN,
+    // TODO(paultag): pass in the right env here.
+    // environment: "production",
+    integrations: [
+      new Sentry.BrowserTracing({
+        routingInstrumentation: Sentry.reactRouterV6Instrumentation(
+          useEffect,
+          useLocation,
+          useNavigationType,
+          createRoutesFromChildren,
+          matchRoutes
+        ),
+      }),
+      new Sentry.Replay(),
+    ],
+
+    // Set tracesSampleRate to 1.0 to capture 100%
+    // of transactions for performance monitoring.
+    tracesSampleRate: 1.0,
+
+    // TODO: Add in kittycad.io endpoints
+    tracePropagationTargets: ['localhost'],
+
+    // Capture Replay for 10% of all sessions,
+    // plus for 100% of sessions with an error
+    replaysSessionSampleRate: 0.1,
+    replaysOnErrorSampleRate: 1.0,
+  })
+}
+
+const prependRoutes =
+  (routesObject: Record<string, string>) => (prepend: string) => {
+    return Object.fromEntries(
+      Object.entries(routesObject).map(([constName, path]) => [
+        constName,
+        prepend + path,
+      ])
+    )
+  }
+
+export const paths = {
+  INDEX: '/',
+  HOME: '/home',
+  FILE: '/file',
+  SETTINGS: '/settings',
+  SIGN_IN: '/signin',
+  ONBOARDING: prependRoutes(onboardingPaths)(
+    '/onboarding'
+  ) as typeof onboardingPaths,
+}
+
+export type IndexLoaderData = {
+  code: string | null
+  project?: ProjectWithEntryPointMetadata
+}
+
+export type ProjectWithEntryPointMetadata = FileEntry & {
+  entrypoint_metadata: Metadata
+}
+export type HomeLoaderData = {
+  projects: ProjectWithEntryPointMetadata[]
+}
+
+type CreateBrowserRouterArg = Parameters<typeof createBrowserRouter>[0]
+
+const addGlobalContextToElements = (
+  routes: CreateBrowserRouterArg
+): CreateBrowserRouterArg =>
+  routes.map((route) =>
+    'element' in route
+      ? {
+          ...route,
+          element: (
+            <CommandBarProvider>
+              <GlobalStateProvider>{route.element}</GlobalStateProvider>
+            </CommandBarProvider>
+          ),
+        }
+      : route
+  )
+
+const router = createBrowserRouter(
+  addGlobalContextToElements([
+    {
+      path: paths.INDEX,
+      loader: () =>
+        isTauri() ? redirect(paths.HOME) : redirect(paths.FILE + '/new'),
+    },
+    {
+      path: paths.FILE + '/:id',
+      element: (
+        <Auth>
+          <Outlet />
+          <App />
+          {!isTauri() && import.meta.env.PROD && <DownloadAppBanner />}
+        </Auth>
+      ),
+      errorElement: <ErrorPage />,
+      id: paths.FILE,
+      loader: async ({
+        request,
+        params,
+      }): Promise<IndexLoaderData | Response> => {
+        const fetchedStorage = localStorage?.getItem(SETTINGS_PERSIST_KEY)
+        const persistedSettings = JSON.parse(fetchedStorage || '{}') as Partial<
+          ContextFrom<typeof settingsMachine>
+        >
+
+        const status = persistedSettings.onboardingStatus || ''
+        const notEnRouteToOnboarding = !request.url.includes(
+          paths.ONBOARDING.INDEX
+        )
+        // '' is the initial state, 'done' and 'dismissed' are the final states
+        const hasValidOnboardingStatus =
+          status.length === 0 || !(status === 'done' || status === 'dismissed')
+        const shouldRedirectToOnboarding =
+          notEnRouteToOnboarding && hasValidOnboardingStatus
+
+        if (shouldRedirectToOnboarding) {
+          return redirect(
+            makeUrlPathRelative(paths.ONBOARDING.INDEX) + status.slice(1)
+          )
+        }
+
+        if (params.id && params.id !== 'new') {
+          // Note that PROJECT_ENTRYPOINT is hardcoded until we support multiple files
+          const code = await readTextFile(params.id + '/' + PROJECT_ENTRYPOINT)
+          const entrypoint_metadata = await metadata(
+            params.id + '/' + PROJECT_ENTRYPOINT
+          )
+          const children = await readDir(params.id)
+
+          return {
+            code,
+            project: {
+              name: params.id.slice(params.id.lastIndexOf('/') + 1),
+              path: params.id,
+              children,
+              entrypoint_metadata,
+            },
+          }
+        }
+
+        return {
+          code: '',
+        }
+      },
+      children: [
+        {
+          path: makeUrlPathRelative(paths.SETTINGS),
+          element: <Settings />,
+        },
+        {
+          path: makeUrlPathRelative(paths.ONBOARDING.INDEX),
+          element: <Onboarding />,
+          children: onboardingRoutes,
+        },
+      ],
+    },
+    {
+      path: paths.HOME,
+      element: (
+        <Auth>
+          <Outlet />
+          <Home />
+        </Auth>
+      ),
+      loader: async () => {
+        if (!isTauri()) {
+          return redirect(paths.FILE + '/new')
+        }
+        const fetchedStorage = localStorage?.getItem(SETTINGS_PERSIST_KEY)
+        const persistedSettings = JSON.parse(fetchedStorage || '{}') as Partial<
+          ContextFrom<typeof settingsMachine>
+        >
+        const projectDir = await initializeProjectDirectory(
+          persistedSettings.defaultDirectory || ''
+        )
+        if (projectDir !== persistedSettings.defaultDirectory) {
+          localStorage.setItem(
+            SETTINGS_PERSIST_KEY,
+            JSON.stringify({
+              ...persistedSettings,
+              defaultDirectory: projectDir,
+            })
+          )
+        }
+        const projectsNoMeta = (await readDir(projectDir)).filter(
+          isProjectDirectory
+        )
+        const projects = await Promise.all(
+          projectsNoMeta.map(async (p) => ({
+            entrypoint_metadata: await metadata(
+              p.path + '/' + PROJECT_ENTRYPOINT
+            ),
+            ...p,
+          }))
+        )
+
+        return {
+          projects,
+        }
+      },
+      children: [
+        {
+          path: makeUrlPathRelative(paths.SETTINGS),
+          element: <Settings />,
+        },
+      ],
+    },
+    {
+      path: paths.SIGN_IN,
+      element: <SignIn />,
+    },
+  ])
+)
+
+/**
+ * All routes in the app, used in src/index.tsx
+ * @returns RouterProvider
+ */
+export const Router = () => {
+  return <RouterProvider router={router} />
+}

src/Toolbar.module.css

@@ -0,0 +1,60 @@
+.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;
+}
+
+: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

@@ -11,6 +11,11 @@ import { SetAngleLength } from './components/Toolbar/setAngleLength'
 import { ConvertToVariable } from './components/Toolbar/ConvertVariable'
 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'
 
 export const Toolbar = () => {
   const {
@@ -29,76 +34,26 @@ export const Toolbar = () => {
     programMemory: s.programMemory,
   }))
 
-  return (
-    <div>
-      {guiMode.mode === 'default' && (
-        <button
-          onClick={() => {
-            setGuiMode({
-              mode: 'sketch',
-              sketchMode: 'selectFace',
-            })
-          }}
-          className="border m-1 px-1 rounded text-xs"
-        >
-          Start Sketch
-        </button>
-      )}
-      {guiMode.mode === 'canEditExtrude' && (
-        <button
-          onClick={() => {
-            if (!ast) return
-            const pathToNode = getNodePathFromSourceRange(
-              ast,
-              selectionRanges.codeBasedSelections[0].range
-            )
-            const { modifiedAst } = sketchOnExtrudedFace(
-              ast,
-              pathToNode,
-              programMemory
-            )
-            updateAst(modifiedAst)
-          }}
-          className="border m-1 px-1 rounded text-xs"
-        >
-          SketchOnFace
-        </button>
-      )}
-      {(guiMode.mode === 'canEditSketch' || false) && (
-        <button
-          onClick={() => {
-            setGuiMode({
-              mode: 'sketch',
-              sketchMode: 'sketchEdit',
-              pathToNode: guiMode.pathToNode,
-              rotation: guiMode.rotation,
-              position: guiMode.position,
-            })
-          }}
-          className="border m-1 px-1 rounded text-xs"
-        >
-          Edit Sketch
-        </button>
-      )}
-      {guiMode.mode === 'canEditSketch' && (
-        <>
+  useEffect(() => {
+    console.log('guiMode', guiMode)
+  }, [guiMode])
+
+  function ToolbarButtons() {
+    return (
+      <>
+        {guiMode.mode === 'default' && (
           <button
             onClick={() => {
-              if (!ast) return
-              const pathToNode = getNodePathFromSourceRange(
-                ast,
-                selectionRanges.codeBasedSelections[0].range
-              )
-              const { modifiedAst, pathToExtrudeArg } = extrudeSketch(
-                ast,
-                pathToNode
-              )
-              updateAst(modifiedAst, { focusPath: pathToExtrudeArg })
+              setGuiMode({
+                mode: 'sketch',
+                sketchMode: 'selectFace',
+              })
             }}
-            className="border m-1 px-1 rounded text-xs"
           >
-            ExtrudeSketch
+            Start Sketch
           </button>
+        )}
+        {guiMode.mode === 'canEditExtrude' && (
           <button
             onClick={() => {
               if (!ast) return
@@ -106,84 +61,182 @@ export const Toolbar = () => {
                 ast,
                 selectionRanges.codeBasedSelections[0].range
               )
-              const { modifiedAst, pathToExtrudeArg } = extrudeSketch(
+              const { modifiedAst } = sketchOnExtrudedFace(
                 ast,
                 pathToNode,
-                false
+                programMemory
               )
-              updateAst(modifiedAst, { focusPath: pathToExtrudeArg })
+              updateAst(modifiedAst)
             }}
-            className="border m-1 px-1 rounded text-xs"
           >
-            ExtrudeSketch (w/o pipe)
+            SketchOnFace
           </button>
-        </>
-      )}
-
-      {guiMode.mode === 'sketch' && (
-        <button
-          onClick={() => setGuiMode({ mode: 'default' })}
-          className="border m-1 px-1 rounded text-xs"
-        >
-          Exit sketch
-        </button>
-      )}
-      {toolTips
-        .filter(
-          // (sketchFnName) => !['angledLineThatIntersects'].includes(sketchFnName)
-          (sketchFnName) => ['line'].includes(sketchFnName)
-        )
-        .map((sketchFnName) => {
-          if (
-            guiMode.mode !== 'sketch' ||
-            !('isTooltip' in guiMode || guiMode.sketchMode === 'sketchEdit')
-          )
-            return null
-          return (
+        )}
+        {(guiMode.mode === 'canEditSketch' || false) && (
+          <button
+            onClick={() => {
+              setGuiMode({
+                mode: 'sketch',
+                sketchMode: 'sketchEdit',
+                pathToNode: guiMode.pathToNode,
+                rotation: guiMode.rotation,
+                position: guiMode.position,
+              })
+            }}
+          >
+            Edit Sketch
+          </button>
+        )}
+        {guiMode.mode === 'canEditSketch' && (
+          <>
             <button
-              key={sketchFnName}
-              className={`border m-0.5 px-0.5 rounded text-xs ${
-                guiMode.sketchMode === sketchFnName && 'bg-gray-400'
-              }`}
-              onClick={() =>
-                setGuiMode({
-                  ...guiMode,
-                  ...(guiMode.sketchMode === sketchFnName
-                    ? {
-                        sketchMode: 'sketchEdit',
-                        // todo: ...guiMod is adding isTooltip: true, will probably just fix with xstate migtaion
-                      }
-                    : {
-                        sketchMode: sketchFnName,
-                        isTooltip: true,
-                      }),
-                })
-              }
+              onClick={() => {
+                if (!ast) return
+                const pathToNode = getNodePathFromSourceRange(
+                  ast,
+                  selectionRanges.codeBasedSelections[0].range
+                )
+                const { modifiedAst, pathToExtrudeArg } = extrudeSketch(
+                  ast,
+                  pathToNode
+                )
+                updateAst(modifiedAst, { focusPath: pathToExtrudeArg })
+              }}
             >
-              {sketchFnName}
-              {guiMode.sketchMode === sketchFnName && '✅'}
+              ExtrudeSketch
             </button>
+            <button
+              onClick={() => {
+                if (!ast) return
+                const pathToNode = getNodePathFromSourceRange(
+                  ast,
+                  selectionRanges.codeBasedSelections[0].range
+                )
+                const { modifiedAst, pathToExtrudeArg } = extrudeSketch(
+                  ast,
+                  pathToNode,
+                  false
+                )
+                updateAst(modifiedAst, { focusPath: pathToExtrudeArg })
+              }}
+            >
+              ExtrudeSketch (w/o pipe)
+            </button>
+          </>
+        )}
+
+        {guiMode.mode === 'sketch' && (
+          <button onClick={() => setGuiMode({ mode: 'default' })}>
+            Exit sketch
+          </button>
+        )}
+        {toolTips
+          .filter(
+            // (sketchFnName) => !['angledLineThatIntersects'].includes(sketchFnName)
+            (sketchFnName) => ['line'].includes(sketchFnName)
           )
-        })}
-      <br></br>
-      <ConvertToVariable />
-      <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 />
-    </div>
+          .map((sketchFnName) => {
+            if (
+              guiMode.mode !== 'sketch' ||
+              !('isTooltip' in guiMode || guiMode.sketchMode === 'sketchEdit')
+            )
+              return null
+            return (
+              <button
+                key={sketchFnName}
+                onClick={() =>
+                  setGuiMode({
+                    ...guiMode,
+                    ...(guiMode.sketchMode === sketchFnName
+                      ? {
+                          sketchMode: 'sketchEdit',
+                          // todo: ...guiMod is adding isTooltip: true, will probably just fix with xstate migtaion
+                        }
+                      : {
+                          sketchMode: sketchFnName,
+                          isTooltip: true,
+                        }),
+                  })
+                }
+              >
+                {sketchFnName}
+                {guiMode.sketchMode === sketchFnName && '✅'}
+              </button>
+            )
+          })}
+        <ConvertToVariable />
+        <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 />
+      </>
+    )
+  }
+
+  return (
+    <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 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"
+      >
+        <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 />
+          </section>
+        </Popover.Panel>
+      </Transition>
+    </Popover>
   )
 }

src/colors.css

@@ -0,0 +1,263 @@
+:root {
+  /*
+        Generated using Catmosphere Theme Builder
+        by KittyCAD
+        https://catmosphere-theme-builder.vercel.app/?colors=%5B%7B%22from%22:%7B%22l%22:1,%22c%22:0.01,%22h%22:78%7D,%22to%22:%7B%22l%22:0.065,%22c%22:0.05,%22h%22:182.6%7D,%22stops%22:10,%22steps%22:12%7D,%7B%22from%22:%7B%22l%22:1,%22c%22:0.45,%22h%22:122.4%7D,%22to%22:%7B%22l%22:0.13,%22c%22:0.031,%22h%22:137.2%7D,%22stops%22:10,%22steps%22:12%7D,%7B%22from%22:%7B%22l%22:1,%22c%22:0.13,%22h%22:176%7D,%22to%22:%7B%22l%22:0.116,%22c%22:0.097,%22h%22:213.1%7D,%22stops%22:10,%22steps%22:12%7D,%7B%22from%22:%7B%22l%22:1,%22c%22:0.169,%22h%22:144.4%7D,%22to%22:%7B%22l%22:0.12,%22c%22:0.45,%22h%22:132.7%7D,%22steps%22:12%7D,%7B%22from%22:%7B%22l%22:1,%22c%22:0.087,%22h%22:261.6%7D,%22to%22:%7B%22l%22:0.22,%22c%22:0.084,%22h%22:275.5%7D,%22steps%22:12,%22uuid%22:%227tpx9pf1zd6%22%7D,%7B%22from%22:%7B%22l%22:0.954,%22c%22:0.108,%22h%22:280.6%7D,%22to%22:%7B%22l%22:0.166,%22c%22:0.188,%22h%22:263.8%7D,%22steps%22:12,%22uuid%22:%22vu652mebd3%22%7D,%7B%22from%22:%7B%22l%22:1,%22c%22:0.115,%22h%22:0%7D,%22to%22:%7B%22l%22:0.096,%22c%22:0.261,%22h%22:302%7D,%22steps%22:12%7D,%7B%22from%22:%7B%22l%22:1,%22c%22:0.185,%22h%22:19.8%7D,%22to%22:%7B%22l%22:0.368,%22c%22:0.45,%22h%22:9.4%7D,%22steps%22:8,%22uuid%22:%22g05inkd34l%22%7D,%7B%22from%22:%7B%22l%22:0.912,%22c%22:0.139,%22h%22:87%7D,%22to%22:%7B%22l%22:0.502,%22c%22:0.45,%22h%22:97.7%7D,%22steps%22:8,%22uuid%22:%22l892hcw4ef%22%7D,%7B%22from%22:%7B%22l%22:0.89,%22c%22:0.16,%22h%22:143.4%7D,%22to%22:%7B%22l%22:0.466,%22c%22:0.208,%22h%22:147.7%7D,%22steps%22:8,%22uuid%22:%22hkd09y9ov4h%22%7D%5D
+    */
+  /* Chalkboard */
+  --chalkboard-10: oklch(99.7% 0.008766 102.8deg);
+  --chalkboard-20: oklch(91.34% 0.009353 109deg);
+  --chalkboard-30: oklch(82.99% 0.00994 115.2deg);
+  --chalkboard-40: oklch(74.63% 0.01053 121.4deg);
+  --chalkboard-50: oklch(66.27% 0.01111 127.6deg);
+  --chalkboard-60: oklch(57.92% 0.0117 133.9deg);
+  --chalkboard-70: oklch(49.56% 0.01229 140.1deg);
+  --chalkboard-80: oklch(41.21% 0.01288 146.3deg);
+  --chalkboard-90: oklch(32.85% 0.01346 152.5deg);
+  --chalkboard-100: oklch(24.49% 0.01405 158.7deg);
+  --chalkboard-110: oklch(16.14% 0.01464 164.9deg);
+  --chalkboard-120: oklch(7.783% 0.01522 171.1deg);
+
+  /* Energy  */
+  --energy-10: oklch(93.31% 0.227 122.3deg);
+  --energy-20: oklch(86.01% 0.2092 123.6deg);
+  --energy-30: oklch(78.71% 0.1914 125deg);
+  --energy-40: oklch(71.41% 0.1736 126.3deg);
+  --energy-50: oklch(64.1% 0.1557 127.7deg);
+  --energy-60: oklch(56.8% 0.1379 129.1deg);
+  --energy-70: oklch(49.5% 0.1201 130.4deg);
+  --energy-80: oklch(42.2% 0.1023 131.8deg);
+  --energy-90: oklch(34.9% 0.08446 133.1deg);
+  --energy-100: oklch(27.6% 0.06664 134.5deg);
+  --energy-110: oklch(20.3% 0.04882 135.8deg);
+  --energy-120: oklch(13% 0.031 137.2deg);
+
+  /* Liquid */
+  --liquid-10: oklch(93.45% 0.1002 193.1deg);
+  --liquid-20: oklch(86.21% 0.09511 198.7deg);
+  --liquid-30: oklch(78.97% 0.09003 204.2deg);
+  --liquid-40: oklch(71.74% 0.08495 209.8deg);
+  --liquid-50: oklch(64.5% 0.07988 215.3deg);
+  --liquid-60: oklch(57.26% 0.0748 220.9deg);
+  --liquid-70: oklch(50.03% 0.06972 226.4deg);
+  --liquid-80: oklch(42.79% 0.06465 232deg);
+  --liquid-90: oklch(35.56% 0.05957 237.5deg);
+  --liquid-100: oklch(28.32% 0.0545 243.1deg);
+  --liquid-110: oklch(21.08% 0.04942 248.6deg);
+  --liquid-120: oklch(13.85% 0.04434 254.2deg);
+
+  /* Fern */
+  --fern-10: oklch(93.22% 0.1243 144.8deg);
+  --fern-20: oklch(86.59% 0.1193 144.6deg);
+  --fern-30: oklch(79.97% 0.1143 144.4deg);
+  --fern-40: oklch(73.34% 0.1093 144.2deg);
+  --fern-50: oklch(66.71% 0.1043 144deg);
+  --fern-60: oklch(60.09% 0.09927 143.8deg);
+  --fern-70: oklch(53.46% 0.09425 143.6deg);
+  --fern-80: oklch(46.83% 0.08924 143.3deg);
+  --fern-90: oklch(40.21% 0.08422 143.1deg);
+  --fern-100: oklch(33.58% 0.0792 142.9deg);
+  --fern-110: oklch(26.95% 0.07419 142.7deg);
+  --fern-120: oklch(20.33% 0.06917 142.5deg);
+
+  /* Cool */
+  --cool-10: oklch(97.71% 0.03321 196.6deg);
+  --cool-20: oklch(90.82% 0.03783 203.8deg);
+  --cool-30: oklch(83.94% 0.04245 211deg);
+  --cool-40: oklch(77.06% 0.04706 218.1deg);
+  --cool-50: oklch(70.18% 0.05168 225.3deg);
+  --cool-60: oklch(63.29% 0.0563 232.5deg);
+  --cool-70: oklch(56.41% 0.06091 239.6deg);
+  --cool-80: oklch(49.53% 0.06553 246.8deg);
+  --cool-90: oklch(42.65% 0.07015 254deg);
+  --cool-100: oklch(35.76% 0.07477 261.2deg);
+  --cool-110: oklch(28.88% 0.07938 268.3deg);
+  --cool-120: oklch(22% 0.084 275.5deg);
+
+  /* River */
+  --river-10: oklch(93.35% 0.03169 273.4deg);
+  --river-20: oklch(86.91% 0.04221 273.1deg);
+  --river-30: oklch(80.46% 0.05274 272.7deg);
+  --river-40: oklch(74.01% 0.06326 272.4deg);
+  --river-50: oklch(67.57% 0.07378 272deg);
+  --river-60: oklch(61.12% 0.0843 271.7deg);
+  --river-70: oklch(54.67% 0.09483 271.4deg);
+  --river-80: oklch(48.22% 0.1053 271deg);
+  --river-90: oklch(41.78% 0.1159 270.7deg);
+  --river-100: oklch(35.33% 0.1264 270.4deg);
+  --river-110: oklch(28.88% 0.1369 270deg);
+  --river-120: oklch(22.44% 0.1474 269.7deg);
+
+  /* Berry */
+  --berry-10: oklch(93.77% 0.05212 329deg);
+  --berry-20: oklch(87.3% 0.05912 325.3deg);
+  --berry-30: oklch(80.82% 0.06612 321.6deg);
+  --berry-40: oklch(74.34% 0.07313 317.8deg);
+  --berry-50: oklch(67.86% 0.08013 314.1deg);
+  --berry-60: oklch(61.39% 0.08713 310.3deg);
+  --berry-70: oklch(54.91% 0.09413 306.6deg);
+  --berry-80: oklch(48.43% 0.1011 302.8deg);
+  --berry-90: oklch(41.95% 0.1081 299.1deg);
+  --berry-100: oklch(35.47% 0.1151 295.4deg);
+  --berry-110: oklch(29% 0.1221 291.6deg);
+  --berry-120: oklch(22.52% 0.1291 287.9deg);
+
+  /* Destroy */
+  --destroy-10: oklch(88.21% 0.06281 14.85deg);
+  --destroy-20: oklch(83.23% 0.08511 16.91deg);
+  --destroy-30: oklch(78.25% 0.1074 18.96deg);
+  --destroy-40: oklch(73.27% 0.1297 21.01deg);
+  --destroy-50: oklch(68.29% 0.152 23.07deg);
+  --destroy-60: oklch(63.31% 0.1743 25.12deg);
+  --destroy-70: oklch(58.33% 0.1966 27.18deg);
+  --destroy-80: oklch(53.35% 0.2189 29.23deg);
+
+  /* Warn */
+  --warn-10: oklch(90.19% 0.1361 92deg);
+  --warn-20: oklch(84.6% 0.1388 84.84deg);
+  --warn-30: oklch(79.01% 0.1414 77.68deg);
+  --warn-40: oklch(73.42% 0.144 70.52deg);
+  --warn-50: oklch(67.83% 0.1466 63.36deg);
+  --warn-60: oklch(62.24% 0.1492 56.2deg);
+  --warn-70: oklch(56.65% 0.1518 49.04deg);
+  --warn-80: oklch(51.06% 0.1544 41.88deg);
+
+  /* Succeed */
+  --succeed-10: oklch(89% 0.16 143.4deg);
+  --succeed-20: oklch(83.23% 0.1608 143.3deg);
+  --succeed-30: oklch(77.46% 0.1616 143.1deg);
+  --succeed-40: oklch(71.69% 0.1623 143deg);
+  --succeed-50: oklch(65.92% 0.1631 142.9deg);
+  --succeed-60: oklch(60.16% 0.1639 142.8deg);
+  --succeed-70: oklch(54.39% 0.1647 142.6deg);
+  --succeed-80: oklch(48.62% 0.1654 142.5deg);
+
+  /* Base values for use with Tailwind. */
+  /* Chalkboard */
+  --_chalkboard-10: 99.7% 0.008766 102.8deg;
+  --_chalkboard-20: 91.34% 0.009353 109deg;
+  --_chalkboard-30: 82.99% 0.00994 115.2deg;
+  --_chalkboard-40: 74.63% 0.01053 121.4deg;
+  --_chalkboard-50: 66.27% 0.01111 127.6deg;
+  --_chalkboard-60: 57.92% 0.0117 133.9deg;
+  --_chalkboard-70: 49.56% 0.01229 140.1deg;
+  --_chalkboard-80: 41.21% 0.01288 146.3deg;
+  --_chalkboard-90: 32.85% 0.01346 152.5deg;
+  --_chalkboard-100: 24.49% 0.01405 158.7deg;
+  --_chalkboard-110: 16.14% 0.01464 164.9deg;
+  --_chalkboard-120: 7.783% 0.01522 171.1deg;
+
+  /* Energy  */
+  --_energy-10: 93.31% 0.227 122.3deg;
+  --_energy-20: 86.01% 0.2092 123.6deg;
+  --_energy-30: 78.71% 0.1914 125deg;
+  --_energy-40: 71.41% 0.1736 126.3deg;
+  --_energy-50: 64.1% 0.1557 127.7deg;
+  --_energy-60: 56.8% 0.1379 129.1deg;
+  --_energy-70: 49.5% 0.1201 130.4deg;
+  --_energy-80: 42.2% 0.1023 131.8deg;
+  --_energy-90: 34.9% 0.08446 133.1deg;
+  --_energy-100: 27.6% 0.06664 134.5deg;
+  --_energy-110: 20.3% 0.04882 135.8deg;
+  --_energy-120: 13% 0.031 137.2deg;
+
+  /* Liquid */
+  --_liquid-10: 93.45% 0.1002 193.1deg;
+  --_liquid-20: 86.21% 0.09511 198.7deg;
+  --_liquid-30: 78.97% 0.09003 204.2deg;
+  --_liquid-40: 71.74% 0.08495 209.8deg;
+  --_liquid-50: 64.5% 0.07988 215.3deg;
+  --_liquid-60: 57.26% 0.0748 220.9deg;
+  --_liquid-70: 50.03% 0.06972 226.4deg;
+  --_liquid-80: 42.79% 0.06465 232deg;
+  --_liquid-90: 35.56% 0.05957 237.5deg;
+  --_liquid-100: 28.32% 0.0545 243.1deg;
+  --_liquid-110: 21.08% 0.04942 248.6deg;
+  --_liquid-120: 13.85% 0.04434 254.2deg;
+
+  /* Fern */
+  --_fern-10: 93.22% 0.1243 144.8deg;
+  --_fern-20: 86.59% 0.1193 144.6deg;
+  --_fern-30: 79.97% 0.1143 144.4deg;
+  --_fern-40: 73.34% 0.1093 144.2deg;
+  --_fern-50: 66.71% 0.1043 144deg;
+  --_fern-60: 60.09% 0.09927 143.8deg;
+  --_fern-70: 53.46% 0.09425 143.6deg;
+  --_fern-80: 46.83% 0.08924 143.3deg;
+  --_fern-90: 40.21% 0.08422 143.1deg;
+  --_fern-100: 33.58% 0.0792 142.9deg;
+  --_fern-110: 26.95% 0.07419 142.7deg;
+  --_fern-120: 20.33% 0.06917 142.5deg;
+
+  /* Cool */
+  --_cool-10: 97.71% 0.03321 196.6deg;
+  --_cool-20: 90.82% 0.03783 203.8deg;
+  --_cool-30: 83.94% 0.04245 211deg;
+  --_cool-40: 77.06% 0.04706 218.1deg;
+  --_cool-50: 70.18% 0.05168 225.3deg;
+  --_cool-60: 63.29% 0.0563 232.5deg;
+  --_cool-70: 56.41% 0.06091 239.6deg;
+  --_cool-80: 49.53% 0.06553 246.8deg;
+  --_cool-90: 42.65% 0.07015 254deg;
+  --_cool-100: 35.76% 0.07477 261.2deg;
+  --_cool-110: 28.88% 0.07938 268.3deg;
+  --_cool-120: 22% 0.084 275.5deg;
+
+  /* River */
+  --_river-10: 93.35% 0.03169 273.4deg;
+  --_river-20: 86.91% 0.04221 273.1deg;
+  --_river-30: 80.46% 0.05274 272.7deg;
+  --_river-40: 74.01% 0.06326 272.4deg;
+  --_river-50: 67.57% 0.07378 272deg;
+  --_river-60: 61.12% 0.0843 271.7deg;
+  --_river-70: 54.67% 0.09483 271.4deg;
+  --_river-80: 48.22% 0.1053 271deg;
+  --_river-90: 41.78% 0.1159 270.7deg;
+  --_river-100: 35.33% 0.1264 270.4deg;
+  --_river-110: 28.88% 0.1369 270deg;
+  --_river-120: 22.44% 0.1474 269.7deg;
+
+  /* Berry */
+  --_berry-10: 93.77% 0.05212 329deg;
+  --_berry-20: 87.3% 0.05912 325.3deg;
+  --_berry-30: 80.82% 0.06612 321.6deg;
+  --_berry-40: 74.34% 0.07313 317.8deg;
+  --_berry-50: 67.86% 0.08013 314.1deg;
+  --_berry-60: 61.39% 0.08713 310.3deg;
+  --_berry-70: 54.91% 0.09413 306.6deg;
+  --_berry-80: 48.43% 0.1011 302.8deg;
+  --_berry-90: 41.95% 0.1081 299.1deg;
+  --_berry-100: 35.47% 0.1151 295.4deg;
+  --_berry-110: 29% 0.1221 291.6deg;
+  --_berry-120: 22.52% 0.1291 287.9deg;
+
+  /* Destroy */
+  --_destroy-10: 88.21% 0.06281 14.85deg;
+  --_destroy-20: 83.23% 0.08511 16.91deg;
+  --_destroy-30: 78.25% 0.1074 18.96deg;
+  --_destroy-40: 73.27% 0.1297 21.01deg;
+  --_destroy-50: 68.29% 0.152 23.07deg;
+  --_destroy-60: 63.31% 0.1743 25.12deg;
+  --_destroy-70: 58.33% 0.1966 27.18deg;
+  --_destroy-80: 53.35% 0.2189 29.23deg;
+
+  /* Warn */
+  --_warn-10: 90.19% 0.1361 92deg;
+  --_warn-20: 84.6% 0.1388 84.84deg;
+  --_warn-30: 79.01% 0.1414 77.68deg;
+  --_warn-40: 73.42% 0.144 70.52deg;
+  --_warn-50: 67.83% 0.1466 63.36deg;
+  --_warn-60: 62.24% 0.1492 56.2deg;
+  --_warn-70: 56.65% 0.1518 49.04deg;
+  --_warn-80: 51.06% 0.1544 41.88deg;
+
+  /* Succeed */
+  --_succeed-10: 89% 0.16 143.4deg;
+  --_succeed-20: 83.23% 0.1608 143.3deg;
+  --_succeed-30: 77.46% 0.1616 143.1deg;
+  --_succeed-40: 71.69% 0.1623 143deg;
+  --_succeed-50: 65.92% 0.1631 142.9deg;
+  --_succeed-60: 60.16% 0.1639 142.8deg;
+  --_succeed-70: 54.39% 0.1647 142.6deg;
+  --_succeed-80: 48.62% 0.1654 142.5deg;
+}

src/components/ActionButton.tsx

@@ -0,0 +1,92 @@
+import { ActionIcon, ActionIconProps } from './ActionIcon'
+import React from 'react'
+import { paths } from '../Router'
+import { Link } from 'react-router-dom'
+import type { LinkProps } from 'react-router-dom'
+
+interface BaseActionButtonProps {
+  icon?: ActionIconProps
+  className?: string
+}
+
+type ActionButtonAsButton = BaseActionButtonProps &
+  Omit<
+    React.ButtonHTMLAttributes<HTMLButtonElement>,
+    keyof BaseActionButtonProps
+  > & {
+    Element: 'button'
+  }
+
+type ActionButtonAsLink = BaseActionButtonProps &
+  Omit<LinkProps, keyof BaseActionButtonProps> & {
+    Element: 'link'
+  }
+
+type ActionButtonAsExternal = BaseActionButtonProps &
+  Omit<
+    React.AnchorHTMLAttributes<HTMLAnchorElement>,
+    keyof BaseActionButtonProps
+  > & {
+    Element: 'externalLink'
+  }
+
+type ActionButtonAsElement = BaseActionButtonProps &
+  Omit<React.HTMLAttributes<HTMLElement>, keyof BaseActionButtonProps> & {
+    Element: React.ComponentType<React.HTMLAttributes<HTMLButtonElement>>
+  }
+
+type ActionButtonProps =
+  | ActionButtonAsButton
+  | ActionButtonAsLink
+  | ActionButtonAsExternal
+  | ActionButtonAsElement
+
+export const ActionButton = (props: ActionButtonProps) => {
+  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 || ''}`
+
+  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, ...rest } = props
+      return (
+        <button className={classNames} {...rest}>
+          {props.icon && <ActionIcon {...icon} />}
+          {children}
+        </button>
+      )
+    }
+    case 'link': {
+      const { Element, to, icon, children, className, ...rest } = props
+      return (
+        <Link to={to || paths.INDEX} className={classNames} {...rest}>
+          {icon && <ActionIcon {...icon} />}
+          {children}
+        </Link>
+      )
+    }
+    case 'externalLink': {
+      const { Element, icon, children, className, ...rest } = props
+      return (
+        <a className={classNames} {...rest}>
+          {icon && <ActionIcon {...icon} />}
+          {children}
+        </a>
+      )
+    }
+    default: {
+      const { Element, icon, children, className, ...rest } = props
+      if (!Element) throw new Error('Element is required')
+
+      return (
+        <Element className={classNames} {...rest}>
+          {props.icon && <ActionIcon {...props.icon} />}
+          {children}
+        </Element>
+      )
+    }
+  }
+}

src/components/ActionIcon.tsx

@@ -0,0 +1,54 @@
+import {
+  IconDefinition as SolidIconDefinition,
+  faCircleExclamation,
+} from '@fortawesome/free-solid-svg-icons'
+import { IconDefinition as BrandIconDefinition } from '@fortawesome/free-brands-svg-icons'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+
+const iconSizes = {
+  sm: 12,
+  md: 14.4,
+  lg: 20,
+  xl: 28,
+}
+
+export interface ActionIconProps extends React.PropsWithChildren {
+  icon?: SolidIconDefinition | BrandIconDefinition
+  className?: string
+  bgClassName?: string
+  iconClassName?: string
+  size?: keyof typeof iconSizes
+}
+
+export const ActionIcon = ({
+  icon = faCircleExclamation,
+  className,
+  bgClassName,
+  iconClassName,
+  size = 'md',
+  children,
+}: ActionIconProps) => {
+  return (
+    <div
+      className={
+        `p-${
+          size === 'xl' ? '2' : '1'
+        } w-fit inline-grid place-content-center ${className} ` +
+        (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')
+      }
+    >
+      {children || (
+        <FontAwesomeIcon
+          icon={icon}
+          width={iconSizes[size]}
+          height={iconSizes[size]}
+          className={
+            iconClassName ||
+            'text-liquid-20 h-auto group-hover:text-liquid-10 hover:text-liquid-10 dark:text-liquid-100 dark:group-hover:text-liquid-100 dark:hover:text-liquid-100'
+          }
+        />
+      )}
+    </div>
+  )
+}

src/components/AppHeader.module.css

@@ -0,0 +1,7 @@
+/*
+  Some CSS cannot be represented
+  in Tailwind, such as complex grid layouts.
+ */
+.header {
+  grid-template-columns: 1fr auto 1fr;
+}

src/components/AppHeader.tsx

@@ -0,0 +1,52 @@
+import { Toolbar } from '../Toolbar'
+import UserSidebarMenu from './UserSidebarMenu'
+import { ProjectWithEntryPointMetadata } from '../Router'
+import ProjectSidebarMenu from './ProjectSidebarMenu'
+import { useGlobalStateContext } from 'hooks/useGlobalStateContext'
+import styles from './AppHeader.module.css'
+
+interface AppHeaderProps extends React.PropsWithChildren {
+  showToolbar?: boolean
+  project?: ProjectWithEntryPointMetadata
+  className?: string
+  enableMenu?: boolean
+}
+
+export const AppHeader = ({
+  showToolbar = true,
+  project,
+  children,
+  className = '',
+  enableMenu = false,
+}: AppHeaderProps) => {
+  const {
+    auth: {
+      context: { user },
+    },
+  } = useGlobalStateContext()
+
+  return (
+    <header
+      className={
+        (showToolbar ? 'grid ' : 'flex justify-between ') +
+        styles.header +
+        ' 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} />
+      {/* Toolbar if the context deems it */}
+      {showToolbar && (
+        <div className="max-w-4xl">
+          <Toolbar />
+        </div>
+      )}
+      {/* If there are children, show them, otherwise show User menu */}
+      {children || (
+        <div className="ml-auto">
+          <UserSidebarMenu user={user} />
+        </div>
+      )}
+    </header>
+  )
+}

src/components/AvailableVarsHelpers.tsx

@@ -1,9 +1,6 @@
 import { useEffect, useState, useRef } from 'react'
-import {
-  abstractSyntaxTree,
-  BinaryPart,
-  Value,
-} from '../lang/abstractSyntaxTree'
+import { parser_wasm } from '../lang/abstractSyntaxTree'
+import { BinaryPart, Value } from '../lang/abstractSyntaxTreeTypes'
 import { executor } from '../lang/executor'
 import {
   createIdentifier,
@@ -12,7 +9,6 @@ import {
   findUniqueName,
 } from '../lang/modifyAst'
 import { findAllPreviousVariables, PrevVariable } from '../lang/queryAst'
-import { lexer } from '../lang/tokeniser'
 import { useStore } from '../useStore'
 
 export const AvailableVars = ({
@@ -96,11 +92,14 @@ export function useCalc({
   newVariableInsertIndex: number
   setNewVariableName: (a: string) => void
 } {
-  const { ast, programMemory, selectionRange } = useStore((s) => ({
-    ast: s.ast,
-    programMemory: s.programMemory,
-    selectionRange: s.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>
@@ -141,25 +140,27 @@ export function useCalc({
   }, [ast, programMemory, selectionRange])
 
   useEffect(() => {
+    if (!engineCommandManager) return
     try {
       const code = `const __result__ = ${value}\nshow(__result__)`
-      const ast = abstractSyntaxTree(lexer(code))
+      const ast = parser_wasm(code)
       const _programMem: any = { root: {} }
       availableVarInfo.variables.forEach(({ key, value }) => {
         _programMem.root[key] = { type: 'userVal', value, __meta: [] }
       })
-      const programMemory = executor(ast, _programMem)
-      const resultDeclaration = ast.body.find(
-        (a) =>
-          a.type === 'VariableDeclaration' &&
-          a.declarations?.[0]?.id?.name === '__result__'
-      )
-      const init =
-        resultDeclaration?.type === 'VariableDeclaration' &&
-        resultDeclaration?.declarations?.[0]?.init
-      const result = programMemory?.root?.__result__?.value
-      setCalcResult(typeof result === 'number' ? String(result) : 'NAN')
-      init && setValueNode(init)
+      executor(ast, _programMem, engineCommandManager).then((programMemory) => {
+        const resultDeclaration = ast.body.find(
+          (a) =>
+            a.type === 'VariableDeclaration' &&
+            a.declarations?.[0]?.id?.name === '__result__'
+        )
+        const init =
+          resultDeclaration?.type === 'VariableDeclaration' &&
+          resultDeclaration?.declarations?.[0]?.init
+        const result = programMemory?.root?.__result__?.value
+        setCalcResult(typeof result === 'number' ? String(result) : 'NAN')
+        init && setValueNode(init)
+      })
     } catch (e) {
       setCalcResult('NAN')
       setValueNode(null)

src/components/AxisIndicator.tsx

@@ -1,16 +0,0 @@
-export const AxisIndicator = () => (
-  <>
-    <mesh position={[0.5, 0, 0]}>
-      <boxBufferGeometry args={[1, 0.05, 0.05]} />
-      <meshStandardMaterial color="red" />
-    </mesh>
-    <mesh position={[0, 0.5, 0]}>
-      <boxBufferGeometry args={[0.05, 1, 0.05]} />
-      <meshStandardMaterial color="blue" />
-    </mesh>
-    <mesh position={[0, 0, 0.5]}>
-      <boxBufferGeometry args={[0.05, 0.05, 1]} />
-      <meshStandardMaterial color="green" />
-    </mesh>
-  </>
-)

src/components/BasePlanes.tsx

@@ -1,121 +0,0 @@
-import { useState } from 'react'
-import { DoubleSide, Vector3 } from 'three'
-import { useStore } from '../useStore'
-import { Intersection } from '@react-three/fiber'
-import { Text } from '@react-three/drei'
-import { addSketchTo } from '../lang/modifyAst'
-import { Program } from '../lang/abstractSyntaxTree'
-import { Quaternion } from 'three'
-
-const opacity = 0.1
-
-export const BasePlanes = () => {
-  const [axisIndex, setAxisIndex] = useState<null | number>(null)
-  const { setGuiMode, guiMode, ast, updateAst } = useStore(
-    ({ guiMode, setGuiMode, ast, updateAst }) => ({
-      guiMode,
-      setGuiMode,
-      ast,
-      updateAst,
-    })
-  )
-
-  const onPointerEvent = ({
-    intersections,
-  }: {
-    intersections: Intersection[]
-  }) => {
-    if (!intersections.length) {
-      setAxisIndex(null)
-      return
-    }
-    let closestIntersection = intersections[0]
-    intersections.forEach((intersection) => {
-      if (intersection.distance < closestIntersection.distance)
-        closestIntersection = intersection
-    })
-    const smallestIndex = Number(closestIntersection.eventObject.name)
-    setAxisIndex(smallestIndex)
-  }
-  const onClick = () => {
-    if (guiMode.mode !== 'sketch') {
-      return null
-    }
-    if (guiMode.sketchMode !== 'selectFace') {
-      return null
-    }
-
-    let _ast: Program = ast
-      ? ast
-      : {
-          type: 'Program',
-          start: 0,
-          end: 0,
-          body: [],
-          nonCodeMeta: {},
-        }
-    const axis = axisIndex === 0 ? 'xy' : axisIndex === 1 ? 'xz' : 'yz'
-    const quaternion = new Quaternion()
-    if (axisIndex === 1) {
-      quaternion.setFromAxisAngle(new Vector3(1, 0, 0), Math.PI / 2)
-    } else if (axisIndex === 2) {
-      quaternion.setFromAxisAngle(new Vector3(0, 1, 0), Math.PI / 2)
-    }
-    const { modifiedAst, id, pathToNode } = addSketchTo(_ast, axis)
-
-    setGuiMode({
-      mode: 'sketch',
-      sketchMode: 'sketchEdit',
-      rotation: quaternion.toArray() as [number, number, number, number],
-      position: [0, 0, 0],
-      pathToNode,
-    })
-
-    updateAst(modifiedAst)
-  }
-  if (guiMode.mode !== 'sketch') {
-    return null
-  }
-  if (guiMode.sketchMode !== 'selectFace') {
-    return null
-  }
-  return (
-    <>
-      {Array.from({ length: 3 }).map((_, index) => (
-        <mesh
-          key={index}
-          rotation-x={index === 1 ? -Math.PI / 2 : 0}
-          rotation-y={index === 2 ? -Math.PI / 2 : 0}
-          onPointerMove={onPointerEvent}
-          onPointerOut={onPointerEvent}
-          onClick={onClick}
-          name={`${index}`}
-        >
-          <planeGeometry args={[5, 5]} />
-          <meshStandardMaterial
-            color="blue"
-            side={DoubleSide}
-            transparent
-            opacity={opacity + (axisIndex === index ? 0.3 : 0)}
-          />
-          <Text
-            fontSize={1}
-            color="#555"
-            position={[1, 1, 0.01]}
-            font={'/roboto.woff'}
-          >
-            {index === 0 ? 'xy' : index === 1 ? 'xz' : 'yz'}
-          </Text>
-          <Text
-            fontSize={1}
-            color="#555"
-            position={[1, 1, -0.01]}
-            font={'/roboto.woff'}
-          >
-            {index === 0 ? 'xy' : index === 1 ? 'xz' : 'yz'}
-          </Text>
-        </mesh>
-      ))}
-    </>
-  )
-}

src/components/CollapsiblePanel.module.css

@@ -0,0 +1,52 @@
+.panel {
+  @apply relative z-0;
+  @apply bg-chalkboard-10/70 backdrop-blur-sm;
+}
+
+:global(.dark) .panel {
+  @apply bg-chalkboard-110/50 backdrop-blur-0;
+}
+
+.header {
+  @apply sticky top-0 z-10 cursor-pointer;
+  @apply flex items-center gap-2 w-full p-2;
+  @apply font-mono text-xs font-bold select-none text-chalkboard-90;
+  @apply bg-chalkboard-20;
+}
+
+.header:not(:last-of-type) {
+  @apply border-b;
+}
+
+:global(.dark) .header {
+  @apply bg-chalkboard-110 border-b-chalkboard-90 text-chalkboard-30;
+}
+
+:global(.dark) .header:not(:last-of-type) {
+  @apply border-b-2;
+}
+
+.panel:first-of-type .header {
+  @apply rounded-t;
+}
+
+.panel:last-of-type .header {
+  @apply rounded-b;
+}
+
+.panel[open] .header {
+  @apply rounded-t rounded-b-none;
+}
+
+.panel[open] {
+  @apply flex-grow max-h-full h-48 my-1 rounded;
+}
+
+.panel[open] + .panel[open],
+.panel[open]:first-of-type {
+  @apply mt-0;
+}
+
+.panel[open]:last-of-type {
+  @apply mb-0;
+}

src/components/CollapsiblePanel.tsx

@@ -0,0 +1,57 @@
+import { IconDefinition } from '@fortawesome/free-solid-svg-icons'
+import { ActionIcon } from './ActionIcon'
+import styles from './CollapsiblePanel.module.css'
+
+export interface CollapsiblePanelProps
+  extends React.PropsWithChildren,
+    React.HTMLAttributes<HTMLDetailsElement> {
+  title: string
+  icon?: IconDefinition
+  open?: boolean
+  iconClassNames?: {
+    bg?: string
+    icon?: string
+  }
+}
+
+export const PanelHeader = ({
+  title,
+  icon,
+  iconClassNames,
+}: CollapsiblePanelProps) => {
+  return (
+    <summary className={styles.header}>
+      <ActionIcon
+        icon={icon}
+        bgClassName={
+          'bg-chalkboard-30 dark:bg-chalkboard-90 group-open:bg-chalkboard-80 rounded ' +
+          (iconClassNames?.bg || '')
+        }
+        iconClassName={
+          'text-chalkboard-90 dark:text-chalkboard-40 group-open:text-liquid-10 ' +
+          (iconClassNames?.icon || '')
+        }
+      />
+      {title}
+    </summary>
+  )
+}
+
+export const CollapsiblePanel = ({
+  title,
+  icon,
+  children,
+  className,
+  iconClassNames,
+  ...props
+}: CollapsiblePanelProps) => {
+  return (
+    <details
+      {...props}
+      className={styles.panel + ' group ' + (className || '')}
+    >
+      <PanelHeader title={title} icon={icon} iconClassNames={iconClassNames} />
+      {children}
+    </details>
+  )
+}

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', () => {
+    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="rounded relative mx-auto p-2 bg-chalkboard-10 dark:bg-chalkboard-100 border dark:border-chalkboard-70 max-w-xl w-full shadow-lg"
+            as="div"
+          >
+            <div className="flex gap-2 items-center">
+              <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="bg-transparent focus:outline-none w-full"
+                  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="max-h-96 overflow-y-auto">
+              {filteredCommands?.map((commandResult) => (
+                <Combobox.Option
+                  key={commandResult.item.name}
+                  value={commandResult}
+                  className="my-2 first:mt-4 last:mb-4 ui-active:bg-liquid-10 dark:ui-active:bg-liquid-90 py-1 px-2"
+                >
+                  <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/DebugPanel.tsx

@@ -0,0 +1,138 @@
+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'
+
+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 !h-auto bottom-5 right-5 ' + className}
+    >
+      <section className="p-4 flex flex-col gap-4">
+        <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>
+      </section>
+    </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>
+  )
+}

src/components/DownloadAppBanner.tsx

@@ -0,0 +1,57 @@
+import { Dialog } from '@headlessui/react'
+import { useStore } from '../useStore'
+import { ActionButton } from './ActionButton'
+import { faX } from '@fortawesome/free-solid-svg-icons'
+
+const DownloadAppBanner = () => {
+  const { isBannerDismissed, setBannerDismissed } = useStore((s) => ({
+    isBannerDismissed: s.isBannerDismissed,
+    setBannerDismissed: s.setBannerDismissed,
+  }))
+
+  return (
+    <Dialog
+      className="fixed inset-0 top-auto z-50 bg-warn-20 text-warn-80 px-8 py-4"
+      open={!isBannerDismissed}
+      onClose={() => ({})}
+    >
+      <Dialog.Panel className="max-w-3xl mx-auto">
+        <div className="flex gap-2 justify-between items-start">
+          <h2 className="text-xl font-bold mb-4">
+            KittyCAD Modeling App is better as a desktop app!
+          </h2>
+          <ActionButton
+            Element="button"
+            onClick={() => setBannerDismissed(true)}
+            icon={{
+              icon: faX,
+              bgClassName:
+                'bg-warn-70 hover:bg-warn-80 dark:bg-warn-70 dark:hover:bg-warn-80',
+              iconClassName:
+                'text-warn-10 group-hover:text-warn-10 dark:text-warn-10 dark:group-hover:text-warn-10',
+            }}
+            className="!p-0 !bg-transparent !border-transparent"
+          />
+        </div>
+        <p>
+          The browser version of the app only saves your data temporarily in{' '}
+          <code className="text-base inline-block px-0.5 bg-warn-30/50 rounded">
+            localStorage
+          </code>
+          , and isn't backed up anywhere! Visit{' '}
+          <a
+            href="https://github.com/KittyCAD/modeling-app/releases"
+            rel="noopener noreferrer"
+            target="_blank"
+            className="text-warn-80 dark:text-warn-80 dark:hover:text-warn-70 underline"
+          >
+            our GitHub repository
+          </a>{' '}
+          to download the app for the best experience.
+        </p>
+      </Dialog.Panel>
+    </Dialog>
+  )
+}
+
+export default DownloadAppBanner

src/components/ErrorPage.tsx

@@ -0,0 +1,8 @@
+export const ErrorPage = () => {
+  return (
+    <div className="flex flex-col items-center justify-center h-screen">
+      <h1 className="text-4xl font-bold">404</h1>
+      <p className="text-2xl font-bold">Page not found</p>
+    </div>
+  )
+}

src/components/ExportButton.tsx

@@ -0,0 +1,191 @@
+import { v4 as uuidv4 } from 'uuid'
+import { useStore } from '../useStore'
+import { faFileExport, faXmark } from '@fortawesome/free-solid-svg-icons'
+import { ActionButton } from './ActionButton'
+import Modal from 'react-modal'
+import React from 'react'
+import { useFormik } from 'formik'
+import { Models } from '@kittycad/lib'
+
+type OutputFormat = Models['OutputFormat_type']
+
+interface ExportButtonProps extends React.PropsWithChildren {
+  className?: {
+    button?: string
+    // If we wanted more classname configuration of sub-elements,
+    // put them here
+  }
+}
+
+export const ExportButton = ({ children, className }: ExportButtonProps) => {
+  const { engineCommandManager } = useStore((s) => ({
+    engineCommandManager: s.engineCommandManager,
+  }))
+
+  const [modalIsOpen, setIsOpen] = React.useState(false)
+
+  const defaultType = 'gltf'
+  const [type, setType] = React.useState(defaultType)
+
+  function openModal() {
+    setIsOpen(true)
+  }
+
+  function closeModal() {
+    setIsOpen(false)
+  }
+
+  // Default to gltf and embedded.
+  const initialValues: OutputFormat = {
+    type: defaultType,
+    storage: 'embedded',
+    presentation: 'pretty',
+  }
+  const formik = useFormik({
+    initialValues,
+    onSubmit: (values: OutputFormat) => {
+      // Set the default coords.
+      if (
+        values.type === 'obj' ||
+        values.type === 'ply' ||
+        values.type === 'step' ||
+        values.type === 'stl'
+      ) {
+        // Set the default coords.
+        // In the future we can make this configurable.
+        // But for now, its probably best to keep it consistent with the
+        // UI.
+        values.coords = {
+          forward: {
+            axis: 'y',
+            direction: 'negative',
+          },
+          up: {
+            axis: 'z',
+            direction: 'positive',
+          },
+        }
+      }
+      engineCommandManager?.sendSceneCommand({
+        type: 'modeling_cmd_req',
+        cmd: {
+          type: 'export',
+          // By default let's leave this blank to export the whole scene.
+          // In the future we might want to let the user choose which entities
+          // in the scene to export. In that case, you'd pass the IDs thru here.
+          entity_ids: [],
+          format: values,
+        },
+        cmd_id: uuidv4(),
+      })
+
+      closeModal()
+    },
+  })
+
+  return (
+    <>
+      <ActionButton
+        onClick={openModal}
+        Element="button"
+        icon={{ icon: faFileExport }}
+        className={className?.button}
+      >
+        {children || 'Export'}
+      </ActionButton>
+      <Modal
+        isOpen={modalIsOpen}
+        onRequestClose={closeModal}
+        contentLabel="Export"
+        overlayClassName="z-40 fixed inset-0 grid place-items-center"
+        className="rounded p-4 bg-chalkboard-10 dark:bg-chalkboard-100 border max-w-xl w-full"
+      >
+        <h1 className="text-2xl font-bold">Export your design</h1>
+        <form onSubmit={formik.handleSubmit}>
+          <div className="flex flex-wrap justify-between gap-8 items-center w-full my-8">
+            <label htmlFor="type" className="flex-1">
+              <p className="mb-2">Type</p>
+              <select
+                id="type"
+                name="type"
+                onChange={(e) => {
+                  setType(e.target.value)
+                  formik.handleChange(e)
+                }}
+                className="bg-chalkboard-20 dark:bg-chalkboard-90 w-full"
+              >
+                <option value="gltf">gltf</option>
+                <option value="obj">obj</option>
+                <option value="ply">ply</option>
+                <option value="step">step</option>
+                <option value="stl">stl</option>
+              </select>
+            </label>
+            {(type === 'gltf' || type === 'ply' || type === 'stl') && (
+              <label htmlFor="storage" className="flex-1">
+                <p className="mb-2">Storage</p>
+                <select
+                  id="storage"
+                  name="storage"
+                  onChange={formik.handleChange}
+                  value={
+                    'storage' in formik.values ? formik.values.storage : ''
+                  }
+                  className="bg-chalkboard-20 dark:bg-chalkboard-90 w-full"
+                >
+                  {type === 'gltf' && (
+                    <>
+                      <option value="embedded">embedded</option>
+                      <option value="binary">binary</option>
+                      <option value="standard">standard</option>
+                    </>
+                  )}
+                  {type === 'ply' && (
+                    <>
+                      <option value="ascii">ascii</option>
+                      <option value="binary">binary</option>
+                    </>
+                  )}
+                  {type === 'stl' && (
+                    <>
+                      <option value="ascii">ascii</option>
+                      <option value="binary_little_endian">
+                        binary_little_endian
+                      </option>
+                      <option value="binary_big_endian">
+                        binary_big_endian
+                      </option>
+                    </>
+                  )}
+                </select>
+              </label>
+            )}
+          </div>
+
+          <div className="flex justify-between mt-6">
+            <ActionButton
+              Element="button"
+              onClick={closeModal}
+              icon={{
+                icon: faXmark,
+                bgClassName: 'bg-destroy-80',
+                iconClassName:
+                  'text-destroy-20 group-hover:text-destroy-10 hover:text-destroy-10',
+              }}
+              className="hover:border-destroy-40"
+            >
+              Close
+            </ActionButton>
+            <ActionButton
+              Element="button"
+              type="submit"
+              icon={{ icon: faFileExport }}
+            >
+              Export
+            </ActionButton>
+          </div>
+        </form>
+      </Modal>
+    </>
+  )
+}

src/components/GlobalStateProvider.tsx

@@ -0,0 +1,158 @@
+import { useMachine } from '@xstate/react'
+import { useNavigate } from 'react-router-dom'
+import { paths } from '../Router'
+import {
+  authCommandBarMeta,
+  authMachine,
+  TOKEN_PERSIST_KEY,
+} from '../machines/authMachine'
+import withBaseUrl from '../lib/withBaseURL'
+import React, { createContext, useEffect, useRef } from 'react'
+import useStateMachineCommands from '../hooks/useStateMachineCommands'
+import {
+  SETTINGS_PERSIST_KEY,
+  settingsCommandBarMeta,
+  settingsMachine,
+} from 'machines/settingsMachine'
+import { toast } from 'react-hot-toast'
+import { setThemeClass, Themes } from 'lib/theme'
+import {
+  AnyStateMachine,
+  ContextFrom,
+  InterpreterFrom,
+  Prop,
+  StateFrom,
+} from 'xstate'
+import { useCommandsContext } from 'hooks/useCommandsContext'
+
+type MachineContext<T extends AnyStateMachine> = {
+  state: StateFrom<T>
+  context: ContextFrom<T>
+  send: Prop<InterpreterFrom<T>, 'send'>
+}
+
+type GlobalContext = {
+  auth: MachineContext<typeof authMachine>
+  settings: MachineContext<typeof settingsMachine>
+}
+
+export const GlobalStateContext = createContext({} as GlobalContext)
+
+export const GlobalStateProvider = ({
+  children,
+}: {
+  children: React.ReactNode
+}) => {
+  const navigate = useNavigate()
+  const { commands } = useCommandsContext()
+
+  // Settings machine setup
+  const retrievedSettings = useRef(
+    localStorage?.getItem(SETTINGS_PERSIST_KEY) || '{}'
+  )
+  const persistedSettings = Object.assign(
+    settingsMachine.initialState.context,
+    JSON.parse(retrievedSettings.current) as Partial<
+      (typeof settingsMachine)['context']
+    >
+  )
+
+  const [settingsState, settingsSend] = useMachine(settingsMachine, {
+    context: persistedSettings,
+    actions: {
+      toastSuccess: (context, event) => {
+        const truncatedNewValue =
+          'data' in event && event.data instanceof Object
+            ? (context[Object.keys(event.data)[0] as keyof typeof context]
+                .toString()
+                .substring(0, 28) as any)
+            : undefined
+        toast.success(
+          event.type +
+            (truncatedNewValue
+              ? ` to "${truncatedNewValue}${
+                  truncatedNewValue.length === 28 ? '...' : ''
+                }"`
+              : '')
+        )
+      },
+    },
+  })
+
+  useStateMachineCommands({
+    state: settingsState,
+    send: settingsSend,
+    commands,
+    owner: 'settings',
+    commandBarMeta: settingsCommandBarMeta,
+  })
+
+  // Listen for changes to the system theme and update the app theme accordingly
+  // This is only done if the theme setting is set to 'system'.
+  // It can't be done in XState (in an invoked callback, for example)
+  // because there doesn't seem to be a good way to listen to
+  // events outside of the machine that also depend on the machine's context
+  useEffect(() => {
+    const matcher = window.matchMedia('(prefers-color-scheme: dark)')
+    const listener = (e: MediaQueryListEvent) => {
+      if (settingsState.context.theme !== 'system') return
+      setThemeClass(e.matches ? Themes.Dark : Themes.Light)
+    }
+
+    matcher.addEventListener('change', listener)
+    return () => matcher.removeEventListener('change', listener)
+  }, [settingsState.context])
+
+  // Auth machine setup
+  const [authState, authSend] = useMachine(authMachine, {
+    actions: {
+      goToSignInPage: () => {
+        navigate(paths.SIGN_IN)
+        logout()
+      },
+      goToIndexPage: () => {
+        if (window.location.pathname.includes(paths.SIGN_IN)) {
+          navigate(paths.INDEX)
+        }
+      },
+    },
+  })
+
+  useStateMachineCommands({
+    state: authState,
+    send: authSend,
+    commands,
+    commandBarMeta: authCommandBarMeta,
+    owner: 'auth',
+  })
+
+  return (
+    <GlobalStateContext.Provider
+      value={{
+        auth: {
+          state: authState,
+          context: authState.context,
+          send: authSend,
+        },
+        settings: {
+          state: settingsState,
+          context: settingsState.context,
+          send: settingsSend,
+        },
+      }}
+    >
+      {children}
+    </GlobalStateContext.Provider>
+  )
+}
+
+export default GlobalStateProvider
+
+export function logout() {
+  const url = withBaseUrl('/logout')
+  localStorage.removeItem(TOKEN_PERSIST_KEY)
+  return fetch(url, {
+    method: 'POST',
+    credentials: 'include',
+  })
+}

src/components/Loading.tsx

@@ -0,0 +1,41 @@
+import { useEffect, useState } from 'react'
+
+const Loading = ({ children }: React.PropsWithChildren) => {
+  const [hasLongLoadTime, setHasLongLoadTime] = useState(false)
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      setHasLongLoadTime(true)
+    }, 4000)
+
+    return () => clearTimeout(timer)
+  }, [setHasLongLoadTime])
+  return (
+    <div className="body-bg flex flex-col items-center justify-center h-screen">
+      <svg viewBox="0 0 10 10" className="w-8 h-8">
+        <circle cx="5" cy="5" r="4" stroke="var(--liquid-20)" fill="none" />
+        <circle
+          cx="5"
+          cy="5"
+          r="4"
+          stroke="var(--liquid-10)"
+          fill="none"
+          strokeDasharray="4, 4"
+          className="animate-spin origin-center"
+        />
+      </svg>
+      <p className="text-base mt-4 text-liquid-80 dark:text-liquid-20">
+        {children || 'Loading'}
+      </p>
+      <p
+        className={
+          'text-sm mt-4 text-liquid-90 dark:text-liquid-10 transition-opacity duration-500' +
+          (hasLongLoadTime ? ' opacity-100' : ' opacity-0')
+        }
+      >
+        Loading is taking longer than expected.
+      </p>
+    </div>
+  )
+}
+
+export default Loading

src/components/Logs.tsx

@@ -1,14 +1,18 @@
 import ReactJson from 'react-json-view'
 import { useEffect } from 'react'
 import { useStore } from '../useStore'
-import { PanelHeader } from './PanelHeader'
+import { CollapsiblePanel, CollapsiblePanelProps } from './CollapsiblePanel'
+import { Themes } from '../lib/theme'
 
 const ReactJsonTypeHack = ReactJson as any
 
-export const Logs = () => {
-  const { logs, resetLogs } = useStore(({ logs, resetLogs }) => ({
+interface LogPanelProps extends CollapsiblePanelProps {
+  theme?: Exclude<Themes, Themes.System>
+}
+
+export const Logs = ({ theme = Themes.Light, ...props }: LogPanelProps) => {
+  const { logs } = useStore(({ logs }) => ({
     logs,
-    resetLogs,
   }))
   useEffect(() => {
     const element = document.querySelector('.console-tile')
@@ -17,10 +21,9 @@ export const Logs = () => {
     }
   }, [logs])
   return (
-    <div>
-      <PanelHeader title="Logs" />
-      <div className="h-full relative">
-        <div className="absolute inset-0 flex flex-col items-start">
+    <CollapsiblePanel {...props}>
+      <div className="relative w-full">
+        <div className="absolute inset-0 flex flex-col">
           <ReactJsonTypeHack
             src={logs}
             collapsed={1}
@@ -32,9 +35,46 @@ export const Logs = () => {
             indentWidth={2}
             quotesOnKeys={false}
             name={false}
+            theme={theme === 'light' ? 'rjv-default' : 'monokai'}
           />
         </div>
       </div>
-    </div>
+    </CollapsiblePanel>
+  )
+}
+
+export const KCLErrors = ({
+  theme = Themes.Light,
+  ...props
+}: LogPanelProps) => {
+  const { kclErrors } = useStore(({ kclErrors }) => ({
+    kclErrors,
+  }))
+  useEffect(() => {
+    const element = document.querySelector('.console-tile')
+    if (element) {
+      element.scrollTop = element.scrollHeight - element.clientHeight
+    }
+  }, [kclErrors])
+  return (
+    <CollapsiblePanel {...props}>
+      <div className="h-full relative">
+        <div className="absolute inset-0 flex flex-col">
+          <ReactJsonTypeHack
+            src={kclErrors}
+            collapsed={1}
+            collapseStringsAfterLength={60}
+            enableClipboard={false}
+            displayArrayKey={false}
+            displayDataTypes={false}
+            displayObjectSize={true}
+            indentWidth={2}
+            quotesOnKeys={false}
+            name={false}
+            theme={theme === 'light' ? 'rjv-default' : 'monokai'}
+          />
+        </div>
+      </div>
+    </CollapsiblePanel>
   )
 }

src/components/MemoryPanel.test.tsx

@@ -1,75 +1,47 @@
 import { processMemory } from './MemoryPanel'
-import { lexer } from '../lang/tokeniser'
-import { abstractSyntaxTree } from '../lang/abstractSyntaxTree'
-import { executor } from '../lang/executor'
+import { parser_wasm } from '../lang/abstractSyntaxTree'
+import { enginelessExecutor } from '../lib/testHelpers'
 import { initPromise } from '../lang/rust'
 
 beforeAll(() => initPromise)
 
 describe('processMemory', () => {
-  it('should grab the values and remove and geo data', () => {
+  it('should grab the values and remove and geo data', async () => {
+    // Enable rotations #152
     const code = `
   const myVar = 5
   const myFn = (a) => {
     return a - 2
   }
   const otherVar = myFn(5)
-  
-  const theExtrude = startSketchAt([0, 0]) 
+
+  const theExtrude = startSketchAt([0, 0])
     |> lineTo([-2.4, myVar], %)
     |> lineTo([-0.76, otherVar], %)
     |> extrude(4, %)
-  
+
   const theSketch = startSketchAt([0, 0])
     |> lineTo([-3.35, 0.17], %)
     |> lineTo([0.98, 5.16], %)
     |> lineTo([2.15, 4.32], %)
-    |> rx(90, %)
+    // |> rx(90, %)
   show(theExtrude, theSketch)`
-    const tokens = lexer(code)
-    const ast = abstractSyntaxTree(tokens)
-    const programMemory = executor(ast, {
-      root: {
-        log: {
-          type: 'userVal',
-          value: (a: any) => {
-            console.log('raw log', a)
-          },
-          __meta: [],
-        },
-      },
-      _sketch: [],
+    const ast = parser_wasm(code)
+    const programMemory = await enginelessExecutor(ast, {
+      root: {},
     })
     const output = processMemory(programMemory)
     expect(output.myVar).toEqual(5)
-    expect(output.myFn).toEqual('__function__')
     expect(output.otherVar).toEqual(3)
     expect(output).toEqual({
       myVar: 5,
-      myFn: '__function__',
+      myFn: undefined,
       otherVar: 3,
-      theExtrude: [
-        {
-          type: 'extrudePlane',
-          position: [-1.2, 2.5, 0],
-          rotation: [
-            0.5984837231672995, -0.3765862890544571, 0.3765862890544572,
-            0.5984837231672996,
-          ],
-        },
-        {
-          type: 'extrudePlane',
-          position: [-1.58, 4, 0],
-          rotation: [
-            0.3024567786448806, 0.6391556125481195, -0.6391556125481194,
-            0.30245677864488063,
-          ],
-        },
-      ],
+      theExtrude: [],
       theSketch: [
-        { type: 'toPoint', to: [-3.35, 0.17], from: [0, 0] },
-        { type: 'toPoint', to: [0.98, 5.16], from: [-3.35, 0.17] },
-        { type: 'toPoint', to: [2.15, 4.32], from: [0.98, 5.16] },
+        { type: 'toPoint', to: [-3.35, 0.17], from: [0, 0], name: '' },
+        { type: 'toPoint', to: [0.98, 5.16], from: [-3.35, 0.17], name: '' },
+        { type: 'toPoint', to: [2.15, 4.32], from: [0.98, 5.16], name: '' },
       ],
     })
   })

src/components/MemoryPanel.tsx

@@ -1,10 +1,18 @@
 import ReactJson from 'react-json-view'
-import { PanelHeader } from './PanelHeader'
+import { CollapsiblePanel, CollapsiblePanelProps } from './CollapsiblePanel'
 import { useStore } from '../useStore'
 import { useMemo } from 'react'
 import { ProgramMemory } from '../lang/executor'
+import { Themes } from '../lib/theme'
 
-export const MemoryPanel = () => {
+interface MemoryPanelProps extends CollapsiblePanelProps {
+  theme?: Exclude<Themes, Themes.System>
+}
+
+export const MemoryPanel = ({
+  theme = Themes.Light,
+  ...props
+}: MemoryPanelProps) => {
   const { programMemory } = useStore((s) => ({
     programMemory: s.programMemory,
   }))
@@ -13,11 +21,10 @@ export const MemoryPanel = () => {
     [programMemory]
   )
   return (
-    <div className="h-full">
-      <PanelHeader title="Variables" />
+    <CollapsiblePanel {...props}>
       <div className="h-full relative">
         <div className="absolute inset-0 flex flex-col items-start">
-          <div className=" overflow-auto h-full console-tile w-full">
+          <div className=" h-full console-tile w-full">
             <ReactJson
               src={ProcessedMemory}
               collapsed={1}
@@ -28,11 +35,12 @@ export const MemoryPanel = () => {
               indentWidth={2}
               quotesOnKeys={false}
               name={false}
+              theme={theme === 'light' ? 'rjv-default' : 'monokai'}
             />
           </div>
         </div>
       </div>
-    </div>
+    </CollapsiblePanel>
   )
 }
 

src/components/OpenFileButton.tsx

@@ -0,0 +1,42 @@
+import { invoke } from '@tauri-apps/api/tauri'
+import { open } from '@tauri-apps/api/dialog'
+import { useStore } from '../useStore'
+
+export const OpenFileButton = () => {
+  const { setCode } = useStore((s) => ({
+    setCode: s.setCode,
+  }))
+  const handleClick = async () => {
+    const selected = await open({
+      multiple: false,
+      directory: false,
+      filters: [
+        {
+          name: 'CAD',
+          extensions: ['toml'],
+        },
+      ],
+    })
+    if (Array.isArray(selected)) {
+      // User selected multiple files
+      // We should not get here, since multiple is false.
+    } else if (selected === null) {
+      // User cancelled the selection
+      // Do nothing.
+    } else {
+      // User selected a single file
+      // We want to invoke our command to read the file.
+      const json: string = await invoke('read_toml', { path: selected })
+      const packageDetails = JSON.parse(json).package
+      if (packageDetails.main) {
+        const absPath = [
+          ...selected.split('/').slice(0, -1),
+          packageDetails.main,
+        ].join('/')
+        const file: string = await invoke('read_txt_file', { path: absPath })
+        setCode(file)
+      }
+    }
+  }
+  return <button onClick={() => handleClick()}>Open File</button>
+}

src/components/PanelHeader.tsx

@@ -1,7 +0,0 @@
-export const PanelHeader = ({ title }: { title: string }) => {
-  return (
-    <div className="font-mono text-[11px] bg-stone-100 w-full pl-4 h-[20px] text-stone-700 flex items-center">
-      <span className="pt-1">{title}</span>
-    </div>
-  )
-}

src/components/ProjectCard.tsx

@@ -0,0 +1,162 @@
+import { FormEvent, useState } from 'react'
+import { type ProjectWithEntryPointMetadata, paths } from '../Router'
+import { Link } from 'react-router-dom'
+import { ActionButton } from './ActionButton'
+import {
+  faCheck,
+  faPenAlt,
+  faTrashAlt,
+  faX,
+} from '@fortawesome/free-solid-svg-icons'
+import { FILE_EXT } from '../lib/tauriFS'
+import { Dialog } from '@headlessui/react'
+import { useHotkeys } from 'react-hotkeys-hook'
+
+function ProjectCard({
+  project,
+  handleRenameProject,
+  handleDeleteProject,
+  ...props
+}: {
+  project: ProjectWithEntryPointMetadata
+  handleRenameProject: (
+    e: FormEvent<HTMLFormElement>,
+    f: ProjectWithEntryPointMetadata
+  ) => Promise<void>
+  handleDeleteProject: (f: ProjectWithEntryPointMetadata) => Promise<void>
+}) {
+  useHotkeys('esc', () => setIsEditing(false))
+  const [isEditing, setIsEditing] = useState(false)
+  const [isConfirmingDelete, setIsConfirmingDelete] = useState(false)
+
+  function handleSave(e: FormEvent<HTMLFormElement>) {
+    e.preventDefault()
+    handleRenameProject(e, project).then(() => setIsEditing(false))
+  }
+
+  function getDisplayedTime(date: Date) {
+    const startOfToday = new Date()
+    startOfToday.setHours(0, 0, 0, 0)
+    return date.getTime() < startOfToday.getTime()
+      ? date.toLocaleDateString()
+      : date.toLocaleTimeString()
+  }
+
+  return (
+    <li
+      {...props}
+      className="group relative min-h-[5em] p-1 rounded-sm border border-chalkboard-20 dark:border-chalkboard-90 hover:border-chalkboard-30 dark:hover:border-chalkboard-80"
+    >
+      {isEditing ? (
+        <form onSubmit={handleSave} className="flex gap-2 items-center">
+          <input
+            className="dark:bg-chalkboard-80 dark:border-chalkboard-40 min-w-0 p-1"
+            type="text"
+            id="newProjectName"
+            name="newProjectName"
+            autoCorrect="off"
+            autoCapitalize="off"
+            defaultValue={project.name}
+            autoFocus={true}
+          />
+          <div className="flex gap-1 items-center">
+            <ActionButton
+              Element="button"
+              type="submit"
+              icon={{ icon: faCheck, size: 'sm' }}
+              className="!p-0"
+            ></ActionButton>
+            <ActionButton
+              Element="button"
+              icon={{ icon: faX, size: 'sm' }}
+              className="!p-0"
+              onClick={() => setIsEditing(false)}
+            />
+          </div>
+        </form>
+      ) : (
+        <>
+          <div className="p-1 flex flex-col gap-2">
+            <Link
+              to={`${paths.FILE}/${encodeURIComponent(project.path)}`}
+              className="flex-1 text-liquid-100"
+            >
+              {project.name?.replace(FILE_EXT, '')}
+            </Link>
+            <span className="text-chalkboard-60 text-xs">
+              Edited {getDisplayedTime(project.entrypoint_metadata.modifiedAt)}
+            </span>
+            <div className="absolute bottom-2 right-2 flex gap-1 items-center opacity-0 group-hover:opacity-100 group-focus-within:opacity-100">
+              <ActionButton
+                Element="button"
+                icon={{ icon: faPenAlt, size: 'sm' }}
+                onClick={() => setIsEditing(true)}
+                className="!p-0"
+              />
+              <ActionButton
+                Element="button"
+                icon={{
+                  icon: faTrashAlt,
+                  size: 'sm',
+                  bgClassName: 'bg-destroy-80 hover:bg-destroy-70',
+                  iconClassName:
+                    'text-destroy-20 group-hover:text-destroy-10 hover:text-destroy-10 dark:text-destroy-20 dark:group-hover:text-destroy-10 dark:hover:text-destroy-10',
+                }}
+                className="!p-0 hover:border-destroy-40 dark:hover:border-destroy-40"
+                onClick={() => setIsConfirmingDelete(true)}
+              />
+            </div>
+          </div>
+          <Dialog
+            open={isConfirmingDelete}
+            onClose={() => setIsConfirmingDelete(false)}
+            className="relative z-50"
+          >
+            <div className="fixed inset-0 bg-chalkboard-110/80 grid place-content-center">
+              <Dialog.Panel className="rounded p-4 bg-chalkboard-10 dark:bg-chalkboard-100 border border-destroy-80 max-w-2xl">
+                <Dialog.Title as="h2" className="text-2xl font-bold mb-4">
+                  Delete File
+                </Dialog.Title>
+                <Dialog.Description>
+                  This will permanently delete "{project.name || 'this file'}".
+                </Dialog.Description>
+
+                <p className="my-4">
+                  Are you sure you want to delete "{project.name || 'this file'}
+                  "? This action cannot be undone.
+                </p>
+
+                <div className="flex justify-between">
+                  <ActionButton
+                    Element="button"
+                    onClick={async () => {
+                      await handleDeleteProject(project)
+                      setIsConfirmingDelete(false)
+                    }}
+                    icon={{
+                      icon: faTrashAlt,
+                      bgClassName: 'bg-destroy-80',
+                      iconClassName:
+                        'text-destroy-20 group-hover:text-destroy-10 hover:text-destroy-10 dark:text-destroy-20 dark:group-hover:text-destroy-10 dark:hover:text-destroy-10',
+                    }}
+                    className="hover:border-destroy-40 dark:hover:border-destroy-40"
+                  >
+                    Delete
+                  </ActionButton>
+                  <ActionButton
+                    Element="button"
+                    onClick={() => setIsConfirmingDelete(false)}
+                  >
+                    Cancel
+                  </ActionButton>
+                </div>
+              </Dialog.Panel>
+            </div>
+          </Dialog>
+        </>
+      )}
+    </li>
+  )
+}
+
+export default ProjectCard

src/components/ProjectSidebarMenu.test.tsx

@@ -0,0 +1,81 @@
+import { fireEvent, render, screen } from '@testing-library/react'
+import { BrowserRouter } from 'react-router-dom'
+import ProjectSidebarMenu from './ProjectSidebarMenu'
+import { ProjectWithEntryPointMetadata } from '../Router'
+
+const now = new Date()
+const projectWellFormed = {
+  name: 'Simple Box',
+  path: '/some/path/Simple Box',
+  children: [
+    {
+      name: 'main.kcl',
+      path: '/some/path/Simple Box/main.kcl',
+    },
+  ],
+  entrypoint_metadata: {
+    accessedAt: now,
+    blksize: 32,
+    blocks: 32,
+    createdAt: now,
+    dev: 1,
+    gid: 1,
+    ino: 1,
+    isDir: false,
+    isFile: true,
+    isSymlink: false,
+    mode: 1,
+    modifiedAt: now,
+    nlink: 1,
+    permissions: { readonly: false, mode: 1 },
+    rdev: 1,
+    size: 32,
+    uid: 1,
+  },
+} satisfies ProjectWithEntryPointMetadata
+
+describe('ProjectSidebarMenu tests', () => {
+  test('Renders the project name', () => {
+    render(
+      <BrowserRouter>
+        <ProjectSidebarMenu project={projectWellFormed} />
+      </BrowserRouter>
+    )
+
+    fireEvent.click(screen.getByTestId('project-sidebar-toggle'))
+
+    expect(screen.getByTestId('projectName')).toHaveTextContent(
+      projectWellFormed.name
+    )
+    expect(screen.getByTestId('createdAt')).toHaveTextContent(
+      `Created ${now.toLocaleDateString()}`
+    )
+  })
+
+  test('Renders app name if given no project', () => {
+    render(
+      <BrowserRouter>
+        <ProjectSidebarMenu />
+      </BrowserRouter>
+    )
+
+    fireEvent.click(screen.getByTestId('project-sidebar-toggle'))
+
+    expect(screen.getByTestId('projectName')).toHaveTextContent(
+      'KittyCAD Modeling App'
+    )
+  })
+
+  test('Renders as a link if set to do so', () => {
+    render(
+      <BrowserRouter>
+        <ProjectSidebarMenu project={projectWellFormed} renderAsLink={true} />
+      </BrowserRouter>
+    )
+
+    expect(screen.getByTestId('project-sidebar-link')).toBeInTheDocument()
+    expect(screen.getByTestId('project-sidebar-link-name')).toHaveTextContent(
+      projectWellFormed.name
+    )
+  })
+})

src/components/ProjectSidebarMenu.tsx

@@ -0,0 +1,125 @@
+import { Popover, Transition } from '@headlessui/react'
+import { ActionButton } from './ActionButton'
+import { faHome } from '@fortawesome/free-solid-svg-icons'
+import { ProjectWithEntryPointMetadata, paths } from '../Router'
+import { isTauri } from '../lib/isTauri'
+import { Link } from 'react-router-dom'
+import { ExportButton } from './ExportButton'
+import { Fragment } from 'react'
+
+const ProjectSidebarMenu = ({
+  project,
+  renderAsLink = false,
+}: {
+  renderAsLink?: boolean
+  project?: Partial<ProjectWithEntryPointMetadata>
+}) => {
+  return renderAsLink ? (
+    <Link
+      to={'../'}
+      className="flex items-center gap-4 my-2"
+      data-testid="project-sidebar-link"
+    >
+      <img
+        src="/kitt-8bit-winking.svg"
+        alt="KittyCAD App"
+        className="h-9 w-auto"
+      />
+      <span
+        className="text-sm text-chalkboard-110 dark:text-chalkboard-20 min-w-max"
+        data-testid="project-sidebar-link-name"
+      >
+        {project?.name ? project.name : 'KittyCAD Modeling App'}
+      </span>
+    </Link>
+  ) : (
+    <Popover className="relative">
+      <Popover.Button
+        className="border-0 p-0.5 pr-2 flex items-center gap-4 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-energy-50"
+        data-testid="project-sidebar-toggle"
+      >
+        <img
+          src="/kitt-8bit-winking.svg"
+          alt="KittyCAD App"
+          className="h-9 w-auto"
+        />
+        <span className="text-sm text-chalkboard-110 dark:text-chalkboard-20 min-w-max">
+          {isTauri() && project?.name ? project.name : 'KittyCAD Modeling App'}
+        </span>
+      </Popover.Button>
+      <Transition
+        enter="duration-200 ease-out"
+        enterFrom="opacity-0"
+        enterTo="opacity-100"
+        leave="duration-100 ease-in"
+        leaveFrom="opacity-100"
+        leaveTo="opacity-0"
+        as={Fragment}
+      >
+        <Popover.Overlay className="fixed z-20 inset-0 bg-chalkboard-110/50" />
+      </Transition>
+
+      <Transition
+        enter="duration-100 ease-out"
+        enterFrom="opacity-0 -translate-x-1/4"
+        enterTo="opacity-100 translate-x-0"
+        leave="duration-75 ease-in"
+        leaveFrom="opacity-100 translate-x-0"
+        leaveTo="opacity-0 -translate-x-4"
+        as={Fragment}
+      >
+        <Popover.Panel className="fixed inset-0 right-auto z-30 w-64 bg-chalkboard-10 dark:bg-chalkboard-100 border border-energy-100 dark:border-energy-100/50 shadow-md rounded-r-lg overflow-hidden">
+          <div className="flex items-center gap-4 px-4 py-3 bg-energy-100">
+            <img
+              src="/kitt-8bit-winking.svg"
+              alt="KittyCAD App"
+              className="h-9 w-auto"
+            />
+
+            <div>
+              <p
+                className="m-0 text-energy-10 text-mono"
+                data-testid="projectName"
+              >
+                {project?.name ? project.name : 'KittyCAD Modeling App'}
+              </p>
+              {project?.entrypoint_metadata && (
+                <p
+                  className="m-0 text-energy-40 text-xs"
+                  data-testid="createdAt"
+                >
+                  Created{' '}
+                  {project?.entrypoint_metadata.createdAt.toLocaleDateString()}
+                </p>
+              )}
+            </div>
+          </div>
+          <div className="p-4 flex flex-col gap-2">
+            <ExportButton
+              className={{
+                button:
+                  'border-transparent dark:border-transparent dark:hover:border-energy-60',
+              }}
+            >
+              Export Model
+            </ExportButton>
+            {isTauri() && (
+              <ActionButton
+                Element="link"
+                to={paths.HOME}
+                icon={{
+                  icon: faHome,
+                }}
+                className="border-transparent dark:border-transparent dark:hover:border-energy-60"
+              >
+                Go to Home
+              </ActionButton>
+            )}
+          </div>
+        </Popover.Panel>
+      </Transition>
+    </Popover>
+  )
+}
+
+export default ProjectSidebarMenu

src/components/RenderViewerArtifacts.tsx

@@ -1,646 +0,0 @@
-import { useRef, useState, useEffect, useMemo } from 'react'
-import {
-  CallExpression,
-  ArrayExpression,
-  PipeExpression,
-} from '../lang/abstractSyntaxTree'
-import {
-  getNodePathFromSourceRange,
-  getNodeFromPath,
-  getNodeFromPathCurry,
-} from '../lang/queryAst'
-import { changeSketchArguments } from '../lang/std/sketch'
-import {
-  ExtrudeGroup,
-  ExtrudeSurface,
-  SketchGroup,
-  Path,
-  Rotation,
-  Position,
-  PathToNode,
-  SourceRange,
-} from '../lang/executor'
-import { BufferGeometry } from 'three'
-import { useStore } from '../useStore'
-import { isOverlap, roundOff } from '../lib/utils'
-import { Vector3, DoubleSide, Quaternion } from 'three'
-import { useSetCursor } from '../hooks/useSetCursor'
-import { getConstraintLevelFromSourceRange } from '../lang/std/sketchcombos'
-import { createCallExpression, createPipeSubstitution } from '../lang/modifyAst'
-
-function LineEnd({
-  geo,
-  sourceRange,
-  editorCursor,
-  rotation,
-  position,
-  from,
-}: {
-  geo: BufferGeometry
-  sourceRange: [number, number]
-  editorCursor: boolean
-  rotation: Rotation
-  position: Position
-  from: [number, number]
-}) {
-  const ref = useRef<BufferGeometry | undefined>() as any
-  const detectionPlaneRef = useRef<BufferGeometry | undefined>() as any
-  const lastPointerRef = useRef<Vector3>(new Vector3())
-  const point2DRef = useRef<Vector3>(new Vector3())
-  const [hovered, setHover] = useState(false)
-  const [isMouseDown, setIsMouseDown] = useState(false)
-  const baseColor = useConstraintColors(sourceRange)
-
-  const setCursor = useSetCursor(sourceRange, 'line-end')
-
-  const { setHighlightRange, guiMode, ast, updateAst, programMemory } =
-    useStore((s) => ({
-      setHighlightRange: s.setHighlightRange,
-      guiMode: s.guiMode,
-      ast: s.ast,
-      updateAst: s.updateAst,
-      programMemory: s.programMemory,
-    }))
-  const { originalXY } = useMemo(() => {
-    if (ast) {
-      const thePath = getNodePathFromSourceRange(ast, sourceRange)
-      const { node: callExpression } = getNodeFromPath<CallExpression>(
-        ast,
-        thePath
-      )
-      const [xArg, yArg] =
-        guiMode.mode === 'sketch'
-          ? callExpression?.arguments || []
-          : (callExpression?.arguments?.[0] as ArrayExpression)?.elements || []
-      const x = xArg?.type === 'Literal' ? xArg.value : -1
-      const y = yArg?.type === 'Literal' ? yArg.value : -1
-      return {
-        originalXY: [x, y],
-      }
-    }
-    return {
-      originalXY: [-1, -1],
-    }
-  }, [ast])
-
-  useEffect(() => {
-    const handleMouseUp = () => {
-      if (isMouseDown && ast) {
-        const current2d = point2DRef.current.clone()
-        const inverseQuaternion = new Quaternion()
-        if (
-          guiMode.mode === 'canEditSketch' ||
-          (guiMode.mode === 'sketch' && guiMode.sketchMode === 'sketchEdit')
-        ) {
-          inverseQuaternion.set(...guiMode.rotation)
-          inverseQuaternion.invert()
-        }
-        current2d.sub(
-          new Vector3(...position).applyQuaternion(inverseQuaternion)
-        )
-        let [x, y] = [roundOff(current2d.x, 2), roundOff(current2d.y, 2)]
-        let theNewPoints: [number, number] = [x, y]
-        const { modifiedAst } = changeSketchArguments(
-          ast,
-          programMemory,
-          sourceRange,
-          theNewPoints,
-          guiMode,
-          from
-        )
-        if (!(current2d.x === 0 && current2d.y === 0 && current2d.z === 0))
-          updateAst(modifiedAst)
-        ref.current.position.set(...position)
-      }
-      setIsMouseDown(false)
-    }
-    window.addEventListener('mouseup', handleMouseUp)
-    return () => {
-      window.removeEventListener('mouseup', handleMouseUp)
-    }
-  }, [isMouseDown])
-
-  const inEditMode =
-    guiMode.mode === 'canEditSketch' ||
-    (guiMode.mode === 'sketch' && guiMode.sketchMode === 'sketchEdit')
-
-  let clickDetectPlaneQuaternion = new Quaternion()
-  if (inEditMode) {
-    clickDetectPlaneQuaternion = new Quaternion(...rotation)
-  }
-
-  return (
-    <>
-      <mesh
-        position={position}
-        quaternion={rotation}
-        ref={ref}
-        onPointerOver={(event) => {
-          inEditMode && setHover(true)
-          setHighlightRange(sourceRange)
-        }}
-        onPointerOut={(event) => {
-          setHover(false)
-          setHighlightRange([0, 0])
-        }}
-        onPointerDown={() => {
-          inEditMode && setIsMouseDown(true)
-          setCursor()
-        }}
-      >
-        <primitive object={geo} scale={hovered ? 2 : 1} />
-        <meshStandardMaterial
-          color={hovered ? 'hotpink' : editorCursor ? 'skyblue' : baseColor}
-        />
-      </mesh>
-      {isMouseDown && (
-        <mesh
-          quaternion={clickDetectPlaneQuaternion}
-          onPointerMove={(a) => {
-            const point = a.point
-
-            const transformedPoint = point.clone()
-            const inverseQuaternion = new Quaternion()
-            if (
-              guiMode.mode === 'canEditSketch' ||
-              (guiMode.mode === 'sketch' && guiMode.sketchMode === 'sketchEdit')
-            ) {
-              inverseQuaternion.set(...guiMode.rotation)
-              inverseQuaternion.invert()
-            }
-            transformedPoint.applyQuaternion(inverseQuaternion)
-            point2DRef.current.copy(transformedPoint)
-
-            if (
-              lastPointerRef.current.x === 0 &&
-              lastPointerRef.current.y === 0 &&
-              lastPointerRef.current.z === 0
-            ) {
-              lastPointerRef.current.set(point.x, point.y, point.z)
-              return
-            }
-            if (guiMode.mode)
-              if (ref.current) {
-                const diff = new Vector3().subVectors(
-                  point.clone().applyQuaternion(inverseQuaternion),
-                  lastPointerRef.current
-                    .clone()
-                    .applyQuaternion(inverseQuaternion)
-                )
-                if (originalXY[0] === -1) {
-                  // x arg is not a literal and should be locked
-                  diff.x = 0
-                }
-                if (originalXY[1] === -1) {
-                  // y arg is not a literal and should be locked
-                  diff.y = 0
-                }
-                ref.current.position.add(
-                  diff.applyQuaternion(inverseQuaternion.invert())
-                )
-                lastPointerRef.current.copy(point.clone())
-              }
-          }}
-        >
-          <planeGeometry args={[50, 50]} ref={detectionPlaneRef} />
-          <meshStandardMaterial
-            side={DoubleSide}
-            color="blue"
-            transparent
-            opacity={0}
-          />
-        </mesh>
-      )}
-    </>
-  )
-}
-
-export function RenderViewerArtifacts({
-  artifacts,
-}: {
-  artifacts: (ExtrudeGroup | SketchGroup)[]
-}) {
-  useSetAppModeFromCursorLocation(artifacts)
-  return (
-    <>
-      {artifacts?.map((artifact, i) => (
-        <RenderViewerArtifact key={i} artifact={artifact} />
-      ))}
-    </>
-  )
-}
-
-function RenderViewerArtifact({
-  artifact,
-}: {
-  artifact: ExtrudeGroup | SketchGroup
-}) {
-  // const { selectionRange, guiMode, ast, setGuiMode } = useStore(
-  //   ({ selectionRange, guiMode, ast, setGuiMode }) => ({
-  //     selectionRange,
-  //     guiMode,
-  //     ast,
-  //     setGuiMode,
-  //   })
-  // )
-  // const [editorCursor, setEditorCursor] = useState(false)
-  // useEffect(() => {
-  //   const shouldHighlight = isOverlapping(
-  //     artifact.__meta.slice(-1)[0].sourceRange,
-  //     selectionRange
-  //   )
-  //   setEditorCursor(shouldHighlight)
-  // }, [selectionRange, artifact.__meta])
-
-  if (artifact.type === 'sketchGroup') {
-    return (
-      <>
-        {artifact.start && (
-          <PathRender
-            geoInfo={artifact.start}
-            forceHighlight={false}
-            rotation={artifact.rotation}
-            position={artifact.position}
-          />
-        )}
-        {artifact.value.map((geoInfo, key) => (
-          <PathRender
-            geoInfo={geoInfo}
-            key={key}
-            forceHighlight={false}
-            rotation={artifact.rotation}
-            position={artifact.position}
-          />
-        ))}
-      </>
-    )
-  }
-  if (artifact.type === 'extrudeGroup') {
-    return (
-      <>
-        {artifact.value.map((geoInfo, key) => (
-          <WallRender
-            geoInfo={geoInfo}
-            key={key}
-            forceHighlight={false}
-            rotation={artifact.rotation}
-            position={artifact.position}
-          />
-        ))}
-      </>
-    )
-  }
-  return null
-}
-
-function WallRender({
-  geoInfo,
-  forceHighlight = false,
-  rotation,
-  position,
-}: {
-  geoInfo: ExtrudeSurface
-  forceHighlight?: boolean
-  rotation: Rotation
-  position: Position
-}) {
-  const { setHighlightRange, selectionRanges } = useStore(
-    ({ setHighlightRange, selectionRanges }) => ({
-      setHighlightRange,
-      selectionRanges,
-    })
-  )
-  const onClick = useSetCursor(geoInfo.__geoMeta.sourceRange)
-  // This reference will give us direct access to the mesh
-  const ref = useRef<BufferGeometry | undefined>() as any
-  const [hovered, setHover] = useState(false)
-
-  const [editorCursor, setEditorCursor] = useState(false)
-  useEffect(() => {
-    const shouldHighlight = selectionRanges.codeBasedSelections.some(
-      ({ range }) => isOverlap(geoInfo.__geoMeta.sourceRange, range)
-    )
-    setEditorCursor(shouldHighlight)
-  }, [selectionRanges, geoInfo])
-
-  return (
-    <>
-      <mesh
-        quaternion={rotation}
-        position={position}
-        ref={ref}
-        onPointerOver={(event) => {
-          setHover(true)
-          setHighlightRange(geoInfo.__geoMeta.sourceRange)
-        }}
-        onPointerOut={(event) => {
-          setHover(false)
-          setHighlightRange([0, 0])
-        }}
-        onClick={onClick}
-      >
-        <primitive object={geoInfo.__geoMeta.geo} />
-        <meshStandardMaterial
-          side={DoubleSide}
-          color={
-            hovered
-              ? 'hotpink'
-              : forceHighlight || editorCursor
-              ? 'skyblue'
-              : 'orange'
-          }
-        />
-      </mesh>
-    </>
-  )
-}
-
-function PathRender({
-  geoInfo,
-  forceHighlight = false,
-  rotation,
-  position,
-}: {
-  geoInfo: Path
-  forceHighlight?: boolean
-  rotation: Rotation
-  position: Position
-}) {
-  const { selectionRanges, updateAstAsync, ast, guiMode } = useStore((s) => ({
-    selectionRanges: s.selectionRanges,
-    updateAstAsync: s.updateAstAsync,
-    ast: s.ast,
-    guiMode: s.guiMode,
-  }))
-  const [editorCursor, setEditorCursor] = useState(false)
-  const [editorLineCursor, setEditorLineCursor] = useState(false)
-  useEffect(() => {
-    const shouldHighlight = selectionRanges.codeBasedSelections.some(
-      ({ range }) => isOverlap(geoInfo.__geoMeta.sourceRange, range)
-    )
-    const shouldHighlightLine = selectionRanges.codeBasedSelections.some(
-      ({ range, type }) =>
-        isOverlap(geoInfo.__geoMeta.sourceRange, range) && type === 'default'
-    )
-    setEditorCursor(shouldHighlight)
-    setEditorLineCursor(shouldHighlightLine)
-  }, [selectionRanges, geoInfo])
-  return (
-    <>
-      {geoInfo.__geoMeta.geos.map((meta, i) => {
-        if (meta.type === 'line')
-          return (
-            <LineRender
-              key={i}
-              geo={meta.geo}
-              sourceRange={geoInfo.__geoMeta.sourceRange}
-              forceHighlight={editorLineCursor}
-              rotation={rotation}
-              position={position}
-            />
-          )
-        if (meta.type === 'lineEnd')
-          return (
-            <LineEnd
-              key={i}
-              geo={meta.geo}
-              from={geoInfo.from}
-              sourceRange={geoInfo.__geoMeta.sourceRange}
-              editorCursor={forceHighlight || editorCursor}
-              rotation={rotation}
-              position={position}
-            />
-          )
-        if (meta.type === 'sketchBase')
-          return (
-            <LineRender
-              key={i}
-              geo={meta.geo}
-              sourceRange={geoInfo.__geoMeta.sourceRange}
-              forceHighlight={forceHighlight || editorLineCursor}
-              rotation={rotation}
-              position={position}
-              onClick={() => {
-                if (
-                  !ast ||
-                  !(guiMode.mode === 'sketch' && guiMode.sketchMode === 'line')
-                )
-                  return
-                const path = getNodePathFromSourceRange(
-                  ast,
-                  geoInfo.__geoMeta.sourceRange
-                )
-                const getNode = getNodeFromPathCurry(ast, path)
-                const maybeStartSketchAt =
-                  getNode<CallExpression>('CallExpression')
-                const pipe = getNode<PipeExpression>('PipeExpression')
-                if (
-                  maybeStartSketchAt?.node.callee.name === 'startSketchAt' &&
-                  pipe.node &&
-                  pipe.node.body.length > 2
-                ) {
-                  const modifiedAst = JSON.parse(JSON.stringify(ast))
-                  const _pipe = getNodeFromPath<PipeExpression>(
-                    modifiedAst,
-                    path,
-                    'PipeExpression'
-                  )
-                  _pipe.node.body.push(
-                    createCallExpression('close', [createPipeSubstitution()])
-                  )
-                  updateAstAsync(modifiedAst)
-                }
-              }}
-            />
-          )
-      })}
-    </>
-  )
-}
-
-function LineRender({
-  geo,
-  sourceRange,
-  forceHighlight = false,
-  rotation,
-  position,
-  onClick: _onClick = () => {},
-}: {
-  geo: BufferGeometry
-  sourceRange: [number, number]
-  forceHighlight?: boolean
-  rotation: Rotation
-  position: Position
-  onClick?: () => void
-}) {
-  const { setHighlightRange } = useStore((s) => ({
-    setHighlightRange: s.setHighlightRange,
-  }))
-  const onClick = useSetCursor(sourceRange)
-  // This reference will give us direct access to the mesh
-  const ref = useRef<BufferGeometry | undefined>() as any
-  const [hovered, setHover] = useState(false)
-
-  const baseColor = useConstraintColors(sourceRange)
-
-  return (
-    <>
-      <mesh
-        quaternion={rotation}
-        position={position}
-        ref={ref}
-        onPointerOver={(e) => {
-          setHover(true)
-          setHighlightRange(sourceRange)
-        }}
-        onPointerOut={(e) => {
-          setHover(false)
-          setHighlightRange([0, 0])
-        }}
-        onClick={() => {
-          _onClick()
-          onClick()
-        }}
-      >
-        <primitive object={geo} />
-        <meshStandardMaterial
-          color={hovered ? 'hotpink' : forceHighlight ? 'skyblue' : baseColor}
-        />
-      </mesh>
-    </>
-  )
-}
-
-type Artifact = ExtrudeGroup | SketchGroup
-
-function useSetAppModeFromCursorLocation(artifacts: Artifact[]) {
-  const { selectionRanges, guiMode, setGuiMode, ast } = useStore(
-    ({ selectionRanges, guiMode, setGuiMode, ast }) => ({
-      selectionRanges,
-      guiMode,
-      setGuiMode,
-      ast,
-    })
-  )
-  useEffect(() => {
-    const artifactsWithinCursorRange: (
-      | {
-          parentType: Artifact['type']
-          isParent: true
-          pathToNode: PathToNode
-          sourceRange: SourceRange
-          rotation: Rotation
-          position: Position
-        }
-      | {
-          parentType: Artifact['type']
-          isParent: false
-          pathToNode: PathToNode
-          sourceRange: SourceRange
-          rotation: Rotation
-          position: Position
-        }
-    )[] = []
-    artifacts?.forEach((artifact) => {
-      artifact.value.forEach((geo) => {
-        if (
-          isOverlap(
-            geo.__geoMeta.sourceRange,
-            selectionRanges.codeBasedSelections[0].range
-          )
-        ) {
-          artifactsWithinCursorRange.push({
-            parentType: artifact.type,
-            isParent: false,
-            pathToNode: geo.__geoMeta.pathToNode,
-            sourceRange: geo.__geoMeta.sourceRange,
-            rotation: artifact.rotation,
-            position: artifact.position,
-          })
-        }
-      })
-      artifact.__meta.forEach((meta) => {
-        if (
-          isOverlap(
-            meta.sourceRange,
-            selectionRanges.codeBasedSelections[0].range
-          )
-        ) {
-          artifactsWithinCursorRange.push({
-            parentType: artifact.type,
-            isParent: true,
-            pathToNode: meta.pathToNode,
-            sourceRange: meta.sourceRange,
-            rotation: artifact.rotation,
-            position: artifact.position,
-          })
-        }
-      })
-    })
-    const parentArtifacts = artifactsWithinCursorRange.filter((a) => a.isParent)
-    const hasSketchArtifact = artifactsWithinCursorRange.filter(
-      ({ parentType }) => parentType === 'sketchGroup'
-    )
-    const hasExtrudeArtifact = artifactsWithinCursorRange.filter(
-      ({ parentType }) => parentType === 'extrudeGroup'
-    )
-    const artifact = parentArtifacts[0]
-    const shouldHighlight = !!artifact || hasSketchArtifact.length
-    if (
-      (guiMode.mode === 'default' || guiMode.mode === 'canEditSketch') &&
-      ast &&
-      hasSketchArtifact.length
-    ) {
-      const pathToNode = getNodePathFromSourceRange(
-        ast,
-        hasSketchArtifact[0].sourceRange
-      )
-      const { rotation, position } = hasSketchArtifact[0]
-      setGuiMode({ mode: 'canEditSketch', pathToNode, rotation, position })
-    } else if (
-      hasExtrudeArtifact.length &&
-      (guiMode.mode === 'default' || guiMode.mode === 'canEditExtrude') &&
-      ast
-    ) {
-      const pathToNode = getNodePathFromSourceRange(
-        ast,
-        hasExtrudeArtifact[0].sourceRange
-      )
-      const { rotation, position } = hasExtrudeArtifact[0]
-      setGuiMode({ mode: 'canEditExtrude', pathToNode, rotation, position })
-    } else if (
-      !shouldHighlight &&
-      (guiMode.mode === 'canEditExtrude' || guiMode.mode === 'canEditSketch')
-    ) {
-      setGuiMode({ mode: 'default' })
-    }
-  }, [artifacts, selectionRanges])
-}
-
-function useConstraintColors(sourceRange: [number, number]): string {
-  const { guiMode, ast } = useStore((s) => ({
-    guiMode: s.guiMode,
-    ast: s.ast,
-  }))
-  const [baseColor, setBaseColor] = useState('orange')
-  useEffect(() => {
-    if (!ast || guiMode.mode !== 'sketch') {
-      setBaseColor('orange')
-      return
-    }
-    try {
-      const level = getConstraintLevelFromSourceRange(sourceRange, ast)
-      if (level === 'free') {
-        setBaseColor('orange')
-      } else if (level === 'partial') {
-        setBaseColor('IndianRed')
-      } else if (level === 'full') {
-        setBaseColor('lightgreen')
-      }
-    } catch (e) {
-      setBaseColor('orange')
-    }
-  }, [guiMode, ast, sourceRange])
-
-  return baseColor
-}

src/components/SetAngleLengthModal.tsx

@@ -1,6 +1,6 @@
 import { Dialog, Transition } from '@headlessui/react'
 import { Fragment, useState } from 'react'
-import { Value } from '../lang/abstractSyntaxTree'
+import { Value } from '../lang/abstractSyntaxTreeTypes'
 import {
   AvailableVars,
   addToInputHelper,

src/components/SetHorVertDistanceModal.tsx

@@ -1,6 +1,6 @@
 import { Dialog, Transition } from '@headlessui/react'
 import { Fragment, useState } from 'react'
-import { Value } from '../lang/abstractSyntaxTree'
+import { Value } from '../lang/abstractSyntaxTreeTypes'
 import {
   AvailableVars,
   addToInputHelper,

src/components/SetVarNameModal.tsx

@@ -1,5 +1,5 @@
 import { Dialog, Transition } from '@headlessui/react'
-import { Fragment, useState } from 'react'
+import { Fragment } from 'react'
 import { useCalc, CreateNewVariable } from './AvailableVarsHelpers'
 
 export const SetVarNameModal = ({

src/components/SketchPlane.tsx

@@ -1,181 +0,0 @@
-import { useState } from 'react'
-import { Selections, useStore } from '../useStore'
-import { DoubleSide, Vector3, Quaternion } from 'three'
-import { Program } from '../lang/abstractSyntaxTree'
-import { addNewSketchLn } from '../lang/std/sketch'
-import { roundOff } from '../lib/utils'
-
-export const SketchPlane = () => {
-  const {
-    ast,
-    guiMode,
-    programMemory,
-    updateAstAsync,
-    setSelectionRanges,
-    selectionRanges,
-    isShiftDown,
-    setCursor,
-  } = useStore((s) => ({
-    guiMode: s.guiMode,
-    ast: s.ast,
-    updateAstAsync: s.updateAstAsync,
-    programMemory: s.programMemory,
-    setSelectionRanges: s.setSelectionRanges,
-    selectionRanges: s.selectionRanges,
-    isShiftDown: s.isShiftDown,
-    setCursor: s.setCursor,
-  }))
-  const [xHover, setXHover] = useState(false)
-  const [yHover, setYHover] = useState(false)
-  if (guiMode.mode !== 'sketch') {
-    return null
-  }
-  if (!(guiMode.sketchMode === 'sketchEdit') && !('isTooltip' in guiMode)) {
-    return null
-  }
-
-  const sketchGridName = 'sketchGrid'
-
-  let clickDetectQuaternion = new Quaternion(...guiMode.rotation)
-
-  let temp = new Quaternion().setFromAxisAngle(
-    new Vector3(1, 0, 0),
-    Math.PI / 2
-  )
-  let position = guiMode.position
-  const gridQuaternion = new Quaternion().multiplyQuaternions(
-    new Quaternion(...guiMode.rotation),
-    temp
-  )
-
-  const onAxisClick = (name: 'y-axis' | 'x-axis') => () => {
-    const _selectionRanges: Selections = isShiftDown
-      ? selectionRanges
-      : {
-          codeBasedSelections: [
-            {
-              range: [0, 0],
-              type: 'default',
-            },
-          ],
-          otherSelections: [],
-        }
-    if (!isShiftDown) {
-      setCursor({
-        ..._selectionRanges,
-        otherSelections: [name],
-      })
-    }
-    setTimeout(() => {
-      setSelectionRanges({
-        ..._selectionRanges,
-        otherSelections: [name],
-      })
-    }, 100)
-  }
-
-  return (
-    <>
-      <mesh
-        quaternion={clickDetectQuaternion}
-        position={position}
-        name={sketchGridName}
-        onPointerDown={(e) => {
-          if (!('isTooltip' in guiMode)) {
-            return
-          }
-          const sketchGridIntersection = e.intersections.find(
-            ({ object }) => object.name === sketchGridName
-          )
-          const inverseQuaternion = clickDetectQuaternion.clone().invert()
-          let transformedPoint = sketchGridIntersection?.point.clone()
-          if (transformedPoint) {
-            transformedPoint.applyQuaternion(inverseQuaternion)
-            transformedPoint?.sub(
-              new Vector3(...position).applyQuaternion(inverseQuaternion)
-            )
-          }
-
-          const point = roundy(transformedPoint)
-          let _ast: Program = ast
-            ? ast
-            : {
-                type: 'Program',
-                start: 0,
-                end: 0,
-                body: [],
-                nonCodeMeta: {},
-              }
-          const { modifiedAst } = addNewSketchLn({
-            node: _ast,
-            programMemory,
-            to: [point.x, point.y],
-            fnName: guiMode.sketchMode,
-            pathToNode: guiMode.pathToNode,
-          })
-          updateAstAsync(modifiedAst)
-        }}
-      >
-        <planeGeometry args={[30, 40]} />
-        <meshStandardMaterial
-          color="blue"
-          side={DoubleSide}
-          opacity={0}
-          transparent
-        />
-      </mesh>
-      <gridHelper
-        args={[50, 50, 'blue', 'hotpink']}
-        quaternion={gridQuaternion}
-        position={position}
-        onClick={() =>
-          !isShiftDown &&
-          setSelectionRanges({
-            ...selectionRanges,
-            otherSelections: [],
-          })
-        }
-      />
-      <mesh
-        onPointerOver={() => setXHover(true)}
-        onPointerOut={() => setXHover(false)}
-        onClick={onAxisClick('x-axis')}
-      >
-        <boxGeometry args={[50, 0.2, 0.05]} />
-        <meshStandardMaterial
-          color={
-            selectionRanges.otherSelections.includes('x-axis')
-              ? 'skyblue'
-              : xHover
-              ? '#FF5555'
-              : '#FF1111'
-          }
-        />
-      </mesh>
-      <mesh
-        onPointerOver={() => setYHover(true)}
-        onPointerOut={() => setYHover(false)}
-        onClick={onAxisClick('y-axis')}
-      >
-        <boxGeometry args={[0.2, 50, 0.05]} />
-        <meshStandardMaterial
-          color={
-            selectionRanges.otherSelections.includes('y-axis')
-              ? 'skyblue'
-              : yHover
-              ? '#5555FF'
-              : '#1111FF'
-          }
-        />
-      </mesh>
-    </>
-  )
-}
-
-function roundy({ x, y, z }: any) {
-  return {
-    x: roundOff(x, 2),
-    y: roundOff(y, 2),
-    z: roundOff(z, 2),
-  }
-}

src/components/Stream.tsx

@@ -1,8 +1,36 @@
-import { useEffect, useRef } from 'react'
-import { PanelHeader } from '../components/PanelHeader'
+import {
+  MouseEventHandler,
+  WheelEventHandler,
+  useEffect,
+  useRef,
+  useState,
+} from 'react'
+import { v4 as uuidv4 } from 'uuid'
+import { useStore } from '../useStore'
+import { getNormalisedCoordinates } from '../lib/utils'
+import Loading from './Loading'
 
-export const Stream = () => {
+export const Stream = ({ className = '' }) => {
+  const [isLoading, setIsLoading] = useState(true)
+  const [clickCoords, setClickCoords] = useState<{ x: number; y: number }>()
   const videoRef = useRef<HTMLVideoElement>(null)
+  const {
+    mediaStream,
+    engineCommandManager,
+    setIsMouseDownInStream,
+    didDragInStream,
+    setDidDragInStream,
+    streamDimensions,
+  } = useStore((s) => ({
+    mediaStream: s.mediaStream,
+    engineCommandManager: s.engineCommandManager,
+    isMouseDownInStream: s.isMouseDownInStream,
+    setIsMouseDownInStream: s.setIsMouseDownInStream,
+    fileId: s.fileId,
+    didDragInStream: s.didDragInStream,
+    setDidDragInStream: s.setDidDragInStream,
+    streamDimensions: s.streamDimensions,
+  }))
 
   useEffect(() => {
     if (
@@ -10,127 +38,130 @@ export const Stream = () => {
       typeof RTCPeerConnection === 'undefined'
     )
       return
-    const url = 'wss://dev.api.kittycad.io/ws/modeling/commands'
-    const [pc, socket] = [new RTCPeerConnection(), new WebSocket(url)]
-    // Connection opened
-    socket.addEventListener('open', (event) => {
-      console.log('Connected to websocket, waiting for ICE servers')
+    if (!videoRef.current) return
+    if (!mediaStream) return
+    videoRef.current.srcObject = mediaStream
+  }, [mediaStream, engineCommandManager])
+
+  const handleMouseDown: MouseEventHandler<HTMLVideoElement> = ({
+    clientX,
+    clientY,
+    ctrlKey,
+  }) => {
+    if (!videoRef.current) return
+    const { x, y } = getNormalisedCoordinates({
+      clientX,
+      clientY,
+      el: videoRef.current,
+      ...streamDimensions,
+    })
+    console.log('click', x, y)
+
+    const newId = uuidv4()
+
+    const interaction = ctrlKey ? 'pan' : 'rotate'
+
+    engineCommandManager?.sendSceneCommand({
+      type: 'modeling_cmd_req',
+      cmd: {
+        type: 'camera_drag_start',
+        interaction,
+        window: { x, y },
+      },
+      cmd_id: newId,
     })
 
-    socket.addEventListener('close', (event) => {
-      console.log('websocket connection closed')
+    setIsMouseDownInStream(true)
+    setClickCoords({ x, y })
+  }
+
+  const handleScroll: WheelEventHandler<HTMLVideoElement> = (e) => {
+    e.preventDefault()
+    engineCommandManager?.sendSceneCommand({
+      type: 'modeling_cmd_req',
+      cmd: {
+        type: 'default_camera_zoom',
+        magnitude: e.deltaY * 0.4,
+      },
+      cmd_id: uuidv4(),
+    })
+  }
+
+  const handleMouseUp: MouseEventHandler<HTMLVideoElement> = ({
+    clientX,
+    clientY,
+    ctrlKey,
+  }) => {
+    if (!videoRef.current) return
+    const { x, y } = getNormalisedCoordinates({
+      clientX,
+      clientY,
+      el: videoRef.current,
+      ...streamDimensions,
     })
 
-    socket.addEventListener('error', (event) => {
-      console.log('websocket connection error')
+    const newCmdId = uuidv4()
+    const interaction = ctrlKey ? 'pan' : 'rotate'
+
+    engineCommandManager?.sendSceneCommand({
+      type: 'modeling_cmd_req',
+      cmd: {
+        type: 'camera_drag_end',
+        interaction,
+        window: { x, y },
+      },
+      cmd_id: newCmdId,
     })
 
-    // Listen for messages
-    socket.addEventListener('message', (event) => {
-      //console.log('Message from server ', event.data);
-      if (event.data instanceof Blob) {
-        const reader = new FileReader()
-
-        reader.onload = () => {
-          //console.log("Result: " + reader.result);
-        }
-
-        reader.readAsText(event.data)
-      } else {
-        const message = JSON.parse(event.data)
-        if (message.type === 'SDPAnswer') {
-          pc.setRemoteDescription(new RTCSessionDescription(message.answer))
-        } else if (message.type === 'IceServerInfo') {
-          console.log('received IceServerInfo')
-          pc.setConfiguration({
-            iceServers: message.ice_servers,
-          })
-          pc.ontrack = function (event) {
-            if (videoRef.current) {
-              videoRef.current.srcObject = event.streams[0]
-              videoRef.current.autoplay = true
-              videoRef.current.controls = false
-            }
-          }
-          pc.oniceconnectionstatechange = (e) =>
-            console.log(pc.iceConnectionState)
-          pc.onicecandidate = (event) => {
-            if (event.candidate === null) {
-              console.log('sent SDPOffer')
-              socket.send(
-                JSON.stringify({
-                  type: 'SDPOffer',
-                  offer: pc.localDescription,
-                })
-              )
-            }
-          }
-
-          // Offer to receive 1 video track
-          pc.addTransceiver('video', {
-            direction: 'sendrecv',
-          })
-          pc.createOffer()
-            .then((d) => pc.setLocalDescription(d))
-            .catch(console.log)
-        }
-      }
-    })
-
-    const debounceSocketSend = throttle((message) => {
-      socket.send(JSON.stringify(message))
-    }, 100)
-    const handleMouseMove = ({ clientX, clientY }: MouseEvent) => {
-      if (!videoRef.current) return
-      const { left, top } = videoRef.current.getBoundingClientRect()
-      const x = clientX - left
-      const y = clientY - top
-      debounceSocketSend({ type: 'MouseMove', x: x, y: y })
-    }
-    if (videoRef.current) {
-      videoRef.current.addEventListener('mousemove', handleMouseMove)
+    setIsMouseDownInStream(false)
+    if (!didDragInStream) {
+      engineCommandManager?.sendSceneCommand({
+        type: 'modeling_cmd_req',
+        cmd: {
+          type: 'select_with_point',
+          selection_type: 'add',
+          selected_at_window: { x, y },
+        },
+        cmd_id: uuidv4(),
+      })
     }
+    setDidDragInStream(false)
+    setClickCoords(undefined)
+  }
 
-    return () => {
-      socket.close()
-      pc.close()
-      if (!videoRef.current) return
-      videoRef.current.removeEventListener('mousemove', handleMouseMove)
+  const handleMouseMove: MouseEventHandler<HTMLVideoElement> = (e) => {
+    if (!clickCoords) return
+
+    const delta =
+      ((clickCoords.x - e.clientX) ** 2 + (clickCoords.y - e.clientY) ** 2) **
+      0.5
+
+    if (delta > 5 && !didDragInStream) {
+      setDidDragInStream(true)
     }
-  }, [])
+  }
 
   return (
-    <div>
-      <PanelHeader title="Stream" />
-      <video ref={videoRef} />
+    <div id="stream" className={className}>
+      <video
+        ref={videoRef}
+        muted
+        autoPlay
+        controls={false}
+        onMouseDown={handleMouseDown}
+        onMouseUp={handleMouseUp}
+        onContextMenu={(e) => e.preventDefault()}
+        onContextMenuCapture={(e) => e.preventDefault()}
+        onWheel={handleScroll}
+        onPlay={() => setIsLoading(false)}
+        onMouseMoveCapture={handleMouseMove}
+        className="w-full h-full"
+      />
+      {isLoading && (
+        <div className="text-center absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2">
+          <Loading>Loading stream...</Loading>
+        </div>
+      )}
     </div>
   )
 }
-
-function throttle(
-  func: (...args: any[]) => any,
-  wait: number
-): (...args: any[]) => any {
-  let timeout: ReturnType<typeof setTimeout> | null
-  let latestArgs: any[]
-  let latestTimestamp: number
-
-  function later() {
-    timeout = null
-    func(...latestArgs)
-  }
-
-  function throttled(...args: any[]) {
-    const currentTimestamp = Date.now()
-    latestArgs = args
-
-    if (!latestTimestamp || currentTimestamp - latestTimestamp >= wait) {
-      latestTimestamp = currentTimestamp
-      func(...latestArgs)
-    } else if (!timeout) {
-      timeout = setTimeout(later, wait - (currentTimestamp - latestTimestamp))
-    }
-  }
-
-  return throttled
-}

src/components/Toggle/Toggle.module.css

@@ -0,0 +1,40 @@
+.toggle {
+  @apply flex items-center gap-2 w-fit;
+  --toggle-size: 1.25rem;
+  --padding: 0.25rem;
+}
+
+.toggle:focus-within > span {
+  @apply outline-none ring-2;
+}
+
+.toggle input {
+  @apply sr-only;
+}
+
+.toggle > span {
+  @apply relative rounded border border-chalkboard-110 hover:border-chalkboard-100 cursor-pointer;
+  width: calc(2 * (var(--toggle-size) + var(--padding)));
+  height: calc(var(--toggle-size) + var(--padding));
+}
+
+:global(.dark) .toggle > span {
+  @apply border-chalkboard-40 hover:border-chalkboard-30;
+}
+
+.toggle > span::after {
+  content: '';
+  @apply absolute w-4 h-4 rounded-sm bg-chalkboard-110;
+  top: 50%;
+  left: 50%;
+  translate: calc(-100% - var(--padding)) -50%;
+  transition: translate 0.08s ease-out;
+}
+
+:global(.dark) .toggle > span::after {
+  @apply bg-chalkboard-10;
+}
+
+.toggle input:checked + span::after {
+  translate: calc(50% - var(--padding)) -50%;
+}

src/components/Toggle/Toggle.tsx

@@ -0,0 +1,34 @@
+import styles from './Toggle.module.css'
+
+interface ToggleProps {
+  className?: string
+  offLabel?: string
+  onLabel?: string
+  name: string
+  onChange: (e: React.ChangeEvent<HTMLInputElement>) => void
+  checked: boolean
+}
+
+export const Toggle = ({
+  className = '',
+  offLabel = 'Off',
+  onLabel = 'On',
+  name = '',
+  onChange,
+  checked,
+}: ToggleProps) => {
+  return (
+    <label className={`${styles.toggle} ${className}`}>
+      {offLabel}
+      <input
+        type="checkbox"
+        name={name}
+        id={name}
+        checked={checked}
+        onChange={onChange}
+      />
+      <span></span>
+      {onLabel}
+    </label>
+  )
+}

src/components/Toolbar/ConvertVariable.tsx

@@ -53,9 +53,6 @@ export const ConvertToVariable = () => {
           console.log('e', e)
         }
       }}
-      className={`border m-1 px-1 rounded text-xs ${
-        enableAngLen ? 'bg-gray-50 text-gray-800' : 'bg-gray-200 text-gray-400'
-      }`}
       disabled={!enableAngLen}
     >
       ConvertToVariable

src/components/Toolbar/EqualAngle.tsx

@@ -1,6 +1,6 @@
 import { useState, useEffect } from 'react'
 import { toolTips, useStore } from '../../useStore'
-import { Value, VariableDeclarator } from '../../lang/abstractSyntaxTree'
+import { Value, VariableDeclarator } from '../../lang/abstractSyntaxTreeTypes'
 import {
   getNodePathFromSourceRange,
   getNodeFromPath,
@@ -86,9 +86,6 @@ export const EqualAngle = () => {
           callBack: updateCursors(setCursor, selectionRanges, pathToNodeMap),
         })
       }}
-      className={`border m-1 px-1 rounded text-xs ${
-        enableEqual ? 'bg-gray-50 text-gray-800' : 'bg-gray-200 text-gray-400'
-      }`}
       disabled={!enableEqual}
       title="yo dawg"
     >

src/components/Toolbar/EqualLength.tsx

@@ -1,6 +1,6 @@
 import { useState, useEffect } from 'react'
 import { toolTips, useStore } from '../../useStore'
-import { Value, VariableDeclarator } from '../../lang/abstractSyntaxTree'
+import { Value, VariableDeclarator } from '../../lang/abstractSyntaxTreeTypes'
 import {
   getNodePathFromSourceRange,
   getNodeFromPath,
@@ -86,9 +86,6 @@ export const EqualLength = () => {
           callBack: updateCursors(setCursor, selectionRanges, pathToNodeMap),
         })
       }}
-      className={`border m-1 px-1 rounded text-xs ${
-        enableEqual ? 'bg-gray-50 text-gray-800' : 'bg-gray-200 text-gray-400'
-      }`}
       disabled={!enableEqual}
       title="yo dawg"
     >

src/components/Toolbar/HorzVert.tsx

@@ -1,6 +1,6 @@
 import { useState, useEffect } from 'react'
 import { toolTips, useStore } from '../../useStore'
-import { Value } from '../../lang/abstractSyntaxTree'
+import { Value } from '../../lang/abstractSyntaxTreeTypes'
 import {
   getNodePathFromSourceRange,
   getNodeFromPath,
@@ -65,9 +65,6 @@ export const HorzVert = ({
           callBack: updateCursors(setCursor, selectionRanges, pathToNodeMap),
         })
       }}
-      className={`border m-1 px-1 rounded text-xs ${
-        enableHorz ? 'bg-gray-50 text-gray-800' : 'bg-gray-200 text-gray-400'
-      }`}
       disabled={!enableHorz}
       title="yo dawg"
     >