Revert "Fix isomorphic-copy to work on Windows (#5417)" (#5424)

This reverts commit 18d87b99bd.

docs/kcl/types/KclValue.md

@@ -59,23 +59,7 @@ Any KCL value.
 |----------|------|-------------|----------|
 | `type` |enum: `Number`|  | No |
 | `value` |`number`|  | No |
-| `__meta` |`[` [`Metadata`](/docs/kcl/types/Metadata) `]`|  | No |
-
-
-----
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `Int`|  | No |
-| `value` |`integer`|  | No |
+| `ty` |[`NumericType`](/docs/kcl/types/NumericType)| Any KCL value. | No |
 | `__meta` |`[` [`Metadata`](/docs/kcl/types/Metadata) `]`|  | No |
 
 

docs/kcl/types/NumericType.md

@@ -0,0 +1,250 @@
+---
+title: "NumericType"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+
+**This schema accepts exactly one of the following:**
+
+
+**Type:** `object`
+
+
+
+**This schema accepts exactly one of the following:**
+
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `Count`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+**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 |
+
+
+----
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `Length`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+**This schema accepts exactly one of the following:**
+
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `Degrees`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `Radians`|  | No |
+
+
+----
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `Angle`|  | No |
+
+
+----
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `Known`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `Default`|  | No |
+| `len` |[`UnitLen`](/docs/kcl/types/UnitLen)|  | No |
+| `angle` |[`UnitAngle`](/docs/kcl/types/UnitAngle)|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `Unknown`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `Any`|  | No |
+
+
+----
+
+
+
+

docs/kcl/types/UnitAngle.md

@@ -0,0 +1,47 @@
+---
+title: "UnitAngle"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+
+**This schema accepts exactly one of the following:**
+
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `Degrees`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `Radians`|  | No |
+
+
+----
+
+
+
+

docs/kcl/types/UnitType.md

@@ -0,0 +1,186 @@
+---
+title: "UnitType"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+
+**This schema accepts exactly one of the following:**
+
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `Count`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+**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 |
+
+
+----
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `Length`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+**This schema accepts exactly one of the following:**
+
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `Degrees`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `Radians`|  | No |
+
+
+----
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `Angle`|  | No |
+
+
+----
+
+
+
+

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

@@ -24,7 +24,7 @@ sketch001 = startSketchOn('XZ')
 revolve001 = revolve({ axis = "X" }, sketch001)
 triangle()
   |> extrude(length = 30)
-plane001 = offsetPlane('XY', 10)
+plane001 = offsetPlane('XY', offset = 10)
 sketch002 = startSketchOn(plane001)
   |> startProfileAt([-20, 0], %)
   |> line(end = [5, -15])
@@ -35,7 +35,7 @@ sketch002 = startSketchOn(plane001)
 extrude001 = extrude(sketch002, length = 10)
 `
 
-const FEAUTRE_TREE_SKETCH_CODE = `sketch001 = startSketchOn('XZ')
+const FEATURE_TREE_SKETCH_CODE = `sketch001 = startSketchOn('XZ')
   |> startProfileAt([0, 0], %)
   |> angledLine([0, 4], %, $rectangleSegmentA001)
   |> angledLine([
@@ -54,7 +54,7 @@ sketch002 = startSketchOn(extrude001, rectangleSegmentB001)
        center = [-1, 2],
        radius = .5
      }, %)
-plane001 = offsetPlane('XZ', -5)
+plane001 = offsetPlane('XZ', offset = -5)
 sketch003 = startSketchOn(plane001)
   |> circle({ center = [0, 0], radius = 5 }, %)
 `
@@ -116,7 +116,7 @@ test.describe('Feature Tree pane', () => {
       await testViewSource({
         operationName: 'Offset Plane',
         operationIndex: 0,
-        expectedActiveLine: "plane001 = offsetPlane('XY', 10)",
+        expectedActiveLine: "plane001 = offsetPlane('XY', offset = 10)",
       })
       await testViewSource({
         operationName: 'Extrude',
@@ -153,33 +153,16 @@ test.describe('Feature Tree pane', () => {
     `User can edit sketch (but not on offset plane yet) from the feature tree`,
     { tag: '@electron' },
     async ({ context, homePage, scene, editor, toolbar, page }) => {
-      const unavailableToastMessage = page.getByText(
-        'Editing sketches on faces or offset planes through the feature tree is not yet supported'
-      )
+      await context.addInitScript((initialCode) => {
+        localStorage.setItem('persistCode', initialCode)
+      }, FEATURE_TREE_SKETCH_CODE)
+      await page.setBodyDimensions({ width: 1000, height: 500 })
+      await homePage.goToModelingScene()
 
-      await context.folderSetupFn(async (dir) => {
-        const bracketDir = join(dir, 'test-sample')
-        await fsp.mkdir(bracketDir, { recursive: true })
-        await fsp.writeFile(
-          join(bracketDir, 'main.kcl'),
-          FEAUTRE_TREE_SKETCH_CODE,
-          'utf-8'
-        )
-      })
-
-      await test.step('setup test', async () => {
-        await homePage.expectState({
-          projectCards: [
-            {
-              title: 'test-sample',
-              fileCount: 1,
-            },
-          ],
-          sortBy: 'last-modified-desc',
-        })
-        await homePage.openProject('test-sample')
-        await scene.waitForExecutionDone()
-        await toolbar.openFeatureTreePane()
+      await test.step('force re-exe', async () => {
+        await page.waitForTimeout(1000)
+        await editor.replaceCode('90', '91')
+        await page.waitForTimeout(1500)
       })
 
       await test.step('On a default plane should work', async () => {
@@ -199,24 +182,23 @@ test.describe('Feature Tree pane', () => {
       await test.step('On an extrude face should *not* work', async () => {
         // Tooltip is getting in the way of clicking, so I'm first closing the pane
         await toolbar.closeFeatureTreePane()
+        await page.waitForTimeout(1000)
+        await editor.replaceCode('91', '90')
+        await page.waitForTimeout(2000)
         await (await toolbar.getFeatureTreeOperation('Sketch', 1)).dblclick()
+
         await expect(
-          unavailableToastMessage,
-          'We should see a toast message about this'
+          toolbar.exitSketchBtn,
+          'We should be in sketch mode now'
         ).toBeVisible()
-        await unavailableToastMessage.waitFor({ state: 'detached' })
-        // TODO - turn on once we update the artifactGraph in Rust
-        // to include the proper source location for the extrude face
-        // await expect(
-        //   toolbar.exitSketchBtn,
-        //   'We should be in sketch mode now'
-        // ).toBeVisible()
-        // await editor.expectState({
-        //   highlightedCode: '',
-        //   diagnostics: [],
-        //   activeLines: ['|>circle({center=[-1,2],radius=.5},%)'],
-        // })
-        // await toolbar.exitSketchBtn.click()
+        await editor.expectState({
+          highlightedCode: '',
+          diagnostics: [],
+          activeLines: [
+            'sketch002=startSketchOn(extrude001,rectangleSegmentB001)',
+          ],
+        })
+        await toolbar.exitSketchBtn.click()
       })
 
       await test.step('On an offset plane should *not* work', async () => {
@@ -226,7 +208,7 @@ test.describe('Feature Tree pane', () => {
         await editor.expectState({
           highlightedCode: '',
           diagnostics: [],
-          activeLines: ['|>circle({center=[0,0],radius=5},%)'],
+          activeLines: ['sketch003=startSketchOn(plane001)'],
         })
         await expect(
           toolbar.exitSketchBtn,
@@ -342,7 +324,8 @@ test.describe('Feature Tree pane', () => {
     toolbar,
     cmdBar,
   }) => {
-    const testCode = (value: string) => `p = offsetPlane('XY', ${value})`
+    const testCode = (value: string) =>
+      `p = offsetPlane('XY', offset = ${value})`
     const initialInput = '10'
     const initialCode = testCode(initialInput)
     const newInput = '5 + 10'

e2e/playwright/point-click.spec.ts

@@ -1028,7 +1028,7 @@ openSketch = startSketchOn('XY')
     // One dumb hardcoded screen pixel value
     const testPoint = { x: 700, y: 150 }
     const [clickOnXzPlane] = scene.makeMouseHelpers(testPoint.x, testPoint.y)
-    const expectedOutput = `plane001 = offsetPlane('XZ', 5)`
+    const expectedOutput = `plane001 = offsetPlane('XZ', offset = 5)`
 
     await homePage.goToModelingScene()
     // FIXME: Since there is no KCL code loaded. We need to wait for the scene to load before we continue.
@@ -1164,7 +1164,7 @@ openSketch = startSketchOn('XY')
     }) => {
       const initialCode = `sketch001 = startSketchOn('XZ')
     |> circle({ center = [0, 0], radius = 30 }, %)
-    plane001 = offsetPlane('XZ', 50)
+    plane001 = offsetPlane('XZ', offset = 50)
     sketch002 = startSketchOn(plane001)
     |> circle({ center = [0, 0], radius = 20 }, %)
 `
@@ -1250,7 +1250,7 @@ openSketch = startSketchOn('XY')
   }) => {
     const initialCode = `sketch001 = startSketchOn('XZ')
   |> circle({ center = [0, 0], radius = 30 }, %)
-  plane001 = offsetPlane('XZ', 50)
+  plane001 = offsetPlane('XZ', offset = 50)
   sketch002 = startSketchOn(plane001)
   |> circle({ center = [0, 0], radius = 20 }, %)
 loft001 = loft([sketch001, sketch002])
@@ -1297,7 +1297,7 @@ loft001 = loft([sketch001, sketch002])
       await page.waitForTimeout(1000)
       await clickOnSketch2()
       await expect(page.locator('.cm-activeLine')).toHaveText(`
-      plane001 = offsetPlane('XZ', 50)
+      plane001 = offsetPlane('XZ', offset = 50)
     `)
       await page.keyboard.press('Backspace')
       // Check for sketch 1
@@ -2448,19 +2448,18 @@ extrude002 = extrude(sketch002, length = 50)
       await context.addInitScript((initialCode) => {
         localStorage.setItem('persistCode', initialCode)
       }, initialCode)
-      await page.setBodyDimensions({ width: 1000, height: 500 })
+      await page.setBodyDimensions({ width: 1200, height: 500 })
       await homePage.goToModelingScene()
       await scene.waitForExecutionDone()
 
       // One dumb hardcoded screen pixel value
-      const testPoint = { x: 550, y: 295 }
+      const testPoint = { x: 580, y: 320 }
       const [clickOnCap] = scene.makeMouseHelpers(testPoint.x, testPoint.y)
       const shellTarget = hasExtrudesInPipe ? 'sketch002' : 'extrude002'
       const shellDeclaration = `shell001 = shell(${shellTarget}, faces = ['end'], thickness = 5)`
 
       await test.step(`Look for the grey of the shape`, async () => {
-        await toolbar.closePane('code')
-        await scene.expectPixelColor([128, 128, 128], testPoint, 15)
+        await scene.expectPixelColor([113, 113, 113], testPoint, 15)
       })
 
       await test.step(`Go through the command bar flow, selecting a cap and keeping default thickness`, async () => {

e2e/playwright/sketch-tests.spec.ts

@@ -1316,7 +1316,7 @@ test.describe(`Sketching with offset planes`, () => {
     await context.addInitScript(() => {
       localStorage.setItem(
         'persistCode',
-        `offsetPlane001 = offsetPlane("XY", 10)`
+        `offsetPlane001 = offsetPlane("XY", offset = 10)`
       )
     })
 
@@ -1330,9 +1330,9 @@ test.describe(`Sketching with offset planes`, () => {
       await test.step(`Hovering should highlight code`, async () => {
         await planeHover()
         await editor.expectState({
-          activeLines: [`offsetPlane001=offsetPlane("XY",10)`],
+          activeLines: [`offsetPlane001=offsetPlane("XY",offset=10)`],
           diagnostics: [],
-          highlightedCode: 'offsetPlane("XY", 10)',
+          highlightedCode: 'offsetPlane("XY", offset = 10)',
         })
       })
 
@@ -1343,7 +1343,7 @@ test.describe(`Sketching with offset planes`, () => {
         await expect(toolbar.lineBtn).toBeEnabled()
         await editor.expectEditor.toContain('startSketchOn(offsetPlane001)')
         await editor.expectState({
-          activeLines: [`offsetPlane001=offsetPlane("XY",10)`],
+          activeLines: [`offsetPlane001=offsetPlane("XY",offset=10)`],
           diagnostics: [],
           highlightedCode: '',
         })
@@ -1353,14 +1353,103 @@ test.describe(`Sketching with offset planes`, () => {
 })
 
 test.describe('multi-profile sketching', () => {
-  test(`snapToProfile start only works for current profile`, async ({
-    context,
-    page,
-    scene,
-    toolbar,
-    editor,
-    homePage,
-  }) => {
+  test(
+    `test it removes half-finished expressions when changing tools in sketch mode`,
+    { tag: ['@skipWin'] },
+    async ({ context, page, scene, toolbar, editor, homePage }) => {
+      // We seed the scene with a single offset plane
+      await context.addInitScript(() => {
+        localStorage.setItem(
+          'persistCode',
+          `yo = 5
+sketch001 = startSketchOn('XZ')
+profile001 = startProfileAt([121.52, 168.25], sketch001)
+  |> line(end = [115.04, 113.61])
+  |> line(end = [130.87, -97.79])
+  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+  |> close()
+profile002 = startProfileAt([117.2, 56.08], sketch001)
+  |> line(end = [166.82, 25.89])
+  |> yLine(-107.86, %)
+
+`
+        )
+      })
+
+      await homePage.goToModelingScene()
+      await expect(
+        page.getByRole('button', { name: 'Start Sketch' })
+      ).not.toBeDisabled()
+
+      await (await toolbar.getFeatureTreeOperation('Sketch', 0)).dblclick()
+      await page.waitForTimeout(600)
+
+      const [circlePoint1] = scene.makeMouseHelpers(700, 200)
+
+      await test.step('equip circle tool and click first point', async () => {
+        await toolbar.circleBtn.click()
+        await page.waitForTimeout(100)
+        await circlePoint1()
+        await editor.expectEditor.toContain('profile003 = circle({ center = [')
+      })
+
+      await test.step('equip line tool and verify circle code is removed', async () => {
+        await toolbar.lineBtn.click()
+        await editor.expectEditor.not.toContain('profile003 = circle({')
+      })
+
+      const [circle3Point1] = scene.makeMouseHelpers(650, 200)
+      const [circle3Point2] = scene.makeMouseHelpers(750, 200)
+
+      await test.step('equip three point circle tool and click first two points', async () => {
+        await toolbar.selectCircleThreePoint()
+        await page.waitForTimeout(100)
+        await circle3Point1()
+        await page.waitForTimeout(100)
+        await circle3Point2()
+        await editor.expectEditor.toContain('profile003 = circleThreePoint(')
+      })
+
+      await test.step('equip line tool and verify three point circle code is removed', async () => {
+        await toolbar.lineBtn.click()
+        await editor.expectEditor.not.toContain(
+          'profile003 = circleThreePoint('
+        )
+      })
+
+      const [cornerRectPoint1] = scene.makeMouseHelpers(600, 300)
+
+      await test.step('equip corner rectangle tool and click first point', async () => {
+        await toolbar.rectangleBtn.click()
+        await page.waitForTimeout(100)
+        await cornerRectPoint1()
+        await editor.expectEditor.toContain('profile003 = startProfileAt(')
+      })
+
+      await test.step('equip line tool and verify corner rectangle code is removed', async () => {
+        await toolbar.lineBtn.click()
+        await editor.expectEditor.not.toContain('profile003 = startProfileAt(')
+      })
+
+      const [centerRectPoint1] = scene.makeMouseHelpers(700, 300)
+
+      await test.step('equip center rectangle tool and click first point', async () => {
+        await toolbar.selectCenterRectangle()
+        await page.waitForTimeout(100)
+        await centerRectPoint1()
+        await editor.expectEditor.toContain('profile003 = startProfileAt(')
+      })
+
+      await test.step('equip line tool and verify center rectangle code is removed', async () => {
+        await toolbar.lineBtn.click()
+        await editor.expectEditor.not.toContain('profile003 = startProfileAt(')
+      })
+    }
+  )
+  test(
+    `snapToProfile start only works for current profile`,
+    { tag: ['@skipWin'] },
+    async ({ context, page, scene, toolbar, editor, homePage }) => {
       // We seed the scene with a single offset plane
       await context.addInitScript(() => {
         localStorage.setItem(
@@ -1431,7 +1520,8 @@ profile003 = startProfileAt([206.63, -56.73], sketch001)
           `[profileStartX(%), profileStartY(%)]`
         )
       })
-  })
+    }
+  )
   test('Can add multiple profiles to a sketch (all tool types)', async ({
     scene,
     toolbar,
@@ -1677,14 +1767,26 @@ profile003 = startProfileAt([206.63, -56.73], sketch001)
       await circle3Point1p2()
       await page.waitForTimeout(300)
       await editor.expectEditor.toContain(
-        'profile009 = circleThreePoint(sketch001, p1 = [8.82, -14.58], p2 = [11.73, -6.1], p3 = [11.83, -6])'
+        `profile009 = circleThreePoint(
+  sketch001,
+  p1 = [8.82, -14.58],
+  p2 = [11.73, -6.1],
+  p3 = [11.83, -6],
+)`,
+        { shouldNormalise: true }
       )
 
       await circle3Point1p3Move()
       await circle3Point1p3()
       await page.waitForTimeout(300)
       await editor.expectEditor.toContain(
-        'profile009 = circleThreePoint(sketch001, p1 = [8.82, -14.58], p2 = [11.73, -6.1], p3 = [15.87, -11.12])'
+        `profile009 = circleThreePoint(
+  sketch001,
+  p1 = [8.82, -14.58],
+  p2 = [11.73, -6.1],
+  p3 = [15.87, -11.12],
+)`,
+        { shouldNormalise: true }
       )
 
       await circle3Point2p1Move()
@@ -1694,19 +1796,31 @@ profile003 = startProfileAt([206.63, -56.73], sketch001)
       await circle3Point2p2()
       await page.waitForTimeout(300)
       await editor.expectEditor.toContain(
-        'profile010 = circleThreePoint(sketch001, p1 = [25.5, -6.85], p2 = [25.43, -1.97], p3 = [25.53, -1.87])'
+        `profile010 = circleThreePoint(
+  sketch001,
+  p1 = [25.5, -6.85],
+  p2 = [25.43, -1.97],
+  p3 = [25.53, -1.87],
+)`,
+        { shouldNormalise: true }
       )
 
       await circle3Point2p3Move()
       await circle3Point2p3()
       await page.waitForTimeout(300)
       await editor.expectEditor.toContain(
-        'profile010 = circleThreePoint(sketch001, p1 = [25.5, -6.85], p2 = [25.43, -1.97], p3 = [22.65, -3.8])'
+        `profile010 = circleThreePoint(
+  sketch001,
+  p1 = [25.5, -6.85],
+  p2 = [25.43, -1.97],
+  p3 = [22.65, -3.8],
+)`,
+        { shouldNormalise: true }
       )
     })
 
     await test.step('double check that circle three point can be unequiped', async () => {
-      // this was implicitly for other tools, but not for circle three point since it's last
+      // this was tested implicitly for other tools, but not for circle three point since it's last
       await page.waitForTimeout(300)
       await expect
         .poll(async () => {
@@ -1717,13 +1831,10 @@ profile003 = startProfileAt([206.63, -56.73], sketch001)
     })
   })
 
-  test('Can edit a sketch with multiple profiles, dragging segments to edit them, and adding one new profile', async ({
-    homePage,
-    scene,
-    toolbar,
-    editor,
-    page,
-  }) => {
+  test(
+    'Can edit a sketch with multiple profiles, dragging segments to edit them, and adding one new profile',
+    { tag: ['@skipWin'] },
+    async ({ homePage, scene, toolbar, editor, page }) => {
       await page.addInitScript(async () => {
         localStorage.setItem(
           'persistCode',
@@ -1830,7 +1941,13 @@ profile004 = circleThreePoint(sketch001, p1 = [13.44, -6.8], p2 = [13.39, -2.07]
         await circ3PEnd()
         await page.mouse.up()
         await editor.expectEditor.toContain(
-        `profile004 = circleThreePoint(sketch001, p1 = [13.44, -6.8], p2 = [13.39, -2.07], p3 = [19.73, -1.33])`
+          `profile004 = circleThreePoint(
+  sketch001,
+  p1 = [13.44, -6.8],
+  p2 = [13.39, -2.07],
+  p3 = [19.73, -1.33],
+)`,
+          { shouldNormalise: true }
         )
       })
 
@@ -1857,15 +1974,12 @@ profile004 = circleThreePoint(sketch001, p1 = [13.44, -6.8], p2 = [13.39, -2.07]
   |> close()`.replaceAll('\n', '')
         )
       })
-  })
-  test('Can delete a profile in the editor while is sketch mode, and sketch mode does not break, can ctrl+z to undo after constraint with variable was added', async ({
-    scene,
-    toolbar,
-    editor,
-    cmdBar,
-    page,
-    homePage,
-  }) => {
+    }
+  )
+  test(
+    'Can delete a profile in the editor while is sketch mode, and sketch mode does not break, can ctrl+z to undo after constraint with variable was added',
+    { tag: ['@skipWin', '@skipLinux'] },
+    async ({ scene, toolbar, editor, cmdBar, page, homePage }) => {
       await page.addInitScript(async () => {
         localStorage.setItem(
           'persistCode',
@@ -1893,6 +2007,7 @@ profile003 = circle({ center = [6.92, -4.2], radius = 3.16 }, sketch001)
 
       await page.setBodyDimensions({ width: 1000, height: 500 })
       await homePage.goToModelingScene()
+      await scene.waitForExecutionDone()
       await expect(
         page.getByRole('button', { name: 'Start Sketch' })
       ).not.toBeDisabled()
@@ -1947,7 +2062,7 @@ profile003 = circle({ center = [6.92, -4.2], radius = 3.16 }, sketch001)
             activeLines: ['|>line(end = [-0.41,6.99])'],
             highlightedCode: 'line(end = [-0.41,6.99])',
           })
-      }).toPass({ timeout: 5_000, intervals: [500] })
+        }).toPass({ timeout: 30_000, intervals: [1500] })
 
         await toolbar.lengthConstraintBtn.click()
         await cmdBar.progressCmdBar()
@@ -1964,14 +2079,13 @@ profile003 = circle({ center = [6.92, -4.2], radius = 3.16 }, sketch001)
         await editor.expectEditor.not.toContain('length001 = 7')
         await sketchIsDrawnProperly()
       })
-  })
+    }
+  )
 
-  test('can enter sketch when there is an extrude', async ({
-    homePage,
-    scene,
-    toolbar,
-    page,
-  }) => {
+  test(
+    'can enter sketch when there is an extrude',
+    { tag: ['@skipWin'] },
+    async ({ homePage, scene, toolbar, page }) => {
       await page.addInitScript(async () => {
         localStorage.setItem(
           'persistCode',
@@ -2023,7 +2137,8 @@ extrude001 = extrude(profile003, length = 5)
         await scene.expectPixelColor([255, 255, 255], { x: 641, y: 220 }, 15)
         await scene.expectPixelColor([255, 255, 255], { x: 763, y: 214 }, 15)
       })
-  })
+    }
+  )
   test('exit new sketch without drawing anything should not be a problem', async ({
     homePage,
     scene,
@@ -2068,13 +2183,10 @@ extrude001 = extrude(profile003, length = 5)
       await scene.expectPixelColor([255, 255, 255], { x: 633, y: 211 }, 15)
     })
   })
-  test('A sketch with only "startProfileAt" and no segments should still be able to be continued', async ({
-    homePage,
-    scene,
-    toolbar,
-    editor,
-    page,
-  }) => {
+  test(
+    'A sketch with only "startProfileAt" and no segments should still be able to be continued',
+    { tag: ['@skipWin'] },
+    async ({ homePage, scene, toolbar, editor, page }) => {
       await page.addInitScript(async () => {
         localStorage.setItem(
           'persistCode',
@@ -2111,14 +2223,12 @@ profile002 = startProfileAt([85.81, 52.55], sketch002)
       await page.waitForTimeout(100)
       await nextPoint()
       await editor.expectEditor.toContain(`|> line(end = [126.05, 44.12])`)
-  })
-  test('old style sketch all in one pipe (with extrude) will break up to allow users to add a new profile to the same sketch', async ({
-    homePage,
-    scene,
-    toolbar,
-    editor,
-    page,
-  }) => {
+    }
+  )
+  test(
+    'old style sketch all in one pipe (with extrude) will break up to allow users to add a new profile to the same sketch',
+    { tag: ['@skipWin'] },
+    async ({ homePage, scene, toolbar, editor, page }) => {
       await page.addInitScript(async () => {
         localStorage.setItem(
           'persistCode',
@@ -2172,14 +2282,12 @@ extrude001 = extrude(thePart, length = 75)
         await profilePoint2()
         await editor.expectEditor.toContain(`|> line(end = [18.97, -18.06])`)
       })
-  })
-  test('Can enter sketch on sketch of wall and cap for segment, solid2d, extrude-wall, extrude-cap selections', async ({
-    homePage,
-    scene,
-    toolbar,
-    editor,
-    page,
-  }) => {
+    }
+  )
+  test(
+    'Can enter sketch on sketch of wall and cap for segment, solid2d, extrude-wall, extrude-cap selections',
+    { tag: ['@skipWin'] },
+    async ({ homePage, scene, toolbar, editor, page }) => {
       // TODO this test should include a test for selecting revolve walls and caps
 
       await page.addInitScript(async () => {
@@ -2273,7 +2381,10 @@ extrude003 = extrude(profile011, length = 2.5)
           { x: -54, y: -476, z: 148 }
         )
       const camPositionForSelectingSketchOnCapProfiles = () =>
-      scene.moveCameraTo({ x: 404, y: 690, z: 38 }, { x: 16, y: -140, z: -10 })
+        scene.moveCameraTo(
+          { x: 404, y: 690, z: 38 },
+          { x: 16, y: -140, z: -10 }
+        )
       const wallSelectionOptions = [
         {
           title: 'select wall segment',
@@ -2323,13 +2434,29 @@ extrude003 = extrude(profile011, length = 2.5)
       const verifyWallProfilesAreDrawn = async () =>
         test.step('verify wall profiles are drawn', async () => {
           // open polygon
-        await scene.expectPixelColor(TEST_COLORS.WHITE, { x: 599, y: 168 }, 15)
+          await scene.expectPixelColor(
+            TEST_COLORS.WHITE,
+            { x: 599, y: 168 },
+            15
+          )
           // closed polygon
-        await scene.expectPixelColor(TEST_COLORS.WHITE, { x: 656, y: 171 }, 15)
+          await scene.expectPixelColor(
+            TEST_COLORS.WHITE,
+            { x: 656, y: 171 },
+            15
+          )
           // revolved profile
-        await scene.expectPixelColor(TEST_COLORS.WHITE, { x: 655, y: 264 }, 15)
+          await scene.expectPixelColor(
+            TEST_COLORS.WHITE,
+            { x: 655, y: 264 },
+            15
+          )
           // extruded profile
-        await scene.expectPixelColor(TEST_COLORS.WHITE, { x: 808, y: 396 }, 15)
+          await scene.expectPixelColor(
+            TEST_COLORS.WHITE,
+            { x: 808, y: 396 },
+            15
+          )
           // circle
           await scene.expectPixelColor(
             [
@@ -2351,11 +2478,23 @@ extrude003 = extrude(profile011, length = 2.5)
             15
           )
           // revolved profile
-        await scene.expectPixelColor(TEST_COLORS.WHITE, { x: 641, y: 110 }, 15)
+          await scene.expectPixelColor(
+            TEST_COLORS.WHITE,
+            { x: 641, y: 110 },
+            15
+          )
           // closed polygon
-        await scene.expectPixelColor(TEST_COLORS.WHITE, { x: 632, y: 200 }, 15)
+          await scene.expectPixelColor(
+            TEST_COLORS.WHITE,
+            { x: 632, y: 200 },
+            15
+          )
           // extruded profile
-        await scene.expectPixelColor(TEST_COLORS.WHITE, { x: 628, y: 410 }, 15)
+          await scene.expectPixelColor(
+            TEST_COLORS.WHITE,
+            { x: 628, y: 410 },
+            15
+          )
           // circle
           await scene.expectPixelColor(
             [
@@ -2396,14 +2535,12 @@ extrude003 = extrude(profile011, length = 2.5)
           })
         }
       })
-  })
-  test('Can enter sketch loft edges, base and continue sketch', async ({
-    homePage,
-    scene,
-    toolbar,
-    editor,
-    page,
-  }) => {
+    }
+  )
+  test(
+    'Can enter sketch loft edges, base and continue sketch',
+    { tag: ['@skipWin'] },
+    async ({ homePage, scene, toolbar, editor, page }) => {
       await page.addInitScript(async () => {
         localStorage.setItem(
           'persistCode',
@@ -2413,7 +2550,7 @@ profile001 = startProfileAt([34, 42.66], sketch001)
   |> line(end = [76, -138.66])
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
-plane001 = offsetPlane('XZ', 50)
+plane001 = offsetPlane('XZ', offset = 50)
 sketch002 = startSketchOn(plane001)
 profile002 = startProfileAt([39.43, 172.21], sketch002)
   |> xLine(183.99, %)
@@ -2452,14 +2589,11 @@ loft([profile001, profile002])
       await editor.expectEditor.toContain(
         `angledLine([0, 113.01], %, $rectangleSegmentA001)`
       )
-  })
-  test('Can enter sketch loft edges offsetPlane and continue sketch', async ({
-    scene,
-    toolbar,
-    editor,
-    page,
-    homePage,
-  }) => {
+    }
+  )
+  test.fixme(
+    'Can enter sketch loft edges offsetPlane and continue sketch',
+    async ({ scene, toolbar, editor, page, homePage }) => {
       await page.addInitScript(async () => {
         localStorage.setItem(
           'persistCode',
@@ -2469,7 +2603,7 @@ profile001 = startProfileAt([34, 42.66], sketch001)
   |> line(end = [76, -138.66])
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
-plane001 = offsetPlane('XZ', 50)
+plane001 = offsetPlane('XZ', offset = 50)
 sketch002 = startSketchOn(plane001)
 profile002 = startProfileAt([39.43, 172.21], sketch002)
   |> xLine(183.99, %)
@@ -2522,7 +2656,8 @@ loft([profile001, profile002])
         `angledLine([0, 106.42], %, $rectangleSegmentA001)`
       )
       await page.waitForTimeout(100)
-  })
+    }
+  )
 })
 
 // Regression test for https://github.com/KittyCAD/modeling-app/issues/4891

e2e/playwright/testing-selections.spec.ts

@@ -390,43 +390,47 @@ profile003 = startProfileAt([40.16, -120.48], sketch006)
       `rev = revolve({ axis: 'y' }, part009)`
     )
 
-    // DELETE PARENT EXTRUDE
-    await page.mouse.click(parentExtrude.x, parentExtrude.y)
-    await page.waitForTimeout(100)
-    await expect(page.locator('.cm-activeLine')).toHaveText(
-      '|> line(end = [170.36, -121.61], tag = $seg01)'
-    )
-    await u.clearCommandLogs()
-    await page.keyboard.press('Backspace')
-    await u.expectCmdLog('[data-message-type="execution-done"]', 10_000)
-    await page.waitForTimeout(200)
-    await expect(u.codeLocator).not.toContainText(
-      `extrude001 = extrude(sketch001, length = 50)`
-    )
-    await expect(u.codeLocator).toContainText(`sketch005 = startSketchOn({
-     plane = {
-       origin = { x = 0, y = -50, z = 0 },
-       xAxis = { x = 1, y = 0, z = 0 },
-       yAxis = { x = 0, y = 0, z = 1 },
-       zAxis = { x = 0, y = -1, z = 0 }
-     }
-   })`)
-    await expect(u.codeLocator).toContainText(`sketch003 = startSketchOn({
-     plane = {
-       origin = { x = 116.53, y = 0, z = 163.25 },
-       xAxis = { x = -0.81, y = 0, z = 0.58 },
-       yAxis = { x = 0, y = -1, z = 0 },
-       zAxis = { x = 0.58, y = 0, z = 0.81 }
-     }
-   })`)
-    await expect(u.codeLocator).toContainText(`sketch002 = startSketchOn({
-     plane = {
-       origin = { x = -91.74, y = 0, z = 80.89 },
-       xAxis = { x = -0.66, y = 0, z = -0.75 },
-       yAxis = { x = 0, y = -1, z = 0 },
-       zAxis = { x = -0.75, y = 0, z = 0.66 }
-     }
-   })`)
+    // FIXME (commented section below), this test would select a wall that had a sketch on it, and delete the underlying extrude
+    // and replace the sketch on face with a hard coded custom plane, but since there was a sketch on that plane maybe it
+    // should have delete the sketch? it's broken atm, but not sure if worth fixing since desired behaviour is a little
+    // vague
+    //   // DELETE PARENT EXTRUDE
+    //   await page.mouse.click(parentExtrude.x, parentExtrude.y)
+    //   await page.waitForTimeout(100)
+    //   await expect(page.locator('.cm-activeLine')).toHaveText(
+    //     '|> line(end = [170.36, -121.61], tag = $seg01)'
+    //   )
+    //   await u.clearCommandLogs()
+    //   await page.keyboard.press('Backspace')
+    //   await u.expectCmdLog('[data-message-type="execution-done"]', 10_000)
+    //   await page.waitForTimeout(200)
+    //   await expect(u.codeLocator).not.toContainText(
+    //     `extrude001 = extrude(sketch001, length = 50)`
+    //   )
+    //   await expect(u.codeLocator).toContainText(`sketch005 = startSketchOn({
+    //    plane = {
+    //      origin = { x = 0, y = -50, z = 0 },
+    //      xAxis = { x = 1, y = 0, z = 0 },
+    //      yAxis = { x = 0, y = 0, z = 1 },
+    //      zAxis = { x = 0, y = -1, z = 0 }
+    //    }
+    //  })`)
+    //   await expect(u.codeLocator).toContainText(`sketch003 = startSketchOn({
+    //    plane = {
+    //      origin = { x = 116.53, y = 0, z = 163.25 },
+    //      xAxis = { x = -0.81, y = 0, z = 0.58 },
+    //      yAxis = { x = 0, y = -1, z = 0 },
+    //      zAxis = { x = 0.58, y = 0, z = 0.81 }
+    //    }
+    //  })`)
+    //   await expect(u.codeLocator).toContainText(`sketch002 = startSketchOn({
+    //    plane = {
+    //      origin = { x = -91.74, y = 0, z = 80.89 },
+    //      xAxis = { x = -0.66, y = 0, z = -0.75 },
+    //      yAxis = { x = 0, y = -1, z = 0 },
+    //      zAxis = { x = -0.75, y = 0, z = 0.66 }
+    //    }
+    //  })`)
 
     // DELETE SOLID 2D
     await page.mouse.click(solid2d.x, solid2d.y)
@@ -454,10 +458,9 @@ profile003 = startProfileAt([40.16, -120.48], sketch006)
     await page.waitForTimeout(200)
     await expect(u.codeLocator).not.toContainText(codeToBeDeletedSnippet)
   })
-  test("Deleting solid that the AST mod can't handle results in a toast message", async ({
-    page,
-    homePage,
-  }) => {
+  test.fixme(
+    "Deleting solid that the AST mod can't handle results in a toast message",
+    async ({ page, homePage }) => {
       const u = await getUtils(page)
       await page.addInitScript(async () => {
         localStorage.setItem(
@@ -518,7 +521,8 @@ profile003 = startProfileAt([40.16, -120.48], sketch006)
       await page.keyboard.press('Backspace')
 
       await expect(page.getByText('Unable to delete selection')).toBeVisible()
-  })
+    }
+  )
   test('Hovering over 3d features highlights code, clicking puts the cursor in the right place and sends selection id to engine', async ({
     page,
     homePage,

electron-builder.yml

@@ -16,8 +16,7 @@ mac:
       arch:
         - x64
         - arm64
-  notarize:
-    teamId: 92H8YB3B95
+  notarize: true
   fileAssociations:
     - ext: kcl
       name: kcl
@@ -32,9 +31,10 @@ win:
       arch:
         - x64
         - arm64
+  signtoolOptions:
+    sign: "./scripts/sign-win.js"
     signingHashAlgorithms:
       - sha256
-  sign: "./scripts/sign-win.js"
     publisherName: "KittyCAD Inc" # needs to be exactly like on Digicert
   icon: "assets/icon.ico"
   fileAssociations:

package.json

@@ -40,7 +40,7 @@
     "codemirror": "^6.0.1",
     "decamelize": "^6.0.0",
     "diff": "^7.0.0",
-    "electron-updater": "6.3.0",
+    "electron-updater": "^6.5.0",
     "fuse.js": "^7.0.0",
     "html2canvas-pro": "^1.5.8",
     "isomorphic-fetch": "^3.0.0",
@@ -85,7 +85,7 @@
     "fmt": "prettier --write ./src *.ts *.json *.js ./e2e ./packages",
     "fmt-check": "prettier --check ./src *.ts *.json *.js ./e2e ./packages",
     "fetch:wasm": "./get-latest-wasm-bundle.sh",
-    "fetch:samples": "echo \"Fetching latest KCL samples...\" && curl -o public/kcl-samples-manifest-fallback.json https://raw.githubusercontent.com/KittyCAD/kcl-samples/achalmers/kw-pattern-transform2/manifest.json",
+    "fetch:samples": "echo \"Fetching latest KCL samples...\" && curl -o public/kcl-samples-manifest-fallback.json https://raw.githubusercontent.com/KittyCAD/kcl-samples/next/manifest.json",
     "isomorphic-copy-wasm": "(copy src/wasm-lib/pkg/wasm_lib_bg.wasm public || cp src/wasm-lib/pkg/wasm_lib_bg.wasm public)",
     "build:wasm-dev": "yarn wasm-prep && (cd src/wasm-lib && wasm-pack build --dev --target web --out-dir pkg && cargo test -p kcl-lib export_bindings) && yarn isomorphic-copy-wasm && yarn fmt",
     "build:wasm": "yarn wasm-prep && cd src/wasm-lib && wasm-pack build --release --target web --out-dir pkg && cargo test -p kcl-lib export_bindings && cd ../.. && yarn isomorphic-copy-wasm && yarn fmt",
@@ -145,10 +145,11 @@
   "devDependencies": {
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@babel/preset-env": "^7.25.4",
-    "@electron-forge/cli": "7.4.0",
-    "@electron-forge/plugin-fuses": "7.4.0",
-    "@electron-forge/plugin-vite": "7.4.0",
-    "@electron/fuses": "1.8.0",
+    "@electron-forge/cli": "^7.6.1",
+    "@electron-forge/plugin-fuses": "^7.6.1",
+    "@electron-forge/plugin-vite": "^7.6.1",
+    "@electron/fuses": "^1.8.0",
+    "@electron/notarize": "^2.5.0",
     "@iarna/toml": "^2.2.5",
     "@lezer/generator": "^1.7.2",
     "@nabla/vite-plugin-eslint": "^2.0.5",
@@ -175,9 +176,8 @@
     "@vitest/web-worker": "^1.5.0",
     "@xstate/cli": "^0.5.17",
     "autoprefixer": "^10.4.19",
-    "electron": "32.1.2",
-    "electron-builder": "24.13.3",
-    "electron-notarize": "1.2.2",
+    "electron": "^34.1.1",
+    "electron-builder": "^26.0.6",
     "eslint": "^8.0.1",
     "eslint-plugin-css-modules": "^2.12.0",
     "eslint-plugin-import": "^2.30.0",

packages/codemirror-lang-kcl/src/kcl.grammar

@@ -1,4 +1,5 @@
 @precedence {
+  annotation
   member
   call
   exp @left
@@ -20,9 +21,12 @@ statement[@isGroup=Statement] {
   FunctionDeclaration { kw<"export">? kw<"fn"> VariableDefinition Equals? ParamList Arrow? Body } |
   VariableDeclaration { kw<"export">? (kw<"var"> | kw<"let"> | kw<"const">)? VariableDefinition Equals expression } |
   ReturnStatement { kw<"return"> expression } |
-  ExpressionStatement { expression }
+  ExpressionStatement { expression } |
+  Annotation { AnnotationName AnnotationList? }
 }
 
+AnnotationList { !annotation "(" commaSep<AnnotationProperty> ")" }
+
 ParamList { "(" commaSep<Parameter { VariableDefinition "?"? (":" type)? }> ")" }
 
 Body { "{" statement* "}" }
@@ -59,6 +63,12 @@ UnaryOp { AddOp | BangOp }
 
 ObjectProperty { PropertyName (":" | Equals) expression }
 
+AnnotationProperty {
+  PropertyName
+  ( AddOp | MultOp | ExpOp | LogicOp | BangOp | CompOp | Equals | Arrow | PipeOperator | PipeSubstitution )
+  expression
+}
+
 LabeledArgument { ArgumentLabel Equals expression }
 
 ArgumentList { "(" commaSep<LabeledArgument | expression> ")" }
@@ -105,6 +115,7 @@ commaSep1NoTrailingComma<term> { term ("," term)* }
   PipeSubstitution { "%" }
 
   identifier { (@asciiLetter | "_") (@asciiLetter | @digit | "_")* }
+  AnnotationName { "@" identifier? }
   PropertyName { identifier }
   TagDeclarator { "$" identifier }
 

packages/codemirror-lang-kcl/test/annotation.txt

@@ -0,0 +1,153 @@
+# alone
+
+@a
+
+==>
+Program(Annotation(AnnotationName))
+
+# alone and anonymous
+
+@
+
+==>
+Program(Annotation(AnnotationName))
+
+# empty
+
+@ann()
+
+==>
+Program(Annotation(AnnotationName,
+                   AnnotationList))
+
+# empty and anonymous
+
+@()
+
+==>
+Program(Annotation(AnnotationName,
+                   AnnotationList))
+
+# equals
+
+@setting(a=1)
+
+==>
+Program(Annotation(AnnotationName,
+                   AnnotationList(AnnotationProperty(PropertyName,
+                                                     Equals,
+                                                     Number))))
+
+# operator
+
+@ann(a*1)
+
+==>
+Program(Annotation(AnnotationName,
+                   AnnotationList(AnnotationProperty(PropertyName,
+                                                     MultOp,
+                                                     Number))))
+
+# anonymous
+
+@(a=1)
+
+==>
+Program(Annotation(AnnotationName,
+                   AnnotationList(AnnotationProperty(PropertyName,
+                                                     Equals,
+                                                     Number))))
+
+# complex expr
+
+@ann(a=(1+2+f('yes')))
+
+==>
+Program(Annotation(AnnotationName,
+                   AnnotationList(AnnotationProperty(PropertyName,
+                                                     Equals,
+                                                     ParenthesizedExpression(BinaryExpression(BinaryExpression(Number,
+                                                                                                               AddOp,
+                                                                                                               Number),
+                                                                                              AddOp,
+                                                                                              CallExpression(VariableName,
+                                                                                                             ArgumentList(String))))))))
+
+# many args
+
+@ann(a=1, b=2)
+
+==>
+Program(Annotation(AnnotationName,
+                   AnnotationList(AnnotationProperty(PropertyName,
+                                                     Equals,
+                                                     Number),
+                                  AnnotationProperty(PropertyName,
+                                                     Equals,
+                                                     Number))))
+
+# space around op
+
+@ann(a / 1)
+
+==>
+Program(Annotation(AnnotationName,
+                   AnnotationList(AnnotationProperty(PropertyName,
+                                                     MultOp,
+                                                     Number))))
+
+# space around sep
+
+@ann(a/1 , b/2)
+
+==>
+Program(Annotation(AnnotationName,
+                   AnnotationList(AnnotationProperty(PropertyName,
+                                                     MultOp,
+                                                     Number),
+                                  AnnotationProperty(PropertyName,
+                                                     MultOp,
+                                                     Number))))
+
+# trailing sep
+
+@ann(a=1,)
+
+==>
+Program(Annotation(AnnotationName,
+                   AnnotationList(AnnotationProperty(PropertyName,
+                                                     Equals,
+                                                     Number))))
+
+# lone sep
+
+@ann(,)
+
+==>
+Program(Annotation(AnnotationName,
+                   AnnotationList))
+
+# inside fn
+
+fn f() {
+  @anno(b=2)
+}
+
+==>
+Program(FunctionDeclaration(fn,
+                            VariableDefinition,
+                            ParamList,
+                            Body(Annotation(AnnotationName,
+                                            AnnotationList(AnnotationProperty(PropertyName,
+                                                                              Equals,
+                                                                              Number))))))
+
+# laxer with space than the language parser is
+
+@anno (b=2)
+
+==>
+Program(Annotation(AnnotationName,
+                   AnnotationList(AnnotationProperty(PropertyName,
+                                                     Equals,
+                                                     Number))))

src/components/ModelingMachineProvider.tsx

@@ -69,6 +69,7 @@ import {
   startSketchOnDefault,
 } from 'lang/modifyAst'
 import {
+  KclValue,
   PathToNode,
   Program,
   VariableDeclaration,
@@ -804,12 +805,33 @@ export const ModelingMachineProvider = ({
               engineCommandManager.artifactGraph
             )
             if (err(plane)) return Promise.reject(plane)
-
-            const sketch = Object.values(kclManager.execState.variables).find(
-              (variable) =>
+            let sketch: KclValue | null = null
+            for (const variable of Object.values(
+              kclManager.execState.variables
+            )) {
+              // find programMemory that matches path artifact
+              if (
                 variable?.type === 'Sketch' &&
                 variable.value.artifactId === plane.pathIds[0]
-            )
+              ) {
+                sketch = variable
+                break
+              }
+              if (
+                // if the variable is an sweep, check if the underlying sketch matches the artifact
+                variable?.type === 'Solid' &&
+                variable.value.sketch.on.type === 'plane' &&
+                variable.value.sketch.artifactId === plane.pathIds[0]
+              ) {
+                sketch = {
+                  type: 'Sketch',
+                  value: variable.value.sketch,
+                }
+                break
+              }
+            }
+            if (!sketch || sketch.type !== 'Sketch')
+              return Promise.reject(new Error('No sketch'))
             if (!sketch || sketch.type !== 'Sketch')
               return Promise.reject(new Error('No sketch'))
             const info = await getSketchOrientationDetails(sketch.value)
@@ -1551,8 +1573,11 @@ export const ModelingMachineProvider = ({
                   ? pathToProfile
                   : updatedSketchNodePaths[0]
             }
+
+            if (doesNeedSplitting || indexToDelete >= 0) {
               await kclManager.executeAstMock(moddedAst)
               await codeManager.updateEditorWithAstAndWriteToFile(moddedAst)
+            }
             return {
               updatedEntryNodePath: pathToProfile,
               updatedSketchNodePaths: updatedSketchNodePaths,

src/lang/codeManager.ts

@@ -8,7 +8,7 @@ import { editorManager } from 'lib/singletons'
 import { Annotation, Transaction } from '@codemirror/state'
 import { EditorView, KeyBinding } from '@codemirror/view'
 import { recast, Program } from 'lang/wasm'
-import { err } from 'lib/trap'
+import { err, reportRejection } from 'lib/trap'
 import { Compartment } from '@codemirror/state'
 import { history } from '@codemirror/commands'
 
@@ -168,7 +168,7 @@ export default class CodeManager {
     const newCode = recast(ast)
     if (err(newCode)) return
     this.updateCodeStateEditor(newCode)
-    await this.writeToFile()
+    this.writeToFile().catch(reportRejection)
   }
 }
 

src/lang/executor.test.ts

@@ -239,6 +239,7 @@ const newVar = myVar + 1`
     expect(mem['three']).toEqual({
       type: 'Number',
       value: 3,
+      ty: expect.any(Object),
       __meta: [
         {
           sourceRange: [14, 15, 0],
@@ -248,12 +249,23 @@ const newVar = myVar + 1`
     expect(mem['yo']).toEqual({
       type: 'Array',
       value: [
-        { type: 'Number', value: 1, __meta: [{ sourceRange: [28, 29, 0] }] },
+        {
+          type: 'Number',
+          value: 1,
+          ty: expect.any(Object),
+          __meta: [{ sourceRange: [28, 29, 0] }],
+        },
         { type: 'String', value: '2', __meta: [{ sourceRange: [31, 34, 0] }] },
-        { type: 'Number', value: 3, __meta: [{ sourceRange: [14, 15, 0] }] },
+        {
+          type: 'Number',
+          value: 3,
+          ty: expect.any(Object),
+          __meta: [{ sourceRange: [14, 15, 0] }],
+        },
         {
           type: 'Number',
           value: 9,
+          ty: expect.any(Object),
           __meta: [{ sourceRange: [43, 44, 0] }, { sourceRange: [47, 48, 0] }],
         },
       ],
@@ -281,16 +293,19 @@ const newVar = myVar + 1`
         anum: {
           type: 'Number',
           value: 2,
+          ty: expect.any(Object),
           __meta: [{ sourceRange: [47, 48, 0] }],
         },
         identifier: {
           type: 'Number',
           value: 3,
+          ty: expect.any(Object),
           __meta: [{ sourceRange: [14, 15, 0] }],
         },
         binExp: {
           type: 'Number',
           value: 9,
+          ty: expect.any(Object),
           __meta: [{ sourceRange: [77, 78, 0] }, { sourceRange: [81, 82, 0] }],
         },
       },
@@ -404,6 +419,7 @@ describe('testing math operators', () => {
         ],
         type: 'Number',
         value: 1,
+        ty: expect.any(Object),
       },
       {
         __meta: [
@@ -413,6 +429,7 @@ describe('testing math operators', () => {
         ],
         type: 'Number',
         value: -3,
+        ty: expect.any(Object),
       },
     ])
   })

src/lang/kclSamples.test.ts

@@ -32,7 +32,7 @@ child_process.spawnSync('git', [
   'clone',
   '--single-branch',
   '--branch',
-  'achalmers/kw-pattern-transform2',
+  'next',
   URL_GIT_KCL_SAMPLES,
   DIR_KCL_SAMPLES,
 ])

src/lang/modifyAst.test.ts

@@ -821,144 +821,146 @@ sketch003 = startSketchOn('XZ')
         type: 'segment',
       },
     ],
-    [
-      'delete extrude',
-      {
-        codeBefore: `sketch001 = startSketchOn('XZ')
-  |> startProfileAt([3.29, 7.86], %)
-  |> line(end = [2.48, 2.44])
-  |> line(end = [2.66, 1.17])
-  |> line(end = [3.75, 0.46])
-  |> line(end = [4.99, -0.46], tag = $seg01)
-  |> line(end = [-3.86, -2.73])
-  |> line(end = [-17.67, 0.85])
-  |> close()
-const extrude001 = extrude(sketch001, length = 10)`,
-        codeAfter: `sketch001 = startSketchOn('XZ')
-  |> startProfileAt([3.29, 7.86], %)
-  |> line(end = [2.48, 2.44])
-  |> line(end = [2.66, 1.17])
-  |> line(end = [3.75, 0.46])
-  |> line(end = [4.99, -0.46], tag = $seg01)
-  |> line(end = [-3.86, -2.73])
-  |> line(end = [-17.67, 0.85])
-  |> close()\n`,
-        lineOfInterest: 'line(end = [2.66, 1.17])',
-        type: 'wall',
-      },
-    ],
-    [
-      'delete extrude with sketch on it',
-      {
-        codeBefore: `myVar = 5
-sketch001 = startSketchOn('XZ')
-  |> startProfileAt([4.46, 5.12], %, $tag)
-  |> line(end = [0.08, myVar])
-  |> line(end = [13.03, 2.02], tag = $seg01)
-  |> line(end = [3.9, -7.6])
-  |> line(end = [-11.18, -2.15])
-  |> line(end = [5.41, -9.61])
-  |> line(end = [-8.54, -2.51])
-  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-  |> close()
-const extrude001 = extrude(sketch001, length = 5)
-sketch002 = startSketchOn(extrude001, seg01)
-  |> startProfileAt([-12.55, 2.89], %)
-  |> line(end = [3.02, 1.9])
-  |> line(end = [1.82, -1.49], tag = $seg02)
-  |> angledLine([-86, segLen(seg02)], %)
-  |> line(end = [-3.97, -0.53])
-  |> line(end = [0.3, 0.84])
-  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-  |> close()`,
-        codeAfter: `myVar = 5
-sketch001 = startSketchOn('XZ')
-  |> startProfileAt([4.46, 5.12], %, $tag)
-  |> line(end = [0.08, myVar])
-  |> line(end = [13.03, 2.02], tag = $seg01)
-  |> line(end = [3.9, -7.6])
-  |> line(end = [-11.18, -2.15])
-  |> line(end = [5.41, -9.61])
-  |> line(end = [-8.54, -2.51])
-  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-  |> close()
-sketch002 = startSketchOn({
-       plane = {
-         origin = { x = 1, y = 2, z = 3 },
-         xAxis = { x = 4, y = 5, z = 6 },
-         yAxis = { x = 7, y = 8, z = 9 },
-         zAxis = { x = 10, y = 11, z = 12 }
-       }
-     })
-  |> startProfileAt([-12.55, 2.89], %)
-  |> line(end = [3.02, 1.9])
-  |> line(end = [1.82, -1.49], tag = $seg02)
-  |> angledLine([-86, segLen(seg02)], %)
-  |> line(end = [-3.97, -0.53])
-  |> line(end = [0.3, 0.84])
-  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-  |> close()
-`,
-        lineOfInterest: 'line(end = [-11.18, -2.15])',
-        type: 'wall',
-      },
-    ],
-    [
-      'delete extrude with sketch on it 2',
-      {
-        codeBefore: `myVar = 5
-sketch001 = startSketchOn('XZ')
-  |> startProfileAt([4.46, 5.12], %, $tag)
-  |> line(end = [0.08, myVar])
-  |> line(end = [13.03, 2.02], tag = $seg01)
-  |> line(end = [3.9, -7.6])
-  |> line(end = [-11.18, -2.15])
-  |> line(end = [5.41, -9.61])
-  |> line(end = [-8.54, -2.51])
-  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-  |> close()
-const extrude001 = extrude(sketch001, length = 5)
-sketch002 = startSketchOn(extrude001, seg01)
-  |> startProfileAt([-12.55, 2.89], %)
-  |> line(end = [3.02, 1.9])
-  |> line(end = [1.82, -1.49], tag = $seg02)
-  |> angledLine([-86, segLen(seg02)], %)
-  |> line(end = [-3.97, -0.53])
-  |> line(end = [0.3, 0.84])
-  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-  |> close()`,
-        codeAfter: `myVar = 5
-sketch001 = startSketchOn('XZ')
-  |> startProfileAt([4.46, 5.12], %, $tag)
-  |> line(end = [0.08, myVar])
-  |> line(end = [13.03, 2.02], tag = $seg01)
-  |> line(end = [3.9, -7.6])
-  |> line(end = [-11.18, -2.15])
-  |> line(end = [5.41, -9.61])
-  |> line(end = [-8.54, -2.51])
-  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-  |> close()
-sketch002 = startSketchOn({
-       plane = {
-         origin = { x = 1, y = 2, z = 3 },
-         xAxis = { x = 4, y = 5, z = 6 },
-         yAxis = { x = 7, y = 8, z = 9 },
-         zAxis = { x = 10, y = 11, z = 12 }
-       }
-     })
-  |> startProfileAt([-12.55, 2.89], %)
-  |> line(end = [3.02, 1.9])
-  |> line(end = [1.82, -1.49], tag = $seg02)
-  |> angledLine([-86, segLen(seg02)], %)
-  |> line(end = [-3.97, -0.53])
-  |> line(end = [0.3, 0.84])
-  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-  |> close()
-`,
-        lineOfInterest: 'startProfileAt([4.46, 5.12], %, $tag)',
-        type: 'cap',
-      },
-    ],
+    // TODO FIXME, similar to fix me in e2e/playwright/testing-selections.spec.ts
+    // also related to deleting, deleting in general probably is due for a refactor
+    //     [
+    //       'delete extrude',
+    //       {
+    //         codeBefore: `sketch001 = startSketchOn('XZ')
+    //   |> startProfileAt([3.29, 7.86], %)
+    //   |> line(end = [2.48, 2.44])
+    //   |> line(end = [2.66, 1.17])
+    //   |> line(end = [3.75, 0.46])
+    //   |> line(end = [4.99, -0.46], tag = $seg01)
+    //   |> line(end = [-3.86, -2.73])
+    //   |> line(end = [-17.67, 0.85])
+    //   |> close()
+    // const extrude001 = extrude(sketch001, length = 10)`,
+    //         codeAfter: `sketch001 = startSketchOn('XZ')
+    //   |> startProfileAt([3.29, 7.86], %)
+    //   |> line(end = [2.48, 2.44])
+    //   |> line(end = [2.66, 1.17])
+    //   |> line(end = [3.75, 0.46])
+    //   |> line(end = [4.99, -0.46], tag = $seg01)
+    //   |> line(end = [-3.86, -2.73])
+    //   |> line(end = [-17.67, 0.85])
+    //   |> close()\n`,
+    //         lineOfInterest: 'line(end = [2.66, 1.17])',
+    //         type: 'wall',
+    //       },
+    //     ],
+    //     [
+    //       'delete extrude with sketch on it',
+    //       {
+    //         codeBefore: `myVar = 5
+    // sketch001 = startSketchOn('XZ')
+    //   |> startProfileAt([4.46, 5.12], %, $tag)
+    //   |> line(end = [0.08, myVar])
+    //   |> line(end = [13.03, 2.02], tag = $seg01)
+    //   |> line(end = [3.9, -7.6])
+    //   |> line(end = [-11.18, -2.15])
+    //   |> line(end = [5.41, -9.61])
+    //   |> line(end = [-8.54, -2.51])
+    //   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+    //   |> close()
+    // const extrude001 = extrude(sketch001, length = 5)
+    // sketch002 = startSketchOn(extrude001, seg01)
+    //   |> startProfileAt([-12.55, 2.89], %)
+    //   |> line(end = [3.02, 1.9])
+    //   |> line(end = [1.82, -1.49], tag = $seg02)
+    //   |> angledLine([-86, segLen(seg02)], %)
+    //   |> line(end = [-3.97, -0.53])
+    //   |> line(end = [0.3, 0.84])
+    //   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+    //   |> close()`,
+    //         codeAfter: `myVar = 5
+    // sketch001 = startSketchOn('XZ')
+    //   |> startProfileAt([4.46, 5.12], %, $tag)
+    //   |> line(end = [0.08, myVar])
+    //   |> line(end = [13.03, 2.02], tag = $seg01)
+    //   |> line(end = [3.9, -7.6])
+    //   |> line(end = [-11.18, -2.15])
+    //   |> line(end = [5.41, -9.61])
+    //   |> line(end = [-8.54, -2.51])
+    //   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+    //   |> close()
+    // sketch002 = startSketchOn({
+    //        plane = {
+    //          origin = { x = 1, y = 2, z = 3 },
+    //          xAxis = { x = 4, y = 5, z = 6 },
+    //          yAxis = { x = 7, y = 8, z = 9 },
+    //          zAxis = { x = 10, y = 11, z = 12 }
+    //        }
+    //      })
+    //   |> startProfileAt([-12.55, 2.89], %)
+    //   |> line(end = [3.02, 1.9])
+    //   |> line(end = [1.82, -1.49], tag = $seg02)
+    //   |> angledLine([-86, segLen(seg02)], %)
+    //   |> line(end = [-3.97, -0.53])
+    //   |> line(end = [0.3, 0.84])
+    //   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+    //   |> close()
+    // `,
+    //         lineOfInterest: 'line(end = [-11.18, -2.15])',
+    //         type: 'wall',
+    //       },
+    //     ],
+    //     [
+    //       'delete extrude with sketch on it 2',
+    //       {
+    //         codeBefore: `myVar = 5
+    // sketch001 = startSketchOn('XZ')
+    //   |> startProfileAt([4.46, 5.12], %, $tag)
+    //   |> line(end = [0.08, myVar])
+    //   |> line(end = [13.03, 2.02], tag = $seg01)
+    //   |> line(end = [3.9, -7.6])
+    //   |> line(end = [-11.18, -2.15])
+    //   |> line(end = [5.41, -9.61])
+    //   |> line(end = [-8.54, -2.51])
+    //   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+    //   |> close()
+    // const extrude001 = extrude(sketch001, length = 5)
+    // sketch002 = startSketchOn(extrude001, seg01)
+    //   |> startProfileAt([-12.55, 2.89], %)
+    //   |> line(end = [3.02, 1.9])
+    //   |> line(end = [1.82, -1.49], tag = $seg02)
+    //   |> angledLine([-86, segLen(seg02)], %)
+    //   |> line(end = [-3.97, -0.53])
+    //   |> line(end = [0.3, 0.84])
+    //   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+    //   |> close()`,
+    //         codeAfter: `myVar = 5
+    // sketch001 = startSketchOn('XZ')
+    //   |> startProfileAt([4.46, 5.12], %, $tag)
+    //   |> line(end = [0.08, myVar])
+    //   |> line(end = [13.03, 2.02], tag = $seg01)
+    //   |> line(end = [3.9, -7.6])
+    //   |> line(end = [-11.18, -2.15])
+    //   |> line(end = [5.41, -9.61])
+    //   |> line(end = [-8.54, -2.51])
+    //   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+    //   |> close()
+    // sketch002 = startSketchOn({
+    //        plane = {
+    //          origin = { x = 1, y = 2, z = 3 },
+    //          xAxis = { x = 4, y = 5, z = 6 },
+    //          yAxis = { x = 7, y = 8, z = 9 },
+    //          zAxis = { x = 10, y = 11, z = 12 }
+    //        }
+    //      })
+    //   |> startProfileAt([-12.55, 2.89], %)
+    //   |> line(end = [3.02, 1.9])
+    //   |> line(end = [1.82, -1.49], tag = $seg02)
+    //   |> angledLine([-86, segLen(seg02)], %)
+    //   |> line(end = [-3.97, -0.53])
+    //   |> line(end = [0.3, 0.84])
+    //   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+    //   |> close()
+    // `,
+    //         lineOfInterest: 'startProfileAt([4.46, 5.12], %, $tag)',
+    //         type: 'cap',
+    //       },
+    //     ],
   ] as const
   test.each(cases)(
     '%s',
@@ -980,6 +982,7 @@ sketch002 = startSketchOn({
           artifact,
         },
         execState.variables,
+        execState.artifactGraph,
         async () => {
           await new Promise((resolve) => setTimeout(resolve, 100))
           return {

src/lang/modifyAst.ts

@@ -38,6 +38,7 @@ import {
   isCallExprWithName,
   ARG_INDEX_FIELD,
   LABELED_ARG_FIELD,
+  UNLABELED_ARG,
 } from './queryAst'
 import {
   addTagForSketchOnFace,
@@ -68,12 +69,12 @@ import {
   expandWall,
   getArtifactOfTypes,
   getArtifactsOfTypes,
+  getFaceCodeRef,
   getPathsFromArtifact,
 } from './std/artifactGraph'
 import { BodyItem } from 'wasm-lib/kcl/bindings/BodyItem'
 import { findKwArg } from './util'
 import { deleteEdgeTreatment } from './modifyAst/addEdgeTreatment'
-import { engineCommandManager } from 'lib/singletons'
 
 export function startSketchOnDefault(
   node: Node<Program>,
@@ -676,10 +677,11 @@ export function addOffsetPlane({
 
   const newPlane = createVariableDeclaration(
     newPlaneName,
-    createCallExpressionStdLib('offsetPlane', [
+    createCallExpressionStdLibKw(
+      'offsetPlane',
       createLiteral(defaultPlane.toUpperCase()),
-      offset,
-    ])
+      [createLabeledArg('offset', offset)]
+    )
   )
 
   const insertAt =
@@ -697,8 +699,7 @@ export function addOffsetPlane({
     [insertAt, 'index'],
     ['declaration', 'VariableDeclaration'],
     ['init', 'VariableDeclarator'],
-    ['arguments', 'CallExpression'],
-    [0, 'index'],
+    ['unlabeled', UNLABELED_ARG],
   ]
   return {
     modifiedAst,
@@ -983,6 +984,7 @@ export function createCallExpressionStdLibKw(
     end: 0,
     moduleId: 0,
     outerAttrs: [],
+    nonCodeMeta: nonCodeMetaEmpty(),
     callee: {
       type: 'Identifier',
       start: 0,
@@ -1390,6 +1392,7 @@ export async function deleteFromSelection(
   ast: Node<Program>,
   selection: Selection,
   variables: VariableMap,
+  artifactGraph: ArtifactGraph,
   getFaceDetails: (id: string) => Promise<Models['FaceIsPlanar_type']> = () =>
     ({} as any)
 ): Promise<Node<Program> | Error> {
@@ -1402,12 +1405,12 @@ export async function deleteFromSelection(
   ) {
     const plane =
       selection.artifact.type === 'plane'
-        ? expandPlane(selection.artifact, engineCommandManager.artifactGraph)
+        ? expandPlane(selection.artifact, artifactGraph)
         : selection.artifact.type === 'wall'
-        ? expandWall(selection.artifact, engineCommandManager.artifactGraph)
-        : expandCap(selection.artifact, engineCommandManager.artifactGraph)
+        ? expandWall(selection.artifact, artifactGraph)
+        : expandCap(selection.artifact, artifactGraph)
     for (const path of plane.paths.sort(
-      (a, b) => b.codeRef.range[0] - a.codeRef.range[0]
+      (a, b) => b.codeRef.range?.[0] - a.codeRef.range?.[0]
     )) {
       const varDec = getNodeFromPath<VariableDeclarator>(
         ast,
@@ -1424,6 +1427,15 @@ export async function deleteFromSelection(
       selection.artifact.type === 'cap' ||
       selection.artifact.type === 'wall'
     ) {
+      // Delete the sketch node, which would not work if
+      // we continued down the traditional code path below.
+      // faceCodeRef's pathToNode is empty for some reason
+      // so using source range instead
+      const codeRef = getFaceCodeRef(selection.artifact)
+      if (!codeRef) return new Error('Could not find face code ref')
+      const sketchVarDec = getNodePathFromSourceRange(astClone, codeRef.range)
+      const sketchBodyIndex = Number(sketchVarDec[1][0])
+      astClone.body.splice(sketchBodyIndex, 1)
       return astClone
     }
   }
@@ -1523,20 +1535,20 @@ export async function deleteFromSelection(
                 selection.artifact.surfaceId
               ? getArtifactOfTypes(
                   { key: selection.artifact.surfaceId, types: ['wall'] },
-                  engineCommandManager.artifactGraph
+                  artifactGraph
                 )
               : null
           if (err(wallArtifact)) return
           if (wallArtifact) {
             const sweep = getArtifactOfTypes(
               { key: wallArtifact.sweepId, types: ['sweep'] },
-              engineCommandManager.artifactGraph
+              artifactGraph
             )
             if (err(sweep)) return
             const wallsWithDependencies = Array.from(
               getArtifactsOfTypes(
                 { keys: sweep.surfaceIds, types: ['wall', 'cap'] },
-                engineCommandManager.artifactGraph
+                artifactGraph
               ).values()
             ).filter((wall) => wall?.pathIds?.length)
             const wallIds = wallsWithDependencies.map((wall) => wall.id)
@@ -1714,7 +1726,7 @@ export async function deleteFromSelection(
   return new Error('Selection not recognised, could not delete')
 }
 
-const nonCodeMetaEmpty = () => {
+export const nonCodeMetaEmpty = () => {
   return { nonCodeNodes: {}, startNodes: [], start: 0, end: 0 }
 }
 

src/lang/queryAst.test.ts

@@ -582,7 +582,7 @@ sketch002 = startSketchOn(extrude001, $seg01)
   it('finds sketch001 and sketch002 pipes to be lofted', async () => {
     const exampleCode = `sketch001 = startSketchOn('XZ')
   |> circle({ center = [0, 0], radius = 1 }, %)
-plane001 = offsetPlane('XZ', 2)
+plane001 = offsetPlane('XZ', offset = 2)
 sketch002 = startSketchOn(plane001)
   |> circle({ center = [0, 0], radius = 3 }, %)
 `

src/lang/queryAst.ts

@@ -45,6 +45,7 @@ import { ImportStatement } from 'wasm-lib/kcl/bindings/ImportStatement'
 import { KclSettingsAnnotation } from 'lib/settings/settingsTypes'
 
 export const LABELED_ARG_FIELD = 'LabeledArg -> Arg'
+export const UNLABELED_ARG = 'unlabeled first arg'
 export const ARG_INDEX_FIELD = 'arg index'
 
 /**

src/lang/std/artifactGraph.ts

@@ -532,6 +532,32 @@ function getPlaneFromSolid2D(
   if (err(path)) return path
   return getPlaneFromPath(path, graph)
 }
+function getPlaneFromCap(
+  cap: CapArtifact,
+  graph: ArtifactGraph
+): PlaneArtifact | WallArtifact | CapArtifact | Error {
+  const sweep = getArtifactOfTypes(
+    { key: cap.sweepId, types: ['sweep'] },
+    graph
+  )
+  if (err(sweep)) return sweep
+  const path = getArtifactOfTypes({ key: sweep.pathId, types: ['path'] }, graph)
+  if (err(path)) return path
+  return getPlaneFromPath(path, graph)
+}
+function getPlaneFromWall(
+  wall: WallArtifact,
+  graph: ArtifactGraph
+): PlaneArtifact | WallArtifact | CapArtifact | Error {
+  const sweep = getArtifactOfTypes(
+    { key: wall.sweepId, types: ['sweep'] },
+    graph
+  )
+  if (err(sweep)) return sweep
+  const path = getArtifactOfTypes({ key: sweep.pathId, types: ['path'] }, graph)
+  if (err(path)) return path
+  return getPlaneFromPath(path, graph)
+}
 function getPlaneFromSweepEdge(edge: SweepEdge, graph: ArtifactGraph) {
   const sweep = getArtifactOfTypes(
     { key: edge.sweepId, types: ['sweep'] },
@@ -552,7 +578,15 @@ export function getPlaneFromArtifact(
   if (artifact.type === 'path') return getPlaneFromPath(artifact, graph)
   if (artifact.type === 'segment') return getPlaneFromSegment(artifact, graph)
   if (artifact.type === 'solid2d') return getPlaneFromSolid2D(artifact, graph)
-  if (artifact.type === 'wall' || artifact.type === 'cap') return artifact
+  if (
+    // if the user selects a face with sketch on it (pathIds.length), they probably wanted to edit that sketch,
+    // not the sketch for the underlying sweep sketch
+    (artifact.type === 'wall' || artifact.type === 'cap') &&
+    artifact?.pathIds?.length
+  )
+    return artifact
+  if (artifact.type === 'cap') return getPlaneFromCap(artifact, graph)
+  if (artifact.type === 'wall') return getPlaneFromWall(artifact, graph)
   if (artifact.type === 'sweepEdge')
     return getPlaneFromSweepEdge(artifact, graph)
   return new Error(`Artifact type ${artifact.type} does not have a plane`)

src/lang/std/sketch.ts

@@ -30,6 +30,7 @@ import { toolTips, ToolTip } from 'lang/langHelpers'
 import {
   createPipeExpression,
   mutateKwArg,
+  nonCodeMetaEmpty,
   splitPathAtPipeExpression,
 } from '../modifyAst'
 
@@ -2829,6 +2830,7 @@ function addTagKw(): addTagFn {
             unlabeled: callExpr.node.arguments.length
               ? callExpr.node.arguments[0]
               : null,
+            nonCodeMeta: nonCodeMetaEmpty(),
             arguments: [],
           }
     const tagArg = findKwArg(ARG_TAG, primaryCallExp)

src/lib/kclHelpers.test.ts

@@ -14,6 +14,7 @@ describe('KCL expression calculations', () => {
     variables['x'] = {
       type: 'Number',
       value: 2,
+      ty: { type: 'Any' },
       __meta: [],
     }
     const actual = await getCalculatedKclExpressionValue('1 + x', variables)
@@ -32,6 +33,7 @@ describe('KCL expression calculations', () => {
     variables['y'] = {
       type: 'Number',
       value: 2,
+      ty: { type: 'Any' },
       __meta: [],
     }
     const actual = await getCalculatedKclExpressionValue('1 + x', variables)
@@ -44,6 +46,7 @@ describe('KCL expression calculations', () => {
     variables['x'] = {
       type: 'Number',
       value: 2,
+      ty: { type: 'Any' },
       __meta: [],
     }
     const actual = await getCalculatedKclExpressionValue(

src/lib/operations.ts

@@ -126,8 +126,7 @@ const prepareToEditOffsetPlane: PrepareToEditCallback = async ({
   if (
     operation.type !== 'StdLibCall' ||
     !operation.labeledArgs ||
-    !('std_plane' in operation.labeledArgs) ||
-    !operation.labeledArgs.std_plane ||
+    !operation.unlabeledArg ||
     !('offset' in operation.labeledArgs) ||
     !operation.labeledArgs.offset
   ) {
@@ -135,11 +134,9 @@ const prepareToEditOffsetPlane: PrepareToEditCallback = async ({
   }
   // TODO: Implement conversion to arbitrary plane selection
   // once the Offset Plane command supports it.
+  const stdPlane = operation.unlabeledArg
   const planeName = codeManager.code
-    .slice(
-      operation.labeledArgs.std_plane.sourceRange[0],
-      operation.labeledArgs.std_plane.sourceRange[1]
-    )
+    .slice(stdPlane.sourceRange[0], stdPlane.sourceRange[1])
     .replaceAll(`'`, ``)
 
   if (!isDefaultPlaneStr(planeName)) {

src/lib/toolbar.ts

@@ -375,14 +375,7 @@ export const toolbarConfig: Record<ToolbarModeName, ToolbarMode> = {
         },
         icon: 'line',
         status: 'available',
-        disabled: (state) =>
-          state.matches('Sketch no face') ||
-          state.matches({
-            Sketch: { 'Rectangle tool': 'Awaiting second corner' },
-          }) ||
-          state.matches({
-            Sketch: { 'Circle tool': 'Awaiting Radius' },
-          }),
+        disabled: (state) => state.matches('Sketch no face'),
         title: 'Line',
         hotkey: (state) =>
           state.matches({ Sketch: 'Line tool' }) ? ['Esc', 'L'] : 'L',

src/main.ts

@@ -53,6 +53,7 @@ process.env.VITE_KC_CONNECTION_TIMEOUT_MS ??=
 console.log('process.env', process.env)
 
 /// Register our application to handle all "zoo-studio:" protocols.
+const singleInstanceLock = app.requestSingleInstanceLock()
 if (process.defaultApp) {
   if (process.argv.length >= 2) {
     app.setAsDefaultProtocolClient(ZOO_STUDIO_PROTOCOL, process.execPath, [
@@ -65,7 +66,13 @@ if (process.defaultApp) {
 
 // Global app listeners
 // Must be done before ready event.
-registerStartupListeners()
+// Checking against this lock is needed for Windows and Linux, see
+// https://www.electronjs.org/docs/latest/tutorial/launch-app-from-url-in-another-app#windows-and-linux-code
+if (!singleInstanceLock && !process.env.IS_PLAYWRIGHT) {
+  app.quit()
+} else {
+  registerStartupListeners()
+}
 
 const createWindow = (pathToOpen?: string, reuse?: boolean): BrowserWindow => {
   let newWindow
@@ -75,7 +82,7 @@ const createWindow = (pathToOpen?: string, reuse?: boolean): BrowserWindow => {
   }
   if (!newWindow) {
     newWindow = new BrowserWindow({
-      autoHideMenuBar: true,
+      autoHideMenuBar: false,
       show: false,
       width: 1800,
       height: 1200,

src/wasm-lib/Cargo.lock

@@ -730,7 +730,7 @@ dependencies = [
 
 [[package]]
 name = "derive-docs"
-version = "0.1.36"
+version = "0.1.38"
 dependencies = [
  "Inflector",
  "anyhow",
@@ -1712,7 +1712,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-lib"
-version = "0.2.35"
+version = "0.2.38"
 dependencies = [
  "anyhow",
  "approx 0.5.1",
@@ -1779,7 +1779,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-test-server"
-version = "0.1.21"
+version = "0.1.38"
 dependencies = [
  "anyhow",
  "hyper 0.14.32",

src/wasm-lib/derive-docs/Cargo.toml

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

src/wasm-lib/kcl-test-server/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "kcl-test-server"
 description = "A test server for KCL"
-version = "0.1.21"
+version = "0.1.38"
 edition = "2021"
 license = "MIT"
 

src/wasm-lib/kcl-to-core/src/conn_mock_core.rs

@@ -1,7 +1,4 @@
-use std::{
-    collections::HashMap,
-    sync::{Arc, Mutex},
-};
+use std::{collections::HashMap, sync::Arc};
 
 use anyhow::Result;
 use indexmap::IndexMap;
@@ -24,22 +21,20 @@ const NEED_PLANES: bool = true;
 
 #[derive(Debug, Clone)]
 pub struct EngineConnection {
-    batch: Arc<Mutex<Vec<(WebSocketRequest, kcl_lib::SourceRange)>>>,
-    batch_end: Arc<Mutex<IndexMap<uuid::Uuid, (WebSocketRequest, kcl_lib::SourceRange)>>>,
-    core_test: Arc<Mutex<String>>,
+    batch: Arc<RwLock<Vec<(WebSocketRequest, kcl_lib::SourceRange)>>>,
+    batch_end: Arc<RwLock<IndexMap<uuid::Uuid, (WebSocketRequest, kcl_lib::SourceRange)>>>,
+    core_test: Arc<RwLock<String>>,
     default_planes: Arc<RwLock<Option<DefaultPlanes>>>,
-    execution_kind: Arc<Mutex<ExecutionKind>>,
+    execution_kind: Arc<RwLock<ExecutionKind>>,
 }
 
 impl EngineConnection {
-    pub async fn new(result: Arc<Mutex<String>>) -> Result<EngineConnection> {
-        if let Ok(mut code) = result.lock() {
-            code.push_str(CPP_PREFIX);
-        }
+    pub async fn new(result: Arc<RwLock<String>>) -> Result<EngineConnection> {
+        result.write().await.push_str(CPP_PREFIX);
 
         Ok(EngineConnection {
-            batch: Arc::new(Mutex::new(Vec::new())),
-            batch_end: Arc::new(Mutex::new(IndexMap::new())),
+            batch: Arc::new(RwLock::new(Vec::new())),
+            batch_end: Arc::new(RwLock::new(IndexMap::new())),
             core_test: result,
             default_planes: Default::default(),
             execution_kind: Default::default(),
@@ -362,29 +357,29 @@ fn codegen_cpp_repl_uuid_setters(reps_id: &str, entity_ids: &[uuid::Uuid]) -> St
 
 #[async_trait::async_trait]
 impl kcl_lib::EngineManager for EngineConnection {
-    fn batch(&self) -> Arc<Mutex<Vec<(WebSocketRequest, kcl_lib::SourceRange)>>> {
+    fn batch(&self) -> Arc<RwLock<Vec<(WebSocketRequest, kcl_lib::SourceRange)>>> {
         self.batch.clone()
     }
 
-    fn batch_end(&self) -> Arc<Mutex<IndexMap<uuid::Uuid, (WebSocketRequest, kcl_lib::SourceRange)>>> {
+    fn batch_end(&self) -> Arc<RwLock<IndexMap<uuid::Uuid, (WebSocketRequest, kcl_lib::SourceRange)>>> {
         self.batch_end.clone()
     }
 
-    fn responses(&self) -> IndexMap<Uuid, WebSocketResponse> {
-        IndexMap::new()
+    fn responses(&self) -> Arc<RwLock<IndexMap<Uuid, WebSocketResponse>>> {
+        Arc::new(RwLock::new(IndexMap::new()))
     }
 
-    fn take_artifact_commands(&self) -> Vec<ArtifactCommand> {
-        Vec::new()
+    fn artifact_commands(&self) -> Arc<RwLock<Vec<ArtifactCommand>>> {
+        Arc::new(RwLock::new(Vec::new()))
     }
 
-    fn execution_kind(&self) -> ExecutionKind {
-        let guard = self.execution_kind.lock().unwrap();
+    async fn execution_kind(&self) -> ExecutionKind {
+        let guard = self.execution_kind.read().await;
         *guard
     }
 
-    fn replace_execution_kind(&self, execution_kind: ExecutionKind) -> ExecutionKind {
-        let mut guard = self.execution_kind.lock().unwrap();
+    async fn replace_execution_kind(&self, execution_kind: ExecutionKind) -> ExecutionKind {
+        let mut guard = self.execution_kind.write().await;
         let original = *guard;
         *guard = execution_kind;
         original
@@ -435,10 +430,7 @@ impl kcl_lib::EngineManager for EngineConnection {
             }) => {
                 let mut responses = HashMap::new();
                 for request in requests {
-                    let (new_code, this_response);
-
-                    if let Ok(mut test_code) = self.core_test.lock() {
-                        (new_code, this_response) = self.handle_command(&request.cmd_id, &request.cmd);
+                    let (new_code, this_response) = self.handle_command(&request.cmd_id, &request.cmd);
 
                     if !new_code.is_empty() {
                         let new_code = new_code
@@ -449,10 +441,7 @@ impl kcl_lib::EngineManager for EngineConnection {
                             .join(" ")
                             + "\n";
                         //println!("{new_code}");
-                            test_code.push_str(&new_code);
-                        }
-                    } else {
-                        this_response = OkModelingCmdResponse::Empty {};
+                        self.core_test.write().await.push_str(&new_code);
                     }
 
                     responses.insert(
@@ -470,10 +459,7 @@ impl kcl_lib::EngineManager for EngineConnection {
             }
             WebSocketRequest::ModelingCmdReq(ModelingCmdReq { cmd, cmd_id }) => {
                 //also handle unbatched requests inline
-                let (new_code, this_response);
-
-                if let Ok(mut test_code) = self.core_test.lock() {
-                    (new_code, this_response) = self.handle_command(&cmd_id, &cmd);
+                let (new_code, this_response) = self.handle_command(&cmd_id, &cmd);
 
                 if !new_code.is_empty() {
                     let new_code = new_code
@@ -484,10 +470,7 @@ impl kcl_lib::EngineManager for EngineConnection {
                         .join(" ")
                         + "\n";
                     //println!("{new_code}");
-                        test_code.push_str(&new_code);
-                    }
-                } else {
-                    this_response = OkModelingCmdResponse::Empty {};
+                    self.core_test.write().await.push_str(&new_code);
                 }
 
                 Ok(WebSocketResponse::Success(kcmc::websocket::SuccessWebSocketResponse {

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

@@ -1,7 +1,8 @@
-use std::sync::{Arc, Mutex};
+use std::sync::Arc;
 
 use anyhow::Result;
 use kcl_lib::{ExecState, ExecutorContext};
+use tokio::sync::RwLock;
 
 #[cfg(not(target_arch = "wasm32"))]
 mod conn_mock_core;
@@ -10,7 +11,7 @@ mod conn_mock_core;
 pub async fn kcl_to_engine_core(code: &str) -> Result<String> {
     let program = kcl_lib::Program::parse_no_errs(code)?;
 
-    let result = Arc::new(Mutex::new("".into()));
+    let result = Arc::new(RwLock::new("".into()));
     let ref_result = Arc::clone(&result);
 
     let ctx = ExecutorContext::new_forwarded_mock(Arc::new(Box::new(
@@ -18,6 +19,6 @@ pub async fn kcl_to_engine_core(code: &str) -> Result<String> {
     )));
     ctx.run(&program, &mut ExecState::new(&ctx.settings)).await?;
 
-    let result = result.lock().expect("mutex lock").clone();
+    let result = result.read().await.clone();
     Ok(result)
 }

src/wasm-lib/kcl/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "kcl-lib"
 description = "KittyCAD Language implementation and tools"
-version = "0.2.35"
+version = "0.2.38"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/KittyCAD/modeling-app"

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

@@ -1,13 +1,9 @@
 //! Functions for setting up our WebSocket and WebRTC connections for communications with the
 //! engine.
 
-use std::{
-    collections::HashMap,
-    sync::{Arc, Mutex},
-};
+use std::{collections::HashMap, sync::Arc};
 
 use anyhow::{anyhow, Result};
-use dashmap::DashMap;
 use futures::{SinkExt, StreamExt};
 use indexmap::IndexMap;
 use kcmc::{
@@ -17,9 +13,7 @@ use kcmc::{
     },
     ModelingCmd,
 };
-use kittycad_modeling_cmds::{
-    self as kcmc, id::ModelingCmdId, ok_response::OkModelingCmdResponse, websocket::ModelingBatch,
-};
+use kittycad_modeling_cmds::{self as kcmc};
 use tokio::sync::{mpsc, oneshot, RwLock};
 use tokio_tungstenite::tungstenite::Message as WsMsg;
 use uuid::Uuid;
@@ -43,21 +37,21 @@ type WebSocketTcpWrite = futures::stream::SplitSink<tokio_tungstenite::WebSocket
 pub struct EngineConnection {
     engine_req_tx: mpsc::Sender<ToEngineReq>,
     shutdown_tx: mpsc::Sender<()>,
-    responses: Arc<DashMap<uuid::Uuid, WebSocketResponse>>,
-    pending_errors: Arc<Mutex<Vec<String>>>,
+    responses: Arc<RwLock<IndexMap<uuid::Uuid, WebSocketResponse>>>,
+    pending_errors: Arc<RwLock<Vec<String>>>,
     #[allow(dead_code)]
     tcp_read_handle: Arc<TcpReadHandle>,
-    socket_health: Arc<Mutex<SocketHealth>>,
-    batch: Arc<Mutex<Vec<(WebSocketRequest, SourceRange)>>>,
-    batch_end: Arc<Mutex<IndexMap<uuid::Uuid, (WebSocketRequest, SourceRange)>>>,
-    artifact_commands: Arc<Mutex<Vec<ArtifactCommand>>>,
+    socket_health: Arc<RwLock<SocketHealth>>,
+    batch: Arc<RwLock<Vec<(WebSocketRequest, SourceRange)>>>,
+    batch_end: Arc<RwLock<IndexMap<uuid::Uuid, (WebSocketRequest, SourceRange)>>>,
+    artifact_commands: Arc<RwLock<Vec<ArtifactCommand>>>,
 
     /// The default planes for the scene.
     default_planes: Arc<RwLock<Option<DefaultPlanes>>>,
     /// If the server sends session data, it'll be copied to here.
-    session_data: Arc<Mutex<Option<ModelingSessionData>>>,
+    session_data: Arc<RwLock<Option<ModelingSessionData>>>,
 
-    execution_kind: Arc<Mutex<ExecutionKind>>,
+    execution_kind: Arc<RwLock<ExecutionKind>>,
 }
 
 pub struct TcpRead {
@@ -230,12 +224,12 @@ impl EngineConnection {
 
         let mut tcp_read = TcpRead { stream: tcp_read };
 
-        let session_data: Arc<Mutex<Option<ModelingSessionData>>> = Arc::new(Mutex::new(None));
+        let session_data: Arc<RwLock<Option<ModelingSessionData>>> = Arc::new(RwLock::new(None));
         let session_data2 = session_data.clone();
-        let responses: Arc<DashMap<uuid::Uuid, WebSocketResponse>> = Arc::new(DashMap::new());
+        let responses: Arc<RwLock<IndexMap<uuid::Uuid, WebSocketResponse>>> = Arc::new(RwLock::new(IndexMap::new()));
         let responses_clone = responses.clone();
-        let socket_health = Arc::new(Mutex::new(SocketHealth::Active));
-        let pending_errors = Arc::new(Mutex::new(Vec::new()));
+        let socket_health = Arc::new(RwLock::new(SocketHealth::Active));
+        let pending_errors = Arc::new(RwLock::new(Vec::new()));
         let pending_errors_clone = pending_errors.clone();
 
         let socket_health_tcp_read = socket_health.clone();
@@ -260,7 +254,7 @@ impl EngineConnection {
                                     let id: uuid::Uuid = (*resp_id).into();
                                     match batch_response {
                                         BatchResponse::Success { response } => {
-                                            responses_clone.insert(
+                                            responses_clone.write().await.insert(
                                                 id,
                                                 WebSocketResponse::Success(SuccessWebSocketResponse {
                                                     success: true,
@@ -272,7 +266,7 @@ impl EngineConnection {
                                             );
                                         }
                                         BatchResponse::Failure { errors } => {
-                                            responses_clone.insert(
+                                            responses_clone.write().await.insert(
                                                 id,
                                                 WebSocketResponse::Failure(FailureWebSocketResponse {
                                                     success: false,
@@ -288,7 +282,7 @@ impl EngineConnection {
                                 resp: OkWebSocketResponseData::ModelingSessionData { session },
                                 ..
                             }) => {
-                                let mut sd = session_data2.lock().unwrap();
+                                let mut sd = session_data2.write().await;
                                 sd.replace(session.clone());
                             }
                             WebSocketResponse::Failure(FailureWebSocketResponse {
@@ -297,7 +291,7 @@ impl EngineConnection {
                                 errors,
                             }) => {
                                 if let Some(id) = request_id {
-                                    responses_clone.insert(
+                                    responses_clone.write().await.insert(
                                         *id,
                                         WebSocketResponse::Failure(FailureWebSocketResponse {
                                             success: false,
@@ -307,19 +301,20 @@ impl EngineConnection {
                                     );
                                 } else {
                                     // Add it to our pending errors.
-                                    let mut pe = pending_errors_clone.lock().unwrap();
+                                    let mut pe = pending_errors_clone.write().await;
                                     for error in errors {
                                         if !pe.contains(&error.message) {
                                             pe.push(error.message.clone());
                                         }
                                     }
+                                    drop(pe);
                                 }
                             }
                             _ => {}
                         }
 
                         if let Some(id) = id {
-                            responses_clone.insert(id, ws_resp.clone());
+                            responses_clone.write().await.insert(id, ws_resp.clone());
                         }
                     }
                     Err(e) => {
@@ -327,7 +322,7 @@ impl EngineConnection {
                             WebSocketReadError::Read(e) => crate::logln!("could not read from WS: {:?}", e),
                             WebSocketReadError::Deser(e) => crate::logln!("could not deserialize msg from WS: {:?}", e),
                         }
-                        *socket_health_tcp_read.lock().unwrap() = SocketHealth::Inactive;
+                        *socket_health_tcp_read.write().await = SocketHealth::Inactive;
                         return Err(e);
                     }
                 }
@@ -343,70 +338,41 @@ impl EngineConnection {
             responses,
             pending_errors,
             socket_health,
-            batch: Arc::new(Mutex::new(Vec::new())),
-            batch_end: Arc::new(Mutex::new(IndexMap::new())),
-            artifact_commands: Arc::new(Mutex::new(Vec::new())),
+            batch: Arc::new(RwLock::new(Vec::new())),
+            batch_end: Arc::new(RwLock::new(IndexMap::new())),
+            artifact_commands: Arc::new(RwLock::new(Vec::new())),
             default_planes: Default::default(),
             session_data,
             execution_kind: Default::default(),
         })
     }
-
-    fn handle_command(
-        &self,
-        cmd: &ModelingCmd,
-        cmd_id: ModelingCmdId,
-        id_to_source_range: &HashMap<Uuid, SourceRange>,
-    ) -> Result<(), KclError> {
-        let cmd_id = *cmd_id.as_ref();
-        let range = id_to_source_range
-            .get(&cmd_id)
-            .copied()
-            .ok_or_else(|| KclError::internal(format!("Failed to get source range for command ID: {:?}", cmd_id)))?;
-
-        // Add artifact command.
-        let mut artifact_commands = self.artifact_commands.lock().unwrap();
-        artifact_commands.push(ArtifactCommand {
-            cmd_id,
-            range,
-            command: cmd.clone(),
-        });
-        Ok(())
-    }
 }
 
 #[async_trait::async_trait]
 impl EngineManager for EngineConnection {
-    fn batch(&self) -> Arc<Mutex<Vec<(WebSocketRequest, SourceRange)>>> {
+    fn batch(&self) -> Arc<RwLock<Vec<(WebSocketRequest, SourceRange)>>> {
         self.batch.clone()
     }
 
-    fn batch_end(&self) -> Arc<Mutex<IndexMap<uuid::Uuid, (WebSocketRequest, SourceRange)>>> {
+    fn batch_end(&self) -> Arc<RwLock<IndexMap<uuid::Uuid, (WebSocketRequest, SourceRange)>>> {
         self.batch_end.clone()
     }
 
-    fn responses(&self) -> IndexMap<Uuid, WebSocketResponse> {
-        self.responses
-            .iter()
-            .map(|entry| {
-                let (k, v) = entry.pair();
-                (*k, v.clone())
-            })
-            .collect()
+    fn responses(&self) -> Arc<RwLock<IndexMap<Uuid, WebSocketResponse>>> {
+        self.responses.clone()
     }
 
-    fn take_artifact_commands(&self) -> Vec<ArtifactCommand> {
-        let mut artifact_commands = self.artifact_commands.lock().unwrap();
-        std::mem::take(&mut *artifact_commands)
+    fn artifact_commands(&self) -> Arc<RwLock<Vec<ArtifactCommand>>> {
+        self.artifact_commands.clone()
     }
 
-    fn execution_kind(&self) -> ExecutionKind {
-        let guard = self.execution_kind.lock().unwrap();
+    async fn execution_kind(&self) -> ExecutionKind {
+        let guard = self.execution_kind.read().await;
         *guard
     }
 
-    fn replace_execution_kind(&self, execution_kind: ExecutionKind) -> ExecutionKind {
-        let mut guard = self.execution_kind.lock().unwrap();
+    async fn replace_execution_kind(&self, execution_kind: ExecutionKind) -> ExecutionKind {
+        let mut guard = self.execution_kind.write().await;
         let original = *guard;
         *guard = execution_kind;
         original
@@ -447,49 +413,8 @@ impl EngineManager for EngineConnection {
         id: uuid::Uuid,
         source_range: SourceRange,
         cmd: WebSocketRequest,
-        id_to_source_range: HashMap<Uuid, SourceRange>,
+        _id_to_source_range: HashMap<Uuid, SourceRange>,
     ) -> Result<WebSocketResponse, KclError> {
-        match &cmd {
-            WebSocketRequest::ModelingCmdBatchReq(ModelingBatch { requests, .. }) => {
-                for request in requests {
-                    self.handle_command(&request.cmd, request.cmd_id, &id_to_source_range)?;
-                }
-            }
-            WebSocketRequest::ModelingCmdReq(request) => {
-                self.handle_command(&request.cmd, request.cmd_id, &id_to_source_range)?;
-            }
-            _ => {}
-        }
-
-        // In isolated mode, we don't send the command to the engine.
-        if self.execution_kind().is_isolated() {
-            return match &cmd {
-                WebSocketRequest::ModelingCmdBatchReq(ModelingBatch { requests, .. }) => {
-                    let mut responses = HashMap::with_capacity(requests.len());
-                    for request in requests {
-                        responses.insert(
-                            request.cmd_id,
-                            BatchResponse::Success {
-                                response: OkModelingCmdResponse::Empty {},
-                            },
-                        );
-                    }
-                    Ok(WebSocketResponse::Success(SuccessWebSocketResponse {
-                        request_id: Some(id),
-                        resp: OkWebSocketResponseData::ModelingBatch { responses },
-                        success: true,
-                    }))
-                }
-                _ => Ok(WebSocketResponse::Success(SuccessWebSocketResponse {
-                    request_id: Some(id),
-                    resp: OkWebSocketResponseData::Modeling {
-                        modeling_response: OkModelingCmdResponse::Empty {},
-                    },
-                    success: true,
-                })),
-            };
-        }
-
         let (tx, rx) = oneshot::channel();
 
         // Send the request to the engine, via the actor.
@@ -524,10 +449,10 @@ impl EngineManager for EngineConnection {
         // Wait for the response.
         let current_time = std::time::Instant::now();
         while current_time.elapsed().as_secs() < 60 {
-            if let Ok(guard) = self.socket_health.lock() {
+            let guard = self.socket_health.read().await;
             if *guard == SocketHealth::Inactive {
                 // Check if we have any pending errors.
-                    let pe = self.pending_errors.lock().unwrap();
+                let pe = self.pending_errors.read().await;
                 if !pe.is_empty() {
                     return Err(KclError::Engine(KclErrorDetails {
                         message: pe.join(", ").to_string(),
@@ -540,9 +465,8 @@ impl EngineManager for EngineConnection {
                     }));
                 }
             }
-            }
             // We pop off the responses to cleanup our mappings.
-            if let Some((_, resp)) = self.responses.remove(&id) {
+            if let Some(resp) = self.responses.write().await.shift_remove(&id) {
                 return Ok(resp);
             }
         }
@@ -553,18 +477,17 @@ impl EngineManager for EngineConnection {
         }))
     }
 
-    fn get_session_data(&self) -> Option<ModelingSessionData> {
-        self.session_data.lock().unwrap().clone()
+    async fn get_session_data(&self) -> Option<ModelingSessionData> {
+        self.session_data.read().await.clone()
     }
 
     async fn close(&self) {
         let _ = self.shutdown_tx.send(()).await;
         loop {
-            if let Ok(guard) = self.socket_health.lock() {
+            let guard = self.socket_health.read().await;
             if *guard == SocketHealth::Inactive {
                 return;
             }
         }
     }
-    }
 }

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

@@ -1,10 +1,7 @@
 //! Functions for setting up our WebSocket and WebRTC connections for communications with the
 //! engine.
 
-use std::{
-    collections::HashMap,
-    sync::{Arc, Mutex},
-};
+use std::{collections::HashMap, sync::Arc};
 
 use anyhow::Result;
 use indexmap::IndexMap;
@@ -15,7 +12,8 @@ use kcmc::{
         WebSocketResponse,
     },
 };
-use kittycad_modeling_cmds::{self as kcmc, id::ModelingCmdId, ModelingCmd};
+use kittycad_modeling_cmds::{self as kcmc};
+use tokio::sync::RwLock;
 use uuid::Uuid;
 
 use super::ExecutionKind;
@@ -28,71 +26,48 @@ use crate::{
 
 #[derive(Debug, Clone)]
 pub struct EngineConnection {
-    batch: Arc<Mutex<Vec<(WebSocketRequest, SourceRange)>>>,
-    batch_end: Arc<Mutex<IndexMap<uuid::Uuid, (WebSocketRequest, SourceRange)>>>,
-    artifact_commands: Arc<Mutex<Vec<ArtifactCommand>>>,
-    execution_kind: Arc<Mutex<ExecutionKind>>,
+    batch: Arc<RwLock<Vec<(WebSocketRequest, SourceRange)>>>,
+    batch_end: Arc<RwLock<IndexMap<uuid::Uuid, (WebSocketRequest, SourceRange)>>>,
+    artifact_commands: Arc<RwLock<Vec<ArtifactCommand>>>,
+    execution_kind: Arc<RwLock<ExecutionKind>>,
 }
 
 impl EngineConnection {
     pub async fn new() -> Result<EngineConnection> {
         Ok(EngineConnection {
-            batch: Arc::new(Mutex::new(Vec::new())),
-            batch_end: Arc::new(Mutex::new(IndexMap::new())),
-            artifact_commands: Arc::new(Mutex::new(Vec::new())),
+            batch: Arc::new(RwLock::new(Vec::new())),
+            batch_end: Arc::new(RwLock::new(IndexMap::new())),
+            artifact_commands: Arc::new(RwLock::new(Vec::new())),
             execution_kind: Default::default(),
         })
     }
-
-    fn handle_command(
-        &self,
-        cmd: &ModelingCmd,
-        cmd_id: ModelingCmdId,
-        id_to_source_range: &HashMap<Uuid, SourceRange>,
-    ) -> Result<(), KclError> {
-        let cmd_id = *cmd_id.as_ref();
-        let range = id_to_source_range
-            .get(&cmd_id)
-            .copied()
-            .ok_or_else(|| KclError::internal(format!("Failed to get source range for command ID: {:?}", cmd_id)))?;
-
-        // Add artifact command.
-        let mut artifact_commands = self.artifact_commands.lock().unwrap();
-        artifact_commands.push(ArtifactCommand {
-            cmd_id,
-            range,
-            command: cmd.clone(),
-        });
-        Ok(())
-    }
 }
 
 #[async_trait::async_trait]
 impl crate::engine::EngineManager for EngineConnection {
-    fn batch(&self) -> Arc<Mutex<Vec<(WebSocketRequest, SourceRange)>>> {
+    fn batch(&self) -> Arc<RwLock<Vec<(WebSocketRequest, SourceRange)>>> {
         self.batch.clone()
     }
 
-    fn batch_end(&self) -> Arc<Mutex<IndexMap<uuid::Uuid, (WebSocketRequest, SourceRange)>>> {
+    fn batch_end(&self) -> Arc<RwLock<IndexMap<uuid::Uuid, (WebSocketRequest, SourceRange)>>> {
         self.batch_end.clone()
     }
 
-    fn responses(&self) -> IndexMap<Uuid, WebSocketResponse> {
-        IndexMap::new()
+    fn responses(&self) -> Arc<RwLock<IndexMap<Uuid, WebSocketResponse>>> {
+        Arc::new(RwLock::new(IndexMap::new()))
     }
 
-    fn take_artifact_commands(&self) -> Vec<ArtifactCommand> {
-        let mut artifact_commands = self.artifact_commands.lock().unwrap();
-        std::mem::take(&mut *artifact_commands)
+    fn artifact_commands(&self) -> Arc<RwLock<Vec<ArtifactCommand>>> {
+        self.artifact_commands.clone()
     }
 
-    fn execution_kind(&self) -> ExecutionKind {
-        let guard = self.execution_kind.lock().unwrap();
+    async fn execution_kind(&self) -> ExecutionKind {
+        let guard = self.execution_kind.read().await;
         *guard
     }
 
-    fn replace_execution_kind(&self, execution_kind: ExecutionKind) -> ExecutionKind {
-        let mut guard = self.execution_kind.lock().unwrap();
+    async fn replace_execution_kind(&self, execution_kind: ExecutionKind) -> ExecutionKind {
+        let mut guard = self.execution_kind.write().await;
         let original = *guard;
         *guard = execution_kind;
         original
@@ -119,7 +94,7 @@ impl crate::engine::EngineManager for EngineConnection {
         id: uuid::Uuid,
         _source_range: SourceRange,
         cmd: WebSocketRequest,
-        id_to_source_range: HashMap<Uuid, SourceRange>,
+        _id_to_source_range: HashMap<Uuid, SourceRange>,
     ) -> Result<WebSocketResponse, KclError> {
         match cmd {
             WebSocketRequest::ModelingCmdBatchReq(ModelingBatch {
@@ -130,7 +105,6 @@ impl crate::engine::EngineManager for EngineConnection {
                 // Create the empty responses.
                 let mut responses = HashMap::with_capacity(requests.len());
                 for request in requests {
-                    self.handle_command(&request.cmd, request.cmd_id, &id_to_source_range)?;
                     responses.insert(
                         request.cmd_id,
                         BatchResponse::Success {
@@ -144,17 +118,13 @@ impl crate::engine::EngineManager for EngineConnection {
                     success: true,
                 }))
             }
-            WebSocketRequest::ModelingCmdReq(request) => {
-                self.handle_command(&request.cmd, request.cmd_id, &id_to_source_range)?;
-
-                Ok(WebSocketResponse::Success(SuccessWebSocketResponse {
+            WebSocketRequest::ModelingCmdReq(_) => Ok(WebSocketResponse::Success(SuccessWebSocketResponse {
                 request_id: Some(id),
                 resp: OkWebSocketResponseData::Modeling {
                     modeling_response: OkModelingCmdResponse::Empty {},
                 },
                 success: true,
-                }))
-            }
+            })),
             _ => Ok(WebSocketResponse::Success(SuccessWebSocketResponse {
                 request_id: Some(id),
                 resp: OkWebSocketResponseData::Modeling {

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

@@ -1,22 +1,12 @@
 //! Functions for setting up our WebSocket and WebRTC connections for communications with the
 //! engine.
-use std::{
-    collections::HashMap,
-    sync::{Arc, Mutex},
-};
+use std::{collections::HashMap, sync::Arc};
 
 use anyhow::Result;
 use indexmap::IndexMap;
-use kcmc::{
-    id::ModelingCmdId,
-    ok_response::OkModelingCmdResponse,
-    websocket::{
-        BatchResponse, ModelingBatch, OkWebSocketResponseData, SuccessWebSocketResponse, WebSocketRequest,
-        WebSocketResponse,
-    },
-    ModelingCmd,
-};
+use kcmc::websocket::{WebSocketRequest, WebSocketResponse};
 use kittycad_modeling_cmds as kcmc;
+use tokio::sync::RwLock;
 use uuid::Uuid;
 use wasm_bindgen::prelude::*;
 
@@ -54,11 +44,11 @@ extern "C" {
 #[derive(Debug, Clone)]
 pub struct EngineConnection {
     manager: Arc<EngineCommandManager>,
-    batch: Arc<Mutex<Vec<(WebSocketRequest, SourceRange)>>>,
-    batch_end: Arc<Mutex<IndexMap<uuid::Uuid, (WebSocketRequest, SourceRange)>>>,
-    responses: Arc<Mutex<IndexMap<Uuid, WebSocketResponse>>>,
-    artifact_commands: Arc<Mutex<Vec<ArtifactCommand>>>,
-    execution_kind: Arc<Mutex<ExecutionKind>>,
+    batch: Arc<RwLock<Vec<(WebSocketRequest, SourceRange)>>>,
+    batch_end: Arc<RwLock<IndexMap<uuid::Uuid, (WebSocketRequest, SourceRange)>>>,
+    responses: Arc<RwLock<IndexMap<Uuid, WebSocketResponse>>>,
+    artifact_commands: Arc<RwLock<Vec<ArtifactCommand>>>,
+    execution_kind: Arc<RwLock<ExecutionKind>>,
 }
 
 // Safety: WebAssembly will only ever run in a single-threaded context.
@@ -70,66 +60,101 @@ impl EngineConnection {
         #[allow(clippy::arc_with_non_send_sync)]
         Ok(EngineConnection {
             manager: Arc::new(manager),
-            batch: Arc::new(Mutex::new(Vec::new())),
-            batch_end: Arc::new(Mutex::new(IndexMap::new())),
-            responses: Arc::new(Mutex::new(IndexMap::new())),
-            artifact_commands: Arc::new(Mutex::new(Vec::new())),
+            batch: Arc::new(RwLock::new(Vec::new())),
+            batch_end: Arc::new(RwLock::new(IndexMap::new())),
+            responses: Arc::new(RwLock::new(IndexMap::new())),
+            artifact_commands: Arc::new(RwLock::new(Vec::new())),
             execution_kind: Default::default(),
         })
     }
-}
 
-impl EngineConnection {
-    fn handle_command(
+    async fn do_send_modeling_cmd(
         &self,
-        cmd: &ModelingCmd,
-        cmd_id: ModelingCmdId,
-        id_to_source_range: &HashMap<Uuid, SourceRange>,
-    ) -> Result<(), KclError> {
-        let cmd_id = *cmd_id.as_ref();
-        let range = id_to_source_range
-            .get(&cmd_id)
-            .copied()
-            .ok_or_else(|| KclError::internal(format!("Failed to get source range for command ID: {:?}", cmd_id)))?;
+        id: uuid::Uuid,
+        source_range: SourceRange,
+        cmd: WebSocketRequest,
+        id_to_source_range: HashMap<uuid::Uuid, SourceRange>,
+    ) -> Result<WebSocketResponse, KclError> {
+        let source_range_str = serde_json::to_string(&source_range).map_err(|e| {
+            KclError::Engine(KclErrorDetails {
+                message: format!("Failed to serialize source range: {:?}", e),
+                source_ranges: vec![source_range],
+            })
+        })?;
+        let cmd_str = serde_json::to_string(&cmd).map_err(|e| {
+            KclError::Engine(KclErrorDetails {
+                message: format!("Failed to serialize modeling command: {:?}", e),
+                source_ranges: vec![source_range],
+            })
+        })?;
+        let id_to_source_range_str = serde_json::to_string(&id_to_source_range).map_err(|e| {
+            KclError::Engine(KclErrorDetails {
+                message: format!("Failed to serialize id to source range: {:?}", e),
+                source_ranges: vec![source_range],
+            })
+        })?;
 
-        // Add artifact command.
-        let mut artifact_commands = self.artifact_commands.lock().unwrap();
-        artifact_commands.push(ArtifactCommand {
-            cmd_id,
-            range,
-            command: cmd.clone(),
-        });
-        Ok(())
+        let promise = self
+            .manager
+            .send_modeling_cmd_from_wasm(id.to_string(), source_range_str, cmd_str, id_to_source_range_str)
+            .map_err(|e| {
+                KclError::Engine(KclErrorDetails {
+                    message: e.to_string().into(),
+                    source_ranges: vec![source_range],
+                })
+            })?;
+
+        let value = crate::wasm::JsFuture::from(promise).await.map_err(|e| {
+            KclError::Engine(KclErrorDetails {
+                message: format!("Failed to wait for promise from engine: {:?}", e),
+                source_ranges: vec![source_range],
+            })
+        })?;
+
+        // Parse the value as a string.
+        let s = value.as_string().ok_or_else(|| {
+            KclError::Engine(KclErrorDetails {
+                message: format!("Failed to get string from response from engine: `{:?}`", value),
+                source_ranges: vec![source_range],
+            })
+        })?;
+
+        let ws_result: WebSocketResponse = serde_json::from_str(&s).map_err(|e| {
+            KclError::Engine(KclErrorDetails {
+                message: format!("Failed to deserialize response from engine: {:?}", e),
+                source_ranges: vec![source_range],
+            })
+        })?;
+
+        Ok(ws_result)
     }
 }
 
 #[async_trait::async_trait]
 impl crate::engine::EngineManager for EngineConnection {
-    fn batch(&self) -> Arc<Mutex<Vec<(WebSocketRequest, SourceRange)>>> {
+    fn batch(&self) -> Arc<RwLock<Vec<(WebSocketRequest, SourceRange)>>> {
         self.batch.clone()
     }
 
-    fn batch_end(&self) -> Arc<Mutex<IndexMap<uuid::Uuid, (WebSocketRequest, SourceRange)>>> {
+    fn batch_end(&self) -> Arc<RwLock<IndexMap<uuid::Uuid, (WebSocketRequest, SourceRange)>>> {
         self.batch_end.clone()
     }
 
-    fn responses(&self) -> IndexMap<Uuid, WebSocketResponse> {
-        let responses = self.responses.lock().unwrap();
-        responses.clone()
+    fn responses(&self) -> Arc<RwLock<IndexMap<Uuid, WebSocketResponse>>> {
+        self.responses.clone()
     }
 
-    fn take_artifact_commands(&self) -> Vec<ArtifactCommand> {
-        let mut artifact_commands = self.artifact_commands.lock().unwrap();
-        std::mem::take(&mut *artifact_commands)
+    fn artifact_commands(&self) -> Arc<RwLock<Vec<ArtifactCommand>>> {
+        self.artifact_commands.clone()
     }
 
-    fn execution_kind(&self) -> ExecutionKind {
-        let guard = self.execution_kind.lock().unwrap();
+    async fn execution_kind(&self) -> ExecutionKind {
+        let guard = self.execution_kind.read().await;
         *guard
     }
 
-    fn replace_execution_kind(&self, execution_kind: ExecutionKind) -> ExecutionKind {
-        let mut guard = self.execution_kind.lock().unwrap();
+    async fn replace_execution_kind(&self, execution_kind: ExecutionKind) -> ExecutionKind {
+        let mut guard = self.execution_kind.write().await;
         let original = *guard;
         *guard = execution_kind;
         original
@@ -214,100 +239,18 @@ impl crate::engine::EngineManager for EngineConnection {
         cmd: WebSocketRequest,
         id_to_source_range: HashMap<uuid::Uuid, SourceRange>,
     ) -> Result<WebSocketResponse, KclError> {
-        match &cmd {
-            WebSocketRequest::ModelingCmdBatchReq(ModelingBatch { requests, .. }) => {
-                for request in requests {
-                    self.handle_command(&request.cmd, request.cmd_id, &id_to_source_range)?;
-                }
-            }
-            WebSocketRequest::ModelingCmdReq(request) => {
-                self.handle_command(&request.cmd, request.cmd_id, &id_to_source_range)?;
-            }
-            _ => {}
+        let ws_result = self
+            .do_send_modeling_cmd(id, source_range, cmd, id_to_source_range)
+            .await?;
+
+        // In isolated mode, we don't save the response.
+        if self.execution_kind().await.is_isolated() {
+            return Ok(ws_result);
         }
 
-        // In isolated mode, we don't send the command to the engine.
-        if self.execution_kind().is_isolated() {
-            return match &cmd {
-                WebSocketRequest::ModelingCmdBatchReq(ModelingBatch { requests, .. }) => {
-                    let mut responses = HashMap::with_capacity(requests.len());
-                    for request in requests {
-                        responses.insert(
-                            request.cmd_id,
-                            BatchResponse::Success {
-                                response: OkModelingCmdResponse::Empty {},
-                            },
-                        );
-                    }
-                    Ok(WebSocketResponse::Success(SuccessWebSocketResponse {
-                        request_id: Some(id),
-                        resp: OkWebSocketResponseData::ModelingBatch { responses },
-                        success: true,
-                    }))
-                }
-                _ => Ok(WebSocketResponse::Success(SuccessWebSocketResponse {
-                    request_id: Some(id),
-                    resp: OkWebSocketResponseData::Modeling {
-                        modeling_response: OkModelingCmdResponse::Empty {},
-                    },
-                    success: true,
-                })),
-            };
-        }
-
-        let source_range_str = serde_json::to_string(&source_range).map_err(|e| {
-            KclError::Engine(KclErrorDetails {
-                message: format!("Failed to serialize source range: {:?}", e),
-                source_ranges: vec![source_range],
-            })
-        })?;
-        let cmd_str = serde_json::to_string(&cmd).map_err(|e| {
-            KclError::Engine(KclErrorDetails {
-                message: format!("Failed to serialize modeling command: {:?}", e),
-                source_ranges: vec![source_range],
-            })
-        })?;
-        let id_to_source_range_str = serde_json::to_string(&id_to_source_range).map_err(|e| {
-            KclError::Engine(KclErrorDetails {
-                message: format!("Failed to serialize id to source range: {:?}", e),
-                source_ranges: vec![source_range],
-            })
-        })?;
-
-        let promise = self
-            .manager
-            .send_modeling_cmd_from_wasm(id.to_string(), source_range_str, cmd_str, id_to_source_range_str)
-            .map_err(|e| {
-                KclError::Engine(KclErrorDetails {
-                    message: e.to_string().into(),
-                    source_ranges: vec![source_range],
-                })
-            })?;
-
-        let value = crate::wasm::JsFuture::from(promise).await.map_err(|e| {
-            KclError::Engine(KclErrorDetails {
-                message: format!("Failed to wait for promise from engine: {:?}", e),
-                source_ranges: vec![source_range],
-            })
-        })?;
-
-        // Parse the value as a string.
-        let s = value.as_string().ok_or_else(|| {
-            KclError::Engine(KclErrorDetails {
-                message: format!("Failed to get string from response from engine: `{:?}`", value),
-                source_ranges: vec![source_range],
-            })
-        })?;
-
-        let ws_result: WebSocketResponse = serde_json::from_str(&s).map_err(|e| {
-            KclError::Engine(KclErrorDetails {
-                message: format!("Failed to deserialize response from engine: {:?}", e),
-                source_ranges: vec![source_range],
-            })
-        })?;
-
-        let mut responses = self.responses.lock().unwrap();
+        let mut responses = self.responses.write().await;
         responses.insert(id, ws_result.clone());
+        drop(responses);
 
         Ok(ws_result)
     }

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

@@ -8,14 +8,12 @@ pub mod conn_mock;
 #[cfg(feature = "engine")]
 pub mod conn_wasm;
 
-use std::{
-    collections::HashMap,
-    sync::{Arc, Mutex},
-};
+use std::{collections::HashMap, sync::Arc};
 
 use indexmap::IndexMap;
 use kcmc::{
     each_cmd as mcmd,
+    id::ModelingCmdId,
     length_unit::LengthUnit,
     ok_response::OkModelingCmdResponse,
     shared::Color,
@@ -28,6 +26,7 @@ use kcmc::{
 use kittycad_modeling_cmds as kcmc;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
+use tokio::sync::RwLock;
 use uuid::Uuid;
 
 use crate::{
@@ -62,28 +61,38 @@ impl ExecutionKind {
 #[async_trait::async_trait]
 pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
     /// Get the batch of commands to be sent to the engine.
-    fn batch(&self) -> Arc<Mutex<Vec<(WebSocketRequest, SourceRange)>>>;
+    fn batch(&self) -> Arc<RwLock<Vec<(WebSocketRequest, SourceRange)>>>;
 
     /// Get the batch of end commands to be sent to the engine.
-    fn batch_end(&self) -> Arc<Mutex<IndexMap<uuid::Uuid, (WebSocketRequest, SourceRange)>>>;
+    fn batch_end(&self) -> Arc<RwLock<IndexMap<uuid::Uuid, (WebSocketRequest, SourceRange)>>>;
 
     /// Get the command responses from the engine.
-    fn responses(&self) -> IndexMap<Uuid, WebSocketResponse>;
+    fn responses(&self) -> Arc<RwLock<IndexMap<Uuid, WebSocketResponse>>>;
 
-    /// Take the artifact commands generated up to this point and clear them.
-    fn take_artifact_commands(&self) -> Vec<ArtifactCommand>;
+    /// Get the artifact commands that have accumulated so far.
+    fn artifact_commands(&self) -> Arc<RwLock<Vec<ArtifactCommand>>>;
 
     /// Clear all artifact commands that have accumulated so far.
-    fn clear_artifact_commands(&self) {
-        self.take_artifact_commands();
+    async fn clear_artifact_commands(&self) {
+        self.artifact_commands().write().await.clear();
+    }
+
+    /// Take the artifact commands that have accumulated so far and clear them.
+    async fn take_artifact_commands(&self) -> Vec<ArtifactCommand> {
+        std::mem::take(&mut *self.artifact_commands().write().await)
+    }
+
+    /// Take the responses that have accumulated so far and clear them.
+    async fn take_responses(&self) -> IndexMap<Uuid, WebSocketResponse> {
+        std::mem::take(&mut *self.responses().write().await)
     }
 
     /// Get the current execution kind.
-    fn execution_kind(&self) -> ExecutionKind;
+    async fn execution_kind(&self) -> ExecutionKind;
 
     /// Replace the current execution kind with a new value and return the
     /// existing value.
-    fn replace_execution_kind(&self, execution_kind: ExecutionKind) -> ExecutionKind;
+    async fn replace_execution_kind(&self, execution_kind: ExecutionKind) -> ExecutionKind;
 
     /// Get the default planes.
     async fn default_planes(
@@ -127,7 +136,7 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
 
         // Ensure artifact commands are cleared so that we don't accumulate them
         // across runs.
-        self.clear_artifact_commands();
+        self.clear_artifact_commands().await;
 
         // Do the after clear scene hook.
         self.clear_scene_post_hook(id_generator, source_range).await?;
@@ -151,6 +160,27 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
         Ok(())
     }
 
+    async fn handle_artifact_command(
+        &self,
+        cmd: &ModelingCmd,
+        cmd_id: ModelingCmdId,
+        id_to_source_range: &HashMap<Uuid, SourceRange>,
+    ) -> Result<(), KclError> {
+        let cmd_id = *cmd_id.as_ref();
+        let range = id_to_source_range
+            .get(&cmd_id)
+            .copied()
+            .ok_or_else(|| KclError::internal(format!("Failed to get source range for command ID: {:?}", cmd_id)))?;
+
+        // Add artifact command.
+        self.artifact_commands().write().await.push(ArtifactCommand {
+            cmd_id,
+            range,
+            command: cmd.clone(),
+        });
+        Ok(())
+    }
+
     async fn set_units(
         &self,
         units: crate::UnitLength,
@@ -197,13 +227,18 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
         source_range: SourceRange,
         cmd: &ModelingCmd,
     ) -> Result<(), crate::errors::KclError> {
+        // In isolated mode, we don't send the command to the engine.
+        if self.execution_kind().await.is_isolated() {
+            return Ok(());
+        }
+
         let req = WebSocketRequest::ModelingCmdReq(ModelingCmdReq {
             cmd: cmd.clone(),
             cmd_id: id.into(),
         });
 
         // Add cmd to the batch.
-        self.batch().lock().unwrap().push((req, source_range));
+        self.batch().write().await.push((req, source_range));
 
         Ok(())
     }
@@ -217,13 +252,18 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
         source_range: SourceRange,
         cmd: &ModelingCmd,
     ) -> Result<(), crate::errors::KclError> {
+        // In isolated mode, we don't send the command to the engine.
+        if self.execution_kind().await.is_isolated() {
+            return Ok(());
+        }
+
         let req = WebSocketRequest::ModelingCmdReq(ModelingCmdReq {
             cmd: cmd.clone(),
             cmd_id: id.into(),
         });
 
         // Add cmd to the batch end.
-        self.batch_end().lock().unwrap().insert(id, (req, source_range));
+        self.batch_end().write().await.insert(id, (req, source_range));
         Ok(())
     }
 
@@ -249,11 +289,11 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
         source_range: SourceRange,
     ) -> Result<OkWebSocketResponseData, crate::errors::KclError> {
         let all_requests = if batch_end {
-            let mut requests = self.batch().lock().unwrap().clone();
-            requests.extend(self.batch_end().lock().unwrap().values().cloned());
+            let mut requests = self.batch().read().await.clone();
+            requests.extend(self.batch_end().read().await.values().cloned());
             requests
         } else {
-            self.batch().lock().unwrap().clone()
+            self.batch().read().await.clone()
         };
 
         // Return early if we have no commands to send.
@@ -304,10 +344,27 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
             }
         }
 
+        // Do the artifact commands.
+        for (req, _) in all_requests.iter() {
+            match &req {
+                WebSocketRequest::ModelingCmdBatchReq(ModelingBatch { requests, .. }) => {
+                    for request in requests {
+                        self.handle_artifact_command(&request.cmd, request.cmd_id, &id_to_source_range)
+                            .await?;
+                    }
+                }
+                WebSocketRequest::ModelingCmdReq(request) => {
+                    self.handle_artifact_command(&request.cmd, request.cmd_id, &id_to_source_range)
+                        .await?;
+                }
+                _ => {}
+            }
+        }
+
         // Throw away the old batch queue.
-        self.batch().lock().unwrap().clear();
+        self.batch().write().await.clear();
         if batch_end {
-            self.batch_end().lock().unwrap().clear();
+            self.batch_end().write().await.clear();
         }
 
         // We pop off the responses to cleanup our mappings.
@@ -596,7 +653,7 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
 
     /// Get session data, if it has been received.
     /// Returns None if the server never sent it.
-    fn get_session_data(&self) -> Option<ModelingSessionData> {
+    async fn get_session_data(&self) -> Option<ModelingSessionData> {
         None
     }
 

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

@@ -9,8 +9,8 @@ use crate::{
     execution::{
         annotations,
         cad_op::{OpArg, Operation},
+        kcl_value::NumericType,
         memory,
-        memory::ProgramMemory,
         state::ModuleState,
         BodyType, EnvironmentRef, ExecState, ExecutorContext, KclValue, MemoryFunction, Metadata, TagEngineInfo,
         TagIdentifier,
@@ -48,7 +48,7 @@ impl ExecutorContext {
                     let old_units = exec_state.length_unit();
                     exec_state.mod_local.settings.update_from_annotation(annotation)?;
                     let new_units = exec_state.length_unit();
-                    if !self.engine.execution_kind().is_isolated() && old_units != new_units {
+                    if !self.engine.execution_kind().await.is_isolated() && old_units != new_units {
                         self.engine
                             .set_units(new_units.into(), annotation.as_source_range())
                             .await?;
@@ -393,7 +393,7 @@ impl ExecutorContext {
         exec_state.global.mod_loader.enter_module(path);
         std::mem::swap(&mut exec_state.mod_local, &mut local_state);
         exec_state.mut_memory().push_new_root_env();
-        let original_execution = self.engine.replace_execution_kind(exec_kind);
+        let original_execution = self.engine.replace_execution_kind(exec_kind).await;
 
         let result = self
             .exec_program(program, exec_state, crate::execution::BodyType::Root)
@@ -406,7 +406,7 @@ impl ExecutorContext {
         if !exec_kind.is_isolated() && new_units != old_units {
             self.engine.set_units(old_units.into(), Default::default()).await?;
         }
-        self.engine.replace_execution_kind(original_execution);
+        self.engine.replace_execution_kind(original_execution).await;
 
         result
             .map_err(|err| {
@@ -437,7 +437,7 @@ impl ExecutorContext {
     ) -> Result<KclValue, KclError> {
         let item = match init {
             Expr::None(none) => KclValue::from(none),
-            Expr::Literal(literal) => KclValue::from(literal),
+            Expr::Literal(literal) => KclValue::from_literal((**literal).clone(), &exec_state.mod_local.settings),
             Expr::TagDeclarator(tag) => tag.execute(exec_state).await?,
             Expr::Identifier(identifier) => {
                 let value = exec_state.memory().get(&identifier.name, identifier.into())?.clone();
@@ -518,7 +518,10 @@ impl BinaryPart {
     #[async_recursion]
     pub async fn get_result(&self, exec_state: &mut ExecState, ctx: &ExecutorContext) -> Result<KclValue, KclError> {
         match self {
-            BinaryPart::Literal(literal) => Ok(literal.into()),
+            BinaryPart::Literal(literal) => Ok(KclValue::from_literal(
+                (**literal).clone(),
+                &exec_state.mod_local.settings,
+            )),
             BinaryPart::Identifier(identifier) => {
                 let value = exec_state.memory().get(&identifier.name, identifier.into())?;
                 Ok(value.clone())
@@ -704,26 +707,32 @@ impl Node<BinaryExpression> {
             BinaryOperator::Add => KclValue::Number {
                 value: left + right,
                 meta,
+                ty: NumericType::Unknown,
             },
             BinaryOperator::Sub => KclValue::Number {
                 value: left - right,
                 meta,
+                ty: NumericType::Unknown,
             },
             BinaryOperator::Mul => KclValue::Number {
                 value: left * right,
                 meta,
+                ty: NumericType::Unknown,
             },
             BinaryOperator::Div => KclValue::Number {
                 value: left / right,
                 meta,
+                ty: NumericType::Unknown,
             },
             BinaryOperator::Mod => KclValue::Number {
                 value: left % right,
                 meta,
+                ty: NumericType::Unknown,
             },
             BinaryOperator::Pow => KclValue::Number {
                 value: left.powf(right),
                 meta,
+                ty: NumericType::Unknown,
             },
             BinaryOperator::Neq => KclValue::Bool {
                 value: left != right,
@@ -786,19 +795,14 @@ impl Node<UnaryExpression> {
 
         let value = &self.argument.get_result(exec_state, ctx).await?;
         match value {
-            KclValue::Number { value, meta: _ } => {
-                let meta = vec![Metadata {
-                    source_range: self.into(),
-                }];
-                Ok(KclValue::Number { value: -value, meta })
-            }
-            KclValue::Int { value, meta: _ } => {
+            KclValue::Number { value, ty, .. } => {
                 let meta = vec![Metadata {
                     source_range: self.into(),
                 }];
                 Ok(KclValue::Number {
-                    value: (-value) as f64,
+                    value: -value,
                     meta,
+                    ty: ty.clone(),
                 })
             }
             _ => Err(KclError::Semantic(KclErrorDetails {
@@ -1299,8 +1303,9 @@ impl Node<ArrayRangeExpression> {
         Ok(KclValue::Array {
             value: range
                 .into_iter()
-                .map(|num| KclValue::Int {
-                    value: num,
+                .map(|num| KclValue::Number {
+                    value: num as f64,
+                    ty: NumericType::Unknown,
                     meta: meta.clone(),
                 })
                 .collect(),
@@ -1342,8 +1347,6 @@ fn article_for(s: &str) -> &'static str {
 pub fn parse_number_as_f64(v: &KclValue, source_range: SourceRange) -> Result<f64, KclError> {
     if let KclValue::Number { value: n, .. } = &v {
         Ok(*n)
-    } else if let KclValue::Int { value: n, .. } = &v {
-        Ok(*n as f64)
     } else {
         let actual_type = v.human_friendly_type();
         let article = if actual_type.starts_with(['a', 'e', 'i', 'o', 'u']) {
@@ -1460,16 +1463,7 @@ fn jvalue_to_prop(value: &KclValue, property_sr: Vec<SourceRange>, name: &str) -
         }))
     };
     match value {
-        KclValue::Int { value:num, meta: _ } => {
-            let maybe_int: Result<usize, _> = (*num).try_into();
-            if let Ok(uint) = maybe_int {
-                Ok(Property::UInt(uint))
-            }
-            else {
-                make_err(format!("'{num}' is negative, so you can't index an array with it"))
-            }
-        }
-        KclValue::Number{value: num, meta:_} => {
+        KclValue::Number{value: num, .. } => {
             let num = *num;
             if num < 0.0 {
                 return make_err(format!("'{num}' is negative, so you can't index an array with it"))
@@ -1510,7 +1504,7 @@ impl Node<PipeExpression> {
 fn assign_args_to_params(
     function_expression: NodeRef<'_, FunctionExpression>,
     args: Vec<Arg>,
-    fn_memory: &mut ProgramMemory,
+    exec_state: &mut ExecState,
 ) -> Result<(), KclError> {
     let num_args = function_expression.number_of_args();
     let (min_params, max_params) = num_args.into_inner();
@@ -1530,12 +1524,15 @@ fn assign_args_to_params(
         return Err(err_wrong_number_args);
     }
 
+    let mem = &mut exec_state.global.memory;
+    let settings = &exec_state.mod_local.settings;
+
     // Add the arguments to the memory.  A new call frame should have already
     // been created.
     for (index, param) in function_expression.params.iter().enumerate() {
         if let Some(arg) = args.get(index) {
             // Argument was provided.
-            fn_memory.add(
+            mem.add(
                 param.identifier.name.clone(),
                 arg.value.clone(),
                 (&param.identifier).into(),
@@ -1545,9 +1542,9 @@ fn assign_args_to_params(
             if let Some(ref default_val) = param.default_value {
                 // If the corresponding parameter is optional,
                 // then it's fine, the user doesn't need to supply it.
-                fn_memory.add(
+                mem.add(
                     param.identifier.name.clone(),
-                    default_val.clone().into(),
+                    KclValue::from_default_param(default_val.clone(), settings),
                     (&param.identifier).into(),
                 )?;
             } else {
@@ -1563,18 +1560,21 @@ fn assign_args_to_params(
 fn assign_args_to_params_kw(
     function_expression: NodeRef<'_, FunctionExpression>,
     mut args: crate::std::args::KwArgs,
-    fn_memory: &mut ProgramMemory,
+    exec_state: &mut ExecState,
 ) -> Result<(), KclError> {
     // Add the arguments to the memory.  A new call frame should have already
     // been created.
     let source_ranges = vec![function_expression.into()];
+    let mem = &mut exec_state.global.memory;
+    let settings = &exec_state.mod_local.settings;
+
     for param in function_expression.params.iter() {
         if param.labeled {
             let arg = args.labeled.get(&param.identifier.name);
             let arg_val = match arg {
                 Some(arg) => arg.value.clone(),
                 None => match param.default_value {
-                    Some(ref default_val) => KclValue::from(default_val.clone()),
+                    Some(ref default_val) => KclValue::from_default_param(default_val.clone(), settings),
                     None => {
                         return Err(KclError::Semantic(KclErrorDetails {
                             source_ranges,
@@ -1586,7 +1586,7 @@ fn assign_args_to_params_kw(
                     }
                 },
             };
-            fn_memory.add(param.identifier.name.clone(), arg_val, (&param.identifier).into())?;
+            mem.add(param.identifier.name.clone(), arg_val, (&param.identifier).into())?;
         } else {
             let Some(unlabeled) = args.unlabeled.take() else {
                 let param_name = &param.identifier.name;
@@ -1603,7 +1603,7 @@ fn assign_args_to_params_kw(
                     })
                 });
             };
-            fn_memory.add(
+            mem.add(
                 param.identifier.name.clone(),
                 unlabeled.value.clone(),
                 (&param.identifier).into(),
@@ -1624,7 +1624,7 @@ pub(crate) async fn call_user_defined_function(
     // variables shadow variables in the parent scope.  The new environment's
     // parent should be the environment of the closure.
     exec_state.mut_memory().push_new_env_for_call(memory);
-    if let Err(e) = assign_args_to_params(function_expression, args, exec_state.mut_memory()) {
+    if let Err(e) = assign_args_to_params(function_expression, args, exec_state) {
         exec_state.mut_memory().pop_env();
         return Err(e);
     }
@@ -1657,7 +1657,7 @@ pub(crate) async fn call_user_defined_function_kw(
     // variables shadow variables in the parent scope.  The new environment's
     // parent should be the environment of the closure.
     exec_state.mut_memory().push_new_env_for_call(memory);
-    if let Err(e) = assign_args_to_params_kw(function_expression, args, exec_state.mut_memory()) {
+    if let Err(e) = assign_args_to_params_kw(function_expression, args, exec_state) {
         exec_state.mut_memory().pop_env();
         return Err(e);
     }
@@ -1720,19 +1720,19 @@ impl JsonSchema for FunctionParam<'_> {
 
 #[cfg(test)]
 mod test {
+    use super::*;
     use crate::{
-        execution::parse_execute,
+        execution::{memory::ProgramMemory, parse_execute},
         parsing::ast::types::{DefaultParamVal, Identifier, Parameter},
     };
 
-    use super::*;
-
     #[test]
     fn test_assign_args_to_params() {
         // Set up a little framework for this test.
         fn mem(number: usize) -> KclValue {
-            KclValue::Int {
-                value: number as i64,
+            KclValue::Number {
+                value: number as f64,
+                ty: NumericType::count(),
                 meta: Default::default(),
             }
         }
@@ -1838,8 +1838,8 @@ mod test {
                 digest: None,
             });
             let args = args.into_iter().map(Arg::synthetic).collect();
-            let mut actual = ProgramMemory::new();
-            let actual = assign_args_to_params(func_expr, args, &mut actual).map(|_| actual);
+            let mut exec_state = ExecState::new(&Default::default());
+            let actual = assign_args_to_params(func_expr, args, &mut exec_state).map(|_| exec_state.global.memory);
             assert_eq!(
                 actual, expected,
                 "failed test '{test_name}':\ngot {actual:?}\nbut expected\n{expected:?}"

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

@@ -289,7 +289,7 @@ pub struct PreImportedGeometry {
 }
 
 pub async fn send_to_engine(pre: PreImportedGeometry, ctxt: &ExecutorContext) -> Result<ImportedGeometry, KclError> {
-    if ctxt.no_engine_commands() {
+    if ctxt.no_engine_commands().await {
         return Ok(ImportedGeometry {
             id: pre.id,
             value: pre.command.files.iter().map(|f| f.path.to_string()).collect(),

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

@@ -12,14 +12,16 @@ use crate::{
         TagIdentifier,
     },
     parsing::{
-        ast::types::{FunctionExpression, KclNone, LiteralValue, TagDeclarator, TagNode},
+        ast::types::{
+            DefaultParamVal, FunctionExpression, KclNone, Literal, LiteralValue, Node, TagDeclarator, TagNode,
+        },
         token::NumericSuffix,
     },
     std::{args::Arg, FnAsArg},
     ExecutorContext, KclError, ModuleId, SourceRange,
 };
 
-use super::memory::EnvironmentRef;
+use super::{memory::EnvironmentRef, MetaSettings};
 
 pub type KclObjectFields = HashMap<String, KclValue>;
 
@@ -40,11 +42,7 @@ pub enum KclValue {
     },
     Number {
         value: f64,
-        #[serde(rename = "__meta")]
-        meta: Vec<Metadata>,
-    },
-    Int {
-        value: i64,
+        ty: NumericType,
         #[serde(rename = "__meta")]
         meta: Vec<Metadata>,
     },
@@ -168,7 +166,6 @@ impl From<KclValue> for Vec<SourceRange> {
             KclValue::Face { value } => to_vec_sr(&value.meta),
             KclValue::Bool { meta, .. } => to_vec_sr(&meta),
             KclValue::Number { meta, .. } => to_vec_sr(&meta),
-            KclValue::Int { meta, .. } => to_vec_sr(&meta),
             KclValue::String { meta, .. } => to_vec_sr(&meta),
             KclValue::Array { meta, .. } => to_vec_sr(&meta),
             KclValue::Object { meta, .. } => to_vec_sr(&meta),
@@ -200,7 +197,6 @@ impl From<&KclValue> for Vec<SourceRange> {
             KclValue::Face { value } => to_vec_sr(&value.meta),
             KclValue::Bool { meta, .. } => to_vec_sr(meta),
             KclValue::Number { meta, .. } => to_vec_sr(meta),
-            KclValue::Int { meta, .. } => to_vec_sr(meta),
             KclValue::String { meta, .. } => to_vec_sr(meta),
             KclValue::Uuid { meta, .. } => to_vec_sr(meta),
             KclValue::Array { meta, .. } => to_vec_sr(meta),
@@ -217,8 +213,7 @@ impl KclValue {
         match self {
             KclValue::Uuid { value: _, meta } => meta.clone(),
             KclValue::Bool { value: _, meta } => meta.clone(),
-            KclValue::Number { value: _, meta } => meta.clone(),
-            KclValue::Int { value: _, meta } => meta.clone(),
+            KclValue::Number { meta, .. } => meta.clone(),
             KclValue::String { value: _, meta } => meta.clone(),
             KclValue::Array { value: _, meta } => meta.clone(),
             KclValue::Object { value: _, meta } => meta.clone(),
@@ -297,7 +292,6 @@ impl KclValue {
             KclValue::Face { .. } => "Face",
             KclValue::Bool { .. } => "boolean (true/false value)",
             KclValue::Number { .. } => "number",
-            KclValue::Int { .. } => "integer",
             KclValue::String { .. } => "string (text)",
             KclValue::Array { .. } => "array (list)",
             KclValue::Object { .. } => "object",
@@ -307,14 +301,29 @@ impl KclValue {
         }
     }
 
-    pub(crate) fn from_literal(literal: LiteralValue, meta: Vec<Metadata>) -> Self {
-        match literal {
-            LiteralValue::Number { value, .. } => KclValue::Number { value, meta },
+    pub(crate) fn from_literal(literal: Node<Literal>, settings: &MetaSettings) -> Self {
+        let meta = vec![literal.metadata()];
+        match literal.inner.value {
+            LiteralValue::Number { value, suffix } => KclValue::Number {
+                value,
+                meta,
+                ty: NumericType::from_parsed(suffix, settings),
+            },
             LiteralValue::String(value) => KclValue::String { value, meta },
             LiteralValue::Bool(value) => KclValue::Bool { value, meta },
         }
     }
 
+    pub(crate) fn from_default_param(param: DefaultParamVal, settings: &MetaSettings) -> Self {
+        match param {
+            DefaultParamVal::Literal(lit) => Self::from_literal(lit, settings),
+            DefaultParamVal::KclNone(none) => KclValue::KclNone {
+                value: none,
+                meta: Default::default(),
+            },
+        }
+    }
+
     pub(crate) fn map_env_ref(&self, env_map: &HashMap<EnvironmentRef, EnvironmentRef>) -> Self {
         let mut result = self.clone();
         if let KclValue::Function { ref mut memory, .. } = result {
@@ -327,20 +336,30 @@ impl KclValue {
 
     /// Put the number into a KCL value.
     pub const fn from_number(f: f64, meta: Vec<Metadata>) -> Self {
-        Self::Number { value: f, meta }
+        Self::Number {
+            value: f,
+            meta,
+            ty: NumericType::Unknown,
+        }
+    }
+
+    pub const fn from_number_with_type(f: f64, ty: NumericType, meta: Vec<Metadata>) -> Self {
+        Self::Number { value: f, meta, ty }
     }
 
     /// Put the point into a KCL value.
-    pub fn from_point2d(p: [f64; 2], meta: Vec<Metadata>) -> Self {
+    pub fn from_point2d(p: [f64; 2], ty: NumericType, meta: Vec<Metadata>) -> Self {
         Self::Array {
             value: vec![
                 Self::Number {
                     value: p[0],
                     meta: meta.clone(),
+                    ty: ty.clone(),
                 },
                 Self::Number {
                     value: p[1],
                     meta: meta.clone(),
+                    ty,
                 },
             ],
             meta,
@@ -349,7 +368,6 @@ impl KclValue {
 
     pub(crate) fn as_usize(&self) -> Option<usize> {
         match self {
-            KclValue::Int { value, .. } if *value > 0 => Some(*value as usize),
             KclValue::Number { value, .. } => crate::try_f64_to_usize(*value),
             _ => None,
         }
@@ -357,7 +375,6 @@ impl KclValue {
 
     pub fn as_int(&self) -> Option<i64> {
         match self {
-            KclValue::Int { value, .. } => Some(*value),
             KclValue::Number { value, .. } => crate::try_f64_to_i64(*value),
             _ => None,
         }
@@ -438,10 +455,8 @@ impl KclValue {
     }
 
     pub fn as_f64(&self) -> Option<f64> {
-        if let KclValue::Number { value, meta: _ } = &self {
+        if let KclValue::Number { value, .. } = &self {
             Some(*value)
-        } else if let KclValue::Int { value, meta: _ } = &self {
-            Some(*value as f64)
         } else {
             None
         }
@@ -606,6 +621,73 @@ impl KclValue {
     }
 }
 
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
+#[ts(export)]
+#[serde(tag = "type")]
+pub enum NumericType {
+    // Specified by the user (directly or indirectly)
+    Known(UnitType),
+    // Unspecified, using defaults
+    Default { len: UnitLen, angle: UnitAngle },
+    // Exceeded the ability of the type system to track.
+    Unknown,
+    // Type info has been explicitly cast away.
+    Any,
+}
+
+impl NumericType {
+    pub fn count() -> Self {
+        NumericType::Known(UnitType::Count)
+    }
+
+    pub fn combine(self, other: &NumericType) -> NumericType {
+        if &self == other {
+            self
+        } else {
+            NumericType::Unknown
+        }
+    }
+
+    pub fn from_parsed(suffix: NumericSuffix, settings: &super::MetaSettings) -> Self {
+        match suffix {
+            NumericSuffix::None => NumericType::Default {
+                len: settings.default_length_units,
+                angle: settings.default_angle_units,
+            },
+            NumericSuffix::Count => NumericType::Known(UnitType::Count),
+            NumericSuffix::Mm => NumericType::Known(UnitType::Length(UnitLen::Mm)),
+            NumericSuffix::Cm => NumericType::Known(UnitType::Length(UnitLen::Cm)),
+            NumericSuffix::M => NumericType::Known(UnitType::Length(UnitLen::M)),
+            NumericSuffix::Inch => NumericType::Known(UnitType::Length(UnitLen::Inches)),
+            NumericSuffix::Ft => NumericType::Known(UnitType::Length(UnitLen::Feet)),
+            NumericSuffix::Yd => NumericType::Known(UnitType::Length(UnitLen::Yards)),
+            NumericSuffix::Deg => NumericType::Known(UnitType::Angle(UnitAngle::Degrees)),
+            NumericSuffix::Rad => NumericType::Known(UnitType::Angle(UnitAngle::Radians)),
+        }
+    }
+}
+
+impl From<UnitLen> for NumericType {
+    fn from(value: UnitLen) -> Self {
+        NumericType::Known(UnitType::Length(value))
+    }
+}
+
+impl From<UnitAngle> for NumericType {
+    fn from(value: UnitAngle) -> Self {
+        NumericType::Known(UnitType::Angle(value))
+    }
+}
+
+#[derive(Debug, Clone, Copy, Deserialize, Serialize, PartialEq, Eq, ts_rs::TS, JsonSchema)]
+#[ts(export)]
+#[serde(tag = "type")]
+pub enum UnitType {
+    Count,
+    Length(UnitLen),
+    Angle(UnitAngle),
+}
+
 // TODO called UnitLen so as not to clash with UnitLength in settings)
 #[derive(Debug, Default, Clone, Copy, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Eq)]
 #[ts(export)]

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

@@ -845,6 +845,8 @@ mod env {
 
 #[cfg(test)]
 mod test {
+    use crate::execution::kcl_value::NumericType;
+
     use super::*;
 
     fn sr() -> SourceRange {
@@ -852,8 +854,9 @@ mod test {
     }
 
     fn val(value: i64) -> KclValue {
-        KclValue::Int {
-            value,
+        KclValue::Number {
+            value: value as f64,
+            ty: NumericType::count(),
             meta: Vec::new(),
         }
     }
@@ -861,14 +864,14 @@ mod test {
     #[track_caller]
     fn assert_get(mem: &ProgramMemory, key: &str, n: i64) {
         match mem.get(key, sr()).unwrap() {
-            KclValue::Int { value, .. } => assert_eq!(*value, n),
+            KclValue::Number { value, .. } => assert_eq!(*value as i64, n),
             _ => unreachable!(),
         }
     }
 
-    fn expect_int(value: &KclValue) -> Option<i64> {
+    fn expect_small_number(value: &KclValue) -> Option<i64> {
         match value {
-            KclValue::Int { value, .. } => Some(*value),
+            KclValue::Number { value, .. } if value > &0.0 && value < &10.0 => Some(*value as i64),
             _ => None,
         }
     }
@@ -876,7 +879,7 @@ mod test {
     #[track_caller]
     fn assert_get_from(mem: &ProgramMemory, key: &str, n: i64, snapshot: EnvironmentRef) {
         match mem.get_from(key, snapshot, sr()).unwrap() {
-            KclValue::Int { value, .. } => assert_eq!(*value, n),
+            KclValue::Number { value, .. } => assert_eq!(*value as i64, n),
             _ => unreachable!(),
         }
     }
@@ -1127,7 +1130,7 @@ mod test {
         assert_get_from(mem, "b", 3, sn3);
         assert_get_from(mem, "b", 4, sn4);
 
-        let vals: Vec<_> = mem.walk_call_stack().filter_map(expect_int).collect();
+        let vals: Vec<_> = mem.walk_call_stack().filter_map(expect_small_number).collect();
         let expected = [6, 1, 3, 1, 7];
         assert_eq!(vals, expected);
 
@@ -1136,7 +1139,7 @@ mod test {
         mem.get_from("b", sn1, sr()).unwrap_err();
         assert_get_from(mem, "b", 3, sn2);
 
-        let vals: Vec<_> = mem.walk_call_stack().filter_map(expect_int).collect();
+        let vals: Vec<_> = mem.walk_call_stack().filter_map(expect_small_number).collect();
         let expected = [1, 7];
         assert_eq!(vals, expected);
 

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

@@ -484,8 +484,8 @@ impl ExecutorContext {
     }
 
     /// Returns true if we should not send engine commands for any reason.
-    pub fn no_engine_commands(&self) -> bool {
-        self.is_mock() || self.engine.execution_kind().is_isolated()
+    pub async fn no_engine_commands(&self) -> bool {
+        self.is_mock() || self.engine.execution_kind().await.is_isolated()
     }
 
     pub async fn send_clear_scene(
@@ -713,7 +713,7 @@ impl ExecutorContext {
             "Post interpretation KCL memory stats: {:#?}",
             exec_state.memory().stats
         ));
-        let session_data = self.engine.get_session_data();
+        let session_data = self.engine.get_session_data().await;
         Ok(session_data)
     }
 
@@ -734,8 +734,11 @@ impl ExecutorContext {
         exec_state
             .global
             .artifact_commands
-            .extend(self.engine.take_artifact_commands());
-        exec_state.global.artifact_responses.extend(self.engine.responses());
+            .extend(self.engine.take_artifact_commands().await);
+        exec_state
+            .global
+            .artifact_responses
+            .extend(self.engine.take_responses().await);
         // Build the artifact graph.
         match build_artifact_graph(
             &exec_state.global.artifact_commands,

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

@@ -1581,7 +1581,7 @@ pub struct CallExpression {
 
 #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
-#[serde(tag = "type")]
+#[serde(rename_all = "camelCase", tag = "type")]
 pub struct CallExpressionKw {
     pub callee: Node<Identifier>,
     pub unlabeled: Option<Expr>,
@@ -1591,6 +1591,9 @@ pub struct CallExpressionKw {
     #[serde(default, skip_serializing_if = "Option::is_none")]
     #[ts(optional)]
     pub digest: Option<Digest>,
+
+    #[serde(default, skip_serializing_if = "NonCodeMeta::is_empty")]
+    pub non_code_meta: NonCodeMeta,
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
@@ -1714,6 +1717,7 @@ impl CallExpressionKw {
             unlabeled,
             arguments,
             digest: None,
+            non_code_meta: Default::default(),
         }))
     }
 
@@ -2080,30 +2084,6 @@ impl Literal {
     }
 }
 
-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::String(value) => KclValue::String { value, meta },
-            LiteralValue::Bool(value) => KclValue::Bool { value, meta },
-        }
-    }
-}
-
-impl From<&Node<Literal>> for KclValue {
-    fn from(literal: &Node<Literal>) -> Self {
-        Self::from(literal.to_owned())
-    }
-}
-
-impl From<&BoxNode<Literal>> for KclValue {
-    fn from(literal: &BoxNode<Literal>) -> Self {
-        let b: &Node<Literal> = literal;
-        Self::from(b)
-    }
-}
-
 #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Eq)]
 #[ts(export)]
 #[serde(tag = "type")]
@@ -3088,20 +3068,7 @@ pub enum FnArgType {
 #[allow(clippy::large_enum_variant)]
 pub enum DefaultParamVal {
     KclNone(KclNone),
-    Literal(Literal),
-}
-
-// TODO: This should actually take metadata.
-impl From<DefaultParamVal> for KclValue {
-    fn from(v: DefaultParamVal) -> Self {
-        match v {
-            DefaultParamVal::KclNone(kcl_none) => Self::KclNone {
-                value: kcl_none,
-                meta: Default::default(),
-            },
-            DefaultParamVal::Literal(literal) => Self::from_literal(literal.value, Vec::new()),
-        }
-    }
+    Literal(Node<Literal>),
 }
 
 impl DefaultParamVal {

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

@@ -882,6 +882,17 @@ fn property_separator(i: &mut TokenSlice) -> PResult<()> {
     .parse_next(i)
 }
 
+/// Match something that separates the labeled arguments of a fn call.
+fn labeled_arg_separator(i: &mut TokenSlice) -> PResult<()> {
+    alt((
+        // Normally you need a comma.
+        comma_sep,
+        // But, if the argument list is ending, no need for a comma.
+        peek(preceded(opt(whitespace), close_paren)).void(),
+    ))
+    .parse_next(i)
+}
+
 /// Parse a KCL object value.
 pub(crate) fn object(i: &mut TokenSlice) -> PResult<Node<ObjectExpression>> {
     let open = open_brace(i)?;
@@ -2496,14 +2507,6 @@ fn labeled_argument(i: &mut TokenSlice) -> PResult<LabeledArg> {
     .parse_next(i)
 }
 
-/// Arguments are passed into a function,
-/// preceded by the name of the parameter (the label).
-fn labeled_arguments(i: &mut TokenSlice) -> PResult<Vec<LabeledArg>> {
-    separated(0.., labeled_argument, comma_sep)
-        .context(expected("function arguments"))
-        .parse_next(i)
-}
-
 /// A type of a function argument.
 /// This can be:
 /// - a primitive type, e.g. 'number' or 'string' or 'bool'
@@ -2579,7 +2582,7 @@ fn parameter(i: &mut TokenSlice) -> PResult<ParamDescription> {
         arg_name,
         type_,
         default_value: match (question_mark.is_some(), default_literal) {
-            (true, Some(lit)) => Some(DefaultParamVal::Literal(lit.inner)),
+            (true, Some(lit)) => Some(DefaultParamVal::Literal(*lit)),
             (true, None) => Some(DefaultParamVal::none()),
             (false, None) => None,
             (false, Some(lit)) => {
@@ -2783,7 +2786,28 @@ fn fn_call_kw(i: &mut TokenSlice) -> PResult<Node<CallExpressionKw>> {
     ignore_whitespace(i);
 
     let initial_unlabeled_arg = opt((expression, comma, opt(whitespace)).map(|(arg, _, _)| arg)).parse_next(i)?;
-    let args = labeled_arguments(i)?;
+    let args: Vec<_> = repeat(
+        0..,
+        alt((
+            terminated(non_code_node.map(NonCodeOr::NonCode), whitespace),
+            terminated(labeled_argument, labeled_arg_separator).map(NonCodeOr::Code),
+        )),
+    )
+    .parse_next(i)?;
+    let (args, non_code_nodes): (Vec<_>, BTreeMap<usize, _>) = args.into_iter().enumerate().fold(
+        (Vec::new(), BTreeMap::new()),
+        |(mut args, mut non_code_nodes), (i, e)| {
+            match e {
+                NonCodeOr::NonCode(x) => {
+                    non_code_nodes.insert(i, vec![x]);
+                }
+                NonCodeOr::Code(x) => {
+                    args.push(x);
+                }
+            }
+            (args, non_code_nodes)
+        },
+    );
     if let Some(std_fn) = crate::std::get_stdlib_fn(&fn_name.name) {
         let just_args: Vec<_> = args.iter().collect();
         typecheck_all_kw(std_fn, &just_args)?;
@@ -2792,6 +2816,10 @@ fn fn_call_kw(i: &mut TokenSlice) -> PResult<Node<CallExpressionKw>> {
     opt(comma_sep).parse_next(i)?;
     let end = close_paren.parse_next(i)?.end;
 
+    let non_code_meta = NonCodeMeta {
+        non_code_nodes,
+        ..Default::default()
+    };
     Ok(Node {
         start: fn_name.start,
         end,
@@ -2801,6 +2829,7 @@ fn fn_call_kw(i: &mut TokenSlice) -> PResult<Node<CallExpressionKw>> {
             unlabeled: initial_unlabeled_arg,
             arguments: args,
             digest: None,
+            non_code_meta,
         },
         outer_attrs: Vec::new(),
     })
@@ -4390,14 +4419,6 @@ let myBox = box([0,0], -3, -16, -10)
         crate::parsing::top_level_parse(some_program_string).unwrap();
     }
 
-    #[test]
-    fn arg_labels() {
-        let input = r#"length: 3"#;
-        let module_id = ModuleId::default();
-        let tokens = crate::parsing::token::lex(input, module_id).unwrap();
-        super::labeled_arguments(&mut tokens.as_slice()).unwrap();
-    }
-
     #[test]
     fn kw_fn() {
         for input in ["val = foo(x, y = z)", "val = foo(y = z)"] {
@@ -4879,6 +4900,22 @@ my14 = 4 ^ 2 - 3 ^ 2 * 2
         r#"fn foo(x?: number = 2) { return 1 }"#
     );
     snapshot_test!(kw_function_call_in_pipe, r#"val = 1 |> f(arg = x)"#);
+    snapshot_test!(
+        kw_function_call_multiline,
+        r#"val = f(
+             arg = x,
+             foo = x,
+             bar = x,
+           )"#
+    );
+    snapshot_test!(
+        kw_function_call_multiline_with_comments,
+        r#"val = f(
+             arg = x,
+             // foo = x,
+             bar = x,
+           )"#
+    );
 }
 
 #[allow(unused)]

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__kw_function_call_multiline.snap

@@ -0,0 +1,86 @@
+---
+source: kcl/src/parsing/parser.rs
+expression: actual
+snapshot_kind: text
+---
+{
+  "body": [
+    {
+      "declaration": {
+        "end": 87,
+        "id": {
+          "end": 3,
+          "name": "val",
+          "start": 0,
+          "type": "Identifier"
+        },
+        "init": {
+          "arguments": [
+            {
+              "type": "LabeledArg",
+              "label": {
+                "type": "Identifier",
+                "name": "arg"
+              },
+              "arg": {
+                "end": 29,
+                "name": "x",
+                "start": 28,
+                "type": "Identifier",
+                "type": "Identifier"
+              }
+            },
+            {
+              "type": "LabeledArg",
+              "label": {
+                "type": "Identifier",
+                "name": "foo"
+              },
+              "arg": {
+                "end": 51,
+                "name": "x",
+                "start": 50,
+                "type": "Identifier",
+                "type": "Identifier"
+              }
+            },
+            {
+              "type": "LabeledArg",
+              "label": {
+                "type": "Identifier",
+                "name": "bar"
+              },
+              "arg": {
+                "end": 73,
+                "name": "x",
+                "start": 72,
+                "type": "Identifier",
+                "type": "Identifier"
+              }
+            }
+          ],
+          "callee": {
+            "end": 7,
+            "name": "f",
+            "start": 6,
+            "type": "Identifier"
+          },
+          "end": 87,
+          "start": 6,
+          "type": "CallExpressionKw",
+          "type": "CallExpressionKw",
+          "unlabeled": null
+        },
+        "start": 0,
+        "type": "VariableDeclarator"
+      },
+      "end": 87,
+      "kind": "const",
+      "start": 0,
+      "type": "VariableDeclaration",
+      "type": "VariableDeclaration"
+    }
+  ],
+  "end": 87,
+  "start": 0
+}