Add back old window detection heuristic

Test attempt number 15345203, action!
Try again
2025-04-04 18:05:29 -04:00 · 2025-04-04 16:43:49 -04:00 · 2025-04-04 14:58:06 -04:00 · 2025-04-04 14:28:04 -04:00 · 2025-04-04 14:24:27 -04:00 · 2025-04-04 13:51:44 -04:00
343 changed files with 29626 additions and 49340 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@ -1,5 +1,5 @@
 name: Bug Report
-description: File a bug report for the Zoo Modeling App
+description: File a bug report for the Zoo Design Studio
 title: "[BUG]: "
 labels: ["bug"]
 assignees: []
@ -70,7 +70,7 @@ body:
    id: version
    attributes:
      label: Version
-      description: "The version of the Zoo Modeling App you're using."
+      description: "The version of the Zoo Design Studio you're using."
      placeholder: "example: v0.15.0. You can find this in the settings."
    validations:
      required: true
--- a/.github/workflows/build-apps.yml
+++ b/.github/workflows/build-apps.yml
@ -241,7 +241,7 @@ jobs:
      - uses: actions/upload-artifact@v4
        with:
          name: out-arm64-${{ matrix.platform }}
-          # first two will pick both Zoo Modeling App-$VERSION-arm64-win.exe and Zoo Modeling App-$VERSION-win.exe
+          # first two will pick both Zoo Design Studio-$VERSION-arm64-win.exe and Zoo Design Studio-$VERSION-win.exe
          path: |
            out/*-${{ env.VERSION_NO_V }}-win.*
            out/*-${{ env.VERSION_NO_V }}-arm64-win.*
--- a/INSTALL.md
+++ b/INSTALL.md
@ -1,27 +1,27 @@
-# Setting Up Zoo Modeling App
+# Setting Up Zoo Design Studio

-Compared to other CAD software, getting Zoo Modeling App up and running is quick and straightforward across platforms. It's about 100MB to download and is quick to install.
+Compared to other CAD software, getting Zoo Design Studio up and running is quick and straightforward across platforms. It's about 100MB to download and is quick to install.

 ## Windows

-1. Download the [Zoo Modeling App installer](https://zoo.dev/modeling-app/download) for Windows and for your processor type.
+1. Download the [Zoo Design Studio installer](https://zoo.dev/modeling-app/download) for Windows and for your processor type.

-2. Once downloaded, run the installer `Zoo Modeling App-{version}-{arch}-win.exe` which should take a few seconds.
+2. Once downloaded, run the installer `Zoo Design Studio-{version}-{arch}-win.exe` which should take a few seconds.

-3. The installation happens at `C:\Program Files\Zoo Modeling App`. A shortcut in the start menu is also created so you can run the app easily by clicking on it.
+3. The installation happens at `C:\Program Files\Zoo Design Studio`. A shortcut in the start menu is also created so you can run the app easily by clicking on it.

 ## macOS

-1. Download the [Zoo Modeling App installer](https://zoo.dev/modeling-app/download) for macOS and for your processor type.
+1. Download the [Zoo Design Studio installer](https://zoo.dev/modeling-app/download) for macOS and for your processor type.

-2. Once downloaded, open the disk image `Zoo Modeling App-{version}-{arch}-mac.dmg` and drag the applications to your `Applications` directory.
+2. Once downloaded, open the disk image `Zoo Design Studio-{version}-{arch}-mac.dmg` and drag the applications to your `Applications` directory.

-3. You can then open your `Applications` directory and double-click on `Zoo Modeling App` to open.
+3. You can then open your `Applications` directory and double-click on `Zoo Design Studio` to open.


 ## Linux 

-1. Download the [Zoo Modeling App installer](https://zoo.dev/modeling-app/download) for Linux and for your processor type.
+1. Download the [Zoo Design Studio installer](https://zoo.dev/modeling-app/download) for Linux and for your processor type.

 2. Install the dependencies needed to run the [AppImage format](https://appimage.org/).
    -  On Ubuntu, install the FUSE library with these commands in a terminal.
@ -30,7 +30,7 @@ Compared to other CAD software, getting Zoo Modeling App up and running is quick
       sudo apt install libfuse2
       ```
    - Optionally, follow [these steps](https://github.com/probonopd/go-appimage/blob/master/src/appimaged/README.md#initial-setup) to install `appimaged`. It is a daemon that makes interacting with AppImage files more seamless. 
-    - Once installed, copy the downloaded `Zoo Modeling App-{version}-{arch}-linux.AppImage` to the directory of your choice, for instance `~/Applications`.
+    - Once installed, copy the downloaded `Zoo Design Studio-{version}-{arch}-linux.AppImage` to the directory of your choice, for instance `~/Applications`.

   - `appimaged` should automatically find it and make it executable. If not, run:
     ```bash
--- a/18
+++ b/18
@ -87,7 +87,7 @@ lint: install ## Lint the code
 ###############################################################################
 # RUN

-TARGET ?= web
+TARGET ?= desktop

 .PHONY: run
 run: run-$(TARGET)
@ -103,9 +103,9 @@ run-desktop: install build-desktop ## Start the desktop app
 ###############################################################################
 # TEST

-E2E_WORKERS ?= 1
+E2E_GREP ?=
+E2E_WORKERS ?=
 E2E_FAILURES ?= 1
-E2E_GREP ?= ""

 .PHONY: test
 test: test-unit test-e2e
@ -121,11 +121,19 @@ test-e2e: test-e2e-$(TARGET)
 .PHONY: test-e2e-web
 test-e2e-web: install build-web ## Run the web e2e tests
 	@ curl -fs localhost:3000 >/dev/null || ( echo "Error: localhost:3000 not available, 'make run-web' first" && exit 1 )
-	yarn chrome:test --headed --workers=$(E2E_WORKERS) --max-failures=$(E2E_FAILURES) --grep=$(E2E_GREP)
+ifdef E2E_GREP
+	yarn chrome:test --headed --grep="$(E2E_GREP)" --max-failures=$(E2E_FAILURES)
+else
+	yarn chrome:test --headed --workers='100%'
+endif

 .PHONY: test-e2e-desktop
 test-e2e-desktop: install build-desktop ## Run the desktop e2e tests
-	yarn test:playwright:electron --workers=$(E2E_WORKERS) --max-failures=$(E2E_FAILURES) --grep="$(E2E_GREP)"
+ifdef E2E_GREP
+	yarn test:playwright:electron --grep="$(E2E_GREP)" --max-failures=$(E2E_FAILURES)
+else
+	yarn test:playwright:electron --workers='100%'
+endif

 ###############################################################################
 # CLEAN
--- a/README.md
+++ b/README.md
@ -1,17 +1,17 @@
-![Zoo Modeling App](/public/zma-logomark-outlined.png)
+![Zoo Design Studio](/public/zma-logomark-outlined.png)

-## Zoo Modeling App
+## Zoo Design Studio

 download at [zoo.dev/modeling-app/download](https://zoo.dev/modeling-app/download)

 A CAD application from the future, brought to you by the [Zoo team](https://zoo.dev).

-Modeling App is our take on what a modern modelling experience can be. It is applying several lessons learned in the decades since most major CAD tools came into existence:
+Design Studio is our take on what a modern modelling experience can be. It is applying several lessons learned in the decades since most major CAD tools came into existence:

 - All artifacts—including parts and assemblies—should be represented as human-readable code. At the end of the day, your CAD project should be "plain text"
  - This makes version control—which is a solved problem in software engineering—trivial for CAD
 - All GUI (or point-and-click) interactions should be actions performed on this code representation under the hood
-  - This unlocks a hybrid approach to modeling. Whether you point-and-click as you always have or you write your own KCL code, you are performing the same action in Modeling App
+  - This unlocks a hybrid approach to modeling. Whether you point-and-click as you always have or you write your own KCL code, you are performing the same action in Design Studio
 - Everything graphics _has_ to be built for the GPU
  - Most CAD applications have had to retrofit support for GPUs, but our geometry engine is made for GPUs (primarily Nvidia's Vulkan), getting the order of magnitude rendering performance boost with it
 - Make the resource-intensive pieces of an application auto-scaling
@ -19,9 +19,9 @@ Modeling App is our take on what a modern modelling experience can be. It is app

 We are excited about what a small team of people could build in a short time with our API. We welcome you to try our API, build your own applications, or contribute to ours!

-Modeling App is a _hybrid_ user interface for CAD modeling. You can point-and-click to design parts (and soon assemblies), but everything you make is really just [`kcl` code](https://github.com/KittyCAD/kcl-experiments) under the hood. All of your CAD models can be checked into source control such as GitHub and responsibly versioned, rolled back, and more.
+Design Studio is a _hybrid_ user interface for CAD modeling. You can point-and-click to design parts (and soon assemblies), but everything you make is really just [`kcl` code](https://github.com/KittyCAD/kcl-experiments) under the hood. All of your CAD models can be checked into source control such as GitHub and responsibly versioned, rolled back, and more.

-The 3D view in Modeling App is just a video stream from our hosted geometry engine. The app sends new modeling commands to the engine via WebSockets, which returns back video frames of the view within the engine.
+The 3D view in Design Studio is just a video stream from our hosted geometry engine. The app sends new modeling commands to the engine via WebSockets, which returns back video frames of the view within the engine.

 ## Tools

@ -198,13 +198,13 @@ If the prompt doesn't show up, start the app in command line to grab the electro

 ```
 # Windows (PowerShell)
-& 'C:\Program Files\Zoo Modeling App\Zoo Modeling App.exe'
+& 'C:\Program Files\Zoo Design Studio\Zoo Design Studio.exe'

 # macOS
 /Applications/Zoo\ Modeling\ App.app/Contents/MacOS/Zoo\ Modeling\ App

 # Linux
-./Zoo Modeling App-{version}-{arch}-linux.AppImage
+./Zoo Design Studio-{version}-{arch}-linux.AppImage
 ```

 #### 4. Publish the release
--- a/docs/kcl/appearance.md
+++ b/docs/kcl/appearance.md
@ -54,7 +54,7 @@ example = extrude(exampleSketch, length = 5)
 // Add color to a revolved solid.
 sketch001 = startSketchOn(XY)
  |> circle(center = [15, 0], radius = 5)
-  |> revolve(angle = 360, axis = 'y')
+  |> revolve(angle = 360, axis = Y)
  |> appearance(color = '#ff0000', metalness = 90, roughness = 90)
 ```

--- a/docs/kcl/consts.md
+++ b/docs/kcl/consts.md
@ -9,9 +9,12 @@ layout: manual

 ### `std`

+- [`X`](/docs/kcl/consts/std-X)
 - [`XY`](/docs/kcl/consts/std-XY)
 - [`XZ`](/docs/kcl/consts/std-XZ)
+- [`Y`](/docs/kcl/consts/std-Y)
 - [`YZ`](/docs/kcl/consts/std-YZ)
+- [`Z`](/docs/kcl/consts/std-Z)

 ### `std::math`

--- a/docs/kcl/consts/std-X.md
+++ b/docs/kcl/consts/std-X.md
@ -0,0 +1,15 @@
+---
+title: "std::X"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+```js
+std::X
+```
+
+
--- a/docs/kcl/consts/std-Y.md
+++ b/docs/kcl/consts/std-Y.md
@ -0,0 +1,15 @@
+---
+title: "std::Y"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+```js
+std::Y
+```
+
+
--- a/docs/kcl/consts/std-Z.md
+++ b/docs/kcl/consts/std-Z.md
@ -0,0 +1,15 @@
+---
+title: "std::Z"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+```js
+std::Z
+```
+
+
--- a/docs/kcl/helix.md
+++ b/docs/kcl/helix.md
--- a/docs/kcl/import.md
+++ b/docs/kcl/import.md
@ -12,7 +12,7 @@ Import a CAD file.

 For formats lacking unit data (such as STL, OBJ, or PLY files), the default unit of measurement is millimeters. Alternatively you may specify the unit by passing your desired measurement unit in the options parameter. When importing a GLTF file, the bin file will be imported as well. Import paths are relative to the current project directory.

-Note: The import command currently only works when using the native Modeling App.
+Note: The import command currently only works when using the native Design Studio.

 ```js
 import(
--- a/docs/kcl/index.md
+++ b/docs/kcl/index.md
@ -1,6 +1,6 @@
 ---
 title: "KCL Standard Library"
-excerpt: "Documentation for the KCL standard library for the Zoo Modeling App."
+excerpt: "Documentation for the KCL standard library for the Zoo Design Studio."
 layout: manual
 ---

@ -22,6 +22,9 @@ layout: manual
  * [`string`](kcl/types/string)
  * [`tag`](kcl/types/tag)
 * **std**
+  * [`Axis2d`](kcl/types/Axis2d)
+  * [`Axis3d`](kcl/types/Axis3d)
+  * [`Edge`](kcl/types/Edge)
  * [`Face`](kcl/types/Face)
  * [`Helix`](kcl/types/Helix)
  * [`Plane`](kcl/types/Plane)
@ -29,9 +32,12 @@ layout: manual
  * [`Point3d`](kcl/types/Point3d)
  * [`Sketch`](kcl/types/Sketch)
  * [`Solid`](kcl/types/Solid)
+  * [`X`](kcl/consts/std-X)
  * [`XY`](kcl/consts/std-XY)
  * [`XZ`](kcl/consts/std-XZ)
+  * [`Y`](kcl/consts/std-Y)
  * [`YZ`](kcl/consts/std-YZ)
+  * [`Z`](kcl/consts/std-Z)
  * [`abs`](kcl/abs)
  * [`acos`](kcl/acos)
  * [`angleToMatchLengthX`](kcl/angleToMatchLengthX)
@ -68,7 +74,7 @@ layout: manual
  * [`getNextAdjacentEdge`](kcl/getNextAdjacentEdge)
  * [`getOppositeEdge`](kcl/getOppositeEdge)
  * [`getPreviousAdjacentEdge`](kcl/getPreviousAdjacentEdge)
-  * [`helix`](kcl/helix)
+  * [`helix`](kcl/std-helix)
  * [`hole`](kcl/hole)
  * [`hollow`](kcl/hollow)
  * [`inch`](kcl/inch)
@ -87,7 +93,6 @@ layout: manual
  * [`map`](kcl/map)
  * [`max`](kcl/max)
  * [`min`](kcl/min)
-  * [`mirror2d`](kcl/mirror2d)
  * [`mm`](kcl/mm)
  * [`offsetPlane`](kcl/offsetPlane)
  * [`patternCircular2d`](kcl/patternCircular2d)
@ -106,7 +111,7 @@ layout: manual
  * [`push`](kcl/push)
  * [`reduce`](kcl/reduce)
  * [`rem`](kcl/rem)
-  * [`revolve`](kcl/revolve)
+  * [`revolve`](kcl/std-revolve)
  * [`rotate`](kcl/rotate)
  * [`round`](kcl/round)
  * [`scale`](kcl/scale)
@ -142,6 +147,7 @@ layout: manual
  * [`tan`](kcl/std-math-tan)
 * **std::sketch**
  * [`circle`](kcl/std-sketch-circle)
+  * [`mirror2d`](kcl/std-sketch-mirror2d)
 * **std::turns**
  * [`turns::HALF_TURN`](kcl/consts/std-turns-HALF_TURN)
  * [`turns::QUARTER_TURN`](kcl/consts/std-turns-QUARTER_TURN)
--- a/docs/kcl/intersect.md
+++ b/docs/kcl/intersect.md
--- a/docs/kcl/known-issues.md
+++ b/docs/kcl/known-issues.md
@ -1,6 +1,6 @@
 ---
 title: "KCL Known Issues"
-excerpt: "Known issues with the KCL standard library for the Zoo Modeling App."
+excerpt: "Known issues with the KCL standard library for the Zoo Design Studio."
 layout: manual
 ---

--- a/docs/kcl/mirror2d.md
+++ b/docs/kcl/mirror2d.md
--- a/docs/kcl/modules.md
+++ b/docs/kcl/modules.md
@ -1,6 +1,6 @@
 ---
 title: "KCL Modules"
-excerpt: "Documentation of modules for the KCL language for the Zoo Modeling App."
+excerpt: "Documentation of modules for the KCL language for the Zoo Design Studio."
 layout: manual
 ---

@ -95,7 +95,7 @@ import "tests/inputs/cube.obj"
 When importing a GLTF file, the bin file will be imported as well.

 Import paths are relative to the current project directory. Imports currently only work when
-using the native Modeling App, not in the browser.
+using the native Design Studio, not in the browser.

 ### Supported values

--- a/docs/kcl/revolve.md
+++ b/docs/kcl/revolve.md
--- a/docs/kcl/settings.md
+++ b/docs/kcl/settings.md
@ -1,12 +1,12 @@
 ---
 title: "KCL Settings"
-excerpt: "Documentation of settings for the KCL language and Zoo Modeling App."
+excerpt: "Documentation of settings for the KCL language and Zoo Design Studio."
 layout: manual
 ---

 # KCL Settings

-There are three levels of settings available in the KittyCAD modeling application:
+There are three levels of settings available in the KittyCAD Design Studiolication:

 1. [User Settings](/docs/kcl/settings/user): Global settings that apply to all projects, stored in `user.toml`
 2. [Project Settings](/docs/kcl/settings/project): Settings specific to a project, stored in `project.toml`
@ -14,7 +14,7 @@ There are three levels of settings available in the KittyCAD modeling applicatio

 ## Configuration Files

-The KittyCAD modeling app uses TOML files for configuration:
+The KittyCAD Design Studio uses TOML files for configuration:

 * **User Settings**: `user.toml` - See [complete documentation](/docs/kcl/settings/user)
 * **Project Settings**: `project.toml` - See [complete documentation](/docs/kcl/settings/project)
--- a/docs/kcl/settings/project.md
+++ b/docs/kcl/settings/project.md
@ -35,7 +35,7 @@ base_unit = "in"

 #### app

-The settings for the modeling app.
+The settings for the Design Studio.


 **Default:** None
--- a/docs/kcl/settings/user.md
+++ b/docs/kcl/settings/user.md
@ -37,7 +37,7 @@ text_wrapping = false

 #### app

-The settings for the modeling app.
+The settings for the Design Studio.


 **Default:** None
--- a/docs/kcl/startSketchOn.md
+++ b/docs/kcl/startSketchOn.md
@ -146,7 +146,7 @@ exampleSketch = startSketchOn(XY)
  |> line(end = [-2, 0])
  |> close()

-example = revolve(exampleSketch, axis = 'y', angle = 180)
+example = revolve(exampleSketch, axis = Y, angle = 180)

 exampleSketch002 = startSketchOn(example, 'end')
  |> startProfileAt([4.5, -5], %)
@ -177,7 +177,7 @@ exampleSketch = startSketchOn(XY)

 example = revolve(
  exampleSketch,
-  axis = 'y',
+  axis = Y,
  angle = 180,
  tagEnd = $end01,
 )
--- a/docs/kcl/std-helix.md
+++ b/docs/kcl/std-helix.md
--- a/docs/kcl/std-revolve.md
+++ b/docs/kcl/std-revolve.md
--- a/docs/kcl/std-sketch-mirror2d.md
+++ b/docs/kcl/std-sketch-mirror2d.md
--- a/docs/kcl/std.json
+++ b/docs/kcl/std.json
--- a/docs/kcl/subtract.md
+++ b/docs/kcl/subtract.md
--- a/docs/kcl/sweep.md
+++ b/docs/kcl/sweep.md
@ -74,7 +74,7 @@ helixPath = helix(
  revolutions = 4,
  length = 10,
  radius = 5,
-  axis = 'Z',
+  axis = Z,
 )

 // Create a spring by sweeping around the helix path.
--- a/docs/kcl/types.md
+++ b/docs/kcl/types.md
@ -1,6 +1,6 @@
 ---
 title: "KCL Types"
-excerpt: "Documentation of types for the KCL standard library for the Zoo Modeling App."
+excerpt: "Documentation of types for the KCL standard library for the Zoo Design Studio."
 layout: manual
 ---

--- a/docs/kcl/types/Axis2d.md
+++ b/docs/kcl/types/Axis2d.md
@ -0,0 +1,12 @@
+---
+title: "std::Axis2d"
+excerpt: "An infinite line in 2d space."
+layout: manual
+---
+
+An infinite line in 2d space.
+
+
+
+
+
--- a/docs/kcl/types/Axis3d.md
+++ b/docs/kcl/types/Axis3d.md
@ -0,0 +1,12 @@
+---
+title: "std::Axis3d"
+excerpt: "An infinite line in 3d space."
+layout: manual
+---
+
+An infinite line in 3d space.
+
+
+
+
+
--- a/docs/kcl/types/Edge.md
+++ b/docs/kcl/types/Edge.md
@ -0,0 +1,12 @@
+---
+title: "std::Edge"
+excerpt: "The edge of a solid."
+layout: manual
+---
+
+The edge of a solid.
+
+
+
+
+
--- a/docs/kcl/union.md
+++ b/docs/kcl/union.md
--- a/e2e/playwright/boolean.spec.ts
+++ b/e2e/playwright/boolean.spec.ts
@ -46,8 +46,6 @@ test.describe('Point and click for boolean workflows', () => {
        localStorage.setItem('persistCode', file)
      }, file)
      await homePage.goToModelingScene()
-      await scene.waitForExecutionDone()
-
      await scene.settled(cmdBar)

      // Test coordinates for selection - these might need adjustment based on actual scene layout
@ -77,6 +75,7 @@ test.describe('Point and click for boolean workflows', () => {

        // Select first object in the scene, expect there to be a pixel diff from the selection color change
        await clickFirstObject({ pixelDiff: 50 })
+        await page.waitForTimeout(1000)

        // For subtract, we need to proceed to the next step before selecting the second object
        if (operationName !== 'subtract') {
@ -87,6 +86,8 @@ test.describe('Point and click for boolean workflows', () => {
        // Select second object
        await clickSecondObject({ pixelDiff: 50 })

+        await page.waitForTimeout(1000)
+
        // Confirm the operation in the command bar
        await cmdBar.progressCmdBar()

--- a/e2e/playwright/can-create-sketches-on-all-planes-and-their-back-sides.spec.ts
+++ b/e2e/playwright/can-create-sketches-on-all-planes-and-their-back-sides.spec.ts
@ -4,6 +4,7 @@ import { uuidv4 } from '@src/lib/utils'

 import type { HomePageFixture } from '@e2e/playwright/fixtures/homePageFixture'
 import type { SceneFixture } from '@e2e/playwright/fixtures/sceneFixture'
+import type { ToolbarFixture } from '@e2e/playwright/fixtures/toolbarFixture'
 import { getUtils } from '@e2e/playwright/test-utils'
 import { expect, test } from '@e2e/playwright/zoo-test'

@ -15,6 +16,7 @@ test.describe(
      page: Page,
      homePage: HomePageFixture,
      scene: SceneFixture,
+      toolbar: ToolbarFixture,
      plane: string,
      clickCoords: { x: number; y: number }
    ) => {
@ -59,9 +61,12 @@ test.describe(
      await u.sendCustomCmd(updateCamCommand)

      await u.closeDebugPanel()
+
      await page.mouse.click(clickCoords.x, clickCoords.y)
      await page.waitForTimeout(600) // wait for animation

+      await toolbar.waitUntilSketchingReady()
+
      await expect(
        page.getByRole('button', { name: 'line Line', exact: true })
      ).toBeVisible()
@ -117,11 +122,12 @@ test.describe(
    ]

    for (const config of planeConfigs) {
-      test(config.plane, async ({ page, homePage, scene }) => {
+      test(config.plane, async ({ page, homePage, scene, toolbar }) => {
        await sketchOnPlaneAndBackSideTest(
          page,
          homePage,
          scene,
+          toolbar,
          config.plane,
          config.coords
        )
--- a/e2e/playwright/code-pane-and-errors.spec.ts
+++ b/e2e/playwright/code-pane-and-errors.spec.ts
@ -15,6 +15,7 @@ test.describe('Code pane and errors', { tag: ['@skipWin'] }, () => {
    page,
    homePage,
    scene,
+    cmdBar,
  }) => {
    const u = await getUtils(page)

@ -36,7 +37,7 @@ extrude001 = extrude(sketch001, length = 5)`

    await page.setBodyDimensions({ width: 1200, height: 500 })
    await homePage.goToModelingScene()
-    await scene.waitForExecutionDone()
+    await scene.settled(cmdBar)

    // Ensure no badge is present
    const codePaneButtonHolder = page.locator('#code-button-holder')
@ -171,6 +172,8 @@ extrude001 = extrude(sketch001, length = 5)`
    context,
    page,
    homePage,
+    scene,
+    cmdBar,
  }) => {
    // Load the app with the working starter code
    await context.addInitScript((code) => {
@ -180,9 +183,7 @@ extrude001 = extrude(sketch001, length = 5)`
    await page.setBodyDimensions({ width: 1200, height: 500 })
    await homePage.goToModelingScene()

-    // FIXME: await scene.waitForExecutionDone() does not work. It still fails.
-    // I needed to increase this timeout to get this to pass.
-    await page.waitForTimeout(10000)
+    await scene.settled(cmdBar)

    // Ensure badge is present
    const codePaneButtonHolder = page.locator('#code-button-holder')
--- a/e2e/playwright/command-bar-tests.spec.ts
+++ b/e2e/playwright/command-bar-tests.spec.ts
@ -317,9 +317,13 @@ test.describe('Command bar tests', { tag: ['@skipWin'] }, () => {
  test('Can switch between sketch tools via command bar', async ({
    page,
    homePage,
+    scene,
+    cmdBar,
+    toolbar,
  }) => {
    await page.setBodyDimensions({ width: 1200, height: 500 })
    await homePage.goToModelingScene()
+    await scene.settled(cmdBar)

    const sketchButton = page.getByRole('button', { name: 'Start Sketch' })
    const cmdBarButton = page.getByRole('button', { name: 'Commands' })
@ -343,7 +347,9 @@ test.describe('Command bar tests', { tag: ['@skipWin'] }, () => {

    // Start a sketch
    await sketchButton.click()
+
    await page.mouse.click(700, 200)
+    await toolbar.waitUntilSketchingReady()

    // Switch between sketch tools via the command bar
    await expect(lineToolButton).toHaveAttribute('aria-pressed', 'true')
--- a/e2e/playwright/desktop-export.spec.ts
+++ b/e2e/playwright/desktop-export.spec.ts
@ -11,7 +11,7 @@ import { expect, test } from '@e2e/playwright/zoo-test'
 test(
  'export works on the first try',
  { tag: ['@electron', '@skipLocalEngine'] },
-  async ({ page, context, scene, tronApp }, testInfo) => {
+  async ({ page, context, scene, tronApp, cmdBar }, testInfo) => {
    if (!tronApp) {
      fail()
    }
@ -48,10 +48,7 @@ test(
      await expect(exportButton).toBeVisible()

      // Wait for the model to finish loading
-      const modelStateIndicator = page.getByTestId(
-        'model-state-indicator-execution-done'
-      )
-      await expect(modelStateIndicator).toBeVisible({ timeout: 60000 })
+      await scene.settled(cmdBar)

      const gltfOption = page.getByText('glTF')
      const submitButton = page.getByText('Confirm Export')
@ -124,8 +121,7 @@ test(
      // Close the file pane
      await u.closeFilePanel()

-      // FIXME: await scene.waitForExecutionDone() does not work. The modeling indicator stays in -receive-reliable and not execution done
-      await page.waitForTimeout(10000)
+      await scene.settled(cmdBar)

      // expect zero errors in guter
      await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
--- a/e2e/playwright/editor-tests.spec.ts
+++ b/e2e/playwright/editor-tests.spec.ts
@ -78,12 +78,14 @@ sketch001 = startSketchOn(XY)

    // Ensure we execute the first time.
    await u.openDebugPanel()
-    await expect(
-      page.locator('[data-receive-command-type="scene_clear_all"]')
-    ).toHaveCount(1)
-    await expect(
-      page.locator('[data-message-type="execution-done"]')
-    ).toHaveCount(2)
+    await expect
+      .poll(() =>
+        page.locator('[data-receive-command-type="scene_clear_all"]').count()
+      )
+      .toBe(1)
+    await expect
+      .poll(() => page.locator('[data-message-type="execution-done"]').count())
+      .toBe(2)

    // Add whitespace to the end of the code.
    await u.codeLocator.click()
@ -110,12 +112,14 @@ sketch001 = startSketchOn(XY)
  test('ensure we use the cache, and do not clear on append', async ({
    homePage,
    page,
+    scene,
+    cmdBar,
  }) => {
    const u = await getUtils(page)
    await page.setBodyDimensions({ width: 1000, height: 500 })

    await homePage.goToModelingScene()
-    await u.waitForPageLoad()
+    await scene.settled(cmdBar)

    await u.codeLocator.click()
    await page.keyboard.type(`sketch001 = startSketchOn(XY)
@ -499,7 +503,7 @@ sketch_001 = startSketchOn(XY)
    await page.keyboard.press('ArrowLeft')
    await page.keyboard.press('ArrowRight')

-    await scene.waitForExecutionDone()
+    await scene.connectionEstablished()

    // error in guter
    await expect(page.locator('.cm-lint-marker-info').first()).toBeVisible()
@ -1274,4 +1278,45 @@ sketch001 = startSketchOn(XZ)
      await middleMousePan(800, 200, 900, 300)
    })
  })
+
+  test('Can select lines on the main axis', async ({
+    page,
+    homePage,
+    toolbar,
+  }) => {
+    await page.addInitScript(async () => {
+      localStorage.setItem(
+        'persistCode',
+        `sketch001 = startSketchOn(XZ)
+  profile001 = startProfileAt([100.00, 100.0], sketch001)
+    |> yLine(length = -100.0)
+    |> xLine(length = 200.0)
+    |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+    |> close()`
+      )
+    })
+
+    const width = 1200
+    const height = 800
+    const viewportSize = { width, height }
+    await page.setBodyDimensions(viewportSize)
+
+    await homePage.goToModelingScene()
+
+    const u = await getUtils(page)
+    await u.waitForPageLoad()
+
+    await toolbar.editSketch(0)
+
+    await page.waitForTimeout(1000)
+
+    // Click on the bottom segment that lies on the x axis
+    await page.mouse.click(width * 0.85, height / 2)
+
+    await page.waitForTimeout(1000)
+
+    // Verify segment is selected (you can check for visual indicators or state)
+    const element = page.locator('[data-overlay-index="1"]')
+    await expect(element).toHaveAttribute('data-overlay-visible', 'true')
+  })
 })
--- a/e2e/playwright/feature-tree-pane.spec.ts
+++ b/e2e/playwright/feature-tree-pane.spec.ts
@ -22,7 +22,7 @@ sketch001 = startSketchOn(XZ)
  |> angledLine([-45, length001], %)
  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
  |> close()
-revolve001 = revolve(sketch001, axis = "X")
+revolve001 = revolve(sketch001, axis = X)
 triangle()
  |> extrude(length = 30)
 plane001 = offsetPlane(XY, offset = 10)
@ -64,7 +64,7 @@ test.describe('Feature Tree pane', () => {
  test(
    'User can go to definition and go to function definition',
    { tag: '@electron' },
-    async ({ context, homePage, scene, editor, toolbar }) => {
+    async ({ context, homePage, scene, editor, toolbar, cmdBar, page }) => {
      await context.folderSetupFn(async (dir) => {
        const bracketDir = join(dir, 'test-sample')
        await fsp.mkdir(bracketDir, { recursive: true })
@ -86,9 +86,13 @@ test.describe('Feature Tree pane', () => {
          sortBy: 'last-modified-desc',
        })
        await homePage.openProject('test-sample')
-        await scene.waitForExecutionDone()
-        await editor.closePane()
+        await scene.connectionEstablished()
+        await scene.settled(cmdBar)
+
        await toolbar.openFeatureTreePane()
+        await expect
+          .poll(() => page.getByText('Feature tree').count())
+          .toBeGreaterThan(1)
      })

      async function testViewSource({
@ -127,7 +131,7 @@ test.describe('Feature Tree pane', () => {
      await testViewSource({
        operationName: 'Revolve',
        operationIndex: 0,
-        expectedActiveLine: 'revolve001 = revolve(sketch001, axis = "X")',
+        expectedActiveLine: 'revolve001 = revolve(sketch001, axis = X)',
      })
      await testViewSource({
        operationName: 'Triangle',
@ -254,7 +258,7 @@ test.describe('Feature Tree pane', () => {
        sortBy: 'last-modified-desc',
      })
      await homePage.openProject('test-sample')
-      await scene.waitForExecutionDone()
+      await scene.settled(cmdBar)
      await toolbar.openFeatureTreePane()
    })

@ -339,7 +343,7 @@ test.describe('Feature Tree pane', () => {
        sortBy: 'last-modified-desc',
      })
      await homePage.openProject('test-sample')
-      await scene.waitForExecutionDone()
+      await scene.settled(cmdBar)
      await toolbar.openFeatureTreePane()
    })

@ -414,8 +418,7 @@ profile003 = startProfileAt([0, -4.93], sketch001)
    const planeColor: [number, number, number] = [74, 74, 74]

    await homePage.openProject('test-sample')
-    // FIXME: @lf94 has a better way to verify execution completion, in a PR rn
-    await scene.waitForExecutionDone()
+    await scene.settled(cmdBar)

    await test.step(`Verify we see the sketch`, async () => {
      await scene.expectPixelColor(sketchColor, testPoint, 10)
--- a/e2e/playwright/file-tree.spec.ts
+++ b/e2e/playwright/file-tree.spec.ts
@ -47,6 +47,7 @@ test.describe('integrations tests', () => {
        await scene.connectionEstablished()
        await scene.settled(cmdBar)
        await clickObj()
+        await page.waitForTimeout(1000)
        await scene.moveNoWhere()
        await editor.expectState({
          activeLines: [
@ -72,11 +73,11 @@ test.describe('integrations tests', () => {
      })
      await test.step('setup for next assertion', async () => {
        await toolbar.openFile('main.kcl')
-
-        await scene.settled(cmdBar)
-
+        await page.waitForTimeout(1000)
        await clickObj()
+        await page.waitForTimeout(1000)
        await scene.moveNoWhere()
+        await page.waitForTimeout(1000)
        await editor.expectState({
          activeLines: [
            '|>startProfileAt([75.8,317.2],%)//[$startCapTag,$EndCapTag]',
@ -89,7 +90,7 @@ test.describe('integrations tests', () => {
        await toolbar.expectFileTreeState(['main.kcl', fileName])
      })
      await test.step('check sketch mode is exited when opening a different file', async () => {
-        await toolbar.openFile(fileName, { wait: false })
+        await toolbar.openFile(fileName)

        // check we're out of sketch mode
        await expect(toolbar.exitSketchBtn).not.toBeVisible()
--- a/e2e/playwright/fixtures/cmdBarFixture.ts
+++ b/e2e/playwright/fixtures/cmdBarFixture.ts
@ -112,22 +112,16 @@ export class CmdBarFixture {
   * and assumes we are past the `pickCommand` step.
   */
  progressCmdBar = async (shouldFuzzProgressMethod = true) => {
-    // FIXME: Progressing the command bar is a race condition. We have an async useEffect that reports the final state via useCalculateKclExpression. If this does not run quickly enough, it will not "fail" the continue because you can press continue if the state is not ready. E2E tests do not know this.
-    // Wait 1250ms to assume the await executeAst of the KCL input field is finished
-    await this.page.waitForTimeout(1250)
-    if (shouldFuzzProgressMethod || Math.random() > 0.5) {
-      const arrowButton = this.page.getByRole('button', {
-        name: 'arrow right Continue',
-      })
-      if (await arrowButton.isVisible()) {
-        await arrowButton.click()
-      } else {
-        await this.page
-          .getByRole('button', { name: 'checkmark Submit command' })
-          .click()
-      }
+    await this.page.waitForTimeout(2000)
+    const arrowButton = this.page.getByRole('button', {
+      name: 'arrow right Continue',
+    })
+    if (await arrowButton.isVisible()) {
+      await arrowButton.click()
    } else {
-      await this.page.keyboard.press('Enter')
+      await this.page
+        .getByRole('button', { name: 'checkmark Submit command' })
+        .click()
    }
  }

--- a/e2e/playwright/fixtures/fixtureSetup.ts
+++ b/e2e/playwright/fixtures/fixtureSetup.ts
@ -39,7 +39,8 @@ export class AuthenticatedApp {
  }

  async initialise(code = '') {
-    await setup(this.context, this.page, this.testInfo)
+    const testDir = this.testInfo.outputPath('electron-test-projects-dir')
+    await setup(this.context, this.page, testDir, this.testInfo)
    const u = await getUtils(this.page)

    await this.page.addInitScript(async (code) => {
@ -102,11 +103,11 @@ export class ElectronZoo {
            return resolve(undefined)
          }

-          if (Date.now() - timeA > 10000) {
+          if (Date.now() - timeA > 3000) {
            return resolve(undefined)
          }

-          setTimeout(checkDisconnected, 0)
+          setTimeout(checkDisconnected, 1)
        }
        checkDisconnected()
      })
@ -128,11 +129,9 @@ export class ElectronZoo {
    const that = this

    const options = {
-      timeout: 120000,
      args: ['.', '--no-sandbox'],
      env: {
        ...process.env,
-        TEST_SETTINGS_FILE_KEY: this.projectDirName,
        IS_PLAYWRIGHT: 'true',
      },
      ...(process.env.ELECTRON_OVERRIDE_DIST_PATH
@ -155,6 +154,7 @@ export class ElectronZoo {
    if (!this.electron) {
      this.electron = await electron.launch(options)

+      this.page = await this.electron.firstWindow()
      // Mac takes quite a long time to create the first window in CI.
      // Turns out we can't trust firstWindow() either. So loop.
      let timeoutId: ReturnType<typeof setTimeout>
@ -177,11 +177,37 @@ export class ElectronZoo {

      this.context = this.electron.context()
      await this.context.tracing.start({ screenshots: true, snapshots: true })
+
+      // We need to patch this because addInitScript will bind too late in our
+      // electron tests, never running. We need to call reload() after each call
+      // to guarantee it runs.
+      const oldContextAddInitScript = this.context.addInitScript
+      this.context.addInitScript = async function (a, b) {
+        // @ts-ignore pretty sure way out of tsc's type checking capabilities.
+        // This code works perfectly fine.
+        await oldContextAddInitScript.apply(this, [a, b])
+        await that.page.reload()
+      }
+
+      const oldPageAddInitScript = this.page.addInitScript
+      this.page.addInitScript = async function (a: any, b: any) {
+        // @ts-ignore pretty sure way out of tsc's type checking capabilities.
+        // This code works perfectly fine.
+        await oldPageAddInitScript.apply(this, [a, b])
+        await that.page.reload()
+      }
    }

    await this.context.tracing.startChunk()

-    await setup(this.context, this.page, testInfo)
+    // THIS IS ABSOLUTELY NECESSARY TO CHANGE THE PROJECT DIRECTORY BETWEEN
+    // TESTS BECAUSE OF THE ELECTRON INSTANCE REUSE.
+    await this.electron?.evaluate(({ app }, projectDirName) => {
+      // @ts-ignore can't declaration merge see main.ts
+      app.testProperty['TEST_SETTINGS_FILE_KEY'] = projectDirName
+    }, this.projectDirName)
+
+    await setup(this.context, this.page, this.projectDirName, testInfo)

    await this.cleanProjectDir()

@ -219,26 +245,6 @@ export class ElectronZoo {
        }))
    }

-    // We need to patch this because addInitScript will bind too late in our
-    // electron tests, never running. We need to call reload() after each call
-    // to guarantee it runs.
-    const oldContextAddInitScript = this.context.addInitScript
-    this.context.addInitScript = async function (a, b) {
-      // @ts-ignore pretty sure way out of tsc's type checking capabilities.
-      // This code works perfectly fine.
-      await oldContextAddInitScript.apply(this, [a, b])
-      await that.page.reload()
-    }
-
-    // No idea why we mix and match page and context's addInitScript but we do
-    const oldPageAddInitScript = this.page.addInitScript
-    this.page.addInitScript = async function (a: any, b: any) {
-      // @ts-ignore pretty sure way out of tsc's type checking capabilities.
-      // This code works perfectly fine.
-      await oldPageAddInitScript.apply(this, [a, b])
-      await that.page.reload()
-    }
-
    if (!this.firstUrl) {
      await this.page.getByText('Your Projects').count()
      this.firstUrl = this.page.url()
@ -251,11 +257,6 @@ export class ElectronZoo {
    //   return app.reuseWindowForTest();
    // });

-    await this.electron?.evaluate(({ app }, projectDirName) => {
-      // @ts-ignore can't declaration merge see main.ts
-      app.testProperty['TEST_SETTINGS_FILE_KEY'] = projectDirName
-    }, this.projectDirName)
-
    // Always start at the root view
    await this.page.goto(this.firstUrl)

@ -279,8 +280,9 @@ export class ElectronZoo {
      // Not a problem if it already exists.
    }

-    const tempSettingsFilePath = path.join(
+    const tempSettingsFilePath = path.resolve(
      this.projectDirName,
+      '..',
      SETTINGS_FILE_NAME
    )

--- a/e2e/playwright/fixtures/homePageFixture.ts
+++ b/e2e/playwright/fixtures/homePageFixture.ts
@ -96,7 +96,7 @@ export class HomePageFixture {
    await expect(this.projectSection).not.toHaveText('Loading your Projects...')
  }

-  createAndGoToProject = async (projectTitle = 'project-$nnn') => {
+  createAndGoToProject = async (projectTitle = 'untitled') => {
    await this.projectsLoaded()
    await this.projectButtonNew.click()
    await this.projectTextName.click()
--- a/e2e/playwright/fixtures/sceneFixture.ts
+++ b/e2e/playwright/fixtures/sceneFixture.ts
@ -43,21 +43,13 @@ type DragFromHandler = (
 export class SceneFixture {
  public page: Page
  public streamWrapper!: Locator
-  public loadingIndicator!: Locator
  public networkToggleConnected!: Locator
  public startEditSketchBtn!: Locator

-  get exeIndicator() {
-    return this.page
-      .getByTestId('model-state-indicator-execution-done')
-      .or(this.page.getByTestId('model-state-indicator-receive-reliable'))
-  }
-
  constructor(page: Page) {
    this.page = page
    this.streamWrapper = page.getByTestId('stream')
    this.networkToggleConnected = page.getByTestId('network-toggle-ok')
-    this.loadingIndicator = this.streamWrapper.getByTestId('loading')
    this.startEditSketchBtn = page
      .getByRole('button', { name: 'Start Sketch' })
      .or(page.getByRole('button', { name: 'Edit Sketch' }))
@ -231,10 +223,6 @@ export class SceneFixture {
    }
  }

-  waitForExecutionDone = async () => {
-    await expect(this.exeIndicator).toBeVisible({ timeout: 30000 })
-  }
-
  connectionEstablished = async () => {
    const timeout = 30000
    await expect(this.networkToggleConnected).toBeVisible({ timeout })
@ -243,6 +231,9 @@ export class SceneFixture {
  settled = async (cmdBar: CmdBarFixture) => {
    const u = await getUtils(this.page)

+    await expect(this.startEditSketchBtn).not.toBeDisabled()
+    await expect(this.startEditSketchBtn).toBeVisible()
+
    await cmdBar.openCmdBar()
    await cmdBar.chooseCommand('Settings · app · show debug panel')
    await cmdBar.selectOption({ name: 'on' }).click()
@ -250,10 +241,6 @@ export class SceneFixture {
    await u.openDebugPanel()
    await u.expectCmdLog('[data-message-type="execution-done"]')
    await u.closeDebugPanel()
-
-    await this.waitForExecutionDone()
-    await expect(this.startEditSketchBtn).not.toBeDisabled()
-    await expect(this.startEditSketchBtn).toBeVisible()
  }

  expectPixelColor = async (
--- a/e2e/playwright/fixtures/toolbarFixture.ts
+++ b/e2e/playwright/fixtures/toolbarFixture.ts
@ -84,12 +84,6 @@ export class ToolbarFixture {
    return this.page.getByTestId('app-logo')
  }

-  get exeIndicator() {
-    return this.page
-      .getByTestId('model-state-indicator-receive-reliable')
-      .or(this.page.getByTestId('model-state-indicator-execution-done'))
-  }
-
  startSketchPlaneSelection = async () =>
    doAndWaitForImageDiff(this.page, () => this.startSketchBtn.click(), 500)

@ -165,16 +159,10 @@ export class ToolbarFixture {
    }
  }
  /**
-   * Opens file by it's name and waits for execution to finish
+   * Opens file by it's name
   */
-  openFile = async (
-    fileName: string,
-    { wait }: { wait?: boolean } = { wait: true }
-  ) => {
+  openFile = async (fileName: string) => {
    await this.filePane.getByText(fileName).click()
-    if (wait) {
-      await expect(this.exeIndicator).toBeVisible({ timeout: 15_000 })
-    }
  }
  selectCenterRectangle = async () => {
    await this.page
--- a/e2e/playwright/import-ui.spec.ts
+++ b/e2e/playwright/import-ui.spec.ts
@ -0,0 +1,121 @@
+import { expect, test } from '@e2e/playwright/zoo-test'
+import * as fsp from 'fs/promises'
+import path from 'path'
+
+test.describe('Import UI tests', () => {
+  test('shows toast when trying to sketch on imported face', async ({
+    context,
+    page,
+    homePage,
+    toolbar,
+    scene,
+    editor,
+    cmdBar,
+  }) => {
+    await context.folderSetupFn(async (dir) => {
+      const projectDir = path.join(dir, 'import-test')
+      await fsp.mkdir(projectDir, { recursive: true })
+
+      // Create the imported file
+      await fsp.writeFile(
+        path.join(projectDir, 'toBeImported.kcl'),
+        `sketch001 = startSketchOn(XZ)
+profile001 = startProfileAt([281.54, 305.81], sketch001)
+  |> angledLine([0, 123.43], %, $rectangleSegmentA001)
+  |> angledLine([
+       segAng(rectangleSegmentA001) - 90,
+       85.99
+     ], %)
+  |> angledLine([
+       segAng(rectangleSegmentA001),
+       -segLen(rectangleSegmentA001)
+     ], %)
+  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+  |> close()
+extrude(profile001, length = 100)`
+      )
+
+      // Create the main file that imports
+      await fsp.writeFile(
+        path.join(projectDir, 'main.kcl'),
+        `import "toBeImported.kcl" as importedCube
+
+importedCube
+
+sketch001 = startSketchOn(XZ)
+profile001 = startProfileAt([-134.53, -56.17], sketch001)
+  |> angledLine([0, 79.05], %, $rectangleSegmentA001)
+  |> angledLine([
+       segAng(rectangleSegmentA001) - 90,
+       76.28
+     ], %)
+  |> angledLine([
+       segAng(rectangleSegmentA001),
+       -segLen(rectangleSegmentA001)
+     ], %, $seg01)
+  |> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $seg02)
+  |> close()
+extrude001 = extrude(profile001, length = 100)
+sketch003 = startSketchOn(extrude001, seg02)
+sketch002 = startSketchOn(extrude001, seg01)`
+      )
+    })
+
+    await homePage.openProject('import-test')
+    await scene.settled(cmdBar)
+
+    await scene.moveCameraTo(
+      {
+        x: -114,
+        y: -897,
+        z: 475,
+      },
+      {
+        x: -114,
+        y: -51,
+        z: 83,
+      }
+    )
+    const [_, hoverOverNonImport] = scene.makeMouseHelpers(611, 364)
+    const [importedFaceClick, hoverOverImported] = scene.makeMouseHelpers(
+      940,
+      150
+    )
+
+    await test.step('check code highlight works for code define in the file being edited', async () => {
+      await hoverOverNonImport()
+      await editor.expectState({
+        highlightedCode: 'startProfileAt([-134.53,-56.17],sketch001)',
+        diagnostics: [],
+        activeLines: ['import"toBeImported.kcl"asimportedCube'],
+      })
+    })
+
+    await test.step('check code does nothing when geometry is defined in an import', async () => {
+      await hoverOverImported()
+      await editor.expectState({
+        highlightedCode: '',
+        diagnostics: [],
+        activeLines: ['import"toBeImported.kcl"asimportedCube'],
+      })
+    })
+
+    await test.step('check the user is warned when sketching on a imported face', async () => {
+      // Start sketch mode
+      await toolbar.startSketchPlaneSelection()
+
+      // Click on a face from the imported model
+      // await new Promise(() => {})
+      await importedFaceClick()
+
+      // Verify toast appears with correct content
+      await expect(page.getByText('This face is from an import')).toBeVisible()
+      await expect(
+        page.locator('.font-mono').getByText('toBeImported.kcl')
+      ).toBeVisible()
+      await expect(
+        page.getByText('Please select this from the files pane to edit')
+      ).toBeVisible()
+    })
+  })
+})
--- a/e2e/playwright/lib/electron-helpers.ts
+++ b/e2e/playwright/lib/electron-helpers.ts
@ -0,0 +1,7 @@
+export const throwError = (message: string): never => {
+  throw new Error(message)
+}
+
+export const throwTronAppMissing = () => {
+  throwError('tronApp is missing')
+}
--- a/e2e/playwright/machines.spec.ts
+++ b/e2e/playwright/machines.spec.ts
@ -7,7 +7,7 @@ import { expect, test } from '@e2e/playwright/zoo-test'
 test(
  'When machine-api server not found butt is disabled and shows the reason',
  { tag: '@electron' },
-  async ({ context, page }, testInfo) => {
+  async ({ context, page, scene, cmdBar }, testInfo) => {
    await context.folderSetupFn(async (dir) => {
      const bracketDir = join(dir, 'bracket')
      await fsp.mkdir(bracketDir, { recursive: true })
@ -23,10 +23,7 @@ test(

    await page.getByText('bracket').click()

-    await expect(page.getByTestId('loading')).toBeAttached()
-    await expect(page.getByTestId('loading')).not.toBeAttached({
-      timeout: 20_000,
-    })
+    await scene.settled(cmdBar)

    const notFoundText = 'Machine API server was not discovered'
    await expect(page.getByText(notFoundText).first()).not.toBeVisible()
@ -47,7 +44,7 @@ test(
 test(
  'When machine-api server not found home screen & project status shows the reason',
  { tag: '@electron' },
-  async ({ context, page }, testInfo) => {
+  async ({ context, page, scene, cmdBar }, testInfo) => {
    await context.folderSetupFn(async (dir) => {
      const bracketDir = join(dir, 'bracket')
      await fsp.mkdir(bracketDir, { recursive: true })
@ -71,10 +68,7 @@ test(

    await page.getByText('bracket').click()

-    await expect(page.getByTestId('loading')).toBeAttached()
-    await expect(page.getByTestId('loading')).not.toBeAttached({
-      timeout: 20_000,
-    })
+    await scene.settled(cmdBar)

    await expect(page.getByText(notFoundText).nth(1)).not.toBeVisible()

--- a/e2e/playwright/named-views.spec.ts
+++ b/e2e/playwright/named-views.spec.ts
@ -88,7 +88,7 @@ test.describe('Named view tests', () => {

    // Create and load project
    await createProject({ name: projectName, page })
-    await scene.waitForExecutionDone()
+    await scene.settled(cmdBar)

    // Create named view
    const projectDirName = testInfo.outputPath('electron-test-projects-dir')
@ -110,14 +110,17 @@ test.describe('Named view tests', () => {
      expect(exists).toBe(true)
    }).toPass()

-    // Read project.toml into memory
-    let tomlString = await fsp.readFile(tempProjectSettingsFilePath, 'utf-8')
-    // Rewrite the uuids in the named views to match snapshot otherwise they will be randomly generated from rust and break
-    tomlString = tomlStringOverWriteNamedViewUuids(tomlString)
+    await expect(async () => {
+      // Read project.toml into memory
+      let tomlString = await fsp.readFile(tempProjectSettingsFilePath, 'utf-8')

-    // Write the entire tomlString to a snapshot.
-    // There are many key/value pairs to check this is a safer match.
-    expect(tomlString).toMatchSnapshot('verify-named-view-gets-created')
+      // Rewrite the uuids in the named views to match snapshot otherwise they will be randomly generated from rust and break
+      tomlString = tomlStringOverWriteNamedViewUuids(tomlString)
+
+      // Write the entire tomlString to a snapshot.
+      // There are many key/value pairs to check this is a safer match.
+      expect(tomlString).toMatchSnapshot('verify-named-view-gets-created')
+    }).toPass()
  })
  test('Verify named view gets deleted', async ({
    cmdBar,
@ -130,7 +133,7 @@ test.describe('Named view tests', () => {

    // Create project and go into the project
    await createProject({ name: projectName, page })
-    await scene.waitForExecutionDone()
+    await scene.settled(cmdBar)

    // Create a new named view
    await cmdBar.openCmdBar()
@ -152,14 +155,16 @@ test.describe('Named view tests', () => {
      expect(exists).toBe(true)
    }).toPass()

-    // Read project.toml into memory
-    let tomlString = await fsp.readFile(tempProjectSettingsFilePath, 'utf-8')
-    // Rewrite the uuids in the named views to match snapshot otherwise they will be randomly generated from rust and break
-    tomlString = tomlStringOverWriteNamedViewUuids(tomlString)
+    await expect(async () => {
+      // Read project.toml into memory
+      let tomlString = await fsp.readFile(tempProjectSettingsFilePath, 'utf-8')
+      // Rewrite the uuids in the named views to match snapshot otherwise they will be randomly generated from rust and break
+      tomlString = tomlStringOverWriteNamedViewUuids(tomlString)

-    // Write the entire tomlString to a snapshot.
-    // There are many key/value pairs to check this is a safer match.
-    expect(tomlString).toMatchSnapshot('verify-named-view-gets-created')
+      // Write the entire tomlString to a snapshot.
+      // There are many key/value pairs to check this is a safer match.
+      expect(tomlString).toMatchSnapshot('verify-named-view-gets-created')
+    }).toPass()

    // Delete a named view
    await cmdBar.openCmdBar()
@ -167,14 +172,16 @@ test.describe('Named view tests', () => {
    cmdBar.selectOption({ name: myNamedView2 })
    await cmdBar.progressCmdBar(false)

-    // Read project.toml into memory again since we deleted a named view
-    tomlString = await fsp.readFile(tempProjectSettingsFilePath, 'utf-8')
-    // Rewrite the uuids in the named views to match snapshot otherwise they will be randomly generated from rust and break
-    tomlString = tomlStringOverWriteNamedViewUuids(tomlString)
+    await expect(async () => {
+      // Read project.toml into memory again since we deleted a named view
+      let tomlString = await fsp.readFile(tempProjectSettingsFilePath, 'utf-8')
+      // Rewrite the uuids in the named views to match snapshot otherwise they will be randomly generated from rust and break
+      tomlString = tomlStringOverWriteNamedViewUuids(tomlString)

-    // // Write the entire tomlString to a snapshot.
-    // // There are many key/value pairs to check this is a safer match.
-    expect(tomlString).toMatchSnapshot('verify-named-view-gets-deleted')
+      // // Write the entire tomlString to a snapshot.
+      // // There are many key/value pairs to check this is a safer match.
+      expect(tomlString).toMatchSnapshot('verify-named-view-gets-deleted')
+    }).toPass()
  })
  test('Verify named view gets loaded', async ({
    cmdBar,
@ -186,7 +193,7 @@ test.describe('Named view tests', () => {

    // Create project and go into the project
    await createProject({ name: projectName, page })
-    await scene.waitForExecutionDone()
+    await scene.settled(cmdBar)

    // Create a new named view
    await cmdBar.openCmdBar()
@ -208,14 +215,16 @@ test.describe('Named view tests', () => {
      expect(exists).toBe(true)
    }).toPass()

-    // Read project.toml into memory
-    let tomlString = await fsp.readFile(tempProjectSettingsFilePath, 'utf-8')
-    // Rewrite the uuids in the named views to match snapshot otherwise they will be randomly generated from rust and break
-    tomlString = tomlStringOverWriteNamedViewUuids(tomlString)
+    await expect(async () => {
+      // Read project.toml into memory
+      let tomlString = await fsp.readFile(tempProjectSettingsFilePath, 'utf-8')
+      // Rewrite the uuids in the named views to match snapshot otherwise they will be randomly generated from rust and break
+      tomlString = tomlStringOverWriteNamedViewUuids(tomlString)

-    // Write the entire tomlString to a snapshot.
-    // There are many key/value pairs to check this is a safer match.
-    expect(tomlString).toMatchSnapshot('verify-named-view-gets-created')
+      // Write the entire tomlString to a snapshot.
+      // There are many key/value pairs to check this is a safer match.
+      expect(tomlString).toMatchSnapshot('verify-named-view-gets-created')
+    }).toPass()

    // Create a load a named view
    await cmdBar.openCmdBar()
@ -239,7 +248,7 @@ test.describe('Named view tests', () => {

    // Create and load project
    await createProject({ name: projectName, page })
-    await scene.waitForExecutionDone()
+    await scene.settled(cmdBar)

    // Create named view
    const projectDirName = testInfo.outputPath('electron-test-projects-dir')
@ -282,13 +291,15 @@ test.describe('Named view tests', () => {
      expect(exists).toBe(true)
    }).toPass()

-    // Read project.toml into memory
-    let tomlString = await fsp.readFile(tempProjectSettingsFilePath, 'utf-8')
-    // Rewrite the uuids in the named views to match snapshot otherwise they will be randomly generated from rust and break
-    tomlString = tomlStringOverWriteNamedViewUuids(tomlString)
+    await expect(async () => {
+      // Read project.toml into memory
+      let tomlString = await fsp.readFile(tempProjectSettingsFilePath, 'utf-8')
+      // Rewrite the uuids in the named views to match snapshot otherwise they will be randomly generated from rust and break
+      tomlString = tomlStringOverWriteNamedViewUuids(tomlString)

-    // Write the entire tomlString to a snapshot.
-    // There are many key/value pairs to check this is a safer match.
-    expect(tomlString).toMatchSnapshot('verify-two-named-view-gets-created')
+      // Write the entire tomlString to a snapshot.
+      // There are many key/value pairs to check this is a safer match.
+      expect(tomlString).toMatchSnapshot('verify-two-named-view-gets-created')
+    }).toPass()
  })
 })
--- a/e2e/playwright/native-file-menu.spec.ts
+++ b/e2e/playwright/native-file-menu.spec.ts
--- a/e2e/playwright/onboarding-tests.spec.ts
+++ b/e2e/playwright/onboarding-tests.spec.ts
@ -42,10 +42,10 @@ test.describe('Onboarding tests', () => {
    await homePage.goToModelingScene()

    // Test that the onboarding pane loaded
-    await expect(page.getByText('Welcome to Modeling App! This')).toBeVisible()
+    await expect(page.getByText('Welcome to Design Studio! This')).toBeVisible()

    // Test that the onboarding pane loaded
-    await expect(page.getByText('Welcome to Modeling App! This')).toBeVisible()
+    await expect(page.getByText('Welcome to Design Studio! This')).toBeVisible()

    // *and* that the code is shown in the editor
    await expect(page.locator('.cm-content')).toContainText('// Shelf Bracket')
@ -86,7 +86,7 @@ test.describe('Onboarding tests', () => {
      await test.step(`Ensure we see the onboarding stuff`, async () => {
        // Test that the onboarding pane loaded
        await expect(
-          page.getByText('Welcome to Modeling App! This')
+          page.getByText('Welcome to Design Studio! This')
        ).toBeVisible()

        // *and* that the code is shown in the editor
@ -147,7 +147,7 @@ test.describe('Onboarding tests', () => {
    await nextButton.click()

    // Ensure we see the introduction and that the code has been reset
-    await expect(page.getByText('Welcome to Modeling App!')).toBeVisible()
+    await expect(page.getByText('Welcome to Design Studio!')).toBeVisible()
    await expect(page.locator('.cm-content')).toContainText('// Shelf Bracket')

    // There used to be old code here that checked if we stored the reset
@ -188,7 +188,7 @@ test.describe('Onboarding tests', () => {
    await homePage.goToModelingScene()

    // Test that the onboarding pane loaded
-    await expect(page.getByText('Welcome to Modeling App! This')).toBeVisible()
+    await expect(page.getByText('Welcome to Design Studio! This')).toBeVisible()

    const nextButton = page.getByTestId('onboarding-next')
    const prevButton = page.getByTestId('onboarding-prev')
@ -494,7 +494,7 @@ test('Restarting onboarding on desktop takes one attempt', async ({
  const tutorialProjectIndicator = page
    .getByTestId('project-sidebar-toggle')
    .filter({ hasText: 'Tutorial Project 00' })
-  const tutorialModalText = page.getByText('Welcome to Modeling App!')
+  const tutorialModalText = page.getByText('Welcome to Design Studio!')
  const tutorialDismissButton = page.getByRole('button', { name: 'Dismiss' })
  const userMenuButton = page.getByTestId('user-sidebar-toggle')
  const userMenuSettingsButton = page.getByRole('button', {
--- a/e2e/playwright/point-click.spec.ts
+++ b/e2e/playwright/point-click.spec.ts
@ -5,13 +5,14 @@ import path from 'node:path'
 import type { EditorFixture } from '@e2e/playwright/fixtures/editorFixture'
 import type { SceneFixture } from '@e2e/playwright/fixtures/sceneFixture'
 import type { ToolbarFixture } from '@e2e/playwright/fixtures/toolbarFixture'
-import { getUtils, orRunWhenFullSuiteEnabled } from '@e2e/playwright/test-utils'
+import { orRunWhenFullSuiteEnabled } from '@e2e/playwright/test-utils'
 import { expect, test } from '@e2e/playwright/zoo-test'

 // test file is for testing point an click code gen functionality that's not sketch mode related

 test.describe('Point-and-click tests', () => {
  test('verify extruding circle works', async ({
+    page,
    context,
    homePage,
    cmdBar,
@ -30,8 +31,9 @@ test.describe('Point-and-click tests', () => {
    await context.addInitScript((file) => {
      localStorage.setItem('persistCode', file)
    }, file)
+
    await homePage.goToModelingScene()
-    await scene.waitForExecutionDone()
+    await scene.connectionEstablished()

    const [clickCircle, moveToCircle] = scene.makeMouseHelpers(582, 217)

@ -72,7 +74,6 @@ test.describe('Point-and-click tests', () => {

    await test.step('do extrude flow and check extrude code is added to editor', async () => {
      await toolbar.extrudeButton.click()
-
      await cmdBar.expectState({
        stage: 'arguments',
        currentArgKey: 'distance',
@ -186,6 +187,7 @@ test.describe('Point-and-click tests', () => {
      editor,
      toolbar,
      scene,
+      cmdBar,
    }) => {
      const file = await fs.readFile(
        path.resolve(
@ -200,9 +202,7 @@ test.describe('Point-and-click tests', () => {
      }, file)
      await page.setBodyDimensions({ width: 1000, height: 500 })
      await homePage.goToModelingScene()
-      await expect(
-        page.getByTestId('model-state-indicator-receive-reliable')
-      ).toBeVisible()
+      await scene.settled(cmdBar)

      const sketchOnAChamfer = _sketchOnAChamfer(page, editor, toolbar, scene)

@ -377,6 +377,7 @@ profile001 = startProfileAt([205.96, 254.59], sketch002)
      editor,
      toolbar,
      scene,
+      cmdBar,
    }) => {
      const file = await fs.readFile(
        path.resolve(
@ -392,7 +393,7 @@ profile001 = startProfileAt([205.96, 254.59], sketch002)
      await page.setBodyDimensions({ width: 1000, height: 500 })
      await homePage.goToModelingScene()

-      await scene.waitForExecutionDone()
+      await scene.settled(cmdBar)

      const sketchOnAChamfer = _sketchOnAChamfer(page, editor, toolbar, scene)

@ -479,6 +480,7 @@ profile001 = startProfileAt([205.96, 254.59], sketch002)
    await page.setBodyDimensions(viewPortSize)

    await homePage.goToModelingScene()
+    await scene.connectionEstablished()

    // Constants and locators
    // These are mappings from screenspace to KCL coordinates,
@ -537,8 +539,7 @@ profile001 = startProfileAt([205.96, 254.59], sketch002)
      await toolbar.startSketchPlaneSelection()
      await moveToXzPlane()
      await clickOnXzPlane()
-      // timeout wait for engine animation is unavoidable
-      await page.waitForTimeout(600)
+      await toolbar.waitUntilSketchingReady()
      await editor.expectEditor.toContain(expectedCodeSnippets.sketchOnXzPlane)
    })
    await test.step(`Place a point a few pixels off the middle, verify it still snaps to 0,0`, async () => {
@ -580,9 +581,8 @@ profile001 = startProfileAt([205.96, 254.59], sketch002)
    editor,
    toolbar,
    scene,
+    cmdBar,
  }) => {
-    const u = await getUtils(page)
-
    const initialCode = `closedSketch = startSketchOn(XZ)
  |> circle(center = [8, 5], radius = 2)
 openSketch = startSketchOn(XY)
@ -599,8 +599,6 @@ openSketch = startSketchOn(XY)
    }, initialCode)

    await homePage.goToModelingScene()
-    await u.waitForPageLoad()
-    await page.waitForTimeout(1000)

    const pointInsideCircle = {
      x: viewPortSize.width * 0.63,
@ -625,15 +623,16 @@ openSketch = startSketchOn(XY)
    const exitSketch = async () => {
      await test.step(`Exit sketch mode`, async () => {
        await toolbar.exitSketchBtn.click()
-        await expect(toolbar.exitSketchBtn).not.toBeVisible()
        await expect(toolbar.startSketchBtn).toBeEnabled()
      })
    }

    await test.step(`Double-click on the closed sketch`, async () => {
+      await scene.settled(cmdBar)
      await moveToCircle()
+      await page.waitForTimeout(1000)
      await dblClickCircle()
-      await expect(toolbar.startSketchBtn).not.toBeVisible()
+      await page.waitForTimeout(1000)
      await expect(toolbar.exitSketchBtn).toBeVisible()
      await editor.expectState({
        activeLines: [`|>circle(center=[8,5],radius=2)`],
@ -670,7 +669,6 @@ openSketch = startSketchOn(XY)
      // There is a full execution after exiting sketch that clears the scene.
      await page.waitForTimeout(500)
      await dblClickOpenPath()
-      await expect(toolbar.startSketchBtn).not.toBeVisible()
      await expect(toolbar.exitSketchBtn).toBeVisible()
      // Wait for enter sketch mode to complete
      await page.waitForTimeout(500)
@ -1031,6 +1029,9 @@ openSketch = startSketchOn(XY)
    })
    await test.step(`Go through the command bar flow`, async () => {
      await toolbar.offsetPlaneButton.click()
+      await expect
+        .poll(() => page.getByText('Please select one').count())
+        .toBe(1)
      await cmdBar.expectState({
        stage: 'arguments',
        currentArgKey: 'plane',
@ -1084,10 +1085,11 @@ openSketch = startSketchOn(XY)
  }) => {
    // One dumb hardcoded screen pixel value
    const testPoint = { x: 620, y: 257 }
-    const expectedOutput = `helix001 = helix(  axis = 'X',  radius = 5,  length = 5,  revolutions = 1,  angleStart = 360,  ccw = false,)`
-    const expectedLine = `axis='X',`
+    const expectedOutput = `helix001 = helix(  axis = X,  radius = 5,  length = 5,  revolutions = 1,  angleStart = 360,  ccw = false,)`
+    const expectedLine = `axis=X,`

    await homePage.goToModelingScene()
+    await scene.connectionEstablished()

    await test.step(`Go through the command bar flow`, async () => {
      await toolbar.helixButton.click()
@ -1106,6 +1108,7 @@ openSketch = startSketchOn(XY)
        commandName: 'Helix',
      })
      await cmdBar.progressCmdBar()
+      await expect.poll(() => page.getByText('Axis').count()).toBe(6)
      await cmdBar.progressCmdBar()
      await cmdBar.progressCmdBar()
      await cmdBar.progressCmdBar()
@ -1217,7 +1220,7 @@ openSketch = startSketchOn(XY)
        cmdBar,
      }) => {
        page.on('console', console.log)
-        const initialCode = `sketch001 = startSketchOn('XZ')
+        const initialCode = `sketch001 = startSketchOn(XZ)
  profile001 = startProfileAt([0, 0], sketch001)
    |> yLine(length = 100)
    |> line(endAbsolute = [100, 0])
@ -1233,6 +1236,7 @@ openSketch = startSketchOn(XY)
        }, initialCode)
        await page.setBodyDimensions({ width: 1000, height: 500 })
        await homePage.goToModelingScene()
+        await scene.settled(cmdBar)

        await test.step(`Go through the command bar flow`, async () => {
          await toolbar.closePane('code')
@ -1252,15 +1256,22 @@ openSketch = startSketchOn(XY)
            commandName: 'Helix',
          })
          await cmdBar.selectOption({ name: 'Edge' }).click()
+          await expect
+            .poll(() => page.getByText('Please select one').count())
+            .toBe(1)
          await clickOnEdge()
+          await page.waitForTimeout(1000)
          await cmdBar.progressCmdBar()
+          await page.waitForTimeout(1000)
          await cmdBar.argumentInput.focus()
+          await page.waitForTimeout(1000)
          await page.keyboard.insertText('20')
          await cmdBar.progressCmdBar()
          await page.keyboard.insertText('0')
          await cmdBar.progressCmdBar()
          await page.keyboard.insertText('1')
          await cmdBar.progressCmdBar()
+          await page.keyboard.insertText('100')
          await cmdBar.expectState({
            stage: 'review',
            headerArguments: {
@ -1274,6 +1285,7 @@ openSketch = startSketchOn(XY)
            commandName: 'Helix',
          })
          await cmdBar.progressCmdBar()
+          await page.waitForTimeout(1000)
        })

        await test.step(`Confirm code is added to the editor, scene has changed`, async () => {
@ -1369,7 +1381,7 @@ extrude001 = extrude(profile001, length = 100)
    }, initialCode)
    await page.setBodyDimensions({ width: 1000, height: 500 })
    await homePage.goToModelingScene()
-    await scene.waitForExecutionDone()
+    await scene.settled(cmdBar)

    // One dumb hardcoded screen pixel value
    const testPoint = { x: 620, y: 257 }
@ -1530,6 +1542,9 @@ extrude001 = extrude(profile001, length = 100)
      if (!shouldPreselect) {
        await test.step(`Go through the command bar flow without preselected sketches`, async () => {
          await toolbar.loftButton.click()
+          await expect
+            .poll(() => page.getByText('Please select one').count())
+            .toBe(1)
          await cmdBar.expectState({
            stage: 'arguments',
            currentArgKey: 'selection',
@ -1579,6 +1594,7 @@ extrude001 = extrude(profile001, length = 100)
    page,
    homePage,
    scene,
+    cmdBar,
  }) => {
    const initialCode = `sketch001 = startSketchOn(XZ)
  |> circle(center = [0, 0], radius = 30)
@ -1592,7 +1608,7 @@ loft001 = loft([sketch001, sketch002])
    }, initialCode)
    await page.setBodyDimensions({ width: 1000, height: 500 })
    await homePage.goToModelingScene()
-    await scene.waitForExecutionDone()
+    await scene.settled(cmdBar)

    // One dumb hardcoded screen pixel value
    const testPoint = { x: 575, y: 200 }
@ -1687,7 +1703,7 @@ sketch002 = startSketchOn(XZ)
      }, initialCode)
      await page.setBodyDimensions({ width: 1000, height: 500 })
      await homePage.goToModelingScene()
-      await scene.waitForExecutionDone()
+      await scene.settled(cmdBar)

      // One dumb hardcoded screen pixel value
      const [clickOnSketch1] = scene.makeMouseHelpers(testPoint.x, testPoint.y)
@ -1707,6 +1723,9 @@ sketch002 = startSketchOn(XZ)

      await test.step(`Go through the command bar flow`, async () => {
        await toolbar.sweepButton.click()
+        await expect
+          .poll(() => page.getByText('Please select one').count())
+          .toBe(1)
        await cmdBar.expectState({
          commandName: 'Sweep',
          currentArgKey: 'target',
@ -1826,7 +1845,7 @@ sketch002 = startSketchOn(XZ)
    }, initialCode)
    await page.setBodyDimensions({ width: 1000, height: 500 })
    await homePage.goToModelingScene()
-    await scene.waitForExecutionDone()
+    await scene.settled(cmdBar)

    // One dumb hardcoded screen pixel value
    const testPoint = { x: 700, y: 250 }
@ -1843,6 +1862,9 @@ sketch002 = startSketchOn(XZ)

    await test.step(`Go through the command bar flow and fail validation with a toast`, async () => {
      await toolbar.sweepButton.click()
+      await expect
+        .poll(() => page.getByText('Please select one').count())
+        .toBe(1)
      await cmdBar.expectState({
        commandName: 'Sweep',
        currentArgKey: 'target',
@ -2059,6 +2081,9 @@ extrude001 = extrude(sketch001, length = -12)
    await test.step(`Open fillet UI without selecting edges`, async () => {
      await page.waitForTimeout(100)
      await toolbar.filletButton.click()
+      await expect
+        .poll(() => page.getByText('Please select one').count())
+        .toBe(1)
      await cmdBar.expectState({
        stage: 'arguments',
        currentArgKey: 'selection',
@ -2184,6 +2209,7 @@ extrude001 = extrude(sketch001, length = -12)
    homePage,
    scene,
    toolbar,
+    cmdBar,
  }) => {
    const initialCode = `sketch001 = startSketchOn(XY)
 profile001 = circle(
@ -2200,7 +2226,7 @@ fillet001 = fillet(extrude001, radius = 5, tags = [getOppositeEdge(seg01)])
    }, initialCode)
    await page.setBodyDimensions({ width: 1000, height: 500 })
    await homePage.goToModelingScene()
-    await scene.waitForExecutionDone()
+    await scene.settled(cmdBar)

    await test.step('Double-click in feature tree and expect error toast', async () => {
      await toolbar.openPane('feature-tree')
@ -2521,7 +2547,7 @@ extrude001 = extrude(sketch001, length = -12)
      }, initialCode)
      await page.setBodyDimensions({ width: 1000, height: 500 })
      await homePage.goToModelingScene()
-      await scene.waitForExecutionDone()
+      await scene.settled(cmdBar)
    })

    // Test 1: Command bar flow with preselected edges
@ -2554,6 +2580,7 @@ extrude001 = extrude(sketch001, length = -12)
        stage: 'arguments',
      })
      await cmdBar.progressCmdBar()
+      await page.waitForTimeout(1000)
      await cmdBar.expectState({
        commandName: 'Chamfer',
        highlightedHeaderArg: 'length',
@ -2565,7 +2592,10 @@ extrude001 = extrude(sketch001, length = -12)
        },
        stage: 'arguments',
      })
+      await cmdBar.argumentInput.focus()
+      await page.waitForTimeout(1000)
      await cmdBar.progressCmdBar()
+      await page.waitForTimeout(1000)
      await cmdBar.expectState({
        commandName: 'Chamfer',
        headerArguments: {
@ -2649,6 +2679,9 @@ extrude001 = extrude(sketch001, length = -12)
    await test.step(`Open chamfer UI without selecting edges`, async () => {
      await page.waitForTimeout(100)
      await toolbar.chamferButton.click()
+      await expect
+        .poll(() => page.getByText('Please select one').count())
+        .toBe(1)
      await cmdBar.expectState({
        stage: 'arguments',
        currentArgKey: 'selection',
@ -2771,6 +2804,7 @@ extrude001 = extrude(sketch001, length = -12)
    scene,
    editor,
    toolbar,
+    cmdBar,
  }) => {
    // Code samples
    const initialCode = `@settings(defaultLengthUnit = in)
@ -2814,7 +2848,7 @@ chamfer04 = chamfer(extrude001, length = 5, tags = [getOppositeEdge(seg02)])
      }, initialCode)
      await page.setBodyDimensions({ width: 1000, height: 500 })
      await homePage.goToModelingScene()
-      await scene.waitForExecutionDone()
+      await scene.settled(cmdBar)

      // verify modeling scene is loaded
      await scene.expectPixelColor(
@ -2936,9 +2970,11 @@ extrude001 = extrude(sketch001, length = 30)
      await context.addInitScript((initialCode) => {
        localStorage.setItem('persistCode', initialCode)
      }, initialCode)
+
      await page.setBodyDimensions({ width: 1000, height: 500 })
+
      await homePage.goToModelingScene()
-      await scene.waitForExecutionDone()
+      await scene.connectionEstablished()

      // One dumb hardcoded screen pixel value
      const testPoint = { x: 575, y: 200 }
@ -2955,6 +2991,9 @@ extrude001 = extrude(sketch001, length = 30)
      if (!shouldPreselect) {
        await test.step(`Go through the command bar flow without preselected faces`, async () => {
          await toolbar.shellButton.click()
+          await expect
+            .poll(() => page.getByText('Please select one').count())
+            .toBe(1)
          await cmdBar.expectState({
            stage: 'arguments',
            currentArgKey: 'selection',
@ -3015,7 +3054,6 @@ extrude001 = extrude(sketch001, length = 30)
      })

      await test.step('Edit shell via feature tree selection works', async () => {
-        await toolbar.closePane('code')
        await toolbar.openPane('feature-tree')
        const operationButton = await toolbar.getFeatureTreeOperation(
          'Shell',
@ -3044,7 +3082,6 @@ extrude001 = extrude(sketch001, length = 30)
        await cmdBar.progressCmdBar()
        await toolbar.closePane('feature-tree')
        await scene.expectPixelColor([150, 150, 150], testPoint, 15)
-        await toolbar.openPane('code')
        await editor.expectEditor.toContain(editedShellDeclaration)
        await editor.expectState({
          diagnostics: [],
@ -3079,7 +3116,7 @@ extrude001 = extrude(sketch001, length = 40)
    }, initialCode)
    await page.setBodyDimensions({ width: 1000, height: 500 })
    await homePage.goToModelingScene()
-    await scene.waitForExecutionDone()
+    await scene.settled(cmdBar)

    // One dumb hardcoded screen pixel value
    const testPoint = { x: 580, y: 180 }
@ -3097,6 +3134,9 @@ extrude001 = extrude(sketch001, length = 40)

    await test.step(`Go through the command bar flow, selecting a wall and keeping default thickness`, async () => {
      await toolbar.shellButton.click()
+      await expect
+        .poll(() => page.getByText('Please select one').count())
+        .toBe(1)
      await cmdBar.expectState({
        stage: 'arguments',
        currentArgKey: 'selection',
@ -3108,6 +3148,9 @@ extrude001 = extrude(sketch001, length = 40)
        highlightedHeaderArg: 'selection',
        commandName: 'Shell',
      })
+      await expect
+        .poll(() => page.getByText('Please select one').count())
+        .toBe(1)
      await clickOnCap()
      await page.keyboard.down('Shift')
      await clickOnWall()
@ -3116,6 +3159,7 @@ extrude001 = extrude(sketch001, length = 40)
      await cmdBar.progressCmdBar()
      await page.waitForTimeout(500)
      await cmdBar.progressCmdBar()
+      await page.waitForTimeout(500)
      await cmdBar.expectState({
        stage: 'review',
        headerArguments: {
@ -3124,7 +3168,9 @@ extrude001 = extrude(sketch001, length = 40)
        },
        commandName: 'Shell',
      })
+      await page.waitForTimeout(500)
      await cmdBar.progressCmdBar()
+      await page.waitForTimeout(500)
    })

    await test.step(`Confirm code is added to the editor, scene has changed`, async () => {
@ -3139,7 +3185,6 @@ extrude001 = extrude(sketch001, length = 40)
    })

    await test.step('Edit shell via feature tree selection works', async () => {
-      await editor.closePane()
      const operationButton = await toolbar.getFeatureTreeOperation('Shell', 0)
      await operationButton.dblclick({ button: 'left' })
      await cmdBar.expectState({
@ -3154,6 +3199,7 @@ extrude001 = extrude(sketch001, length = 40)
      })
      await page.keyboard.insertText('1')
      await cmdBar.progressCmdBar()
+      await page.waitForTimeout(500)
      await cmdBar.expectState({
        stage: 'review',
        headerArguments: {
@ -3164,7 +3210,6 @@ extrude001 = extrude(sketch001, length = 40)
      await cmdBar.progressCmdBar()
      await toolbar.closePane('feature-tree')
      await scene.expectPixelColor([150, 150, 150], testPoint, 15)
-      await toolbar.openPane('code')
      await editor.expectEditor.toContain(editedShellDeclaration)
      await editor.expectState({
        diagnostics: [],
@ -3218,7 +3263,7 @@ extrude002 = extrude(sketch002, length = 50)
      }, initialCode)
      await page.setBodyDimensions({ width: 1200, height: 500 })
      await homePage.goToModelingScene()
-      await scene.waitForExecutionDone()
+      await scene.settled(cmdBar)

      // One dumb hardcoded screen pixel value
      const testPoint = { x: 580, y: 320 }
@ -3243,12 +3288,13 @@ extrude002 = extrude(sketch002, length = 50)
          highlightedHeaderArg: 'selection',
          commandName: 'Shell',
        })
+        await expect
+          .poll(() => page.getByText('Please select one').count())
+          .toBe(1)
        await clickOnCap()
-        await page.waitForTimeout(500)
+        await page.waitForTimeout(1000)
        await cmdBar.progressCmdBar()
-        await page.waitForTimeout(500)
        await cmdBar.progressCmdBar()
-        await page.waitForTimeout(500)
        await cmdBar.expectState({
          stage: 'review',
          headerArguments: {
@ -3306,7 +3352,7 @@ profile001 = startProfileAt([-20, 20], sketch001)
      }, initialCode)
      await page.setBodyDimensions({ width: 1000, height: 500 })
      await homePage.goToModelingScene()
-      await scene.waitForExecutionDone()
+      await scene.settled(cmdBar)
      await toolbar.openPane('feature-tree')

      // One dumb hardcoded screen pixel value
@ -3386,7 +3432,7 @@ sweep001 = sweep(sketch001, path = sketch002)
    }, initialCode)
    await page.setBodyDimensions({ width: 1000, height: 500 })
    await homePage.goToModelingScene()
-    await scene.waitForExecutionDone()
+    await scene.settled(cmdBar)

    // One dumb hardcoded screen pixel value
    const testPoint = { x: 500, y: 250 }
@ -3399,6 +3445,9 @@ sweep001 = sweep(sketch001, path = sketch002)

    await test.step(`Go through the Shell flow and fail validation with a toast`, async () => {
      await toolbar.shellButton.click()
+      await expect
+        .poll(() => page.getByText('Please select one').count())
+        .toBe(1)
      await cmdBar.expectState({
        stage: 'arguments',
        currentArgKey: 'selection',
@ -3462,19 +3511,20 @@ segAng(rectangleSegmentA002),
      }, initialCode)
      await page.setBodyDimensions({ width: 1000, height: 500 })
      await homePage.goToModelingScene()
-      await scene.waitForExecutionDone()
+      await scene.settled(cmdBar)

      // select line of code
-      const codeToSelecton = `segAng(rectangleSegmentA002) - 90,`
+      const codeToSelection = `segAng(rectangleSegmentA002) - 90,`
      // revolve
-      await page.getByText(codeToSelecton).click()
+      await editor.scrollToText(codeToSelection)
+      await page.getByText(codeToSelection).click()
      await toolbar.revolveButton.click()
      await cmdBar.progressCmdBar()
      await cmdBar.progressCmdBar()
      await cmdBar.progressCmdBar()
      await cmdBar.progressCmdBar()

-      const newCodeToFind = `revolve001 = revolve(sketch002, angle = 360, axis = 'X')`
+      const newCodeToFind = `revolve001 = revolve(sketch002, angle = 360, axis = X)`
      expect(editor.expectEditor.toContain(newCodeToFind)).toBeTruthy()

      // Edit flow
@ -3541,15 +3591,17 @@ sketch002 = startSketchOn(extrude001, rectangleSegmentA001)
      }, initialCode)
      await page.setBodyDimensions({ width: 1000, height: 500 })
      await homePage.goToModelingScene()
-      await scene.waitForExecutionDone()
+      await scene.connectionEstablished()
+      await scene.settled(cmdBar)

      // select line of code
-      const codeToSelecton = `center = [-11.34, 10.0]`
+      const codeToSelection = `center = [-11.34, 10.0]`
      // revolve
-      await page.getByText(codeToSelecton).click()
+      await editor.scrollToText(codeToSelection)
+      await page.getByText(codeToSelection).click()
      await toolbar.revolveButton.click()
      await page.getByText('Edge', { exact: true }).click()
-      const lineCodeToSelection = `|> angledLine([0, 202.6], %, $rectangleSegmentA001)`
+      const lineCodeToSelection = `angledLine([0, 202.6], %, $rectangleSegmentA001)`
      await page.getByText(lineCodeToSelection).click()
      await cmdBar.progressCmdBar()
      await cmdBar.progressCmdBar()
@ -3595,6 +3647,7 @@ sketch002 = startSketchOn(extrude001, rectangleSegmentA001)
      await editor.expectEditor.toContain(
        newCodeToFind.replace('angle = 360', 'angle = angle001')
      )
+      expect(editor.expectEditor.toContain(newCodeToFind)).toBeTruthy()
    })
    test('revolve sketch circle around line segment from startProfileAt sketch', async ({
      context,
@ -3628,15 +3681,20 @@ sketch003 = startSketchOn(extrude001, 'START')
      }, initialCode)
      await page.setBodyDimensions({ width: 1000, height: 500 })
      await homePage.goToModelingScene()
-      await scene.waitForExecutionDone()
+      await scene.connectionEstablished()
+      await scene.settled(cmdBar)

      // select line of code
-      const codeToSelecton = `center = [-0.69, 0.56]`
+      const codeToSelection = `center = [-0.69, 0.56]`
      // revolve
-      await page.getByText(codeToSelecton).click()
      await toolbar.revolveButton.click()
+      await page.waitForTimeout(1000)
+      await editor.scrollToText(codeToSelection)
+      await page.getByText(codeToSelection).click()
+      await expect.poll(() => page.getByText('AxisOrEdge').count()).toBe(2)
      await page.getByText('Edge', { exact: true }).click()
-      const lineCodeToSelection = `|> xLine(length = 2.6)`
+      const lineCodeToSelection = `length = 2.6`
+      await editor.scrollToText(lineCodeToSelection)
      await page.getByText(lineCodeToSelection).click()
      await cmdBar.progressCmdBar()
      await cmdBar.progressCmdBar()
@ -3703,7 +3761,7 @@ extrude001 = extrude(profile001, length = 100)
    }, initialCode)
    await page.setBodyDimensions({ width: 1000, height: 500 })
    await homePage.goToModelingScene()
-    await scene.waitForExecutionDone()
+    await scene.settled(cmdBar)

    // One dumb hardcoded screen pixel value
    const testPoint = { x: 500, y: 250 }
--- a/e2e/playwright/projects.spec.ts
+++ b/e2e/playwright/projects.spec.ts
@ -83,7 +83,7 @@ test(
 test(
  'click help/keybindings from project page',
  { tag: '@electron' },
-  async ({ context, page }, testInfo) => {
+  async ({ scene, cmdBar, context, page }, testInfo) => {
    await context.folderSetupFn(async (dir) => {
      const bracketDir = path.join(dir, 'bracket')
      await fsp.mkdir(bracketDir, { recursive: true })
@ -95,17 +95,11 @@ test(

    await page.setBodyDimensions({ width: 1200, height: 500 })

-    page.on('console', console.log)
-
    // expect to see the text bracket
    await expect(page.getByText('bracket')).toBeVisible()
-
    await page.getByText('bracket').click()

-    await expect(page.getByTestId('loading')).toBeAttached()
-    await expect(page.getByTestId('loading')).not.toBeAttached({
-      timeout: 20_000,
-    })
+    await scene.settled(cmdBar)

    // click ? button
    await page.getByTestId('help-button').click()
@ -120,7 +114,7 @@ test(
 test(
  'open a file in a project works and renders, open another file in different project with errors, it should clear the scene',
  { tag: '@electron' },
-  async ({ context, page, editor }, testInfo) => {
+  async ({ scene, cmdBar, context, page, editor }, testInfo) => {
    await context.folderSetupFn(async (dir) => {
      const bracketDir = path.join(dir, 'bracket')
      await fsp.mkdir(bracketDir, { recursive: true })
@ -149,24 +143,7 @@ test(

      await page.getByText('bracket').click()

-      await expect(page.getByTestId('loading')).toBeAttached()
-      await expect(page.getByTestId('loading')).not.toBeAttached({
-        timeout: 20_000,
-      })
-
-      await expect(
-        page.getByRole('button', { name: 'Start Sketch' })
-      ).toBeEnabled({
-        timeout: 20_000,
-      })
-
-      // gray at this pixel means the stream has loaded in the most
-      // user way we can verify it (pixel color)
-      await expect
-        .poll(() => u.getGreatestPixDiff(pointOnModel, [110, 110, 110]), {
-          timeout: 10_000,
-        })
-        .toBeLessThan(20)
+      await scene.settled(cmdBar)
    })

    await test.step('Clicking the logo takes us back to the projects page / home', async () => {
@ -209,7 +186,7 @@ test(
 test(
  'open a file in a project works and renders, open another file in different project that is empty, it should clear the scene',
  { tag: '@electron' },
-  async ({ context, page }, testInfo) => {
+  async ({ scene, cmdBar, context, page }, testInfo) => {
    await context.folderSetupFn(async (dir) => {
      const bracketDir = path.join(dir, 'bracket')
      await fsp.mkdir(bracketDir, { recursive: true })
@ -235,24 +212,7 @@ test(

      await page.getByText('bracket').click()

-      await expect(page.getByTestId('loading')).toBeAttached()
-      await expect(page.getByTestId('loading')).not.toBeAttached({
-        timeout: 20_000,
-      })
-
-      await expect(
-        page.getByRole('button', { name: 'Start Sketch' })
-      ).toBeEnabled({
-        timeout: 20_000,
-      })
-
-      // gray at this pixel means the stream has loaded in the most
-      // user way we can verify it (pixel color)
-      await expect
-        .poll(() => u.getGreatestPixDiff(pointOnModel, [125, 125, 125]), {
-          timeout: 10_000,
-        })
-        .toBeLessThan(15)
+      await scene.settled(cmdBar)
    })

    await test.step('Clicking the logo takes us back to the projects page / home', async () => {
@ -352,7 +312,7 @@ test(
 test(
  'open a file in a project works and renders, open another file in the same project with errors, it should clear the scene',
  { tag: '@electron' },
-  async ({ context, page }, testInfo) => {
+  async ({ scene, cmdBar, context, page }, testInfo) => {
    if (runningOnWindows()) {
      test.fixme(orRunWhenFullSuiteEnabled())
    }
@ -380,10 +340,7 @@ test(

      await page.getByText('bracket').click()

-      await expect(page.getByTestId('loading')).toBeAttached()
-      await expect(page.getByTestId('loading')).not.toBeAttached({
-        timeout: 20_000,
-      })
+      await scene.settled(cmdBar)

      await expect(
        page.getByRole('button', { name: 'Start Sketch' })
@ -443,10 +400,10 @@ test(
    await expect(page.getByText('broken-code')).toBeVisible()
    await page.getByText('broken-code').click()

-    // Gotcha: You can not use scene.waitForExecutionDone() since the KCL code is going to fail
-    await expect(page.getByTestId('loading')).not.toBeAttached({
-      timeout: 20_000,
-    })
+    // Gotcha: You can not use scene.settled() since the KCL code is going to fail
+    await expect(
+      page.getByTestId('model-state-indicator-playing')
+    ).toBeAttached()

    // Gotcha: Scroll to the text content in code mirror because CodeMirror lazy loads DOM content
    await editor.scrollToText(
@ -469,7 +426,7 @@ test.describe('Can export from electron app', () => {
    test(
      `Can export using ${method}`,
      { tag: ['@electron', '@skipLocalEngine'] },
-      async ({ context, page, tronApp }, testInfo) => {
+      async ({ scene, cmdBar, context, page, tronApp }, testInfo) => {
        if (!tronApp) {
          fail()
        }
@ -499,10 +456,7 @@ test.describe('Can export from electron app', () => {

          await page.getByText('bracket').click()

-          await expect(page.getByTestId('loading')).toBeAttached()
-          await expect(page.getByTestId('loading')).not.toBeAttached({
-            timeout: 20_000,
-          })
+          await scene.settled(cmdBar)

          await expect(
            page.getByRole('button', { name: 'Start Sketch' })
@ -812,7 +766,7 @@ test.describe(`Project management commands`, () => {
  test(
    `Rename from project page`,
    { tag: '@electron' },
-    async ({ context, page }, testInfo) => {
+    async ({ context, page, scene, cmdBar }, testInfo) => {
      const projectName = `my_project_to_rename`
      await context.folderSetupFn(async (dir) => {
        await fsp.mkdir(`${dir}/${projectName}`, { recursive: true })
@ -821,14 +775,13 @@ test.describe(`Project management commands`, () => {
          `${dir}/${projectName}/main.kcl`
        )
      })
-      const u = await getUtils(page)

      // Constants and locators
      const projectHomeLink = page.getByTestId('project-link')
      const commandButton = page.getByRole('button', { name: 'Commands' })
      const commandOption = page.getByRole('option', { name: 'rename project' })
      const projectNameOption = page.getByRole('option', { name: projectName })
-      const projectRenamedName = `project-000`
+      const projectRenamedName = `untitled`
      // const projectMenuButton = page.getByTestId('project-sidebar-toggle')
      const commandContinueButton = page.getByRole('button', {
        name: 'Continue',
@ -843,7 +796,7 @@ test.describe(`Project management commands`, () => {
        page.on('console', console.log)

        await projectHomeLink.click()
-        await u.waitForPageLoad()
+        await scene.settled(cmdBar)
      })

      await test.step(`Run rename command via command palette`, async () => {
@ -882,7 +835,6 @@ test.describe(`Project management commands`, () => {
          `${dir}/${projectName}/main.kcl`
        )
      })
-      const u = await getUtils(page)

      // Constants and locators
      const projectHomeLink = page.getByTestId('project-link')
@ -900,9 +852,9 @@ test.describe(`Project management commands`, () => {
        await page.setBodyDimensions({ width: 1200, height: 500 })
        page.on('console', console.log)

+        await page.waitForTimeout(3000)
+
        await projectHomeLink.click()
-        await u.waitForPageLoad()
-        await scene.connectionEstablished()
        await scene.settled(cmdBar)
      })

@ -926,7 +878,7 @@ test.describe(`Project management commands`, () => {
  test(
    `Rename from home page`,
    { tag: '@electron' },
-    async ({ context, page, homePage }, testInfo) => {
+    async ({ context, page, homePage, scene, cmdBar }, testInfo) => {
      const projectName = `my_project_to_rename`
      await context.folderSetupFn(async (dir) => {
        await fsp.mkdir(`${dir}/${projectName}`, { recursive: true })
@ -941,7 +893,7 @@ test.describe(`Project management commands`, () => {
      const commandButton = page.getByRole('button', { name: 'Commands' })
      const commandOption = page.getByRole('option', { name: 'rename project' })
      const projectNameOption = page.getByRole('option', { name: projectName })
-      const projectRenamedName = `project-000`
+      const projectRenamedName = `untitled`
      const commandContinueButton = page.getByRole('button', {
        name: 'Continue',
      })
@ -982,7 +934,7 @@ test.describe(`Project management commands`, () => {
  test(
    `Delete from home page`,
    { tag: '@electron' },
-    async ({ context, page }, testInfo) => {
+    async ({ context, page, scene, cmdBar }, testInfo) => {
      const projectName = `my_project_to_delete`
      await context.folderSetupFn(async (dir) => {
        await fsp.mkdir(`${dir}/${projectName}`, { recursive: true })
@ -1033,6 +985,7 @@ test.describe(`Project management commands`, () => {
    homePage,
    toolbar,
    cmdBar,
+    scene,
  }) => {
    const projectName = 'test-project'
    await test.step(`Setup`, async () => {
@ -1072,10 +1025,11 @@ test.describe(`Project management commands`, () => {
      })
      await cmdBar.argumentInput.fill(projectName)
      await cmdBar.progressCmdBar()
+      await scene.settled(cmdBar)
+      await toolbar.logoLink.click()
    })

    await test.step(`Check the project was created with a non-colliding name`, async () => {
-      await toolbar.logoLink.click()
      await homePage.expectState({
        projectCards: [
          {
@ -1106,10 +1060,11 @@ test.describe(`Project management commands`, () => {
      })
      await cmdBar.argumentInput.fill(projectName)
      await cmdBar.progressCmdBar()
+      await scene.settled(cmdBar)
+      await toolbar.logoLink.click()
    })

    await test.step(`Check the second project was created with a non-colliding name`, async () => {
-      await toolbar.logoLink.click()
      await homePage.expectState({
        projectCards: [
          {
@ -1139,7 +1094,7 @@ test(`Create a few projects using the default project name`, async ({
    await test.step(`Create project ${i}`, async () => {
      await homePage.expectState({
        projectCards: Array.from({ length: i }, (_, i) => ({
-          title: `project-${i.toString().padStart(3, '0')}`,
+          title: i === 0 ? 'untitled' : `untitled-${i}`,
          fileCount: 1,
        })).toReversed(),
        sortBy: 'last-modified-desc',
@ -1195,7 +1150,7 @@ test(
 test(
  'Nested directories in project without main.kcl do not create main.kcl',
  { tag: '@electron' },
-  async ({ context, page }, testInfo) => {
+  async ({ scene, cmdBar, context, page }, testInfo) => {
    let testDir: string | undefined
    await context.folderSetupFn(async (dir) => {
      await fsp.mkdir(path.join(dir, 'router-template-slate', 'nested'), {
@ -1218,10 +1173,7 @@ test(

    await test.step('Open the project', async () => {
      await page.getByText('router-template-slate').click()
-      await expect(page.getByTestId('loading')).toBeAttached()
-      await expect(page.getByTestId('loading')).not.toBeAttached({
-        timeout: 20_000,
-      })
+      await scene.settled(cmdBar)

      // It actually loads.
      await expect(u.codeLocator).toContainText('mounting bracket')
@ -1323,9 +1275,9 @@ test(
    })

    await test.step('Check we can still create a project', async () => {
-      await createProject({ name: 'project-000', page, returnHome: true })
+      await createProject({ name: 'new-project', page, returnHome: true })
      await expect(
-        page.getByTestId('project-link').filter({ hasText: 'project-000' })
+        page.getByTestId('project-link').filter({ hasText: 'new-project' })
      ).toBeVisible()
    })
  }
@ -1334,7 +1286,7 @@ test(
 test(
  'Can load a file with CRLF line endings',
  { tag: '@electron' },
-  async ({ context, page }, testInfo) => {
+  async ({ context, page, scene, cmdBar }, testInfo) => {
    if (runningOnWindows()) {
      test.fixme(orRunWhenFullSuiteEnabled())
    }
@ -1357,13 +1309,8 @@ test(
    const u = await getUtils(page)
    await page.setBodyDimensions({ width: 1200, height: 500 })

-    page.on('console', console.log)
-
    await page.getByText('router-template-slate').click()
-    await expect(page.getByTestId('loading')).toBeAttached()
-    await expect(page.getByTestId('loading')).not.toBeAttached({
-      timeout: 20_000,
-    })
+    await scene.settled(cmdBar)

    await expect(u.codeLocator).toContainText('routerDiameter')
    await expect(u.codeLocator).toContainText('templateGap')
@ -1578,7 +1525,7 @@ extrude001 = extrude(sketch001, length = 200)`)
 test(
  'Opening a project should successfully load the stream, (regression test that this also works when switching between projects)',
  { tag: '@electron' },
-  async ({ context, page, cmdBar, homePage }, testInfo) => {
+  async ({ context, page, cmdBar, homePage, scene }, testInfo) => {
    await context.folderSetupFn(async (dir) => {
      await fsp.mkdir(path.join(dir, 'router-template-slate'), {
        recursive: true,
@ -1607,13 +1554,10 @@ test(
        path.join(dir, 'bracket', 'main.kcl')
      )
    })
-    const u = await getUtils(page)
+
    await page.setBodyDimensions({ width: 1200, height: 500 })
-
    page.on('console', console.log)

-    const pointOnModel = { x: 630, y: 280 }
-
    await test.step('Opening the bracket project via command palette should load the stream', async () => {
      await homePage.expectState({
        projectCards: [
@ -1647,15 +1591,7 @@ test(
        stage: 'commandBarClosed',
      })

-      await u.waitForPageLoad()
-
-      // gray at this pixel means the stream has loaded in the most
-      // user way we can verify it (pixel color)
-      await expect
-        .poll(() => u.getGreatestPixDiff(pointOnModel, [85, 85, 85]), {
-          timeout: 10_000,
-        })
-        .toBeLessThan(15)
+      await scene.settled(cmdBar)
    })

    await test.step('Clicking the logo takes us back to the projects page / home', async () => {
@ -1672,15 +1608,7 @@ test(

      await page.getByText('router-template-slate').click()

-      await u.waitForPageLoad()
-
-      // gray at this pixel means the stream has loaded in the most
-      // user way we can verify it (pixel color)
-      await expect
-        .poll(() => u.getGreatestPixDiff(pointOnModel, [143, 143, 143]), {
-          timeout: 10_000,
-        })
-        .toBeLessThan(15)
+      await scene.settled(cmdBar)
    })

    await test.step('The projects on the home page should still be normal', async () => {
@ -1733,8 +1661,6 @@ test(
    })
    await page.setBodyDimensions({ width: 1200, height: 500 })

-    page.on('console', console.log)
-
    // we'll grab this from the settings on screen before we switch
    let originalProjectDirName: string
    const newProjectDirName = testInfo.outputPath(
@ -1875,7 +1801,7 @@ test(
 test(
  'file pane is scrollable when there are many files',
  { tag: '@electron' },
-  async ({ context, page }, testInfo) => {
+  async ({ scene, cmdBar, context, page }, testInfo) => {
    await context.folderSetupFn(async (dir) => {
      const testDir = path.join(dir, 'testProject')
      await fsp.mkdir(testDir, { recursive: true })
@ -1954,10 +1880,8 @@ test(

    await test.step('setup, open file pane', async () => {
      await page.getByText('testProject').click()
-      await expect(page.getByTestId('loading')).toBeAttached()
-      await expect(page.getByTestId('loading')).not.toBeAttached({
-        timeout: 20_000,
-      })
+
+      await scene.settled(cmdBar)

      await page.getByTestId('files-pane-button').click()
    })
--- a/e2e/playwright/prompt-to-edit-snapshot-tests.spec.ts
+++ b/e2e/playwright/prompt-to-edit-snapshot-tests.spec.ts
@ -63,7 +63,7 @@ test.describe('edit with AI example snapshots', () => {
        localStorage.setItem('persistCode', file)
      }, file)
      await homePage.goToModelingScene()
-      await scene.waitForExecutionDone()
+      await scene.settled(cmdBar)

      const body1CapCoords = { x: 571, y: 351 }
      const [clickBody1Cap] = scene.makeMouseHelpers(
--- a/e2e/playwright/prompt-to-edit.spec.ts
+++ b/e2e/playwright/prompt-to-edit.spec.ts
@ -61,7 +61,7 @@ test.describe('Prompt-to-edit tests', { tag: '@skipWin' }, () => {
          localStorage.setItem('persistCode', file)
        }, file)
        await homePage.goToModelingScene()
-        await scene.waitForExecutionDone()
+        await scene.settled(cmdBar)

        const body1CapCoords = { x: 571, y: 311 }
        const greenCheckCoords = { x: 565, y: 305 }
@ -156,7 +156,7 @@ test.describe('Prompt-to-edit tests', { tag: '@skipWin' }, () => {
      localStorage.setItem('persistCode', file)
    }, file)
    await homePage.goToModelingScene()
-    await scene.waitForExecutionDone()
+    await scene.settled(cmdBar)

    const body1CapCoords = { x: 571, y: 311 }
    const [clickBody1Cap] = scene.makeMouseHelpers(
@ -212,7 +212,7 @@ test.describe('Prompt-to-edit tests', { tag: '@skipWin' }, () => {
      localStorage.setItem('persistCode', file)
    }, file)
    await homePage.goToModelingScene()
-    await scene.waitForExecutionDone()
+    await scene.settled(cmdBar)

    const submittingToast = page.getByText('Submitting to Text-to-CAD API...')
    const successToast = page.getByText('Prompt to edit successful')
@ -281,7 +281,7 @@ test.describe('Prompt-to-edit tests', { tag: '@skipWin' }, () => {
      localStorage.setItem('persistCode', file)
    }, file)
    await homePage.goToModelingScene()
-    await scene.waitForExecutionDone()
+    await scene.settled(cmdBar)

    const submittingToast = page.getByText('Submitting to Text-to-CAD API...')
    const successToast = page.getByText('Prompt to edit successful')
--- a/e2e/playwright/regression-tests.spec.ts
+++ b/e2e/playwright/regression-tests.spec.ts
@ -689,6 +689,7 @@ extrude002 = extrude(profile002, length = 150)
    homePage,
    scene,
    toolbar,
+    viewport,
  }) => {
    await context.folderSetupFn(async (dir) => {
      const legoDir = path.join(dir, 'lego')
@ -703,8 +704,8 @@ extrude002 = extrude(profile002, length = 150)
      await homePage.openProject('lego')
      await toolbar.closePane('code')
    })
-    await test.step(`Waiting for the loading spinner to disappear`, async () => {
-      await scene.loadingIndicator.waitFor({ state: 'detached' })
+    await test.step(`Waiting for scene to settle`, async () => {
+      await scene.connectionEstablished()
    })
    await test.step(`The part should start loading quickly, not waiting until execution is complete`, async () => {
      // TODO: use the viewport size to pick the center point, but the `viewport` fixture's values were wrong.
@ -762,7 +763,7 @@ plane002 = offsetPlane(XZ, offset = -2 * x)`
      )
    })
    await homePage.openProject('test-sample')
-    await scene.waitForExecutionDone()
+    await scene.settled(cmdBar)
    await expect(toolbar.startSketchBtn).toBeEnabled({ timeout: 20_000 })
    const operationButton = await toolbar.getFeatureTreeOperation(
      'Offset Plane',
--- a/e2e/playwright/sketch-tests.spec.ts
+++ b/e2e/playwright/sketch-tests.spec.ts
@ -22,6 +22,7 @@ test.describe('Sketch tests', { tag: ['@skipWin'] }, () => {
    context,
    homePage,
    scene,
+    cmdBar,
  }) => {
    const u = await getUtils(page)
    const selectionsSnippets = {
@ -82,7 +83,7 @@ test.describe('Sketch tests', { tag: ['@skipWin'] }, () => {
    await page.setBodyDimensions({ width: 1200, height: 500 })

    await homePage.goToModelingScene()
-    await scene.waitForExecutionDone()
+    await scene.settled(cmdBar)

    // wait for execution done
    await u.openDebugPanel()
@ -108,6 +109,7 @@ test.describe('Sketch tests', { tag: ['@skipWin'] }, () => {
    page,
    scene,
    homePage,
+    cmdBar,
  }) => {
    const u = await getUtils(page)
    await page.addInitScript(async () => {
@ -122,7 +124,7 @@ sketch001 = startSketchOn(XZ)
    })

    await homePage.goToModelingScene()
-    await scene.waitForExecutionDone()
+    await scene.settled(cmdBar)

    await scene.expectPixelColor(TEST_COLORS.WHITE, { x: 587, y: 270 }, 15)

@ -673,6 +675,7 @@ sketch001 = startSketchOn(XZ)
    homePage,
    scene,
    editor,
+    cmdBar,
  }) => {
    const u = await getUtils(page)
    await page.addInitScript(async () => {
@ -684,12 +687,12 @@ sketch001 = startSketchOn(XZ)
  |> line(end = [12.73, -0.09])
  |> tangentialArcTo([24.95, -5.38], %)
  |> close()
-  |> revolve(axis = "X")`
+  |> revolve(axis = X)`
      )
    })

    await homePage.goToModelingScene()
-    await scene.waitForExecutionDone()
+    await scene.settled(cmdBar)

    await expect(
      page.getByRole('button', { name: 'Start Sketch' })
@ -771,7 +774,7 @@ sketch001 = startSketchOn(XZ)
  |> tangentialArcTo([24.95, -5.38], %)
  |> line(end = [1.97, 2.06])
  |> close()
-  |> revolve(axis = "X")`,
+  |> revolve(axis = X)`,
      { shouldNormalise: true }
    )
  })
@ -1223,7 +1226,7 @@ profile001 = startProfileAt([${roundOff(scale * 69.6)}, ${roundOff(
          |> xLine(endAbsolute = 0 + .001)
          |> yLine(endAbsolute = 0)
          |> close()
-          |> revolve(axis = "Y")
+          |> revolve(axis = Y)

        return lugSketch
      }
@ -1614,7 +1617,7 @@ profile002 = startProfileAt([117.2, 56.08], sketch001)
  test(
    `snapToProfile start only works for current profile`,
    { tag: ['@skipWin'] },
-    async ({ context, page, scene, toolbar, editor, homePage }) => {
+    async ({ context, page, scene, toolbar, editor, homePage, cmdBar }) => {
      // We seed the scene with a single offset plane
      await context.addInitScript(() => {
        localStorage.setItem(
@ -1630,6 +1633,8 @@ profile003 = startProfileAt([206.63, -56.73], sketch001)
      })

      await homePage.goToModelingScene()
+      await scene.settled(cmdBar)
+
      await expect(
        page.getByRole('button', { name: 'Start Sketch' })
      ).not.toBeDisabled()
@ -1651,9 +1656,13 @@ profile003 = startProfileAt([206.63, -56.73], sketch001)
      const codeFromTangentialArc = `  |> tangentialArcTo([39.49, 88.22], %)`
      await test.step('check that tangential tool does not snap to other profile starts', async () => {
        await toolbar.tangentialArcBtn.click()
+        await page.waitForTimeout(1000)
        await endOfLowerSegMove()
+        await page.waitForTimeout(1000)
        await endOfLowerSegClick()
+        await page.waitForTimeout(1000)
        await profileStartOfHigherSegClick()
+        await page.waitForTimeout(1000)
        await editor.expectEditor.toContain(codeFromTangentialArc)
        await editor.expectEditor.not.toContain(
          `[profileStartX(%), profileStartY(%)]`
@ -2242,8 +2251,9 @@ profile004 = circleThreePoint(sketch001, p1 = [13.44, -6.8], p2 = [13.39, -2.07]

      await test.step('enter sketch and setup', async () => {
        await moveToClearToolBarPopover()
+        await page.waitForTimeout(1000)
        await pointOnSegment({ shouldDbClick: true })
-        await page.waitForTimeout(600)
+        await page.waitForTimeout(2000)

        await toolbar.lineBtn.click()
        await page.waitForTimeout(100)
@ -2359,7 +2369,7 @@ profile003 = circle(sketch001, center = [6.92, -4.2], radius = 3.16)

      await page.setBodyDimensions({ width: 1000, height: 500 })
      await homePage.goToModelingScene()
-      await scene.waitForExecutionDone()
+      await scene.settled(cmdBar)
      await expect(
        page.getByRole('button', { name: 'Start Sketch' })
      ).not.toBeDisabled()
@ -2965,6 +2975,7 @@ test.describe(`Click based selection don't brick the app when clicked out of ran
    toolbar,
    editor,
    homePage,
+    cmdBar,
  }) => {
    // We seed the scene with a single offset plane
    await context.addInitScript(() => {
@ -2982,7 +2993,7 @@ test.describe(`Click based selection don't brick the app when clicked out of ran
    })

    await homePage.goToModelingScene()
-    await scene.waitForExecutionDone()
+    await scene.settled(cmdBar)

    await test.step(`format the code`, async () => {
      // doesn't contain condensed version
@ -3047,6 +3058,7 @@ test.describe('Redirecting to home page and back to the original file should cle
    toolbar,
    editor,
    homePage,
+    cmdBar,
  }) => {
    // We seed the scene with a single offset plane
    await context.addInitScript(() => {
@ -3059,7 +3071,7 @@ test.describe('Redirecting to home page and back to the original file should cle
      )
    })
    await homePage.goToModelingScene()
-    await scene.waitForExecutionDone()
+    await scene.settled(cmdBar)

    const [objClick] = scene.makeMouseHelpers(634, 274)
    await objClick()
--- a/e2e/playwright/snapshot-tests.spec.ts
+++ b/e2e/playwright/snapshot-tests.spec.ts
@ -103,7 +103,6 @@ part001 = startSketchOn(-XZ)

    await u.waitForAuthSkipAppStart()

-    await scene.connectionEstablished()
    await scene.settled(cmdBar)

    const axisDirectionPair: Models['AxisDirectionPair_type'] = {
@ -351,7 +350,7 @@ const extrudeDefaultPlane = async (
            },
          },
          project: {
-            default_project_name: 'project-$nnn',
+            default_project_name: 'untitled',
          },
          text_editor: {
            text_wrapping: true,
@ -369,7 +368,6 @@ const extrudeDefaultPlane = async (
  await page.setViewportSize({ width: 1200, height: 500 })

  await u.waitForAuthSkipAppStart()
-  await scene.connectionEstablished()
  await scene.settled(cmdBar)

  await expect(page).toHaveScreenshot({
@ -421,8 +419,6 @@ test(
    const PUR = 400 / 37.5 //pixeltoUnitRatio
    await u.waitForAuthSkipAppStart()

-    await scene.connectionEstablished()
-
    const startXPx = 600
    const [endOfTangentClk, endOfTangentMv] = scene.makeMouseHelpers(
      startXPx + PUR * 30,
@ -551,8 +547,6 @@ test(

    await u.waitForAuthSkipAppStart()

-    await scene.connectionEstablished()
-
    // click on "Start Sketch" button
    await u.doAndWaitForImageDiff(
      () => page.getByRole('button', { name: 'Start Sketch' }).click(),
@ -598,8 +592,6 @@ test(

    await u.waitForAuthSkipAppStart()

-    await scene.connectionEstablished()
-
    await u.doAndWaitForImageDiff(
      () => page.getByRole('button', { name: 'Start Sketch' }).click(),
      200
@ -650,8 +642,6 @@ test.describe(

      await u.waitForAuthSkipAppStart()

-      await scene.connectionEstablished()
-
      await u.doAndWaitForImageDiff(
        () => page.getByRole('button', { name: 'Start Sketch' }).click(),
        200
@ -744,7 +734,6 @@ test.describe(

      await u.waitForAuthSkipAppStart()

-      await scene.connectionEstablished()
      await scene.settled(cmdBar)

      await u.doAndWaitForImageDiff(
@ -846,7 +835,6 @@ part002 = startSketchOn(part001, seg01)

    await u.waitForAuthSkipAppStart()

-    await scene.connectionEstablished()
    await scene.settled(cmdBar)

    // Wait for the second extrusion to appear
@ -902,7 +890,6 @@ test(

    await u.waitForAuthSkipAppStart()

-    await scene.connectionEstablished()
    await scene.settled(cmdBar)

    // Wait for the second extrusion to appear
@ -943,7 +930,6 @@ test(

    await u.waitForAuthSkipAppStart()

-    await scene.connectionEstablished()
    await scene.settled(cmdBar)

    // Wait for the second extrusion to appear
@ -976,7 +962,6 @@ test.describe('Grid visibility', { tag: '@snapshot' }, () => {
    await page.goto('/')
    await u.waitForAuthSkipAppStart()

-    await scene.connectionEstablished()
    await scene.settled(cmdBar)

    await u.closeKclCodePanel()
@ -1041,7 +1026,6 @@ test.describe('Grid visibility', { tag: '@snapshot' }, () => {
    await page.goto('/')
    await u.waitForAuthSkipAppStart()

-    await scene.connectionEstablished()
    await scene.settled(cmdBar)

    await u.closeKclCodePanel()
@ -1086,7 +1070,6 @@ test.describe('Grid visibility', { tag: '@snapshot' }, () => {
    await page.goto('/')
    await u.waitForAuthSkipAppStart()

-    await scene.connectionEstablished()
    await scene.settled(cmdBar)

    await u.closeKclCodePanel()
@ -1205,7 +1188,6 @@ sweepSketch = startSketchOn(XY)
    await page.setViewportSize({ width: 1200, height: 1000 })
    await u.waitForAuthSkipAppStart()

-    await scene.connectionEstablished()
    await scene.settled(cmdBar)

    await expect(page, 'expect small color widget').toHaveScreenshot({
@ -1255,7 +1237,6 @@ sweepSketch = startSketchOn(XY)
    await page.setViewportSize({ width: 1200, height: 1000 })
    await u.waitForAuthSkipAppStart()

-    await scene.connectionEstablished()
    await scene.settled(cmdBar)

    await expect(page.locator('.cm-css-color-picker-wrapper')).toBeVisible()
--- a/e2e/playwright/storageStates.ts
+++ b/e2e/playwright/storageStates.ts
@ -23,7 +23,7 @@ export const TEST_SETTINGS: DeepPartial<Settings> = {
    camera_projection: 'perspective',
  },
  project: {
-    default_project_name: 'project-$nnn',
+    default_project_name: 'untitled',
    directory: '',
  },
  text_editor: {
--- a/e2e/playwright/test-network-and-connection-issues.spec.ts
+++ b/e2e/playwright/test-network-and-connection-issues.spec.ts
@ -89,7 +89,7 @@ test.describe('Test network and connection issues', () => {
  test(
    'Engine disconnect & reconnect in sketch mode',
    { tag: '@skipLocalEngine' },
-    async ({ page, homePage, toolbar }) => {
+    async ({ page, homePage, toolbar, scene, cmdBar }) => {
      test.fixme(orRunWhenFullSuiteEnabled())
      const networkToggle = page.getByTestId('network-toggle')

@ -169,7 +169,7 @@ test.describe('Test network and connection issues', () => {

      // Expect the network to be up
      await expect(networkToggle).toContainText('Connected')
-      await expect(page.getByTestId('loading-stream')).not.toBeAttached()
+      await scene.settled(cmdBar)

      // Click off the code pane.
      await page.mouse.click(100, 100)
--- a/e2e/playwright/test-utils.ts
+++ b/e2e/playwright/test-utils.ts
@ -74,7 +74,10 @@ async function waitForPageLoadWithRetry(page: Page) {
  await expect(async () => {
    await page.goto('/')
    const errorMessage = 'App failed to load - 🔃 Retrying ...'
-    await expect(page.getByTestId('loading'), errorMessage).not.toBeAttached({
+    await expect(
+      page.getByTestId('model-state-indicator-playing'),
+      errorMessage
+    ).toBeAttached({
      timeout: 20_000,
    })

@ -87,9 +90,10 @@ async function waitForPageLoadWithRetry(page: Page) {
  }).toPass({ timeout: 70_000, intervals: [1_000] })
 }

+// lee: This needs to be replaced by scene.settled() eventually.
 async function waitForPageLoad(page: Page) {
  // wait for all spinners to be gone
-  await expect(page.getByTestId('loading')).not.toBeAttached({
+  await expect(page.getByTestId('model-state-indicator-playing')).toBeVisible({
    timeout: 20_000,
  })

@ -871,9 +875,10 @@ export async function tearDown(page: Page, testInfo: TestInfo) {
 export async function setup(
  context: BrowserContext,
  page: Page,
+  testDir: string,
  testInfo?: TestInfo
 ) {
-  await context.addInitScript(
+  await page.addInitScript(
    async ({
      token,
      settingsKey,
@ -914,7 +919,7 @@ export async function setup(
        },
      }),
      IS_PLAYWRIGHT_KEY,
-      PLAYWRIGHT_TEST_DIR: TEST_SETTINGS.project?.directory || '',
+      PLAYWRIGHT_TEST_DIR: testDir,
      PERSIST_MODELING_CONTEXT,
    }
  )
@ -934,7 +939,7 @@ export async function setup(
  await page.emulateMedia({ reducedMotion: 'reduce' })

  // Trigger a navigation, since loading file:// doesn't.
-  // await page.reload()
+  await page.reload()
 }

 function failOnConsoleErrors(page: Page, testInfo?: TestInfo) {
--- a/e2e/playwright/testing-camera-movement.spec.ts
+++ b/e2e/playwright/testing-camera-movement.spec.ts
@ -5,12 +5,18 @@ import { getUtils, orRunWhenFullSuiteEnabled } from '@e2e/playwright/test-utils'
 import { expect, test } from '@e2e/playwright/zoo-test'

 test.describe('Testing Camera Movement', { tag: ['@skipWin'] }, () => {
-  test('Can move camera reliably', async ({ page, context, homePage }) => {
+  test('Can move camera reliably', async ({
+    page,
+    context,
+    homePage,
+    scene,
+  }) => {
    const u = await getUtils(page)
    await page.setBodyDimensions({ width: 1200, height: 500 })

    await homePage.goToModelingScene()
-    await u.waitForPageLoad()
+    await scene.connectionEstablished()
+
    await u.openAndClearDebugPanel()
    await u.closeKclCodePanel()

--- a/e2e/playwright/testing-constraints.spec.ts
+++ b/e2e/playwright/testing-constraints.spec.ts
@ -77,7 +77,7 @@ test.describe('Testing constraints', { tag: ['@skipWin'] }, () => {
      })
      .toBe(false)
  })
-  test(`Remove constraints`, async ({ page, homePage }) => {
+  test(`Remove constraints`, async ({ page, homePage, scene, cmdBar }) => {
    await page.addInitScript(async () => {
      localStorage.setItem(
        'persistCode',
@ -101,7 +101,7 @@ test.describe('Testing constraints', { tag: ['@skipWin'] }, () => {
    await page.setBodyDimensions({ width: 1000, height: 500 })

    await homePage.goToModelingScene()
-    await u.waitForPageLoad()
+    await scene.settled(cmdBar)

    await page.getByText('line(end = [74.36, 130.4], tag = $seg01)').click()
    await page.getByRole('button', { name: 'Edit Sketch' }).click()
@ -142,7 +142,7 @@ test.describe('Testing constraints', { tag: ['@skipWin'] }, () => {
      },
    ] as const
    for (const { testName, offset } of cases) {
-      test(`${testName}`, async ({ page, homePage }) => {
+      test(`${testName}`, async ({ page, homePage, scene, cmdBar }) => {
        await page.addInitScript(async () => {
          localStorage.setItem(
            'persistCode',
@ -166,7 +166,7 @@ test.describe('Testing constraints', { tag: ['@skipWin'] }, () => {
        await page.setBodyDimensions({ width: 1200, height: 500 })

        await homePage.goToModelingScene()
-        await u.waitForPageLoad()
+        await scene.settled(cmdBar)

        await page.getByText('line(end = [74.36, 130.4], tag = $seg01)').click()
        await page.getByRole('button', { name: 'Edit Sketch' }).click()
@ -250,7 +250,12 @@ test.describe('Testing constraints', { tag: ['@skipWin'] }, () => {
      },
    ] as const
    for (const { testName, value, constraint } of cases) {
-      test(`${constraint} - ${testName}`, async ({ page, homePage }) => {
+      test(`${constraint} - ${testName}`, async ({
+        page,
+        homePage,
+        scene,
+        cmdBar,
+      }) => {
        await page.addInitScript(async () => {
          localStorage.setItem(
            'persistCode',
@ -274,7 +279,7 @@ test.describe('Testing constraints', { tag: ['@skipWin'] }, () => {
        await page.setBodyDimensions({ width: 1000, height: 500 })

        await homePage.goToModelingScene()
-        await u.waitForPageLoad()
+        await scene.settled(cmdBar)

        await page.getByText('line(end = [74.36, 130.4])').click()
        await page.getByRole('button', { name: 'Edit Sketch' }).click()
@ -361,7 +366,12 @@ test.describe('Testing constraints', { tag: ['@skipWin'] }, () => {
      },
    ] as const
    for (const { testName, addVariable, value, constraint } of cases) {
-      test(`${constraint} - ${testName}`, async ({ page, homePage }) => {
+      test(`${constraint} - ${testName}`, async ({
+        page,
+        homePage,
+        scene,
+        cmdBar,
+      }) => {
        await page.addInitScript(async () => {
          localStorage.setItem(
            'persistCode',
@ -385,7 +395,7 @@ test.describe('Testing constraints', { tag: ['@skipWin'] }, () => {
        await page.setBodyDimensions({ width: 1200, height: 500 })

        await homePage.goToModelingScene()
-        await u.waitForPageLoad()
+        await scene.settled(cmdBar)

        await page.getByText('line(end = [74.36, 130.4])').click()
        await page.getByRole('button', { name: 'Edit Sketch' }).click()
@ -475,7 +485,7 @@ test.describe('Testing constraints', { tag: ['@skipWin'] }, () => {
      },
    ] as const
    for (const { testName, addVariable, value, axisSelect } of cases) {
-      test(`${testName}`, async ({ page, homePage }) => {
+      test(`${testName}`, async ({ page, homePage, scene, cmdBar }) => {
        await page.addInitScript(async () => {
          localStorage.setItem(
            'persistCode',
@ -499,7 +509,7 @@ test.describe('Testing constraints', { tag: ['@skipWin'] }, () => {
        await page.setBodyDimensions({ width: 1200, height: 500 })

        await homePage.goToModelingScene()
-        await u.waitForPageLoad()
+        await scene.settled(cmdBar)

        await page.getByText('line(end = [74.36, 130.4])').click()
        await page.getByRole('button', { name: 'Edit Sketch' }).click()
@ -578,7 +588,7 @@ test.describe('Testing constraints', { tag: ['@skipWin'] }, () => {
      },
    ] as const
    for (const { testName, addVariable, value, constraint } of cases) {
-      test(`${testName}`, async ({ page, homePage }) => {
+      test(`${testName}`, async ({ page, homePage, scene, cmdBar }) => {
        await page.addInitScript(async () => {
          localStorage.setItem(
            'persistCode',
@ -602,7 +612,7 @@ test.describe('Testing constraints', { tag: ['@skipWin'] }, () => {
        await page.setBodyDimensions({ width: 1000, height: 500 })

        await homePage.goToModelingScene()
-        await u.waitForPageLoad()
+        await scene.settled(cmdBar)

        await page.getByText('line(end = [74.36, 130.4])').click()
        await page.getByRole('button', { name: 'Edit Sketch' }).click()
@ -655,7 +665,14 @@ test.describe('Testing constraints', { tag: ['@skipWin'] }, () => {
      },
    ] as const
    for (const { testName, addVariable, value, constraint } of cases) {
-      test(`${testName}`, async ({ context, homePage, page, editor }) => {
+      test(`${testName}`, async ({
+        context,
+        homePage,
+        page,
+        editor,
+        scene,
+        cmdBar,
+      }) => {
        // constants and locators
        const cmdBarKclInput = page
          .getByTestId('cmd-bar-arg-value')
@ -689,7 +706,7 @@ part002 = startSketchOn(XZ)
        await page.setBodyDimensions({ width: 1200, height: 500 })

        await homePage.goToModelingScene()
-        await u.waitForPageLoad()
+        await scene.settled(cmdBar)

        await editor.scrollToText('line(end = [74.36, 130.4])', true)
        await page.getByText('line(end = [74.36, 130.4])').click()
@ -746,7 +763,7 @@ part002 = startSketchOn(XZ)
      },
    ] as const
    for (const { codeAfter, constraintName } of cases) {
-      test(`${constraintName}`, async ({ page, homePage }) => {
+      test(`${constraintName}`, async ({ page, homePage, scene, cmdBar }) => {
        await page.addInitScript(async (customCode) => {
          localStorage.setItem(
            'persistCode',
@ -770,7 +787,7 @@ part002 = startSketchOn(XZ)
        await page.setBodyDimensions({ width: 1000, height: 500 })

        await homePage.goToModelingScene()
-        await u.waitForPageLoad()
+        await scene.settled(cmdBar)

        await page.getByText('line(end = [74.36, 130.4])').click()
        await page.getByRole('button', { name: 'Edit Sketch' }).click()
@ -848,7 +865,7 @@ part002 = startSketchOn(XZ)
      },
    ] as const
    for (const { codeAfter, constraintName } of cases) {
-      test(`${constraintName}`, async ({ page, homePage }) => {
+      test(`${constraintName}`, async ({ page, homePage, scene, cmdBar }) => {
        await page.addInitScript(async () => {
          localStorage.setItem(
            'persistCode',
@ -871,7 +888,7 @@ part002 = startSketchOn(XZ)
        await page.setBodyDimensions({ width: 1000, height: 500 })

        await homePage.goToModelingScene()
-        await u.waitForPageLoad()
+        await scene.settled(cmdBar)

        await page.getByText('line(end = [74.36, 130.4])').click()
        await page.getByRole('button', { name: 'Edit Sketch' }).click()
@ -930,7 +947,7 @@ part002 = startSketchOn(XZ)
      },
    ] as const
    for (const { codeAfter, constraintName, axisClick } of cases) {
-      test(`${constraintName}`, async ({ page, homePage }) => {
+      test(`${constraintName}`, async ({ page, homePage, scene, cmdBar }) => {
        await page.addInitScript(async () => {
          localStorage.setItem(
            'persistCode',
@ -953,7 +970,7 @@ part002 = startSketchOn(XZ)
        await page.setBodyDimensions({ width: 1200, height: 500 })

        await homePage.goToModelingScene()
-        await u.waitForPageLoad()
+        await scene.settled(cmdBar)

        await page.getByText('line(end = [74.36, 130.4])').click()
        await page.getByRole('button', { name: 'Edit Sketch' }).click()
@ -994,6 +1011,8 @@ part002 = startSketchOn(XZ)
  test('Horizontally constrained line remains selected after applying constraint', async ({
    page,
    homePage,
+    scene,
+    cmdBar,
  }) => {
    test.fixme(orRunWhenFullSuiteEnabled())
    test.setTimeout(70_000)
@ -1010,7 +1029,7 @@ part002 = startSketchOn(XZ)
    await page.setBodyDimensions({ width: 1200, height: 500 })

    await homePage.goToModelingScene()
-    await u.waitForPageLoad()
+    await scene.settled(cmdBar)

    await page.getByText('line(end = [3.79, 2.68], tag = $seg01)').click()
    await expect(page.getByRole('button', { name: 'Edit Sketch' })).toBeEnabled(
@ -1129,7 +1148,7 @@ test.describe('Electron constraint tests', () => {
          sortBy: 'last-modified-desc',
        })
        await homePage.openProject('test-sample')
-        await scene.waitForExecutionDone()
+        await scene.settled(cmdBar)
      })

      async function clickOnFirstSegmentLabel() {
--- a/e2e/playwright/testing-samples-loading.spec.ts
+++ b/e2e/playwright/testing-samples-loading.spec.ts
@ -11,7 +11,8 @@ test.describe('Testing in-app sample loading', () => {
   * Note this test implicitly depends on the KCL sample "a-parametric-bearing-pillow-block",
   * its title, and its units settings. https://github.com/KittyCAD/kcl-samples/blob/main/a-parametric-bearing-pillow-block/main.kcl
   */
-  test('Web: should overwrite current code, cannot create new file', async ({
+  // We have no more web tests
+  test.skip('Web: should overwrite current code, cannot create new file', async ({
    editor,
    context,
    page,
@ -78,7 +79,7 @@ test.describe('Testing in-app sample loading', () => {
  test(
    'Desktop: should create new file by default, optionally overwrite',
    { tag: '@electron' },
-    async ({ editor, context, page }, testInfo) => {
+    async ({ editor, context, page, scene, cmdBar }, testInfo) => {
      const { dir } = await context.folderSetupFn(async (dir) => {
        const bracketDir = join(dir, 'bracket')
        await fsp.mkdir(bracketDir, { recursive: true })
@ -125,7 +126,7 @@ test.describe('Testing in-app sample loading', () => {
      await test.step(`Test setup`, async () => {
        await page.setBodyDimensions({ width: 1200, height: 500 })
        await projectCard.click()
-        await u.waitForPageLoad()
+        await scene.settled(cmdBar)
      })

      await test.step(`Precondition: check the initial code`, async () => {
@ -140,11 +141,14 @@ test.describe('Testing in-app sample loading', () => {

      await test.step(`Load a KCL sample with the command palette`, async () => {
        await commandBarButton.click()
+        await page.waitForTimeout(1000)
        await commandOption.click()
+        await page.waitForTimeout(1000)
        await commandSampleOption(sampleOne.title).click()
        await expect(overwriteWarning).not.toBeVisible()
        await expect(newFileWarning).toBeVisible()
        await confirmButton.click()
+        await page.waitForTimeout(1000)
      })

      await test.step(`Ensure we made and opened a new file`, async () => {
@ -155,14 +159,20 @@ test.describe('Testing in-app sample loading', () => {

      await test.step(`Now overwrite the current file`, async () => {
        await commandBarButton.click()
+        await page.waitForTimeout(1000)
        await commandOption.click()
+        await page.waitForTimeout(1000)
        await commandSampleOption(sampleTwo.title).click()
+        await page.waitForTimeout(1000)
        await commandMethodArgButton.click()
+        await page.waitForTimeout(1000)
        await commandMethodOption.click()
+        await page.waitForTimeout(1000)
        await expect(commandMethodArgButton).toContainText('overwrite')
        await expect(newFileWarning).not.toBeVisible()
        await expect(overwriteWarning).toBeVisible()
        await confirmButton.click()
+        await page.waitForTimeout(1000)
      })

      await test.step(`Ensure we overwrote the current file without navigating`, async () => {
--- a/e2e/playwright/testing-segment-overlays.spec.ts
+++ b/e2e/playwright/testing-segment-overlays.spec.ts
@ -1520,6 +1520,8 @@ part001 = startSketchOn(XZ)
        page,
        editor,
        homePage,
+        scene,
+        cmdBar,
      }) => {
        await page.addInitScript(
          async ({ lineToBeDeleted }) => {
@ -1541,7 +1543,8 @@ part001 = startSketchOn(XZ)
        await page.setBodyDimensions({ width: 1200, height: 500 })

        await homePage.goToModelingScene()
-        await u.waitForPageLoad()
+        await scene.connectionEstablished()
+        await scene.settled(cmdBar)
        await page.waitForTimeout(300)

        await page.getByText(before).click()
--- a/e2e/playwright/testing-selections.spec.ts
+++ b/e2e/playwright/testing-selections.spec.ts
@ -324,7 +324,7 @@ part009 = startSketchOn(XY)
  |> line(end = [0, pipeLength])
  |> angledLineToX({ angle = 60, to = pipeLargeDia }, %)
  |> close()
-rev = revolve(part009, axis = 'y')
+rev = revolve(part009, axis = Y)
 sketch006 = startSketchOn(XY)
 profile001 = circle(
  sketch006,
@ -381,7 +381,7 @@ profile003 = startProfileAt([40.16, -120.48], sketch006)
    await page.waitForTimeout(200)

    await expect(u.codeLocator).not.toContainText(
-      `rev = revolve(part009, axis: 'y')`
+      `rev = revolve(part009, axis: Y)`
    )

    // FIXME (commented section below), this test would select a wall that had a sketch on it, and delete the underlying extrude
@ -528,6 +528,8 @@ profile001 = startProfileAt([7.49, 9.96], sketch001)
  test('Hovering over 3d features highlights code, clicking puts the cursor in the right place and sends selection id to engine', async ({
    page,
    homePage,
+    scene,
+    cmdBar,
  }) => {
    const u = await getUtils(page)
    await page.addInitScript(async (KCL_DEFAULT_LENGTH) => {
@ -779,11 +781,7 @@ part001 = startSketchOn(XZ)
   )
  `)

-    await expect(
-      page
-        .getByTestId('model-state-indicator-receive-reliable')
-        .or(page.getByTestId('model-state-indicator-execution-done'))
-    ).toBeVisible()
+    await scene.settled(cmdBar)

    await u.openAndClearDebugPanel()
    await u.sendCustomCmd({
@ -953,6 +951,7 @@ part001 = startSketchOn(XZ)
    page,
    homePage,
    scene,
+    cmdBar,
  }) => {
    const cases = [
      {
@ -989,7 +988,7 @@ part001 = startSketchOn(XZ)
    await page.setBodyDimensions({ width: 1200, height: 500 })

    await homePage.goToModelingScene()
-    await scene.waitForExecutionDone()
+    await scene.settled(cmdBar)
    await u.openAndClearDebugPanel()

    await u.sendCustomCmd({
@ -1024,6 +1023,7 @@ part001 = startSketchOn(XZ)
    page,
    homePage,
    scene,
+    cmdBar,
  }) => {
    await page.addInitScript(async () => {
      localStorage.setItem(
@ -1043,7 +1043,7 @@ part001 = startSketchOn(XZ)
    await page.setBodyDimensions({ width: 1200, height: 500 })

    await homePage.goToModelingScene()
-    await scene.waitForExecutionDone()
+    await scene.settled(cmdBar)
    await u.openAndClearDebugPanel()

    await u.sendCustomCmd({
--- a/e2e/playwright/testing-settings.spec.ts
+++ b/e2e/playwright/testing-settings.spec.ts
@ -55,9 +55,10 @@ test.describe('Testing settings', () => {
    // Check that the invalid settings were changed to good defaults
    expect(storedSettings.settings?.modeling?.base_unit).toBe('in')
    expect(storedSettings.settings?.modeling?.mouse_controls).toBe('zoo')
-    expect(storedSettings.settings?.project?.directory).toBe('')
+    // Commenting this out because tests need this to be set to work properly.
+    // expect(storedSettings.settings?.app?.project_directory).toBe('')
    expect(storedSettings.settings?.project?.default_project_name).toBe(
-      'project-$nnn'
+      'untitled'
    )
  })

@ -865,6 +866,8 @@ test.describe('Testing settings', () => {
    page,
    homePage,
    tronApp,
+    scene,
+    cmdBar,
  }) => {
    if (!tronApp) {
      fail()
@ -886,6 +889,7 @@ test.describe('Testing settings', () => {
    })
    await page.setBodyDimensions({ width: 1200, height: 500 })
    await homePage.goToModelingScene()
+    await scene.connectionEstablished()

    // Constants and locators
    const resizeHandle = page.locator('.sidebar-resize-handles > div.block')
@ -897,6 +901,7 @@ test.describe('Testing settings', () => {

    async function setShowDebugPanelTo(value: 'On' | 'Off') {
      await commandsButton.click()
+      await debugPaneOption.scrollIntoViewIfNeeded()
      await debugPaneOption.click()
      await page.getByRole('option', { name: value }).click()
      await expect(
--- a/e2e/playwright/zoo-test.ts
+++ b/e2e/playwright/zoo-test.ts
@ -17,7 +17,6 @@ declare module '@playwright/test' {
  }
  interface Page {
    dir: string
-    TEST_SETTINGS_FILE_KEY?: string
    setBodyDimensions: (dims: {
      width: number
      height: number
--- a/index.html
+++ b/index.html
@ -22,7 +22,7 @@
      data-domain="app.zoo.dev"
      src="https://plausible.corp.zoo.dev/js/script.tagged-events.js"
    ></script>
-    <title>Zoo Modeling App</title>
+    <title>Zoo Design Studio</title>
  </head>
  <body class="body-bg">
    <noscript>You need to enable JavaScript to run this app.</noscript>
--- a/interface.d.ts
+++ b/interface.d.ts
@ -72,7 +72,6 @@ export interface IElectronAPI {
  process: {
    env: {
      BASE_URL: string
-      TEST_SETTINGS_FILE_KEY: string
      IS_PLAYWRIGHT: string
      VITE_KC_DEV_TOKEN: string
      VITE_KC_API_WS_MODELING_URL: string
--- a/known-circular.txt
+++ b/known-circular.txt
@ -4,10 +4,10 @@ $ dpdm --no-warning --no-tree -T --skip-dynamic-imports=circular src/index.tsx
  02) src/lang/std/sketch.ts -> src/lang/modifyAst.ts
  03) src/lang/std/sketch.ts -> src/lang/modifyAst.ts -> src/lang/std/sketchcombos.ts
  04) src/lib/singletons.ts -> src/editor/manager.ts -> src/lib/selections.ts
-  05) src/lib/singletons.ts -> src/lang/KclSingleton.ts
-  06) src/lib/singletons.ts -> src/lang/codeManager.ts
-  07) src/lib/singletons.ts -> src/clientSideScene/sceneEntities.ts -> src/clientSideScene/segments.ts -> src/components/Toolbar/angleLengthInfo.ts
-  08) src/lib/singletons.ts -> src/clientSideScene/sceneEntities.ts -> src/clientSideScene/segments.ts -> src/machines/commandBarMachine.ts -> src/lib/commandBarConfigs/authCommandConfig.ts -> src/machines/appMachine.ts -> src/machines/settingsMachine.ts
-  09) src/machines/commandBarMachine.ts -> src/lib/commandBarConfigs/authCommandConfig.ts -> src/machines/appMachine.ts -> src/machines/settingsMachine.ts
+  05) src/lib/singletons.ts -> src/editor/manager.ts -> src/lib/selections.ts -> src/machines/appMachine.ts -> src/machines/engineStreamMachine.ts
+  06) src/lib/singletons.ts -> src/editor/manager.ts -> src/lib/selections.ts -> src/machines/appMachine.ts -> src/machines/settingsMachine.ts
+  07) src/machines/appMachine.ts -> src/machines/settingsMachine.ts -> src/machines/commandBarMachine.ts -> src/lib/commandBarConfigs/authCommandConfig.ts
+  08) src/lib/singletons.ts -> src/lang/codeManager.ts
+  09) src/lib/singletons.ts -> src/clientSideScene/sceneEntities.ts -> src/clientSideScene/segments.ts -> src/components/Toolbar/angleLengthInfo.ts
  10) src/hooks/useModelingContext.ts -> src/components/ModelingMachineProvider.tsx -> src/components/Toolbar/Intersect.tsx -> src/components/SetHorVertDistanceModal.tsx -> src/lib/useCalculateKclExpression.ts
  11) src/routes/Onboarding/index.tsx -> src/routes/Onboarding/Camera.tsx -> src/routes/Onboarding/utils.tsx
--- a/package.json
+++ b/package.json
@ -2,13 +2,13 @@
  "name": "zoo-modeling-app",
  "version": "0.0.0",
  "private": true,
-  "productName": "Zoo Modeling App",
+  "productName": "Zoo Design Studio",
  "author": {
    "name": "Zoo Corporation",
    "email": "info@zoo.dev",
    "url": "https://zoo.dev"
  },
-  "description": "Zoo Modeling App",
+  "description": "Zoo Design Studio",
  "main": ".vite/build/main.js",
  "license": "MIT",
  "dependencies": {
@ -26,7 +26,7 @@
    "@fortawesome/react-fontawesome": "^0.2.0",
    "@headlessui/react": "^1.7.19",
    "@headlessui/tailwindcss": "^0.2.2",
-    "@kittycad/lib": "2.0.25",
+    "@kittycad/lib": "2.0.26",
    "@lezer/highlight": "^1.2.1",
    "@lezer/lr": "^1.4.1",
    "@react-hook/resize-observer": "^2.0.1",
@ -233,7 +233,7 @@
    "ts-node": "^10.0.0",
    "typescript": "^5.8.2",
    "typescript-eslint": "^8.26.1",
-    "vite": "^5.4.12",
+    "vite": "^5.4.16",
    "vite-plugin-package-version": "^1.1.0",
    "vite-plugin-top-level-await": "^1.5.0",
    "vite-tsconfig-paths": "^4.3.2",
--- a/packages/codemirror-lang-kcl/yarn.lock
+++ b/packages/codemirror-lang-kcl/yarn.lock
@ -683,9 +683,9 @@ vite-tsconfig-paths@^4.3.2:
    tsconfck "^3.0.3"

 vite@^5.0.0:
-  version "5.4.14"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.14.tgz#ff8255edb02134df180dcfca1916c37a6abe8408"
-  integrity sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==
+  version "5.4.16"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.16.tgz#471983257a890ef33f2700cbbbc2134f2d08abf1"
+  integrity sha512-Y5gnfp4NemVfgOTDQAunSD4346fal44L9mszGGY/e+qxsRT5y1sMlS/8tiQ8AFAp+MFgYNSINdfEchJiPm41vQ==
  dependencies:
    esbuild "^0.21.3"
    postcss "^8.4.43"
--- a/playwright.config.ts
+++ b/playwright.config.ts
@ -1,10 +1,29 @@
 import { defineConfig, devices } from '@playwright/test'
+import os from 'os'

-/**
- * Read environment variables from file.
- * https://github.com/motdotla/dotenv
- */
-// require('dotenv').config();
+const platform = os.platform() // 'linux' (Ubuntu), 'darwin' (macOS), 'win32' (Windows)
+
+let workers: number | string
+
+if (process.env.E2E_WORKERS) {
+  workers = process.env.E2E_WORKERS.includes('%')
+    ? process.env.E2E_WORKERS
+    : parseInt(process.env.E2E_WORKERS)
+} else if (!process.env.CI) {
+  workers = 1 // Local dev: keep things simple and deterministic by default
+} else {
+  // On CI: adjust based on OS
+  switch (platform) {
+    case 'linux':
+      workers = '100%' // CI Linux runners are generally beefier
+      break
+    case 'darwin':
+    case 'win32':
+    default:
+      workers = '75%' // Slightly conservative for GUI-based OSes
+      break
+  }
+}

 /**
 * See https://playwright.dev/docs/test-configuration.
@ -19,8 +38,8 @@ export default defineConfig({
  forbidOnly: !!process.env.CI,
  /* Do not retry */
  retries: process.env.CI ? 0 : 0,
-  /* Different amount of parallelism on CI and local. */
-  workers: process.env.CI ? 1 : 4,
+  /* Use all available CPU cores */
+  workers: workers,
  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
  reporter: [
    [process.env.CI ? 'dot' : 'list'],
--- a/playwright.electron.config.ts
+++ b/playwright.electron.config.ts
@ -1,5 +1,29 @@
 import { defineConfig, devices } from '@playwright/test'
-import { platform } from 'os'
+import os from 'os'
+
+const platform = os.platform() // 'linux' (Ubuntu), 'darwin' (macOS), 'win32' (Windows)
+
+let workers: number | string
+
+if (process.env.E2E_WORKERS) {
+  workers = process.env.E2E_WORKERS.includes('%')
+    ? process.env.E2E_WORKERS
+    : parseInt(process.env.E2E_WORKERS)
+} else if (!process.env.CI) {
+  workers = 1 // Local dev: keep things simple and deterministic by default
+} else {
+  // On CI: adjust based on OS
+  switch (platform) {
+    case 'linux':
+      workers = '50%' // CI Linux runners are generally beefier
+      break
+    case 'darwin':
+    case 'win32':
+    default:
+      workers = '25%' // Lower concurrency for heavier Electron processes
+      break
+  }
+}

 /**
 * See https://playwright.dev/docs/test-configuration.
@ -14,8 +38,8 @@ export default defineConfig({
  forbidOnly: true,
  /* Do not retry */
  retries: 0,
-  /* Different amount of parallelism on CI and local. */
-  workers: platform() === 'win32' ? 1 : 2,
+  /* Use all available CPU cores */
+  workers: workers,
  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
  reporter: [
    ['dot'],
--- a/public/announce_release.py
+++ b/public/announce_release.py
@ -31,7 +31,7 @@ data = {

        {modified_release_body}
    '''),
-    "username": "Modeling App Release Updates",
+    "username": "Design Studio Release Updates",
    "avatar_url": "https://raw.githubusercontent.com/KittyCAD/modeling-app/main/public/discord-avatar.png"
 }

--- a/public/expectations.md
+++ b/public/expectations.md
@ -4,9 +4,9 @@

 First off, thank you so much for your interest in being a part of the closed Alpha program! We are thrilled to have others use our product and see what you build with it (and truthfully, how you break it too).

-### Zoo Modeling App (ZMA)
+### Zoo Design Studio (ZMA)

-What we are introducing to you is our Zoo Modeling App (ZMA). ZMA is a CAD application that expresses a hybrid style of traditional CAD interface along with a code-CAD interface. ZMA is a great way for us to test our own APIs as well as inspire others to develop their own applications.
+What we are introducing to you is our Zoo Design Studio (ZMA). ZMA is a CAD application that expresses a hybrid style of traditional CAD interface along with a code-CAD interface. ZMA is a great way for us to test our own APIs as well as inspire others to develop their own applications.

 ### Why Code?

--- a/public/kcl-samples/ball-bearing/main.kcl
+++ b/public/kcl-samples/ball-bearing/main.kcl
@ -35,7 +35,7 @@ ballsSketch = startSketchOn(XY)
  |> close()

 // Revolve the ball to make a sphere and pattern around the inside wall
-balls = revolve(ballsSketch, axis = "X")
+balls = revolve(ballsSketch, axis = X)
  |> patternCircular3d(
       arcDegrees = 360,
       axis = [0, 0, 1],
@ -60,7 +60,7 @@ chainSketch = startSketchOn(XY)
  |> close()

 // Revolve the chain sketch
-chainHead = revolve(chainSketch, axis = "X")
+chainHead = revolve(chainSketch, axis = X)
  |> patternCircular3d(
       arcDegrees = 360,
       axis = [0, 0, 1],
@ -80,7 +80,7 @@ linkSketch = startSketchOn(XZ)
     )

 // Revolve the link sketch
-linkRevolve = revolve(linkSketch, axis = 'Y', angle = 360 / nBalls)
+linkRevolve = revolve(linkSketch, axis = Y, angle = 360 / nBalls)
  |> patternCircular3d(
       arcDegrees = 360,
       axis = [0, 0, 1],
--- a/public/kcl-samples/car-wheel-assembly/brake-caliper.kcl
+++ b/public/kcl-samples/car-wheel-assembly/brake-caliper.kcl
@ -80,5 +80,5 @@ brakeCaliperSketch = startSketchOn(XY)
  |> close()

 // Revolve the brake caliper sketch
-revolve(brakeCaliperSketch, axis = "Y", angle = -70)
+revolve(brakeCaliperSketch, axis = Y, angle = -70)
  |> appearance(color = "#c82d2d", metalness = 90, roughness = 90)
--- a/public/kcl-samples/car-wheel-assembly/car-tire.kcl
+++ b/public/kcl-samples/car-wheel-assembly/car-tire.kcl
@ -41,5 +41,5 @@ tireSketch = startSketchOn(XY)
  |> close()

 // Revolve the sketch to create the tire
-revolve(tireSketch, axis = "Y")
+revolve(tireSketch, axis = Y)
  |> appearance(color = "#0f0f0f", roughness = 80)
--- a/public/kcl-samples/car-wheel-assembly/car-wheel.kcl
+++ b/public/kcl-samples/car-wheel-assembly/car-wheel.kcl
@ -54,7 +54,7 @@ wheelCenterInner = startSketchOn(XY)
  |> yLine(endAbsolute = 0)
  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
  |> close()
-  |> revolve(axis = 'y')
+  |> revolve(axis = Y)
  |> appearance(color = "#ffffff", metalness = 0, roughness = 0)

 wheelCenterOuter = startSketchOn(XY)
@ -68,7 +68,7 @@ wheelCenterOuter = startSketchOn(XY)
  |> yLine(endAbsolute = -wheelWidth / 20)
  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
  |> close()
-  |> revolve(axis = 'y')
+  |> revolve(axis = Y)
  |> appearance(color = "#ffffff", metalness = 0, roughness = 0)

 // Write a function that defines the spoke geometry, patterns and extrudes it
@ -173,5 +173,5 @@ startSketchOn(XY)
  |> xLine(length = wheelWidth * 0.03)
  |> yLine(length = wheelWidth * 0.05)
  |> close()
-  |> revolve(axis = 'y')
+  |> revolve(axis = Y)
  |> appearance(color = "#ffffff", metalness = 0, roughness = 0)
--- a/public/kcl-samples/car-wheel-assembly/lug-nut.kcl
+++ b/public/kcl-samples/car-wheel-assembly/lug-nut.kcl
@ -32,7 +32,7 @@ fn lug(plane, length, diameter) {
    |> xLine(endAbsolute = lugThreadDiameter)
    |> yLine(endAbsolute = 0)
    |> close()
-    |> revolve(axis = "Y")
+    |> revolve(axis = Y)
    |> appearance(color = "#dbcd70", roughness = 90, metalness = 90)
  return lugSketch
 }
--- a/public/kcl-samples/french-press/main.kcl
+++ b/public/kcl-samples/french-press/main.kcl
@ -23,7 +23,7 @@ sketch001 = startSketchOn(XZ)
     ], %, $rectangleSegmentC001)
  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
  |> close()
-  |> revolve(angle = 360, axis = 'Y')
+  |> revolve(angle = 360, axis = Y)

 // Create an angled plane to sketch the supports
 plane001 = {
@ -132,7 +132,7 @@ sketch005 = startSketchOn(XZ)
  |> xLine(endAbsolute = 0.15)
  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
  |> close()
-  |> revolve(axis = 'y')
+  |> revolve(axis = Y)

 // Plunger and stem
 sketch006 = startSketchOn(XZ)
@ -145,7 +145,7 @@ sketch006 = startSketchOn(XZ)
  |> tangentialArc({ radius = 0.6, offset = -90 }, %)
  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
  |> close()
-  |> revolve(axis = 'y')
+  |> revolve(axis = Y)

 // Spiral plate
 sketch007 = startSketchOn(offsetPlane(XY, offset = 1.12))
@ -201,7 +201,7 @@ sketch011 = startSketchOn(XZ)
     }, %)
  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
  |> close()
-  |> revolve(axis = 'y')
+  |> revolve(axis = Y)

 // Draw and extrude handle
 sketch012 = startSketchOn(offsetPlane(XZ, offset = handleThickness / 2))
--- a/public/kcl-samples/gridfinity-baseplate-magnets/main.kcl
+++ b/public/kcl-samples/gridfinity-baseplate-magnets/main.kcl
@ -48,10 +48,8 @@ sides = patternCircular3d(

 // define an axis axis000
 axis000 = {
-  custom = {
-    axis = [0.0, 1.0],
-    origin = [cornerRadius, cornerRadius]
-  }
+  direction = [0.0, 1.0],
+  origin = [cornerRadius, cornerRadius]
 }

 // create a single corner of the bin
--- a/public/kcl-samples/gridfinity-baseplate/main.kcl
+++ b/public/kcl-samples/gridfinity-baseplate/main.kcl
@ -45,10 +45,8 @@ sides = patternCircular3d(

 // define an axis axis000
 axis000 = {
-  custom = {
-    axis = [0.0, 1.0],
-    origin = [cornerRadius, cornerRadius]
-  }
+  direction = [0.0, 1.0],
+  origin = [cornerRadius, cornerRadius]
 }

 // create a single corner of the bin
--- a/public/kcl-samples/gridfinity-bins-stacking-lip/main.kcl
+++ b/public/kcl-samples/gridfinity-bins-stacking-lip/main.kcl
@ -65,13 +65,11 @@ sides = patternCircular3d(

 // define an axis axis000
 axis000 = {
-  custom = {
-    axis = [0.0, 1.0],
-    origin = [
-      cornerRadius + binTol,
-      cornerRadius + binTol
-    ]
-  }
+  direction = [0.0, 1.0],
+  origin = [
+    cornerRadius + binTol,
+    cornerRadius + binTol
+  ]
 }

 // create a single corner of the bin
@ -272,10 +270,8 @@ lipWidths = patternCircular3d(

 // define an axis axis000
 axis001 = {
-  custom = {
-    axis = [0.0, 1.0],
-    origin = [cornerRadius, cornerRadius]
-  }
+  direction = [0.0, 1.0],
+  origin = [cornerRadius, cornerRadius]
 }

 // create a single corner of the bin
--- a/public/kcl-samples/gridfinity-bins/main.kcl
+++ b/public/kcl-samples/gridfinity-bins/main.kcl
@ -58,13 +58,11 @@ sides = patternCircular3d(

 // define an axis axis000
 axis000 = {
-  custom = {
-    axis = [0.0, 1.0],
-    origin = [
-      cornerRadius + binTol,
-      cornerRadius + binTol
-    ]
-  }
+  direction = [0.0, 1.0],
+  origin = [
+    cornerRadius + binTol,
+    cornerRadius + binTol
+  ]
 }

 // create a single corner of the bin
--- a/public/kcl-samples/i-beam/main.kcl
+++ b/public/kcl-samples/i-beam/main.kcl
@ -20,6 +20,6 @@ sketch001 = startSketchOn(-XZ)
  |> xLine(endAbsolute = webThickness / 2 + rootRadius)
  |> tangentialArc({ radius = rootRadius, offset = 90 }, %)
  |> yLine(endAbsolute = 0)
-  |> mirror2d({ axis = 'X' }, %)
-  |> mirror2d({ axis = 'Y' }, %)
+  |> mirror2d(axis = X)
+  |> mirror2d(axis = Y)
  |> extrude(length = beamLength)
--- a/public/kcl-samples/pipe-with-bend/main.kcl
+++ b/public/kcl-samples/pipe-with-bend/main.kcl
@ -24,4 +24,4 @@ pipeProfile = outerProfile
  |> hole(innerProfile, %)

 // revolve the pipe profile at the desired angle
-pipe = revolve(pipeProfile, axis = 'Y', angle = bendAngle)
+pipe = revolve(pipeProfile, axis = Y, angle = bendAngle)
--- a/public/kcl-samples/pipe/main.kcl
+++ b/public/kcl-samples/pipe/main.kcl
@ -33,4 +33,4 @@ pipeSketch = startSketchOn(XY)
  |> close()

 // Revolve the sketch to create the pipe
-pipe = revolve(pipeSketch, axis = 'y')
+pipe = revolve(pipeSketch, axis = Y)
--- a/public/kcl-samples/poopy-shoe/main.kcl
+++ b/public/kcl-samples/poopy-shoe/main.kcl
@ -34,10 +34,8 @@ part001 = revolve(
  sketch001,
  angle = 90,
  axis = {
-    custom = {
-      axis = [1.0, 0.0],
-      origin = [0.0, height + .0001]
-    }
+    direction = [1.0, 0.0],
+    origin = [0.0, height + .0001]
  },
 )

--- a/public/kcl-samples/walkie-talkie/knob.kcl
+++ b/public/kcl-samples/walkie-talkie/knob.kcl
@ -21,7 +21,7 @@ export fn knob() {
       }, %)
    |> xLine(endAbsolute = 0.0001)
    |> close()
-    |> revolve(axis = "Y")
+    |> revolve(axis = Y)
    |> appearance(color = '#D0FF01', metalness = 90, roughness = 50)

  return knob
--- a/public/manifest.json
+++ b/public/manifest.json
@ -1,6 +1,6 @@
 {
  "short_name": "ZMA",
-  "name": "Zoo Modeling App",
+  "name": "Zoo Design Studio",
  "icons": [
    {
      "src": "favicon.ico",
--- a/public/roadmap.md
+++ b/public/roadmap.md
@ -1,4 +1,4 @@
-## Zoo Modeling App Roadmap
+## Zoo Design Studio Roadmap

 This document ties into our [GH Discussions Feature List](https://github.com/KittyCAD/modeling-app/discussions). Please upvote any features that you want to see next, or add ones that are not listed and we will review. 

--- a/rust/kcl-lib/e2e/executor/main.rs
+++ b/rust/kcl-lib/e2e/executor/main.rs
@ -881,7 +881,7 @@ async fn kcl_test_simple_revolve() {
     |> line(end = [0, -5.5])
     |> line(end = [-2, 0])
     |> close()
-     |> revolve(axis = 'y')
+     |> revolve(axis = Y)

 "#;

@ -901,7 +901,7 @@ async fn kcl_test_simple_revolve_uppercase() {
     |> line(end = [0, -5.5])
     |> line(end = [-2, 0])
     |> close()
-     |> revolve(axis = 'Y')
+     |> revolve(axis = Y)

 "#;

@ -921,7 +921,7 @@ async fn kcl_test_simple_revolve_negative() {
     |> line(end = [0, -5.5])
     |> line(end = [-2, 0])
     |> close()
-     |> revolve(axis = '-Y', angle = 180)
+     |> revolve(axis = -Y, angle = 180)

 "#;

@ -941,7 +941,7 @@ async fn kcl_test_revolve_bad_angle_low() {
     |> line(end = [0, -5.5])
     |> line(end = [-2, 0])
     |> close()
-     |> revolve(axis = 'y', angle = -455)
+     |> revolve(axis = Y, angle = -455)

 "#;

@ -967,7 +967,7 @@ async fn kcl_test_revolve_bad_angle_high() {
     |> line(end = [0, -5.5])
     |> line(end = [-2, 0])
     |> close()
-     |> revolve(axis = 'y', angle = 455)
+     |> revolve(axis = Y, angle = 455)

 "#;

@ -993,7 +993,7 @@ async fn kcl_test_simple_revolve_custom_angle() {
     |> line(end = [0, -5.5])
     |> line(end = [-2, 0])
     |> close()
-     |> revolve(axis = 'y', angle = 180)
+     |> revolve(axis = Y, angle = 180)

 "#;

@ -1013,7 +1013,7 @@ async fn kcl_test_simple_revolve_custom_axis() {
     |> line(end = [0, -5.5])
     |> line(end = [-2, 0])
     |> close()
-     |> revolve(axis = {custom: {axis: [0, -1], origin: [0,0]}}, angle = 180)
+     |> revolve(axis = { direction = [0, -1], origin: [0,0] }, angle = 180)

 "#;

@ -1111,7 +1111,7 @@ sketch001 = startSketchOn(box, "END")
  |> circle(center = [10,10], radius= 4 )
  |> revolve(
    angle = -90, 
-    axis = 'y' 
+    axis = Y 
    )
 "#;

@ -1136,7 +1136,7 @@ sketch001 = startSketchOn(box, "end")
  |> line(end = [0, 10])
  |> close()
  |> revolve(
-      axis = 'y',
+      axis = Y,
      angle = -90,
  )
 "#;
@ -1151,7 +1151,7 @@ async fn kcl_test_basic_revolve_circle() {
  |> circle(center = [15, 0], radius= 5)
  |> revolve(
    angle = 360, 
-    axis = 'y' 
+    axis = Y 
    )
 "#;

@ -1171,7 +1171,7 @@ async fn kcl_test_simple_revolve_sketch_on_edge() {
     |> line(end = [0, -5.5])
     |> line(end = [-2, 0])
     |> close()
-     |> revolve(axis = 'y', angle = 180)
+     |> revolve(axis = Y, angle = 180)

 part002 = startSketchOn(part001, 'end')
    |> startProfileAt([4.5, -5], %)
--- a/rust/kcl-lib/src/coredump/mod.rs
+++ b/rust/kcl-lib/src/coredump/mod.rs
@ -164,7 +164,7 @@ impl CoreDumpInfo {
 ![Screenshot]({screenshot_url})

 > _Note: If you are capturing from a browser there is limited support for screenshots, only captures the modeling scene.
-  If you are on MacOS native screenshots may be disabled by default. To enable native screenshots add Zoo Modeling App to System Settings -> Screen & SystemAudio Recording for native screenshots._
+  If you are on MacOS native screenshots may be disabled by default. To enable native screenshots add Zoo Design Studio to System Settings -> Screen & SystemAudio Recording for native screenshots._

 <details>
 <summary><b>Core Dump</b></summary>
--- a/rust/kcl-lib/src/docs/gen_std_tests.rs
+++ b/rust/kcl-lib/src/docs/gen_std_tests.rs
@ -24,8 +24,9 @@ use crate::{
 const TYPES_DIR: &str = "../../docs/kcl/types";
 const LANG_TOPICS: [&str; 5] = ["Types", "Modules", "Settings", "Known Issues", "Constants"];
 // These types are declared in std.
-const DECLARED_TYPES: [&str; 11] = [
-    "number", "string", "tag", "bool", "Sketch", "Solid", "Plane", "Helix", "Face", "Point2d", "Point3d",
+const DECLARED_TYPES: [&str; 14] = [
+    "number", "string", "tag", "bool", "Sketch", "Solid", "Plane", "Helix", "Face", "Edge", "Point2d", "Point3d",
+    "Axis2d", "Axis3d",
 ];

 fn init_handlebars() -> Result<handlebars::Handlebars<'static>> {
@ -241,7 +242,7 @@ fn init_handlebars() -> Result<handlebars::Handlebars<'static>> {
             out: &mut dyn handlebars::Output|
             -> handlebars::HelperResult {
                let param = h.param(0).and_then(|v| v.value().as_str()).unwrap_or("");
-                let basename = param.split('/').last().unwrap_or("");
+                let basename = param.split('/').next_back().unwrap_or("");
                out.write(&format!("`{}`", basename))?;
                Ok(())
            },
--- a/rust/kcl-lib/src/docs/kcl_doc.rs
+++ b/rust/kcl-lib/src/docs/kcl_doc.rs
@ -508,6 +508,7 @@ pub struct ArgData {
    pub ty: Option<String>,
    /// If the argument is required.
    pub kind: ArgKind,
+    pub override_in_snippet: Option<bool>,
    /// Additional information that could be used instead of the type's description.
    /// This is helpful if the type is really basic, like "number" -- that won't tell the user much about
    /// how this argument is meant to be used.
@ -528,6 +529,7 @@ impl ArgData {
            name: arg.identifier.name.clone(),
            ty: arg.type_.as_ref().map(|t| t.to_string()),
            docs: None,
+            override_in_snippet: None,
            kind: if arg.labeled {
                ArgKind::Labelled(arg.optional())
            } else {
@ -535,26 +537,51 @@ impl ArgData {
            },
        };

+        for attr in &arg.identifier.outer_attrs {
+            if let Annotation {
+                name: None,
+                properties: Some(props),
+                ..
+            } = &attr.inner
+            {
+                for p in props {
+                    if p.key.name == "include_in_snippet" {
+                        if let Some(b) = p.value.literal_bool() {
+                            result.override_in_snippet = Some(b);
+                        } else {
+                            panic!(
+                                "Invalid value for `include_in_snippet`, expected bool literal, found {:?}",
+                                p.value
+                            );
+                        }
+                    }
+                }
+            }
+        }
+
        result.with_comments(&arg.identifier.pre_comments);
        result
    }

    pub fn get_autocomplete_snippet(&self, index: usize) -> Option<(usize, String)> {
+        match self.override_in_snippet {
+            Some(false) => return None,
+            None if !self.kind.required() => return None,
+            _ => {}
+        }
+
        let label = if self.kind == ArgKind::Special {
            String::new()
        } else {
            format!("{} = ", self.name)
        };
        match self.ty.as_deref() {
-            Some(s) if ["Sketch", "Solid", "Plane | Face", "Sketch | Plane | Face"].contains(&s) => {
-                Some((index, format!("{label}${{{}:{}}}", index, "%")))
-            }
-            Some("number") if self.kind.required() => Some((index, format!(r#"{label}${{{}:3.14}}"#, index))),
-            Some("Point2d") if self.kind.required() => Some((
+            Some(s) if s.starts_with("number") => Some((index, format!(r#"{label}${{{}:3.14}}"#, index))),
+            Some("Point2d") => Some((
                index + 1,
                format!(r#"{label}[${{{}:3.14}}, ${{{}:3.14}}]"#, index, index + 1),
            )),
-            Some("Point3d") if self.kind.required() => Some((
+            Some("Point3d") => Some((
                index + 2,
                format!(
                    r#"{label}[${{{}:3.14}}, ${{{}:3.14}}, ${{{}:3.14}}]"#,
@ -563,8 +590,10 @@ impl ArgData {
                    index + 2
                ),
            )),
-            Some("string") if self.kind.required() => Some((index, format!(r#"{label}${{{}:"string"}}"#, index))),
-            Some("bool") if self.kind.required() => Some((index, format!(r#"{label}${{{}:false}}"#, index))),
+            Some("Axis2d | Edge") | Some("Axis3d | Edge") => Some((index, format!(r#"{label}${{{}:X}}"#, index))),
+
+            Some("string") => Some((index, format!(r#"{label}${{{}:"string"}}"#, index))),
+            Some("bool") => Some((index, format!(r#"{label}${{{}:false}}"#, index))),
            _ => None,
        }
    }
--- a/rust/kcl-lib/src/docs/mod.rs
+++ b/rust/kcl-lib/src/docs/mod.rs
@ -612,7 +612,7 @@ pub fn get_description_string_from_schema(schema: &schemars::schema::RootSchema)
    }

    if let Some(reference) = &schema.schema.reference {
-        if let Some(definition) = schema.definitions.get(reference.split('/').last().unwrap_or("")) {
+        if let Some(definition) = schema.definitions.get(reference.split('/').next_back().unwrap_or("")) {
            let schemars::schema::Schema::Object(definition) = definition else {
                return None;
            };
@ -937,9 +937,12 @@ mod tests {

    #[test]
    fn get_autocomplete_snippet_revolve() {
-        let revolve_fn: Box<dyn StdLibFn> = Box::new(crate::std::revolve::Revolve);
-        let snippet = revolve_fn.to_autocomplete_snippet().unwrap();
-        assert_eq!(snippet, r#"revolve(${0:%}, axis = ${1:"X"})${}"#);
+        let data = kcl_doc::walk_prelude();
+        let DocData::Fn(revolve_fn) = data.into_iter().find(|d| d.name() == "revolve").unwrap() else {
+            panic!();
+        };
+        let snippet = revolve_fn.to_autocomplete_snippet();
+        assert_eq!(snippet, r#"revolve(axis = ${0:X})${}"#);
    }

    #[test]
@ -952,7 +955,7 @@ mod tests {
        let snippet = circle_fn.to_autocomplete_snippet();
        assert_eq!(
            snippet,
-            r#"circle(${0:%}, center = [${1:3.14}, ${2:3.14}], radius = ${3:3.14})${}"#
+            r#"circle(center = [${0:3.14}, ${1:3.14}], radius = ${2:3.14})${}"#
        );
    }

@ -1026,11 +1029,14 @@ mod tests {
    #[test]
    #[allow(clippy::literal_string_with_formatting_args)]
    fn get_autocomplete_snippet_helix() {
-        let helix_fn: Box<dyn StdLibFn> = Box::new(crate::std::helix::Helix);
-        let snippet = helix_fn.to_autocomplete_snippet().unwrap();
+        let data = kcl_doc::walk_prelude();
+        let DocData::Fn(helix_fn) = data.into_iter().find(|d| d.name() == "helix").unwrap() else {
+            panic!();
+        };
+        let snippet = helix_fn.to_autocomplete_snippet();
        assert_eq!(
            snippet,
-            r#"helix(revolutions = ${0:3.14}, angleStart = ${1:3.14}, radius = ${2:3.14}, axis = ${3:"X"}, length = ${4:3.14})${}"#
+            r#"helix(revolutions = ${0:3.14}, angleStart = ${1:3.14}, radius = ${2:3.14}, axis = ${3:X}, length = ${4:3.14})${}"#
        );
    }

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
lee-at-zoo-corp	2342d04fe2	Add back old window detection heuristic	2025-04-04 18:05:29 -04:00
lee-at-zoo-corp	ddac107dc1	Test attempt number 15345203, action!	2025-04-04 16:43:49 -04:00
lee-at-zoo-corp	313a21e82a	Try again	2025-04-04 14:58:06 -04:00
lee-at-zoo-corp	b9875bb8cf	Fix camera failure	2025-04-04 14:28:04 -04:00
lee-at-zoo-corp	8940f9b214	tsc lint	2025-04-04 14:24:27 -04:00
lee-at-zoo-corp	0af99af15e	Fix native menu tests more	2025-04-04 13:51:44 -04:00
lee-at-zoo-corp	7f18aef49b	Add app console.log	2025-04-04 12:43:04 -04:00
lee-at-zoo-corp	062495c02d	Hopefully fix snapshots at least	2025-04-04 12:40:14 -04:00
lee-at-zoo-corp	767fde869c	Use scene.connectionEstablished	2025-04-04 11:46:04 -04:00
lee-at-zoo-corp	49fcbdddba	Try something	2025-04-04 11:39:22 -04:00
lee-at-zoo-corp	e06f76a6bb	Qualify fail function	2025-04-04 11:38:05 -04:00
lee-at-zoo-corp	e98a957553	Remove a test race - poll window info.	2025-04-04 11:37:20 -04:00
lee-at-zoo-corp	25af691911	Fix cache count numbers in editor test	2025-04-04 11:37:20 -04:00
lee-at-zoo-corp	cdc0fa4ed9	Fix zoom to fit at the right moments...	2025-04-04 11:37:20 -04:00
lee-at-zoo-corp	4d06a917f2	Fix the bad reload repeat issue kevin started on	2025-04-04 11:37:19 -04:00
lee-at-zoo-corp	682fa50c1a	Remove NetworkHealthIndicator test that was shit	2025-04-04 11:36:27 -04:00
lee-at-zoo-corp	496522e27d	a new list of circular deps	2025-04-04 11:36:27 -04:00
lee-at-zoo-corp	4c57cea22d	Fix zoom to fit being frigged	2025-04-04 11:36:27 -04:00
lee-at-zoo-corp	70f9c8edf1	fmt tsc	2025-04-04 11:36:27 -04:00
lee-at-zoo-corp	9de37879e5	fmt	2025-04-04 11:36:27 -04:00
lee-at-zoo-corp	91b5549a06	Fix another cyclic mfer!	2025-04-04 11:36:27 -04:00
lee-at-zoo-corp	3471f73479	Get rid of 1 cyclic dependency	2025-04-04 11:36:27 -04:00
lee-at-zoo-corp	277c489e38	Fix up new changes	2025-04-04 11:36:26 -04:00
lee-at-zoo-corp	00122aae5e	yarn fmt lint tsc	2025-04-04 11:35:44 -04:00
lee-at-zoo-corp	65adfd4497	Fix up named-views tests	2025-04-04 11:34:59 -04:00
lee-at-zoo-corp	8d0343c946	Fix 2 more	2025-04-04 11:34:59 -04:00
lee-at-zoo-corp	4c564bf332	Fix more tests	2025-04-04 11:34:59 -04:00
lee-at-zoo-corp	ed1e2aedfd	Fixup after rebase	2025-04-04 11:34:59 -04:00
lee-at-zoo-corp	992fec6afb	wip	2025-04-04 11:34:58 -04:00
lee-at-zoo-corp	62a18dd2b3	less flaky point and click	2025-04-04 11:34:31 -04:00
lee-at-zoo-corp	2c673fba82	wip	2025-04-04 11:34:30 -04:00
lee-at-zoo-corp	635314bb8d	Fix tsc after rebase	2025-04-04 11:33:39 -04:00
lee-at-zoo-corp	c75aafa60d	yarn tsc	2025-04-04 11:33:39 -04:00
lee-at-zoo-corp	fb192ee213	yarn lint	2025-04-04 11:33:39 -04:00
lee-at-zoo-corp	9e19d131eb	yarn fmt	2025-04-04 11:33:39 -04:00
lee-at-zoo-corp	81f70251e1	Fix the rest of the mfing tests	2025-04-04 11:33:39 -04:00
lee-at-zoo-corp	74f9afb2ca	Deflake revolve some revolve tests	2025-04-04 11:33:39 -04:00
lee-at-zoo-corp	d03343d97d	More e2e fixes	2025-04-04 11:33:39 -04:00
lee-at-zoo-corp	6c8a525762	Rework initial root projects dir + deflake many projects tests	2025-04-04 11:33:39 -04:00
lee-at-zoo-corp	c8177564e1	wip	2025-04-04 11:33:39 -04:00
lee-at-zoo-corp	12bf41ab7e	Clear diagnostics when unmounting code editor!	2025-04-04 11:33:39 -04:00
lee-at-zoo-corp	fbefff490c	Massive extinction event for waitForExecutionDone; try to stop projects view switching from crashing	2025-04-04 11:33:38 -04:00
lee-at-zoo-corp	4c9851efbf	yarn fmt	2025-04-04 11:33:20 -04:00
lee-at-zoo-corp	2cca1376e2	Fix streamIdleMode checkbox being wonky	2025-04-04 11:33:20 -04:00
lee-at-zoo-corp	c32a3edb39	wip	2025-04-04 11:33:20 -04:00
lee-at-zoo-corp	955a2ffaf9	Add back better ping indicator	2025-04-04 11:33:20 -04:00
lee-at-zoo-corp	6bc8e45aa7	Use pause/play iconology	2025-04-04 11:33:20 -04:00
lee-at-zoo-corp	be0fdc53b5	Remove camera sync	2025-04-04 11:33:20 -04:00
lee-at-zoo-corp	cfbe805e14	Fix up everything after bumping kittycad/lib	2025-04-04 11:33:20 -04:00
lee-at-zoo-corp	2a60efc5ab	Move engineStreamMachine as a global actor; tons of more work	2025-04-04 11:33:20 -04:00
49lf	deb83cf62c	tsc lint fmt	2025-04-04 11:33:20 -04:00
49lf	e3705bf7df	cargo fmt	2025-04-04 11:33:20 -04:00
49lf	ff887af540	Correct serialization; only expose at user level	2025-04-04 11:33:20 -04:00
49lf	1e4b6ce701	Shut up codespell	2025-04-04 11:33:20 -04:00
49lf	e642731529	Add back stream idle mode	2025-04-04 11:33:20 -04:00
Jace Browning	1aa27bd91c	Use all available CPUs to run tests on CI (#6138 ) * Use all available CPUs to run tests on CI * Use less than 100% based on research * Ensure proper types for worker value	2025-04-04 11:11:26 -04:00
Frank Noirot	118ec28b04	[fix] Get rid of risky useEffect in restart onboarding flow (#6133 ) Get rid of risky useEffect in restart onboarding flow In certain cases this would cause an infinite loop in the web version of the app. We should eliminate all uses of this "fire and listen with a useEffect" antipattern in the code base, it was a mistake I introduced. This uses the XState `waitFor` function to wait only once for the transition to complete, with some error handling in case it fails.	2025-04-04 14:24:30 +00:00
Kevin Nadro	449b43792b	Feature: Traditional menu actions in desktop application part II (#6030 ) * chore: skeleton for building and creating menus. Need electron to renderer interface to dynamically set the menu * chore: skeleton typing for communication between nodes and web side * chore: more skeleton for the different roles within the menu options, need more type safety * chore: adding more skeleton and templates of what the menus could be * chore: implemented first pass for helpRole links * fix: syntax issue stopped the build step * feature: loading different menus based on your page * feature: Home page file role implemented * chore: handling the build workflow for the signin page * fix: moving edit actionst to the edit menu * chore: adding preferences to the file role * chore: redoing help roles based on the question mark widget * fix: auto fmt * chore: examples of accelerator strings for Menu.MenuItems keyboard shortcuts! * chore: oddly specific toggle API for disabling MenuItems from JS. No rules! * fix: do not implement a custom label disable thingy, use id on menu and use the native APIga * fix: auto fmt * fix: adding some typechecks and auto fmt fixes * fix: trying to fix custom type? * fix: nvm we back, the lsp on my editor borked for a second * fix: adding one more level to the custom type for the labels * chore: cleaning up type definitions to read easier * fix: resolving yarn lint errors * chore: adding file sign out * chore: adding more file bar actions * chore: ready for PR draft * fix: preemptive GC collectoin bug fix if somehow a user interacts with a menu while it is being GCed * fix: linking the OG source * fix: set application menu to null to avoid default electron menu * chore: trying to add more typescript * chore: BIG workflow changes... better typing, less IPC junk * fix: remapping the icp functions to the cb option select... * chore: all og events are rehooked up with new workflow pattern * feat: adding more options to the native bar! * fix: todo * chore: cleaning up some menus and adding more * fix: desktop vs browser and lint errors * fix: typescript did not like sample electorn JS code for the basic templates with isMac conditionals... * fix: PR clean up * fix: more PR cleanup * A snapshot a day keeps the bugs away! 📷🐛 * fix: added the new help menu to the default sign in and modeling page * fix: disabled two menu actions within sign in page since they will not do anything. * A snapshot a day keeps the bugs away! 📷🐛 * A snapshot a day keeps the bugs away! 📷🐛 * fix: mergining main, auto fixes * A snapshot a day keeps the bugs away! 📷🐛 * A snapshot a day keeps the bugs away! 📷🐛 * A snapshot a day keeps the bugs away! 📷🐛 * A snapshot a day keeps the bugs away! 📷🐛 * fix: saving off progress found an IPC on/off bug thanks electron! * fix: fixed ipc renderer off/remove listener bug * A snapshot a day keeps the bugs away! 📷🐛 * A snapshot a day keeps the bugs away! 📷🐛 * A snapshot a day keeps the bugs away! 📷🐛 * chore: skeleton layout for the file menu in the modeling page. * fix: adding types * A snapshot a day keeps the bugs away! 📷🐛 * fix: more skeleton * feat: adding file preferences project settings * feat: adding share current part link to file menu * fix: report a bug to refresha and report a bug * fix: new type for webContents send payload that does not brick TS * fix: removing import file from url since it is not working in the command palette for manual user input * fix: removing old comment * chore: adding user default units * A snapshot a day keeps the bugs away! 📷🐛 * A snapshot a day keeps the bugs away! 📷🐛 * fix: trying to create a new file but I don't think this the correct workflow... * A snapshot a day keeps the bugs away! 📷🐛 * A snapshot a day keeps the bugs away! 📷🐛 * A snapshot a day keeps the bugs away! 📷🐛 * A snapshot a day keeps the bugs away! 📷🐛 * A snapshot a day keeps the bugs away! 📷🐛 * A snapshot a day keeps the bugs away! 📷🐛 * A snapshot a day keeps the bugs away! 📷🐛 * fix: disabling create a file and folder until we get it properly implemented at the commad bar level * fix: hooking up more commands * fix: auto fixes * chore: adding standard views * chore: adding some E2E tests. * chore: added E2E tests for each file menu * fix: auto fixes * chore: adding more edit role E2E tests * chore: e2e test * chore: adding help role e2e test * A snapshot a day keeps the bugs away! 📷🐛 * chore: e2e test for all the menu options you can interact with in the frontend * chore: hooking up more menu actions * chore: adding pane actions * fix: mac only menu fix and added start sketch * chore: big edit for state management and command registration * fix: auto fixes, tsc * fix: codespell typo * chore: implementing E2E tests for the menus since we cleared them. * chore: file export current part e2e test * chore: added all file role tests in modeling page * chore: modeling page edit e2e tests * chore: implemented view e2e test for modeling page * chore: add all design e2e playright tests * fix: auto linter,fmt * chore: added modeling help role e2e tests * fix: ugh this function isn't available in electron evalulate * fix: new default project name --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Pierre Jacquier <pierrejacquier39@gmail.com>	2025-04-04 08:39:02 -05:00
Kurt Hutten	f1e95156ea	[Bug] fix some UI friction from imports (#6139 ) * fix some UI friction from imports * add test * console * Jon's comments	2025-04-04 19:38:53 +11:00
Jace Browning	45e5b25cda	Use scene fixture to make test more reliable on macOS (#6140 )	2025-04-04 08:35:15 +00:00
Kevin Nadro	bdec611cf3	Fix: function composition during playwright setup created a massive page.reload loop (#6137 ) fix: prevented the largest function composition known to man	2025-04-04 03:36:51 +00:00
Farzad Yousefzadeh	fa612d5f28	Alternative way to make appMachine spawned children type safe (#5890 ) Co-authored-by: Frank Noirot <frank@zoo.dev>	2025-04-04 03:25:54 +00:00
Kurt Hutten	d270447777	[BUG] mutate ast to keep comments for pipe split ast-mod (#6128 ) * mutate ast to keep comments * remove commented out code * fix case where no comments in split	2025-04-04 14:01:23 +11:00
Pierre Jacquier	1a59fc4f99	Rename the app to Zoo Design Studio (#5974 ) * WIP: Change the name of the app Fixes #5971 * Force release build * More renames * Fix release builds on PR * Remove alpha on home page, replace with nightly if nightly * Change appId back to dev.zoo.modeling-app after updater test failure * Cleanup towards review * Lint * Lint plus @jacebrowning's suggestion * Lint	2025-04-03 22:24:51 -04:00
Jonathan Tran	d38dcb9ba2	Add grouping of module instances in Feature Tree (#6125 ) * Rename operations to be more generic grouping * Add group enum * Add module instance groups * Change to export all operation ts-rs types to the same file * Fix Feature Tree display of modules to use name * Ignore clippy warning * Update output after operation changes * Change module instances in Feature Tree use to import icon * Fix error message when attempting to delete module instance	2025-04-04 02:10:39 +00:00
Andrew Varga	c7b348390e	Add test for #4391 : "Can't select line on top of axis" (#6035 ) * disable fixed PR temporarily and add test draft * make the test empty * fix test for selecting line on main axis * PR feedback	2025-04-03 23:08:52 +02:00
Jonathan Tran	bf6c91932c	Upgrade to rust toolchain 1.86 (#6134 )	2025-04-03 19:59:26 +00:00
Pierre Jacquier	716ed3acb3	Change default project name to 'untitled' (#5998 ) * Change default project name to 'untitled' * A snapshot a day keeps the bugs away! 📷🐛 * A snapshot a day keeps the bugs away! 📷🐛 * A snapshot a day keeps the bugs away! 📷🐛 * A snapshot a day keeps the bugs away! 📷🐛 * A snapshot a day keeps the bugs away! 📷🐛 * A snapshot a day keeps the bugs away! 📷🐛 * A snapshot a day keeps the bugs away! 📷🐛 * A snapshot a day keeps the bugs away! 📷🐛 * A snapshot a day keeps the bugs away! 📷🐛 * Clean up * More renaming * Fix test --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2025-04-03 11:38:52 -07:00
Kevin Nadro	65e08bea92	Feature: Disable all automatic `zoom_to_fit` workflows. Do not take control of users camera. (#6076 ) chore: removing all force zoom_to_fit workflows in the system except on initial stream load sending it	2025-04-03 10:58:18 -05:00
Max Ammann	74859e99e7	Add STUN-based RTT (#6110 ) * add stun rtt * fix * update for future types * update --------- Co-authored-by: Jess Frazelle <jessfraz@users.noreply.github.com>	2025-04-03 16:47:22 +02:00
Nick Cameron	aad583be2e	Move axes to std constants; move helix, revolve, and mirror2d to be declared in KCL (#6105 ) Move axes to std constants; move helix, revolve, and mirror2d to be declated in KCL Signed-off-by: Nick Cameron <nrc@ncameron.org>	2025-04-03 09:44:52 +00:00
Frank Noirot	3e4505e2e3	[refactor] remove 6 floating-promise ignores (#5985 ) * Remove trivial floating promise in authMachine * Add catch statement so LSP promise is considered non-floating * Remove trivial float in AllSettingsFields * Add error reporting for ensureWasmInit * Remove pointless floating promise in Modeling * Add comment and reportRejection to floating promise in "set selection" * Read comment, put back await that should be there * Fix dumb imports rebase botch * Missed an import --------- Co-authored-by: Jess Frazelle <jessfraz@users.noreply.github.com>	2025-04-03 02:53:10 +00:00
Jess Frazelle	1fe1cfb397	Syntax sugar booleans (`+` and `-`) which is intuitive for MEs (#6124 ) * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * docs Signed-off-by: Jess Frazelle <github@jessfraz.com> * docs Signed-off-by: Jess Frazelle <github@jessfraz.com> --------- Signed-off-by: Jess Frazelle <github@jessfraz.com>	2025-04-03 02:13:03 +00:00
dependabot[bot]	2f721c84ed	Bump vite from 5.4.12 to 5.4.16 in the security group (#6118 ) Bumps the security group with 1 update: [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite). Updates `vite` from 5.4.12 to 5.4.16 - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v5.4.16/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v5.4.16/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: direct:development dependency-group: security ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-04-02 22:46:30 +00:00
dependabot[bot]	9112ff8c0a	Bump vite from 5.4.14 to 5.4.16 in /packages/codemirror-lang-kcl in the security group (#6117 ) Bump vite in /packages/codemirror-lang-kcl in the security group Bumps the security group in /packages/codemirror-lang-kcl with 1 update: [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite). Updates `vite` from 5.4.14 to 5.4.16 - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v5.4.16/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v5.4.16/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: indirect dependency-group: security ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-04-02 22:22:17 +00:00