Cut release v0.21.0 (#2334 )

Bump kittycad-modeling-cmds from 0.2.23 to 0.2.24 in /src/wasm-lib (#2330 )
Bumps [kittycad-modeling-cmds](https://github.com/KittyCAD/modeling-api) from 0.2.23 to 0.2.24. - [Commits](https://github.com/KittyCAD/modeling-api/compare/kittycad-modeling-cmds-0.2.23...kittycad-modeling-cmds-0.2.24) --- updated-dependencies: - dependency-name: kittycad-modeling-cmds dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-05-10 16:23:04 -04:00 · 2024-05-09 11:38:43 -07:00 · 2024-05-09 08:38:42 -04:00 · 2024-05-09 15:38:04 +10:00 · 2024-05-09 15:04:33 +10:00 · 2024-05-08 10:56:37 -07:00
73 changed files with 739 additions and 338 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -239,8 +239,8 @@ jobs:
          includeDebug: true
          args: "${{ env.TAURI_ARGS_MACOS }} ${{ env.TAURI_ARGS_UBUNTU }}"

-      - name: Mac App Store
-        if: ${{ env.BUILD_RELEASE == 'true' && matrix.os == 'macos-14' }}
+      - name: Build for Mac TestFlight (nightly)
+        if: ${{ github.event_name == 'schedule' && matrix.os == 'macos-14' }}
        shell: bash
        run: |
          unset APPLE_SIGNING_IDENTITY
@ -302,9 +302,9 @@ jobs:
          APPLE_STORE_P12_PASSWORD: ${{ secrets.APPLE_STORE_P12_PASSWORD }}


-      - name: 'Upload app to TestFlight'
+      - name: 'Upload to Mac TestFlight (nightly)'
        uses: apple-actions/upload-testflight-build@v1
-        if: ${{ env.BUILD_RELEASE == 'true' && matrix.os == 'macos-14' }}
+        if: ${{ github.event_name == 'schedule' && matrix.os == 'macos-14' }}
        with:
          app-path: 'src-tauri/target/universal-apple-darwin/release/bundle/macos/Zoo Modeling App.pkg'
          issuer-id: ${{ secrets.APPLE_STORE_ISSUER_ID }}
@ -313,8 +313,8 @@ jobs:
          app-type: osx


-      - name: Clean up after Mac App Store
-        if: ${{ env.BUILD_RELEASE == 'true' && matrix.os == 'macos-14' }}
+      - name: Clean up after Mac TestFlight (nightly)
+        if: ${{ github.event_name == 'schedule' && matrix.os == 'macos-14' }}
        shell: bash
        run: |
          git status
@ -354,7 +354,7 @@ jobs:
          path: "${{ env.PREFIX }}/${{ env.MODE }}/bundle/*/*"

      - name: Run e2e tests (linux only)
-        if: matrix.os == 'ubuntu-latest'
+        if: ${{ matrix.os == 'ubuntu-latest' && github.event_name != 'release' && github.event_name != 'schedule' }}
        run: |
          cargo install tauri-driver --force
          source .env.${{ env.BUILD_RELEASE == 'true' && 'production' || 'development' }}
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@ -17,11 +17,11 @@ jobs:
        name: Read Cut release PR info and create release
        with:
          script: |
-            const { owner, repo, sha } = context.repo
+            const { owner, repo } = context.repo
            const pulls = await github.rest.repos.listPullRequestsAssociatedWithCommit({
              owner,
              repo,
-              commit_sha: sha,
+              commit_sha: context.sha,
            })
            const { title, body } = pulls.data[0]
            const version = title.split('Cut release ')[1]
--- a/docs/kcl/arc.md
+++ b/docs/kcl/arc.md
--- a/e2e/playwright/flow-tests.spec.ts
+++ b/e2e/playwright/flow-tests.spec.ts
@ -12,6 +12,7 @@ import {
  TEST_SETTINGS_ONBOARDING_START,
 } from './storageStates'
 import * as TOML from '@iarna/toml'
+import { Coords2d } from 'lang/std/sketch'

 /*
 debug helper: unfortunately we do rely on exact coord mouse clicks in a few places
@ -528,6 +529,10 @@ test.describe('Can create sketches on all planes and their back sides', () => {
 })

 test('Auto complete works', async ({ page }) => {
+  test.skip(
+    true,
+    'CORS issue stopping the kcl lsp from working, enable again later'
+  )
  const u = getUtils(page)
  // const PUR = 400 / 37.5 //pixeltoUnitRatio
  await page.setViewportSize({ width: 1200, height: 500 })
@ -950,9 +955,8 @@ test.describe('Command bar tests', () => {
    let cmdSearchBar = page.getByPlaceholder('Search commands')

    // First try opening the command bar and closing it
-    // It has a different label on mac and windows/linux, "Meta+K" and "Ctrl+/" respectively
    await page
-      .getByRole('button', { name: 'Ctrl+/' })
+      .getByRole('button', { name: 'Commands', exact: false })
      .or(page.getByRole('button', { name: '⌘K' }))
      .click()
    await expect(cmdSearchBar).toBeVisible()
@ -997,13 +1001,13 @@ test.describe('Command bar tests', () => {
      localStorage.setItem(
        'persistCode',
        `const distance = sqrt(20)
-        const part001 = startSketchOn('-XZ')
-  |> startProfileAt([-6.95, 4.98], %)
-  |> line([25.1, 0.41], %)
-  |> line([0.73, -14.93], %)
-  |> line([-23.44, 0.52], %)
-  |> close(%)
-        `
+      const part001 = startSketchOn('-XZ')
+      |> startProfileAt([-6.95, 10.98], %)
+      |> line([25.1, 0.41], %)
+      |> line([0.73, -20.93], %)
+      |> line([-23.44, 0.52], %)
+      |> close(%)
+          `
      )
    })

@ -1020,7 +1024,6 @@ test.describe('Command bar tests', () => {
      page.getByRole('button', { name: 'Start Sketch' })
    ).not.toBeDisabled()
    await u.clearCommandLogs()
-    await page.getByText('|> line([0.73, -14.93], %)').click()
    await page.getByRole('button', { name: 'Extrude' }).isEnabled()

    let cmdSearchBar = page.getByPlaceholder('Search commands')
@ -1030,6 +1033,12 @@ test.describe('Command bar tests', () => {
    // Search for extrude command and choose it
    await page.getByRole('option', { name: 'Extrude' }).click()

+    // Assert that we're on the selection step
+    await expect(page.getByRole('button', { name: 'selection' })).toBeDisabled()
+    // Select a face
+    await page.mouse.move(700, 200)
+    await page.mouse.click(700, 200)
+
    // Assert that we're on the distance step
    await expect(page.getByRole('button', { name: 'distance' })).toBeDisabled()

@ -1063,9 +1072,9 @@ test.describe('Command bar tests', () => {
      `const distance = sqrt(20)
 const distance001 = 5 + 7
 const part001 = startSketchOn('-XZ')
-    |> startProfileAt([-6.95, 4.98], %)
+    |> startProfileAt([-6.95, 10.98], %)
    |> line([25.1, 0.41], %)
-    |> line([0.73, -14.93], %)
+    |> line([0.73, -20.93], %)
    |> line([-23.44, 0.52], %)
    |> close(%)
    |> extrude(distance001, %)`.replace(/(\r\n|\n|\r)/gm, '') // remove newlines
@ -1256,6 +1265,72 @@ test('ProgramMemory can be serialised', async ({ page }) => {
  })
 })

+test('Hovering over 3d features highlights code', async ({ page }) => {
+  const u = getUtils(page)
+  await page.addInitScript(async () => {
+    localStorage.setItem(
+      'persistCode',
+      `const part001 = startSketchOn('-XZ')
+  |> startProfileAt([20, 0], %)
+  |> line([7.13, 4 + 0], %)
+  |> angledLine({ angle: 3 + 0, length: 3.14 + 0 }, %)
+  |> lineTo([20.14 + 0, -0.14 + 0], %)
+  |> xLineTo(29 + 0, %)
+  |> yLine(-3.14 + 0, %, 'a')
+  |> xLine(1.63, %)
+  |> angledLineOfXLength({ angle: 3 + 0, length: 3.14 }, %)
+  |> angledLineOfYLength({ angle: 30, length: 3 + 0 }, %)
+  |> angledLineToX({ angle: 22.14 + 0, to: 12 }, %)
+  |> angledLineToY({ angle: 30, to: 11.14 }, %)
+  |> angledLineThatIntersects({
+        angle: 3.14,
+        intersectTag: 'a',
+        offset: 0
+      }, %)
+  |> tangentialArcTo([13.14 + 0, 13.14], %)
+  |> close(%)
+  |> extrude(5 + 7, %)    
+`
+    )
+  })
+  await page.setViewportSize({ width: 1000, height: 500 })
+  await page.goto('/')
+  await u.waitForAuthSkipAppStart()
+
+  const extrusionTop: Coords2d = [800, 240]
+  const flatExtrusionFace: Coords2d = [960, 160]
+  const arc: Coords2d = [840, 160]
+  const close: Coords2d = [720, 200]
+  const nothing: Coords2d = [600, 200]
+
+  await page.mouse.move(nothing[0], nothing[1])
+  await page.mouse.click(nothing[0], nothing[1])
+
+  await expect(page.getByTestId('hover-highlight')).not.toBeVisible()
+  await page.waitForTimeout(200)
+
+  await page.mouse.move(extrusionTop[0], extrusionTop[1])
+  await expect(page.getByTestId('hover-highlight')).toBeVisible()
+  await page.mouse.move(nothing[0], nothing[1])
+  await expect(page.getByTestId('hover-highlight')).not.toBeVisible()
+
+  await page.mouse.move(arc[0], arc[1])
+  await expect(page.getByTestId('hover-highlight')).toBeVisible()
+  await page.mouse.move(nothing[0], nothing[1])
+  await expect(page.getByTestId('hover-highlight')).not.toBeVisible()
+
+  await page.mouse.move(close[0], close[1])
+  await expect(page.getByTestId('hover-highlight')).toBeVisible()
+  await page.mouse.move(nothing[0], nothing[1])
+  await expect(page.getByTestId('hover-highlight')).not.toBeVisible()
+
+  await page.mouse.move(flatExtrusionFace[0], flatExtrusionFace[1])
+  await expect(page.getByTestId('hover-highlight')).toHaveCount(5) // multiple lines
+  await page.mouse.move(nothing[0], nothing[1])
+  await page.waitForTimeout(100)
+  await expect(page.getByTestId('hover-highlight')).not.toBeVisible()
+})
+
 test("Various pipe expressions should and shouldn't allow edit and or extrude", async ({
  page,
 }) => {
@ -1390,7 +1465,7 @@ test('Deselecting line tool should mean nothing happens on click', async ({
    `const part001 = startSketchOn('-XZ')`
  )

-  await page.waitForTimeout(300)
+  await page.waitForTimeout(600)

  let previousCodeContent = await page.locator('.cm-content').innerText()

--- a/e2e/playwright/snapshot-tests.spec.ts
+++ b/e2e/playwright/snapshot-tests.spec.ts
@ -507,7 +507,7 @@ test('Draft rectangles should look right', async ({ page, context }) => {
    `const part001 = startSketchOn('-XZ')`
  )

-  await page.waitForTimeout(300) // TODO detect animation ending, or disable animation
+  await page.waitForTimeout(500) // TODO detect animation ending, or disable animation
  await u.closeDebugPanel()

  const startXPx = 600
@ -597,12 +597,15 @@ test.describe('Client side scene scale should match engine scale', () => {

    // exit sketch
    await u.openAndClearDebugPanel()
-    await page.getByRole('button', { name: 'Exit Sketch' }).click()
+    await u.doAndWaitForImageDiff(
+      () => page.getByRole('button', { name: 'Exit Sketch' }).click(),
+      200
+    )

    // wait for execution done
    await u.expectCmdLog('[data-message-type="execution-done"]')
    await u.clearAndCloseDebugPanel()
-    await page.waitForTimeout(200)
+    await page.waitForTimeout(300)

    // second screen shot should look almost identical, i.e. scale should be the same.
    await expect(page).toHaveScreenshot({
@ -696,12 +699,15 @@ test.describe('Client side scene scale should match engine scale', () => {

    // exit sketch
    await u.openAndClearDebugPanel()
-    await page.getByRole('button', { name: 'Exit Sketch' }).click()
+    await u.doAndWaitForImageDiff(
+      () => page.getByRole('button', { name: 'Exit Sketch' }).click(),
+      200
+    )

    // wait for execution done
    await u.expectCmdLog('[data-message-type="execution-done"]')
    await u.clearAndCloseDebugPanel()
-    await page.waitForTimeout(200)
+    await page.waitForTimeout(300)

    // second screen shot should look almost identical, i.e. scale should be the same.
    await expect(page).toHaveScreenshot({
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Client-side-scene-scale-should-match-engine-scale-Inch-scale-1-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Client-side-scene-scale-should-match-engine-scale-Inch-scale-1-Google-Chrome-linux.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Client-side-scene-scale-should-match-engine-scale-Inch-scale-2-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Client-side-scene-scale-should-match-engine-scale-Inch-scale-2-Google-Chrome-linux.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Client-side-scene-scale-should-match-engine-scale-Millimeter-scale-1-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Client-side-scene-scale-should-match-engine-scale-Millimeter-scale-1-Google-Chrome-linux.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Client-side-scene-scale-should-match-engine-scale-Millimeter-scale-2-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Client-side-scene-scale-should-match-engine-scale-Millimeter-scale-2-Google-Chrome-linux.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-rectangles-should-look-right-1-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-rectangles-should-look-right-1-Google-Chrome-linux.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-1-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-1-Google-Chrome-linux.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-2-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-2-Google-Chrome-linux.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Sketch-on-face-with-none-z-up-1-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Sketch-on-face-with-none-z-up-1-Google-Chrome-linux.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable--XY-1-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable--XY-1-Google-Chrome-linux.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable--XZ-1-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable--XZ-1-Google-Chrome-linux.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable--YZ-1-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable--YZ-1-Google-Chrome-linux.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable-XY-1-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable-XY-1-Google-Chrome-linux.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable-XZ-1-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable-XZ-1-Google-Chrome-linux.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable-YZ-1-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable-YZ-1-Google-Chrome-linux.png
--- a/index.html
+++ b/index.html
@ -15,7 +15,7 @@
    <script
      defer
      data-domain="app.zoo.dev"
-      src="https://plausible.corp.zoo.dev/js/script.js"
+      src="https://plausible.corp.zoo.dev/js/script.tagged-events.js"
    ></script>
    <title>Zoo Modeling App</title>
  </head>
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "untitled-app",
-  "version": "0.20.0",
+  "version": "0.21.0",
  "private": true,
  "dependencies": {
    "@codemirror/autocomplete": "^6.16.0",
@ -10,7 +10,7 @@
    "@fortawesome/react-fontawesome": "^0.2.0",
    "@headlessui/react": "^1.7.19",
    "@headlessui/tailwindcss": "^0.2.0",
-    "@kittycad/lib": "^0.0.58",
+    "@kittycad/lib": "^0.0.60",
    "@lezer/javascript": "^1.4.9",
    "@open-rpc/client-js": "^1.8.1",
    "@react-hook/resize-observer": "^1.2.6",
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@ -38,6 +38,17 @@ dependencies = [
 "cpufeatures",
 ]

+[[package]]
+name = "ahash"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
+dependencies = [
+ "getrandom 0.2.14",
+ "once_cell",
+ "version_check",
+]
+
 [[package]]
 name = "ahash"
 version = "0.8.11"
@ -81,6 +92,24 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"

+[[package]]
+name = "android_log-sys"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937"
+
+[[package]]
+name = "android_logger"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c494134f746c14dc653a35a4ea5aca24ac368529da5370ecf41fe0341c35772f"
+dependencies = [
+ "android_log-sys",
+ "env_logger",
+ "log",
+ "once_cell",
+]
+
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@ -154,6 +183,7 @@ dependencies = [
 "anyhow",
 "kcl-lib",
 "kittycad",
+ "log",
 "oauth2",
 "serde_json",
 "tauri",
@ -163,6 +193,7 @@ dependencies = [
 "tauri-plugin-dialog",
 "tauri-plugin-fs",
 "tauri-plugin-http",
+ "tauri-plugin-log",
 "tauri-plugin-os",
 "tauri-plugin-process",
 "tauri-plugin-shell",
@ -181,6 +212,12 @@ dependencies = [
 "num-traits",
 ]

+[[package]]
+name = "arrayvec"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+
 [[package]]
 name = "ashpd"
 version = "0.8.1"
@ -507,6 +544,30 @@ dependencies = [
 "tracing",
 ]

+[[package]]
+name = "borsh"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbe5b10e214954177fb1dc9fbd20a1a2608fe99e6c832033bdc7cea287a20d77"
+dependencies = [
+ "borsh-derive",
+ "cfg_aliases 0.1.1",
+]
+
+[[package]]
+name = "borsh-derive"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7a8646f94ab393e43e8b35a2558b1624bed28b97ee09c5d15456e3c9463f46d"
+dependencies = [
+ "once_cell",
+ "proc-macro-crate 3.1.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+ "syn_derive",
+]
+
 [[package]]
 name = "brotli"
 version = "3.5.0"
@ -534,7 +595,7 @@ version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d43b38e074cc0de2957f10947e376a1d88b9c4dbab340b590800cc1b2e066b2"
 dependencies = [
- "ahash",
+ "ahash 0.8.11",
 "base64 0.13.1",
 "bitvec",
 "chrono",
@ -556,6 +617,39 @@ version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"

+[[package]]
+name = "byte-unit"
+version = "5.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ac19bdf0b2665407c39d82dbc937e951e7e2001609f0fb32edd0af45a2d63e"
+dependencies = [
+ "rust_decimal",
+ "serde",
+ "utf8-width",
+]
+
+[[package]]
+name = "bytecheck"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2"
+dependencies = [
+ "bytecheck_derive",
+ "ptr_meta",
+ "simdutf8",
+]
+
+[[package]]
+name = "bytecheck_derive"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "bytemuck"
 version = "1.15.0"
@ -1294,6 +1388,16 @@ dependencies = [
 "syn 2.0.60",
 ]

+[[package]]
+name = "env_logger"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
+dependencies = [
+ "log",
+ "regex",
+]
+
 [[package]]
 name = "equivalent"
 version = "1.0.1"
@ -1367,6 +1471,15 @@ dependencies = [
 "simd-adler32",
 ]

+[[package]]
+name = "fern"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee"
+dependencies = [
+ "log",
+]
+
 [[package]]
 name = "field-offset"
 version = "0.3.6"
@ -1964,6 +2077,9 @@ name = "hashbrown"
 version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+dependencies = [
+ "ahash 0.7.8",
+]

 [[package]]
 name = "hashbrown"
@ -2420,7 +2536,7 @@ dependencies = [

 [[package]]
 name = "kcl-lib"
-version = "0.1.53"
+version = "0.1.54"
 dependencies = [
 "anyhow",
 "approx",
@ -2479,9 +2595,9 @@ dependencies = [

 [[package]]
 name = "kittycad"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddc922f0da3abc22661bf49423c9bfcc02ce6ae92dae007ede6990874789545b"
+checksum = "2c6e12eb45fd9a28c8e99dbdef54556246b39acee14e4aa6f0fc43636caa62d9"
 dependencies = [
 "anyhow",
 "async-trait",
@ -2658,6 +2774,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 dependencies = [
 "serde",
+ "value-bag",
 ]

 [[package]]
@ -2970,6 +3087,15 @@ dependencies = [
 "syn 1.0.109",
 ]

+[[package]]
+name = "num_threads"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "oauth2"
 version = "4.4.2"
@ -3619,6 +3745,26 @@ dependencies = [
 "unicode-ident",
 ]

+[[package]]
+name = "ptr_meta"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1"
+dependencies = [
+ "ptr_meta_derive",
+]
+
+[[package]]
+name = "ptr_meta_derive"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "quick-xml"
 version = "0.31.0"
@ -3836,6 +3982,15 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"

+[[package]]
+name = "rend"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c"
+dependencies = [
+ "bytecheck",
+]
+
 [[package]]
 name = "reqwest"
 version = "0.11.27"
@ -4044,6 +4199,35 @@ dependencies = [
 "windows-sys 0.52.0",
 ]

+[[package]]
+name = "rkyv"
+version = "0.7.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0"
+dependencies = [
+ "bitvec",
+ "bytecheck",
+ "bytes",
+ "hashbrown 0.12.3",
+ "ptr_meta",
+ "rend",
+ "rkyv_derive",
+ "seahash",
+ "tinyvec",
+ "uuid",
+]
+
+[[package]]
+name = "rkyv_derive"
+version = "0.7.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "ropey"
 version = "1.6.1"
@ -4054,6 +4238,22 @@ dependencies = [
 "str_indices",
 ]

+[[package]]
+name = "rust_decimal"
+version = "1.35.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a"
+dependencies = [
+ "arrayvec",
+ "borsh",
+ "bytes",
+ "num-traits",
+ "rand 0.8.5",
+ "rkyv",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.23"
@ -4249,6 +4449,12 @@ dependencies = [
 "untrusted",
 ]

+[[package]]
+name = "seahash"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
+
 [[package]]
 name = "security-framework"
 version = "2.10.0"
@ -4537,6 +4743,12 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"

+[[package]]
+name = "simdutf8"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
+
 [[package]]
 name = "siphasher"
 version = "0.3.11"
@ -4794,6 +5006,18 @@ dependencies = [
 "unicode-ident",
 ]

+[[package]]
+name = "syn_derive"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b"
+dependencies = [
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+]
+
 [[package]]
 name = "sync_wrapper"
 version = "0.1.2"
@ -4938,9 +5162,9 @@ dependencies = [

 [[package]]
 name = "tauri"
-version = "2.0.0-beta.16"
+version = "2.0.0-beta.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d411ebb670bbe5cf948f6c24978632937329748b499de1619ab55ad31512652"
+checksum = "5fedd5490eddf117253945f0baedafded43474c971cba546a818f527d5c26266"
 dependencies = [
 "anyhow",
 "bytes",
@ -4952,7 +5176,7 @@ dependencies = [
 "getrandom 0.2.14",
 "glob",
 "gtk",
- "heck 0.4.1",
+ "heck 0.5.0",
 "http 1.1.0",
 "jni",
 "libc",
@ -5153,6 +5377,27 @@ dependencies = [
 "urlpattern",
 ]

+[[package]]
+name = "tauri-plugin-log"
+version = "2.0.0-beta.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97718db0d981b03b7b1257c22f699ff46639220c5acb4510ac9696437afc93f8"
+dependencies = [
+ "android_logger",
+ "byte-unit",
+ "cocoa",
+ "fern",
+ "log",
+ "objc",
+ "serde",
+ "serde_json",
+ "serde_repr",
+ "swift-rs",
+ "tauri",
+ "tauri-plugin",
+ "time",
+]
+
 [[package]]
 name = "tauri-plugin-os"
 version = "2.0.0-beta.3"
@ -5231,9 +5476,9 @@ dependencies = [

 [[package]]
 name = "tauri-runtime"
-version = "2.0.0-beta.13"
+version = "2.0.0-beta.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7439729d0107c9797764919c39c4a4cc3af64306faaa48271da50d8eb4c0283"
+checksum = "148b6e6aff8e63fe5d4ae1d50159d50cfc0b4309abdeca64833c887c6b5631ef"
 dependencies = [
 "dpi",
 "gtk",
@ -5250,9 +5495,9 @@ dependencies = [

 [[package]]
 name = "tauri-runtime-wry"
-version = "2.0.0-beta.13"
+version = "2.0.0-beta.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c38dcfa7f8c2b2e344c7401972e0ddaaec4fa655666788d94b1852d6c4a7fe8"
+checksum = "398d065c6e0fbf3c4304583759b6e153bc1e0daeb033bede6834ebe4df371fc3"
 dependencies = [
 "cocoa",
 "gtk",
@ -5393,7 +5638,9 @@ checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
 dependencies = [
 "deranged",
 "itoa 1.0.11",
+ "libc",
 "num-conv",
+ "num_threads",
 "powerfmt",
 "serde",
 "time-core",
@ -5963,6 +6210,12 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"

+[[package]]
+name = "utf8-width"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.1"
@ -6017,6 +6270,12 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"

+[[package]]
+name = "value-bag"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101"
+
 [[package]]
 name = "version-compare"
 version = "0.2.0"
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@ -17,6 +17,7 @@ tauri-build = { version = "2.0.0-beta.13", features = [] }
 anyhow = "1"
 kcl-lib = { version = "0.1.53", path = "../src/wasm-lib/kcl" }
 kittycad = "0.3.0"
+log = "0.4.21"
 oauth2 = "4.4.2"
 serde_json = "1.0"
 tauri = { version = "2.0.0-beta.15", features = [ "devtools", "unstable"] }
@ -25,6 +26,7 @@ tauri-plugin-deep-link = { version = "2.0.0-beta.3" }
 tauri-plugin-dialog = { version = "2.0.0-beta.6" }
 tauri-plugin-fs = { version = "2.0.0-beta.6" }
 tauri-plugin-http = { version = "2.0.0-beta.6" }
+tauri-plugin-log = { version = "2.0.0-beta.4" }
 tauri-plugin-os = { version = "2.0.0-beta.2" }
 tauri-plugin-process = { version = "2.0.0-beta.2" }
 tauri-plugin-shell = { version = "2.0.0-beta.2" }
--- a/src-tauri/capabilities/desktop.json
+++ b/src-tauri/capabilities/desktop.json
@ -9,6 +9,7 @@
  "permissions": [
    "cli:default",
    "deep-link:default",
+    "log:default",
    "path:default",
    "event:default",
    "window:default",
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@ -226,7 +226,7 @@ async fn read_dir_recursive(path: &str) -> Result<FileEntry, InvokeError> {
 /// The string returned from this method is the access token.
 #[tauri::command]
 async fn login(app: tauri::AppHandle, host: &str) -> Result<String, InvokeError> {
-    println!("Logging in...");
+    log::debug!("Logging in...");
    // Do an OAuth 2.0 Device Authorization Grant dance to get a token.
    let device_auth_url = oauth2::DeviceAuthorizationUrl::new(format!("{host}/oauth2/device/auth"))
        .map_err(|e| InvokeError::from_anyhow(e.into()))?;
@ -265,7 +265,7 @@ async fn login(app: tauri::AppHandle, host: &str) -> Result<String, InvokeError>
    // and bypass the shell::open call as it fails on GitHub Actions.
    let e2e_tauri_enabled = env::var("E2E_TAURI_ENABLED").is_ok();
    if e2e_tauri_enabled {
-        println!("E2E_TAURI_ENABLED is set, won't open {} externally", auth_uri.secret());
+        log::warn!("E2E_TAURI_ENABLED is set, won't open {} externally", auth_uri.secret());
        tokio::fs::write("/tmp/kittycad_user_code", details.user_code().secret())
            .await
            .map_err(|e| InvokeError::from_anyhow(e.into()))?;
@ -308,7 +308,7 @@ async fn get_user(token: &str, hostname: &str) -> Result<kittycad::types::User,
            baseurl = format!("http://{host}")
        }
    }
-    println!("Getting user info...");
+    log::debug!("Getting user info...");

    // use kittycad library to fetch the user info from /user/me
    let mut client = kittycad::Client::new(token);
@ -352,10 +352,12 @@ fn show_in_folder(path: &str) -> Result<(), InvokeError> {

 #[allow(dead_code)]
 fn open_url_sync(app: &tauri::AppHandle, url: &url::Url) {
-    println!("Opening URL: {:?}", url);
+    log::debug!("Opening URL: {:?}", url);
    let cloned_url = url.clone();
    let runner: tauri::async_runtime::JoinHandle<Result<ProjectState>> = tauri::async_runtime::spawn(async move {
-        let url_str = cloned_url.to_string();
+        let url_str = cloned_url.path().to_string();
+
+        log::debug!("Opening URL path : {}", url_str);
        let path = Path::new(url_str.as_str());
        ProjectState::new_from_path(path.to_path_buf()).await
    });
@ -367,10 +369,10 @@ fn open_url_sync(app: &tauri::AppHandle, url: &url::Url) {
            app.manage(state::Store::new(store));
        }
        Err(e) => {
-            println!("Error opening URL:{} {:?}", url, e);
+            log::warn!("Error opening URL:{} {:?}", url, e);
        }
        Ok(Err(e)) => {
-            println!("Error opening URL:{} {:?}", url, e);
+            log::warn!("Error opening URL:{} {:?}", url, e);
        }
    }
 }
@ -400,6 +402,15 @@ fn main() -> Result<()> {
        .plugin(tauri_plugin_dialog::init())
        .plugin(tauri_plugin_fs::init())
        .plugin(tauri_plugin_http::init())
+        .plugin(
+            tauri_plugin_log::Builder::new()
+                .targets([
+                    tauri_plugin_log::Target::new(tauri_plugin_log::TargetKind::Stdout),
+                    tauri_plugin_log::Target::new(tauri_plugin_log::TargetKind::LogDir { file_name: None }),
+                ])
+                .level(log::LevelFilter::Debug)
+                .build(),
+        )
        .plugin(tauri_plugin_os::init())
        .plugin(tauri_plugin_process::init())
        .plugin(tauri_plugin_shell::init())
@ -435,7 +446,7 @@ fn main() -> Result<()> {
                    if let Some(source_arg) = matches.args.get("source") {
                        // We don't do an else here because this can be null.
                        if let Some(value) = source_arg.value.as_str() {
-                            println!("Got path in cli argument: {}", value);
+                            log::info!("Got path in cli argument: {}", value);
                            source_path = Some(Path::new(value).to_path_buf());
                        }
                    }
@ -446,7 +457,7 @@ fn main() -> Result<()> {
            }

            if verbose {
-                println!("Verbose mode enabled.");
+                log::debug!("Verbose mode enabled.");
            }

            // If we have a source path to open, make sure it exists.
@ -476,7 +487,7 @@ fn main() -> Result<()> {

            // Listen on the deep links.
            app.listen("deep-link://new-url", |event| {
-                println!("got deep-link url: {:?}", event);
+                log::info!("got deep-link url: {:?}", event);
                // TODO: open_url_sync(app.handle(), event.url);
            });

@ -488,10 +499,7 @@ fn main() -> Result<()> {
            |app, event| {
                #[cfg(any(target_os = "macos", target_os = "ios"))]
                if let tauri::RunEvent::Opened { urls } = event {
-                    if let Some(w) = app.get_webview_window("main") {
-                        let _ = w.eval(&format!("console.log(`[tauri] Opened URLs: {:?}`)", urls));
-                    }
-                    println!("Opened URLs: {:?}", urls);
+                    log::info!("Opened URLs: {:?}", urls);

                    // Handle the first URL.
                    // TODO: do we want to handle more than one URL?
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@ -37,8 +37,7 @@
      }
    },
    "longDescription": "",
-    "macOS": {
-    },
+    "macOS": {},
    "resources": [],
    "shortDescription": "",
    "targets": "all"
@ -75,5 +74,5 @@
    }
  },
  "productName": "Zoo Modeling App",
-  "version": "0.20.0"
+  "version": "0.21.0"
 }
--- a/src/Toolbar.tsx
+++ b/src/Toolbar.tsx
@ -4,7 +4,6 @@ import { engineCommandManager, kclManager } from 'lib/singletons'
 import { useModelingContext } from 'hooks/useModelingContext'
 import { useCommandsContext } from 'hooks/useCommandsContext'
 import { ActionButton } from 'components/ActionButton'
-import usePlatform from 'hooks/usePlatform'
 import { isSingleCursorInPipe } from 'lang/queryAst'
 import { useKclContext } from 'lang/KclProvider'
 import {
@ -14,7 +13,6 @@ import {
 import { useStore } from 'useStore'

 export const Toolbar = () => {
-  const platform = usePlatform()
  const { commandBarSend } = useCommandsContext()
  const { state, send, context } = useModelingContext()
  const toolbarButtonsRef = useRef<HTMLUListElement>(null)
@ -274,17 +272,8 @@ export const Toolbar = () => {
  }

  return (
-    <div className="max-w-full flex items-stretch rounded-l-sm rounded-r-full bg-chalkboard-10/80 dark:bg-chalkboard-110/70 relative">
-      <menu className="flex-1 pl-1 pr-2 py-0 overflow-hidden rounded-l-sm whitespace-nowrap border-solid border border-primary/30 dark:border-chalkboard-90 border-r-0">
-        <ToolbarButtons />
-      </menu>
-      <ActionButton
-        Element="button"
-        onClick={() => commandBarSend({ type: 'Open' })}
-        className="rounded-r-full pr-4 self-stretch border-primary/30 hover:border-primary dark:border-chalkboard-80 dark:bg-chalkboard-80 text-primary"
-      >
-        {platform === 'macos' ? '⌘K' : 'Ctrl+/'}
-      </ActionButton>
-    </div>
+    <menu className="max-w-full overflow-hidden whitespace-nowrap rounded px-1.5 py-0.5 backdrop-blur-sm bg-chalkboard-10/80 dark:bg-chalkboard-110/70 relative">
+      <ToolbarButtons />
+    </menu>
  )
 }
--- a/src/clientSideScene/ClientSideSceneComp.tsx
+++ b/src/clientSideScene/ClientSideSceneComp.tsx
@ -90,7 +90,8 @@ export const ClientSideScene = ({
      cursor = 'grabbing'
    } else if (
      state.matches('Sketch.Line tool') ||
-      state.matches('Sketch.Tangential arc to')
+      state.matches('Sketch.Tangential arc to') ||
+      state.matches('Sketch.Rectangle tool')
    ) {
      cursor = 'crosshair'
    } else {
@ -104,9 +105,9 @@ export const ClientSideScene = ({
      style={{ cursor: cursor }}
      className={`absolute inset-0 h-full w-full transition-all duration-300 ${
        hideClient ? 'opacity-0' : 'opacity-100'
-      } ${hideServer ? 'bg-black' : ''} ${
+      } ${hideServer ? 'bg-chalkboard-10 dark:bg-chalkboard-100' : ''} ${
        !hideClient && !hideServer && state.matches('Sketch')
-          ? 'bg-black/80'
+          ? 'bg-chalkboard-10/80 dark:bg-chalkboard-100/80'
          : ''
      }`}
    ></div>
--- a/src/clientSideScene/sceneEntities.ts
+++ b/src/clientSideScene/sceneEntities.ts
@ -97,6 +97,7 @@ import {
  getRectangleCallExpressions,
  updateRectangleSketch,
 } from 'lib/rectangleTool'
+import { getThemeColorForThreeJs } from 'lib/theme'

 type DraftSegment = 'line' | 'tangentialArcTo'

@ -356,6 +357,7 @@ export class SceneEntities {
      id: sketchGroup.start.__geoMeta.id,
      pathToNode: segPathToNode,
      scale: factor,
+      theme: sceneInfra._theme,
    })
    _profileStart.layers.set(SKETCH_LAYER)
    _profileStart.traverse((child) => {
@ -406,6 +408,7 @@ export class SceneEntities {
          isDraftSegment,
          scale: factor,
          texture: sceneInfra.extraSegmentTexture,
+          theme: sceneInfra._theme,
        })
      } else {
        seg = straightSegment({
@ -417,6 +420,7 @@ export class SceneEntities {
          scale: factor,
          callExpName,
          texture: sceneInfra.extraSegmentTexture,
+          theme: sceneInfra._theme,
        })
      }
      seg.layers.set(SKETCH_LAYER)
@ -964,7 +968,7 @@ export class SceneEntities {
      if (!draftInfo)
        // don't want to mod the user's code yet as they have't committed to the change yet
        // plus this would be the truncated ast being recast, it would be wrong
-        codeManager.updateCodeStateEditor(code)
+        codeManager.updateCodeEditor(code)
      const { programMemory } = await executeAst({
        ast: truncatedAst,
        useFakeExecutor: true,
@ -1503,7 +1507,10 @@ export class SceneEntities {
        const isSelected = parent?.userData?.isSelected
        colorSegment(
          selected,
-          isSelected ? 0x0000ff : parent?.userData?.baseColor || 0xffffff
+          isSelected
+            ? 0x0000ff
+            : parent?.userData?.baseColor ||
+                getThemeColorForThreeJs(sceneInfra._theme)
        )
        const extraSegmentGroup = parent?.getObjectByName(EXTRA_SEGMENT_HANDLE)
        if (extraSegmentGroup) {
--- a/src/clientSideScene/sceneInfra.ts
+++ b/src/clientSideScene/sceneInfra.ts
@ -30,6 +30,7 @@ import { CameraControls } from './CameraControls'
 import { EngineCommandManager } from 'lang/std/engineConnection'
 import { settings } from 'lib/settings/initialSettings'
 import { MouseState } from 'machines/modelingMachine'
+import { Themes } from 'lib/theme'

 type SendType = ReturnType<typeof useModelingContext>['send']

@ -101,6 +102,7 @@ export class SceneInfra {
  isFovAnimationInProgress = false
  _baseUnit: BaseUnit = 'mm'
  _baseUnitMultiplier = 1
+  _theme: Themes = Themes.System
  extraSegmentTexture: Texture
  lastMouseState: MouseState = { type: 'idle' }
  onDragStartCallback: (arg: OnDragCallbackArgs) => void = () => {}
@ -137,6 +139,9 @@ export class SceneInfra {
      this._baseUnitMultiplier
    )
  }
+  set theme(theme: Themes) {
+    this._theme = theme
+  }
  resetMouseListeners = () => {
    this.setCallbacks({
      onDragStart: () => {},
--- a/src/clientSideScene/segments.ts
+++ b/src/clientSideScene/segments.ts
@ -37,22 +37,26 @@ import {
 } from './sceneEntities'
 import { getTangentPointFromPreviousArc } from 'lib/utils2d'
 import { ARROWHEAD } from './sceneInfra'
+import { Themes, getThemeColorForThreeJs } from 'lib/theme'

 export function profileStart({
  from,
  id,
  pathToNode,
  scale = 1,
+  theme,
 }: {
  from: Coords2d
  id: string
  pathToNode: PathToNode
  scale?: number
+  theme: Themes
 }) {
  const group = new Group()

  const geometry = new BoxGeometry(12, 12, 12) // in pixels scaled later
-  const body = new MeshBasicMaterial({ color: 0xffffff })
+  const baseColor = getThemeColorForThreeJs(theme)
+  const body = new MeshBasicMaterial({ color: baseColor })
  const mesh = new Mesh(geometry, body)

  group.add(mesh)
@ -79,6 +83,7 @@ export function straightSegment({
  scale = 1,
  callExpName,
  texture,
+  theme,
 }: {
  from: Coords2d
  to: Coords2d
@ -88,6 +93,7 @@ export function straightSegment({
  scale?: number
  callExpName: string
  texture: Texture
+  theme: Themes
 }): Group {
  const group = new Group()

@ -111,7 +117,8 @@ export function straightSegment({
    })
  }

-  const baseColor = callExpName === 'close' ? 0x444444 : 0xffffff
+  const baseColor =
+    callExpName === 'close' ? 0x444444 : getThemeColorForThreeJs(theme)
  const body = new MeshBasicMaterial({ color: baseColor })
  const mesh = new Mesh(geometry, body)
  mesh.userData.type = isDraftSegment
@ -134,7 +141,7 @@ export function straightSegment({
  const length = Math.sqrt(
    Math.pow(to[0] - from[0], 2) + Math.pow(to[1] - from[1], 2)
  )
-  const arrowGroup = createArrowhead(scale)
+  const arrowGroup = createArrowhead(scale, theme)
  arrowGroup.position.set(to[0], to[1], 0)
  const dir = new Vector3()
    .subVectors(new Vector3(to[0], to[1], 0), new Vector3(from[0], from[1], 0))
@ -147,7 +154,7 @@ export function straightSegment({
  group.add(mesh)
  if (callExpName !== 'close') group.add(arrowGroup)

-  const extraSegmentGroup = createExtraSegmentHandle(scale, texture)
+  const extraSegmentGroup = createExtraSegmentHandle(scale, texture, theme)
  const offsetFromBase = new Vector2(to[0] - from[0], to[1] - from[1])
    .normalize()
    .multiplyScalar(EXTRA_SEGMENT_OFFSET_PX * scale)
@ -162,8 +169,10 @@ export function straightSegment({
  return group
 }

-function createArrowhead(scale = 1): Group {
-  const arrowMaterial = new MeshBasicMaterial({ color: 0xffffff })
+function createArrowhead(scale = 1, theme: Themes): Group {
+  const arrowMaterial = new MeshBasicMaterial({
+    color: getThemeColorForThreeJs(theme),
+  })
  // specify the size of the geometry in pixels (i.e. cone height = 20px, cone radius = 4.5px)
  // we'll scale the group to the correct size later to match these sizes in screen space
  const arrowheadMesh = new Mesh(new ConeGeometry(4.5, 20, 12), arrowMaterial)
@ -179,7 +188,11 @@ function createArrowhead(scale = 1): Group {
  return arrowGroup
 }

-function createExtraSegmentHandle(scale: number, texture: Texture): Group {
+function createExtraSegmentHandle(
+  scale: number,
+  texture: Texture,
+  theme: Themes
+): Group {
  const particleMaterial = new PointsMaterial({
    size: 12, // in pixels
    map: texture,
@ -189,7 +202,7 @@ function createExtraSegmentHandle(scale: number, texture: Texture): Group {
  })
  const mat = new MeshBasicMaterial({
    transparent: true,
-    color: 0xffffff,
+    color: getThemeColorForThreeJs(theme),
    opacity: 0,
  })
  const particleGeometry = new BufferGeometry().setFromPoints([
@ -218,6 +231,7 @@ export function tangentialArcToSegment({
  isDraftSegment,
  scale = 1,
  texture,
+  theme,
 }: {
  prevSegment: SketchGroup['value'][number]
  from: Coords2d
@ -227,6 +241,7 @@ export function tangentialArcToSegment({
  isDraftSegment?: boolean
  scale?: number
  texture: Texture
+  theme: Themes
 }): Group {
  const group = new Group()

@ -257,7 +272,8 @@ export function tangentialArcToSegment({
    scale,
  })

-  const body = new MeshBasicMaterial({ color: 0xffffff })
+  const baseColor = getThemeColorForThreeJs(theme)
+  const body = new MeshBasicMaterial({ color: baseColor })
  const mesh = new Mesh(geometry, body)
  mesh.userData.type = isDraftSegment
    ? TANGENTIAL_ARC_TO__SEGMENT_DASH
@ -271,10 +287,11 @@ export function tangentialArcToSegment({
    prevSegment,
    pathToNode,
    isSelected: false,
+    baseColor,
  }
  group.name = TANGENTIAL_ARC_TO_SEGMENT

-  const arrowGroup = createArrowhead(scale)
+  const arrowGroup = createArrowhead(scale, theme)
  arrowGroup.position.set(to[0], to[1], 0)
  const arrowheadAngle = endAngle + (Math.PI / 2) * (ccw ? 1 : -1)
  arrowGroup.quaternion.setFromUnitVectors(
@ -285,7 +302,7 @@ export function tangentialArcToSegment({
  const shouldHide = pxLength < HIDE_SEGMENT_LENGTH
  arrowGroup.visible = !shouldHide

-  const extraSegmentGroup = createExtraSegmentHandle(scale, texture)
+  const extraSegmentGroup = createExtraSegmentHandle(scale, texture, theme)
  const circumferenceInPx = (2 * Math.PI * radius) / scale
  const extraSegmentAngleDelta =
    (EXTRA_SEGMENT_OFFSET_PX / circumferenceInPx) * Math.PI * 2
--- a/src/components/AppHeader.tsx
+++ b/src/components/AppHeader.tsx
@ -1,12 +1,11 @@
 import { Toolbar } from '../Toolbar'
-import UserSidebarMenu from './UserSidebarMenu'
+import UserSidebarMenu from 'components/UserSidebarMenu'
 import { type IndexLoaderData } from 'lib/types'
 import ProjectSidebarMenu from './ProjectSidebarMenu'
 import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
 import styles from './AppHeader.module.css'
-import { useCommandsContext } from 'hooks/useCommandsContext'
-import { ActionButton } from './ActionButton'
-import usePlatform from 'hooks/usePlatform'
+import { RefreshButton } from 'components/RefreshButton'
+import { CommandBarOpenButton } from './CommandBarOpenButton'

 interface AppHeaderProps extends React.PropsWithChildren {
  showToolbar?: boolean
@ -22,8 +21,6 @@ export const AppHeader = ({
  className = '',
  enableMenu = false,
 }: AppHeaderProps) => {
-  const platform = usePlatform()
-  const { commandBarSend } = useCommandsContext()
  const { auth } = useSettingsAuthContext()
  const user = auth?.context?.user

@ -43,24 +40,17 @@ export const AppHeader = ({
      />
      {/* Toolbar if the context deems it */}
      <div className="flex-grow flex justify-center max-w-lg md:max-w-xl lg:max-w-2xl xl:max-w-4xl 2xl:max-w-5xl">
-        {showToolbar ? (
-          <Toolbar />
-        ) : (
-          <ActionButton
-            Element="button"
-            onClick={() => commandBarSend({ type: 'Open' })}
-            className="text-sm self-center flex items-center w-fit gap-3"
-          >
-            Command Palette{' '}
-            <kbd className="bg-primary/10 dark:bg-chalkboard-100 dark:text-primary inline-block px-1 py-0.5 border-primary dark:border-chalkboard-90">
-              {platform === 'macos' ? '⌘K' : 'Ctrl+/'}
-            </kbd>
-          </ActionButton>
-        )}
+        {showToolbar && <Toolbar />}
      </div>
      <div className="flex items-center gap-1 py-1 ml-auto">
        {/* If there are children, show them, otherwise show User menu */}
-        {children || <UserSidebarMenu user={user} />}
+        {children || (
+          <>
+            <CommandBarOpenButton />
+            <RefreshButton />
+            <UserSidebarMenu user={user} />
+          </>
+        )}
      </div>
    </header>
  )
--- a/src/components/CommandBar/CommandBarSelectionInput.tsx
+++ b/src/components/CommandBar/CommandBarSelectionInput.tsx
@ -7,6 +7,7 @@ import {
  getSelectionType,
  getSelectionTypeDisplayText,
 } from 'lib/selections'
+import { kclManager } from 'lib/singletons'
 import { modelingMachine } from 'machines/modelingMachine'
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { useHotkeys } from 'react-hotkeys-hook'
@ -50,6 +51,14 @@ function CommandBarSelectionInput({
    inputRef.current?.focus()
  }, [selection, inputRef])

+  // Exit engine's edit mode when this input step is active,
+  // and re-enter it when it's not.
+  // In future the engine's edit mode will go away and this will be handled differently.
+  useEffect(() => {
+    kclManager.exitEditMode()
+    return () => kclManager.enterEditMode()
+  }, [])
+
  // Fast-forward through this arg if it's marked as skippable
  // and we have a valid selection already
  useEffect(() => {
--- a/src/components/CommandBarOpenButton.tsx
+++ b/src/components/CommandBarOpenButton.tsx
@ -0,0 +1,19 @@
+import { useCommandsContext } from 'hooks/useCommandsContext'
+import usePlatform from 'hooks/usePlatform'
+
+export function CommandBarOpenButton() {
+  const { commandBarSend } = useCommandsContext()
+  const platform = usePlatform()
+
+  return (
+    <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' })}
+    >
+      <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">
+        {platform === 'macos' ? '⌘K' : '^/'}
+      </kbd>
+    </button>
+  )
+}
--- a/src/components/CommandComboBox.tsx
+++ b/src/components/CommandComboBox.tsx
@ -38,7 +38,7 @@ function CommandComboBox({
      <div className="flex items-center gap-2 px-4 pb-2 border-solid border-0 border-b border-b-chalkboard-20 dark:border-b-chalkboard-80">
        <CustomIcon
          name="search"
-          className="w-5 h-5 bg-primary/10 text-primary"
+          className="w-5 h-5 bg-primary/10 dark:bg-primary text-primary dark:text-inherit"
        />
        <Combobox.Input
          onChange={(event) => setQuery(event.target.value)}
--- a/src/components/CustomIcon.tsx
+++ b/src/components/CustomIcon.tsx
@ -41,6 +41,16 @@ const CustomIconMap = {
      />
    </svg>
  ),
+  arrowRotateRight: (
+    <svg viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M15.5 7.59684L15.5 8.09684L15 8.09684L10.7931 8.09684L10.7931 7.09684L13.769 7.09684C13.3052 6.54751 12.7147 6.11526 12.0452 5.83941C11.2133 5.49662 10.2977 5.41109 9.41668 5.59387C8.53566 5.77666 7.72967 6.21935 7.10277 6.8648C6.47588 7.51025 6.05687 8.32881 5.89986 9.21478C5.74284 10.1008 5.85503 11.0134 6.22194 11.835C6.58884 12.6566 7.19361 13.3493 7.95816 13.8237C8.7227 14.2981 9.61192 14.5325 10.511 14.4964C11.41 14.4604 12.2776 14.1557 13.0018 13.6216L13.5953 14.4264C12.7103 15.0792 11.6499 15.4516 10.551 15.4956C9.45216 15.5397 8.36535 15.2533 7.4309 14.6734C6.49646 14.0936 5.75729 13.2469 5.30885 12.2428C4.86041 11.2386 4.7233 10.1231 4.9152 9.04027C5.10711 7.95742 5.61923 6.95696 6.38543 6.16808C7.15164 5.3792 8.13674 4.83812 9.21354 4.61472C10.2903 4.39132 11.4094 4.49586 12.4262 4.91483C13.2286 5.24545 13.9382 5.7599 14.5 6.41286L14.5 3.38998L15.5 3.38998L15.5 7.59684Z"
+        fill="currentColor"
+      />
+    </svg>
+  ),
  arrowUp: (
    <svg viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
      <path
--- a/src/components/ModelingSidebar/ModelingPanes/KclEditorPane.tsx
+++ b/src/components/ModelingSidebar/ModelingPanes/KclEditorPane.tsx
@ -2,7 +2,7 @@ import ReactCodeMirror from '@uiw/react-codemirror'
 import { TEST } from 'env'
 import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
 import { Themes, getSystemTheme } from 'lib/theme'
-import { useEffect, useMemo } from 'react'
+import { useEffect, useMemo, useRef } from 'react'
 import { highlightSelectionMatches, searchKeymap } from '@codemirror/search'
 import { lineHighlightField } from 'editor/highlightextension'
 import { roundOff } from 'lib/utils'
@ -190,13 +190,15 @@ export const KclEditorPane = () => {
    return extensions
  }, [kclLSP, copilotLSP, textWrapping.current, cursorBlinking.current])

+  const initialCode = useRef(codeManager.code)
+
  return (
    <div
      id="code-mirror-override"
      className={'absolute inset-0 ' + (cursorBlinking.current ? 'blink' : '')}
    >
      <ReactCodeMirror
-        value={codeManager.code}
+        value={initialCode.current}
        extensions={editorExtensions}
        theme={theme}
        onCreateEditor={(_editorView) =>
--- a/src/components/RefreshButton.tsx
+++ b/src/components/RefreshButton.tsx
@ -0,0 +1,37 @@
+import { CustomIcon } from './CustomIcon'
+import Tooltip from './Tooltip'
+
+export function RefreshButton() {
+  async function refresh() {
+    if (window && 'plausible' in window) {
+      const p = window.plausible as (
+        event: string,
+        options?: { props: Record<string, string> }
+      ) => Promise<void>
+      // Send a refresh event to Plausible so we can track how often users get stuck
+      await p('Refresh', {
+        props: {
+          method: 'UI button',
+          // TODO: add more coredump data here
+        },
+      })
+    }
+
+    // Window may not be available in some environments
+    window?.location.reload()
+  }
+
+  return (
+    <button
+      onClick={refresh}
+      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-10 dark:border-chalkboard-100"
+    >
+      <CustomIcon name="arrowRotateRight" className="w-5 h-5" />
+      <Tooltip position="bottom-right">
+        <span>Refresh and report</span>
+        <br />
+        <span className="text-xs">Send us data on how you got stuck</span>
+      </Tooltip>
+    </button>
+  )
+}
--- a/src/components/SettingsAuthProvider.tsx
+++ b/src/components/SettingsAuthProvider.tsx
@ -134,6 +134,10 @@ export const SettingsAuthProviderBase = ({
            },
          })
        },
+        setClientTheme: (context) => {
+          const opposingTheme = getOppositeTheme(context.app.theme.current)
+          sceneInfra.theme = opposingTheme
+        },
        setEngineEdges: (context) => {
          engineCommandManager.sendSceneCommand({
            cmd_id: uuidv4(),
--- a/src/editor/manager.ts
+++ b/src/editor/manager.ts
@ -189,6 +189,7 @@ export default class EditorManager {
    const ignoreEvents: ModelingMachineEvent['type'][] = [
      'Equip Line tool',
      'Equip tangential arc to',
+      'Equip rectangle tool',
    ]

    if (!this._modelingEvent) {
--- a/src/hooks/useBackdropHighlight.ts
+++ b/src/hooks/useBackdropHighlight.ts
@ -1,57 +0,0 @@
-import useResizeObserver from '@react-hook/resize-observer'
-import { useEffect, useState } from 'react'
-
-interface Rect {
-  top: number
-  left: number
-  height: number
-  width: number
-}
-
-/**
- * Takes an element id and uses React refs to create a CSS clip-path rule to apply to a backdrop element
- * which excludes the element with the given id, creating a "highlight" effect.
- * @param highlightId
- */
-export function useBackdropHighlight(target: string): string {
-  const [clipPath, setClipPath] = useState('')
-  const [elem, setElem] = useState(document.getElementById(target))
-
-  // Build the actual clip path string, cutting out the target element
-  function buildClipPath({ top, left, height, width }: Rect) {
-    const windowWidth = window.innerWidth
-    const windowHeight = window.innerHeight
-
-    return `
-        path(evenodd, "M0 0 l${windowWidth} 0 l0 ${windowHeight} l-${windowWidth} 0 Z \
-            M${left} ${top} l${width} 0 l0 ${height} l-${width} 0 Z")
-        `
-  }
-
-  // initial setup of clip path
-  useEffect(() => {
-    if (!elem) {
-      const newElem = document.getElementById(target)
-      if (newElem === null) {
-        throw new Error(
-          `Could not find element with id "${target}" to highlight`
-        )
-      }
-      setElem(document.getElementById(target))
-      return
-    }
-
-    const { top, left, height, width } = elem.getBoundingClientRect()
-    setClipPath(buildClipPath({ top, left, height, width }))
-  }, [elem, target])
-
-  // update clip path on resize
-  useResizeObserver(elem, (entry) => {
-    const { height, width } = entry.contentRect
-    // the top and left are relative to the viewport, so we need to get the target's position
-    const { top, left } = entry.target.getBoundingClientRect()
-    setClipPath(buildClipPath({ top, left, height, width }))
-  })
-
-  return clipPath
-}
--- a/src/hooks/useEngineConnectionSubscriptions.ts
+++ b/src/hooks/useEngineConnectionSubscriptions.ts
@ -14,8 +14,8 @@ export function useEngineConnectionSubscriptions() {
      event: 'highlight_set_entity',
      callback: ({ data }) => {
        if (data?.entity_id) {
-          const sourceRange =
-            engineCommandManager.artifactMap?.[data.entity_id]?.range
+          const sourceRange = engineCommandManager.artifactMap?.[data.entity_id]
+            ?.range || [0, 0]
          editorManager.setHighlightRange(sourceRange)
        } else if (
          !editorManager.highlightRange ||
--- a/src/lang/KclSingleton.ts
+++ b/src/lang/KclSingleton.ts
@ -17,7 +17,7 @@ import {
  ExtrudeGroup,
 } from 'lang/wasm'
 import { getNodeFromPath } from './queryAst'
-import { codeManager, editorManager } from 'lib/singletons'
+import { codeManager, editorManager, sceneInfra } from 'lib/singletons'

 export class KclManager {
  private _ast: Program = {
@ -187,6 +187,7 @@ export class KclManager {
      ast,
      engineCommandManager: this.engineCommandManager,
    })
+    sceneInfra.modelingSend({ type: 'code edit during sketch' })
    enterEditMode(programMemory, this.engineCommandManager)
    this.isExecuting = false
    // Check the cancellation token for this execution before applying side effects
@ -219,7 +220,7 @@ export class KclManager {
    const newCode = recast(ast)
    const newAst = this.safeParse(newCode)
    if (!newAst) return
-    codeManager.updateCodeStateEditor(newCode)
+    codeManager.updateCodeEditor(newCode)
    // Write the file to disk.
    await codeManager.writeToFile()
    await this?.engineCommandManager?.waitForReady
@ -316,7 +317,7 @@ export class KclManager {
    if (execute) {
      // Call execute on the set ast.
      // Update the code state and editor.
-      codeManager.updateCodeStateEditor(newCode)
+      codeManager.updateCodeEditor(newCode)
      // Write the file to disk.
      await codeManager.writeToFile()
      await this.executeAst(astWithUpdatedSource)
--- a/src/lang/codeManager.ts
+++ b/src/lang/codeManager.ts
@ -11,8 +11,7 @@ const PERSIST_CODE_TOKEN = 'persistCode'

 export default class CodeManager {
  private _code: string = bracket
-  private _updateState: (arg: string) => void = () => {}
-  private _updateEditor: (arg: string) => void = () => {}
+  #updateState: (arg: string) => void = () => {}
  private _currentFilePath: string | null = null

  constructor() {
@ -46,7 +45,7 @@ export default class CodeManager {
  }

  registerCallBacks({ setCode }: { setCode: (arg: string) => void }) {
-    this._updateState = setCode
+    this.#updateState = setCode
  }

  updateCurrentFilePath(path: string) {
@ -57,18 +56,20 @@ export default class CodeManager {
  updateCodeState(code: string): void {
    if (this._code !== code) {
      this.code = code
-      this._updateState(code)
+      this.#updateState(code)
    }
  }

  // Update the code in the editor.
  updateCodeEditor(code: string): void {
-    const lastCode = this._code
    this.code = code
-    this._updateEditor(code)
    if (editorManager.editorView) {
      editorManager.editorView.dispatch({
-        changes: { from: 0, to: lastCode.length, insert: code },
+        changes: {
+          from: 0,
+          to: editorManager.editorView.state.doc.length,
+          insert: code,
+        },
      })
    }
  }
@ -77,8 +78,7 @@ export default class CodeManager {
  updateCodeStateEditor(code: string): void {
    if (this._code !== code) {
      this.code = code
-      this._updateState(code)
-      this._updateEditor(code)
+      this.#updateState(code)
    }
  }

--- a/src/lang/std/engineConnection.ts
+++ b/src/lang/std/engineConnection.ts
@ -542,6 +542,27 @@ class EngineConnection {
            },
          }
        })
+        this.unreliableDataChannel.addEventListener('message', (event) => {
+          const result: UnreliableResponses = JSON.parse(event.data)
+          Object.values(
+            this.engineCommandManager.unreliableSubscriptions[result.type] || {}
+          ).forEach(
+            // TODO: There is only one response that uses the unreliable channel atm,
+            // highlight_set_entity, if there are more it's likely they will all have the same
+            // sequence logic, but I'm not sure if we use a single global sequence or a sequence
+            // per unreliable subscription.
+            (callback) => {
+              if (
+                result.type === 'highlight_set_entity' &&
+                result?.data?.sequence &&
+                result?.data.sequence > this.engineCommandManager.inSequence
+              ) {
+                this.engineCommandManager.inSequence = result.data.sequence
+                callback(result)
+              }
+            }
+          )
+        })
      })
    }

@ -853,7 +874,7 @@ type CommandTypes = Models['ModelingCmd_type']['type'] | 'batch'

 type UnreliableResponses = Extract<
  Models['OkModelingCmdResponse_type'],
-  { type: 'highlight_set_entity' }
+  { type: 'highlight_set_entity' | 'camera_drag_move' }
 >
 interface UnreliableSubscription<T extends UnreliableResponses['type']> {
  event: T
@ -1061,32 +1082,6 @@ export class EngineCommandManager {
        setIsStreamReady(false)
      },
      onConnectionStarted: (engineConnection) => {
-        engineConnection?.pc?.addEventListener('datachannel', (event) => {
-          let unreliableDataChannel = event.channel
-
-          unreliableDataChannel.addEventListener('message', (event) => {
-            const result: UnreliableResponses = JSON.parse(event.data)
-            Object.values(
-              this.unreliableSubscriptions[result.type] || {}
-            ).forEach(
-              // TODO: There is only one response that uses the unreliable channel atm,
-              // highlight_set_entity, if there are more it's likely they will all have the same
-              // sequence logic, but I'm not sure if we use a single global sequence or a sequence
-              // per unreliable subscription.
-              (callback) => {
-                if (
-                  result?.data?.sequence &&
-                  result?.data.sequence > this.inSequence &&
-                  result.type === 'highlight_set_entity'
-                ) {
-                  this.inSequence = result.data.sequence
-                  callback(result)
-                }
-              }
-            )
-          })
-        })
-
        // When the EngineConnection starts a connection, we want to register
        // callbacks into the WebSocket/PeerConnection.
        engineConnection.websocket?.addEventListener('message', (event) => {
@ -1366,14 +1361,11 @@ export class EngineCommandManager {
    callback,
  }: Subscription<T>): () => void {
    const localUnsubscribeId = uuidv4()
-    const otherEventCallbacks = this.subscriptions[event]
-    if (otherEventCallbacks) {
-      otherEventCallbacks[localUnsubscribeId] = callback
-    } else {
-      this.subscriptions[event] = {
-        [localUnsubscribeId]: callback,
-      }
+    if (!this.subscriptions[event]) {
+      this.subscriptions[event] = {}
    }
+    this.subscriptions[event][localUnsubscribeId] = callback
+
    return () => this.unSubscribeTo(event, localUnsubscribeId)
  }
  private unSubscribeTo(event: ModelTypes, id: string) {
@ -1384,14 +1376,10 @@ export class EngineCommandManager {
    callback,
  }: UnreliableSubscription<T>): () => void {
    const localUnsubscribeId = uuidv4()
-    const otherEventCallbacks = this.unreliableSubscriptions[event]
-    if (otherEventCallbacks) {
-      otherEventCallbacks[localUnsubscribeId] = callback
-    } else {
-      this.unreliableSubscriptions[event] = {
-        [localUnsubscribeId]: callback,
-      }
+    if (!this.unreliableSubscriptions[event]) {
+      this.unreliableSubscriptions[event] = {}
    }
+    this.unreliableSubscriptions[event][localUnsubscribeId] = callback
    return () => this.unSubscribeToUnreliable(event, localUnsubscribeId)
  }
  private unSubscribeToUnreliable(
--- a/src/lib/exportSave.ts
+++ b/src/lib/exportSave.ts
@ -14,9 +14,21 @@ interface ModelingAppFile {
 const save_ = async (file: ModelingAppFile) => {
  try {
    if (isTauri()) {
+      const extension = file.name.split('.').pop() || null
+      let extensions: string[] = []
+      if (extension !== null) {
+        extensions.push(extension)
+      }
+
      // Open a dialog to save the file.
      const filePath = await save({
        defaultPath: file.name,
+        filters: [
+          {
+            name: 'model',
+            extensions: extensions,
+          },
+        ],
      })

      if (filePath === null) {
@ -48,7 +60,7 @@ export async function exportSave(data: ArrayBuffer) {
  // This converts the ArrayBuffer to a Rust equivalent Vec<u8>.
  let uintArray = new Uint8Array(data)

-  const files: ModelingAppFile[] = deserialize_files(uintArray)
+  let files: ModelingAppFile[] = deserialize_files(uintArray)

  if (files.length > 1) {
    let zip = new JSZip()
--- a/src/lib/theme.ts
+++ b/src/lib/theme.ts
@ -65,3 +65,15 @@ export function getThemeColorForEngine(theme: Themes) {
    ? { r: dark, g: dark, b: dark, a: 1 }
    : { r: light, g: light, b: light, a: 1 }
 }
+
+/**
+ * ThreeJS uses hex values for colors
+ * @param theme
+ * @returns
+ */
+export function getThemeColorForThreeJs(theme: Themes) {
+  const resolvedTheme = getResolvedTheme(theme)
+  const dark = 0x1c1c1c
+  const light = 0xf9f9f9
+  return resolvedTheme === Themes.Dark ? dark : light
+}
--- a/src/machines/modelingMachine.ts
+++ b/src/machines/modelingMachine.ts
--- a/src/machines/settingsMachine.ts
+++ b/src/machines/settingsMachine.ts
@ -11,7 +11,7 @@ import {

 export const settingsMachine = createMachine(
  {
-    /** @xstate-layout N4IgpgJg5mDOIC5QGUwBc0EsB2VYDpMIAbMAYlnXwFsB7CMYnKfAV20zVgG0AGAXUSgADrVidMtbEJAAPRABYAHAFZ8vAEwA2FVq0aNAZgCcARl0B2ADQgAnolO8LvfBYUXT+48YW+tCgF8Am1QMZgIiUgoqAENhYXw0AAswajA+QSQQUXEsKRl5BCM1DQUDMo0VQwVjJxt7BFMDJXwNWo0LFSU3c0DgkFCsXAiScgAlOHQAAkow4YyZHIl8rMKAWn18Q39q3ScVFQ1NFXqHXiVTfGNqhSdeXi1DJQ1TIJD0IbxCUbIAKgWsks8tJVopjFp8KZjEpqi9lKZDE0TnYzgZXO5PG0fH4+u85l9IuRQlMYsRiFNsGAAO4zD7hAEiMTLEGgda6fAKJoIiyIkwWYwWawoxpGFxaHkKFS1a7woL9bD0OAyQbhRZM4EFRBrUyOLY7SVafaHTSnBDGDqQiz6DRKbwqTxvAZ04bfUhq3KSFlyBxHdQIhR6HTQmoC02OUwKPW7GrPdy8QxygJAA */
+    /** @xstate-layout N4IgpgJg5mDOIC5QGUwBc0EsB2VYDpMIAbMAYlnXwEMAHW-Ae2wCNHqAnCHKZNatAFdYAbQAMAXUShajWJizNpIAB6IAbAFZN+AOwAWAIwAOYwE4AzGYBM+-ZosAaEAE9Eh62LP51ls+v0LMWt1awMAX3DnVAweAiJSCio6BjQACzAAWzAAYUZiRg5xKSQQWXlFbGU1BA9vQ0N1CwCxdVbdY1DnNwQzPp8zTTFje1D1QwtjSOj0LFx4knJKNHxMxggwYh58DYAzakFiNABVbAVi5XKFTCVSmotNY3w7YysHRuNDTXV1bvdG7w-IKTcbaazWCzTEAxOZ4QiLJIrFL4dJZMAXUpXSrVDTGazPMQPR4GXRBAx-XoGfDWIadMx4n6EqEwuLwxLLVbrTbbNKYKBpLb8tAAUWgcAxMjk11uoHumn0+DEw2sJkMulCgWsFL6YnwfX0ELsYg61jMumZs1ZCXIACU4OgAATLWGiSSXKXYu4aLz4UwWBr6DqBYYUzSePXqUlBLxmyZmC2xeZs8gxB3UYjEJ2W+YSsoem5VL0IKy6z6EsJifQ2Czq0MTHzq8Yjfz6MQmBMu5NkABUuaxBZxCDD+DD5lJgUjxssFP0xl0I+0pm06uMmg8kSiIGwXPgpRZ83dFQHRYAtA0LCO2tZjGIHJNdB5fq5EK3dc1OsNGkrA+oO1bFoe0qFrKiAnlol7BDed5zo+FK+Doc7qhCNaVv4UwbkAA */
    id: 'Settings',
    predictableActionArguments: true,
    context: {} as ReturnType<typeof createSettings>,
@ -59,6 +59,7 @@ export const settingsMachine = createMachine(
              'setThemeClass',
              'setEngineTheme',
              'persistSettings',
+              'setClientTheme',
            ],
          },

@ -83,6 +84,7 @@ export const settingsMachine = createMachine(
              'setClientSideSceneUnits',
              'Execute AST',
              'persistSettings',
+              'setClientTheme',
            ],
          },

@ -96,6 +98,7 @@ export const settingsMachine = createMachine(
              'setClientSideSceneUnits',
              'Execute AST',
              'persistSettings',
+              'setClientTheme',
            ],
          },
        },
--- a/src/routes/Onboarding/CodeEditor.tsx
+++ b/src/routes/Onboarding/CodeEditor.tsx
@ -1,7 +1,6 @@
 import { OnboardingButtons, useDismiss, useNextClick } from '.'
 import { onboardingPaths } from 'routes/Onboarding/paths'
 import { useStore } from '../../useStore'
-import { useBackdropHighlight } from 'hooks/useBackdropHighlight'

 export default function CodeEditor() {
  const { buttonDownInStream } = useStore((s) => ({
@ -12,10 +11,6 @@ export default function CodeEditor() {

  return (
    <div className="fixed grid justify-end items-center inset-0 z-50 pointer-events-none">
-      <div
-        className="fixed inset-0 bg-black opacity-50 dark:opacity-80 pointer-events-none"
-        style={{ clipPath: useBackdropHighlight('code-pane') }}
-      ></div>
      <div
        className={
          'z-10 max-w-xl border border-chalkboard-50 dark:border-chalkboard-80 shadow-lg h-3/4 flex flex-col justify-center bg-chalkboard-10 dark:bg-chalkboard-90 p-8 rounded' +
--- a/src/routes/Onboarding/FutureWork.tsx
+++ b/src/routes/Onboarding/FutureWork.tsx
@ -12,7 +12,7 @@ export default function FutureWork() {

  useEffect(() => {
    // We do want to update both the state and editor here.
-    codeManager.updateCodeStateEditor(bracket)
+    codeManager.updateCodeEditor(bracket)
    if (kclManager.engineCommandManager.engineConnection?.isReady()) {
      // If the engine is ready, promptly execute the loaded code
      kclManager.executeCode(true)
--- a/src/routes/Onboarding/InteractiveNumbers.tsx
+++ b/src/routes/Onboarding/InteractiveNumbers.tsx
@ -1,7 +1,6 @@
 import { OnboardingButtons, kbdClasses, useDismiss, useNextClick } from '.'
 import { onboardingPaths } from 'routes/Onboarding/paths'
 import { useStore } from '../../useStore'
-import { useBackdropHighlight } from 'hooks/useBackdropHighlight'
 import { bracketWidthConstantLine } from 'lib/exampleKcl'

 export default function InteractiveNumbers() {
@ -13,10 +12,6 @@ export default function InteractiveNumbers() {

  return (
    <div className="fixed grid justify-end items-center inset-0 z-50 pointer-events-none">
-      <div
-        className="fixed inset-0 bg-black opacity-50 pointer-events-none"
-        style={{ clipPath: useBackdropHighlight('code-pane') }}
-      ></div>
      <div
        className={
          'z-10 max-w-xl border border-chalkboard-50 dark:border-chalkboard-80 shadow-lg h-3/4 flex flex-col justify-center bg-chalkboard-10 dark:bg-chalkboard-90 p-8 rounded' +
--- a/src/routes/Onboarding/Introduction.tsx
+++ b/src/routes/Onboarding/Introduction.tsx
@ -56,7 +56,7 @@ function OnboardingWithNewFile() {
              dismiss={dismiss}
              next={() => {
                // We do want to update both the state and editor here.
-                codeManager.updateCodeStateEditor(bracket)
+                codeManager.updateCodeEditor(bracket)
                kclManager.executeCode(true)
                next()
              }}
@ -80,7 +80,7 @@ function OnboardingWithNewFile() {
              dismiss={dismiss}
              next={() => {
                void createAndOpenNewProject()
-                codeManager.updateCodeStateEditor(bracket)
+                codeManager.updateCodeEditor(bracket)
                dismiss()
              }}
              nextText="Make a new project"
@ -113,7 +113,7 @@ export default function Introduction() {
  const isStarterCode = currentCode === '' || currentCode === bracket

  useEffect(() => {
-    if (codeManager.code === '') codeManager.updateCodeStateEditor(bracket)
+    if (codeManager.code === '') codeManager.updateCodeEditor(bracket)
  }, [])

  return isStarterCode ? (
--- a/src/routes/Onboarding/ParametricModeling.tsx
+++ b/src/routes/Onboarding/ParametricModeling.tsx
@ -1,7 +1,6 @@
 import { OnboardingButtons, useDismiss, useNextClick } from '.'
 import { onboardingPaths } from 'routes/Onboarding/paths'
 import { useStore } from '../../useStore'
-import { useBackdropHighlight } from 'hooks/useBackdropHighlight'
 import { Themes, getSystemTheme } from 'lib/theme'
 import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
 import { bracketThicknessCalculationLine } from 'lib/exampleKcl'
@ -29,10 +28,6 @@ export default function ParametricModeling() {

  return (
    <div className="fixed grid justify-end items-center inset-0 z-50 pointer-events-none">
-      <div
-        className="fixed inset-0 bg-black dark:bg-black-80 opacity-50 pointer-events-none"
-        style={{ clipPath: useBackdropHighlight('code-pane') }}
-      ></div>
      <div
        className={
          'z-10 max-w-xl border border-chalkboard-50 dark:border-chalkboard-80 shadow-lg h-3/4 flex flex-col justify-center bg-chalkboard-10 dark:bg-chalkboard-90 p-8 rounded' +
--- a/src/routes/Onboarding/Sketching.tsx
+++ b/src/routes/Onboarding/Sketching.tsx
@ -11,7 +11,7 @@ export default function Sketching() {

  useEffect(() => {
    // We do want to update both the state and editor here.
-    codeManager.updateCodeStateEditor('')
+    codeManager.updateCodeEditor('')
    if (kclManager.engineCommandManager.engineConnection?.isReady()) {
      // If the engine is ready, promptly execute the loaded code
      kclManager.executeCode(true)
--- a/src/wasm-lib/Cargo.lock
+++ b/src/wasm-lib/Cargo.lock
@ -155,9 +155,9 @@ dependencies = [

 [[package]]
 name = "anyhow"
-version = "1.0.82"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
+checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3"
 dependencies = [
 "backtrace",
 ]
@ -246,7 +246,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -257,7 +257,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -280,7 +280,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -596,7 +596,7 @@ dependencies = [
 "heck 0.5.0",
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -846,7 +846,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -870,7 +870,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "strsim 0.10.0",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -881,7 +881,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
 dependencies = [
 "darling_core",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -922,7 +922,7 @@ checksum = "377af281d8f23663862a7c84623bc5dcf7f8c44b13c7496a590bdc157f941a43"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 "synstructure 0.13.1",
 ]

@ -976,7 +976,7 @@ dependencies = [
 "rustfmt-wrapper",
 "serde",
 "serde_tokenstream",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -988,7 +988,7 @@ dependencies = [
 "diesel_table_macro_syntax",
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -997,7 +997,7 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5"
 dependencies = [
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -1026,7 +1026,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -1108,7 +1108,7 @@ checksum = "03cdc46ec28bd728e67540c528013c6a10eb69a02eb31078a1bda695438cbfb8"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -1325,7 +1325,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -1436,7 +1436,7 @@ dependencies = [
 "inflections",
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -1895,7 +1895,7 @@ dependencies = [

 [[package]]
 name = "kcl-lib"
-version = "0.1.53"
+version = "0.1.54"
 dependencies = [
 "anyhow",
 "approx 0.5.1",
@ -1959,14 +1959,14 @@ dependencies = [
 "pretty_assertions",
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
 name = "kittycad"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddc922f0da3abc22661bf49423c9bfcc02ce6ae92dae007ede6990874789545b"
+checksum = "2c6e12eb45fd9a28c8e99dbdef54556246b39acee14e4aa6f0fc43636caa62d9"
 dependencies = [
 "anyhow",
 "async-trait",
@ -2003,9 +2003,9 @@ dependencies = [

 [[package]]
 name = "kittycad-execution-plan"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae99665cd699f8800da8ea4b01889c0c9c61619d2a9dc62d1d5028f1b21110bd"
+checksum = "0936396491f132c163e9411a3dd699e5b2daa49c19436691c5153f7ad2d4953d"
 dependencies = [
 "bytes",
 "gltf-json",
@ -2032,7 +2032,7 @@ checksum = "0611fc9b9786175da21d895ffa0f65039e19c9111e94a41b7af999e3b95f045f"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -2048,9 +2048,9 @@ dependencies = [

 [[package]]
 name = "kittycad-modeling-cmds"
-version = "0.2.22"
+version = "0.2.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef6326553271cfb08d0143d9329f38cde162d5a0dcba1bd717c763d5361700d7"
+checksum = "c390a9f643aa00d2c3ffe880f1810066f52a13877ec3ecab858ff53cad84bd5e"
 dependencies = [
 "anyhow",
 "chrono",
@ -2083,7 +2083,7 @@ checksum = "385775cc9d5bf25579f3029824ca1a6e7ab1b7c338e972ec8e8fcefff801f353"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -2457,7 +2457,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -2614,7 +2614,7 @@ dependencies = [
 "regex",
 "regex-syntax 0.7.5",
 "structmeta 0.2.0",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -2628,7 +2628,7 @@ dependencies = [
 "regex",
 "regex-syntax 0.8.2",
 "structmeta 0.3.0",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -2694,7 +2694,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -2841,9 +2841,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.81"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
 "unicode-ident",
 ]
@ -3443,7 +3443,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "serde_derive_internals",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -3519,9 +3519,9 @@ checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"

 [[package]]
 name = "serde"
-version = "1.0.200"
+version = "1.0.201"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f"
+checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c"
 dependencies = [
 "serde_derive",
 ]
@ -3537,13 +3537,13 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.200"
+version = "1.0.201"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb"
+checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -3554,7 +3554,7 @@ checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -3577,7 +3577,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -3598,7 +3598,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "serde",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -3773,7 +3773,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "structmeta-derive 0.2.0",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -3785,7 +3785,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "structmeta-derive 0.3.0",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -3796,7 +3796,7 @@ checksum = "a60bcaff7397072dca0017d1db428e30d5002e00b6847703e2e42005c95fbe00"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -3807,7 +3807,7 @@ checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -3879,9 +3879,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "2.0.60"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
 "proc-macro2",
 "quote",
@ -3914,7 +3914,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -4000,22 +4000,22 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "1.0.59"
+version = "1.0.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa"
+checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.59"
+version = "1.0.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
+checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -4122,7 +4122,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -4285,7 +4285,7 @@ checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -4313,7 +4313,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -4390,7 +4390,7 @@ dependencies = [
 "Inflector",
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 "termcolor",
 ]

@ -4586,7 +4586,7 @@ dependencies = [
 "proc-macro-error",
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -4662,7 +4662,7 @@ dependencies = [
 "once_cell",
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 "wasm-bindgen-shared",
 ]

@ -4697,7 +4697,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
 ]
@ -5269,7 +5269,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
@ -5289,7 +5289,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.60",
+ "syn 2.0.61",
 ]

 [[package]]
--- a/src/wasm-lib/Cargo.toml
+++ b/src/wasm-lib/Cargo.toml
@ -62,11 +62,11 @@ members = [
 ]

 [workspace.dependencies]
-kittycad = { version = "0.3.0", default-features = false, features = ["js", "requests"] }
-kittycad-execution-plan = "0.1.5"
+kittycad = { version = "0.3.1", default-features = false, features = ["js", "requests"] }
+kittycad-execution-plan = "0.1.6"
 kittycad-execution-plan-macros = "0.1.9"
 kittycad-execution-plan-traits = "0.1.14"
-kittycad-modeling-cmds = "0.2.22"
+kittycad-modeling-cmds = "0.2.24"
 kittycad-modeling-session = "0.1.4"

 [[test]]
--- a/src/wasm-lib/derive-docs/Cargo.toml
+++ b/src/wasm-lib/derive-docs/Cargo.toml
@ -18,12 +18,12 @@ once_cell = "1.19.0"
 proc-macro2 = "1"
 quote = "1"
 regex = "1.10"
-serde = { version = "1.0.200", features = ["derive"] }
+serde = { version = "1.0.201", features = ["derive"] }
 serde_tokenstream = "0.2"
-syn = { version = "2.0.60", features = ["full"] }
+syn = { version = "2.0.61", features = ["full"] }

 [dev-dependencies]
-anyhow = "1.0.82"
+anyhow = "1.0.83"
 expectorate = "1.1.0"
 pretty_assertions = "1.4.0"
 rustfmt-wrapper = "0.2.1"
--- a/src/wasm-lib/grackle/Cargo.toml
+++ b/src/wasm-lib/grackle/Cargo.toml
@ -14,7 +14,7 @@ kittycad-execution-plan-traits = { workspace = true }
 kittycad-execution-plan-macros = { workspace = true }
 kittycad-modeling-cmds = { workspace = true }
 kittycad-modeling-session = { workspace = true }
-thiserror = "1.0.59"
+thiserror = "1.0.60"
 tokio = { version = "1.37.0", features = ["macros", "rt"] }
 twenty-twenty = "0.7.0"
 uuid = "1.8"
--- a/src/wasm-lib/grackle/fixtures/cube_lineTo.png
+++ b/src/wasm-lib/grackle/fixtures/cube_lineTo.png
--- a/src/wasm-lib/grackle/fixtures/cube_tangentialArcTo.png
+++ b/src/wasm-lib/grackle/fixtures/cube_tangentialArcTo.png
--- a/src/wasm-lib/grackle/fixtures/cube_xyLine.png
+++ b/src/wasm-lib/grackle/fixtures/cube_xyLine.png
--- a/src/wasm-lib/grackle/src/native_functions/sketch/stdlib_functions.rs
+++ b/src/wasm-lib/grackle/src/native_functions/sketch/stdlib_functions.rs
@ -642,14 +642,15 @@ impl Callable for StartSketchAt {
        // Next, enter sketch mode.
        stack_api_call(
            &mut instructions,
-            ModelingCmdEndpoint::SketchModeEnable,
+            ModelingCmdEndpoint::EnableSketchMode,
            None,
            Uuid::new_v4().into(),
            [
                Some(axes.z).into_parts(),
-                vec![false.into()], // animated
-                vec![false.into()], // ortho mode
-                vec![plane_id.into()],
+                vec![false.into()],    // adjust camera
+                vec![false.into()],    // animated
+                vec![false.into()],    // ortho mode
+                vec![plane_id.into()], // entity id (plane in this case)
            ],
        );

--- a/src/wasm-lib/kcl-macros/Cargo.toml
+++ b/src/wasm-lib/kcl-macros/Cargo.toml
@ -15,7 +15,7 @@ databake = "0.1.7"
 kcl-lib = { path = "../kcl" }
 proc-macro2 = "1"
 quote = "1"
-syn = { version = "2.0.60", features = ["full"] }
+syn = { version = "2.0.61", features = ["full"] }

 [dev-dependencies]
 pretty_assertions = "1.4.0"
--- a/src/wasm-lib/kcl/Cargo.toml
+++ b/src/wasm-lib/kcl/Cargo.toml
@ -1,7 +1,7 @@
 [package]
 name = "kcl-lib"
 description = "KittyCAD Language implementation and tools"
-version = "0.1.53"
+version = "0.1.54"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/KittyCAD/modeling-app"
@ -11,7 +11,7 @@ keywords = ["kcl", "KittyCAD", "CAD"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-anyhow = { version = "1.0.82", features = ["backtrace"] }
+anyhow = { version = "1.0.83", features = ["backtrace"] }
 async-recursion = "1.1.1"
 async-trait = "0.1.80"
 base64 = "0.22.1"
@ -33,10 +33,10 @@ parse-display = "0.9.0"
 reqwest = { version = "0.11.26", default-features = false, features = ["stream", "rustls-tls"] }
 ropey = "1.6.1"
 schemars = { version = "0.8.17", features = ["impl_json_schema", "url", "uuid1"] }
-serde = { version = "1.0.200", features = ["derive"] }
+serde = { version = "1.0.201", features = ["derive"] }
 serde_json = "1.0.116"
 sha2 = "0.10.8"
-thiserror = "1.0.59"
+thiserror = "1.0.60"
 toml = "0.8.12"
 ts-rs = { version = "7.1.1", features = ["uuid-impl", "url-impl", "chrono-impl"] }
 url = { version = "2.5.0", features = ["serde"] }
--- a/src/wasm-lib/kcl/src/std/sketch.rs
+++ b/src/wasm-lib/kcl/src/std/sketch.rs
@ -947,6 +947,7 @@ async fn start_sketch_on_face(
            ortho: false,
            entity_id: extrude_plane_id,
            adjust_camera: false,
+            planar_normal: None,
        },
    )
    .await?;
@ -1005,12 +1006,13 @@ async fn start_sketch_on_plane(data: PlaneData, args: Args) -> Result<Box<Plane>
    // Enter sketch mode on the plane.
    args.send_modeling_cmd(
        uuid::Uuid::new_v4(),
-        ModelingCmd::SketchModeEnable {
+        ModelingCmd::EnableSketchMode {
            animated: false,
            ortho: false,
-            plane_id: plane.id,
+            entity_id: plane.id,
            // We pass in the normal for the plane here.
-            disable_camera_with_plane: Some(plane.z_axis.clone().into()),
+            planar_normal: Some(plane.z_axis.clone().into()),
+            adjust_camera: false,
        },
    )
    .await?;
--- a/src/wasm-lib/kcl/tests/outputs/serial_test_example_arc0.png
+++ b/src/wasm-lib/kcl/tests/outputs/serial_test_example_arc0.png
--- a/src/wasm-lib/tests/executor/outputs/member_expression_in_params.png
+++ b/src/wasm-lib/tests/executor/outputs/member_expression_in_params.png
--- a/src/wasm-lib/tests/executor/outputs/tangential_arc.png
+++ b/src/wasm-lib/tests/executor/outputs/tangential_arc.png
--- a/src/wasm-lib/tests/executor/outputs/tangential_arc_to.png
+++ b/src/wasm-lib/tests/executor/outputs/tangential_arc_to.png
--- a/src/wasm-lib/tests/executor/outputs/tangential_arc_with_point.png
+++ b/src/wasm-lib/tests/executor/outputs/tangential_arc_with_point.png
--- a/src/wasm-lib/tests/modify/main.rs
+++ b/src/wasm-lib/tests/modify/main.rs
@ -67,11 +67,12 @@ async fn setup(code: &str, name: &str) -> Result<(ExecutorContext, Program, uuid
        .send_modeling_cmd(
            uuid::Uuid::new_v4(),
            SourceRange::default(),
-            ModelingCmd::SketchModeEnable {
+            ModelingCmd::EnableSketchMode {
                animated: false,
                ortho: true,
-                plane_id,
-                disable_camera_with_plane: Some(Point3D { x: 0.0, y: 0.0, z: 1.0 }),
+                entity_id: plane_id,
+                planar_normal: Some(Point3D { x: 0.0, y: 0.0, z: 1.0 }),
+                adjust_camera: false,
            },
        )
        .await?;
--- a/yarn.lock
+++ b/yarn.lock
@ -1831,10 +1831,10 @@
  resolved "https://registry.yarnpkg.com/@juggle/resize-observer/-/resize-observer-3.4.0.tgz#08d6c5e20cf7e4cc02fd181c4b0c225cd31dbb60"
  integrity sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==

-"@kittycad/lib@^0.0.58":
-  version "0.0.58"
-  resolved "https://registry.yarnpkg.com/@kittycad/lib/-/lib-0.0.58.tgz#4b47a295d8238e64d30d855336e4bcc4aab380f9"
-  integrity sha512-iSkJNXumtlEjey/K1Lsl/j1aVlcjcPONW7+6YwqccioKJ6zwSCgXF4AFB3oxVmM27Gm8YjEmaHxbcOhGP02X9g==
+"@kittycad/lib@^0.0.60":
+  version "0.0.60"
+  resolved "https://registry.yarnpkg.com/@kittycad/lib/-/lib-0.0.60.tgz#478aa1f750ab05cd4e67503de96f2f3bbc075329"
+  integrity sha512-LW9NFy2gv0pm1GJyquMXPiFKOBSdJJxYGkmacDton6jluGhAa8Qtcuj3O5vqUEeq9ObSM1Jt8gp39P9nvXG9yg==
  dependencies:
    node-fetch "3.3.2"
    openapi-types "^12.0.0"
Author	SHA1	Message	Date
Pierre Jacquier	da323e22d4	Cut release v0.21.0 (#2334 )	2024-05-10 16:23:04 -04:00
dependabot[bot]	8dc3628e9b	Bump kittycad-modeling-cmds from 0.2.23 to 0.2.24 in /src/wasm-lib (#2330 ) Bumps [kittycad-modeling-cmds](https://github.com/KittyCAD/modeling-api) from 0.2.23 to 0.2.24. - [Commits](https://github.com/KittyCAD/modeling-api/compare/kittycad-modeling-cmds-0.2.23...kittycad-modeling-cmds-0.2.24) --- updated-dependencies: - dependency-name: kittycad-modeling-cmds dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-05-09 11:38:43 -07:00
Frank Noirot	253744867b	Franknoirot/sketch light mode (#2328 )	2024-05-09 08:38:42 -04:00
Kurt Hutten	c45eb1e3e3	clean up old imports (#2331 )	2024-05-09 15:38:04 +10:00
Kurt Hutten	758aac9328	fix unreliable channel (#2329 ) * fix unreliable channel * add test for hovering	2024-05-09 15:04:33 +10:00
dependabot[bot]	309943cf2c	Bump proc-macro2 from 1.0.81 to 1.0.82 in /src/wasm-lib (#2321 ) Bumps [proc-macro2](https://github.com/dtolnay/proc-macro2) from 1.0.81 to 1.0.82. - [Release notes](https://github.com/dtolnay/proc-macro2/releases) - [Commits](https://github.com/dtolnay/proc-macro2/compare/1.0.81...1.0.82) --- updated-dependencies: - dependency-name: proc-macro2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-05-08 10:56:37 -07:00
dependabot[bot]	b3d4ab91fc	Bump serde from 1.0.200 to 1.0.201 in /src/wasm-lib (#2320 ) Bumps [serde](https://github.com/serde-rs/serde) from 1.0.200 to 1.0.201. - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.200...v1.0.201) --- updated-dependencies: - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-05-08 10:56:21 -07:00
Frank Noirot	5e73fa45f0	Remove useBackdropHighlight (#2323 )	2024-05-08 12:27:41 -04:00
Frank Noirot	17d23a17db	Move the command bar out to the right in the AppHeader (#2317 ) * Move the command bar out to the right in the AppHeader * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu) * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu) * trigger ci * trigger ci --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Kurt Hutten <k.hutten@protonmail.ch>	2024-05-08 09:57:16 -04:00
Jess Frazelle	0460f8eaee	Cut release v0.20.2 (#2319 ) Signed-off-by: Jess Frazelle <github@jessfraz.com>	2024-05-08 01:35:55 +00:00
Jess Frazelle	2077cdb6fc	remove code-pane stuff temporarily again (#2318 ) Signed-off-by: Jess Frazelle <github@jessfraz.com>	2024-05-08 01:21:52 +00:00
Frank Noirot	cb0b7e8169	Make "Extrude from command bar" test selection via 3D scene, not code (#2313 )	2024-05-07 20:01:52 -04:00
Pierre Jacquier	3a05211d30	Mac TestFlight in nightly runs only (#2312 )	2024-05-07 12:33:04 -07:00
Frank Noirot	d12d103cba	Franknoirot/refresh button add (#2314 ) * Add a simple refresh button * Add plausible event for when Refresh button is clicked	2024-05-07 14:33:11 -04:00
dependabot[bot]	04f6d3dcc8	Bump syn from 2.0.60 to 2.0.61 in /src/wasm-lib (#2310 ) Bumps [syn](https://github.com/dtolnay/syn) from 2.0.60 to 2.0.61. - [Release notes](https://github.com/dtolnay/syn/releases) - [Commits](https://github.com/dtolnay/syn/compare/2.0.60...2.0.61) --- updated-dependencies: - dependency-name: syn dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-05-07 09:40:21 -07:00
dependabot[bot]	9c9ffa0d03	Bump anyhow from 1.0.82 to 1.0.83 in /src/wasm-lib (#2309 ) Bumps [anyhow](https://github.com/dtolnay/anyhow) from 1.0.82 to 1.0.83. - [Release notes](https://github.com/dtolnay/anyhow/releases) - [Commits](https://github.com/dtolnay/anyhow/compare/1.0.82...1.0.83) --- updated-dependencies: - dependency-name: anyhow dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-05-07 09:40:13 -07:00
dependabot[bot]	c62b9f1f04	Bump thiserror from 1.0.59 to 1.0.60 in /src/wasm-lib (#2307 ) Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.59 to 1.0.60. - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.59...1.0.60) --- updated-dependencies: - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-05-07 09:40:06 -07:00
Frank Noirot	fcac3c72e4	Exit edit mode when selection input is up, re-enter when it's not. (#2306 )	2024-05-06 18:52:17 -04:00
Jess Frazelle	1e2f577a9f	tell the save dialog the file extension (#2303 ) Signed-off-by: Jess Frazelle <github@jessfraz.com>	2024-05-06 13:07:35 -07:00
Pierre Jacquier	1814f340fb	Disable tauri e2e tests on release (#2299 )	2024-05-06 11:25:08 +00:00
Kurt Hutten	43928f88aa	enable editor changes in sketch mode, refactor some of the code manager (#2287 ) * Revert "Revert "client side sketch updating properly with direct changes to t… (#2286)" This reverts commit `e7ab645267`. * rejig out side of xstate * test tweak * more test tweak * refactor some codeManager stuff * tsc * try and fix tests * revert small uneeded change * fix * snapshot tweak * more test tweak * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu) * small tweak * disable bad test * fmt --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2024-05-06 19:28:30 +10:00
Jess Frazelle	6959036688	Cut release v0.20.1 (#2292 ) bump jsons Signed-off-by: Jess Frazelle <github@jessfraz.com>	2024-05-03 15:18:10 -07:00
Jess Frazelle	570d0473c6	switch to new sketch mode api (#2295 ) * swtch to new api Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix ts Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix Signed-off-by: Jess Frazelle <github@jessfraz.com> * small changes Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> --------- Signed-off-by: Jess Frazelle <github@jessfraz.com>	2024-05-03 14:45:39 -07:00
Jess Frazelle	44f0d7c25c	turn on tauri app logging (#2296 ) * turn on tauri app logging Signed-off-by: Jess Frazelle <github@jessfraz.com> * fixups Signed-off-by: Jess Frazelle <github@jessfraz.com> * switch everything to logs; Signed-off-by: Jess Frazelle <github@jessfraz.com> * remove other shit logs Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix macos open Signed-off-by: Jess Frazelle <github@jessfraz.com> --------- Signed-off-by: Jess Frazelle <github@jessfraz.com>	2024-05-03 13:49:26 -07:00
Pierre Jacquier	3ccb04c4e7	Fix Create Release commit sha (#2293 )	2024-05-03 05:37:27 -04:00