Merge branch 'main' into marijnh/signature-tooltip

.github/ci-cd-scripts/upload-results.sh

@@ -6,7 +6,6 @@ if [ -z "${TAB_API_URL:-}" ] || [ -z "${TAB_API_KEY:-}" ]; then
 fi
 
 project="https://github.com/KittyCAD/modeling-app"
-suite="${CI_SUITE:-unit}"
 branch="${GITHUB_HEAD_REF:-${GITHUB_REF_NAME:-}}"
 commit="${CI_COMMIT_SHA:-${GITHUB_SHA:-}}"
 
@@ -14,7 +13,6 @@ echo "Uploading batch results"
 curl --silent --request POST \
   --header "X-API-Key: ${TAB_API_KEY}" \
   --form "project=${project}" \
-  --form "suite=${suite}" \
   --form "branch=${branch}" \
   --form "commit=${commit}" \
   --form "tests=@test-results/junit.xml" \

.github/workflows/build-apps.yml

@@ -13,7 +13,7 @@ env:
   IS_NIGHTLY: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:
@@ -123,6 +123,18 @@ jobs:
       - id: export_notes
         run: echo "notes=`cat release-notes.md`" >> "$GITHUB_OUTPUT"
 
+      - name: Prepare electron-builder.yml file for updater test
+        if: ${{ env.IS_RELEASE == 'true' }}
+        run: |
+          yq -i '.publish[0].url = "https://dl.zoo.dev/releases/modeling-app/updater-test"' electron-builder.yml
+
+      - uses: actions/upload-artifact@v4
+        if: ${{ env.IS_RELEASE == 'true' }}
+        with:
+          name: prepared-files-updater-test
+          path: |
+            electron-builder.yml
+
 
   build-apps:
     needs: [prepare-files]
@@ -247,6 +259,49 @@ jobs:
 
       # TODO: add the 'Build for Mac TestFlight (nightly)' stage back
 
+      # The steps below are for updater-test builds, only on release
+
+      - uses: actions/download-artifact@v4
+        if: ${{ env.IS_RELEASE == 'true' }}
+        name: prepared-files-updater-test
+
+      - name: Copy updated electron-builder.yml file for updater test
+        if: ${{ env.IS_RELEASE == 'true' }}
+        run: |
+          ls -R prepared-files-updater-test
+          cp prepared-files-updater-test/electron-builder.yml electron-builder.yml
+
+      - name: Build the app (updater-test)
+        if: ${{ env.IS_RELEASE == 'true' }}
+        env:
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
+          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          CSC_LINK: ${{ secrets.APPLE_CERTIFICATE }}
+          CSC_KEY_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+          CSC_KEYCHAIN: ${{ secrets.APPLE_SIGNING_IDENTITY }}
+          WINDOWS_CERTIFICATE_THUMBPRINT: ${{ secrets.WINDOWS_CERTIFICATE_THUMBPRINT }}
+        run: npm run tronb:package:prod
+
+      - uses: actions/upload-artifact@v4
+        if: ${{ env.IS_RELEASE == 'true' }}
+        with:
+          name: updater-test-arm64-${{ matrix.platform }}
+          path: |
+            out/*-arm64-win.exe
+            out/*-arm64-mac.dmg
+            out/*-arm64-linux.AppImage
+
+      - uses: actions/upload-artifact@v4
+        if: ${{ env.IS_RELEASE == 'true' }}
+        with:
+          name: updater-test-x64-${{ matrix.platform }}
+          path: |
+            out/*-x64-win.exe
+            out/*-x64-mac.dmg
+            out/*-x86_64-linux.AppImage
+
 
   upload-apps-release:
     runs-on: ubuntu-22.04

.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

@@ -88,7 +88,6 @@ jobs:
           KITTYCAD_API_TOKEN: ${{secrets.KITTYCAD_API_TOKEN_DEV}}
           ZOO_HOST: https://api.dev.zoo.dev
           RUST_BACKTRACE: full
-          RUST_MIN_STACK: 10485760000
       - name: Commit differences
         if: steps.path-changes.outputs.outside-kcl-samples == 'false' && steps.cargo-test-kcl-samples.outcome == 'failure'
         shell: bash
@@ -120,7 +119,6 @@ jobs:
           # Configure nextest when it's run by insta (via just).
           NEXTEST_PROFILE: ci
           RUST_BACKTRACE: full
-          RUST_MIN_STACK: 10485760000
       - name: Build and archive tests
         run: |
           cd rust
@@ -157,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.
@@ -184,7 +182,6 @@ jobs:
         env:
           KITTYCAD_API_TOKEN: ${{secrets.KITTYCAD_API_TOKEN_DEV}}
           ZOO_HOST: https://api.dev.zoo.dev
-          RUST_MIN_STACK: 10485760000
       - name: Upload results
         if: always()
         run: .github/ci-cd-scripts/upload-results.sh
@@ -193,56 +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 }}
-          CI_SUITE: unit:kcl
-  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}}
-          RUST_MIN_STACK: 10485760000
   run-wasm-tests:
     name: Run wasm tests
     strategy:

.github/workflows/e2e-tests.yml

@@ -40,7 +40,7 @@ jobs:
       - name: Install dependencies
         run: npm install
 
-      - name: Download Wasm cache
+      - name: Download Wasm Cache
         id: download-wasm
         if: ${{ github.event_name != 'schedule' && steps.filter.outputs.rust == 'false' }}
         uses: dawidd6/action-download-artifact@v7
@@ -52,7 +52,7 @@ jobs:
           branch: main
           path: rust/kcl-wasm-lib/pkg
 
-      - name: Build Wasm condition
+      - name: Build WASM condition
         id: wasm
         run: |
           set -euox pipefail
@@ -70,7 +70,7 @@ jobs:
         run: |
           [ -e rust-toolchain.toml ] || cp rust/rust-toolchain.toml ./
 
-      - name: Install Rust
+      - name: Install rust
         if: ${{ steps.wasm.outputs.should-build-wasm == 'true' }}
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
@@ -81,7 +81,7 @@ jobs:
         with:
           tool: wasm-pack
 
-      - name: Use Rust cache
+      - name: Rust Cache
         if: ${{ steps.wasm.outputs.should-build-wasm == 'true' }}
         uses: Swatinem/rust-cache@v2
         with:
@@ -117,7 +117,7 @@ jobs:
       - uses: actions/download-artifact@v4
         name: prepared-wasm
 
-      - name: Copy prepared Wasm
+      - name: Copy prepared wasm
         run: |
           ls -R prepared-wasm
           cp prepared-wasm/kcl_wasm_lib_bg.wasm public
@@ -133,17 +133,20 @@ jobs:
         id: deps-install
         run: npm install
 
-      - name: Cache browsers
+      - name: Cache Playwright Browsers
         uses: actions/cache@v4
         with:
           path: |
             ~/.cache/ms-playwright/
           key: ${{ runner.os }}-playwright-${{ hashFiles('package-lock.json') }}
 
-      - name: Install browsers
+      - name: Install Playwright Browsers
         run: npm run playwright install --with-deps
 
-      - name: Test snapshots
+      - name: build web
+        run: npm run tronb:vite:dev
+
+      - name: Run ubuntu/chrome snapshots
         uses: nick-fields/retry@v3.0.2
         with:
           shell: bash
@@ -156,19 +159,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 }}
-          CI_SUITE: snapshots
-          TARGET: web
-
-      - name: Update snapshots
-        if: always()
-        run: npm run test:snapshots -- --last-failed --update-snapshots
-        env:
-          token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
-          TAB_API_URL: ${{ secrets.TAB_API_URL }}
-          TAB_API_KEY: ${{ secrets.TAB_API_KEY }}
-          CI_COMMIT_SHA: ${{ github.event.pull_request.head.sha }}
-          CI_PR_NUMBER: ${{ github.event.pull_request.number }}
-          CI_SUITE: snapshots
           TARGET: web
 
       - uses: actions/upload-artifact@v4
@@ -180,19 +170,20 @@ jobs:
           retention-days: 30
           overwrite: true
 
-      - name: Check diff
+      - name: Check for changes
         if: ${{ github.ref != 'refs/heads/main' }}
         shell: bash
         id: git-check
         run: |
             git add e2e/playwright/snapshot-tests.spec.ts-snapshots e2e/playwright/snapshots
-            if git status | grep --quiet "Changes to be committed"
+            if git status | grep -q "Changes to be committed"
             then echo "modified=true" >> $GITHUB_OUTPUT
             else echo "modified=false" >> $GITHUB_OUTPUT
             fi
 
-      - name: Commit changes
+      - name: Commit changes, if any
-        if: ${{ steps.git-check.outputs.modified == 'true' }}
+        # TODO: find a more reliable way to detect visual changes
+        if: ${{ false && steps.git-check.outputs.modified == 'true' }}
         shell: bash
         run: |
           git add e2e/playwright/snapshot-tests.spec.ts-snapshots e2e/playwright/snapshots
@@ -202,7 +193,7 @@ jobs:
           git fetch origin
           echo ${{ github.head_ref }}
           git checkout ${{ github.head_ref }}
-          git commit --message "Update snapshots" || true
+          git commit -m "A snapshot a day keeps the bugs away! 📷🐛" || true
           git push
           git push origin ${{ github.head_ref }}
 
@@ -243,16 +234,10 @@ jobs:
             shardTotal: 8
           - os: namespace-profile-macos-8-cores
             shardIndex: 1
-            shardTotal: 2
+            shardTotal: 1
-          - os: namespace-profile-macos-8-cores
-            shardIndex: 2
-            shardTotal: 2
           - os: windows-latest-8-cores
             shardIndex: 1
-            shardTotal: 2
+            shardTotal: 1
-          - os: windows-latest-8-cores
-            shardIndex: 2
-            shardTotal: 2
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4

.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
+            code-target:
-            #- os: windows-latest
+              win32-x64
-            #target: i686-pc-windows-msvc
+              #- os: windows-latest
-            #code-target:
+              #target: i686-pc-windows-msvc
-            #win32-ia32
+              #code-target:
-            #- os: windows-latest
+              #win32-ia32
-            #target: aarch64-pc-windows-msvc
+              #- os: windows-latest
-            #code-target: win32-arm64
+              #target: aarch64-pc-windows-msvc
+              #code-target: win32-arm64
           - os: ubuntu-latest
             target: x86_64-unknown-linux-gnu
-            code-target: linux-x64
+            code-target:
-            #- os: ubuntu-latest
+              linux-x64
-            #target: aarch64-unknown-linux-musl
+              #- os: ubuntu-latest
-            #code-target: linux-arm64
+              #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
+          path:
-          #- uses: actions/download-artifact@v4
+            rust/build
-          #with:
+            #- uses: actions/download-artifact@v4
-          #name: release-i686-pc-windows-msvc
+            #with:
-          #path:
+            #name: release-i686-pc-windows-msvc
-          #build
+            #path:
-          #- uses: actions/download-artifact@v4
+            #build
-          #with:
+            #- uses: actions/download-artifact@v4
-          #name: release-aarch64-pc-windows-msvc
+            #with:
-          #path: rust/build
+            #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
+            uv venv .venv
-          echo "VIRTUAL_ENV=.venv" >> $GITHUB_ENV
+            echo "VIRTUAL_ENV=.venv" >> $GITHUB_ENV
-          echo "$PWD/.venv/bin" >> $GITHUB_PATH
+            echo "$PWD/.venv/bin" >> $GITHUB_PATH
-          uv pip install pip --upgrade
+            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
+            cd rust/kcl-python-bindings
-          uv venv .venv
+            uv venv .venv
-          echo "VIRTUAL_ENV=.venv" >> $GITHUB_ENV
+            echo "VIRTUAL_ENV=.venv" >> $GITHUB_ENV
-          echo "$PWD/.venv/bin" >> $GITHUB_PATH
+            echo "$PWD/.venv/bin" >> $GITHUB_PATH
-          uv pip install pip --upgrade
+            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,116 @@ jobs:
         uses: actions/checkout@v4
       - name: Run codespell
         uses: crate-ci/typos@v1.32.0
+
+  npm-unit-test-kcl-samples:
+    runs-on: ubuntu-latest
+    needs: npm-build-wasm
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+          cache: 'npm'
+
+      - run: npm install
+      - uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc
+        with:
+          tool: wasm-pack
+
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+
+      - name: Copy prepared wasm
+        run: |
+          ls -R prepared-wasm
+          cp prepared-wasm/kcl_wasm_lib_bg.wasm public
+          mkdir rust/kcl-wasm-lib/pkg
+          cp prepared-wasm/kcl_wasm_lib* rust/kcl-wasm-lib/pkg
+
+      - name: Copy prepared ts-rs bindings
+        run: |
+          ls -R prepared-ts-rs-bindings
+          mkdir rust/kcl-lib/bindings
+          cp -r prepared-ts-rs-bindings/* rust/kcl-lib/bindings/
+
+      - run: npm run simpleserver:bg
+        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
+
+      - name: Install Chromium Browser
+        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
+        run: npm run playwright install chromium --with-deps
+
+      - name: run unit tests for kcl samples
+        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
+        run: npm run test:unit:kcl-samples
+        env:
+          VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
+
+  npm-unit-test:
+    runs-on: ubuntu-latest
+    needs: npm-build-wasm
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+          cache: 'npm'
+
+      - run: npm install
+      - uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc
+        with:
+          tool: wasm-pack
+
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+
+      - name: Copy prepared wasm
+        run: |
+          ls -R prepared-wasm
+          cp prepared-wasm/kcl_wasm_lib_bg.wasm public
+          mkdir rust/kcl-wasm-lib/pkg
+          cp prepared-wasm/kcl_wasm_lib* rust/kcl-wasm-lib/pkg
+
+      - name: Copy prepared ts-rs bindings
+        run: |
+          ls -R prepared-ts-rs-bindings
+          mkdir rust/kcl-lib/bindings
+          cp -r prepared-ts-rs-bindings/* rust/kcl-lib/bindings/
+
+      - run: npm run simpleserver:bg
+        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
+
+      - name: Install Chromium Browser
+        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
+        run: npm run playwright install chromium --with-deps
+
+      - name: Run unit tests
+        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
+        run: xvfb-run -a npm run test:unit
+        env:
+          VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
+
+      - name: Check for changes
+        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
+        id: git-check
+        run: |
+            git add src/lang/std/artifactMapGraphs
+            if git status src/lang/std/artifactMapGraphs | grep -q "Changes to be committed"
+            then echo "modified=true" >> $GITHUB_OUTPUT
+            else echo "modified=false" >> $GITHUB_OUTPUT
+            fi
+      - name: Commit changes, if any
+        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' && steps.git-check.outputs.modified == 'true' }}
+        run: |
+          git config --local user.email "github-actions[bot]@users.noreply.github.com"
+          git config --local user.name "github-actions[bot]"
+          git remote set-url origin https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git
+          git fetch origin
+          echo ${{ github.head_ref }}
+          git checkout ${{ github.head_ref }}
+          # TODO when webkit works on ubuntu remove the os part of the commit message
+          git commit -am "Look at this (photo)Graph *in the voice of Nickelback*" || true
+          git push
+          git push origin ${{ github.head_ref }}

.github/workflows/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/

CONTRIBUTING.md

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

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

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

@@ -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/arrays.md

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

docs/kcl-lang/index.md

@@ -4,7 +4,7 @@ excerpt: "Documentation of the KCL language for the Zoo Design Studio."
 layout: manual
 ---
 
-This is a reference for KCL. If you are learning KCL, you may prefer the [guide](https://zoo.dev/docs/kcl-book/intro.html) which explains
+This is a reference for KCL. If you are learning KCL, you may prefer the [guide]() which explains
 things in a more tutorial fashion. See also our documentation of the [standard library](/docs/kcl-std).
 
 ## Topics
@@ -14,7 +14,6 @@ things in a more tutorial fashion. See also our documentation of the [standard l
 * [Values and types](/docs/kcl-lang/types)
 * [Numeric types and units](/docs/kcl-lang/numeric)
 * [Functions](/docs/kcl-lang/functions)
-* [Arrays and ranges](/docs/kcl-lang/arrays)
 * [Projects and modules](/docs/kcl-lang/modules)
 * [Attributes](/docs/kcl-lang/attributes)
 * [Importing geometry from other CAD systems](/docs/kcl-lang/foreign-imports)

docs/kcl-lang/modules.md

@@ -27,6 +27,9 @@ import increment from "util.kcl"
 answer = increment(41)
 ```
 
+Imported files _must_ be in the same project so that units are uniform across
+modules. This means that it must be in the same directory.
+
 Import statements must be at the top-level of a file. It is not allowed to have
 an `import` statement inside a function or in the body of an if‑else.
 
@@ -55,9 +58,6 @@ Imported symbols can be renamed for convenience or to avoid name collisions.
 import increment as inc, decrement as dec from "util.kcl"
 ```
 
-You can import files from the current directory or from subdirectories, but if importing from a
-subdirectory you can only import `main.kcl`.
-
 ---
 
 ## Functions vs `clone`
@@ -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)
 ```
@@ -229,19 +229,6 @@ The final statement is what's important because it's the return value of the
 entire module. The module is expected to return a single object that can be used
 as a variable by the file that imports it.
 
-The name of the file or subdirectory is used as the name of the variable within the importing program.
-If you want to use a different name, you can do so by using the `as` keyword:
-
-```kcl,norun
-import "cube.kcl"                // Introduces a new variable called `cube`.
-import "cube.kcl" as block       // Introduces a new variable called `block`.
-import "cube/main.kcl"           // Introduces a new variable called `cube`.
-import "cube/main.kcl" as block  // Introduces a new variable called `block`.
-```
-
-If the filename includes hyphens (`-`) or starts with an underscore (`_`), then you must specify a
-variable name.
-
 ---
 
 ## Multiple instances of the same import
@@ -254,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)
@@ -270,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-lang/types.md

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

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

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

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

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

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

@@ -10,7 +10,7 @@ Apply a function to every element of a list.
 ```kcl
 map(
   @array: [any],
-  f: fn(any): any,
+  f: Fn,
 ): [any]
 ```
 
@@ -22,7 +22,7 @@ Given a list like `[a, b, c]`, and a function like `f`, returns
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
 | `array` | [`[any]`](/docs/kcl-std/types/std-types-any) | Input array. The output array is this input array, but every element has had the function `f` run on it. | Yes |
-| `f` | [`fn(any): any`](/docs/kcl-std/types/std-types-fn) | A function. The output array is just the input array, but `f` has been run on every item. | Yes |
+| `f` | [`Fn`](/docs/kcl-std/types/std-types-Fn) | A function. The output array is just the input array, but `f` has been run on every item. | Yes |
 
 ### Returns
 

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

@@ -11,8 +11,8 @@ layout: manual
 reduce(
   @array: [any],
   initial: any,
-  f: fn(any, accum: any): any,
+  f: Fn,
-): any
+): [any]
 ```
 
 Take a starting value. Then, for each element of an array, calculate the next value,
@@ -24,11 +24,11 @@ using the previous value and the element.
 |----------|------|-------------|----------|
 | `array` | [`[any]`](/docs/kcl-std/types/std-types-any) | Each element of this array gets run through the function `f`, combined with the previous output from `f`, and then used for the next run. | Yes |
 | `initial` | [`any`](/docs/kcl-std/types/std-types-any) | The first time `f` is run, it will be called with the first item of `array` and this initial starting value. | Yes |
-| `f` | [`fn(any, accum: any): any`](/docs/kcl-std/types/std-types-fn) | Run once per item in the input `array`. This function takes an item from the array, and the previous output from `f` (or `initial` on the very first run). The final time `f` is run, its output is returned as the final output from `reduce`. | Yes |
+| `f` | [`Fn`](/docs/kcl-std/types/std-types-Fn) | Run once per item in the input `array`. This function takes an item from the array, and the previous output from `f` (or `initial` on the very first run). The final time `f` is run, its output is returned as the final output from `reduce`. | Yes |
 
 ### 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-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/index.md

@@ -65,7 +65,7 @@ layout: manual
   * [`line`](/docs/kcl-std/line)
   * [`loft`](/docs/kcl-std/loft)
   * [`patternCircular2d`](/docs/kcl-std/patternCircular2d)
-  * [`patternTransform2d`](/docs/kcl-std/functions/std-sketch-patternTransform2d)
+  * [`patternTransform2d`](/docs/kcl-std/patternTransform2d)
   * [`polygon`](/docs/kcl-std/polygon)
   * [`profileStart`](/docs/kcl-std/profileStart)
   * [`profileStartX`](/docs/kcl-std/profileStartX)
@@ -94,7 +94,7 @@ layout: manual
   * [`intersect`](/docs/kcl-std/intersect)
   * [`patternCircular3d`](/docs/kcl-std/patternCircular3d)
   * [`patternLinear3d`](/docs/kcl-std/patternLinear3d)
-  * [`patternTransform`](/docs/kcl-std/functions/std-solid-patternTransform)
+  * [`patternTransform`](/docs/kcl-std/patternTransform)
   * [`shell`](/docs/kcl-std/functions/std-solid-shell)
   * [`subtract`](/docs/kcl-std/subtract)
   * [`union`](/docs/kcl-std/union)
@@ -128,9 +128,6 @@ layout: manual
   * [`E`](/docs/kcl-std/consts/std-math-E)
   * [`PI`](/docs/kcl-std/consts/std-math-PI)
   * [`TAU`](/docs/kcl-std/consts/std-math-TAU)
-* [**std::sweep**](/docs/kcl-std/modules/std-sweep)
-  * [`sweep::SKETCH_PLANE`](/docs/kcl-std/consts/std-sweep-SKETCH_PLANE)
-  * [`sweep::TRAJECTORY`](/docs/kcl-std/consts/std-sweep-TRAJECTORY)
 * [**std::turns**](/docs/kcl-std/modules/std-turns)
   * [`turns::HALF_TURN`](/docs/kcl-std/consts/std-turns-HALF_TURN)
   * [`turns::QUARTER_TURN`](/docs/kcl-std/consts/std-turns-QUARTER_TURN)
@@ -143,13 +140,13 @@ See also the [types overview](/docs/kcl-lang/types)
 
 * [**Primitive types**](/docs/kcl-lang/types)
   * [`End`](/docs/kcl-lang/types#End)
+  * [`Fn`](/docs/kcl-std/types/std-types-Fn)
   * [`ImportedGeometry`](/docs/kcl-std/types/std-types-ImportedGeometry)
   * [`Start`](/docs/kcl-lang/types#Start)
   * [`TagDeclarator`](/docs/kcl-lang/types#TagDeclarator)
   * [`TagIdentifier`](/docs/kcl-lang/types#TagIdentifier)
   * [`any`](/docs/kcl-std/types/std-types-any)
   * [`bool`](/docs/kcl-std/types/std-types-bool)
-  * [`fn`](/docs/kcl-std/types/std-types-fn)
   * [`number`](/docs/kcl-std/types/std-types-number)
   * [`string`](/docs/kcl-std/types/std-types-string)
   * [`tag`](/docs/kcl-std/types/std-types-tag)

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

@@ -30,7 +30,7 @@ This module contains functions for creating and manipulating sketches, and makin
 * [`line`](/docs/kcl-std/line)
 * [`loft`](/docs/kcl-std/loft)
 * [`patternCircular2d`](/docs/kcl-std/patternCircular2d)
-* [`patternTransform2d`](/docs/kcl-std/functions/std-sketch-patternTransform2d)
+* [`patternTransform2d`](/docs/kcl-std/patternTransform2d)
 * [`polygon`](/docs/kcl-std/polygon)
 * [`profileStart`](/docs/kcl-std/profileStart)
 * [`profileStartX`](/docs/kcl-std/profileStartX)

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

@@ -18,7 +18,7 @@ This module contains functions for modifying solids, e.g., by adding a fillet or
 * [`intersect`](/docs/kcl-std/intersect)
 * [`patternCircular3d`](/docs/kcl-std/patternCircular3d)
 * [`patternLinear3d`](/docs/kcl-std/patternLinear3d)
-* [`patternTransform`](/docs/kcl-std/functions/std-solid-patternTransform)
+* [`patternTransform`](/docs/kcl-std/patternTransform)
 * [`shell`](/docs/kcl-std/functions/std-solid-shell)
 * [`subtract`](/docs/kcl-std/subtract)
 * [`union`](/docs/kcl-std/union)

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

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

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

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

docs/kcl-std/modules/std.md

@@ -11,7 +11,7 @@ Contains frequently used constants, functions for interacting with the KittyCAD
 
 The standard library is organised into modules (listed below), but most things are always available in KCL programs. 
 
-You might also want the [KCL language reference](/docs/kcl-lang) or the [KCL guide](https://zoo.dev/docs/kcl-book/intro.html). 
+You might also want the [KCL language reference](/docs/kcl-lang) or the [KCL guide](). 
 
 ## Modules
 
@@ -19,7 +19,6 @@ You might also want the [KCL language reference](/docs/kcl-lang) or the [KCL gui
 * [`math`](/docs/kcl-std/modules/std-math)
 * [`sketch`](/docs/kcl-std/modules/std-sketch)
 * [`solid`](/docs/kcl-std/modules/std-solid)
-* [`sweep::sweep`](/docs/kcl-std/modules/std-sweep)
 * [`transform`](/docs/kcl-std/modules/std-transform)
 * [`turns::turns`](/docs/kcl-std/modules/std-turns)
 * [`types`](/docs/kcl-std/modules/std-types)

docs/kcl-std/patternCircular2d.md

@@ -12,8 +12,8 @@ patternCircular2d(
   @sketchSet: [Sketch],
   instances: number,
   center: Point2d,
-  arcDegrees?: number,
+  arcDegrees: number,
-  rotateDuplicates?: bool,
+  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 |
+| `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. Defaults to true. | No |
+| `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/patternTransform2d.md

@@ -1,19 +1,19 @@
 ---
 title: "patternTransform2d"
 subtitle: "Function in std::sketch"
-excerpt: "Just like `patternTransform`, but works on 2D sketches not 3D solids."
+excerpt: "Just like patternTransform, but works on 2D sketches not 3D solids."
 layout: manual
 ---
 
-Just like `patternTransform`, but works on 2D sketches not 3D solids.
+Just like patternTransform, but works on 2D sketches not 3D solids.
 
 ```kcl
 patternTransform2d(
-  @sketches: [Sketch; 1+],
+  @sketches: [Sketch],
-  instances: number(_),
+  instances: number,
-  transform: fn(number(_)): { },
+  transform: FunctionSource,
-  useOriginal?: boolean,
+  useOriginal?: bool,
-): [Sketch; 1+]
+): [Sketch]
 ```
 
 
@@ -22,14 +22,14 @@ patternTransform2d(
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `sketches` | [`[Sketch; 1+]`](/docs/kcl-std/types/std-types-Sketch) | The sketch(es) to duplicate. | Yes |
+| `sketches` | [`[Sketch]`](/docs/kcl-std/types/std-types-Sketch) | The sketch(es) to duplicate | 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 |
+| `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 |
-| `transform` | [`fn(number(_)): { }`](/docs/kcl-std/types/std-types-fn) | How each replica should be transformed. The transform function takes a single parameter: an integer representing which number replication the transform is for. E.g. the first replica to be transformed will be passed the argument `1`. This simplifies your math: the transform function can rely on id `0` being the original instance passed into the `patternTransform`. See the examples. | Yes |
+| `transform` | `FunctionSource` | How each replica should be transformed. The transform function takes a single parameter: an integer representing which number replication the transform is for. E.g. the first replica to be transformed will be passed the argument `1`. This simplifies your math: the transform function can rely on id `0` being the original instance passed into the `patternTransform`. See the examples. | Yes |
-| `useOriginal` | `boolean` | If the target was sketched on an extrusion, setting this will use the original sketch as the target, not the entire joined solid. | No |
+| `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
 
-[`[Sketch; 1+]`](/docs/kcl-std/types/std-types-Sketch)
+[`[Sketch]`](/docs/kcl-std/types/std-types-Sketch)
 
 
 ### Examples

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

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

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

@@ -134,6 +134,8 @@ extrude001 = extrude(sketch001, length = 5)`
     await page.setBodyDimensions({ width: 1200, height: 500 })
     await homePage.goToModelingScene()
 
+    await page.waitForTimeout(1000)
+
     // Ensure badge is present
     const codePaneButtonHolder = page.locator('#code-button-holder')
     await expect(codePaneButtonHolder).toContainText('notification', {
@@ -156,14 +158,10 @@ extrude001 = extrude(sketch001, length = 5)`
     await expect(
       page
         .getByText(
-          'Solid3D revolve failed:  sketch profile must lie entirely on one side of the revolution axis'
+          'Modeling command failed: [ApiError { error_code: InternalEngine, message: "Solid3D revolve failed:  sketch profile must lie entirely on one side of the revolution axis" }]'
         )
         .first()
     ).toBeVisible()
-
-    // Make sure ApiError is not on the page.
-    // This ensures we didn't nest the json
-    await expect(page.getByText('ApiError')).not.toBeVisible()
   })
 
   test('When error is not in view WITH LINTS you can click the badge to scroll to it', async ({
@@ -181,7 +179,7 @@ extrude001 = extrude(sketch001, length = 5)`
     await page.setBodyDimensions({ width: 1200, height: 500 })
     await homePage.goToModelingScene()
 
-    // await scene.settled(cmdBar)
+    await scene.settled(cmdBar)
 
     // Ensure badge is present
     const codePaneButtonHolder = page.locator('#code-button-holder')
@@ -235,48 +233,6 @@ extrude001 = extrude(sketch001, length = 5)`
         .first()
     ).toBeVisible()
   })
-
-  test('KCL errors with functions show hints for the entire backtrace', async ({
-    page,
-    homePage,
-    scene,
-    cmdBar,
-    editor,
-    toolbar,
-  }) => {
-    await homePage.goToModelingScene()
-    await scene.settled(cmdBar)
-
-    const code = `fn check(@x) {
-  return assert(x, isGreaterThan = 0)
-}
-
-fn middle(@x) {
-  return check(x)
-}
-
-middle(1)
-middle(0)
-`
-    await test.step('Set the code with a KCL error', async () => {
-      await toolbar.openPane('code')
-      await editor.replaceCode('', code)
-    })
-    // This shows all the diagnostics in a way that doesn't require the mouse
-    // pointer hovering over a coordinate, which would be brittle.
-    await test.step('Open CodeMirror diagnostics list', async () => {
-      // Ensure keyboard focus is in the editor.
-      await page.getByText('fn check(').click()
-      await page.keyboard.press('ControlOrMeta+Shift+M')
-    })
-    await expect(
-      page.getByText(`assert failed: Expected 0 to be greater than 0 but it wasn't
-check()
-middle()`)
-    ).toBeVisible()
-    // There should be one hint inside middle() and one at the top level.
-    await expect(page.getByText('Part of the error backtrace')).toHaveCount(2)
-  })
 })
 
 test(

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()
+    await page.getByText(`close()`).click() // TODO remove this and reinstate // await topHorzSegmentClick()
-
-    // 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.expectState({
       stage: 'arguments',
       commandName: 'Extrude',
-      currentArgKey: 'length',
+      currentArgKey: 'sketches',
-      currentArgValue: '5',
+      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,56 +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',
-    })
-  })
-
-  test('Text-to-CAD command can be closed with escape while in prompt', async ({
-    page,
-    homePage,
-    cmdBar,
-  }) => {
-    await homePage.expectState({
-      projectCards: [],
-      sortBy: 'last-modified-desc',
-    })
-    await homePage.textToCadBtn.click()
-    await cmdBar.expectState({
-      stage: 'arguments',
-      commandName: 'Text-to-CAD Create',
-      currentArgKey: 'prompt',
-      currentArgValue: '',
-      headerArguments: {
-        Method: 'New project',
-        NewProjectName: 'untitled',
-        Prompt: '',
-      },
-      highlightedHeaderArg: 'prompt',
-    })
-    await page.keyboard.press('Escape')
-    await cmdBar.toBeClosed()
-    await cmdBar.expectState({
-      stage: 'commandBarClosed',
-    })
-  })
 })

e2e/playwright/desktop-export.spec.ts

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

e2e/playwright/editor-tests.spec.ts

@@ -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', {
+      const resetCameraButton = page.getByRole('button', { name: 'Reset view' })
-        name: 'Reset view',
-      })
       const locationToHaveColor = async (
         position: { x: number; y: number },
         color: [number, number, number]
@@ -1536,6 +1533,7 @@ sketch001 = startSketchOn(XZ)
     await homePage.goToModelingScene()
 
     await scene.connectionEstablished()
+    await scene.settled(cmdBar)
 
     await scene.expectPixelColor(
       TEST_COLORS.DARK_MODE_BKGD,

e2e/playwright/file-tree.spec.ts

@@ -238,26 +238,6 @@ test.describe('when using the file tree to', () => {
     }
   )
 
-  test(
-    `create new folders and that doesn't trigger a navigation`,
-    { tag: ['@electron', '@macos', '@windows'] },
-    async ({ page, homePage, scene, toolbar, cmdBar }) => {
-      await homePage.goToModelingScene()
-      await scene.settled(cmdBar)
-      await toolbar.openPane('files')
-      const { createNewFolder } = await getUtils(page, test)
-
-      await createNewFolder('folder')
-
-      await createNewFolder('folder.kcl')
-
-      await test.step(`Postcondition: folders are created and we didn't navigate`, async () => {
-        await toolbar.expectFileTreeState(['folder', 'folder.kcl', 'main.kcl'])
-        await expect(toolbar.fileName).toHaveText('main.kcl')
-      })
-    }
-  )
-
   test(
     'deleting all files recreates a default main.kcl with no code',
     { tag: '@electron' },

e2e/playwright/fixtures/cmdBarFixture.ts

@@ -105,19 +105,14 @@ export class CmdBarFixture {
   expectState = async (expected: CmdBarSerialised) => {
     return expect.poll(() => this._serialiseCmdBar()).toEqual(expected)
   }
-  /**
+  /** The method will use buttons OR press enter randomly to progress the cmdbar,
-   * This method is used to progress the command bar to the next step, defaulting to clicking the next button.
+   * this could have unexpected results depending on what's focused
-   * Optionally, with the `shouldUseKeyboard` parameter, it will hit `Enter` to progress.
+   *
-   * * TODO: This method assumes the user has a valid input to the current stage,
+   * TODO: This method assumes the user has a valid input to the current stage,
    * and assumes we are past the `pickCommand` step.
    */
-  progressCmdBar = async (shouldUseKeyboard = false) => {
+  progressCmdBar = async (shouldFuzzProgressMethod = true) => {
     await this.page.waitForTimeout(2000)
-    if (shouldUseKeyboard) {
-      await this.page.keyboard.press('Enter')
-      return
-    }
-
     const arrowButton = this.page.getByRole('button', {
       name: 'arrow right Continue',
     })
@@ -151,19 +146,15 @@ 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()
     }
   }
 
-  closeCmdBar = async () => {
-    const cmdBarCloseBtn = this.page.getByTestId('command-bar-close-button')
-    await cmdBarCloseBtn.click()
-    await expect(this.cmdBarElement).not.toBeVisible()
-  }
-
   get cmdSearchInput() {
     return this.page.getByTestId('cmd-bar-search')
   }
@@ -307,32 +298,4 @@ export class CmdBarFixture {
       `Monitoring text-to-cad API requests. Output will be saved to: ${outputPath}`
     )
   }
-
-  async toBeOpened() {
-    // Check that the command bar is opened
-    await expect(this.cmdBarElement).toBeVisible({ timeout: 10_000 })
-  }
-
-  async toBeClosed() {
-    // Check that the command bar is closed
-    await expect(this.cmdBarElement).not.toBeVisible({ timeout: 10_000 })
-  }
-
-  async expectArgValue(value: string) {
-    // Check the placeholder project name exists
-    const actualArgument = await this.cmdBarElement
-      .getByTestId('cmd-bar-arg-value')
-      .inputValue()
-    const expectedArgument = value
-    expect(actualArgument).toBe(expectedArgument)
-  }
-
-  async expectCommandName(value: string) {
-    // Check the placeholder project name exists
-    const actual = await this.cmdBarElement
-      .getByTestId('command-name')
-      .textContent()
-    const expected = value
-    expect(actual).toBe(expected)
-  }
 }

e2e/playwright/fixtures/homePageFixture.ts

@@ -24,9 +24,7 @@ export class HomePageFixture {
   projectTextName!: Locator
   sortByDateBtn!: Locator
   sortByNameBtn!: Locator
-  appHeader!: Locator
   tutorialBtn!: Locator
-  textToCadBtn!: Locator
 
   constructor(page: Page) {
     this.page = page
@@ -46,9 +44,7 @@ export class HomePageFixture {
 
     this.sortByDateBtn = this.page.getByTestId('home-sort-by-modified')
     this.sortByNameBtn = this.page.getByTestId('home-sort-by-name')
-    this.appHeader = this.page.getByTestId('app-header')
     this.tutorialBtn = this.page.getByTestId('home-tutorial-button')
-    this.textToCadBtn = this.page.getByTestId('home-text-to-cad')
   }
 
   private _serialiseSortBy = async (): Promise<
@@ -123,19 +119,10 @@ export class HomePageFixture {
     await projectCard.click()
   }
 
-  /** Returns the project name in case caller has used the default and needs it */
+  goToModelingScene = async (name: string = 'testDefault') => {
-  goToModelingScene = async (name = '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 () => {
-    await expect(this.appHeader).toHaveAttribute(
-      'data-native-file-menu',
-      'true'
-    )
   }
 }

e2e/playwright/fixtures/sceneFixture.ts

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

e2e/playwright/lib/api-reporter.ts

@@ -61,7 +61,6 @@ class MyAPIReporter implements Reporter {
     const payload = {
       // Required information
       project: 'https://github.com/KittyCAD/modeling-app',
-      suite: process.env.CI_SUITE || 'e2e',
       branch: process.env.GITHUB_HEAD_REF || process.env.GITHUB_REF_NAME || '',
       commit: process.env.CI_COMMIT_SHA || process.env.GITHUB_SHA || '',
       test: test.titlePath().slice(2).join(' › '),

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: '' },
+            headerArguments: { Sketches: '' },
-            highlightedHeaderArg: 'Profiles',
+            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,17 +1867,13 @@ sketch002 = startSketchOn(XZ)
         await cmdBar.expectState({
           commandName: 'Sweep',
           headerArguments: {
-            Profiles: '1 profile',
+            Sketches: '1 face',
             Path: '1 segment',
             Sectional: '',
           },
           stage: 'review',
         })
-        // Confirm we can submit from the review step with just `Enter`
+        await cmdBar.progressCmdBar()
-        await cmdBar.progressCmdBar(true)
-        await cmdBar.expectState({
-          stage: 'commandBarClosed',
-        })
       })
 
       await test.step(`Confirm code is added to the editor, scene has changed`, async () => {
@@ -1917,51 +1931,63 @@ sketch002 = startSketchOn(XZ)
     })
   })
 
-  test(`Sweep point-and-click helix`, async ({
+  test(`Sweep point-and-click failing validation`, async ({
     context,
     page,
     homePage,
     scene,
-    editor,
     toolbar,
     cmdBar,
   }) => {
-    const circleCode = `circle(sketch001, center = [0, -1], radius = .1)`
+    const initialCode = `@settings(defaultLengthUnit = in)
-    const initialCode = `helix001 = helix(
+sketch001 = startSketchOn(YZ)
-  axis = X,
+  |> circle(
-  radius = 1,
+       center = [0, 0],
-  length = 10,
+       radius = 500
-  revolutions = 10,
+     )
-  angleStart = 0,
+sketch002 = startSketchOn(XZ)
-  ccw = false,
+  |> startProfile(at = [0, 0])
-)
+  |> xLine(length = -500)
-sketch001 = startSketchOn(XZ)
+  |> line(endAbsolute = [-2000, 500])
-profile001 = ${circleCode}`
+`
-    const sweepDeclaration = 'sweep001 = sweep(profile001, path = helix001)'
-
     await context.addInitScript((initialCode) => {
       localStorage.setItem('persistCode', initialCode)
     }, initialCode)
+    await page.setBodyDimensions({ width: 1000, height: 500 })
     await homePage.goToModelingScene()
     await scene.settled(cmdBar)
 
-    await test.step(`Add sweep through the command bar flow`, async () => {
+    // One dumb hardcoded screen pixel value
-      await toolbar.openPane('feature-tree')
+    const testPoint = { x: 700, y: 250 }
+    const [clickOnSketch1] = scene.makeMouseHelpers(testPoint.x, testPoint.y)
+    const [clickOnSketch2] = scene.makeMouseHelpers(
+      testPoint.x - 50,
+      testPoint.y
+    )
+
+    await test.step(`Look for sketch001`, async () => {
+      await toolbar.closePane('code')
+      await scene.expectPixelColor([53, 53, 53], testPoint, 15)
+    })
+
+    await test.step(`Go through the command bar flow and fail validation with a toast`, async () => {
       await toolbar.sweepButton.click()
+      await expect
+        .poll(() => page.getByText('Please select one').count())
+        .toBe(1)
       await cmdBar.expectState({
         commandName: 'Sweep',
         currentArgKey: 'sketches',
         currentArgValue: '',
         headerArguments: {
           Sectional: '',
-          Profiles: '',
+          Sketches: '',
           Path: '',
         },
-        highlightedHeaderArg: 'Profiles',
+        highlightedHeaderArg: 'sketches',
         stage: 'arguments',
       })
-      await editor.scrollToText(circleCode)
+      await clickOnSketch1()
-      await page.getByText(circleCode).click()
       await cmdBar.progressCmdBar()
       await cmdBar.expectState({
         commandName: 'Sweep',
@@ -1969,45 +1995,17 @@ profile001 = ${circleCode}`
         currentArgValue: '',
         headerArguments: {
           Sectional: '',
-          Profiles: '1 profile',
+          Sketches: '1 face',
-          Path: '',
-        },
-        highlightedHeaderArg: 'path',
-        stage: 'arguments',
-      })
-      const helix = await toolbar.getFeatureTreeOperation('Helix', 0)
-      await helix.click()
-      await cmdBar.expectState({
-        commandName: 'Sweep',
-        currentArgKey: 'path',
-        currentArgValue: '',
-        headerArguments: {
-          Sectional: '',
-          Profiles: '1 profile',
           Path: '',
         },
         highlightedHeaderArg: 'path',
         stage: 'arguments',
       })
+      await clickOnSketch2()
       await cmdBar.progressCmdBar()
-      await cmdBar.expectState({
+      await expect(
-        commandName: 'Sweep',
+        page.getByText('Unable to sweep with the current selection. Reason:')
-        headerArguments: {
+      ).toBeVisible()
-          Profiles: '1 profile',
-          Path: '1 helix',
-          Sectional: '',
-        },
-        stage: 'review',
-      })
-      await cmdBar.progressCmdBar(true)
-      await editor.expectEditor.toContain(sweepDeclaration)
-    })
-
-    await test.step('Delete sweep via feature tree selection', async () => {
-      const sweep = await toolbar.getFeatureTreeOperation('Sweep', 0)
-      await sweep.click()
-      await page.keyboard.press('Delete')
-      await editor.expectEditor.not.toContain(sweepDeclaration)
     })
   })
 
@@ -2092,6 +2090,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',
@@ -2621,6 +2631,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',
@@ -2726,6 +2748,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',
@@ -3209,6 +3244,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: {
@@ -3590,6 +3627,67 @@ profile001 = startProfile(sketch001, at = [-20, 20])
     })
   })
 
+  test(`Shell dry-run validation rejects sweeps`, async ({
+    context,
+    page,
+    homePage,
+    scene,
+    editor,
+    toolbar,
+    cmdBar,
+  }) => {
+    const initialCode = `sketch001 = startSketchOn(YZ)
+  |> circle(
+       center = [0, 0],
+       radius = 500
+     )
+sketch002 = startSketchOn(XZ)
+    |> startProfile(at = [0, 0])
+  |> xLine(length = -2000)
+sweep001 = sweep(sketch001, path = sketch002)
+`
+    await context.addInitScript((initialCode) => {
+      localStorage.setItem('persistCode', initialCode)
+    }, initialCode)
+    await page.setBodyDimensions({ width: 1000, height: 500 })
+    await homePage.goToModelingScene()
+    await scene.settled(cmdBar)
+
+    // One dumb hardcoded screen pixel value
+    const testPoint = { x: 500, y: 250 }
+    const [clickOnSweep] = scene.makeMouseHelpers(testPoint.x, testPoint.y)
+
+    await test.step(`Confirm sweep exists`, async () => {
+      await toolbar.closePane('code')
+      await scene.expectPixelColor([231, 231, 231], testPoint, 15)
+    })
+
+    await test.step(`Go through the Shell flow and fail validation with a toast`, async () => {
+      await toolbar.shellButton.click()
+      await expect
+        .poll(() => page.getByText('Please select one').count())
+        .toBe(1)
+      await cmdBar.expectState({
+        stage: 'arguments',
+        currentArgKey: 'selection',
+        currentArgValue: '',
+        headerArguments: {
+          Selection: '',
+          Thickness: '',
+        },
+        highlightedHeaderArg: 'selection',
+        commandName: 'Shell',
+      })
+      await clickOnSweep()
+      await page.waitForTimeout(500)
+      await cmdBar.progressCmdBar()
+      await expect(
+        page.getByText('Unable to shell with the current selection. Reason:')
+      ).toBeVisible()
+      await page.waitForTimeout(1000)
+    })
+  })
+
   test.describe('Revolve point and click workflows', () => {
     test('Base case workflow, auto spam continue in command bar', async ({
       context,
@@ -3638,17 +3736,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()
@@ -4577,12 +4674,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',
@@ -4593,7 +4702,7 @@ path001 = startProfile(sketch001, at = [0, 0])
       await cmdBar.expectState({
         stage: 'review',
         headerArguments: {
-          Profiles: '2 profiles',
+          Sketches: '2 faces',
           Length: '1',
         },
         commandName: 'Extrude',
@@ -4659,12 +4768,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: '',
         },
@@ -4677,7 +4799,7 @@ path001 = startProfile(sketch001, at = [0, 0])
       await cmdBar.expectState({
         stage: 'review',
         headerArguments: {
-          Profiles: '2 profiles',
+          Sketches: '2 faces',
           Path: '1 segment',
           Sectional: '',
         },
@@ -4743,12 +4865,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: '',
         },
@@ -4764,7 +4899,7 @@ path001 = startProfile(sketch001, at = [0, 0])
         currentArgKey: 'angle',
         currentArgValue: '360',
         headerArguments: {
-          Profiles: '2 profiles',
+          Sketches: '2 faces',
           AxisOrEdge: 'Edge',
           Edge: '1 segment',
           Angle: '',
@@ -4777,7 +4912,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',
@@ -4808,34 +4943,4 @@ path001 = startProfile(sketch001, at = [0, 0])
       )
     })
   })
-
-  test(`Point and click codemods can't run on KCL errors`, async ({
-    context,
-    page,
-    homePage,
-    scene,
-    editor,
-    toolbar,
-    cmdBar,
-  }) => {
-    const badCode = `sketch001 = startSketchOn(XZ)
-profile001 = circle(sketch001, center = [0, 0], radius = 1)
-extrude001 = extrude(profile001 length = 1)`
-    await context.addInitScript((initialCode) => {
-      localStorage.setItem('persistCode', initialCode)
-    }, badCode)
-    await page.setBodyDimensions({ width: 1000, height: 500 })
-    await homePage.goToModelingScene()
-    await scene.connectionEstablished()
-
-    await test.step(`Start Sketch is disabled`, async () => {
-      await expect(toolbar.startSketchBtn).not.toBeEnabled()
-      await editor.expectEditor.toContain(badCode, { shouldNormalise: true })
-    })
-
-    await test.step(`Helix is disabled`, async () => {
-      await expect(toolbar.helixButton).not.toBeEnabled()
-      await editor.expectEditor.toContain(badCode, { shouldNormalise: true })
-    })
-  })
 })

e2e/playwright/projects.spec.ts

@@ -1818,6 +1818,7 @@ test(
         'extrude-custom-plane.kcl',
         'extrude-inside-fn-with-tags.kcl',
         'fillet-and-shell.kcl',
+        'fillet_duplicate_tags.kcl',
         'focusrite_scarlett_mounting_bracket.kcl',
         'function_sketch.kcl',
         'function_sketch_with_position.kcl',
@@ -1825,6 +1826,7 @@ test(
         'helix_defaults.kcl',
         'helix_defaults_negative_extrude.kcl',
         'helix_with_length.kcl',
+        'i_shape.kcl',
         'kittycad_svg.kcl',
         'lego.kcl',
         'lsystem.kcl',
@@ -2064,59 +2066,3 @@ test(
     })
   }
 )
-
-test(
-  'nested dir import works on windows',
-  { tag: ['@electron', '@windows'] },
-  async ({ scene, cmdBar, context, page }, testInfo) => {
-    // Skip if on non-windows
-    if (process.platform !== 'win32') {
-      test.skip()
-    }
-    await context.folderSetupFn(async (dir) => {
-      const bracketDir = path.join(dir, 'bracket')
-      await fsp.mkdir(bracketDir, { recursive: true })
-      const nestedDir = path.join(bracketDir, 'nested')
-      await fsp.mkdir(nestedDir, { recursive: true })
-
-      await fsp.copyFile(
-        executorInputPath('cylinder-inches.kcl'),
-        path.join(nestedDir, 'main.kcl')
-      )
-      await fsp.writeFile(
-        path.join(bracketDir, 'main.kcl'),
-        `import 'nested\\main.kcl' as thing
-
-thing`
-      )
-    })
-
-    await page.setBodyDimensions({ width: 1200, height: 500 })
-    const u = await getUtils(page)
-
-    const pointOnModel = { x: 630, y: 280 }
-
-    await test.step('Opening the bracket project should load the stream', async () => {
-      // expect to see the text bracket
-      await expect(page.getByText('bracket')).toBeVisible()
-
-      await page.getByText('bracket').click()
-
-      await scene.settled(cmdBar)
-
-      await expect(
-        page.getByRole('button', { name: 'Start Sketch' })
-      ).toBeEnabled({
-        timeout: 20_000,
-      })
-
-      // gray at this pixel means the stream has loaded in the most
-      // user way we can verify it (pixel color)
-      await expect
-        .poll(() => u.getGreatestPixDiff(pointOnModel, [125, 125, 125]), {
-          timeout: 10_000,
-        })
-        .toBeLessThan(15)
-    })
-  }
-)

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/regression-tests.spec.ts

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

e2e/playwright/sketch-tests.spec.ts

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

e2e/playwright/snapshot-tests.spec.ts

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

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

@@ -1,257 +1,236 @@
 import type { EngineCommand } from '@src/lang/std/artifactGraph'
 import { uuidv4 } from '@src/lib/utils'
 
-import {
+import { commonPoints, getUtils } from '@e2e/playwright/test-utils'
-  commonPoints,
-  getUtils,
-  TEST_COLORS,
-  circleMove,
-} from '@e2e/playwright/test-utils'
 import { expect, test } from '@e2e/playwright/zoo-test'
 
-test.describe('Test network related behaviors', () => {
+test.describe(
-  test(
+  'Test network and connection issues',
-    'simulate network down and network little widget',
+  {
-    { tag: '@skipLocalEngine' },
+    tag: ['@macos', '@windows'],
-    async ({ page, homePage }) => {
+  },
-      const networkToggleConnectedText = page.getByText('Connected')
+  () => {
-      const networkToggleWeakText = page.getByText('Network health (Weak)')
+    test(
+      'simulate network down and network little widget',
+      { tag: '@skipLocalEngine' },
+      async ({ page, homePage }) => {
+        const u = await getUtils(page)
+        await page.setBodyDimensions({ width: 1200, height: 500 })
 
-      const u = await getUtils(page)
+        await homePage.goToModelingScene()
-      await page.setBodyDimensions({ width: 1200, height: 500 })
 
-      await homePage.goToModelingScene()
+        const networkToggle = page.getByTestId('network-toggle')
 
-      const networkToggle = page.getByTestId('network-toggle')
+        // This is how we wait until the stream is online
+        await expect(
+          page.getByRole('button', { name: 'Start Sketch' })
+        ).not.toBeDisabled({ timeout: 15000 })
 
-      // This is how we wait until the stream is online
+        const networkWidget = page.locator('[data-testid="network-toggle"]')
-      await expect(
+        await expect(networkWidget).toBeVisible()
-        page.getByRole('button', { name: 'Start Sketch' })
+        await networkWidget.hover()
-      ).not.toBeDisabled({ timeout: 15000 })
 
-      const networkWidget = page.locator('[data-testid="network-toggle"]')
+        const networkPopover = page.locator('[data-testid="network-popover"]')
-      await expect(networkWidget).toBeVisible()
+        await expect(networkPopover).not.toBeVisible()
-      await networkWidget.hover()
 
-      const networkPopover = page.locator('[data-testid="network-popover"]')
+        // (First check) Expect the network to be up
-      await expect(networkPopover).not.toBeVisible()
+        await expect(networkToggle).toContainText('Connected')
 
-      // (First check) Expect the network to be up
+        // Click the network widget
-      await expect(
+        await networkWidget.click()
-        networkToggleConnectedText.or(networkToggleWeakText)
-      ).toBeVisible()
 
-      // Click the network widget
+        // Check the modal opened.
-      await networkWidget.click()
+        await expect(networkPopover).toBeVisible()
 
-      // Check the modal opened.
+        // Click off the modal.
-      await expect(networkPopover).toBeVisible()
+        await page.mouse.click(100, 100)
+        await expect(networkPopover).not.toBeVisible()
 
-      // Click off the modal.
+        // Turn off the network
-      await page.mouse.click(100, 100)
+        await u.emulateNetworkConditions({
-      await expect(networkPopover).not.toBeVisible()
+          offline: true,
+          // values of 0 remove any active throttling. crbug.com/456324#c9
+          latency: 0,
+          downloadThroughput: -1,
+          uploadThroughput: -1,
+        })
 
-      // Turn off the network
+        // Expect the network to be down
-      await u.emulateNetworkConditions({
+        await expect(networkToggle).toContainText('Problem')
-        offline: true,
-        // values of 0 remove any active throttling. crbug.com/456324#c9
-        latency: 0,
-        downloadThroughput: -1,
-        uploadThroughput: -1,
-      })
 
-      // Expect the network to be down
+        // Click the network widget
-      await expect(networkToggle).toContainText('Problem')
+        await networkWidget.click()
 
-      // Click the network widget
+        // Check the modal opened.
-      await networkWidget.click()
+        await expect(networkPopover).toBeVisible()
 
-      // Check the modal opened.
+        // Click off the modal.
-      await expect(networkPopover).toBeVisible()
+        await page.mouse.click(0, 0)
+        await expect(networkPopover).not.toBeVisible()
 
-      // Click off the modal.
+        // Turn back on the network
-      await page.mouse.click(0, 0)
+        await u.emulateNetworkConditions({
-      await expect(networkPopover).not.toBeVisible()
+          offline: false,
+          // values of 0 remove any active throttling. crbug.com/456324#c9
+          latency: 0,
+          downloadThroughput: -1,
+          uploadThroughput: -1,
+        })
 
-      // Turn back on the network
+        await expect(
-      await u.emulateNetworkConditions({
+          page.getByRole('button', { name: 'Start Sketch' })
-        offline: false,
+        ).not.toBeDisabled({ timeout: 15000 })
-        // values of 0 remove any active throttling. crbug.com/456324#c9
-        latency: 0,
-        downloadThroughput: -1,
-        uploadThroughput: -1,
-      })
 
-      await expect(
+        // (Second check) expect the network to be up
-        page.getByRole('button', { name: 'Start Sketch' })
+        await expect(networkToggle).toContainText('Connected')
-      ).not.toBeDisabled({ timeout: 15000 })
+      }
+    )
 
-      // (Second check) expect the network to be up
+    test(
-      await expect(
+      'Engine disconnect & reconnect in sketch mode',
-        networkToggleConnectedText.or(networkToggleWeakText)
+      { tag: '@skipLocalEngine' },
-      ).toBeVisible()
+      async ({ page, homePage, toolbar, scene, cmdBar }) => {
-    }
+        const networkToggle = page.getByTestId('network-toggle')
-  )
 
-  test(
+        const u = await getUtils(page)
-    'Engine disconnect & reconnect in sketch mode',
+        await page.setBodyDimensions({ width: 1200, height: 500 })
-    { tag: '@skipLocalEngine' },
+        const PUR = 400 / 37.5 //pixeltoUnitRatio
-    async ({ page, homePage, toolbar, scene, cmdBar }) => {
-      const networkToggle = page.getByTestId('network-toggle')
-      const networkToggleConnectedText = page.getByText('Connected')
-      const networkToggleWeakText = page.getByText('Network health (Weak)')
 
-      const u = await getUtils(page)
+        await homePage.goToModelingScene()
-      await page.setBodyDimensions({ width: 1200, height: 500 })
+        await u.waitForPageLoad()
-      const PUR = 400 / 37.5 //pixeltoUnitRatio
 
-      await homePage.goToModelingScene()
+        await u.openDebugPanel()
-      await u.waitForPageLoad()
+        // click on "Start Sketch" button
+        await u.clearCommandLogs()
+        await page.getByRole('button', { name: 'Start Sketch' }).click()
+        await page.waitForTimeout(100)
 
-      await u.openDebugPanel()
+        // select a plane
-      // click on "Start Sketch" button
+        await page.mouse.click(700, 200)
-      await u.clearCommandLogs()
-      await page.getByRole('button', { name: 'Start Sketch' }).click()
-      await page.waitForTimeout(100)
 
-      // select a plane
+        await expect(page.locator('.cm-content')).toHaveText(
-      await page.mouse.click(700, 200)
+          `sketch001 = startSketchOn(XZ)`
+        )
+        await u.closeDebugPanel()
 
-      await expect(page.locator('.cm-content')).toHaveText(
+        await page.waitForTimeout(500) // TODO detect animation ending, or disable animation
-        `@settings(defaultLengthUnit = in)sketch001 = startSketchOn(XZ)`
-      )
-      await u.closeDebugPanel()
 
-      await page.waitForTimeout(500) // TODO detect animation ending, or disable animation
+        const startXPx = 600
+        await page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10)
+        await expect(page.locator('.cm-content')).toHaveText(
+          `sketch001 = startSketchOn(XZ)profile001 = startProfile(sketch001, at = ${commonPoints.startAt})`
+        )
+        await page.waitForTimeout(100)
 
-      const startXPx = 600
+        await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 10)
-      await page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10)
+        await page.waitForTimeout(100)
-      await expect(page.locator('.cm-content')).toHaveText(
-        `@settings(defaultLengthUnit = in)sketch001 = startSketchOn(XZ)profile001 = startProfile(sketch001, at = ${commonPoints.startAt})`
-      )
-      await page.waitForTimeout(100)
 
-      await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 10)
+        await expect(
-      await page.waitForTimeout(100)
+          page.locator('.cm-content')
-
+        ).toHaveText(`sketch001 = startSketchOn(XZ)profile001 = startProfile(sketch001, at = ${commonPoints.startAt})
-      await expect(
-        page.locator('.cm-content')
-      ).toHaveText(`@settings(defaultLengthUnit = in)sketch001 = startSketchOn(XZ)profile001 = startProfile(sketch001, at = ${commonPoints.startAt})
       |> xLine(length = ${commonPoints.num1})`)
 
-      // Expect the network to be up
+        // Expect the network to be up
-      await networkToggle.hover()
+        await expect(networkToggle).toContainText('Connected')
-      await expect(
-        networkToggleConnectedText.or(networkToggleWeakText)
-      ).toBeVisible()
 
-      // simulate network down
+        // simulate network down
-      await u.emulateNetworkConditions({
+        await u.emulateNetworkConditions({
-        offline: true,
+          offline: true,
-        // values of 0 remove any active throttling. crbug.com/456324#c9
+          // values of 0 remove any active throttling. crbug.com/456324#c9
-        latency: 0,
+          latency: 0,
-        downloadThroughput: -1,
+          downloadThroughput: -1,
-        uploadThroughput: -1,
+          uploadThroughput: -1,
-      })
+        })
 
-      // Expect the network to be down
+        // Expect the network to be down
-      await networkToggle.hover()
+        await expect(networkToggle).toContainText('Problem')
-      await expect(networkToggle).toContainText('Problem')
 
-      // Ensure we are not in sketch mode
+        // Ensure we are not in sketch mode
-      await expect(
+        await expect(
-        page.getByRole('button', { name: 'Exit Sketch' })
+          page.getByRole('button', { name: 'Exit Sketch' })
-      ).not.toBeVisible()
+        ).not.toBeVisible()
-      await expect(
+        await expect(
-        page.getByRole('button', { name: 'Start Sketch' })
+          page.getByRole('button', { name: 'Start Sketch' })
-      ).toBeVisible()
+        ).toBeVisible()
 
-      // simulate network up
+        // simulate network up
-      await u.emulateNetworkConditions({
+        await u.emulateNetworkConditions({
-        offline: false,
+          offline: false,
-        // values of 0 remove any active throttling. crbug.com/456324#c9
+          // values of 0 remove any active throttling. crbug.com/456324#c9
-        latency: 0,
+          latency: 0,
-        downloadThroughput: -1,
+          downloadThroughput: -1,
-        uploadThroughput: -1,
+          uploadThroughput: -1,
-      })
+        })
 
-      // Wait for the app to be ready for use
+        // Wait for the app to be ready for use
-      await expect(
+        await expect(
-        page.getByRole('button', { name: 'Start Sketch' })
+          page.getByRole('button', { name: 'Start Sketch' })
-      ).not.toBeDisabled({ timeout: 15000 })
+        ).not.toBeDisabled({ timeout: 15000 })
 
-      // Expect the network to be up
+        // Expect the network to be up
-      await networkToggle.hover()
+        await expect(networkToggle).toContainText('Connected')
-      await expect(
+        await scene.settled(cmdBar)
-        networkToggleConnectedText.or(networkToggleWeakText)
-      ).toBeVisible()
 
-      await scene.settled(cmdBar)
+        // Click off the code pane.
+        await page.mouse.click(100, 100)
 
-      // Click off the code pane.
+        // select a line
-      await page.mouse.click(100, 100)
+        await page
+          .getByText(`startProfile(sketch001, at = ${commonPoints.startAt})`)
+          .click()
 
-      // select a line
+        // enter sketch again
-      await page
+        await toolbar.editSketch()
-        .getByText(`startProfile(sketch001, at = ${commonPoints.startAt})`)
-        .click()
 
-      // enter sketch again
+        // Click the line tool
-      await toolbar.editSketch()
+        await page
+          .getByRole('button', { name: 'line Line', exact: true })
+          .click()
 
-      // Click the line tool
+        await page.waitForTimeout(150)
-      await page.getByRole('button', { name: 'line Line', exact: true }).click()
 
-      await page.waitForTimeout(150)
+        const camCommand: EngineCommand = {
+          type: 'modeling_cmd_req',
+          cmd_id: uuidv4(),
+          cmd: {
+            type: 'default_camera_look_at',
+            center: { x: 109, y: 0, z: -152 },
+            vantage: { x: 115, y: -505, z: -152 },
+            up: { x: 0, y: 0, z: 1 },
+          },
+        }
+        const updateCamCommand: EngineCommand = {
+          type: 'modeling_cmd_req',
+          cmd_id: uuidv4(),
+          cmd: {
+            type: 'default_camera_get_settings',
+          },
+        }
+        await toolbar.openPane('debug')
+        await u.sendCustomCmd(camCommand)
+        await page.waitForTimeout(100)
+        await u.sendCustomCmd(updateCamCommand)
+        await page.waitForTimeout(100)
 
-      const camCommand: EngineCommand = {
+        // click to continue profile
-        type: 'modeling_cmd_req',
+        await page.mouse.click(1007, 400)
-        cmd_id: uuidv4(),
+        await page.waitForTimeout(100)
-        cmd: {
+        // Ensure we can continue sketching
-          type: 'default_camera_look_at',
+        await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 20)
-          center: { x: 109, y: 0, z: -152 },
+        await expect
-          vantage: { x: 115, y: -505, z: -152 },
+          .poll(u.normalisedEditorCode)
-          up: { x: 0, y: 0, z: 1 },
+          .toBe(`sketch001 = startSketchOn(XZ)
-        },
-      }
-      const updateCamCommand: EngineCommand = {
-        type: 'modeling_cmd_req',
-        cmd_id: uuidv4(),
-        cmd: {
-          type: 'default_camera_get_settings',
-        },
-      }
-      await toolbar.openPane('debug')
-      await u.sendCustomCmd(camCommand)
-      await page.waitForTimeout(100)
-      await u.sendCustomCmd(updateCamCommand)
-      await page.waitForTimeout(100)
-
-      // click to continue profile
-      await page.mouse.click(1007, 400)
-      await page.waitForTimeout(100)
-      // Ensure we can continue sketching
-      await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 20)
-      await expect
-        .poll(u.normalisedEditorCode)
-        .toBe(`@settings(defaultLengthUnit = in)
-
-
-sketch001 = startSketchOn(XZ)
 profile001 = startProfile(sketch001, at = [12.34, -12.34])
   |> xLine(length = 12.34)
   |> line(end = [-12.34, 12.34])
 
 `)
-      await page.waitForTimeout(100)
+        await page.waitForTimeout(100)
-      await page.mouse.click(startXPx, 500 - PUR * 20)
+        await page.mouse.click(startXPx, 500 - PUR * 20)
 
-      await expect
+        await expect
-        .poll(u.normalisedEditorCode)
+          .poll(u.normalisedEditorCode)
-        .toBe(`@settings(defaultLengthUnit = in)
+          .toBe(`sketch001 = startSketchOn(XZ)
-
-
-sketch001 = startSketchOn(XZ)
 profile001 = startProfile(sketch001, at = [12.34, -12.34])
   |> xLine(length = 12.34)
   |> line(end = [-12.34, 12.34])
@@ -259,105 +238,22 @@ profile001 = startProfile(sketch001, at = [12.34, -12.34])
 
 `)
 
-      // Unequip line tool
+        // Unequip line tool
-      await page.keyboard.press('Escape')
+        await page.keyboard.press('Escape')
-      // Make sure we didn't pop out of sketch mode.
+        // Make sure we didn't pop out of sketch mode.
-      await expect(
+        await expect(
-        page.getByRole('button', { name: 'Exit Sketch' })
+          page.getByRole('button', { name: 'Exit Sketch' })
-      ).toBeVisible()
+        ).toBeVisible()
-      await expect(
+        await expect(
-        page.getByRole('button', { name: 'line Line', exact: true })
+          page.getByRole('button', { name: 'line Line', exact: true })
-      ).not.toHaveAttribute('aria-pressed', 'true')
+        ).not.toHaveAttribute('aria-pressed', 'true')
 
-      // Exit sketch
+        // Exit sketch
-      await page.keyboard.press('Escape')
+        await page.keyboard.press('Escape')
-      await expect(
+        await expect(
-        page.getByRole('button', { name: 'Exit Sketch' })
+          page.getByRole('button', { name: 'Exit Sketch' })
-      ).not.toBeVisible()
+        ).not.toBeVisible()
-    }
-  )
-
-  test(
-    'Paused stream freezes view frame, unpause reconnect is seamless to user',
-    { tag: ['@electron', '@skipLocalEngine'] },
-    async ({ page, homePage, scene, cmdBar, toolbar, tronApp }) => {
-      const networkToggle = page.getByTestId('network-toggle')
-      const networkToggleConnectedText = page.getByText('Connected')
-      const networkToggleWeakText = page.getByText('Network health (Weak)')
-
-      if (!tronApp) {
-        fail()
       }
-
+    )
-      await tronApp.cleanProjectDir({
+  }
-        app: {
+)
-          stream_idle_mode: 5000,
-        },
-      })
-
-      await page.addInitScript(async () => {
-        localStorage.setItem(
-          'persistCode',
-          `sketch001 = startSketchOn(XY)
-profile001 = startProfile(sketch001, at = [0.0, 0.0])
-  |> line(end = [10.0, 0])
-  |> line(end = [0, 10.0])
-  |> close()`
-        )
-      })
-
-      const dim = { width: 1200, height: 500 }
-      await page.setBodyDimensions(dim)
-
-      await test.step('Go to modeling scene', async () => {
-        await homePage.goToModelingScene()
-        await scene.settled(cmdBar)
-      })
-
-      await test.step('Verify pausing behavior', async () => {
-        // Wait 5s + 1s to pause.
-        await page.waitForTimeout(6000)
-
-        // We should now be paused. To the user, it should appear we're still
-        // connected.
-        await networkToggle.hover()
-        await expect(
-          networkToggleConnectedText.or(networkToggleWeakText)
-        ).toBeVisible()
-
-        const center = {
-          x: dim.width / 2,
-          y: dim.height / 2,
-        }
-
-        let probe = { x: 0, y: 0 }
-
-        // ... and the model's still visibly there
-        probe.x = center.x + dim.width / 100
-        probe.y = center.y
-        await scene.expectPixelColor(TEST_COLORS.GREY, probe, 15)
-        probe = { ...center }
-
-        // Now move the mouse around to unpause!
-        await circleMove(page, probe.x, probe.y, 20, 10)
-
-        // ONCE AGAIN! Check the view area hasn't changed at all.
-        // Check the pixel a couple times as it reconnects.
-        // NOTE: Remember, idle behavior is still on at this point -
-        // if this test takes longer than 5s shit WILL go south!
-        probe.x = center.x + dim.width / 100
-        probe.y = center.y
-        await scene.expectPixelColor(TEST_COLORS.GREY, probe, 15)
-        await page.waitForTimeout(1000)
-        await scene.expectPixelColor(TEST_COLORS.GREY, probe, 15)
-        probe = { ...center }
-
-        // Ensure we're still connected
-        await networkToggle.hover()
-        await expect(
-          networkToggleConnectedText.or(networkToggleWeakText)
-        ).toBeVisible()
-      })
-    }
-  )
-})

e2e/playwright/test-utils.ts

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

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

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

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(
+    await sendPromptFromCommandBarTriggeredByButton(page, 'a 2x4 lego')
-      page,
-      'a 2x4 lego',
-      cmdBar
-    )
 
     // 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(
+    await sendPromptFromCommandBarTriggeredByButton(page, 'a 2x6 lego')
-      page,
-      'a 2x6 lego',
-      cmdBar
-    )
 
     // 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(
+    await sendPromptFromCommandBarTriggeredByButton(page, 'a 2x4 lego')
-      page,
-      'a 2x4 lego',
-      cmdBar
-    )
 
     // 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(
+    await sendPromptFromCommandBarTriggeredByButton(page, 'a 2x4 lego')
-      page,
-      'a 2x4 lego',
-      cmdBar
-    )
 
     // 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(
+    await sendPromptFromCommandBarTriggeredByButton(page, randomPrompt)
-      page,
-      randomPrompt,
-      cmdBar
-    )
 
     // 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(
+    await sendPromptFromCommandBarTriggeredByButton(page, 'a 2x4 lego')
-      page,
-      'a 2x4 lego',
-      cmdBar
-    )
 
     // 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 page.getByTestId('text-to-cad').click()
-      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: '',
-        },
-      })
-    })
 
     // 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(
+    await sendPromptFromCommandBarTriggeredByButton(page, 'a 2x4 lego')
-      page,
-      'a 2x4 lego',
-      cmdBar
-    )
 
-    await sendPromptFromCommandBarAndSetExistingProject(
+    await sendPromptFromCommandBarTriggeredByButton(page, 'a 2x8 lego')
-      page,
-      'a 2x8 lego',
-      cmdBar
-    )
 
-    await sendPromptFromCommandBarAndSetExistingProject(
+    await sendPromptFromCommandBarTriggeredByButton(page, 'a 2x10 lego')
-      page,
-      'a 2x10 lego',
-      cmdBar
-    )
 
     // 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(
+    await sendPromptFromCommandBarTriggeredByButton(page, 'a 2x4 lego')
-      page,
-      'a 2x4 lego',
-      cmdBar
-    )
 
-    await sendPromptFromCommandBarAndSetExistingProject(
+    await sendPromptFromCommandBarTriggeredByButton(
       page,
-      'alkjsdnlajshdbfjlhsbdf a;askjdnf',
+      'alkjsdnlajshdbfjlhsbdf a;askjdnf'
-      cmdBar
     )
 
     // 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', {
+    const textToCadCommand = page.getByText('Use the Zoo Text-to-CAD API')
-      name: 'Text-to-CAD Create',
-    })
     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,
+  promptStr: string
-  cmdBar: CmdBarFixture,
-  projectName = 'testDefault'
 ) {
   await page.waitForTimeout(1000)
   await test.step(`Send prompt from command bar: ${promptStr}`, async () => {
-    await cmdBar.openCmdBar()
+    await page.getByTestId('text-to-cad').click()
-    await cmdBar.selectOption({ name: 'Text-to-CAD Create' }).click()
 
-    await cmdBar.expectState({
+    // Enter the prompt.
-      commandName: 'Text-to-CAD Create',
+    const prompt = page.getByRole('textbox', { name: 'Prompt' })
-      stage: 'arguments',
+    await expect(prompt.first()).toBeVisible()
-      currentArgKey: 'method',
-      currentArgValue: '',
-      highlightedHeaderArg: 'method',
-      headerArguments: {
-        Method: '',
-        Prompt: '',
-      },
-    })
-    await cmdBar.currentArgumentInput.fill('existing')
-    await cmdBar.progressCmdBar()
 
-    await cmdBar.expectState({
+    // Type the prompt.
-      commandName: 'Text-to-CAD Create',
+    await page.keyboard.type(promptStr)
-      stage: 'arguments',
+    await page.waitForTimeout(200)
-      currentArgKey: 'projectName',
+    await page.keyboard.press('Enter')
-      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()
   })
 }
 
 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(
+      await sendPromptFromCommandBarTriggeredByButton(page, prompt)
-        page,
-        prompt,
-        cmdBar,
-        projectName
-      )
       // 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()
     }
   )
@@ -1022,7 +905,7 @@ test.describe('Mocked Text-to-CAD API tests', { tag: ['@skipWin'] }, () => {
       await page.keyboard.press('Enter')
 
       // Go into the project that was created from Text to CAD
-      await homePage.openProject(projectName)
+      await page.getByText(projectName).click()
 
       await expect(page.getByTestId('app-header-project-name')).toBeVisible()
       await expect(page.getByTestId('app-header-project-name')).toContainText(
@@ -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()
@@ -1068,7 +951,7 @@ test.describe('Mocked Text-to-CAD API tests', { tag: ['@skipWin'] }, () => {
       await page.keyboard.press('Enter')
 
       // Go into the project that was created from Text to CAD
-      await homePage.openProject(projectName)
+      await page.getByText(projectName).click()
 
       await page.getByRole('button', { name: 'Accept' }).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()

flake.nix

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

package.json

@@ -94,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": [

packages/codemirror-lsp-client/src/plugin/go-to-definition.ts

@@ -15,10 +15,6 @@ export default function lspGoToDefinitionExt(
         {
           key: 'F12',
           run: (view) => {
-            if (!plugin) {
-              return false
-            }
-
             const value = view.plugin(plugin)
             if (!value) return false
 

packages/codemirror-lsp-client/src/plugin/lsp.ts

@@ -47,7 +47,7 @@ import {
 import { isArray } from '../lib/utils'
 import lspGoToDefinitionExt from './go-to-definition'
 import lspRenameExt from './rename'
-import lspSignatureHelpExt from './signature-help'
+import { lspSignatureHelpExt, setSignatureTooltip } from './signature-help'
 
 const useLast = (values: readonly any[]) => values.reduce((_, v) => v, '')
 export const docPathFacet = Facet.define<string, string>({
@@ -695,6 +695,8 @@ export class LanguageServerPlugin implements PluginValue {
 
       // Create the tooltip container
       const dom = this.createTooltipContainer()
+      dom.className =
+        'documentation hover-tooltip cm-tooltip cm-signature-tooltip'
 
       // Get active signature
       const activeSignatureIndex = result.activeSignature ?? 0
@@ -769,42 +771,7 @@ export class LanguageServerPlugin implements PluginValue {
     )
 
     if (tooltip) {
-      // Create and show the tooltip manually
+      view.dispatch({ effects: setSignatureTooltip.of(tooltip) })
-      const { pos: tooltipPos, create } = tooltip
-      const tooltipView = create(view)
-
-      const tooltipElement = document.createElement('div')
-      tooltipElement.className =
-        'documentation hover-tooltip cm-tooltip cm-signature-tooltip'
-      tooltipElement.style.position = 'absolute'
-      tooltipElement.style.zIndex = '99999999'
-
-      tooltipElement.appendChild(tooltipView.dom)
-
-      // Position the tooltip
-      const coords = view.coordsAtPos(tooltipPos)
-      if (coords) {
-        tooltipElement.style.left = `${coords.left}px`
-        tooltipElement.style.top = `${coords.bottom + 5}px`
-
-        // Add to DOM
-        document.body.appendChild(tooltipElement)
-
-        // Remove after a delay or on editor changes
-        setTimeout(() => {
-          removeTooltip() // Use the function that also cleans up event listeners
-        }, 10000) // Show for 10 seconds
-
-        // Also remove on any user input
-        const removeTooltip = () => {
-          tooltipElement.remove()
-          view.dom.removeEventListener('keydown', removeTooltip)
-          view.dom.removeEventListener('mousedown', removeTooltip)
-        }
-
-        view.dom.addEventListener('keydown', removeTooltip)
-        view.dom.addEventListener('mousedown', removeTooltip)
-      }
     }
   }
 
@@ -1034,15 +1001,8 @@ export class LanguageServerPlugin implements PluginValue {
             continue
           }
 
-          // Sort edits in reverse order to avoid position shifts
-          const sortedEdits = docChange.edits.sort((a, b) => {
-            const posA = posToOffset(view.state.doc, a.range.start)
-            const posB = posToOffset(view.state.doc, b.range.start)
-            return (posB ?? 0) - (posA ?? 0)
-          })
-
           // Create a single transaction with all changes
-          const changes = sortedEdits.map((edit) => ({
+          const changes = docChange.edits.map((edit) => ({
             from: posToOffset(view.state.doc, edit.range.start) ?? 0,
             to: posToOffset(view.state.doc, edit.range.end) ?? 0,
             insert: edit.newText,
@@ -1070,15 +1030,8 @@ export class LanguageServerPlugin implements PluginValue {
           continue
         }
 
-        // Sort changes in reverse order to avoid position shifts
-        const sortedChanges = changes.sort((a, b) => {
-          const posA = posToOffset(view.state.doc, a.range.start)
-          const posB = posToOffset(view.state.doc, b.range.start)
-          return (posB ?? 0) - (posA ?? 0)
-        })
-
         // Create a single transaction with all changes
-        const changeSpecs = sortedChanges.map((change) => ({
+        const changeSpecs = changes.map((change) => ({
           from: posToOffset(view.state.doc, change.range.start) ?? 0,
           to: posToOffset(view.state.doc, change.range.end) ?? 0,
           insert: change.newText,