test: verify useCalculateKclExpression cancellation

* allow more than one tool

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

* updates

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

* updates

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

* updates

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

* update tests

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

* fmt

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

* bump kcl

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

---------

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

.github/workflows/build-apps.yml

@@ -7,14 +7,13 @@ on:
       - main
     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_NIGHTLY: ${{ github.ref_type == 'tag' && startsWith(github.ref_name, 'nightly-v') }}
+  IS_NIGHTLY: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -95,7 +94,9 @@ jobs:
       - name: Set nightly version, product name, release notes, and icons
         if: ${{ env.IS_NIGHTLY == 'true' }}
         run: |
-          export VERSION=${GITHUB_REF_NAME#nightly-v}
+          COMMIT=$(git rev-parse --short HEAD)
+          DATE=$(date +'%-y.%-m.%-d')
+          export VERSION=$DATE-main.$COMMIT
           npm run files:set-version
           npm run files:flip-to-nightly
 
@@ -122,18 +123,6 @@ jobs:
       - id: export_notes
         run: echo "notes=`cat release-notes.md`" >> "$GITHUB_OUTPUT"
 
-      - name: Prepare electron-builder.yml file for updater test
-        if: ${{ env.IS_RELEASE == 'true' }}
-        run: |
-          yq -i '.publish[0].url = "https://dl.zoo.dev/releases/modeling-app/updater-test"' electron-builder.yml
-
-      - uses: actions/upload-artifact@v4
-        if: ${{ env.IS_RELEASE == 'true' }}
-        with:
-          name: prepared-files-updater-test
-          path: |
-            electron-builder.yml
-
 
   build-apps:
     needs: [prepare-files]
@@ -258,55 +247,13 @@ jobs:
 
       # TODO: add the 'Build for Mac TestFlight (nightly)' stage back
 
-      # The steps below are for updater-test builds, only on release
-
-      - uses: actions/download-artifact@v4
-        if: ${{ env.IS_RELEASE == 'true' }}
-        name: prepared-files-updater-test
-
-      - name: Copy updated electron-builder.yml file for updater test
-        if: ${{ env.IS_RELEASE == 'true' }}
-        run: |
-          ls -R prepared-files-updater-test
-          cp prepared-files-updater-test/electron-builder.yml electron-builder.yml
-
-      - name: Build the app (updater-test)
-        if: ${{ env.IS_RELEASE == 'true' }}
-        env:
-          APPLE_ID: ${{ secrets.APPLE_ID }}
-          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
-          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
-          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-          CSC_LINK: ${{ secrets.APPLE_CERTIFICATE }}
-          CSC_KEY_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
-          CSC_KEYCHAIN: ${{ secrets.APPLE_SIGNING_IDENTITY }}
-          WINDOWS_CERTIFICATE_THUMBPRINT: ${{ secrets.WINDOWS_CERTIFICATE_THUMBPRINT }}
-        run: npm run tronb:package:prod
-
-      - uses: actions/upload-artifact@v4
-        if: ${{ env.IS_RELEASE == 'true' }}
-        with:
-          name: updater-test-arm64-${{ matrix.platform }}
-          path: |
-            out/*-arm64-win.exe
-            out/*-arm64-mac.dmg
-            out/*-arm64-linux.AppImage
-
-      - uses: actions/upload-artifact@v4
-        if: ${{ env.IS_RELEASE == 'true' }}
-        with:
-          name: updater-test-x64-${{ matrix.platform }}
-          path: |
-            out/*-x64-win.exe
-            out/*-x64-mac.dmg
-            out/*-x86_64-linux.AppImage
-
 
   upload-apps-release:
     runs-on: ubuntu-22.04
     permissions:
       contents: write
-    if: ${{ github.ref_type == 'tag' }}
+    # Equivalent to IS_RELEASE || IS_NIGHTLY (but we can't access those env vars here)
+    if: ${{ (github.ref_type == 'tag' && startsWith(github.ref_name, 'v')) || (github.event_name == 'push' && github.ref == 'refs/heads/main') }}
     env:
       VERSION_NO_V: ${{ needs.prepare-files.outputs.version }}
       VERSION: ${{ format('v{0}', needs.prepare-files.outputs.version) }}
@@ -412,17 +359,6 @@ jobs:
       - name: List artifacts
         run: "ls -R out"
 
-      - name: Set more complete nightly release notes
-        if: ${{ env.IS_NIGHTLY == 'true' }}
-        run: |
-          # Note: preferred going this way instead of a full clone in the checkout step,
-          # see https://github.com/actions/checkout/issues/1471
-          git fetch --prune --unshallow --tags
-          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)
-          npm run files:set-notes
-
       - name: Authenticate to Google Cloud
         if: ${{ env.IS_NIGHTLY == 'true' }}
         uses: 'google-github-actions/auth@v2.1.8'

.github/workflows/build-wasm.yml

@@ -0,0 +1,56 @@
+name: Build WASM
+
+on:
+  workflow_call:
+
+permissions:
+  contents: read
+
+jobs:
+  npm-build-wasm:
+    runs-on: runs-on=${{ github.run_id }}/family=i7ie.2xlarge/image=ubuntu22-full-x64
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+          cache: 'npm'
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Use correct Rust toolchain
+        shell: bash
+        run: |
+          [ -e rust-toolchain.toml ] || cp rust/rust-toolchain.toml ./
+
+      - name: Install rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          cache: false # configured below
+
+      - uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc
+        with:
+          tool: wasm-pack
+
+      - name: Use Rust cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: './rust'
+
+      - name: Build Wasm
+        shell: bash
+        run: npm run build:wasm
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: prepared-wasm
+          path: |
+            rust/kcl-wasm-lib/pkg/kcl_wasm_lib*
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: prepared-ts-rs-bindings
+          path: |
+            rust/kcl-lib/bindings/*

.github/workflows/cargo-test.yml

@@ -155,7 +155,7 @@ jobs:
         shell: bash
         run: |
           [ -e rust-toolchain.toml ] || cp rust/rust-toolchain.toml ./
-      - name: Install rust
+      - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           cache: false # Configured below.
@@ -190,6 +190,54 @@ jobs:
           TAB_API_KEY: ${{ secrets.TAB_API_KEY }}
           CI_COMMIT_SHA: ${{ github.event.pull_request.head.sha }}
           CI_PR_NUMBER: ${{ github.event.pull_request.number }}
+  run-internal-kcl-samples:
+    name: cargo test (internal-kcl-samples)
+    runs-on:
+      - runs-on=${{ github.run_id }}
+      - runner=32cpu-linux-x64
+      - extras=s3-cache
+    steps:
+      - uses: runs-on/action@v1
+      - uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: ${{ secrets.MODELING_APP_GH_APP_ID }}
+          private-key: ${{ secrets.MODELING_APP_GH_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+      - uses: actions/checkout@v4
+        with:
+          token: ${{ steps.app-token.outputs.token }}
+      - name: Use correct Rust toolchain
+        shell: bash
+        run: |
+          [ -e rust-toolchain.toml ] || cp rust/rust-toolchain.toml ./
+      - name: Install Rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          cache: false # Configured below.
+      - name: Start Vector
+        run: .github/ci-cd-scripts/start-vector-ubuntu.sh
+        env:
+          GH_ACTIONS_AXIOM_TOKEN: ${{ secrets.GH_ACTIONS_AXIOM_TOKEN }}
+          OS_NAME: ${{ env.OS_NAME }}
+      - uses: taiki-e/install-action@nextest
+      - name: Download internal KCL samples
+        run: git clone --depth=1 https://x-access-token:${{ secrets.GH_PAT_KCL_SAMPLES_INTERNAL }}@github.com/KittyCAD/kcl-samples-internal public/kcl-samples/internal
+      - name: Run tests
+        shell: bash
+        run: |-
+          cd rust/kcl-lib
+          cargo nextest run \
+           --retries=10 --no-fail-fast --features artifact-graph --profile=ci \
+           internal \
+           2>&1 | tee /tmp/github-actions.log
+        env:
+          TWENTY_TWENTY: overwrite
+          INSTA_UPDATE: always
+          EXPECTORATE: overwrite
+          KITTYCAD_API_TOKEN: ${{secrets.KITTYCAD_API_TOKEN_DEV}}
+          ZOO_HOST: https://api.dev.zoo.dev
+          MODELING_APP_INTERNAL_SAMPLES_SECRET: ${{secrets.MODELING_APP_INTERNAL_SAMPLES_SECRET}}
   run-wasm-tests:
     name: Run wasm tests
     strategy:

.github/workflows/check-exampleKcl.yml

@@ -1,47 +0,0 @@
-name: Check Onboarding KCL
-
-on:
-  pull_request:
-    types: [opened, synchronize]
-    paths:
-      - 'src/lib/exampleKcl.ts'
-      - 'public/kcl-samples/bracket/main.kcl'
-
-permissions:
-  contents: read
-  issues: write
-  pull-requests: write
-
-jobs:
-  comment:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Comment on PR
-        uses: actions/github-script@v7
-        with:
-          script: |
-            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;
-
-            const { data: comments } = await github.rest.issues.listComments({
-              owner,
-              repo,
-              issue_number
-            });
-
-            const commentExists = comments.some(comment => comment.body === message);
-
-            if (!commentExists) {
-              // Post a comment on the PR
-              await github.rest.issues.createComment({
-                owner,
-                repo,
-                issue_number,
-                body: message,
-              });
-            }

.github/workflows/e2e-tests.yml

@@ -18,73 +18,13 @@ permissions:
 
 jobs:
 
-  conditions:
-    runs-on: ubuntu-latest
-    outputs:
-      significant: ${{ steps.path-changes.outputs.significant }}
-      should-run: ${{ steps.should-run.outputs.should-run }}
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Fetch the base branch
-        if: ${{ github.event_name == 'pull_request' }}
-        run: git fetch origin ${{ github.base_ref }} --depth=1
-
-      - name: Check for path changes
-        id: path-changes
-        shell: bash
-        run: |
-          set -euo pipefail
-
-          # Manual runs or push should run all tests.
-          if [[ ${{ github.event_name }} != 'pull_request' ]]; then
-            echo "significant=true" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-
-          changed_files=$(git diff --name-only origin/${{ github.base_ref }})
-          echo "$changed_files"
-          if grep -Evq '^README.md|^public/kcl-samples/|^rust/kcl-lib/tests/kcl_samples/' <<< "$changed_files" ; then
-            echo "significant=true" >> $GITHUB_OUTPUT
-          else
-            echo "significant=false" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Should run
-        id: should-run
-        shell: bash
-        run: |
-          set -euo pipefail
-          # We should run when this is a scheduled run or if there are
-          # significant changes in the diff.
-          if [[ ${{ github.event_name }} == 'schedule' || ${{ steps.path-changes.outputs.significant }} == 'true' ]]; then
-            echo "should-run=true" >> $GITHUB_OUTPUT
-          else
-            echo "should-run=false" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Display conditions
-        shell: bash
-        run: |
-          # For debugging purposes
-          set -euo pipefail
-          echo "GITHUB_REF: $GITHUB_REF"
-          echo "GITHUB_HEAD_REF: $GITHUB_HEAD_REF"
-          echo "GITHUB_BASE_REF: $GITHUB_BASE_REF"
-          echo "significant: ${{ steps.path-changes.outputs.significant }}"
-          echo "should-run: ${{ steps.should-run.outputs.should-run }}"
-
   prepare-wasm:
     # separate job on Ubuntu to build or fetch the wasm blob once on the fastest runner
     runs-on: runs-on=${{ github.run_id }}/family=i7ie.2xlarge/image=ubuntu22-full-x64
-    needs: conditions
     steps:
       - uses: actions/checkout@v4
-        if: needs.conditions.outputs.should-run == 'true'
 
       - id: filter
-        if: needs.conditions.outputs.should-run == 'true'
         name: Check for Rust changes
         uses: dorny/paths-filter@v3
         with:
@@ -93,18 +33,16 @@ jobs:
               - 'rust/**'
 
       - uses: actions/setup-node@v4
-        if: needs.conditions.outputs.should-run == 'true'
         with:
           node-version-file: '.nvmrc'
           cache: 'npm'
 
       - name: Install dependencies
-        if: needs.conditions.outputs.should-run == 'true'
         run: npm install
 
-      - name: Download Wasm Cache
+      - name: Download Wasm cache
         id: download-wasm
-        if: ${{ needs.conditions.outputs.should-run == 'true' && github.event_name != 'schedule' && steps.filter.outputs.rust == 'false' }}
+        if: ${{ github.event_name != 'schedule' && steps.filter.outputs.rust == 'false' }}
         uses: dawidd6/action-download-artifact@v7
         continue-on-error: true
         with:
@@ -114,9 +52,8 @@ jobs:
           branch: main
           path: rust/kcl-wasm-lib/pkg
 
-      - name: Build WASM condition
+      - name: Build Wasm condition
         id: wasm
-        if: needs.conditions.outputs.should-run == 'true'
         run: |
           set -euox pipefail
           # Build wasm if this is a scheduled run, there are Rust changes, or
@@ -128,35 +65,34 @@ jobs:
           fi
 
       - name: Use correct Rust toolchain
-        if: ${{ needs.conditions.outputs.should-run == 'true' && steps.wasm.outputs.should-build-wasm == 'true' }}
+        if: ${{ steps.wasm.outputs.should-build-wasm == 'true' }}
         shell: bash
         run: |
           [ -e rust-toolchain.toml ] || cp rust/rust-toolchain.toml ./
 
-      - name: Install rust
-        if: ${{ needs.conditions.outputs.should-run == 'true' && steps.wasm.outputs.should-build-wasm == 'true' }}
+      - name: Install Rust
+        if: ${{ steps.wasm.outputs.should-build-wasm == 'true' }}
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           cache: false # Configured below.
 
       - uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc
-        if: ${{ needs.conditions.outputs.should-run == 'true' && steps.wasm.outputs.should-build-wasm == 'true' }}
+        if: ${{ steps.wasm.outputs.should-build-wasm == 'true' }}
         with:
           tool: wasm-pack
 
-      - name: Rust Cache
-        if: ${{ needs.conditions.outputs.should-run == 'true' && steps.wasm.outputs.should-build-wasm == 'true' }}
+      - name: Use Rust cache
+        if: ${{ steps.wasm.outputs.should-build-wasm == 'true' }}
         uses: Swatinem/rust-cache@v2
         with:
           workspaces: './rust'
 
       - name: Build Wasm
-        if: ${{ needs.conditions.outputs.should-run == 'true' && steps.wasm.outputs.should-build-wasm == 'true' }}
+        if: ${{ steps.wasm.outputs.should-build-wasm == 'true' }}
         shell: bash
         run: npm run build:wasm
 
       - uses: actions/upload-artifact@v4
-        if: needs.conditions.outputs.should-run == 'true'
         with:
           name: prepared-wasm
           path: |
@@ -165,10 +101,9 @@ jobs:
   snapshots:
     name: playwright:snapshots:ubuntu
     runs-on: runs-on=${{ github.run_id }}/family=i7ie.2xlarge/image=ubuntu22-full-x64
-    needs: [conditions, prepare-wasm]
+    needs: [prepare-wasm]
     steps:
       - uses: actions/create-github-app-token@v1
-        if: needs.conditions.outputs.should-run == 'true'
         id: app-token
         with:
           app-id: ${{ secrets.MODELING_APP_GH_APP_ID }}
@@ -176,16 +111,13 @@ jobs:
           owner: ${{ github.repository_owner }}
 
       - uses: actions/checkout@v4
-        if: needs.conditions.outputs.should-run == 'true'
         with:
           token: ${{ steps.app-token.outputs.token }}
 
       - uses: actions/download-artifact@v4
-        if: needs.conditions.outputs.should-run == 'true'
         name: prepared-wasm
 
-      - name: Copy prepared wasm
-        if: needs.conditions.outputs.should-run == 'true'
+      - name: Copy prepared Wasm
         run: |
           ls -R prepared-wasm
           cp prepared-wasm/kcl_wasm_lib_bg.wasm public
@@ -193,34 +125,25 @@ jobs:
           cp prepared-wasm/kcl_wasm_lib* rust/kcl-wasm-lib/pkg
 
       - uses: actions/setup-node@v4
-        if: needs.conditions.outputs.should-run == 'true'
         with:
           node-version-file: '.nvmrc'
           cache: 'npm'
 
       - name: Install dependencies
         id: deps-install
-        if: needs.conditions.outputs.should-run == 'true'
         run: npm install
 
-      - name: Cache Playwright Browsers
-        if: needs.conditions.outputs.should-run == 'true'
+      - name: Cache browsers
         uses: actions/cache@v4
         with:
           path: |
             ~/.cache/ms-playwright/
           key: ${{ runner.os }}-playwright-${{ hashFiles('package-lock.json') }}
 
-      - name: Install Playwright Browsers
-        if: needs.conditions.outputs.should-run == 'true'
+      - name: Install browsers
         run: npm run playwright install --with-deps
 
-      - name: build web
-        if: needs.conditions.outputs.should-run == 'true'
-        run: npm run tronb:vite:dev
-
-      - name: Run ubuntu/chrome snapshots
-        if: needs.conditions.outputs.should-run == 'true'
+      - name: Capture snapshots
         uses: nick-fields/retry@v3.0.2
         with:
           shell: bash
@@ -236,7 +159,7 @@ jobs:
           TARGET: web
 
       - uses: actions/upload-artifact@v4
-        if: ${{ needs.conditions.outputs.should-run == 'true' && !cancelled() && (success() || failure()) }}
+        if: ${{ !cancelled() && (success() || failure()) }}
         with:
           name: playwright-report-ubuntu-snapshot-${{ github.sha }}
           path: playwright-report/
@@ -244,8 +167,8 @@ jobs:
           retention-days: 30
           overwrite: true
 
-      - name: Check for changes
-        if: ${{ needs.conditions.outputs.should-run == 'true' && github.ref != 'refs/heads/main' }}
+      - name: Check diff
+        if: ${{ github.ref != 'refs/heads/main' }}
         shell: bash
         id: git-check
         run: |
@@ -255,9 +178,8 @@ jobs:
             else echo "modified=false" >> $GITHUB_OUTPUT
             fi
 
-      - name: Commit changes, if any
-        # TODO: find a more reliable way to detect visual changes
-        if: ${{ false && needs.conditions.outputs.should-run == 'true' && steps.git-check.outputs.modified == 'true' }}
+      - name: Commit changes
+        if: ${{ steps.git-check.outputs.modified == 'true' }}
         shell: bash
         run: |
           git add e2e/playwright/snapshot-tests.spec.ts-snapshots e2e/playwright/snapshots
@@ -267,12 +189,12 @@ jobs:
           git fetch origin
           echo ${{ github.head_ref }}
           git checkout ${{ github.head_ref }}
-          git commit -m "A snapshot a day keeps the bugs away! 📷🐛" || true
+          git commit --message "Update snapshots" || true
           git push
           git push origin ${{ github.head_ref }}
 
   electron:
-    needs: [conditions, prepare-wasm]
+    needs: [prepare-wasm]
     timeout-minutes: 60
     env:
       OS_NAME: ${{ contains(matrix.os, 'ubuntu') && 'ubuntu' || (contains(matrix.os, 'windows') && 'windows' || 'macos') }}
@@ -308,21 +230,24 @@ jobs:
             shardTotal: 8
           - os: namespace-profile-macos-8-cores
             shardIndex: 1
-            shardTotal: 1
+            shardTotal: 2
+          - os: namespace-profile-macos-8-cores
+            shardIndex: 2
+            shardTotal: 2
           - os: windows-latest-8-cores
             shardIndex: 1
-            shardTotal: 1
+            shardTotal: 2
+          - os: windows-latest-8-cores
+            shardIndex: 2
+            shardTotal: 2
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
-        if: needs.conditions.outputs.should-run == 'true'
 
       - uses: actions/download-artifact@v4
-        if: needs.conditions.outputs.should-run == 'true'
         name: prepared-wasm
 
       - name: Copy prepared wasm
-        if: needs.conditions.outputs.should-run == 'true'
         run: |
           ls -R prepared-wasm
           cp prepared-wasm/kcl_wasm_lib_bg.wasm public
@@ -330,18 +255,15 @@ jobs:
           cp prepared-wasm/kcl_wasm_lib* rust/kcl-wasm-lib/pkg
 
       - uses: actions/setup-node@v4
-        if: needs.conditions.outputs.should-run == 'true'
         with:
           node-version-file: '.nvmrc'
           cache: 'npm'
 
       - name: Install dependencies
         id: deps-install
-        if: needs.conditions.outputs.should-run == 'true'
         run: npm install
 
       - name: Cache Playwright Browsers
-        if: needs.conditions.outputs.should-run == 'true'
         uses: actions/cache@v4
         with:
           path: |
@@ -349,22 +271,20 @@ jobs:
           key: ${{ runner.os }}-playwright-${{ hashFiles('package-lock.json') }}
 
       - name: Install Playwright Browsers
-        if: needs.conditions.outputs.should-run == 'true'
         run: npm run playwright install --with-deps
 
       - name: Build web
-        if: needs.conditions.outputs.should-run == 'true'
         run: npm run tronb:vite:dev
 
       - name: Start Vector
-        if: ${{ needs.conditions.outputs.should-run == 'true' && !contains(matrix.os, 'windows') }}
+        if: ${{ !contains(matrix.os, 'windows') }}
         run: .github/ci-cd-scripts/start-vector-${{ env.OS_NAME }}.sh
         env:
           GH_ACTIONS_AXIOM_TOKEN: ${{ secrets.GH_ACTIONS_AXIOM_TOKEN }}
           OS_NAME: ${{ env.OS_NAME }}
 
       - uses: actions/download-artifact@v4
-        if: ${{ needs.conditions.outputs.should-run == 'true' && !cancelled() && (success() || failure()) }}
+        if: ${{ !cancelled() && (success() || failure()) }}
         continue-on-error: true
         with:
           name: test-results-${{ env.OS_NAME }}-${{ matrix.shardIndex }}-${{ github.sha }}
@@ -372,7 +292,7 @@ jobs:
 
       - name: Run playwright/electron flow (with retries)
         id: retry
-        if: ${{ needs.conditions.outputs.should-run == 'true' && !cancelled() && steps.deps-install.outcome == 'success' }}
+        if:  ${{ !cancelled() && steps.deps-install.outcome == 'success' }}
         uses: nick-fields/retry@v3.0.2
         with:
           shell: bash
@@ -389,7 +309,7 @@ jobs:
           TARGET: desktop
 
       - uses: actions/upload-artifact@v4
-        if: ${{ needs.conditions.outputs.should-run == 'true' && always() }}
+        if: always()
         with:
           name: test-results-${{ env.OS_NAME }}-${{ matrix.shardIndex }}-${{ github.sha }}
           path: test-results/
@@ -398,7 +318,7 @@ jobs:
           overwrite: true
 
       - uses: actions/upload-artifact@v4
-        if: ${{ needs.conditions.outputs.should-run == 'true' && always() }}
+        if: always()
         with:
           name: playwright-report-${{ env.OS_NAME }}-${{ matrix.shardIndex }}-${{ github.sha }}
           path: playwright-report/

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

@@ -21,14 +21,11 @@ on:
       - '**.rs'
       - .github/workflows/kcl-language-server.yml
   workflow_dispatch:
-
 permissions:
   contents: read
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
-
 env:
   CARGO_INCREMENTAL: 0
   CARGO_NET_RETRY: 10
@@ -38,10 +35,9 @@ env:
   MACOSX_DEPLOYMENT_TARGET: 10.15
   CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
   CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER: arm-linux-gnueabihf-gcc
-
 jobs:
   test:
-    name: vscode tests
+    name: kcl-language-server (vscode tests)
     strategy:
       fail-fast: false
       matrix:
@@ -77,8 +73,7 @@ jobs:
         include:
           - os: windows-latest
             target: x86_64-pc-windows-msvc
-            code-target:
-              win32-x64
+            code-target: win32-x64
             #- os: windows-latest
             #target: i686-pc-windows-msvc
             #code-target:
@@ -88,8 +83,7 @@ jobs:
             #code-target: win32-arm64
           - os: ubuntu-latest
             target: x86_64-unknown-linux-gnu
-            code-target:
-              linux-x64
+            code-target: linux-x64
             #- os: ubuntu-latest
             #target: aarch64-unknown-linux-musl
             #code-target: linux-arm64
@@ -105,41 +99,33 @@ jobs:
           - os: macos-latest
             target: aarch64-apple-darwin
             code-target: darwin-arm64
-
-    name: build-release (${{ matrix.target }})
+    name: kcl-language-server build-release (${{ matrix.target }})
     runs-on: ${{ matrix.os }}
     container: ${{ matrix.container }}
-
     env:
       RA_TARGET: ${{ matrix.target }}
-
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           fetch-depth: ${{ env.FETCH_DEPTH }}
-
       - name: Use correct Rust toolchain
         shell: bash
         run: |
           rm rust/rust-toolchain.toml
-
       - name: Install rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           cache: rust
           components: rust-src
           target: ${{ matrix.target }}
-
       - name: Install Node.js
         uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"
-
       - name: Update apt repositories
         if: matrix.target == 'aarch64-unknown-linux-gnu' || matrix.target == 'arm-unknown-linux-gnueabihf' || matrix.os == 'ubuntu-latest'
         run: sudo apt-get update
-
       - if: ${{ matrix.os == 'ubuntu-latest' }}
         name: Install deps
         shell: bash
@@ -164,64 +150,53 @@ jobs:
             zlib1g-dev
 
           cargo install cross
-
       - name: Install AArch64 target toolchain
         if: matrix.target == 'aarch64-unknown-linux-gnu'
         run: sudo apt-get install gcc-aarch64-linux-gnu
-
       - name: Install ARM target toolchain
         if: matrix.target == 'arm-unknown-linux-gnueabihf'
         run: sudo apt-get install gcc-arm-linux-gnueabihf
-
       - name: build
         run: |
           cd rust
           cargo kcl-language-server-release build --client-patch-version ${{ github.run_number }}
-
       - 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 --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 --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'
         run: |
           cd rust/kcl-language-server
           rm -rf server
-
       - name: Package Extension (no server, release)
         if: matrix.target == 'x86_64-unknown-linux-gnu' && startsWith(github.event.ref, 'refs/tags/')
         run: |
           cd rust/kcl-language-server
           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 --yarn -o ../build/kcl-language-server-no-server.vsix --pre-release
-
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
           name: release-${{ matrix.target }}
           path: ./rust/build
-
   build-release-x86_64-unknown-linux-musl:
-    name: build-release (x86_64-unknown-linux-musl)
+    name: kcl-language-server build-release (x86_64-unknown-linux-musl)
     runs-on: ubuntu-latest
     env:
       RA_TARGET: x86_64-unknown-linux-musl
@@ -231,7 +206,6 @@ jobs:
       image: alpine:latest
       volumes:
         - /usr/local/cargo/registry:/usr/local/cargo/registry
-
     steps:
       - name: Install dependencies
         run: |
@@ -245,55 +219,46 @@ jobs:
             nodejs \
             npm \
             yarn
-
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           fetch-depth: ${{ env.FETCH_DEPTH }}
-
       - name: Use correct Rust toolchain
         shell: bash
         run: |
           rm rust/rust-toolchain.toml
-
       - name: Install rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           cache: rust
           components: rust-src
           target: ${{ matrix.target }}
-
       - name: build
         run: |
           cd rust
           cargo kcl-language-server-release build --client-patch-version ${{ github.run_number }}
-
       - 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 --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 --yarn -o "../build/kcl-language-server-alpine-x64.vsix" --target alpine-x64 --pre-release
-
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
           name: release-x86_64-unknown-linux-musl
           path: ./rust/build
-
   publish:
-    name: publish
+    name: kcl-language-server (publish)
     runs-on: ubuntu-latest
     needs: ["build-release", "build-release-x86_64-unknown-linux-musl"]
     if: startsWith(github.event.ref, 'refs/tags')
@@ -301,22 +266,17 @@ jobs:
       contents: write
     steps:
       - run: echo "TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
       - run: 'echo "TAG: $TAG"'
-
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           fetch-depth: ${{ env.FETCH_DEPTH }}
-
       - name: Install Nodejs
         uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"
-
       - run: echo "HEAD_SHA=$(git rev-parse HEAD)" >> $GITHUB_ENV
       - run: 'echo "HEAD_SHA: $HEAD_SHA"'
-
       - uses: actions/download-artifact@v4
         with:
           name: release-aarch64-apple-darwin
@@ -344,8 +304,7 @@ jobs:
       - uses: actions/download-artifact@v4
         with:
           name: release-x86_64-pc-windows-msvc
-          path:
-            rust/build
+          path: rust/build
           #- uses: actions/download-artifact@v4
           #with:
           #name: release-i686-pc-windows-msvc
@@ -356,21 +315,18 @@ jobs:
           #name: release-aarch64-pc-windows-msvc
           #path: rust/build
       - run: ls -al ./rust/build
-
       - name: Publish Release
         uses: ./.github/actions/github-release
         with:
           files: "rust/build/*"
           name: ${{ env.TAG }}
           token: ${{ secrets.GITHUB_TOKEN }}
-
       - name: move files to dir for upload
         shell: bash
         run: |
           cd rust
           mkdir -p releases/language-server/${{ env.TAG }}
           cp -r build/* releases/language-server/${{ env.TAG }}
-
       - name: "Authenticate to Google Cloud"
         uses: "google-github-actions/auth@v2.1.8"
         with:
@@ -385,15 +341,12 @@ jobs:
         with:
           path: rust/releases
           destination: dl.kittycad.io
-
       - run: rm rust/build/kcl-language-server-no-server.vsix
-
       - name: Publish Extension (Code Marketplace, release)
         # token from https://dev.azure.com/kcl-language-server/
         run: |
           cd rust/kcl-language-server
           npx vsce publish --pat ${{ secrets.VSCE_PAT }} --packagePath ../build/kcl-language-server-*.vsix
-
       - name: Publish Extension (OpenVSX, release)
         run: |
           cd rust/kcl-language-server

.github/workflows/kcl-python-bindings.yml

@@ -4,7 +4,6 @@
 #    maturin generate-ci github
 #
 name: kcl-python-bindings
-
 on:
   push:
     branches:
@@ -27,16 +26,14 @@ on:
       - '**.rs'
       - .github/workflows/kcl-python-bindings.yml
   workflow_dispatch:
-
 permissions:
   contents: read
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
-
 jobs:
   linux-x86_64:
+    name: kcl-python-bindings (linux-x86_64)
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -58,8 +55,8 @@ jobs:
         with:
           name: wheels-linux-x86_64
           path: rust/kcl-python-bindings/dist
-
   windows:
+    name: kcl-python-bindings (windows)
     runs-on: windows-16-cores
     strategy:
       matrix:
@@ -84,8 +81,8 @@ jobs:
         with:
           name: wheels-windows-${{ matrix.target }}
           path: rust/kcl-python-bindings/dist
-
   macos:
+    name: kcl-python-bindings (macos)
     runs-on: macos-latest
     strategy:
       matrix:
@@ -110,8 +107,8 @@ jobs:
         with:
           name: wheels-macos-${{ matrix.target }}
           path: rust/kcl-python-bindings/dist
-
   test:
+    name: kcl-python-bindings (test)
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -127,8 +124,8 @@ jobs:
         env:
           KITTYCAD_API_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
           ZOO_HOST: https://api.dev.zoo.dev
-
   sdist:
+    name: kcl-python-bindings (sdist)
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -151,7 +148,6 @@ jobs:
         with:
           name: wheels-sdist
           path: rust/kcl-python-bindings/dist
-
   release:
     name: Release
     runs-on: ubuntu-latest

.github/workflows/static-analysis.yml

@@ -28,53 +28,7 @@ jobs:
       - run: npm run fmt:check
 
   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:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'npm'
-
-      - name: Install dependencies
-        run: npm install
-
-      - name: Use correct Rust toolchain
-        shell: bash
-        run: |
-          [ -e rust-toolchain.toml ] || cp rust/rust-toolchain.toml ./
-
-      - name: Install rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          cache: false # Configured below.
-
-      - uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc
-        with:
-          tool: wasm-pack
-
-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: './rust'
-
-      - name: Build Wasm
-        shell: bash
-        run: npm run build:wasm
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: prepared-wasm
-          path: |
-            rust/kcl-wasm-lib/pkg/kcl_wasm_lib*
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: prepared-ts-rs-bindings
-          path: |
-            rust/kcl-lib/bindings/*
+    uses: ./.github/workflows/build-wasm.yml
 
   npm-tsc:
     runs-on: ubuntu-latest
@@ -173,116 +127,3 @@ jobs:
         uses: actions/checkout@v4
       - name: Run codespell
         uses: crate-ci/typos@v1.32.0
-
-  npm-unit-test-kcl-samples:
-    runs-on: ubuntu-latest
-    needs: npm-build-wasm
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'npm'
-
-      - run: npm install
-      - uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc
-        with:
-          tool: wasm-pack
-
-      - name: Download all artifacts
-        uses: actions/download-artifact@v4
-
-      - name: Copy prepared wasm
-        run: |
-          ls -R prepared-wasm
-          cp prepared-wasm/kcl_wasm_lib_bg.wasm public
-          mkdir rust/kcl-wasm-lib/pkg
-          cp prepared-wasm/kcl_wasm_lib* rust/kcl-wasm-lib/pkg
-
-      - name: Copy prepared ts-rs bindings
-        run: |
-          ls -R prepared-ts-rs-bindings
-          mkdir rust/kcl-lib/bindings
-          cp -r prepared-ts-rs-bindings/* rust/kcl-lib/bindings/
-
-      - 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: npm run playwright install chromium --with-deps
-
-      - name: run unit tests for kcl samples
-        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
-        run: npm run test:unit:kcl-samples
-        env:
-          VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
-
-  npm-unit-test:
-    runs-on: ubuntu-latest
-    needs: npm-build-wasm
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'npm'
-
-      - run: npm install
-      - uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc
-        with:
-          tool: wasm-pack
-
-      - name: Download all artifacts
-        uses: actions/download-artifact@v4
-
-      - name: Copy prepared wasm
-        run: |
-          ls -R prepared-wasm
-          cp prepared-wasm/kcl_wasm_lib_bg.wasm public
-          mkdir rust/kcl-wasm-lib/pkg
-          cp prepared-wasm/kcl_wasm_lib* rust/kcl-wasm-lib/pkg
-
-      - name: Copy prepared ts-rs bindings
-        run: |
-          ls -R prepared-ts-rs-bindings
-          mkdir rust/kcl-lib/bindings
-          cp -r prepared-ts-rs-bindings/* rust/kcl-lib/bindings/
-
-      - 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: npm run playwright install chromium --with-deps
-
-      - name: Run unit tests
-        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
-        run: xvfb-run -a npm run test:unit
-        env:
-          VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
-
-      - name: Check for changes
-        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
-        id: git-check
-        run: |
-            git add src/lang/std/artifactMapGraphs
-            if git status src/lang/std/artifactMapGraphs | grep -q "Changes to be committed"
-            then echo "modified=true" >> $GITHUB_OUTPUT
-            else echo "modified=false" >> $GITHUB_OUTPUT
-            fi
-      - name: Commit changes, if any
-        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' && steps.git-check.outputs.modified == 'true' }}
-        run: |
-          git config --local user.email "github-actions[bot]@users.noreply.github.com"
-          git config --local user.name "github-actions[bot]"
-          git remote set-url origin https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git
-          git fetch origin
-          echo ${{ github.head_ref }}
-          git checkout ${{ github.head_ref }}
-          # TODO when webkit works on ubuntu remove the os part of the commit message
-          git commit -am "Look at this (photo)Graph *in the voice of Nickelback*" || true
-          git push
-          git push origin ${{ github.head_ref }}

.github/workflows/tag-nightly.yml

@@ -1,39 +0,0 @@
-name: tag-nightly
-
-permissions:
-  contents: write
-on:
-  schedule:
-    - cron: '0 4 * * *'
-  # Daily at 04:00 AM UTC
-  # Will checkout the last commit from the default branch (main as of 2023-10-04)
-  
-jobs:
-  tag-nightly:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/create-github-app-token@v1
-        id: app-token
-        with:
-          app-id: ${{ secrets.MODELING_APP_GH_APP_ID }}
-          private-key: ${{ secrets.MODELING_APP_GH_APP_PRIVATE_KEY }}
-          owner: ${{ github.repository_owner }}
-
-      - uses: actions/checkout@v4
-        with:
-          token: ${{ steps.app-token.outputs.token }}
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-
-      - run: npm install
-
-      - name: Push tag
-        run: |
-          VERSION_NO_V=$(date +'%-y.%-m.%-d')
-          TAG="nightly-v$VERSION_NO_V"
-          git config --local user.email "github-actions[bot]@users.noreply.github.com"
-          git config --local user.name "github-actions[bot]"
-          git tag $TAG
-          git push origin tag $TAG

.github/workflows/unit-tests.yml

@@ -0,0 +1,124 @@
+name: Unit Tests
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions:
+  contents: write
+  pull-requests: write
+  actions: read
+
+jobs:
+  npm-build-wasm:
+    uses: ./.github/workflows/build-wasm.yml
+
+  npm-test-unit:
+    runs-on: ubuntu-latest
+    needs: npm-build-wasm
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+          cache: 'npm'
+
+      - run: npm install
+      - uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc
+        with:
+          tool: wasm-pack
+
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+
+      - name: Copy prepared wasm
+        run: |
+          ls -R prepared-wasm
+          cp prepared-wasm/kcl_wasm_lib_bg.wasm public
+          mkdir rust/kcl-wasm-lib/pkg
+          cp prepared-wasm/kcl_wasm_lib* rust/kcl-wasm-lib/pkg
+
+      - name: Copy prepared ts-rs bindings
+        run: |
+          ls -R prepared-ts-rs-bindings
+          mkdir rust/kcl-lib/bindings
+          cp -r prepared-ts-rs-bindings/* rust/kcl-lib/bindings/
+
+      - 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: npm run playwright install chromium --with-deps
+
+      - name: Run unit tests
+        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
+        run: xvfb-run -a npm run test:unit
+        env:
+          VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
+
+      - name: Check for changes
+        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
+        id: git-check
+        run: |
+            git add src/lang/std/artifactMapGraphs
+            if git status src/lang/std/artifactMapGraphs | grep -q "Changes to be committed"
+            then echo "modified=true" >> $GITHUB_OUTPUT
+            else echo "modified=false" >> $GITHUB_OUTPUT
+            fi
+
+      - name: Commit changes, if any
+        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' && steps.git-check.outputs.modified == 'true' }}
+        run: |
+          git config --local user.email "github-actions[bot]@users.noreply.github.com"
+          git config --local user.name "github-actions[bot]"
+          git remote set-url origin https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git
+          git fetch origin
+          echo ${{ github.head_ref }}
+          git checkout ${{ github.head_ref }}
+          # TODO when webkit works on ubuntu remove the os part of the commit message
+          git commit -am "Look at this (photo)Graph *in the voice of Nickelback*" || true
+          git push
+          git push origin ${{ github.head_ref }}
+
+  npm-test-unit-components:
+    runs-on: ubuntu-latest
+    needs: npm-build-wasm
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+          cache: 'npm'
+
+      - run: npm install
+      - uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc
+        with:
+          tool: wasm-pack
+
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+
+      - name: Copy prepared wasm
+        run: |
+          ls -R prepared-wasm
+          cp prepared-wasm/kcl_wasm_lib_bg.wasm public
+          mkdir rust/kcl-wasm-lib/pkg
+          cp prepared-wasm/kcl_wasm_lib* rust/kcl-wasm-lib/pkg
+
+      - name: Copy prepared ts-rs bindings
+        run: |
+          ls -R prepared-ts-rs-bindings
+          mkdir rust/kcl-lib/bindings
+          cp -r prepared-ts-rs-bindings/* rust/kcl-lib/bindings/
+
+      - name: Run component tests
+        run: npm run test:unit:components

.gitignore

@@ -58,6 +58,8 @@ trace.zip
 /public/kcl-samples/.github
 /public/kcl-samples/screenshots/main.kcl
 /public/kcl-samples/step/main.kcl
+/public/kcl-samples/internal
+/rust/kcl-lib/tests/kcl_samples/internal
 /test-results/
 /playwright-report/
 /blob-report/

CONTRIBUTING.md

@@ -130,7 +130,7 @@ git tag $VERSION
 git push origin --tags
 ```
 
-This will trigger the `build-apps` workflow, set the version, build & sign the apps, and generate release files as well as updater-test artifacts.
+This will trigger the `build-apps` workflow, set the version, build & sign the apps, and generate release files.
 
 The workflow should be listed right away [in this list](https://github.com/KittyCAD/modeling-app/actions/workflows/build-apps.yml?query=event%3Apush)).
 
@@ -142,13 +142,10 @@ The release builds can be found under the `out-{arch}-{platform}` zip files, at
 
 Manually test against this [list](https://github.com/KittyCAD/modeling-app/issues/3588) across Windows, MacOS, Linux and posting results as comments in the issue.
 
-##### Updater-test builds
-
-The other `build-apps` output in the release `build-apps` workflow (triggered by 2.) is `updater-test-{arch}-{platform}`. It's a semi-automated process: for macOS, Windows, and Linux, download the corresponding updater-test artifact file, install the app, run it, expect an updater prompt to a dummy v0.255.255, install it and check that the app comes back at that version.
-
-The only difference with these builds is that they point to a different update location on the release bucket, with this dummy v0.255.255 always available. This helps ensuring that the version we release will be able to update to the next one available.
-
-If the prompt doesn't show up, start the app in command line to grab the electron-updater logs. This is likely an issue with the current build that needs addressing (or the updater-test location in the storage bucket).
+A prompt should show up asking for a downgrade to the last release version. Running through that at the end of testing
+and making sure the current release candidate has the ability to be updated to what electron-updater points to is critical,
+but what is actually being downloaded and installed isn't.
+If the prompt doesn't show up, start the app in command line to grab the electron-updater logs. This is likely an issue with the current build that needs addressing.
 
 ```
 # Windows (PowerShell)

Makefile

@@ -23,6 +23,7 @@ endif
 install: node_modules/.package-lock.json $(CARGO) $(WASM_PACK) ## Install dependencies
 
 node_modules/.package-lock.json: package.json package-lock.json
+	npm prune
 	npm install
 
 $(CARGO):
@@ -43,15 +44,15 @@ endif
 # BUILD
 
 CARGO_SOURCES := rust/.cargo/config.toml $(wildcard rust/Cargo.*) $(wildcard rust/**/Cargo.*)
+KCL_SOURCES := $(wildcard public/kcl-samples/**/*.kcl)
 RUST_SOURCES := $(wildcard rust/**/*.rs)
 
 REACT_SOURCES := $(wildcard src/*.tsx) $(wildcard src/**/*.tsx)
 TYPESCRIPT_SOURCES := tsconfig.* $(wildcard src/*.ts) $(wildcard src/**/*.ts)
 VITE_SOURCES := $(wildcard vite.*) $(wildcard vite/**/*.tsx)
 
-
 .PHONY: build
-build: install public/kcl_wasm_lib_bg.wasm .vite/build/main.js
+build: install public/kcl_wasm_lib_bg.wasm public/kcl-samples/manifest.json .vite/build/main.js
 
 public/kcl_wasm_lib_bg.wasm: $(CARGO_SOURCES) $(RUST_SOURCES)
 ifdef WINDOWS
@@ -60,6 +61,9 @@ else
 	npm run build:wasm:dev
 endif
 
+public/kcl-samples/manifest.json: $(KCL_SOURCES)
+	cd rust/kcl-lib && EXPECTORATE=overwrite cargo test generate_manifest
+
 .vite/build/main.js: $(REACT_SOURCES) $(TYPESCRIPT_SOURCES) $(VITE_SOURCES)
 	npm run tronb:vite:dev
 
@@ -107,6 +111,7 @@ test: test-unit test-e2e
 .PHONY: test-unit
 test-unit: install ## Run the unit tests
 	npm run test:rust
+	npm run test:unit:components
 	@ curl -fs localhost:3000 >/dev/null || ( echo "Error: localhost:3000 not available, 'make run-web' first" && exit 1 )
 	npm run test:unit
 

README.md

@@ -34,7 +34,7 @@ The 3D view in Design Studio is just a video stream from our hosted geometry eng
   - WebSockets (via [KittyCAD TS client](https://github.com/KittyCAD/kittycad.ts))
 - Code Editor
   - [CodeMirror](https://codemirror.net/)
-  - Custom WASM LSP Server
+  - [Custom WASM LSP Server](https://github.com/KittyCAD/modeling-app/tree/main/rust/kcl-lib/src/lsp/kcl)
 - Modeling
   - [KittyCAD TypeScript client](https://github.com/KittyCAD/kittycad.ts)
 

_typos.toml

@@ -29,6 +29,7 @@ THRE = "THRE" # Weird bug that wrongly detects THREEjs as a typo
 nwo = "nwo" # don't know what this is about tbh
 "ot" = "ot" # some abbreviation, idk what
 "oe" = "oe" # some abbreviation, idk what
+"colinear" = "colinear" # some engine shit, kidding
 
 [default]
 extend-ignore-identifiers-re = [

docs/kcl-lang/arrays.md

@@ -0,0 +1,32 @@
+---
+title: "Arrays and ranges"
+excerpt: "Documentation of the KCL language for the Zoo Design Studio."
+layout: manual
+---
+
+Arrays are sequences of values.
+
+Arrays can be written out as *array literals* using a sequence of expressions surrounded by square brackets, e.g., `['hello', 'world']` is an array of strings, `[x, x + 1, x + 2]` is an array of numbers (assuming `x` is a number), `[]` is an empty array, and `['hello', 42, true]` is a mixed array.
+
+A value in an array can be accessed by indexing using square brackets where the index is a number, for example, `arr[0]`, `arr[42]`, `arr[i]` (where `arr` is an array and `i` is a (whole) number).
+
+There are some useful functions for working with arrays in the standard library, see [std::array](/docs/kcl-std/modules/std-array) for details.
+
+## Array types
+
+Arrays have their own types: `[T]` where `T` is the type of the elements of the array, for example, `[string]` means an array of `string`s and `[any]` means an array of any values.
+
+Array types can also include length information: `[T; n]` denotes an array of length `n` (where `n` is a number literal) and `[T; 1+]` denotes an array whose length is at least one (i.e., a non-empty array). E.g., `[string; 1+]` and `[number(mm); 3]` are valid array types.
+
+## Ranges
+
+Ranges are a succinct way to create an array of sequential numbers. The syntax is `[start .. end]` where `start` and `end` evaluate to whole numbers (integers). Ranges are inclusive of the start and end. The end must be greater than the start. Examples:
+
+```kcl,norun
+[0..3]      // [0, 1, 2, 3]
+[3..10]     // [3, 4, 5, 6, 7, 8, 9, 10]
+x = 2
+[x..x+1]    // [2, 3]
+```
+
+The units of the start and end numbers must be the same and the result inherits those units. 

docs/kcl-lang/index.md

@@ -14,6 +14,7 @@ things in a more tutorial fashion. See also our documentation of the [standard l
 * [Values and types](/docs/kcl-lang/types)
 * [Numeric types and units](/docs/kcl-lang/numeric)
 * [Functions](/docs/kcl-lang/functions)
+* [Arrays and ranges](/docs/kcl-lang/arrays)
 * [Projects and modules](/docs/kcl-lang/modules)
 * [Attributes](/docs/kcl-lang/attributes)
 * [Importing geometry from other CAD systems](/docs/kcl-lang/foreign-imports)

docs/kcl-lang/types.md

@@ -19,18 +19,6 @@ myBool = false
 
 Currently you cannot redeclare a constant.
 
-## Arrays
-
-An array is defined with `[]` braces. What is inside the brackets can
-be of any type. For example, the following is completely valid:
-
-```
-myArray = ["thing", 2, false]
-```
-
-If you want to get a value from an array you can use the index like so:
-`myArray[0]`.
-
 
 ## Objects
 
@@ -40,8 +28,8 @@ An object is defined with `{}` braces. Here is an example object:
 myObj = { a = 0, b = "thing" }
 ```
 
-We support two different ways of getting properties from objects, you can call
-`myObj.a` or `myObj["a"]` both work.
+To get the property of an object, you can call `myObj.a`, which in the above
+example returns 0.
 
 ## `ImportedGeometry`
 

docs/kcl-std/consts/std-sweep-SKETCH_PLANE.md

@@ -0,0 +1,16 @@
+---
+title: "sweep::SKETCH_PLANE"
+subtitle: "Constant in std::sweep"
+excerpt: "Local/relative to a position centered within the plane being sketched on"
+layout: manual
+---
+
+Local/relative to a position centered within the plane being sketched on
+
+```kcl
+sweep::SKETCH_PLANE: string = 'sketchPlane'
+```
+
+
+
+

docs/kcl-std/consts/std-sweep-TRAJECTORY.md

@@ -0,0 +1,16 @@
+---
+title: "sweep::TRAJECTORY"
+subtitle: "Constant in std::sweep"
+excerpt: "Local/relative to the trajectory curve"
+layout: manual
+---
+
+Local/relative to the trajectory curve
+
+```kcl
+sweep::TRAJECTORY: string = 'trajectoryCurve'
+```
+
+
+
+

docs/kcl-std/functions/std-math-legAngX.md

@@ -0,0 +1,38 @@
+---
+title: "legAngX"
+subtitle: "Function in std::math"
+excerpt: "Compute the angle of the given leg for x."
+layout: manual
+---
+
+Compute the angle of the given leg for x.
+
+```kcl
+legAngX(
+  hypotenuse: number(Length),
+  leg: number(Length),
+): number(deg)
+```
+
+
+
+### Arguments
+
+| Name | Type | Description | Required |
+|----------|------|-------------|----------|
+| `hypotenuse` | [`number(Length)`](/docs/kcl-std/types/std-types-number) | The length of the triangle's hypotenuse. | Yes |
+| `leg` | [`number(Length)`](/docs/kcl-std/types/std-types-number) | The length of one of the triangle's legs (i.e. non-hypotenuse side). | Yes |
+
+### Returns
+
+[`number(deg)`](/docs/kcl-std/types/std-types-number) - A number.
+
+
+### Examples
+
+```kcl
+legAngX(hypotenuse = 5, leg = 3)
+```
+
+
+

docs/kcl-std/functions/std-math-legAngY.md

@@ -0,0 +1,38 @@
+---
+title: "legAngY"
+subtitle: "Function in std::math"
+excerpt: "Compute the angle of the given leg for y."
+layout: manual
+---
+
+Compute the angle of the given leg for y.
+
+```kcl
+legAngY(
+  hypotenuse: number(Length),
+  leg: number(Length),
+): number(deg)
+```
+
+
+
+### Arguments
+
+| Name | Type | Description | Required |
+|----------|------|-------------|----------|
+| `hypotenuse` | [`number(Length)`](/docs/kcl-std/types/std-types-number) | The length of the triangle's hypotenuse. | Yes |
+| `leg` | [`number(Length)`](/docs/kcl-std/types/std-types-number) | The length of one of the triangle's legs (i.e. non-hypotenuse side). | Yes |
+
+### Returns
+
+[`number(deg)`](/docs/kcl-std/types/std-types-number) - A number.
+
+
+### Examples
+
+```kcl
+legAngY(hypotenuse = 5, leg = 3)
+```
+
+
+

docs/kcl-std/functions/std-math-legLen.md

@@ -0,0 +1,38 @@
+---
+title: "legLen"
+subtitle: "Function in std::math"
+excerpt: "Compute the length of the given leg."
+layout: manual
+---
+
+Compute the length of the given leg.
+
+```kcl
+legLen(
+  hypotenuse: number(Length),
+  leg: number(Length),
+): number(deg)
+```
+
+
+
+### Arguments
+
+| Name | Type | Description | Required |
+|----------|------|-------------|----------|
+| `hypotenuse` | [`number(Length)`](/docs/kcl-std/types/std-types-number) | The length of the triangle's hypotenuse. | Yes |
+| `leg` | [`number(Length)`](/docs/kcl-std/types/std-types-number) | The length of one of the triangle's legs (i.e. non-hypotenuse side). | Yes |
+
+### Returns
+
+[`number(deg)`](/docs/kcl-std/types/std-types-number) - A number.
+
+
+### Examples
+
+```kcl
+legLen(hypotenuse = 5, leg = 3)
+```
+
+
+

docs/kcl-std/index.md

@@ -12,15 +12,15 @@ layout: manual
   * [`appearance`](/docs/kcl-std/appearance)
   * [`assert`](/docs/kcl-std/assert)
   * [`assertIs`](/docs/kcl-std/assertIs)
-  * [`clone`](/docs/kcl-std/clone)
+  * [`clone`](/docs/kcl-std/functions/std-clone)
   * [`helix`](/docs/kcl-std/functions/std-helix)
   * [`offsetPlane`](/docs/kcl-std/functions/std-offsetPlane)
   * [`patternLinear2d`](/docs/kcl-std/patternLinear2d)
 * [**std::array**](/docs/kcl-std/modules/std-array)
-  * [`map`](/docs/kcl-std/map)
-  * [`pop`](/docs/kcl-std/pop)
-  * [`push`](/docs/kcl-std/push)
-  * [`reduce`](/docs/kcl-std/reduce)
+  * [`map`](/docs/kcl-std/functions/std-array-map)
+  * [`pop`](/docs/kcl-std/functions/std-array-pop)
+  * [`push`](/docs/kcl-std/functions/std-array-push)
+  * [`reduce`](/docs/kcl-std/functions/std-array-reduce)
 * [**std::math**](/docs/kcl-std/modules/std-math)
   * [`abs`](/docs/kcl-std/functions/std-math-abs)
   * [`acos`](/docs/kcl-std/functions/std-math-acos)
@@ -30,9 +30,9 @@ layout: manual
   * [`ceil`](/docs/kcl-std/functions/std-math-ceil)
   * [`cos`](/docs/kcl-std/functions/std-math-cos)
   * [`floor`](/docs/kcl-std/functions/std-math-floor)
-  * [`legAngX`](/docs/kcl-std/legAngX)
-  * [`legAngY`](/docs/kcl-std/legAngY)
-  * [`legLen`](/docs/kcl-std/legLen)
+  * [`legAngX`](/docs/kcl-std/functions/std-math-legAngX)
+  * [`legAngY`](/docs/kcl-std/functions/std-math-legAngY)
+  * [`legLen`](/docs/kcl-std/functions/std-math-legLen)
   * [`ln`](/docs/kcl-std/functions/std-math-ln)
   * [`log`](/docs/kcl-std/functions/std-math-log)
   * [`log10`](/docs/kcl-std/functions/std-math-log10)
@@ -128,6 +128,9 @@ layout: manual
   * [`E`](/docs/kcl-std/consts/std-math-E)
   * [`PI`](/docs/kcl-std/consts/std-math-PI)
   * [`TAU`](/docs/kcl-std/consts/std-math-TAU)
+* [**std::sweep**](/docs/kcl-std/modules/std-sweep)
+  * [`sweep::SKETCH_PLANE`](/docs/kcl-std/consts/std-sweep-SKETCH_PLANE)
+  * [`sweep::TRAJECTORY`](/docs/kcl-std/consts/std-sweep-TRAJECTORY)
 * [**std::turns**](/docs/kcl-std/modules/std-turns)
   * [`turns::HALF_TURN`](/docs/kcl-std/consts/std-turns-HALF_TURN)
   * [`turns::QUARTER_TURN`](/docs/kcl-std/consts/std-turns-QUARTER_TURN)
@@ -140,12 +143,13 @@ See also the [types overview](/docs/kcl-lang/types)
 
 * [**Primitive types**](/docs/kcl-lang/types)
   * [`End`](/docs/kcl-lang/types#End)
-  * [`ImportedGeometry`](/docs/kcl-lang/types#ImportedGeometry)
+  * [`ImportedGeometry`](/docs/kcl-std/types/std-types-ImportedGeometry)
   * [`Start`](/docs/kcl-lang/types#Start)
   * [`TagDeclarator`](/docs/kcl-lang/types#TagDeclarator)
   * [`TagIdentifier`](/docs/kcl-lang/types#TagIdentifier)
   * [`any`](/docs/kcl-std/types/std-types-any)
   * [`bool`](/docs/kcl-std/types/std-types-bool)
+  * [`fn`](/docs/kcl-std/types/std-types-fn)
   * [`number`](/docs/kcl-std/types/std-types-number)
   * [`string`](/docs/kcl-std/types/std-types-string)
   * [`tag`](/docs/kcl-std/types/std-types-tag)

docs/kcl-std/legAngX.md

@@ -1,38 +0,0 @@
----
-title: "legAngX"
-subtitle: "Function in std::math"
-excerpt: "Compute the angle of the given leg for x."
-layout: manual
----
-
-Compute the angle of the given leg for x.
-
-```kcl
-legAngX(
-  hypotenuse: number,
-  leg: number,
-): number
-```
-
-
-
-### Arguments
-
-| Name | Type | Description | Required |
-|----------|------|-------------|----------|
-| `hypotenuse` | [`number`](/docs/kcl-std/types/std-types-number) | The length of the triangle's hypotenuse | Yes |
-| `leg` | [`number`](/docs/kcl-std/types/std-types-number) | The length of one of the triangle's legs (i.e. non-hypotenuse side) | Yes |
-
-### Returns
-
-[`number`](/docs/kcl-std/types/std-types-number) - A number.
-
-
-### Examples
-
-```kcl
-legAngX(hypotenuse = 5, leg = 3)
-```
-
-
-

docs/kcl-std/legAngY.md

@@ -1,38 +0,0 @@
----
-title: "legAngY"
-subtitle: "Function in std::math"
-excerpt: "Compute the angle of the given leg for y."
-layout: manual
----
-
-Compute the angle of the given leg for y.
-
-```kcl
-legAngY(
-  hypotenuse: number,
-  leg: number,
-): number
-```
-
-
-
-### Arguments
-
-| Name | Type | Description | Required |
-|----------|------|-------------|----------|
-| `hypotenuse` | [`number`](/docs/kcl-std/types/std-types-number) | The length of the triangle's hypotenuse | Yes |
-| `leg` | [`number`](/docs/kcl-std/types/std-types-number) | The length of one of the triangle's legs (i.e. non-hypotenuse side) | Yes |
-
-### Returns
-
-[`number`](/docs/kcl-std/types/std-types-number) - A number.
-
-
-### Examples
-
-```kcl
-legAngY(hypotenuse = 5, leg = 3)
-```
-
-
-

docs/kcl-std/legLen.md

@@ -1,38 +0,0 @@
----
-title: "legLen"
-subtitle: "Function in std::math"
-excerpt: "Compute the length of the given leg."
-layout: manual
----
-
-Compute the length of the given leg.
-
-```kcl
-legLen(
-  hypotenuse: number,
-  leg: number,
-): number
-```
-
-
-
-### Arguments
-
-| Name | Type | Description | Required |
-|----------|------|-------------|----------|
-| `hypotenuse` | [`number`](/docs/kcl-std/types/std-types-number) | The length of the triangle's hypotenuse | Yes |
-| `leg` | [`number`](/docs/kcl-std/types/std-types-number) | The length of one of the triangle's legs (i.e. non-hypotenuse side) | Yes |
-
-### Returns
-
-[`number`](/docs/kcl-std/types/std-types-number) - A number.
-
-
-### Examples
-
-```kcl
-legLen(hypotenuse = 5, leg = 3)
-```
-
-
-

docs/kcl-std/modules/std-array.md

@@ -12,8 +12,8 @@ Functions for manipulating arrays of values.
 
 ## Functions and constants
 
-* [`map`](/docs/kcl-std/map)
-* [`pop`](/docs/kcl-std/pop)
-* [`push`](/docs/kcl-std/push)
-* [`reduce`](/docs/kcl-std/reduce)
+* [`map`](/docs/kcl-std/functions/std-array-map)
+* [`pop`](/docs/kcl-std/functions/std-array-pop)
+* [`push`](/docs/kcl-std/functions/std-array-push)
+* [`reduce`](/docs/kcl-std/functions/std-array-reduce)
 

docs/kcl-std/modules/std-math.md

@@ -23,9 +23,9 @@ Functions for mathematical operations and some useful constants.
 * [`ceil`](/docs/kcl-std/functions/std-math-ceil)
 * [`cos`](/docs/kcl-std/functions/std-math-cos)
 * [`floor`](/docs/kcl-std/functions/std-math-floor)
-* [`legAngX`](/docs/kcl-std/legAngX)
-* [`legAngY`](/docs/kcl-std/legAngY)
-* [`legLen`](/docs/kcl-std/legLen)
+* [`legAngX`](/docs/kcl-std/functions/std-math-legAngX)
+* [`legAngY`](/docs/kcl-std/functions/std-math-legAngY)
+* [`legLen`](/docs/kcl-std/functions/std-math-legLen)
 * [`ln`](/docs/kcl-std/functions/std-math-ln)
 * [`log`](/docs/kcl-std/functions/std-math-log)
 * [`log10`](/docs/kcl-std/functions/std-math-log10)

docs/kcl-std/modules/std-sweep.md

@@ -0,0 +1,17 @@
+---
+title: "sweep"
+subtitle: "Module in std"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+
+## Functions and constants
+
+* [`sweep::SKETCH_PLANE`](/docs/kcl-std/consts/std-sweep-SKETCH_PLANE)
+* [`sweep::TRAJECTORY`](/docs/kcl-std/consts/std-sweep-TRAJECTORY)
+

docs/kcl-std/modules/std-types.md

@@ -18,6 +18,7 @@ Types can (optionally) be used to describe a function's arguments and returned v
 * [`Edge`](/docs/kcl-std/types/std-types-Edge)
 * [`Face`](/docs/kcl-std/types/std-types-Face)
 * [`Helix`](/docs/kcl-std/types/std-types-Helix)
+* [`ImportedGeometry`](/docs/kcl-std/types/std-types-ImportedGeometry)
 * [`Plane`](/docs/kcl-std/types/std-types-Plane)
 * [`Point2d`](/docs/kcl-std/types/std-types-Point2d)
 * [`Point3d`](/docs/kcl-std/types/std-types-Point3d)
@@ -25,6 +26,7 @@ Types can (optionally) be used to describe a function's arguments and returned v
 * [`Solid`](/docs/kcl-std/types/std-types-Solid)
 * [`any`](/docs/kcl-std/types/std-types-any)
 * [`bool`](/docs/kcl-std/types/std-types-bool)
+* [`fn`](/docs/kcl-std/types/std-types-fn)
 * [`number`](/docs/kcl-std/types/std-types-number)
 * [`string`](/docs/kcl-std/types/std-types-string)
 * [`tag`](/docs/kcl-std/types/std-types-tag)

docs/kcl-std/modules/std.md

@@ -19,6 +19,7 @@ You might also want the [KCL language reference](/docs/kcl-lang) or the [KCL gui
 * [`math`](/docs/kcl-std/modules/std-math)
 * [`sketch`](/docs/kcl-std/modules/std-sketch)
 * [`solid`](/docs/kcl-std/modules/std-solid)
+* [`sweep::sweep`](/docs/kcl-std/modules/std-sweep)
 * [`transform`](/docs/kcl-std/modules/std-transform)
 * [`turns::turns`](/docs/kcl-std/modules/std-turns)
 * [`types`](/docs/kcl-std/modules/std-types)
@@ -37,7 +38,7 @@ You might also want the [KCL language reference](/docs/kcl-lang) or the [KCL gui
 * [`appearance`](/docs/kcl-std/appearance)
 * [`assert`](/docs/kcl-std/assert)
 * [`assertIs`](/docs/kcl-std/assertIs)
-* [`clone`](/docs/kcl-std/clone)
+* [`clone`](/docs/kcl-std/functions/std-clone)
 * [`helix`](/docs/kcl-std/functions/std-helix)
 * [`offsetPlane`](/docs/kcl-std/functions/std-offsetPlane)
 * [`patternLinear2d`](/docs/kcl-std/patternLinear2d)

docs/kcl-std/types/std-types-ImportedGeometry.md

@@ -0,0 +1,13 @@
+---
+title: "ImportedGeometry"
+subtitle: "Type in std::types"
+excerpt: "Represents geometry which is defined using some other CAD system and imported into KCL."
+layout: manual
+---
+
+Represents geometry which is defined using some other CAD system and imported into KCL.
+
+
+
+
+

docs/kcl-std/types/std-types-fn.md

@@ -0,0 +1,13 @@
+---
+title: "fn"
+subtitle: "Type in std::types"
+excerpt: "The type of any function in KCL."
+layout: manual
+---
+
+The type of any function in KCL.
+
+
+
+
+

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

@@ -134,8 +134,6 @@ extrude001 = extrude(sketch001, length = 5)`
     await page.setBodyDimensions({ width: 1200, height: 500 })
     await homePage.goToModelingScene()
 
-    await page.waitForTimeout(1000)
-
     // Ensure badge is present
     const codePaneButtonHolder = page.locator('#code-button-holder')
     await expect(codePaneButtonHolder).toContainText('notification', {
@@ -158,10 +156,14 @@ extrude001 = extrude(sketch001, length = 5)`
     await expect(
       page
         .getByText(
-          'Modeling command failed: [ApiError { error_code: InternalEngine, message: "Solid3D revolve failed:  sketch profile must lie entirely on one side of the revolution axis" }]'
+          'Solid3D revolve failed:  sketch profile must lie entirely on one side of the revolution axis'
         )
         .first()
     ).toBeVisible()
+
+    // Make sure ApiError is not on the page.
+    // This ensures we didn't nest the json
+    await expect(page.getByText('ApiError')).not.toBeVisible()
   })
 
   test('When error is not in view WITH LINTS you can click the badge to scroll to it', async ({
@@ -179,7 +181,7 @@ extrude001 = extrude(sketch001, length = 5)`
     await page.setBodyDimensions({ width: 1200, height: 500 })
     await homePage.goToModelingScene()
 
-    await scene.settled(cmdBar)
+    // await scene.settled(cmdBar)
 
     // Ensure badge is present
     const codePaneButtonHolder = page.locator('#code-button-holder')

e2e/playwright/desktop-export.spec.ts

@@ -58,12 +58,6 @@ test(
       await expect(submitButton).toBeVisible()
       await page.keyboard.press('Enter')
 
-      // Look out for the toast message
-      const exportingToastMessage = page.getByText(`Exporting...`)
-      const alreadyExportingToastMessage = page.getByText(`Already exporting`)
-      await expect(exportingToastMessage).toBeVisible()
-      await expect(alreadyExportingToastMessage).not.toBeVisible()
-
       // Expect it to succeed
       const errorToastMessage = page.getByText(`Error while exporting`)
       const engineErrorToastMessage = page.getByText(`Nothing to export`)
@@ -71,8 +65,9 @@ test(
       await expect(engineErrorToastMessage).not.toBeVisible()
 
       const successToastMessage = page.getByText(`Exported successfully`)
-      await expect(successToastMessage).toBeVisible()
-      await expect(exportingToastMessage).not.toBeVisible()
+      await page.waitForTimeout(1_000)
+      const count = await successToastMessage.count()
+      await expect(count).toBeGreaterThanOrEqual(1)
 
       // Check for the exported file
       const firstFileFullPath = path.resolve(
@@ -141,7 +136,9 @@ test(
       await expect(engineErrorToastMessage).not.toBeVisible()
 
       const successToastMessage = page.getByText(`Exported successfully`)
-      await expect(successToastMessage).toBeVisible()
+      await page.waitForTimeout(1_000)
+      const count = await successToastMessage.count()
+      await expect(count).toBeGreaterThanOrEqual(1)
       await expect(exportingToastMessage).not.toBeVisible()
 
       // Check for the exported file=

e2e/playwright/editor-tests.spec.ts

@@ -1533,7 +1533,6 @@ sketch001 = startSketchOn(XZ)
     await homePage.goToModelingScene()
 
     await scene.connectionEstablished()
-    await scene.settled(cmdBar)
 
     await scene.expectPixelColor(
       TEST_COLORS.DARK_MODE_BKGD,

e2e/playwright/fixtures/cmdBarFixture.ts

@@ -155,6 +155,12 @@ export class CmdBarFixture {
     }
   }
 
+  closeCmdBar = async () => {
+    const cmdBarCloseBtn = this.page.getByTestId('command-bar-close-button')
+    await cmdBarCloseBtn.click()
+    await expect(this.cmdBarElement).not.toBeVisible()
+  }
+
   get cmdSearchInput() {
     return this.page.getByTestId('cmd-bar-search')
   }
@@ -298,4 +304,27 @@ export class CmdBarFixture {
       `Monitoring text-to-cad API requests. Output will be saved to: ${outputPath}`
     )
   }
+
+  async toBeOpened() {
+    // Check that the command bar is opened
+    await expect(this.cmdBarElement).toBeVisible({ timeout: 10_000 })
+  }
+
+  async expectArgValue(value: string) {
+    // Check the placeholder project name exists
+    const actualArgument = await this.cmdBarElement
+      .getByTestId('cmd-bar-arg-value')
+      .inputValue()
+    const expectedArgument = value
+    expect(actualArgument).toBe(expectedArgument)
+  }
+
+  async expectCommandName(value: string) {
+    // Check the placeholder project name exists
+    const actual = await this.cmdBarElement
+      .getByTestId('command-name')
+      .textContent()
+    const expected = value
+    expect(actual).toBe(expected)
+  }
 }

e2e/playwright/fixtures/homePageFixture.ts

@@ -24,6 +24,7 @@ export class HomePageFixture {
   projectTextName!: Locator
   sortByDateBtn!: Locator
   sortByNameBtn!: Locator
+  appHeader!: Locator
   tutorialBtn!: Locator
 
   constructor(page: Page) {
@@ -44,6 +45,7 @@ export class HomePageFixture {
 
     this.sortByDateBtn = this.page.getByTestId('home-sort-by-modified')
     this.sortByNameBtn = this.page.getByTestId('home-sort-by-name')
+    this.appHeader = this.page.getByTestId('app-header')
     this.tutorialBtn = this.page.getByTestId('home-tutorial-button')
   }
 
@@ -125,4 +127,11 @@ export class HomePageFixture {
 
     await this.createAndGoToProject(name)
   }
+
+  isNativeFileMenuCreated = async () => {
+    await expect(this.appHeader).toHaveAttribute(
+      'data-native-file-menu',
+      'true'
+    )
+  }
 }

e2e/playwright/fixtures/sceneFixture.ts

@@ -46,6 +46,7 @@ export class SceneFixture {
   public networkToggleConnected!: Locator
   public engineConnectionsSpinner!: Locator
   public startEditSketchBtn!: Locator
+  public appHeader!: Locator
 
   constructor(page: Page) {
     this.page = page
@@ -57,6 +58,7 @@ export class SceneFixture {
     this.startEditSketchBtn = page
       .getByRole('button', { name: 'Start Sketch' })
       .or(page.getByRole('button', { name: 'Edit Sketch' }))
+    this.appHeader = this.page.getByTestId('app-header')
   }
   private _serialiseScene = async (): Promise<SceneSerialised> => {
     const camera = await this.getCameraInfo()
@@ -280,6 +282,13 @@ export class SceneFixture {
     await expect(buttonToTest).toBeVisible()
     await buttonToTest.click()
   }
+
+  isNativeFileMenuCreated = async () => {
+    await expect(this.appHeader).toHaveAttribute(
+      'data-native-file-menu',
+      'true'
+    )
+  }
 }
 
 function isColourArray(

e2e/playwright/onboarding-tests.spec.ts

@@ -6,7 +6,6 @@ test.describe('Onboarding tests', () => {
     homePage,
     toolbar,
     editor,
-    scene,
     tronApp,
   }) => {
     if (!tronApp) {
@@ -62,7 +61,6 @@ test.describe('Onboarding tests', () => {
       await editor.expectEditor.toContain('@settings(defaultLengthUnit = in)', {
         shouldNormalise: true,
       })
-      await scene.connectionEstablished()
     })
 
     await test.step('Go home and verify we still see the tutorial button, then begin it.', async () => {
@@ -132,9 +130,7 @@ test.describe('Onboarding tests', () => {
       })
 
       await test.step('Dismiss the onboarding', async () => {
-        await postDismissToast.waitFor({ state: 'hidden' })
         await page.keyboard.press('Escape')
-        await expect(postDismissToast).toBeVisible()
         await expect(page.getByTestId('onboarding-content')).not.toBeVisible()
         await expect.poll(() => page.url()).not.toContain('/onboarding')
       })
@@ -162,13 +158,10 @@ test.describe('Onboarding tests', () => {
       await test.step('Gets to the onboarding start', async () => {
         await expect(toolbar.projectName).toContainText('tutorial-project')
         await expect(tutorialWelcomeHeading).toBeVisible()
-        await scene.connectionEstablished()
       })
 
       await test.step('Dismiss the onboarding', async () => {
-        await postDismissToast.waitFor({ state: 'hidden' })
         await page.keyboard.press('Escape')
-        await expect(postDismissToast).toBeVisible()
         await expect(page.getByTestId('onboarding-content')).not.toBeVisible()
         await expect.poll(() => page.url()).not.toContain('/onboarding')
       })

e2e/playwright/point-click.spec.ts

@@ -1931,50 +1931,37 @@ sketch002 = startSketchOn(XZ)
     })
   })
 
-  test(`Sweep point-and-click failing validation`, async ({
+  test(`Sweep point-and-click helix`, async ({
     context,
     page,
     homePage,
     scene,
+    editor,
     toolbar,
     cmdBar,
   }) => {
-    const initialCode = `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(YZ)
-  |> circle(
-       center = [0, 0],
-       radius = 500
+    const circleCode = `circle(sketch001, center = [0, -1], radius = .1)`
+    const initialCode = `helix001 = helix(
+  axis = X,
+  radius = 1,
+  length = 10,
+  revolutions = 10,
+  angleStart = 0,
+  ccw = false,
 )
-sketch002 = startSketchOn(XZ)
-  |> startProfile(at = [0, 0])
-  |> xLine(length = -500)
-  |> line(endAbsolute = [-2000, 500])
-`
+sketch001 = startSketchOn(XZ)
+profile001 = ${circleCode}`
+    const sweepDeclaration = 'sweep001 = sweep(profile001, path = helix001)'
+
     await context.addInitScript((initialCode) => {
       localStorage.setItem('persistCode', initialCode)
     }, initialCode)
-    await page.setBodyDimensions({ width: 1000, height: 500 })
     await homePage.goToModelingScene()
     await scene.settled(cmdBar)
 
-    // One dumb hardcoded screen pixel value
-    const testPoint = { x: 700, y: 250 }
-    const [clickOnSketch1] = scene.makeMouseHelpers(testPoint.x, testPoint.y)
-    const [clickOnSketch2] = scene.makeMouseHelpers(
-      testPoint.x - 50,
-      testPoint.y
-    )
-
-    await test.step(`Look for sketch001`, async () => {
-      await toolbar.closePane('code')
-      await scene.expectPixelColor([53, 53, 53], testPoint, 15)
-    })
-
-    await test.step(`Go through the command bar flow and fail validation with a toast`, async () => {
+    await test.step(`Add sweep through the command bar flow`, async () => {
+      await toolbar.openPane('feature-tree')
       await toolbar.sweepButton.click()
-      await expect
-        .poll(() => page.getByText('Please select one').count())
-        .toBe(1)
       await cmdBar.expectState({
         commandName: 'Sweep',
         currentArgKey: 'sketches',
@@ -1987,7 +1974,8 @@ sketch002 = startSketchOn(XZ)
         highlightedHeaderArg: 'sketches',
         stage: 'arguments',
       })
-      await clickOnSketch1()
+      await editor.scrollToText(circleCode)
+      await page.getByText(circleCode).click()
       await cmdBar.progressCmdBar()
       await cmdBar.expectState({
         commandName: 'Sweep',
@@ -2001,11 +1989,39 @@ sketch002 = startSketchOn(XZ)
         highlightedHeaderArg: 'path',
         stage: 'arguments',
       })
-      await clickOnSketch2()
+      const helix = await toolbar.getFeatureTreeOperation('Helix', 0)
+      await helix.click()
+      await cmdBar.expectState({
+        commandName: 'Sweep',
+        currentArgKey: 'path',
+        currentArgValue: '',
+        headerArguments: {
+          Sectional: '',
+          Sketches: '1 face',
+          Path: '',
+        },
+        highlightedHeaderArg: 'path',
+        stage: 'arguments',
+      })
       await cmdBar.progressCmdBar()
-      await expect(
-        page.getByText('Unable to sweep with the current selection. Reason:')
-      ).toBeVisible()
+      await cmdBar.expectState({
+        commandName: 'Sweep',
+        headerArguments: {
+          Sketches: '1 face',
+          Path: '1 helix',
+          Sectional: '',
+        },
+        stage: 'review',
+      })
+      await cmdBar.progressCmdBar()
+      await editor.expectEditor.toContain(sweepDeclaration)
+    })
+
+    await test.step('Delete sweep via feature tree selection', async () => {
+      const sweep = await toolbar.getFeatureTreeOperation('Sweep', 0)
+      await sweep.click()
+      await page.keyboard.press('Delete')
+      await editor.expectEditor.not.toContain(sweepDeclaration)
     })
   })
 
@@ -3627,67 +3643,6 @@ profile001 = startProfile(sketch001, at = [-20, 20])
     })
   })
 
-  test(`Shell dry-run validation rejects sweeps`, async ({
-    context,
-    page,
-    homePage,
-    scene,
-    editor,
-    toolbar,
-    cmdBar,
-  }) => {
-    const initialCode = `sketch001 = startSketchOn(YZ)
-  |> circle(
-       center = [0, 0],
-       radius = 500
-     )
-sketch002 = startSketchOn(XZ)
-    |> startProfile(at = [0, 0])
-  |> xLine(length = -2000)
-sweep001 = sweep(sketch001, path = sketch002)
-`
-    await context.addInitScript((initialCode) => {
-      localStorage.setItem('persistCode', initialCode)
-    }, initialCode)
-    await page.setBodyDimensions({ width: 1000, height: 500 })
-    await homePage.goToModelingScene()
-    await scene.settled(cmdBar)
-
-    // One dumb hardcoded screen pixel value
-    const testPoint = { x: 500, y: 250 }
-    const [clickOnSweep] = scene.makeMouseHelpers(testPoint.x, testPoint.y)
-
-    await test.step(`Confirm sweep exists`, async () => {
-      await toolbar.closePane('code')
-      await scene.expectPixelColor([231, 231, 231], testPoint, 15)
-    })
-
-    await test.step(`Go through the Shell flow and fail validation with a toast`, async () => {
-      await toolbar.shellButton.click()
-      await expect
-        .poll(() => page.getByText('Please select one').count())
-        .toBe(1)
-      await cmdBar.expectState({
-        stage: 'arguments',
-        currentArgKey: 'selection',
-        currentArgValue: '',
-        headerArguments: {
-          Selection: '',
-          Thickness: '',
-        },
-        highlightedHeaderArg: 'selection',
-        commandName: 'Shell',
-      })
-      await clickOnSweep()
-      await page.waitForTimeout(500)
-      await cmdBar.progressCmdBar()
-      await expect(
-        page.getByText('Unable to shell with the current selection. Reason:')
-      ).toBeVisible()
-      await page.waitForTimeout(1000)
-    })
-  })
-
   test.describe('Revolve point and click workflows', () => {
     test('Base case workflow, auto spam continue in command bar', async ({
       context,
@@ -4943,4 +4898,34 @@ path001 = startProfile(sketch001, at = [0, 0])
       )
     })
   })
+
+  test(`Point and click codemods can't run on KCL errors`, async ({
+    context,
+    page,
+    homePage,
+    scene,
+    editor,
+    toolbar,
+    cmdBar,
+  }) => {
+    const badCode = `sketch001 = startSketchOn(XZ)
+profile001 = circle(sketch001, center = [0, 0], radius = 1)
+extrude001 = extrude(profile001 length = 1)`
+    await context.addInitScript((initialCode) => {
+      localStorage.setItem('persistCode', initialCode)
+    }, badCode)
+    await page.setBodyDimensions({ width: 1000, height: 500 })
+    await homePage.goToModelingScene()
+    await scene.connectionEstablished()
+
+    await test.step(`Start Sketch is disabled`, async () => {
+      await expect(toolbar.startSketchBtn).not.toBeEnabled()
+      await editor.expectEditor.toContain(badCode, { shouldNormalise: true })
+    })
+
+    await test.step(`Helix is disabled`, async () => {
+      await expect(toolbar.helixButton).not.toBeEnabled()
+      await editor.expectEditor.toContain(badCode, { shouldNormalise: true })
+    })
+  })
 })

e2e/playwright/projects.spec.ts

@@ -1818,7 +1818,6 @@ test(
         'extrude-custom-plane.kcl',
         'extrude-inside-fn-with-tags.kcl',
         'fillet-and-shell.kcl',
-        'fillet_duplicate_tags.kcl',
         'focusrite_scarlett_mounting_bracket.kcl',
         'function_sketch.kcl',
         'function_sketch_with_position.kcl',
@@ -1826,7 +1825,6 @@ test(
         'helix_defaults.kcl',
         'helix_defaults_negative_extrude.kcl',
         'helix_with_length.kcl',
-        'i_shape.kcl',
         'kittycad_svg.kcl',
         'lego.kcl',
         'lsystem.kcl',

e2e/playwright/prompt-to-edit-snapshot-tests.spec.ts

@@ -99,6 +99,8 @@ test.describe('edit with AI example snapshots', () => {
       await test.step('fire off edit prompt', async () => {
         await cmdBar.captureTextToCadRequestSnapshot(test.info())
         await cmdBar.openCmdBar('promptToEdit')
+        await page.waitForTimeout(100)
+        await cmdBar.progressCmdBar()
         // being specific about the color with a hex means asserting pixel color is more stable
         await page
           .getByTestId('cmd-bar-arg-value')

e2e/playwright/prompt-to-edit.spec.ts

@@ -88,6 +88,8 @@ test.describe('Prompt-to-edit tests', () => {
 
         await test.step('fire off edit prompt', async () => {
           await cmdBar.openCmdBar('promptToEdit')
+          await page.waitForTimeout(100)
+          await cmdBar.progressCmdBar()
           // being specific about the color with a hex means asserting pixel color is more stable
           await page
             .getByTestId('cmd-bar-arg-value')
@@ -165,6 +167,8 @@ test.describe('Prompt-to-edit tests', () => {
 
     await test.step('fire of bad prompt', async () => {
       await cmdBar.openCmdBar('promptToEdit')
+      await page.waitForTimeout(100)
+      await cmdBar.progressCmdBar()
       await page
         .getByTestId('cmd-bar-arg-value')
         .fill('ansheusha asnthuatshoeuhtaoetuhthaeu laughs in dvorak')

e2e/playwright/regression-tests.spec.ts

@@ -19,11 +19,12 @@ test.describe('Regression tests', () => {
     context,
     page,
     homePage,
+    scene,
   }) => {
     // because the model has `line([0,0]..` it is valid code, but the model is invalid
     // regression test for https://github.com/KittyCAD/modeling-app/issues/3251
     // Since the bad model also found as issue with the artifact graph, which in tern blocked the editor diognostics
-    const u = await getUtils(page)
+    // const u = await getUtils(page)
     await context.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
@@ -40,7 +41,8 @@ test.describe('Regression tests', () => {
     await page.setBodyDimensions({ width: 1000, height: 500 })
 
     await homePage.goToModelingScene()
-    await u.waitForPageLoad()
+    await scene.connectionEstablished()
+    // await u.waitForPageLoad()
 
     // error in guter
     await expect(page.locator('.cm-lint-marker-error')).toBeVisible()
@@ -51,8 +53,11 @@ test.describe('Regression tests', () => {
     // the close doesn't work
     // when https://github.com/KittyCAD/modeling-app/issues/3268 is closed
     // this test will need updating
-    const crypticErrorText = `ApiError`
+    const crypticErrorText = `Cannot close a path that is non-planar or with duplicate vertices.
+Internal engine error on request`
     await expect(page.getByText(crypticErrorText).first()).toBeVisible()
+    // Ensure we didn't nest the json.
+    await expect(page.getByText('ApiError')).not.toBeVisible()
   })
   test('user should not have to press down twice in cmdbar', async ({
     page,
@@ -185,8 +190,8 @@ extrude001 = extrude(sketch001, length = 50)
       page.locator('.pretty-json-container >> text=myVar:"67')
     ).toBeVisible()
   })
-  test('ProgramMemory can be serialised', async ({ page, homePage }) => {
-    const u = await getUtils(page)
+  test('ProgramMemory can be serialised', async ({ page, homePage, scene }) => {
+    // const u = await getUtils(page)
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
@@ -211,11 +216,12 @@ extrude001 = extrude(sketch001, length = 50)
     // Listen for all console events and push the message text to an array
     page.on('console', (message) => messages.push(message.text()))
     await homePage.goToModelingScene()
-    await u.waitForPageLoad()
+    // await u.waitForPageLoad()
+    await scene.connectionEstablished()
 
     // wait for execution done
-    await u.openDebugPanel()
-    await u.expectCmdLog('[data-message-type="execution-done"]')
+    // await u.openDebugPanel()
+    // await u.expectCmdLog('[data-message-type="execution-done"]')
 
     const forbiddenMessages = ['cannot serialize tagged newtype variant']
     forbiddenMessages.forEach((forbiddenMessage) => {
@@ -229,6 +235,7 @@ extrude001 = extrude(sketch001, length = 50)
     context,
     page,
     homePage,
+    scene,
   }) => {
     const u = await getUtils(page)
     // const PUR = 400 / 37.5 //pixeltoUnitRatio
@@ -247,11 +254,10 @@ extrude001 = extrude(sketch001, length = 50)
     shell(exampleSketch, faces = ['end'], thickness = 0.25)`
       )
     })
+    await homePage.goToModelingScene()
+    await scene.connectionEstablished()
 
     await expect(async () => {
-      await homePage.goToModelingScene()
-      await u.waitForPageLoad()
-
       // error in guter
       await expect(page.locator('.cm-lint-marker-error')).toBeVisible({
         timeout: 1_000,
@@ -329,10 +335,10 @@ extrude002 = extrude(profile002, length = 150)
       )
 
       const websocketPromise = page.waitForEvent('websocket')
-      await toolbar.closePane('code')
       await page.setBodyDimensions({ width: 1000, height: 500 })
 
       await homePage.goToModelingScene()
+      await toolbar.closePane('code')
       const websocket = await websocketPromise
 
       await scene.connectionEstablished()
@@ -452,12 +458,10 @@ extrude002 = extrude(profile002, length = 150)
 
       // Click the stl.
       await expect(stlOption).toBeVisible()
-
       await page.keyboard.press('Enter')
 
       // Click the checkbox
       await expect(submitButton).toBeVisible()
-
       await page.keyboard.press('Enter')
 
       // Find the toast.
@@ -465,11 +469,13 @@ extrude002 = extrude(profile002, length = 150)
       await expect(exportingToastMessage).toBeVisible()
 
       // Expect it to succeed.
-      await expect(exportingToastMessage).not.toBeVisible({ timeout: 15_000 })
+      await expect(exportingToastMessage).not.toBeVisible()
       await expect(engineErrorToastMessage).not.toBeVisible()
 
       const successToastMessage = page.getByText(`Exported successfully`)
-      await expect(successToastMessage).toBeVisible()
+      await page.waitForTimeout(1_000)
+      const count = await successToastMessage.count()
+      await expect(count).toBeGreaterThanOrEqual(1)
     }
   )
   // We updated this test such that you can have multiple exports going at once.
@@ -545,14 +551,15 @@ extrude002 = extrude(profile002, length = 150)
         expect(alreadyExportingToastMessage).not.toBeVisible(),
       ])
 
-      await expect(successToastMessage).toHaveCount(2)
+      const count = await successToastMessage.count()
+      await expect(count).toBeGreaterThanOrEqual(2)
     })
   })
 
   test(
     `Network health indicator only appears in modeling view`,
     { tag: '@electron' },
-    async ({ context, page }, testInfo) => {
+    async ({ context, page }) => {
       await context.folderSetupFn(async (dir) => {
         const bracketDir = path.join(dir, 'bracket')
         await fsp.mkdir(bracketDir, { recursive: true })
@@ -561,9 +568,7 @@ extrude002 = extrude(profile002, length = 150)
           path.join(bracketDir, 'main.kcl')
         )
       })
-
       await page.setBodyDimensions({ width: 1200, height: 500 })
-      const u = await getUtils(page)
 
       // Locators
       const projectsHeading = page.getByRole('heading', {
@@ -583,10 +588,8 @@ extrude002 = extrude(profile002, length = 150)
       })
 
       await test.step('Check the modeling view', async () => {
+        await expect(projectsHeading).not.toBeVisible()
         await expect(networkHealthIndicator).toBeVisible()
-        await expect(networkHealthIndicator).toContainText('Problem')
-        await u.waitForPageLoad()
-        await expect(networkHealthIndicator).toContainText('Connected')
       })
     }
   )

e2e/playwright/sketch-tests.spec.ts

@@ -1365,18 +1365,18 @@ solid001 = subtract([extrude001], tools = [extrude002])
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
-        `fn in2mm = (inches) => {
+        `fn in2mm(@inches) {
     return inches * 25.4
   }
 
-  const railTop = in2mm(.748)
-  const railSide = in2mm(.024)
-  const railBaseWidth = in2mm(.612)
-  const railWideWidth = in2mm(.835)
-  const railBaseLength = in2mm(.200)
-  const railClampable = in2mm(.200)
+  railTop = in2mm(.748)
+  railSide = in2mm(.024)
+  railBaseWidth = in2mm(.612)
+  railWideWidth = in2mm(.835)
+  railBaseLength = in2mm(.200)
+  railClampable = in2mm(.200)
 
-  const rail = startSketchOn(XZ)
+  rail = startSketchOn(XZ)
     |> startProfile(at = [-railTop / 2, railClampable + railBaseLength])
     |> line(endAbsolute = [
      railTop / 2,
@@ -3496,6 +3496,69 @@ profile001 = startProfile(sketch001, at = [-102.72, 237.44])
     ).toBeVisible()
   })
 
+  // Ensure feature tree is not showing previous file's content when switching to a file with KCL errors.
+  test('Feature tree shows correct sketch count per file', async ({
+    context,
+    homePage,
+    scene,
+    toolbar,
+    cmdBar,
+    page,
+  }) => {
+    const u = await getUtils(page)
+
+    // Setup project with files.
+    const GOOD_KCL = `sketch001 = startSketchOn(XZ)
+profile001 = startProfile(sketch001, at = [220.81, 253.8])
+  |> line(end = [132.84, -151.31])
+  |> line(end = [25.51, 167.15])
+  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+  |> close()
+sketch002 = startSketchOn(XZ)
+profile002 = startProfile(sketch002, at = [158.35, -70.82])
+  |> line(end = [73.9, -152.19])
+  |> line(end = [85.33, 135.48])
+  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+  |> close()`
+
+    const ERROR_KCL = `sketch001 = startSketchOn(XZ)
+profile001 = startProfile(sketch001, at = [127.56, 179.02])
+  |> line(end = [132.84, -112.6])
+  |> line(end = [85.33, 234.01])
+  |> line(enfd = [-137.23, -54.55])`
+
+    await context.folderSetupFn(async (dir) => {
+      const projectDir = path.join(dir, 'multi-file-sketch-test')
+      await fs.mkdir(projectDir, { recursive: true })
+      await Promise.all([
+        fs.writeFile(path.join(projectDir, 'good.kcl'), GOOD_KCL, 'utf-8'),
+        fs.writeFile(path.join(projectDir, 'error.kcl'), ERROR_KCL, 'utf-8'),
+      ])
+    })
+
+    await page.setBodyDimensions({ width: 1000, height: 800 })
+
+    await homePage.openProject('multi-file-sketch-test')
+    await scene.connectionEstablished()
+
+    await u.closeDebugPanel()
+
+    await toolbar.openFeatureTreePane()
+    await toolbar.openPane('files')
+
+    await toolbar.openFile('good.kcl')
+
+    await expect(
+      toolbar.featureTreePane.getByRole('button', { name: 'Sketch' })
+    ).toHaveCount(2)
+
+    await toolbar.openFile('error.kcl')
+
+    await expect(
+      toolbar.featureTreePane.getByRole('button', { name: 'Sketch' })
+    ).toHaveCount(0)
+  })
+
   test('adding a syntax error, recovers after fixing', async ({
     page,
     homePage,

e2e/playwright/snapshot-tests.spec.ts

@@ -1,4 +1,3 @@
-import { KCL_DEFAULT_LENGTH } from '@src/lib/constants'
 import type { CmdBarFixture } from '@e2e/playwright/fixtures/cmdBarFixture'
 import type { SceneFixture } from '@e2e/playwright/fixtures/sceneFixture'
 import { TEST_SETTINGS, TEST_SETTINGS_KEY } from '@e2e/playwright/storageStates'
@@ -9,6 +8,7 @@ import {
   settingsToToml,
 } from '@e2e/playwright/test-utils'
 import { expect, test } from '@e2e/playwright/zoo-test'
+import { KCL_DEFAULT_LENGTH } from '@src/lib/constants'
 
 test.beforeEach(async ({ page, context }) => {
   // Make the user avatar image always 404
@@ -766,7 +766,7 @@ test.describe('Grid visibility', { tag: '@snapshot' }, () => {
   })
 })
 
-test('theme persists', async ({ page, context }) => {
+test('theme persists', async ({ page, context, homePage }) => {
   const u = await getUtils(page)
   await context.addInitScript(async () => {
     localStorage.setItem(
@@ -784,7 +784,7 @@ test('theme persists', async ({ page, context }) => {
 
   await page.setViewportSize({ width: 1200, height: 500 })
 
-  await u.waitForAuthSkipAppStart()
+  await homePage.goToModelingScene()
   await page.waitForTimeout(500)
 
   // await page.getByRole('link', { name: 'Settings Settings (tooltip)' }).click()
@@ -812,7 +812,7 @@ test('theme persists', async ({ page, context }) => {
   // Disconnect and reconnect to check the theme persists through a reload
 
   // Expect the network to be down
-  await expect(networkToggle).toContainText('Offline')
+  await expect(networkToggle).toContainText('Problem')
 
   // simulate network up
   await u.emulateNetworkConditions({
@@ -873,6 +873,50 @@ sweepSketch = startSketchOn(XY)
       mask: lowerRightMasks(page),
     })
   })
+  test('code color goober works with single quotes', async ({
+    page,
+    context,
+    scene,
+    cmdBar,
+  }) => {
+    const u = await getUtils(page)
+    await context.addInitScript(async () => {
+      localStorage.setItem(
+        'persistCode',
+        `// Create a pipe using a sweep.
+
+// Create a path for the sweep.
+sweepPath = startSketchOn(XZ)
+  |> startProfile(at = [0.05, 0.05])
+  |> line(end = [0, 7])
+  |> tangentialArc(angle = 90, radius = 5)
+  |> line(end = [-3, 0])
+  |> tangentialArc(angle = -90, radius = 5)
+  |> line(end = [0, 7])
+
+sweepSketch = startSketchOn(XY)
+  |> startProfile(at = [2, 0])
+  |> arc(angleStart = 0, angleEnd = 360, radius = 2)
+  |> sweep(path = sweepPath)
+  |> appearance(
+       color = '#bb00ff',
+       metalness = 90,
+       roughness = 90
+     )
+`
+      )
+    })
+
+    await page.setViewportSize({ width: 1200, height: 1000 })
+    await u.waitForAuthSkipAppStart()
+
+    await scene.settled(cmdBar)
+
+    await expect(page, 'expect small color widget').toHaveScreenshot({
+      maxDiffPixels: 100,
+      mask: lowerRightMasks(page),
+    })
+  })
 
   test('code color goober opening window', async ({
     page,

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

@@ -1,19 +1,22 @@
 import type { EngineCommand } from '@src/lang/std/artifactGraph'
 import { uuidv4 } from '@src/lib/utils'
 
-import { commonPoints, getUtils } from '@e2e/playwright/test-utils'
+import {
+  commonPoints,
+  getUtils,
+  TEST_COLORS,
+  circleMove,
+} from '@e2e/playwright/test-utils'
 import { expect, test } from '@e2e/playwright/zoo-test'
 
-test.describe(
-  'Test network and connection issues',
-  {
-    tag: ['@macos', '@windows'],
-  },
-  () => {
+test.describe('Test network related behaviors', () => {
   test(
     'simulate network down and network little widget',
     { tag: '@skipLocalEngine' },
     async ({ page, homePage }) => {
+      const networkToggleConnectedText = page.getByText('Connected')
+      const networkToggleWeakText = page.getByText('Network health (Weak)')
+
       const u = await getUtils(page)
       await page.setBodyDimensions({ width: 1200, height: 500 })
 
@@ -34,7 +37,9 @@ test.describe(
       await expect(networkPopover).not.toBeVisible()
 
       // (First check) Expect the network to be up
-        await expect(networkToggle).toContainText('Connected')
+      await expect(
+        networkToggleConnectedText.or(networkToggleWeakText)
+      ).toBeVisible()
 
       // Click the network widget
       await networkWidget.click()
@@ -82,7 +87,9 @@ test.describe(
       ).not.toBeDisabled({ timeout: 15000 })
 
       // (Second check) expect the network to be up
-        await expect(networkToggle).toContainText('Connected')
+      await expect(
+        networkToggleConnectedText.or(networkToggleWeakText)
+      ).toBeVisible()
     }
   )
 
@@ -91,6 +98,8 @@ test.describe(
     { tag: '@skipLocalEngine' },
     async ({ page, homePage, toolbar, scene, cmdBar }) => {
       const networkToggle = page.getByTestId('network-toggle')
+      const networkToggleConnectedText = page.getByText('Connected')
+      const networkToggleWeakText = page.getByText('Network health (Weak)')
 
       const u = await getUtils(page)
       await page.setBodyDimensions({ width: 1200, height: 500 })
@@ -109,7 +118,7 @@ test.describe(
       await page.mouse.click(700, 200)
 
       await expect(page.locator('.cm-content')).toHaveText(
-          `sketch001 = startSketchOn(XZ)`
+        `@settings(defaultLengthUnit = in)sketch001 = startSketchOn(XZ)`
       )
       await u.closeDebugPanel()
 
@@ -118,7 +127,7 @@ test.describe(
       const startXPx = 600
       await page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10)
       await expect(page.locator('.cm-content')).toHaveText(
-          `sketch001 = startSketchOn(XZ)profile001 = startProfile(sketch001, at = ${commonPoints.startAt})`
+        `@settings(defaultLengthUnit = in)sketch001 = startSketchOn(XZ)profile001 = startProfile(sketch001, at = ${commonPoints.startAt})`
       )
       await page.waitForTimeout(100)
 
@@ -127,11 +136,14 @@ test.describe(
 
       await expect(
         page.locator('.cm-content')
-        ).toHaveText(`sketch001 = startSketchOn(XZ)profile001 = startProfile(sketch001, at = ${commonPoints.startAt})
+      ).toHaveText(`@settings(defaultLengthUnit = in)sketch001 = startSketchOn(XZ)profile001 = startProfile(sketch001, at = ${commonPoints.startAt})
       |> xLine(length = ${commonPoints.num1})`)
 
       // Expect the network to be up
-        await expect(networkToggle).toContainText('Connected')
+      await networkToggle.hover()
+      await expect(
+        networkToggleConnectedText.or(networkToggleWeakText)
+      ).toBeVisible()
 
       // simulate network down
       await u.emulateNetworkConditions({
@@ -143,6 +155,7 @@ test.describe(
       })
 
       // Expect the network to be down
+      await networkToggle.hover()
       await expect(networkToggle).toContainText('Problem')
 
       // Ensure we are not in sketch mode
@@ -168,7 +181,11 @@ test.describe(
       ).not.toBeDisabled({ timeout: 15000 })
 
       // Expect the network to be up
-        await expect(networkToggle).toContainText('Connected')
+      await networkToggle.hover()
+      await expect(
+        networkToggleConnectedText.or(networkToggleWeakText)
+      ).toBeVisible()
+
       await scene.settled(cmdBar)
 
       // Click off the code pane.
@@ -183,9 +200,7 @@ test.describe(
       await toolbar.editSketch()
 
       // Click the line tool
-        await page
-          .getByRole('button', { name: 'line Line', exact: true })
-          .click()
+      await page.getByRole('button', { name: 'line Line', exact: true }).click()
 
       await page.waitForTimeout(150)
 
@@ -219,7 +234,10 @@ test.describe(
       await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 20)
       await expect
         .poll(u.normalisedEditorCode)
-          .toBe(`sketch001 = startSketchOn(XZ)
+        .toBe(`@settings(defaultLengthUnit = in)
+
+
+sketch001 = startSketchOn(XZ)
 profile001 = startProfile(sketch001, at = [12.34, -12.34])
   |> xLine(length = 12.34)
   |> line(end = [-12.34, 12.34])
@@ -230,7 +248,10 @@ profile001 = startProfile(sketch001, at = [12.34, -12.34])
 
       await expect
         .poll(u.normalisedEditorCode)
-          .toBe(`sketch001 = startSketchOn(XZ)
+        .toBe(`@settings(defaultLengthUnit = in)
+
+
+sketch001 = startSketchOn(XZ)
 profile001 = startProfile(sketch001, at = [12.34, -12.34])
   |> xLine(length = 12.34)
   |> line(end = [-12.34, 12.34])
@@ -255,5 +276,88 @@ profile001 = startProfile(sketch001, at = [12.34, -12.34])
       ).not.toBeVisible()
     }
   )
+
+  test(
+    'Paused stream freezes view frame, unpause reconnect is seamless to user',
+    { tag: ['@electron', '@skipLocalEngine'] },
+    async ({ page, homePage, scene, cmdBar, toolbar, tronApp }) => {
+      const networkToggle = page.getByTestId('network-toggle')
+      const networkToggleConnectedText = page.getByText('Connected')
+      const networkToggleWeakText = page.getByText('Network health (Weak)')
+
+      if (!tronApp) {
+        fail()
+      }
+
+      await tronApp.cleanProjectDir({
+        app: {
+          stream_idle_mode: 5000,
+        },
+      })
+
+      await page.addInitScript(async () => {
+        localStorage.setItem(
+          'persistCode',
+          `sketch001 = startSketchOn(XY)
+profile001 = startProfile(sketch001, at = [0.0, 0.0])
+  |> line(end = [10.0, 0])
+  |> line(end = [0, 10.0])
+  |> close()`
+        )
+      })
+
+      const dim = { width: 1200, height: 500 }
+      await page.setBodyDimensions(dim)
+
+      await test.step('Go to modeling scene', async () => {
+        await homePage.goToModelingScene()
+        await scene.settled(cmdBar)
+      })
+
+      await test.step('Verify pausing behavior', async () => {
+        // Wait 5s + 1s to pause.
+        await page.waitForTimeout(6000)
+
+        // We should now be paused. To the user, it should appear we're still
+        // connected.
+        await networkToggle.hover()
+        await expect(
+          networkToggleConnectedText.or(networkToggleWeakText)
+        ).toBeVisible()
+
+        const center = {
+          x: dim.width / 2,
+          y: dim.height / 2,
+        }
+
+        let probe = { x: 0, y: 0 }
+
+        // ... and the model's still visibly there
+        probe.x = center.x + dim.width / 100
+        probe.y = center.y
+        await scene.expectPixelColor(TEST_COLORS.GREY, probe, 15)
+        probe = { ...center }
+
+        // Now move the mouse around to unpause!
+        await circleMove(page, probe.x, probe.y, 20, 10)
+
+        // ONCE AGAIN! Check the view area hasn't changed at all.
+        // Check the pixel a couple times as it reconnects.
+        // NOTE: Remember, idle behavior is still on at this point -
+        // if this test takes longer than 5s shit WILL go south!
+        probe.x = center.x + dim.width / 100
+        probe.y = center.y
+        await scene.expectPixelColor(TEST_COLORS.GREY, probe, 15)
+        await page.waitForTimeout(1000)
+        await scene.expectPixelColor(TEST_COLORS.GREY, probe, 15)
+        probe = { ...center }
+
+        // Ensure we're still connected
+        await networkToggle.hover()
+        await expect(
+          networkToggleConnectedText.or(networkToggleWeakText)
+        ).toBeVisible()
+      })
     }
   )
+})

e2e/playwright/test-utils.ts

@@ -21,6 +21,7 @@ export const token = process.env.token || ''
 
 import type { ProjectConfiguration } from '@rust/kcl-lib/bindings/ProjectConfiguration'
 
+import type { ElectronZoo } from '@e2e/playwright/fixtures/fixtureSetup'
 import { isErrorWhitelisted } from '@e2e/playwright/lib/console-error-whitelist'
 import { TEST_SETTINGS, TEST_SETTINGS_KEY } from '@e2e/playwright/storageStates'
 import { test } from '@e2e/playwright/zoo-test'
@@ -43,6 +44,8 @@ export const lowerRightMasks = (page: Page) => [
 export type TestColor = [number, number, number]
 export const TEST_COLORS: { [key: string]: TestColor } = {
   WHITE: [249, 249, 249],
+  OFFWHITE: [237, 237, 237],
+  GREY: [142, 142, 142],
   YELLOW: [255, 255, 0],
   BLUE: [0, 0, 255],
   DARK_MODE_BKGD: [27, 27, 27],
@@ -548,11 +551,6 @@ export async function getUtils(page: Page, test_?: typeof test) {
 
     createNewFile: async (name: string) => {
       return test?.step(`Create a file named ${name}`, async () => {
-        // If the application is in the middle of connecting a stream
-        // then creating a new file won't work in the end.
-        await expect(
-          page.getByRole('button', { name: 'Start Sketch' })
-        ).not.toBeDisabled()
         await page.getByTestId('create-file-button').click()
         await page.getByTestId('tree-input-field').fill(name)
         await page.keyboard.press('Enter')
@@ -809,8 +807,6 @@ export const doExport = async (
 
   await page.getByRole('button', { name: 'Submit command' }).click()
 
-  // This usually happens immediately after. If we're too slow we don't
-  // catch it.
   await expect(page.getByText('Exported successfully')).toBeVisible()
 
   if (exportFrom === 'sidebarButton' || exportFrom === 'commandBar') {
@@ -1151,3 +1147,77 @@ export function perProjectSettingsToToml(
   // eslint-disable-next-line no-restricted-syntax
   return TOML.stringify(settings as any)
 }
+
+export async function clickElectronNativeMenuById(
+  tronApp: ElectronZoo,
+  menuId: string
+) {
+  const clickWasTriggered = await tronApp.electron.evaluate(
+    async ({ app }, menuId) => {
+      if (!app || !app.applicationMenu) {
+        return false
+      }
+      const menu = app.applicationMenu.getMenuItemById(menuId)
+      if (!menu) return false
+      menu.click()
+      return true
+    },
+    menuId
+  )
+  expect(clickWasTriggered).toBe(true)
+}
+
+export async function findElectronNativeMenuById(
+  tronApp: ElectronZoo,
+  menuId: string
+) {
+  const found = await tronApp.electron.evaluate(async ({ app }, menuId) => {
+    if (!app || !app.applicationMenu) {
+      return false
+    }
+    const menu = app.applicationMenu.getMenuItemById(menuId)
+    if (!menu) return false
+    return true
+  }, menuId)
+  expect(found).toBe(true)
+}
+
+export async function openSettingsExpectText(page: Page, text: string) {
+  const settings = page.getByTestId('settings-dialog-panel')
+  await expect(settings).toBeVisible()
+  // You are viewing the user tab
+  const actualText = settings.getByText(text)
+  await expect(actualText).toBeVisible()
+}
+
+export async function openSettingsExpectLocator(page: Page, selector: string) {
+  const settings = page.getByTestId('settings-dialog-panel')
+  await expect(settings).toBeVisible()
+  // You are viewing the keybindings tab
+  const settingsLocator = settings.locator(selector)
+  await expect(settingsLocator).toBeVisible()
+}
+
+/**
+ * A developer helper function to make playwright send all the console logs to stdout
+ * Call this within your E2E test and pass in the page or the tronApp to get as many
+ * logs piped to stdout for debugging
+ */
+export async function enableConsoleLogEverything({
+  page,
+  tronApp,
+}: { page?: Page; tronApp?: ElectronZoo }) {
+  page?.on('console', (msg) => {
+    console.log(`[Page-log]: ${msg.text()}`)
+  })
+
+  tronApp?.electron.on('window', async (electronPage) => {
+    electronPage.on('console', (msg) => {
+      console.log(`[Renderer] ${msg.type()}: ${msg.text()}`)
+    })
+  })
+
+  tronApp?.electron.on('console', (msg) => {
+    console.log(`[Main] ${msg.type()}: ${msg.text()}`)
+  })
+}

e2e/playwright/testing-samples-loading.spec.ts

@@ -33,8 +33,8 @@ test.describe('Testing loading external models', () => {
 
       // Locators and constants
       const newSample = {
-        file: 'parametric-bearing-pillow-block' + FILE_EXT,
-        title: 'Parametric Bearing Pillow Block',
+        file: 'pillow-block-bearing' + FILE_EXT,
+        title: 'Pillow Block Bearing',
       }
       const commandBarButton = page.getByRole('button', { name: 'Commands' })
       const samplesCommandOption = page.getByRole('option', {
@@ -100,9 +100,9 @@ test.describe('Testing loading external models', () => {
 
       // Locators and constants
       const sampleOne = {
-        file: 'parametric-bearing-pillow-block' + FILE_EXT,
-        title: 'Parametric Bearing Pillow Block',
-        file1: 'parametric-bearing-pillow-block-1' + FILE_EXT,
+        file: 'ball-bearing' + FILE_EXT,
+        title: 'Ball Bearing',
+        file1: 'ball-bearing-1' + FILE_EXT,
       }
       const projectCard = page.getByRole('link', { name: 'bracket' })
       const overwriteWarning = page.getByText(

e2e/playwright/text-to-cad-tests.spec.ts

@@ -905,7 +905,7 @@ test.describe('Mocked Text-to-CAD API tests', { tag: ['@skipWin'] }, () => {
       await page.keyboard.press('Enter')
 
       // Go into the project that was created from Text to CAD
-      await page.getByText(projectName).click()
+      await homePage.openProject(projectName)
 
       await expect(page.getByTestId('app-header-project-name')).toBeVisible()
       await expect(page.getByTestId('app-header-project-name')).toContainText(
@@ -951,7 +951,7 @@ test.describe('Mocked Text-to-CAD API tests', { tag: ['@skipWin'] }, () => {
       await page.keyboard.press('Enter')
 
       // Go into the project that was created from Text to CAD
-      await page.getByText(projectName).click()
+      await homePage.openProject(projectName)
 
       await page.getByRole('button', { name: 'Accept' }).click()
 

flake.nix

@@ -74,7 +74,7 @@
         LIBCLANG_PATH = "${pkgs.libclang.lib}/lib";
         ELECTRON_OVERRIDE_DIST_PATH =
           if pkgs.stdenv.isDarwin
-          then "${pkgs.electron}/Applications"
+          then "${pkgs.electron}/Applications/Electron.app/Contents/MacOS/"
           else "${pkgs.electron}/bin";
         PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS = true;
         PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH = "${pkgs.playwright-driver.browsers}/chromium-1091/chrome-linux/chrome";

package.json

@@ -94,7 +94,6 @@
     "build:wasm:dev": "./scripts/build-wasm-dev.sh",
     "build:wasm:dev:windows": "powershell -ExecutionPolicy Bypass -File ./scripts/build-wasm-dev.ps1",
     "pretest": "npm run remove-importmeta",
-    "test:rust": "(cd rust && just test && just lint)",
     "simpleserver": "npm run pretest && http-server ./public --cors -p 3000",
     "simpleserver:ci": "npm run pretest && http-server ./public --cors -p 3000 &",
     "simpleserver:bg": "npm run pretest && http-server ./public --cors -p 3000 &",
@@ -107,7 +106,6 @@
     "check": "biome check ./src ./e2e ./packages/codemirror-lsp-client/src ./rust/kcl-language-server/client/src",
     "fetch:wasm": "./scripts/get-latest-wasm-bundle.sh",
     "fetch:wasm:windows": "powershell -ExecutionPolicy Bypass -File ./scripts/get-latest-wasm-bundle.ps1",
-    "fetch:samples": "rm -rf public/kcl-samples* && curl -L -o public/kcl-samples.zip https://github.com/KittyCAD/kcl-samples/archive/refs/heads/achalmers/kw-args-xylineto.zip && unzip -o public/kcl-samples.zip -d public && mv public/kcl-samples-* public/kcl-samples",
     "remove-importmeta": "sed -i 's/import.meta.url/window.location.origin/g' \"./rust/kcl-wasm-lib/pkg/kcl_wasm_lib.js\"; sed -i '' 's/import.meta.url/window.location.origin/g' \"./rust/kcl-wasm-lib/pkg/kcl_wasm_lib.js\" || echo \"sed for both mac and linux\"",
     "lint-fix": "eslint --fix --ext .ts --ext .tsx src e2e packages/codemirror-lsp-client/src rust/kcl-language-server/client/src",
     "lint": "eslint --max-warnings 0 --ext .ts --ext .tsx src e2e packages/codemirror-lsp-client/src rust/kcl-language-server/client/src",
@@ -123,7 +121,6 @@
     "files:invalidate-bucket:nightly": "./scripts/invalidate-files-bucket.sh --nightly",
     "postinstall": "electron-rebuild",
     "generate:machine-api": "npx openapi-typescript ./openapi/machine-api.json -o src/lib/machine-api.d.ts",
-    "generate:samples-manifest": "cd public/kcl-samples && node generate-manifest.js",
     "tron:start": "electron-forge start",
     "chrome:test": "PLATFORM=web NODE_ENV=development playwright test --config=playwright.config.ts --project='Google Chrome' --grep-invert=@snapshot",
     "tronb:vite:dev": "vite build -c vite.main.config.ts -m development && vite build -c vite.preload.config.ts -m development && vite build -c vite.renderer.config.ts -m development",
@@ -132,15 +129,14 @@
     "tronb:package:prod": "npm run tronb:vite:prod && electron-builder --config electron-builder.yml --publish always",
     "test-setup": "npm install && npm run build:wasm",
     "test": "vitest --mode development",
+    "test:rust": "(cd rust && just test && just lint)",
     "test:snapshots": "PLATFORM=web NODE_ENV=development playwright test --config=playwright.config.ts --grep=@snapshot --trace=on --shard=1/1",
-    "test:unit": "vitest run --mode development --exclude **/kclSamples.test.ts --exclude **/jest-component-unit-tests/*",
+    "test:unit": "vitest run --mode development --exclude **/jest-component-unit-tests/*",
     "test:unit:components": "jest -c jest-component-unit-tests/jest.config.ts --rootDir jest-component-unit-tests/",
-    "test:unit:kcl-samples": "vitest run --mode development ./src/lang/kclSamples.test.ts",
     "test:playwright:electron": "playwright test --config=playwright.electron.config.ts --grep-invert=@snapshot",
     "test:playwright:electron:local": "npm run tronb:vite:dev && playwright test --config=playwright.electron.config.ts --grep-invert=@snapshot --grep-invert=\"$(curl --silent https://test-analysis-bot.hawk-dinosaur.ts.net/projects/KittyCAD/modeling-app/tests/disabled/regex)\"",
     "test:playwright:electron:local-engine": "npm run tronb:vite:dev && playwright test --config=playwright.electron.config.ts --grep-invert='@snapshot|@skipLocalEngine' --grep-invert=\"$(curl --silent https://test-analysis-bot.hawk-dinosaur.ts.net/projects/KittyCAD/modeling-app/tests/disabled/regex)\"",
-    "test:unit:local": "npm run simpleserver:bg && npm run test:unit; kill-port 3000",
-    "test:unit:kcl-samples:local": "npm run simpleserver:bg && npm run test:unit:kcl-samples; kill-port 3000"
+    "test:unit:local": "npm run simpleserver:bg && npm run test:unit; kill-port 3000"
   },
   "browserslist": {
     "production": [

public/kcl-samples/README.md

@@ -31,14 +31,24 @@ When you submit a PR to add or modify KCL samples, images will be generated and
 [![ball-bearing](screenshots/ball-bearing.png)](ball-bearing/main.kcl)
 #### [bench](bench/main.kcl) ([screenshot](screenshots/bench.png))
 [![bench](screenshots/bench.png)](bench/main.kcl)
+#### [bone-plate](bone-plate/main.kcl) ([screenshot](screenshots/bone-plate.png))
+[![bone-plate](screenshots/bone-plate.png)](bone-plate/main.kcl)
 #### [bottle](bottle/main.kcl) ([screenshot](screenshots/bottle.png))
 [![bottle](screenshots/bottle.png)](bottle/main.kcl)
 #### [bracket](bracket/main.kcl) ([screenshot](screenshots/bracket.png))
 [![bracket](screenshots/bracket.png)](bracket/main.kcl)
 #### [car-wheel-assembly](car-wheel-assembly/main.kcl) ([screenshot](screenshots/car-wheel-assembly.png))
 [![car-wheel-assembly](screenshots/car-wheel-assembly.png)](car-wheel-assembly/main.kcl)
+#### [cold-plate](cold-plate/main.kcl) ([screenshot](screenshots/cold-plate.png))
+[![cold-plate](screenshots/cold-plate.png)](cold-plate/main.kcl)
 #### [color-cube](color-cube/main.kcl) ([screenshot](screenshots/color-cube.png))
 [![color-cube](screenshots/color-cube.png)](color-cube/main.kcl)
+#### [counterdrilled-weldment](counterdrilled-weldment/main.kcl) ([screenshot](screenshots/counterdrilled-weldment.png))
+[![counterdrilled-weldment](screenshots/counterdrilled-weldment.png)](counterdrilled-weldment/main.kcl)
+#### [countersunk-plate](countersunk-plate/main.kcl) ([screenshot](screenshots/countersunk-plate.png))
+[![countersunk-plate](screenshots/countersunk-plate.png)](countersunk-plate/main.kcl)
+#### [cpu-cooler](cpu-cooler/main.kcl) ([screenshot](screenshots/cpu-cooler.png))
+[![cpu-cooler](screenshots/cpu-cooler.png)](cpu-cooler/main.kcl)
 #### [cycloidal-gear](cycloidal-gear/main.kcl) ([screenshot](screenshots/cycloidal-gear.png))
 [![cycloidal-gear](screenshots/cycloidal-gear.png)](cycloidal-gear/main.kcl)
 #### [dodecahedron](dodecahedron/main.kcl) ([screenshot](screenshots/dodecahedron.png))
@@ -55,8 +65,6 @@ When you submit a PR to add or modify KCL samples, images will be generated and
 [![food-service-spatula](screenshots/food-service-spatula.png)](food-service-spatula/main.kcl)
 #### [french-press](french-press/main.kcl) ([screenshot](screenshots/french-press.png))
 [![french-press](screenshots/french-press.png)](french-press/main.kcl)
-#### [gear](gear/main.kcl) ([screenshot](screenshots/gear.png))
-[![gear](screenshots/gear.png)](gear/main.kcl)
 #### [gear-rack](gear-rack/main.kcl) ([screenshot](screenshots/gear-rack.png))
 [![gear-rack](screenshots/gear-rack.png)](gear-rack/main.kcl)
 #### [gridfinity-baseplate](gridfinity-baseplate/main.kcl) ([screenshot](screenshots/gridfinity-baseplate.png))
@@ -67,6 +75,18 @@ When you submit a PR to add or modify KCL samples, images will be generated and
 [![gridfinity-bins](screenshots/gridfinity-bins.png)](gridfinity-bins/main.kcl)
 #### [gridfinity-bins-stacking-lip](gridfinity-bins-stacking-lip/main.kcl) ([screenshot](screenshots/gridfinity-bins-stacking-lip.png))
 [![gridfinity-bins-stacking-lip](screenshots/gridfinity-bins-stacking-lip.png)](gridfinity-bins-stacking-lip/main.kcl)
+#### [hammer](hammer/main.kcl) ([screenshot](screenshots/hammer.png))
+[![hammer](screenshots/hammer.png)](hammer/main.kcl)
+#### [helical-gear](helical-gear/main.kcl) ([screenshot](screenshots/helical-gear.png))
+[![helical-gear](screenshots/helical-gear.png)](helical-gear/main.kcl)
+#### [helical-planetary-gearset](helical-planetary-gearset/main.kcl) ([screenshot](screenshots/helical-planetary-gearset.png))
+[![helical-planetary-gearset](screenshots/helical-planetary-gearset.png)](helical-planetary-gearset/main.kcl)
+#### [helium-tank](helium-tank/main.kcl) ([screenshot](screenshots/helium-tank.png))
+[![helium-tank](screenshots/helium-tank.png)](helium-tank/main.kcl)
+#### [herringbone-gear](herringbone-gear/main.kcl) ([screenshot](screenshots/herringbone-gear.png))
+[![herringbone-gear](screenshots/herringbone-gear.png)](herringbone-gear/main.kcl)
+#### [herringbone-planetary-gearset](herringbone-planetary-gearset/main.kcl) ([screenshot](screenshots/herringbone-planetary-gearset.png))
+[![herringbone-planetary-gearset](screenshots/herringbone-planetary-gearset.png)](herringbone-planetary-gearset/main.kcl)
 #### [hex-nut](hex-nut/main.kcl) ([screenshot](screenshots/hex-nut.png))
 [![hex-nut](screenshots/hex-nut.png)](hex-nut/main.kcl)
 #### [i-beam](i-beam/main.kcl) ([screenshot](screenshots/i-beam.png))
@@ -83,8 +103,8 @@ When you submit a PR to add or modify KCL samples, images will be generated and
 [![mounting-plate](screenshots/mounting-plate.png)](mounting-plate/main.kcl)
 #### [multi-axis-robot](multi-axis-robot/main.kcl) ([screenshot](screenshots/multi-axis-robot.png))
 [![multi-axis-robot](screenshots/multi-axis-robot.png)](multi-axis-robot/main.kcl)
-#### [parametric-bearing-pillow-block](parametric-bearing-pillow-block/main.kcl) ([screenshot](screenshots/parametric-bearing-pillow-block.png))
-[![parametric-bearing-pillow-block](screenshots/parametric-bearing-pillow-block.png)](parametric-bearing-pillow-block/main.kcl)
+#### [pillow-block-bearing](pillow-block-bearing/main.kcl) ([screenshot](screenshots/pillow-block-bearing.png))
+[![pillow-block-bearing](screenshots/pillow-block-bearing.png)](pillow-block-bearing/main.kcl)
 #### [pipe](pipe/main.kcl) ([screenshot](screenshots/pipe.png))
 [![pipe](screenshots/pipe.png)](pipe/main.kcl)
 #### [pipe-flange-assembly](pipe-flange-assembly/main.kcl) ([screenshot](screenshots/pipe-flange-assembly.png))
@@ -93,6 +113,8 @@ When you submit a PR to add or modify KCL samples, images will be generated and
 [![pipe-with-bend](screenshots/pipe-with-bend.png)](pipe-with-bend/main.kcl)
 #### [poopy-shoe](poopy-shoe/main.kcl) ([screenshot](screenshots/poopy-shoe.png))
 [![poopy-shoe](screenshots/poopy-shoe.png)](poopy-shoe/main.kcl)
+#### [prosthetic-hip](prosthetic-hip/main.kcl) ([screenshot](screenshots/prosthetic-hip.png))
+[![prosthetic-hip](screenshots/prosthetic-hip.png)](prosthetic-hip/main.kcl)
 #### [router-template-cross-bar](router-template-cross-bar/main.kcl) ([screenshot](screenshots/router-template-cross-bar.png))
 [![router-template-cross-bar](screenshots/router-template-cross-bar.png)](router-template-cross-bar/main.kcl)
 #### [router-template-slate](router-template-slate/main.kcl) ([screenshot](screenshots/router-template-slate.png))
@@ -101,10 +123,20 @@ When you submit a PR to add or modify KCL samples, images will be generated and
 [![sheet-metal-bracket](screenshots/sheet-metal-bracket.png)](sheet-metal-bracket/main.kcl)
 #### [socket-head-cap-screw](socket-head-cap-screw/main.kcl) ([screenshot](screenshots/socket-head-cap-screw.png))
 [![socket-head-cap-screw](screenshots/socket-head-cap-screw.png)](socket-head-cap-screw/main.kcl)
+#### [spur-gear](spur-gear/main.kcl) ([screenshot](screenshots/spur-gear.png))
+[![spur-gear](screenshots/spur-gear.png)](spur-gear/main.kcl)
+#### [spur-reduction-gearset](spur-reduction-gearset/main.kcl) ([screenshot](screenshots/spur-reduction-gearset.png))
+[![spur-reduction-gearset](screenshots/spur-reduction-gearset.png)](spur-reduction-gearset/main.kcl)
+#### [surgical-drill-guide](surgical-drill-guide/main.kcl) ([screenshot](screenshots/surgical-drill-guide.png))
+[![surgical-drill-guide](screenshots/surgical-drill-guide.png)](surgical-drill-guide/main.kcl)
+#### [tooling-nest-block](tooling-nest-block/main.kcl) ([screenshot](screenshots/tooling-nest-block.png))
+[![tooling-nest-block](screenshots/tooling-nest-block.png)](tooling-nest-block/main.kcl)
 #### [utility-sink](utility-sink/main.kcl) ([screenshot](screenshots/utility-sink.png))
 [![utility-sink](screenshots/utility-sink.png)](utility-sink/main.kcl)
 #### [walkie-talkie](walkie-talkie/main.kcl) ([screenshot](screenshots/walkie-talkie.png))
 [![walkie-talkie](screenshots/walkie-talkie.png)](walkie-talkie/main.kcl)
 #### [washer](washer/main.kcl) ([screenshot](screenshots/washer.png))
 [![washer](screenshots/washer.png)](washer/main.kcl)
+#### [wing-spar](wing-spar/main.kcl) ([screenshot](screenshots/wing-spar.png))
+[![wing-spar](screenshots/wing-spar.png)](wing-spar/main.kcl)
 

public/kcl-samples/bench/bench-parts.kcl

@@ -57,9 +57,9 @@ fn connectorSketch(@plane, start) {
 
 export fn connector(@plane, length) {
   connectorSketch(plane, start = [-12, 8])
-    |> extrude(length = length)
+    |> extrude(length)
   connectorSketch(plane, start = [16, 8])
-    |> extrude(length = length)
+    |> extrude(length)
   return 0
 }
 
@@ -79,7 +79,7 @@ fn seatSlatSketch(@plane) {
 
 export fn seatSlats(@plane, length) {
   seatSlatSketch(plane)
-    |> extrude(length = length)
+    |> extrude(length)
   return 0
 }
 
@@ -99,7 +99,7 @@ fn backSlatsSketch(@plane) {
 
 export fn backSlats(@plane, length) {
   b = backSlatsSketch(plane)
-    |> extrude(length = length)
+    |> extrude(length)
   return b
 }
 

public/kcl-samples/bone-plate/main.kcl

@@ -0,0 +1,55 @@
+// Bone Plate
+// A bone plate is a medical device used in orthopedics to stabilize and fix bone fractures during the healing process. They are typically made of stainless steel or titanium and are secured to the bone with screws. Bone plates come in various types, including locking, compression, and bridge plates, each with specific applications
+
+// Set units
+@settings(defaultLengthUnit = mm)
+
+// Define parameters
+boltSize = 4.5
+
+// Revolve the profile of a compression plate designed to fit a bone
+plateRevolve = startSketchOn(YZ)
+  |> startProfile(at = [22.9, 0])
+  |> arc(angleStart = 180, angleEnd = 176, radius = 120)
+  |> arc(angleStart = -60, angleEnd = 54, radius = 5)
+  |> arc(angleStart = 180, angleEnd = 176, radius = 120)
+  |> arc(angleStart = -60, angleEnd = 54, radius = 5)
+  |> arc(angleStart = 180, angleEnd = 176, radius = 120)
+  |> arc(angleStart = -60, angleEnd = 54, radius = 5)
+  |> arc(angleStart = 180, angleEnd = 174, radius = 170)
+  |> tangentialArc(endAbsolute = [41.8, 91.88])
+  |> tangentialArc(endAbsolute = [56.92, 117.08], tag = $seg01)
+  |> angledLine(angle = tangentToEnd(seg01), length = 23.16)
+  |> tangentialArc(endAbsolute = [60.93, 140.44], tag = $seg02)
+  |> angledLine(angle = tangentToEnd(seg02), length = 25.65)
+  |> tangentialArc(endAbsolute = [48.35, 85.53])
+  |> tangentialArc(endAbsolute = [35.2, 67.73], tag = $seg03)
+  |> angledLine(angle = tangentToEnd(seg03), length = 49.06)
+  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+  |> close()
+  |> revolve(axis = Y, angle = 65, symmetric = true)
+
+// Create a hole sketch with the size and location of each bolt hole
+holeSketch = startSketchOn(XZ)
+hole01 = circle(holeSketch, center = [0, 12.25], radius = boltSize / 2)
+  |> extrude(length = -100)
+hole02 = circle(holeSketch, center = [0, 29.5], radius = boltSize / 2)
+  |> extrude(length = -100)
+hole03 = circle(holeSketch, center = [0, 46.25], radius = boltSize / 2)
+  |> extrude(length = -100)
+hole04 = circle(holeSketch, center = [0, 77], radius = boltSize / 2)
+  |> extrude(length = -100)
+hole05 = circle(holeSketch, center = [0, 100], radius = boltSize / 2)
+  |> extrude(length = -100)
+hole06 = circle(holeSketch, center = [0, 130], radius = boltSize / 2)
+  |> extrude(length = -100)
+hole07 = circle(holeSketch, center = [-20, 130], radius = boltSize / 2)
+  |> extrude(length = -100)
+hole08 = circle(holeSketch, center = [20, 130], radius = boltSize / 2)
+  |> extrude(length = -100)
+
+// Cut each guiding clearance hole from the bone plate
+solid001 = subtract([plateRevolve], tools = union([hole01, hole02]))
+solid002 = subtract([solid001], tools = union([hole03, hole04]))
+solid003 = subtract([solid002], tools = union([hole05, hole06]))
+solid004 = subtract([solid003], tools = union([hole07, hole08]))

public/kcl-samples/cold-plate/main.kcl

@@ -0,0 +1,67 @@
+// Cold Plate
+// A cold plate is a thermal management device used to remove heat from a device or component, typically by transferring heat to a liquid coolant that flows through the plate. It's a conductive cooling solution, commonly made of materials like aluminum or copper, with internal channels or tubes for the coolant
+
+// Set units
+@settings(defaultLengthUnit = in)
+
+// Define parameters
+tubeDiameter = 5 / 8
+wallThickness = 0.080
+bendRadius = 1
+
+// Create the cold plate with indentions to secure each pass of the brazed copper tube
+coldPlate = startSketchOn(YZ)
+  |> startProfile(at = [0, tubeDiameter * 2])
+  |> xLine(length = bendRadius - (tubeDiameter / 2))
+  |> yLine(length = -tubeDiameter)
+  |> tangentialArc(angle = 180, radius = tubeDiameter / 2)
+  |> yLine(length = tubeDiameter)
+  |> xLine(length = bendRadius * 2 - tubeDiameter, tag = $seg07)
+  |> yLine(length = -tubeDiameter, tag = $seg09)
+  |> tangentialArc(angle = 180, radius = tubeDiameter / 2)
+  |> yLine(length = tubeDiameter, tag = $seg08)
+  |> xLine(length = bendRadius - (tubeDiameter / 2))
+  |> angledLine(angle = -77, length = tubeDiameter / 3)
+  |> tangentialArc(angle = 77, radius = tubeDiameter, tag = $seg01)
+  |> angledLine(angle = tangentToEnd(seg01), length = 1)
+  |> yLine(endAbsolute = 0)
+  |> xLine(endAbsolute = 0)
+  |> mirror2d(axis = Y)
+  |> close()
+  |> extrude(length = 10, symmetric = true)
+
+// Sketch the path for the copper tube to follow
+copperTubePath = startSketchOn(offsetPlane(XY, offset = tubeDiameter))
+  |> startProfile(at = [-7.35, -bendRadius * 3])
+  |> xLine(length = 14.13, tag = $seg05)
+  |> tangentialArc(angle = 180, radius = bendRadius, tag = $seg02)
+  |> angledLine(angle = tangentToEnd(seg02), length = 13.02, tag = $seg06)
+  |> tangentialArc(angle = -180, radius = bendRadius, tag = $seg03)
+  |> angledLine(angle = tangentToEnd(seg03), length = segLen(seg06))
+  |> tangentialArc(angle = 180, radius = bendRadius, tag = $seg04)
+  |> angledLine(angle = tangentToEnd(seg04), length = segLen(seg05))
+
+// Create the profile for the inner and outer diameter of the hollow copper tube
+tubeWall = startSketchOn(offsetPlane(YZ, offset = -7.35))
+  |> circle(center = [-bendRadius * 3, tubeDiameter], radius = tubeDiameter / 2)
+  |> subtract2d(%, tool = circle(center = [-bendRadius * 3, tubeDiameter], radius = tubeDiameter / 2 - wallThickness))
+  |> sweep(path = copperTubePath)
+  |> appearance(color = "#b81b0a")
+
+// Model a brazed cap to cover each tube. Constrain the caps using the walls of the plate
+brazedCap = startSketchOn(YZ)
+  |> startProfile(at = segEnd(seg07))
+  |> arc(interiorAbsolute = [bendRadius * 3, tubeDiameter * 1.85], endAbsolute = segEnd(seg08))
+  |> yLine(endAbsolute = segStartY(seg08))
+  |> arc(
+       interiorAbsolute = [
+         bendRadius * 3,
+         segEndY(seg09) + tubeDiameter / 2
+       ],
+       endAbsolute = segEnd(seg09),
+     )
+  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+  |> close()
+  |> extrude(length = 10, symmetric = true)
+  |> patternLinear3d(instances = 4, distance = bendRadius * 2, axis = [0, -1, 0])
+  |> appearance(color = "#6b261e")

public/kcl-samples/counterdrilled-weldment/main.kcl

@@ -0,0 +1,120 @@
+// Counterdrilled Weldment
+// A metal weldment consisting of a counterdrilled plate, a centrally mounted housing tube, and four structural support fins.
+
+// Set units
+@settings(defaultLengthUnit = in)
+
+// Define parameters
+boltSpacingX = 5
+boltSpacingY = 3
+boltDiameter = 1 / 4
+counterdrillDiameter = 7 / 16
+counterdrillDepth = 3 / 16
+tubeInnerDiameter = 1 + 1 / 4
+tubeThickness = 0.115
+tubeHeight = 2
+stockThickness = .5
+
+// Calculate the dimensions of the block using the specified bolt spacing. The size of the block can be defined by adding a multiple of the counterdrill diameter to the bolt spacing
+blockLength = boltSpacingX + boltDiameter * 6
+blockWidth = boltSpacingY + boltDiameter * 6
+
+// Draw the base plate
+plateSketch = startSketchOn(XY)
+  |> startProfile(at = [-blockLength / 2, -blockWidth / 2])
+  |> angledLine(angle = 0, length = blockLength, tag = $rectangleSegmentA001)
+  |> angledLine(angle = segAng(rectangleSegmentA001) + 90, length = blockWidth, tag = $rectangleSegmentB001)
+  |> angledLine(angle = segAng(rectangleSegmentA001), length = -segLen(rectangleSegmentA001), tag = $rectangleSegmentC001)
+  |> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $rectangleSegmentD001)
+  |> close()
+  |> subtract2d(tool = circle(center = [0, 0], radius = tubeInnerDiameter / 2))
+plateBody = extrude(plateSketch, length = stockThickness)
+  |> chamfer(
+       length = boltDiameter * 2,
+       tags = [
+         getNextAdjacentEdge(rectangleSegmentB001),
+         getNextAdjacentEdge(rectangleSegmentA001),
+         getNextAdjacentEdge(rectangleSegmentC001),
+         getNextAdjacentEdge(rectangleSegmentD001)
+       ],
+     )
+
+// Define hole positions
+holePositions = [
+  [-boltSpacingX / 2, -boltSpacingY / 2],
+  [-boltSpacingX / 2, boltSpacingY / 2],
+  [boltSpacingX / 2, -boltSpacingY / 2],
+  [boltSpacingX / 2, boltSpacingY / 2]
+]
+
+// Function to create a counterdrilled hole
+fn counterdrill(@holePosition) {
+  cbdrill = startSketchOn(plateBody, face = END)
+    |> circle(center = holePosition, radius = counterdrillDiameter / 2)
+    |> extrude(length = -counterdrillDepth)
+  cbBolt = startSketchOn(cbdrill, face = START)
+    |> circle(center = holePosition, radius = boltDiameter / 2, tag = $hole01)
+    |> extrude(length = -stockThickness + counterdrillDepth)
+    // Use a chamfer to create a 90-degree counterdrill edge
+    |> chamfer(length = (counterdrillDiameter - boltDiameter) / 2 * sqrt(2), tags = [hole01])
+  return {  }
+}
+
+// Place a counterdrilled hole at each bolt hole position
+map(holePositions, f = counterdrill)
+
+// Drill a small pin hole in the side of the tube
+pinhole = startSketchOn(YZ)
+  |> circle(center = [0, 2.2], radius = 0.125)
+  |> extrude(length = -10)
+
+// Model the central tube and subtract the pin hole
+centralTube = startSketchOn(offsetPlane(XY, offset = stockThickness))
+  |> circle(center = [0, 0], radius = tubeInnerDiameter / 2 + tubeThickness)
+  |> subtract2d(tool = circle(center = [0, 0], radius = tubeInnerDiameter / 2))
+  |> extrude(length = tubeHeight)
+  |> subtract(tools = [pinhole])
+
+// Create a function to create a fin which spans from the central tube to the bolt hole
+fn fin(@i) {
+  diagPlane = {
+    origin = [0.0, 0.0, 0.0],
+    xAxis = [
+      boltSpacingX / 2 * i,
+      boltSpacingY / 2,
+      0.0
+    ],
+    yAxis = [0.0, 0.0, 1.0]
+  }
+
+  finSketch = startSketchOn(diagPlane)
+    |> startProfile(at = [
+         tubeInnerDiameter / 2 + tubeThickness,
+         stockThickness
+       ])
+    |> xLine(endAbsolute = sqrt((boltSpacingX / 2) ^ 2 + (boltSpacingY / 2) ^ 2) - counterdrillDiameter)
+    |> yLine(length = 0.15)
+    |> line(endAbsolute = [
+         profileStartX(%) + 0.15,
+         stockThickness + tubeHeight * .8
+       ])
+    |> xLine(length = -0.15)
+    |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+    |> close()
+    |> extrude(length = tubeThickness, symmetric = true)
+
+  // Use a circular pattern to create an identical fin on the opposite side
+  otherFin = patternCircular3d(
+    finSketch,
+    instances = 2,
+    axis = [0, 0, 1],
+    center = [0, 0, 0],
+    arcDegrees = 360,
+    rotateDuplicates = true,
+  )
+  return {  }
+}
+
+// Place a pair of support fins along each diagonal axis of the bolt pattern
+fin(1)
+fin(-1)

public/kcl-samples/countersunk-plate/main.kcl

@@ -0,0 +1,50 @@
+// Plate with countersunk holes
+// A small mounting plate with a countersunk hole at each end
+
+// Set units
+@settings(defaultLengthUnit = in)
+
+// Define parameters
+boltSpacing = 5
+boltDiameter = 1 / 4
+centerHoleDiameter = 1 + 3 / 4
+plateThickness = 0.375
+
+// Check that the plate is thick enough to countersink a hole
+// assertGreaterThan(plateThickness, boltDiameter, "This plate is not thick enough for the necessary countersink dimensions")
+
+// A bit of math to calculate the tangent line between the two diameters
+r1 = centerHoleDiameter / 2 * 1.5 + .35
+r2 = boltDiameter * 2 + .25
+d = boltSpacing / 2
+tangentAngle = asin((r1 - r2) / d)
+tangentLength = (r1 - r2) / tan(tangentAngle)
+
+plateBody = startSketchOn(XY)
+  // Use polar coordinates to start the sketch at the tangent point of the larger radius
+  |> startProfile(at = polar(angle = 90 - tangentAngle, length = r1))
+  |> angledLine(angle = -tangentAngle, length = tangentLength)
+  |> tangentialArc(radius = r2, angle = (tangentAngle - 90) * 2)
+  |> angledLine(angle = tangentAngle, length = -tangentLength)
+  |> tangentialArc(radius = r1, angle = -tangentAngle * 2)
+  |> angledLine(angle = -tangentAngle, length = -tangentLength)
+  |> tangentialArc(radius = r2, angle = (tangentAngle - 90) * 2)
+  |> angledLine(angle = tangentAngle, length = tangentLength)
+  |> tangentialArc(endAbsolute = [profileStartX(%), profileStartY(%)])
+  |> close()
+  |> subtract2d(tool = circle(center = [0, 0], radius = centerHoleDiameter / 2 * 1.5))
+  |> extrude(%, length = plateThickness)
+
+// Function to create a countersunk hole
+fn countersink(@holePosition) {
+  startSketchOn(plateBody, face = END)
+    |> circle(center = [holePosition, 0], radius = boltDiameter / 2, tag = $hole01)
+    |> extrude(length = -plateThickness)
+    // Use a chamfer to create a 90-degree countersink
+    |> chamfer(length = boltDiameter, tags = [hole01])
+  return {  }
+}
+
+// Place a countersunk hole at each bolt hole position
+countersink(-boltSpacing / 2)
+countersink(boltSpacing / 2)