Cut release v0.26.3 (#4427)

* Cut release v0.26.3

* Support new electron-builder env variable requirements for building in release mode

.github/workflows/cargo-test.yml

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

Makefile

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

README.md

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

docs/kcl/angleToMatchLengthX.md

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

docs/kcl/modules.md

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

docs/kcl/types/KclNone.md

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

docs/kcl/types/KclValue.md

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

e2e/playwright/basic-sketch.spec.ts

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

e2e/playwright/editor-tests.spec.ts

@@ -694,9 +694,6 @@ test.describe('Editor tests', () => {
         .toHaveText(`sketch001 = startSketchOn('XZ')
     |> startProfileAt([3.14, 12], %)
     |> xLine(5, %) // lin`)
-
-      // expect there to be no KCL errors
-      await expect(page.locator('.cm-lint-marker-error')).toHaveCount(0)
     })
 
     test('with tab to accept the completion', async ({ page }) => {

e2e/playwright/point-click.spec.ts

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

e2e/playwright/sketch-tests.spec.ts

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

e2e/playwright/snapshot-tests.spec.ts

@@ -462,7 +462,7 @@ test(
     await page.waitForTimeout(100)
 
     code += `
-  |> xLine(7.25, %)`
+  |> line([7.25, 0], %)`
     await expect(page.locator('.cm-content')).toHaveText(code)
 
     await page
@@ -647,7 +647,7 @@ test.describe(
       await page.waitForTimeout(100)
 
       code += `
-  |> xLine(7.25, %)`
+  |> line([7.25, 0], %)`
       await expect(u.codeLocator).toHaveText(code)
 
       await page
@@ -752,7 +752,7 @@ test.describe(
       await page.waitForTimeout(100)
 
       code += `
-  |> xLine(184.3, %)`
+  |> line([184.3, 0], %)`
       await expect(u.codeLocator).toHaveText(code)
 
       await page

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

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

e2e/playwright/test-utils.ts

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

e2e/playwright/testing-constraints.spec.ts

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

e2e/playwright/testing-selections.spec.ts

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

e2e/playwright/testing-settings.spec.ts

@@ -258,7 +258,7 @@ test.describe('Testing settings', () => {
     })
   })
 
-  test.fixme(
+  test(
     `Project settings override user settings on desktop`,
     { tag: ['@electron', '@skipWin'] },
     async ({ browser: _ }, testInfo) => {
@@ -318,6 +318,7 @@ test.describe('Testing settings', () => {
             timeout: 5_000,
           })
           .toContain(`themeColor = "${userThemeColor}"`)
+        // Only close the button after we've confirmed
       })
 
       await test.step('Set project theme color', async () => {
@@ -743,19 +744,18 @@ extrude001 = extrude(5, sketch001)
       )
     })
     await page.setViewportSize({ width: 1200, height: 500 })
-    await u.waitForAuthSkipAppStart()
 
     // Selectors and constants
     const editSketchButton = page.getByRole('button', { name: 'Edit Sketch' })
     const lineToolButton = page.getByTestId('line')
     const segmentOverlays = page.getByTestId('segment-overlay')
-    const sketchOriginLocation = await u.getCenterOfModelViewArea()
+    const sketchOriginLocation = { x: 600, y: 250 }
     const darkThemeSegmentColor: [number, number, number] = [215, 215, 215]
     const lightThemeSegmentColor: [number, number, number] = [90, 90, 90]
 
     await test.step(`Get into sketch mode`, async () => {
-      await page.mouse.click(sketchOriginLocation.x, sketchOriginLocation.y)
-
+      await u.waitForAuthSkipAppStart()
+      await page.mouse.click(700, 200)
       await expect(editSketchButton).toBeVisible()
       await editSketchButton.click()
 
@@ -766,18 +766,12 @@ extrude001 = extrude(5, sketch001)
       await page.waitForTimeout(1000)
     })
 
-    const line1 = await u.getSegmentBodyCoords(`[data-overlay-index="${0}"]`, 0)
-
-    // Our lines are translucent (surprise!), so we need to get on portion
-    // of the line that is only on the background, and not on top of something
-    // like the axis lines.
-    line1.x -= 1
-    line1.y -= 1
-
     await test.step(`Check the sketch line color before`, async () => {
       await expect
-        .poll(() => u.getGreatestPixDiff(line1, darkThemeSegmentColor))
-        .toBeLessThanOrEqual(34)
+        .poll(() =>
+          u.getGreatestPixDiff(sketchOriginLocation, darkThemeSegmentColor)
+        )
+        .toBeLessThan(15)
     })
 
     await test.step(`Change theme to light using command palette`, async () => {
@@ -792,8 +786,10 @@ extrude001 = extrude(5, sketch001)
 
     await test.step(`Check the sketch line color after`, async () => {
       await expect
-        .poll(() => u.getGreatestPixDiff(line1, lightThemeSegmentColor))
-        .toBeLessThanOrEqual(34)
+        .poll(() =>
+          u.getGreatestPixDiff(sketchOriginLocation, lightThemeSegmentColor)
+        )
+        .toBeLessThan(15)
     })
   })
 

e2e/playwright/various.spec.ts

@@ -503,16 +503,14 @@ test('Sketch on face', async ({ page }) => {
 
   let previousCodeContent = await page.locator('.cm-content').innerText()
 
-  const center = await u.getCenterOfModelViewArea()
-
-  // This basically waits for sketch mode to be ready.
+  await u.openAndClearDebugPanel()
   await u.doAndWaitForCmd(
-    async () => page.mouse.click(center.x, 180),
+    () => page.mouse.click(625, 165),
     'default_camera_get_settings',
     true
   )
-
-  await page.waitForTimeout(300)
+  await page.waitForTimeout(150)
+  await u.closeDebugPanel()
 
   const firstClickPosition = [612, 238]
   const secondClickPosition = [661, 242]

interface.d.ts

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zoo-modeling-app",
-  "version": "0.26.5",
+  "version": "0.26.3",
   "private": true,
   "productName": "Zoo Modeling App",
   "author": {
@@ -65,8 +65,7 @@
     "vscode-languageserver-protocol": "^3.17.5",
     "vscode-uri": "^3.0.8",
     "web-vitals": "^3.5.2",
-    "xstate": "^5.17.4",
-    "yargs": "^17.7.2"
+    "xstate": "^5.17.4"
   },
   "scripts": {
     "start": "vite",

src/App.tsx

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

src/Router.tsx

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

src/Toolbar.tsx

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

src/clientSideScene/CameraControls.ts

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

src/clientSideScene/ClientSideSceneComp.tsx

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

src/clientSideScene/constants.ts

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

src/clientSideScene/helpers.ts

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

src/clientSideScene/scale.ts

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

src/clientSideScene/sceneEntities.ts

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

src/clientSideScene/sceneInfra.ts

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

src/clientSideScene/segments.ts

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

src/commandLineArgs.ts

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

src/components/AvailableVarsHelpers.tsx

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

src/components/CommandBar/CommandBar.tsx

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

src/components/CommandBarOpenButton.tsx

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

src/components/CustomIcon.tsx

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

src/components/EngineStream.tsx

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

src/components/FileMachineProvider.tsx

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

src/components/FileTree.tsx

@@ -22,7 +22,6 @@ import usePlatform from 'hooks/usePlatform'
 import { FileEntry } from 'lib/project'
 import { useFileSystemWatcher } from 'hooks/useFileSystemWatcher'
 import { normalizeLineEndings } from 'lib/codeEditor'
-import { reportRejection } from 'lib/trap'
 
 function getIndentationCSS(level: number) {
   return `calc(1rem * ${level + 1})`
@@ -197,7 +196,8 @@ const FileTreeItem = ({
         return
       }
 
-      if (isCurrentFile && eventType === 'change') {
+      // Don't try to read a file that was removed.
+      if (isCurrentFile && eventType !== 'unlink') {
         let code = await window.electron.readFile(path, { encoding: 'utf-8' })
         code = normalizeLineEndings(code)
         codeManager.updateCodeStateEditor(code)
@@ -242,7 +242,7 @@ const FileTreeItem = ({
       // Show the renaming form
       addCurrentItemToRenaming()
     } else if (e.code === 'Space') {
-      void handleClick().catch(reportRejection)
+      void handleClick()
     }
   }
 
@@ -293,7 +293,7 @@ const FileTreeItem = ({
               style={{ paddingInlineStart: getIndentationCSS(level) }}
               onClick={(e) => {
                 e.currentTarget.focus()
-                void handleClick().catch(reportRejection)
+                void handleClick()
               }}
               onKeyUp={handleKeyUp}
             >

src/components/LowerRightControls.tsx

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

src/components/ModelStateIndicator.tsx

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

src/components/ModelingMachineProvider.tsx

@@ -20,6 +20,7 @@ import {
   modelingMachine,
   modelingMachineDefaultContext,
 } from 'machines/modelingMachine'
+import { useSetupEngineManager } from 'hooks/useSetupEngineManager'
 import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
 import {
   isCursorInSketchCommandRange,
@@ -111,8 +112,13 @@ export const ModelingMachineProvider = ({
     auth,
     settings: {
       context: {
-        app: { theme },
-        modeling: { defaultUnit, highlightEdges, cameraProjection },
+        app: { theme, enableSSAO },
+        modeling: {
+          defaultUnit,
+          cameraProjection,
+          highlightEdges,
+          showScaleGrid,
+        },
       },
     },
   } = useSettingsAuthContext()
@@ -123,6 +129,9 @@ export const ModelingMachineProvider = ({
   const streamRef = useRef<HTMLDivElement>(null)
   const persistedContext = useMemo(() => getPersistedContext(), [])
 
+  let [searchParams] = useSearchParams()
+  const pool = searchParams.get('pool')
+
   const { commandBarState, commandBarSend } = useCommandsContext()
 
   // Settings machine setup
@@ -295,7 +304,6 @@ export const ModelingMachineProvider = ({
             const dispatchSelection = (selection?: EditorSelection) => {
               if (!selection) return // TODO less of hack for the below please
               if (!editorManager.editorView) return
-
               setTimeout(() => {
                 if (!editorManager.editorView) return
                 editorManager.editorView.dispatch({
@@ -649,9 +657,6 @@ export const ModelingMachineProvider = ({
               engineCommandManager,
               input.faceId
             )
-            await sceneInfra.camControls.centerModelRelativeToPanes({
-              resetLastPaneWidth: true,
-            })
             sceneInfra.camControls.syncDirection = 'clientToEngine'
             return {
               sketchPathToNode: pathToNewSketchNode,
@@ -672,9 +677,6 @@ export const ModelingMachineProvider = ({
             engineCommandManager,
             input.planeId
           )
-          await sceneInfra.camControls.centerModelRelativeToPanes({
-            resetLastPaneWidth: true,
-          })
 
           return {
             sketchPathToNode: pathToNode,
@@ -697,9 +699,6 @@ export const ModelingMachineProvider = ({
               engineCommandManager,
               info?.sketchDetails?.faceId || ''
             )
-            await sceneInfra.camControls.centerModelRelativeToPanes({
-              resetLastPaneWidth: true,
-            })
             return {
               sketchPathToNode: sketchPathToNode || [],
               zAxis: info.sketchDetails.zAxis || null,
@@ -733,11 +732,6 @@ export const ModelingMachineProvider = ({
                 sketchDetails.origin
               )
             if (err(updatedAst)) return Promise.reject(updatedAst)
-
-            await codeManager.updateEditorWithAstAndWriteToFile(
-              updatedAst.newAst
-            )
-
             const selection = updateSelections(
               pathToNodeMap,
               selectionRanges,
@@ -774,11 +768,6 @@ export const ModelingMachineProvider = ({
                 sketchDetails.origin
               )
             if (err(updatedAst)) return Promise.reject(updatedAst)
-
-            await codeManager.updateEditorWithAstAndWriteToFile(
-              updatedAst.newAst
-            )
-
             const selection = updateSelections(
               pathToNodeMap,
               selectionRanges,
@@ -824,11 +813,6 @@ export const ModelingMachineProvider = ({
                 sketchDetails.origin
               )
             if (err(updatedAst)) return Promise.reject(updatedAst)
-
-            await codeManager.updateEditorWithAstAndWriteToFile(
-              updatedAst.newAst
-            )
-
             const selection = updateSelections(
               pathToNodeMap,
               selectionRanges,
@@ -862,11 +846,6 @@ export const ModelingMachineProvider = ({
                 sketchDetails.origin
               )
             if (err(updatedAst)) return Promise.reject(updatedAst)
-
-            await codeManager.updateEditorWithAstAndWriteToFile(
-              updatedAst.newAst
-            )
-
             const selection = updateSelections(
               pathToNodeMap,
               selectionRanges,
@@ -902,11 +881,6 @@ export const ModelingMachineProvider = ({
                 sketchDetails.origin
               )
             if (err(updatedAst)) return Promise.reject(updatedAst)
-
-            await codeManager.updateEditorWithAstAndWriteToFile(
-              updatedAst.newAst
-            )
-
             const selection = updateSelections(
               pathToNodeMap,
               selectionRanges,
@@ -943,11 +917,6 @@ export const ModelingMachineProvider = ({
                 sketchDetails.origin
               )
             if (err(updatedAst)) return Promise.reject(updatedAst)
-
-            await codeManager.updateEditorWithAstAndWriteToFile(
-              updatedAst.newAst
-            )
-
             const selection = updateSelections(
               pathToNodeMap,
               selectionRanges,
@@ -984,11 +953,6 @@ export const ModelingMachineProvider = ({
                 sketchDetails.origin
               )
             if (err(updatedAst)) return Promise.reject(updatedAst)
-
-            await codeManager.updateEditorWithAstAndWriteToFile(
-              updatedAst.newAst
-            )
-
             const selection = updateSelections(
               pathToNodeMap,
               selectionRanges,
@@ -1035,11 +999,6 @@ export const ModelingMachineProvider = ({
                 sketchDetails.origin
               )
             if (err(updatedAst)) return Promise.reject(updatedAst)
-
-            await codeManager.updateEditorWithAstAndWriteToFile(
-              updatedAst.newAst
-            )
-
             const selection = updateSelections(
               { 0: pathToReplacedNode },
               selectionRanges,
@@ -1068,6 +1027,21 @@ export const ModelingMachineProvider = ({
     }
   )
 
+  useSetupEngineManager(
+    streamRef,
+    modelingSend,
+    modelingState.context,
+    {
+      pool: pool,
+      theme: theme.current,
+      highlightEdges: highlightEdges.current,
+      enableSSAO: enableSSAO.current,
+      showScaleGrid: showScaleGrid.current,
+      cameraProjection: cameraProjection.current,
+    },
+    token
+  )
+
   useEffect(() => {
     kclManager.registerExecuteCallback(() => {
       modelingSend({ type: 'Re-execute' })

src/components/ModelingSidebar/ModelingPanes/KclEditorPane.tsx

@@ -4,7 +4,7 @@ import { Themes, getSystemTheme } from 'lib/theme'
 import { useMemo, useRef } from 'react'
 import { highlightSelectionMatches, searchKeymap } from '@codemirror/search'
 import { lineHighlightField } from 'editor/highlightextension'
-import { onMouseDragMakeANewNumber, onMouseDragRegex } from 'lib/utils'
+import { roundOff } from 'lib/utils'
 import {
   lineNumbers,
   rectangularSelection,
@@ -129,9 +129,7 @@ export const KclEditorPane = () => {
         closeBrackets(),
         highlightActiveLine(),
         highlightSelectionMatches(),
-        syntaxHighlighting(defaultHighlightStyle, {
-          fallback: true,
-        }),
+        syntaxHighlighting(defaultHighlightStyle, { fallback: true }),
         rectangularSelection(),
         dropCursor(),
         interact({
@@ -139,12 +137,29 @@ export const KclEditorPane = () => {
             // a rule for a number dragger
             {
               // the regexp matching the value
-              regexp: onMouseDragRegex,
+              regexp: /-?\b\d+\.?\d*\b/g,
               // set cursor to "ew-resize" on hover
               cursor: 'ew-resize',
               // change number value based on mouse X movement on drag
               onDrag: (text, setText, e) => {
-                onMouseDragMakeANewNumber(text, setText, e)
+                const multiplier =
+                  e.shiftKey && e.metaKey
+                    ? 0.01
+                    : e.metaKey
+                    ? 0.1
+                    : e.shiftKey
+                    ? 10
+                    : 1
+
+                const delta = e.movementX * multiplier
+
+                const newVal = roundOff(
+                  Number(text) + delta,
+                  multiplier === 0.01 ? 2 : multiplier === 0.1 ? 1 : 0
+                )
+
+                if (isNaN(newVal)) return
+                setText(newVal.toString())
               },
             },
           ],

src/components/ModelingSidebar/ModelingPanes/MemoryPane.tsx

@@ -89,9 +89,9 @@ export const processMemory = (programMemory: ProgramMemory) => {
   const processedMemory: any = {}
   for (const [key, val] of programMemory?.visibleEntries()) {
     if (
-      val.type === 'Sketch' ||
+      (val.type === 'UserVal' && val.value.type === 'Sketch') ||
       // @ts-ignore
-      val.type !== 'Function'
+      (val.type !== 'Function' && val.type !== 'UserVal')
     ) {
       const sg = sketchFromKclValue(val, key)
       if (val.type === 'Solid') {
@@ -110,6 +110,8 @@ export const processMemory = (programMemory: ProgramMemory) => {
       processedMemory[key] = `__function(${(val as any)?.expression?.params
         ?.map?.(({ identifier }: any) => identifier?.name || '')
         .join(', ')})__`
+    } else {
+      processedMemory[key] = val.value
     }
   }
   return processedMemory

src/components/ModelingSidebar/ModelingSidebar.tsx

@@ -6,11 +6,6 @@ import {
   useEffect,
   useMemo,
   useContext,
-  MutableRefObject,
-  forwardRef,
-  // https://stackoverflow.com/a/77055468 Thank you.
-  useImperativeHandle,
-  useRef,
 } from 'react'
 import { useHotkeys } from 'react-hotkeys-hook'
 import { SidebarAction, SidebarType, sidebarPanes } from './ModelingPanes'
@@ -24,12 +19,9 @@ import { useCommandsContext } from 'hooks/useCommandsContext'
 import { IconDefinition } from '@fortawesome/free-solid-svg-icons'
 import { useKclContext } from 'lang/KclProvider'
 import { MachineManagerContext } from 'components/MachineManagerProvider'
-import { sceneInfra } from 'lib/singletons'
-import { REASONABLE_TIME_TO_REFRESH_STREAM_SIZE } from 'lib/timings'
 
 interface ModelingSidebarProps {
   paneOpacity: '' | 'opacity-20' | 'opacity-40'
-  ref: MutableRefObject<HTMLDivElement>
 }
 
 interface BadgeInfoComputed {
@@ -41,34 +33,19 @@ function getPlatformString(): 'web' | 'desktop' {
   return isDesktop() ? 'desktop' : 'web'
 }
 
-export const ModelingSidebar = forwardRef<
-  HTMLUListElement,
-  ModelingSidebarProps
->(function ModelingSidebar({ paneOpacity }, outerRef) {
+export function ModelingSidebar({ paneOpacity }: ModelingSidebarProps) {
   const machineManager = useContext(MachineManagerContext)
   const { commandBarSend } = useCommandsContext()
   const kclContext = useKclContext()
   const { settings } = useSettingsAuthContext()
   const onboardingStatus = settings.context.app.onboardingStatus
-  const { send, state, context } = useModelingContext()
+  const { send, context } = useModelingContext()
   const pointerEventsCssClass =
     onboardingStatus.current === 'camera' ||
     context.store?.openPanes.length === 0
       ? 'pointer-events-none '
       : 'pointer-events-auto '
   const showDebugPanel = settings.context.modeling.showDebugPanel
-  const innerRef = useRef<HTMLUListElement>(null)
-
-  // forwardRef's type causes me to do this type narrowing.
-  useEffect(() => {
-    if (typeof outerRef === 'function') {
-      outerRef(innerRef.current)
-    } else {
-      if (outerRef) {
-        outerRef.current = innerRef.current
-      }
-    }
-  }, [innerRef.current])
 
   const paneCallbackProps = useMemo(
     () => ({
@@ -182,37 +159,8 @@ export const ModelingSidebar = forwardRef<
     [context.store?.openPanes, send]
   )
 
-  useEffect(() => {
-    // Don't send camera adjustment commands after 1 pane is open. It
-    // won't make any difference.
-    if (context.store?.openPanes.length > 1) return
-
-    void sceneInfra.camControls.centerModelRelativeToPanes()
-  }, [context.store?.openPanes])
-
-  // If the panes are resized then center the model also
-  useEffect(() => {
-    if (!innerRef.current) return
-
-    let last = Date.now()
-    const observer = new ResizeObserver(() => {
-      if (Date.now() - last < REASONABLE_TIME_TO_REFRESH_STREAM_SIZE) return
-      if (!innerRef.current) return
-
-      last = Date.now()
-      void sceneInfra.camControls.centerModelRelativeToPanes()
-    })
-
-    observer.observe(innerRef.current)
-
-    return () => {
-      observer.disconnect()
-    }
-  }, [state, innerRef.current])
-
   return (
     <Resizable
-      data-testid="modeling-sidebar"
       className={`group flex-1 flex flex-col z-10 my-2 pr-1 ${paneOpacity} ${pointerEventsCssClass}`}
       defaultSize={{
         width: '550px',
@@ -244,7 +192,6 @@ export const ModelingSidebar = forwardRef<
         >
           <ul
             id="pane-buttons-section"
-            data-testid="pane-buttons-section"
             className={
               'w-fit p-2 flex flex-col gap-2 ' +
               (context.store?.openPanes.length >= 1 ? 'pr-0.5' : '')
@@ -289,8 +236,6 @@ export const ModelingSidebar = forwardRef<
         </ul>
         <ul
           id="pane-section"
-          data-testid="pane-section"
-          ref={innerRef}
           className={
             'ml-[-1px] col-start-2 col-span-1 flex flex-col items-stretch gap-2 ' +
             (context.store?.openPanes.length >= 1 ? `w-full` : `hidden`)
@@ -320,7 +265,7 @@ export const ModelingSidebar = forwardRef<
       </div>
     </Resizable>
   )
-})
+}
 
 interface ModelingPaneButtonProps
   extends React.HTMLAttributes<HTMLButtonElement> {

src/components/RouteProvider.tsx

@@ -1,33 +0,0 @@
-import { useEffect, useState, createContext, ReactNode } from 'react'
-import { useNavigation, useLocation } from 'react-router-dom'
-import { PATHS } from 'lib/paths'
-import { markOnce } from 'lib/performance'
-
-export const RouteProviderContext = createContext({})
-
-export function RouteProvider({ children }: { children: ReactNode }) {
-  const [first, setFirstState] = useState(true)
-  const navigation = useNavigation()
-  const location = useLocation()
-  useEffect(() => {
-    // On initialization, the react-router-dom does not send a 'loading' state event.
-    // it sends an idle event first.
-    const pathname = first ? location.pathname : navigation.location?.pathname
-    const isHome = pathname === PATHS.HOME
-    const isFile =
-      pathname?.includes(PATHS.FILE) &&
-      pathname?.substring(pathname?.length - 4) === '.kcl'
-    if (isHome) {
-      markOnce('code/willLoadHome')
-    } else if (isFile) {
-      markOnce('code/willLoadFile')
-    }
-    setFirstState(false)
-  }, [navigation])
-
-  return (
-    <RouteProviderContext.Provider value={{}}>
-      {children}
-    </RouteProviderContext.Provider>
-  )
-}

src/components/SettingsAuthProvider.tsx

@@ -1,7 +1,7 @@
 import { trap } from 'lib/trap'
 import { useMachine } from '@xstate/react'
 import { useNavigate, useRouteLoaderData, useLocation } from 'react-router-dom'
-import { PATHS, BROWSER_PATH } from 'lib/paths'
+import { PATHS } from 'lib/paths'
 import { authMachine, TOKEN_PERSIST_KEY } from '../machines/authMachine'
 import withBaseUrl from '../lib/withBaseURL'
 import React, { createContext, useEffect, useState } from 'react'
@@ -42,7 +42,6 @@ import { getAppSettingsFilePath } from 'lib/desktop'
 import { isDesktop } from 'lib/isDesktop'
 import { useFileSystemWatcher } from 'hooks/useFileSystemWatcher'
 import { codeManager } from 'lib/singletons'
-import { createRouteCommands } from 'lib/commandBarConfigs/routeCommandConfig'
 
 type MachineContext<T extends AnyStateMachine> = {
   state: StateFrom<T>
@@ -289,44 +288,6 @@ export const SettingsAuthProviderBase = ({
     settingsWithCommandConfigs,
   ])
 
-  // Due to the route provider, i've moved this to the SettingsAuthProvider instead of CommandBarProvider
-  // This will register the commands to route to Telemetry, Home, and Settings.
-  useEffect(() => {
-    const filePath =
-      PATHS.FILE +
-      '/' +
-      encodeURIComponent(loadedProject?.file?.path || BROWSER_PATH)
-    const { RouteTelemetryCommand, RouteHomeCommand, RouteSettingsCommand } =
-      createRouteCommands(navigate, location, filePath)
-    commandBarSend({
-      type: 'Remove commands',
-      data: {
-        commands: [
-          RouteTelemetryCommand,
-          RouteHomeCommand,
-          RouteSettingsCommand,
-        ],
-      },
-    })
-    if (location.pathname === PATHS.HOME) {
-      commandBarSend({
-        type: 'Add commands',
-        data: { commands: [RouteTelemetryCommand, RouteSettingsCommand] },
-      })
-    } else if (location.pathname.includes(PATHS.FILE)) {
-      commandBarSend({
-        type: 'Add commands',
-        data: {
-          commands: [
-            RouteTelemetryCommand,
-            RouteSettingsCommand,
-            RouteHomeCommand,
-          ],
-        },
-      })
-    }
-  }, [location])
-
   // Listen for changes to the system theme and update the app theme accordingly
   // This is only done if the theme setting is set to 'system'.
   // It can't be done in XState (in an invoked callback, for example)

src/components/Stream.tsx

@@ -0,0 +1,340 @@
+import { MouseEventHandler, useEffect, useRef, useState } from 'react'
+import Loading from './Loading'
+import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
+import { useModelingContext } from 'hooks/useModelingContext'
+import { useNetworkContext } from 'hooks/useNetworkContext'
+import { NetworkHealthState } from 'hooks/useNetworkStatus'
+import { ClientSideScene } from 'clientSideScene/ClientSideSceneComp'
+import { btnName } from 'lib/cameraControls'
+import { sendSelectEventToEngine } from 'lib/selections'
+import { kclManager, engineCommandManager, sceneInfra } from 'lib/singletons'
+import { useAppStream } from 'AppState'
+import {
+  EngineCommandManagerEvents,
+  EngineConnectionStateType,
+  DisconnectingType,
+} from 'lang/std/engineConnection'
+import { useRouteLoaderData } from 'react-router-dom'
+import { PATHS } from 'lib/paths'
+import { IndexLoaderData } from 'lib/types'
+
+enum StreamState {
+  Playing = 'playing',
+  Paused = 'paused',
+  Resuming = 'resuming',
+  Unset = 'unset',
+}
+
+export const Stream = () => {
+  const [isLoading, setIsLoading] = useState(true)
+  const videoRef = useRef<HTMLVideoElement>(null)
+  const { settings } = useSettingsAuthContext()
+  const { state, send } = useModelingContext()
+  const { mediaStream } = useAppStream()
+  const { overallState, immediateState } = useNetworkContext()
+  const [streamState, setStreamState] = useState(StreamState.Unset)
+  const { file } = useRouteLoaderData(PATHS.FILE) as IndexLoaderData
+
+  const IDLE = settings.context.app.streamIdleMode.current
+
+  const isNetworkOkay =
+    overallState === NetworkHealthState.Ok ||
+    overallState === NetworkHealthState.Weak
+
+  /**
+   * Execute code and show a "building scene message"
+   * in Stream.tsx in the meantime.
+   *
+   * I would like for this to live somewhere more central,
+   * but it seems to me that we need the video element ref
+   * to be able to play the video after the code has been
+   * executed. If we can find a way to do this from a more
+   * central place, we can move this code there.
+   */
+  function executeCodeAndPlayStream() {
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
+    kclManager.executeCode(true).then(async () => {
+      await videoRef.current?.play().catch((e) => {
+        console.warn('Video playing was prevented', e, videoRef.current)
+      })
+      setStreamState(StreamState.Playing)
+    })
+  }
+
+  /**
+   * Subscribe to execute code when the file changes
+   * but only if the scene is already ready.
+   * See onSceneReady for the initial scene setup.
+   */
+  useEffect(() => {
+    if (engineCommandManager.engineConnection?.isReady() && file?.path) {
+      console.log('execute on file change')
+      executeCodeAndPlayStream()
+    }
+  }, [file?.path, engineCommandManager.engineConnection])
+
+  useEffect(() => {
+    if (
+      immediateState.type === EngineConnectionStateType.Disconnecting &&
+      immediateState.value.type === DisconnectingType.Pause
+    ) {
+      setStreamState(StreamState.Paused)
+    }
+  }, [immediateState])
+
+  // Linux has a default behavior to paste text on middle mouse up
+  // This adds a listener to block that pasting if the click target
+  // is not a text input, so users can move in the 3D scene with
+  // middle mouse drag with a text input focused without pasting.
+  useEffect(() => {
+    const handlePaste = (e: ClipboardEvent) => {
+      const isHtmlElement = e.target && e.target instanceof HTMLElement
+      const isEditable =
+        (isHtmlElement && !('explicitOriginalTarget' in e)) ||
+        ('explicitOriginalTarget' in e &&
+          ((e.explicitOriginalTarget as HTMLElement).contentEditable ===
+            'true' ||
+            ['INPUT', 'TEXTAREA'].some(
+              (tagName) =>
+                tagName === (e.explicitOriginalTarget as HTMLElement).tagName
+            )))
+      if (!isEditable) {
+        e.preventDefault()
+        e.stopPropagation()
+        e.stopImmediatePropagation()
+      }
+    }
+
+    globalThis?.window?.document?.addEventListener('paste', handlePaste, {
+      capture: true,
+    })
+
+    const IDLE_TIME_MS = 1000 * 60 * 2
+    let timeoutIdIdleA: ReturnType<typeof setTimeout> | undefined = undefined
+
+    const teardown = () => {
+      // Already paused
+      if (streamState === StreamState.Paused) return
+
+      videoRef.current?.pause()
+      setStreamState(StreamState.Paused)
+      sceneInfra.modelingSend({ type: 'Cancel' })
+      // Give video time to pause
+      window.requestAnimationFrame(() => {
+        engineCommandManager.tearDown({ idleMode: true })
+      })
+    }
+
+    const onVisibilityChange = () => {
+      if (globalThis.window.document.visibilityState === 'hidden') {
+        clearTimeout(timeoutIdIdleA)
+        timeoutIdIdleA = setTimeout(teardown, IDLE_TIME_MS)
+      } else if (!engineCommandManager.engineConnection?.isReady()) {
+        clearTimeout(timeoutIdIdleA)
+        setStreamState(StreamState.Resuming)
+      }
+    }
+
+    // Teardown everything if we go hidden or reconnect
+    if (IDLE) {
+      globalThis?.window?.document?.addEventListener(
+        'visibilitychange',
+        onVisibilityChange
+      )
+    }
+
+    let timeoutIdIdleB: ReturnType<typeof setTimeout> | undefined = undefined
+
+    const onAnyInput = () => {
+      if (streamState === StreamState.Playing) {
+        // Clear both timers
+        clearTimeout(timeoutIdIdleA)
+        clearTimeout(timeoutIdIdleB)
+        timeoutIdIdleB = setTimeout(teardown, IDLE_TIME_MS)
+      }
+      if (streamState === StreamState.Paused) {
+        setStreamState(StreamState.Resuming)
+      }
+    }
+
+    if (IDLE) {
+      globalThis?.window?.document?.addEventListener('keydown', onAnyInput)
+      globalThis?.window?.document?.addEventListener('mousemove', onAnyInput)
+      globalThis?.window?.document?.addEventListener('mousedown', onAnyInput)
+      globalThis?.window?.document?.addEventListener('scroll', onAnyInput)
+      globalThis?.window?.document?.addEventListener('touchstart', onAnyInput)
+    }
+
+    if (IDLE) {
+      timeoutIdIdleB = setTimeout(teardown, IDLE_TIME_MS)
+    }
+
+    /**
+     * Add a listener to execute code and play the stream
+     * on initial stream setup.
+     */
+    engineCommandManager.addEventListener(
+      EngineCommandManagerEvents.SceneReady,
+      executeCodeAndPlayStream
+    )
+
+    return () => {
+      engineCommandManager.removeEventListener(
+        EngineCommandManagerEvents.SceneReady,
+        executeCodeAndPlayStream
+      )
+      globalThis?.window?.document?.removeEventListener('paste', handlePaste, {
+        capture: true,
+      })
+      if (IDLE) {
+        clearTimeout(timeoutIdIdleA)
+        clearTimeout(timeoutIdIdleB)
+
+        globalThis?.window?.document?.removeEventListener(
+          'visibilitychange',
+          onVisibilityChange
+        )
+        globalThis?.window?.document?.removeEventListener('keydown', onAnyInput)
+        globalThis?.window?.document?.removeEventListener(
+          'mousemove',
+          onAnyInput
+        )
+        globalThis?.window?.document?.removeEventListener(
+          'mousedown',
+          onAnyInput
+        )
+        globalThis?.window?.document?.removeEventListener('scroll', onAnyInput)
+        globalThis?.window?.document?.removeEventListener(
+          'touchstart',
+          onAnyInput
+        )
+      }
+    }
+  }, [IDLE, streamState])
+
+  /**
+   * Play the vid
+   */
+  useEffect(() => {
+    if (!kclManager.isExecuting) {
+      setTimeout(() => {
+        // execute in the next event loop
+        videoRef.current?.play().catch((e) => {
+          console.warn('Video playing was prevented', e, videoRef.current)
+        })
+      })
+    }
+  }, [kclManager.isExecuting])
+
+  useEffect(() => {
+    if (
+      typeof window === 'undefined' ||
+      typeof RTCPeerConnection === 'undefined'
+    )
+      return
+    if (!videoRef.current) return
+    if (!mediaStream) return
+
+    // The browser complains if we try to load a new stream without pausing first.
+    // Do not immediately play the stream!
+    try {
+      videoRef.current.srcObject = mediaStream
+      videoRef.current.pause()
+    } catch (e) {
+      console.warn('Attempted to pause stream while play was still loading', e)
+    }
+
+    send({
+      type: 'Set context',
+      data: {
+        videoElement: videoRef.current,
+      },
+    })
+
+    setIsLoading(false)
+  }, [mediaStream])
+
+  const handleMouseUp: MouseEventHandler<HTMLDivElement> = (e) => {
+    // If we've got no stream or connection, don't do anything
+    if (!isNetworkOkay) return
+    if (!videoRef.current) return
+    // If we're in sketch mode, don't send a engine-side select event
+    if (state.matches('Sketch')) return
+    if (state.matches({ idle: 'showPlanes' })) return
+    // If we're mousing up from a camera drag, don't send a select event
+    if (sceneInfra.camControls.wasDragging === true) return
+
+    if (btnName(e.nativeEvent).left) {
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
+      sendSelectEventToEngine(e, videoRef.current)
+    }
+  }
+
+  return (
+    <div
+      className="absolute inset-0 z-0"
+      id="stream"
+      data-testid="stream"
+      onClick={handleMouseUp}
+      onContextMenu={(e) => e.preventDefault()}
+      onContextMenuCapture={(e) => e.preventDefault()}
+    >
+      <video
+        ref={videoRef}
+        muted
+        autoPlay
+        controls={false}
+        onPlay={() => setIsLoading(false)}
+        className="w-full cursor-pointer h-full"
+        disablePictureInPicture
+        id="video-stream"
+      />
+      <ClientSideScene
+        cameraControls={settings.context.modeling.mouseControls.current}
+      />
+      {(streamState === StreamState.Paused ||
+        streamState === StreamState.Resuming) && (
+        <div className="text-center absolute inset-0">
+          <div
+            className="flex flex-col items-center justify-center h-screen"
+            data-testid="paused"
+          >
+            <div className="border-primary border p-2 rounded-sm">
+              <svg
+                width="8"
+                height="12"
+                viewBox="0 0 8 12"
+                fill="none"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  fillRule="evenodd"
+                  clipRule="evenodd"
+                  d="M2 12V0H0V12H2ZM8 12V0H6V12H8Z"
+                  fill="var(--primary)"
+                />
+              </svg>
+            </div>
+            <p className="text-base mt-2 text-primary bold">
+              {streamState === StreamState.Paused && 'Paused'}
+              {streamState === StreamState.Resuming && 'Resuming'}
+            </p>
+          </div>
+        </div>
+      )}
+      {(!isNetworkOkay || isLoading) && (
+        <div className="text-center absolute inset-0">
+          <Loading>
+            {!isNetworkOkay && !isLoading ? (
+              <span data-testid="loading-stream">Stream disconnected...</span>
+            ) : (
+              !isLoading && (
+                <span data-testid="loading-stream">Loading stream...</span>
+              )
+            )}
+          </Loading>
+        </div>
+      )}
+    </div>
+  )
+}

src/components/TelemetryExplorer.tsx

@@ -1,72 +0,0 @@
-import { getMarks } from 'lib/performance'
-
-import {
-  printDeltaTotal,
-  printInvocationCount,
-  printMarkDownTable,
-  printRawMarks,
-} from 'lib/telemetry'
-
-export function TelemetryExplorer() {
-  const marks = getMarks()
-  const markdownTable = printMarkDownTable(marks)
-  const rawMarks = printRawMarks(marks)
-  const deltaTotalTable = printDeltaTotal(marks)
-  const invocationCount = printInvocationCount(marks)
-  // TODO data-telemetry-type
-  // TODO data-telemetry-name
-  return (
-    <div>
-      <h1 className="pb-4">Marks</h1>
-      <div className="max-w-xl max-h-64 overflow-auto select-all">
-        {marks.map((mark, index) => {
-          return (
-            <pre className="text-xs" key={index}>
-              <code key={index}>{JSON.stringify(mark, null, 2)}</code>
-            </pre>
-          )
-        })}
-      </div>
-      <h1 className="pb-4">Startup Performance</h1>
-      <div className="max-w-xl max-h-64 overflow-auto select-all">
-        {markdownTable.map((line, index) => {
-          return (
-            <pre className="text-xs" key={index}>
-              <code key={index}>{line}</code>
-            </pre>
-          )
-        })}
-      </div>
-      <h1 className="pb-4">Delta and Totals</h1>
-      <div className="max-w-xl max-h-64 overflow-auto select-all">
-        {deltaTotalTable.map((line, index) => {
-          return (
-            <pre className="text-xs" key={index}>
-              <code key={index}>{line}</code>
-            </pre>
-          )
-        })}
-      </div>
-      <h1 className="pb-4">Raw Marks</h1>
-      <div className="max-w-xl max-h-64 overflow-auto select-all">
-        {rawMarks.map((line, index) => {
-          return (
-            <pre className="text-xs" key={index}>
-              <code key={index}>{line}</code>
-            </pre>
-          )
-        })}
-      </div>
-      <h1 className="pb-4">Invocation Count</h1>
-      <div className="max-w-xl max-h-64 overflow-auto select-all">
-        {invocationCount.map((line, index) => {
-          return (
-            <pre className="text-xs" key={index}>
-              <code key={index}>{line}</code>
-            </pre>
-          )
-        })}
-      </div>
-    </div>
-  )
-}

src/editor/manager.test.ts

@@ -1,81 +0,0 @@
-import { editorManager } from 'lib/singletons'
-import { Diagnostic } from '@codemirror/lint'
-
-describe('EditorManager Class', () => {
-  describe('makeUniqueDiagnostics', () => {
-    it('should filter out duplicated diagnostics', () => {
-      const duplicatedDiagnostics: Diagnostic[] = [
-        {
-          from: 2,
-          to: 10,
-          severity: 'hint',
-          message: 'my cool message',
-        },
-        {
-          from: 2,
-          to: 10,
-          severity: 'hint',
-          message: 'my cool message',
-        },
-        {
-          from: 2,
-          to: 10,
-          severity: 'hint',
-          message: 'my cool message',
-        },
-      ]
-
-      const expected: Diagnostic[] = [
-        {
-          from: 2,
-          to: 10,
-          severity: 'hint',
-          message: 'my cool message',
-        },
-      ]
-
-      const actual = editorManager.makeUniqueDiagnostics(duplicatedDiagnostics)
-      expect(actual).toStrictEqual(expected)
-    })
-    it('should filter out duplicated diagnostic and keep some original ones', () => {
-      const duplicatedDiagnostics: Diagnostic[] = [
-        {
-          from: 0,
-          to: 10,
-          severity: 'hint',
-          message: 'my cool message',
-        },
-        {
-          from: 0,
-          to: 10,
-          severity: 'hint',
-          message: 'my cool message',
-        },
-        {
-          from: 88,
-          to: 99,
-          severity: 'hint',
-          message: 'my super cool message',
-        },
-      ]
-
-      const expected: Diagnostic[] = [
-        {
-          from: 0,
-          to: 10,
-          severity: 'hint',
-          message: 'my cool message',
-        },
-        {
-          from: 88,
-          to: 99,
-          severity: 'hint',
-          message: 'my super cool message',
-        },
-      ]
-
-      const actual = editorManager.makeUniqueDiagnostics(duplicatedDiagnostics)
-      expect(actual).toStrictEqual(expected)
-    })
-  })
-})

src/editor/manager.ts

@@ -1,5 +1,4 @@
 import { EditorView, ViewUpdate } from '@codemirror/view'
-import { syntaxTree } from '@codemirror/language'
 import { EditorSelection, Annotation, Transaction } from '@codemirror/state'
 import { engineCommandManager } from 'lib/singletons'
 import { modelingMachine, ModelingMachineEvent } from 'machines/modelingMachine'
@@ -13,7 +12,6 @@ import {
   setDiagnosticsEffect,
 } from '@codemirror/lint'
 import { StateFrom } from 'xstate'
-import { markOnce } from 'lib/performance'
 
 const updateOutsideEditorAnnotation = Annotation.define<boolean>()
 export const updateOutsideEditorEvent = updateOutsideEditorAnnotation.of(true)
@@ -24,6 +22,10 @@ export const modelingMachineEvent = modelingMachineAnnotation.of(true)
 const setDiagnosticsAnnotation = Annotation.define<boolean>()
 export const setDiagnosticsEvent = setDiagnosticsAnnotation.of(true)
 
+function diagnosticIsEqual(d1: Diagnostic, d2: Diagnostic): boolean {
+  return d1.from === d2.from && d1.to === d2.to && d1.message === d2.message
+}
+
 export default class EditorManager {
   private _editorView: EditorView | null = null
   private _copilotEnabled: boolean = true
@@ -57,49 +59,6 @@ export default class EditorManager {
 
   setEditorView(editorView: EditorView) {
     this._editorView = editorView
-    this.overrideTreeHighlighterUpdateForPerformanceTracking()
-  }
-
-  overrideTreeHighlighterUpdateForPerformanceTracking() {
-    // @ts-ignore
-    this._editorView?.plugins.forEach((e) => {
-      let sawATreeDiff = false
-
-      // we cannot use <>.constructor.name since it will get destroyed
-      // when packaging the application.
-      const isTreeHighlightPlugin =
-        e?.value &&
-        e.value?.hasOwnProperty('tree') &&
-        e.value?.hasOwnProperty('decoratedTo') &&
-        e.value?.hasOwnProperty('decorations')
-
-      if (isTreeHighlightPlugin) {
-        let originalUpdate = e.value.update
-        // @ts-ignore
-        function performanceTrackingUpdate(args) {
-          /**
-           * TreeHighlighter.update will be called multiple times on start up.
-           * We do not want to track the highlight performance of an empty update.
-           * mark the syntax highlight one time when the new tree comes in with the
-           * initial code
-           */
-          const treeIsDifferent =
-            // @ts-ignore
-            !sawATreeDiff && this.tree !== syntaxTree(args.state)
-          if (treeIsDifferent && !sawATreeDiff) {
-            markOnce('code/willSyntaxHighlight')
-          }
-          // Call the original function
-          // @ts-ignore
-          originalUpdate.apply(this, [args])
-          if (treeIsDifferent && !sawATreeDiff) {
-            markOnce('code/didSyntaxHighlight')
-            sawATreeDiff = true
-          }
-        }
-        e.value.update = performanceTrackingUpdate
-      }
-    })
   }
 
   get editorView(): EditorView | null {
@@ -158,29 +117,20 @@ export default class EditorManager {
     }
   }
 
-  /**
-   * Given an array of Diagnostics remove any duplicates by hashing a key
-   * in the format of from + ' ' + to + ' ' + message.
-   */
-  makeUniqueDiagnostics(duplicatedDiagnostics: Diagnostic[]): Diagnostic[] {
-    const uniqueDiagnostics: Diagnostic[] = []
-    const seenDiagnostic: { [key: string]: boolean } = {}
-
-    duplicatedDiagnostics.forEach((diagnostic: Diagnostic) => {
-      const hash = `${diagnostic.from} ${diagnostic.to} ${diagnostic.message}`
-      if (!seenDiagnostic[hash]) {
-        uniqueDiagnostics.push(diagnostic)
-        seenDiagnostic[hash] = true
-      }
-    })
-
-    return uniqueDiagnostics
-  }
-
   setDiagnostics(diagnostics: Diagnostic[]): void {
     if (!this._editorView) return
     // Clear out any existing diagnostics that are the same.
-    diagnostics = this.makeUniqueDiagnostics(diagnostics)
+    for (const diagnostic of diagnostics) {
+      for (const otherDiagnostic of diagnostics) {
+        if (diagnosticIsEqual(diagnostic, otherDiagnostic)) {
+          diagnostics = diagnostics.filter(
+            (d) => !diagnosticIsEqual(d, diagnostic)
+          )
+          diagnostics.push(diagnostic)
+          break
+        }
+      }
+    }
 
     this._editorView.dispatch({
       effects: [setDiagnosticsEffect.of(diagnostics)],

src/hooks/useEngineStreamContext.ts

@@ -1,237 +0,0 @@
-import { makeDefaultPlanes, modifyGrid } from 'lang/wasm'
-import { MutableRefObject } from 'react'
-import { setup, assign } from 'xstate'
-import { createActorContext } from '@xstate/react'
-import { kclManager, sceneInfra, engineCommandManager } from 'lib/singletons'
-import { trap } from 'lib/trap'
-
-export enum EngineStreamState {
-  Off = 'off',
-  On = 'on',
-  Playing = 'playing',
-  Paused = 'paused',
-  Resuming = 'resuming',
-}
-
-export enum EngineStreamTransition {
-  SetMediaStream = 'set-context',
-  Play = 'play',
-  Resume = 'resume',
-  Pause = 'pause',
-  StartOrReconfigureEngine = 'start-or-reconfigure-engine',
-}
-
-export interface EngineStreamContext {
-  pool: string | null
-  authToken: string | null
-  mediaStream: MediaStream | null
-  videoRef: MutableRefObject<HTMLVideoElement | null>
-  canvasRef: MutableRefObject<HTMLCanvasElement | null>
-}
-
-export function getDimensions(streamWidth: number, streamHeight: number) {
-  const factorOf = 4
-  const maxResolution = 2160
-  const ratio = Math.min(
-    Math.min(maxResolution / streamWidth, maxResolution / streamHeight),
-    1.0
-  )
-  const quadWidth = Math.round((streamWidth * ratio) / factorOf) * factorOf
-  const quadHeight = Math.round((streamHeight * ratio) / factorOf) * factorOf
-  return { width: quadWidth, height: quadHeight }
-}
-
-const engineStreamMachine = setup({
-  types: {
-    context: {} as EngineStreamContext,
-    input: {} as EngineStreamContext,
-  },
-  actions: {
-    [EngineStreamTransition.Play]({ context }, params: { zoomToFit: boolean }) {
-      const canvas = context.canvasRef.current
-      if (!canvas) return false
-
-      const video = context.videoRef.current
-      if (!video) return false
-
-      const mediaStream = context.mediaStream
-      if (!mediaStream) return false
-
-      video.style.display = 'block'
-      canvas.style.display = 'none'
-
-      video.srcObject = mediaStream
-      void sceneInfra.camControls
-        .restoreCameraPosition()
-        .then(() => video.play())
-        .catch((e) => {
-          console.warn('Video playing was prevented', e, video)
-        })
-        .then(() => kclManager.executeCode(params.zoomToFit))
-        .catch(trap)
-    },
-    [EngineStreamTransition.Pause]({ context }) {
-      const video = context.videoRef.current
-      if (!video) return
-
-      video.pause()
-
-      const canvas = context.canvasRef.current
-      if (!canvas) return
-
-      canvas.width = video.videoWidth
-      canvas.height = video.videoHeight
-      canvas.style.width = video.videoWidth + 'px'
-      canvas.style.height = video.videoHeight + 'px'
-      canvas.style.display = 'block'
-
-      const ctx = canvas.getContext('2d')
-      if (!ctx) return
-
-      ctx.drawImage(video, 0, 0, canvas.width, canvas.height)
-
-      // Make sure we're on the next frame for no flickering between canvas
-      // and the video elements.
-      window.requestAnimationFrame(() => {
-        video.style.display = 'none'
-
-        // Destroy the media stream only. We will re-establish it. We could
-        // leave everything at pausing, preventing video decoders from running
-        // but we can do even better by significantly reducing network
-        // cards also.
-        context.mediaStream?.getVideoTracks()[0].stop()
-        video.srcObject = null
-
-        sceneInfra.camControls.old = {
-          camera: sceneInfra.camControls.camera.clone(),
-          target: sceneInfra.camControls.target.clone(),
-        }
-
-        engineCommandManager.tearDown({ idleMode: true })
-      })
-    },
-    async [EngineStreamTransition.StartOrReconfigureEngine]({
-      context,
-      event,
-    }) {
-      if (!context.authToken) return
-
-      const video = context.videoRef.current
-      if (!video) return
-
-      const { width, height } = getDimensions(
-        window.innerWidth,
-        window.innerHeight
-      )
-
-      video.width = width
-      video.height = height
-
-      const settingsNext = {
-        // override the pool param (?pool=) to request a specific engine instance
-        // from a particular pool.
-        pool: context.pool,
-        ...event.settings,
-      }
-
-      engineCommandManager.settings = settingsNext
-
-      engineCommandManager.start({
-        setMediaStream: event.onMediaStream,
-        setIsStreamReady: (isStreamReady) =>
-          event.setAppState({ isStreamReady }),
-        width,
-        height,
-        token: context.authToken,
-        settings: settingsNext,
-        makeDefaultPlanes: () => {
-          return makeDefaultPlanes(kclManager.engineCommandManager)
-        },
-        modifyGrid: (hidden: boolean) => {
-          return modifyGrid(kclManager.engineCommandManager, hidden)
-        },
-      })
-
-      event.modelingMachineActorSend({
-        type: 'Set context',
-        data: {
-          streamDimensions: {
-            streamWidth: width,
-            streamHeight: height,
-          },
-        },
-      })
-    },
-    async [EngineStreamTransition.Resume]({ context, event }) {
-      // engineCommandManager.engineConnection?.reattachMediaStream()
-    },
-  },
-}).createMachine({
-  context: (initial) => initial.input,
-  initial: EngineStreamState.Off,
-  states: {
-    [EngineStreamState.Off]: {
-      on: {
-        [EngineStreamTransition.StartOrReconfigureEngine]: {
-          target: EngineStreamState.On,
-          actions: [{ type: EngineStreamTransition.StartOrReconfigureEngine }],
-        },
-      },
-    },
-    [EngineStreamState.On]: {
-      on: {
-        [EngineStreamTransition.SetMediaStream]: {
-          target: EngineStreamState.On,
-          actions: [
-            assign({ mediaStream: ({ context, event }) => event.mediaStream }),
-          ],
-        },
-        [EngineStreamTransition.Play]: {
-          target: EngineStreamState.Playing,
-          actions: [
-            { type: EngineStreamTransition.Play, params: { zoomToFit: true } },
-          ],
-        },
-      },
-    },
-    [EngineStreamState.Playing]: {
-      on: {
-        [EngineStreamTransition.StartOrReconfigureEngine]: {
-          target: EngineStreamState.Playing,
-          reenter: true,
-          actions: [{ type: EngineStreamTransition.StartOrReconfigureEngine }],
-        },
-        [EngineStreamTransition.Pause]: {
-          target: EngineStreamState.Paused,
-          actions: [{ type: EngineStreamTransition.Pause }],
-        },
-      },
-    },
-    [EngineStreamState.Paused]: {
-      on: {
-        [EngineStreamTransition.StartOrReconfigureEngine]: {
-          target: EngineStreamState.Resuming,
-          actions: [{ type: EngineStreamTransition.StartOrReconfigureEngine }],
-        },
-      },
-    },
-    [EngineStreamState.Resuming]: {
-      on: {
-        [EngineStreamTransition.SetMediaStream]: {
-          target: EngineStreamState.Resuming,
-          actions: [
-            assign({ mediaStream: ({ context, event }) => event.mediaStream }),
-          ],
-        },
-        [EngineStreamTransition.Play]: {
-          target: EngineStreamState.Playing,
-          actions: [
-            { type: EngineStreamTransition.Play, params: { zoomToFit: false } },
-          ],
-        },
-      },
-    },
-  },
-})
-
-export default createActorContext(engineStreamMachine)

src/hooks/useToolbarGuards.ts

@@ -2,13 +2,13 @@ import {
   SetVarNameModal,
   createSetVarNameModal,
 } from 'components/SetVarNameModal'
-import { editorManager, kclManager, codeManager } from 'lib/singletons'
-import { reportRejection, trap, err } from 'lib/trap'
+import { editorManager, kclManager } from 'lib/singletons'
+import { reportRejection, trap } from 'lib/trap'
 import { moveValueIntoNewVariable } from 'lang/modifyAst'
 import { isNodeSafeToReplace } from 'lang/queryAst'
 import { useEffect, useState } from 'react'
 import { useModelingContext } from './useModelingContext'
-import { PathToNode, SourceRange, recast } from 'lang/wasm'
+import { PathToNode, SourceRange } from 'lang/wasm'
 import { useKclContext } from 'lang/KclProvider'
 import { toSync } from 'lib/utils'
 
@@ -57,11 +57,6 @@ export function useConvertToVariable(range?: SourceRange) {
         )
 
       await kclManager.updateAst(_modifiedAst, true)
-
-      const newCode = recast(_modifiedAst)
-      if (err(newCode)) return
-      codeManager.updateCodeEditor(newCode)
-
       return pathToReplacedNode
     } catch (e) {
       console.log('error', e)

src/index.tsx

@@ -8,10 +8,8 @@ import ModalContainer from 'react-modal-promise'
 import { isDesktop } from 'lib/isDesktop'
 import { AppStreamProvider } from 'AppState'
 import { ToastUpdate } from 'components/ToastUpdate'
-import { markOnce } from 'lib/performance'
 import { AUTO_UPDATER_TOAST_ID } from 'lib/constants'
 
-markOnce('code/willAuth')
 // uncomment for xstate inspector
 // import { DEV } from 'env'
 // import { inspect } from '@xstate/inspect'

src/lang/KclSingleton.ts

@@ -2,7 +2,7 @@ import { executeAst, lintAst } from 'lang/langHelpers'
 import { Selections } from 'lib/selections'
 import { KCLError, kclErrorsToDiagnostics } from './errors'
 import { uuidv4 } from 'lib/utils'
-import { EngineCommandManager, CommandLogType } from './std/engineConnection'
+import { EngineCommandManager } from './std/engineConnection'
 import { err } from 'lib/trap'
 import { EXECUTE_AST_INTERRUPT_ERROR_MESSAGE } from 'lib/constants'
 
@@ -21,7 +21,6 @@ import {
 import { getNodeFromPath } from './queryAst'
 import { codeManager, editorManager, sceneInfra } from 'lib/singletons'
 import { Diagnostic } from '@codemirror/lint'
-import { markOnce } from 'lib/performance'
 import { Node } from 'wasm-lib/kcl/bindings/Node'
 
 interface ExecuteArgs {
@@ -125,7 +124,7 @@ export class KclManager {
     if (this.lints.length > 0) {
       diagnostics = diagnostics.concat(this.lints)
     }
-    editorManager?.setDiagnostics(diagnostics)
+    editorManager.setDiagnostics(diagnostics)
   }
 
   addKclErrors(kclErrors: KCLError[]) {
@@ -258,7 +257,6 @@ export class KclManager {
     }
 
     const ast = args.ast || this.ast
-    markOnce('code/startExecuteAst')
 
     const currentExecutionId = args.executionId || Date.now()
     this._cancelTokens.set(currentExecutionId, false)
@@ -290,9 +288,15 @@ export class KclManager {
           )
         }
 
-        await sceneInfra.camControls.centerModelRelativeToPanes({
-          zoomToFit: true,
-          zoomObjectId,
+        await this.engineCommandManager.sendSceneCommand({
+          type: 'modeling_cmd_req',
+          cmd_id: uuidv4(),
+          cmd: {
+            type: 'zoom_to_fit',
+            object_ids: zoomObjectId ? [zoomObjectId] : [], // leave empty to zoom to all objects
+            padding: 0.1, // padding around the objects
+            animated: false, // don't animate the zoom for now
+          },
         })
       }
     }
@@ -322,12 +326,11 @@ export class KclManager {
     this.ast = { ...ast }
     this._executeCallback()
     this.engineCommandManager.addCommandLog({
-      type: CommandLogType.ExecutionDone,
+      type: 'execution-done',
       data: null,
     })
 
     this._cancelTokens.delete(currentExecutionId)
-    markOnce('code/endExecuteAst')
   }
   // NOTE: this always updates the code state and editor.
   // DO NOT CALL THIS from codemirror ever.
@@ -351,6 +354,9 @@ export class KclManager {
       this.clearAst()
       return
     }
+    codeManager.updateCodeEditor(newCode)
+    // Write the file to disk.
+    await codeManager.writeToFile()
     this._ast = { ...newAst }
 
     const { logs, errors, execState } = await executeAst({
@@ -488,6 +494,11 @@ export class KclManager {
     }
 
     if (execute) {
+      // Call execute on the set ast.
+      // Update the code state and editor.
+      codeManager.updateCodeEditor(newCode)
+      // Write the file to disk.
+      await codeManager.writeToFile()
       await this.executeAst({
         ast: astWithUpdatedSource,
         zoomToFit: optionalParams?.zoomToFit,

src/lang/artifact.test.ts

@@ -18,7 +18,8 @@ const mySketch001 = startSketchOn('XY')
     // @ts-ignore
     const sketch001 = execState.memory.get('mySketch001')
     expect(sketch001).toEqual({
-      type: 'Sketch',
+      type: 'UserVal',
+      __meta: [{ sourceRange: [46, 71, 0] }],
       value: {
         type: 'Sketch',
         on: expect.any(Object),

src/lang/codeManager.ts

@@ -7,8 +7,6 @@ import toast from 'react-hot-toast'
 import { editorManager } from 'lib/singletons'
 import { Annotation, Transaction } from '@codemirror/state'
 import { KeyBinding } from '@codemirror/view'
-import { recast, Program } from 'lang/wasm'
-import { err } from 'lib/trap'
 
 const PERSIST_CODE_KEY = 'persistCode'
 
@@ -149,13 +147,6 @@ export default class CodeManager {
       safeLSSetItem(PERSIST_CODE_KEY, this.code)
     }
   }
-
-  async updateEditorWithAstAndWriteToFile(ast: Program) {
-    const newCode = recast(ast)
-    if (err(newCode)) return
-    this.updateCodeStateEditor(newCode)
-    await this.writeToFile()
-  }
 }
 
 function safeLSGetItem(key: string) {

src/lang/executor.test.ts

@@ -58,13 +58,7 @@ const newVar = myVar + 1`
 `
     const mem = await exe(code)
     // geo is three js buffer geometry and is very bloated to have in tests
-    const sk = mem.get('mySketch')
-    expect(sk?.type).toEqual('Sketch')
-    if (sk?.type !== 'Sketch') {
-      return
-    }
-
-    const minusGeo = sk?.value?.paths
+    const minusGeo = mem.get('mySketch')?.value?.paths
     expect(minusGeo).toEqual([
       {
         type: 'ToPoint',
@@ -156,7 +150,7 @@ const newVar = myVar + 1`
     ].join('\n')
     const mem = await exe(code)
     expect(mem.get('mySk1')).toEqual({
-      type: 'Sketch',
+      type: 'UserVal',
       value: {
         type: 'Sketch',
         on: expect.any(Object),
@@ -221,6 +215,7 @@ const newVar = myVar + 1`
         id: expect.any(String),
         __meta: [{ sourceRange: [39, 63, 0] }],
       },
+      __meta: [{ sourceRange: [39, 63, 0] }],
     })
   })
   it('execute array expression', async () => {
@@ -230,7 +225,7 @@ const newVar = myVar + 1`
     const mem = await exe(code)
     // TODO path to node is probably wrong here, zero indexes are not correct
     expect(mem.get('three')).toEqual({
-      type: 'Int',
+      type: 'UserVal',
       value: 3,
       __meta: [
         {
@@ -239,17 +234,8 @@ const newVar = myVar + 1`
       ],
     })
     expect(mem.get('yo')).toEqual({
-      type: 'Array',
-      value: [
-        { type: 'Int', value: 1, __meta: [{ sourceRange: [28, 29, 0] }] },
-        { type: 'String', value: '2', __meta: [{ sourceRange: [31, 34, 0] }] },
-        { type: 'Int', value: 3, __meta: [{ sourceRange: [14, 15, 0] }] },
-        {
-          type: 'Number',
-          value: 9,
-          __meta: [{ sourceRange: [43, 44, 0] }, { sourceRange: [47, 48, 0] }],
-        },
-      ],
+      type: 'UserVal',
+      value: [1, '2', 3, 9],
       __meta: [
         {
           sourceRange: [27, 49, 0],
@@ -267,25 +253,8 @@ const newVar = myVar + 1`
     ].join('\n')
     const mem = await exe(code)
     expect(mem.get('yo')).toEqual({
-      type: 'Object',
-      value: {
-        aStr: {
-          type: 'String',
-          value: 'str',
-          __meta: [{ sourceRange: [34, 39, 0] }],
-        },
-        anum: { type: 'Int', value: 2, __meta: [{ sourceRange: [47, 48, 0] }] },
-        identifier: {
-          type: 'Int',
-          value: 3,
-          __meta: [{ sourceRange: [14, 15, 0] }],
-        },
-        binExp: {
-          type: 'Number',
-          value: 9,
-          __meta: [{ sourceRange: [77, 78, 0] }, { sourceRange: [81, 82, 0] }],
-        },
-      },
+      type: 'UserVal',
+      value: { aStr: 'str', anum: 2, identifier: 3, binExp: 9 },
       __meta: [
         {
           sourceRange: [27, 83, 0],
@@ -299,11 +268,11 @@ const newVar = myVar + 1`
     )
     const mem = await exe(code)
     expect(mem.get('myVar')).toEqual({
-      type: 'String',
+      type: 'UserVal',
       value: '123',
       __meta: [
         {
-          sourceRange: [19, 24, 0],
+          sourceRange: [41, 50, 0],
         },
       ],
     })
@@ -387,26 +356,7 @@ describe('testing math operators', () => {
   it('with unaryExpression in ArrayExpression', async () => {
     const code = 'const myVar = [1,-legLen(5, 4)]'
     const mem = await exe(code)
-    expect(mem.get('myVar')?.value).toEqual([
-      {
-        __meta: [
-          {
-            sourceRange: [15, 16, 0],
-          },
-        ],
-        type: 'Int',
-        value: 1,
-      },
-      {
-        __meta: [
-          {
-            sourceRange: [17, 30, 0],
-          },
-        ],
-        type: 'Number',
-        value: -3,
-      },
-    ])
+    expect(mem.get('myVar')?.value).toEqual([1, -3])
   })
   it('with unaryExpression in ArrayExpression in CallExpression, checking nothing funny happens when used in a sketch', async () => {
     const code = [

src/lang/kclSamples.test.ts

@@ -55,13 +55,18 @@ describe('Test KCL Samples from public Github repository', () => {
     })
     // Run through all of the files in the manifest json. This will allow us to be automatically updated
     // with the latest changes in github. We won't be hard coding the filenames
-    files.forEach((file: KclSampleFile) => {
-      it(`should parse ${file.filename} without errors`, async () => {
-        const code = await getKclSampleCodeFromGithub(file.filename)
-        const parsed = parse(code)
-        assert(!(parsed instanceof Error))
-      }, 1000)
-    })
+    it(
+      'should run through all the files',
+      async () => {
+        for (let i = 0; i < files.length; i++) {
+          const file: KclSampleFile = files[i]
+          const code = await getKclSampleCodeFromGithub(file.filename)
+          const parsed = parse(code)
+          assert(!(parsed instanceof Error))
+        }
+      },
+      files.length * 1000
+    )
   })
 
   describe('when performing enginelessExecutor', () => {