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/patternTransform2d.md

@@ -9,7 +9,7 @@ Just like patternTransform, but works on 2D sketches not 3D solids.
 
 
 ```js
-patternTransform2d(total_instances: integer, transform_function: FunctionParam, solid_set: SketchSet, use_original?: bool) -> [Sketch]
+patternTransform2d(total_instances: integer, transform_function: FunctionParam, solid_set: SketchSet) -> [Sketch]
 ```
 
 
@@ -20,7 +20,6 @@ patternTransform2d(total_instances: integer, transform_function: FunctionParam,
 | `total_instances` | `integer` |  | Yes |
 | `transform_function` | `FunctionParam` |  | Yes |
 | `solid_set` | [`SketchSet`](/docs/kcl/types/SketchSet) | A sketch or a group of sketches. | Yes |
-| `use_original` | `bool` |  | No |
 
 ### Returns
 

docs/kcl/types/ArtifactId.md

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

docs/kcl/types/CircularPattern2dData.md

@@ -20,6 +20,5 @@ Data for a circular pattern on a 2D sketch.
 | `center` |`[number, number]`| The center about which to make the pattern. This is a 2D vector. | No |
 | `arcDegrees` |`number`| The arc angle (in degrees) to place the repetitions. Must be greater than 0. | No |
 | `rotateDuplicates` |`boolean`| Whether or not to rotate the duplicates as they are copied. | No |
-| `useOriginal` |`boolean`| If the target being patterned is itself a pattern, then, should you use the original solid, or the pattern? | No |
 
 

docs/kcl/types/CircularPattern3dData.md

@@ -21,6 +21,5 @@ Data for a circular pattern on a 3D model.
 | `center` |`[number, number, number]`| The center about which to make the pattern. This is a 3D vector. | No |
 | `arcDegrees` |`number`| The arc angle (in degrees) to place the repetitions. Must be greater than 0. | No |
 | `rotateDuplicates` |`boolean`| Whether or not to rotate the duplicates as they are copied. | No |
-| `useOriginal` |`boolean`| If the target being patterned is itself a pattern, then, should you use the original solid, or the pattern? | No |
 
 

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,8 +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 |
-| `originalId` |`string`|  | 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,8 +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 |
-| `originalId` |`string`|  | 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/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

@@ -38,10 +38,7 @@ 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
@@ -67,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')
   }

e2e/playwright/fixtures/toolbarFixture.ts

@@ -20,7 +20,6 @@ export class ToolbarFixture {
   shellButton!: Locator
   revolveButton!: Locator
   offsetPlaneButton!: Locator
-  helixButton!: Locator
   startSketchBtn!: Locator
   lineBtn!: Locator
   rectangleBtn!: Locator
@@ -30,6 +29,7 @@ export class ToolbarFixture {
   createFileBtn!: Locator
   fileCreateToast!: Locator
   filePane!: Locator
+  exeIndicator!: Locator
   treeInputField!: Locator
   /** The sidebar button for the Feature Tree pane */
   featureTreeId = 'feature-tree' as const
@@ -50,7 +50,6 @@ export class ToolbarFixture {
     this.shellButton = page.getByTestId('shell')
     this.revolveButton = page.getByTestId('revolve')
     this.offsetPlaneButton = page.getByTestId('plane-offset')
-    this.helixButton = page.getByTestId('helix')
     this.startSketchBtn = page.getByTestId('sketch')
     this.lineBtn = page.getByTestId('line')
     this.rectangleBtn = page.getByTestId('corner-rectangle')
@@ -63,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)
 
@@ -141,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

@@ -27,7 +27,7 @@ test.describe('Onboarding tests', () => {
       },
       cleanProjectDir: true,
     },
-    async ({ page, homePage }) => {
+    async ({ context, page, homePage }) => {
       const u = await getUtils(page)
       await page.setBodyDimensions({ width: 1200, height: 500 })
       await homePage.goToModelingScene()
@@ -68,7 +68,7 @@ test.describe('Onboarding tests', () => {
       },
       cleanProjectDir: true,
     },
-    async ({ page }) => {
+    async ({ page, homePage }, testInfo) => {
       const u = await getUtils(page)
 
       const viewportSize = { width: 1200, height: 500 }
@@ -154,7 +154,7 @@ test.describe('Onboarding tests', () => {
   )
 
   test(
-    'Click through each onboarding step and back',
+    'Click through each onboarding step',
     {
       appSettings: {
         app: {
@@ -187,21 +187,15 @@ test.describe('Onboarding tests', () => {
       ).toBeVisible()
 
       const nextButton = page.getByTestId('onboarding-next')
-      const prevButton = page.getByTestId('onboarding-prev')
 
       while ((await nextButton.innerText()) !== 'Finish') {
         await nextButton.hover()
         await nextButton.click()
       }
 
-      while ((await prevButton.innerText()) !== 'Dismiss') {
-        await prevButton.hover()
-        await prevButton.click()
-      }
-
-      // Dismiss the onboarding
-      await prevButton.hover()
-      await prevButton.click()
+      // Finish the onboarding
+      await nextButton.hover()
+      await nextButton.click()
 
       // Test that the onboarding pane is gone
       await expect(page.getByTestId('onboarding-content')).not.toBeVisible()
@@ -275,7 +269,7 @@ test.describe('Onboarding tests', () => {
       cleanProjectDir: true,
     },
 
-    async ({ page, homePage }) => {
+    async ({ context, page, homePage }) => {
       const u = await getUtils(page)
       const badCode = `// This is bad code we shouldn't see`
 
@@ -342,10 +336,10 @@ test.describe('Onboarding tests', () => {
       await homePage.goToModelingScene()
 
       // Test that the text in this step is correct
-      const avatarLocator = page
+      const avatarLocator = await page
         .getByTestId('user-sidebar-toggle')
         .locator('img')
-      const onboardingOverlayLocator = page
+      const onboardingOverlayLocator = await page
         .getByTestId('onboarding-content')
         .locator('div')
         .nth(1)
@@ -453,7 +447,7 @@ test.fixme(
     },
     cleanProjectDir: true,
   },
-  async ({ context, page }) => {
+  async ({ context, page, homePage }, testInfo) => {
     await context.folderSetupFn(async (dir) => {
       const routerTemplateDir = join(dir, 'router-template-slate')
       await fsp.mkdir(routerTemplateDir, { recursive: true })
@@ -492,6 +486,10 @@ test.fixme(
     })
 
     await test.step('Navigate into project', async () => {
+      await page.setBodyDimensions({ width: 1200, height: 500 })
+
+      page.on('console', console.log)
+
       await expect(
         page.getByRole('heading', { name: 'Your Projects' })
       ).toBeVisible()

e2e/playwright/point-click.spec.ts

@@ -775,71 +775,6 @@ openSketch = startSketchOn('XY')
     })
   })
 
-  test('Helix point-and-click', async ({
-    context,
-    page,
-    homePage,
-    scene,
-    editor,
-    toolbar,
-    cmdBar,
-  }) => {
-    // One dumb hardcoded screen pixel value
-    const testPoint = { x: 620, y: 257 }
-    const expectedOutput = `helix001 = helix(revolutions = 1, angleStart = 360, counterClockWise = false, radius = 5, axis = 'X', length = 5)`
-
-    await homePage.goToModelingScene()
-
-    await test.step(`Look for the red of the default plane`, async () => {
-      await scene.expectPixelColor([96, 52, 52], testPoint, 15)
-    })
-    await test.step(`Go through the command bar flow`, async () => {
-      await toolbar.helixButton.click()
-      await cmdBar.expectState({
-        stage: 'arguments',
-        currentArgKey: 'revolutions',
-        currentArgValue: '1',
-        headerArguments: {
-          AngleStart: '',
-          Axis: '',
-          CounterClockWise: '',
-          Length: '',
-          Radius: '',
-          Revolutions: '',
-        },
-        highlightedHeaderArg: 'revolutions',
-        commandName: 'Helix',
-      })
-      await cmdBar.progressCmdBar()
-      await cmdBar.progressCmdBar()
-      await cmdBar.progressCmdBar()
-      await cmdBar.progressCmdBar()
-      await cmdBar.progressCmdBar()
-      await cmdBar.progressCmdBar()
-      await cmdBar.progressCmdBar()
-    })
-
-    await test.step(`Confirm code is added to the editor, scene has changed`, async () => {
-      await editor.expectEditor.toContain(expectedOutput)
-      await editor.expectState({
-        diagnostics: [],
-        activeLines: [expectedOutput],
-        highlightedCode: '',
-      })
-      // Red plane is now gone, white helix is there
-      await scene.expectPixelColor([250, 250, 250], testPoint, 15)
-    })
-
-    await test.step('Delete offset plane via feature tree selection', async () => {
-      await editor.closePane()
-      const operationButton = await toolbar.getFeatureTreeOperation('Helix', 0)
-      await operationButton.click({ button: 'left' })
-      await page.keyboard.press('Backspace')
-      // Red plane is back
-      await scene.expectPixelColor([96, 52, 52], testPoint, 15)
-    })
-  })
-
   const loftPointAndClickCases = [
     { shouldPreselect: true },
     { shouldPreselect: false },
@@ -1029,7 +964,7 @@ sketch002 = startSketchOn('XZ')
       testPoint.x - 50,
       testPoint.y
     )
-    const sweepDeclaration = 'sweep001 = sweep(sketch001, path = sketch002)'
+    const sweepDeclaration = 'sweep001 = sweep({ path = sketch002 }, sketch001)'
 
     await test.step(`Look for sketch001`, async () => {
       await toolbar.closePane('code')
@@ -1955,7 +1890,7 @@ chamfer04 = chamfer({  length = 5,  tags = [getOppositeEdge(seg02)]}, extrude001
       const testPoint = { x: 575, y: 200 }
       const [clickOnCap] = scene.makeMouseHelpers(testPoint.x, testPoint.y)
       const shellDeclaration =
-        "shell001 = shell(extrude001, faces = ['end'], thickness = 5)"
+        "shell001 = shell({ faces = ['end'], thickness = 5 }, extrude001)"
 
       await test.step(`Look for the grey of the shape`, async () => {
         await scene.expectPixelColor([127, 127, 127], testPoint, 15)
@@ -2055,7 +1990,8 @@ extrude001 = extrude(sketch001, length = 40)
     const [clickOnWall] = scene.makeMouseHelpers(testPoint.x, testPoint.y + 70)
     const mutatedCode = 'xLine(-40, %, $seg01)'
     const shellDeclaration =
-      "shell001 = shell(extrude001, faces = ['end', seg01], thickness = 5)"
+      "shell001 = shell({  faces = ['end', seg01],  thickness = 5}, extrude001)"
+    const formattedOutLastLine = '}, extrude001)'
 
     await test.step(`Look for the grey of the shape`, async () => {
       await scene.expectPixelColor([99, 99, 99], testPoint, 15)
@@ -2098,7 +2034,7 @@ extrude001 = extrude(sketch001, length = 40)
       await editor.expectEditor.toContain(shellDeclaration)
       await editor.expectState({
         diagnostics: [],
-        activeLines: [shellDeclaration],
+        activeLines: [formattedOutLastLine],
         highlightedCode: '',
       })
       await scene.expectPixelColor([49, 49, 49], testPoint, 15)
@@ -2152,8 +2088,9 @@ extrude002 = extrude(sketch002, length = 50)
       // One dumb hardcoded screen pixel value
       const testPoint = { x: 550, y: 295 }
       const [clickOnCap] = scene.makeMouseHelpers(testPoint.x, testPoint.y)
-      const shellTarget = hasExtrudesInPipe ? 'sketch002' : 'extrude002'
-      const shellDeclaration = `shell001 = shell(${shellTarget}, faces = ['end'], thickness = 5)`
+      const shellDeclaration = `shell001 = shell({ faces = ['end'], thickness = 5 }, ${
+        hasExtrudesInPipe ? 'sketch002' : 'extrude002'
+      })`
 
       await test.step(`Look for the grey of the shape`, async () => {
         await toolbar.closePane('code')
@@ -2221,7 +2158,7 @@ extrude002 = extrude(sketch002, length = 50)
 sketch002 = startSketchOn('XZ')
   |> startProfileAt([0, 0], %)
   |> xLine(-2000, %)
-sweep001 = sweep(sketch001, path = sketch002)
+sweep001 = sweep({ path = sketch002 }, sketch001)
 `
     await context.addInitScript((initialCode) => {
       localStorage.setItem('persistCode', initialCode)