Merge branch 'main' into toast-does-not-accept-Errors

.codespellrc

@@ -1,3 +1,3 @@
 [codespell]
-ignore-words-list: crate,everytime,inout,co-ordinate,ot,nwo,absolutey,atleast,ue
+ignore-words-list: crate,everytime,inout,co-ordinate,ot,nwo,absolutey,atleast
 skip: **/target,node_modules,build,**/Cargo.lock,./docs/kcl/*.md,./src-tauri/gen/schemas

.envrc

@@ -1 +0,0 @@
-use flake .

.github/workflows/cargo-check.yml

@@ -1,40 +0,0 @@
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - '**/Cargo.toml'
-      - '**/Cargo.lock'
-      - '**/rust-toolchain.toml'
-      - '**.rs'
-      - .github/workflows/cargo-check.yml
-  pull_request:
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-name: cargo check
-jobs:
-  cargocheck:
-    name: cargo check
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        dir: ['src/wasm-lib']
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install latest rust
-        uses: actions-rs/toolchain@v1
-        with:
-            toolchain: stable
-            override: true
-
-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2.6.1
-
-      - name: Run check
-        run: |
-          cd "${{ matrix.dir }}"
-          # We specifically want to test the disable-println feature
-          # Since it is not enabled by default, we need to specify it
-          # This is used in kcl-lsp
-          cargo check --all --features disable-println --features pyo3

.github/workflows/cargo-clippy.yml

@@ -9,12 +9,6 @@ on:
       - '**.rs'
       - .github/workflows/cargo-clippy.yml
   pull_request:
-    paths:
-      - '**/Cargo.toml'
-      - '**/Cargo.lock'
-      - '**/rust-toolchain.toml'
-      - '**.rs'
-      - .github/workflows/cargo-clippy.yml
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
@@ -60,8 +54,3 @@ jobs:
         run: |
           cd "${{ matrix.dir }}"
           cargo clippy --all --tests --benches -- -D warnings
-      # If this fails, run "cargo check" to update Cargo.lock,
-      # then add Cargo.lock to the PR.
-      - name: Check Cargo.lock doesn't need updating
-        run: |
-          cargo check --locked || echo "Pls run cargo check and commit the changed Cargo.lock"

.github/workflows/ci.yml

@@ -180,7 +180,9 @@ jobs:
       - name: Setup Rust
         uses: dtolnay/rust-toolchain@stable
 
+      # TODO: re-enable for Windows builds, see https://github.com/tauri-apps/tauri/issues/9045
       - name: Setup Rust cache
+        if: matrix.os != 'windows-latest'
         uses: swatinem/rust-cache@v2
         with:
           workspaces: './src-tauri -> target'

.github/workflows/playwright.yml

@@ -46,18 +46,12 @@ jobs:
     - uses: KittyCAD/action-install-cli@main
     - name: Install dependencies
       run: yarn
-    - name: Cache Playwright Browsers
-      uses: actions/cache@v4
-      with:
-        path: |
-          ~/.cache/ms-playwright/
-        key: ${{ runner.os }}-playwright-${{ hashFiles('yarn.lock') }}
     - name: Install Playwright Browsers
       run: yarn playwright install --with-deps
     - name: Download Wasm Cache
       id: download-wasm
       if: needs.check-rust-changes.outputs.rust-changed == 'false'
-      uses: dawidd6/action-download-artifact@v6
+      uses: dawidd6/action-download-artifact@v3
       continue-on-error: true
       with:
         github_token: ${{secrets.GITHUB_TOKEN}}
@@ -133,7 +127,7 @@ jobs:
     - uses: actions/upload-artifact@v3
       if: always()
       with:
-        name: playwright-report-ubuntu
+        name: playwright-report
         path: playwright-report/
         retention-days: 30
 
@@ -149,20 +143,12 @@ jobs:
         cache: 'yarn'
     - name: Install dependencies
       run: yarn
-    - name: Cache Playwright Browsers
-      uses: actions/cache@v4
-      with:
-        path: |
-          ~/.cache/ms-playwright
-        key: ${{ runner.os }}-playwright-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-playwright-
     - name: Install Playwright Browsers
       run: yarn playwright install --with-deps
     - name: Download Wasm Cache
       id: download-wasm
       if: needs.check-rust-changes.outputs.rust-changed == 'false'
-      uses: dawidd6/action-download-artifact@v6
+      uses: dawidd6/action-download-artifact@v3
       continue-on-error: true
       with:
         github_token: ${{secrets.GITHUB_TOKEN}}
@@ -204,6 +190,6 @@ jobs:
     - uses: actions/upload-artifact@v3
       if: always()
       with:
-        name: playwright-report-macos
+        name: playwright-report
         path: playwright-report/
         retention-days: 30

.gitignore

@@ -17,7 +17,6 @@
 .env.development.local
 .env.test.local
 .env.production.local
-.direnv
 
 npm-debug.log*
 yarn-debug.log*

Makefile

@@ -1,14 +0,0 @@
-.PHONY: dev
-
-WASM_LIB_FILES := $(wildcard src/wasm-lib/**/*.rs)
-
-dev: node_modules public/wasm_lib_bg.wasm
-	yarn start
-
-public/wasm_lib_bg.wasm: $(WASM_LIB_FILES)
-	yarn build:wasm-dev
-
-node_modules: package.json
-
-package.json:
-	yarn install

README.md

@@ -197,32 +197,28 @@ For more information on fuzzing you can check out
 
 ### Playwright
 
-For a portable way to run Playwright you'll need Docker.
-
-After that, open a terminal and run:
+First time running plawright locally, you'll need to add the secrets file
 
 ```bash
-docker run --network host  --rm --init -it playwright/chrome:playwright-1.43.1
+touch ./e2e/playwright/playwright-secrets.env
+printf 'token="your-token"\nsnapshottoken="your-snapshot-token"' > ./e2e/playwright/playwright-secrets.env
 ```
 
-and in another terminal, run:
-
-```bash
-PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:4444/ yarn playwright test --project="Google Chrome" <test suite>
-```
-
-An example of a `<test suite>` is: `e2e/playwright/flow-tests.spec.ts`
-
-YOU WILL NEED A PLAYWRIGHT-SECRETS.ENV FILE:
-
-
-```bash
-# ./e2e/playwright/playwright-secrets.env
-token=<your-token>
-snapshottoken=<your-snapshot-token>
-```
 then replace "your-token" with a dev token from dev.zoo.dev/account/api-tokens
 
+then:
+run playwright
+
+```
+yarn playwright test
+```
+
+run a specific test suite
+
+```
+yarn playwright test src/e2e-tests/example.spec.ts
+```
+
 run a specific test change the test from `test('...` to `test.only('...`
 (note if you commit this, the tests will instantly fail without running any of the tests)
 
@@ -319,7 +315,7 @@ PS: for the debug panel, the following JSON is useful for snapping the camera
 
 ```
 yarn install
-yarn build:wasm-dev
+yarn build:wasm
 cp src/wasm-lib/pkg/wasm_lib_bg.wasm public
 yarn vite build --mode development
 yarn tauri build --debug -b

docs/kcl/index.md

@@ -23,7 +23,6 @@ layout: manual
 * [`atan`](kcl/atan)
 * [`bezierCurve`](kcl/bezierCurve)
 * [`ceil`](kcl/ceil)
-* [`chamfer`](kcl/chamfer)
 * [`circle`](kcl/circle)
 * [`close`](kcl/close)
 * [`cos`](kcl/cos)
@@ -65,7 +64,6 @@ layout: manual
 * [`segEndX`](kcl/segEndX)
 * [`segEndY`](kcl/segEndY)
 * [`segLen`](kcl/segLen)
-* [`shell`](kcl/shell)
 * [`sin`](kcl/sin)
 * [`sqrt`](kcl/sqrt)
 * [`startProfileAt`](kcl/startProfileAt)

docs/kcl/patternCircular2d.md

@@ -9,7 +9,7 @@ A circular pattern on a 2D sketch.
 
 
 ```js
-patternCircular2d(data: CircularPattern2dData, sketch_group_set: SketchGroupSet) -> [SketchGroup]
+patternCircular2d(data: CircularPattern2dData, sketch_group: SketchGroup) -> [SketchGroup]
 ```
 
 ### Examples
@@ -48,7 +48,7 @@ const example = extrude(1, exampleSketch)
 	rotateDuplicates: string,
 }
 ```
-* `sketch_group_set`: `SketchGroupSet` - A sketch group or a group of sketch groups. (REQUIRED)
+* `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
 	// The plane id or face id of the sketch group.
@@ -129,7 +129,6 @@ const example = extrude(1, exampleSketch)
 	// The to point.
 	to: [number, number],
 },
-	type: "sketchGroup",
 	// The paths in the sketch group.
 	value: [{
 	// The from point.
@@ -213,9 +212,6 @@ const example = extrude(1, exampleSketch)
 	y: number,
 	z: number,
 },
-} |
-{
-	type: "sketchGroups",
 }
 ```
 

docs/kcl/patternCircular3d.md

@@ -9,7 +9,7 @@ A circular pattern on a 3D model.
 
 
 ```js
-patternCircular3d(data: CircularPattern3dData, extrude_group_set: ExtrudeGroupSet) -> [ExtrudeGroup]
+patternCircular3d(data: CircularPattern3dData, extrude_group: ExtrudeGroup) -> [ExtrudeGroup]
 ```
 
 ### Examples
@@ -47,7 +47,7 @@ const example = extrude(-5, exampleSketch)
 	rotateDuplicates: string,
 }
 ```
-* `extrude_group_set`: `ExtrudeGroupSet` - A extrude group or a group of extrude groups. (REQUIRED)
+* `extrude_group`: `ExtrudeGroup` - An extrude group is a collection of extrude surfaces. (REQUIRED)
 ```js
 {
 	// The id of the extrusion end cap
@@ -127,7 +127,6 @@ const example = extrude(-5, exampleSketch)
 }],
 	// The id of the extrusion start cap
 	startCapId: uuid,
-	type: "extrudeGroup",
 	// The extrude surfaces.
 	value: [{
 	// The face id for the extrude plane.
@@ -177,9 +176,6 @@ const example = extrude(-5, exampleSketch)
 	y: number,
 	z: number,
 },
-} |
-{
-	type: "extrudeGroups",
 }
 ```
 

docs/kcl/patternLinear3d.md

@@ -9,7 +9,7 @@ A linear pattern on a 3D model.
 
 
 ```js
-patternLinear3d(data: LinearPattern3dData, extrude_group_set: ExtrudeGroupSet) -> [ExtrudeGroup]
+patternLinear3d(data: LinearPattern3dData, extrude_group: ExtrudeGroup) -> [ExtrudeGroup]
 ```
 
 ### Examples
@@ -45,7 +45,7 @@ const example = extrude(1, exampleSketch)
 	repetitions: number,
 }
 ```
-* `extrude_group_set`: `ExtrudeGroupSet` - A extrude group or a group of extrude groups. (REQUIRED)
+* `extrude_group`: `ExtrudeGroup` - An extrude group is a collection of extrude surfaces. (REQUIRED)
 ```js
 {
 	// The id of the extrusion end cap
@@ -125,7 +125,6 @@ const example = extrude(1, exampleSketch)
 }],
 	// The id of the extrusion start cap
 	startCapId: uuid,
-	type: "extrudeGroup",
 	// The extrude surfaces.
 	value: [{
 	// The face id for the extrude plane.
@@ -175,9 +174,6 @@ const example = extrude(1, exampleSketch)
 	y: number,
 	z: number,
 },
-} |
-{
-	type: "extrudeGroups",
 }
 ```
 

e2e/playwright/snapshot-tests.spec.ts

@@ -405,16 +405,17 @@ test('Draft segments should look right', async ({ page, context }) => {
   // select a plane
   await page.mouse.click(700, 200)
 
-  let code = `const sketch001 = startSketchOn('XZ')`
-  await expect(page.locator('.cm-content')).toHaveText(code)
+  await expect(page.locator('.cm-content')).toHaveText(
+    `const part001 = startSketchOn('XZ')`
+  )
 
-  await page.waitForTimeout(700) // TODO detect animation ending, or disable animation
+  await page.waitForTimeout(300) // TODO detect animation ending, or disable animation
 
   const startXPx = 600
   await page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10)
-  code += `
-  |> startProfileAt([7.19, -9.7], %)`
-  await expect(page.locator('.cm-content')).toHaveText(code)
+  await expect(page.locator('.cm-content'))
+    .toHaveText(`const part001 = startSketchOn('XZ')
+  |> startProfileAt([9.06, -12.22], %)`)
   await page.waitForTimeout(100)
 
   await u.closeDebugPanel()
@@ -426,9 +427,10 @@ test('Draft segments should look right', async ({ page, context }) => {
   await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 10)
   await page.waitForTimeout(100)
 
-  code += `
-  |> line([7.25, 0], %)`
-  await expect(page.locator('.cm-content')).toHaveText(code)
+  await expect(page.locator('.cm-content'))
+    .toHaveText(`const part001 = startSketchOn('XZ')
+  |> startProfileAt([9.06, -12.22], %)
+  |> line([9.14, 0], %)`)
 
   await page.getByRole('button', { name: 'Tangential Arc' }).click()
 
@@ -463,7 +465,7 @@ test('Draft rectangles should look right', async ({ page, context }) => {
   await page.mouse.click(700, 200)
 
   await expect(page.locator('.cm-content')).toHaveText(
-    `const sketch001 = startSketchOn('XZ')`
+    `const part001 = startSketchOn('XZ')`
   )
 
   await page.waitForTimeout(500) // TODO detect animation ending, or disable animation
@@ -511,16 +513,17 @@ test.describe('Client side scene scale should match engine scale', () => {
     // select a plane
     await page.mouse.click(700, 200)
 
-    let code = `const sketch001 = startSketchOn('XZ')`
-    await expect(page.locator('.cm-content')).toHaveText(code)
+    await expect(page.locator('.cm-content')).toHaveText(
+      `const part001 = startSketchOn('XZ')`
+    )
 
-    await page.waitForTimeout(600) // TODO detect animation ending, or disable animation
+    await page.waitForTimeout(300) // TODO detect animation ending, or disable animation
 
     const startXPx = 600
     await page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10)
-    code += `
-  |> startProfileAt([7.19, -9.7], %)`
-    await expect(u.codeLocator).toHaveText(code)
+    await expect(page.locator('.cm-content'))
+      .toHaveText(`const part001 = startSketchOn('XZ')
+    |> startProfileAt([9.06, -12.22], %)`)
     await page.waitForTimeout(100)
 
     await u.closeDebugPanel()
@@ -528,18 +531,21 @@ test.describe('Client side scene scale should match engine scale', () => {
     await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 10)
     await page.waitForTimeout(100)
 
-    code += `
-  |> line([7.25, 0], %)`
-    await expect(u.codeLocator).toHaveText(code)
+    await expect(page.locator('.cm-content'))
+      .toHaveText(`const part001 = startSketchOn('XZ')
+    |> startProfileAt([9.06, -12.22], %)
+    |> line([9.14, 0], %)`)
 
     await page.getByRole('button', { name: 'Tangential Arc' }).click()
     await page.waitForTimeout(100)
 
     await page.mouse.click(startXPx + PUR * 30, 500 - PUR * 20)
 
-    code += `
-  |> tangentialArcTo([21.7, -2.44], %)`
-    await expect(u.codeLocator).toHaveText(code)
+    await expect(page.locator('.cm-content'))
+      .toHaveText(`const part001 = startSketchOn('XZ')
+    |> startProfileAt([9.06, -12.22], %)
+    |> line([9.14, 0], %)
+    |> tangentialArcTo([27.34, -3.08], %)`)
 
     // click tangential arc tool again to unequip it
     await page.getByRole('button', { name: 'Tangential Arc' }).click()
@@ -610,16 +616,17 @@ test.describe('Client side scene scale should match engine scale', () => {
     // select a plane
     await page.mouse.click(700, 200)
 
-    let code = `const sketch001 = startSketchOn('XZ')`
-    await expect(u.codeLocator).toHaveText(code)
+    await expect(page.locator('.cm-content')).toHaveText(
+      `const part001 = startSketchOn('XZ')`
+    )
 
-    await page.waitForTimeout(600) // TODO detect animation ending, or disable animation
+    await page.waitForTimeout(300) // TODO detect animation ending, or disable animation
 
     const startXPx = 600
     await page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10)
-    code += `
-  |> startProfileAt([182.59, -246.32], %)`
-    await expect(u.codeLocator).toHaveText(code)
+    await expect(page.locator('.cm-content'))
+      .toHaveText(`const part001 = startSketchOn('XZ')
+      |> startProfileAt([230.03, -310.32], %)`)
     await page.waitForTimeout(100)
 
     await u.closeDebugPanel()
@@ -627,18 +634,21 @@ test.describe('Client side scene scale should match engine scale', () => {
     await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 10)
     await page.waitForTimeout(100)
 
-    code += `
-  |> line([184.3, 0], %)`
-    await expect(u.codeLocator).toHaveText(code)
+    await expect(page.locator('.cm-content'))
+      .toHaveText(`const part001 = startSketchOn('XZ')
+      |> startProfileAt([230.03, -310.32], %)
+      |> line([232.2, 0], %)`)
 
     await page.getByRole('button', { name: 'Tangential Arc' }).click()
     await page.waitForTimeout(100)
 
     await page.mouse.click(startXPx + PUR * 30, 500 - PUR * 20)
 
-    code += `
-  |> tangentialArcTo([551.2, -62.01], %)`
-    await expect(u.codeLocator).toHaveText(code)
+    await expect(page.locator('.cm-content'))
+      .toHaveText(`const part001 = startSketchOn('XZ')
+      |> startProfileAt([230.03, -310.32], %)
+      |> line([232.2, 0], %)
+      |> tangentialArcTo([694.43, -78.12], %)`)
 
     await page.getByRole('button', { name: 'Tangential Arc' }).click()
     await page.waitForTimeout(100)

e2e/playwright/storageStates.ts

@@ -1,6 +1,5 @@
 import { SaveSettingsPayload } from 'lib/settings/settingsTypes'
 import { Themes } from 'lib/theme'
-import { onboardingPaths } from 'routes/Onboarding/paths'
 
 export const TEST_SETTINGS_KEY = '/settings.toml'
 export const TEST_SETTINGS = {
@@ -23,22 +22,9 @@ export const TEST_SETTINGS = {
   },
 } satisfies Partial<SaveSettingsPayload>
 
-export const TEST_SETTINGS_ONBOARDING_USER_MENU = {
-  ...TEST_SETTINGS,
-  app: { ...TEST_SETTINGS.app, onboardingStatus: onboardingPaths.USER_MENU },
-} satisfies Partial<SaveSettingsPayload>
-
 export const TEST_SETTINGS_ONBOARDING_EXPORT = {
   ...TEST_SETTINGS,
-  app: { ...TEST_SETTINGS.app, onboardingStatus: onboardingPaths.EXPORT },
-} satisfies Partial<SaveSettingsPayload>
-
-export const TEST_SETTINGS_ONBOARDING_PARAMETRIC_MODELING = {
-  ...TEST_SETTINGS,
-  app: {
-    ...TEST_SETTINGS.app,
-    onboardingStatus: onboardingPaths.PARAMETRIC_MODELING,
-  },
+  app: { ...TEST_SETTINGS.app, onboardingStatus: '/export' },
 } satisfies Partial<SaveSettingsPayload>
 
 export const TEST_SETTINGS_ONBOARDING_START = {
@@ -64,25 +50,3 @@ export const TEST_SETTINGS_CORRUPTED = {
     textWrapping: true,
   },
 } satisfies Partial<SaveSettingsPayload>
-
-export const TEST_CODE_GIZMO = `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, %)
-`

e2e/playwright/test-utils.ts

@@ -1,6 +1,5 @@
 import { test, expect, Page, Download } from '@playwright/test'
 import { EngineCommand } from '../../src/lang/std/engineConnection'
-import os from 'os'
 import fsp from 'fs/promises'
 import pixelMatch from 'pixelmatch'
 import { PNG } from 'pngjs'
@@ -12,16 +11,14 @@ async function waitForPageLoad(page: Page) {
   // wait for 'Loading stream...' spinner
   await page.getByTestId('loading-stream').waitFor()
   // wait for all spinners to be gone
-  await page
-    .getByTestId('loading')
-    .waitFor({ state: 'detached', timeout: 20_000 })
+  await page.getByTestId('loading').waitFor({ state: 'detached' })
 
   await page.getByTestId('start-sketch').waitFor()
 }
 
 async function removeCurrentCode(page: Page) {
   const hotkey = process.platform === 'darwin' ? 'Meta' : 'Control'
-  await page.locator('.cm-content').click()
+  await page.click('.cm-content')
   await page.keyboard.down(hotkey)
   await page.keyboard.press('a')
   await page.keyboard.up(hotkey)
@@ -30,12 +27,12 @@ async function removeCurrentCode(page: Page) {
 }
 
 async function sendCustomCmd(page: Page, cmd: EngineCommand) {
-  await page.getByTestId('custom-cmd-input').fill(JSON.stringify(cmd))
-  await page.getByTestId('custom-cmd-send-button').click()
+  await page.fill('[data-testid="custom-cmd-input"]', JSON.stringify(cmd))
+  await page.click('[data-testid="custom-cmd-send-button"]')
 }
 
 async function clearCommandLogs(page: Page) {
-  await page.getByTestId('clear-commands').click()
+  await page.click('[data-testid="clear-commands"]')
 }
 
 async function expectCmdLog(page: Page, locatorStr: string) {
@@ -99,74 +96,6 @@ async function waitForCmdReceive(page: Page, commandType: string) {
     .waitFor()
 }
 
-export const wiggleMove = async (
-  page: any,
-  x: number,
-  y: number,
-  steps: number,
-  dist: number,
-  ang: number,
-  amplitude: number,
-  freq: number
-) => {
-  const tau = Math.PI * 2
-  const deg = tau / 360
-  const step = dist / steps
-  for (let i = 0, j = 0; i < dist; i += step, j += 1) {
-    const [x1, y1] = [0, Math.sin((tau / steps) * j * freq) * amplitude]
-    const [x2, y2] = [
-      Math.cos(-ang * deg) * i - Math.sin(-ang * deg) * y1,
-      Math.sin(-ang * deg) * i + Math.cos(-ang * deg) * y1,
-    ]
-    const [xr, yr] = [x2, y2]
-    await page.mouse.move(x + xr, y + yr, { steps: 2 })
-  }
-}
-
-export const getMovementUtils = (opts: any) => {
-  // The way we truncate is kinda odd apparently, so we need this function
-  // "[k]itty[c]ad round"
-  const kcRound = (n: number) => Math.trunc(n * 100) / 100
-
-  // To translate between screen and engine ("[U]nit") coordinates
-  // NOTE: these pretty much can't be perfect because of screen scaling.
-  // Handle on a case-by-case.
-  const toU = (x: number, y: number) => [
-    kcRound(x * 0.0678),
-    kcRound(-y * 0.0678), // Y is inverted in our coordinate system
-  ]
-
-  // Turn the array into a string with specific formatting
-  const fromUToString = (xy: number[]) => `[${xy[0]}, ${xy[1]}]`
-
-  // Combine because used often
-  const toSU = (xy: number[]) => fromUToString(toU(xy[0], xy[1]))
-
-  // Make it easier to click around from center ("click [from] zero zero")
-  const click00 = (x: number, y: number) =>
-    opts.page.mouse.click(opts.center.x + x, opts.center.y + y)
-
-  // Relative clicker, must keep state
-  let last = { x: 0, y: 0 }
-  const click00r = (x?: number, y?: number) => {
-    // reset relative coordinates when anything is undefined
-    if (x === undefined || y === undefined) {
-      last.x = 0
-      last.y = 0
-      return
-    }
-
-    const ret = click00(last.x + x, last.y + y)
-    last.x += x
-    last.y += y
-
-    // Returns the new absolute coordinate if you need it.
-    return ret.then(() => [last.x, last.y])
-  }
-
-  return { toSU, click00r }
-}
-
 export async function getUtils(page: Page) {
   // Chrome devtools protocol session only works in Chromium
   const browserType = page.context().browser()?.browserType().name()
@@ -212,21 +141,15 @@ export async function getUtils(page: Page) {
       const angleXOffset = Math.cos(((angle - 180) * Math.PI) / 180) * px
       const angleYOffset = Math.sin(((angle - 180) * Math.PI) / 180) * px
       return {
-        x: Math.round(bbox.x + angleXOffset),
-        y: Math.round(bbox.y - angleYOffset),
+        x: bbox.x + angleXOffset,
+        y: bbox.y - angleYOffset,
       }
     },
-    getAngle: async (locator: string) => {
-      const overlay = page.locator(locator)
-      return Number(await overlay.getAttribute('data-overlay-angle'))
-    },
     getBoundingBox: async (locator: string) =>
       page
         .locator(locator)
         .boundingBox()
-        .then((box) => ({ ...box, x: box?.x || 0, y: box?.y || 0 })),
-    codeLocator: page.locator('.cm-content'),
-    canvasLocator: page.getByTestId('client-side-scene'),
+        .then((box) => ({ x: box?.x || 0, y: box?.y || 0 })),
     doAndWaitForCmd: async (
       fn: () => Promise<void>,
       commandType: string,
@@ -242,30 +165,6 @@ export async function getUtils(page: Page) {
         await closeDebugPanel(page)
       }
     },
-    /**
-     * Given an expected RGB value, diff if the channel with the largest difference
-     */
-    getGreatestPixDiff: async (
-      coords: { x: number; y: number },
-      expected: [number, number, number]
-    ): Promise<number> => {
-      const buffer = await page.screenshot({
-        fullPage: true,
-      })
-      const screenshot = await PNG.sync.read(buffer)
-      // most likely related to pixel density but the screenshots for webkit are 2x the size
-      // there might be a more robust way of doing this.
-      const pixMultiplier = browserType === 'webkit' ? 2 : 1
-      const index =
-        (screenshot.width * coords.y * pixMultiplier +
-          coords.x * pixMultiplier) *
-        4 // rbga is 4 channels
-      return Math.max(
-        Math.abs(screenshot.data[index] - expected[0]),
-        Math.abs(screenshot.data[index + 1] - expected[1]),
-        Math.abs(screenshot.data[index + 2] - expected[2])
-      )
-    },
     doAndWaitForImageDiff: (fn: () => Promise<any>, diffCount = 200) =>
       new Promise(async (resolve) => {
         await page.screenshot({
@@ -467,8 +366,3 @@ export const doExport = async (
     outputType: output.type,
   }
 }
-
-/**
- * Gets the appropriate modifier key for the platform.
- */
-export const metaModifier = os.platform() === 'darwin' ? 'Meta' : 'Control'

e2e/tauri/specs/auth.e2e.ts

@@ -2,7 +2,6 @@ import { browser, $, expect } from '@wdio/globals'
 import fs from 'fs/promises'
 import path from 'path'
 import os from 'os'
-import { click, setDatasetValue } from '../utils'
 
 const isWin32 = os.platform() === 'win32'
 const documentsDir = path.join(os.homedir(), 'Documents')
@@ -16,8 +15,25 @@ const newProjectDir = path.join(documentsDir, 'a-different-directory')
 const tmp = process.env.TEMP || '/tmp'
 const userCodeDir = path.join(tmp, 'kittycad_user_code')
 
-describe('ZMA sign in flow', () => {
-  before(async () => {
+async function click(element: WebdriverIO.Element): Promise<void> {
+  // Workaround for .click(), see https://github.com/tauri-apps/tauri/issues/6541
+  await element.waitForClickable()
+  await browser.execute('arguments[0].click();', element)
+}
+
+/* Shoutout to @Sheap on Github for a great workaround utility:
+ * https://github.com/tauri-apps/tauri/issues/6541#issue-1638944060
+ */
+async function setDatasetValue(
+  field: WebdriverIO.Element,
+  property: string,
+  value: string
+) {
+  await browser.execute(`arguments[0].dataset.${property} = "${value}"`, field)
+}
+
+describe('ZMA (Tauri)', () => {
+  it('opens the auth page and signs in', async () => {
     // Clean up filesystem from previous tests
     await new Promise((resolve) => setTimeout(resolve, 100))
     await fs.rm(defaultProjectDir, { force: true, recursive: true })
@@ -26,9 +42,7 @@ describe('ZMA sign in flow', () => {
     await fs.rm(userSettingsDir, { force: true, recursive: true })
     await fs.mkdir(defaultProjectDir, { recursive: true })
     await fs.mkdir(newProjectDir, { recursive: true })
-  })
 
-  it('opens the auth page and signs in', async () => {
     const signInButton = await $('[data-testid="sign-in-button"]')
     expect(await signInButton.getText()).toEqual('Sign in')
 
@@ -68,10 +82,6 @@ describe('ZMA sign in flow', () => {
     const newFileButton = await $('[data-testid="home-new-file"]')
     expect(await newFileButton.getText()).toEqual('New project')
   })
-})
-
-describe('ZMA authorized user flows', () => {
-  // Note: each flow below is intended to start *and* end from the home page
 
   it('opens the settings page, checks filesystem settings, and closes the settings page', async () => {
     const menuButton = await $('[data-testid="user-sidebar-toggle"]')
@@ -140,11 +150,8 @@ describe('ZMA authorized user flows', () => {
     const base = isWin32 ? 'http://tauri.localhost' : 'tauri://localhost'
     await browser.execute(`window.location.href = "${base}/home"`)
   })
-})
 
-describe('ZMA sign out flow', () => {
   it('signs out', async () => {
-    await new Promise((resolve) => setTimeout(resolve, 1000))
     const menuButton = await $('[data-testid="user-sidebar-toggle"]')
     await click(menuButton)
     const signoutButton = await $('[data-testid="user-sidebar-sign-out"]')

e2e/tauri/utils.ts

@@ -1,18 +0,0 @@
-import { browser } from '@wdio/globals'
-
-export async function click(element: WebdriverIO.Element): Promise<void> {
-  // Workaround for .click(), see https://github.com/tauri-apps/tauri/issues/6541
-  await element.waitForClickable()
-  await browser.execute('arguments[0].click();', element)
-}
-
-/* Shoutout to @Sheap on Github for a great workaround utility:
- * https://github.com/tauri-apps/tauri/issues/6541#issue-1638944060
- */
-export async function setDatasetValue(
-  field: WebdriverIO.Element,
-  property: string,
-  value: string
-) {
-  await browser.execute(`arguments[0].dataset.${property} = "${value}"`, field)
-}

flake.lock

@@ -1,62 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1718470082,
-        "narHash": "sha256-u2F0MMYE+Efc+ocruTbtU/wWHuYHWcJafp5zJ++n/YE=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "3027ba73dfef68eb555fc2fa97aed4e999e74f97",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1718428119,
-        "narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e6cea36f83499eb4e9cd184c8a8e823296b50ad5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs",
-        "rust-overlay": "rust-overlay"
-      }
-    },
-    "rust-overlay": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1718681902,
-        "narHash": "sha256-E/T7Ge6ayEQe7FVKMJqDBoHyLhRhjc6u9CmU8MyYfy0=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "16c8ad83297c278eebe740dea5491c1708960dd1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

flake.nix

@@ -1,70 +0,0 @@
-{
-  description = "modeling-app development environment";
-
-  # Flake inputs
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    rust-overlay.url = "github:oxalica/rust-overlay"; # A helper for Rust + Nix
-  };
-
-  # Flake outputs
-  outputs = { self, nixpkgs, rust-overlay }:
-    let
-      # Overlays enable you to customize the Nixpkgs attribute set
-      overlays = [
-        # Makes a `rust-bin` attribute available in Nixpkgs
-        (import rust-overlay)
-        # Provides a `rustToolchain` attribute for Nixpkgs that we can use to
-        # create a Rust environment
-        (self: super: {
-          rustToolchain = super. rust-bin.stable.latest.default.override {
-            targets = [ "wasm32-unknown-unknown" ];
-            extensions = [ "rustfmt" "llvm-tools-preview" ];
-          };
-        })
-      ];
-
-      # Systems supported
-      allSystems = [
-        "x86_64-linux" # 64-bit Intel/AMD Linux
-        "aarch64-linux" # 64-bit ARM Linux
-        "x86_64-darwin" # 64-bit Intel macOS
-        "aarch64-darwin" # 64-bit ARM macOS
-      ];
-
-      # Helper to provide system-specific attributes
-      forAllSystems = f: nixpkgs.lib.genAttrs allSystems (system: f {
-        pkgs = import nixpkgs { inherit overlays system; };
-      });
-
-    in
-    {
-      # Development environment output
-      devShells = forAllSystems ({ pkgs }: {
-        default = pkgs.mkShell {
-          # The Nix packages provided in the environment
-          packages = (with pkgs; [
-            # The package provided by our custom overlay. Includes cargo, Clippy, cargo-fmt,
-            # rustdoc, rustfmt, and other tools.
-            rustToolchain
-
-            cargo-llvm-cov
-            cargo-nextest
-
-            just
-            postgresql.lib
-            openssl
-            pkg-config
-
-            nodejs_22
-          ]) ++ pkgs.lib.optionals pkgs.stdenv.isDarwin (with pkgs; [
-            libiconv 
-            darwin.apple_sdk.frameworks.Security
-          ]);
-
-          TARGET_CC = "${pkgs.stdenv.cc}/bin/${pkgs.stdenv.cc.targetPrefix}cc";
-          LIBCLANG_PATH = "${pkgs.libclang.lib}/lib";
-        };
-      });
-    };
-}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "untitled-app",
-  "version": "0.22.3",
+  "version": "0.22.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.67",
+    "@kittycad/lib": "^0.0.63",
     "@lezer/javascript": "^1.4.9",
     "@open-rpc/client-js": "^1.8.1",
     "@react-hook/resize-observer": "^2.0.1",
@@ -95,8 +95,7 @@
     "lint": "eslint --fix src",
     "bump-jsons": "echo \"$(jq --arg v \"$VERSION\" '.version=$v' package.json --indent 2)\" > package.json && echo \"$(jq --arg v \"$VERSION\" '.version=$v' src-tauri/tauri.conf.json --indent 2)\" > src-tauri/tauri.conf.json",
     "postinstall": "yarn xstate:typegen",
-    "xstate:typegen": "yarn xstate typegen \"src/**/*.ts?(x)\"",
-    "make:dev": "make dev"
+    "xstate:typegen": "yarn xstate typegen \"src/**/*.ts?(x)\""
   },
   "prettier": {
     "trailingComma": "es5",

playwright.config.ts

@@ -12,12 +12,12 @@ import { defineConfig, devices } from '@playwright/test'
 export default defineConfig({
   testDir: './e2e/playwright',
   /* Run tests in files in parallel */
-  fullyParallel: false,
+  fullyParallel: true,
   /* Fail the build on CI if you accidentally left test.only in the source code. */
   forbidOnly: !!process.env.CI,
   /* Retry on CI only */
   retries: process.env.CI ? 3 : 0,
-  /* Different amount of parallelism on CI and local. */
+  /* Opt out of parallel tests on CI. */
   workers: process.env.CI ? 1 : 1,
   /* Reporter to use. See https://playwright.dev/docs/test-reporters */
   reporter: 'html',
@@ -34,14 +34,7 @@ export default defineConfig({
   projects: [
     {
       name: 'Google Chrome',
-      use: {
-        ...devices['Desktop Chrome'],
-        channel: 'chrome',
-        contextOptions: {
-          /* Chromium is the only one with these permission types */
-          permissions: ['clipboard-write', 'clipboard-read'],
-        },
-      }, // or 'chrome-beta'
+      use: { ...devices['Desktop Chrome'], channel: 'chrome' }, // or 'chrome-beta'
     },
     {
       name: 'webkit',
@@ -79,7 +72,7 @@ export default defineConfig({
 
   /* Run your local dev server before starting the tests */
   webServer: {
-    command: 'yarn start',
+    command: 'yarn serve',
     // url: 'http://127.0.0.1:3000',
     reuseExistingServer: !process.env.CI,
   },

src-tauri/Cargo.toml

@@ -16,11 +16,11 @@ tauri-build = { version = "2.0.0-beta.13", features = [] }
 [dependencies]
 anyhow = "1"
 kcl-lib = { version = "0.1.53", path = "../src/wasm-lib/kcl" }
-kittycad = "0.3.5"
+kittycad = "0.3.0"
 log = "0.4.21"
 oauth2 = "4.4.2"
 serde_json = "1.0"
-tauri = { version = "2.0.0-beta.22", features = [ "devtools", "unstable"] }
+tauri = { version = "2.0.0-beta.15", features = [ "devtools", "unstable"] }
 tauri-plugin-cli = { version = "2.0.0-beta.3" }
 tauri-plugin-deep-link = { version = "2.0.0-beta.3" }
 tauri-plugin-dialog = { version = "2.0.0-beta.6" }

src-tauri/tauri.conf.json

@@ -63,17 +63,16 @@
       "subcommands": {}
     },
     "deep-link": {
-      "mobile": [],
-      "desktop": {
-        "schemes": [
-          "app.zoo.dev"
-        ]
-      }
+      "domains": [
+        {
+          "host": "app.zoo.dev"
+        }
+      ]
     },
     "shell": {
       "open": true
     }
   },
   "productName": "Zoo Modeling App",
-  "version": "0.22.3"
+  "version": "0.22.0"
 }

src/App.tsx

@@ -127,7 +127,7 @@ export function App() {
       />
       <ModalContainer />
       <ModelingSidebar paneOpacity={paneOpacity} />
-      <Stream />
+      <Stream className="absolute inset-0 z-0" />
       {/* <CamToggle /> */}
       <LowerRightControls>
         <Gizmo />

src/Router.tsx

@@ -12,8 +12,6 @@ import SignIn from './routes/SignIn'
 import { Auth } from './Auth'
 import { isTauri } from './lib/isTauri'
 import Home from './routes/Home'
-import { NetworkContext } from './hooks/useNetworkContext'
-import { useNetworkStatus } from './hooks/useNetworkStatus'
 import makeUrlPathRelative from './lib/makeUrlPathRelative'
 import DownloadAppBanner from 'components/DownloadAppBanner'
 import { WasmErrBanner } from 'components/WasmErrBanner'
@@ -157,11 +155,5 @@ const router = createBrowserRouter([
  * @returns RouterProvider
  */
 export const Router = () => {
-  const networkStatus = useNetworkStatus()
-
-  return (
-    <NetworkContext.Provider value={networkStatus}>
-      <RouterProvider router={router} />
-    </NetworkContext.Provider>
-  )
+  return <RouterProvider router={router} />
 }

src/Toolbar.tsx

@@ -3,11 +3,13 @@ import { isCursorInSketchCommandRange } from 'lang/util'
 import { engineCommandManager, kclManager } from 'lib/singletons'
 import { useModelingContext } from 'hooks/useModelingContext'
 import { useCommandsContext } from 'hooks/useCommandsContext'
-import { useNetworkContext } from 'hooks/useNetworkContext'
-import { NetworkHealthState } from 'hooks/useNetworkStatus'
 import { ActionButton } from 'components/ActionButton'
 import { isSingleCursorInPipe } from 'lang/queryAst'
 import { useKclContext } from 'lang/KclProvider'
+import {
+  NetworkHealthState,
+  useNetworkStatus,
+} from 'components/NetworkHealthIndicator'
 import { useStore } from 'useStore'
 import { ActionButtonDropdown } from 'components/ActionButtonDropdown'
 import { useHotkeys } from 'react-hotkeys-hook'
@@ -36,16 +38,14 @@ export function Toolbar({
   }, [engineCommandManager.artifactMap, context.selectionRanges])
 
   const toolbarButtonsRef = useRef<HTMLUListElement>(null)
-  const { overallState } = useNetworkContext()
+
+  const { overallState } = useNetworkStatus()
   const { isExecuting } = useKclContext()
   const { isStreamReady } = useStore((s) => ({
     isStreamReady: s.isStreamReady,
   }))
   const disableAllButtons =
-    (overallState !== NetworkHealthState.Ok &&
-      overallState !== NetworkHealthState.Weak) ||
-    isExecuting ||
-    !isStreamReady
+    overallState !== NetworkHealthState.Ok || isExecuting || !isStreamReady
 
   useHotkeys(
     'l',

src/clientSideScene/CameraControls.ts

@@ -48,14 +48,12 @@ export type ReactCameraProperties =
       type: 'perspective'
       fov?: number
       position: [number, number, number]
-      target: [number, number, number]
       quaternion: [number, number, number, number]
     }
   | {
       type: 'orthographic'
       zoom?: number
       position: [number, number, number]
-      target: [number, number, number]
       quaternion: [number, number, number, number]
     }
 
@@ -174,6 +172,41 @@ export class CameraControls {
     }
   }
 
+  throttledUpdateEngineFov = throttle(
+    (vals: {
+      position: Vector3
+      quaternion: Quaternion
+      zoom: number
+      fov: number
+      target: Vector3
+    }) => {
+      const cmd: EngineCommand = {
+        type: 'modeling_cmd_req',
+        cmd_id: uuidv4(),
+        cmd: {
+          type: 'default_camera_perspective_settings',
+          ...convertThreeCamValuesToEngineCam({
+            ...vals,
+            isPerspective: true,
+          }),
+          fov_y: vals.fov,
+          ...calculateNearFarFromFOV(vals.fov),
+        },
+      }
+      this.engineCommandManager.sendSceneCommand(cmd)
+      this.lastPerspectiveCmd = cmd
+      this.lastPerspectiveCmdTime = Date.now()
+      if (this.lastPerspectiveCmdTimeoutId !== null) {
+        clearTimeout(this.lastPerspectiveCmdTimeoutId)
+      }
+      this.lastPerspectiveCmdTimeoutId = setTimeout(
+        this.sendLastPerspectiveReliableChannel,
+        lastCmdDelay
+      ) as any as number
+    },
+    1000 / 30
+  )
+
   constructor(
     isOrtho = false,
     domElement: HTMLCanvasElement,
@@ -409,7 +442,7 @@ export class CameraControls {
         this.handleEnd()
         return
       }
-      this.engineCommandManager.sendSceneCommand({
+      this.throttledEngCmd({
         type: 'modeling_cmd_req',
         cmd: {
           type: 'default_camera_zoom',
@@ -421,11 +454,11 @@ export class CameraControls {
       return
     }
 
-    // Else "clientToEngine" (Sketch Mode) or forceUpdate
+    const isTrackpad = Math.abs(event.deltaY) <= 1 || event.deltaY % 1 === 0
 
-    // From onMouseMove zoom handling which seems to be really smooth
+    const zoomSpeed = isTrackpad ? 0.02 : 0.1 // Reduced zoom speed for trackpad
     this.pendingZoom = this.pendingZoom ? this.pendingZoom : 1
-    this.pendingZoom *= 1 + event.deltaY * 0.01
+    this.pendingZoom *= 1 + (event.deltaY > 0 ? zoomSpeed : -zoomSpeed)
     this.handleEnd()
   }
 
@@ -499,28 +532,26 @@ export class CameraControls {
     direction.normalize()
     this.camera.position.copy(this.target).addScaledVector(direction, distance)
   }
-  usePerspectiveCamera = async () => {
+  usePerspectiveCamera = () => {
     this._usePerspectiveCamera()
-    if (this.syncDirection === 'clientToEngine') {
-      await this.engineCommandManager.sendSceneCommand({
-        type: 'modeling_cmd_req',
-        cmd_id: uuidv4(),
-        cmd: {
-          type: 'default_camera_set_perspective',
-          parameters: {
-            fov_y:
-              this.camera instanceof PerspectiveCamera ? this.camera.fov : 45,
-            ...calculateNearFarFromFOV(this.lastPerspectiveFov),
-          },
+    this.engineCommandManager.sendSceneCommand({
+      type: 'modeling_cmd_req',
+      cmd_id: uuidv4(),
+      cmd: {
+        type: 'default_camera_set_perspective',
+        parameters: {
+          fov_y:
+            this.camera instanceof PerspectiveCamera ? this.camera.fov : 45,
+          ...calculateNearFarFromFOV(this.lastPerspectiveFov),
         },
-      })
-    }
+      },
+    })
     this.onCameraChange()
     this.update()
     return this.camera
   }
 
-  dollyZoom = async (newFov: number, splitEngineCalls = false) => {
+  dollyZoom = (newFov: number) => {
     if (!(this.camera instanceof PerspectiveCamera)) {
       console.warn('Dolly zoom is only applicable to perspective cameras.')
       return
@@ -571,52 +602,13 @@ export class CameraControls {
     this.camera.near = z_near
     this.camera.far = z_far
 
-    if (splitEngineCalls) {
-      await this.engineCommandManager.sendSceneCommand({
-        type: 'modeling_cmd_req',
-        cmd_id: uuidv4(),
-        cmd: {
-          type: 'default_camera_look_at',
-          ...convertThreeCamValuesToEngineCam({
-            isPerspective: true,
-            position: newPosition,
-            quaternion: this.camera.quaternion,
-            zoom: this.camera.zoom,
-            target: this.target,
-          }),
-        },
-      })
-      await this.engineCommandManager.sendSceneCommand({
-        type: 'modeling_cmd_req',
-        cmd_id: uuidv4(),
-        cmd: {
-          type: 'default_camera_set_perspective',
-          parameters: {
-            fov_y: newFov,
-            z_near: 0.01,
-            z_far: 1000,
-          },
-        },
-      })
-    } else {
-      await this.engineCommandManager.sendSceneCommand({
-        type: 'modeling_cmd_req',
-        cmd_id: uuidv4(),
-        cmd: {
-          type: 'default_camera_perspective_settings',
-          ...convertThreeCamValuesToEngineCam({
-            isPerspective: true,
-            position: newPosition,
-            quaternion: this.camera.quaternion,
-            zoom: this.camera.zoom,
-            target: this.target,
-          }),
-          fov_y: newFov,
-          z_near: 0.01,
-          z_far: 1000,
-        },
-      })
-    }
+    this.throttledUpdateEngineFov({
+      fov: newFov,
+      position: newPosition,
+      quaternion: this.camera.quaternion,
+      zoom: this.camera.zoom,
+      target: this.target,
+    })
   }
 
   update = (forceUpdate = false) => {
@@ -781,75 +773,6 @@ export class CameraControls {
     })
   }
 
-  async updateCameraToAxis(
-    axis: 'x' | 'y' | 'z' | '-x' | '-y' | '-z'
-  ): Promise<void> {
-    const distance = this.camera.position.distanceTo(this.target)
-
-    const vantage = this.target.clone()
-    let up = { x: 0, y: 0, z: 1 }
-
-    if (axis === 'x') {
-      vantage.x += distance
-    } else if (axis === 'y') {
-      vantage.y += distance
-    } else if (axis === 'z') {
-      vantage.z += distance
-      up = { x: -1, y: 0, z: 0 }
-    } else if (axis === '-x') {
-      vantage.x -= distance
-    } else if (axis === '-y') {
-      vantage.y -= distance
-    } else if (axis === '-z') {
-      vantage.z -= distance
-      up = { x: -1, y: 0, z: 0 }
-    }
-
-    await this.engineCommandManager.sendSceneCommand({
-      type: 'modeling_cmd_req',
-      cmd_id: uuidv4(),
-      cmd: {
-        type: 'default_camera_look_at',
-        center: this.target,
-        vantage: vantage,
-        up: up,
-      },
-    })
-    await this.engineCommandManager.sendSceneCommand({
-      type: 'modeling_cmd_req',
-      cmd_id: uuidv4(),
-      cmd: {
-        type: 'default_camera_get_settings',
-      },
-    })
-  }
-
-  async resetCameraPosition(): Promise<void> {
-    await this.engineCommandManager.sendSceneCommand({
-      type: 'modeling_cmd_req',
-      cmd_id: uuidv4(),
-      cmd: {
-        type: 'default_camera_look_at',
-        center: this.target,
-        vantage: {
-          x: this.target.x,
-          y: this.target.y - 128,
-          z: this.target.z + 64,
-        },
-        up: { x: 0, y: 0, z: 1 },
-      },
-    })
-    await this.engineCommandManager.sendSceneCommand({
-      type: 'modeling_cmd_req',
-      cmd_id: uuidv4(),
-      cmd: {
-        type: 'zoom_to_fit',
-        object_ids: [], // leave empty to zoom to all objects
-        padding: 0.2, // padding around the objects
-      },
-    })
-  }
-
   async tweenCameraToQuaternion(
     targetQuaternion: Quaternion,
     targetPosition = new Vector3(),
@@ -1021,29 +944,6 @@ export class CameraControls {
         .onComplete(onComplete)
         .start()
     })
-  snapToPerspectiveBeforeHandingBackControlToEngine = async (
-    targetCamUp = new Vector3(0, 0, 1)
-  ) => {
-    if (this.syncDirection === 'engineToClient') {
-      console.warn(
-        'animate To Perspective not design to work with engineToClient syncDirection.'
-      )
-    }
-    this.isFovAnimationInProgress = true
-    const targetFov = this.fovBeforeOrtho // Target FOV for perspective
-    this.lastPerspectiveFov = 4
-    let currentFov = 4
-    const initialCameraUp = this.camera.up.clone()
-    this.usePerspectiveCamera()
-    const tempVec = new Vector3()
-
-    currentFov = this.lastPerspectiveFov + (targetFov - this.lastPerspectiveFov)
-    const currentUp = tempVec.lerpVectors(initialCameraUp, targetCamUp, 1)
-    this.camera.up.copy(currentUp)
-    await this.dollyZoom(currentFov, true)
-
-    this.isFovAnimationInProgress = false
-  }
 
   get reactCameraProperties(): ReactCameraProperties {
     return {
@@ -1057,11 +957,6 @@ export class CameraControls {
         roundOff(this.camera.position.y, 2),
         roundOff(this.camera.position.z, 2),
       ],
-      target: [
-        roundOff(this.target.x, 2),
-        roundOff(this.target.y, 2),
-        roundOff(this.target.z, 2),
-      ],
       quaternion: [
         roundOff(this.camera.quaternion.x, 2),
         roundOff(this.camera.quaternion.y, 2),
@@ -1116,7 +1011,7 @@ function calculateNearFarFromFOV(fov: number) {
   // const nearFarRatio = (fov - 3) / (45 - 3)
   // const z_near = 0.1 + nearFarRatio * (5 - 0.1)
   // const z_far = 1000 + nearFarRatio * (100000 - 1000)
-  return { z_near: 0.01, z_far: 1000 }
+  return { z_near: 0.1, z_far: 1000 }
 }
 
 function convertThreeCamValuesToEngineCam({
@@ -1135,6 +1030,11 @@ function convertThreeCamValuesToEngineCam({
   // leaving for now since it's working but maybe revisit later
   const euler = new Euler().setFromQuaternion(quaternion, 'XYZ')
 
+  const lookAtVector = new Vector3(0, 0, -1)
+    .applyEuler(euler)
+    .normalize()
+    .add(position)
+
   const upVector = new Vector3(0, 1, 0).applyEuler(euler).normalize()
   if (isPerspective) {
     return {
@@ -1143,10 +1043,6 @@ function convertThreeCamValuesToEngineCam({
       vantage: position,
     }
   }
-  const lookAtVector = new Vector3(0, 0, -1)
-    .applyEuler(euler)
-    .normalize()
-    .add(position)
   const fudgeFactor2 = zoom * 0.9979224466814468 - 0.03473692325839295
   const zoomFactor = (-ZOOM_MAGIC_NUMBER + fudgeFactor2) / zoom
   const direction = lookAtVector.clone().sub(position).normalize()

src/clientSideScene/ClientSideSceneComp.tsx

@@ -136,7 +136,6 @@ export const ClientSideScene = ({
       <div
         ref={canvasRef}
         style={{ cursor: cursor }}
-        data-testid="client-side-scene"
         className={`absolute inset-0 h-full w-full transition-all duration-300 ${
           hideClient ? 'opacity-0' : 'opacity-100'
         } ${hideServer ? 'bg-chalkboard-10 dark:bg-chalkboard-100' : ''} ${
@@ -700,15 +699,6 @@ export const CamDebugSettings = () => {
           }
         }}
       />
-      <div>
-        <button
-          onClick={() => {
-            sceneInfra.camControls.resetCameraPosition()
-          }}
-        >
-          Reset Camera Position
-        </button>
-      </div>
       {camSettings.type === 'perspective' && (
         <input
           type="range"
@@ -826,71 +816,6 @@ export const CamDebugSettings = () => {
           </li>
         </ul>
       </div>
-      <div>
-        target
-        <ul className="flex">
-          <li>
-            <span className="pl-2 pr-1">x:</span>
-            <input
-              type="number"
-              step={5}
-              data-testid="cam-x-target"
-              value={camSettings.target[0]}
-              className="text-black w-16"
-              onChange={(e) => {
-                sceneInfra.camControls.setCam({
-                  ...camSettings,
-                  target: [
-                    parseFloat(e.target.value),
-                    camSettings.target[1],
-                    camSettings.target[2],
-                  ],
-                })
-              }}
-            />
-          </li>
-          <li>
-            <span className="pl-2 pr-1">y:</span>
-            <input
-              type="number"
-              step={5}
-              data-testid="cam-y-target"
-              value={camSettings.target[1]}
-              className="text-black w-16"
-              onChange={(e) => {
-                sceneInfra.camControls.setCam({
-                  ...camSettings,
-                  target: [
-                    camSettings.target[0],
-                    parseFloat(e.target.value),
-                    camSettings.target[2],
-                  ],
-                })
-              }}
-            />
-          </li>
-          <li>
-            <span className="pl-2 pr-1">z:</span>
-            <input
-              type="number"
-              step={5}
-              data-testid="cam-z-target"
-              value={camSettings.target[2]}
-              className="text-black w-16"
-              onChange={(e) => {
-                sceneInfra.camControls.setCam({
-                  ...camSettings,
-                  target: [
-                    camSettings.target[0],
-                    camSettings.target[1],
-                    parseFloat(e.target.value),
-                  ],
-                })
-              }}
-            />
-          </li>
-        </ul>
-      </div>
     </div>
   )
 }

src/clientSideScene/sceneEntities.ts

@@ -32,7 +32,9 @@ import {
   SKETCH_GROUP_SEGMENTS,
   SKETCH_LAYER,
   X_AXIS,
+  XZ_PLANE,
   Y_AXIS,
+  YZ_PLANE,
 } from './sceneInfra'
 import { isQuaternionVertical, quaternionFromUpNForward } from './helpers'
 import {
@@ -91,10 +93,7 @@ import { createGridHelper, orthoScale, perspScale } from './helpers'
 import { Models } from '@kittycad/lib'
 import { uuidv4 } from 'lib/utils'
 import { SegmentOverlayPayload, SketchDetails } from 'machines/modelingMachine'
-import {
-  ArtifactMapCommand,
-  EngineCommandManager,
-} from 'lang/std/engineConnection'
+import { EngineCommandManager } from 'lang/std/engineConnection'
 import {
   getRectangleCallExpressions,
   updateRectangleSketch,
@@ -760,6 +759,14 @@ export class SceneEntities {
 
           _ast = parse(recast(_ast))
 
+          console.log('onClick', {
+            sketchInit: sketchInit,
+            _ast,
+            x,
+            y,
+            truncatedAst,
+          })
+
           // Update the primary AST and unequip the rectangle tool
           await kclManager.executeAstMock(_ast)
           sceneInfra.modelingSend({ type: 'CancelSketch' })
@@ -1327,6 +1334,13 @@ export class SceneEntities {
         to,
       })
   }
+  async animateAfterSketch() {
+    // if (isReducedMotion()) {
+    //   sceneInfra.camControls.usePerspectiveCamera()
+    //   return
+    // }
+    await sceneInfra.camControls.animateToPerspective()
+  }
   removeSketchGrid() {
     if (this.axisGroup) this.scene.remove(this.axisGroup)
   }
@@ -1390,135 +1404,87 @@ export class SceneEntities {
         selected.material.color = defaultPlaneColor(type)
       },
       onClick: async (args) => {
-        const { streamDimensions } = useStore.getState()
-        const { entity_id, ...rest } = await sendSelectEventToEngine(
-          args?.mouseEvent,
-          document.getElementById('video-stream') as HTMLVideoElement,
-          streamDimensions
-        )
-        let _entity_id = entity_id
-        console.log('things', _entity_id, rest)
-        if (!_entity_id) return
-        if (
-          engineCommandManager.defaultPlanes?.xy === _entity_id ||
-          engineCommandManager.defaultPlanes?.xz === _entity_id ||
-          engineCommandManager.defaultPlanes?.yz === _entity_id ||
-          engineCommandManager.defaultPlanes?.negXy === _entity_id ||
-          engineCommandManager.defaultPlanes?.negXz === _entity_id ||
-          engineCommandManager.defaultPlanes?.negYz === _entity_id
-        ) {
-          const defaultPlaneStrMap: Record<string, DefaultPlaneStr> = {
-            [engineCommandManager.defaultPlanes.xy]: 'XY',
-            [engineCommandManager.defaultPlanes.xz]: 'XZ',
-            [engineCommandManager.defaultPlanes.yz]: 'YZ',
-            [engineCommandManager.defaultPlanes.negXy]: '-XY',
-            [engineCommandManager.defaultPlanes.negXz]: '-XZ',
-            [engineCommandManager.defaultPlanes.negYz]: '-YZ',
+        const checkExtrudeFaceClick = async (): Promise<
+          ['face' | 'plane' | 'other', string]
+        > => {
+          const { streamDimensions } = useStore.getState()
+          const { entity_id } = await sendSelectEventToEngine(
+            args?.mouseEvent,
+            document.getElementById('video-stream') as HTMLVideoElement,
+            streamDimensions
+          )
+          if (!entity_id) return ['other', '']
+          if (
+            engineCommandManager.defaultPlanes?.xy === entity_id ||
+            engineCommandManager.defaultPlanes?.xz === entity_id ||
+            engineCommandManager.defaultPlanes?.yz === entity_id
+          ) {
+            return ['plane', entity_id]
           }
-          // TODO can we get this information from rust land when it creates the default planes?
-          // maybe returned from make_default_planes (src/wasm-lib/src/wasm.rs)
-          let zAxis: [number, number, number] = [0, 0, 1]
-          let yAxis: [number, number, number] = [0, 1, 0]
+          const artifact = this.engineCommandManager.artifactMap[entity_id]
+          if (artifact?.commandType !== 'solid3d_get_extrusion_face_info')
+            return ['other', entity_id]
 
-          // get unit vector from camera position to target
-          const camVector = sceneInfra.camControls.camera.position
-            .clone()
-            .sub(sceneInfra.camControls.target)
-
-          if (engineCommandManager.defaultPlanes?.xy === _entity_id) {
-            console.log('XY')
-            zAxis = [0, 0, 1]
-            yAxis = [0, 1, 0]
-            if (camVector.z < 0) {
-              zAxis = [0, 0, -1]
-              _entity_id = engineCommandManager.defaultPlanes?.negXy || ''
-            }
-          } else if (engineCommandManager.defaultPlanes?.yz === _entity_id) {
-            console.log('YZ')
-            zAxis = [1, 0, 0]
-            yAxis = [0, 0, 1]
-            if (camVector.x < 0) {
-              zAxis = [-1, 0, 0]
-              _entity_id = engineCommandManager.defaultPlanes?.negYz || ''
-            }
-          } else if (engineCommandManager.defaultPlanes?.xz === _entity_id) {
-            console.log('XZ')
-            zAxis = [0, 1, 0]
-            yAxis = [0, 0, 1]
-            _entity_id = engineCommandManager.defaultPlanes?.negXz || ''
-            if (camVector.y < 0) {
-              zAxis = [0, -1, 0]
-              _entity_id = engineCommandManager.defaultPlanes?.xz || ''
-            }
-          }
+          const faceInfo = await getFaceDetails(entity_id)
+          if (!faceInfo?.origin || !faceInfo?.z_axis || !faceInfo?.y_axis)
+            return ['other', entity_id]
+          const { z_axis, y_axis, origin } = faceInfo
+          const pathToNode = getNodePathFromSourceRange(
+            kclManager.ast,
+            artifact.range
+          )
 
           sceneInfra.modelingSend({
             type: 'Select default plane',
             data: {
-              type: 'defaultPlane',
-              planeId: _entity_id,
-              plane: defaultPlaneStrMap[_entity_id],
-              zAxis,
-              yAxis,
+              type: 'extrudeFace',
+              zAxis: [z_axis.x, z_axis.y, z_axis.z],
+              yAxis: [y_axis.x, y_axis.y, y_axis.z],
+              position: [origin.x, origin.y, origin.z].map(
+                (num) => num / sceneInfra._baseUnitMultiplier
+              ) as [number, number, number],
+              extrudeSegmentPathToNode: pathToNode,
+              cap:
+                artifact?.additionalData?.type === 'cap'
+                  ? artifact.additionalData.info
+                  : 'none',
+              faceId: entity_id,
             },
           })
-          return
+          return ['face', entity_id]
         }
-        const artifact = this.engineCommandManager.artifactMap[_entity_id]
-        // If we clicked on an extrude wall, we climb up the parent Id
-        // to get the sketch profile's face ID. If we clicked on an endcap,
-        // we already have it.
-        const targetId =
-          'additionalData' in artifact &&
-          artifact.additionalData?.type === 'cap'
-            ? _entity_id
-            : artifact.parentId
 
-        // tsc cannot infer that target can have extrusions
-        // from the commandType (why?) so we need to cast it
-        const target = this.engineCommandManager.artifactMap?.[
-          targetId || ''
-        ] as ArtifactMapCommand & { extrusions?: string[] }
-
-        // TODO: We get the first extrusion command ID,
-        // which is fine while backend systems only support one extrusion.
-        // but we need to more robustly handle resolving to the correct extrusion
-        // if there are multiple.
-        const extrusions =
-          this.engineCommandManager.artifactMap?.[target?.extrusions?.[0] || '']
-
-        if (artifact?.commandType !== 'solid3d_get_extrusion_face_info') return
-
-        const faceInfo = await getFaceDetails(_entity_id)
-        if (!faceInfo?.origin || !faceInfo?.z_axis || !faceInfo?.y_axis) return
-        const { z_axis, y_axis, origin } = faceInfo
-        const sketchPathToNode = getNodePathFromSourceRange(
-          kclManager.ast,
-          artifact.range
-        )
-        const extrudePathToNode = extrusions?.range
-          ? getNodePathFromSourceRange(kclManager.ast, extrusions.range)
-          : []
+        const faceResult = await checkExtrudeFaceClick()
+        console.log('faceResult', faceResult)
+        if (faceResult[0] === 'face') return
 
+        if (!args || !args.intersects?.[0]) return
+        if (args.mouseEvent.which !== 1) return
+        const { intersects } = args
+        const type = intersects?.[0].object.name || ''
+        const posNorm = Number(intersects?.[0]?.normal?.z) > 0
+        let planeString: DefaultPlaneStr = posNorm ? 'XY' : '-XY'
+        let zAxis: [number, number, number] = posNorm ? [0, 0, 1] : [0, 0, -1]
+        let yAxis: [number, number, number] = [0, 1, 0]
+        if (type === YZ_PLANE) {
+          planeString = posNorm ? 'YZ' : '-YZ'
+          zAxis = posNorm ? [1, 0, 0] : [-1, 0, 0]
+          yAxis = [0, 0, 1]
+        } else if (type === XZ_PLANE) {
+          planeString = posNorm ? '-XZ' : 'XZ'
+          zAxis = posNorm ? [0, 1, 0] : [0, -1, 0]
+          yAxis = [0, 0, 1]
+        }
         sceneInfra.modelingSend({
           type: 'Select default plane',
           data: {
-            type: 'extrudeFace',
-            zAxis: [z_axis.x, z_axis.y, z_axis.z],
-            yAxis: [y_axis.x, y_axis.y, y_axis.z],
-            position: [origin.x, origin.y, origin.z].map(
-              (num) => num / sceneInfra._baseUnitMultiplier
-            ) as [number, number, number],
-            sketchPathToNode,
-            extrudePathToNode,
-            cap:
-              artifact?.additionalData?.type === 'cap'
-                ? artifact.additionalData.info
-                : 'none',
-            faceId: _entity_id,
+            type: 'defaultPlane',
+            plane: planeString,
+            zAxis,
+            yAxis,
+            planeId: faceResult[1],
           },
         })
-        return
       },
     })
   }

src/components/CommandBar/CommandBar.tsx

@@ -6,8 +6,6 @@ import CommandComboBox from '../CommandComboBox'
 import CommandBarReview from './CommandBarReview'
 import { useLocation } from 'react-router-dom'
 import useHotkeyWrapper from 'lib/hotkeyWrapper'
-import { CustomIcon } from 'components/CustomIcon'
-import Tooltip from 'components/Tooltip'
 
 export const CommandBar = () => {
   const { pathname } = useLocation()
@@ -105,7 +103,7 @@ export const CommandBar = () => {
           leaveTo="opacity-0 scale-95"
         >
           <WrapperComponent.Panel
-            className="relative z-50 pointer-events-auto w-full max-w-xl py-2 mx-auto border rounded rounded-tl-none shadow-lg bg-chalkboard-10 dark:bg-chalkboard-100 dark:border-chalkboard-70"
+            className="relative z-50 pointer-events-auto w-full max-w-xl py-2 mx-auto border rounded shadow-lg bg-chalkboard-10 dark:bg-chalkboard-100 dark:border-chalkboard-70"
             as="div"
             data-testid="command-bar"
           >
@@ -118,19 +116,6 @@ export const CommandBar = () => {
                 <CommandBarReview stepBack={stepBack} />
               )
             )}
-            <button
-              onClick={() => commandBarSend({ type: 'Close' })}
-              className="group block !absolute left-auto right-full top-[-3px] m-2.5 p-0 border-none bg-transparent hover:bg-transparent"
-            >
-              <CustomIcon
-                name="close"
-                className="w-5 h-5 rounded-sm bg-destroy-10 text-destroy-80 dark:bg-destroy-80 dark:text-destroy-10 group-hover:brightness-110"
-              />
-              <Tooltip position="bottom" delay={500}>
-                Cancel{' '}
-                <kbd className="hotkey ml-4 dark:!bg-chalkboard-80">esc</kbd>
-              </Tooltip>
-            </button>
           </WrapperComponent.Panel>
         </Transition.Child>
       </WrapperComponent>

src/components/CommandBar/CommandBarSelectionInput.tsx

@@ -7,8 +7,10 @@ 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'
 import { StateFrom } from 'xstate'
 
 const selectionSelector = (snapshot: StateFrom<typeof modelingMachine>) =>
@@ -39,10 +41,24 @@ function CommandBarSelectionInput({
     canSubmitSelectionArg(selectionsByType, arg)
   )
 
+  useHotkeys('tab', () => onSubmit(selection), {
+    enableOnFormTags: true,
+    enableOnContentEditable: true,
+    keyup: true,
+  })
+
   useEffect(() => {
     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.defaultSelectionFilter()
+  }, [])
+
   // Fast-forward through this arg if it's marked as skippable
   // and we have a valid selection already
   useEffect(() => {

src/components/ContextMenu.tsx

@@ -1,199 +0,0 @@
-import toast from 'react-hot-toast'
-import { ActionIcon, ActionIconProps } from './ActionIcon'
-import { RefObject, useEffect, useMemo, useRef, useState } from 'react'
-import { useHotkeys } from 'react-hotkeys-hook'
-import { Dialog } from '@headlessui/react'
-
-interface ContextMenuProps
-  extends Omit<React.HTMLAttributes<HTMLUListElement>, 'children'> {
-  items?: React.ReactElement[]
-  menuTargetElement?: RefObject<HTMLElement>
-}
-
-const DefaultContextMenuItems = [
-  <ContextMenuItemRefresh />,
-  <ContextMenuItemCopy />,
-  // add more default context menu items here
-]
-
-export function ContextMenu({
-  items = DefaultContextMenuItems,
-  menuTargetElement,
-  className,
-  ...props
-}: ContextMenuProps) {
-  const dialogRef = useRef<HTMLDivElement>(null)
-  const [open, setOpen] = useState(false)
-  const [windowSize, setWindowSize] = useState({
-    width: globalThis?.window?.innerWidth,
-    height: globalThis?.window?.innerHeight,
-  })
-  const [position, setPosition] = useState({ x: 0, y: 0 })
-  useHotkeys('esc', () => setOpen(false), {
-    enabled: open,
-  })
-
-  const dialogPositionStyle = useMemo(() => {
-    if (!dialogRef.current)
-      return {
-        top: 0,
-        left: 0,
-        right: 'auto',
-        bottom: 'auto',
-      }
-
-    return {
-      top:
-        position.y + dialogRef.current.clientHeight > windowSize.height
-          ? 'auto'
-          : position.y,
-      left:
-        position.x + dialogRef.current.clientWidth > windowSize.width
-          ? 'auto'
-          : position.x,
-      right:
-        position.x + dialogRef.current.clientWidth > windowSize.width
-          ? windowSize.width - position.x
-          : 'auto',
-      bottom:
-        position.y + dialogRef.current.clientHeight > windowSize.height
-          ? windowSize.height - position.y
-          : 'auto',
-    }
-  }, [position, windowSize, dialogRef.current])
-
-  // Listen for window resize to update context menu position
-  useEffect(() => {
-    const handleResize = () => {
-      setWindowSize({
-        width: globalThis?.window?.innerWidth,
-        height: globalThis?.window?.innerHeight,
-      })
-    }
-    globalThis?.window?.addEventListener('resize', handleResize)
-    return () => {
-      globalThis?.window?.removeEventListener('resize', handleResize)
-    }
-  }, [])
-
-  // Add context menu listener to target once mounted
-  useEffect(() => {
-    const handleContextMenu = (e: MouseEvent) => {
-      console.log('context menu', e)
-      e.preventDefault()
-      setPosition({ x: e.x, y: e.y })
-      setOpen(true)
-    }
-    menuTargetElement?.current?.addEventListener(
-      'contextmenu',
-      handleContextMenu
-    )
-    return () => {
-      menuTargetElement?.current?.removeEventListener(
-        'contextmenu',
-        handleContextMenu
-      )
-    }
-  }, [menuTargetElement?.current])
-
-  return (
-    <Dialog open={open} onClose={() => setOpen(false)}>
-      <div
-        className="fixed inset-0 z-50 w-screen h-screen"
-        onContextMenu={(e) => e.preventDefault()}
-      >
-        <Dialog.Backdrop className="fixed z-10 inset-0" />
-        <Dialog.Panel
-          ref={dialogRef}
-          className={`w-48 fixed bg-chalkboard-10 dark:bg-chalkboard-90
-          border border-solid border-chalkboard-10 dark:border-chalkboard-90 rounded
-          shadow-lg backdrop:fixed backdrop:inset-0 backdrop:bg-primary ${className}`}
-          style={{
-            ...dialogPositionStyle,
-            ...props.style,
-          }}
-        >
-          <ul
-            {...props}
-            className="relative flex flex-col gap-0.5 items-stretch content-stretch"
-            onClick={() => setOpen(false)}
-          >
-            {...items}
-          </ul>
-        </Dialog.Panel>
-      </div>
-    </Dialog>
-  )
-}
-
-export function ContextMenuDivider() {
-  return <hr className="border-chalkboard-20 dark:border-chalkboard-80" />
-}
-
-interface ContextMenuItemProps {
-  children: React.ReactNode
-  icon?: ActionIconProps['icon']
-  onClick?: () => void
-  hotkey?: string
-}
-
-export function ContextMenuItem({
-  children,
-  icon,
-  onClick,
-  hotkey,
-}: ContextMenuItemProps) {
-  return (
-    <button
-      className="flex items-center gap-2 py-1 px-2 cursor-pointer hover:bg-chalkboard-20 dark:hover:bg-chalkboard-80 border-none text-left"
-      onClick={onClick}
-    >
-      {icon && <ActionIcon icon={icon} bgClassName="!bg-transparent" />}
-      <div className="flex-1">{children}</div>
-      {hotkey && (
-        <kbd className="px-1.5 py-0.5 rounded bg-primary/10 text-primary dark:bg-chalkboard-80 dark:text-chalkboard-40">
-          {hotkey}
-        </kbd>
-      )}
-    </button>
-  )
-}
-
-export function ContextMenuItemRefresh() {
-  return (
-    <ContextMenuItem
-      icon="arrowRotateRight"
-      onClick={() => globalThis?.window?.location.reload()}
-    >
-      Refresh
-    </ContextMenuItem>
-  )
-}
-
-interface ContextMenuItemCopyProps {
-  toBeCopiedContent?: string
-  toBeCopiedLabel?: string
-}
-
-export function ContextMenuItemCopy({
-  toBeCopiedContent = globalThis.window?.getSelection()?.toString(),
-  toBeCopiedLabel = 'selection',
-}: ContextMenuItemCopyProps) {
-  return (
-    <ContextMenuItem
-      icon="clipboardPlus"
-      onClick={() => {
-        if (toBeCopiedContent) {
-          globalThis?.navigator?.clipboard
-            .writeText(toBeCopiedContent)
-            .then(() => toast.success(`Copied ${toBeCopiedLabel} to clipboard`))
-            .catch(() =>
-              toast.error(`Failed to copy ${toBeCopiedLabel} to clipboard`)
-            )
-        }
-      }}
-    >
-      Copy
-    </ContextMenuItem>
-  )
-}

src/components/CustomIcon.tsx

@@ -71,16 +71,6 @@ const CustomIconMap = {
       />
     </svg>
   ),
-  bug: (
-    <svg viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-      <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M10.8209 5.99884C10.6403 5.73962 10.3399 5.57001 10 5.57001C9.65984 5.57001 9.35936 5.73984 9.17871 5.99935C9.43724 5.95129 9.71142 5.92578 10.0012 5.92578C10.29 5.92578 10.5633 5.95111 10.8209 5.99884ZM10 4.57001C8.9459 4.57001 8.08227 5.38548 8.00554 6.41997C7.58916 6.65398 7.23724 6.95989 6.95014 7.31304L5.85355 6.21645L5.14645 6.92356L6.40931 8.18642C6.20774 8.62503 6.08043 9.09624 6.0278 9.57001H5V10.57H6.01946C6.06396 11.1581 6.1867 11.8173 6.4071 12.4558L5.14645 13.7165L5.85355 14.4236L6.8408 13.4363C7.46354 14.555 8.47307 15.4258 10.0012 15.4258C11.529 15.4258 12.5378 14.5554 13.16 13.4371L14.1464 14.4236L14.8536 13.7165L13.5934 12.4563C13.8136 11.8177 13.9362 11.1583 13.9806 10.57H15V9.57001H13.9722C13.9197 9.0961 13.7925 8.62474 13.5911 8.18602L14.8536 6.92356L14.1464 6.21645L13.0505 7.31239C12.7633 6.95894 12.4112 6.65285 11.9944 6.41883C11.9171 5.38488 11.0537 4.57001 10 4.57001ZM10.5 14.3801V8.57001H9.5V14.3796C8.72105 14.2298 8.15885 13.7245 7.7428 12.9999C7.22316 12.095 7 10.937 7 10.07C7 8.46381 8.04281 6.92578 10.0012 6.92578C11.9589 6.92578 13 8.4629 13 10.07C13 10.9373 12.7773 12.0954 12.2582 13.0003C11.8422 13.7254 11.2799 14.2309 10.5 14.3801Z"
-        fill="currentColor"
-      />
-    </svg>
-  ),
   checkmark: (
     <svg viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
       <path
@@ -267,14 +257,6 @@ const CustomIconMap = {
       />
     </svg>
   ),
-  keyboard: (
-    <svg viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-      <path
-        d="M16 12V15H13.5M16 12V9M16 12H13.5M4 12V15H6.5M4 12V9M4 12H6.5M4 9V6H6.5M4 9H6.5M16 9V6H13.5M16 9H13.5M6.5 12V15M6.5 12H7.5M6.5 15H13.5M13.5 15V12M13.5 12H12.5M7.5 12V9M7.5 12H10M7.5 9H8.75M7.5 9H6.5M10 12V9M10 12H12.5M10 9H11.25M10 9H8.75M12.5 12V9M12.5 9H13.5M12.5 9H11.25M13.5 9V6M13.5 6H11.25M11.25 9V6M11.25 6H8.75M8.75 9V6M8.75 6H6.5M6.5 9V6"
-        stroke="currentColor"
-      />
-    </svg>
-  ),
   line: (
     <svg viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
       <path

src/components/FileTree.tsx

@@ -18,8 +18,6 @@ import { useLspContext } from './LspProvider'
 import useHotkeyWrapper from 'lib/hotkeyWrapper'
 import { useModelingContext } from 'hooks/useModelingContext'
 import { DeleteConfirmationDialog } from './ProjectCard/DeleteProjectDialog'
-import { ContextMenu, ContextMenuItem } from './ContextMenu'
-import usePlatform from 'hooks/usePlatform'
 
 function getIndentationCSS(level: number) {
   return `calc(1rem * ${level + 1})`
@@ -127,7 +125,6 @@ const FileTreeItem = ({
   const navigate = useNavigate()
   const [isConfirmingDelete, setIsConfirmingDelete] = useState(false)
   const isCurrentFile = fileOrDir.path === currentFile?.path
-  const itemRef = useRef(null)
 
   const isRenaming = fileContext.itemsBeingRenamed.includes(fileOrDir.path)
   const removeCurrentItemFromRenaming = useCallback(
@@ -188,7 +185,7 @@ const FileTreeItem = ({
   }
 
   return (
-    <div className="contents" ref={itemRef}>
+    <>
       {fileOrDir.children === undefined ? (
         <li
           className={
@@ -324,41 +321,7 @@ const FileTreeItem = ({
           setIsOpen={setIsConfirmingDelete}
         />
       )}
-      <FileTreeContextMenu
-        itemRef={itemRef}
-        onRename={addCurrentItemToRenaming}
-        onDelete={() => setIsConfirmingDelete(true)}
-      />
-    </div>
-  )
-}
-
-interface FileTreeContextMenuProps {
-  itemRef: React.RefObject<HTMLElement>
-  onRename: () => void
-  onDelete: () => void
-}
-
-function FileTreeContextMenu({
-  itemRef,
-  onRename,
-  onDelete,
-}: FileTreeContextMenuProps) {
-  const platform = usePlatform()
-  const metaKey = platform === 'macos' ? '⌘' : 'Ctrl'
-
-  return (
-    <ContextMenu
-      menuTargetElement={itemRef}
-      items={[
-        <ContextMenuItem onClick={onRename} hotkey="Enter">
-          Rename
-        </ContextMenuItem>,
-        <ContextMenuItem onClick={onDelete} hotkey={metaKey + ' + Del'}>
-          Delete
-        </ContextMenuItem>,
-      ]}
-    />
+    </>
   )
 }
 

src/components/Gizmo.tsx

@@ -1,6 +1,5 @@
-import { SceneInfra } from 'clientSideScene/sceneInfra'
 import { sceneInfra } from 'lib/singletons'
-import { MutableRefObject, useEffect, useRef } from 'react'
+import { useEffect, useRef } from 'react'
 import {
   WebGLRenderer,
   Scene,
@@ -13,52 +12,21 @@ import {
   Clock,
   Quaternion,
   ColorRepresentation,
-  Vector2,
-  Raycaster,
-  Camera,
-  Intersection,
-  Object3D,
 } from 'three'
-import {
-  ContextMenu,
-  ContextMenuDivider,
-  ContextMenuItem,
-  ContextMenuItemRefresh,
-} from './ContextMenu'
 
 const CANVAS_SIZE = 80
 const FRUSTUM_SIZE = 0.5
 const AXIS_LENGTH = 0.35
 const AXIS_WIDTH = 0.02
-enum AxisColors {
-  X = '#fa6668',
-  Y = '#11eb6b',
-  Z = '#6689ef',
-  Gray = '#c6c7c2',
-}
-enum AxisNames {
-  X = 'x',
-  Y = 'y',
-  Z = 'z',
-  NEG_X = '-x',
-  NEG_Y = '-y',
-  NEG_Z = '-z',
-}
-const axisNamesSemantic: Record<AxisNames, string> = {
-  [AxisNames.X]: 'Right',
-  [AxisNames.Y]: 'Back',
-  [AxisNames.Z]: 'Top',
-  [AxisNames.NEG_X]: 'Left',
-  [AxisNames.NEG_Y]: 'Front',
-  [AxisNames.NEG_Z]: 'Bottom',
+const AXIS_COLORS = {
+  x: '#fa6668',
+  y: '#11eb6b',
+  z: '#6689ef',
+  gray: '#c6c7c2',
 }
 
 export default function Gizmo() {
-  const wrapperRef = useRef<HTMLDivElement | null>(null)
   const canvasRef = useRef<HTMLCanvasElement | null>(null)
-  const raycasterIntersect = useRef<Intersection<Object3D> | null>(null)
-  const cameraPassiveUpdateTimer = useRef(0)
-  const raycasterPassiveUpdateTimer = useRef(0)
 
   useEffect(() => {
     if (!canvasRef.current) return
@@ -73,89 +41,35 @@ export default function Gizmo() {
     const { gizmoAxes, gizmoAxisHeads } = createGizmo()
     scene.add(...gizmoAxes, ...gizmoAxisHeads)
 
-    const raycaster = new Raycaster()
-    const { mouse, disposeMouseEvents } = initializeMouseEvents(
-      canvas,
-      raycasterIntersect,
-      sceneInfra
-    )
-    const raycasterObjects = [...gizmoAxisHeads]
-
     const clock = new Clock()
     const clientCamera = sceneInfra.camControls.camera
     let currentQuaternion = new Quaternion().copy(clientCamera.quaternion)
 
     const animate = () => {
-      const delta = clock.getDelta()
+      requestAnimationFrame(animate)
       updateCameraOrientation(
         camera,
         currentQuaternion,
         sceneInfra.camControls.camera.quaternion,
-        delta,
-        cameraPassiveUpdateTimer
-      )
-      updateRayCaster(
-        raycasterObjects,
-        raycaster,
-        mouse,
-        camera,
-        raycasterIntersect,
-        delta,
-        raycasterPassiveUpdateTimer
+        clock.getDelta()
       )
       renderer.render(scene, camera)
-      requestAnimationFrame(animate)
     }
     animate()
 
     return () => {
       renderer.dispose()
-      disposeMouseEvents()
     }
   }, [])
 
   return (
-    <>
-      <div
-        ref={wrapperRef}
-        aria-label="View orientation gizmo"
-        className="grid place-content-center rounded-full overflow-hidden border border-solid border-primary/50 pointer-events-auto"
-      >
-        <canvas ref={canvasRef} />
-        <ContextMenu
-          menuTargetElement={wrapperRef}
-          items={[
-            ...Object.entries(axisNamesSemantic).map(
-              ([axisName, axisSemantic]) => (
-                <ContextMenuItem
-                  key={axisName}
-                  onClick={() => {
-                    sceneInfra.camControls.updateCameraToAxis(
-                      axisName as AxisNames
-                    )
-                  }}
-                >
-                  {axisSemantic} view
-                </ContextMenuItem>
-              )
-            ),
-            <ContextMenuItem
-              onClick={() => {
-                sceneInfra.camControls.resetCameraPosition()
-              }}
-            >
-              Reset view
-            </ContextMenuItem>,
-            <ContextMenuDivider />,
-            <ContextMenuItemRefresh />,
-          ]}
-        />
-      </div>
-    </>
+    <div className="grid place-content-center rounded-full overflow-hidden border border-solid border-primary/50 pointer-events-none">
+      <canvas ref={canvasRef} />
+    </div>
   )
 }
 
-const createCamera = (): OrthographicCamera => {
+const createCamera = () => {
   return new OrthographicCamera(
     -FRUSTUM_SIZE,
     FRUSTUM_SIZE,
@@ -168,21 +82,21 @@ const createCamera = (): OrthographicCamera => {
 
 const createGizmo = () => {
   const gizmoAxes = [
-    createAxis(AXIS_LENGTH, AXIS_WIDTH, AxisColors.X, 0, 'z'),
-    createAxis(AXIS_LENGTH, AXIS_WIDTH, AxisColors.Y, Math.PI / 2, 'z'),
-    createAxis(AXIS_LENGTH, AXIS_WIDTH, AxisColors.Z, -Math.PI / 2, 'y'),
-    createAxis(AXIS_LENGTH, AXIS_WIDTH, AxisColors.Gray, Math.PI, 'z'),
-    createAxis(AXIS_LENGTH, AXIS_WIDTH, AxisColors.Gray, -Math.PI / 2, 'z'),
-    createAxis(AXIS_LENGTH, AXIS_WIDTH, AxisColors.Gray, Math.PI / 2, 'y'),
+    createAxis(AXIS_LENGTH, AXIS_WIDTH, AXIS_COLORS.x, 0, 'z'),
+    createAxis(AXIS_LENGTH, AXIS_WIDTH, AXIS_COLORS.y, Math.PI / 2, 'z'),
+    createAxis(AXIS_LENGTH, AXIS_WIDTH, AXIS_COLORS.z, -Math.PI / 2, 'y'),
+    createAxis(AXIS_LENGTH, AXIS_WIDTH, AXIS_COLORS.gray, Math.PI, 'z'),
+    createAxis(AXIS_LENGTH, AXIS_WIDTH, AXIS_COLORS.gray, -Math.PI / 2, 'z'),
+    createAxis(AXIS_LENGTH, AXIS_WIDTH, AXIS_COLORS.gray, Math.PI / 2, 'y'),
   ]
 
   const gizmoAxisHeads = [
-    createAxisHead(AxisNames.X, AxisColors.X, [AXIS_LENGTH, 0, 0]),
-    createAxisHead(AxisNames.Y, AxisColors.Y, [0, AXIS_LENGTH, 0]),
-    createAxisHead(AxisNames.Z, AxisColors.Z, [0, 0, AXIS_LENGTH]),
-    createAxisHead(AxisNames.NEG_X, AxisColors.Gray, [-AXIS_LENGTH, 0, 0]),
-    createAxisHead(AxisNames.NEG_Y, AxisColors.Gray, [0, -AXIS_LENGTH, 0]),
-    createAxisHead(AxisNames.NEG_Z, AxisColors.Gray, [0, 0, -AXIS_LENGTH]),
+    createAxisHead(AXIS_LENGTH, AXIS_COLORS.x, 0, 'z'),
+    createAxisHead(AXIS_LENGTH, AXIS_COLORS.y, Math.PI / 2, 'z'),
+    createAxisHead(AXIS_LENGTH, AXIS_COLORS.z, -Math.PI / 2, 'y'),
+    createAxisHead(AXIS_LENGTH, AXIS_COLORS.gray, Math.PI, 'z'),
+    createAxisHead(AXIS_LENGTH, AXIS_COLORS.gray, -Math.PI / 2, 'z'),
+    createAxisHead(AXIS_LENGTH, AXIS_COLORS.gray, Math.PI / 2, 'y'),
   ]
 
   return { gizmoAxes, gizmoAxisHeads }
@@ -194,9 +108,12 @@ const createAxis = (
   color: ColorRepresentation,
   rotation = 0,
   axis = 'x'
-): Mesh => {
-  const geometry = new BoxGeometry(length, width, width)
-  geometry.translate(length / 2, 0, 0)
+) => {
+  const geometry = new BoxGeometry(length, width, width).translate(
+    length / 2,
+    0,
+    0
+  )
   const material = new MeshBasicMaterial({ color: new Color(color) })
   const mesh = new Mesh(geometry, material)
   mesh.rotation[axis as 'x' | 'y' | 'z'] = rotation
@@ -204,17 +121,15 @@ const createAxis = (
 }
 
 const createAxisHead = (
-  name: AxisNames,
+  length: number,
   color: ColorRepresentation,
-  position: number[]
-): Mesh => {
-  const geometry = new SphereGeometry(0.065, 16, 8)
+  rotation = 0,
+  axis = 'x'
+) => {
+  const geometry = new SphereGeometry(0.065, 16, 8).translate(length, 0, 0)
   const material = new MeshBasicMaterial({ color: new Color(color) })
   const mesh = new Mesh(geometry, material)
-
-  mesh.position.set(position[0], position[1], position[2])
-  mesh.updateMatrixWorld()
-  mesh.name = name
+  mesh.rotation[axis as 'x' | 'y' | 'z'] = rotation
   return mesh
 }
 
@@ -222,97 +137,10 @@ const updateCameraOrientation = (
   camera: OrthographicCamera,
   currentQuaternion: Quaternion,
   targetQuaternion: Quaternion,
-  deltaTime: number,
-  cameraPassiveUpdateTimer: MutableRefObject<number>
+  deltaTime: number
 ) => {
-  cameraPassiveUpdateTimer.current += deltaTime
-  if (
-    !quaternionsEqual(currentQuaternion, targetQuaternion) ||
-    cameraPassiveUpdateTimer.current >= 5
-  ) {
-    const slerpFactor = 1 - Math.exp(-30 * deltaTime)
-    currentQuaternion.slerp(targetQuaternion, slerpFactor).normalize()
-    camera.position.set(0, 0, 1).applyQuaternion(currentQuaternion)
-    camera.quaternion.copy(currentQuaternion)
-    cameraPassiveUpdateTimer.current = 0
-  }
-}
-
-const quaternionsEqual = (
-  q1: Quaternion,
-  q2: Quaternion,
-  tolerance: number = 0.001
-): boolean => {
-  return (
-    Math.abs(q1.x - q2.x) < tolerance &&
-    Math.abs(q1.y - q2.y) < tolerance &&
-    Math.abs(q1.z - q2.z) < tolerance &&
-    Math.abs(q1.w - q2.w) < tolerance
-  )
-}
-
-const initializeMouseEvents = (
-  canvas: HTMLCanvasElement,
-  raycasterIntersect: MutableRefObject<Intersection<Object3D> | null>,
-  sceneInfra: SceneInfra
-): { mouse: Vector2; disposeMouseEvents: () => void } => {
-  const mouse = new Vector2()
-  mouse.x = 1 // fix initial mouse position issue
-
-  const handleMouseMove = (event: MouseEvent) => {
-    const { left, top, width, height } = canvas.getBoundingClientRect()
-    mouse.x = ((event.clientX - left) / width) * 2 - 1
-    mouse.y = ((event.clientY - top) / height) * -2 + 1
-  }
-
-  const handleClick = () => {
-    if (raycasterIntersect.current) {
-      const axisName = raycasterIntersect.current.object.name as AxisNames
-      sceneInfra.camControls.updateCameraToAxis(axisName)
-    }
-  }
-
-  window.addEventListener('mousemove', handleMouseMove)
-  window.addEventListener('click', handleClick)
-
-  const disposeMouseEvents = () => {
-    window.removeEventListener('mousemove', handleMouseMove)
-    window.removeEventListener('click', handleClick)
-  }
-
-  return { mouse, disposeMouseEvents }
-}
-
-const updateRayCaster = (
-  objects: Object3D[],
-  raycaster: Raycaster,
-  mouse: Vector2,
-  camera: Camera,
-  raycasterIntersect: MutableRefObject<Intersection<Object3D> | null>,
-  deltaTime: number,
-  raycasterPassiveUpdateTimer: MutableRefObject<number>
-) => {
-  raycasterPassiveUpdateTimer.current += deltaTime
-
-  // check if mouse is outside the canvas bounds and stop raycaster
-  if (raycasterPassiveUpdateTimer.current < 2) {
-    if (mouse.x < -1 || mouse.x > 1 || mouse.y < -1 || mouse.y > 1) {
-      raycasterIntersect.current = null
-      return
-    }
-  }
-
-  raycaster.setFromCamera(mouse, camera)
-  const intersects = raycaster.intersectObjects(objects)
-
-  objects.forEach((object) => object.scale.set(1, 1, 1))
-  if (intersects.length) {
-    intersects[0].object.scale.set(1.5, 1.5, 1.5)
-    raycasterIntersect.current = intersects[0] // filter first object
-  } else {
-    raycasterIntersect.current = null
-  }
-  if (raycasterPassiveUpdateTimer.current > 2) {
-    raycasterPassiveUpdateTimer.current = 0
-  }
+  const slerpFactor = 1 - Math.exp(-30 * deltaTime)
+  currentQuaternion.slerp(targetQuaternion, slerpFactor).normalize()
+  camera.position.set(0, 0, 1).applyQuaternion(currentQuaternion)
+  camera.quaternion.copy(currentQuaternion)
 }

src/components/HelpMenu.tsx

@@ -81,12 +81,6 @@ export function HelpMenu(props: React.PropsWithChildren) {
         >
           Release notes
         </HelpMenuItem>
-        <HelpMenuItem
-          as="button"
-          onClick={() => navigate('settings?tab=keybindings')}
-        >
-          Keyboard shortcuts
-        </HelpMenuItem>
         <HelpMenuItem
           as="button"
           onClick={() => {

src/components/Loading.tsx

@@ -1,65 +1,14 @@
 import { useEffect, useState } from 'react'
 
-import {
-  EngineConnectionStateType,
-  DisconnectingType,
-  EngineCommandManagerEvents,
-  EngineConnectionEvents,
-  ConnectionError,
-  CONNECTION_ERROR_TEXT,
-} from '../lang/std/engineConnection'
-
-import { engineCommandManager } from '../lib/singletons'
-
 const Loading = ({ children }: React.PropsWithChildren) => {
-  const [error, setError] = useState<ConnectionError>(ConnectionError.Unset)
-
+  const [hasLongLoadTime, setHasLongLoadTime] = useState(false)
   useEffect(() => {
-    const onConnectionStateChange = ({ detail: state }: CustomEvent) => {
-      if (
-        (state.type !== EngineConnectionStateType.Disconnected ||
-          state.type !== EngineConnectionStateType.Disconnecting) &&
-        state.value?.type !== DisconnectingType.Error
-      )
-        return
-      setError(state.value.value.error)
-    }
-
-    const onEngineAvailable = ({ detail: engineConnection }: CustomEvent) => {
-      engineConnection.addEventListener(
-        EngineConnectionEvents.ConnectionStateChanged,
-        onConnectionStateChange as EventListener
-      )
-    }
-
-    engineCommandManager.addEventListener(
-      EngineCommandManagerEvents.EngineAvailable,
-      onEngineAvailable as EventListener
-    )
-
-    return () => {
-      engineCommandManager.removeEventListener(
-        EngineCommandManagerEvents.EngineAvailable,
-        onEngineAvailable as EventListener
-      )
-      engineCommandManager.engineConnection?.removeEventListener(
-        EngineConnectionEvents.ConnectionStateChanged,
-        onConnectionStateChange as EventListener
-      )
-    }
-  }, [])
-
-  useEffect(() => {
-    // Don't set long loading time if there's a more severe error
-    if (error > ConnectionError.LongLoadingTime) return
-
     const timer = setTimeout(() => {
-      setError(ConnectionError.LongLoadingTime)
+      setHasLongLoadTime(true)
     }, 4000)
 
     return () => clearTimeout(timer)
-  }, [error, setError])
-
+  }, [setHasLongLoadTime])
   return (
     <div
       className="body-bg flex flex-col items-center justify-center h-screen"
@@ -80,10 +29,10 @@ const Loading = ({ children }: React.PropsWithChildren) => {
       <p
         className={
           'text-sm mt-4 text-primary/60 transition-opacity duration-500' +
-          (error !== ConnectionError.Unset ? ' opacity-100' : ' opacity-0')
+          (hasLongLoadTime ? ' opacity-100' : ' opacity-0')
         }
       >
-        {CONNECTION_ERROR_TEXT[error]}
+        Loading is taking longer than expected.
       </p>
     </div>
   )

src/components/LowerRightControls.tsx

@@ -33,7 +33,7 @@ export function LowerRightControls(props: React.PropsWithChildren) {
           rel="noopener noreferrer"
         >
           <CustomIcon
-            name="bug"
+            name="exclamationMark"
             className={`w-5 h-5 ${linkOverrideClassName}`}
           />
           <Tooltip position="top">Report a bug</Tooltip>

src/components/LspProvider.tsx

@@ -13,6 +13,7 @@ import { LanguageSupport } from '@codemirror/language'
 import { useNavigate } from 'react-router-dom'
 import { paths } from 'lib/paths'
 import { FileEntry } from 'lib/types'
+import { NetworkHealthState, useNetworkStatus } from './NetworkHealthIndicator'
 import Worker from 'editor/plugins/lsp/worker.ts?worker'
 import {
   LspWorkerEventType,
@@ -22,8 +23,6 @@ import {
 } from 'editor/plugins/lsp/types'
 import { wasmUrl } from 'lang/wasm'
 import { PROJECT_ENTRYPOINT } from 'lib/constants'
-import { useNetworkContext } from 'hooks/useNetworkContext'
-import { NetworkHealthState } from 'hooks/useNetworkStatus'
 
 function getWorkspaceFolders(): LSP.WorkspaceFolder[] {
   return []
@@ -87,7 +86,7 @@ export const LspProvider = ({ children }: { children: React.ReactNode }) => {
   } = useSettingsAuthContext()
   const token = auth?.context.token
   const navigate = useNavigate()
-  const { overallState } = useNetworkContext()
+  const { overallState } = useNetworkStatus()
   const isNetworkOkay = overallState === NetworkHealthState.Ok
 
   // So this is a bit weird, we need to initialize the lsp server and client.

src/components/ModelingMachineProvider.tsx

@@ -47,6 +47,7 @@ import {
   TANGENTIAL_ARC_TO_SEGMENT,
   getParentGroup,
   getSketchOrientationDetails,
+  getSketchQuaternion,
 } from 'clientSideScene/sceneEntities'
 import {
   moveValueIntoNewVariablePath,
@@ -63,7 +64,6 @@ import {
 import {
   getNodeFromPath,
   getNodePathFromSourceRange,
-  hasExtrudableGeometry,
   isSingleCursorInPipe,
 } from 'lang/queryAst'
 import { TEST } from 'env'
@@ -76,7 +76,6 @@ import { useSearchParams } from 'react-router-dom'
 import { letEngineAnimateAndSyncCamAfter } from 'clientSideScene/CameraControls'
 import { getVarNameModal } from 'hooks/useToolbarGuards'
 import useHotkeyWrapper from 'lib/hotkeyWrapper'
-import { uuidv4 } from 'lib/utils'
 
 type MachineContext<T extends AnyStateMachine> = {
   state: StateFrom<T>
@@ -122,24 +121,7 @@ export const ModelingMachineProvider = ({
     htmlRef,
     token
   )
-  useHotkeyWrapper(['meta + shift + .'], () => {
-    console.warn('CoreDump: Initializing core dump')
-    toast.promise(
-      coreDump(coreDumpManager, true),
-      {
-        loading: 'Starting core dump...',
-        success: 'Core dump completed successfully',
-        error: 'Error while exporting core dump',
-      },
-      {
-        success: {
-          // Note: this extended duration is especially important for Playwright e2e testing
-          // default duration is 2000 - https://react-hot-toast.com/docs/toast#default-durations
-          duration: 6000,
-        },
-      }
-    )
-  })
+  useHotkeyWrapper(['meta + shift + .'], () => coreDump(coreDumpManager, true))
 
   // Settings machine setup
   // const retrievedSettings = useRef(
@@ -159,41 +141,7 @@ export const ModelingMachineProvider = ({
     {
       actions: {
         'sketch exit execute': () => {
-          ;(async () => {
-            await sceneInfra.camControls.snapToPerspectiveBeforeHandingBackControlToEngine()
-
-            sceneInfra.camControls.syncDirection = 'engineToClient'
-
-            const settings: Models['CameraSettings_type'] = (
-              await engineCommandManager.sendSceneCommand({
-                type: 'modeling_cmd_req',
-                cmd_id: uuidv4(),
-                cmd: {
-                  type: 'default_camera_get_settings',
-                },
-              })
-            )?.data?.data?.settings
-            if (settings.up.z !== 1) {
-              // workaround for gimbal lock situation
-              await engineCommandManager.sendSceneCommand({
-                type: 'modeling_cmd_req',
-                cmd_id: uuidv4(),
-                cmd: {
-                  type: 'default_camera_look_at',
-                  center: settings.center,
-                  vantage: {
-                    ...settings.pos,
-                    y:
-                      settings.pos.y +
-                      (settings.center.z - settings.pos.z > 0 ? 2 : -2),
-                  },
-                  up: { x: 0, y: 0, z: 1 },
-                },
-              })
-            }
-
-            kclManager.executeCode(true)
-          })()
+          kclManager.executeCode(true)
         },
         'Set mouse state': assign({
           mouseState: (_, event) => event.data,
@@ -448,13 +396,8 @@ export const ModelingMachineProvider = ({
           if (
             selectionRanges.codeBasedSelections.length === 0 ||
             isSelectionLastLine(selectionRanges, codeManager.code)
-          ) {
-            // they have no selection, we should enable the button
-            // so they can select the face through the cmdbar
-            // BUT only if there's extrudable geometry
-            if (hasExtrudableGeometry(kclManager.ast)) return true
-            return false
-          }
+          )
+            return true
           if (!isPipe) return false
 
           return canExtrudeSelection(selectionRanges)
@@ -510,8 +453,7 @@ export const ModelingMachineProvider = ({
             const { modifiedAst, pathToNode: pathToNewSketchNode } =
               sketchOnExtrudedFace(
                 kclManager.ast,
-                data.sketchPathToNode,
-                data.extrudePathToNode,
+                data.extrudeSegmentPathToNode,
                 kclManager.programMemory,
                 data.cap
               )
@@ -521,7 +463,7 @@ export const ModelingMachineProvider = ({
               engineCommandManager,
               data.faceId
             )
-            sceneInfra.camControls.syncDirection = 'clientToEngine'
+
             return {
               sketchPathToNode: pathToNewSketchNode,
               zAxis: data.zAxis,
@@ -535,10 +477,8 @@ export const ModelingMachineProvider = ({
           )
           await kclManager.updateAst(modifiedAst, false)
           sceneInfra.camControls.syncDirection = 'clientToEngine'
-          await letEngineAnimateAndSyncCamAfter(
-            engineCommandManager,
-            data.planeId
-          )
+          const quat = await getSketchQuaternion(pathToNode, data.zAxis)
+          await sceneInfra.camControls.tweenCameraToQuaternion(quat)
           return {
             sketchPathToNode: pathToNode,
             zAxis: data.zAxis,

src/components/ModelingSidebar/ModelingPane.module.css

@@ -2,7 +2,7 @@
   @apply relative z-0 rounded-r max-w-full h-full flex-1;
   display: grid;
   grid-template-rows: auto 1fr;
-  @apply bg-chalkboard-10/50 focus-within:bg-chalkboard-10/90 backdrop-blur-sm border border-chalkboard-20;
+  @apply bg-chalkboard-10/50 backdrop-blur-sm border border-chalkboard-20;
   scroll-margin-block-start: 41px;
 }
 
@@ -12,7 +12,7 @@
 }
 
 :global(.dark) .panel {
-  @apply bg-chalkboard-100/50 focus-within:bg-chalkboard-100/90 backdrop-blur-[3px] border-chalkboard-80;
+  @apply bg-chalkboard-100/50 backdrop-blur-[3px] border-chalkboard-80;
 }
 
 .header {

src/components/ModelingSidebar/ModelingPane.tsx

@@ -46,11 +46,7 @@ export const ModelingPane = ({
       data-testid={detailsTestId}
       id={id}
       className={
-        'group-focus-within:border-primary dark:group-focus-within:border-chalkboard-50 ' +
-        pointerEventsCssClass +
-        styles.panel +
-        ' group ' +
-        (className || '')
+        pointerEventsCssClass + styles.panel + ' group ' + (className || '')
       }
     >
       <ModelingPaneHeader title={title} Menu={Menu} />

src/components/ModelingSidebar/ModelingSidebar.tsx

@@ -123,73 +123,70 @@ function ModelingSidebarSection({
   }, [showDebugPanel.current, togglePane, openPanes])
 
   return (
-    <div className="group contents">
-      <Tab.Group
-        vertical
-        selectedIndex={
-          currentPane === 'none' ? 0 : paneIds.indexOf(currentPane) + 1
+    <Tab.Group
+      vertical
+      selectedIndex={
+        currentPane === 'none' ? 0 : paneIds.indexOf(currentPane) + 1
+      }
+      onChange={(index) => {
+        const newPane = index === 0 ? 'none' : paneIds[index - 1]
+        togglePane(newPane)
+      }}
+    >
+      <Tab.List
+        className={
+          'pointer-events-auto ' +
+          (alignButtons === 'start'
+            ? 'justify-start self-start'
+            : 'justify-end self-end') +
+          (currentPane === 'none'
+            ? ' rounded-r focus-within:!border-primary/50'
+            : ' border-r-0') +
+          ' p-2 col-start-1 col-span-1 h-fit w-fit flex flex-col items-start gap-2 bg-chalkboard-10 border border-solid border-chalkboard-20 dark:bg-chalkboard-90 dark:border-chalkboard-80 ' +
+          (openPanes.length === 1 && currentPane === 'none' ? 'pr-0.5' : '')
         }
-        onChange={(index) => {
-          const newPane = index === 0 ? 'none' : paneIds[index - 1]
-          togglePane(newPane)
-        }}
       >
-        <Tab.List
-          className={
-            'pointer-events-auto ' +
-            (alignButtons === 'start'
-              ? 'justify-start self-start'
-              : 'justify-end self-end') +
-            (currentPane === 'none'
-              ? ' rounded-r focus-within:!border-primary/50'
-              : ' border-r-0') +
-            ' p-2 col-start-1 col-span-1 h-fit w-fit flex flex-col items-start gap-2 ' +
-            'bg-chalkboard-10 border border-solid border-chalkboard-20 dark:bg-chalkboard-90 dark:border-chalkboard-80 group-focus-within:border-primary dark:group-focus-within:border-chalkboard-50 ' +
-            (openPanes.length === 1 && currentPane === 'none' ? 'pr-0.5' : '')
-          }
-        >
-          <Tab key="none" className="sr-only">
-            No panes open
-          </Tab>
-          {filteredPanes.map((pane) => (
-            <ModelingPaneButton
-              key={pane.id}
-              paneConfig={pane}
-              currentPane={currentPane}
-              togglePane={() => togglePane(pane.id)}
-            />
-          ))}
-        </Tab.List>
-        <Tab.Panels
-          as="article"
-          className={
-            'col-start-2 col-span-1 ' +
-            (openPanes.length === 1
-              ? currentPane !== 'none'
-                ? `row-start-1 row-end-3`
-                : `hidden`
-              : ``)
-          }
-        >
-          <Tab.Panel key="none" />
-          {filteredPanes.map((pane) => (
-            <Tab.Panel key={pane.id} className="h-full">
-              <ModelingPane
-                id={`${pane.id}-pane`}
-                title={pane.title}
-                Menu={pane.Menu}
-              >
-                {pane.Content instanceof Function ? (
-                  <pane.Content />
-                ) : (
-                  pane.Content
-                )}
-              </ModelingPane>
-            </Tab.Panel>
-          ))}
-        </Tab.Panels>
-      </Tab.Group>
-    </div>
+        <Tab key="none" className="sr-only">
+          No panes open
+        </Tab>
+        {filteredPanes.map((pane) => (
+          <ModelingPaneButton
+            key={pane.id}
+            paneConfig={pane}
+            currentPane={currentPane}
+            togglePane={() => togglePane(pane.id)}
+          />
+        ))}
+      </Tab.List>
+      <Tab.Panels
+        as="article"
+        className={
+          'col-start-2 col-span-1 ' +
+          (openPanes.length === 1
+            ? currentPane !== 'none'
+              ? `row-start-1 row-end-3`
+              : `hidden`
+            : ``)
+        }
+      >
+        <Tab.Panel key="none" />
+        {filteredPanes.map((pane) => (
+          <Tab.Panel key={pane.id} className="h-full">
+            <ModelingPane
+              id={`${pane.id}-pane`}
+              title={pane.title}
+              Menu={pane.Menu}
+            >
+              {pane.Content instanceof Function ? (
+                <pane.Content />
+              ) : (
+                pane.Content
+              )}
+            </ModelingPane>
+          </Tab.Panel>
+        ))}
+      </Tab.Panels>
+    </Tab.Group>
   )
 }
 

src/components/NetworkHealthIndicator.test.tsx

@@ -5,8 +5,8 @@ import { CommandBarProvider } from './CommandBar/CommandBarProvider'
 import {
   NETWORK_HEALTH_TEXT,
   NetworkHealthIndicator,
+  NetworkHealthState,
 } from './NetworkHealthIndicator'
-import { NetworkHealthState } from 'hooks/useNetworkStatus'
 
 function TestWrap({ children }: { children: React.ReactNode }) {
   // wrap in router and xState context
@@ -19,7 +19,6 @@ function TestWrap({ children }: { children: React.ReactNode }) {
   )
 }
 
-// Our Playwright tests for this are much more comprehensive.
 describe('NetworkHealthIndicator tests', () => {
   test('Renders the network indicator', () => {
     render(
@@ -30,7 +29,21 @@ describe('NetworkHealthIndicator tests', () => {
 
     fireEvent.click(screen.getByTestId('network-toggle'))
 
-    // Starts as disconnected
+    expect(screen.getByTestId('network')).toHaveTextContent(
+      NETWORK_HEALTH_TEXT[NetworkHealthState.Ok]
+    )
+  })
+
+  test('Responds to network changes', () => {
+    render(
+      <TestWrap>
+        <NetworkHealthIndicator />
+      </TestWrap>
+    )
+
+    fireEvent.offline(window)
+    fireEvent.click(screen.getByTestId('network-toggle'))
+
     expect(screen.getByTestId('network')).toHaveTextContent(
       NETWORK_HEALTH_TEXT[NetworkHealthState.Disconnected]
     )

src/components/NetworkHealthIndicator.tsx

@@ -1,13 +1,26 @@
 import { Popover } from '@headlessui/react'
+import { useEffect, useState } from 'react'
 import { ActionIcon, ActionIconProps } from './ActionIcon'
+import {
+  ConnectingType,
+  ConnectingTypeGroup,
+  DisconnectingType,
+  EngineConnectionState,
+  EngineConnectionStateType,
+  ErrorType,
+  initialConnectingTypeGroupState,
+} from '../lang/std/engineConnection'
+import { engineCommandManager } from '../lib/singletons'
 import Tooltip from './Tooltip'
-import { ConnectingTypeGroup } from '../lang/std/engineConnection'
-import { useNetworkContext } from '../hooks/useNetworkContext'
-import { NetworkHealthState } from '../hooks/useNetworkStatus'
+
+export enum NetworkHealthState {
+  Ok,
+  Issue,
+  Disconnected,
+}
 
 export const NETWORK_HEALTH_TEXT: Record<NetworkHealthState, string> = {
   [NetworkHealthState.Ok]: 'Connected',
-  [NetworkHealthState.Weak]: 'Weak',
   [NetworkHealthState.Issue]: 'Problem',
   [NetworkHealthState.Disconnected]: 'Offline',
 }
@@ -48,10 +61,6 @@ const overallConnectionStateColor: Record<NetworkHealthState, IconColorConfig> =
       icon: 'text-succeed-80 dark:text-succeed-10',
       bg: 'bg-succeed-10/30 dark:bg-succeed-80/50',
     },
-    [NetworkHealthState.Weak]: {
-      icon: 'text-warn-80 dark:text-warn-10',
-      bg: 'bg-warn-10 dark:bg-warn-80/80',
-    },
     [NetworkHealthState.Issue]: {
       icon: 'text-destroy-80 dark:text-destroy-10',
       bg: 'bg-destroy-10 dark:bg-destroy-80/80',
@@ -67,11 +76,125 @@ const overallConnectionStateIcon: Record<
   ActionIconProps['icon']
 > = {
   [NetworkHealthState.Ok]: 'network',
-  [NetworkHealthState.Weak]: 'network',
   [NetworkHealthState.Issue]: 'networkCrossedOut',
   [NetworkHealthState.Disconnected]: 'networkCrossedOut',
 }
 
+export function useNetworkStatus() {
+  const [steps, setSteps] = useState(initialConnectingTypeGroupState)
+  const [internetConnected, setInternetConnected] = useState<boolean>(true)
+  const [overallState, setOverallState] = useState<NetworkHealthState>(
+    NetworkHealthState.Ok
+  )
+  const [hasCopied, setHasCopied] = useState<boolean>(false)
+
+  const [error, setError] = useState<ErrorType | undefined>(undefined)
+
+  const issues: Record<ConnectingTypeGroup, boolean> = {
+    [ConnectingTypeGroup.WebSocket]: steps[ConnectingTypeGroup.WebSocket].some(
+      (a: [ConnectingType, boolean | undefined]) => a[1] === false
+    ),
+    [ConnectingTypeGroup.ICE]: steps[ConnectingTypeGroup.ICE].some(
+      (a: [ConnectingType, boolean | undefined]) => a[1] === false
+    ),
+    [ConnectingTypeGroup.WebRTC]: steps[ConnectingTypeGroup.WebRTC].some(
+      (a: [ConnectingType, boolean | undefined]) => a[1] === false
+    ),
+  }
+
+  const hasIssues: boolean =
+    issues[ConnectingTypeGroup.WebSocket] ||
+    issues[ConnectingTypeGroup.ICE] ||
+    issues[ConnectingTypeGroup.WebRTC]
+
+  useEffect(() => {
+    setOverallState(
+      !internetConnected
+        ? NetworkHealthState.Disconnected
+        : hasIssues
+        ? NetworkHealthState.Issue
+        : NetworkHealthState.Ok
+    )
+  }, [hasIssues, internetConnected])
+
+  useEffect(() => {
+    const onlineCallback = () => {
+      setSteps(initialConnectingTypeGroupState)
+      setInternetConnected(true)
+    }
+    const offlineCallback = () => {
+      setInternetConnected(false)
+    }
+    window.addEventListener('online', onlineCallback)
+    window.addEventListener('offline', offlineCallback)
+    return () => {
+      window.removeEventListener('online', onlineCallback)
+      window.removeEventListener('offline', offlineCallback)
+    }
+  }, [])
+
+  useEffect(() => {
+    engineCommandManager.onConnectionStateChange(
+      (engineConnectionState: EngineConnectionState) => {
+        let hasSetAStep = false
+
+        if (
+          engineConnectionState.type === EngineConnectionStateType.Connecting
+        ) {
+          const groups = Object.values(steps)
+          for (let group of groups) {
+            for (let step of group) {
+              if (step[0] !== engineConnectionState.value.type) continue
+              step[1] = true
+              hasSetAStep = true
+            }
+          }
+        }
+
+        if (
+          engineConnectionState.type === EngineConnectionStateType.Disconnecting
+        ) {
+          const groups = Object.values(steps)
+          for (let group of groups) {
+            for (let step of group) {
+              if (
+                engineConnectionState.value.type === DisconnectingType.Error
+              ) {
+                if (
+                  engineConnectionState.value.value.lastConnectingValue
+                    ?.type === step[0]
+                ) {
+                  step[1] = false
+                  hasSetAStep = true
+                }
+              }
+            }
+
+            if (engineConnectionState.value.type === DisconnectingType.Error) {
+              setError(engineConnectionState.value.value)
+            }
+          }
+        }
+
+        if (hasSetAStep) {
+          setSteps(steps)
+        }
+      }
+    )
+  }, [])
+
+  return {
+    hasIssues,
+    overallState,
+    internetConnected,
+    steps,
+    issues,
+    error,
+    setHasCopied,
+    hasCopied,
+  }
+}
+
 export const NetworkHealthIndicator = () => {
   const {
     hasIssues,
@@ -82,7 +205,7 @@ export const NetworkHealthIndicator = () => {
     error,
     setHasCopied,
     hasCopied,
-  } = useNetworkContext()
+  } = useNetworkStatus()
 
   return (
     <Popover className="relative">
@@ -136,18 +259,18 @@ export const NetworkHealthIndicator = () => {
                     size="lg"
                     icon={
                       hasIssueToIcon[
-                        String(issues[name as ConnectingTypeGroup])
+                        issues[name as ConnectingTypeGroup].toString()
                       ]
                     }
                     iconClassName={
                       hasIssueToIconColors[
-                        String(issues[name as ConnectingTypeGroup])
+                        issues[name as ConnectingTypeGroup].toString()
                       ].icon
                     }
                     bgClassName={
                       'rounded-sm ' +
                       hasIssueToIconColors[
-                        String(issues[name as ConnectingTypeGroup])
+                        issues[name as ConnectingTypeGroup].toString()
                       ].bg
                     }
                   />

src/components/ProjectSidebarMenu.test.tsx

@@ -1,7 +1,8 @@
-import { render, screen } from '@testing-library/react'
+import { fireEvent, render, screen } from '@testing-library/react'
 import { BrowserRouter } from 'react-router-dom'
 import ProjectSidebarMenu from './ProjectSidebarMenu'
 import { SettingsAuthProviderJest } from './SettingsAuthProvider'
+import { APP_NAME } from 'lib/constants'
 import { CommandBarProvider } from './CommandBar/CommandBarProvider'
 import { Project } from 'wasm-lib/kcl/bindings/Project'
 

src/components/ProjectSidebarMenu.tsx

@@ -5,6 +5,7 @@ import { paths } from 'lib/paths'
 import { isTauri } from '../lib/isTauri'
 import { Link } from 'react-router-dom'
 import { Fragment } from 'react'
+import { FileTree } from './FileTree'
 import { sep } from '@tauri-apps/api/path'
 import { Logo } from './Logo'
 import { APP_NAME } from 'lib/constants'

src/components/RefreshButton.tsx

@@ -24,9 +24,9 @@ export function RefreshButton() {
   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-20 dark:border-chalkboard-90"
+      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="exclamationMark" className="w-5 h-5" />
+      <CustomIcon name="arrowRotateRight" className="w-5 h-5" />
       <Tooltip position="bottom-right">
         <span>Refresh and report</span>
         <br />

src/components/Settings/AllKeybindingsFields.tsx

@@ -1,87 +0,0 @@
-import {
-  InteractionMapItem,
-  interactionMap,
-  sortInteractionMapByCategory,
-} from 'lib/settings/initialKeybindings'
-import { ForwardedRef, forwardRef } from 'react'
-import { useLocation } from 'react-router-dom'
-
-interface AllKeybindingsFieldsProps {}
-
-export const AllKeybindingsFields = forwardRef(
-  (
-    props: AllKeybindingsFieldsProps,
-    scrollRef: ForwardedRef<HTMLDivElement>
-  ) => {
-    // This is how we will get the interaction map from the context
-    // in the future whene franknoirot/editable-hotkeys is merged.
-    // const { state } = useInteractionMapContext()
-
-    return (
-      <div className="relative overflow-y-auto pb-16">
-        <div ref={scrollRef} className="flex flex-col gap-12">
-          {Object.entries(interactionMap)
-            .sort(sortInteractionMapByCategory)
-            .map(([category, categoryItems]) => (
-              <div className="flex flex-col gap-4 px-2 pr-4">
-                <h2
-                  id={`category-${category}`}
-                  className="text-xl mt-6 first-of-type:mt-0 capitalize font-bold"
-                >
-                  {category}
-                </h2>
-                {categoryItems.map((item) => (
-                  <KeybindingField
-                    key={category + '-' + item.name}
-                    category={category}
-                    item={item}
-                  />
-                ))}
-              </div>
-            ))}
-        </div>
-      </div>
-    )
-  }
-)
-
-function KeybindingField({
-  item,
-  category,
-}: {
-  item: InteractionMapItem
-  category: string
-}) {
-  const location = useLocation()
-
-  return (
-    <div
-      className={
-        'flex gap-16 justify-between items-start py-1 px-2 -my-1 -mx-2 ' +
-        (location.hash === `#${item.name}`
-          ? 'bg-primary/5 dark:bg-chalkboard-90'
-          : '')
-      }
-      id={item.name}
-    >
-      <div>
-        <h3 className="text-lg font-normal capitalize tracking-wide">
-          {item.title}
-        </h3>
-        <p className="text-xs text-chalkboard-60 dark:text-chalkboard-50">
-          {item.description}
-        </p>
-      </div>
-      <div className="flex-1 flex flex-wrap justify-end gap-3">
-        {item.sequence.split(' ').map((chord, i) => (
-          <kbd
-            key={`${category}-${item.name}-${chord}-${i}`}
-            className="py-0.5 px-1.5 rounded bg-primary/10 dark:bg-chalkboard-80"
-          >
-            {chord}
-          </kbd>
-        ))}
-      </div>
-    </div>
-  )
-}

src/components/Settings/AllSettingsFields.tsx

@@ -1,238 +0,0 @@
-import decamelize from 'decamelize'
-import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
-import { Setting } from 'lib/settings/initialSettings'
-import { SetEventTypes, SettingsLevel } from 'lib/settings/settingsTypes'
-import {
-  shouldHideSetting,
-  shouldShowSettingInput,
-} from 'lib/settings/settingsUtils'
-import { Fragment } from 'react/jsx-runtime'
-import { SettingsSection } from './SettingsSection'
-import { useLocation, useNavigate } from 'react-router-dom'
-import { isTauri } from 'lib/isTauri'
-import { ActionButton } from 'components/ActionButton'
-import { SettingsFieldInput } from './SettingsFieldInput'
-import { getInitialDefaultDir, showInFolder } from 'lib/tauri'
-import toast from 'react-hot-toast'
-import { APP_VERSION } from 'routes/Settings'
-import { createAndOpenNewProject, getSettingsFolderPaths } from 'lib/tauriFS'
-import { paths } from 'lib/paths'
-import { useDotDotSlash } from 'hooks/useDotDotSlash'
-import { sep } from '@tauri-apps/api/path'
-import { ForwardedRef, forwardRef } from 'react'
-
-interface AllSettingsFieldsProps {
-  searchParamTab: SettingsLevel
-  isFileSettings: boolean
-}
-
-export const AllSettingsFields = forwardRef(
-  (
-    { searchParamTab, isFileSettings }: AllSettingsFieldsProps,
-    scrollRef: ForwardedRef<HTMLDivElement>
-  ) => {
-    const location = useLocation()
-    const navigate = useNavigate()
-    const dotDotSlash = useDotDotSlash()
-    const {
-      settings: { send, context },
-    } = useSettingsAuthContext()
-
-    const projectPath =
-      isFileSettings && isTauri()
-        ? decodeURI(
-            location.pathname
-              .replace(paths.FILE + '/', '')
-              .replace(paths.SETTINGS, '')
-              .slice(0, decodeURI(location.pathname).lastIndexOf(sep()))
-          )
-        : undefined
-
-    function restartOnboarding() {
-      send({
-        type: `set.app.onboardingStatus`,
-        data: { level: 'user', value: '' },
-      })
-
-      if (isFileSettings) {
-        navigate(dotDotSlash(1) + paths.ONBOARDING.INDEX)
-      } else {
-        createAndOpenNewProject(navigate)
-      }
-    }
-
-    return (
-      <div className="relative overflow-y-auto">
-        <div ref={scrollRef} className="flex flex-col gap-4 px-2">
-          {Object.entries(context)
-            .filter(([_, categorySettings]) =>
-              // Filter out categories that don't have any non-hidden settings
-              Object.values(categorySettings).some(
-                (setting) => !shouldHideSetting(setting, searchParamTab)
-              )
-            )
-            .map(([category, categorySettings]) => (
-              <Fragment key={category}>
-                <h2
-                  id={`category-${category}`}
-                  className="text-xl mt-6 first-of-type:mt-0 capitalize font-bold"
-                >
-                  {decamelize(category, { separator: ' ' })}
-                </h2>
-                {Object.entries(categorySettings)
-                  .filter(
-                    // Filter out settings that don't have a Component or inputType
-                    // or are hidden on the current level or the current platform
-                    (item: [string, Setting<unknown>]) =>
-                      shouldShowSettingInput(item[1], searchParamTab)
-                  )
-                  .map(([settingName, s]) => {
-                    const setting = s as Setting
-                    const parentValue =
-                      setting[setting.getParentLevel(searchParamTab)]
-                    return (
-                      <SettingsSection
-                        title={decamelize(settingName, {
-                          separator: ' ',
-                        })}
-                        id={settingName}
-                        className={
-                          location.hash === `#${settingName}`
-                            ? 'bg-primary/5 dark:bg-chalkboard-90'
-                            : ''
-                        }
-                        key={`${category}-${settingName}-${searchParamTab}`}
-                        description={setting.description}
-                        settingHasChanged={
-                          setting[searchParamTab] !== undefined &&
-                          setting[searchParamTab] !==
-                            setting.getFallback(searchParamTab)
-                        }
-                        parentLevel={setting.getParentLevel(searchParamTab)}
-                        onFallback={() =>
-                          send({
-                            type: `set.${category}.${settingName}`,
-                            data: {
-                              level: searchParamTab,
-                              value:
-                                parentValue !== undefined
-                                  ? parentValue
-                                  : setting.getFallback(searchParamTab),
-                            },
-                          } as SetEventTypes)
-                        }
-                      >
-                        <SettingsFieldInput
-                          category={category}
-                          settingName={settingName}
-                          settingsLevel={searchParamTab}
-                          setting={setting}
-                        />
-                      </SettingsSection>
-                    )
-                  })}
-              </Fragment>
-            ))}
-          <h2 id="settings-resets" className="text-2xl mt-6 font-bold">
-            Resets
-          </h2>
-          <SettingsSection
-            title="Onboarding"
-            description="Replay the onboarding process"
-          >
-            <ActionButton
-              Element="button"
-              onClick={restartOnboarding}
-              iconStart={{
-                icon: 'refresh',
-                size: 'sm',
-                className: 'p-1',
-              }}
-            >
-              Replay Onboarding
-            </ActionButton>
-          </SettingsSection>
-          <SettingsSection
-            title="Reset settings"
-            description={`Restore settings to their default values. Your settings are saved in
-                    ${
-                      isTauri()
-                        ? ' a file in the app data folder for your OS.'
-                        : " your browser's local storage."
-                    }
-                  `}
-          >
-            <div className="flex flex-col items-start gap-4">
-              {isTauri() && (
-                <ActionButton
-                  Element="button"
-                  onClick={async () => {
-                    const paths = await getSettingsFolderPaths(
-                      projectPath ? decodeURIComponent(projectPath) : undefined
-                    )
-                    showInFolder(paths[searchParamTab])
-                  }}
-                  iconStart={{
-                    icon: 'folder',
-                    size: 'sm',
-                    className: 'p-1',
-                  }}
-                >
-                  Show in folder
-                </ActionButton>
-              )}
-              <ActionButton
-                Element="button"
-                onClick={async () => {
-                  const defaultDirectory = await getInitialDefaultDir()
-                  send({
-                    type: 'Reset settings',
-                    defaultDirectory,
-                  })
-                  toast.success('Settings restored to default')
-                }}
-                iconStart={{
-                  icon: 'refresh',
-                  size: 'sm',
-                  className: 'p-1 text-chalkboard-10',
-                  bgClassName: 'bg-destroy-70',
-                }}
-              >
-                Restore default settings
-              </ActionButton>
-            </div>
-          </SettingsSection>
-          <h2 id="settings-about" className="text-2xl mt-6 font-bold">
-            About Modeling App
-          </h2>
-          <div className="text-sm mb-12">
-            <p>
-              {/* This uses a Vite plugin, set in vite.config.ts
-                  to inject the version from package.json */}
-              App version {APP_VERSION}.{' '}
-              <a
-                href={`https://github.com/KittyCAD/modeling-app/releases/tag/v${APP_VERSION}`}
-                target="_blank"
-                rel="noopener noreferrer"
-              >
-                View release on GitHub
-              </a>
-            </p>
-            <p className="max-w-2xl mt-6">
-              Don't see the feature you want? Check to see if it's on{' '}
-              <a
-                href="https://github.com/KittyCAD/modeling-app/discussions"
-                target="_blank"
-                rel="noopener noreferrer"
-              >
-                our roadmap
-              </a>
-              , and start a discussion if you don't see it! Your feedback will
-              help us prioritize what to build next.
-            </p>
-          </div>
-        </div>
-      </div>
-    )
-  }
-)

src/components/Settings/KeybindingsSectionsList.tsx

@@ -1,35 +0,0 @@
-import {
-  interactionMap,
-  sortInteractionMapByCategory,
-} from 'lib/settings/initialKeybindings'
-
-interface KeybindingSectionsListProps {
-  scrollRef: React.RefObject<HTMLDivElement>
-}
-
-export function KeybindingsSectionsList({
-  scrollRef,
-}: KeybindingSectionsListProps) {
-  return (
-    <div className="flex w-32 flex-col gap-3 pr-2 py-1 border-0 border-r border-r-chalkboard-20 dark:border-r-chalkboard-90">
-      {Object.entries(interactionMap)
-        .sort(sortInteractionMapByCategory)
-        .map(([category]) => (
-          <button
-            key={category}
-            onClick={() =>
-              scrollRef.current
-                ?.querySelector(`#category-${category}`)
-                ?.scrollIntoView({
-                  block: 'center',
-                  behavior: 'smooth',
-                })
-            }
-            className="capitalize text-left border-none px-1"
-          >
-            {category}
-          </button>
-        ))}
-    </div>
-  )
-}

src/components/Settings/SettingsSearchBar.tsx

@@ -3,23 +3,11 @@ import { CustomIcon } from 'components/CustomIcon'
 import decamelize from 'decamelize'
 import Fuse from 'fuse.js'
 import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
-import { interactionMap } from 'lib/settings/initialKeybindings'
 import { Setting } from 'lib/settings/initialSettings'
-import { SettingsLevel } from 'lib/settings/settingsTypes'
 import { useEffect, useMemo, useRef, useState } from 'react'
 import { useHotkeys } from 'react-hotkeys-hook'
 import { useNavigate } from 'react-router-dom'
 
-type ExtendedSettingsLevel = SettingsLevel | 'keybindings'
-
-export type SettingsSearchItem = {
-  name: string
-  displayName: string
-  description: string
-  category: string
-  level: ExtendedSettingsLevel
-}
-
 export function SettingsSearchBar() {
   const inputRef = useRef<HTMLInputElement>(null)
   useHotkeys(
@@ -33,40 +21,29 @@ export function SettingsSearchBar() {
   const navigate = useNavigate()
   const [query, setQuery] = useState('')
   const { settings } = useSettingsAuthContext()
-  const settingsAsSearchable: SettingsSearchItem[] = useMemo(
-    () => [
-      ...Object.entries(settings.state.context).flatMap(
+  const settingsAsSearchable = useMemo(
+    () =>
+      Object.entries(settings.state.context).flatMap(
         ([category, categorySettings]) =>
           Object.entries(categorySettings).flatMap(([settingName, setting]) => {
             const s = setting as Setting
-            return (['project', 'user'] satisfies SettingsLevel[])
+            return ['project', 'user']
               .filter((l) => s.hideOnLevel !== l)
               .map((l) => ({
                 category: decamelize(category, { separator: ' ' }),
-                name: settingName,
-                description: s.description ?? '',
-                displayName: decamelize(settingName, { separator: ' ' }),
-                level: l as ExtendedSettingsLevel,
+                settingName: settingName,
+                settingNameDisplay: decamelize(settingName, { separator: ' ' }),
+                setting: s,
+                level: l,
               }))
           })
       ),
-      ...Object.entries(interactionMap).flatMap(
-        ([category, categoryKeybindings]) =>
-          categoryKeybindings.map((keybinding) => ({
-            name: keybinding.name,
-            displayName: keybinding.title,
-            description: keybinding.description,
-            category: category,
-            level: 'keybindings' as ExtendedSettingsLevel,
-          }))
-      ),
-    ],
     [settings.state.context]
   )
   const [searchResults, setSearchResults] = useState(settingsAsSearchable)
 
   const fuse = new Fuse(settingsAsSearchable, {
-    keys: ['category', 'displayName', 'description'],
+    keys: ['category', 'settingNameDisplay', 'setting.description'],
     includeScore: true,
   })
 
@@ -75,8 +52,16 @@ export function SettingsSearchBar() {
     setSearchResults(query.length > 0 ? results : settingsAsSearchable)
   }, [query])
 
-  function handleSelection({ level, name }: SettingsSearchItem) {
-    navigate(`?tab=${level}#${name}`)
+  function handleSelection({
+    level,
+    settingName,
+  }: {
+    category: string
+    settingName: string
+    setting: Setting<unknown>
+    level: string
+  }) {
+    navigate(`?tab=${level}#${settingName}`)
   }
 
   return (
@@ -102,18 +87,18 @@ export function SettingsSearchBar() {
         <Combobox.Options className="absolute top-full mt-2 right-0 w-80 overflow-y-auto z-50 max-h-96 cursor-pointer bg-chalkboard-10 dark:bg-chalkboard-100 border border-solid border-primary dark:border-chalkboard-30 rounded">
           {searchResults?.map((option) => (
             <Combobox.Option
-              key={`${option.category}-${option.name}-${option.level}`}
+              key={`${option.category}-${option.settingName}-${option.level}`}
               value={option}
               className="flex flex-col items-start gap-2 px-4 py-2 ui-active:bg-primary/10 dark:ui-active:bg-chalkboard-90"
             >
               <p className="flex-grow text-base capitalize m-0 leading-none">
                 {option.level} ·{' '}
                 {decamelize(option.category, { separator: ' ' })} ·{' '}
-                {option.displayName}
+                {option.settingNameDisplay}
               </p>
-              {option.description && (
+              {option.setting.description && (
                 <p className="text-xs leading-tight text-chalkboard-70 dark:text-chalkboard-50">
-                  {option.description}
+                  {option.setting.description}
                 </p>
               )}
             </Combobox.Option>

src/components/Settings/SettingsSectionsList.tsx

@@ -1,68 +0,0 @@
-import decamelize from 'decamelize'
-import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
-import { Setting } from 'lib/settings/initialSettings'
-import { SettingsLevel } from 'lib/settings/settingsTypes'
-import { shouldHideSetting } from 'lib/settings/settingsUtils'
-
-interface SettingsSectionsListProps {
-  searchParamTab: SettingsLevel
-  scrollRef: React.RefObject<HTMLDivElement>
-}
-
-export function SettingsSectionsList({
-  searchParamTab,
-  scrollRef,
-}: SettingsSectionsListProps) {
-  const {
-    settings: { context },
-  } = useSettingsAuthContext()
-  return (
-    <div className="flex w-32 flex-col gap-3 pr-2 py-1 border-0 border-r border-r-chalkboard-20 dark:border-r-chalkboard-90">
-      {Object.entries(context)
-        .filter(([_, categorySettings]) =>
-          // Filter out categories that don't have any non-hidden settings
-          Object.values(categorySettings).some(
-            (setting: Setting) => !shouldHideSetting(setting, searchParamTab)
-          )
-        )
-        .map(([category]) => (
-          <button
-            key={category}
-            onClick={() =>
-              scrollRef.current
-                ?.querySelector(`#category-${category}`)
-                ?.scrollIntoView({
-                  block: 'center',
-                  behavior: 'smooth',
-                })
-            }
-            className="capitalize text-left border-none px-1"
-          >
-            {decamelize(category, { separator: ' ' })}
-          </button>
-        ))}
-      <button
-        onClick={() =>
-          scrollRef.current?.querySelector(`#settings-resets`)?.scrollIntoView({
-            block: 'center',
-            behavior: 'smooth',
-          })
-        }
-        className="capitalize text-left border-none px-1"
-      >
-        Resets
-      </button>
-      <button
-        onClick={() =>
-          scrollRef.current?.querySelector(`#settings-about`)?.scrollIntoView({
-            block: 'center',
-            behavior: 'smooth',
-          })
-        }
-        className="capitalize text-left border-none px-1"
-      >
-        About
-      </button>
-    </div>
-  )
-}

src/components/Settings/SettingsTabs.tsx

@@ -34,15 +34,6 @@ export function SettingsTabs({
           )}
         </RadioGroup.Option>
       )}
-      <RadioGroup.Option value="keybindings">
-        {({ checked }) => (
-          <SettingsTabButton
-            checked={checked}
-            icon="keyboard"
-            text="Keybindings"
-          />
-        )}
-      </RadioGroup.Option>
     </RadioGroup>
   )
 }

src/components/SettingsAuthProvider.tsx

@@ -171,9 +171,7 @@ export const SettingsAuthProviderBase = ({
           })
         },
         'Execute AST': () => kclManager.executeCode(true, true),
-      },
-      services: {
-        'Persist settings': (context) =>
+        persistSettings: (context) =>
           saveSettings(context, loadedProject?.project?.path),
       },
     }

src/components/Stream.tsx

@@ -4,9 +4,8 @@ import { getNormalisedCoordinates } from '../lib/utils'
 import Loading from './Loading'
 import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
 import { useModelingContext } from 'hooks/useModelingContext'
-import { useNetworkContext } from 'hooks/useNetworkContext'
-import { NetworkHealthState } from 'hooks/useNetworkStatus'
 import { ClientSideScene } from 'clientSideScene/ClientSideSceneComp'
+import { NetworkHealthState, useNetworkStatus } from './NetworkHealthIndicator'
 import { butName } from 'lib/cameraControls'
 import { sendSelectEventToEngine } from 'lib/selections'
 
@@ -29,43 +28,8 @@ export const Stream = ({ className = '' }: { className?: string }) => {
   }))
   const { settings } = useSettingsAuthContext()
   const { state } = useModelingContext()
-  const { overallState } = useNetworkContext()
-
-  const isNetworkOkay =
-    overallState === NetworkHealthState.Ok ||
-    overallState === NetworkHealthState.Weak
-
-  // Linux has a default behavior to paste text on middle mouse up
-  // This adds a listener to block that pasting if the click target
-  // is not a text input, so users can move in the 3D scene with
-  // middle mouse drag with a text input focused without pasting.
-  useEffect(() => {
-    const handlePaste = (e: ClipboardEvent) => {
-      const isHtmlElement = e.target && e.target instanceof HTMLElement
-      const isEditable =
-        (isHtmlElement && !('explicitOriginalTarget' in e)) ||
-        ('explicitOriginalTarget' in e &&
-          ((e.explicitOriginalTarget as HTMLElement).contentEditable ===
-            'true' ||
-            ['INPUT', 'TEXTAREA'].some(
-              (tagName) =>
-                tagName === (e.explicitOriginalTarget as HTMLElement).tagName
-            )))
-      if (!isEditable) {
-        e.preventDefault()
-        e.stopPropagation()
-        e.stopImmediatePropagation()
-      }
-    }
-
-    globalThis?.window?.document?.addEventListener('paste', handlePaste, {
-      capture: true,
-    })
-    return () =>
-      globalThis?.window?.document?.removeEventListener('paste', handlePaste, {
-        capture: true,
-      })
-  }, [])
+  const { overallState } = useNetworkStatus()
+  const isNetworkOkay = overallState === NetworkHealthState.Ok
 
   useEffect(() => {
     if (
@@ -79,7 +43,6 @@ export const Stream = ({ className = '' }: { className?: string }) => {
   }, [mediaStream])
 
   const handleMouseDown: MouseEventHandler<HTMLDivElement> = (e) => {
-    if (!isNetworkOkay) return
     if (!videoRef.current) return
     if (state.matches('Sketch')) return
     if (state.matches('Sketch no face')) return
@@ -95,7 +58,6 @@ export const Stream = ({ className = '' }: { className?: string }) => {
   }
 
   const handleMouseUp: MouseEventHandler<HTMLDivElement> = (e) => {
-    if (!isNetworkOkay) return
     if (!videoRef.current) return
     setButtonDownInStream(undefined)
     if (state.matches('Sketch')) return
@@ -110,7 +72,6 @@ export const Stream = ({ className = '' }: { className?: string }) => {
   }
 
   const handleMouseMove: MouseEventHandler<HTMLVideoElement> = (e) => {
-    if (!isNetworkOkay) return
     if (state.matches('Sketch')) return
     if (state.matches('Sketch no face')) return
     if (!clickCoords) return
@@ -126,8 +87,8 @@ export const Stream = ({ className = '' }: { className?: string }) => {
 
   return (
     <div
-      className="absolute inset-0 z-0"
-      data-testid="stream"
+      id="stream"
+      className={className}
       onMouseUp={handleMouseUp}
       onMouseDown={handleMouseDown}
       onContextMenu={(e) => e.preventDefault()}
@@ -142,6 +103,7 @@ export const Stream = ({ className = '' }: { className?: string }) => {
         onMouseMoveCapture={handleMouseMove}
         className="w-full cursor-pointer h-full"
         disablePictureInPicture
+        style={{ transitionDuration: '200ms', transitionProperty: 'filter' }}
         id="video-stream"
       />
       <ClientSideScene
@@ -150,7 +112,7 @@ export const Stream = ({ className = '' }: { className?: string }) => {
       {!isNetworkOkay && !isLoading && (
         <div className="text-center absolute inset-0">
           <Loading>
-            <span data-testid="loading-stream">Stream disconnected...</span>
+            <span data-testid="loading-stream">Stream disconnected</span>
           </Loading>
         </div>
       )}

src/components/Tooltip.module.css

@@ -11,8 +11,30 @@
   --_p-inline: calc(50% + calc(var(--isRTL) * var(--_triangle-width) / 2));
   --_p-block: 4px;
   --_bg: var(--chalkboard-10);
-  --_shadow-alpha: 8%;
+  --_shadow-alpha: 5%;
   --_theme-alpha: 0.15;
+  --_theme-outline: drop-shadow(
+      0 1px 0
+        oklch(
+          var(--primary-lightness) var(--primary-chroma) var(--primary-hue) /
+            var(--_theme-alpha)
+        )
+    )
+    drop-shadow(
+      0 -1px 0 oklch(var(--primary-lightness) var(--primary-chroma)
+            var(--primary-hue) / var(--_theme-alpha))
+    )
+    drop-shadow(
+      1px 0 0
+        oklch(
+          var(--primary-lightness) var(--primary-chroma) var(--primary-hue) /
+            var(--_theme-alpha)
+        )
+    )
+    drop-shadow(
+      -1px 0 0 oklch(var(--primary-lightness) var(--primary-chroma)
+            var(--primary-hue) / var(--_theme-alpha))
+    );
 
   pointer-events: none;
   user-select: none;
@@ -39,15 +61,16 @@
   background: var(--_bg);
   @apply text-chalkboard-110;
   will-change: filter;
-  filter: drop-shadow(0 1px 2px hsl(0 0% 0% / var(--_shadow-alpha)))
-    drop-shadow(0 4px 6px hsl(0 0% 0% / calc(var(--_shadow-alpha) / 2)));
+  filter: drop-shadow(0 1px 3px hsl(0 0% 0% / var(--_shadow-alpha)))
+    drop-shadow(0 4px 8px hsl(0 0% 0% / var(--_shadow-alpha)))
+    var(--_theme-outline);
 }
 
 :global(.dark) .tooltip {
-  --_bg: var(--chalkboard-90);
+  --_bg: var(--chalkboard-110);
   --_theme-alpha: 40%;
-  --_shadow-alpha: 16%;
   @apply text-chalkboard-10;
+  filter: var(--_theme-outline);
 }
 
 .tooltip:dir(rtl) {
@@ -86,7 +109,7 @@
 }
 
 /* Sometimes there's no visible label,
- * so we'll use the tooltip as the label
+ * so we'll use the tooltip as the label  
 */
 .tooltip:only-child::before {
   content: 'Tooltip:';

src/components/UserSidebarMenu.tsx

@@ -39,7 +39,7 @@ const UserSidebarMenu = ({ user }: { user?: User }) => {
     <Popover className="relative">
       {user?.image && !imageLoadFailed ? (
         <Popover.Button
-          className="relative border-0 rounded-full w-fit min-w-max p-0 group"
+          className="border-0 rounded-full w-fit min-w-max p-0 group"
           data-testid="user-sidebar-toggle"
         >
           <div className="rounded-full border overflow-hidden">
@@ -51,9 +51,6 @@ const UserSidebarMenu = ({ user }: { user?: User }) => {
               onError={() => setImageLoadFailed(true)}
             />
           </div>
-          <Tooltip position="bottom-right" delay={1000}>
-            User menu
-          </Tooltip>
         </Popover.Button>
       ) : (
         <ActionButton
@@ -62,7 +59,7 @@ const UserSidebarMenu = ({ user }: { user?: User }) => {
           className="border-transparent !px-0"
           data-testid="user-sidebar-toggle"
         >
-          <Tooltip position="bottom-right" delay={1000}>
+          <Tooltip position="left" delay={1000}>
             User menu
           </Tooltip>
         </ActionButton>

src/editor/manager.ts

@@ -7,11 +7,7 @@ import { Selections, processCodeMirrorRanges, Selection } from 'lib/selections'
 import { undo, redo } from '@codemirror/commands'
 import { CommandBarMachineEvent } from 'machines/commandBarMachine'
 import { addLineHighlight } from './highlightextension'
-import { forEachDiagnostic, setDiagnostics, Diagnostic } from '@codemirror/lint'
-
-function diagnosticIsEqual(d1: Diagnostic, d2: Diagnostic): boolean {
-  return d1.from === d2.from && d1.to === d2.to && d1.message === d2.message
-}
+import { setDiagnostics, Diagnostic } from '@codemirror/lint'
 
 export default class EditorManager {
   private _editorView: EditorView | null = null
@@ -95,38 +91,11 @@ export default class EditorManager {
     }
   }
 
-  clearDiagnostics(): void {
-    if (!this.editorView) return
-    this.editorView.dispatch(setDiagnostics(this.editorView.state, []))
-  }
-
   setDiagnostics(diagnostics: Diagnostic[]): void {
     if (!this.editorView) return
     this.editorView.dispatch(setDiagnostics(this.editorView.state, diagnostics))
   }
 
-  addDiagnostics(diagnostics: Diagnostic[]): void {
-    if (!this.editorView) return
-
-    forEachDiagnostic(this.editorView.state, function (diag) {
-      diagnostics.push(diag)
-    })
-
-    const uniqueDiagnostics = new Set<Diagnostic>()
-    diagnostics.forEach((diagnostic) => {
-      for (const knownDiagnostic of uniqueDiagnostics.values()) {
-        if (diagnosticIsEqual(diagnostic, knownDiagnostic)) {
-          return
-        }
-      }
-      uniqueDiagnostics.add(diagnostic)
-    })
-
-    this.editorView.dispatch(
-      setDiagnostics(this.editorView.state, [...uniqueDiagnostics])
-    )
-  }
-
   undo() {
     if (this._editorView) {
       undo(this._editorView)

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

@@ -474,13 +474,19 @@ const completionRequester = (client: LanguageServerClient) => {
 }
 
 export const copilotPlugin = (options: LanguageServerOptions): Extension => {
+  let plugin: LanguageServerPlugin | null = null
+
   return [
     documentUri.of(options.documentUri),
     languageId.of('kcl'),
     workspaceFolders.of(options.workspaceFolders),
     ViewPlugin.define(
       (view) =>
-        new LanguageServerPlugin(options.client, view, options.allowHTMLContent)
+        (plugin = new LanguageServerPlugin(
+          options.client,
+          view,
+          options.allowHTMLContent
+        ))
     ),
     completionDecoration,
     Prec.highest(completionPlugin(options.client)),

src/editor/plugins/lsp/plugin.ts

@@ -382,14 +382,9 @@ export class LanguageServerPlugin implements PluginValue {
     try {
       switch (notification.method) {
         case 'textDocument/publishDiagnostics':
-          console.log(
-            '[lsp] [window/publishDiagnostics]',
-            this.client.getName(),
-            notification.params
-          )
-          const params = notification.params as PublishDiagnosticsParams
+          //const params = notification.params as PublishDiagnosticsParams
           // this is sometimes slower than our actual typing.
-          this.processDiagnostics(params)
+          //this.processDiagnostics(params)
           break
         case 'window/logMessage':
           console.log(

src/hooks/useNetworkContext.tsx

@@ -1,25 +0,0 @@
-import { createContext, useContext } from 'react'
-import {
-  ConnectingTypeGroup,
-  initialConnectingTypeGroupState,
-} from '../lang/std/engineConnection'
-import { NetworkStatus, NetworkHealthState } from './useNetworkStatus'
-
-export const NetworkContext = createContext<NetworkStatus>({
-  hasIssues: undefined,
-  overallState: NetworkHealthState.Disconnected,
-  internetConnected: true,
-  steps: structuredClone(initialConnectingTypeGroupState),
-  issues: {
-    [ConnectingTypeGroup.WebSocket]: undefined,
-    [ConnectingTypeGroup.ICE]: undefined,
-    [ConnectingTypeGroup.WebRTC]: undefined,
-  },
-  error: undefined,
-  setHasCopied: (b: boolean) => {},
-  hasCopied: false,
-  pingPongHealth: undefined,
-} as NetworkStatus)
-export const useNetworkContext = () => {
-  return useContext(NetworkContext)
-}

src/hooks/useNetworkStatus.tsx

@@ -1,228 +0,0 @@
-import { useEffect, useState } from 'react'
-import {
-  ConnectingType,
-  ConnectingTypeGroup,
-  DisconnectingType,
-  EngineCommandManagerEvents,
-  EngineConnectionEvents,
-  EngineConnectionStateType,
-  ErrorType,
-  initialConnectingTypeGroupState,
-} from '../lang/std/engineConnection'
-import { engineCommandManager } from '../lib/singletons'
-
-export enum NetworkHealthState {
-  Ok,
-  Weak,
-  Issue,
-  Disconnected,
-}
-
-export interface NetworkStatus {
-  hasIssues: boolean | undefined
-  overallState: NetworkHealthState
-  internetConnected: boolean
-  steps: typeof initialConnectingTypeGroupState
-  issues: Record<ConnectingTypeGroup, boolean | undefined>
-  error: ErrorType | undefined
-  setHasCopied: (b: boolean) => void
-  hasCopied: boolean
-  pingPongHealth: undefined | 'OK' | 'TIMEOUT'
-}
-
-// Must be called from one place in the application.
-// We've chosen the <Router /> component for this.
-export function useNetworkStatus() {
-  const [steps, setSteps] = useState(
-    structuredClone(initialConnectingTypeGroupState)
-  )
-  const [internetConnected, setInternetConnected] = useState<boolean>(true)
-  const [overallState, setOverallState] = useState<NetworkHealthState>(
-    NetworkHealthState.Disconnected
-  )
-  const [pingPongHealth, setPingPongHealth] = useState<
-    undefined | 'OK' | 'TIMEOUT'
-  >(undefined)
-  const [hasCopied, setHasCopied] = useState<boolean>(false)
-
-  const [error, setError] = useState<ErrorType | undefined>(undefined)
-
-  const hasIssue = (i: [ConnectingType, boolean | undefined]) =>
-    i[1] === undefined ? i[1] : !i[1]
-
-  const [issues, setIssues] = useState<
-    Record<ConnectingTypeGroup, boolean | undefined>
-  >({
-    [ConnectingTypeGroup.WebSocket]: undefined,
-    [ConnectingTypeGroup.ICE]: undefined,
-    [ConnectingTypeGroup.WebRTC]: undefined,
-  })
-
-  const [hasIssues, setHasIssues] = useState<boolean | undefined>(undefined)
-  useEffect(() => {
-    setOverallState(
-      !internetConnected
-        ? NetworkHealthState.Disconnected
-        : hasIssues || hasIssues === undefined
-        ? NetworkHealthState.Issue
-        : pingPongHealth === 'TIMEOUT'
-        ? NetworkHealthState.Weak
-        : NetworkHealthState.Ok
-    )
-  }, [hasIssues, internetConnected, pingPongHealth])
-
-  useEffect(() => {
-    const onlineCallback = () => {
-      setInternetConnected(true)
-    }
-    const offlineCallback = () => {
-      setInternetConnected(false)
-      setSteps(structuredClone(initialConnectingTypeGroupState))
-    }
-    window.addEventListener('online', onlineCallback)
-    window.addEventListener('offline', offlineCallback)
-    return () => {
-      window.removeEventListener('online', onlineCallback)
-      window.removeEventListener('offline', offlineCallback)
-    }
-  }, [])
-
-  useEffect(() => {
-    const issues = {
-      [ConnectingTypeGroup.WebSocket]: steps[
-        ConnectingTypeGroup.WebSocket
-      ].reduce(
-        (acc: boolean | undefined, a) =>
-          acc === true || acc === undefined ? acc : hasIssue(a),
-        false
-      ),
-      [ConnectingTypeGroup.ICE]: steps[ConnectingTypeGroup.ICE].reduce(
-        (acc: boolean | undefined, a) =>
-          acc === true || acc === undefined ? acc : hasIssue(a),
-        false
-      ),
-      [ConnectingTypeGroup.WebRTC]: steps[ConnectingTypeGroup.WebRTC].reduce(
-        (acc: boolean | undefined, a) =>
-          acc === true || acc === undefined ? acc : hasIssue(a),
-        false
-      ),
-    }
-    setIssues(issues)
-  }, [steps])
-
-  useEffect(() => {
-    setHasIssues(
-      issues[ConnectingTypeGroup.WebSocket] ||
-        issues[ConnectingTypeGroup.ICE] ||
-        issues[ConnectingTypeGroup.WebRTC]
-    )
-  }, [issues])
-
-  useEffect(() => {
-    const onPingPongChange = ({ detail: state }: CustomEvent) => {
-      setPingPongHealth(state)
-    }
-
-    const onConnectionStateChange = ({
-      detail: engineConnectionState,
-    }: CustomEvent) => {
-      setSteps((steps) => {
-        let nextSteps = structuredClone(steps)
-
-        if (
-          engineConnectionState.type === EngineConnectionStateType.Connecting
-        ) {
-          const groups = Object.values(nextSteps)
-          for (let group of groups) {
-            for (let step of group) {
-              if (step[0] !== engineConnectionState.value.type) continue
-              step[1] = true
-            }
-          }
-        }
-
-        if (
-          engineConnectionState.type === EngineConnectionStateType.Disconnecting
-        ) {
-          const groups = Object.values(nextSteps)
-          for (let group of groups) {
-            for (let step of group) {
-              if (
-                engineConnectionState.value.type === DisconnectingType.Error
-              ) {
-                if (
-                  engineConnectionState.value.value.lastConnectingValue
-                    ?.type === step[0]
-                ) {
-                  step[1] = false
-                }
-              }
-            }
-
-            if (engineConnectionState.value.type === DisconnectingType.Error) {
-              setError(engineConnectionState.value.value)
-            }
-          }
-        }
-
-        // Reset the state of all steps if we have disconnected.
-        if (
-          engineConnectionState.type === EngineConnectionStateType.Disconnected
-        ) {
-          return structuredClone(initialConnectingTypeGroupState)
-        }
-
-        return nextSteps
-      })
-    }
-
-    const onEngineAvailable = ({ detail: engineConnection }: CustomEvent) => {
-      engineConnection.addEventListener(
-        EngineConnectionEvents.PingPongChanged,
-        onPingPongChange as EventListener
-      )
-      engineConnection.addEventListener(
-        EngineConnectionEvents.ConnectionStateChanged,
-        onConnectionStateChange as EventListener
-      )
-
-      // Tell EngineConnection to start firing events.
-      window.dispatchEvent(new CustomEvent('use-network-status-ready', {}))
-    }
-
-    engineCommandManager.addEventListener(
-      EngineCommandManagerEvents.EngineAvailable,
-      onEngineAvailable as EventListener
-    )
-
-    return () => {
-      engineCommandManager.removeEventListener(
-        EngineCommandManagerEvents.EngineAvailable,
-        onEngineAvailable as EventListener
-      )
-
-      // When the component is unmounted these should be assigned, but it's possible
-      // the component mounts and unmounts before engine is available.
-      engineCommandManager.engineConnection?.addEventListener(
-        EngineConnectionEvents.PingPongChanged,
-        onPingPongChange as EventListener
-      )
-      engineCommandManager.engineConnection?.addEventListener(
-        EngineConnectionEvents.ConnectionStateChanged,
-        onConnectionStateChange as EventListener
-      )
-    }
-  }, [])
-
-  return {
-    hasIssues,
-    overallState,
-    internetConnected,
-    steps,
-    issues,
-    error,
-    setHasCopied,
-    hasCopied,
-    pingPongHealth,
-  }
-}

src/hooks/useSetupEngineManager.ts

@@ -43,7 +43,7 @@ export function useSetupEngineManager(
     engineCommandManager.pool = settings.pool
   }
 
-  const startEngineInstance = () => {
+  useLayoutEffect(() => {
     // Load the engine command manager once with the initial width and height,
     // then we do not want to reload it.
     const { width: quadWidth, height: quadHeight } = getDimensions(
@@ -73,12 +73,7 @@ export function useSetupEngineManager(
       })
       hasSetNonZeroDimensions.current = true
     }
-  }
-
-  useLayoutEffect(startEngineInstance, [
-    streamRef?.current?.offsetWidth,
-    streamRef?.current?.offsetHeight,
-  ])
+  }, [streamRef?.current?.offsetWidth, streamRef?.current?.offsetHeight])
 
   useEffect(() => {
     const handleResize = deferExecution(() => {
@@ -101,20 +96,8 @@ export function useSetupEngineManager(
       }
     }, 500)
 
-    const onOnline = () => {
-      startEngineInstance()
-    }
-
-    const onOffline = () => {
-      engineCommandManager.tearDown()
-    }
-
-    window.addEventListener('online', onOnline)
-    window.addEventListener('offline', onOffline)
     window.addEventListener('resize', handleResize)
     return () => {
-      window.removeEventListener('online', onOnline)
-      window.removeEventListener('offline', onOffline)
       window.removeEventListener('resize', handleResize)
     }
   }, [])

src/hooks/useStateMachineCommands.ts

@@ -7,10 +7,12 @@ import { authMachine } from 'machines/authMachine'
 import { settingsMachine } from 'machines/settingsMachine'
 import { homeMachine } from 'machines/homeMachine'
 import { Command, CommandSetConfig, CommandSetSchema } from 'lib/commandTypes'
+import {
+  NetworkHealthState,
+  useNetworkStatus,
+} from 'components/NetworkHealthIndicator'
 import { useKclContext } from 'lang/KclProvider'
 import { useStore } from 'useStore'
-import { useNetworkContext } from 'hooks/useNetworkContext'
-import { NetworkHealthState } from 'hooks/useNetworkStatus'
 
 // This might not be necessary, AnyStateMachine from xstate is working
 export type AllMachines =
@@ -45,7 +47,7 @@ export default function useStateMachineCommands<
   onCancel,
 }: UseStateMachineCommandsArgs<T, S>) {
   const { commandBarSend } = useCommandsContext()
-  const { overallState } = useNetworkContext()
+  const { overallState } = useNetworkStatus()
   const { isExecuting } = useKclContext()
   const { isStreamReady } = useStore((s) => ({
     isStreamReady: s.isStreamReady,
@@ -53,10 +55,7 @@ export default function useStateMachineCommands<
 
   useEffect(() => {
     const disableAllButtons =
-      (overallState !== NetworkHealthState.Ok &&
-        overallState !== NetworkHealthState.Weak) ||
-      isExecuting ||
-      !isStreamReady
+      overallState !== NetworkHealthState.Ok || isExecuting || !isStreamReady
     const newCommands = state.nextEvents
       .filter((_) => !allCommandsRequireNetwork || !disableAllButtons)
       .filter((e) => !['done.', 'error.'].some((n) => e.includes(n)))

src/index.css

@@ -147,31 +147,13 @@ code {
 
 #code-mirror-override .cm-activeLine,
 #code-mirror-override .cm-activeLineGutter {
-  @apply bg-primary/5;
+  @apply bg-primary/10;
 }
 
 .dark #code-mirror-override .cm-activeLine,
 .dark #code-mirror-override .cm-activeLineGutter {
-  @apply bg-chalkboard-70/20;
-  mix-blend-mode: lighten;
-}
-
-#code-mirror-override .cm-focused .cm-activeLine,
-#code-mirror-override .cm-focused .cm-activeLineGutter {
-  @apply bg-primary/10;
-}
-
-.dark #code-mirror-override .cm-focused .cm-activeLine,
-.dark #code-mirror-override .cm-focused .cm-activeLineGutter {
-  @apply bg-chalkboard-70/40;
-}
-
-#code-mirror-override .cm-matchingBracket {
   @apply bg-primary/20;
-}
-
-.dark #code-mirror-override .cm-matchingBracket {
-  @apply bg-chalkboard-70/60;
+  mix-blend-mode: lighten;
 }
 
 #code-mirror-override .cm-gutters {
@@ -189,8 +171,22 @@ code {
   @apply caret-chalkboard-10;
 }
 
-#code-mirror-override .cm-focused {
-  outline: none;
+#code-mirror-override .cm-focused .cm-cursor {
+  width: 0px;
+}
+#code-mirror-override .cm-cursor {
+  display: block;
+  width: 1ch;
+  @apply mix-blend-multiply;
+  @apply border-l-primary;
+}
+
+.dark #code-mirror-override .cm-cursor {
+  @apply border-l-chalkboard-10;
+}
+
+#code-mirror-override.blink .cm-cursor {
+  animation: blink 1200ms ease-out infinite;
 }
 
 @keyframes blink {
@@ -253,10 +249,3 @@ code {
 .cm-ghostText * {
   color: rgb(120, 120, 120, 0.8) !important;
 }
-
-@layer components {
-  kbd.hotkey {
-    @apply font-mono text-xs inline-block px-1 py-0.5 rounded-sm;
-    @apply bg-chalkboard-20 dark:bg-chalkboard-90;
-  }
-}

src/lang/KclSingleton.ts

@@ -41,10 +41,7 @@ export class KclManager {
   engineCommandManager: EngineCommandManager
   private _defferer = deferExecution((code: string) => {
     const ast = this.safeParse(code)
-    if (!ast) {
-      this.clearAst()
-      return
-    }
+    if (!ast) return
     try {
       const fmtAndStringify = (ast: Program) =>
         JSON.stringify(parse(recast(ast)))
@@ -94,7 +91,7 @@ export class KclManager {
   set kclErrors(kclErrors) {
     this._kclErrors = kclErrors
     let diagnostics = kclErrorsToDiagnostics(kclErrors)
-    editorManager.addDiagnostics(diagnostics)
+    editorManager.setDiagnostics(diagnostics)
     this._kclErrorsCallBack(kclErrors)
   }
 
@@ -148,18 +145,6 @@ export class KclManager {
     this._executeCallback = callback
   }
 
-  clearAst() {
-    this._ast = {
-      body: [],
-      start: 0,
-      end: 0,
-      nonCodeMeta: {
-        nonCodeNodes: {},
-        start: [],
-      },
-    }
-  }
-
   safeParse(code: string): Program | null {
     try {
       const ast = parse(code)
@@ -200,11 +185,6 @@ export class KclManager {
     const currentExecutionId = executionId || Date.now()
     this._cancelTokens.set(currentExecutionId, false)
 
-    // here we're going to clear diagnostics since we're the first
-    // one in. We're the only location where diagnostics are cleared;
-    // everything from here on out should be *appending*.
-    editorManager.clearDiagnostics()
-
     this.isExecuting = true
     await this.ensureWasmInit()
     const { logs, errors, programMemory } = await executeAst({
@@ -254,7 +234,6 @@ export class KclManager {
     } = { updates: 'none' }
   ) {
     await this.ensureWasmInit()
-
     const newCode = recast(ast)
     const newAst = this.safeParse(newCode)
     if (!newAst) return
@@ -264,11 +243,6 @@ export class KclManager {
     await this?.engineCommandManager?.waitForReady
     this._ast = { ...newAst }
 
-    // here we're going to clear diagnostics since we're the first
-    // one in. We're the only location where diagnostics are cleared;
-    // everything from here on out should be *appending*.
-    editorManager.clearDiagnostics()
-
     const { logs, errors, programMemory } = await executeAst({
       ast: newAst,
       engineCommandManager: this.engineCommandManager,
@@ -307,20 +281,14 @@ export class KclManager {
     if (!force) return this._defferer(codeManager.code)
 
     const ast = this.safeParse(codeManager.code)
-    if (!ast) {
-      this.clearAst()
-      return
-    }
+    if (!ast) return
     this.ast = { ...ast }
     return this.executeAst(ast, zoomToFit)
   }
   format() {
     const originalCode = codeManager.code
     const ast = this.safeParse(originalCode)
-    if (!ast) {
-      this.clearAst()
-      return
-    }
+    if (!ast) return
     const code = recast(ast)
     if (originalCode === code) return
 
@@ -384,55 +352,25 @@ export class KclManager {
     return this?.engineCommandManager?.defaultPlanes
   }
 
-  showPlanes(all = false) {
-    if (!this.defaultPlanes) return Promise.all([])
-    const thePromises = [
-      this.engineCommandManager.setPlaneHidden(this.defaultPlanes.xy, false),
-      this.engineCommandManager.setPlaneHidden(this.defaultPlanes.yz, false),
-      this.engineCommandManager.setPlaneHidden(this.defaultPlanes.xz, false),
-    ]
-    if (all) {
-      thePromises.push(
-        this.engineCommandManager.setPlaneHidden(
-          this.defaultPlanes.negXy,
-          false
-        )
-      )
-      thePromises.push(
-        this.engineCommandManager.setPlaneHidden(
-          this.defaultPlanes.negYz,
-          false
-        )
-      )
-      thePromises.push(
-        this.engineCommandManager.setPlaneHidden(
-          this.defaultPlanes.negXz,
-          false
-        )
-      )
-    }
-    return Promise.all(thePromises)
+  showPlanes() {
+    if (!this.defaultPlanes) return
+    void this.engineCommandManager.setPlaneHidden(this.defaultPlanes.xy, false)
+    void this.engineCommandManager.setPlaneHidden(this.defaultPlanes.yz, false)
+    void this.engineCommandManager.setPlaneHidden(this.defaultPlanes.xz, false)
   }
 
-  hidePlanes(all = false) {
-    if (!this.defaultPlanes) return Promise.all([])
-    const thePromises = [
-      this.engineCommandManager.setPlaneHidden(this.defaultPlanes.xy, true),
-      this.engineCommandManager.setPlaneHidden(this.defaultPlanes.yz, true),
-      this.engineCommandManager.setPlaneHidden(this.defaultPlanes.xz, true),
-    ]
-    if (all) {
-      thePromises.push(
-        this.engineCommandManager.setPlaneHidden(this.defaultPlanes.negXy, true)
-      )
-      thePromises.push(
-        this.engineCommandManager.setPlaneHidden(this.defaultPlanes.negYz, true)
-      )
-      thePromises.push(
-        this.engineCommandManager.setPlaneHidden(this.defaultPlanes.negXz, true)
-      )
-    }
-    return Promise.all(thePromises)
+  hidePlanes() {
+    if (!this.defaultPlanes) return
+    void this.engineCommandManager.setPlaneHidden(this.defaultPlanes.xy, true)
+    void this.engineCommandManager.setPlaneHidden(this.defaultPlanes.yz, true)
+    void this.engineCommandManager.setPlaneHidden(this.defaultPlanes.xz, true)
+  }
+  exitEditMode() {
+    this.engineCommandManager.sendSceneCommand({
+      type: 'modeling_cmd_req',
+      cmd_id: uuidv4(),
+      cmd: { type: 'edit_mode_exit' },
+    })
   }
   defaultSelectionFilter() {
     defaultSelectionFilter(this.programMemory, this.engineCommandManager)
@@ -448,11 +386,24 @@ function defaultSelectionFilter(
   ) as SketchGroup | ExtrudeGroup
   firstSketchOrExtrudeGroup &&
     engineCommandManager.sendSceneCommand({
-      type: 'modeling_cmd_req',
-      cmd_id: uuidv4(),
-      cmd: {
-        type: 'set_selection_filter',
-        filter: ['face', 'edge', 'solid2d', 'curve'],
-      },
+      type: 'modeling_cmd_batch_req',
+      batch_id: uuidv4(),
+      responses: false,
+      requests: [
+        {
+          cmd_id: uuidv4(),
+          cmd: {
+            type: 'edit_mode_enter',
+            target: firstSketchOrExtrudeGroup.id,
+          },
+        },
+        {
+          cmd_id: uuidv4(),
+          cmd: {
+            type: 'set_selection_filter',
+            filter: ['face', 'edge', 'solid2d'],
+          },
+        },
+      ],
     })
 }

src/lang/codeManager.ts

@@ -22,7 +22,7 @@ export default class CodeManager {
       return
     }
 
-    const storedCode = safeLSGetItem(PERSIST_CODE_TOKEN)
+    const storedCode = safeLSGetItem(PERSIST_CODE_TOKEN) || ''
     // TODO #819 remove zustand persistence logic in a few months
     // short term migration, shouldn't make a difference for tauri app users
     // anyway since that's filesystem based.
@@ -68,9 +68,7 @@ export default class CodeManager {
     this._currentFilePath = path
   }
 
-  /**
-   * This updates the code state and calls the updateState function.
-   */
+  // This updates the code state and calls the updateState function.
   updateCodeState(code: string): void {
     if (this._code !== code) {
       this.code = code
@@ -78,9 +76,7 @@ export default class CodeManager {
     }
   }
 
-  /**
-   * Update the code in the editor.
-   */
+  // Update the code in the editor.
   updateCodeEditor(code: string): void {
     this.code = code
     if (editorManager.editorView) {
@@ -94,9 +90,7 @@ export default class CodeManager {
     }
   }
 
-  /**
-   * Update the code, state, and the code the code mirror editor sees.
-   */
+  // Update the code, state, and the code the code mirror editor sees.
   updateCodeStateEditor(code: string): void {
     if (this._code !== code) {
       this.code = code

src/lang/modifyAst.test.ts

@@ -125,7 +125,7 @@ describe('Testing addSketchTo', () => {
       'yz'
     )
     const str = recast(result.modifiedAst)
-    expect(str).toBe(`const sketch001 = startSketchOn('YZ')
+    expect(str).toBe(`const part001 = startSketchOn('YZ')
   |> startProfileAt('default', %)
   |> line('default', %)
 `)
@@ -291,25 +291,14 @@ describe('testing sketchOnExtrudedFace', () => {
   |> extrude(5 + 7, %)`
     const ast = parse(code)
     const programMemory = await enginelessExecutor(ast)
-    const segmentSnippet = `line([9.7, 9.19], %)`
-    const segmentRange: [number, number] = [
-      code.indexOf(segmentSnippet),
-      code.indexOf(segmentSnippet) + segmentSnippet.length,
+    const snippet = `line([9.7, 9.19], %)`
+    const range: [number, number] = [
+      code.indexOf(snippet),
+      code.indexOf(snippet) + snippet.length,
     ]
-    const segmentPathToNode = getNodePathFromSourceRange(ast, segmentRange)
-    const extrudeSnippet = `extrude(5 + 7, %)`
-    const extrudeRange: [number, number] = [
-      code.indexOf(extrudeSnippet),
-      code.indexOf(extrudeSnippet) + extrudeSnippet.length,
-    ]
-    const extrudePathToNode = getNodePathFromSourceRange(ast, extrudeRange)
+    const pathToNode = getNodePathFromSourceRange(ast, range)
 
-    const { modifiedAst } = sketchOnExtrudedFace(
-      ast,
-      segmentPathToNode,
-      extrudePathToNode,
-      programMemory
-    )
+    const { modifiedAst } = sketchOnExtrudedFace(ast, pathToNode, programMemory)
     const newCode = recast(modifiedAst)
     expect(newCode).toContain(`const part001 = startSketchOn('-XZ')
   |> startProfileAt([3.58, 2.06], %)
@@ -317,7 +306,7 @@ describe('testing sketchOnExtrudedFace', () => {
   |> line([8.62, -9.57], %)
   |> close(%)
   |> extrude(5 + 7, %)
-const sketch001 = startSketchOn(part001, 'seg01')`)
+const part002 = startSketchOn(part001, 'seg01')`)
   })
   test('it should be able to extrude on close segments', async () => {
     const code = `const part001 = startSketchOn('-XZ')
@@ -328,25 +317,14 @@ const sketch001 = startSketchOn(part001, 'seg01')`)
   |> extrude(5 + 7, %)`
     const ast = parse(code)
     const programMemory = await enginelessExecutor(ast)
-    const segmentSnippet = `close(%)`
-    const segmentRange: [number, number] = [
-      code.indexOf(segmentSnippet),
-      code.indexOf(segmentSnippet) + segmentSnippet.length,
+    const snippet = `close(%)`
+    const range: [number, number] = [
+      code.indexOf(snippet),
+      code.indexOf(snippet) + snippet.length,
     ]
-    const segmentPathToNode = getNodePathFromSourceRange(ast, segmentRange)
-    const extrudeSnippet = `extrude(5 + 7, %)`
-    const extrudeRange: [number, number] = [
-      code.indexOf(extrudeSnippet),
-      code.indexOf(extrudeSnippet) + extrudeSnippet.length,
-    ]
-    const extrudePathToNode = getNodePathFromSourceRange(ast, extrudeRange)
+    const pathToNode = getNodePathFromSourceRange(ast, range)
 
-    const { modifiedAst } = sketchOnExtrudedFace(
-      ast,
-      segmentPathToNode,
-      extrudePathToNode,
-      programMemory
-    )
+    const { modifiedAst } = sketchOnExtrudedFace(ast, pathToNode, programMemory)
     const newCode = recast(modifiedAst)
     expect(newCode).toContain(`const part001 = startSketchOn('-XZ')
   |> startProfileAt([3.58, 2.06], %)
@@ -354,7 +332,7 @@ const sketch001 = startSketchOn(part001, 'seg01')`)
   |> line([8.62, -9.57], %)
   |> close(%, 'seg01')
   |> extrude(5 + 7, %)
-const sketch001 = startSketchOn(part001, 'seg01')`)
+const part002 = startSketchOn(part001, 'seg01')`)
   })
   test('it should be able to extrude on start-end caps', async () => {
     const code = `const part001 = startSketchOn('-XZ')
@@ -365,23 +343,16 @@ const sketch001 = startSketchOn(part001, 'seg01')`)
   |> extrude(5 + 7, %)`
     const ast = parse(code)
     const programMemory = await enginelessExecutor(ast)
-    const sketchSnippet = `startProfileAt([3.58, 2.06], %)`
-    const sketchRange: [number, number] = [
-      code.indexOf(sketchSnippet),
-      code.indexOf(sketchSnippet) + sketchSnippet.length,
+    const snippet = `startProfileAt([3.58, 2.06], %)`
+    const range: [number, number] = [
+      code.indexOf(snippet),
+      code.indexOf(snippet) + snippet.length,
     ]
-    const sketchPathToNode = getNodePathFromSourceRange(ast, sketchRange)
-    const extrudeSnippet = `extrude(5 + 7, %)`
-    const extrudeRange: [number, number] = [
-      code.indexOf(extrudeSnippet),
-      code.indexOf(extrudeSnippet) + extrudeSnippet.length,
-    ]
-    const extrudePathToNode = getNodePathFromSourceRange(ast, extrudeRange)
+    const pathToNode = getNodePathFromSourceRange(ast, range)
 
     const { modifiedAst } = sketchOnExtrudedFace(
       ast,
-      sketchPathToNode,
-      extrudePathToNode,
+      pathToNode,
       programMemory,
       'end'
     )
@@ -392,47 +363,7 @@ const sketch001 = startSketchOn(part001, 'seg01')`)
   |> line([8.62, -9.57], %)
   |> close(%)
   |> extrude(5 + 7, %)
-const sketch001 = startSketchOn(part001, 'END')`)
-  })
-  test('it should ensure that the new sketch is inserted after the extrude', async () => {
-    const code = `const sketch001 = startSketchOn('-XZ')
-    |> startProfileAt([3.29, 7.86], %)
-    |> line([2.48, 2.44], %)
-    |> line([2.66, 1.17], %)
-    |> line([3.75, 0.46], %)
-    |> line([4.99, -0.46], %)
-    |> line([3.3, -2.12], %)
-    |> line([2.16, -3.33], %)
-    |> line([0.85, -3.08], %)
-    |> line([-0.18, -3.36], %)
-    |> line([-3.86, -2.73], %)
-    |> line([-17.67, 0.85], %)
-    |> close(%)
-    const part001 = extrude(5 + 7, sketch001)`
-    const ast = parse(code)
-    const programMemory = await enginelessExecutor(ast)
-    const segmentSnippet = `line([4.99, -0.46], %)`
-    const segmentRange: [number, number] = [
-      code.indexOf(segmentSnippet),
-      code.indexOf(segmentSnippet) + segmentSnippet.length,
-    ]
-    const segmentPathToNode = getNodePathFromSourceRange(ast, segmentRange)
-    const extrudeSnippet = `extrude(5 + 7, sketch001)`
-    const extrudeRange: [number, number] = [
-      code.indexOf(extrudeSnippet),
-      code.indexOf(extrudeSnippet) + extrudeSnippet.length,
-    ]
-    const extrudePathToNode = getNodePathFromSourceRange(ast, extrudeRange)
-
-    const { modifiedAst } = sketchOnExtrudedFace(
-      ast,
-      segmentPathToNode,
-      extrudePathToNode,
-      programMemory
-    )
-    const newCode = recast(modifiedAst)
-    expect(newCode).toContain(`const part001 = extrude(5 + 7, sketch001)
-const sketch002 = startSketchOn(part001, 'seg01')`)
+const part002 = startSketchOn(part001, 'END')`)
   })
 })
 

src/lang/modifyAst.ts

@@ -34,7 +34,6 @@ import {
 } from './std/sketchcombos'
 import { DefaultPlaneStr } from 'clientSideScene/sceneEntities'
 import { isOverlap, roundOff } from 'lib/utils'
-import { KCL_DEFAULT_CONSTANT_PREFIXES } from 'lib/constants'
 import { ConstrainInfo } from './std/stdTypes'
 
 export function startSketchOnDefault(
@@ -43,8 +42,7 @@ export function startSketchOnDefault(
   name = ''
 ): { modifiedAst: Program; id: string; pathToNode: PathToNode } {
   const _node = { ...node }
-  const _name =
-    name || findUniqueName(node, KCL_DEFAULT_CONSTANT_PREFIXES.SKETCH)
+  const _name = name || findUniqueName(node, 'part')
 
   const startSketchOn = createCallExpressionStdLib('startSketchOn', [
     createLiteral(axis),
@@ -111,8 +109,7 @@ export function addSketchTo(
   name = ''
 ): { modifiedAst: Program; id: string; pathToNode: PathToNode } {
   const _node = { ...node }
-  const _name =
-    name || findUniqueName(node, KCL_DEFAULT_CONSTANT_PREFIXES.SKETCH)
+  const _name = name || findUniqueName(node, 'part')
 
   const startSketchOn = createCallExpressionStdLib('startSketchOn', [
     createLiteral(axis.toUpperCase()),
@@ -245,7 +242,7 @@ export function mutateObjExpProp(
 export function extrudeSketch(
   node: Program,
   pathToNode: PathToNode,
-  shouldPipe = false,
+  shouldPipe = true,
   distance = createLiteral(4) as Value
 ): {
   modifiedAst: Program
@@ -296,22 +293,12 @@ export function extrudeSketch(
       pathToExtrudeArg,
     }
   }
-
-  // We're not creating a pipe expression,
-  // but rather a separate constant for the extrusion
-  const name = findUniqueName(node, KCL_DEFAULT_CONSTANT_PREFIXES.EXTRUDE)
+  const name = findUniqueName(node, 'part')
   const VariableDeclaration = createVariableDeclaration(name, extrudeCall)
-
-  const sketchIndexInPathToNode =
-    pathToDecleration.findIndex((a) => a[0] === 'body') + 1
-  const sketchIndexInBody = pathToDecleration[
-    sketchIndexInPathToNode
-  ][0] as number
-  _node.body.splice(sketchIndexInBody + 1, 0, VariableDeclaration)
-
+  _node.body.splice(_node.body.length, 0, VariableDeclaration)
   const pathToExtrudeArg: PathToNode = [
     ['body', ''],
-    [sketchIndexInBody + 1, 'index'],
+    [_node.body.length, 'index'],
     ['declarations', 'VariableDeclaration'],
     [0, 'index'],
     ['init', 'VariableDeclarator'],
@@ -319,7 +306,7 @@ export function extrudeSketch(
     [0, 'index'],
   ]
   return {
-    modifiedAst: _node,
+    modifiedAst: node,
     pathToNode: [...pathToNode.slice(0, -1), [-1, 'index']],
     pathToExtrudeArg,
   }
@@ -327,41 +314,31 @@ export function extrudeSketch(
 
 export function sketchOnExtrudedFace(
   node: Program,
-  sketchPathToNode: PathToNode,
-  extrudePathToNode: PathToNode,
+  pathToNode: PathToNode,
   programMemory: ProgramMemory,
   cap: 'none' | 'start' | 'end' = 'none'
 ): { modifiedAst: Program; pathToNode: PathToNode } {
   let _node = { ...node }
-  const newSketchName = findUniqueName(
-    node,
-    KCL_DEFAULT_CONSTANT_PREFIXES.SKETCH
-  )
+  const newSketchName = findUniqueName(node, 'part')
   const { node: oldSketchNode } = getNodeFromPath<VariableDeclarator>(
     _node,
-    sketchPathToNode,
+    pathToNode,
     'VariableDeclarator',
     true
   )
   const oldSketchName = oldSketchNode.id.name
   const { node: expression } = getNodeFromPath<CallExpression>(
     _node,
-    sketchPathToNode,
+    pathToNode,
     'CallExpression'
   )
-  const { node: extrudeVarDec } = getNodeFromPath<VariableDeclarator>(
-    _node,
-    extrudePathToNode,
-    'VariableDeclarator'
-  )
-  const extrudeName = extrudeVarDec.id?.name
 
   let _tag = ''
   if (cap === 'none') {
     const { modifiedAst, tag } = addTagForSketchOnFace(
       {
         previousProgramMemory: programMemory,
-        pathToNode: sketchPathToNode,
+        pathToNode,
         node: _node,
       },
       expression.callee.name
@@ -375,16 +352,13 @@ export function sketchOnExtrudedFace(
   const newSketch = createVariableDeclaration(
     newSketchName,
     createCallExpressionStdLib('startSketchOn', [
-      createIdentifier(extrudeName ? extrudeName : oldSketchName),
+      createIdentifier(oldSketchName),
       createLiteral(_tag),
     ]),
     'const'
   )
 
-  const expressionIndex = Math.max(
-    sketchPathToNode[1][0] as number,
-    extrudePathToNode[1][0] as number
-  )
+  const expressionIndex = pathToNode[1][0] as number
   _node.body.splice(expressionIndex + 1, 0, newSketch)
   const newpathToNode: PathToNode = [
     ['body', ''],

src/lang/queryAst.test.ts

@@ -7,8 +7,6 @@ import {
   doesPipeHaveCallExp,
   hasExtrudeSketchGroup,
   findUsesOfTagInPipe,
-  hasSketchPipeBeenExtruded,
-  hasExtrudableGeometry,
 } from './queryAst'
 import { enginelessExecutor } from '../lib/testHelpers'
 import {
@@ -398,90 +396,3 @@ describe('Testing findUsesOfTagInPipe', () => {
     expect(result).toHaveLength(0)
   })
 })
-
-describe('Testing hasSketchPipeBeenExtruded', () => {
-  const exampleCode = `const sketch001 = startSketchOn('XZ')
-  |> startProfileAt([3.29, 7.86], %)
-  |> line([2.48, 2.44], %)
-  |> line([2.66, 1.17], %)
-  |> line([3.75, 0.46], %)
-  |> line([4.99, -0.46], %, 'seg01')
-  |> line([3.3, -2.12], %)
-  |> line([2.16, -3.33], %)
-  |> line([0.85, -3.08], %)
-  |> line([-0.18, -3.36], %)
-  |> line([-3.86, -2.73], %)
-  |> line([-17.67, 0.85], %)
-  |> close(%)
-const extrude001 = extrude(10, sketch001)
-const sketch002 = startSketchOn(extrude001, 'seg01')
-  |> startProfileAt([-12.94, 6.6], %)
-  |> line([2.45, -0.2], %)
-  |> line([-2, -1.25], %)
-  |> lineTo([profileStartX(%), profileStartY(%)], %)
-  |> close(%)
-`
-  it('finds sketch001 pipe to be extruded', async () => {
-    const ast = parse(exampleCode)
-    const lineOfInterest = `line([4.99, -0.46], %, 'seg01')`
-    const characterIndex =
-      exampleCode.indexOf(lineOfInterest) + lineOfInterest.length
-    const extruded = hasSketchPipeBeenExtruded(
-      {
-        range: [characterIndex, characterIndex],
-        type: 'default',
-      },
-      ast
-    )
-    expect(extruded).toBeTruthy()
-  })
-  it('find sketch002 NOT pipe to be extruded', async () => {
-    const ast = parse(exampleCode)
-    const lineOfInterest = `line([2.45, -0.2], %)`
-    const characterIndex =
-      exampleCode.indexOf(lineOfInterest) + lineOfInterest.length
-    const extruded = hasSketchPipeBeenExtruded(
-      {
-        range: [characterIndex, characterIndex],
-        type: 'default',
-      },
-      ast
-    )
-    expect(extruded).toBeFalsy()
-  })
-})
-
-describe('Testing hasExtrudableGeometry', () => {
-  it('finds sketch001 pipe to be extruded', async () => {
-    const exampleCode = `const sketch001 = startSketchOn('XZ')
-  |> startProfileAt([3.29, 7.86], %)
-  |> line([2.48, 2.44], %)
-  |> line([-3.86, -2.73], %)
-  |> line([-17.67, 0.85], %)
-  |> close(%)
-const extrude001 = extrude(10, sketch001)
-const sketch002 = startSketchOn(extrude001, 'seg01')
-  |> startProfileAt([-12.94, 6.6], %)
-  |> line([2.45, -0.2], %)
-  |> line([-2, -1.25], %)
-  |> lineTo([profileStartX(%), profileStartY(%)], %)
-  |> close(%)
-`
-    const ast = parse(exampleCode)
-    const extrudable = hasExtrudableGeometry(ast)
-    expect(extrudable).toBeTruthy()
-  })
-  it('find sketch002 NOT pipe to be extruded', async () => {
-    const exampleCode = `const sketch001 = startSketchOn('XZ')
-  |> startProfileAt([3.29, 7.86], %)
-  |> line([2.48, 2.44], %)
-  |> line([-3.86, -2.73], %)
-  |> line([-17.67, 0.85], %)
-  |> close(%)
-const extrude001 = extrude(10, sketch001)
-`
-    const ast = parse(exampleCode)
-    const extrudable = hasExtrudableGeometry(ast)
-    expect(extrudable).toBeFalsy()
-  })
-})

src/lang/queryAst.ts

@@ -720,78 +720,3 @@ export function findUsesOfTagInPipe(
   })
   return dependentRanges
 }
-
-export function hasSketchPipeBeenExtruded(selection: Selection, ast: Program) {
-  const path = getNodePathFromSourceRange(ast, selection.range)
-  const { node: pipeExpression } = getNodeFromPath<PipeExpression>(
-    ast,
-    path,
-    'PipeExpression'
-  )
-  if (pipeExpression.type !== 'PipeExpression') return false
-  const varDec = getNodeFromPath<VariableDeclarator>(
-    ast,
-    path,
-    'VariableDeclarator'
-  ).node
-  let extruded = false
-  traverse(ast as any, {
-    enter(node) {
-      if (
-        node.type === 'CallExpression' &&
-        node.callee.type === 'Identifier' &&
-        node.callee.name === 'extrude' &&
-        node.arguments?.[1]?.type === 'Identifier' &&
-        node.arguments[1].name === varDec.id.name
-      ) {
-        extruded = true
-      }
-    },
-  })
-  return extruded
-}
-
-/** File must contain at least one sketch that has not been extruded already */
-export function hasExtrudableGeometry(ast: Program) {
-  const theMap: any = {}
-  traverse(ast as any, {
-    enter(node) {
-      if (
-        node.type === 'VariableDeclarator' &&
-        node.init?.type === 'PipeExpression'
-      ) {
-        let hasStartProfileAt = false
-        let hasStartSketchOn = false
-        let hasClose = false
-        for (const pipe of node.init.body) {
-          if (
-            pipe.type === 'CallExpression' &&
-            pipe.callee.name === 'startProfileAt'
-          ) {
-            hasStartProfileAt = true
-          }
-          if (
-            pipe.type === 'CallExpression' &&
-            pipe.callee.name === 'startSketchOn'
-          ) {
-            hasStartSketchOn = true
-          }
-          if (pipe.type === 'CallExpression' && pipe.callee.name === 'close') {
-            hasClose = true
-          }
-        }
-        if (hasStartProfileAt && hasStartSketchOn && hasClose) {
-          theMap[node.id.name] = true
-        }
-      } else if (
-        node.type === 'CallExpression' &&
-        node.callee.name === 'extrude' &&
-        node.arguments[1]?.type === 'Identifier' &&
-        theMap?.[node?.arguments?.[1]?.name]
-      ) {
-        delete theMap[node.arguments[1].name]
-      }
-    },
-  })
-  return Object.keys(theMap).length > 0
-}

src/lang/wasm.ts

@@ -25,7 +25,7 @@ import type { Program } from '../wasm-lib/kcl/bindings/Program'
 import type { Token } from '../wasm-lib/kcl/bindings/Token'
 import { Coords2d } from './std/sketch'
 import { fileSystemManager } from 'lang/std/fileSystemManager'
-import { CoreDumpInfo } from 'wasm-lib/kcl/bindings/CoreDumpInfo'
+import { AppInfo } from 'wasm-lib/kcl/bindings/AppInfo'
 import { CoreDumpManager } from 'lib/coredump'
 import openWindow from 'lib/openWindow'
 import { DefaultPlanes } from 'wasm-lib/kcl/bindings/DefaultPlanes'
@@ -335,27 +335,14 @@ export function programMemoryInit(): ProgramMemory {
 export async function coreDump(
   coreDumpManager: CoreDumpManager,
   openGithubIssue: boolean = false
-): Promise<CoreDumpInfo> {
+): Promise<AppInfo> {
   try {
-    const dump: CoreDumpInfo = await coredump(coreDumpManager)
-    /* NOTE: this console output of the coredump should include the field
-       `github_issue_url` which is not in the uploaded coredump file.
-       `github_issue_url` is added after the file is uploaded
-       and is only needed for the openWindow operation which creates
-       a new GitHub issue for the user.
-     */
+    const dump: AppInfo = await coredump(coreDumpManager)
     if (openGithubIssue && dump.github_issue_url) {
       openWindow(dump.github_issue_url)
-    } else {
-      console.error(
-        'github_issue_url undefined. Unable to create GitHub issue for coredump.'
-      )
     }
-    console.log('CoreDump: final coredump', dump)
-    console.log('CoreDump: final coredump JSON', JSON.stringify(dump))
     return dump
   } catch (e: any) {
-    console.error('CoreDump: error', e)
     throw new Error(`Error getting core dump: ${e}`)
   }
 }

src/lib/constants.ts

@@ -44,13 +44,5 @@ export const RELEVANT_FILE_TYPES = [
 ] as const
 /** The default name for a tutorial project */
 export const ONBOARDING_PROJECT_NAME = 'Tutorial Project $nn'
-/**
- * The default starting constant name for various modeling operations.
- * These are used to generate unique names for new objects.
- * */
-export const KCL_DEFAULT_CONSTANT_PREFIXES = {
-  SKETCH: 'sketch',
-  EXTRUDE: 'extrude',
-} as const
 /** The default KCL length expression */
 export const KCL_DEFAULT_LENGTH = `5`

src/lib/coredump.ts

@@ -13,15 +13,8 @@ import screenshot from 'lib/screenshot'
 import React from 'react'
 import { VITE_KC_API_BASE_URL } from 'env'
 
-/**
- * CoreDumpManager module
- * - for getting all the values from the JS world to pass to the Rust world for a core dump.
- * @module lib/coredump
- * @class
- */
-// CoreDumpManager is instantiated in ModelingMachineProvider and passed to coreDump() in wasm.ts
-// The async function coreDump() handles any errors thrown in its Promise catch method and rethrows
-// them to so the toast handler in ModelingMachineProvider can show the user an error message toast
+// This is a class for getting all the values from the JS world to pass to the Rust world
+// for a core dump.
 export class CoreDumpManager {
   engineCommandManager: EngineCommandManager
   htmlRef: React.RefObject<HTMLDivElement> | null
@@ -151,293 +144,6 @@ export class CoreDumpManager {
       })
   }
 
-  // Currently just a placeholder to begin loading singleton and xstate data into
-  getClientState(): Promise<string> {
-    /**
-     * Deep clone a JavaScript Object
-     * - NOTE: this function throws on parse errors from things like circular references
-     * - It is also synchronous and could be more performant
-     * - There is a whole rabbit hole to explore here if you like.
-     * - This works for our use case.
-     * @param {object} obj - The object to clone.
-     */
-    const deepClone = (obj: any) => JSON.parse(JSON.stringify(obj))
-
-    /**
-     * Check if a function is private method
-     */
-    const isPrivateMethod = (key: string) => {
-      return key.length && key[0] === '_'
-    }
-
-    // Turn off verbose logging by default
-    const verboseLogging = false
-
-    /**
-     * Toggle verbose debug logging of step-by-step client state coredump data
-     */
-    const debugLog = verboseLogging ? console.log : () => {}
-
-    console.warn('CoreDump: Gathering client state')
-
-    // Initialize the clientState object
-    let clientState = {
-      // singletons
-      engine_command_manager: {
-        artifact_map: {},
-        command_logs: [],
-        engine_connection: { state: { type: '' } },
-        default_planes: {},
-        scene_command_artifacts: {},
-      },
-      kcl_manager: {
-        ast: {},
-        kcl_errors: [],
-      },
-      scene_infra: {},
-      scene_entities_manager: {},
-      editor_manager: {},
-      // xstate
-      auth_machine: {},
-      command_bar_machine: {},
-      file_machine: {},
-      home_machine: {},
-      modeling_machine: {},
-      settings_machine: {},
-    }
-    debugLog('CoreDump: initialized clientState', clientState)
-    debugLog('CoreDump: globalThis.window', globalThis.window)
-
-    try {
-      // Singletons
-
-      // engine_command_manager
-      debugLog('CoreDump: engineCommandManager', this.engineCommandManager)
-
-      // artifact map - this.engineCommandManager.artifactMap
-      if (this.engineCommandManager?.artifactMap) {
-        debugLog(
-          'CoreDump: Engine Command Manager artifact map',
-          this.engineCommandManager.artifactMap
-        )
-        clientState.engine_command_manager.artifact_map = deepClone(
-          this.engineCommandManager.artifactMap
-        )
-      }
-
-      // command logs - this.engineCommandManager.commandLogs
-      if (this.engineCommandManager?.commandLogs) {
-        debugLog(
-          'CoreDump: Engine Command Manager command logs',
-          this.engineCommandManager.commandLogs
-        )
-        clientState.engine_command_manager.command_logs = deepClone(
-          this.engineCommandManager.commandLogs
-        )
-      }
-
-      // default planes - this.engineCommandManager.defaultPlanes
-      if (this.engineCommandManager?.defaultPlanes) {
-        debugLog(
-          'CoreDump: Engine Command Manager default planes',
-          this.engineCommandManager.defaultPlanes
-        )
-        clientState.engine_command_manager.default_planes = deepClone(
-          this.engineCommandManager.defaultPlanes
-        )
-      }
-
-      // engine connection state
-      if (this.engineCommandManager?.engineConnection?.state) {
-        debugLog(
-          'CoreDump: Engine Command Manager engine connection state',
-          this.engineCommandManager.engineConnection.state
-        )
-        clientState.engine_command_manager.engine_connection.state =
-          this.engineCommandManager.engineConnection.state
-      }
-
-      // in sequence - this.engineCommandManager.inSequence
-      if (this.engineCommandManager?.inSequence) {
-        debugLog(
-          'CoreDump: Engine Command Manager in sequence',
-          this.engineCommandManager.inSequence
-        )
-        ;(clientState.engine_command_manager as any).in_sequence =
-          this.engineCommandManager.inSequence
-      }
-
-      // out sequence - this.engineCommandManager.outSequence
-      if (this.engineCommandManager?.outSequence) {
-        debugLog(
-          'CoreDump: Engine Command Manager out sequence',
-          this.engineCommandManager.outSequence
-        )
-        ;(clientState.engine_command_manager as any).out_sequence =
-          this.engineCommandManager.outSequence
-      }
-
-      // scene command artifacts - this.engineCommandManager.sceneCommandArtifacts
-      if (this.engineCommandManager?.sceneCommandArtifacts) {
-        debugLog(
-          'CoreDump: Engine Command Manager scene command artifacts',
-          this.engineCommandManager.sceneCommandArtifacts
-        )
-        clientState.engine_command_manager.scene_command_artifacts = deepClone(
-          this.engineCommandManager.sceneCommandArtifacts
-        )
-      }
-
-      // KCL Manager - globalThis?.window?.kclManager
-      const kclManager = (globalThis?.window as any)?.kclManager
-      debugLog('CoreDump: kclManager', kclManager)
-
-      if (kclManager) {
-        // KCL Manager AST
-        debugLog('CoreDump: KCL Manager AST', kclManager?.ast)
-        if (kclManager?.ast) {
-          clientState.kcl_manager.ast = deepClone(kclManager.ast)
-        }
-
-        // KCL Errors
-        debugLog('CoreDump: KCL Errors', kclManager?.kclErrors)
-        if (kclManager?.kclErrors) {
-          clientState.kcl_manager.kcl_errors = deepClone(kclManager.kclErrors)
-        }
-
-        // KCL isExecuting
-        debugLog('CoreDump: KCL isExecuting', kclManager?.isExecuting)
-        if (kclManager?.isExecuting) {
-          ;(clientState.kcl_manager as any).isExecuting = kclManager.isExecuting
-        }
-
-        // KCL logs
-        debugLog('CoreDump: KCL logs', kclManager?.logs)
-        if (kclManager?.logs) {
-          ;(clientState.kcl_manager as any).logs = deepClone(kclManager.logs)
-        }
-
-        // KCL programMemory
-        debugLog('CoreDump: KCL programMemory', kclManager?.programMemory)
-        if (kclManager?.programMemory) {
-          ;(clientState.kcl_manager as any).programMemory = deepClone(
-            kclManager.programMemory
-          )
-        }
-
-        // KCL wasmInitFailed
-        debugLog('CoreDump: KCL wasmInitFailed', kclManager?.wasmInitFailed)
-        if (kclManager?.wasmInitFailed) {
-          ;(clientState.kcl_manager as any).wasmInitFailed =
-            kclManager.wasmInitFailed
-        }
-      }
-
-      // Scene Infra - globalThis?.window?.sceneInfra
-      const sceneInfra = (globalThis?.window as any)?.sceneInfra
-      debugLog('CoreDump: Scene Infra', sceneInfra)
-
-      if (sceneInfra) {
-        const sceneInfraSkipKeys = ['camControls']
-        const sceneInfraKeys = Object.keys(sceneInfra)
-          .sort()
-          .filter((entry) => {
-            return (
-              typeof sceneInfra[entry] !== 'function' &&
-              !sceneInfraSkipKeys.includes(entry)
-            )
-          })
-
-        debugLog('CoreDump: Scene Infra keys', sceneInfraKeys)
-        sceneInfraKeys.forEach((key: string) => {
-          debugLog('CoreDump: Scene Infra', key, sceneInfra[key])
-          try {
-            ;(clientState.scene_infra as any)[key] = sceneInfra[key]
-          } catch (error) {
-            console.error(
-              'CoreDump: unable to parse Scene Infra ' + key + ' data due to ',
-              error
-            )
-          }
-        })
-      }
-
-      // Scene Entities Manager - globalThis?.window?.sceneEntitiesManager
-      const sceneEntitiesManager = (globalThis?.window as any)
-        ?.sceneEntitiesManager
-      debugLog('CoreDump: sceneEntitiesManager', sceneEntitiesManager)
-
-      if (sceneEntitiesManager) {
-        // Scene Entities Manager active segments
-        debugLog(
-          'CoreDump: Scene Entities Manager active segments',
-          sceneEntitiesManager?.activeSegments
-        )
-        if (sceneEntitiesManager?.activeSegments) {
-          ;(clientState.scene_entities_manager as any).activeSegments =
-            deepClone(sceneEntitiesManager.activeSegments)
-        }
-      }
-
-      // Editor Manager - globalThis?.window?.editorManager
-      const editorManager = (globalThis?.window as any)?.editorManager
-      debugLog('CoreDump: editorManager', editorManager)
-
-      if (editorManager) {
-        const editorManagerSkipKeys = ['camControls']
-        const editorManagerKeys = Object.keys(editorManager)
-          .sort()
-          .filter((entry) => {
-            return (
-              typeof editorManager[entry] !== 'function' &&
-              !isPrivateMethod(entry) &&
-              !editorManagerSkipKeys.includes(entry)
-            )
-          })
-
-        debugLog('CoreDump: Editor Manager keys', editorManagerKeys)
-        editorManagerKeys.forEach((key: string) => {
-          debugLog('CoreDump: Editor Manager', key, editorManager[key])
-          try {
-            ;(clientState.editor_manager as any)[key] = deepClone(
-              editorManager[key]
-            )
-          } catch (error) {
-            console.error(
-              'CoreDump: unable to parse Editor Manager ' +
-                key +
-                ' data due to ',
-              error
-            )
-          }
-        })
-      }
-
-      // enableMousePositionLogs - Not coredumped
-      // See https://github.com/KittyCAD/modeling-app/issues/2338#issuecomment-2136441998
-      debugLog(
-        'CoreDump: enableMousePositionLogs [not coredumped]',
-        (globalThis?.window as any)?.enableMousePositionLogs
-      )
-
-      // XState Machines
-      debugLog(
-        'CoreDump: xstate services',
-        (globalThis?.window as any)?.__xstate__?.services
-      )
-
-      debugLog('CoreDump: final clientState', clientState)
-
-      const clientStateJson = JSON.stringify(clientState)
-      debugLog('CoreDump: final clientState JSON', clientStateJson)
-
-      return Promise.resolve(clientStateJson)
-    } catch (error) {
-      console.error('CoreDump: unable to return data due to ', error)
-      return Promise.reject(JSON.stringify(error))
-    }
-  }
-
   // Return a data URL (png format) of the screenshot of the current page.
   screenshot(): Promise<string> {
     return screenshot(this.htmlRef)

src/lib/paths.ts

@@ -17,17 +17,15 @@ const prependRoutes =
     )
   }
 
-type OnboardingPaths = {
-  [K in keyof typeof onboardingPaths]: `/onboarding${(typeof onboardingPaths)[K]}`
-}
-
 export const paths = {
   INDEX: '/',
   HOME: '/home',
   FILE: '/file',
   SETTINGS: '/settings',
   SIGN_IN: '/signin',
-  ONBOARDING: prependRoutes(onboardingPaths)('/onboarding') as OnboardingPaths,
+  ONBOARDING: prependRoutes(onboardingPaths)(
+    '/onboarding'
+  ) as typeof onboardingPaths,
 } as const
 export const BROWSER_PATH = `%2F${BROWSER_PROJECT_NAME}%2F${BROWSER_FILE_NAME}${FILE_EXT}`