Merge branch 'main' into migrate-to-lsp-execution

Signed-off-by: Jess Frazelle <github@jessfraz.com>

.github/workflows/build-and-store-wasm.yml

@@ -1,33 +0,0 @@
-name: Build and Store WASM
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  build-and-upload:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'yarn'
-      - name: Install dependencies
-        run: yarn
-      - name: Setup Rust
-        uses: dtolnay/rust-toolchain@stable
-      - name: Cache wasm
-        uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: './src/wasm-lib'
-      - name: build wasm
-        run: yarn build:wasm
-
-
-      # Upload the WASM bundle as an artifact
-      - uses: actions/upload-artifact@v2
-        with:
-          name: wasm-bundle
-          path: src/wasm-lib/pkg

.github/workflows/cargo-clippy.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        dir: ['src/wasm-lib', 'src-tauri']
+        dir: ['src/wasm-lib']
     steps:
       - uses: actions/checkout@v4
       - name: Install latest rust
@@ -31,22 +31,9 @@ jobs:
 
       - name: install dependencies
         if: matrix.dir ==  'src-tauri'
-        shell: bash
         run: |
           sudo apt-get update
-          sudo apt-get install -y \
+          sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
-            libgtk-3-dev \
-            libayatana-appindicator3-dev \
-            webkit2gtk-driver \
-            libsoup-3.0-dev \
-            libjavascriptcoregtk-4.1-dev \
-            libwebkit2gtk-4.1-dev \
-            at-spi2-core \
-            xvfb
-          yarn install
-          yarn build:wasm
-          yarn build:local
-
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2.6.1
 

.github/workflows/cargo-test-tauri.yml

@@ -1,57 +0,0 @@
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - 'src-tauri/**.rs'
-      - '**/Cargo.toml'
-      - '**/Cargo.lock'
-      - '**/rust-toolchain.toml'
-      - .github/workflows/cargo-test-tauri.yml
-  pull_request:
-    paths:
-      - 'src-tauri/**.rs'
-      - '**/Cargo.toml'
-      - '**/Cargo.lock'
-      - '**/rust-toolchain.toml'
-      - .github/workflows/cargo-test-tauri.yml
-  workflow_dispatch:
-permissions: read-all
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-name: cargo test of tauri
-jobs:
-  cargotest:
-    name: cargo test
-    runs-on: ubuntu-latest-8-cores
-    strategy:
-      matrix:
-        dir: ['src-tauri']
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install latest rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          override: true
-      - name: install dependencies
-        if: matrix.dir ==  'src-tauri'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y \
-            libgtk-3-dev \
-            libayatana-appindicator3-dev \
-            webkit2gtk-driver \
-            libsoup-3.0-dev \
-            libjavascriptcoregtk-4.1-dev \
-            libwebkit2gtk-4.1-dev \
-            at-spi2-core \
-            xvfb
-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2.6.1
-      - name: cargo test
-        shell: bash
-        run: |-
-          cd "${{ matrix.dir }}"
-          cargo test --all

.github/workflows/ci.yml

@@ -50,7 +50,7 @@ jobs:
       - run: yarn tsc
 
 
-  check-typos:
+  check-typos: 
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -98,7 +98,7 @@ jobs:
         with:
           node-version-file: '.nvmrc'
           cache: 'yarn'
-
+          
       - name: Set nightly version
         if: github.event_name == 'schedule'
         run: |
@@ -143,21 +143,21 @@ jobs:
           ls -l artifact
           cp artifact/package.json package.json
           cp artifact/src-tauri/tauri.conf.json src-tauri/tauri.conf.json
-          cp artifact/src-tauri/tauri.release.conf.json src-tauri/tauri.release.conf.json
+          cp artifact/src-tauri/tauri.release.conf.json src-tauri/tauri.release.conf.json 
 
       - name: Install ubuntu system dependencies
         if: matrix.os == 'ubuntu-latest'
-        run: |
+        run: >
-          sudo apt-get update
+          sudo apt-get update &&
-          sudo apt-get install -y \
+          sudo apt-get install -y
-            libgtk-3-dev \
+          libgtk-3-dev
-            libayatana-appindicator3-dev \
+          libayatana-appindicator3-dev
-            webkit2gtk-driver \
+          webkit2gtk-driver
-            libsoup-3.0-dev \
+          libsoup-3.0-dev
-            libjavascriptcoregtk-4.1-dev \
+          libjavascriptcoregtk-4.1-dev
-            libwebkit2gtk-4.1-dev \
+          libwebkit2gtk-4.1-dev
-            at-spi2-core \
+          at-spi2-core
-            xvfb
+          xvfb
 
       - name: Sync node version and setup cache
         uses: actions/setup-node@v4
@@ -383,7 +383,7 @@ jobs:
         uses: softprops/action-gh-release@v2
         with:
           files: 'artifact/*/Zoo*'
-
+          
   announce_release:
     needs: [publish-apps-release]
     runs-on: ubuntu-latest
@@ -391,17 +391,17 @@ jobs:
     steps:
       - name: Check out code
         uses: actions/checkout@v4
-
+          
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
           python-version: '3.x'
-
+  
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           pip install requests
-
+  
       - name: Announce Release
         env:
           DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}

.github/workflows/playwright.yml

@@ -12,31 +12,11 @@ concurrency:
 permissions:
   contents: write
   pull-requests: write
-  actions: read
-  
 
 jobs:
-
-  check-rust-changes:
-    runs-on: ubuntu-latest
-    outputs:
-      rust-changed: ${{ steps.filter.outputs.rust }}
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - id: filter
-        name: Check for Rust changes
-        uses: dorny/paths-filter@v2
-        with:
-          filters: |
-            rust:
-              - 'src/wasm-lib/**'
-
   playwright-ubuntu:
     timeout-minutes: 60
     runs-on: ubuntu-latest-8-cores
-    needs: check-rust-changes
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
@@ -48,39 +28,13 @@ jobs:
       run: yarn
     - name: Install Playwright Browsers
       run: yarn playwright install --with-deps
-    - name: download wasm
-      id: download-wasm
-      if: needs.check-rust-changes.outputs.rust-changed == 'false'
-      uses: actions/download-artifact@v2
-      continue-on-error: true
-      with:
-        name: wasm-bundle
-        path: src/wasm-lib/pkg
-    - name: copy wasm blob
-      if: needs.check-rust-changes.outputs.rust-changed == 'false'
-      run: cp src/wasm-lib/pkg/wasm_lib_bg.wasm public
-      continue-on-error: true
     - name: Setup Rust
-      if: needs.check-rust-changes.outputs.rust-changed == 'true'
-      uses: dtolnay/rust-toolchain@stable
-    - name: Setup Rust
-      if: steps.download-wasm.outcome == 'failure'
       uses: dtolnay/rust-toolchain@stable
     - name: Cache wasm
-      if: needs.check-rust-changes.outputs.rust-changed == 'true'
-      uses: Swatinem/rust-cache@v2
-      with:
-        workspaces: './src/wasm-lib'
-    - name: Cache wasm
-      if: steps.download-wasm.outcome == 'failure'
       uses: Swatinem/rust-cache@v2
       with:
         workspaces: './src/wasm-lib'
     - name: build wasm
-      if: needs.check-rust-changes.outputs.rust-changed == 'true'
-      run: yarn build:wasm
-    - name: build wasm
-      if: steps.download-wasm.outcome == 'failure'
       run: yarn build:wasm
     - name: build web
       run: yarn build:local
@@ -131,16 +85,10 @@ jobs:
         name: playwright-report
         path: playwright-report/
         retention-days: 30
-    - uses: actions/upload-artifact@v4
-      if: github.ref == 'refs/heads/main'
-      with:
-        name: wasm-bundle
-        path: src/wasm-lib/pkg
 
   playwright-macos:
     timeout-minutes: 60
     runs-on: macos-14
-    needs: check-rust-changes
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
@@ -151,39 +99,13 @@ jobs:
       run: yarn
     - name: Install Playwright Browsers
       run: yarn playwright install --with-deps
-    - name: download wasm
-      id: download-wasm
-      if: needs.check-rust-changes.outputs.rust-changed == 'false'
-      uses: actions/download-artifact@v4
-      with:
-        name: wasm-bundle
-        path: src/wasm-lib/pkg
-      continue-on-error: true
-    - name: copy wasm blob
-      if: needs.check-rust-changes.outputs.rust-changed == 'false'
-      run: cp src/wasm-lib/pkg/wasm_lib_bg.wasm public
-      continue-on-error: true
     - name: Setup Rust
-      if: needs.check-rust-changes.outputs.rust-changed == 'true'
-      uses: dtolnay/rust-toolchain@stable
-    - name: Setup Rust
-      if: steps.download-wasm.outcome == 'failure'
       uses: dtolnay/rust-toolchain@stable
     - name: Cache wasm
-      if: needs.check-rust-changes.outputs.rust-changed == 'true'
-      uses: Swatinem/rust-cache@v2
-      with:
-        workspaces: './src/wasm-lib'
-    - name: Cache wasm
-      if: steps.download-wasm.outcome == 'failure'
       uses: Swatinem/rust-cache@v2
       with:
         workspaces: './src/wasm-lib'
     - name: build wasm
-      if: needs.check-rust-changes.outputs.rust-changed == 'true'
-      run: yarn build:wasm
-    - name: build wasm
-      if: steps.download-wasm.outcome == 'failure'
       run: yarn build:wasm
     - name: build web
       run: yarn build:local
@@ -200,8 +122,3 @@ jobs:
         name: playwright-report
         path: playwright-report/
         retention-days: 30
-    - uses: actions/upload-artifact@v4
-      if: github.ref == 'refs/heads/main'
-      with:
-        name: wasm-bundle
-        path: src/wasm-lib/pkg

.nvmrc

@@ -1 +1 @@
-v21.7.1
+v20.5.0

babel.config.js

@@ -1,3 +1,3 @@
 module.exports = {
-  presets: ['@babel/preset-env'],
+  presets: ["@babel/preset-env"],
 }

e2e/playwright/flow-tests.spec.ts

@@ -2,6 +2,7 @@ import { test, expect } from '@playwright/test'
 import { getUtils } from './test-utils'
 import waitOn from 'wait-on'
 import { roundOff } from 'lib/utils'
+import * as TOML from '@iarna/toml'
 import { SaveSettingsPayload } from 'lib/settings/settingsTypes'
 import { secrets } from './secrets'
 import {
@@ -10,7 +11,6 @@ import {
   TEST_SETTINGS_CORRUPTED,
   TEST_SETTINGS_ONBOARDING,
 } from './storageStates'
-import * as TOML from '@iarna/toml'
 
 /*
 debug helper: unfortunately we do rely on exact coord mouse clicks in a few places
@@ -104,7 +104,6 @@ test('Basic sketch', async ({ page }) => {
   |> startProfileAt(${commonPoints.startAt}, %)
   |> line([${commonPoints.num1}, 0], %)
   |> line([0, ${commonPoints.num1}], %)`)
-  await page.waitForTimeout(100)
   await page.mouse.click(startXPx, 500 - PUR * 20)
   await expect(page.locator('.cm-content'))
     .toHaveText(`const part001 = startSketchOn('-XZ')
@@ -329,56 +328,6 @@ test('if you write invalid kcl you get inlined errors', async ({ page }) => {
   await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
 })
 
-test('if your kcl gets an error from the engine it is inlined', async ({
-  page,
-}) => {
-  const u = getUtils(page)
-  await page.addInitScript(async () => {
-    localStorage.setItem(
-      'persistCode',
-      `const box = startSketchOn('XY')
-|> startProfileAt([0, 0], %)
-|> line([0, 10], %)
-|> line([10, 0], %)
-|> line([0, -10], %, 'revolveAxis')
-|> close(%)
-|> extrude(10, %)
-
-const sketch001 = startSketchOn(box, "revolveAxis")
-|> startProfileAt([5, 10], %)
-|> line([0, -10], %)
-|> line([2, 0], %)
-|> line([0, -10], %)
-|> close(%)
-|> revolve({
-axis: getEdge('revolveAxis', box),
-angle: 90
-}, %)
-    `
-    )
-  })
-
-  await page.setViewportSize({ width: 1000, height: 500 })
-  await page.goto('/')
-
-  await u.waitForAuthSkipAppStart()
-
-  await u.openDebugPanel()
-  await u.expectCmdLog('[data-message-type="execution-done"]')
-  await u.closeDebugPanel()
-
-  // error in guter
-  await expect(page.locator('.cm-lint-marker-error')).toBeVisible()
-
-  // error text on hover
-  await page.hover('.cm-lint-marker-error')
-  await expect(
-    page.getByText(
-      'sketch profile must lie entirely on one side of the revolution axis'
-    )
-  ).toBeVisible()
-})
-
 test('executes on load', async ({ page }) => {
   const u = getUtils(page)
   await page.addInitScript(async () => {
@@ -445,11 +394,9 @@ test('re-executes', async ({ page }) => {
   ).toBeVisible()
 })
 
-const sketchOnPlaneAndBackSideTest = async (
+test('Can create sketches on all planes and their back sides', async ({
-  page: any,
+  page,
-  plane: string,
+}) => {
-  clickCoords: { x: number; y: number }
-) => {
   const u = getUtils(page)
   const PUR = 400 / 37.5 //pixeltoUnitRatio
   await page.setViewportSize({ width: 1200, height: 500 })
@@ -457,72 +404,81 @@ const sketchOnPlaneAndBackSideTest = async (
   await u.waitForAuthSkipAppStart()
   await u.openDebugPanel()
 
-  const camCmdBackSide: [number, number, number] = [-100, -100, -100]
+  const camPos: [number, number, number] = [100, 100, 100]
-  let camPos: [number, number, number] = [100, 100, 100]
+
-  if (plane === '-XY' || plane === '-YZ' || plane === '-XZ') {
+  const TestSinglePlane = async ({
-    camPos = camCmdBackSide
+    viewCmd,
+    expectedCode,
+    clickCoords,
+  }: {
+    viewCmd: [number, number, number]
+    expectedCode: string
+    clickCoords: { x: number; y: number }
+  }) => {
+    await u.openDebugPanel()
+
+    await u.clearCommandLogs()
+    await page.getByRole('button', { name: 'Start Sketch' }).click()
+    await u.updateCamPosition(viewCmd)
+
+    await u.closeDebugPanel()
+    await page.mouse.click(clickCoords.x, clickCoords.y)
+    await page.waitForTimeout(300) // wait for animation
+
+    await expect(page.getByRole('button', { name: 'Line' })).toBeVisible()
+
+    // draw a line
+    const startXPx = 600
+
+    await u.closeDebugPanel()
+    await page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10)
+
+    await expect(page.locator('.cm-content')).toHaveText(expectedCode)
+
+    await page.getByRole('button', { name: 'Line' }).click()
+    await u.openAndClearDebugPanel()
+    await page.getByRole('button', { name: 'Exit Sketch' }).click()
+    await u.expectCmdLog('[data-message-type="execution-done"]')
+
+    await u.clearCommandLogs()
+    await u.removeCurrentCode()
   }
 
-  const code = `const part001 = startSketchOn('${plane}')
+  const codeTemplate = (
+    plane = 'XY'
+  ) => `const part001 = startSketchOn('${plane}')
   |> startProfileAt([1.14, -1.54], %)`
-
+  await TestSinglePlane({
-  await u.openDebugPanel()
+    viewCmd: camPos,
-
+    expectedCode: codeTemplate('XY'),
-  await u.clearCommandLogs()
+    clickCoords: { x: 600, y: 388 }, // red plane
-  await page.getByRole('button', { name: 'Start Sketch' }).click()
+    // clickCoords: { x: 600, y: 400 }, // red plane // clicks grid helper and that causes problems, should fix so that these coords work too.
-  await u.updateCamPosition(camPos)
-
-  await u.closeDebugPanel()
-  await page.mouse.click(clickCoords.x, clickCoords.y)
-  await page.waitForTimeout(300) // wait for animation
-
-  await expect(page.getByRole('button', { name: 'Line' })).toBeVisible()
-
-  // draw a line
-  const startXPx = 600
-
-  await u.closeDebugPanel()
-  await page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10)
-
-  await expect(page.locator('.cm-content')).toHaveText(code)
-
-  await page.getByRole('button', { name: 'Line' }).click()
-  await u.openAndClearDebugPanel()
-  await page.getByRole('button', { name: 'Exit Sketch' }).click()
-  await u.expectCmdLog('[data-message-type="execution-done"]')
-
-  await u.clearCommandLogs()
-  await u.removeCurrentCode()
-}
-
-test.describe('Can create sketches on all planes and their back sides', () => {
-  test('XY', async ({ page }) => {
-    await sketchOnPlaneAndBackSideTest(
-      page,
-      'XY',
-      { x: 600, y: 388 } // red plane
-      // { x: 600, y: 400 }, // red plane // clicks grid helper and that causes problems, should fix so that these coords work too.
-    )
   })
-
+  await TestSinglePlane({
-  test('YZ', async ({ page }) => {
+    viewCmd: camPos,
-    await sketchOnPlaneAndBackSideTest(page, 'YZ', { x: 700, y: 250 }) // green plane
+    expectedCode: codeTemplate('YZ'),
+    clickCoords: { x: 700, y: 250 }, // green plane
   })
-
+  await TestSinglePlane({
-  test('XZ', async ({ page }) => {
+    viewCmd: camPos,
-    await sketchOnPlaneAndBackSideTest(page, 'XZ', { x: 700, y: 80 }) // blue plane
+    expectedCode: codeTemplate('XZ'),
+    clickCoords: { x: 700, y: 80 }, // blue plane
   })
-
+  const camCmdBackSide: [number, number, number] = [-100, -100, -100]
-  test('-XY', async ({ page }) => {
+  await TestSinglePlane({
-    await sketchOnPlaneAndBackSideTest(page, '-XY', { x: 600, y: 118 }) // back of red plane
+    viewCmd: camCmdBackSide,
+    expectedCode: codeTemplate('-XY'),
+    clickCoords: { x: 601, y: 118 }, // back of red plane
   })
-
+  await TestSinglePlane({
-  test('-YZ', async ({ page }) => {
+    viewCmd: camCmdBackSide,
-    await sketchOnPlaneAndBackSideTest(page, '-YZ', { x: 700, y: 219 }) // back of green plane
+    expectedCode: codeTemplate('-YZ'),
+    clickCoords: { x: 730, y: 219 }, // back of green plane
   })
-
+  await TestSinglePlane({
-  test('-XZ', async ({ page }) => {
+    viewCmd: camCmdBackSide,
-    await sketchOnPlaneAndBackSideTest(page, '-XZ', { x: 700, y: 427 }) // back of blue plane
+    expectedCode: codeTemplate('-XZ'),
+    clickCoords: { x: 680, y: 427 }, // back of blue plane
   })
 })
 
@@ -554,7 +510,7 @@ test('Auto complete works', async ({ page }) => {
   // expect there to be three auto complete options
   await expect(page.locator('.cm-completionLabel')).toHaveCount(3)
   await page.getByText('startSketchOn').click()
-  await page.keyboard.type("'XZ'")
+  await page.keyboard.type("'XY'")
   await page.keyboard.press('Tab')
   await page.keyboard.press('Enter')
   await page.keyboard.type('  |> startProfi')
@@ -564,10 +520,7 @@ test('Auto complete works', async ({ page }) => {
   await page.keyboard.press('Enter') // accepting the auto complete, not a new line
 
   await page.keyboard.press('Tab')
-  await page.keyboard.type('12')
-  await page.waitForTimeout(100)
   await page.keyboard.press('Tab')
-  await page.waitForTimeout(100)
   await page.keyboard.press('Tab')
   await page.keyboard.press('Tab')
   await page.keyboard.press('Enter')
@@ -589,19 +542,20 @@ test('Auto complete works', async ({ page }) => {
   await expect(page.locator('.cm-completionLabel')).not.toBeVisible()
 
   await expect(page.locator('.cm-content'))
-    .toHaveText(`const part001 = startSketchOn('XZ')
+    .toHaveText(`const part001 = startSketchOn('XY')
-  |> startProfileAt([3.14, 12], %)
+  |> startProfileAt([3.14, 3.14], %)
   |> xLine(5, %) // lin`)
 })
 
 test('Stored settings are validated and fall back to defaults', async ({
   page,
+  context,
 }) => {
   const u = getUtils(page)
 
   // Override beforeEach test setup
   // with corrupted settings
-  await page.addInitScript(
+  await context.addInitScript(
     async ({ settingsKey, settings }) => {
       localStorage.setItem(settingsKey, settings)
     },
@@ -618,18 +572,18 @@ test('Stored settings are validated and fall back to defaults', async ({
   // Check the settings were reset
   const storedSettings = TOML.parse(
     await page.evaluate(
-      ({ settingsKey }) => localStorage.getItem(settingsKey) || '',
+      ({ settingsKey }) => localStorage.getItem(settingsKey) || '{}',
       { settingsKey: TEST_SETTINGS_KEY }
     )
   ) as { settings: SaveSettingsPayload }
 
-  expect(storedSettings.settings?.app?.theme).toBe(undefined)
+  expect(storedSettings.settings.app?.theme).toBe('dark')
 
   // Check that the invalid settings were removed
-  expect(storedSettings.settings?.modeling?.defaultUnit).toBe(undefined)
+  expect(storedSettings.settings.modeling?.defaultUnit).toBe(undefined)
-  expect(storedSettings.settings?.modeling?.mouseControls).toBe(undefined)
+  expect(storedSettings.settings.modeling?.mouseControls).toBe(undefined)
-  expect(storedSettings.settings?.app?.projectDirectory).toBe(undefined)
+  expect(storedSettings.settings.app?.projectDirectory).toBe(undefined)
-  expect(storedSettings.settings?.projects?.defaultProjectName).toBe(undefined)
+  expect(storedSettings.settings.projects?.defaultProjectName).toBe(undefined)
 })
 
 test('Project settings can be set and override user settings', async ({
@@ -736,7 +690,7 @@ test('Selections work on fresh and edited sketch', async ({ page }) => {
   await u.openDebugPanel()
 
   const xAxisClick = () =>
-    page.mouse.click(700, 253).then(() => page.waitForTimeout(100))
+    page.mouse.click(700, 250).then(() => page.waitForTimeout(100))
   const emptySpaceClick = () =>
     page.mouse.click(728, 343).then(() => page.waitForTimeout(100))
   const topHorzSegmentClick = () =>
@@ -761,7 +715,6 @@ test('Selections work on fresh and edited sketch', async ({ page }) => {
     .toHaveText(`const part001 = startSketchOn('-XZ')
   |> startProfileAt(${commonPoints.startAt}, %)`)
 
-  await page.waitForTimeout(100)
   await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 10)
 
   await expect(page.locator('.cm-content'))
@@ -769,14 +722,12 @@ test('Selections work on fresh and edited sketch', async ({ page }) => {
   |> startProfileAt(${commonPoints.startAt}, %)
   |> 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(`const part001 = startSketchOn('-XZ')
   |> startProfileAt(${commonPoints.startAt}, %)
   |> line([${commonPoints.num1}, 0], %)
   |> line([0, ${commonPoints.num1}], %)`)
-  await page.waitForTimeout(100)
   await page.mouse.click(startXPx, 500 - PUR * 20)
   await expect(page.locator('.cm-content'))
     .toHaveText(`const part001 = startSketchOn('-XZ')
@@ -789,14 +740,10 @@ test('Selections work on fresh and edited sketch', async ({ page }) => {
   await page.getByRole('button', { name: 'Line' }).click()
 
   await u.closeDebugPanel()
-  const selectionSequence = async (isSecondTime = false) => {
+  const selectionSequence = async () => {
     await expect(page.getByTestId('hover-highlight')).not.toBeVisible()
 
-    await page.waitForTimeout(100)
+    await page.mouse.move(startXPx + PUR * 15, 500 - PUR * 10)
-    await page.mouse.move(
-      startXPx + PUR * 15,
-      isSecondTime ? 430 : 500 - PUR * 10
-    )
 
     await expect(page.getByTestId('hover-highlight')).toBeVisible()
     // bg-yellow-200 is more brittle than hover-highlight, but is closer to the user experience
@@ -806,10 +753,7 @@ test('Selections work on fresh and edited sketch', async ({ page }) => {
     // check mousing off, than mousing onto another line
     await page.mouse.move(startXPx + PUR * 10, 500 - PUR * 15) // mouse off
     await expect(page.getByTestId('hover-highlight')).not.toBeVisible()
-    await page.mouse.move(
+    await page.mouse.move(startXPx + PUR * 10, 500 - PUR * 20) // mouse onto another line
-      startXPx + PUR * 10,
-      isSecondTime ? 295 : 500 - PUR * 20
-    ) // mouse onto another line
     await expect(page.getByTestId('hover-highlight')).toBeVisible()
 
     // now check clicking works including axis
@@ -819,7 +763,6 @@ test('Selections work on fresh and edited sketch', async ({ page }) => {
     await page.keyboard.down('Shift')
     const absYButton = page.getByRole('button', { name: 'ABS Y' })
     await expect(absYButton).toBeDisabled()
-    await page.waitForTimeout(100)
     await xAxisClick()
     await page.keyboard.up('Shift')
     await absYButton.and(page.locator(':not([disabled])')).waitFor()
@@ -828,12 +771,10 @@ test('Selections work on fresh and edited sketch', async ({ page }) => {
     // clear selection by clicking on nothing
     await emptySpaceClick()
 
-    await page.waitForTimeout(100)
     // same selection but click the axis first
     await xAxisClick()
     await expect(absYButton).toBeDisabled()
     await page.keyboard.down('Shift')
-    await page.waitForTimeout(100)
     await topHorzSegmentClick()
 
     await page.keyboard.up('Shift')
@@ -846,7 +787,6 @@ test('Selections work on fresh and edited sketch', async ({ page }) => {
     await page.getByText(`  |> line([-${commonPoints.num2}, 0], %)`).click()
     await page.keyboard.down('Shift')
     await expect(absYButton).toBeDisabled()
-    await page.waitForTimeout(100)
     await xAxisClick()
     await page.keyboard.up('Shift')
     await expect(absYButton).not.toBeDisabled()
@@ -889,16 +829,11 @@ test('Selections work on fresh and edited sketch', async ({ page }) => {
   await page.waitForTimeout(100)
 
   // enter sketch again
-  await u.doAndWaitForCmd(
+  await page.getByRole('button', { name: 'Edit Sketch' }).click()
-    () => page.getByRole('button', { name: 'Edit Sketch' }).click(),
-    'default_camera_get_settings'
-  )
-  await page.waitForTimeout(150)
-
   await page.waitForTimeout(300) // wait for animation
 
   // hover again and check it works
-  await selectionSequence(true)
+  await selectionSequence()
 })
 
 test.describe('Command bar tests', () => {
@@ -1034,7 +969,6 @@ const part001 = startSketchOn('-XZ')
 })
 
 test('Can add multiple sketches', async ({ page }) => {
-  test.skip(process.platform === 'darwin', 'Can add multiple sketches')
   const u = getUtils(page)
   await page.setViewportSize({ width: 1200, height: 500 })
   const PUR = 400 / 37.5 //pixeltoUnitRatio
@@ -1085,7 +1019,6 @@ test('Can add multiple sketches', async ({ page }) => {
   |> startProfileAt(${commonPoints.startAt}, %)
   |> line([${commonPoints.num1}, 0], %)
   |> line([0, ${commonPoints.num1}], %)`)
-  await page.waitForTimeout(100)
   await page.mouse.click(startXPx, 500 - PUR * 20)
   const finalCodeFirstSketch = `const part001 = startSketchOn('-XZ')
   |> startProfileAt(${commonPoints.startAt}, %)
@@ -1101,33 +1034,24 @@ test('Can add multiple sketches', async ({ page }) => {
 
   await u.expectCmdLog('[data-message-type="execution-done"]')
 
-  await u.updateCamPosition([100, 100, 100])
+  await u.updateCamPosition([0, 100, 100])
-  await page.waitForTimeout(250)
 
   // start a new sketch
   await u.clearCommandLogs()
   await page.getByRole('button', { name: 'Start Sketch' }).click()
-  await page.waitForTimeout(400)
+  await page.waitForTimeout(100)
-  await page.mouse.click(650, 450)
+  await page.mouse.click(673, 384)
 
   await page.waitForTimeout(500) // TODO detect animation ending, or disable animation
   await u.clearAndCloseDebugPanel()
 
-  // on mock os there are issues with getting the camera to update
-  // it should not be selecting the 'XZ' plane here if the camera updated
-  // properly, but if we just role with it we can still verify everything
-  // in the rest of the test
-  const plane = process.platform === 'darwin' ? 'XZ' : 'XY'
-
-  await page.waitForTimeout(100)
   await page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10)
-  const startAt2 =
+  const startAt2 = '[0.93,-1.25]'
-    process.platform === 'darwin' ? '[9.75, -13.16]' : '[0.93, -1.25]'
   await expect(
     (await page.locator('.cm-content').innerText()).replace(/\s/g, '')
   ).toBe(
     `${finalCodeFirstSketch}
-const part002 = startSketchOn('${plane}')
+const part002 = startSketchOn('XY')
   |> startProfileAt(${startAt2}, %)`.replace(/\s/g, '')
   )
   await page.waitForTimeout(100)
@@ -1136,12 +1060,12 @@ const part002 = startSketchOn('${plane}')
   await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 10)
   await page.waitForTimeout(100)
 
-  const num2 = process.platform === 'darwin' ? 9.84 : 0.94
+  const num2 = 0.94
   await expect(
     (await page.locator('.cm-content').innerText()).replace(/\s/g, '')
   ).toBe(
     `${finalCodeFirstSketch}
-const part002 = startSketchOn('${plane}')
+const part002 = startSketchOn('XY')
   |> startProfileAt(${startAt2}, %)
   |> line([${num2}, 0], %)`.replace(/\s/g, '')
   )
@@ -1151,29 +1075,21 @@ const part002 = startSketchOn('${plane}')
     (await page.locator('.cm-content').innerText()).replace(/\s/g, '')
   ).toBe(
     `${finalCodeFirstSketch}
-const part002 = startSketchOn('${plane}')
+const part002 = startSketchOn('XY')
   |> startProfileAt(${startAt2}, %)
   |> line([${num2}, 0], %)
-  |> line([0, ${roundOff(
+  |> line([0, ${roundOff(num2 - 0.01)}], %)`.replace(/\s/g, '')
-    num2 + (process.platform === 'darwin' ? 0.01 : -0.01)
-  )}], %)`.replace(/\s/g, '')
   )
-  await page.waitForTimeout(100)
   await page.mouse.click(startXPx, 500 - PUR * 20)
   await expect(
     (await page.locator('.cm-content').innerText()).replace(/\s/g, '')
   ).toBe(
     `${finalCodeFirstSketch}
-const part002 = startSketchOn('${plane}')
+const part002 = startSketchOn('XY')
   |> startProfileAt(${startAt2}, %)
   |> line([${num2}, 0], %)
-  |> line([0, ${roundOff(
+  |> line([0, ${roundOff(num2 - 0.01)}], %)
-    num2 + (process.platform === 'darwin' ? 0.01 : -0.01)
+  |> line([-1.87, 0], %)`.replace(/\s/g, '')
-  )}], %)
-  |> line([-${process.platform === 'darwin' ? 19.59 : 1.87}, 0], %)`.replace(
-      /\s/g,
-      ''
-    )
   )
 })
 
@@ -1259,11 +1175,11 @@ const part003 = startSketchOn('-XZ')
 
 fn yohey = (pos) => {
   const part004 = startSketchOn('-XZ')
-  ${extrudeAndEditBlockedInFunction}
+    ${extrudeAndEditBlockedInFunction}
-  |> line([27.55, -1.65], %)
+    |> line([27.55, -1.65], %)
-  |> line([4.95, -10.53], %)
+    |> line([4.95, -10.53], %)
-  |> line([-20.38, -8], %)
+    |> line([-20.38, -8], %)
-  |> line([-15.79, 17.08], %)
+    |> line([-15.79, 17.08], %)
   return ''
 }
 
@@ -1377,12 +1293,10 @@ test('Deselecting line tool should mean nothing happens on click', async ({
   await expect(page.locator('.cm-content')).not.toHaveText(previousCodeContent)
   previousCodeContent = await page.locator('.cm-content').innerText()
 
-  await page.waitForTimeout(100)
   await page.mouse.click(700, 300)
   await expect(page.locator('.cm-content')).not.toHaveText(previousCodeContent)
   previousCodeContent = await page.locator('.cm-content').innerText()
 
-  await page.waitForTimeout(100)
   await page.mouse.click(750, 300)
   await expect(page.locator('.cm-content')).not.toHaveText(previousCodeContent)
   previousCodeContent = await page.locator('.cm-content').innerText()
@@ -1407,16 +1321,16 @@ test('Can edit segments by dragging their handles', async ({ page }) => {
     page.getByRole('button', { name: 'Start Sketch' })
   ).not.toBeDisabled()
 
-  const startPX = [665, 458]
+  const startPX = [652, 418]
-  const lineEndPX = [842, 458]
+  const lineEndPX = [794, 416]
-  const arcEndPX = [971, 342]
+  const arcEndPX = [893, 318]
 
   const dragPX = 30
 
   await page.getByText('startProfileAt([4.61, -14.01], %)').click()
   await expect(page.getByRole('button', { name: 'Edit Sketch' })).toBeVisible()
   await page.getByRole('button', { name: 'Edit Sketch' }).click()
-  await page.waitForTimeout(400)
+  await page.waitForTimeout(100)
   let prevContent = await page.locator('.cm-content').innerText()
 
   const step5 = { steps: 5 }
@@ -1426,7 +1340,7 @@ test('Can edit segments by dragging their handles', async ({ page }) => {
   await page.mouse.down()
   await page.mouse.move(startPX[0] + dragPX, startPX[1] - dragPX, step5)
   await page.mouse.up()
-
+  await page.waitForTimeout(100)
   await expect(page.locator('.cm-content')).not.toHaveText(prevContent)
   prevContent = await page.locator('.cm-content').innerText()
 
@@ -1454,95 +1368,92 @@ test('Can edit segments by dragging their handles', async ({ page }) => {
   // expect the code to have changed
   await expect(page.locator('.cm-content'))
     .toHaveText(`const part001 = startSketchOn('-XZ')
-  |> startProfileAt([6.44, -12.07], %)
+  |> startProfileAt([7.01, -11.79], %)
-  |> line([14.04, 2.03], %)
+  |> line([14.69, 2.73], %)
-  |> tangentialArcTo([27.19, -4.2], %)`)
+  |> tangentialArcTo([27.6, -3.25], %)`)
 })
 
-const doSnapAtDifferentScales = async (
+test('Snap to close works (at any scale)', async ({ page }) => {
-  page: any,
-  camPos: [number, number, number],
-  scale = 1,
-  fudge = 0
-) => {
   const u = getUtils(page)
   await page.setViewportSize({ width: 1200, height: 500 })
   await page.goto('/')
   await u.waitForAuthSkipAppStart()
   await u.openDebugPanel()
 
-  const code = `const part001 = startSketchOn('XZ')
-|> startProfileAt([${roundOff(scale * 87.68)}, ${roundOff(scale * 43.84)}], %)
-|> line([${roundOff(scale * 175.36)}, 0], %)
-|> line([0, -${roundOff(scale * 175.36) + fudge}], %)
-|> close(%)`
-
   await expect(
     page.getByRole('button', { name: 'Start Sketch' })
   ).not.toBeDisabled()
   await expect(page.getByRole('button', { name: 'Start Sketch' })).toBeVisible()
 
-  await u.clearCommandLogs()
+  const doSnapAtDifferentScales = async (
-  await page.getByRole('button', { name: 'Start Sketch' }).click()
+    camPos: [number, number, number],
-  await page.waitForTimeout(100)
+    expectedCode: string
+  ) => {
+    await u.clearCommandLogs()
+    await page.getByRole('button', { name: 'Start Sketch' }).click()
+    await page.waitForTimeout(100)
 
-  await u.openAndClearDebugPanel()
+    await u.openAndClearDebugPanel()
-  await u.updateCamPosition(camPos)
+    await u.updateCamPosition(camPos)
-  await u.closeDebugPanel()
+    await u.closeDebugPanel()
 
-  // select a plane
+    // select a plane
-  await page.mouse.click(700, 200)
+    await page.mouse.click(700, 200)
-  await expect(page.locator('.cm-content')).toHaveText(
+    await expect(page.locator('.cm-content')).toHaveText(
-    `const part001 = startSketchOn('XZ')`
+      `const part001 = startSketchOn('XZ')`
-  )
+    )
 
-  let prevContent = await page.locator('.cm-content').innerText()
+    let prevContent = await page.locator('.cm-content').innerText()
 
-  const pointA = [700, 200]
+    const pointA = [700, 200]
-  const pointB = [900, 200]
+    const pointB = [900, 200]
-  const pointC = [900, 400]
+    const pointC = [900, 400]
 
-  // draw three lines
+    // draw three lines
-  await page.mouse.click(pointA[0], pointA[1])
+    await page.mouse.click(pointA[0], pointA[1])
-  await page.waitForTimeout(100)
+    await page.waitForTimeout(100)
-  await expect(page.locator('.cm-content')).not.toHaveText(prevContent)
+    await expect(page.locator('.cm-content')).not.toHaveText(prevContent)
-  prevContent = await page.locator('.cm-content').innerText()
+    prevContent = await page.locator('.cm-content').innerText()
 
-  await page.mouse.click(pointB[0], pointB[1])
+    await page.mouse.click(pointB[0], pointB[1])
-  await page.waitForTimeout(100)
+    await page.waitForTimeout(100)
-  await expect(page.locator('.cm-content')).not.toHaveText(prevContent)
+    await expect(page.locator('.cm-content')).not.toHaveText(prevContent)
-  prevContent = await page.locator('.cm-content').innerText()
+    prevContent = await page.locator('.cm-content').innerText()
 
-  await page.mouse.click(pointC[0], pointC[1])
+    await page.mouse.click(pointC[0], pointC[1])
-  await page.waitForTimeout(100)
+    await page.waitForTimeout(100)
-  await expect(page.locator('.cm-content')).not.toHaveText(prevContent)
+    await expect(page.locator('.cm-content')).not.toHaveText(prevContent)
-  prevContent = await page.locator('.cm-content').innerText()
+    prevContent = await page.locator('.cm-content').innerText()
 
-  await page.mouse.move(pointA[0] - 12, pointA[1] + 12)
+    await page.mouse.move(pointA[0] - 12, pointA[1] + 12)
-  const pointNotQuiteA = [pointA[0] - 7, pointA[1] + 7]
+    const pointNotQuiteA = [pointA[0] - 7, pointA[1] + 7]
-  await page.mouse.move(pointNotQuiteA[0], pointNotQuiteA[1], { steps: 10 })
+    await page.mouse.move(pointNotQuiteA[0], pointNotQuiteA[1], { steps: 10 })
 
-  await page.mouse.click(pointNotQuiteA[0], pointNotQuiteA[1])
+    await page.mouse.click(pointNotQuiteA[0], pointNotQuiteA[1])
-  await expect(page.locator('.cm-content')).not.toHaveText(prevContent)
+    await expect(page.locator('.cm-content')).not.toHaveText(prevContent)
-  prevContent = await page.locator('.cm-content').innerText()
+    prevContent = await page.locator('.cm-content').innerText()
 
-  await expect(page.locator('.cm-content')).toHaveText(code)
+    await expect(page.locator('.cm-content')).toHaveText(expectedCode)
 
-  // exit sketch
+    // exit sketch
-  await u.openAndClearDebugPanel()
+    await u.openAndClearDebugPanel()
-  await page.getByRole('button', { name: 'Exit Sketch' }).click()
+    await page.getByRole('button', { name: 'Exit Sketch' }).click()
-  await u.expectCmdLog('[data-message-type="execution-done"]')
+    await u.expectCmdLog('[data-message-type="execution-done"]')
-  await u.removeCurrentCode()
+    await u.removeCurrentCode()
-}
+  }
 
-test.describe('Snap to close works (at any scale)', () => {
+  const codeTemplate = (
-  test('[0, 100, 100]', async ({ page }) => {
+    scale = 1,
-    await doSnapAtDifferentScales(page, [0, 100, 100], 0.01, 0.01)
+    fudge = 0
-  })
+  ) => `const part001 = startSketchOn('XZ')
+|> startProfileAt([${roundOff(scale * 87.68)}, ${roundOff(scale * 43.84)}], %)
+|> line([${roundOff(scale * 175.36)}, 0], %)
+|> line([0, -${roundOff(scale * 175.36) + fudge}], %)
+|> close(%)`
 
-  test('[0, 10000, 10000]', async ({ page }) => {
+  await doSnapAtDifferentScales([0, 100, 100], codeTemplate(0.01, 0.01))
-    await doSnapAtDifferentScales(page, [0, 10000, 10000])
+
-  })
+  await doSnapAtDifferentScales([0, 10000, 10000], codeTemplate())
 })
 
 test('Sketch on face', async ({ page }) => {
@@ -1575,46 +1486,38 @@ test('Sketch on face', async ({ page }) => {
   ).not.toBeDisabled()
 
   await page.getByRole('button', { name: 'Start Sketch' }).click()
-  await page.waitForTimeout(300)
 
   let previousCodeContent = await page.locator('.cm-content').innerText()
 
-  await u.openAndClearDebugPanel()
+  await page.mouse.click(793, 133)
-  await u.doAndWaitForCmd(
-    () => page.mouse.click(793, 133),
-    'default_camera_get_settings',
-    true
-  )
-  await page.waitForTimeout(150)
 
   const firstClickPosition = [612, 238]
   const secondClickPosition = [661, 242]
   const thirdClickPosition = [609, 267]
 
+  await page.waitForTimeout(300)
+
   await page.mouse.click(firstClickPosition[0], firstClickPosition[1])
   await expect(page.locator('.cm-content')).not.toHaveText(previousCodeContent)
   previousCodeContent = await page.locator('.cm-content').innerText()
 
-  await page.waitForTimeout(100)
   await page.mouse.click(secondClickPosition[0], secondClickPosition[1])
   await expect(page.locator('.cm-content')).not.toHaveText(previousCodeContent)
   previousCodeContent = await page.locator('.cm-content').innerText()
 
-  await page.waitForTimeout(100)
   await page.mouse.click(thirdClickPosition[0], thirdClickPosition[1])
   await expect(page.locator('.cm-content')).not.toHaveText(previousCodeContent)
   previousCodeContent = await page.locator('.cm-content').innerText()
 
-  await page.waitForTimeout(100)
   await page.mouse.click(firstClickPosition[0], firstClickPosition[1])
   await expect(page.locator('.cm-content')).not.toHaveText(previousCodeContent)
   previousCodeContent = await page.locator('.cm-content').innerText()
 
   await expect(page.locator('.cm-content'))
     .toContainText(`const part002 = startSketchOn(part001, 'seg01')
-  |> startProfileAt([-12.83, 6.7], %)
+  |> startProfileAt([1.03, 1.03], %)
-  |> line([2.87, -0.23], %)
+  |> line([4.18, -0.35], %)
-  |> line([-3.05, -1.47], %)
+  |> line([-4.44, -2.13], %)
   |> close(%)`)
 
   await u.openAndClearDebugPanel()
@@ -1624,14 +1527,9 @@ test('Sketch on face', async ({ page }) => {
   await u.updateCamPosition([1049, 239, 686])
   await u.closeDebugPanel()
 
-  await page.getByText('startProfileAt([-12.83, 6.7], %)').click()
+  await page.getByText('startProfileAt([1.03, 1.03], %)').click()
   await expect(page.getByRole('button', { name: 'Edit Sketch' })).toBeVisible()
-  await u.doAndWaitForCmd(
+  await page.getByRole('button', { name: 'Edit Sketch' }).click()
-    () => page.getByRole('button', { name: 'Edit Sketch' }).click(),
-    'default_camera_get_settings',
-    true
-  )
-  await page.waitForTimeout(150)
   await page.setViewportSize({ width: 1200, height: 1200 })
   await u.openAndClearDebugPanel()
   await u.updateCamPosition([452, -152, 1166])
@@ -1651,11 +1549,11 @@ test('Sketch on face', async ({ page }) => {
 
   await expect(page.locator('.cm-content'))
     .toContainText(`const part002 = startSketchOn(part001, 'seg01')
-|> startProfileAt([-12.83, 6.7], %)
+|> startProfileAt([1.03, 1.03], %)
-|> line([${process?.env?.CI ? 2.28 : 2.28}, -${
+|> line([${process?.env?.CI ? 2.74 : 2.93}, -${
-    process?.env?.CI ? 0.07 : 0.07
+    process?.env?.CI ? 0.24 : 0.2
   }], %)
-|> line([-3.05, -1.47], %)
+|> line([-4.44, -2.13], %)
 |> close(%)`)
 
   // exit sketch
@@ -1663,7 +1561,7 @@ test('Sketch on face', async ({ page }) => {
   await page.getByRole('button', { name: 'Exit Sketch' }).click()
   await u.expectCmdLog('[data-message-type="execution-done"]')
 
-  await page.getByText('startProfileAt([-12.83, 6.7], %)').click()
+  await page.getByText('startProfileAt([1.03, 1.03], %)').click()
 
   await expect(page.getByRole('button', { name: 'Extrude' })).not.toBeDisabled()
   await page.getByRole('button', { name: 'Extrude' }).click()
@@ -1677,91 +1575,11 @@ test('Sketch on face', async ({ page }) => {
 
   await expect(page.locator('.cm-content'))
     .toContainText(`const part002 = startSketchOn(part001, 'seg01')
-|> startProfileAt([-12.83, 6.7], %)
+|> startProfileAt([1.03, 1.03], %)
-|> line([${process?.env?.CI ? 2.28 : 2.28}, -${
+|> line([${process?.env?.CI ? 2.74 : 2.93}, -${
-    process?.env?.CI ? 0.07 : 0.07
+    process?.env?.CI ? 0.24 : 0.2
   }], %)
-|> line([-3.05, -1.47], %)
+|> line([-4.44, -2.13], %)
 |> close(%)
 |> extrude(5 + 7, %)`)
 })
-
-test('Can code mod a line length', async ({ page }) => {
-  await page.addInitScript(async () => {
-    localStorage.setItem(
-      'persistCode',
-      `const part001 = startSketchOn('XY')
-  |> startProfileAt([-10, -10], %)
-  |> line([20, 0], %)
-  |> line([0, 20], %)
-  |> xLine(-20, %)
-`
-    )
-  })
-
-  const u = getUtils(page)
-  const PUR = 400 / 37.5 //pixeltoUnitRatio
-  await page.setViewportSize({ width: 1200, height: 500 })
-  await page.goto('/')
-  await u.waitForAuthSkipAppStart()
-  await u.openDebugPanel()
-  await u.expectCmdLog('[data-message-type="execution-done"]')
-  await u.closeDebugPanel()
-
-  // Click the line of code for xLine.
-  await page.getByText(`xLine(-20, %)`).click() // TODO remove this and reinstate // await topHorzSegmentClick()
-  await page.waitForTimeout(100)
-
-  // enter sketch again
-  await page.getByRole('button', { name: 'Edit Sketch' }).click()
-  await page.waitForTimeout(350) // wait for animation
-
-  const startXPx = 500
-  await page.mouse.move(startXPx + PUR * 15, 250 - PUR * 10)
-  await page.mouse.click(615, 102)
-  await page.getByRole('button', { name: 'length', exact: true }).click()
-  await page.getByText('Add constraining value').click()
-
-  await expect(page.locator('.cm-content')).toHaveText(
-    `const length001 = 20const part001 = startSketchOn('XY')  |> startProfileAt([-10, -10], %)  |> line([20, 0], %)  |> line([0, 20], %)  |> xLine(-length001, %)`
-  )
-})
-
-test('Extrude from command bar selects extrude line after', async ({
-  page,
-}) => {
-  await page.addInitScript(async () => {
-    localStorage.setItem(
-      'persistCode',
-      `const part001 = startSketchOn('XY')
-  |> startProfileAt([-10, -10], %)
-  |> line([20, 0], %)
-  |> line([0, 20], %)
-  |> xLine(-20, %)
-  |> close(%)
-    `
-    )
-  })
-
-  const u = getUtils(page)
-  await page.setViewportSize({ width: 1200, height: 500 })
-  await page.goto('/')
-  await u.waitForAuthSkipAppStart()
-  await u.openDebugPanel()
-  await u.expectCmdLog('[data-message-type="execution-done"]')
-  await u.closeDebugPanel()
-
-  // Click the line of code for xLine.
-  await page.getByText(`close(%)`).click() // TODO remove this and reinstate // await topHorzSegmentClick()
-  await page.waitForTimeout(100)
-
-  await page.getByRole('button', { name: 'Extrude' }).click()
-  await page.waitForTimeout(100)
-  await page.keyboard.press('Enter')
-  await page.waitForTimeout(100)
-  await page.keyboard.press('Enter')
-  await page.waitForTimeout(100)
-  await expect(page.locator('.cm-activeLine')).toHaveText(
-    `  |> extrude(5 + 7, %)`
-  )
-})

e2e/playwright/snapshot-tests.spec.ts

@@ -27,16 +27,6 @@ test.beforeEach(async ({ page }) => {
       settings: TOML.stringify({ settings: TEST_SETTINGS }),
     }
   )
-
-  // Make the user avatar image always 404
-  // so we see the fallback menu icon for all snapshot tests
-  await page.route('https://lh3.googleusercontent.com/**', async (route) => {
-    await route.fulfill({
-      status: 404,
-      contentType: 'text/plain',
-      body: 'Not Found!',
-    })
-  })
 })
 
 test.setTimeout(60_000)
@@ -45,7 +35,7 @@ test('exports of each format should work', async ({ page, context }) => {
   // FYI this test doesn't work with only engine running locally
   // And you will need to have the KittyCAD CLI installed
   const u = getUtils(page)
-  await context.addInitScript(async () => {
+  await page.addInitScript(async () => {
     ;(window as any).playwrightSkipFilePicker = true
     localStorage.setItem(
       'persistCode',
@@ -89,6 +79,7 @@ const part001 = startSketchOn('-XZ')
   |> extrude(4, %)`
     )
   })
+
   await page.setViewportSize({ width: 1200, height: 500 })
   await page.goto('/')
   await u.waitForAuthSkipAppStart()
@@ -336,7 +327,10 @@ const part001 = startSketchOn('-XZ')
   }
 })
 
-const extrudeDefaultPlane = async (context: any, page: any, plane: string) => {
+test('extrude on each default plane should be stable', async ({
+  page,
+  context,
+}) => {
   await context.addInitScript(async () => {
     localStorage.setItem(
       'SETTINGS_PERSIST_KEY',
@@ -353,8 +347,8 @@ const extrudeDefaultPlane = async (context: any, page: any, plane: string) => {
       })
     )
   })
-
+  const u = getUtils(page)
-  const code = `const part001 = startSketchOn('${plane}')
+  const makeCode = (plane = 'XY') => `const part001 = startSketchOn('${plane}')
   |> startProfileAt([7.00, 4.40], %)
   |> line([6.60, -0.20], %)
   |> line([2.80, 5.00], %)
@@ -363,11 +357,9 @@ const extrudeDefaultPlane = async (context: any, page: any, plane: string) => {
   |> close(%)
   |> extrude(10.00, %)
 `
-  await page.addInitScript(async (code: string) => {
+  await context.addInitScript(async (code) => {
     localStorage.setItem('persistCode', code)
-  })
+  }, makeCode('XY'))
-
-  const u = getUtils(page)
   await page.setViewportSize({ width: 1200, height: 500 })
   await page.goto('/')
   await u.waitForAuthSkipAppStart()
@@ -377,48 +369,34 @@ const extrudeDefaultPlane = async (context: any, page: any, plane: string) => {
   await u.expectCmdLog('[data-message-type="execution-done"]')
   await u.clearAndCloseDebugPanel()
   await page.waitForTimeout(200)
-  // clear code
-  await u.removeCurrentCode()
-  await u.openAndClearDebugPanel()
-  await u.doAndWaitForImageDiff(
-    () => page.locator('.cm-content').fill(code),
-    200
-  )
-  // wait for execution done
-  await u.expectCmdLog('[data-message-type="execution-done"]')
-  await u.clearAndCloseDebugPanel()
 
-  await u.closeKclCodePanel()
+  const runSnapshotsForOtherPlanes = async (plane = 'XY') => {
-  await expect(page).toHaveScreenshot({
+    // clear code
-    maxDiffPixels: 100,
+    await u.removeCurrentCode()
-  })
+    // add makeCode('XZ')
-  await u.openKclCodePanel()
+    await u.openAndClearDebugPanel()
-}
+    await u.doAndWaitForImageDiff(
+      () => page.locator('.cm-content').fill(makeCode(plane)),
+      200
+    )
+    // wait for execution done
+    await u.expectCmdLog('[data-message-type="execution-done"]')
+    await u.clearAndCloseDebugPanel()
 
-test.describe('extrude on default planes should be stable', () => {
+    await u.closeKclCodePanel()
-  test('XY', async ({ page, context }) => {
+    await expect(page).toHaveScreenshot({
-    await extrudeDefaultPlane(context, page, 'XY')
+      maxDiffPixels: 100,
-  })
+    })
+    await u.openKclCodePanel()
+  }
+  await runSnapshotsForOtherPlanes('XY')
+  await runSnapshotsForOtherPlanes('-XY')
 
-  test('XZ', async ({ page, context }) => {
+  await runSnapshotsForOtherPlanes('XZ')
-    await extrudeDefaultPlane(context, page, 'XZ')
+  await runSnapshotsForOtherPlanes('-XZ')
-  })
 
-  test('YZ', async ({ page, context }) => {
+  await runSnapshotsForOtherPlanes('YZ')
-    await extrudeDefaultPlane(context, page, 'YZ')
+  await runSnapshotsForOtherPlanes('-YZ')
-  })
-
-  test('-XY', async ({ page, context }) => {
-    await extrudeDefaultPlane(context, page, '-XY')
-  })
-
-  test('-XZ', async ({ page, context }) => {
-    await extrudeDefaultPlane(context, page, '-XZ')
-  })
-
-  test('-YZ', async ({ page, context }) => {
-    await extrudeDefaultPlane(context, page, '-YZ')
-  })
 })
 
 test('Draft segments should look right', async ({ page, context }) => {
@@ -480,52 +458,6 @@ test('Draft segments should look right', async ({ page, context }) => {
   })
 })
 
-test('Draft rectangles should look right', async ({ page, context }) => {
-  const u = getUtils(page)
-  await page.setViewportSize({ width: 1200, height: 500 })
-  const PUR = 400 / 37.5 //pixeltoUnitRatio
-  await page.goto('/')
-  await u.waitForAuthSkipAppStart()
-  await u.openDebugPanel()
-
-  await expect(
-    page.getByRole('button', { name: 'Start Sketch' })
-  ).not.toBeDisabled()
-  await expect(page.getByRole('button', { name: 'Start Sketch' })).toBeVisible()
-
-  // click on "Start Sketch" button
-  await u.clearCommandLogs()
-  await u.doAndWaitForImageDiff(
-    () => page.getByRole('button', { name: 'Start Sketch' }).click(),
-    200
-  )
-
-  // select a plane
-  await page.mouse.click(700, 200)
-
-  await expect(page.locator('.cm-content')).toHaveText(
-    `const part001 = startSketchOn('-XZ')`
-  )
-
-  await page.waitForTimeout(300) // TODO detect animation ending, or disable animation
-  await u.closeDebugPanel()
-
-  const startXPx = 600
-
-  // Equip the rectangle tool
-  await page.getByRole('button', { name: 'Line' }).click()
-  await page.getByRole('button', { name: 'Rectangle' }).click()
-
-  // Draw the rectangle
-  await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 30)
-  await page.mouse.move(startXPx + PUR * 10, 500 - PUR * 10, { steps: 5 })
-
-  // Ensure the draft rectangle looks the same as it usually does
-  await expect(page).toHaveScreenshot({
-    maxDiffPixels: 100,
-  })
-})
-
 test.describe('Client side scene scale should match engine scale', () => {
   test('Inch scale', async ({ page }) => {
     const u = getUtils(page)

e2e/playwright/storageStates.ts

@@ -1,13 +1,12 @@
 import { SaveSettingsPayload } from 'lib/settings/settingsTypes'
 import { Themes } from 'lib/theme'
 
-export const TEST_SETTINGS_KEY = '/settings.toml'
+export const TEST_SETTINGS_KEY = '/user.toml'
 export const TEST_SETTINGS = {
   app: {
     theme: Themes.Dark,
     onboardingStatus: 'dismissed',
     projectDirectory: '',
-    enableSSAO: false,
   },
   modeling: {
     defaultUnit: 'in',
@@ -24,7 +23,7 @@ export const TEST_SETTINGS = {
 
 export const TEST_SETTINGS_ONBOARDING = {
   ...TEST_SETTINGS,
-  app: { ...TEST_SETTINGS.app, onboardingStatus: '/export' },
+  app: { ...TEST_SETTINGS.app, onboardingStatus: '/export ' },
 } satisfies Partial<SaveSettingsPayload>
 
 export const TEST_SETTINGS_CORRUPTED = {

e2e/tauri/specs/auth.e2e.ts

@@ -71,7 +71,7 @@ describe('ZMA (Tauri, Linux)', () => {
 
     // Now should be signed in
     const newFileButton = await $('[data-testid="home-new-file"]')
-    expect(await newFileButton.getText()).toEqual('New project')
+    expect(await newFileButton.getText()).toEqual('New file')
   })
 
   it('opens the settings page, checks filesystem settings, and closes the settings page', async () => {

make-release.sh

@@ -57,7 +57,7 @@ echo "New version number without 'v': $new_version_number"
 git checkout -b "cut-release-$new_version"
 
 echo "$(jq --arg v "$new_version_number" '.version=$v' package.json --indent 2)" > package.json
-echo "$(jq --arg v "$new_version_number" '.version=$v' src-tauri/tauri.conf.json --indent 2)" > src-tauri/tauri.conf.json
+echo "$(jq --arg v "$new_version_number" '.package.version=$v' src-tauri/tauri.conf.json --indent 2)" > src-tauri/tauri.conf.json
 
 git add package.json src-tauri/tauri.conf.json
 git commit -m "Cut release $new_version"

package.json

@@ -1,28 +1,27 @@
 {
   "name": "untitled-app",
-  "version": "0.19.3",
+  "version": "0.17.3",
   "private": true,
   "dependencies": {
-    "@codemirror/autocomplete": "^6.16.0",
+    "@codemirror/autocomplete": "^6.15.0",
     "@fortawesome/fontawesome-svg-core": "^6.5.2",
     "@fortawesome/free-brands-svg-icons": "^6.5.2",
     "@fortawesome/free-solid-svg-icons": "^6.4.2",
     "@fortawesome/react-fontawesome": "^0.2.0",
-    "@headlessui/react": "^1.7.19",
+    "@headlessui/react": "^1.7.18",
     "@headlessui/tailwindcss": "^0.2.0",
-    "@kittycad/lib": "^0.0.58",
+    "@iarna/toml": "^2.2.5",
+    "@kittycad/lib": "^0.0.56",
     "@lezer/javascript": "^1.4.9",
     "@open-rpc/client-js": "^1.8.1",
     "@react-hook/resize-observer": "^1.2.6",
     "@replit/codemirror-interact": "^6.3.1",
-    "@tauri-apps/api": "2.0.0-beta.8",
+    "@tauri-apps/api": "2.0.0-beta.7",
     "@tauri-apps/plugin-dialog": "^2.0.0-beta.2",
     "@tauri-apps/plugin-fs": "^2.0.0-beta.2",
     "@tauri-apps/plugin-http": "^2.0.0-beta.2",
     "@tauri-apps/plugin-os": "^2.0.0-beta.2",
-    "@tauri-apps/plugin-process": "^2.0.0-beta.2",
     "@tauri-apps/plugin-shell": "^2.0.0-beta.2",
-    "@tauri-apps/plugin-updater": "^2.0.0-beta.2",
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^15.0.2",
     "@testing-library/user-event": "^14.5.2",
@@ -56,6 +55,7 @@
     "sketch-helpers": "^0.0.4",
     "swr": "^2.2.5",
     "three": "^0.163.0",
+    "toml": "^3.0.0",
     "ts-node": "^10.9.2",
     "typescript": "^5.4.5",
     "ua-parser-js": "^1.0.37",
@@ -84,8 +84,8 @@
     "test:e2e:tauri": "E2E_TAURI_ENABLED=true TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\"}' wdio run wdio.conf.ts",
     "simpleserver:ci": "yarn pretest && http-server ./public --cors -p 3000 &",
     "simpleserver": "yarn pretest && http-server ./public --cors -p 3000",
-    "fmt": "prettier --write ./src *.ts *.json *.js ./e2e",
+    "fmt": "prettier --write ./src && prettier --write ./e2e",
-    "fmt-check": "prettier --check ./src *.ts *.json *.js ./e2e",
+    "fmt-check": "prettier --check ./src && prettier --check ./e2e",
     "build:wasm-dev": "(cd src/wasm-lib && wasm-pack build --dev --target web --out-dir pkg && cargo test -p kcl-lib export_bindings) && cp src/wasm-lib/pkg/wasm_lib_bg.wasm public && yarn fmt",
     "build:wasm": "(cd src/wasm-lib && wasm-pack build --target web --out-dir pkg && cargo test -p kcl-lib export_bindings) && cp src/wasm-lib/pkg/wasm_lib_bg.wasm public && yarn fmt",
     "build:wasm-clean": "yarn wasm-prep && yarn build:wasm",
@@ -117,8 +117,7 @@
   "devDependencies": {
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@babel/preset-env": "^7.24.3",
-    "@iarna/toml": "^2.2.5",
+    "@playwright/test": "^1.43.0",
-    "@playwright/test": "^1.43.1",
     "@tauri-apps/cli": "^2.0.0-beta.13",
     "@types/crypto-js": "^4.2.2",
     "@types/debounce-promise": "^3.1.9",
@@ -132,12 +131,11 @@
     "@types/wicg-file-system-access": "^2023.10.5",
     "@types/ws": "^8.5.10",
     "@vitejs/plugin-react": "^4.2.1",
-    "@vitest/web-worker": "^1.5.0",
     "@wdio/cli": "^8.24.3",
     "@wdio/globals": "^8.36.0",
-    "@wdio/local-runner": "^8.36.0",
+    "@wdio/local-runner": "^8.35.1",
     "@wdio/mocha-framework": "^8.36.0",
-    "@wdio/spec-reporter": "^8.36.0",
+    "@wdio/spec-reporter": "^8.32.4",
     "@xstate/cli": "^0.5.17",
     "autoprefixer": "^10.4.19",
     "eslint": "^8.57.0",
@@ -152,7 +150,7 @@
     "prettier": "^2.8.0",
     "setimmediate": "^1.0.5",
     "tailwindcss": "^3.4.1",
-    "vite": "^5.2.9",
+    "vite": "^5.2.6",
     "vite-plugin-eslint": "^1.8.1",
     "vite-plugin-package-version": "^1.1.0",
     "vite-tsconfig-paths": "^4.3.2",

playwright.config.ts

@@ -49,6 +49,8 @@ export default defineConfig({
     //   use: { ...devices['Desktop Chrome'] },
     // },
 
+
+
     /* Test against mobile viewports. */
     // {
     //   name: 'Mobile Chrome',
@@ -76,4 +78,4 @@ export default defineConfig({
     // url: 'http://127.0.0.1:3000',
     reuseExistingServer: !process.env.CI,
   },
-})
+})

src-tauri/Cargo.toml

@@ -8,27 +8,26 @@ repository = "https://github.com/KittyCAD/modeling-app"
 default-run = "app"
 edition = "2021"
 rust-version = "1.70"
+
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = { version = "2.0.0-beta.13", features = [] }
+tauri-build = { version = "2.0.0-beta.12", features = [] }
 
 [dependencies]
 anyhow = "1"
-kcl-lib = { version = "0.1.53", path = "../src/wasm-lib/kcl" }
+kittycad = "0.2.67"
-kittycad = "0.3.0"
 oauth2 = "4.4.2"
+serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 tauri = { version = "2.0.0-beta.15", features = [ "devtools", "unstable"] }
-tauri-plugin-cli = { version = "2.0.0-beta.3" }
+tauri-plugin-dialog = { version = "2.0.0-beta.0" }
-tauri-plugin-dialog = { version = "2.0.0-beta.6" }
+tauri-plugin-fs = { version = "2.0.0-beta.0" }
-tauri-plugin-fs = { version = "2.0.0-beta.6" }
+tauri-plugin-http = { version = "2.0.0-beta.0" }
-tauri-plugin-http = { version = "2.0.0-beta.6" }
+tauri-plugin-os = { version = "2.0.0-beta.0" }
-tauri-plugin-os = { version = "2.0.0-beta.2" }
+tauri-plugin-shell = { version = "2.0.0-beta.0" }
-tauri-plugin-process = { version = "2.0.0-beta.2" }
+tauri-plugin-updater = { version = "2.0.0-beta.0" }
-tauri-plugin-shell = { version = "2.0.0-beta.2" }
+tokio = { version = "1.37.0", features = ["time"] }
-tauri-plugin-updater = { version = "2.0.0-beta.4" }
-tokio = { version = "1.37.0", features = ["time", "fs"] }
 toml = "0.8.2"
 
 [features]

src-tauri/capabilities/desktop.json

@@ -7,7 +7,6 @@
     "main"
   ],
   "permissions": [
-    "cli:default",
     "path:default",
     "event:default",
     "window:default",
@@ -24,6 +23,7 @@
     "fs:allow-copy-file",
     "fs:allow-mkdir",
     "fs:allow-remove",
+    "fs:allow-remove",
     "fs:allow-rename",
     "fs:allow-exists",
     "fs:allow-stat",
@@ -77,9 +77,7 @@
     "os:allow-arch",
     "os:allow-exe-extension",
     "os:allow-locale",
-    "os:allow-hostname",
+    "os:allow-hostname"
-    "process:allow-restart",
-    "updater:default"
   ],
   "platforms": [
     "linux",