Update snapshots from the upload artifact run

.github/workflows/e2e-flow-tests.yml

@@ -1,4 +1,4 @@
-name: E2E Tests
+name: E2E Flow Tests
 on:
   push:
     branches: [ main ]
@@ -33,7 +33,7 @@ jobs:
             rust:
               - 'src/wasm-lib/**'
 
-  electron:
+  flow-tests:
     timeout-minutes: 60
     name: playwright:electron:${{ matrix.os }} ${{ matrix.shardIndex }} ${{ matrix.shardTotal }}
     strategy:
@@ -46,32 +46,30 @@ jobs:
     runs-on: ${{ matrix.os }}
     needs: check-rust-changes
     steps:
-    - uses: actions/create-github-app-token@v1
-      id: app-token
-      with:
-        app-id: ${{ secrets.MODELING_APP_GH_APP_ID }}
-        private-key: ${{ secrets.MODELING_APP_GH_APP_PRIVATE_KEY }}
-        owner: ${{ github.repository_owner }}
     - uses: actions/checkout@v4
-      with:
-        token: ${{ steps.app-token.outputs.token }}
+
     - uses: actions/setup-node@v4
       with:
         node-version-file: '.nvmrc'
         cache: 'yarn'
+
     - uses: KittyCAD/action-install-cli@main
+
     - name: Install dependencies
       shell: bash
       run: yarn
+
     - name: Cache Playwright Browsers
       uses: actions/cache@v4
       with:
         path: |
           ~/.cache/ms-playwright/
         key: ${{ runner.os }}-playwright-${{ hashFiles('yarn.lock') }}
+
     - name: Install Playwright Browsers
       shell: bash
       run: yarn playwright install --with-deps
+
     - name: Download Wasm Cache
       id: download-wasm
       if: needs.check-rust-changes.outputs.rust-changed == 'false'
@@ -83,29 +81,35 @@ jobs:
         workflow: build-and-store-wasm.yml
         branch: main
         path: src/wasm-lib/pkg
+
     - name: copy wasm blob
       if: needs.check-rust-changes.outputs.rust-changed == 'false'
       shell: bash
       run: cp src/wasm-lib/pkg/wasm_lib_bg.wasm public
       continue-on-error: true
+
     - name: Setup Rust
       uses: dtolnay/rust-toolchain@stable
+
     - name: Cache Wasm (because rust diff)
       if: needs.check-rust-changes.outputs.rust-changed == 'true'
       uses: Swatinem/rust-cache@v2
       with:
         workspaces: './src/wasm-lib'
+
     - name: OR Cache Wasm (because wasm cache failed)
       if: steps.download-wasm.outcome == 'failure'
       uses: Swatinem/rust-cache@v2
       with:
         workspaces: './src/wasm-lib'
+
     - name: install good sed
       if:  ${{ startsWith(matrix.os, 'macos') }}
       shell: bash
       run: |
         brew install gnu-sed
         echo "/opt/homebrew/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH
+
     - name: Install vector
       shell: bash
       # TODO: figure out what to do with this, it's failing
@@ -123,81 +127,33 @@ jobs:
         sed -i "s#GH_ACTIONS_AXIOM_TOKEN#${{secrets.GH_ACTIONS_AXIOM_TOKEN}}#g" /tmp/vector.toml
         cat /tmp/vector.toml
         ${HOME}/.vector/bin/vector --config /tmp/vector.toml &
+
     - name: Build Wasm (because rust diff)
       if: needs.check-rust-changes.outputs.rust-changed == 'true'
       shell: bash
       run: yarn build:wasm
+
     - name: OR Build Wasm (because wasm cache failed)
       if: steps.download-wasm.outcome == 'failure'
       shell: bash
       run: yarn build:wasm
+
     - name: build web
       shell: bash
       run: yarn tronb:vite:dev
-    - name: Run ubuntu/chrome snapshots
-      if: ${{ matrix.os == 'namespace-profile-ubuntu-8-cores' && matrix.shardIndex == 1 }}
-      shell: bash
-      # TODO: break this in its own job, for now it's not slowing down the overall execution as ubuntu is the quickest,
-      # but we could do better. This forces a large 1/1 shard of all 20 snapshot tests that runs in about 3 minutes.
-      run: |
-        PLATFORM=web yarn playwright test --config=playwright.config.ts --retries="3" --update-snapshots --grep=@snapshot  --shard=1/1
-      env:
-        CI: true
-        NODE_ENV: development
-        VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
-        VITE_KC_SKIP_AUTH: true
-        token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
-        snapshottoken: ${{ secrets.KITTYCAD_API_TOKEN }}
-    - uses: actions/upload-artifact@v4
-      if: ${{ !cancelled() && (success() || failure()) }}
-      with:
-        name: playwright-report-${{ matrix.os }}-snapshot-${{ matrix.shardIndex }}-${{ github.sha }}
-        path: playwright-report/
-        include-hidden-files: true
-        retention-days: 30
-        overwrite: true
+
     - name: Clean up test-results
       if: ${{ !cancelled() && (success() || failure()) }}
       continue-on-error: true
       run: rm -r test-results
-    - name: check for changes
-      if: ${{ matrix.os == 'namespace-profile-ubuntu-8-cores' && matrix.shardIndex == 1 && github.ref != 'refs/heads/main' }}
-      shell: bash
-      id: git-check
-      run: |
-          git add e2e/playwright/snapshot-tests.spec.ts-snapshots
-          if git status | grep -q "Changes to be committed"
-          then echo "modified=true" >> $GITHUB_OUTPUT
-          else echo "modified=false" >> $GITHUB_OUTPUT
-          fi
-    - name: Commit changes, if any
-      if: steps.git-check.outputs.modified == 'true'
-      shell: bash
-      run: |
-        git add e2e/playwright/snapshot-tests.spec.ts-snapshots
-        git config --local user.email "github-actions[bot]@users.noreply.github.com"
-        git config --local user.name "github-actions[bot]"
-        git remote set-url origin https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git
-        git fetch origin
-        echo ${{ github.head_ref }}
-        git checkout ${{ github.head_ref }}
-        git commit -m "A snapshot a day keeps the bugs away! 📷🐛 (OS: ${{matrix.os}})" || true
-        git push
-        git push origin ${{ github.head_ref }}
-    # only upload artifacts if there's actually changes
-    - uses: actions/upload-artifact@v4
-      if: steps.git-check.outputs.modified == 'true'
-      with:
-        name: playwright-report-${{ matrix.os }}-${{ matrix.shardIndex }}-${{ github.sha }}
-        path: playwright-report/
-        include-hidden-files: true
-        retention-days: 30
+
     - uses: actions/download-artifact@v4
       if: ${{ !cancelled() && (success() || failure()) }}
       continue-on-error: true
       with:
         name: test-results-${{ matrix.os }}-${{ matrix.shardIndex }}-${{ github.sha }}
         path: test-results/
+
     - name: Run playwright/electron flow (with retries)
       id: retry
       if: ${{ !cancelled() && (success() || failure()) }}
@@ -211,6 +167,7 @@ jobs:
         VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
         VITE_KC_SKIP_AUTH: true
         token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
+
     - uses: actions/upload-artifact@v4
       if: always()
       with:
@@ -219,6 +176,7 @@ jobs:
         include-hidden-files: true
         retention-days: 30
         overwrite: true
+
     - uses: actions/upload-artifact@v4
       if: always()
       with:
@@ -227,4 +185,3 @@ jobs:
         include-hidden-files: true
         retention-days: 30
         overwrite: true
-

.github/workflows/e2e-snapshot-tests.yml

@@ -0,0 +1,145 @@
+name: E2E Snapshot Tests
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+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@v3
+        with:
+          filters: |
+            rust:
+              - 'src/wasm-lib/**'
+
+  snapshot-tests:
+    runs-on: ubuntu-22.04
+    needs: check-rust-changes
+    steps:
+    - uses: actions/checkout@v4
+
+    - uses: actions/setup-node@v4
+      with:
+        node-version-file: '.nvmrc'
+        cache: 'yarn'
+
+    - name: Install dependencies
+      run: yarn
+
+    - name: Cache Playwright Browsers
+      uses: actions/cache@v4
+      with:
+        path: |
+          ~/.cache/ms-playwright/
+        key: ${{ runner.os }}-playwright-${{ hashFiles('yarn.lock') }}
+
+    - name: Install Playwright Browsers
+      run: yarn playwright install --with-deps
+
+    - name: Download Wasm Cache
+      id: download-wasm
+      if: needs.check-rust-changes.outputs.rust-changed == 'false'
+      uses: dawidd6/action-download-artifact@v7
+      continue-on-error: true
+      with:
+        github_token: ${{secrets.GITHUB_TOKEN}}
+        name: wasm-bundle
+        workflow: build-and-store-wasm.yml
+        branch: main
+        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: Cache Wasm (because rust diff)
+      if: needs.check-rust-changes.outputs.rust-changed == 'true'
+      uses: Swatinem/rust-cache@v2
+      with:
+        workspaces: './src/wasm-lib'
+
+    - name: OR Cache Wasm (because wasm cache failed)
+      if: steps.download-wasm.outcome == 'failure'
+      uses: Swatinem/rust-cache@v2
+      with:
+        workspaces: './src/wasm-lib'
+
+    - name: Build Wasm (because rust diff)
+      if: needs.check-rust-changes.outputs.rust-changed == 'true'
+      run: yarn build:wasm
+
+    - name: OR Build Wasm (because wasm cache failed)
+      if: steps.download-wasm.outcome == 'failure'
+      run: yarn build:wasm
+
+    - name: build web
+      run: yarn tronb:vite:dev
+
+    - name: Run chrome snapshots
+      run: |
+        PLATFORM=web yarn playwright test --config=playwright.config.ts --retries="3" --update-snapshots --grep=@snapshot
+      env:
+        CI: true
+        NODE_ENV: development
+        VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
+        VITE_KC_SKIP_AUTH: true
+        token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
+        snapshottoken: ${{ secrets.KITTYCAD_API_TOKEN }}
+
+    - name: check for changes
+      id: git-check
+      run: |
+        {
+          echo 'changes<<EOF'
+          git diff --name-only e2e/playwright/snapshot-tests.spec.ts-snapshots
+          echo EOF
+        } >> "$GITHUB_OUTPUT"
+
+    # only upload artifacts if there's actually changes
+    - name: Upload changes, if any
+      if: steps.git-check.outputs.changes != ''
+      uses: actions/upload-artifact@v4
+      with:
+        name: playwright-snapshots-${{ runner.os }}-${{ github.sha }}
+        path: ${{ steps.git-check.outputs.changes }}
+
+    - name: Upload report, if any
+      uses: actions/upload-artifact@v4
+      if: steps.git-check.outputs.changes != ''
+      with:
+        name: playwright-report-${{ runner.os }}-${{ github.sha }}
+        path: playwright-report/
+        include-hidden-files: true
+        retention-days: 30
+
+    - name: Fail the run if we have snapshot updates
+      if: steps.git-check.outputs.changes != ''
+      run: exit 1
+
+    # TODO: check if we could comment on the PR as well

docs/kcl/types/ArtifactId.md

@@ -1,15 +0,0 @@
----
-title: "ArtifactId"
-excerpt: ""
-layout: manual
----
-
-
-**Type:** `string` (`uuid`)
-
-
-
-
-
-
-

docs/kcl/types/Face.md

@@ -17,7 +17,6 @@ A face.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `id` |`string`| The id of the face. | No |
-| `artifactId` |[`ArtifactId`](/docs/kcl/types/ArtifactId)| The artifact ID. | No |
 | `value` |`string`| The tag of the face. | No |
 | `xAxis` |[`Point3d`](/docs/kcl/types/Point3d)| What should the face’s X axis be? | No |
 | `yAxis` |[`Point3d`](/docs/kcl/types/Point3d)| What should the face’s Y axis be? | No |

docs/kcl/types/Helix.md

@@ -17,7 +17,6 @@ A helix.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `value` |`string`| The id of the helix. | No |
-| `artifactId` |[`ArtifactId`](/docs/kcl/types/ArtifactId)| The artifact ID. | No |
 | `revolutions` |`number`| Number of revolutions. | No |
 | `angleStart` |`number`| Start angle (in degrees). | No |
 | `ccw` |`boolean`| Is the helix rotation counter clockwise? | No |

docs/kcl/types/HelixData.md

@@ -0,0 +1,26 @@
+---
+title: "HelixData"
+excerpt: "Data for a helix."
+layout: manual
+---
+
+Data for a helix.
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `revolutions` |`number`| Number of revolutions. | No |
+| `angleStart` |`number`| Start angle (in degrees). | No |
+| `ccw` |`boolean`| Is the helix rotation counter clockwise? The default is `false`. | No |
+| `length` |`number`| Length of the helix. This is not necessary if the helix is created around an edge. If not given the length of the edge is used. | No |
+| `radius` |`number`| Radius of the helix. | No |
+| `axis` |[`Axis3dOrEdgeReference`](/docs/kcl/types/Axis3dOrEdgeReference)| Axis to use as mirror. | No |
+
+

docs/kcl/types/HelixValue.md

@@ -17,7 +17,6 @@ A helix.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `value` |`string`| The id of the helix. | No |
-| `artifactId` |[`ArtifactId`](/docs/kcl/types/ArtifactId)| The artifact ID. | No |
 | `revolutions` |`number`| Number of revolutions. | No |
 | `angleStart` |`number`| Start angle (in degrees). | No |
 | `ccw` |`boolean`| Is the helix rotation counter clockwise? | No |

docs/kcl/types/Plane.md

@@ -17,7 +17,6 @@ A plane.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `id` |`string`| The id of the plane. | No |
-| `artifactId` |[`ArtifactId`](/docs/kcl/types/ArtifactId)| The artifact ID. | No |
 | `value` |[`PlaneType`](/docs/kcl/types/PlaneType)| A plane. | No |
 | `origin` |[`Point3d`](/docs/kcl/types/Point3d)| Origin of the plane. | No |
 | `xAxis` |[`Point3d`](/docs/kcl/types/Point3d)| What should the plane’s X axis be? | No |

docs/kcl/types/Sketch.md

@@ -21,7 +21,6 @@ A sketch is a collection of paths.
 | `on` |[`SketchSurface`](/docs/kcl/types/SketchSurface)| What the sketch is on (can be a plane or a face). | No |
 | `start` |[`BasePath`](/docs/kcl/types/BasePath)| The starting path. | No |
 | `tags` |`object`| Tag identifiers that have been declared in this sketch. | No |
-| `artifactId` |[`ArtifactId`](/docs/kcl/types/ArtifactId)| The original id of the sketch. This stays the same even if the sketch is is sketched on face etc. | No |
 | `units` |[`UnitLen`](/docs/kcl/types/UnitLen)| A sketch is a collection of paths. | No |
 | `__meta` |`[` [`Metadata`](/docs/kcl/types/Metadata) `]`| Metadata. | No |
 

docs/kcl/types/SketchSet.md

@@ -30,7 +30,6 @@ A sketch is a collection of paths.
 | `on` |[`SketchSurface`](/docs/kcl/types/SketchSurface)| What the sketch is on (can be a plane or a face). | No |
 | `start` |[`BasePath`](/docs/kcl/types/BasePath)| The starting path. | No |
 | `tags` |`object`| Tag identifiers that have been declared in this sketch. | No |
-| `artifactId` |[`ArtifactId`](/docs/kcl/types/ArtifactId)| The original id of the sketch. This stays the same even if the sketch is is sketched on face etc. | No |
 | `units` |[`UnitLen`](/docs/kcl/types/UnitLen)| A sketch or a group of sketches. | No |
 | `__meta` |`[` [`Metadata`](/docs/kcl/types/Metadata) `]`| Metadata. | No |
 

docs/kcl/types/SketchSurface.md

@@ -26,7 +26,6 @@ A plane.
 |----------|------|-------------|----------|
 | `type` |enum: `plane`|  | No |
 | `id` |`string`| The id of the plane. | No |
-| `artifactId` |[`ArtifactId`](/docs/kcl/types/ArtifactId)| The artifact ID. | No |
 | `value` |[`PlaneType`](/docs/kcl/types/PlaneType)| A sketch type. | No |
 | `origin` |[`Point3d`](/docs/kcl/types/Point3d)| Origin of the plane. | No |
 | `xAxis` |[`Point3d`](/docs/kcl/types/Point3d)| What should the plane’s X axis be? | No |
@@ -51,7 +50,6 @@ A face.
 |----------|------|-------------|----------|
 | `type` |enum: `face`|  | No |
 | `id` |`string`| The id of the face. | No |
-| `artifactId` |[`ArtifactId`](/docs/kcl/types/ArtifactId)| The artifact ID. | No |
 | `value` |`string`| The tag of the face. | No |
 | `xAxis` |[`Point3d`](/docs/kcl/types/Point3d)| What should the face’s X axis be? | No |
 | `yAxis` |[`Point3d`](/docs/kcl/types/Point3d)| What should the face’s Y axis be? | No |

docs/kcl/types/Solid.md

@@ -17,7 +17,6 @@ An solid is a collection of extrude surfaces.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `id` |`string`| The id of the solid. | No |
-| `artifactId` |[`ArtifactId`](/docs/kcl/types/ArtifactId)| The artifact ID of the solid.  Unlike `id`, this doesn't change. | No |
 | `value` |`[` [`ExtrudeSurface`](/docs/kcl/types/ExtrudeSurface) `]`| The extrude surfaces. | No |
 | `sketch` |[`Sketch`](/docs/kcl/types/Sketch)| The sketch. | No |
 | `height` |`number`| The height of the solid. | No |

docs/kcl/types/SolidSet.md

@@ -26,7 +26,6 @@ An solid is a collection of extrude surfaces.
 |----------|------|-------------|----------|
 | `type` |enum: `solid`|  | No |
 | `id` |`string`| The id of the solid. | No |
-| `artifactId` |[`ArtifactId`](/docs/kcl/types/ArtifactId)| The artifact ID of the solid.  Unlike `id`, this doesn't change. | No |
 | `value` |`[` [`ExtrudeSurface`](/docs/kcl/types/ExtrudeSurface) `]`| The extrude surfaces. | No |
 | `sketch` |[`Sketch`](/docs/kcl/types/Sketch)| The sketch. | No |
 | `height` |`number`| The height of the solid. | No |

e2e/playwright/basic-sketch.spec.ts

@@ -54,26 +54,23 @@ async function doBasicSketch(
   const startXPx = 600
   await page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10)
   if (openPanes.includes('code')) {
-    await expect(u.codeLocator).toContainText(
-      `sketch001 = startSketchOn('XZ')profile001 = startProfileAt(${commonPoints.startAt}, sketch001)`
-    )
+    await expect(u.codeLocator).toHaveText(`sketch001 = startSketchOn('XZ')
+  |> startProfileAt(${commonPoints.startAt}, %)`)
   }
   await page.waitForTimeout(500)
   await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 10)
   await page.waitForTimeout(500)
 
   if (openPanes.includes('code')) {
-    await expect(u.codeLocator)
-      .toHaveText(`sketch001 = startSketchOn('XZ')profile001 = startProfileAt(${commonPoints.startAt}, sketch001)
+    await expect(u.codeLocator).toHaveText(`sketch001 = startSketchOn('XZ')
+  |> startProfileAt(${commonPoints.startAt}, %)
   |> xLine(${commonPoints.num1}, %)`)
   }
   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')profile001 = startProfileAt(${
-      commonPoints.startAt
-    }, sketch001)
+    await expect(u.codeLocator).toHaveText(`sketch001 = startSketchOn('XZ')
+  |> startProfileAt(${commonPoints.startAt}, %)
   |> xLine(${commonPoints.num1}, %)
   |> yLine(${commonPoints.num1 + 0.01}, %)`)
   } else {
@@ -82,10 +79,8 @@ async function doBasicSketch(
   await page.waitForTimeout(200)
   await page.mouse.click(startXPx, 500 - PUR * 20)
   if (openPanes.includes('code')) {
-    await expect(u.codeLocator)
-      .toHaveText(`sketch001 = startSketchOn('XZ')profile001 = startProfileAt(${
-      commonPoints.startAt
-    }, sketch001)
+    await expect(u.codeLocator).toHaveText(`sketch001 = startSketchOn('XZ')
+  |> startProfileAt(${commonPoints.startAt}, %)
   |> xLine(${commonPoints.num1}, %)
   |> yLine(${commonPoints.num1 + 0.01}, %)
   |> xLine(${commonPoints.num2 * -1}, %)`)
@@ -142,10 +137,8 @@ async function doBasicSketch(
 
   // Open the code pane.
   await u.openKclCodePanel()
-  await expect(u.codeLocator)
-    .toHaveText(`sketch001 = startSketchOn('XZ')profile001 = startProfileAt(${
-    commonPoints.startAt
-  }, sketch001)
+  await expect(u.codeLocator).toHaveText(`sketch001 = startSketchOn('XZ')
+  |> startProfileAt(${commonPoints.startAt}, %)
   |> xLine(${commonPoints.num1}, %, $seg01)
   |> yLine(${commonPoints.num1 + 0.01}, %)
   |> xLine(-segLen(seg01), %)`)

e2e/playwright/can-create-sketches-on-all-planes-and-their-back-sides.spec.ts

@@ -41,7 +41,8 @@ test.describe(
         },
       }
 
-      const code = `sketch001 = startSketchOn('${plane}')profile001 = startProfileAt([0.9, -1.22], sketch001)`
+      const code = `sketch001 = startSketchOn('${plane}')
+    |> startProfileAt([0.9, -1.22], %)`
 
       await u.openDebugPanel()
 

e2e/playwright/code-pane-and-errors.spec.ts

@@ -301,7 +301,7 @@ test(
   }
 )
 
-test.skip(
+test(
   'external change of file contents are reflected in editor',
   { tag: '@electron' },
   async ({ context, page }, testInfo) => {

e2e/playwright/feature-tree-pane.spec.ts

@@ -35,30 +35,6 @@ sketch002 = startSketchOn(plane001)
 extrude001 = extrude(sketch002, length = 10)
 `
 
-const FEAUTRE_TREE_SKETCH_CODE = `sketch001 = startSketchOn('XZ')
-  |> startProfileAt([0, 0], %)
-  |> angledLine([0, 4], %, $rectangleSegmentA001)
-  |> angledLine([
-       segAng(rectangleSegmentA001) - 90,
-       2
-     ], %, $rectangleSegmentB001)
-  |> angledLine([
-       segAng(rectangleSegmentA001),
-       -segLen(rectangleSegmentA001)
-     ], %, $rectangleSegmentC001)
-  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-  |> close(%)
-extrude001 = extrude(sketch001, length = 10)
-sketch002 = startSketchOn(extrude001, rectangleSegmentB001)
-  |> circle({
-       center = [-1, 2],
-       radius = .5
-     }, %)
-plane001 = offsetPlane('XZ', -5)
-sketch003 = startSketchOn(plane001)
-  |> circle({ center = [0, 0], radius = 5 }, %)
-`
-
 test.describe('Feature Tree pane', () => {
   test(
     'User can go to definition and go to function definition',
@@ -148,267 +124,4 @@ test.describe('Feature Tree pane', () => {
       })
     }
   )
-
-  test(
-    `User can edit sketch (but not on offset plane yet) from the feature tree`,
-    { tag: '@electron' },
-    async ({ context, homePage, scene, editor, toolbar, page }) => {
-      const unavailableToastMessage = page.getByText(
-        'Editing sketches on faces or offset planes through the feature tree is not yet supported'
-      )
-
-      await context.folderSetupFn(async (dir) => {
-        const bracketDir = join(dir, 'test-sample')
-        await fsp.mkdir(bracketDir, { recursive: true })
-        await fsp.writeFile(
-          join(bracketDir, 'main.kcl'),
-          FEAUTRE_TREE_SKETCH_CODE,
-          'utf-8'
-        )
-      })
-
-      await test.step('setup test', async () => {
-        await homePage.expectState({
-          projectCards: [
-            {
-              title: 'test-sample',
-              fileCount: 1,
-            },
-          ],
-          sortBy: 'last-modified-desc',
-        })
-        await homePage.openProject('test-sample')
-        await scene.waitForExecutionDone()
-        await toolbar.openFeatureTreePane()
-      })
-
-      await test.step('On a default plane should work', async () => {
-        await (await toolbar.getFeatureTreeOperation('Sketch', 0)).dblclick()
-        await expect(
-          toolbar.exitSketchBtn,
-          'We should be in sketch mode now'
-        ).toBeVisible()
-        await editor.expectState({
-          highlightedCode: '',
-          diagnostics: [],
-          activeLines: ["sketch001 = startSketchOn('XZ')"],
-        })
-        await toolbar.exitSketchBtn.click()
-      })
-
-      await test.step('On an extrude face should *not* work', async () => {
-        // Tooltip is getting in the way of clicking, so I'm first closing the pane
-        await toolbar.closeFeatureTreePane()
-        await (await toolbar.getFeatureTreeOperation('Sketch', 1)).dblclick()
-        await expect(
-          unavailableToastMessage,
-          'We should see a toast message about this'
-        ).toBeVisible()
-        await unavailableToastMessage.waitFor({ state: 'detached' })
-        // TODO - turn on once we update the artifactGraph in Rust
-        // to include the proper source location for the extrude face
-        // await expect(
-        //   toolbar.exitSketchBtn,
-        //   'We should be in sketch mode now'
-        // ).toBeVisible()
-        // await editor.expectState({
-        //   highlightedCode: '',
-        //   diagnostics: [],
-        //   activeLines: ['|>circle({center=[-1,2],radius=.5},%)'],
-        // })
-        // await toolbar.exitSketchBtn.click()
-      })
-
-      await test.step('On an offset plane should *not* work', async () => {
-        // Tooltip is getting in the way of clicking, so I'm first closing the pane
-        await toolbar.closeFeatureTreePane()
-        await (await toolbar.getFeatureTreeOperation('Sketch', 2)).dblclick()
-        await editor.expectState({
-          highlightedCode: '',
-          diagnostics: [],
-          activeLines: ['|>circle({center=[0,0],radius=5},%)'],
-        })
-        await expect(
-          toolbar.exitSketchBtn,
-          'We should not be in sketch mode now'
-        ).not.toBeVisible()
-        await expect(
-          page.getByText(
-            'Editing sketches on faces or offset planes through the feature tree is not yet supported'
-          ),
-          'We should see a toast message about this'
-        ).toBeVisible()
-      })
-    }
-  )
-  test(`User can edit an extrude operation from the feature tree`, async ({
-    context,
-    homePage,
-    scene,
-    editor,
-    toolbar,
-    cmdBar,
-    page,
-  }) => {
-    const initialInput = '23'
-    const initialCode = `sketch001 = startSketchOn('XZ')
-      |> circle({ center = [0, 0], radius = 5 }, %)
-      renamedExtrude = extrude(sketch001, length = ${initialInput})`
-    const newConstantName = 'distance001'
-    const expectedCode = `sketch001 = startSketchOn('XZ')
-      |> circle({ center = [0, 0], radius = 5 }, %)
-      ${newConstantName} = 23
-      renamedExtrude = extrude(sketch001, length = ${newConstantName})`
-
-    await context.folderSetupFn(async (dir) => {
-      const testDir = join(dir, 'test-sample')
-      await fsp.mkdir(testDir, { recursive: true })
-      await fsp.writeFile(join(testDir, 'main.kcl'), initialCode, 'utf-8')
-    })
-
-    await test.step('setup test', async () => {
-      await homePage.expectState({
-        projectCards: [
-          {
-            title: 'test-sample',
-            fileCount: 1,
-          },
-        ],
-        sortBy: 'last-modified-desc',
-      })
-      await homePage.openProject('test-sample')
-      await scene.waitForExecutionDone()
-      await toolbar.openFeatureTreePane()
-    })
-
-    await test.step('Double click on the extrude operation', async () => {
-      await (await toolbar.getFeatureTreeOperation('Extrude', 0))
-        .first()
-        .dblclick()
-      await editor.expectState({
-        highlightedCode: '',
-        diagnostics: [],
-        activeLines: [
-          `renamedExtrude = extrude(sketch001, length = ${initialInput})`,
-        ],
-      })
-      await cmdBar.expectState({
-        commandName: 'Extrude',
-        stage: 'arguments',
-        currentArgKey: 'distance',
-        currentArgValue: initialInput,
-        headerArguments: {
-          Selection: '1 face',
-          Distance: initialInput,
-        },
-        highlightedHeaderArg: 'distance',
-      })
-    })
-
-    await test.step('Add a named constant for distance argument and submit', async () => {
-      await expect(cmdBar.currentArgumentInput).toBeVisible()
-      const addVariableButton = page.getByRole('button', {
-        name: 'Create new variable',
-      })
-      await addVariableButton.click()
-      await cmdBar.progressCmdBar()
-      await cmdBar.expectState({
-        stage: 'review',
-        headerArguments: {
-          Selection: '1 face',
-          // The calculated value is shown in the argument summary
-          Distance: initialInput,
-        },
-        commandName: 'Extrude',
-      })
-      await cmdBar.progressCmdBar()
-      await editor.expectState({
-        highlightedCode: '',
-        diagnostics: [],
-        activeLines: [
-          `renamedExtrude = extrude(sketch001, length = ${newConstantName})`,
-        ],
-      })
-      await editor.expectEditor.toContain(expectedCode, {
-        shouldNormalise: true,
-      })
-    })
-  })
-  test(`User can edit an offset plane operation from the feature tree`, async ({
-    context,
-    homePage,
-    scene,
-    editor,
-    toolbar,
-    cmdBar,
-  }) => {
-    const testCode = (value: string) => `p = offsetPlane('XY', ${value})`
-    const initialInput = '10'
-    const initialCode = testCode(initialInput)
-    const newInput = '5 + 10'
-    const expectedCode = testCode(newInput)
-    await context.folderSetupFn(async (dir) => {
-      const testDir = join(dir, 'test-sample')
-      await fsp.mkdir(testDir, { recursive: true })
-      await fsp.writeFile(join(testDir, 'main.kcl'), initialCode, 'utf-8')
-    })
-
-    await test.step('setup test', async () => {
-      await homePage.expectState({
-        projectCards: [
-          {
-            title: 'test-sample',
-            fileCount: 1,
-          },
-        ],
-        sortBy: 'last-modified-desc',
-      })
-      await homePage.openProject('test-sample')
-      await scene.waitForExecutionDone()
-      await toolbar.openFeatureTreePane()
-    })
-
-    await test.step('Double click on the offset plane operation', async () => {
-      await (await toolbar.getFeatureTreeOperation('Offset Plane', 0))
-        .first()
-        .dblclick()
-      await editor.expectState({
-        highlightedCode: '',
-        diagnostics: [],
-        activeLines: [initialCode],
-      })
-      await cmdBar.expectState({
-        commandName: 'Offset plane',
-        stage: 'arguments',
-        currentArgKey: 'distance',
-        currentArgValue: initialInput,
-        headerArguments: {
-          Plane: '1 plane',
-          Distance: initialInput,
-        },
-        highlightedHeaderArg: 'distance',
-      })
-    })
-
-    await test.step('Edit the distance argument and submit', async () => {
-      await expect(cmdBar.currentArgumentInput).toBeVisible()
-      await cmdBar.currentArgumentInput.locator('.cm-content').fill(newInput)
-      await cmdBar.progressCmdBar()
-      await cmdBar.expectState({
-        stage: 'review',
-        headerArguments: {
-          Plane: '1 plane',
-          // We show the calculated value in the argument summary
-          Distance: '15',
-        },
-        commandName: 'Offset plane',
-      })
-      await cmdBar.progressCmdBar()
-      await editor.expectState({
-        highlightedCode: '',
-        diagnostics: [],
-        activeLines: [expectedCode],
-      })
-    })
-  })
 })

e2e/playwright/fixtures/cmdBarFixture.ts

@@ -26,18 +26,11 @@ type CmdBarSerialised =
 export class CmdBarFixture {
   public page: Page
   cmdBarOpenBtn!: Locator
-  cmdBarElement!: Locator
 
   constructor(page: Page) {
     this.page = page
     this.cmdBarOpenBtn = page.getByTestId('command-bar-open-button')
-    this.cmdBarElement = page.getByTestId('command-bar')
   }
-
-  get currentArgumentInput() {
-    return this.page.getByTestId('cmd-bar-arg-value')
-  }
-
   reConstruct = (page: Page) => {
     this.page = page
   }

e2e/playwright/fixtures/sceneFixture.ts

@@ -9,15 +9,13 @@ import {
   sendCustomCmd,
 } from '../test-utils'
 
-type MouseParams = {
+type mouseParams = {
   pixelDiff?: number
-  shouldDbClick?: boolean
-  delay?: number
 }
-type MouseDragToParams = MouseParams & {
+type mouseDragToParams = mouseParams & {
   fromPoint: { x: number; y: number }
 }
-type MouseDragFromParams = MouseParams & {
+type mouseDragFromParams = mouseParams & {
   toPoint: { x: number; y: number }
 }
 
@@ -28,22 +26,19 @@ type SceneSerialised = {
   }
 }
 
-type ClickHandler = (clickParams?: MouseParams) => Promise<void | boolean>
-type MoveHandler = (moveParams?: MouseParams) => Promise<void | boolean>
-type DblClickHandler = (clickParams?: MouseParams) => Promise<void | boolean>
-type DragToHandler = (dragParams: MouseDragToParams) => Promise<void | boolean>
+type ClickHandler = (clickParams?: mouseParams) => Promise<void | boolean>
+type MoveHandler = (moveParams?: mouseParams) => Promise<void | boolean>
+type DblClickHandler = (clickParams?: mouseParams) => Promise<void | boolean>
+type DragToHandler = (dragParams: mouseDragToParams) => Promise<void | boolean>
 type DragFromHandler = (
-  dragParams: MouseDragFromParams
+  dragParams: mouseDragFromParams
 ) => Promise<void | boolean>
 
 export class SceneFixture {
   public page: Page
   public streamWrapper!: Locator
   public loadingIndicator!: Locator
-
-  get exeIndicator() {
-    return this.page.getByTestId('model-state-indicator-execution-done')
-  }
+  private exeIndicator!: Locator
 
   constructor(page: Page) {
     this.page = page
@@ -69,6 +64,7 @@ export class SceneFixture {
   reConstruct = (page: Page) => {
     this.page = page
 
+    this.exeIndicator = page.getByTestId('model-state-indicator-execution-done')
     this.streamWrapper = page.getByTestId('stream')
     this.loadingIndicator = this.streamWrapper.getByTestId('loading')
   }
@@ -79,26 +75,17 @@ export class SceneFixture {
     { steps }: { steps: number } = { steps: 20 }
   ): [ClickHandler, MoveHandler, DblClickHandler] =>
     [
-      (clickParams?: MouseParams) => {
+      (clickParams?: mouseParams) => {
         if (clickParams?.pixelDiff) {
           return doAndWaitForImageDiff(
             this.page,
-            () =>
-              clickParams?.shouldDbClick
-                ? this.page.mouse.dblclick(x, y, {
-                    delay: clickParams?.delay || 0,
-                  })
-                : this.page.mouse.click(x, y, {
-                    delay: clickParams?.delay || 0,
-                  }),
+            () => this.page.mouse.click(x, y),
             clickParams.pixelDiff
           )
         }
-        return clickParams?.shouldDbClick
-          ? this.page.mouse.dblclick(x, y, { delay: clickParams?.delay || 0 })
-          : this.page.mouse.click(x, y, { delay: clickParams?.delay || 0 })
+        return this.page.mouse.click(x, y)
       },
-      (moveParams?: MouseParams) => {
+      (moveParams?: mouseParams) => {
         if (moveParams?.pixelDiff) {
           return doAndWaitForImageDiff(
             this.page,
@@ -108,7 +95,7 @@ export class SceneFixture {
         }
         return this.page.mouse.move(x, y, { steps })
       },
-      (clickParams?: MouseParams) => {
+      (clickParams?: mouseParams) => {
         if (clickParams?.pixelDiff) {
           return doAndWaitForImageDiff(
             this.page,
@@ -125,7 +112,7 @@ export class SceneFixture {
     { steps }: { steps: number } = { steps: 20 }
   ): [DragToHandler, DragFromHandler] =>
     [
-      (dragToParams: MouseDragToParams) => {
+      (dragToParams: mouseDragToParams) => {
         if (dragToParams?.pixelDiff) {
           return doAndWaitForImageDiff(
             this.page,
@@ -142,7 +129,7 @@ export class SceneFixture {
           targetPosition: { x, y },
         })
       },
-      (dragFromParams: MouseDragFromParams) => {
+      (dragFromParams: mouseDragFromParams) => {
         if (dragFromParams?.pixelDiff) {
           return doAndWaitForImageDiff(
             this.page,
@@ -230,7 +217,7 @@ export class SceneFixture {
   }
 
   expectPixelColor = async (
-    colour: [number, number, number] | [number, number, number][],
+    colour: [number, number, number],
     coords: { x: number; y: number },
     diff: number
   ) => {
@@ -252,36 +239,22 @@ export class SceneFixture {
   }
 }
 
-function isColourArray(
-  colour: [number, number, number] | [number, number, number][]
-): colour is [number, number, number][] {
-  return Array.isArray(colour[0])
-}
-
 export async function expectPixelColor(
   page: Page,
-  colour: [number, number, number] | [number, number, number][],
+  colour: [number, number, number],
   coords: { x: number; y: number },
   diff: number
 ) {
   let finalValue = colour
   await expect
-    .poll(
-      async () => {
-        const pixel = (await getPixelRGBs(page)(coords, 1))[0]
-        if (!pixel) return null
-        finalValue = pixel
-        if (!isColourArray(colour)) {
-          return pixel.every(
-            (channel, index) => Math.abs(channel - colour[index]) < diff
-          )
-        }
-        return colour.some((c) =>
-          c.every((channel, index) => Math.abs(pixel[index] - channel) < diff)
-        )
-      },
-      { timeout: 10_000 }
-    )
+    .poll(async () => {
+      const pixel = (await getPixelRGBs(page)(coords, 1))[0]
+      if (!pixel) return null
+      finalValue = pixel
+      return pixel.every(
+        (channel, index) => Math.abs(channel - colour[index]) < diff
+      )
+    })
     .toBeTruthy()
     .catch((cause) => {
       throw new Error(

e2e/playwright/fixtures/toolbarFixture.ts

@@ -22,16 +22,14 @@ export class ToolbarFixture {
   offsetPlaneButton!: Locator
   startSketchBtn!: Locator
   lineBtn!: Locator
-  tangentialArcBtn!: Locator
-  circleBtn!: Locator
   rectangleBtn!: Locator
-  lengthConstraintBtn!: Locator
   exitSketchBtn!: Locator
   editSketchBtn!: Locator
   fileTreeBtn!: Locator
   createFileBtn!: Locator
   fileCreateToast!: Locator
   filePane!: Locator
+  exeIndicator!: Locator
   treeInputField!: Locator
   /** The sidebar button for the Feature Tree pane */
   featureTreeId = 'feature-tree' as const
@@ -54,10 +52,7 @@ export class ToolbarFixture {
     this.offsetPlaneButton = page.getByTestId('plane-offset')
     this.startSketchBtn = page.getByTestId('sketch')
     this.lineBtn = page.getByTestId('line')
-    this.tangentialArcBtn = page.getByTestId('tangential-arc')
-    this.circleBtn = page.getByTestId('circle-center')
     this.rectangleBtn = page.getByTestId('corner-rectangle')
-    this.lengthConstraintBtn = page.getByTestId('constraint-length')
     this.exitSketchBtn = page.getByTestId('sketch-exit')
     this.editSketchBtn = page.getByText('Edit Sketch')
     this.fileTreeBtn = page.locator('[id="files-button-holder"]')
@@ -67,16 +62,15 @@ export class ToolbarFixture {
     this.filePane = page.locator('#files-pane')
     this.featureTreePane = page.locator('#feature-tree-pane')
     this.fileCreateToast = page.getByText('Successfully created')
+    this.exeIndicator = page.getByTestId(
+      'model-state-indicator-receive-reliable'
+    )
   }
 
   get logoLink() {
     return this.page.getByTestId('app-logo')
   }
 
-  get exeIndicator() {
-    return this.page.getByTestId('model-state-indicator-receive-reliable')
-  }
-
   startSketchPlaneSelection = async () =>
     doAndWaitForImageDiff(this.page, () => this.startSketchBtn.click(), 500)
 
@@ -123,15 +117,6 @@ export class ToolbarFixture {
       await expect(this.exeIndicator).toBeVisible({ timeout: 15_000 })
     }
   }
-  selectCenterRectangle = async () => {
-    await this.page
-      .getByRole('button', { name: 'caret down Corner rectangle:' })
-      .click()
-    await expect(
-      this.page.getByTestId('dropdown-center-rectangle')
-    ).toBeVisible()
-    await this.page.getByTestId('dropdown-center-rectangle').click()
-  }
 
   async closePane(paneId: SidebarType) {
     return closePane(this.page, paneId + SIDEBAR_BUTTON_SUFFIX)
@@ -154,8 +139,7 @@ export class ToolbarFixture {
   }
 
   /**
-   * Get a specific operation button from the Feature Tree pane.
-   * Index is 0-based.
+   * Get a specific operation button from the Feature Tree pane
    */
   async getFeatureTreeOperation(operationName: string, operationIndex: number) {
     await this.openFeatureTreePane()

e2e/playwright/onboarding-tests.spec.ts

@@ -437,7 +437,7 @@ test.describe('Onboarding tests', () => {
   )
 })
 
-test(
+test.fixme(
   'Restarting onboarding on desktop takes one attempt',
   {
     appSettings: {
@@ -514,7 +514,10 @@ test(
       const modelColor: [number, number, number] = [76, 76, 76]
 
       await page.mouse.move(XYPlanePoint.x, XYPlanePoint.y)
+      await expectPixelColor(page, modelColor, XYPlanePoint, 8)
       await tutorialDismissButton.click()
+      // Make sure model still there.
+      await expectPixelColor(page, modelColor, XYPlanePoint, 8)
     })
 
     await test.step('Clear code and restart onboarding from settings', async () => {

e2e/playwright/point-click.spec.ts

@@ -216,13 +216,18 @@ test.describe('Point-and-click tests', { tag: ['@skipWin'] }, () => {
 
         afterChamferSelectSnippet:
           'sketch002 = startSketchOn(extrude001, seg03)',
-        afterRectangle1stClickSnippet:
-          'startProfileAt([205.96, 254.59], sketch002)',
-        afterRectangle2ndClickSnippet: `angledLine([0,11.39],%,$rectangleSegmentA002)
-        |>angledLine([segAng(rectangleSegmentA002)-90,105.26],%)
-        |>angledLine([segAng(rectangleSegmentA002),-segLen(rectangleSegmentA002)],%)
-        |>line(endAbsolute=[profileStartX(%),profileStartY(%)],%)
-        |>close(%)`,
+        afterRectangle1stClickSnippet: 'startProfileAt([205.96, 254.59], %)',
+        afterRectangle2ndClickSnippet: `angledLine([0, 11.39], %, $rectangleSegmentA002)
+    |> angledLine([
+         segAng(rectangleSegmentA002) - 90,
+         105.26
+       ], %, $rectangleSegmentB001)
+    |> angledLine([
+         segAng(rectangleSegmentA002),
+         -segLen(rectangleSegmentA002)
+       ], %, $rectangleSegmentC001)
+    |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+    |> close()`,
       })
 
       await sketchOnAChamfer({
@@ -243,15 +248,19 @@ test.describe('Point-and-click tests', { tag: ['@skipWin'] }, () => {
 
         afterChamferSelectSnippet:
           'sketch003 = startSketchOn(extrude001, seg04)',
-        afterRectangle1stClickSnippet:
-          'startProfileAt([-209.64, 255.28], sketch003)',
-        afterRectangle2ndClickSnippet: `angledLine([0,11.56],%,$rectangleSegmentA003)
-        |>angledLine([segAng(rectangleSegmentA003)-90,106.84],%)
-        |>angledLine([segAng(rectangleSegmentA003),-segLen(rectangleSegmentA003)],%)
-        |>line(endAbsolute=[profileStartX(%),profileStartY(%)],%)
-        |>close(%)`,
+        afterRectangle1stClickSnippet: 'startProfileAt([-209.64, 255.28], %)',
+        afterRectangle2ndClickSnippet: `angledLine([0, 11.56], %, $rectangleSegmentA003)
+    |> angledLine([
+         segAng(rectangleSegmentA003) - 90,
+         106.84
+       ], %, $rectangleSegmentB002)
+    |> angledLine([
+         segAng(rectangleSegmentA003),
+         -segLen(rectangleSegmentA003)
+       ], %, $rectangleSegmentC002)
+    |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+    |> close()`,
       })
-
       await sketchOnAChamfer({
         clickCoords: { x: 677, y: 87 },
         cameraPos: { x: -6200, y: 1500, z: 6200 },
@@ -264,14 +273,19 @@ test.describe('Point-and-click tests', { tag: ['@skipWin'] }, () => {
          ]
        }, %)`,
         afterChamferSelectSnippet:
-          'sketch004 = startSketchOn(extrude001, seg05)',
-        afterRectangle1stClickSnippet:
-          'startProfileAt([82.57, 322.96], sketch004)',
-        afterRectangle2ndClickSnippet: `angledLine([0,11.16],%,$rectangleSegmentA004)
-        |>angledLine([segAng(rectangleSegmentA004)-90,103.07],%)
-        |>angledLine([segAng(rectangleSegmentA004),-segLen(rectangleSegmentA004)],%)
-        |>line(endAbsolute=[profileStartX(%),profileStartY(%)],%)|
-        >close(%)`,
+          'sketch003 = startSketchOn(extrude001, seg04)',
+        afterRectangle1stClickSnippet: 'startProfileAt([75.8, 317.2], %)',
+        afterRectangle2ndClickSnippet: `angledLine([0, 11.56], %, $rectangleSegmentA003)
+    |> angledLine([
+         segAng(rectangleSegmentA003) - 90,
+         106.84
+       ], %, $rectangleSegmentB002)
+    |> angledLine([
+         segAng(rectangleSegmentA003),
+         -segLen(rectangleSegmentA003)
+       ], %, $rectangleSegmentC002)
+    |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+    |> close()`,
       })
       /// last one
       await sketchOnAChamfer({
@@ -284,97 +298,104 @@ test.describe('Point-and-click tests', { tag: ['@skipWin'] }, () => {
        }, %)`,
         afterChamferSelectSnippet:
           'sketch005 = startSketchOn(extrude001, seg06)',
-        afterRectangle1stClickSnippet:
-          'startProfileAt([-23.43, 19.69], sketch005)',
-        afterRectangle2ndClickSnippet: `angledLine([0,9.1],%,$rectangleSegmentA005)
-        |>angledLine([segAng(rectangleSegmentA005)-90,84.07],%)
-        |>angledLine([segAng(rectangleSegmentA005),-segLen(rectangleSegmentA005)],%)
-        |>line(endAbsolute=[profileStartX(%),profileStartY(%)],%)
-        |>close(%)`,
+        afterRectangle1stClickSnippet: 'startProfileAt([-23.43, 19.69], %)',
+        afterRectangle2ndClickSnippet: `angledLine([0, 9.1], %, $rectangleSegmentA005)
+
+    |> angledLine([
+         segAng(rectangleSegmentA005) - 90,
+         84.07
+       ], %, $rectangleSegmentB004)
+    |> angledLine([
+         segAng(rectangleSegmentA005),
+         -segLen(rectangleSegmentA005)
+       ], %, $rectangleSegmentC004)
+    |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+    |> close()`,
       })
 
       await test.step('verify at the end of the test that final code is what is expected', async () => {
         await editor.expectEditor.toContain(
           `sketch001 = startSketchOn('XZ')
-  |> startProfileAt([75.8, 317.2], %) // [$startCapTag, $EndCapTag]
-  |> angledLine([0, 268.43], %, $rectangleSegmentA001)
-  |> angledLine([
-       segAng(rectangleSegmentA001) - 90,
-       217.26
-     ], %, $seg01)
-  |> angledLine([
-       segAng(rectangleSegmentA001),
-       -segLen(rectangleSegmentA001)
-     ], %, $yo)
-  |> line(endAbsolute=[profileStartX(%), profileStartY(%)], %, $seg02)
-  |> close(%)
-extrude001 = extrude(100, sketch001)
-  |> chamfer({
-       length = 30,
-       tags = [getOppositeEdge(seg01)]
-     }, %, $seg03)
-  |> chamfer({ length = 30, tags = [seg01] }, %, $seg04)
-  |> chamfer({
-       length = 30,
-       tags = [getNextAdjacentEdge(seg02)]
-     }, %, $seg05)
-  |> chamfer({
-       length = 30,
-       tags = [getNextAdjacentEdge(yo)]
-     }, %, $seg06)
-sketch005 = startSketchOn(extrude001, seg06)
-profile004 = startProfileAt([-23.43, 19.69], sketch005)
-  |> angledLine([0, 9.1], %, $rectangleSegmentA005)
-  |> angledLine([
-       segAng(rectangleSegmentA005) - 90,
-       84.07
-     ], %)
-  |> angledLine([
-       segAng(rectangleSegmentA005),
-       -segLen(rectangleSegmentA005)
-     ], %)
-  |> line(endAbsolute=[profileStartX(%), profileStartY(%)], %)
-  |> close(%)
-sketch004 = startSketchOn(extrude001, seg05)
-profile003 = startProfileAt([82.57, 322.96], sketch004)
-  |> angledLine([0, 11.16], %, $rectangleSegmentA004)
-  |> angledLine([
-       segAng(rectangleSegmentA004) - 90,
-       103.07
-     ], %)
-  |> angledLine([
-       segAng(rectangleSegmentA004),
-       -segLen(rectangleSegmentA004)
-     ], %)
-  |> line(endAbsolute=[profileStartX(%), profileStartY(%)], %)
-  |> close(%)
-sketch003 = startSketchOn(extrude001, seg04)
-profile002 = startProfileAt([-209.64, 255.28], sketch003)
-  |> angledLine([0, 11.56], %, $rectangleSegmentA003)
-  |> angledLine([
-       segAng(rectangleSegmentA003) - 90,
-       106.84
-     ], %)
-  |> angledLine([
-       segAng(rectangleSegmentA003),
-       -segLen(rectangleSegmentA003)
-     ], %)
-  |> line(endAbsolute=[profileStartX(%), profileStartY(%)], %)
-  |> close(%)
-sketch002 = startSketchOn(extrude001, seg03)
-profile001 = startProfileAt([205.96, 254.59], sketch002)
-  |> angledLine([0, 11.39], %, $rectangleSegmentA002)
-  |> angledLine([
-       segAng(rectangleSegmentA002) - 90,
-       105.26
-     ], %)
-  |> angledLine([
-       segAng(rectangleSegmentA002),
-       -segLen(rectangleSegmentA002)
-     ], %)
-  |> line(endAbsolute=[profileStartX(%), profileStartY(%)], %)
-  |> close(%)
-`,
+
+      |> startProfileAt([75.8, 317.2], %) // [$startCapTag, $EndCapTag]
+      |> angledLine([0, 268.43], %, $rectangleSegmentA001)
+      |> angledLine([
+           segAng(rectangleSegmentA001) - 90,
+           217.26
+         ], %, $seg01)
+      |> angledLine([
+           segAng(rectangleSegmentA001),
+           -segLen(rectangleSegmentA001)
+         ], %, $yo)
+      |> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $seg02)
+      |> close()
+    extrude001 = extrude(sketch001, length = 100)
+      |> chamfer({
+           length = 30,
+           tags = [getOppositeEdge(seg01)]
+         }, %, $seg03)
+      |> chamfer({ length = 30, tags = [seg01] }, %, $seg04)
+      |> chamfer({
+           length = 30,
+           tags = [getNextAdjacentEdge(seg02)]
+         }, %, $seg05)
+      |> chamfer({
+           length = 30,
+           tags = [getNextAdjacentEdge(yo)]
+         }, %, $seg06)
+    sketch005 = startSketchOn(extrude001, seg06)
+      |> startProfileAt([-23.43,19.69], %)
+      |> angledLine([0, 9.1], %, $rectangleSegmentA005)
+      |> angledLine([
+           segAng(rectangleSegmentA005) - 90,
+           84.07
+         ], %, $rectangleSegmentB004)
+      |> angledLine([
+           segAng(rectangleSegmentA005),
+           -segLen(rectangleSegmentA005)
+         ], %, $rectangleSegmentC004)
+      |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+      |> close()
+    sketch004 = startSketchOn(extrude001, seg05)
+      |> startProfileAt([82.57,322.96], %)
+      |> angledLine([0, 11.16], %, $rectangleSegmentA004)
+      |> angledLine([
+           segAng(rectangleSegmentA004) - 90,
+           103.07
+         ], %, $rectangleSegmentB003)
+      |> angledLine([
+           segAng(rectangleSegmentA004),
+           -segLen(rectangleSegmentA004)
+         ], %, $rectangleSegmentC003)
+      |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+      |> close()
+    sketch003 = startSketchOn(extrude001, seg04)
+      |> startProfileAt([-209.64,255.28], %)
+      |> angledLine([0, 11.56], %, $rectangleSegmentA003)
+      |> angledLine([
+           segAng(rectangleSegmentA003) - 90,
+           106.84
+         ], %, $rectangleSegmentB002)
+      |> angledLine([
+           segAng(rectangleSegmentA003),
+           -segLen(rectangleSegmentA003)
+         ], %, $rectangleSegmentC002)
+      |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+      |> close()
+    sketch002 = startSketchOn(extrude001, seg03)
+      |> startProfileAt([205.96,254.59], %)
+      |> angledLine([0, 11.39], %, $rectangleSegmentA002)
+      |> angledLine([
+           segAng(rectangleSegmentA002) - 90,
+           105.26
+         ], %, $rectangleSegmentB001)
+      |> angledLine([
+           segAng(rectangleSegmentA002),
+           -segLen(rectangleSegmentA002)
+         ], %, $rectangleSegmentC001)
+      |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+      |> close()
+    `,
           { shouldNormalise: true }
         )
       })
@@ -418,13 +439,18 @@ profile001 = startProfileAt([205.96, 254.59], sketch002)
         beforeChamferSnippetEnd: '}, extrude001)',
         afterChamferSelectSnippet:
           'sketch002 = startSketchOn(extrude001, seg03)',
-        afterRectangle1stClickSnippet:
-          'startProfileAt([205.96, 254.59], sketch002)',
-        afterRectangle2ndClickSnippet: `angledLine([0,11.39],%,$rectangleSegmentA002)
-        |>angledLine([segAng(rectangleSegmentA002)-90,105.26],%)
-        |>angledLine([segAng(rectangleSegmentA002),-segLen(rectangleSegmentA002)],%)
-        |>line(endAbsolute=[profileStartX(%),profileStartY(%)],%)
-        |>close(%)`,
+        afterRectangle1stClickSnippet: 'startProfileAt([205.96, 254.59], %)',
+        afterRectangle2ndClickSnippet: `angledLine([0, 11.39], %, $rectangleSegmentA002)
+    |> angledLine([
+         segAng(rectangleSegmentA002) - 90,
+         105.26
+       ], %, $rectangleSegmentB001)
+    |> angledLine([
+         segAng(rectangleSegmentA002),
+         -segLen(rectangleSegmentA002)
+       ], %, $rectangleSegmentC001)
+    |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+    |> close()`,
       })
       await editor.expectEditor.toContain(
         `sketch001 = startSketchOn('XZ')
@@ -454,119 +480,24 @@ chamf = chamfer({
        ]
      }, %)
 sketch002 = startSketchOn(extrude001, seg03)
-profile001 = startProfileAt([205.96, 254.59], sketch002)
+  |> startProfileAt([205.96, 254.59], %)
   |> angledLine([0, 11.39], %, $rectangleSegmentA002)
   |> angledLine([
        segAng(rectangleSegmentA002) - 90,
        105.26
-     ], %)
+     ], %, $rectangleSegmentB001)
   |> angledLine([
        segAng(rectangleSegmentA002),
        -segLen(rectangleSegmentA002)
-     ], %)
-  |> line(endAbsolute=[profileStartX(%), profileStartY(%)], %)
-  |> close(%)
+     ], %, $rectangleSegmentC001)
+  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+  |> close()
 `,
         { shouldNormalise: true }
       )
     })
   })
 
-  test(`Verify axis, origin, and horizontal snapping`, async ({
-    page,
-    homePage,
-    editor,
-    toolbar,
-    scene,
-  }) => {
-    const viewPortSize = { width: 1200, height: 500 }
-
-    await page.setBodyDimensions(viewPortSize)
-
-    await homePage.goToModelingScene()
-
-    // Constants and locators
-    // These are mappings from screenspace to KCL coordinates,
-    // until we merge in our coordinate system helpers
-    const xzPlane = [
-      viewPortSize.width * 0.65,
-      viewPortSize.height * 0.3,
-    ] as const
-    const originSloppy = {
-      screen: [
-        viewPortSize.width / 2 + 3, // 3px off the center of the screen
-        viewPortSize.height / 2,
-      ],
-      kcl: [0, 0],
-    } as const
-    const xAxisSloppy = {
-      screen: [
-        viewPortSize.width * 0.75,
-        viewPortSize.height / 2 - 3, // 3px off the X-axis
-      ],
-      kcl: [20.34, 0],
-    } as const
-    const offYAxis = {
-      screen: [
-        viewPortSize.width * 0.6, // Well off the Y-axis, out of snapping range
-        viewPortSize.height * 0.3,
-      ],
-      kcl: [8.14, 6.78],
-    } as const
-    const yAxisSloppy = {
-      screen: [
-        viewPortSize.width / 2 + 5, // 5px off the Y-axis
-        viewPortSize.height * 0.3,
-      ],
-      kcl: [0, 6.78],
-    } as const
-    const [clickOnXzPlane, moveToXzPlane] = scene.makeMouseHelpers(...xzPlane)
-    const [clickOriginSloppy] = scene.makeMouseHelpers(...originSloppy.screen)
-    const [clickXAxisSloppy, moveXAxisSloppy] = scene.makeMouseHelpers(
-      ...xAxisSloppy.screen
-    )
-    const [dragToOffYAxis, dragFromOffAxis] = scene.makeDragHelpers(
-      ...offYAxis.screen
-    )
-
-    const expectedCodeSnippets = {
-      sketchOnXzPlane: `sketch001 = startSketchOn('XZ')`,
-      pointAtOrigin: `startProfileAt([${originSloppy.kcl[0]}, ${originSloppy.kcl[1]}], sketch001)`,
-      segmentOnXAxis: `xLine(${xAxisSloppy.kcl[0]}, %)`,
-      afterSegmentDraggedOffYAxis: `startProfileAt([${offYAxis.kcl[0]}, ${offYAxis.kcl[1]}], sketch001)`,
-      afterSegmentDraggedOnYAxis: `startProfileAt([${yAxisSloppy.kcl[0]}, ${yAxisSloppy.kcl[1]}], sketch001)`,
-    }
-
-    await test.step(`Start a sketch on the XZ plane`, async () => {
-      await editor.closePane()
-      await toolbar.startSketchPlaneSelection()
-      await moveToXzPlane()
-      await clickOnXzPlane()
-      // timeout wait for engine animation is unavoidable
-      await page.waitForTimeout(600)
-      await editor.expectEditor.toContain(expectedCodeSnippets.sketchOnXzPlane)
-    })
-    await test.step(`Place a point a few pixels off the middle, verify it still snaps to 0,0`, async () => {
-      await clickOriginSloppy()
-      await editor.expectEditor.toContain(expectedCodeSnippets.pointAtOrigin)
-    })
-    await test.step(`Add a segment on x-axis after moving the mouse a bit, verify it snaps`, async () => {
-      await moveXAxisSloppy()
-      await clickXAxisSloppy()
-      await editor.expectEditor.toContain(expectedCodeSnippets.segmentOnXAxis)
-    })
-    await test.step(`Unequip line tool`, async () => {
-      await toolbar.lineBtn.click()
-      await expect(toolbar.lineBtn).not.toHaveAttribute('aria-pressed', 'true')
-    })
-    await test.step(`Drag the origin point up and to the right, verify it's past snapping`, async () => {
-      await dragToOffYAxis({
-        fromPoint: { x: originSloppy.screen[0], y: originSloppy.screen[1] },
-      })
-    })
-  })
-  // yo
-
   test(`Verify axis, origin, and horizontal snapping`, async ({
     page,
     homePage,
@@ -1070,21 +1001,6 @@ sketch002 = startSketchOn('XZ')
       await cmdBar.progressCmdBar()
       await page.waitForTimeout(500)
     })
-    //   // yo
-    //   await clickOnSketch2()
-    //   await page.waitForTimeout(500)
-    //   await cmdBar.progressCmdBar()
-    //   await toolbar.openPane('code')
-    //   await page.waitForTimeout(500)
-    // })
-
-    // await test.step(`Confirm code is added to the editor, scene has changed`, async () => {
-    //   await scene.expectPixelColor([135, 64, 73], testPoint, 15)
-    //   await editor.expectEditor.toContain(sweepDeclaration)
-    //   await editor.expectState({
-    //     diagnostics: [],
-    //     activeLines: [sweepDeclaration],
-    //     highlightedCode: '',
 
     await test.step(`Confirm code is added to the editor, scene has changed`, async () => {
       await scene.expectPixelColor([135, 64, 73], testPoint, 15)