Merge branch 'main' into toast-does-not-accept-Errors

.codespellrc

@@ -1,3 +1,3 @@
 [codespell]
-ignore-words-list: crate,everytime,inout,co-ordinate,ot,nwo,absolutey,atleast,ue
+ignore-words-list: crate,everytime,inout,co-ordinate,ot,nwo,absolutey,atleast
 skip: **/target,node_modules,build,**/Cargo.lock,./docs/kcl/*.md,./src-tauri/gen/schemas

.envrc

@@ -1 +0,0 @@
-use flake .

.github/workflows/cargo-check.yml

@@ -1,40 +0,0 @@
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - '**/Cargo.toml'
-      - '**/Cargo.lock'
-      - '**/rust-toolchain.toml'
-      - '**.rs'
-      - .github/workflows/cargo-check.yml
-  pull_request:
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-name: cargo check
-jobs:
-  cargocheck:
-    name: cargo check
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        dir: ['src/wasm-lib']
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install latest rust
-        uses: actions-rs/toolchain@v1
-        with:
-            toolchain: stable
-            override: true
-
-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2.6.1
-
-      - name: Run check
-        run: |
-          cd "${{ matrix.dir }}"
-          # We specifically want to test the disable-println feature
-          # Since it is not enabled by default, we need to specify it
-          # This is used in kcl-lsp
-          cargo check --all --features disable-println --features pyo3

.github/workflows/cargo-clippy.yml

@@ -9,12 +9,6 @@ on:
       - '**.rs'
       - .github/workflows/cargo-clippy.yml
   pull_request:
-    paths:
-      - '**/Cargo.toml'
-      - '**/Cargo.lock'
-      - '**/rust-toolchain.toml'
-      - '**.rs'
-      - .github/workflows/cargo-clippy.yml
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
@@ -60,8 +54,3 @@ jobs:
         run: |
           cd "${{ matrix.dir }}"
           cargo clippy --all --tests --benches -- -D warnings
-      # If this fails, run "cargo check" to update Cargo.lock,
-      # then add Cargo.lock to the PR.
-      - name: Check Cargo.lock doesn't need updating
-        run: |
-          cargo check --locked || echo "Pls run cargo check and commit the changed Cargo.lock"

.github/workflows/ci.yml

@@ -180,7 +180,9 @@ jobs:
       - name: Setup Rust
         uses: dtolnay/rust-toolchain@stable
 
+      # TODO: re-enable for Windows builds, see https://github.com/tauri-apps/tauri/issues/9045
       - name: Setup Rust cache
+        if: matrix.os != 'windows-latest'
         uses: swatinem/rust-cache@v2
         with:
           workspaces: './src-tauri -> target'

.github/workflows/playwright.yml

@@ -46,18 +46,12 @@ jobs:
     - uses: KittyCAD/action-install-cli@main
     - name: Install dependencies
       run: yarn
-    - name: Cache Playwright Browsers
-      uses: actions/cache@v4
-      with:
-        path: |
-          ~/.cache/ms-playwright/
-        key: ${{ runner.os }}-playwright-${{ hashFiles('yarn.lock') }}
     - name: Install Playwright Browsers
       run: yarn playwright install --with-deps
     - name: Download Wasm Cache
       id: download-wasm
       if: needs.check-rust-changes.outputs.rust-changed == 'false'
-      uses: dawidd6/action-download-artifact@v6
+      uses: dawidd6/action-download-artifact@v3
       continue-on-error: true
       with:
         github_token: ${{secrets.GITHUB_TOKEN}}
@@ -133,7 +127,7 @@ jobs:
     - uses: actions/upload-artifact@v3
       if: always()
       with:
-        name: playwright-report-ubuntu
+        name: playwright-report
         path: playwright-report/
         retention-days: 30
 
@@ -149,20 +143,12 @@ jobs:
         cache: 'yarn'
     - name: Install dependencies
       run: yarn
-    - name: Cache Playwright Browsers
-      uses: actions/cache@v4
-      with:
-        path: |
-          ~/.cache/ms-playwright
-        key: ${{ runner.os }}-playwright-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-playwright-
     - name: Install Playwright Browsers
       run: yarn playwright install --with-deps
     - name: Download Wasm Cache
       id: download-wasm
       if: needs.check-rust-changes.outputs.rust-changed == 'false'
-      uses: dawidd6/action-download-artifact@v6
+      uses: dawidd6/action-download-artifact@v3
       continue-on-error: true
       with:
         github_token: ${{secrets.GITHUB_TOKEN}}
@@ -204,6 +190,6 @@ jobs:
     - uses: actions/upload-artifact@v3
       if: always()
       with:
-        name: playwright-report-macos
+        name: playwright-report
         path: playwright-report/
         retention-days: 30

.gitignore

@@ -17,7 +17,6 @@
 .env.development.local
 .env.test.local
 .env.production.local
-.direnv
 
 npm-debug.log*
 yarn-debug.log*

Makefile

@@ -1,14 +0,0 @@
-.PHONY: dev
-
-WASM_LIB_FILES := $(wildcard src/wasm-lib/**/*.rs)
-
-dev: node_modules public/wasm_lib_bg.wasm
-	yarn start
-
-public/wasm_lib_bg.wasm: $(WASM_LIB_FILES)
-	yarn build:wasm-dev
-
-node_modules: package.json
-
-package.json:
-	yarn install

README.md

@@ -197,32 +197,28 @@ For more information on fuzzing you can check out
 
 ### Playwright
 
-For a portable way to run Playwright you'll need Docker.
-
-After that, open a terminal and run:
+First time running plawright locally, you'll need to add the secrets file
 
 ```bash
-docker run --network host  --rm --init -it playwright/chrome:playwright-1.43.1
+touch ./e2e/playwright/playwright-secrets.env
+printf 'token="your-token"\nsnapshottoken="your-snapshot-token"' > ./e2e/playwright/playwright-secrets.env
 ```
 
-and in another terminal, run:
-
-```bash
-PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:4444/ yarn playwright test --project="Google Chrome" <test suite>
-```
-
-An example of a `<test suite>` is: `e2e/playwright/flow-tests.spec.ts`
-
-YOU WILL NEED A PLAYWRIGHT-SECRETS.ENV FILE:
-
-
-```bash
-# ./e2e/playwright/playwright-secrets.env
-token=<your-token>
-snapshottoken=<your-snapshot-token>
-```
 then replace "your-token" with a dev token from dev.zoo.dev/account/api-tokens
 
+then:
+run playwright
+
+```
+yarn playwright test
+```
+
+run a specific test suite
+
+```
+yarn playwright test src/e2e-tests/example.spec.ts
+```
+
 run a specific test change the test from `test('...` to `test.only('...`
 (note if you commit this, the tests will instantly fail without running any of the tests)
 
@@ -319,7 +315,7 @@ PS: for the debug panel, the following JSON is useful for snapping the camera
 
 ```
 yarn install
-yarn build:wasm-dev
+yarn build:wasm
 cp src/wasm-lib/pkg/wasm_lib_bg.wasm public
 yarn vite build --mode development
 yarn tauri build --debug -b

docs/kcl/KNOWN-ISSUES.md

@@ -17,11 +17,4 @@ once fixed in engine will just start working here with no language changes.
     currently move or transform the imported objects at all, once we have assemblies
     this will work.
 
-- **Fillets**: Fillets cannot intersect, you will get an error. Only simple fillet
-    cases work currently.
-
-- **Chamfers**: Chamfers cannot intersect, you will get an error. Only simple
-    chamfer cases work currently.
-
-- **Shell**: Shell is only working for `end` faces, not for `side` or `start` 
-    faces. We are tracking the engine side bug on this.
+- **Fillets**: Fillets cannot intersect, you will get an error. Only simple fillet cases work currently.

docs/kcl/angleToMatchLengthX.md

@@ -36,6 +36,8 @@ const extrusion = extrude(5, sketch001)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -71,6 +73,8 @@ const extrusion = extrude(5, sketch001)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -97,6 +101,10 @@ const extrusion = extrude(5, sketch001)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -171,6 +179,24 @@ const extrusion = extrude(5, sketch001)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/angleToMatchLengthY.md

@@ -37,6 +37,8 @@ const extrusion = extrude(5, sketch001)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -72,6 +74,8 @@ const extrusion = extrude(5, sketch001)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -98,6 +102,10 @@ const extrusion = extrude(5, sketch001)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -172,6 +180,24 @@ const extrusion = extrude(5, sketch001)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/angledLine.md

@@ -43,6 +43,8 @@ const example = extrude(10, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -78,6 +80,8 @@ const example = extrude(10, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -104,6 +108,10 @@ const example = extrude(10, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -178,6 +186,24 @@ const example = extrude(10, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 * `tag`: `String` (OPTIONAL)
@@ -187,6 +213,8 @@ const example = extrude(10, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -222,6 +250,8 @@ const example = extrude(10, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -248,6 +278,10 @@ const example = extrude(10, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -322,6 +356,24 @@ const example = extrude(10, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/angledLineOfXLength.md

@@ -42,6 +42,8 @@ const extrusion = extrude(10, sketch001)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -77,6 +79,8 @@ const extrusion = extrude(10, sketch001)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -103,6 +107,10 @@ const extrusion = extrude(10, sketch001)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -177,6 +185,24 @@ const extrusion = extrude(10, sketch001)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 * `tag`: `String` (OPTIONAL)
@@ -186,6 +212,8 @@ const extrusion = extrude(10, sketch001)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -221,6 +249,8 @@ const extrusion = extrude(10, sketch001)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -247,6 +277,10 @@ const extrusion = extrude(10, sketch001)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -321,6 +355,24 @@ const extrusion = extrude(10, sketch001)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/angledLineOfYLength.md

@@ -44,6 +44,8 @@ const example = extrude(10, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -79,6 +81,8 @@ const example = extrude(10, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -105,6 +109,10 @@ const example = extrude(10, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -179,6 +187,24 @@ const example = extrude(10, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 * `tag`: `String` (OPTIONAL)
@@ -188,6 +214,8 @@ const example = extrude(10, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -223,6 +251,8 @@ const example = extrude(10, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -249,6 +279,10 @@ const example = extrude(10, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -323,6 +357,24 @@ const example = extrude(10, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/angledLineThatIntersects.md

@@ -48,6 +48,8 @@ const example = extrude(10, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -83,6 +85,8 @@ const example = extrude(10, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -109,6 +113,10 @@ const example = extrude(10, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -183,6 +191,24 @@ const example = extrude(10, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 * `tag`: `String` (OPTIONAL)
@@ -192,6 +218,8 @@ const example = extrude(10, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -227,6 +255,8 @@ const example = extrude(10, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -253,6 +283,10 @@ const example = extrude(10, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -327,6 +361,24 @@ const example = extrude(10, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/angledLineToX.md

@@ -41,6 +41,8 @@ const example = extrude(10, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -76,6 +78,8 @@ const example = extrude(10, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -102,6 +106,10 @@ const example = extrude(10, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -176,6 +184,24 @@ const example = extrude(10, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 * `tag`: `String` (OPTIONAL)
@@ -185,6 +211,8 @@ const example = extrude(10, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -220,6 +248,8 @@ const example = extrude(10, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -246,6 +276,10 @@ const example = extrude(10, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -320,6 +354,24 @@ const example = extrude(10, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/angledLineToY.md

@@ -41,6 +41,8 @@ const example = extrude(10, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -76,6 +78,8 @@ const example = extrude(10, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -102,6 +106,10 @@ const example = extrude(10, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -176,6 +184,24 @@ const example = extrude(10, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 * `tag`: `String` (OPTIONAL)
@@ -185,6 +211,8 @@ const example = extrude(10, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -220,6 +248,8 @@ const example = extrude(10, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -246,6 +276,10 @@ const example = extrude(10, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -320,6 +354,24 @@ const example = extrude(10, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/arc.md

@@ -52,6 +52,8 @@ const exampleSketch = startSketchOn('XZ')
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -87,6 +89,8 @@ const exampleSketch = startSketchOn('XZ')
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -113,6 +117,10 @@ const exampleSketch = startSketchOn('XZ')
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -187,6 +195,24 @@ const exampleSketch = startSketchOn('XZ')
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 * `tag`: `String` (OPTIONAL)
@@ -196,6 +222,8 @@ const exampleSketch = startSketchOn('XZ')
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -231,6 +259,8 @@ const exampleSketch = startSketchOn('XZ')
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -257,6 +287,10 @@ const exampleSketch = startSketchOn('XZ')
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -331,6 +365,24 @@ const exampleSketch = startSketchOn('XZ')
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/bezierCurve.md

@@ -47,6 +47,8 @@ const example = extrude(10, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -82,6 +84,8 @@ const example = extrude(10, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -108,6 +112,10 @@ const example = extrude(10, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -182,6 +190,24 @@ const example = extrude(10, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 * `tag`: `String` (OPTIONAL)
@@ -191,6 +217,8 @@ const example = extrude(10, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -226,6 +254,8 @@ const example = extrude(10, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -252,6 +282,10 @@ const example = extrude(10, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -326,6 +360,24 @@ const example = extrude(10, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/circle.md

@@ -76,6 +76,8 @@ const example = extrude(5, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -103,6 +105,8 @@ const example = extrude(5, exampleSketch)
 },
 } |
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -138,6 +142,8 @@ const example = extrude(5, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -164,6 +170,10 @@ const example = extrude(5, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -238,6 +248,24 @@ const example = extrude(5, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 
@@ -246,6 +274,8 @@ const example = extrude(5, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -281,6 +311,8 @@ const example = extrude(5, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -307,6 +339,10 @@ const example = extrude(5, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -381,6 +417,24 @@ const example = extrude(5, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/close.md

@@ -42,6 +42,8 @@ const example = extrude(10, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -77,6 +79,8 @@ const example = extrude(10, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -103,6 +107,10 @@ const example = extrude(10, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -177,6 +185,24 @@ const example = extrude(10, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 * `tag`: `String` (OPTIONAL)
@@ -186,6 +212,8 @@ const example = extrude(10, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -221,6 +249,8 @@ const example = extrude(10, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -247,6 +277,10 @@ const example = extrude(10, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -321,6 +355,24 @@ const example = extrude(10, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/extrude.md

@@ -67,6 +67,8 @@ const example = extrude(10, exampleSketch)
 * `sketch_group_set`: `SketchGroupSet` - A sketch group or a group of sketch groups. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -102,6 +104,8 @@ const example = extrude(10, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -128,6 +132,10 @@ const example = extrude(10, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -203,6 +211,24 @@ const example = extrude(10, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 } |
 {
 	type: "sketchGroups",
@@ -220,80 +246,12 @@ const example = extrude(10, exampleSketch)
 	height: number,
 	// The id of the extrude group.
 	id: uuid,
-	// The sketch group.
-	sketchGroup: {
-	// The id of the sketch group.
-	id: uuid,
-	// What the sketch is on (can be a plane or a face).
-	on: {
-	// The id of the plane.
-	id: uuid,
-	// Origin of the plane.
-	origin: {
-	x: number,
-	y: number,
-	z: number,
-},
-	type: "plane",
-	// Type for a plane.
-	value: "XY" | "XZ" | "YZ" | "Custom",
-	// What should the plane’s X axis be?
-	xAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// What should the plane’s Y axis be?
-	yAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// The z-axis (normal).
-	zAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-} |
-{
-	// The id of the face.
-	id: uuid,
-	// The original sketch group id of the object we are sketching on.
-	sketchGroupId: uuid,
-	type: "face",
-	// The tag of the face.
-	value: string,
-	// What should the face’s X axis be?
-	xAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// What should the face’s Y axis be?
-	yAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// The z-axis (normal).
-	zAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-},
-	// The starting path.
-	start: {
-	// The from point.
-	from: [number, number],
-	// The name of the path.
-	name: string,
-	// The to point.
-	to: [number, number],
-},
-	// The paths in the sketch group.
-	value: [{
+	// The position of the extrude group.
+	position: [number, number, number],
+	// The rotation of the extrude group.
+	rotation: [number, number, number, number],
+	// The sketch group paths.
+	sketchGroupValues: [{
 	// The from point.
 	from: [number, number],
 	// The name of the path.
@@ -357,7 +315,6 @@ const example = extrude(10, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
-},
 	// The id of the extrusion start cap
 	startCapId: uuid,
 	type: "extrudeGroup",
@@ -369,6 +326,10 @@ const example = extrude(10, exampleSketch)
 	id: uuid,
 	// The name.
 	name: string,
+	// The position.
+	position: [number, number, number],
+	// The rotation.
+	rotation: [number, number, number, number],
 	// The source range.
 	sourceRange: [number, number],
 	type: "extrudePlane",
@@ -380,10 +341,32 @@ const example = extrude(10, exampleSketch)
 	id: uuid,
 	// The name.
 	name: string,
+	// The position.
+	position: [number, number, number],
+	// The rotation.
+	rotation: [number, number, number, number],
 	// The source range.
 	sourceRange: [number, number],
 	type: "extrudeArc",
 }],
+	// The x-axis of the extrude group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the extrude group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the extrude group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 } |
 {
 	type: "extrudeGroups",

docs/kcl/fillet.md

@@ -62,80 +62,12 @@ string],
 	height: number,
 	// The id of the extrude group.
 	id: uuid,
-	// The sketch group.
-	sketchGroup: {
-	// The id of the sketch group.
-	id: uuid,
-	// What the sketch is on (can be a plane or a face).
-	on: {
-	// The id of the plane.
-	id: uuid,
-	// Origin of the plane.
-	origin: {
-	x: number,
-	y: number,
-	z: number,
-},
-	type: "plane",
-	// Type for a plane.
-	value: "XY" | "XZ" | "YZ" | "Custom",
-	// What should the plane’s X axis be?
-	xAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// What should the plane’s Y axis be?
-	yAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// The z-axis (normal).
-	zAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-} |
-{
-	// The id of the face.
-	id: uuid,
-	// The original sketch group id of the object we are sketching on.
-	sketchGroupId: uuid,
-	type: "face",
-	// The tag of the face.
-	value: string,
-	// What should the face’s X axis be?
-	xAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// What should the face’s Y axis be?
-	yAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// The z-axis (normal).
-	zAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-},
-	// The starting path.
-	start: {
-	// The from point.
-	from: [number, number],
-	// The name of the path.
-	name: string,
-	// The to point.
-	to: [number, number],
-},
-	// The paths in the sketch group.
-	value: [{
+	// The position of the extrude group.
+	position: [number, number, number],
+	// The rotation of the extrude group.
+	rotation: [number, number, number, number],
+	// The sketch group paths.
+	sketchGroupValues: [{
 	// The from point.
 	from: [number, number],
 	// The name of the path.
@@ -199,7 +131,6 @@ string],
 	to: [number, number],
 	type: "Base",
 }],
-},
 	// The id of the extrusion start cap
 	startCapId: uuid,
 	// The extrude surfaces.
@@ -210,6 +141,10 @@ string],
 	id: uuid,
 	// The name.
 	name: string,
+	// The position.
+	position: [number, number, number],
+	// The rotation.
+	rotation: [number, number, number, number],
 	// The source range.
 	sourceRange: [number, number],
 	type: "extrudePlane",
@@ -221,10 +156,32 @@ string],
 	id: uuid,
 	// The name.
 	name: string,
+	// The position.
+	position: [number, number, number],
+	// The rotation.
+	rotation: [number, number, number, number],
 	// The source range.
 	sourceRange: [number, number],
 	type: "extrudeArc",
 }],
+	// The x-axis of the extrude group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the extrude group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the extrude group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 
@@ -239,80 +196,12 @@ string],
 	height: number,
 	// The id of the extrude group.
 	id: uuid,
-	// The sketch group.
-	sketchGroup: {
-	// The id of the sketch group.
-	id: uuid,
-	// What the sketch is on (can be a plane or a face).
-	on: {
-	// The id of the plane.
-	id: uuid,
-	// Origin of the plane.
-	origin: {
-	x: number,
-	y: number,
-	z: number,
-},
-	type: "plane",
-	// Type for a plane.
-	value: "XY" | "XZ" | "YZ" | "Custom",
-	// What should the plane’s X axis be?
-	xAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// What should the plane’s Y axis be?
-	yAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// The z-axis (normal).
-	zAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-} |
-{
-	// The id of the face.
-	id: uuid,
-	// The original sketch group id of the object we are sketching on.
-	sketchGroupId: uuid,
-	type: "face",
-	// The tag of the face.
-	value: string,
-	// What should the face’s X axis be?
-	xAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// What should the face’s Y axis be?
-	yAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// The z-axis (normal).
-	zAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-},
-	// The starting path.
-	start: {
-	// The from point.
-	from: [number, number],
-	// The name of the path.
-	name: string,
-	// The to point.
-	to: [number, number],
-},
-	// The paths in the sketch group.
-	value: [{
+	// The position of the extrude group.
+	position: [number, number, number],
+	// The rotation of the extrude group.
+	rotation: [number, number, number, number],
+	// The sketch group paths.
+	sketchGroupValues: [{
 	// The from point.
 	from: [number, number],
 	// The name of the path.
@@ -376,7 +265,6 @@ string],
 	to: [number, number],
 	type: "Base",
 }],
-},
 	// The id of the extrusion start cap
 	startCapId: uuid,
 	// The extrude surfaces.
@@ -387,6 +275,10 @@ string],
 	id: uuid,
 	// The name.
 	name: string,
+	// The position.
+	position: [number, number, number],
+	// The rotation.
+	rotation: [number, number, number, number],
 	// The source range.
 	sourceRange: [number, number],
 	type: "extrudePlane",
@@ -398,10 +290,32 @@ string],
 	id: uuid,
 	// The name.
 	name: string,
+	// The position.
+	position: [number, number, number],
+	// The rotation.
+	rotation: [number, number, number, number],
 	// The source range.
 	sourceRange: [number, number],
 	type: "extrudeArc",
 }],
+	// The x-axis of the extrude group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the extrude group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the extrude group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/getEdge.md

@@ -49,80 +49,12 @@ const revolution = startSketchOn(box, "revolveAxis")
 	height: number,
 	// The id of the extrude group.
 	id: uuid,
-	// The sketch group.
-	sketchGroup: {
-	// The id of the sketch group.
-	id: uuid,
-	// What the sketch is on (can be a plane or a face).
-	on: {
-	// The id of the plane.
-	id: uuid,
-	// Origin of the plane.
-	origin: {
-	x: number,
-	y: number,
-	z: number,
-},
-	type: "plane",
-	// Type for a plane.
-	value: "XY" | "XZ" | "YZ" | "Custom",
-	// What should the plane’s X axis be?
-	xAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// What should the plane’s Y axis be?
-	yAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// The z-axis (normal).
-	zAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-} |
-{
-	// The id of the face.
-	id: uuid,
-	// The original sketch group id of the object we are sketching on.
-	sketchGroupId: uuid,
-	type: "face",
-	// The tag of the face.
-	value: string,
-	// What should the face’s X axis be?
-	xAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// What should the face’s Y axis be?
-	yAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// The z-axis (normal).
-	zAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-},
-	// The starting path.
-	start: {
-	// The from point.
-	from: [number, number],
-	// The name of the path.
-	name: string,
-	// The to point.
-	to: [number, number],
-},
-	// The paths in the sketch group.
-	value: [{
+	// The position of the extrude group.
+	position: [number, number, number],
+	// The rotation of the extrude group.
+	rotation: [number, number, number, number],
+	// The sketch group paths.
+	sketchGroupValues: [{
 	// The from point.
 	from: [number, number],
 	// The name of the path.
@@ -186,7 +118,6 @@ const revolution = startSketchOn(box, "revolveAxis")
 	to: [number, number],
 	type: "Base",
 }],
-},
 	// The id of the extrusion start cap
 	startCapId: uuid,
 	// The extrude surfaces.
@@ -197,6 +128,10 @@ const revolution = startSketchOn(box, "revolveAxis")
 	id: uuid,
 	// The name.
 	name: string,
+	// The position.
+	position: [number, number, number],
+	// The rotation.
+	rotation: [number, number, number, number],
 	// The source range.
 	sourceRange: [number, number],
 	type: "extrudePlane",
@@ -208,10 +143,32 @@ const revolution = startSketchOn(box, "revolveAxis")
 	id: uuid,
 	// The name.
 	name: string,
+	// The position.
+	position: [number, number, number],
+	// The rotation.
+	rotation: [number, number, number, number],
 	// The source range.
 	sourceRange: [number, number],
 	type: "extrudeArc",
 }],
+	// The x-axis of the extrude group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the extrude group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the extrude group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/getNextAdjacentEdge.md

@@ -47,80 +47,12 @@ const example = extrude(5, exampleSketch)
 	height: number,
 	// The id of the extrude group.
 	id: uuid,
-	// The sketch group.
-	sketchGroup: {
-	// The id of the sketch group.
-	id: uuid,
-	// What the sketch is on (can be a plane or a face).
-	on: {
-	// The id of the plane.
-	id: uuid,
-	// Origin of the plane.
-	origin: {
-	x: number,
-	y: number,
-	z: number,
-},
-	type: "plane",
-	// Type for a plane.
-	value: "XY" | "XZ" | "YZ" | "Custom",
-	// What should the plane’s X axis be?
-	xAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// What should the plane’s Y axis be?
-	yAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// The z-axis (normal).
-	zAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-} |
-{
-	// The id of the face.
-	id: uuid,
-	// The original sketch group id of the object we are sketching on.
-	sketchGroupId: uuid,
-	type: "face",
-	// The tag of the face.
-	value: string,
-	// What should the face’s X axis be?
-	xAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// What should the face’s Y axis be?
-	yAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// The z-axis (normal).
-	zAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-},
-	// The starting path.
-	start: {
-	// The from point.
-	from: [number, number],
-	// The name of the path.
-	name: string,
-	// The to point.
-	to: [number, number],
-},
-	// The paths in the sketch group.
-	value: [{
+	// The position of the extrude group.
+	position: [number, number, number],
+	// The rotation of the extrude group.
+	rotation: [number, number, number, number],
+	// The sketch group paths.
+	sketchGroupValues: [{
 	// The from point.
 	from: [number, number],
 	// The name of the path.
@@ -184,7 +116,6 @@ const example = extrude(5, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
-},
 	// The id of the extrusion start cap
 	startCapId: uuid,
 	// The extrude surfaces.
@@ -195,6 +126,10 @@ const example = extrude(5, exampleSketch)
 	id: uuid,
 	// The name.
 	name: string,
+	// The position.
+	position: [number, number, number],
+	// The rotation.
+	rotation: [number, number, number, number],
 	// The source range.
 	sourceRange: [number, number],
 	type: "extrudePlane",
@@ -206,10 +141,32 @@ const example = extrude(5, exampleSketch)
 	id: uuid,
 	// The name.
 	name: string,
+	// The position.
+	position: [number, number, number],
+	// The rotation.
+	rotation: [number, number, number, number],
 	// The source range.
 	sourceRange: [number, number],
 	type: "extrudeArc",
 }],
+	// The x-axis of the extrude group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the extrude group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the extrude group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/getOppositeEdge.md

@@ -45,80 +45,12 @@ const example = extrude(5, exampleSketch)
 	height: number,
 	// The id of the extrude group.
 	id: uuid,
-	// The sketch group.
-	sketchGroup: {
-	// The id of the sketch group.
-	id: uuid,
-	// What the sketch is on (can be a plane or a face).
-	on: {
-	// The id of the plane.
-	id: uuid,
-	// Origin of the plane.
-	origin: {
-	x: number,
-	y: number,
-	z: number,
-},
-	type: "plane",
-	// Type for a plane.
-	value: "XY" | "XZ" | "YZ" | "Custom",
-	// What should the plane’s X axis be?
-	xAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// What should the plane’s Y axis be?
-	yAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// The z-axis (normal).
-	zAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-} |
-{
-	// The id of the face.
-	id: uuid,
-	// The original sketch group id of the object we are sketching on.
-	sketchGroupId: uuid,
-	type: "face",
-	// The tag of the face.
-	value: string,
-	// What should the face’s X axis be?
-	xAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// What should the face’s Y axis be?
-	yAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// The z-axis (normal).
-	zAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-},
-	// The starting path.
-	start: {
-	// The from point.
-	from: [number, number],
-	// The name of the path.
-	name: string,
-	// The to point.
-	to: [number, number],
-},
-	// The paths in the sketch group.
-	value: [{
+	// The position of the extrude group.
+	position: [number, number, number],
+	// The rotation of the extrude group.
+	rotation: [number, number, number, number],
+	// The sketch group paths.
+	sketchGroupValues: [{
 	// The from point.
 	from: [number, number],
 	// The name of the path.
@@ -182,7 +114,6 @@ const example = extrude(5, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
-},
 	// The id of the extrusion start cap
 	startCapId: uuid,
 	// The extrude surfaces.
@@ -193,6 +124,10 @@ const example = extrude(5, exampleSketch)
 	id: uuid,
 	// The name.
 	name: string,
+	// The position.
+	position: [number, number, number],
+	// The rotation.
+	rotation: [number, number, number, number],
 	// The source range.
 	sourceRange: [number, number],
 	type: "extrudePlane",
@@ -204,10 +139,32 @@ const example = extrude(5, exampleSketch)
 	id: uuid,
 	// The name.
 	name: string,
+	// The position.
+	position: [number, number, number],
+	// The rotation.
+	rotation: [number, number, number, number],
 	// The source range.
 	sourceRange: [number, number],
 	type: "extrudeArc",
 }],
+	// The x-axis of the extrude group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the extrude group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the extrude group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/getPreviousAdjacentEdge.md

@@ -47,80 +47,12 @@ const example = extrude(5, exampleSketch)
 	height: number,
 	// The id of the extrude group.
 	id: uuid,
-	// The sketch group.
-	sketchGroup: {
-	// The id of the sketch group.
-	id: uuid,
-	// What the sketch is on (can be a plane or a face).
-	on: {
-	// The id of the plane.
-	id: uuid,
-	// Origin of the plane.
-	origin: {
-	x: number,
-	y: number,
-	z: number,
-},
-	type: "plane",
-	// Type for a plane.
-	value: "XY" | "XZ" | "YZ" | "Custom",
-	// What should the plane’s X axis be?
-	xAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// What should the plane’s Y axis be?
-	yAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// The z-axis (normal).
-	zAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-} |
-{
-	// The id of the face.
-	id: uuid,
-	// The original sketch group id of the object we are sketching on.
-	sketchGroupId: uuid,
-	type: "face",
-	// The tag of the face.
-	value: string,
-	// What should the face’s X axis be?
-	xAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// What should the face’s Y axis be?
-	yAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// The z-axis (normal).
-	zAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-},
-	// The starting path.
-	start: {
-	// The from point.
-	from: [number, number],
-	// The name of the path.
-	name: string,
-	// The to point.
-	to: [number, number],
-},
-	// The paths in the sketch group.
-	value: [{
+	// The position of the extrude group.
+	position: [number, number, number],
+	// The rotation of the extrude group.
+	rotation: [number, number, number, number],
+	// The sketch group paths.
+	sketchGroupValues: [{
 	// The from point.
 	from: [number, number],
 	// The name of the path.
@@ -184,7 +116,6 @@ const example = extrude(5, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
-},
 	// The id of the extrusion start cap
 	startCapId: uuid,
 	// The extrude surfaces.
@@ -195,6 +126,10 @@ const example = extrude(5, exampleSketch)
 	id: uuid,
 	// The name.
 	name: string,
+	// The position.
+	position: [number, number, number],
+	// The rotation.
+	rotation: [number, number, number, number],
 	// The source range.
 	sourceRange: [number, number],
 	type: "extrudePlane",
@@ -206,10 +141,32 @@ const example = extrude(5, exampleSketch)
 	id: uuid,
 	// The name.
 	name: string,
+	// The position.
+	position: [number, number, number],
+	// The rotation.
+	rotation: [number, number, number, number],
 	// The source range.
 	sourceRange: [number, number],
 	type: "extrudeArc",
 }],
+	// The x-axis of the extrude group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the extrude group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the extrude group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/helix.md

@@ -52,80 +52,12 @@ const part001 = startSketchOn('XY')
 	height: number,
 	// The id of the extrude group.
 	id: uuid,
-	// The sketch group.
-	sketchGroup: {
-	// The id of the sketch group.
-	id: uuid,
-	// What the sketch is on (can be a plane or a face).
-	on: {
-	// The id of the plane.
-	id: uuid,
-	// Origin of the plane.
-	origin: {
-	x: number,
-	y: number,
-	z: number,
-},
-	type: "plane",
-	// Type for a plane.
-	value: "XY" | "XZ" | "YZ" | "Custom",
-	// What should the plane’s X axis be?
-	xAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// What should the plane’s Y axis be?
-	yAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// The z-axis (normal).
-	zAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-} |
-{
-	// The id of the face.
-	id: uuid,
-	// The original sketch group id of the object we are sketching on.
-	sketchGroupId: uuid,
-	type: "face",
-	// The tag of the face.
-	value: string,
-	// What should the face’s X axis be?
-	xAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// What should the face’s Y axis be?
-	yAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// The z-axis (normal).
-	zAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-},
-	// The starting path.
-	start: {
-	// The from point.
-	from: [number, number],
-	// The name of the path.
-	name: string,
-	// The to point.
-	to: [number, number],
-},
-	// The paths in the sketch group.
-	value: [{
+	// The position of the extrude group.
+	position: [number, number, number],
+	// The rotation of the extrude group.
+	rotation: [number, number, number, number],
+	// The sketch group paths.
+	sketchGroupValues: [{
 	// The from point.
 	from: [number, number],
 	// The name of the path.
@@ -189,7 +121,6 @@ const part001 = startSketchOn('XY')
 	to: [number, number],
 	type: "Base",
 }],
-},
 	// The id of the extrusion start cap
 	startCapId: uuid,
 	// The extrude surfaces.
@@ -200,6 +131,10 @@ const part001 = startSketchOn('XY')
 	id: uuid,
 	// The name.
 	name: string,
+	// The position.
+	position: [number, number, number],
+	// The rotation.
+	rotation: [number, number, number, number],
 	// The source range.
 	sourceRange: [number, number],
 	type: "extrudePlane",
@@ -211,10 +146,32 @@ const part001 = startSketchOn('XY')
 	id: uuid,
 	// The name.
 	name: string,
+	// The position.
+	position: [number, number, number],
+	// The rotation.
+	rotation: [number, number, number, number],
 	// The source range.
 	sourceRange: [number, number],
 	type: "extrudeArc",
 }],
+	// The x-axis of the extrude group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the extrude group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the extrude group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 
@@ -229,80 +186,12 @@ const part001 = startSketchOn('XY')
 	height: number,
 	// The id of the extrude group.
 	id: uuid,
-	// The sketch group.
-	sketchGroup: {
-	// The id of the sketch group.
-	id: uuid,
-	// What the sketch is on (can be a plane or a face).
-	on: {
-	// The id of the plane.
-	id: uuid,
-	// Origin of the plane.
-	origin: {
-	x: number,
-	y: number,
-	z: number,
-},
-	type: "plane",
-	// Type for a plane.
-	value: "XY" | "XZ" | "YZ" | "Custom",
-	// What should the plane’s X axis be?
-	xAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// What should the plane’s Y axis be?
-	yAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// The z-axis (normal).
-	zAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-} |
-{
-	// The id of the face.
-	id: uuid,
-	// The original sketch group id of the object we are sketching on.
-	sketchGroupId: uuid,
-	type: "face",
-	// The tag of the face.
-	value: string,
-	// What should the face’s X axis be?
-	xAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// What should the face’s Y axis be?
-	yAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// The z-axis (normal).
-	zAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-},
-	// The starting path.
-	start: {
-	// The from point.
-	from: [number, number],
-	// The name of the path.
-	name: string,
-	// The to point.
-	to: [number, number],
-},
-	// The paths in the sketch group.
-	value: [{
+	// The position of the extrude group.
+	position: [number, number, number],
+	// The rotation of the extrude group.
+	rotation: [number, number, number, number],
+	// The sketch group paths.
+	sketchGroupValues: [{
 	// The from point.
 	from: [number, number],
 	// The name of the path.
@@ -366,7 +255,6 @@ const part001 = startSketchOn('XY')
 	to: [number, number],
 	type: "Base",
 }],
-},
 	// The id of the extrusion start cap
 	startCapId: uuid,
 	// The extrude surfaces.
@@ -377,6 +265,10 @@ const part001 = startSketchOn('XY')
 	id: uuid,
 	// The name.
 	name: string,
+	// The position.
+	position: [number, number, number],
+	// The rotation.
+	rotation: [number, number, number, number],
 	// The source range.
 	sourceRange: [number, number],
 	type: "extrudePlane",
@@ -388,10 +280,32 @@ const part001 = startSketchOn('XY')
 	id: uuid,
 	// The name.
 	name: string,
+	// The position.
+	position: [number, number, number],
+	// The rotation.
+	rotation: [number, number, number, number],
 	// The source range.
 	sourceRange: [number, number],
 	type: "extrudeArc",
 }],
+	// The x-axis of the extrude group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the extrude group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the extrude group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/hole.md

@@ -53,6 +53,8 @@ const example = extrude(1, exampleSketch)
 * `hole_sketch_group`: `SketchGroupSet` - A sketch group or a group of sketch groups. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -88,6 +90,8 @@ const example = extrude(1, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -114,6 +118,10 @@ const example = extrude(1, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -189,6 +197,24 @@ const example = extrude(1, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 } |
 {
 	type: "sketchGroups",
@@ -197,6 +223,8 @@ const example = extrude(1, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -232,6 +260,8 @@ const example = extrude(1, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -258,6 +288,10 @@ const example = extrude(1, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -332,6 +366,24 @@ const example = extrude(1, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 
@@ -340,6 +392,8 @@ const example = extrude(1, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -375,6 +429,8 @@ const example = extrude(1, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -401,6 +457,10 @@ const example = extrude(1, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -475,6 +535,24 @@ const example = extrude(1, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/index.md

@@ -23,7 +23,6 @@ layout: manual
 * [`atan`](kcl/atan)
 * [`bezierCurve`](kcl/bezierCurve)
 * [`ceil`](kcl/ceil)
-* [`chamfer`](kcl/chamfer)
 * [`circle`](kcl/circle)
 * [`close`](kcl/close)
 * [`cos`](kcl/cos)
@@ -65,7 +64,6 @@ layout: manual
 * [`segEndX`](kcl/segEndX)
 * [`segEndY`](kcl/segEndY)
 * [`segLen`](kcl/segLen)
-* [`shell`](kcl/shell)
 * [`sin`](kcl/sin)
 * [`sqrt`](kcl/sqrt)
 * [`startProfileAt`](kcl/startProfileAt)

docs/kcl/lastSegX.md

@@ -33,6 +33,8 @@ const example = extrude(5, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -68,6 +70,8 @@ const example = extrude(5, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -94,6 +98,10 @@ const example = extrude(5, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -168,6 +176,24 @@ const example = extrude(5, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/lastSegY.md

@@ -33,6 +33,8 @@ const example = extrude(5, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -68,6 +70,8 @@ const example = extrude(5, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -94,6 +98,10 @@ const example = extrude(5, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -168,6 +176,24 @@ const example = extrude(5, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/line.md

@@ -46,6 +46,8 @@ const example = extrude(5, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -81,6 +83,8 @@ const example = extrude(5, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -107,6 +111,10 @@ const example = extrude(5, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -181,6 +189,24 @@ const example = extrude(5, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 * `tag`: `String` (OPTIONAL)
@@ -190,6 +216,8 @@ const example = extrude(5, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -225,6 +253,8 @@ const example = extrude(5, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -251,6 +281,10 @@ const example = extrude(5, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -325,6 +359,24 @@ const example = extrude(5, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/lineTo.md

@@ -33,6 +33,8 @@ const example = extrude(5, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -68,6 +70,8 @@ const example = extrude(5, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -94,6 +98,10 @@ const example = extrude(5, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -168,6 +176,24 @@ const example = extrude(5, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 * `tag`: `String` (OPTIONAL)
@@ -177,6 +203,8 @@ const example = extrude(5, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -212,6 +240,8 @@ const example = extrude(5, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -238,6 +268,10 @@ const example = extrude(5, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -312,6 +346,24 @@ const example = extrude(5, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/patternCircular2d.md

@@ -9,7 +9,7 @@ A circular pattern on a 2D sketch.
 
 
 ```js
-patternCircular2d(data: CircularPattern2dData, sketch_group_set: SketchGroupSet) -> [SketchGroup]
+patternCircular2d(data: CircularPattern2dData, sketch_group: SketchGroup) -> [SketchGroup]
 ```
 
 ### Examples
@@ -48,9 +48,11 @@ const example = extrude(1, exampleSketch)
 	rotateDuplicates: string,
 }
 ```
-* `sketch_group_set`: `SketchGroupSet` - A sketch group or a group of sketch groups. (REQUIRED)
+* `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -86,6 +88,8 @@ const example = extrude(1, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -112,6 +116,10 @@ const example = extrude(1, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -121,7 +129,6 @@ const example = extrude(1, exampleSketch)
 	// The to point.
 	to: [number, number],
 },
-	type: "sketchGroup",
 	// The paths in the sketch group.
 	value: [{
 	// The from point.
@@ -187,9 +194,24 @@ const example = extrude(1, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
-} |
-{
-	type: "sketchGroups",
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/patternCircular3d.md

@@ -9,7 +9,7 @@ A circular pattern on a 3D model.
 
 
 ```js
-patternCircular3d(data: CircularPattern3dData, extrude_group_set: ExtrudeGroupSet) -> [ExtrudeGroup]
+patternCircular3d(data: CircularPattern3dData, extrude_group: ExtrudeGroup) -> [ExtrudeGroup]
 ```
 
 ### Examples
@@ -47,7 +47,7 @@ const example = extrude(-5, exampleSketch)
 	rotateDuplicates: string,
 }
 ```
-* `extrude_group_set`: `ExtrudeGroupSet` - A extrude group or a group of extrude groups. (REQUIRED)
+* `extrude_group`: `ExtrudeGroup` - An extrude group is a collection of extrude surfaces. (REQUIRED)
 ```js
 {
 	// The id of the extrusion end cap
@@ -56,80 +56,12 @@ const example = extrude(-5, exampleSketch)
 	height: number,
 	// The id of the extrude group.
 	id: uuid,
-	// The sketch group.
-	sketchGroup: {
-	// The id of the sketch group.
-	id: uuid,
-	// What the sketch is on (can be a plane or a face).
-	on: {
-	// The id of the plane.
-	id: uuid,
-	// Origin of the plane.
-	origin: {
-	x: number,
-	y: number,
-	z: number,
-},
-	type: "plane",
-	// Type for a plane.
-	value: "XY" | "XZ" | "YZ" | "Custom",
-	// What should the plane’s X axis be?
-	xAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// What should the plane’s Y axis be?
-	yAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// The z-axis (normal).
-	zAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-} |
-{
-	// The id of the face.
-	id: uuid,
-	// The original sketch group id of the object we are sketching on.
-	sketchGroupId: uuid,
-	type: "face",
-	// The tag of the face.
-	value: string,
-	// What should the face’s X axis be?
-	xAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// What should the face’s Y axis be?
-	yAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// The z-axis (normal).
-	zAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-},
-	// The starting path.
-	start: {
-	// The from point.
-	from: [number, number],
-	// The name of the path.
-	name: string,
-	// The to point.
-	to: [number, number],
-},
-	// The paths in the sketch group.
-	value: [{
+	// The position of the extrude group.
+	position: [number, number, number],
+	// The rotation of the extrude group.
+	rotation: [number, number, number, number],
+	// The sketch group paths.
+	sketchGroupValues: [{
 	// The from point.
 	from: [number, number],
 	// The name of the path.
@@ -193,10 +125,8 @@ const example = extrude(-5, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
-},
 	// The id of the extrusion start cap
 	startCapId: uuid,
-	type: "extrudeGroup",
 	// The extrude surfaces.
 	value: [{
 	// The face id for the extrude plane.
@@ -205,6 +135,10 @@ const example = extrude(-5, exampleSketch)
 	id: uuid,
 	// The name.
 	name: string,
+	// The position.
+	position: [number, number, number],
+	// The rotation.
+	rotation: [number, number, number, number],
 	// The source range.
 	sourceRange: [number, number],
 	type: "extrudePlane",
@@ -216,13 +150,32 @@ const example = extrude(-5, exampleSketch)
 	id: uuid,
 	// The name.
 	name: string,
+	// The position.
+	position: [number, number, number],
+	// The rotation.
+	rotation: [number, number, number, number],
 	// The source range.
 	sourceRange: [number, number],
 	type: "extrudeArc",
 }],
-} |
-{
-	type: "extrudeGroups",
+	// The x-axis of the extrude group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the extrude group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the extrude group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/patternLinear2d.md

@@ -44,6 +44,8 @@ const example = extrude(1, exampleSketch)
 * `sketch_group_set`: `SketchGroupSet` - A sketch group or a group of sketch groups. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -79,6 +81,8 @@ const example = extrude(1, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -105,6 +109,10 @@ const example = extrude(1, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -180,6 +188,24 @@ const example = extrude(1, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 } |
 {
 	type: "sketchGroups",

docs/kcl/patternLinear3d.md

@@ -9,7 +9,7 @@ A linear pattern on a 3D model.
 
 
 ```js
-patternLinear3d(data: LinearPattern3dData, extrude_group_set: ExtrudeGroupSet) -> [ExtrudeGroup]
+patternLinear3d(data: LinearPattern3dData, extrude_group: ExtrudeGroup) -> [ExtrudeGroup]
 ```
 
 ### Examples
@@ -45,7 +45,7 @@ const example = extrude(1, exampleSketch)
 	repetitions: number,
 }
 ```
-* `extrude_group_set`: `ExtrudeGroupSet` - A extrude group or a group of extrude groups. (REQUIRED)
+* `extrude_group`: `ExtrudeGroup` - An extrude group is a collection of extrude surfaces. (REQUIRED)
 ```js
 {
 	// The id of the extrusion end cap
@@ -54,80 +54,12 @@ const example = extrude(1, exampleSketch)
 	height: number,
 	// The id of the extrude group.
 	id: uuid,
-	// The sketch group.
-	sketchGroup: {
-	// The id of the sketch group.
-	id: uuid,
-	// What the sketch is on (can be a plane or a face).
-	on: {
-	// The id of the plane.
-	id: uuid,
-	// Origin of the plane.
-	origin: {
-	x: number,
-	y: number,
-	z: number,
-},
-	type: "plane",
-	// Type for a plane.
-	value: "XY" | "XZ" | "YZ" | "Custom",
-	// What should the plane’s X axis be?
-	xAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// What should the plane’s Y axis be?
-	yAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// The z-axis (normal).
-	zAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-} |
-{
-	// The id of the face.
-	id: uuid,
-	// The original sketch group id of the object we are sketching on.
-	sketchGroupId: uuid,
-	type: "face",
-	// The tag of the face.
-	value: string,
-	// What should the face’s X axis be?
-	xAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// What should the face’s Y axis be?
-	yAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// The z-axis (normal).
-	zAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-},
-	// The starting path.
-	start: {
-	// The from point.
-	from: [number, number],
-	// The name of the path.
-	name: string,
-	// The to point.
-	to: [number, number],
-},
-	// The paths in the sketch group.
-	value: [{
+	// The position of the extrude group.
+	position: [number, number, number],
+	// The rotation of the extrude group.
+	rotation: [number, number, number, number],
+	// The sketch group paths.
+	sketchGroupValues: [{
 	// The from point.
 	from: [number, number],
 	// The name of the path.
@@ -191,10 +123,8 @@ const example = extrude(1, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
-},
 	// The id of the extrusion start cap
 	startCapId: uuid,
-	type: "extrudeGroup",
 	// The extrude surfaces.
 	value: [{
 	// The face id for the extrude plane.
@@ -203,6 +133,10 @@ const example = extrude(1, exampleSketch)
 	id: uuid,
 	// The name.
 	name: string,
+	// The position.
+	position: [number, number, number],
+	// The rotation.
+	rotation: [number, number, number, number],
 	// The source range.
 	sourceRange: [number, number],
 	type: "extrudePlane",
@@ -214,13 +148,32 @@ const example = extrude(1, exampleSketch)
 	id: uuid,
 	// The name.
 	name: string,
+	// The position.
+	position: [number, number, number],
+	// The rotation.
+	rotation: [number, number, number, number],
 	// The source range.
 	sourceRange: [number, number],
 	type: "extrudeArc",
 }],
-} |
-{
-	type: "extrudeGroups",
+	// The x-axis of the extrude group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the extrude group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the extrude group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/profileStart.md

@@ -34,6 +34,8 @@ const sketch001 = startSketchOn('XY')
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -69,6 +71,8 @@ const sketch001 = startSketchOn('XY')
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -95,6 +99,10 @@ const sketch001 = startSketchOn('XY')
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -169,6 +177,24 @@ const sketch001 = startSketchOn('XY')
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/profileStartX.md

@@ -29,6 +29,8 @@ const sketch001 = startSketchOn('XY')
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -64,6 +66,8 @@ const sketch001 = startSketchOn('XY')
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -90,6 +94,10 @@ const sketch001 = startSketchOn('XY')
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -164,6 +172,24 @@ const sketch001 = startSketchOn('XY')
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/profileStartY.md

@@ -28,6 +28,8 @@ const sketch001 = startSketchOn('XY')
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -63,6 +65,8 @@ const sketch001 = startSketchOn('XY')
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -89,6 +93,10 @@ const sketch001 = startSketchOn('XY')
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -163,6 +171,24 @@ const sketch001 = startSketchOn('XY')
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/segAng.md

@@ -36,6 +36,8 @@ const example = extrude(4, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -71,6 +73,8 @@ const example = extrude(4, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -97,6 +101,10 @@ const example = extrude(4, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -171,6 +179,24 @@ const example = extrude(4, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/segEndX.md

@@ -34,6 +34,8 @@ const example = extrude(5, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -69,6 +71,8 @@ const example = extrude(5, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -95,6 +99,10 @@ const example = extrude(5, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -169,6 +177,24 @@ const example = extrude(5, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/segEndY.md

@@ -35,6 +35,8 @@ const example = extrude(5, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -70,6 +72,8 @@ const example = extrude(5, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -96,6 +100,10 @@ const example = extrude(5, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -170,6 +178,24 @@ const example = extrude(5, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/segLen.md

@@ -36,6 +36,8 @@ const example = extrude(5, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -71,6 +73,8 @@ const example = extrude(5, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -97,6 +101,10 @@ const example = extrude(5, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -171,6 +179,24 @@ const example = extrude(5, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/startProfileAt.md

@@ -90,6 +90,8 @@ const example = extrude(5, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -124,6 +126,8 @@ const example = extrude(5, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -159,6 +163,8 @@ const example = extrude(5, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -185,6 +191,10 @@ const example = extrude(5, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -259,6 +269,24 @@ const example = extrude(5, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/startSketchAt.md

@@ -59,6 +59,8 @@ const example = extrude(5, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -94,6 +96,8 @@ const example = extrude(5, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -120,6 +124,10 @@ const example = extrude(5, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -194,6 +202,24 @@ const example = extrude(5, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/startSketchOn.md

@@ -167,80 +167,12 @@ const a1 = startSketchOn({
 	height: number,
 	// The id of the extrude group.
 	id: uuid,
-	// The sketch group.
-	sketchGroup: {
-	// The id of the sketch group.
-	id: uuid,
-	// What the sketch is on (can be a plane or a face).
-	on: {
-	// The id of the plane.
-	id: uuid,
-	// Origin of the plane.
-	origin: {
-	x: number,
-	y: number,
-	z: number,
-},
-	type: "plane",
-	// Type for a plane.
-	value: "XY" | "XZ" | "YZ" | "Custom",
-	// What should the plane’s X axis be?
-	xAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// What should the plane’s Y axis be?
-	yAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// The z-axis (normal).
-	zAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-} |
-{
-	// The id of the face.
-	id: uuid,
-	// The original sketch group id of the object we are sketching on.
-	sketchGroupId: uuid,
-	type: "face",
-	// The tag of the face.
-	value: string,
-	// What should the face’s X axis be?
-	xAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// What should the face’s Y axis be?
-	yAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-	// The z-axis (normal).
-	zAxis: {
-	x: number,
-	y: number,
-	z: number,
-},
-},
-	// The starting path.
-	start: {
-	// The from point.
-	from: [number, number],
-	// The name of the path.
-	name: string,
-	// The to point.
-	to: [number, number],
-},
-	// The paths in the sketch group.
-	value: [{
+	// The position of the extrude group.
+	position: [number, number, number],
+	// The rotation of the extrude group.
+	rotation: [number, number, number, number],
+	// The sketch group paths.
+	sketchGroupValues: [{
 	// The from point.
 	from: [number, number],
 	// The name of the path.
@@ -304,7 +236,6 @@ const a1 = startSketchOn({
 	to: [number, number],
 	type: "Base",
 }],
-},
 	// The id of the extrusion start cap
 	startCapId: uuid,
 	// The extrude surfaces.
@@ -315,6 +246,10 @@ const a1 = startSketchOn({
 	id: uuid,
 	// The name.
 	name: string,
+	// The position.
+	position: [number, number, number],
+	// The rotation.
+	rotation: [number, number, number, number],
 	// The source range.
 	sourceRange: [number, number],
 	type: "extrudePlane",
@@ -326,10 +261,32 @@ const a1 = startSketchOn({
 	id: uuid,
 	// The name.
 	name: string,
+	// The position.
+	position: [number, number, number],
+	// The rotation.
+	rotation: [number, number, number, number],
 	// The source range.
 	sourceRange: [number, number],
 	type: "extrudeArc",
 }],
+	// The x-axis of the extrude group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the extrude group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the extrude group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 * `tag`: `SketchOnFaceTag` - A tag for sketch on face. (OPTIONAL)
@@ -374,6 +331,8 @@ string
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.

docs/kcl/tangentialArc.md

@@ -42,6 +42,8 @@ const example = extrude(10, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -77,6 +79,8 @@ const example = extrude(10, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -103,6 +107,10 @@ const example = extrude(10, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -177,6 +185,24 @@ const example = extrude(10, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 * `tag`: `String` (OPTIONAL)
@@ -186,6 +212,8 @@ const example = extrude(10, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -221,6 +249,8 @@ const example = extrude(10, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -247,6 +277,10 @@ const example = extrude(10, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -321,6 +355,24 @@ const example = extrude(10, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/tangentialArcTo.md

@@ -33,6 +33,8 @@ const example = extrude(10, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -68,6 +70,8 @@ const example = extrude(10, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -94,6 +98,10 @@ const example = extrude(10, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -168,6 +176,24 @@ const example = extrude(10, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 * `tag`: `String` (OPTIONAL)
@@ -177,6 +203,8 @@ const example = extrude(10, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -212,6 +240,8 @@ const example = extrude(10, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -238,6 +268,10 @@ const example = extrude(10, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -312,6 +346,24 @@ const example = extrude(10, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/xLine.md

@@ -36,6 +36,8 @@ const example = extrude(10, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -71,6 +73,8 @@ const example = extrude(10, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -97,6 +101,10 @@ const example = extrude(10, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -171,6 +179,24 @@ const example = extrude(10, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 * `tag`: `String` (OPTIONAL)
@@ -180,6 +206,8 @@ const example = extrude(10, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -215,6 +243,8 @@ const example = extrude(10, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -241,6 +271,10 @@ const example = extrude(10, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -315,6 +349,24 @@ const example = extrude(10, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/xLineTo.md

@@ -36,6 +36,8 @@ const example = extrude(10, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -71,6 +73,8 @@ const example = extrude(10, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -97,6 +101,10 @@ const example = extrude(10, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -171,6 +179,24 @@ const example = extrude(10, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 * `tag`: `String` (OPTIONAL)
@@ -180,6 +206,8 @@ const example = extrude(10, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -215,6 +243,8 @@ const example = extrude(10, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -241,6 +271,10 @@ const example = extrude(10, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -315,6 +349,24 @@ const example = extrude(10, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/yLine.md

@@ -34,6 +34,8 @@ const example = extrude(10, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -69,6 +71,8 @@ const example = extrude(10, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -95,6 +99,10 @@ const example = extrude(10, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -169,6 +177,24 @@ const example = extrude(10, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 * `tag`: `String` (OPTIONAL)
@@ -178,6 +204,8 @@ const example = extrude(10, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -213,6 +241,8 @@ const example = extrude(10, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -239,6 +269,10 @@ const example = extrude(10, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -313,6 +347,24 @@ const example = extrude(10, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

docs/kcl/yLineTo.md

@@ -32,6 +32,8 @@ const example = extrude(5, exampleSketch)
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -67,6 +69,8 @@ const example = extrude(5, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -93,6 +97,10 @@ const example = extrude(5, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -167,6 +175,24 @@ const example = extrude(5, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 * `tag`: `String` (OPTIONAL)
@@ -176,6 +202,8 @@ const example = extrude(5, exampleSketch)
 `SketchGroup` - A sketch group is a collection of paths.
 ```js
 {
+	// The plane id or face id of the sketch group.
+	entityId: uuid,
 	// The id of the sketch group.
 	id: uuid,
 	// What the sketch is on (can be a plane or a face).
@@ -211,6 +239,8 @@ const example = extrude(5, exampleSketch)
 },
 } |
 {
+	// the face id the sketch is on
+	faceId: uuid,
 	// The id of the face.
 	id: uuid,
 	// The original sketch group id of the object we are sketching on.
@@ -237,6 +267,10 @@ const example = extrude(5, exampleSketch)
 	z: number,
 },
 },
+	// The position of the sketch group.
+	position: [number, number, number],
+	// The rotation of the sketch group base plane.
+	rotation: [number, number, number, number],
 	// The starting path.
 	start: {
 	// The from point.
@@ -311,6 +345,24 @@ const example = extrude(5, exampleSketch)
 	to: [number, number],
 	type: "Base",
 }],
+	// The x-axis of the sketch group base plane in the 3D space
+	xAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The y-axis of the sketch group base plane in the 3D space
+	yAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
+	// The z-axis of the sketch group base plane in the 3D space
+	zAxis: {
+	x: number,
+	y: number,
+	z: number,
+},
 }
 ```
 

e2e/playwright/snapshot-tests.spec.ts

@@ -405,16 +405,17 @@ test('Draft segments should look right', async ({ page, context }) => {
   // select a plane
   await page.mouse.click(700, 200)
 
-  let code = `const sketch001 = startSketchOn('XZ')`
-  await expect(page.locator('.cm-content')).toHaveText(code)
+  await expect(page.locator('.cm-content')).toHaveText(
+    `const part001 = startSketchOn('XZ')`
+  )
 
-  await page.waitForTimeout(700) // TODO detect animation ending, or disable animation
+  await page.waitForTimeout(300) // TODO detect animation ending, or disable animation
 
   const startXPx = 600
   await page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10)
-  code += `
-  |> startProfileAt([7.19, -9.7], %)`
-  await expect(page.locator('.cm-content')).toHaveText(code)
+  await expect(page.locator('.cm-content'))
+    .toHaveText(`const part001 = startSketchOn('XZ')
+  |> startProfileAt([9.06, -12.22], %)`)
   await page.waitForTimeout(100)
 
   await u.closeDebugPanel()
@@ -426,9 +427,10 @@ test('Draft segments should look right', async ({ page, context }) => {
   await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 10)
   await page.waitForTimeout(100)
 
-  code += `
-  |> line([7.25, 0], %)`
-  await expect(page.locator('.cm-content')).toHaveText(code)
+  await expect(page.locator('.cm-content'))
+    .toHaveText(`const part001 = startSketchOn('XZ')
+  |> startProfileAt([9.06, -12.22], %)
+  |> line([9.14, 0], %)`)
 
   await page.getByRole('button', { name: 'Tangential Arc' }).click()
 
@@ -463,7 +465,7 @@ test('Draft rectangles should look right', async ({ page, context }) => {
   await page.mouse.click(700, 200)
 
   await expect(page.locator('.cm-content')).toHaveText(
-    `const sketch001 = startSketchOn('XZ')`
+    `const part001 = startSketchOn('XZ')`
   )
 
   await page.waitForTimeout(500) // TODO detect animation ending, or disable animation
@@ -511,16 +513,17 @@ test.describe('Client side scene scale should match engine scale', () => {
     // select a plane
     await page.mouse.click(700, 200)
 
-    let code = `const sketch001 = startSketchOn('XZ')`
-    await expect(page.locator('.cm-content')).toHaveText(code)
+    await expect(page.locator('.cm-content')).toHaveText(
+      `const part001 = startSketchOn('XZ')`
+    )
 
-    await page.waitForTimeout(600) // TODO detect animation ending, or disable animation
+    await page.waitForTimeout(300) // TODO detect animation ending, or disable animation
 
     const startXPx = 600
     await page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10)
-    code += `
-  |> startProfileAt([7.19, -9.7], %)`
-    await expect(u.codeLocator).toHaveText(code)
+    await expect(page.locator('.cm-content'))
+      .toHaveText(`const part001 = startSketchOn('XZ')
+    |> startProfileAt([9.06, -12.22], %)`)
     await page.waitForTimeout(100)
 
     await u.closeDebugPanel()
@@ -528,18 +531,21 @@ test.describe('Client side scene scale should match engine scale', () => {
     await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 10)
     await page.waitForTimeout(100)
 
-    code += `
-  |> line([7.25, 0], %)`
-    await expect(u.codeLocator).toHaveText(code)
+    await expect(page.locator('.cm-content'))
+      .toHaveText(`const part001 = startSketchOn('XZ')
+    |> startProfileAt([9.06, -12.22], %)
+    |> line([9.14, 0], %)`)
 
     await page.getByRole('button', { name: 'Tangential Arc' }).click()
     await page.waitForTimeout(100)
 
     await page.mouse.click(startXPx + PUR * 30, 500 - PUR * 20)
 
-    code += `
-  |> tangentialArcTo([21.7, -2.44], %)`
-    await expect(u.codeLocator).toHaveText(code)
+    await expect(page.locator('.cm-content'))
+      .toHaveText(`const part001 = startSketchOn('XZ')
+    |> startProfileAt([9.06, -12.22], %)
+    |> line([9.14, 0], %)
+    |> tangentialArcTo([27.34, -3.08], %)`)
 
     // click tangential arc tool again to unequip it
     await page.getByRole('button', { name: 'Tangential Arc' }).click()
@@ -610,16 +616,17 @@ test.describe('Client side scene scale should match engine scale', () => {
     // select a plane
     await page.mouse.click(700, 200)
 
-    let code = `const sketch001 = startSketchOn('XZ')`
-    await expect(u.codeLocator).toHaveText(code)
+    await expect(page.locator('.cm-content')).toHaveText(
+      `const part001 = startSketchOn('XZ')`
+    )
 
-    await page.waitForTimeout(600) // TODO detect animation ending, or disable animation
+    await page.waitForTimeout(300) // TODO detect animation ending, or disable animation
 
     const startXPx = 600
     await page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10)
-    code += `
-  |> startProfileAt([182.59, -246.32], %)`
-    await expect(u.codeLocator).toHaveText(code)
+    await expect(page.locator('.cm-content'))
+      .toHaveText(`const part001 = startSketchOn('XZ')
+      |> startProfileAt([230.03, -310.32], %)`)
     await page.waitForTimeout(100)
 
     await u.closeDebugPanel()
@@ -627,18 +634,21 @@ test.describe('Client side scene scale should match engine scale', () => {
     await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 10)
     await page.waitForTimeout(100)
 
-    code += `
-  |> line([184.3, 0], %)`
-    await expect(u.codeLocator).toHaveText(code)
+    await expect(page.locator('.cm-content'))
+      .toHaveText(`const part001 = startSketchOn('XZ')
+      |> startProfileAt([230.03, -310.32], %)
+      |> line([232.2, 0], %)`)
 
     await page.getByRole('button', { name: 'Tangential Arc' }).click()
     await page.waitForTimeout(100)
 
     await page.mouse.click(startXPx + PUR * 30, 500 - PUR * 20)
 
-    code += `
-  |> tangentialArcTo([551.2, -62.01], %)`
-    await expect(u.codeLocator).toHaveText(code)
+    await expect(page.locator('.cm-content'))
+      .toHaveText(`const part001 = startSketchOn('XZ')
+      |> startProfileAt([230.03, -310.32], %)
+      |> line([232.2, 0], %)
+      |> tangentialArcTo([694.43, -78.12], %)`)
 
     await page.getByRole('button', { name: 'Tangential Arc' }).click()
     await page.waitForTimeout(100)

e2e/playwright/storageStates.ts

@@ -1,6 +1,5 @@
 import { SaveSettingsPayload } from 'lib/settings/settingsTypes'
 import { Themes } from 'lib/theme'
-import { onboardingPaths } from 'routes/Onboarding/paths'
 
 export const TEST_SETTINGS_KEY = '/settings.toml'
 export const TEST_SETTINGS = {
@@ -23,22 +22,9 @@ export const TEST_SETTINGS = {
   },
 } satisfies Partial<SaveSettingsPayload>
 
-export const TEST_SETTINGS_ONBOARDING_USER_MENU = {
-  ...TEST_SETTINGS,
-  app: { ...TEST_SETTINGS.app, onboardingStatus: onboardingPaths.USER_MENU },
-} satisfies Partial<SaveSettingsPayload>
-
 export const TEST_SETTINGS_ONBOARDING_EXPORT = {
   ...TEST_SETTINGS,
-  app: { ...TEST_SETTINGS.app, onboardingStatus: onboardingPaths.EXPORT },
-} satisfies Partial<SaveSettingsPayload>
-
-export const TEST_SETTINGS_ONBOARDING_PARAMETRIC_MODELING = {
-  ...TEST_SETTINGS,
-  app: {
-    ...TEST_SETTINGS.app,
-    onboardingStatus: onboardingPaths.PARAMETRIC_MODELING,
-  },
+  app: { ...TEST_SETTINGS.app, onboardingStatus: '/export' },
 } satisfies Partial<SaveSettingsPayload>
 
 export const TEST_SETTINGS_ONBOARDING_START = {
@@ -64,25 +50,3 @@ export const TEST_SETTINGS_CORRUPTED = {
     textWrapping: true,
   },
 } satisfies Partial<SaveSettingsPayload>
-
-export const TEST_CODE_GIZMO = `const part001 = startSketchOn('XZ')
-|> startProfileAt([20, 0], %)
-|> line([7.13, 4 + 0], %)
-|> angledLine({ angle: 3 + 0, length: 3.14 + 0 }, %)
-|> lineTo([20.14 + 0, -0.14 + 0], %)
-|> xLineTo(29 + 0, %)
-|> yLine(-3.14 + 0, %, 'a')
-|> xLine(1.63, %)
-|> angledLineOfXLength({ angle: 3 + 0, length: 3.14 }, %)
-|> angledLineOfYLength({ angle: 30, length: 3 + 0 }, %)
-|> angledLineToX({ angle: 22.14 + 0, to: 12 }, %)
-|> angledLineToY({ angle: 30, to: 11.14 }, %)
-|> angledLineThatIntersects({
-  angle: 3.14,
-  intersectTag: 'a',
-  offset: 0
-}, %)
-|> tangentialArcTo([13.14 + 0, 13.14], %)
-|> close(%)
-|> extrude(5 + 7, %)
-`

e2e/playwright/test-utils.ts

@@ -1,6 +1,5 @@
 import { test, expect, Page, Download } from '@playwright/test'
 import { EngineCommand } from '../../src/lang/std/engineConnection'
-import os from 'os'
 import fsp from 'fs/promises'
 import pixelMatch from 'pixelmatch'
 import { PNG } from 'pngjs'
@@ -8,27 +7,18 @@ import { Protocol } from 'playwright-core/types/protocol'
 import type { Models } from '@kittycad/lib'
 import { APP_NAME } from 'lib/constants'
 
-type TestColor = [number, number, number]
-export const TEST_COLORS = {
-  WHITE: [249, 249, 249] as TestColor,
-  YELLOW: [255, 255, 0] as TestColor,
-  BLUE: [0, 0, 255] as TestColor,
-} as const
-
 async function waitForPageLoad(page: Page) {
   // wait for 'Loading stream...' spinner
   await page.getByTestId('loading-stream').waitFor()
   // wait for all spinners to be gone
-  await page
-    .getByTestId('loading')
-    .waitFor({ state: 'detached', timeout: 20_000 })
+  await page.getByTestId('loading').waitFor({ state: 'detached' })
 
   await page.getByTestId('start-sketch').waitFor()
 }
 
 async function removeCurrentCode(page: Page) {
   const hotkey = process.platform === 'darwin' ? 'Meta' : 'Control'
-  await page.locator('.cm-content').click()
+  await page.click('.cm-content')
   await page.keyboard.down(hotkey)
   await page.keyboard.press('a')
   await page.keyboard.up(hotkey)
@@ -37,12 +27,12 @@ async function removeCurrentCode(page: Page) {
 }
 
 async function sendCustomCmd(page: Page, cmd: EngineCommand) {
-  await page.getByTestId('custom-cmd-input').fill(JSON.stringify(cmd))
-  await page.getByTestId('custom-cmd-send-button').click()
+  await page.fill('[data-testid="custom-cmd-input"]', JSON.stringify(cmd))
+  await page.click('[data-testid="custom-cmd-send-button"]')
 }
 
 async function clearCommandLogs(page: Page) {
-  await page.getByTestId('clear-commands').click()
+  await page.click('[data-testid="clear-commands"]')
 }
 
 async function expectCmdLog(page: Page, locatorStr: string) {
@@ -106,74 +96,6 @@ async function waitForCmdReceive(page: Page, commandType: string) {
     .waitFor()
 }
 
-export const wiggleMove = async (
-  page: any,
-  x: number,
-  y: number,
-  steps: number,
-  dist: number,
-  ang: number,
-  amplitude: number,
-  freq: number
-) => {
-  const tau = Math.PI * 2
-  const deg = tau / 360
-  const step = dist / steps
-  for (let i = 0, j = 0; i < dist; i += step, j += 1) {
-    const [x1, y1] = [0, Math.sin((tau / steps) * j * freq) * amplitude]
-    const [x2, y2] = [
-      Math.cos(-ang * deg) * i - Math.sin(-ang * deg) * y1,
-      Math.sin(-ang * deg) * i + Math.cos(-ang * deg) * y1,
-    ]
-    const [xr, yr] = [x2, y2]
-    await page.mouse.move(x + xr, y + yr, { steps: 2 })
-  }
-}
-
-export const getMovementUtils = (opts: any) => {
-  // The way we truncate is kinda odd apparently, so we need this function
-  // "[k]itty[c]ad round"
-  const kcRound = (n: number) => Math.trunc(n * 100) / 100
-
-  // To translate between screen and engine ("[U]nit") coordinates
-  // NOTE: these pretty much can't be perfect because of screen scaling.
-  // Handle on a case-by-case.
-  const toU = (x: number, y: number) => [
-    kcRound(x * 0.0678),
-    kcRound(-y * 0.0678), // Y is inverted in our coordinate system
-  ]
-
-  // Turn the array into a string with specific formatting
-  const fromUToString = (xy: number[]) => `[${xy[0]}, ${xy[1]}]`
-
-  // Combine because used often
-  const toSU = (xy: number[]) => fromUToString(toU(xy[0], xy[1]))
-
-  // Make it easier to click around from center ("click [from] zero zero")
-  const click00 = (x: number, y: number) =>
-    opts.page.mouse.click(opts.center.x + x, opts.center.y + y)
-
-  // Relative clicker, must keep state
-  let last = { x: 0, y: 0 }
-  const click00r = (x?: number, y?: number) => {
-    // reset relative coordinates when anything is undefined
-    if (x === undefined || y === undefined) {
-      last.x = 0
-      last.y = 0
-      return
-    }
-
-    const ret = click00(last.x + x, last.y + y)
-    last.x += x
-    last.y += y
-
-    // Returns the new absolute coordinate if you need it.
-    return ret.then(() => [last.x, last.y])
-  }
-
-  return { toSU, click00r }
-}
-
 export async function getUtils(page: Page) {
   // Chrome devtools protocol session only works in Chromium
   const browserType = page.context().browser()?.browserType().name()
@@ -219,21 +141,15 @@ export async function getUtils(page: Page) {
       const angleXOffset = Math.cos(((angle - 180) * Math.PI) / 180) * px
       const angleYOffset = Math.sin(((angle - 180) * Math.PI) / 180) * px
       return {
-        x: Math.round(bbox.x + angleXOffset),
-        y: Math.round(bbox.y - angleYOffset),
+        x: bbox.x + angleXOffset,
+        y: bbox.y - angleYOffset,
       }
     },
-    getAngle: async (locator: string) => {
-      const overlay = page.locator(locator)
-      return Number(await overlay.getAttribute('data-overlay-angle'))
-    },
     getBoundingBox: async (locator: string) =>
       page
         .locator(locator)
         .boundingBox()
-        .then((box) => ({ ...box, x: box?.x || 0, y: box?.y || 0 })),
-    codeLocator: page.locator('.cm-content'),
-    canvasLocator: page.getByTestId('client-side-scene'),
+        .then((box) => ({ x: box?.x || 0, y: box?.y || 0 })),
     doAndWaitForCmd: async (
       fn: () => Promise<void>,
       commandType: string,
@@ -249,30 +165,6 @@ export async function getUtils(page: Page) {
         await closeDebugPanel(page)
       }
     },
-    /**
-     * Given an expected RGB value, diff if the channel with the largest difference
-     */
-    getGreatestPixDiff: async (
-      coords: { x: number; y: number },
-      expected: [number, number, number]
-    ): Promise<number> => {
-      const buffer = await page.screenshot({
-        fullPage: true,
-      })
-      const screenshot = await PNG.sync.read(buffer)
-      // most likely related to pixel density but the screenshots for webkit are 2x the size
-      // there might be a more robust way of doing this.
-      const pixMultiplier = browserType === 'webkit' ? 2 : 1
-      const index =
-        (screenshot.width * coords.y * pixMultiplier +
-          coords.x * pixMultiplier) *
-        4 // rbga is 4 channels
-      return Math.max(
-        Math.abs(screenshot.data[index] - expected[0]),
-        Math.abs(screenshot.data[index + 1] - expected[1]),
-        Math.abs(screenshot.data[index + 2] - expected[2])
-      )
-    },
     doAndWaitForImageDiff: (fn: () => Promise<any>, diffCount = 200) =>
       new Promise(async (resolve) => {
         await page.screenshot({
@@ -474,8 +366,3 @@ export const doExport = async (
     outputType: output.type,
   }
 }
-
-/**
- * Gets the appropriate modifier key for the platform.
- */
-export const metaModifier = os.platform() === 'darwin' ? 'Meta' : 'Control'

e2e/tauri/specs/auth.e2e.ts

@@ -2,7 +2,6 @@ import { browser, $, expect } from '@wdio/globals'
 import fs from 'fs/promises'
 import path from 'path'
 import os from 'os'
-import { click, setDatasetValue } from '../utils'
 
 const isWin32 = os.platform() === 'win32'
 const documentsDir = path.join(os.homedir(), 'Documents')
@@ -16,8 +15,25 @@ const newProjectDir = path.join(documentsDir, 'a-different-directory')
 const tmp = process.env.TEMP || '/tmp'
 const userCodeDir = path.join(tmp, 'kittycad_user_code')
 
-describe('ZMA sign in flow', () => {
-  before(async () => {
+async function click(element: WebdriverIO.Element): Promise<void> {
+  // Workaround for .click(), see https://github.com/tauri-apps/tauri/issues/6541
+  await element.waitForClickable()
+  await browser.execute('arguments[0].click();', element)
+}
+
+/* Shoutout to @Sheap on Github for a great workaround utility:
+ * https://github.com/tauri-apps/tauri/issues/6541#issue-1638944060
+ */
+async function setDatasetValue(
+  field: WebdriverIO.Element,
+  property: string,
+  value: string
+) {
+  await browser.execute(`arguments[0].dataset.${property} = "${value}"`, field)
+}
+
+describe('ZMA (Tauri)', () => {
+  it('opens the auth page and signs in', async () => {
     // Clean up filesystem from previous tests
     await new Promise((resolve) => setTimeout(resolve, 100))
     await fs.rm(defaultProjectDir, { force: true, recursive: true })
@@ -26,9 +42,7 @@ describe('ZMA sign in flow', () => {
     await fs.rm(userSettingsDir, { force: true, recursive: true })
     await fs.mkdir(defaultProjectDir, { recursive: true })
     await fs.mkdir(newProjectDir, { recursive: true })
-  })
 
-  it('opens the auth page and signs in', async () => {
     const signInButton = await $('[data-testid="sign-in-button"]')
     expect(await signInButton.getText()).toEqual('Sign in')
 
@@ -68,10 +82,6 @@ describe('ZMA sign in flow', () => {
     const newFileButton = await $('[data-testid="home-new-file"]')
     expect(await newFileButton.getText()).toEqual('New project')
   })
-})
-
-describe('ZMA authorized user flows', () => {
-  // Note: each flow below is intended to start *and* end from the home page
 
   it('opens the settings page, checks filesystem settings, and closes the settings page', async () => {
     const menuButton = await $('[data-testid="user-sidebar-toggle"]')
@@ -140,11 +150,8 @@ describe('ZMA authorized user flows', () => {
     const base = isWin32 ? 'http://tauri.localhost' : 'tauri://localhost'
     await browser.execute(`window.location.href = "${base}/home"`)
   })
-})
 
-describe('ZMA sign out flow', () => {
   it('signs out', async () => {
-    await new Promise((resolve) => setTimeout(resolve, 1000))
     const menuButton = await $('[data-testid="user-sidebar-toggle"]')
     await click(menuButton)
     const signoutButton = await $('[data-testid="user-sidebar-sign-out"]')

e2e/tauri/utils.ts

@@ -1,18 +0,0 @@
-import { browser } from '@wdio/globals'
-
-export async function click(element: WebdriverIO.Element): Promise<void> {
-  // Workaround for .click(), see https://github.com/tauri-apps/tauri/issues/6541
-  await element.waitForClickable()
-  await browser.execute('arguments[0].click();', element)
-}
-
-/* Shoutout to @Sheap on Github for a great workaround utility:
- * https://github.com/tauri-apps/tauri/issues/6541#issue-1638944060
- */
-export async function setDatasetValue(
-  field: WebdriverIO.Element,
-  property: string,
-  value: string
-) {
-  await browser.execute(`arguments[0].dataset.${property} = "${value}"`, field)
-}

flake.lock

@@ -1,62 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1718470082,
-        "narHash": "sha256-u2F0MMYE+Efc+ocruTbtU/wWHuYHWcJafp5zJ++n/YE=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "3027ba73dfef68eb555fc2fa97aed4e999e74f97",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1718428119,
-        "narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e6cea36f83499eb4e9cd184c8a8e823296b50ad5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs",
-        "rust-overlay": "rust-overlay"
-      }
-    },
-    "rust-overlay": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1718681902,
-        "narHash": "sha256-E/T7Ge6ayEQe7FVKMJqDBoHyLhRhjc6u9CmU8MyYfy0=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "16c8ad83297c278eebe740dea5491c1708960dd1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

flake.nix

@@ -1,70 +0,0 @@
-{
-  description = "modeling-app development environment";
-
-  # Flake inputs
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    rust-overlay.url = "github:oxalica/rust-overlay"; # A helper for Rust + Nix
-  };
-
-  # Flake outputs
-  outputs = { self, nixpkgs, rust-overlay }:
-    let
-      # Overlays enable you to customize the Nixpkgs attribute set
-      overlays = [
-        # Makes a `rust-bin` attribute available in Nixpkgs
-        (import rust-overlay)
-        # Provides a `rustToolchain` attribute for Nixpkgs that we can use to
-        # create a Rust environment
-        (self: super: {
-          rustToolchain = super. rust-bin.stable.latest.default.override {
-            targets = [ "wasm32-unknown-unknown" ];
-            extensions = [ "rustfmt" "llvm-tools-preview" ];
-          };
-        })
-      ];
-
-      # Systems supported
-      allSystems = [
-        "x86_64-linux" # 64-bit Intel/AMD Linux
-        "aarch64-linux" # 64-bit ARM Linux
-        "x86_64-darwin" # 64-bit Intel macOS
-        "aarch64-darwin" # 64-bit ARM macOS
-      ];
-
-      # Helper to provide system-specific attributes
-      forAllSystems = f: nixpkgs.lib.genAttrs allSystems (system: f {
-        pkgs = import nixpkgs { inherit overlays system; };
-      });
-
-    in
-    {
-      # Development environment output
-      devShells = forAllSystems ({ pkgs }: {
-        default = pkgs.mkShell {
-          # The Nix packages provided in the environment
-          packages = (with pkgs; [
-            # The package provided by our custom overlay. Includes cargo, Clippy, cargo-fmt,
-            # rustdoc, rustfmt, and other tools.
-            rustToolchain
-
-            cargo-llvm-cov
-            cargo-nextest
-
-            just
-            postgresql.lib
-            openssl
-            pkg-config
-
-            nodejs_22
-          ]) ++ pkgs.lib.optionals pkgs.stdenv.isDarwin (with pkgs; [
-            libiconv 
-            darwin.apple_sdk.frameworks.Security
-          ]);
-
-          TARGET_CC = "${pkgs.stdenv.cc}/bin/${pkgs.stdenv.cc.targetPrefix}cc";
-          LIBCLANG_PATH = "${pkgs.libclang.lib}/lib";
-        };
-      });
-    };
-}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "untitled-app",
-  "version": "0.22.6",
+  "version": "0.22.0",
   "private": true,
   "dependencies": {
     "@codemirror/autocomplete": "^6.16.0",
@@ -10,7 +10,7 @@
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@headlessui/react": "^1.7.19",
     "@headlessui/tailwindcss": "^0.2.0",
-    "@kittycad/lib": "^0.0.67",
+    "@kittycad/lib": "^0.0.63",
     "@lezer/javascript": "^1.4.9",
     "@open-rpc/client-js": "^1.8.1",
     "@react-hook/resize-observer": "^2.0.1",
@@ -95,8 +95,7 @@
     "lint": "eslint --fix src",
     "bump-jsons": "echo \"$(jq --arg v \"$VERSION\" '.version=$v' package.json --indent 2)\" > package.json && echo \"$(jq --arg v \"$VERSION\" '.version=$v' src-tauri/tauri.conf.json --indent 2)\" > src-tauri/tauri.conf.json",
     "postinstall": "yarn xstate:typegen",
-    "xstate:typegen": "yarn xstate typegen \"src/**/*.ts?(x)\"",
-    "make:dev": "make dev"
+    "xstate:typegen": "yarn xstate typegen \"src/**/*.ts?(x)\""
   },
   "prettier": {
     "trailingComma": "es5",

playwright.config.ts

@@ -12,12 +12,12 @@ import { defineConfig, devices } from '@playwright/test'
 export default defineConfig({
   testDir: './e2e/playwright',
   /* Run tests in files in parallel */
-  fullyParallel: false,
+  fullyParallel: true,
   /* Fail the build on CI if you accidentally left test.only in the source code. */
   forbidOnly: !!process.env.CI,
   /* Retry on CI only */
   retries: process.env.CI ? 3 : 0,
-  /* Different amount of parallelism on CI and local. */
+  /* Opt out of parallel tests on CI. */
   workers: process.env.CI ? 1 : 1,
   /* Reporter to use. See https://playwright.dev/docs/test-reporters */
   reporter: 'html',
@@ -34,14 +34,7 @@ export default defineConfig({
   projects: [
     {
       name: 'Google Chrome',
-      use: {
-        ...devices['Desktop Chrome'],
-        channel: 'chrome',
-        contextOptions: {
-          /* Chromium is the only one with these permission types */
-          permissions: ['clipboard-write', 'clipboard-read'],
-        },
-      }, // or 'chrome-beta'
+      use: { ...devices['Desktop Chrome'], channel: 'chrome' }, // or 'chrome-beta'
     },
     {
       name: 'webkit',
@@ -79,7 +72,7 @@ export default defineConfig({
 
   /* Run your local dev server before starting the tests */
   webServer: {
-    command: 'yarn start',
+    command: 'yarn serve',
     // url: 'http://127.0.0.1:3000',
     reuseExistingServer: !process.env.CI,
   },

src-tauri/Cargo.lock

@@ -200,7 +200,7 @@ dependencies = [
  "tauri-plugin-shell",
  "tauri-plugin-updater",
  "tokio",
- "toml 0.8.14",
+ "toml 0.8.13",
  "url",
 ]
 
@@ -344,7 +344,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -379,7 +379,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -425,7 +425,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -574,7 +574,7 @@ dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
  "syn_derive",
 ]
 
@@ -601,9 +601,9 @@ dependencies = [
 
 [[package]]
 name = "bson"
-version = "2.11.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8a88e82b9106923b5c4d6edfca9e7db958d4e98a478ec115022e81b9b38e2c8"
+checksum = "4d43b38e074cc0de2957f10947e376a1d88b9c4dbab340b590800cc1b2e066b2"
 dependencies = [
  "ahash 0.8.11",
  "base64 0.13.1",
@@ -766,7 +766,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a969e13a7589e9e3e4207e153bae624ade2b5622fb4684a4923b23ec3d57719"
 dependencies = [
  "serde",
- "toml 0.8.14",
+ "toml 0.8.13",
 ]
 
 [[package]]
@@ -852,9 +852,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.7"
+version = "4.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f"
+checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -862,9 +862,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.7"
+version = "4.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f"
+checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
 dependencies = [
  "anstream",
  "anstyle",
@@ -876,14 +876,14 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.5"
+version = "4.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6"
+checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -1085,7 +1085,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
 dependencies = [
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -1095,7 +1095,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f"
 dependencies = [
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -1119,7 +1119,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.10.0",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -1130,7 +1130,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -1160,9 +1160,9 @@ checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a"
 
 [[package]]
 name = "databake"
-version = "0.1.8"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a04fbfbecca8f0679c8c06fef907594adcc3e2052e11163a6d30535a1a5604d"
+checksum = "82175d72e69414ceafbe2b49686794d3a8bed846e0d50267355f83ea8fdd953a"
 dependencies = [
  "databake-derive",
  "proc-macro2",
@@ -1171,13 +1171,13 @@ dependencies = [
 
 [[package]]
 name = "databake-derive"
-version = "0.1.8"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4078275de501a61ceb9e759d37bdd3d7210e654dbc167ac1a3678ef4435ed57b"
+checksum = "377af281d8f23663862a7c84623bc5dcf7f8c44b13c7496a590bdc157f941a43"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
  "synstructure",
 ]
 
@@ -1214,7 +1214,7 @@ dependencies = [
  "regex",
  "serde",
  "serde_tokenstream",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -1225,7 +1225,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -1287,7 +1287,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -1319,7 +1319,7 @@ checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -1373,7 +1373,7 @@ dependencies = [
  "cc",
  "memchr",
  "rustc_version",
- "toml 0.8.14",
+ "toml 0.8.13",
  "vswhom",
  "winreg 0.52.0",
 ]
@@ -1417,7 +1417,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -1568,7 +1568,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -1684,7 +1684,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -1960,7 +1960,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -1988,7 +1988,7 @@ dependencies = [
  "inflections",
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -2063,7 +2063,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -2470,15 +2470,6 @@ dependencies = [
  "either",
 ]
 
-[[package]]
-name = "itertools"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itoa"
 version = "0.4.8"
@@ -2568,7 +2559,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-lib"
-version = "0.1.62"
+version = "0.1.58"
 dependencies = [
  "anyhow",
  "approx",
@@ -2587,6 +2578,8 @@ dependencies = [
  "gltf-json",
  "js-sys",
  "kittycad",
+ "kittycad-execution-plan-macros",
+ "kittycad-execution-plan-traits",
  "lazy_static",
  "mime_guess",
  "parse-display",
@@ -2599,7 +2592,7 @@ dependencies = [
  "thiserror",
  "tokio",
  "tokio-tungstenite",
- "toml 0.8.14",
+ "toml 0.8.13",
  "tower-lsp",
  "ts-rs",
  "url",
@@ -2625,9 +2618,9 @@ dependencies = [
 
 [[package]]
 name = "kittycad"
-version = "0.3.5"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df75feef10313fa1cb15b7cecd0f579877312ba3d42bb5b8b4c1d4b1d0fcabf0"
+checksum = "b0cbef813153197e60c0e96f59eea0b75f8418380f414b20250ee81b60e522c3"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2640,7 +2633,7 @@ dependencies = [
  "format_serde_error",
  "futures",
  "http 0.2.12",
- "itertools 0.13.0",
+ "itertools",
  "log",
  "mime_guess",
  "parse-display",
@@ -2662,6 +2655,28 @@ dependencies = [
  "uuid",
 ]
 
+[[package]]
+name = "kittycad-execution-plan-macros"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0611fc9b9786175da21d895ffa0f65039e19c9111e94a41b7af999e3b95f045f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "kittycad-execution-plan-traits"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "123cb47e2780ea8ef3aa67b4db237a27b388d3d3b96db457e274aa4565723151"
+dependencies = [
+ "serde",
+ "thiserror",
+ "uuid",
+]
+
 [[package]]
 name = "kuchikiki"
 version = "0.8.2"
@@ -3338,9 +3353,9 @@ dependencies = [
 
 [[package]]
 name = "parse-display"
-version = "0.9.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "914a1c2265c98e2446911282c6ac86d8524f495792c38c5bd884f80499c7538a"
+checksum = "06af5f9333eb47bd9ba8462d612e37a8328a5cb80b13f0af4de4c3b89f52dee5"
 dependencies = [
  "parse-display-derive",
  "regex",
@@ -3349,16 +3364,16 @@ dependencies = [
 
 [[package]]
 name = "parse-display-derive"
-version = "0.9.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ae7800a4c974efd12df917266338e79a7a74415173caf7e70aa0a0707345281"
+checksum = "dc9252f259500ee570c75adcc4e317fa6f57a1e47747d622e0bf838002a7b790"
 dependencies = [
  "proc-macro2",
  "quote",
  "regex",
  "regex-syntax 0.8.3",
  "structmeta",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -3500,7 +3515,7 @@ dependencies = [
  "phf_shared 0.11.2",
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -3539,7 +3554,7 @@ dependencies = [
  "bincode",
  "either",
  "fnv",
- "itertools 0.12.1",
+ "itertools",
  "lazy_static",
  "nom",
  "quick-xml",
@@ -3568,7 +3583,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -3720,9 +3735,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.85"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
+checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43"
 dependencies = [
  "unicode-ident",
 ]
@@ -4284,19 +4299,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "rustls"
-version = "0.23.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebbbdb961df0ad3f2652da8f3fdc4b36122f568f968f45ad3316f26c025c677b"
-dependencies = [
- "once_cell",
- "rustls-pki-types",
- "rustls-webpki 0.102.3",
- "subtle",
- "zeroize",
-]
-
 [[package]]
 name = "rustls-native-certs"
 version = "0.7.0"
@@ -4413,7 +4415,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -4522,7 +4524,7 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -4533,7 +4535,7 @@ checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -4566,7 +4568,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -4587,7 +4589,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -4629,7 +4631,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -4897,7 +4899,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "structmeta-derive",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -4908,7 +4910,7 @@ checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -4930,7 +4932,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -4963,9 +4965,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.67"
+version = "2.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff8655ed1d86f3af4ee3fd3263786bc14245ad17c4c7e85ba7187fb3ae028c90"
+checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4981,7 +4983,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -4998,7 +5000,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -5040,7 +5042,7 @@ dependencies = [
  "cfg-expr",
  "heck 0.5.0",
  "pkg-config",
- "toml 0.8.14",
+ "toml 0.8.13",
  "version-compare",
 ]
 
@@ -5193,7 +5195,7 @@ dependencies = [
  "serde_json",
  "tauri-utils",
  "tauri-winres",
- "toml 0.8.14",
+ "toml 0.8.13",
  "walkdir",
 ]
 
@@ -5215,7 +5217,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2",
- "syn 2.0.67",
+ "syn 2.0.66",
  "tauri-utils",
  "thiserror",
  "time",
@@ -5233,7 +5235,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
  "tauri-codegen",
  "tauri-utils",
 ]
@@ -5251,7 +5253,7 @@ dependencies = [
  "serde",
  "serde_json",
  "tauri-utils",
- "toml 0.8.14",
+ "toml 0.8.13",
  "walkdir",
 ]
 
@@ -5528,7 +5530,7 @@ dependencies = [
  "serde_with",
  "swift-rs",
  "thiserror",
- "toml 0.8.14",
+ "toml 0.8.13",
  "url",
  "urlpattern",
  "walkdir",
@@ -5599,7 +5601,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -5662,9 +5664,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.38.0"
+version = "1.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
+checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
 dependencies = [
  "backtrace",
  "bytes",
@@ -5682,13 +5684,13 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.3.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -5712,30 +5714,19 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "tokio-rustls"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
-dependencies = [
- "rustls 0.23.7",
- "rustls-pki-types",
- "tokio",
-]
-
 [[package]]
 name = "tokio-tungstenite"
-version = "0.23.1"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd"
+checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38"
 dependencies = [
  "futures-util",
  "log",
- "rustls 0.23.7",
+ "rustls 0.22.4",
  "rustls-native-certs",
  "rustls-pki-types",
  "tokio",
- "tokio-rustls 0.26.0",
+ "tokio-rustls 0.25.0",
  "tungstenite",
 ]
 
@@ -5767,14 +5758,14 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.14"
+version = "0.8.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
+checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.14",
+ "toml_edit 0.22.13",
 ]
 
 [[package]]
@@ -5823,9 +5814,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.14"
+version = "0.22.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
+checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c"
 dependencies = [
  "indexmap 2.2.6",
  "serde",
@@ -5888,7 +5879,7 @@ checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -5917,7 +5908,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -6021,12 +6012,10 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "ts-rs"
-version = "9.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e2dcf58e612adda9a83800731e8e4aba04d8a302b9029617b0b6e4b021d5357"
+version = "8.1.0"
+source = "git+https://github.com/Aleph-Alpha/ts-rs#f898578d80d3e2a54080c1c046c45f9eaa2435c3"
 dependencies = [
  "chrono",
- "serde_json",
  "thiserror",
  "ts-rs-macros",
  "url",
@@ -6035,21 +6024,20 @@ dependencies = [
 
 [[package]]
 name = "ts-rs-macros"
-version = "9.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbdee324e50a7402416d9c25270d3df4241ed528af5d36dda18b6f219551c577"
+version = "8.1.0"
+source = "git+https://github.com/Aleph-Alpha/ts-rs#f898578d80d3e2a54080c1c046c45f9eaa2435c3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
  "termcolor",
 ]
 
 [[package]]
 name = "tungstenite"
-version = "0.23.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8"
+checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1"
 dependencies = [
  "byteorder",
  "bytes",
@@ -6058,10 +6046,11 @@ dependencies = [
  "httparse",
  "log",
  "rand 0.8.5",
- "rustls 0.23.7",
+ "rustls 0.22.4",
  "rustls-pki-types",
  "sha1",
  "thiserror",
+ "url",
  "utf-8",
 ]
 
@@ -6173,9 +6162,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -6253,7 +6242,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -6352,7 +6341,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
  "wasm-bindgen-shared",
 ]
 
@@ -6386,7 +6375,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6527,7 +6516,7 @@ checksum = "ac1345798ecd8122468840bcdf1b95e5dc6d2206c5e4b0eafa078d061f59c9bc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -6633,7 +6622,7 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -6644,7 +6633,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -7086,7 +7075,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.67",
+ "syn 2.0.66",
 ]
 
 [[package]]

src-tauri/Cargo.toml

@@ -16,7 +16,7 @@ tauri-build = { version = "2.0.0-beta.13", features = [] }
 [dependencies]
 anyhow = "1"
 kcl-lib = { version = "0.1.53", path = "../src/wasm-lib/kcl" }
-kittycad = "0.3.5"
+kittycad = "0.3.0"
 log = "0.4.21"
 oauth2 = "4.4.2"
 serde_json = "1.0"

src-tauri/tauri.conf.json

@@ -74,5 +74,5 @@
     }
   },
   "productName": "Zoo Modeling App",
-  "version": "0.22.6"
+  "version": "0.22.0"
 }

src/App.tsx

@@ -127,7 +127,7 @@ export function App() {
       />
       <ModalContainer />
       <ModelingSidebar paneOpacity={paneOpacity} />
-      <Stream />
+      <Stream className="absolute inset-0 z-0" />
       {/* <CamToggle /> */}
       <LowerRightControls>
         <Gizmo />

src/Router.tsx

@@ -12,8 +12,6 @@ import SignIn from './routes/SignIn'
 import { Auth } from './Auth'
 import { isTauri } from './lib/isTauri'
 import Home from './routes/Home'
-import { NetworkContext } from './hooks/useNetworkContext'
-import { useNetworkStatus } from './hooks/useNetworkStatus'
 import makeUrlPathRelative from './lib/makeUrlPathRelative'
 import DownloadAppBanner from 'components/DownloadAppBanner'
 import { WasmErrBanner } from 'components/WasmErrBanner'
@@ -157,11 +155,5 @@ const router = createBrowserRouter([
  * @returns RouterProvider
  */
 export const Router = () => {
-  const networkStatus = useNetworkStatus()
-
-  return (
-    <NetworkContext.Provider value={networkStatus}>
-      <RouterProvider router={router} />
-    </NetworkContext.Provider>
-  )
+  return <RouterProvider router={router} />
 }

src/Toolbar.tsx

@@ -3,11 +3,13 @@ import { isCursorInSketchCommandRange } from 'lang/util'
 import { engineCommandManager, kclManager } from 'lib/singletons'
 import { useModelingContext } from 'hooks/useModelingContext'
 import { useCommandsContext } from 'hooks/useCommandsContext'
-import { useNetworkContext } from 'hooks/useNetworkContext'
-import { NetworkHealthState } from 'hooks/useNetworkStatus'
 import { ActionButton } from 'components/ActionButton'
 import { isSingleCursorInPipe } from 'lang/queryAst'
 import { useKclContext } from 'lang/KclProvider'
+import {
+  NetworkHealthState,
+  useNetworkStatus,
+} from 'components/NetworkHealthIndicator'
 import { useStore } from 'useStore'
 import { ActionButtonDropdown } from 'components/ActionButtonDropdown'
 import { useHotkeys } from 'react-hotkeys-hook'
@@ -36,16 +38,14 @@ export function Toolbar({
   }, [engineCommandManager.artifactMap, context.selectionRanges])
 
   const toolbarButtonsRef = useRef<HTMLUListElement>(null)
-  const { overallState } = useNetworkContext()
+
+  const { overallState } = useNetworkStatus()
   const { isExecuting } = useKclContext()
   const { isStreamReady } = useStore((s) => ({
     isStreamReady: s.isStreamReady,
   }))
   const disableAllButtons =
-    (overallState !== NetworkHealthState.Ok &&
-      overallState !== NetworkHealthState.Weak) ||
-    isExecuting ||
-    !isStreamReady
+    overallState !== NetworkHealthState.Ok || isExecuting || !isStreamReady
 
   useHotkeys(
     'l',

src/clientSideScene/CameraControls.ts

@@ -48,14 +48,12 @@ export type ReactCameraProperties =
       type: 'perspective'
       fov?: number
       position: [number, number, number]
-      target: [number, number, number]
       quaternion: [number, number, number, number]
     }
   | {
       type: 'orthographic'
       zoom?: number
       position: [number, number, number]
-      target: [number, number, number]
       quaternion: [number, number, number, number]
     }
 
@@ -174,6 +172,41 @@ export class CameraControls {
     }
   }
 
+  throttledUpdateEngineFov = throttle(
+    (vals: {
+      position: Vector3
+      quaternion: Quaternion
+      zoom: number
+      fov: number
+      target: Vector3
+    }) => {
+      const cmd: EngineCommand = {
+        type: 'modeling_cmd_req',
+        cmd_id: uuidv4(),
+        cmd: {
+          type: 'default_camera_perspective_settings',
+          ...convertThreeCamValuesToEngineCam({
+            ...vals,
+            isPerspective: true,
+          }),
+          fov_y: vals.fov,
+          ...calculateNearFarFromFOV(vals.fov),
+        },
+      }
+      this.engineCommandManager.sendSceneCommand(cmd)
+      this.lastPerspectiveCmd = cmd
+      this.lastPerspectiveCmdTime = Date.now()
+      if (this.lastPerspectiveCmdTimeoutId !== null) {
+        clearTimeout(this.lastPerspectiveCmdTimeoutId)
+      }
+      this.lastPerspectiveCmdTimeoutId = setTimeout(
+        this.sendLastPerspectiveReliableChannel,
+        lastCmdDelay
+      ) as any as number
+    },
+    1000 / 30
+  )
+
   constructor(
     isOrtho = false,
     domElement: HTMLCanvasElement,
@@ -409,7 +442,7 @@ export class CameraControls {
         this.handleEnd()
         return
       }
-      this.engineCommandManager.sendSceneCommand({
+      this.throttledEngCmd({
         type: 'modeling_cmd_req',
         cmd: {
           type: 'default_camera_zoom',
@@ -421,11 +454,11 @@ export class CameraControls {
       return
     }
 
-    // Else "clientToEngine" (Sketch Mode) or forceUpdate
+    const isTrackpad = Math.abs(event.deltaY) <= 1 || event.deltaY % 1 === 0
 
-    // From onMouseMove zoom handling which seems to be really smooth
+    const zoomSpeed = isTrackpad ? 0.02 : 0.1 // Reduced zoom speed for trackpad
     this.pendingZoom = this.pendingZoom ? this.pendingZoom : 1
-    this.pendingZoom *= 1 + event.deltaY * 0.01
+    this.pendingZoom *= 1 + (event.deltaY > 0 ? zoomSpeed : -zoomSpeed)
     this.handleEnd()
   }
 
@@ -499,28 +532,26 @@ export class CameraControls {
     direction.normalize()
     this.camera.position.copy(this.target).addScaledVector(direction, distance)
   }
-  usePerspectiveCamera = async () => {
+  usePerspectiveCamera = () => {
     this._usePerspectiveCamera()
-    if (this.syncDirection === 'clientToEngine') {
-      await this.engineCommandManager.sendSceneCommand({
-        type: 'modeling_cmd_req',
-        cmd_id: uuidv4(),
-        cmd: {
-          type: 'default_camera_set_perspective',
-          parameters: {
-            fov_y:
-              this.camera instanceof PerspectiveCamera ? this.camera.fov : 45,
-            ...calculateNearFarFromFOV(this.lastPerspectiveFov),
-          },
+    this.engineCommandManager.sendSceneCommand({
+      type: 'modeling_cmd_req',
+      cmd_id: uuidv4(),
+      cmd: {
+        type: 'default_camera_set_perspective',
+        parameters: {
+          fov_y:
+            this.camera instanceof PerspectiveCamera ? this.camera.fov : 45,
+          ...calculateNearFarFromFOV(this.lastPerspectiveFov),
         },
-      })
-    }
+      },
+    })
     this.onCameraChange()
     this.update()
     return this.camera
   }
 
-  dollyZoom = async (newFov: number, splitEngineCalls = false) => {
+  dollyZoom = (newFov: number) => {
     if (!(this.camera instanceof PerspectiveCamera)) {
       console.warn('Dolly zoom is only applicable to perspective cameras.')
       return
@@ -571,52 +602,13 @@ export class CameraControls {
     this.camera.near = z_near
     this.camera.far = z_far
 
-    if (splitEngineCalls) {
-      await this.engineCommandManager.sendSceneCommand({
-        type: 'modeling_cmd_req',
-        cmd_id: uuidv4(),
-        cmd: {
-          type: 'default_camera_look_at',
-          ...convertThreeCamValuesToEngineCam({
-            isPerspective: true,
-            position: newPosition,
-            quaternion: this.camera.quaternion,
-            zoom: this.camera.zoom,
-            target: this.target,
-          }),
-        },
-      })
-      await this.engineCommandManager.sendSceneCommand({
-        type: 'modeling_cmd_req',
-        cmd_id: uuidv4(),
-        cmd: {
-          type: 'default_camera_set_perspective',
-          parameters: {
-            fov_y: newFov,
-            z_near: 0.01,
-            z_far: 1000,
-          },
-        },
-      })
-    } else {
-      await this.engineCommandManager.sendSceneCommand({
-        type: 'modeling_cmd_req',
-        cmd_id: uuidv4(),
-        cmd: {
-          type: 'default_camera_perspective_settings',
-          ...convertThreeCamValuesToEngineCam({
-            isPerspective: true,
-            position: newPosition,
-            quaternion: this.camera.quaternion,
-            zoom: this.camera.zoom,
-            target: this.target,
-          }),
-          fov_y: newFov,
-          z_near: 0.01,
-          z_far: 1000,
-        },
-      })
-    }
+    this.throttledUpdateEngineFov({
+      fov: newFov,
+      position: newPosition,
+      quaternion: this.camera.quaternion,
+      zoom: this.camera.zoom,
+      target: this.target,
+    })
   }
 
   update = (forceUpdate = false) => {
@@ -781,75 +773,6 @@ export class CameraControls {
     })
   }
 
-  async updateCameraToAxis(
-    axis: 'x' | 'y' | 'z' | '-x' | '-y' | '-z'
-  ): Promise<void> {
-    const distance = this.camera.position.distanceTo(this.target)
-
-    const vantage = this.target.clone()
-    let up = { x: 0, y: 0, z: 1 }
-
-    if (axis === 'x') {
-      vantage.x += distance
-    } else if (axis === 'y') {
-      vantage.y += distance
-    } else if (axis === 'z') {
-      vantage.z += distance
-      up = { x: -1, y: 0, z: 0 }
-    } else if (axis === '-x') {
-      vantage.x -= distance
-    } else if (axis === '-y') {
-      vantage.y -= distance
-    } else if (axis === '-z') {
-      vantage.z -= distance
-      up = { x: -1, y: 0, z: 0 }
-    }
-
-    await this.engineCommandManager.sendSceneCommand({
-      type: 'modeling_cmd_req',
-      cmd_id: uuidv4(),
-      cmd: {
-        type: 'default_camera_look_at',
-        center: this.target,
-        vantage: vantage,
-        up: up,
-      },
-    })
-    await this.engineCommandManager.sendSceneCommand({
-      type: 'modeling_cmd_req',
-      cmd_id: uuidv4(),
-      cmd: {
-        type: 'default_camera_get_settings',
-      },
-    })
-  }
-
-  async resetCameraPosition(): Promise<void> {
-    await this.engineCommandManager.sendSceneCommand({
-      type: 'modeling_cmd_req',
-      cmd_id: uuidv4(),
-      cmd: {
-        type: 'default_camera_look_at',
-        center: this.target,
-        vantage: {
-          x: this.target.x,
-          y: this.target.y - 128,
-          z: this.target.z + 64,
-        },
-        up: { x: 0, y: 0, z: 1 },
-      },
-    })
-    await this.engineCommandManager.sendSceneCommand({
-      type: 'modeling_cmd_req',
-      cmd_id: uuidv4(),
-      cmd: {
-        type: 'zoom_to_fit',
-        object_ids: [], // leave empty to zoom to all objects
-        padding: 0.2, // padding around the objects
-      },
-    })
-  }
-
   async tweenCameraToQuaternion(
     targetQuaternion: Quaternion,
     targetPosition = new Vector3(),
@@ -1021,29 +944,6 @@ export class CameraControls {
         .onComplete(onComplete)
         .start()
     })
-  snapToPerspectiveBeforeHandingBackControlToEngine = async (
-    targetCamUp = new Vector3(0, 0, 1)
-  ) => {
-    if (this.syncDirection === 'engineToClient') {
-      console.warn(
-        'animate To Perspective not design to work with engineToClient syncDirection.'
-      )
-    }
-    this.isFovAnimationInProgress = true
-    const targetFov = this.fovBeforeOrtho // Target FOV for perspective
-    this.lastPerspectiveFov = 4
-    let currentFov = 4
-    const initialCameraUp = this.camera.up.clone()
-    this.usePerspectiveCamera()
-    const tempVec = new Vector3()
-
-    currentFov = this.lastPerspectiveFov + (targetFov - this.lastPerspectiveFov)
-    const currentUp = tempVec.lerpVectors(initialCameraUp, targetCamUp, 1)
-    this.camera.up.copy(currentUp)
-    await this.dollyZoom(currentFov, true)
-
-    this.isFovAnimationInProgress = false
-  }
 
   get reactCameraProperties(): ReactCameraProperties {
     return {
@@ -1057,11 +957,6 @@ export class CameraControls {
         roundOff(this.camera.position.y, 2),
         roundOff(this.camera.position.z, 2),
       ],
-      target: [
-        roundOff(this.target.x, 2),
-        roundOff(this.target.y, 2),
-        roundOff(this.target.z, 2),
-      ],
       quaternion: [
         roundOff(this.camera.quaternion.x, 2),
         roundOff(this.camera.quaternion.y, 2),
@@ -1116,7 +1011,7 @@ function calculateNearFarFromFOV(fov: number) {
   // const nearFarRatio = (fov - 3) / (45 - 3)
   // const z_near = 0.1 + nearFarRatio * (5 - 0.1)
   // const z_far = 1000 + nearFarRatio * (100000 - 1000)
-  return { z_near: 0.01, z_far: 1000 }
+  return { z_near: 0.1, z_far: 1000 }
 }
 
 function convertThreeCamValuesToEngineCam({
@@ -1135,6 +1030,11 @@ function convertThreeCamValuesToEngineCam({
   // leaving for now since it's working but maybe revisit later
   const euler = new Euler().setFromQuaternion(quaternion, 'XYZ')
 
+  const lookAtVector = new Vector3(0, 0, -1)
+    .applyEuler(euler)
+    .normalize()
+    .add(position)
+
   const upVector = new Vector3(0, 1, 0).applyEuler(euler).normalize()
   if (isPerspective) {
     return {
@@ -1143,10 +1043,6 @@ function convertThreeCamValuesToEngineCam({
       vantage: position,
     }
   }
-  const lookAtVector = new Vector3(0, 0, -1)
-    .applyEuler(euler)
-    .normalize()
-    .add(position)
   const fudgeFactor2 = zoom * 0.9979224466814468 - 0.03473692325839295
   const zoomFactor = (-ZOOM_MAGIC_NUMBER + fudgeFactor2) / zoom
   const direction = lookAtVector.clone().sub(position).normalize()

src/clientSideScene/ClientSideSceneComp.tsx

@@ -136,7 +136,6 @@ export const ClientSideScene = ({
       <div
         ref={canvasRef}
         style={{ cursor: cursor }}
-        data-testid="client-side-scene"
         className={`absolute inset-0 h-full w-full transition-all duration-300 ${
           hideClient ? 'opacity-0' : 'opacity-100'
         } ${hideServer ? 'bg-chalkboard-10 dark:bg-chalkboard-100' : ''} ${
@@ -700,15 +699,6 @@ export const CamDebugSettings = () => {
           }
         }}
       />
-      <div>
-        <button
-          onClick={() => {
-            sceneInfra.camControls.resetCameraPosition()
-          }}
-        >
-          Reset Camera Position
-        </button>
-      </div>
       {camSettings.type === 'perspective' && (
         <input
           type="range"
@@ -826,71 +816,6 @@ export const CamDebugSettings = () => {
           </li>
         </ul>
       </div>
-      <div>
-        target
-        <ul className="flex">
-          <li>
-            <span className="pl-2 pr-1">x:</span>
-            <input
-              type="number"
-              step={5}
-              data-testid="cam-x-target"
-              value={camSettings.target[0]}
-              className="text-black w-16"
-              onChange={(e) => {
-                sceneInfra.camControls.setCam({
-                  ...camSettings,
-                  target: [
-                    parseFloat(e.target.value),
-                    camSettings.target[1],
-                    camSettings.target[2],
-                  ],
-                })
-              }}
-            />
-          </li>
-          <li>
-            <span className="pl-2 pr-1">y:</span>
-            <input
-              type="number"
-              step={5}
-              data-testid="cam-y-target"
-              value={camSettings.target[1]}
-              className="text-black w-16"
-              onChange={(e) => {
-                sceneInfra.camControls.setCam({
-                  ...camSettings,
-                  target: [
-                    camSettings.target[0],
-                    parseFloat(e.target.value),
-                    camSettings.target[2],
-                  ],
-                })
-              }}
-            />
-          </li>
-          <li>
-            <span className="pl-2 pr-1">z:</span>
-            <input
-              type="number"
-              step={5}
-              data-testid="cam-z-target"
-              value={camSettings.target[2]}
-              className="text-black w-16"
-              onChange={(e) => {
-                sceneInfra.camControls.setCam({
-                  ...camSettings,
-                  target: [
-                    camSettings.target[0],
-                    camSettings.target[1],
-                    parseFloat(e.target.value),
-                  ],
-                })
-              }}
-            />
-          </li>
-        </ul>
-      </div>
     </div>
   )
 }

src/clientSideScene/sceneEntities.ts

@@ -32,7 +32,9 @@ import {
   SKETCH_GROUP_SEGMENTS,
   SKETCH_LAYER,
   X_AXIS,
+  XZ_PLANE,
   Y_AXIS,
+  YZ_PLANE,
 } from './sceneInfra'
 import { isQuaternionVertical, quaternionFromUpNForward } from './helpers'
 import {
@@ -73,7 +75,7 @@ import {
   changeSketchArguments,
   updateStartProfileAtArgs,
 } from 'lang/std/sketch'
-import { isOverlap, normaliseAngle, roundOff, throttle } from 'lib/utils'
+import { normaliseAngle, roundOff, throttle } from 'lib/utils'
 import {
   createArrayExpression,
   createCallExpressionStdLib,
@@ -83,7 +85,6 @@ import {
   findUniqueName,
 } from 'lang/modifyAst'
 import {
-  Selections,
   getEventForSegmentSelection,
   sendSelectEventToEngine,
 } from 'lib/selections'
@@ -92,10 +93,7 @@ import { createGridHelper, orthoScale, perspScale } from './helpers'
 import { Models } from '@kittycad/lib'
 import { uuidv4 } from 'lib/utils'
 import { SegmentOverlayPayload, SketchDetails } from 'machines/modelingMachine'
-import {
-  ArtifactMapCommand,
-  EngineCommandManager,
-} from 'lang/std/engineConnection'
+import { EngineCommandManager } from 'lang/std/engineConnection'
 import {
   getRectangleCallExpressions,
   updateRectangleSketch,
@@ -301,7 +299,6 @@ export class SceneEntities {
     position,
     maybeModdedAst,
     draftExpressionsIndices,
-    selectionRanges,
   }: {
     sketchPathToNode: PathToNode
     maybeModdedAst: Program
@@ -309,7 +306,6 @@ export class SceneEntities {
     forward: [number, number, number]
     up: [number, number, number]
     position?: [number, number, number]
-    selectionRanges?: Selections
   }): Promise<{
     truncatedAst: Program
     programMemoryOverride: ProgramMemory
@@ -346,8 +342,11 @@ export class SceneEntities {
       pathToNode: sketchPathToNode,
     }
     const dummy = new Mesh()
-    // TODO: When we actually have sketch positions and rotations we can use them here.
-    dummy.position.set(0, 0, 0)
+    dummy.position.set(
+      sketchGroup.position[0],
+      sketchGroup.position[1],
+      sketchGroup.position[2]
+    )
     const orthoFactor = orthoScale(sceneInfra.camControls.camera)
     const factor =
       (sceneInfra.camControls.camera instanceof OrthographicCamera
@@ -399,12 +398,6 @@ export class SceneEntities {
         draftExpressionsIndices &&
         index <= draftExpressionsIndices.end &&
         index >= draftExpressionsIndices.start
-      const isSelected = selectionRanges?.codeBasedSelections.some(
-        (selection) => {
-          return isOverlap(selection.range, segment.__geoMeta.sourceRange)
-        }
-      )
-
       let seg
       const callExpName = getNodeFromPath<CallExpression>(
         maybeModdedAst,
@@ -422,7 +415,6 @@ export class SceneEntities {
           scale: factor,
           texture: sceneInfra.extraSegmentTexture,
           theme: sceneInfra._theme,
-          isSelected,
         })
         callbacks.push(
           this.updateTangentialArcToSegment({
@@ -444,7 +436,6 @@ export class SceneEntities {
           callExpName,
           texture: sceneInfra.extraSegmentTexture,
           theme: sceneInfra._theme,
-          isSelected,
         })
         callbacks.push(
           this.updateStraightSegment({
@@ -768,6 +759,14 @@ export class SceneEntities {
 
           _ast = parse(recast(_ast))
 
+          console.log('onClick', {
+            sketchInit: sketchInit,
+            _ast,
+            x,
+            y,
+            truncatedAst,
+          })
+
           // Update the primary AST and unequip the rectangle tool
           await kclManager.executeAstMock(_ast)
           sceneInfra.modelingSend({ type: 'CancelSketch' })
@@ -1335,6 +1334,13 @@ export class SceneEntities {
         to,
       })
   }
+  async animateAfterSketch() {
+    // if (isReducedMotion()) {
+    //   sceneInfra.camControls.usePerspectiveCamera()
+    //   return
+    // }
+    await sceneInfra.camControls.animateToPerspective()
+  }
   removeSketchGrid() {
     if (this.axisGroup) this.scene.remove(this.axisGroup)
   }
@@ -1398,133 +1404,87 @@ export class SceneEntities {
         selected.material.color = defaultPlaneColor(type)
       },
       onClick: async (args) => {
-        const { streamDimensions } = useStore.getState()
-        const { entity_id } = await sendSelectEventToEngine(
-          args?.mouseEvent,
-          document.getElementById('video-stream') as HTMLVideoElement,
-          streamDimensions
-        )
-
-        let _entity_id = entity_id
-        if (!_entity_id) return
-        if (
-          engineCommandManager.defaultPlanes?.xy === _entity_id ||
-          engineCommandManager.defaultPlanes?.xz === _entity_id ||
-          engineCommandManager.defaultPlanes?.yz === _entity_id ||
-          engineCommandManager.defaultPlanes?.negXy === _entity_id ||
-          engineCommandManager.defaultPlanes?.negXz === _entity_id ||
-          engineCommandManager.defaultPlanes?.negYz === _entity_id
-        ) {
-          const defaultPlaneStrMap: Record<string, DefaultPlaneStr> = {
-            [engineCommandManager.defaultPlanes.xy]: 'XY',
-            [engineCommandManager.defaultPlanes.xz]: 'XZ',
-            [engineCommandManager.defaultPlanes.yz]: 'YZ',
-            [engineCommandManager.defaultPlanes.negXy]: '-XY',
-            [engineCommandManager.defaultPlanes.negXz]: '-XZ',
-            [engineCommandManager.defaultPlanes.negYz]: '-YZ',
+        const checkExtrudeFaceClick = async (): Promise<
+          ['face' | 'plane' | 'other', string]
+        > => {
+          const { streamDimensions } = useStore.getState()
+          const { entity_id } = await sendSelectEventToEngine(
+            args?.mouseEvent,
+            document.getElementById('video-stream') as HTMLVideoElement,
+            streamDimensions
+          )
+          if (!entity_id) return ['other', '']
+          if (
+            engineCommandManager.defaultPlanes?.xy === entity_id ||
+            engineCommandManager.defaultPlanes?.xz === entity_id ||
+            engineCommandManager.defaultPlanes?.yz === entity_id
+          ) {
+            return ['plane', entity_id]
           }
-          // TODO can we get this information from rust land when it creates the default planes?
-          // maybe returned from make_default_planes (src/wasm-lib/src/wasm.rs)
-          let zAxis: [number, number, number] = [0, 0, 1]
-          let yAxis: [number, number, number] = [0, 1, 0]
+          const artifact = this.engineCommandManager.artifactMap[entity_id]
+          if (artifact?.commandType !== 'solid3d_get_extrusion_face_info')
+            return ['other', entity_id]
 
-          // get unit vector from camera position to target
-          const camVector = sceneInfra.camControls.camera.position
-            .clone()
-            .sub(sceneInfra.camControls.target)
-
-          if (engineCommandManager.defaultPlanes?.xy === _entity_id) {
-            zAxis = [0, 0, 1]
-            yAxis = [0, 1, 0]
-            if (camVector.z < 0) {
-              zAxis = [0, 0, -1]
-              _entity_id = engineCommandManager.defaultPlanes?.negXy || ''
-            }
-          } else if (engineCommandManager.defaultPlanes?.yz === _entity_id) {
-            zAxis = [1, 0, 0]
-            yAxis = [0, 0, 1]
-            if (camVector.x < 0) {
-              zAxis = [-1, 0, 0]
-              _entity_id = engineCommandManager.defaultPlanes?.negYz || ''
-            }
-          } else if (engineCommandManager.defaultPlanes?.xz === _entity_id) {
-            zAxis = [0, 1, 0]
-            yAxis = [0, 0, 1]
-            _entity_id = engineCommandManager.defaultPlanes?.negXz || ''
-            if (camVector.y < 0) {
-              zAxis = [0, -1, 0]
-              _entity_id = engineCommandManager.defaultPlanes?.xz || ''
-            }
-          }
+          const faceInfo = await getFaceDetails(entity_id)
+          if (!faceInfo?.origin || !faceInfo?.z_axis || !faceInfo?.y_axis)
+            return ['other', entity_id]
+          const { z_axis, y_axis, origin } = faceInfo
+          const pathToNode = getNodePathFromSourceRange(
+            kclManager.ast,
+            artifact.range
+          )
 
           sceneInfra.modelingSend({
             type: 'Select default plane',
             data: {
-              type: 'defaultPlane',
-              planeId: _entity_id,
-              plane: defaultPlaneStrMap[_entity_id],
-              zAxis,
-              yAxis,
+              type: 'extrudeFace',
+              zAxis: [z_axis.x, z_axis.y, z_axis.z],
+              yAxis: [y_axis.x, y_axis.y, y_axis.z],
+              position: [origin.x, origin.y, origin.z].map(
+                (num) => num / sceneInfra._baseUnitMultiplier
+              ) as [number, number, number],
+              extrudeSegmentPathToNode: pathToNode,
+              cap:
+                artifact?.additionalData?.type === 'cap'
+                  ? artifact.additionalData.info
+                  : 'none',
+              faceId: entity_id,
             },
           })
-          return
+          return ['face', entity_id]
         }
-        const artifact = this.engineCommandManager.artifactMap[_entity_id]
-        // If we clicked on an extrude wall, we climb up the parent Id
-        // to get the sketch profile's face ID. If we clicked on an endcap,
-        // we already have it.
-        const targetId =
-          'additionalData' in artifact &&
-          artifact.additionalData?.type === 'cap'
-            ? _entity_id
-            : artifact.parentId
 
-        // tsc cannot infer that target can have extrusions
-        // from the commandType (why?) so we need to cast it
-        const target = this.engineCommandManager.artifactMap?.[
-          targetId || ''
-        ] as ArtifactMapCommand & { extrusions?: string[] }
-
-        // TODO: We get the first extrusion command ID,
-        // which is fine while backend systems only support one extrusion.
-        // but we need to more robustly handle resolving to the correct extrusion
-        // if there are multiple.
-        const extrusions =
-          this.engineCommandManager.artifactMap?.[target?.extrusions?.[0] || '']
-
-        if (artifact?.commandType !== 'solid3d_get_extrusion_face_info') return
-
-        const faceInfo = await getFaceDetails(_entity_id)
-        if (!faceInfo?.origin || !faceInfo?.z_axis || !faceInfo?.y_axis) return
-        const { z_axis, y_axis, origin } = faceInfo
-        const sketchPathToNode = getNodePathFromSourceRange(
-          kclManager.ast,
-          artifact.range
-        )
-
-        const extrudePathToNode = extrusions?.range
-          ? getNodePathFromSourceRange(kclManager.ast, extrusions.range)
-          : []
+        const faceResult = await checkExtrudeFaceClick()
+        console.log('faceResult', faceResult)
+        if (faceResult[0] === 'face') return
 
+        if (!args || !args.intersects?.[0]) return
+        if (args.mouseEvent.which !== 1) return
+        const { intersects } = args
+        const type = intersects?.[0].object.name || ''
+        const posNorm = Number(intersects?.[0]?.normal?.z) > 0
+        let planeString: DefaultPlaneStr = posNorm ? 'XY' : '-XY'
+        let zAxis: [number, number, number] = posNorm ? [0, 0, 1] : [0, 0, -1]
+        let yAxis: [number, number, number] = [0, 1, 0]
+        if (type === YZ_PLANE) {
+          planeString = posNorm ? 'YZ' : '-YZ'
+          zAxis = posNorm ? [1, 0, 0] : [-1, 0, 0]
+          yAxis = [0, 0, 1]
+        } else if (type === XZ_PLANE) {
+          planeString = posNorm ? '-XZ' : 'XZ'
+          zAxis = posNorm ? [0, 1, 0] : [0, -1, 0]
+          yAxis = [0, 0, 1]
+        }
         sceneInfra.modelingSend({
           type: 'Select default plane',
           data: {
-            type: 'extrudeFace',
-            zAxis: [z_axis.x, z_axis.y, z_axis.z],
-            yAxis: [y_axis.x, y_axis.y, y_axis.z],
-            position: [origin.x, origin.y, origin.z].map(
-              (num) => num / sceneInfra._baseUnitMultiplier
-            ) as [number, number, number],
-            sketchPathToNode,
-            extrudePathToNode,
-            cap:
-              artifact?.additionalData?.type === 'cap'
-                ? artifact.additionalData.info
-                : 'none',
-            faceId: _entity_id,
+            type: 'defaultPlane',
+            plane: planeString,
+            zAxis,
+            yAxis,
+            planeId: faceResult[1],
           },
         })
-        return
       },
     })
   }
@@ -1774,11 +1734,7 @@ export function sketchGroupFromPathToNode({
     pathToNode,
     'VariableDeclarator'
   ).node
-  const result = programMemory.root[varDec?.id?.name || '']
-  if (result?.type === 'ExtrudeGroup') {
-    return result.sketchGroup
-  }
-  return result as SketchGroup
+  return programMemory.root[varDec?.id?.name || ''] as SketchGroup
 }
 
 function colorSegment(object: any, color: number) {
@@ -1814,7 +1770,7 @@ export function getSketchQuaternion(
     ast: kclManager.ast,
     programMemory: kclManager.programMemory,
   })
-  const zAxis = sketchGroup?.on.zAxis || sketchNormalBackUp
+  const zAxis = sketchGroup?.zAxis || sketchNormalBackUp
   return getQuaternionFromZAxis(massageFormats(zAxis))
 }
 export async function getSketchOrientationDetails(
@@ -1829,24 +1785,20 @@ export async function getSketchOrientationDetails(
     programMemory: kclManager.programMemory,
   })
   if (sketchGroup.on.type === 'plane') {
-    const zAxis = sketchGroup?.on.zAxis
+    const zAxis = sketchGroup?.zAxis
     return {
       quat: getQuaternionFromZAxis(massageFormats(zAxis)),
       sketchDetails: {
         sketchPathToNode,
         zAxis: [zAxis.x, zAxis.y, zAxis.z],
-        yAxis: [
-          sketchGroup.on.yAxis.x,
-          sketchGroup.on.yAxis.y,
-          sketchGroup.on.yAxis.z,
-        ],
+        yAxis: [sketchGroup.yAxis.x, sketchGroup.yAxis.y, sketchGroup.yAxis.z],
         origin: [0, 0, 0],
         faceId: sketchGroup.on.id,
       },
     }
   }
   if (sketchGroup.on.type === 'face') {
-    const faceInfo = await getFaceDetails(sketchGroup.on.id)
+    const faceInfo = await getFaceDetails(sketchGroup.on.faceId)
 
     if (!faceInfo?.origin || !faceInfo?.z_axis || !faceInfo?.y_axis)
       throw new Error('faceInfo')
@@ -1862,7 +1814,7 @@ export async function getSketchOrientationDetails(
         zAxis: [z_axis.x, z_axis.y, z_axis.z],
         yAxis: [y_axis.x, y_axis.y, y_axis.z],
         origin: [origin.x, origin.y, origin.z],
-        faceId: sketchGroup.on.id,
+        faceId: sketchGroup.on.faceId,
       },
     }
   }

src/clientSideScene/segments.ts

@@ -45,21 +45,18 @@ export function profileStart({
   pathToNode,
   scale = 1,
   theme,
-  isSelected,
 }: {
   from: Coords2d
   id: string
   pathToNode: PathToNode
   scale?: number
   theme: Themes
-  isSelected?: boolean
 }) {
   const group = new Group()
 
   const geometry = new BoxGeometry(12, 12, 12) // in pixels scaled later
   const baseColor = getThemeColorForThreeJs(theme)
-  const color = isSelected ? 0x0000ff : baseColor
-  const body = new MeshBasicMaterial({ color })
+  const body = new MeshBasicMaterial({ color: baseColor })
   const mesh = new Mesh(geometry, body)
 
   group.add(mesh)
@@ -69,8 +66,7 @@ export function profileStart({
     id,
     from,
     pathToNode,
-    isSelected,
-    baseColor,
+    isSelected: false,
   }
   group.name = PROFILE_START
   group.position.set(from[0], from[1], 0)
@@ -88,7 +84,6 @@ export function straightSegment({
   callExpName,
   texture,
   theme,
-  isSelected = false,
 }: {
   from: Coords2d
   to: Coords2d
@@ -99,7 +94,6 @@ export function straightSegment({
   callExpName: string
   texture: Texture
   theme: Themes
-  isSelected?: boolean
 }): Group {
   const group = new Group()
 
@@ -125,8 +119,7 @@ export function straightSegment({
 
   const baseColor =
     callExpName === 'close' ? 0x444444 : getThemeColorForThreeJs(theme)
-  const color = isSelected ? 0x0000ff : baseColor
-  const body = new MeshBasicMaterial({ color })
+  const body = new MeshBasicMaterial({ color: baseColor })
   const mesh = new Mesh(geometry, body)
   mesh.userData.type = isDraftSegment
     ? STRAIGHT_SEGMENT_DASH
@@ -139,7 +132,7 @@ export function straightSegment({
     from,
     to,
     pathToNode,
-    isSelected,
+    isSelected: false,
     callExpName,
     baseColor,
   }
@@ -148,7 +141,7 @@ export function straightSegment({
   const length = Math.sqrt(
     Math.pow(to[0] - from[0], 2) + Math.pow(to[1] - from[1], 2)
   )
-  const arrowGroup = createArrowhead(scale, theme, color)
+  const arrowGroup = createArrowhead(scale, theme)
   arrowGroup.position.set(to[0], to[1], 0)
   const dir = new Vector3()
     .subVectors(new Vector3(to[0], to[1], 0), new Vector3(from[0], from[1], 0))
@@ -176,10 +169,9 @@ export function straightSegment({
   return group
 }
 
-function createArrowhead(scale = 1, theme: Themes, color?: number): Group {
-  const baseColor = getThemeColorForThreeJs(theme)
+function createArrowhead(scale = 1, theme: Themes): Group {
   const arrowMaterial = new MeshBasicMaterial({
-    color: color || baseColor,
+    color: getThemeColorForThreeJs(theme),
   })
   // specify the size of the geometry in pixels (i.e. cone height = 20px, cone radius = 4.5px)
   // we'll scale the group to the correct size later to match these sizes in screen space
@@ -240,7 +232,6 @@ export function tangentialArcToSegment({
   scale = 1,
   texture,
   theme,
-  isSelected,
 }: {
   prevSegment: SketchGroup['value'][number]
   from: Coords2d
@@ -251,7 +242,6 @@ export function tangentialArcToSegment({
   scale?: number
   texture: Texture
   theme: Themes
-  isSelected?: boolean
 }): Group {
   const group = new Group()
 
@@ -283,8 +273,7 @@ export function tangentialArcToSegment({
   })
 
   const baseColor = getThemeColorForThreeJs(theme)
-  const color = isSelected ? 0x0000ff : baseColor
-  const body = new MeshBasicMaterial({ color })
+  const body = new MeshBasicMaterial({ color: baseColor })
   const mesh = new Mesh(geometry, body)
   mesh.userData.type = isDraftSegment
     ? TANGENTIAL_ARC_TO__SEGMENT_DASH
@@ -297,12 +286,12 @@ export function tangentialArcToSegment({
     to,
     prevSegment,
     pathToNode,
-    isSelected,
+    isSelected: false,
     baseColor,
   }
   group.name = TANGENTIAL_ARC_TO_SEGMENT
 
-  const arrowGroup = createArrowhead(scale, theme, color)
+  const arrowGroup = createArrowhead(scale, theme)
   arrowGroup.position.set(to[0], to[1], 0)
   const arrowheadAngle = endAngle + (Math.PI / 2) * (ccw ? 1 : -1)
   arrowGroup.quaternion.setFromUnitVectors(

src/components/CommandBar/CommandBar.tsx

@@ -6,8 +6,6 @@ import CommandComboBox from '../CommandComboBox'
 import CommandBarReview from './CommandBarReview'
 import { useLocation } from 'react-router-dom'
 import useHotkeyWrapper from 'lib/hotkeyWrapper'
-import { CustomIcon } from 'components/CustomIcon'
-import Tooltip from 'components/Tooltip'
 
 export const CommandBar = () => {
   const { pathname } = useLocation()
@@ -105,7 +103,7 @@ export const CommandBar = () => {
           leaveTo="opacity-0 scale-95"
         >
           <WrapperComponent.Panel
-            className="relative z-50 pointer-events-auto w-full max-w-xl py-2 mx-auto border rounded rounded-tl-none shadow-lg bg-chalkboard-10 dark:bg-chalkboard-100 dark:border-chalkboard-70"
+            className="relative z-50 pointer-events-auto w-full max-w-xl py-2 mx-auto border rounded shadow-lg bg-chalkboard-10 dark:bg-chalkboard-100 dark:border-chalkboard-70"
             as="div"
             data-testid="command-bar"
           >
@@ -118,19 +116,6 @@ export const CommandBar = () => {
                 <CommandBarReview stepBack={stepBack} />
               )
             )}
-            <button
-              onClick={() => commandBarSend({ type: 'Close' })}
-              className="group block !absolute left-auto right-full top-[-3px] m-2.5 p-0 border-none bg-transparent hover:bg-transparent"
-            >
-              <CustomIcon
-                name="close"
-                className="w-5 h-5 rounded-sm bg-destroy-10 text-destroy-80 dark:bg-destroy-80 dark:text-destroy-10 group-hover:brightness-110"
-              />
-              <Tooltip position="bottom" delay={500}>
-                Cancel{' '}
-                <kbd className="hotkey ml-4 dark:!bg-chalkboard-80">esc</kbd>
-              </Tooltip>
-            </button>
           </WrapperComponent.Panel>
         </Transition.Child>
       </WrapperComponent>

src/components/CommandBar/CommandBarSelectionInput.tsx

@@ -7,8 +7,10 @@ import {
   getSelectionType,
   getSelectionTypeDisplayText,
 } from 'lib/selections'
+import { kclManager } from 'lib/singletons'
 import { modelingMachine } from 'machines/modelingMachine'
 import { useCallback, useEffect, useRef, useState } from 'react'
+import { useHotkeys } from 'react-hotkeys-hook'
 import { StateFrom } from 'xstate'
 
 const selectionSelector = (snapshot: StateFrom<typeof modelingMachine>) =>
@@ -39,10 +41,24 @@ function CommandBarSelectionInput({
     canSubmitSelectionArg(selectionsByType, arg)
   )
 
+  useHotkeys('tab', () => onSubmit(selection), {
+    enableOnFormTags: true,
+    enableOnContentEditable: true,
+    keyup: true,
+  })
+
   useEffect(() => {
     inputRef.current?.focus()
   }, [selection, inputRef])
 
+  // Exit engine's edit mode when this input step is active,
+  // and re-enter it when it's not.
+  // In future the engine's edit mode will go away and this will be handled differently.
+  useEffect(() => {
+    kclManager.exitEditMode()
+    return () => kclManager.defaultSelectionFilter()
+  }, [])
+
   // Fast-forward through this arg if it's marked as skippable
   // and we have a valid selection already
   useEffect(() => {

src/components/ContextMenu.tsx

@@ -1,199 +0,0 @@
-import toast from 'react-hot-toast'
-import { ActionIcon, ActionIconProps } from './ActionIcon'
-import { RefObject, useEffect, useMemo, useRef, useState } from 'react'
-import { useHotkeys } from 'react-hotkeys-hook'
-import { Dialog } from '@headlessui/react'
-
-interface ContextMenuProps
-  extends Omit<React.HTMLAttributes<HTMLUListElement>, 'children'> {
-  items?: React.ReactElement[]
-  menuTargetElement?: RefObject<HTMLElement>
-}
-
-const DefaultContextMenuItems = [
-  <ContextMenuItemRefresh />,
-  <ContextMenuItemCopy />,
-  // add more default context menu items here
-]
-
-export function ContextMenu({
-  items = DefaultContextMenuItems,
-  menuTargetElement,
-  className,
-  ...props
-}: ContextMenuProps) {
-  const dialogRef = useRef<HTMLDivElement>(null)
-  const [open, setOpen] = useState(false)
-  const [windowSize, setWindowSize] = useState({
-    width: globalThis?.window?.innerWidth,
-    height: globalThis?.window?.innerHeight,
-  })
-  const [position, setPosition] = useState({ x: 0, y: 0 })
-  useHotkeys('esc', () => setOpen(false), {
-    enabled: open,
-  })
-
-  const dialogPositionStyle = useMemo(() => {
-    if (!dialogRef.current)
-      return {
-        top: 0,
-        left: 0,
-        right: 'auto',
-        bottom: 'auto',
-      }
-
-    return {
-      top:
-        position.y + dialogRef.current.clientHeight > windowSize.height
-          ? 'auto'
-          : position.y,
-      left:
-        position.x + dialogRef.current.clientWidth > windowSize.width
-          ? 'auto'
-          : position.x,
-      right:
-        position.x + dialogRef.current.clientWidth > windowSize.width
-          ? windowSize.width - position.x
-          : 'auto',
-      bottom:
-        position.y + dialogRef.current.clientHeight > windowSize.height
-          ? windowSize.height - position.y
-          : 'auto',
-    }
-  }, [position, windowSize, dialogRef.current])
-
-  // Listen for window resize to update context menu position
-  useEffect(() => {
-    const handleResize = () => {
-      setWindowSize({
-        width: globalThis?.window?.innerWidth,
-        height: globalThis?.window?.innerHeight,
-      })
-    }
-    globalThis?.window?.addEventListener('resize', handleResize)
-    return () => {
-      globalThis?.window?.removeEventListener('resize', handleResize)
-    }
-  }, [])
-
-  // Add context menu listener to target once mounted
-  useEffect(() => {
-    const handleContextMenu = (e: MouseEvent) => {
-      console.log('context menu', e)
-      e.preventDefault()
-      setPosition({ x: e.x, y: e.y })
-      setOpen(true)
-    }
-    menuTargetElement?.current?.addEventListener(
-      'contextmenu',
-      handleContextMenu
-    )
-    return () => {
-      menuTargetElement?.current?.removeEventListener(
-        'contextmenu',
-        handleContextMenu
-      )
-    }
-  }, [menuTargetElement?.current])
-
-  return (
-    <Dialog open={open} onClose={() => setOpen(false)}>
-      <div
-        className="fixed inset-0 z-50 w-screen h-screen"
-        onContextMenu={(e) => e.preventDefault()}
-      >
-        <Dialog.Backdrop className="fixed z-10 inset-0" />
-        <Dialog.Panel
-          ref={dialogRef}
-          className={`w-48 fixed bg-chalkboard-10 dark:bg-chalkboard-90
-          border border-solid border-chalkboard-10 dark:border-chalkboard-90 rounded
-          shadow-lg backdrop:fixed backdrop:inset-0 backdrop:bg-primary ${className}`}
-          style={{
-            ...dialogPositionStyle,
-            ...props.style,
-          }}
-        >
-          <ul
-            {...props}
-            className="relative flex flex-col gap-0.5 items-stretch content-stretch"
-            onClick={() => setOpen(false)}
-          >
-            {...items}
-          </ul>
-        </Dialog.Panel>
-      </div>
-    </Dialog>
-  )
-}
-
-export function ContextMenuDivider() {
-  return <hr className="border-chalkboard-20 dark:border-chalkboard-80" />
-}
-
-interface ContextMenuItemProps {
-  children: React.ReactNode
-  icon?: ActionIconProps['icon']
-  onClick?: () => void
-  hotkey?: string
-}
-
-export function ContextMenuItem({
-  children,
-  icon,
-  onClick,
-  hotkey,
-}: ContextMenuItemProps) {
-  return (
-    <button
-      className="flex items-center gap-2 py-1 px-2 cursor-pointer hover:bg-chalkboard-20 dark:hover:bg-chalkboard-80 border-none text-left"
-      onClick={onClick}
-    >
-      {icon && <ActionIcon icon={icon} bgClassName="!bg-transparent" />}
-      <div className="flex-1">{children}</div>
-      {hotkey && (
-        <kbd className="px-1.5 py-0.5 rounded bg-primary/10 text-primary dark:bg-chalkboard-80 dark:text-chalkboard-40">
-          {hotkey}
-        </kbd>
-      )}
-    </button>
-  )
-}
-
-export function ContextMenuItemRefresh() {
-  return (
-    <ContextMenuItem
-      icon="arrowRotateRight"
-      onClick={() => globalThis?.window?.location.reload()}
-    >
-      Refresh
-    </ContextMenuItem>
-  )
-}
-
-interface ContextMenuItemCopyProps {
-  toBeCopiedContent?: string
-  toBeCopiedLabel?: string
-}
-
-export function ContextMenuItemCopy({
-  toBeCopiedContent = globalThis.window?.getSelection()?.toString(),
-  toBeCopiedLabel = 'selection',
-}: ContextMenuItemCopyProps) {
-  return (
-    <ContextMenuItem
-      icon="clipboardPlus"
-      onClick={() => {
-        if (toBeCopiedContent) {
-          globalThis?.navigator?.clipboard
-            .writeText(toBeCopiedContent)
-            .then(() => toast.success(`Copied ${toBeCopiedLabel} to clipboard`))
-            .catch(() =>
-              toast.error(`Failed to copy ${toBeCopiedLabel} to clipboard`)
-            )
-        }
-      }}
-    >
-      Copy
-    </ContextMenuItem>
-  )
-}

src/components/CustomIcon.tsx

@@ -71,16 +71,6 @@ const CustomIconMap = {
       />
     </svg>
   ),
-  bug: (
-    <svg viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-      <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M10.8209 5.99884C10.6403 5.73962 10.3399 5.57001 10 5.57001C9.65984 5.57001 9.35936 5.73984 9.17871 5.99935C9.43724 5.95129 9.71142 5.92578 10.0012 5.92578C10.29 5.92578 10.5633 5.95111 10.8209 5.99884ZM10 4.57001C8.9459 4.57001 8.08227 5.38548 8.00554 6.41997C7.58916 6.65398 7.23724 6.95989 6.95014 7.31304L5.85355 6.21645L5.14645 6.92356L6.40931 8.18642C6.20774 8.62503 6.08043 9.09624 6.0278 9.57001H5V10.57H6.01946C6.06396 11.1581 6.1867 11.8173 6.4071 12.4558L5.14645 13.7165L5.85355 14.4236L6.8408 13.4363C7.46354 14.555 8.47307 15.4258 10.0012 15.4258C11.529 15.4258 12.5378 14.5554 13.16 13.4371L14.1464 14.4236L14.8536 13.7165L13.5934 12.4563C13.8136 11.8177 13.9362 11.1583 13.9806 10.57H15V9.57001H13.9722C13.9197 9.0961 13.7925 8.62474 13.5911 8.18602L14.8536 6.92356L14.1464 6.21645L13.0505 7.31239C12.7633 6.95894 12.4112 6.65285 11.9944 6.41883C11.9171 5.38488 11.0537 4.57001 10 4.57001ZM10.5 14.3801V8.57001H9.5V14.3796C8.72105 14.2298 8.15885 13.7245 7.7428 12.9999C7.22316 12.095 7 10.937 7 10.07C7 8.46381 8.04281 6.92578 10.0012 6.92578C11.9589 6.92578 13 8.4629 13 10.07C13 10.9373 12.7773 12.0954 12.2582 13.0003C11.8422 13.7254 11.2799 14.2309 10.5 14.3801Z"
-        fill="currentColor"
-      />
-    </svg>
-  ),
   checkmark: (
     <svg viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
       <path
@@ -267,14 +257,6 @@ const CustomIconMap = {
       />
     </svg>
   ),
-  keyboard: (
-    <svg viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-      <path
-        d="M16 12V15H13.5M16 12V9M16 12H13.5M4 12V15H6.5M4 12V9M4 12H6.5M4 9V6H6.5M4 9H6.5M16 9V6H13.5M16 9H13.5M6.5 12V15M6.5 12H7.5M6.5 15H13.5M13.5 15V12M13.5 12H12.5M7.5 12V9M7.5 12H10M7.5 9H8.75M7.5 9H6.5M10 12V9M10 12H12.5M10 9H11.25M10 9H8.75M12.5 12V9M12.5 9H13.5M12.5 9H11.25M13.5 9V6M13.5 6H11.25M11.25 9V6M11.25 6H8.75M8.75 9V6M8.75 6H6.5M6.5 9V6"
-        stroke="currentColor"
-      />
-    </svg>
-  ),
   line: (
     <svg viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
       <path

src/components/FileTree.tsx

@@ -18,8 +18,6 @@ import { useLspContext } from './LspProvider'
 import useHotkeyWrapper from 'lib/hotkeyWrapper'
 import { useModelingContext } from 'hooks/useModelingContext'
 import { DeleteConfirmationDialog } from './ProjectCard/DeleteProjectDialog'
-import { ContextMenu, ContextMenuItem } from './ContextMenu'
-import usePlatform from 'hooks/usePlatform'
 
 function getIndentationCSS(level: number) {
   return `calc(1rem * ${level + 1})`
@@ -127,7 +125,6 @@ const FileTreeItem = ({
   const navigate = useNavigate()
   const [isConfirmingDelete, setIsConfirmingDelete] = useState(false)
   const isCurrentFile = fileOrDir.path === currentFile?.path
-  const itemRef = useRef(null)
 
   const isRenaming = fileContext.itemsBeingRenamed.includes(fileOrDir.path)
   const removeCurrentItemFromRenaming = useCallback(
@@ -188,7 +185,7 @@ const FileTreeItem = ({
   }
 
   return (
-    <div className="contents" ref={itemRef}>
+    <>
       {fileOrDir.children === undefined ? (
         <li
           className={
@@ -324,41 +321,7 @@ const FileTreeItem = ({
           setIsOpen={setIsConfirmingDelete}
         />
       )}
-      <FileTreeContextMenu
-        itemRef={itemRef}
-        onRename={addCurrentItemToRenaming}
-        onDelete={() => setIsConfirmingDelete(true)}
-      />
-    </div>
-  )
-}
-
-interface FileTreeContextMenuProps {
-  itemRef: React.RefObject<HTMLElement>
-  onRename: () => void
-  onDelete: () => void
-}
-
-function FileTreeContextMenu({
-  itemRef,
-  onRename,
-  onDelete,
-}: FileTreeContextMenuProps) {
-  const platform = usePlatform()
-  const metaKey = platform === 'macos' ? '⌘' : 'Ctrl'
-
-  return (
-    <ContextMenu
-      menuTargetElement={itemRef}
-      items={[
-        <ContextMenuItem onClick={onRename} hotkey="Enter">
-          Rename
-        </ContextMenuItem>,
-        <ContextMenuItem onClick={onDelete} hotkey={metaKey + ' + Del'}>
-          Delete
-        </ContextMenuItem>,
-      ]}
-    />
+    </>
   )
 }