Update rust/kcl-lib/src/execution/memory.rs

Co-authored-by: Jonathan Tran <jonnytran@gmail.com>

.github/workflows/e2e-tests.yml

@@ -229,6 +229,10 @@ jobs:
           timeout_minutes: 30
           max_attempts: 3
         env:
+          CI: true
+          NODE_ENV: development
+          VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
+          VITE_KC_SKIP_AUTH: true
           token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
           snapshottoken: ${{ secrets.KITTYCAD_API_TOKEN }}
 
@@ -373,7 +377,11 @@ jobs:
           timeout_minutes: 45
           max_attempts: 15
         env:
+          CI: true
           FAIL_ON_CONSOLE_ERRORS: true
+          NODE_ENV: development
+          VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
+          VITE_KC_SKIP_AUTH: true
           token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
 
       - uses: actions/upload-artifact@v4

docs/kcl/consts.md

@@ -9,9 +9,13 @@ layout: manual
 
 ### `std`
 
+- [`HALF_TURN`](/docs/kcl/consts/std-HALF_TURN)
+- [`QUARTER_TURN`](/docs/kcl/consts/std-QUARTER_TURN)
+- [`THREE_QUARTER_TURN`](/docs/kcl/consts/std-THREE_QUARTER_TURN)
 - [`XY`](/docs/kcl/consts/std-XY)
 - [`XZ`](/docs/kcl/consts/std-XZ)
 - [`YZ`](/docs/kcl/consts/std-YZ)
+- [`ZERO`](/docs/kcl/consts/std-ZERO)
 
 ### `std::math`
 
@@ -19,10 +23,3 @@ layout: manual
 - [`PI`](/docs/kcl/consts/std-math-PI)
 - [`TAU`](/docs/kcl/consts/std-math-TAU)
 
-### `std::turns`
-
-- [`HALF_TURN`](/docs/kcl/consts/std-turns-HALF_TURN)
-- [`QUARTER_TURN`](/docs/kcl/consts/std-turns-QUARTER_TURN)
-- [`THREE_QUARTER_TURN`](/docs/kcl/consts/std-turns-THREE_QUARTER_TURN)
-- [`ZERO`](/docs/kcl/consts/std-turns-ZERO)
-

docs/kcl/consts/std-HALF_TURN.md

@@ -0,0 +1,15 @@
+---
+title: "std::HALF_TURN"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+```js
+std::HALF_TURN: number(deg) = 180deg
+```
+
+

docs/kcl/consts/std-QUARTER_TURN.md

@@ -0,0 +1,15 @@
+---
+title: "std::QUARTER_TURN"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+```js
+std::QUARTER_TURN: number(deg) = 90deg
+```
+
+

docs/kcl/consts/std-THREE_QUARTER_TURN.md

@@ -0,0 +1,15 @@
+---
+title: "std::THREE_QUARTER_TURN"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+```js
+std::THREE_QUARTER_TURN: number(deg) = 270deg
+```
+
+

docs/kcl/consts/std-ZERO.md

@@ -0,0 +1,15 @@
+---
+title: "std::ZERO"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+```js
+std::ZERO: number = 0
+```
+
+

docs/kcl/consts/std-turns-HALF_TURN.md

@@ -1,15 +0,0 @@
----
-title: "std::turns::HALF_TURN"
-excerpt: ""
-layout: manual
----
-
-
-
-
-
-```js
-std::turns::HALF_TURN: number(deg) = 180deg
-```
-
-

docs/kcl/consts/std-turns-QUARTER_TURN.md

@@ -1,15 +0,0 @@
----
-title: "std::turns::QUARTER_TURN"
-excerpt: ""
-layout: manual
----
-
-
-
-
-
-```js
-std::turns::QUARTER_TURN: number(deg) = 90deg
-```
-
-

docs/kcl/consts/std-turns-THREE_QUARTER_TURN.md

@@ -1,15 +0,0 @@
----
-title: "std::turns::THREE_QUARTER_TURN"
-excerpt: ""
-layout: manual
----
-
-
-
-
-
-```js
-std::turns::THREE_QUARTER_TURN: number(deg) = 270deg
-```
-
-

docs/kcl/consts/std-turns-ZERO.md

@@ -1,15 +0,0 @@
----
-title: "std::turns::ZERO"
-excerpt: ""
-layout: manual
----
-
-
-
-
-
-```js
-std::turns::ZERO: number = 0
-```
-
-

docs/kcl/index.md

@@ -23,15 +23,19 @@ layout: manual
   * [`tag`](kcl/types/tag)
 * **std**
   * [`Face`](kcl/types/Face)
+  * [`HALF_TURN`](kcl/consts/std-HALF_TURN)
   * [`Helix`](kcl/types/Helix)
   * [`Plane`](kcl/types/Plane)
   * [`Point2d`](kcl/types/Point2d)
   * [`Point3d`](kcl/types/Point3d)
+  * [`QUARTER_TURN`](kcl/consts/std-QUARTER_TURN)
   * [`Sketch`](kcl/types/Sketch)
   * [`Solid`](kcl/types/Solid)
+  * [`THREE_QUARTER_TURN`](kcl/consts/std-THREE_QUARTER_TURN)
   * [`XY`](kcl/consts/std-XY)
   * [`XZ`](kcl/consts/std-XZ)
   * [`YZ`](kcl/consts/std-YZ)
+  * [`ZERO`](kcl/consts/std-ZERO)
   * [`abs`](kcl/abs)
   * [`acos`](kcl/acos)
   * [`angleToMatchLengthX`](kcl/angleToMatchLengthX)
@@ -142,8 +146,3 @@ layout: manual
   * [`tan`](kcl/std-math-tan)
 * **std::sketch**
   * [`circle`](kcl/std-sketch-circle)
-* **std::turns**
-  * [`turns::HALF_TURN`](kcl/consts/std-turns-HALF_TURN)
-  * [`turns::QUARTER_TURN`](kcl/consts/std-turns-QUARTER_TURN)
-  * [`turns::THREE_QUARTER_TURN`](kcl/consts/std-turns-THREE_QUARTER_TURN)
-  * [`turns::ZERO`](kcl/consts/std-turns-ZERO)

docs/kcl/std-sketch-circle.md

@@ -17,7 +17,7 @@ circle(@sketch_or_surface: Sketch | Plane | Face, center: Point2d, radius: numbe
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `sketch_or_surface` | [`Sketch`](/docs/kcl/types/Sketch) OR [`Plane`](/docs/kcl/types/Plane) OR [`Face`](/docs/kcl/types/Face) | Sketch to extend, or plane or surface to sketch on. | Yes |
+| `sketch_or_surface` | [`Sketch`](/docs/kcl/types/Sketch) `|` [`Plane`](/docs/kcl/types/Face) `|` [`Plane`](/docs/kcl/types/Face) | Sketch to extend, or plane or surface to sketch on. | Yes |
 | `center` | [`Point2d`](/docs/kcl/types/Point2d) | The center of the circle. | Yes |
 | `radius` | [`number`](/docs/kcl/types/number) | The radius of the circle. | Yes |
 | [`tag`](/docs/kcl/types/tag) | [`tag`](/docs/kcl/types/tag) | Create a new tag which refers to this circle. | No |

docs/kcl/std.json

@@ -207302,8 +207302,372 @@
           },
           "definitions": {
             "TyF64": {
+              "type": "object",
+              "required": [
+                "n",
+                "ty"
+              ],
+              "properties": {
+                "n": {
                   "type": "number",
                   "format": "double"
+                },
+                "ty": {
+                  "$ref": "#/components/schemas/NumericType"
+                }
+              }
+            },
+            "NumericType": {
+              "oneOf": [
+                {
+                  "type": "object",
+                  "oneOf": [
+                    {
+                      "type": "object",
+                      "required": [
+                        "type"
+                      ],
+                      "properties": {
+                        "type": {
+                          "type": "string",
+                          "enum": [
+                            "Count"
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "description": "A unit of length.",
+                      "type": "object",
+                      "oneOf": [
+                        {
+                          "type": "object",
+                          "required": [
+                            "type"
+                          ],
+                          "properties": {
+                            "type": {
+                              "type": "string",
+                              "enum": [
+                                "Mm"
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "type": "object",
+                          "required": [
+                            "type"
+                          ],
+                          "properties": {
+                            "type": {
+                              "type": "string",
+                              "enum": [
+                                "Cm"
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "type": "object",
+                          "required": [
+                            "type"
+                          ],
+                          "properties": {
+                            "type": {
+                              "type": "string",
+                              "enum": [
+                                "M"
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "type": "object",
+                          "required": [
+                            "type"
+                          ],
+                          "properties": {
+                            "type": {
+                              "type": "string",
+                              "enum": [
+                                "Inches"
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "type": "object",
+                          "required": [
+                            "type"
+                          ],
+                          "properties": {
+                            "type": {
+                              "type": "string",
+                              "enum": [
+                                "Feet"
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "type": "object",
+                          "required": [
+                            "type"
+                          ],
+                          "properties": {
+                            "type": {
+                              "type": "string",
+                              "enum": [
+                                "Yards"
+                              ]
+                            }
+                          }
+                        }
+                      ],
+                      "required": [
+                        "type"
+                      ],
+                      "properties": {
+                        "type": {
+                          "type": "string",
+                          "enum": [
+                            "Length"
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "description": "A unit of angle.",
+                      "type": "object",
+                      "oneOf": [
+                        {
+                          "type": "object",
+                          "required": [
+                            "type"
+                          ],
+                          "properties": {
+                            "type": {
+                              "type": "string",
+                              "enum": [
+                                "Degrees"
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "type": "object",
+                          "required": [
+                            "type"
+                          ],
+                          "properties": {
+                            "type": {
+                              "type": "string",
+                              "enum": [
+                                "Radians"
+                              ]
+                            }
+                          }
+                        }
+                      ],
+                      "required": [
+                        "type"
+                      ],
+                      "properties": {
+                        "type": {
+                          "type": "string",
+                          "enum": [
+                            "Angle"
+                          ]
+                        }
+                      }
+                    }
+                  ],
+                  "required": [
+                    "type"
+                  ],
+                  "properties": {
+                    "type": {
+                      "type": "string",
+                      "enum": [
+                        "Known"
+                      ]
+                    }
+                  }
+                },
+                {
+                  "type": "object",
+                  "required": [
+                    "angle",
+                    "len",
+                    "type"
+                  ],
+                  "properties": {
+                    "type": {
+                      "type": "string",
+                      "enum": [
+                        "Default"
+                      ]
+                    },
+                    "len": {
+                      "$ref": "#/components/schemas/UnitLen"
+                    },
+                    "angle": {
+                      "$ref": "#/components/schemas/UnitAngle"
+                    }
+                  }
+                },
+                {
+                  "type": "object",
+                  "required": [
+                    "type"
+                  ],
+                  "properties": {
+                    "type": {
+                      "type": "string",
+                      "enum": [
+                        "Unknown"
+                      ]
+                    }
+                  }
+                },
+                {
+                  "type": "object",
+                  "required": [
+                    "type"
+                  ],
+                  "properties": {
+                    "type": {
+                      "type": "string",
+                      "enum": [
+                        "Any"
+                      ]
+                    }
+                  }
+                }
+              ]
+            },
+            "UnitLen": {
+              "description": "A unit of length.",
+              "oneOf": [
+                {
+                  "type": "object",
+                  "required": [
+                    "type"
+                  ],
+                  "properties": {
+                    "type": {
+                      "type": "string",
+                      "enum": [
+                        "Mm"
+                      ]
+                    }
+                  }
+                },
+                {
+                  "type": "object",
+                  "required": [
+                    "type"
+                  ],
+                  "properties": {
+                    "type": {
+                      "type": "string",
+                      "enum": [
+                        "Cm"
+                      ]
+                    }
+                  }
+                },
+                {
+                  "type": "object",
+                  "required": [
+                    "type"
+                  ],
+                  "properties": {
+                    "type": {
+                      "type": "string",
+                      "enum": [
+                        "M"
+                      ]
+                    }
+                  }
+                },
+                {
+                  "type": "object",
+                  "required": [
+                    "type"
+                  ],
+                  "properties": {
+                    "type": {
+                      "type": "string",
+                      "enum": [
+                        "Inches"
+                      ]
+                    }
+                  }
+                },
+                {
+                  "type": "object",
+                  "required": [
+                    "type"
+                  ],
+                  "properties": {
+                    "type": {
+                      "type": "string",
+                      "enum": [
+                        "Feet"
+                      ]
+                    }
+                  }
+                },
+                {
+                  "type": "object",
+                  "required": [
+                    "type"
+                  ],
+                  "properties": {
+                    "type": {
+                      "type": "string",
+                      "enum": [
+                        "Yards"
+                      ]
+                    }
+                  }
+                }
+              ]
+            },
+            "UnitAngle": {
+              "description": "A unit of angle.",
+              "oneOf": [
+                {
+                  "type": "object",
+                  "required": [
+                    "type"
+                  ],
+                  "properties": {
+                    "type": {
+                      "type": "string",
+                      "enum": [
+                        "Degrees"
+                      ]
+                    }
+                  }
+                },
+                {
+                  "type": "object",
+                  "required": [
+                    "type"
+                  ],
+                  "properties": {
+                    "type": {
+                      "type": "string",
+                      "enum": [
+                        "Radians"
+                      ]
+                    }
+                  }
+                }
+              ]
             }
           }
         },

docs/kcl/types/ExtrudeSurface.md

@@ -28,7 +28,7 @@ An extrude plane.
 | `faceId` |[`string`](/docs/kcl/types/string)| The face id for the extrude plane. | No |
 | [`tag`](/docs/kcl/types/tag) |[`TagDeclarator`](/docs/kcl/types#tag-declaration)| The tag. | No |
 | `id` |[`string`](/docs/kcl/types/string)| The id of the geometry. | No |
-| `sourceRange` |`[integer, integer, integer]`| The source range. | No |
+| `sourceRange` |[`SourceRange`](/docs/kcl/types/SourceRange)| The source range. | No |
 
 
 ----
@@ -48,7 +48,7 @@ An extruded arc.
 | `faceId` |[`string`](/docs/kcl/types/string)| The face id for the extrude plane. | No |
 | [`tag`](/docs/kcl/types/tag) |[`TagDeclarator`](/docs/kcl/types#tag-declaration)| The tag. | No |
 | `id` |[`string`](/docs/kcl/types/string)| The id of the geometry. | No |
-| `sourceRange` |`[integer, integer, integer]`| The source range. | No |
+| `sourceRange` |[`SourceRange`](/docs/kcl/types/SourceRange)| The source range. | No |
 
 
 ----
@@ -68,7 +68,7 @@ Geometry metadata.
 | `faceId` |[`string`](/docs/kcl/types/string)| The id for the chamfer surface. | No |
 | [`tag`](/docs/kcl/types/tag) |[`TagDeclarator`](/docs/kcl/types#tag-declaration)| The tag. | No |
 | `id` |[`string`](/docs/kcl/types/string)| The id of the geometry. | No |
-| `sourceRange` |`[integer, integer, integer]`| The source range. | No |
+| `sourceRange` |[`SourceRange`](/docs/kcl/types/SourceRange)| The source range. | No |
 
 
 ----
@@ -88,7 +88,7 @@ Geometry metadata.
 | `faceId` |[`string`](/docs/kcl/types/string)| The id for the fillet surface. | No |
 | [`tag`](/docs/kcl/types/tag) |[`TagDeclarator`](/docs/kcl/types#tag-declaration)| The tag. | No |
 | `id` |[`string`](/docs/kcl/types/string)| The id of the geometry. | No |
-| `sourceRange` |`[integer, integer, integer]`| The source range. | No |
+| `sourceRange` |[`SourceRange`](/docs/kcl/types/SourceRange)| The source range. | No |
 
 
 ----

docs/kcl/types/GeoMeta.md

@@ -17,6 +17,6 @@ Geometry metadata.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `id` |[`string`](/docs/kcl/types/string)| The id of the geometry. | No |
-| `sourceRange` |`[integer, integer, integer]`| The source range. | No |
+| `sourceRange` |[`SourceRange`](/docs/kcl/types/SourceRange)| The source range. | No |
 
 

docs/kcl/types/HelixValue.md

@@ -17,7 +17,7 @@ A helix.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `value` |[`string`](/docs/kcl/types/string)| The id of the helix. | No |
-| `artifactId` |[`string`](/docs/kcl/types/string)| The artifact ID. | No |
+| `artifactId` |[`ArtifactId`](/docs/kcl/types/ArtifactId)| The artifact ID. | No |
 | `revolutions` |[`number`](/docs/kcl/types/number)| Number of revolutions. | No |
 | `angleStart` |[`number`](/docs/kcl/types/number)| Start angle (in degrees). | No |
 | `ccw` |`boolean`| Is the helix rotation counter clockwise? | No |

docs/kcl/types/KclValue.md

@@ -285,7 +285,7 @@ Data for an imported geometry.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: `Module`|  | No |
-| `value` |`integer`| Identifier of a source file.  Uses a u32 to keep the size small. | No |
+| `value` |[`ModuleId`](/docs/kcl/types/ModuleId)| Identifier of a source file.  Uses a u32 to keep the size small. | No |
 
 
 ----

docs/kcl/types/PolarCoordsData.md

@@ -17,6 +17,6 @@ Data for polar coordinates.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `angle` |[`number`](/docs/kcl/types/number)| The angle of the line (in degrees). | No |
-| `length` |[`number`](/docs/kcl/types/number)| The length of the line. | No |
+| `length` |[`TyF64`](/docs/kcl/types/TyF64)| The length of the line. | No |
 
 

docs/kcl/types/SketchSurface.md

@@ -25,7 +25,7 @@ A sketch type.
 |----------|------|-------------|----------|
 | `type` |enum: `plane`|  | No |
 | `id` |[`string`](/docs/kcl/types/string)| The id of the plane. | No |
-| `artifactId` |[`string`](/docs/kcl/types/string)| The artifact ID. | No |
+| `artifactId` |[`ArtifactId`](/docs/kcl/types/ArtifactId)| The artifact ID. | No |
 | `value` |[`PlaneType`](/docs/kcl/types/PlaneType)| Type for a plane. | No |
 | `origin` |[`Point3d`](/docs/kcl/types/Point3d)| Origin of the plane. | No |
 | `xAxis` |[`Point3d`](/docs/kcl/types/Point3d)| What should the plane's X axis be? | No |
@@ -49,7 +49,7 @@ A face.
 |----------|------|-------------|----------|
 | `type` |enum: `face`|  | No |
 | `id` |[`string`](/docs/kcl/types/string)| The id of the face. | No |
-| `artifactId` |[`string`](/docs/kcl/types/string)| The artifact ID. | No |
+| `artifactId` |[`ArtifactId`](/docs/kcl/types/ArtifactId)| The artifact ID. | No |
 | `value` |[`string`](/docs/kcl/types/string)| The tag of the face. | No |
 | `xAxis` |[`Point3d`](/docs/kcl/types/Point3d)| What should the face's X axis be? | No |
 | `yAxis` |[`Point3d`](/docs/kcl/types/Point3d)| What should the face's Y axis be? | No |

docs/kcl/types/SourceRange.md

@@ -0,0 +1,15 @@
+---
+title: "SourceRange"
+excerpt: ""
+layout: manual
+---
+
+
+**Type:** `integer` (`uint`)
+
+
+
+
+
+
+

docs/kcl/types/TyF64.md

@@ -5,11 +5,17 @@ layout: manual
 ---
 
 
-**Type:** [`number`](/docs/kcl/types/number) (`double`)
+**Type:** `object`
 
 
 
 
 
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `n` |[`number`](/docs/kcl/types/number)|  | No |
+| `ty` |[`NumericType`](/docs/kcl/types/NumericType)|  | No |
 
 

e2e/playwright/basic-sketch.spec.ts

@@ -85,7 +85,7 @@ async function doBasicSketch(
   await page.mouse.click(startXPx, 500 - PUR * 20)
   if (openPanes.includes('code')) {
     await expect(u.codeLocator)
-      .toHaveText(`@settings(defaultLengthUnit = in)sketch001 = startSketchOn(XZ)profile001 = startProfileAt(${
+      .toHaveText(`sketch001 = startSketchOn(XZ)profile001 = startProfileAt(${
       commonPoints.startAt
     }, sketch001)
   |> xLine(length = ${commonPoints.num1})
@@ -119,7 +119,10 @@ async function doBasicSketch(
   await page.waitForTimeout(100)
 
   if (openPanes.includes('code')) {
-    expect(await u.getGreatestPixDiff(line1, TEST_COLORS.BLUE)).toBeLessThan(3)
+    await expect(
+      await u.getGreatestPixDiff(line1, TEST_COLORS.BLUE)
+    ).toBeLessThan(3)
+    await expect(await u.getGreatestPixDiff(line1, [0, 0, 255])).toBeLessThan(3)
   }
 
   // hold down shift
@@ -142,7 +145,7 @@ async function doBasicSketch(
   // Open the code pane.
   await u.openKclCodePanel()
   await expect(u.codeLocator)
-    .toHaveText(`@settings(defaultLengthUnit = in)sketch001 = startSketchOn(XZ)profile001 = startProfileAt(${
+    .toHaveText(`sketch001 = startSketchOn(XZ)profile001 = startProfileAt(${
     commonPoints.startAt
   }, sketch001)
   |> xLine(length = ${commonPoints.num1}, tag = $seg01)

e2e/playwright/can-create-sketches-on-all-planes-and-their-back-sides.spec.ts

@@ -46,7 +46,7 @@ test.describe(
         },
       }
 
-      const code = `@settings(defaultLengthUnit = in)sketch001 = startSketchOn(${plane})profile001 = startProfileAt([0.91, -1.22], sketch001)`
+      const code = `sketch001 = startSketchOn(${plane})profile001 = startProfileAt([0.91, -1.22], sketch001)`
 
       await u.openDebugPanel()
 

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

@@ -251,11 +251,11 @@ test(
       ])
       await Promise.all([
         fsp.copyFile(
-          executorInputPath('cylinder-inches.kcl'),
+          executorInputPath('router-template-slate.kcl'),
           join(routerTemplateDir, 'main.kcl')
         ),
         fsp.copyFile(
-          executorInputPath('e2e-can-sketch-on-chamfer.kcl'),
+          executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
           join(bracketDir, 'main.kcl')
         ),
       ])

e2e/playwright/desktop-export.spec.ts

@@ -20,11 +20,11 @@ test(
       await Promise.all([fsp.mkdir(bracketDir, { recursive: true })])
       await Promise.all([
         fsp.copyFile(
-          executorInputPath('cylinder-inches.kcl'),
+          executorInputPath('router-template-slate.kcl'),
           path.join(bracketDir, 'other.kcl')
         ),
         fsp.copyFile(
-          executorInputPath('e2e-can-sketch-on-chamfer.kcl'),
+          executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
           path.join(bracketDir, 'main.kcl')
         ),
       ])
@@ -107,7 +107,7 @@ test(
             },
             { timeout: 15_000 }
           )
-          .toBeGreaterThan(30_000)
+          .toBeGreaterThan(300_000)
       })
     })
 
@@ -187,7 +187,7 @@ test(
             },
             { timeout: 15_000 }
           )
-          .toBeGreaterThan(50_000)
+          .toBeGreaterThan(70_000)
       })
     })
   }

e2e/playwright/editor-tests.spec.ts

@@ -32,30 +32,26 @@ test.describe('Editor tests', { tag: ['@skipWin'] }, () => {
     await page.keyboard.press('/')
     await page.keyboard.up('ControlOrMeta')
 
-    await expect(page.locator('.cm-content')).toHaveText(
-      `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XY)
+    await expect(page.locator('.cm-content'))
+      .toHaveText(`sketch001 = startSketchOn(XY)
   |> startProfileAt([-10, -10], %)
   |> line(end = [20, 0])
   |> line(end = [0, 20])
   |> line(end = [-20, 0])
-  // |> close()`.replaceAll('\n', '')
-    )
+  // |> close()`)
 
     // uncomment the code
     await page.keyboard.down('ControlOrMeta')
     await page.keyboard.press('/')
     await page.keyboard.up('ControlOrMeta')
 
-    await expect(page.locator('.cm-content')).toHaveText(
-      `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XY)
+    await expect(page.locator('.cm-content'))
+      .toHaveText(`sketch001 = startSketchOn(XY)
   |> startProfileAt([-10, -10], %)
   |> line(end = [20, 0])
   |> line(end = [0, 20])
   |> line(end = [-20, 0])
-  |> close()`.replaceAll('\n', '')
-    )
+  |> close()`)
   })
 
   test('ensure we use the cache, and do not re-execute', async ({
@@ -182,15 +178,13 @@ sketch001 = startSketchOn(XY)
     await page.locator('#code-pane button:first-child').click()
     await page.locator('button:has-text("Format code")').click()
 
-    await expect(page.locator('.cm-content')).toHaveText(
-      `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XY)
+    await expect(page.locator('.cm-content'))
+      .toHaveText(`sketch001 = startSketchOn(XY)
   |> startProfileAt([-10, -10], %)
   |> line(end = [20, 0])
   |> line(end = [0, 20])
   |> line(end = [-20, 0])
-  |> close()`.replaceAll('\n', '')
-    )
+  |> close()`)
   })
 
   test('if you click the format button it formats your code and executes so lints are still there', async ({
@@ -233,15 +227,13 @@ sketch001 = startSketchOn(XY)
     await u.expectCmdLog('[data-message-type="execution-done"]')
     await u.closeDebugPanel()
 
-    await expect(page.locator('.cm-content')).toHaveText(
-      `@settings(defaultLengthUnit = in)
-sketch_001 = startSketchOn(XY)
+    await expect(page.locator('.cm-content'))
+      .toHaveText(`sketch_001 = startSketchOn(XY)
   |> startProfileAt([-10, -10], %)
   |> line(end = [20, 0])
   |> line(end = [0, 20])
   |> line(end = [-20, 0])
-  |> close()`.replaceAll('\n', '')
-    )
+  |> close()`)
 
     // error in guter
     await expect(page.locator('.cm-lint-marker-info').first()).toBeVisible()
@@ -479,7 +471,6 @@ sketch_001 = startSketchOn(XY)
   test('if you write kcl with lint errors you get lints', async ({
     page,
     homePage,
-    scene,
   }) => {
     const u = await getUtils(page)
     await page.setBodyDimensions({ width: 1000, height: 500 })
@@ -499,7 +490,10 @@ sketch_001 = startSketchOn(XY)
     await page.keyboard.press('ArrowLeft')
     await page.keyboard.press('ArrowRight')
 
-    await scene.waitForExecutionDone()
+    // FIXME: lsp errors do not propagate to the frontend until engine is connected and code is executed
+    // This timeout is to wait for engine connection. LSP and code execution errors should be handled differently
+    // LSP can emit errors as fast as it waits and show them in the editor
+    await page.waitForTimeout(10000)
 
     // error in guter
     await expect(page.locator('.cm-lint-marker-info').first()).toBeVisible()
@@ -821,12 +815,10 @@ sketch_001 = startSketchOn(XY)
       // there shouldn't be any auto complete options for 'lin' in the comment
       await expect(page.locator('.cm-completionLabel')).not.toBeVisible()
 
-      await expect(page.locator('.cm-content')).toHaveText(
-        `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XZ)
+      await expect(page.locator('.cm-content'))
+        .toHaveText(`sketch001 = startSketchOn(XZ)
         |> startProfileAt([3.14, 12], %)
-        |> xLine(%, length = 5) // lin`.replaceAll('\n', '')
-      )
+        |> xLine(%, length = 5) // lin`)
 
       // expect there to be no KCL errors
       await expect(page.locator('.cm-lint-marker-error')).toHaveCount(0)
@@ -896,12 +888,10 @@ sketch001 = startSketchOn(XZ)
       // there shouldn't be any auto complete options for 'lin' in the comment
       await expect(page.locator('.cm-completionLabel')).not.toBeVisible()
 
-      await expect(page.locator('.cm-content')).toHaveText(
-        `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XZ)
+      await expect(page.locator('.cm-content'))
+        .toHaveText(`sketch001 = startSketchOn(XZ)
         |> startProfileAt([3.14, 12], %)
-        |> xLine(%, length = 5) // lin`.replaceAll('\n', '')
-      )
+        |> xLine(%, length = 5) // lin`)
     })
   })
   test('Can undo a click and point extrude with ctrl+z', async ({
@@ -1216,55 +1206,4 @@ sketch001 = startSketchOn(XZ)
       })
     }
   )
-
-  test('Rectangle tool panning with middle click', async ({
-    page,
-    homePage,
-    toolbar,
-    scene,
-    cmdBar,
-    editor,
-  }) => {
-    await page.setBodyDimensions({ width: 1200, height: 900 })
-    await homePage.goToModelingScene()
-
-    // wait until scene is ready to be interacted with
-    await scene.connectionEstablished()
-    await scene.settled(cmdBar)
-
-    await page.getByRole('button', { name: 'Start Sketch' }).click()
-
-    // select an axis plane
-    await page.mouse.click(700, 200)
-
-    // Needed as we don't yet have a way to get a signal from the engine that the camera has animated to the sketch plane
-    await page.waitForTimeout(1000)
-
-    const middleMousePan = async (
-      startX: number,
-      startY: number,
-      endX: number,
-      endY: number
-    ) => {
-      const initialCode = await editor.getCurrentCode()
-
-      await page.mouse.click(startX, startY, { button: 'middle' })
-      await page.mouse.move(endX, endY, {
-        steps: 10,
-      })
-
-      // We expect the code to be the same, middle mouse click should not modify the code, only do panning
-      await editor.expectEditor.toBe(initialCode)
-    }
-
-    await test.step(`Verify corner rectangle panning`, async () => {
-      await page.getByTestId('corner-rectangle').click()
-      await middleMousePan(800, 500, 900, 600)
-    })
-
-    await test.step(`Verify center rectangle panning`, async () => {
-      await toolbar.selectCenterRectangle()
-      await middleMousePan(800, 200, 900, 300)
-    })
-  })
 })

e2e/playwright/fixtures/editorFixture.ts

@@ -81,13 +81,6 @@ export class EditorFixture {
   expectEditor = {
     toContain: this._expectEditorToContain(),
     not: { toContain: this._expectEditorToContain(true) },
-    toBe: async (code: string) => {
-      const currentCode = await this.getCurrentCode()
-      return expect(currentCode).toBe(code)
-    },
-  }
-  getCurrentCode = async () => {
-    return await this.codeContent.innerText()
   }
   snapshot = async (options?: { timeout?: number; name?: string }) => {
     const wasPaneOpen = await this.checkIfPaneIsOpen()

e2e/playwright/fixtures/sceneFixture.ts

@@ -310,9 +310,7 @@ export async function expectPixelColor(
     .toBeTruthy()
     .catch((cause) => {
       throw new Error(
-        `ExpectPixelColor: point ${JSON.stringify(
-          coords
-        )} was expecting ${colour} but got ${finalValue}`,
+        `ExpectPixelColor: expecting ${colour} got ${finalValue}`,
         { cause }
       )
     })

e2e/playwright/lib/console-error-whitelist.ts

@@ -272,6 +272,14 @@ export const isErrorWhitelisted = (exception: Error) => {
       project: 'Google Chrome',
       foundInSpec: 'e2e/playwright/snapshot-tests.spec.ts',
     },
+    // TODO: fix this error in the code
+    {
+      name: 'ReferenceError',
+      message: 'createNewVariableCheckbox is not defined',
+      stack: '',
+      project: 'Google Chrome',
+      foundInSpec: 'e2e/playwright/testing-constraints.spec.ts',
+    },
     {
       name: 'Error',
       message: 'The "path" argument must be of type string. Received undefined',

e2e/playwright/machines.spec.ts

@@ -11,7 +11,7 @@ test(
       const bracketDir = join(dir, 'bracket')
       await fsp.mkdir(bracketDir, { recursive: true })
       await fsp.copyFile(
-        executorInputPath('cylinder-inches.kcl'),
+        executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
         join(bracketDir, 'main.kcl')
       )
     })
@@ -51,7 +51,7 @@ test(
       const bracketDir = join(dir, 'bracket')
       await fsp.mkdir(bracketDir, { recursive: true })
       await fsp.copyFile(
-        executorInputPath('cylinder-inches.kcl'),
+        executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
         join(bracketDir, 'main.kcl')
       )
     })

e2e/playwright/point-click.spec.ts

@@ -137,7 +137,7 @@ test.describe('Point-and-click tests', () => {
 
         await scene.moveCameraTo(cameraPos, cameraTarget)
 
-        await test.step('check chamfer selection changes cursor position', async () => {
+        await test.step('check chamfer selection changes cursor positon', async () => {
           await expect(async () => {
             // sometimes initial click doesn't register
             await clickChamfer()
@@ -173,7 +173,7 @@ test.describe('Point-and-click tests', () => {
         })
         await test.step('Check there is no errors after code created in previous steps executes', async () => {
           await editor.expectState({
-            activeLines: ['@settings(defaultLengthUnit = in)'],
+            activeLines: ['sketch001 = startSketchOn(XZ)'],
             highlightedCode: '',
             diagnostics: [],
           })
@@ -299,8 +299,7 @@ test.describe('Point-and-click tests', () => {
 
       await test.step('verify at the end of the test that final code is what is expected', async () => {
         await editor.expectEditor.toContain(
-          `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XZ)
+          `sketch001 = startSketchOn(XZ)
   |> startProfileAt([75.8, 317.2], %) // [$startCapTag, $EndCapTag]
   |> angledLine([0, 268.43], %, $rectangleSegmentA001)
   |> angledLine([
@@ -370,7 +369,7 @@ profile001 = startProfileAt([205.96, 254.59], sketch002)
       })
     })
 
-    test('Works on chamfers that are not in a pipeExpression can break up multi edges in a chamfer array', async ({
+    test('Works on chamfers that are non in a pipeExpression can break up multi edges in a chamfer array', async ({
       context,
       page,
       homePage,
@@ -419,8 +418,7 @@ profile001 = startProfileAt([205.96, 254.59], sketch002)
         |>close()`,
       })
       await editor.expectEditor.toContain(
-        `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XZ)
+        `sketch001 = startSketchOn(XZ)
   |> startProfileAt([75.8, 317.2], %)
   |> angledLine([0, 268.43], %, $rectangleSegmentA001)
   |> angledLine([
@@ -1641,10 +1639,9 @@ loft001 = loft([sketch001, sketch002])
     {
       targetType: 'circle',
       testPoint: { x: 700, y: 250 },
-      initialCode: `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(YZ)
+      initialCode: `sketch001 = startSketchOn('YZ')
 profile001 = circle(sketch001, center = [0, 0], radius = 500)
-sketch002 = startSketchOn(XZ)
+sketch002 = startSketchOn('XZ')
   |> startProfileAt([0, 0], %)
   |> xLine(length = -500)
   |> tangentialArcTo([-2000, 500], %)`,
@@ -1652,8 +1649,7 @@ sketch002 = startSketchOn(XZ)
     {
       targetType: 'rectangle',
       testPoint: { x: 710, y: 255 },
-      initialCode: `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(YZ)
+      initialCode: `sketch001 = startSketchOn('YZ')
 profile001 = startProfileAt([-400, -400], sketch001)
   |> angledLine([0, 800], %, $rectangleSegmentA001)
   |> angledLine([
@@ -1666,7 +1662,7 @@ profile001 = startProfileAt([-400, -400], sketch001)
      ], %)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
-sketch002 = startSketchOn(XZ)
+sketch002 = startSketchOn('XZ')
   |> startProfileAt([0, 0], %)
   |> xLine(length = -500)
   |> tangentialArcTo([-2000, 500], %)`,
@@ -1810,8 +1806,7 @@ sketch002 = startSketchOn(XZ)
     toolbar,
     cmdBar,
   }) => {
-    const initialCode = `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(YZ)
+    const initialCode = `sketch001 = startSketchOn(YZ)
   |> circle(
        center = [0, 0],
        radius = 500
@@ -2480,8 +2475,7 @@ extrude001 = extrude(profile001, length = 5)
     cmdBar,
   }) => {
     // Code samples
-    const initialCode = `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XY)
+    const initialCode = `sketch001 = startSketchOn(XY)
   |> startProfileAt([-12, -6], %)
   |> line(end = [0, 12])
   |> line(end = [24, 0])
@@ -2773,8 +2767,7 @@ extrude001 = extrude(sketch001, length = -12)
     toolbar,
   }) => {
     // Code samples
-    const initialCode = `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XY)
+    const initialCode = `sketch001 = startSketchOn(XY)
   |> startProfileAt([-12, -6], %)
   |> line(end = [0, 12])
   |> line(end = [24, 0], tag = $seg02)
@@ -2928,8 +2921,7 @@ chamfer04 = chamfer(extrude001, length = 5, tags = [getOppositeEdge(seg02)])
       toolbar,
       cmdBar,
     }) => {
-      const initialCode = `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XZ)
+      const initialCode = `sketch001 = startSketchOn(XZ)
   |> circle(center = [0, 0], radius = 30)
 extrude001 = extrude(sketch001, length = 30)
     `
@@ -3064,8 +3056,7 @@ extrude001 = extrude(sketch001, length = 30)
     toolbar,
     cmdBar,
   }) => {
-    const initialCode = `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XY)
+    const initialCode = `sketch001 = startSketchOn(XY)
   |> startProfileAt([-20, 20], %)
   |> xLine(length = 40)
   |> yLine(length = -60)
@@ -3183,8 +3174,7 @@ extrude001 = extrude(sketch001, length = 40)
   })
 
   const shellSketchOnFacesCases = [
-    `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XZ)
+    `sketch001 = startSketchOn(XZ)
   |> circle(center = [0, 0], radius = 100)
   |> extrude(length = 100)
 
@@ -3192,8 +3182,7 @@ sketch002 = startSketchOn(sketch001, 'END')
   |> circle(center = [0, 0], radius = 50)
   |> extrude(length = 50)
   `,
-    `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XZ)
+    `sketch001 = startSketchOn(XZ)
   |> circle(center = [0, 0], radius = 100)
 extrude001 = extrude(sketch001, length = 100)
 
@@ -3476,39 +3465,6 @@ segAng(rectangleSegmentA002),
 
       const newCodeToFind = `revolve001 = revolve(sketch002, angle = 360, axis = 'X')`
       expect(editor.expectEditor.toContain(newCodeToFind)).toBeTruthy()
-
-      // Edit flow
-      const newAngle = '90'
-      await toolbar.openPane('feature-tree')
-      const operationButton = await toolbar.getFeatureTreeOperation(
-        'Revolve',
-        0
-      )
-      await operationButton.dblclick({ button: 'left' })
-      await cmdBar.expectState({
-        commandName: 'Revolve',
-        currentArgKey: 'angle',
-        currentArgValue: '360',
-        headerArguments: {
-          Angle: '360',
-        },
-        highlightedHeaderArg: 'angle',
-        stage: 'arguments',
-      })
-      await page.keyboard.insertText(newAngle)
-      await cmdBar.progressCmdBar()
-      await cmdBar.expectState({
-        stage: 'review',
-        headerArguments: {
-          Angle: newAngle,
-        },
-        commandName: 'Revolve',
-      })
-      await cmdBar.progressCmdBar()
-      await toolbar.closePane('feature-tree')
-      await editor.expectEditor.toContain(
-        newCodeToFind.replace('angle = 360', 'angle = ' + newAngle)
-      )
     })
     test('revolve surface around edge from an extruded solid2d', async ({
       context,
@@ -3519,7 +3475,8 @@ segAng(rectangleSegmentA002),
       toolbar,
       cmdBar,
     }) => {
-      const initialCode = `sketch001 = startSketchOn(XZ)
+      const initialCode = `
+sketch001 = startSketchOn(XZ)
 |> startProfileAt([-102.57, 101.72], %)
 |> angledLine([0, 202.6], %, $rectangleSegmentA001)
 |> angledLine([
@@ -3534,7 +3491,10 @@ segAng(rectangleSegmentA002),
 |> close()
 extrude001 = extrude(sketch001, length = 50)
 sketch002 = startSketchOn(extrude001, rectangleSegmentA001)
-  |> circle(center = [-11.34, 10.0], radius = 8.69)
+|> circle(
+center = [-11.34, 10.0],
+radius = 8.69
+)
 `
       await context.addInitScript((initialCode) => {
         localStorage.setItem('persistCode', initialCode)
@@ -3552,49 +3512,9 @@ sketch002 = startSketchOn(extrude001, rectangleSegmentA001)
       const lineCodeToSelection = `|> angledLine([0, 202.6], %, $rectangleSegmentA001)`
       await page.getByText(lineCodeToSelection).click()
       await cmdBar.progressCmdBar()
-      await cmdBar.progressCmdBar()
-      await cmdBar.progressCmdBar()
 
-      const newCodeToFind = `revolve001 = revolve(sketch002, angle = 360, axis = rectangleSegmentA001)`
-      await editor.expectEditor.toContain(newCodeToFind)
-
-      // Edit flow
-      const newAngle = '180'
-      await toolbar.openPane('feature-tree')
-      const operationButton = await toolbar.getFeatureTreeOperation(
-        'Revolve',
-        0
-      )
-      await operationButton.dblclick({ button: 'left' })
-      await cmdBar.expectState({
-        commandName: 'Revolve',
-        currentArgKey: 'angle',
-        currentArgValue: '360',
-        headerArguments: {
-          Angle: '360',
-        },
-        highlightedHeaderArg: 'angle',
-        stage: 'arguments',
-      })
-      await page.keyboard.insertText(newAngle)
-      await page.getByRole('button', { name: 'Create new variable' }).click()
-      await expect(page.getByPlaceholder('Variable name')).toHaveValue(
-        'angle001'
-      )
-      await cmdBar.progressCmdBar()
-      await cmdBar.expectState({
-        stage: 'review',
-        headerArguments: {
-          Angle: newAngle,
-        },
-        commandName: 'Revolve',
-      })
-      await cmdBar.progressCmdBar()
-      await toolbar.closePane('feature-tree')
-      await editor.expectEditor.toContain('angle001 = ' + newAngle)
-      await editor.expectEditor.toContain(
-        newCodeToFind.replace('angle = 360', 'angle = angle001')
-      )
+      const newCodeToFind = `revolve001 = revolve(sketch002, angle = 360, axis = getOppositeEdge(rectangleSegmentA001)) `
+      expect(editor.expectEditor.toContain(newCodeToFind)).toBeTruthy()
     })
     test('revolve sketch circle around line segment from startProfileAt sketch', async ({
       context,
@@ -3605,10 +3525,11 @@ sketch002 = startSketchOn(extrude001, rectangleSegmentA001)
       toolbar,
       cmdBar,
     }) => {
-      const initialCode = `sketch002 = startSketchOn(XY)
+      const initialCode = `
+    sketch002 = startSketchOn(XY)
       |> startProfileAt([-2.02, 1.79], %)
       |> xLine(length = 2.6)
-sketch001 = startSketchOn(-XY)
+    sketch001 = startSketchOn('-XY')
       |> startProfileAt([-0.48, 1.25], %)
       |> angledLine([0, 2.38], %, $rectangleSegmentA001)
       |> angledLine([segAng(rectangleSegmentA001) - 90, 2.4], %, $rectangleSegmentB001)
@@ -3620,7 +3541,10 @@ sketch001 = startSketchOn(-XY)
       |> close()
     extrude001 = extrude(sketch001, length = 5)
     sketch003 = startSketchOn(extrude001, 'START')
-  |> circle(center = [-0.69, 0.56], radius = 0.28)
+      |> circle(
+        center = [-0.69, 0.56],
+        radius = 0.28
+      )
 `
 
       await context.addInitScript((initialCode) => {
@@ -3639,44 +3563,9 @@ sketch003 = startSketchOn(extrude001, 'START')
       const lineCodeToSelection = `|> xLine(length = 2.6)`
       await page.getByText(lineCodeToSelection).click()
       await cmdBar.progressCmdBar()
-      await cmdBar.progressCmdBar()
-      await cmdBar.progressCmdBar()
 
       const newCodeToFind = `revolve001 = revolve(sketch003, angle = 360, axis = seg01)`
       expect(editor.expectEditor.toContain(newCodeToFind)).toBeTruthy()
-
-      // Edit flow
-      const newAngle = '270'
-      await toolbar.openPane('feature-tree')
-      const operationButton = await toolbar.getFeatureTreeOperation(
-        'Revolve',
-        0
-      )
-      await operationButton.dblclick({ button: 'left' })
-      await cmdBar.expectState({
-        commandName: 'Revolve',
-        currentArgKey: 'angle',
-        currentArgValue: '360',
-        headerArguments: {
-          Angle: '360',
-        },
-        highlightedHeaderArg: 'angle',
-        stage: 'arguments',
-      })
-      await page.keyboard.insertText(newAngle)
-      await cmdBar.progressCmdBar()
-      await cmdBar.expectState({
-        stage: 'review',
-        headerArguments: {
-          Angle: newAngle,
-        },
-        commandName: 'Revolve',
-      })
-      await cmdBar.progressCmdBar()
-      await toolbar.closePane('feature-tree')
-      await editor.expectEditor.toContain(
-        newCodeToFind.replace('angle = 360', 'angle = ' + newAngle)
-      )
     })
   })
 
@@ -3689,8 +3578,7 @@ sketch003 = startSketchOn(extrude001, 'START')
     toolbar,
     cmdBar,
   }) => {
-    const initialCode = `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XZ)
+    const initialCode = `sketch001 = startSketchOn(XZ)
 profile001 = circle(
   sketch001,
   center = [0, 0],

e2e/playwright/projects.spec.ts

@@ -87,7 +87,7 @@ test(
       const bracketDir = path.join(dir, 'bracket')
       await fsp.mkdir(bracketDir, { recursive: true })
       await fsp.copyFile(
-        executorInputPath('cylinder-inches.kcl'),
+        executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
         path.join(bracketDir, 'main.kcl')
       )
     })
@@ -124,7 +124,7 @@ test(
       const bracketDir = path.join(dir, 'bracket')
       await fsp.mkdir(bracketDir, { recursive: true })
       await fsp.copyFile(
-        executorInputPath('cylinder-inches.kcl'),
+        executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
         path.join(bracketDir, 'main.kcl')
       )
       const errorDir = path.join(dir, 'broken-code')
@@ -162,7 +162,7 @@ test(
       // gray at this pixel means the stream has loaded in the most
       // user way we can verify it (pixel color)
       await expect
-        .poll(() => u.getGreatestPixDiff(pointOnModel, [110, 110, 110]), {
+        .poll(() => u.getGreatestPixDiff(pointOnModel, [85, 85, 85]), {
           timeout: 10_000,
         })
         .toBeLessThan(20)
@@ -213,7 +213,7 @@ test(
       const bracketDir = path.join(dir, 'bracket')
       await fsp.mkdir(bracketDir, { recursive: true })
       await fsp.copyFile(
-        executorInputPath('cylinder-inches.kcl'),
+        executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
         path.join(bracketDir, 'main.kcl')
       )
       const emptyDir = path.join(dir, 'empty')
@@ -248,7 +248,7 @@ test(
       // gray at this pixel means the stream has loaded in the most
       // user way we can verify it (pixel color)
       await expect
-        .poll(() => u.getGreatestPixDiff(pointOnModel, [125, 125, 125]), {
+        .poll(() => u.getGreatestPixDiff(pointOnModel, [85, 85, 85]), {
           timeout: 10_000,
         })
         .toBeLessThan(15)
@@ -290,7 +290,7 @@ test(
       const bracketDir = path.join(dir, 'bracket')
       await fsp.mkdir(bracketDir, { recursive: true })
       await fsp.copyFile(
-        executorInputPath('cylinder-inches.kcl'),
+        executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
         path.join(bracketDir, 'main.kcl')
       )
 
@@ -319,7 +319,7 @@ test(
       // gray at this pixel means the stream has loaded in the most
       // user way we can verify it (pixel color)
       await expect
-        .poll(() => u.getGreatestPixDiff(pointOnModel, [125, 125, 125]), {
+        .poll(() => u.getGreatestPixDiff(pointOnModel, [85, 85, 85]), {
           timeout: 10_000,
         })
         .toBeLessThan(15)
@@ -359,7 +359,7 @@ test(
       const bracketDir = path.join(dir, 'bracket')
       await fsp.mkdir(bracketDir, { recursive: true })
       await fsp.copyFile(
-        executorInputPath('cylinder-inches.kcl'),
+        executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
         path.join(bracketDir, 'main.kcl')
       )
       await fsp.copyFile(
@@ -393,7 +393,7 @@ test(
       // gray at this pixel means the stream has loaded in the most
       // user way we can verify it (pixel color)
       await expect
-        .poll(() => u.getGreatestPixDiff(pointOnModel, [125, 125, 125]), {
+        .poll(() => u.getGreatestPixDiff(pointOnModel, [85, 85, 85]), {
           timeout: 10_000,
         })
         .toBeLessThan(15)
@@ -443,6 +443,7 @@ test(
     await page.getByText('broken-code').click()
 
     // Gotcha: You can not use scene.waitForExecutionDone() since the KCL code is going to fail
+    await expect(page.getByTestId('loading')).toBeAttached()
     await expect(page.getByTestId('loading')).not.toBeAttached({
       timeout: 20_000,
     })
@@ -480,7 +481,7 @@ test.describe('Can export from electron app', () => {
           const bracketDir = path.join(dir, 'bracket')
           await fsp.mkdir(bracketDir, { recursive: true })
           await fsp.copyFile(
-            executorInputPath('cylinder-inches.kcl'),
+            executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
             path.join(bracketDir, 'main.kcl')
           )
         })
@@ -512,7 +513,7 @@ test.describe('Can export from electron app', () => {
           // gray at this pixel means the stream has loaded in the most
           // user way we can verify it (pixel color)
           await expect
-            .poll(() => u.getGreatestPixDiff(pointOnModel, [125, 125, 125]), {
+            .poll(() => u.getGreatestPixDiff(pointOnModel, [85, 85, 85]), {
               timeout: 10_000,
             })
             .toBeLessThan(15)
@@ -553,7 +554,7 @@ test.describe('Can export from electron app', () => {
               },
               { timeout: 15_000 }
             )
-            .toBeGreaterThan(50_000)
+            .toBeGreaterThan(300_000)
 
           // clean up exported file
           await fsp.rm(filepath)
@@ -1506,12 +1507,7 @@ test(
 
     await u.waitForPageLoad()
 
-    // The file should be prepopulated with the user's unit settings.
-    await expect(page.locator('.cm-content')).toHaveText(
-      '@settings(defaultLengthUnit = in)'
-    )
-
-    await page.locator('.cm-content').fill(`sketch001 = startSketchOn('XZ')
+    await page.locator('.cm-content').fill(`sketch001 = startSketchOn(XZ)
   |> startProfileAt([-87.4, 282.92], %)
   |> line(end = [324.07, 27.199], tag = $seg01)
   |> line(end = [118.328, -291.754])

e2e/playwright/regression-tests.spec.ts

@@ -4,9 +4,9 @@ import path from 'path'
 import * as fsp from 'fs/promises'
 import {
   getUtils,
+  executorInputPath,
   TEST_COLORS,
   TestColor,
-  executorInputPath,
   orRunWhenFullSuiteEnabled,
 } from './test-utils'
 import { TEST_CODE_TRIGGER_ENGINE_EXPORT_ERROR } from './storageStates'
@@ -331,7 +331,7 @@ extrude001 = extrude(sketch001, length = 50)
           localStorage.setItem(
             'persistCode',
             `@settings(defaultLengthUnit = mm)
-sketch002 = startSketchOn(XY)
+sketch002 = startSketchOn('XY')
 profile002 = startProfileAt([72.24, -52.05], sketch002)
   |> angledLine([0, 181.26], %, $rectangleSegmentA001)
   |> angledLine([
@@ -582,7 +582,7 @@ extrude002 = extrude(profile002, length = 150)
         const bracketDir = path.join(dir, 'bracket')
         await fsp.mkdir(bracketDir, { recursive: true })
         await fsp.copyFile(
-          executorInputPath('cylinder-inches.kcl'),
+          executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
           path.join(bracketDir, 'main.kcl')
         )
       })
@@ -619,7 +619,6 @@ extrude002 = extrude(profile002, length = 150)
   test(`View gizmo stays visible even when zoomed out all the way`, async ({
     page,
     homePage,
-    scene,
   }) => {
     const u = await getUtils(page)
 
@@ -633,7 +632,7 @@ extrude002 = extrude(profile002, length = 150)
 
     await test.step(`Load an empty file`, async () => {
       await page.addInitScript(async () => {
-        localStorage.setItem('persistCode', '@settings(defaultLengthUnit = in)')
+        localStorage.setItem('persistCode', '')
       })
       await page.setBodyDimensions({ width: 1200, height: 500 })
       await homePage.goToModelingScene()
@@ -647,31 +646,22 @@ extrude002 = extrude(profile002, length = 150)
           timeout: 5000,
           message: 'Plane color is visible',
         })
-        .toBeLessThanOrEqual(20)
-      await expect(scene.startEditSketchBtn).toBeEnabled()
+        .toBeLessThanOrEqual(15)
 
       let maxZoomOuts = 10
       let middlePixelIsBackgroundColor =
         (await middlePixelIsColor(bgColor)) < 10
-
-      console.time('pressing control')
-      await page.keyboard.down('Control')
-
       while (!middlePixelIsBackgroundColor && maxZoomOuts > 0) {
-        await page.waitForTimeout(100)
-        await page.mouse.move(650, 460)
-        console.time('moved to start point')
+        await page.keyboard.down('Control')
+        await page.mouse.move(600, 460)
         await page.mouse.down({ button: 'right' })
-        console.time('moused down')
-        await page.mouse.move(650, 50, { steps: 20 })
-        console.time('moved to end point')
-        await page.waitForTimeout(100)
+        await page.mouse.move(600, 50, { steps: 20 })
         await page.mouse.up({ button: 'right' })
-        console.time('moused up')
-        maxZoomOuts--
-        middlePixelIsBackgroundColor = (await middlePixelIsColor(bgColor)) < 15
-      }
         await page.keyboard.up('Control')
+        await page.waitForTimeout(100)
+        maxZoomOuts--
+        middlePixelIsBackgroundColor = (await middlePixelIsColor(bgColor)) < 10
+      }
 
       expect(middlePixelIsBackgroundColor, {
         message: 'We should not see the default planes',
@@ -688,12 +678,13 @@ extrude002 = extrude(profile002, length = 150)
     homePage,
     scene,
     toolbar,
+    viewport,
   }) => {
     await context.folderSetupFn(async (dir) => {
       const legoDir = path.join(dir, 'lego')
       await fsp.mkdir(legoDir, { recursive: true })
       await fsp.copyFile(
-        executorInputPath('e2e-can-sketch-on-chamfer.kcl'),
+        executorInputPath('lego.kcl'),
         path.join(legoDir, 'main.kcl')
       )
     })
@@ -706,8 +697,11 @@ extrude002 = extrude(profile002, length = 150)
       await scene.loadingIndicator.waitFor({ state: 'detached' })
     })
     await test.step(`The part should start loading quickly, not waiting until execution is complete`, async () => {
-      // TODO: use the viewport size to pick the center point, but the `viewport` fixture's values were wrong.
-      await scene.expectPixelColor([116, 116, 116], { x: 500, y: 250 }, 15)
+      await scene.expectPixelColor(
+        [143, 143, 143],
+        { x: (viewport?.width ?? 1200) / 2, y: (viewport?.height ?? 500) / 2 },
+        15
+      )
     })
   })
 

e2e/playwright/sketch-tests.spec.ts

@@ -113,8 +113,7 @@ test.describe('Sketch tests', { tag: ['@skipWin'] }, () => {
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
-        `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XZ)
+        `sketch001 = startSketchOn(XZ)
   |> startProfileAt([2.61, -4.01], %)
   |> xLine(length = 8.73)
   |> tangentialArcTo([8.33, -1.31], %)`
@@ -160,10 +159,7 @@ sketch001 = startSketchOn(XZ)
       await page.mouse.click(700, 200)
 
       await expect.poll(u.normalisedEditorCode, { timeout: 1000 })
-        .toBe(`@settings(defaultLengthUnit = in)
-
-
-sketch002 = startSketchOn(XZ)
+        .toBe(`sketch002 = startSketchOn(XZ)
 sketch001 = startProfileAt([12.34, -12.34], sketch002)
   |> yLine(length = 12.34)
 
@@ -793,8 +789,7 @@ sketch001 = startProfileAt([12.34, -12.34], sketch002)
       200
     )
 
-    let codeStr =
-      '@settings(defaultLengthUnit = in)sketch001 = startSketchOn(XY)'
+    let codeStr = 'sketch001 = startSketchOn(XY)'
 
     await page.mouse.click(center.x, viewportSize.height * 0.55)
     await expect(u.codeLocator).toHaveText(codeStr)
@@ -873,8 +868,7 @@ sketch001 = startProfileAt([12.34, -12.34], sketch002)
 
       await u.openDebugPanel()
 
-      const code = `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(-XZ)
+      const code = `sketch001 = startSketchOn(-XZ)
 profile001 = startProfileAt([${roundOff(scale * 69.6)}, ${roundOff(
         scale * 34.8
       )}], sketch001)
@@ -904,7 +898,7 @@ profile001 = startProfileAt([${roundOff(scale * 69.6)}, ${roundOff(
       await page.mouse.move(700, 200, { steps: 10 })
       await page.mouse.click(700, 200, { delay: 200 })
       await expect(page.locator('.cm-content')).toHaveText(
-        `@settings(defaultLengthUnit = in)sketch001 = startSketchOn(-XZ)`
+        `sketch001 = startSketchOn(-XZ)`
       )
 
       let prevContent = await page.locator('.cm-content').innerText()
@@ -1432,8 +1426,7 @@ test.describe(`Sketching with offset planes`, () => {
     await context.addInitScript(() => {
       localStorage.setItem(
         'persistCode',
-        `@settings(defaultLengthUnit = in)
-offsetPlane001 = offsetPlane(XY, offset = 10)`
+        `offsetPlane001 = offsetPlane(XY, offset = 10)`
       )
     })
 
@@ -1447,7 +1440,7 @@ offsetPlane001 = offsetPlane(XY, offset = 10)`
       await test.step(`Hovering should highlight code`, async () => {
         await planeHover()
         await editor.expectState({
-          activeLines: [`@settings(defaultLengthUnit = in)`],
+          activeLines: [`offsetPlane001=offsetPlane(XY,offset=10)`],
           diagnostics: [],
           highlightedCode: 'offsetPlane(XY, offset = 10)',
         })
@@ -1460,7 +1453,7 @@ offsetPlane001 = offsetPlane(XY, offset = 10)`
         await expect(toolbar.lineBtn).toBeEnabled()
         await editor.expectEditor.toContain('startSketchOn(offsetPlane001)')
         await editor.expectState({
-          activeLines: [`@settings(defaultLengthUnit = in)`],
+          activeLines: [`offsetPlane001=offsetPlane(XY,offset=10)`],
           diagnostics: [],
           highlightedCode: '',
         })
@@ -1611,8 +1604,7 @@ profile002 = startProfileAt([117.2, 56.08], sketch001)
       await context.addInitScript(() => {
         localStorage.setItem(
           'persistCode',
-          `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XZ)
+          `sketch001 = startSketchOn(XZ)
 profile002 = startProfileAt([40.68, 87.67], sketch001)
   |> xLine(length = 239.17)
 profile003 = startProfileAt([206.63, -56.73], sketch001)
@@ -2180,8 +2172,7 @@ profile003 = startProfileAt([206.63, -56.73], sketch001)
       await page.addInitScript(async () => {
         localStorage.setItem(
           'persistCode',
-          `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XZ)
+          `sketch001 = startSketchOn(XZ)
 profile001 = startProfileAt([6.24, 4.54], sketch001)
   |> line(end = [-0.41, 6.99])
   |> line(end = [8.61, 0.74])
@@ -2326,8 +2317,7 @@ profile004 = circleThreePoint(sketch001, p1 = [13.44, -6.8], p2 = [13.39, -2.07]
       await page.addInitScript(async () => {
         localStorage.setItem(
           'persistCode',
-          `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XZ)
+          `sketch001 = startSketchOn(XZ)
 profile001 = startProfileAt([6.24, 4.54], sketch001)
   |> line(end = [-0.41, 6.99])
   |> line(end = [8.61, 0.74])
@@ -2432,8 +2422,7 @@ profile003 = circle(sketch001, center = [6.92, -4.2], radius = 3.16)
       await page.addInitScript(async () => {
         localStorage.setItem(
           'persistCode',
-          `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XZ)
+          `sketch001 = startSketchOn(XZ)
 profile001 = startProfileAt([-63.43, 193.08], sketch001)
   |> line(end = [168.52, 149.87])
   |> line(end = [190.29, -39.18])
@@ -2497,11 +2486,7 @@ extrude001 = extrude(profile003, length = 5)
     page,
   }) => {
     await page.addInitScript(async () => {
-      localStorage.setItem(
-        'persistCode',
-        `@settings(defaultLengthUnit = in)
-        myVar = 5`
-      )
+      localStorage.setItem('persistCode', `myVar = 5`)
     })
 
     await page.setBodyDimensions({ width: 1000, height: 500 })
@@ -2548,8 +2533,7 @@ extrude001 = extrude(profile003, length = 5)
       await page.addInitScript(async () => {
         localStorage.setItem(
           'persistCode',
-          `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XZ)
+          `sketch001 = startSketchOn(XZ)
 profile001 = startProfileAt([85.19, 338.59], sketch001)
   |> line(end = [213.3, -94.52])
   |> line(end = [-230.09, -55.34])
@@ -2591,8 +2575,7 @@ profile002 = startProfileAt([85.81, 52.55], sketch002)
       await page.addInitScript(async () => {
         localStorage.setItem(
           'persistCode',
-          `@settings(defaultLengthUnit = in)
-thePart = startSketchOn(XZ)
+          `thePart = startSketchOn(XZ)
   |> startProfileAt([7.53, 10.51], %)
   |> line(end = [12.54, 1.83])
   |> line(end = [6.65, -6.91])
@@ -2653,8 +2636,7 @@ extrude001 = extrude(thePart, length = 75)
       await page.addInitScript(async () => {
         localStorage.setItem(
           'persistCode',
-          `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XZ)
+          `sketch001 = startSketchOn(XZ)
 profile001 = startProfileAt([6.71, -3.66], sketch001)
   |> line(end = [2.65, 9.02], tag = $seg02)
   |> line(end = [3.73, -9.36], tag = $seg01)
@@ -2827,8 +2809,7 @@ extrude003 = extrude(profile011, length = 2.5)
       await page.addInitScript(async () => {
         localStorage.setItem(
           'persistCode',
-          `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XZ)
+          `sketch001 = startSketchOn(XZ)
 profile001 = startProfileAt([34, 42.66], sketch001)
   |> line(end = [102.65, 151.99])
   |> line(end = [76, -138.66])

e2e/playwright/snapshot-tests.spec.ts

@@ -76,11 +76,11 @@ part001 = startSketchOn(-XZ)
   |> xLine(endAbsolute = totalLen, tag = $seg03)
   |> yLine(length = -armThick, tag = $seg01)
   |> angledLineThatIntersects({
-        angle = turns::HALF_TURN,
+        angle = HALF_TURN,
         offset = -armThick,
         intersectTag = seg04
       }, %)
-  |> angledLineToY([segAng(seg04, %) + 180, turns::ZERO], %)
+  |> angledLineToY([segAng(seg04, %) + 180, ZERO], %)
   |> angledLineToY({
         angle = -bottomAng,
         to = -totalHeightHalf - armThick,
@@ -88,12 +88,12 @@ part001 = startSketchOn(-XZ)
   |> xLine(length = endAbsolute = segEndX(seg03) + 0)
   |> yLine(length = -segLen(seg01, %))
   |> angledLineThatIntersects({
-        angle = turns::HALF_TURN,
+        angle = HALF_TURN,
         offset = -armThick,
         intersectTag = seg02
       }, %)
   |> angledLineToY([segAng(seg02, %) + 180, -baseHeight], %)
-  |> xLine(endAbsolute = turns::ZERO)
+  |> xLine(endAbsolute = ZERO)
   |> close()
   |> extrude(length = 4)`
       )

e2e/playwright/snapshots/prompt-to-edit/prompt-to-edit-snapshot-tests-spec-ts--change-colour.snap.json

@@ -1,5 +1,5 @@
 {
-  "original_source_code": "sketch001 = startSketchOn('XZ')\nprofile001 = startProfileAt([57.81, 250.51], sketch001)\n  |> line(end = [121.13, 56.63], tag = $seg02)\n  |> line(end = [83.37, -34.61], tag = $seg01)\n  |> line(end = [19.66, -116.4])\n  |> line(end = [-221.8, -41.69])\n  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])\n  |> close()\nextrude001 = extrude(profile001, length = 200)\nsketch002 = startSketchOn('XZ')\n  |> startProfileAt([-73.64, -42.89], %)\n  |> xLine(length = 173.71)\n  |> line(end = [-22.12, -94.4])\n  |> xLine(length = -156.98)\n  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])\n  |> close()\nextrude002 = extrude(sketch002, length = 50)\nsketch003 = startSketchOn(XY)\n  |> startProfileAt([52.92, 157.81], %)\n  |> angledLine([0, 176.4], %, $rectangleSegmentA001)\n  |> angledLine([\n       segAng(rectangleSegmentA001) - 90,\n       53.4\n     ], %, $rectangleSegmentB001)\n  |> angledLine([\n       segAng(rectangleSegmentA001),\n       -segLen(rectangleSegmentA001)\n     ], %, $rectangleSegmentC001)\n  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])\n  |> close()\nextrude003 = extrude(sketch003, length = 20)\n",
+  "original_source_code": "sketch001 = startSketchOn('XZ')\nprofile001 = startProfileAt([57.81, 250.51], sketch001)\n  |> line(end = [121.13, 56.63], tag = $seg02)\n  |> line(end = [83.37, -34.61], tag = $seg01)\n  |> line(end = [19.66, -116.4])\n  |> line(end = [-221.8, -41.69])\n  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])\n  |> close()\nextrude001 = extrude(profile001, length = 200)\nsketch002 = startSketchOn('XZ')\n  |> startProfileAt([-73.64, -42.89], %)\n  |> xLine(length = 173.71)\n  |> line(end = [-22.12, -94.4])\n  |> xLine(length = -156.98)\n  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])\n  |> close()\nextrude002 = extrude(sketch002, length = 50)\nsketch003 = startSketchOn('XY')\n  |> startProfileAt([52.92, 157.81], %)\n  |> angledLine([0, 176.4], %, $rectangleSegmentA001)\n  |> angledLine([\n       segAng(rectangleSegmentA001) - 90,\n       53.4\n     ], %, $rectangleSegmentB001)\n  |> angledLine([\n       segAng(rectangleSegmentA001),\n       -segLen(rectangleSegmentA001)\n     ], %, $rectangleSegmentC001)\n  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])\n  |> close()\nextrude003 = extrude(sketch003, length = 20)\n",
   "prompt": "make this neon green please, use #39FF14",
   "source_ranges": [
     {

e2e/playwright/testing-constraints.spec.ts

@@ -4,6 +4,7 @@ import {
   getUtils,
   TEST_COLORS,
   pollEditorLinesSelectedLength,
+  executorInputPath,
   orRunWhenFullSuiteEnabled,
 } from './test-utils'
 import { XOR } from 'lib/utils'
@@ -80,8 +81,7 @@ test.describe('Testing constraints', { tag: ['@skipWin'] }, () => {
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
-        `@settings(defaultLengthUnit = in)
-  yo = 79
+        `yo = 79
   part001 = startSketchOn(XZ)
     |> startProfileAt([-7.54, -26.74], %)
     |> line(end = [74.36, 130.4], tag = $seg01)
@@ -145,8 +145,7 @@ test.describe('Testing constraints', { tag: ['@skipWin'] }, () => {
         await page.addInitScript(async () => {
           localStorage.setItem(
             'persistCode',
-            `@settings(defaultLengthUnit = in)
-      yo = 5
+            `yo = 5
       part001 = startSketchOn(XZ)
         |> startProfileAt([-7.54, -26.74], %)
         |> line(end = [74.36, 130.4], tag = $seg01)
@@ -160,6 +159,31 @@ test.describe('Testing constraints', { tag: ['@skipWin'] }, () => {
         |> xLine(length = segLen(seg_what))
         |> line(endAbsolute = [profileStartX(%), profileStartY(%)])`
           )
+
+          const isChecked = await createNewVariableCheckbox.isChecked()
+          const addVariable = testName === 'Add variable'
+          XOR(isChecked, addVariable) && // XOR because no need to click the checkbox if the state is already correct
+            (await createNewVariableCheckbox.click())
+
+          await page
+            .getByRole('button', { name: 'Add constraining value' })
+            .click()
+
+          // Wait for the codemod to take effect
+          await expect(page.locator('.cm-content')).toContainText(`angle: -57,`)
+          await expect(page.locator('.cm-content')).toContainText(
+            `offset: ${offset},`
+          )
+
+          await pollEditorLinesSelectedLength(page, 2)
+          const activeLinesContent = await page.locator('.cm-activeLine').all()
+          await expect(activeLinesContent[0]).toHaveText(
+            `|> line(end = [74.36, 130.4], tag = $seg01)`
+          )
+          await expect(activeLinesContent[1]).toHaveText(`}, %)`)
+
+          // checking the count of the overlays is a good proxy check that the client sketch scene is in a good state
+          await expect(page.getByTestId('segment-overlay')).toHaveCount(4)
         })
         const u = await getUtils(page)
         await page.setBodyDimensions({ width: 1200, height: 500 })
@@ -253,8 +277,7 @@ test.describe('Testing constraints', { tag: ['@skipWin'] }, () => {
         await page.addInitScript(async () => {
           localStorage.setItem(
             'persistCode',
-            `@settings(defaultLengthUnit = in)
-      yo = 5
+            `yo = 5
       part001 = startSketchOn(XZ)
         |> startProfileAt([-7.54, -26.74], %)
         |> line(end = [74.36, 130.4])
@@ -364,8 +387,7 @@ test.describe('Testing constraints', { tag: ['@skipWin'] }, () => {
         await page.addInitScript(async () => {
           localStorage.setItem(
             'persistCode',
-            `@settings(defaultLengthUnit = in)
-      yo = 5
+            `yo = 5
       part001 = startSketchOn(XZ)
         |> startProfileAt([-7.54, -26.74], %)
         |> line(end = [74.36, 130.4])
@@ -464,13 +486,13 @@ test.describe('Testing constraints', { tag: ['@skipWin'] }, () => {
         testName: 'Add variable, selecting axis',
         addVariable: true,
         axisSelect: true,
-        value: 'turns::QUARTER_TURN - angle001',
+        value: 'QUARTER_TURN - angle001',
       },
       {
         testName: 'No variable, selecting axis',
         addVariable: false,
         axisSelect: true,
-        value: 'turns::QUARTER_TURN - 7',
+        value: 'QUARTER_TURN - 7',
       },
     ] as const
     for (const { testName, addVariable, value, axisSelect } of cases) {
@@ -478,8 +500,7 @@ test.describe('Testing constraints', { tag: ['@skipWin'] }, () => {
         await page.addInitScript(async () => {
           localStorage.setItem(
             'persistCode',
-            `@settings(defaultLengthUnit = in)
-      yo = 5
+            `yo = 5
       part001 = startSketchOn(XZ)
         |> startProfileAt([-7.54, -26.74], %)
         |> line(end = [74.36, 130.4])
@@ -581,8 +602,7 @@ test.describe('Testing constraints', { tag: ['@skipWin'] }, () => {
         await page.addInitScript(async () => {
           localStorage.setItem(
             'persistCode',
-            `@settings(defaultLengthUnit = in)
-      yo = 5
+            `yo = 5
       part001 = startSketchOn(XZ)
         |> startProfileAt([-7.54, -26.74], %)
         |> line(end = [74.36, 130.4])
@@ -668,8 +688,7 @@ test.describe('Testing constraints', { tag: ['@skipWin'] }, () => {
         await page.addInitScript(async () => {
           localStorage.setItem(
             'persistCode',
-            `@settings(defaultLengthUnit = in)
-yo = 5
+            `yo = 5
 part001 = startSketchOn(XZ)
   |> startProfileAt([-7.54, -26.74], %)
   |> line(end = [74.36, 130.4])
@@ -749,8 +768,7 @@ part002 = startSketchOn(XZ)
         await page.addInitScript(async (customCode) => {
           localStorage.setItem(
             'persistCode',
-            `@settings(defaultLengthUnit = in)
-      yo = 5
+            `yo = 5
       part001 = startSketchOn(XZ)
         |> startProfileAt([-7.54, -26.74], %)
         |> line(end = [74.36, 130.4])
@@ -851,8 +869,7 @@ part002 = startSketchOn(XZ)
         await page.addInitScript(async () => {
           localStorage.setItem(
             'persistCode',
-            `@settings(defaultLengthUnit = in)
-      yo = 5
+            `yo = 5
       part001 = startSketchOn(XZ)
         |> startProfileAt([-7.54, -26.74], %)
         |> line(end = [74.36, 130.4])
@@ -918,12 +935,12 @@ part002 = startSketchOn(XZ)
   test.describe('Axis & segment - no modal constraints', () => {
     const cases = [
       {
-        codeAfter: `|> line(endAbsolute = [154.9, turns::ZERO])`,
+        codeAfter: `|> line(endAbsolute = [154.9, ZERO])`,
         axisClick: { x: 950, y: 250 },
         constraintName: 'Snap To X',
       },
       {
-        codeAfter: `|> line(endAbsolute = [turns::ZERO, 61.34])`,
+        codeAfter: `|> line(endAbsolute = [ZERO, 61.34])`,
         axisClick: { x: 600, y: 150 },
         constraintName: 'Snap To Y',
       },
@@ -933,8 +950,7 @@ part002 = startSketchOn(XZ)
         await page.addInitScript(async () => {
           localStorage.setItem(
             'persistCode',
-            `@settings(defaultLengthUnit = in)
-      yo = 5
+            `yo = 5
       part001 = startSketchOn(XZ)
         |> startProfileAt([-7.54, -26.74], %)
         |> line(end = [74.36, 130.4])
@@ -1101,19 +1117,9 @@ test.describe('Electron constraint tests', () => {
       await context.folderSetupFn(async (dir) => {
         const bracketDir = path.join(dir, 'test-sample')
         await fsp.mkdir(bracketDir, { recursive: true })
-        await fsp.writeFile(
-          path.join(bracketDir, 'main.kcl'),
-          `@settings(defaultLengthUnit = in)
-          const part001 = startSketchOn(XY)
-            |> startProfileAt([4.83, 12.56], %)
-            |> line(end = [15.1, 2.48])
-            |> line(end = [3.15, -9.85], tag = $seg01)
-            |> line(end = [-15.17, -4.1])
-            |> angledLine([segAng(seg01), 12.35], %)
-            |> line(end = [-13.02, 10.03])
-            |> close()
-            |> extrude(length = 4)`,
-          'utf-8'
+        await fsp.copyFile(
+          executorInputPath('angled_line.kcl'),
+          path.join(bracketDir, 'main.kcl')
         )
       })
 

e2e/playwright/testing-gizmo.spec.ts

@@ -255,7 +255,7 @@ test.describe(`Testing gizmo, fixture-based`, () => {
     await context.addInitScript(() => {
       localStorage.setItem(
         'persistCode',
-        `@settings(defaultLengthUnit = in)
+        `
         const sketch002 = startSketchOn(XZ)
           |> startProfileAt([-108.83, -57.48], %)
           |> angledLine([0, 105.13], %, $rectangleSegmentA001)

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

@@ -46,7 +46,7 @@ test.describe('Testing in-app sample loading', () => {
       page.getByRole('option', {
         name,
       })
-    const warningText = page.getByText('Overwrite current file with sample?')
+    const warningText = page.getByText('Overwrite current file and units?')
     const confirmButton = page.getByRole('button', { name: 'Submit command' })
 
     await test.step(`Precondition: check the initial code`, async () => {
@@ -110,9 +110,11 @@ test.describe('Testing in-app sample loading', () => {
       const commandMethodOption = page.getByRole('option', {
         name: 'Overwrite',
       })
-      const newFileWarning = page.getByText('Create a new file from sample?')
+      const newFileWarning = page.getByText(
+        'Create a new file, overwrite project units?'
+      )
       const overwriteWarning = page.getByText(
-        'Overwrite current file with sample?'
+        'Overwrite current file and units?'
       )
       const confirmButton = page.getByRole('button', { name: 'Submit command' })
       const projectMenuButton = page.getByTestId('project-sidebar-toggle')

e2e/playwright/testing-segment-overlays.spec.ts

@@ -210,8 +210,7 @@ test.describe('Testing segment overlays', { tag: ['@skipWin'] }, () => {
       await page.addInitScript(async () => {
         localStorage.setItem(
           'persistCode',
-          `@settings(defaultLengthUnit = in)
-      part001 = startSketchOn(XZ)
+          `part001 = startSketchOn(XZ)
         |> startProfileAt([5 + 0, 20 + 0], %)
         |> line(end = [0.5, -14 + 0])
         |> angledLine({ angle = 3 + 0, length = 32 + 0 }, %)
@@ -381,8 +380,7 @@ test.describe('Testing segment overlays', { tag: ['@skipWin'] }, () => {
       await page.addInitScript(async () => {
         localStorage.setItem(
           'persistCode',
-          `@settings(defaultLengthUnit = in)
-    yRel001 = -14
+          `yRel001 = -14
     xRel001 = 0.5
     angle001 = 3
     len001 = 32
@@ -461,8 +459,7 @@ test.describe('Testing segment overlays', { tag: ['@skipWin'] }, () => {
       await page.addInitScript(async () => {
         localStorage.setItem(
           'persistCode',
-          `@settings(defaultLengthUnit = in)
-      part001 = startSketchOn(XZ)
+          `part001 = startSketchOn(XZ)
         |> startProfileAt([0, 0], %)
         |> line(end = [0.5, -14 + 0])
         |> angledLine({ angle = 3 + 0, length = 32 + 0 }, %)
@@ -593,8 +590,7 @@ test.describe('Testing segment overlays', { tag: ['@skipWin'] }, () => {
       await page.addInitScript(async () => {
         localStorage.setItem(
           'persistCode',
-          `@settings(defaultLengthUnit = in)
-      part001 = startSketchOn(XZ)
+          `part001 = startSketchOn(XZ)
         |> startProfileAt([0, 0], %)
         |> line(end = [0.5, -14 + 0])
         |> angledLine({ angle = 3 + 0, length = 32 + 0 }, %)
@@ -755,8 +751,7 @@ test.describe('Testing segment overlays', { tag: ['@skipWin'] }, () => {
       await page.addInitScript(async () => {
         localStorage.setItem(
           'persistCode',
-          `@settings(defaultLengthUnit = in)
-      part001 = startSketchOn(XZ)
+          `part001 = startSketchOn(XZ)
         |> startProfileAt([0, 0], %)
         |> line(end = [0.5, -14 + 0])
         |> angledLine({ angle = 3 + 0, length = 32 + 0 }, %)
@@ -836,8 +831,7 @@ test.describe('Testing segment overlays', { tag: ['@skipWin'] }, () => {
       await page.addInitScript(async () => {
         localStorage.setItem(
           'persistCode',
-          `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XZ)
+          `sketch001 = startSketchOn(XZ)
 profile001 = startProfileAt([56.37, 120.33], sketch001)
   |> line(end = [162.86, 106.48])
   |> arcTo({
@@ -963,8 +957,7 @@ profile001 = startProfileAt([56.37, 120.33], sketch001)
       await page.addInitScript(async () => {
         localStorage.setItem(
           'persistCode',
-          `@settings(defaultLengthUnit = in)
-part001 = startSketchOn(XZ)
+          `part001 = startSketchOn(XZ)
       |> circle(center = [1 + 0, 0], radius = 8)
     `
         )
@@ -1084,8 +1077,7 @@ part001 = startSketchOn(XZ)
       await page.addInitScript(async () => {
         localStorage.setItem(
           'persistCode',
-          `@settings(defaultLengthUnit = in)
-part001 = startSketchOn(XZ)
+          `part001 = startSketchOn(XZ)
   |>startProfileAt([0, 0], %)
   |> line(end = [0.5, -14 + 0])
   |> angledLine({ angle = 3 + 0, length = 32 + 0 }, %)
@@ -1359,8 +1351,7 @@ part001 = startSketchOn(XZ)
             async ({ lineToBeDeleted, extraLine }) => {
               localStorage.setItem(
                 'persistCode',
-                `@settings(defaultLengthUnit = in)
-        part001 = startSketchOn(XZ)
+                `part001 = startSketchOn(XZ)
           |> startProfileAt([5, 6], %)
           |> ${lineToBeDeleted}
           |> line(end = [-10, -15])
@@ -1525,8 +1516,7 @@ part001 = startSketchOn(XZ)
           async ({ lineToBeDeleted }) => {
             localStorage.setItem(
               'persistCode',
-              `@settings(defaultLengthUnit = in)
-      part001 = startSketchOn(XZ)
+              `part001 = startSketchOn(XZ)
         |> startProfileAt([5, 6], %)
         |> ${lineToBeDeleted}
         |> line(end = [-10, -15])

e2e/playwright/testing-selections.spec.ts

@@ -68,20 +68,20 @@ test.describe('Testing selections', { tag: ['@skipWin'] }, () => {
     await u.closeDebugPanel()
     await page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10)
     await expect(page.locator('.cm-content')).toHaveText(
-      `@settings(defaultLengthUnit = in)sketch001 = startSketchOn(XZ)profile001 = startProfileAt(${commonPoints.startAt}, sketch001)`
+      `sketch001 = startSketchOn(XZ)profile001 = startProfileAt(${commonPoints.startAt}, sketch001)`
     )
 
     await page.waitForTimeout(100)
     await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 10)
 
     await expect(page.locator('.cm-content'))
-      .toHaveText(`@settings(defaultLengthUnit = in)sketch001 = startSketchOn(XZ)profile001 = startProfileAt(${commonPoints.startAt}, sketch001)
+      .toHaveText(`sketch001 = startSketchOn(XZ)profile001 = startProfileAt(${commonPoints.startAt}, sketch001)
     |> xLine(length = ${commonPoints.num1})`)
 
     await page.waitForTimeout(100)
     await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 20)
     await expect(page.locator('.cm-content'))
-      .toHaveText(`@settings(defaultLengthUnit = in)sketch001 = startSketchOn(XZ)profile001 = startProfileAt(${
+      .toHaveText(`sketch001 = startSketchOn(XZ)profile001 = startProfileAt(${
       commonPoints.startAt
     }, sketch001)
     |> xLine(length = ${commonPoints.num1})
@@ -89,7 +89,7 @@ test.describe('Testing selections', { tag: ['@skipWin'] }, () => {
     await page.waitForTimeout(100)
     await page.mouse.click(startXPx, 500 - PUR * 20)
     await expect(page.locator('.cm-content'))
-      .toHaveText(`@settings(defaultLengthUnit = in)sketch001 = startSketchOn(XZ)profile001 = startProfileAt(${
+      .toHaveText(`sketch001 = startSketchOn(XZ)profile001 = startProfileAt(${
       commonPoints.startAt
     }, sketch001)
     |> xLine(length = ${commonPoints.num1})
@@ -260,8 +260,7 @@ test.describe('Testing selections', { tag: ['@skipWin'] }, () => {
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
-        `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XZ)
+        `sketch001 = startSketchOn(XZ)
   |> startProfileAt([-79.26, 95.04], %)
   |> line(end = [112.54, 127.64], tag = $seg02)
   |> line(end = [170.36, -121.61], tag = $seg01)
@@ -529,8 +528,7 @@ profile001 = startProfileAt([7.49, 9.96], sketch001)
     await page.addInitScript(async (KCL_DEFAULT_LENGTH) => {
       localStorage.setItem(
         'persistCode',
-        `@settings(defaultLengthUnit = in)
-part001 = startSketchOn(XZ)
+        `part001 = startSketchOn(XZ)
   |> startProfileAt([20, 0], %)
   |> line(end = [7.13, 4 + 0])
   |> angledLine({ angle = 3 + 0, length = 3.14 + 0 }, %)
@@ -749,8 +747,7 @@ part001 = startSketchOn(XZ)
     await page.waitForTimeout(200)
 
     await u.removeCurrentCode()
-    await u.codeLocator.fill(`@settings(defaultLengthUnit = in)
-    sketch001 = startSketchOn(XZ)
+    await u.codeLocator.fill(`sketch001 = startSketchOn(XZ)
     |> startProfileAt([75.8, 317.2], %) // [$startCapTag, $EndCapTag]
     |> angledLine([0, 268.43], %, $rectangleSegmentA001)
     |> angledLine([
@@ -968,8 +965,7 @@ part001 = startSketchOn(XZ)
       async ({ cases }) => {
         localStorage.setItem(
           'persistCode',
-          `@settings(defaultLengthUnit = in)
-  yo = 79
+          `yo = 79
   part001 = startSketchOn(XZ)
     |> startProfileAt([-7.54, -26.74], %)
     |> ${cases[0].expectedCode}
@@ -1024,8 +1020,7 @@ part001 = startSketchOn(XZ)
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
-        `@settings(defaultLengthUnit = in)
-  sketch001 = startSketchOn(XZ)
+        `sketch001 = startSketchOn(XZ)
     |> startProfileAt([-79.26, 95.04], %)
     |> line(end = [112.54, 127.64])
     |> line(end = [170.36, -121.61], tag = $seg01)
@@ -1258,7 +1253,7 @@ part001 = startSketchOn(XZ)
     await page.mouse.click(700, 200)
 
     await expect(page.locator('.cm-content')).toHaveText(
-      `@settings(defaultLengthUnit = in)sketch001 = startSketchOn(XZ)`
+      `sketch001 = startSketchOn(XZ)`
     )
 
     await page.waitForTimeout(600)

e2e/playwright/testing-settings.spec.ts

@@ -271,7 +271,7 @@ test.describe('Testing settings', () => {
           const bracketDir = join(dir, projectName)
           await fsp.mkdir(bracketDir, { recursive: true })
           await fsp.copyFile(
-            executorInputPath('cylinder-inches.kcl'),
+            executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
             join(bracketDir, 'main.kcl')
           )
         }
@@ -699,19 +699,19 @@ test.describe('Testing settings', () => {
           name: 'Current units are: ',
         })
         await gizmo.click()
-        const button = page.locator('ul').getByRole('button', {
+        const button = page.getByRole('button', {
           name: copy,
           exact: true,
         })
         await button.click()
         const toastMessage = page.getByText(
-          `Updated per-file units to ${unitOfMeasure}`
+          `Set default unit to "${unitOfMeasure}" for this project`
         )
         await expect(toastMessage).toBeVisible()
       }
 
-      await changeUnitOfMeasureInGizmo('ft', 'Feet')
       await changeUnitOfMeasureInGizmo('in', 'Inches')
+      await changeUnitOfMeasureInGizmo('ft', 'Feet')
       await changeUnitOfMeasureInGizmo('yd', 'Yards')
       await changeUnitOfMeasureInGizmo('mm', 'Millimeters')
       await changeUnitOfMeasureInGizmo('cm', 'Centimeters')
@@ -951,9 +951,9 @@ test.describe('Testing settings', () => {
       )
     })
 
-    await test.step(`Initial units from settings are ignored`, async () => {
+    await test.step(`Initial units from settings`, async () => {
       await homePage.openProject('project-000')
-      await expect(unitsIndicator).toHaveText('Current units are: mm')
+      await expect(unitsIndicator).toHaveText('Current units are: in')
     })
 
     await test.step(`Manually write inline settings`, async () => {

e2e/playwright/various.spec.ts

@@ -67,11 +67,11 @@ part001 = startSketchOn(-XZ)
 |> xLine(endAbsolute = totalLen, tag = $seg03)
 |> yLine(length = -armThick, tag = $seg01)
 |> angledLineThatIntersects({
-      angle = turns::HALF_TURN,
+      angle = HALF_TURN,
       offset = -armThick,
       intersectTag = seg04
     }, %)
-|> angledLineToY([segAng(seg04) + 180, turns::ZERO], %)
+|> angledLineToY([segAng(seg04) + 180, ZERO], %)
 |> angledLineToY({
       angle = -bottomAng,
       to = -totalHeightHalf - armThick,
@@ -79,12 +79,12 @@ part001 = startSketchOn(-XZ)
 |> xLine(endAbsolute = segEndX(seg03) + 0)
 |> yLine(length = -segLen(seg01))
 |> angledLineThatIntersects({
-      angle = turns::HALF_TURN,
+      angle = HALF_TURN,
       offset = -armThick,
       intersectTag = seg02
     }, %)
 |> angledLineToY([segAng(seg02) + 180, -baseHeight], %)
-|> xLine(endAbsolute = turns::ZERO)
+|> xLine(endAbsolute = ZERO)
 |> close()
 |> extrude(length = 4)`
       )
@@ -483,8 +483,7 @@ test('Sketch on face', async ({ page, homePage, scene, cmdBar, toolbar }) => {
   await page.addInitScript(async () => {
     localStorage.setItem(
       'persistCode',
-      `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XZ)
+      `sketch001 = startSketchOn(XZ)
 |> startProfileAt([3.29, 7.86], %)
 |> line(end = [2.48, 2.44])
 |> line(end = [2.66, 1.17])

package.json

@@ -13,20 +13,20 @@
   "license": "MIT",
   "dependencies": {
     "@codemirror/autocomplete": "^6.18.6",
-    "@codemirror/commands": "^6.8.1",
+    "@codemirror/commands": "^6.8.0",
     "@codemirror/language": "^6.11.0",
-    "@codemirror/lint": "^6.8.5",
+    "@codemirror/lint": "^6.8.4",
     "@codemirror/search": "^6.5.10",
-    "@codemirror/state": "^6.5.2",
+    "@codemirror/state": "^6.4.1",
     "@codemirror/theme-one-dark": "^6.1.2",
-    "@csstools/postcss-oklab-function": "^4.0.8",
+    "@csstools/postcss-oklab-function": "^4.0.7",
     "@fortawesome/fontawesome-svg-core": "^6.7.2",
     "@fortawesome/free-brands-svg-icons": "^6.7.2",
     "@fortawesome/free-solid-svg-icons": "^6.7.2",
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@headlessui/react": "^1.7.19",
-    "@headlessui/tailwindcss": "^0.2.2",
-    "@kittycad/lib": "2.0.23",
+    "@headlessui/tailwindcss": "^0.2.0",
+    "@kittycad/lib": "2.0.21",
     "@lezer/highlight": "^1.2.1",
     "@lezer/lr": "^1.4.1",
     "@react-hook/resize-observer": "^2.0.1",
@@ -37,11 +37,11 @@
     "@xstate/react": "^4.1.1",
     "bonjour-service": "^1.3.0",
     "bson": "^6.10.3",
-    "chokidar": "^4.0.3",
+    "chokidar": "^4.0.1",
     "codemirror": "^6.0.1",
     "decamelize": "^6.0.0",
     "diff": "^7.0.0",
-    "electron-updater": "^6.6.2",
+    "electron-updater": "^6.6.0",
     "fuse.js": "^7.1.0",
     "html2canvas-pro": "^1.5.8",
     "isomorphic-fetch": "^3.0.0",
@@ -164,15 +164,15 @@
     "@iarna/toml": "^2.2.5",
     "@lezer/generator": "^1.7.2",
     "@nabla/vite-plugin-eslint": "^2.0.5",
-    "@playwright/test": "^1.51.1",
+    "@playwright/test": "^1.51.0",
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^15.0.2",
-    "@types/diff": "^7.0.2",
+    "@types/diff": "^7.0.1",
     "@types/electron": "^1.6.10",
     "@types/isomorphic-fetch": "^0.0.39",
     "@types/minimist": "^1.2.5",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^22.13.14",
+    "@types/node": "^22.13.9",
     "@types/pixelmatch": "^5.2.6",
     "@types/pngjs": "^6.0.4",
     "@types/react": "^18.3.4",
@@ -182,13 +182,13 @@
     "@types/ua-parser-js": "^0.7.39",
     "@types/uuid": "^9.0.8",
     "@types/wicg-file-system-access": "^2023.10.5",
-    "@types/ws": "^8.18.0",
-    "@vitejs/plugin-react": "^4.3.4",
+    "@types/ws": "^8.5.13",
+    "@vitejs/plugin-react": "^4.3.0",
     "@vitest/web-worker": "^1.5.0",
     "@xstate/cli": "^0.5.17",
-    "autoprefixer": "^10.4.21",
+    "autoprefixer": "^10.4.19",
     "electron": "^34.1.1",
-    "electron-builder": "^26.0.12",
+    "electron-builder": "^26.0.6",
     "eslint": "^8.0.1",
     "eslint-plugin-css-modules": "^2.12.0",
     "eslint-plugin-import": "^2.31.0",
@@ -220,7 +220,7 @@
     "vite-tsconfig-paths": "^4.3.2",
     "vitest": "^1.6.1",
     "vitest-webgl-canvas-mock": "^1.1.0",
-    "ws": "^8.18.1",
+    "ws": "^8.17.0",
     "yarn": "^1.22.22"
   },
   "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"

public/kcl-samples/dual-basin-utility-sink/main.kcl

@@ -1,7 +1,6 @@
 // Dual-Basin Utility Sink
 // A stainless steel sink unit with dual rectangular basins and six under-counter storage compartments.
 
-// set units
 @settings(defaultLengthUnit = mm)
 
 // globals
@@ -115,7 +114,7 @@ sinkLength = 250
 sinkDepth = 200
 sinkOffsetFront = 40
 sinkOffsetLeft = 350
-sinkSpacing = tableWidth - sinkWidth - (sinkOffsetLeft * 2)
+sinkSpacing = tableWidth - sinkWidth - sinkOffsetLeft*2
 
 sinkPlaneOutside = startSketchOn(tableTopBody, 'START')
 sinkBodyOutside = startProfileAt([-sinkOffsetLeft, sinkOffsetFront], sinkPlaneOutside)
@@ -128,12 +127,9 @@ sinkBodyOutside = startProfileAt([-sinkOffsetLeft, sinkOffsetFront], sinkPlaneOu
   |> extrude(length = sinkDepth)
 
 sinkPlaneInside = startSketchOn(tableTopBody, 'END')
-sinkBodyInside = startProfileAt([
-       sinkOffsetLeft + metalThickness,
-       sinkOffsetFront + metalThickness
-     ], sinkPlaneInside)
-  |> yLine(length = sinkLength - (metalThickness * 2))
-  |> xLine(length = sinkWidth - (metalThickness * 2))
+sinkBodyInside = startProfileAt([sinkOffsetLeft+metalThickness, sinkOffsetFront+metalThickness], sinkPlaneInside)
+  |> yLine(length=sinkLength-metalThickness*2)
+  |> xLine(length=sinkWidth-metalThickness*2)
   |> yLine(length=-sinkLength+metalThickness*2)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
@@ -142,7 +138,7 @@ sinkBodyInside = startProfileAt([
   
 // door panels
 doorGap = 2
-doorWidth = blockSubdivisionWidth - profileThickness - (doorGap * 2)
+doorWidth = blockSubdivisionWidth - profileThickness - doorGap*2
 doorStart = profileThickness+doorGap
 doorHeightAboveTheFloor = pillarHeightAboveTheFloor + doorGap
 doorHeight = blockHeight - doorHeightAboveTheFloor - profileThickness - doorGap
@@ -159,7 +155,7 @@ doorBody = startProfileAt([doorStart, 0], doorPlane)
   |> extrude(length = doorHeight)
 
 // side panels
-panelWidth = blockDepth - profileThickness - (doorGap * 2)
+panelWidth = blockDepth - profileThickness - doorGap*2
 panelCount = doorCount + 1
 panelSpacing = tableWidth - profileThickness
 panelBody = startProfileAt([0, doorStart], doorPlane)
@@ -197,11 +193,8 @@ handleProfilePath = startProfileAt([0 + handleOffset, 0], handlePlane)
 handleSectionPlane = startSketchOn(XZ)
 handleProfileSection = circle(
   handleSectionPlane,
-  center = [
-    handleOffset,
-    handleHeightAboveTheFloor
-  ],
-  radius = 2,
-)
+  center = [handleOffset, handleHeightAboveTheFloor],
+  radius = 2)
+  
 handleBody = sweep(handleProfileSection, path = handleProfilePath)
   |> patternLinear3d(axis = [1, 0, 0], instances = doorCount, distance = blockSubdivisionWidth)

public/kcl-samples/makeup-mirror/main.kcl

@@ -64,10 +64,7 @@ fn mirrorFn(plane, offsetX, offsetY, altitude, radius, tiefe, gestellR, gestellD
        }, %)
     |> xLine(length = gestellD)
     |> arcTo({
-         interior = [
-           offsetX,
-           altitude - gestellR - gestellD
-         ],
+         interior = [offsetX, altitude-gestellR-gestellD],
          end = [profileStartX(%), profileStartY(%)]
        }, %)
     |> close()

public/kcl-samples/pipe-flange-assembly/91251a404-bolt.kcl

@@ -4,6 +4,7 @@
 // set units
 @settings(defaultLengthUnit = in)
 
+
 // import constants
 import boltDiameter, boltLength, boltHeadLength, boltHeadDiameter, boltHexDrive, boltHexFlatLength, boltThreadLength from "globals.kcl"
 

public/kcl-samples/pipe-flange-assembly/main.kcl

@@ -19,15 +19,27 @@ import pipe from "1120t74-pipe.kcl"
 flange()
 flange()
   |> rotate(axis = [0, 1, 0], angle = 180)
-  |> translate(x = 0, y = 0, z = flangeBackHeight * 2 + gasketThickness)
+  |> translate(
+       x = 0,
+       y = 0,
+       z = flangeBackHeight * 2 + gasketThickness,
+     )
 
 // place gasket between the flanges
 gasket()
-  |> translate(x = 0, y = 0, z = -flangeBackHeight - gasketThickness)
+  |> translate(
+       x = 0,
+       y = 0,
+       z = -flangeBackHeight - gasketThickness
+     )
 
 // place eight washers (four front, four back)
 washer()
-  |> translate(x = mountingHolePlacementDiameter / 2, y = 0, z = flangeBaseThickness)
+  |> translate(
+       x = mountingHolePlacementDiameter / 2,
+       y = 0,
+       z = flangeBaseThickness
+     )
   |> patternCircular3d(
        %,
        instances = 4,
@@ -45,7 +57,11 @@ washer()
 
 // place four bolts
 bolt()
-  |> translate(x = mountingHolePlacementDiameter / 2, y = 0, z = flangeBaseThickness + washerThickness)
+  |> translate(
+       x = mountingHolePlacementDiameter / 2,
+       y = 0,
+       z = flangeBaseThickness + washerThickness,
+     )
   |> rotate(roll = 90, pitch = 0, yaw = 0)
   |> patternCircular3d(
        %,
@@ -58,7 +74,11 @@ bolt()
 
 // place four hex nuts
 hexNut()
-  |> translate(x = mountingHolePlacementDiameter / 2, y = 0, z = -(flangeBackHeight * 2 + gasketThickness + flangeBaseThickness + washerThickness + hexNutThickness))
+  |> translate(
+       x = mountingHolePlacementDiameter / 2,
+       y = 0,
+       z = -(flangeBackHeight * 2 + gasketThickness + flangeBaseThickness + washerThickness + hexNutThickness),
+     )
   |> patternCircular3d(
        %,
        instances = 4,

public/kcl-samples/router-template-cross-bar/main.kcl

@@ -14,7 +14,7 @@ radius = 10
 depth = 30
 distanceToInsideEdge = slateWidthHalf + templateThickness + templateGap
 sketch001 = startSketchOn(XZ)
-  |> startProfileAt([0, depth + templateGap], %)
+  |> startProfileAt([ZERO, depth + templateGap], %)
   |> xLine(length = slateWidthHalf - radius, tag = $seg01)
   |> arc({
        angleEnd = 0,
@@ -28,7 +28,7 @@ sketch001 = startSketchOn(XZ)
   |> yLine(length = templateThickness * 2, tag = $seg08)
   |> xLine(endAbsolute = segEndX(seg02) + 0, tag = $seg05)
   |> yLine(endAbsolute = segEndY(seg01) + templateThickness, tag = $seg10)
-  |> xLine(endAbsolute = 0, tag = $seg04)
+  |> xLine(endAbsolute = ZERO, tag = $seg04)
   |> xLine(length = -segLen(seg04))
   |> yLine(length = -segLen(seg10))
   |> xLine(length = -segLen(seg05))

public/kcl-samples/router-template-slate/main.kcl

@@ -28,7 +28,7 @@ sketch001 = startSketchOn(XZ)
   |> yLine(endAbsolute = -templateGap * 2 - (templateDiameter / 2), tag = $seg05)
   |> xLine(endAbsolute = slateWidthHalf + templateThickness, tag = $seg04)
   |> yLine(length = -length002, tag = $seg03)
-  |> xLine(endAbsolute = 0, tag = $seg02)
+  |> xLine(endAbsolute = ZERO, tag = $seg02)
   // |> line(end = [7.78, 11.16])
   |> xLine(length = -segLen(seg02))
   |> yLine(length = segLen(seg03))

public/kcl-samples/walkie-talkie/main.kcl

@@ -32,13 +32,25 @@ talkButton()
 
 // import the frequency knob
 knob()
-  |> translate(x = width / 2 - 0.70, y = -thickness / 2, z = height / 2)
+  |> translate(
+    x = width / 2 - 0.70,
+    y = -thickness / 2,
+    z = height / 2
+    )
 
 // import the buttons
 button()
-  |> translate(x = -(screenWidth / 2 + tolerance), y = -1, z = screenYPosition)
+  |> translate(
+    x = -(screenWidth / 2 + tolerance),
+    y = -1,
+    z = screenYPosition
+    )
 button()
-  |> translate(x = -(screenWidth / 2 + tolerance), y = -1, z = screenYPosition - buttonHeight - (tolerance * 2))
+  |> translate(
+       x = -(screenWidth / 2 + tolerance),
+       y = -1,
+       z = screenYPosition - buttonHeight - (tolerance * 2)
+     )
 button()
   |> rotate(
        %,

rust/Cargo.lock

@@ -1780,7 +1780,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-bumper"
-version = "0.1.57"
+version = "0.1.55"
 dependencies = [
  "anyhow",
  "clap",
@@ -1791,7 +1791,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-derive-docs"
-version = "0.1.57"
+version = "0.1.55"
 dependencies = [
  "Inflector",
  "anyhow",
@@ -1810,7 +1810,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-directory-test-macro"
-version = "0.1.57"
+version = "0.1.55"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1819,7 +1819,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-language-server"
-version = "0.2.57"
+version = "0.2.55"
 dependencies = [
  "anyhow",
  "clap",
@@ -1840,7 +1840,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-language-server-release"
-version = "0.1.57"
+version = "0.1.55"
 dependencies = [
  "anyhow",
  "clap",
@@ -1860,7 +1860,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-lib"
-version = "0.2.57"
+version = "0.2.55"
 dependencies = [
  "anyhow",
  "approx 0.5.1",
@@ -1928,7 +1928,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-python-bindings"
-version = "0.3.57"
+version = "0.3.55"
 dependencies = [
  "anyhow",
  "kcl-lib",
@@ -1943,7 +1943,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-test-server"
-version = "0.1.57"
+version = "0.1.55"
 dependencies = [
  "anyhow",
  "hyper 0.14.32",
@@ -1956,7 +1956,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-to-core"
-version = "0.1.57"
+version = "0.1.55"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -1970,7 +1970,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-wasm-lib"
-version = "0.1.57"
+version = "0.1.55"
 dependencies = [
  "bson",
  "console_error_panic_hook",
@@ -1996,9 +1996,9 @@ dependencies = [
 
 [[package]]
 name = "kittycad"
-version = "0.3.36"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a345fd2a4cb16205f32bd1aa41715045830c59d78c59927fca6580e2a651ac9"
+checksum = "4f6f65645cc07a8f43c34584e4979bf4da16c047cce50c4715fa9381227574d5"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2033,9 +2033,9 @@ dependencies = [
 
 [[package]]
 name = "kittycad-modeling-cmds"
-version = "0.2.108"
+version = "0.2.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58f5fbcfb0fe3384592829cd1a5109aa45fb6a3ffc5ff2d164d2fd528ffd4641"
+checksum = "cb129c1f4906a76e3518e58f61968f16cb56f1279366415d2bae6059aa68fce8"
 dependencies = [
  "anyhow",
  "chrono",

rust/Cargo.toml

@@ -35,8 +35,8 @@ clap = { version = "4.5.31", features = ["derive"] }
 dashmap = { version = "6.1.0" }
 http = "1"
 indexmap = "2.7.0"
-kittycad = { version = "0.3.36", default-features = false, features = ["js", "requests"] }
-kittycad-modeling-cmds = { version = "0.2.108", features = ["ts-rs", "websocket"] }
+kittycad = { version = "0.3.33", default-features = false, features = ["js", "requests"] }
+kittycad-modeling-cmds = { version = "0.2.107", features = ["ts-rs", "websocket"] }
 lazy_static = "1.5.0"
 miette = "7.5.0"
 pyo3 = { version = "0.24.0" }

rust/kcl-bumper/Cargo.toml

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

rust/kcl-derive-docs/Cargo.toml

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

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

@@ -329,7 +329,7 @@ fn do_stdlib_inner(
         let camel_case_arg_name = to_camel_case(&arg_name);
         if ty_string != "ExecState" && ty_string != "Args" {
             let schema = quote! {
-                generator.root_schema_for::<#ty_ident>()
+                #docs_crate::cleanup_number_tuples_root(generator.root_schema_for::<#ty_ident>())
             };
             arg_types.push(quote! {
                 #docs_crate::StdLibFnArg {
@@ -394,7 +394,7 @@ fn do_stdlib_inner(
     let return_type = if !ret_ty_string.is_empty() || ret_ty_string != "()" {
         let ret_ty_string = rust_type_to_openapi_type(&ret_ty_string);
         quote! {
-            let schema = generator.root_schema_for::<#return_type_inner>();
+            let schema = #docs_crate::cleanup_number_tuples_root(generator.root_schema_for::<#return_type_inner>());
             Some(#docs_crate::StdLibFnArg {
                 name: "".to_string(),
                 type_: #ret_ty_string.to_string(),
@@ -816,7 +816,7 @@ fn generate_code_block_test(fn_name: &str, code_block: &str, index: usize) -> pr
         async fn #test_name() -> miette::Result<()> {
             let code = #code_block;
             // Note, `crate` must be kcl_lib
-            let result = match crate::test_server::execute_and_snapshot(code, None).await {
+            let result = match crate::test_server::execute_and_snapshot(code, crate::settings::types::UnitLength::Mm, None).await {
                 Err(crate::errors::ExecError::Kcl(e)) => {
                     return Err(miette::Report::new(crate::errors::Report {
                         error: e.error,

rust/kcl-derive-docs/tests/args_with_lifetime.gen

@@ -31,7 +31,13 @@ mod test_examples_someFn {
     #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
     async fn kcl_test_example_someFn0() -> miette::Result<()> {
         let code = "someFn()";
-        let result = match crate::test_server::execute_and_snapshot(code, None).await {
+        let result = match crate::test_server::execute_and_snapshot(
+            code,
+            crate::settings::types::UnitLength::Mm,
+            None,
+        )
+        .await
+        {
             Err(crate::errors::ExecError::Kcl(e)) => {
                 return Err(miette::Report::new(crate::errors::Report {
                     error: e.error,
@@ -102,7 +108,7 @@ impl crate::docs::StdLibFn for SomeFn {
         vec![crate::docs::StdLibFnArg {
             name: "data".to_string(),
             type_: "Foo".to_string(),
-            schema: generator.root_schema_for::<Foo>(),
+            schema: crate::docs::cleanup_number_tuples_root(generator.root_schema_for::<Foo>()),
             required: true,
             label_required: true,
             description: String::new().to_string(),
@@ -114,7 +120,7 @@ impl crate::docs::StdLibFn for SomeFn {
         let mut settings = schemars::gen::SchemaSettings::openapi3();
         settings.inline_subschemas = inline_subschemas;
         let mut generator = schemars::gen::SchemaGenerator::new(settings);
-        let schema = generator.root_schema_for::<i32>();
+        let schema = crate::docs::cleanup_number_tuples_root(generator.root_schema_for::<i32>());
         Some(crate::docs::StdLibFnArg {
             name: "".to_string(),
             type_: "i32".to_string(),

rust/kcl-derive-docs/tests/args_with_refs.gen

@@ -31,7 +31,13 @@ mod test_examples_someFn {
     #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
     async fn kcl_test_example_someFn0() -> miette::Result<()> {
         let code = "someFn()";
-        let result = match crate::test_server::execute_and_snapshot(code, None).await {
+        let result = match crate::test_server::execute_and_snapshot(
+            code,
+            crate::settings::types::UnitLength::Mm,
+            None,
+        )
+        .await
+        {
             Err(crate::errors::ExecError::Kcl(e)) => {
                 return Err(miette::Report::new(crate::errors::Report {
                     error: e.error,
@@ -102,7 +108,7 @@ impl crate::docs::StdLibFn for SomeFn {
         vec![crate::docs::StdLibFnArg {
             name: "data".to_string(),
             type_: "string".to_string(),
-            schema: generator.root_schema_for::<str>(),
+            schema: crate::docs::cleanup_number_tuples_root(generator.root_schema_for::<str>()),
             required: true,
             label_required: true,
             description: String::new().to_string(),
@@ -114,7 +120,7 @@ impl crate::docs::StdLibFn for SomeFn {
         let mut settings = schemars::gen::SchemaSettings::openapi3();
         settings.inline_subschemas = inline_subschemas;
         let mut generator = schemars::gen::SchemaGenerator::new(settings);
-        let schema = generator.root_schema_for::<i32>();
+        let schema = crate::docs::cleanup_number_tuples_root(generator.root_schema_for::<i32>());
         Some(crate::docs::StdLibFnArg {
             name: "".to_string(),
             type_: "i32".to_string(),

rust/kcl-derive-docs/tests/array.gen

@@ -32,7 +32,13 @@ mod test_examples_show {
     #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
     async fn kcl_test_example_show0() -> miette::Result<()> {
         let code = "This is another code block.\nyes sirrr.\nshow";
-        let result = match crate::test_server::execute_and_snapshot(code, None).await {
+        let result = match crate::test_server::execute_and_snapshot(
+            code,
+            crate::settings::types::UnitLength::Mm,
+            None,
+        )
+        .await
+        {
             Err(crate::errors::ExecError::Kcl(e)) => {
                 return Err(miette::Report::new(crate::errors::Report {
                     error: e.error,
@@ -103,7 +109,9 @@ impl crate::docs::StdLibFn for Show {
         vec![crate::docs::StdLibFnArg {
             name: "args".to_string(),
             type_: "[number]".to_string(),
-            schema: generator.root_schema_for::<[f64; 2usize]>(),
+            schema: crate::docs::cleanup_number_tuples_root(
+                generator.root_schema_for::<[f64; 2usize]>(),
+            ),
             required: true,
             label_required: true,
             description: String::new().to_string(),
@@ -115,7 +123,7 @@ impl crate::docs::StdLibFn for Show {
         let mut settings = schemars::gen::SchemaSettings::openapi3();
         settings.inline_subschemas = inline_subschemas;
         let mut generator = schemars::gen::SchemaGenerator::new(settings);
-        let schema = generator.root_schema_for::<f64>();
+        let schema = crate::docs::cleanup_number_tuples_root(generator.root_schema_for::<f64>());
         Some(crate::docs::StdLibFnArg {
             name: "".to_string(),
             type_: "number".to_string(),

rust/kcl-derive-docs/tests/box.gen

@@ -32,7 +32,13 @@ mod test_examples_show {
     #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
     async fn kcl_test_example_show0() -> miette::Result<()> {
         let code = "This is code.\nIt does other shit.\nshow";
-        let result = match crate::test_server::execute_and_snapshot(code, None).await {
+        let result = match crate::test_server::execute_and_snapshot(
+            code,
+            crate::settings::types::UnitLength::Mm,
+            None,
+        )
+        .await
+        {
             Err(crate::errors::ExecError::Kcl(e)) => {
                 return Err(miette::Report::new(crate::errors::Report {
                     error: e.error,
@@ -103,7 +109,7 @@ impl crate::docs::StdLibFn for Show {
         vec![crate::docs::StdLibFnArg {
             name: "args".to_string(),
             type_: "number".to_string(),
-            schema: generator.root_schema_for::<f64>(),
+            schema: crate::docs::cleanup_number_tuples_root(generator.root_schema_for::<f64>()),
             required: true,
             label_required: true,
             description: String::new().to_string(),
@@ -115,7 +121,7 @@ impl crate::docs::StdLibFn for Show {
         let mut settings = schemars::gen::SchemaSettings::openapi3();
         settings.inline_subschemas = inline_subschemas;
         let mut generator = schemars::gen::SchemaGenerator::new(settings);
-        let schema = generator.root_schema_for::<f64>();
+        let schema = crate::docs::cleanup_number_tuples_root(generator.root_schema_for::<f64>());
         Some(crate::docs::StdLibFnArg {
             name: "".to_string(),
             type_: "number".to_string(),

rust/kcl-derive-docs/tests/doc_comment_with_code.gen

@@ -33,7 +33,13 @@ mod test_examples_my_func {
     #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
     async fn kcl_test_example_my_func0() -> miette::Result<()> {
         let code = "This is another code block.\nyes sirrr.\nmyFunc";
-        let result = match crate::test_server::execute_and_snapshot(code, None).await {
+        let result = match crate::test_server::execute_and_snapshot(
+            code,
+            crate::settings::types::UnitLength::Mm,
+            None,
+        )
+        .await
+        {
             Err(crate::errors::ExecError::Kcl(e)) => {
                 return Err(miette::Report::new(crate::errors::Report {
                     error: e.error,
@@ -104,7 +110,9 @@ impl crate::docs::StdLibFn for MyFunc {
         vec![crate::docs::StdLibFnArg {
             name: "args".to_string(),
             type_: "kittycad::types::InputFormat".to_string(),
-            schema: generator.root_schema_for::<Option<kittycad::types::InputFormat>>(),
+            schema: crate::docs::cleanup_number_tuples_root(
+                generator.root_schema_for::<Option<kittycad::types::InputFormat>>(),
+            ),
             required: false,
             label_required: true,
             description: String::new().to_string(),
@@ -116,7 +124,8 @@ impl crate::docs::StdLibFn for MyFunc {
         let mut settings = schemars::gen::SchemaSettings::openapi3();
         settings.inline_subschemas = inline_subschemas;
         let mut generator = schemars::gen::SchemaGenerator::new(settings);
-        let schema = generator.root_schema_for::<Vec<Sketch>>();
+        let schema =
+            crate::docs::cleanup_number_tuples_root(generator.root_schema_for::<Vec<Sketch>>());
         Some(crate::docs::StdLibFnArg {
             name: "".to_string(),
             type_: "[Sketch]".to_string(),

rust/kcl-derive-docs/tests/lineTo.gen

@@ -33,7 +33,13 @@ mod test_examples_line_to {
     #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
     async fn kcl_test_example_line_to0() -> miette::Result<()> {
         let code = "This is another code block.\nyes sirrr.\nlineTo";
-        let result = match crate::test_server::execute_and_snapshot(code, None).await {
+        let result = match crate::test_server::execute_and_snapshot(
+            code,
+            crate::settings::types::UnitLength::Mm,
+            None,
+        )
+        .await
+        {
             Err(crate::errors::ExecError::Kcl(e)) => {
                 return Err(miette::Report::new(crate::errors::Report {
                     error: e.error,
@@ -105,7 +111,9 @@ impl crate::docs::StdLibFn for LineTo {
             crate::docs::StdLibFnArg {
                 name: "data".to_string(),
                 type_: "LineToData".to_string(),
-                schema: generator.root_schema_for::<LineToData>(),
+                schema: crate::docs::cleanup_number_tuples_root(
+                    generator.root_schema_for::<LineToData>(),
+                ),
                 required: true,
                 label_required: true,
                 description: String::new().to_string(),
@@ -114,7 +122,9 @@ impl crate::docs::StdLibFn for LineTo {
             crate::docs::StdLibFnArg {
                 name: "sketch".to_string(),
                 type_: "Sketch".to_string(),
-                schema: generator.root_schema_for::<Sketch>(),
+                schema: crate::docs::cleanup_number_tuples_root(
+                    generator.root_schema_for::<Sketch>(),
+                ),
                 required: true,
                 label_required: true,
                 description: "the sketch you're adding the line to".to_string(),
@@ -127,7 +137,7 @@ impl crate::docs::StdLibFn for LineTo {
         let mut settings = schemars::gen::SchemaSettings::openapi3();
         settings.inline_subschemas = inline_subschemas;
         let mut generator = schemars::gen::SchemaGenerator::new(settings);
-        let schema = generator.root_schema_for::<Sketch>();
+        let schema = crate::docs::cleanup_number_tuples_root(generator.root_schema_for::<Sketch>());
         Some(crate::docs::StdLibFnArg {
             name: "".to_string(),
             type_: "Sketch".to_string(),

rust/kcl-derive-docs/tests/min.gen

@@ -32,7 +32,13 @@ mod test_examples_min {
     #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
     async fn kcl_test_example_min0() -> miette::Result<()> {
         let code = "This is another code block.\nyes sirrr.\nmin";
-        let result = match crate::test_server::execute_and_snapshot(code, None).await {
+        let result = match crate::test_server::execute_and_snapshot(
+            code,
+            crate::settings::types::UnitLength::Mm,
+            None,
+        )
+        .await
+        {
             Err(crate::errors::ExecError::Kcl(e)) => {
                 return Err(miette::Report::new(crate::errors::Report {
                     error: e.error,
@@ -103,7 +109,9 @@ impl crate::docs::StdLibFn for Min {
         vec![crate::docs::StdLibFnArg {
             name: "args".to_string(),
             type_: "[number]".to_string(),
-            schema: generator.root_schema_for::<Vec<f64>>(),
+            schema: crate::docs::cleanup_number_tuples_root(
+                generator.root_schema_for::<Vec<f64>>(),
+            ),
             required: true,
             label_required: true,
             description: String::new().to_string(),
@@ -115,7 +123,7 @@ impl crate::docs::StdLibFn for Min {
         let mut settings = schemars::gen::SchemaSettings::openapi3();
         settings.inline_subschemas = inline_subschemas;
         let mut generator = schemars::gen::SchemaGenerator::new(settings);
-        let schema = generator.root_schema_for::<f64>();
+        let schema = crate::docs::cleanup_number_tuples_root(generator.root_schema_for::<f64>());
         Some(crate::docs::StdLibFnArg {
             name: "".to_string(),
             type_: "number".to_string(),

rust/kcl-derive-docs/tests/option.gen

@@ -32,7 +32,13 @@ mod test_examples_show {
     #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
     async fn kcl_test_example_show0() -> miette::Result<()> {
         let code = "This is code.\nIt does other shit.\nshow";
-        let result = match crate::test_server::execute_and_snapshot(code, None).await {
+        let result = match crate::test_server::execute_and_snapshot(
+            code,
+            crate::settings::types::UnitLength::Mm,
+            None,
+        )
+        .await
+        {
             Err(crate::errors::ExecError::Kcl(e)) => {
                 return Err(miette::Report::new(crate::errors::Report {
                     error: e.error,
@@ -103,7 +109,9 @@ impl crate::docs::StdLibFn for Show {
         vec![crate::docs::StdLibFnArg {
             name: "args".to_string(),
             type_: "number".to_string(),
-            schema: generator.root_schema_for::<Option<f64>>(),
+            schema: crate::docs::cleanup_number_tuples_root(
+                generator.root_schema_for::<Option<f64>>(),
+            ),
             required: false,
             label_required: true,
             description: String::new().to_string(),
@@ -115,7 +123,7 @@ impl crate::docs::StdLibFn for Show {
         let mut settings = schemars::gen::SchemaSettings::openapi3();
         settings.inline_subschemas = inline_subschemas;
         let mut generator = schemars::gen::SchemaGenerator::new(settings);
-        let schema = generator.root_schema_for::<f64>();
+        let schema = crate::docs::cleanup_number_tuples_root(generator.root_schema_for::<f64>());
         Some(crate::docs::StdLibFnArg {
             name: "".to_string(),
             type_: "number".to_string(),

rust/kcl-derive-docs/tests/option_input_format.gen

@@ -32,7 +32,13 @@ mod test_examples_import {
     #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
     async fn kcl_test_example_import0() -> miette::Result<()> {
         let code = "This is code.\nIt does other shit.\nimport";
-        let result = match crate::test_server::execute_and_snapshot(code, None).await {
+        let result = match crate::test_server::execute_and_snapshot(
+            code,
+            crate::settings::types::UnitLength::Mm,
+            None,
+        )
+        .await
+        {
             Err(crate::errors::ExecError::Kcl(e)) => {
                 return Err(miette::Report::new(crate::errors::Report {
                     error: e.error,
@@ -103,7 +109,9 @@ impl crate::docs::StdLibFn for Import {
         vec![crate::docs::StdLibFnArg {
             name: "args".to_string(),
             type_: "kittycad::types::InputFormat".to_string(),
-            schema: generator.root_schema_for::<Option<kittycad::types::InputFormat>>(),
+            schema: crate::docs::cleanup_number_tuples_root(
+                generator.root_schema_for::<Option<kittycad::types::InputFormat>>(),
+            ),
             required: false,
             label_required: true,
             description: String::new().to_string(),
@@ -115,7 +123,7 @@ impl crate::docs::StdLibFn for Import {
         let mut settings = schemars::gen::SchemaSettings::openapi3();
         settings.inline_subschemas = inline_subschemas;
         let mut generator = schemars::gen::SchemaGenerator::new(settings);
-        let schema = generator.root_schema_for::<f64>();
+        let schema = crate::docs::cleanup_number_tuples_root(generator.root_schema_for::<f64>());
         Some(crate::docs::StdLibFnArg {
             name: "".to_string(),
             type_: "number".to_string(),

rust/kcl-derive-docs/tests/return_vec_box_sketch.gen

@@ -32,7 +32,13 @@ mod test_examples_import {
     #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
     async fn kcl_test_example_import0() -> miette::Result<()> {
         let code = "This is code.\nIt does other shit.\nimport";
-        let result = match crate::test_server::execute_and_snapshot(code, None).await {
+        let result = match crate::test_server::execute_and_snapshot(
+            code,
+            crate::settings::types::UnitLength::Mm,
+            None,
+        )
+        .await
+        {
             Err(crate::errors::ExecError::Kcl(e)) => {
                 return Err(miette::Report::new(crate::errors::Report {
                     error: e.error,
@@ -103,7 +109,9 @@ impl crate::docs::StdLibFn for Import {
         vec![crate::docs::StdLibFnArg {
             name: "args".to_string(),
             type_: "kittycad::types::InputFormat".to_string(),
-            schema: generator.root_schema_for::<Option<kittycad::types::InputFormat>>(),
+            schema: crate::docs::cleanup_number_tuples_root(
+                generator.root_schema_for::<Option<kittycad::types::InputFormat>>(),
+            ),
             required: false,
             label_required: true,
             description: String::new().to_string(),
@@ -115,7 +123,8 @@ impl crate::docs::StdLibFn for Import {
         let mut settings = schemars::gen::SchemaSettings::openapi3();
         settings.inline_subschemas = inline_subschemas;
         let mut generator = schemars::gen::SchemaGenerator::new(settings);
-        let schema = generator.root_schema_for::<Vec<Sketch>>();
+        let schema =
+            crate::docs::cleanup_number_tuples_root(generator.root_schema_for::<Vec<Sketch>>());
         Some(crate::docs::StdLibFnArg {
             name: "".to_string(),
             type_: "[Sketch]".to_string(),

rust/kcl-derive-docs/tests/return_vec_sketch.gen

@@ -32,7 +32,13 @@ mod test_examples_import {
     #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
     async fn kcl_test_example_import0() -> miette::Result<()> {
         let code = "This is code.\nIt does other shit.\nimport";
-        let result = match crate::test_server::execute_and_snapshot(code, None).await {
+        let result = match crate::test_server::execute_and_snapshot(
+            code,
+            crate::settings::types::UnitLength::Mm,
+            None,
+        )
+        .await
+        {
             Err(crate::errors::ExecError::Kcl(e)) => {
                 return Err(miette::Report::new(crate::errors::Report {
                     error: e.error,
@@ -103,7 +109,9 @@ impl crate::docs::StdLibFn for Import {
         vec![crate::docs::StdLibFnArg {
             name: "args".to_string(),
             type_: "kittycad::types::InputFormat".to_string(),
-            schema: generator.root_schema_for::<Option<kittycad::types::InputFormat>>(),
+            schema: crate::docs::cleanup_number_tuples_root(
+                generator.root_schema_for::<Option<kittycad::types::InputFormat>>(),
+            ),
             required: false,
             label_required: true,
             description: String::new().to_string(),
@@ -115,7 +123,8 @@ impl crate::docs::StdLibFn for Import {
         let mut settings = schemars::gen::SchemaSettings::openapi3();
         settings.inline_subschemas = inline_subschemas;
         let mut generator = schemars::gen::SchemaGenerator::new(settings);
-        let schema = generator.root_schema_for::<Vec<Sketch>>();
+        let schema =
+            crate::docs::cleanup_number_tuples_root(generator.root_schema_for::<Vec<Sketch>>());
         Some(crate::docs::StdLibFnArg {
             name: "".to_string(),
             type_: "[Sketch]".to_string(),

rust/kcl-derive-docs/tests/show.gen

@@ -32,7 +32,13 @@ mod test_examples_show {
     #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
     async fn kcl_test_example_show0() -> miette::Result<()> {
         let code = "This is code.\nIt does other shit.\nshow";
-        let result = match crate::test_server::execute_and_snapshot(code, None).await {
+        let result = match crate::test_server::execute_and_snapshot(
+            code,
+            crate::settings::types::UnitLength::Mm,
+            None,
+        )
+        .await
+        {
             Err(crate::errors::ExecError::Kcl(e)) => {
                 return Err(miette::Report::new(crate::errors::Report {
                     error: e.error,
@@ -103,7 +109,9 @@ impl crate::docs::StdLibFn for Show {
         vec![crate::docs::StdLibFnArg {
             name: "args".to_string(),
             type_: "[number]".to_string(),
-            schema: generator.root_schema_for::<Vec<f64>>(),
+            schema: crate::docs::cleanup_number_tuples_root(
+                generator.root_schema_for::<Vec<f64>>(),
+            ),
             required: true,
             label_required: true,
             description: String::new().to_string(),
@@ -115,7 +123,7 @@ impl crate::docs::StdLibFn for Show {
         let mut settings = schemars::gen::SchemaSettings::openapi3();
         settings.inline_subschemas = inline_subschemas;
         let mut generator = schemars::gen::SchemaGenerator::new(settings);
-        let schema = generator.root_schema_for::<()>();
+        let schema = crate::docs::cleanup_number_tuples_root(generator.root_schema_for::<()>());
         Some(crate::docs::StdLibFnArg {
             name: "".to_string(),
             type_: "()".to_string(),

rust/kcl-derive-docs/tests/test_args_with_exec_state.gen

@@ -31,7 +31,13 @@ mod test_examples_some_function {
     #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
     async fn kcl_test_example_some_function0() -> miette::Result<()> {
         let code = "someFunction()";
-        let result = match crate::test_server::execute_and_snapshot(code, None).await {
+        let result = match crate::test_server::execute_and_snapshot(
+            code,
+            crate::settings::types::UnitLength::Mm,
+            None,
+        )
+        .await
+        {
             Err(crate::errors::ExecError::Kcl(e)) => {
                 return Err(miette::Report::new(crate::errors::Report {
                     error: e.error,
@@ -106,7 +112,7 @@ impl crate::docs::StdLibFn for SomeFunction {
         let mut settings = schemars::gen::SchemaSettings::openapi3();
         settings.inline_subschemas = inline_subschemas;
         let mut generator = schemars::gen::SchemaGenerator::new(settings);
-        let schema = generator.root_schema_for::<i32>();
+        let schema = crate::docs::cleanup_number_tuples_root(generator.root_schema_for::<i32>());
         Some(crate::docs::StdLibFnArg {
             name: "".to_string(),
             type_: "i32".to_string(),

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

@@ -1,7 +1,7 @@
 [package]
 name = "kcl-directory-test-macro"
 description = "A tool for generating tests from a directory of kcl files"
-version = "0.1.57"
+version = "0.1.55"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/KittyCAD/modeling-app"

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

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

rust/kcl-language-server/Cargo.toml

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

rust/kcl-language-server/yarn.lock

@@ -2194,9 +2194,9 @@ supports-color@^8.1.1:
     has-flag "^4.0.0"
 
 tar-fs@^2.0.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.2.tgz#425f154f3404cb16cb8ff6e671d45ab2ed9596c5"
-  integrity sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
+  integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
   dependencies:
     chownr "^1.1.1"
     mkdirp-classic "^0.5.2"

rust/kcl-lib/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "kcl-lib"
 description = "KittyCAD Language implementation and tools"
-version = "0.2.57"
+version = "0.2.55"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/KittyCAD/modeling-app"
@@ -104,7 +104,7 @@ tower-lsp = { workspace = true, features = ["proposed", "default"] }
 
 [features]
 default = ["engine"]
-cli = ["dep:clap", "kittycad/clap"]
+cli = ["dep:clap"]
 dhat-heap = ["dep:dhat"]
 # For the lsp server, when run with stdout for rpc we want to disable println.
 # This is used for editor extensions that use the lsp server.
@@ -153,3 +153,8 @@ harness = false
 name = "executor"
 path = "e2e/executor/main.rs"
 required-features = ["engine"]
+
+[[test]]
+name = "modify"
+path = "e2e/modify/main.rs"
+required-features = ["engine"]

rust/kcl-lib/benches/benchmark_kcl_samples.rs

@@ -76,7 +76,7 @@ fn run_benchmarks(c: &mut Criterion) {
         group.bench_function(format!("execute_{}", dir_name), |b| {
             b.iter(|| {
                 if let Err(err) = rt.block_on(async {
-                    let ctx = kcl_lib::ExecutorContext::new_with_default_client().await?;
+                    let ctx = kcl_lib::ExecutorContext::new_with_default_client(Default::default()).await?;
                     let mut exec_state = kcl_lib::ExecState::new(&ctx);
                     ctx.run(black_box(&program), &mut exec_state).await?;
                     ctx.close().await;

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

@@ -1,8 +1,6 @@
 //! Cache testing framework.
 
 use kcl_lib::{bust_cache, ExecError, ExecOutcome};
-use kcmc::{each_cmd as mcmd, ModelingCmd};
-use kittycad_modeling_cmds as kcmc;
 
 #[derive(Debug)]
 struct Variation<'a> {
@@ -51,6 +49,45 @@ async fn cache_test(
     img_results
 }
 
+#[tokio::test(flavor = "multi_thread")]
+async fn kcl_test_cache_change_units_changes_output() {
+    let code = r#"part001 = startSketchOn('XY')
+  |> startProfileAt([5.5229, 5.25217], %)
+  |> line(end = [10.50433, -1.19122])
+  |> line(end = [8.01362, -5.48731])
+  |> line(end = [-1.02877, -6.76825])
+  |> line(end = [-11.53311, 2.81559])
+  |> close()
+  |> extrude(length = 4)
+"#;
+
+    let result = cache_test(
+        "change_units_changes_output",
+        vec![
+            Variation {
+                code,
+                settings: &kcl_lib::ExecutorSettings {
+                    units: kcl_lib::UnitLength::In,
+                    ..Default::default()
+                },
+            },
+            Variation {
+                code,
+                settings: &kcl_lib::ExecutorSettings {
+                    units: kcl_lib::UnitLength::Mm,
+                    ..Default::default()
+                },
+            },
+        ],
+    )
+    .await;
+
+    let first = result.first().unwrap();
+    let second = result.last().unwrap();
+
+    assert!(first.1 != second.1);
+}
+
 #[tokio::test(flavor = "multi_thread")]
 async fn kcl_test_cache_change_grid_visualizes_grid_off_to_on() {
     let code = r#"part001 = startSketchOn('XY')
@@ -216,69 +253,3 @@ extrude(sketch001, length = 4)
         second.artifact_graph.len()
     );
 }
-
-#[tokio::test(flavor = "multi_thread")]
-async fn kcl_test_cache_empty_file_pop_cache_empty_file_planes_work() {
-    // Get the current working directory.
-    let code = "";
-
-    let ctx = kcl_lib::ExecutorContext::new_with_default_client().await.unwrap();
-    let program = kcl_lib::Program::parse_no_errs(code).unwrap();
-    let outcome = ctx.run_with_caching(program).await.unwrap();
-
-    // Ensure nothing is left in the batch
-    assert!(ctx.engine.batch().read().await.is_empty());
-    assert!(ctx.engine.batch_end().read().await.is_empty());
-
-    // Ensure the planes work, and we can show or hide them.
-    // Hide/show the grid.
-    let default_planes = ctx.engine.get_default_planes().read().await.clone().unwrap();
-
-    // Assure the outcome is the same.
-    assert_eq!(outcome.default_planes, Some(default_planes.clone()));
-
-    ctx.engine
-        .send_modeling_cmd(
-            uuid::Uuid::new_v4(),
-            Default::default(),
-            &ModelingCmd::from(mcmd::ObjectVisible {
-                hidden: false,
-                object_id: default_planes.xy,
-            }),
-        )
-        .await
-        .unwrap();
-
-    // Now simulate an engine pause/network disconnect.
-    // Raw dog clear the scene entirely.
-    ctx.engine
-        .send_modeling_cmd(
-            uuid::Uuid::new_v4(),
-            Default::default(),
-            &ModelingCmd::from(mcmd::SceneClearAll {}),
-        )
-        .await
-        .unwrap();
-
-    // Bust the cache and reset the scene.
-    let outcome = ctx.bust_cache_and_reset_scene().await.unwrap();
-    // Get the default planes.
-    let default_planes = ctx.engine.get_default_planes().read().await.clone().unwrap();
-
-    assert_eq!(outcome.default_planes, Some(default_planes.clone()));
-
-    // Ensure we can show a plane.
-    ctx.engine
-        .send_modeling_cmd(
-            uuid::Uuid::new_v4(),
-            Default::default(),
-            &ModelingCmd::from(mcmd::ObjectVisible {
-                hidden: false,
-                object_id: default_planes.xz,
-            }),
-        )
-        .await
-        .unwrap();
-
-    ctx.close().await;
-}

rust/kcl-lib/e2e/executor/inputs/cylinder-inches.kcl

@@ -1,4 +0,0 @@
-@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XZ)
-  |> circle(center = [0, 0], radius = 20)
-extrude001 = extrude(sketch001, length = 10)

rust/kcl-lib/e2e/executor/inputs/e2e-can-sketch-on-chamfer-no-pipeExpr.kcl

@@ -1,5 +1,4 @@
-@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XZ)
+const sketch001 = startSketchOn(XZ)
   |> startProfileAt([75.8, 317.2], %)
   |> angledLine([0, 268.43], %, $rectangleSegmentA001)
   |> angledLine([
@@ -12,8 +11,8 @@ sketch001 = startSketchOn(XZ)
      ], %, $yo)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $seg02)
   |> close()
-extrude001 = extrude(sketch001, length = 100)
-chamf = chamfer(
+const extrude001 = extrude(sketch001, length = 100)
+const chamf = chamfer(
   extrude001,
   length = 30,
   tags = [

rust/kcl-lib/e2e/executor/inputs/e2e-can-sketch-on-chamfer.kcl

@@ -1,5 +1,4 @@
-@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XZ)
+const sketch001 = startSketchOn(XZ)
   |> startProfileAt([75.8, 317.2], %) // [$startCapTag, $EndCapTag]
   |> angledLine([0, 268.43], %, $rectangleSegmentA001)
   |> angledLine([
@@ -12,7 +11,7 @@ sketch001 = startSketchOn(XZ)
      ], %, $yo)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $seg02)
   |> close()
-extrude001 = extrude(sketch001, length = 100)
+const extrude001 = extrude(sketch001, length = 100)
   |> chamfer(
        length = 30,
        tags = [

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

@@ -2,7 +2,7 @@ mod cache;
 
 use kcl_lib::{
     test_server::{execute_and_export_step, execute_and_snapshot, execute_and_snapshot_no_auth},
-    ExecError,
+    ExecError, UnitLength,
 };
 
 /// The minimum permissible difference between asserted twenty-twenty images.
@@ -26,7 +26,7 @@ pub(crate) fn assert_out(test_name: &str, result: &image::DynamicImage) -> Strin
 async fn kcl_test_fillet_duplicate_tags() {
     let code = kcl_input!("fillet_duplicate_tags");
 
-    let result = execute_and_snapshot(code, None).await;
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await;
     let err = result.expect_err("Code should have failed due to the duplicate edges being filletted");
 
     let err = err.as_kcl_error().unwrap();
@@ -48,7 +48,7 @@ async fn kcl_test_execute_engine_error_return() {
   |> extrude(length = 4)
 "#;
 
-    let result = execute_and_snapshot(code, None).await;
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await;
     assert!(result.is_err());
     assert_eq!(
         result.err().unwrap().to_string(),
@@ -61,7 +61,7 @@ async fn kcl_test_execute_i_shape() {
     // This is some code from lee that starts a pipe expression with a variable.
     let code = kcl_input!("i_shape");
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("i_shape", &result);
 }
 
@@ -70,7 +70,7 @@ async fn kcl_test_execute_i_shape() {
 async fn kcl_test_execute_pipes_on_pipes() {
     let code = kcl_input!("pipes_on_pipes");
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("pipes_on_pipes", &result);
 }
 
@@ -78,7 +78,7 @@ async fn kcl_test_execute_pipes_on_pipes() {
 async fn kcl_test_execute_cylinder() {
     let code = kcl_input!("cylinder");
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("cylinder", &result);
 }
 
@@ -86,7 +86,7 @@ async fn kcl_test_execute_cylinder() {
 async fn kcl_test_execute_kittycad_svg() {
     let code = kcl_input!("kittycad_svg");
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("kittycad_svg", &result);
 }
 
@@ -94,7 +94,7 @@ async fn kcl_test_execute_kittycad_svg() {
 async fn kcl_test_execute_lsystem() {
     let code = kcl_input!("lsystem");
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("lsystem", &result);
 }
 
@@ -102,7 +102,7 @@ async fn kcl_test_execute_lsystem() {
 async fn kcl_test_member_expression_sketch() {
     let code = kcl_input!("member_expression_sketch");
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("member_expression_sketch", &result);
 }
 
@@ -110,7 +110,7 @@ async fn kcl_test_member_expression_sketch() {
 async fn kcl_test_helix_defaults() {
     let code = kcl_input!("helix_defaults");
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("helix_defaults", &result);
 }
 
@@ -118,7 +118,7 @@ async fn kcl_test_helix_defaults() {
 async fn kcl_test_helix_defaults_negative_extrude() {
     let code = kcl_input!("helix_defaults_negative_extrude");
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("helix_defaults_negative_extrude", &result);
 }
 
@@ -126,7 +126,7 @@ async fn kcl_test_helix_defaults_negative_extrude() {
 async fn kcl_test_helix_with_length() {
     let code = kcl_input!("helix_with_length");
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("helix_with_length", &result);
 }
 
@@ -134,7 +134,7 @@ async fn kcl_test_helix_with_length() {
 async fn kcl_test_dimensions_match() {
     let code = kcl_input!("dimensions_match");
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("dimensions_match", &result);
 }
 
@@ -142,7 +142,7 @@ async fn kcl_test_dimensions_match() {
 async fn kcl_test_close_arc() {
     let code = kcl_input!("close_arc");
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("close_arc", &result);
 }
 
@@ -150,7 +150,7 @@ async fn kcl_test_close_arc() {
 async fn kcl_test_negative_args() {
     let code = kcl_input!("negative_args");
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("negative_args", &result);
 }
 
@@ -164,7 +164,7 @@ async fn kcl_test_basic_tangential_arc_with_point() {
     |> extrude(length = 10)
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("tangential_arc_with_point", &result);
 }
 
@@ -178,7 +178,7 @@ async fn kcl_test_basic_tangential_arc_to() {
     |> extrude(length = 10)
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("tangential_arc_to", &result);
 }
 
@@ -205,7 +205,7 @@ box(30, 43, 18, '-xy')
 let thing = box(-12, -15, 10, 'yz')
 box(-20, -5, 10, 'xy')"#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("different_planes_same_drawing", &result);
 }
 
@@ -263,7 +263,7 @@ part004 = startSketchOn(YZ)
   |> close()
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("lots_of_planes", &result);
 }
 
@@ -280,7 +280,7 @@ async fn kcl_test_holes() {
   |> extrude(length = 2)
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("holes", &result);
 }
 
@@ -299,7 +299,7 @@ async fn optional_params() {
 
 thing = other_circle([2, 2], 20)
 "#;
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("optional_params", &result);
 }
 
@@ -335,7 +335,7 @@ part = roundedRectangle([0, 0], 20, 20, 4)
   |> extrude(length = 2)
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("rounded_with_holes", &result);
 }
 
@@ -343,7 +343,7 @@ part = roundedRectangle([0, 0], 20, 20, 4)
 async fn kcl_test_top_level_expression() {
     let code = r#"startSketchOn(XY) |> circle(center = [0,0], radius= 22) |> extrude(length = 14)"#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("top_level_expression", &result);
 }
 
@@ -357,7 +357,7 @@ part =  startSketchOn(XY)
     |> extrude(length = 1)
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("patterns_linear_basic_with_math", &result);
 }
 
@@ -369,7 +369,7 @@ async fn kcl_test_patterns_linear_basic() {
     |> extrude(length = 1)
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("patterns_linear_basic", &result);
 }
 
@@ -385,7 +385,7 @@ async fn kcl_test_patterns_linear_basic_3d() {
     |> patternLinear3d(axis = [1, 0, 1], instances = 4, distance = 6)
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("patterns_linear_basic_3d", &result);
 }
 
@@ -397,7 +397,7 @@ async fn kcl_test_patterns_linear_basic_negative_distance() {
     |> extrude(length = 1)
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("patterns_linear_basic_negative_distance", &result);
 }
 
@@ -409,7 +409,7 @@ async fn kcl_test_patterns_linear_basic_negative_axis() {
     |> extrude(length = 1)
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("patterns_linear_basic_negative_axis", &result);
 }
 
@@ -430,7 +430,7 @@ rectangle = startSketchOn(XY)
 
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("patterns_linear_basic_holes", &result);
 }
 
@@ -442,7 +442,7 @@ async fn kcl_test_patterns_circular_basic_2d() {
     |> extrude(length = 1)
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("patterns_circular_basic_2d", &result);
 }
 
@@ -458,7 +458,7 @@ async fn kcl_test_patterns_circular_basic_3d() {
     |> patternCircular3d(axis = [0,0, 1], center = [-20, -20, -20], instances = 41, arcDegrees = 360, rotateDuplicates = false)
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("patterns_circular_basic_3d", &result);
 }
 
@@ -474,7 +474,7 @@ async fn kcl_test_patterns_circular_3d_tilted_axis() {
     |> patternCircular3d(axis = [1,1,0], center = [10, 0, 10], instances = 11, arcDegrees = 360, rotateDuplicates = true)
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("patterns_circular_3d_tilted_axis", &result);
 }
 
@@ -483,7 +483,7 @@ async fn kcl_test_import_file_doesnt_exist() {
     let code = r#"import 'thing.obj'
 model = cube"#;
 
-    let result = execute_and_snapshot(code, None).await;
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await;
     assert!(result.is_err());
     assert_eq!(
         result.err().unwrap().to_string(),
@@ -496,7 +496,7 @@ async fn kcl_test_import_obj_with_mtl() {
     let code = r#"import 'e2e/executor/inputs/cube.obj'
 model = cube"#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("import_obj_with_mtl", &result);
 }
 
@@ -506,7 +506,7 @@ async fn kcl_test_import_obj_with_mtl_units() {
 import 'e2e/executor/inputs/cube.obj'
 model = cube"#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("import_obj_with_mtl_units", &result);
 }
 
@@ -515,7 +515,7 @@ async fn kcl_test_import_stl() {
     let code = r#"import 'e2e/executor/inputs/2-5-long-m8-chc-screw.stl' as screw
 model = screw"#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("import_stl", &result);
 }
 
@@ -524,7 +524,7 @@ async fn kcl_test_import_gltf_with_bin() {
     let code = r#"import 'e2e/executor/inputs/cube.gltf'
 model = cube"#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("import_gltf_with_bin", &result);
 }
 
@@ -533,7 +533,7 @@ async fn kcl_test_import_gltf_embedded() {
     let code = r#"import 'e2e/executor/inputs/cube-embedded.gltf' as cube
 model = cube"#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("import_gltf_embedded", &result);
 }
 
@@ -542,7 +542,7 @@ async fn kcl_test_import_glb() {
     let code = r#"import 'e2e/executor/inputs/cube.glb'
 model = cube"#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("import_glb", &result);
 }
 
@@ -551,7 +551,7 @@ async fn kcl_test_import_glb_no_assign() {
     let code = r#"import 'e2e/executor/inputs/cube.glb'
 cube"#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("import_glb_no_assign", &result);
 }
 
@@ -561,7 +561,7 @@ async fn kcl_test_import_ext_doesnt_match() {
 import 'e2e/executor/inputs/cube.gltf'
 model = cube"#;
 
-    let result = execute_and_snapshot(code, None).await;
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await;
     assert!(result.is_err());
     assert_eq!(
         result.err().unwrap().to_string(),
@@ -586,15 +586,14 @@ async fn kcl_test_cube_mm() {
 myCube = cube([0,0], 10)
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("cube_mm", &result);
 }
 
 #[tokio::test(flavor = "multi_thread")]
 async fn kcl_test_cube_cm() {
-    let code = r#"@settings(defaultLengthUnit = cm)
-fn cube = (pos, scale) => {
-  sg = startSketchOn('XY')
+    let code = r#"fn cube = (pos, scale) => {
+  sg = startSketchOn(XY)
     |> startProfileAt(pos, %)
     |> line(end = [0, scale])
     |> line(end = [scale, 0])
@@ -608,15 +607,14 @@ fn cube = (pos, scale) => {
 myCube = cube([0,0], 10)
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Cm, None).await.unwrap();
     assert_out("cube_cm", &result);
 }
 
 #[tokio::test(flavor = "multi_thread")]
 async fn kcl_test_cube_m() {
-    let code = r#"@settings(defaultLengthUnit = m)
-fn cube = (pos, scale) => {
-  sg = startSketchOn('XY')
+    let code = r#"fn cube = (pos, scale) => {
+  sg = startSketchOn(XY)
     |> startProfileAt(pos, %)
     |> line(end = [0, scale])
     |> line(end = [scale, 0])
@@ -630,15 +628,14 @@ fn cube = (pos, scale) => {
 myCube = cube([0,0], 10)
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::M, None).await.unwrap();
     assert_out("cube_m", &result);
 }
 
 #[tokio::test(flavor = "multi_thread")]
 async fn kcl_test_cube_in() {
-    let code = r#"@settings(defaultLengthUnit = in)
-fn cube = (pos, scale) => {
-  sg = startSketchOn('XY')
+    let code = r#"fn cube = (pos, scale) => {
+  sg = startSketchOn(XY)
     |> startProfileAt(pos, %)
     |> line(end = [0, scale])
     |> line(end = [scale, 0])
@@ -652,15 +649,14 @@ fn cube = (pos, scale) => {
 myCube = cube([0,0], 10)
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::In, None).await.unwrap();
     assert_out("cube_in", &result);
 }
 
 #[tokio::test(flavor = "multi_thread")]
 async fn kcl_test_cube_ft() {
-    let code = r#"@settings(defaultLengthUnit = ft)
-fn cube = (pos, scale) => {
-  sg = startSketchOn('XY')
+    let code = r#"fn cube = (pos, scale) => {
+  sg = startSketchOn(XY)
     |> startProfileAt(pos, %)
     |> line(end = [0, scale])
     |> line(end = [scale, 0])
@@ -674,15 +670,14 @@ fn cube = (pos, scale) => {
 myCube = cube([0,0], 10)
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Ft, None).await.unwrap();
     assert_out("cube_ft", &result);
 }
 
 #[tokio::test(flavor = "multi_thread")]
 async fn kcl_test_cube_yd() {
-    let code = r#"@settings(defaultLengthUnit = yd)
-fn cube = (pos, scale) => {
-  sg = startSketchOn('XY')
+    let code = r#"fn cube = (pos, scale) => {
+  sg = startSketchOn(XY)
     |> startProfileAt(pos, %)
     |> line(end = [0, scale])
     |> line(end = [scale, 0])
@@ -696,7 +691,7 @@ fn cube = (pos, scale) => {
 myCube = cube([0,0], 10)
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Yd, None).await.unwrap();
     assert_out("cube_yd", &result);
 }
 
@@ -724,7 +719,7 @@ part002 = startSketchOn(part001, part001.sketch.tags.here)
   |> extrude(length = 1)
 "#;
 
-    let result = execute_and_snapshot(code, None).await;
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await;
 
     let err = result.err().unwrap();
     let ExecError::Kcl(err) = err else {
@@ -768,7 +763,7 @@ part003 = startSketchOn(part002, "end")
   |> extrude(length = 5)
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("sketch_on_face_of_face", &result);
 }
 
@@ -785,7 +780,7 @@ async fn kcl_test_stdlib_kcl_error_right_code_path() {
   |> extrude(length = 2)
 "#;
 
-    let result = execute_and_snapshot(code, None).await;
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await;
     let err = result.err().unwrap();
     let ExecError::Kcl(err) = err else {
         panic!("Expected KCL error, found {err}");
@@ -816,7 +811,7 @@ part002 = startSketchOn(part001, "end")
   |> extrude(length = 5)
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("sketch_on_face_circle", &result);
 }
 
@@ -858,7 +853,7 @@ part = rectShape([0, 0], 20, 20)
      )
 "#;
 
-    let result = execute_and_snapshot(code, None).await;
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await;
     let err = result.err().unwrap();
     let ExecError::Kcl(err) = err else {
         panic!("Expected KCL error, found {err}");
@@ -885,7 +880,7 @@ async fn kcl_test_simple_revolve() {
 
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("simple_revolve", &result);
 }
 
@@ -905,7 +900,7 @@ async fn kcl_test_simple_revolve_uppercase() {
 
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("simple_revolve_uppercase", &result);
 }
 
@@ -925,7 +920,7 @@ async fn kcl_test_simple_revolve_negative() {
 
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("simple_revolve_negative", &result);
 }
 
@@ -945,7 +940,7 @@ async fn kcl_test_revolve_bad_angle_low() {
 
 "#;
 
-    let result = execute_and_snapshot(code, None).await;
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await;
 
     assert!(result.is_err());
     assert!(result
@@ -971,7 +966,7 @@ async fn kcl_test_revolve_bad_angle_high() {
 
 "#;
 
-    let result = execute_and_snapshot(code, None).await;
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await;
 
     assert!(result.is_err());
     assert!(result
@@ -997,7 +992,7 @@ async fn kcl_test_simple_revolve_custom_angle() {
 
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("simple_revolve_custom_angle", &result);
 }
 
@@ -1017,7 +1012,7 @@ async fn kcl_test_simple_revolve_custom_axis() {
 
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("simple_revolve_custom_axis", &result);
 }
 
@@ -1041,7 +1036,7 @@ sketch001 = startSketchOn(box, "end")
 
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("revolve_on_edge", &result);
 }
 
@@ -1065,7 +1060,7 @@ sketch001 = startSketchOn(box, revolveAxis)
 
 "#;
 
-    let result = execute_and_snapshot(code, None).await;
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await;
 
     result.unwrap_err();
     //this fails right now, but slightly differently, lets just say its enough for it to fail - mike
@@ -1093,7 +1088,7 @@ sketch001 = startSketchOn(box, "END")
     )
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("revolve_on_face_circle_edge", &result);
 }
 
@@ -1115,7 +1110,7 @@ sketch001 = startSketchOn(box, "END")
     )
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("revolve_on_face_circle", &result);
 }
 
@@ -1141,7 +1136,7 @@ sketch001 = startSketchOn(box, "end")
   )
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("revolve_on_face", &result);
 }
 
@@ -1155,7 +1150,7 @@ async fn kcl_test_basic_revolve_circle() {
     )
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("basic_revolve_circle", &result);
 }
 
@@ -1182,7 +1177,7 @@ part002 = startSketchOn(part001, 'end')
     |> extrude(length = 5)
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("simple_revolve_sketch_on_edge", &result);
 }
 
@@ -1245,7 +1240,7 @@ plumbus1 = circle1
       )
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("plumbus_fillets", &result);
 }
 
@@ -1253,7 +1248,7 @@ plumbus1 = circle1
 async fn kcl_test_empty_file_is_ok() {
     let code = r#""#;
 
-    let result = execute_and_snapshot(code, None).await;
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await;
     result.unwrap();
 }
 
@@ -1283,7 +1278,7 @@ async fn kcl_test_member_expression_in_params() {
 capScrew([0, 0.5, 0], 50, 37.5, 50, 25)
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("member_expression_in_params", &result);
 }
 
@@ -1328,7 +1323,7 @@ bracket = startSketchOn(XY)
      )
 "#;
 
-    let result = execute_and_snapshot(code, None).await;
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await;
     result.unwrap();
 }
 
@@ -1348,7 +1343,7 @@ secondSketch = startSketchOn(part001, '')
   |> extrude(length = 20)
 "#;
 
-    let result = execute_and_snapshot(code, None).await;
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await;
     assert!(result.is_err());
     assert_eq!(
         result.err().unwrap().to_string(),
@@ -1379,7 +1374,7 @@ extrusion = startSketchOn(XY)
   |> extrude(length = height)
 "#;
 
-    let result = execute_and_snapshot(code, None).await;
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await;
     assert!(result.is_err());
     assert_eq!(
         result.err().unwrap().to_string(),
@@ -1412,7 +1407,7 @@ sketch001 = [profile001, profile002]
  extrude(sketch001, length = 10)
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("array_of_sketches", &result);
 }
 
@@ -1449,7 +1444,7 @@ pattn1 = patternLinear3d(
      )
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("pattern3d_array_of_extrudes", &result);
 }
 
@@ -1497,7 +1492,7 @@ baseExtrusion = extrude(sketch001, length = width)
  )
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("fillets_referencing_other_fillets", &result);
 }
 
@@ -1545,7 +1540,7 @@ baseExtrusion = extrude(sketch001, length = width)
    )
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("chamfers_referencing_other_chamfers", &result);
 }
 
@@ -1565,7 +1560,7 @@ async fn kcl_test_shell_with_tag() {
   )
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("shell_with_tag", &result);
 }
 
@@ -1596,7 +1591,7 @@ pattn1 = patternLinear3d(
 )
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("linear_pattern3d_filleted_sketch", &result);
 }
 
@@ -1623,7 +1618,7 @@ pattn2 = patternCircular3d(part001, axis = [0,0, 1], center = [-20, -20, -20], i
 
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("circular_pattern3d_filleted_sketch", &result);
 }
 
@@ -1649,7 +1644,7 @@ part001 = cube([0,0], 20)
 pattn2 = patternCircular3d(part001, axis = [0,0, 1], center = [-20, -20, -20], instances = 5, arcDegrees = 360, rotateDuplicates = false)
 "#;
 
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("circular_pattern3d_chamfered_sketch", &result);
 }
 
@@ -1676,7 +1671,7 @@ part001 = cube([0,0], 20)
 
 "#;
 
-    let result = execute_and_snapshot(code, None).await;
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await;
     let err = result.err().unwrap();
     let ExecError::Kcl(err) = err else {
         panic!("Expected KCL error, found {err}");
@@ -1706,7 +1701,7 @@ async fn kcl_test_duplicate_tags_should_error() {
 let p = triangle(200)
 "#;
 
-    let result = execute_and_snapshot(code, None).await;
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await;
     assert!(result.is_err());
     assert_eq!(
         result.err().unwrap().to_string(),
@@ -1717,49 +1712,49 @@ let p = triangle(200)
 #[tokio::test(flavor = "multi_thread")]
 async fn kcl_test_global_tags() {
     let code = kcl_input!("global-tags");
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("global_tags", &result);
 }
 
 #[tokio::test(flavor = "multi_thread")]
 async fn kcl_test_extrude_inside_fn_with_tags() {
     let code = kcl_input!("extrude-inside-fn-with-tags");
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("extrude-inside-fn-with-tags", &result);
 }
 
 #[tokio::test(flavor = "multi_thread")]
 async fn kcl_test_pattern_vase() {
     let code = kcl_input!("pattern_vase");
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("pattern_vase", &result);
 }
 
 #[tokio::test(flavor = "multi_thread")]
 async fn kcl_test_scoped_tags() {
     let code = kcl_input!("scoped-tags");
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("scoped_tags", &result);
 }
 
 #[tokio::test(flavor = "multi_thread")]
 async fn kcl_test_order_sketch_extrude_in_order() {
     let code = kcl_input!("order-sketch-extrude-in-order");
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("order-sketch-extrude-in-order", &result);
 }
 
 #[tokio::test(flavor = "multi_thread")]
 async fn kcl_test_order_sketch_extrude_out_of_order() {
     let code = kcl_input!("order-sketch-extrude-out-of-order");
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("order-sketch-extrude-out-of-order", &result);
 }
 
 #[tokio::test(flavor = "multi_thread")]
 async fn kcl_test_extrude_custom_plane() {
     let code = kcl_input!("extrude-custom-plane");
-    let result = execute_and_snapshot(code, None).await.unwrap();
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
     assert_out("extrude-custom-plane", &result);
 }
 
@@ -1781,7 +1776,7 @@ async fn kcl_test_arc_error_same_start_end() {
      )
 "#;
 
-    let result = execute_and_snapshot(code, None).await;
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await;
     assert!(result.is_err());
     assert_eq!(
         result.err().unwrap().to_string(),
@@ -1801,7 +1796,7 @@ async fn kcl_test_angled_line_to_x_90() {
 example = extrude(exampleSketch, length = 10)
 "#;
 
-    let result = execute_and_snapshot(code, None).await;
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await;
     assert!(result.is_err());
     assert_eq!(
         result.err().unwrap().to_string(),
@@ -1821,7 +1816,7 @@ async fn kcl_test_angled_line_to_x_270() {
 example = extrude(exampleSketch, length = 10)
 "#;
 
-    let result = execute_and_snapshot(code, None).await;
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await;
     assert!(result.is_err());
     assert_eq!(
         result.err().unwrap().to_string(),
@@ -1841,7 +1836,7 @@ async fn kcl_test_angled_line_to_y_0() {
 example = extrude(exampleSketch, length = 10)
 "#;
 
-    let result = execute_and_snapshot(code, None).await;
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await;
     assert!(result.is_err());
     assert_eq!(
         result.err().unwrap().to_string(),
@@ -1861,7 +1856,7 @@ async fn kcl_test_angled_line_to_y_180() {
 example = extrude(exampleSketch, length = 10)
 "#;
 
-    let result = execute_and_snapshot(code, None).await;
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await;
     assert!(result.is_err());
     assert_eq!(
         result.err().unwrap().to_string(),
@@ -1881,7 +1876,7 @@ async fn kcl_test_angled_line_of_x_length_90() {
 extrusion = extrude(sketch001, length = 10)
 "#;
 
-    let result = execute_and_snapshot(code, None).await;
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await;
     assert!(result.is_err());
     assert_eq!(
         result.err().unwrap().to_string(),
@@ -1901,7 +1896,7 @@ async fn kcl_test_angled_line_of_x_length_270() {
 extrusion = extrude(sketch001, length = 10)
 "#;
 
-    let result = execute_and_snapshot(code, None).await;
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await;
     assert!(result.is_err());
     assert_eq!(
         result.err().unwrap().to_string(),
@@ -1923,7 +1918,7 @@ async fn kcl_test_angled_line_of_y_length_0() {
 example = extrude(exampleSketch, length = 10)
 "#;
 
-    let result = execute_and_snapshot(code, None).await;
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await;
     assert!(result.is_err());
     assert_eq!(
         result.err().unwrap().to_string(),
@@ -1945,7 +1940,7 @@ async fn kcl_test_angled_line_of_y_length_180() {
 example = extrude(exampleSketch, length = 10)
 "#;
 
-    let result = execute_and_snapshot(code, None).await;
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await;
     assert!(result.is_err());
     assert_eq!(
         result.err().unwrap().to_string(),
@@ -1967,7 +1962,7 @@ async fn kcl_test_angled_line_of_y_length_negative_180() {
 example = extrude(exampleSketch, length = 10)
 "#;
 
-    let result = execute_and_snapshot(code, None).await;
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await;
     assert!(result.is_err());
     assert_eq!(
         result.err().unwrap().to_string(),
@@ -1984,7 +1979,7 @@ async fn kcl_test_error_inside_fn_also_has_source_range_of_call_site() {
 someFunction('INVALID')
 "#;
 
-    let result = execute_and_snapshot(code, None).await;
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await;
     assert!(result.is_err());
     assert_eq!(
         result.err().unwrap().to_string(),
@@ -2005,7 +2000,7 @@ async fn kcl_test_error_inside_fn_also_has_source_range_of_call_site_recursive()
 someFunction('INVALID')
 "#;
 
-    let result = execute_and_snapshot(code, None).await;
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await;
     assert!(result.is_err());
     assert_eq!(
         result.err().unwrap().to_string(),
@@ -2029,7 +2024,7 @@ async fn kcl_test_error_no_auth_websocket() {
   )
 "#;
 
-    let result = execute_and_snapshot_no_auth(code, None).await;
+    let result = execute_and_snapshot_no_auth(code, UnitLength::Mm, None).await;
     assert!(result.is_err());
     assert!(result
         .err()
@@ -2055,7 +2050,9 @@ sketch000 = startSketchOn(XY)
     |> line(end = [0, innerDiameter / 2])
 "#;
 
-    let ctx = kcl_lib::ExecutorContext::new_with_default_client().await.unwrap();
+    let ctx = kcl_lib::ExecutorContext::new_with_default_client(Default::default())
+        .await
+        .unwrap();
     let mut exec_state = kcl_lib::ExecState::new(&ctx);
     let program = kcl_lib::Program::parse_no_errs(code).unwrap();
     ctx.run(&program, &mut exec_state).await.unwrap();
@@ -2078,7 +2075,9 @@ async fn kcl_test_ensure_nothing_left_in_batch_multi_file() {
     // Change the current working directory to the test directory.
     std::env::set_current_dir(path.parent().unwrap()).unwrap();
 
-    let ctx = kcl_lib::ExecutorContext::new_with_default_client().await.unwrap();
+    let ctx = kcl_lib::ExecutorContext::new_with_default_client(Default::default())
+        .await
+        .unwrap();
     let mut exec_state = kcl_lib::ExecState::new(&ctx);
     let program = kcl_lib::Program::parse_no_errs(&code).unwrap();
     ctx.run(&program, &mut exec_state).await.unwrap();
@@ -2096,7 +2095,7 @@ async fn kcl_test_better_type_names() {
   |> circle(center = [-95.51, -74.7], radius = 262.23)
   |> appearance(metalness = 0.9)
 "#;
-    let result = execute_and_snapshot(code, None).await;
+    let result = execute_and_snapshot(code, UnitLength::Mm, None).await;
 
     let err = match result.err() {
         Some(x) => match x {
@@ -2115,7 +2114,7 @@ async fn kcl_test_exporting_step_file() {
     // This tests export like how we do it in cli and kcl.py.
     let code = kcl_input!("helix_defaults_negative_extrude");
 
-    let (_, _, files) = execute_and_export_step(code, None).await.unwrap();
+    let (_, _, files) = execute_and_export_step(code, UnitLength::Mm, None).await.unwrap();
     for file in files {
         expectorate::assert_contents(
             format!("e2e/executor/outputs/helix_defaults_negative_extrude_{}", file.name),