Merge branch 'main' into updater-test

* maybe use biome

* import organising

* Removed unused new fmt commands; fix to not use linter

* Don't use fmt:generated - fmt is fast, but also use Makefile for this sort of thing

---------

Co-authored-by: lee-at-zoo-corp <lee@zoo.dev>

.codespellrc

@@ -1,3 +1,3 @@
 [codespell]
 ignore-words-list: crate,everytime,inout,co-ordinate,ot,nwo,atleast,ue,afterall,ser,fromM,FromM
-skip: **/target,node_modules,build,dist,./out,**/Cargo.lock,./docs/kcl/*.md,.yarn.lock,**/yarn.lock,./openapi/*.json,./packages/codemirror-lang-kcl/test/all.test.ts,./public/kcl-samples,./rust/kcl-lib/tests/kcl_samples,tsconfig.tsbuildinfo
+skip: **/target,node_modules,build,dist,./out,**/Cargo.lock,./docs/kcl/*.md,.package-lock.json,**/package-lock.json,./openapi/*.json,./packages/codemirror-lang-kcl/test/all.test.ts,./public/kcl-samples,./rust/kcl-lib/tests/kcl_samples,tsconfig.tsbuildinfo,./src/lib/machine-api.d.ts

.github/ci-cd-scripts/playwright-electron.sh

@@ -7,11 +7,11 @@ if [[ ! -f "test-results/.last-run.json" ]]; then
     # If no last run artifact, than run Playwright normally
     echo "run playwright normally"
     if [[ "$3" == *ubuntu* ]]; then
-        xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn test:playwright:electron:ubuntu -- --shard=$1/$2 || true
+        xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run test:playwright:electron:ubuntu -- --shard=$1/$2 || true
     elif [[ "$3" == *windows* ]]; then
-        yarn test:playwright:electron:windows -- --shard=$1/$2 || true
+        npm run test:playwright:electron:windows -- --shard=$1/$2 || true
     elif [[ "$3" == *macos* ]]; then
-        yarn test:playwright:electron:macos  -- --shard=$1/$2 || true
+        npm run test:playwright:electron:macos  -- --shard=$1/$2 || true
     else
         echo "Do not run Playwright. Unable to detect os runtime."
         exit 1
@@ -31,11 +31,11 @@ while [[ $retry -le $max_retries ]]; do
             echo "retried=true" >>$GITHUB_OUTPUT
             echo "run playwright with last failed tests and retry $retry"
             if [[ "$3" == *ubuntu* ]]; then
-                xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn test:playwright:electron:ubuntu -- --last-failed || true
+                xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run test:playwright:electron:ubuntu -- --last-failed || true
             elif [[ "$3" == *windows* ]]; then
-                yarn test:playwright:electron:windows -- --last-failed || true
+                npm run test:playwright:electron:windows -- --last-failed || true
             elif [[ "$3" == *macos* ]]; then
-                yarn test:playwright:electron:macos -- --last-failed || true
+                npm run test:playwright:electron:macos -- --last-failed || true
             else
                 echo "Do not run playwright. Unable to detect os runtime."
                 exit 1

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

@@ -13,9 +13,9 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'npm'
       - name: Install dependencies
-        run: yarn
+        run: npm install
       - name: Use correct Rust toolchain
         shell: bash
         run: |
@@ -32,7 +32,7 @@ jobs:
         with:
           workspaces: rust
       - name: build wasm
-        run: yarn build:wasm
+        run: npm run build:wasm
 
 
       # Upload the WASM bundle as an artifact

.github/workflows/build-apps.yml

@@ -5,12 +5,14 @@ on:
   push:
     branches:
       - main
+      - updater-test
     tags:
       - 'v[0-9]+.[0-9]+.[0-9]+'
       - 'nightly-v[0-9]+.[0-9]+.[0-9]+'
 
 env:
-  IS_RELEASE: ${{ github.ref_type == 'tag' && startsWith(github.ref_name, 'v') }}
+  # IS_RELEASE: ${{ github.ref_type == 'tag' && startsWith(github.ref_name, 'v') }}
+  IS_RELEASE: true
   IS_NIGHTLY: ${{ github.ref_type == 'tag' && startsWith(github.ref_name, 'nightly-v') }}
 
 concurrency:
@@ -29,9 +31,9 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'npm'
 
-      - run: yarn install
+      - run: npm install
 
       - id: filter
         name: Check for Rust changes
@@ -90,20 +92,20 @@ jobs:
 
       - name: Run build:wasm
         if: ${{ steps.wasm.outputs.should-build-wasm == 'true' }}
-        run: "yarn build:wasm"
+        run: "npm run build:wasm"
 
       - name: Set nightly version, product name, release notes, and icons
         if: ${{ env.IS_NIGHTLY == 'true' }}
         run: |
           export VERSION=${GITHUB_REF_NAME#nightly-v}
-          yarn files:set-version
+          npm run files:set-version
-          yarn files:flip-to-nightly
+          npm run files:flip-to-nightly
 
-      - name: Set release version
+      # - name: Set release version
-        if: ${{ env.IS_RELEASE == 'true' }}
+      #   if: ${{ env.IS_RELEASE == 'true' }}
-        run: |
+      #   run: |
-          export VERSION=${GITHUB_REF_NAME#v}
+      #     export VERSION=${GITHUB_REF_NAME#v}
-          yarn files:set-version
+      #     npm run files:set-version
 
       - uses: actions/upload-artifact@v4
         with:
@@ -122,17 +124,17 @@ jobs:
       - id: export_notes
         run: echo "notes=`cat release-notes.md`" >> "$GITHUB_OUTPUT"
 
-      - name: Prepare electron-builder.yml file for updater test
+      # - name: Prepare electron-builder.yml file for updater test
-        if: ${{ env.IS_RELEASE == 'true' }}
+      #   if: ${{ env.IS_RELEASE == 'true' }}
-        run: |
+      #   run: |
-          yq -i '.publish[0].url = "https://dl.zoo.dev/releases/modeling-app/updater-test"' electron-builder.yml
+      #     yq -i '.publish[0].url = "https://dl.zoo.dev/releases/modeling-app/updater-test"' electron-builder.yml
 
-      - uses: actions/upload-artifact@v4
+      # - uses: actions/upload-artifact@v4
-        if: ${{ env.IS_RELEASE == 'true' }}
+      #   if: ${{ env.IS_RELEASE == 'true' }}
-        with:
+      #   with:
-          name: prepared-files-updater-test
+      #     name: prepared-files-updater-test
-          path: |
+      #     path: |
-            electron-builder.yml
+      #       electron-builder.yml
 
 
   build-apps:
@@ -172,16 +174,9 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'yarn' # Set this to npm, yarn or pnpm.
+          cache: 'npm' # Set this to npm, npm or pnpm.
 
-      - name: yarn install
+      - run: npm install
-        # Windows is picky sometimes and fails on fetch. Step takes about ~30s
-        uses: nick-fields/retry@v3.0.2
-        with:
-          shell: bash
-          timeout_minutes: 2
-          max_attempts: 3
-          command: yarn install
 
       - name: Prepare certificate and variables (Windows only)
         if: ${{ (env.IS_RELEASE == 'true' || env.IS_NIGHTLY == 'true') && matrix.os == 'windows-2022' }}
@@ -220,7 +215,7 @@ jobs:
         if: ${{ env.IS_RELEASE == 'false' && env.IS_NIGHTLY == 'false' }}
         # electron-builder doesn't have a concept of release vs debug,
         # this is just not doing any codesign or release yml generation, and points to dev infra
-        run: yarn tronb:package:dev
+        run: npm run tronb:package:dev
 
       - name: Build the app (release)
         if: ${{ env.IS_RELEASE == 'true' || env.IS_NIGHTLY == 'true' }}
@@ -233,14 +228,7 @@ jobs:
           CSC_KEY_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
           CSC_KEYCHAIN: ${{ secrets.APPLE_SIGNING_IDENTITY }}
           WINDOWS_CERTIFICATE_THUMBPRINT: ${{ secrets.WINDOWS_CERTIFICATE_THUMBPRINT }}
-          DEBUG: "electron-notarize*"
+        run: npm run tronb:package:prod
-        # TODO: Fix electron-notarize flakes. The logs above should help gather more data on failures
-        uses: nick-fields/retry@v3.0.2
-        with:
-          shell: bash
-          timeout_minutes: 10
-          max_attempts: 3
-          command: yarn tronb:package:prod
 
       - name: List artifacts in out/
         run: ls -R out
@@ -274,60 +262,53 @@ jobs:
 
       # The steps below are for updater-test builds, only on release
 
-      - uses: actions/download-artifact@v4
+      # - uses: actions/download-artifact@v4
-        if: ${{ env.IS_RELEASE == 'true' }}
+      #   if: ${{ env.IS_RELEASE == 'true' }}
-        name: prepared-files-updater-test
+      #   name: prepared-files-updater-test
 
-      - name: Copy updated electron-builder.yml file for updater test
+      # - name: Copy updated electron-builder.yml file for updater test
-        if: ${{ env.IS_RELEASE == 'true' }}
+      #   if: ${{ env.IS_RELEASE == 'true' }}
-        run: |
+      #   run: |
-          ls -R prepared-files-updater-test
+      #     ls -R prepared-files-updater-test
-          cp prepared-files-updater-test/electron-builder.yml electron-builder.yml
+      #     cp prepared-files-updater-test/electron-builder.yml electron-builder.yml
 
-      - name: Build the app (updater-test)
+      # - name: Build the app (updater-test)
-        if: ${{ env.IS_RELEASE == 'true' }}
+      #   if: ${{ env.IS_RELEASE == 'true' }}
-        env:
+      #   env:
-          APPLE_ID: ${{ secrets.APPLE_ID }}
+      #     APPLE_ID: ${{ secrets.APPLE_ID }}
-          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
+      #     APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
-          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
+      #     APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
-          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+      #     APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-          CSC_LINK: ${{ secrets.APPLE_CERTIFICATE }}
+      #     CSC_LINK: ${{ secrets.APPLE_CERTIFICATE }}
-          CSC_KEY_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+      #     CSC_KEY_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
-          CSC_KEYCHAIN: ${{ secrets.APPLE_SIGNING_IDENTITY }}
+      #     CSC_KEYCHAIN: ${{ secrets.APPLE_SIGNING_IDENTITY }}
-          WINDOWS_CERTIFICATE_THUMBPRINT: ${{ secrets.WINDOWS_CERTIFICATE_THUMBPRINT }}
+      #     WINDOWS_CERTIFICATE_THUMBPRINT: ${{ secrets.WINDOWS_CERTIFICATE_THUMBPRINT }}
-          DEBUG: "electron-notarize*"
+      #   run: npm run tronb:package:prod
-        # TODO: Fix electron-notarize flakes. The logs above should help gather more data on failures
-        uses: nick-fields/retry@v3.0.2
-        with:
-          shell: bash
-          timeout_minutes: 10
-          max_attempts: 3
-          command: yarn tronb:package:prod
 
-      - uses: actions/upload-artifact@v4
+      # - uses: actions/upload-artifact@v4
-        if: ${{ env.IS_RELEASE == 'true' }}
+      #   if: ${{ env.IS_RELEASE == 'true' }}
-        with:
+      #   with:
-          name: updater-test-arm64-${{ matrix.platform }}
+      #     name: updater-test-arm64-${{ matrix.platform }}
-          path: |
+      #     path: |
-            out/*-arm64-win.exe
+      #       out/*-arm64-win.exe
-            out/*-arm64-mac.dmg
+      #       out/*-arm64-mac.dmg
-            out/*-arm64-linux.AppImage
+      #       out/*-arm64-linux.AppImage
 
-      - uses: actions/upload-artifact@v4
+      # - uses: actions/upload-artifact@v4
-        if: ${{ env.IS_RELEASE == 'true' }}
+      #   if: ${{ env.IS_RELEASE == 'true' }}
-        with:
+      #   with:
-          name: updater-test-x64-${{ matrix.platform }}
+      #     name: updater-test-x64-${{ matrix.platform }}
-          path: |
+      #     path: |
-            out/*-x64-win.exe
+      #       out/*-x64-win.exe
-            out/*-x64-mac.dmg
+      #       out/*-x64-mac.dmg
-            out/*-x86_64-linux.AppImage
+      #       out/*-x86_64-linux.AppImage
 
 
   upload-apps-release:
     runs-on: ubuntu-22.04
     permissions:
       contents: write
-    if: ${{ github.ref_type == 'tag' }}
+    # if: ${{ github.ref_type == 'tag' }}
     env:
       VERSION_NO_V: ${{ needs.prepare-files.outputs.version }}
       VERSION: ${{ format('v{0}', needs.prepare-files.outputs.version) }}
@@ -442,16 +423,16 @@ jobs:
           export TAG="nightly-${VERSION}"
           export PREVIOUS_TAG=$(git tag --list --sort=-committerdate "nightly-v[0-9]*" | head -n2 | tail -n1)
           export NOTES=$(./scripts/get-nightly-changelog.sh)
-          yarn files:set-notes
+          npm run files:set-notes
 
       - name: Authenticate to Google Cloud
-        if: ${{ env.IS_NIGHTLY == 'true' }}
+        # if: ${{ env.IS_NIGHTLY == 'true' }}
         uses: 'google-github-actions/auth@v2.1.8'
         with:
           credentials_json: '${{ secrets.GOOGLE_CLOUD_DL_SA }}'
 
       - name: Set up Google Cloud SDK
-        if: ${{ env.IS_NIGHTLY == 'true' }}
+        # if: ${{ env.IS_NIGHTLY == 'true' }}
         uses: google-github-actions/setup-gcloud@v2.1.4
         with:
           project_id: ${{ env.GOOGLE_CLOUD_PROJECT_ID }}
@@ -465,6 +446,14 @@ jobs:
           parent: false
           destination: 'dl.kittycad.io/releases/modeling-app/nightly'
 
+      - name: Upload updater-test files to public bucket
+        uses: google-github-actions/upload-cloud-storage@v2.2.1
+        with:
+          path: out
+          glob: '*'
+          parent: false
+          destination: 'dl.kittycad.io/releases/modeling-app/updater-test'
+
       - name: Invalidate bucket cache on latest*.yml and last_download.json files
         if: ${{ env.IS_NIGHTLY == 'true' }}
-        run: yarn files:invalidate-bucket:nightly
+        run: npm run files:invalidate-bucket:nightly

.github/workflows/check-exampleKcl.yml

@@ -5,6 +5,7 @@ on:
     types: [opened, synchronize]
     paths:
       - 'src/lib/exampleKcl.ts'
+      - 'public/kcl-samples/bracket/main.kcl'
 
 permissions:
   contents: read
@@ -22,7 +23,7 @@ jobs:
         uses: actions/github-script@v7
         with:
           script: |
-            const message = '`src/lib/exampleKcl.ts` has been updated in this PR, please review and update the `src/routes/onboarding`, if needed.';
+            const message = '`public/kcl-samples/bracket/main.kcl` or `src/lib/exampleKcl.ts` has been updated in this PR, please review and update the `src/routes/onboarding`, if needed.';
             const issue_number = context.payload.pull_request.number;
             const owner = context.repo.owner;
             const repo = context.repo.repo;

.github/workflows/codemirror-lang-kcl.yml

@@ -11,7 +11,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  yarn-unit-test:
+  npm-unit-test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -19,14 +19,11 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'npm'
 
-      - run: yarn install
+      - run: npm install
-        working-directory: packages/codemirror-lang-kcl
 
-      - run: yarn tsc
+      - run: npm run tsc --workspace=packages/codemirror-lang-kcl
-        working-directory: packages/codemirror-lang-kcl
 
       - name: run unit tests
-        run: yarn test
+        run: npm run test --workspace=packages/codemirror-lang-kcl
-        working-directory: packages/codemirror-lang-kcl

.github/workflows/e2e-tests.yml

@@ -97,11 +97,11 @@ jobs:
         if: needs.conditions.outputs.should-run == 'true'
         with:
           node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'npm'
 
       - name: Install dependencies
         if: needs.conditions.outputs.should-run == 'true'
-        run: yarn
+        run: npm install
 
       - name: Download Wasm Cache
         id: download-wasm
@@ -154,7 +154,7 @@ jobs:
       - name: Build Wasm
         if: ${{ needs.conditions.outputs.should-run == 'true' && steps.wasm.outputs.should-build-wasm == 'true' }}
         shell: bash
-        run: yarn build:wasm
+        run: npm run build:wasm
 
       - uses: actions/upload-artifact@v4
         if: needs.conditions.outputs.should-run == 'true'
@@ -197,12 +197,12 @@ jobs:
         if: needs.conditions.outputs.should-run == 'true'
         with:
           node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'npm'
 
       - name: Install dependencies
         id: deps-install
         if: needs.conditions.outputs.should-run == 'true'
-        run: yarn
+        run: npm install
 
       - name: Cache Playwright Browsers
         if: needs.conditions.outputs.should-run == 'true'
@@ -210,22 +210,22 @@ jobs:
         with:
           path: |
             ~/.cache/ms-playwright/
-          key: ${{ runner.os }}-playwright-${{ hashFiles('yarn.lock') }}
+          key: ${{ runner.os }}-playwright-${{ hashFiles('package-lock.json') }}
 
       - name: Install Playwright Browsers
         if: needs.conditions.outputs.should-run == 'true'
-        run: yarn playwright install --with-deps
+        run: npm run playwright install --with-deps
 
       - name: build web
         if: needs.conditions.outputs.should-run == 'true'
-        run: yarn tronb:vite:dev
+        run: npm run tronb:vite:dev
 
       - name: Run ubuntu/chrome snapshots
         if: needs.conditions.outputs.should-run == 'true'
         uses: nick-fields/retry@v3.0.2
         with:
           shell: bash
-          command: yarn test:snapshots
+          command: npm run test:snapshots
           timeout_minutes: 30
           max_attempts: 3
         env:
@@ -321,12 +321,12 @@ jobs:
         if: needs.conditions.outputs.should-run == 'true'
         with:
           node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'npm'
 
       - name: Install dependencies
         id: deps-install
         if: needs.conditions.outputs.should-run == 'true'
-        run: yarn
+        run: npm install
 
       - name: Cache Playwright Browsers
         if: needs.conditions.outputs.should-run == 'true'
@@ -334,15 +334,15 @@ jobs:
         with:
           path: |
             ~/.cache/ms-playwright/
-          key: ${{ runner.os }}-playwright-${{ hashFiles('yarn.lock') }}
+          key: ${{ runner.os }}-playwright-${{ hashFiles('package-lock.json') }}
 
       - name: Install Playwright Browsers
         if: needs.conditions.outputs.should-run == 'true'
-        run: yarn playwright install --with-deps
+        run: npm run playwright install --with-deps
 
       - name: Build web
         if: needs.conditions.outputs.should-run == 'true'
-        run: yarn tronb:vite:dev
+        run: npm run tronb:vite:dev
 
       - name: Start Vector
         if: ${{ needs.conditions.outputs.should-run == 'true' && !contains(matrix.os, 'windows') }}

.github/workflows/generate-machine-api-types.yml

@@ -21,10 +21,10 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'npm'
-      - run: yarn install
+      - run: npm install
-      - run: yarn generate:machine-api
+      - run: npm run generate:machine-api
-      - run: yarn fmt
+      - run: npm run fmt || true
       - name: check for changes
         id: git-check
         run: |

.github/workflows/kcl-language-server.yml

@@ -56,21 +56,19 @@ jobs:
           node-version-file: ".nvmrc"
       - name: Install dependencies
         run: |
-          yarn install
+          npm install
-          cd rust/kcl-language-server
-          yarn install
       - name: Run tests
         run: |
           cd rust/kcl-language-server
-          yarn build
+          npm run build
-          yarn test-compile
+          npm run test-compile
           ls -la dist
-          xvfb-run -a yarn test
+          xvfb-run -a npm run test
         if: runner.os == 'Linux'
       - name: Run tests
         run: |
           cd rust/kcl-language-server
-          yarn test
+          npm run test
         if: runner.os != 'Linux'
   build-release:
     strategy:
@@ -183,19 +181,20 @@ jobs:
       - name: Install dependencies
         run: |
           cd rust/kcl-language-server
+          # npm will symlink which will cause issues w tarballing later
           yarn install
 
       - name: Package Extension (release)
         if: startsWith(github.event.ref, 'refs/tags/')
         run: |
           cd rust/kcl-language-server
-          npx vsce package -o "../build/kcl-language-server-${{ matrix.code-target }}.vsix" --target ${{ matrix.code-target }}
+          npx vsce package --yarn -o "../build/kcl-language-server-${{ matrix.code-target }}.vsix" --target ${{ matrix.code-target }}
 
       - name: Package Extension (nightly)
         if: startsWith(github.event.ref, 'refs/tags/') == false
         run: |
           cd rust/kcl-language-server
-          npx vsce package -o "../build/kcl-language-server-${{ matrix.code-target }}.vsix" --target ${{ matrix.code-target }} --pre-release
+          npx vsce package --yarn -o "../build/kcl-language-server-${{ matrix.code-target }}.vsix" --target ${{ matrix.code-target }} --pre-release
 
       - name: remove server
         if: matrix.target == 'x86_64-unknown-linux-gnu'
@@ -207,13 +206,13 @@ jobs:
         if: matrix.target == 'x86_64-unknown-linux-gnu' && startsWith(github.event.ref, 'refs/tags/')
         run: |
           cd rust/kcl-language-server
-          npx vsce package -o ../build/kcl-language-server-no-server.vsix
+          npx vsce package --yarn -o ../build/kcl-language-server-no-server.vsix
 
       - name: Package Extension (no server, nightly)
         if: matrix.target == 'x86_64-unknown-linux-gnu' && startsWith(github.event.ref, 'refs/tags/') == false
         run: |
           cd rust/kcl-language-server
-          npx vsce package -o ../build/kcl-language-server-no-server.vsix --pre-release
+          npx vsce package --yarn -o ../build/kcl-language-server-no-server.vsix --pre-release
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
@@ -244,8 +243,8 @@ jobs:
             lld \
             musl-dev \
             nodejs \
-            yarn \
+            npm \
-            npm
+            yarn
 
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -272,19 +271,20 @@ jobs:
       - name: Install dependencies
         run: |
           cd rust/kcl-language-server
+          # npm will symlink which will cause issues w tarballing later
           yarn install
 
       - name: Package Extension (release)
         if: startsWith(github.event.ref, 'refs/tags/')
         run: |
           cd rust/kcl-language-server
-          npx vsce package -o "../build/kcl-language-server-alpine-x64.vsix" --target alpine-x64
+          npx vsce package --yarn -o "../build/kcl-language-server-alpine-x64.vsix" --target alpine-x64
 
       - name: Package Extension (release)
         if: startsWith(github.event.ref, 'refs/tags/') == false
         run: |
           cd rust/kcl-language-server
-          npx vsce package -o "../build/kcl-language-server-alpine-x64.vsix" --target alpine-x64 --pre-release
+          npx vsce package --yarn -o "../build/kcl-language-server-alpine-x64.vsix" --target alpine-x64 --pre-release
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4

.github/workflows/publish-apps-release.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'npm'
 
       - name: Find tag workflow id
         id: tag_workflow_id
@@ -105,7 +105,7 @@ jobs:
       - name: Override release notes
         env:
           NOTES: ${{ github.event.release.body }}
-        run: yarn files:set-notes
+        run: npm run files:set-notes
 
       - name: Authenticate to Google Cloud
         uses: 'google-github-actions/auth@v2.1.8'
@@ -126,7 +126,7 @@ jobs:
           destination: 'dl.kittycad.io/releases/modeling-app'
 
       - name: Invalidate bucket cache on latest*.yml and last_download.json files
-        run: yarn files:invalidate-bucket
+        run: npm run files:invalidate-bucket
 
       - name: Upload release files to Github
         if: ${{ github.event_name == 'release' }}

.github/workflows/static-analysis.yml

@@ -16,18 +16,18 @@ permissions:
   actions: read
 
 jobs:
-  yarn-fmt-check:
+  npm-fmt-check:
     runs-on: 'ubuntu-22.04'
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'npm'
-      - run: yarn install
+      - run: npm install
-      - run: yarn fmt-check
+      - run: npm run fmt:check
 
-  yarn-build-wasm:
+  npm-build-wasm:
     # Build the wasm blob once on the fastest runner.
     runs-on: runs-on=${{ github.run_id }}/family=i7ie.2xlarge/image=ubuntu22-full-x64
     steps:
@@ -36,10 +36,10 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'npm'
 
       - name: Install dependencies
-        run: yarn install
+        run: npm install
 
       - name: Use correct Rust toolchain
         shell: bash
@@ -62,7 +62,7 @@ jobs:
 
       - name: Build Wasm
         shell: bash
-        run: yarn build:wasm
+        run: npm run build:wasm
 
       - uses: actions/upload-artifact@v4
         with:
@@ -76,17 +76,17 @@ jobs:
           path: |
             rust/kcl-lib/bindings/*
 
-  yarn-tsc:
+  npm-tsc:
     runs-on: ubuntu-latest
-    needs: yarn-build-wasm
+    needs: npm-build-wasm
 
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'npm'
-      - run: yarn install
+      - run: npm install
 
       - name: Download all artifacts
         uses: actions/download-artifact@v4
@@ -104,19 +104,19 @@ jobs:
           mkdir rust/kcl-lib/bindings
           cp -r prepared-ts-rs-bindings/* rust/kcl-lib/bindings/
 
-      - run: yarn tsc
+      - run: npm run tsc
 
-  yarn-lint:
+  npm-lint:
     runs-on: ubuntu-latest
-    needs: yarn-build-wasm
+    needs: npm-build-wasm
 
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'npm'
-      - run: yarn install
+      - run: npm install
 
       - name: Download all artifacts
         uses: actions/download-artifact@v4
@@ -134,19 +134,19 @@ jobs:
           mkdir rust/kcl-lib/bindings
           cp -r prepared-ts-rs-bindings/* rust/kcl-lib/bindings/
 
-      - run: yarn lint
+      - run: npm run lint
 
-  yarn-circular-dependencies:
+  npm-circular-dependencies:
     runs-on: ubuntu-latest
-    needs: yarn-build-wasm
+    needs: npm-build-wasm
 
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'npm'
-      - run: yarn install
+      - run: npm install
 
       - name: Download all artifacts
         uses: actions/download-artifact@v4
@@ -164,7 +164,7 @@ jobs:
           mkdir rust/kcl-lib/bindings
           cp -r prepared-ts-rs-bindings/* rust/kcl-lib/bindings/
 
-      - run: yarn circular-deps:diff
+      - run: npm run circular-deps:diff
 
   python-codespell:
     runs-on: ubuntu-22.04
@@ -179,18 +179,18 @@ jobs:
       - name: Run codespell
         run: codespell --config .codespellrc # Edit this file to tweak the typo list and other configuration.
 
-  yarn-unit-test-kcl-samples:
+  npm-unit-test-kcl-samples:
     runs-on: ubuntu-latest
-    needs: yarn-build-wasm
+    needs: npm-build-wasm
     steps:
       - uses: actions/checkout@v4
 
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'npm'
 
-      - run: yarn install
+      - run: npm install
       - uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc
         with:
           tool: wasm-pack
@@ -211,31 +211,31 @@ jobs:
           mkdir rust/kcl-lib/bindings
           cp -r prepared-ts-rs-bindings/* rust/kcl-lib/bindings/
 
-      - run: yarn simpleserver:bg
+      - run: npm run simpleserver:bg
         if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
 
       - name: Install Chromium Browser
         if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
-        run: yarn playwright install chromium --with-deps
+        run: npm run playwright install chromium --with-deps
 
       - name: run unit tests for kcl samples
         if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
-        run: yarn test:unit:kcl-samples
+        run: npm run test:unit:kcl-samples
         env:
           VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
 
-  yarn-unit-test:
+  npm-unit-test:
     runs-on: ubuntu-latest
-    needs: yarn-build-wasm
+    needs: npm-build-wasm
     steps:
       - uses: actions/checkout@v4
 
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'npm'
 
-      - run: yarn install
+      - run: npm install
       - uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc
         with:
           tool: wasm-pack
@@ -256,16 +256,16 @@ jobs:
           mkdir rust/kcl-lib/bindings
           cp -r prepared-ts-rs-bindings/* rust/kcl-lib/bindings/
 
-      - run: yarn simpleserver:bg
+      - run: npm run simpleserver:bg
         if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
 
       - name: Install Chromium Browser
         if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
-        run: yarn playwright install chromium --with-deps
+        run: npm run playwright install chromium --with-deps
 
       - name: Run unit tests
         if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
-        run: xvfb-run -a yarn test:unit
+        run: xvfb-run -a npm run test:unit
         env:
           VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
 

.github/workflows/tag-nightly.yml

@@ -27,7 +27,7 @@ jobs:
         with:
           node-version-file: '.nvmrc'
 
-      - run: yarn install
+      - run: npm install
 
       - name: Push tag
         run: |

.gitignore

@@ -31,6 +31,7 @@ result
 # rust
 rust/target
 rust/kcl-lib/bindings
+rust/kcl-language-server/server
 public/kcl_wasm_lib_bg.wasm
 rust/lcov.info
 rust/kcl-wasm-lib/pkg
@@ -83,3 +84,4 @@ dist
 venv
 
 .vscode-test
+.biome/

.husky/pre-push

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-yarn fmt-check
+npm run fmt-check

.npmrc

@@ -0,0 +1 @@
+legacy-peer-deps=true

Makefile

@@ -20,28 +20,23 @@ WASM_PACK ?= ~/.cargo/bin/wasm-pack
 endif
 
 .PHONY: install
-install: node_modules/.yarn-integrity $(CARGO) $(WASM_PACK) ## Install dependencies
+install: node_modules/.package-lock.json $(CARGO) $(WASM_PACK) ## Install dependencies
 
-node_modules/.yarn-integrity: package.json yarn.lock
+node_modules/.package-lock.json: package.json package-lock.json
-	yarn install
+	npm install
-ifdef POWERSHELL
-	@ type nul > $@
-else
-	@ touch $@
-endif
 
 $(CARGO):
 ifdef WINDOWS
-	yarn install:rust:windows
+	npm run install:rust:windows
 else
-	yarn install:rust
+	npm run install:rust
 endif
 
 $(WASM_PACK):
 ifdef WINDOWS
-	yarn install:wasm-pack:cargo
+	npm run install:wasm-pack:cargo
 else
-	yarn install:wasm-pack:sh
+	npm run install:wasm-pack:sh
 endif
 
 ###############################################################################
@@ -65,16 +60,16 @@ build-desktop: install public/kcl_wasm_lib_bg.wasm .vite/build/main.js
 
 public/kcl_wasm_lib_bg.wasm: $(CARGO_SOURCES) $(RUST_SOURCES)
 ifdef WINDOWS
-	yarn build:wasm:dev:windows
+	npm run build:wasm:dev:windows
 else
-	yarn build:wasm:dev
+	npm run build:wasm:dev
 endif
 
 build/index.html: $(REACT_SOURCES) $(TYPESCRIPT_SOURCES) $(VITE_SOURCES)
-	yarn build:local
+	npm run build:local
 
 .vite/build/main.js: $(REACT_SOURCES) $(TYPESCRIPT_SOURCES) $(VITE_SOURCES)
-	yarn tronb:vite:dev
+	npm run tronb:vite:dev
 
 ###############################################################################
 # CHECK
@@ -84,12 +79,12 @@ check: format lint
 
 .PHONY: format
 format: install ## Format the code
-	yarn fmt
+	npm run fmt
 
 .PHONY: lint
 lint: install ## Lint the code
-	yarn tsc
+	npm run tsc
-	yarn lint
+	npm run lint
 
 ###############################################################################
 # RUN
@@ -101,11 +96,11 @@ run: run-$(TARGET)
 
 .PHONY: run-web
 run-web: install build-web ## Start the web app
-	yarn start
+	npm run start
 
 .PHONY: run-desktop
 run-desktop: install build-desktop ## Start the desktop app
-	yarn tron:start
+	npm run tron:start
 
 ###############################################################################
 # TEST
@@ -120,7 +115,7 @@ test: test-unit test-e2e
 .PHONY: test-unit
 test-unit: install ## Run the unit tests
 	@ curl -fs localhost:3000 >/dev/null || ( echo "Error: localhost:3000 not available, 'make run-web' first" && exit 1 )
-	yarn test:unit
+	npm run test:unit
 
 .PHONY: test-e2e
 test-e2e: test-e2e-$(TARGET)
@@ -129,17 +124,17 @@ test-e2e: test-e2e-$(TARGET)
 test-e2e-web: install build-web ## Run the web e2e tests
 	@ curl -fs localhost:3000 >/dev/null || ( echo "Error: localhost:3000 not available, 'make run-web' first" && exit 1 )
 ifdef E2E_GREP
-	yarn chrome:test --headed --grep="$(E2E_GREP)" --max-failures=$(E2E_FAILURES)
+	npm run chrome:test -- --headed --grep="$(E2E_GREP)" --max-failures=$(E2E_FAILURES)
 else
-	yarn chrome:test --headed --workers='100%'
+	npm run chrome:test -- --headed --workers='100%'
 endif
 
 .PHONY: test-e2e-desktop
 test-e2e-desktop: install build-desktop ## Run the desktop e2e tests
 ifdef E2E_GREP
-	yarn test:playwright:electron --grep="$(E2E_GREP)" --max-failures=$(E2E_FAILURES)
+	npm run test:playwright:electron -- --grep="$(E2E_GREP)" --max-failures=$(E2E_FAILURES)
 else
-	yarn test:playwright:electron --workers='100%'
+	npm run test:playwright:electron -- --workers='100%'
 endif
 
 ###############################################################################
@@ -174,5 +169,5 @@ endif
 # It should work for you other Linux users.
 lee-electron-test:
 	Xephyr -br -ac -noreset -screen 1200x500 :2 &
-	DISPLAY=:2 NODE_ENV=development PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:4444/ yarn tron:test -g "when using the file tree"
+	DISPLAY=:2 NODE_ENV=development PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:4444/ npm run tron:test -g "when using the file tree"
 	killall Xephyr

README.md

@@ -62,39 +62,39 @@ fnm use
 Install the NPM dependencies with:
 
 ```
-yarn install
+npm install
 ```
 
 This project uses a lot of Rust compiled to [WASM](https://webassembly.org/) within it. We have package scripts to run rustup, see `package.json` for reference:
 
 ```
 # macOS/Linux
-yarn install:rust
+npm run install:rust
-yarn install:wasm-pack:sh
+npm run install:wasm-pack:sh
 
 # Windows
-yarn install:rust:windows
+npm run install:rust:windows
-yarn install:wasm-pack:cargo
+npm run install:wasm-pack:cargo
 ```
 
 Then to build the WASM layer, run:
 
 ```
 # macOS/Linux
-yarn build:wasm
+npm run build:wasm
 
 # Windows
-yarn build:wasm:windows
+npm run build:wasm:windows
 ```
 
-Or if you have the `gh` cli installed and want to download the latest main wasm bundle. Note that on Windows, you need to associate .ps1 files with PowerShell, which can be done via the right click menu, selecting `C:\Program Files\PowerShell\7\pwsh.exe`, and you can install tools like `gh` via `yarn install:tools:windows`.
+Or if you have the `gh` cli installed and want to download the latest main wasm bundle. Note that on Windows, you need to associate .ps1 files with PowerShell, which can be done via the right click menu, selecting `C:\Program Files\PowerShell\7\pwsh.exe`, and you can install tools like `gh` via `npm run install:tools:windows`.
 
 ```
 # macOS/Linux
-yarn fetch:wasm
+npm run fetch:wasm
 
 # Windows
-yarn fetch:wasm:windows
+npm run fetch:wasm:windows
 ```
 
 That will build the WASM binary and put in the `public` dir (though gitignored).
@@ -102,7 +102,7 @@ That will build the WASM binary and put in the `public` dir (though gitignored).
 Finally, to run the web app only, run:
 
 ```
-yarn start
+npm start
 ```
 
 If you're not a Zoo employee you won't be able to access the dev environment, you should copy everything from `.env.production` to `.env.development.local` to make it point to production instead, then when you navigate to `localhost:3000` the easiest way to sign in is to paste `localStorage.setItem('TOKEN_PERSIST_KEY', "your-token-from-https://zoo.dev/account/api-tokens")` replacing the with a real token from https://zoo.dev/account/api-tokens of course, then navigate to `localhost:3000` again. Note that navigating to `localhost:3000/signin` removes your token so you will need to set the token again.
@@ -122,17 +122,17 @@ Third-Party Cookies".
 
 ## Desktop
 
-To spin up the desktop app, `yarn install` and `yarn build:wasm` need to have been done before hand then:
+To spin up the desktop app, `npm install` and `npm run build:wasm` need to have been done before hand then:
 
 ```
-yarn tron:start
+npm run tron:start
 ```
 
 This will start the application and hot-reload on changes.
 
 Devtools can be opened with the usual Command-Option-I (macOS) or Ctrl-Shift-I (Linux and Windows).
 
-To package the app for your platform with electron-builder, run `yarn tronb:package:dev` (or `yarn tronb:package:prod` to point to the .env.production variables).
+To package the app for your platform with electron-builder, run `npm run tronb:package:dev` (or `npm run tronb:package:prod` to point to the .env.production variables).
 
 ## Checking out commits / Bisecting
 
@@ -141,9 +141,9 @@ Which commands from setup are one off vs. need to be run every time?
 The following will need to be run when checking out a new commit and guarantees the build is not stale:
 
 ```bash
-yarn install
+npm install
-yarn build:wasm
+npm run build:wasm
-yarn start # or yarn build:local && yarn serve for slower but more production-like build
+npm start # or npm run build:local && npm run serve for slower but more production-like build
 ```
 
 ## Before submitting a PR
@@ -153,10 +153,10 @@ Before you submit a contribution PR to this repo, please ensure that:
 - There is a corresponding issue for the changes you want to make, so that discussion of approach can be had before work begins.
 - You have separated out refactoring commits from feature commits as much as possible
 - You have run all of the following commands locally:
-  - `yarn fmt`
+  - `npm run fmt`
-  - `yarn tsc`
+  - `npm run tsc`
-  - `yarn test`
+  - `npm run test`
-  - Here they are all together: `yarn fmt && yarn tsc && yarn test`
+  - Here they are all together: `npm run fmt && npm run tsc && npm run test`
 
 ## Release a new version
 
@@ -250,55 +250,29 @@ You will need a `./e2e/playwright/playwright-secrets.env` file:
 $ touch ./e2e/playwright/playwright-secrets.env
 $ cat ./e2e/playwright/playwright-secrets.env
 token=<dev.zoo.dev/account/api-tokens>
-snapshottoken=<your-snapshot-token>
+snapshottoken=<zoo.dev/account/api-tokens>
 ```
+or use `export` to set the environment variables `token` and `snapshottoken`.
 
-For a portable way to run Playwright you'll need Docker.
+#### Snapshot tests (Google Chrome on Ubuntu only)
 
-#### Generic example
+Only Ubunu and Google Chrome is supported for the set of tests evaluating screenshot snapshots.
-
+If you don't run Ubuntu locally or in a VM, you may use a GitHub Codespace.
-After that, open a terminal and run:
-
-```bash
-docker run --network host  --rm --init -it playwright/chrome:playwright-x.xx.x
 ```
-
+npm run playwright -- install chrome
-and in another terminal, run:
+npm run test:snapshots
-
-```bash
-PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:4444/ yarn playwright test --project="Google Chrome" <test suite>
 ```
+You may use `-- --update-snapshots` as needed.
 
-#### Specific example
+#### Electron flow tests (Chromium on Ubuntu, macOS, Windows)
-
-open a terminal and run:
-
-```bash
-docker run --network host  --rm --init -it playwright/chrome:playwright-1.46.0
-```
-
-and in another terminal, run:
-
-```bash
-PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:4444/ yarn playwright test --project="Google Chrome" e2e/playwright/command-bar-tests.spec.ts
-```
-
-run a specific test change the test from `test('...` to `test.only('...`
-(note if you commit this, the tests will instantly fail without running any of the tests)
-
-**Gotcha**: running the docker container with a mismatched image against your `./node_modules/playwright` will cause a failure. Make sure the versions are matched and up to date.
-
-run headed
 
 ```
-yarn playwright test --headed
+npm run playwright -- install chromium
+npm run test:playwright:electron:local 
 ```
+You may use `-- -g "my test"` to match specific test titles, or `-- path/to/file.spec.ts` for a test file.
 
-run with step through debugger
+#### Debugger
-
-```
-PWDEBUG=1 yarn playwright test
-```
 
 However, if you want a debugger I recommend using VSCode and the `playwright` extension, as the above command is a cruder debugger that steps into every function call which is annoying.
 With the extension you can set a breakpoint after `waitForDefaultPlanesVisibilityChange` in order to skip app loading, then the vscode debugger's "step over" is much better for being able to stay at the right level of abstraction as you debug the code.
@@ -308,7 +282,7 @@ Or comment out browsers in `playwright.config.ts`.
 
 note chromium has encoder compat issues which is why were testing against the branded 'Google Chrome'
 
-You may consider using the VSCode extension, it's useful for running individual threads, but some some reason the "record a test" is locked to chromium with we can't use. A work around is to us the CI `yarn playwright codegen -b wk --load-storage ./store localhost:3000`
+You may consider using the VSCode extension, it's useful for running individual threads, but some some reason the "record a test" is locked to chromium with we can't use. A work around is to us the CI `npm run playwright codegen -b wk --load-storage ./store localhost:3000`
 
 <details>
 <summary>
@@ -351,21 +325,21 @@ However because much of our tests involve clicking in the stream at specific loc
 If you already haven't, run the following:
 
 ```
-yarn
+npm
-yarn build:wasm
+npm run build:wasm
-yarn start
+npm start
 ```
 
 and finally:
 
 ```
-yarn test:unit
+npm run test:unit
 ```
 
 For individual testing:
 
 ```
-yarn test abstractSyntaxTree -t "unexpected closed curly brace" --silent=false
+npm run test abstractSyntaxTree -t "unexpected closed curly brace" --silent=false
 ```
 
 Which will run our suite of [Vitest unit](https://vitest.dev/) and [React Testing Library E2E](https://testing-library.com/docs/react-testing-library/intro) tests, in interactive mode by default.
@@ -439,16 +413,16 @@ Part of the CI CD pipeline performs static analysis on the code. Use the followi
 The following set of commands should get us closer to one and done commands to instantly retest issues.
 
 ```
-yarn test-setup
+npm run test-setup
 ```
 
 > Gotcha, are packages up to date and is the wasm built?
 
 ```
-yarn tsc
+npm run tsc
-yarn fmt-check
+npm run fmt:check
-yarn lint
+npm run lint
-yarn test:unit:local
+npm run test:unit:local
 ```
 
 > Gotcha: Our unit tests have integration tests in them. You need to run a localhost server to run the unit tests.
@@ -460,10 +434,10 @@ yarn test:unit:local
 These E2E tests run in electron. There are tests that are skipped if they are ran in a windows, linux, or macos environment. We can use playwright tags to implement test skipping.
 
 ```
-yarn test:playwright:electron:local
+npm run test:playwright:electron:local
-yarn test:playwright:electron:windows:local
+npm run test:playwright:electron:windows:local
-yarn test:playwright:electron:macos:local
+npm run test:playwright:electron:macos:local
-yarn test:playwright:electron:ubuntu:local
+npm run test:playwright:electron:ubuntu:local
 ```
 
 > Why does it say local? The CI CD commands that run in the pipeline cannot be ran locally. A single command will not properly setup the testing environment locally.

biome.json

@@ -0,0 +1,48 @@
+{
+  "$schema": "https://biomejs.dev/schemas/1.6.0/schema.json",
+  "organizeImports": {
+    "enabled": true
+  },
+  "linter": {
+    "enabled": true,
+    "rules": {
+      "recommended": true,
+      "correctness": {
+        "noUnusedVariables": "error"
+      },
+      "suspicious": {
+        "noExplicitAny": "warn"
+      },
+      "style": {
+        "useBlockStatements": "error",
+        "useShorthandArrayType": "error"
+      }
+    }
+  },
+  "formatter": {
+    "enabled": true,
+    "indentWidth": 2,
+    "indentStyle": "space",
+    "lineWidth": 80,
+    "formatWithErrors": true
+  },
+  "javascript": {
+    "formatter": {
+      "quoteStyle": "single",
+      "jsxQuoteStyle": "double",
+      "trailingCommas": "es5",
+      "semicolons": "asNeeded"
+    },
+    "parser": {
+      "unsafeParameterDecoratorsEnabled": true
+    }
+  },
+  "css": {
+    "parser": {
+      "cssModules": true
+    }
+  },
+  "files": {
+    "ignore": ["**/*.json"]
+  }
+}

docs/kcl/angledLine.md

@@ -28,11 +28,11 @@ angledLine(
 |----------|------|-------------|----------|
 | `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | Which sketch should this path be added to? | Yes |
 | `angle` | [`number`](/docs/kcl/types/number) | Which angle should the line be drawn at? | Yes |
-| `length` | [`number`](/docs/kcl/types/number) | Draw the line this distance along the given angle. Only one of `length`, `lengthX`, `lengthY`, `lengthAbsoluteEndX`, `lengthAbsoluteEndY` can be given. | No |
+| `length` | [`number`](/docs/kcl/types/number) | Draw the line this distance along the given angle. Only one of `length`, `lengthX`, `lengthY`, `endAbsoluteX`, `endAbsoluteY` can be given. | No |
-| `lengthX` | [`number`](/docs/kcl/types/number) | Draw the line this distance along the X axis. Only one of `length`, `lengthX`, `lengthY`, `lengthAbsoluteEndX`, `lengthAbsoluteEndY` can be given. | No |
+| `lengthX` | [`number`](/docs/kcl/types/number) | Draw the line this distance along the X axis. Only one of `length`, `lengthX`, `lengthY`, `endAbsoluteX`, `endAbsoluteY` can be given. | No |
-| `lengthY` | [`number`](/docs/kcl/types/number) | Draw the line this distance along the Y axis. Only one of `length`, `lengthX`, `lengthY`, `lengthAbsoluteEndX`, `lengthAbsoluteEndY` can be given. | No |
+| `lengthY` | [`number`](/docs/kcl/types/number) | Draw the line this distance along the Y axis. Only one of `length`, `lengthX`, `lengthY`, `endAbsoluteX`, `endAbsoluteY` can be given. | No |
-| `endAbsoluteX` | [`number`](/docs/kcl/types/number) | Draw the line along the given angle until it reaches this point along the X axis. Only one of `length`, `lengthX`, `lengthY`, `lengthAbsoluteEndX`, `lengthAbsoluteEndY` can be given. | No |
+| `endAbsoluteX` | [`number`](/docs/kcl/types/number) | Draw the line along the given angle until it reaches this point along the X axis. Only one of `length`, `lengthX`, `lengthY`, `endAbsoluteX`, `endAbsoluteY` can be given. | No |
-| `endAbsoluteY` | [`number`](/docs/kcl/types/number) | Draw the line along the given angle until it reaches this point along the Y axis. Only one of `length`, `lengthX`, `lengthY`, `lengthAbsoluteEndX`, `lengthAbsoluteEndY` can be given. | No |
+| `endAbsoluteY` | [`number`](/docs/kcl/types/number) | Draw the line along the given angle until it reaches this point along the Y axis. Only one of `length`, `lengthX`, `lengthY`, `endAbsoluteX`, `endAbsoluteY` can be given. | No |
 | [`tag`](/docs/kcl/types/tag) | [`TagDeclarator`](/docs/kcl/types#tag-declaration) | Create a new tag which refers to this line | No |
 
 ### Returns

docs/kcl/angledLineThatIntersects.md

@@ -10,8 +10,10 @@ Draw an angled line from the current origin, constructing a line segment such th
 
 ```js
 angledLineThatIntersects(
-  data: AngledLineThatIntersectsData,
   sketch: Sketch,
+  angle: number,
+  intersectTag: TagIdentifier,
+  offset?: number,
   tag?: TagDeclarator,
 ): Sketch
 ```
@@ -21,9 +23,11 @@ angledLineThatIntersects(
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `data` | [`AngledLineThatIntersectsData`](/docs/kcl/types/AngledLineThatIntersectsData) | Data for drawing an angled line that intersects with a given line. | Yes |
+| `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | Which sketch should this path be added to? | Yes |
-| `sketch` | [`Sketch`](/docs/kcl/types/Sketch) |  | Yes |
+| `angle` | [`number`](/docs/kcl/types/number) | Which angle should the line be drawn at? | Yes |
-| [`tag`](/docs/kcl/types/tag) | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `intersectTag` | [`TagIdentifier`](/docs/kcl/types#tag-identifier) | The tag of the line to intersect with | Yes |
+| `offset` | [`number`](/docs/kcl/types/number) | The offset from the intersecting line. Defaults to 0. | No |
+| [`tag`](/docs/kcl/types/tag) | [`TagDeclarator`](/docs/kcl/types#tag-declaration) | Create a new tag which refers to this line | No |
 
 ### Returns
 
@@ -38,11 +42,7 @@ exampleSketch = startSketchOn(XZ)
   |> line(endAbsolute = [5, 10])
   |> line(endAbsolute = [-10, 10], tag = $lineToIntersect)
   |> line(endAbsolute = [0, 20])
-  |> angledLineThatIntersects({
+  |> angledLineThatIntersects(angle = 80, intersectTag = lineToIntersect, offset = 10)
-       angle = 80,
-       intersectTag = lineToIntersect,
-       offset = 10
-     }, %)
   |> close()
 
 example = extrude(exampleSketch, length = 10)

docs/kcl/atan2.md

@@ -24,8 +24,8 @@ atan2(
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `y` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `y` | [`number`](/docs/kcl/types/number) | Y | Yes |
-| `x` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `x` | [`number`](/docs/kcl/types/number) | X | Yes |
 
 ### Returns
 
@@ -37,7 +37,7 @@ atan2(
 ```js
 sketch001 = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
-  |> angledLine(angle = toDegrees(atan2(1.25, 2)), length = 20)
+  |> angledLine(angle = toDegrees(atan2(y = 1.25, x = 2)), length = 20)
   |> yLine(endAbsolute = 0)
   |> close()
 

docs/kcl/chamfer.md

@@ -80,7 +80,7 @@ part001 = cube([0, 0], 20)
   // We tag the chamfer to reference it later.
   |> chamfer(length = 10, tags = [getOppositeEdge(line1)], tag = $chamfer1)
 
-sketch001 = startSketchOn(part001, chamfer1)
+sketch001 = startSketchOn(part001, face = chamfer1)
   |> startProfileAt([10, 10], %)
   |> line(end = [2, 0])
   |> line(end = [0, 2])

docs/kcl/consts.md

@@ -9,6 +9,8 @@ layout: manual
 
 ### `std`
 
+- [`END`](/docs/kcl/consts/std-END)
+- [`START`](/docs/kcl/consts/std-START)
 - [`X`](/docs/kcl/consts/std-X)
 - [`XY`](/docs/kcl/consts/std-XY)
 - [`XZ`](/docs/kcl/consts/std-XZ)

docs/kcl/consts/std-END.md

@@ -0,0 +1,15 @@
+---
+title: "std::END"
+excerpt: "Identifies the ending face of an extrusion. I.e., the new face created by an extrusion."
+layout: manual
+---
+
+Identifies the ending face of an extrusion. I.e., the new face created by an extrusion.
+
+
+
+```js
+std::END: string = 'end'
+```
+
+

docs/kcl/consts/std-START.md

@@ -0,0 +1,15 @@
+---
+title: "std::START"
+excerpt: "Identifies the starting face of an extrusion. I.e., the face which is extruded."
+layout: manual
+---
+
+Identifies the starting face of an extrusion. I.e., the face which is extruded.
+
+
+
+```js
+std::START: string = 'start'
+```
+
+

docs/kcl/hollow.md

@@ -69,11 +69,11 @@ case = startSketchOn(-XZ)
   |> close()
   |> extrude(length = 65)
 
-thing1 = startSketchOn(case, 'end')
+thing1 = startSketchOn(case, face = END)
   |> circle(center = [-size / 2, -size / 2], radius = 25)
   |> extrude(length = 50)
 
-thing2 = startSketchOn(case, 'end')
+thing2 = startSketchOn(case, face = END)
   |> circle(center = [size / 2, -size / 2], radius = 25)
   |> extrude(length = 50)
 

docs/kcl/index.md

@@ -24,12 +24,14 @@ layout: manual
 * **std**
   * [`Axis2d`](kcl/types/Axis2d)
   * [`Axis3d`](kcl/types/Axis3d)
+  * [`END`](kcl/consts/std-END)
   * [`Edge`](kcl/types/Edge)
   * [`Face`](kcl/types/Face)
   * [`Helix`](kcl/types/Helix)
   * [`Plane`](kcl/types/Plane)
   * [`Point2d`](kcl/types/Point2d)
   * [`Point3d`](kcl/types/Point3d)
+  * [`START`](kcl/consts/std-START)
   * [`Sketch`](kcl/types/Sketch)
   * [`Solid`](kcl/types/Solid)
   * [`X`](kcl/consts/std-X)
@@ -78,6 +80,7 @@ layout: manual
   * [`hole`](kcl/hole)
   * [`hollow`](kcl/hollow)
   * [`intersect`](kcl/intersect)
+  * [`involuteCircular`](kcl/involuteCircular)
   * [`lastSegX`](kcl/lastSegX)
   * [`lastSegY`](kcl/lastSegY)
   * [`legAngX`](kcl/legAngX)

docs/kcl/line.md

@@ -37,7 +37,7 @@ line(
 ```js
 triangle = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
-  // The 'end' argument means it ends at exactly [10, 0].
+  // The END argument means it ends at exactly [10, 0].
   // This is an absolute measurement, it is NOT relative to
   // the start of the sketch.
   |> line(endAbsolute = [10, 0])

docs/kcl/offsetPlane.md

@@ -20,7 +20,7 @@ offsetPlane(
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `plane` | [`PlaneData`](/docs/kcl/types/PlaneData) | The plane (e.g. 'XY') which this new plane is created from. | Yes |
+| `plane` | [`PlaneData`](/docs/kcl/types/PlaneData) | The plane (e.g. XY) which this new plane is created from. | Yes |
 | `offset` | [`number`](/docs/kcl/types/number) | Distance from the standard plane this new plane will be created at. | Yes |
 
 ### Returns

docs/kcl/patternLinear3d.md

@@ -61,11 +61,11 @@ case = startSketchOn(XY)
   |> close(%)
   |> extrude(length = 65)
 
-thing1 = startSketchOn(case, 'end')
+thing1 = startSketchOn(case, face = END)
   |> circle(center = [-size / 2, -size / 2], radius = 25)
   |> extrude(length = 50)
 
-thing2 = startSketchOn(case, 'end')
+thing2 = startSketchOn(case, face = END)
   |> circle(center = [size / 2, -size / 2], radius = 25)
   |> extrude(length = 50)
 
@@ -92,7 +92,7 @@ case = startSketchOn(XY)
   |> close(%)
   |> extrude(length = 65)
 
-thing1 = startSketchOn(case, 'end')
+thing1 = startSketchOn(case, face = END)
   |> circle(center = [-size / 2, -size / 2], radius = 25)
   |> extrude(length = 50)
 

docs/kcl/startSketchOn.md

@@ -18,8 +18,8 @@ The point is if you want to export the result of a sketch on a face, you only ne
 
 ```js
 startSketchOn(
-  data: SketchData,
+  planeOrSolid: SketchData,
-  tag?: FaceTag,
+  face?: FaceTag,
 ): SketchSurface
 ```
 
@@ -28,8 +28,8 @@ startSketchOn(
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `data` | [`SketchData`](/docs/kcl/types/SketchData) | Data for start sketch on. You can start a sketch on a plane or an solid. | Yes |
+| `planeOrSolid` | [`SketchData`](/docs/kcl/types/SketchData) | The plane or solid to sketch on | Yes |
-| [`tag`](/docs/kcl/types/tag) | [`FaceTag`](/docs/kcl/types/FaceTag) | A tag for a face. | No |
+| `face` | [`FaceTag`](/docs/kcl/types/FaceTag) | Identify a face of a solid if a solid is specified as the input argument (`plane_or_solid`) | No |
 
 ### Returns
 
@@ -48,7 +48,7 @@ exampleSketch = startSketchOn(XY)
 
 example = extrude(exampleSketch, length = 5)
 
-exampleSketch002 = startSketchOn(example, 'end')
+exampleSketch002 = startSketchOn(example, face = END)
   |> startProfileAt([1, 1], %)
   |> line(end = [8, 0])
   |> line(end = [0, 8])
@@ -57,7 +57,7 @@ exampleSketch002 = startSketchOn(example, 'end')
 
 example002 = extrude(exampleSketch002, length = 5)
 
-exampleSketch003 = startSketchOn(example002, 'end')
+exampleSketch003 = startSketchOn(example002, face = END)
   |> startProfileAt([2, 2], %)
   |> line(end = [6, 0])
   |> line(end = [0, 6])
@@ -82,7 +82,7 @@ exampleSketch = startSketchOn(XY)
 
 example = extrude(exampleSketch, length = 5, tagEnd = $end01)
 
-exampleSketch002 = startSketchOn(example, end01)
+exampleSketch002 = startSketchOn(example, face = end01)
   |> startProfileAt([1, 1], %)
   |> line(end = [8, 0])
   |> line(end = [0, 8])
@@ -91,7 +91,7 @@ exampleSketch002 = startSketchOn(example, end01)
 
 example002 = extrude(exampleSketch002, length = 5, tagEnd = $end02)
 
-exampleSketch003 = startSketchOn(example002, end02)
+exampleSketch003 = startSketchOn(example002, face = end02)
   |> startProfileAt([2, 2], %)
   |> line(end = [6, 0])
   |> line(end = [0, 6])
@@ -113,7 +113,7 @@ exampleSketch = startSketchOn(XY)
 
 example = extrude(exampleSketch, length = 10)
 
-exampleSketch002 = startSketchOn(example, sketchingFace)
+exampleSketch002 = startSketchOn(example, face = sketchingFace)
   |> startProfileAt([1, 1], %)
   |> line(end = [8, 0])
   |> line(end = [0, 8])
@@ -122,7 +122,7 @@ exampleSketch002 = startSketchOn(example, sketchingFace)
 
 example002 = extrude(exampleSketch002, length = 10)
 
-exampleSketch003 = startSketchOn(example002, sketchingFace002)
+exampleSketch003 = startSketchOn(example002, face = sketchingFace002)
   |> startProfileAt([-8, 12], %)
   |> line(end = [0, 6])
   |> line(end = [6, 0])
@@ -148,7 +148,7 @@ exampleSketch = startSketchOn(XY)
 
 example = revolve(exampleSketch, axis = Y, angle = 180)
 
-exampleSketch002 = startSketchOn(example, 'end')
+exampleSketch002 = startSketchOn(example, face = END)
   |> startProfileAt([4.5, -5], %)
   |> line(end = [0, 5])
   |> line(end = [5, 0])
@@ -182,7 +182,7 @@ example = revolve(
   tagEnd = $end01,
 )
 
-exampleSketch002 = startSketchOn(example, end01)
+exampleSketch002 = startSketchOn(example, face = end01)
   |> startProfileAt([4.5, -5], %)
   |> line(end = [0, 5])
   |> line(end = [5, 0])
@@ -196,12 +196,10 @@ example002 = extrude(exampleSketch002, length = 5)
 
 ```js
 a1 = startSketchOn({
-       plane = {
+       origin = { x = 0, y = 0, z = 0 },
-         origin = { x = 0, y = 0, z = 0 },
+       xAxis = { x = 1, y = 0, z = 0 },
-         xAxis = { x = 1, y = 0, z = 0 },
+       yAxis = { x = 0, y = 1, z = 0 },
-         yAxis = { x = 0, y = 1, z = 0 },
+       zAxis = { x = 0, y = 0, z = 1 }
-         zAxis = { x = 0, y = 0, z = 1 }
-       }
      })
   |> startProfileAt([0, 0], %)
   |> line(end = [100.0, 0])

docs/kcl/std-helix.md

@@ -11,11 +11,11 @@ Create a helix.
 ```js
 helix(
   revolutions: number(_),
-  angleStart: number(deg),
+  angleStart: number(Angle),
   ccw?: bool,
-  radius?: number(mm),
+  radius?: number(Length),
   axis?: Axis3d | Edge,
-  length?: number(mm),
+  length?: number(Length),
   cylinder?: Solid,
 ): Helix
 ```
@@ -26,11 +26,11 @@ helix(
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
 | `revolutions` | `number(_)` | Number of revolutions. | Yes |
-| `angleStart` | `number(deg)` | Start angle (in degrees). | Yes |
+| `angleStart` | `number(Angle)` | Start angle (in degrees). | Yes |
 | `ccw` | [`bool`](/docs/kcl/types/bool) | Is the helix rotation counter clockwise? The default is `false`. | No |
-| `radius` | `number(mm)` | Radius of the helix. | No |
+| `radius` | `number(Length)` | Radius of the helix. | No |
 | `axis` | `Axis3d | Edge` | Axis to use for the helix. | No |
-| `length` | `number(mm)` | 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 |
+| `length` | `number(Length)` | 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 |
 | `cylinder` | [`Solid`](/docs/kcl/types/Solid) | Cylinder to create the helix on. | No |
 
 ### Returns

docs/kcl/std-math-cos.md

@@ -9,7 +9,7 @@ Compute the cosine of a number (in radians).
 
 
 ```js
-cos(@num: number(rad)): number(_)
+cos(@num: number(Angle)): number(_)
 ```
 
 
@@ -17,7 +17,7 @@ cos(@num: number(rad)): number(_)
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `num` | `number(rad)` |  | Yes |
+| `num` | `number(Angle)` |  | Yes |
 
 ### Returns
 

docs/kcl/std-math-polar.md

@@ -11,9 +11,9 @@ cartesian (x/y/z grid) coordinates.
 
 ```js
 polar(
-  angle: number(deg),
+  angle: number(Angle),
-  length: number(mm),
+  length: number(Length),
-): [number(mm); 2]
+): Point2d
 ```
 
 
@@ -21,12 +21,12 @@ polar(
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `angle` | `number(deg)` |  | Yes |
+| `angle` | `number(Angle)` |  | Yes |
-| `length` | `number(mm)` |  | Yes |
+| `length` | `number(Length)` |  | Yes |
 
 ### Returns
 
-`[number(mm); 2]`
+[`Point2d`](/docs/kcl/types/Point2d)
 
 
 ### Examples

docs/kcl/std-math-sin.md

@@ -9,7 +9,7 @@ Compute the sine of a number (in radians).
 
 
 ```js
-sin(@num: number(rad)): number(_)
+sin(@num: number(Angle)): number(_)
 ```
 
 
@@ -17,7 +17,7 @@ sin(@num: number(rad)): number(_)
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `num` | `number(rad)` |  | Yes |
+| `num` | `number(Angle)` |  | Yes |
 
 ### Returns
 

docs/kcl/std-math-tan.md

@@ -9,7 +9,7 @@ Compute the tangent of a number (in radians).
 
 
 ```js
-tan(@num: number(rad)): number(_)
+tan(@num: number(Angle)): number(_)
 ```
 
 
@@ -17,7 +17,7 @@ tan(@num: number(rad)): number(_)
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `num` | `number(rad)` |  | Yes |
+| `num` | `number(Angle)` |  | Yes |
 
 ### Returns
 

docs/kcl/std-revolve.md

@@ -21,10 +21,10 @@ revolved around the same axis.
 revolve(
   @sketches: [Sketch; 1+],
   axis: Axis2d | Edge,
-  angle?: number(deg),
+  angle?: number(Angle),
-  tolerance?: number(mm),
+  tolerance?: number(Length),
   symmetric?: bool,
-  bidirectionalAngle?: number(deg),
+  bidirectionalAngle?: number(Angle),
   tagStart?: tag,
   tagEnd?: tag,
 ): Solid
@@ -37,10 +37,10 @@ revolve(
 |----------|------|-------------|----------|
 | `sketches` | `[Sketch; 1+]` | The sketch or set of sketches that should be revolved | Yes |
 | `axis` | `Axis2d | Edge` | Axis of revolution. | Yes |
-| `angle` | `number(deg)` | Angle to revolve (in degrees). Default is 360. | No |
+| `angle` | `number(Angle)` | Angle to revolve (in degrees). Default is 360. | No |
-| `tolerance` | `number(mm)` | Tolerance for the revolve operation. | No |
+| `tolerance` | `number(Length)` | Tolerance for the revolve operation. | No |
 | `symmetric` | [`bool`](/docs/kcl/types/bool) | If true, the extrusion will happen symmetrically around the sketch. Otherwise, the extrusion will happen on only one side of the sketch. | No |
-| `bidirectionalAngle` | `number(deg)` | If specified, will also revolve in the opposite direction to 'angle' to the specified angle. If 'symmetric' is true, this value is ignored. | No |
+| `bidirectionalAngle` | `number(Angle)` | If specified, will also revolve in the opposite direction to 'angle' to the specified angle. If 'symmetric' is true, this value is ignored. | No |
 | `tagStart` | [`tag`](/docs/kcl/types/tag) | A named tag for the face at the start of the revolve, i.e. the original sketch. | No |
 | `tagEnd` | [`tag`](/docs/kcl/types/tag) | A named tag for the face at the end of the revolve. | No |
 
@@ -108,7 +108,7 @@ part001 = startSketchOn(XY)
     |> close()
     |> revolve(axis = Y, angle = 180)
 
-part002 = startSketchOn(part001, 'end')
+part002 = startSketchOn(part001, face = END)
     |> startProfileAt([4.5, -5], %)
     |> line(end = [0, 5])
     |> line(end = [5, 0])
@@ -128,7 +128,7 @@ box = startSketchOn(XY)
     |> close()
     |> extrude(length = 20)
 
-sketch001 = startSketchOn(box, "END")
+sketch001 = startSketchOn(box, face = END)
     |> circle( center = [10,10], radius = 4 )
     |> revolve(
         angle = -90,
@@ -147,7 +147,7 @@ box = startSketchOn(XY)
     |> close()
     |> extrude(length = 20)
 
-sketch001 = startSketchOn(box, "END")
+sketch001 = startSketchOn(box, face = END)
     |> circle( center = [10,10], radius = 4 )
     |> revolve(
         angle = 90,
@@ -166,7 +166,7 @@ box = startSketchOn(XY)
     |> close()
     |> extrude(length = 20)
 
-sketch001 = startSketchOn(box, "END")
+sketch001 = startSketchOn(box, face = END)
     |> circle( center = [10,10], radius = 4 )
     |> revolve(
         angle = 90,

docs/kcl/std-sketch-circle.md

@@ -13,7 +13,7 @@ the provided (x, y) origin point.
 circle(
   @sketch_or_surface: Sketch | Plane | Face,
   center: Point2d,
-  radius: number,
+  radius: number(Length),
   tag?: tag,
 ): Sketch
 ```
@@ -25,7 +25,7 @@ circle(
 |----------|------|-------------|----------|
 | `sketch_or_surface` | [`Sketch`](/docs/kcl/types/Sketch) OR [`Plane`](/docs/kcl/types/Plane) OR [`Face`](/docs/kcl/types/Face) | Sketch to extend, or plane or surface to sketch on. | Yes |
 | `center` | [`Point2d`](/docs/kcl/types/Point2d) | The center of the circle. | Yes |
-| `radius` | [`number`](/docs/kcl/types/number) | The radius of the circle. | Yes |
+| `radius` | `number(Length)` | The radius of the circle. | Yes |
 | [`tag`](/docs/kcl/types/tag) | [`tag`](/docs/kcl/types/tag) | Create a new tag which refers to this circle. | No |
 
 ### Returns

docs/kcl/std-sketch-mirror2d.md

@@ -110,7 +110,7 @@ sketch0011 = startSketchOn(XY)
      |> mirror2d( axis = X )
      |> extrude(length = 10)
 
-sketch002 = startSketchOn(sketch0011, 'END')
+sketch002 = startSketchOn(sketch0011, face = END)
     |> circle( center = [-0.01, 1.58], radius = 1.2 )
     |> extrude(length = 1.2)
 

docs/kcl/types/AngledLineData.md

@@ -1,46 +0,0 @@
----
-title: "AngledLineData"
-excerpt: "Data to draw an angled line."
-layout: manual
----
-
-Data to draw an angled line.
-
-
-
-
-**This schema accepts any of the following:**
-
-An angle and length with explicitly named parameters
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `angle` |[`number`](/docs/kcl/types/number)| The angle of the line (in degrees). | No |
-| `length` |[`number`](/docs/kcl/types/number)| The length of the line. | No |
-
-
-----
-An angle and length given as a pair
-
-**Type:** `array`
-
-`[number, number]`
-
-
-
-
-
-----
-
-
-
-
-

docs/kcl/types/AngledLineThatIntersectsData.md

@@ -16,8 +16,8 @@ Data for drawing an angled line that intersects with a given line.
 
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
-| `angle` |[`number`](/docs/kcl/types/number)| The angle of the line. | No |
+| `angle` |`TyF64`| The angle of the line. | No |
 | `intersectTag` |[`TagIdentifier`](/docs/kcl/types#tag-identifier)| The tag of the line to intersect with. | No |
-| `offset` |[`number`](/docs/kcl/types/number)| The offset from the intersecting line. | No |
+| `offset` |`TyF64`| The offset from the intersecting line. | No |
 
 

docs/kcl/types/AngledLineToData.md

@@ -1,22 +0,0 @@
----
-title: "AngledLineToData"
-excerpt: "Data to draw an angled line to a point."
-layout: manual
----
-
-Data to draw an angled line to a point.
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `angle` |[`number`](/docs/kcl/types/number)| The angle of the line. | No |
-| `to` |[`number`](/docs/kcl/types/number)| The point to draw to. | No |
-
-

docs/kcl/types/ArcData.md

@@ -23,9 +23,9 @@ Angles and radius with an optional tag.
 
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
-| `angleStart` |[`number`](/docs/kcl/types/number) (**maximum:** 360.0) (**minimum:** -360.0)| The start angle. | No |
+| `angleStart` |`TyF64`| The start angle. | No |
-| `angleEnd` |[`number`](/docs/kcl/types/number) (**maximum:** 360.0) (**minimum:** -360.0)| The end angle. | No |
+| `angleEnd` |`TyF64`| The end angle. | No |
-| `radius` |[`number`](/docs/kcl/types/number)| The radius. | No |
+| `radius` |`TyF64`| The radius. | No |
 
 
 ----
@@ -41,9 +41,9 @@ Center, to and radius with an optional tag.
 
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
-| `center` |`[number, number]`| The center. | No |
+| `center` |`[, `TyF64`, `TyF64`]`| The center. | No |
-| `to` |`[number, number]`| The to point. | No |
+| `to` |`[, `TyF64`, `TyF64`]`| The to point. | No |
-| `radius` |[`number`](/docs/kcl/types/number)| The radius. | No |
+| `radius` |`TyF64`| The radius. | No |
 
 
 ----

docs/kcl/types/ArcToData.md

@@ -16,7 +16,7 @@ Data to draw a three point arc (arcTo).
 
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
-| `end` |`[number, number]`| End point of the arc. A point in 3D space | No |
+| `end` |`[, `TyF64`, `TyF64`]`| End point of the arc. A point in 3D space | No |
-| `interior` |`[number, number]`| Interior point of the arc. A point in 3D space | No |
+| `interior` |`[, `TyF64`, `TyF64`]`| Interior point of the arc. A point in 3D space | No |
 
 

docs/kcl/types/BezierData.md

@@ -16,8 +16,8 @@ Data to draw a bezier curve.
 
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
-| `to` |`[number, number]`| The to point. | No |
+| `to` |`[, `TyF64`, `TyF64`]`| The to point. | No |
-| `control1` |`[number, number]`| The first control point. | No |
+| `control1` |`[, `TyF64`, `TyF64`]`| The first control point. | No |
-| `control2` |`[number, number]`| The second control point. | No |
+| `control2` |`[, `TyF64`, `TyF64`]`| The second control point. | No |
 
 

docs/kcl/types/EdgeCut.md

@@ -26,7 +26,7 @@ A fillet.
 |----------|------|-------------|----------|
 | `type` |enum: `fillet`|  | No |
 | `id` |[`string`](/docs/kcl/types/string)| The id of the engine command that called this fillet. | No |
-| `radius` |[`number`](/docs/kcl/types/number)|  | No |
+| `radius` |`TyF64`|  | No |
 | `edgeId` |[`string`](/docs/kcl/types/string)| The engine id of the edge to fillet. | No |
 | [`tag`](/docs/kcl/types/tag) |[`TagDeclarator`](/docs/kcl/types#tag-declaration)|  | No |
 
@@ -46,7 +46,7 @@ A chamfer.
 |----------|------|-------------|----------|
 | `type` |enum: `chamfer`|  | No |
 | `id` |[`string`](/docs/kcl/types/string)| The id of the engine command that called this chamfer. | No |
-| `length` |[`number`](/docs/kcl/types/number)|  | No |
+| `length` |`TyF64`|  | No |
 | `edgeId` |[`string`](/docs/kcl/types/string)| The engine id of the edge to chamfer. | No |
 | [`tag`](/docs/kcl/types/tag) |[`TagDeclarator`](/docs/kcl/types#tag-declaration)|  | No |
 

docs/kcl/types/NumericType.md

@@ -130,6 +130,21 @@ A unit of length.
 | `type` |enum: `Yards`|  | No |
 
 
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `Unknown`|  | No |
+
+
 ----
 
 
@@ -178,6 +193,21 @@ A unit of angle.
 | `type` |enum: `Radians`|  | No |
 
 
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `Unknown`|  | No |
+
+
 ----
 
 

docs/kcl/types/Point2d.md

@@ -7,7 +7,7 @@ layout: manual
 A point in two dimensional space.
 
 ```kcl
-type Point2d = [number; 2]
+type Point2d = [number(Length); 2]
 ```
 
 [`Point2d`](/docs/kcl/types/Point2d) is an alias for a two-element array of [number](/docs/kcl/types/number)s. To write a value

docs/kcl/types/Point3d.md

@@ -7,7 +7,7 @@ layout: manual
 A point in three dimensional space.
 
 ```kcl
-type Point3d = [number; 3]
+type Point3d = [number(Length); 3]
 ```
 
 [`Point3d`](/docs/kcl/types/Point3d) is an alias for a three-element array of [number](/docs/kcl/types/number)s. To write a value

docs/kcl/types/PolygonData.md

@@ -16,9 +16,9 @@ Data for drawing a polygon
 
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
-| `radius` |[`number`](/docs/kcl/types/number)| The radius of the polygon | No |
+| `radius` |`TyF64`| The radius of the polygon | No |
 | `numSides` |`integer`| The number of sides in the polygon | No |
-| `center` |`[number, number]`| The center point of the polygon | No |
+| `center` |`[, `TyF64`, `TyF64`]`| The center point of the polygon | No |
 | `inscribed` |`boolean`| Whether the polygon is inscribed (true) or circumscribed (false) about a circle with the specified radius | No |
 
 

docs/kcl/types/TangentialArcData.md

@@ -16,7 +16,7 @@ Data to draw a tangential arc.
 
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
-| `radius` |[`number`](/docs/kcl/types/number)| Radius of the arc. Not to be confused with Raiders of the Lost Ark. | No |
+| `radius` |`TyF64`| Radius of the arc. Not to be confused with Raiders of the Lost Ark. | No |
-| `offset` |[`number`](/docs/kcl/types/number)| Offset of the arc, in degrees. | No |
+| `offset` |`TyF64`| Offset of the arc, in degrees. | No |
 
 

docs/kcl/types/UnitAngle.md

@@ -43,6 +43,21 @@ A unit of angle.
 
 ----
 
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `Unknown`|  | No |
+
+
+----
+
 
 
 

docs/kcl/types/UnitLen.md

@@ -103,6 +103,21 @@ A unit of length.
 
 ----
 
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `Unknown`|  | No |
+
+
+----
+
 
 
 

e2e/playwright/basic-sketch.spec.ts

@@ -66,15 +66,17 @@ async function doBasicSketch(
   await page.waitForTimeout(500)
 
   if (openPanes.includes('code')) {
-    await expect(u.codeLocator)
+    await expect(
-      .toHaveText(`sketch001 = startSketchOn(XZ)profile001 = startProfileAt(${commonPoints.startAt}, sketch001)
+      u.codeLocator
+    ).toHaveText(`sketch001 = startSketchOn(XZ)profile001 = startProfileAt(${commonPoints.startAt}, sketch001)
   |> xLine(length = ${commonPoints.num1})`)
   }
   await page.waitForTimeout(500)
   await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 20)
   if (openPanes.includes('code')) {
-    await expect(u.codeLocator)
+    await expect(
-      .toHaveText(`sketch001 = startSketchOn(XZ)profile001 = startProfileAt(${
+      u.codeLocator
+    ).toHaveText(`sketch001 = startSketchOn(XZ)profile001 = startProfileAt(${
       commonPoints.startAt
     }, sketch001)
   |> xLine(length = ${commonPoints.num1})
@@ -85,8 +87,9 @@ async function doBasicSketch(
   await page.waitForTimeout(200)
   await page.mouse.click(startXPx, 500 - PUR * 20)
   if (openPanes.includes('code')) {
-    await expect(u.codeLocator)
+    await expect(
-      .toHaveText(`@settings(defaultLengthUnit = in)sketch001 = startSketchOn(XZ)profile001 = startProfileAt(${
+      u.codeLocator
+    ).toHaveText(`@settings(defaultLengthUnit = in)sketch001 = startSketchOn(XZ)profile001 = startProfileAt(${
       commonPoints.startAt
     }, sketch001)
   |> xLine(length = ${commonPoints.num1})
@@ -142,8 +145,9 @@ async function doBasicSketch(
 
   // Open the code pane.
   await u.openKclCodePanel()
-  await expect(u.codeLocator)
+  await expect(
-    .toHaveText(`@settings(defaultLengthUnit = in)sketch001 = startSketchOn(XZ)profile001 = startProfileAt(${
+    u.codeLocator
+  ).toHaveText(`@settings(defaultLengthUnit = in)sketch001 = startSketchOn(XZ)profile001 = startProfileAt(${
     commonPoints.startAt
   }, sketch001)
   |> xLine(length = ${commonPoints.num1}, tag = $seg01)

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

@@ -1,6 +1,6 @@
-import { bracket } from '@src/lib/exampleKcl'
-import fsp from 'fs/promises'
 import { join } from 'path'
+import { bracket } from '@e2e/playwright/fixtures/bracket'
+import fsp from 'fs/promises'
 
 import { TEST_CODE_LONG_WITH_ERROR_OUT_OF_VIEW } from '@e2e/playwright/storageStates'
 import {

e2e/playwright/command-bar-tests.spec.ts

@@ -1,6 +1,6 @@
+import path, { join } from 'path'
 import { KCL_DEFAULT_LENGTH } from '@src/lib/constants'
 import * as fsp from 'fs/promises'
-import path, { join } from 'path'
 
 import {
   executorInputPath,

e2e/playwright/desktop-export.spec.ts

@@ -1,5 +1,5 @@
-import fsp from 'fs/promises'
 import path from 'path'
+import fsp from 'fs/promises'
 
 import {
   executorInputPath,

e2e/playwright/editor-tests.spec.ts

@@ -1,6 +1,6 @@
+import { join } from 'path'
 import { uuidv4 } from '@src/lib/utils'
 import fsp from 'fs/promises'
-import { join } from 'path'
 
 import {
   TEST_COLORS,
@@ -82,7 +82,7 @@ sketch001 = startSketchOn(XY)
       .poll(() =>
         page.locator('[data-receive-command-type="scene_clear_all"]').count()
       )
-      .toBe(1)
+      .toBe(2)
     await expect
       .poll(() => page.locator('[data-message-type="execution-done"]').count())
       .toBe(2)
@@ -106,7 +106,7 @@ sketch001 = startSketchOn(XY)
     ).toHaveCount(3)
     await expect(
       page.locator('[data-receive-command-type="scene_clear_all"]')
-    ).toHaveCount(1)
+    ).toHaveCount(2)
   })
 
   test('ensure we use the cache, and do not clear on append', async ({
@@ -133,7 +133,7 @@ sketch001 = startSketchOn(XY)
     await u.openDebugPanel()
     await expect(
       page.locator('[data-receive-command-type="scene_clear_all"]')
-    ).toHaveCount(1)
+    ).toHaveCount(2)
     await expect(
       page.locator('[data-message-type="execution-done"]')
     ).toHaveCount(2)
@@ -161,7 +161,7 @@ sketch001 = startSketchOn(XY)
     ).toHaveCount(3)
     await expect(
       page.locator('[data-receive-command-type="scene_clear_all"]')
-    ).toHaveCount(1)
+    ).toHaveCount(2)
   })
 
   test('if you click the format button it formats your code', async ({
@@ -409,8 +409,9 @@ sketch_001 = startSketchOn(XY)
     // Hit alt+shift+f to format the code
     await page.keyboard.press('Alt+Shift+KeyF')
 
-    await expect(page.locator('.cm-content'))
+    await expect(
-      .toHaveText(`sketch001 = startSketchOn(XY)
+      page.locator('.cm-content')
+    ).toHaveText(`sketch001 = startSketchOn(XY)
   |> startProfileAt([-10, -10], %)
   |> line(end = [20, 0])
   |> line(end = [0, 20])
@@ -462,8 +463,9 @@ sketch_001 = startSketchOn(XY)
     await u.expectCmdLog('[data-message-type="execution-done"]')
     await u.closeDebugPanel()
 
-    await expect(page.locator('.cm-content'))
+    await expect(
-      .toHaveText(`sketch_001 = startSketchOn(XY)
+      page.locator('.cm-content')
+    ).toHaveText(`sketch_001 = startSketchOn(XY)
   |> startProfileAt([-10, -10], %)
   |> line(end = [20, 0])
   |> line(end = [0, 20])
@@ -731,7 +733,7 @@ sketch_001 = startSketchOn(XY)
     |> close()
     |> extrude(length = 10)
 
-    sketch001 = startSketchOn(box, revolveAxis)
+    sketch001 = startSketchOn(box, face = revolveAxis)
     |> startProfileAt([5, 10], %)
     |> line(end = [0, -10])
     |> line(end = [2, 0])
@@ -978,8 +980,9 @@ sketch001 = startSketchOn(XZ)
     await page.keyboard.up('Control')
 
     await page.waitForTimeout(100)
-    await expect(page.locator('.cm-content'))
+    await expect(
-      .toHaveText(`sketch001 = startSketchOn(XZ)
+      page.locator('.cm-content')
+    ).toHaveText(`sketch001 = startSketchOn(XZ)
   |> startProfileAt([4.61, -14.01], %)
   |> line(end = [12.73, -0.09])
   |> tangentialArc(endAbsolute = [24.95, -5.38])

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

@@ -1,5 +1,5 @@
-import * as fsp from 'fs/promises'
 import { join } from 'path'
+import * as fsp from 'fs/promises'
 
 import { expect, test } from '@e2e/playwright/zoo-test'
 
@@ -44,7 +44,7 @@ const FEATURE_TREE_SKETCH_CODE = `sketch001 = startSketchOn(XZ)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close(%)
 extrude001 = extrude(sketch001, length = 10)
-sketch002 = startSketchOn(extrude001, rectangleSegmentB001)
+sketch002 = startSketchOn(extrude001, face = rectangleSegmentB001)
   |> circle(
        center = [-1, 2],
        radius = .5
@@ -194,7 +194,7 @@ test.describe('Feature Tree pane', () => {
           highlightedCode: '',
           diagnostics: [],
           activeLines: [
-            'sketch002=startSketchOn(extrude001,rectangleSegmentB001)',
+            'sketch002=startSketchOn(extrude001,face=rectangleSegmentB001)',
           ],
         })
         await toolbar.exitSketchBtn.click()

e2e/playwright/file-tree.spec.ts

@@ -1,7 +1,7 @@
-import { FILE_EXT } from '@src/lib/constants'
 import * as fs from 'fs'
-import * as fsp from 'fs/promises'
 import { join } from 'path'
+import { FILE_EXT } from '@src/lib/constants'
+import * as fsp from 'fs/promises'
 
 import {
   createProject,

e2e/playwright/fixtures/bracket.ts

@@ -0,0 +1,16 @@
+import fs from 'fs'
+import path from 'path'
+
+export const bracket = fs.readFileSync(
+  path.resolve(
+    __dirname,
+    '..',
+    '..',
+    '..',
+    'public',
+    'kcl-samples',
+    'bracket',
+    'main.kcl'
+  ),
+  'utf8'
+)

e2e/playwright/fixtures/cmdBarFixture.ts

@@ -1,9 +1,9 @@
-import type { Locator, Page, Request, Route, TestInfo } from '@playwright/test'
-import { expect } from '@playwright/test'
 import * as fs from 'fs'
 import * as path from 'path'
+import type { Locator, Page, Request, Route, TestInfo } from '@playwright/test'
+import { expect } from '@playwright/test'
 
-type CmdBarSerialised =
+export type CmdBarSerialised =
   | {
       stage: 'commandBarClosed'
     }

e2e/playwright/fixtures/fixtureSetup.ts

@@ -7,11 +7,11 @@ import type {
 } from '@playwright/test'
 import { _electron as electron } from '@playwright/test'
 
+import fs from 'node:fs'
+import path from 'path'
 import { SETTINGS_FILE_NAME } from '@src/lib/constants'
 import type { DeepPartial } from '@src/lib/types'
 import fsp from 'fs/promises'
-import fs from 'node:fs'
-import path from 'path'
 
 import type { Settings } from '@rust/kcl-lib/bindings/Settings'
 

e2e/playwright/fixtures/sceneFixture.ts

@@ -44,6 +44,7 @@ export class SceneFixture {
   public page: Page
   public streamWrapper!: Locator
   public networkToggleConnected!: Locator
+  public engineConnectionsSpinner!: Locator
   public startEditSketchBtn!: Locator
 
   constructor(page: Page) {
@@ -52,6 +53,7 @@ export class SceneFixture {
     this.networkToggleConnected = page
       .getByTestId('network-toggle-ok')
       .or(page.getByTestId('network-toggle-other'))
+    this.engineConnectionsSpinner = page.getByTestId(`loading-engine`)
     this.startEditSketchBtn = page
       .getByRole('button', { name: 'Start Sketch' })
       .or(page.getByRole('button', { name: 'Edit Sketch' }))
@@ -228,6 +230,7 @@ export class SceneFixture {
   connectionEstablished = async () => {
     const timeout = 30000
     await expect(this.networkToggleConnected).toBeVisible({ timeout })
+    await expect(this.engineConnectionsSpinner).not.toBeVisible()
   }
 
   settled = async (cmdBar: CmdBarFixture) => {
@@ -235,6 +238,7 @@ export class SceneFixture {
 
     await expect(this.startEditSketchBtn).not.toBeDisabled({ timeout: 15_000 })
     await expect(this.startEditSketchBtn).toBeVisible()
+    await expect(this.engineConnectionsSpinner).not.toBeVisible()
 
     await cmdBar.openCmdBar()
     await cmdBar.chooseCommand('Settings · app · show debug panel')

e2e/playwright/fixtures/toolbarFixture.ts

@@ -27,6 +27,7 @@ export class ToolbarFixture {
   offsetPlaneButton!: Locator
   helixButton!: Locator
   startSketchBtn!: Locator
+  insertButton!: Locator
   lineBtn!: Locator
   tangentialArcBtn!: Locator
   circleBtn!: Locator
@@ -44,7 +45,7 @@ export class ToolbarFixture {
   featureTreePane!: Locator
   gizmo!: Locator
   gizmoDisabled!: Locator
-  insertButton!: Locator
+  loadButton!: Locator
 
   constructor(page: Page) {
     this.page = page
@@ -59,6 +60,7 @@ export class ToolbarFixture {
     this.offsetPlaneButton = page.getByTestId('plane-offset')
     this.helixButton = page.getByTestId('helix')
     this.startSketchBtn = page.getByTestId('sketch')
+    this.insertButton = page.getByTestId('insert')
     this.lineBtn = page.getByTestId('line')
     this.tangentialArcBtn = page.getByTestId('tangential-arc')
     this.circleBtn = page.getByTestId('circle-center')
@@ -68,6 +70,7 @@ export class ToolbarFixture {
     this.fileTreeBtn = page.locator('[id="files-button-holder"]')
     this.createFileBtn = page.getByTestId('create-file-button')
     this.treeInputField = page.getByTestId('tree-input-field')
+    this.loadButton = page.getByTestId('load-external-model-pane-button')
 
     this.filePane = page.locator('#files-pane')
     this.featureTreePane = page.locator('#feature-tree-pane')
@@ -79,8 +82,6 @@ export class ToolbarFixture {
     // element or two different elements can represent these states.
     this.gizmo = page.getByTestId('gizmo')
     this.gizmoDisabled = page.getByTestId('gizmo-disabled')
-
-    this.insertButton = page.getByTestId('insert-pane-button')
   }
 
   get logoLink() {
@@ -204,6 +205,11 @@ export class ToolbarFixture {
     ).toBeVisible()
     await this.page.getByTestId('dropdown-three-point-arc').click()
   }
+  selectLine = async () => {
+    await this.page
+      .getByRole('button', { name: 'line Line', exact: true })
+      .click()
+  }
 
   async closePane(paneId: SidebarType) {
     return closePane(this.page, paneId + SIDEBAR_BUTTON_SUFFIX)

e2e/playwright/import-ui.spec.ts

@@ -1,9 +1,9 @@
+import path from 'path'
 import { expect, test } from '@e2e/playwright/zoo-test'
 import * as fsp from 'fs/promises'
-import path from 'path'
 
 test.describe('Import UI tests', () => {
-  test('shows toast when trying to sketch on imported face', async ({
+  test('shows toast when trying to sketch on imported face, and hovering over imported geometry should NOT highlight any code', async ({
     context,
     page,
     homePage,
@@ -44,8 +44,8 @@ profile001 = startProfileAt([-134.53, -56.17], sketch001)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $seg02)
   |> close()
 extrude001 = extrude(profile001, length = 100)
-sketch003 = startSketchOn(extrude001, seg02)
+sketch003 = startSketchOn(extrude001, face = seg02)
-sketch002 = startSketchOn(extrude001, seg01)`
+sketch002 = startSketchOn(extrude001, face = seg01)`
       )
     })
 
@@ -93,7 +93,6 @@ sketch002 = startSketchOn(extrude001, seg01)`
       await toolbar.startSketchPlaneSelection()
 
       // Click on a face from the imported model
-      // await new Promise(() => {})
       await importedFaceClick()
 
       // Verify toast appears with correct content

e2e/playwright/lib/api-reporter.ts

@@ -19,8 +19,9 @@ class MyAPIReporter implements Reporter {
       target: process.env.TARGET || null,
       platform: process.env.RUNNER_OS || process.platform,
       // Extra test and result data
-      annotations: test.annotations.map((a) => a.type),
+      annotations: test.annotations.map((a) => a.type), // e.g. 'fail' or 'fixme'
-      retries: result.retry,
+      retry: result.retry,
+      tags: test.tags, // e.g. '@snapshot' or '@skipWin'
       // Extra environment variables
       CI_COMMIT_SHA: process.env.CI_COMMIT_SHA || null,
       CI_PR_NUMBER: process.env.CI_PR_NUMBER || null,

e2e/playwright/machines.spec.ts

@@ -1,5 +1,5 @@
-import fsp from 'fs/promises'
 import { join } from 'path'
+import fsp from 'fs/promises'
 
 import { executorInputPath } from '@e2e/playwright/test-utils'
 import { expect, test } from '@e2e/playwright/zoo-test'

e2e/playwright/named-views.spec.ts

@@ -1,14 +1,13 @@
+import { join } from 'path'
 import { PROJECT_SETTINGS_FILE_NAME } from '@src/lib/constants'
 import * as fsp from 'fs/promises'
-import { join } from 'path'
 
 import type { NamedView } from '@rust/kcl-lib/bindings/NamedView'
 
 import {
   createProject,
-  orRunWhenFullSuiteEnabled,
   perProjectSettingsToToml,
-  runningOnMac,
+  runningOnWindows,
   tomlToPerProjectSettings,
 } from '@e2e/playwright/test-utils'
 import { expect, test } from '@e2e/playwright/zoo-test'
@@ -63,9 +62,7 @@ function tomlStringOverWriteNamedViewUuids(toml: string): string {
 }
 
 test.describe('Named view tests', () => {
-  if (runningOnMac()) {
+  test.skip(runningOnWindows(), 'Windows line endings break snapshot matching')
-    test.fixme(orRunWhenFullSuiteEnabled())
-  }
   test('Verify project.toml is not created', async ({ page }, testInfo) => {
     // Create project and load it
     const projectName = 'named-views'
@@ -127,7 +124,7 @@ test.describe('Named view tests', () => {
 
       // Write the entire tomlString to a snapshot.
       // There are many key/value pairs to check this is a safer match.
-      expect(tomlString).toMatchSnapshot('verify-named-view-gets-created')
+      expect(tomlString).toMatchSnapshot('verify-named-view-gets-created.toml')
     }).toPass()
   })
   test('Verify named view gets deleted', async ({
@@ -173,7 +170,7 @@ test.describe('Named view tests', () => {
 
       // Write the entire tomlString to a snapshot.
       // There are many key/value pairs to check this is a safer match.
-      expect(tomlString).toMatchSnapshot('verify-named-view-gets-created')
+      expect(tomlString).toMatchSnapshot('verify-named-view-gets-created.toml')
     }).toPass()
 
     // Delete a named view
@@ -193,7 +190,7 @@ test.describe('Named view tests', () => {
 
       // Write the entire tomlString to a snapshot.
       // There are many key/value pairs to check this is a safer match.
-      expect(tomlString).toMatchSnapshot('verify-named-view-gets-deleted')
+      expect(tomlString).toMatchSnapshot('verify-named-view-gets-deleted.toml')
     }).toPass()
   })
   test('Verify named view gets loaded', async ({
@@ -239,7 +236,7 @@ test.describe('Named view tests', () => {
 
       // Write the entire tomlString to a snapshot.
       // There are many key/value pairs to check this is a safer match.
-      expect(tomlString).toMatchSnapshot('verify-named-view-gets-created')
+      expect(tomlString).toMatchSnapshot('verify-named-view-gets-created.toml')
     }).toPass()
 
     // Create a load a named view
@@ -308,7 +305,9 @@ test.describe('Named view tests', () => {
 
       // Write the entire tomlString to a snapshot.
       // There are many key/value pairs to check this is a safer match.
-      expect(tomlString).toMatchSnapshot('verify-two-named-view-gets-created')
+      expect(tomlString).toMatchSnapshot(
+        'verify-two-named-view-gets-created.toml'
+      )
     }).toPass()
   })
 })

e2e/playwright/named-views.spec.ts-snapshots/verify-named-view-gets-created-chromium-linux

@@ -1,16 +0,0 @@
-[settings]
-modeling = { }
-text_editor = { }
-command_bar = { }
-
-[settings.app.named_views.0656fb1a-9640-473e-b334-591dc70c0138]
-name = "uuid1"
-eye_offset = 1_378.0059
-fov_y = 45
-is_ortho = false
-ortho_scale_enabled = true
-ortho_scale_factor = 1.6
-pivot_position = [ 0, 0, 0 ]
-pivot_rotation = [ 0.5380994, 0.0, 0.0, 0.8428814 ]
-world_coord_system = "right_handed_up_z"
-version = 1

e2e/playwright/named-views.spec.ts-snapshots/verify-two-named-view-gets-created-chromium-darwin

@@ -1,28 +0,0 @@
-[settings]
-modeling = { }
-text_editor = { }
-command_bar = { }
-
-[settings.app.named_views.0656fb1a-9640-473e-b334-591dc70c0138]
-name = "uuid1"
-eye_offset = 1_378.0059
-fov_y = 45
-is_ortho = false
-ortho_scale_enabled = true
-ortho_scale_factor = 1.6
-pivot_position = [ 0, 0, 0 ]
-pivot_rotation = [ 0.5380994, 0.0, 0.0, 0.8428814 ]
-world_coord_system = "right_handed_up_z"
-version = 1
-
-[settings.app.named_views.c810cf04-c6cc-4a4a-8b11-17bf445dcab7]
-name = "uuid2"
-eye_offset = 1_378.0059
-fov_y = 45
-is_ortho = false
-ortho_scale_enabled = true
-ortho_scale_factor = 1.6
-pivot_position = [ 1_826.5239, 0.0, 0.0 ]
-pivot_rotation = [ 0.5380994, 0.0, 0.0, 0.8428814 ]
-world_coord_system = "right_handed_up_z"
-version = 1

e2e/playwright/native-file-menu.spec.ts

@@ -534,7 +534,7 @@ test.describe('Native file menu', { tag: ['@electron'] }, () => {
         const expected = 'Open project'
         expect(actual).toBe(expected)
       })
-      test('Modeling.File.Load a sample model', async ({
+      test('Modeling.File.Load external model', async ({
         tronApp,
         cmdBar,
         page,
@@ -555,10 +555,10 @@ test.describe('Native file menu', { tag: ['@electron'] }, () => {
             throw new Error('app or app.applicationMenu is missing')
           }
           const openProject = app.applicationMenu.getMenuItemById(
-            'File.Load a sample model'
+            'File.Load external model'
           )
           if (!openProject) {
-            throw new Error('File.Load a sample model')
+            throw new Error('File.Load external model')
           }
           openProject.click()
         })
@@ -568,44 +568,7 @@ test.describe('Native file menu', { tag: ['@electron'] }, () => {
         const actual = await cmdBar.cmdBarElement
           .getByTestId('command-name')
           .textContent()
-        const expected = 'Open sample'
+        const expected = 'Load external model'
-        expect(actual).toBe(expected)
-      })
-      test('Modeling.File.Insert from project file', async ({
-        tronApp,
-        cmdBar,
-        page,
-        homePage,
-        scene,
-      }) => {
-        if (!tronApp) {
-          throwTronAppMissing()
-          return
-        }
-        await homePage.goToModelingScene()
-        await scene.settled(cmdBar)
-
-        // Run electron snippet to find the Menu!
-        await page.waitForTimeout(100) // wait for createModelingPageMenu() to run
-        await tronApp.electron.evaluate(async ({ app }) => {
-          if (!app || !app.applicationMenu) {
-            throw new Error('app or app.applicationMenu is missing')
-          }
-          const openProject = app.applicationMenu.getMenuItemById(
-            'File.Insert from project file'
-          )
-          if (!openProject) {
-            throw new Error('File.Insert from project file')
-          }
-          openProject.click()
-        })
-        // Check that the command bar is opened
-        await expect(cmdBar.cmdBarElement).toBeVisible()
-        // Check the placeholder project name exists
-        const actual = await cmdBar.cmdBarElement
-          .getByTestId('command-name')
-          .textContent()
-        const expected = 'Insert'
         expect(actual).toBe(expected)
       })
       test('Modeling.File.Export current part', async ({
@@ -2159,6 +2122,44 @@ test.describe('Native file menu', { tag: ['@electron'] }, () => {
         expect(actual).toBe(expected)
       })
 
+      test('Modeling.Design.Insert from project file', async ({
+        tronApp,
+        cmdBar,
+        page,
+        homePage,
+        scene,
+      }) => {
+        if (!tronApp) {
+          throwTronAppMissing()
+          return
+        }
+        await homePage.goToModelingScene()
+        await scene.settled(cmdBar)
+
+        // Run electron snippet to find the Menu!
+        await page.waitForTimeout(100) // wait for createModelingPageMenu() to run
+        await tronApp.electron.evaluate(async ({ app }) => {
+          if (!app || !app.applicationMenu) {
+            throw new Error('app or app.applicationMenu is missing')
+          }
+          const openProject = app.applicationMenu.getMenuItemById(
+            'Design.Insert from project file'
+          )
+          if (!openProject) {
+            throw new Error('Design.Insert from project file')
+          }
+          openProject.click()
+        })
+        // Check that the command bar is opened
+        await expect(cmdBar.cmdBarElement).toBeVisible()
+        // Check the placeholder project name exists
+        const actual = await cmdBar.cmdBarElement
+          .getByTestId('command-name')
+          .textContent()
+        const expected = 'Insert'
+        expect(actual).toBe(expected)
+      })
+
       test('Modeling.Design.Create with Zoo Text-To-CAD', async ({
         tronApp,
         cmdBar,

e2e/playwright/onboarding-tests.spec.ts

@@ -1,7 +1,7 @@
-import { bracket } from '@src/lib/exampleKcl'
+import { join } from 'path'
+import { bracket } from '@e2e/playwright/fixtures/bracket'
 import { onboardingPaths } from '@src/routes/Onboarding/paths'
 import fsp from 'fs/promises'
-import { join } from 'path'
 
 import { expectPixelColor } from '@e2e/playwright/fixtures/sceneFixture'
 import {
@@ -15,6 +15,7 @@ import {
   executorInputPath,
   getUtils,
   orRunWhenFullSuiteEnabled,
+  runningOnWindows,
   settingsToToml,
 } from '@e2e/playwright/test-utils'
 import { expect, test } from '@e2e/playwright/zoo-test'
@@ -279,6 +280,9 @@ test.describe('Onboarding tests', () => {
     if (!tronApp) {
       fail()
     }
+    if (runningOnWindows()) {
+      test.fixme(orRunWhenFullSuiteEnabled())
+    }
     await tronApp.cleanProjectDir({
       app: {
         onboarding_status: '/parametric-modeling',

e2e/playwright/point-click-assemblies.spec.ts

@@ -1,5 +1,5 @@
-import * as fsp from 'fs/promises'
 import path from 'path'
+import * as fsp from 'fs/promises'
 
 import type { CmdBarFixture } from '@e2e/playwright/fixtures/cmdBarFixture'
 import type { ToolbarFixture } from '@e2e/playwright/fixtures/toolbarFixture'

e2e/playwright/point-click.spec.ts

@@ -1,6 +1,6 @@
-import type { Locator, Page } from '@playwright/test'
 import fs from 'node:fs/promises'
 import path from 'node:path'
+import type { Locator, Page } from '@playwright/test'
 
 import type { EditorFixture } from '@e2e/playwright/fixtures/editorFixture'
 import type { SceneFixture } from '@e2e/playwright/fixtures/sceneFixture'
@@ -220,7 +220,7 @@ test.describe('Point-and-click tests', () => {
     )`,
 
         afterChamferSelectSnippet:
-          'sketch002 = startSketchOn(extrude001, seg03)',
+          'sketch002 = startSketchOn(extrude001, face = seg03)',
         afterRectangle1stClickSnippet:
           'startProfileAt([205.96, 254.59], sketch002)',
         afterRectangle2ndClickSnippet: `angledLine(angle=0,length=11.39,tag=$rectangleSegmentA002)
@@ -244,7 +244,7 @@ test.describe('Point-and-click tests', () => {
        )`,
 
         afterChamferSelectSnippet:
-          'sketch003 = startSketchOn(extrude001, seg04)',
+          'sketch003 = startSketchOn(extrude001, face = seg04)',
         afterRectangle1stClickSnippet:
           'startProfileAt([-209.64, 255.28], sketch003)',
         afterRectangle2ndClickSnippet: `angledLine(angle=0,length=11.56,tag=$rectangleSegmentA003)
@@ -266,7 +266,7 @@ test.describe('Point-and-click tests', () => {
          ]
        )`,
         afterChamferSelectSnippet:
-          'sketch004 = startSketchOn(extrude001, seg05)',
+          'sketch004 = startSketchOn(extrude001, face = seg05)',
         afterRectangle1stClickSnippet:
           'startProfileAt([82.57, 322.96], sketch004)',
         afterRectangle2ndClickSnippet: `angledLine(angle=0,length=11.16,tag=$rectangleSegmentA004)
@@ -284,7 +284,7 @@ test.describe('Point-and-click tests', () => {
         beforeChamferSnippetEnd:
           '|> chamfer(length = 30, tags = [getNextAdjacentEdge(yo)])',
         afterChamferSelectSnippet:
-          'sketch005 = startSketchOn(extrude001, seg06)',
+          'sketch005 = startSketchOn(extrude001, face = seg06)',
         afterRectangle1stClickSnippet:
           'startProfileAt([-23.43, 19.69], sketch005)',
         afterRectangle2ndClickSnippet: `angledLine(angle=0,length=9.1,tag=$rectangleSegmentA005)
@@ -309,28 +309,28 @@ extrude001 = extrude(sketch001, length = 100)
   |> chamfer(length = 30, tags = [seg01], tag = $seg04)
   |> chamfer(length = 30, tags = [getNextAdjacentEdge(seg02)], tag = $seg05)
   |> chamfer(length = 30, tags = [getNextAdjacentEdge(yo)], tag = $seg06)
-sketch005 = startSketchOn(extrude001, seg06)
+sketch005 = startSketchOn(extrude001, face = seg06)
 profile004=startProfileAt([-23.43,19.69], sketch005)
   |> angledLine(angle = 0, length = 9.1, tag = $rectangleSegmentA005)
   |> angledLine(angle = segAng(rectangleSegmentA005) - 90, length = 84.07)
   |> angledLine(angle = segAng(rectangleSegmentA005), length = -segLen(rectangleSegmentA005))
   |> line(endAbsolute=[profileStartX(%), profileStartY(%)])
   |> close()
-sketch004 = startSketchOn(extrude001, seg05)
+sketch004 = startSketchOn(extrude001, face = seg05)
 profile003 = startProfileAt([82.57, 322.96], sketch004)
   |> angledLine(angle = 0, length = 11.16, tag = $rectangleSegmentA004)
   |> angledLine(angle = segAng(rectangleSegmentA004) - 90, length = 103.07)
   |> angledLine(angle = segAng(rectangleSegmentA004), length = -segLen(rectangleSegmentA004))
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
-sketch003 = startSketchOn(extrude001, seg04)
+sketch003 = startSketchOn(extrude001, face = seg04)
 profile002 = startProfileAt([-209.64, 255.28], sketch003)
   |> angledLine(angle = 0, length = 11.56, tag = $rectangleSegmentA003)
   |> angledLine(angle = segAng(rectangleSegmentA003) - 90, length = 106.84)
   |> angledLine(angle = segAng(rectangleSegmentA003), length = -segLen(rectangleSegmentA003))
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
-sketch002 = startSketchOn(extrude001, seg03)
+sketch002 = startSketchOn(extrude001, face = seg03)
 profile001 = startProfileAt([205.96, 254.59], sketch002)
   |> angledLine(angle = 0, length = 11.39, tag = $rectangleSegmentA002)
   |> angledLine(angle = segAng(rectangleSegmentA002) - 90, length = 105.26)
@@ -383,7 +383,7 @@ profile001 = startProfileAt([205.96, 254.59], sketch002)
     ])`,
         beforeChamferSnippetEnd: ')',
         afterChamferSelectSnippet:
-          'sketch002 = startSketchOn(extrude001, seg03)',
+          'sketch002 = startSketchOn(extrude001, face = seg03)',
         afterRectangle1stClickSnippet:
           'startProfileAt([205.96, 254.59], sketch002)',
         afterRectangle2ndClickSnippet: `angledLine(angle=0,length=11.39,tag=$rectangleSegmentA002)
@@ -416,7 +416,7 @@ chamf = chamfer(
          getNextAdjacentEdge(seg02)
        ],
      )
-sketch002 = startSketchOn(extrude001, seg03)
+sketch002 = startSketchOn(extrude001, face = seg03)
 profile001 = startProfileAt([205.96, 254.59], sketch002)
   |> angledLine(angle = 0, length = 11.39, tag = $rectangleSegmentA002)
   |> angledLine(angle = segAng(rectangleSegmentA002) - 90, length = 105.26)
@@ -2935,9 +2935,9 @@ extrude001 = extrude(sketch001, length = 30)
       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(extrude001, faces = [END], thickness = 5)'
       const editedShellDeclaration =
-        "shell001 = shell(extrude001, faces = ['end'], thickness = 2)"
+        'shell001 = shell(extrude001, faces = [END], thickness = 2)'
 
       await test.step(`Look for the grey of the shape`, async () => {
         await scene.expectPixelColor([127, 127, 127], testPoint, 15)
@@ -3079,9 +3079,9 @@ extrude001 = extrude(sketch001, length = 40)
     const [clickOnWall] = scene.makeMouseHelpers(testPoint.x, testPoint.y + 70)
     const mutatedCode = 'xLine(length = -40, tag = $seg01)'
     const shellDeclaration =
-      "shell001 = shell(extrude001, faces = ['end', seg01], thickness = 5)"
+      'shell001 = shell(extrude001, faces = [END, seg01], thickness = 5)'
     const editedShellDeclaration =
-      "shell001 = shell(extrude001, faces = ['end', seg01], thickness = 1)"
+      'shell001 = shell(extrude001, faces = [END, seg01], thickness = 1)'
 
     await test.step(`Look for the grey of the shape`, async () => {
       await scene.expectPixelColor([99, 99, 99], testPoint, 15)
@@ -3188,7 +3188,7 @@ sketch001 = startSketchOn(XZ)
   |> circle(center = [0, 0], radius = 100)
   |> extrude(length = 100)
 
-sketch002 = startSketchOn(sketch001, 'END')
+sketch002 = startSketchOn(sketch001, face = 'END')
   |> circle(center = [0, 0], radius = 50)
   |> extrude(length = 50)
   `,
@@ -3197,7 +3197,7 @@ sketch001 = startSketchOn(XZ)
   |> circle(center = [0, 0], radius = 100)
 extrude001 = extrude(sketch001, length = 100)
 
-sketch002 = startSketchOn(extrude001, 'END')
+sketch002 = startSketchOn(extrude001, face = 'END')
   |> circle(center = [0, 0], radius = 50)
 extrude002 = extrude(sketch002, length = 50)
   `,
@@ -3224,7 +3224,7 @@ extrude002 = extrude(sketch002, length = 50)
       const testPoint = { x: 580, y: 320 }
       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(${shellTarget}, faces = [END], thickness = 5)`
 
       await test.step(`Look for the grey of the shape`, async () => {
         await scene.expectPixelColor([113, 113, 113], testPoint, 15)
@@ -3299,7 +3299,7 @@ profile001 = startProfileAt([-20, 20], sketch001)
 `
       const extrudeCode = `extrude001 = extrude(profile001, length = 40)
 `
-      const shellCode = `shell001 = shell(extrude001, faces = ['end'], thickness = 5)
+      const shellCode = `shell001 = shell(extrude001, faces = [END], thickness = 5)
 `
       const initialCode = sketchCode + extrudeCode + shellCode
       await context.addInitScript((initialCode) => {
@@ -3447,7 +3447,7 @@ tag=$rectangleSegmentC001,
 |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
 |> close()
 extrude001 = extrude(sketch001, length = 200)
-sketch002 = startSketchOn(extrude001, rectangleSegmentA001)
+sketch002 = startSketchOn(extrude001, face = rectangleSegmentA001)
 |> startProfileAt([-66.77, 84.81], %)
 |> angledLine(angle = 180, length = 27.08, tag = $rectangleSegmentA002)
 |> angledLine(
@@ -3535,7 +3535,7 @@ tag=$rectangleSegmentC002,
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
 extrude001 = extrude(sketch001, length = 50)
-sketch002 = startSketchOn(extrude001, rectangleSegmentA001)
+sketch002 = startSketchOn(extrude001, face = rectangleSegmentA001)
   |> circle(center = [-11.34, 10.0], radius = 8.69)
 
 `
@@ -3623,7 +3623,7 @@ sketch002 = startSketchOn(extrude001, rectangleSegmentA001)
       |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
       |> close()
     extrude001 = extrude(sketch001, length = 5)
-    sketch003 = startSketchOn(extrude001, 'START')
+    sketch003 = startSketchOn(extrude001, face = 'START')
       |> circle(
         center = [-0.69, 0.56],
         radius = 0.28

e2e/playwright/projects.spec.ts

@@ -1,7 +1,7 @@
-import { DEFAULT_PROJECT_KCL_FILE } from '@src/lib/constants'
 import fs from 'fs'
-import fsp from 'fs/promises'
 import path from 'path'
+import { DEFAULT_PROJECT_KCL_FILE } from '@src/lib/constants'
+import fsp from 'fs/promises'
 
 import type { Paths } from '@e2e/playwright/test-utils'
 import {

e2e/playwright/regression-tests.spec.ts

@@ -1,8 +1,8 @@
+import path from 'path'
+import { bracket } from '@e2e/playwright/fixtures/bracket'
 import type { Page } from '@playwright/test'
-import { bracket } from '@src/lib/exampleKcl'
 import { reportRejection } from '@src/lib/trap'
 import * as fsp from 'fs/promises'
-import path from 'path'
 
 import { TEST_CODE_TRIGGER_ENGINE_EXPORT_ERROR } from '@e2e/playwright/storageStates'
 import type { TestColor } from '@e2e/playwright/test-utils'
@@ -304,8 +304,9 @@ extrude001 = extrude(sketch001, length = 50)
       await page.keyboard.press('Enter')
       await page.keyboard.press('ArrowLeft')
 
-      await expect(page.locator('.cm-content'))
+      await expect(
-        .toContainText(`exampleSketch = startSketchOn("XZ")
+        page.locator('.cm-content')
+      ).toContainText(`exampleSketch = startSketchOn("XZ")
       |> startProfileAt([0, 0], %)
       |> angledLine(angle = 50, length = 45 )
       |> yLine(endAbsolute = 0)

e2e/playwright/sketch-tests.spec.ts

@@ -1,7 +1,7 @@
-import type { Page } from '@playwright/test'
-import { roundOff, uuidv4 } from '@src/lib/utils'
 import fs from 'node:fs/promises'
 import path from 'node:path'
+import type { Page } from '@playwright/test'
+import { roundOff, uuidv4 } from '@src/lib/utils'
 
 import type { CmdBarFixture } from '@e2e/playwright/fixtures/cmdBarFixture'
 import type { HomePageFixture } from '@e2e/playwright/fixtures/homePageFixture'
@@ -161,7 +161,8 @@ sketch001 = startSketchOn(XZ)
       // click to add segment
       await page.mouse.click(700, 200)
 
-      await expect.poll(u.normalisedEditorCode, { timeout: 1000 })
+      await expect
+        .poll(u.normalisedEditorCode, { timeout: 1000 })
         .toBe(`@settings(defaultLengthUnit = in)
 
 
@@ -403,8 +404,9 @@ sketch001 = startProfileAt([12.34, -12.34], sketch002)
       await u.openKclCodePanel()
 
       // expect the code to have changed
-      await expect(page.locator('.cm-content'))
+      await expect(
-        .toHaveText(`sketch001 = startSketchOn(XZ)
+        page.locator('.cm-content')
+      ).toHaveText(`sketch001 = startSketchOn(XZ)
   |> startProfileAt([6.44, -12.07], %)
   |> line(end = [14.72, 1.97])
   |> tangentialArc(endAbsolute = [26.92, -3.32])
@@ -1077,7 +1079,7 @@ profile001 = startProfileAt([${roundOff(scale * 69.6)}, ${roundOff(
     // The click should generate a new sketch starting on the end face of extrude001
     // signified by the implicit 'END' tag for that solid.
     await page.waitForTimeout(800)
-    await page.getByText(`END')`).click()
+    await page.getByText(`END)`).click()
     await page.keyboard.press('End')
     await page.keyboard.press('Enter')
     await page.keyboard.type('  |>', { delay: 100 })
@@ -1099,7 +1101,7 @@ profile001 = startProfileAt([${roundOff(scale * 69.6)}, ${roundOff(
     |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
     |> close()
   extrude001 = extrude(sketch001, length = 5)
-  sketch002 = startSketchOn(extrude001, 'END')
+  sketch002 = startSketchOn(extrude001, face = END)
     |>
   `.replace(/\s/g, '')
     )
@@ -1363,73 +1365,6 @@ profile001 = startProfileAt([${roundOff(scale * 69.6)}, ${roundOff(
   })
 })
 
-test.describe('Sketch mode should be toleratant to syntax errors', () => {
-  test(
-    'adding a syntax error, recovers after fixing',
-    { tag: ['@skipWin'] },
-    async ({ page, homePage, context, scene, editor, toolbar }) => {
-      const file = await fs.readFile(
-        path.resolve(
-          __dirname,
-          '../../',
-          './rust/kcl-lib/e2e/executor/inputs/e2e-can-sketch-on-chamfer.kcl'
-        ),
-        'utf-8'
-      )
-      await context.addInitScript((file) => {
-        localStorage.setItem('persistCode', file)
-      }, file)
-      await homePage.goToModelingScene()
-
-      const [objClick] = scene.makeMouseHelpers(600, 250)
-      const arrowHeadLocation = { x: 706, y: 129 } as const
-      const arrowHeadWhite = TEST_COLORS.WHITE
-      const backgroundGray: [number, number, number] = [28, 28, 28]
-      const verifyArrowHeadColor = async (c: [number, number, number]) =>
-        scene.expectPixelColor(c, arrowHeadLocation, 15)
-
-      await test.step('check chamfer selection changes cursor positon', async () => {
-        await expect(async () => {
-          // sometimes initial click doesn't register
-          await objClick()
-          await editor.expectActiveLinesToBe([
-            '|> startProfileAt([75.8, 317.2], %) // [$startCapTag, $EndCapTag]',
-          ])
-        }).toPass({ timeout: 15_000, intervals: [500] })
-      })
-
-      await test.step('enter sketch and sanity check segments have been drawn', async () => {
-        await toolbar.editSketch()
-        // this checks sketch segments have been drawn
-        await verifyArrowHeadColor(arrowHeadWhite)
-      })
-
-      await test.step('Make typo and check the segments have Disappeared and there is a syntax error', async () => {
-        await editor.replaceCode('line(endAbsolute = [pro', 'badBadBadFn([pro')
-        await editor.expectState({
-          activeLines: [],
-          diagnostics: ['memoryitemkey`badBadBadFn`isnotdefined'],
-          highlightedCode: '',
-        })
-        // this checks sketch segments have failed to be drawn
-        await verifyArrowHeadColor(backgroundGray)
-      })
-
-      await test.step('', async () => {
-        await editor.replaceCode('badBadBadFn([pro', 'line(endAbsolute = [pro')
-        await editor.expectState({
-          activeLines: [],
-          diagnostics: [],
-          highlightedCode: '',
-        })
-        // this checks sketch segments have been drawn
-        await verifyArrowHeadColor(arrowHeadWhite)
-      })
-      await page.waitForTimeout(100)
-    }
-  )
-})
-
 test.describe(`Sketching with offset planes`, () => {
   test(`Can select an offset plane to sketch on`, async ({
     context,
@@ -1623,6 +1558,7 @@ profile002 = startProfileAt([117.2, 56.08], sketch001)
         localStorage.setItem(
           'persistCode',
           `@settings(defaultLengthUnit = in)
+
 sketch001 = startSketchOn(XZ)
 profile002 = startProfileAt([40.68, 87.67], sketch001)
   |> xLine(length = 239.17)
@@ -2634,7 +2570,7 @@ profile001 = startProfileAt([6.71, -3.66], sketch001)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
 extrude001 = extrude(profile001, length = 20)
-sketch002 = startSketchOn(extrude001, seg01)
+sketch002 = startSketchOn(extrude001, face = seg01)
 profile002 = startProfileAt([0.75, 13.46], sketch002)
   |> line(end = [4.52, 3.79])
   |> line(end = [5.98, -2.81])
@@ -3034,4 +2970,387 @@ test.describe('Redirecting to home page and back to the original file should cle
     await homePage.openProject('testDefault')
     await expect(page.getByText('323.49')).not.toBeVisible()
   })
+
+  test('Straight line snapping to previous tangent', async ({
+    page,
+    homePage,
+    toolbar,
+    scene,
+    cmdBar,
+    context,
+    editor,
+  }) => {
+    await context.addInitScript(() => {
+      localStorage.setItem('persistCode', `@settings(defaultLengthUnit = mm)`)
+    })
+
+    const viewportSize = { width: 1200, height: 900 }
+    await page.setBodyDimensions(viewportSize)
+    await homePage.goToModelingScene()
+
+    // wait until scene is ready to be interacted with
+    await scene.connectionEstablished()
+    await scene.settled(cmdBar)
+
+    await page.getByRole('button', { name: 'Start Sketch' }).click()
+
+    // select an axis plane
+    await page.mouse.click(700, 200)
+
+    // Needed as we don't yet have a way to get a signal from the engine that the camera has animated to the sketch plane
+    await page.waitForTimeout(3000)
+
+    const center = { x: viewportSize.width / 2, y: viewportSize.height / 2 }
+    const { click00r } = getMovementUtils({ center, page })
+
+    // Draw line
+    await click00r(0, 0)
+    await click00r(200, -200)
+
+    // Draw arc
+    await toolbar.tangentialArcBtn.click()
+    await click00r(0, 0)
+    await click00r(100, 100)
+
+    // Switch back to line
+    await toolbar.selectLine()
+    await click00r(0, 0)
+    await click00r(-100, 100)
+
+    // Draw a 3 point arc
+    await toolbar.selectThreePointArc()
+    await click00r(0, 0)
+    await click00r(0, 100)
+    await click00r(100, 0)
+
+    // draw a line to opposite tangnet direction of previous arc
+    await toolbar.selectLine()
+    await click00r(0, 0)
+    await click00r(-200, 200)
+
+    await editor.expectEditor.toContain(
+      `@settings(defaultLengthUnit = mm)
+
+sketch001 = startSketchOn(XZ)
+profile001 = startProfileAt([0, 0], sketch001)
+  |> line(end = [191.39, 191.39])
+  |> tangentialArc(endAbsolute = [287.08, 95.69], tag = $seg01)
+  |> angledLine(angle = tangentToEnd(seg01), length = 135.34)
+  |> arcTo({
+       interior = [191.39, -95.69],
+       end = [287.08, -95.69]
+     }, %, $seg02)
+  |> angledLine(angle = tangentToEnd(seg02) + turns::HALF_TURN, length = 270.67)
+`.replaceAll('\n', '')
+    )
+  })
+})
+
+test.describe('manual edits during sketch mode', () => {
+  test('Can edit sketch through feature tree with variable modifications', async ({
+    page,
+    context,
+    homePage,
+    scene,
+    editor,
+    toolbar,
+    cmdBar,
+  }) => {
+    const initialCode = `myVar1 = 5
+    myVar2 = 6
+    
+    sketch001 = startSketchOn(XZ)
+    profile001 = startProfileAt([106.68, 89.77], sketch001)
+      |> line(end = [132.34, 157.8])
+      |> line(end = [67.65, -460.55], tag = $seg01)
+      |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+      |> close()
+    extrude001 = extrude(profile001, length = 500)
+    sketch002 = startSketchOn(extrude001, face = seg01)
+    profile002 = startProfileAt([83.39, 329.15], sketch002)
+      |> angledLine(angle = 0, length = 119.61, tag = $rectangleSegmentA001)
+      |> angledLine(angle = segAng(rectangleSegmentA001) - 90, length = 156.54, angle = -28)
+      |> angledLine(
+          angle = segAng(rectangleSegmentA001),
+          length = -segLen(rectangleSegmentA001),
+          angle = -151,
+          length = 116.27,
+        )
+      |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+      |> close()
+    profile003 = startProfileAt([-201.08, 254.17], sketch002)
+      |> line(end = [103.55, 33.32])
+      |> line(end = [48.8, -153.54])`
+
+    await context.addInitScript((initialCode) => {
+      localStorage.setItem('persistCode', initialCode)
+    }, initialCode)
+
+    await homePage.goToModelingScene()
+    await scene.connectionEstablished()
+    await scene.settled(cmdBar)
+    const expectSketchOriginToBeDrawn = async () => {
+      await scene.expectPixelColor(TEST_COLORS.WHITE, { x: 672, y: 193 }, 15)
+    }
+
+    await test.step('Open feature tree and edit second sketch', async () => {
+      await toolbar.openFeatureTreePane()
+      const sketchButton = await toolbar.getFeatureTreeOperation('Sketch', 1)
+      await sketchButton.dblclick()
+      await page.waitForTimeout(700) // Wait for engine animation
+      await expectSketchOriginToBeDrawn()
+    })
+
+    await test.step('Add new variable and wait for re-execution', async () => {
+      await page.waitForTimeout(500) // wait for deferred execution
+      await editor.replaceCode('myVar2 = 6', 'myVar2 = 6\nmyVar3 = 7')
+      await page.waitForTimeout(2000) // wait for deferred execution
+      await expectSketchOriginToBeDrawn()
+    })
+
+    const handle1Location = { x: 843, y: 235 }
+
+    await test.step('Edit sketch by dragging handle', async () => {
+      await page.waitForTimeout(500)
+      await editor.expectEditor.toContain('length = 156.54, angle = -28')
+      await page.mouse.move(handle1Location.x, handle1Location.y)
+      await page.mouse.down()
+      await page.mouse.move(handle1Location.x + 50, handle1Location.y + 50, {
+        steps: 5,
+      })
+      await page.mouse.up()
+      await editor.expectEditor.toContain('length = 231.59, angle = -34')
+      // await page.waitForTimeout(1000) // Wait for update
+    })
+
+    await test.step('Delete variables and wait for re-execution', async () => {
+      await page.waitForTimeout(500)
+      await editor.replaceCode('myVar3 = 7', '')
+      await page.waitForTimeout(50)
+      await editor.replaceCode('myVar2 = 6', '')
+      await page.waitForTimeout(2000) // Wait for deferred execution
+      await expectSketchOriginToBeDrawn()
+    })
+
+    const handle2Location = { x: 872, y: 273 }
+    await test.step('Edit sketch again', async () => {
+      await editor.expectEditor.toContain('length = 231.59, angle = -34')
+      await page.waitForTimeout(500)
+      await page.mouse.move(handle2Location.x, handle2Location.y)
+      await page.mouse.down()
+      await page.mouse.move(handle2Location.x, handle2Location.y - 50, {
+        steps: 5,
+      })
+      await page.mouse.up()
+      await editor.expectEditor.toContain('length = 167.36, angle = -14')
+    })
+
+    await test.step('add whole other sketch before current sketch', async () => {
+      await page.waitForTimeout(500)
+      await editor.replaceCode(
+        `myVar1 = 5`,
+        `myVar1 = 5
+    sketch003 = startSketchOn(XY)
+    profile004 = circle(sketch003, center = [143.91, 136.89], radius = 71.63)`
+      )
+      await page.waitForTimeout(2000) // Wait for deferred execution
+      await expectSketchOriginToBeDrawn()
+    })
+
+    const handle3Location = { x: 844, y: 212 }
+    await test.step('edit sketch again', async () => {
+      await editor.expectEditor.toContain('length = 167.36, angle = -14')
+      await page.mouse.move(handle3Location.x, handle3Location.y)
+      await page.mouse.down()
+      await page.mouse.move(handle3Location.x, handle3Location.y + 110, {
+        steps: 5,
+      })
+      await page.mouse.up()
+      await editor.expectEditor.toContain('length = 219.2, angle = -56')
+    })
+
+    // exit sketch and assert whole code
+    await test.step('Exit sketch and assert code', async () => {
+      await toolbar.exitSketch()
+      await editor.expectEditor.toContain(
+        `myVar1 = 5
+    sketch003 = startSketchOn(XY)
+    profile004 = circle(sketch003, center = [143.91, 136.89], radius = 71.63)
+    
+    sketch001 = startSketchOn(XZ)
+    profile001 = startProfileAt([106.68, 89.77], sketch001)
+      |> line(end = [132.34, 157.8])
+      |> line(end = [67.65, -460.55], tag = $seg01)
+      |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+      |> close()
+    extrude001 = extrude(profile001, length = 500)
+    sketch002 = startSketchOn(extrude001, face = seg01)
+    profile002 = startProfileAt([83.39, 329.15], sketch002)
+      |> angledLine(angle = 0, length = 119.61, tag = $rectangleSegmentA001)
+      |> angledLine(angle = segAng(rectangleSegmentA001) - 90, length = 219.2, angle = -56)
+      |> angledLine(
+          angle = segAng(rectangleSegmentA001),
+          length = -segLen(rectangleSegmentA001),
+          angle = -151,
+          length = 116.27,
+        )
+      |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+      |> close()
+    profile003 = startProfileAt([-201.08, 254.17], sketch002)
+      |> line(end = [103.55, 33.32])
+      |> line(end = [48.8, -153.54])
+    `,
+        { shouldNormalise: true }
+      )
+      await editor.expectState({
+        activeLines: [],
+        diagnostics: [],
+        highlightedCode: '',
+      })
+    })
+  })
+  test('Will exit out of sketch mode for some incompatible edits', async ({
+    page,
+    context,
+    homePage,
+    scene,
+    editor,
+    toolbar,
+    cmdBar,
+  }) => {
+    const initialCode = `myVar1 = 5
+    myVar2 = 6
+    
+    sketch001 = startSketchOn(XZ)
+    profile001 = startProfileAt([106.68, 89.77], sketch001)
+      |> line(end = [132.34, 157.8])
+      |> line(end = [67.65, -460.55], tag = $seg01)
+      |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+      |> close()
+    extrude001 = extrude(profile001, length = 500)
+    sketch002 = startSketchOn(extrude001, face = seg01)
+    profile002 = startProfileAt([83.39, 329.15], sketch002)
+      |> angledLine(angle = 0, length = 119.61, tag = $rectangleSegmentA001)
+      |> angledLine(angle = segAng(rectangleSegmentA001) - 90, length = 156.54, angle = -28)
+      |> angledLine(
+           angle = segAng(rectangleSegmentA001),
+           length = -segLen(rectangleSegmentA001),
+           angle = -151,
+           length = 116.27,
+         )
+      |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+      |> close()
+    profile003 = startProfileAt([-201.08, 254.17], sketch002)
+      |> line(end = [103.55, 33.32])
+      |> line(end = [48.8, -153.54])`
+
+    await context.addInitScript((initialCode) => {
+      localStorage.setItem('persistCode', initialCode)
+    }, initialCode)
+
+    await homePage.goToModelingScene()
+    await scene.connectionEstablished()
+    await scene.settled(cmdBar)
+    const expectSketchOriginToBeDrawn = async () => {
+      await scene.expectPixelColor(TEST_COLORS.WHITE, { x: 672, y: 193 }, 15)
+    }
+
+    await test.step('Open feature tree and edit second sketch', async () => {
+      await toolbar.openFeatureTreePane()
+      const sketchButton = await toolbar.getFeatureTreeOperation('Sketch', 1)
+      await sketchButton.dblclick()
+      await page.waitForTimeout(700) // Wait for engine animation
+      await expectSketchOriginToBeDrawn()
+    })
+
+    await test.step('rename variable of current sketch, sketch002 to changeSketchNamePartWayThrough', async () => {
+      await editor.replaceCode('sketch002', 'changeSketchNamePartWayThrough')
+      await page.waitForTimeout(100)
+      // three times to rename the declaration and it's use
+      await editor.replaceCode('sketch002', 'changeSketchNamePartWayThrough')
+      await page.waitForTimeout(100)
+      await editor.replaceCode('sketch002', 'changeSketchNamePartWayThrough')
+      await expect(
+        page.getByText('Unable to maintain sketch mode')
+      ).toBeVisible()
+    })
+  })
+  test(
+    'adding a syntax error, recovers after fixing',
+    { tag: ['@skipWin'] },
+    async ({ page, homePage, context, scene, editor, toolbar, cmdBar }) => {
+      const file = await fs.readFile(
+        path.resolve(
+          __dirname,
+          '../../',
+          './rust/kcl-lib/e2e/executor/inputs/e2e-can-sketch-on-chamfer.kcl'
+        ),
+        'utf-8'
+      )
+      await context.addInitScript((file) => {
+        localStorage.setItem('persistCode', file)
+      }, file)
+      await homePage.goToModelingScene()
+
+      const [objClick] = scene.makeMouseHelpers(600, 250)
+      const arrowHeadLocation = { x: 706, y: 129 } as const
+      const arrowHeadWhite = TEST_COLORS.WHITE
+      const backgroundGray: [number, number, number] = [28, 28, 28]
+      const verifyArrowHeadColor = async (c: [number, number, number]) =>
+        scene.expectPixelColor(c, arrowHeadLocation, 15)
+
+      // wait for scene to load
+      await scene.settled(cmdBar)
+
+      await test.step('check chamfer selection changes cursor positon', async () => {
+        await expect(async () => {
+          // sometimes initial click doesn't register
+          await objClick()
+          await editor.expectActiveLinesToBe([
+            '|> startProfileAt([75.8, 317.2], %) // [$startCapTag, $EndCapTag]',
+          ])
+        }).toPass({ timeout: 15_000, intervals: [500] })
+      })
+
+      await test.step('enter sketch and sanity check segments have been drawn', async () => {
+        await toolbar.editSketch()
+        // this checks sketch segments have been drawn
+        await verifyArrowHeadColor(arrowHeadWhite)
+      })
+
+      await test.step('Make typo and check the segments have Disappeared and there is a syntax error', async () => {
+        await editor.replaceCode(
+          'line(endAbsolute = [pro',
+          'badBadBadFn(endAbsolute = [pro'
+        )
+        await editor.expectState({
+          activeLines: [],
+          diagnostics: ['memoryitemkey`badBadBadFn`isnotdefined'],
+          highlightedCode: '',
+        })
+        await expect(
+          page.getByText(
+            "Error in kcl script, sketch cannot be drawn until it's fixed"
+          )
+        ).toBeVisible()
+        // this checks sketch segments have failed to be drawn
+        await verifyArrowHeadColor(backgroundGray)
+      })
+
+      await test.step('', async () => {
+        await editor.replaceCode(
+          'badBadBadFn(endAbsolute = [pro',
+          'line(endAbsolute = [pro'
+        )
+        await editor.expectState({
+          activeLines: [],
+          diagnostics: [],
+          highlightedCode: '',
+        })
+        // this checks sketch segments have been drawn
+        await verifyArrowHeadColor(arrowHeadWhite)
+      })
+      await page.waitForTimeout(100)
+    }
+  )
 })

e2e/playwright/snapshot-tests.spec.ts

@@ -1,9 +1,9 @@
+import { spawn } from 'child_process'
+import path from 'path'
 import type { Models } from '@kittycad/lib'
 import { KCL_DEFAULT_LENGTH } from '@src/lib/constants'
-import { spawn } from 'child_process'
 import fsp from 'fs/promises'
 import JSZip from 'jszip'
-import path from 'path'
 
 import type { CmdBarFixture } from '@e2e/playwright/fixtures/cmdBarFixture'
 import type { SceneFixture } from '@e2e/playwright/fixtures/sceneFixture'
@@ -13,6 +13,8 @@ import type { Paths } from '@e2e/playwright/test-utils'
 import {
   doExport,
   getUtils,
+  headerMasks,
+  networkingMasks,
   orRunWhenFullSuiteEnabled,
   settingsToToml,
 } from '@e2e/playwright/test-utils'
@@ -77,11 +79,7 @@ part001 = startSketchOn(-XZ)
      )
   |> xLine(endAbsolute = totalLen, tag = $seg03)
   |> yLine(length = -armThick, tag = $seg01)
-  |> angledLineThatIntersects({
+  |> angledLineThatIntersects(angle = turns::HALF_TURN, offset = -armThick, intersectTag = seg04)
-        angle = turns::HALF_TURN,
-        offset = -armThick,
-        intersectTag = seg04
-      }, %)
   |> angledLine(angle = segAng(seg04, %) + 180, endAbsoluteY = turns::ZERO)
   |> angledLine(
         angle = -bottomAng,
@@ -90,11 +88,7 @@ part001 = startSketchOn(-XZ)
      )
   |> xLine(length = endAbsolute = segEndX(seg03) + 0)
   |> yLine(length = -segLen(seg01, %))
-  |> angledLineThatIntersects({
+  |> angledLineThatIntersects(angle = turns::HALF_TURN, offset = -armThick, intersectTag = seg02)
-        angle = turns::HALF_TURN,
-        offset = -armThick,
-        intersectTag = seg02
-      }, %)
   |> angledLine(angle = segAng(seg02, %) + 180, endAbsoluteY = -baseHeight)
   |> xLine(endAbsolute = turns::ZERO)
   |> close()
@@ -374,7 +368,7 @@ const extrudeDefaultPlane = async (
 
   await expect(page).toHaveScreenshot({
     maxDiffPixels: 100,
-    mask: [page.getByTestId('model-state-indicator')],
+    mask: networkingMasks(page),
   })
   await u.openKclCodePanel()
 }
@@ -462,7 +456,7 @@ test(
     await page.waitForTimeout(500)
     await expect(page).toHaveScreenshot({
       maxDiffPixels: 100,
-      mask: [page.getByTestId('model-state-indicator')],
+      mask: networkingMasks(page),
     })
 
     const lineEndClick = () =>
@@ -491,7 +485,7 @@ test(
 
     await expect(page).toHaveScreenshot({
       maxDiffPixels: 100,
-      mask: [page.getByTestId('model-state-indicator')],
+      mask: networkingMasks(page),
     })
     await endOfTangentClk()
 
@@ -501,7 +495,7 @@ test(
     await threePointArcMidPointMv()
     await expect(page).toHaveScreenshot({
       maxDiffPixels: 100,
-      mask: [page.getByTestId('model-state-indicator')],
+      mask: networkingMasks(page),
     })
     await threePointArcMidPointClk()
     await page.waitForTimeout(100)
@@ -510,7 +504,7 @@ test(
     await page.waitForTimeout(500)
     await expect(page).toHaveScreenshot({
       maxDiffPixels: 100,
-      mask: [page.getByTestId('model-state-indicator')],
+      mask: networkingMasks(page),
     })
 
     await threePointArcEndPointClk()
@@ -530,7 +524,7 @@ test(
     await page.waitForTimeout(500)
     await expect(page).toHaveScreenshot({
       maxDiffPixels: 100,
-      mask: [page.getByTestId('model-state-indicator')],
+      mask: networkingMasks(page),
     })
     await arcEndClk()
   }
@@ -580,7 +574,7 @@ test(
     // Ensure the draft rectangle looks the same as it usually does
     await expect(page).toHaveScreenshot({
       maxDiffPixels: 100,
-      mask: [page.getByTestId('model-state-indicator')],
+      mask: networkingMasks(page),
     })
   }
 )
@@ -623,7 +617,7 @@ test(
     // Ensure the draft rectangle looks the same as it usually does
     await expect(page).toHaveScreenshot({
       maxDiffPixels: 100,
-      mask: [page.getByTestId('model-state-indicator')],
+      mask: networkingMasks(page),
     })
     await expect(page.locator('.cm-content')).toHaveText(
       `sketch001 = startSketchOn(XZ)profile001 = circle(sketch001, center = [366.89, -62.01], radius = 1)`
@@ -696,7 +690,7 @@ test.describe(
       // screen shot should show the sketch
       await expect(page).toHaveScreenshot({
         maxDiffPixels: 100,
-        mask: [page.getByTestId('model-state-indicator')],
+        mask: networkingMasks(page),
       })
 
       await u.doAndWaitForImageDiff(
@@ -709,7 +703,7 @@ test.describe(
       // second screen shot should look almost identical, i.e. scale should be the same.
       await expect(page).toHaveScreenshot({
         maxDiffPixels: 100,
-        mask: [page.getByTestId('model-state-indicator')],
+        mask: networkingMasks(page),
       })
     })
 
@@ -789,6 +783,7 @@ test.describe(
       // screen shot should show the sketch
       await expect(page).toHaveScreenshot({
         maxDiffPixels: 100,
+        mask: networkingMasks(page),
       })
 
       // exit sketch
@@ -802,6 +797,7 @@ test.describe(
       // second screen shot should look almost identical, i.e. scale should be the same.
       await expect(page).toHaveScreenshot({
         maxDiffPixels: 100,
+        mask: networkingMasks(page),
       })
     })
   }
@@ -824,7 +820,7 @@ test(
   |> line(end = [11.91, -10.42])
   |> close()
   |> extrude(length = ${KCL_DEFAULT_LENGTH})
-part002 = startSketchOn(part001, seg01)
+part002 = startSketchOn(part001, face = seg01)
   |> startProfileAt([8, 8], %)
   |> line(end = [4.68, 3.05])
   |> line(end = [0, -7.79])
@@ -863,7 +859,7 @@ part002 = startSketchOn(part001, seg01)
 
     await expect(page).toHaveScreenshot({
       maxDiffPixels: 100,
-      mask: [page.getByTestId('model-state-indicator')],
+      mask: networkingMasks(page),
     })
   }
 )
@@ -902,7 +898,7 @@ test(
 
     await expect(page).toHaveScreenshot({
       maxDiffPixels: 100,
-      mask: [page.getByTestId('model-state-indicator')],
+      mask: networkingMasks(page),
     })
   }
 )
@@ -942,7 +938,7 @@ test(
 
     await expect(page).toHaveScreenshot({
       maxDiffPixels: 100,
-      mask: [page.getByTestId('model-state-indicator')],
+      mask: networkingMasks(page),
     })
   }
 )
@@ -955,11 +951,6 @@ test.describe('Grid visibility', { tag: '@snapshot' }, () => {
   }) => {
     const u = await getUtils(page)
     const stream = page.getByTestId('stream')
-    const mask = [
-      page.locator('#app-header'),
-      page.locator('#sidebar-top-ribbon'),
-      page.locator('#sidebar-bottom-ribbon'),
-    ]
 
     await page.setViewportSize({ width: 1200, height: 500 })
     await page.goto('/')
@@ -1012,18 +1003,13 @@ test.describe('Grid visibility', { tag: '@snapshot' }, () => {
 
     await expect(stream).toHaveScreenshot({
       maxDiffPixels: 100,
-      mask,
+      mask: [...headerMasks(page), ...networkingMasks(page)],
     })
   })
 
   test('Grid turned off', async ({ page, cmdBar, scene }) => {
     const u = await getUtils(page)
     const stream = page.getByTestId('stream')
-    const mask = [
-      page.locator('#app-header'),
-      page.locator('#sidebar-top-ribbon'),
-      page.locator('#sidebar-bottom-ribbon'),
-    ]
 
     await page.setViewportSize({ width: 1200, height: 500 })
     await page.goto('/')
@@ -1038,7 +1024,7 @@ test.describe('Grid visibility', { tag: '@snapshot' }, () => {
 
     await expect(stream).toHaveScreenshot({
       maxDiffPixels: 100,
-      mask,
+      mask: [...headerMasks(page), ...networkingMasks(page)],
     })
   })
 
@@ -1063,11 +1049,6 @@ test.describe('Grid visibility', { tag: '@snapshot' }, () => {
 
     const u = await getUtils(page)
     const stream = page.getByTestId('stream')
-    const mask = [
-      page.locator('#app-header'),
-      page.locator('#sidebar-top-ribbon'),
-      page.locator('#sidebar-bottom-ribbon'),
-    ]
 
     await page.setViewportSize({ width: 1200, height: 500 })
     await page.goto('/')
@@ -1082,7 +1063,7 @@ test.describe('Grid visibility', { tag: '@snapshot' }, () => {
 
     await expect(stream).toHaveScreenshot({
       maxDiffPixels: 100,
-      mask,
+      mask: [...headerMasks(page), ...networkingMasks(page)],
     })
   })
 })
@@ -1151,6 +1132,7 @@ test('theme persists', async ({ page, context }) => {
 
   await expect(page, 'expect screenshot to have light theme').toHaveScreenshot({
     maxDiffPixels: 100,
+    mask: networkingMasks(page),
   })
 })
 
@@ -1166,9 +1148,9 @@ test.describe('code color goober', { tag: '@snapshot' }, () => {
 sweepPath = startSketchOn(XZ)
   |> startProfileAt([0.05, 0.05], %)
   |> line(end = [0, 7])
-  |> tangentialArc({ offset = 90, radius = 5 }, %)
+  |> tangentialArc(angle = 90, radius = 5)
   |> line(end = [-3, 0])
-  |> tangentialArc({ offset = -90, radius = 5 }, %)
+  |> tangentialArc(angle = -90, radius = 5)
   |> line(end = [0, 7])
 
 sweepSketch = startSketchOn(XY)
@@ -1195,7 +1177,7 @@ sweepSketch = startSketchOn(XY)
 
     await expect(page, 'expect small color widget').toHaveScreenshot({
       maxDiffPixels: 100,
-      mask: [page.getByTestId('model-state-indicator')],
+      mask: networkingMasks(page),
     })
   })
 
@@ -1215,9 +1197,9 @@ sweepSketch = startSketchOn(XY)
 sweepPath = startSketchOn(XZ)
   |> startProfileAt([0.05, 0.05], %)
   |> line(end = [0, 7])
-  |> tangentialArc({ offset = 90, radius = 5 }, %)
+  |> tangentialArc(angle = 90, radius = 5)
   |> line(end = [-3, 0])
-  |> tangentialArc({ offset = -90, radius = 5 }, %)
+  |> tangentialArc(angle = -90, radius = 5)
   |> line(end = [0, 7])
 
 sweepSketch = startSketchOn(XY)
@@ -1252,7 +1234,7 @@ sweepSketch = startSketchOn(XY)
       'expect small color widget to have window open'
     ).toHaveScreenshot({
       maxDiffPixels: 100,
-      mask: [page.getByTestId('model-state-indicator')],
+      mask: networkingMasks(page),
     })
   })
 })