Revert "Add uniqueness check to "Create project" command (#5100)"

This reverts commit dac91d3b79.

.github/workflows/cargo-bench.yml

@@ -0,0 +1,44 @@
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - '**.rs'
+      - '**/Cargo.toml'
+      - '**/Cargo.lock'
+      - '**/rust-toolchain.toml'
+      - .github/workflows/cargo-bench.yml
+  pull_request:
+    paths:
+      - '**.rs'
+      - '**/Cargo.toml'
+      - '**/Cargo.lock'
+      - '**/rust-toolchain.toml'
+      - .github/workflows/cargo-bench.yml
+  workflow_dispatch:
+permissions: read-all
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+name: cargo bench
+jobs:
+  cargo-bench:
+    name: Benchmark with iai
+    runs-on: ubuntu-latest-8-cores
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+      - name: Install dependencies
+        run: |
+          cargo install cargo-criterion
+          sudo apt update
+          sudo apt install -y valgrind
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v2.6.1
+      - name: Benchmark kcl library
+        shell: bash
+        run: |-
+          cd src/wasm-lib/kcl; cargo bench --all-features -- iai
+        env:
+          KITTYCAD_API_TOKEN: ${{secrets.KITTYCAD_API_TOKEN}}
+

docs/kcl/types/Face.md

@@ -1,28 +0,0 @@
----
-title: "Face"
-excerpt: "A face."
-layout: manual
----
-
-A face.
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `id` |`string`| The id of the face. | No |
-| `value` |`string`| The tag of the face. | No |
-| `xAxis` |[`Point3d`](/docs/kcl/types/Point3d)| What should the face’s X axis be? | No |
-| `yAxis` |[`Point3d`](/docs/kcl/types/Point3d)| What should the face’s Y axis be? | No |
-| `zAxis` |[`Point3d`](/docs/kcl/types/Point3d)| The z-axis (normal). | No |
-| `solid` |[`Solid`](/docs/kcl/types/Solid)| The solid the face is on. | No |
-| `units` |[`UnitLen`](/docs/kcl/types/UnitLen)| A face. | No |
-| `__meta` |`[` [`Metadata`](/docs/kcl/types/Metadata) `]`|  | No |
-
-

docs/kcl/types/Helix.md

@@ -20,7 +20,6 @@ A helix.
 | `revolutions` |`number`| Number of revolutions. | No |
 | `angleStart` |`number`| Start angle (in degrees). | No |
 | `ccw` |`boolean`| Is the helix rotation counter clockwise? | No |
-| `units` |[`UnitLen`](/docs/kcl/types/UnitLen)| A helix. | No |
 | `__meta` |`[` [`Metadata`](/docs/kcl/types/Metadata) `]`|  | No |
 
 

docs/kcl/types/HelixValue.md

@@ -20,7 +20,6 @@ A helix.
 | `revolutions` |`number`| Number of revolutions. | No |
 | `angleStart` |`number`| Start angle (in degrees). | No |
 | `ccw` |`boolean`| Is the helix rotation counter clockwise? | No |
-| `units` |[`UnitLen`](/docs/kcl/types/UnitLen)| A helix. | No |
 | `__meta` |`[` [`Metadata`](/docs/kcl/types/Metadata) `]`|  | No |
 
 

docs/kcl/types/KclValue.md

@@ -168,6 +168,7 @@ Any KCL value.
 
 
 ----
+A plane.
 
 **Type:** `object`
 
@@ -180,10 +181,17 @@ Any KCL value.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: [`Plane`](/docs/kcl/types/Plane)|  | No |
-| `value` |[`Plane`](/docs/kcl/types/Plane)| Any KCL value. | No |
+| `id` |`string`| The id of the plane. | No |
+| `value` |[`PlaneType`](/docs/kcl/types/PlaneType)| Any KCL value. | No |
+| `origin` |[`Point3d`](/docs/kcl/types/Point3d)| Origin of the plane. | No |
+| `xAxis` |[`Point3d`](/docs/kcl/types/Point3d)| What should the plane’s X axis be? | No |
+| `yAxis` |[`Point3d`](/docs/kcl/types/Point3d)| What should the plane’s Y axis be? | No |
+| `zAxis` |[`Point3d`](/docs/kcl/types/Point3d)| The z-axis (normal). | No |
+| `__meta` |`[` [`Metadata`](/docs/kcl/types/Metadata) `]`|  | No |
 
 
 ----
+A face.
 
 **Type:** `object`
 
@@ -195,8 +203,14 @@ Any KCL value.
 
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
-| `type` |enum: [`Face`](/docs/kcl/types/Face)|  | No |
-| `value` |[`Face`](/docs/kcl/types/Face)| Any KCL value. | No |
+| `type` |enum: `Face`|  | No |
+| `id` |`string`| The id of the face. | No |
+| `value` |`string`| The tag of the face. | No |
+| `xAxis` |[`Point3d`](/docs/kcl/types/Point3d)| What should the face’s X axis be? | No |
+| `yAxis` |[`Point3d`](/docs/kcl/types/Point3d)| What should the face’s Y axis be? | No |
+| `zAxis` |[`Point3d`](/docs/kcl/types/Point3d)| The z-axis (normal). | No |
+| `solid` |[`Solid`](/docs/kcl/types/Solid)| The solid the face is on. | No |
+| `__meta` |`[` [`Metadata`](/docs/kcl/types/Metadata) `]`|  | No |
 
 
 ----
@@ -232,6 +246,7 @@ Any KCL value.
 
 
 ----
+An solid is a collection of extrude surfaces.
 
 **Type:** `object`
 
@@ -244,7 +259,14 @@ Any KCL value.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: [`Solid`](/docs/kcl/types/Solid)|  | No |
-| `value` |[`Solid`](/docs/kcl/types/Solid)| Any KCL value. | No |
+| `id` |`string`| The id of the solid. | No |
+| `value` |`[` [`ExtrudeSurface`](/docs/kcl/types/ExtrudeSurface) `]`| The extrude surfaces. | No |
+| `sketch` |[`Sketch`](/docs/kcl/types/Sketch)| The sketch. | No |
+| `height` |`number`| The height of the solid. | No |
+| `startCapId` |`string`| The id of the extrusion start cap | No |
+| `endCapId` |`string`| The id of the extrusion end cap | No |
+| `edgeCuts` |`[` [`EdgeCut`](/docs/kcl/types/EdgeCut) `]`| Chamfers or fillets on this solid. | No |
+| `__meta` |`[` [`Metadata`](/docs/kcl/types/Metadata) `]`| Metadata. | No |
 
 
 ----
@@ -264,6 +286,7 @@ Any KCL value.
 
 
 ----
+A helix.
 
 **Type:** `object`
 
@@ -276,7 +299,11 @@ Any KCL value.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: [`Helix`](/docs/kcl/types/Helix)|  | No |
-| `value` |[`Helix`](/docs/kcl/types/Helix)| Any KCL value. | No |
+| `value` |`string`| The id of the helix. | No |
+| `revolutions` |`number`| Number of revolutions. | No |
+| `angleStart` |`number`| Start angle (in degrees). | No |
+| `ccw` |`boolean`| Is the helix rotation counter clockwise? | No |
+| `__meta` |`[` [`Metadata`](/docs/kcl/types/Metadata) `]`|  | No |
 
 
 ----

docs/kcl/types/Plane.md

@@ -22,7 +22,6 @@ A plane.
 | `xAxis` |[`Point3d`](/docs/kcl/types/Point3d)| What should the plane’s X axis be? | No |
 | `yAxis` |[`Point3d`](/docs/kcl/types/Point3d)| What should the plane’s Y axis be? | No |
 | `zAxis` |[`Point3d`](/docs/kcl/types/Point3d)| The z-axis (normal). | No |
-| `units` |[`UnitLen`](/docs/kcl/types/UnitLen)| A plane. | No |
 | `__meta` |`[` [`Metadata`](/docs/kcl/types/Metadata) `]`|  | No |
 
 

docs/kcl/types/Sketch.md

@@ -21,7 +21,6 @@ A sketch is a collection of paths.
 | `on` |[`SketchSurface`](/docs/kcl/types/SketchSurface)| What the sketch is on (can be a plane or a face). | No |
 | `start` |[`BasePath`](/docs/kcl/types/BasePath)| The starting path. | No |
 | `tags` |`object`| Tag identifiers that have been declared in this sketch. | No |
-| `units` |[`UnitLen`](/docs/kcl/types/UnitLen)| A sketch is a collection of paths. | No |
 | `__meta` |`[` [`Metadata`](/docs/kcl/types/Metadata) `]`| Metadata. | No |
 
 

docs/kcl/types/SketchSet.md

@@ -30,7 +30,6 @@ A sketch is a collection of paths.
 | `on` |[`SketchSurface`](/docs/kcl/types/SketchSurface)| What the sketch is on (can be a plane or a face). | No |
 | `start` |[`BasePath`](/docs/kcl/types/BasePath)| The starting path. | No |
 | `tags` |`object`| Tag identifiers that have been declared in this sketch. | No |
-| `units` |[`UnitLen`](/docs/kcl/types/UnitLen)| A sketch or a group of sketches. | No |
 | `__meta` |`[` [`Metadata`](/docs/kcl/types/Metadata) `]`| Metadata. | No |
 
 

docs/kcl/types/SketchSurface.md

@@ -31,7 +31,6 @@ A plane.
 | `xAxis` |[`Point3d`](/docs/kcl/types/Point3d)| What should the plane’s X axis be? | No |
 | `yAxis` |[`Point3d`](/docs/kcl/types/Point3d)| What should the plane’s Y axis be? | No |
 | `zAxis` |[`Point3d`](/docs/kcl/types/Point3d)| The z-axis (normal). | No |
-| `units` |[`UnitLen`](/docs/kcl/types/UnitLen)| A sketch type. | No |
 | `__meta` |`[` [`Metadata`](/docs/kcl/types/Metadata) `]`|  | No |
 
 
@@ -55,7 +54,6 @@ A face.
 | `yAxis` |[`Point3d`](/docs/kcl/types/Point3d)| What should the face’s Y axis be? | No |
 | `zAxis` |[`Point3d`](/docs/kcl/types/Point3d)| The z-axis (normal). | No |
 | `solid` |[`Solid`](/docs/kcl/types/Solid)| The solid the face is on. | No |
-| `units` |[`UnitLen`](/docs/kcl/types/UnitLen)| A sketch type. | No |
 | `__meta` |`[` [`Metadata`](/docs/kcl/types/Metadata) `]`|  | No |
 
 

docs/kcl/types/Solid.md

@@ -23,7 +23,6 @@ An solid is a collection of extrude surfaces.
 | `startCapId` |`string`| The id of the extrusion start cap | No |
 | `endCapId` |`string`| The id of the extrusion end cap | No |
 | `edgeCuts` |`[` [`EdgeCut`](/docs/kcl/types/EdgeCut) `]`| Chamfers or fillets on this solid. | No |
-| `units` |[`UnitLen`](/docs/kcl/types/UnitLen)| An solid is a collection of extrude surfaces. | No |
 | `__meta` |`[` [`Metadata`](/docs/kcl/types/Metadata) `]`| Metadata. | No |
 
 

docs/kcl/types/SolidSet.md

@@ -32,7 +32,6 @@ An solid is a collection of extrude surfaces.
 | `startCapId` |`string`| The id of the extrusion start cap | No |
 | `endCapId` |`string`| The id of the extrusion end cap | No |
 | `edgeCuts` |`[` [`EdgeCut`](/docs/kcl/types/EdgeCut) `]`| Chamfers or fillets on this solid. | No |
-| `units` |[`UnitLen`](/docs/kcl/types/UnitLen)| A solid or a group of solids. | No |
 | `__meta` |`[` [`Metadata`](/docs/kcl/types/Metadata) `]`| Metadata. | No |
 
 

docs/kcl/types/UnitLen.md

@@ -1,107 +0,0 @@
----
-title: "UnitLen"
-excerpt: ""
-layout: manual
----
-
-
-
-
-
-
-**This schema accepts exactly one of the following:**
-
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `Mm`|  | No |
-
-
-----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `Cm`|  | No |
-
-
-----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `M`|  | No |
-
-
-----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `Inches`|  | No |
-
-
-----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `Feet`|  | No |
-
-
-----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `Yards`|  | No |
-
-
-----
-
-
-
-

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

@@ -280,7 +280,7 @@ test(
 
       await expect(page.getByRole('link', { name: 'bracket' })).toBeVisible()
       await expect(page.getByText('router-template-slate')).toBeVisible()
-      await expect(page.getByText('Create project')).toBeVisible()
+      await expect(page.getByText('New Project')).toBeVisible()
     })
 
     await test.step('Opening the router-template project should load', async () => {

e2e/playwright/debug-pane.spec.ts

@@ -38,14 +38,14 @@ test.describe('Debug pane', () => {
       // Set the code in the code editor.
       await u.codeLocator.click()
       await page.keyboard.type(code, { delay: 0 })
-      // Scroll to the artifact graph.
+      // Scroll to the feature tree.
       await tree.scrollIntoViewIfNeeded()
-      // Expand the artifact graph.
-      await tree.getByText('Artifact Graph').click()
+      // Expand the feature tree.
+      await tree.getByText('Feature Tree').click()
       // Just expanded the details, making the element taller, so scroll again.
       await tree.getByText('Plane').first().scrollIntoViewIfNeeded()
     })
-    // Extract the artifact IDs from the debug artifact graph.
+    // Extract the artifact IDs from the debug feature tree.
     const initialSegmentIds = await segment.innerText({ timeout: 5_000 })
     // The artifact ID should include a UUID.
     expect(initialSegmentIds).toMatch(

e2e/playwright/fixtures/cmdBarFixture.ts

@@ -135,20 +135,4 @@ export class CmdBarFixture {
       await promptEditCommand.first().click()
     }
   }
-
-  get cmdSearchInput() {
-    return this.page.getByTestId('cmd-bar-search')
-  }
-
-  get argumentInput() {
-    return this.page.getByTestId('cmd-bar-arg-value')
-  }
-
-  get cmdOptions() {
-    return this.page.getByTestId('cmd-bar-option')
-  }
-
-  chooseCommand = async (commandName: string) => {
-    await this.cmdOptions.getByText(commandName).click()
-  }
 }

e2e/playwright/fixtures/homePageFixture.ts

@@ -103,7 +103,7 @@ export class HomePageFixture {
       .toEqual(expectedState)
   }
 
-  createAndGoToProject = async (projectTitle = 'project-$nnn') => {
+  createAndGoToProject = async (projectTitle: string) => {
     await expect(this.projectSection).not.toHaveText('Loading your Projects...')
     await this.projectButtonNew.click()
     await this.projectTextName.click()

e2e/playwright/fixtures/toolbarFixture.ts

@@ -63,10 +63,6 @@ export class ToolbarFixture {
     this.exeIndicator = page.getByTestId('model-state-indicator-execution-done')
   }
 
-  get logoLink() {
-    return this.page.getByTestId('app-logo')
-  }
-
   startSketchPlaneSelection = async () =>
     doAndWaitForImageDiff(this.page, () => this.startSketchBtn.click(), 500)
 

e2e/playwright/point-click.spec.ts

@@ -963,31 +963,37 @@ sketch002 = startSketchOn('XZ')
     await toolbar.sweepButton.click()
     await cmdBar.expectState({
       commandName: 'Sweep',
-      currentArgKey: 'target',
+      currentArgKey: 'profile',
       currentArgValue: '',
       headerArguments: {
-        Target: '',
-        Trajectory: '',
+        Path: '',
+        Profile: '',
       },
-      highlightedHeaderArg: 'target',
+      highlightedHeaderArg: 'profile',
       stage: 'arguments',
     })
     await clickOnSketch1()
     await cmdBar.expectState({
       commandName: 'Sweep',
-      currentArgKey: 'trajectory',
+      currentArgKey: 'path',
       currentArgValue: '',
       headerArguments: {
-        Target: '1 face',
-        Trajectory: '',
+        Path: '',
+        Profile: '1 face',
       },
-      highlightedHeaderArg: 'trajectory',
+      highlightedHeaderArg: 'path',
       stage: 'arguments',
     })
     await clickOnSketch2()
-    await page.waitForTimeout(500)
+    await cmdBar.expectState({
+      commandName: 'Sweep',
+      headerArguments: {
+        Path: '1 face',
+        Profile: '1 face',
+      },
+      stage: 'review',
+    })
     await cmdBar.progressCmdBar()
-    await page.waitForTimeout(500)
   })
 
   await test.step(`Confirm code is added to the editor, scene has changed`, async () => {
@@ -1014,75 +1020,6 @@ sketch002 = startSketchOn('XZ')
   })
 })
 
-test(`Sweep point-and-click failing validation`, async ({
-  context,
-  page,
-  homePage,
-  scene,
-  toolbar,
-  cmdBar,
-}) => {
-  const initialCode = `sketch001 = startSketchOn('YZ')
-  |> circle({
-       center = [0, 0],
-       radius = 500
-     }, %)
-sketch002 = startSketchOn('XZ')
-  |> startProfileAt([0, 0], %)
-  |> xLine(-500, %)
-  |> lineTo([-2000, 500], %)
-`
-  await context.addInitScript((initialCode) => {
-    localStorage.setItem('persistCode', initialCode)
-  }, initialCode)
-  await page.setBodyDimensions({ width: 1000, height: 500 })
-  await homePage.goToModelingScene()
-  await scene.waitForExecutionDone()
-
-  // One dumb hardcoded screen pixel value
-  const testPoint = { x: 700, y: 250 }
-  const [clickOnSketch1] = scene.makeMouseHelpers(testPoint.x, testPoint.y)
-  const [clickOnSketch2] = scene.makeMouseHelpers(testPoint.x - 50, testPoint.y)
-
-  await test.step(`Look for sketch001`, async () => {
-    await toolbar.closePane('code')
-    await scene.expectPixelColor([53, 53, 53], testPoint, 15)
-  })
-
-  await test.step(`Go through the command bar flow and fail validation with a toast`, async () => {
-    await toolbar.sweepButton.click()
-    await cmdBar.expectState({
-      commandName: 'Sweep',
-      currentArgKey: 'target',
-      currentArgValue: '',
-      headerArguments: {
-        Target: '',
-        Trajectory: '',
-      },
-      highlightedHeaderArg: 'target',
-      stage: 'arguments',
-    })
-    await clickOnSketch1()
-    await cmdBar.expectState({
-      commandName: 'Sweep',
-      currentArgKey: 'trajectory',
-      currentArgValue: '',
-      headerArguments: {
-        Target: '1 face',
-        Trajectory: '',
-      },
-      highlightedHeaderArg: 'trajectory',
-      stage: 'arguments',
-    })
-    await clickOnSketch2()
-    await page.waitForTimeout(500)
-    await cmdBar.progressCmdBar()
-    await expect(
-      page.getByText('Unable to sweep with the provided selection')
-    ).toBeVisible()
-  })
-})
-
 test(`Fillet point-and-click`, async ({
   context,
   page,

e2e/playwright/projects.spec.ts

@@ -172,7 +172,7 @@ test(
       await expect(page.getByRole('link', { name: 'bracket' })).toBeVisible()
       await expect(page.getByText('broken-code')).toBeVisible()
       await expect(page.getByText('bracket')).toBeVisible()
-      await expect(page.getByText('Create project')).toBeVisible()
+      await expect(page.getByText('New Project')).toBeVisible()
     })
     await test.step('opening broken code project should clear the scene and show the error', async () => {
       // Go back home.
@@ -253,7 +253,7 @@ test(
       await expect(page.getByRole('link', { name: 'bracket' })).toBeVisible()
       await expect(page.getByText('empty')).toBeVisible()
       await expect(page.getByText('bracket')).toBeVisible()
-      await expect(page.getByText('Create project')).toBeVisible()
+      await expect(page.getByText('New Project')).toBeVisible()
     })
     await test.step('opening empty code project should clear the scene', async () => {
       // Go back home.
@@ -985,126 +985,6 @@ test.describe(`Project management commands`, () => {
       })
     }
   )
-  test(`Create a new project with a colliding name`, async ({
-    context,
-    homePage,
-    toolbar,
-    cmdBar,
-  }) => {
-    const projectName = 'test-project'
-    await test.step(`Setup`, async () => {
-      await context.folderSetupFn(async (dir) => {
-        const projectDir = path.join(dir, projectName)
-        await Promise.all([fsp.mkdir(projectDir, { recursive: true })])
-        await Promise.all([
-          fsp.copyFile(
-            executorInputPath('router-template-slate.kcl'),
-            path.join(projectDir, 'main.kcl')
-          ),
-        ])
-      })
-      await homePage.expectState({
-        projectCards: [
-          {
-            title: projectName,
-            fileCount: 1,
-          },
-        ],
-        sortBy: 'last-modified-desc',
-      })
-    })
-
-    await test.step('Create a new project with the same name', async () => {
-      await cmdBar.openCmdBar()
-      await cmdBar.chooseCommand('create project')
-      await cmdBar.expectState({
-        stage: 'arguments',
-        commandName: 'Create project',
-        currentArgKey: 'name',
-        currentArgValue: '',
-        headerArguments: {
-          Name: '',
-        },
-        highlightedHeaderArg: 'name',
-      })
-      await cmdBar.argumentInput.fill(projectName)
-      await cmdBar.progressCmdBar()
-    })
-
-    await test.step(`Check the project was created with a non-colliding name`, async () => {
-      await toolbar.logoLink.click()
-      await homePage.expectState({
-        projectCards: [
-          {
-            title: projectName + '-1',
-            fileCount: 1,
-          },
-          {
-            title: projectName,
-            fileCount: 1,
-          },
-        ],
-        sortBy: 'last-modified-desc',
-      })
-    })
-
-    await test.step('Create another project with the same name', async () => {
-      await cmdBar.openCmdBar()
-      await cmdBar.chooseCommand('create project')
-      await cmdBar.expectState({
-        stage: 'arguments',
-        commandName: 'Create project',
-        currentArgKey: 'name',
-        currentArgValue: '',
-        headerArguments: {
-          Name: '',
-        },
-        highlightedHeaderArg: 'name',
-      })
-      await cmdBar.argumentInput.fill(projectName)
-      await cmdBar.progressCmdBar()
-    })
-
-    await test.step(`Check the second project was created with a non-colliding name`, async () => {
-      await toolbar.logoLink.click()
-      await homePage.expectState({
-        projectCards: [
-          {
-            title: projectName + '-2',
-            fileCount: 1,
-          },
-          {
-            title: projectName + '-1',
-            fileCount: 1,
-          },
-          {
-            title: projectName,
-            fileCount: 1,
-          },
-        ],
-        sortBy: 'last-modified-desc',
-      })
-    })
-  })
-})
-
-test(`Create a few projects using the default project name`, async ({
-  homePage,
-  toolbar,
-}) => {
-  for (let i = 0; i < 12; i++) {
-    await test.step(`Create project ${i}`, async () => {
-      await homePage.expectState({
-        projectCards: Array.from({ length: i }, (_, i) => ({
-          title: `project-${i.toString().padStart(3, '0')}`,
-          fileCount: 1,
-        })).toReversed(),
-        sortBy: 'last-modified-desc',
-      })
-      await homePage.createAndGoToProject()
-      await toolbar.logoLink.click()
-    })
-  }
 })
 
 test(
@@ -1511,7 +1391,7 @@ extrude001 = extrude(200, sketch001)`)
     await page.getByTestId('app-logo').click()
 
     await expect(
-      page.getByRole('button', { name: 'Create project' })
+      page.getByRole('button', { name: 'New project' })
     ).toBeVisible()
 
     for (let i = 1; i <= 10; i++) {
@@ -1585,7 +1465,7 @@ test(
 
       await expect(page.getByRole('link', { name: 'bracket' })).toBeVisible()
       await expect(page.getByText('router-template-slate')).toBeVisible()
-      await expect(page.getByText('Create project')).toBeVisible()
+      await expect(page.getByText('New Project')).toBeVisible()
     })
 
     await test.step('Opening the router-template project should load the stream', async () => {
@@ -1614,7 +1494,7 @@ test(
 
       await expect(page.getByRole('link', { name: 'bracket' })).toBeVisible()
       await expect(page.getByText('router-template-slate')).toBeVisible()
-      await expect(page.getByText('Create project')).toBeVisible()
+      await expect(page.getByText('New Project')).toBeVisible()
     })
   }
 )

e2e/playwright/test-utils.ts

@@ -1078,7 +1078,7 @@ export async function createProject({
   returnHome?: boolean
 }) {
   await test.step(`Create project and navigate to it`, async () => {
-    await page.getByRole('button', { name: 'Create project' }).click()
+    await page.getByRole('button', { name: 'New project' }).click()
     await page.getByRole('textbox', { name: 'Name' }).fill(name)
     await page.getByRole('button', { name: 'Continue' }).click()
 

package.json

@@ -113,9 +113,9 @@
     "test:unit": "vitest run --mode development --exclude **/kclSamples.test.ts",
     "test:unit:kcl-samples": "vitest run --mode development ./src/lang/kclSamples.test.ts",
     "test:playwright:electron": "playwright test --config=playwright.electron.config.ts --grep-invert='@snapshot'",
-    "test:playwright:electron:windows": "playwright test --config=playwright.electron.config.ts --grep-invert=\"@skipWin|@snapshot\" --quiet",
-    "test:playwright:electron:macos": "playwright test --config=playwright.electron.config.ts --grep-invert='@skipMacos|@snapshot' --quiet",
-    "test:playwright:electron:ubuntu": "playwright test --config=playwright.electron.config.ts --grep-invert='@skipLinux|@snapshot' --quiet",
+    "test:playwright:electron:windows": "playwright test --config=playwright.electron.config.ts --grep-invert=\"@skipWin|@snapshot\"",
+    "test:playwright:electron:macos": "playwright test --config=playwright.electron.config.ts --grep-invert='@skipMacos|@snapshot'",
+    "test:playwright:electron:ubuntu": "playwright test --config=playwright.electron.config.ts --grep-invert='@skipLinux|@snapshot'",
     "test:playwright:electron:local": "yarn tron:package && NODE_ENV=development playwright test --config=playwright.electron.config.ts --grep-invert='@snapshot'",
     "test:playwright:electron:windows:local": "yarn tron:package && NODE_ENV=development playwright test --config=playwright.electron.config.ts --grep-invert=\"@skipWin|@snapshot\"",
     "test:playwright:electron:macos:local": "yarn tron:package && NODE_ENV=development playwright test --config=playwright.electron.config.ts --grep-invert='@skipMacos|@snapshot'",
@@ -201,7 +201,7 @@
     "ts-node": "^10.0.0",
     "typescript": "^5.7.3",
     "typescript-eslint": "^8.19.1",
-    "vite": "^5.4.12",
+    "vite": "^5.4.6",
     "vite-plugin-package-version": "^1.1.0",
     "vite-tsconfig-paths": "^4.3.2",
     "vitest": "^1.6.0",

src/Router.tsx

@@ -31,6 +31,7 @@ import {
   settingsLoader,
   telemetryLoader,
 } from 'lib/routeLoaders'
+import { CommandBarProvider } from 'components/CommandBar/CommandBarProvider'
 import SettingsAuthProvider from 'components/SettingsAuthProvider'
 import LspProvider from 'components/LspProvider'
 import { KclContextProvider } from 'lang/KclProvider'
@@ -57,21 +58,23 @@ const router = createRouter([
     /* Make sure auth is the outermost provider or else we will have
      * inefficient re-renders, use the react profiler to see. */
     element: (
-      <RouteProvider>
-        <SettingsAuthProvider>
-          <LspProvider>
-            <ProjectsContextProvider>
-              <KclContextProvider>
-                <AppStateProvider>
-                  <MachineManagerProvider>
-                    <Outlet />
-                  </MachineManagerProvider>
-                </AppStateProvider>
-              </KclContextProvider>
-            </ProjectsContextProvider>
-          </LspProvider>
-        </SettingsAuthProvider>
-      </RouteProvider>
+      <CommandBarProvider>
+        <RouteProvider>
+          <SettingsAuthProvider>
+            <LspProvider>
+              <ProjectsContextProvider>
+                <KclContextProvider>
+                  <AppStateProvider>
+                    <MachineManagerProvider>
+                      <Outlet />
+                    </MachineManagerProvider>
+                  </AppStateProvider>
+                </KclContextProvider>
+              </ProjectsContextProvider>
+            </LspProvider>
+          </SettingsAuthProvider>
+        </RouteProvider>
+      </CommandBarProvider>
     ),
     errorElement: <ErrorPage />,
     children: [

src/Toolbar.tsx

@@ -1,7 +1,8 @@
-import { useRef, useMemo, memo, useCallback, useState } from 'react'
+import { useRef, useMemo, memo } from 'react'
 import { isCursorInSketchCommandRange } from 'lang/util'
 import { engineCommandManager, kclManager } from 'lib/singletons'
 import { useModelingContext } from 'hooks/useModelingContext'
+import { useCommandsContext } from 'hooks/useCommandsContext'
 import { useNetworkContext } from 'hooks/useNetworkContext'
 import { NetworkHealthState } from 'hooks/useNetworkStatus'
 import { ActionButton } from 'components/ActionButton'
@@ -21,19 +22,20 @@ import {
 } from 'lib/toolbar'
 import { isDesktop } from 'lib/isDesktop'
 import { openExternalBrowserIfDesktop } from 'lib/openWindow'
-import { commandBarActor } from 'machines/commandBarMachine'
 
 export function Toolbar({
   className = '',
   ...props
 }: React.HTMLAttributes<HTMLElement>) {
   const { state, send, context } = useModelingContext()
+  const { commandBarSend } = useCommandsContext()
   const iconClassName =
     'group-disabled:text-chalkboard-50 !text-inherit dark:group-enabled:group-hover:!text-inherit'
   const bgClassName = '!bg-transparent'
   const buttonBgClassName =
     'bg-chalkboard-transparent dark:bg-transparent disabled:bg-transparent dark:disabled:bg-transparent enabled:hover:bg-chalkboard-10 dark:enabled:hover:bg-chalkboard-100 pressed:!bg-primary pressed:enabled:hover:!text-chalkboard-10'
-  const buttonBorderClassName = '!border-transparent'
+  const buttonBorderClassName =
+    '!border-transparent hover:!border-chalkboard-20 dark:enabled:hover:!border-primary pressed:!border-primary ui-open:!border-primary'
 
   const sketchPathId = useMemo(() => {
     if (!isSingleCursorInPipe(context.selectionRanges, kclManager.ast))
@@ -48,7 +50,6 @@ export function Toolbar({
   const { overallState } = useNetworkContext()
   const { isExecuting } = useKclContext()
   const { isStreamReady } = useAppState()
-  const [showRichContent, setShowRichContent] = useState(false)
 
   const disableAllButtons =
     (overallState !== NetworkHealthState.Ok &&
@@ -70,45 +71,12 @@ export function Toolbar({
     () => ({
       modelingState: state,
       modelingSend: send,
+      commandBarSend,
       sketchPathId,
     }),
-    [state, send, commandBarActor.send, sketchPathId]
+    [state, send, commandBarSend, sketchPathId]
   )
 
-  const tooltipContentClassName = !showRichContent
-    ? ''
-    : '!text-left text-wrap !text-xs !p-0 !pb-2 flex gap-2 !max-w-none !w-72 flex-col items-stretch'
-  const richContentTimeout = useRef<number | null>(null)
-  const richContentClearTimeout = useRef<number | null>(null)
-  // On mouse enter, show rich content after a 1s delay
-  const handleMouseEnter = useCallback(() => {
-    // Cancel the clear timeout if it's already set
-    if (richContentClearTimeout.current) {
-      clearTimeout(richContentClearTimeout.current)
-    }
-    // Start our own timeout to show the rich content
-    richContentTimeout.current = window.setTimeout(() => {
-      setShowRichContent(true)
-      if (richContentClearTimeout.current) {
-        clearTimeout(richContentClearTimeout.current)
-      }
-    }, 1000)
-  }, [setShowRichContent])
-  // On mouse leave, clear the timeout and hide rich content
-  const handleMouseLeave = useCallback(() => {
-    // Clear the timeout to show rich content
-    if (richContentTimeout.current) {
-      clearTimeout(richContentTimeout.current)
-    }
-    // Start a timeout to hide the rich content
-    richContentClearTimeout.current = window.setTimeout(() => {
-      setShowRichContent(false)
-      if (richContentClearTimeout.current) {
-        clearTimeout(richContentClearTimeout.current)
-      }
-    }, 500)
-  }, [setShowRichContent])
-
   /**
    * Resolve all the callbacks and values for the current mode,
    * so we don't need to worry about the other modes
@@ -206,64 +174,43 @@ export function Toolbar({
                   status: itemConfig.status,
                 }))}
               >
-                <div
-                  className="contents"
-                  // Mouse events do not fire on disabled buttons
-                  onMouseEnter={handleMouseEnter}
-                  onMouseLeave={handleMouseLeave}
+                <ActionButton
+                  Element="button"
+                  id={maybeIconConfig[0].id}
+                  data-testid={maybeIconConfig[0].id}
+                  iconStart={{
+                    icon: maybeIconConfig[0].icon,
+                    className: iconClassName,
+                    bgClassName: bgClassName,
+                  }}
+                  className={
+                    '!border-transparent !px-0 pressed:!text-chalkboard-10 pressed:enabled:hovered:!text-chalkboard-10 ' +
+                    buttonBgClassName
+                  }
+                  aria-pressed={maybeIconConfig[0].isActive}
+                  disabled={
+                    disableAllButtons ||
+                    maybeIconConfig[0].status !== 'available' ||
+                    maybeIconConfig[0].disabled
+                  }
+                  name={maybeIconConfig[0].title}
+                  // aria-description is still in ARIA 1.3 draft.
+                  // eslint-disable-next-line jsx-a11y/aria-props
+                  aria-description={maybeIconConfig[0].description}
+                  onClick={() =>
+                    maybeIconConfig[0].onClick(configCallbackProps)
+                  }
                 >
-                  <ActionButton
-                    Element="button"
-                    id={maybeIconConfig[0].id}
-                    data-testid={maybeIconConfig[0].id}
-                    iconStart={{
-                      icon: maybeIconConfig[0].icon,
-                      className: iconClassName,
-                      bgClassName: bgClassName,
-                    }}
-                    className={
-                      '!border-transparent !px-0 pressed:!text-chalkboard-10 pressed:enabled:hovered:!text-chalkboard-10 ' +
-                      buttonBgClassName
-                    }
-                    aria-pressed={maybeIconConfig[0].isActive}
-                    disabled={
-                      disableAllButtons ||
-                      maybeIconConfig[0].status !== 'available' ||
-                      maybeIconConfig[0].disabled
-                    }
-                    name={maybeIconConfig[0].title}
-                    // aria-description is still in ARIA 1.3 draft.
-                    // eslint-disable-next-line jsx-a11y/aria-props
-                    aria-description={maybeIconConfig[0].description}
-                    onClick={() =>
-                      maybeIconConfig[0].onClick(configCallbackProps)
-                    }
+                  <span
+                    className={!maybeIconConfig[0].showTitle ? 'sr-only' : ''}
                   >
-                    <span
-                      className={!maybeIconConfig[0].showTitle ? 'sr-only' : ''}
-                    >
-                      {maybeIconConfig[0].title}
-                    </span>
-                    <ToolbarItemTooltip
-                      itemConfig={maybeIconConfig[0]}
-                      configCallbackProps={configCallbackProps}
-                      wrapperClassName="ui-open:!hidden"
-                      contentClassName={tooltipContentClassName}
-                    >
-                      {showRichContent ? (
-                        <ToolbarItemTooltipRichContent
-                          itemConfig={maybeIconConfig[0]}
-                        />
-                      ) : (
-                        <ToolbarItemTooltipShortContent
-                          status={maybeIconConfig[0].status}
-                          title={maybeIconConfig[0].title}
-                          hotkey={maybeIconConfig[0].hotkey}
-                        />
-                      )}
-                    </ToolbarItemTooltip>
-                  </ActionButton>
-                </div>
+                    {maybeIconConfig[0].title}
+                  </span>
+                </ActionButton>
+                <ToolbarItemTooltip
+                  itemConfig={maybeIconConfig[0]}
+                  configCallbackProps={configCallbackProps}
+                />
               </ActionButtonDropdown>
             )
           }
@@ -271,13 +218,7 @@ export function Toolbar({
 
           // A single button
           return (
-            <div
-              className="relative"
-              key={itemConfig.id}
-              // Mouse events do not fire on disabled buttons
-              onMouseEnter={handleMouseEnter}
-              onMouseLeave={handleMouseLeave}
-            >
+            <div className="relative" key={itemConfig.id}>
               <ActionButton
                 Element="button"
                 key={itemConfig.id}
@@ -314,18 +255,7 @@ export function Toolbar({
               <ToolbarItemTooltip
                 itemConfig={itemConfig}
                 configCallbackProps={configCallbackProps}
-                contentClassName={tooltipContentClassName}
-              >
-                {showRichContent ? (
-                  <ToolbarItemTooltipRichContent itemConfig={itemConfig} />
-                ) : (
-                  <ToolbarItemTooltipShortContent
-                    status={itemConfig.status}
-                    title={itemConfig.title}
-                    hotkey={itemConfig.hotkey}
-                  />
-                )}
-              </ToolbarItemTooltip>
+              />
             </div>
           )
         })}
@@ -339,12 +269,6 @@ export function Toolbar({
   )
 }
 
-interface ToolbarItemContentsProps extends React.PropsWithChildren {
-  itemConfig: ToolbarItemResolved
-  configCallbackProps: ToolbarItemCallbackProps
-  wrapperClassName?: string
-  contentClassName?: string
-}
 /**
  * The single button and dropdown button share content, so we extract it here
  * It contains a tooltip with the title, description, and links
@@ -353,10 +277,12 @@ interface ToolbarItemContentsProps extends React.PropsWithChildren {
 const ToolbarItemTooltip = memo(function ToolbarItemContents({
   itemConfig,
   configCallbackProps,
-  wrapperClassName = '',
-  contentClassName = '',
-  children,
-}: ToolbarItemContentsProps) {
+}: {
+  itemConfig: ToolbarItemResolved
+  configCallbackProps: ToolbarItemCallbackProps
+}) {
+  const { state } = useModelingContext()
+
   useHotkeys(
     itemConfig.hotkey || '',
     () => {
@@ -379,50 +305,11 @@ const ToolbarItemTooltip = memo(function ToolbarItemContents({
           ? ({ '-webkit-app-region': 'no-drag' } as React.CSSProperties)
           : {}
       }
-      hoverOnly
       position="bottom"
-      wrapperClassName={'!p-4 !pointer-events-auto ' + wrapperClassName}
-      contentClassName={contentClassName}
-      delay={0}
+      wrapperClassName="!p-4 !pointer-events-auto"
+      contentClassName="!text-left text-wrap !text-xs !p-0 !pb-2 flex gap-2 !max-w-none !w-72 flex-col items-stretch"
     >
-      {children}
-    </Tooltip>
-  )
-})
-
-const ToolbarItemTooltipShortContent = ({
-  status,
-  title,
-  hotkey,
-}: {
-  status: string
-  title: string
-  hotkey?: string | string[]
-}) => (
-  <span
-    className={`text-sm ${
-      status !== 'available' ? 'text-chalkboard-70 dark:text-chalkboard-40' : ''
-    }`}
-  >
-    {title}
-    {hotkey && (
-      <kbd className="inline-block ml-2 flex-none hotkey">{hotkey}</kbd>
-    )}
-  </span>
-)
-
-const ToolbarItemTooltipRichContent = ({
-  itemConfig,
-}: {
-  itemConfig: ToolbarItemResolved
-}) => {
-  const { state } = useModelingContext()
-  return (
-    <>
       <div className="rounded-top flex items-center gap-2 pt-3 pb-2 px-2 bg-chalkboard-20/50 dark:bg-chalkboard-80/50">
-        {itemConfig.icon && (
-          <CustomIcon className="w-5 h-5" name={itemConfig.icon} />
-        )}
         <span
           className={`text-sm flex-1 ${
             itemConfig.status !== 'available'
@@ -491,6 +378,6 @@ const ToolbarItemTooltipRichContent = ({
           </ul>
         </>
       )}
-    </>
+    </Tooltip>
   )
-}
+})

src/clientSideScene/ClientSideSceneComp.tsx

@@ -46,8 +46,8 @@ import {
 } from 'lang/modifyAst'
 import { ActionButton } from 'components/ActionButton'
 import { err, reportRejection, trap } from 'lib/trap'
+import { useCommandsContext } from 'hooks/useCommandsContext'
 import { Node } from 'wasm-lib/kcl/bindings/Node'
-import { commandBarActor } from 'machines/commandBarMachine'
 
 function useShouldHideScene(): { hideClient: boolean; hideServer: boolean } {
   const [isCamMoving, setIsCamMoving] = useState(false)
@@ -510,6 +510,7 @@ const ConstraintSymbol = ({
   constrainInfo: ConstrainInfo
   verticalPosition: 'top' | 'bottom'
 }) => {
+  const { commandBarSend } = useCommandsContext()
   const { context } = useModelingContext()
   const varNameMap: {
     [key in ConstrainInfo['type']]: {
@@ -629,7 +630,7 @@ const ConstraintSymbol = ({
         // disabled={implicitDesc} TODO why does this change styles that are hard to override?
         onClick={toSync(async () => {
           if (!isConstrained) {
-            commandBarActor.send({
+            commandBarSend({
               type: 'Find and select command',
               data: {
                 name: 'Constrain with named value',
@@ -755,6 +756,7 @@ export const CamDebugSettings = () => {
     sceneInfra.camControls.reactCameraProperties
   )
   const [fov, setFov] = useState(12)
+  const { commandBarSend } = useCommandsContext()
 
   useEffect(() => {
     sceneInfra.camControls.setReactCameraPropertiesCallback(setCamSettings)
@@ -773,7 +775,7 @@ export const CamDebugSettings = () => {
         type="checkbox"
         checked={camSettings.type === 'perspective'}
         onChange={() =>
-          commandBarActor.send({
+          commandBarSend({
             type: 'Find and select command',
             data: {
               groupId: 'settings',

src/clientSideScene/sceneEntities.ts

@@ -1398,23 +1398,23 @@ export class SceneEntities {
 
       const arg0 = arg(kclCircle3PointArgs[0])
       if (!arg0) return kclManager.ast
-      arg0[0].value = { value: points[0].x, suffix: 'None' }
+      arg0[0].value = points[0].x
       arg0[0].raw = points[0].x.toString()
-      arg0[1].value = { value: points[0].y, suffix: 'None' }
+      arg0[1].value = points[0].y
       arg0[1].raw = points[0].y.toString()
 
       const arg1 = arg(kclCircle3PointArgs[1])
       if (!arg1) return kclManager.ast
-      arg1[0].value = { value: points[1].x, suffix: 'None' }
+      arg1[0].value = points[1].x
       arg1[0].raw = points[1].x.toString()
-      arg1[1].value = { value: points[1].y, suffix: 'None' }
+      arg1[1].value = points[1].y
       arg1[1].raw = points[1].y.toString()
 
       const arg2 = arg(kclCircle3PointArgs[2])
       if (!arg2) return kclManager.ast
-      arg2[0].value = { value: points[2].x, suffix: 'None' }
+      arg2[0].value = points[2].x
       arg2[0].raw = points[2].x.toString()
-      arg2[1].value = { value: points[2].y, suffix: 'None' }
+      arg2[1].value = points[2].y
       arg2[1].raw = points[2].y.toString()
 
       const astSnapshot = structuredClone(kclManager.ast)
@@ -2051,8 +2051,8 @@ export class SceneEntities {
       )
       if (!(sk instanceof Reason)) {
         sketch = sk
-      } else if (maybeSketch && (maybeSketch.value as Solid)?.sketch) {
-        sketch = (maybeSketch.value as Solid).sketch
+      } else if ((maybeSketch as Solid).sketch) {
+        sketch = (maybeSketch as Solid).sketch
       }
       if (!sketch) return
 
@@ -2541,7 +2541,7 @@ export function sketchFromPathToNode({
   const varDec = _varDec.node
   const result = programMemory.get(varDec?.id?.name || '')
   if (result?.type === 'Solid') {
-    return result.value.sketch
+    return result.sketch
   }
   const sg = sketchFromKclValue(result, varDec?.id?.name)
   if (err(sg)) {

src/clientSideScene/segments.ts

@@ -61,7 +61,6 @@ import { SegmentInputs } from 'lang/std/stdTypes'
 import { err } from 'lib/trap'
 import { editorManager, sceneInfra } from 'lib/singletons'
 import { Selections } from 'lib/selections'
-import { commandBarActor } from 'machines/commandBarMachine'
 
 interface CreateSegmentArgs {
   input: SegmentInputs
@@ -848,7 +847,7 @@ function createLengthIndicator({
     })
 
     // Command Bar
-    commandBarActor.send({
+    editorManager.commandBarSend({
       type: 'Find and select command',
       data: {
         name: 'Constrain length',

src/components/ActionButtonDropdown.tsx

@@ -1,11 +1,9 @@
 import { Popover } from '@headlessui/react'
 import { ActionButtonProps } from './ActionButton'
 import { CustomIcon } from './CustomIcon'
-import Tooltip from './Tooltip'
 
 type ActionButtonSplitProps = ActionButtonProps & { Element: 'button' } & {
   name?: string
-  dropdownTooltipText?: string
   splitMenuItems: {
     id: string
     label: string
@@ -19,7 +17,6 @@ type ActionButtonSplitProps = ActionButtonProps & { Element: 'button' } & {
 export function ActionButtonDropdown({
   splitMenuItems,
   className,
-  dropdownTooltipText = 'More tools',
   children,
   ...props
 }: ActionButtonSplitProps) {
@@ -29,14 +26,7 @@ export function ActionButtonDropdown({
       {({ close }) => (
         <>
           {children}
-          <Popover.Button
-            className={
-              '!border-transparent dark:!border-transparent ' +
-              'bg-chalkboard-transparent dark:bg-transparent disabled:bg-transparent dark:disabled:bg-transparent ' +
-              'enabled:hover:bg-chalkboard-10 dark:enabled:hover:bg-chalkboard-100 ' +
-              'pressed:!bg-primary pressed:enabled:hover:!text-chalkboard-10 p-0 m-0 rounded-none !outline-none ui-open:border-primary ui-open:bg-primary'
-            }
-          >
+          <Popover.Button className="border-transparent dark:border-transparent p-0 m-0 rounded-none !outline-none ui-open:border-primary ui-open:bg-primary">
             <CustomIcon
               name="caretDown"
               className={
@@ -47,14 +37,6 @@ export function ActionButtonDropdown({
             <span className="sr-only">
               {props.name ? props.name + ': ' : ''}open menu
             </span>
-            <Tooltip
-              delay={0}
-              position="bottom"
-              hoverOnly
-              wrapperClassName="ui-open:!hidden"
-            >
-              {dropdownTooltipText}
-            </Tooltip>
           </Popover.Button>
           <Popover.Panel
             as="ul"

src/components/CommandBar/CommandArgOptionInput.tsx

@@ -1,8 +1,8 @@
 import { Combobox } from '@headlessui/react'
 import { useSelector } from '@xstate/react'
 import Fuse from 'fuse.js'
+import { useCommandsContext } from 'hooks/useCommandsContext'
 import { CommandArgument, CommandArgumentOption } from 'lib/commandTypes'
-import { commandBarActor, useCommandBarState } from 'machines/commandBarMachine'
 import { useEffect, useMemo, useRef, useState } from 'react'
 import { AnyStateMachine, StateFrom } from 'xstate'
 
@@ -23,7 +23,7 @@ function CommandArgOptionInput({
   placeholder?: string
 }) {
   const actorContext = useSelector(arg.machineActor, contextSelector)
-  const commandBarState = useCommandBarState()
+  const { commandBarSend, commandBarState } = useCommandsContext()
   const resolvedOptions = useMemo(
     () =>
       typeof arg.options === 'function'
@@ -134,7 +134,6 @@ function CommandArgOptionInput({
           </label>
           <Combobox.Input
             id="option-input"
-            data-testid="cmd-bar-arg-value"
             ref={inputRef}
             onChange={(event) =>
               !event.target.disabled && setQuery(event.target.value)
@@ -142,7 +141,7 @@ function CommandArgOptionInput({
             className="flex-grow px-2 py-1 border-b border-b-chalkboard-100 dark:border-b-chalkboard-80 !bg-transparent focus:outline-none"
             onKeyDown={(event) => {
               if (event.metaKey && event.key === 'k')
-                commandBarActor.send({ type: 'Close' })
+                commandBarSend({ type: 'Close' })
               if (event.key === 'Backspace' && !event.currentTarget.value) {
                 stepBack()
               }

src/components/CommandBar/CommandBar.tsx

@@ -1,5 +1,6 @@
 import { Dialog, Popover, Transition } from '@headlessui/react'
 import { Fragment, useEffect } from 'react'
+import { useCommandsContext } from 'hooks/useCommandsContext'
 import CommandBarArgument from './CommandBarArgument'
 import CommandComboBox from '../CommandComboBox'
 import CommandBarReview from './CommandBarReview'
@@ -7,13 +8,12 @@ import { useLocation } from 'react-router-dom'
 import useHotkeyWrapper from 'lib/hotkeyWrapper'
 import { CustomIcon } from 'components/CustomIcon'
 import Tooltip from 'components/Tooltip'
-import { commandBarActor, useCommandBarState } from 'machines/commandBarMachine'
 
 export const COMMAND_PALETTE_HOTKEY = 'mod+k'
 
 export const CommandBar = () => {
   const { pathname } = useLocation()
-  const commandBarState = useCommandBarState()
+  const { commandBarState, commandBarSend } = useCommandsContext()
   const {
     context: { selectedCommand, currentArgument, commands },
   } = commandBarState
@@ -23,16 +23,16 @@ export const CommandBar = () => {
   // Close the command bar when navigating
   useEffect(() => {
     if (commandBarState.matches('Closed')) return
-    commandBarActor.send({ type: 'Close' })
+    commandBarSend({ type: 'Close' })
   }, [pathname])
 
   // Hook up keyboard shortcuts
   useHotkeyWrapper([COMMAND_PALETTE_HOTKEY], () => {
     if (commandBarState.context.commands.length === 0) return
     if (commandBarState.matches('Closed')) {
-      commandBarActor.send({ type: 'Open' })
+      commandBarSend({ type: 'Open' })
     } else {
-      commandBarActor.send({ type: 'Close' })
+      commandBarSend({ type: 'Close' })
     }
   })
 
@@ -52,14 +52,14 @@ export const CommandBar = () => {
           ...entries[entries.length - 1][1],
         }
 
-        commandBarActor.send({
+        commandBarSend({
           type: 'Edit argument',
           data: {
             arg: currentArg,
           },
         })
       } else {
-        commandBarActor.send({ type: 'Deselect command' })
+        commandBarSend({ type: 'Deselect command' })
       }
     } else {
       const entries = Object.entries(selectedCommand?.args || {})
@@ -68,9 +68,9 @@ export const CommandBar = () => {
       )
 
       if (index === 0) {
-        commandBarActor.send({ type: 'Deselect command' })
+        commandBarSend({ type: 'Deselect command' })
       } else {
-        commandBarActor.send({
+        commandBarSend({
           type: 'Change current argument',
           data: {
             arg: { name: entries[index - 1][0], ...entries[index - 1][1] },
@@ -85,14 +85,14 @@ export const CommandBar = () => {
       show={!commandBarState.matches('Closed') || false}
       afterLeave={() => {
         if (selectedCommand?.onCancel) selectedCommand.onCancel()
-        commandBarActor.send({ type: 'Clear' })
+        commandBarSend({ type: 'Clear' })
       }}
       as={Fragment}
     >
       <WrapperComponent
         open={!commandBarState.matches('Closed') || isSelectionArgument}
         onClose={() => {
-          commandBarActor.send({ type: 'Close' })
+          commandBarSend({ type: 'Close' })
         }}
         className={
           'fixed inset-0 z-50 overflow-y-auto pb-4 pt-1 ' +
@@ -122,7 +122,7 @@ export const CommandBar = () => {
               )
             )}
             <button
-              onClick={() => commandBarActor.send({ type: 'Close' })}
+              onClick={() => commandBarSend({ type: 'Close' })}
               className="group block !absolute left-auto right-full top-[-3px] m-2.5 p-0 border-none bg-transparent hover:bg-transparent"
             >
               <CustomIcon

src/components/CommandBar/CommandBarArgument.tsx

@@ -2,13 +2,13 @@ import CommandArgOptionInput from './CommandArgOptionInput'
 import CommandBarBasicInput from './CommandBarBasicInput'
 import CommandBarSelectionInput from './CommandBarSelectionInput'
 import { CommandArgument } from 'lib/commandTypes'
+import { useCommandsContext } from 'hooks/useCommandsContext'
 import CommandBarHeader from './CommandBarHeader'
 import CommandBarKclInput from './CommandBarKclInput'
 import CommandBarTextareaInput from './CommandBarTextareaInput'
-import { commandBarActor, useCommandBarState } from 'machines/commandBarMachine'
 
 function CommandBarArgument({ stepBack }: { stepBack: () => void }) {
-  const commandBarState = useCommandBarState()
+  const { commandBarState, commandBarSend } = useCommandsContext()
   const {
     context: { currentArgument },
   } = commandBarState
@@ -16,7 +16,7 @@ function CommandBarArgument({ stepBack }: { stepBack: () => void }) {
   function onSubmit(data: unknown) {
     if (!currentArgument) return
 
-    commandBarActor.send({
+    commandBarSend({
       type: 'Submit argument',
       data: {
         [currentArgument.name]: data,

src/components/CommandBar/CommandBarBasicInput.tsx

@@ -1,5 +1,5 @@
+import { useCommandsContext } from 'hooks/useCommandsContext'
 import { CommandArgument } from 'lib/commandTypes'
-import { commandBarActor, useCommandBarState } from 'machines/commandBarMachine'
 import { useEffect, useRef } from 'react'
 import { useHotkeys } from 'react-hotkeys-hook'
 
@@ -15,8 +15,8 @@ function CommandBarBasicInput({
   stepBack: () => void
   onSubmit: (event: unknown) => void
 }) {
-  const commandBarState = useCommandBarState()
-  useHotkeys('mod + k, mod + /', () => commandBarActor.send({ type: 'Close' }))
+  const { commandBarSend, commandBarState } = useCommandsContext()
+  useHotkeys('mod + k, mod + /', () => commandBarSend({ type: 'Close' }))
   const inputRef = useRef<HTMLInputElement>(null)
 
   useEffect(() => {

src/components/CommandBar/CommandBarHeader.tsx

@@ -1,3 +1,4 @@
+import { useCommandsContext } from 'hooks/useCommandsContext'
 import { CustomIcon } from '../CustomIcon'
 import React, { useState } from 'react'
 import { ActionButton } from '../ActionButton'
@@ -6,10 +7,9 @@ import { useHotkeys } from 'react-hotkeys-hook'
 import { KclCommandValue, KclExpressionWithVariable } from 'lib/commandTypes'
 import Tooltip from 'components/Tooltip'
 import { roundOff } from 'lib/utils'
-import { commandBarActor, useCommandBarState } from 'machines/commandBarMachine'
 
 function CommandBarHeader({ children }: React.PropsWithChildren<{}>) {
-  const commandBarState = useCommandBarState()
+  const { commandBarState, commandBarSend } = useCommandsContext()
   const {
     context: { selectedCommand, currentArgument, argumentsToSubmit },
   } = commandBarState
@@ -49,7 +49,7 @@ function CommandBarHeader({ children }: React.PropsWithChildren<{}>) {
         ]
         const arg = selectedCommand?.args[argName]
         if (!argName || !arg) return
-        commandBarActor.send({
+        commandBarSend({
           type: 'Change current argument',
           data: { arg: { ...arg, name: argName } },
         })
@@ -100,7 +100,7 @@ function CommandBarHeader({ children }: React.PropsWithChildren<{}>) {
                     }
                     disabled={!isReviewing && currentArgument?.name === argName}
                     onClick={() => {
-                      commandBarActor.send({
+                      commandBarSend({
                         type: isReviewing
                           ? 'Edit argument'
                           : 'Change current argument',

src/components/CommandBar/CommandBarKclInput.tsx

@@ -7,6 +7,7 @@ import {
 } from '@codemirror/autocomplete'
 import { EditorView, keymap, ViewUpdate } from '@codemirror/view'
 import { CustomIcon } from 'components/CustomIcon'
+import { useCommandsContext } from 'hooks/useCommandsContext'
 import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
 import { CommandArgument, KclCommandValue } from 'lib/commandTypes'
 import { getSystemTheme } from 'lib/theme'
@@ -19,7 +20,6 @@ import styles from './CommandBarKclInput.module.css'
 import { createIdentifier, createVariableDeclaration } from 'lang/modifyAst'
 import { useCodeMirror } from 'components/ModelingSidebar/ModelingPanes/CodeEditor'
 import { useSelector } from '@xstate/react'
-import { commandBarActor, useCommandBarState } from 'machines/commandBarMachine'
 
 const machineContextSelector = (snapshot?: {
   context: Record<string, unknown>
@@ -37,7 +37,7 @@ function CommandBarKclInput({
   stepBack: () => void
   onSubmit: (event: unknown) => void
 }) {
-  const commandBarState = useCommandBarState()
+  const { commandBarSend, commandBarState } = useCommandsContext()
   const previouslySetValue = commandBarState.context.argumentsToSubmit[
     arg.name
   ] as KclCommandValue | undefined
@@ -82,7 +82,7 @@ function CommandBarKclInput({
       false
   )
   const [canSubmit, setCanSubmit] = useState(true)
-  useHotkeys('mod + k, mod + /', () => commandBarActor.send({ type: 'Close' }))
+  useHotkeys('mod + k, mod + /', () => commandBarSend({ type: 'Close' }))
   const editorRef = useRef<HTMLDivElement>(null)
 
   const {

src/components/CommandBar/CommandBarProvider.tsx

@@ -0,0 +1,43 @@
+import { createActorContext } from '@xstate/react'
+import { editorManager } from 'lib/singletons'
+import { commandBarMachine } from 'machines/commandBarMachine'
+import { useEffect } from 'react'
+
+export const CommandsContext = createActorContext(
+  commandBarMachine.provide({
+    guards: {
+      'Command has no arguments': ({ context }) => {
+        return (
+          !context.selectedCommand?.args ||
+          Object.keys(context.selectedCommand?.args).length === 0
+        )
+      },
+      'All arguments are skippable': ({ context }) => {
+        return Object.values(context.selectedCommand!.args!).every(
+          (argConfig) => argConfig.skip
+        )
+      },
+    },
+  })
+)
+
+export const CommandBarProvider = ({
+  children,
+}: {
+  children: React.ReactNode
+}) => {
+  return (
+    <CommandsContext.Provider>
+      <CommandBarProviderInner>{children}</CommandBarProviderInner>
+    </CommandsContext.Provider>
+  )
+}
+function CommandBarProviderInner({ children }: { children: React.ReactNode }) {
+  const commandBarActor = CommandsContext.useActorRef()
+
+  useEffect(() => {
+    editorManager.setCommandBarSend(commandBarActor.send)
+  })
+
+  return children
+}

src/components/CommandBar/CommandBarReview.tsx

@@ -1,9 +1,9 @@
-import { commandBarActor, useCommandBarState } from 'machines/commandBarMachine'
+import { useCommandsContext } from 'hooks/useCommandsContext'
 import CommandBarHeader from './CommandBarHeader'
 import { useHotkeys } from 'react-hotkeys-hook'
 
 function CommandBarReview({ stepBack }: { stepBack: () => void }) {
-  const commandBarState = useCommandBarState()
+  const { commandBarState, commandBarSend } = useCommandsContext()
   const {
     context: { argumentsToSubmit, selectedCommand },
   } = commandBarState
@@ -33,7 +33,7 @@ function CommandBarReview({ stepBack }: { stepBack: () => void }) {
           parseInt(b.keys[0], 10) - 1
         ]
         const arg = selectedCommand?.args[argName]
-        commandBarActor.send({
+        commandBarSend({
           type: 'Edit argument',
           data: { arg: { ...arg, name: argName } },
         })
@@ -50,7 +50,7 @@ function CommandBarReview({ stepBack }: { stepBack: () => void }) {
 
   function submitCommand(e: React.FormEvent<HTMLFormElement>) {
     e.preventDefault()
-    commandBarActor.send({
+    commandBarSend({
       type: 'Submit command',
       output: argumentsToSubmit,
     })

src/components/CommandBar/CommandBarSelectionInput.tsx

@@ -1,4 +1,5 @@
 import { useSelector } from '@xstate/react'
+import { useCommandsContext } from 'hooks/useCommandsContext'
 import { Artifact } from 'lang/std/artifactGraph'
 import { CommandArgument } from 'lib/commandTypes'
 import {
@@ -9,7 +10,6 @@ import {
 import { kclManager } from 'lib/singletons'
 import { reportRejection } from 'lib/trap'
 import { toSync } from 'lib/utils'
-import { commandBarActor, useCommandBarState } from 'machines/commandBarMachine'
 import { modelingMachine } from 'machines/modelingMachine'
 import { useEffect, useMemo, useRef, useState } from 'react'
 import { StateFrom } from 'xstate'
@@ -49,7 +49,7 @@ function CommandBarSelectionInput({
   onSubmit: (data: unknown) => void
 }) {
   const inputRef = useRef<HTMLInputElement>(null)
-  const commandBarState = useCommandBarState()
+  const { commandBarState, commandBarSend } = useCommandsContext()
   const [hasSubmitted, setHasSubmitted] = useState(false)
   const selection = useSelector(arg.machineActor, selectionSelector)
   const selectionsByType = useMemo(() => {
@@ -145,7 +145,7 @@ function CommandBarSelectionInput({
             if (event.key === 'Backspace') {
               stepBack()
             } else if (event.key === 'Escape') {
-              commandBarActor.send({ type: 'Close' })
+              commandBarSend({ type: 'Close' })
             }
           }}
           onChange={handleChange}

src/components/CommandBar/CommandBarTextareaInput.tsx

@@ -1,5 +1,5 @@
+import { useCommandsContext } from 'hooks/useCommandsContext'
 import { CommandArgument } from 'lib/commandTypes'
-import { commandBarActor, useCommandBarState } from 'machines/commandBarMachine'
 import { RefObject, useEffect, useRef } from 'react'
 import { useHotkeys } from 'react-hotkeys-hook'
 
@@ -15,8 +15,8 @@ function CommandBarTextareaInput({
   stepBack: () => void
   onSubmit: (event: unknown) => void
 }) {
-  const commandBarState = useCommandBarState()
-  useHotkeys('mod + k, mod + /', () => commandBarActor.send({ type: 'Close' }))
+  const { commandBarSend, commandBarState } = useCommandsContext()
+  useHotkeys('mod + k, mod + /', () => commandBarSend({ type: 'Close' }))
   const formRef = useRef<HTMLFormElement>(null)
   const inputRef = useRef<HTMLTextAreaElement>(null)
   useTextareaAutoGrow(inputRef)

src/components/CommandBarOpenButton.tsx

@@ -1,15 +1,16 @@
+import { useCommandsContext } from 'hooks/useCommandsContext'
 import usePlatform from 'hooks/usePlatform'
 import { hotkeyDisplay } from 'lib/hotkeyWrapper'
 import { COMMAND_PALETTE_HOTKEY } from './CommandBar/CommandBar'
-import { commandBarActor } from 'machines/commandBarMachine'
 
 export function CommandBarOpenButton() {
+  const { commandBarSend } = useCommandsContext()
   const platform = usePlatform()
 
   return (
     <button
       className="group rounded-full flex items-center justify-center gap-2 px-2 py-1 bg-primary/10 dark:bg-chalkboard-90 dark:backdrop-blur-sm border-primary hover:border-primary dark:border-chalkboard-50 dark:hover:border-inherit text-primary dark:text-inherit"
-      onClick={() => commandBarActor.send({ type: 'Open' })}
+      onClick={() => commandBarSend({ type: 'Open' })}
       data-testid="command-bar-open-button"
     >
       <span>Commands</span>

src/components/CommandComboBox.tsx

@@ -1,11 +1,11 @@
 import { Combobox } from '@headlessui/react'
 import Fuse from 'fuse.js'
+import { useCommandsContext } from 'hooks/useCommandsContext'
 import { Command } from 'lib/commandTypes'
 import { useEffect, useState } from 'react'
 import { CustomIcon } from './CustomIcon'
 import { getActorNextEvents } from 'lib/utils'
 import { sortCommands } from 'lib/commandUtils'
-import { commandBarActor } from 'machines/commandBarMachine'
 
 function CommandComboBox({
   options,
@@ -14,6 +14,7 @@ function CommandComboBox({
   options: Command[]
   placeholder?: string
 }) {
+  const { commandBarSend } = useCommandsContext()
   const [query, setQuery] = useState('')
   const [filteredOptions, setFilteredOptions] = useState<typeof options>()
 
@@ -40,7 +41,7 @@ function CommandComboBox({
   }, [query])
 
   function handleSelection(command: Command) {
-    commandBarActor.send({ type: 'Select command', data: { command } })
+    commandBarSend({ type: 'Select command', data: { command } })
   }
 
   return (
@@ -51,7 +52,6 @@ function CommandComboBox({
           className="w-5 h-5 bg-primary/10 dark:bg-primary text-primary dark:text-inherit"
         />
         <Combobox.Input
-          data-testid="cmd-bar-search"
           onChange={(event) => setQuery(event.target.value)}
           className="w-full bg-transparent focus:outline-none selection:bg-primary/20 dark:selection:bg-primary/40 dark:focus:outline-none"
           onKeyDown={(event) => {
@@ -60,7 +60,7 @@ function CommandComboBox({
               (event.key === 'Backspace' && !event.currentTarget.value)
             ) {
               event.preventDefault()
-              commandBarActor.send({ type: 'Close' })
+              commandBarSend({ type: 'Close' })
             }
           }}
           placeholder={
@@ -85,7 +85,6 @@ function CommandComboBox({
             value={option}
             className="flex items-center gap-4 px-4 py-1.5 first:mt-2 last:mb-2 ui-active:bg-primary/10 dark:ui-active:bg-chalkboard-90 ui-disabled:!text-chalkboard-50"
             disabled={optionIsDisabled(option)}
-            data-testid={`cmd-bar-option`}
           >
             {'icon' in option && option.icon && (
               <CustomIcon name={option.icon} className="w-5 h-5" />

src/components/DebugFeatureTree.tsx

@@ -4,18 +4,18 @@ import { expandPlane, PlaneArtifactRich } from 'lang/std/artifactGraph'
 import { ArtifactGraph } from 'lang/wasm'
 import { DebugDisplayArray, GenericObj } from './DebugDisplayObj'
 
-export function DebugArtifactGraph() {
-  const artifactGraphTree = useMemo(() => {
+export function DebugFeatureTree() {
+  const featureTree = useMemo(() => {
     return computeTree(engineCommandManager.artifactGraph)
   }, [engineCommandManager.artifactGraph])
 
   const filterKeys: string[] = ['__meta', 'codeRef', 'pathToNode']
   return (
     <details data-testid="debug-feature-tree" className="relative">
-      <summary>Artifact Graph</summary>
-      {artifactGraphTree.length > 0 ? (
+      <summary>Feature Tree</summary>
+      {featureTree.length > 0 ? (
         <pre className="text-xs">
-          <DebugDisplayArray arr={artifactGraphTree} filterKeys={filterKeys} />
+          <DebugDisplayArray arr={featureTree} filterKeys={filterKeys} />
         </pre>
       ) : (
         <p>(Empty)</p>

src/components/FileMachineProvider.tsx

@@ -12,6 +12,7 @@ import {
   StateFrom,
   fromPromise,
 } from 'xstate'
+import { useCommandsContext } from 'hooks/useCommandsContext'
 import { fileMachine } from 'machines/fileMachine'
 import { isDesktop } from 'lib/isDesktop'
 import {
@@ -29,7 +30,6 @@ import {
 } from 'lib/getKclSamplesManifest'
 import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
 import { markOnce } from 'lib/performance'
-import { commandBarActor } from 'machines/commandBarMachine'
 
 type MachineContext<T extends AnyStateMachine> = {
   state: StateFrom<T>
@@ -47,6 +47,7 @@ export const FileMachineProvider = ({
   children: React.ReactNode
 }) => {
   const navigate = useNavigate()
+  const { commandBarSend } = useCommandsContext()
   const { settings } = useSettingsAuthContext()
   const { project, file } = useRouteLoaderData(PATHS.FILE) as IndexLoaderData
   const [kclSamples, setKclSamples] = React.useState<KclSamplesManifestItem[]>(
@@ -89,7 +90,7 @@ export const FileMachineProvider = ({
         navigateToFile: ({ context, event }) => {
           if (event.type !== 'xstate.done.actor.create-and-open-file') return
           if (event.output && 'name' in event.output) {
-            commandBarActor.send({ type: 'Close' })
+            commandBarSend({ type: 'Close' })
             navigate(
               `..${PATHS.FILE}/${encodeURIComponent(
                 context.selectedDirectory +
@@ -335,18 +336,15 @@ export const FileMachineProvider = ({
   )
 
   useEffect(() => {
-    commandBarActor.send({
-      type: 'Add commands',
-      data: { commands: kclCommandMemo },
-    })
+    commandBarSend({ type: 'Add commands', data: { commands: kclCommandMemo } })
 
     return () => {
-      commandBarActor.send({
+      commandBarSend({
         type: 'Remove commands',
         data: { commands: kclCommandMemo },
       })
     }
-  }, [commandBarActor.send, kclCommandMemo])
+  }, [commandBarSend, kclCommandMemo])
 
   return (
     <FileContext.Provider

src/components/MachineManagerProvider.tsx

@@ -1,11 +1,11 @@
 import { createContext, useEffect, useState } from 'react'
 
 import { engineCommandManager } from 'lib/singletons'
+import { CommandsContext } from 'components/CommandBar/CommandBarProvider'
 import { isDesktop } from 'lib/isDesktop'
 import { components } from 'lib/machine-api'
 import { reportRejection } from 'lib/trap'
 import { toSync } from 'lib/utils'
-import { commandBarActor } from 'machines/commandBarMachine'
 
 export type MachinesListing = Array<
   components['schemas']['MachineInfoResponse']
@@ -42,6 +42,8 @@ export const MachineManagerProvider = ({
     components['schemas']['MachineInfoResponse'] | null
   >(null)
 
+  const commandBarActor = CommandsContext.useActorRef()
+
   // Get the reason message for why there are no machines.
   const noMachinesReason = (): string | undefined => {
     if (machines.length > 0) {

src/components/ModelingMachineProvider.tsx

@@ -1,4 +1,4 @@
-import { useMachine, useSelector } from '@xstate/react'
+import { useMachine } from '@xstate/react'
 import React, {
   createContext,
   useEffect,
@@ -11,7 +11,6 @@ import {
   AnyStateMachine,
   ContextFrom,
   Prop,
-  SnapshotFrom,
   StateFrom,
   assign,
   fromPromise,
@@ -79,6 +78,7 @@ import toast from 'react-hot-toast'
 import { useLoaderData, useNavigate, useSearchParams } from 'react-router-dom'
 import { letEngineAnimateAndSyncCamAfter } from 'clientSideScene/CameraControls'
 import { err, reportRejection, trap } from 'lib/trap'
+import { useCommandsContext } from 'hooks/useCommandsContext'
 import {
   ExportIntent,
   EngineConnectionStateType,
@@ -91,7 +91,6 @@ import { IndexLoaderData } from 'lib/types'
 import { Node } from 'wasm-lib/kcl/bindings/Node'
 import { promptToEditFlow } from 'lib/promptToEdit'
 import { kclEditorActor } from 'machines/kclEditorMachine'
-import { commandBarActor } from 'machines/commandBarMachine'
 
 type MachineContext<T extends AnyStateMachine> = {
   state: StateFrom<T>
@@ -103,10 +102,6 @@ export const ModelingMachineContext = createContext(
   {} as MachineContext<typeof modelingMachine>
 )
 
-const commandBarIsClosedSelector = (
-  state: SnapshotFrom<typeof commandBarActor>
-) => state.matches('Closed')
-
 export const ModelingMachineProvider = ({
   children,
 }: {
@@ -137,10 +132,8 @@ export const ModelingMachineProvider = ({
   let [searchParams] = useSearchParams()
   const pool = searchParams.get('pool')
 
-  const isCommandBarClosed = useSelector(
-    commandBarActor,
-    commandBarIsClosedSelector
-  )
+  const { commandBarState, commandBarSend } = useCommandsContext()
+
   // Settings machine setup
   // const retrievedSettings = useRef(
   // localStorage?.getItem(MODELING_PERSIST_KEY) || '{}'
@@ -395,16 +388,7 @@ export const ModelingMachineProvider = ({
             }
 
             if (setSelections.selectionType === 'completeSelection') {
-              const codeMirrorSelection = editorManager.createEditorSelection(
-                setSelections.selection
-              )
-              kclEditorActor.send({
-                type: 'setLastSelectionEvent',
-                data: {
-                  codeMirrorSelection,
-                  scrollIntoView: false,
-                },
-              })
+              editorManager.selectRange(setSelections.selection)
               if (!sketchDetails)
                 return {
                   selectionRanges: setSelections.selection,
@@ -545,6 +529,7 @@ export const ModelingMachineProvider = ({
             trimmedPrompt,
             fileMachineSend,
             navigate,
+            commandBarSend,
             context,
             token,
             settings: {
@@ -558,7 +543,7 @@ export const ModelingMachineProvider = ({
         'has valid selection for deletion': ({
           context: { selectionRanges },
         }) => {
-          if (!isCommandBarClosed) return false
+          if (!commandBarState.matches('Closed')) return false
           if (selectionRanges.graphSelections.length <= 0) return false
           return true
         },

src/components/ModelingSidebar/ModelingPanes/DebugPane.tsx

@@ -1,4 +1,4 @@
-import { DebugArtifactGraph } from 'components/DebugArtifactGraph'
+import { DebugFeatureTree } from 'components/DebugFeatureTree'
 import { AstExplorer } from '../../AstExplorer'
 import { EngineCommands } from '../../EngineCommands'
 import { CamDebugSettings } from 'clientSideScene/ClientSideSceneComp'
@@ -14,7 +14,7 @@ export const DebugPane = () => {
           <EngineCommands />
           <CamDebugSettings />
           <AstExplorer />
-          <DebugArtifactGraph />
+          <DebugFeatureTree />
         </div>
       </section>
     </div>

src/components/ModelingSidebar/ModelingPanes/KclEditorMenu.module.css

@@ -3,7 +3,6 @@
   @apply font-mono !no-underline text-xs font-bold select-none text-chalkboard-90;
   @apply ui-active:bg-primary/10 ui-active:text-primary ui-active:text-inherit;
   @apply transition-colors ease-out;
-  @apply m-0;
 }
 
 :global(.dark) .button {

src/components/ModelingSidebar/ModelingPanes/KclEditorMenu.tsx

@@ -9,11 +9,12 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { kclManager } from 'lib/singletons'
 import { openExternalBrowserIfDesktop } from 'lib/openWindow'
 import { reportRejection } from 'lib/trap'
-import { commandBarActor } from 'machines/commandBarMachine'
+import { useCommandsContext } from 'hooks/useCommandsContext'
 
 export const KclEditorMenu = ({ children }: PropsWithChildren) => {
   const { enable: convertToVarEnabled, handleClick: handleConvertToVarClick } =
     useConvertToVariable()
+  const { commandBarSend } = useCommandsContext()
 
   return (
     <Menu>
@@ -84,7 +85,7 @@ export const KclEditorMenu = ({ children }: PropsWithChildren) => {
           <Menu.Item>
             <button
               onClick={() => {
-                commandBarActor.send({
+                commandBarSend({
                   type: 'Find and select command',
                   data: {
                     groupId: 'code',

src/components/ModelingSidebar/ModelingPanes/MemoryPane.tsx

@@ -95,11 +95,9 @@ export const processMemory = (programMemory: ProgramMemory) => {
     ) {
       const sk = sketchFromKclValueOptional(val, key)
       if (val.type === 'Solid') {
-        processedMemory[key] = val.value.value.map(
-          ({ ...rest }: ExtrudeSurface) => {
-            return rest
-          }
-        )
+        processedMemory[key] = val.value.map(({ ...rest }: ExtrudeSurface) => {
+          return rest
+        })
       } else if (!(sk instanceof Reason)) {
         processedMemory[key] = sk.paths.map(({ __geoMeta, ...rest }: Path) => {
           return rest

src/components/ModelingSidebar/ModelingSidebar.tsx

@@ -15,12 +15,12 @@ import { ModelingPane } from './ModelingPane'
 import { isDesktop } from 'lib/isDesktop'
 import { useModelingContext } from 'hooks/useModelingContext'
 import { CustomIconName } from 'components/CustomIcon'
+import { useCommandsContext } from 'hooks/useCommandsContext'
 import { IconDefinition } from '@fortawesome/free-solid-svg-icons'
 import { useKclContext } from 'lang/KclProvider'
 import { MachineManagerContext } from 'components/MachineManagerProvider'
 import { onboardingPaths } from 'routes/Onboarding/paths'
 import { SIDEBAR_BUTTON_SUFFIX } from 'lib/constants'
-import { commandBarActor } from 'machines/commandBarMachine'
 
 interface ModelingSidebarProps {
   paneOpacity: '' | 'opacity-20' | 'opacity-40'
@@ -37,6 +37,7 @@ function getPlatformString(): 'web' | 'desktop' {
 
 export function ModelingSidebar({ paneOpacity }: ModelingSidebarProps) {
   const machineManager = useContext(MachineManagerContext)
+  const { commandBarSend } = useCommandsContext()
   const kclContext = useKclContext()
   const { settings } = useSettingsAuthContext()
   const onboardingStatus = settings.context.app.onboardingStatus
@@ -65,7 +66,7 @@ export function ModelingSidebar({ paneOpacity }: ModelingSidebarProps) {
       icon: 'floppyDiskArrow',
       keybinding: 'Ctrl + Shift + E',
       action: () =>
-        commandBarActor.send({
+        commandBarSend({
           type: 'Find and select command',
           data: { name: 'Export', groupId: 'modeling' },
         }),
@@ -78,7 +79,7 @@ export function ModelingSidebar({ paneOpacity }: ModelingSidebarProps) {
       keybinding: 'Ctrl + Shift + M',
       // eslint-disable-next-line @typescript-eslint/no-misused-promises
       action: async () => {
-        commandBarActor.send({
+        commandBarSend({
           type: 'Find and select command',
           data: { name: 'Make', groupId: 'modeling' },
         })

src/components/NetworkHealthIndicator.test.tsx

@@ -1,6 +1,7 @@
 import { fireEvent, render, screen } from '@testing-library/react'
 import { BrowserRouter } from 'react-router-dom'
 import { SettingsAuthProviderJest } from './SettingsAuthProvider'
+import { CommandBarProvider } from './CommandBar/CommandBarProvider'
 import {
   NETWORK_HEALTH_TEXT,
   NetworkHealthIndicator,
@@ -11,7 +12,9 @@ function TestWrap({ children }: { children: React.ReactNode }) {
   // wrap in router and xState context
   return (
     <BrowserRouter>
-      <SettingsAuthProviderJest>{children}</SettingsAuthProviderJest>
+      <CommandBarProvider>
+        <SettingsAuthProviderJest>{children}</SettingsAuthProviderJest>
+      </CommandBarProvider>
     </BrowserRouter>
   )
 }

src/components/ProjectSidebarMenu.test.tsx

@@ -2,6 +2,7 @@ import { render, screen } from '@testing-library/react'
 import { BrowserRouter } from 'react-router-dom'
 import ProjectSidebarMenu from './ProjectSidebarMenu'
 import { SettingsAuthProviderJest } from './SettingsAuthProvider'
+import { CommandBarProvider } from './CommandBar/CommandBarProvider'
 import { Project } from 'lib/project'
 
 const now = new Date()
@@ -32,9 +33,11 @@ describe('ProjectSidebarMenu tests', () => {
   test('Disables popover menu by default', () => {
     render(
       <BrowserRouter>
-        <SettingsAuthProviderJest>
-          <ProjectSidebarMenu project={projectWellFormed} />
-        </SettingsAuthProviderJest>
+        <CommandBarProvider>
+          <SettingsAuthProviderJest>
+            <ProjectSidebarMenu project={projectWellFormed} />
+          </SettingsAuthProviderJest>
+        </CommandBarProvider>
       </BrowserRouter>
     )
 

src/components/ProjectSidebarMenu.tsx

@@ -7,6 +7,7 @@ import { Link, useLocation, useNavigate } from 'react-router-dom'
 import { Fragment, useMemo, useContext } from 'react'
 import { Logo } from './Logo'
 import { APP_NAME } from 'lib/constants'
+import { useCommandsContext } from 'hooks/useCommandsContext'
 import { CustomIcon } from './CustomIcon'
 import { useLspContext } from './LspProvider'
 import { engineCommandManager, kclManager } from 'lib/singletons'
@@ -14,9 +15,6 @@ import { MachineManagerContext } from 'components/MachineManagerProvider'
 import usePlatform from 'hooks/usePlatform'
 import { useAbsoluteFilePath } from 'hooks/useAbsoluteFilePath'
 import Tooltip from './Tooltip'
-import { SnapshotFrom } from 'xstate'
-import { commandBarActor } from 'machines/commandBarMachine'
-import { useSelector } from '@xstate/react'
 
 const ProjectSidebarMenu = ({
   project,
@@ -86,9 +84,6 @@ function AppLogoLink({
   )
 }
 
-const commandsSelector = (state: SnapshotFrom<typeof commandBarActor>) =>
-  state.context.commands
-
 function ProjectMenuPopover({
   project,
   file,
@@ -101,14 +96,16 @@ function ProjectMenuPopover({
   const navigate = useNavigate()
   const filePath = useAbsoluteFilePath()
   const machineManager = useContext(MachineManagerContext)
-  const commands = useSelector(commandBarActor, commandsSelector)
 
+  const { commandBarState, commandBarSend } = useCommandsContext()
   const { onProjectClose } = useLspContext()
   const exportCommandInfo = { name: 'Export', groupId: 'modeling' }
   const makeCommandInfo = { name: 'Make', groupId: 'modeling' }
   const findCommand = (obj: { name: string; groupId: string }) =>
     Boolean(
-      commands.find((c) => c.name === obj.name && c.groupId === obj.groupId)
+      commandBarState.context.commands.find(
+        (c) => c.name === obj.name && c.groupId === obj.groupId
+      )
     )
   const machineCount = machineManager.machines.length
 
@@ -153,7 +150,7 @@ function ProjectMenuPopover({
           ),
           disabled: !findCommand(exportCommandInfo),
           onClick: () =>
-            commandBarActor.send({
+            commandBarSend({
               type: 'Find and select command',
               data: exportCommandInfo,
             }),
@@ -178,7 +175,7 @@ function ProjectMenuPopover({
           ),
           disabled: !findCommand(makeCommandInfo) || machineCount === 0,
           onClick: () => {
-            commandBarActor.send({
+            commandBarSend({
               type: 'Find and select command',
               data: makeCommandInfo,
             })
@@ -203,7 +200,7 @@ function ProjectMenuPopover({
     [
       platform,
       findCommand,
-      commandBarActor.send,
+      commandBarSend,
       engineCommandManager,
       onProjectClose,
       isDesktop,

src/components/ProjectsContextProvider.tsx

@@ -1,4 +1,5 @@
 import { useMachine } from '@xstate/react'
+import { useCommandsContext } from 'hooks/useCommandsContext'
 import { useFileSystemWatcher } from 'hooks/useFileSystemWatcher'
 import { useProjectsLoader } from 'hooks/useProjectsLoader'
 import { projectsMachine } from 'machines/projectsMachine'
@@ -17,13 +18,11 @@ import {
   getNextProjectIndex,
   interpolateProjectNameWithIndex,
   doesProjectNameNeedInterpolated,
-  getUniqueProjectName,
 } from 'lib/desktopFS'
 import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
 import useStateMachineCommands from 'hooks/useStateMachineCommands'
 import { projectsCommandBarConfig } from 'lib/commandBarConfigs/projectsCommandConfig'
 import { isDesktop } from 'lib/isDesktop'
-import { commandBarActor } from 'machines/commandBarMachine'
 
 type MachineContext<T extends AnyStateMachine> = {
   state?: StateFrom<T>
@@ -73,6 +72,7 @@ const ProjectsContextDesktop = ({
 }) => {
   const navigate = useNavigate()
   const location = useLocation()
+  const { commandBarSend } = useCommandsContext()
   const { onProjectOpen } = useLspContext()
   const {
     settings: { context: settings },
@@ -125,7 +125,7 @@ const ProjectsContextDesktop = ({
               },
               null
             )
-            commandBarActor.send({ type: 'Close' })
+            commandBarSend({ type: 'Close' })
             const newPathName = `${PATHS.FILE}/${encodeURIComponent(
               projectPath
             )}`
@@ -195,12 +195,16 @@ const ProjectsContextDesktop = ({
               : settings.projects.defaultProjectName.current
           ).trim()
 
-          const uniqueName = getUniqueProjectName(name, input.projects)
-          await createNewProjectDirectory(uniqueName)
+          if (doesProjectNameNeedInterpolated(name)) {
+            const nextIndex = getNextProjectIndex(name, input.projects)
+            name = interpolateProjectNameWithIndex(name, nextIndex)
+          }
+
+          await createNewProjectDirectory(name)
 
           return {
-            message: `Successfully created "${uniqueName}"`,
-            name: uniqueName,
+            message: `Successfully created "${name}"`,
+            name,
           }
         }),
         renameProject: fromPromise(async ({ input }) => {

src/components/SettingsAuthProvider.tsx

@@ -29,6 +29,7 @@ import {
   createSettingsCommand,
   settingsWithCommandConfigs,
 } from 'lib/commandBarConfigs/settingsCommandConfig'
+import { useCommandsContext } from 'hooks/useCommandsContext'
 import { Command } from 'lib/commandTypes'
 import { BaseUnit } from 'lib/settings/settingsTypes'
 import {
@@ -41,7 +42,6 @@ import { isDesktop } from 'lib/isDesktop'
 import { useFileSystemWatcher } from 'hooks/useFileSystemWatcher'
 import { codeManager } from 'lib/singletons'
 import { createRouteCommands } from 'lib/commandBarConfigs/routeCommandConfig'
-import { commandBarActor } from 'machines/commandBarMachine'
 
 type MachineContext<T extends AnyStateMachine> = {
   state: StateFrom<T>
@@ -109,6 +109,7 @@ export const SettingsAuthProviderBase = ({
 }) => {
   const location = useLocation()
   const navigate = useNavigate()
+  const { commandBarSend } = useCommandsContext()
   const [settingsPath, setSettingsPath] = useState<string | undefined>(
     undefined
   )
@@ -277,10 +278,10 @@ export const SettingsAuthProviderBase = ({
       )
       .filter((c) => c !== null) as Command[]
 
-    commandBarActor.send({ type: 'Add commands', data: { commands: commands } })
+    commandBarSend({ type: 'Add commands', data: { commands: commands } })
 
     return () => {
-      commandBarActor.send({
+      commandBarSend({
         type: 'Remove commands',
         data: { commands },
       })
@@ -289,7 +290,7 @@ export const SettingsAuthProviderBase = ({
     settingsState,
     settingsSend,
     settingsActor,
-    commandBarActor.send,
+    commandBarSend,
     settingsWithCommandConfigs,
   ])
 
@@ -302,7 +303,7 @@ export const SettingsAuthProviderBase = ({
       encodeURIComponent(loadedProject?.file?.path || BROWSER_PATH)
     const { RouteTelemetryCommand, RouteHomeCommand, RouteSettingsCommand } =
       createRouteCommands(navigate, location, filePath)
-    commandBarActor.send({
+    commandBarSend({
       type: 'Remove commands',
       data: {
         commands: [
@@ -313,12 +314,12 @@ export const SettingsAuthProviderBase = ({
       },
     })
     if (location.pathname === PATHS.HOME) {
-      commandBarActor.send({
+      commandBarSend({
         type: 'Add commands',
         data: { commands: [RouteTelemetryCommand, RouteSettingsCommand] },
       })
     } else if (location.pathname.includes(PATHS.FILE)) {
-      commandBarActor.send({
+      commandBarSend({
         type: 'Add commands',
         data: {
           commands: [

src/components/Stream.tsx

@@ -17,11 +17,10 @@ import {
 import { useRouteLoaderData } from 'react-router-dom'
 import { PATHS } from 'lib/paths'
 import { IndexLoaderData } from 'lib/types'
+import { useCommandsContext } from 'hooks/useCommandsContext'
 import { err, reportRejection } from 'lib/trap'
 import { getArtifactOfTypes } from 'lang/std/artifactGraph'
 import { ViewControlContextMenu } from './ViewControlMenu'
-import { commandBarActor, useCommandBarState } from 'machines/commandBarMachine'
-import { useSelector } from '@xstate/react'
 
 enum StreamState {
   Playing = 'playing',
@@ -36,7 +35,7 @@ export const Stream = () => {
   const videoRef = useRef<HTMLVideoElement>(null)
   const { settings } = useSettingsAuthContext()
   const { state, send } = useModelingContext()
-  const commandBarState = useCommandBarState()
+  const { commandBarState } = useCommandsContext()
   const { mediaStream } = useAppStream()
   const { overallState, immediateState } = useNetworkContext()
   const [streamState, setStreamState] = useState(StreamState.Unset)

src/components/ToastTextToCad.tsx

@@ -28,7 +28,7 @@ import { base64Decode } from 'lang/wasm'
 import { sendTelemetry } from 'lib/textToCad'
 import { Themes } from 'lib/theme'
 import { ActionButton } from './ActionButton'
-import { commandBarActor, commandBarMachine } from 'machines/commandBarMachine'
+import { commandBarMachine } from 'machines/commandBarMachine'
 import { EventFrom } from 'xstate'
 import { fileMachine } from 'machines/fileMachine'
 import { reportRejection } from 'lib/trap'
@@ -43,10 +43,15 @@ export function ToastTextToCadError({
   toastId,
   message,
   prompt,
+  commandBarSend,
 }: {
   toastId: string
   message: string
   prompt: string
+  commandBarSend: (
+    event: EventFrom<typeof commandBarMachine>,
+    data?: unknown
+  ) => void
 }) {
   return (
     <div className="flex flex-col justify-between gap-6">
@@ -76,7 +81,7 @@ export function ToastTextToCadError({
           }}
           name="Edit prompt"
           onClick={() => {
-            commandBarActor.send({
+            commandBarSend({
               type: 'Find and select command',
               data: {
                 groupId: 'modeling',

src/components/UserSidebarMenu.test.tsx

@@ -8,6 +8,7 @@ import {
 } from 'react-router-dom'
 import { Models } from '@kittycad/lib'
 import { SettingsAuthProviderJest } from './SettingsAuthProvider'
+import { CommandBarProvider } from './CommandBar/CommandBarProvider'
 
 type User = Models['User_type']
 
@@ -123,7 +124,9 @@ function TestWrap({ children }: { children: React.ReactNode }) {
       <Route
         path="/file/:id"
         element={
-          <SettingsAuthProviderJest>{children}</SettingsAuthProviderJest>
+          <CommandBarProvider>
+            <SettingsAuthProviderJest>{children}</SettingsAuthProviderJest>
+          </CommandBarProvider>
         }
       />
     ),

src/editor/manager.ts

@@ -5,6 +5,7 @@ import { engineCommandManager, kclManager } from 'lib/singletons'
 import { modelingMachine, ModelingMachineEvent } from 'machines/modelingMachine'
 import { Selections, Selection, processCodeMirrorRanges } from 'lib/selections'
 import { undo, redo } from '@codemirror/commands'
+import { CommandBarMachineEvent } from 'machines/commandBarMachine'
 import { addLineHighlight, addLineHighlightEvent } from './highlightextension'
 import {
   Diagnostic,
@@ -51,6 +52,9 @@ export default class EditorManager {
   private _modelingSend: (eventInfo: ModelingMachineEvent) => void = () => {}
   private _modelingState: StateFrom<typeof modelingMachine> | null = null
 
+  private _commandBarSend: (eventInfo: CommandBarMachineEvent) => void =
+    () => {}
+
   private _convertToVariableEnabled: boolean = false
   private _convertToVariableCallback: () => void = () => {}
 
@@ -157,6 +161,14 @@ export default class EditorManager {
     this._modelingState = state
   }
 
+  setCommandBarSend(send: (eventInfo: CommandBarMachineEvent) => void) {
+    this._commandBarSend = send
+  }
+
+  commandBarSend(eventInfo: CommandBarMachineEvent): void {
+    return this._commandBarSend(eventInfo)
+  }
+
   get highlightRange(): Array<[number, number]> {
     return this._highlightRange
   }
@@ -303,21 +315,6 @@ export default class EditorManager {
     if (selections?.graphSelections?.length === 0) {
       return
     }
-
-    if (!this._editorView) {
-      return
-    }
-    const codeBaseSelections = this.createEditorSelection(selections)
-    this._editorView.dispatch({
-      selection: codeBaseSelections,
-      annotations: [
-        updateOutsideEditorEvent,
-        Transaction.addToHistory.of(false),
-      ],
-    })
-  }
-
-  createEditorSelection(selections: Selections) {
     let codeBasedSelections = []
     for (const selection of selections.graphSelections) {
       const safeEnd = Math.min(
@@ -334,7 +331,18 @@ export default class EditorManager {
         .range[1]
     const safeEnd = Math.min(end, this._editorView?.state.doc.length || end)
     codeBasedSelections.push(EditorSelection.cursor(safeEnd))
-    return EditorSelection.create(codeBasedSelections, 1)
+
+    if (!this._editorView) {
+      return
+    }
+
+    this._editorView.dispatch({
+      selection: EditorSelection.create(codeBasedSelections, 1),
+      annotations: [
+        updateOutsideEditorEvent,
+        Transaction.addToHistory.of(false),
+      ],
+    })
   }
 
   // We will ONLY get here if the user called a select event.

src/hooks/useCommandsContext.ts

@@ -0,0 +1,10 @@
+import { CommandsContext } from 'components/CommandBar/CommandBarProvider'
+
+export const useCommandsContext = () => {
+  const commandBarActor = CommandsContext.useActorRef()
+  const commandBarState = CommandsContext.useSelector((state) => state)
+  return {
+    commandBarSend: commandBarActor.send,
+    commandBarState,
+  }
+}

src/hooks/useStateMachineCommands.ts

@@ -1,6 +1,7 @@
 import { useEffect } from 'react'
 import { AnyStateMachine, Actor, StateFrom, EventFrom } from 'xstate'
 import { createMachineCommand } from '../lib/createMachineCommand'
+import { useCommandsContext } from './useCommandsContext'
 import { modelingMachine } from 'machines/modelingMachine'
 import { authMachine } from 'machines/authMachine'
 import { settingsMachine } from 'machines/settingsMachine'
@@ -14,7 +15,6 @@ import { useKclContext } from 'lang/KclProvider'
 import { useNetworkContext } from 'hooks/useNetworkContext'
 import { NetworkHealthState } from 'hooks/useNetworkStatus'
 import { useAppState } from 'AppState'
-import { commandBarActor } from 'machines/commandBarMachine'
 
 // This might not be necessary, AnyStateMachine from xstate is working
 export type AllMachines =
@@ -48,6 +48,7 @@ export default function useStateMachineCommands<
   allCommandsRequireNetwork = false,
   onCancel,
 }: UseStateMachineCommandsArgs<T, S>) {
+  const { commandBarSend } = useCommandsContext()
   const { overallState } = useNetworkContext()
   const { isExecuting } = useKclContext()
   const { isStreamReady } = useAppState()
@@ -75,13 +76,10 @@ export default function useStateMachineCommands<
       })
       .filter((c) => c !== null) as Command[] // TS isn't smart enough to know this filter removes nulls
 
-    commandBarActor.send({
-      type: 'Add commands',
-      data: { commands: newCommands },
-    })
+    commandBarSend({ type: 'Add commands', data: { commands: newCommands } })
 
     return () => {
-      commandBarActor.send({
+      commandBarSend({
         type: 'Remove commands',
         data: { commands: newCommands },
       })

src/lang/abstractSyntaxTree.test.ts

@@ -24,10 +24,7 @@ describe('testing AST', () => {
             type: 'Literal',
             start: 0,
             end: 1,
-            value: {
-              suffix: 'None',
-              value: 5,
-            },
+            value: 5,
             raw: '5',
           },
           operator: '+',
@@ -35,10 +32,7 @@ describe('testing AST', () => {
             type: 'Literal',
             start: 3,
             end: 4,
-            value: {
-              suffix: 'None',
-              value: 6,
-            },
+            value: 6,
             raw: '6',
           },
         },

src/lang/artifact.test.ts

@@ -54,9 +54,6 @@ const mySketch001 = startSketchOn('XY')
           },
         ],
         id: expect.any(String),
-        units: {
-          type: 'Mm',
-        },
         __meta: [{ sourceRange: [46, 71, 0] }],
       },
     })
@@ -75,65 +72,56 @@ const mySketch001 = startSketchOn('XY')
     const sketch001 = execState.memory.get('mySketch001')
     expect(sketch001).toEqual({
       type: 'Solid',
-      value: {
-        type: 'Solid',
+      id: expect.any(String),
+      value: [
+        {
+          type: 'extrudePlane',
+          faceId: expect.any(String),
+          tag: null,
+          id: expect.any(String),
+          sourceRange: [77, 102, 0],
+        },
+        {
+          type: 'extrudePlane',
+          faceId: expect.any(String),
+          tag: null,
+          id: expect.any(String),
+          sourceRange: [108, 132, 0],
+        },
+      ],
+      sketch: {
         id: expect.any(String),
-        value: [
+        __meta: expect.any(Array),
+        on: expect.any(Object),
+        start: expect.any(Object),
+        type: 'Sketch',
+        paths: [
           {
-            type: 'extrudePlane',
-            faceId: expect.any(String),
+            type: 'ToPoint',
+            from: [0, 0],
+            to: [-1.59, -1.54],
             tag: null,
-            id: expect.any(String),
-            sourceRange: [77, 102, 0],
+            __geoMeta: {
+              id: expect.any(String),
+              sourceRange: [77, 102, 0],
+            },
           },
           {
-            type: 'extrudePlane',
-            faceId: expect.any(String),
+            type: 'ToPoint',
+            from: [-1.59, -1.54],
+            to: [0.46, -5.82],
             tag: null,
-            id: expect.any(String),
-            sourceRange: [108, 132, 0],
+            __geoMeta: {
+              id: expect.any(String),
+              sourceRange: [108, 132, 0],
+            },
           },
         ],
-        sketch: {
-          id: expect.any(String),
-          units: {
-            type: 'Mm',
-          },
-          __meta: expect.any(Array),
-          on: expect.any(Object),
-          start: expect.any(Object),
-          type: 'Sketch',
-          paths: [
-            {
-              type: 'ToPoint',
-              from: [0, 0],
-              to: [-1.59, -1.54],
-              tag: null,
-              __geoMeta: {
-                id: expect.any(String),
-                sourceRange: [77, 102, 0],
-              },
-            },
-            {
-              type: 'ToPoint',
-              from: [-1.59, -1.54],
-              to: [0.46, -5.82],
-              tag: null,
-              __geoMeta: {
-                id: expect.any(String),
-                sourceRange: [108, 132, 0],
-              },
-            },
-          ],
-        },
-        height: 2,
-        startCapId: expect.any(String),
-        endCapId: expect.any(String),
-        units: {
-          type: 'Mm',
-        },
-        __meta: [{ sourceRange: [46, 71, 0] }],
       },
+      height: 2,
+      startCapId: expect.any(String),
+      endCapId: expect.any(String),
+      __meta: [{ sourceRange: [46, 71, 0] }],
     })
   })
   test('sketch extrude and sketch on one of the faces', async () => {
@@ -166,205 +154,187 @@ const sk2 = startSketchOn('XY')
     expect(geos).toEqual([
       {
         type: 'Solid',
-        value: {
-          type: 'Solid',
+        id: expect.any(String),
+        value: [
+          {
+            type: 'extrudePlane',
+            faceId: expect.any(String),
+            tag: null,
+            id: expect.any(String),
+            sourceRange: [69, 89, 0],
+          },
+          {
+            type: 'extrudePlane',
+            faceId: expect.any(String),
+            tag: {
+              end: 116,
+              start: 114,
+              type: 'TagDeclarator',
+              value: 'p',
+            },
+            id: expect.any(String),
+            sourceRange: [95, 117, 0],
+          },
+          {
+            type: 'extrudePlane',
+            faceId: expect.any(String),
+            tag: null,
+            id: expect.any(String),
+            sourceRange: [123, 142, 0],
+          },
+        ],
+        sketch: {
           id: expect.any(String),
-          value: [
+          __meta: expect.any(Array),
+          on: expect.any(Object),
+          start: expect.any(Object),
+          type: 'Sketch',
+          tags: {
+            p: {
+              __meta: [
+                {
+                  sourceRange: [114, 116, 0],
+                },
+              ],
+              type: 'TagIdentifier',
+              value: 'p',
+              info: expect.any(Object),
+            },
+          },
+          paths: [
             {
-              type: 'extrudePlane',
-              faceId: expect.any(String),
+              type: 'ToPoint',
+              from: [0, 0],
+              to: [-2.5, 0],
               tag: null,
-              id: expect.any(String),
-              sourceRange: [69, 89, 0],
+              __geoMeta: {
+                id: expect.any(String),
+                sourceRange: [69, 89, 0],
+              },
             },
             {
-              type: 'extrudePlane',
-              faceId: expect.any(String),
+              type: 'ToPoint',
+              from: [-2.5, 0],
+              to: [0, 10],
               tag: {
                 end: 116,
                 start: 114,
                 type: 'TagDeclarator',
                 value: 'p',
               },
-              id: expect.any(String),
-              sourceRange: [95, 117, 0],
+              __geoMeta: {
+                id: expect.any(String),
+                sourceRange: [95, 117, 0],
+              },
             },
             {
-              type: 'extrudePlane',
-              faceId: expect.any(String),
+              type: 'ToPoint',
+              from: [0, 10],
+              to: [2.5, 0],
               tag: null,
-              id: expect.any(String),
-              sourceRange: [123, 142, 0],
+              __geoMeta: {
+                id: expect.any(String),
+                sourceRange: [123, 142, 0],
+              },
             },
           ],
-          sketch: {
-            id: expect.any(String),
-            __meta: expect.any(Array),
-            on: expect.any(Object),
-            start: expect.any(Object),
-            type: 'Sketch',
-            units: {
-              type: 'Mm',
-            },
-            tags: {
-              p: {
-                __meta: [
-                  {
-                    sourceRange: [114, 116, 0],
-                  },
-                ],
-                type: 'TagIdentifier',
-                value: 'p',
-                info: expect.any(Object),
-              },
-            },
-            paths: [
-              {
-                type: 'ToPoint',
-                from: [0, 0],
-                to: [-2.5, 0],
-                tag: null,
-                __geoMeta: {
-                  id: expect.any(String),
-                  sourceRange: [69, 89, 0],
-                },
-              },
-              {
-                type: 'ToPoint',
-                from: [-2.5, 0],
-                to: [0, 10],
-                tag: {
-                  end: 116,
-                  start: 114,
-                  type: 'TagDeclarator',
-                  value: 'p',
-                },
-                __geoMeta: {
-                  id: expect.any(String),
-                  sourceRange: [95, 117, 0],
-                },
-              },
-              {
-                type: 'ToPoint',
-                from: [0, 10],
-                to: [2.5, 0],
-                tag: null,
-                __geoMeta: {
-                  id: expect.any(String),
-                  sourceRange: [123, 142, 0],
-                },
-              },
-            ],
-          },
-          height: 2,
-          startCapId: expect.any(String),
-          endCapId: expect.any(String),
-          units: {
-            type: 'Mm',
-          },
-          __meta: [{ sourceRange: [38, 63, 0] }],
         },
+        height: 2,
+        startCapId: expect.any(String),
+        endCapId: expect.any(String),
+        __meta: [{ sourceRange: [38, 63, 0] }],
       },
       {
         type: 'Solid',
-        value: {
-          type: 'Solid',
+        id: expect.any(String),
+        value: [
+          {
+            type: 'extrudePlane',
+            faceId: expect.any(String),
+            tag: null,
+            id: expect.any(String),
+            sourceRange: [373, 393, 0],
+          },
+          {
+            type: 'extrudePlane',
+            faceId: expect.any(String),
+            tag: {
+              end: 419,
+              start: 417,
+              type: 'TagDeclarator',
+              value: 'o',
+            },
+            id: expect.any(String),
+            sourceRange: [399, 420, 0],
+          },
+          {
+            type: 'extrudePlane',
+            faceId: expect.any(String),
+            tag: null,
+            id: expect.any(String),
+            sourceRange: [426, 445, 0],
+          },
+        ],
+        sketch: {
           id: expect.any(String),
-          value: [
+          __meta: expect.any(Array),
+          on: expect.any(Object),
+          start: expect.any(Object),
+          type: 'Sketch',
+          tags: {
+            o: {
+              __meta: [
+                {
+                  sourceRange: [417, 419, 0],
+                },
+              ],
+              type: 'TagIdentifier',
+              value: 'o',
+              info: expect.any(Object),
+            },
+          },
+          paths: [
             {
-              type: 'extrudePlane',
-              faceId: expect.any(String),
+              type: 'ToPoint',
+              from: [0, 0],
+              to: [-2.5, 0],
               tag: null,
-              id: expect.any(String),
-              sourceRange: [373, 393, 0],
+              __geoMeta: {
+                id: expect.any(String),
+                sourceRange: [373, 393, 0],
+              },
             },
             {
-              type: 'extrudePlane',
-              faceId: expect.any(String),
+              type: 'ToPoint',
+              from: [-2.5, 0],
+              to: [0, 3],
               tag: {
                 end: 419,
                 start: 417,
                 type: 'TagDeclarator',
                 value: 'o',
               },
-              id: expect.any(String),
-              sourceRange: [399, 420, 0],
+              __geoMeta: {
+                id: expect.any(String),
+                sourceRange: [399, 420, 0],
+              },
             },
             {
-              type: 'extrudePlane',
-              faceId: expect.any(String),
+              type: 'ToPoint',
+              from: [0, 3],
+              to: [2.5, 0],
               tag: null,
-              id: expect.any(String),
-              sourceRange: [426, 445, 0],
+              __geoMeta: {
+                id: expect.any(String),
+                sourceRange: [426, 445, 0],
+              },
             },
           ],
-          sketch: {
-            id: expect.any(String),
-            units: {
-              type: 'Mm',
-            },
-            __meta: expect.any(Array),
-            on: expect.any(Object),
-            start: expect.any(Object),
-            type: 'Sketch',
-            tags: {
-              o: {
-                __meta: [
-                  {
-                    sourceRange: [417, 419, 0],
-                  },
-                ],
-                type: 'TagIdentifier',
-                value: 'o',
-                info: expect.any(Object),
-              },
-            },
-            paths: [
-              {
-                type: 'ToPoint',
-                from: [0, 0],
-                to: [-2.5, 0],
-                tag: null,
-                __geoMeta: {
-                  id: expect.any(String),
-                  sourceRange: [373, 393, 0],
-                },
-              },
-              {
-                type: 'ToPoint',
-                from: [-2.5, 0],
-                to: [0, 3],
-                tag: {
-                  end: 419,
-                  start: 417,
-                  type: 'TagDeclarator',
-                  value: 'o',
-                },
-                __geoMeta: {
-                  id: expect.any(String),
-                  sourceRange: [399, 420, 0],
-                },
-              },
-              {
-                type: 'ToPoint',
-                from: [0, 3],
-                to: [2.5, 0],
-                tag: null,
-                __geoMeta: {
-                  id: expect.any(String),
-                  sourceRange: [426, 445, 0],
-                },
-              },
-            ],
-          },
-          height: 2,
-          startCapId: expect.any(String),
-          endCapId: expect.any(String),
-          __meta: [{ sourceRange: [342, 367, 0] }],
-          units: {
-            type: 'Mm',
-          },
         },
+        height: 2,
+        startCapId: expect.any(String),
+        endCapId: expect.any(String),
+        __meta: [{ sourceRange: [342, 367, 0] }],
       },
     ])
   })

src/lang/executor.test.ts

@@ -221,9 +221,6 @@ const newVar = myVar + 1`
           },
         ],
         id: expect.any(String),
-        units: {
-          type: 'Mm',
-        },
         __meta: [{ sourceRange: [39, 63, 0] }],
       },
     })

src/lang/modifyAst.test.ts

@@ -39,7 +39,7 @@ describe('Testing createLiteral', () => {
   it('should create a literal', () => {
     const result = createLiteral(5)
     expect(result.type).toBe('Literal')
-    expect((result as any).value.value).toBe(5)
+    expect(result.value).toBe(5)
   })
 })
 describe('Testing createIdentifier', () => {
@@ -56,7 +56,7 @@ describe('Testing createCallExpression', () => {
     expect(result.callee.type).toBe('Identifier')
     expect(result.callee.name).toBe('myFunc')
     expect(result.arguments[0].type).toBe('Literal')
-    expect((result.arguments[0] as any).value.value).toBe(5)
+    expect((result.arguments[0] as any).value).toBe(5)
   })
 })
 describe('Testing createObjectExpression', () => {
@@ -68,7 +68,7 @@ describe('Testing createObjectExpression', () => {
     expect(result.properties[0].type).toBe('ObjectProperty')
     expect(result.properties[0].key.name).toBe('myProp')
     expect(result.properties[0].value.type).toBe('Literal')
-    expect((result.properties[0].value as any).value.value).toBe(5)
+    expect((result.properties[0].value as any).value).toBe(5)
   })
 })
 describe('Testing createArrayExpression', () => {
@@ -76,7 +76,7 @@ describe('Testing createArrayExpression', () => {
     const result = createArrayExpression([createLiteral(5)])
     expect(result.type).toBe('ArrayExpression')
     expect(result.elements[0].type).toBe('Literal')
-    expect((result.elements[0] as any).value.value).toBe(5)
+    expect((result.elements[0] as any).value).toBe(5)
   })
 })
 describe('Testing createPipeSubstitution', () => {
@@ -93,7 +93,7 @@ describe('Testing createVariableDeclaration', () => {
     expect(result.declaration.id.type).toBe('Identifier')
     expect(result.declaration.id.name).toBe('myVar')
     expect(result.declaration.init.type).toBe('Literal')
-    expect((result.declaration.init as any).value.value).toBe(5)
+    expect((result.declaration.init as any).value).toBe(5)
   })
 })
 describe('Testing createPipeExpression', () => {
@@ -101,7 +101,7 @@ describe('Testing createPipeExpression', () => {
     const result = createPipeExpression([createLiteral(5)])
     expect(result.type).toBe('PipeExpression')
     expect(result.body[0].type).toBe('Literal')
-    expect((result.body[0] as any).value.value).toBe(5)
+    expect((result.body[0] as any).value).toBe(5)
   })
 })
 

src/lang/modifyAst.ts

@@ -743,18 +743,14 @@ export function splitPathAtPipeExpression(pathToNode: PathToNode): {
   return splitPathAtPipeExpression(pathToNode.slice(0, -1))
 }
 
-export function createLiteral(value: LiteralValue | number): Node<Literal> {
-  const raw = `${value}`
-  if (typeof value === 'number') {
-    value = { value, suffix: 'None' }
-  }
+export function createLiteral(value: LiteralValue): Node<Literal> {
   return {
     type: 'Literal',
     start: 0,
     end: 0,
     moduleId: 0,
     value,
-    raw,
+    raw: `${value}`,
   }
 }
 

src/lang/queryAst.test.ts

@@ -660,7 +660,7 @@ myNestedVar = [
       enter: (node, path) => {
         if (
           node.type === 'Literal' &&
-          String((node as any).value.value) === literalOfInterest
+          String(node.value) === literalOfInterest
         ) {
           pathToNode = path
         } else if (

src/lang/queryAst.ts

@@ -717,6 +717,16 @@ function isTypeInArrayExp(
   return node.elements.some((el) => isTypeInValue(el, syntaxType))
 }
 
+export function isValueZero(val?: Expr): boolean {
+  return (
+    (val?.type === 'Literal' && Number(val.value) === 0) ||
+    (val?.type === 'UnaryExpression' &&
+      val.operator === '-' &&
+      val.argument.type === 'Literal' &&
+      Number(val.argument.value) === 0)
+  )
+}
+
 export function isLinesParallelAndConstrained(
   ast: Program,
   artifactGraph: ArtifactGraph,

src/lang/std/engineConnection.ts

@@ -1014,11 +1014,6 @@ class EngineConnection extends EventTarget {
               this.pingPongSpan.pong = new Date()
               break
 
-            case 'modeling_session_data':
-              let api_call_id = resp.data?.session?.api_call_id
-              console.log(`API Call ID: ${api_call_id}`)
-              break
-
             // Only fires on successful authentication.
             case 'ice_server_info':
               let ice_servers = resp.data?.ice_servers

src/lang/std/sketchcombos.ts

@@ -20,12 +20,12 @@ import {
   sketchFromKclValue,
   Literal,
   SourceRange,
-  LiteralValue,
 } from '../wasm'
 import {
   getNodeFromPath,
   getNodeFromPathCurry,
   getNodePathFromSourceRange,
+  isValueZero,
 } from '../queryAst'
 import {
   createArrayExpression,
@@ -79,32 +79,11 @@ export type ConstraintType =
   | 'setAngleBetween'
 
 const REF_NUM_ERR = new Error('Referenced segment does not have a to value')
-
-function asNum(val: LiteralValue): number | Error {
-  if (typeof val === 'object') return val.value
-  return REF_NUM_ERR
-}
-
-function forceNum(arg: Literal): number {
-  if (typeof arg.value === 'boolean' || typeof arg.value === 'string') {
-    return Number(arg.value)
-  } else {
-    return arg.value.value
-  }
-}
-
 function isUndef(val: any): val is undefined {
   return typeof val === 'undefined'
 }
-
-function isValueZero(val?: Expr): boolean {
-  return (
-    (val?.type === 'Literal' && forceNum(val) === 0) ||
-    (val?.type === 'UnaryExpression' &&
-      val.operator === '-' &&
-      val.argument.type === 'Literal' &&
-      Number(val.argument.value) === 0)
-  )
+function isNum(val: any): val is number {
+  return typeof val === 'number'
 }
 
 function createCallWrapper(
@@ -211,7 +190,7 @@ const xyLineSetLength =
       : referenceSeg
       ? segRef
       : args[0].expr
-    const literalARg = asNum(args[0].expr.value)
+    const literalARg = getArgLiteralVal(args[0].expr)
     if (err(literalARg)) return literalARg
     return createCallWrapper(xOrY, lineVal, tag, literalARg)
   }
@@ -232,14 +211,13 @@ const basicAngledLineCreateNode =
     referencedSegment: path,
   }) => {
     const refAng = path ? getAngle(path?.from, path?.to) : 0
-    const argValue = asNum(args[0].expr.value)
-    if (err(argValue)) return argValue
+    if (!isNum(args[0].expr.value)) return REF_NUM_ERR
     const nonForcedAng =
       varValToUse === 'ang'
         ? inputs[0].expr
         : referenceSeg === 'ang'
         ? getClosesAngleDirection(
-            argValue,
+            args[0].expr.value,
             refAng,
             createSegAngle(referenceSegName)
           )
@@ -252,8 +230,8 @@ const basicAngledLineCreateNode =
         : args[1].expr
     const shouldForceAng = valToForce === 'ang' && forceValueUsedInTransform
     const shouldForceLen = valToForce === 'len' && forceValueUsedInTransform
-    const literalArg = asNum(
-      valToForce === 'ang' ? args[0].expr.value : args[1].expr.value
+    const literalArg = getArgLiteralVal(
+      valToForce === 'ang' ? args[0].expr : args[1].expr
     )
     if (err(literalArg)) return literalArg
     return createCallWrapper(
@@ -305,7 +283,7 @@ const getMinAndSegAngVals = (
 }
 
 const getSignedLeg = (arg: Literal, legLenVal: BinaryPart) =>
-  forceNum(arg) < 0 ? createUnaryExpression(legLenVal) : legLenVal
+  Number(arg.value) < 0 ? createUnaryExpression(legLenVal) : legLenVal
 
 const getLegAng = (ang: number, legAngleVal: BinaryPart) => {
   const normalisedAngle = ((ang % 360) + 360) % 360 // between 0 and 360
@@ -344,7 +322,8 @@ const setHorzVertDistanceCreateNode =
     referencedSegment,
   }) => {
     const refNum = referencedSegment?.to?.[index]
-    const literalArg = asNum(args?.[index].expr.value)
+    const literalArg = getArgLiteralVal(args?.[index].expr)
+    if (err(literalArg)) return literalArg
     if (isUndef(refNum) || err(literalArg)) return REF_NUM_ERR
 
     const valueUsedInTransform = roundOff(literalArg - refNum, 2)
@@ -373,7 +352,7 @@ const setHorzVertDistanceForAngleLineCreateNode =
     referencedSegment,
   }) => {
     const refNum = referencedSegment?.to?.[index]
-    const literalArg = asNum(args?.[1].expr.value)
+    const literalArg = getArgLiteralVal(args?.[1].expr)
     if (isUndef(refNum) || err(literalArg)) return REF_NUM_ERR
     const valueUsedInTransform = roundOff(literalArg - refNum, 2)
     const binExp = createBinaryExpressionWithUnary([
@@ -395,8 +374,8 @@ const setAbsDistanceCreateNode =
     index = xOrY === 'x' ? 0 : 1
   ): CreateStdLibSketchCallExpr =>
   ({ tag, forceValueUsedInTransform, rawArgs: args }) => {
-    const literalArg = asNum(args?.[index].expr.value)
-    if (err(literalArg)) return literalArg
+    const literalArg = getArgLiteralVal(args?.[index].expr)
+    if (err(literalArg)) return REF_NUM_ERR
     const valueUsedInTransform = roundOff(literalArg, 2)
     const val = forceValueUsedInTransform || createLiteral(valueUsedInTransform)
     if (isXOrYLine) {
@@ -417,8 +396,8 @@ const setAbsDistanceCreateNode =
 const setAbsDistanceForAngleLineCreateNode =
   (xOrY: 'x' | 'y'): CreateStdLibSketchCallExpr =>
   ({ tag, forceValueUsedInTransform, inputs, rawArgs: args }) => {
-    const literalArg = asNum(args?.[1].expr.value)
-    if (err(literalArg)) return literalArg
+    const literalArg = getArgLiteralVal(args?.[1].expr)
+    if (err(literalArg)) return REF_NUM_ERR
     const valueUsedInTransform = roundOff(literalArg, 2)
     const val = forceValueUsedInTransform || createLiteral(valueUsedInTransform)
     return createCallWrapper(
@@ -440,7 +419,7 @@ const setHorVertDistanceForXYLines =
   }) => {
     const index = xOrY === 'x' ? 0 : 1
     const refNum = referencedSegment?.to?.[index]
-    const literalArg = asNum(args?.[index].expr.value)
+    const literalArg = getArgLiteralVal(args?.[index].expr)
     if (isUndef(refNum) || err(literalArg)) return REF_NUM_ERR
     const valueUsedInTransform = roundOff(literalArg - refNum, 2)
     const makeBinExp = createBinaryExpressionWithUnary([
@@ -466,9 +445,9 @@ const setHorzVertDistanceConstraintLineCreateNode =
     ])
 
     const makeBinExp = (index: 0 | 1) => {
-      const arg = asNum(args?.[index].expr.value)
+      const arg = getArgLiteralVal(args?.[index].expr)
       const refNum = referencedSegment?.to?.[index]
-      if (err(arg) || isUndef(refNum)) return REF_NUM_ERR
+      if (err(arg) || !isNum(refNum)) return REF_NUM_ERR
       return createBinaryExpressionWithUnary([
         createSegEnd(referenceSegName, isX),
         createLiteral(roundOff(arg - refNum, 2)),
@@ -489,9 +468,9 @@ const setAngledIntersectLineForLines: CreateStdLibSketchCallExpr = ({
   forceValueUsedInTransform,
   rawArgs: args,
 }) => {
-  const val = asNum(args[1].expr.value),
-    angle = asNum(args[0].expr.value)
-  if (err(val) || err(angle)) return REF_NUM_ERR
+  const val = args[1].expr.value,
+    angle = args[0].expr.value
+  if (!isNum(val) || !isNum(angle)) return REF_NUM_ERR
   const valueUsedInTransform = roundOff(val, 2)
   const varNamMap: { [key: number]: string } = {
     0: 'ZERO',
@@ -519,8 +498,8 @@ const setAngledIntersectForAngledLines: CreateStdLibSketchCallExpr = ({
   inputs,
   rawArgs: args,
 }) => {
-  const val = asNum(args[1].expr.value)
-  if (err(val)) return val
+  const val = args[1].expr.value
+  if (!isNum(val)) return REF_NUM_ERR
   const valueUsedInTransform = roundOff(val, 2)
   return intersectCallWrapper({
     fnName: 'angledLineThatIntersects',
@@ -545,8 +524,8 @@ const setAngleBetweenCreateNode =
     const refAngle = referencedSegment
       ? getAngle(referencedSegment?.from, referencedSegment?.to)
       : 0
-    const val = asNum(args[0].expr.value)
-    if (err(val)) return val
+    const val = args[0].expr.value
+    if (!isNum(val)) return REF_NUM_ERR
     let valueUsedInTransform = roundOff(normaliseAngle(val - refAngle))
     let firstHalfValue = createSegAngle(referenceSegName)
     if (Math.abs(valueUsedInTransform) > 90) {
@@ -727,11 +706,13 @@ const transformMap: TransformMap = {
               createPipeSubstitution(),
             ]
           )
-          const val = asNum(args[0].expr.value)
-          if (err(val)) return val
+          if (!isNum(args[0].expr.value)) return REF_NUM_ERR
           return createCallWrapper(
             'angledLineToX',
-            [getAngleLengthSign(val, angleToMatchLengthXCall), inputs[0].expr],
+            [
+              getAngleLengthSign(args[0].expr.value, angleToMatchLengthXCall),
+              inputs[0].expr,
+            ],
             tag
           )
         },
@@ -758,11 +739,13 @@ const transformMap: TransformMap = {
               createPipeSubstitution(),
             ]
           )
-          const val = asNum(args[0].expr.value)
-          if (err(val)) return val
+          if (!isNum(args[0].expr.value)) return REF_NUM_ERR
           return createCallWrapper(
             'angledLineToY',
-            [getAngleLengthSign(val, angleToMatchLengthYCall), inputs[1].expr],
+            [
+              getAngleLengthSign(args[0].expr.value, angleToMatchLengthYCall),
+              inputs[1].expr,
+            ],
             tag
           )
         },
@@ -780,7 +763,7 @@ const transformMap: TransformMap = {
           forceValueUsedInTransform,
           rawArgs: args,
         }) => {
-          const val = asNum(args[0].expr.value)
+          const val = getArgLiteralVal(args[0].expr)
           if (err(val)) return val
           return createCallWrapper(
             'angledLineToY',
@@ -861,7 +844,7 @@ const transformMap: TransformMap = {
         tooltip: 'yLine',
         createNode: ({ inputs, tag, rawArgs: args }) => {
           const expr = inputs[1].expr
-          if (forceNum(args[0].expr) >= 0)
+          if (Number(args[0].expr.value) >= 0)
             return createCallWrapper('yLine', expr, tag)
           if (isExprBinaryPart(expr))
             return createCallWrapper('yLine', createUnaryExpression(expr), tag)
@@ -873,7 +856,7 @@ const transformMap: TransformMap = {
         tooltip: 'xLine',
         createNode: ({ inputs, tag, rawArgs: args }) => {
           const expr = inputs[1].expr
-          if (forceNum(args[0].expr) >= 0)
+          if (Number(args[0].expr.value) >= 0)
             return createCallWrapper('xLine', expr, tag)
           if (isExprBinaryPart(expr))
             return createCallWrapper('xLine', createUnaryExpression(expr), tag)
@@ -917,11 +900,10 @@ const transformMap: TransformMap = {
             referenceSegName,
             getInputOfType(inputs, 'xRelative').expr
           )
-          const val = asNum(args[0].expr.value)
-          if (err(val)) return val
+          if (!isNum(args[0].expr.value)) return REF_NUM_ERR
           return createCallWrapper(
             'angledLineOfXLength',
-            [getLegAng(val, legAngle), minVal],
+            [getLegAng(args[0].expr.value, legAngle), minVal],
             tag
           )
         },
@@ -930,7 +912,7 @@ const transformMap: TransformMap = {
         tooltip: 'xLine',
         createNode: ({ inputs, tag, rawArgs: args }) => {
           const expr = inputs[1].expr
-          if (forceNum(args[0].expr) >= 0)
+          if (Number(args[0].expr.value) >= 0)
             return createCallWrapper('xLine', expr, tag)
           if (isExprBinaryPart(expr))
             return createCallWrapper('xLine', createUnaryExpression(expr), tag)
@@ -971,11 +953,10 @@ const transformMap: TransformMap = {
             inputs[1].expr,
             'legAngY'
           )
-          const val = asNum(args[0].expr.value)
-          if (err(val)) return val
+          if (!isNum(args[0].expr.value)) return REF_NUM_ERR
           return createCallWrapper(
             'angledLineOfXLength',
-            [getLegAng(val, legAngle), minVal],
+            [getLegAng(args[0].expr.value, legAngle), minVal],
             tag
           )
         },
@@ -984,7 +965,7 @@ const transformMap: TransformMap = {
         tooltip: 'yLine',
         createNode: ({ inputs, tag, rawArgs: args }) => {
           const expr = inputs[1].expr
-          if (forceNum(args[0].expr) >= 0)
+          if (Number(args[0].expr.value) >= 0)
             return createCallWrapper('yLine', expr, tag)
           if (isExprBinaryPart(expr))
             return createCallWrapper('yLine', createUnaryExpression(expr), tag)
@@ -1024,11 +1005,13 @@ const transformMap: TransformMap = {
               createPipeSubstitution(),
             ]
           )
-          const val = asNum(args[0].expr.value)
-          if (err(val)) return val
+          if (!isNum(args[0].expr.value)) return REF_NUM_ERR
           return createCallWrapper(
             'angledLineToX',
-            [getAngleLengthSign(val, angleToMatchLengthXCall), inputs[1].expr],
+            [
+              getAngleLengthSign(args[0].expr.value, angleToMatchLengthXCall),
+              inputs[1].expr,
+            ],
             tag
           )
         },
@@ -1074,11 +1057,13 @@ const transformMap: TransformMap = {
               createPipeSubstitution(),
             ]
           )
-          const val = asNum(args[0].expr.value)
-          if (err(val)) return val
+          if (!isNum(args[0].expr.value)) return REF_NUM_ERR
           return createCallWrapper(
             'angledLineToY',
-            [getAngleLengthSign(val, angleToMatchLengthXCall), inputs[1].expr],
+            [
+              getAngleLengthSign(args[0].expr.value, angleToMatchLengthXCall),
+              inputs[1].expr,
+            ],
             tag
           )
         },
@@ -1095,7 +1080,7 @@ const transformMap: TransformMap = {
       equalLength: {
         tooltip: 'xLine',
         createNode: ({ referenceSegName, tag, rawArgs: args }) => {
-          const argVal = asNum(args[0].expr.value)
+          const argVal = getArgLiteralVal(args[0].expr)
           if (err(argVal)) return argVal
           const segLen = createSegLen(referenceSegName)
           if (argVal > 0) return createCallWrapper('xLine', segLen, tag, argVal)
@@ -1133,7 +1118,7 @@ const transformMap: TransformMap = {
       equalLength: {
         tooltip: 'yLine',
         createNode: ({ referenceSegName, tag, rawArgs: args }) => {
-          const argVal = asNum(args[0].expr.value)
+          const argVal = getArgLiteralVal(args[0].expr)
           if (err(argVal)) return argVal
           let segLen = createSegLen(referenceSegName)
           if (argVal < 0) segLen = createUnaryExpression(segLen)
@@ -1729,7 +1714,7 @@ export function transformAstSketchLines({
     let kclVal = programMemory.get(varName)
     let sketch
     if (kclVal?.type === 'Solid') {
-      sketch = kclVal.value.sketch
+      sketch = kclVal.sketch
     } else {
       sketch = sketchFromKclValue(kclVal, varName)
       if (err(sketch)) {
@@ -1838,6 +1823,11 @@ function createLastSeg(isX: boolean): Node<CallExpression> {
   ])
 }
 
+function getArgLiteralVal(arg: Literal): number | Error {
+  if (!isNum(arg.value)) return REF_NUM_ERR
+  return arg.value
+}
+
 export type ConstraintLevel = 'free' | 'partial' | 'full'
 
 export function getConstraintLevelFromSourceRange(

src/lang/wasm.ts

@@ -539,8 +539,7 @@ export function sketchFromKclValueOptional(
 ): Sketch | Reason {
   if (obj?.value?.type === 'Sketch') return obj.value
   if (obj?.value?.type === 'Solid') return obj.value.sketch
-  if (obj?.type === 'Sketch') return obj.value
-  if (obj?.type === 'Solid') return obj.value.sketch
+  if (obj?.type === 'Solid') return obj.sketch
   if (!varName) {
     varName = 'a KCL value'
   }

src/lib/commandBarConfigs/modelingCommandConfig.ts

@@ -13,7 +13,6 @@ import {
   loftValidator,
   revolveAxisValidator,
   shellValidator,
-  sweepValidator,
 } from './validators'
 
 type OutputFormat = Models['OutputFormat_type']
@@ -43,8 +42,8 @@ export type ModelingCommandSchema = {
     distance: KclCommandValue
   }
   Sweep: {
-    target: Selections
-    trajectory: Selections
+    path: Selections
+    profile: Selections
   }
   Loft: {
     selection: Selections
@@ -309,24 +308,25 @@ export const modelingMachineCommandConfig: StateMachineCommandSetConfig<
       'Create a 3D body by moving a sketch region along an arbitrary path.',
     icon: 'sweep',
     status: 'development',
-    needsReview: false,
+    needsReview: true,
     args: {
-      target: {
+      profile: {
         inputType: 'selection',
         selectionTypes: ['solid2d'],
         required: true,
         skip: true,
         multiple: false,
+        // TODO: add dry-run validation
         warningMessage:
           'The sweep workflow is new and under tested. Please break it and report issues.',
       },
-      trajectory: {
+      path: {
         inputType: 'selection',
         selectionTypes: ['segment', 'path'],
         required: true,
-        skip: false,
+        skip: true,
         multiple: false,
-        validation: sweepValidator,
+        // TODO: add dry-run validation
       },
     },
   },

src/lib/commandBarConfigs/validators.ts

@@ -207,64 +207,3 @@ export const shellValidator = async ({
 
   return 'Unable to shell with the provided selection'
 }
-
-export const sweepValidator = async ({
-  context,
-  data,
-}: {
-  context: CommandBarContext
-  data: { trajectory: Selections }
-}): Promise<boolean | string> => {
-  if (!isSelections(data.trajectory)) {
-    console.log('Unable to sweep, selections are missing')
-    return 'Unable to sweep, selections are missing'
-  }
-
-  // Retrieve the parent path from the segment selection directly
-  const trajectoryArtifact = data.trajectory.graphSelections[0].artifact
-  if (!trajectoryArtifact) {
-    return "Unable to sweep, couldn't find the trajectory artifact"
-  }
-  if (trajectoryArtifact.type !== 'segment') {
-    return "Unable to sweep, couldn't find the target from a non-segment selection"
-  }
-  const trajectory = trajectoryArtifact.pathId
-
-  // Get the former arg in the command bar flow, and retrieve the path from the solid2d directly
-  const targetArg = context.argumentsToSubmit['target'] as Selections
-  const targetArtifact = targetArg.graphSelections[0].artifact
-  if (!targetArtifact) {
-    return "Unable to sweep, couldn't find the profile artifact"
-  }
-  if (targetArtifact.type !== 'solid2d') {
-    return "Unable to sweep, couldn't find the target from a non-solid2d selection"
-  }
-  const target = targetArtifact.pathId
-
-  const sweepCommand = async () => {
-    // TODO: second look on defaults here
-    const DEFAULT_TOLERANCE: Models['LengthUnit_type'] = 1e-7
-    const DEFAULT_SECTIONAL = false
-    const cmdArgs = {
-      target,
-      trajectory,
-      sectional: DEFAULT_SECTIONAL,
-      tolerance: DEFAULT_TOLERANCE,
-    }
-    return await engineCommandManager.sendSceneCommand({
-      type: 'modeling_cmd_req',
-      cmd_id: uuidv4(),
-      cmd: {
-        type: 'sweep',
-        ...cmdArgs,
-      },
-    })
-  }
-
-  const attemptSweep = await dryRunWrapper(sweepCommand)
-  if (attemptSweep?.success) {
-    return true
-  }
-
-  return 'Unable to sweep with the provided selection'
-}

src/lib/desktopFS.test.ts

@@ -1,58 +0,0 @@
-import { getUniqueProjectName } from './desktopFS'
-import { FileEntry } from './project'
-
-/** Create a dummy project */
-function project(name: string, children?: FileEntry[]): FileEntry {
-  return {
-    name,
-    children: children || [
-      { name: 'main.kcl', children: null, path: 'main.kcl' },
-    ],
-    path: `/projects/${name}`,
-  }
-}
-
-describe(`Getting unique project names`, () => {
-  it(`should return the same name if no conflicts`, () => {
-    const projectName = 'new-project'
-    const projects = [project('existing-project'), project('another-project')]
-    const result = getUniqueProjectName(projectName, projects)
-    expect(result).toBe(projectName)
-  })
-  it(`should return a unique name if there is a conflict`, () => {
-    const projectName = 'existing-project'
-    const projects = [project('existing-project'), project('another-project')]
-    const result = getUniqueProjectName(projectName, projects)
-    expect(result).toBe('existing-project-1')
-  })
-  it(`should increment an ending index until a unique one is found`, () => {
-    const projectName = 'existing-project-1'
-    const projects = [
-      project('existing-project'),
-      project('existing-project-1'),
-      project('existing-project-2'),
-    ]
-    const result = getUniqueProjectName(projectName, projects)
-    expect(result).toBe('existing-project-3')
-  })
-  it(`should prefer the formatting of the index identifier if present`, () => {
-    const projectName = 'existing-project-$nn'
-    const projects = [
-      project('existing-project'),
-      project('existing-project-1'),
-      project('existing-project-2'),
-    ]
-    const result = getUniqueProjectName(projectName, projects)
-    expect(result).toBe('existing-project-03')
-  })
-  it(`be able to get an incrementing index regardless of padding zeroes`, () => {
-    const projectName = 'existing-project-$nn'
-    const projects = [
-      project('existing-project'),
-      project('existing-project-01'),
-      project('existing-project-2'),
-    ]
-    const result = getUniqueProjectName(projectName, projects)
-    expect(result).toBe('existing-project-03')
-  })
-})

src/lib/desktopFS.ts

@@ -54,10 +54,8 @@ export function getNextProjectIndex(
   const matches = projects.map((project) => project.name?.match(regex))
   const indices = matches
     .filter(Boolean)
-    .map((match) => (match !== null ? match[1] : '-1'))
-    .map((maybeMatchIndex) => {
-      return parseInt(maybeMatchIndex || '0', 10)
-    })
+    .map((match) => match![1])
+    .map(Number)
   const maxIndex = Math.max(...indices, -1)
   return maxIndex + 1
 }
@@ -85,33 +83,6 @@ export function doesProjectNameNeedInterpolated(projectName: string) {
   return projectName.includes(INDEX_IDENTIFIER)
 }
 
-/**
- * Given a target name, which may include our magic index interpolation string,
- * and a list of projects, return a unique name that doesn't conflict with any
- * of the existing projects, incrementing any ending number if necessary.
- * @param name
- * @param projects
- * @returns
- */
-export function getUniqueProjectName(name: string, projects: FileEntry[]) {
-  // The name may have our magic index interpolation string in it
-  const needsInterpolation = doesProjectNameNeedInterpolated(name)
-
-  if (needsInterpolation) {
-    const nextIndex = getNextProjectIndex(name, projects)
-    return interpolateProjectNameWithIndex(name, nextIndex)
-  } else {
-    let newName = name
-    while (projects.some((project) => project.name === newName)) {
-      const nameEndsWithNumber = newName.match(/\d+$/)
-      newName = nameEndsWithNumber
-        ? newName.replace(/\d+$/, (num) => `${parseInt(num, 10) + 1}`)
-        : `${name}-1`
-    }
-    return newName
-  }
-}
-
 function escapeRegExpChars(string: string) {
   return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
 }

src/lib/textToCad.ts

@@ -68,6 +68,10 @@ interface TextToKclProps {
     data?: unknown
   ) => unknown
   navigate: NavigateFunction
+  commandBarSend: (
+    type: EventFrom<typeof commandBarMachine>,
+    data?: unknown
+  ) => unknown
   context: ContextFrom<typeof fileMachine>
   token?: string
   settings: {
@@ -80,6 +84,7 @@ export async function submitAndAwaitTextToKcl({
   trimmedPrompt,
   fileMachineSend,
   navigate,
+  commandBarSend,
   context,
   token,
   settings,
@@ -91,6 +96,7 @@ export async function submitAndAwaitTextToKcl({
         ToastTextToCadError({
           toastId,
           message,
+          commandBarSend,
           prompt: trimmedPrompt,
         }),
       {
@@ -189,7 +195,7 @@ export async function submitAndAwaitTextToKcl({
         .toLowerCase()}${FILE_EXT}`
 
       if (isDesktop()) {
-        // We have to preemptively run our unique file name logic,
+        // We have to pre-emptively run our unique file name logic,
         // so that we can pass the unique file name to the toast,
         // and by extension the file-deletion-on-reject logic.
         newFileName = getNextFileName({

src/lib/toolbar.ts

@@ -1,6 +1,6 @@
 import { CustomIconName } from 'components/CustomIcon'
 import { DEV } from 'env'
-import { commandBarActor, commandBarMachine } from 'machines/commandBarMachine'
+import { commandBarMachine } from 'machines/commandBarMachine'
 import {
   canRectangleOrCircleTool,
   isClosedSketch,
@@ -21,6 +21,7 @@ type ToolbarMode = {
 export interface ToolbarItemCallbackProps {
   modelingState: StateFrom<typeof modelingMachine>
   modelingSend: (event: EventFrom<typeof modelingMachine>) => void
+  commandBarSend: (event: EventFrom<typeof commandBarMachine>) => void
   sketchPathId: string | false
 }
 
@@ -83,8 +84,8 @@ export const toolbarConfig: Record<ToolbarModeName, ToolbarMode> = {
       'break',
       {
         id: 'extrude',
-        onClick: () =>
-          commandBarActor.send({
+        onClick: ({ commandBarSend }) =>
+          commandBarSend({
             type: 'Find and select command',
             data: { name: 'Extrude', groupId: 'modeling' },
           }),
@@ -97,8 +98,8 @@ export const toolbarConfig: Record<ToolbarModeName, ToolbarMode> = {
       },
       {
         id: 'revolve',
-        onClick: () =>
-          commandBarActor.send({
+        onClick: ({ commandBarSend }) =>
+          commandBarSend({
             type: 'Find and select command',
             data: { name: 'Revolve', groupId: 'modeling' },
           }),
@@ -118,8 +119,8 @@ export const toolbarConfig: Record<ToolbarModeName, ToolbarMode> = {
       },
       {
         id: 'sweep',
-        onClick: () =>
-          commandBarActor.send({
+        onClick: ({ commandBarSend }) =>
+          commandBarSend({
             type: 'Find and select command',
             data: { name: 'Sweep', groupId: 'modeling' },
           }),
@@ -138,8 +139,8 @@ export const toolbarConfig: Record<ToolbarModeName, ToolbarMode> = {
       },
       {
         id: 'loft',
-        onClick: () =>
-          commandBarActor.send({
+        onClick: ({ commandBarSend }) =>
+          commandBarSend({
             type: 'Find and select command',
             data: { name: 'Loft', groupId: 'modeling' },
           }),
@@ -159,8 +160,8 @@ export const toolbarConfig: Record<ToolbarModeName, ToolbarMode> = {
       'break',
       {
         id: 'fillet3d',
-        onClick: () =>
-          commandBarActor.send({
+        onClick: ({ commandBarSend }) =>
+          commandBarSend({
             type: 'Find and select command',
             data: { name: 'Fillet', groupId: 'modeling' },
           }),
@@ -173,8 +174,8 @@ export const toolbarConfig: Record<ToolbarModeName, ToolbarMode> = {
       },
       {
         id: 'chamfer3d',
-        onClick: () =>
-          commandBarActor.send({
+        onClick: ({ commandBarSend }) =>
+          commandBarSend({
             type: 'Find and select command',
             data: { name: 'Chamfer', groupId: 'modeling' },
           }),
@@ -187,8 +188,8 @@ export const toolbarConfig: Record<ToolbarModeName, ToolbarMode> = {
       },
       {
         id: 'shell',
-        onClick: () => {
-          commandBarActor.send({
+        onClick: ({ commandBarSend }) => {
+          commandBarSend({
             type: 'Find and select command',
             data: { name: 'Shell', groupId: 'modeling' },
           })
@@ -268,8 +269,8 @@ export const toolbarConfig: Record<ToolbarModeName, ToolbarMode> = {
       [
         {
           id: 'plane-offset',
-          onClick: () => {
-            commandBarActor.send({
+          onClick: ({ commandBarSend }) => {
+            commandBarSend({
               type: 'Find and select command',
               data: { name: 'Offset plane', groupId: 'modeling' },
             })
@@ -279,12 +280,7 @@ export const toolbarConfig: Record<ToolbarModeName, ToolbarMode> = {
           status: 'available',
           title: 'Offset plane',
           description: 'Create a plane parallel to an existing plane.',
-          links: [
-            {
-              label: 'KCL docs',
-              url: 'https://zoo.dev/docs/kcl/offsetPlane',
-            },
-          ],
+          links: [],
         },
         {
           id: 'plane-points',
@@ -300,8 +296,8 @@ export const toolbarConfig: Record<ToolbarModeName, ToolbarMode> = {
       [
         {
           id: 'text-to-cad',
-          onClick: () =>
-            commandBarActor.send({
+          onClick: ({ commandBarSend }) =>
+            commandBarSend({
               type: 'Find and select command',
               data: { name: 'Text-to-CAD', groupId: 'modeling' },
             }),
@@ -309,17 +305,12 @@ export const toolbarConfig: Record<ToolbarModeName, ToolbarMode> = {
           status: 'available',
           title: 'Text-to-CAD',
           description: 'Generate geometry from a text prompt.',
-          links: [
-            {
-              label: 'API docs',
-              url: 'https://zoo.dev/docs/api/ml/generate-a-cad-model-from-text',
-            },
-          ],
+          links: [],
         },
         {
           id: 'prompt-to-edit',
-          onClick: () =>
-            commandBarActor.send({
+          onClick: ({ commandBarSend }) =>
+            commandBarSend({
               type: 'Find and select command',
               data: { name: 'Prompt-to-edit', groupId: 'modeling' },
             }),
@@ -592,8 +583,8 @@ export const toolbarConfig: Record<ToolbarModeName, ToolbarMode> = {
         {
           id: 'constraint-length',
           disabled: (state) => !state.matches({ Sketch: 'SketchIdle' }),
-          onClick: () =>
-            commandBarActor.send({
+          onClick: ({ commandBarSend }) =>
+            commandBarSend({
               type: 'Find and select command',
               data: {
                 name: 'Constrain length',

src/machines/commandBarMachine.ts

@@ -1,4 +1,4 @@
-import { assign, createActor, fromPromise, setup, SnapshotFrom } from 'xstate'
+import { assign, fromPromise, setup } from 'xstate'
 import {
   Command,
   CommandArgument,
@@ -9,7 +9,6 @@ import { Selections__old } from 'lib/selections'
 import { getCommandArgumentKclValuesOnly } from 'lib/commandUtils'
 import { MachineManager } from 'components/MachineManagerProvider'
 import toast from 'react-hot-toast'
-import { useSelector } from '@xstate/react'
 
 export type CommandBarContext = {
   commands: Command[]
@@ -248,17 +247,8 @@ export const commandBarMachine = setup({
   guards: {
     'Command needs review': ({ context }) =>
       context.selectedCommand?.needsReview || false,
-    'Command has no arguments': ({ context }) => {
-      return (
-        !context.selectedCommand?.args ||
-        Object.keys(context.selectedCommand?.args).length === 0
-      )
-    },
-    'All arguments are skippable': ({ context }) => {
-      return Object.values(context.selectedCommand!.args!).every(
-        (argConfig) => argConfig.skip
-      )
-    },
+    'Command has no arguments': () => false,
+    'All arguments are skippable': () => false,
     'Has selected command': ({ context }) => !!context.selectedCommand,
   },
   actors: {
@@ -630,12 +620,3 @@ function sortCommands(a: Command, b: Command) {
   if (a.groupId === 'settings' && !(b.groupId === 'settings')) return 1
   return a.name.localeCompare(b.name)
 }
-
-export const commandBarActor = createActor(commandBarMachine).start()
-
-/** Basic state snapshot selector */
-const cmdBarStateSelector = (state: SnapshotFrom<typeof commandBarActor>) =>
-  state
-export const useCommandBarState = () => {
-  return useSelector(commandBarActor, cmdBarStateSelector)
-}

src/machines/modelingMachine.ts

@@ -1561,40 +1561,40 @@ export const modelingMachine = setup({
         if (!input) return new Error('No input provided')
         // Extract inputs
         const ast = kclManager.ast
-        const { target, trajectory } = input
+        const { profile, path } = input
 
         // Find the profile declaration
-        const targetNodePath = getNodePathFromSourceRange(
+        const profileNodePath = getNodePathFromSourceRange(
           ast,
-          target.graphSelections[0].codeRef.range
+          profile.graphSelections[0].codeRef.range
         )
-        const targetNode = getNodeFromPath<VariableDeclarator>(
+        const profileNode = getNodeFromPath<VariableDeclarator>(
           ast,
-          targetNodePath,
+          profileNodePath,
           'VariableDeclarator'
         )
-        if (err(targetNode)) {
+        if (err(profileNode)) {
           return new Error("Couldn't parse profile selection")
         }
-        const targetDeclarator = targetNode.node
+        const profileDeclarator = profileNode.node
 
         // Find the path declaration
-        const trajectoryNodePath = getNodePathFromSourceRange(
+        const pathNodePath = getNodePathFromSourceRange(
           ast,
-          trajectory.graphSelections[0].codeRef.range
+          path.graphSelections[0].codeRef.range
         )
-        const trajectoryNode = getNodeFromPath<VariableDeclarator>(
+        const pathNode = getNodeFromPath<VariableDeclarator>(
           ast,
-          trajectoryNodePath,
+          pathNodePath,
           'VariableDeclarator'
         )
-        if (err(trajectoryNode)) {
+        if (err(pathNode)) {
           return new Error("Couldn't parse path selection")
         }
-        const trajectoryDeclarator = trajectoryNode.node
+        const pathDeclarator = pathNode.node
 
         // Perform the sweep
-        const sweepRes = addSweep(ast, targetDeclarator, trajectoryDeclarator)
+        const sweepRes = addSweep(ast, profileDeclarator, pathDeclarator)
         const updateAstResult = await kclManager.updateAst(
           sweepRes.modifiedAst,
           true,

src/routes/Home.tsx

@@ -24,12 +24,13 @@ import { markOnce } from 'lib/performance'
 import { useFileSystemWatcher } from 'hooks/useFileSystemWatcher'
 import { useProjectsLoader } from 'hooks/useProjectsLoader'
 import { useProjectsContext } from 'hooks/useProjectsContext'
-import { commandBarActor } from 'machines/commandBarMachine'
+import { useCommandsContext } from 'hooks/useCommandsContext'
 
 // This route only opens in the desktop context for now,
 // as defined in Router.tsx, so we can use the desktop APIs and types.
 const Home = () => {
   const { state, send } = useProjectsContext()
+  const { commandBarSend } = useCommandsContext()
   const [projectsLoaderTrigger, setProjectsLoaderTrigger] = useState(0)
   const { projectsDir } = useProjectsLoader([projectsLoaderTrigger])
 
@@ -127,7 +128,7 @@ const Home = () => {
               <ActionButton
                 Element="button"
                 onClick={() =>
-                  commandBarActor.send({
+                  commandBarSend({
                     type: 'Find and select command',
                     data: {
                       groupId: 'projects',
@@ -147,7 +148,7 @@ const Home = () => {
                 }}
                 data-testid="home-new-file"
               >
-                Create project
+                New project
               </ActionButton>
             </div>
             <div className="flex gap-2 items-center">

src/wasm-lib/Cargo.lock

@@ -1382,6 +1382,12 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "iai"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71a816c97c42258aa5834d07590b718b4c9a598944cd39a52dc25b351185d678"
+
 [[package]]
 name = "iana-time-zone"
 version = "0.1.61"
@@ -1733,6 +1739,7 @@ dependencies = [
  "gltf-json",
  "handlebars",
  "http 1.2.0",
+ "iai",
  "image",
  "indexmap 2.7.0",
  "insta",

src/wasm-lib/Cargo.toml

@@ -9,12 +9,6 @@ rust-version = "1.73"
 [lib]
 crate-type = ["cdylib"]
 
-# DO NOT MERGE ME WITH THIS PLEASE
-#
-# FOR THE LOVE OF GOD DON'T HIT APPROVE PR WITHOUT ASKING ME TO REMOVE THIS
-[package.metadata.wasm-pack.profile.release]
-wasm-opt = false
-
 [dependencies]
 bson = { version = "2.13.0", features = ["uuid-1", "chrono"] }
 data-encoding = "2.6.0"

src/wasm-lib/kcl/Cargo.toml

@@ -113,6 +113,7 @@ base64 = "0.22.1"
 criterion = { version = "0.5.1", features = ["async_tokio"] }
 expectorate = "1.1.0"
 handlebars = "6.3.0"
+iai = "0.1"
 image = { version = "0.25.5", default-features = false, features = ["png"] }
 insta = { version = "1.41.1", features = ["json", "filters", "redactions"] }
 itertools = "0.13.0"
@@ -128,6 +129,10 @@ workspace = true
 name = "compiler_benchmark_criterion"
 harness = false
 
+[[bench]]
+name = "compiler_benchmark_iai"
+harness = false
+
 [[bench]]
 name = "digest_benchmark"
 harness = false
@@ -137,7 +142,15 @@ name = "lsp_semantic_tokens_benchmark_criterion"
 harness = false
 required-features = ["lsp-test-util"]
 
+[[bench]]
+name = "lsp_semantic_tokens_benchmark_iai"
+harness = false
+required-features = ["lsp-test-util"]
+
 [[bench]]
 name = "executor_benchmark_criterion"
 harness = false
 
+[[bench]]
+name = "executor_benchmark_iai"
+harness = false

src/wasm-lib/kcl/benches/compiler_benchmark_iai.rs

@@ -0,0 +1,35 @@
+use iai::black_box;
+
+pub fn parse(program: &str) {
+    black_box(kcl_lib::Program::parse(program).unwrap());
+}
+
+fn parse_kitt() {
+    parse(KITT_PROGRAM)
+}
+fn parse_pipes() {
+    parse(PIPES_PROGRAM)
+}
+fn parse_cube() {
+    parse(CUBE_PROGRAM)
+}
+fn parse_math() {
+    parse(MATH_PROGRAM)
+}
+fn parse_lsystem() {
+    parse(LSYSTEM_PROGRAM)
+}
+
+iai::main! {
+    parse_kitt,
+    parse_pipes,
+    parse_cube,
+    parse_math,
+    parse_lsystem,
+}
+
+const KITT_PROGRAM: &str = include_str!("../../tests/executor/inputs/kittycad_svg.kcl");
+const PIPES_PROGRAM: &str = include_str!("../../tests/executor/inputs/pipes_on_pipes.kcl");
+const CUBE_PROGRAM: &str = include_str!("../../tests/executor/inputs/cube.kcl");
+const MATH_PROGRAM: &str = include_str!("../../tests/executor/inputs/math.kcl");
+const LSYSTEM_PROGRAM: &str = include_str!("../../tests/executor/inputs/lsystem.kcl");

src/wasm-lib/kcl/benches/executor_benchmark_iai.rs

@@ -0,0 +1,27 @@
+use iai::black_box;
+
+async fn execute_server_rack_heavy() {
+    let code = SERVER_RACK_HEAVY_PROGRAM;
+    black_box(
+        kcl_lib::test_server::execute_and_snapshot(code, kcl_lib::UnitLength::Mm, None)
+            .await
+            .unwrap(),
+    );
+}
+
+async fn execute_server_rack_lite() {
+    let code = SERVER_RACK_LITE_PROGRAM;
+    black_box(
+        kcl_lib::test_server::execute_and_snapshot(code, kcl_lib::UnitLength::Mm, None)
+            .await
+            .unwrap(),
+    );
+}
+
+iai::main! {
+    execute_server_rack_lite,
+    execute_server_rack_heavy,
+}
+
+const SERVER_RACK_HEAVY_PROGRAM: &str = include_str!("../../tests/executor/inputs/server-rack-heavy.kcl");
+const SERVER_RACK_LITE_PROGRAM: &str = include_str!("../../tests/executor/inputs/server-rack-lite.kcl");

src/wasm-lib/kcl/benches/lsp_semantic_tokens_benchmark_iai.rs

@@ -0,0 +1,45 @@
+use iai::black_box;
+use kcl_lib::kcl_lsp_server;
+use tower_lsp::LanguageServer;
+
+async fn kcl_lsp_semantic_tokens(code: &str) {
+    let server = kcl_lsp_server(false).await.unwrap();
+
+    // Send open file.
+    server
+        .did_open(tower_lsp::lsp_types::DidOpenTextDocumentParams {
+            text_document: tower_lsp::lsp_types::TextDocumentItem {
+                uri: "file:///test.kcl".try_into().unwrap(),
+                language_id: "kcl".to_string(),
+                version: 1,
+                text: code.to_string(),
+            },
+        })
+        .await;
+
+    // Send semantic tokens request.
+    black_box(
+        server
+            .semantic_tokens_full(tower_lsp::lsp_types::SemanticTokensParams {
+                text_document: tower_lsp::lsp_types::TextDocumentIdentifier {
+                    uri: "file:///test.kcl".try_into().unwrap(),
+                },
+                partial_result_params: Default::default(),
+                work_done_progress_params: Default::default(),
+            })
+            .await
+            .unwrap()
+            .unwrap(),
+    );
+}
+
+async fn semantic_tokens_global_tags() {
+    let code = GLOBAL_TAGS_FILE;
+    kcl_lsp_semantic_tokens(code).await;
+}
+
+iai::main! {
+    semantic_tokens_global_tags,
+}
+
+const GLOBAL_TAGS_FILE: &str = include_str!("../../tests/executor/inputs/global-tags.kcl");

src/wasm-lib/kcl/src/errors.rs

@@ -370,6 +370,8 @@ impl From<KclError> for pyo3::PyErr {
 pub struct CompilationError {
     #[serde(rename = "sourceRange")]
     pub source_range: SourceRange,
+    #[serde(rename = "contextRange")]
+    pub context_range: Option<SourceRange>,
     pub message: String,
     pub suggestion: Option<Suggestion>,
     pub severity: Severity,
@@ -380,6 +382,7 @@ impl CompilationError {
     pub(crate) fn err(source_range: SourceRange, message: impl ToString) -> CompilationError {
         CompilationError {
             source_range,
+            context_range: None,
             message: message.to_string(),
             suggestion: None,
             severity: Severity::Error,
@@ -390,6 +393,7 @@ impl CompilationError {
     pub(crate) fn fatal(source_range: SourceRange, message: impl ToString) -> CompilationError {
         CompilationError {
             source_range,
+            context_range: None,
             message: message.to_string(),
             suggestion: None,
             severity: Severity::Fatal,
@@ -398,18 +402,22 @@ impl CompilationError {
     }
 
     pub(crate) fn with_suggestion(
-        self,
-        suggestion_title: impl ToString,
-        suggestion_insert: impl ToString,
+        source_range: SourceRange,
+        context_range: Option<SourceRange>,
+        message: impl ToString,
+        suggestion: Option<(impl ToString, impl ToString)>,
         tag: Tag,
     ) -> CompilationError {
         CompilationError {
-            suggestion: Some(Suggestion {
-                title: suggestion_title.to_string(),
-                insert: suggestion_insert.to_string(),
+            source_range,
+            context_range,
+            message: message.to_string(),
+            suggestion: suggestion.map(|(t, i)| Suggestion {
+                title: t.to_string(),
+                insert: i.to_string(),
             }),
+            severity: Severity::Error,
             tag,
-            ..self
         }
     }
 

src/wasm-lib/kcl/src/execution/annotations.rs

@@ -11,11 +11,6 @@ pub(super) const SETTINGS: &str = "settings";
 pub(super) const SETTINGS_UNIT_LENGTH: &str = "defaultLengthUnit";
 pub(super) const SETTINGS_UNIT_ANGLE: &str = "defaultAngleUnit";
 
-#[derive(Copy, Clone, Debug, Eq, PartialEq)]
-pub(super) enum AnnotationScope {
-    Module,
-}
-
 pub(super) fn expect_properties<'a>(
     for_key: &'static str,
     annotation: &'a NonCodeValue,

src/wasm-lib/kcl/src/execution/exec_ast.rs

@@ -121,8 +121,8 @@ impl Node<MemberExpression> {
                     source_ranges: vec![self.clone().into()],
                 }))
             }
-            (KclValue::Solid { value }, Property::String(prop)) if prop == "sketch" => Ok(KclValue::Sketch {
-                value: Box::new(value.sketch),
+            (KclValue::Solid(solid), Property::String(prop)) if prop == "sketch" => Ok(KclValue::Sketch {
+                value: Box::new(solid.sketch),
             }),
             (KclValue::Sketch { value: sk }, Property::String(prop)) if prop == "tags" => Ok(KclValue::Object {
                 meta: vec![Metadata {
@@ -662,11 +662,11 @@ fn update_memory_for_tags_of_geometry(result: &mut KclValue, exec_state: &mut Ex
                 exec_state.mut_memory().update_tag(&tag.value, tag.clone())?;
             }
         }
-        KclValue::Solid { ref mut value } => {
-            for v in &value.value {
-                if let Some(tag) = v.get_tag() {
+        KclValue::Solid(ref mut solid) => {
+            for value in &solid.value {
+                if let Some(tag) = value.get_tag() {
                     // Get the past tag and update it.
-                    let mut t = if let Some(t) = value.sketch.tags.get(&tag.name) {
+                    let mut t = if let Some(t) = solid.sketch.tags.get(&tag.name) {
                         t.clone()
                     } else {
                         // It's probably a fillet or a chamfer.
@@ -674,10 +674,10 @@ fn update_memory_for_tags_of_geometry(result: &mut KclValue, exec_state: &mut Ex
                         TagIdentifier {
                             value: tag.name.clone(),
                             info: Some(TagEngineInfo {
-                                id: v.get_id(),
-                                surface: Some(v.clone()),
+                                id: value.get_id(),
+                                surface: Some(value.clone()),
                                 path: None,
-                                sketch: value.id,
+                                sketch: solid.id,
                             }),
                             meta: vec![Metadata {
                                 source_range: tag.clone().into(),
@@ -693,21 +693,21 @@ fn update_memory_for_tags_of_geometry(result: &mut KclValue, exec_state: &mut Ex
                     };
 
                     let mut info = info.clone();
-                    info.surface = Some(v.clone());
-                    info.sketch = value.id;
+                    info.surface = Some(value.clone());
+                    info.sketch = solid.id;
                     t.info = Some(info);
 
                     exec_state.mut_memory().update_tag(&tag.name, t.clone())?;
 
                     // update the sketch tags.
-                    value.sketch.tags.insert(tag.name.clone(), t);
+                    solid.sketch.tags.insert(tag.name.clone(), t);
                 }
             }
 
             // Find the stale sketch in memory and update it.
             let cur_env_index = exec_state.memory().current_env.index();
             if let Some(current_env) = exec_state.mut_memory().environments.get_mut(cur_env_index) {
-                current_env.update_sketch_tags(&value.sketch);
+                current_env.update_sketch_tags(&solid.sketch);
             }
         }
         _ => {}
@@ -929,13 +929,13 @@ impl Property {
             LiteralIdentifier::Literal(literal) => {
                 let value = literal.value.clone();
                 match value {
-                    LiteralValue::Number { value, .. } => {
-                        if let Some(x) = crate::try_f64_to_usize(value) {
+                    LiteralValue::Number(x) => {
+                        if let Some(x) = crate::try_f64_to_usize(x) {
                             Ok(Property::UInt(x))
                         } else {
                             Err(KclError::Semantic(KclErrorDetails {
                                 source_ranges: property_sr,
-                                message: format!("{value} is not a valid index, indices must be whole numbers >= 0"),
+                                message: format!("{x} is not a valid index, indices must be whole numbers >= 0"),
                             }))
                         }
                     }

src/wasm-lib/kcl/src/execution/kcl_value.rs

@@ -62,27 +62,19 @@ pub enum KclValue {
     },
     TagIdentifier(Box<TagIdentifier>),
     TagDeclarator(crate::parsing::ast::types::BoxNode<TagDeclarator>),
-    Plane {
-        value: Box<Plane>,
-    },
-    Face {
-        value: Box<Face>,
-    },
+    Plane(Box<Plane>),
+    Face(Box<Face>),
     Sketch {
         value: Box<Sketch>,
     },
     Sketches {
         value: Vec<Box<Sketch>>,
     },
-    Solid {
-        value: Box<Solid>,
-    },
+    Solid(Box<Solid>),
     Solids {
         value: Vec<Box<Solid>>,
     },
-    Helix {
-        value: Box<Helix>,
-    },
+    Helix(Box<Helix>),
     ImportedGeometry(ImportedGeometry),
     #[ts(skip)]
     Function {
@@ -128,7 +120,7 @@ impl From<Vec<Box<Sketch>>> for KclValue {
 impl From<SolidSet> for KclValue {
     fn from(eg: SolidSet) -> Self {
         match eg {
-            SolidSet::Solid(eg) => KclValue::Solid { value: eg },
+            SolidSet::Solid(eg) => KclValue::Solid(eg),
             SolidSet::Solids(egs) => KclValue::Solids { value: egs },
         }
     }
@@ -137,7 +129,7 @@ impl From<SolidSet> for KclValue {
 impl From<Vec<Box<Solid>>> for KclValue {
     fn from(eg: Vec<Box<Solid>>) -> Self {
         if eg.len() == 1 {
-            KclValue::Solid { value: eg[0].clone() }
+            KclValue::Solid(eg[0].clone())
         } else {
             KclValue::Solids { value: eg }
         }
@@ -148,15 +140,15 @@ impl From<KclValue> for Vec<SourceRange> {
         match item {
             KclValue::TagDeclarator(t) => vec![SourceRange::new(t.start, t.end, t.module_id)],
             KclValue::TagIdentifier(t) => to_vec_sr(&t.meta),
-            KclValue::Solid { value } => to_vec_sr(&value.meta),
+            KclValue::Solid(e) => to_vec_sr(&e.meta),
             KclValue::Solids { value } => value.iter().flat_map(|eg| to_vec_sr(&eg.meta)).collect(),
             KclValue::Sketch { value } => to_vec_sr(&value.meta),
             KclValue::Sketches { value } => value.iter().flat_map(|eg| to_vec_sr(&eg.meta)).collect(),
-            KclValue::Helix { value } => to_vec_sr(&value.meta),
+            KclValue::Helix(e) => to_vec_sr(&e.meta),
             KclValue::ImportedGeometry(i) => to_vec_sr(&i.meta),
             KclValue::Function { meta, .. } => to_vec_sr(&meta),
-            KclValue::Plane { value } => to_vec_sr(&value.meta),
-            KclValue::Face { value } => to_vec_sr(&value.meta),
+            KclValue::Plane(p) => to_vec_sr(&p.meta),
+            KclValue::Face(f) => to_vec_sr(&f.meta),
             KclValue::Bool { meta, .. } => to_vec_sr(&meta),
             KclValue::Number { meta, .. } => to_vec_sr(&meta),
             KclValue::Int { meta, .. } => to_vec_sr(&meta),
@@ -179,15 +171,15 @@ impl From<&KclValue> for Vec<SourceRange> {
         match item {
             KclValue::TagDeclarator(t) => vec![SourceRange::new(t.start, t.end, t.module_id)],
             KclValue::TagIdentifier(t) => to_vec_sr(&t.meta),
-            KclValue::Solid { value } => to_vec_sr(&value.meta),
+            KclValue::Solid(e) => to_vec_sr(&e.meta),
             KclValue::Solids { value } => value.iter().flat_map(|eg| to_vec_sr(&eg.meta)).collect(),
             KclValue::Sketch { value } => to_vec_sr(&value.meta),
             KclValue::Sketches { value } => value.iter().flat_map(|eg| to_vec_sr(&eg.meta)).collect(),
-            KclValue::Helix { value } => to_vec_sr(&value.meta),
+            KclValue::Helix(x) => to_vec_sr(&x.meta),
             KclValue::ImportedGeometry(i) => to_vec_sr(&i.meta),
             KclValue::Function { meta, .. } => to_vec_sr(meta),
-            KclValue::Plane { value } => to_vec_sr(&value.meta),
-            KclValue::Face { value } => to_vec_sr(&value.meta),
+            KclValue::Plane(p) => to_vec_sr(&p.meta),
+            KclValue::Face(f) => to_vec_sr(&f.meta),
             KclValue::Bool { meta, .. } => to_vec_sr(meta),
             KclValue::Number { meta, .. } => to_vec_sr(meta),
             KclValue::Int { meta, .. } => to_vec_sr(meta),
@@ -213,13 +205,13 @@ impl KclValue {
             KclValue::Object { value: _, meta } => meta.clone(),
             KclValue::TagIdentifier(x) => x.meta.clone(),
             KclValue::TagDeclarator(x) => vec![x.metadata()],
-            KclValue::Plane { value } => value.meta.clone(),
-            KclValue::Face { value } => value.meta.clone(),
+            KclValue::Plane(x) => x.meta.clone(),
+            KclValue::Face(x) => x.meta.clone(),
             KclValue::Sketch { value } => value.meta.clone(),
             KclValue::Sketches { value } => value.iter().flat_map(|sketch| &sketch.meta).copied().collect(),
-            KclValue::Solid { value } => value.meta.clone(),
+            KclValue::Solid(x) => x.meta.clone(),
             KclValue::Solids { value } => value.iter().flat_map(|sketch| &sketch.meta).copied().collect(),
-            KclValue::Helix { value } => value.meta.clone(),
+            KclValue::Helix(x) => x.meta.clone(),
             KclValue::ImportedGeometry(x) => x.meta.clone(),
             KclValue::Function { meta, .. } => meta.clone(),
             KclValue::Module { meta, .. } => meta.clone(),
@@ -238,7 +230,7 @@ impl KclValue {
 
     pub(crate) fn get_solid_set(&self) -> Result<SolidSet> {
         match self {
-            KclValue::Solid { value } => Ok(SolidSet::Solid(value.clone())),
+            KclValue::Solid(e) => Ok(SolidSet::Solid(e.clone())),
             KclValue::Solids { value } => Ok(SolidSet::Solids(value.clone())),
             KclValue::Array { value, .. } => {
                 let solids: Vec<_> = value
@@ -274,15 +266,15 @@ impl KclValue {
             KclValue::Uuid { .. } => "Unique ID (uuid)",
             KclValue::TagDeclarator(_) => "TagDeclarator",
             KclValue::TagIdentifier(_) => "TagIdentifier",
-            KclValue::Solid { .. } => "Solid",
+            KclValue::Solid(_) => "Solid",
             KclValue::Solids { .. } => "Solids",
             KclValue::Sketch { .. } => "Sketch",
             KclValue::Sketches { .. } => "Sketches",
-            KclValue::Helix { .. } => "Helix",
+            KclValue::Helix(_) => "Helix",
             KclValue::ImportedGeometry(_) => "ImportedGeometry",
             KclValue::Function { .. } => "Function",
-            KclValue::Plane { .. } => "Plane",
-            KclValue::Face { .. } => "Face",
+            KclValue::Plane(_) => "Plane",
+            KclValue::Face(_) => "Face",
             KclValue::Bool { .. } => "boolean (true/false value)",
             KclValue::Number { .. } => "number",
             KclValue::Int { .. } => "integer",
@@ -296,7 +288,7 @@ impl KclValue {
 
     pub(crate) fn from_literal(literal: LiteralValue, meta: Vec<Metadata>) -> Self {
         match literal {
-            LiteralValue::Number { value, .. } => KclValue::Number { value, meta },
+            LiteralValue::Number(value) => KclValue::Number { value, meta },
             LiteralValue::String(value) => KclValue::String { value, meta },
             LiteralValue::Bool(value) => KclValue::Bool { value, meta },
         }
@@ -391,7 +383,7 @@ impl KclValue {
     }
 
     pub fn as_plane(&self) -> Option<&Plane> {
-        if let KclValue::Plane { value } = &self {
+        if let KclValue::Plane(value) = &self {
             Some(value)
         } else {
             None
@@ -399,7 +391,7 @@ impl KclValue {
     }
 
     pub fn as_solid(&self) -> Option<&Solid> {
-        if let KclValue::Solid { value } = &self {
+        if let KclValue::Solid(value) = &self {
             Some(value)
         } else {
             None
@@ -622,19 +614,6 @@ impl From<crate::UnitLength> for UnitLen {
     }
 }
 
-impl From<UnitLen> for crate::UnitLength {
-    fn from(unit: UnitLen) -> Self {
-        match unit {
-            UnitLen::Cm => crate::UnitLength::Cm,
-            UnitLen::Feet => crate::UnitLength::Ft,
-            UnitLen::Inches => crate::UnitLength::In,
-            UnitLen::M => crate::UnitLength::M,
-            UnitLen::Mm => crate::UnitLength::Mm,
-            UnitLen::Yards => crate::UnitLength::Yd,
-        }
-    }
-}
-
 #[derive(Debug, Default, Clone, Copy, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Eq)]
 #[ts(export)]
 #[serde(tag = "type")]

src/wasm-lib/kcl/src/execution/mod.rs

@@ -1,8 +1,7 @@
 //! The executor for the AST.
 
-use std::{cmp::Ordering, path::PathBuf, sync::Arc};
+use std::{path::PathBuf, sync::Arc};
 
-use annotations::AnnotationScope;
 use anyhow::Result;
 use artifact::build_artifact_graph;
 use async_recursion::async_recursion;
@@ -43,7 +42,6 @@ use crate::{
         BodyItem, Expr, FunctionExpression, ImportSelector, ItemVisibility, Node, NodeRef, NonCodeValue,
         Program as AstProgram, TagDeclarator, TagNode,
     },
-    refgraph::extract_refgraph,
     settings::types::UnitLength,
     source_range::{ModuleId, SourceRange},
     std::{args::Arg, StdLib},
@@ -393,7 +391,7 @@ impl ProgramMemory {
                 env.bindings
                     .values()
                     .filter_map(|item| match item {
-                        KclValue::Solid { value } if value.sketch.id == sketch_id => Some(value.clone()),
+                        KclValue::Solid(eg) if eg.sketch.id == sketch_id => Some(eg.clone()),
                         _ => None,
                     })
                     .collect::<Vec<_>>()
@@ -507,8 +505,8 @@ impl DynamicState {
     fn append(&mut self, memory: &ProgramMemory) {
         for env in &memory.environments {
             for item in env.bindings.values() {
-                if let KclValue::Solid { value } = item {
-                    self.solid_ids.push(SolidLazyIds::from(value.as_ref()));
+                if let KclValue::Solid(eg) = item {
+                    self.solid_ids.push(SolidLazyIds::from(eg.as_ref()));
                 }
             }
         }
@@ -761,7 +759,6 @@ pub struct Helix {
     pub angle_start: f64,
     /// Is the helix rotation counter clockwise?
     pub ccw: bool,
-    pub units: UnitLen,
     #[serde(rename = "__meta")]
     pub meta: Vec<Metadata>,
 }
@@ -783,7 +780,6 @@ pub struct Plane {
     pub y_axis: Point3d,
     /// The z-axis (normal).
     pub z_axis: Point3d,
-    pub units: UnitLen,
     #[serde(rename = "__meta")]
     pub meta: Vec<Metadata>,
 }
@@ -799,7 +795,6 @@ impl Plane {
                 y_axis: Point3d::new(0.0, 1.0, 0.0),
                 z_axis: Point3d::new(0.0, 0.0, 1.0),
                 value: PlaneType::XY,
-                units: exec_state.length_unit(),
                 meta: vec![],
             },
             crate::std::sketch::PlaneData::NegXY => Plane {
@@ -809,7 +804,6 @@ impl Plane {
                 y_axis: Point3d::new(0.0, 1.0, 0.0),
                 z_axis: Point3d::new(0.0, 0.0, -1.0),
                 value: PlaneType::XY,
-                units: exec_state.length_unit(),
                 meta: vec![],
             },
             crate::std::sketch::PlaneData::XZ => Plane {
@@ -819,7 +813,6 @@ impl Plane {
                 y_axis: Point3d::new(0.0, 0.0, 1.0),
                 z_axis: Point3d::new(0.0, -1.0, 0.0),
                 value: PlaneType::XZ,
-                units: exec_state.length_unit(),
                 meta: vec![],
             },
             crate::std::sketch::PlaneData::NegXZ => Plane {
@@ -829,7 +822,6 @@ impl Plane {
                 y_axis: Point3d::new(0.0, 0.0, 1.0),
                 z_axis: Point3d::new(0.0, 1.0, 0.0),
                 value: PlaneType::XZ,
-                units: exec_state.length_unit(),
                 meta: vec![],
             },
             crate::std::sketch::PlaneData::YZ => Plane {
@@ -839,7 +831,6 @@ impl Plane {
                 y_axis: Point3d::new(0.0, 0.0, 1.0),
                 z_axis: Point3d::new(1.0, 0.0, 0.0),
                 value: PlaneType::YZ,
-                units: exec_state.length_unit(),
                 meta: vec![],
             },
             crate::std::sketch::PlaneData::NegYZ => Plane {
@@ -849,7 +840,6 @@ impl Plane {
                 y_axis: Point3d::new(0.0, 0.0, 1.0),
                 z_axis: Point3d::new(-1.0, 0.0, 0.0),
                 value: PlaneType::YZ,
-                units: exec_state.length_unit(),
                 meta: vec![],
             },
             crate::std::sketch::PlaneData::Plane {
@@ -864,7 +854,6 @@ impl Plane {
                 y_axis: *y_axis,
                 z_axis: *z_axis,
                 value: PlaneType::Custom,
-                units: exec_state.length_unit(),
                 meta: vec![],
             },
         }
@@ -911,7 +900,6 @@ pub struct Face {
     pub z_axis: Point3d,
     /// The solid the face is on.
     pub solid: Box<Solid>,
-    pub units: UnitLen,
     #[serde(rename = "__meta")]
     pub meta: Vec<Metadata>,
 }
@@ -1030,7 +1018,6 @@ pub struct Sketch {
     /// is sketched on face etc.
     #[serde(skip)]
     pub original_id: uuid::Uuid,
-    pub units: UnitLen,
     /// Metadata.
     #[serde(rename = "__meta")]
     pub meta: Vec<Metadata>,
@@ -1154,7 +1141,6 @@ pub struct Solid {
     /// Chamfers or fillets on this solid.
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub edge_cuts: Vec<EdgeCut>,
-    pub units: UnitLen,
     /// Metadata.
     #[serde(rename = "__meta")]
     pub meta: Vec<Metadata>,
@@ -2318,36 +2304,6 @@ impl ExecutorContext {
         }
     }
 
-    async fn handle_annotations(
-        &self,
-        annotations: impl Iterator<Item = (&NonCodeValue, SourceRange)>,
-        scope: AnnotationScope,
-        exec_state: &mut ExecState,
-    ) -> Result<(), KclError> {
-        for (annotation, source_range) in annotations {
-            if annotation.annotation_name() == Some(annotations::SETTINGS) {
-                if scope == AnnotationScope::Module {
-                    let old_units = exec_state.length_unit();
-                    exec_state
-                        .mod_local
-                        .settings
-                        .update_from_annotation(annotation, source_range)?;
-                    let new_units = exec_state.length_unit();
-                    if old_units != new_units {
-                        self.engine.set_units(new_units.into(), source_range).await?;
-                    }
-                } else {
-                    return Err(KclError::Semantic(KclErrorDetails {
-                        message: "Settings can only be modified at the top level scope of a file".to_owned(),
-                        source_ranges: vec![source_range],
-                    }));
-                }
-            }
-            // TODO warn on unknown annotations
-        }
-        Ok(())
-    }
-
     /// Execute an AST's program.
     #[async_recursion]
     pub(crate) async fn inner_execute<'a>(
@@ -2356,16 +2312,21 @@ impl ExecutorContext {
         exec_state: &mut ExecState,
         body_type: BodyType,
     ) -> Result<Option<KclValue>, KclError> {
-        self.handle_annotations(
-            program
-                .non_code_meta
-                .start_nodes
-                .iter()
-                .filter_map(|n| n.annotation().map(|result| (result, n.as_source_range()))),
-            AnnotationScope::Module,
-            exec_state,
-        )
-        .await?;
+        if let Some((annotation, source_range)) = program
+            .non_code_meta
+            .start_nodes
+            .iter()
+            .filter_map(|n| {
+                n.annotation(annotations::SETTINGS)
+                    .map(|result| (result, n.as_source_range()))
+            })
+            .next()
+        {
+            exec_state
+                .mod_local
+                .settings
+                .update_from_annotation(annotation, source_range)?;
+        }
 
         let mut last_expr = None;
         // Iterate over the body of the program.
@@ -2548,7 +2509,6 @@ impl ExecutorContext {
         exec_kind: ExecutionKind,
         source_range: SourceRange,
     ) -> Result<(Option<KclValue>, ProgramMemory, Vec<String>), KclError> {
-        let old_units = exec_state.length_unit();
         // TODO It sucks that we have to clone the whole module AST here
         let info = exec_state.global.module_infos[&module_id].clone();
 
@@ -2565,11 +2525,7 @@ impl ExecutorContext {
             .inner_execute(&info.parsed.unwrap(), exec_state, crate::execution::BodyType::Root)
             .await;
 
-        let new_units = exec_state.length_unit();
         std::mem::swap(&mut exec_state.mod_local, &mut local_state);
-        if new_units != old_units {
-            self.engine.set_units(old_units.into(), Default::default()).await?;
-        }
         self.engine.replace_execution_kind(original_execution);
 
         let result = result.map_err(|err| {

src/wasm-lib/kcl/src/lib.rs

@@ -66,7 +66,6 @@ pub mod lint;
 mod log;
 mod lsp;
 mod parsing;
-mod refgraph;
 mod settings;
 #[cfg(test)]
 mod simulation_tests;

src/wasm-lib/kcl/src/lint/checks/offset_plane.rs

@@ -163,7 +163,7 @@ fn get_xyz(point: &ObjectExpression) -> Option<(f64, f64, f64)> {
 
     fn unlitafy(lit: &LiteralValue) -> Option<f64> {
         Some(match lit {
-            LiteralValue::Number { value, .. } => *value,
+            LiteralValue::Number(value) => *value,
             _ => {
                 return None;
             }

src/wasm-lib/kcl/src/parsing/ast/digest.rs

@@ -1,6 +1,6 @@
 use sha2::{Digest as DigestTrait, Sha256};
 
-use super::types::{DefaultParamVal, ItemVisibility, LabelledExpression, LiteralValue, VariableKind};
+use super::types::{DefaultParamVal, ItemVisibility, LabelledExpression, VariableKind};
 use crate::parsing::ast::types::{
     ArrayExpression, ArrayRangeExpression, BinaryExpression, BinaryPart, BodyItem, CallExpression, CallExpressionKw,
     ElseIf, Expr, ExpressionStatement, FnArgType, FunctionExpression, Identifier, IfExpression, ImportItem,
@@ -277,26 +277,6 @@ impl Literal {
     });
 }
 
-impl LiteralValue {
-    fn digestable_id(&self) -> Vec<u8> {
-        match self {
-            LiteralValue::Number { value, suffix } => {
-                let mut result: Vec<u8> = value.to_ne_bytes().into();
-                result.extend((*suffix as u32).to_ne_bytes());
-                result
-            }
-            LiteralValue::String(st) => st.as_bytes().into(),
-            LiteralValue::Bool(b) => {
-                if *b {
-                    vec![1]
-                } else {
-                    vec![0]
-                }
-            }
-        }
-    }
-}
-
 impl Identifier {
     compute_digest!(|slf, hasher| {
         let name = slf.name.as_bytes();

src/wasm-lib/kcl/src/parsing/ast/modify.rs

@@ -18,8 +18,6 @@ use crate::{
     Program,
 };
 
-use super::types::LiteralValue;
-
 type Point3d = kcmc::shared::Point3d<f64>;
 
 #[derive(Debug)]
@@ -203,8 +201,8 @@ fn create_start_sketch_on(
         "startProfileAt",
         vec![
             ArrayExpression::new(vec![
-                Literal::new(LiteralValue::from_f64_no_uom(round_before_recast(start[0]))).into(),
-                Literal::new(LiteralValue::from_f64_no_uom(round_before_recast(start[1]))).into(),
+                Literal::new(round_before_recast(start[0]).into()).into(),
+                Literal::new(round_before_recast(start[1]).into()).into(),
             ])
             .into(),
             PipeSubstitution::new().into(),
@@ -223,8 +221,8 @@ fn create_start_sketch_on(
         "line",
         vec![
             ArrayExpression::new(vec![
-                Literal::new(LiteralValue::from_f64_no_uom(round_before_recast(end[0]))).into(),
-                Literal::new(LiteralValue::from_f64_no_uom(round_before_recast(end[1]))).into(),
+                Literal::new(round_before_recast(end[0]).into()).into(),
+                Literal::new(round_before_recast(end[1]).into()).into(),
             ])
             .into(),
             PipeSubstitution::new().into(),
@@ -256,8 +254,8 @@ fn create_start_sketch_on(
             "line",
             vec![
                 ArrayExpression::new(vec![
-                    Literal::new(LiteralValue::from_f64_no_uom(round_before_recast(line[0]))).into(),
-                    Literal::new(LiteralValue::from_f64_no_uom(round_before_recast(line[1]))).into(),
+                    Literal::new(round_before_recast(line[0]).into()).into(),
+                    Literal::new(round_before_recast(line[1]).into()).into(),
                 ])
                 .into(),
                 PipeSubstitution::new().into(),

src/wasm-lib/kcl/src/parsing/ast/types/literal_value.rs

@@ -1,49 +1,31 @@
-use std::fmt;
-
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
+use serde_json::Value as JValue;
 
 use super::Node;
-use crate::parsing::{
-    ast::types::{Expr, Literal},
-    token::NumericSuffix,
-};
+use crate::parsing::ast::types::{Expr, Literal};
 
 #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 #[serde(untagged, rename_all = "snake_case")]
 pub enum LiteralValue {
-    Number { value: f64, suffix: NumericSuffix },
+    Number(f64),
     String(String),
     Bool(bool),
 }
 
 impl LiteralValue {
-    pub fn from_f64_no_uom(value: f64) -> Self {
-        LiteralValue::Number {
-            value,
-            suffix: NumericSuffix::None,
-        }
-    }
-}
-
-impl fmt::Display for LiteralValue {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+    pub fn digestable_id(&self) -> Vec<u8> {
         match self {
-            LiteralValue::Number { value, suffix } => {
-                let int_value = *value as u64;
-                if int_value as f64 == *value {
-                    write!(f, "{int_value}")?;
+            LiteralValue::Number(frac) => frac.to_ne_bytes().into(),
+            LiteralValue::String(st) => st.as_bytes().into(),
+            LiteralValue::Bool(b) => {
+                if *b {
+                    vec![1]
                 } else {
-                    write!(f, "{value}")?;
+                    vec![0]
                 }
-                if *suffix != NumericSuffix::None {
-                    write!(f, "{suffix}")?;
-                }
-                Ok(())
             }
-            LiteralValue::String(s) => write!(f, "\"{s}\""),
-            LiteralValue::Bool(b) => write!(f, "{b}"),
         }
     }
 }
@@ -54,12 +36,49 @@ impl From<Node<Literal>> for Expr {
     }
 }
 
+impl From<LiteralValue> for JValue {
+    fn from(value: LiteralValue) -> Self {
+        match value {
+            LiteralValue::Number(x) => x.into(),
+            LiteralValue::String(x) => x.into(),
+            LiteralValue::Bool(b) => b.into(),
+        }
+    }
+}
+
+impl From<f64> for LiteralValue {
+    fn from(value: f64) -> Self {
+        Self::Number(value)
+    }
+}
+
+impl From<i64> for LiteralValue {
+    fn from(value: i64) -> Self {
+        Self::Number(value as f64)
+    }
+}
+
 impl From<String> for LiteralValue {
     fn from(value: String) -> Self {
         Self::String(value)
     }
 }
 
+impl From<u32> for LiteralValue {
+    fn from(value: u32) -> Self {
+        Self::Number(value as f64)
+    }
+}
+impl From<u16> for LiteralValue {
+    fn from(value: u16) -> Self {
+        Self::Number(value as f64)
+    }
+}
+impl From<u8> for LiteralValue {
+    fn from(value: u8) -> Self {
+        Self::Number(value as f64)
+    }
+}
 impl From<&'static str> for LiteralValue {
     fn from(value: &'static str) -> Self {
         // TODO: Make this Cow<str>

src/wasm-lib/kcl/src/parsing/ast/types/mod.rs

@@ -13,6 +13,7 @@ use anyhow::Result;
 use parse_display::{Display, FromStr};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
+use serde_json::Value as JValue;
 use tower_lsp::lsp_types::{
     CompletionItem, CompletionItemKind, DocumentSymbol, FoldingRange, FoldingRangeKind, Range as LspRange, SymbolKind,
 };
@@ -1011,9 +1012,9 @@ impl NonCodeNode {
         }
     }
 
-    pub fn annotation(&self) -> Option<&NonCodeValue> {
+    pub fn annotation(&self, expected_name: &str) -> Option<&NonCodeValue> {
         match &self.value {
-            a @ NonCodeValue::Annotation { .. } => Some(a),
+            a @ NonCodeValue::Annotation { name, .. } if name.name == expected_name => Some(a),
             _ => None,
         }
     }
@@ -1071,15 +1072,6 @@ pub enum NonCodeValue {
     },
 }
 
-impl NonCodeValue {
-    pub fn annotation_name(&self) -> Option<&str> {
-        match self {
-            NonCodeValue::Annotation { name, .. } => Some(&name.name),
-            _ => None,
-        }
-    }
-}
-
 #[derive(Debug, Default, Clone, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
@@ -1875,7 +1867,7 @@ impl Node<Literal> {
 impl Literal {
     pub fn new(value: LiteralValue) -> Node<Self> {
         Node::no_src(Self {
-            raw: value.to_string(),
+            raw: JValue::from(value.clone()).to_string(),
             value,
             digest: None,
         })
@@ -1886,7 +1878,7 @@ impl From<Node<Literal>> for KclValue {
     fn from(literal: Node<Literal>) -> Self {
         let meta = vec![literal.metadata()];
         match literal.inner.value {
-            LiteralValue::Number { value, .. } => KclValue::Number { value, meta },
+            LiteralValue::Number(value) => KclValue::Number { value, meta },
             LiteralValue::String(value) => KclValue::String { value, meta },
             LiteralValue::Bool(value) => KclValue::Bool { value, meta },
         }

src/wasm-lib/kcl/src/parsing/math.rs

@@ -126,13 +126,7 @@ impl From<BinaryOperator> for BinaryExpressionToken {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{
-        parsing::{
-            ast::types::{Literal, LiteralValue},
-            token::NumericSuffix,
-        },
-        source_range::ModuleId,
-    };
+    use crate::{parsing::ast::types::Literal, source_range::ModuleId};
 
     #[test]
     fn parse_and_evaluate() {
@@ -140,10 +134,7 @@ mod tests {
         fn lit(n: u8) -> BinaryPart {
             BinaryPart::Literal(Box::new(Node::new(
                 Literal {
-                    value: LiteralValue::Number {
-                        value: n as f64,
-                        suffix: NumericSuffix::None,
-                    },
+                    value: n.into(),
                     raw: n.to_string(),
                     digest: None,
                 },