Remove flaky file test that is redundant with others

.github/workflows/build-wasm.yml

@@ -1,56 +0,0 @@
-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,54 +190,6 @@ 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/kcl-language-server.yml

@@ -21,11 +21,14 @@ 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
@@ -35,9 +38,10 @@ 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: kcl-language-server (vscode tests)
+    name: vscode tests
     strategy:
       fail-fast: false
       matrix:
@@ -73,20 +77,22 @@ jobs:
         include:
           - os: windows-latest
             target: x86_64-pc-windows-msvc
-            code-target: win32-x64
-            #- os: windows-latest
-            #target: i686-pc-windows-msvc
-            #code-target:
-            #win32-ia32
-            #- os: windows-latest
-            #target: aarch64-pc-windows-msvc
-            #code-target: win32-arm64
+            code-target:
+              win32-x64
+              #- os: windows-latest
+              #target: i686-pc-windows-msvc
+              #code-target:
+              #win32-ia32
+              #- os: windows-latest
+              #target: aarch64-pc-windows-msvc
+              #code-target: win32-arm64
           - os: ubuntu-latest
             target: x86_64-unknown-linux-gnu
-            code-target: linux-x64
-            #- os: ubuntu-latest
-            #target: aarch64-unknown-linux-musl
-            #code-target: linux-arm64
+            code-target:
+              linux-x64
+              #- os: ubuntu-latest
+              #target: aarch64-unknown-linux-musl
+              #code-target: linux-arm64
           - os: ubuntu-latest
             target: aarch64-unknown-linux-gnu
             code-target: linux-arm64
@@ -99,33 +105,41 @@ jobs:
           - os: macos-latest
             target: aarch64-apple-darwin
             code-target: darwin-arm64
-    name: kcl-language-server build-release (${{ matrix.target }})
+
+    name: 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
@@ -150,53 +164,64 @@ 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: kcl-language-server build-release (x86_64-unknown-linux-musl)
+    name: build-release (x86_64-unknown-linux-musl)
     runs-on: ubuntu-latest
     env:
       RA_TARGET: x86_64-unknown-linux-musl
@@ -206,6 +231,7 @@ jobs:
       image: alpine:latest
       volumes:
         - /usr/local/cargo/registry:/usr/local/cargo/registry
+
     steps:
       - name: Install dependencies
         run: |
@@ -219,46 +245,55 @@ 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: kcl-language-server (publish)
+    name: publish
     runs-on: ubuntu-latest
     needs: ["build-release", "build-release-x86_64-unknown-linux-musl"]
     if: startsWith(github.event.ref, 'refs/tags')
@@ -266,17 +301,22 @@ 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
@@ -304,29 +344,33 @@ jobs:
       - uses: actions/download-artifact@v4
         with:
           name: release-x86_64-pc-windows-msvc
-          path: rust/build
-          #- uses: actions/download-artifact@v4
-          #with:
-          #name: release-i686-pc-windows-msvc
-          #path:
-          #build
-          #- uses: actions/download-artifact@v4
-          #with:
-          #name: release-aarch64-pc-windows-msvc
-          #path: rust/build
+          path:
+            rust/build
+            #- uses: actions/download-artifact@v4
+            #with:
+            #name: release-i686-pc-windows-msvc
+            #path:
+            #build
+            #- uses: actions/download-artifact@v4
+            #with:
+            #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:
@@ -341,12 +385,15 @@ 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,6 +4,7 @@
 #    maturin generate-ci github
 #
 name: kcl-python-bindings
+
 on:
   push:
     branches:
@@ -26,14 +27,16 @@ 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
@@ -55,8 +58,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:
@@ -81,8 +84,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:
@@ -107,8 +110,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
@@ -124,8 +127,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
@@ -133,10 +136,10 @@ jobs:
         uses: astral-sh/setup-uv@v5
       - name: Install codespell
         run: |
-          uv venv .venv
-          echo "VIRTUAL_ENV=.venv" >> $GITHUB_ENV
-          echo "$PWD/.venv/bin" >> $GITHUB_PATH
-          uv pip install pip --upgrade
+            uv venv .venv
+            echo "VIRTUAL_ENV=.venv" >> $GITHUB_ENV
+            echo "$PWD/.venv/bin" >> $GITHUB_PATH
+            uv pip install pip --upgrade
       - name: Build sdist
         uses: PyO3/maturin-action@v1
         with:
@@ -148,6 +151,7 @@ jobs:
         with:
           name: wheels-sdist
           path: rust/kcl-python-bindings/dist
+
   release:
     name: Release
     runs-on: ubuntu-latest
@@ -164,11 +168,11 @@ jobs:
         uses: astral-sh/setup-uv@v5
       - name: do uv things
         run: |
-          cd rust/kcl-python-bindings
-          uv venv .venv
-          echo "VIRTUAL_ENV=.venv" >> $GITHUB_ENV
-          echo "$PWD/.venv/bin" >> $GITHUB_PATH
-          uv pip install pip --upgrade
+            cd rust/kcl-python-bindings
+            uv venv .venv
+            echo "VIRTUAL_ENV=.venv" >> $GITHUB_ENV
+            echo "$PWD/.venv/bin" >> $GITHUB_PATH
+            uv pip install pip --upgrade
       - name: Publish to PyPI
         uses: PyO3/maturin-action@v1
         env:

.github/workflows/static-analysis.yml

@@ -28,7 +28,53 @@ jobs:
       - run: npm run fmt:check
 
   npm-build-wasm:
-    uses: ./.github/workflows/build-wasm.yml
+    # 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/*
 
   npm-tsc:
     runs-on: ubuntu-latest
@@ -127,3 +173,122 @@ 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: 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: Regenerate KCL samples manifest
+        run: cd rust/kcl-lib && EXPECTORATE=overwrite cargo test generate_manifest
+
+      - name: Check public and internal 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/unit-tests.yml

@@ -1,124 +0,0 @@
-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,8 +58,6 @@ 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/

Makefile

@@ -114,6 +114,7 @@ test-unit: install ## Run the unit tests
 	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
+	npm run test:unit:kcl-samples
 
 .PHONY: test-e2e
 test-e2e: test-e2e-$(TARGET)

README.md

@@ -42,6 +42,8 @@ The 3D view in Design Studio is just a video stream from our hosted geometry eng
 
 We recommend downloading the latest application binary from our [releases](https://github.com/KittyCAD/modeling-app/releases) page. If you don't see your platform or architecture supported there, please file an issue.
 
+If you'd like to try out upcoming changes sooner, you can also download those from our [nightly releases](https://zoo.dev/modeling-app/download/nightly) page.
+
 ## Developing
 
 Finally, if you'd like to run a development build or contribute to the project, please visit our [contributor guide](CONTRIBUTING.md) to get started.

_typos.toml

@@ -21,7 +21,7 @@ extend-exclude = [
 ]
 
 [default.extend-words]
-metalness = "metalness" # appearance API
+metalness = "metalness" # appearance API 
 Hom = "Hom" # short for homogenous
 typ = "typ" # used to declare a variable named 'type' which is a reserved keyword in Rust
 ue = "ue" # short for UnaryExpression
@@ -29,7 +29,6 @@ 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/modules.md

@@ -177,7 +177,7 @@ You can also import the whole module. This is useful if you want to use the
 result of a module as a variable, like a part.
 
 ```norun
-import "cube.kcl"
+import "tests/inputs/cube.kcl" as cube
 cube
   |> translate(x=10)
 ```
@@ -241,7 +241,7 @@ If you want to have multiple instances of the same object, you can use the
 [`clone`](/docs/kcl/clone) function. This will render a new instance of the object in memory.
 
 ```norun
-import cube from "cube.kcl"
+import cube from "tests/inputs/cube.kcl"
 
 cube  
   |> translate(x=10)
@@ -257,7 +257,7 @@ separate objects in memory, and can be manipulated independently.
 Here is an example with a file from another CAD system:
 
 ```kcl
-import "tests/inputs/cube.step"
+import "tests/inputs/cube.step" as cube
 
 cube
   |> translate(x=10)

docs/kcl-std/functions/std-array-reduce.md

@@ -12,7 +12,7 @@ reduce(
   @array: [any],
   initial: any,
   f: fn(any, accum: any): any,
-): any
+): [any]
 ```
 
 Take a starting value. Then, for each element of an array, calculate the next value,
@@ -28,7 +28,7 @@ using the previous value and the element.
 
 ### Returns
 
-[`any`](/docs/kcl-std/types/std-types-any)
+[`[any]`](/docs/kcl-std/types/std-types-any)
 
 
 ### Examples

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

@@ -11,7 +11,7 @@ Compute the length of the given leg.
 legLen(
   hypotenuse: number(Length),
   leg: number(Length),
-): number(Length)
+): number(deg)
 ```
 
 
@@ -25,7 +25,7 @@ legLen(
 
 ### Returns
 
-[`number(Length)`](/docs/kcl-std/types/std-types-number) - A number.
+[`number(deg)`](/docs/kcl-std/types/std-types-number) - A number.
 
 
 ### Examples

docs/kcl-std/functions/std-sketch-revolve.md

@@ -17,7 +17,7 @@ revolve(
   bidirectionalAngle?: number(Angle),
   tagStart?: tag,
   tagEnd?: tag,
-): [Solid; 1+]
+): Solid
 ```
 
 This, like extrude, is able to create a 3-dimensional solid from a
@@ -46,7 +46,7 @@ revolved around the same axis.
 
 ### Returns
 
-[`[Solid; 1+]`](/docs/kcl-std/types/std-types-Solid)
+[`Solid`](/docs/kcl-std/types/std-types-Solid) - A solid is a collection of extruded surfaces.
 
 
 ### Examples

docs/kcl-std/functions/std-transform-mirror2d.md

@@ -14,6 +14,8 @@ mirror2d(
 ): Sketch
 ```
 
+Only works on unclosed sketches for now.
+
 Mirror occurs around a local sketch axis rather than a global axis.
 
 ### Arguments

docs/kcl-std/patternCircular2d.md

@@ -12,8 +12,8 @@ patternCircular2d(
   @sketchSet: [Sketch],
   instances: number,
   center: Point2d,
-  arcDegrees?: number,
-  rotateDuplicates?: bool,
+  arcDegrees: number,
+  rotateDuplicates: bool,
   useOriginal?: bool,
 ): [Sketch]
 ```
@@ -27,8 +27,8 @@ patternCircular2d(
 | `sketchSet` | [`[Sketch]`](/docs/kcl-std/types/std-types-Sketch) | Which sketch(es) to pattern | Yes |
 | `instances` | [`number`](/docs/kcl-std/types/std-types-number) | The number of total instances. Must be greater than or equal to 1. This includes the original entity. For example, if instances is 2, there will be two copies -- the original, and one new copy. If instances is 1, this has no effect. | Yes |
 | `center` | [`Point2d`](/docs/kcl-std/types/std-types-Point2d) | The center about which to make the pattern. This is a 2D vector. | Yes |
-| `arcDegrees` | [`number`](/docs/kcl-std/types/std-types-number) | The arc angle (in degrees) to place the repetitions. Must be greater than 0. Defaults to 360. | No |
-| `rotateDuplicates` | [`bool`](/docs/kcl-std/types/std-types-bool) | Whether or not to rotate the duplicates as they are copied. Defaults to true. | No |
+| `arcDegrees` | [`number`](/docs/kcl-std/types/std-types-number) | The arc angle (in degrees) to place the repetitions. Must be greater than 0. | Yes |
+| `rotateDuplicates` | [`bool`](/docs/kcl-std/types/std-types-bool) | Whether or not to rotate the duplicates as they are copied. | Yes |
 | `useOriginal` | [`bool`](/docs/kcl-std/types/std-types-bool) | If the target was sketched on an extrusion, setting this will use the original sketch as the target, not the entire joined solid. Defaults to false. | No |
 
 ### Returns

docs/kcl-std/patternCircular3d.md

@@ -13,8 +13,8 @@ patternCircular3d(
   instances: number,
   axis: [number],
   center: Point3d,
-  arcDegrees?: number,
-  rotateDuplicates?: bool,
+  arcDegrees: number,
+  rotateDuplicates: bool,
   useOriginal?: bool,
 ): [Solid]
 ```
@@ -29,8 +29,8 @@ patternCircular3d(
 | `instances` | [`number`](/docs/kcl-std/types/std-types-number) | The number of total instances. Must be greater than or equal to 1. This includes the original entity. For example, if instances is 2, there will be two copies -- the original, and one new copy. If instances is 1, this has no effect. | Yes |
 | `axis` | [`[number]`](/docs/kcl-std/types/std-types-number) | The axis around which to make the pattern. This is a 3D vector | Yes |
 | `center` | [`Point3d`](/docs/kcl-std/types/std-types-Point3d) | The center about which to make the pattern. This is a 3D vector. | Yes |
-| `arcDegrees` | [`number`](/docs/kcl-std/types/std-types-number) | The arc angle (in degrees) to place the repetitions. Must be greater than 0. Defaults to 360. | No |
-| `rotateDuplicates` | [`bool`](/docs/kcl-std/types/std-types-bool) | Whether or not to rotate the duplicates as they are copied. Defaults to true. | No |
+| `arcDegrees` | [`number`](/docs/kcl-std/types/std-types-number) | The arc angle (in degrees) to place the repetitions. Must be greater than 0. | Yes |
+| `rotateDuplicates` | [`bool`](/docs/kcl-std/types/std-types-bool) | Whether or not to rotate the duplicates as they are copied. | Yes |
 | `useOriginal` | [`bool`](/docs/kcl-std/types/std-types-bool) | If the target was sketched on an extrusion, setting this will use the original sketch as the target, not the entire joined solid. Defaults to false. | No |
 
 ### Returns

docs/kcl-std/std.json

@@ -127364,10 +127364,9 @@
         "type": "number",
         "schema": {
           "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
-          "title": "Nullable_double",
+          "title": "double",
           "type": "number",
           "format": "double",
-          "nullable": true,
           "definitions": {
             "Sketch": {
               "type": "object",
@@ -128960,8 +128959,9 @@
             }
           }
         },
-        "required": false,
-        "description": "The arc angle (in degrees) to place the repetitions. Must be greater than 0. Defaults to 360.",
+        "required": true,
+        "includeInSnippet": true,
+        "description": "The arc angle (in degrees) to place the repetitions. Must be greater than 0.",
         "labelRequired": true
       },
       {
@@ -128969,9 +128969,8 @@
         "type": "bool",
         "schema": {
           "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
-          "title": "Nullable_Boolean",
+          "title": "Boolean",
           "type": "boolean",
-          "nullable": true,
           "definitions": {
             "Sketch": {
               "type": "object",
@@ -130564,8 +130563,9 @@
             }
           }
         },
-        "required": false,
-        "description": "Whether or not to rotate the duplicates as they are copied. Defaults to true.",
+        "required": true,
+        "includeInSnippet": true,
+        "description": "Whether or not to rotate the duplicates as they are copied.",
         "labelRequired": true
       },
       {
@@ -140234,10 +140234,9 @@
         "type": "number",
         "schema": {
           "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
-          "title": "Nullable_double",
+          "title": "double",
           "type": "number",
           "format": "double",
-          "nullable": true,
           "definitions": {
             "Solid": {
               "type": "object",
@@ -141830,8 +141829,9 @@
             }
           }
         },
-        "required": false,
-        "description": "The arc angle (in degrees) to place the repetitions. Must be greater than 0. Defaults to 360.",
+        "required": true,
+        "includeInSnippet": true,
+        "description": "The arc angle (in degrees) to place the repetitions. Must be greater than 0.",
         "labelRequired": true
       },
       {
@@ -141839,9 +141839,8 @@
         "type": "bool",
         "schema": {
           "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
-          "title": "Nullable_Boolean",
+          "title": "Boolean",
           "type": "boolean",
-          "nullable": true,
           "definitions": {
             "Solid": {
               "type": "object",
@@ -143434,8 +143433,9 @@
             }
           }
         },
-        "required": false,
-        "description": "Whether or not to rotate the duplicates as they are copied. Defaults to true.",
+        "required": true,
+        "includeInSnippet": true,
+        "description": "Whether or not to rotate the duplicates as they are copied.",
         "labelRequired": true
       },
       {
@@ -156307,11 +156307,7 @@
     "deprecated": false,
     "examples": [
       [
-        "// / Pattern using a named axis.\n\n\nexampleSketch = startSketchOn(XZ)\n  |> circle(center = [0, 0], radius = 1)\n  |> patternLinear2d(axis = X, instances = 7, distance = 4)\n\nexample = extrude(exampleSketch, length = 1)",
-        false
-      ],
-      [
-        "// / Pattern using a raw axis.\n\n\nexampleSketch = startSketchOn(XZ)\n  |> circle(center = [0, 0], radius = 1)\n  |> patternLinear2d(axis = [1, 0], instances = 7, distance = 4)\n\nexample = extrude(exampleSketch, length = 1)",
+        "exampleSketch = startSketchOn(XZ)\n  |> circle(center = [0, 0], radius = 1)\n  |> patternLinear2d(axis = [1, 0], instances = 7, distance = 4)\n\nexample = extrude(exampleSketch, length = 1)",
         false
       ]
     ]
@@ -165967,11 +165963,7 @@
     "deprecated": false,
     "examples": [
       [
-        "// / Pattern using a named axis.\n\n\nexampleSketch = startSketchOn(XZ)\n  |> startProfile(at = [0, 0])\n  |> line(end = [0, 2])\n  |> line(end = [3, 1])\n  |> line(end = [0, -4])\n  |> close()\n\nexample = extrude(exampleSketch, length = 1)\n  |> patternLinear3d(axis = X, instances = 7, distance = 6)",
-        false
-      ],
-      [
-        "// / Pattern using a raw axis.\n\n\nexampleSketch = startSketchOn(XZ)\n  |> startProfile(at = [0, 0])\n  |> line(end = [0, 2])\n  |> line(end = [3, 1])\n  |> line(end = [0, -4])\n  |> close()\n\nexample = extrude(exampleSketch, length = 1)\n  |> patternLinear3d(axis = [1, 0, 1], instances = 7, distance = 6)",
+        "exampleSketch = startSketchOn(XZ)\n  |> startProfile(at = [0, 0])\n  |> line(end = [0, 2])\n  |> line(end = [3, 1])\n  |> line(end = [0, -4])\n  |> close()\n\nexample = extrude(exampleSketch, length = 1)\n  |> patternLinear3d(axis = [1, 0, 1], instances = 7, distance = 6)",
         false
       ],
       [
@@ -256728,7 +256720,7 @@
         false
       ],
       [
-        "// Create a spring by sweeping around a helix path.\n\n// Create a helix around the Z axis.\nhelixPath = helix(\n  angleStart = 0,\n  ccw = true,\n  revolutions = 4,\n  length = 10,\n  radius = 5,\n  axis = Z,\n)\n\n// Create a spring by sweeping around the helix path.\nspringSketch = startSketchOn(XZ)\n  |> circle(center = [5, 0], radius = 1)\n  |> sweep(path = helixPath)",
+        "// Create a spring by sweeping around a helix path.\n\n// Create a helix around the Z axis.\nhelixPath = helix(\n  angleStart = 0,\n  ccw = true,\n  revolutions = 4,\n  length = 10,\n  radius = 5,\n  axis = Z,\n)\n\n// Create a spring by sweeping around the helix path.\nspringSketch = startSketchOn(YZ)\n  |> circle(center = [0, 0], radius = 1)\n  |> sweep(path = helixPath, relativeTo = \"sketchPlane\")",
         false
       ],
       [

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

@@ -36,29 +36,27 @@ test.describe('Command bar tests', () => {
     await u.closeDebugPanel()
 
     // Click the line of code for xLine.
-    await page.getByText(`startProfile(at = [-10, -10])`).click()
-
-    // Wait for the selection to register (TODO: we need a definitive way to wait for this)
-    await page.waitForTimeout(200)
+    await page.getByText(`close()`).click() // TODO remove this and reinstate // await topHorzSegmentClick()
 
     await toolbar.extrudeButton.click()
     await cmdBar.expectState({
       stage: 'arguments',
       commandName: 'Extrude',
-      currentArgKey: 'length',
-      currentArgValue: '5',
+      currentArgKey: 'sketches',
+      currentArgValue: '',
       headerArguments: {
-        Profiles: '1 profile',
+        Sketches: '',
         Length: '',
       },
-      highlightedHeaderArg: 'length',
+      highlightedHeaderArg: 'sketches',
     })
     await cmdBar.progressCmdBar()
+    await cmdBar.progressCmdBar()
     await cmdBar.expectState({
       stage: 'review',
       commandName: 'Extrude',
       headerArguments: {
-        Profiles: '1 profile',
+        Sketches: '1 segment',
         Length: '5',
       },
     })
@@ -288,7 +286,7 @@ test.describe('Command bar tests', () => {
     await cmdBar.cmdOptions.getByText('Extrude').click()
 
     // Assert that we're on the selection step
-    await expect(page.getByRole('button', { name: 'Profiles' })).toBeDisabled()
+    await expect(page.getByRole('button', { name: 'sketches' })).toBeDisabled()
     // Select a face
     await page.mouse.move(700, 200)
     await page.mouse.click(700, 200)
@@ -401,6 +399,7 @@ test.describe('Command bar tests', () => {
         sortBy: 'last-modified-desc',
       })
       await page.goto(page.url() + targetURL)
+      expect(page.url()).toContain(targetURL)
     })
 
     await test.step(`Submit the command`, async () => {
@@ -411,7 +410,7 @@ test.describe('Command bar tests', () => {
         currentArgValue: '',
         headerArguments: {
           Method: '',
-          Name: 'main.kcl',
+          Name: 'test',
           Code: '1 line',
         },
         highlightedHeaderArg: 'method',
@@ -422,7 +421,7 @@ test.describe('Command bar tests', () => {
         commandName: 'Import file from URL',
         headerArguments: {
           Method: 'New project',
-          Name: 'main.kcl',
+          Name: 'test',
           Code: '1 line',
         },
       })
@@ -464,6 +463,7 @@ test.describe('Command bar tests', () => {
         sortBy: 'last-modified-desc',
       })
       await page.goto(page.url() + targetURL)
+      expect(page.url()).toContain(targetURL)
     })
 
     await test.step(`Submit the command`, async () => {
@@ -474,7 +474,7 @@ test.describe('Command bar tests', () => {
         currentArgValue: '',
         headerArguments: {
           Method: '',
-          Name: 'main.kcl',
+          Name: 'test',
           Code: '1 line',
         },
         highlightedHeaderArg: 'method',
@@ -487,7 +487,7 @@ test.describe('Command bar tests', () => {
         currentArgValue: '',
         headerArguments: {
           Method: 'Existing project',
-          Name: 'main.kcl',
+          Name: 'test',
           ProjectName: '',
           Code: '1 line',
         },
@@ -500,7 +500,7 @@ test.describe('Command bar tests', () => {
         headerArguments: {
           Method: 'Existing project',
           ProjectName: 'testProjectDir',
-          Name: 'main.kcl',
+          Name: 'test',
           Code: '1 line',
         },
       })
@@ -510,7 +510,7 @@ test.describe('Command bar tests', () => {
     await test.step(`Ensure we created the project and are in the modeling scene`, async () => {
       await editor.expectEditor.toContain('extrusionDistance = 12')
       await toolbar.openPane('files')
-      await toolbar.expectFileTreeState(['main-1.kcl', 'main.kcl'])
+      await toolbar.expectFileTreeState(['main.kcl', 'test.kcl'])
     })
   })
 
@@ -661,27 +661,4 @@ c = 3 + a`
       `a = 5b = a * amyParameter001 = ${newValue}c = 3 + a`
     )
   })
-
-  test('Command palette can be opened via query parameter', async ({
-    page,
-    homePage,
-    cmdBar,
-  }) => {
-    await page.goto(`${page.url()}/?cmd=app.theme&groupId=settings`)
-    await homePage.expectState({
-      projectCards: [],
-      sortBy: 'last-modified-desc',
-    })
-    await cmdBar.expectState({
-      stage: 'arguments',
-      commandName: 'Settings · app · theme',
-      currentArgKey: 'value',
-      currentArgValue: '',
-      headerArguments: {
-        Level: 'user',
-        Value: '',
-      },
-      highlightedHeaderArg: 'value',
-    })
-  })
 })

e2e/playwright/editor-tests.spec.ts

@@ -1131,15 +1131,14 @@ sketch001 = startSketchOn(XZ)
     await page.waitForTimeout(100)
 
     await page.getByText('startProfile(at = [4.61, -14.01])').click()
-    // Wait for the selection to register (TODO: we need a definitive way to wait for this)
-    await page.waitForTimeout(200)
     await toolbar.extrudeButton.click()
+    await cmdBar.progressCmdBar()
     await cmdBar.expectState({
       stage: 'arguments',
       currentArgKey: 'length',
       currentArgValue: '5',
       headerArguments: {
-        Profiles: '1 profile',
+        Sketches: '1 face',
         Length: '',
       },
       highlightedHeaderArg: 'length',
@@ -1149,7 +1148,7 @@ sketch001 = startSketchOn(XZ)
     await cmdBar.expectState({
       stage: 'review',
       headerArguments: {
-        Profiles: '1 profile',
+        Sketches: '1 face',
         Length: '5',
       },
       commandName: 'Extrude',
@@ -1355,9 +1354,7 @@ sketch001 = startSketchOn(XZ)
       const u = await getUtils(page)
       const projectLink = page.getByRole('link', { name: 'cube' })
       const gizmo = page.locator('[aria-label*=gizmo]')
-      const resetCameraButton = page.getByRole('button', {
-        name: 'Reset view',
-      })
+      const resetCameraButton = page.getByRole('button', { name: 'Reset view' })
       const locationToHaveColor = async (
         position: { x: number; y: number },
         color: [number, number, number]

e2e/playwright/file-tree.spec.ts

@@ -267,75 +267,6 @@ test.describe('when using the file tree to', () => {
       })
     }
   )
-
-  test(
-    'loading small file, then large, then back to small',
-    {
-      tag: '@electron',
-    },
-    async ({ page }, testInfo) => {
-      const {
-        panesOpen,
-        pasteCodeInEditor,
-        createNewFile,
-        openDebugPanel,
-        closeDebugPanel,
-        expectCmdLog,
-      } = await getUtils(page, test)
-
-      await page.setViewportSize({ width: 1200, height: 500 })
-      page.on('console', console.log)
-
-      await panesOpen(['files', 'code'])
-      await createProject({ name: 'project-000', page })
-
-      // Create a small file
-      const kclCube = await fsp.readFile(
-        'rust/kcl-lib/e2e/executor/inputs/cube.kcl',
-        'utf-8'
-      )
-      // pasted into main.kcl
-      await pasteCodeInEditor(kclCube)
-
-      // Create a large lego file
-      await createNewFile('lego')
-      const legoFile = page.getByRole('listitem').filter({
-        has: page.getByRole('button', { name: 'lego.kcl' }),
-      })
-      await expect(legoFile).toBeVisible({ timeout: 60_000 })
-      await legoFile.click()
-      const kclLego = await fsp.readFile(
-        'rust/kcl-lib/e2e/executor/inputs/lego.kcl',
-        'utf-8'
-      )
-      await pasteCodeInEditor(kclLego)
-      const mainFile = page.getByRole('listitem').filter({
-        has: page.getByRole('button', { name: 'main.kcl' }),
-      })
-
-      // Open settings and enable the debug panel
-      await page
-        .getByRole('link', {
-          name: 'settings Settings',
-        })
-        .click()
-      await page.locator('#showDebugPanel').getByText('OffOn').click()
-      await page.getByTestId('settings-close-button').click()
-
-      await test.step('swap between small and large files', async () => {
-        await openDebugPanel()
-        // Previously created a file so we need to start back at main.kcl
-        await mainFile.click()
-        await expectCmdLog('[data-message-type="execution-done"]', 60_000)
-        // Click the large file
-        await legoFile.click()
-        // Once it is building, click back to the smaller file
-        await mainFile.click()
-        await expectCmdLog('[data-message-type="execution-done"]', 60_000)
-        await closeDebugPanel()
-      })
-    }
-  )
 })
 
 test.describe('Renaming in the file tree', () => {

e2e/playwright/fixtures/cmdBarFixture.ts

@@ -146,7 +146,9 @@ export class CmdBarFixture {
     await this.cmdBarOpenBtn.click()
     await expect(this.page.getByPlaceholder('Search commands')).toBeVisible()
     if (selectCmd === 'promptToEdit') {
-      const promptEditCommand = this.selectOption({ name: 'Text-to-CAD Edit' })
+      const promptEditCommand = this.page.getByText(
+        'Use Zoo AI to edit your parts and code.'
+      )
       await expect(promptEditCommand.first()).toBeVisible()
       await promptEditCommand.first().scrollIntoViewIfNeeded()
       await promptEditCommand.first().click()

e2e/playwright/fixtures/homePageFixture.ts

@@ -121,13 +121,11 @@ export class HomePageFixture {
     await projectCard.click()
   }
 
-  /** Returns the project name in case caller has used the default and needs it */
-  goToModelingScene = async (name = 'testDefault') => {
+  goToModelingScene = async (name: string = 'testDefault') => {
     // On web this is a no-op. There is no project view.
-    if (process.env.PLATFORM === 'web') return ''
+    if (process.env.PLATFORM === 'web') return
 
     await this.createAndGoToProject(name)
-    return name
   }
 
   isNativeFileMenuCreated = async () => {

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

@@ -197,6 +197,18 @@ test.describe(
         await clickElectronNativeMenuById(tronApp, 'File.Export current part')
         await cmdBar.expectCommandName('Export')
       })
+      await test.step('Modeling.File.Share part via Zoo link', async () => {
+        await page.waitForTimeout(250)
+        await clickElectronNativeMenuById(
+          tronApp,
+          'File.Share part via Zoo link'
+        )
+        const textToCheck =
+          'Link copied to clipboard. Anyone who clicks this link will get a copy of this file. Share carefully!'
+        // Check if text appears anywhere in the page
+        const isTextVisible = page.getByText(textToCheck)
+        await expect(isTextVisible).toBeVisible({ timeout: 10000 })
+      })
       await test.step('Modeling.File.Preferences.Project settings', async () => {
         await page.waitForTimeout(250)
         await clickElectronNativeMenuById(
@@ -252,7 +264,7 @@ test.describe(
           tronApp,
           'Edit.Modify with Zoo Text-To-CAD'
         )
-        await cmdBar.expectCommandName('Text-to-CAD Edit')
+        await cmdBar.expectCommandName('Prompt-to-edit')
       })
       await test.step('Modeling.Edit.Edit parameter', async () => {
         await page.waitForTimeout(250)
@@ -518,7 +530,7 @@ test.describe(
           'Design.Create with Zoo Text-To-CAD'
         )
         await cmdBar.toBeOpened()
-        await cmdBar.expectCommandName('Text-to-CAD Create')
+        await cmdBar.expectCommandName('Text to CAD')
       })
 
       await test.step('Modeling.Design.Modify with Zoo Text-To-CAD', async () => {
@@ -528,7 +540,7 @@ test.describe(
           'Design.Modify with Zoo Text-To-CAD'
         )
         await cmdBar.toBeOpened()
-        await cmdBar.expectCommandName('Text-to-CAD Edit')
+        await cmdBar.expectCommandName('Prompt-to-edit')
       })
 
       await test.step('Modeling.Help.KCL code samples', async () => {

e2e/playwright/onboarding-tests.spec.ts

@@ -6,6 +6,7 @@ test.describe('Onboarding tests', () => {
     homePage,
     toolbar,
     editor,
+    scene,
     tronApp,
   }) => {
     if (!tronApp) {
@@ -61,6 +62,7 @@ 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 () => {
@@ -130,7 +132,9 @@ 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')
       })
@@ -158,10 +162,13 @@ 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

@@ -74,11 +74,20 @@ test.describe('Point-and-click tests', () => {
 
     await test.step('do extrude flow and check extrude code is added to editor', async () => {
       await toolbar.extrudeButton.click()
+      await cmdBar.expectState({
+        stage: 'arguments',
+        currentArgKey: 'sketches',
+        currentArgValue: '',
+        headerArguments: { Sketches: '', Length: '' },
+        highlightedHeaderArg: 'sketches',
+        commandName: 'Extrude',
+      })
+      await cmdBar.progressCmdBar()
       await cmdBar.expectState({
         stage: 'arguments',
         currentArgKey: 'length',
         currentArgValue: '5',
-        headerArguments: { Profiles: '1 profile', Length: '' },
+        headerArguments: { Sketches: '1 face', Length: '' },
         highlightedHeaderArg: 'length',
         commandName: 'Extrude',
       })
@@ -89,7 +98,7 @@ test.describe('Point-and-click tests', () => {
 
       await cmdBar.expectState({
         stage: 'review',
-        headerArguments: { Profiles: '1 profile', Length: '5' },
+        headerArguments: { Sketches: '1 face', Length: '5' },
         commandName: 'Extrude',
       })
       await cmdBar.progressCmdBar()
@@ -1625,15 +1634,15 @@ sketch002 = startSketchOn(plane001)
             stage: 'arguments',
             currentArgKey: 'sketches',
             currentArgValue: '',
-            headerArguments: { Profiles: '' },
-            highlightedHeaderArg: 'Profiles',
+            headerArguments: { Sketches: '' },
+            highlightedHeaderArg: 'sketches',
             commandName: 'Loft',
           })
           await selectSketches()
           await cmdBar.progressCmdBar()
           await cmdBar.expectState({
             stage: 'review',
-            headerArguments: { Profiles: '2 profiles' },
+            headerArguments: { Sketches: '2 faces' },
             commandName: 'Loft',
           })
           await cmdBar.submit()
@@ -1645,9 +1654,18 @@ sketch002 = startSketchOn(plane001)
 
         await test.step(`Go through the command bar flow with preselected sketches`, async () => {
           await toolbar.loftButton.click()
+          await cmdBar.expectState({
+            stage: 'arguments',
+            currentArgKey: 'sketches',
+            currentArgValue: '',
+            headerArguments: { Sketches: '' },
+            highlightedHeaderArg: 'sketches',
+            commandName: 'Loft',
+          })
+          await cmdBar.progressCmdBar()
           await cmdBar.expectState({
             stage: 'review',
-            headerArguments: { Profiles: '2 profiles' },
+            headerArguments: { Sketches: '2 faces' },
             commandName: 'Loft',
           })
           await cmdBar.submit()
@@ -1812,10 +1830,10 @@ sketch002 = startSketchOn(XZ)
           currentArgValue: '',
           headerArguments: {
             Sectional: '',
-            Profiles: '',
+            Sketches: '',
             Path: '',
           },
-          highlightedHeaderArg: 'Profiles',
+          highlightedHeaderArg: 'sketches',
           stage: 'arguments',
         })
         await clickOnSketch1()
@@ -1826,7 +1844,7 @@ sketch002 = startSketchOn(XZ)
           currentArgValue: '',
           headerArguments: {
             Sectional: '',
-            Profiles: '1 profile',
+            Sketches: '1 face',
             Path: '',
           },
           highlightedHeaderArg: 'path',
@@ -1839,7 +1857,7 @@ sketch002 = startSketchOn(XZ)
           currentArgValue: '',
           headerArguments: {
             Sectional: '',
-            Profiles: '1 profile',
+            Sketches: '1 face',
             Path: '',
           },
           highlightedHeaderArg: 'path',
@@ -1849,7 +1867,7 @@ sketch002 = startSketchOn(XZ)
         await cmdBar.expectState({
           commandName: 'Sweep',
           headerArguments: {
-            Profiles: '1 profile',
+            Sketches: '1 face',
             Path: '1 segment',
             Sectional: '',
           },
@@ -1950,10 +1968,10 @@ profile001 = ${circleCode}`
         currentArgValue: '',
         headerArguments: {
           Sectional: '',
-          Profiles: '',
+          Sketches: '',
           Path: '',
         },
-        highlightedHeaderArg: 'Profiles',
+        highlightedHeaderArg: 'sketches',
         stage: 'arguments',
       })
       await editor.scrollToText(circleCode)
@@ -1965,7 +1983,7 @@ profile001 = ${circleCode}`
         currentArgValue: '',
         headerArguments: {
           Sectional: '',
-          Profiles: '1 profile',
+          Sketches: '1 face',
           Path: '',
         },
         highlightedHeaderArg: 'path',
@@ -1979,7 +1997,7 @@ profile001 = ${circleCode}`
         currentArgValue: '',
         headerArguments: {
           Sectional: '',
-          Profiles: '1 profile',
+          Sketches: '1 face',
           Path: '',
         },
         highlightedHeaderArg: 'path',
@@ -1989,7 +2007,7 @@ profile001 = ${circleCode}`
       await cmdBar.expectState({
         commandName: 'Sweep',
         headerArguments: {
-          Profiles: '1 profile',
+          Sketches: '1 face',
           Path: '1 helix',
           Sectional: '',
         },
@@ -2088,6 +2106,18 @@ extrude001 = extrude(sketch001, length = -12)
     await test.step(`Apply fillet to the preselected edge`, async () => {
       await page.waitForTimeout(100)
       await toolbar.filletButton.click()
+      await cmdBar.expectState({
+        commandName: 'Fillet',
+        highlightedHeaderArg: 'selection',
+        currentArgKey: 'selection',
+        currentArgValue: '',
+        headerArguments: {
+          Selection: '',
+          Radius: '',
+        },
+        stage: 'arguments',
+      })
+      await cmdBar.progressCmdBar()
       await cmdBar.expectState({
         commandName: 'Fillet',
         highlightedHeaderArg: 'radius',
@@ -2617,6 +2647,18 @@ extrude001 = extrude(profile001, length = 5)
       await test.step(`Apply fillet`, async () => {
         await page.waitForTimeout(100)
         await toolbar.filletButton.click()
+        await cmdBar.expectState({
+          commandName: 'Fillet',
+          highlightedHeaderArg: 'selection',
+          currentArgKey: 'selection',
+          currentArgValue: '',
+          headerArguments: {
+            Selection: '',
+            Radius: '',
+          },
+          stage: 'arguments',
+        })
+        await cmdBar.progressCmdBar()
         await cmdBar.expectState({
           commandName: 'Fillet',
           highlightedHeaderArg: 'radius',
@@ -2722,6 +2764,19 @@ extrude001 = extrude(sketch001, length = -12)
     await test.step(`Apply chamfer to the preselected edge`, async () => {
       await page.waitForTimeout(100)
       await toolbar.chamferButton.click()
+      await cmdBar.expectState({
+        commandName: 'Chamfer',
+        highlightedHeaderArg: 'selection',
+        currentArgKey: 'selection',
+        currentArgValue: '',
+        headerArguments: {
+          Selection: '',
+          Length: '',
+        },
+        stage: 'arguments',
+      })
+      await cmdBar.progressCmdBar()
+      await page.waitForTimeout(1000)
       await cmdBar.expectState({
         commandName: 'Chamfer',
         highlightedHeaderArg: 'length',
@@ -3205,6 +3260,8 @@ extrude001 = extrude(sketch001, length = 30)
         await test.step(`Go through the command bar flow with a preselected face (cap)`, async () => {
           await toolbar.shellButton.click()
           await cmdBar.progressCmdBar()
+          await page.waitForTimeout(500)
+          await cmdBar.progressCmdBar()
           await cmdBar.expectState({
             stage: 'review',
             headerArguments: {
@@ -3634,17 +3691,16 @@ tag=$rectangleSegmentC002,
       await scene.settled(cmdBar)
 
       // select line of code
-      const codeToSelection = `startProfile(at = [-66.77, 84.81])`
+      const codeToSelection = `segAng(rectangleSegmentA002) - 90,`
       // revolve
       await editor.scrollToText(codeToSelection)
       await page.getByText(codeToSelection).click()
-      // Wait for the selection to register (TODO: we need a definitive way to wait for this)
-      await page.waitForTimeout(200)
       await toolbar.revolveButton.click()
       await cmdBar.progressCmdBar()
       await cmdBar.progressCmdBar()
       await cmdBar.progressCmdBar()
       await cmdBar.progressCmdBar()
+      await cmdBar.progressCmdBar()
 
       const newCodeToFind = `revolve001 = revolve(sketch002, angle = 360, axis = X)`
       expect(editor.expectEditor.toContain(newCodeToFind)).toBeTruthy()
@@ -4573,12 +4629,24 @@ path001 = startProfile(sketch001, at = [0, 0])
 
     await test.step('Go through command bar flow', async () => {
       await toolbar.extrudeButton.click()
+      await cmdBar.expectState({
+        stage: 'arguments',
+        currentArgKey: 'sketches',
+        currentArgValue: '',
+        headerArguments: {
+          Sketches: '',
+          Length: '',
+        },
+        highlightedHeaderArg: 'sketches',
+        commandName: 'Extrude',
+      })
+      await cmdBar.progressCmdBar()
       await cmdBar.expectState({
         stage: 'arguments',
         currentArgKey: 'length',
         currentArgValue: '5',
         headerArguments: {
-          Profiles: '2 profiles',
+          Sketches: '2 faces',
           Length: '',
         },
         highlightedHeaderArg: 'length',
@@ -4589,7 +4657,7 @@ path001 = startProfile(sketch001, at = [0, 0])
       await cmdBar.expectState({
         stage: 'review',
         headerArguments: {
-          Profiles: '2 profiles',
+          Sketches: '2 faces',
           Length: '1',
         },
         commandName: 'Extrude',
@@ -4655,12 +4723,25 @@ path001 = startProfile(sketch001, at = [0, 0])
 
     await test.step('Go through command bar flow', async () => {
       await toolbar.sweepButton.click()
+      await cmdBar.expectState({
+        stage: 'arguments',
+        currentArgKey: 'sketches',
+        currentArgValue: '',
+        headerArguments: {
+          Sketches: '',
+          Path: '',
+          Sectional: '',
+        },
+        highlightedHeaderArg: 'sketches',
+        commandName: 'Sweep',
+      })
+      await cmdBar.progressCmdBar()
       await cmdBar.expectState({
         stage: 'arguments',
         currentArgKey: 'path',
         currentArgValue: '',
         headerArguments: {
-          Profiles: '2 profiles',
+          Sketches: '2 faces',
           Path: '',
           Sectional: '',
         },
@@ -4673,7 +4754,7 @@ path001 = startProfile(sketch001, at = [0, 0])
       await cmdBar.expectState({
         stage: 'review',
         headerArguments: {
-          Profiles: '2 profiles',
+          Sketches: '2 faces',
           Path: '1 segment',
           Sectional: '',
         },
@@ -4739,12 +4820,25 @@ path001 = startProfile(sketch001, at = [0, 0])
     await test.step('Go through command bar flow', async () => {
       await toolbar.closePane('code')
       await toolbar.revolveButton.click()
+      await cmdBar.expectState({
+        stage: 'arguments',
+        currentArgKey: 'sketches',
+        currentArgValue: '',
+        headerArguments: {
+          Sketches: '',
+          AxisOrEdge: '',
+          Angle: '',
+        },
+        highlightedHeaderArg: 'sketches',
+        commandName: 'Revolve',
+      })
+      await cmdBar.progressCmdBar()
       await cmdBar.expectState({
         stage: 'arguments',
         currentArgKey: 'axisOrEdge',
         currentArgValue: '',
         headerArguments: {
-          Profiles: '2 profiles',
+          Sketches: '2 faces',
           AxisOrEdge: '',
           Angle: '',
         },
@@ -4760,7 +4854,7 @@ path001 = startProfile(sketch001, at = [0, 0])
         currentArgKey: 'angle',
         currentArgValue: '360',
         headerArguments: {
-          Profiles: '2 profiles',
+          Sketches: '2 faces',
           AxisOrEdge: 'Edge',
           Edge: '1 segment',
           Angle: '',
@@ -4773,7 +4867,7 @@ path001 = startProfile(sketch001, at = [0, 0])
       await cmdBar.expectState({
         stage: 'review',
         headerArguments: {
-          Profiles: '2 profiles',
+          Sketches: '2 faces',
           AxisOrEdge: 'Edge',
           Edge: '1 segment',
           Angle: '180',

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

@@ -99,8 +99,6 @@ 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,8 +88,6 @@ 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')
@@ -167,8 +165,6 @@ 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/sketch-tests.spec.ts

@@ -995,8 +995,8 @@ profile001 = startProfile(sketch001, at = [${roundOff(scale * 69.6)}, ${roundOff
     await u.expectCmdLog('[data-message-type="execution-done"]')
     await u.closeDebugPanel()
 
-    // click profile in code
-    await page.getByText(`startProfile(at = [-0.45, 0.87])`).click()
+    // click "line(end = [1.32, 0.38])"
+    await page.getByText(`line(end = [1.32, 0.38])`).click()
     await page.waitForTimeout(100)
     await expect(page.getByRole('button', { name: 'Edit Sketch' })).toBeEnabled(
       { timeout: 10_000 }
@@ -1014,13 +1014,14 @@ profile001 = startProfile(sketch001, at = [${roundOff(scale * 69.6)}, ${roundOff
     // click extrude
     await toolbar.extrudeButton.click()
 
-    // sketch selection should already have been made.
+    // sketch selection should already have been made. "Sketches: 1 face" only show up when the selection has been made already
     // otherwise the cmdbar would be waiting for a selection.
+    await cmdBar.progressCmdBar()
     await cmdBar.expectState({
       stage: 'arguments',
       currentArgKey: 'length',
       currentArgValue: '5',
-      headerArguments: { Profiles: '1 profile', Length: '' },
+      headerArguments: { Sketches: '1 segment', Length: '' },
       highlightedHeaderArg: 'length',
       commandName: 'Extrude',
     })

e2e/playwright/test-utils.ts

@@ -551,6 +551,11 @@ 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')

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

@@ -4,10 +4,9 @@ import type { Page } from '@playwright/test'
 
 import { createProject, getUtils } from '@e2e/playwright/test-utils'
 import { expect, test } from '@e2e/playwright/zoo-test'
-import type { CmdBarFixture } from '@e2e/playwright/fixtures/cmdBarFixture'
 
 test.describe('Text-to-CAD tests', () => {
-  test('basic lego happy case', async ({ page, homePage, cmdBar }) => {
+  test('basic lego happy case', async ({ page, homePage }) => {
     const u = await getUtils(page)
 
     await test.step('Set up', async () => {
@@ -16,11 +15,7 @@ test.describe('Text-to-CAD tests', () => {
       await u.waitForPageLoad()
     })
 
-    await sendPromptFromCommandBarAndSetExistingProject(
-      page,
-      'a 2x4 lego',
-      cmdBar
-    )
+    await sendPromptFromCommandBarTriggeredByButton(page, 'a 2x4 lego')
 
     // Find the toast.
     // Look out for the toast message
@@ -61,7 +56,6 @@ test.describe('Text-to-CAD tests', () => {
   test('success model, then ignore success toast, user can create new prompt from command bar', async ({
     page,
     homePage,
-    cmdBar,
   }) => {
     const u = await getUtils(page)
 
@@ -70,11 +64,7 @@ test.describe('Text-to-CAD tests', () => {
     await homePage.goToModelingScene()
     await u.waitForPageLoad()
 
-    await sendPromptFromCommandBarAndSetExistingProject(
-      page,
-      'a 2x6 lego',
-      cmdBar
-    )
+    await sendPromptFromCommandBarTriggeredByButton(page, 'a 2x6 lego')
 
     // Find the toast.
     // Look out for the toast message
@@ -92,11 +82,7 @@ test.describe('Text-to-CAD tests', () => {
     await expect(successToastMessage).toBeVisible({ timeout: 15000 })
 
     // Can send a new prompt from the command bar.
-    await sendPromptFromCommandBarAndSetExistingProject(
-      page,
-      'a 2x4 lego',
-      cmdBar
-    )
+    await sendPromptFromCommandBarTriggeredByButton(page, 'a 2x4 lego')
 
     // Find the toast.
     // Look out for the toast message
@@ -114,7 +100,6 @@ test.describe('Text-to-CAD tests', () => {
   test('you can reject text-to-cad output and it does nothing', async ({
     page,
     homePage,
-    cmdBar,
   }) => {
     const u = await getUtils(page)
 
@@ -123,11 +108,7 @@ test.describe('Text-to-CAD tests', () => {
     await homePage.goToModelingScene()
     await u.waitForPageLoad()
 
-    await sendPromptFromCommandBarAndSetExistingProject(
-      page,
-      'a 2x4 lego',
-      cmdBar
-    )
+    await sendPromptFromCommandBarTriggeredByButton(page, 'a 2x4 lego')
 
     // Find the toast.
     // Look out for the toast message
@@ -160,7 +141,6 @@ test.describe('Text-to-CAD tests', () => {
   test('sending a bad prompt fails, can dismiss', async ({
     page,
     homePage,
-    cmdBar,
   }) => {
     const u = await getUtils(page)
 
@@ -170,11 +150,7 @@ test.describe('Text-to-CAD tests', () => {
     await u.waitForPageLoad()
 
     const randomPrompt = `aslkdfja;` + Date.now() + `FFFFEIWJF`
-    await sendPromptFromCommandBarAndSetExistingProject(
-      page,
-      randomPrompt,
-      cmdBar
-    )
+    await sendPromptFromCommandBarTriggeredByButton(page, randomPrompt)
 
     // Find the toast.
     // Look out for the toast message
@@ -212,7 +188,6 @@ test.describe('Text-to-CAD tests', () => {
   test('sending a bad prompt fails, can start over from toast', async ({
     page,
     homePage,
-    cmdBar,
   }) => {
     const u = await getUtils(page)
 
@@ -222,7 +197,7 @@ test.describe('Text-to-CAD tests', () => {
     await u.waitForPageLoad()
 
     const badPrompt = 'akjsndladf lajbhflauweyfaaaljhr472iouafyvsssssss'
-    await sendPromptFromCommandBarAndSetExistingProject(page, badPrompt, cmdBar)
+    await sendPromptFromCommandBarTriggeredByButton(page, badPrompt)
 
     // Find the toast.
     // Look out for the toast message
@@ -281,7 +256,6 @@ test.describe('Text-to-CAD tests', () => {
   test('sending a bad prompt fails, can ignore toast, can start over from command bar', async ({
     page,
     homePage,
-    cmdBar,
   }) => {
     const u = await getUtils(page)
 
@@ -291,7 +265,7 @@ test.describe('Text-to-CAD tests', () => {
     await u.waitForPageLoad()
 
     const badPrompt = 'akjsndladflajbhflauweyf15;'
-    await sendPromptFromCommandBarAndSetExistingProject(page, badPrompt, cmdBar)
+    await sendPromptFromCommandBarTriggeredByButton(page, badPrompt)
 
     // Find the toast.
     // Look out for the toast message
@@ -318,11 +292,7 @@ test.describe('Text-to-CAD tests', () => {
     await expect(page.getByText(`Text-to-CAD failed`)).toBeVisible()
 
     // They should be able to try again from the command bar.
-    await sendPromptFromCommandBarAndSetExistingProject(
-      page,
-      'a 2x4 lego',
-      cmdBar
-    )
+    await sendPromptFromCommandBarTriggeredByButton(page, 'a 2x4 lego')
 
     // Find the toast.
     // Look out for the toast message
@@ -340,40 +310,17 @@ test.describe('Text-to-CAD tests', () => {
   test('ensure you can shift+enter in the prompt box', async ({
     page,
     homePage,
-    cmdBar,
   }) => {
     const u = await getUtils(page)
 
     await page.setBodyDimensions({ width: 1000, height: 500 })
 
-    const projectName = await homePage.goToModelingScene()
+    await homePage.goToModelingScene()
     await u.waitForPageLoad()
 
     const promptWithNewline = `a 2x4\nlego`
 
-    await test.step('Get to the prompt step to test', async () => {
-      await cmdBar.openCmdBar()
-      await cmdBar.selectOption({ name: 'Text-to-CAD Create' }).click()
-
-      await cmdBar.currentArgumentInput.fill('existing')
-      await cmdBar.progressCmdBar()
-
-      await cmdBar.currentArgumentInput.fill(projectName)
-      await cmdBar.progressCmdBar()
-
-      await cmdBar.expectState({
-        commandName: 'Text-to-CAD Create',
-        stage: 'arguments',
-        currentArgKey: 'prompt',
-        currentArgValue: '',
-        highlightedHeaderArg: 'prompt',
-        headerArguments: {
-          Method: 'Existing project',
-          ProjectName: projectName,
-          Prompt: '',
-        },
-      })
-    })
+    await page.getByTestId('text-to-cad').click()
 
     // Type the prompt.
     await page.keyboard.type('a 2x4')
@@ -407,7 +354,6 @@ test.describe('Text-to-CAD tests', () => {
   test('can do many at once and get many prompts back, and interact with many', async ({
     page,
     homePage,
-    cmdBar,
   }) => {
     // Let this test run longer since we've seen it timeout.
     test.setTimeout(180_000)
@@ -419,23 +365,11 @@ test.describe('Text-to-CAD tests', () => {
     await homePage.goToModelingScene()
     await u.waitForPageLoad()
 
-    await sendPromptFromCommandBarAndSetExistingProject(
-      page,
-      'a 2x4 lego',
-      cmdBar
-    )
+    await sendPromptFromCommandBarTriggeredByButton(page, 'a 2x4 lego')
 
-    await sendPromptFromCommandBarAndSetExistingProject(
-      page,
-      'a 2x8 lego',
-      cmdBar
-    )
+    await sendPromptFromCommandBarTriggeredByButton(page, 'a 2x8 lego')
 
-    await sendPromptFromCommandBarAndSetExistingProject(
-      page,
-      'a 2x10 lego',
-      cmdBar
-    )
+    await sendPromptFromCommandBarTriggeredByButton(page, 'a 2x10 lego')
 
     // Find the toast.
     // Look out for the toast message
@@ -506,7 +440,6 @@ test.describe('Text-to-CAD tests', () => {
   test('can do many at once with errors, clicking dismiss error does not dismiss all', async ({
     page,
     homePage,
-    cmdBar,
   }) => {
     const u = await getUtils(page)
 
@@ -515,16 +448,11 @@ test.describe('Text-to-CAD tests', () => {
     await homePage.goToModelingScene()
     await u.waitForPageLoad()
 
-    await sendPromptFromCommandBarAndSetExistingProject(
-      page,
-      'a 2x4 lego',
-      cmdBar
-    )
+    await sendPromptFromCommandBarTriggeredByButton(page, 'a 2x4 lego')
 
-    await sendPromptFromCommandBarAndSetExistingProject(
+    await sendPromptFromCommandBarTriggeredByButton(
       page,
-      'alkjsdnlajshdbfjlhsbdf a;askjdnf',
-      cmdBar
+      'alkjsdnlajshdbfjlhsbdf a;askjdnf'
     )
 
     // Find the toast.
@@ -598,9 +526,7 @@ async function _sendPromptFromCommandBar(page: Page, promptStr: string) {
     const cmdSearchBar = page.getByPlaceholder('Search commands')
     await expect(cmdSearchBar).toBeVisible()
 
-    const textToCadCommand = page.getByRole('option', {
-      name: 'Text-to-CAD Create',
-    })
+    const textToCadCommand = page.getByText('Use the Zoo Text-to-CAD API')
     await expect(textToCadCommand.first()).toBeVisible()
     // Click the Text-to-CAD command
     await textToCadCommand.first().scrollIntoViewIfNeeded()
@@ -618,67 +544,29 @@ async function _sendPromptFromCommandBar(page: Page, promptStr: string) {
   })
 }
 
-async function sendPromptFromCommandBarAndSetExistingProject(
+async function sendPromptFromCommandBarTriggeredByButton(
   page: Page,
-  promptStr: string,
-  cmdBar: CmdBarFixture,
-  projectName = 'testDefault'
+  promptStr: string
 ) {
   await page.waitForTimeout(1000)
   await test.step(`Send prompt from command bar: ${promptStr}`, async () => {
-    await cmdBar.openCmdBar()
-    await cmdBar.selectOption({ name: 'Text-to-CAD Create' }).click()
+    await page.getByTestId('text-to-cad').click()
 
-    await cmdBar.expectState({
-      commandName: 'Text-to-CAD Create',
-      stage: 'arguments',
-      currentArgKey: 'method',
-      currentArgValue: '',
-      highlightedHeaderArg: 'method',
-      headerArguments: {
-        Method: '',
-        Prompt: '',
-      },
-    })
-    await cmdBar.currentArgumentInput.fill('existing')
-    await cmdBar.progressCmdBar()
+    // Enter the prompt.
+    const prompt = page.getByRole('textbox', { name: 'Prompt' })
+    await expect(prompt.first()).toBeVisible()
 
-    await cmdBar.expectState({
-      commandName: 'Text-to-CAD Create',
-      stage: 'arguments',
-      currentArgKey: 'projectName',
-      currentArgValue: '',
-      highlightedHeaderArg: 'projectName',
-      headerArguments: {
-        Method: 'Existing project',
-        ProjectName: '',
-        Prompt: '',
-      },
-    })
-    await cmdBar.currentArgumentInput.fill(projectName)
-    await cmdBar.progressCmdBar()
-
-    await cmdBar.expectState({
-      commandName: 'Text-to-CAD Create',
-      stage: 'arguments',
-      currentArgKey: 'prompt',
-      currentArgValue: '',
-      highlightedHeaderArg: 'prompt',
-      headerArguments: {
-        Method: 'Existing project',
-        ProjectName: projectName,
-        Prompt: '',
-      },
-    })
-    await cmdBar.currentArgumentInput.fill(promptStr)
-    await cmdBar.progressCmdBar()
+    // Type the prompt.
+    await page.keyboard.type(promptStr)
+    await page.waitForTimeout(200)
+    await page.keyboard.press('Enter')
   })
 }
 
 test(
   'Text-to-CAD functionality',
   { tag: '@electron' },
-  async ({ context, page, cmdBar }, testInfo) => {
+  async ({ context, page }, testInfo) => {
     const projectName = 'project-000'
     const prompt = 'lego 2x4'
     const textToCadFileName = 'lego-2x4.kcl'
@@ -715,12 +603,7 @@ test(
     await openKclCodePanel()
 
     await test.step(`Test file creation`, async () => {
-      await sendPromptFromCommandBarAndSetExistingProject(
-        page,
-        prompt,
-        cmdBar,
-        projectName
-      )
+      await sendPromptFromCommandBarTriggeredByButton(page, prompt)
       // File is considered created if it shows up in the Project Files pane
       await expect(textToCadFileButton).toBeVisible({ timeout: 20_000 })
       expect(fileExists()).toBeTruthy()
@@ -890,12 +773,12 @@ test.describe('Mocked Text-to-CAD API tests', { tag: ['@skipWin'] }, () => {
       )
       await expect(page.getByTestId('app-header-file-name')).toBeVisible()
       await expect(page.getByTestId('app-header-file-name')).toContainText(
-        'main.kcl'
+        '2x2x2-cube.kcl'
       )
 
       await u.openFilePanel()
       await expect(
-        page.getByTestId('file-tree-item').getByText('main.kcl')
+        page.getByTestId('file-tree-item').getByText('2x2x2-cube.kcl')
       ).toBeVisible()
     }
   )
@@ -1030,7 +913,7 @@ test.describe('Mocked Text-to-CAD API tests', { tag: ['@skipWin'] }, () => {
       )
       await expect(page.getByTestId('app-header-file-name')).toBeVisible()
       await expect(page.getByTestId('app-header-file-name')).toContainText(
-        'main.kcl'
+        '2x2x2-cube.kcl'
       )
 
       await page.getByRole('button', { name: 'Reject' }).click()
@@ -1078,7 +961,7 @@ test.describe('Mocked Text-to-CAD API tests', { tag: ['@skipWin'] }, () => {
       )
       await expect(page.getByTestId('app-header-file-name')).toBeVisible()
       await expect(page.getByTestId('app-header-file-name')).toContainText(
-        'main.kcl'
+        '2x2x2-cube.kcl'
       )
     }
   )
@@ -1330,14 +1213,18 @@ test.describe('Mocked Text-to-CAD API tests', { tag: ['@skipWin'] }, () => {
       )
       await expect(page.getByTestId('app-header-file-name')).toBeVisible()
       await expect(page.getByTestId('app-header-file-name')).toContainText(
-        'main.kcl'
+        '2x2x2-cube.kcl'
       )
 
       // Check file is created
       await u.openFilePanel()
       await expect(
-        page.getByTestId('file-tree-item').getByText('main.kcl')
+        page.getByTestId('file-tree-item').getByText('2x2x2-cube.kcl')
       ).toBeVisible()
+
+      await expect(
+        page.getByTestId('file-tree-item').getByText('main.kcl')
+      ).not.toBeVisible()
     }
   )
 

e2e/playwright/various.spec.ts

@@ -573,6 +573,7 @@ profile001 = startProfile(sketch002, at = [-12.34, 12.34])
   await expect(page.getByTestId('command-bar')).toBeVisible()
   await page.waitForTimeout(100)
 
+  await cmdBar.progressCmdBar()
   await cmdBar.progressCmdBar()
   await expect(page.getByText('Confirm Extrude')).toBeVisible()
   await cmdBar.progressCmdBar()

package.json

@@ -94,6 +94,7 @@
     "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 &",
@@ -129,14 +130,15 @@
     "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 **/jest-component-unit-tests/*",
+    "test:unit": "vitest run --mode development --exclude **/kclSamples.test.ts --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: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"
   },
   "browserslist": {
     "production": [

public/kcl-samples/README.md

@@ -49,16 +49,12 @@ When you submit a PR to add or modify KCL samples, images will be generated and
 [![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)
-#### [curtain-wall-anchor-plate](curtain-wall-anchor-plate/main.kcl) ([screenshot](screenshots/curtain-wall-anchor-plate.png))
-[![curtain-wall-anchor-plate](screenshots/curtain-wall-anchor-plate.png)](curtain-wall-anchor-plate/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))
 [![dodecahedron](screenshots/dodecahedron.png)](dodecahedron/main.kcl)
 #### [enclosure](enclosure/main.kcl) ([screenshot](screenshots/enclosure.png))
 [![enclosure](screenshots/enclosure.png)](enclosure/main.kcl)
-#### [engine-valve](engine-valve/main.kcl) ([screenshot](screenshots/engine-valve.png))
-[![engine-valve](screenshots/engine-valve.png)](engine-valve/main.kcl)
 #### [exhaust-manifold](exhaust-manifold/main.kcl) ([screenshot](screenshots/exhaust-manifold.png))
 [![exhaust-manifold](screenshots/exhaust-manifold.png)](exhaust-manifold/main.kcl)
 #### [flange](flange/main.kcl) ([screenshot](screenshots/flange.png))
@@ -107,8 +103,6 @@ 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)
-#### [pdu-faceplate](pdu-faceplate/main.kcl) ([screenshot](screenshots/pdu-faceplate.png))
-[![pdu-faceplate](screenshots/pdu-faceplate.png)](pdu-faceplate/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))
@@ -125,24 +119,16 @@ When you submit a PR to add or modify KCL samples, images will be generated and
 [![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))
 [![router-template-slate](screenshots/router-template-slate.png)](router-template-slate/main.kcl)
-#### [sash-window](sash-window/main.kcl) ([screenshot](screenshots/sash-window.png))
-[![sash-window](screenshots/sash-window.png)](sash-window/main.kcl)
 #### [sheet-metal-bracket](sheet-metal-bracket/main.kcl) ([screenshot](screenshots/sheet-metal-bracket.png))
 [![sheet-metal-bracket](screenshots/sheet-metal-bracket.png)](sheet-metal-bracket/main.kcl)
-#### [shepherds-hook-bolt](shepherds-hook-bolt/main.kcl) ([screenshot](screenshots/shepherds-hook-bolt.png))
-[![shepherds-hook-bolt](screenshots/shepherds-hook-bolt.png)](shepherds-hook-bolt/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)
-#### [spinning-highrise-tower](spinning-highrise-tower/main.kcl) ([screenshot](screenshots/spinning-highrise-tower.png))
-[![spinning-highrise-tower](screenshots/spinning-highrise-tower.png)](spinning-highrise-tower/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)
-#### [thermal-block-insert](thermal-block-insert/main.kcl) ([screenshot](screenshots/thermal-block-insert.png))
-[![thermal-block-insert](screenshots/thermal-block-insert.png)](thermal-block-insert/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))

public/kcl-samples/curtain-wall-anchor-plate/main.kcl

@@ -1,155 +0,0 @@
-// Curtain Wall Anchor Plate
-// A structural steel L-plate used to anchor curtain wall systems to concrete slabs, with elongated holes for adjustability and bolts with nuts and base plates for secure fastening
-
-// Set units in millimeters (mm)
-@settings(defaultLengthUnit = mm, kclVersion = 1.0)
-
-// Define parameters
-slabPlateBaseLength = 300
-slabPlateHookLength = 80
-slabPlateWidth = 200
-slabPlateThickness = 8
-offsetSlabRail = 200
-
-// Generate L-shaped anchor profile with base and hook flange
-// Includes fillets at internal and external corners for strength and safety
-fn lProfileFn(lengthBase, lengthHook, width, thickness) {
-  profilePlane = startSketchOn(offsetPlane(XZ, offset = -width / 2))
-  profileShape = startProfile(profilePlane, at = [0, 0])
-    |> yLine(length = lengthHook, tag = $hookOutside)
-    |> xLine(length = thickness)
-    |> yLine(length = thickness - lengthHook, tag = $hookInside)
-    |> xLine(length = lengthBase - thickness, tag = $baseInside)
-    |> yLine(length = -thickness)
-    |> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $baseOutside)
-    |> close()
-  profileBody = extrude(profileShape, length = width)
-    |> fillet(
-         radius = thickness,
-         tags = [
-           getCommonEdge(faces = [baseInside, hookInside])
-         ],
-       )
-    |> fillet(
-         radius = thickness * 2,
-         tags = [
-           getCommonEdge(faces = [baseOutside, hookOutside])
-         ],
-       )
-  return profileBody
-}
-
-// Create a hexagonal shape used for bolt and nut heads
-fn hexagonFn(plane, radius) {
-  shape = startProfile(plane, at = [-radius, 0])
-    |> angledLine(angle = 60, length = radius)
-    |> xLine(length = radius)
-    |> angledLine(angle = -60, length = radius)
-    |> angledLine(angle = -120, length = radius)
-    |> xLine(length = -radius)
-    |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-    |> close()
-  return shape
-}
-
-// Build a bolt with a hexagonal head and cylindrical shaft
-fn boltFn(diameter, length) {
-  boltHeadPlane = startSketchOn(XY)
-  boltHeadShape = hexagonFn(plane = boltHeadPlane, radius = diameter)
-  boltHeadBody = extrude(boltHeadShape, length = diameter * 0.7)
-  boltPlane = startSketchOn(boltHeadBody, face = START)
-  boltShape = circle(boltPlane, center = [0, 0], radius = diameter / 2)
-  boltBody = extrude(boltShape, length = length)
-  return boltBody
-}
-
-// Construct a bolt assembly with base plate and hex nut
-// Assembles all parts for realistic anchor simulation
-fn boltWithPlateAndNutFn(diameter, length, gap) {
-  plateSide = diameter * 3
-  plateplane = startSketchOn(offsetPlane(XY, offset = -gap))
-  plateShape = startProfile(plateplane, at = [-plateSide / 2, -plateSide / 2])
-    |> yLine(length = plateSide)
-    |> xLine(length = plateSide)
-    |> yLine(length = -plateSide)
-    |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-    |> close()
-  plateBody = extrude(plateShape, length = -diameter * 0.3)
-  nutPlane = startSketchOn(plateBody, face = START)
-  boltHeadShape = hexagonFn(plane = nutPlane, radius = 12)
-  boltHeadBody = extrude(boltHeadShape, length = diameter * 0.7)
-  boltBody = boltFn(diameter = diameter, length = gap + diameter + 3)
-  mergedBody = union([boltHeadBody, boltBody])
-  return mergedBody
-}
-
-// Generate the plate geometry with a vertical hook for slab attachment
-slabPlate = lProfileFn(
-  lengthBase = slabPlateBaseLength,
-  lengthHook = slabPlateHookLength,
-  width = slabPlateWidth,
-  thickness = slabPlateThickness,
-)
-
-// Define oblong holes for bolts, allowing positional adjustment
-wideHoleWidth = 12
-wideHoleLength = 60
-wideHoleOffset = 30
-
-// Two slots mirrored across the plate width
-wideHolePlane = startSketchOn(XY)
-wideHoleShape = startProfile(
-       wideHolePlane,
-       at = [
-         -(wideHoleLength - wideHoleWidth) / 2,
-         wideHoleWidth / 2
-       ],
-     )
-  |> xLine(length = wideHoleLength - wideHoleWidth)
-  |> tangentialArc(endAbsolute = [
-       (wideHoleLength - wideHoleWidth) / 2,
-       -wideHoleWidth / 2
-     ])
-  |> xLine(length = wideHoleWidth - wideHoleLength)
-  |> tangentialArc(endAbsolute = [profileStartX(%), profileStartY(%)])
-  |> close()
-  |> translate(
-       %,
-       x = offsetSlabRail,
-       y = wideHoleOffset - (slabPlateWidth / 2),
-       z = -1,
-     )
-wideHoleVoidLeft = extrude(wideHoleShape, length = slabPlateThickness + 2)
-wideHoleVoidRight = clone(wideHoleVoidLeft)
-  |> translate(
-       %,
-       x = 0,
-       y = slabPlateWidth - (wideHoleOffset * 2),
-       z = 0,
-     )
-
-// Cut the holes into the anchor plate body
-slabPlatePunchOne = subtract([slabPlate], tools = [wideHoleVoidLeft])
-slabPlatePunchTwo = subtract([slabPlatePunchOne], tools = [wideHoleVoidRight])
-
-// Add two bolt assemblies into the oblong slots
-// Properly rotated and spaced to match anchor hole layout
-slabPlateBolts = boltWithPlateAndNutFn(diameter = 10, length = 20, gap = slabPlateThickness + 5)
-  |> rotate(
-       %,
-       roll = 180,
-       pitch = 0,
-       yaw = 0,
-     )
-  |> translate(
-       %,
-       x = offsetSlabRail,
-       y = wideHoleOffset - (slabPlateWidth / 2),
-       z = 5,
-     )
-  |> patternLinear3d(
-       %,
-       instances = 2,
-       distance = slabPlateWidth - (wideHoleOffset * 2),
-       axis = [0, -1, 0],
-     )

public/kcl-samples/engine-valve/main.kcl

@@ -1,79 +0,0 @@
-// Engine Valve
-// A mechanical valve used in internal combustion engines to control intake or exhaust flow
-
-
-
-
-@settings(defaultLengthUnit = mm, kclVersion = 1.0)
-
-// Define parameters
-valveDiameter = 30
-valveLength = 120
-valveHeadLength = valveDiameter * 1.0
-valveHeadThickness = 3
-stemDiameter = 6
-stemHeadLength = 9
-stemLength = valveLength - valveHeadLength - stemHeadLength
-
-// Create the valve head
-valveRadius = valveDiameter / 2
-valveHeadPlane = startSketchOn(XZ)
-valveHeadShape = startProfile(valveHeadPlane, at = [-0.01, valveHeadLength])
-  |> xLine(length = 0.01 - (stemDiameter / 2))
-  |> line(endAbsolute = [0.01 - (stemDiameter / 2), valveRadius])
-  |> tangentialArc(endAbsolute = [-0.8 * valveRadius, valveHeadThickness], tag = $seg01)
-  |> tangentialArc(endAbsolute = [-valveRadius, 0])
-  |> xLine(length = 0.3 * valveRadius)
-  |> arc(
-       interiorAbsolute = [
-         -0.34 * valveRadius,
-         0.08 * valveRadius
-       ],
-       endAbsolute = [
-         -0.02 * valveRadius,
-         0.11 * valveRadius
-       ],
-     )
-  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-  |> close()
-valveHead = revolve(valveHeadShape, angle = 360, axis = Y)
-
-// Create the valve stem
-valveStemSketch = startSketchOn(offsetPlane(XY, offset = valveHeadLength))
-  |> circle(center = [0, 0], radius = stemDiameter / 2)
-  |> extrude(length = stemLength - valveHeadLength - stemHeadLength)
-
-// Create the valve stem end
-stepLength = stemHeadLength / 10
-step1 = startSketchOn(valveStemSketch, face = END)
-  |> circle(%, center = [0, 0], radius = stemDiameter / 2 * 0.9)
-  |> extrude(%, length = stepLength * 2)
-step2 = startSketchOn(step1, face = END)
-  |> circle(%, center = [0, 0], radius = stemDiameter / 2 * 0.8)
-  |> extrude(%, length = stepLength)
-step3 = startSketchOn(step2, face = END)
-  |> circle(%, center = [0, 0], radius = stemDiameter / 2 * 0.9)
-  |> extrude(%, length = stepLength)
-step4 = startSketchOn(step3, face = END)
-  |> circle(%, center = [0, 0], radius = stemDiameter / 2 * 0.8)
-  |> extrude(%, length = stepLength)
-step5 = startSketchOn(step4, face = END)
-  |> circle(%, center = [0, 0], radius = stemDiameter / 2 * 0.9)
-  |> extrude(%, length = stepLength)
-step6 = startSketchOn(step5, face = END)
-  |> circle(%, center = [0, 0], radius = stemDiameter / 2 * 0.8)
-  |> extrude(%, length = stepLength)
-step7 = startSketchOn(step6, face = END)
-  |> circle(
-       %,
-       center = [0, 0],
-       radius = stemDiameter / 2 * 0.9,
-       tag = $seg02,
-     )
-  |> extrude(%, length = stepLength * 3, tagEnd = $capEnd001)
-  |> chamfer(
-       length = 0.5,
-       tags = [
-         getCommonEdge(faces = [seg02, capEnd001])
-       ],
-     )

public/kcl-samples/manifest.json

@@ -147,16 +147,6 @@
       "removable-sticker.kcl"
     ]
   },
-  {
-    "file": "main.kcl",
-    "pathFromProjectDirectoryToFirstFile": "curtain-wall-anchor-plate/main.kcl",
-    "multipleFiles": false,
-    "title": "Curtain Wall Anchor Plate",
-    "description": "A structural steel L-plate used to anchor curtain wall systems to concrete slabs, with elongated holes for adjustability and bolts with nuts and base plates for secure fastening",
-    "files": [
-      "main.kcl"
-    ]
-  },
   {
     "file": "main.kcl",
     "pathFromProjectDirectoryToFirstFile": "cycloidal-gear/main.kcl",
@@ -187,16 +177,6 @@
       "main.kcl"
     ]
   },
-  {
-    "file": "main.kcl",
-    "pathFromProjectDirectoryToFirstFile": "engine-valve/main.kcl",
-    "multipleFiles": false,
-    "title": "Engine Valve",
-    "description": "A mechanical valve used in internal combustion engines to control intake or exhaust flow",
-    "files": [
-      "main.kcl"
-    ]
-  },
   {
     "file": "main.kcl",
     "pathFromProjectDirectoryToFirstFile": "exhaust-manifold/main.kcl",
@@ -442,16 +422,6 @@
       "robot-rotating-base.kcl"
     ]
   },
-  {
-    "file": "main.kcl",
-    "pathFromProjectDirectoryToFirstFile": "pdu-faceplate/main.kcl",
-    "multipleFiles": false,
-    "title": "Power Distribution Unit (PDU) faceplate with European plug sockets and switch",
-    "description": "Designed for standard 19-inch rack systems with 1U height and 8 sockets",
-    "files": [
-      "main.kcl"
-    ]
-  },
   {
     "file": "main.kcl",
     "pathFromProjectDirectoryToFirstFile": "pillow-block-bearing/main.kcl",
@@ -542,16 +512,6 @@
       "main.kcl"
     ]
   },
-  {
-    "file": "main.kcl",
-    "pathFromProjectDirectoryToFirstFile": "sash-window/main.kcl",
-    "multipleFiles": false,
-    "title": "Sash Window",
-    "description": "A traditional wooden sash window with two vertically sliding panels and a central locking mechanism",
-    "files": [
-      "main.kcl"
-    ]
-  },
   {
     "file": "main.kcl",
     "pathFromProjectDirectoryToFirstFile": "sheet-metal-bracket/main.kcl",
@@ -562,16 +522,6 @@
       "main.kcl"
     ]
   },
-  {
-    "file": "main.kcl",
-    "pathFromProjectDirectoryToFirstFile": "shepherds-hook-bolt/main.kcl",
-    "multipleFiles": false,
-    "title": "Shepherd’s Hook Bolt",
-    "description": "A bent bolt with a curved hook, typically used for hanging or anchoring loads. The threaded end allows secure attachment to surfaces or materials, while the curved hook resists pull-out under tension.",
-    "files": [
-      "main.kcl"
-    ]
-  },
   {
     "file": "main.kcl",
     "pathFromProjectDirectoryToFirstFile": "socket-head-cap-screw/main.kcl",
@@ -582,16 +532,6 @@
       "main.kcl"
     ]
   },
-  {
-    "file": "main.kcl",
-    "pathFromProjectDirectoryToFirstFile": "spinning-highrise-tower/main.kcl",
-    "multipleFiles": false,
-    "title": "Spinning Highrise Tower",
-    "description": "A conceptual high-rise tower with a central core and rotating floor slabs, demonstrating dynamic form through vertical repetition and transformation",
-    "files": [
-      "main.kcl"
-    ]
-  },
   {
     "file": "main.kcl",
     "pathFromProjectDirectoryToFirstFile": "spur-gear/main.kcl",
@@ -622,16 +562,6 @@
       "main.kcl"
     ]
   },
-  {
-    "file": "main.kcl",
-    "pathFromProjectDirectoryToFirstFile": "thermal-block-insert/main.kcl",
-    "multipleFiles": false,
-    "title": "Thermal Block Insert",
-    "description": "Interlocking insulation insert for masonry walls, designed with a tongue-and-groove profile for modular alignment and thermal efficiency",
-    "files": [
-      "main.kcl"
-    ]
-  },
   {
     "file": "main.kcl",
     "pathFromProjectDirectoryToFirstFile": "tooling-nest-block/main.kcl",

public/kcl-samples/pdu-faceplate/main.kcl

@@ -1,240 +0,0 @@
-// Power Distribution Unit (PDU) faceplate with European plug sockets and switch
-// Designed for standard 19-inch rack systems with 1U height and 8 sockets
-
-// Set units in millimeters (mm)
-@settings(defaultLengthUnit = mm, kclVersion = 1.0)
-
-// Define the dimensions
-// Width fits standard 19” rack, height is 1U, depth is variable
-faceplateWidth = 482.6 // this is standardized to fit 19-inch racks)
-faceplateHeight = 44.45 // usually 1U (44.45 mm), but can be 2U (88.9 mm) or more
-faceplateDepth = 100 // varies by manufacturer, but commonly between 100 mm and 300 mm
-
-
-// Define dimensions of side supports (width and thickness)
-supportWidth = 50
-supportThickness = 3
-
-// Main body of the PDU faceplate with integrated rack mounting flanges
-faceplateShape = startSketchOn(offsetPlane(XY, offset = -faceplateHeight / 2))
-  |> startProfile(%, at = [-faceplateWidth / 2 - supportWidth, 0])
-  |> yLine(length = supportThickness)
-  |> xLine(length = supportWidth)
-  |> yLine(length = faceplateDepth - supportThickness)
-  |> xLine(length = faceplateWidth)
-  |> yLine(length = supportThickness - faceplateDepth)
-  |> xLine(length = supportWidth)
-  |> yLine(length = -supportThickness)
-  |> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $seg01)
-  |> close()
-faceplateBody = extrude(faceplateShape, length = faceplateHeight)
-faceplateFrontFace = startSketchOn(faceplateBody, face = seg01)
-
-// Creates recessed volume within the faceplate for inserting modules
-nestWall = 2
-nestWidth = faceplateWidth - (nestWall * 2)
-nestHeight = faceplateHeight - (nestWall * 2)
-nestDepth = faceplateDepth - nestWall
-nestShape = startProfile(faceplateFrontFace, at = [-nestWidth / 2, nestHeight / 2])
-  |> xLine(length = nestWidth)
-  |> yLine(length = -nestHeight)
-  |> xLine(length = -nestWidth)
-  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-  |> close()
-nestVoid = extrude(nestShape, length = -nestDepth)
-
-// Spacer block on the left side, used to position components correctly
-moduleHeight = nestHeight
-moduleWidth = nestHeight
-moduleDepth = nestHeight
-
-leftSpacerWidth = moduleWidth * 1.5
-leftSpacerPosition = leftSpacerWidth / 2 - (nestWidth / 2)
-
-fn boxModuleFn(width) {
-  shape = startSketchOn(XZ)
-    |> startProfile(%, at = [-width / 2, moduleHeight / 2])
-    |> xLine(length = width)
-    |> yLine(length = -moduleHeight)
-    |> xLine(length = -width)
-    |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-    |> close()
-  body = extrude(shape, length = -moduleDepth)
-  return body
-}
-leftSpacerShape = boxModuleFn(width = leftSpacerWidth)
-  |> translate(
-       %,
-       x = leftSpacerPosition,
-       y = 0,
-       z = 0,
-     )
-
-// Module for power switch including front plate and red rocker button
-switchPosition = leftSpacerPosition + leftSpacerWidth / 2 + moduleWidth / 2
-swtichWidth = moduleWidth
-
-// Switch Body
-switchBody = boxModuleFn(width = moduleWidth)
-
-// Switch Plate
-swtichPlateWidth = 20
-switchPlateHeight = 30
-switchPlateThickness = 3
-switchPlateShape = startSketchOn(switchBody, face = END)
-  |> startProfile(
-       %,
-       at = [
-         -swtichPlateWidth / 2,
-         -switchPlateHeight / 2
-       ],
-     )
-  |> yLine(length = switchPlateHeight)
-  |> xLine(length = swtichPlateWidth)
-  |> yLine(length = -switchPlateHeight)
-  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-  |> close()
-switchPlateBody = extrude(switchPlateShape, length = switchPlateThickness)
-  |> translate(
-       %,
-       x = switchPosition,
-       y = 0,
-       z = 0,
-     )
-
-// Switch Button
-switchButtonHeight = 26
-swtichButtonWidth = 15
-switchButtonShape = startSketchOn(offsetPlane(-YZ, offset = -swtichButtonWidth / 2))
-  |> startProfile(
-       %,
-       at = [
-         switchPlateThickness,
-         switchButtonHeight / 2
-       ],
-     )
-  |> line(end = [3, -1])
-  |> arc(interiorAbsolute = [6, 0], endAbsolute = [12, -9])
-  |> line(endAbsolute = [
-       switchPlateThickness,
-       -switchButtonHeight / 2
-     ])
-  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-  |> close()
-switchButtonBody = extrude(switchButtonShape, length = swtichButtonWidth)
-  |> translate(
-       %,
-       x = switchPosition,
-       y = 0,
-       z = 0,
-     )
-  |> appearance(%, color = "#ff0000")
-
-// Spacer between switch and plug modules for layout alignment
-secondSpacerWidth = moduleWidth / 2
-secondSpacerPosition = switchPosition + swtichWidth / 2 + secondSpacerWidth / 2
-secondSpacerBody = boxModuleFn(width = secondSpacerWidth)
-  |> translate(
-       %,
-       x = secondSpacerPosition,
-       y = 0,
-       z = 0,
-     )
-
-  // European power plug modules with circular sockets and two-pin holes
-// 8 identical sockets, each with grounding notch and dual-pin recesses
-powerPlugWidth = moduleWidth
-powerPlugCount = 8
-powerPlugOveralWidth = powerPlugWidth * powerPlugCount
-firstPowerPlugPosition = secondSpacerPosition + secondSpacerWidth / 2 + powerPlugWidth / 2
-lastPowerPlugPosition = firstPowerPlugPosition + powerPlugWidth * (powerPlugCount - 1)
-powerPlugBody = boxModuleFn(width = powerPlugWidth)
-  |> translate(
-       %,
-       x = firstPowerPlugPosition,
-       y = 0,
-       z = 0,
-     )
-plugShape = startSketchOn(powerPlugBody, face = END)
-  |> circle(%, center = [0, 0], radius = 17)
-  |> translate(
-       %,
-       x = firstPowerPlugPosition,
-       y = 0,
-       z = 0,
-     )
-plugBody = extrude(plugShape, length = -20)
-plugHoleDistance = 20
-plugHoleShape = startSketchOn(plugBody, face = START)
-  |> circle(%, center = [-plugHoleDistance / 2, 0], radius = 3)
-  |> translate(
-       %,
-       x = firstPowerPlugPosition,
-       y = 0,
-       z = 0,
-     )
-  |> patternLinear2d(
-       %,
-       instances = 2,
-       distance = plugHoleDistance,
-       axis = [1, 0],
-     )
-plugHoleBody = extrude(plugHoleShape, length = -5)
-  |> patternLinear3d(
-       %,
-       instances = powerPlugCount,
-       distance = powerPlugWidth,
-       axis = [1, 0, 0],
-     )
-
-// Rightmost spacer to fill in remaining horizontal space
-rightSpacerWidth = nestWidth / 2 - lastPowerPlugPosition - (powerPlugWidth / 2)
-rightSpacerPosition = lastPowerPlugPosition + powerPlugWidth / 2 + rightSpacerWidth / 2
-rightSpacerBody = boxModuleFn(width = rightSpacerWidth)
-  |> translate(
-       %,
-       x = rightSpacerPosition,
-       y = 0,
-       z = 0,
-     )
-
-// Rack mounting holes on flanges, elongated for alignment flexibility
-holeWidth = 25
-holeDiameter = 5
-holeStraightSegment = holeWidth - holeDiameter
-holeVerticalDistance = faceplateHeight * 0.3
-
-holeShapes = startProfile(
-       faceplateFrontFace,
-       at = [
-         -holeStraightSegment / 2,
-         holeDiameter / 2
-       ],
-     )
-  |> xLine(length = holeStraightSegment)
-  |> tangentialArc(endAbsolute = [
-       holeStraightSegment / 2,
-       -holeDiameter / 2
-     ])
-  |> xLine(length = -holeStraightSegment)
-  |> tangentialArc(endAbsolute = [profileStartX(%), profileStartY(%)])
-  |> close()
-  |> translate(
-       %,
-       x = -faceplateWidth / 2 - (supportWidth / 2),
-       y = 0,
-       z = -holeVerticalDistance,
-     )
-  |> patternLinear2d(
-       %,
-       instances = 3,
-       distance = holeVerticalDistance,
-       axis = [0, 1],
-     )
-  |> patternLinear2d(
-       %,
-       instances = 2,
-       distance = faceplateWidth + supportWidth,
-       axis = [1, 0],
-     )
-holeVoid = extrude(holeShapes, length = -supportThickness)

public/kcl-samples/sash-window/main.kcl

@@ -1,214 +0,0 @@
-// Sash Window
-// A traditional wooden sash window with two vertically sliding panels and a central locking mechanism
-
-// Set units in millimeters (mm)
-@settings(defaultLengthUnit = mm, kclVersion = 1.0)
-
-// Window state: 0 for closed, 1 for open
-windowState = 0
-
-// Basic window dimensions
-windowWidth = 500
-windowHeight = 1000
-
-// Frame thickness and depth
-frameWidth = 30
-frameDepth = 50
-
-// Number of divisions per sash (horizontal and vertical)
-sashOpeningCountHorizontal = 2
-sashOpeningCountVertical = 1
-
-// Derived dimensions
-sashWidth = windowWidth - (frameWidth * 2)
-sashHeight = (windowHeight - (frameWidth * 2)) / 2 + frameWidth / 2
-sashDepth = frameDepth / 2 - 2
-sashTravelDistance = sashHeight * windowState * 0.8
-
-// Function to create panel with frame and openings
-fn panelFn(plane, offset, width, height, depth, perimeter, divisionThickness, openingCountHorizontal, openingCountVertical) {
-  // Create panel base shape
-  panelPlane = startSketchOn(offsetPlane(XZ, offset = offset))
-  panelShape = startProfile(panelPlane, at = [-width / 2, -height / 2])
-    |> yLine(length = height)
-    |> xLine(length = width)
-    |> yLine(length = -height)
-    |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-    |> close()
-  panelBody = extrude(panelShape, length = depth)
-
-  // Create opening grid within the panel
-  voidAreaWidth = width - (perimeter * 2)
-  voidAreaHeight = height - (perimeter * 2)
-
-  divisionTotalThicknessHorizontal = divisionThickness * openingCountHorizontal - divisionThickness
-  divisionTotalThicknessVertical = divisionThickness * openingCountVertical - divisionThickness
-  voidWidth = (voidAreaWidth - divisionTotalThicknessHorizontal) / openingCountHorizontal
-  voidHeight = (voidAreaHeight - divisionTotalThicknessVertical) / openingCountVertical
-
-  voidStepHorizontal = voidWidth + divisionThickness
-  voidStepVertical = voidHeight + divisionThickness
-  voidPlane = startSketchOn(panelBody, face = END)
-  voidShape = startProfile(
-         voidPlane,
-         at = [
-           -voidAreaWidth / 2,
-           -voidAreaHeight / 2
-         ],
-       )
-    |> yLine(length = voidHeight)
-    |> xLine(length = voidWidth)
-    |> yLine(length = -voidHeight)
-    |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-    |> close()
-    |> patternLinear2d(
-         %,
-         instances = openingCountHorizontal,
-         distance = voidStepHorizontal,
-         axis = [1, 0],
-       )
-    |> patternLinear2d(
-         %,
-         instances = openingCountVertical,
-         distance = voidStepVertical,
-         axis = [0, 1],
-       )
-  voidBody = extrude(voidShape, length = -depth)
-    |> appearance(color = "#a55e2c")
-  return panelBody
-}
-
-// Create main window frame
-frame = panelFn(
-  plane = XZ,
-  offset = -frameDepth / 2,
-  width = windowWidth,
-  height = windowHeight,
-  depth = frameDepth,
-  perimeter = frameWidth,
-  divisionThickness = 10,
-  openingCountHorizontal = 1,
-  openingCountVertical = 1,
-)
-
-// Create bottom sliding sash
-bottomSash = panelFn(
-       plane = XZ,
-       offset = (frameDepth / 2 - sashDepth) / 2,
-       width = sashWidth,
-       height = sashHeight,
-       depth = sashDepth,
-       perimeter = frameWidth,
-       divisionThickness = 10,
-       openingCountHorizontal = sashOpeningCountHorizontal,
-       openingCountVertical = sashOpeningCountVertical,
-     )
-  |> translate(
-       %,
-       x = 0,
-       y = 0,
-       z = frameWidth / 2 - (sashHeight / 2),
-     )
-  |> translate(
-       %,
-       x = 0,
-       y = 0,
-       z = sashTravelDistance,
-     ) // open / close
-
-  // Latch mechanism on bottom sash
-// Create latch plate
-latchPlateWidth = 13
-latchPlateLength = 30
-latchPlateThickness = 1
-
-latchPlatePlane = startSketchOn(offsetPlane(XY, offset = frameWidth / 2))
-latchPlateShape = startProfile(
-       latchPlatePlane,
-       at = [
-         -latchPlateLength / 2,
-         -latchPlateWidth / 2
-       ],
-     )
-  |> yLine(length = latchPlateWidth)
-  |> xLine(length = latchPlateLength)
-  |> yLine(length = -latchPlateWidth)
-  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-  |> close()
-latchPlateBody = extrude(latchPlateShape, length = latchPlateThickness)
-  |> translate(
-       %,
-       x = 0,
-       y = -frameDepth / 4,
-       z = 0,
-     )
-  |> translate(
-       %,
-       x = 0,
-       y = 0,
-       z = sashTravelDistance,
-     ) // open / close
-
-// Create latch cylinder
-latchCylinderHeight = 5
-latchCylinderPlane = startSketchOn(offsetPlane(latchPlatePlane, offset = latchPlateThickness))
-latchCylinderShape = startProfile(latchCylinderPlane, at = [40, -1])
-  |> xLine(length = -35)
-  |> arc(interiorAbsolute = [-5, 0], endAbsolute = [5, 1])
-  |> xLine(length = 35)
-  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-  |> close()
-latchCylinderBody = extrude(latchCylinderShape, length = latchCylinderHeight)
-  |> translate(
-       %,
-       x = 0,
-       y = -frameDepth / 4,
-       z = 0,
-     )
-  |> translate(
-       %,
-       x = 0,
-       y = 0,
-       z = sashTravelDistance,
-     ) // open / close
-  |> rotate(
-       %,
-       roll = 0,
-       pitch = 0,
-       yaw = -90 * windowState,
-     )
-
-// Create top fixed sash
-topSash = panelFn(
-       plane = XZ,
-       offset = -(frameDepth / 2 - sashDepth) / 2 - sashDepth,
-       width = sashWidth,
-       height = sashHeight,
-       depth = sashDepth,
-       perimeter = frameWidth,
-       divisionThickness = 10,
-       openingCountHorizontal = sashOpeningCountHorizontal,
-       openingCountVertical = sashOpeningCountVertical,
-     )
-  |> translate(
-       %,
-       x = 0,
-       y = 0,
-       z = sashHeight / 2 - (frameWidth / 2),
-     )
-
-// Create latch nut on the top sash
-latchNutPlane = startSketchOn(XZ)
-latchNutShape = startProfile(
-       latchNutPlane,
-       at = [
-         -latchPlateLength / 2,
-         -latchPlateWidth / 2
-       ],
-     )
-  |> yLine(length = latchPlateWidth)
-  |> xLine(length = latchPlateLength)
-  |> yLine(length = -latchPlateWidth)
-  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-  |> close()
-latchNutPlateBody = extrude(latchNutShape, length = latchPlateThickness)

public/kcl-samples/shepherds-hook-bolt/main.kcl

@@ -1,89 +0,0 @@
-// Shepherd’s Hook Bolt
-// A bent bolt with a curved hook, typically used for hanging or anchoring loads. The threaded end allows secure attachment to surfaces or materials, while the curved hook resists pull-out under tension.
-
-// Set units in millimeters (mm)
-@settings(defaultLengthUnit = mm, kclVersion = 1.0)
-
-// Define bolt geometry parameters
-boltDiameter = 5
-hookRadius = 12
-shankLength = 5
-threadedEndLength = 30
-nutDistance = 20
-hookStartAngle = 290
-hookEndAngle = 150
-
-approximatePitch = boltDiameter * 0.15
-threadDepth = 0.6134 * approximatePitch
-innerRadius = boltDiameter / 2 - threadDepth
-boltNumberOfRevolutions = threadedEndLength / approximatePitch
-
-// Helper values for computing geometry transitions between straight shaft and hook arc
-hypotenuse = hookRadius / cos(hookStartAngle - 270)
-side = sqrt(pow(hypotenuse, exp = 2) - pow(hookRadius, exp = 2))
-shankOffset = hypotenuse + side
-
-// Converts polar coordinates to cartesian points for drawing arcs
-fn polarToCartesian(radius, angle) {
-  x = radius * cos(angle)
-  y = radius * sin(angle)
-  return [x, y]
-}
-
-// Create the hook and shank profile path
-// Includes straight segment and two connected arcs forming the hook
-hookProfilePlane = startSketchOn(XZ)
-hookProfileShape = startProfile(hookProfilePlane, at = [0, -shankOffset - shankLength])
-  |> line(endAbsolute = [0, -shankOffset])
-  |> tangentialArc(endAbsolute = polarToCartesian(radius = hookRadius, angle = hookStartAngle))
-  |> tangentialArc(endAbsolute = polarToCartesian(radius = hookRadius, angle = hookEndAngle), tag = $hook)
-
-// Create the circular cross-section used for sweeping along the hook path
-hookSectionPlane = offsetPlane(XY, offset = -shankOffset - shankLength)
-hookSectionShape = circle(hookSectionPlane, center = [0, 0], radius = boltDiameter / 2)
-
-// Sweep the section along the hook profile to form the main body of the hook bolt
-hookBody = sweep(hookSectionShape, path = hookProfileShape, sectional = true)
-
-// Add a cylindrical tip at the hook end
-tipPlane = startSketchOn(hookBody, face = END)
-tipShape = circle(
-  tipPlane,
-  center = [hookRadius, 0],
-  radius = boltDiameter / 2,
-  tag = $seg01,
-)
-tipBody = extrude(
-       tipShape,
-       length = hookRadius * 0.5,
-       tagStart = $startTag,
-       tagEnd = $capEnd001,
-     )
-  |> fillet(
-       radius = boltDiameter / 4,
-       tags = [
-         getCommonEdge(faces = [seg01, capEnd001])
-       ],
-     )
-
-  // Create the threaded end of the bolt
-
-// Construct the triangular profile for thread cutting
-boltThreadSectionPlane = startSketchOn(XZ)
-boltThreadSectionShapeForRevolve = startProfile(
-       boltThreadSectionPlane,
-       at = [
-         innerRadius,
-         -shankOffset - shankLength - threadedEndLength
-       ],
-     )
-  |> line(end = [threadDepth, approximatePitch / 2])
-  |> line(end = [-threadDepth, approximatePitch / 2])
-  |> patternLinear2d(axis = [0, 1], instances = boltNumberOfRevolutions, distance = approximatePitch)
-  |> xLine(length = -innerRadius * 0.9)
-  |> yLine(length = -threadedEndLength)
-  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-  |> close()
-
-// Create a revolved solid representing the thread geometry by repeating and revolving the profile around the shaft
-boltThreadRevolve = revolve(boltThreadSectionShapeForRevolve, angle = 360, axis = Y)

public/kcl-samples/spinning-highrise-tower/main.kcl

@@ -1,93 +0,0 @@
-// Spinning Highrise Tower
-// A conceptual high-rise tower with a central core and rotating floor slabs, demonstrating dynamic form through vertical repetition and transformation
-
-
-
-
-@settings(defaultLengthUnit = m, kclVersion = 1.0)
-
-// Define global parameters for floor geometry and building layout
-floorCount = 17
-floorHeight = 5
-slabWidth = 30
-slabThickness = 0.5
-rotationAngleStep = 5
-handrailHeight = 1.2
-handrailThickness = 0.3
-balconyDepth = 3
-
-// Calculate facade and core geometry from parameters
-facadeWidth = slabWidth - (balconyDepth * 2)
-facadeHeight = floorHeight - slabThickness
-coreHeight = floorCount * floorHeight - slabThickness
-frameSide = 0.1
-windowTargetWidth = 6
-windowTargetCount = facadeWidth / windowTargetWidth
-windowCount = round(windowTargetCount)
-windowWidth = facadeWidth / windowCount
-
-// Helper function: Creates a box from a center plane with given width and height
-fn boxFn(plane, width, height) {
-  shape = startSketchOn(plane)
-    |> startProfile(%, at = [-width / 2, -width / 2])
-    |> line(%, end = [0, width])
-    |> line(%, end = [width, 0])
-    |> line(%, end = [0, -width])
-    |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-    |> close(%)
-  body = extrude(shape, length = height)
-  return body
-}
-
-// Helper function: Defines transformation (translation and rotation) for each floor
-fn transformFn(@i) {
-  return {
-    translate = [0, 0, i * floorHeight],
-    rotation = { angle = rotationAngleStep * i }
-  }
-}
-
-// Create building base
-baseThickness = 0.2
-baseSlab = boxFn(plane = XY, width = slabWidth, height = -baseThickness)
-  |> appearance(%, color = "#dbd7d2")
-
-// Create ground platform beneath the base
-goundSize = 50
-groundBody = boxFn(plane = offsetPlane(XY, offset = -baseThickness), width = goundSize, height = -5)
-  |> appearance(%, color = "#3a3631")
-
-// Create a single slab with handrail height to be reused with pattern
-slabAndHandrailGeometry = boxFn(plane = offsetPlane(XY, offset = floorHeight - slabThickness), width = slabWidth, height = slabThickness + handrailHeight)
-slabVoidStart = -slabWidth / 2 + handrailThickness
-slabVoidWidth = slabWidth - (handrailThickness * 2)
-slabVoidShape = startSketchOn(slabAndHandrailGeometry, face = END)
-  |> startProfile(%, at = [slabVoidStart, slabVoidStart])
-  |> line(%, end = [0, slabVoidWidth])
-  |> line(%, end = [slabVoidWidth, 0])
-  |> line(%, end = [0, -slabVoidWidth])
-  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-  |> close(%)
-
-// Generate and pattern slabs with voids across all floors
-slabBody = extrude(slabVoidShape, length = -handrailHeight)
-  |> patternTransform(instances = floorCount, transform = transformFn)
-  |> appearance(%, color = "#dbd7d2")
-
-// Create structural core of the tower
-coreLength = 10
-coreWidth = 8
-core = startSketchOn(XY)
-  |> startProfile(%, at = [-coreLength / 2, -coreWidth / 2])
-  |> line(%, end = [0, coreWidth])
-  |> line(%, end = [coreLength, 0])
-  |> line(%, end = [-0.22, -coreWidth])
-  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-  |> close(%)
-  |> extrude(%, length = coreHeight)
-
-// Create facade panels for each floor
-facadeStart = facadeWidth / 2
-facadeGeometry = boxFn(plane = XY, width = facadeWidth, height = facadeHeight)
-  |> patternTransform(instances = floorCount, transform = transformFn)
-  |> appearance(%, color = "#151819")

public/kcl-samples/thermal-block-insert/main.kcl

@@ -1,61 +0,0 @@
-// Thermal Block Insert
-// Interlocking insulation insert for masonry walls, designed with a tongue-and-groove profile for modular alignment and thermal efficiency
-
-// Set units in millimeters (mm)
-@settings(defaultLengthUnit = mm, kclVersion = 1.0)
-
-// Define overall dimensions of the insert block
-insertLength = 400
-insertHeight = 200
-insertThickness = 50
-
-// Define tongue-and-groove profile parameters for interlocking geometry
-setbackFactor = 0.25 // spacing between tongues
-tongueTargetCount = insertLength / 80
-tongueCount = round(tongueTargetCount)
-tongueLength = insertLength / (tongueCount * (1 + setbackFactor * 2) + 1)
-tongueGap = tongueLength * setbackFactor * 2
-tongueStep = tongueLength + tongueGap
-tongueDepth = tongueLength * 0.5
-tongueSetback = tongueLength * setbackFactor
-
-// Function to create one side of the repeating tongue geometry along the block edge
-fn tongueBlockFn() {
-  tongueSingleBlock = xLine(length = tongueLength)
-    |> line(end = [-tongueSetback, tongueDepth])
-    |> xLine(length = tongueLength)
-    |> line(end = [-tongueSetback, -tongueDepth])
-    |> patternLinear2d(
-         %,
-         instances = tongueCount,
-         distance = tongueStep,
-         axis = [1, 0],
-       )
-    |> xLine(length = tongueLength)
-  return tongueSingleBlock
-}
-
-// Create top-side profile with tongues
-tongueShape = startSketchOn(XY)
-  |> startProfile(%, at = [-insertLength / 2, insertThickness / 2])
-  |> tongueBlockFn()
-  |> yLine(length = -insertThickness / 2)
-  |> xLine(length = -insertLength)
-  |> close(%)
-
-// Create bottom-side profile with grooves (inverse of tongue)
-grooveShape = startSketchOn(XY)
-  |> startProfile(
-       %,
-       at = [
-         -insertLength / 2,
-         -insertThickness / 2 - tongueDepth
-       ],
-     )
-  |> tongueBlockFn()
-  |> yLine(length = insertThickness / 2 + tongueDepth)
-  |> xLine(length = -insertLength)
-  |> close(%)
-
-// Extrude both tongue and groove profiles to form the final thermal insert block
-insertShape = extrude([tongueShape, grooveShape], length = insertHeight)

rust/Cargo.lock

@@ -1815,7 +1815,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-bumper"
-version = "0.1.74"
+version = "0.1.73"
 dependencies = [
  "anyhow",
  "clap",
@@ -1826,7 +1826,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-derive-docs"
-version = "0.1.74"
+version = "0.1.73"
 dependencies = [
  "Inflector",
  "anyhow",
@@ -1845,9 +1845,8 @@ dependencies = [
 
 [[package]]
 name = "kcl-directory-test-macro"
-version = "0.1.74"
+version = "0.1.73"
 dependencies = [
- "convert_case",
  "proc-macro2",
  "quote",
  "syn 2.0.100",
@@ -1855,7 +1854,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-language-server"
-version = "0.2.74"
+version = "0.2.73"
 dependencies = [
  "anyhow",
  "clap",
@@ -1876,7 +1875,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-language-server-release"
-version = "0.1.74"
+version = "0.1.73"
 dependencies = [
  "anyhow",
  "clap",
@@ -1896,7 +1895,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-lib"
-version = "0.2.74"
+version = "0.2.73"
 dependencies = [
  "anyhow",
  "approx 0.5.1",
@@ -1935,7 +1934,6 @@ dependencies = [
  "measurements",
  "miette",
  "mime_guess",
- "nalgebra-glm",
  "parse-display 0.10.0",
  "pretty_assertions",
  "pyo3",
@@ -1973,7 +1971,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-python-bindings"
-version = "0.3.74"
+version = "0.3.73"
 dependencies = [
  "anyhow",
  "kcl-lib",
@@ -1988,7 +1986,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-test-server"
-version = "0.1.74"
+version = "0.1.73"
 dependencies = [
  "anyhow",
  "hyper 0.14.32",
@@ -2001,7 +1999,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-to-core"
-version = "0.1.74"
+version = "0.1.73"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2015,7 +2013,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-wasm-lib"
-version = "0.1.74"
+version = "0.1.73"
 dependencies = [
  "anyhow",
  "bson",
@@ -2255,16 +2253,6 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "matrixmultiply"
-version = "0.3.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06de3016e9fae57a36fd14dba131fccf49f74b40b7fbdb472f96e361ec71a08"
-dependencies = [
- "autocfg",
- "rawpointer",
-]
-
 [[package]]
 name = "measurements"
 version = "0.11.0"
@@ -2385,33 +2373,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "nalgebra"
-version = "0.33.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26aecdf64b707efd1310e3544d709c5c0ac61c13756046aaaba41be5c4f66a3b"
-dependencies = [
- "approx 0.5.1",
- "matrixmultiply",
- "num-complex",
- "num-rational",
- "num-traits 0.2.19",
- "simba",
- "typenum",
-]
-
-[[package]]
-name = "nalgebra-glm"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e441f43bccdf40cb6bd4294321e6983c5bc7b9886112d19fd4c9813976b117e4"
-dependencies = [
- "approx 0.5.1",
- "nalgebra",
- "num-traits 0.2.19",
- "simba",
-]
-
 [[package]]
 name = "newline-converter"
 version = "0.3.0"
@@ -2451,15 +2412,6 @@ dependencies = [
  "num-traits 0.2.19",
 ]
 
-[[package]]
-name = "num-complex"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
-dependencies = [
- "num-traits 0.2.19",
-]
-
 [[package]]
 name = "num-conv"
 version = "0.1.0"
@@ -2490,17 +2442,6 @@ dependencies = [
  "num-modular",
 ]
 
-[[package]]
-name = "num-rational"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
-dependencies = [
- "num-bigint",
- "num-integer",
- "num-traits 0.2.19",
-]
-
 [[package]]
 name = "num-traits"
 version = "0.1.43"
@@ -2654,12 +2595,6 @@ dependencies = [
  "syn 2.0.100",
 ]
 
-[[package]]
-name = "paste"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
-
 [[package]]
 name = "pbkdf2"
 version = "0.12.2"
@@ -3158,12 +3093,6 @@ dependencies = [
  "getrandom 0.3.1",
 ]
 
-[[package]]
-name = "rawpointer"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
-
 [[package]]
 name = "rayon"
 version = "1.10.0"
@@ -3447,15 +3376,6 @@ version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
-[[package]]
-name = "safe_arch"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96b02de82ddbe1b636e6170c21be622223aea188ef2e139be0a5b219ec215323"
-dependencies = [
- "bytemuck",
-]
-
 [[package]]
 name = "same-file"
 version = "1.0.6"
@@ -3711,19 +3631,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "simba"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3a386a501cd104797982c15ae17aafe8b9261315b5d07e3ec803f2ea26be0fa"
-dependencies = [
- "approx 0.5.1",
- "num-complex",
- "num-traits 0.2.19",
- "paste",
- "wide",
-]
-
 [[package]]
 name = "simd-adler32"
 version = "0.3.7"
@@ -4824,16 +4731,6 @@ dependencies = [
  "rustls-pki-types",
 ]
 
-[[package]]
-name = "wide"
-version = "0.7.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41b5576b9a81633f3e8df296ce0063042a73507636cbe956c61133dd7034ab22"
-dependencies = [
- "bytemuck",
- "safe_arch",
-]
-
 [[package]]
 name = "winapi"
 version = "0.3.9"

rust/kcl-bumper/Cargo.toml

@@ -1,7 +1,7 @@
 
 [package]
 name = "kcl-bumper"
-version = "0.1.74"
+version = "0.1.73"
 edition = "2021"
 repository = "https://github.com/KittyCAD/modeling-api"
 rust-version = "1.76"

rust/kcl-derive-docs/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "kcl-derive-docs"
 description = "A tool for generating documentation from Rust derive macros"
-version = "0.1.74"
+version = "0.1.73"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/KittyCAD/modeling-app"

rust/kcl-directory-test-macro/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "kcl-directory-test-macro"
 description = "A tool for generating tests from a directory of kcl files"
-version = "0.1.74"
+version = "0.1.73"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/KittyCAD/modeling-app"
@@ -11,7 +11,6 @@ proc-macro = true
 bench = false
 
 [dependencies]
-convert_case = "0.8.0"
 proc-macro2 = "1"
 quote = "1"
 syn = { version = "2.0.96", features = ["full"] }

rust/kcl-directory-test-macro/src/lib.rs

@@ -1,13 +1,10 @@
 use std::fs;
 
-use convert_case::Casing;
 use proc_macro::TokenStream;
 use quote::{format_ident, quote};
 use syn::{parse_macro_input, LitStr};
 
 /// A macro that generates test functions for each directory within a given path.
-/// To be included the test directory must have a main.kcl file.
-/// This will also recursively search for directories within the given path.
 ///
 /// # Example
 ///
@@ -48,11 +45,7 @@ pub fn test_all_dirs(attr: TokenStream, item: TokenStream) -> TokenStream {
 
     // Generate a test function for each directory
     let test_fns = dirs.iter().map(|(dir_name, dir_path)| {
-        let relative_path = dir_path
-            .strip_prefix(&path.to_string_lossy().to_string())
-            .unwrap()
-            .trim();
-        let test_fn_name = format_ident!("{}_{}", fn_name, sanitize_dir_name(relative_path));
+        let test_fn_name = format_ident!("{}_{}", fn_name, sanitize_dir_name(dir_name));
         let dir_name_str = dir_name.clone();
         let dir_path_str = dir_path.clone();
 
@@ -82,26 +75,16 @@ fn get_all_directories(path: &std::path::Path) -> Result<Vec<(String, String)>,
 
     for entry in fs::read_dir(path)? {
         let entry = entry?;
-        let new_path = entry.path();
+        let path = entry.path();
 
-        if new_path.is_dir()
-            && !IGNORE_DIRS.contains(&new_path.file_name().and_then(|name| name.to_str()).unwrap_or(""))
-        {
-            // Check if the directory contains a main.kcl file.
-            let main_kcl_path = new_path.join("main.kcl");
-            if !main_kcl_path.exists() {
-                // Recurse into the directory.
-                let sub_dirs = get_all_directories(&new_path)?;
-                dirs.extend(sub_dirs);
-                continue;
-            }
-            let dir_name = new_path
+        if path.is_dir() && !IGNORE_DIRS.contains(&path.file_name().and_then(|name| name.to_str()).unwrap_or("")) {
+            let dir_name = path
                 .file_name()
                 .and_then(|name| name.to_str())
                 .unwrap_or("unknown")
                 .to_string();
 
-            let dir_path = new_path.to_str().unwrap_or("unknown").to_string();
+            let dir_path = path.to_str().unwrap_or("unknown").to_string();
 
             dirs.push((dir_name, dir_path));
         }
@@ -112,9 +95,10 @@ fn get_all_directories(path: &std::path::Path) -> Result<Vec<(String, String)>,
 
 /// Sanitize directory name to create a valid Rust identifier
 fn sanitize_dir_name(name: &str) -> String {
-    let binding = name
-        .replace(|c: char| !c.is_ascii_alphanumeric() && c != '_', "_")
-        .replace("/", "_");
-    let name = binding.trim_start_matches('_').to_string();
-    name.to_case(convert_case::Case::Snake)
+    let name = name.replace(|c: char| !c.is_ascii_alphanumeric() && c != '_', "_");
+    if name.chars().next().is_some_and(|c| c.is_numeric()) {
+        format!("d_{}", name)
+    } else {
+        name
+    }
 }

rust/kcl-language-server-release/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "kcl-language-server-release"
-version = "0.1.74"
+version = "0.1.73"
 edition = "2021"
 authors = ["KittyCAD Inc <kcl@kittycad.io>"]
 publish = false

rust/kcl-language-server/Cargo.toml

@@ -2,7 +2,7 @@
 name = "kcl-language-server"
 description = "A language server for KCL."
 authors = ["KittyCAD Inc <kcl@kittycad.io>"]
-version = "0.2.74"
+version = "0.2.73"
 edition = "2021"
 license = "MIT"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

rust/kcl-lib/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "kcl-lib"
 description = "KittyCAD Language implementation and tools"
-version = "0.2.74"
+version = "0.2.73"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/KittyCAD/modeling-app"
@@ -50,7 +50,6 @@ lazy_static = { workspace = true }
 measurements = "0.11.0"
 miette = { workspace = true }
 mime_guess = "2.0.5"
-nalgebra-glm = "0.19.0"
 parse-display = "0.10.0"
 pyo3 = { workspace = true, optional = true }
 regex = "1.11.1"

rust/kcl-lib/e2e/executor/cache.rs

@@ -1,7 +1,5 @@
 //! Cache testing framework.
 
-#[cfg(feature = "artifact-graph")]
-use kcl_lib::NodePathStep;
 use kcl_lib::{bust_cache, ExecError, ExecOutcome};
 use kcmc::{each_cmd as mcmd, ModelingCmd};
 use kittycad_modeling_cmds as kcmc;
@@ -332,40 +330,6 @@ extrude001 = extrude(profile001, length = 4)
     }
 }
 
-#[cfg(feature = "artifact-graph")]
-#[tokio::test(flavor = "multi_thread")]
-async fn kcl_test_cache_add_offset_plane_computes_node_path() {
-    let code = r#"sketch001 = startSketchOn(XY)
-profile001 = startProfile(sketch001, at = [0, 0])
-"#;
-    let code_with_more = code.to_owned()
-        + r#"plane001 = offsetPlane(XY, offset = 500)
-"#;
-
-    let result = cache_test(
-        "add_offset_plane_preserves_artifact_commands",
-        vec![
-            Variation {
-                code,
-                other_files: vec![],
-                settings: &Default::default(),
-            },
-            Variation {
-                code: code_with_more.as_str(),
-                other_files: vec![],
-                settings: &Default::default(),
-            },
-        ],
-    )
-    .await;
-
-    let second = &result.last().unwrap().2;
-
-    let v = second.artifact_graph.values().collect::<Vec<_>>();
-    let path_step = &v[2].code_ref().unwrap().node_path.steps[0];
-    assert_eq!(*path_step, NodePathStep::ProgramBodyItem { index: 2 });
-}
-
 #[tokio::test(flavor = "multi_thread")]
 async fn kcl_test_cache_empty_file_pop_cache_empty_file_planes_work() {
     // Get the current working directory.

rust/kcl-lib/src/docs/mod.rs

@@ -995,7 +995,7 @@ mod tests {
         let snippet = pattern_fn.to_autocomplete_snippet().unwrap();
         assert_eq!(
             snippet,
-            r#"patternCircular3d(${0:%}, instances = ${1:10}, axis = [${2:3.14}, ${3:3.14}, ${4:3.14}], center = [${5:3.14}, ${6:3.14}, ${7:3.14}])"#
+            r#"patternCircular3d(${0:%}, instances = ${1:10}, axis = [${2:3.14}, ${3:3.14}, ${4:3.14}], center = [${5:3.14}, ${6:3.14}, ${7:3.14}], arcDegrees = ${8:3.14}, rotateDuplicates = ${9:false})"#
         );
     }
 

rust/kcl-lib/src/errors.rs

@@ -129,7 +129,6 @@ impl From<KclErrorWithOutputs> for KclError {
 #[serde(rename_all = "camelCase")]
 pub struct KclErrorWithOutputs {
     pub error: KclError,
-    pub non_fatal: Vec<CompilationError>,
     #[cfg(feature = "artifact-graph")]
     pub operations: Vec<Operation>,
     #[cfg(feature = "artifact-graph")]
@@ -142,10 +141,8 @@ pub struct KclErrorWithOutputs {
 }
 
 impl KclErrorWithOutputs {
-    #[allow(clippy::too_many_arguments)]
     pub fn new(
         error: KclError,
-        non_fatal: Vec<CompilationError>,
         #[cfg(feature = "artifact-graph")] operations: Vec<Operation>,
         #[cfg(feature = "artifact-graph")] artifact_commands: Vec<ArtifactCommand>,
         #[cfg(feature = "artifact-graph")] artifact_graph: ArtifactGraph,
@@ -155,7 +152,6 @@ impl KclErrorWithOutputs {
     ) -> Self {
         Self {
             error,
-            non_fatal,
             #[cfg(feature = "artifact-graph")]
             operations,
             #[cfg(feature = "artifact-graph")]
@@ -170,7 +166,6 @@ impl KclErrorWithOutputs {
     pub fn no_outputs(error: KclError) -> Self {
         Self {
             error,
-            non_fatal: Default::default(),
             #[cfg(feature = "artifact-graph")]
             operations: Default::default(),
             #[cfg(feature = "artifact-graph")]

rust/kcl-lib/src/execution/artifact.rs

@@ -2,17 +2,18 @@ use fnv::FnvHashMap;
 use indexmap::IndexMap;
 use kittycad_modeling_cmds::{
     self as kcmc,
+    id::ModelingCmdId,
     ok_response::OkModelingCmdResponse,
     shared::ExtrusionFaceCapType,
     websocket::{BatchResponse, OkWebSocketResponseData, WebSocketResponse},
     EnableSketchMode, ModelingCmd,
 };
+use schemars::JsonSchema;
 use serde::{ser::SerializeSeq, Serialize};
 use uuid::Uuid;
 
 use crate::{
     errors::KclErrorDetails,
-    execution::ArtifactId,
     parsing::ast::types::{Node, Program},
     KclError, NodePath, SourceRange,
 };
@@ -57,6 +58,52 @@ impl PartialOrd for ArtifactCommand {
     }
 }
 
+#[derive(Debug, Clone, Copy, Serialize, PartialEq, Eq, Ord, PartialOrd, Hash, ts_rs::TS, JsonSchema)]
+#[ts(export_to = "Artifact.ts")]
+pub struct ArtifactId(Uuid);
+
+impl ArtifactId {
+    pub fn new(uuid: Uuid) -> Self {
+        Self(uuid)
+    }
+}
+
+impl From<Uuid> for ArtifactId {
+    fn from(uuid: Uuid) -> Self {
+        Self::new(uuid)
+    }
+}
+
+impl From<&Uuid> for ArtifactId {
+    fn from(uuid: &Uuid) -> Self {
+        Self::new(*uuid)
+    }
+}
+
+impl From<ArtifactId> for Uuid {
+    fn from(id: ArtifactId) -> Self {
+        id.0
+    }
+}
+
+impl From<&ArtifactId> for Uuid {
+    fn from(id: &ArtifactId) -> Self {
+        id.0
+    }
+}
+
+impl From<ModelingCmdId> for ArtifactId {
+    fn from(id: ModelingCmdId) -> Self {
+        Self::new(*id.as_ref())
+    }
+}
+
+impl From<&ModelingCmdId> for ArtifactId {
+    fn from(id: &ModelingCmdId) -> Self {
+        Self::new(*id.as_ref())
+    }
+}
+
 pub type DummyPathToNode = Vec<()>;
 
 fn serialize_dummy_path_to_node<S>(_path_to_node: &DummyPathToNode, serializer: S) -> Result<S::Ok, S::Error>
@@ -703,7 +750,6 @@ pub(super) fn build_artifact_graph(
     artifact_commands: &[ArtifactCommand],
     responses: &IndexMap<Uuid, WebSocketResponse>,
     ast: &Node<Program>,
-    cached_body_items: usize,
     exec_artifacts: &mut IndexMap<ArtifactId, Artifact>,
     initial_graph: ArtifactGraph,
 ) -> Result<ArtifactGraph, KclError> {
@@ -717,7 +763,7 @@ pub(super) fn build_artifact_graph(
     for exec_artifact in exec_artifacts.values_mut() {
         // Note: We only have access to the new AST. So if these artifacts
         // somehow came from cached AST, this won't fill in anything.
-        fill_in_node_paths(exec_artifact, ast, cached_body_items);
+        fill_in_node_paths(exec_artifact, ast);
     }
 
     for artifact_command in artifact_commands {
@@ -744,7 +790,6 @@ pub(super) fn build_artifact_graph(
             &flattened_responses,
             &path_to_plane_id_map,
             ast,
-            cached_body_items,
             exec_artifacts,
         )?;
         for artifact in artifact_updates {
@@ -762,18 +807,16 @@ pub(super) fn build_artifact_graph(
 
 /// These may have been created with placeholder `CodeRef`s because we didn't
 /// have the entire AST available. Now we fill them in.
-fn fill_in_node_paths(artifact: &mut Artifact, program: &Node<Program>, cached_body_items: usize) {
+fn fill_in_node_paths(artifact: &mut Artifact, program: &Node<Program>) {
     match artifact {
         Artifact::StartSketchOnFace(face) => {
             if face.code_ref.node_path.is_empty() {
-                face.code_ref.node_path =
-                    NodePath::from_range(program, cached_body_items, face.code_ref.range).unwrap_or_default();
+                face.code_ref.node_path = NodePath::from_range(program, face.code_ref.range).unwrap_or_default();
             }
         }
         Artifact::StartSketchOnPlane(plane) => {
             if plane.code_ref.node_path.is_empty() {
-                plane.code_ref.node_path =
-                    NodePath::from_range(program, cached_body_items, plane.code_ref.range).unwrap_or_default();
+                plane.code_ref.node_path = NodePath::from_range(program, plane.code_ref.range).unwrap_or_default();
             }
         }
         _ => {}
@@ -862,7 +905,6 @@ fn artifacts_to_update(
     responses: &FnvHashMap<Uuid, OkModelingCmdResponse>,
     path_to_plane_id_map: &FnvHashMap<Uuid, Uuid>,
     ast: &Node<Program>,
-    cached_body_items: usize,
     exec_artifacts: &IndexMap<ArtifactId, Artifact>,
 ) -> Result<Vec<Artifact>, KclError> {
     let uuid = artifact_command.cmd_id;
@@ -876,7 +918,7 @@ fn artifacts_to_update(
     // correct value based on NodePath.
     let path_to_node = Vec::new();
     let range = artifact_command.range;
-    let node_path = NodePath::from_range(ast, cached_body_items, range).unwrap_or_default();
+    let node_path = NodePath::from_range(ast, range).unwrap_or_default();
     let code_ref = CodeRef {
         range,
         node_path,

rust/kcl-lib/src/execution/artifact/mermaid_tests.rs

@@ -308,11 +308,6 @@ impl ArtifactGraph {
             // a child of the line above it.
             let label = label.unwrap_or("");
             if code_ref.node_path.is_empty() {
-                if !code_ref.range.module_id().is_top_level() {
-                    // This is pointing to another module. We don't care about
-                    // these. It's okay that it's missing, for now.
-                    return Ok(());
-                }
                 return writeln!(output, "{prefix}  %% {label}Missing NodePath");
             }
             writeln!(output, "{prefix}  %% {label}{:?}", code_ref.node_path.steps)

rust/kcl-lib/src/execution/cache.rs

@@ -79,9 +79,6 @@ pub(super) enum CacheResult {
         reapply_settings: bool,
         /// The program that needs to be executed.
         program: Node<Program>,
-        /// The number of body items that were cached and omitted from the
-        /// program that needs to be executed. Used to compute [`crate::NodePath`].
-        cached_body_items: usize,
     },
     /// Check only the imports, and not the main program.
     /// Before sending this we already checked the main program and it is the same.
@@ -194,7 +191,6 @@ pub(super) async fn get_changed_program(old: CacheInformation<'_>, new: CacheInf
             clear_scene: true,
             reapply_settings: true,
             program: new.ast.clone(),
-            cached_body_items: 0,
         };
     }
 
@@ -223,7 +219,6 @@ fn generate_changed_program(old_ast: Node<Program>, mut new_ast: Node<Program>,
             clear_scene: true,
             reapply_settings,
             program: new_ast,
-            cached_body_items: 0,
         };
     }
 
@@ -244,7 +239,6 @@ fn generate_changed_program(old_ast: Node<Program>, mut new_ast: Node<Program>,
                 clear_scene: true,
                 reapply_settings,
                 program: new_ast,
-                cached_body_items: 0,
             }
         }
         std::cmp::Ordering::Greater => {
@@ -261,7 +255,6 @@ fn generate_changed_program(old_ast: Node<Program>, mut new_ast: Node<Program>,
                 clear_scene: false,
                 reapply_settings,
                 program: new_ast,
-                cached_body_items: old_ast.body.len(),
             }
         }
         std::cmp::Ordering::Equal => {
@@ -599,8 +592,7 @@ startSketchOn(XY)
             CacheResult::ReExecute {
                 clear_scene: true,
                 reapply_settings: true,
-                program: new_program.ast,
-                cached_body_items: 0,
+                program: new_program.ast
             }
         );
     }
@@ -638,8 +630,7 @@ startSketchOn(XY)
             CacheResult::ReExecute {
                 clear_scene: true,
                 reapply_settings: true,
-                program: new_program.ast,
-                cached_body_items: 0,
+                program: new_program.ast
             }
         );
     }

rust/kcl-lib/src/execution/cad_op.rs

@@ -3,7 +3,7 @@ use schemars::JsonSchema;
 use serde::Serialize;
 
 use super::{types::NumericType, ArtifactId, KclValue};
-use crate::{ModuleId, SourceRange};
+use crate::{docs::StdLibFn, ModuleId, SourceRange};
 
 /// A CAD modeling operation for display in the feature tree, AKA operations
 /// timeline.
@@ -13,6 +13,21 @@ use crate::{ModuleId, SourceRange};
 pub enum Operation {
     #[serde(rename_all = "camelCase")]
     StdLibCall {
+        /// The standard library function being called.
+        #[serde(flatten)]
+        std_lib_fn: StdLibFnRef,
+        /// The unlabeled argument to the function.
+        unlabeled_arg: Option<OpArg>,
+        /// The labeled keyword arguments to the function.
+        labeled_args: IndexMap<String, OpArg>,
+        /// The source range of the operation in the source code.
+        source_range: SourceRange,
+        /// True if the operation resulted in an error.
+        #[serde(default, skip_serializing_if = "is_false")]
+        is_error: bool,
+    },
+    #[serde(rename_all = "camelCase")]
+    KclStdLibCall {
         name: String,
         /// The unlabeled argument to the function.
         unlabeled_arg: Option<OpArg>,
@@ -42,12 +57,19 @@ impl PartialOrd for Operation {
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
         Some(match (self, other) {
             (Self::StdLibCall { source_range: a, .. }, Self::StdLibCall { source_range: b, .. }) => a.cmp(b),
+            (Self::StdLibCall { source_range: a, .. }, Self::KclStdLibCall { source_range: b, .. }) => a.cmp(b),
             (Self::StdLibCall { source_range: a, .. }, Self::GroupBegin { source_range: b, .. }) => a.cmp(b),
             (Self::StdLibCall { .. }, Self::GroupEnd) => std::cmp::Ordering::Less,
+            (Self::KclStdLibCall { source_range: a, .. }, Self::KclStdLibCall { source_range: b, .. }) => a.cmp(b),
+            (Self::KclStdLibCall { source_range: a, .. }, Self::StdLibCall { source_range: b, .. }) => a.cmp(b),
+            (Self::KclStdLibCall { source_range: a, .. }, Self::GroupBegin { source_range: b, .. }) => a.cmp(b),
+            (Self::KclStdLibCall { .. }, Self::GroupEnd) => std::cmp::Ordering::Less,
             (Self::GroupBegin { source_range: a, .. }, Self::GroupBegin { source_range: b, .. }) => a.cmp(b),
             (Self::GroupBegin { source_range: a, .. }, Self::StdLibCall { source_range: b, .. }) => a.cmp(b),
+            (Self::GroupBegin { source_range: a, .. }, Self::KclStdLibCall { source_range: b, .. }) => a.cmp(b),
             (Self::GroupBegin { .. }, Self::GroupEnd) => std::cmp::Ordering::Less,
             (Self::GroupEnd, Self::StdLibCall { .. }) => std::cmp::Ordering::Greater,
+            (Self::GroupEnd, Self::KclStdLibCall { .. }) => std::cmp::Ordering::Greater,
             (Self::GroupEnd, Self::GroupBegin { .. }) => std::cmp::Ordering::Greater,
             (Self::GroupEnd, Self::GroupEnd) => std::cmp::Ordering::Equal,
         })
@@ -59,6 +81,7 @@ impl Operation {
     pub(crate) fn set_std_lib_call_is_error(&mut self, is_err: bool) {
         match self {
             Self::StdLibCall { ref mut is_error, .. } => *is_error = is_err,
+            Self::KclStdLibCall { ref mut is_error, .. } => *is_error = is_err,
             Self::GroupBegin { .. } | Self::GroupEnd => {}
         }
     }
@@ -84,7 +107,6 @@ pub enum Group {
         labeled_args: IndexMap<String, OpArg>,
     },
     /// A whole-module import use.
-    #[allow(dead_code)]
     #[serde(rename_all = "camelCase")]
     ModuleInstance {
         /// The name of the module being used.
@@ -113,6 +135,54 @@ impl OpArg {
     }
 }
 
+/// A reference to a standard library function.  This exists to implement
+/// `PartialEq` and `Eq` for `Operation`.
+#[derive(Debug, Clone, Serialize, ts_rs::TS, JsonSchema)]
+#[ts(export_to = "Operation.ts")]
+#[serde(rename_all = "camelCase")]
+pub struct StdLibFnRef {
+    // The following doc comment gets inlined into Operation, overriding what's
+    // there, in the generated TS.  We serialize to its name.  Renaming the
+    // field to "name" allows it to match the other variant.
+    /// The standard library function being called.
+    #[serde(
+        rename = "name",
+        serialize_with = "std_lib_fn_name",
+        deserialize_with = "std_lib_fn_from_name"
+    )]
+    #[ts(type = "string", rename = "name")]
+    pub std_lib_fn: Box<dyn StdLibFn>,
+}
+
+impl StdLibFnRef {
+    pub(crate) fn new(std_lib_fn: Box<dyn StdLibFn>) -> Self {
+        Self { std_lib_fn }
+    }
+}
+
+impl From<&Box<dyn StdLibFn>> for StdLibFnRef {
+    fn from(std_lib_fn: &Box<dyn StdLibFn>) -> Self {
+        Self::new(std_lib_fn.clone())
+    }
+}
+
+impl PartialEq for StdLibFnRef {
+    fn eq(&self, other: &Self) -> bool {
+        self.std_lib_fn.name() == other.std_lib_fn.name()
+    }
+}
+
+impl Eq for StdLibFnRef {}
+
+#[expect(clippy::borrowed_box, reason = "Explicit Box is needed for serde")]
+fn std_lib_fn_name<S>(std_lib_fn: &Box<dyn StdLibFn>, serializer: S) -> Result<S::Ok, S::Error>
+where
+    S: serde::Serializer,
+{
+    let name = std_lib_fn.name();
+    serializer.serialize_str(&name)
+}
+
 fn is_false(b: &bool) -> bool {
     !*b
 }

rust/kcl-lib/src/execution/exec_ast.rs

@@ -1,32 +1,42 @@
 use std::collections::HashMap;
 
 use async_recursion::async_recursion;
+use indexmap::IndexMap;
 
+#[cfg(feature = "artifact-graph")]
+use crate::execution::cad_op::{Group, OpArg, OpKclValue, Operation};
 use crate::{
     errors::{KclError, KclErrorDetails},
     execution::{
         annotations,
-        fn_call::Args,
         kcl_value::{FunctionSource, TypeDef},
         memory,
         state::ModuleState,
         types::{NumericType, PrimitiveType, RuntimeType},
-        BodyType, EnvironmentRef, ExecState, ExecutorContext, KclValue, Metadata, PlaneType, StatementKind,
+        BodyType, EnvironmentRef, ExecState, ExecutorContext, KclValue, Metadata, PlaneType, TagEngineInfo,
         TagIdentifier,
     },
     fmt,
     modules::{ModuleId, ModulePath, ModuleRepr},
     parsing::ast::types::{
         Annotation, ArrayExpression, ArrayRangeExpression, AscribedExpression, BinaryExpression, BinaryOperator,
-        BinaryPart, BodyItem, Expr, IfExpression, ImportPath, ImportSelector, ItemVisibility, LiteralIdentifier,
-        LiteralValue, MemberExpression, MemberObject, Name, Node, NodeRef, ObjectExpression, PipeExpression, Program,
-        TagDeclarator, Type, UnaryExpression, UnaryOperator,
+        BinaryPart, BodyItem, CallExpressionKw, Expr, FunctionExpression, IfExpression, ImportPath, ImportSelector,
+        ItemVisibility, LiteralIdentifier, LiteralValue, MemberExpression, MemberObject, Name, Node, NodeRef,
+        ObjectExpression, PipeExpression, Program, TagDeclarator, Type, UnaryExpression, UnaryOperator,
     },
     source_range::SourceRange,
-    std::args::TyF64,
+    std::{
+        args::{Arg, Args, KwArgs, TyF64},
+        FunctionKind,
+    },
     CompilationError,
 };
 
+enum StatementKind<'a> {
+    Declaration { name: &'a str },
+    Expression,
+}
+
 impl<'a> StatementKind<'a> {
     fn expect_name(&self) -> &'a str {
         match self {
@@ -584,7 +594,7 @@ impl ExecutorContext {
     }
 
     #[async_recursion]
-    pub(super) async fn execute_expr<'a: 'async_recursion>(
+    async fn execute_expr<'a: 'async_recursion>(
         &self,
         init: &Expr,
         exec_state: &mut ExecState,
@@ -777,7 +787,7 @@ impl BinaryPart {
 }
 
 impl Node<Name> {
-    pub(super) async fn get_result<'a>(
+    async fn get_result<'a>(
         &self,
         exec_state: &'a mut ExecState,
         ctx: &ExecutorContext,
@@ -1295,6 +1305,301 @@ async fn inner_execute_pipe_body(
     Ok(final_output)
 }
 
+impl Node<CallExpressionKw> {
+    #[async_recursion]
+    pub async fn execute(&self, exec_state: &mut ExecState, ctx: &ExecutorContext) -> Result<KclValue, KclError> {
+        let fn_name = &self.callee;
+        let callsite: SourceRange = self.into();
+
+        // Build a hashmap from argument labels to the final evaluated values.
+        let mut fn_args = IndexMap::with_capacity(self.arguments.len());
+        let mut errors = Vec::new();
+        for arg_expr in &self.arguments {
+            let source_range = SourceRange::from(arg_expr.arg.clone());
+            let metadata = Metadata { source_range };
+            let value = ctx
+                .execute_expr(&arg_expr.arg, exec_state, &metadata, &[], StatementKind::Expression)
+                .await?;
+            let arg = Arg::new(value, source_range);
+            match &arg_expr.label {
+                Some(l) => {
+                    fn_args.insert(l.name.clone(), arg);
+                }
+                None => {
+                    if let Some(id) = arg_expr.arg.ident_name() {
+                        fn_args.insert(id.to_owned(), arg);
+                    } else {
+                        errors.push(arg);
+                    }
+                }
+            }
+        }
+
+        // Evaluate the unlabeled first param, if any exists.
+        let unlabeled = if let Some(ref arg_expr) = self.unlabeled {
+            let source_range = SourceRange::from(arg_expr.clone());
+            let metadata = Metadata { source_range };
+            let value = ctx
+                .execute_expr(arg_expr, exec_state, &metadata, &[], StatementKind::Expression)
+                .await?;
+
+            let label = arg_expr.ident_name().map(str::to_owned);
+
+            Some((label, Arg::new(value, source_range)))
+        } else {
+            None
+        };
+
+        let mut args = Args::new_kw(
+            KwArgs {
+                unlabeled,
+                labeled: fn_args,
+                errors,
+            },
+            self.into(),
+            ctx.clone(),
+            exec_state.pipe_value().map(|v| Arg::new(v.clone(), callsite)),
+        );
+        match ctx.stdlib.get_either(fn_name) {
+            FunctionKind::Core(func) => {
+                if func.deprecated() {
+                    exec_state.warn(CompilationError::err(
+                        self.callee.as_source_range(),
+                        format!("`{fn_name}` is deprecated, see the docs for a recommended replacement"),
+                    ));
+                }
+
+                let formals = func.args(false);
+
+                // If it's possible the input arg was meant to be labelled and we probably don't want to use
+                // it as the input arg, then treat it as labelled.
+                if let Some((Some(label), _)) = &args.kw_args.unlabeled {
+                    if (formals.iter().all(|a| a.label_required) || exec_state.pipe_value().is_some())
+                        && formals.iter().any(|a| &a.name == label && a.label_required)
+                        && !args.kw_args.labeled.contains_key(label)
+                    {
+                        let (label, arg) = args.kw_args.unlabeled.take().unwrap();
+                        args.kw_args.labeled.insert(label.unwrap(), arg);
+                    }
+                }
+
+                #[cfg(feature = "artifact-graph")]
+                let op = if func.feature_tree_operation() {
+                    let op_labeled_args = args
+                        .kw_args
+                        .labeled
+                        .iter()
+                        .map(|(k, arg)| (k.clone(), OpArg::new(OpKclValue::from(&arg.value), arg.source_range)))
+                        .collect();
+                    Some(Operation::StdLibCall {
+                        std_lib_fn: (&func).into(),
+                        unlabeled_arg: args
+                            .unlabeled_kw_arg_unconverted()
+                            .map(|arg| OpArg::new(OpKclValue::from(&arg.value), arg.source_range)),
+                        labeled_args: op_labeled_args,
+                        source_range: callsite,
+                        is_error: false,
+                    })
+                } else {
+                    None
+                };
+
+                for (label, arg) in &args.kw_args.labeled {
+                    match formals.iter().find(|p| &p.name == label) {
+                        Some(p) => {
+                            if !p.label_required {
+                                exec_state.err(CompilationError::err(
+                                    arg.source_range,
+                                    format!(
+                                        "The function `{fn_name}` expects an unlabeled first parameter (`{label}`), but it is labelled in the call"
+                                    ),
+                                ));
+                            }
+                        }
+                        None => {
+                            exec_state.err(CompilationError::err(
+                                arg.source_range,
+                                format!("`{label}` is not an argument of `{fn_name}`"),
+                            ));
+                        }
+                    }
+                }
+
+                // Attempt to call the function.
+                let mut return_value = {
+                    // Don't early-return in this block.
+                    exec_state.mut_stack().push_new_env_for_rust_call();
+                    let result = func.std_lib_fn()(exec_state, args).await;
+                    exec_state.mut_stack().pop_env();
+
+                    #[cfg(feature = "artifact-graph")]
+                    if let Some(mut op) = op {
+                        op.set_std_lib_call_is_error(result.is_err());
+                        // Track call operation.  We do this after the call
+                        // since things like patternTransform may call user code
+                        // before running, and we will likely want to use the
+                        // return value. The call takes ownership of the args,
+                        // so we need to build the op before the call.
+                        exec_state.global.operations.push(op);
+                    }
+
+                    result
+                }?;
+
+                update_memory_for_tags_of_geometry(&mut return_value, exec_state)?;
+
+                Ok(return_value)
+            }
+            FunctionKind::UserDefined => {
+                // Clone the function so that we can use a mutable reference to
+                // exec_state.
+                let func = fn_name.get_result(exec_state, ctx).await?.clone();
+
+                let Some(fn_src) = func.as_fn() else {
+                    return Err(KclError::Semantic(KclErrorDetails {
+                        message: "cannot call this because it isn't a function".to_string(),
+                        source_ranges: vec![callsite],
+                    }));
+                };
+
+                let return_value = fn_src
+                    .call_kw(Some(fn_name.to_string()), exec_state, ctx, args, callsite)
+                    .await
+                    .map_err(|e| {
+                        // Add the call expression to the source ranges.
+                        // TODO currently ignored by the frontend
+                        e.add_source_ranges(vec![callsite])
+                    })?;
+
+                let result = return_value.ok_or_else(move || {
+                    let mut source_ranges: Vec<SourceRange> = vec![callsite];
+                    // We want to send the source range of the original function.
+                    if let KclValue::Function { meta, .. } = func {
+                        source_ranges = meta.iter().map(|m| m.source_range).collect();
+                    };
+                    KclError::UndefinedValue(KclErrorDetails {
+                        message: format!("Result of user-defined function {} is undefined", fn_name),
+                        source_ranges,
+                    })
+                })?;
+
+                Ok(result)
+            }
+        }
+    }
+}
+
+fn update_memory_for_tags_of_geometry(result: &mut KclValue, exec_state: &mut ExecState) -> Result<(), KclError> {
+    // If the return result is a sketch or solid, we want to update the
+    // memory for the tags of the group.
+    // TODO: This could probably be done in a better way, but as of now this was my only idea
+    // and it works.
+    match result {
+        KclValue::Sketch { value } => {
+            for (name, tag) in value.tags.iter() {
+                if exec_state.stack().cur_frame_contains(name) {
+                    exec_state.mut_stack().update(name, |v, _| {
+                        v.as_mut_tag().unwrap().merge_info(tag);
+                    });
+                } else {
+                    exec_state
+                        .mut_stack()
+                        .add(
+                            name.to_owned(),
+                            KclValue::TagIdentifier(Box::new(tag.clone())),
+                            SourceRange::default(),
+                        )
+                        .unwrap();
+                }
+            }
+        }
+        KclValue::Solid { ref mut value } => {
+            for v in &value.value {
+                if let Some(tag) = v.get_tag() {
+                    // Get the past tag and update it.
+                    let tag_id = if let Some(t) = value.sketch.tags.get(&tag.name) {
+                        let mut t = t.clone();
+                        let Some(info) = t.get_cur_info() else {
+                            return Err(KclError::Internal(KclErrorDetails {
+                                message: format!("Tag {} does not have path info", tag.name),
+                                source_ranges: vec![tag.into()],
+                            }));
+                        };
+
+                        let mut info = info.clone();
+                        info.surface = Some(v.clone());
+                        info.sketch = value.id;
+                        t.info.push((exec_state.stack().current_epoch(), info));
+                        t
+                    } else {
+                        // It's probably a fillet or a chamfer.
+                        // Initialize it.
+                        TagIdentifier {
+                            value: tag.name.clone(),
+                            info: vec![(
+                                exec_state.stack().current_epoch(),
+                                TagEngineInfo {
+                                    id: v.get_id(),
+                                    surface: Some(v.clone()),
+                                    path: None,
+                                    sketch: value.id,
+                                },
+                            )],
+                            meta: vec![Metadata {
+                                source_range: tag.clone().into(),
+                            }],
+                        }
+                    };
+
+                    // update the sketch tags.
+                    value.sketch.merge_tags(Some(&tag_id).into_iter());
+
+                    if exec_state.stack().cur_frame_contains(&tag.name) {
+                        exec_state.mut_stack().update(&tag.name, |v, _| {
+                            v.as_mut_tag().unwrap().merge_info(&tag_id);
+                        });
+                    } else {
+                        exec_state
+                            .mut_stack()
+                            .add(
+                                tag.name.clone(),
+                                KclValue::TagIdentifier(Box::new(tag_id)),
+                                SourceRange::default(),
+                            )
+                            .unwrap();
+                    }
+                }
+            }
+
+            // Find the stale sketch in memory and update it.
+            if !value.sketch.tags.is_empty() {
+                let sketches_to_update: Vec<_> = exec_state
+                    .stack()
+                    .find_keys_in_current_env(|v| match v {
+                        KclValue::Sketch { value: sk } => sk.original_id == value.sketch.original_id,
+                        _ => false,
+                    })
+                    .cloned()
+                    .collect();
+
+                for k in sketches_to_update {
+                    exec_state.mut_stack().update(&k, |v, _| {
+                        let sketch = v.as_mut_sketch().unwrap();
+                        sketch.merge_tags(value.sketch.tags.values());
+                    });
+                }
+            }
+        }
+        KclValue::Tuple { value, .. } | KclValue::HomArray { value, .. } => {
+            for v in value {
+                update_memory_for_tags_of_geometry(v, exec_state)?;
+            }
+        }
+        _ => {}
+    }
+    Ok(())
+}
+
 impl Node<TagDeclarator> {
     pub async fn execute(&self, exec_state: &mut ExecState) -> Result<KclValue, KclError> {
         let memory_item = KclValue::TagIdentifier(Box::new(TagIdentifier {
@@ -1589,6 +1894,409 @@ impl Node<PipeExpression> {
     }
 }
 
+fn type_check_params_kw(
+    fn_name: Option<&str>,
+    function_expression: NodeRef<'_, FunctionExpression>,
+    args: &mut KwArgs,
+    exec_state: &mut ExecState,
+) -> Result<(), KclError> {
+    // If it's possible the input arg was meant to be labelled and we probably don't want to use
+    // it as the input arg, then treat it as labelled.
+    if let Some((Some(label), _)) = &args.unlabeled {
+        if (function_expression.params.iter().all(|p| p.labeled) || exec_state.pipe_value().is_some())
+            && function_expression
+                .params
+                .iter()
+                .any(|p| &p.identifier.name == label && p.labeled)
+            && !args.labeled.contains_key(label)
+        {
+            let (label, arg) = args.unlabeled.take().unwrap();
+            args.labeled.insert(label.unwrap(), arg);
+        }
+    }
+
+    for (label, arg) in &mut args.labeled {
+        match function_expression.params.iter().find(|p| &p.identifier.name == label) {
+            Some(p) => {
+                if !p.labeled {
+                    exec_state.err(CompilationError::err(
+                        arg.source_range,
+                        format!(
+                            "{} expects an unlabeled first parameter (`{label}`), but it is labelled in the call",
+                            fn_name
+                                .map(|n| format!("The function `{}`", n))
+                                .unwrap_or_else(|| "This function".to_owned()),
+                        ),
+                    ));
+                }
+
+                if let Some(ty) = &p.type_ {
+                    arg.value = arg
+                        .value
+                        .coerce(
+                            &RuntimeType::from_parsed(ty.inner.clone(), exec_state, arg.source_range).map_err(|e| KclError::Semantic(e.into()))?,
+                            exec_state,
+                        )
+                        .map_err(|e| {
+                            let mut message = format!(
+                                "{label} requires a value with type `{}`, but found {}",
+                                ty.inner,
+                                arg.value.human_friendly_type(),
+                            );
+                            if let Some(ty) = e.explicit_coercion {
+                                // TODO if we have access to the AST for the argument we could choose which example to suggest.
+                                message = format!("{message}\n\nYou may need to add information about the type of the argument, for example:\n  using a numeric suffix: `42{ty}`\n  or using type ascription: `foo(): number({ty})`");
+                            }
+                            KclError::Semantic(KclErrorDetails {
+                                message,
+                                source_ranges: vec![arg.source_range],
+                            })
+                        })?;
+                }
+            }
+            None => {
+                exec_state.err(CompilationError::err(
+                    arg.source_range,
+                    format!(
+                        "`{label}` is not an argument of {}",
+                        fn_name
+                            .map(|n| format!("`{}`", n))
+                            .unwrap_or_else(|| "this function".to_owned()),
+                    ),
+                ));
+            }
+        }
+    }
+
+    if !args.errors.is_empty() {
+        let actuals = args.labeled.keys();
+        let formals: Vec<_> = function_expression
+            .params
+            .iter()
+            .filter_map(|p| {
+                if !p.labeled {
+                    return None;
+                }
+
+                let name = &p.identifier.name;
+                if actuals.clone().any(|a| a == name) {
+                    return None;
+                }
+
+                Some(format!("`{name}`"))
+            })
+            .collect();
+
+        let suggestion = if formals.is_empty() {
+            String::new()
+        } else {
+            format!("; suggested labels: {}", formals.join(", "))
+        };
+
+        let mut errors = args.errors.iter().map(|e| {
+            CompilationError::err(
+                e.source_range,
+                format!("This argument needs a label, but it doesn't have one{suggestion}"),
+            )
+        });
+
+        let first = errors.next().unwrap();
+        errors.for_each(|e| exec_state.err(e));
+
+        return Err(KclError::Semantic(first.into()));
+    }
+
+    if let Some(arg) = &mut args.unlabeled {
+        if let Some(p) = function_expression.params.iter().find(|p| !p.labeled) {
+            if let Some(ty) = &p.type_ {
+                arg.1.value = arg
+                    .1
+                    .value
+                    .coerce(
+                        &RuntimeType::from_parsed(ty.inner.clone(), exec_state, arg.1.source_range)
+                            .map_err(|e| KclError::Semantic(e.into()))?,
+                        exec_state,
+                    )
+                    .map_err(|_| {
+                        KclError::Semantic(KclErrorDetails {
+                            message: format!(
+                                "The input argument of {} requires a value with type `{}`, but found {}",
+                                fn_name
+                                    .map(|n| format!("`{}`", n))
+                                    .unwrap_or_else(|| "this function".to_owned()),
+                                ty.inner,
+                                arg.1.value.human_friendly_type()
+                            ),
+                            source_ranges: vec![arg.1.source_range],
+                        })
+                    })?;
+            }
+        }
+    }
+
+    Ok(())
+}
+
+fn assign_args_to_params_kw(
+    fn_name: Option<&str>,
+    function_expression: NodeRef<'_, FunctionExpression>,
+    mut args: Args,
+    exec_state: &mut ExecState,
+) -> Result<(), KclError> {
+    type_check_params_kw(fn_name, function_expression, &mut args.kw_args, exec_state)?;
+
+    // Add the arguments to the memory.  A new call frame should have already
+    // been created.
+    let source_ranges = vec![function_expression.into()];
+
+    for param in function_expression.params.iter() {
+        if param.labeled {
+            let arg = args.kw_args.labeled.get(&param.identifier.name);
+            let arg_val = match arg {
+                Some(arg) => arg.value.clone(),
+                None => match param.default_value {
+                    Some(ref default_val) => KclValue::from_default_param(default_val.clone(), exec_state),
+                    None => {
+                        return Err(KclError::Semantic(KclErrorDetails {
+                            source_ranges,
+                            message: format!(
+                                "This function requires a parameter {}, but you haven't passed it one.",
+                                param.identifier.name
+                            ),
+                        }));
+                    }
+                },
+            };
+            exec_state
+                .mut_stack()
+                .add(param.identifier.name.clone(), arg_val, (&param.identifier).into())?;
+        } else {
+            let unlabelled = args.unlabeled_kw_arg_unconverted();
+
+            let Some(unlabeled) = unlabelled else {
+                let param_name = &param.identifier.name;
+                return Err(if args.kw_args.labeled.contains_key(param_name) {
+                    KclError::Semantic(KclErrorDetails {
+                        source_ranges,
+                        message: format!("The function does declare a parameter named '{param_name}', but this parameter doesn't use a label. Try removing the `{param_name}:`"),
+                    })
+                } else {
+                    KclError::Semantic(KclErrorDetails {
+                        source_ranges,
+                        message: "This function expects an unlabeled first parameter, but you haven't passed it one."
+                            .to_owned(),
+                    })
+                });
+            };
+            exec_state.mut_stack().add(
+                param.identifier.name.clone(),
+                unlabeled.value.clone(),
+                (&param.identifier).into(),
+            )?;
+        }
+    }
+
+    Ok(())
+}
+
+fn coerce_result_type(
+    result: Result<Option<KclValue>, KclError>,
+    function_expression: NodeRef<'_, FunctionExpression>,
+    exec_state: &mut ExecState,
+) -> Result<Option<KclValue>, KclError> {
+    if let Ok(Some(val)) = result {
+        if let Some(ret_ty) = &function_expression.return_type {
+            let ty = RuntimeType::from_parsed(ret_ty.inner.clone(), exec_state, ret_ty.as_source_range())
+                .map_err(|e| KclError::Semantic(e.into()))?;
+            let val = val.coerce(&ty, exec_state).map_err(|_| {
+                KclError::Semantic(KclErrorDetails {
+                    message: format!(
+                        "This function requires its result to be of type `{}`, but found {}",
+                        ty.human_friendly_type(),
+                        val.human_friendly_type(),
+                    ),
+                    source_ranges: ret_ty.as_source_ranges(),
+                })
+            })?;
+            Ok(Some(val))
+        } else {
+            Ok(Some(val))
+        }
+    } else {
+        result
+    }
+}
+
+async fn call_user_defined_function_kw(
+    fn_name: Option<&str>,
+    args: Args,
+    memory: EnvironmentRef,
+    function_expression: NodeRef<'_, FunctionExpression>,
+    exec_state: &mut ExecState,
+    ctx: &ExecutorContext,
+) -> Result<Option<KclValue>, KclError> {
+    // Create a new environment to execute the function body in so that local
+    // variables shadow variables in the parent scope.  The new environment's
+    // parent should be the environment of the closure.
+    exec_state.mut_stack().push_new_env_for_call(memory);
+    if let Err(e) = assign_args_to_params_kw(fn_name, function_expression, args, exec_state) {
+        exec_state.mut_stack().pop_env();
+        return Err(e);
+    }
+
+    // Execute the function body using the memory we just created.
+    let result = ctx
+        .exec_block(&function_expression.body, exec_state, BodyType::Block)
+        .await;
+    let mut result = result.map(|_| {
+        exec_state
+            .stack()
+            .get(memory::RETURN_NAME, function_expression.as_source_range())
+            .ok()
+            .cloned()
+    });
+
+    result = coerce_result_type(result, function_expression, exec_state);
+
+    // Restore the previous memory.
+    exec_state.mut_stack().pop_env();
+
+    result
+}
+
+impl FunctionSource {
+    pub async fn call_kw(
+        &self,
+        fn_name: Option<String>,
+        exec_state: &mut ExecState,
+        ctx: &ExecutorContext,
+        mut args: Args,
+        callsite: SourceRange,
+    ) -> Result<Option<KclValue>, KclError> {
+        match self {
+            FunctionSource::Std { func, ast, props } => {
+                if props.deprecated {
+                    exec_state.warn(CompilationError::err(
+                        callsite,
+                        format!(
+                            "`{}` is deprecated, see the docs for a recommended replacement",
+                            props.name
+                        ),
+                    ));
+                }
+
+                type_check_params_kw(Some(&props.name), ast, &mut args.kw_args, exec_state)?;
+
+                if let Some(arg) = &mut args.kw_args.unlabeled {
+                    if let Some(p) = ast.params.iter().find(|p| !p.labeled) {
+                        if let Some(ty) = &p.type_ {
+                            arg.1.value = arg
+                                .1
+                                .value
+                                .coerce(
+                                    &RuntimeType::from_parsed(ty.inner.clone(), exec_state, arg.1.source_range)
+                                        .map_err(|e| KclError::Semantic(e.into()))?,
+                                    exec_state,
+                                )
+                                .map_err(|_| {
+                                    KclError::Semantic(KclErrorDetails {
+                                        message: format!(
+                                            "The input argument of {} requires a value with type `{}`, but found {}",
+                                            props.name,
+                                            ty.inner,
+                                            arg.1.value.human_friendly_type(),
+                                        ),
+                                        source_ranges: vec![callsite],
+                                    })
+                                })?;
+                        }
+                    }
+                }
+
+                #[cfg(feature = "artifact-graph")]
+                let op = if props.include_in_feature_tree {
+                    let op_labeled_args = args
+                        .kw_args
+                        .labeled
+                        .iter()
+                        .map(|(k, arg)| (k.clone(), OpArg::new(OpKclValue::from(&arg.value), arg.source_range)))
+                        .collect();
+                    Some(Operation::KclStdLibCall {
+                        name: fn_name.unwrap_or_default(),
+                        unlabeled_arg: args
+                            .unlabeled_kw_arg_unconverted()
+                            .map(|arg| OpArg::new(OpKclValue::from(&arg.value), arg.source_range)),
+                        labeled_args: op_labeled_args,
+                        source_range: callsite,
+                        is_error: false,
+                    })
+                } else {
+                    None
+                };
+
+                // Attempt to call the function.
+                exec_state.mut_stack().push_new_env_for_rust_call();
+                let mut result = {
+                    // Don't early-return in this block.
+                    let result = func(exec_state, args).await;
+                    exec_state.mut_stack().pop_env();
+
+                    #[cfg(feature = "artifact-graph")]
+                    if let Some(mut op) = op {
+                        op.set_std_lib_call_is_error(result.is_err());
+                        // Track call operation.  We do this after the call
+                        // since things like patternTransform may call user code
+                        // before running, and we will likely want to use the
+                        // return value. The call takes ownership of the args,
+                        // so we need to build the op before the call.
+                        exec_state.global.operations.push(op);
+                    }
+                    result
+                }?;
+
+                update_memory_for_tags_of_geometry(&mut result, exec_state)?;
+
+                Ok(Some(result))
+            }
+            FunctionSource::User { ast, memory, .. } => {
+                // Track call operation.
+                #[cfg(feature = "artifact-graph")]
+                {
+                    let op_labeled_args = args
+                        .kw_args
+                        .labeled
+                        .iter()
+                        .map(|(k, arg)| (k.clone(), OpArg::new(OpKclValue::from(&arg.value), arg.source_range)))
+                        .collect();
+                    exec_state.global.operations.push(Operation::GroupBegin {
+                        group: Group::FunctionCall {
+                            name: fn_name.clone(),
+                            function_source_range: ast.as_source_range(),
+                            unlabeled_arg: args
+                                .kw_args
+                                .unlabeled
+                                .as_ref()
+                                .map(|arg| OpArg::new(OpKclValue::from(&arg.1.value), arg.1.source_range)),
+                            labeled_args: op_labeled_args,
+                        },
+                        source_range: callsite,
+                    });
+                }
+
+                let result =
+                    call_user_defined_function_kw(fn_name.as_deref(), args, *memory, ast, exec_state, ctx).await;
+
+                // Track return operation.
+                #[cfg(feature = "artifact-graph")]
+                exec_state.global.operations.push(Operation::GroupEnd);
+
+                result
+            }
+            FunctionSource::None => unreachable!(),
+        }
+    }
+}
+
 #[cfg(test)]
 mod test {
     use std::sync::Arc;
@@ -1598,10 +2306,151 @@ mod test {
     use super::*;
     use crate::{
         exec::UnitType,
-        execution::{parse_execute, ContextType},
+        execution::{memory::Stack, parse_execute, ContextType},
+        parsing::ast::types::{DefaultParamVal, Identifier, Parameter},
         ExecutorSettings, UnitLen,
     };
 
+    #[tokio::test(flavor = "multi_thread")]
+    async fn test_assign_args_to_params() {
+        // Set up a little framework for this test.
+        fn mem(number: usize) -> KclValue {
+            KclValue::Number {
+                value: number as f64,
+                ty: NumericType::count(),
+                meta: Default::default(),
+            }
+        }
+        fn ident(s: &'static str) -> Node<Identifier> {
+            Node::no_src(Identifier {
+                name: s.to_owned(),
+                digest: None,
+            })
+        }
+        fn opt_param(s: &'static str) -> Parameter {
+            Parameter {
+                identifier: ident(s),
+                type_: None,
+                default_value: Some(DefaultParamVal::none()),
+                labeled: true,
+                digest: None,
+            }
+        }
+        fn req_param(s: &'static str) -> Parameter {
+            Parameter {
+                identifier: ident(s),
+                type_: None,
+                default_value: None,
+                labeled: true,
+                digest: None,
+            }
+        }
+        fn additional_program_memory(items: &[(String, KclValue)]) -> Stack {
+            let mut program_memory = Stack::new_for_tests();
+            for (name, item) in items {
+                program_memory
+                    .add(name.clone(), item.clone(), SourceRange::default())
+                    .unwrap();
+            }
+            program_memory
+        }
+        // Declare the test cases.
+        for (test_name, params, args, expected) in [
+            ("empty", Vec::new(), Vec::new(), Ok(additional_program_memory(&[]))),
+            (
+                "all params required, and all given, should be OK",
+                vec![req_param("x")],
+                vec![("x", mem(1))],
+                Ok(additional_program_memory(&[("x".to_owned(), mem(1))])),
+            ),
+            (
+                "all params required, none given, should error",
+                vec![req_param("x")],
+                vec![],
+                Err(KclError::Semantic(KclErrorDetails {
+                    source_ranges: vec![SourceRange::default()],
+                    message: "This function requires a parameter x, but you haven't passed it one.".to_owned(),
+                })),
+            ),
+            (
+                "all params optional, none given, should be OK",
+                vec![opt_param("x")],
+                vec![],
+                Ok(additional_program_memory(&[("x".to_owned(), KclValue::none())])),
+            ),
+            (
+                "mixed params, too few given",
+                vec![req_param("x"), opt_param("y")],
+                vec![],
+                Err(KclError::Semantic(KclErrorDetails {
+                    source_ranges: vec![SourceRange::default()],
+                    message: "This function requires a parameter x, but you haven't passed it one.".to_owned(),
+                })),
+            ),
+            (
+                "mixed params, minimum given, should be OK",
+                vec![req_param("x"), opt_param("y")],
+                vec![("x", mem(1))],
+                Ok(additional_program_memory(&[
+                    ("x".to_owned(), mem(1)),
+                    ("y".to_owned(), KclValue::none()),
+                ])),
+            ),
+            (
+                "mixed params, maximum given, should be OK",
+                vec![req_param("x"), opt_param("y")],
+                vec![("x", mem(1)), ("y", mem(2))],
+                Ok(additional_program_memory(&[
+                    ("x".to_owned(), mem(1)),
+                    ("y".to_owned(), mem(2)),
+                ])),
+            ),
+        ] {
+            // Run each test.
+            let func_expr = &Node::no_src(FunctionExpression {
+                params,
+                body: Program::empty(),
+                return_type: None,
+                digest: None,
+            });
+            let labeled = args
+                .iter()
+                .map(|(name, value)| {
+                    let arg = Arg::new(value.clone(), SourceRange::default());
+                    ((*name).to_owned(), arg)
+                })
+                .collect::<IndexMap<_, _>>();
+            let exec_ctxt = ExecutorContext {
+                engine: Arc::new(Box::new(
+                    crate::engine::conn_mock::EngineConnection::new().await.unwrap(),
+                )),
+                fs: Arc::new(crate::fs::FileManager::new()),
+                stdlib: Arc::new(crate::std::StdLib::new()),
+                settings: Default::default(),
+                context_type: ContextType::Mock,
+            };
+            let mut exec_state = ExecState::new(&exec_ctxt);
+            exec_state.mod_local.stack = Stack::new_for_tests();
+
+            let args = Args::new_kw(
+                KwArgs {
+                    unlabeled: None,
+                    labeled,
+                    errors: Vec::new(),
+                },
+                SourceRange::default(),
+                exec_ctxt,
+                None,
+            );
+            let actual =
+                assign_args_to_params_kw(None, func_expr, args, &mut exec_state).map(|_| exec_state.mod_local.stack);
+            assert_eq!(
+                actual, expected,
+                "failed test '{test_name}':\ngot {actual:?}\nbut expected\n{expected:?}"
+            );
+        }
+    }
+
     #[tokio::test(flavor = "multi_thread")]
     async fn ascription() {
         let program = r#"

rust/kcl-lib/src/execution/fn_call.rs

@@ -1,979 +0,0 @@
-use async_recursion::async_recursion;
-use indexmap::IndexMap;
-
-use crate::execution::cad_op::{Group, OpArg, OpKclValue, Operation};
-use crate::{
-    docs::StdLibFn,
-    errors::{KclError, KclErrorDetails},
-    execution::{
-        kcl_value::FunctionSource, memory, types::RuntimeType, BodyType, ExecState, ExecutorContext, KclValue,
-        Metadata, StatementKind, TagEngineInfo, TagIdentifier,
-    },
-    parsing::ast::types::{CallExpressionKw, DefaultParamVal, FunctionExpression, Node, Program, Type},
-    source_range::SourceRange,
-    std::StdFn,
-    CompilationError,
-};
-
-use super::types::ArrayLen;
-use super::EnvironmentRef;
-
-#[derive(Debug, Clone)]
-pub struct Args {
-    /// Positional args.
-    pub args: Vec<Arg>,
-    /// Keyword arguments
-    pub kw_args: KwArgs,
-    pub source_range: SourceRange,
-    pub ctx: ExecutorContext,
-    /// If this call happens inside a pipe (|>) expression, this holds the LHS of that |>.
-    /// Otherwise it's None.
-    pub pipe_value: Option<Arg>,
-}
-
-impl Args {
-    pub fn new(args: Vec<Arg>, source_range: SourceRange, ctx: ExecutorContext, pipe_value: Option<Arg>) -> Self {
-        Self {
-            args,
-            kw_args: Default::default(),
-            source_range,
-            ctx,
-            pipe_value,
-        }
-    }
-
-    /// Collect the given keyword arguments.
-    pub fn new_kw(kw_args: KwArgs, source_range: SourceRange, ctx: ExecutorContext, pipe_value: Option<Arg>) -> Self {
-        Self {
-            args: Default::default(),
-            kw_args,
-            source_range,
-            ctx,
-            pipe_value,
-        }
-    }
-
-    /// Get the unlabeled keyword argument. If not set, returns None.
-    pub(crate) fn unlabeled_kw_arg_unconverted(&self) -> Option<&Arg> {
-        self.kw_args
-            .unlabeled
-            .as_ref()
-            .map(|(_, a)| a)
-            .or(self.args.first())
-            .or(self.pipe_value.as_ref())
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct Arg {
-    /// The evaluated argument.
-    pub value: KclValue,
-    /// The source range of the unevaluated argument.
-    pub source_range: SourceRange,
-}
-
-impl Arg {
-    pub fn new(value: KclValue, source_range: SourceRange) -> Self {
-        Self { value, source_range }
-    }
-
-    pub fn synthetic(value: KclValue) -> Self {
-        Self {
-            value,
-            source_range: SourceRange::synthetic(),
-        }
-    }
-
-    pub fn source_ranges(&self) -> Vec<SourceRange> {
-        vec![self.source_range]
-    }
-}
-
-#[derive(Debug, Clone, Default)]
-pub struct KwArgs {
-    /// Unlabeled keyword args. Currently only the first arg can be unlabeled.
-    /// If the argument was a local variable, then the first element of the tuple is its name
-    /// which may be used to treat this arg as a labelled arg.
-    pub unlabeled: Option<(Option<String>, Arg)>,
-    /// Labeled args.
-    pub labeled: IndexMap<String, Arg>,
-    pub errors: Vec<Arg>,
-}
-
-impl KwArgs {
-    /// How many arguments are there?
-    pub fn len(&self) -> usize {
-        self.labeled.len() + if self.unlabeled.is_some() { 1 } else { 0 }
-    }
-    /// Are there no arguments?
-    pub fn is_empty(&self) -> bool {
-        self.labeled.len() == 0 && self.unlabeled.is_none()
-    }
-}
-
-struct FunctionDefinition<'a> {
-    input_arg: Option<(String, Option<Type>)>,
-    named_args: IndexMap<String, (Option<DefaultParamVal>, Option<Type>)>,
-    return_type: Option<Node<Type>>,
-    deprecated: bool,
-    include_in_feature_tree: bool,
-    is_std: bool,
-    body: FunctionBody<'a>,
-}
-
-#[derive(Debug)]
-enum FunctionBody<'a> {
-    Rust(StdFn),
-    Kcl(&'a Node<Program>, EnvironmentRef),
-}
-
-impl<'a> From<&'a FunctionSource> for FunctionDefinition<'a> {
-    fn from(value: &'a FunctionSource) -> Self {
-        #[allow(clippy::type_complexity)]
-        fn args_from_ast(
-            ast: &FunctionExpression,
-        ) -> (
-            Option<(String, Option<Type>)>,
-            IndexMap<String, (Option<DefaultParamVal>, Option<Type>)>,
-        ) {
-            let mut input_arg = None;
-            let mut named_args = IndexMap::new();
-            for p in &ast.params {
-                if !p.labeled {
-                    input_arg = Some((p.identifier.name.clone(), p.type_.as_ref().map(|t| t.inner.clone())));
-                    continue;
-                }
-
-                named_args.insert(
-                    p.identifier.name.clone(),
-                    (p.default_value.clone(), p.type_.as_ref().map(|t| t.inner.clone())),
-                );
-            }
-
-            (input_arg, named_args)
-        }
-
-        match value {
-            FunctionSource::Std { func, ast, props } => {
-                let (input_arg, named_args) = args_from_ast(ast);
-                FunctionDefinition {
-                    input_arg,
-                    named_args,
-                    return_type: ast.return_type.clone(),
-                    deprecated: props.deprecated,
-                    include_in_feature_tree: props.include_in_feature_tree,
-                    is_std: true,
-                    body: FunctionBody::Rust(*func),
-                }
-            }
-            FunctionSource::User { ast, memory, .. } => {
-                let (input_arg, named_args) = args_from_ast(ast);
-                FunctionDefinition {
-                    input_arg,
-                    named_args,
-                    return_type: ast.return_type.clone(),
-                    deprecated: false,
-                    include_in_feature_tree: true,
-                    // TODO I think this might be wrong for pure Rust std functions
-                    is_std: false,
-                    body: FunctionBody::Kcl(&ast.body, *memory),
-                }
-            }
-            FunctionSource::None => unreachable!(),
-        }
-    }
-}
-
-impl From<&dyn StdLibFn> for FunctionDefinition<'static> {
-    fn from(value: &dyn StdLibFn) -> Self {
-        let mut input_arg = None;
-        let mut named_args = IndexMap::new();
-        for a in value.args(false) {
-            if !a.label_required {
-                input_arg = Some((a.name.clone(), None));
-                continue;
-            }
-
-            named_args.insert(
-                a.name.clone(),
-                (
-                    if a.required {
-                        None
-                    } else {
-                        Some(DefaultParamVal::none())
-                    },
-                    None,
-                ),
-            );
-        }
-        FunctionDefinition {
-            input_arg,
-            named_args,
-            return_type: None,
-            deprecated: value.deprecated(),
-            include_in_feature_tree: value.feature_tree_operation(),
-            is_std: true,
-            body: FunctionBody::Rust(value.std_lib_fn()),
-        }
-    }
-}
-
-impl Node<CallExpressionKw> {
-    #[async_recursion]
-    pub async fn execute(&self, exec_state: &mut ExecState, ctx: &ExecutorContext) -> Result<KclValue, KclError> {
-        let fn_name = &self.callee;
-        let callsite: SourceRange = self.into();
-
-        // Build a hashmap from argument labels to the final evaluated values.
-        let mut fn_args = IndexMap::with_capacity(self.arguments.len());
-        let mut errors = Vec::new();
-        for arg_expr in &self.arguments {
-            let source_range = SourceRange::from(arg_expr.arg.clone());
-            let metadata = Metadata { source_range };
-            let value = ctx
-                .execute_expr(&arg_expr.arg, exec_state, &metadata, &[], StatementKind::Expression)
-                .await?;
-            let arg = Arg::new(value, source_range);
-            match &arg_expr.label {
-                Some(l) => {
-                    fn_args.insert(l.name.clone(), arg);
-                }
-                None => {
-                    if let Some(id) = arg_expr.arg.ident_name() {
-                        fn_args.insert(id.to_owned(), arg);
-                    } else {
-                        errors.push(arg);
-                    }
-                }
-            }
-        }
-
-        // Evaluate the unlabeled first param, if any exists.
-        let unlabeled = if let Some(ref arg_expr) = self.unlabeled {
-            let source_range = SourceRange::from(arg_expr.clone());
-            let metadata = Metadata { source_range };
-            let value = ctx
-                .execute_expr(arg_expr, exec_state, &metadata, &[], StatementKind::Expression)
-                .await?;
-
-            let label = arg_expr.ident_name().map(str::to_owned);
-
-            Some((label, Arg::new(value, source_range)))
-        } else {
-            None
-        };
-
-        let args = Args::new_kw(
-            KwArgs {
-                unlabeled,
-                labeled: fn_args,
-                errors,
-            },
-            self.into(),
-            ctx.clone(),
-            exec_state.pipe_value().map(|v| Arg::new(v.clone(), callsite)),
-        );
-
-        match ctx.stdlib.get_rust_function(fn_name) {
-            Some(func) => {
-                let def: FunctionDefinition = (&*func).into();
-                // All std lib functions return a value, so the unwrap is safe.
-                def.call_kw(Some(func.name()), exec_state, ctx, args, callsite)
-                    .await
-                    .map(Option::unwrap)
-            }
-            None => {
-                // Clone the function so that we can use a mutable reference to
-                // exec_state.
-                let func = fn_name.get_result(exec_state, ctx).await?.clone();
-
-                let Some(fn_src) = func.as_fn() else {
-                    return Err(KclError::Semantic(KclErrorDetails {
-                        message: "cannot call this because it isn't a function".to_string(),
-                        source_ranges: vec![callsite],
-                    }));
-                };
-
-                let return_value = fn_src
-                    .call_kw(Some(fn_name.to_string()), exec_state, ctx, args, callsite)
-                    .await
-                    .map_err(|e| {
-                        // Add the call expression to the source ranges.
-                        e.add_source_ranges(vec![callsite])
-                    })?;
-
-                let result = return_value.ok_or_else(move || {
-                    let mut source_ranges: Vec<SourceRange> = vec![callsite];
-                    // We want to send the source range of the original function.
-                    if let KclValue::Function { meta, .. } = func {
-                        source_ranges = meta.iter().map(|m| m.source_range).collect();
-                    };
-                    KclError::UndefinedValue(KclErrorDetails {
-                        message: format!("Result of user-defined function {} is undefined", fn_name),
-                        source_ranges,
-                    })
-                })?;
-
-                Ok(result)
-            }
-        }
-    }
-}
-
-impl FunctionDefinition<'_> {
-    pub async fn call_kw(
-        &self,
-        fn_name: Option<String>,
-        exec_state: &mut ExecState,
-        ctx: &ExecutorContext,
-        mut args: Args,
-        callsite: SourceRange,
-    ) -> Result<Option<KclValue>, KclError> {
-        if self.deprecated {
-            exec_state.warn(CompilationError::err(
-                callsite,
-                format!(
-                    "{} is deprecated, see the docs for a recommended replacement",
-                    match &fn_name {
-                        Some(n) => format!("`{n}`"),
-                        None => "This function".to_owned(),
-                    }
-                ),
-            ));
-        }
-
-        type_check_params_kw(fn_name.as_deref(), self, &mut args.kw_args, exec_state)?;
-
-        // Don't early return until the stack frame is popped!
-        self.body.prep_mem(exec_state);
-
-        let op = if self.include_in_feature_tree {
-            let op_labeled_args = args
-                .kw_args
-                .labeled
-                .iter()
-                .map(|(k, arg)| (k.clone(), OpArg::new(OpKclValue::from(&arg.value), arg.source_range)))
-                .collect();
-
-            if self.is_std {
-                Some(Operation::StdLibCall {
-                    name: fn_name.clone().unwrap_or_else(|| "unknown function".to_owned()),
-                    unlabeled_arg: args
-                        .unlabeled_kw_arg_unconverted()
-                        .map(|arg| OpArg::new(OpKclValue::from(&arg.value), arg.source_range)),
-                    labeled_args: op_labeled_args,
-                    source_range: callsite,
-                    is_error: false,
-                })
-            } else {
-                exec_state.push_op(Operation::GroupBegin {
-                    group: Group::FunctionCall {
-                        name: fn_name.clone(),
-                        function_source_range: self.as_source_range().unwrap(),
-                        unlabeled_arg: args
-                            .kw_args
-                            .unlabeled
-                            .as_ref()
-                            .map(|arg| OpArg::new(OpKclValue::from(&arg.1.value), arg.1.source_range)),
-                        labeled_args: op_labeled_args,
-                    },
-                    source_range: callsite,
-                });
-
-                None
-            }
-        } else {
-            None
-        };
-
-        let mut result = match &self.body {
-            FunctionBody::Rust(f) => f(exec_state, args).await.map(Some),
-            FunctionBody::Kcl(f, _) => {
-                if let Err(e) = assign_args_to_params_kw(self, args, exec_state) {
-                    exec_state.mut_stack().pop_env();
-                    return Err(e);
-                }
-
-                ctx.exec_block(f, exec_state, BodyType::Block).await.map(|_| {
-                    exec_state
-                        .stack()
-                        .get(memory::RETURN_NAME, f.as_source_range())
-                        .ok()
-                        .cloned()
-                })
-            }
-        };
-
-        exec_state.mut_stack().pop_env();
-
-        if let Some(mut op) = op {
-            op.set_std_lib_call_is_error(result.is_err());
-            // Track call operation.  We do this after the call
-            // since things like patternTransform may call user code
-            // before running, and we will likely want to use the
-            // return value. The call takes ownership of the args,
-            // so we need to build the op before the call.
-            exec_state.push_op(op);
-        } else if !self.is_std {
-            exec_state.push_op(Operation::GroupEnd);
-        }
-
-        if self.is_std {
-            if let Ok(Some(result)) = &mut result {
-                update_memory_for_tags_of_geometry(result, exec_state)?;
-            }
-        }
-
-        coerce_result_type(result, self, exec_state)
-    }
-
-    // Postcondition: result.is_some() if function is not in the standard library.
-    fn as_source_range(&self) -> Option<SourceRange> {
-        match &self.body {
-            FunctionBody::Rust(_) => None,
-            FunctionBody::Kcl(p, _) => Some(p.as_source_range()),
-        }
-    }
-}
-
-impl FunctionBody<'_> {
-    fn prep_mem(&self, exec_state: &mut ExecState) {
-        match self {
-            FunctionBody::Rust(_) => exec_state.mut_stack().push_new_env_for_rust_call(),
-            FunctionBody::Kcl(_, memory) => exec_state.mut_stack().push_new_env_for_call(*memory),
-        }
-    }
-}
-
-impl FunctionSource {
-    pub async fn call_kw(
-        &self,
-        fn_name: Option<String>,
-        exec_state: &mut ExecState,
-        ctx: &ExecutorContext,
-        args: Args,
-        callsite: SourceRange,
-    ) -> Result<Option<KclValue>, KclError> {
-        let def: FunctionDefinition = self.into();
-        def.call_kw(fn_name, exec_state, ctx, args, callsite).await
-    }
-}
-
-fn update_memory_for_tags_of_geometry(result: &mut KclValue, exec_state: &mut ExecState) -> Result<(), KclError> {
-    // If the return result is a sketch or solid, we want to update the
-    // memory for the tags of the group.
-    // TODO: This could probably be done in a better way, but as of now this was my only idea
-    // and it works.
-    match result {
-        KclValue::Sketch { value } => {
-            for (name, tag) in value.tags.iter() {
-                if exec_state.stack().cur_frame_contains(name) {
-                    exec_state.mut_stack().update(name, |v, _| {
-                        v.as_mut_tag().unwrap().merge_info(tag);
-                    });
-                } else {
-                    exec_state
-                        .mut_stack()
-                        .add(
-                            name.to_owned(),
-                            KclValue::TagIdentifier(Box::new(tag.clone())),
-                            SourceRange::default(),
-                        )
-                        .unwrap();
-                }
-            }
-        }
-        KclValue::Solid { ref mut value } => {
-            for v in &value.value {
-                if let Some(tag) = v.get_tag() {
-                    // Get the past tag and update it.
-                    let tag_id = if let Some(t) = value.sketch.tags.get(&tag.name) {
-                        let mut t = t.clone();
-                        let Some(info) = t.get_cur_info() else {
-                            return Err(KclError::Internal(KclErrorDetails {
-                                message: format!("Tag {} does not have path info", tag.name),
-                                source_ranges: vec![tag.into()],
-                            }));
-                        };
-
-                        let mut info = info.clone();
-                        info.surface = Some(v.clone());
-                        info.sketch = value.id;
-                        t.info.push((exec_state.stack().current_epoch(), info));
-                        t
-                    } else {
-                        // It's probably a fillet or a chamfer.
-                        // Initialize it.
-                        TagIdentifier {
-                            value: tag.name.clone(),
-                            info: vec![(
-                                exec_state.stack().current_epoch(),
-                                TagEngineInfo {
-                                    id: v.get_id(),
-                                    surface: Some(v.clone()),
-                                    path: None,
-                                    sketch: value.id,
-                                },
-                            )],
-                            meta: vec![Metadata {
-                                source_range: tag.clone().into(),
-                            }],
-                        }
-                    };
-
-                    // update the sketch tags.
-                    value.sketch.merge_tags(Some(&tag_id).into_iter());
-
-                    if exec_state.stack().cur_frame_contains(&tag.name) {
-                        exec_state.mut_stack().update(&tag.name, |v, _| {
-                            v.as_mut_tag().unwrap().merge_info(&tag_id);
-                        });
-                    } else {
-                        exec_state
-                            .mut_stack()
-                            .add(
-                                tag.name.clone(),
-                                KclValue::TagIdentifier(Box::new(tag_id)),
-                                SourceRange::default(),
-                            )
-                            .unwrap();
-                    }
-                }
-            }
-
-            // Find the stale sketch in memory and update it.
-            if !value.sketch.tags.is_empty() {
-                let sketches_to_update: Vec<_> = exec_state
-                    .stack()
-                    .find_keys_in_current_env(|v| match v {
-                        KclValue::Sketch { value: sk } => sk.original_id == value.sketch.original_id,
-                        _ => false,
-                    })
-                    .cloned()
-                    .collect();
-
-                for k in sketches_to_update {
-                    exec_state.mut_stack().update(&k, |v, _| {
-                        let sketch = v.as_mut_sketch().unwrap();
-                        sketch.merge_tags(value.sketch.tags.values());
-                    });
-                }
-            }
-        }
-        KclValue::Tuple { value, .. } | KclValue::HomArray { value, .. } => {
-            for v in value {
-                update_memory_for_tags_of_geometry(v, exec_state)?;
-            }
-        }
-        _ => {}
-    }
-    Ok(())
-}
-
-fn type_check_params_kw(
-    fn_name: Option<&str>,
-    fn_def: &FunctionDefinition<'_>,
-    args: &mut KwArgs,
-    exec_state: &mut ExecState,
-) -> Result<(), KclError> {
-    // If it's possible the input arg was meant to be labelled and we probably don't want to use
-    // it as the input arg, then treat it as labelled.
-    if let Some((Some(label), _)) = &args.unlabeled {
-        if (fn_def.input_arg.is_none() || exec_state.pipe_value().is_some())
-            && fn_def.named_args.iter().any(|p| p.0 == label)
-            && !args.labeled.contains_key(label)
-        {
-            let (label, arg) = args.unlabeled.take().unwrap();
-            args.labeled.insert(label.unwrap(), arg);
-        }
-    }
-
-    for (label, arg) in &mut args.labeled {
-        match fn_def.named_args.get(label) {
-            Some((_, ty)) => {
-                if let Some(ty) = ty {
-                    arg.value = arg
-                        .value
-                        .coerce(
-                            &RuntimeType::from_parsed(ty.clone(), exec_state, arg.source_range).map_err(|e| KclError::Semantic(e.into()))?,
-                            exec_state,
-                        )
-                        .map_err(|e| {
-                            let mut message = format!(
-                                "{label} requires a value with type `{}`, but found {}",
-                                ty,
-                                arg.value.human_friendly_type(),
-                            );
-                            if let Some(ty) = e.explicit_coercion {
-                                // TODO if we have access to the AST for the argument we could choose which example to suggest.
-                                message = format!("{message}\n\nYou may need to add information about the type of the argument, for example:\n  using a numeric suffix: `42{ty}`\n  or using type ascription: `foo(): number({ty})`");
-                            }
-                            KclError::Semantic(KclErrorDetails {
-                                message,
-                                source_ranges: vec![arg.source_range],
-                            })
-                        })?;
-                }
-            }
-            None => {
-                exec_state.err(CompilationError::err(
-                    arg.source_range,
-                    format!(
-                        "`{label}` is not an argument of {}",
-                        fn_name
-                            .map(|n| format!("`{}`", n))
-                            .unwrap_or_else(|| "this function".to_owned()),
-                    ),
-                ));
-            }
-        }
-    }
-
-    if !args.errors.is_empty() {
-        let actuals = args.labeled.keys();
-        let formals: Vec<_> = fn_def
-            .named_args
-            .keys()
-            .filter_map(|name| {
-                if actuals.clone().any(|a| a == name) {
-                    return None;
-                }
-
-                Some(format!("`{name}`"))
-            })
-            .collect();
-
-        let suggestion = if formals.is_empty() {
-            String::new()
-        } else {
-            format!("; suggested labels: {}", formals.join(", "))
-        };
-
-        let mut errors = args.errors.iter().map(|e| {
-            CompilationError::err(
-                e.source_range,
-                format!("This argument needs a label, but it doesn't have one{suggestion}"),
-            )
-        });
-
-        let first = errors.next().unwrap();
-        errors.for_each(|e| exec_state.err(e));
-
-        return Err(KclError::Semantic(first.into()));
-    }
-
-    if let Some(arg) = &mut args.unlabeled {
-        if let Some((_, Some(ty))) = &fn_def.input_arg {
-            arg.1.value = arg
-                .1
-                .value
-                .coerce(
-                    &RuntimeType::from_parsed(ty.clone(), exec_state, arg.1.source_range)
-                        .map_err(|e| KclError::Semantic(e.into()))?,
-                    exec_state,
-                )
-                .map_err(|_| {
-                    KclError::Semantic(KclErrorDetails {
-                        message: format!(
-                            "The input argument of {} requires a value with type `{}`, but found {}",
-                            fn_name
-                                .map(|n| format!("`{}`", n))
-                                .unwrap_or_else(|| "this function".to_owned()),
-                            ty,
-                            arg.1.value.human_friendly_type()
-                        ),
-                        source_ranges: vec![arg.1.source_range],
-                    })
-                })?;
-        }
-    } else if let Some((name, _)) = &fn_def.input_arg {
-        if let Some(arg) = args.labeled.get(name) {
-            exec_state.err(CompilationError::err(
-                arg.source_range,
-                format!(
-                    "{} expects an unlabeled first parameter (`@{name}`), but it is labelled in the call",
-                    fn_name
-                        .map(|n| format!("The function `{}`", n))
-                        .unwrap_or_else(|| "This function".to_owned()),
-                ),
-            ));
-        }
-    }
-
-    Ok(())
-}
-
-fn assign_args_to_params_kw(
-    fn_def: &FunctionDefinition<'_>,
-    args: Args,
-    exec_state: &mut ExecState,
-) -> Result<(), KclError> {
-    // Add the arguments to the memory.  A new call frame should have already
-    // been created.
-    let source_ranges = fn_def.as_source_range().into_iter().collect();
-
-    for (name, (default, _)) in fn_def.named_args.iter() {
-        let arg = args.kw_args.labeled.get(name);
-        match arg {
-            Some(arg) => {
-                exec_state.mut_stack().add(
-                    name.clone(),
-                    arg.value.clone(),
-                    arg.source_ranges().pop().unwrap_or(SourceRange::synthetic()),
-                )?;
-            }
-            None => match default {
-                Some(ref default_val) => {
-                    let value = KclValue::from_default_param(default_val.clone(), exec_state);
-                    exec_state
-                        .mut_stack()
-                        .add(name.clone(), value, default_val.source_range())?;
-                }
-                None => {
-                    return Err(KclError::Semantic(KclErrorDetails {
-                        source_ranges,
-                        message: format!(
-                            "This function requires a parameter {}, but you haven't passed it one.",
-                            name
-                        ),
-                    }));
-                }
-            },
-        }
-    }
-
-    if let Some((param_name, _)) = &fn_def.input_arg {
-        let unlabelled = args.unlabeled_kw_arg_unconverted();
-
-        let Some(unlabeled) = unlabelled else {
-            return Err(if args.kw_args.labeled.contains_key(param_name) {
-                KclError::Semantic(KclErrorDetails {
-                    source_ranges,
-                    message: format!("The function does declare a parameter named '{param_name}', but this parameter doesn't use a label. Try removing the `{param_name}:`"),
-                })
-            } else {
-                KclError::Semantic(KclErrorDetails {
-                    source_ranges,
-                    message: "This function expects an unlabeled first parameter, but you haven't passed it one."
-                        .to_owned(),
-                })
-            });
-        };
-        exec_state.mut_stack().add(
-            param_name.clone(),
-            unlabeled.value.clone(),
-            unlabeled.source_ranges().pop().unwrap_or(SourceRange::synthetic()),
-        )?;
-    }
-
-    Ok(())
-}
-
-fn coerce_result_type(
-    result: Result<Option<KclValue>, KclError>,
-    fn_def: &FunctionDefinition<'_>,
-    exec_state: &mut ExecState,
-) -> Result<Option<KclValue>, KclError> {
-    if let Ok(Some(val)) = result {
-        if let Some(ret_ty) = &fn_def.return_type {
-            let mut ty = RuntimeType::from_parsed(ret_ty.inner.clone(), exec_state, ret_ty.as_source_range())
-                .map_err(|e| KclError::Semantic(e.into()))?;
-            // Treat `[T; 1+]` as `T | [T; 1+]` (which can't yet be expressed in our syntax of types).
-            // This is a very specific hack which exists because some std functions can produce arrays
-            // but usually only make a singleton and the frontend expects the singleton.
-            // If we can make the frontend work on arrays (or at least arrays of length 1), then this
-            // can be removed.
-            // I believe this is safe, since anywhere which requires an array should coerce the singleton
-            // to an array and we only do this hack for return values.
-            if let RuntimeType::Array(inner, ArrayLen::NonEmpty) = &ty {
-                ty = RuntimeType::Union(vec![(**inner).clone(), ty]);
-            }
-            let val = val.coerce(&ty, exec_state).map_err(|_| {
-                KclError::Semantic(KclErrorDetails {
-                    message: format!(
-                        "This function requires its result to be of type `{}`, but found {}",
-                        ty.human_friendly_type(),
-                        val.human_friendly_type(),
-                    ),
-                    source_ranges: ret_ty.as_source_ranges(),
-                })
-            })?;
-            Ok(Some(val))
-        } else {
-            Ok(Some(val))
-        }
-    } else {
-        result
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use std::sync::Arc;
-
-    use super::*;
-    use crate::{
-        execution::{memory::Stack, parse_execute, types::NumericType, ContextType},
-        parsing::ast::types::{DefaultParamVal, Identifier, Parameter},
-    };
-
-    #[tokio::test(flavor = "multi_thread")]
-    async fn test_assign_args_to_params() {
-        // Set up a little framework for this test.
-        fn mem(number: usize) -> KclValue {
-            KclValue::Number {
-                value: number as f64,
-                ty: NumericType::count(),
-                meta: Default::default(),
-            }
-        }
-        fn ident(s: &'static str) -> Node<Identifier> {
-            Node::no_src(Identifier {
-                name: s.to_owned(),
-                digest: None,
-            })
-        }
-        fn opt_param(s: &'static str) -> Parameter {
-            Parameter {
-                identifier: ident(s),
-                type_: None,
-                default_value: Some(DefaultParamVal::none()),
-                labeled: true,
-                digest: None,
-            }
-        }
-        fn req_param(s: &'static str) -> Parameter {
-            Parameter {
-                identifier: ident(s),
-                type_: None,
-                default_value: None,
-                labeled: true,
-                digest: None,
-            }
-        }
-        fn additional_program_memory(items: &[(String, KclValue)]) -> Stack {
-            let mut program_memory = Stack::new_for_tests();
-            for (name, item) in items {
-                program_memory
-                    .add(name.clone(), item.clone(), SourceRange::default())
-                    .unwrap();
-            }
-            program_memory
-        }
-        // Declare the test cases.
-        for (test_name, params, args, expected) in [
-            ("empty", Vec::new(), Vec::new(), Ok(additional_program_memory(&[]))),
-            (
-                "all params required, and all given, should be OK",
-                vec![req_param("x")],
-                vec![("x", mem(1))],
-                Ok(additional_program_memory(&[("x".to_owned(), mem(1))])),
-            ),
-            (
-                "all params required, none given, should error",
-                vec![req_param("x")],
-                vec![],
-                Err(KclError::Semantic(KclErrorDetails {
-                    source_ranges: vec![SourceRange::default()],
-                    message: "This function requires a parameter x, but you haven't passed it one.".to_owned(),
-                })),
-            ),
-            (
-                "all params optional, none given, should be OK",
-                vec![opt_param("x")],
-                vec![],
-                Ok(additional_program_memory(&[("x".to_owned(), KclValue::none())])),
-            ),
-            (
-                "mixed params, too few given",
-                vec![req_param("x"), opt_param("y")],
-                vec![],
-                Err(KclError::Semantic(KclErrorDetails {
-                    source_ranges: vec![SourceRange::default()],
-                    message: "This function requires a parameter x, but you haven't passed it one.".to_owned(),
-                })),
-            ),
-            (
-                "mixed params, minimum given, should be OK",
-                vec![req_param("x"), opt_param("y")],
-                vec![("x", mem(1))],
-                Ok(additional_program_memory(&[
-                    ("x".to_owned(), mem(1)),
-                    ("y".to_owned(), KclValue::none()),
-                ])),
-            ),
-            (
-                "mixed params, maximum given, should be OK",
-                vec![req_param("x"), opt_param("y")],
-                vec![("x", mem(1)), ("y", mem(2))],
-                Ok(additional_program_memory(&[
-                    ("x".to_owned(), mem(1)),
-                    ("y".to_owned(), mem(2)),
-                ])),
-            ),
-        ] {
-            // Run each test.
-            let func_expr = Node::no_src(FunctionExpression {
-                params,
-                body: Program::empty(),
-                return_type: None,
-                digest: None,
-            });
-            let func_src = FunctionSource::User {
-                ast: Box::new(func_expr),
-                settings: Default::default(),
-                memory: EnvironmentRef::dummy(),
-            };
-            let labeled = args
-                .iter()
-                .map(|(name, value)| {
-                    let arg = Arg::new(value.clone(), SourceRange::default());
-                    ((*name).to_owned(), arg)
-                })
-                .collect::<IndexMap<_, _>>();
-            let exec_ctxt = ExecutorContext {
-                engine: Arc::new(Box::new(
-                    crate::engine::conn_mock::EngineConnection::new().await.unwrap(),
-                )),
-                fs: Arc::new(crate::fs::FileManager::new()),
-                stdlib: Arc::new(crate::std::StdLib::new()),
-                settings: Default::default(),
-                context_type: ContextType::Mock,
-            };
-            let mut exec_state = ExecState::new(&exec_ctxt);
-            exec_state.mod_local.stack = Stack::new_for_tests();
-
-            let args = Args::new_kw(
-                KwArgs {
-                    unlabeled: None,
-                    labeled,
-                    errors: Vec::new(),
-                },
-                SourceRange::default(),
-                exec_ctxt,
-                None,
-            );
-            let actual = assign_args_to_params_kw(&(&func_src).into(), args, &mut exec_state)
-                .map(|_| exec_state.mod_local.stack);
-            assert_eq!(
-                actual, expected,
-                "failed test '{test_name}':\ngot {actual:?}\nbut expected\n{expected:?}"
-            );
-        }
-    }
-
-    #[tokio::test(flavor = "multi_thread")]
-    async fn type_check_user_args() {
-        let program = r#"fn makeMessage(prefix: string, suffix: string) {
-  return prefix + suffix
-}
-
-msg1 = makeMessage(prefix = "world", suffix = " hello")
-msg2 = makeMessage(prefix = 1, suffix = 3)"#;
-        let err = parse_execute(program).await.unwrap_err();
-        assert_eq!(
-            err.message(),
-            "prefix requires a value with type `string`, but found number(default units)"
-        )
-    }
-}

rust/kcl-lib/src/execution/geometry.rs

@@ -8,12 +8,12 @@ use parse_display::{Display, FromStr};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
+#[cfg(feature = "artifact-graph")]
+use crate::execution::ArtifactId;
 use crate::{
     engine::{PlaneName, DEFAULT_PLANE_INFO},
     errors::{KclError, KclErrorDetails},
-    execution::{
-        types::NumericType, ArtifactId, ExecState, ExecutorContext, Metadata, TagEngineInfo, TagIdentifier, UnitLen,
-    },
+    execution::{types::NumericType, ExecState, ExecutorContext, Metadata, TagEngineInfo, TagIdentifier, UnitLen},
     parsing::ast::types::{Node, NodeRef, TagDeclarator, TagNode},
     std::{args::TyF64, sketch::PlaneData},
 };
@@ -256,6 +256,7 @@ pub struct Helix {
     /// The id of the helix.
     pub value: uuid::Uuid,
     /// The artifact ID.
+    #[cfg(feature = "artifact-graph")]
     pub artifact_id: ArtifactId,
     /// Number of revolutions.
     pub revolutions: f64,
@@ -277,6 +278,7 @@ pub struct Plane {
     /// The id of the plane.
     pub id: uuid::Uuid,
     /// The artifact ID.
+    #[cfg(feature = "artifact-graph")]
     pub artifact_id: ArtifactId,
     // The code for the plane either a string or custom.
     pub value: PlaneType,
@@ -506,6 +508,7 @@ impl Plane {
         let id = exec_state.next_uuid();
         Ok(Plane {
             id,
+            #[cfg(feature = "artifact-graph")]
             artifact_id: id.into(),
             info: PlaneInfo::try_from(value.clone())?,
             value: value.into(),
@@ -527,6 +530,7 @@ pub struct Face {
     /// The id of the face.
     pub id: uuid::Uuid,
     /// The artifact ID.
+    #[cfg(feature = "artifact-graph")]
     pub artifact_id: ArtifactId,
     /// The tag of the face.
     pub value: String,
@@ -580,6 +584,7 @@ pub struct Sketch {
     pub tags: IndexMap<String, TagIdentifier>,
     /// The original id of the sketch. This stays the same even if the sketch is
     /// is sketched on face etc.
+    #[cfg(feature = "artifact-graph")]
     pub artifact_id: ArtifactId,
     #[ts(skip)]
     pub original_id: uuid::Uuid,
@@ -743,6 +748,7 @@ pub struct Solid {
     /// The id of the solid.
     pub id: uuid::Uuid,
     /// The artifact ID of the solid.  Unlike `id`, this doesn't change.
+    #[cfg(feature = "artifact-graph")]
     pub artifact_id: ArtifactId,
     /// The extrude surfaces.
     pub value: Vec<ExtrudeSurface>,

rust/kcl-lib/src/execution/kcl_value.rs

@@ -352,8 +352,8 @@ impl KclValue {
     pub(crate) fn from_default_param(param: DefaultParamVal, exec_state: &mut ExecState) -> Self {
         match param {
             DefaultParamVal::Literal(lit) => Self::from_literal(lit, exec_state),
-            DefaultParamVal::KclNone(value) => KclValue::KclNone {
-                value,
+            DefaultParamVal::KclNone(none) => KclValue::KclNone {
+                value: none,
                 meta: Default::default(),
             },
         }