Check settings file exists before checking its contents

* Visualize draft point when near axes (only works on XY rn due to quaternion rotation issue)

* Slightly better quaternion rotation

* Actually snap new profiles to the X and Y axis

* Add snapping behavior while dragging

* Fix flickering on non-XY planes

* Add some fixture additions to support click-and-drag tests

* Add new test to verify snapping behavior

* Make the editor test fixture auto-open and close as needed

* All feedback except absolute lines

* Use `lineTo` for lines that have snapped

* Get other existing tests passing after switching to `lineTo` when snapping

* A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest)

* Re-run CI

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

.github/ci-cd-scripts/playwright-browser-chrome.sh

@@ -4,9 +4,9 @@ set -euo pipefail
 if [[ ! -f "test-results/.last-run.json" ]]; then
     # if no last run artifact, than run plawright normally
     echo "run playwright normally"
-    if [[ "$3" == ubuntu-latest* ]]; then
+    if [[ "$3" == "ubuntu-latest" ]]; then
         yarn test:playwright:browser:chrome:ubuntu -- --shard=$1/$2 || true
-    elif [[ "$3" == windows-latest* ]]; then
+    elif [[ "$3" == "windows-latest" ]]; then
         yarn test:playwright:browser:chrome:windows -- --shard=$1/$2 || true
     else
         echo "Do not run playwright. Unable to detect os runtime."
@@ -26,9 +26,9 @@ while [[ $retry -le $max_retrys ]]; do
         if [[ $failed_tests -gt 0 ]]; then
             echo "retried=true" >>$GITHUB_OUTPUT
             echo "run playwright with last failed tests and retry $retry"
-            if [[ "$3" == ubuntu-latest* ]]; then
+            if [[ "$3" == "ubuntu-latest" ]]; then
                 yarn test:playwright:browser:chrome:ubuntu -- --last-failed || true
-            elif [[ "$3" == windows-latest* ]]; then
+            elif [[ "$3" == "windows-latest" ]]; then
                 yarn test:playwright:browser:chrome:windows -- --last-failed || true
             else
                 echo "Do not run playwright. Unable to detect os runtime."

.github/ci-cd-scripts/playwright-electron.sh

@@ -4,11 +4,11 @@ set -euo pipefail
 if [[ ! -f "test-results/.last-run.json" ]]; then
     # if no last run artifact, than run plawright normally
     echo "run playwright normally"
-        if [[ "$1" == ubuntu-latest* ]]; then
+        if [[ "$1" == "ubuntu-latest" ]]; then
             xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn test:playwright:electron:ubuntu || true
-        elif [[ "$1" == windows-latest* ]]; then
+        elif [[ "$1" == "windows-latest" ]]; then
             yarn test:playwright:electron:windows || true
-        elif [[ "$1" == macos-14* ]]; then
+        elif [[ "$1" == "macos-14" ]]; then
             yarn test:playwright:electron:macos || true
         else
             echo "Do not run playwright. Unable to detect os runtime."
@@ -28,11 +28,11 @@ while [[ $retry -le $max_retrys ]]; do
         if [[ $failed_tests -gt 0 ]]; then
             echo "retried=true" >>$GITHUB_OUTPUT
             echo "run playwright with last failed tests and retry $retry"
-            if [[ "$1" == ubuntu-latest* ]]; then
+            if [[ "$1" == "ubuntu-latest" ]]; then
                 xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn test:playwright:electron:ubuntu -- --last-failed || true
-            elif [[ "$1" == windows-latest* ]]; then
+            elif [[ "$1" == "windows-latest" ]]; then
                 yarn test:playwright:electron:windows -- --last-failed || true
-            elif [[ "$1" == macos-14* ]]; then
+            elif [[ "$1" == "macos-14" ]]; then
                 yarn test:playwright:electron:macos -- --last-failed || true
             else
                 echo "Do not run playwright. Unable to detect os runtime."

.github/dependabot.yml

@@ -8,21 +8,21 @@ updates:
     - package-ecosystem: 'npm' # See documentation for possible values
       directory: '/' # Location of package manifests
       schedule:
-          interval: 'weekly'
+          interval: 'daily'
       reviewers:
           - franknoirot
           - irev-dev
     - package-ecosystem: 'github-actions' # See documentation for possible values
       directory: '/' # Location of package manifests
       schedule:
-          interval: 'weekly'
+          interval: 'daily'
       reviewers:
           - adamchalmers
           - jessfraz
     - package-ecosystem: 'cargo' # See documentation for possible values
       directory: '/src/wasm-lib/' # Location of package manifests
       schedule:
-          interval: 'weekly'
+          interval: 'daily'
       reviewers:
           - adamchalmers
           - jessfraz

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

@@ -85,7 +85,7 @@ jobs:
       - name: Prepare electron-builder.yml file for updater test
         if: ${{ env.CUT_RELEASE_PR == 'true' }}
         run: |
-          yq -i '.publish[0].url = "https://dl.zoo.dev/releases/modeling-app/updater-test"' electron-builder.yml
+          yq -i '.publish[0].url = "https://dl.zoo.dev/releases/modeling-app/updater-test-release-notes"' electron-builder.yml
 
       - uses: actions/upload-artifact@v3
         if: ${{ env.CUT_RELEASE_PR == 'true' }}
@@ -181,7 +181,6 @@ jobs:
       - name: Build the app (release)
         if: ${{ env.BUILD_RELEASE == 'true' }}
         env:
-          PUBLISH_FOR_PULL_REQUEST: true
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
           APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
@@ -361,17 +360,17 @@ jobs:
         run: "ls -R out"
 
       - name: Authenticate to Google Cloud
-        uses: 'google-github-actions/auth@v2.1.7'
+        uses: 'google-github-actions/auth@v2.1.6'
         with:
           credentials_json: '${{ secrets.GOOGLE_CLOUD_DL_SA }}'
 
       - name: Set up Google Cloud SDK
-        uses: google-github-actions/setup-gcloud@v2.1.2
+        uses: google-github-actions/setup-gcloud@v2.1.0
         with:
           project_id: ${{ env.GOOGLE_CLOUD_PROJECT_ID }}
 
       - name: Upload release files to public bucket
-        uses: google-github-actions/upload-cloud-storage@v2.2.1
+        uses: google-github-actions/upload-cloud-storage@v2.2.0
         with:
           path: out
           glob: 'Zoo*'
@@ -379,7 +378,7 @@ jobs:
           destination: ${{ env.BUCKET_DIR }}
 
       - name: Upload update endpoint to public bucket
-        uses: google-github-actions/upload-cloud-storage@v2.2.1
+        uses: google-github-actions/upload-cloud-storage@v2.2.0
         with:
           path: out
           glob: 'latest*'
@@ -387,7 +386,7 @@ jobs:
           destination: ${{ env.BUCKET_DIR }}
 
       - name: Upload download endpoint to public bucket
-        uses: google-github-actions/upload-cloud-storage@v2.2.1
+        uses: google-github-actions/upload-cloud-storage@v2.2.0
         with:
           path: last_download.json
           destination: ${{ env.BUCKET_DIR }}

.github/workflows/cargo-test.yml

@@ -5,8 +5,6 @@ on:
     paths:
       - 'src/wasm-lib/**.rs'
       - 'src/wasm-lib/**.hbs'
-      - 'src/wasm-lib/**.gen'
-      - 'src/wasm-lib/**.snap'
       - '**/Cargo.toml'
       - '**/Cargo.lock'
       - '**/rust-toolchain.toml'
@@ -17,8 +15,6 @@ on:
     paths:
       - 'src/wasm-lib/**.rs'
       - 'src/wasm-lib/**.hbs'
-      - 'src/wasm-lib/**.gen'
-      - 'src/wasm-lib/**.snap'
       - '**/Cargo.toml'
       - '**/Cargo.lock'
       - '**/rust-toolchain.toml'

.github/workflows/e2e-tests.yml

@@ -39,7 +39,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest-8-cores, windows-latest-8-cores]
+        os: [ubuntu-latest, windows-latest]
         shardIndex: [1, 2, 3, 4]
         shardTotal: [4]
     runs-on: ${{ matrix.os }}
@@ -227,7 +227,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest-8-cores, windows-latest-8-cores, macos-14-large]
+        os: [ubuntu-latest, windows-latest, macos-14]
     timeout-minutes: 60
     runs-on: ${{ matrix.os }}
     needs: check-rust-changes
@@ -287,7 +287,7 @@ jobs:
         brew install gnu-sed
         echo "/opt/homebrew/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH
     - name: Install vector
-      if:  ${{ startsWith(matrix.os, 'ubuntu') }}
+      if:  ${{ !startsWith(matrix.os, 'windows') }}
       shell: bash
       run: |
         curl --proto '=https' --tlsv1.2 -sSfL https://sh.vector.dev > /tmp/vector.sh

.github/workflows/static-analysis.yml

@@ -81,31 +81,6 @@ jobs:
       - name: Run codespell
         run: codespell --config .codespellrc # Edit this file to tweak the typo list and other configuration.
 
-  yarn-unit-test-kcl-samples:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'yarn'
-
-      - run: yarn install
-      - run: yarn build:wasm
-
-      - run: yarn simpleserver:bg
-        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
-
-      - name: Install Chromium Browser
-        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
-        run: yarn playwright install chromium --with-deps
-
-      - name: run unit tests for kcl samples
-        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
-        run: yarn test:unit:kcl-samples
-        env:
-          VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
 
   yarn-unit-test:
     runs-on: ubuntu-latest

Makefile

@@ -19,7 +19,7 @@ $(XSTATE_TYPEGENS): $(TS_SRC)
 	yarn xstate typegen 'src/**/*.ts?(x)'
 
 public/wasm_lib_bg.wasm: $(WASM_LIB_FILES)
-	yarn build:wasm
+	yarn build:wasm-dev
 
 node_modules: package.json yarn.lock
 	yarn install

README.md

@@ -110,7 +110,7 @@ Which commands from setup are one off vs need to be run every time?
 The following will need to be run when checking out a new commit and guarantees the build is not stale:
 ```bash
 yarn install
-yarn build:wasm
+yarn build:wasm-dev # or yarn build:wasm for slower but more production-like build
 yarn start # or yarn build:local && yarn serve for slower but more production-like build
 ```
 

docs/kcl/angleToMatchLengthX.md

@@ -1,10 +1,10 @@
 ---
 title: "angleToMatchLengthX"
-excerpt: "Returns the angle to match the given length for x."
+excerpt: "Compute the angle (in degrees) in o"
 layout: manual
 ---
 
-Returns the angle to match the given length for x.
+Compute the angle (in degrees) in o
 
 
 

docs/kcl/index.md

@@ -84,13 +84,9 @@ layout: manual
 * [`rem`](kcl/rem)
 * [`revolve`](kcl/revolve)
 * [`segAng`](kcl/segAng)
-* [`segEnd`](kcl/segEnd)
 * [`segEndX`](kcl/segEndX)
 * [`segEndY`](kcl/segEndY)
 * [`segLen`](kcl/segLen)
-* [`segStart`](kcl/segStart)
-* [`segStartX`](kcl/segStartX)
-* [`segStartY`](kcl/segStartY)
 * [`shell`](kcl/shell)
 * [`sin`](kcl/sin)
 * [`sqrt`](kcl/sqrt)

docs/kcl/modules.md

@@ -1,59 +0,0 @@
----
-title: "KCL Modules"
-excerpt: "Documentation of modules for the KCL language for the Zoo Modeling App."
-layout: manual
----
-
-`KCL` allows splitting code up into multiple files.  Each file is somewhat
-isolated from other files as a separate module.
-
-When you define a function, you can use `export` before it to make it available
-to other modules.
-
-```
-// util.kcl
-export fn increment = (x) => {
-  return x + 1
-}
-```
-
-Other files in the project can now import functions that have been exported.
-This makes them available to use in another file.
-
-```
-// main.kcl
-import increment from "util.kcl"
-
-answer = increment(41)
-```
-
-Imported files _must_ be in the same project so that units are uniform across
-modules. This means that it must be in the same directory.
-
-Import statements must be at the top-level of a file. It is not allowed to have
-an `import` statement inside a function or in the body of an if-else.
-
-Multiple functions can be exported in a file.
-
-```
-// util.kcl
-export fn increment = (x) => {
-  return x + 1
-}
-
-export fn decrement = (x) => {
-  return x - 1
-}
-```
-
-When importing, you can import multiple functions at once.
-
-```
-import increment, decrement from "util.kcl"
-```
-
-Imported symbols can be renamed for convenience or to avoid name collisions.
-
-```
-import increment as inc, decrement as dec from "util.kcl"
-```

docs/kcl/types/KclNone.md

@@ -1,16 +0,0 @@
----
-title: "KclNone"
-excerpt: "KCL value for an optional parameter which was not given an argument. (remember, parameters are in the function declaration, arguments are in the function call/application)."
-layout: manual
----
-
-KCL value for an optional parameter which was not given an argument. (remember, parameters are in the function declaration, arguments are in the function call/application).
-
-**Type:** `object`
-
-
-
-
-
-
-

docs/kcl/types/KclValue.md

@@ -23,110 +23,8 @@ Any KCL value.
 
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
-| `type` |enum: `Uuid`|  | No |
-| `value` |`string`|  | No |
-| `__meta` |`[` [`Metadata`](/docs/kcl/types/Metadata) `]`|  | No |
-
-
-----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `Bool`|  | No |
-| `value` |`boolean`|  | No |
-| `__meta` |`[` [`Metadata`](/docs/kcl/types/Metadata) `]`|  | No |
-
-
-----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `Number`|  | No |
-| `value` |`number`|  | No |
-| `__meta` |`[` [`Metadata`](/docs/kcl/types/Metadata) `]`|  | No |
-
-
-----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `Int`|  | No |
-| `value` |`integer`|  | No |
-| `__meta` |`[` [`Metadata`](/docs/kcl/types/Metadata) `]`|  | No |
-
-
-----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `String`|  | No |
-| `value` |`string`|  | No |
-| `__meta` |`[` [`Metadata`](/docs/kcl/types/Metadata) `]`|  | No |
-
-
-----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `Array`|  | No |
-| `value` |`[` [`KclValue`](/docs/kcl/types/KclValue) `]`|  | No |
-| `__meta` |`[` [`Metadata`](/docs/kcl/types/Metadata) `]`|  | No |
-
-
-----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `Object`|  | No |
-| `value` |`object`|  | No |
+| `type` |enum: `UserVal`|  | No |
+| `value` |``|  | No |
 | `__meta` |`[` [`Metadata`](/docs/kcl/types/Metadata) `]`|  | No |
 
 
@@ -213,38 +111,6 @@ A face.
 | `__meta` |`[` [`Metadata`](/docs/kcl/types/Metadata) `]`|  | No |
 
 
-----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: [`Sketch`](/docs/kcl/types/Sketch)|  | No |
-| `value` |[`Sketch`](/docs/kcl/types/Sketch)| Any KCL value. | No |
-
-
-----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `Sketches`|  | No |
-| `value` |`[` [`Sketch`](/docs/kcl/types/Sketch) `]`|  | No |
-
-
 ----
 An solid is a collection of extrude surfaces.
 
@@ -324,23 +190,6 @@ Data for an imported geometry.
 
 ----
 
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: [`KclNone`](/docs/kcl/types/KclNone)|  | No |
-| `value` |[`KclNone`](/docs/kcl/types/KclNone)| Any KCL value. | No |
-| `__meta` |`[` [`Metadata`](/docs/kcl/types/Metadata) `]`|  | No |
-
-
-----
-
 
 
 

e2e/playwright/basic-sketch.spec.ts

@@ -67,15 +67,15 @@ async function doBasicSketch(page: Page, openPanes: string[]) {
   if (openPanes.includes('code')) {
     await expect(u.codeLocator).toHaveText(`sketch001 = startSketchOn('XZ')
   |> startProfileAt(${commonPoints.startAt}, %)
-  |> xLine(${commonPoints.num1}, %)`)
+  |> line([${commonPoints.num1}, 0], %)`)
   }
   await page.waitForTimeout(500)
   await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 20)
   if (openPanes.includes('code')) {
     await expect(u.codeLocator).toHaveText(`sketch001 = startSketchOn('XZ')
   |> startProfileAt(${commonPoints.startAt}, %)
-  |> xLine(${commonPoints.num1}, %)
-  |> yLine(${commonPoints.num1 + 0.01}, %)`)
+  |> line([${commonPoints.num1}, 0], %)
+  |> line([0, ${commonPoints.num1 + 0.01}], %)`)
   } else {
     await page.waitForTimeout(500)
   }
@@ -84,9 +84,9 @@ async function doBasicSketch(page: Page, openPanes: string[]) {
   if (openPanes.includes('code')) {
     await expect(u.codeLocator).toHaveText(`sketch001 = startSketchOn('XZ')
   |> startProfileAt(${commonPoints.startAt}, %)
-  |> xLine(${commonPoints.num1}, %)
-  |> yLine(${commonPoints.num1 + 0.01}, %)
-  |> xLine(${commonPoints.num2 * -1}, %)`)
+  |> line([${commonPoints.num1}, 0], %)
+  |> line([0, ${commonPoints.num1 + 0.01}], %)
+  |> lineTo([0, ${commonPoints.num3}], %)`)
   }
 
   // deselect line tool
@@ -142,9 +142,9 @@ async function doBasicSketch(page: Page, openPanes: string[]) {
   await u.openKclCodePanel()
   await expect(u.codeLocator).toHaveText(`sketch001 = startSketchOn('XZ')
   |> startProfileAt(${commonPoints.startAt}, %)
-  |> xLine(${commonPoints.num1}, %, $seg01)
-  |> yLine(${commonPoints.num1 + 0.01}, %)
-  |> xLine(-segLen(seg01), %)`)
+  |> line([${commonPoints.num1}, 0], %, $seg01)
+  |> line([0, ${commonPoints.num1 + 0.01}], %)
+  |> angledLine([180, segLen(seg01)], %)`)
 }
 
 test.describe('Basic sketch', () => {

e2e/playwright/editor-tests.spec.ts

@@ -632,18 +632,16 @@ test.describe('Editor tests', () => {
 
       await u.waitForAuthSkipAppStart()
 
+      // this test might be brittle as we add and remove functions
+      // but should also be easy to update.
       // tests clicking on an option, selection the first option
       // and arrowing down to an option
 
       await u.codeLocator.click()
       await page.keyboard.type('sketch001 = start')
 
-      // expect there to be some auto complete options
-      // exact number depends on the KCL stdlib, so let's just check it's > 0 for now.
-      await expect(async () => {
-        const children = await page.locator('.cm-completionLabel').count()
-        expect(children).toBeGreaterThan(0)
-      }).toPass()
+      // expect there to be six auto complete options
+      await expect(page.locator('.cm-completionLabel')).toHaveCount(8)
       // this makes sure we can accept a completion with click
       await page.getByText('startSketchOn').click()
       await page.keyboard.type("'XZ'")
@@ -694,9 +692,6 @@ test.describe('Editor tests', () => {
         .toHaveText(`sketch001 = startSketchOn('XZ')
     |> startProfileAt([3.14, 12], %)
     |> xLine(5, %) // lin`)
-
-      // expect there to be no KCL errors
-      await expect(page.locator('.cm-lint-marker-error')).toHaveCount(0)
     })
 
     test('with tab to accept the completion', async ({ page }) => {
@@ -990,7 +985,7 @@ test.describe('Editor tests', () => {
     |> extrude(5, %)`)
   })
 
-  test.fixme(
+  test(
     `Can use the import stdlib function on a local OBJ file`,
     { tag: '@electron' },
     async ({ browserName }, testInfo) => {

e2e/playwright/file-tree.spec.ts

@@ -26,6 +26,10 @@ test.describe('integrations tests', () => {
     'Creating a new file or switching file while in sketchMode should exit sketchMode',
     { tag: '@electron' },
     async ({ tronApp, homePage, scene, editor, toolbar }) => {
+      test.skip(
+        process.platform === 'win32',
+        'windows times out will waiting for the execution indicator?'
+      )
       await tronApp.initialise({
         fixtures: { homePage, scene, editor, toolbar },
         folderSetupFn: async (dir) => {
@@ -51,6 +55,7 @@ test.describe('integrations tests', () => {
           sortBy: 'last-modified-desc',
         })
         await homePage.openProject('test-sample')
+        // windows times out here, hence the skip above
         await scene.waitForExecutionDone()
       })
       await test.step('enter sketch mode', async () => {
@@ -66,13 +71,10 @@ test.describe('integrations tests', () => {
         await toolbar.editSketch()
         await expect(toolbar.exitSketchBtn).toBeVisible()
       })
-
-      const fileName = 'Untitled.kcl'
       await test.step('check sketch mode is exited when creating new file', async () => {
         await toolbar.fileTreeBtn.click()
         await toolbar.expectFileTreeState(['main.kcl'])
-
-        await toolbar.createFile({ fileName, waitForToastToDisappear: true })
+        await toolbar.createFile({ wait: true })
 
         // check we're out of sketch mode
         await expect(toolbar.exitSketchBtn).not.toBeVisible()
@@ -91,10 +93,10 @@ test.describe('integrations tests', () => {
         })
         await toolbar.editSketch()
         await expect(toolbar.exitSketchBtn).toBeVisible()
-        await toolbar.expectFileTreeState(['main.kcl', fileName])
+        await toolbar.expectFileTreeState(['main.kcl', 'Untitled.kcl'])
       })
       await test.step('check sketch mode is exited when opening a different file', async () => {
-        await toolbar.openFile(fileName, { wait: false })
+        await toolbar.openFile('untitled.kcl', { wait: false })
 
         // check we're out of sketch mode
         await expect(toolbar.exitSketchBtn).not.toBeVisible()
@@ -107,7 +109,7 @@ test.describe('when using the file tree to', () => {
   const fromFile = 'main.kcl'
   const toFile = 'hello.kcl'
 
-  test.fixme(
+  test(
     `rename ${fromFile} to ${toFile}, and doesn't crash on reload and settings load`,
     { tag: '@electron' },
     async ({ browser: _, tronApp }, testInfo) => {
@@ -155,7 +157,7 @@ test.describe('when using the file tree to', () => {
     }
   )
 
-  test.fixme(
+  test(
     `create many new untitled files they increment their names`,
     { tag: '@electron' },
     async ({ browser: _, tronApp }, testInfo) => {
@@ -296,7 +298,7 @@ test.describe('when using the file tree to', () => {
     }
   )
 
-  test.fixme(
+  test(
     'loading small file, then large, then back to small',
     {
       tag: '@electron',

e2e/playwright/fixtures/sceneFixture.ts

@@ -195,7 +195,7 @@ export class SceneFixture {
   }
 
   waitForExecutionDone = async () => {
-    await expect(this.exeIndicator).toBeVisible({ timeout: 30000 })
+    await expect(this.exeIndicator).toBeVisible()
   }
 
   expectPixelColor = async (

e2e/playwright/fixtures/toolbarFixture.ts

@@ -16,7 +16,6 @@ export class ToolbarFixture {
   fileCreateToast!: Locator
   filePane!: Locator
   exeIndicator!: Locator
-  treeInputField!: Locator
 
   constructor(page: Page) {
     this.page = page
@@ -32,7 +31,6 @@ export class ToolbarFixture {
     this.editSketchBtn = page.getByText('Edit Sketch')
     this.fileTreeBtn = page.locator('[id="files-button-holder"]')
     this.createFileBtn = page.getByTestId('create-file-button')
-    this.treeInputField = page.getByTestId('tree-input-field')
 
     this.filePane = page.locator('#files-pane')
     this.fileCreateToast = page.getByText('Successfully created')
@@ -61,15 +59,10 @@ export class ToolbarFixture {
   expectFileTreeState = async (expected: string[]) => {
     await expect.poll(this._serialiseFileTree).toEqual(expected)
   }
-  createFile = async (args: {
-    fileName: string
-    waitForToastToDisappear: boolean
-  }) => {
+  createFile = async ({ wait }: { wait: boolean } = { wait: false }) => {
     await this.createFileBtn.click()
-    await this.treeInputField.fill(args.fileName)
-    await this.treeInputField.press('Enter')
     await expect(this.fileCreateToast).toBeVisible()
-    if (args.waitForToastToDisappear) {
+    if (wait) {
       await this.fileCreateToast.waitFor({ state: 'detached' })
     }
   }

e2e/playwright/lib/console-error-whitelist.ts

@@ -18,7 +18,7 @@ export const isErrorWhitelisted = (exception: Error) => {
     {
       name: '"{"kind"',
       message:
-        '"engine","sourceRanges":[[0,0,0]],"msg":"Failed to get string from response from engine: `JsValue(undefined)`"}"',
+        '"engine","sourceRanges":[[0,0]],"msg":"Failed to get string from response from engine: `JsValue(undefined)`"}"',
       stack: '',
       foundInSpec: 'e2e/playwright/testing-settings.spec.ts',
       project: 'Google Chrome',
@@ -156,8 +156,8 @@ export const isErrorWhitelisted = (exception: Error) => {
     {
       name: 'Unhandled Promise Rejection',
       message:
-        '{"kind":"engine","sourceRanges":[[0,0,0]],"msg":"Failed to get string from response from engine: `JsValue(undefined)`"}',
-      stack: `Unhandled Promise Rejection: {"kind":"engine","sourceRanges":[[0,0,0]],"msg":"Failed to get string from response from engine: \`JsValue(undefined)\`"}
+        '{"kind":"engine","sourceRanges":[[0,0]],"msg":"Failed to get string from response from engine: `JsValue(undefined)`"}',
+      stack: `Unhandled Promise Rejection: {"kind":"engine","sourceRanges":[[0,0]],"msg":"Failed to get string from response from engine: \`JsValue(undefined)\`"}
     at unknown (http://localhost:3000/src/lang/std/engineConnection.ts:1245:26)`,
       foundInSpec:
         'e2e/playwright/onboarding-tests.spec.ts Click through each onboarding step',
@@ -253,7 +253,7 @@ export const isErrorWhitelisted = (exception: Error) => {
     {
       name: '{"kind"',
       stack: ``,
-      message: `engine","sourceRanges":[[0,0,0]],"msg":"Failed to wait for promise from engine: JsValue(\\"Force interrupt, executionIsStale, new AST requested\\")"}`,
+      message: `engine","sourceRanges":[[0,0]],"msg":"Failed to wait for promise from engine: JsValue(\\"Force interrupt, executionIsStale, new AST requested\\")"}`,
       project: 'Google Chrome',
       foundInSpec: 'e2e/playwright/testing-settings.spec.ts',
     },

e2e/playwright/point-click.spec.ts

@@ -452,7 +452,7 @@ sketch002 = startSketchOn(extrude001, seg03)
   )
 })
 
-test(`Verify axis, origin, and horizontal snapping`, async ({
+test(`Verify axis and origin snapping`, async ({
   app,
   editor,
   toolbar,
@@ -505,7 +505,7 @@ test(`Verify axis, origin, and horizontal snapping`, async ({
   const expectedCodeSnippets = {
     sketchOnXzPlane: `sketch001 = startSketchOn('XZ')`,
     pointAtOrigin: `startProfileAt([${originSloppy.kcl[0]}, ${originSloppy.kcl[1]}], %)`,
-    segmentOnXAxis: `xLine(${xAxisSloppy.kcl[0]}, %)`,
+    segmentOnXAxis: `lineTo([${xAxisSloppy.kcl[0]}, ${xAxisSloppy.kcl[1]}], %)`,
     afterSegmentDraggedOffYAxis: `startProfileAt([${offYAxis.kcl[0]}, ${offYAxis.kcl[1]}], %)`,
     afterSegmentDraggedOnYAxis: `startProfileAt([${yAxisSloppy.kcl[0]}, ${yAxisSloppy.kcl[1]}], %)`,
   }

e2e/playwright/projects.spec.ts

@@ -854,7 +854,7 @@ test(
   }
 )
 
-test.fixme(
+test(
   'Deleting projects, can delete individual project, can still create projects after deleting all',
   { tag: '@electron' },
   async ({ browserName }, testInfo) => {
@@ -1490,6 +1490,7 @@ test(
           'function_sketch.kcl',
           'function_sketch_with_position.kcl',
           'global-tags.kcl',
+          'helix_ccw.kcl',
           'helix_defaults.kcl',
           'helix_defaults_negative_extrude.kcl',
           'helix_with_length.kcl',
@@ -1669,8 +1670,7 @@ test(
   }
 )
 
-// Flaky
-test.fixme(
+test(
   'Original project name persist after onboarding',
   { tag: '@electron' },
   async ({ browserName }, testInfo) => {

e2e/playwright/sketch-tests.spec.ts

@@ -115,7 +115,7 @@ test.describe('Sketch tests', () => {
         'persistCode',
         `sketch001 = startSketchOn('XZ')
   |> startProfileAt([4.61, -14.01], %)
-  |> xLine(12.73, %)
+  |> line([12.73, -0.09], %)
   |> tangentialArcTo([24.95, -5.38], %)`
       )
     })
@@ -156,7 +156,7 @@ test.describe('Sketch tests', () => {
       await expect.poll(u.normalisedEditorCode, { timeout: 1000 })
         .toBe(`sketch001 = startSketchOn('XZ')
   |> startProfileAt([12.34, -12.34], %)
-  |> yLine(12.34, %)
+  |> line([-12.34, 12.34], %)
 
 `)
     }).toPass({ timeout: 40_000, intervals: [1_000] })
@@ -202,19 +202,35 @@ test.describe('Sketch tests', () => {
       })
 
       const u = await getUtils(page)
-      const viewport = { width: 1200, height: 500 }
-      await page.setViewportSize(viewport)
+      await page.setViewportSize({ width: 1200, height: 500 })
 
       await u.waitForAuthSkipAppStart()
       await expect(
         page.getByRole('button', { name: 'Start Sketch' })
       ).not.toBeDisabled()
 
-      const center = {
-        x: viewport.width / 2,
-        y: viewport.height / 2,
-      }
-      const modelAreaSize = await u.getModelViewAreaSize()
+      await page.waitForTimeout(100)
+      await u.openAndClearDebugPanel()
+      await u.sendCustomCmd({
+        type: 'modeling_cmd_req',
+        cmd_id: uuidv4(),
+        cmd: {
+          type: 'default_camera_look_at',
+          vantage: { x: 0, y: -1250, z: 580 },
+          center: { x: 0, y: 0, z: 0 },
+          up: { x: 0, y: 0, z: 1 },
+        },
+      })
+      await page.waitForTimeout(100)
+      await u.sendCustomCmd({
+        type: 'modeling_cmd_req',
+        cmd_id: uuidv4(),
+        cmd: {
+          type: 'default_camera_get_settings',
+        },
+      })
+      await page.waitForTimeout(100)
+      await u.closeDebugPanel()
 
       // If we have the code pane open, we should see the code.
       if (openPanes.includes('code')) {
@@ -228,7 +244,7 @@ test.describe('Sketch tests', () => {
         await expect(u.codeLocator).not.toBeVisible()
       }
 
-      const startPX = [center.x + 65, 458]
+      const startPX = [665, 458]
 
       const dragPX = 30
       let prevContent = ''
@@ -239,7 +255,7 @@ test.describe('Sketch tests', () => {
         // Wait for the render.
         await page.waitForTimeout(1000)
         // Select the sketch
-        await page.mouse.click(center.x + 100, 370)
+        await page.mouse.click(700, 370)
       }
       await expect(
         page.getByRole('button', { name: 'Edit Sketch' })
@@ -250,74 +266,45 @@ test.describe('Sketch tests', () => {
         prevContent = await page.locator('.cm-content').innerText()
       }
 
-      await page.waitForTimeout(1000)
-      await u.openAndClearDebugPanel()
-      await u.sendCustomCmd({
-        type: 'modeling_cmd_req',
-        cmd_id: uuidv4(),
-        cmd: {
-          type: 'default_camera_look_at',
-          vantage: { x: 0, y: -1250, z: 580 - modelAreaSize.w },
-          center: { x: 0, y: 0, z: 0 },
-          up: { x: 0, y: 0, z: 1 },
-        },
-      })
-      await page.waitForTimeout(100)
-      await u.sendCustomCmd({
-        type: 'modeling_cmd_req',
-        cmd_id: uuidv4(),
-        cmd: {
-          type: 'default_camera_get_settings',
-        },
-      })
-      await page.waitForTimeout(1000)
-      await u.closeDebugPanel()
-
       const step5 = { steps: 5 }
 
       await expect(page.getByTestId('segment-overlay')).toHaveCount(2)
 
-      test.step('drag startProfileAt handle', async () => {
-        await page.mouse.move(startPX[0], startPX[1])
-        await page.mouse.down()
-        await page.mouse.move(startPX[0] + dragPX, startPX[1] - dragPX, step5)
-        await page.mouse.up()
-        if (openPanes.includes('code')) {
-          await expect(page.locator('.cm-content')).not.toHaveText(prevContent)
-          prevContent = await page.locator('.cm-content').innerText()
-        }
-      })
+      // drag startProfieAt handle
+      await page.mouse.move(startPX[0], startPX[1])
+      await page.mouse.down()
+      await page.mouse.move(startPX[0] + dragPX, startPX[1] - dragPX, step5)
+      await page.mouse.up()
 
+      if (openPanes.includes('code')) {
+        await expect(page.locator('.cm-content')).not.toHaveText(prevContent)
+        prevContent = await page.locator('.cm-content').innerText()
+      }
+
+      // drag line handle
       await page.waitForTimeout(100)
 
-      test.step('drag line handle', async () => {
-        const lineEnd = await u.getBoundingBox('[data-overlay-index="0"]')
-        await page.mouse.move(lineEnd.x - 5, lineEnd.y)
-        await page.mouse.down()
-        await page.mouse.move(lineEnd.x + dragPX, lineEnd.y - dragPX, step5)
-        await page.mouse.up()
-        await page.waitForTimeout(100)
-        if (openPanes.includes('code')) {
-          await expect(page.locator('.cm-content')).not.toHaveText(prevContent)
-          prevContent = await page.locator('.cm-content').innerText()
-        }
-      })
+      const lineEnd = await u.getBoundingBox('[data-overlay-index="0"]')
+      await page.mouse.move(lineEnd.x - 5, lineEnd.y)
+      await page.mouse.down()
+      await page.mouse.move(lineEnd.x + dragPX, lineEnd.y - dragPX, step5)
+      await page.mouse.up()
+      await page.waitForTimeout(100)
+      if (openPanes.includes('code')) {
+        await expect(page.locator('.cm-content')).not.toHaveText(prevContent)
+        prevContent = await page.locator('.cm-content').innerText()
+      }
 
-      test.step('drag tangentialArcTo handle', async () => {
-        const tangentEnd = await u.getBoundingBox('[data-overlay-index="1"]')
-        await page.mouse.move(tangentEnd.x, tangentEnd.y - 5)
-        await page.mouse.down()
-        await page.mouse.move(
-          tangentEnd.x + dragPX,
-          tangentEnd.y - dragPX,
-          step5
-        )
-        await page.mouse.up()
-        await page.waitForTimeout(100)
-        if (openPanes.includes('code')) {
-          await expect(page.locator('.cm-content')).not.toHaveText(prevContent)
-        }
-      })
+      // drag tangentialArcTo handle
+      const tangentEnd = await u.getBoundingBox('[data-overlay-index="1"]')
+      await page.mouse.move(tangentEnd.x, tangentEnd.y - 5)
+      await page.mouse.down()
+      await page.mouse.move(tangentEnd.x + dragPX, tangentEnd.y - dragPX, step5)
+      await page.mouse.up()
+      await page.waitForTimeout(100)
+      if (openPanes.includes('code')) {
+        await expect(page.locator('.cm-content')).not.toHaveText(prevContent)
+      }
 
       // Open the code pane
       await u.openKclCodePanel()
@@ -593,7 +580,7 @@ test.describe('Sketch tests', () => {
     })
     await page.waitForTimeout(100)
 
-    const center = await u.getCenterOfModelViewArea()
+    const startPX = [665, 458]
 
     const dragPX = 30
 
@@ -609,7 +596,7 @@ test.describe('Sketch tests', () => {
 
     await expect(page.getByTestId('segment-overlay')).toHaveCount(2)
 
-    // drag startProfileAt handle
+    // drag startProfieAt handle
     await page.mouse.move(startPX[0], startPX[1])
     await page.mouse.down()
     await page.mouse.move(startPX[0] + dragPX, startPX[1] - dragPX, step5)
@@ -651,7 +638,6 @@ test.describe('Sketch tests', () => {
   })
   test('Can add multiple sketches', async ({ page }) => {
     const u = await getUtils(page)
-
     const viewportSize = { width: 1200, height: 500 }
     await page.setViewportSize(viewportSize)
 
@@ -659,7 +645,7 @@ test.describe('Sketch tests', () => {
     await u.openDebugPanel()
 
     const center = { x: viewportSize.width / 2, y: viewportSize.height / 2 }
-    const { toSU, toU, click00r } = getMovementUtils({ center, page })
+    const { toSU, click00r } = getMovementUtils({ center, page })
 
     await expect(
       page.getByRole('button', { name: 'Start Sketch' })
@@ -675,32 +661,29 @@ test.describe('Sketch tests', () => {
       200
     )
 
-    const center = await u.getCenterOfModelViewArea()
-
     let codeStr = "sketch001 = startSketchOn('XY')"
 
-    await page.mouse.click(center.x - 50, viewportSize.height * 0.55)
+    await page.mouse.click(center.x, viewportSize.height * 0.55)
     await expect(u.codeLocator).toHaveText(codeStr)
     await u.closeDebugPanel()
     await page.waitForTimeout(500) // TODO detect animation ending, or disable animation
 
-    const { click00r } = await getMovementUtils({ center, page })
-
-    let coord = await click00r(0, 0)
-    codeStr += `  |> startProfileAt(${coord.kcl}, %)`
+    await click00r(0, 0)
+    codeStr += `  |> startProfileAt(${toSU([0, 0])}, %)`
     await expect(u.codeLocator).toHaveText(codeStr)
 
     await click00r(50, 0)
     await page.waitForTimeout(100)
-    codeStr += `  |> xLine(${toU(50, 0)[0]}, %)`
+    codeStr += `  |> lineTo(${toSU([50, 0])}, %)`
     await expect(u.codeLocator).toHaveText(codeStr)
 
     await click00r(0, 50)
-    codeStr += `  |> yLine(${toU(0, 50)[1]}, %)`
+    codeStr += `  |> line(${toSU([0, 50])}, %)`
     await expect(u.codeLocator).toHaveText(codeStr)
 
-    await click00r(-50, 0)
-    codeStr += `  |> xLine(${toU(-50, 0)[0]}, %)`
+    let clickCoords = await click00r(-50, 0)
+    expect(clickCoords).not.toBeUndefined()
+    codeStr += `  |> lineTo(${toSU(clickCoords!)}, %)`
     await expect(u.codeLocator).toHaveText(codeStr)
 
     // exit the sketch, reset relative clicker
@@ -716,29 +699,28 @@ test.describe('Sketch tests', () => {
 
     // when exiting the sketch above the camera is still looking down at XY,
     // so selecting the plane again is a bit easier.
-    await page.mouse.move(center.x - 100, center.y + 50, { steps: 5 })
-    await page.mouse.click(center.x - 100, center.y + 50)
+    await page.mouse.click(center.x + 200, center.y + 100)
     await page.waitForTimeout(600) // TODO detect animation ending, or disable animation
     codeStr += "sketch002 = startSketchOn('XY')"
     await expect(u.codeLocator).toHaveText(codeStr)
     await u.closeDebugPanel()
 
-    coord = await click00r(30, 0)
-    codeStr += `  |> startProfileAt(${coord.kcl}, %)`
+    await click00r(30, 0)
+    codeStr += `  |> startProfileAt([2.03, 0], %)`
     await expect(u.codeLocator).toHaveText(codeStr)
 
     // TODO: I couldn't use `toSU` here because of some rounding error causing
     // it to be off by 0.01
     await click00r(30, 0)
-    codeStr += `  |> xLine(2.04, %)`
+    codeStr += `  |> lineTo([4.07, 0], %)`
     await expect(u.codeLocator).toHaveText(codeStr)
 
     await click00r(0, 30)
-    codeStr += `  |> yLine(-2.03, %)`
+    codeStr += `  |> line([0, -2.03], %)`
     await expect(u.codeLocator).toHaveText(codeStr)
 
     await click00r(-30, 0)
-    codeStr += `  |> xLine(-2.04, %)`
+    codeStr += `  |> line([-2.04, 0], %)`
     await expect(u.codeLocator).toHaveText(codeStr)
 
     await click00r(undefined, undefined)
@@ -762,8 +744,8 @@ test.describe('Sketch tests', () => {
 
       const code = `sketch001 = startSketchOn('-XZ')
     |> startProfileAt([${roundOff(scale * 69.6)}, ${roundOff(scale * 34.8)}], %)
-    |> xLine(${roundOff(scale * 139.19)}, %)
-    |> yLine(-${roundOff(scale * 139.2)}, %)
+    |> line([${roundOff(scale * 139.19)}, 0], %)
+    |> line([0, -${roundOff(scale * 139.2)}], %)
     |> lineTo([profileStartX(%), profileStartY(%)], %)
     |> close(%)`
 
@@ -782,21 +764,20 @@ test.describe('Sketch tests', () => {
       await u.updateCamPosition(camPos)
       await u.closeDebugPanel()
 
-      const center = await u.getCenterOfModelViewArea()
       await page.mouse.move(0, 0)
 
       // select a plane
-      await page.mouse.move(center.x + 100, 200, { steps: 10 })
-      await page.mouse.click(center.x + 100, 200, { delay: 200 })
+      await page.mouse.move(700, 200, { steps: 10 })
+      await page.mouse.click(700, 200, { delay: 200 })
       await expect(page.locator('.cm-content')).toHaveText(
         `sketch001 = startSketchOn('-XZ')`
       )
 
       let prevContent = await page.locator('.cm-content').innerText()
 
-      const pointA = [center.x + 100, 200]
-      const pointB = [center.x + 300, 200]
-      const pointC = [center.x + 300, 400]
+      const pointA = [700, 200]
+      const pointB = [900, 200]
+      const pointC = [900, 400]
 
       // draw three lines
       await page.waitForTimeout(500)
@@ -933,9 +914,7 @@ extrude001 = extrude(5, sketch001)
 
     await page.getByRole('button', { name: 'Start Sketch' }).click()
 
-    const center = await u.getCenterOfModelViewArea()
-
-    await page.mouse.click(center.x + 22, 355)
+    await page.mouse.click(622, 355)
 
     await page.waitForTimeout(800)
     await page.getByText(`END')`).click()

e2e/playwright/snapshot-tests.spec.ts

@@ -462,7 +462,7 @@ test(
     await page.waitForTimeout(100)
 
     code += `
-  |> xLine(7.25, %)`
+  |> line([7.25, 0], %)`
     await expect(page.locator('.cm-content')).toHaveText(code)
 
     await page
@@ -647,7 +647,7 @@ test.describe(
       await page.waitForTimeout(100)
 
       code += `
-  |> xLine(7.25, %)`
+  |> line([7.25, 0], %)`
       await expect(u.codeLocator).toHaveText(code)
 
       await page
@@ -752,7 +752,7 @@ test.describe(
       await page.waitForTimeout(100)
 
       code += `
-  |> xLine(184.3, %)`
+  |> line([184.3, 0], %)`
       await expect(u.codeLocator).toHaveText(code)
 
       await page
@@ -1031,7 +1031,7 @@ test.describe('Grid visibility', { tag: '@snapshot' }, () => {
   })
 })
 
-test.fixme('theme persists', async ({ page, context }) => {
+test('theme persists', async ({ page, context }) => {
   const u = await getUtils(page)
   await context.addInitScript(async () => {
     localStorage.setItem(

e2e/playwright/test-network-and-connection-issues.spec.ts

@@ -141,7 +141,7 @@ test.describe('Test network and connection issues', () => {
     await expect(page.locator('.cm-content'))
       .toHaveText(`sketch001 = startSketchOn('XZ')
     |> startProfileAt(${commonPoints.startAt}, %)
-    |> xLine(${commonPoints.num1}, %)`)
+    |> line([${commonPoints.num1}, 0], %)`)
 
     // Expect the network to be up
     await expect(networkToggle).toContainText('Connected')
@@ -207,7 +207,7 @@ test.describe('Test network and connection issues', () => {
     await expect.poll(u.normalisedEditorCode)
       .toBe(`sketch001 = startSketchOn('XZ')
   |> startProfileAt([12.34, -12.34], %)
-  |> xLine(12.34, %)
+  |> line([12.34, 0], %)
   |> line([-12.34, 12.34], %)
 
 `)
@@ -217,9 +217,9 @@ test.describe('Test network and connection issues', () => {
     await expect.poll(u.normalisedEditorCode)
       .toBe(`sketch001 = startSketchOn('XZ')
   |> startProfileAt([12.34, -12.34], %)
-  |> xLine(12.34, %)
+  |> line([12.34, 0], %)
   |> line([-12.34, 12.34], %)
-  |> xLine(-12.34, %)
+  |> lineTo([0, -12.34], %)
 
 `)
 

e2e/playwright/test-utils.ts

@@ -8,21 +8,6 @@ import {
   Locator,
   test,
 } from '@playwright/test'
-import {
-  OrthographicCamera,
-  Mesh,
-  Scene,
-  Raycaster,
-  PlaneGeometry,
-  MeshBasicMaterial,
-  DoubleSide,
-  Vector2,
-  Vector3,
-} from 'three'
-import {
-  RAYCASTABLE_PLANE,
-  INTERSECTION_PLANE_LAYER,
-} from 'clientSideScene/constants'
 import { EngineCommand } from 'lang/std/artifactGraph'
 import fsp from 'fs/promises'
 import fsSync from 'fs'
@@ -272,141 +257,55 @@ export const circleMove = async (
   }
 }
 
-export function rollingRound(n: number, digitsAfterDecimal: number) {
-  const s = String(n).split('.')
+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
 
-  // There are no decimals, just return the number.
-  if (s.length === 1) return n
+  // 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
+  ]
 
-  // Find the closest 9. We don't care about anything beyond that.
-  const nineIndex = s[1].indexOf('9')
+  // Turn the array into a string with specific formatting
+  const fromUToString = (xy: number[]) => `[${xy[0]}, ${xy[1]}]`
 
-  const fractStr = nineIndex > 0 ? s[1].slice(0, nineIndex + 1) : s[1]
-
-  let fract = Number(fractStr) / 10 ** fractStr.length
-
-  for (let i = fractStr.length - 1; i >= 0; i -= 1) {
-    if (i === digitsAfterDecimal) break
-    fract = Math.round(fract * 10 ** i) / 10 ** i
-  }
-
-  return (Number(s[0]) + fract).toFixed(digitsAfterDecimal)
-}
-
-export const getMovementUtils = async (opts: any) => {
-  const sceneInfra = await opts.page.evaluate(() => window.sceneInfra)
-
-  // Various data for raycasting into the scene to get our XY.
-  const hundredM = 100_0000
-  const planeGeometry = new PlaneGeometry(hundredM, hundredM)
-  const planeMaterial = new MeshBasicMaterial({
-    color: 0xff0000,
-    side: DoubleSide,
-    transparent: true,
-    opacity: 0.5,
-  })
-  const scene = new Scene()
-  const intersectionPlane = new Mesh(planeGeometry, planeMaterial)
-  intersectionPlane.userData = { type: RAYCASTABLE_PLANE }
-  intersectionPlane.name = RAYCASTABLE_PLANE
-  intersectionPlane.layers.set(INTERSECTION_PLANE_LAYER)
-  scene.add(intersectionPlane)
-  const planeRaycaster = new Raycaster()
-  planeRaycaster.far = Infinity
-  planeRaycaster.layers.enable(INTERSECTION_PLANE_LAYER)
-
-  const kcRound = (n: number) => Math.round(n * 100) / 100
+  // 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(x, y, { delay: 100 })
+    opts.page.mouse.click(opts.center.x + x, opts.center.y + y, { delay: 100 })
 
   // Relative clicker, must keep state
   let last = { x: 0, y: 0 }
-  let lastScreenSpace = { x: 0, y: 0 }
-
   const click00r = async (x?: number, y?: number) => {
     // reset relative coordinates when anything is undefined
     if (x === undefined || y === undefined) {
-      last = { x: 0, y: 0 }
-      lastScreenSpace = { x: 0, y: 0 }
-      return {
-        nextXY: [0, 0],
-        kcl: `[0, 0]`,
-      }
+      last.x = 0
+      last.y = 0
+      return
     }
 
-    const absX = opts.center.x + x
-    const absY = opts.center.y + y
-
-    const nextX = last.x + x
-    const nextY = last.y + y
-
-    const targetX = opts.center.x + nextX
-    const targetY = opts.center.y + -nextY
-
-    // Use the current camera specification
-    const camera = await opts.page.evaluate(() => {
-      window.sceneInfra.camControls.onCameraChange(true)
-      return window.sceneInfra.camControls.camera
-    })
-
-    const windowWH = await opts.page.evaluate(() => ({
-      w: window.innerWidth,
-      h: window.innerHeight,
-    }))
-
-    // I didn't write this math, it's copied from sceneInfra.ts, and I understand
-    // it's just normalizing the point, but why *-2 ± 1 I have no idea.
-    const mouseVector = new Vector2(
-      (targetX / windowWH.w) * 2 - 1,
-      -(targetY / windowWH.h) * 2 + 1
+    await circleMove(
+      opts.page,
+      opts.center.x + last.x + x,
+      opts.center.y + last.y + y,
+      10,
+      10
     )
-    planeRaycaster.setFromCamera(mouseVector, camera)
-    const intersections = planeRaycaster.intersectObjects(scene.children, true)
-
-    const planePosition = intersections[0].object.position
-    const inversePlaneQuaternion = intersections[0].object.quaternion
-      .clone()
-      .invert()
-    let transformedPoint = intersections[0].point.clone()
-    if (transformedPoint) {
-      transformedPoint.applyQuaternion(inversePlaneQuaternion)
-    }
-    const twoD = new Vector2(
-      // I think the intersection plane doesn't get scale when nearly everything else does, maybe that should change
-      transformedPoint.x / sceneInfra._baseUnitMultiplier,
-      transformedPoint.y / sceneInfra._baseUnitMultiplier
-    ) // z should be 0
-    const planePositionCorrected = new Vector3(
-      ...planePosition
-    ).applyQuaternion(inversePlaneQuaternion)
-    twoD.sub(new Vector2(...planePositionCorrected))
-
-    await circleMove(opts.page, targetX, targetY, 10, 10)
-    await click00(targetX, targetY)
-
+    await click00(last.x + x, last.y + y)
     last.x += x
     last.y += y
 
-    const relativeScreenSpace = {
-      x: twoD.x - lastScreenSpace.x,
-      y: -(twoD.y - lastScreenSpace.y),
-    }
-
-    lastScreenSpace.x = kcRound(twoD.x)
-    lastScreenSpace.y = kcRound(twoD.y)
-
-    // Returns the new absolute coordinate and the screen space coordinate if you need it.
-    return {
-      nextXY: [last.x, last.y],
-      kcl: `[${kcRound(relativeScreenSpace.x)}, ${-kcRound(
-        relativeScreenSpace.y
-      )}]`,
-    }
+    // Returns the new absolute coordinate if you need it.
+    return [last.x, last.y]
   }
 
-  return { toSU, toU, click00r }
+  return { toSU, click00r }
 }
 
 async function waitForAuthAndLsp(page: Page) {
@@ -457,30 +356,6 @@ export async function getUtils(page: Page, test_?: typeof test) {
     browserType !== 'chromium' ? null : await page.context().newCDPSession(page)
 
   const util = {
-    async getModelViewAreaSize() {
-      const windowInnerWidth = await page.evaluate(() => window.innerWidth)
-      const windowInnerHeight = await page.evaluate(() => window.innerHeight)
-
-      const sidebar = page.getByTestId('modeling-sidebar')
-      const bb = await sidebar.boundingBox()
-      return {
-        w: windowInnerWidth - (bb?.width ?? 0),
-        h: windowInnerHeight - (bb?.height ?? 0),
-      }
-    },
-    async getCenterOfModelViewArea() {
-      const windowInnerWidth = await page.evaluate(() => window.innerWidth)
-      const windowInnerHeight = await page.evaluate(() => window.innerHeight)
-
-      const sidebar = page.getByTestId('modeling-sidebar')
-      const bb = await sidebar.boundingBox()
-      const goRightPx = (bb?.width ?? 0) / 2
-      const borderWidthsCombined = 2
-      return {
-        x: Math.round(windowInnerWidth / 2 + goRightPx) - borderWidthsCombined,
-        y: Math.round(windowInnerHeight / 2),
-      }
-    },
     waitForAuthSkipAppStart: () => waitForAuthAndLsp(page),
     waitForPageLoad: () => waitForPageLoad(page),
     waitForPageLoadWithRetry: () => waitForPageLoadWithRetry(page),

e2e/playwright/testing-constraints.spec.ts

@@ -43,12 +43,10 @@ test.describe('Testing constraints', () => {
     await page.getByRole('button', { name: 'Edit Sketch' }).click()
     await page.waitForTimeout(500) // wait for animation
 
-    const center = await u.getCenterOfModelViewArea()
-
-    const startXPx = center.x - 100
+    const startXPx = 500
     await page.mouse.move(startXPx + PUR * 15, 250 - PUR * 10)
     await page.keyboard.down('Shift')
-    await page.mouse.click(center.x + 234, 244)
+    await page.mouse.click(834, 244)
     await page.keyboard.up('Shift')
 
     await page

e2e/playwright/testing-selections.spec.ts

@@ -32,17 +32,10 @@ test.describe('Testing selections', () => {
       await u.waitForAuthSkipAppStart()
       await u.openDebugPanel()
 
-      const yAxisClick = () =>
-        test.step('Click on Y axis', async () => {
-          await page.mouse.move(600, 200, { steps: 5 })
-          await page.mouse.click(600, 200)
-          await page.waitForTimeout(100)
-        })
+      const xAxisClick = () =>
+        page.mouse.click(700, 253).then(() => page.waitForTimeout(100))
       const xAxisClickAfterExitingSketch = () =>
-        test.step(`Click on X axis after exiting sketch, which shifts it at the moment`, async () => {
-          await page.mouse.click(639, 278)
-          await page.waitForTimeout(100)
-        })
+        page.mouse.click(639, 278).then(() => page.waitForTimeout(100))
       const emptySpaceHover = () =>
         test.step('Hover over empty space', async () => {
           await page.mouse.move(700, 143, { steps: 5 })
@@ -87,23 +80,23 @@ test.describe('Testing selections', () => {
       await expect(page.locator('.cm-content'))
         .toHaveText(`sketch001 = startSketchOn('XZ')
     |> startProfileAt(${commonPoints.startAt}, %)
-    |> xLine(${commonPoints.num1}, %)`)
+    |> line([${commonPoints.num1}, 0], %)`)
 
       await page.waitForTimeout(100)
       await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 20)
       await expect(page.locator('.cm-content'))
         .toHaveText(`sketch001 = startSketchOn('XZ')
     |> startProfileAt(${commonPoints.startAt}, %)
-    |> xLine(${commonPoints.num1}, %)
-    |> yLine(${commonPoints.num1 + 0.01}, %)`)
+    |> line([${commonPoints.num1}, 0], %)
+    |> line([0, ${commonPoints.num1 + 0.01}], %)`)
       await page.waitForTimeout(100)
       await page.mouse.click(startXPx, 500 - PUR * 20)
       await expect(page.locator('.cm-content'))
         .toHaveText(`sketch001 = startSketchOn('XZ')
     |> startProfileAt(${commonPoints.startAt}, %)
-    |> xLine(${commonPoints.num1}, %)
-    |> yLine(${commonPoints.num1 + 0.01}, %)
-    |> xLine(${commonPoints.num2 * -1}, %)`)
+    |> line([${commonPoints.num1}, 0], %)
+    |> line([0, ${commonPoints.num1 + 0.01}], %)
+    |> lineTo([0, ${commonPoints.num3}], %)`)
 
       // deselect line tool
       await page.getByRole('button', { name: 'line Line', exact: true }).click()
@@ -128,58 +121,53 @@ test.describe('Testing selections', () => {
         // now check clicking works including axis
 
         // click a segment hold shift and click an axis, see that a relevant constraint is enabled
+        await topHorzSegmentClick()
+        await page.keyboard.down('Shift')
         const constrainButton = page.getByRole('button', {
           name: 'Length: open menu',
         })
-        const absXButton = page.getByRole('button', { name: 'Absolute X' })
-
-        await test.step(`Select a segment and an axis, see that a relevant constraint is enabled`, async () => {
-          await topHorzSegmentClick()
-          await page.keyboard.down('Shift')
-          await constrainButton.click()
-          await expect(absXButton).toBeDisabled()
-          await page.waitForTimeout(100)
-          await yAxisClick()
-          await page.keyboard.up('Shift')
-          await constrainButton.click()
-          await absXButton.and(page.locator(':not([disabled])')).waitFor()
-          await expect(absXButton).not.toBeDisabled()
-        })
+        const absYButton = page.getByRole('button', { name: 'Absolute Y' })
+        await constrainButton.click()
+        await expect(absYButton).toBeDisabled()
+        await page.waitForTimeout(100)
+        await xAxisClick()
+        await page.keyboard.up('Shift')
+        await constrainButton.click()
+        await absYButton.and(page.locator(':not([disabled])')).waitFor()
+        await expect(absYButton).not.toBeDisabled()
 
+        // clear selection by clicking on nothing
         await emptySpaceClick()
+
+        await page.waitForTimeout(100)
+        // same selection but click the axis first
+        await xAxisClick()
+        await constrainButton.click()
+        await expect(absYButton).toBeDisabled()
+        await page.keyboard.down('Shift')
+        await page.waitForTimeout(100)
+        await topHorzSegmentClick()
         await page.waitForTimeout(100)
 
-        await test.step(`Same selection but click the axis first`, async () => {
-          await yAxisClick()
-          await constrainButton.click()
-          await expect(absXButton).toBeDisabled()
-          await page.keyboard.down('Shift')
-          await page.waitForTimeout(100)
-          await topHorzSegmentClick()
-          await page.waitForTimeout(100)
-
-          await page.keyboard.up('Shift')
-          await constrainButton.click()
-          await expect(absXButton).not.toBeDisabled()
-        })
+        await page.keyboard.up('Shift')
+        await constrainButton.click()
+        await expect(absYButton).not.toBeDisabled()
 
         // clear selection by clicking on nothing
         await emptySpaceClick()
 
         // check the same selection again by putting cursor in code first then selecting axis
-        await test.step(`Same selection but code selection then axis`, async () => {
-          await page
-            .getByText(`  |> xLine(${commonPoints.num2 * -1}, %)`)
-            .click()
-          await page.keyboard.down('Shift')
-          await constrainButton.click()
-          await expect(absXButton).toBeDisabled()
-          await page.waitForTimeout(100)
-          await yAxisClick()
-          await page.keyboard.up('Shift')
-          await constrainButton.click()
-          await expect(absXButton).not.toBeDisabled()
-        })
+        await page
+          .getByText(`  |> lineTo([0, ${commonPoints.num3}], %)`)
+          .click()
+        await page.keyboard.down('Shift')
+        await constrainButton.click()
+        await expect(absYButton).toBeDisabled()
+        await page.waitForTimeout(100)
+        await xAxisClick()
+        await page.keyboard.up('Shift')
+        await constrainButton.click()
+        await expect(absYButton).not.toBeDisabled()
 
         // clear selection by clicking on nothing
         await emptySpaceClick()
@@ -194,7 +182,9 @@ test.describe('Testing selections', () => {
           process.platform === 'linux' ? 'Control' : 'Meta'
         )
         await page.waitForTimeout(100)
-        await page.getByText(`  |> xLine(${commonPoints.num2 * -1}, %)`).click()
+        await page
+          .getByText(`  |> lineTo([0, ${commonPoints.num3}], %)`)
+          .click()
 
         await expect(page.locator('.cm-cursor')).toHaveCount(2)
         await page.waitForTimeout(500)
@@ -938,7 +928,6 @@ sketch002 = startSketchOn(extrude001, $seg01)
     // test fillet button with the body in the scene
     const codeToAdd = `${await u.codeLocator.allInnerTexts()}
 extrude001 = extrude(10, sketch001)`
-    await u.codeLocator.clear()
     await u.codeLocator.fill(codeToAdd)
     await selectSegment()
     await expect(page.getByRole('button', { name: 'Fillet' })).toBeEnabled()

e2e/playwright/testing-settings.spec.ts

@@ -1,5 +1,6 @@
 import { test, expect } from '@playwright/test'
 import * as fsp from 'fs/promises'
+import * as fs from 'fs'
 import { join } from 'path'
 import {
   getUtils,
@@ -258,7 +259,7 @@ test.describe('Testing settings', () => {
     })
   })
 
-  test.fixme(
+  test(
     `Project settings override user settings on desktop`,
     { tag: ['@electron', '@skipWin'] },
     async ({ browser: _ }, testInfo) => {
@@ -304,6 +305,21 @@ test.describe('Testing settings', () => {
       const projectLink = page.getByText('bracket')
       const logoLink = page.getByTestId('app-logo')
 
+      async function confirmThemeWasWritten(filePath: string, value: string) {
+        return expect
+          .poll(
+            async () => {
+              const fileExists = await fs.existsSync(filePath)
+              return fileExists ? fsp.readFile(filePath, 'utf-8') : ''
+            },
+            {
+              message: 'Setting should now be written to the file',
+              timeout: 5_000,
+            }
+          )
+          .toContain(`themeColor = "${value}"`)
+      }
+
       await test.step('Set user theme color on home', async () => {
         await expect(settingsOpenButton).toBeVisible()
         await settingsOpenButton.click()
@@ -311,13 +327,8 @@ test.describe('Testing settings', () => {
         await expect(userSettingsTab).toBeChecked()
         await themeColorSetting.fill(userThemeColor)
         await expect(logoLink).toHaveCSS('--primary-hue', userThemeColor)
+        await confirmThemeWasWritten(tempUserSettingsFilePath, userThemeColor)
         await settingsCloseButton.click()
-        await expect
-          .poll(async () => fsp.readFile(tempUserSettingsFilePath, 'utf-8'), {
-            message: 'Setting should now be written to the file',
-            timeout: 5_000,
-          })
-          .toContain(`themeColor = "${userThemeColor}"`)
       })
 
       await test.step('Set project theme color', async () => {
@@ -328,29 +339,25 @@ test.describe('Testing settings', () => {
         await expect(projectSettingsTab).toBeChecked()
         await themeColorSetting.fill(projectThemeColor)
         await expect(logoLink).toHaveCSS('--primary-hue', projectThemeColor)
-        await settingsCloseButton.click()
         // Make sure that the project settings file has been written to before continuing
-        await expect
-          .poll(
-            async () => fsp.readFile(tempProjectSettingsFilePath, 'utf-8'),
-            {
-              message: 'Setting should now be written to the file',
-              timeout: 5_000,
-            }
-          )
-          .toContain(`themeColor = "${projectThemeColor}"`)
+        await confirmThemeWasWritten(
+          tempProjectSettingsFilePath,
+          projectThemeColor
+        )
+        await settingsCloseButton.click()
       })
 
       await test.step('Refresh the application and see project setting applied', async () => {
         // Make sure we're done navigating before we reload
         await expect(settingsCloseButton).not.toBeVisible()
-
         await page.reload({ waitUntil: 'domcontentloaded' })
+
         await expect(logoLink).toHaveCSS('--primary-hue', projectThemeColor)
       })
 
       await test.step(`Navigate back to the home view and see user setting applied`, async () => {
         await logoLink.click()
+        await page.screenshot({ path: 'out.png' })
         await expect(logoLink).toHaveCSS('--primary-hue', userThemeColor)
       })
 
@@ -414,7 +421,7 @@ test.describe('Testing settings', () => {
   )
 
   // It was much easier to test the logo color than the background stream color.
-  test.fixme(
+  test(
     'user settings reload on external change, on project and modeling view',
     { tag: '@electron' },
     async ({ browserName }, testInfo) => {
@@ -743,19 +750,18 @@ extrude001 = extrude(5, sketch001)
       )
     })
     await page.setViewportSize({ width: 1200, height: 500 })
-    await u.waitForAuthSkipAppStart()
 
     // Selectors and constants
     const editSketchButton = page.getByRole('button', { name: 'Edit Sketch' })
     const lineToolButton = page.getByTestId('line')
     const segmentOverlays = page.getByTestId('segment-overlay')
-    const sketchOriginLocation = await u.getCenterOfModelViewArea()
+    const sketchOriginLocation = { x: 600, y: 250 }
     const darkThemeSegmentColor: [number, number, number] = [215, 215, 215]
     const lightThemeSegmentColor: [number, number, number] = [90, 90, 90]
 
     await test.step(`Get into sketch mode`, async () => {
-      await page.mouse.click(sketchOriginLocation.x, sketchOriginLocation.y)
-
+      await u.waitForAuthSkipAppStart()
+      await page.mouse.click(700, 200)
       await expect(editSketchButton).toBeVisible()
       await editSketchButton.click()
 
@@ -766,18 +772,12 @@ extrude001 = extrude(5, sketch001)
       await page.waitForTimeout(1000)
     })
 
-    const line1 = await u.getSegmentBodyCoords(`[data-overlay-index="${0}"]`, 0)
-
-    // Our lines are translucent (surprise!), so we need to get on portion
-    // of the line that is only on the background, and not on top of something
-    // like the axis lines.
-    line1.x -= 1
-    line1.y -= 1
-
     await test.step(`Check the sketch line color before`, async () => {
       await expect
-        .poll(() => u.getGreatestPixDiff(line1, darkThemeSegmentColor))
-        .toBeLessThanOrEqual(34)
+        .poll(() =>
+          u.getGreatestPixDiff(sketchOriginLocation, darkThemeSegmentColor)
+        )
+        .toBeLessThan(15)
     })
 
     await test.step(`Change theme to light using command palette`, async () => {
@@ -792,8 +792,10 @@ extrude001 = extrude(5, sketch001)
 
     await test.step(`Check the sketch line color after`, async () => {
       await expect
-        .poll(() => u.getGreatestPixDiff(line1, lightThemeSegmentColor))
-        .toBeLessThanOrEqual(34)
+        .poll(() =>
+          u.getGreatestPixDiff(sketchOriginLocation, lightThemeSegmentColor)
+        )
+        .toBeLessThan(15)
     })
   })
 

e2e/playwright/various.spec.ts

@@ -256,186 +256,181 @@ test('First escape in tool pops you out of tool, second exits sketch mode', asyn
   ).not.toBeVisible()
 })
 
-test.fixme(
-  'Basic default modeling and sketch hotkeys work',
-  async ({ page }) => {
-    const u = await getUtils(page)
+test('Basic default modeling and sketch hotkeys work', async ({ page }) => {
+  const u = await getUtils(page)
 
-    // This test can run long if it takes a little too long to load
-    // the engine.
-    test.setTimeout(90000)
-    // This test has a weird bug on ubuntu
-    // Funny, it's flaking on Windows too :). I think there is just something
-    // actually wrong.
-    test.skip(
-      process.platform === 'linux',
-      'weird playwright bug on ubuntu https://github.com/KittyCAD/modeling-app/issues/2444'
-    )
-    // Load the app with the code pane open
+  // This test can run long if it takes a little too long to load
+  // the engine.
+  test.setTimeout(90000)
+  // This test has a weird bug on ubuntu
+  test.skip(
+    process.platform === 'linux',
+    'weird playwright bug on ubuntu https://github.com/KittyCAD/modeling-app/issues/2444'
+  )
+  // Load the app with the code pane open
 
-    await test.step(`Set up test`, async () => {
-      await page.addInitScript(async () => {
-        localStorage.setItem(
-          'store',
-          JSON.stringify({
-            state: {
-              openPanes: ['code'],
-            },
-            version: 0,
-          })
-        )
-      })
-      await page.setViewportSize({ width: 1200, height: 500 })
-      await u.waitForAuthSkipAppStart()
-      await u.openDebugPanel()
-      await u.expectCmdLog('[data-message-type="execution-done"]')
-      await u.closeDebugPanel()
-    })
-
-    const codePane = page.locator('.cm-content')
-    const lineButton = page.getByRole('button', {
-      name: 'line Line',
-      exact: true,
-    })
-    const arcButton = page.getByRole('button', {
-      name: 'arc Tangential Arc',
-      exact: true,
-    })
-    const extrudeButton = page.getByRole('button', { name: 'Extrude' })
-    const commandBarComboBox = page.getByPlaceholder('Search commands')
-    const exitSketchButton = page.getByRole('button', { name: 'Exit Sketch' })
-
-    await test.step(`Type code with modeling hotkeys, shouldn't fire`, async () => {
-      await codePane.click()
-      await page.keyboard.type('//')
-      await page.keyboard.press('s')
-      await expect(commandBarComboBox).not.toBeVisible()
-      await page.keyboard.press('e')
-      await expect(commandBarComboBox).not.toBeVisible()
-      await expect(codePane).toHaveText('//se')
-    })
-
-    // Blur focus from the code editor, use the s command to sketch
-    await test.step(`Blur editor focus, enter sketch`, async () => {
-      /**
-       * TODO: There is a bug somewhere that causes this test to fail
-       * if you toggle the codePane closed before your trigger the
-       * start of the sketch.
-       * and a separate Safari-only bug that causes the test to fail
-       * if the pane is open the entire test. The maintainer of CodeMirror
-       * has pinpointed this to the unusual browser behavior:
-       * https://discuss.codemirror.net/t/how-to-force-unfocus-of-the-codemirror-element-in-safari/8095/3
-       */
-      await blurCodeEditor()
-      await page.waitForTimeout(1000)
-      await page.keyboard.press('s')
-      await page.waitForTimeout(1000)
-      await page.mouse.move(800, 300, { steps: 5 })
-      await page.mouse.click(800, 300)
-      await page.waitForTimeout(1000)
-      await expect(lineButton).toHaveAttribute('aria-pressed', 'true', {
-        timeout: 15_000,
-      })
-    })
-
-    // Use some sketch hotkeys to create a sketch (l and a for now)
-    await test.step(`Incomplete sketch with hotkeys`, async () => {
-      await test.step(`Draw a line`, async () => {
-        await page.mouse.move(700, 200, { steps: 5 })
-        await page.mouse.click(700, 200)
-        await page.mouse.move(800, 250, { steps: 5 })
-        await page.mouse.click(800, 250)
-      })
-
-      await test.step(`Unequip line tool`, async () => {
-        await page.keyboard.press('l')
-        await expect(lineButton).not.toHaveAttribute('aria-pressed', 'true')
-      })
-
-      await test.step(`Draw a tangential arc`, async () => {
-        await page.keyboard.press('a')
-        await expect(arcButton).toHaveAttribute('aria-pressed', 'true', {
-          timeout: 10_000,
+  await test.step(`Set up test`, async () => {
+    await page.addInitScript(async () => {
+      localStorage.setItem(
+        'store',
+        JSON.stringify({
+          state: {
+            openPanes: ['code'],
+          },
+          version: 0,
         })
-        await page.mouse.move(1000, 100, { steps: 5 })
-        await page.mouse.click(1000, 100)
-      })
-
-      await test.step(`Unequip with escape, equip line tool`, async () => {
-        await page.keyboard.press('Escape')
-        await page.keyboard.press('l')
-        await page.waitForTimeout(50)
-        await expect(lineButton).toHaveAttribute('aria-pressed', 'true')
-      })
+      )
     })
+    await page.setViewportSize({ width: 1200, height: 500 })
+    await u.waitForAuthSkipAppStart()
+    await u.openDebugPanel()
+    await u.expectCmdLog('[data-message-type="execution-done"]')
+    await u.closeDebugPanel()
+  })
 
-    await test.step(`Type code with sketch hotkeys, shouldn't fire`, async () => {
-      // Since there's code now, we have to get to the end of the line
-      await page.locator('.cm-line').last().click()
-      await page.keyboard.down('ControlOrMeta')
-      await page.keyboard.press('ArrowRight')
-      await page.keyboard.up('ControlOrMeta')
+  const codePane = page.locator('.cm-content')
+  const lineButton = page.getByRole('button', {
+    name: 'line Line',
+    exact: true,
+  })
+  const arcButton = page.getByRole('button', {
+    name: 'arc Tangential Arc',
+    exact: true,
+  })
+  const extrudeButton = page.getByRole('button', { name: 'Extrude' })
+  const commandBarComboBox = page.getByPlaceholder('Search commands')
+  const exitSketchButton = page.getByRole('button', { name: 'Exit Sketch' })
 
-      await page.keyboard.press('Enter')
-      await page.keyboard.type('//')
-      await page.keyboard.press('l')
-      await expect(lineButton).toHaveAttribute('aria-pressed', 'true')
-      await page.keyboard.press('a')
-      await expect(lineButton).toHaveAttribute('aria-pressed', 'true')
-      await expect(codePane).toContainText('//la')
-      await page.keyboard.press('Backspace')
-      await page.keyboard.press('Backspace')
-      await page.keyboard.press('Backspace')
-      await page.keyboard.press('Backspace')
+  await test.step(`Type code with modeling hotkeys, shouldn't fire`, async () => {
+    await codePane.click()
+    await page.keyboard.type('//')
+    await page.keyboard.press('s')
+    await expect(commandBarComboBox).not.toBeVisible()
+    await page.keyboard.press('e')
+    await expect(commandBarComboBox).not.toBeVisible()
+    await expect(codePane).toHaveText('//se')
+  })
+
+  // Blur focus from the code editor, use the s command to sketch
+  await test.step(`Blur editor focus, enter sketch`, async () => {
+    /**
+     * TODO: There is a bug somewhere that causes this test to fail
+     * if you toggle the codePane closed before your trigger the
+     * start of the sketch.
+     * and a separate Safari-only bug that causes the test to fail
+     * if the pane is open the entire test. The maintainer of CodeMirror
+     * has pinpointed this to the unusual browser behavior:
+     * https://discuss.codemirror.net/t/how-to-force-unfocus-of-the-codemirror-element-in-safari/8095/3
+     */
+    await blurCodeEditor()
+    await page.waitForTimeout(1000)
+    await page.keyboard.press('s')
+    await page.waitForTimeout(1000)
+    await page.mouse.move(800, 300, { steps: 5 })
+    await page.mouse.click(800, 300)
+    await page.waitForTimeout(1000)
+    await expect(lineButton).toHaveAttribute('aria-pressed', 'true', {
+      timeout: 15_000,
     })
+  })
 
-    await test.step(`Close profile and exit sketch`, async () => {
-      await blurCodeEditor()
+  // Use some sketch hotkeys to create a sketch (l and a for now)
+  await test.step(`Incomplete sketch with hotkeys`, async () => {
+    await test.step(`Draw a line`, async () => {
       await page.mouse.move(700, 200, { steps: 5 })
       await page.mouse.click(700, 200)
-      // On  close it will unequip the line tool.
-      await expect(lineButton).toHaveAttribute('aria-pressed', 'false')
-      await expect(exitSketchButton).toBeEnabled()
-      await page.keyboard.press('Escape')
-      await expect(
-        page.getByRole('button', { name: 'Exit Sketch' })
-      ).not.toBeVisible()
+      await page.mouse.move(800, 250, { steps: 5 })
+      await page.mouse.click(800, 250)
     })
 
-    // Extrude with e
-    await test.step(`Extrude the sketch`, async () => {
-      await page.mouse.click(750, 150)
-      await blurCodeEditor()
-      await expect(extrudeButton).toBeEnabled()
-      await page.keyboard.press('e')
-      await page.waitForTimeout(500)
-      await page.mouse.move(800, 200, { steps: 5 })
-      await page.mouse.click(800, 200)
-      await expect(page.getByRole('button', { name: 'Continue' })).toBeVisible({
-        timeout: 20_000,
+    await test.step(`Unequip line tool`, async () => {
+      await page.keyboard.press('l')
+      await expect(lineButton).not.toHaveAttribute('aria-pressed', 'true')
+    })
+
+    await test.step(`Draw a tangential arc`, async () => {
+      await page.keyboard.press('a')
+      await expect(arcButton).toHaveAttribute('aria-pressed', 'true', {
+        timeout: 10_000,
       })
-      await page.getByRole('button', { name: 'Continue' }).click()
-      await expect(
-        page.getByRole('button', { name: 'Submit command' })
-      ).toBeVisible()
-      await page.getByRole('button', { name: 'Submit command' }).click()
-      await expect(page.locator('.cm-content')).toContainText('extrude(')
+      await page.mouse.move(1000, 100, { steps: 5 })
+      await page.mouse.click(1000, 100)
     })
 
-    // await codePaneButton.click()
-    // await expect(u.codeLocator).not.toBeVisible()
-
-    /**
-     * work-around: to stop `keyboard.press()` from typing in the editor even when it should be blurred
-     */
-    async function blurCodeEditor() {
-      await page.getByRole('button', { name: 'Commands' }).click()
-      await page.waitForTimeout(100)
+    await test.step(`Unequip with escape, equip line tool`, async () => {
       await page.keyboard.press('Escape')
-      await page.waitForTimeout(100)
-    }
+      await page.keyboard.press('l')
+      await page.waitForTimeout(50)
+      await expect(lineButton).toHaveAttribute('aria-pressed', 'true')
+    })
+  })
+
+  await test.step(`Type code with sketch hotkeys, shouldn't fire`, async () => {
+    // Since there's code now, we have to get to the end of the line
+    await page.locator('.cm-line').last().click()
+    await page.keyboard.down('ControlOrMeta')
+    await page.keyboard.press('ArrowRight')
+    await page.keyboard.up('ControlOrMeta')
+
+    await page.keyboard.press('Enter')
+    await page.keyboard.type('//')
+    await page.keyboard.press('l')
+    await expect(lineButton).toHaveAttribute('aria-pressed', 'true')
+    await page.keyboard.press('a')
+    await expect(lineButton).toHaveAttribute('aria-pressed', 'true')
+    await expect(codePane).toContainText('//la')
+    await page.keyboard.press('Backspace')
+    await page.keyboard.press('Backspace')
+    await page.keyboard.press('Backspace')
+    await page.keyboard.press('Backspace')
+  })
+
+  await test.step(`Close profile and exit sketch`, async () => {
+    await blurCodeEditor()
+    await page.mouse.move(700, 200, { steps: 5 })
+    await page.mouse.click(700, 200)
+    // On  close it will unequip the line tool.
+    await expect(lineButton).toHaveAttribute('aria-pressed', 'false')
+    await expect(exitSketchButton).toBeEnabled()
+    await page.keyboard.press('Escape')
+    await expect(
+      page.getByRole('button', { name: 'Exit Sketch' })
+    ).not.toBeVisible()
+  })
+
+  // Extrude with e
+  await test.step(`Extrude the sketch`, async () => {
+    await page.mouse.click(750, 150)
+    await blurCodeEditor()
+    await expect(extrudeButton).toBeEnabled()
+    await page.keyboard.press('e')
+    await page.waitForTimeout(500)
+    await page.mouse.move(800, 200, { steps: 5 })
+    await page.mouse.click(800, 200)
+    await expect(page.getByRole('button', { name: 'Continue' })).toBeVisible({
+      timeout: 20_000,
+    })
+    await page.getByRole('button', { name: 'Continue' }).click()
+    await expect(
+      page.getByRole('button', { name: 'Submit command' })
+    ).toBeVisible()
+    await page.getByRole('button', { name: 'Submit command' }).click()
+    await expect(page.locator('.cm-content')).toContainText('extrude(')
+  })
+
+  // await codePaneButton.click()
+  // await expect(u.codeLocator).not.toBeVisible()
+
+  /**
+   * work-around: to stop `keyboard.press()` from typing in the editor even when it should be blurred
+   */
+  async function blurCodeEditor() {
+    await page.getByRole('button', { name: 'Commands' }).click()
+    await page.waitForTimeout(100)
+    await page.keyboard.press('Escape')
+    await page.waitForTimeout(100)
   }
-)
+})
 
 test('Delete key does not navigate back', async ({ page }) => {
   await page.setViewportSize({ width: 1200, height: 500 })
@@ -503,16 +498,14 @@ test('Sketch on face', async ({ page }) => {
 
   let previousCodeContent = await page.locator('.cm-content').innerText()
 
-  const center = await u.getCenterOfModelViewArea()
-
-  // This basically waits for sketch mode to be ready.
+  await u.openAndClearDebugPanel()
   await u.doAndWaitForCmd(
-    async () => page.mouse.click(center.x, 180),
+    () => page.mouse.click(625, 165),
     'default_camera_get_settings',
     true
   )
-
-  await page.waitForTimeout(300)
+  await page.waitForTimeout(150)
+  await u.closeDebugPanel()
 
   const firstClickPosition = [612, 238]
   const secondClickPosition = [661, 242]

interface.d.ts

@@ -78,7 +78,6 @@ export interface IElectronAPI {
   ) => Electron.IpcRenderer
   onUpdateError: (callback: (value: { error: Error }) => void) => Electron
   appRestart: () => void
-  getArgvParsed: () => any
 }
 
 declare global {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zoo-modeling-app",
-  "version": "0.26.5",
+  "version": "0.26.2",
   "private": true,
   "productName": "Zoo Modeling App",
   "author": {
@@ -14,7 +14,7 @@
   "dependencies": {
     "@codemirror/autocomplete": "^6.17.0",
     "@codemirror/commands": "^6.6.0",
-    "@codemirror/language": "^6.10.3",
+    "@codemirror/language": "^6.10.2",
     "@codemirror/lint": "^6.8.1",
     "@codemirror/search": "^6.5.6",
     "@codemirror/state": "^6.4.1",
@@ -40,7 +40,7 @@
     "codemirror": "^6.0.1",
     "decamelize": "^6.0.0",
     "electron-squirrel-startup": "^1.0.1",
-    "electron-updater": "^6.3.9",
+    "electron-updater": "^6.3.0",
     "fuse.js": "^7.0.0",
     "html2canvas-pro": "^1.5.8",
     "isomorphic-fetch": "^3.0.0",
@@ -60,13 +60,12 @@
     "sketch-helpers": "^0.0.4",
     "three": "^0.166.1",
     "ua-parser-js": "^1.0.37",
-    "uuid": "^11.0.2",
+    "uuid": "^9.0.1",
     "vscode-jsonrpc": "^8.2.1",
     "vscode-languageserver-protocol": "^3.17.5",
     "vscode-uri": "^3.0.8",
     "web-vitals": "^3.5.2",
-    "xstate": "^5.17.4",
-    "yargs": "^17.7.2"
+    "xstate": "^5.17.4"
   },
   "scripts": {
     "start": "vite",
@@ -106,8 +105,7 @@
     "tronb:package": "electron-builder --config electron-builder.yml",
     "test-setup": "yarn install && yarn build:wasm",
     "test": "vitest --mode development",
-    "test:unit": "vitest run --mode development --exclude **/kclSamples.test.ts",
-    "test:unit:kcl-samples": "vitest run --mode development ./src/lang/kclSamples.test.ts",
+    "test:unit": "vitest run --mode development",
     "test:playwright:browser:chrome": "playwright test --project='Google Chrome' --config=playwright.ci.config.ts --grep-invert='@snapshot|@electron'",
     "test:playwright:browser:chrome:windows": "playwright test --project=\"Google Chrome\" --config=playwright.ci.config.ts --grep-invert=\"@snapshot|@electron|@skipWin\"",
     "test:playwright:browser:chrome:ubuntu": "playwright test --project='Google Chrome' --config=playwright.ci.config.ts --grep-invert='@snapshot|@electron|@skipLinux'",
@@ -119,8 +117,7 @@
     "test:playwright:electron:windows:local": "yarn tron:package && NODE_ENV=development playwright test --config=playwright.electron.config.ts --grep=@electron --grep-invert=@skipWin",
     "test:playwright:electron:macos:local": "yarn tron:package && NODE_ENV=development playwright test --config=playwright.electron.config.ts --grep=@electron --grep-invert=@skipMacos",
     "test:playwright:electron:ubuntu:local": "yarn tron:package && NODE_ENV=development playwright test --config=playwright.electron.config.ts --grep=@electron --grep-invert=@skipLinux",
-    "test:unit:local": "yarn simpleserver:bg && yarn test:unit; kill-port 3000",
-    "test:unit:kcl-samples:local": "yarn simpleserver:bg && yarn test:unit:kcl-samples; kill-port 3000"
+    "test:unit:local": "yarn simpleserver:bg && yarn test:unit; kill-port 3000"
   },
   "prettier": {
     "trailingComma": "es5",
@@ -147,8 +144,8 @@
     "@electron-forge/maker-deb": "^7.4.0",
     "@electron-forge/maker-rpm": "^7.4.0",
     "@electron-forge/maker-squirrel": "^7.4.0",
-    "@electron-forge/maker-wix": "^7.5.0",
-    "@electron-forge/maker-zip": "^7.5.0",
+    "@electron-forge/maker-wix": "^7.4.0",
+    "@electron-forge/maker-zip": "^7.4.0",
     "@electron-forge/plugin-auto-unpack-natives": "^7.4.0",
     "@electron-forge/plugin-fuses": "^7.4.0",
     "@electron-forge/plugin-vite": "^7.4.0",
@@ -174,7 +171,7 @@
     "@types/ua-parser-js": "^0.7.39",
     "@types/uuid": "^9.0.8",
     "@types/wicg-file-system-access": "^2023.10.5",
-    "@types/ws": "^8.5.13",
+    "@types/ws": "^8.5.10",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
     "@typescript-eslint/parser": "^5.0.0",
     "@vitejs/plugin-react": "^4.3.0",
@@ -190,7 +187,7 @@
     "eslint-plugin-css-modules": "^2.12.0",
     "eslint-plugin-import": "^2.30.0",
     "eslint-plugin-suggest-no-throw": "^1.0.0",
-    "happy-dom": "^15.10.2",
+    "happy-dom": "^14.3.10",
     "http-server": "^14.1.1",
     "husky": "^9.1.5",
     "kill-port": "^2.0.1",

src/App.tsx

@@ -1,14 +1,15 @@
 import { useEffect, useMemo, useRef } from 'react'
 import { useHotKeyListener } from './hooks/useHotKeyListener'
+import { Stream } from './components/Stream'
 import { AppHeader } from './components/AppHeader'
 import { useHotkeys } from 'react-hotkeys-hook'
-import { useLoaderData, useNavigate, useSearchParams } from 'react-router-dom'
+import { useLoaderData, useNavigate } from 'react-router-dom'
 import { type IndexLoaderData } from 'lib/types'
 import { PATHS } from 'lib/paths'
 import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
 import { onboardingPaths } from 'routes/Onboarding/paths'
 import { useEngineConnectionSubscriptions } from 'hooks/useEngineConnectionSubscriptions'
-import { codeManager, engineCommandManager, sceneInfra } from 'lib/singletons'
+import { codeManager, engineCommandManager } from 'lib/singletons'
 import { useAbsoluteFilePath } from 'hooks/useAbsoluteFilePath'
 import { isDesktop } from 'lib/isDesktop'
 import { useLspContext } from 'components/LspProvider'
@@ -21,12 +22,6 @@ import Gizmo from 'components/Gizmo'
 import { CoreDumpManager } from 'lib/coredump'
 import { UnitsMenu } from 'components/UnitsMenu'
 import { CameraProjectionToggle } from 'components/CameraProjectionToggle'
-import EngineStreamContext from 'hooks/useEngineStreamContext'
-import { EngineStream } from 'components/EngineStream'
-import { maybeWriteToDisk } from 'lib/telemetry'
-maybeWriteToDisk()
-  .then(() => {})
-  .catch(() => {})
 
 export function App() {
   const { project, file } = useLoaderData() as IndexLoaderData
@@ -38,13 +33,6 @@ export function App() {
   // the coredump.
   const ref = useRef<HTMLDivElement>(null)
 
-  // Stream related refs and data
-  const videoRef = useRef<HTMLVideoElement>(null)
-  const canvasRef = useRef<HTMLCanvasElement>(null)
-  const modelingSidebarRef = useRef<HTMLUListElement>(null)
-  let [searchParams] = useSearchParams()
-  const pool = searchParams.get('pool')
-
   const projectName = project?.name || null
   const projectPath = project?.path || null
   useEffect(() => {
@@ -65,10 +53,6 @@ export function App() {
     app: { onboardingStatus },
   } = settings.context
 
-  useEffect(() => {
-    sceneInfra.camControls.modelingSidebarRef = modelingSidebarRef
-  }, [modelingSidebarRef.current])
-
   useHotkeys('backspace', (e) => {
     e.preventDefault()
   })
@@ -96,26 +80,14 @@ export function App() {
         enableMenu={true}
       />
       <ModalContainer />
-      <ModelingSidebar paneOpacity={paneOpacity} ref={modelingSidebarRef} />
-      <EngineStreamContext.Provider
-        options={{
-          input: {
-            videoRef,
-            canvasRef,
-            mediaStream: null,
-            authToken: auth?.context?.token ?? null,
-            pool,
-          },
-        }}
-      >
-        <EngineStream />
-        {/* <CamToggle /> */}
-        <LowerRightControls coreDumpManager={coreDumpManager}>
-          <UnitsMenu />
-          <Gizmo />
-          <CameraProjectionToggle />
-        </LowerRightControls>
-      </EngineStreamContext.Provider>
+      <ModelingSidebar paneOpacity={paneOpacity} />
+      <Stream />
+      {/* <CamToggle /> */}
+      <LowerRightControls coreDumpManager={coreDumpManager}>
+        <UnitsMenu />
+        <Gizmo />
+        <CameraProjectionToggle />
+      </LowerRightControls>
     </div>
   )
 }

src/Router.tsx

@@ -8,7 +8,6 @@ import {
 } from 'react-router-dom'
 import { ErrorPage } from './components/ErrorPage'
 import { Settings } from './routes/Settings'
-import { Telemetry } from './routes/Telemetry'
 import Onboarding, { onboardingRoutes } from './routes/Onboarding'
 import SignIn from './routes/SignIn'
 import { Auth } from './Auth'
@@ -29,7 +28,6 @@ import {
   homeLoader,
   onboardingRedirectLoader,
   settingsLoader,
-  telemetryLoader,
 } from 'lib/routeLoaders'
 import { CommandBarProvider } from 'components/CommandBar/CommandBarProvider'
 import SettingsAuthProvider from 'components/SettingsAuthProvider'
@@ -45,7 +43,6 @@ import { coreDump } from 'lang/wasm'
 import { useMemo } from 'react'
 import { AppStateProvider } from 'AppState'
 import { reportRejection } from 'lib/trap'
-import { RouteProvider } from 'components/RouteProvider'
 import { ProjectsContextProvider } from 'components/ProjectsContextProvider'
 
 const createRouter = isDesktop() ? createHashRouter : createBrowserRouter
@@ -59,21 +56,19 @@ const router = createRouter([
      * inefficient re-renders, use the react profiler to see. */
     element: (
       <CommandBarProvider>
-        <RouteProvider>
-          <SettingsAuthProvider>
-            <LspProvider>
-              <ProjectsContextProvider>
-                <KclContextProvider>
-                  <AppStateProvider>
-                    <MachineManagerProvider>
-                      <Outlet />
-                    </MachineManagerProvider>
-                  </AppStateProvider>
-                </KclContextProvider>
-              </ProjectsContextProvider>
-            </LspProvider>
-          </SettingsAuthProvider>
-        </RouteProvider>
+        <SettingsAuthProvider>
+          <LspProvider>
+            <ProjectsContextProvider>
+              <KclContextProvider>
+                <AppStateProvider>
+                  <MachineManagerProvider>
+                    <Outlet />
+                  </MachineManagerProvider>
+                </AppStateProvider>
+              </KclContextProvider>
+            </ProjectsContextProvider>
+          </LspProvider>
+        </SettingsAuthProvider>
       </CommandBarProvider>
     ),
     errorElement: <ErrorPage />,
@@ -129,16 +124,6 @@ const router = createRouter([
               },
             ],
           },
-          {
-            id: PATHS.FILE + 'TELEMETRY',
-            loader: telemetryLoader,
-            children: [
-              {
-                path: makeUrlPathRelative(PATHS.TELEMETRY),
-                element: <Telemetry />,
-              },
-            ],
-          },
         ],
       },
       {
@@ -164,11 +149,6 @@ const router = createRouter([
             loader: settingsLoader,
             element: <Settings />,
           },
-          {
-            path: makeUrlPathRelative(PATHS.TELEMETRY),
-            loader: telemetryLoader,
-            element: <Telemetry />,
-          },
         ],
       },
       {

src/Toolbar.tsx

@@ -22,7 +22,6 @@ import {
 } from 'lib/toolbar'
 import { isDesktop } from 'lib/isDesktop'
 import { openExternalBrowserIfDesktop } from 'lib/openWindow'
-import { EngineConnectionStateType } from 'lang/std/engineConnection'
 
 export function Toolbar({
   className = '',
@@ -49,7 +48,7 @@ export function Toolbar({
   }, [engineCommandManager.artifactGraph, context.selectionRanges])
 
   const toolbarButtonsRef = useRef<HTMLUListElement>(null)
-  const { overallState, immediateState } = useNetworkContext()
+  const { overallState } = useNetworkContext()
   const { isExecuting } = useKclContext()
   const { isStreamReady } = useAppState()
 
@@ -57,7 +56,6 @@ export function Toolbar({
     (overallState !== NetworkHealthState.Ok &&
       overallState !== NetworkHealthState.Weak) ||
     isExecuting ||
-    immediateState.type !== EngineConnectionStateType.ConnectionEstablished ||
     !isStreamReady
 
   const currentMode =

src/clientSideScene/CameraControls.ts

@@ -1,5 +1,3 @@
-import { Models } from '@kittycad/lib'
-import { MutableRefObject } from 'react'
 import { cameraMouseDragGuards, MouseGuard } from 'lib/cameraControls'
 import {
   Euler,
@@ -89,9 +87,6 @@ class CameraRateLimiter {
 
 export class CameraControls {
   engineCommandManager: EngineCommandManager
-  modelingSidebarRef: MutableRefObject<HTMLUListElement | null> = {
-    current: null,
-  }
   syncDirection: 'clientToEngine' | 'engineToClient' = 'engineToClient'
   camera: PerspectiveCamera | OrthographicCamera
   target: Vector3
@@ -100,13 +95,6 @@ export class CameraControls {
   wasDragging: boolean
   mouseDownPosition: Vector2
   mouseNewPosition: Vector2
-  cameraDragStartXY = new Vector2()
-  old:
-    | {
-        camera: PerspectiveCamera | OrthographicCamera
-        target: Vector3
-      }
-    | undefined
   rotationSpeed = 0.3
   enableRotate = true
   enablePan = true
@@ -473,7 +461,6 @@ export class CameraControls {
     if (this.syncDirection === 'engineToClient') {
       const interaction = this.getInteractionType(event)
       if (interaction === 'none') return
-
       void this.engineCommandManager.sendSceneCommand({
         type: 'modeling_cmd_req',
         cmd: {
@@ -922,123 +909,18 @@ export class CameraControls {
         up: { x: 0, y: 0, z: 1 },
       },
     })
-
-    await this.centerModelRelativeToPanes({
-      zoomToFit: true,
-      resetLastPaneWidth: true,
-    })
-
-    this.cameraDragStartXY = new Vector2()
-    this.cameraDragStartXY.x = 0
-    this.cameraDragStartXY.y = 0
-  }
-
-  async restoreCameraPosition(): Promise<void> {
-    if (!this.old) return
-
-    this.camera = this.old.camera.clone()
-    this.target = this.old.target.clone()
-
-    void this.engineCommandManager.sendSceneCommand({
+    await this.engineCommandManager.sendSceneCommand({
       type: 'modeling_cmd_req',
       cmd_id: uuidv4(),
       cmd: {
-        type: 'default_camera_look_at',
-        ...convertThreeCamValuesToEngineCam({
-          isPerspective: true,
-          position: this.camera.position,
-          quaternion: this.camera.quaternion,
-          zoom: this.camera.zoom,
-          target: this.target,
-        }),
+        type: 'zoom_to_fit',
+        object_ids: [], // leave empty to zoom to all objects
+        padding: 0.2, // padding around the objects
+        animated: false, // don't animate the zoom for now
       },
     })
   }
 
-  private lastFramePaneWidth: number = 0
-
-  async centerModelRelativeToPanes(args?: {
-    zoomObjectId?: string
-    zoomToFit?: boolean
-    resetLastPaneWidth?: boolean
-  }): Promise<void> {
-    const panes = this.modelingSidebarRef?.current
-    if (!panes) return
-
-    const panesWidth = panes.offsetWidth + panes.offsetLeft
-
-    if (args?.resetLastPaneWidth) {
-      this.lastFramePaneWidth = 0
-    }
-
-    const goPx =
-      (panesWidth - this.lastFramePaneWidth) / 2 / window.devicePixelRatio
-    this.lastFramePaneWidth = panesWidth
-
-    // Originally I had tried to use the default_camera_look_at endpoint and
-    // some quaternion math to move the camera right, but it ended up being
-    // overly complicated, and I think the threejs scene also doesn't have the
-    // camera coordinates after a zoom-to-fit... So this is much easier, and
-    // maps better to screen coordinates.
-
-    const requests: Models['ModelingCmdReq_type'][] = [
-      {
-        cmd: {
-          type: 'camera_drag_start',
-          interaction: 'pan',
-          window: { x: goPx < 0 ? -goPx : 0, y: 0 },
-        },
-        cmd_id: uuidv4(),
-      },
-      {
-        cmd: {
-          type: 'camera_drag_move',
-          interaction: 'pan',
-          window: {
-            x: goPx < 0 ? 0 : goPx,
-            y: 0,
-          },
-        },
-        cmd_id: uuidv4(),
-      },
-    ]
-
-    if (args?.zoomToFit) {
-      requests.unshift({
-        cmd: {
-          type: 'zoom_to_fit',
-          object_ids: args?.zoomObjectId ? [args?.zoomObjectId] : [], // leave empty to zoom to all objects
-          padding: 0.2, // padding around the objects
-        },
-        cmd_id: uuidv4(),
-      })
-    }
-
-    await this.engineCommandManager
-      .sendSceneCommand({
-        type: 'modeling_cmd_batch_req',
-        batch_id: uuidv4(),
-        responses: true,
-        requests,
-      })
-      // engineCommandManager can't subscribe to batch responses so we'll send
-      // this one off by its lonesome after.
-      .then(() =>
-        this.engineCommandManager.sendSceneCommand({
-          type: 'modeling_cmd_req',
-          cmd: {
-            type: 'camera_drag_end',
-            interaction: 'pan',
-            window: {
-              x: goPx < 0 ? 0 : goPx,
-              y: 0,
-            },
-          },
-          cmd_id: uuidv4(),
-        })
-      )
-  }
-
   async tweenCameraToQuaternion(
     targetQuaternion: Quaternion,
     targetPosition = new Vector3(),

src/clientSideScene/ClientSideSceneComp.tsx

@@ -1,11 +1,4 @@
-import {
-  CSSProperties,
-  useRef,
-  useEffect,
-  useState,
-  useMemo,
-  Fragment,
-} from 'react'
+import { useRef, useEffect, useState, useMemo, Fragment } from 'react'
 import { useModelingContext } from 'hooks/useModelingContext'
 
 import { cameraMouseDragGuards } from 'lib/cameraControls'
@@ -209,20 +202,12 @@ const Overlay = ({
   let xAlignment = overlay.angle < 0 ? '0%' : '-100%'
   let yAlignment = overlay.angle < -90 || overlay.angle >= 90 ? '0%' : '-100%'
 
-  // It's possible for the pathToNode to request a newer AST node
-  // than what's available in the AST at the moment of query.
-  // It eventually settles on being updated.
   const _node1 = getNodeFromPath<Node<CallExpression>>(
     kclManager.ast,
     overlay.pathToNode,
     'CallExpression'
   )
-
-  // For that reason, to prevent console noise, we do not use err here.
-  if (_node1 instanceof Error) {
-    console.warn('ast older than pathToNode, not fatal, eventually settles', '')
-    return
-  }
+  if (err(_node1)) return
   const callExpression = _node1.node
 
   const constraints = getConstraintInfo(
@@ -249,13 +234,6 @@ const Overlay = ({
       state.matches({ Sketch: 'Rectangle tool' })
     )
 
-  // Line labels will cover the constraints overlay if this is not used.
-  // For each line label, ThreeJS increments each CSS2DObject z-index as they
-  // are added. I have looked into overriding renderOrder and depthTest and
-  // while renderOrder is set, ThreeJS still sets z-index on these 2D objects.
-  // It is easier to set this to a large number, such as a billion.
-  const zIndex = 1000000000
-
   return (
     <div className={`absolute w-0 h-0`}>
       <div
@@ -266,7 +244,6 @@ const Overlay = ({
         data-overlay-angle={overlay.angle}
         className="pointer-events-auto absolute w-0 h-0"
         style={{
-          zIndex,
           transform: `translate3d(${overlay.windowCoords[0]}px, ${overlay.windowCoords[1]}px, 0)`,
         }}
       ></div>
@@ -275,7 +252,6 @@ const Overlay = ({
           data-overlay-toolbar-index={overlayIndex}
           className={`px-0 pointer-events-auto absolute flex gap-1`}
           style={{
-            zIndex,
             transform: `translate3d(calc(${
               overlay.windowCoords[0] + xOffset
             }px + ${xAlignment}), calc(${
@@ -317,7 +293,6 @@ const Overlay = ({
           */}
           {callExpression?.callee?.name !== 'circle' && (
             <SegmentMenu
-              style={{ zIndex }}
               verticalPosition={
                 overlay.windowCoords[1] > window.innerHeight / 2
                   ? 'top'
@@ -459,17 +434,15 @@ const SegmentMenu = ({
   verticalPosition,
   pathToNode,
   stdLibFnName,
-  style,
 }: {
   verticalPosition: 'top' | 'bottom'
   pathToNode: PathToNode
   stdLibFnName: string
-  style?: CSSProperties
 }) => {
   const { send } = useModelingContext()
   const dependentSourceRanges = findUsesOfTagInPipe(kclManager.ast, pathToNode)
   return (
-    <Popover style={style} className="relative">
+    <Popover className="relative">
       {({ open }) => (
         <>
           <Popover.Button
@@ -664,16 +637,10 @@ const ConstraintSymbol = ({
                 kclManager.ast,
                 kclManager.programMemory
               )
-
               if (!transform) return
               const { modifiedAst } = transform
-
-              await kclManager.updateAst(modifiedAst, true)
-
-              // Code editor will be updated in the modelingMachine.
-              const newCode = recast(modifiedAst)
-              if (err(newCode)) return
-              await codeManager.updateCodeEditor(newCode)
+              // eslint-disable-next-line @typescript-eslint/no-floating-promises
+              kclManager.updateAst(modifiedAst, true)
             } catch (e) {
               console.log('error', e)
             }

src/clientSideScene/constants.ts

@@ -1,22 +0,0 @@
-// 63.5 is definitely a bit of a magic number, play with it until it looked right
-// if it were 64, that would feel like it's something in the engine where a random
-// power of 2 is used, but it's the 0.5 seems to make things look much more correct
-export const ZOOM_MAGIC_NUMBER = 63.5
-
-export const INTERSECTION_PLANE_LAYER = 1
-export const SKETCH_LAYER = 2
-
-export const RAYCASTABLE_PLANE = 'raycastable-plane'
-
-// redundant types so that it can be changed temporarily but CI will catch the wrong type
-export const DEBUG_SHOW_INTERSECTION_PLANE: false = false
-export const DEBUG_SHOW_BOTH_SCENES: false = false
-
-export const X_AXIS = 'xAxis'
-export const Y_AXIS = 'yAxis'
-export const AXIS_GROUP = 'axisGroup'
-export const SKETCH_GROUP_SEGMENTS = 'sketch-group-segments'
-export const ARROWHEAD = 'arrowhead'
-export const SEGMENT_LENGTH_LABEL = 'segment-length-label'
-export const SEGMENT_LENGTH_LABEL_TEXT = 'segment-length-label-text'
-export const SEGMENT_LENGTH_LABEL_OFFSET_PX = 30

src/clientSideScene/helpers.ts

@@ -2,7 +2,10 @@ import { compareVec2Epsilon2 } from 'lang/std/sketch'
 import {
   GridHelper,
   LineBasicMaterial,
+  OrthographicCamera,
   PerspectiveCamera,
+  Group,
+  Mesh,
   Quaternion,
   Vector3,
 } from 'three'
@@ -25,9 +28,15 @@ export function createGridHelper({
   gridHelper.rotation.x = Math.PI / 2
   return gridHelper
 }
+const fudgeFactor = 72.66985970437086
 
-// Re-export scale.ts
-export * from './scale'
+export const orthoScale = (cam: OrthographicCamera | PerspectiveCamera) =>
+  (0.55 * fudgeFactor) / cam.zoom / window.innerHeight
+
+export const perspScale = (cam: PerspectiveCamera, group: Group | Mesh) =>
+  (group.position.distanceTo(cam.position) * cam.fov * fudgeFactor) /
+  4000 /
+  window.innerHeight
 
 export function isQuaternionVertical(q: Quaternion) {
   const v = new Vector3(0, 0, 1).applyQuaternion(q)

src/clientSideScene/scale.ts

@@ -1,17 +0,0 @@
-import { OrthographicCamera, PerspectiveCamera, Group, Mesh } from 'three'
-
-export const fudgeFactor = 72.66985970437086
-
-export const orthoScale = (
-  cam: OrthographicCamera | PerspectiveCamera,
-  innerHeight?: number
-) => (0.55 * fudgeFactor) / cam.zoom / (innerHeight ?? window.innerHeight)
-
-export const perspScale = (
-  cam: PerspectiveCamera,
-  group: Group | Mesh,
-  innerHeight?: number
-) =>
-  (group.position.distanceTo(cam.position) * cam.fov * fudgeFactor) /
-  4000 /
-  (innerHeight ?? window.innerHeight)

src/clientSideScene/sceneEntities.ts

@@ -17,7 +17,6 @@ import {
   Vector3,
 } from 'three'
 import {
-  ANGLE_SNAP_THRESHOLD_DEGREES,
   ARROWHEAD,
   AXIS_GROUP,
   DRAFT_POINT,
@@ -96,7 +95,6 @@ import { CSS2DObject } from 'three/examples/jsm/renderers/CSS2DRenderer'
 import { Point3d } from 'wasm-lib/kcl/bindings/Point3d'
 import { SegmentInputs } from 'lang/std/stdTypes'
 import { Node } from 'wasm-lib/kcl/bindings/Node'
-import { radToDeg } from 'three/src/math/MathUtils'
 
 type DraftSegment = 'line' | 'tangentialArcTo'
 
@@ -453,7 +451,6 @@ export class SceneEntities {
         const { modifiedAst } = addStartProfileAtRes
 
         await kclManager.updateAst(modifiedAst, false)
-
         this.removeIntersectionPlane()
         this.scene.remove(draftPointGroup)
 
@@ -686,7 +683,7 @@ export class SceneEntities {
     })
     return nextAst
   }
-  setupDraftSegment = async (
+  setUpDraftSegment = async (
     sketchPathToNode: PathToNode,
     forward: [number, number, number],
     up: [number, number, number],
@@ -801,24 +798,11 @@ export class SceneEntities {
             (sceneObject) => sceneObject.object.name === X_AXIS
           )
 
-          const lastSegment = sketch.paths.slice(-1)[0] || sketch.start
+          const lastSegment = sketch.paths.slice(-1)[0]
           const snappedPoint = {
             x: intersectsYAxis ? 0 : intersection2d.x,
             y: intersectsXAxis ? 0 : intersection2d.y,
           }
-          // Get the angle between the previous segment (or sketch start)'s end and this one's
-          const angle = Math.atan2(
-            snappedPoint.y - lastSegment.to[1],
-            snappedPoint.x - lastSegment.to[0]
-          )
-
-          const isHorizontal =
-            radToDeg(Math.abs(angle)) < ANGLE_SNAP_THRESHOLD_DEGREES ||
-            Math.abs(radToDeg(Math.abs(angle) - Math.PI)) <
-              ANGLE_SNAP_THRESHOLD_DEGREES
-          const isVertical =
-            Math.abs(radToDeg(Math.abs(angle) - Math.PI / 2)) <
-            ANGLE_SNAP_THRESHOLD_DEGREES
 
           let resolvedFunctionName: ToolTip = 'line'
 
@@ -826,12 +810,6 @@ export class SceneEntities {
           // case-based logic for different segment types
           if (lastSegment.type === 'TangentialArcTo') {
             resolvedFunctionName = 'tangentialArcTo'
-          } else if (isHorizontal) {
-            // If the angle between is 0 or 180 degrees (+/- the snapping angle), make the line an xLine
-            resolvedFunctionName = 'xLine'
-          } else if (isVertical) {
-            // If the angle between is 90 or 270 degrees (+/- the snapping angle), make the line a yLine
-            resolvedFunctionName = 'yLine'
           } else if (snappedPoint.x === 0 || snappedPoint.y === 0) {
             // We consider a point placed on axes or origin to be absolute
             resolvedFunctionName = 'lineTo'
@@ -857,11 +835,10 @@ export class SceneEntities {
         }
 
         await kclManager.executeAstMock(modifiedAst)
-
         if (intersectsProfileStart) {
           sceneInfra.modelingSend({ type: 'CancelSketch' })
         } else {
-          await this.setupDraftSegment(
+          await this.setUpDraftSegment(
             sketchPathToNode,
             forward,
             up,
@@ -869,8 +846,6 @@ export class SceneEntities {
             segmentName
           )
         }
-
-        await codeManager.updateEditorWithAstAndWriteToFile(modifiedAst)
       },
       onMove: (args) => {
         this.onDragSegment({
@@ -995,51 +970,43 @@ export class SceneEntities {
         if (trap(_node)) return
         const sketchInit = _node.node?.declarations?.[0]?.init
 
-        if (sketchInit.type !== 'PipeExpression') {
-          return
+        if (sketchInit.type === 'PipeExpression') {
+          updateRectangleSketch(sketchInit, x, y, tags[0])
+
+          let _recastAst = parse(recast(_ast))
+          if (trap(_recastAst)) return
+          _ast = _recastAst
+
+          // Update the primary AST and unequip the rectangle tool
+          await kclManager.executeAstMock(_ast)
+          sceneInfra.modelingSend({ type: 'Finish rectangle' })
+
+          const { execState } = await executeAst({
+            ast: _ast,
+            useFakeExecutor: true,
+            engineCommandManager: this.engineCommandManager,
+            programMemoryOverride,
+            idGenerator: kclManager.execState.idGenerator,
+          })
+          const programMemory = execState.memory
+
+          // Prepare to update the THREEjs scene
+          this.sceneProgramMemory = programMemory
+          const sketch = sketchFromKclValue(
+            programMemory.get(variableDeclarationName),
+            variableDeclarationName
+          )
+          if (err(sketch)) return
+          const sgPaths = sketch.paths
+          const orthoFactor = orthoScale(sceneInfra.camControls.camera)
+
+          // Update the starting segment of the THREEjs scene
+          this.updateSegment(sketch.start, 0, 0, _ast, orthoFactor, sketch)
+          // Update the rest of the segments of the THREEjs scene
+          sgPaths.forEach((seg, index) =>
+            this.updateSegment(seg, index, 0, _ast, orthoFactor, sketch)
+          )
         }
-
-        updateRectangleSketch(sketchInit, x, y, tags[0])
-
-        const newCode = recast(_ast)
-        let _recastAst = parse(newCode)
-        if (trap(_recastAst)) return
-        _ast = _recastAst
-
-        // Update the primary AST and unequip the rectangle tool
-        await kclManager.executeAstMock(_ast)
-        sceneInfra.modelingSend({ type: 'Finish rectangle' })
-
-        // lee: I had this at the bottom of the function, but it's
-        // possible sketchFromKclValue "fails" when sketching on a face,
-        // and this couldn't wouldn't run.
-        await codeManager.updateEditorWithAstAndWriteToFile(_ast)
-
-        const { execState } = await executeAst({
-          ast: _ast,
-          useFakeExecutor: true,
-          engineCommandManager: this.engineCommandManager,
-          programMemoryOverride,
-          idGenerator: kclManager.execState.idGenerator,
-        })
-        const programMemory = execState.memory
-
-        // Prepare to update the THREEjs scene
-        this.sceneProgramMemory = programMemory
-        const sketch = sketchFromKclValue(
-          programMemory.get(variableDeclarationName),
-          variableDeclarationName
-        )
-        if (err(sketch)) return
-        const sgPaths = sketch.paths
-        const orthoFactor = orthoScale(sceneInfra.camControls.camera)
-
-        // Update the starting segment of the THREEjs scene
-        this.updateSegment(sketch.start, 0, 0, _ast, orthoFactor, sketch)
-        // Update the rest of the segments of the THREEjs scene
-        sgPaths.forEach((seg, index) =>
-          this.updateSegment(seg, index, 0, _ast, orthoFactor, sketch)
-        )
       },
     })
   }
@@ -1199,17 +1166,13 @@ export class SceneEntities {
           if (err(moddedResult)) return
           modded = moddedResult.modifiedAst
 
-          const newCode = recast(modded)
-          if (err(newCode)) return
-          let _recastAst = parse(newCode)
+          let _recastAst = parse(recast(modded))
           if (trap(_recastAst)) return Promise.reject(_recastAst)
           _ast = _recastAst
 
           // Update the primary AST and unequip the rectangle tool
           await kclManager.executeAstMock(_ast)
           sceneInfra.modelingSend({ type: 'Finish circle' })
-
-          await codeManager.updateEditorWithAstAndWriteToFile(_ast)
         }
       },
     })
@@ -1245,7 +1208,6 @@ export class SceneEntities {
             forward,
             position,
           })
-          await codeManager.writeToFile()
         }
       },
       onDrag: async ({

src/clientSideScene/sceneInfra.ts

@@ -50,8 +50,6 @@ export const RAYCASTABLE_PLANE = 'raycastable-plane'
 
 export const X_AXIS = 'xAxis'
 export const Y_AXIS = 'yAxis'
-/** If a segment angle is less than this many degrees off a meanginful angle it'll snap to it */
-export const ANGLE_SNAP_THRESHOLD_DEGREES = 3
 /** the THREEjs representation of the group surrounding a "snapped" point that is not yet placed */
 export const DRAFT_POINT_GROUP = 'draft-point-group'
 /** the THREEjs representation of a "snapped" point that is not yet placed */
@@ -291,14 +289,14 @@ export class SceneInfra {
       engineCommandManager
     )
     this.camControls.subscribeToCamChange(() => this.onCameraChange())
-    this.camControls.camera.layers.enable(constants.SKETCH_LAYER)
-    if (constants.DEBUG_SHOW_INTERSECTION_PLANE)
-      this.camControls.camera.layers.enable(constants.INTERSECTION_PLANE_LAYER)
+    this.camControls.camera.layers.enable(SKETCH_LAYER)
+    if (DEBUG_SHOW_INTERSECTION_PLANE)
+      this.camControls.camera.layers.enable(INTERSECTION_PLANE_LAYER)
 
     // RAYCASTERS
-    this.raycaster.layers.enable(constants.SKETCH_LAYER)
+    this.raycaster.layers.enable(SKETCH_LAYER)
     this.raycaster.layers.disable(0)
-    this.planeRaycaster.layers.enable(constants.INTERSECTION_PLANE_LAYER)
+    this.planeRaycaster.layers.enable(INTERSECTION_PLANE_LAYER)
 
     // GRID
     const size = 100
@@ -333,7 +331,7 @@ export class SceneInfra {
       this.camControls.target
     )
     const axisGroup = this.scene
-      .getObjectByName(constants.AXIS_GROUP)
+      .getObjectByName(AXIS_GROUP)
       ?.getObjectByName('gridHelper')
     axisGroup?.name === 'gridHelper' && axisGroup.scale.set(scale, scale, scale)
   }
@@ -344,6 +342,7 @@ export class SceneInfra {
   }
 
   animate = () => {
+    requestAnimationFrame(this.animate)
     TWEEN.update() // This will update all tweens during the animation loop
     if (!this.isFovAnimationInProgress) {
       // console.log('animation frame', this.cameraControls.camera)
@@ -351,7 +350,6 @@ export class SceneInfra {
       this.renderer.render(this.scene, this.camControls.camera)
       this.labelRenderer.render(this.scene, this.camControls.camera)
     }
-    requestAnimationFrame(this.animate)
   }
 
   dispose = () => {
@@ -655,11 +653,11 @@ export class SceneInfra {
   }
   updateOtherSelectionColors = (otherSelections: Axis[]) => {
     const axisGroup = this.scene.children.find(
-      ({ userData }) => userData?.type === constants.AXIS_GROUP
+      ({ userData }) => userData?.type === AXIS_GROUP
     )
     const axisMap: { [key: string]: Axis } = {
-      [constants.X_AXIS]: 'x-axis',
-      [constants.Y_AXIS]: 'y-axis',
+      [X_AXIS]: 'x-axis',
+      [Y_AXIS]: 'y-axis',
     }
     axisGroup?.children.forEach((_mesh) => {
       const mesh = _mesh as Mesh

src/clientSideScene/segments.ts

@@ -300,7 +300,7 @@ class StraightSegment implements SegmentUtils {
       sceneInfra.updateOverlayDetails({
         arrowGroup,
         group,
-        isHandlesVisible: true,
+        isHandlesVisible,
         from,
         to,
       })
@@ -476,7 +476,7 @@ class TangentialArcToSegment implements SegmentUtils {
       sceneInfra.updateOverlayDetails({
         arrowGroup,
         group,
-        isHandlesVisible: true,
+        isHandlesVisible,
         from,
         to,
         angle,
@@ -542,7 +542,7 @@ class CircleSegment implements SegmentUtils {
     }
     group.name = CIRCLE_SEGMENT
 
-    group.add(arcMesh, arrowGroup, circleCenterGroup)
+    group.add(arcMesh, arrowGroup, circleCenterGroup, radiusIndicatorGroup)
     const updateOverlaysCallback = this.update({
       prevSegment,
       input,
@@ -677,7 +677,7 @@ class CircleSegment implements SegmentUtils {
       sceneInfra.updateOverlayDetails({
         arrowGroup,
         group,
-        isHandlesVisible: true,
+        isHandlesVisible,
         from: from,
         to: [center[0], center[1]],
         angle: Math.PI / 4,

src/commandLineArgs.ts

@@ -1,12 +0,0 @@
-import yargs from 'yargs'
-import { hideBin } from 'yargs/helpers'
-
-const argv = yargs(hideBin(process.argv))
-  .option('telemetry', {
-    alias: 't',
-    type: 'boolean',
-    description: 'Writes startup telemetry to file on disk.',
-  })
-  .parse()
-
-export default argv

src/components/AvailableVarsHelpers.tsx

@@ -145,7 +145,7 @@ export function useCalc({
       const _programMem: ProgramMemory = ProgramMemory.empty()
       for (const { key, value } of availableVarInfo.variables) {
         const error = _programMem.set(key, {
-          type: 'String',
+          type: 'UserVal',
           value,
           __meta: [],
         })

src/components/CommandBar/CommandBar.tsx

@@ -1,8 +1,6 @@
 import { Dialog, Popover, Transition } from '@headlessui/react'
 import { Fragment, useEffect } from 'react'
 import { useCommandsContext } from 'hooks/useCommandsContext'
-import { useNetworkContext } from 'hooks/useNetworkContext'
-import { EngineConnectionStateType } from 'lang/std/engineConnection'
 import CommandBarArgument from './CommandBarArgument'
 import CommandComboBox from '../CommandComboBox'
 import CommandBarReview from './CommandBarReview'
@@ -16,7 +14,6 @@ export const COMMAND_PALETTE_HOTKEY = 'mod+k'
 export const CommandBar = () => {
   const { pathname } = useLocation()
   const { commandBarState, commandBarSend } = useCommandsContext()
-  const { immediateState } = useNetworkContext()
   const {
     context: { selectedCommand, currentArgument, commands },
   } = commandBarState
@@ -28,14 +25,6 @@ export const CommandBar = () => {
     commandBarSend({ type: 'Close' })
   }, [pathname])
 
-  useEffect(() => {
-    if (
-      immediateState.type !== EngineConnectionStateType.ConnectionEstablished
-    ) {
-      commandBarSend({ type: 'Close' })
-    }
-  }, [immediateState])
-
   // Hook up keyboard shortcuts
   useHotkeyWrapper([COMMAND_PALETTE_HOTKEY], () => {
     if (commandBarState.context.commands.length === 0) return

src/components/CommandBarOpenButton.tsx

@@ -2,20 +2,13 @@ import { useCommandsContext } from 'hooks/useCommandsContext'
 import usePlatform from 'hooks/usePlatform'
 import { hotkeyDisplay } from 'lib/hotkeyWrapper'
 import { COMMAND_PALETTE_HOTKEY } from './CommandBar/CommandBar'
-import { useNetworkContext } from 'hooks/useNetworkContext'
-import { EngineConnectionStateType } from 'lang/std/engineConnection'
 
 export function CommandBarOpenButton() {
   const { commandBarSend } = useCommandsContext()
-  const { immediateState } = useNetworkContext()
   const platform = usePlatform()
 
-  const isDisabled =
-    immediateState.type !== EngineConnectionStateType.ConnectionEstablished
-
   return (
     <button
-      disabled={isDisabled}
       className="group rounded-full flex items-center justify-center gap-2 px-2 py-1 bg-primary/10 dark:bg-chalkboard-90 dark:backdrop-blur-sm border-primary hover:border-primary dark:border-chalkboard-50 dark:hover:border-inherit text-primary dark:text-inherit"
       onClick={() => commandBarSend({ type: 'Open' })}
       data-testid="command-bar-open-button"

src/components/CustomIcon.tsx

@@ -1161,29 +1161,6 @@ const CustomIconMap = {
       />
     </svg>
   ),
-  stopwatch: (
-    <svg
-      width="20"
-      height="20"
-      viewBox="0 0 20 20"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        fill-rule="evenodd"
-        clip-rule="evenodd"
-        d="M7.95705 5.99046C7.05643 6.44935 6.33654 7.19809 5.91336 8.11602C5.49019 9.03396 5.38838 10.0676 5.62434 11.0505C5.8603 12.0334 6.42029 12.9081 7.21408 13.5339C8.00787 14.1597 8.98922 14.5 10 14.5C11.0108 14.5 11.9921 14.1597 12.7859 13.5339C13.5797 12.9082 14.1397 12.0334 14.3757 11.0505C14.6116 10.0676 14.5098 9.03396 14.0866 8.11603C13.6635 7.19809 12.9436 6.44935 12.043 5.99046L12.497 5.09946C13.5977 5.66032 14.4776 6.57544 14.9948 7.69737C15.512 8.81929 15.6364 10.0827 15.348 11.2839C15.0596 12.4852 14.3752 13.5544 13.405 14.3192C12.4348 15.0841 11.2354 15.5 10 15.5C8.7646 15.5 7.56517 15.0841 6.59499 14.3192C5.6248 13.5544 4.94037 12.4852 4.65197 11.2839C4.36357 10.0827 4.488 8.81929 5.00522 7.69736C5.52243 6.57544 6.40231 5.66032 7.50306 5.09946L7.95705 5.99046Z"
-        fill="currentColor"
-      />
-      <path d="M10 5.5V4M10 4H8M10 4H12" stroke="currentColor" />
-      <path
-        fill-rule="evenodd"
-        clip-rule="evenodd"
-        d="M12.8536 7.85356L10.3536 10.3536C10.1583 10.5488 9.84171 10.5488 9.64645 10.3536C9.45118 10.1583 9.45118 9.84172 9.64645 9.64645L12.1464 7.14645L12.8536 7.85356Z"
-        fill="currentColor"
-      />
-    </svg>
-  ),
 } as const
 
 export type CustomIconName = keyof typeof CustomIconMap

src/components/EngineStream.tsx

@@ -1,293 +0,0 @@
-import { MouseEventHandler, useEffect, useRef } from 'react'
-import { useAppState } from 'AppState'
-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 { btnName } from 'lib/cameraControls'
-import { trap } from 'lib/trap'
-import { sendSelectEventToEngine } from 'lib/selections'
-import { kclManager, engineCommandManager } from 'lib/singletons'
-import { EngineCommandManagerEvents } from 'lang/std/engineConnection'
-import { useRouteLoaderData } from 'react-router-dom'
-import { PATHS } from 'lib/paths'
-import { IndexLoaderData } from 'lib/types'
-import useEngineStreamContext, {
-  EngineStreamState,
-  EngineStreamTransition,
-} from 'hooks/useEngineStreamContext'
-import { REASONABLE_TIME_TO_REFRESH_STREAM_SIZE } from 'lib/timings'
-
-export const EngineStream = () => {
-  const { setAppState } = useAppState()
-
-  const { overallState } = useNetworkContext()
-  const { settings } = useSettingsAuthContext()
-  const { file } = useRouteLoaderData(PATHS.FILE) as IndexLoaderData
-  const last = useRef<number>(Date.now())
-
-  const settingsEngine = {
-    theme: settings.context.app.theme.current,
-    enableSSAO: settings.context.app.enableSSAO.current,
-    highlightEdges: settings.context.modeling.highlightEdges.current,
-    showScaleGrid: settings.context.modeling.showScaleGrid.current,
-    cameraProjection: settings.context.modeling.cameraProjection.current,
-  }
-
-  const { state: modelingMachineState, send: modelingMachineActorSend } =
-    useModelingContext()
-
-  const engineStreamActor = useEngineStreamContext.useActorRef()
-  const engineStreamState = engineStreamActor.getSnapshot()
-
-  const streamIdleMode = settings.context.app.streamIdleMode.current
-
-  const configure = () => {
-    engineStreamActor.send({
-      type: EngineStreamTransition.StartOrReconfigureEngine,
-      modelingMachineActorSend,
-      settings: settingsEngine,
-      setAppState,
-
-      // It's possible a reconnect happens as we drag the window :')
-      onMediaStream(mediaStream: MediaStream) {
-        engineStreamActor.send({
-          type: EngineStreamTransition.SetMediaStream,
-          mediaStream,
-        })
-      },
-    })
-  }
-
-  useEffect(() => {
-    const play = () => {
-      engineStreamActor.send({
-        type: EngineStreamTransition.Play,
-      })
-    }
-    engineCommandManager.addEventListener(
-      EngineCommandManagerEvents.SceneReady,
-      play
-    )
-
-    return () => {
-      engineCommandManager.removeEventListener(
-        EngineCommandManagerEvents.SceneReady,
-        play
-      )
-    }
-  }, [])
-
-  useEffect(() => {
-    const video = engineStreamState.context.videoRef?.current
-    if (!video) return
-    const canvas = engineStreamState.context.canvasRef?.current
-    if (!canvas) return
-
-    new ResizeObserver(() => {
-      if (Date.now() - last.current < REASONABLE_TIME_TO_REFRESH_STREAM_SIZE)
-        return
-      last.current = Date.now()
-
-      if (
-        Math.abs(video.width - window.innerWidth) > 4 ||
-        Math.abs(video.height - window.innerHeight) > 4
-      ) {
-        timeoutStart.current = Date.now()
-        configure()
-      }
-    }).observe(document.body)
-  }, [engineStreamState.value])
-
-  // When the video and canvas element references are set, start the engine.
-  useEffect(() => {
-    if (
-      engineStreamState.context.canvasRef.current &&
-      engineStreamState.context.videoRef.current
-    ) {
-      engineStreamActor.send({
-        type: EngineStreamTransition.StartOrReconfigureEngine,
-        modelingMachineActorSend,
-        settings: settingsEngine,
-        setAppState,
-        onMediaStream(mediaStream: MediaStream) {
-          engineStreamActor.send({
-            type: EngineStreamTransition.SetMediaStream,
-            mediaStream,
-          })
-        },
-      })
-    }
-  }, [
-    engineStreamState.context.canvasRef.current,
-    engineStreamState.context.videoRef.current,
-  ])
-
-  // On settings change, reconfigure the engine. When paused this gets really tricky,
-  // and also requires onMediaStream to be set!
-  useEffect(() => {
-    engineStreamActor.send({
-      type: EngineStreamTransition.StartOrReconfigureEngine,
-      modelingMachineActorSend,
-      settings: settingsEngine,
-      setAppState,
-      onMediaStream(mediaStream: MediaStream) {
-        engineStreamActor.send({
-          type: EngineStreamTransition.SetMediaStream,
-          mediaStream,
-        })
-      },
-    })
-  }, [settings.context])
-
-  /**
-   * Subscribe to execute code when the file changes
-   * but only if the scene is already ready.
-   * See onSceneReady for the initial scene setup.
-   */
-  useEffect(() => {
-    if (engineCommandManager.engineConnection?.isReady() && file?.path) {
-      console.log('execute on file change')
-      void kclManager.executeCode(true).catch(trap)
-    }
-  }, [file?.path, engineCommandManager.engineConnection])
-
-  const IDLE_TIME_MS = Number(streamIdleMode)
-
-  // When streamIdleMode is changed, setup or teardown the timeouts
-  const timeoutStart = useRef<number | null>(null)
-
-  useEffect(() => {
-    timeoutStart.current = streamIdleMode ? Date.now() : null
-  }, [streamIdleMode])
-
-  useEffect(() => {
-    let frameId: ReturnType<typeof window.requestAnimationFrame> = 0
-    const frameLoop = () => {
-      // Do not pause if the user is in the middle of an operation
-      if (!modelingMachineState.matches('idle')) {
-        // In fact, stop the timeout, because we don't want to trigger the
-        // pause when we exit the operation.
-        timeoutStart.current = null
-      } else if (timeoutStart.current) {
-        const elapsed = Date.now() - timeoutStart.current
-        if (elapsed >= IDLE_TIME_MS) {
-          timeoutStart.current = null
-          engineStreamActor.send({ type: EngineStreamTransition.Pause })
-        }
-      }
-      frameId = window.requestAnimationFrame(frameLoop)
-    }
-    frameId = window.requestAnimationFrame(frameLoop)
-
-    return () => {
-      window.cancelAnimationFrame(frameId)
-    }
-  }, [modelingMachineState])
-
-  useEffect(() => {
-    if (!streamIdleMode) return
-
-    const onAnyInput = () => {
-      // Just in case it happens in the middle of the user turning off
-      // idle mode.
-      if (!streamIdleMode) {
-        timeoutStart.current = null
-        return
-      }
-
-      if (engineStreamState.value === EngineStreamState.Paused) {
-        engineStreamActor.send({
-          type: EngineStreamTransition.StartOrReconfigureEngine,
-          modelingMachineActorSend,
-          settings: settingsEngine,
-          setAppState,
-          onMediaStream(mediaStream: MediaStream) {
-            engineStreamActor.send({
-              type: EngineStreamTransition.SetMediaStream,
-              mediaStream,
-            })
-          },
-        })
-      }
-
-      timeoutStart.current = Date.now()
-    }
-
-    // It's possible after a reconnect, the user doesn't move their mouse at
-    // all, meaning the timer is not reset to run. We need to set it every
-    // time our effect dependencies change then.
-    timeoutStart.current = Date.now()
-
-    window.document.addEventListener('keydown', onAnyInput)
-    window.document.addEventListener('keyup', onAnyInput)
-    window.document.addEventListener('mousemove', onAnyInput)
-    window.document.addEventListener('mousedown', onAnyInput)
-    window.document.addEventListener('mouseup', onAnyInput)
-    window.document.addEventListener('scroll', onAnyInput)
-    window.document.addEventListener('touchstart', onAnyInput)
-    window.document.addEventListener('touchstop', onAnyInput)
-
-    return () => {
-      timeoutStart.current = null
-      window.document.removeEventListener('keydown', onAnyInput)
-      window.document.removeEventListener('keyup', onAnyInput)
-      window.document.removeEventListener('mousemove', onAnyInput)
-      window.document.removeEventListener('mousedown', onAnyInput)
-      window.document.removeEventListener('mouseup', onAnyInput)
-      window.document.removeEventListener('scroll', onAnyInput)
-      window.document.removeEventListener('touchstart', onAnyInput)
-      window.document.removeEventListener('touchstop', onAnyInput)
-    }
-  }, [streamIdleMode, engineStreamState.value])
-
-  const isNetworkOkay =
-    overallState === NetworkHealthState.Ok ||
-    overallState === NetworkHealthState.Weak
-
-  const handleMouseUp: MouseEventHandler<HTMLDivElement> = (e) => {
-    if (!isNetworkOkay) return
-    if (!engineStreamState.context.videoRef.current) return
-    if (modelingMachineState.matches('Sketch')) return
-    if (modelingMachineState.matches({ idle: 'showPlanes' })) return
-
-    if (btnName(e.nativeEvent).left) {
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      sendSelectEventToEngine(e, engineStreamState.context.videoRef.current)
-    }
-  }
-
-  return (
-    <div
-      className="absolute inset-0 z-0"
-      id="stream"
-      data-testid="stream"
-      onMouseUp={handleMouseUp}
-      onContextMenu={(e) => e.preventDefault()}
-      onContextMenuCapture={(e) => e.preventDefault()}
-    >
-      <video
-        autoPlay
-        muted
-        key={engineStreamActor.id + 'video'}
-        ref={engineStreamState.context.videoRef}
-        controls={false}
-        className="cursor-pointer"
-        disablePictureInPicture
-        id="video-stream"
-      />
-      <canvas
-        key={engineStreamActor.id + 'canvas'}
-        ref={engineStreamState.context.canvasRef}
-        className="cursor-pointer"
-        id="freeze-frame"
-      >
-        No canvas support
-      </canvas>
-      <ClientSideScene
-        cameraControls={settings.context.modeling.mouseControls.current}
-      />
-    </div>
-  )
-}

src/components/FileMachineProvider.tsx

@@ -29,7 +29,6 @@ import {
   KclSamplesManifestItem,
 } from 'lib/getKclSamplesManifest'
 import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
-import { markOnce } from 'lib/performance'
 
 type MachineContext<T extends AnyStateMachine> = {
   state: StateFrom<T>
@@ -55,7 +54,6 @@ export const FileMachineProvider = ({
   )
 
   useEffect(() => {
-    markOnce('code/didLoadFile')
     async function fetchKclSamples() {
       setKclSamples(await getKclSamplesManifest())
     }

src/components/FileTree.tsx

@@ -6,10 +6,10 @@ import { Dispatch, useCallback, useRef, useState } from 'react'
 import { useNavigate, useRouteLoaderData } from 'react-router-dom'
 import { Disclosure } from '@headlessui/react'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import { faChevronRight, faPencil } from '@fortawesome/free-solid-svg-icons'
+import { faChevronRight } from '@fortawesome/free-solid-svg-icons'
 import { useFileContext } from 'hooks/useFileContext'
 import styles from './FileTree.module.css'
-import { sortFilesAndDirectories } from 'lib/desktopFS'
+import { sortProject } from 'lib/desktopFS'
 import { FILE_EXT } from 'lib/constants'
 import { CustomIcon } from './CustomIcon'
 import { codeManager, kclManager } from 'lib/singletons'
@@ -22,42 +22,11 @@ import usePlatform from 'hooks/usePlatform'
 import { FileEntry } from 'lib/project'
 import { useFileSystemWatcher } from 'hooks/useFileSystemWatcher'
 import { normalizeLineEndings } from 'lib/codeEditor'
-import { reportRejection } from 'lib/trap'
 
 function getIndentationCSS(level: number) {
   return `calc(1rem * ${level + 1})`
 }
 
-function TreeEntryInput(props: {
-  level: number
-  onSubmit: (value: string) => void
-}) {
-  const [value, setValue] = useState('')
-  const onKeyPress = (e: React.KeyboardEvent<HTMLInputElement>) => {
-    if (e.key !== 'Enter') return
-    props.onSubmit(value)
-  }
-
-  return (
-    <label>
-      <span className="sr-only">Entry input</span>
-      <input
-        data-testid="tree-input-field"
-        type="text"
-        autoFocus
-        autoCapitalize="off"
-        autoCorrect="off"
-        className="w-full py-1 bg-transparent text-chalkboard-100 placeholder:text-chalkboard-70 dark:text-chalkboard-10 dark:placeholder:text-chalkboard-50 focus:outline-none focus:ring-0"
-        onBlur={() => props.onSubmit(value)}
-        onChange={(e) => setValue(e.target.value)}
-        onKeyPress={onKeyPress}
-        style={{ paddingInlineStart: getIndentationCSS(props.level) }}
-        value={value}
-      />
-    </label>
-  )
-}
-
 function RenameForm({
   fileOrDir,
   onSubmit,
@@ -144,44 +113,23 @@ function DeleteFileTreeItemDialog({
 }
 
 const FileTreeItem = ({
-  parentDir,
   project,
   currentFile,
-  lastDirectoryClicked,
   fileOrDir,
   onNavigateToFile,
-  onClickDirectory,
-  onCreateFile,
-  onCreateFolder,
-  newTreeEntry,
   level = 0,
-  treeSelection,
-  setTreeSelection,
 }: {
-  parentDir: FileEntry | undefined
   project?: IndexLoaderData['project']
   currentFile?: IndexLoaderData['file']
-  lastDirectoryClicked?: FileEntry
   fileOrDir: FileEntry
   onNavigateToFile?: () => void
-  onClickDirectory: (
-    open: boolean,
-    path: FileEntry,
-    parentDir: FileEntry | undefined
-  ) => void
-  onCreateFile: (name: string) => void
-  onCreateFolder: (name: string) => void
-  newTreeEntry: TreeEntry
   level?: number
-  treeSelection: FileEntry | undefined
-  setTreeSelection: Dispatch<React.SetStateAction<FileEntry | undefined>>
 }) => {
   const { send: fileSend, context: fileContext } = useFileContext()
   const { onFileOpen, onFileClose } = useLspContext()
   const navigate = useNavigate()
   const [isConfirmingDelete, setIsConfirmingDelete] = useState(false)
   const isCurrentFile = fileOrDir.path === currentFile?.path
-  const isFileOrDirHighlighted = treeSelection?.path === fileOrDir?.path
   const itemRef = useRef(null)
 
   // Since every file or directory gets its own FileTreeItem, we can do this.
@@ -190,14 +138,15 @@ const FileTreeItem = ({
   // the ReactNodes are destroyed, so is this listener :)
   useFileSystemWatcher(
     async (eventType, path) => {
-      // Prevents a cyclic read / write causing editor problems such as
-      // misplaced cursor positions.
-      if (codeManager.writeCausedByAppCheckedInFileTreeFileSystemWatcher) {
-        codeManager.writeCausedByAppCheckedInFileTreeFileSystemWatcher = false
-        return
-      }
+      // Don't try to read a file that was removed.
+      if (isCurrentFile && eventType !== 'unlink') {
+        // Prevents a cyclic read / write causing editor problems such as
+        // misplaced cursor positions.
+        if (codeManager.writeCausedByAppCheckedInFileTreeFileSystemWatcher) {
+          codeManager.writeCausedByAppCheckedInFileTreeFileSystemWatcher = false
+          return
+        }
 
-      if (isCurrentFile && eventType === 'change') {
         let code = await window.electron.readFile(path, { encoding: 'utf-8' })
         code = normalizeLineEndings(code)
         codeManager.updateCodeStateEditor(code)
@@ -207,10 +156,6 @@ const FileTreeItem = ({
     [fileOrDir.path]
   )
 
-  const showNewTreeEntry =
-    newTreeEntry !== undefined &&
-    fileOrDir.path === fileContext.selectedDirectory.path
-
   const isRenaming = fileContext.itemsBeingRenamed.includes(fileOrDir.path)
   const removeCurrentItemFromRenaming = useCallback(
     () =>
@@ -234,6 +179,13 @@ const FileTreeItem = ({
     })
   }, [fileContext.itemsBeingRenamed, fileOrDir.path, fileSend])
 
+  const clickDirectory = () => {
+    fileSend({
+      type: 'Set selected directory',
+      directory: fileOrDir,
+    })
+  }
+
   function handleKeyUp(e: React.KeyboardEvent<HTMLButtonElement>) {
     if (e.metaKey && e.key === 'Backspace') {
       // Open confirmation dialog
@@ -242,13 +194,11 @@ const FileTreeItem = ({
       // Show the renaming form
       addCurrentItemToRenaming()
     } else if (e.code === 'Space') {
-      void handleClick().catch(reportRejection)
+      handleClick()
     }
   }
 
-  async function handleClick() {
-    setTreeSelection(fileOrDir)
-
+  function handleClick() {
     if (fileOrDir.children !== null) return // Don't open directories
 
     if (fileOrDir.name?.endsWith(FILE_EXT) === false && project?.path) {
@@ -258,10 +208,12 @@ const FileTreeItem = ({
         `import("${fileOrDir.path.replace(project.path, '.')}")\n` +
           codeManager.code
       )
-      await codeManager.writeToFile()
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
+      codeManager.writeToFile()
 
       // Prevent seeing the model built one piece at a time when changing files
-      await kclManager.executeCode(true)
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
+      kclManager.executeCode(true)
     } else {
       // Let the lsp servers know we closed a file.
       onFileClose(currentFile?.path || null, project?.path || null)
@@ -270,19 +222,16 @@ const FileTreeItem = ({
       // Open kcl files
       navigate(`${PATHS.FILE}/${encodeURIComponent(fileOrDir.path)}`)
     }
-
     onNavigateToFile?.()
   }
 
-  // The below handles both the "root" of all directories and all subs. It's
-  // why some code is duplicated.
   return (
     <div className="contents" data-testid="file-tree-item" ref={itemRef}>
       {fileOrDir.children === null ? (
         <li
           className={
             'group m-0 p-0 border-solid border-0 hover:bg-primary/5 focus-within:bg-primary/5 dark:hover:bg-primary/20 dark:focus-within:bg-primary/20 ' +
-            (isFileOrDirHighlighted || isCurrentFile
+            (isCurrentFile
               ? '!bg-primary/10 !text-primary dark:!bg-primary/20 dark:!text-inherit'
               : '')
           }
@@ -293,7 +242,7 @@ const FileTreeItem = ({
               style={{ paddingInlineStart: getIndentationCSS(level) }}
               onClick={(e) => {
                 e.currentTarget.focus()
-                void handleClick().catch(reportRejection)
+                handleClick()
               }}
               onKeyUp={handleKeyUp}
             >
@@ -319,13 +268,14 @@ const FileTreeItem = ({
                 <Disclosure.Button
                   className={
                     ' group border-none text-sm rounded-none p-0 m-0 flex items-center justify-start w-full py-0.5 hover:text-primary hover:bg-primary/5 dark:hover:text-inherit dark:hover:bg-primary/10' +
-                    (isFileOrDirHighlighted ? ' ui-open:bg-primary/10' : '')
+                    (fileContext.selectedDirectory.path.includes(fileOrDir.path)
+                      ? ' ui-open:bg-primary/10'
+                      : '')
                   }
                   style={{ paddingInlineStart: getIndentationCSS(level) }}
-                  onClick={(e) => {
-                    e.stopPropagation()
-                    onClickDirectory(open, fileOrDir, parentDir)
-                  }}
+                  onClick={(e) => e.currentTarget.focus()}
+                  onClickCapture={clickDirectory}
+                  onFocusCapture={clickDirectory}
                   onKeyDown={(e) => e.key === 'Enter' && e.preventDefault()}
                   onKeyUp={handleKeyUp}
                 >
@@ -367,69 +317,35 @@ const FileTreeItem = ({
               >
                 <ul
                   className="m-0 p-0"
-                  onClick={(e) => {
-                    e.stopPropagation()
-                    onClickDirectory(open, fileOrDir, parentDir)
+                  onClickCapture={(e) => {
+                    fileSend({
+                      type: 'Set selected directory',
+                      directory: fileOrDir,
+                    })
                   }}
+                  onFocusCapture={(e) =>
+                    fileSend({
+                      type: 'Set selected directory',
+                      directory: fileOrDir,
+                    })
+                  }
                 >
-                  {showNewTreeEntry && (
-                    <div
-                      className="flex items-center"
-                      style={{
-                        paddingInlineStart: getIndentationCSS(level + 1),
-                      }}
-                    >
-                      <FontAwesomeIcon
-                        icon={faPencil}
-                        className="inline-block mr-2 m-0 p-0 w-2 h-2"
-                      />
-                      <TreeEntryInput
-                        level={-1}
-                        onSubmit={(value: string) =>
-                          newTreeEntry === 'file'
-                            ? onCreateFile(value)
-                            : onCreateFolder(value)
-                        }
-                      />
-                    </div>
-                  )}
-                  {sortFilesAndDirectories(fileOrDir.children || []).map(
-                    (child) => (
-                      <FileTreeItem
-                        parentDir={fileOrDir}
-                        fileOrDir={child}
-                        project={project}
-                        currentFile={currentFile}
-                        onCreateFile={onCreateFile}
-                        onCreateFolder={onCreateFolder}
-                        newTreeEntry={newTreeEntry}
-                        lastDirectoryClicked={lastDirectoryClicked}
-                        onClickDirectory={onClickDirectory}
-                        onNavigateToFile={onNavigateToFile}
-                        level={level + 1}
-                        key={level + '-' + child.path}
-                        treeSelection={treeSelection}
-                        setTreeSelection={setTreeSelection}
-                      />
-                    )
-                  )}
-                  {!showNewTreeEntry && fileOrDir.children?.length === 0 && (
-                    <div
-                      className="flex items-center text-chalkboard-50"
-                      style={{
-                        paddingInlineStart: getIndentationCSS(level + 1),
-                      }}
-                    >
-                      <div>No files</div>
-                    </div>
-                  )}
+                  {fileOrDir.children?.map((child) => (
+                    <FileTreeItem
+                      fileOrDir={child}
+                      project={project}
+                      currentFile={currentFile}
+                      onNavigateToFile={onNavigateToFile}
+                      level={level + 1}
+                      key={level + '-' + child.path}
+                    />
+                  ))}
                 </ul>
               </Disclosure.Panel>
             </div>
           )}
         </Disclosure>
       )}
-
       {isConfirmingDelete && (
         <DeleteFileTreeItemDialog
           fileOrDir={fileOrDir}
@@ -493,15 +409,27 @@ interface FileTreeProps {
   ) => void
 }
 
-export const FileTreeMenu = ({
-  onCreateFile,
-  onCreateFolder,
-}: {
-  onCreateFile: () => void
-  onCreateFolder: () => void
-}) => {
-  useHotkeyWrapper(['mod + n'], onCreateFile)
-  useHotkeyWrapper(['mod + shift + n'], onCreateFolder)
+export const FileTreeMenu = () => {
+  const { send } = useFileContext()
+  const { send: modelingSend } = useModelingContext()
+
+  function createFile() {
+    send({
+      type: 'Create file',
+      data: { name: '', makeDir: false, shouldSetToRename: true },
+    })
+    modelingSend({ type: 'Cancel' })
+  }
+
+  function createFolder() {
+    send({
+      type: 'Create file',
+      data: { name: '', makeDir: true, shouldSetToRename: true },
+    })
+  }
+
+  useHotkeyWrapper(['mod + n'], createFile)
+  useHotkeyWrapper(['mod + shift + n'], createFolder)
 
   return (
     <>
@@ -514,7 +442,7 @@ export const FileTreeMenu = ({
           bgClassName: 'bg-transparent',
         }}
         className="!p-0 !bg-transparent hover:text-primary border-transparent hover:border-primary !outline-none"
-        onClick={onCreateFile}
+        onClick={createFile}
       >
         <Tooltip position="bottom-right" delay={750}>
           Create file
@@ -530,7 +458,7 @@ export const FileTreeMenu = ({
           bgClassName: 'bg-transparent',
         }}
         className="!p-0 !bg-transparent hover:text-primary border-transparent hover:border-primary !outline-none"
-        onClick={onCreateFolder}
+        onClick={createFolder}
       >
         <Tooltip position="bottom-right" delay={750}>
           Create folder
@@ -540,110 +468,30 @@ export const FileTreeMenu = ({
   )
 }
 
-type TreeEntry = 'file' | 'folder' | undefined
-
-export const useFileTreeOperations = () => {
-  const { send } = useFileContext()
-  const { send: modelingSend } = useModelingContext()
-
-  // As long as this is undefined, a new "file tree entry prompt" is not shown.
-  const [newTreeEntry, setNewTreeEntry] = useState<TreeEntry>(undefined)
-
-  function createFile(args: { dryRun: boolean; name?: string }) {
-    if (args.dryRun) {
-      setNewTreeEntry('file')
-      return
-    }
-
-    // Clear so that the entry prompt goes away.
-    setNewTreeEntry(undefined)
-
-    if (!args.name) return
-
-    send({
-      type: 'Create file',
-      data: { name: args.name, makeDir: false, shouldSetToRename: false },
-    })
-    modelingSend({ type: 'Cancel' })
-  }
-
-  function createFolder(args: { dryRun: boolean; name?: string }) {
-    if (args.dryRun) {
-      setNewTreeEntry('folder')
-      return
-    }
-
-    setNewTreeEntry(undefined)
-
-    if (!args.name) return
-
-    send({
-      type: 'Create file',
-      data: { name: args.name, makeDir: true, shouldSetToRename: false },
-    })
-  }
-
-  return {
-    createFile,
-    createFolder,
-    newTreeEntry,
-  }
-}
-
 export const FileTree = ({
   className = '',
   onNavigateToFile: closePanel,
 }: FileTreeProps) => {
-  const { createFile, createFolder, newTreeEntry } = useFileTreeOperations()
-
   return (
     <div className={className}>
       <div className="flex items-center gap-1 px-4 py-1 bg-chalkboard-20/40 dark:bg-chalkboard-80/50 border-b border-b-chalkboard-30 dark:border-b-chalkboard-80">
         <h2 className="flex-1 m-0 p-0 text-sm mono">Files</h2>
-        <FileTreeMenu
-          onCreateFile={() => createFile({ dryRun: true })}
-          onCreateFolder={() => createFolder({ dryRun: true })}
-        />
+        <FileTreeMenu />
       </div>
-      <FileTreeInner
-        onNavigateToFile={closePanel}
-        newTreeEntry={newTreeEntry}
-        onCreateFile={(name: string) => createFile({ dryRun: false, name })}
-        onCreateFolder={(name: string) => createFolder({ dryRun: false, name })}
-      />
+      <FileTreeInner onNavigateToFile={closePanel} />
     </div>
   )
 }
 
 export const FileTreeInner = ({
   onNavigateToFile,
-  onCreateFile,
-  onCreateFolder,
-  newTreeEntry,
 }: {
-  onCreateFile: (name: string) => void
-  onCreateFolder: (name: string) => void
-  newTreeEntry: TreeEntry
   onNavigateToFile?: () => void
 }) => {
   const loaderData = useRouteLoaderData(PATHS.FILE) as IndexLoaderData
   const { send: fileSend, context: fileContext } = useFileContext()
   const { send: modelingSend } = useModelingContext()
 
-  const [lastDirectoryClicked, setLastDirectoryClicked] = useState<
-    FileEntry | undefined
-  >(undefined)
-
-  const [treeSelection, setTreeSelection] = useState<FileEntry | undefined>(
-    loaderData.file
-  )
-
-  const onNavigateToFile_ = () => {
-    // Reset modeling state when navigating to a new file
-    onNavigateToFile?.()
-    modelingSend({ type: 'Cancel' })
-  }
-
   // Refresh the file tree when there are changes.
   useFileSystemWatcher(
     async (eventType, path) => {
@@ -653,13 +501,6 @@ export const FileTreeInner = ({
       const isCurrentFile = loaderData.file?.path === path
       const hasChanged = eventType === 'change'
       if (isCurrentFile && hasChanged) return
-
-      // If it's a settings file we wrote to already from the app ignore it.
-      if (codeManager.writeCausedByAppCheckedInFileTreeFileSystemWatcher) {
-        codeManager.writeCausedByAppCheckedInFileTreeFileSystemWatcher = false
-        return
-      }
-
       fileSend({ type: 'Refresh' })
     },
     [loaderData?.project?.path, fileContext.selectedDirectory.path].filter(
@@ -667,81 +508,33 @@ export const FileTreeInner = ({
     )
   )
 
-  const onTreeEntryInputSubmit = (value: string) => {
-    if (newTreeEntry === 'file') {
-      onCreateFile(value)
-      onNavigateToFile_()
-    } else {
-      onCreateFolder(value)
-    }
-  }
-
-  const onClickDirectory = (
-    open_: boolean,
-    fileOrDir: FileEntry,
-    parentDir: FileEntry | undefined
-  ) => {
-    // open true is closed... it's broken. Save me. I've inverted it here for
-    // sanity.
-    const open = !open_
-
-    const target = open ? fileOrDir : parentDir
-
-    // We're at the root, can't select anything further
-    if (!target) return
-
-    setTreeSelection(target)
-    setLastDirectoryClicked(target)
+  const clickDirectory = () => {
     fileSend({
       type: 'Set selected directory',
-      directory: target,
+      directory: fileContext.project,
     })
   }
 
-  const showNewTreeEntry =
-    newTreeEntry !== undefined &&
-    fileContext.selectedDirectory.path === loaderData.project?.path
-
   return (
-    <div className="relative">
-      <div
-        className="overflow-auto pb-12 absolute inset-0"
-        data-testid="file-pane-scroll-container"
-      >
-        <ul className="m-0 p-0 text-sm">
-          {showNewTreeEntry && (
-            <div
-              className="flex items-center"
-              style={{ paddingInlineStart: getIndentationCSS(0) }}
-            >
-              <FontAwesomeIcon
-                icon={faPencil}
-                className="inline-block mr-2 m-0 p-0 w-2 h-2"
-              />
-              <TreeEntryInput level={-1} onSubmit={onTreeEntryInputSubmit} />
-            </div>
-          )}
-          {sortFilesAndDirectories(fileContext.project?.children || []).map(
-            (fileOrDir) => (
-              <FileTreeItem
-                parentDir={fileContext.project}
-                project={fileContext.project}
-                currentFile={loaderData?.file}
-                lastDirectoryClicked={lastDirectoryClicked}
-                fileOrDir={fileOrDir}
-                onCreateFile={onCreateFile}
-                onCreateFolder={onCreateFolder}
-                newTreeEntry={newTreeEntry}
-                onClickDirectory={onClickDirectory}
-                onNavigateToFile={onNavigateToFile_}
-                key={fileOrDir.path}
-                treeSelection={treeSelection}
-                setTreeSelection={setTreeSelection}
-              />
-            )
-          )}
-        </ul>
-      </div>
+    <div
+      className="overflow-auto pb-12 absolute inset-0"
+      data-testid="file-pane-scroll-container"
+    >
+      <ul className="m-0 p-0 text-sm" onClickCapture={clickDirectory}>
+        {sortProject(fileContext.project?.children || []).map((fileOrDir) => (
+          <FileTreeItem
+            project={fileContext.project}
+            currentFile={loaderData?.file}
+            fileOrDir={fileOrDir}
+            onNavigateToFile={() => {
+              // Reset modeling state when navigating to a new file
+              modelingSend({ type: 'Cancel' })
+              onNavigateToFile?.()
+            }}
+            key={fileOrDir.path}
+          />
+        ))}
+      </ul>
     </div>
   )
 }

src/components/LowerRightControls.tsx

@@ -96,23 +96,6 @@ export function LowerRightControls({
             Report a bug
           </Tooltip>
         </a>
-        <Link
-          to={
-            location.pathname.includes(PATHS.FILE)
-              ? filePath + PATHS.TELEMETRY + '?tab=project'
-              : PATHS.HOME + PATHS.TELEMETRY
-          }
-          data-testid="telemetry-link"
-        >
-          <CustomIcon
-            name="stopwatch"
-            className={`w-5 h-5 ${linkOverrideClassName}`}
-          />
-          <span className="sr-only">Telemetry</span>
-          <Tooltip position="top" contentClassName="text-xs">
-            Telemetry
-          </Tooltip>
-        </Link>
         <Link
           to={
             location.pathname.includes(PATHS.FILE)

src/components/ModelStateIndicator.tsx

@@ -1,47 +1,40 @@
-import { useEffect, useState } from 'react'
 import { useEngineCommands } from './EngineCommands'
+import { Spinner } from './Spinner'
 import { CustomIcon } from './CustomIcon'
-import useEngineStreamContext, {
-  EngineStreamState,
-} from 'hooks/useEngineStreamContext'
-import { CommandLogType } from 'lang/std/engineConnection'
 
 export const ModelStateIndicator = () => {
   const [commands] = useEngineCommands()
-  const [isDone, setIsDone] = useState<boolean>(false)
-
-  const engineStreamActor = useEngineStreamContext.useActorRef()
-  const engineStreamState = engineStreamActor.getSnapshot()
 
   const lastCommandType = commands[commands.length - 1]?.type
 
-  useEffect(() => {
-    if (lastCommandType === CommandLogType.SetDefaultSystemProperties) {
-      setIsDone(false)
-    }
-    if (lastCommandType === CommandLogType.ExecutionDone) {
-      setIsDone(true)
-    }
-  }, [lastCommandType])
-
   let className = 'w-6 h-6 '
-  let icon = <div className={className}></div>
+  let icon = <Spinner className={className} />
   let dataTestId = 'model-state-indicator'
 
-  if (engineStreamState.value === EngineStreamState.Paused) {
-    className += 'text-secondary'
-    icon = <CustomIcon data-testid={dataTestId + '-paused'} name="parallel" />
-  } else if (engineStreamState.value === EngineStreamState.Resuming) {
-    className += 'text-secondary'
-    icon = <CustomIcon data-testid={dataTestId + '-resuming'} name="parallel" />
-  } else if (isDone) {
-    className += 'text-secondary'
+  if (lastCommandType === 'receive-reliable') {
+    className +=
+      'bg-chalkboard-20 dark:bg-chalkboard-80 !group-disabled:bg-chalkboard-30 !dark:group-disabled:bg-chalkboard-80 rounded-sm bg-succeed-10/30 dark:bg-succeed'
+    icon = (
+      <CustomIcon
+        data-testid={dataTestId + '-receive-reliable'}
+        name="checkmark"
+      />
+    )
+  } else if (lastCommandType === 'execution-done') {
+    className +=
+      'border-6 border border-solid border-chalkboard-60 dark:border-chalkboard-80 bg-chalkboard-20 dark:bg-chalkboard-80 !group-disabled:bg-chalkboard-30 !dark:group-disabled:bg-chalkboard-80 rounded-sm bg-succeed-10/30 dark:bg-succeed'
     icon = (
       <CustomIcon
         data-testid={dataTestId + '-execution-done'}
         name="checkmark"
       />
     )
+  } else if (lastCommandType === 'export-done') {
+    className +=
+      'border-6 border border-solid border-chalkboard-60 dark:border-chalkboard-80 bg-chalkboard-20 dark:bg-chalkboard-80 !group-disabled:bg-chalkboard-30 !dark:group-disabled:bg-chalkboard-80 rounded-sm bg-succeed-10/30 dark:bg-succeed'
+    icon = (
+      <CustomIcon data-testid={dataTestId + '-export-done'} name="checkmark" />
+    )
   }
 
   return (

src/components/ModelingMachineProvider.tsx

@@ -20,6 +20,7 @@ import {
   modelingMachine,
   modelingMachineDefaultContext,
 } from 'machines/modelingMachine'
+import { useSetupEngineManager } from 'hooks/useSetupEngineManager'
 import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
 import {
   isCursorInSketchCommandRange,
@@ -111,8 +112,13 @@ export const ModelingMachineProvider = ({
     auth,
     settings: {
       context: {
-        app: { theme },
-        modeling: { defaultUnit, highlightEdges, cameraProjection },
+        app: { theme, enableSSAO },
+        modeling: {
+          defaultUnit,
+          cameraProjection,
+          highlightEdges,
+          showScaleGrid,
+        },
       },
     },
   } = useSettingsAuthContext()
@@ -123,6 +129,9 @@ export const ModelingMachineProvider = ({
   const streamRef = useRef<HTMLDivElement>(null)
   const persistedContext = useMemo(() => getPersistedContext(), [])
 
+  let [searchParams] = useSearchParams()
+  const pool = searchParams.get('pool')
+
   const { commandBarState, commandBarSend } = useCommandsContext()
 
   // Settings machine setup
@@ -149,39 +158,36 @@ export const ModelingMachineProvider = ({
         'enable copilot': () => {
           editorManager.setCopilotEnabled(true)
         },
-        // tsc reports this typing as perfectly fine, but eslint is complaining.
-        // It's actually nonsensical, so I'm quieting.
-        // eslint-disable-next-line @typescript-eslint/no-misused-promises
-        'sketch exit execute': async ({
-          context: { store },
-        }): Promise<void> => {
-          // When cancelling the sketch mode we should disable sketch mode within the engine.
-          await engineCommandManager.sendSceneCommand({
-            type: 'modeling_cmd_req',
-            cmd_id: uuidv4(),
-            cmd: { type: 'sketch_mode_disable' },
-          })
-
-          sceneInfra.camControls.syncDirection = 'clientToEngine'
-
-          if (cameraProjection.current === 'perspective') {
-            await sceneInfra.camControls.snapToPerspectiveBeforeHandingBackControlToEngine()
-          }
-
-          sceneInfra.camControls.syncDirection = 'engineToClient'
-
-          store.videoElement?.pause()
-
-          return kclManager
-            .executeCode()
-            .then(() => {
-              if (engineCommandManager.engineConnection?.idleMode) return
-
-              store.videoElement?.play().catch((e) => {
-                console.warn('Video playing was prevented', e)
-              })
+        'sketch exit execute': ({ context: { store } }) => {
+          ;(async () => {
+            // When cancelling the sketch mode we should disable sketch mode within the engine.
+            await engineCommandManager.sendSceneCommand({
+              type: 'modeling_cmd_req',
+              cmd_id: uuidv4(),
+              cmd: { type: 'sketch_mode_disable' },
             })
-            .catch(reportRejection)
+
+            sceneInfra.camControls.syncDirection = 'clientToEngine'
+
+            if (cameraProjection.current === 'perspective') {
+              await sceneInfra.camControls.snapToPerspectiveBeforeHandingBackControlToEngine()
+            }
+
+            sceneInfra.camControls.syncDirection = 'engineToClient'
+
+            store.videoElement?.pause()
+
+            kclManager
+              .executeCode()
+              .then(() => {
+                if (engineCommandManager.engineConnection?.idleMode) return
+
+                store.videoElement?.play().catch((e) => {
+                  console.warn('Video playing was prevented', e)
+                })
+              })
+              .catch(reportRejection)
+          })().catch(reportRejection)
         },
         'Set mouse state': assign(({ context, event }) => {
           if (event.type !== 'Set mouse state') return {}
@@ -295,7 +301,6 @@ export const ModelingMachineProvider = ({
             const dispatchSelection = (selection?: EditorSelection) => {
               if (!selection) return // TODO less of hack for the below please
               if (!editorManager.editorView) return
-
               setTimeout(() => {
                 if (!editorManager.editorView) return
                 editorManager.editorView.dispatch({
@@ -649,9 +654,6 @@ export const ModelingMachineProvider = ({
               engineCommandManager,
               input.faceId
             )
-            await sceneInfra.camControls.centerModelRelativeToPanes({
-              resetLastPaneWidth: true,
-            })
             sceneInfra.camControls.syncDirection = 'clientToEngine'
             return {
               sketchPathToNode: pathToNewSketchNode,
@@ -672,9 +674,6 @@ export const ModelingMachineProvider = ({
             engineCommandManager,
             input.planeId
           )
-          await sceneInfra.camControls.centerModelRelativeToPanes({
-            resetLastPaneWidth: true,
-          })
 
           return {
             sketchPathToNode: pathToNode,
@@ -697,9 +696,6 @@ export const ModelingMachineProvider = ({
               engineCommandManager,
               info?.sketchDetails?.faceId || ''
             )
-            await sceneInfra.camControls.centerModelRelativeToPanes({
-              resetLastPaneWidth: true,
-            })
             return {
               sketchPathToNode: sketchPathToNode || [],
               zAxis: info.sketchDetails.zAxis || null,
@@ -733,11 +729,6 @@ export const ModelingMachineProvider = ({
                 sketchDetails.origin
               )
             if (err(updatedAst)) return Promise.reject(updatedAst)
-
-            await codeManager.updateEditorWithAstAndWriteToFile(
-              updatedAst.newAst
-            )
-
             const selection = updateSelections(
               pathToNodeMap,
               selectionRanges,
@@ -774,11 +765,6 @@ export const ModelingMachineProvider = ({
                 sketchDetails.origin
               )
             if (err(updatedAst)) return Promise.reject(updatedAst)
-
-            await codeManager.updateEditorWithAstAndWriteToFile(
-              updatedAst.newAst
-            )
-
             const selection = updateSelections(
               pathToNodeMap,
               selectionRanges,
@@ -824,11 +810,6 @@ export const ModelingMachineProvider = ({
                 sketchDetails.origin
               )
             if (err(updatedAst)) return Promise.reject(updatedAst)
-
-            await codeManager.updateEditorWithAstAndWriteToFile(
-              updatedAst.newAst
-            )
-
             const selection = updateSelections(
               pathToNodeMap,
               selectionRanges,
@@ -862,11 +843,6 @@ export const ModelingMachineProvider = ({
                 sketchDetails.origin
               )
             if (err(updatedAst)) return Promise.reject(updatedAst)
-
-            await codeManager.updateEditorWithAstAndWriteToFile(
-              updatedAst.newAst
-            )
-
             const selection = updateSelections(
               pathToNodeMap,
               selectionRanges,
@@ -902,11 +878,6 @@ export const ModelingMachineProvider = ({
                 sketchDetails.origin
               )
             if (err(updatedAst)) return Promise.reject(updatedAst)
-
-            await codeManager.updateEditorWithAstAndWriteToFile(
-              updatedAst.newAst
-            )
-
             const selection = updateSelections(
               pathToNodeMap,
               selectionRanges,
@@ -943,11 +914,6 @@ export const ModelingMachineProvider = ({
                 sketchDetails.origin
               )
             if (err(updatedAst)) return Promise.reject(updatedAst)
-
-            await codeManager.updateEditorWithAstAndWriteToFile(
-              updatedAst.newAst
-            )
-
             const selection = updateSelections(
               pathToNodeMap,
               selectionRanges,
@@ -984,11 +950,6 @@ export const ModelingMachineProvider = ({
                 sketchDetails.origin
               )
             if (err(updatedAst)) return Promise.reject(updatedAst)
-
-            await codeManager.updateEditorWithAstAndWriteToFile(
-              updatedAst.newAst
-            )
-
             const selection = updateSelections(
               pathToNodeMap,
               selectionRanges,
@@ -1035,11 +996,6 @@ export const ModelingMachineProvider = ({
                 sketchDetails.origin
               )
             if (err(updatedAst)) return Promise.reject(updatedAst)
-
-            await codeManager.updateEditorWithAstAndWriteToFile(
-              updatedAst.newAst
-            )
-
             const selection = updateSelections(
               { 0: pathToReplacedNode },
               selectionRanges,
@@ -1068,6 +1024,21 @@ export const ModelingMachineProvider = ({
     }
   )
 
+  useSetupEngineManager(
+    streamRef,
+    modelingSend,
+    modelingState.context,
+    {
+      pool: pool,
+      theme: theme.current,
+      highlightEdges: highlightEdges.current,
+      enableSSAO: enableSSAO.current,
+      showScaleGrid: showScaleGrid.current,
+      cameraProjection: cameraProjection.current,
+    },
+    token
+  )
+
   useEffect(() => {
     kclManager.registerExecuteCallback(() => {
       modelingSend({ type: 'Re-execute' })

src/components/ModelingSidebar/ModelingPane.tsx

@@ -48,7 +48,7 @@ export const ModelingPaneHeader = ({
           bgClassName: 'bg-transparent dark:bg-transparent',
         }}
         className="!p-0 !bg-transparent hover:text-primary border-transparent dark:!border-transparent hover:!border-primary dark:hover:!border-chalkboard-70 !outline-none"
-        onClick={() => onClose()}
+        onClick={onClose}
       >
         <Tooltip position="bottom-right" delay={750}>
           Close
@@ -59,12 +59,14 @@ export const ModelingPaneHeader = ({
 }
 
 export const ModelingPane = ({
+  title,
+  icon,
   id,
   children,
   className,
+  Menu,
   detailsTestId,
   onClose,
-  title,
   ...props
 }: ModelingPaneProps) => {
   const { settings } = useSettingsAuthContext()
@@ -76,7 +78,6 @@ export const ModelingPane = ({
   return (
     <section
       {...props}
-      title={title && typeof title === 'string' ? title : ''}
       data-testid={detailsTestId}
       id={id}
       className={
@@ -87,7 +88,14 @@ export const ModelingPane = ({
         (className || '')
       }
     >
-      {children}
+      <ModelingPaneHeader
+        id={id}
+        icon={icon}
+        title={title}
+        Menu={Menu}
+        onClose={onClose}
+      />
+      <div className="relative w-full">{children}</div>
     </section>
   )
 }