Fix to not have infinite console errors editing tangentialArc (#7296)

* Add variable name to operations in Feature Tree

* small design tweak

---------

Co-authored-by: Kurt Hutten Irev-Dev <k.hutten@protonmail.ch>

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

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

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

@@ -6,6 +6,7 @@ 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:-}}"
 
@@ -13,6 +14,7 @@ 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/cargo-test.yml

@@ -1,16 +1,22 @@
+name: cargo test
+
 on:
   push:
     branches:
       - main
   pull_request:
   workflow_dispatch:
+  schedule:
+    - cron: 0 * * * *  # hourly
+
 permissions:
   contents: read
   pull-requests: write
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
-name: cargo test
+
 jobs:
   build-test-artifacts:
     name: Build test artifacts
@@ -193,6 +199,7 @@ 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: e2e:kcl
   run-internal-kcl-samples:
     name: cargo test (internal-kcl-samples)
     runs-on:

.github/workflows/e2e-tests.yml

@@ -1,4 +1,5 @@
 name: E2E Tests
+
 on:
   push:
     branches:
@@ -19,9 +20,11 @@ permissions:
 jobs:
 
   prepare-wasm:
+
     # separate job on Ubuntu to build or fetch the wasm blob once on the fastest runner
     runs-on: runs-on=${{ github.run_id }}/family=i7ie.2xlarge/image=ubuntu22-full-x64
     steps:
+
       - uses: actions/checkout@v4
 
       - id: filter
@@ -99,10 +102,13 @@ jobs:
             rust/kcl-wasm-lib/pkg/kcl_wasm_lib*
 
   snapshots:
-    name: playwright:snapshots:ubuntu
-    runs-on: runs-on=${{ github.run_id }}/family=i7ie.2xlarge/image=ubuntu22-full-x64
     needs: [prepare-wasm]
+
+    runs-on: runs-on=${{ github.run_id }}/family=i7ie.2xlarge/image=ubuntu22-full-x64
+    name: e2e:snapshots
+
     steps:
+
       - uses: actions/create-github-app-token@v1
         id: app-token
         with:
@@ -130,10 +136,9 @@ jobs:
           cache: 'npm'
 
       - name: Install dependencies
-        id: deps-install
         run: npm install
 
-      - name: Cache browsers
+      - name: Download browser cache
         uses: actions/cache@v4
         with:
           path: |
@@ -143,7 +148,7 @@ jobs:
       - name: Install browsers
         run: npm run playwright install --with-deps
 
-      - name: Test snapshots
+      - name: npm run test:snapshots
         uses: nick-fields/retry@v3.0.2
         with:
           shell: bash
@@ -156,6 +161,7 @@ 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: e2e:snapshots
           TARGET: web
 
       - name: Update snapshots
@@ -167,6 +173,7 @@ 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: e2e:snapshots
           TARGET: web
 
       - uses: actions/upload-artifact@v4
@@ -204,12 +211,96 @@ jobs:
           git push
           git push origin ${{ github.head_ref }}
 
-  electron:
+  web:
     needs: [prepare-wasm]
-    timeout-minutes: 60
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: "runs-on=${{ github.run_id }}/family=i7ie.2xlarge/image=ubuntu22-full-x64"
+          - os: namespace-profile-macos-8-cores
+          - os: windows-latest-8-cores
+    runs-on: ${{ matrix.os }}
+    name: e2e:web (${{ contains(matrix.os, 'ubuntu') && 'ubuntu' || (contains(matrix.os, 'windows') && 'windows' || 'macos') }})
     env:
       OS_NAME: ${{ contains(matrix.os, 'ubuntu') && 'ubuntu' || (contains(matrix.os, 'windows') && 'windows' || 'macos') }}
-    name: playwright:electron:${{ contains(matrix.os, 'ubuntu') && 'ubuntu' || (contains(matrix.os, 'windows') && 'windows' || 'macos') }} (shard ${{ matrix.shardIndex }})
+
+    steps:
+
+      - uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: ${{ secrets.MODELING_APP_GH_APP_ID }}
+          private-key: ${{ secrets.MODELING_APP_GH_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+
+      - uses: actions/checkout@v4
+        with:
+          token: ${{ steps.app-token.outputs.token }}
+
+      - uses: actions/download-artifact@v4
+        name: prepared-wasm
+
+      - 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
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+          cache: 'npm'
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Download browser cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cache/ms-playwright/
+          key: ${{ runner.os }}-playwright-${{ hashFiles('package-lock.json') }}
+
+      - name: Install browsers
+        run: npm run playwright install --with-deps
+
+      - name: Start Vector
+        if: ${{ !contains(matrix.os, 'windows') }}
+        run: .github/ci-cd-scripts/start-vector-${{ env.OS_NAME }}.sh
+        env:
+          GH_ACTIONS_AXIOM_TOKEN: ${{ secrets.GH_ACTIONS_AXIOM_TOKEN }}
+          OS_NAME: ${{ env.OS_NAME }}
+
+      - name: npm run test:e2e:web
+        uses: nick-fields/retry@v3.0.2
+        with:
+          shell: bash
+          command: npm run test:e2e:web
+          timeout_minutes: 5
+          max_attempts: 5
+        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: e2e:web
+          TARGET: web
+
+      - uses: actions/upload-artifact@v4
+        if: ${{ !cancelled() && (success() || failure()) }}
+        with:
+          path: playwright-report/
+          include-hidden-files: true
+          retention-days: 30
+          overwrite: true
+
+  desktop:
+    needs: [prepare-wasm]
+
     strategy:
       fail-fast: false
       matrix:
@@ -252,13 +343,17 @@ jobs:
             shardIndex: 2
             shardTotal: 2
     runs-on: ${{ matrix.os }}
+    name: e2e:desktop (${{ contains(matrix.os, 'ubuntu') && 'ubuntu' || (contains(matrix.os, 'windows') && 'windows' || 'macos') }}, shard ${{ matrix.shardIndex }})
+    env:
+      OS_NAME: ${{ contains(matrix.os, 'ubuntu') && 'ubuntu' || (contains(matrix.os, 'windows') && 'windows' || 'macos') }}
+
     steps:
       - uses: actions/checkout@v4
 
       - 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
@@ -274,19 +369,16 @@ jobs:
         id: deps-install
         run: npm install
 
-      - name: Cache Playwright Browsers
+      - name: Download browser cache
         uses: actions/cache@v4
         with:
           path: |
             ~/.cache/ms-playwright/
           key: ${{ runner.os }}-playwright-${{ hashFiles('package-lock.json') }}
 
-      - name: Install Playwright Browsers
+      - name: Install browsers
         run: npm run playwright install --with-deps
 
-      - name: Build web
-        run: npm run tronb:vite:dev
-
       - name: Start Vector
         if: ${{ !contains(matrix.os, 'windows') }}
         run: .github/ci-cd-scripts/start-vector-${{ env.OS_NAME }}.sh
@@ -294,6 +386,9 @@ jobs:
           GH_ACTIONS_AXIOM_TOKEN: ${{ secrets.GH_ACTIONS_AXIOM_TOKEN }}
           OS_NAME: ${{ env.OS_NAME }}
 
+      - name: Build app
+        run: npm run tronb:vite:dev
+
       - uses: actions/download-artifact@v4
         if: ${{ !cancelled() && (success() || failure()) }}
         continue-on-error: true
@@ -301,7 +396,7 @@ jobs:
           name: test-results-${{ env.OS_NAME }}-${{ matrix.shardIndex }}-${{ github.sha }}
           path: test-results/
 
-      - name: Run playwright/electron flow (with retries)
+      - name: npm run test:e2e:desktop
         id: retry
         if:  ${{ !cancelled() && steps.deps-install.outcome == 'success' }}
         uses: nick-fields/retry@v3.0.2
@@ -317,6 +412,7 @@ 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: e2e:desktop
           TARGET: desktop
 
       - uses: actions/upload-artifact@v4

CONTRIBUTING.md

@@ -122,25 +122,24 @@ https://github.com/KittyCAD/modeling-app/issues/new
 
 #### 2. Push a new tag
 
-Create a new tag and push it to the repo. The `semantic-release.sh` script will automatically bump the minor part, which we use the most. For instance going from `v0.27.0` to `v0.28.0`.
+Decide on a `v`-prefixed semver `VERSION` (e.g. `v1.2.3`) with the team and tag the repo on the latest main:
 
 ```
-VERSION=$(./scripts/semantic-release.sh)
-git tag $VERSION
-git push origin --tags
+git tag $VERSION --message=""
+git push origin $VERSION
 ```
 
-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 to set the version, build & sign the apps, and generate release files.
 
-The workflow should be listed right away [in this list](https://github.com/KittyCAD/modeling-app/actions/workflows/build-apps.yml?query=event%3Apush)).
+The workflow should be listed right away [in this list](https://github.com/KittyCAD/modeling-app/actions/workflows/build-apps.yml?query=event%3Apush).
 
 #### 3. Manually test artifacts
 
 ##### Release builds
 
-The release builds can be found under the `out-{arch}-{platform}` zip files, at the very bottom of the `build-apps` summary page for the workflow (triggered by the tag in 2.).
+The release builds can be found under the `out-{arch}-{platform}` zip files, at the very bottom of the `build-apps` summary page for the workflow (triggered by the tag in step 2).
 
-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.
+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
 and making sure the current release candidate has the ability to be updated to what electron-updater points to is critical,
@@ -158,15 +157,20 @@ If the prompt doesn't show up, start the app in command line to grab the electro
 ./Zoo Design Studio-{version}-{arch}-linux.AppImage
 ```
 
-#### 4. Publish the release
+#### 4. Bump the KCL version
 
-Head over to https://github.com/KittyCAD/modeling-app/releases/new, pick the newly created tag and type it in the _Release title_ field as well.
+Follow the instructions [here](./rust/README.md) to publish new crates.
+This ensures that the KCL accepted by the app is also accepted by the CLI.
 
-Hit _Generate release notes_ as a starting point to discuss the changelog in the issue. Once done, make sure _Set as the latest release_ is checked, and hit _Publish release_.
+#### 5. Publish the release
 
-A new `publish-apps-release` will kick in and you should be able to find it [here](https://github.com/KittyCAD/modeling-app/actions?query=event%3Arelease). On success, the files will be uploaded to the public bucket as well as to the GitHub release, and the announcement on Discord will be sent.
+Head over to https://github.com/KittyCAD/modeling-app/releases/new, pick the newly created tag and type it in the **Release title** field as well.
 
-#### 5. Close the issue
+Click **Generate release notes** as a starting point to discuss the changelog in the issue. Once done, make sure **Set as the latest release** is checked, and click **Publish release**.
+
+A new `publish-apps-release` workflow will start and you should be able to find it [here](https://github.com/KittyCAD/modeling-app/actions?query=event%3Arelease). On success, the files will be uploaded to the public bucket as well as to the GitHub release, and the announcement on Discord will be sent.
+
+#### 6. Close the issue
 
 If everything is well and the release is out to the public, the issue tracking the release shall be closed.
 
@@ -201,7 +205,7 @@ Prepare these system dependencies:
 
 #### Snapshot tests (Google Chrome on Ubuntu only)
 
-Only Ubunu and Google Chrome is supported for the set of tests evaluating screenshot snapshots.
+Only Ubuntu and Google Chrome is supported for the set of tests evaluating screenshot snapshots.
 If you don't run Ubuntu locally or in a VM, you may use a GitHub Codespace.
 ```
 npm run playwright -- install chrome
@@ -209,14 +213,21 @@ npm run test:snapshots
 ```
 You may use `-- --update-snapshots` as needed.
 
-#### Electron flow tests (Chromium on Ubuntu, macOS, Windows)
+#### Desktop tests (Electron on all platforms)
 
 ```
 npm run playwright -- install chromium
-npm run test:playwright:electron:local
+npm run test:e2e:desktop:local
 ```
+
 You may use `-- -g "my test"` to match specific test titles, or `-- path/to/file.spec.ts` for a test file.
 
+#### Web tests (Google Chrome on all platforms)
+
+```
+npm run test:e2e:web
+```
+
 #### Debugger
 
 However, if you want a debugger I recommend using VSCode and the `playwright` extension, as the above command is a cruder debugger that steps into every function call which is annoying.

INSTALL.md

@@ -4,7 +4,7 @@ Compared to other CAD software, getting Zoo Design Studio up and running is quic
 
 ## Windows
 
-1. Download the [Zoo Design Studio installer](https://zoo.dev/modeling-app/download) for Windows and for your processor type.
+1. Download the [Zoo Design Studio installer](https://zoo.dev/design-studio/download) for Windows and for your processor type.
 
 2. Once downloaded, run the installer `Zoo Design Studio-{version}-{arch}-win.exe` which should take a few seconds.
 
@@ -12,7 +12,7 @@ Compared to other CAD software, getting Zoo Design Studio up and running is quic
 
 ## macOS
 
-1. Download the [Zoo Design Studio installer](https://zoo.dev/modeling-app/download) for macOS and for your processor type.
+1. Download the [Zoo Design Studio installer](https://zoo.dev/design-studio/download) for macOS and for your processor type.
 
 2. Once downloaded, open the disk image `Zoo Design Studio-{version}-{arch}-mac.dmg` and drag the applications to your `Applications` directory.
 
@@ -21,7 +21,7 @@ Compared to other CAD software, getting Zoo Design Studio up and running is quic
 
 ## Linux
 
-1. Download the [Zoo Design Studio installer](https://zoo.dev/modeling-app/download) for Linux and for your processor type.
+1. Download the [Zoo Design Studio installer](https://zoo.dev/design-studio/download) for Linux and for your processor type.
 
 2. Install the dependencies needed to run the [AppImage format](https://appimage.org/).
     -  On Ubuntu, install the FUSE library with these commands in a terminal.

Makefile

@@ -120,19 +120,18 @@ test-e2e: test-e2e-$(TARGET)
 
 .PHONY: test-e2e-web
 test-e2e-web: install build ## Run the web e2e tests
-	@ curl -fs localhost:3000 >/dev/null || ( echo "Error: localhost:3000 not available, 'make run-web' first" && exit 1 )
 ifdef E2E_GREP
-	npm run chrome:test -- --headed --grep="$(E2E_GREP)" --max-failures=$(E2E_FAILURES)
+	npm run test:e2e:web -- --headed --grep="$(E2E_GREP)" --max-failures=$(E2E_FAILURES)
 else
-	npm run chrome:test -- --headed --workers='100%'
+	npm run test:e2e:web -- --headed --workers='100%'
 endif
 
 .PHONY: test-e2e-desktop
 test-e2e-desktop: install build ## Run the desktop e2e tests
 ifdef E2E_GREP
-	npm run test:playwright:electron -- --grep="$(E2E_GREP)" --max-failures=$(E2E_FAILURES)
+	npm run test:e2e:desktop -- --grep="$(E2E_GREP)" --max-failures=$(E2E_FAILURES)
 else
-	npm run test:playwright:electron -- --workers='100%'
+	npm run test:e2e:desktop -- --workers='100%'
 endif
 
 ###############################################################################

README.md

@@ -2,7 +2,7 @@
 
 # Zoo Design Studio
 
-[zoo.dev/modeling-app](https://zoo.dev/modeling-app)
+[zoo.dev/design-studio](https://zoo.dev/design-studio)
 
 A CAD application from the future, brought to you by the [Zoo team](https://zoo.dev).
 
@@ -40,12 +40,8 @@ The 3D view in Design Studio is just a video stream from our hosted geometry eng
 
 ## Get Started
 
-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.
+We recommend downloading the latest application binary from our [website](https://zoo.dev/design-studio/download). If you don't see your platform or architecture supported there, please file an issue. See the [installation guide](INSTALL.md) for additional instructions.
 
 ## 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.
-
-## KCL
-
-To contribute to the KittyCAD Language, see the [README](https://github.com/KittyCAD/modeling-app/tree/main/rust/kcl-lib) for KCL.
+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. To contribute to the KittyCAD Language, see the dedicated [readme](rust/kcl-lib/README.md) for KCL.

docs/kcl-lang/arrays.md

@@ -16,15 +16,16 @@ There are some useful functions for working with arrays in the standard library,
 
 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.
+Array types can also include length information: `[T; n]` denotes an array of length `n` (where `n` is a number literal) and `[T; n+]` denotes an array whose length is at least `n`. The common case for that is `[T; 1+]`, 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:
+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. A range which is exclusive of its end is written with `<end`. Examples:
 
 ```kcl,norun
 [0..3]      // [0, 1, 2, 3]
 [3..10]     // [3, 4, 5, 6, 7, 8, 9, 10]
+[3..<10]    // [3, 4, 5, 6, 7, 8, 9]
 x = 2
 [x..x+1]    // [2, 3]
 ```

docs/kcl-std/arc.md

@@ -13,6 +13,7 @@ arc(
   angleStart?: number,
   angleEnd?: number,
   radius?: number,
+  diameter?: number,
   interiorAbsolute?: Point2d,
   endAbsolute?: Point2d,
   tag?: TagDeclarator,
@@ -30,7 +31,8 @@ Unless this makes a lot of sense and feels like what you're looking for to const
 | `sketch` | [`Sketch`](/docs/kcl-std/types/std-types-Sketch) | Which sketch should this path be added to? | Yes |
 | `angleStart` | [`number`](/docs/kcl-std/types/std-types-number) | Where along the circle should this arc start? | No |
 | `angleEnd` | [`number`](/docs/kcl-std/types/std-types-number) | Where along the circle should this arc end? | No |
-| `radius` | [`number`](/docs/kcl-std/types/std-types-number) | How large should the circle be? | No |
+| `radius` | [`number`](/docs/kcl-std/types/std-types-number) | How large should the circle be? Incompatible with `diameter`. | No |
+| `diameter` | [`number`](/docs/kcl-std/types/std-types-number) | How large should the circle be? Incompatible with `radius`. | No |
 | `interiorAbsolute` | [`Point2d`](/docs/kcl-std/types/std-types-Point2d) | Any point between the arc's start and end? Requires `endAbsolute`. Incompatible with `angleStart` or `angleEnd` | No |
 | `endAbsolute` | [`Point2d`](/docs/kcl-std/types/std-types-Point2d) | Where should this arc end? Requires `interiorAbsolute`. Incompatible with `angleStart` or `angleEnd` | No |
 | [`tag`](/docs/kcl-std/types/std-types-tag) | [`TagDeclarator`](/docs/kcl-lang/types#TagDeclarator) | Create a new tag which refers to this line | No |

docs/kcl-std/functions/std-assert.md

@@ -0,0 +1,50 @@
+---
+title: "assert"
+subtitle: "Function in std"
+excerpt: ""
+layout: manual
+---
+
+
+
+```kcl
+assert(
+  @actual: number,
+  isGreaterThan?: number,
+  isLessThan?: number,
+  isGreaterThanOrEqual?: number,
+  isLessThanOrEqual?: number,
+  isEqualTo?: number,
+  tolerance?: number,
+  error?: string,
+)
+```
+
+Check a value meets some expected conditions at runtime. Program terminates with an error if conditions aren't met.
+If you provide multiple conditions, they will all be checked and all must be met.
+
+### Arguments
+
+| Name | Type | Description | Required |
+|----------|------|-------------|----------|
+| `actual` | [`number`](/docs/kcl-std/types/std-types-number) | Value to check. If this is the boolean value true, assert passes. Otherwise it fails.. | Yes |
+| `isGreaterThan` | [`number`](/docs/kcl-std/types/std-types-number) | Comparison argument. If given, checks the `actual` value is greater than this. | No |
+| `isLessThan` | [`number`](/docs/kcl-std/types/std-types-number) | Comparison argument. If given, checks the `actual` value is less than this. | No |
+| `isGreaterThanOrEqual` | [`number`](/docs/kcl-std/types/std-types-number) | Comparison argument. If given, checks the `actual` value is greater than or equal to this. | No |
+| `isLessThanOrEqual` | [`number`](/docs/kcl-std/types/std-types-number) | Comparison argument. If given, checks the `actual` value is less than or equal to this. | No |
+| `isEqualTo` | [`number`](/docs/kcl-std/types/std-types-number) | Comparison argument. If given, checks the `actual` value is less than or equal to this. | No |
+| `tolerance` | [`number`](/docs/kcl-std/types/std-types-number) | If `isEqualTo` is used, this is the tolerance to allow for the comparison. This tolerance is used because KCL's number system has some floating-point imprecision when used with very large decimal places. | No |
+| `error` | [`string`](/docs/kcl-std/types/std-types-string) | If the value was false, the program will terminate with this error message | No |
+
+
+### Examples
+
+```kcl
+n = 10
+assert(n, isEqualTo = 10)
+assert(n, isGreaterThanOrEqual = 0, isLessThan = 100, error = "number should be between 0 and 100")
+assert(1.0000000000012, isEqualTo = 1, tolerance = 0.0001, error = "number should be almost exactly 1")
+```
+
+
+

docs/kcl-std/functions/std-assertIs.md

@@ -0,0 +1,35 @@
+---
+title: "assertIs"
+subtitle: "Function in std"
+excerpt: "Asserts that a value is the boolean value true."
+layout: manual
+---
+
+Asserts that a value is the boolean value true.
+
+```kcl
+assertIs(
+  @actual: bool,
+  error?: string,
+)
+```
+
+
+
+### Arguments
+
+| Name | Type | Description | Required |
+|----------|------|-------------|----------|
+| `actual` | [`bool`](/docs/kcl-std/types/std-types-bool) | Value to check. If this is the boolean value true, assert passes. Otherwise it fails.. | Yes |
+| `error` | [`string`](/docs/kcl-std/types/std-types-string) | If the value was false, the program will terminate with this error message | No |
+
+
+### Examples
+
+```kcl
+kclIsFun = true
+assertIs(kclIsFun)
+```
+
+
+

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

@@ -9,9 +9,10 @@ layout: manual
 
 ```kcl
 circle(
-  @sketch_or_surface: Sketch | Plane | Face,
+  @sketchOrSurface: Sketch | Plane | Face,
   center: Point2d,
-  radius: number(Length),
+  radius?: number(Length),
+  diameter?: number(Length),
   tag?: tag,
 ): Sketch
 ```
@@ -23,9 +24,10 @@ the provided (x, y) origin point.
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `sketch_or_surface` | [`Sketch`](/docs/kcl-std/types/std-types-Sketch) or [`Plane`](/docs/kcl-std/types/std-types-Plane) or [`Face`](/docs/kcl-std/types/std-types-Face) | Sketch to extend, or plane or surface to sketch on. | Yes |
+| `sketchOrSurface` | [`Sketch`](/docs/kcl-std/types/std-types-Sketch) or [`Plane`](/docs/kcl-std/types/std-types-Plane) or [`Face`](/docs/kcl-std/types/std-types-Face) | Sketch to extend, or plane or surface to sketch on. | Yes |
 | `center` | [`Point2d`](/docs/kcl-std/types/std-types-Point2d) | The center of the circle. | Yes |
-| `radius` | [`number(Length)`](/docs/kcl-std/types/std-types-number) | The radius of the circle. | Yes |
+| `radius` | [`number(Length)`](/docs/kcl-std/types/std-types-number) | The radius of the circle. Incompatible with `diameter`. | No |
+| `diameter` | [`number(Length)`](/docs/kcl-std/types/std-types-number) | The diameter of the circle. Incompatible with `radius`. | No |
 | [`tag`](/docs/kcl-std/types/std-types-tag) | [`tag`](/docs/kcl-std/types/std-types-tag) | Create a new tag which refers to this circle. | No |
 
 ### Returns
@@ -51,7 +53,7 @@ exampleSketch = startSketchOn(XZ)
   |> line(end = [0, 30])
   |> line(end = [-30, 0])
   |> close()
-  |> subtract2d(tool = circle(center = [0, 15], radius = 5))
+  |> subtract2d(tool = circle(center = [0, 15], diameter = 10))
 
 example = extrude(exampleSketch, length = 5)
 ```

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

@@ -9,11 +9,11 @@ Construct a circle derived from 3 points.
 
 ```kcl
 circleThreePoint(
-  @sketchSurfaceOrGroup: Sketch | Plane | Face,
+  @sketchOrSurface: Sketch | Plane | Face,
   p1: Point2d,
   p2: Point2d,
   p3: Point2d,
-  tag?: TagDeclarator,
+  tag?: tag,
 ): Sketch
 ```
 
@@ -23,11 +23,11 @@ circleThreePoint(
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `sketchSurfaceOrGroup` | [`Sketch`](/docs/kcl-std/types/std-types-Sketch) or [`Plane`](/docs/kcl-std/types/std-types-Plane) or [`Face`](/docs/kcl-std/types/std-types-Face) | Plane or surface to sketch on. | Yes |
+| `sketchOrSurface` | [`Sketch`](/docs/kcl-std/types/std-types-Sketch) or [`Plane`](/docs/kcl-std/types/std-types-Plane) or [`Face`](/docs/kcl-std/types/std-types-Face) | Plane or surface to sketch on. | Yes |
 | `p1` | [`Point2d`](/docs/kcl-std/types/std-types-Point2d) | 1st point to derive the circle. | Yes |
 | `p2` | [`Point2d`](/docs/kcl-std/types/std-types-Point2d) | 2nd point to derive the circle. | Yes |
 | `p3` | [`Point2d`](/docs/kcl-std/types/std-types-Point2d) | 3rd point to derive the circle. | Yes |
-| [`tag`](/docs/kcl-std/types/std-types-tag) | [`TagDeclarator`](/docs/kcl-lang/types#TagDeclarator) | Identifier for the circle to reference elsewhere. | No |
+| [`tag`](/docs/kcl-std/types/std-types-tag) | [`tag`](/docs/kcl-std/types/std-types-tag) | Identifier for the circle to reference elsewhere. | No |
 
 ### Returns
 
@@ -38,7 +38,7 @@ circleThreePoint(
 
 ```kcl
 exampleSketch = startSketchOn(XY)
-  |> circleThreePoint(p1 = [10, 10], p2 = [20, 8], p3 = [15, 5])
+  |> circleThreePoint(p1 = [10,10], p2 = [20,8], p3 = [15,5])
   |> extrude(length = 5)
 ```
 

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

@@ -1,39 +1,43 @@
 ---
 title: "extrude"
 subtitle: "Function in std::sketch"
-excerpt: "Extend a 2-dimensional sketch through a third dimension in order to create new 3-dimensional volume, or if extruded into an existing volume, cut into an existing solid."
+excerpt: ""
 layout: manual
 ---
 
-Extend a 2-dimensional sketch through a third dimension in order to create new 3-dimensional volume, or if extruded into an existing volume, cut into an existing solid.
+
 
 ```kcl
 extrude(
-  @sketches: [Sketch],
-  length: number,
+  @sketches: [Sketch; 1+],
+  length: number(Length),
   symmetric?: bool,
-  bidirectionalLength?: number,
-  tagStart?: TagDeclarator,
-  tagEnd?: TagDeclarator,
-): [Solid]
+  bidirectionalLength?: number(Length),
+  tagStart?: tag,
+  tagEnd?: tag,
+): [Solid; 1+]
 ```
 
-You can provide more than one sketch to extrude, and they will all be extruded in the same direction.
+Extend a 2-dimensional sketch through a third dimension in order to
+create new 3-dimensional volume, or if extruded into an existing volume,cut into an existing solid.
+
+You can provide more than one sketch to extrude, and they will all be
+extruded in the same direction.
 
 ### Arguments
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `sketches` | [`[Sketch]`](/docs/kcl-std/types/std-types-Sketch) | Which sketch or sketches should be extruded | Yes |
-| `length` | [`number`](/docs/kcl-std/types/std-types-number) | How far to extrude the given sketches | Yes |
+| `sketches` | [`[Sketch; 1+]`](/docs/kcl-std/types/std-types-Sketch) | Which sketch or sketches should be extruded. | Yes |
+| `length` | [`number(Length)`](/docs/kcl-std/types/std-types-number) | How far to extrude the given sketches. | Yes |
 | `symmetric` | [`bool`](/docs/kcl-std/types/std-types-bool) | If true, the extrusion will happen symmetrically around the sketch. Otherwise, the extrusion will happen on only one side of the sketch. | No |
-| `bidirectionalLength` | [`number`](/docs/kcl-std/types/std-types-number) | If specified, will also extrude in the opposite direction to 'distance' to the specified distance. If 'symmetric' is true, this value is ignored. | No |
-| `tagStart` | [`TagDeclarator`](/docs/kcl-lang/types#TagDeclarator) | A named tag for the face at the start of the extrusion, i.e. the original sketch | No |
-| `tagEnd` | [`TagDeclarator`](/docs/kcl-lang/types#TagDeclarator) | A named tag for the face at the end of the extrusion, i.e. the new face created by extruding the original sketch | No |
+| `bidirectionalLength` | [`number(Length)`](/docs/kcl-std/types/std-types-number) | If specified, will also extrude in the opposite direction to 'distance' to the specified distance. If 'symmetric' is true, this value is ignored. | No |
+| `tagStart` | [`tag`](/docs/kcl-std/types/std-types-tag) | A named tag for the face at the start of the extrusion, i.e. the original sketch. | No |
+| `tagEnd` | [`tag`](/docs/kcl-std/types/std-types-tag) | A named tag for the face at the end of the extrusion, i.e. the new face created by extruding the original sketch. | No |
 
 ### Returns
 
-[`[Solid]`](/docs/kcl-std/types/std-types-Solid)
+[`[Solid; 1+]`](/docs/kcl-std/types/std-types-Solid)
 
 
 ### Examples
@@ -42,10 +46,18 @@ You can provide more than one sketch to extrude, and they will all be extruded i
 example = startSketchOn(XZ)
   |> startProfile(at = [0, 0])
   |> line(end = [10, 0])
-  |> arc(angleStart = 120, angleEnd = 0, radius = 5)
+  |> arc(
+    angleStart = 120,
+    angleEnd = 0,
+    radius = 5,
+  )
   |> line(end = [5, 0])
   |> line(end = [0, 10])
-  |> bezierCurve(control1 = [-10, 0], control2 = [2, 10], end = [-5, 10])
+  |> bezierCurve(
+       control1 = [-10, 0],
+       control2 = [2, 10],
+       end = [-5, 10],
+     )
   |> line(end = [-5, -2])
   |> close()
   |> extrude(length = 10)
@@ -56,10 +68,18 @@ example = startSketchOn(XZ)
 ```kcl
 exampleSketch = startSketchOn(XZ)
   |> startProfile(at = [-10, 0])
-  |> arc(angleStart = 120, angleEnd = -60, radius = 5)
+  |> arc(
+    angleStart = 120,
+    angleEnd = -60,
+    radius = 5,
+  )
   |> line(end = [10, 0])
   |> line(end = [5, 0])
-  |> bezierCurve(control1 = [-3, 0], control2 = [2, 10], end = [-5, 10])
+  |> bezierCurve(
+       control1 = [-3, 0],
+       control2 = [2, 10],
+       end = [-5, 10],
+     )
   |> line(end = [-4, 10])
   |> line(end = [-5, -2])
   |> close()
@@ -72,10 +92,18 @@ example = extrude(exampleSketch, length = 10)
 ```kcl
 exampleSketch = startSketchOn(XZ)
   |> startProfile(at = [-10, 0])
-  |> arc(angleStart = 120, angleEnd = -60, radius = 5)
+  |> arc(
+    angleStart = 120,
+    angleEnd = -60,
+    radius = 5,
+  )
   |> line(end = [10, 0])
   |> line(end = [5, 0])
-  |> bezierCurve(control1 = [-3, 0], control2 = [2, 10], end = [-5, 10])
+  |> bezierCurve(
+       control1 = [-3, 0],
+       control2 = [2, 10],
+       end = [-5, 10],
+     )
   |> line(end = [-4, 10])
   |> line(end = [-5, -2])
   |> close()
@@ -88,10 +116,18 @@ example = extrude(exampleSketch, length = 20, symmetric = true)
 ```kcl
 exampleSketch = startSketchOn(XZ)
   |> startProfile(at = [-10, 0])
-  |> arc(angleStart = 120, angleEnd = -60, radius = 5)
+  |> arc(
+    angleStart = 120,
+    angleEnd = -60,
+    radius = 5,
+  )
   |> line(end = [10, 0])
   |> line(end = [5, 0])
-  |> bezierCurve(control1 = [-3, 0], control2 = [2, 10], end = [-5, 10])
+  |> bezierCurve(
+       control1 = [-3, 0],
+       control2 = [2, 10],
+       end = [-5, 10],
+     )
   |> line(end = [-4, 10])
   |> line(end = [-5, -2])
   |> close()

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

@@ -8,7 +8,7 @@ layout: manual
 Get the shared edge between two faces.
 
 ```kcl
-getCommonEdge(faces: [TagIdentifier]): Uuid
+getCommonEdge(faces: [tag; 2]): Edge
 ```
 
 
@@ -17,11 +17,11 @@ getCommonEdge(faces: [TagIdentifier]): Uuid
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `faces` | [`[TagIdentifier]`](/docs/kcl-lang/types#TagIdentifier) | The tags of the faces you want to find the common edge between | Yes |
+| `faces` | `[tag; 2]` | The tags of the faces you want to find the common edge between. | Yes |
 
 ### Returns
 
-`Uuid`
+[`Edge`](/docs/kcl-std/types/std-types-Edge) - An edge of a solid.
 
 
 ### Examples
@@ -29,17 +29,16 @@ getCommonEdge(faces: [TagIdentifier]): Uuid
 ```kcl
 // Get an edge shared between two faces, created after a chamfer.
 
-
 scale = 20
 part001 = startSketchOn(XY)
-  |> startProfile(at = [0, 0])
-  |> line(end = [0, scale])
-  |> line(end = [scale, 0])
-  |> line(end = [0, -scale])
-  |> close(tag = $line0)
-  |> extrude(length = 20, tagEnd = $end0)
-  // We tag the chamfer to reference it later.
-  |> chamfer(length = 10, tags = [getOppositeEdge(line0)], tag = $chamfer0)
+    |> startProfile(at = [0, 0])
+    |> line(end = [0, scale])
+    |> line(end = [scale, 0])
+    |> line(end = [0, -scale])
+    |> close(tag = $line0)
+    |> extrude(length = 20, tagEnd = $end0)
+    // We tag the chamfer to reference it later.
+    |> chamfer(length = 10, tags = [getOppositeEdge(line0)], tag = $chamfer0)
 
 // Get the shared edge between the chamfer and the extrusion.
 commonEdge = getCommonEdge(faces = [chamfer0, end0])

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

@@ -1,39 +1,41 @@
 ---
 title: "patternCircular2d"
 subtitle: "Function in std::sketch"
-excerpt: "Repeat a 2-dimensional sketch some number of times along a partial or complete circle some specified number of times. Each object may additionally be rotated along the circle, ensuring orientation of the solid with respect to the center of the circle is maintained."
+excerpt: ""
 layout: manual
 ---
 
-Repeat a 2-dimensional sketch some number of times along a partial or complete circle some specified number of times. Each object may additionally be rotated along the circle, ensuring orientation of the solid with respect to the center of the circle is maintained.
+
 
 ```kcl
 patternCircular2d(
-  @sketchSet: [Sketch],
-  instances: number,
+  @sketches: [Sketch; 1+],
+  instances: number(_),
   center: Point2d,
-  arcDegrees?: number,
+  arcDegrees?: number(Angle),
   rotateDuplicates?: bool,
   useOriginal?: bool,
-): [Sketch]
+): [Sketch; 1+]
 ```
 
-
+Repeat a 2-dimensional sketch some number of times along a partial or
+complete circle some specified number of times. Each object mayadditionally be rotated along the circle, ensuring orientation of the
+solid with respect to the center of the circle is maintained.
 
 ### Arguments
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `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 |
+| `sketches` | [`[Sketch; 1+]`](/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 |
 | `center` | [`Point2d`](/docs/kcl-std/types/std-types-Point2d) | The center about which to make the pattern. This is a 2D vector. | Yes |
-| `arcDegrees` | [`number`](/docs/kcl-std/types/std-types-number) | The arc angle (in degrees) to place the repetitions. Must be greater than 0. Defaults to 360. | No |
-| `rotateDuplicates` | [`bool`](/docs/kcl-std/types/std-types-bool) | Whether or not to rotate the duplicates as they are copied. Defaults to true. | No |
-| `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 |
+| `arcDegrees` | [`number(Angle)`](/docs/kcl-std/types/std-types-number) | The arc angle (in degrees) to place the repetitions. Must be greater than 0. | No |
+| `rotateDuplicates` | [`bool`](/docs/kcl-std/types/std-types-bool) | Whether or not to rotate the duplicates as they are copied. | 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. | No |
 
 ### Returns
 
-[`[Sketch]`](/docs/kcl-std/types/std-types-Sketch)
+[`[Sketch; 1+]`](/docs/kcl-std/types/std-types-Sketch)
 
 
 ### Examples
@@ -49,7 +51,7 @@ exampleSketch = startSketchOn(XZ)
        center = [0, 0],
        instances = 13,
        arcDegrees = 360,
-       rotateDuplicates = true,
+       rotateDuplicates = true
      )
 
 example = extrude(exampleSketch, length = 1)

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

@@ -9,9 +9,9 @@ Create a regular polygon with the specified number of sides that is either inscr
 
 ```kcl
 polygon(
-  @sketchSurfaceOrGroup: Sketch | Plane | Face,
-  radius: number,
-  numSides: u64,
+  @sketchOrSurface: Sketch | Plane | Face,
+  radius: number(Length),
+  numSides: number(_),
   center: Point2d,
   inscribed?: bool,
 ): Sketch
@@ -23,11 +23,11 @@ polygon(
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `sketchSurfaceOrGroup` | [`Sketch`](/docs/kcl-std/types/std-types-Sketch) or [`Plane`](/docs/kcl-std/types/std-types-Plane) or [`Face`](/docs/kcl-std/types/std-types-Face) | Plane or surface to sketch on | Yes |
-| `radius` | [`number`](/docs/kcl-std/types/std-types-number) | The radius of the polygon | Yes |
-| `numSides` | `u64` | The number of sides in the polygon | Yes |
-| `center` | [`Point2d`](/docs/kcl-std/types/std-types-Point2d) | The center point of the polygon | Yes |
-| `inscribed` | [`bool`](/docs/kcl-std/types/std-types-bool) | Whether the polygon is inscribed (true, the default) or circumscribed (false) about a circle with the specified radius | No |
+| `sketchOrSurface` | [`Sketch`](/docs/kcl-std/types/std-types-Sketch) or [`Plane`](/docs/kcl-std/types/std-types-Plane) or [`Face`](/docs/kcl-std/types/std-types-Face) | Plane or surface to sketch on. | Yes |
+| `radius` | [`number(Length)`](/docs/kcl-std/types/std-types-number) | The radius of the polygon. | Yes |
+| `numSides` | [`number(_)`](/docs/kcl-std/types/std-types-number) | The number of sides in the polygon. | Yes |
+| `center` | [`Point2d`](/docs/kcl-std/types/std-types-Point2d) | The center point of the polygon. | Yes |
+| `inscribed` | [`bool`](/docs/kcl-std/types/std-types-bool) | Whether the polygon is inscribed (true, the default) or circumscribed (false) about a circle with the specified radius. | No |
 
 ### Returns
 
@@ -40,11 +40,11 @@ polygon(
 // Create a regular hexagon inscribed in a circle of radius 10
 hex = startSketchOn(XY)
   |> polygon(
-       radius = 10,
-       numSides = 6,
-       center = [0, 0],
-       inscribed = true,
-     )
+    radius = 10,
+    numSides = 6,
+    center = [0, 0],
+    inscribed = true,
+  )
 
 example = extrude(hex, length = 5)
 ```
@@ -55,11 +55,11 @@ example = extrude(hex, length = 5)
 // Create a square circumscribed around a circle of radius 5
 square = startSketchOn(XY)
   |> polygon(
-       radius = 5.0,
-       numSides = 4,
-       center = [10, 10],
-       inscribed = false,
-     )
+    radius = 5.0,
+    numSides = 4,
+    center = [10, 10],
+    inscribed = false,
+  )
 example = extrude(square, length = 5)
 ```
 

docs/kcl-std/functions/std-solid-intersect.md

@@ -1,31 +1,36 @@
 ---
 title: "intersect"
 subtitle: "Function in std::solid"
-excerpt: "Intersect returns the shared volume between multiple solids, preserving only overlapping regions."
+excerpt: ""
 layout: manual
 ---
 
-Intersect returns the shared volume between multiple solids, preserving only overlapping regions.
+
 
 ```kcl
 intersect(
-  @solids: [Solid],
-  tolerance?: number,
-): [Solid]
+  @solids: [Solid; 2+],
+  tolerance?: number(Length),
+): [Solid; 1+]
 ```
 
-Intersect computes the geometric intersection of multiple solid bodies, returning a new solid representing the volume that is common to all input solids. This operation is useful for determining shared material regions, verifying fit, and analyzing overlapping geometries in assemblies.
+Intersect returns the shared volume between multiple solids, preserving only
+overlapping regions.
+Intersect computes the geometric intersection of multiple solid bodies,
+returning a new solid representing the volume that is common to all input
+solids. This operation is useful for determining shared material regions,
+verifying fit, and analyzing overlapping geometries in assemblies.
 
 ### Arguments
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `solids` | [`[Solid]`](/docs/kcl-std/types/std-types-Solid) | The solids to intersect. | Yes |
-| `tolerance` | [`number`](/docs/kcl-std/types/std-types-number) | The tolerance to use for the intersection operation. | No |
+| `solids` | `[Solid; 2+]` | The solids to intersect. | Yes |
+| `tolerance` | [`number(Length)`](/docs/kcl-std/types/std-types-number) | The tolerance to use for the intersection operation. | No |
 
 ### Returns
 
-[`[Solid]`](/docs/kcl-std/types/std-types-Solid)
+[`[Solid; 1+]`](/docs/kcl-std/types/std-types-Solid)
 
 
 ### Examples
@@ -33,20 +38,19 @@ Intersect computes the geometric intersection of multiple solid bodies, returnin
 ```kcl
 // Intersect two cubes using the stdlib functions.
 
-
 fn cube(center, size) {
-  return startSketchOn(XY)
-    |> startProfile(at = [center[0] - size, center[1] - size])
-    |> line(endAbsolute = [center[0] + size, center[1] - size])
-    |> line(endAbsolute = [center[0] + size, center[1] + size])
-    |> line(endAbsolute = [center[0] - size, center[1] + size])
-    |> close()
-    |> extrude(length = 10)
+    return startSketchOn(XY)
+        |> startProfile(at = [center[0] - size, center[1] - size])
+        |> line(endAbsolute = [center[0] + size, center[1] - size])
+        |> line(endAbsolute = [center[0] + size, center[1] + size])
+        |> line(endAbsolute = [center[0] - size, center[1] + size])
+        |> close()
+        |> extrude(length = 10)
 }
 
 part001 = cube(center = [0, 0], size = 10)
 part002 = cube(center = [7, 3], size = 5)
-  |> translate(z = 1)
+    |> translate(z = 1)
 
 intersectedPart = intersect([part001, part002])
 ```
@@ -58,20 +62,19 @@ intersectedPart = intersect([part001, part002])
 // NOTE: This will not work when using codemods through the UI.
 // Codemods will generate the stdlib function call instead.
 
-
 fn cube(center, size) {
-  return startSketchOn(XY)
-    |> startProfile(at = [center[0] - size, center[1] - size])
-    |> line(endAbsolute = [center[0] + size, center[1] - size])
-    |> line(endAbsolute = [center[0] + size, center[1] + size])
-    |> line(endAbsolute = [center[0] - size, center[1] + size])
-    |> close()
-    |> extrude(length = 10)
+    return startSketchOn(XY)
+        |> startProfile(at = [center[0] - size, center[1] - size])
+        |> line(endAbsolute = [center[0] + size, center[1] - size])
+        |> line(endAbsolute = [center[0] + size, center[1] + size])
+        |> line(endAbsolute = [center[0] - size, center[1] + size])
+        |> close()
+        |> extrude(length = 10)
 }
 
 part001 = cube(center = [0, 0], size = 10)
 part002 = cube(center = [7, 3], size = 5)
-  |> translate(z = 1)
+    |> translate(z = 1)
 
 // This is the equivalent of: intersect([part001, part002])
 intersectedPart = part001 & part002

docs/kcl-std/functions/std-solid-patternTransform.md

@@ -12,7 +12,7 @@ patternTransform(
   @solids: [Solid; 1+],
   instances: number(_),
   transform: fn(number(_)): { },
-  useOriginal?: boolean,
+  useOriginal?: bool,
 ): [Solid; 1+]
 ```
 
@@ -61,7 +61,7 @@ Its properties are:
 | `solids` | [`[Solid; 1+]`](/docs/kcl-std/types/std-types-Solid) | The solid(s) 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 |
 | `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 |
-| `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. | No |
 
 ### Returns
 

docs/kcl-std/functions/std-solid-union.md

@@ -9,9 +9,9 @@ Union two or more solids into a single solid.
 
 ```kcl
 union(
-  @solids: [Solid],
-  tolerance?: number,
-): [Solid]
+  @solids: [Solid; 2+],
+  tolerance?: number(Length),
+): [Solid; 1+]
 ```
 
 
@@ -20,12 +20,12 @@ union(
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `solids` | [`[Solid]`](/docs/kcl-std/types/std-types-Solid) | The solids to union. | Yes |
-| `tolerance` | [`number`](/docs/kcl-std/types/std-types-number) | The tolerance to use for the union operation. | No |
+| `solids` | `[Solid; 2+]` | The solids to union. | Yes |
+| `tolerance` | [`number(Length)`](/docs/kcl-std/types/std-types-number) | The tolerance to use for the union operation. | No |
 
 ### Returns
 
-[`[Solid]`](/docs/kcl-std/types/std-types-Solid)
+[`[Solid; 1+]`](/docs/kcl-std/types/std-types-Solid)
 
 
 ### Examples
@@ -33,20 +33,19 @@ union(
 ```kcl
 // Union two cubes using the stdlib functions.
 
-
 fn cube(center, size) {
-  return startSketchOn(XY)
-    |> startProfile(at = [center[0] - size, center[1] - size])
-    |> line(endAbsolute = [center[0] + size, center[1] - size])
-    |> line(endAbsolute = [center[0] + size, center[1] + size])
-    |> line(endAbsolute = [center[0] - size, center[1] + size])
-    |> close()
-    |> extrude(length = 10)
+    return startSketchOn(XY)
+        |> startProfile(at = [center[0] - size, center[1] - size])
+        |> line(endAbsolute = [center[0] + size, center[1] - size])
+        |> line(endAbsolute = [center[0] + size, center[1] + size])
+        |> line(endAbsolute = [center[0] - size, center[1] + size])
+        |> close()
+        |> extrude(length = 10)
 }
 
 part001 = cube(center = [0, 0], size = 10)
 part002 = cube(center = [7, 3], size = 5)
-  |> translate(z = 1)
+    |> translate(z = 1)
 
 unionedPart = union([part001, part002])
 ```
@@ -58,20 +57,19 @@ unionedPart = union([part001, part002])
 // NOTE: This will not work when using codemods through the UI.
 // Codemods will generate the stdlib function call instead.
 
-
 fn cube(center, size) {
-  return startSketchOn(XY)
-    |> startProfile(at = [center[0] - size, center[1] - size])
-    |> line(endAbsolute = [center[0] + size, center[1] - size])
-    |> line(endAbsolute = [center[0] + size, center[1] + size])
-    |> line(endAbsolute = [center[0] - size, center[1] + size])
-    |> close()
-    |> extrude(length = 10)
+    return startSketchOn(XY)
+        |> startProfile(at = [center[0] - size, center[1] - size])
+        |> line(endAbsolute = [center[0] + size, center[1] - size])
+        |> line(endAbsolute = [center[0] + size, center[1] + size])
+        |> line(endAbsolute = [center[0] - size, center[1] + size])
+        |> close()
+        |> extrude(length = 10)
 }
 
 part001 = cube(center = [0, 0], size = 10)
 part002 = cube(center = [7, 3], size = 5)
-  |> translate(z = 1)
+    |> translate(z = 1)
 
 // This is the equivalent of: union([part001, part002])
 unionedPart = part001 + part002
@@ -84,23 +82,22 @@ unionedPart = part001 + part002
 // NOTE: This will not work when using codemods through the UI.
 // Codemods will generate the stdlib function call instead.
 
-
 fn cube(center, size) {
-  return startSketchOn(XY)
-    |> startProfile(at = [center[0] - size, center[1] - size])
-    |> line(endAbsolute = [center[0] + size, center[1] - size])
-    |> line(endAbsolute = [center[0] + size, center[1] + size])
-    |> line(endAbsolute = [center[0] - size, center[1] + size])
-    |> close()
-    |> extrude(length = 10)
+    return startSketchOn(XY)
+        |> startProfile(at = [center[0] - size, center[1] - size])
+        |> line(endAbsolute = [center[0] + size, center[1] - size])
+        |> line(endAbsolute = [center[0] + size, center[1] + size])
+        |> line(endAbsolute = [center[0] - size, center[1] + size])
+        |> close()
+        |> extrude(length = 10)
 }
 
 part001 = cube(center = [0, 0], size = 10)
 part002 = cube(center = [7, 3], size = 5)
-  |> translate(z = 1)
+    |> translate(z = 1)
 
-  // This is the equivalent of: union([part001, part002])
-  // Programmers will understand `|` as a union operation, but mechanical engineers
+// This is the equivalent of: union([part001, part002])
+// Programmers will understand `|` as a union operation, but mechanical engineers
 // will understand `+`, we made both work.
 unionedPart = part001 | part002
 ```

docs/kcl-std/index.md

@@ -9,13 +9,13 @@ layout: manual
 ### Functions
 
 * [**std**](/docs/kcl-std/modules/std)
-  * [`appearance`](/docs/kcl-std/appearance)
-  * [`assert`](/docs/kcl-std/assert)
-  * [`assertIs`](/docs/kcl-std/assertIs)
+  * [`assert`](/docs/kcl-std/functions/std-assert)
+  * [`assertIs`](/docs/kcl-std/functions/std-assertIs)
   * [`clone`](/docs/kcl-std/functions/std-clone)
   * [`helix`](/docs/kcl-std/functions/std-helix)
   * [`offsetPlane`](/docs/kcl-std/functions/std-offsetPlane)
-  * [`patternLinear2d`](/docs/kcl-std/patternLinear2d)
+* [**std::appearance**](/docs/kcl-std/modules/std-appearance)
+  * [`appearance::hexString`](/docs/kcl-std/functions/std-appearance-hexString)
 * [**std::array**](/docs/kcl-std/modules/std-array)
   * [`map`](/docs/kcl-std/functions/std-array-map)
   * [`pop`](/docs/kcl-std/functions/std-array-pop)
@@ -52,21 +52,22 @@ layout: manual
   * [`arc`](/docs/kcl-std/arc)
   * [`bezierCurve`](/docs/kcl-std/bezierCurve)
   * [`circle`](/docs/kcl-std/functions/std-sketch-circle)
-  * [`circleThreePoint`](/docs/kcl-std/circleThreePoint)
+  * [`circleThreePoint`](/docs/kcl-std/functions/std-sketch-circleThreePoint)
   * [`close`](/docs/kcl-std/close)
-  * [`extrude`](/docs/kcl-std/extrude)
-  * [`getCommonEdge`](/docs/kcl-std/getCommonEdge)
-  * [`getNextAdjacentEdge`](/docs/kcl-std/getNextAdjacentEdge)
-  * [`getOppositeEdge`](/docs/kcl-std/getOppositeEdge)
-  * [`getPreviousAdjacentEdge`](/docs/kcl-std/getPreviousAdjacentEdge)
+  * [`extrude`](/docs/kcl-std/functions/std-sketch-extrude)
+  * [`getCommonEdge`](/docs/kcl-std/functions/std-sketch-getCommonEdge)
+  * [`getNextAdjacentEdge`](/docs/kcl-std/functions/std-sketch-getNextAdjacentEdge)
+  * [`getOppositeEdge`](/docs/kcl-std/functions/std-sketch-getOppositeEdge)
+  * [`getPreviousAdjacentEdge`](/docs/kcl-std/functions/std-sketch-getPreviousAdjacentEdge)
   * [`involuteCircular`](/docs/kcl-std/involuteCircular)
   * [`lastSegX`](/docs/kcl-std/lastSegX)
   * [`lastSegY`](/docs/kcl-std/lastSegY)
   * [`line`](/docs/kcl-std/line)
-  * [`loft`](/docs/kcl-std/loft)
-  * [`patternCircular2d`](/docs/kcl-std/patternCircular2d)
+  * [`loft`](/docs/kcl-std/functions/std-sketch-loft)
+  * [`patternCircular2d`](/docs/kcl-std/functions/std-sketch-patternCircular2d)
+  * [`patternLinear2d`](/docs/kcl-std/functions/std-sketch-patternLinear2d)
   * [`patternTransform2d`](/docs/kcl-std/functions/std-sketch-patternTransform2d)
-  * [`polygon`](/docs/kcl-std/polygon)
+  * [`polygon`](/docs/kcl-std/functions/std-sketch-polygon)
   * [`profileStart`](/docs/kcl-std/profileStart)
   * [`profileStartX`](/docs/kcl-std/profileStartX)
   * [`profileStartY`](/docs/kcl-std/profileStartY)
@@ -82,27 +83,28 @@ layout: manual
   * [`startProfile`](/docs/kcl-std/startProfile)
   * [`startSketchOn`](/docs/kcl-std/startSketchOn)
   * [`subtract2d`](/docs/kcl-std/subtract2d)
-  * [`sweep`](/docs/kcl-std/sweep)
+  * [`sweep`](/docs/kcl-std/functions/std-sketch-sweep)
   * [`tangentToEnd`](/docs/kcl-std/tangentToEnd)
   * [`tangentialArc`](/docs/kcl-std/tangentialArc)
   * [`xLine`](/docs/kcl-std/xLine)
   * [`yLine`](/docs/kcl-std/yLine)
 * [**std::solid**](/docs/kcl-std/modules/std-solid)
+  * [`appearance`](/docs/kcl-std/functions/std-solid-appearance)
   * [`chamfer`](/docs/kcl-std/functions/std-solid-chamfer)
   * [`fillet`](/docs/kcl-std/functions/std-solid-fillet)
   * [`hollow`](/docs/kcl-std/functions/std-solid-hollow)
-  * [`intersect`](/docs/kcl-std/intersect)
-  * [`patternCircular3d`](/docs/kcl-std/patternCircular3d)
-  * [`patternLinear3d`](/docs/kcl-std/patternLinear3d)
+  * [`intersect`](/docs/kcl-std/functions/std-solid-intersect)
+  * [`patternCircular3d`](/docs/kcl-std/functions/std-solid-patternCircular3d)
+  * [`patternLinear3d`](/docs/kcl-std/functions/std-solid-patternLinear3d)
   * [`patternTransform`](/docs/kcl-std/functions/std-solid-patternTransform)
   * [`shell`](/docs/kcl-std/functions/std-solid-shell)
-  * [`subtract`](/docs/kcl-std/subtract)
-  * [`union`](/docs/kcl-std/union)
+  * [`subtract`](/docs/kcl-std/functions/std-solid-subtract)
+  * [`union`](/docs/kcl-std/functions/std-solid-union)
 * [**std::transform**](/docs/kcl-std/modules/std-transform)
   * [`mirror2d`](/docs/kcl-std/functions/std-transform-mirror2d)
-  * [`rotate`](/docs/kcl-std/rotate)
-  * [`scale`](/docs/kcl-std/scale)
-  * [`translate`](/docs/kcl-std/translate)
+  * [`rotate`](/docs/kcl-std/functions/std-transform-rotate)
+  * [`scale`](/docs/kcl-std/functions/std-transform-scale)
+  * [`translate`](/docs/kcl-std/functions/std-transform-translate)
 * [**std::units**](/docs/kcl-std/modules/std-units)
   * [`units::toCentimeters`](/docs/kcl-std/functions/std-units-toCentimeters)
   * [`units::toDegrees`](/docs/kcl-std/functions/std-units-toDegrees)

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

@@ -0,0 +1,16 @@
+---
+title: "appearance"
+subtitle: "Module in std"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+
+## Functions and constants
+
+* [`appearance::hexString`](/docs/kcl-std/functions/std-appearance-hexString)
+

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

@@ -17,21 +17,22 @@ This module contains functions for creating and manipulating sketches, and makin
 * [`arc`](/docs/kcl-std/arc)
 * [`bezierCurve`](/docs/kcl-std/bezierCurve)
 * [`circle`](/docs/kcl-std/functions/std-sketch-circle)
-* [`circleThreePoint`](/docs/kcl-std/circleThreePoint)
+* [`circleThreePoint`](/docs/kcl-std/functions/std-sketch-circleThreePoint)
 * [`close`](/docs/kcl-std/close)
-* [`extrude`](/docs/kcl-std/extrude)
-* [`getCommonEdge`](/docs/kcl-std/getCommonEdge)
-* [`getNextAdjacentEdge`](/docs/kcl-std/getNextAdjacentEdge)
-* [`getOppositeEdge`](/docs/kcl-std/getOppositeEdge)
-* [`getPreviousAdjacentEdge`](/docs/kcl-std/getPreviousAdjacentEdge)
+* [`extrude`](/docs/kcl-std/functions/std-sketch-extrude)
+* [`getCommonEdge`](/docs/kcl-std/functions/std-sketch-getCommonEdge)
+* [`getNextAdjacentEdge`](/docs/kcl-std/functions/std-sketch-getNextAdjacentEdge)
+* [`getOppositeEdge`](/docs/kcl-std/functions/std-sketch-getOppositeEdge)
+* [`getPreviousAdjacentEdge`](/docs/kcl-std/functions/std-sketch-getPreviousAdjacentEdge)
 * [`involuteCircular`](/docs/kcl-std/involuteCircular)
 * [`lastSegX`](/docs/kcl-std/lastSegX)
 * [`lastSegY`](/docs/kcl-std/lastSegY)
 * [`line`](/docs/kcl-std/line)
-* [`loft`](/docs/kcl-std/loft)
-* [`patternCircular2d`](/docs/kcl-std/patternCircular2d)
+* [`loft`](/docs/kcl-std/functions/std-sketch-loft)
+* [`patternCircular2d`](/docs/kcl-std/functions/std-sketch-patternCircular2d)
+* [`patternLinear2d`](/docs/kcl-std/functions/std-sketch-patternLinear2d)
 * [`patternTransform2d`](/docs/kcl-std/functions/std-sketch-patternTransform2d)
-* [`polygon`](/docs/kcl-std/polygon)
+* [`polygon`](/docs/kcl-std/functions/std-sketch-polygon)
 * [`profileStart`](/docs/kcl-std/profileStart)
 * [`profileStartX`](/docs/kcl-std/profileStartX)
 * [`profileStartY`](/docs/kcl-std/profileStartY)
@@ -47,7 +48,7 @@ This module contains functions for creating and manipulating sketches, and makin
 * [`startProfile`](/docs/kcl-std/startProfile)
 * [`startSketchOn`](/docs/kcl-std/startSketchOn)
 * [`subtract2d`](/docs/kcl-std/subtract2d)
-* [`sweep`](/docs/kcl-std/sweep)
+* [`sweep`](/docs/kcl-std/functions/std-sketch-sweep)
 * [`tangentToEnd`](/docs/kcl-std/tangentToEnd)
 * [`tangentialArc`](/docs/kcl-std/tangentialArc)
 * [`xLine`](/docs/kcl-std/xLine)

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

@@ -12,14 +12,15 @@ This module contains functions for modifying solids, e.g., by adding a fillet or
 
 ## Functions and constants
 
+* [`appearance`](/docs/kcl-std/functions/std-solid-appearance)
 * [`chamfer`](/docs/kcl-std/functions/std-solid-chamfer)
 * [`fillet`](/docs/kcl-std/functions/std-solid-fillet)
 * [`hollow`](/docs/kcl-std/functions/std-solid-hollow)
-* [`intersect`](/docs/kcl-std/intersect)
-* [`patternCircular3d`](/docs/kcl-std/patternCircular3d)
-* [`patternLinear3d`](/docs/kcl-std/patternLinear3d)
+* [`intersect`](/docs/kcl-std/functions/std-solid-intersect)
+* [`patternCircular3d`](/docs/kcl-std/functions/std-solid-patternCircular3d)
+* [`patternLinear3d`](/docs/kcl-std/functions/std-solid-patternLinear3d)
 * [`patternTransform`](/docs/kcl-std/functions/std-solid-patternTransform)
 * [`shell`](/docs/kcl-std/functions/std-solid-shell)
-* [`subtract`](/docs/kcl-std/subtract)
-* [`union`](/docs/kcl-std/union)
+* [`subtract`](/docs/kcl-std/functions/std-solid-subtract)
+* [`union`](/docs/kcl-std/functions/std-solid-union)
 

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

@@ -13,7 +13,7 @@ This module contains functions for transforming sketches and solids.
 ## Functions and constants
 
 * [`mirror2d`](/docs/kcl-std/functions/std-transform-mirror2d)
-* [`rotate`](/docs/kcl-std/rotate)
-* [`scale`](/docs/kcl-std/scale)
-* [`translate`](/docs/kcl-std/translate)
+* [`rotate`](/docs/kcl-std/functions/std-transform-rotate)
+* [`scale`](/docs/kcl-std/functions/std-transform-scale)
+* [`translate`](/docs/kcl-std/functions/std-transform-translate)
 

docs/kcl-std/modules/std.md

@@ -15,6 +15,7 @@ You might also want the [KCL language reference](/docs/kcl-lang) or the [KCL gui
 
 ## Modules
 
+* [`appearance::appearance`](/docs/kcl-std/modules/std-appearance)
 * [`array`](/docs/kcl-std/modules/std-array)
 * [`math`](/docs/kcl-std/modules/std-math)
 * [`sketch`](/docs/kcl-std/modules/std-sketch)
@@ -35,11 +36,9 @@ You might also want the [KCL language reference](/docs/kcl-lang) or the [KCL gui
 * [`Y`](/docs/kcl-std/consts/std-Y)
 * [`YZ`](/docs/kcl-std/consts/std-YZ)
 * [`Z`](/docs/kcl-std/consts/std-Z)
-* [`appearance`](/docs/kcl-std/appearance)
-* [`assert`](/docs/kcl-std/assert)
-* [`assertIs`](/docs/kcl-std/assertIs)
+* [`assert`](/docs/kcl-std/functions/std-assert)
+* [`assertIs`](/docs/kcl-std/functions/std-assertIs)
 * [`clone`](/docs/kcl-std/functions/std-clone)
 * [`helix`](/docs/kcl-std/functions/std-helix)
 * [`offsetPlane`](/docs/kcl-std/functions/std-offsetPlane)
-* [`patternLinear2d`](/docs/kcl-std/patternLinear2d)
 

docs/kcl-std/tangentialArc.md

@@ -13,6 +13,7 @@ tangentialArc(
   endAbsolute?: Point2d,
   end?: Point2d,
   radius?: number,
+  diameter?: number,
   angle?: number,
   tag?: TagDeclarator,
 ): Sketch
@@ -27,7 +28,8 @@ When using radius and angle, draw a curved line segment along part of an imagina
 | `sketch` | [`Sketch`](/docs/kcl-std/types/std-types-Sketch) | Which sketch should this path be added to? | Yes |
 | `endAbsolute` | [`Point2d`](/docs/kcl-std/types/std-types-Point2d) | Which absolute point should this arc go to? Incompatible with `end`, `radius`, and `offset`. | No |
 | `end` | [`Point2d`](/docs/kcl-std/types/std-types-Point2d) | How far away (along the X and Y axes) should this arc go? Incompatible with `endAbsolute`, `radius`, and `offset`. | No |
-| `radius` | [`number`](/docs/kcl-std/types/std-types-number) | Radius of the imaginary circle. `angle` must be given. Incompatible with `end` and `endAbsolute`. | No |
+| `radius` | [`number`](/docs/kcl-std/types/std-types-number) | Radius of the imaginary circle. `angle` must be given. Incompatible with `end` and `endAbsolute` and `diameter`. | No |
+| `diameter` | [`number`](/docs/kcl-std/types/std-types-number) | Diameter of the imaginary circle. `angle` must be given. Incompatible with `end` and `endAbsolute` and `radius`. | No |
 | `angle` | [`number`](/docs/kcl-std/types/std-types-number) | Offset of the arc in degrees. `radius` must be given. Incompatible with `end` and `endAbsolute`. | No |
 | [`tag`](/docs/kcl-std/types/std-types-tag) | [`TagDeclarator`](/docs/kcl-lang/types#TagDeclarator) | Create a new tag which refers to this arc | No |
 

e2e/playwright/app-header-tests.spec.ts

@@ -5,7 +5,7 @@ import * as fsp from 'fs/promises'
 test.describe('Electron app header tests', () => {
   test(
     'Open Command Palette button has correct shortcut',
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ page }, testInfo) => {
       await page.setBodyDimensions({ width: 1200, height: 500 })
 
@@ -30,7 +30,7 @@ test.describe('Electron app header tests', () => {
 
   test(
     'User settings has correct shortcut',
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ page, toolbar }, testInfo) => {
       await page.setBodyDimensions({ width: 1200, height: 500 })
 

e2e/playwright/auth.spec.ts

@@ -4,7 +4,7 @@ import { expect, test } from '@e2e/playwright/zoo-test'
 test.describe('Authentication tests', () => {
   test(
     `The user can sign out and back in`,
-    { tag: ['@electron'] },
+    { tag: ['@desktop'] },
     async ({ page, homePage, signInPage, toolbar, tronApp }) => {
       if (!tronApp) {
         fail()

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

@@ -78,11 +78,10 @@ extrude001 = extrude(sketch001, length = 5)`
 
     // Delete a character to break the KCL
     await editor.openPane()
-    await editor.scrollToText('bracketLeg1Sketch, length = thickness)')
-    await page
-      .getByText('extrude(bracketLeg1Sketch, length = thickness)')
-      .click()
-    await page.keyboard.press('Backspace')
+    await editor.scrollToText('extrude(%, length = width)')
+    await page.getByText('extrude(%, length = width)').click()
+
+    await page.keyboard.press(')')
 
     // Ensure that a badge appears on the button
     await expect(codePaneButtonHolder).toContainText('notification')
@@ -99,16 +98,11 @@ extrude001 = extrude(sketch001, length = 5)`
 
     await page.waitForTimeout(500)
 
-    // Ensure that a badge appears on the button
-    await expect(codePaneButtonHolder).toContainText('notification')
-    // Ensure we have no errors in the gutter.
-    await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
-
     // Open the code pane
     await editor.openPane()
 
-    // Go to our problematic code again (missing closing paren!)
-    await editor.scrollToText('extrude(bracketLeg1Sketch, length = thickness')
+    // Go to our problematic code again
+    await editor.scrollToText('extrude(%, length = w')
 
     // Ensure that a badge appears on the button
     await expect(codePaneButtonHolder).toContainText('notification')
@@ -271,6 +265,7 @@ middle(0)
     })
     await expect(
       page.getByText(`assert failed: Expected 0 to be greater than 0 but it wasn't
+assert()
 check()
 middle()`)
     ).toBeVisible()
@@ -281,7 +276,7 @@ middle()`)
 
 test(
   'Opening multiple panes persists when switching projects',
-  { tag: '@electron' },
+  { tag: '@desktop' },
   async ({ context, page }, testInfo) => {
     // Setup multiple projects.
     await context.folderSetupFn(async (dir) => {
@@ -352,7 +347,7 @@ test(
 
 test(
   'external change of file contents are reflected in editor',
-  { tag: '@electron' },
+  { tag: '@desktop' },
   async ({ context, page }, testInfo) => {
     const PROJECT_DIR_NAME = 'lee-was-here'
     const { dir: projectsDir } = await context.folderSetupFn(async (dir) => {

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

@@ -45,15 +45,16 @@ test.describe('Command bar tests', () => {
     await cmdBar.expectState({
       stage: 'arguments',
       commandName: 'Extrude',
-      currentArgKey: 'length',
-      currentArgValue: '5',
+      currentArgKey: 'sketches',
+      currentArgValue: '',
       headerArguments: {
-        Profiles: '1 profile',
+        Profiles: '',
         Length: '',
       },
-      highlightedHeaderArg: 'length',
+      highlightedHeaderArg: 'Profiles',
     })
     await cmdBar.progressCmdBar()
+    await cmdBar.progressCmdBar()
     await cmdBar.expectState({
       stage: 'review',
       commandName: 'Extrude',
@@ -518,7 +519,7 @@ test.describe('Command bar tests', () => {
     `Zoom to fit to shared model on web`,
     { tag: ['@web'] },
     async ({ page, scene }) => {
-      if (process.env.PLATFORM !== 'web') {
+      if (process.env.TARGET !== 'web') {
         // This test is web-only
         // TODO: re-enable on CI as part of a new @web test suite
         return

e2e/playwright/desktop-export.spec.ts

@@ -10,7 +10,7 @@ import { expect, test } from '@e2e/playwright/zoo-test'
 
 test(
   'export works on the first try',
-  { tag: ['@electron', '@macos', '@windows', '@skipLocalEngine'] },
+  { tag: ['@desktop', '@macos', '@windows', '@skipLocalEngine'] },
   async ({ page, context, scene, tronApp, cmdBar }, testInfo) => {
     if (!tronApp) {
       fail()

e2e/playwright/editor-tests.spec.ts

@@ -1001,7 +1001,7 @@ a1 = startSketchOn(offsetPlane(XY, offset = 10))
       await expect(page.locator('.cm-content')).toHaveText(
         `@settings(defaultLengthUnit = in)
 sketch001 = startSketchOn(XZ)
-        |> startProfile(%, at = [3.14, 12])
+        |> startProfile(%, at = [0, 12])
         |> xLine(%, length = 5) // lin`.replaceAll('\n', '')
       )
 
@@ -1076,7 +1076,7 @@ sketch001 = startSketchOn(XZ)
       await expect(page.locator('.cm-content')).toHaveText(
         `@settings(defaultLengthUnit = in)
 sketch001 = startSketchOn(XZ)
-        |> startProfile(%, at = [3.14, 12])
+        |> startProfile(%, at = [0, 12])
         |> xLine(%, length = 5) // lin`.replaceAll('\n', '')
       )
     })
@@ -1134,6 +1134,7 @@ sketch001 = startSketchOn(XZ)
     // 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',
@@ -1336,7 +1337,7 @@ sketch001 = startSketchOn(XZ)
 
   test(
     `Can import a local OBJ file`,
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ page, context }, testInfo) => {
       await context.folderSetupFn(async (dir) => {
         const bracketDir = join(dir, 'cube')
@@ -1355,9 +1356,7 @@ sketch001 = startSketchOn(XZ)
       const u = await getUtils(page)
       const projectLink = page.getByRole('link', { name: 'cube' })
       const gizmo = page.locator('[aria-label*=gizmo]')
-      const resetCameraButton = page.getByRole('button', {
-        name: 'Reset view',
-      })
+      const resetCameraButton = page.getByRole('button', { name: 'Reset view' })
       const locationToHaveColor = async (
         position: { x: number; y: number },
         color: [number, number, number]
@@ -1591,4 +1590,38 @@ sketch001 = startSketchOn(XZ)
       await expect(page.getByTestId('center-rectangle')).toBeVisible()
     })
   })
+
+  test('syntax errors still show when reopening KCL pane', async ({
+    page,
+    homePage,
+    scene,
+    cmdBar,
+  }) => {
+    const u = await getUtils(page)
+    await page.setBodyDimensions({ width: 1200, height: 500 })
+
+    await homePage.goToModelingScene()
+
+    // Wait for connection, this is especially important for this test, because safeParse is invoked when
+    // connection is established which would interfere with the test if it happened during later steps.
+    await scene.connectionEstablished()
+    await scene.settled(cmdBar)
+
+    // Code with no error
+    await u.codeLocator.fill(`x = 7`)
+    await page.waitForTimeout(200) // allow some time for the error to show potentially
+    await expect(page.locator('.cm-lint-marker-error')).toHaveCount(0)
+
+    // Code with error
+    await u.codeLocator.fill(`x 7`)
+    await expect(page.locator('.cm-lint-marker-error')).toHaveCount(1)
+
+    // Close and reopen KCL code panel
+    await u.closeKclCodePanel()
+    await expect(page.locator('.cm-lint-marker-error')).toHaveCount(0) // error disappears on close
+    await u.openKclCodePanel()
+
+    // Verify error is still visible
+    await expect(page.locator('.cm-lint-marker-error')).toHaveCount(1)
+  })
 })

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

@@ -57,7 +57,7 @@ sketch003 = startSketchOn(plane001)
 test.describe('Feature Tree pane', () => {
   test(
     'User can go to definition and go to function definition',
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ context, homePage, scene, editor, toolbar, cmdBar, page }) => {
       await context.folderSetupFn(async (dir) => {
         const bracketDir = join(dir, 'test-sample')
@@ -150,7 +150,7 @@ test.describe('Feature Tree pane', () => {
 
   test(
     `User can edit sketch (but not on offset plane yet) from the feature tree`,
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ context, homePage, scene, editor, toolbar, page }) => {
       await context.addInitScript((initialCode) => {
         localStorage.setItem('persistCode', initialCode)

e2e/playwright/file-tree.spec.ts

@@ -13,7 +13,7 @@ import { expect, test } from '@e2e/playwright/zoo-test'
 test.describe('integrations tests', () => {
   test(
     'Creating a new file or switching file while in sketchMode should exit sketchMode',
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ page, context, homePage, scene, editor, toolbar, cmdBar }) => {
       await context.folderSetupFn(async (dir) => {
         const bracketDir = join(dir, 'test-sample')
@@ -100,7 +100,7 @@ test.describe('when using the file tree to', () => {
 
   test(
     `rename ${fromFile} to ${toFile}, and doesn't crash on reload and settings load`,
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ page }, testInfo) => {
       const { panesOpen, pasteCodeInEditor, renameFile, editorTextMatches } =
         await getUtils(page, test)
@@ -142,7 +142,7 @@ test.describe('when using the file tree to', () => {
 
   test(
     `create many new files of the same name, incrementing their names`,
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ page }, testInfo) => {
       const { panesOpen, createNewFile } = await getUtils(page, test)
 
@@ -174,7 +174,7 @@ test.describe('when using the file tree to', () => {
 
   test(
     'create a new file with the same name as an existing file cancels the operation',
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ context, page, homePage, scene, editor, toolbar }, testInfo) => {
       const projectName = 'cube'
       const mainFile = 'main.kcl'
@@ -240,7 +240,7 @@ test.describe('when using the file tree to', () => {
 
   test(
     `create new folders and that doesn't trigger a navigation`,
-    { tag: ['@electron', '@macos', '@windows'] },
+    { tag: ['@desktop', '@macos', '@windows'] },
     async ({ page, homePage, scene, toolbar, cmdBar }) => {
       await homePage.goToModelingScene()
       await scene.settled(cmdBar)
@@ -260,7 +260,7 @@ test.describe('when using the file tree to', () => {
 
   test(
     'deleting all files recreates a default main.kcl with no code',
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ page }, testInfo) => {
       const { panesOpen, pasteCodeInEditor, deleteFile, editorTextMatches } =
         await getUtils(page, test)
@@ -291,7 +291,7 @@ test.describe('when using the file tree to', () => {
   test(
     'loading small file, then large, then back to small',
     {
-      tag: '@electron',
+      tag: '@desktop',
     },
     async ({ page }, testInfo) => {
       const {
@@ -361,7 +361,7 @@ test.describe('when using the file tree to', () => {
 test.describe('Renaming in the file tree', () => {
   test(
     'A file you have open',
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ context, page }, testInfo) => {
       const { dir } = await context.folderSetupFn(async (dir) => {
         await fsp.mkdir(join(dir, 'Test Project'), { recursive: true })
@@ -450,7 +450,7 @@ test.describe('Renaming in the file tree', () => {
 
   test(
     'A file you do not have open',
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ context, page }, testInfo) => {
       const { dir } = await context.folderSetupFn(async (dir) => {
         await fsp.mkdir(join(dir, 'Test Project'), { recursive: true })
@@ -536,7 +536,7 @@ test.describe('Renaming in the file tree', () => {
 
   test(
     `A folder you're not inside`,
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ context, page }, testInfo) => {
       const { dir } = await context.folderSetupFn(async (dir) => {
         await fsp.mkdir(join(dir, 'Test Project'), { recursive: true })
@@ -618,7 +618,7 @@ test.describe('Renaming in the file tree', () => {
 
   test(
     `A folder you are inside`,
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ page, context }, testInfo) => {
       const { dir } = await context.folderSetupFn(async (dir) => {
         await fsp.mkdir(join(dir, 'Test Project'), { recursive: true })
@@ -721,7 +721,7 @@ test.describe('Renaming in the file tree', () => {
 test.describe('Deleting items from the file pane', () => {
   test(
     `delete file when main.kcl exists, navigate to main.kcl`,
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ page, context }, testInfo) => {
       await context.folderSetupFn(async (dir) => {
         const testDir = join(dir, 'testProject')
@@ -786,7 +786,7 @@ test.describe('Deleting items from the file pane', () => {
 
   test(
     `Delete folder we are not in, don't navigate`,
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ context, page }, testInfo) => {
       await context.folderSetupFn(async (dir) => {
         await fsp.mkdir(join(dir, 'Test Project'), { recursive: true })
@@ -840,7 +840,7 @@ test.describe('Deleting items from the file pane', () => {
 
   test(
     `Delete folder we are in, navigate to main.kcl`,
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ context, page }, testInfo) => {
       await context.folderSetupFn(async (dir) => {
         await fsp.mkdir(join(dir, 'Test Project'), { recursive: true })
@@ -906,7 +906,7 @@ test.describe('Deleting items from the file pane', () => {
   // Copied from tests above.
   test(
     `external deletion of project navigates back home`,
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ context, page }, testInfo) => {
       const TEST_PROJECT_NAME = 'Test Project'
       const { dir: projectsDirName } = await context.folderSetupFn(
@@ -970,7 +970,7 @@ test.describe('Deleting items from the file pane', () => {
   // Similar to the above
   test(
     `external deletion of file in sub-directory updates the file tree and recreates it on code editor typing`,
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ context, page }, testInfo) => {
       const TEST_PROJECT_NAME = 'Test Project'
       const { dir: projectsDirName } = await context.folderSetupFn(
@@ -1045,7 +1045,7 @@ test.describe('Deleting items from the file pane', () => {
 test.describe('Undo and redo do not keep history when navigating between files', () => {
   test(
     `open a file, change something, open a different file, hitting undo should do nothing`,
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ context, page }, testInfo) => {
       await context.folderSetupFn(async (dir) => {
         const testDir = join(dir, 'testProject')
@@ -1112,7 +1112,7 @@ test.describe('Undo and redo do not keep history when navigating between files',
 
   test(
     `open a file, change something, undo it, open a different file, hitting redo should do nothing`,
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ context, page }, testInfo) => {
       await context.folderSetupFn(async (dir) => {
         const testDir = join(dir, 'testProject')
@@ -1212,7 +1212,7 @@ test.describe('Undo and redo do not keep history when navigating between files',
 
   test(
     `cloned file has an incremented name and same contents`,
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ page, context, homePage }, testInfo) => {
       const { panesOpen, cloneFile } = await getUtils(page, test)
 

e2e/playwright/fixtures/cmdBarFixture.ts

@@ -105,14 +105,19 @@ 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 could have unexpected results depending on what's focused
-   *
-   * TODO: This method assumes the user has a valid input to the current stage,
+  /**
+   * This method is used to progress the command bar to the next step, defaulting to clicking the next button.
+   * 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,
    * and assumes we are past the `pickCommand` step.
    */
-  progressCmdBar = async (shouldFuzzProgressMethod = true) => {
+  progressCmdBar = async (shouldUseKeyboard = false) => {
     await this.page.waitForTimeout(2000)
+    if (shouldUseKeyboard) {
+      await this.page.keyboard.press('Enter')
+      return
+    }
+
     const arrowButton = this.page.getByRole('button', {
       name: 'arrow right Continue',
     })

e2e/playwright/fixtures/fixtureSetup.ts

@@ -394,7 +394,7 @@ const fixturesBasedOnProcessEnvPlatform = {
   },
 }
 
-if (process.env.PLATFORM === 'web') {
+if (process.env.TARGET === 'web') {
   Object.assign(fixturesBasedOnProcessEnvPlatform, fixturesForWeb)
 } else {
   Object.assign(fixturesBasedOnProcessEnvPlatform, fixturesForElectron)

e2e/playwright/fixtures/homePageFixture.ts

@@ -126,7 +126,7 @@ export class HomePageFixture {
   /** Returns the project name in case caller has used the default and needs it */
   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.TARGET === 'web') return ''
 
     await this.createAndGoToProject(name)
     return name

e2e/playwright/import-ui.spec.ts

@@ -5,7 +5,7 @@ import * as fsp from 'fs/promises'
 test.describe('Import UI tests', () => {
   test(
     'shows toast when trying to sketch on imported face, and hovering over imported geometry should NOT highlight any code',
-    { tag: ['@electron', '@macos', '@windows'] },
+    { tag: ['@desktop', '@macos', '@windows'] },
     async ({ context, page, homePage, toolbar, scene, editor, cmdBar }) => {
       await context.folderSetupFn(async (dir) => {
         const projectDir = path.join(dir, 'import-test')

e2e/playwright/lib/api-reporter.ts

@@ -61,6 +61,7 @@ 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/machines.spec.ts

@@ -6,7 +6,7 @@ import { expect, test } from '@e2e/playwright/zoo-test'
 
 test(
   'When machine-api server not found butt is disabled and shows the reason',
-  { tag: '@electron' },
+  { tag: '@desktop' },
   async ({ context, page, scene, cmdBar }, testInfo) => {
     await context.folderSetupFn(async (dir) => {
       const bracketDir = join(dir, 'bracket')
@@ -43,7 +43,7 @@ test(
 
 test(
   'When machine-api server not found home screen & project status shows the reason',
-  { tag: '@electron' },
+  { tag: '@desktop' },
   async ({ context, page, scene, cmdBar }, testInfo) => {
     await context.folderSetupFn(async (dir) => {
       const bracketDir = join(dir, 'bracket')

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

@@ -13,7 +13,7 @@ import { expect, test } from '@e2e/playwright/zoo-test'
  */
 test.describe(
   'Native file menu',
-  { tag: ['@electron', '@macos', '@windows'] },
+  { tag: ['@desktop', '@macos', '@windows'] },
   () => {
     test('Home page', async ({ tronApp, cmdBar, page, homePage }) => {
       if (!tronApp) fail()

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

@@ -43,7 +43,7 @@ async function insertPartIntoAssembly(
 test.describe('Point-and-click assemblies tests', () => {
   test(
     `Insert kcl parts into assembly as whole module import`,
-    { tag: ['@electron', '@macos', '@windows'] },
+    { tag: ['@desktop', '@macos', '@windows'] },
     async ({
       context,
       page,
@@ -70,22 +70,28 @@ test.describe('Point-and-click assemblies tests', () => {
       await test.step('Setup parts and expect empty assembly scene', async () => {
         const projectName = 'assembly'
         await context.folderSetupFn(async (dir) => {
-          const bracketDir = path.join(dir, projectName)
-          await fsp.mkdir(bracketDir, { recursive: true })
+          const projDir = path.join(dir, projectName)
+          const nestedProjDir = path.join(dir, projectName, 'nested', 'twice')
+          await fsp.mkdir(projDir, { recursive: true })
+          await fsp.mkdir(nestedProjDir, { recursive: true })
           await Promise.all([
             fsp.copyFile(
               executorInputPath('cylinder.kcl'),
-              path.join(bracketDir, 'cylinder.kcl')
+              path.join(projDir, 'cylinder.kcl')
+            ),
+            fsp.copyFile(
+              executorInputPath('cylinder.kcl'),
+              path.join(nestedProjDir, 'main.kcl')
             ),
             fsp.copyFile(
               executorInputPath('e2e-can-sketch-on-chamfer.kcl'),
-              path.join(bracketDir, 'bracket.kcl')
+              path.join(projDir, 'bracket.kcl')
             ),
             fsp.copyFile(
               testsInputPath('cube.step'),
-              path.join(bracketDir, 'cube.step')
+              path.join(projDir, 'cube.step')
             ),
-            fsp.writeFile(path.join(bracketDir, 'main.kcl'), ''),
+            fsp.writeFile(path.join(projDir, 'main.kcl'), ''),
           ])
         })
         await page.setBodyDimensions({ width: 1000, height: 500 })
@@ -167,13 +173,32 @@ test.describe('Point-and-click assemblies tests', () => {
         await expect(
           page.getByText('This file is already imported')
         ).toBeVisible()
+        await cmdBar.closeCmdBar()
+      })
+
+      await test.step('Insert a nested kcl part', async () => {
+        await insertPartIntoAssembly(
+          'nested/twice/main.kcl',
+          'main',
+          toolbar,
+          cmdBar,
+          page
+        )
+        await toolbar.openPane('code')
+        await page.waitForTimeout(10000)
+        await editor.expectEditor.toContain(
+          `
+          import "nested/twice/main.kcl" as main
+          `,
+          { shouldNormalise: true }
+        )
       })
     }
   )
 
   test(
     `Can still translate, rotate, and delete inserted parts even with non standard code`,
-    { tag: ['@electron', '@macos', '@windows'] },
+    { tag: ['@desktop', '@macos', '@windows'] },
     async ({
       context,
       page,
@@ -369,7 +394,7 @@ test.describe('Point-and-click assemblies tests', () => {
 
   test(
     `Insert the bracket part into an assembly and transform it`,
-    { tag: ['@electron', '@macos', '@windows'] },
+    { tag: ['@desktop', '@macos', '@windows'] },
     async ({
       context,
       page,
@@ -560,7 +585,7 @@ test.describe('Point-and-click assemblies tests', () => {
 
   test(
     `Insert foreign parts into assembly and delete them`,
-    { tag: ['@electron', '@macos', '@windows'] },
+    { tag: ['@desktop', '@macos', '@windows'] },
     async ({
       context,
       page,
@@ -711,7 +736,7 @@ test.describe('Point-and-click assemblies tests', () => {
 
   test(
     'Assembly gets reexecuted when imported models are updated externally',
-    { tag: ['@electron', '@macos', '@windows'] },
+    { tag: ['@desktop', '@macos', '@windows'] },
     async ({ context, page, homePage, scene, toolbar, cmdBar, tronApp }) => {
       if (!tronApp) {
         fail()
@@ -801,7 +826,7 @@ foreign
 
   test(
     `Point-and-click clone`,
-    { tag: ['@electron', '@macos', '@windows'] },
+    { tag: ['@desktop', '@macos', '@windows'] },
     async ({
       context,
       page,

e2e/playwright/point-click.spec.ts

@@ -74,6 +74,15 @@ 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: { Profiles: '', Length: '' },
+        highlightedHeaderArg: 'Profiles',
+        commandName: 'Extrude',
+      })
+      await cmdBar.progressCmdBar()
       await cmdBar.expectState({
         stage: 'arguments',
         currentArgKey: 'length',
@@ -1645,6 +1654,15 @@ 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: { Profiles: '' },
+            highlightedHeaderArg: 'Profiles',
+            commandName: 'Loft',
+          })
+          await cmdBar.progressCmdBar()
           await cmdBar.expectState({
             stage: 'review',
             headerArguments: { Profiles: '2 profiles' },
@@ -1855,7 +1873,11 @@ sketch002 = startSketchOn(XZ)
           },
           stage: 'review',
         })
-        await cmdBar.progressCmdBar()
+        // Confirm we can submit from the review step with just `Enter`
+        await cmdBar.progressCmdBar(true)
+        await cmdBar.expectState({
+          stage: 'commandBarClosed',
+        })
       })
 
       await test.step(`Confirm code is added to the editor, scene has changed`, async () => {
@@ -1995,7 +2017,7 @@ profile001 = ${circleCode}`
         },
         stage: 'review',
       })
-      await cmdBar.progressCmdBar()
+      await cmdBar.progressCmdBar(true)
       await editor.expectEditor.toContain(sweepDeclaration)
     })
 
@@ -2088,6 +2110,18 @@ extrude001 = extrude(sketch001, length = -12)
     await test.step(`Apply fillet to the preselected edge`, async () => {
       await page.waitForTimeout(100)
       await toolbar.filletButton.click()
+      await cmdBar.expectState({
+        commandName: 'Fillet',
+        highlightedHeaderArg: 'selection',
+        currentArgKey: 'selection',
+        currentArgValue: '',
+        headerArguments: {
+          Selection: '',
+          Radius: '',
+        },
+        stage: 'arguments',
+      })
+      await cmdBar.progressCmdBar()
       await cmdBar.expectState({
         commandName: 'Fillet',
         highlightedHeaderArg: 'radius',
@@ -2617,6 +2651,18 @@ extrude001 = extrude(profile001, length = 5)
       await test.step(`Apply fillet`, async () => {
         await page.waitForTimeout(100)
         await toolbar.filletButton.click()
+        await cmdBar.expectState({
+          commandName: 'Fillet',
+          highlightedHeaderArg: 'selection',
+          currentArgKey: 'selection',
+          currentArgValue: '',
+          headerArguments: {
+            Selection: '',
+            Radius: '',
+          },
+          stage: 'arguments',
+        })
+        await cmdBar.progressCmdBar()
         await cmdBar.expectState({
           commandName: 'Fillet',
           highlightedHeaderArg: 'radius',
@@ -2722,6 +2768,19 @@ extrude001 = extrude(sketch001, length = -12)
     await test.step(`Apply chamfer to the preselected edge`, async () => {
       await page.waitForTimeout(100)
       await toolbar.chamferButton.click()
+      await cmdBar.expectState({
+        commandName: 'Chamfer',
+        highlightedHeaderArg: 'selection',
+        currentArgKey: 'selection',
+        currentArgValue: '',
+        headerArguments: {
+          Selection: '',
+          Length: '',
+        },
+        stage: 'arguments',
+      })
+      await cmdBar.progressCmdBar()
+      await page.waitForTimeout(1000)
       await cmdBar.expectState({
         commandName: 'Chamfer',
         highlightedHeaderArg: 'length',
@@ -3205,6 +3264,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: {
@@ -3638,13 +3699,12 @@ tag=$rectangleSegmentC002,
       // revolve
       await editor.scrollToText(codeToSelection)
       await page.getByText(codeToSelection).click()
-      // Wait for the selection to register (TODO: we need a definitive way to wait for this)
-      await page.waitForTimeout(200)
       await toolbar.revolveButton.click()
       await cmdBar.progressCmdBar()
       await cmdBar.progressCmdBar()
       await cmdBar.progressCmdBar()
       await cmdBar.progressCmdBar()
+      await cmdBar.progressCmdBar()
 
       const newCodeToFind = `revolve001 = revolve(sketch002, angle = 360, axis = X)`
       expect(editor.expectEditor.toContain(newCodeToFind)).toBeTruthy()
@@ -4573,6 +4633,18 @@ 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: {
+          Profiles: '',
+          Length: '',
+        },
+        highlightedHeaderArg: 'Profiles',
+        commandName: 'Extrude',
+      })
+      await cmdBar.progressCmdBar()
       await cmdBar.expectState({
         stage: 'arguments',
         currentArgKey: 'length',
@@ -4655,6 +4727,19 @@ 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: {
+          Profiles: '',
+          Path: '',
+          Sectional: '',
+        },
+        highlightedHeaderArg: 'Profiles',
+        commandName: 'Sweep',
+      })
+      await cmdBar.progressCmdBar()
       await cmdBar.expectState({
         stage: 'arguments',
         currentArgKey: 'path',
@@ -4739,6 +4824,19 @@ 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: {
+          Profiles: '',
+          AxisOrEdge: '',
+          Angle: '',
+        },
+        highlightedHeaderArg: 'Profiles',
+        commandName: 'Revolve',
+      })
+      await cmdBar.progressCmdBar()
       await cmdBar.expectState({
         stage: 'arguments',
         currentArgKey: 'axisOrEdge',

e2e/playwright/projects.spec.ts

@@ -11,12 +11,13 @@ import {
   getPlaywrightDownloadDir,
   getUtils,
   isOutOfViewInScrollContainer,
+  runningOnWindows,
 } from '@e2e/playwright/test-utils'
 import { expect, test } from '@e2e/playwright/zoo-test'
 
 test(
   'projects reload if a new one is created, deleted, or renamed externally',
-  { tag: ['@electron', '@macos', '@windows'] },
+  { tag: ['@desktop', '@macos', '@windows'] },
   async ({ context, page }, testInfo) => {
     let externalCreatedProjectName = 'external-created-project'
 
@@ -62,7 +63,7 @@ test(
 
 test(
   'click help/keybindings from home page',
-  { tag: '@electron' },
+  { tag: '@desktop' },
   async ({ page }, testInfo) => {
     await page.setBodyDimensions({ width: 1200, height: 500 })
 
@@ -80,7 +81,7 @@ test(
 
 test(
   'click help/keybindings from project page',
-  { tag: '@electron' },
+  { tag: '@desktop' },
   async ({ scene, cmdBar, context, page }, testInfo) => {
     await context.folderSetupFn(async (dir) => {
       const bracketDir = path.join(dir, 'bracket')
@@ -111,7 +112,7 @@ test(
 
 test(
   'open a file in a project works and renders, open another file in different project with errors, it should clear the scene',
-  { tag: '@electron' },
+  { tag: '@desktop' },
   async ({ scene, cmdBar, context, page, editor }, testInfo) => {
     await context.folderSetupFn(async (dir) => {
       const bracketDir = path.join(dir, 'bracket')
@@ -183,7 +184,7 @@ test(
 
 test(
   'open a file in a project works and renders, open another file in different project that is empty, it should clear the scene',
-  { tag: '@electron' },
+  { tag: '@desktop' },
   async ({ scene, cmdBar, context, page }, testInfo) => {
     await context.folderSetupFn(async (dir) => {
       const bracketDir = path.join(dir, 'bracket')
@@ -243,7 +244,7 @@ test(
 
 test(
   'open a file in a project works and renders, open empty file, it should clear the scene',
-  { tag: '@electron' },
+  { tag: '@desktop' },
   async ({ context, page }, testInfo) => {
     await context.folderSetupFn(async (dir) => {
       const bracketDir = path.join(dir, 'bracket')
@@ -309,7 +310,7 @@ test(
 
 test(
   'open a file in a project works and renders, open another file in the same project with errors, it should clear the scene',
-  { tag: '@electron' },
+  { tag: '@desktop' },
   async ({ scene, cmdBar, context, page }, testInfo) => {
     await context.folderSetupFn(async (dir) => {
       const bracketDir = path.join(dir, 'bracket')
@@ -381,7 +382,7 @@ test(
 
 test(
   'when code with error first loads you get errors in console',
-  { tag: '@electron' },
+  { tag: '@desktop' },
   async ({ context, page, editor }, testInfo) => {
     await context.folderSetupFn(async (dir) => {
       await fsp.mkdir(path.join(dir, 'broken-code'), { recursive: true })
@@ -415,7 +416,7 @@ test.describe('Can export from electron app', () => {
   for (const method of exportMethods) {
     test(
       `Can export using ${method}`,
-      { tag: ['@electron', '@skipLocalEngine'] },
+      { tag: ['@desktop', '@skipLocalEngine'] },
       async ({ scene, cmdBar, context, page, tronApp }, testInfo) => {
         if (!tronApp) {
           fail()
@@ -506,7 +507,7 @@ test.describe('Can export from electron app', () => {
 })
 test(
   'Rename and delete projects, also spam arrow keys when renaming',
-  { tag: '@electron' },
+  { tag: '@desktop' },
   async ({ context, page }, testInfo) => {
     await context.folderSetupFn(async (dir) => {
       await fsp.mkdir(`${dir}/router-template-slate`, { recursive: true })
@@ -722,7 +723,7 @@ test(
 
 test(
   'pressing "delete" on home screen should do nothing',
-  { tag: '@electron' },
+  { tag: '@desktop' },
   async ({ context, page, homePage }, testInfo) => {
     await context.folderSetupFn(async (dir) => {
       await fsp.mkdir(`${dir}/router-template-slate`, { recursive: true })
@@ -752,7 +753,7 @@ test(
 test.describe(`Project management commands`, () => {
   test(
     `Rename from project page`,
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ context, page, scene, cmdBar }, testInfo) => {
       const projectName = `my_project_to_rename`
       await context.folderSetupFn(async (dir) => {
@@ -814,7 +815,7 @@ test.describe(`Project management commands`, () => {
 
   test(
     `Delete from project page`,
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ context, page, scene, cmdBar }, testInfo) => {
       const projectName = `my_project_to_delete`
       await context.folderSetupFn(async (dir) => {
@@ -868,7 +869,7 @@ test.describe(`Project management commands`, () => {
   )
   test(
     `Rename from home page`,
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ context, page, homePage, scene, cmdBar }, testInfo) => {
       const projectName = `my_project_to_rename`
       await context.folderSetupFn(async (dir) => {
@@ -926,7 +927,7 @@ test.describe(`Project management commands`, () => {
   )
   test(
     `Delete from home page`,
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ context, page, scene, cmdBar }, testInfo) => {
       const projectName = `my_project_to_delete`
       await context.folderSetupFn(async (dir) => {
@@ -1102,7 +1103,7 @@ test(`Create a few projects using the default project name`, async ({
 
 test(
   'File in the file pane should open with a single click',
-  { tag: '@electron' },
+  { tag: '@desktop' },
   async ({ context, homePage, page }, testInfo) => {
     const projectName = 'router-template-slate'
     await context.folderSetupFn(async (dir) => {
@@ -1144,7 +1145,7 @@ test(
 
 test(
   'Nested directories in project without main.kcl do not create main.kcl',
-  { tag: '@electron' },
+  { tag: '@desktop' },
   async ({ scene, cmdBar, context, page }, testInfo) => {
     let testDir: string | undefined
     await context.folderSetupFn(async (dir) => {
@@ -1201,7 +1202,7 @@ test(
 
 test(
   'Deleting projects, can delete individual project, can still create projects after deleting all',
-  { tag: '@electron' },
+  { tag: '@desktop' },
   async ({ context, page }, testInfo) => {
     const projectData = [
       ['router-template-slate', 'cylinder.kcl'],
@@ -1279,7 +1280,7 @@ test(
 
 test(
   'Can load a file with CRLF line endings',
-  { tag: '@electron' },
+  { tag: '@desktop' },
   async ({ context, page, scene, cmdBar }, testInfo) => {
     await context.folderSetupFn(async (dir) => {
       const routerTemplateDir = path.join(dir, 'router-template-slate')
@@ -1311,7 +1312,7 @@ test(
 
 test(
   'Can sort projects on home page',
-  { tag: '@electron' },
+  { tag: '@desktop' },
   async ({ context, page }, testInfo) => {
     const projectData = [
       ['router-template-slate', 'cylinder.kcl'],
@@ -1418,7 +1419,7 @@ test(
 
 test(
   'When the project folder is empty, user can create new project and open it.',
-  { tag: '@electron' },
+  { tag: '@desktop' },
   async ({ page }, testInfo) => {
     const u = await getUtils(page)
     await page.setBodyDimensions({ width: 1200, height: 500 })
@@ -1514,7 +1515,7 @@ extrude001 = extrude(sketch001, length = 200)`)
 
 test(
   'Opening a project should successfully load the stream, (regression test that this also works when switching between projects)',
-  { tag: '@electron' },
+  { tag: '@desktop' },
   async ({ context, page, cmdBar, homePage, scene }, testInfo) => {
     await context.folderSetupFn(async (dir) => {
       await fsp.mkdir(path.join(dir, 'router-template-slate'), {
@@ -1627,7 +1628,7 @@ test(
 
 test(
   'You can change the root projects directory and nothing is lost',
-  { tag: '@electron' },
+  { tag: '@desktop' },
   async ({ context, page, tronApp, homePage }, testInfo) => {
     if (!tronApp) {
       fail()
@@ -1734,7 +1735,7 @@ test(
 
 test(
   'Search projects on desktop home',
-  { tag: '@electron' },
+  { tag: '@desktop' },
   async ({ context, page }, testInfo) => {
     const projectData = [
       ['basic bracket', 'focusrite_scarlett_mounting_bracket.kcl'],
@@ -1790,7 +1791,7 @@ test(
 
 test(
   'file pane is scrollable when there are many files',
-  { tag: '@electron' },
+  { tag: '@desktop' },
   async ({ scene, cmdBar, context, page }, testInfo) => {
     await context.folderSetupFn(async (dir) => {
       const testDir = path.join(dir, 'testProject')
@@ -1891,7 +1892,7 @@ test(
 
 test(
   'select all in code editor does not actually select all, just what is visible (regression)',
-  { tag: '@electron' },
+  { tag: '@desktop' },
   async ({ context, page }, testInfo) => {
     await context.folderSetupFn(async (dir) => {
       // rust/kcl-lib/e2e/executor/inputs/mike_stress_test.kcl
@@ -1949,7 +1950,7 @@ test(
 
 test(
   'Settings persist across restarts',
-  { tag: '@electron' },
+  { tag: '@desktop' },
   async ({ page, toolbar }, testInfo) => {
     await test.step('We can change a user setting like theme', async () => {
       await page.setBodyDimensions({ width: 1200, height: 500 })
@@ -1979,10 +1980,9 @@ test(
   }
 )
 
-// Flaky
 test(
   'Original project name persist after onboarding',
-  { tag: '@electron' },
+  { tag: '@desktop' },
   async ({ page, toolbar }, testInfo) => {
     const nextButton = page.getByTestId('onboarding-next')
     await page.setBodyDimensions({ width: 1200, height: 500 })
@@ -2022,7 +2022,7 @@ test(
 
 test(
   'project name with foreign characters should open',
-  { tag: '@electron' },
+  { tag: '@desktop' },
   async ({ context, page }, testInfo) => {
     await context.folderSetupFn(async (dir) => {
       const bracketDir = path.join(dir, 'العربية')
@@ -2066,13 +2066,9 @@ 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()
-    }
+  'import from nested directory',
+  { tag: ['@desktop', '@windows', '@macos'] },
+  async ({ scene, cmdBar, context, page }) => {
     await context.folderSetupFn(async (dir) => {
       const bracketDir = path.join(dir, 'bracket')
       await fsp.mkdir(bracketDir, { recursive: true })
@@ -2085,9 +2081,9 @@ test(
       )
       await fsp.writeFile(
         path.join(bracketDir, 'main.kcl'),
-        `import 'nested\\main.kcl' as thing
-
-thing`
+        runningOnWindows()
+          ? `import 'nested\\main.kcl' as thing\n\nthing`
+          : `import 'nested/main.kcl' as thing\n\nthing`
       )
     })
 

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

@@ -63,7 +63,7 @@ test.describe('edit with AI example snapshots', () => {
   test(
     `change colour`,
     // TODO this is more of a snapshot, but atm it needs to be manually run locally to update the files
-    { tag: ['@electron'] },
+    { tag: ['@desktop'] },
     async ({ context, homePage, cmdBar, editor, page, scene }) => {
       const project = 'test-dir'
       await context.folderSetupFn(async (dir) => {

e2e/playwright/regression-tests.spec.ts

@@ -558,7 +558,7 @@ extrude002 = extrude(profile002, length = 150)
 
   test(
     `Network health indicator only appears in modeling view`,
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ context, page }) => {
       await context.folderSetupFn(async (dir) => {
         const bracketDir = path.join(dir, 'bracket')

e2e/playwright/share-link.spec.ts

@@ -17,7 +17,7 @@ test.describe('Share link tests', () => {
       `Open in desktop app with ${codeLength}-long code ${isWindows && showsErrorOnWindows ? 'shows error' : "doesn't show error"}`,
       { tag: ['@web'] },
       async ({ page }) => {
-        if (process.env.PLATFORM !== 'web') {
+        if (process.env.TARGET !== 'web') {
           // This test is web-only
           // TODO: re-enable on CI as part of a new @web test suite
           return

e2e/playwright/sketch-tests.spec.ts

@@ -1016,6 +1016,7 @@ profile001 = startProfile(sketch001, at = [${roundOff(scale * 69.6)}, ${roundOff
 
     // sketch selection should already have been made.
     // otherwise the cmdbar would be waiting for a selection.
+    await cmdBar.progressCmdBar()
     await cmdBar.expectState({
       stage: 'arguments',
       currentArgKey: 'length',
@@ -1732,7 +1733,7 @@ profile003 = startProfile(sketch001, at = [206.63, -56.73])
       await page.waitForTimeout(600)
     })
 
-    const codeFromTangentialArc = `  |> tangentialArc(endAbsolute = [39.49, 88.22])`
+    const codeFromTangentialArc = `  |> tangentialArc(end = [-10.82, 144.95])`
     await test.step('check that tangential tool does not snap to other profile starts', async () => {
       await toolbar.selectTangentialArc()
       await page.waitForTimeout(1000)
@@ -1754,7 +1755,7 @@ profile003 = startProfile(sketch001, at = [206.63, -56.73])
       // check pixel is now gray at tanArcLocation to verify code has executed
       await scene.expectPixelColor([26, 26, 26], tanArcLocation, 15)
       await editor.expectEditor.not.toContain(
-        `tangentialArc(endAbsolute = [39.49, 88.22])`
+        `tangentialArc(end = [-10.82, 144.95])`
       )
     })
 
@@ -1954,7 +1955,7 @@ profile003 = startProfile(sketch001, at = [206.63, -56.73])
 
       await endArcStartLine()
       await editor.expectEditor.toContain(
-        `|> tangentialArc(endAbsolute = [16.61, 4.14])`
+        `|> tangentialArc(end = [2.98, -7.52])`
       )
 
       // Add a three-point arc segment
@@ -3180,7 +3181,7 @@ test.describe('Redirecting to home page and back to the original file should cle
 sketch001 = startSketchOn(XZ)
 profile001 = startProfile(sketch001, at = [0, 0])
   |> line(end = [191.39, 191.39])
-  |> tangentialArc(endAbsolute = [287.08, 95.69], tag = $seg01)
+  |> tangentialArc(end = [95.69, -95.7], tag = $seg01)
   |> angledLine(angle = tangentToEnd(seg01), length = 135.34)
   |> arc(interiorAbsolute = [191.39, -95.69], endAbsolute = [287.08, -95.69], tag = $seg02)
   |> angledLine(angle = tangentToEnd(seg02) + turns::HALF_TURN, length = 270.67)

e2e/playwright/snapshot-tests.spec.ts

@@ -375,22 +375,22 @@ test.describe(
       await expect(u.codeLocator).toHaveText(code)
 
       await toolbar.selectTangentialArc()
-      await page.waitForTimeout(100)
+      await page.waitForTimeout(200)
 
       // click to continue profile
       await page.mouse.click(813, 392)
-      await page.waitForTimeout(100)
+      await page.waitForTimeout(300)
 
       await page.mouse.click(startXPx + PUR * 30, 500 - PUR * 20)
 
       code += `
-  |> tangentialArc(endAbsolute = [551.2, -62.01])`
+  |> tangentialArc(end = [184.31, 184.31])`
       await expect(u.codeLocator).toHaveText(code)
 
       // click tangential arc tool again to unequip it
       // it will be available directly in the toolbar since it was last equipped
       await toolbar.tangentialArcBtn.click()
-      await page.waitForTimeout(100)
+      await page.waitForTimeout(1000)
 
       // screen shot should show the sketch
       await expect(page).toHaveScreenshot({
@@ -472,20 +472,20 @@ test.describe(
       await expect(u.codeLocator).toHaveText(code)
 
       await toolbar.selectTangentialArc()
-      await page.waitForTimeout(100)
+      await page.waitForTimeout(200)
 
       // click to continue profile
       await page.mouse.click(813, 392)
-      await page.waitForTimeout(100)
+      await page.waitForTimeout(300)
 
       await page.mouse.click(startXPx + PUR * 30, 500 - PUR * 20)
 
       code += `
-  |> tangentialArc(endAbsolute = [551.2, -62.01])`
+  |> tangentialArc(end = [184.31, 184.31])`
       await expect(u.codeLocator).toHaveText(code)
 
       await toolbar.tangentialArcBtn.click()
-      await page.waitForTimeout(100)
+      await page.waitForTimeout(1000)
 
       // screen shot should show the sketch
       await expect(page).toHaveScreenshot({

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

@@ -279,7 +279,7 @@ profile001 = startProfile(sketch001, at = [12.34, -12.34])
 
   test(
     'Paused stream freezes view frame, unpause reconnect is seamless to user',
-    { tag: ['@electron', '@skipLocalEngine'] },
+    { tag: ['@desktop', '@skipLocalEngine'] },
     async ({ page, homePage, scene, cmdBar, toolbar, tronApp }) => {
       const networkToggle = page.getByTestId('network-toggle')
       const networkToggleConnectedText = page.getByText('Connected')

e2e/playwright/test-utils.ts

@@ -79,20 +79,6 @@ export function runningOnWindows() {
   return process.platform === 'win32'
 }
 
-async function waitForPageLoadWithRetry(page: Page) {
-  await expect(async () => {
-    await page.goto('/')
-    const errorMessage = 'App failed to load - 🔃 Retrying ...'
-
-    await expect(
-      page.getByRole('button', { name: 'sketch Start Sketch' }),
-      errorMessage
-    ).toBeEnabled({
-      timeout: 20_000,
-    })
-  }).toPass({ timeout: 70_000, intervals: [1_000] })
-}
-
 // lee: This needs to be replaced by scene.settled() eventually.
 async function waitForPageLoad(page: Page) {
   await expect(page.getByRole('button', { name: 'Start Sketch' })).toBeEnabled({
@@ -354,13 +340,8 @@ async function waitForAuthAndLsp(page: Page) {
     },
     timeout: 45_000,
   })
-  if (process.env.CI) {
-    await waitForPageLoadWithRetry(page)
-  } else {
-    await page.goto('/')
-    await waitForPageLoad(page)
-  }
-
+  await page.goto('/')
+  await waitForPageLoad(page)
   return waitForLspPromise
 }
 
@@ -391,7 +372,6 @@ export async function getUtils(page: Page, test_?: typeof test) {
   const util = {
     waitForAuthSkipAppStart: () => waitForAuthAndLsp(page),
     waitForPageLoad: () => waitForPageLoad(page),
-    waitForPageLoadWithRetry: () => waitForPageLoadWithRetry(page),
     removeCurrentCode: () => removeCurrentCode(page),
     sendCustomCmd: (cmd: EngineCommand) => sendCustomCmd(page, cmd),
     updateCamPosition: async (xyz: [number, number, number]) => {

e2e/playwright/testing-constraints.spec.ts

@@ -1120,7 +1120,7 @@ part002 = startSketchOn(XZ)
 test.describe('Electron constraint tests', () => {
   test(
     'Able to double click label to set constraint',
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ page, context, homePage, scene, editor, toolbar, cmdBar }) => {
       await context.folderSetupFn(async (dir) => {
         const bracketDir = path.join(dir, 'test-sample')

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

@@ -84,7 +84,7 @@ test.describe('Testing loading external models', () => {
    */
   test(
     'Desktop: should create new file by default, creates a second file with automatic unique name',
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ editor, context, page, scene, cmdBar, toolbar }) => {
       if (runningOnWindows()) {
       }
@@ -103,6 +103,8 @@ test.describe('Testing loading external models', () => {
         file: 'ball-bearing' + FILE_EXT,
         title: 'Ball Bearing',
         file1: 'ball-bearing-1' + FILE_EXT,
+        folderName: 'ball-bearing',
+        folderName1: 'ball-bearing-1',
       }
       const projectCard = page.getByRole('link', { name: 'bracket' })
       const overwriteWarning = page.getByText(
@@ -154,8 +156,10 @@ test.describe('Testing loading external models', () => {
 
       await test.step(`Ensure we made and opened a new file`, async () => {
         await editor.expectEditor.toContain('// ' + sampleOne.title)
-        await expect(newlyCreatedFile(sampleOne.file)).toBeVisible()
-        await expect(projectMenuButton).toContainText(sampleOne.file)
+        await expect(
+          page.getByTestId('file-tree-item').getByText(sampleOne.folderName)
+        ).toBeVisible()
+        await expect(projectMenuButton).toContainText('main.kcl')
       })
 
       await test.step(`Load a KCL sample with the command palette`, async () => {
@@ -169,8 +173,10 @@ test.describe('Testing loading external models', () => {
 
       await test.step(`Ensure we made and opened a new file with a unique name`, async () => {
         await editor.expectEditor.toContain('// ' + sampleOne.title)
-        await expect(newlyCreatedFile(sampleOne.file1)).toBeVisible()
-        await expect(projectMenuButton).toContainText(sampleOne.file1)
+        await expect(
+          page.getByTestId('file-tree-item').getByText(sampleOne.folderName1)
+        ).toBeVisible()
+        await expect(projectMenuButton).toContainText('main.kcl')
       })
     }
   )
@@ -190,7 +196,7 @@ test.describe('Testing loading external models', () => {
   externalModelCases.map(({ modelName, deconflictedModelName, modelPath }) => {
     test(
       `Load external models from local drive - ${modelName}`,
-      { tag: ['@electron'] },
+      { tag: ['@desktop'] },
       async ({ page, homePage, scene, toolbar, cmdBar, tronApp }) => {
         if (!tronApp) {
           fail()

e2e/playwright/testing-settings.spec.ts

@@ -278,7 +278,7 @@ test.describe(
 
     test(
       `Project settings override user settings on desktop`,
-      { tag: ['@electron'] },
+      { tag: ['@desktop'] },
       async ({ context, page }, testInfo) => {
         const projectName = 'bracket'
         const { dir: projectDirName } = await context.folderSetupFn(
@@ -373,7 +373,7 @@ test.describe(
     test(
       `Load desktop app with no settings file`,
       {
-        tag: '@electron',
+        tag: '@desktop',
       },
       async ({ page }, testInfo) => {
         await page.setBodyDimensions({ width: 1200, height: 500 })
@@ -393,7 +393,7 @@ test.describe(
     test(
       `Load desktop app with a settings file, but no project directory setting`,
       {
-        tag: '@electron',
+        tag: '@desktop',
       },
       async ({ context, page, tronApp }, testInfo) => {
         if (!tronApp) {
@@ -425,7 +425,7 @@ test.describe(
     test(
       'user settings reload on external change, on project and modeling view',
       {
-        tag: '@electron',
+        tag: '@desktop',
       },
       async ({ context, page, tronApp }, testInfo) => {
         if (!tronApp) {
@@ -486,7 +486,7 @@ test.describe(
 
     test(
       'project settings reload on external change',
-      { tag: '@electron' },
+      { tag: '@desktop' },
       async ({ context, page }, testInfo) => {
         const { dir: projectDirName } = await context.folderSetupFn(
           async () => {}
@@ -536,7 +536,7 @@ test.describe(
 
     test(
       `Closing settings modal should go back to the original file being viewed`,
-      { tag: '@electron' },
+      { tag: '@desktop' },
       async ({ context, page }, testInfo) => {
         await context.folderSetupFn(async (dir) => {
           const bracketDir = join(dir, 'project-000')

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

@@ -1,5 +1,3 @@
-import fs from 'fs'
-import { join } from 'path'
 import type { Page } from '@playwright/test'
 
 import { createProject, getUtils } from '@e2e/playwright/test-utils'
@@ -403,106 +401,6 @@ test.describe('Text-to-CAD tests', () => {
     await expect(page.getByText(promptWithNewline)).toBeVisible()
   })
 
-  // This will be fine once greg makes prompt at top of file deterministic
-  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)
-
-    const u = await getUtils(page)
-
-    await page.setBodyDimensions({ width: 1000, height: 500 })
-
-    await homePage.goToModelingScene()
-    await u.waitForPageLoad()
-
-    await sendPromptFromCommandBarAndSetExistingProject(
-      page,
-      'a 2x4 lego',
-      cmdBar
-    )
-
-    await sendPromptFromCommandBarAndSetExistingProject(
-      page,
-      'a 2x8 lego',
-      cmdBar
-    )
-
-    await sendPromptFromCommandBarAndSetExistingProject(
-      page,
-      'a 2x10 lego',
-      cmdBar
-    )
-
-    // Find the toast.
-    // Look out for the toast message
-    const submittingToastMessage = page.getByText(
-      `Submitting to Text-to-CAD API...`
-    )
-    await expect(submittingToastMessage.first()).toBeVisible()
-
-    const generatingToastMessage = page.getByText(
-      `Generating parametric model...`
-    )
-    await expect(generatingToastMessage.first()).toBeVisible({
-      timeout: 10_000,
-    })
-
-    const successToastMessage = page.getByText(`Text-to-CAD successful`)
-    // We should have three success toasts.
-    await expect(successToastMessage).toHaveCount(3, { timeout: 25_000 })
-
-    await expect(page.getByText(`a 2x4 lego`)).toBeVisible()
-    await expect(page.getByText(`a 2x8 lego`)).toBeVisible()
-    await expect(page.getByText(`a 2x10 lego`)).toBeVisible()
-
-    // Ensure if you reject one, the others stay.
-    const rejectButton = page.getByRole('button', { name: 'Reject' })
-    await expect(rejectButton.first()).toBeVisible()
-    // Click the reject button on the first toast.
-    await rejectButton.first().click()
-
-    // The first toast should disappear, but not the others.
-    await expect(page.getByText(`a 2x10 lego`)).not.toBeVisible()
-    await expect(page.getByText(`a 2x8 lego`)).toBeVisible()
-    await expect(page.getByText(`a 2x4 lego`)).toBeVisible()
-
-    // Ensure you can copy the code for one of the models remaining.
-    const copyToClipboardButton = page.getByRole('button', {
-      name: 'Accept',
-    })
-    await expect(copyToClipboardButton.first()).toBeVisible()
-    // Click the button.
-    await copyToClipboardButton.first().click()
-
-    // Do NOT do AI tests like this: "Expect the code to be pasted."
-    // Reason: AI tests are NONDETERMINISTIC. Thus we need to be as most
-    // general as we can for the assertion.
-    // We can use Kolmogorov complexity as a measurement of the
-    // "probably most minimal version of this program" to have a lower
-    // bound to work with. It is completely by feel because there are
-    // no proofs that any program is its smallest self.
-    const code2x8 = await page.locator('.cm-content').innerText()
-    await expect(code2x8.length).toBeGreaterThan(249)
-
-    // Ensure the final toast remains.
-    await expect(page.getByText(`a 2x10 lego`)).not.toBeVisible()
-    await expect(page.getByText(`Prompt: "a 2x8 lego`)).not.toBeVisible()
-    await expect(page.getByText(`a 2x4 lego`)).toBeVisible()
-
-    // Ensure you can copy the code for the final model.
-    await expect(copyToClipboardButton).toBeVisible()
-    // Click the button.
-    await copyToClipboardButton.click()
-
-    // Expect the code to be pasted.
-    const code2x4 = await page.locator('.cm-content').innerText()
-    await expect(code2x4.length).toBeGreaterThan(249)
-  })
-
   test('can do many at once with errors, clicking dismiss error does not dismiss all', async ({
     page,
     homePage,
@@ -675,82 +573,6 @@ async function sendPromptFromCommandBarAndSetExistingProject(
   })
 }
 
-test(
-  'Text-to-CAD functionality',
-  { tag: '@electron' },
-  async ({ context, page, cmdBar }, testInfo) => {
-    const projectName = 'project-000'
-    const prompt = 'lego 2x4'
-    const textToCadFileName = 'lego-2x4.kcl'
-
-    const { dir } = await context.folderSetupFn(async () => {})
-
-    const fileExists = () =>
-      fs.existsSync(join(dir, projectName, textToCadFileName))
-
-    const { openFilePanel, openKclCodePanel, waitForPageLoad } = await getUtils(
-      page,
-      test
-    )
-
-    await page.setBodyDimensions({ width: 1200, height: 500 })
-
-    // Locators
-    const projectMenuButton = page
-      .getByTestId('project-sidebar-toggle')
-      .filter({ hasText: projectName })
-    const textToCadFileButton = page.getByRole('listitem').filter({
-      has: page.getByRole('button', { name: textToCadFileName }),
-    })
-    const textToCadComment = page.getByText(
-      `// Generated by Text-to-CAD: ${prompt}`
-    )
-
-    // Create and navigate to the project
-    await createProject({ name: 'project-000', page })
-
-    // Wait for Start Sketch otherwise you will not have access Text-to-CAD command
-    await waitForPageLoad()
-    await openFilePanel()
-    await openKclCodePanel()
-
-    await test.step(`Test file creation`, async () => {
-      await sendPromptFromCommandBarAndSetExistingProject(
-        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()
-    })
-
-    await test.step(`Test file navigation`, async () => {
-      await expect(projectMenuButton).toContainText('main.kcl')
-      await textToCadFileButton.click()
-      // File can be navigated and loaded assuming a specific KCL comment is loaded into the KCL code pane
-      await expect(textToCadComment).toBeVisible({ timeout: 20_000 })
-      await expect(projectMenuButton).toContainText(textToCadFileName)
-    })
-
-    await test.step(`Test file deletion on rejection`, async () => {
-      const rejectButton = page.getByRole('button', { name: 'Reject' })
-      // A file is created and can be navigated to while this prompt is still opened
-      // Click the "Reject" button within the prompt and it will delete the file.
-      await rejectButton.click()
-
-      const submittingToastMessage = page.getByText(
-        `Successfully deleted file "lego-2x4.kcl"`
-      )
-      await expect(submittingToastMessage).toBeVisible()
-      expect(fileExists()).toBeFalsy()
-      // Confirm we've navigated back to the main.kcl file after deletion
-      await expect(projectMenuButton).toContainText('main.kcl')
-    })
-  }
-)
-
 /**
  * Below there are twelve (12) tests for testing the navigation and file creation
  * logic around text to cad. The Text to CAD command is now globally available
@@ -818,7 +640,7 @@ test.describe('Mocked Text-to-CAD API tests', { tag: ['@skipWin'] }, () => {
 
   test(
     'Home Page -> Text To CAD -> New Project -> Stay in home page -> Reject -> Project should be deleted',
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ context, page }, testInfo) => {
       const projectName = 'my-project-name'
       const prompt = '2x2x2 cube'
@@ -856,7 +678,7 @@ test.describe('Mocked Text-to-CAD API tests', { tag: ['@skipWin'] }, () => {
 
   test(
     'Home Page -> Text To CAD -> New Project -> Stay in home page -> Accept -> should navigate to file',
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ context, page }, testInfo) => {
       const u = await getUtils(page)
       const projectName = 'my-project-name'
@@ -902,7 +724,7 @@ test.describe('Mocked Text-to-CAD API tests', { tag: ['@skipWin'] }, () => {
 
   test(
     'Home Page -> Text To CAD -> Existing Project -> Stay in home page -> Reject -> should delete single file',
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ homePage, page }, testInfo) => {
       const projectName = 'my-project-name'
       const prompt = '2x2x2 cube'
@@ -945,7 +767,7 @@ test.describe('Mocked Text-to-CAD API tests', { tag: ['@skipWin'] }, () => {
 
   test(
     'Home Page -> Text To CAD -> Existing Project -> Stay in home page -> Accept -> should navigate to file',
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ homePage, page }, testInfo) => {
       const u = await getUtils(page)
       const projectName = 'my-project-name'
@@ -984,19 +806,19 @@ 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(
-        '2x2x2-cube.kcl'
+        'main.kcl'
       )
 
       await u.openFilePanel()
       await expect(
-        page.getByTestId('file-tree-item').getByText('2x2x2-cube.kcl')
+        page.getByTestId('file-tree-item').getByText('2x2x2-cube')
       ).toBeVisible()
     }
   )
 
   test(
     'Home Page -> Text To CAD -> New Project -> Navigate to the project -> Reject -> should go to home page',
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ homePage, page }, testInfo) => {
       const projectName = 'my-project-name'
       const prompt = '2x2x2 cube'
@@ -1042,7 +864,7 @@ test.describe('Mocked Text-to-CAD API tests', { tag: ['@skipWin'] }, () => {
 
   test(
     'Home Page -> Text To CAD -> New Project -> Navigate to the project -> Accept -> should stay in same file',
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ homePage, page }, testInfo) => {
       const projectName = 'my-project-name'
       const prompt = '2x2x2 cube'
@@ -1085,7 +907,7 @@ test.describe('Mocked Text-to-CAD API tests', { tag: ['@skipWin'] }, () => {
 
   test(
     'Home Page -> Text To CAD -> Existing Project -> Navigate to the project -> Reject -> should load main.kcl',
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ homePage, page }, testInfo) => {
       const u = await getUtils(page)
       const projectName = 'my-project-name'
@@ -1140,7 +962,7 @@ test.describe('Mocked Text-to-CAD API tests', { tag: ['@skipWin'] }, () => {
 
   test(
     'Home Page -> Text To CAD -> Existing Project -> Navigate to the project -> Accept -> should load 2x2x2-cube.kcl',
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ homePage, page }, testInfo) => {
       const u = await getUtils(page)
       const projectName = 'my-project-name'
@@ -1184,20 +1006,20 @@ 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(
-        '2x2x2-cube.kcl'
+        'main.kcl'
       )
 
       // Check file is created
       await u.openFilePanel()
       await expect(
-        page.getByTestId('file-tree-item').getByText('2x2x2-cube.kcl')
+        page.getByTestId('file-tree-item').getByText('2x2x2-cube')
       ).toBeVisible()
     }
   )
 
   test(
     'Home Page -> Text To CAD -> New Project -> Navigate to different project -> Reject -> should stay in project',
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ homePage, page }, testInfo) => {
       const u = await getUtils(page)
       const projectName = 'my-project-name'
@@ -1274,7 +1096,7 @@ test.describe('Mocked Text-to-CAD API tests', { tag: ['@skipWin'] }, () => {
 
   test(
     'Home Page -> Text To CAD -> New Project -> Navigate to different project -> Accept -> should go to new project',
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ page, homePage }, testInfo) => {
       const u = await getUtils(page)
       const projectName = 'my-project-name'
@@ -1343,7 +1165,7 @@ test.describe('Mocked Text-to-CAD API tests', { tag: ['@skipWin'] }, () => {
 
   test(
     'Home Page -> Text To CAD -> Existing Project -> Navigate to different project -> Reject -> should stay in same project',
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ page, homePage }, testInfo) => {
       const u = await getUtils(page)
       const projectName = 'my-project-name'
@@ -1418,7 +1240,7 @@ test.describe('Mocked Text-to-CAD API tests', { tag: ['@skipWin'] }, () => {
 
   test(
     'Home Page -> Text To CAD -> Existing Project -> Navigate to different project -> Accept -> should navigate to new project',
-    { tag: '@electron' },
+    { tag: '@desktop' },
     async ({ page, homePage }, testInfo) => {
       const u = await getUtils(page)
       const projectName = 'my-project-name'
@@ -1476,13 +1298,13 @@ 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(
-        '2x2x2-cube.kcl'
+        'main.kcl'
       )
 
       // Check file is created
       await u.openFilePanel()
       await expect(
-        page.getByTestId('file-tree-item').getByText('2x2x2-cube.kcl')
+        page.getByTestId('file-tree-item').getByText('2x2x2-cube')
       ).toBeVisible()
       await expect(
         page.getByTestId('file-tree-item').getByText('main.kcl')

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()

e2e/playwright/zoo-test.ts

@@ -41,7 +41,7 @@ const playwrightTestFnWithFixtures_ = playwrightTestFn.extend<{
 }>({
   tronApp: [
     async ({}, use, testInfo) => {
-      if (process.env.PLATFORM === 'web') {
+      if (process.env.TARGET === 'web') {
         await use(undefined)
         return
       }

index.html

@@ -16,7 +16,6 @@
     <link rel="apple-touch-icon" href="/logo192.png" />
     <link rel="manifest" href="/manifest.json" />
     <link rel="stylesheet" href="./inter/inter.css" />
-    <link rel="stylesheet" href="https://use.typekit.net/zzv8rvm.css" />
     <script
       defer
       data-domain="app.zoo.dev"

package-lock.json

@@ -113,6 +113,7 @@
         "@xstate/cli": "^0.5.17",
         "autoprefixer": "^10.4.21",
         "babel-preset-vite": "^1.1.3",
+        "cross-env": "^7.0.3",
         "dpdm": "^3.14.0",
         "electron": "^34.1.1",
         "electron-builder": "^26.0.12",

package.json

@@ -122,7 +122,6 @@
     "postinstall": "electron-rebuild",
     "generate:machine-api": "npx openapi-typescript ./openapi/machine-api.json -o src/lib/machine-api.d.ts",
     "tron:start": "electron-forge start",
-    "chrome:test": "PLATFORM=web NODE_ENV=development playwright test --config=playwright.config.ts --project='Google Chrome' --grep-invert=@snapshot",
     "tronb:vite:dev": "vite build -c vite.main.config.ts -m development && vite build -c vite.preload.config.ts -m development && vite build -c vite.renderer.config.ts -m development",
     "tronb:vite:prod": "vite build -c vite.main.config.ts && vite build -c vite.preload.config.ts && vite build -c vite.renderer.config.ts",
     "tronb:package:dev": "npm run tronb:vite:dev && electron-builder --config electron-builder.yml",
@@ -130,12 +129,13 @@
     "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:snapshots": "cross-env TARGET=web NODE_ENV=development playwright test --config=playwright.config.ts --grep=@snapshot --trace=on",
     "test:unit": "vitest run --mode development --exclude **/jest-component-unit-tests/*",
     "test:unit:components": "jest -c jest-component-unit-tests/jest.config.ts --rootDir jest-component-unit-tests/",
-    "test: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:e2e:web": "cross-env TARGET=web NODE_ENV=development playwright test --config=playwright.config.ts --project=\"Google Chrome\" --grep=@web",
+    "test:e2e:desktop": "cross-env TARGET=desktop playwright test --config=playwright.electron.config.ts --grep-invert=@snapshot",
+    "test:e2e:desktop:local": "cross-env TARGET=desktop 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:e2e:desktop:local-engine": "cross-env TARGET=desktop 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"
   },
   "browserslist": {
@@ -188,6 +188,7 @@
     "@xstate/cli": "^0.5.17",
     "autoprefixer": "^10.4.21",
     "babel-preset-vite": "^1.1.3",
+    "cross-env": "^7.0.3",
     "dpdm": "^3.14.0",
     "electron": "^34.1.1",
     "electron-builder": "^26.0.12",

public/announce_release.py

@@ -27,7 +27,7 @@ if len(modified_release_body) > max_length:
 # Message to send to Discord
 data = {
     "content": textwrap.dedent(f'''
-        **{release_version}** is now available! Check out the latest features and improvements here: <https://zoo.dev/modeling-app/download>
+        **{release_version}** is now available! Check out the latest features and improvements here: <https://zoo.dev/design-studio>
 
         {modified_release_body}
     '''),

public/kcl-samples/80-20-rail/main.kcl

@@ -1,142 +0,0 @@
-// 80/20 Rail
-// An 80/20 extruded aluminum linear rail. T-slot profile adjustable by profile height, rail length, and origin position
-
-// Set units
-@settings(defaultLengthUnit = in, kclVersion = 1.0)
-
-// Create a function to make the 80-20 rail
-fn rail8020(originStart, railHeight, railLength) {
-  // Sketch side 1 of profile
-  sketch001 = startSketchOn(-XZ)
-    |> startProfile(at = [
-         originStart[0],
-         0.1 * railHeight + originStart[1]
-       ])
-    |> arc(angleStart = 180, angleEnd = 270, radius = 0.1 * railHeight)
-    |> arc(angleStart = 180, angleEnd = 0, radius = 0.072 / 4 * railHeight)
-    |> xLine(length = 0.1 * railHeight)
-    |> arc(angleStart = 180, angleEnd = 0, radius = 0.072 / 4 * railHeight)
-    |> xLine(length = 0.06 * railHeight, tag = $edge1)
-    |> yLine(length = 0.087 * railHeight, tag = $edge2)
-    |> xLine(length = -0.183 * railHeight, tag = $edge3)
-    |> angledLine(angle = 45, endAbsoluteY = (1 - 0.356) / 2 * railHeight + originStart[1], tag = $edge4)
-    |> xLine(length = 0.232 * railHeight, tag = $edge5)
-    |> angledLine(angle = -45, endAbsoluteY = 0.087 * railHeight + originStart[1], tag = $edge6)
-    |> xLine(length = -0.183 * railHeight, tag = $edge7)
-    |> yLine(length = -0.087 * railHeight, tag = $edge8)
-    |> xLine(length = 0.06 * railHeight)
-    |> arc(angleStart = 180, angleEnd = 0, radius = 0.072 / 4 * railHeight)
-    |> xLine(length = 0.1 * railHeight)
-    |> arc(angleStart = 180, angleEnd = 0, radius = 0.072 / 4 * railHeight)
-    |> arc(angleStart = -90, angleEnd = 0, radius = 0.1 * railHeight)
-
-    // Sketch side 2 of profile
-    |> arc(angleStart = 270, angleEnd = 90, radius = 0.072 / 4 * railHeight)
-    |> yLine(length = 0.1 * railHeight)
-    |> arc(angleStart = 270, angleEnd = 90, radius = 0.072 / 4 * railHeight)
-    |> yLine(length = 0.06 * railHeight, tag = $edge9)
-    |> xLine(length = -0.087 * railHeight, tag = $edge10)
-    |> yLine(length = -0.183 * railHeight, tag = $edge11) // edge11
-    |> angledLine(angle = 135, endAbsoluteX = ((1 - 0.356) / 2 + 0.356) * railHeight + originStart[0], tag = $edge12) // edge12
-    |> yLine(length = 0.232 * railHeight, tag = $edge13) // 13
-    |> angledLine(angle = 45, endAbsoluteX = (1 - 0.087) * railHeight + originStart[0], tag = $edge14) // 14
-    |> yLine(length = -0.183 * railHeight, tag = $edge15) // 15
-    |> xLine(length = 0.087 * railHeight, tag = $edge16)
-    |> yLine(length = 0.06 * railHeight)
-    |> arc(angleStart = 270, angleEnd = 90, radius = 0.072 / 4 * railHeight)
-    |> yLine(length = 0.1 * railHeight)
-    |> arc(angleStart = 270, angleEnd = 90, radius = 0.072 / 4 * railHeight)
-
-    // Sketch side 3 of profile
-    |> arc(angleStart = 0, angleEnd = 90, radius = 0.1 * railHeight)
-    |> arc(angleStart = 0, angleEnd = -180, radius = 0.072 / 4 * railHeight)
-    |> xLine(length = -0.1 * railHeight)
-    |> arc(angleStart = 0, angleEnd = -180, radius = 0.072 / 4 * railHeight)
-    |> xLine(length = -0.06 * railHeight, tag = $edge17)
-    |> yLine(length = -0.087 * railHeight, tag = $edge18)
-    |> xLine(length = 0.183 * railHeight, tag = $edge19)
-    |> angledLine(angle = 45, endAbsoluteY = ((1 - 0.356) / 2 + 0.356) * railHeight + originStart[1], tag = $edge20)
-    |> xLine(length = -0.232 * railHeight, tag = $edge21)
-    |> angledLine(angle = 135, endAbsoluteY = (1 - 0.087) * railHeight + originStart[1], tag = $edge22)
-    |> xLine(length = 0.183 * railHeight, tag = $edge23)
-    |> yLine(length = 0.087 * railHeight, tag = $edge24)
-    |> xLine(length = -0.06 * railHeight)
-    |> arc(angleStart = 0, angleEnd = -180, radius = 0.072 / 4 * railHeight)
-    |> xLine(length = -0.1 * railHeight)
-    |> arc(angleStart = 0, angleEnd = -180, radius = 0.072 / 4 * railHeight)
-    |> arc(angleStart = 90, angleEnd = 180, radius = 0.1 * railHeight)
-
-    // Sketch side 4 of profile
-    |> arc(angleStart = 90, angleEnd = -90, radius = 0.072 / 4 * railHeight)
-    |> yLine(length = -0.1 * railHeight)
-    |> arc(angleStart = 90, angleEnd = -90, radius = 0.072 / 4 * railHeight)
-    |> yLine(length = -0.06 * railHeight, tag = $edge25)
-    |> xLine(length = 0.087 * railHeight, tag = $edge26)
-    |> yLine(length = 0.183 * railHeight, tag = $edge27)
-    |> angledLine(angle = 135, endAbsoluteX = (1 - 0.356) / 2 * railHeight + originStart[0], tag = $edge28)
-    |> yLine(length = -0.232 * railHeight, tag = $edge29)
-    |> angledLine(angle = 45, endAbsoluteX = 0.087 * railHeight + originStart[0], tag = $edge30)
-    |> yLine(length = 0.183 * railHeight, tag = $edge31)
-    |> xLine(length = -0.087 * railHeight, tag = $edge32)
-    |> yLine(length = -0.06 * railHeight)
-    |> arc(angleStart = 90, angleEnd = -90, radius = 0.072 / 4 * railHeight)
-    |> yLine(length = -0.1 * railHeight)
-    |> arc(angleStart = 90, angleEnd = -90, radius = 0.072 / 4 * railHeight)
-    |> close()
-
-    // Sketch center hole of profile
-    |> subtract2d(tool = circle(
-         center = [
-           .5 * railHeight + originStart[0],
-           .5 * railHeight + originStart[1]
-         ],
-         radius = .205 * railHeight / 2,
-       ))
-    |> extrude(length = railLength)
-    |> fillet(
-         radius = 0.06,
-         tags = [
-           getNextAdjacentEdge(edge3),
-           getNextAdjacentEdge(edge4),
-           getNextAdjacentEdge(edge5),
-           getNextAdjacentEdge(edge6),
-           getNextAdjacentEdge(edge11),
-           getNextAdjacentEdge(edge12),
-           getNextAdjacentEdge(edge13),
-           getNextAdjacentEdge(edge14),
-           getNextAdjacentEdge(edge19),
-           getNextAdjacentEdge(edge20),
-           getNextAdjacentEdge(edge21),
-           getNextAdjacentEdge(edge22),
-           getNextAdjacentEdge(edge27),
-           getNextAdjacentEdge(edge28),
-           getNextAdjacentEdge(edge29),
-           getNextAdjacentEdge(edge30)
-         ],
-       )
-    |> fillet(
-         radius = 0.03,
-         tags = [
-           getNextAdjacentEdge(edge1),
-           getNextAdjacentEdge(edge2),
-           getNextAdjacentEdge(edge7),
-           getNextAdjacentEdge(edge8),
-           getNextAdjacentEdge(edge9),
-           getNextAdjacentEdge(edge10),
-           getNextAdjacentEdge(edge15),
-           getNextAdjacentEdge(edge16),
-           getNextAdjacentEdge(edge17),
-           getNextAdjacentEdge(edge18),
-           getNextAdjacentEdge(edge23),
-           getNextAdjacentEdge(edge24),
-           getNextAdjacentEdge(edge25),
-           getNextAdjacentEdge(edge26),
-           getNextAdjacentEdge(edge31),
-           getNextAdjacentEdge(edge32)
-         ],
-       )
-  return sketch001
-}
-
-// Generate one adjustable rail of 80/20
-rail8020(originStart = [0, 0], railHeight = 1.5, railLength = 48)

public/kcl-samples/README.md

@@ -23,12 +23,12 @@ KCL samples conform to a set of style guidelines to ensure consistency and reada
 When you submit a PR to add or modify KCL samples, images will be generated and added to the repository automatically.
 
 ---
-#### [80-20-rail](80-20-rail/main.kcl) ([screenshot](screenshots/80-20-rail.png))
-[![80-20-rail](screenshots/80-20-rail.png)](80-20-rail/main.kcl)
 #### [axial-fan](axial-fan/main.kcl) ([screenshot](screenshots/axial-fan.png))
 [![axial-fan](screenshots/axial-fan.png)](axial-fan/main.kcl)
 #### [ball-bearing](ball-bearing/main.kcl) ([screenshot](screenshots/ball-bearing.png))
 [![ball-bearing](screenshots/ball-bearing.png)](ball-bearing/main.kcl)
+#### [ball-joint-rod-end](ball-joint-rod-end/main.kcl) ([screenshot](screenshots/ball-joint-rod-end.png))
+[![ball-joint-rod-end](screenshots/ball-joint-rod-end.png)](ball-joint-rod-end/main.kcl)
 #### [bench](bench/main.kcl) ([screenshot](screenshots/bench.png))
 [![bench](screenshots/bench.png)](bench/main.kcl)
 #### [bone-plate](bone-plate/main.kcl) ([screenshot](screenshots/bone-plate.png))
@@ -41,6 +41,8 @@ When you submit a PR to add or modify KCL samples, images will be generated and
 [![brake-rotor](screenshots/brake-rotor.png)](brake-rotor/main.kcl)
 #### [car-wheel-assembly](car-wheel-assembly/main.kcl) ([screenshot](screenshots/car-wheel-assembly.png))
 [![car-wheel-assembly](screenshots/car-wheel-assembly.png)](car-wheel-assembly/main.kcl)
+#### [clock](clock/main.kcl) ([screenshot](screenshots/clock.png))
+[![clock](screenshots/clock.png)](clock/main.kcl)
 #### [cold-plate](cold-plate/main.kcl) ([screenshot](screenshots/cold-plate.png))
 [![cold-plate](screenshots/cold-plate.png)](cold-plate/main.kcl)
 #### [color-cube](color-cube/main.kcl) ([screenshot](screenshots/color-cube.png))
@@ -143,10 +145,16 @@ When you submit a PR to add or modify KCL samples, images will be generated and
 [![spur-reduction-gearset](screenshots/spur-reduction-gearset.png)](spur-reduction-gearset/main.kcl)
 #### [surgical-drill-guide](surgical-drill-guide/main.kcl) ([screenshot](screenshots/surgical-drill-guide.png))
 [![surgical-drill-guide](screenshots/surgical-drill-guide.png)](surgical-drill-guide/main.kcl)
+#### [t-slot-rail](t-slot-rail/main.kcl) ([screenshot](screenshots/t-slot-rail.png))
+[![t-slot-rail](screenshots/t-slot-rail.png)](t-slot-rail/main.kcl)
+#### [telemetry-antenna](telemetry-antenna/main.kcl) ([screenshot](screenshots/telemetry-antenna.png))
+[![telemetry-antenna](screenshots/telemetry-antenna.png)](telemetry-antenna/main.kcl)
 #### [thermal-block-insert](thermal-block-insert/main.kcl) ([screenshot](screenshots/thermal-block-insert.png))
 [![thermal-block-insert](screenshots/thermal-block-insert.png)](thermal-block-insert/main.kcl)
 #### [tooling-nest-block](tooling-nest-block/main.kcl) ([screenshot](screenshots/tooling-nest-block.png))
 [![tooling-nest-block](screenshots/tooling-nest-block.png)](tooling-nest-block/main.kcl)
+#### [truss-structure](truss-structure/main.kcl) ([screenshot](screenshots/truss-structure.png))
+[![truss-structure](screenshots/truss-structure.png)](truss-structure/main.kcl)
 #### [utility-sink](utility-sink/main.kcl) ([screenshot](screenshots/utility-sink.png))
 [![utility-sink](screenshots/utility-sink.png)](utility-sink/main.kcl)
 #### [walkie-talkie](walkie-talkie/main.kcl) ([screenshot](screenshots/walkie-talkie.png))

public/kcl-samples/ball-joint-rod-end/main.kcl

@@ -0,0 +1,105 @@
+// ball joint rod end
+// A ball joint rod end is a mechanical linkage component that consists of a spherical ball housed within a socket, connected to a threaded rod, allowing rotational movement in multiple directions while providing a secure connection point between two parts of a mechanical system. Commonly used in steering systems and suspension components.
+
+// Set Units
+@settings(defaultLengthUnit = in, kclVersion = 1.0)
+
+// variables
+ballBoltLength = 6
+ballRadius = 8
+sketchStartAngle = asin(ballBoltLength / ballRadius)
+housingThicknessHalf = 4.5
+housingR1 = 11
+housingR2 = 8
+tolerance = 0.1
+shaftR = 8
+distanceBetweenEyeAndShaftEnd = 36
+radiusToFlat = 12
+flatsWidth = 14
+tapperInAng = 45
+holeDForM8Tap = 6.8
+holdDepth = 18
+
+// calculated variables
+retainingLoopSketchAngle1 = asin(housingThicknessHalf / housingR1)
+retainingLoopSketchAngle2 = asin(housingThicknessHalf / housingR2)
+pointOnRingPolar = polar(angle = retainingLoopSketchAngle2 + 90, length = housingR2 + tolerance)
+polarY = pointOnRingPolar[1]
+
+intersectPoint = sqrt(pow(housingR1, exp = 2) - pow(shaftR, exp = 2))
+
+// start modeling section
+
+// start with inner ball
+ballSketch = startSketchOn(YZ)
+ballProfile = startProfile(ballSketch, at = polar(angle = sketchStartAngle + 90, length = ballRadius))
+  |> arc(angleStart = sketchStartAngle + 90, angleEnd = 90 - sketchStartAngle, radius = ballRadius)
+  |> yLine(endAbsolute = 4)
+  |> xLine(endAbsolute = -ballBoltLength)
+  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+  |> close()
+ballRevolve = revolve(ballProfile, angle = 360, axis = X)
+  |> appearance(%, color = "#519afb")
+
+// next the retaining loop that keep the ball in place
+retainingLoopSketch = startSketchOn(YZ)
+retainingLoopProfile = startProfile(retainingLoopSketch, at = polar(angle = retainingLoopSketchAngle1 + 90, length = housingR1))
+  |> arc(angleStart = retainingLoopSketchAngle1 + 90, angleEnd = 90 - retainingLoopSketchAngle1, radius = housingR1)
+  |> yLine(endAbsolute = polarY)
+  |> arc(angleStart = -retainingLoopSketchAngle2 + 90, angleEnd = 90 + retainingLoopSketchAngle2, radius = housingR2)
+  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+  |> close()
+retainingLoopRevolve = revolve(retainingLoopProfile, angle = 360, axis = X)
+
+intersectPoint2 = polar(angle = -5, length = housingR1 - 0.08)
+
+// the shaft is modeled in two parts, and intersected together
+// starting with a revolve
+threadedShaftBodyRevolveSketch = startSketchOn(XZ)
+threadedShaftBodyRevolveProfile = startProfile(threadedShaftBodyRevolveSketch, at = [0, -distanceBetweenEyeAndShaftEnd])
+  |> xLine(length = shaftR - 0.07, tag = $seg05) // 0.07 dither to make CSG work
+  |> yLine(endAbsolute = -intersectPoint, tag = $kink)
+  |> arc(interiorAbsolute = intersectPoint2, endAbsolute = [housingR1 - 0.08, 0])
+  // |> line(endAbsolute = [housingR1, 0])
+  |> xLine(endAbsolute = 0)
+  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+  |> close()
+threadedShaftBodyRevolve = revolve(threadedShaftBodyRevolveProfile, angle = 360, axis = Y)
+
+// second part of the shalft is a extrude that will add the flats and the filleted taper to get to the retaining ring width
+threadedShaftBodySketch = startSketchOn(-YZ)
+threadedShaftBodyProfile = startProfile(threadedShaftBodySketch, at = [0, -distanceBetweenEyeAndShaftEnd - 1])
+  |> xLine(length = flatsWidth / 2)
+  |> yLine(endAbsolute = -intersectPoint - 2.5 - 0.11, tag = $longflats)
+  |> angledLine(tag = $seg01, angle = tapperInAng + 90, endAbsoluteX = housingThicknessHalf - 0.1)
+  |> yLine(endAbsolute = 0, tag = $seg02)
+  |> xLine(endAbsolute = -housingThicknessHalf + 0.15)
+  |> yLine(length = -segLen(seg02), tag = $seg03)
+  |> angledLine(angle = tapperInAng, endAbsoluteX = -flatsWidth / 2, tag = $seg04)
+  |> yLine(length = -segLen(longflats))
+  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+  |> close()
+threadedShaftBodyFlats = extrude(threadedShaftBodyProfile, length = 40)
+  |> translate(x = 20, y = 0, z = 0)
+  |> fillet(radius = 1.9, tags = [getCommonEdge(faces = [seg01, seg02])])
+  |> fillet(radius = 1.5, tags = [getCommonEdge(faces = [seg03, seg04])])
+
+solid001 = intersect([
+  threadedShaftBodyRevolve,
+  threadedShaftBodyFlats
+])
+sketch005 = startSketchOn(-XZ)
+profile005 = circle(sketch005, center = [0, 0], radius = ballRadius - 2)
+extrude002 = extrude(profile005, length = 100)
+  |> translate(x = 0, y = -50, z = 0)
+
+solid002 = subtract([solid001], tools = [extrude002])
+// Join the thread body with the retaining loop for the balljoint
+solid003 = union([solid002, retainingLoopRevolve])
+plane001 = offsetPlane(XY, offset = -distanceBetweenEyeAndShaftEnd - 1)
+sketch001 = startSketchOn(plane001)
+profile001 = circle(sketch001, center = [0, 0], radius = holeDForM8Tap / 2)
+threadedRodHole = extrude(profile001, length = holdDepth + 1)
+
+// cut hole for threaded rod
+solid004 = subtract([solid003], tools = [threadedRodHole])

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

@@ -29,27 +29,27 @@ plateRevolve = startSketchOn(YZ)
   |> close()
   |> revolve(axis = Y, angle = 65, symmetric = true)
 
-// Create a hole sketch with the size and location of each bolt hole
-holeSketch = startSketchOn(XZ)
-hole01 = circle(holeSketch, center = [0, 12.25], radius = boltSize / 2)
-  |> extrude(length = -100)
-hole02 = circle(holeSketch, center = [0, 29.5], radius = boltSize / 2)
-  |> extrude(length = -100)
-hole03 = circle(holeSketch, center = [0, 46.25], radius = boltSize / 2)
-  |> extrude(length = -100)
-hole04 = circle(holeSketch, center = [0, 77], radius = boltSize / 2)
-  |> extrude(length = -100)
-hole05 = circle(holeSketch, center = [0, 100], radius = boltSize / 2)
-  |> extrude(length = -100)
-hole06 = circle(holeSketch, center = [0, 130], radius = boltSize / 2)
-  |> extrude(length = -100)
-hole07 = circle(holeSketch, center = [-20, 130], radius = boltSize / 2)
-  |> extrude(length = -100)
-hole08 = circle(holeSketch, center = [20, 130], radius = boltSize / 2)
-  |> extrude(length = -100)
+// Define a function to create and extrude holes
+fn holeFn(@center) {
+  return startSketchOn(XZ)
+    |> circle(center = center, diameter = boltSize)
+    |> extrude(length = -100)
+}
 
-// Cut each guiding clearance hole from the bone plate
-solid001 = subtract([plateRevolve], tools = union([hole01, hole02]))
-solid002 = subtract([solid001], tools = union([hole03, hole04]))
-solid003 = subtract([solid002], tools = union([hole05, hole06]))
-solid004 = subtract([solid003], tools = union([hole07, hole08]))
+// Create a hole sketch with the size and location of each bolt hole
+holeCenters = [
+  [0, 12.25],
+  [0, 29.5],
+  [0, 46.25],
+  [0, 77],
+  [0, 100],
+  [0, 130],
+  [-20, 130],
+  [20, 130]
+]
+
+// Use map to apply the hole creation function to the list of center coordinates
+holes = map(holeCenters, f = holeFn)
+
+// Cut each guiding clearance hole from the bone plate using a single subtract operation
+solid = subtract([plateRevolve], tools = holes)

public/kcl-samples/brake-rotor/main.kcl

@@ -1,3 +1,4 @@
+// Brake Rotor
 // A 320mm vented brake disc (rotor), with straight vanes, 30mm thick. The disc bell should accommodate 5 M12 wheel studs on a 114.3mm pitch circle diameter.
 
 

public/kcl-samples/clock/main.kcl

@@ -0,0 +1,441 @@
+// Clock
+// A clock with roman numerals
+
+// Define parameters
+clockDiameter = 500
+clockThickness = 50
+minuteHandLength = 100
+nubDiameter = 30
+numHeight = 10
+minuteHandWidth = 25
+hourHandWidth = 25
+hourHandLargeDiameter = 230
+minuteHandLargeDiameter = 310
+filletRadius = 5
+ridgeThickness = 10
+numberThickness = 10
+
+// Calculated parameters
+ridgeDiameter = clockDiameter - 50
+hourHandArmLength = clockDiameter / 2 * .25
+minuteHandArmLength = clockDiameter / 2 * .40
+
+// Add assert for clockDiameter
+assert(clockDiameter, isGreaterThan = 450, error = "clock diameter needs to be greater than 400")
+
+// What time is it?
+hour = 9
+minute = 29
+
+// Calculate hand angles
+hourHandAngle = 90 - (hour * 30)
+minuteHandAngle = 90 - (minute * 6)
+
+// Create the clock body
+clockBodySketch = startSketchOn(XY)
+profile001 = circle(
+  clockBodySketch,
+  center = [0, 0],
+  diameter = clockDiameter,
+  tag = $seg02,
+)
+
+clockBody = extrude(profile001, length = clockThickness, tagStart = $capStart001)
+  |> fillet(
+       radius = filletRadius,
+       tags = [
+         getCommonEdge(faces = [seg02, capStart001])
+       ],
+     )
+
+// Create the ridge on the top face of the body
+clockRidgeSketch = startSketchOn(clockBody, face = END)
+profile002 = circle(
+  clockRidgeSketch,
+  center = [0, 0],
+  diameter = clockDiameter,
+  tag = $seg01,
+)
+profile003 = circle(clockRidgeSketch, center = [0, 0], diameter = ridgeDiameter)
+subtract2d(profile002, tool = profile003)
+clockRidge = extrude(profile002, length = ridgeThickness, tagEnd = $capEnd001)
+  |> fillet(
+       radius = filletRadius,
+       tags = [
+         getCommonEdge(faces = [seg01, capEnd001])
+       ],
+     )
+  |> appearance(%, color = "#ab4321")
+
+// Create an object that has all of the x and y starting positions of every number
+numberObject = {
+  // one = { i = [90, 160] },
+  one = {
+    i = [
+      clockDiameter / 2 * 3 / 4 * cos(60),
+      clockDiameter / 2 * 3 / 4 * sin(60)
+    ]
+  },
+  two = {
+    i = [
+      clockDiameter / 2 * 3 / 4 * cos(30) - 10,
+      clockDiameter / 2 * 3 / 4 * sin(30)
+    ],
+    i2 = [
+      clockDiameter / 2 * 3 / 4 * cos(30) + 5,
+      clockDiameter / 2 * 3 / 4 * sin(30)
+    ]
+  },
+  three = {
+    i = [
+      clockDiameter / 2 * 3 / 4 * cos(0) - 15,
+      clockDiameter / 2 * 3 / 4 * sin(0)
+    ],
+    i2 = [
+      clockDiameter / 2 * 3 / 4 * cos(0),
+      clockDiameter / 2 * 3 / 4 * sin(0)
+    ],
+    i3 = [
+      clockDiameter / 2 * 3 / 4 * cos(0) + 15,
+      clockDiameter / 2 * 3 / 4 * sin(0)
+    ]
+  },
+  four = {
+    i = [
+      clockDiameter / 2 * 3 / 4 * cos(-30) - 10,
+      clockDiameter / 2 * 3 / 4 * sin(-30)
+    ],
+    v = [
+      clockDiameter / 2 * 3 / 4 * cos(-30) + 13,
+      clockDiameter / 2 * 3 / 4 * sin(-30)
+    ]
+  },
+  five = {
+    v = [
+      clockDiameter / 2 * 3 / 4 * cos(-60),
+      clockDiameter / 2 * 3 / 4 * sin(-60)
+    ]
+  },
+  six = {
+    v = [
+      clockDiameter / 2 * 3 / 4 * cos(-90) - 10,
+      clockDiameter / 2 * 3 / 4 * sin(-90)
+    ],
+    i = [
+      clockDiameter / 2 * 3 / 4 * cos(-90) + 12,
+      clockDiameter / 2 * 3 / 4 * sin(-90)
+    ]
+  },
+  seven = {
+    v = [
+      clockDiameter / 2 * 3 / 4 * cos(-120) - 15,
+      clockDiameter / 2 * 3 / 4 * sin(-120)
+    ],
+    i = [
+      clockDiameter / 2 * 3 / 4 * cos(-120) + 5,
+      clockDiameter / 2 * 3 / 4 * sin(-120)
+    ],
+    i2 = [
+      clockDiameter / 2 * 3 / 4 * cos(-120) + 20,
+      clockDiameter / 2 * 3 / 4 * sin(-120)
+    ]
+  },
+  eight = {
+    v = [
+      clockDiameter / 2 * 3 / 4 * cos(-150) - 10,
+      clockDiameter / 2 * 3 / 4 * sin(-150)
+    ],
+    i = [
+      clockDiameter / 2 * 3 / 4 * cos(-150) + 10,
+      clockDiameter / 2 * 3 / 4 * sin(-150)
+    ],
+    i2 = [
+      clockDiameter / 2 * 3 / 4 * cos(-150) + 25,
+      clockDiameter / 2 * 3 / 4 * sin(-150)
+    ],
+    i3 = [
+      clockDiameter / 2 * 3 / 4 * cos(-150) + 40,
+      clockDiameter / 2 * 3 / 4 * sin(-150)
+    ]
+  },
+  nine = {
+    i = [
+      clockDiameter / 2 * 3 / 4 * cos(180) - 15,
+      clockDiameter / 2 * 3 / 4 * sin(180)
+    ],
+    x = [
+      clockDiameter / 2 * 3 / 4 * cos(180) + 15,
+      clockDiameter / 2 * 3 / 4 * sin(180)
+    ]
+  },
+  ten = {
+    x = [
+      clockDiameter / 2 * 3 / 4 * cos(150) + 5,
+      clockDiameter / 2 * 3 / 4 * sin(150)
+    ]
+  },
+  eleven = {
+    x = [
+      clockDiameter / 2 * 3 / 4 * cos(120),
+      clockDiameter / 2 * 3 / 4 * sin(120)
+    ],
+    i = [
+      clockDiameter / 2 * 3 / 4 * cos(120) + 10,
+      clockDiameter / 2 * 3 / 4 * sin(120)
+    ]
+  },
+  twelve = {
+    x = [
+      clockDiameter / 2 * 3 / 4 * cos(90) - 10,
+      clockDiameter / 2 * 3 / 4 * sin(90)
+    ],
+    i = [
+      clockDiameter / 2 * 3 / 4 * cos(90) + 5,
+      clockDiameter / 2 * 3 / 4 * sin(90)
+    ],
+    i2 = [
+      clockDiameter / 2 * 3 / 4 * cos(90) + 20,
+      clockDiameter / 2 * 3 / 4 * sin(90)
+    ]
+  }
+}
+
+// Function for the letter I
+fn letterI(startX, startY) {
+  iWidth = 8
+  iLength = 40
+  return startSketchOn(offsetPlane(XY, offset = 50))
+    |> startProfile(
+         %,
+         at = [
+           startX - (iWidth / 2),
+           startY + iLength / 2
+         ],
+       )
+    |> xLine(%, length = iWidth)
+    |> yLine(%, length = -iLength)
+    |> xLine(%, length = -iWidth)
+    |> close(%)
+    |> extrude(%, length = numberThickness)
+    |> appearance(%, color = "#140f0f")
+}
+
+// Function for the letter X
+fn letterX(startX, startY) {
+  xWidth = 40
+  xLength = 40
+
+  return startSketchOn(offsetPlane(XY, offset = 50))
+    |> startProfile(
+         %,
+         at = [
+           startX - (xWidth / 2),
+           startY + xLength / 2
+         ],
+       )
+    |> xLine(%, length = xWidth / 6)
+    |> angledLine(%, angle = -70, lengthY = xLength * 1 / 3)
+    |> angledLine(%, angle = 70, lengthY = xLength * 1 / 3)
+    |> xLine(%, length = xWidth / 6)
+    |> angledLine(%, angle = 70 + 180, lengthY = xLength * 1 / 2)
+    |> angledLine(%, angle = -70, lengthY = xLength * 1 / 2)
+    |> xLine(%, length = -xWidth / 6)
+    |> angledLine(%, angle = -70 - 180, lengthY = xLength * 1 / 3)
+    |> angledLine(%, angle = 70 + 180, lengthY = xLength * 1 / 3)
+    |> xLine(%, length = -xWidth / 6)
+    |> angledLine(%, angle = 70, lengthY = xLength * 1 / 2)
+    |> close(%)
+    |> extrude(%, length = numberThickness)
+    |> appearance(%, color = "#140f0f")
+}
+
+// Function for the letter V
+fn letterV(startX, startY) {
+  vWidth = 25
+  vLength = 40
+  return startSketchOn(offsetPlane(XY, offset = 50))
+    |> startProfile(
+         %,
+         at = [
+           startX - (vWidth / 2),
+           startY + vLength / 2
+         ],
+       )
+    |> xLine(%, length = vWidth * 1 / 3)
+    |> line(%, end = [vWidth / 6, -vLength / 2])
+    |> line(%, end = [vWidth / 6, vLength / 2])
+    |> xLine(%, length = vWidth * 1 / 3)
+    |> line(%, end = [-vWidth * 1 / 2, -vLength])
+    |> close(%)
+    |> extrude(%, length = numberThickness)
+    |> appearance(%, color = "#140f0f")
+}
+
+// Create the numbers on the face of the clock
+
+// 1 //
+letterI(startX = numberObject.one.i[0], startY = numberObject.one.i[1])
+
+// 2 //
+letterI(startX = numberObject.two.i[0], startY = numberObject.two.i[1])
+letterI(startX = numberObject.two.i2[0], startY = numberObject.two.i2[1])
+
+// 3 //
+letterI(startX = numberObject.three.i[0], startY = numberObject.three.i[1])
+letterI(startX = numberObject.three.i2[0], startY = numberObject.three.i2[1])
+letterI(startX = numberObject.three.i3[0], startY = numberObject.three.i3[1])
+
+// 4 //
+letterI(startX = numberObject.four.i[0], startY = numberObject.four.i[1])
+letterV(startX = numberObject.four.v[0], startY = numberObject.four.v[1])
+
+// 5 //
+letterV(startX = numberObject.five.v[0], startY = numberObject.five.v[1])
+
+// 6 //
+letterV(startX = numberObject.six.v[0], startY = numberObject.six.v[1])
+letterI(startX = numberObject.six.i[0], startY = numberObject.six.i[1])
+
+// 7 //
+letterV(startX = numberObject.seven.v[0], startY = numberObject.seven.v[1])
+letterI(startX = numberObject.seven.i[0], startY = numberObject.seven.i[1])
+letterI(startX = numberObject.seven.i2[0], startY = numberObject.seven.i2[1])
+
+// 8 //
+letterV(startX = numberObject.eight.v[0], startY = numberObject.eight.v[1])
+letterI(startX = numberObject.eight.i[0], startY = numberObject.eight.i[1])
+letterI(startX = numberObject.eight.i2[0], startY = numberObject.eight.i2[1])
+letterI(startX = numberObject.eight.i3[0], startY = numberObject.eight.i3[1])
+
+// 9 //
+letterI(startX = numberObject.nine.i[0], startY = numberObject.nine.i[1])
+letterX(startX = numberObject.nine.x[0], startY = numberObject.nine.x[1])
+
+// 10 //
+letterX(startX = numberObject.ten.x[0], startY = numberObject.ten.x[1])
+
+// 11 //
+letterX(startX = numberObject.eleven.x[0], startY = numberObject.eleven.x[1])
+letterI(startX = numberObject.eleven.i[0], startY = numberObject.eleven.i[1])
+
+// 12 //
+letterX(startX = numberObject.twelve.x[0], startY = numberObject.twelve.x[1])
+letterI(startX = numberObject.twelve.i[0], startY = numberObject.twelve.i[1])
+letterI(startX = numberObject.twelve.i2[0], startY = numberObject.twelve.i2[1])
+
+// Create nub for the minute and hour hands
+startSketchOn(clockBody, face = END)
+  |> circle(center = [0, 0], diameter = nubDiameter)
+  |> extrude(%, length = numHeight)
+
+// Create the hour hand
+sketch005 = startSketchOn(offsetPlane(XY, offset = 55))
+profile007 = startProfile(
+       sketch005,
+       at = [
+         nubDiameter / 2 * 1.375 * cos(hourHandAngle + 20),
+         nubDiameter / 2 * 1.375 * sin(hourHandAngle + 20)
+       ],
+     )
+  |> arc(
+       %,
+       interiorAbsolute = [
+         nubDiameter / 2 * 1.375 * cos(hourHandAngle + 180),
+         nubDiameter / 2 * 1.375 * sin(hourHandAngle + 180)
+       ],
+       endAbsolute = [
+         nubDiameter / 2 * 1.375 * cos(hourHandAngle + 340),
+         nubDiameter / 2 * 1.375 * sin(hourHandAngle + 340)
+       ],
+     )
+  |> angledLine(%, angle = hourHandAngle, length = hourHandArmLength)
+  |> angledLine(
+       %,
+       angle = hourHandAngle - 90,
+       length = hourHandWidth / 2,
+       tag = $seg004,
+     )
+  |> line(
+       %,
+       endAbsolute = [
+         hourHandLargeDiameter / 2 * cos(hourHandAngle),
+         hourHandLargeDiameter / 2 * sin(hourHandAngle)
+       ],
+       tag = $seg002,
+     )
+  |> angledLine(%, angle = segAng(seg002) + 120, length = segLen(seg002))
+  // |> angledLineThatIntersects(%, angle = segAng(seg002) + hourHandAngle - 90, intersectTag = seg004)
+  |> angledLine(%, angle = hourHandAngle - 90, length = segLen(seg004))
+  |> line(%, endAbsolute = [profileStartX(%), profileStartY(%)])
+  |> close(%)
+profile008 = circle(sketch005, center = [0, 0], diameter = nubDiameter)
+subtract2d(profile007, tool = profile008)
+  |> extrude(%, length = 5)
+  |> appearance(%, color = "#404040")
+
+// create the minute hand
+sketch006 = startSketchOn(offsetPlane(XY, offset = 50))
+profile009 = startProfile(
+       sketch006,
+       at = [
+         nubDiameter / 2 * 1.375 * cos(minuteHandAngle + 20),
+         nubDiameter / 2 * 1.375 * sin(minuteHandAngle + 20)
+       ],
+     )
+  |> arc(
+       %,
+       interiorAbsolute = [
+         nubDiameter / 2 * 1.375 * cos(minuteHandAngle + 180),
+         nubDiameter / 2 * 1.375 * sin(minuteHandAngle + 180)
+       ],
+       endAbsolute = [
+         nubDiameter / 2 * 1.375 * cos(minuteHandAngle + 340),
+         nubDiameter / 2 * 1.375 * sin(minuteHandAngle + 340)
+       ],
+     )
+  |> angledLine(%, angle = minuteHandAngle, length = minuteHandArmLength)
+  |> angledLine(
+       %,
+       angle = minuteHandAngle - 90,
+       length = minuteHandWidth / 2,
+       tag = $seg003,
+     )
+  |> line(
+       %,
+       endAbsolute = [
+         minuteHandLargeDiameter / 2 * cos(minuteHandAngle),
+         minuteHandLargeDiameter / 2 * sin(minuteHandAngle)
+       ],
+       tag = $seg005,
+     )
+  |> angledLine(%, angle = segAng(seg005) + 120, length = segLen(seg005))
+  |> angledLine(%, angle = minuteHandAngle - 90, length = segLen(seg003))
+  |> line(%, endAbsolute = [profileStartX(%), profileStartY(%)])
+  |> close(%)
+profile010 = circle(sketch006, center = [0, 0], diameter = 30)
+subtract2d(profile009, tool = profile010)
+  |> extrude(%, length = 5)
+  |> appearance(%, color = "#404040")
+
+// Define parameters of the screw slot for hanging the clock
+screwHeadDiameter = 9.53
+screwTolerance = .5
+slotWidth = (screwHeadDiameter + screwTolerance) / 2
+slotLength = 40
+
+// Create the screw slot
+sketch003 = startSketchOn(clockBody, face = START)
+profile004 = startProfile(sketch003, at = [-slotWidth / 2, 200])
+  |> yLine(length = -slotLength)
+  |> arc(
+       %,
+       radius = screwHeadDiameter / 2 + screwTolerance,
+       angleStart = 120,
+       angleEnd = 420,
+     )
+  |> yLine(%, length = slotLength)
+  |> tangentialArc(endAbsolute = [profileStartX(%), profileStartY(%)])
+  |> close()
+  |> extrude(%, length = -20)
+
+// todo: create cavity for the screw to slide into (need csg update)

public/kcl-samples/manifest.json

@@ -1,14 +1,4 @@
 [
-  {
-    "file": "main.kcl",
-    "pathFromProjectDirectoryToFirstFile": "80-20-rail/main.kcl",
-    "multipleFiles": false,
-    "title": "80/20 Rail",
-    "description": "An 80/20 extruded aluminum linear rail. T-slot profile adjustable by profile height, rail length, and origin position",
-    "files": [
-      "main.kcl"
-    ]
-  },
   {
     "file": "main.kcl",
     "pathFromProjectDirectoryToFirstFile": "axial-fan/main.kcl",
@@ -33,6 +23,16 @@
       "main.kcl"
     ]
   },
+  {
+    "file": "main.kcl",
+    "pathFromProjectDirectoryToFirstFile": "ball-joint-rod-end/main.kcl",
+    "multipleFiles": false,
+    "title": "ball joint rod end",
+    "description": "A ball joint rod end is a mechanical linkage component that consists of a spherical ball housed within a socket, connected to a threaded rod, allowing rotational movement in multiple directions while providing a secure connection point between two parts of a mechanical system. Commonly used in steering systems and suspension components.",
+    "files": [
+      "main.kcl"
+    ]
+  },
   {
     "file": "main.kcl",
     "pathFromProjectDirectoryToFirstFile": "bench/main.kcl",
@@ -78,8 +78,8 @@
     "file": "main.kcl",
     "pathFromProjectDirectoryToFirstFile": "brake-rotor/main.kcl",
     "multipleFiles": false,
-    "title": "A 320mm vented brake disc (rotor), with straight vanes, 30mm thick. The disc bell should accommodate 5 M12 wheel studs on a 114.3mm pitch circle diameter.",
-    "description": "",
+    "title": "Brake Rotor",
+    "description": "A 320mm vented brake disc (rotor), with straight vanes, 30mm thick. The disc bell should accommodate 5 M12 wheel studs on a 114.3mm pitch circle diameter.",
     "files": [
       "main.kcl"
     ]
@@ -100,6 +100,16 @@
       "parameters.kcl"
     ]
   },
+  {
+    "file": "main.kcl",
+    "pathFromProjectDirectoryToFirstFile": "clock/main.kcl",
+    "multipleFiles": false,
+    "title": "Clock",
+    "description": "A clock with roman numerals",
+    "files": [
+      "main.kcl"
+    ]
+  },
   {
     "file": "main.kcl",
     "pathFromProjectDirectoryToFirstFile": "cold-plate/main.kcl",
@@ -632,6 +642,26 @@
       "main.kcl"
     ]
   },
+  {
+    "file": "main.kcl",
+    "pathFromProjectDirectoryToFirstFile": "t-slot-rail/main.kcl",
+    "multipleFiles": false,
+    "title": "T-Slotted Framing Rail",
+    "description": "A T-slotted framing rail, or T-slot extrusion, is a rectangular or square aluminum profile with a \"T\" shaped slot along one or more sides. These slots allow for easy attachment of various hardware components like brackets, connectors, and fasteners, making it a versatile and customizable framing system.",
+    "files": [
+      "main.kcl"
+    ]
+  },
+  {
+    "file": "main.kcl",
+    "pathFromProjectDirectoryToFirstFile": "telemetry-antenna/main.kcl",
+    "multipleFiles": false,
+    "title": "Aircraft telemetry antenna plate",
+    "description": "Consists of a circular base plate 3 inches in diameter and 0.08 inches thick, with a tapered monopole antenna mounted at the top with a base diameter of 0.65 inches and height of 1.36 inches. Also consists of a mounting base and connector at the bottom of the plate. The plate also has 6 countersunk holes at a defined pitch circle diameter.",
+    "files": [
+      "main.kcl"
+    ]
+  },
   {
     "file": "main.kcl",
     "pathFromProjectDirectoryToFirstFile": "thermal-block-insert/main.kcl",
@@ -652,6 +682,16 @@
       "main.kcl"
     ]
   },
+  {
+    "file": "main.kcl",
+    "pathFromProjectDirectoryToFirstFile": "truss-structure/main.kcl",
+    "multipleFiles": false,
+    "title": "Truss Structure",
+    "description": "A truss structure is a framework composed of triangular units made from straight members connected at joints, often called nodes. Trusses are widely used in architecture, civil engineering, and construction for their ability to support large loads with minimal material.",
+    "files": [
+      "main.kcl"
+    ]
+  },
   {
     "file": "main.kcl",
     "pathFromProjectDirectoryToFirstFile": "utility-sink/main.kcl",

public/kcl-samples/prosthetic-hip/main.kcl

@@ -33,14 +33,9 @@ stemLoftProfile2 = startSketchOn(offsetPlane(XY, offset = 75))
 // Draw the third profile for the lofted femur
 p3Z = 110
 p3A = 25
-plane003 = {
-  origin = [0, 0.0, p3Z],
-  xAxis = [cos(p3A), 0, sin(p3A)],
-  yAxis = [0.0, 1.0, 0.0]
-}
 l3 = 32
 r3 = 4
-stemLoftProfile3 = startSketchOn(plane003)
+stemLoftProfile3 = startSketchOn(XY)
   |> startProfile(at = [-15.5, -l3 / 2])
   |> yLine(length = l3, tag = $seg03)
   |> tangentialArc(angle = -120, radius = r3)
@@ -49,18 +44,14 @@ stemLoftProfile3 = startSketchOn(plane003)
   |> angledLine(angle = 30, length = -segLen(seg03))
   |> tangentialArc(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
-
+  |> translate(z = p3Z)
+  |> rotate(pitch = -p3A)
 // Draw the fourth profile for the lofted femur
 p4Z = 130
 p4A = 36.5
-plane004 = {
-  origin = [0, 0.0, p4Z],
-  xAxis = [cos(p4A), 0, sin(p4A)],
-  yAxis = [0.0, 1.0, 0.0]
-}
 l4 = 16
 r4 = 5
-stemLoftProfile4 = startSketchOn(plane004)
+stemLoftProfile4 = startSketchOn(XY)
   |> startProfile(at = [-23, -l4 / 2])
   |> yLine(length = l4, tag = $seg04)
   |> tangentialArc(angle = -120, radius = r4)
@@ -69,18 +60,14 @@ stemLoftProfile4 = startSketchOn(plane004)
   |> angledLine(angle = 30, length = -segLen(seg04))
   |> tangentialArc(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
-
+  |> translate(z = p4Z)
+  |> rotate(pitch = -p4A)
 // Draw the first profile for the femoral stem
 p5Z = 140
 p5A = 36.5
-plane005 = {
-  origin = [0, 0.0, p5Z],
-  xAxis = [cos(p5A), 0, sin(p5A)],
-  yAxis = [0.0, 1.0, 0.0]
-}
 l5 = 1.6
 r5 = 1.6
-stemLoftProfile5 = startSketchOn(plane005)
+stemLoftProfile5 = startSketchOn(XY)
   |> startProfile(at = [-19.5, -l5 / 2])
   |> yLine(length = l5, tag = $seg05)
   |> tangentialArc(angle = -120, radius = r5)
@@ -89,18 +76,14 @@ stemLoftProfile5 = startSketchOn(plane005)
   |> angledLine(angle = 30, length = -segLen(seg05))
   |> tangentialArc(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
-
+  |> translate(z = p5Z)
+  |> rotate(pitch = -p5A)
 // Draw the second profile for the femoral stem
 p6Z = 145
 p6A = 36.5
-plane006 = {
-  origin = [0, 0.0, p6Z],
-  xAxis = [cos(p6A), 0, sin(p6A)],
-  yAxis = [0.0, 1.0, 0.0]
-}
 l6 = 1
 r6 = 3
-stemLoftProfile6 = startSketchOn(plane006)
+stemLoftProfile6 = startSketchOn(XY)
   |> startProfile(at = [-23.4, -l6 / 2])
   |> yLine(length = l6, tag = $seg06)
   |> tangentialArc(angle = -120, radius = r6)
@@ -109,27 +92,24 @@ stemLoftProfile6 = startSketchOn(plane006)
   |> angledLine(angle = 30, length = -segLen(seg06))
   |> tangentialArc(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
-
-// Draw the third profile for the femoral stem
-stemTab = clone(stemLoftProfile6)
-  |> extrude(%, length = 6)
-
+  |> translate(z = p6Z)
+  |> rotate(pitch = -p6A)
 // Loft the femur using all profiles in sequence
-
 femur = loft([
   stemLoftProfile1,
   stemLoftProfile2,
   stemLoftProfile3,
   stemLoftProfile4
 ])
-
 // Loft the femoral stem
 femoralStem = loft([
   clone(stemLoftProfile4),
   stemLoftProfile5,
-  stemLoftProfile6
+  clone(stemLoftProfile6)
 ])
-
+// Draw the third profile for the femoral stem
+stemTab = stemLoftProfile6
+  |> extrude(length = 6)
 // Revolve a hollow socket to represent the femoral head
 femoralHead = startSketchOn(XZ)
   |> startProfile(at = [4, 0])