Bump: Improve and fix nightly release notes

Move parsing files around (#4626 )
Signed-off-by: Nick Cameron <nrc@ncameron.org>
2024-12-05 07:13:44 -05:00 · 2024-12-05 17:56:49 +13:00 · 2024-12-04 19:06:17 -05:00 · 2024-12-04 22:24:16 +00:00 · 2024-12-04 15:57:17 -06:00 · 2024-12-04 21:06:02 +00:00
203 changed files with 2160 additions and 22416 deletions
--- a/.github/workflows/build-apps.yml
+++ b/.github/workflows/build-apps.yml
@ -5,6 +5,7 @@ on:
  push:
    branches:
      - main
+      - pierremtb/cleaner-nightly-release-notes
    tags:
      - 'v[0-9]+.[0-9]+.[0-9]+'
  schedule:
@ -14,7 +15,8 @@ on:

 env:
  IS_RELEASE: ${{ github.ref_type == 'tag' }}
-  IS_NIGHTLY: ${{ github.event_name == 'schedule' }}
+  # IS_NIGHTLY: ${{ github.event_name == 'schedule' }}
+  IS_NIGHTLY: true

 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@ -256,7 +258,7 @@ jobs:
    runs-on: ubuntu-22.04
    permissions:
      contents: write
-    if: ${{ github.ref_type == 'tag' || github.event_name == 'schedule' }}
+    # if: ${{ github.ref_type == 'tag' || github.event_name == 'schedule' }}
    env:
      VERSION_NO_V: ${{ needs.prepare-files.outputs.version }}
      VERSION: ${{ format('v{0}', needs.prepare-files.outputs.version) }}
@ -313,8 +315,10 @@ jobs:
        env:
          NOTES: ${{ needs.prepare-files.outputs.notes }}
          PUB_DATE: ${{ github.event.repository.updated_at }}
-          WEBSITE_DIR: ${{ github.event_name == 'schedule' && 'dl.zoo.dev/releases/modeling-app/nightly' || 'dl.zoo.dev/releases/modeling-app' }}
-          URL_CODED_NAME: ${{ github.event_name == 'schedule' && 'Zoo%20Modeling%20App%20%28Nightly%29' || 'Zoo%20Modeling%20App' }}
+          # WEBSITE_DIR: ${{ github.event_name == 'schedule' && 'dl.zoo.dev/releases/modeling-app/nightly' || 'dl.zoo.dev/releases/modeling-app' }}
+          WEBSITE_DIR: ${{ 'dl.zoo.dev/releases/modeling-app/nightly' }}
+          # URL_CODED_NAME: ${{ github.event_name == 'schedule' && 'Zoo%20Modeling%20App%20%28Nightly%29' || 'Zoo%20Modeling%20App' }}
+          URL_CODED_NAME: ${{ 'Zoo%20Modeling%20App%20%28Nightly%29' }}
        run: |
          RELEASE_DIR=https://${WEBSITE_DIR}
          jq --null-input \
@ -362,6 +366,17 @@ jobs:
      - name: List artifacts
        run: "ls -R out"

+      - name: Set more complete nightly release notes
+        if: ${{ env.IS_NIGHTLY == 'true' }}
+        run: |
+          # Note: prefered going this way instead of a full clone in the checkout step,
+          # see https://github.com/actions/checkout/issues/1471
+          git fetch --prune --unshallow --tags
+          export TAG="nightly-v$VERSION"
+          export PREVIOUS_TAG=$(git describe --tags --match="nightly-v[0-9]*" --abbrev=0)
+          export NOTES=$(./scripts/get-nightly-changelog.sh)
+          yarn files:set-notes
+
      - name: Authenticate to Google Cloud
        if: ${{ env.IS_NIGHTLY == 'true' }}
        uses: 'google-github-actions/auth@v2.1.7'
@ -382,3 +397,14 @@ jobs:
          glob: '*'
          parent: false
          destination: 'dl.kittycad.io/releases/modeling-app/nightly'
+
+      - name: Tag nightly commit
+        if: ${{ env.IS_NIGHTLY == 'true' }}
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const { VERSION } = process.env          
+            const { owner, repo } = context.repo
+            const { sha } = context
+            const ref = `refs/tags/nightly-${VERSION}`
+            github.rest.git.createRef({ owner, repo, sha, ref })
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@ -68,7 +68,7 @@ jobs:
    - name: Download Wasm Cache
      id: download-wasm
      if: needs.check-rust-changes.outputs.rust-changed == 'false'
-      uses: dawidd6/action-download-artifact@v6
+      uses: dawidd6/action-download-artifact@v7
      continue-on-error: true
      with:
        github_token: ${{secrets.GITHUB_TOKEN}}
@ -255,7 +255,7 @@ jobs:
    - name: Download Wasm Cache
      id: download-wasm
      if: needs.check-rust-changes.outputs.rust-changed == 'false'
-      uses: dawidd6/action-download-artifact@v6
+      uses: dawidd6/action-download-artifact@v7
      continue-on-error: true
      with:
        github_token: ${{secrets.GITHUB_TOKEN}}
--- a/docs/kcl/modules.md
+++ b/docs/kcl/modules.md
@ -12,7 +12,7 @@ to other modules.

 ```
 // util.kcl
-export fn increment = (x) => {
+export fn increment(x) {
  return x + 1
 }
 ```
@ -37,11 +37,11 @@ Multiple functions can be exported in a file.

 ```
 // util.kcl
-export fn increment = (x) => {
+export fn increment(x) {
  return x + 1
 }

-export fn decrement = (x) => {
+export fn decrement(x) {
  return x - 1
 }
 ```
--- a/docs/kcl/std.json
+++ b/docs/kcl/std.json
--- a/docs/kcl/types.md
+++ b/docs/kcl/types.md
@ -54,7 +54,7 @@ We also have support for defining your own functions. Functions can take in any
 type of argument. Below is an example of the syntax:

 ```
-fn myFn = (x) => {
+fn myFn(x) {
  return x
 }
 ```
@ -118,7 +118,7 @@ use the tag `rectangleSegmentA001` in any function or expression in the file.
 However if the code was written like this:

 ```
-fn rect = (origin) => {
+fn rect(origin) {
  return startSketchOn('XZ')
    |> startProfileAt(origin, %)
    |> angledLine([0, 191.26], %, $rectangleSegmentA001)
@ -146,7 +146,7 @@ Tags are accessible through the sketch group they are declared in.
 For example the following code works.

 ```
-fn rect = (origin) => {
+fn rect(origin) {
  return startSketchOn('XZ')
    |> startProfileAt(origin, %)
    |> angledLine([0, 191.26], %, $rectangleSegmentA001)
--- a/docs/kcl/types/BinaryOperator.md
+++ b/docs/kcl/types/BinaryOperator.md
@ -1,161 +0,0 @@
---
-title: "BinaryOperator"
-excerpt: ""
-layout: manual
---
-
-
-
-
-
-
-**This schema accepts exactly one of the following:**
-
-Add two numbers.
-
-**enum:** `+`
-
-
-
-
-
-
-
-
----
-Subtract two numbers.
-
-**enum:** `-`
-
-
-
-
-
-
-
-
----
-Multiply two numbers.
-
-**enum:** `*`
-
-
-
-
-
-
-
-
----
-Divide two numbers.
-
-**enum:** `/`
-
-
-
-
-
-
-
-
----
-Modulo two numbers.
-
-**enum:** `%`
-
-
-
-
-
-
-
-
----
-Raise a number to a power.
-
-**enum:** `^`
-
-
-
-
-
-
-
-
----
-Are two numbers equal?
-
-**enum:** `==`
-
-
-
-
-
-
-
-
----
-Are two numbers not equal?
-
-**enum:** `!=`
-
-
-
-
-
-
-
-
----
-Is left greater than right
-
-**enum:** `>`
-
-
-
-
-
-
-
-
----
-Is left greater than or equal to right
-
-**enum:** `>=`
-
-
-
-
-
-
-
-
----
-Is left less than right
-
-**enum:** `<`
-
-
-
-
-
-
-
-
----
-Is left less than or equal to right
-
-**enum:** `<=`
-
-
-
-
-
-
-
-
----
-
-
-
-
--- a/docs/kcl/types/BinaryPart.md
+++ b/docs/kcl/types/BinaryPart.md
@ -1,160 +0,0 @@
---
-title: "BinaryPart"
-excerpt: ""
-layout: manual
---
-
-
-
-
-
-
-**This schema accepts exactly one of the following:**
-
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `Literal`|  | No |
-| `value` |[`LiteralValue`](/docs/kcl/types/LiteralValue)|  | No |
-| `raw` |`string`|  | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: [`Identifier`](/docs/kcl/types/Identifier)|  | No |
-| `name` |`string`|  | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `BinaryExpression`|  | No |
-| `operator` |[`BinaryOperator`](/docs/kcl/types/BinaryOperator)|  | No |
-| `left` |[`BinaryPart`](/docs/kcl/types/BinaryPart)|  | No |
-| `right` |[`BinaryPart`](/docs/kcl/types/BinaryPart)|  | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `CallExpression`|  | No |
-| `callee` |[`Identifier`](/docs/kcl/types/Identifier)|  | No |
-| `arguments` |`[` [`Expr`](/docs/kcl/types/Expr) `]`|  | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `UnaryExpression`|  | No |
-| `operator` |[`UnaryOperator`](/docs/kcl/types/UnaryOperator)|  | No |
-| `argument` |[`BinaryPart`](/docs/kcl/types/BinaryPart)|  | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `MemberExpression`|  | No |
-| `object` |[`MemberObject`](/docs/kcl/types/MemberObject)|  | No |
-| `property` |[`LiteralIdentifier`](/docs/kcl/types/LiteralIdentifier)|  | No |
-| `computed` |`boolean`|  | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `IfExpression`|  | No |
-| `cond` |[`Expr`](/docs/kcl/types/Expr)|  | No |
-| `then_val` |[`Program`](/docs/kcl/types/Program)|  | No |
-| `else_ifs` |`[` [`ElseIf`](/docs/kcl/types/ElseIf) `]`|  | No |
-| `final_else` |[`Program`](/docs/kcl/types/Program)|  | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
----
-
-
-
-
--- a/docs/kcl/types/BodyItem.md
+++ b/docs/kcl/types/BodyItem.md
@ -1,97 +0,0 @@
---
-title: "BodyItem"
-excerpt: ""
-layout: manual
---
-
-
-
-
-
-
-**This schema accepts exactly one of the following:**
-
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `ImportStatement`|  | No |
-| `items` |`[` [`ImportItem`](/docs/kcl/types/ImportItem) `]`|  | No |
-| `path` |`string`|  | No |
-| `raw_path` |`string`|  | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `ExpressionStatement`|  | No |
-| `expression` |[`Expr`](/docs/kcl/types/Expr)|  | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `VariableDeclaration`|  | No |
-| `declarations` |`[` [`VariableDeclarator`](/docs/kcl/types/VariableDeclarator) `]`|  | No |
-| `visibility` |[`ItemVisibility`](/docs/kcl/types/ItemVisibility)|  | No |
-| `kind` |[`VariableKind`](/docs/kcl/types/VariableKind)|  | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `ReturnStatement`|  | No |
-| `argument` |[`Expr`](/docs/kcl/types/Expr)|  | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
----
-
-
-
-
--- a/docs/kcl/types/CommentStyle.md
+++ b/docs/kcl/types/CommentStyle.md
@ -1,41 +0,0 @@
---
-title: "CommentStyle"
-excerpt: ""
-layout: manual
---
-
-
-
-
-
-
-**This schema accepts exactly one of the following:**
-
-Like // foo
-
-**enum:** `line`
-
-
-
-
-
-
-
-
----
-Like /* foo */
-
-**enum:** `block`
-
-
-
-
-
-
-
-
----
-
-
-
-
--- a/docs/kcl/types/ElseIf.md
+++ b/docs/kcl/types/ElseIf.md
@ -1,24 +0,0 @@
---
-title: "ElseIf"
-excerpt: ""
-layout: manual
---
-
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `cond` |[`Expr`](/docs/kcl/types/Expr)|  | No |
-| `then_val` |[`Program`](/docs/kcl/types/Program)|  | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
--- a/docs/kcl/types/EnvironmentRef.md
+++ b/docs/kcl/types/EnvironmentRef.md
@ -1,16 +0,0 @@
---
-title: "EnvironmentRef"
-excerpt: "An index pointing to an environment."
-layout: manual
---
-
-An index pointing to an environment.
-
-**Type:** `integer` (`uint`)
-
-
-
-
-
-
-
--- a/docs/kcl/types/Expr.md
+++ b/docs/kcl/types/Expr.md
@ -1,317 +0,0 @@
---
-title: "Expr"
-excerpt: "An expression can be evaluated to yield a single KCL value."
-layout: manual
---
-
-An expression can be evaluated to yield a single KCL value.
-
-
-
-
-
-**This schema accepts exactly one of the following:**
-
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `Literal`|  | No |
-| `value` |[`LiteralValue`](/docs/kcl/types/LiteralValue)| An expression can be evaluated to yield a single KCL value. | No |
-| `raw` |`string`|  | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: [`Identifier`](/docs/kcl/types/Identifier)|  | No |
-| `name` |`string`|  | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: [`TagDeclarator`](/docs/kcl/types#tag-declaration)|  | No |
-| `value` |`string`|  | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `BinaryExpression`|  | No |
-| `operator` |[`BinaryOperator`](/docs/kcl/types/BinaryOperator)| An expression can be evaluated to yield a single KCL value. | No |
-| `left` |[`BinaryPart`](/docs/kcl/types/BinaryPart)| An expression can be evaluated to yield a single KCL value. | No |
-| `right` |[`BinaryPart`](/docs/kcl/types/BinaryPart)| An expression can be evaluated to yield a single KCL value. | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: [`FunctionExpression`](/docs/kcl/types/FunctionExpression)|  | No |
-| `params` |`[` [`Parameter`](/docs/kcl/types/Parameter) `]`|  | No |
-| `body` |[`Program`](/docs/kcl/types/Program)| An expression can be evaluated to yield a single KCL value. | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `CallExpression`|  | No |
-| `callee` |[`Identifier`](/docs/kcl/types/Identifier)| An expression can be evaluated to yield a single KCL value. | No |
-| `arguments` |`[` [`Expr`](/docs/kcl/types/Expr) `]`|  | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `PipeExpression`|  | No |
-| `body` |`[` [`Expr`](/docs/kcl/types/Expr) `]`|  | No |
-| `nonCodeMeta` |[`NonCodeMeta`](/docs/kcl/types/NonCodeMeta)| An expression can be evaluated to yield a single KCL value. | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `PipeSubstitution`|  | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `ArrayExpression`|  | No |
-| `elements` |`[` [`Expr`](/docs/kcl/types/Expr) `]`|  | No |
-| `nonCodeMeta` |[`NonCodeMeta`](/docs/kcl/types/NonCodeMeta)| An expression can be evaluated to yield a single KCL value. | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `ArrayRangeExpression`|  | No |
-| `startElement` |[`Expr`](/docs/kcl/types/Expr)| An expression can be evaluated to yield a single KCL value. | No |
-| `endElement` |[`Expr`](/docs/kcl/types/Expr)| An expression can be evaluated to yield a single KCL value. | No |
-| `endInclusive` |`boolean`| Is the `end_element` included in the range? | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `ObjectExpression`|  | No |
-| `properties` |`[` [`ObjectProperty`](/docs/kcl/types/ObjectProperty) `]`|  | No |
-| `nonCodeMeta` |[`NonCodeMeta`](/docs/kcl/types/NonCodeMeta)| An expression can be evaluated to yield a single KCL value. | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `MemberExpression`|  | No |
-| `object` |[`MemberObject`](/docs/kcl/types/MemberObject)| An expression can be evaluated to yield a single KCL value. | No |
-| `property` |[`LiteralIdentifier`](/docs/kcl/types/LiteralIdentifier)| An expression can be evaluated to yield a single KCL value. | No |
-| `computed` |`boolean`|  | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `UnaryExpression`|  | No |
-| `operator` |[`UnaryOperator`](/docs/kcl/types/UnaryOperator)| An expression can be evaluated to yield a single KCL value. | No |
-| `argument` |[`BinaryPart`](/docs/kcl/types/BinaryPart)| An expression can be evaluated to yield a single KCL value. | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `IfExpression`|  | No |
-| `cond` |[`Expr`](/docs/kcl/types/Expr)| An expression can be evaluated to yield a single KCL value. | No |
-| `then_val` |[`Program`](/docs/kcl/types/Program)| An expression can be evaluated to yield a single KCL value. | No |
-| `else_ifs` |`[` [`ElseIf`](/docs/kcl/types/ElseIf) `]`|  | No |
-| `final_else` |[`Program`](/docs/kcl/types/Program)| An expression can be evaluated to yield a single KCL value. | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
----
-KCL value for an optional parameter which was not given an argument. (remember, parameters are in the function declaration, arguments are in the function call/application).
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `None`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
----
-
-
-
-
--- a/docs/kcl/types/FunctionExpression.md
+++ b/docs/kcl/types/FunctionExpression.md
@ -1,24 +0,0 @@
---
-title: "FunctionExpression"
-excerpt: ""
-layout: manual
---
-
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `params` |`[` [`Parameter`](/docs/kcl/types/Parameter) `]`|  | No |
-| `body` |[`Program`](/docs/kcl/types/Program)|  | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
--- a/docs/kcl/types/Identifier.md
+++ b/docs/kcl/types/Identifier.md
@ -1,23 +0,0 @@
---
-title: "Identifier"
-excerpt: ""
-layout: manual
---
-
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `name` |`string`|  | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
--- a/docs/kcl/types/ImportItem.md
+++ b/docs/kcl/types/ImportItem.md
@ -1,24 +0,0 @@
---
-title: "ImportItem"
-excerpt: ""
-layout: manual
---
-
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `name` |[`Identifier`](/docs/kcl/types/Identifier)| Name of the item to import. | No |
-| `alias` |[`Identifier`](/docs/kcl/types/Identifier)| Rename the item using an identifier after "as". | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
--- a/docs/kcl/types/ItemVisibility.md
+++ b/docs/kcl/types/ItemVisibility.md
@ -1,16 +0,0 @@
---
-title: "ItemVisibility"
-excerpt: ""
-layout: manual
---
-
-
-**enum:** `default`, `export`
-
-
-
-
-
-
-
-
--- a/docs/kcl/types/KclValue.md
+++ b/docs/kcl/types/KclValue.md
@ -317,7 +317,6 @@ Data for an imported geometry.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: `Function`|  | No |
-| `expression` |[`FunctionExpression`](/docs/kcl/types/FunctionExpression)| Any KCL value. | No |
 | `memory` |[`ProgramMemory`](/docs/kcl/types/ProgramMemory)| Any KCL value. | No |
 | `__meta` |`[` [`Metadata`](/docs/kcl/types/Metadata) `]`|  | No |

--- a/docs/kcl/types/LiteralIdentifier.md
+++ b/docs/kcl/types/LiteralIdentifier.md
@ -1,56 +0,0 @@
---
-title: "LiteralIdentifier"
-excerpt: ""
-layout: manual
---
-
-
-
-
-
-
-**This schema accepts exactly one of the following:**
-
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: [`Identifier`](/docs/kcl/types/Identifier)|  | No |
-| `name` |`string`|  | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `Literal`|  | No |
-| `value` |[`LiteralValue`](/docs/kcl/types/LiteralValue)|  | No |
-| `raw` |`string`|  | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
----
-
-
-
-
--- a/docs/kcl/types/LiteralValue.md
+++ b/docs/kcl/types/LiteralValue.md
@ -1,47 +0,0 @@
---
-title: "LiteralValue"
-excerpt: ""
-layout: manual
---
-
-
-
-
-
-**This schema accepts any of the following:**
-
-
-**Type:** `number` (`double`)
-
-
-
-
-
-
-
----
-
-**Type:** `string`
-
-
-
-
-
-
-
----
-
-**Type:** `boolean`
-
-
-
-
-
-
-
----
-
-
-
-
-
--- a/docs/kcl/types/MemberObject.md
+++ b/docs/kcl/types/MemberObject.md
@ -1,57 +0,0 @@
---
-title: "MemberObject"
-excerpt: ""
-layout: manual
---
-
-
-
-
-
-
-**This schema accepts exactly one of the following:**
-
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `MemberExpression`|  | No |
-| `object` |[`MemberObject`](/docs/kcl/types/MemberObject)|  | No |
-| `property` |[`LiteralIdentifier`](/docs/kcl/types/LiteralIdentifier)|  | No |
-| `computed` |`boolean`|  | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: [`Identifier`](/docs/kcl/types/Identifier)|  | No |
-| `name` |`string`|  | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
----
-
-
-
-
--- a/docs/kcl/types/NonCodeMeta.md
+++ b/docs/kcl/types/NonCodeMeta.md
@ -1,22 +0,0 @@
---
-title: "NonCodeMeta"
-excerpt: ""
-layout: manual
---
-
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `nonCodeNodes` |`object`|  | No |
-| `startNodes` |`[` [`NonCodeNode`](/docs/kcl/types/NonCodeNode) `]`|  | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-
-
--- a/docs/kcl/types/NonCodeNode.md
+++ b/docs/kcl/types/NonCodeNode.md
@ -1,23 +0,0 @@
---
-title: "NonCodeNode"
-excerpt: ""
-layout: manual
---
-
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `value` |[`NonCodeValue`](/docs/kcl/types/NonCodeValue)|  | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
--- a/docs/kcl/types/NonCodeValue.md
+++ b/docs/kcl/types/NonCodeValue.md
@ -1,86 +0,0 @@
---
-title: "NonCodeValue"
-excerpt: ""
-layout: manual
---
-
-
-
-
-
-
-**This schema accepts exactly one of the following:**
-
-An inline comment. Here are examples: `1 + 1 // This is an inline comment`. `1 + 1 /* Here's another */`.
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `inlineComment`|  | No |
-| `value` |`string`|  | No |
-| `style` |[`CommentStyle`](/docs/kcl/types/CommentStyle)|  | No |
-
-
----
-A block comment. An example of this is the following: ```python,no_run /* This is a block comment */ 1 + 1 ``` Now this is important. The block comment is attached to the next line. This is always the case. Also the block comment doesn't have a new line above it. If it did it would be a `NewLineBlockComment`.
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `blockComment`|  | No |
-| `value` |`string`|  | No |
-| `style` |[`CommentStyle`](/docs/kcl/types/CommentStyle)|  | No |
-
-
----
-A block comment that has a new line above it. The user explicitly added a new line above the block comment.
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `newLineBlockComment`|  | No |
-| `value` |`string`|  | No |
-| `style` |[`CommentStyle`](/docs/kcl/types/CommentStyle)|  | No |
-
-
----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `newLine`|  | No |
-
-
----
-
-
-
-
--- a/docs/kcl/types/ObjectProperty.md
+++ b/docs/kcl/types/ObjectProperty.md
@ -1,24 +0,0 @@
---
-title: "ObjectProperty"
-excerpt: ""
-layout: manual
---
-
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `key` |[`Identifier`](/docs/kcl/types/Identifier)|  | No |
-| `value` |[`Expr`](/docs/kcl/types/Expr)|  | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
--- a/docs/kcl/types/Parameter.md
+++ b/docs/kcl/types/Parameter.md
@ -1,23 +0,0 @@
---
-title: "Parameter"
-excerpt: "Parameter of a KCL function."
-layout: manual
---
-
-Parameter of a KCL function.
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `identifier` |[`Identifier`](/docs/kcl/types/Identifier)| The parameter's label or name. | No |
-| `optional` |`boolean`| Is the parameter optional? | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-
-
--- a/docs/kcl/types/Program.md
+++ b/docs/kcl/types/Program.md
@ -1,26 +0,0 @@
---
-title: "Program"
-excerpt: "A KCL program top level, or function body."
-layout: manual
---
-
-A KCL program top level, or function body.
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `body` |`[` [`BodyItem`](/docs/kcl/types/BodyItem) `]`|  | No |
-| `nonCodeMeta` |[`NonCodeMeta`](/docs/kcl/types/NonCodeMeta)| A KCL program top level, or function body. | No |
-| `shebang` |[`Shebang`](/docs/kcl/types/Shebang)|  | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
--- a/docs/kcl/types/Shebang.md
+++ b/docs/kcl/types/Shebang.md
@ -1,23 +0,0 @@
---
-title: "Shebang"
-excerpt: "A shebang. This is a special type of comment that is at the top of the file. It looks like this: ```python,no_run #!/usr/bin/env python ```"
-layout: manual
---
-
-A shebang. This is a special type of comment that is at the top of the file. It looks like this: ```python,no_run #!/usr/bin/env python ```
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `content` |`string`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
--- a/docs/kcl/types/Uint.md
+++ b/docs/kcl/types/Uint.md
@ -1,15 +0,0 @@
---
-title: "Uint"
-excerpt: ""
-layout: manual
---
-
-
-**Type:** `integer` (`uint32`)
-
-
-
-
-
-
-
--- a/docs/kcl/types/UnaryOperator.md
+++ b/docs/kcl/types/UnaryOperator.md
@ -1,41 +0,0 @@
---
-title: "UnaryOperator"
-excerpt: ""
-layout: manual
---
-
-
-
-
-
-
-**This schema accepts exactly one of the following:**
-
-Negate a number.
-
-**enum:** `-`
-
-
-
-
-
-
-
-
----
-Negate a boolean.
-
-**enum:** `!`
-
-
-
-
-
-
-
-
----
-
-
-
-
--- a/docs/kcl/types/VariableDeclarator.md
+++ b/docs/kcl/types/VariableDeclarator.md
@ -1,24 +0,0 @@
---
-title: "VariableDeclarator"
-excerpt: ""
-layout: manual
---
-
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `id` |[`Identifier`](/docs/kcl/types/Identifier)| The identifier of the variable. | No |
-| `init` |[`Expr`](/docs/kcl/types/Expr)| The value of the variable. | No |
-| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
-
-
--- a/docs/kcl/types/VariableKind.md
+++ b/docs/kcl/types/VariableKind.md
@ -1,41 +0,0 @@
---
-title: "VariableKind"
-excerpt: ""
-layout: manual
---
-
-
-
-
-
-
-**This schema accepts exactly one of the following:**
-
-Declare a named constant.
-
-**enum:** `const`
-
-
-
-
-
-
-
-
----
-Declare a function.
-
-**enum:** `fn`
-
-
-
-
-
-
-
-
----
-
-
-
-
--- a/e2e/playwright/file-tree.spec.ts
+++ b/e2e/playwright/file-tree.spec.ts
@ -45,7 +45,6 @@ test.describe('integrations tests', () => {
            {
              title: 'test-sample',
              fileCount: 1,
-              folderCount: 1,
            },
          ],
          sortBy: 'last-modified-desc',
@ -233,7 +232,6 @@ test.describe('when using the file tree to', () => {
            {
              title: projectName,
              fileCount: 2,
-              folderCount: 2, // TODO: This is a pre-existing bug, there are no folders within the project
            },
          ],
          sortBy: 'last-modified-desc',
--- a/e2e/playwright/fixtures/homePageFixture.ts
+++ b/e2e/playwright/fixtures/homePageFixture.ts
@ -4,7 +4,6 @@ import { expect } from '@playwright/test'
 interface ProjectCardState {
  title: string
  fileCount: number
-  folderCount: number
 }

 interface HomePageState {
@ -61,15 +60,13 @@ export class HomePageFixture {
    const projectCards = await this.projectCard.all()
    const projectCardStates: Array<ProjectCardState> = []
    for (const projectCard of projectCards) {
-      const [title, fileCount, folderCount] = await Promise.all([
+      const [title, fileCount] = await Promise.all([
        (await projectCard.locator(this.projectCardTitle).textContent()) || '',
        Number(await projectCard.locator(this.projectCardFile).textContent()),
-        Number(await projectCard.locator(this.projectCardFolder).textContent()),
      ])
      projectCardStates.push({
        title: title,
        fileCount,
-        folderCount,
      })
    }
    return projectCardStates
--- a/e2e/playwright/fixtures/toolbarFixture.ts
+++ b/e2e/playwright/fixtures/toolbarFixture.ts
@ -6,6 +6,7 @@ export class ToolbarFixture {
  public page: Page

  extrudeButton!: Locator
+  loftButton!: Locator
  offsetPlaneButton!: Locator
  startSketchBtn!: Locator
  lineBtn!: Locator
@ -26,6 +27,7 @@ export class ToolbarFixture {
  reConstruct = (page: Page) => {
    this.page = page
    this.extrudeButton = page.getByTestId('extrude')
+    this.loftButton = page.getByTestId('loft')
    this.offsetPlaneButton = page.getByTestId('plane-offset')
    this.startSketchBtn = page.getByTestId('sketch')
    this.lineBtn = page.getByTestId('line')
--- a/e2e/playwright/point-click.spec.ts
+++ b/e2e/playwright/point-click.spec.ts
@ -677,3 +677,94 @@ test(`Offset plane point-and-click`, async ({
    await scene.expectPixelColor([74, 74, 74], testPoint, 15)
  })
 })
+
+const loftPointAndClickCases = [
+  { shouldPreselect: true },
+  { shouldPreselect: false },
+]
+loftPointAndClickCases.forEach(({ shouldPreselect }) => {
+  test(`Loft point-and-click (preselected sketches: ${shouldPreselect})`, async ({
+    app,
+    page,
+    scene,
+    editor,
+    toolbar,
+    cmdBar,
+  }) => {
+    const initialCode = `sketch001 = startSketchOn('XZ')
+    |> circle({ center = [0, 0], radius = 30 }, %)
+    plane001 = offsetPlane('XZ', 50)
+    sketch002 = startSketchOn(plane001)
+    |> circle({ center = [0, 0], radius = 20 }, %)
+`
+    await app.initialise(initialCode)
+
+    // One dumb hardcoded screen pixel value
+    const testPoint = { x: 575, y: 200 }
+    const [clickOnSketch1] = scene.makeMouseHelpers(testPoint.x, testPoint.y)
+    const [clickOnSketch2] = scene.makeMouseHelpers(
+      testPoint.x,
+      testPoint.y + 80
+    )
+    const loftDeclaration = 'loft001 = loft([sketch001, sketch002])'
+
+    await test.step(`Look for the white of the sketch001 shape`, async () => {
+      await scene.expectPixelColor([254, 254, 254], testPoint, 15)
+    })
+
+    async function selectSketches() {
+      await clickOnSketch1()
+      await page.keyboard.down('Shift')
+      await clickOnSketch2()
+      await app.page.waitForTimeout(500)
+      await page.keyboard.up('Shift')
+    }
+
+    if (!shouldPreselect) {
+      await test.step(`Go through the command bar flow without preselected sketches`, async () => {
+        await toolbar.loftButton.click()
+        await cmdBar.expectState({
+          stage: 'arguments',
+          currentArgKey: 'selection',
+          currentArgValue: '',
+          headerArguments: { Selection: '' },
+          highlightedHeaderArg: 'selection',
+          commandName: 'Loft',
+        })
+        await selectSketches()
+        await cmdBar.progressCmdBar()
+        await cmdBar.expectState({
+          stage: 'review',
+          headerArguments: { Selection: '2 faces' },
+          commandName: 'Loft',
+        })
+        await cmdBar.progressCmdBar()
+      })
+    } else {
+      await test.step(`Preselect the two sketches`, async () => {
+        await selectSketches()
+      })
+
+      await test.step(`Go through the command bar flow with preselected sketches`, async () => {
+        await toolbar.loftButton.click()
+        await cmdBar.progressCmdBar()
+        await cmdBar.expectState({
+          stage: 'review',
+          headerArguments: { Selection: '2 faces' },
+          commandName: 'Loft',
+        })
+        await cmdBar.progressCmdBar()
+      })
+    }
+
+    await test.step(`Confirm code is added to the editor, scene has changed`, async () => {
+      await editor.expectEditor.toContain(loftDeclaration)
+      await editor.expectState({
+        diagnostics: [],
+        activeLines: [loftDeclaration],
+        highlightedCode: '',
+      })
+      await scene.expectPixelColor([89, 89, 89], testPoint, 15)
+    })
+  })
+})
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable--XZ-1-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable--XZ-1-Google-Chrome-linux.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable--XZ-1-Google-Chrome-win32.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable--XZ-1-Google-Chrome-win32.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable-XY-1-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable-XY-1-Google-Chrome-linux.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable-XY-1-Google-Chrome-win32.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable-XY-1-Google-Chrome-win32.png
--- a/package.json
+++ b/package.json
@ -192,7 +192,7 @@
    "eslint-plugin-css-modules": "^2.12.0",
    "eslint-plugin-import": "^2.30.0",
    "eslint-plugin-suggest-no-throw": "^1.0.0",
-    "happy-dom": "^15.10.2",
+    "happy-dom": "^15.11.7",
    "http-server": "^14.1.1",
    "husky": "^9.1.5",
    "kill-port": "^2.0.1",
@ -212,7 +212,7 @@
    "vite-tsconfig-paths": "^4.3.2",
    "vitest": "^1.6.0",
    "vitest-webgl-canvas-mock": "^1.1.0",
-    "wasm-pack": "^0.13.0",
+    "wasm-pack": "^0.13.1",
    "ws": "^8.17.0",
    "yarn": "^1.22.22"
  }
--- a/scripts/get-nightly-changelog.sh
+++ b/scripts/get-nightly-changelog.sh
@ -0,0 +1,5 @@
+#!/bin/bash
+echo "## What's Changed"
+git log ${PREVIOUS_TAG}..HEAD --oneline --pretty=format:%s | grep -v Bump | awk '{print "* "toupper(substr($0,0,1))substr($0,2)}'
+echo ""
+echo "**Full Changelog**: https://github.com/KittyCAD/modeling-app/compare/${PREVIOUS_TAG}...${TAG}"
--- a/src/clientSideScene/CameraControls.ts
+++ b/src/clientSideScene/CameraControls.ts
@ -273,14 +273,26 @@ export class CameraControls {
        camSettings.center.y,
        camSettings.center.z
      )
-      const quat = new Quaternion(
+      const orientation = new Quaternion(
        camSettings.orientation.x,
        camSettings.orientation.y,
        camSettings.orientation.z,
        camSettings.orientation.w
      ).invert()

-      this.camera.up.copy(new Vector3(0, 1, 0).applyQuaternion(quat))
+      const newUp = new Vector3(
+        camSettings.up.x,
+        camSettings.up.y,
+        camSettings.up.z
+      )
+      this.camera.quaternion.set(
+        orientation.x,
+        orientation.y,
+        orientation.z,
+        orientation.w
+      )
+      this.camera.up.copy(newUp)
+      this.camera.updateProjectionMatrix()
      if (this.camera instanceof PerspectiveCamera && camSettings.ortho) {
        this.useOrthographicCamera()
      }
@ -1164,7 +1176,7 @@ export class CameraControls {
      this.camera.updateProjectionMatrix()
    }

-    if (this.syncDirection === 'clientToEngine' || forceUpdate)
+    if (this.syncDirection === 'clientToEngine' || forceUpdate) {
      this.throttledUpdateEngineCamera({
        quaternion: this.camera.quaternion,
        position: this.camera.position,
@ -1172,6 +1184,7 @@ export class CameraControls {
        isPerspective: this.isPerspective,
        target: this.target,
      })
+    }
    this.deferReactUpdate(this.reactCameraProperties)
    Object.values(this._camChangeCallbacks).forEach((cb) => cb())
  }
--- a/src/components/ModelingMachineProvider.tsx
+++ b/src/components/ModelingMachineProvider.tsx
@ -50,6 +50,7 @@ import {
  isSketchPipe,
  Selections,
  updateSelections,
+  canLoftSelection,
 } from 'lib/selections'
 import { applyConstraintIntersect } from './Toolbar/Intersect'
 import { applyConstraintAbsDistance } from './Toolbar/SetAbsDistance'
@ -82,7 +83,7 @@ import { getVarNameModal } from 'hooks/useToolbarGuards'
 import { err, reportRejection, trap } from 'lib/trap'
 import { useCommandsContext } from 'hooks/useCommandsContext'
 import { modelingMachineEvent } from 'editor/manager'
-import { hasValidFilletSelection } from 'lang/modifyAst/addFillet'
+import { hasValidEdgeTreatmentSelection } from 'lang/modifyAst/addEdgeTreatment'
 import {
  ExportIntent,
  EngineConnectionStateType,
@ -569,6 +570,21 @@ export const ModelingMachineProvider = ({
          if (err(canSweep)) return false
          return canSweep
        },
+        'has valid loft selection': ({ context: { selectionRanges } }) => {
+          const hasNoSelection =
+            selectionRanges.graphSelections.length === 0 ||
+            isRangeBetweenCharacters(selectionRanges) ||
+            isSelectionLastLine(selectionRanges, codeManager.code)
+
+          if (hasNoSelection) {
+            const count = 2
+            return doesSceneHaveSweepableSketch(kclManager.ast, count)
+          }
+
+          const canLoft = canLoftSelection(selectionRanges)
+          if (err(canLoft)) return false
+          return canLoft
+        },
        'has valid selection for deletion': ({
          context: { selectionRanges },
        }) => {
@ -576,8 +592,10 @@ export const ModelingMachineProvider = ({
          if (selectionRanges.graphSelections.length <= 0) return false
          return true
        },
-        'has valid fillet selection': ({ context: { selectionRanges } }) => {
-          return hasValidFilletSelection({
+        'has valid edge treatment selection': ({
+          context: { selectionRanges },
+        }) => {
+          return hasValidEdgeTreatmentSelection({
            selectionRanges,
            ast: kclManager.ast,
            code: codeManager.code,
--- a/src/lang/modifyAst.ts
+++ b/src/lang/modifyAst.ts
@ -346,6 +346,37 @@ export function extrudeSketch(
  }
 }

+export function loftSketches(
+  node: Node<Program>,
+  declarators: VariableDeclarator[]
+): {
+  modifiedAst: Node<Program>
+  pathToNode: PathToNode
+} {
+  const modifiedAst = structuredClone(node)
+  const name = findUniqueName(node, KCL_DEFAULT_CONSTANT_PREFIXES.LOFT)
+  const elements = declarators.map((d) => createIdentifier(d.id.name))
+  const loft = createCallExpressionStdLib('loft', [
+    createArrayExpression(elements),
+  ])
+  const declaration = createVariableDeclaration(name, loft)
+  modifiedAst.body.push(declaration)
+  const pathToNode: PathToNode = [
+    ['body', ''],
+    [modifiedAst.body.length - 1, 'index'],
+    ['declarations', 'VariableDeclaration'],
+    ['0', 'index'],
+    ['init', 'VariableDeclarator'],
+    ['arguments', 'CallExpression'],
+    [0, 'index'],
+  ]
+
+  return {
+    modifiedAst,
+    pathToNode,
+  }
+}
+
 export function revolveSketch(
  node: Node<Program>,
  pathToNode: PathToNode,
--- a/src/lang/modifyAst/addEdgeTreatment.test.ts
+++ b/src/lang/modifyAst/addEdgeTreatment.test.ts
@ -10,18 +10,21 @@ import {
  VariableDeclarator,
 } from '../wasm'
 import {
+  EdgeTreatmentType,
  getPathToExtrudeForSegmentSelection,
-  hasValidFilletSelection,
-  isTagUsedInFillet,
-  modifyAstWithFilletAndTag,
-} from './addFillet'
+  hasValidEdgeTreatmentSelection,
+  isTagUsedInEdgeTreatment,
+  modifyAstWithEdgeTreatmentAndTag,
+  FilletParameters,
+  ChamferParameters,
+  EdgeTreatmentParameters,
+} from './addEdgeTreatment'
 import { getNodeFromPath, getNodePathFromSourceRange } from '../queryAst'
 import { createLiteral } from 'lang/modifyAst'
 import { err } from 'lib/trap'
 import { Selections } from 'lib/selections'
 import { engineCommandManager, kclManager } from 'lib/singletons'
 import { VITE_KC_DEV_TOKEN } from 'env'
-import { KclCommandValue } from 'lib/commandTypes'
 import { isOverlap } from 'lib/utils'
 import { codeRefFromRange } from 'lang/std/artifactGraph'

@ -253,10 +256,10 @@ extrude003 = extrude(-15, sketch003)`
  })
 })

-const runModifyAstCloneWithFilletAndTag = async (
+const runModifyAstCloneWithEdgeTreatmentAndTag = async (
  code: string,
  selectionSnippets: Array<string>,
-  radiusValue: number,
+  parameters: EdgeTreatmentParameters,
  expectedCode: string
 ) => {
  // ast
@ -274,13 +277,6 @@ const runModifyAstCloneWithFilletAndTag = async (
    ]
  )

-  // radius
-  const radius: KclCommandValue = {
-    valueAst: createLiteral(radiusValue),
-    valueText: radiusValue.toString(),
-    valueCalculated: radiusValue.toString(),
-  }
-
  // executeAst
  await kclManager.executeAst({ ast })
  const artifactGraph = engineCommandManager.artifactGraph
@ -299,8 +295,8 @@ const runModifyAstCloneWithFilletAndTag = async (
    otherSelections: [],
  }

-  // apply fillet to selection
-  const result = modifyAstWithFilletAndTag(ast, selection, radius)
+  // apply edge treatment to seleciton
+  const result = modifyAstWithEdgeTreatmentAndTag(ast, selection, parameters)
  if (err(result)) {
    return result
  }
@ -310,9 +306,42 @@ const runModifyAstCloneWithFilletAndTag = async (

  expect(newCode).toContain(expectedCode)
 }
-describe('Testing applyFilletToSelection', () => {
-  it('should add a fillet to a specific segment', async () => {
-    const code = `sketch001 = startSketchOn('XY')
+const createFilletParameters = (radiusValue: number): FilletParameters => ({
+  type: EdgeTreatmentType.Fillet,
+  radius: {
+    valueAst: createLiteral(radiusValue),
+    valueText: radiusValue.toString(),
+    valueCalculated: radiusValue.toString(),
+  },
+})
+const createChamferParameters = (lengthValue: number): ChamferParameters => ({
+  type: EdgeTreatmentType.Chamfer,
+  length: {
+    valueAst: createLiteral(lengthValue),
+    valueText: lengthValue.toString(),
+    valueCalculated: lengthValue.toString(),
+  },
+})
+// Iterate tests over all edge treatment types
+Object.values(EdgeTreatmentType).forEach(
+  (edgeTreatmentType: EdgeTreatmentType) => {
+    // create parameters based on the edge treatment type
+    let parameterName: string
+    let parameters: EdgeTreatmentParameters
+    if (edgeTreatmentType === EdgeTreatmentType.Fillet) {
+      parameterName = 'radius'
+      parameters = createFilletParameters(3)
+    } else if (edgeTreatmentType === EdgeTreatmentType.Chamfer) {
+      parameterName = 'length'
+      parameters = createChamferParameters(3)
+    } else {
+      // Handle future edge treatments
+      return new Error(`Unsupported edge treatment type: ${edgeTreatmentType}`)
+    }
+    // run tests
+    describe(`Testing modifyAstCloneWithEdgeTreatmentAndTag with ${edgeTreatmentType}s`, () => {
+      it(`should add a ${edgeTreatmentType} to a specific segment`, async () => {
+        const code = `sketch001 = startSketchOn('XY')
  |> startProfileAt([-10, 10], %)
  |> line([20, 0], %)
  |> line([0, -20], %)
@ -320,9 +349,8 @@ describe('Testing applyFilletToSelection', () => {
  |> lineTo([profileStartX(%), profileStartY(%)], %)
  |> close(%)
 extrude001 = extrude(-15, sketch001)`
-    const segmentSnippets = ['line([0, -20], %)']
-    const radiusValue = 3
-    const expectedCode = `sketch001 = startSketchOn('XY')
+        const segmentSnippets = ['line([0, -20], %)']
+        const expectedCode = `sketch001 = startSketchOn('XY')
  |> startProfileAt([-10, 10], %)
  |> line([20, 0], %)
  |> line([0, -20], %, $seg01)
@ -330,17 +358,17 @@ extrude001 = extrude(-15, sketch001)`
  |> lineTo([profileStartX(%), profileStartY(%)], %)
  |> close(%)
 extrude001 = extrude(-15, sketch001)
-  |> fillet({ radius = 3, tags = [seg01] }, %)`
+  |> ${edgeTreatmentType}({ ${parameterName} = 3, tags = [seg01] }, %)`

-    await runModifyAstCloneWithFilletAndTag(
-      code,
-      segmentSnippets,
-      radiusValue,
-      expectedCode
-    )
-  })
-  it('should add a fillet to the sketch pipe', async () => {
-    const code = `sketch001 = startSketchOn('XY')
+        await runModifyAstCloneWithEdgeTreatmentAndTag(
+          code,
+          segmentSnippets,
+          parameters,
+          expectedCode
+        )
+      })
+      it(`should add a ${edgeTreatmentType} to the sketch pipe`, async () => {
+        const code = `sketch001 = startSketchOn('XY')
  |> startProfileAt([-10, 10], %)
  |> line([20, 0], %)
  |> line([0, -20], %)
@ -348,9 +376,8 @@ extrude001 = extrude(-15, sketch001)
  |> lineTo([profileStartX(%), profileStartY(%)], %)
  |> close(%)
  |> extrude(-15, %)`
-    const segmentSnippets = ['line([0, -20], %)']
-    const radiusValue = 3
-    const expectedCode = `sketch001 = startSketchOn('XY')
+        const segmentSnippets = ['line([0, -20], %)']
+        const expectedCode = `sketch001 = startSketchOn('XY')
  |> startProfileAt([-10, 10], %)
  |> line([20, 0], %)
  |> line([0, -20], %, $seg01)
@ -358,17 +385,17 @@ extrude001 = extrude(-15, sketch001)
  |> lineTo([profileStartX(%), profileStartY(%)], %)
  |> close(%)
  |> extrude(-15, %)
-  |> fillet({ radius = 3, tags = [seg01] }, %)`
+  |> ${edgeTreatmentType}({ ${parameterName} = 3, tags = [seg01] }, %)`

-    await runModifyAstCloneWithFilletAndTag(
-      code,
-      segmentSnippets,
-      radiusValue,
-      expectedCode
-    )
-  })
-  it('should add a fillet to an already tagged segment', async () => {
-    const code = `sketch001 = startSketchOn('XY')
+        await runModifyAstCloneWithEdgeTreatmentAndTag(
+          code,
+          segmentSnippets,
+          parameters,
+          expectedCode
+        )
+      })
+      it(`should add a ${edgeTreatmentType} to an already tagged segment`, async () => {
+        const code = `sketch001 = startSketchOn('XY')
  |> startProfileAt([-10, 10], %)
  |> line([20, 0], %)
  |> line([0, -20], %, $seg01)
@ -376,9 +403,8 @@ extrude001 = extrude(-15, sketch001)
  |> lineTo([profileStartX(%), profileStartY(%)], %)
  |> close(%)
 extrude001 = extrude(-15, sketch001)`
-    const segmentSnippets = ['line([0, -20], %, $seg01)']
-    const radiusValue = 3
-    const expectedCode = `sketch001 = startSketchOn('XY')
+        const segmentSnippets = ['line([0, -20], %, $seg01)']
+        const expectedCode = `sketch001 = startSketchOn('XY')
  |> startProfileAt([-10, 10], %)
  |> line([20, 0], %)
  |> line([0, -20], %, $seg01)
@ -386,17 +412,17 @@ extrude001 = extrude(-15, sketch001)`
  |> lineTo([profileStartX(%), profileStartY(%)], %)
  |> close(%)
 extrude001 = extrude(-15, sketch001)
-  |> fillet({ radius = 3, tags = [seg01] }, %)`
+  |> ${edgeTreatmentType}({ ${parameterName} = 3, tags = [seg01] }, %)`

-    await runModifyAstCloneWithFilletAndTag(
-      code,
-      segmentSnippets,
-      radiusValue,
-      expectedCode
-    )
-  })
-  it('should add a fillet with existing tag on other segment', async () => {
-    const code = `sketch001 = startSketchOn('XY')
+        await runModifyAstCloneWithEdgeTreatmentAndTag(
+          code,
+          segmentSnippets,
+          parameters,
+          expectedCode
+        )
+      })
+      it(`should add a ${edgeTreatmentType} with existing tag on other segment`, async () => {
+        const code = `sketch001 = startSketchOn('XY')
  |> startProfileAt([-10, 10], %)
  |> line([20, 0], %, $seg01)
  |> line([0, -20], %)
@ -404,9 +430,8 @@ extrude001 = extrude(-15, sketch001)
  |> lineTo([profileStartX(%), profileStartY(%)], %)
  |> close(%)
 extrude001 = extrude(-15, sketch001)`
-    const segmentSnippets = ['line([-20, 0], %)']
-    const radiusValue = 3
-    const expectedCode = `sketch001 = startSketchOn('XY')
+        const segmentSnippets = ['line([-20, 0], %)']
+        const expectedCode = `sketch001 = startSketchOn('XY')
  |> startProfileAt([-10, 10], %)
  |> line([20, 0], %, $seg01)
  |> line([0, -20], %)
@ -414,17 +439,17 @@ extrude001 = extrude(-15, sketch001)`
  |> lineTo([profileStartX(%), profileStartY(%)], %)
  |> close(%)
 extrude001 = extrude(-15, sketch001)
-  |> fillet({ radius = 3, tags = [seg02] }, %)`
+  |> ${edgeTreatmentType}({ ${parameterName} = 3, tags = [seg02] }, %)`

-    await runModifyAstCloneWithFilletAndTag(
-      code,
-      segmentSnippets,
-      radiusValue,
-      expectedCode
-    )
-  })
-  it('should add a fillet with existing fillet on other segment', async () => {
-    const code = `sketch001 = startSketchOn('XY')
+        await runModifyAstCloneWithEdgeTreatmentAndTag(
+          code,
+          segmentSnippets,
+          parameters,
+          expectedCode
+        )
+      })
+      it(`should add a ${edgeTreatmentType} with existing fillet on other segment`, async () => {
+        const code = `sketch001 = startSketchOn('XY')
  |> startProfileAt([-10, 10], %)
  |> line([20, 0], %, $seg01)
  |> line([0, -20], %)
@ -433,9 +458,8 @@ extrude001 = extrude(-15, sketch001)
  |> close(%)
 extrude001 = extrude(-15, sketch001)
  |> fillet({ radius = 5, tags = [seg01] }, %)`
-    const segmentSnippets = ['line([-20, 0], %)']
-    const radiusValue = 3
-    const expectedCode = `sketch001 = startSketchOn('XY')
+        const segmentSnippets = ['line([-20, 0], %)']
+        const expectedCode = `sketch001 = startSketchOn('XY')
  |> startProfileAt([-10, 10], %)
  |> line([20, 0], %, $seg01)
  |> line([0, -20], %)
@ -444,27 +468,27 @@ extrude001 = extrude(-15, sketch001)
  |> close(%)
 extrude001 = extrude(-15, sketch001)
  |> fillet({ radius = 5, tags = [seg01] }, %)
-  |> fillet({ radius = 3, tags = [seg02] }, %)`
+  |> ${edgeTreatmentType}({ ${parameterName} = 3, tags = [seg02] }, %)`

-    await runModifyAstCloneWithFilletAndTag(
-      code,
-      segmentSnippets,
-      radiusValue,
-      expectedCode
-    )
-  })
-  it('should add a fillet to two segments of a single extrusion', async () => {
-    const code = `sketch001 = startSketchOn('XY')
+        await runModifyAstCloneWithEdgeTreatmentAndTag(
+          code,
+          segmentSnippets,
+          parameters,
+          expectedCode
+        )
+      })
+      it(`should add a ${edgeTreatmentType} with existing chamfer on other segment`, async () => {
+        const code = `sketch001 = startSketchOn('XY')
  |> startProfileAt([-10, 10], %)
-  |> line([20, 0], %)
+  |> line([20, 0], %, $seg01)
  |> line([0, -20], %)
  |> line([-20, 0], %)
  |> lineTo([profileStartX(%), profileStartY(%)], %)
  |> close(%)
-extrude001 = extrude(-15, sketch001)`
-    const segmentSnippets = ['line([20, 0], %)', 'line([-20, 0], %)']
-    const radiusValue = 3
-    const expectedCode = `sketch001 = startSketchOn('XY')
+extrude001 = extrude(-15, sketch001)
+  |> chamfer({ length: 5, tags: [seg01] }, %)`
+        const segmentSnippets = ['line([-20, 0], %)']
+        const expectedCode = `sketch001 = startSketchOn('XY')
  |> startProfileAt([-10, 10], %)
  |> line([20, 0], %, $seg01)
  |> line([0, -20], %)
@ -472,17 +496,45 @@ extrude001 = extrude(-15, sketch001)`
  |> lineTo([profileStartX(%), profileStartY(%)], %)
  |> close(%)
 extrude001 = extrude(-15, sketch001)
-  |> fillet({ radius = 3, tags = [seg01, seg02] }, %)`
+  |> chamfer({ length: 5, tags: [seg01] }, %)
+  |> ${edgeTreatmentType}({ ${parameterName}: 3, tags: [seg02] }, %)`

-    await runModifyAstCloneWithFilletAndTag(
-      code,
-      segmentSnippets,
-      radiusValue,
-      expectedCode
-    )
-  })
-  it('should add fillets to two bodies', async () => {
-    const code = `sketch001 = startSketchOn('XY')
+        await runModifyAstCloneWithEdgeTreatmentAndTag(
+          code,
+          segmentSnippets,
+          parameters,
+          expectedCode
+        )
+      })
+      it(`should add a ${edgeTreatmentType} to two segments of a single extrusion`, async () => {
+        const code = `sketch001 = startSketchOn('XY')
+  |> startProfileAt([-10, 10], %)
+  |> line([20, 0], %)
+  |> line([0, -20], %)
+  |> line([-20, 0], %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)
+extrude001 = extrude(-15, sketch001)`
+        const segmentSnippets = ['line([20, 0], %)', 'line([-20, 0], %)']
+        const expectedCode = `sketch001 = startSketchOn('XY')
+  |> startProfileAt([-10, 10], %)
+  |> line([20, 0], %, $seg01)
+  |> line([0, -20], %)
+  |> line([-20, 0], %, $seg02)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)
+extrude001 = extrude(-15, sketch001)
+  |> ${edgeTreatmentType}({ ${parameterName} = 3, tags = [seg01, seg02] }, %)`
+
+        await runModifyAstCloneWithEdgeTreatmentAndTag(
+          code,
+          segmentSnippets,
+          parameters,
+          expectedCode
+        )
+      })
+      it(`should add ${edgeTreatmentType}s to two bodies`, async () => {
+        const code = `sketch001 = startSketchOn('XY')
  |> startProfileAt([-10, 10], %)
  |> line([20, 0], %)
  |> line([0, -20], %)
@ -498,13 +550,12 @@ sketch002 = startSketchOn('XY')
  |> lineTo([profileStartX(%), profileStartY(%)], %)
  |> close(%)
 extrude002 = extrude(-25, sketch002)` // <--- body 2
-    const segmentSnippets = [
-      'line([20, 0], %)',
-      'line([-20, 0], %)',
-      'line([0, -15], %)',
-    ]
-    const radiusValue = 3
-    const expectedCode = `sketch001 = startSketchOn('XY')
+        const segmentSnippets = [
+          'line([20, 0], %)',
+          'line([-20, 0], %)',
+          'line([0, -15], %)',
+        ]
+        const expectedCode = `sketch001 = startSketchOn('XY')
  |> startProfileAt([-10, 10], %)
  |> line([20, 0], %, $seg01)
  |> line([0, -20], %)
@ -512,7 +563,7 @@ extrude002 = extrude(-25, sketch002)` // <--- body 2
  |> lineTo([profileStartX(%), profileStartY(%)], %)
  |> close(%)
 extrude001 = extrude(-15, sketch001)
-  |> fillet({ radius = 3, tags = [seg01, seg02] }, %)
+  |> ${edgeTreatmentType}({ ${parameterName} = 3, tags = [seg01, seg02] }, %)
 sketch002 = startSketchOn('XY')
  |> startProfileAt([30, 10], %)
  |> line([15, 0], %)
@ -521,18 +572,20 @@ sketch002 = startSketchOn('XY')
  |> lineTo([profileStartX(%), profileStartY(%)], %)
  |> close(%)
 extrude002 = extrude(-25, sketch002)
-  |> fillet({ radius = 3, tags = [seg03] }, %)` // <-- able to add a new one
+  |> ${edgeTreatmentType}({ ${parameterName} = 3, tags = [seg03] }, %)` // <-- able to add a new one

-    await runModifyAstCloneWithFilletAndTag(
-      code,
-      segmentSnippets,
-      radiusValue,
-      expectedCode
-    )
-  })
-})
+        await runModifyAstCloneWithEdgeTreatmentAndTag(
+          code,
+          segmentSnippets,
+          parameters,
+          expectedCode
+        )
+      })
+    })
+  }
+)

-describe('Testing isTagUsedInFillet', () => {
+describe('Testing isTagUsedInEdgeTreatment', () => {
  const code = `sketch001 = startSketchOn('XZ')
  |> startProfileAt([7.72, 4.13], %)
  |> line([7.11, 3.48], %, $seg01)
@ -565,7 +618,7 @@ extrude001 = extrude(-5, sketch001)
      'CallExpression'
    )
    if (err(callExp)) return
-    const edges = isTagUsedInFillet({ ast, callExp: callExp.node })
+    const edges = isTagUsedInEdgeTreatment({ ast, callExp: callExp.node })
    expect(edges).toEqual(['getOppositeEdge', 'baseEdge'])
  })
  it('should correctly identify getPreviousAdjacentEdge edges', () => {
@ -584,7 +637,7 @@ extrude001 = extrude(-5, sketch001)
      'CallExpression'
    )
    if (err(callExp)) return
-    const edges = isTagUsedInFillet({ ast, callExp: callExp.node })
+    const edges = isTagUsedInEdgeTreatment({ ast, callExp: callExp.node })
    expect(edges).toEqual(['getPreviousAdjacentEdge'])
  })
  it('should correctly identify no edges', () => {
@ -603,7 +656,7 @@ extrude001 = extrude(-5, sketch001)
      'CallExpression'
    )
    if (err(callExp)) return
-    const edges = isTagUsedInFillet({ ast, callExp: callExp.node })
+    const edges = isTagUsedInEdgeTreatment({ ast, callExp: callExp.node })
    expect(edges).toEqual([])
  })
 })
@ -638,7 +691,7 @@ describe('Testing button states', () => {
    }

    // state
-    const buttonState = hasValidFilletSelection({
+    const buttonState = hasValidEdgeTreatmentSelection({
      ast,
      selectionRanges,
      code,
--- a/src/lang/modifyAst/addEdgeTreatment.ts
+++ b/src/lang/modifyAst/addEdgeTreatment.ts
@ -44,32 +44,49 @@ import {
 } from 'lib/singletons'
 import { Node } from 'wasm-lib/kcl/bindings/Node'

-// Apply Fillet To Selection
+// Edge Treatment Types
+export enum EdgeTreatmentType {
+  Chamfer = 'chamfer',
+  Fillet = 'fillet',
+}

-export function applyFilletToSelection(
+export interface ChamferParameters {
+  type: EdgeTreatmentType.Chamfer
+  length: KclCommandValue
+}
+export interface FilletParameters {
+  type: EdgeTreatmentType.Fillet
+  radius: KclCommandValue
+}
+export type EdgeTreatmentParameters = ChamferParameters | FilletParameters
+
+// Apply Edge Treatment (Fillet or Chamfer) To Selection
+export function applyEdgeTreatmentToSelection(
  ast: Node<Program>,
  selection: Selections,
-  radius: KclCommandValue
+  parameters: EdgeTreatmentParameters
 ): void | Error {
-  // 1. clone and modify with fillet and tag
-  const result = modifyAstWithFilletAndTag(ast, selection, radius)
+  // 1. clone and modify with edge treatment and tag
+  const result = modifyAstWithEdgeTreatmentAndTag(ast, selection, parameters)
  if (err(result)) return result
-  const { modifiedAst, pathToFilletNode } = result
+  const { modifiedAst, pathToEdgeTreatmentNode } = result

  // 2. update ast
  // eslint-disable-next-line @typescript-eslint/no-floating-promises
-  updateAstAndFocus(modifiedAst, pathToFilletNode)
+  updateAstAndFocus(modifiedAst, pathToEdgeTreatmentNode)
 }

-export function modifyAstWithFilletAndTag(
+export function modifyAstWithEdgeTreatmentAndTag(
  ast: Node<Program>,
  selections: Selections,
-  radius: KclCommandValue
-): { modifiedAst: Node<Program>; pathToFilletNode: Array<PathToNode> } | Error {
+  parameters: EdgeTreatmentParameters
+):
+  | { modifiedAst: Node<Program>; pathToEdgeTreatmentNode: Array<PathToNode> }
+  | Error {
  let clonedAst = structuredClone(ast)
  const clonedAstForGetExtrude = structuredClone(ast)

-  const astResult = insertRadiusIntoAst(clonedAst, radius)
+  const astResult = insertParametersIntoAst(clonedAst, parameters)
  if (err(astResult)) return astResult

  const artifactGraph = engineCommandManager.artifactGraph
@ -119,21 +136,26 @@ export function modifyAstWithFilletAndTag(
    }
  }

-  // Step 2: Apply fillet(s) for each extrude node (body)
-  let pathToFilletNodes: Array<PathToNode> = []
+  // Step 2: Apply edge treatments for each extrude node (body)
+  let pathToEdgeTreatmentNodes: Array<PathToNode> = []
  for (const [pathToExtrudeNode, tagInfos] of extrudeToTagsMap.entries()) {
-    // Create a fillet expression with multiple tags
-    const radiusValue =
-      'variableName' in radius ? radius.variableIdentifierAst : radius.valueAst
+    // Create an edge treatment expression with multiple tags

+    // edge treatment parameter
+    const parameterResult = getParameterNameAndValue(parameters)
+    if (err(parameterResult)) return parameterResult
+    const { parameterName, parameterValue } = parameterResult
+
+    // tag calls
    const tagCalls = tagInfos.map(({ tag, artifact }) => {
      return getEdgeTagCall(tag, artifact)
    })
    const firstTag = tagCalls[0] // can be Identifier or CallExpression (for opposite and adjacent edges)

-    const filletCall = createCallExpressionStdLib('fillet', [
+    // edge treatment call
+    const edgeTreatmentCall = createCallExpressionStdLib(parameters.type, [
      createObjectExpression({
-        radius: radiusValue,
+        [parameterName]: parameterValue,
        tags: createArrayExpression(tagCalls),
      }),
      createPipeSubstitution(),
@ -147,64 +169,89 @@ export function modifyAstWithFilletAndTag(
    if (err(locatedExtrudeDeclarator)) return locatedExtrudeDeclarator
    const { extrudeDeclarator } = locatedExtrudeDeclarator

-    // Modify the extrude expression to include this fillet expression
-    // CallExpression - no fillet
-    // PipeExpression - fillet exists or extrude in sketch pipe
+    // Modify the extrude expression to include this edge treatment expression
+    // CallExpression - no edge treatment
+    // PipeExpression - edge treatment exists or body in sketch pipe

-    let pathToFilletNode: PathToNode = []
+    let pathToEdgeTreatmentNode: PathToNode

    if (extrudeDeclarator.init.type === 'CallExpression') {
-      // 1. case when no fillet exists
+      // 1. case when no edge treatment exists

-      // modify ast with new fillet call by mutating the extrude node
+      // modify ast with new edge treatment call by mutating the extrude node
      extrudeDeclarator.init = createPipeExpression([
        extrudeDeclarator.init,
-        filletCall,
+        edgeTreatmentCall,
      ])

-      // get path to the fillet node
-      pathToFilletNode = getPathToNodeOfFilletLiteral(
+      // get path to the edge treatment node
+      pathToEdgeTreatmentNode = getPathToNodeOfEdgeTreatmentLiteral(
        pathToExtrudeNode,
        extrudeDeclarator,
-        firstTag
+        firstTag,
+        parameters
      )
-      pathToFilletNodes.push(pathToFilletNode)
+      pathToEdgeTreatmentNodes.push(pathToEdgeTreatmentNode)
    } else if (extrudeDeclarator.init.type === 'PipeExpression') {
-      // 2. case when fillet exists or extrude in sketch pipe
+      // 2. case when edge treatment exists or extrude in sketch pipe

-      // mutate the extrude node with the new fillet call
-      extrudeDeclarator.init.body.push(filletCall)
+      // mutate the extrude node with the new edge treatment call
+      extrudeDeclarator.init.body.push(edgeTreatmentCall)

-      // get path to the fillet node
-      pathToFilletNode = getPathToNodeOfFilletLiteral(
+      // get path to the edge treatment node
+      pathToEdgeTreatmentNode = getPathToNodeOfEdgeTreatmentLiteral(
        pathToExtrudeNode,
        extrudeDeclarator,
-        firstTag
+        firstTag,
+        parameters
      )
-      pathToFilletNodes.push(pathToFilletNode)
+      pathToEdgeTreatmentNodes.push(pathToEdgeTreatmentNode)
    } else {
      return new Error('Unsupported extrude type.')
    }
  }
-  return { modifiedAst: clonedAst, pathToFilletNode: pathToFilletNodes }
+  return {
+    modifiedAst: clonedAst,
+    pathToEdgeTreatmentNode: pathToEdgeTreatmentNodes,
+  }
 }

-function insertRadiusIntoAst(
+function insertParametersIntoAst(
  ast: Program,
-  radius: KclCommandValue
+  parameters: EdgeTreatmentParameters
 ): { ast: Program } | Error {
  try {
-    // Validate and update AST
+    const newAst = structuredClone(ast)
+
+    // handle radius parameter
    if (
-      'variableName' in radius &&
-      radius.variableName &&
-      radius.insertIndex !== undefined
+      parameters.type === EdgeTreatmentType.Fillet &&
+      'variableName' in parameters.radius &&
+      parameters.radius.variableName &&
+      parameters.radius.insertIndex !== undefined
    ) {
-      const newAst = structuredClone(ast)
-      newAst.body.splice(radius.insertIndex, 0, radius.variableDeclarationAst)
-      return { ast: newAst }
+      newAst.body.splice(
+        parameters.radius.insertIndex,
+        0,
+        parameters.radius.variableDeclarationAst
+      )
    }
-    return { ast }
+    // handle length parameter
+    if (
+      parameters.type === EdgeTreatmentType.Chamfer &&
+      'variableName' in parameters.length &&
+      parameters.length.variableName &&
+      parameters.length.insertIndex !== undefined
+    ) {
+      newAst.body.splice(
+        parameters.length.insertIndex,
+        0,
+        parameters.length.variableDeclarationAst
+      )
+    }
+
+    // handle upcoming parameters here (for blend, bevel, etc.)
+    return { ast: newAst }
  } catch (error) {
    return new Error(`Failed to handle AST: ${(error as Error).message}`)
  }
@ -248,10 +295,10 @@ export function getPathToExtrudeForSegmentSelection(

 async function updateAstAndFocus(
  modifiedAst: Node<Program>,
-  pathToFilletNode: Array<PathToNode>
+  pathToEdgeTreatmentNode: Array<PathToNode>
 ) {
  const updatedAst = await kclManager.updateAst(modifiedAst, true, {
-    focusPath: pathToFilletNode,
+    focusPath: pathToEdgeTreatmentNode,
  })

  await codeManager.updateEditorWithAstAndWriteToFile(updatedAst.newAst)
@ -340,27 +387,38 @@ function locateExtrudeDeclarator(
  return { extrudeDeclarator }
 }

-function getPathToNodeOfFilletLiteral(
+function getPathToNodeOfEdgeTreatmentLiteral(
  pathToExtrudeNode: PathToNode,
  extrudeDeclarator: VariableDeclarator,
-  tag: Identifier | CallExpression
+  tag: Identifier | CallExpression,
+  parameters: EdgeTreatmentParameters
 ): PathToNode {
-  let pathToFilletObj: PathToNode = []
-  let inFillet = false
+  let pathToEdgeTreatmentObj: PathToNode = []
+  let inEdgeTreatment = false

  traverse(extrudeDeclarator.init, {
    enter(node, path) {
-      if (node.type === 'CallExpression' && node.callee.name === 'fillet') {
-        inFillet = true
+      if (
+        node.type === 'CallExpression' &&
+        node.callee.name === parameters.type
+      ) {
+        inEdgeTreatment = true
      }
-      if (inFillet && node.type === 'ObjectExpression') {
+      if (inEdgeTreatment && node.type === 'ObjectExpression') {
        if (!hasTag(node, tag)) return false
-        pathToFilletObj = getPathToRadiusLiteral(node, path)
+        pathToEdgeTreatmentObj = getPathToEdgeTreatmentParameterLiteral(
+          node,
+          path,
+          parameters
+        )
      }
    },
    leave(node) {
-      if (node.type === 'CallExpression' && node.callee.name === 'fillet') {
-        inFillet = false
+      if (
+        node.type === 'CallExpression' &&
+        node.callee.name === parameters.type
+      ) {
+        inEdgeTreatment = false
      }
    },
  })
@ -375,7 +433,7 @@ function getPathToNodeOfFilletLiteral(

  return [
    ...pathToExtrudeNode.slice(0, indexOfPipeExpression),
-    ...pathToFilletObj,
+    ...pathToEdgeTreatmentObj,
  ]
 }

@ -408,23 +466,62 @@ function hasTag(
  })
 }

-function getPathToRadiusLiteral(node: ObjectExpression, path: any): PathToNode {
-  let pathToFilletObj = path
+function getPathToEdgeTreatmentParameterLiteral(
+  node: ObjectExpression,
+  path: any,
+  parameters: EdgeTreatmentParameters
+): PathToNode {
+  let pathToEdgeTreatmentObj = path
+  const parameterResult = getParameterNameAndValue(parameters)
+  if (err(parameterResult)) return pathToEdgeTreatmentObj
+  const { parameterName } = parameterResult
+
  node.properties.forEach((prop, index) => {
-    if (prop.key.name === 'radius') {
-      pathToFilletObj.push(
+    if (prop.key.name === parameterName) {
+      pathToEdgeTreatmentObj.push(
        ['properties', 'ObjectExpression'],
        [index, 'index'],
        ['value', 'Property']
      )
    }
  })
-  return pathToFilletObj
+  return pathToEdgeTreatmentObj
+}
+
+function getParameterNameAndValue(
+  parameters: EdgeTreatmentParameters
+): { parameterName: string; parameterValue: Expr } | Error {
+  if (parameters.type === EdgeTreatmentType.Fillet) {
+    const parameterValue =
+      'variableName' in parameters.radius
+        ? parameters.radius.variableIdentifierAst
+        : parameters.radius.valueAst
+    return { parameterName: 'radius', parameterValue }
+  } else if (parameters.type === EdgeTreatmentType.Chamfer) {
+    const parameterValue =
+      'variableName' in parameters.length
+        ? parameters.length.variableIdentifierAst
+        : parameters.length.valueAst
+    return { parameterName: 'length', parameterValue }
+  } else {
+    return new Error('Unsupported edge treatment type}')
+  }
+}
+
+// Type Guards
+function isEdgeTreatmentType(name: string): name is EdgeTreatmentType {
+  return name === EdgeTreatmentType.Chamfer || name === EdgeTreatmentType.Fillet
+}
+function isEdgeType(name: string): name is EdgeTypes {
+  return (
+    name === 'getNextAdjacentEdge' ||
+    name === 'getPreviousAdjacentEdge' ||
+    name === 'getOppositeEdge'
+  )
 }

 // Button states
-
-export const hasValidFilletSelection = ({
+export const hasValidEdgeTreatmentSelection = ({
  selectionRanges,
  ast,
  code,
@ -433,11 +530,14 @@ export const hasValidFilletSelection = ({
  ast: Node<Program>
  code: string
 }) => {
-  // check if there is anything filletable in the scene
+  // check if there is anything valid for the edge treatment in the scene
  let extrudeExists = false
  traverse(ast, {
    enter(node) {
-      if (node.type === 'CallExpression' && node.callee.name === 'extrude') {
+      if (
+        node.type === 'CallExpression' &&
+        (node.callee.name === 'extrude' || node.callee.name === 'revolve')
+      ) {
        extrudeExists = true
      }
    },
@ -494,32 +594,39 @@ export const hasValidFilletSelection = ({
      },
    })

-    // check if tag is used in fillet
+    // check if tag is used in edge treatment
    if (tagExists && selection.artifact) {
      // create tag call
      let tagCall: Expr = getEdgeTagCall(tag, selection.artifact)

-      // check if tag is used in fillet
-      let inFillet = false
-      let tagUsedInFillet = false
+      // check if tag is used in edge treatment
+      let inEdgeTreatment = false
+      let tagUsedInEdgeTreatment = false
+
      traverse(ast, {
        enter(node) {
-          if (node.type === 'CallExpression' && node.callee.name === 'fillet') {
-            inFillet = true
+          if (
+            node.type === 'CallExpression' &&
+            isEdgeTreatmentType(node.callee.name)
+          ) {
+            inEdgeTreatment = true
          }
-          if (inFillet && node.type === 'ObjectExpression') {
+          if (inEdgeTreatment && node.type === 'ObjectExpression') {
            if (hasTag(node, tagCall)) {
-              tagUsedInFillet = true
+              tagUsedInEdgeTreatment = true
            }
          }
        },
        leave(node) {
-          if (node.type === 'CallExpression' && node.callee.name === 'fillet') {
-            inFillet = false
+          if (
+            node.type === 'CallExpression' &&
+            isEdgeTreatmentType(node.callee.name)
+          ) {
+            inEdgeTreatment = false
          }
        },
      })
-      if (tagUsedInFillet) {
+      if (tagUsedInEdgeTreatment) {
        return false
      }
    }
@ -533,7 +640,7 @@ type EdgeTypes =
  | 'getPreviousAdjacentEdge'
  | 'getOppositeEdge'

-export const isTagUsedInFillet = ({
+export const isTagUsedInEdgeTreatment = ({
  ast,
  callExp,
 }: {
@ -543,16 +650,21 @@ export const isTagUsedInFillet = ({
  const tag = getTagFromCallExpression(callExp)
  if (err(tag)) return []

-  let inFillet = false
+  let inEdgeTreatment = false
  let inObj = false
  let inTagHelper: EdgeTypes | '' = ''
  const edges: Array<EdgeTypes> = []
+
  traverse(ast, {
    enter: (node) => {
-      if (node.type === 'CallExpression' && node.callee.name === 'fillet') {
-        inFillet = true
+      // Check if we are entering an edge treatment call
+      if (
+        node.type === 'CallExpression' &&
+        isEdgeTreatmentType(node.callee.name)
+      ) {
+        inEdgeTreatment = true
      }
-      if (inFillet && node.type === 'ObjectExpression') {
+      if (inEdgeTreatment && node.type === 'ObjectExpression') {
        node.properties.forEach((prop) => {
          if (
            prop.key.name === 'tags' &&
@ -564,17 +676,15 @@ export const isTagUsedInFillet = ({
      }
      if (
        inObj &&
-        inFillet &&
+        inEdgeTreatment &&
        node.type === 'CallExpression' &&
-        (node.callee.name === 'getOppositeEdge' ||
-          node.callee.name === 'getNextAdjacentEdge' ||
-          node.callee.name === 'getPreviousAdjacentEdge')
+        isEdgeType(node.callee.name)
      ) {
        inTagHelper = node.callee.name
      }
      if (
        inObj &&
-        inFillet &&
+        inEdgeTreatment &&
        !inTagHelper &&
        node.type === 'Identifier' &&
        node.name === tag
@ -583,7 +693,7 @@ export const isTagUsedInFillet = ({
      }
      if (
        inObj &&
-        inFillet &&
+        inEdgeTreatment &&
        inTagHelper &&
        node.type === 'Identifier' &&
        node.name === tag
@ -592,10 +702,13 @@ export const isTagUsedInFillet = ({
      }
    },
    leave: (node) => {
-      if (node.type === 'CallExpression' && node.callee.name === 'fillet') {
-        inFillet = false
+      if (
+        node.type === 'CallExpression' &&
+        isEdgeTreatmentType(node.callee.name)
+      ) {
+        inEdgeTreatment = false
      }
-      if (inFillet && node.type === 'ObjectExpression') {
+      if (inEdgeTreatment && node.type === 'ObjectExpression') {
        node.properties.forEach((prop) => {
          if (
            prop.key.name === 'tags' &&
@ -607,11 +720,9 @@ export const isTagUsedInFillet = ({
      }
      if (
        inObj &&
-        inFillet &&
+        inEdgeTreatment &&
        node.type === 'CallExpression' &&
-        (node.callee.name === 'getOppositeEdge' ||
-          node.callee.name === 'getNextAdjacentEdge' ||
-          node.callee.name === 'getPreviousAdjacentEdge')
+        isEdgeType(node.callee.name)
      ) {
        inTagHelper = ''
      }
--- a/src/lang/queryAst.test.ts
+++ b/src/lang/queryAst.test.ts
@ -628,6 +628,18 @@ sketch002 = startSketchOn(extrude001, $seg01)
    const extrudable = doesSceneHaveSweepableSketch(ast)
    expect(extrudable).toBeTruthy()
  })
+  it('finds sketch001 and sketch002 pipes to be lofted', async () => {
+    const exampleCode = `sketch001 = startSketchOn('XZ')
+  |> circle({ center = [0, 0], radius = 1 }, %)
+plane001 = offsetPlane('XZ', 2)
+sketch002 = startSketchOn(plane001)
+  |> circle({ center = [0, 0], radius = 3 }, %)
+`
+    const ast = parse(exampleCode)
+    if (err(ast)) throw ast
+    const extrudable = doesSceneHaveSweepableSketch(ast, 2)
+    expect(extrudable).toBeTruthy()
+  })
  it('find sketch002 NOT pipe to be extruded', async () => {
    const exampleCode = `sketch001 = startSketchOn('XZ')
  |> startProfileAt([3.29, 7.86], %)
--- a/src/lang/queryAst.ts
+++ b/src/lang/queryAst.ts
@ -975,7 +975,9 @@ export function hasSketchPipeBeenExtruded(selection: Selection, ast: Program) {
        if (
          node.type === 'CallExpression' &&
          node.callee.type === 'Identifier' &&
-          (node.callee.name === 'extrude' || node.callee.name === 'revolve') &&
+          (node.callee.name === 'extrude' ||
+            node.callee.name === 'revolve' ||
+            node.callee.name === 'loft') &&
          node.arguments?.[1]?.type === 'Identifier' &&
          node.arguments[1].name === varDec.id.name
        ) {
@ -988,7 +990,7 @@ export function hasSketchPipeBeenExtruded(selection: Selection, ast: Program) {
 }

 /** File must contain at least one sketch that has not been extruded already */
-export function doesSceneHaveSweepableSketch(ast: Node<Program>) {
+export function doesSceneHaveSweepableSketch(ast: Node<Program>, count = 1) {
  const theMap: any = {}
  traverse(ast as any, {
    enter(node) {
@ -1037,7 +1039,7 @@ export function doesSceneHaveSweepableSketch(ast: Node<Program>) {
      }
    },
  })
-  return Object.keys(theMap).length > 0
+  return Object.keys(theMap).length >= count
 }

 export function getObjExprProperty(
--- a/src/lang/std/snapshots/artifactGraph.test.ts.snap
+++ b/src/lang/std/snapshots/artifactGraph.test.ts.snap
@ -11,8 +11,8 @@ Map {
        ],
      ],
      "range": [
-        37,
-        64,
+        12,
+        31,
        0,
      ],
    },
--- a/src/lib/commandBarConfigs/modelingCommandConfig.ts
+++ b/src/lib/commandBarConfigs/modelingCommandConfig.ts
@ -31,6 +31,9 @@ export type ModelingCommandSchema = {
    // result: (typeof EXTRUSION_RESULTS)[number]
    distance: KclCommandValue
  }
+  Loft: {
+    selection: Selections
+  }
  Revolve: {
    selection: Selections
    angle: KclCommandValue
@ -260,6 +263,20 @@ export const modelingMachineCommandConfig: StateMachineCommandSetConfig<
      },
    },
  },
+  Loft: {
+    description: 'Create a 3D body by blending between two or more sketches',
+    icon: 'loft',
+    needsReview: true,
+    args: {
+      selection: {
+        inputType: 'selection',
+        selectionTypes: ['solid2D'],
+        multiple: true,
+        required: true,
+        skip: false,
+      },
+    },
+  },
  // TODO: Update this configuration, copied from extrude for MVP of revolve, specifically the args.selection
  Revolve: {
    description: 'Create a 3D body by rotating a sketch region about an axis.',
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@ -52,6 +52,7 @@ export const ONBOARDING_PROJECT_NAME = 'Tutorial Project $nn'
 export const KCL_DEFAULT_CONSTANT_PREFIXES = {
  SKETCH: 'sketch',
  EXTRUDE: 'extrude',
+  LOFT: 'loft',
  SEGMENT: 'seg',
  REVOLVE: 'revolve',
  PLANE: 'plane',
--- a/src/lib/desktop.test.ts
+++ b/src/lib/desktop.test.ts
@ -46,9 +46,21 @@ describe('desktop utilities', () => {
      'project-without-kcl-files',
      'another-valid-project',
    ],
-    '/test/projects/valid-project': ['file1.kcl', 'file2.stp'],
+    '/test/projects/valid-project': [
+      'file1.kcl',
+      'file2.stp',
+      'file3.kcl',
+      'directory1',
+    ],
+    '/test/projects/valid-project/directory1': [],
    '/test/projects/project-without-kcl-files': ['file3.glb'],
-    '/test/projects/another-valid-project': ['file4.kcl'],
+    '/test/projects/another-valid-project': [
+      'file4.kcl',
+      'directory2',
+      'directory3',
+    ],
+    '/test/projects/another-valid-project/directory2': [],
+    '/test/projects/another-valid-project/directory3': [],
  }

  beforeEach(() => {
@ -119,6 +131,15 @@ describe('desktop utilities', () => {
      )
    })

+    it('correctly counts directories and files', async () => {
+      const projects = await listProjects(mockConfig)
+      // Verify that directories and files are counted correctly
+      expect(projects[0].directory_count).toEqual(1)
+      expect(projects[0].kcl_file_count).toEqual(2)
+      expect(projects[1].directory_count).toEqual(2)
+      expect(projects[1].kcl_file_count).toEqual(1)
+    })
+
    it('handles empty project directory', async () => {
      // Adjust mockFileSystem to simulate empty directory
      mockFileSystem['/test/projects'] = []
--- a/src/lib/desktop.ts
+++ b/src/lib/desktop.ts
@ -307,7 +307,10 @@ const directoryCount = (file: FileEntry) => {
  let count = 0
  if (file.children) {
    for (let entry of file.children) {
-      count += 1
+      // We only want to count FileEntries with children, e.g. folders
+      if (entry.children !== null) {
+        count += 1
+      }
      directoryCount(entry)
    }
  }
--- a/src/lib/selections.ts
+++ b/src/lib/selections.ts
@ -529,6 +529,10 @@ function nodeHasExtrude(node: CommonASTNode) {
    doesPipeHaveCallExp({
      calleeName: 'revolve',
      ...node,
+    }) ||
+    doesPipeHaveCallExp({
+      calleeName: 'loft',
+      ...node,
    })
  )
 }
@ -559,6 +563,22 @@ export function canSweepSelection(selection: Selections) {
  )
 }

+export function canLoftSelection(selection: Selections) {
+  const commonNodes = selection.graphSelections.map((_, i) =>
+    buildCommonNodeFromSelection(selection, i)
+  )
+  return (
+    !!isCursorInSketchCommandRange(
+      engineCommandManager.artifactGraph,
+      selection
+    ) &&
+    commonNodes.length > 1 &&
+    commonNodes.every((n) => !hasSketchPipeBeenExtruded(n.selection, n.ast)) &&
+    commonNodes.every((n) => nodeHasClose(n) || nodeHasCircle(n)) &&
+    commonNodes.every((n) => !nodeHasExtrude(n))
+  )
+}
+
 // This accounts for non-geometry selections under "other"
 export type ResolvedSelectionType = Artifact['type'] | 'other'
 export type SelectionCountsByType = Map<ResolvedSelectionType, number>
--- a/src/lib/toolbar.ts
+++ b/src/lib/toolbar.ts
@ -139,9 +139,14 @@ export const toolbarConfig: Record<ToolbarModeName, ToolbarMode> = {
      },
      {
        id: 'loft',
-        onClick: () => console.error('Loft not yet implemented'),
+        onClick: ({ commandBarSend }) =>
+          commandBarSend({
+            type: 'Find and select command',
+            data: { name: 'Loft', groupId: 'modeling' },
+          }),
+        disabled: (state) => !state.can({ type: 'Loft' }),
        icon: 'loft',
-        status: 'kcl-only',
+        status: 'available',
        title: 'Loft',
        hotkey: 'L',
        description:
--- a/src/machines/modelingMachine.ts
+++ b/src/machines/modelingMachine.ts
@ -44,9 +44,14 @@ import {
  addOffsetPlane,
  deleteFromSelection,
  extrudeSketch,
+  loftSketches,
  revolveSketch,
 } from 'lang/modifyAst'
-import { applyFilletToSelection } from 'lang/modifyAst/addFillet'
+import {
+  applyEdgeTreatmentToSelection,
+  EdgeTreatmentType,
+  FilletParameters,
+} from 'lang/modifyAst/addEdgeTreatment'
 import { getNodeFromPath } from '../lang/queryAst'
 import {
  applyConstraintEqualAngle,
@ -252,6 +257,7 @@ export type ModelingMachineEvent =
  | { type: 'Export'; data: ModelingCommandSchema['Export'] }
  | { type: 'Make'; data: ModelingCommandSchema['Make'] }
  | { type: 'Extrude'; data?: ModelingCommandSchema['Extrude'] }
+  | { type: 'Loft'; data?: ModelingCommandSchema['Loft'] }
  | { type: 'Revolve'; data?: ModelingCommandSchema['Revolve'] }
  | { type: 'Fillet'; data?: ModelingCommandSchema['Fillet'] }
  | { type: 'Offset plane'; data: ModelingCommandSchema['Offset plane'] }
@ -383,7 +389,8 @@ export const modelingMachine = setup({
  guards: {
    'Selection is on face': () => false,
    'has valid sweep selection': () => false,
-    'has valid fillet selection': () => false,
+    'has valid loft selection': () => false,
+    'has valid edge treatment selection': () => false,
    'Has exportable geometry': () => false,
    'has valid selection for deletion': () => false,
    'has made first point': ({ context }) => {
@ -739,14 +746,19 @@ export const modelingMachine = setup({
      // Extract inputs
      const ast = kclManager.ast
      const { selection, radius } = event.data
+      const parameters: FilletParameters = {
+        type: EdgeTreatmentType.Fillet,
+        radius,
+      }

      // Apply fillet to selection
-      const applyFilletToSelectionResult = applyFilletToSelection(
+      const applyEdgeTreatmentToSelectionResult = applyEdgeTreatmentToSelection(
        ast,
        selection,
-        radius
+        parameters
      )
-      if (err(applyFilletToSelectionResult)) return applyFilletToSelectionResult
+      if (err(applyEdgeTreatmentToSelectionResult))
+        return applyEdgeTreatmentToSelectionResult

      // eslint-disable-next-line @typescript-eslint/no-floating-promises
      codeManager.updateEditorWithAstAndWriteToFile(kclManager.ast)
@ -1520,6 +1532,50 @@ export const modelingMachine = setup({
          updateAstResult.newAst
        )

+        if (updateAstResult?.selections) {
+          editorManager.selectRange(updateAstResult?.selections)
+        }
+      }
+    ),
+    loftAstMod: fromPromise(
+      async ({
+        input,
+      }: {
+        input: ModelingCommandSchema['Loft'] | undefined
+      }) => {
+        if (!input) return new Error('No input provided')
+        // Extract inputs
+        const ast = kclManager.ast
+        const { selection } = input
+        const declarators = selection.graphSelections.flatMap((s) => {
+          const path = getNodePathFromSourceRange(ast, s?.codeRef.range)
+          const nodeFromPath = getNodeFromPath<VariableDeclarator>(
+            ast,
+            path,
+            'VariableDeclarator'
+          )
+          return err(nodeFromPath) ? [] : nodeFromPath.node
+        })
+
+        // TODO: add better validation on selection
+        if (!(declarators && declarators.length > 1)) {
+          trap('Not enough sketches selected')
+        }
+
+        // Perform the loft
+        const loftSketchesRes = loftSketches(ast, declarators)
+        const updateAstResult = await kclManager.updateAst(
+          loftSketchesRes.modifiedAst,
+          true,
+          {
+            focusPath: [loftSketchesRes.pathToNode],
+          }
+        )
+
+        await codeManager.updateEditorWithAstAndWriteToFile(
+          updateAstResult.newAst
+        )
+
        if (updateAstResult?.selections) {
          editorManager.selectRange(updateAstResult?.selections)
        }
@ -1561,9 +1617,14 @@ export const modelingMachine = setup({
          reenter: false,
        },

+        Loft: {
+          target: 'Applying loft',
+          reenter: true,
+        },
+
        Fillet: {
          target: 'idle',
-          guard: 'has valid fillet selection', // TODO: fix selections
+          guard: 'has valid edge treatment selection',
          actions: ['AST fillet'],
          reenter: false,
        },
@ -2309,6 +2370,19 @@ export const modelingMachine = setup({
        onError: ['idle'],
      },
    },
+
+    'Applying loft': {
+      invoke: {
+        src: 'loftAstMod',
+        id: 'loftAstMod',
+        input: ({ event }) => {
+          if (event.type !== 'Loft') return undefined
+          return event.data
+        },
+        onDone: ['idle'],
+        onError: ['idle'],
+      },
+    },
  },

  initial: 'idle',
--- a/src/wasm-lib/Cargo.lock
+++ b/src/wasm-lib/Cargo.lock
@ -443,9 +443,9 @@ dependencies = [

 [[package]]
 name = "clap"
-version = "4.5.20"
+version = "4.5.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
+checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f"
 dependencies = [
 "clap_builder",
 "clap_derive",
@ -453,9 +453,9 @@ dependencies = [

 [[package]]
 name = "clap_builder"
-version = "4.5.20"
+version = "4.5.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
+checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec"
 dependencies = [
 "anstream",
 "anstyle",
@ -1182,9 +1182,9 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"

 [[package]]
 name = "hashbrown"
-version = "0.15.0"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"

 [[package]]
 name = "heck"
@ -1589,7 +1589,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
 "equivalent",
- "hashbrown 0.15.0",
+ "hashbrown 0.15.2",
 "serde",
 ]

@ -1706,7 +1706,7 @@ dependencies = [

 [[package]]
 name = "kcl-lib"
-version = "0.2.26"
+version = "0.2.27"
 dependencies = [
 "anyhow",
 "approx 0.5.1",
@ -1800,9 +1800,9 @@ dependencies = [

 [[package]]
 name = "kittycad"
-version = "0.3.25"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6359cc0a1bbccbcf78775eea17a033cf2aa89d3fe6a9784f8ce94e5f882c185"
+checksum = "933cb5f77624386c87d296e3fd493daf50156d1cbfa03b9f333a6d4da2896369"
 dependencies = [
 "anyhow",
 "async-trait",
@ -1831,7 +1831,7 @@ dependencies = [
 "serde_bytes",
 "serde_json",
 "serde_urlencoded",
- "thiserror 1.0.68",
+ "thiserror 2.0.0",
 "tokio",
 "tracing",
 "url",
@ -2921,9 +2921,9 @@ dependencies = [

 [[package]]
 name = "reqwest-conditional-middleware"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1663d9d4fbb6e3900f91455d6d7833301c91ae3c7fc6e116fd7acd40e478a93"
+checksum = "f67ad7fdf5c0a015763fcd164bee294b13fb7b6f89f1b55961d40f00c3e32d6b"
 dependencies = [
 "async-trait",
 "http 1.1.0",
@ -2933,9 +2933,9 @@ dependencies = [

 [[package]]
 name = "reqwest-middleware"
-version = "0.3.3"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "562ceb5a604d3f7c885a792d42c199fd8af239d0a51b2fa6a78aafa092452b04"
+checksum = "d1ccd3b55e711f91a9885a2fa6fbbb2e39db1776420b062efc058c6410f7e5e3"
 dependencies = [
 "anyhow",
 "async-trait",
@ -2948,9 +2948,9 @@ dependencies = [

 [[package]]
 name = "reqwest-retry"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a83df1aaec00176d0fabb65dea13f832d2a446ca99107afc17c5d2d4981221d0"
+checksum = "29c73e4195a6bfbcb174b790d9b3407ab90646976c55de58a6515da25d851178"
 dependencies = [
 "anyhow",
 "async-trait",
@ -2962,6 +2962,7 @@ dependencies = [
 "reqwest",
 "reqwest-middleware",
 "retry-policies",
+ "thiserror 1.0.68",
 "tokio",
 "tracing",
 "wasm-timer",
@ -2969,9 +2970,9 @@ dependencies = [

 [[package]]
 name = "reqwest-tracing"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfdd9bfa64c72233d8dd99ab7883efcdefe9e16d46488ecb9228b71a2e2ceb45"
+checksum = "ff82cf5730a1311fb9413b0bc2b8e743e0157cd73f010ab4ec374a923873b6a2"
 dependencies = [
 "anyhow",
 "async-trait",
@ -3065,9 +3066,9 @@ dependencies = [

 [[package]]
 name = "rustls"
-version = "0.23.13"
+version = "0.23.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8"
+checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1"
 dependencies = [
 "once_cell",
 "ring",
@ -3101,9 +3102,9 @@ dependencies = [

 [[package]]
 name = "rustls-pki-types"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55"
+checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"

 [[package]]
 name = "rustls-webpki"
--- a/src/wasm-lib/Cargo.toml
+++ b/src/wasm-lib/Cargo.toml
@ -74,8 +74,8 @@ members = [

 [workspace.dependencies]
 http = "1"
-kittycad = { version = "0.3.25", default-features = false, features = ["js", "requests"] }
-kittycad-modeling-cmds = { version = "0.2.76", features = ["websocket"] }
+kittycad = { version = "0.3.28", default-features = false, features = ["js", "requests"] }
+kittycad-modeling-cmds = { version = "0.2.77", features = ["websocket"] }

 [[test]]
 name = "executor"
--- a/src/wasm-lib/derive-docs/src/lib.rs
+++ b/src/wasm-lib/derive-docs/src/lib.rs
@ -171,7 +171,7 @@ fn do_stdlib_inner(
            code_blocks.iter().map(|cb| {
                let program = crate::Program::parse(cb).unwrap();

-                let mut options: crate::ast::types::FormatOptions = Default::default();
+                let mut options: crate::parsing::ast::types::FormatOptions = Default::default();
                options.insert_final_newline = false;
                program.ast.recast(&options, 0)
            }).collect::<Vec<String>>()
--- a/src/wasm-lib/derive-docs/tests/args_with_lifetime.gen
+++ b/src/wasm-lib/derive-docs/tests/args_with_lifetime.gen
@ -113,7 +113,7 @@ impl crate::docs::StdLibFn for SomeFn {
            .iter()
            .map(|cb| {
                let program = crate::Program::parse(cb).unwrap();
-                let mut options: crate::ast::types::FormatOptions = Default::default();
+                let mut options: crate::parsing::ast::types::FormatOptions = Default::default();
                options.insert_final_newline = false;
                program.ast.recast(&options, 0)
            })
--- a/src/wasm-lib/derive-docs/tests/args_with_refs.gen
+++ b/src/wasm-lib/derive-docs/tests/args_with_refs.gen
@ -113,7 +113,7 @@ impl crate::docs::StdLibFn for SomeFn {
            .iter()
            .map(|cb| {
                let program = crate::Program::parse(cb).unwrap();
-                let mut options: crate::ast::types::FormatOptions = Default::default();
+                let mut options: crate::parsing::ast::types::FormatOptions = Default::default();
                options.insert_final_newline = false;
                program.ast.recast(&options, 0)
            })
--- a/src/wasm-lib/derive-docs/tests/array.gen
+++ b/src/wasm-lib/derive-docs/tests/array.gen
@ -150,7 +150,7 @@ impl crate::docs::StdLibFn for Show {
            .iter()
            .map(|cb| {
                let program = crate::Program::parse(cb).unwrap();
-                let mut options: crate::ast::types::FormatOptions = Default::default();
+                let mut options: crate::parsing::ast::types::FormatOptions = Default::default();
                options.insert_final_newline = false;
                program.ast.recast(&options, 0)
            })
--- a/src/wasm-lib/derive-docs/tests/box.gen
+++ b/src/wasm-lib/derive-docs/tests/box.gen
@ -113,7 +113,7 @@ impl crate::docs::StdLibFn for Show {
            .iter()
            .map(|cb| {
                let program = crate::Program::parse(cb).unwrap();
-                let mut options: crate::ast::types::FormatOptions = Default::default();
+                let mut options: crate::parsing::ast::types::FormatOptions = Default::default();
                options.insert_final_newline = false;
                program.ast.recast(&options, 0)
            })
--- a/src/wasm-lib/derive-docs/tests/doc_comment_with_code.gen
+++ b/src/wasm-lib/derive-docs/tests/doc_comment_with_code.gen
@ -150,7 +150,7 @@ impl crate::docs::StdLibFn for MyFunc {
            .iter()
            .map(|cb| {
                let program = crate::Program::parse(cb).unwrap();
-                let mut options: crate::ast::types::FormatOptions = Default::default();
+                let mut options: crate::parsing::ast::types::FormatOptions = Default::default();
                options.insert_final_newline = false;
                program.ast.recast(&options, 0)
            })
--- a/src/wasm-lib/derive-docs/tests/lineTo.gen
+++ b/src/wasm-lib/derive-docs/tests/lineTo.gen
@ -158,7 +158,7 @@ impl crate::docs::StdLibFn for LineTo {
            .iter()
            .map(|cb| {
                let program = crate::Program::parse(cb).unwrap();
-                let mut options: crate::ast::types::FormatOptions = Default::default();
+                let mut options: crate::parsing::ast::types::FormatOptions = Default::default();
                options.insert_final_newline = false;
                program.ast.recast(&options, 0)
            })
--- a/src/wasm-lib/derive-docs/tests/min.gen
+++ b/src/wasm-lib/derive-docs/tests/min.gen
@ -150,7 +150,7 @@ impl crate::docs::StdLibFn for Min {
            .iter()
            .map(|cb| {
                let program = crate::Program::parse(cb).unwrap();
-                let mut options: crate::ast::types::FormatOptions = Default::default();
+                let mut options: crate::parsing::ast::types::FormatOptions = Default::default();
                options.insert_final_newline = false;
                program.ast.recast(&options, 0)
            })
--- a/src/wasm-lib/derive-docs/tests/option.gen
+++ b/src/wasm-lib/derive-docs/tests/option.gen
@ -113,7 +113,7 @@ impl crate::docs::StdLibFn for Show {
            .iter()
            .map(|cb| {
                let program = crate::Program::parse(cb).unwrap();
-                let mut options: crate::ast::types::FormatOptions = Default::default();
+                let mut options: crate::parsing::ast::types::FormatOptions = Default::default();
                options.insert_final_newline = false;
                program.ast.recast(&options, 0)
            })
--- a/src/wasm-lib/derive-docs/tests/option_input_format.gen
+++ b/src/wasm-lib/derive-docs/tests/option_input_format.gen
@ -113,7 +113,7 @@ impl crate::docs::StdLibFn for Import {
            .iter()
            .map(|cb| {
                let program = crate::Program::parse(cb).unwrap();
-                let mut options: crate::ast::types::FormatOptions = Default::default();
+                let mut options: crate::parsing::ast::types::FormatOptions = Default::default();
                options.insert_final_newline = false;
                program.ast.recast(&options, 0)
            })
--- a/src/wasm-lib/derive-docs/tests/return_vec_box_sketch.gen
+++ b/src/wasm-lib/derive-docs/tests/return_vec_box_sketch.gen
@ -113,7 +113,7 @@ impl crate::docs::StdLibFn for Import {
            .iter()
            .map(|cb| {
                let program = crate::Program::parse(cb).unwrap();
-                let mut options: crate::ast::types::FormatOptions = Default::default();
+                let mut options: crate::parsing::ast::types::FormatOptions = Default::default();
                options.insert_final_newline = false;
                program.ast.recast(&options, 0)
            })
--- a/src/wasm-lib/derive-docs/tests/return_vec_sketch.gen
+++ b/src/wasm-lib/derive-docs/tests/return_vec_sketch.gen
@ -113,7 +113,7 @@ impl crate::docs::StdLibFn for Import {
            .iter()
            .map(|cb| {
                let program = crate::Program::parse(cb).unwrap();
-                let mut options: crate::ast::types::FormatOptions = Default::default();
+                let mut options: crate::parsing::ast::types::FormatOptions = Default::default();
                options.insert_final_newline = false;
                program.ast.recast(&options, 0)
            })
--- a/src/wasm-lib/derive-docs/tests/show.gen
+++ b/src/wasm-lib/derive-docs/tests/show.gen
@ -113,7 +113,7 @@ impl crate::docs::StdLibFn for Show {
            .iter()
            .map(|cb| {
                let program = crate::Program::parse(cb).unwrap();
-                let mut options: crate::ast::types::FormatOptions = Default::default();
+                let mut options: crate::parsing::ast::types::FormatOptions = Default::default();
                options.insert_final_newline = false;
                program.ast.recast(&options, 0)
            })
--- a/src/wasm-lib/derive-docs/tests/test_args_with_exec_state.gen
+++ b/src/wasm-lib/derive-docs/tests/test_args_with_exec_state.gen
@ -108,7 +108,7 @@ impl crate::docs::StdLibFn for SomeFunction {
            .iter()
            .map(|cb| {
                let program = crate::Program::parse(cb).unwrap();
-                let mut options: crate::ast::types::FormatOptions = Default::default();
+                let mut options: crate::parsing::ast::types::FormatOptions = Default::default();
                options.insert_final_newline = false;
                program.ast.recast(&options, 0)
            })
--- a/src/wasm-lib/kcl/Cargo.toml
+++ b/src/wasm-lib/kcl/Cargo.toml
@ -1,7 +1,7 @@
 [package]
 name = "kcl-lib"
 description = "KittyCAD Language implementation and tools"
-version = "0.2.26"
+version = "0.2.27"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/KittyCAD/modeling-app"
@ -16,7 +16,10 @@ async-recursion = "1.1.1"
 async-trait = "0.1.83"
 base64 = "0.22.1"
 chrono = "0.4.38"
-clap = { version = "4.5.20", default-features = false, optional = true, features = ["std", "derive"] }
+clap = { version = "4.5.21", default-features = false, optional = true, features = [
+    "std",
+    "derive",
+] }
 convert_case = "0.6.0"
 dashmap = "6.1.0"
 databake = { version = "0.1.8", features = ["derive"] }
@ -38,16 +41,32 @@ miette = "7.2.0"
 mime_guess = "2.0.5"
 parse-display = "0.9.1"
 pyo3 = { version = "0.22.6", optional = true }
-reqwest = { version = "0.12", default-features = false, features = ["stream", "rustls-tls"] }
+reqwest = { version = "0.12", default-features = false, features = [
+    "stream",
+    "rustls-tls",
+] }
 ropey = "1.6.1"
-schemars = { version = "0.8.17", features = ["impl_json_schema", "indexmap2", "url", "uuid1", "preserve_order"] }
+schemars = { version = "0.8.17", features = [
+    "impl_json_schema",
+    "indexmap2",
+    "url",
+    "uuid1",
+    "preserve_order",
+] }
 serde = { version = "1.0.214", features = ["derive"] }
 serde_json = "1.0.128"
 sha2 = "0.10.8"
 tabled = { version = "0.15.0", optional = true }
 thiserror = "2.0.0"
 toml = "0.8.19"
-ts-rs = { version = "10.0.0", features = ["uuid-impl", "url-impl", "chrono-impl", "indexmap-impl", "no-serde-warnings", "serde-json-impl"] }
+ts-rs = { version = "10.0.0", features = [
+    "uuid-impl",
+    "url-impl",
+    "chrono-impl",
+    "indexmap-impl",
+    "no-serde-warnings",
+    "serde-json-impl",
+] }
 url = { version = "2.5.3", features = ["serde"] }
 urlencoding = "2.1.3"
 uuid = { version = "1.11.0", features = ["v4", "js", "serde"] }
@ -59,7 +78,9 @@ zip = { version = "2.0.0", default-features = false }
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 js-sys = { version = "0.3.72" }
 tokio = { version = "1.41.1", features = ["sync", "time"] }
-tower-lsp = { version = "0.20.0", default-features = false, features = ["runtime-agnostic"] }
+tower-lsp = { version = "0.20.0", default-features = false, features = [
+    "runtime-agnostic",
+] }
 wasm-bindgen = "0.2.91"
 wasm-bindgen-futures = "0.4.44"
 web-sys = { version = "0.3.72", features = ["console"] }
@ -68,7 +89,9 @@ web-sys = { version = "0.3.72", features = ["console"] }
 approx = "0.5"
 bson = { version = "2.13.0", features = ["uuid-1", "chrono"] }
 tokio = { version = "1.41.1", features = ["full"] }
-tokio-tungstenite = { version = "0.24.0", features = ["rustls-tls-native-roots"] }
+tokio-tungstenite = { version = "0.24.0", features = [
+    "rustls-tls-native-roots",
+] }
 tower-lsp = { version = "0.20.0", features = ["proposed"] }

 [features]
--- a/src/wasm-lib/kcl/src/ast/mod.rs
+++ b/src/wasm-lib/kcl/src/ast/mod.rs
@ -1,2 +0,0 @@
-pub mod modify;
-pub mod types;
--- a/src/wasm-lib/kcl/src/docs/mod.rs
+++ b/src/wasm-lib/kcl/src/docs/mod.rs
@ -797,7 +797,7 @@ mod tests {

    #[test]
    fn test_serialize_function() {
-        let some_function = crate::ast::types::Function::StdLib {
+        let some_function = crate::parsing::ast::types::Function::StdLib {
            func: Box::new(crate::std::sketch::Line),
        };
        let serialized = serde_json::to_string(&some_function).unwrap();
@ -807,11 +807,11 @@ mod tests {
    #[test]
    fn test_deserialize_function() {
        let some_function_string = r#"{"type":"StdLib","func":{"name":"line","summary":"","description":"","tags":[],"returnValue":{"type":"","required":false,"name":"","schema":{},"schemaDefinitions":{}},"args":[],"unpublished":false,"deprecated":false, "examples": []}}"#;
-        let some_function: crate::ast::types::Function = serde_json::from_str(some_function_string).unwrap();
+        let some_function: crate::parsing::ast::types::Function = serde_json::from_str(some_function_string).unwrap();

        assert_eq!(
            some_function,
-            crate::ast::types::Function::StdLib {
+            crate::parsing::ast::types::Function::StdLib {
                func: Box::new(crate::std::sketch::Line)
            }
        );
--- a/src/wasm-lib/kcl/src/engine/conn.rs
+++ b/src/wasm-lib/kcl/src/engine/conn.rs
@ -18,14 +18,14 @@ use kittycad_modeling_cmds as kcmc;
 use tokio::sync::{mpsc, oneshot, RwLock};
 use tokio_tungstenite::tungstenite::Message as WsMsg;

+use super::ExecutionKind;
 use crate::{
    engine::EngineManager,
    errors::{KclError, KclErrorDetails},
    executor::{DefaultPlanes, IdGenerator},
+    SourceRange,
 };

-use super::ExecutionKind;
-
 #[derive(Debug, PartialEq)]
 enum SocketHealth {
    Active,
@ -41,8 +41,8 @@ pub struct EngineConnection {
    #[allow(dead_code)]
    tcp_read_handle: Arc<TcpReadHandle>,
    socket_health: Arc<Mutex<SocketHealth>>,
-    batch: Arc<Mutex<Vec<(WebSocketRequest, crate::executor::SourceRange)>>>,
-    batch_end: Arc<Mutex<IndexMap<uuid::Uuid, (WebSocketRequest, crate::executor::SourceRange)>>>,
+    batch: Arc<Mutex<Vec<(WebSocketRequest, SourceRange)>>>,
+    batch_end: Arc<Mutex<IndexMap<uuid::Uuid, (WebSocketRequest, SourceRange)>>>,

    /// The default planes for the scene.
    default_planes: Arc<RwLock<Option<DefaultPlanes>>>,
@ -311,11 +311,11 @@ impl EngineConnection {

 #[async_trait::async_trait]
 impl EngineManager for EngineConnection {
-    fn batch(&self) -> Arc<Mutex<Vec<(WebSocketRequest, crate::executor::SourceRange)>>> {
+    fn batch(&self) -> Arc<Mutex<Vec<(WebSocketRequest, SourceRange)>>> {
        self.batch.clone()
    }

-    fn batch_end(&self) -> Arc<Mutex<IndexMap<uuid::Uuid, (WebSocketRequest, crate::executor::SourceRange)>>> {
+    fn batch_end(&self) -> Arc<Mutex<IndexMap<uuid::Uuid, (WebSocketRequest, SourceRange)>>> {
        self.batch_end.clone()
    }

@ -334,7 +334,7 @@ impl EngineManager for EngineConnection {
    async fn default_planes(
        &self,
        id_generator: &mut IdGenerator,
-        source_range: crate::executor::SourceRange,
+        source_range: SourceRange,
    ) -> Result<DefaultPlanes, KclError> {
        {
            let opt = self.default_planes.read().await.as_ref().cloned();
@ -352,7 +352,7 @@ impl EngineManager for EngineConnection {
    async fn clear_scene_post_hook(
        &self,
        id_generator: &mut IdGenerator,
-        source_range: crate::executor::SourceRange,
+        source_range: SourceRange,
    ) -> Result<(), KclError> {
        // Remake the default planes, since they would have been removed after the scene was cleared.
        let new_planes = self.new_default_planes(id_generator, source_range).await?;
@ -364,9 +364,9 @@ impl EngineManager for EngineConnection {
    async fn inner_send_modeling_cmd(
        &self,
        id: uuid::Uuid,
-        source_range: crate::executor::SourceRange,
+        source_range: SourceRange,
        cmd: WebSocketRequest,
-        _id_to_source_range: std::collections::HashMap<uuid::Uuid, crate::executor::SourceRange>,
+        _id_to_source_range: std::collections::HashMap<uuid::Uuid, SourceRange>,
    ) -> Result<WebSocketResponse, KclError> {
        let (tx, rx) = oneshot::channel();

--- a/src/wasm-lib/kcl/src/engine/conn_mock.rs
+++ b/src/wasm-lib/kcl/src/engine/conn_mock.rs
@ -17,17 +17,17 @@ use kcmc::{
 };
 use kittycad_modeling_cmds::{self as kcmc};

+use super::ExecutionKind;
 use crate::{
    errors::KclError,
    executor::{DefaultPlanes, IdGenerator},
+    SourceRange,
 };

-use super::ExecutionKind;
-
 #[derive(Debug, Clone)]
 pub struct EngineConnection {
-    batch: Arc<Mutex<Vec<(WebSocketRequest, crate::executor::SourceRange)>>>,
-    batch_end: Arc<Mutex<IndexMap<uuid::Uuid, (WebSocketRequest, crate::executor::SourceRange)>>>,
+    batch: Arc<Mutex<Vec<(WebSocketRequest, SourceRange)>>>,
+    batch_end: Arc<Mutex<IndexMap<uuid::Uuid, (WebSocketRequest, SourceRange)>>>,
    execution_kind: Arc<Mutex<ExecutionKind>>,
 }

@ -43,11 +43,11 @@ impl EngineConnection {

 #[async_trait::async_trait]
 impl crate::engine::EngineManager for EngineConnection {
-    fn batch(&self) -> Arc<Mutex<Vec<(WebSocketRequest, crate::executor::SourceRange)>>> {
+    fn batch(&self) -> Arc<Mutex<Vec<(WebSocketRequest, SourceRange)>>> {
        self.batch.clone()
    }

-    fn batch_end(&self) -> Arc<Mutex<IndexMap<uuid::Uuid, (WebSocketRequest, crate::executor::SourceRange)>>> {
+    fn batch_end(&self) -> Arc<Mutex<IndexMap<uuid::Uuid, (WebSocketRequest, SourceRange)>>> {
        self.batch_end.clone()
    }

@ -66,7 +66,7 @@ impl crate::engine::EngineManager for EngineConnection {
    async fn default_planes(
        &self,
        _id_generator: &mut IdGenerator,
-        _source_range: crate::executor::SourceRange,
+        _source_range: SourceRange,
    ) -> Result<DefaultPlanes, KclError> {
        Ok(DefaultPlanes::default())
    }
@ -74,7 +74,7 @@ impl crate::engine::EngineManager for EngineConnection {
    async fn clear_scene_post_hook(
        &self,
        _id_generator: &mut IdGenerator,
-        _source_range: crate::executor::SourceRange,
+        _source_range: SourceRange,
    ) -> Result<(), KclError> {
        Ok(())
    }
@ -82,9 +82,9 @@ impl crate::engine::EngineManager for EngineConnection {
    async fn inner_send_modeling_cmd(
        &self,
        id: uuid::Uuid,
-        _source_range: crate::executor::SourceRange,
+        _source_range: SourceRange,
        cmd: WebSocketRequest,
-        _id_to_source_range: std::collections::HashMap<uuid::Uuid, crate::executor::SourceRange>,
+        _id_to_source_range: std::collections::HashMap<uuid::Uuid, SourceRange>,
    ) -> Result<WebSocketResponse, KclError> {
        match cmd {
            WebSocketRequest::ModelingCmdBatchReq(ModelingBatch {
--- a/src/wasm-lib/kcl/src/engine/conn_wasm.rs
+++ b/src/wasm-lib/kcl/src/engine/conn_wasm.rs
@ -12,6 +12,7 @@ use crate::{
    engine::ExecutionKind,
    errors::{KclError, KclErrorDetails},
    executor::{DefaultPlanes, IdGenerator},
+    SourceRange,
 };

 #[wasm_bindgen(module = "/../../lang/std/engineConnection.ts")]
@ -41,8 +42,8 @@ extern "C" {
 #[derive(Debug, Clone)]
 pub struct EngineConnection {
    manager: Arc<EngineCommandManager>,
-    batch: Arc<Mutex<Vec<(WebSocketRequest, crate::executor::SourceRange)>>>,
-    batch_end: Arc<Mutex<IndexMap<uuid::Uuid, (WebSocketRequest, crate::executor::SourceRange)>>>,
+    batch: Arc<Mutex<Vec<(WebSocketRequest, SourceRange)>>>,
+    batch_end: Arc<Mutex<IndexMap<uuid::Uuid, (WebSocketRequest, SourceRange)>>>,
    execution_kind: Arc<Mutex<ExecutionKind>>,
 }

@ -63,11 +64,11 @@ impl EngineConnection {

 #[async_trait::async_trait]
 impl crate::engine::EngineManager for EngineConnection {
-    fn batch(&self) -> Arc<Mutex<Vec<(WebSocketRequest, crate::executor::SourceRange)>>> {
+    fn batch(&self) -> Arc<Mutex<Vec<(WebSocketRequest, SourceRange)>>> {
        self.batch.clone()
    }

-    fn batch_end(&self) -> Arc<Mutex<IndexMap<uuid::Uuid, (WebSocketRequest, crate::executor::SourceRange)>>> {
+    fn batch_end(&self) -> Arc<Mutex<IndexMap<uuid::Uuid, (WebSocketRequest, SourceRange)>>> {
        self.batch_end.clone()
    }

@ -86,7 +87,7 @@ impl crate::engine::EngineManager for EngineConnection {
    async fn default_planes(
        &self,
        _id_generator: &mut IdGenerator,
-        source_range: crate::executor::SourceRange,
+        source_range: SourceRange,
    ) -> Result<DefaultPlanes, KclError> {
        // Get the default planes.
        let promise = self.manager.get_default_planes().map_err(|e| {
@ -128,7 +129,7 @@ impl crate::engine::EngineManager for EngineConnection {
    async fn clear_scene_post_hook(
        &self,
        _id_generator: &mut IdGenerator,
-        source_range: crate::executor::SourceRange,
+        source_range: SourceRange,
    ) -> Result<(), KclError> {
        self.manager.clear_default_planes().map_err(|e| {
            KclError::Engine(KclErrorDetails {
@ -158,9 +159,9 @@ impl crate::engine::EngineManager for EngineConnection {
    async fn inner_send_modeling_cmd(
        &self,
        id: uuid::Uuid,
-        source_range: crate::executor::SourceRange,
+        source_range: SourceRange,
        cmd: WebSocketRequest,
-        id_to_source_range: std::collections::HashMap<uuid::Uuid, crate::executor::SourceRange>,
+        id_to_source_range: std::collections::HashMap<uuid::Uuid, SourceRange>,
    ) -> Result<WebSocketResponse, KclError> {
        let source_range_str = serde_json::to_string(&source_range).map_err(|e| {
            KclError::Engine(KclErrorDetails {
--- a/src/wasm-lib/kcl/src/engine/mod.rs
+++ b/src/wasm-lib/kcl/src/engine/mod.rs
@ -33,6 +33,7 @@ use uuid::Uuid;
 use crate::{
    errors::{KclError, KclErrorDetails},
    executor::{DefaultPlanes, IdGenerator, Point3d},
+    SourceRange,
 };

 lazy_static::lazy_static! {
@ -61,10 +62,10 @@ impl ExecutionKind {
 #[async_trait::async_trait]
 pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
    /// Get the batch of commands to be sent to the engine.
-    fn batch(&self) -> Arc<Mutex<Vec<(WebSocketRequest, crate::executor::SourceRange)>>>;
+    fn batch(&self) -> Arc<Mutex<Vec<(WebSocketRequest, SourceRange)>>>;

    /// Get the batch of end commands to be sent to the engine.
-    fn batch_end(&self) -> Arc<Mutex<IndexMap<uuid::Uuid, (WebSocketRequest, crate::executor::SourceRange)>>>;
+    fn batch_end(&self) -> Arc<Mutex<IndexMap<uuid::Uuid, (WebSocketRequest, SourceRange)>>>;

    /// Get the current execution kind.
    fn execution_kind(&self) -> ExecutionKind;
@ -77,7 +78,7 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
    async fn default_planes(
        &self,
        id_generator: &mut IdGenerator,
-        _source_range: crate::executor::SourceRange,
+        _source_range: SourceRange,
    ) -> Result<DefaultPlanes, crate::errors::KclError>;

    /// Helpers to be called after clearing a scene.
@ -85,22 +86,22 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
    async fn clear_scene_post_hook(
        &self,
        id_generator: &mut IdGenerator,
-        source_range: crate::executor::SourceRange,
+        source_range: SourceRange,
    ) -> Result<(), crate::errors::KclError>;

    /// Send a modeling command and wait for the response message.
    async fn inner_send_modeling_cmd(
        &self,
        id: uuid::Uuid,
-        source_range: crate::executor::SourceRange,
+        source_range: SourceRange,
        cmd: WebSocketRequest,
-        id_to_source_range: HashMap<uuid::Uuid, crate::executor::SourceRange>,
+        id_to_source_range: HashMap<uuid::Uuid, SourceRange>,
    ) -> Result<kcmc::websocket::WebSocketResponse, crate::errors::KclError>;

    async fn clear_scene(
        &self,
        id_generator: &mut IdGenerator,
-        source_range: crate::executor::SourceRange,
+        source_range: SourceRange,
    ) -> Result<(), crate::errors::KclError> {
        self.batch_modeling_cmd(
            uuid::Uuid::new_v4(),
@ -123,7 +124,7 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
    async fn batch_modeling_cmd(
        &self,
        id: uuid::Uuid,
-        source_range: crate::executor::SourceRange,
+        source_range: SourceRange,
        cmd: &ModelingCmd,
    ) -> Result<(), crate::errors::KclError> {
        let execution_kind = self.execution_kind();
@ -147,7 +148,7 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
    async fn batch_end_cmd(
        &self,
        id: uuid::Uuid,
-        source_range: crate::executor::SourceRange,
+        source_range: SourceRange,
        cmd: &ModelingCmd,
    ) -> Result<(), crate::errors::KclError> {
        let req = WebSocketRequest::ModelingCmdReq(ModelingCmdReq {
@ -166,7 +167,7 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
    async fn send_modeling_cmd(
        &self,
        id: uuid::Uuid,
-        source_range: crate::executor::SourceRange,
+        source_range: SourceRange,
        cmd: ModelingCmd,
    ) -> Result<OkWebSocketResponseData, crate::errors::KclError> {
        self.batch_modeling_cmd(id, source_range, &cmd).await?;
@ -181,7 +182,7 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
        // Whether or not to flush the end commands as well.
        // We only do this at the very end of the file.
        batch_end: bool,
-        source_range: crate::executor::SourceRange,
+        source_range: SourceRange,
    ) -> Result<OkWebSocketResponseData, crate::errors::KclError> {
        let all_requests = if batch_end {
            let mut requests = self.batch().lock().unwrap().clone();
@ -303,7 +304,7 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
        x_axis: Point3d,
        y_axis: Point3d,
        color: Option<Color>,
-        source_range: crate::executor::SourceRange,
+        source_range: SourceRange,
    ) -> Result<uuid::Uuid, KclError> {
        // Create new default planes.
        let default_size = 100.0;
@ -339,7 +340,7 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
    async fn new_default_planes(
        &self,
        id_generator: &mut IdGenerator,
-        source_range: crate::executor::SourceRange,
+        source_range: SourceRange,
    ) -> Result<DefaultPlanes, KclError> {
        let plane_settings: HashMap<PlaneName, (Uuid, Point3d, Point3d, Option<Color>)> = HashMap::from([
            (
@ -450,7 +451,7 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
    fn parse_websocket_response(
        &self,
        response: WebSocketResponse,
-        source_range: crate::executor::SourceRange,
+        source_range: SourceRange,
    ) -> Result<OkWebSocketResponseData, crate::errors::KclError> {
        match response {
            WebSocketResponse::Success(success) => Ok(success.resp),
@ -469,7 +470,7 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
        // The last response we are looking for.
        id: uuid::Uuid,
        // The mapping of source ranges to command IDs.
-        id_to_source_range: HashMap<uuid::Uuid, crate::executor::SourceRange>,
+        id_to_source_range: HashMap<uuid::Uuid, SourceRange>,
        // The response from the engine.
        responses: HashMap<uuid::Uuid, BatchResponse>,
    ) -> Result<OkWebSocketResponseData, crate::errors::KclError> {
--- a/src/wasm-lib/kcl/src/errors.rs
+++ b/src/wasm-lib/kcl/src/errors.rs
@ -2,7 +2,10 @@ use serde::{Deserialize, Serialize};
 use thiserror::Error;
 use tower_lsp::lsp_types::{Diagnostic, DiagnosticSeverity};

-use crate::{ast::types::ModuleId, executor::SourceRange, lsp::IntoDiagnostic};
+use crate::{
+    lsp::IntoDiagnostic,
+    source_range::{ModuleId, SourceRange},
+};

 /// How did the KCL execution fail
 #[derive(thiserror::Error, Debug)]
--- a/src/wasm-lib/kcl/src/executor.rs
+++ b/src/wasm-lib/kcl/src/executor.rs
@ -19,20 +19,20 @@ use kittycad_modeling_cmds::length_unit::LengthUnit;
 use parse_display::{Display, FromStr};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use tower_lsp::lsp_types::{Position as LspPosition, Range as LspRange};

 type Point2D = kcmc::shared::Point2d<f64>;
 type Point3D = kcmc::shared::Point3d<f64>;

 pub use crate::kcl_value::KclValue;
 use crate::{
-    ast::types::{
-        BodyItem, Expr, FunctionExpression, ItemVisibility, KclNone, ModuleId, Node, NodeRef, TagDeclarator, TagNode,
-    },
    engine::{EngineManager, ExecutionKind},
    errors::{KclError, KclErrorDetails},
    fs::{FileManager, FileSystem},
+    parsing::ast::types::{
+        BodyItem, Expr, FunctionExpression, ItemVisibility, KclNone, Node, NodeRef, TagDeclarator, TagNode,
+    },
    settings::types::UnitLength,
+    source_range::{ModuleId, SourceRange},
    std::{args::Arg, StdLib},
    ExecError, Program,
 };
@ -735,7 +735,7 @@ pub type MemoryFunction =
    fn(
        s: Vec<Arg>,
        memory: ProgramMemory,
-        expression: crate::ast::types::BoxNode<FunctionExpression>,
+        expression: crate::parsing::ast::types::BoxNode<FunctionExpression>,
        metadata: Vec<Metadata>,
        exec_state: &ExecState,
        ctx: ExecutorContext,
@ -993,7 +993,6 @@ pub enum BodyType {
 /// Info about a module.  Right now, this is pretty minimal.  We hope to cache
 /// modules here in the future.
 #[derive(Debug, Default, Clone, PartialEq, Eq, Deserialize, Serialize, ts_rs::TS, JsonSchema)]
-#[cfg_attr(feature = "pyo3", pyo3::pyclass)]
 #[ts(export)]
 pub struct ModuleInfo {
    /// The ID of the module.
@ -1002,101 +1001,6 @@ pub struct ModuleInfo {
    path: std::path::PathBuf,
 }

-#[derive(Debug, Default, Deserialize, Serialize, PartialEq, Copy, Clone, ts_rs::TS, JsonSchema, Hash, Eq)]
-#[cfg_attr(feature = "pyo3", pyo3::pyclass)]
-#[ts(export)]
-pub struct SourceRange(#[ts(type = "[number, number]")] pub [usize; 3]);
-
-impl From<[usize; 3]> for SourceRange {
-    fn from(value: [usize; 3]) -> Self {
-        Self(value)
-    }
-}
-
-impl From<&SourceRange> for miette::SourceSpan {
-    fn from(source_range: &SourceRange) -> Self {
-        let length = source_range.end() - source_range.start();
-        let start = miette::SourceOffset::from(source_range.start());
-        Self::new(start, length)
-    }
-}
-
-impl From<SourceRange> for miette::SourceSpan {
-    fn from(source_range: SourceRange) -> Self {
-        Self::from(&source_range)
-    }
-}
-
-impl SourceRange {
-    /// Create a new source range.
-    pub fn new(start: usize, end: usize, module_id: ModuleId) -> Self {
-        Self([start, end, module_id.as_usize()])
-    }
-
-    /// A source range that doesn't correspond to any source code.
-    pub fn synthetic() -> Self {
-        Self::default()
-    }
-
-    /// Get the start of the range.
-    pub fn start(&self) -> usize {
-        self.0[0]
-    }
-
-    /// Get the end of the range.
-    pub fn end(&self) -> usize {
-        self.0[1]
-    }
-
-    /// Get the module ID of the range.
-    pub fn module_id(&self) -> ModuleId {
-        ModuleId::from_usize(self.0[2])
-    }
-
-    /// Check if the range contains a position.
-    pub fn contains(&self, pos: usize) -> bool {
-        pos >= self.start() && pos <= self.end()
-    }
-
-    pub fn start_to_lsp_position(&self, code: &str) -> LspPosition {
-        // Calculate the line and column of the error from the source range.
-        // Lines are zero indexed in vscode so we need to subtract 1.
-        let mut line = code.get(..self.start()).unwrap_or_default().lines().count();
-        if line > 0 {
-            line = line.saturating_sub(1);
-        }
-        let column = code[..self.start()].lines().last().map(|l| l.len()).unwrap_or_default();
-
-        LspPosition {
-            line: line as u32,
-            character: column as u32,
-        }
-    }
-
-    pub fn end_to_lsp_position(&self, code: &str) -> LspPosition {
-        let lines = code.get(..self.end()).unwrap_or_default().lines();
-        if lines.clone().count() == 0 {
-            return LspPosition { line: 0, character: 0 };
-        }
-
-        // Calculate the line and column of the error from the source range.
-        // Lines are zero indexed in vscode so we need to subtract 1.
-        let line = lines.clone().count() - 1;
-        let column = lines.last().map(|l| l.len()).unwrap_or_default();
-
-        LspPosition {
-            line: line as u32,
-            character: column as u32,
-        }
-    }
-
-    pub fn to_lsp_range(&self, code: &str) -> LspRange {
-        let start = self.start_to_lsp_position(code);
-        let end = self.end_to_lsp_position(code);
-        LspRange { start, end }
-    }
-}
-
 #[derive(Debug, Deserialize, Serialize, PartialEq, Clone, Copy, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 pub struct Point2d {
@ -1940,7 +1844,7 @@ impl ExecutorContext {
    #[async_recursion]
    pub(crate) async fn inner_execute<'a>(
        &'a self,
-        program: NodeRef<'a, crate::ast::types::Program>,
+        program: NodeRef<'a, crate::parsing::ast::types::Program>,
        exec_state: &mut ExecState,
        body_type: BodyType,
    ) -> Result<Option<KclValue>, KclError> {
@ -1981,7 +1885,7 @@ impl ExecutorContext {
                    let module_id = exec_state.add_module(resolved_path.clone());
                    let source = self.fs.read_to_string(&resolved_path, source_range).await?;
                    // TODO handle parsing errors properly
-                    let program = crate::parser::parse_str(&source, module_id).parse_errs_as_err()?;
+                    let program = crate::parsing::parse_str(&source, module_id).parse_errs_as_err()?;
                    let (module_memory, module_exports) = {
                        exec_state.import_stack.push(resolved_path.clone());
                        let original_execution = self.engine.replace_execution_kind(ExecutionKind::Isolated);
@ -2109,7 +2013,7 @@ impl ExecutorContext {
                    // True here tells the engine to flush all the end commands as well like fillets
                    // and chamfers where the engine would otherwise eat the ID of the segments.
                    true,
-                    SourceRange([program.end, program.end, program.module_id.as_usize()]),
+                    SourceRange::new(program.end, program.end, program.module_id),
                )
                .await?;
        }
@ -2145,6 +2049,7 @@ impl ExecutorContext {
                }
            }
            Expr::CallExpression(call_expression) => call_expression.execute(exec_state, self).await?,
+            Expr::CallExpressionKw(call_expression) => call_expression.execute(exec_state, self).await?,
            Expr::PipeExpression(pipe_expression) => pipe_expression.get_result(exec_state, self).await?,
            Expr::PipeSubstitution(pipe_substitution) => match statement_kind {
                StatementKind::Declaration { name } => {
@ -2336,7 +2241,7 @@ mod tests {
    use pretty_assertions::assert_eq;

    use super::*;
-    use crate::ast::types::{Identifier, Node, Parameter};
+    use crate::parsing::ast::types::{Identifier, Node, Parameter};

    pub async fn parse_execute(code: &str) -> Result<ProgramMemory> {
        let program = Program::parse(code)?;
@ -2714,7 +2619,10 @@ const answer = returnX()"#;
            err,
            KclError::UndefinedValue(KclErrorDetails {
                message: "memory item key `x` is not defined".to_owned(),
-                source_ranges: vec![SourceRange([64, 65, 0]), SourceRange([97, 106, 0])],
+                source_ranges: vec![
+                    SourceRange::new(64, 65, ModuleId::default()),
+                    SourceRange::new(97, 106, ModuleId::default())
+                ],
            }),
        );
    }
@ -2749,7 +2657,7 @@ let shape = layer() |> patternTransform(10, transform, %)
            err,
            KclError::UndefinedValue(KclErrorDetails {
                message: "memory item key `x` is not defined".to_owned(),
-                source_ranges: vec![SourceRange([80, 81, 0])],
+                source_ranges: vec![SourceRange::new(80, 81, ModuleId::default())],
            }),
        );
    }
@ -2845,7 +2753,7 @@ let notNull = !myNull
            parse_execute(code1).await.unwrap_err().downcast::<KclError>().unwrap(),
            KclError::Semantic(KclErrorDetails {
                message: "Cannot apply unary operator ! to non-boolean value: number".to_owned(),
-                source_ranges: vec![SourceRange([56, 63, 0])],
+                source_ranges: vec![SourceRange::new(56, 63, ModuleId::default())],
            })
        );

@ -2854,7 +2762,7 @@ let notNull = !myNull
            parse_execute(code2).await.unwrap_err().downcast::<KclError>().unwrap(),
            KclError::Semantic(KclErrorDetails {
                message: "Cannot apply unary operator ! to non-boolean value: number".to_owned(),
-                source_ranges: vec![SourceRange([14, 16, 0])],
+                source_ranges: vec![SourceRange::new(14, 16, ModuleId::default())],
            })
        );

@ -2865,7 +2773,7 @@ let notEmptyString = !""
            parse_execute(code3).await.unwrap_err().downcast::<KclError>().unwrap(),
            KclError::Semantic(KclErrorDetails {
                message: "Cannot apply unary operator ! to non-boolean value: string (text)".to_owned(),
-                source_ranges: vec![SourceRange([22, 25, 0])],
+                source_ranges: vec![SourceRange::new(22, 25, ModuleId::default())],
            })
        );

@ -2877,7 +2785,7 @@ let notMember = !obj.a
            parse_execute(code4).await.unwrap_err().downcast::<KclError>().unwrap(),
            KclError::Semantic(KclErrorDetails {
                message: "Cannot apply unary operator ! to non-boolean value: number".to_owned(),
-                source_ranges: vec![SourceRange([36, 42, 0])],
+                source_ranges: vec![SourceRange::new(36, 42, ModuleId::default())],
            })
        );

@ -2888,7 +2796,7 @@ let notArray = !a";
            parse_execute(code5).await.unwrap_err().downcast::<KclError>().unwrap(),
            KclError::Semantic(KclErrorDetails {
                message: "Cannot apply unary operator ! to non-boolean value: array (list)".to_owned(),
-                source_ranges: vec![SourceRange([27, 29, 0])],
+                source_ranges: vec![SourceRange::new(27, 29, ModuleId::default())],
            })
        );

@ -2899,7 +2807,7 @@ let notObject = !x";
            parse_execute(code6).await.unwrap_err().downcast::<KclError>().unwrap(),
            KclError::Semantic(KclErrorDetails {
                message: "Cannot apply unary operator ! to non-boolean value: object".to_owned(),
-                source_ranges: vec![SourceRange([28, 30, 0])],
+                source_ranges: vec![SourceRange::new(28, 30, ModuleId::default())],
            })
        );

@ -2952,7 +2860,7 @@ let notTagIdentifier = !myTag";
            parse_execute(code10).await.unwrap_err().downcast::<KclError>().unwrap(),
            KclError::Syntax(KclErrorDetails {
                message: "Unexpected token: !".to_owned(),
-                source_ranges: vec![SourceRange([14, 15, 0])],
+                source_ranges: vec![SourceRange::new(14, 15, ModuleId::default())],
            })
        );

@ -2965,7 +2873,7 @@ let notPipeSub = 1 |> identity(!%))";
            parse_execute(code11).await.unwrap_err().downcast::<KclError>().unwrap(),
            KclError::Syntax(KclErrorDetails {
                message: "Unexpected token: |>".to_owned(),
-                source_ranges: vec![SourceRange([54, 56, 0])],
+                source_ranges: vec![SourceRange::new(54, 56, ModuleId::default())],
            })
        );

@ -3009,10 +2917,10 @@ test([0, 0])
 "#;
        let result = parse_execute(ast).await;
        assert!(result.is_err());
-        assert_eq!(
-            result.unwrap_err().to_string(),
-            r#"undefined value: KclErrorDetails { source_ranges: [SourceRange([10, 34, 0])], message: "Result of user-defined function test is undefined" }"#.to_owned()
-        );
+        assert!(result
+            .unwrap_err()
+            .to_string()
+            .contains("Result of user-defined function test is undefined"),);
    }

    #[tokio::test(flavor = "multi_thread")]
@ -3128,7 +3036,7 @@ let w = f() + f()
                vec![req_param("x")],
                vec![],
                Err(KclError::Semantic(KclErrorDetails {
-                    source_ranges: vec![SourceRange([0, 0, 0])],
+                    source_ranges: vec![SourceRange::default()],
                    message: "Expected 1 arguments, got 0".to_owned(),
                })),
            ),
@ -3146,7 +3054,7 @@ let w = f() + f()
                vec![req_param("x"), opt_param("y")],
                vec![],
                Err(KclError::Semantic(KclErrorDetails {
-                    source_ranges: vec![SourceRange([0, 0, 0])],
+                    source_ranges: vec![SourceRange::default()],
                    message: "Expected 1-2 arguments, got 0".to_owned(),
                })),
            ),
@ -3173,7 +3081,7 @@ let w = f() + f()
                vec![req_param("x"), opt_param("y")],
                vec![mem(1), mem(2), mem(3)],
                Err(KclError::Semantic(KclErrorDetails {
-                    source_ranges: vec![SourceRange([0, 0, 0])],
+                    source_ranges: vec![SourceRange::default()],
                    message: "Expected 1-2 arguments, got 3".to_owned(),
                })),
            ),
@ -3182,7 +3090,7 @@ let w = f() + f()
            let func_expr = &Node::no_src(FunctionExpression {
                params,
                body: Node {
-                    inner: crate::ast::types::Program {
+                    inner: crate::parsing::ast::types::Program {
                        body: Vec::new(),
                        non_code_meta: Default::default(),
                        shebang: None,
--- a/src/wasm-lib/kcl/src/fs/local.rs
+++ b/src/wasm-lib/kcl/src/fs/local.rs
@ -5,6 +5,7 @@ use anyhow::Result;
 use crate::{
    errors::{KclError, KclErrorDetails},
    fs::FileSystem,
+    SourceRange,
 };

 #[derive(Debug, Clone)]
@ -27,7 +28,7 @@ impl FileSystem for FileManager {
    async fn read<P: AsRef<std::path::Path> + std::marker::Send + std::marker::Sync>(
        &self,
        path: P,
-        source_range: crate::executor::SourceRange,
+        source_range: SourceRange,
    ) -> Result<Vec<u8>, KclError> {
        tokio::fs::read(&path).await.map_err(|e| {
            KclError::Engine(KclErrorDetails {
@ -40,7 +41,7 @@ impl FileSystem for FileManager {
    async fn read_to_string<P: AsRef<std::path::Path> + std::marker::Send + std::marker::Sync>(
        &self,
        path: P,
-        source_range: crate::executor::SourceRange,
+        source_range: SourceRange,
    ) -> Result<String, KclError> {
        tokio::fs::read_to_string(&path).await.map_err(|e| {
            KclError::Engine(KclErrorDetails {
@ -53,7 +54,7 @@ impl FileSystem for FileManager {
    async fn exists<P: AsRef<std::path::Path> + std::marker::Send + std::marker::Sync>(
        &self,
        path: P,
-        source_range: crate::executor::SourceRange,
+        source_range: SourceRange,
    ) -> Result<bool, crate::errors::KclError> {
        tokio::fs::metadata(&path).await.map(|_| true).or_else(|e| {
            if e.kind() == std::io::ErrorKind::NotFound {
@ -70,7 +71,7 @@ impl FileSystem for FileManager {
    async fn get_all_files<P: AsRef<std::path::Path> + std::marker::Send + std::marker::Sync>(
        &self,
        path: P,
-        source_range: crate::executor::SourceRange,
+        source_range: SourceRange,
    ) -> Result<Vec<std::path::PathBuf>, crate::errors::KclError> {
        let mut files = vec![];
        let mut stack = vec![path.as_ref().to_path_buf()];
--- a/src/wasm-lib/kcl/src/fs/mod.rs
+++ b/src/wasm-lib/kcl/src/fs/mod.rs
@ -1,5 +1,9 @@
 //! Functions for interacting with files on a machine.

+use anyhow::Result;
+
+use crate::SourceRange;
+
 #[cfg(not(target_arch = "wasm32"))]
 pub mod local;
 #[cfg(not(target_arch = "wasm32"))]
@ -9,7 +13,6 @@ pub use local::FileManager;
 #[cfg(not(test))]
 pub mod wasm;

-use anyhow::Result;
 #[cfg(target_arch = "wasm32")]
 #[cfg(not(test))]
 pub use wasm::FileManager;
@ -20,27 +23,27 @@ pub trait FileSystem: Clone {
    async fn read<P: AsRef<std::path::Path> + std::marker::Send + std::marker::Sync>(
        &self,
        path: P,
-        source_range: crate::executor::SourceRange,
+        source_range: SourceRange,
    ) -> Result<Vec<u8>, crate::errors::KclError>;

    /// Read a file from the local file system.
    async fn read_to_string<P: AsRef<std::path::Path> + std::marker::Send + std::marker::Sync>(
        &self,
        path: P,
-        source_range: crate::executor::SourceRange,
+        source_range: SourceRange,
    ) -> Result<String, crate::errors::KclError>;

    /// Check if a file exists on the local file system.
    async fn exists<P: AsRef<std::path::Path> + std::marker::Send + std::marker::Sync>(
        &self,
        path: P,
-        source_range: crate::executor::SourceRange,
+        source_range: SourceRange,
    ) -> Result<bool, crate::errors::KclError>;

    /// Get all the files in a directory recursively.
    async fn get_all_files<P: AsRef<std::path::Path> + std::marker::Send + std::marker::Sync>(
        &self,
        path: P,
-        source_range: crate::executor::SourceRange,
+        source_range: SourceRange,
    ) -> Result<Vec<std::path::PathBuf>, crate::errors::KclError>;
 }
--- a/src/wasm-lib/kcl/src/fs/wasm.rs
+++ b/src/wasm-lib/kcl/src/fs/wasm.rs
@ -7,6 +7,7 @@ use crate::{
    errors::{KclError, KclErrorDetails},
    fs::FileSystem,
    wasm::JsFuture,
+    SourceRange,
 };

 #[wasm_bindgen(module = "/../../lang/std/fileSystemManager.ts")]
@ -43,7 +44,7 @@ impl FileSystem for FileManager {
    async fn read<P: AsRef<std::path::Path> + std::marker::Send + std::marker::Sync>(
        &self,
        path: P,
-        source_range: crate::executor::SourceRange,
+        source_range: SourceRange,
    ) -> Result<Vec<u8>, KclError> {
        let promise = self
            .manager
@ -81,7 +82,7 @@ impl FileSystem for FileManager {
    async fn read_to_string<P: AsRef<std::path::Path> + std::marker::Send + std::marker::Sync>(
        &self,
        path: P,
-        source_range: crate::executor::SourceRange,
+        source_range: SourceRange,
    ) -> Result<String, KclError> {
        let bytes = self.read(path, source_range).await?;
        let string = String::from_utf8(bytes).map_err(|e| {
@ -97,7 +98,7 @@ impl FileSystem for FileManager {
    async fn exists<P: AsRef<std::path::Path> + std::marker::Send + std::marker::Sync>(
        &self,
        path: P,
-        source_range: crate::executor::SourceRange,
+        source_range: SourceRange,
    ) -> Result<bool, crate::errors::KclError> {
        let promise = self
            .manager
@ -139,7 +140,7 @@ impl FileSystem for FileManager {
    async fn get_all_files<P: AsRef<std::path::Path> + std::marker::Send + std::marker::Sync>(
        &self,
        path: P,
-        source_range: crate::executor::SourceRange,
+        source_range: SourceRange,
    ) -> Result<Vec<std::path::PathBuf>, crate::errors::KclError> {
        let promise = self
            .manager
--- a/src/wasm-lib/kcl/src/function_param.rs
+++ b/src/wasm-lib/kcl/src/function_param.rs
@ -1,11 +1,11 @@
 use schemars::JsonSchema;

 use crate::{
-    ast::types::FunctionExpression,
    errors::KclError,
    executor::{
        call_user_defined_function, ExecState, ExecutorContext, KclValue, MemoryFunction, Metadata, ProgramMemory,
    },
+    parsing::ast::types::FunctionExpression,
    std::args::Arg,
 };

@ -14,7 +14,7 @@ use crate::{
 pub struct FunctionParam<'a> {
    pub inner: Option<&'a MemoryFunction>,
    pub memory: ProgramMemory,
-    pub fn_expr: crate::ast::types::BoxNode<FunctionExpression>,
+    pub fn_expr: crate::parsing::ast::types::BoxNode<FunctionExpression>,
    pub meta: Vec<Metadata>,
    pub ctx: ExecutorContext,
 }
--- a/src/wasm-lib/kcl/src/kcl_value.rs
+++ b/src/wasm-lib/kcl/src/kcl_value.rs
@ -5,10 +5,10 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};

 use crate::{
-    ast::types::{FunctionExpression, KclNone, TagDeclarator, TagNode},
    errors::KclErrorDetails,
    exec::{ProgramMemory, Sketch},
    executor::{Face, ImportedGeometry, MemoryFunction, Metadata, Plane, SketchSet, Solid, SolidSet, TagIdentifier},
+    parsing::ast::types::{FunctionExpression, KclNone, TagDeclarator, TagNode},
    std::{args::Arg, FnAsArg},
    ExecState, ExecutorContext, KclError, SourceRange,
 };
@ -56,7 +56,7 @@ pub enum KclValue {
        meta: Vec<Metadata>,
    },
    TagIdentifier(Box<TagIdentifier>),
-    TagDeclarator(crate::ast::types::BoxNode<TagDeclarator>),
+    TagDeclarator(crate::parsing::ast::types::BoxNode<TagDeclarator>),
    Plane(Box<Plane>),
    Face(Box<Face>),
    Sketch {
@ -74,7 +74,8 @@ pub enum KclValue {
    Function {
        #[serde(skip)]
        func: Option<MemoryFunction>,
-        expression: crate::ast::types::BoxNode<FunctionExpression>,
+        #[schemars(skip)]
+        expression: crate::parsing::ast::types::BoxNode<FunctionExpression>,
        memory: Box<ProgramMemory>,
        #[serde(rename = "__meta")]
        meta: Vec<Metadata>,
@ -122,7 +123,7 @@ impl From<Vec<Box<Solid>>> for KclValue {
 impl From<KclValue> for Vec<SourceRange> {
    fn from(item: KclValue) -> Self {
        match item {
-            KclValue::TagDeclarator(t) => vec![SourceRange([t.start, t.end, t.module_id.0 as usize])],
+            KclValue::TagDeclarator(t) => vec![SourceRange::new(t.start, t.end, t.module_id)],
            KclValue::TagIdentifier(t) => to_vec_sr(&t.meta),
            KclValue::Solid(e) => to_vec_sr(&e.meta),
            KclValue::Solids { value } => value.iter().flat_map(|eg| to_vec_sr(&eg.meta)).collect(),
@ -151,7 +152,7 @@ fn to_vec_sr(meta: &[Metadata]) -> Vec<SourceRange> {
 impl From<&KclValue> for Vec<SourceRange> {
    fn from(item: &KclValue) -> Self {
        match item {
-            KclValue::TagDeclarator(t) => vec![SourceRange([t.start, t.end, t.module_id.0 as usize])],
+            KclValue::TagDeclarator(t) => vec![SourceRange::new(t.start, t.end, t.module_id)],
            KclValue::TagIdentifier(t) => to_vec_sr(&t.meta),
            KclValue::Solid(e) => to_vec_sr(&e.meta),
            KclValue::Solids { value } => value.iter().flat_map(|eg| to_vec_sr(&eg.meta)).collect(),
--- a/src/wasm-lib/kcl/src/lib.rs
+++ b/src/wasm-lib/kcl/src/lib.rs
@ -56,7 +56,6 @@ macro_rules! eprint {
 #[global_allocator]
 static ALLOC: dhat::Alloc = dhat::Alloc;

-mod ast;
 mod coredump;
 mod docs;
 mod engine;
@ -68,30 +67,31 @@ mod kcl_value;
 pub mod lint;
 mod log;
 mod lsp;
-mod parser;
+mod parsing;
 mod settings;
 #[cfg(test)]
 mod simulation_tests;
+mod source_range;
 mod std;
 #[cfg(not(target_arch = "wasm32"))]
 pub mod test_server;
 mod thread;
-mod token;
 mod unparser;
 mod walk;
 #[cfg(target_arch = "wasm32")]
 mod wasm;

-pub use ast::modify::modify_ast_for_sketch;
-pub use ast::types::{FormatOptions, ModuleId};
 pub use coredump::CoreDump;
 pub use engine::{EngineManager, ExecutionKind};
 pub use errors::{ConnectionError, ExecError, KclError};
-pub use executor::{ExecState, ExecutorContext, ExecutorSettings, SourceRange};
-pub use lsp::copilot::Backend as CopilotLspBackend;
-pub use lsp::kcl::Backend as KclLspBackend;
-pub use lsp::kcl::Server as KclLspServerSubCommand;
+pub use executor::{ExecState, ExecutorContext, ExecutorSettings};
+pub use lsp::{
+    copilot::Backend as CopilotLspBackend,
+    kcl::{Backend as KclLspBackend, Server as KclLspServerSubCommand},
+};
+pub use parsing::ast::{modify::modify_ast_for_sketch, types::FormatOptions};
 pub use settings::types::{project::ProjectConfiguration, Configuration, UnitLength};
+pub use source_range::{ModuleId, SourceRange};

 // Rather than make executor public and make lots of it pub(crate), just re-export into a new module.
 // Ideally we wouldn't export these things at all, they should only be used for testing.
@ -101,9 +101,11 @@ pub mod exec {

 #[cfg(target_arch = "wasm32")]
 pub mod wasm_engine {
-    pub use crate::coredump::wasm::{CoreDumpManager, CoreDumper};
-    pub use crate::engine::conn_wasm::{EngineCommandManager, EngineConnection};
-    pub use crate::fs::wasm::FileSystemManager;
+    pub use crate::{
+        coredump::wasm::{CoreDumpManager, CoreDumper},
+        engine::conn_wasm::{EngineCommandManager, EngineConnection},
+        fs::wasm::FileSystemManager,
+    };
 }

 #[cfg(not(target_arch = "wasm32"))]
@ -115,14 +117,15 @@ pub mod std_utils {
    pub use crate::std::utils::{get_tangential_arc_to_info, is_points_ccw_wasm, TangentialArcInfoInput};
 }

+use serde::{Deserialize, Serialize};
+
 #[allow(unused_imports)]
 use crate::log::{log, logln};
-use serde::{Deserialize, Serialize};

 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct Program {
    #[serde(flatten)]
-    ast: ast::types::Node<ast::types::Program>,
+    ast: parsing::ast::types::Node<parsing::ast::types::Program>,
 }

 #[cfg(any(test, feature = "lsp-test-util"))]
@ -133,14 +136,14 @@ pub use lsp::test_util::kcl_lsp_server;
 impl Program {
    pub fn parse(input: &str) -> Result<Program, KclError> {
        let module_id = ModuleId::default();
-        let tokens = token::lexer(input, module_id)?;
+        let tokens = parsing::token::lexer(input, module_id)?;
        // TODO handle parsing errors properly
-        let ast = parser::parse_tokens(tokens).parse_errs_as_err()?;
+        let ast = parsing::parse_tokens(tokens).parse_errs_as_err()?;

        Ok(Program { ast })
    }

-    pub fn compute_digest(&mut self) -> ast::types::digest::Digest {
+    pub fn compute_digest(&mut self) -> parsing::ast::digest::Digest {
        self.ast.compute_digest()
    }

@ -162,8 +165,8 @@ impl Program {
    }
 }

-impl From<ast::types::Node<ast::types::Program>> for Program {
-    fn from(ast: ast::types::Node<ast::types::Program>) -> Program {
+impl From<parsing::ast::types::Node<parsing::ast::types::Program>> for Program {
+    fn from(ast: parsing::ast::types::Node<parsing::ast::types::Program>) -> Program {
        Self { ast }
    }
 }
--- a/src/wasm-lib/kcl/src/lint/checks/camel_case.rs
+++ b/src/wasm-lib/kcl/src/lint/checks/camel_case.rs
@ -2,10 +2,10 @@ use anyhow::Result;
 use convert_case::Casing;

 use crate::{
-    ast::types::{ObjectProperty, VariableDeclarator},
-    executor::SourceRange,
    lint::rule::{def_finding, Discovered, Finding},
+    parsing::ast::types::{ObjectProperty, VariableDeclarator},
    walk::Node,
+    SourceRange,
 };

 def_finding!(
--- a/src/wasm-lib/kcl/src/lint/checks/offset_plane.rs
+++ b/src/wasm-lib/kcl/src/lint/checks/offset_plane.rs
@ -1,12 +1,14 @@
-use crate::{
-    ast::types::{BinaryPart, Expr, LiteralValue, ObjectExpression, UnaryOperator},
-    executor::SourceRange,
-    lint::rule::{def_finding, Discovered, Finding},
-    walk::Node,
-};
-use anyhow::Result;
 use std::collections::HashMap;

+use anyhow::Result;
+
+use crate::{
+    lint::rule::{def_finding, Discovered, Finding},
+    parsing::ast::types::{BinaryPart, Expr, LiteralValue, ObjectExpression, UnaryOperator},
+    walk::Node,
+    SourceRange,
+};
+
 def_finding!(
    Z0003,
    "offsetPlane should be used to define a new plane offset from the origin",
--- a/src/wasm-lib/kcl/src/lint/checks/std_lib_args.rs
+++ b/src/wasm-lib/kcl/src/lint/checks/std_lib_args.rs
@ -3,12 +3,12 @@ use std::sync::Arc;
 use anyhow::Result;

 use crate::{
-    ast::types::{CallExpression, NodeRef},
    docs::StdLibFn,
-    executor::SourceRange,
    lint::rule::{def_finding, Discovered, Finding},
+    parsing::ast::types::{CallExpression, NodeRef},
    std::{FunctionKind, StdLib},
    walk::Node,
+    SourceRange,
 };

 def_finding!(
--- a/src/wasm-lib/kcl/src/lint/rule.rs
+++ b/src/wasm-lib/kcl/src/lint/rule.rs
@ -3,7 +3,7 @@ use schemars::JsonSchema;
 use serde::Serialize;
 use tower_lsp::lsp_types::{Diagnostic, DiagnosticSeverity};

-use crate::{executor::SourceRange, lsp::IntoDiagnostic, walk::Node};
+use crate::{lsp::IntoDiagnostic, walk::Node, SourceRange};

 /// Check the provided AST for any found rule violations.
 ///
@ -56,8 +56,8 @@ impl Discovered {
    }

    #[getter]
-    pub fn pos(&self) -> SourceRange {
-        self.pos
+    pub fn pos(&self) -> (usize, usize) {
+        (self.pos.start(), self.pos.end())
    }

    #[getter]
@ -182,7 +182,7 @@ mod test {

    macro_rules! assert_no_finding {
        ( $check:expr, $finding:expr, $kcl:expr ) => {
-            let prog = $crate::parser::top_level_parse($kcl).unwrap();
+            let prog = $crate::parsing::top_level_parse($kcl).unwrap();
            for discovered_finding in prog.lint($check).unwrap() {
                if discovered_finding.finding == $finding {
                    assert!(false, "Finding {:?} was emitted", $finding.code);
@ -193,7 +193,7 @@ mod test {

    macro_rules! assert_finding {
        ( $check:expr, $finding:expr, $kcl:expr ) => {
-            let prog = $crate::parser::top_level_parse($kcl).unwrap();
+            let prog = $crate::parsing::top_level_parse($kcl).unwrap();

            for discovered_finding in prog.lint($check).unwrap() {
                if discovered_finding.finding == $finding {
--- a/src/wasm-lib/kcl/src/log.rs
+++ b/src/wasm-lib/kcl/src/log.rs
@ -1,7 +1,8 @@
 #![allow(dead_code)]
+use std::env;
+
 #[cfg(feature = "dhat-heap")]
 use dhat::{HeapStats, Profiler};
-use std::env;
 use web_time::Instant;

 const LOG_ENV_VAR: &str = "ZOO_LOG";
--- a/src/wasm-lib/kcl/src/lsp/copilot/mod.rs
+++ b/src/wasm-lib/kcl/src/lsp/copilot/mod.rs
@ -27,10 +27,12 @@ use tower_lsp::{

 use crate::lsp::{
    backend::Backend as _,
-    copilot::cache::CopilotCache,
-    copilot::types::{
-        CopilotAcceptCompletionParams, CopilotCompletionResponse, CopilotCompletionTelemetry, CopilotEditorInfo,
-        CopilotLspCompletionParams, CopilotRejectCompletionParams, DocParams,
+    copilot::{
+        cache::CopilotCache,
+        types::{
+            CopilotAcceptCompletionParams, CopilotCompletionResponse, CopilotCompletionTelemetry, CopilotEditorInfo,
+            CopilotLspCompletionParams, CopilotRejectCompletionParams, DocParams,
+        },
    },
 };

--- a/src/wasm-lib/kcl/src/lsp/kcl/custom_notifications.rs
+++ b/src/wasm-lib/kcl/src/lsp/kcl/custom_notifications.rs
@ -3,14 +3,14 @@
 use serde::{Deserialize, Serialize};
 use tower_lsp::lsp_types::notification::Notification;

-use crate::{ast::types::Node, settings::types::UnitLength};
+use crate::{parsing::ast::types::Node, settings::types::UnitLength};

 /// A notification that the AST has changed.
 #[derive(Debug)]
 pub enum AstUpdated {}

 impl Notification for AstUpdated {
-    type Params = Node<crate::ast::types::Program>;
+    type Params = Node<crate::parsing::ast::types::Program>;
    const METHOD: &'static str = "kcl/astUpdated";
 }

--- a/src/wasm-lib/kcl/src/lsp/kcl/mod.rs
+++ b/src/wasm-lib/kcl/src/lsp/kcl/mod.rs
@ -41,11 +41,13 @@ use tower_lsp::{
 };

 use crate::{
-    ast::types::{Expr, ModuleId, Node, VariableKind},
    lsp::{backend::Backend as _, util::IntoDiagnostic},
-    parser::PIPE_OPERATOR,
-    token::TokenType,
-    ExecState, Program, SourceRange,
+    parsing::{
+        ast::types::{Expr, Node, VariableKind},
+        token::TokenType,
+        PIPE_OPERATOR,
+    },
+    ExecState, ModuleId, Program, SourceRange,
 };

 lazy_static::lazy_static! {
@ -98,9 +100,9 @@ pub struct Backend {
    /// The stdlib signatures for the language.
    pub stdlib_signatures: HashMap<String, SignatureHelp>,
    /// Token maps.
-    pub token_map: DashMap<String, Vec<crate::token::Token>>,
+    pub token_map: DashMap<String, Vec<crate::parsing::token::Token>>,
    /// AST maps.
-    pub ast_map: DashMap<String, Node<crate::ast::types::Program>>,
+    pub ast_map: DashMap<String, Node<crate::parsing::ast::types::Program>>,
    /// Memory maps.
    pub memory_map: DashMap<String, crate::executor::ProgramMemory>,
    /// Current code.
@ -257,7 +259,7 @@ impl crate::lsp::backend::Backend for Backend {

        // Lets update the tokens.
        let module_id = ModuleId::default();
-        let tokens = match crate::token::lexer(&params.text, module_id) {
+        let tokens = match crate::parsing::token::lexer(&params.text, module_id) {
            Ok(tokens) => tokens,
            Err(err) => {
                self.add_to_diagnostics(&params, &[err], true).await;
@ -298,7 +300,7 @@ impl crate::lsp::backend::Backend for Backend {
        }

        // Lets update the ast.
-        let result = crate::parser::parse_tokens(tokens.clone());
+        let result = crate::parsing::parse_tokens(tokens.clone());
        // TODO handle parse errors properly
        let mut ast = match result.parse_errs_as_err() {
            Ok(ast) => ast,
@ -376,7 +378,7 @@ impl Backend {
        self.executor_ctx.read().await
    }

-    async fn update_semantic_tokens(&self, tokens: &[crate::token::Token], params: &TextDocumentItem) {
+    async fn update_semantic_tokens(&self, tokens: &[crate::parsing::token::Token], params: &TextDocumentItem) {
        // Update the semantic tokens map.
        let mut semantic_tokens = vec![];
        let mut last_position = Position::new(0, 0);
@ -1036,7 +1038,7 @@ impl LanguageServer for Backend {
        };

        match hover {
-            crate::ast::types::Hover::Function { name, range } => {
+            crate::parsing::ast::types::Hover::Function { name, range } => {
                // Get the docs for this function.
                let Some(completion) = self.stdlib_completions.get(&name) else {
                    return Ok(None);
@ -1071,8 +1073,8 @@ impl LanguageServer for Backend {
                    range: Some(range),
                }))
            }
-            crate::ast::types::Hover::Signature { .. } => Ok(None),
-            crate::ast::types::Hover::Comment { value, range } => Ok(Some(Hover {
+            crate::parsing::ast::types::Hover::Signature { .. } => Ok(None),
+            crate::parsing::ast::types::Hover::Comment { value, range } => Ok(Some(Hover {
                contents: HoverContents::Markup(MarkupContent {
                    kind: MarkupKind::Markdown,
                    value,
@ -1230,7 +1232,7 @@ impl LanguageServer for Backend {
        };

        match hover {
-            crate::ast::types::Hover::Function { name, range: _ } => {
+            crate::parsing::ast::types::Hover::Function { name, range: _ } => {
                // Get the docs for this function.
                let Some(signature) = self.stdlib_signatures.get(&name) else {
                    return Ok(None);
@ -1238,7 +1240,7 @@ impl LanguageServer for Backend {

                Ok(Some(signature.clone()))
            }
-            crate::ast::types::Hover::Signature {
+            crate::parsing::ast::types::Hover::Signature {
                name,
                parameter_index,
                range: _,
@ -1253,7 +1255,7 @@ impl LanguageServer for Backend {

                Ok(Some(signature))
            }
-            crate::ast::types::Hover::Comment { value: _, range: _ } => {
+            crate::parsing::ast::types::Hover::Comment { value: _, range: _ } => {
                return Ok(None);
            }
        }
@ -1302,12 +1304,12 @@ impl LanguageServer for Backend {
        // I don't know if we need to do this again since it should be updated in the context.
        // But I figure better safe than sorry since this will write back out to the file.
        let module_id = ModuleId::default();
-        let Ok(ast) = crate::parser::parse_str(current_code, module_id).parse_errs_as_err() else {
+        let Ok(ast) = crate::parsing::parse_str(current_code, module_id).parse_errs_as_err() else {
            return Ok(None);
        };
        // Now recast it.
        let recast = ast.recast(
-            &crate::ast::types::FormatOptions {
+            &crate::parsing::ast::types::FormatOptions {
                tab_size: params.options.tab_size as usize,
                insert_final_newline: params.options.insert_final_newline.unwrap_or(false),
                use_tabs: !params.options.insert_spaces,
@ -1336,7 +1338,7 @@ impl LanguageServer for Backend {
        // I don't know if we need to do this again since it should be updated in the context.
        // But I figure better safe than sorry since this will write back out to the file.
        let module_id = ModuleId::default();
-        let Ok(mut ast) = crate::parser::parse_str(current_code, module_id).parse_errs_as_err() else {
+        let Ok(mut ast) = crate::parsing::parse_str(current_code, module_id).parse_errs_as_err() else {
            return Ok(None);
        };

--- a/src/wasm-lib/kcl/src/lsp/tests.rs
+++ b/src/wasm-lib/kcl/src/lsp/tests.rs
@ -7,9 +7,9 @@ use tower_lsp::{
 };

 use crate::{
-    ast::types::{Node, Program},
    executor::ProgramMemory,
    lsp::test_util::{copilot_lsp_server, kcl_lsp_server},
+    parsing::ast::types::{Node, Program},
 };

 #[tokio::test(flavor = "multi_thread", worker_threads = 12)]
--- a/src/wasm-lib/kcl/src/parser/bad_inputs.rs
+++ b/src/wasm-lib/kcl/src/parser/bad_inputs.rs
@ -1,14 +0,0 @@
-#[cfg(test)]
-mod tests {
-    macro_rules! parse_and_lex {
-        ($func_name:ident, $test_kcl_program:expr) => {
-            #[test]
-            fn $func_name() {
-                let _ = crate::parser::top_level_parse($test_kcl_program);
-            }
-        };
-    }
-
-    parse_and_lex!(crash_eof_1, "{\"ގގ\0\0\0\"\".");
-    parse_and_lex!(crash_eof_2, "(/=e\"\u{616}ݝ\"\"");
-}
--- a/src/wasm-lib/kcl/src/parsing/ast/digest.rs
+++ b/src/wasm-lib/kcl/src/parsing/ast/digest.rs
@ -1,11 +1,12 @@
 use sha2::{Digest as DigestTrait, Sha256};

-use super::{
-    ArrayExpression, ArrayRangeExpression, BinaryExpression, BinaryPart, BodyItem, CallExpression, ElseIf, Expr,
-    ExpressionStatement, FnArgType, FunctionExpression, Identifier, IfExpression, ImportItem, ImportStatement, Literal,
-    LiteralIdentifier, MemberExpression, MemberObject, NonCodeMeta, NonCodeNode, NonCodeValue, ObjectExpression,
-    ObjectProperty, Parameter, PipeExpression, PipeSubstitution, Program, ReturnStatement, TagDeclarator,
-    UnaryExpression, VariableDeclaration, VariableDeclarator,
+use super::types::{ItemVisibility, VariableKind};
+use crate::parsing::ast::types::{
+    ArrayExpression, ArrayRangeExpression, BinaryExpression, BinaryPart, BodyItem, CallExpression, CallExpressionKw,
+    CommentStyle, ElseIf, Expr, ExpressionStatement, FnArgType, FunctionExpression, Identifier, IfExpression,
+    ImportItem, ImportStatement, Literal, LiteralIdentifier, MemberExpression, MemberObject, NonCodeMeta, NonCodeNode,
+    NonCodeValue, ObjectExpression, ObjectProperty, Parameter, PipeExpression, PipeSubstitution, Program,
+    ReturnStatement, TagDeclarator, UnaryExpression, VariableDeclaration, VariableDeclarator,
 };

 /// Position-independent digest of the AST node.
@ -93,6 +94,7 @@ impl Expr {
            Expr::BinaryExpression(be) => be.compute_digest(),
            Expr::FunctionExpression(fe) => fe.compute_digest(),
            Expr::CallExpression(ce) => ce.compute_digest(),
+            Expr::CallExpressionKw(ce) => ce.compute_digest(),
            Expr::PipeExpression(pe) => pe.compute_digest(),
            Expr::PipeSubstitution(ps) => ps.compute_digest(),
            Expr::ArrayExpression(ae) => ae.compute_digest(),
@ -117,6 +119,7 @@ impl BinaryPart {
            BinaryPart::Identifier(id) => id.compute_digest(),
            BinaryPart::BinaryExpression(be) => be.compute_digest(),
            BinaryPart::CallExpression(ce) => ce.compute_digest(),
+            BinaryPart::CallExpressionKw(ce) => ce.compute_digest(),
            BinaryPart::UnaryExpression(ue) => ue.compute_digest(),
            BinaryPart::MemberExpression(me) => me.compute_digest(),
            BinaryPart::IfExpression(e) => e.compute_digest(),
@ -207,6 +210,15 @@ impl ReturnStatement {
    });
 }

+impl CommentStyle {
+    fn digestable_id(&self) -> [u8; 2] {
+        match &self {
+            CommentStyle::Line => *b"//",
+            CommentStyle::Block => *b"/*",
+        }
+    }
+}
+
 impl NonCodeNode {
    compute_digest!(|slf, hasher| {
        match &slf.value {
@ -262,6 +274,24 @@ impl VariableDeclaration {
    });
 }

+impl VariableKind {
+    fn digestable_id(&self) -> [u8; 1] {
+        match self {
+            VariableKind::Const => [2],
+            VariableKind::Fn => [3],
+        }
+    }
+}
+
+impl ItemVisibility {
+    fn digestable_id(&self) -> [u8; 1] {
+        match self {
+            ItemVisibility::Default => [0],
+            ItemVisibility::Export => [1],
+        }
+    }
+}
+
 impl VariableDeclarator {
    compute_digest!(|slf, hasher| {
        hasher.update(slf.id.compute_digest());
@ -372,6 +402,22 @@ impl CallExpression {
    });
 }

+impl CallExpressionKw {
+    compute_digest!(|slf, hasher| {
+        hasher.update(slf.callee.compute_digest());
+        if let Some(ref mut unlabeled) = slf.unlabeled {
+            hasher.update(unlabeled.compute_digest());
+        } else {
+            hasher.update("no_unlabeled");
+        }
+        hasher.update(slf.arguments.len().to_ne_bytes());
+        for argument in slf.arguments.iter_mut() {
+            hasher.update(argument.label.compute_digest());
+            hasher.update(argument.arg.compute_digest());
+        }
+    });
+}
+
 impl IfExpression {
    compute_digest!(|slf, hasher| {
        hasher.update(slf.cond.compute_digest());
@ -388,3 +434,31 @@ impl ElseIf {
        hasher.update(slf.then_val.compute_digest());
    });
 }
+
+#[cfg(test)]
+mod test {
+    #[tokio::test(flavor = "multi_thread")]
+    async fn test_parse_digest() {
+        let prog1_string = r#"startSketchOn('XY')
+    |> startProfileAt([0, 0], %)
+    |> line([5, 5], %)
+"#;
+        let prog1_digest = crate::parsing::top_level_parse(prog1_string).unwrap().compute_digest();
+
+        let prog2_string = r#"startSketchOn('XY')
+    |> startProfileAt([0, 2], %)
+    |> line([5, 5], %)
+"#;
+        let prog2_digest = crate::parsing::top_level_parse(prog2_string).unwrap().compute_digest();
+
+        assert!(prog1_digest != prog2_digest);
+
+        let prog3_string = r#"startSketchOn('XY')
+    |> startProfileAt([0, 0], %)
+    |> line([5, 5], %)
+"#;
+        let prog3_digest = crate::parsing::top_level_parse(prog3_string).unwrap().compute_digest();
+
+        assert_eq!(prog1_digest, prog3_digest);
+    }
+}
--- a/src/wasm-lib/kcl/src/parsing/ast/execute.rs
+++ b/src/wasm-lib/kcl/src/parsing/ast/execute.rs
@ -1,19 +1,18 @@
 use std::collections::HashMap;

-use super::{
-    ArrayExpression, ArrayRangeExpression, BinaryExpression, BinaryOperator, BinaryPart, CallExpression, Expr,
-    IfExpression, KclNone, LiteralIdentifier, LiteralValue, MemberExpression, MemberObject, Node, ObjectExpression,
-    TagDeclarator, UnaryExpression, UnaryOperator,
-};
+use async_recursion::async_recursion;
+
 use crate::{
    errors::{KclError, KclErrorDetails},
-    executor::{
-        BodyType, ExecState, ExecutorContext, KclValue, Metadata, SourceRange, StatementKind, TagEngineInfo,
-        TagIdentifier,
+    executor::{BodyType, ExecState, ExecutorContext, KclValue, Metadata, StatementKind, TagEngineInfo, TagIdentifier},
+    parsing::ast::types::{
+        ArrayExpression, ArrayRangeExpression, BinaryExpression, BinaryOperator, BinaryPart, CallExpression,
+        CallExpressionKw, Expr, IfExpression, KclNone, LiteralIdentifier, LiteralValue, MemberExpression, MemberObject,
+        Node, ObjectExpression, TagDeclarator, UnaryExpression, UnaryOperator,
    },
+    source_range::SourceRange,
    std::{args::Arg, FunctionKind},
 };
-use async_recursion::async_recursion;

 const FLOAT_TO_INT_MAX_DELTA: f64 = 0.01;

@ -28,6 +27,7 @@ impl BinaryPart {
            }
            BinaryPart::BinaryExpression(binary_expression) => binary_expression.get_result(exec_state, ctx).await,
            BinaryPart::CallExpression(call_expression) => call_expression.execute(exec_state, ctx).await,
+            BinaryPart::CallExpressionKw(call_expression) => call_expression.execute(exec_state, ctx).await,
            BinaryPart::UnaryExpression(unary_expression) => unary_expression.get_result(exec_state, ctx).await,
            BinaryPart::MemberExpression(member_expression) => member_expression.get_result(exec_state),
            BinaryPart::IfExpression(e) => e.get_result(exec_state, ctx).await,
@ -333,6 +333,7 @@ async fn inner_execute_pipe_body(
            | Expr::BinaryExpression(_)
            | Expr::FunctionExpression(_)
            | Expr::CallExpression(_)
+            | Expr::CallExpressionKw(_)
            | Expr::PipeExpression(_)
            | Expr::PipeSubstitution(_)
            | Expr::ArrayExpression(_)
@ -356,6 +357,12 @@ async fn inner_execute_pipe_body(
    Ok(final_output)
 }

+impl Node<CallExpressionKw> {
+    pub async fn execute(&self, _exec_state: &mut ExecState, _ctx: &ExecutorContext) -> Result<KclValue, KclError> {
+        todo!()
+    }
+}
+
 impl Node<CallExpression> {
    #[async_recursion]
    pub async fn execute(&self, exec_state: &mut ExecState, ctx: &ExecutorContext) -> Result<KclValue, KclError> {
--- a/src/wasm-lib/kcl/src/parsing/ast/mod.rs
+++ b/src/wasm-lib/kcl/src/parsing/ast/mod.rs
@ -0,0 +1,5 @@
+pub(crate) mod digest;
+pub(crate) mod execute;
+pub mod modify;
+pub(crate) mod source_range;
+pub mod types;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Pierre Jacquier	8e6d82c6ba	Bump: Improve and fix nightly release notes	2024-12-05 07:13:44 -05:00
Nick Cameron	60a0c811ab	Move parsing files around (#4626 ) Signed-off-by: Nick Cameron <nrc@ncameron.org>	2024-12-05 17:56:49 +13:00
Pierre Jacquier	cab0c1e6a1	Add list of commits as changelog between nightly builds (#4654 )	2024-12-04 19:06:17 -05:00
Pierre Jacquier	417d720b22	Point-and-click Loft (#4605 ) * WIP: experimenting with Loft UI Relates to #4470 * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest-8-cores) * A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-latest-8-cores) * A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-latest-8-cores) * Add selection guard * Working loft for two sketches in the right hardcoded order * First pass at handling more than 2 sketches * WIP selections * WIP selections * More checks * Appends the loft line after the 'last' sketch in the code * Clean up * Enable multiple selections after the button click * First point-click loft test (not working locally, loft gets inserted at the wrong place) * Lint * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest-8-cores) * Clean up and working pw test * Add test for doesSceneHaveSweepableSketch with count = 2 * Clean up loftSketches function * Add pw test for preselected sketches * A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-latest-8-cores) * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest-8-cores) * A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-latest-8-cores) * Trigger CI * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest-8-cores) * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest-8-cores) * A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-latest-8-cores) * Move to fromPromise-based Actor * Move error logic out of loftSketches, fix pw tests * Remove comments * A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-latest-8-cores) * Trigger CI * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest-8-cores) * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest-8-cores) * A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-latest-8-cores) * A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-latest-8-cores) * Trigger CI * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest-8-cores) * A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-latest-8-cores) * Fix typo * Revert snapshots * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest-8-cores) * A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-latest-8-cores) * Trigger CI * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest-8-cores) * A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-latest-8-cores) * Trigger CI --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2024-12-04 22:24:16 +00:00
Kevin Nadro	77293952c0	fix: upon entering sketch mode, axis do not rotate. (#4572 ) * fix: upon entering sketch mode, axis do not rotate. * fix: camera settings has the up vector to set, this should now work	2024-12-04 15:57:17 -06:00
Jonathan Tran	ea3d604b73	Allow standard planes to appear in the artifact graph (#4594 )	2024-12-04 21:06:02 +00:00
Nick Cameron	023a659491	Make some fields of lint::Discovered public again; update kittycad (#4658 ) * Make some fields of lint::Discovered public again; update kittycad Signed-off-by: Nick Cameron <nrc@ncameron.org> * Empty commit to try to unstick CI --------- Signed-off-by: Nick Cameron <nrc@ncameron.org>	2024-12-05 10:05:23 +13:00
Jonathan Tran	dd3a2b14f9	Bump hashbrown from 0.15.0 to 0.15.2 (#4659 )	2024-12-04 20:40:46 +00:00
Greg Sweeney	424b409cc1	Bump and release kcl-lib 0.2.27 (#4643 ) * bump and release kcl-lib * update snapshot * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest-8-cores) * empty commit --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2024-12-03 17:58:21 -05:00
Jonathan Tran	82a58e69c2	Bump wasm-pack from 0.13.0 to 0.13.1 (#4630 )	2024-12-03 16:27:16 -06:00
max	776b420031	Rename addFillet files to addEdgeTreatment (#4644 ) * rename * update references	2024-12-04 08:30:02 +11:00
dependabot[bot]	1087d4223b	Bump happy-dom from 15.10.2 to 15.11.7 (#4625 ) Bumps [happy-dom](https://github.com/capricorn86/happy-dom) from 15.10.2 to 15.11.7. - [Release notes](https://github.com/capricorn86/happy-dom/releases) - [Commits](https://github.com/capricorn86/happy-dom/compare/v15.10.2...v15.11.7) --- updated-dependencies: - dependency-name: happy-dom dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-12-03 15:40:35 -05:00
Jonathan Tran	089d6df889	Update fn syntax in module docs (#4641 )	2024-12-03 15:14:32 -05:00
Jonathan Tran	efb067af58	Update fn syntax in module docs (#4641 )	2024-12-03 19:47:21 +00:00
dependabot[bot]	2aa27eab01	Bump happy-dom from 15.10.2 to 15.11.7 (#4625 ) Bumps [happy-dom](https://github.com/capricorn86/happy-dom) from 15.10.2 to 15.11.7. - [Release notes](https://github.com/capricorn86/happy-dom/releases) - [Commits](https://github.com/capricorn86/happy-dom/compare/v15.10.2...v15.11.7) --- updated-dependencies: - dependency-name: happy-dom dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-12-03 19:40:36 +00:00
Greg Sweeney	9c47ac5b57	Update fn syntax in KCL Types doc (#4640 ) * update fn syntax * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest-8-cores) * Trigger CI --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Jonathan Tran <jonnytran@gmail.com>	2024-12-03 18:17:02 +00:00
Nick Cameron	5ae1aecd74	Reduce Python API surface area to what is necessary for kcl.py (#4637 ) Signed-off-by: Nick Cameron <nrc@ncameron.org>	2024-12-03 17:34:58 +13:00
Nick Cameron	68ae7e98f9	Refactor SourceRange and ModuleId to make them better encapsualated (#4636 ) Signed-off-by: Nick Cameron <nrc@ncameron.org>	2024-12-03 16:39:51 +13:00
Jonathan Tran	56771d561a	Bump rustls from 0.23.13 to 0.23.19 and rustls-pki-types (#4632 )	2024-12-03 15:49:15 +13:00
Adam Chalmers	f09411817c	KCL AST: Call functions with keyword arguments (#4599 ) Call expressions only, haven't done function expressions yet. Part of https://github.com/KittyCAD/modeling-app/issues/4600	2024-12-02 21:23:18 +00:00
max	bed7ae3b8b	Refactor addFillet into addEdgeTreatment Function Supporting Chamfers (#4593 ) * refactor code mod and tests * tsc * make lint happy * remove dumby data Co-authored-by: Kurt Hutten <k.hutten@protonmail.ch> --------- Co-authored-by: Kurt Hutten <k.hutten@protonmail.ch>	2024-12-02 21:43:59 +01:00
Adam Chalmers	c43510732c	KCL docs: Remove FunctionExpression (#4633 ) KCL functions are a weird edge case, and the `FunctionExpression` field should not be included in its public API. That field is only there for implementation details, it shouldn't be exposed to users. What's worse is that `FunctionExpression` includes a `Program` so every single AST node wound up being included in our docs.	2024-12-02 14:36:49 -06:00
Jonathan Tran	51f0b669a4	fix: only count something as a directory if it has children (#4595 ) * fix: only count something as a directory if it has children * fix: playwright tests * fix: return 0 if you cant find the projectfolder * fix: remove folder count from e2e tests since it is unused currently --------- Co-authored-by: Tom Pridham <pridham.tom@gmail.com>	2024-12-02 15:16:43 -05:00
dependabot[bot]	3cbedcd3e7	Bump clap from 4.5.20 to 4.5.21 in /src/wasm-lib (#4623 ) Bumps [clap](https://github.com/clap-rs/clap) from 4.5.20 to 4.5.21. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.5.20...clap_complete-v4.5.21) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-12-02 09:28:57 -08:00
dependabot[bot]	5d2fa43150	Bump dawidd6/action-download-artifact from 6 to 7 (#4621 ) Bumps [dawidd6/action-download-artifact](https://github.com/dawidd6/action-download-artifact) from 6 to 7. - [Release notes](https://github.com/dawidd6/action-download-artifact/releases) - [Commits](https://github.com/dawidd6/action-download-artifact/compare/v6...v7) --- updated-dependencies: - dependency-name: dawidd6/action-download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-12-02 09:27:57 -08:00