Halfway, broken impl of patch from our controls to OrbitControls

* Update test to expect new behavior (failing)

* Update behavior to match new test expectations

* Make reset button more clear

* Fix eslint issue

* Fix up separate test that relied on old reset logic

.env.development

@@ -2,7 +2,9 @@ NODE_ENV=development
 DEV=true
 VITE_KC_API_WS_MODELING_URL=wss://api.dev.zoo.dev/ws/modeling/commands
 VITE_KC_API_BASE_URL=https://api.dev.zoo.dev
+BASE_URL=https://api.dev.zoo.dev
 VITE_KC_SITE_BASE_URL=https://dev.zoo.dev
 VITE_KC_SKIP_AUTH=false
 VITE_KC_CONNECTION_TIMEOUT_MS=5000
-VITE_KC_DEV_TOKEN="your token from dev.zoo.dev should go in .env.development.local"
+# ONLY add your token in .env.development.local if you want to skip auth, otherwise this token takes precedence!
+#VITE_KC_DEV_TOKEN="your token from dev.zoo.dev should go in .env.development.local"

.eslintrc

@@ -13,6 +13,8 @@
       "plugin:css-modules/recommended"
     ],
     "rules": {
+      "@typescript-eslint/no-floating-promises": "error",
+      "@typescript-eslint/no-misused-promises": "error",
       "semi": [
         "error",
         "never"
@@ -24,7 +26,6 @@
       {
         "files": ["e2e/**/*.ts"], // Update the pattern based on your file structure
         "rules": {
-          "@typescript-eslint/no-floating-promises": "warn",
           "suggest-no-throw/suggest-no-throw": "off",
           "testing-library/prefer-screen-queries": "off",
           "jest/valid-expect": "off"

.github/workflows/build-test-publish-apps.yml

@@ -44,7 +44,7 @@ jobs:
 
       # TODO: see if we can fetch from main instead if no diff at src/wasm-lib
       - name: Run build:wasm
-        run: "yarn build:wasm${{ env.BUILD_RELEASE == 'true' && '-dev' || ''}}"
+        run: "yarn build:wasm"
 
       - name: Set nightly version
         if: github.event_name == 'schedule'
@@ -81,8 +81,6 @@ jobs:
       CSC_KEY_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
       CSC_KEYCHAIN: ${{ secrets.APPLE_SIGNING_IDENTITY }}
       CSC_FOR_PULL_REQUEST: true
-      TAURI_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
-      TAURI_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
       VERSION: ${{ github.event_name == 'schedule' && needs.prepare-files.outputs.version || format('v{0}', needs.prepare-files.outputs.version) }}
       VERSION_NO_V: ${{ needs.prepare-files.outputs.version }}
       WINDOWS_CERTIFICATE_THUMBPRINT: F4C9A52FF7BC26EE5E054946F6B11DEEA94C748D
@@ -142,37 +140,12 @@ jobs:
       - name: List artifacts in out/
         run: ls -R out
 
-      - name: Prepare the tauri update bundles (macOS)
-        if: ${{ env.BUILD_RELEASE && matrix.os == 'macos-14' }}
-        run: |
-          for ARCH in arm64 x64; do
-            TAURI_DIR=out/tauri/$VERSION/macos
-            TEMP_DIR=temp/$ARCH
-            mkdir -p $TAURI_DIR
-            mkdir -p $TEMP_DIR
-            unzip out/*-$ARCH-mac.zip -d $TEMP_DIR
-            tar -czvf "$TAURI_DIR/Zoo Modeling App-$ARCH.app.tar.gz" -C $TEMP_DIR "Zoo Modeling App.app" 
-            yarn tauri signer sign "$TAURI_DIR/Zoo Modeling App-$ARCH.app.tar.gz"
-          done
-          ls -R out
-
-      - name: Prepare the tauri update bundles (Windows)
-        if: ${{ env.BUILD_RELEASE && matrix.os == 'windows-2022' }}
-        run: |
-          $env:TAURI_DIR="out/tauri/${env:VERSION}/nsis"
-          mkdir -p ${env:TAURI_DIR}
-          $env:OUT_FILE="${env:TAURI_DIR}/Zoo Modeling App_${env:VERSION_NO_V}_x64-setup.nsis.zip"
-          7z a -mm=Copy "${env:OUT_FILE}" ./out/*-x64-win.exe
-          yarn tauri signer sign "${env:OUT_FILE}"
-          ls -R out
-
       - uses: actions/upload-artifact@v3
         with:
           name: out-${{ matrix.os }}
           path: |
             out/Zoo*.*
             out/latest*.yml
-            out/tauri
 
       # TODO: add the 'Build for Mac TestFlight (nightly)' stage back
 
@@ -192,8 +165,6 @@ jobs:
       NOTES: ${{ github.event_name == 'release' && github.event.release.body || format('Non-release build, commit {0}', github.sha) }}
       BUCKET_DIR: ${{ github.event_name == 'schedule' && 'dl.kittycad.io/releases/modeling-app/nightly' || 'dl.kittycad.io/releases/modeling-app' }}
       WEBSITE_DIR: ${{ github.event_name == 'schedule' && 'dl.zoo.dev/releases/modeling-app/nightly' || 'dl.zoo.dev/releases/modeling-app' }}
-      BUCKET_DIR_TAURI: 'dl.kittycad.io/releases/modeling-app/tauri-compat'
-      WEBSITE_DIR_TAURI: 'dl.zoo.dev/releases/modeling-app/tauri-compat'
       URL_CODED_NAME: ${{ github.event_name == 'schedule' && 'Zoo%20Modeling%20App%20%28Nightly%29' || 'Zoo%20Modeling%20App' }}
     steps:
       - uses: actions/checkout@v4
@@ -212,7 +183,7 @@ jobs:
         with:
           name: out-ubuntu-22.04
           path: out
-      
+
       - name: Generate the download static endpoint
         run: |
           RELEASE_DIR=https://${WEBSITE_DIR}
@@ -222,8 +193,10 @@ jobs:
             --arg notes "${NOTES}" \
             --arg mac_arm64_url "$RELEASE_DIR/${{ env.URL_CODED_NAME }}-${VERSION_NO_V}-arm64-mac.dmg" \
             --arg mac_x64_url "$RELEASE_DIR/${{ env.URL_CODED_NAME }}-${VERSION_NO_V}-x64-mac.dmg" \
-            --arg windows_arm64_url "$RELEASE_DIR/${{ env.URL_CODED_NAME }}-${VERSION_NO_V}-arm64-win.msi" \
+            --arg windows_arm64_url "$RELEASE_DIR/${{ env.URL_CODED_NAME }}-${VERSION_NO_V}-arm64-win.exe" \
-            --arg windows_x64_url "$RELEASE_DIR/${{ env.URL_CODED_NAME }}-${VERSION_NO_V}-x64-win.msi" \
+            --arg windows_x64_url "$RELEASE_DIR/${{ env.URL_CODED_NAME }}-${VERSION_NO_V}-x64-win.exe" \
+            --arg linux_arm64_url "$RELEASE_DIR/${{ env.URL_CODED_NAME }}-${VERSION_NO_V}-arm64-linux.AppImage" \
+            --arg linux_x64_url "$RELEASE_DIR/${{ env.URL_CODED_NAME }}-${VERSION_NO_V}-x86_64-linux.AppImage" \
             '{
               "version": $version,
               "pub_date": $pub_date,
@@ -235,54 +208,22 @@ jobs:
                 "dmg-x64": {
                   "url": $mac_x64_url
                 },
-                "msi-arm64": {
+                "exe-arm64": {
                   "url": $windows_arm64_url
                 },
-                "msi-x64": {
+                "exe-x64": {
                   "url": $windows_x64_url
+                },
+                "appimage-arm64": {
+                  "url": $linux_arm64_url
+                },
+                "appimage-x64": {
+                  "url": $linux_x64_url
                 }
               }
             }' > last_download.json
             cat last_download.json
 
-      - name: Generate the update static endpoint for tauri
-        run: |
-          TAURI_DIR=out/tauri/$VERSION
-          MAC_ARM64_SIG=`cat $TAURI_DIR/macos/*-arm64.app.tar.gz.sig`
-          MAC_X64_SIG=`cat $TAURI_DIR/macos/*-x64.app.tar.gz.sig`
-          WINDOWS_SIG=`cat $TAURI_DIR/nsis/*.nsis.zip.sig`
-          RELEASE_DIR=https://${WEBSITE_DIR_TAURI}/${VERSION}
-          jq --null-input \
-            --arg version "${VERSION}" \
-            --arg pub_date "${PUB_DATE}" \
-            --arg notes "${NOTES}" \
-            --arg mac_arm64_sig "$MAC_ARM64_SIG" \
-            --arg mac_arm64_url "$RELEASE_DIR/macos/${{ env.URL_CODED_NAME }}-arm64.app.tar.gz" \
-            --arg mac_x64_sig "$MAC_X64_SIG" \
-            --arg mac_x64_url "$RELEASE_DIR/macos/${{ env.URL_CODED_NAME }}-x64.app.tar.gz" \
-            --arg windows_sig "$WINDOWS_SIG" \
-            --arg windows_url "$RELEASE_DIR/nsis/${{ env.URL_CODED_NAME }}_${VERSION_NO_V}_x64-setup.nsis.zip" \
-            '{
-              "version": $version,
-              "pub_date": $pub_date,
-              "notes": $notes,
-              "platforms": {
-                "darwin-x86_64": {
-                  "signature": $mac_x64_sig,
-                  "url": $mac_x64_url
-                },
-                "darwin-aarch64": {
-                  "signature": $mac_arm64_sig,
-                  "url": $mac_arm64_url
-                },
-                "windows-x86_64": {
-                  "signature": $windows_sig,
-                  "url": $windows_url
-                }
-              }
-            }' > last_update.json
-            cat last_update.json
-
       - name: List artifacts
         run: "ls -R out"
 
@@ -304,13 +245,31 @@ jobs:
           parent: false
           destination: ${{ env.BUCKET_DIR }}
 
+      # TODO: remove workaround introduced in https://github.com/KittyCAD/modeling-app/issues/3817
+      - name: Upload release files to public bucket (test/electron-builder workaround)
+        uses: google-github-actions/upload-cloud-storage@v2.2.0
+        with:
+          path: out
+          glob: 'Zoo*'
+          parent: false
+          destination: '${{ env.BUCKET_DIR }}/test/electron-builder'
+
       - name: Upload update endpoint to public bucket
         uses: google-github-actions/upload-cloud-storage@v2.2.0
         with:
           path: out
           glob: 'latest*'
           parent: false
-          destination: ${{ env.BUCKET_DIR }} 
+          destination: ${{ env.BUCKET_DIR }}
+
+      # TODO: remove workaround introduced in https://github.com/KittyCAD/modeling-app/issues/3817
+      - name: Upload update endpoint to public bucket (test/electron-builder workaround)
+        uses: google-github-actions/upload-cloud-storage@v2.2.0
+        with:
+          path: out
+          glob: 'latest*'
+          parent: false
+          destination: '${{ env.BUCKET_DIR }}/test/electron-builder'
 
       - name: Upload download endpoint to public bucket
         uses: google-github-actions/upload-cloud-storage@v2.2.0
@@ -318,20 +277,6 @@ jobs:
           path: last_download.json
           destination: ${{ env.BUCKET_DIR }}
 
-      - name: Upload release files to public bucket for tauri
-        uses: google-github-actions/upload-cloud-storage@v2.1.1
-        with:
-          path: "out/tauri/${{ env.VERSION }}" 
-          glob: '*/Zoo*'
-          parent: false
-          destination: ${{ env.BUCKET_DIR_TAURI }}/${{ env.VERSION }}
-
-      - name: Upload update endpoint to public bucket for tauri
-        uses: google-github-actions/upload-cloud-storage@v2.1.1
-        with:
-          path: last_update.json
-          destination: ${{ env.BUCKET_DIR }}
-
       - name: Upload release files to Github
         if: ${{ github.event_name == 'release' }}
         uses: softprops/action-gh-release@v2

.github/workflows/build-test-web.yml

@@ -45,7 +45,7 @@ jobs:
       - run: yarn xstate:typegen
       - run: yarn tsc
       - name: Lint
-        run: yarn eslint --max-warnings 0 src e2e
+        run: yarn eslint --max-warnings 0 src e2e packages/codemirror-lsp-client
 
 
   check-typos:

.github/workflows/cargo-clippy.yml

@@ -28,6 +28,7 @@ jobs:
         dir: ['src/wasm-lib']
     steps:
       - uses: actions/checkout@v4
+      - uses: taiki-e/install-action@just
       - name: Install latest rust
         uses: actions-rs/toolchain@v1
         with:
@@ -41,7 +42,7 @@ jobs:
       - name: Run clippy
         run: |
           cd "${{ matrix.dir }}"
-          cargo clippy --all --tests --benches -- -D warnings
+          just lint
       # If this fails, run "cargo check" to update Cargo.lock,
       # then add Cargo.lock to the PR.
       - name: Check Cargo.lock doesn't need updating

README.md

@@ -351,25 +351,6 @@ PS: for the debug panel, the following JSON is useful for snapping the camera
 
 </details>
 
-### Tauri e2e tests
-
-#### Windows (local only until the CI edge version mismatch is fixed)
-
-```
-yarn install
-yarn build:wasm-dev
-cp src/wasm-lib/pkg/wasm_lib_bg.wasm public
-yarn vite build --mode development
-yarn tauri build --debug -b
-$env:KITTYCAD_API_TOKEN="<YOUR_KITTYCAD_API_TOKEN>"
-$env:VITE_KC_API_BASE_URL="https://api.dev.zoo.dev"
-$env:E2E_TAURI_ENABLED="true"
-$env:TS_NODE_COMPILER_OPTIONS='{"module": "commonjs"}'
-$env:E2E_APPLICATION=".\src-tauri\target\debug\Zoo Modeling App.exe"
-Stop-Process -Name msedgedriver
-yarn wdio run wdio.conf.ts
-```
-
 ## KCL
 
 For how to contribute to KCL, [see our KCL README](https://github.com/KittyCAD/modeling-app/tree/main/src/wasm-lib/kcl).

docs/kcl/KNOWN-ISSUES.md

@@ -24,6 +24,3 @@ once fixed in engine will just start working here with no language changes.
     chamfer cases work currently.
 
     Sketching on the chamfered face does not currently work.
-
-- **Shell**: Shell sometimes does not work when arcs or fillets are involved.
-    We are tracking the engine side bug on this.

docs/kcl/index.md

@@ -56,6 +56,7 @@ layout: manual
 * [`line`](kcl/line)
 * [`lineTo`](kcl/lineTo)
 * [`ln`](kcl/ln)
+* [`loft`](kcl/loft)
 * [`log`](kcl/log)
 * [`log10`](kcl/log10)
 * [`log2`](kcl/log2)
@@ -63,6 +64,7 @@ layout: manual
 * [`max`](kcl/max)
 * [`min`](kcl/min)
 * [`mm`](kcl/mm)
+* [`offsetPlane`](kcl/offsetPlane)
 * [`patternCircular2d`](kcl/patternCircular2d)
 * [`patternCircular3d`](kcl/patternCircular3d)
 * [`patternLinear2d`](kcl/patternLinear2d)

e2e/playwright/code-pane-and-errors.spec.ts

@@ -271,10 +271,7 @@ test(
 
       await page.getByText('bracket').click()
 
-      await expect(page.getByTestId('loading')).toBeAttached()
+      await u.waitForPageLoad()
-      await expect(page.getByTestId('loading')).not.toBeAttached({
-        timeout: 20_000,
-      })
     })
 
     // If they're open by default, we're not actually testing anything.
@@ -302,16 +299,7 @@ test(
 
       await page.getByText('router-template-slate').click()
 
-      await expect(page.getByTestId('loading')).toBeAttached()
+      await u.waitForPageLoad()
-      await expect(page.getByTestId('loading')).not.toBeAttached({
-        timeout: 20_000,
-      })
-
-      await expect(
-        page.getByRole('button', { name: 'Start Sketch' })
-      ).toBeEnabled({
-        timeout: 20_000,
-      })
     })
 
     await test.step('All panes opened before should be visible', async () => {

e2e/playwright/file-tree.spec.ts

@@ -112,7 +112,8 @@ test.describe('when using the file tree to', () => {
       })
 
       const {
-        panesOpen,
+        openKclCodePanel,
+        openFilePanel,
         createAndSelectProject,
         pasteCodeInEditor,
         createNewFileAndSelect,
@@ -124,9 +125,9 @@ test.describe('when using the file tree to', () => {
       await page.setViewportSize({ width: 1200, height: 500 })
       page.on('console', console.log)
 
-      await panesOpen(['files', 'code'])
-
       await createAndSelectProject('project-000')
+      await openKclCodePanel()
+      await openFilePanel()
       // File the main.kcl with contents
       const kclCube = await fsp.readFile(
         'src/wasm-lib/tests/executor/inputs/cube.kcl',
@@ -201,4 +202,78 @@ test.describe('when using the file tree to', () => {
       await electronApp.close()
     }
   )
+
+  test(
+    'loading small file, then large, then back to small',
+    {
+      tag: '@electron',
+    },
+    async ({ browser: _ }, testInfo) => {
+      const { page } = await setupElectron({
+        testInfo,
+      })
+
+      const {
+        panesOpen,
+        createAndSelectProject,
+        pasteCodeInEditor,
+        createNewFile,
+        openDebugPanel,
+        closeDebugPanel,
+        expectCmdLog,
+      } = await getUtils(page, test)
+
+      await page.setViewportSize({ width: 1200, height: 500 })
+      page.on('console', console.log)
+
+      await panesOpen(['files', 'code'])
+      await createAndSelectProject('project-000')
+
+      // Create a small file
+      const kclCube = await fsp.readFile(
+        'src/wasm-lib/tests/executor/inputs/cube.kcl',
+        'utf-8'
+      )
+      // pasted into main.kcl
+      await pasteCodeInEditor(kclCube)
+
+      // Create a large lego file
+      await createNewFile('lego')
+      const legoFile = page.getByRole('listitem').filter({
+        has: page.getByRole('button', { name: 'lego.kcl' }),
+      })
+      await expect(legoFile).toBeVisible({ timeout: 60_000 })
+      await legoFile.click()
+      const kclLego = await fsp.readFile(
+        'src/wasm-lib/tests/executor/inputs/lego.kcl',
+        'utf-8'
+      )
+      await pasteCodeInEditor(kclLego)
+      const mainFile = page.getByRole('listitem').filter({
+        has: page.getByRole('button', { name: 'main.kcl' }),
+      })
+
+      // Open settings and enable the debug panel
+      await page
+        .getByRole('link', {
+          name: 'settings Settings',
+        })
+        .click()
+      await page.locator('#showDebugPanel').getByText('OffOn').click()
+      await page.getByTestId('settings-close-button').click()
+
+      await test.step('swap between small and large files', async () => {
+        await openDebugPanel()
+        // Previously created a file so we need to start back at main.kcl
+        await mainFile.click()
+        await expectCmdLog('[data-message-type="execution-done"]', 60_000)
+        // Click the large file
+        await legoFile.click()
+        // Once it is building, click back to the smaller file
+        await mainFile.click()
+        await expectCmdLog('[data-message-type="execution-done"]', 60_000)
+        await closeDebugPanel()
+      })
+    }
+  )
 })

e2e/playwright/projects.spec.ts

@@ -147,9 +147,6 @@ test.describe('Can export from electron app', () => {
         const u = await getUtils(page)
 
         page.on('console', console.log)
-        await electronApp.context().addInitScript(async () => {
-          ;(window as any).playwrightSkipFilePicker = true
-        })
 
         const pointOnModel = { x: 630, y: 280 }
 
@@ -938,16 +935,7 @@ test(
 
       await page.getByText('bracket').click()
 
-      await expect(page.getByTestId('loading')).toBeAttached()
+      await u.waitForPageLoad()
-      await expect(page.getByTestId('loading')).not.toBeAttached({
-        timeout: 20_000,
-      })
-
-      await expect(
-        page.getByRole('button', { name: 'Start Sketch' })
-      ).toBeEnabled({
-        timeout: 20_000,
-      })
 
       // gray at this pixel means the stream has loaded in the most
       // user way we can verify it (pixel color)
@@ -972,16 +960,7 @@ test(
 
       await page.getByText('router-template-slate').click()
 
-      await expect(page.getByTestId('loading')).toBeAttached()
+      await u.waitForPageLoad()
-      await expect(page.getByTestId('loading')).not.toBeAttached({
-        timeout: 20_000,
-      })
-
-      await expect(
-        page.getByRole('button', { name: 'Start Sketch' })
-      ).toBeEnabled({
-        timeout: 20_000,
-      })
 
       // gray at this pixel means the stream has loaded in the most
       // user way we can verify it (pixel color)
@@ -1740,7 +1719,7 @@ test.describe('Renaming in the file tree', () => {
       })
 
       await test.step('Rename the folder', async () => {
-        await page.waitForTimeout(60000)
+        await page.waitForTimeout(2000)
         await folderToRename.click({ button: 'right' })
         await expect(renameMenuItem).toBeVisible()
         await renameMenuItem.click()

e2e/playwright/regression-tests.spec.ts

@@ -54,6 +54,67 @@ const sketch001 = startSketchAt([-0, -0])
     const crypticErrorText = `ApiError`
     await expect(page.getByText(crypticErrorText).first()).toBeVisible()
   })
+  test('user should not have to press down twice in cmdbar', async ({
+    page,
+  }) => {
+    // because the model has `line([0,0]..` it is valid code, but the model is invalid
+    // regression test for https://github.com/KittyCAD/modeling-app/issues/3251
+    // Since the bad model also found as issue with the artifact graph, which in tern blocked the editor diognostics
+    const u = await getUtils(page)
+    await page.addInitScript(async () => {
+      localStorage.setItem(
+        'persistCode',
+        `const sketch2 = startSketchOn("XY")
+const sketch001 = startSketchAt([-0, -0])
+  |> line([0, 0], %)
+  |> line([-4.84, -5.29], %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)`
+      )
+    })
+
+    await page.setViewportSize({ width: 1000, height: 500 })
+
+    await page.goto('/')
+    await u.waitForPageLoad()
+
+    await test.step('Check arrow down works', async () => {
+      await page.getByTestId('command-bar-open-button').click()
+
+      await page
+        .getByRole('option', { name: 'floppy disk arrow Export' })
+        .click()
+
+      // press arrow down key twice
+      await page.keyboard.press('ArrowDown')
+      await page.waitForTimeout(100)
+      await page.keyboard.press('ArrowDown')
+
+      // STL is the third option, which makes sense for two arrow downs
+      await expect(page.locator('[data-headlessui-state="active"]')).toHaveText(
+        'STL'
+      )
+
+      await page.keyboard.press('Escape')
+      await page.waitForTimeout(200)
+      await page.keyboard.press('Escape')
+      await page.waitForTimeout(200)
+    })
+
+    await test.step('Check arrow up works', async () => {
+      // theme in test is dark, which is the second option, which means we can test arrow up
+      await page.getByTestId('command-bar-open-button').click()
+
+      await page.getByText('The overall appearance of the').click()
+
+      await page.keyboard.press('ArrowUp')
+      await page.waitForTimeout(100)
+
+      await expect(page.locator('[data-headlessui-state="active"]')).toHaveText(
+        'light'
+      )
+    })
+  })
   test('executes on load', async ({ page }) => {
     const u = await getUtils(page)
     await page.addInitScript(async () => {

e2e/playwright/test-utils.ts

@@ -27,6 +27,7 @@ import * as TOML from '@iarna/toml'
 import { SaveSettingsPayload } from 'lib/settings/settingsTypes'
 import { SETTINGS_FILE_NAME } from 'lib/constants'
 import { isArray } from 'lib/utils'
+import { reportRejection } from 'lib/trap'
 
 type TestColor = [number, number, number]
 export const TEST_COLORS = {
@@ -439,46 +440,50 @@ export async function getUtils(page: Page, test_?: typeof test) {
       }
       return maxDiff
     },
-    doAndWaitForImageDiff: (fn: () => Promise<any>, diffCount = 200) =>
+    doAndWaitForImageDiff: (fn: () => Promise<unknown>, diffCount = 200) =>
-      new Promise(async (resolve) => {
+      new Promise<boolean>((resolve) => {
-        await page.screenshot({
+        ;(async () => {
-          path: './e2e/playwright/temp1.png',
-          fullPage: true,
-        })
-        await fn()
-        const isImageDiff = async () => {
           await page.screenshot({
-            path: './e2e/playwright/temp2.png',
+            path: './e2e/playwright/temp1.png',
             fullPage: true,
           })
-          const screenshot1 = PNG.sync.read(
+          await fn()
-            await fsp.readFile('./e2e/playwright/temp1.png')
+          const isImageDiff = async () => {
-          )
+            await page.screenshot({
-          const screenshot2 = PNG.sync.read(
+              path: './e2e/playwright/temp2.png',
-            await fsp.readFile('./e2e/playwright/temp2.png')
+              fullPage: true,
-          )
+            })
-          const actualDiffCount = pixelMatch(
+            const screenshot1 = PNG.sync.read(
-            screenshot1.data,
+              await fsp.readFile('./e2e/playwright/temp1.png')
-            screenshot2.data,
+            )
-            null,
+            const screenshot2 = PNG.sync.read(
-            screenshot1.width,
+              await fsp.readFile('./e2e/playwright/temp2.png')
-            screenshot2.height
+            )
-          )
+            const actualDiffCount = pixelMatch(
-          return actualDiffCount > diffCount
+              screenshot1.data,
-        }
+              screenshot2.data,
-
+              null,
-        // run isImageDiff every 50ms until it returns true or 5 seconds have passed (100 times)
+              screenshot1.width,
-        let count = 0
+              screenshot2.height
-        const interval = setInterval(async () => {
+            )
-          count++
+            return actualDiffCount > diffCount
-          if (await isImageDiff()) {
-            clearInterval(interval)
-            resolve(true)
-          } else if (count > 100) {
-            clearInterval(interval)
-            resolve(false)
           }
-        }, 50)
+
+          // run isImageDiff every 50ms until it returns true or 5 seconds have passed (100 times)
+          let count = 0
+          const interval = setInterval(() => {
+            ;(async () => {
+              count++
+              if (await isImageDiff()) {
+                clearInterval(interval)
+                resolve(true)
+              } else if (count > 100) {
+                clearInterval(interval)
+                resolve(false)
+              }
+            })().catch(reportRejection)
+          }, 50)
+        })().catch(reportRejection)
       }),
     emulateNetworkConditions: async (
       networkOptions: Protocol.Network.emulateNetworkConditionsParameters
@@ -548,13 +553,16 @@ export async function getUtils(page: Page, test_?: typeof test) {
 
     createNewFileAndSelect: async (name: string) => {
       return test?.step(`Create a file named ${name}, select it`, async () => {
+        await openFilePanel(page)
         await page.getByTestId('create-file-button').click()
         await page.getByTestId('file-rename-field').fill(name)
         await page.keyboard.press('Enter')
-        await page
+        const newFile = page
           .locator('[data-testid="file-pane-scroll-container"] button')
           .filter({ hasText: name })
-          .click()
+
+        await expect(newFile).toBeVisible()
+        await newFile.click()
       })
     },
 
@@ -585,6 +593,15 @@ export async function getUtils(page: Page, test_?: typeof test) {
       })
     },
 
+    /**
+     * @deprecated Sorry I don't have time to fix this right now, but runs like
+     * the one linked below show me that setting the open panes in this manner is not reliable.
+     * You can either set `openPanes` as a part of the same initScript we run in setupElectron/setup,
+     * or you can imperatively open the panes with functions like {openKclCodePanel}
+     * (or we can make a general openPane function that takes a paneId).,
+     * but having a separate initScript does not seem to work reliably.
+     * @link https://github.com/KittyCAD/modeling-app/actions/runs/10731890169/job/29762700806?pr=3807#step:20:19553
+     */
     panesOpen: async (paneIds: PaneId[]) => {
       return test?.step(`Setting ${paneIds} panes to be open`, async () => {
         await page.addInitScript(
@@ -852,10 +869,12 @@ export async function setupElectron({
   testInfo,
   folderSetupFn,
   cleanProjectDir = true,
+  appSettings,
 }: {
   testInfo: TestInfo
   folderSetupFn?: (projectDirName: string) => Promise<void>
   cleanProjectDir?: boolean
+  appSettings?: Partial<SaveSettingsPayload>
 }) {
   // create or otherwise clear the folder
   const projectDirName = testInfo.outputPath('electron-test-projects-dir')
@@ -889,15 +908,19 @@ export async function setupElectron({
 
   if (cleanProjectDir) {
     const tempSettingsFilePath = join(projectDirName, SETTINGS_FILE_NAME)
-    const settingsOverrides = TOML.stringify({
+    const settingsOverrides = TOML.stringify(
-      ...TEST_SETTINGS,
+      appSettings
-      settings: {
+        ? { settings: appSettings }
-        app: {
+        : {
-          ...TEST_SETTINGS.app,
+            ...TEST_SETTINGS,
-          projectDirectory: projectDirName,
+            settings: {
-        },
+              app: {
-      },
+                ...TEST_SETTINGS.app,
-    })
+                projectDirectory: projectDirName,
+              },
+            },
+          }
+    )
     await fsp.writeFile(tempSettingsFilePath, settingsOverrides)
   }
 

e2e/playwright/testing-settings.spec.ts

@@ -8,7 +8,7 @@ import {
   tearDown,
   executorInputPath,
 } from './test-utils'
-import { SaveSettingsPayload } from 'lib/settings/settingsTypes'
+import { SaveSettingsPayload, SettingsLevel } from 'lib/settings/settingsTypes'
 import { TEST_SETTINGS_KEY, TEST_SETTINGS_CORRUPTED } from './storageStates'
 import * as TOML from '@iarna/toml'
 
@@ -154,29 +154,33 @@ test.describe('Testing settings', () => {
 
   test('Project and user settings can be reset', async ({ page }) => {
     const u = await getUtils(page)
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await test.step(`Setup`, async () => {
-    await u.waitForAuthSkipAppStart()
+      await page.setViewportSize({ width: 1200, height: 500 })
-    await page
+      await u.waitForAuthSkipAppStart()
-      .getByRole('button', { name: 'Start Sketch' })
+    })
-      .waitFor({ state: 'visible' })
 
+    // Selectors and constants
     const projectSettingsTab = page.getByRole('radio', { name: 'Project' })
     const userSettingsTab = page.getByRole('radio', { name: 'User' })
-    const resetButton = page.getByRole('button', {
+    const resetButton = (level: SettingsLevel) =>
-      name: 'Restore default settings',
+      page.getByRole('button', {
-    })
+        name: `Reset ${level}-level settings`,
+      })
     const themeColorSetting = page.locator('#themeColor').getByRole('slider')
     const settingValues = {
       default: '259',
       user: '120',
       project: '50',
     }
+    const resetToast = (level: SettingsLevel) =>
+      page.getByText(`${level}-level settings were reset`)
 
-    // Open the settings modal with lower-right button
+    await test.step(`Open the settings modal`, async () => {
-    await page.getByRole('link', { name: 'Settings' }).last().click()
+      await page.getByRole('link', { name: 'Settings' }).last().click()
-    await expect(
+      await expect(
-      page.getByRole('heading', { name: 'Settings', exact: true })
+        page.getByRole('heading', { name: 'Settings', exact: true })
-    ).toBeVisible()
+      ).toBeVisible()
+    })
 
     await test.step('Set up theme color', async () => {
       // Verify we're looking at the project-level settings,
@@ -195,37 +199,40 @@ test.describe('Testing settings', () => {
 
     await test.step('Reset project settings', async () => {
       // Click the reset settings button.
-      await resetButton.click()
+      await resetButton('project').click()
 
-      await expect(page.getByText('Settings restored to default')).toBeVisible()
+      await expect(resetToast('project')).toBeVisible()
-      await expect(
+      await expect(resetToast('project')).not.toBeVisible()
-        page.getByText('Settings restored to default')
-      ).not.toBeVisible()
 
       // Verify it is now set to the inherited user value
-      await expect(themeColorSetting).toHaveValue(settingValues.default)
+      await expect(themeColorSetting).toHaveValue(settingValues.user)
 
-      // Check that the user setting also rolled back
+      await test.step(`Check that the user settings did not change`, async () => {
-      await userSettingsTab.click()
+        await userSettingsTab.click()
-      await expect(themeColorSetting).toHaveValue(settingValues.default)
+        await expect(themeColorSetting).toHaveValue(settingValues.user)
-      await projectSettingsTab.click()
+      })
 
-      // Set project-level value to 50 again to test the user-level reset
+      await test.step(`Set project-level again to test the user-level reset`, async () => {
-      await themeColorSetting.fill(settingValues.project)
+        await projectSettingsTab.click()
-      await userSettingsTab.click()
+        await themeColorSetting.fill(settingValues.project)
+        await userSettingsTab.click()
+      })
     })
 
     await test.step('Reset user settings', async () => {
-      // Change the setting and click the reset settings button.
+      // Click the reset settings button.
-      await themeColorSetting.fill(settingValues.user)
+      await resetButton('user').click()
-      await resetButton.click()
+
+      await expect(resetToast('user')).toBeVisible()
+      await expect(resetToast('user')).not.toBeVisible()
 
       // Verify it is now set to the default value
       await expect(themeColorSetting).toHaveValue(settingValues.default)
 
-      // Check that the project setting also changed
+      await test.step(`Check that the project settings did not change`, async () => {
-      await projectSettingsTab.click()
+        await projectSettingsTab.click()
-      await expect(themeColorSetting).toHaveValue(settingValues.default)
+        await expect(themeColorSetting).toHaveValue(settingValues.project)
+      })
     })
   })
 
@@ -288,7 +295,7 @@ test.describe('Testing settings', () => {
       })
 
       await test.step('Refresh the application and see project setting applied', async () => {
-        await page.reload()
+        await page.reload({ waitUntil: 'domcontentloaded' })
 
         await expect(logoLink).toHaveCSS('--primary-hue', projectThemeColor)
         await settingsCloseButton.click()
@@ -303,53 +310,109 @@ test.describe('Testing settings', () => {
     }
   )
 
+  test(
+    `Load desktop app with no settings file`,
+    { tag: '@electron' },
+    async ({ browser: _ }, testInfo) => {
+      const { electronApp, page } = await setupElectron({
+        // This is what makes no settings file get created
+        cleanProjectDir: false,
+        testInfo,
+      })
+
+      await page.setViewportSize({ width: 1200, height: 500 })
+
+      // Selectors and constants
+      const errorHeading = page.getByRole('heading', {
+        name: 'An unextected error occurred',
+      })
+      const projectDirLink = page.getByText('Loaded from')
+
+      // If the app loads without exploding we're in the clear
+      await expect(errorHeading).not.toBeVisible()
+      await expect(projectDirLink).toBeVisible()
+
+      await electronApp.close()
+    }
+  )
+
+  test(
+    `Load desktop app with a settings file, but no project directory setting`,
+    { tag: '@electron' },
+    async ({ browser: _ }, testInfo) => {
+      const { electronApp, page } = await setupElectron({
+        testInfo,
+        appSettings: {
+          app: {
+            themeColor: '259',
+          },
+        },
+      })
+
+      await page.setViewportSize({ width: 1200, height: 500 })
+
+      // Selectors and constants
+      const errorHeading = page.getByRole('heading', {
+        name: 'An unextected error occurred',
+      })
+      const projectDirLink = page.getByText('Loaded from')
+
+      // If the app loads without exploding we're in the clear
+      await expect(errorHeading).not.toBeVisible()
+      await expect(projectDirLink).toBeVisible()
+
+      await electronApp.close()
+    }
+  )
+
   test(
     `Closing settings modal should go back to the original file being viewed`,
     { tag: '@electron' },
     async ({ browser: _ }, testInfo) => {
       const { electronApp, page } = await setupElectron({
         testInfo,
-        folderSetupFn: async () => {},
+        folderSetupFn: async (dir) => {
+          const bracketDir = join(dir, 'project-000')
+          await fsp.mkdir(bracketDir, { recursive: true })
+          await fsp.copyFile(
+            executorInputPath('cube.kcl'),
+            join(bracketDir, 'main.kcl')
+          )
+          await fsp.copyFile(
+            executorInputPath('cylinder.kcl'),
+            join(bracketDir, '2.kcl')
+          )
+        },
       })
+      const kclCube = await fsp.readFile(executorInputPath('cube.kcl'), 'utf-8')
+      const kclCylinder = await fsp.readFile(
+        executorInputPath('cylinder.kcl'),
+        'utf8'
+      )
 
       const {
-        panesOpen,
+        openKclCodePanel,
-        createAndSelectProject,
+        openFilePanel,
-        pasteCodeInEditor,
+        waitForPageLoad,
-        clickPane,
+        selectFile,
-        createNewFileAndSelect,
         editorTextMatches,
       } = await getUtils(page, test)
 
       await page.setViewportSize({ width: 1200, height: 500 })
       page.on('console', console.log)
 
-      await panesOpen([])
+      await test.step('Precondition: Open to second project file', async () => {
-
-      await test.step('Precondition: No projects exist', async () => {
         await expect(page.getByTestId('home-section')).toBeVisible()
-        const projectLinksPre = page.getByTestId('project-link')
+        await page.getByText('project-000').click()
-        await expect(projectLinksPre).toHaveCount(0)
+        await waitForPageLoad()
+        await openKclCodePanel()
+        await openFilePanel()
+        await editorTextMatches(kclCube)
+
+        await selectFile('2.kcl')
+        await editorTextMatches(kclCylinder)
       })
 
-      await createAndSelectProject('project-000')
-
-      await clickPane('code')
-      const kclCube = await fsp.readFile(
-        'src/wasm-lib/tests/executor/inputs/cube.kcl',
-        'utf-8'
-      )
-      await pasteCodeInEditor(kclCube)
-
-      await clickPane('files')
-      await createNewFileAndSelect('2.kcl')
-
-      const kclCylinder = await fsp.readFile(
-        'src/wasm-lib/tests/executor/inputs/cylinder.kcl',
-        'utf-8'
-      )
-      await pasteCodeInEditor(kclCylinder)
-
       const settingsOpenButton = page.getByRole('link', {
         name: 'settings Settings',
       })
@@ -357,6 +420,9 @@ test.describe('Testing settings', () => {
 
       await test.step('Open and close settings', async () => {
         await settingsOpenButton.click()
+        await expect(
+          page.getByRole('heading', { name: 'Settings', exact: true })
+        ).toBeVisible()
         await settingsCloseButton.click()
       })
 
@@ -370,25 +436,37 @@ test.describe('Testing settings', () => {
 
   test('Changing modeling default unit', async ({ page }) => {
     const u = await getUtils(page)
-    await page.setViewportSize({ width: 1200, height: 500 })
+    await test.step(`Test setup`, async () => {
-    await u.waitForAuthSkipAppStart()
+      await page.setViewportSize({ width: 1200, height: 500 })
-    await page
+      await u.waitForAuthSkipAppStart()
-      .getByRole('button', { name: 'Start Sketch' })
+      await page
-      .waitFor({ state: 'visible' })
+        .getByRole('button', { name: 'Start Sketch' })
-
+        .waitFor({ state: 'visible' })
-    const userSettingsTab = page.getByRole('radio', { name: 'User' })
+    })
-
+
-    // Open the settings modal with lower-right button
+    // Selectors and constants
-    await page.getByRole('link', { name: 'Settings' }).last().click()
+    const userSettingsTab = page.getByRole('radio', { name: 'User' })
-    await expect(
+    const projectSettingsTab = page.getByRole('radio', { name: 'Project' })
-      page.getByRole('heading', { name: 'Settings', exact: true })
+    const defaultUnitSection = page.getByText(
-    ).toBeVisible()
+      'default unitRoll back default unitRoll back to match'
-
+    )
-    const resetButton = page.getByRole('button', {
+    const defaultUnitRollbackButton = page.getByRole('button', {
-      name: 'Restore default settings',
+      name: 'Roll back default unit',
+    })
+
+    await test.step(`Open the settings modal`, async () => {
+      await page.getByRole('link', { name: 'Settings' }).last().click()
+      await expect(
+        page.getByRole('heading', { name: 'Settings', exact: true })
+      ).toBeVisible()
+    })
+
+    await test.step(`Reset unit setting`, async () => {
+      await userSettingsTab.click()
+      await defaultUnitSection.hover()
+      await defaultUnitRollbackButton.click()
+      await projectSettingsTab.click()
     })
-    // Default unit should be mm
-    await resetButton.click()
 
     await test.step('Change modeling default unit within project tab', async () => {
       const changeUnitOfMeasureInProjectTab = async (unitOfMeasure: string) => {
@@ -493,4 +571,70 @@ test.describe('Testing settings', () => {
       await changeUnitOfMeasureInGizmo('m', 'Meters')
     })
   })
+
+  test('Changing theme in sketch mode', async ({ page }) => {
+    const u = await getUtils(page)
+    await page.addInitScript(() => {
+      localStorage.setItem(
+        'persistCode',
+        `const sketch001 = startSketchOn('XZ')
+  |> startProfileAt([0, 0], %)
+  |> line([5, 0], %)
+  |> line([0, 5], %)
+  |> line([-5, 0], %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)
+const extrude001 = extrude(5, sketch001)
+`
+      )
+    })
+    await page.setViewportSize({ width: 1200, height: 500 })
+
+    // Selectors and constants
+    const editSketchButton = page.getByRole('button', { name: 'Edit Sketch' })
+    const lineToolButton = page.getByTestId('line')
+    const segmentOverlays = page.getByTestId('segment-overlay')
+    const sketchOriginLocation = { x: 600, y: 250 }
+    const darkThemeSegmentColor: [number, number, number] = [215, 215, 215]
+    const lightThemeSegmentColor: [number, number, number] = [90, 90, 90]
+
+    await test.step(`Get into sketch mode`, async () => {
+      await u.waitForAuthSkipAppStart()
+      await page.mouse.click(700, 200)
+      await expect(editSketchButton).toBeVisible()
+      await editSketchButton.click()
+
+      // We use the line tool as a proxy for sketch mode
+      await expect(lineToolButton).toBeVisible()
+      await expect(segmentOverlays).toHaveCount(4)
+      // but we allow more time to pass for animating to the sketch
+      await page.waitForTimeout(1000)
+    })
+
+    await test.step(`Check the sketch line color before`, async () => {
+      await expect
+        .poll(() =>
+          u.getGreatestPixDiff(sketchOriginLocation, darkThemeSegmentColor)
+        )
+        .toBeLessThan(15)
+    })
+
+    await test.step(`Change theme to light using command palette`, async () => {
+      await page.keyboard.press('ControlOrMeta+K')
+      await page.getByRole('option', { name: 'theme' }).click()
+      await page.getByRole('option', { name: 'light' }).click()
+      await expect(page.getByText('theme to "light"')).toBeVisible()
+
+      // Make sure we haven't left sketch mode
+      await expect(lineToolButton).toBeVisible()
+    })
+
+    await test.step(`Check the sketch line color after`, async () => {
+      await expect
+        .poll(() =>
+          u.getGreatestPixDiff(sketchOriginLocation, lightThemeSegmentColor)
+        )
+        .toBeLessThan(15)
+    })
+  })
 })

e2e/playwright/text-to-cad-tests.spec.ts

@@ -534,7 +534,7 @@ test.describe('Text-to-CAD tests', () => {
 
     // Ensure the final toast remains.
     await expect(page.getByText(`a 2x10 lego`)).not.toBeVisible()
-    await expect(page.getByText(`a 2x8 lego`)).not.toBeVisible()
+    await expect(page.getByText(`Prompt: "a 2x8 lego`)).not.toBeVisible()
     await expect(page.getByText(`a 2x4 lego`)).toBeVisible()
 
     // Ensure you can copy the code for the final model.
@@ -690,40 +690,53 @@ test(
   'Text-to-CAD functionality',
   { tag: '@electron' },
   async ({ browserName }, testInfo) => {
+    const projectName = 'project-000'
+    const prompt = 'lego 2x4'
+    const textToCadFileName = 'lego-2x4.kcl'
+
     const { electronApp, page, dir } = await setupElectron({ testInfo })
     const fileExists = () =>
-      fs.existsSync(join(dir, 'project-000', 'lego-2x4.kcl'))
+      fs.existsSync(join(dir, projectName, textToCadFileName))
 
-    const { createAndSelectProject, panesOpen } = await getUtils(page, test)
+    const {
+      createAndSelectProject,
+      openFilePanel,
+      openKclCodePanel,
+      waitForPageLoad,
+    } = await getUtils(page, test)
 
     await page.setViewportSize({ width: 1200, height: 500 })
 
-    await panesOpen(['code', 'files'])
+    // Locators
+    const projectMenuButton = page.getByRole('button', { name: projectName })
+    const textToCadFileButton = page.getByRole('listitem').filter({
+      has: page.getByRole('button', { name: textToCadFileName }),
+    })
+    const textToCadComment = page.getByText(
+      `// Generated by Text-to-CAD: ${prompt}`
+    )
 
     // Create and navigate to the project
     await createAndSelectProject('project-000')
 
     // Wait for Start Sketch otherwise you will not have access Text-to-CAD command
-    await expect(
+    await waitForPageLoad()
-      page.getByRole('button', { name: 'Start Sketch' })
+    await openFilePanel()
-    ).toBeEnabled({
+    await openKclCodePanel()
-      timeout: 20_000,
-    })
 
     await test.step(`Test file creation`, async () => {
-      await sendPromptFromCommandBar(page, 'lego 2x4')
+      await sendPromptFromCommandBar(page, prompt)
       // File is considered created if it shows up in the Project Files pane
-      const file = page.getByRole('button', { name: 'lego-2x4.kcl' })
+      await expect(textToCadFileButton).toBeVisible({ timeout: 20_000 })
-      await expect(file).toBeVisible({ timeout: 20_000 })
       expect(fileExists()).toBeTruthy()
     })
 
     await test.step(`Test file navigation`, async () => {
-      const file = page.getByRole('button', { name: 'lego-2x4.kcl' })
+      await expect(projectMenuButton).toContainText('main.kcl')
-      await file.click()
+      await textToCadFileButton.click()
-      const kclComment = page.getByText('Lego 2x4 Brick')
       // File can be navigated and loaded assuming a specific KCL comment is loaded into the KCL code pane
-      await expect(kclComment).toBeVisible({ timeout: 20_000 })
+      await expect(textToCadComment).toBeVisible({ timeout: 20_000 })
+      await expect(projectMenuButton).toContainText(textToCadFileName)
     })
 
     await test.step(`Test file deletion on rejection`, async () => {
@@ -737,6 +750,8 @@ test(
       )
       await expect(submittingToastMessage).toBeVisible()
       expect(fileExists()).toBeFalsy()
+      // Confirm we've navigated back to the main.kcl file after deletion
+      await expect(projectMenuButton).toContainText('main.kcl')
     })
 
     await electronApp.close()

electron-builder.yml

@@ -11,16 +11,23 @@ mac:
   category: public.app-category.developer-tools
   artifactName: "${productName}-${version}-${arch}-${os}.${ext}"
   target:
-    - target: dmg 
+    - target: dmg
       arch:
         - x64
         - arm64
-    - target: zip 
+    - target: zip
       arch:
         - x64
         - arm64
   notarize:
     teamId: 92H8YB3B95
+  fileAssociations:
+    - ext: kcl
+      name: kcl
+      mimeType: text/vnd.zoo.kcl
+      description: Zoo KCL File
+      role: Editor
+      rank: Owner
 
 win:
   artifactName: "${productName}-${version}-${arch}-${os}.${ext}"
@@ -38,6 +45,12 @@ win:
   sign: "./sign-win.js"
   publisherName: "KittyCAD Inc"  # needs to be exactly like on Digicert
   icon: "assets/icon.ico"
+  fileAssociations:
+    - ext: kcl
+      name: kcl
+      mimeType: text/vnd.zoo.kcl
+      description: Zoo KCL File
+      role: Editor
 
 msi:
   oneClick: false
@@ -57,8 +70,14 @@ linux:
       arch:
         - x64
         - arm64
+  fileAssociations:
+    - ext: kcl
+      name: kcl
+      mimeType: text/vnd.zoo.kcl
+      description: Zoo KCL File
+      role: Editor
 
 publish:
   - provider: generic
-    url: https://dl.zoo.dev/releases/modeling-app/test/electron-builder
+    url: https://dl.zoo.dev/releases/modeling-app
     channel: latest

interface.d.ts

@@ -30,8 +30,6 @@ export interface IElectronAPI {
   join: typeof path.join
   sep: typeof path.sep
   rename: (prev: string, next: string) => typeof fs.rename
-  setBaseUrl: (value: string) => void
-  loadProjectAtStartup: () => Promise<ProjectState | null>
   packageJson: {
     name: string
   }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zoo-modeling-app",
-  "version": "0.24.12",
+  "version": "0.25.1",
   "private": true,
   "productName": "Zoo Modeling App",
   "author": {
@@ -34,7 +34,7 @@
     "@ts-stack/markdown": "^1.5.0",
     "@tweenjs/tween.js": "^23.1.1",
     "@xstate/inspect": "^0.8.0",
-    "@xstate/react": "^3.2.2",
+    "@xstate/react": "^4.1.1",
     "bonjour-service": "^1.2.1",
     "codemirror": "^6.0.1",
     "decamelize": "^6.0.0",
@@ -51,7 +51,7 @@
     "react": "^18.3.1",
     "react-dom": "^18.2.0",
     "react-hot-toast": "^2.4.1",
-    "react-hotkeys-hook": "^4.5.0",
+    "react-hotkeys-hook": "^4.5.1",
     "react-json-view": "^1.21.3",
     "react-modal": "^3.16.1",
     "react-modal-promise": "^1.0.2",
@@ -64,7 +64,7 @@
     "vscode-languageserver-protocol": "^3.17.5",
     "vscode-uri": "^3.0.8",
     "web-vitals": "^3.5.2",
-    "xstate": "^4.38.2"
+    "xstate": "^5.17.4"
   },
   "scripts": {
     "start": "vite",
@@ -88,7 +88,7 @@
     "build:wasm": "yarn wasm-prep && cd src/wasm-lib && wasm-pack build --release --target web --out-dir pkg && cargo test -p kcl-lib export_bindings && cd ../.. && yarn isomorphic-copy-wasm && yarn fmt",
     "remove-importmeta": "sed -i 's/import.meta.url/window.location.origin/g' \"./src/wasm-lib/pkg/wasm_lib.js\"; sed -i '' 's/import.meta.url/window.location.origin/g' \"./src/wasm-lib/pkg/wasm_lib.js\" || echo \"sed for both mac and linux\"",
     "wasm-prep": "rimraf src/wasm-lib/pkg && mkdirp src/wasm-lib/pkg && rimraf src/wasm-lib/kcl/bindings",
-    "lint": "eslint --fix src e2e",
+    "lint": "eslint --fix src e2e packages/codemirror-lsp-client",
     "bump-jsons": "echo \"$(jq --arg v \"$VERSION\" '.version=$v' package.json --indent 2)\" > package.json",
     "postinstall": "yarn xstate:typegen && ./node_modules/.bin/electron-rebuild",
     "xstate:typegen": "yarn xstate typegen \"src/**/*.ts?(x)\"",
@@ -137,7 +137,6 @@
     "@iarna/toml": "^2.2.5",
     "@lezer/generator": "^1.7.1",
     "@playwright/test": "^1.46.1",
-    "@tauri-apps/cli": "^2.0.0-rc.9",
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^15.0.2",
     "@types/d3-force": "^3.0.10",
@@ -169,7 +168,7 @@
     "eslint": "^8.0.1",
     "eslint-config-react-app": "^7.0.1",
     "eslint-plugin-css-modules": "^2.12.0",
-    "eslint-plugin-import": "^2.25.0",
+    "eslint-plugin-import": "^2.30.0",
     "eslint-plugin-suggest-no-throw": "^1.0.0",
     "happy-dom": "^14.3.10",
     "http-server": "^14.1.1",

packages/codemirror-lsp-client/src/client/index.ts

@@ -72,6 +72,7 @@ export class LanguageServerClient {
   async initialize() {
     // Start the client in the background.
     this.client.setNotifyFn(this.processNotifications.bind(this))
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
     this.client.start()
 
     this.ready = true
@@ -195,6 +196,9 @@ export class LanguageServerClient {
   }
 
   private processNotifications(notification: LSP.NotificationMessage) {
-    for (const plugin of this.plugins) plugin.processNotification(notification)
+    for (const plugin of this.plugins) {
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
+      plugin.processNotification(notification)
+    }
   }
 }

packages/codemirror-lsp-client/src/plugin/format.ts

@@ -12,6 +12,7 @@ export default function lspFormatExt(
       run: (view: EditorView) => {
         let value = view.plugin(plugin)
         if (!value) return false
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
         value.requestFormatting()
         return true
       },

packages/codemirror-lsp-client/src/plugin/lsp.ts

@@ -117,6 +117,7 @@ export class LanguageServerPlugin implements PluginValue {
 
     this.processLspNotification = options.processLspNotification
 
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
     this.initialize({
       documentText: this.getDocText(),
     })
@@ -149,6 +150,7 @@ export class LanguageServerPlugin implements PluginValue {
   }
 
   async initialize({ documentText }: { documentText: string }) {
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
     if (this.client.initializePromise) {
       await this.client.initializePromise
     }
@@ -162,7 +164,9 @@ export class LanguageServerPlugin implements PluginValue {
       },
     })
 
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
     this.requestSemanticTokens()
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
     this.updateFoldingRanges()
   }
 
@@ -225,7 +229,9 @@ export class LanguageServerPlugin implements PluginValue {
         contentChanges: [{ text: this.view.state.doc.toString() }],
       })
 
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
       this.requestSemanticTokens()
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
       this.updateFoldingRanges()
     } catch (e) {
       console.error(e)
@@ -526,7 +532,9 @@ export class LanguageServerPlugin implements PluginValue {
   processDiagnostics(params: PublishDiagnosticsParams) {
     if (params.uri !== this.getDocUri()) return
 
-    const diagnostics = params.diagnostics
+    // Commented to avoid the lint.  See TODO below.
+    // const diagnostics =
+    params.diagnostics
       .map(({ range, message, severity }) => ({
         from: posToOffset(this.view.state.doc, range.start)!,
         to: posToOffset(this.view.state.doc, range.end)!,

src/App.tsx

@@ -26,6 +26,7 @@ import useHotkeyWrapper from 'lib/hotkeyWrapper'
 import Gizmo from 'components/Gizmo'
 import { CoreDumpManager } from 'lib/coredump'
 import { UnitsMenu } from 'components/UnitsMenu'
+import { reportRejection } from 'lib/trap'
 
 export function App() {
   const { project, file } = useLoaderData() as IndexLoaderData
@@ -80,7 +81,7 @@ export function App() {
   useEngineConnectionSubscriptions()
 
   const debounceSocketSend = throttle<EngineCommand>((message) => {
-    engineCommandManager.sendSceneCommand(message)
+    engineCommandManager.sendSceneCommand(message).catch(reportRejection)
   }, 1000 / 15)
   const handleMouseMove: MouseEventHandler<HTMLDivElement> = (e) => {
     if (state.matches('Sketch')) {
@@ -95,7 +96,7 @@ export function App() {
     })
 
     const newCmdId = uuidv4()
-    if (state.matches('idle.showPlanes')) return
+    if (state.matches({ idle: 'showPlanes' })) return
     if (context.store?.buttonDownInStream !== undefined) return
     debounceSocketSend({
       type: 'modeling_cmd_req',
@@ -122,11 +123,11 @@ export function App() {
         // Override the electron window draggable region behavior as well
         // when the button is down in the stream
         style={
-          {
+          isDesktop() && context.store?.buttonDownInStream
-            '-webkit-app-region': context.store?.buttonDownInStream
+            ? ({
-              ? 'no-drag'
+                '-webkit-app-region': 'no-drag',
-              : '',
+              } as React.CSSProperties)
-          } as React.CSSProperties
+            : {}
         }
         project={{ project, file }}
         enableMenu={true}

src/Router.tsx

@@ -41,6 +41,7 @@ import toast from 'react-hot-toast'
 import { coreDump } from 'lang/wasm'
 import { useMemo } from 'react'
 import { AppStateProvider } from 'AppState'
+import { reportRejection } from 'lib/trap'
 
 const createRouter = isDesktop() ? createHashRouter : createBrowserRouter
 
@@ -69,19 +70,6 @@ const router = createRouter([
         path: PATHS.INDEX,
         loader: async () => {
           const onDesktop = isDesktop()
-          if (onDesktop) {
-            const projectStartupFile =
-              await window.electron.loadProjectAtStartup()
-            if (projectStartupFile !== null) {
-              // Redirect to the file if we have a file path.
-              if (projectStartupFile.length > 0) {
-                return redirect(
-                  PATHS.FILE + '/' + encodeURIComponent(projectStartupFile)
-                )
-              }
-            }
-          }
-
           return onDesktop
             ? redirect(PATHS.HOME)
             : redirect(PATHS.FILE + '/%2F' + BROWSER_PROJECT_NAME)
@@ -186,21 +174,23 @@ function CoreDump() {
     []
   )
   useHotkeyWrapper(['mod + shift + .'], () => {
-    toast.promise(
+    toast
-      coreDump(coreDumpManager, true),
+      .promise(
-      {
+        coreDump(coreDumpManager, true),
-        loading: 'Starting core dump...',
+        {
-        success: 'Core dump completed successfully',
+          loading: 'Starting core dump...',
-        error: 'Error while exporting core dump',
+          success: 'Core dump completed successfully',
-      },
+          error: 'Error while exporting core dump',
-      {
-        success: {
-          // Note: this extended duration is especially important for Playwright e2e testing
-          // default duration is 2000 - https://react-hot-toast.com/docs/toast#default-durations
-          duration: 6000,
         },
-      }
+        {
-    )
+          success: {
+            // Note: this extended duration is especially important for Playwright e2e testing
+            // default duration is 2000 - https://react-hot-toast.com/docs/toast#default-durations
+            duration: 6000,
+          },
+        }
+      )
+      .catch(reportRejection)
   })
   return null
 }

src/Toolbar.tsx

@@ -20,6 +20,8 @@ import {
   ToolbarItemResolved,
   ToolbarModeName,
 } from 'lib/toolbar'
+import { isDesktop } from 'lib/isDesktop'
+import { openExternalBrowserIfDesktop } from 'lib/openWindow'
 
 export function Toolbar({
   className = '',
@@ -68,12 +70,12 @@ export function Toolbar({
    */
   const configCallbackProps: ToolbarItemCallbackProps = useMemo(
     () => ({
-      modelingStateMatches: state.matches,
+      modelingState: state,
       modelingSend: send,
       commandBarSend,
       sketchPathId,
     }),
-    [state.matches, send, commandBarSend, sketchPathId]
+    [state, send, commandBarSend, sketchPathId]
   )
 
   /**
@@ -288,6 +290,11 @@ const ToolbarItemTooltip = memo(function ToolbarItemContents({
   return (
     <Tooltip
       inert={false}
+      wrapperStyle={
+        isDesktop()
+          ? ({ '-webkit-app-region': 'no-drag' } as React.CSSProperties)
+          : {}
+      }
       position="bottom"
       wrapperClassName="!p-4 !pointer-events-auto"
       contentClassName="!text-left text-wrap !text-xs !p-0 !pb-2 flex gap-2 !max-w-none !w-72 flex-col items-stretch"
@@ -337,6 +344,7 @@ const ToolbarItemTooltip = memo(function ToolbarItemContents({
               <li key={link.label} className="contents">
                 <a
                   href={link.url}
+                  onClick={openExternalBrowserIfDesktop(link.url)}
                   target="_blank"
                   rel="noreferrer"
                   className="flex items-center rounded-sm p-1 no-underline text-inherit hover:bg-primary/10 hover:text-primary dark:hover:bg-chalkboard-70 dark:hover:text-inherit"

src/clientSideScene/CameraControls.ts

@@ -22,18 +22,19 @@ import {
   UnreliableSubscription,
 } from 'lang/std/engineConnection'
 import { EngineCommand } from 'lang/std/artifactGraph'
-import { uuidv4 } from 'lib/utils'
+import { toSync, uuidv4 } from 'lib/utils'
 import { deg2Rad } from 'lib/utils2d'
 import { isReducedMotion, roundOff, throttle } from 'lib/utils'
 import * as TWEEN from '@tweenjs/tween.js'
 import { isQuaternionVertical } from './helpers'
+import { reportRejection } from 'lib/trap'
 
 const ORTHOGRAPHIC_CAMERA_SIZE = 20
 const FRAMES_TO_ANIMATE_IN = 30
 
 const tempQuaternion = new Quaternion() // just used for maths
 
-type interactionType = 'pan' | 'rotate' | 'zoom'
+export type CameraInteractionType = 'pan' | 'rotate' | 'zoom'
 
 interface ThreeCamValues {
   position: Vector3
@@ -100,6 +101,7 @@ export class CameraControls {
       camProps.type === 'perspective' &&
       this.camera instanceof OrthographicCamera
     ) {
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
       this.usePerspectiveCamera()
     } else if (
       camProps.type === 'orthographic' &&
@@ -127,6 +129,7 @@ export class CameraControls {
   }
 
   throttledEngCmd = throttle((cmd: EngineCommand) => {
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
     this.engineCommandManager.sendSceneCommand(cmd)
   }, 1000 / 30)
 
@@ -139,6 +142,7 @@ export class CameraControls {
         ...convertThreeCamValuesToEngineCam(threeValues),
       },
     }
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
     this.engineCommandManager.sendSceneCommand(cmd)
   }, 1000 / 15)
 
@@ -151,6 +155,7 @@ export class CameraControls {
       this.lastPerspectiveCmd &&
       Date.now() - this.lastPerspectiveCmdTime >= lastCmdDelay
     ) {
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
       this.engineCommandManager.sendSceneCommand(this.lastPerspectiveCmd, true)
       this.lastPerspectiveCmdTime = Date.now()
     }
@@ -218,6 +223,7 @@ export class CameraControls {
         this.useOrthographicCamera()
       }
       if (this.camera instanceof OrthographicCamera && !camSettings.ortho) {
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
         this.usePerspectiveCamera()
       }
       if (this.camera instanceof PerspectiveCamera && camSettings.fov_y) {
@@ -249,6 +255,7 @@ export class CameraControls {
     const doZoom = () => {
       if (this.zoomDataFromLastFrame !== undefined) {
         this.handleStart()
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
         this.engineCommandManager.sendSceneCommand({
           type: 'modeling_cmd_req',
           cmd: {
@@ -266,6 +273,7 @@ export class CameraControls {
 
     const doMove = () => {
       if (this.moveDataFromLastFrame !== undefined) {
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
         this.engineCommandManager.sendSceneCommand({
           type: 'modeling_cmd_req',
           cmd: {
@@ -459,6 +467,7 @@ export class CameraControls {
 
     this.camera.quaternion.set(qx, qy, qz, qw)
     this.camera.updateProjectionMatrix()
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
     this.engineCommandManager.sendSceneCommand({
       type: 'modeling_cmd_req',
       cmd_id: uuidv4(),
@@ -541,7 +550,7 @@ export class CameraControls {
     const oldFov = this.camera.fov
 
     const viewHeightFactor = (fov: number) => {
-      /*       * 
+      /*       *
               /|
              / |
             /  |
@@ -929,6 +938,7 @@ export class CameraControls {
       }
 
       if (isReducedMotion()) {
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
         onComplete()
         return
       }
@@ -937,7 +947,7 @@ export class CameraControls {
         .to({ t: tweenEnd }, duration)
         .easing(TWEEN.Easing.Quadratic.InOut)
         .onUpdate(({ t }) => cameraAtTime(t))
-        .onComplete(onComplete)
+        .onComplete(toSync(onComplete, reportRejection))
         .start()
     })
   }
@@ -962,6 +972,7 @@ export class CameraControls {
             // Decrease the FOV
             currentFov = Math.max(currentFov - fovAnimationStep, targetFov)
             this.camera.updateProjectionMatrix()
+            // eslint-disable-next-line @typescript-eslint/no-floating-promises
             this.dollyZoom(currentFov)
             requestAnimationFrame(animateFovChange) // Continue the animation
           } else if (frameWaitOnFinish > 0) {
@@ -991,6 +1002,7 @@ export class CameraControls {
       this.lastPerspectiveFov = 4
       let currentFov = 4
       const initialCameraUp = this.camera.up.clone()
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
       this.usePerspectiveCamera()
       const tempVec = new Vector3()
 
@@ -999,6 +1011,7 @@ export class CameraControls {
           this.lastPerspectiveFov + (targetFov - this.lastPerspectiveFov) * t
         const currentUp = tempVec.lerpVectors(initialCameraUp, targetCamUp, t)
         this.camera.up.copy(currentUp)
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
         this.dollyZoom(currentFov)
       }
 
@@ -1027,6 +1040,7 @@ export class CameraControls {
     this.lastPerspectiveFov = 4
     let currentFov = 4
     const initialCameraUp = this.camera.up.clone()
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
     this.usePerspectiveCamera()
     const tempVec = new Vector3()
 
@@ -1175,7 +1189,7 @@ function convertThreeCamValuesToEngineCam({
   const lookAt = buildLookAt(64 / zoom, target, position)
   return {
     center: new Vector3(lookAt.center.x, lookAt.center.y, lookAt.center.z),
-    up: new Vector3(0, 0, 1),
+    up: new Vector3(upVector.x, upVector.y, upVector.z),
     vantage: new Vector3(lookAt.eye.x, lookAt.eye.y, lookAt.eye.z),
   }
 }
@@ -1205,8 +1219,8 @@ function _getInteractionType(
   enablePan: boolean,
   enableRotate: boolean,
   enableZoom: boolean
-): interactionType | 'none' {
+): CameraInteractionType | 'none' {
-  let state: interactionType | 'none' = 'none'
+  let state: CameraInteractionType | 'none' = 'none'
   if (enablePan && interactionGuards.pan.callback(event)) return 'pan'
   if (enableRotate && interactionGuards.rotate.callback(event)) return 'rotate'
   if (enableZoom && interactionGuards.zoom.dragCallback(event)) return 'zoom'

src/clientSideScene/ClientSideSceneComp.tsx

@@ -5,7 +5,7 @@ import { cameraMouseDragGuards } from 'lib/cameraControls'
 import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
 import { ARROWHEAD, DEBUG_SHOW_BOTH_SCENES } from './sceneInfra'
 import { ReactCameraProperties } from './CameraControls'
-import { throttle } from 'lib/utils'
+import { throttle, toSync } from 'lib/utils'
 import {
   sceneInfra,
   kclManager,
@@ -44,7 +44,7 @@ import {
   removeSingleConstraintInfo,
 } from 'lang/modifyAst'
 import { ActionButton } from 'components/ActionButton'
-import { err, trap } from 'lib/trap'
+import { err, reportRejection, trap } from 'lib/trap'
 
 function useShouldHideScene(): { hideClient: boolean; hideServer: boolean } {
   const [isCamMoving, setIsCamMoving] = useState(false)
@@ -124,9 +124,9 @@ export const ClientSideScene = ({
     } else if (context.mouseState.type === 'isDragging') {
       cursor = 'grabbing'
     } else if (
-      state.matches('Sketch.Line tool') ||
+      state.matches({ Sketch: 'Line tool' }) ||
-      state.matches('Sketch.Tangential arc to') ||
+      state.matches({ Sketch: 'Tangential arc to' }) ||
-      state.matches('Sketch.Rectangle tool')
+      state.matches({ Sketch: 'Rectangle tool' })
     ) {
       cursor = 'crosshair'
     } else {
@@ -214,9 +214,9 @@ const Overlay = ({
     overlay.visible &&
     typeof context?.segmentHoverMap?.[pathToNodeString] === 'number' &&
     !(
-      state.matches('Sketch.Line tool') ||
+      state.matches({ Sketch: 'Line tool' }) ||
-      state.matches('Sketch.Tangential arc to') ||
+      state.matches({ Sketch: 'Tangential arc to' }) ||
-      state.matches('Sketch.Rectangle tool')
+      state.matches({ Sketch: 'Rectangle tool' })
     )
 
   return (
@@ -582,7 +582,7 @@ const ConstraintSymbol = ({
         }}
         // disabled={isConstrained || !convertToVarEnabled}
         // disabled={implicitDesc} TODO why does this change styles that are hard to override?
-        onClick={async () => {
+        onClick={toSync(async () => {
           if (!isConstrained) {
             send({
               type: 'Convert to variable',
@@ -616,13 +616,14 @@ const ConstraintSymbol = ({
               )
               if (!transform) return
               const { modifiedAst } = transform
+              // eslint-disable-next-line @typescript-eslint/no-floating-promises
               kclManager.updateAst(modifiedAst, true)
             } catch (e) {
               console.log('error', e)
             }
             toast.success('Constraint removed')
           }
-        }}
+        }, reportRejection)}
       >
         <CustomIcon name={name} />
       </button>
@@ -688,7 +689,7 @@ const ConstraintSymbol = ({
 
 const throttled = throttle((a: ReactCameraProperties) => {
   if (a.type === 'perspective' && a.fov) {
-    sceneInfra.camControls.dollyZoom(a.fov)
+    sceneInfra.camControls.dollyZoom(a.fov).catch(reportRejection)
   }
 }, 1000 / 15)
 
@@ -718,6 +719,7 @@ export const CamDebugSettings = () => {
           if (camSettings.type === 'perspective') {
             sceneInfra.camControls.useOrthographicCamera()
           } else {
+            // eslint-disable-next-line @typescript-eslint/no-floating-promises
             sceneInfra.camControls.usePerspectiveCamera(true)
           }
         }}
@@ -725,7 +727,7 @@ export const CamDebugSettings = () => {
       <div>
         <button
           onClick={() => {
-            sceneInfra.camControls.resetCameraPosition()
+            sceneInfra.camControls.resetCameraPosition().catch(reportRejection)
           }}
         >
           Reset Camera Position

src/clientSideScene/sceneEntities.ts

@@ -28,7 +28,6 @@ import {
   OnMouseEnterLeaveArgs,
   RAYCASTABLE_PLANE,
   SEGMENT_LENGTH_LABEL,
-  SEGMENT_LENGTH_LABEL_OFFSET_PX,
   SEGMENT_LENGTH_LABEL_TEXT,
   SKETCH_GROUP_SEGMENTS,
   SKETCH_LAYER,
@@ -102,8 +101,8 @@ import {
   getRectangleCallExpressions,
   updateRectangleSketch,
 } from 'lib/rectangleTool'
-import { getThemeColorForThreeJs } from 'lib/theme'
+import { getThemeColorForThreeJs, Themes } from 'lib/theme'
-import { err, trap } from 'lib/trap'
+import { err, reportRejection, trap } from 'lib/trap'
 import { CSS2DObject } from 'three/examples/jsm/renderers/CSS2DRenderer'
 import { Point3d } from 'wasm-lib/kcl/bindings/Point3d'
 
@@ -324,6 +323,7 @@ export class SceneEntities {
       )
     }
     sceneInfra.setCallbacks({
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
       onClick: async (args) => {
         if (!args) return
         if (args.mouseEvent.which !== 1) return
@@ -634,6 +634,7 @@ export class SceneEntities {
         draftExpressionsIndices,
       })
     sceneInfra.setCallbacks({
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
       onClick: async (args) => {
         if (!args) return
         if (args.mouseEvent.which !== 1) return
@@ -701,7 +702,7 @@ export class SceneEntities {
         if (profileStart) {
           sceneInfra.modelingSend({ type: 'CancelSketch' })
         } else {
-          this.setUpDraftSegment(
+          await this.setUpDraftSegment(
             sketchPathToNode,
             forward,
             up,
@@ -771,6 +772,7 @@ export class SceneEntities {
     })
 
     sceneInfra.setCallbacks({
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
       onMove: async (args) => {
         // Update the width and height of the draft rectangle
         const pathToNodeTwo = structuredClone(sketchPathToNode)
@@ -818,6 +820,7 @@ export class SceneEntities {
           this.updateSegment(seg, index, 0, _ast, orthoFactor, sketchGroup)
         )
       },
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
       onClick: async (args) => {
         // Commit the rectangle to the full AST/code and return to sketch.idle
         const cornerPoint = args.intersectionPoint?.twoD
@@ -892,9 +895,11 @@ export class SceneEntities {
   }) => {
     let addingNewSegmentStatus: 'nothing' | 'pending' | 'added' = 'nothing'
     sceneInfra.setCallbacks({
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
       onDragEnd: async () => {
         if (addingNewSegmentStatus !== 'nothing') {
           await this.tearDownSketch({ removeAxis: false })
+          // eslint-disable-next-line @typescript-eslint/no-floating-promises
           this.setupSketch({
             sketchPathToNode: pathToNode,
             maybeModdedAst: kclManager.ast,
@@ -911,6 +916,7 @@ export class SceneEntities {
           })
         }
       },
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
       onDrag: async ({
         selected,
         intersectionPoint,
@@ -958,6 +964,7 @@ export class SceneEntities {
 
             await kclManager.executeAstMock(mod.modifiedAst)
             await this.tearDownSketch({ removeAxis: false })
+            // eslint-disable-next-line @typescript-eslint/no-floating-promises
             this.setupSketch({
               sketchPathToNode: pathToNode,
               maybeModdedAst: kclManager.ast,
@@ -1161,7 +1168,7 @@ export class SceneEntities {
         )
       )
       sceneInfra.overlayCallbacks(callBacks)
-    })()
+    })().catch(reportRejection)
   }
 
   /**
@@ -1414,20 +1421,14 @@ export class SceneEntities {
       ) as CSS2DObject
       const labelWrapperElem = labelWrapper.element as HTMLDivElement
       const label = labelWrapperElem.children[0] as HTMLParagraphElement
-      label.innerText = `${roundOff(length)}${sceneInfra._baseUnit}`
+      label.innerText = `${roundOff(length)}`
       label.classList.add(SEGMENT_LENGTH_LABEL_TEXT)
-      const offsetFromMidpoint = new Vector2(to[0] - from[0], to[1] - from[1])
+      const slope = (to[1] - from[1]) / (to[0] - from[0])
-        .normalize()
+      let slopeAngle = ((Math.atan(slope) * 180) / Math.PI) * -1
-        .rotateAround(new Vector2(0, 0), Math.PI / 2)
+      label.style.setProperty('--degree', `${slopeAngle}deg`)
-        .multiplyScalar(SEGMENT_LENGTH_LABEL_OFFSET_PX * scale)
+      label.style.setProperty('--x', `0px`)
-      label.style.setProperty('--x', `${offsetFromMidpoint.x}px`)
+      label.style.setProperty('--y', `0px`)
-      label.style.setProperty('--y', `${offsetFromMidpoint.y}px`)
+      labelWrapper.position.set((from[0] + to[0]) / 2, (from[1] + to[1]) / 2, 0)
-      labelWrapper.position.set(
-        (from[0] + to[0]) / 2 + offsetFromMidpoint.x,
-        (from[1] + to[1]) / 2 + offsetFromMidpoint.y,
-        0
-      )
-
       labelGroup.visible = isHandlesVisible
     }
 
@@ -1465,6 +1466,25 @@ export class SceneEntities {
         to,
       })
   }
+  /**
+   * Update the base color of each of the THREEjs meshes
+   * that represent each of the sketch segments, to get the
+   * latest value from `sceneInfra._theme`
+   */
+  updateSegmentBaseColor(newColor: Themes.Light | Themes.Dark) {
+    const newColorThreeJs = getThemeColorForThreeJs(newColor)
+    Object.values(this.activeSegments).forEach((group) => {
+      group.userData.baseColor = newColorThreeJs
+      group.traverse((child) => {
+        if (
+          child instanceof Mesh &&
+          child.material instanceof MeshBasicMaterial
+        ) {
+          child.material.color.set(newColorThreeJs)
+        }
+      })
+    })
+  }
   removeSketchGrid() {
     if (this.axisGroup) this.scene.remove(this.axisGroup)
   }

src/components/AppHeader.module.css

@@ -6,6 +6,9 @@
   grid-template-columns: 1fr auto 1fr;
   user-select: none;
   -webkit-user-select: none;
+}
+
+.header.desktopApp {
   /* Make the header act as a handle to drag the electron app window,
    * per the electron docs: https://www.electronjs.org/docs/latest/tutorial/window-customization#set-custom-draggable-region
    * all interactive elements opt-out of this behavior by default in src/index.css

src/components/AppHeader.tsx

@@ -6,6 +6,7 @@ import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
 import styles from './AppHeader.module.css'
 import { RefreshButton } from 'components/RefreshButton'
 import { CommandBarOpenButton } from './CommandBarOpenButton'
+import { isDesktop } from 'lib/isDesktop'
 
 interface AppHeaderProps extends React.PropsWithChildren {
   showToolbar?: boolean
@@ -32,7 +33,9 @@ export const AppHeader = ({
       className={
         'w-full grid ' +
         styles.header +
-        ' overlaid-panes sticky top-0 z-20 px-2 items-start ' +
+        ` ${
+          isDesktop() ? styles.desktopApp + ' ' : ''
+        }overlaid-panes sticky top-0 z-20 px-2 items-start ` +
         className
       }
       style={style}

src/components/AvailableVarsHelpers.tsx

@@ -151,6 +151,7 @@ export function useCalc({
         })
         if (trap(error)) return
       }
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
       executeAst({
         ast,
         engineCommandManager,

src/components/CamToggle.tsx

@@ -2,6 +2,7 @@ import { useState, useEffect } from 'react'
 import { EngineCommandManagerEvents } from 'lang/std/engineConnection'
 import { engineCommandManager, sceneInfra } from 'lib/singletons'
 import { throttle, isReducedMotion } from 'lib/utils'
+import { reportRejection } from 'lib/trap'
 
 const updateDollyZoom = throttle(
   (newFov: number) => sceneInfra.camControls.dollyZoom(newFov),
@@ -16,8 +17,8 @@ export const CamToggle = () => {
   useEffect(() => {
     engineCommandManager.addEventListener(
       EngineCommandManagerEvents.SceneReady,
-      async () => {
+      () => {
-        sceneInfra.camControls.dollyZoom(fov)
+        sceneInfra.camControls.dollyZoom(fov).catch(reportRejection)
       }
     )
   }, [])
@@ -26,11 +27,11 @@ export const CamToggle = () => {
     if (isPerspective) {
       isReducedMotion()
         ? sceneInfra.camControls.useOrthographicCamera()
-        : sceneInfra.camControls.animateToOrthographic()
+        : sceneInfra.camControls.animateToOrthographic().catch(reportRejection)
     } else {
       isReducedMotion()
-        ? sceneInfra.camControls.usePerspectiveCamera()
+        ? sceneInfra.camControls.usePerspectiveCamera().catch(reportRejection)
-        : sceneInfra.camControls.animateToPerspective()
+        : sceneInfra.camControls.animateToPerspective().catch(reportRejection)
     }
     setIsPerspective(!isPerspective)
   }

src/components/CommandBar/CommandArgOptionInput.tsx

@@ -71,6 +71,17 @@ function CommandArgOptionInput({
     inputRef.current?.focus()
     inputRef.current?.select()
   }, [inputRef])
+  useEffect(() => {
+    // work around to make sure the user doesn't have to press the down arrow key to focus the first option
+    // instead this makes it move from the first hit
+    const downArrowEvent = new KeyboardEvent('keydown', {
+      key: 'ArrowDown',
+      keyCode: 40,
+      which: 40,
+      bubbles: true,
+    })
+    inputRef?.current?.dispatchEvent(downArrowEvent)
+  }, [])
 
   // Filter the options based on the query,
   // resetting the query when the options change

src/components/CommandBar/CommandBarProvider.tsx

@@ -1,53 +1,43 @@
-import { useMachine } from '@xstate/react'
+import { createActorContext } from '@xstate/react'
 import { editorManager } from 'lib/singletons'
 import { commandBarMachine } from 'machines/commandBarMachine'
-import { createContext, useEffect } from 'react'
+import { useEffect } from 'react'
-import { EventFrom, StateFrom } from 'xstate'
 
-type CommandsContextType = {
+export const CommandsContext = createActorContext(
-  commandBarState: StateFrom<typeof commandBarMachine>
+  commandBarMachine.provide({
-  commandBarSend: (event: EventFrom<typeof commandBarMachine>) => void
-}
-
-export const CommandsContext = createContext<CommandsContextType>({
-  commandBarState: commandBarMachine.initialState,
-  commandBarSend: () => {},
-})
-
-export const CommandBarProvider = ({
-  children,
-}: {
-  children: React.ReactNode
-}) => {
-  const [commandBarState, commandBarSend] = useMachine(commandBarMachine, {
-    devTools: true,
     guards: {
-      'Command has no arguments': (context, _event) => {
+      'Command has no arguments': ({ context }) => {
         return (
           !context.selectedCommand?.args ||
           Object.keys(context.selectedCommand?.args).length === 0
         )
       },
-      'All arguments are skippable': (context, _event) => {
+      'All arguments are skippable': ({ context }) => {
         return Object.values(context.selectedCommand!.args!).every(
           (argConfig) => argConfig.skip
         )
       },
     },
   })
+)
 
-  useEffect(() => {
+export const CommandBarProvider = ({
-    editorManager.setCommandBarSend(commandBarSend)
+  children,
-  })
+}: {
-
+  children: React.ReactNode
+}) => {
   return (
-    <CommandsContext.Provider
+    <CommandsContext.Provider>
-      value={{
+      <CommandBarProviderInner>{children}</CommandBarProviderInner>
-        commandBarState,
-        commandBarSend,
-      }}
-    >
-      {children}
     </CommandsContext.Provider>
   )
 }
+function CommandBarProviderInner({ children }: { children: React.ReactNode }) {
+  const commandBarActor = CommandsContext.useActorRef()
+
+  useEffect(() => {
+    editorManager.setCommandBarSend(commandBarActor.send)
+  })
+
+  return children
+}

src/components/CommandBar/CommandBarReview.tsx

@@ -52,7 +52,7 @@ function CommandBarReview({ stepBack }: { stepBack: () => void }) {
     e.preventDefault()
     commandBarSend({
       type: 'Submit command',
-      data: argumentsToSubmit,
+      output: argumentsToSubmit,
     })
   }
 

src/components/CommandBar/CommandBarSelectionInput.tsx

@@ -9,7 +9,7 @@ import {
   getSelectionTypeDisplayText,
 } from 'lib/selections'
 import { modelingMachine } from 'machines/modelingMachine'
-import { useCallback, useEffect, useRef, useState } from 'react'
+import { useEffect, useMemo, useRef, useState } from 'react'
 import { StateFrom } from 'xstate'
 
 const semanticEntityNames: { [key: string]: Array<Selection['type']> } = {
@@ -48,15 +48,15 @@ function CommandBarSelectionInput({
   const { commandBarState, commandBarSend } = useCommandsContext()
   const [hasSubmitted, setHasSubmitted] = useState(false)
   const selection = useSelector(arg.machineActor, selectionSelector)
-  const initSelectionsByType = useCallback(() => {
+  const selectionsByType = useMemo(() => {
     const selectionRangeEnd = selection.codeBasedSelections[0]?.range[1]
     return !selectionRangeEnd || selectionRangeEnd === code.length
       ? 'none'
       : getSelectionType(selection)
   }, [selection, code])
-  const selectionsByType = initSelectionsByType()
+  const canSubmitSelection = useMemo<boolean>(
-  const [canSubmitSelection, setCanSubmitSelection] = useState<boolean>(
+    () => canSubmitSelectionArg(selectionsByType, arg),
-    canSubmitSelectionArg(selectionsByType, arg)
+    [selectionsByType]
   )
 
   useEffect(() => {
@@ -66,26 +66,18 @@ function CommandBarSelectionInput({
   // Fast-forward through this arg if it's marked as skippable
   // and we have a valid selection already
   useEffect(() => {
-    console.log('selection input effect', {
-      selectionsByType,
-      canSubmitSelection,
-      arg,
-    })
-    setCanSubmitSelection(canSubmitSelectionArg(selectionsByType, arg))
     const argValue = commandBarState.context.argumentsToSubmit[arg.name]
     if (canSubmitSelection && arg.skip && argValue === undefined) {
-      handleSubmit({
+      handleSubmit()
-        preventDefault: () => {},
-      } as React.FormEvent<HTMLFormElement>)
     }
-  }, [selectionsByType, arg])
+  }, [canSubmitSelection])
 
   function handleChange() {
     inputRef.current?.focus()
   }
 
-  function handleSubmit(e: React.FormEvent<HTMLFormElement>) {
+  function handleSubmit(e?: React.FormEvent<HTMLFormElement>) {
-    e.preventDefault()
+    e?.preventDefault()
 
     if (!canSubmitSelection) {
       setHasSubmitted(true)

src/components/CommandBarOpenButton.tsx

@@ -11,6 +11,7 @@ export function CommandBarOpenButton() {
     <button
       className="group rounded-full flex items-center justify-center gap-2 px-2 py-1 bg-primary/10 dark:bg-chalkboard-90 dark:backdrop-blur-sm border-primary hover:border-primary dark:border-chalkboard-50 dark:hover:border-inherit text-primary dark:text-inherit"
       onClick={() => commandBarSend({ type: 'Open' })}
+      data-testid="command-bar-open-button"
     >
       <span>Commands</span>
       <kbd className="bg-primary/10 dark:bg-chalkboard-80 dark:group-hover:bg-primary font-mono rounded-sm dark:text-inherit inline-block px-1 border-primary dark:border-chalkboard-90">

src/components/EngineCommands.tsx

@@ -1,5 +1,6 @@
 import { CommandLog } from 'lang/std/engineConnection'
 import { engineCommandManager } from 'lib/singletons'
+import { reportRejection } from 'lib/trap'
 import { useState, useEffect } from 'react'
 
 export function useEngineCommands(): [CommandLog[], () => void] {
@@ -77,9 +78,11 @@ export const EngineCommands = () => {
       />
       <button
         data-testid="custom-cmd-send-button"
-        onClick={() =>
+        onClick={() => {
-          engineCommandManager.sendSceneCommand(JSON.parse(customCmd))
+          engineCommandManager
-        }
+            .sendSceneCommand(JSON.parse(customCmd))
+            .catch(reportRejection)
+        }}
       >
         Send custom command
       </button>

src/components/FileMachineProvider.tsx

@@ -5,13 +5,12 @@ import { PATHS } from 'lib/paths'
 import React, { createContext } from 'react'
 import { toast } from 'react-hot-toast'
 import {
+  Actor,
   AnyStateMachine,
   ContextFrom,
-  EventFrom,
-  InterpreterFrom,
   Prop,
   StateFrom,
-  assign,
+  fromPromise,
 } from 'xstate'
 import { useCommandsContext } from 'hooks/useCommandsContext'
 import { fileMachine } from 'machines/fileMachine'
@@ -27,7 +26,7 @@ import { getNextDirName, getNextFileName } from 'lib/desktopFS'
 type MachineContext<T extends AnyStateMachine> = {
   state: StateFrom<T>
   context: ContextFrom<T>
-  send: Prop<InterpreterFrom<T>, 'send'>
+  send: Prop<Actor<T>, 'send'>
 }
 
 export const FileContext = createContext(
@@ -43,239 +42,234 @@ export const FileMachineProvider = ({
   const { commandBarSend } = useCommandsContext()
   const { project, file } = useRouteLoaderData(PATHS.FILE) as IndexLoaderData
 
-  const [state, send] = useMachine(fileMachine, {
+  const [state, send] = useMachine(
-    context: {
+    fileMachine.provide({
-      project,
+      actions: {
-      selectedDirectory: project,
+        renameToastSuccess: ({ event }) => {
-    },
+          if (event.type !== 'xstate.done.actor.rename-file') return
-    actions: {
+          toast.success(event.output.message)
-      navigateToFile: (context, event) => {
+        },
-        if (event.data && 'name' in event.data) {
+        createToastSuccess: ({ event }) => {
-          commandBarSend({ type: 'Close' })
+          if (event.type !== 'xstate.done.actor.create-and-open-file') return
-          navigate(
+          toast.success(event.output.message)
-            `..${PATHS.FILE}/${encodeURIComponent(
+        },
-              context.selectedDirectory +
+        toastSuccess: ({ event }) => {
-                window.electron.path.sep +
+          if (
-                event.data.name
+            event.type !== 'xstate.done.actor.rename-file' &&
-            )}`
+            event.type !== 'xstate.done.actor.delete-file'
           )
-        } else if (
+            return
-          event.data &&
+          toast.success(event.output.message)
-          'path' in event.data &&
+        },
-          event.data.path.endsWith(FILE_EXT)
+        toastError: ({ event }) => {
-        ) {
+          if (event.type !== 'xstate.done.actor.rename-file') return
-          // Don't navigate to newly created directories
+          toast.error(event.output.message)
-          navigate(`..${PATHS.FILE}/${encodeURIComponent(event.data.path)}`)
+        },
-        }
+        navigateToFile: ({ context, event }) => {
+          if (event.type !== 'xstate.done.actor.create-and-open-file') return
+          if (event.output && 'name' in event.output) {
+            commandBarSend({ type: 'Close' })
+            navigate(
+              `..${PATHS.FILE}/${encodeURIComponent(
+                context.selectedDirectory +
+                  window.electron.path.sep +
+                  event.output.name
+              )}`
+            )
+          } else if (
+            event.output &&
+            'path' in event.output &&
+            event.output.path.endsWith(FILE_EXT)
+          ) {
+            // Don't navigate to newly created directories
+            navigate(`..${PATHS.FILE}/${encodeURIComponent(event.output.path)}`)
+          }
+        },
       },
-      addFileToRenamingQueue: assign({
+      actors: {
-        itemsBeingRenamed: (context, event) => [
+        readFiles: fromPromise(async ({ input }) => {
-          ...context.itemsBeingRenamed,
+          const newFiles =
-          event.data.path,
+            (isDesktop() ? (await getProjectInfo(input.path)).children : []) ??
-        ],
+            []
-      }),
-      removeFileFromRenamingQueue: assign({
-        itemsBeingRenamed: (
-          context,
-          event: EventFrom<typeof fileMachine, 'done.invoke.rename-file'>
-        ) =>
-          context.itemsBeingRenamed.filter(
-            (path) => path !== event.data.oldPath
-          ),
-      }),
-      renameToastSuccess: (_, event) => toast.success(event.data.message),
-      createToastSuccess: (_, event) => toast.success(event.data.message),
-      toastSuccess: (_, event) =>
-        event.data && toast.success((event.data || '') + ''),
-      toastError: (_, event) => toast.error((event.data || '') + ''),
-    },
-    services: {
-      readFiles: async (context: ContextFrom<typeof fileMachine>) => {
-        const newFiles = isDesktop()
-          ? (await getProjectInfo(context.project.path)).children
-          : []
-        return {
-          ...context.project,
-          children: newFiles,
-        }
-      },
-      createAndOpenFile: async (context, event) => {
-        let createdName = event.data.name.trim() || DEFAULT_FILE_NAME
-        let createdPath: string
-
-        if (event.data.makeDir) {
-          let { name, path } = getNextDirName({
-            entryName: createdName,
-            baseDir: context.selectedDirectory.path,
-          })
-          createdName = name
-          createdPath = path
-          await window.electron.mkdir(createdPath)
-        } else {
-          const { name, path } = getNextFileName({
-            entryName: createdName,
-            baseDir: context.selectedDirectory.path,
-          })
-          createdName = name
-          createdPath = path
-          await window.electron.writeFile(createdPath, event.data.content ?? '')
-        }
-
-        return {
-          message: `Successfully created "${createdName}"`,
-          path: createdPath,
-        }
-      },
-      createFile: async (context, event) => {
-        let createdName = event.data.name.trim() || DEFAULT_FILE_NAME
-        let createdPath: string
-
-        if (event.data.makeDir) {
-          let { name, path } = getNextDirName({
-            entryName: createdName,
-            baseDir: context.selectedDirectory.path,
-          })
-          createdName = name
-          createdPath = path
-          await window.electron.mkdir(createdPath)
-        } else {
-          const { name, path } = getNextFileName({
-            entryName: createdName,
-            baseDir: context.selectedDirectory.path,
-          })
-          createdName = name
-          createdPath = path
-          await window.electron.writeFile(createdPath, event.data.content ?? '')
-        }
-
-        return {
-          path: createdPath,
-        }
-      },
-      renameFile: async (
-        context: ContextFrom<typeof fileMachine>,
-        event: EventFrom<typeof fileMachine, 'Rename file'>
-      ) => {
-        const { oldName, newName, isDir } = event.data
-        const name = newName
-          ? newName.endsWith(FILE_EXT) || isDir
-            ? newName
-            : newName + FILE_EXT
-          : DEFAULT_FILE_NAME
-        const oldPath = window.electron.path.join(
-          context.selectedDirectory.path,
-          oldName
-        )
-        const newPath = window.electron.path.join(
-          context.selectedDirectory.path,
-          name
-        )
-
-        // no-op
-        if (oldPath === newPath) {
           return {
-            message: `Old is the same as new.`,
+            ...input,
+            children: newFiles,
+          }
+        }),
+        createAndOpenFile: fromPromise(async ({ input }) => {
+          let createdName = input.name.trim() || DEFAULT_FILE_NAME
+          let createdPath: string
+
+          if (input.makeDir) {
+            let { name, path } = getNextDirName({
+              entryName: createdName,
+              baseDir: input.selectedDirectory.path,
+            })
+            createdName = name
+            createdPath = path
+            await window.electron.mkdir(createdPath)
+          } else {
+            const { name, path } = getNextFileName({
+              entryName: createdName,
+              baseDir: input.selectedDirectory.path,
+            })
+            createdName = name
+            createdPath = path
+            await window.electron.writeFile(createdPath, input.content ?? '')
+          }
+
+          return {
+            message: `Successfully created "${createdName}"`,
+            path: createdPath,
+          }
+        }),
+        createFile: fromPromise(async ({ input }) => {
+          let createdName = input.name.trim() || DEFAULT_FILE_NAME
+          let createdPath: string
+
+          if (input.makeDir) {
+            let { name, path } = getNextDirName({
+              entryName: createdName,
+              baseDir: input.selectedDirectory.path,
+            })
+            createdName = name
+            createdPath = path
+            await window.electron.mkdir(createdPath)
+          } else {
+            const { name, path } = getNextFileName({
+              entryName: createdName,
+              baseDir: input.selectedDirectory.path,
+            })
+            createdName = name
+            createdPath = path
+            await window.electron.writeFile(createdPath, input.content ?? '')
+          }
+
+          return {
+            path: createdPath,
+          }
+        }),
+        renameFile: fromPromise(async ({ input }) => {
+          const { oldName, newName, isDir } = input
+          const name = newName
+            ? newName.endsWith(FILE_EXT) || isDir
+              ? newName
+              : newName + FILE_EXT
+            : DEFAULT_FILE_NAME
+          const oldPath = window.electron.path.join(
+            input.selectedDirectory.path,
+            oldName
+          )
+          const newPath = window.electron.path.join(
+            input.selectedDirectory.path,
+            name
+          )
+
+          // no-op
+          if (oldPath === newPath) {
+            return {
+              message: `Old is the same as new.`,
+              newPath,
+              oldPath,
+            }
+          }
+
+          // if there are any siblings with the same name, report error.
+          const entries = await window.electron.readdir(
+            window.electron.path.dirname(newPath)
+          )
+          for (let entry of entries) {
+            if (entry === newName) {
+              return Promise.reject(new Error('Filename already exists.'))
+            }
+          }
+
+          window.electron.rename(oldPath, newPath)
+
+          if (!file) {
+            return Promise.reject(new Error('file is not defined'))
+          }
+
+          if (oldPath === file.path && project?.path) {
+            // If we just renamed the current file, navigate to the new path
+            navigate(`..${PATHS.FILE}/${encodeURIComponent(newPath)}`)
+          } else if (file?.path.includes(oldPath)) {
+            // If we just renamed a directory that the current file is in, navigate to the new path
+            navigate(
+              `..${PATHS.FILE}/${encodeURIComponent(
+                file.path.replace(oldPath, newPath)
+              )}`
+            )
+          }
+
+          return {
+            message: `Successfully renamed "${oldName}" to "${name}"`,
             newPath,
             oldPath,
           }
-        }
+        }),
+        deleteFile: fromPromise(async ({ input }) => {
+          const isDir = !!input.children
 
-        // if there are any siblings with the same name, report error.
+          if (isDir) {
-        const entries = await window.electron.readdir(
+            await window.electron
-          window.electron.path.dirname(newPath)
+              .rm(input.path, {
-        )
+                recursive: true,
-        for (let entry of entries) {
+              })
-          if (entry === newName) {
+              .catch((e) => console.error('Error deleting directory', e))
-            return Promise.reject(new Error('Filename already exists.'))
+          } else {
+            await window.electron
+              .rm(input.path)
+              .catch((e) => console.error('Error deleting file', e))
           }
-        }
 
-        window.electron.rename(oldPath, newPath)
+          // If there are no more files at all in the project, create a main.kcl
+          // for when we navigate to the root.
+          if (!project?.path) {
+            return Promise.reject(new Error('Project path not set.'))
+          }
 
-        if (!file) {
+          const entries = await window.electron.readdir(project.path)
-          return Promise.reject(new Error('file is not defined'))
+          const hasKclEntries =
-        }
+            entries.filter((e: string) => e.endsWith('.kcl')).length !== 0
+          if (!hasKclEntries) {
+            await window.electron.writeFile(
+              window.electron.path.join(project.path, DEFAULT_PROJECT_KCL_FILE),
+              ''
+            )
+            // Refresh the route selected above because it's possible we're on
+            // the same path on the navigate, which doesn't cause anything to
+            // refresh, leaving a stale execution state.
+            navigate(0)
+            return {
+              message: 'No more files in project, created main.kcl',
+            }
+          }
 
-        if (oldPath === file.path && project?.path) {
+          // If we just deleted the current file or one of its parent directories,
-          // If we just renamed the current file, navigate to the new path
+          // navigate to the project root
-          navigate(`..${PATHS.FILE}/${encodeURIComponent(newPath)}`)
+          if (
-        } else if (file?.path.includes(oldPath)) {
+            (input.path === file?.path || file?.path.includes(input.path)) &&
-          // If we just renamed a directory that the current file is in, navigate to the new path
+            project?.path
-          navigate(
+          ) {
-            `..${PATHS.FILE}/${encodeURIComponent(
+            navigate(`../${PATHS.FILE}/${encodeURIComponent(project.path)}`)
-              file.path.replace(oldPath, newPath)
+          }
-            )}`
-          )
-        }
 
-        return {
+          return {
-          message: `Successfully renamed "${oldName}" to "${name}"`,
+            message: `Successfully deleted ${isDir ? 'folder' : 'file'} "${
-          newPath,
+              input.name
-          oldPath,
+            }"`,
-        }
+          }
+        }),
       },
-      deleteFile: async (
+    }),
-        context: ContextFrom<typeof fileMachine>,
+    {
-        event: EventFrom<typeof fileMachine, 'Delete file'>
+      input: {
-      ) => {
+        project,
-        const isDir = !!event.data.children
+        selectedDirectory: project,
-
-        if (isDir) {
-          await window.electron
-            .rm(event.data.path, {
-              recursive: true,
-            })
-            .catch((e) => console.error('Error deleting directory', e))
-        } else {
-          await window.electron
-            .rm(event.data.path)
-            .catch((e) => console.error('Error deleting file', e))
-        }
-
-        // If there are no more files at all in the project, create a main.kcl
-        // for when we navigate to the root.
-        if (!project?.path) {
-          return Promise.reject(new Error('Project path not set.'))
-        }
-
-        const entries = await window.electron.readdir(project.path)
-        const hasKclEntries =
-          entries.filter((e: string) => e.endsWith('.kcl')).length !== 0
-        if (!hasKclEntries) {
-          await window.electron.writeFile(
-            window.electron.path.join(project.path, DEFAULT_PROJECT_KCL_FILE),
-            ''
-          )
-          // Refresh the route selected above because it's possible we're on
-          // the same path on the navigate, which doesn't cause anything to
-          // refresh, leaving a stale execution state.
-          navigate(0)
-          return
-        }
-
-        // If we just deleted the current file or one of its parent directories,
-        // navigate to the project root
-        if (
-          (event.data.path === file?.path ||
-            file?.path.includes(event.data.path)) &&
-          project?.path
-        ) {
-          navigate(`../${PATHS.FILE}/${encodeURIComponent(project.path)}`)
-        }
-
-        return `Successfully deleted ${isDir ? 'folder' : 'file'} "${
-          event.data.name
-        }"`
       },
-    },
+    }
-    guards: {
+  )
-      'Has at least 1 file': (_, event: EventFrom<typeof fileMachine>) => {
-        if (event.type !== 'done.invoke.read-files') return false
-        return !!event?.data?.children && event.data.children.length > 0
-      },
-      'Is not silent': (_, event) => !event.data?.silent,
-    },
-  })
 
   return (
     <FileContext.Provider

src/components/FileTree.tsx

@@ -176,9 +176,11 @@ const FileTreeItem = ({
         `import("${fileOrDir.path.replace(project.path, '.')}")\n` +
           codeManager.code
       )
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
       codeManager.writeToFile()
 
       // Prevent seeing the model built one piece at a time when changing files
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
       kclManager.executeCode(true)
     } else {
       // Let the lsp servers know we closed a file.
@@ -243,13 +245,13 @@ const FileTreeItem = ({
                   onClickCapture={(e) =>
                     fileSend({
                       type: 'Set selected directory',
-                      data: fileOrDir,
+                      directory: fileOrDir,
                     })
                   }
                   onFocusCapture={(e) =>
                     fileSend({
                       type: 'Set selected directory',
-                      data: fileOrDir,
+                      directory: fileOrDir,
                     })
                   }
                   onKeyDown={(e) => e.key === 'Enter' && e.preventDefault()}
@@ -296,13 +298,13 @@ const FileTreeItem = ({
                   onClickCapture={(e) => {
                     fileSend({
                       type: 'Set selected directory',
-                      data: fileOrDir,
+                      directory: fileOrDir,
                     })
                   }}
                   onFocusCapture={(e) =>
                     fileSend({
                       type: 'Set selected directory',
-                      data: fileOrDir,
+                      directory: fileOrDir,
                     })
                   }
                 >
@@ -388,14 +390,14 @@ interface FileTreeProps {
 export const FileTreeMenu = () => {
   const { send } = useFileContext()
 
-  async function createFile() {
+  function createFile() {
     send({
       type: 'Create file',
       data: { name: '', makeDir: false },
     })
   }
 
-  async function createFolder() {
+  function createFolder() {
     send({
       type: 'Create file',
       data: { name: '', makeDir: true },
@@ -482,7 +484,7 @@ export const FileTreeInner = ({
         onClickCapture={(e) => {
           fileSend({
             type: 'Set selected directory',
-            data: fileContext.project,
+            directory: fileContext.project,
           })
         }}
       >

src/components/Gizmo.tsx

@@ -27,6 +27,7 @@ import {
 } from './ContextMenu'
 import { Popover } from '@headlessui/react'
 import { CustomIcon } from './CustomIcon'
+import { reportRejection } from 'lib/trap'
 
 const CANVAS_SIZE = 80
 const FRUSTUM_SIZE = 0.5
@@ -67,7 +68,9 @@ export default function Gizmo() {
         <ContextMenuItem
           key={axisName}
           onClick={() => {
-            sceneInfra.camControls.updateCameraToAxis(axisName as AxisNames)
+            sceneInfra.camControls
+              .updateCameraToAxis(axisName as AxisNames)
+              .catch(reportRejection)
           }}
         >
           {axisSemantic} view
@@ -75,7 +78,7 @@ export default function Gizmo() {
       )),
       <ContextMenuItem
         onClick={() => {
-          sceneInfra.camControls.resetCameraPosition()
+          sceneInfra.camControls.resetCameraPosition().catch(reportRejection)
         }}
       >
         Reset view
@@ -299,7 +302,7 @@ const initializeMouseEvents = (
   const handleClick = () => {
     if (raycasterIntersect.current) {
       const axisName = raycasterIntersect.current.object.name as AxisNames
-      sceneInfra.camControls.updateCameraToAxis(axisName)
+      sceneInfra.camControls.updateCameraToAxis(axisName).catch(reportRejection)
     }
   }
 

src/components/HelpMenu.tsx

@@ -8,6 +8,7 @@ import { createAndOpenNewProject } from 'lib/desktopFS'
 import { useAbsoluteFilePath } from 'hooks/useAbsoluteFilePath'
 import { useLspContext } from './LspProvider'
 import { openExternalBrowserIfDesktop } from 'lib/openWindow'
+import { reportRejection } from 'lib/trap'
 
 const HelpMenuDivider = () => (
   <div className="h-[1px] bg-chalkboard-110 dark:bg-chalkboard-80" />
@@ -115,7 +116,9 @@ export function HelpMenu(props: React.PropsWithChildren) {
             if (isInProject) {
               navigate(filePath + PATHS.ONBOARDING.INDEX)
             } else {
-              createAndOpenNewProject({ onProjectOpen, navigate })
+              createAndOpenNewProject({ onProjectOpen, navigate }).catch(
+                reportRejection
+              )
             }
           }}
         >

src/components/LowerRightControls.tsx

@@ -12,6 +12,7 @@ import { CoreDumpManager } from 'lib/coredump'
 import openWindow, { openExternalBrowserIfDesktop } from 'lib/openWindow'
 import { NetworkMachineIndicator } from './NetworkMachineIndicator'
 import { ModelStateIndicator } from './ModelStateIndicator'
+import { reportRejection } from 'lib/trap'
 
 export function LowerRightControls({
   children,
@@ -25,7 +26,7 @@ export function LowerRightControls({
   const linkOverrideClassName =
     '!text-chalkboard-70 hover:!text-chalkboard-80 dark:!text-chalkboard-40 dark:hover:!text-chalkboard-30'
 
-  async function reportbug(event: {
+  function reportbug(event: {
     preventDefault: () => void
     stopPropagation: () => void
   }) {
@@ -34,7 +35,9 @@ export function LowerRightControls({
 
     if (!coreDumpManager) {
       // open default reporting option
-      openWindow('https://github.com/KittyCAD/modeling-app/issues/new/choose')
+      openWindow(
+        'https://github.com/KittyCAD/modeling-app/issues/new/choose'
+      ).catch(reportRejection)
     } else {
       toast
         .promise(
@@ -56,7 +59,7 @@ export function LowerRightControls({
           if (err) {
             openWindow(
               'https://github.com/KittyCAD/modeling-app/issues/new/choose'
-            )
+            ).catch(reportRejection)
           }
         })
     }

src/components/LspProvider.tsx

@@ -160,7 +160,9 @@ export const LspProvider = ({ children }: { children: React.ReactNode }) => {
                 // Update the folding ranges, since the AST has changed.
                 // This is a hack since codemirror does not support async foldService.
                 // When they do we can delete this.
+                // eslint-disable-next-line @typescript-eslint/no-floating-promises
                 plugin.updateFoldingRanges()
+                // eslint-disable-next-line @typescript-eslint/no-floating-promises
                 plugin.requestSemanticTokens()
                 break
               case 'kcl/memoryUpdated':

src/components/ModelStateIndicator.tsx

@@ -29,6 +29,12 @@ export const ModelStateIndicator = () => {
         name="checkmark"
       />
     )
+  } else if (lastCommandType === 'export-done') {
+    className +=
+      'border-6 border border-solid border-chalkboard-60 dark:border-chalkboard-80 bg-chalkboard-20 dark:bg-chalkboard-80 !group-disabled:bg-chalkboard-30 !dark:group-disabled:bg-chalkboard-80 rounded-sm bg-succeed-10/30 dark:bg-succeed'
+    icon = (
+      <CustomIcon data-testid={dataTestId + '-export-done'} name="checkmark" />
+    )
   }
 
   return (

src/components/ModelingSidebar/ModelingPanes/KclEditorMenu.tsx

@@ -8,6 +8,7 @@ import { editorShortcutMeta } from './KclEditorPane'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { kclManager } from 'lib/singletons'
 import { openExternalBrowserIfDesktop } from 'lib/openWindow'
+import { reportRejection } from 'lib/trap'
 
 export const KclEditorMenu = ({ children }: PropsWithChildren) => {
   const { enable: convertToVarEnabled, handleClick: handleConvertToVarClick } =
@@ -47,7 +48,9 @@ export const KclEditorMenu = ({ children }: PropsWithChildren) => {
           {convertToVarEnabled && (
             <Menu.Item>
               <button
-                onClick={() => handleConvertToVarClick()}
+                onClick={() => {
+                  handleConvertToVarClick().catch(reportRejection)
+                }}
                 className={styles.button}
               >
                 <span>Convert to Variable</span>

src/components/ModelingSidebar/ModelingSidebar.tsx

@@ -57,6 +57,7 @@ export function ModelingSidebar({ paneOpacity }: ModelingSidebarProps) {
       icon: 'printer3d',
       iconClassName: '!p-0',
       keybinding: 'Ctrl + Shift + M',
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
       action: async () => {
         commandBarSend({
           type: 'Find and select command',

src/components/NetworkHealthIndicator.tsx

@@ -4,6 +4,8 @@ import Tooltip from './Tooltip'
 import { ConnectingTypeGroup } from '../lang/std/engineConnection'
 import { useNetworkContext } from '../hooks/useNetworkContext'
 import { NetworkHealthState } from '../hooks/useNetworkStatus'
+import { toSync } from 'lib/utils'
+import { reportRejection } from 'lib/trap'
 
 export const NETWORK_HEALTH_TEXT: Record<NetworkHealthState, string> = {
   [NetworkHealthState.Ok]: 'Connected',
@@ -160,13 +162,13 @@ export const NetworkHealthIndicator = () => {
               </div>
               {issues[name as ConnectingTypeGroup] && (
                 <button
-                  onClick={async () => {
+                  onClick={toSync(async () => {
                     await navigator.clipboard.writeText(
                       JSON.stringify(error, null, 2) || ''
                     )
                     setHasCopied(true)
                     setTimeout(() => setHasCopied(false), 5000)
-                  }}
+                  }, reportRejection)}
                   className="flex w-fit gap-2 items-center bg-transparent text-sm p-1 py-0 my-0 -mx-1 text-destroy-80 dark:text-destroy-10 hover:bg-transparent border-transparent dark:border-transparent hover:border-destroy-80 dark:hover:border-destroy-80 dark:hover:bg-destroy-80"
                 >
                   {hasCopied ? 'Copied' : 'Copy Error'}

src/components/ProjectCard/ProjectCard.tsx

@@ -8,6 +8,8 @@ import Tooltip from '../Tooltip'
 import { DeleteConfirmationDialog } from './DeleteProjectDialog'
 import { ProjectCardRenameForm } from './ProjectCardRenameForm'
 import { Project } from 'lib/project'
+import { toSync } from 'lib/utils'
+import { reportRejection } from 'lib/trap'
 
 function ProjectCard({
   project,
@@ -165,10 +167,10 @@ function ProjectCard({
       {isConfirmingDelete && (
         <DeleteConfirmationDialog
           title="Delete Project"
-          onConfirm={async () => {
+          onConfirm={toSync(async () => {
             await handleDeleteProject(project)
             setIsConfirmingDelete(false)
-          }}
+          }, reportRejection)}
           onDismiss={() => setIsConfirmingDelete(false)}
         >
           <p className="my-4">

src/components/RefreshButton.tsx

@@ -6,6 +6,8 @@ import React, { useMemo } from 'react'
 import toast from 'react-hot-toast'
 import Tooltip from './Tooltip'
 import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
+import { reportRejection } from 'lib/trap'
+import { toSync } from 'lib/utils'
 
 export const RefreshButton = ({ children }: React.PropsWithChildren) => {
   const { auth } = useSettingsAuthContext()
@@ -50,11 +52,12 @@ export const RefreshButton = ({ children }: React.PropsWithChildren) => {
         // Window may not be available in some environments
         window?.location.reload()
       })
+      .catch(reportRejection)
   }
 
   return (
     <button
-      onClick={refresh}
+      onClick={toSync(refresh, reportRejection)}
       className="p-1 m-0 bg-chalkboard-10/80 dark:bg-chalkboard-100/50 hover:bg-chalkboard-10 dark:hover:bg-chalkboard-100 rounded-full border border-solid border-chalkboard-20 dark:border-chalkboard-90"
     >
       <CustomIcon name="exclamationMark" className="w-5 h-5" />

src/components/Settings/AllSettingsFields.tsx

@@ -12,7 +12,6 @@ import { useLocation, useNavigate } from 'react-router-dom'
 import { isDesktop } from 'lib/isDesktop'
 import { ActionButton } from 'components/ActionButton'
 import { SettingsFieldInput } from './SettingsFieldInput'
-import { getInitialDefaultDir } from 'lib/desktop'
 import toast from 'react-hot-toast'
 import { APP_VERSION } from 'routes/Settings'
 import { PATHS } from 'lib/paths'
@@ -20,6 +19,8 @@ import { createAndOpenNewProject, getSettingsFolderPaths } from 'lib/desktopFS'
 import { useDotDotSlash } from 'hooks/useDotDotSlash'
 import { ForwardedRef, forwardRef, useEffect } from 'react'
 import { useLspContext } from 'components/LspProvider'
+import { toSync } from 'lib/utils'
+import { reportRejection } from 'lib/trap'
 
 interface AllSettingsFieldsProps {
   searchParamTab: SettingsLevel
@@ -54,7 +55,7 @@ export const AllSettingsFields = forwardRef(
           )
         : undefined
 
-    async function restartOnboarding() {
+    function restartOnboarding() {
       send({
         type: `set.app.onboardingStatus`,
         data: { level: 'user', value: '' },
@@ -82,6 +83,7 @@ export const AllSettingsFields = forwardRef(
           }
         }
       }
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
       navigateToOnboardingStart()
     }, [isFileSettings, navigate, state])
 
@@ -190,7 +192,7 @@ export const AllSettingsFields = forwardRef(
               {isDesktop() && (
                 <ActionButton
                   Element="button"
-                  onClick={async () => {
+                  onClick={toSync(async () => {
                     const paths = await getSettingsFolderPaths(
                       projectPath ? decodeURIComponent(projectPath) : undefined
                     )
@@ -199,7 +201,7 @@ export const AllSettingsFields = forwardRef(
                       return new Error('finalPath undefined')
                     }
                     window.electron.showInFolder(finalPath)
-                  }}
+                  }, reportRejection)}
                   iconStart={{
                     icon: 'folder',
                     size: 'sm',
@@ -211,13 +213,14 @@ export const AllSettingsFields = forwardRef(
               )}
               <ActionButton
                 Element="button"
-                onClick={async () => {
+                onClick={() => {
-                  const defaultDirectory = await getInitialDefaultDir()
                   send({
                     type: 'Reset settings',
-                    defaultDirectory,
+                    level: searchParamTab,
                   })
-                  toast.success('Settings restored to default')
+                  toast.success(
+                    `Your ${searchParamTab}-level settings were reset`
+                  )
                 }}
                 iconStart={{
                   icon: 'refresh',
@@ -226,7 +229,7 @@ export const AllSettingsFields = forwardRef(
                   bgClassName: 'bg-destroy-70',
                 }}
               >
-                Restore default settings
+                Reset {searchParamTab}-level settings
               </ActionButton>
             </div>
           </SettingsSection>

src/components/Settings/SettingsFieldInput.tsx

@@ -8,7 +8,7 @@ import {
 } from 'lib/settings/settingsTypes'
 import { getSettingInputType } from 'lib/settings/settingsUtils'
 import { useMemo } from 'react'
-import { Event } from 'xstate'
+import { EventFrom } from 'xstate'
 
 interface SettingsFieldInputProps {
   // We don't need the fancy types here,
@@ -59,7 +59,7 @@ export function SettingsFieldInput({
                   level: settingsLevel,
                   value: newValue,
                 },
-              } as unknown as Event<WildcardSetEvent>)
+              } as unknown as EventFrom<WildcardSetEvent>)
             }}
           />
         )
@@ -103,7 +103,7 @@ export function SettingsFieldInput({
                 level: settingsLevel,
                 value: e.target.value,
               },
-            } as unknown as Event<WildcardSetEvent>)
+            } as unknown as EventFrom<WildcardSetEvent>)
           }
         >
           {options &&
@@ -137,7 +137,7 @@ export function SettingsFieldInput({
                   level: settingsLevel,
                   value: e.target.value,
                 },
-              } as unknown as Event<WildcardSetEvent>)
+              } as unknown as EventFrom<WildcardSetEvent>)
             }
           }}
         />

src/components/SettingsAuthProvider.tsx

@@ -14,16 +14,15 @@ import {
   Themes,
 } from 'lib/theme'
 import decamelize from 'decamelize'
-import {
+import { Actor, AnyStateMachine, ContextFrom, Prop, StateFrom } from 'xstate'
-  AnyStateMachine,
-  ContextFrom,
-  InterpreterFrom,
-  Prop,
-  StateFrom,
-} from 'xstate'
 import { isDesktop } from 'lib/isDesktop'
 import { authCommandBarConfig } from 'lib/commandBarConfigs/authCommandConfig'
-import { kclManager, sceneInfra, engineCommandManager } from 'lib/singletons'
+import {
+  kclManager,
+  sceneInfra,
+  engineCommandManager,
+  sceneEntitiesManager,
+} from 'lib/singletons'
 import { uuidv4 } from 'lib/utils'
 import { IndexLoaderData } from 'lib/types'
 import { settings } from 'lib/settings/initialSettings'
@@ -39,7 +38,7 @@ import { saveSettings } from 'lib/settings/settingsUtils'
 type MachineContext<T extends AnyStateMachine> = {
   state: StateFrom<T>
   context: ContextFrom<T>
-  send: Prop<InterpreterFrom<T>, 'send'>
+  send: Prop<Actor<T>, 'send'>
 }
 
 type SettingsAuthContextType = {
@@ -50,7 +49,7 @@ type SettingsAuthContextType = {
 // a little hacky for sure, open to changing it
 // this implies that we should only even have one instance of this provider mounted at any one time
 // but I think that's a safe assumption
-let settingsStateRef: (typeof settingsMachine)['context'] | undefined
+let settingsStateRef: ContextFrom<typeof settingsMachine> | undefined
 export const getSettingsState = () => settingsStateRef
 
 export const SettingsAuthContext = createContext({} as SettingsAuthContextType)
@@ -101,21 +100,20 @@ export const SettingsAuthProviderBase = ({
   const { commandBarSend } = useCommandsContext()
 
   const [settingsState, settingsSend, settingsActor] = useMachine(
-    settingsMachine,
+    settingsMachine.provide({
-    {
-      context: loadedSettings,
       actions: {
         //TODO: batch all these and if that's difficult to do from tsx,
         // make it easy to do
 
-        setClientSideSceneUnits: (context, event) => {
+        setClientSideSceneUnits: ({ context, event }) => {
           const newBaseUnit =
             event.type === 'set.modeling.defaultUnit'
               ? (event.data.value as BaseUnit)
               : context.modeling.defaultUnit.current
           sceneInfra.baseUnit = newBaseUnit
         },
-        setEngineTheme: (context) => {
+        setEngineTheme: ({ context }) => {
+          // eslint-disable-next-line @typescript-eslint/no-floating-promises
           engineCommandManager.sendSceneCommand({
             cmd_id: uuidv4(),
             type: 'modeling_cmd_req',
@@ -126,6 +124,7 @@ export const SettingsAuthProviderBase = ({
           })
 
           const opposingTheme = getOppositeTheme(context.app.theme.current)
+          // eslint-disable-next-line @typescript-eslint/no-floating-promises
           engineCommandManager.sendSceneCommand({
             cmd_id: uuidv4(),
             type: 'modeling_cmd_req',
@@ -135,16 +134,18 @@ export const SettingsAuthProviderBase = ({
             },
           })
         },
-        setEngineScaleGridVisibility: (context) => {
+        setEngineScaleGridVisibility: ({ context }) => {
           engineCommandManager.setScaleGridVisibility(
             context.modeling.showScaleGrid.current
           )
         },
-        setClientTheme: (context) => {
+        setClientTheme: ({ context }) => {
           const opposingTheme = getOppositeTheme(context.app.theme.current)
           sceneInfra.theme = opposingTheme
+          sceneEntitiesManager.updateSegmentBaseColor(opposingTheme)
         },
-        setEngineEdges: (context) => {
+        setEngineEdges: ({ context }) => {
+          // eslint-disable-next-line @typescript-eslint/no-floating-promises
           engineCommandManager.sendSceneCommand({
             cmd_id: uuidv4(),
             type: 'modeling_cmd_req',
@@ -154,7 +155,8 @@ export const SettingsAuthProviderBase = ({
             },
           })
         },
-        toastSuccess: (_, event) => {
+        toastSuccess: ({ event }) => {
+          if (!('data' in event)) return
           const eventParts = event.type.replace(/^set./, '').split('.') as [
             keyof typeof settings,
             string
@@ -176,7 +178,7 @@ export const SettingsAuthProviderBase = ({
             id: `${event.type}.success`,
           })
         },
-        'Execute AST': (context, event) => {
+        'Execute AST': ({ context, event }) => {
           try {
             const allSettingsIncludesUnitChange =
               event.type === 'Set all settings' &&
@@ -193,6 +195,7 @@ export const SettingsAuthProviderBase = ({
               resetSettingsIncludesUnitChange
             ) {
               // Unit changes requires a re-exec of code
+              // eslint-disable-next-line @typescript-eslint/no-floating-promises
               kclManager.executeCode(true)
             } else {
               // For any future logging we'd like to do
@@ -204,12 +207,13 @@ export const SettingsAuthProviderBase = ({
             console.error('Error executing AST after settings change', e)
           }
         },
+        persistSettings: ({ context }) => {
+          // eslint-disable-next-line @typescript-eslint/no-floating-promises
+          saveSettings(context, loadedProject?.project?.path)
+        },
       },
-      services: {
+    }),
-        'Persist settings': (context) =>
+    { input: loadedSettings }
-          saveSettings(context, loadedProject?.project?.path),
-      },
-    }
   )
   settingsStateRef = settingsState.context
 
@@ -292,19 +296,22 @@ export const SettingsAuthProviderBase = ({
   }, [settingsState.context.textEditor.blinkingCursor.current])
 
   // Auth machine setup
-  const [authState, authSend, authActor] = useMachine(authMachine, {
+  const [authState, authSend, authActor] = useMachine(
-    actions: {
+    authMachine.provide({
-      goToSignInPage: () => {
+      actions: {
-        navigate(PATHS.SIGN_IN)
+        goToSignInPage: () => {
-        logout()
+          navigate(PATHS.SIGN_IN)
+          // eslint-disable-next-line @typescript-eslint/no-floating-promises
+          logout()
+        },
+        goToIndexPage: () => {
+          if (location.pathname.includes(PATHS.SIGN_IN)) {
+            navigate(PATHS.INDEX)
+          }
+        },
       },
-      goToIndexPage: () => {
+    })
-        if (location.pathname.includes(PATHS.SIGN_IN)) {
+  )
-          navigate(PATHS.INDEX)
-        }
-      },
-    },
-  })
 
   useStateMachineCommands({
     machineId: 'auth',
@@ -336,13 +343,11 @@ export const SettingsAuthProviderBase = ({
 
 export default SettingsAuthProvider
 
-export function logout() {
+export async function logout() {
   localStorage.removeItem(TOKEN_PERSIST_KEY)
-  return (
+  if (isDesktop()) return Promise.resolve(null)
-    !isDesktop() &&
+  return fetch(withBaseUrl('/logout'), {
-    fetch(withBaseUrl('/logout'), {
+    method: 'POST',
-      method: 'POST',
+    credentials: 'include',
-      credentials: 'include',
+  })
-    })
-  )
 }

src/components/Stream.tsx

@@ -53,9 +53,10 @@ export const Stream = () => {
    * executed. If we can find a way to do this from a more
    * central place, we can move this code there.
    */
-  async function executeCodeAndPlayStream() {
+  function executeCodeAndPlayStream() {
-    kclManager.executeCode(true).then(() => {
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      videoRef.current?.play().catch((e) => {
+    kclManager.executeCode(true).then(async () => {
+      await videoRef.current?.play().catch((e) => {
         console.warn('Video playing was prevented', e, videoRef.current)
       })
       setStreamState(StreamState.Playing)
@@ -218,12 +219,12 @@ export const Stream = () => {
    */
   useEffect(() => {
     if (!kclManager.isExecuting) {
-      setTimeout(() =>
+      setTimeout(() => {
         // execute in the next event loop
         videoRef.current?.play().catch((e) => {
           console.warn('Video playing was prevented', e, videoRef.current)
         })
-      )
+      })
     }
   }, [kclManager.isExecuting])
 
@@ -287,9 +288,10 @@ export const Stream = () => {
       },
     })
     if (state.matches('Sketch')) return
-    if (state.matches('idle.showPlanes')) return
+    if (state.matches({ idle: 'showPlanes' })) return
 
     if (!context.store?.didDragInStream && btnName(e).left) {
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
       sendSelectEventToEngine(
         e,
         videoRef.current,

src/components/ToastTextToCad.tsx

@@ -5,7 +5,7 @@ import { isDesktop } from 'lib/isDesktop'
 import { PATHS } from 'lib/paths'
 import toast from 'react-hot-toast'
 import { TextToCad_type } from '@kittycad/lib/dist/types/src/models'
-import { useCallback, useEffect, useRef, useState } from 'react'
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import {
   Box3,
   Color,
@@ -15,6 +15,7 @@ import {
   LineSegments,
   Mesh,
   MeshBasicMaterial,
+  MOUSE,
   OrthographicCamera,
   Scene,
   Vector3,
@@ -26,8 +27,18 @@ import { sendTelemetry } from 'lib/textToCad'
 import { Themes } from 'lib/theme'
 import { ActionButton } from './ActionButton'
 import { commandBarMachine } from 'machines/commandBarMachine'
-import { EventData, EventFrom } from 'xstate'
+import { EventFrom } from 'xstate'
 import { fileMachine } from 'machines/fileMachine'
+import { reportRejection } from 'lib/trap'
+import {
+  CameraControls,
+  CameraInteractionType,
+} from 'clientSideScene/CameraControls'
+import {
+  cameraMouseDragGuards,
+  CameraSystem,
+  MouseGuard,
+} from 'lib/cameraControls'
 
 const CANVAS_SIZE = 128
 const PROMPT_TRUNCATE_LENGTH = 128
@@ -45,7 +56,7 @@ export function ToastTextToCadError({
   prompt: string
   commandBarSend: (
     event: EventFrom<typeof commandBarMachine>,
-    data?: EventData
+    data?: unknown
   ) => void
 }) {
   return (
@@ -112,13 +123,19 @@ export function ToastTextToCadSuccess({
   token?: string
   fileMachineSend: (
     event: EventFrom<typeof fileMachine>,
-    data?: EventData
+    data?: unknown
   ) => void
   settings: {
     theme: Themes
     highlightEdges: boolean
+    mouseControls: CameraSystem
   }
 }) {
+  const interactionGuards = useMemo(
+    () => cameraMouseDragGuards[settings.mouseControls],
+    [settings.mouseControls]
+  )
+  const controlsRef = useRef<OrbitControls | null>(null)
   const wrapperRef = useRef<HTMLDivElement | null>(null)
   const canvasRef = useRef<HTMLCanvasElement | null>(null)
   const animationRequestRef = useRef<number>()
@@ -167,8 +184,59 @@ export function ToastTextToCadSuccess({
     const ambientLight = new DirectionalLight(new Color('white'), 8.0)
     scene.add(ambientLight)
     const camera = createCamera()
+    // Because this listener is registered before the OrbitControls are created,
+    // it runs first and can block the OrbitControls from working.
+    renderer.domElement.addEventListener('pointerdown', (e) => {
+      if (!controlsRef.current) return
+      const newInteractionType = getCameraInteractionType({
+        interactionGuards,
+        event: e,
+      })
+      console.log('newInteractionType', newInteractionType)
+
+      if (newInteractionType === 'none') {
+        e.stopImmediatePropagation()
+      }
+
+      /**
+       * Update the OrbitControls to enable only the current interaction type.
+       * This is a hack to override the interaction types of the OrbitControls
+       * to match ours. In the future, we should roll our own class based on OrbitControls,
+       * which can handle interaction guards that are more complex than just mouse buttons.
+       */
+      if (newInteractionType === 'pan') {
+        controlsRef.current.enablePan = true
+        controlsRef.current.enableZoom = false
+        controlsRef.current.enableRotate = false
+        controlsRef.current.mouseButtons = {
+          LEFT: MOUSE.PAN,
+          MIDDLE: MOUSE.PAN,
+          RIGHT: MOUSE.PAN,
+        }
+      } else if (newInteractionType === 'zoom') {
+        controlsRef.current.enablePan = false
+        controlsRef.current.enableZoom = true
+        controlsRef.current.enableRotate = false
+        controlsRef.current.mouseButtons = {
+          LEFT: MOUSE.DOLLY,
+          MIDDLE: MOUSE.DOLLY,
+          RIGHT: MOUSE.DOLLY,
+        }
+      } else if (newInteractionType === 'rotate') {
+        controlsRef.current.enablePan = false
+        controlsRef.current.enableZoom = false
+        controlsRef.current.enableRotate = true
+        controlsRef.current.mouseButtons = {
+          LEFT: MOUSE.ROTATE,
+          MIDDLE: MOUSE.ROTATE,
+          RIGHT: MOUSE.ROTATE,
+        }
+      }
+
+      controls.update()
+    })
     const controls = new OrbitControls(camera, renderer.domElement)
-    controls.enableDamping = true
+    controlsRef.current = controls
     const loader = new GLTFLoader()
     const dracoLoader = new DRACOLoader()
     dracoLoader.setDecoderPath('/examples/jsm/libs/draco/')
@@ -269,7 +337,7 @@ export function ToastTextToCadSuccess({
   }, [])
 
   return (
-    <div className="flex gap-4 min-w-80" ref={wrapperRef}>
+    <div className="flex gap-4 min-w-80 user-select-none" ref={wrapperRef}>
       <div
         className="flex-none overflow-hidden"
         style={{ width: CANVAS_SIZE + 'px', height: CANVAS_SIZE + 'px' }}
@@ -297,7 +365,7 @@ export function ToastTextToCadSuccess({
             name={hasCopied ? 'Close' : 'Reject'}
             onClick={() => {
               if (!hasCopied) {
-                sendTelemetry(modelId, 'rejected', token)
+                sendTelemetry(modelId, 'rejected', token).catch(reportRejection)
               }
               if (isDesktop()) {
                 // Delete the file from the project
@@ -323,6 +391,7 @@ export function ToastTextToCadSuccess({
               }}
               name="Accept"
               onClick={() => {
+                // eslint-disable-next-line @typescript-eslint/no-floating-promises
                 sendTelemetry(modelId, 'accepted', token)
                 navigate(
                   `${PATHS.FILE}/${encodeURIComponent(
@@ -342,7 +411,9 @@ export function ToastTextToCadSuccess({
               }}
               name="Copy to clipboard"
               onClick={() => {
+                // eslint-disable-next-line @typescript-eslint/no-floating-promises
                 sendTelemetry(modelId, 'accepted', token)
+                // eslint-disable-next-line @typescript-eslint/no-floating-promises
                 navigator.clipboard.writeText(data.code || '// no code found')
                 setShowCopiedUi(true)
                 setHasCopied(true)
@@ -407,3 +478,22 @@ function traverseSceneToStyleObjects({
     }
   })
 }
+
+function getCameraInteractionType({
+  interactionGuards,
+  event,
+}: {
+  interactionGuards: MouseGuard
+  event: MouseEvent
+}): CameraInteractionType | 'none' {
+  if (interactionGuards.pan.callback(event)) {
+    return 'pan'
+  }
+  if (interactionGuards.zoom.dragCallback(event)) {
+    return 'zoom'
+  }
+  if (interactionGuards.rotate.callback(event)) {
+    return 'rotate'
+  }
+  return 'none'
+}

src/components/Tooltip.tsx

@@ -12,6 +12,7 @@ interface TooltipProps extends React.PropsWithChildren {
   position?: TooltipPosition
   wrapperClassName?: string
   contentClassName?: string
+  wrapperStyle?: React.CSSProperties
   delay?: number
   hoverOnly?: boolean
   inert?: boolean
@@ -22,6 +23,7 @@ export default function Tooltip({
   position = 'top',
   wrapperClassName: className,
   contentClassName,
+  wrapperStyle = {},
   delay = 200,
   hoverOnly = false,
   inert = true,
@@ -36,7 +38,10 @@ export default function Tooltip({
       } ${styles.tooltipWrapper} ${hoverOnly ? '' : styles.withFocus} ${
         styles[position]
       } ${className}`}
-      style={{ '--_delay': delay + 'ms' } as React.CSSProperties}
+      style={Object.assign(
+        { '--_delay': delay + 'ms' } as React.CSSProperties,
+        wrapperStyle
+      )}
     >
       <div className={`rounded ${styles.tooltip} ${contentClassName || ''}`}>
         {children}

src/components/UserSidebarMenu.tsx

@@ -133,7 +133,7 @@ const UserSidebarMenu = ({ user }: { user?: User }) => {
           Element: 'button',
           'data-testid': 'user-sidebar-sign-out',
           children: 'Sign out',
-          onClick: () => send('Log out'),
+          onClick: () => send({ type: 'Log out' }),
           className: '', // Just making TS's filter type coercion happy 😠
         },
       ].filter(

src/editor/manager.ts

@@ -1,7 +1,7 @@
 import { EditorView, ViewUpdate } from '@codemirror/view'
 import { EditorSelection, Annotation, Transaction } from '@codemirror/state'
 import { engineCommandManager } from 'lib/singletons'
-import { ModelingMachineEvent } from 'machines/modelingMachine'
+import { modelingMachine, ModelingMachineEvent } from 'machines/modelingMachine'
 import { Selections, processCodeMirrorRanges, Selection } from 'lib/selections'
 import { undo, redo } from '@codemirror/commands'
 import { CommandBarMachineEvent } from 'machines/commandBarMachine'
@@ -11,6 +11,7 @@ import {
   forEachDiagnostic,
   setDiagnosticsEffect,
 } from '@codemirror/lint'
+import { StateFrom } from 'xstate'
 
 const updateOutsideEditorAnnotation = Annotation.define<boolean>()
 export const updateOutsideEditorEvent = updateOutsideEditorAnnotation.of(true)
@@ -38,7 +39,7 @@ export default class EditorManager {
   private _lastEvent: { event: string; time: number } | null = null
 
   private _modelingSend: (eventInfo: ModelingMachineEvent) => void = () => {}
-  private _modelingEvent: ModelingMachineEvent | null = null
+  private _modelingState: StateFrom<typeof modelingMachine> | null = null
 
   private _commandBarSend: (eventInfo: CommandBarMachineEvent) => void =
     () => {}
@@ -80,8 +81,8 @@ export default class EditorManager {
     this._modelingSend = send
   }
 
-  set modelingEvent(event: ModelingMachineEvent) {
+  set modelingState(state: StateFrom<typeof modelingMachine>) {
-    this._modelingEvent = event
+    this._modelingState = state
   }
 
   setCommandBarSend(send: (eventInfo: CommandBarMachineEvent) => void) {
@@ -248,13 +249,11 @@ export default class EditorManager {
       return
     }
 
-    const ignoreEvents: ModelingMachineEvent['type'][] = ['change tool']
+    if (!this._modelingState) {
-
-    if (!this._modelingEvent) {
       return
     }
 
-    if (ignoreEvents.includes(this._modelingEvent.type)) {
+    if (this._modelingState.matches({ Sketch: 'Change Tool' })) {
       return
     }
 
@@ -286,8 +285,9 @@ export default class EditorManager {
 
     this._lastEvent = { event: stringEvent, time: Date.now() }
     this._modelingSend(eventInfo.modelingEvent)
-    eventInfo.engineEvents.forEach((event) =>
+    eventInfo.engineEvents.forEach((event) => {
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
       engineCommandManager.sendSceneCommand(event)
-    )
+    })
   }
 }

src/editor/plugins/lsp/copilot/index.ts

@@ -36,6 +36,7 @@ import { CopilotCompletionResponse } from 'wasm-lib/kcl/bindings/CopilotCompleti
 import { CopilotAcceptCompletionParams } from 'wasm-lib/kcl/bindings/CopilotAcceptCompletionParams'
 import { CopilotRejectCompletionParams } from 'wasm-lib/kcl/bindings/CopilotRejectCompletionParams'
 import { editorManager } from 'lib/singletons'
+import { reportRejection } from 'lib/trap'
 
 const copilotPluginAnnotation = Annotation.define<boolean>()
 export const copilotPluginEvent = copilotPluginAnnotation.of(true)
@@ -266,7 +267,7 @@ export class CompletionRequester implements PluginValue {
 
     if (!this.client.ready) return
     try {
-      this.requestCompletions()
+      this.requestCompletions().catch(reportRejection)
     } catch (e) {
       console.error(e)
     }
@@ -462,7 +463,7 @@ export class CompletionRequester implements PluginValue {
       annotations: [copilotPluginEvent, Transaction.addToHistory.of(true)],
     })
 
-    this.accept(ghostText.uuid)
+    this.accept(ghostText.uuid).catch(reportRejection)
     return true
   }
 
@@ -490,7 +491,7 @@ export class CompletionRequester implements PluginValue {
       ],
     })
 
-    this.reject()
+    this.reject().catch(reportRejection)
     return false
   }
 

src/editor/plugins/lsp/kcl/index.ts

@@ -96,6 +96,7 @@ export class KclPlugin implements PluginValue {
 
     const newCode = viewUpdate.state.doc.toString()
     codeManager.code = newCode
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
     codeManager.writeToFile()
 
     this.scheduleUpdateDoc()
@@ -117,6 +118,7 @@ export class KclPlugin implements PluginValue {
     }
 
     if (!this.client.ready) return
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
     kclManager.executeCode()
   }
 

src/editor/plugins/lsp/worker.ts

@@ -18,7 +18,7 @@ import {
   CopilotWorkerOptions,
 } from 'editor/plugins/lsp/types'
 import { EngineCommandManager } from 'lang/std/engineConnection'
-import { err } from 'lib/trap'
+import { err, reportRejection } from 'lib/trap'
 
 const intoServer: IntoServer = new IntoServer()
 const fromServer: FromServer | Error = FromServer.create()
@@ -60,7 +60,8 @@ export async function kclLspRun(
   }
 }
 
-onmessage = function (event) {
+// WebWorker message handler.
+onmessage = function (event: MessageEvent) {
   if (err(fromServer)) return
   const { worker, eventType, eventData }: LspWorkerEvent = event.data
 
@@ -70,7 +71,7 @@ onmessage = function (event) {
         | KclWorkerOptions
         | CopilotWorkerOptions
       initialise(wasmUrl)
-        .then((instantiatedModule) => {
+        .then(async (instantiatedModule) => {
           console.log('Worker: WASM module loaded', worker, instantiatedModule)
           const config = new ServerConfig(
             intoServer,
@@ -81,7 +82,7 @@ onmessage = function (event) {
           switch (worker) {
             case LspWorker.Kcl:
               const kclData = eventData as KclWorkerOptions
-              kclLspRun(
+              await kclLspRun(
                 config,
                 null,
                 kclData.token,
@@ -91,7 +92,11 @@ onmessage = function (event) {
               break
             case LspWorker.Copilot:
               let copilotData = eventData as CopilotWorkerOptions
-              copilotLspRun(config, copilotData.token, copilotData.apiBaseUrl)
+              await copilotLspRun(
+                config,
+                copilotData.token,
+                copilotData.apiBaseUrl
+              )
               break
           }
         })
@@ -104,7 +109,7 @@ onmessage = function (event) {
       intoServer.enqueue(data)
       const json: jsrpc.JSONRPCRequest = Codec.decode(data)
       if (null != json.id) {
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises, @typescript-eslint/no-non-null-assertion
         fromServer.responses.get(json.id)!.then((response) => {
           const encoded = Codec.encode(response as jsrpc.JSONRPCResponse)
           postMessage(encoded)
@@ -115,19 +120,17 @@ onmessage = function (event) {
       console.error('Worker: Unknown message type', worker, eventType)
   }
 }
-
+;(async () => {
-new Promise<void>(async (resolve) => {
   if (err(fromServer)) return
   for await (const requests of fromServer.requests) {
     const encoded = Codec.encode(requests as jsrpc.JSONRPCRequest)
     postMessage(encoded)
   }
-})
+})().catch(reportRejection)
-
+;(async () => {
-new Promise<void>(async (resolve) => {
   if (err(fromServer)) return
   for await (const notification of fromServer.notifications) {
     const encoded = Codec.encode(notification as jsrpc.JSONRPCRequest)
     postMessage(encoded)
   }
-})
+})().catch(reportRejection)

src/hooks/useCommandsContext.ts

@@ -1,6 +1,10 @@
 import { CommandsContext } from 'components/CommandBar/CommandBarProvider'
-import { useContext } from 'react'
 
 export const useCommandsContext = () => {
-  return useContext(CommandsContext)
+  const commandBarActor = CommandsContext.useActorRef()
+  const commandBarState = CommandsContext.useSelector((state) => state)
+  return {
+    commandBarSend: commandBarActor.send,
+    commandBarState,
+  }
 }

src/hooks/useEngineConnectionSubscriptions.ts

@@ -14,7 +14,7 @@ import {
   getSolid2dCodeRef,
   getWallCodeRef,
 } from 'lang/std/artifactGraph'
-import { err } from 'lib/trap'
+import { err, reportRejection } from 'lib/trap'
 import { DefaultPlaneStr, getFaceDetails } from 'clientSideScene/sceneEntities'
 import { getNodePathFromSourceRange } from 'lang/queryAst'
 
@@ -86,9 +86,11 @@ export function useEngineConnectionSubscriptions() {
     })
     const unSubClick = engineCommandManager.subscribeTo({
       event: 'select_with_point',
-      callback: async (engineEvent) => {
+      callback: (engineEvent) => {
-        const event = await getEventForSelectWithPoint(engineEvent)
+        ;(async () => {
-        event && send(event)
+          const event = await getEventForSelectWithPoint(engineEvent)
+          event && send(event)
+        })().catch(reportRejection)
       },
     })
     return () => {
@@ -101,118 +103,120 @@ export function useEngineConnectionSubscriptions() {
     const unSub = engineCommandManager.subscribeTo({
       event: 'select_with_point',
       callback: state.matches('Sketch no face')
-        ? async ({ data }) => {
+        ? ({ data }) => {
-            let planeOrFaceId = data.entity_id
+            ;(async () => {
-            if (!planeOrFaceId) return
+              let planeOrFaceId = data.entity_id
-            if (
+              if (!planeOrFaceId) return
-              engineCommandManager.defaultPlanes?.xy === planeOrFaceId ||
+              if (
-              engineCommandManager.defaultPlanes?.xz === planeOrFaceId ||
+                engineCommandManager.defaultPlanes?.xy === planeOrFaceId ||
-              engineCommandManager.defaultPlanes?.yz === planeOrFaceId ||
+                engineCommandManager.defaultPlanes?.xz === planeOrFaceId ||
-              engineCommandManager.defaultPlanes?.negXy === planeOrFaceId ||
+                engineCommandManager.defaultPlanes?.yz === planeOrFaceId ||
-              engineCommandManager.defaultPlanes?.negXz === planeOrFaceId ||
+                engineCommandManager.defaultPlanes?.negXy === planeOrFaceId ||
-              engineCommandManager.defaultPlanes?.negYz === planeOrFaceId
+                engineCommandManager.defaultPlanes?.negXz === planeOrFaceId ||
-            ) {
+                engineCommandManager.defaultPlanes?.negYz === planeOrFaceId
-              let planeId = planeOrFaceId
+              ) {
-              const defaultPlaneStrMap: Record<string, DefaultPlaneStr> = {
+                let planeId = planeOrFaceId
-                [engineCommandManager.defaultPlanes.xy]: 'XY',
+                const defaultPlaneStrMap: Record<string, DefaultPlaneStr> = {
-                [engineCommandManager.defaultPlanes.xz]: 'XZ',
+                  [engineCommandManager.defaultPlanes.xy]: 'XY',
-                [engineCommandManager.defaultPlanes.yz]: 'YZ',
+                  [engineCommandManager.defaultPlanes.xz]: 'XZ',
-                [engineCommandManager.defaultPlanes.negXy]: '-XY',
+                  [engineCommandManager.defaultPlanes.yz]: 'YZ',
-                [engineCommandManager.defaultPlanes.negXz]: '-XZ',
+                  [engineCommandManager.defaultPlanes.negXy]: '-XY',
-                [engineCommandManager.defaultPlanes.negYz]: '-YZ',
+                  [engineCommandManager.defaultPlanes.negXz]: '-XZ',
-              }
+                  [engineCommandManager.defaultPlanes.negYz]: '-YZ',
-              // TODO can we get this information from rust land when it creates the default planes?
+                }
-              // maybe returned from make_default_planes (src/wasm-lib/src/wasm.rs)
+                // TODO can we get this information from rust land when it creates the default planes?
-              let zAxis: [number, number, number] = [0, 0, 1]
+                // maybe returned from make_default_planes (src/wasm-lib/src/wasm.rs)
-              let yAxis: [number, number, number] = [0, 1, 0]
+                let zAxis: [number, number, number] = [0, 0, 1]
+                let yAxis: [number, number, number] = [0, 1, 0]
 
-              // get unit vector from camera position to target
+                // get unit vector from camera position to target
-              const camVector = sceneInfra.camControls.camera.position
+                const camVector = sceneInfra.camControls.camera.position
-                .clone()
+                  .clone()
-                .sub(sceneInfra.camControls.target)
+                  .sub(sceneInfra.camControls.target)
 
-              if (engineCommandManager.defaultPlanes?.xy === planeId) {
+                if (engineCommandManager.defaultPlanes?.xy === planeId) {
-                zAxis = [0, 0, 1]
+                  zAxis = [0, 0, 1]
-                yAxis = [0, 1, 0]
+                  yAxis = [0, 1, 0]
-                if (camVector.z < 0) {
+                  if (camVector.z < 0) {
-                  zAxis = [0, 0, -1]
+                    zAxis = [0, 0, -1]
-                  planeId = engineCommandManager.defaultPlanes?.negXy || ''
+                    planeId = engineCommandManager.defaultPlanes?.negXy || ''
-                }
+                  }
-              } else if (engineCommandManager.defaultPlanes?.yz === planeId) {
+                } else if (engineCommandManager.defaultPlanes?.yz === planeId) {
-                zAxis = [1, 0, 0]
+                  zAxis = [1, 0, 0]
-                yAxis = [0, 0, 1]
+                  yAxis = [0, 0, 1]
-                if (camVector.x < 0) {
+                  if (camVector.x < 0) {
-                  zAxis = [-1, 0, 0]
+                    zAxis = [-1, 0, 0]
-                  planeId = engineCommandManager.defaultPlanes?.negYz || ''
+                    planeId = engineCommandManager.defaultPlanes?.negYz || ''
-                }
+                  }
-              } else if (engineCommandManager.defaultPlanes?.xz === planeId) {
+                } else if (engineCommandManager.defaultPlanes?.xz === planeId) {
-                zAxis = [0, 1, 0]
+                  zAxis = [0, 1, 0]
-                yAxis = [0, 0, 1]
+                  yAxis = [0, 0, 1]
-                planeId = engineCommandManager.defaultPlanes?.negXz || ''
+                  planeId = engineCommandManager.defaultPlanes?.negXz || ''
-                if (camVector.y < 0) {
+                  if (camVector.y < 0) {
-                  zAxis = [0, -1, 0]
+                    zAxis = [0, -1, 0]
-                  planeId = engineCommandManager.defaultPlanes?.xz || ''
+                    planeId = engineCommandManager.defaultPlanes?.xz || ''
+                  }
                 }
+
+                sceneInfra.modelingSend({
+                  type: 'Select default plane',
+                  data: {
+                    type: 'defaultPlane',
+                    planeId: planeId,
+                    plane: defaultPlaneStrMap[planeId],
+                    zAxis,
+                    yAxis,
+                  },
+                })
+                return
               }
+              const faceId = planeOrFaceId
+              const artifact = engineCommandManager.artifactGraph.get(faceId)
+              const extrusion = getExtrusionFromSuspectedExtrudeSurface(
+                faceId,
+                engineCommandManager.artifactGraph
+              )
+
+              if (artifact?.type !== 'cap' && artifact?.type !== 'wall') return
+
+              const codeRef =
+                artifact.type === 'cap'
+                  ? getCapCodeRef(artifact, engineCommandManager.artifactGraph)
+                  : getWallCodeRef(artifact, engineCommandManager.artifactGraph)
+
+              const faceInfo = await getFaceDetails(faceId)
+              if (!faceInfo?.origin || !faceInfo?.z_axis || !faceInfo?.y_axis)
+                return
+              const { z_axis, y_axis, origin } = faceInfo
+              const sketchPathToNode = getNodePathFromSourceRange(
+                kclManager.ast,
+                err(codeRef) ? [0, 0] : codeRef.range
+              )
+
+              const extrudePathToNode = !err(extrusion)
+                ? getNodePathFromSourceRange(
+                    kclManager.ast,
+                    extrusion.codeRef.range
+                  )
+                : []
 
               sceneInfra.modelingSend({
                 type: 'Select default plane',
                 data: {
-                  type: 'defaultPlane',
+                  type: 'extrudeFace',
-                  planeId: planeId,
+                  zAxis: [z_axis.x, z_axis.y, z_axis.z],
-                  plane: defaultPlaneStrMap[planeId],
+                  yAxis: [y_axis.x, y_axis.y, y_axis.z],
-                  zAxis,
+                  position: [origin.x, origin.y, origin.z].map(
-                  yAxis,
+                    (num) => num / sceneInfra._baseUnitMultiplier
+                  ) as [number, number, number],
+                  sketchPathToNode,
+                  extrudePathToNode,
+                  cap: artifact.type === 'cap' ? artifact.subType : 'none',
+                  faceId: faceId,
                 },
               })
               return
-            }
+            })().catch(reportRejection)
-            const faceId = planeOrFaceId
-            const artifact = engineCommandManager.artifactGraph.get(faceId)
-            const extrusion = getExtrusionFromSuspectedExtrudeSurface(
-              faceId,
-              engineCommandManager.artifactGraph
-            )
-
-            if (artifact?.type !== 'cap' && artifact?.type !== 'wall') return
-
-            const codeRef =
-              artifact.type === 'cap'
-                ? getCapCodeRef(artifact, engineCommandManager.artifactGraph)
-                : getWallCodeRef(artifact, engineCommandManager.artifactGraph)
-
-            const faceInfo = await getFaceDetails(faceId)
-            if (!faceInfo?.origin || !faceInfo?.z_axis || !faceInfo?.y_axis)
-              return
-            const { z_axis, y_axis, origin } = faceInfo
-            const sketchPathToNode = getNodePathFromSourceRange(
-              kclManager.ast,
-              err(codeRef) ? [0, 0] : codeRef.range
-            )
-
-            const extrudePathToNode = !err(extrusion)
-              ? getNodePathFromSourceRange(
-                  kclManager.ast,
-                  extrusion.codeRef.range
-                )
-              : []
-
-            sceneInfra.modelingSend({
-              type: 'Select default plane',
-              data: {
-                type: 'extrudeFace',
-                zAxis: [z_axis.x, z_axis.y, z_axis.z],
-                yAxis: [y_axis.x, y_axis.y, y_axis.z],
-                position: [origin.x, origin.y, origin.z].map(
-                  (num) => num / sceneInfra._baseUnitMultiplier
-                ) as [number, number, number],
-                sketchPathToNode,
-                extrudePathToNode,
-                cap: artifact.type === 'cap' ? artifact.subType : 'none',
-                faceId: faceId,
-              },
-            })
-            return
           }
         : () => {},
     })

src/hooks/useRefreshSettings.ts

@@ -23,7 +23,8 @@ export function useRefreshSettings(routeId: string = PATHS.INDEX) {
   }
 
   useEffect(() => {
-    ctx.settings.send('Set all settings', {
+    ctx.settings.send({
+      type: 'Set all settings',
       settings: routeData,
     })
   }, [])

src/hooks/useStateMachineCommands.ts

@@ -1,5 +1,5 @@
 import { useEffect } from 'react'
-import { AnyStateMachine, InterpreterFrom, StateFrom } from 'xstate'
+import { AnyStateMachine, Actor, StateFrom } from 'xstate'
 import { createMachineCommand } from '../lib/createMachineCommand'
 import { useCommandsContext } from './useCommandsContext'
 import { modelingMachine } from 'machines/modelingMachine'
@@ -15,6 +15,7 @@ import { useKclContext } from 'lang/KclProvider'
 import { useNetworkContext } from 'hooks/useNetworkContext'
 import { NetworkHealthState } from 'hooks/useNetworkStatus'
 import { useAppState } from 'AppState'
+import { getActorNextEvents } from 'lib/utils'
 
 // This might not be necessary, AnyStateMachine from xstate is working
 export type AllMachines =
@@ -30,7 +31,7 @@ interface UseStateMachineCommandsArgs<
   machineId: T['id']
   state: StateFrom<T>
   send: Function
-  actor: InterpreterFrom<T>
+  actor: Actor<T>
   commandBarConfig?: StateMachineCommandSetConfig<T, S>
   allCommandsRequireNetwork?: boolean
   onCancel?: () => void
@@ -59,7 +60,7 @@ export default function useStateMachineCommands<
         overallState !== NetworkHealthState.Weak) ||
       isExecuting ||
       !isStreamReady
-    const newCommands = state.nextEvents
+    const newCommands = getActorNextEvents(state)
       .filter((_) => !allCommandsRequireNetwork || !disableAllButtons)
       .filter((e) => !['done.', 'error.'].some((n) => e.includes(n)))
       .flatMap((type) =>

src/hooks/useToolbarGuards.ts

@@ -3,13 +3,14 @@ import {
   createSetVarNameModal,
 } from 'components/SetVarNameModal'
 import { editorManager, kclManager } from 'lib/singletons'
-import { trap } from 'lib/trap'
+import { reportRejection, trap } from 'lib/trap'
 import { moveValueIntoNewVariable } from 'lang/modifyAst'
 import { isNodeSafeToReplace } from 'lang/queryAst'
 import { useEffect, useState } from 'react'
 import { useModelingContext } from './useModelingContext'
-import { PathToNode, SourceRange, parse, recast } from 'lang/wasm'
+import { PathToNode, SourceRange } from 'lang/wasm'
 import { useKclContext } from 'lang/KclProvider'
+import { toSync } from 'lib/utils'
 
 export const getVarNameModal = createSetVarNameModal(SetVarNameModal)
 
@@ -23,8 +24,7 @@ export function useConvertToVariable(range?: SourceRange) {
   }, [enable])
 
   useEffect(() => {
-    const parsed = parse(recast(ast))
+    const parsed = ast
-    if (trap(parsed)) return
 
     const meta = isNodeSafeToReplace(
       parsed,
@@ -63,7 +63,7 @@ export function useConvertToVariable(range?: SourceRange) {
     }
   }
 
-  editorManager.convertToVariableCallback = handleClick
+  editorManager.convertToVariableCallback = toSync(handleClick, reportRejection)
 
   return { enable, handleClick }
 }

src/index.css

@@ -267,7 +267,8 @@ code {
 }
 
 .segment-length-label-text {
-  transform: translate(var(--x, 0), var(--y, 0));
+  transform: translate(var(--x, 0), var(--y, 0)) rotate(var(--degree, 0));
+  @apply font-mono body-bg px-2 pt-0.5 rounded-sm border border-chalkboard-110 dark:border-chalkboard-10;
 }
 
 @layer components {
@@ -275,7 +276,7 @@ code {
     @apply font-mono text-xs inline-block px-0.5 py-[2px] rounded;
 
     /* This is the only place in our code where layout is impacted by theme.
-     * We may not want that later, if hotkeys are possibly visible 
+     * We may not want that later, if hotkeys are possibly visible
      * while switching theme, but more padding feels better in dark mode.
      */
     @apply dark:px-1;
@@ -287,32 +288,11 @@ code {
 }
 
 @layer utilities {
-  /* Modified from the very helpful https://www.transition.style/#in:circle:hesitate */
+  /* 
-  @keyframes circle-in-hesitate {
+    This is where your own custom Tailwind utility classes can go,
-    0% {
+    which lets you use them with @apply in your CSS, and get 
-      clip-path: circle(
+    autocomplete in classNames in your JSX.
-        var(--circle-size-start, 0%) at var(--circle-x, 50%)
+  */
-          var(--circle-y, 50%)
-      );
-    }
-    40% {
-      clip-path: circle(
-        var(--circle-size-mid, 40%) at var(--circle-x, 50%) var(--circle-y, 50%)
-      );
-    }
-    100% {
-      clip-path: circle(
-        var(--circle-size-end, 125%) at var(--circle-x, 50%)
-          var(--circle-y, 50%)
-      );
-    }
-  }
-
-  .in-circle-hesitate {
-    animation: var(--circle-duration, 2.5s)
-      var(--circle-timing, cubic-bezier(0.25, 1, 0.3, 1)) circle-in-hesitate
-      both;
-  }
 }
 
 #code-mirror-override .cm-scroller,

src/lang/KclSingleton.ts

@@ -129,8 +129,8 @@ export class KclManager {
     if (!isExecuting && this.executeIsStale) {
       const args = this.executeIsStale
       this.executeIsStale = null
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
       this.executeAst(args)
-    } else {
     }
     this._isExecutingCallback(isExecuting)
   }
@@ -154,6 +154,7 @@ export class KclManager {
   constructor(engineCommandManager: EngineCommandManager) {
     this.engineCommandManager = engineCommandManager
 
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
     this.ensureWasmInit().then(() => {
       this.ast = this.safeParse(codeManager.code) || this.ast
     })
@@ -400,9 +401,11 @@ export class KclManager {
     // Update the code state and the editor.
     codeManager.updateCodeStateEditor(code)
     // Write back to the file system.
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
     codeManager.writeToFile()
 
     // execute the code.
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
     this.executeCode()
   }
   // There's overlapping responsibility between updateAst and executeAst.
@@ -541,6 +544,7 @@ function defaultSelectionFilter(
   programMemory: ProgramMemory,
   engineCommandManager: EngineCommandManager
 ) {
+  // eslint-disable-next-line @typescript-eslint/no-floating-promises
   programMemory.hasSketchOrExtrudeGroup() &&
     engineCommandManager.sendSceneCommand({
       type: 'modeling_cmd_req',

src/lang/langHelpers.ts

@@ -64,6 +64,7 @@ export async function executeAst({
   try {
     if (!useFakeExecutor) {
       engineCommandManager.endSession()
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
       engineCommandManager.startNewSession()
     }
     const programMemory = await (useFakeExecutor

src/lang/modifyAst.ts

@@ -1,5 +1,5 @@
 import { Selection } from 'lib/selections'
-import { err, trap } from 'lib/trap'
+import { err, reportRejection, trap } from 'lib/trap'
 import {
   Program,
   CallExpression,
@@ -938,115 +938,119 @@ export async function deleteFromSelection(
     const expressionIndex = pathToNode[1][0] as number
     astClone.body.splice(expressionIndex, 1)
     if (extrudeNameToDelete) {
-      await new Promise(async (resolve) => {
+      await new Promise((resolve) => {
-        let currentVariableName = ''
+        ;(async () => {
-        const pathsDependingOnExtrude: Array<{
+          let currentVariableName = ''
-          path: PathToNode
+          const pathsDependingOnExtrude: Array<{
-          sketchName: string
+            path: PathToNode
-        }> = []
+            sketchName: string
-        traverse(astClone, {
+          }> = []
-          leave: (node) => {
+          traverse(astClone, {
-            if (node.type === 'VariableDeclaration') {
+            leave: (node) => {
-              currentVariableName = ''
+              if (node.type === 'VariableDeclaration') {
-            }
+                currentVariableName = ''
-          },
+              }
-          enter: async (node, path) => {
+            },
-            if (node.type === 'VariableDeclaration') {
+            enter: (node, path) => {
-              currentVariableName = node.declarations[0].id.name
+              ;(async () => {
-            }
+                if (node.type === 'VariableDeclaration') {
-            if (
+                  currentVariableName = node.declarations[0].id.name
-              // match startSketchOn(${extrudeNameToDelete})
+                }
-              node.type === 'CallExpression' &&
+                if (
-              node.callee.name === 'startSketchOn' &&
+                  // match startSketchOn(${extrudeNameToDelete})
-              node.arguments[0].type === 'Identifier' &&
+                  node.type === 'CallExpression' &&
-              node.arguments[0].name === extrudeNameToDelete
+                  node.callee.name === 'startSketchOn' &&
-            ) {
+                  node.arguments[0].type === 'Identifier' &&
-              pathsDependingOnExtrude.push({
+                  node.arguments[0].name === extrudeNameToDelete
-                path,
+                ) {
-                sketchName: currentVariableName,
+                  pathsDependingOnExtrude.push({
-              })
+                    path,
-            }
+                    sketchName: currentVariableName,
-          },
+                  })
-        })
+                }
-        const roundLiteral = (x: number) => createLiteral(roundOff(x))
+              })().catch(reportRejection)
-        const modificationDetails: {
+            },
-          parent: PipeExpression['body']
-          faceDetails: Models['FaceIsPlanar_type']
-          lastKey: number
-        }[] = []
-        for (const { path, sketchName } of pathsDependingOnExtrude) {
-          const parent = getNodeFromPath<PipeExpression['body']>(
-            astClone,
-            path.slice(0, -1)
-          )
-          if (err(parent)) {
-            return
-          }
-          const sketchToPreserve = sketchGroupFromKclValue(
-            programMemory.get(sketchName),
-            sketchName
-          )
-          if (err(sketchToPreserve)) return sketchToPreserve
-          console.log('sketchName', sketchName)
-          // Can't kick off multiple requests at once as getFaceDetails
-          // is three engine calls in one and they conflict
-          const faceDetails = await getFaceDetails(sketchToPreserve.on.id)
-          if (
-            !(
-              faceDetails.origin &&
-              faceDetails.x_axis &&
-              faceDetails.y_axis &&
-              faceDetails.z_axis
-            )
-          ) {
-            return
-          }
-          const lastKey = Number(path.slice(-1)[0][0])
-          modificationDetails.push({
-            parent: parent.node,
-            faceDetails,
-            lastKey,
           })
-        }
+          const roundLiteral = (x: number) => createLiteral(roundOff(x))
-        for (const { parent, faceDetails, lastKey } of modificationDetails) {
+          const modificationDetails: {
-          if (
+            parent: PipeExpression['body']
-            !(
+            faceDetails: Models['FaceIsPlanar_type']
-              faceDetails.origin &&
+            lastKey: number
-              faceDetails.x_axis &&
+          }[] = []
-              faceDetails.y_axis &&
+          for (const { path, sketchName } of pathsDependingOnExtrude) {
-              faceDetails.z_axis
+            const parent = getNodeFromPath<PipeExpression['body']>(
+              astClone,
+              path.slice(0, -1)
             )
-          ) {
+            if (err(parent)) {
-            continue
+              return
+            }
+            const sketchToPreserve = sketchGroupFromKclValue(
+              programMemory.get(sketchName),
+              sketchName
+            )
+            if (err(sketchToPreserve)) return sketchToPreserve
+            console.log('sketchName', sketchName)
+            // Can't kick off multiple requests at once as getFaceDetails
+            // is three engine calls in one and they conflict
+            const faceDetails = await getFaceDetails(sketchToPreserve.on.id)
+            if (
+              !(
+                faceDetails.origin &&
+                faceDetails.x_axis &&
+                faceDetails.y_axis &&
+                faceDetails.z_axis
+              )
+            ) {
+              return
+            }
+            const lastKey = Number(path.slice(-1)[0][0])
+            modificationDetails.push({
+              parent: parent.node,
+              faceDetails,
+              lastKey,
+            })
           }
-          parent[lastKey] = createCallExpressionStdLib('startSketchOn', [
+          for (const { parent, faceDetails, lastKey } of modificationDetails) {
-            createObjectExpression({
+            if (
-              plane: createObjectExpression({
+              !(
-                origin: createObjectExpression({
+                faceDetails.origin &&
-                  x: roundLiteral(faceDetails.origin.x),
+                faceDetails.x_axis &&
-                  y: roundLiteral(faceDetails.origin.y),
+                faceDetails.y_axis &&
-                  z: roundLiteral(faceDetails.origin.z),
+                faceDetails.z_axis
-                }),
+              )
-                x_axis: createObjectExpression({
+            ) {
-                  x: roundLiteral(faceDetails.x_axis.x),
+              continue
-                  y: roundLiteral(faceDetails.x_axis.y),
+            }
-                  z: roundLiteral(faceDetails.x_axis.z),
+            parent[lastKey] = createCallExpressionStdLib('startSketchOn', [
-                }),
+              createObjectExpression({
-                y_axis: createObjectExpression({
+                plane: createObjectExpression({
-                  x: roundLiteral(faceDetails.y_axis.x),
+                  origin: createObjectExpression({
-                  y: roundLiteral(faceDetails.y_axis.y),
+                    x: roundLiteral(faceDetails.origin.x),
-                  z: roundLiteral(faceDetails.y_axis.z),
+                    y: roundLiteral(faceDetails.origin.y),
-                }),
+                    z: roundLiteral(faceDetails.origin.z),
-                z_axis: createObjectExpression({
+                  }),
-                  x: roundLiteral(faceDetails.z_axis.x),
+                  x_axis: createObjectExpression({
-                  y: roundLiteral(faceDetails.z_axis.y),
+                    x: roundLiteral(faceDetails.x_axis.x),
-                  z: roundLiteral(faceDetails.z_axis.z),
+                    y: roundLiteral(faceDetails.x_axis.y),
+                    z: roundLiteral(faceDetails.x_axis.z),
+                  }),
+                  y_axis: createObjectExpression({
+                    x: roundLiteral(faceDetails.y_axis.x),
+                    y: roundLiteral(faceDetails.y_axis.y),
+                    z: roundLiteral(faceDetails.y_axis.z),
+                  }),
+                  z_axis: createObjectExpression({
+                    x: roundLiteral(faceDetails.z_axis.x),
+                    y: roundLiteral(faceDetails.z_axis.y),
+                    z: roundLiteral(faceDetails.z_axis.z),
+                  }),
                 }),
               }),
-            }),
+            ])
-          ])
+          }
-        }
+          resolve(true)
-        resolve(true)
+        })().catch(reportRejection)
       })
     }
     // await prom

src/lang/modifyAst/addFillet.test.ts

@@ -36,7 +36,7 @@ beforeAll(async () => {
       setMediaStream: () => {},
       setIsStreamReady: () => {},
       modifyGrid: async () => {},
-      callbackOnEngineLiteConnect: async () => {
+      callbackOnEngineLiteConnect: () => {
         resolve(true)
       },
     })

src/lang/modifyAst/addFillet.ts

@@ -49,6 +49,22 @@ export function applyFilletToSelection(
 ): void | Error {
   // 1. get AST
   let ast = kclManager.ast
+
+  // 2. modify ast clone with fillet and tag
+  const result = modifyAstWithFilletAndTag(ast, selection, radius)
+  if (err(result)) return result
+  const { modifiedAst, pathToFilletNode } = result
+
+  // 3. update ast
+  // eslint-disable-next-line @typescript-eslint/no-floating-promises
+  updateAstAndFocus(modifiedAst, pathToFilletNode)
+}
+
+function modifyAstWithFilletAndTag(
+  ast: Program,
+  selection: Selections,
+  radius: KclCommandValue
+): { modifiedAst: Program; pathToFilletNode: PathToNode } | Error {
   const astResult = insertRadiusIntoAst(ast, radius)
   if (err(astResult)) return astResult
 
@@ -77,8 +93,7 @@ export function applyFilletToSelection(
   if (trap(addFilletResult)) return addFilletResult
   const { modifiedAst, pathToFilletNode } = addFilletResult
 
-  // 4. update ast
+  return { modifiedAst, pathToFilletNode }
-  updateAstAndFocus(modifiedAst, pathToFilletNode)
 }
 
 function insertRadiusIntoAst(

src/lang/std/artifactGraph.test.ts

@@ -124,6 +124,7 @@ beforeAll(async () => {
       setMediaStream: () => {},
       setIsStreamReady: () => {},
       modifyGrid: async () => {},
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
       callbackOnEngineLiteConnect: async () => {
         const cacheEntries = Object.entries(codeToWriteCacheFor) as [
           CodeKey,

src/lang/std/artifactGraph.ts

@@ -3,6 +3,8 @@ import { Models } from '@kittycad/lib'
 import { getNodePathFromSourceRange } from 'lang/queryAst'
 import { err } from 'lib/trap'
 
+export type ArtifactId = string
+
 interface CommonCommandProperties {
   range: SourceRange
   pathToNode: PathToNode
@@ -10,7 +12,7 @@ interface CommonCommandProperties {
 
 export interface PlaneArtifact {
   type: 'plane'
-  pathIds: Array<string>
+  pathIds: Array<ArtifactId>
   codeRef: CommonCommandProperties
 }
 export interface PlaneArtifactRich {
@@ -21,16 +23,16 @@ export interface PlaneArtifactRich {
 
 export interface PathArtifact {
   type: 'path'
-  planeId: string
+  planeId: ArtifactId
-  segIds: Array<string>
+  segIds: Array<ArtifactId>
-  extrusionId: string
+  extrusionId: ArtifactId
-  solid2dId?: string
+  solid2dId?: ArtifactId
   codeRef: CommonCommandProperties
 }
 
 interface solid2D {
   type: 'solid2D'
-  pathId: string
+  pathId: ArtifactId
 }
 export interface PathArtifactRich {
   type: 'path'
@@ -42,10 +44,10 @@ export interface PathArtifactRich {
 
 interface SegmentArtifact {
   type: 'segment'
-  pathId: string
+  pathId: ArtifactId
-  surfaceId: string
+  surfaceId: ArtifactId
-  edgeIds: Array<string>
+  edgeIds: Array<ArtifactId>
-  edgeCutId?: string
+  edgeCutId?: ArtifactId
   codeRef: CommonCommandProperties
 }
 interface SegmentArtifactRich {
@@ -59,9 +61,9 @@ interface SegmentArtifactRich {
 
 interface ExtrusionArtifact {
   type: 'extrusion'
-  pathId: string
+  pathId: ArtifactId
-  surfaceIds: Array<string>
+  surfaceIds: Array<ArtifactId>
-  edgeIds: Array<string>
+  edgeIds: Array<ArtifactId>
   codeRef: CommonCommandProperties
 }
 interface ExtrusionArtifactRich {
@@ -74,23 +76,23 @@ interface ExtrusionArtifactRich {
 
 interface WallArtifact {
   type: 'wall'
-  segId: string
+  segId: ArtifactId
-  edgeCutEdgeIds: Array<string>
+  edgeCutEdgeIds: Array<ArtifactId>
-  extrusionId: string
+  extrusionId: ArtifactId
-  pathIds: Array<string>
+  pathIds: Array<ArtifactId>
 }
 interface CapArtifact {
   type: 'cap'
   subType: 'start' | 'end'
-  edgeCutEdgeIds: Array<string>
+  edgeCutEdgeIds: Array<ArtifactId>
-  extrusionId: string
+  extrusionId: ArtifactId
-  pathIds: Array<string>
+  pathIds: Array<ArtifactId>
 }
 
 interface ExtrudeEdge {
   type: 'extrudeEdge'
-  segId: string
+  segId: ArtifactId
-  extrusionId: string
+  extrusionId: ArtifactId
   subType: 'opposite' | 'adjacent'
 }
 
@@ -98,16 +100,16 @@ interface ExtrudeEdge {
 interface EdgeCut {
   type: 'edgeCut'
   subType: 'fillet' | 'chamfer'
-  consumedEdgeId: string
+  consumedEdgeId: ArtifactId
-  edgeIds: Array<string>
+  edgeIds: Array<ArtifactId>
-  surfaceId: string
+  surfaceId: ArtifactId
   codeRef: CommonCommandProperties
 }
 
 interface EdgeCutEdge {
   type: 'edgeCutEdge'
-  edgeCutId: string
+  edgeCutId: ArtifactId
-  surfaceId: string
+  surfaceId: ArtifactId
 }
 
 export type Artifact =
@@ -122,7 +124,7 @@ export type Artifact =
   | EdgeCutEdge
   | solid2D
 
-export type ArtifactGraph = Map<string, Artifact>
+export type ArtifactGraph = Map<ArtifactId, Artifact>
 
 export type EngineCommand = Models['WebSocketRequest_type']
 
@@ -149,7 +151,7 @@ export function createArtifactGraph({
   responseMap: ResponseMap
   ast: Program
 }) {
-  const myMap = new Map<string, Artifact>()
+  const myMap = new Map<ArtifactId, Artifact>()
 
   /** see docstring for {@link getArtifactsToUpdate} as to why this is needed */
   let currentPlaneId = ''
@@ -166,7 +168,7 @@ export function createArtifactGraph({
     const artifactsToUpdate = getArtifactsToUpdate({
       orderedCommand,
       responseMap,
-      getArtifact: (id: string) => myMap.get(id),
+      getArtifact: (id: ArtifactId) => myMap.get(id),
       currentPlaneId,
       ast,
     })
@@ -224,11 +226,11 @@ export function getArtifactsToUpdate({
   orderedCommand: OrderedCommand
   responseMap: ResponseMap
   /** Passing in a getter because we don't wan this function to update the map directly */
-  getArtifact: (id: string) => Artifact | undefined
+  getArtifact: (id: ArtifactId) => Artifact | undefined
-  currentPlaneId: string
+  currentPlaneId: ArtifactId
   ast: Program
 }): Array<{
-  id: string
+  id: ArtifactId
   artifact: Artifact
 }> {
   const pathToNode = getNodePathFromSourceRange(ast, range)
@@ -514,7 +516,7 @@ export function filterArtifacts<T extends Artifact['type'][]>(
         (!predicate ||
           predicate(value as Extract<Artifact, { type: T[number] }>))
     )
-  ) as Map<string, Extract<Artifact, { type: T[number] }>>
+  ) as Map<ArtifactId, Extract<Artifact, { type: T[number] }>>
 }
 
 export function getArtifactsOfTypes<T extends Artifact['type'][]>(
@@ -528,7 +530,7 @@ export function getArtifactsOfTypes<T extends Artifact['type'][]>(
     predicate?: (value: Extract<Artifact, { type: T[number] }>) => boolean
   },
   map: ArtifactGraph
-): Map<string, Extract<Artifact, { type: T[number] }>> {
+): Map<ArtifactId, Extract<Artifact, { type: T[number] }>> {
   return new Map(
     [...map].filter(
       ([key, value]) =>
@@ -537,7 +539,7 @@ export function getArtifactsOfTypes<T extends Artifact['type'][]>(
         (!predicate ||
           predicate(value as Extract<Artifact, { type: T[number] }>))
     )
-  ) as Map<string, Extract<Artifact, { type: T[number] }>>
+  ) as Map<ArtifactId, Extract<Artifact, { type: T[number] }>>
 }
 
 export function getArtifactOfTypes<T extends Artifact['type'][]>(
@@ -545,7 +547,7 @@ export function getArtifactOfTypes<T extends Artifact['type'][]>(
     key,
     types,
   }: {
-    key: string
+    key: ArtifactId
     types: T
   },
   map: ArtifactGraph
@@ -718,7 +720,7 @@ export function getExtrudeEdgeCodeRef(
 }
 
 export function getExtrusionFromSuspectedExtrudeSurface(
-  id: string,
+  id: ArtifactId,
   artifactGraph: ArtifactGraph
 ): ExtrusionArtifact | Error {
   const artifact = getArtifactOfTypes(
@@ -733,7 +735,7 @@ export function getExtrusionFromSuspectedExtrudeSurface(
 }
 
 export function getExtrusionFromSuspectedPath(
-  id: string,
+  id: ArtifactId,
   artifactGraph: ArtifactGraph
 ): ExtrusionArtifact | Error {
   const path = getArtifactOfTypes({ key: id, types: ['path'] }, artifactGraph)

src/lang/std/engineConnection.ts

@@ -18,6 +18,7 @@ import toast from 'react-hot-toast'
 import { SettingsViaQueryString } from 'lib/settings/settingsTypes'
 import { EXECUTE_AST_INTERRUPT_ERROR_MESSAGE } from 'lib/constants'
 import { KclManager } from 'lang/KclSingleton'
+import { reportRejection } from 'lib/trap'
 
 // TODO(paultag): This ought to be tweakable.
 const pingIntervalMs = 5_000
@@ -388,11 +389,12 @@ class EngineConnection extends EventTarget {
         default:
           if (this.isConnecting()) break
           // Means we never could do an initial connection. Reconnect everything.
-          if (!this.pingPongSpan.ping) this.connect()
+          if (!this.pingPongSpan.ping) this.connect().catch(reportRejection)
           break
       }
     }, pingIntervalMs)
 
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
     this.connect()
   }
 
@@ -1252,6 +1254,10 @@ export type CommandLog =
       type: 'execution-done'
       data: null
     }
+  | {
+      type: 'export-done'
+      data: null
+    }
 
 export enum EngineCommandManagerEvents {
   // engineConnection is available but scene setup may not have run
@@ -1460,6 +1466,7 @@ export class EngineCommandManager extends EventTarget {
       })
     )
 
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
     this.onEngineConnectionOpened = async () => {
       // Set the stream background color
       // This takes RGBA values from 0-1
@@ -1476,6 +1483,7 @@ export class EngineCommandManager extends EventTarget {
 
       // Sets the default line colors
       const opposingTheme = getOppositeTheme(this.settings.theme)
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
       this.sendSceneCommand({
         cmd_id: uuidv4(),
         type: 'modeling_cmd_req',
@@ -1486,6 +1494,7 @@ export class EngineCommandManager extends EventTarget {
       })
 
       // Set the edge lines visibility
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
       this.sendSceneCommand({
         type: 'modeling_cmd_req',
         cmd_id: uuidv4(),
@@ -1496,6 +1505,7 @@ export class EngineCommandManager extends EventTarget {
       })
 
       this._camControlsCameraChange()
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
       this.sendSceneCommand({
         // CameraControls subscribes to default_camera_get_settings response events
         // firing this at connection ensure the camera's are synced initially
@@ -1508,6 +1518,7 @@ export class EngineCommandManager extends EventTarget {
       // We want modify the grid first because we don't want it to flash.
       // Ideally these would already be default hidden in engine (TODO do
       // that) https://github.com/KittyCAD/engine/issues/2282
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
       this.modifyGrid(!this.settings.showScaleGrid)?.then(async () => {
         await this.initPlanes()
         setIsStreamReady(true)
@@ -1711,6 +1722,7 @@ export class EngineCommandManager extends EventTarget {
         this.onEngineConnectionNewTrack as EventListener
       )
 
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
       this.engineConnection?.connect()
     }
     this.engineConnection.addEventListener(
@@ -1918,7 +1930,13 @@ export class EngineCommandManager extends EventTarget {
     } else if (cmd.type === 'export') {
       const promise = new Promise<null>((resolve, reject) => {
         this.pendingExport = {
-          resolve,
+          resolve: (passThrough) => {
+            this.addCommandLog({
+              type: 'export-done',
+              data: null,
+            })
+            resolve(passThrough)
+          },
           reject: (reason: string) => {
             this.exportIntent = null
             reject(reason)
@@ -2115,6 +2133,7 @@ export class EngineCommandManager extends EventTarget {
    * @param visible - whether to show or hide the scale grid
    */
   setScaleGridVisibility(visible: boolean) {
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
     this.modifyGrid(!visible)
   }
 

src/lang/wasm.ts

@@ -360,6 +360,7 @@ export const executor = async (
 ): Promise<ProgramMemory> => {
   if (err(programMemory)) return Promise.reject(programMemory)
 
+  // eslint-disable-next-line @typescript-eslint/no-floating-promises
   engineCommandManager.startNewSession()
   const _programMemory = await _executor(
     node,
@@ -569,6 +570,7 @@ export async function coreDump(
        a new GitHub issue for the user.
      */
     if (openGithubIssue && dump.github_issue_url) {
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
       openWindow(dump.github_issue_url)
     } else {
       console.error(

src/lib/cameraControls.ts

@@ -6,7 +6,7 @@ const META =
   PLATFORM === 'macos' ? 'Cmd' : PLATFORM === 'windows' ? 'Win' : 'Super'
 const ALT = PLATFORM === 'macos' ? 'Option' : 'Alt'
 
-const noModifiersPressed = (e: React.MouseEvent) =>
+const noModifiersPressed = (e: React.MouseEvent | MouseEvent) =>
   !e.ctrlKey && !e.shiftKey && !e.altKey && !e.metaKey
 
 export type CameraSystem =
@@ -53,14 +53,14 @@ export function mouseControlsToCameraSystem(
 
 interface MouseGuardHandler {
   description: string
-  callback: (e: React.MouseEvent) => boolean
+  callback: (e: React.MouseEvent | MouseEvent) => boolean
   lenientDragStartButton?: number
 }
 
 interface MouseGuardZoomHandler {
   description: string
-  dragCallback: (e: React.MouseEvent) => boolean
+  dragCallback: (e: React.MouseEvent | MouseEvent) => boolean
-  scrollCallback: (e: React.MouseEvent) => boolean
+  scrollCallback: (e: React.MouseEvent | MouseEvent) => boolean
   lenientDragStartButton?: number
 }
 
@@ -70,7 +70,7 @@ export interface MouseGuard {
   rotate: MouseGuardHandler
 }
 
-export const btnName = (e: React.MouseEvent) => ({
+export const btnName = (e: React.MouseEvent | MouseEvent) => ({
   middle: !!(e.buttons & 4) || e.button === 1,
   right: !!(e.buttons & 2) || e.button === 2,
   left: !!(e.buttons & 1) || e.button === 0,

src/lib/commandBarConfigs/settingsCommandConfig.ts

@@ -10,7 +10,7 @@ import {
 } from 'lib/settings/settingsTypes'
 import { settingsMachine } from 'machines/settingsMachine'
 import { PathValue } from 'lib/types'
-import { AnyStateMachine, ContextFrom, InterpreterFrom } from 'xstate'
+import { Actor, AnyStateMachine, ContextFrom } from 'xstate'
 import { getPropertyByPath } from 'lib/objectPropertyByPath'
 import { buildCommandArgument } from 'lib/createMachineCommand'
 import decamelize from 'decamelize'
@@ -28,7 +28,7 @@ export const settingsWithCommandConfigs = (
   ) as SettingsPaths[]
 
 const levelArgConfig = <T extends AnyStateMachine = AnyStateMachine>(
-  actor: InterpreterFrom<T>,
+  actor: Actor<T>,
   isProjectAvailable: boolean,
   hideOnLevel?: SettingsLevel
 ): CommandArgument<SettingsLevel, T> => ({
@@ -55,7 +55,7 @@ interface CreateSettingsArgs {
   type: SettingsPaths
   send: Function
   context: ContextFrom<typeof settingsMachine>
-  actor: InterpreterFrom<typeof settingsMachine>
+  actor: Actor<typeof settingsMachine>
   isProjectAvailable: boolean
 }
 
@@ -132,7 +132,7 @@ export function createSettingsCommand({
       if (data !== undefined && data !== null) {
         send({ type: `set.${type}`, data })
       } else {
-        send(type)
+        send({ type })
       }
     },
     args: {

src/lib/commandTypes.ts

@@ -1,11 +1,6 @@
 import { CustomIconName } from 'components/CustomIcon'
 import { AllMachines } from 'hooks/useStateMachineCommands'
-import {
+import { Actor, AnyStateMachine, ContextFrom, EventFrom } from 'xstate'
-  AnyStateMachine,
-  ContextFrom,
-  EventFrom,
-  InterpreterFrom,
-} from 'xstate'
 import { Selection } from './selections'
 import { Identifier, Expr, VariableDeclaration } from 'lang/wasm'
 import { commandBarMachine } from 'machines/commandBarMachine'
@@ -186,7 +181,7 @@ export type CommandArgument<
         machineContext?: ContextFrom<T>
       ) => boolean)
   skip?: boolean
-  machineActor: InterpreterFrom<T>
+  machineActor: Actor<T>
   /** For showing a summary display of the current value, such as in
    *  the command bar's header
    */

src/lib/createMachineCommand.ts

@@ -2,7 +2,7 @@ import {
   AnyStateMachine,
   ContextFrom,
   EventFrom,
-  InterpreterFrom,
+  Actor,
   StateFrom,
 } from 'xstate'
 import { isDesktop } from './isDesktop'
@@ -23,7 +23,7 @@ interface CreateMachineCommandProps<
   groupId: T['id']
   state: StateFrom<T>
   send: Function
-  actor: InterpreterFrom<T>
+  actor: Actor<T>
   commandBarConfig?: StateMachineCommandSetConfig<T, S>
   onCancel?: () => void
 }
@@ -90,9 +90,9 @@ export function createMachineCommand<
     needsReview: commandConfig.needsReview || false,
     onSubmit: (data?: S[typeof type]) => {
       if (data !== undefined && data !== null) {
-        send(type, { data })
+        send({ type, data })
       } else {
-        send(type)
+        send({ type })
       }
     },
   }
@@ -124,7 +124,7 @@ function buildCommandArguments<
 >(
   state: StateFrom<T>,
   args: CommandConfig<T, CommandName, S>['args'],
-  machineActor: InterpreterFrom<T>
+  machineActor: Actor<T>
 ): NonNullable<Command<T, CommandName, S>['args']> {
   const newArgs = {} as NonNullable<Command<T, CommandName, S>['args']>
 
@@ -143,7 +143,7 @@ export function buildCommandArgument<
 >(
   arg: CommandArgumentConfig<O, T>,
   context: ContextFrom<T>,
-  machineActor: InterpreterFrom<T>
+  machineActor: Actor<T>
 ): CommandArgument<O, T> & { inputType: typeof arg.inputType } {
   const baseCommandArgument = {
     description: arg.description,

src/lib/desktop.ts

@@ -8,7 +8,6 @@ import {
   parseProjectSettings,
 } from 'lang/wasm'
 import {
-  DEFAULT_HOST,
   PROJECT_ENTRYPOINT,
   PROJECT_FOLDER,
   PROJECT_SETTINGS_FILE_NAME,
@@ -462,29 +461,60 @@ export const readProjectSettingsFile = async (
  */
 export const readAppSettingsFile = async () => {
   let settingsPath = await getAppSettingsFilePath()
+  const initialProjectDirConfig: DeepPartial<
+    Configuration['settings']['project']
+  > = { directory: await getInitialDefaultDir() }
 
   // The file exists, read it and parse it.
   if (window.electron.exists(settingsPath)) {
     const configToml = await window.electron.readFile(settingsPath)
-    const configObj = parseAppSettings(configToml)
+    const parsedAppConfig = parseAppSettings(configToml)
-    if (err(configObj)) {
+    if (err(parsedAppConfig)) {
-      return Promise.reject(configObj)
+      return Promise.reject(parsedAppConfig)
     }
 
-    return configObj
+    const hasProjectDirectorySetting =
+      parsedAppConfig.settings?.project?.directory ||
+      parsedAppConfig.settings?.app?.project_directory
+
+    if (hasProjectDirectorySetting) {
+      return parsedAppConfig
+    } else {
+      // inject the default project directory setting
+      const mergedConfig: DeepPartial<Configuration> = {
+        ...parsedAppConfig,
+        settings: {
+          ...parsedAppConfig.settings,
+          project: Object.assign(
+            {},
+            parsedAppConfig.settings?.project,
+            initialProjectDirConfig
+          ),
+        },
+      }
+      return mergedConfig
+    }
   }
 
   // The file doesn't exist, create a new one.
-  // This defaultAppConfig is truly an empty object every time.
   const defaultAppConfig = defaultAppSettings()
   if (err(defaultAppConfig)) {
     return Promise.reject(defaultAppConfig)
   }
-  const initialDirConfig: DeepPartial<Configuration> = {
+
-    settings: { project: { directory: await getInitialDefaultDir() } },
+  // inject the default project directory setting
+  const mergedDefaultConfig: DeepPartial<Configuration> = {
+    ...defaultAppConfig,
+    settings: {
+      ...defaultAppConfig.settings,
+      project: Object.assign(
+        {},
+        defaultAppConfig.settings?.project,
+        initialProjectDirConfig
+      ),
+    },
   }
-  const config = Object.assign(defaultAppConfig, initialDirConfig)
+  return mergedDefaultConfig
-  return config
 }
 
 export const writeAppSettingsFile = async (tomlStr: string) => {
@@ -525,28 +555,6 @@ export const getUser = async (
   token: string,
   hostname: string
 ): Promise<Models['User_type']> => {
-  // Use the host passed in if it's set.
-  // Otherwise, use the default host.
-  const host = !hostname ? DEFAULT_HOST : hostname
-
-  // Change the baseURL to the one we want.
-  let baseurl = host
-  if (!(host.indexOf('http://') === 0) && !(host.indexOf('https://') === 0)) {
-    baseurl = `https://${host}`
-    if (host.indexOf('localhost') === 0) {
-      baseurl = `http://${host}`
-    }
-  }
-
-  // Use kittycad library to fetch the user info from /user/me
-  if (baseurl !== DEFAULT_HOST) {
-    // The TypeScript generated library uses environment variables for this
-    // because it was intended for NodeJS.
-    // Needs to stay like this because window.electron.kittycad needs it
-    // internally.
-    window.electron.setBaseUrl(baseurl)
-  }
-
   try {
     const user = await window.electron.kittycad('users.get_user_self', {
       client: { token },

src/lib/exportSave.ts

@@ -14,7 +14,7 @@ const save_ = async (file: ModelingAppFile) => {
         extensions.push(extension)
       }
 
-      if (!(window as any).playwrightSkipFilePicker) {
+      if (window.electron.process.env.IS_PLAYWRIGHT) {
         // skip file picker, save to default location
         await window.electron.writeFile(
           file.name,

src/lib/machineManager.ts

@@ -1,5 +1,7 @@
 import { isDesktop } from './isDesktop'
 import { components } from './machine-api'
+import { reportRejection } from './trap'
+import { toSync } from './utils'
 
 export type MachinesListing = Array<
   components['schemas']['MachineInfoResponse']
@@ -17,7 +19,7 @@ export class MachineManager {
       return
     }
 
-    this.updateMachines()
+    this.updateMachines().catch(reportRejection)
   }
 
   start() {
@@ -31,11 +33,14 @@ export class MachineManager {
     let timeoutId: ReturnType<typeof setTimeout> | undefined = undefined
     const timeoutLoop = () => {
       clearTimeout(timeoutId)
-      timeoutId = setTimeout(async () => {
+      timeoutId = setTimeout(
-        await this.updateMachineApiIp()
+        toSync(async () => {
-        await this.updateMachines()
+          await this.updateMachineApiIp()
-        timeoutLoop()
+          await this.updateMachines()
-      }, 10000)
+          timeoutLoop()
+        }, reportRejection),
+        10000
+      )
     }
     timeoutLoop()
   }