add API fallback for engine utils lib

.eslintignore

@@ -1,3 +1,4 @@
 src/wasm-lib/*
+src/lib/engine-utils/engine.js
 *.typegen.ts
 packages/codemirror-lsp-client/dist/*

.github/workflows/build-test-publish-apps.yml

@@ -15,7 +15,6 @@ on:
 env:
   CUT_RELEASE_PR: ${{ github.event_name == 'pull_request' && (contains(github.event.pull_request.title, 'Cut release v')) }}
   BUILD_RELEASE: ${{ github.event_name == 'release' || github.event_name == 'schedule' || github.event_name == 'pull_request' && (contains(github.event.pull_request.title, 'Cut release v')) }}
-  NOTES: ${{ github.event_name == 'release' && github.event.release.body || format('Non-release build, commit {0}', github.sha) }}
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -26,6 +25,7 @@ jobs:
     runs-on: ubuntu-22.04  # seperate job on Ubuntu for easy string manipulations (compared to Windows)
     outputs:
       version: ${{ steps.export_version.outputs.version }}
+      notes: ${{ steps.export_version.outputs.notes }}
     steps:
       - uses: actions/checkout@v4
 
@@ -55,6 +55,8 @@ jobs:
       # TODO: see if we need to inject updater nightly URL here https://dl.zoo.dev/releases/modeling-app/nightly/last_update.json
 
       - name: Generate release notes
+        env:
+          NOTES: ${{ github.event_name == 'release' && github.event.release.body || format('Non-release build, commit {0}', github.sha) }}
         run: |
           echo "$NOTES" > release-notes.md
           cat release-notes.md
@@ -82,6 +84,9 @@ jobs:
           path: |
             electron-builder.yml
 
+      - id: export_notes
+        run: echo "notes=`cat release-notes.md'`" >> "$GITHUB_OUTPUT"
+
       - name: Prepare electron-builder.yml file for updater test
         if: ${{ env.CUT_RELEASE_PR == 'true' }}
         run: |
@@ -257,6 +262,7 @@ jobs:
       VERSION_NO_V: ${{ needs.prepare-files.outputs.version }}
       VERSION: ${{ github.event_name == 'schedule' && needs.prepare-files.outputs.version || format('v{0}', needs.prepare-files.outputs.version) }}
       PUB_DATE: ${{ github.event_name == 'release' && github.event.release.created_at || github.event.repository.updated_at }}
+      NOTES: ${{ needs.prepare-files.outputs.notes }}
       BUCKET_DIR: ${{ github.event_name == 'schedule' && 'dl.kittycad.io/releases/modeling-app/nightly' || 'dl.kittycad.io/releases/modeling-app' }}
       WEBSITE_DIR: ${{ github.event_name == 'schedule' && 'dl.zoo.dev/releases/modeling-app/nightly' || 'dl.zoo.dev/releases/modeling-app' }}
       URL_CODED_NAME: ${{ github.event_name == 'schedule' && 'Zoo%20Modeling%20App%20%28Nightly%29' || 'Zoo%20Modeling%20App' }}

.github/workflows/cargo-test.yml

@@ -62,7 +62,7 @@ jobs:
         shell: bash
         run: |-
           cd "${{ matrix.dir }}"
-          cargo llvm-cov nextest --workspace --lcov --output-path lcov.info --test-threads=1 --no-fail-fast -P ci 2>&1 | tee /tmp/github-actions.log
+          cargo llvm-cov nextest --all --lcov --output-path lcov.info --test-threads=1 --no-fail-fast -P ci 2>&1 | tee /tmp/github-actions.log
         env:
           KITTYCAD_API_TOKEN: ${{secrets.KITTYCAD_API_TOKEN}}
           RUST_MIN_STACK: 10485760000

.gitignore

@@ -66,3 +66,7 @@ venv
 
 # electron
 out/
+
+# engine wasm utils
+src/lib/engine-utils/engine.wasm
+src/lib/engine-utils/engine.js

docs/kcl/types/Path.md

@@ -162,28 +162,6 @@ A base path.
 
 
 ----
-A circular arc, not necessarily tangential to the current point.
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `Arc`|  | No |
-| `center` |`[number, number]`| Center of the circle that this arc is drawn on. | No |
-| `radius` |`number`| Radius of the circle that this arc is drawn on. | No |
-| `from` |`[number, number]`| The from point. | No |
-| `to` |`[number, number]`| The to point. | No |
-| `tag` |[`TagDeclarator`](/docs/kcl/types#tag-declaration)| The tag of the path. | No |
-| `__geoMeta` |[`GeoMeta`](/docs/kcl/types/GeoMeta)| Metadata. | No |
-
-
-----
 
 
 

docs/kcl/types/Sketch.md

@@ -16,8 +16,8 @@ A sketch is a collection of paths.
 
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
-| `id` |`string`| The id of the sketch (this will change when the engine's reference to it changes). | No |
+| `id` |`string`| The id of the sketch (this will change when the engine's reference to it changes. | No |
-| `paths` |`[` [`Path`](/docs/kcl/types/Path) `]`| The paths in the sketch. | No |
+| `value` |`[` [`Path`](/docs/kcl/types/Path) `]`| The paths in the sketch. | No |
 | `on` |[`SketchSurface`](/docs/kcl/types/SketchSurface)| What the sketch is on (can be a plane or a face). | No |
 | `start` |[`BasePath`](/docs/kcl/types/BasePath)| The starting path. | No |
 | `tags` |`object`| Tag identifiers that have been declared in this sketch. | No |

docs/kcl/types/SketchSet.md

@@ -25,8 +25,8 @@ A sketch is a collection of paths.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: `sketch`|  | No |
-| `id` |`string`| The id of the sketch (this will change when the engine's reference to it changes). | No |
+| `id` |`string`| The id of the sketch (this will change when the engine's reference to it changes. | No |
-| `paths` |`[` [`Path`](/docs/kcl/types/Path) `]`| The paths in the sketch. | No |
+| `value` |`[` [`Path`](/docs/kcl/types/Path) `]`| The paths in the sketch. | No |
 | `on` |[`SketchSurface`](/docs/kcl/types/SketchSurface)| What the sketch is on (can be a plane or a face). | No |
 | `start` |[`BasePath`](/docs/kcl/types/BasePath)| The starting path. | No |
 | `tags` |`object`| Tag identifiers that have been declared in this sketch. | No |

docs/kcl/types/TagEngineInfo.md

@@ -18,7 +18,7 @@ Engine information for a tag.
 |----------|------|-------------|----------|
 | `id` |`string`| The id of the tagged object. | No |
 | `sketch` |`string`| The sketch the tag is on. | No |
-| `path` |[`Path`](/docs/kcl/types/Path)| The path the tag is on. | No |
+| `path` |[`BasePath`](/docs/kcl/types/BasePath)| The path the tag is on. | No |
 | `surface` |[`ExtrudeSurface`](/docs/kcl/types/ExtrudeSurface)| The surface information for the tag. | No |
 
 

e2e/playwright/onboarding-tests.spec.ts

@@ -55,53 +55,6 @@ test.describe('Onboarding tests', () => {
     await expect(page.locator('.cm-content')).toContainText('// Shelf Bracket')
   })
 
-  test(
-    'Desktop: fresh onboarding executes and loads',
-    { tag: '@electron' },
-    async ({ browserName: _ }, testInfo) => {
-      const { electronApp, page } = await setupElectron({
-        testInfo,
-        appSettings: {
-          app: {
-            onboardingStatus: 'incomplete',
-          },
-        },
-        cleanProjectDir: true,
-      })
-
-      const u = await getUtils(page)
-
-      const viewportSize = { width: 1200, height: 500 }
-      await page.setViewportSize(viewportSize)
-
-      // Locators and constants
-      const newProjectButton = page.getByRole('button', { name: 'New project' })
-      const projectLink = page.getByTestId('project-link')
-
-      await test.step(`Create a project and open to the onboarding`, async () => {
-        await newProjectButton.click()
-        await projectLink.click()
-        await test.step(`Ensure the engine connection works by testing the sketch button`, async () => {
-          await u.waitForPageLoad()
-        })
-      })
-
-      await test.step(`Ensure we see the onboarding stuff`, async () => {
-        // Test that the onboarding pane loaded
-        await expect(
-          page.getByText('Welcome to Modeling App! This')
-        ).toBeVisible()
-
-        // *and* that the code is shown in the editor
-        await expect(page.locator('.cm-content')).toContainText(
-          '// Shelf Bracket'
-        )
-      })
-
-      await electronApp.close()
-    }
-  )
-
   test('Code resets after confirmation', async ({ page }) => {
     const initialCode = `sketch001 = startSketchOn('XZ')`
 

e2e/playwright/test-utils.ts

@@ -888,17 +888,7 @@ export async function setupElectron({
     const tempSettingsFilePath = join(projectDirName, SETTINGS_FILE_NAME)
     const settingsOverrides = TOML.stringify(
       appSettings
-        ? {
+        ? { settings: appSettings }
-            settings: {
-              ...TEST_SETTINGS,
-              ...appSettings,
-              app: {
-                ...TEST_SETTINGS.app,
-                projectDirectory: projectDirName,
-                ...appSettings.app,
-              },
-            },
-          }
         : {
             settings: {
               ...TEST_SETTINGS,

e2e/playwright/testing-gizmo.spec.ts

@@ -292,7 +292,7 @@ test.describe(`Testing gizmo, fixture-based`, () => {
     await test.step(`Verify the camera moved`, async () => {
       await scene.expectState({
         camera: {
-          position: [0, -23865.37, 11073.53],
+          position: [0, -23865.37, 11073.54],
           target: [0, 0, 0],
         },
       })

e2e/playwright/testing-settings.spec.ts

@@ -430,6 +430,7 @@ test.describe('Testing settings', () => {
       await test.step('Check color of logo changed when in modeling view', async () => {
         await page.getByRole('button', { name: 'New project' }).click()
         await page.getByTestId('project-link').first().click()
+        await page.getByRole('button', { name: 'Dismiss' }).click()
         await changeColor('58')
         await expect(logoLink).toHaveCSS('--primary-hue', '58')
       })

interface.d.ts

@@ -2,7 +2,7 @@ import fs from 'node:fs/promises'
 import fsSync from 'node:fs'
 import path from 'path'
 import { dialog, shell } from 'electron'
-import { MachinesListing } from 'components/MachineManagerProvider'
+import { MachinesListing } from 'lib/machineManager'
 
 type EnvFn = (value?: string) => string
 

openapi/machine-api.json

@@ -107,13 +107,6 @@
             },
             "type": "array"
           },
-          "loaded_filament_idx": {
-            "description": "The currently loaded filament index.",
-            "format": "uint",
-            "minimum": 0,
-            "nullable": true,
-            "type": "integer"
-          },
           "nozzle_diameter": {
             "description": "Diameter of the extrusion nozzle, in mm.",
             "format": "double",
@@ -292,21 +285,6 @@
               "type"
             ],
             "type": "object"
-          },
-          {
-            "description": "Unknown material",
-            "properties": {
-              "type": {
-                "enum": [
-                  "unknown"
-                ],
-                "type": "string"
-              }
-            },
-            "required": [
-              "type"
-            ],
-            "type": "object"
           }
         ]
       },
@@ -996,7 +974,7 @@
     },
     "description": "",
     "title": "machine-api",
-    "version": "0.1.1"
+    "version": "0.1.0"
   },
   "openapi": "3.0.3",
   "paths": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zoo-modeling-app",
-  "version": "0.26.2",
+  "version": "0.26.0",
   "private": true,
   "productName": "Zoo Modeling App",
   "author": {
@@ -161,7 +161,7 @@
     "@types/isomorphic-fetch": "^0.0.39",
     "@types/minimist": "^1.2.5",
     "@types/mocha": "^10.0.6",
-    "@types/node": "^22.7.8",
+    "@types/node": "^22.5.0",
     "@types/pixelmatch": "^5.2.6",
     "@types/pngjs": "^6.0.4",
     "@types/react": "^18.3.4",

src/Router.tsx

@@ -21,7 +21,6 @@ import { WasmErrBanner } from 'components/WasmErrBanner'
 import { CommandBar } from 'components/CommandBar/CommandBar'
 import ModelingMachineProvider from 'components/ModelingMachineProvider'
 import FileMachineProvider from 'components/FileMachineProvider'
-import { MachineManagerProvider } from 'components/MachineManagerProvider'
 import { PATHS } from 'lib/paths'
 import {
   fileLoader,
@@ -50,7 +49,6 @@ const router = createRouter([
   {
     loader: settingsLoader,
     id: PATHS.INDEX,
-    // TODO: Re-evaluate if this is true
     /* Make sure auth is the outermost provider or else we will have
      * inefficient re-renders, use the react profiler to see. */
     element: (
@@ -59,9 +57,7 @@ const router = createRouter([
           <LspProvider>
             <KclContextProvider>
               <AppStateProvider>
-                <MachineManagerProvider>
                 <Outlet />
-                </MachineManagerProvider>
               </AppStateProvider>
             </KclContextProvider>
           </LspProvider>

src/clientSideScene/CameraControls.ts

@@ -92,7 +92,6 @@ export class CameraControls {
   target: Vector3
   domElement: HTMLCanvasElement
   isDragging: boolean
-  wasDragging: boolean
   mouseDownPosition: Vector2
   mouseNewPosition: Vector2
   rotationSpeed = 0.3
@@ -234,7 +233,6 @@ export class CameraControls {
     this.target = new Vector3()
     this.domElement = domElement
     this.isDragging = false
-    this.wasDragging = false
     this.mouseDownPosition = new Vector2()
     this.mouseNewPosition = new Vector2()
 
@@ -365,8 +363,6 @@ export class CameraControls {
   onMouseDown = (event: PointerEvent) => {
     this.domElement.setPointerCapture(event.pointerId)
     this.isDragging = true
-    // Reset the wasDragging flag to false when starting a new drag
-    this.wasDragging = false
     this.mouseDownPosition.set(event.clientX, event.clientY)
     let interaction = this.getInteractionType(event)
     if (interaction === 'none') return
@@ -396,10 +392,6 @@ export class CameraControls {
       const interaction = this.getInteractionType(event)
       if (interaction === 'none') return
 
-      // If there's a valid interaction and the mouse is moving,
-      // our past (and current) interaction was a drag.
-      this.wasDragging = true
-
       if (this.syncDirection === 'engineToClient') {
         this.moveSender.send(() => {
           this.doMove(interaction, [event.clientX, event.clientY])
@@ -407,7 +399,6 @@ export class CameraControls {
         return
       }
 
-      // else "clientToEngine" (Sketch Mode) or forceUpdate
       // Implement camera movement logic here based on deltaMove
       // For example, for rotating the camera around the target:
       if (interaction === 'rotate') {
@@ -436,9 +427,6 @@ export class CameraControls {
        * under the cursor. This recently moved from being handled in App.tsx.
        * This might not be the right spot, but it is more consolidated.
        */
-
-      // Clear any previous drag state
-      this.wasDragging = false
       if (this.syncDirection === 'engineToClient') {
         const newCmdId = uuidv4()
 

src/clientSideScene/sceneEntities.ts

@@ -338,11 +338,6 @@ export class SceneEntities {
     sceneInfra.setCallbacks({
       onClick: async (args) => {
         if (!args) return
-        // If there is a valid camera interaction that matches, do that instead
-        const interaction = sceneInfra.camControls.getInteractionType(
-          args.mouseEvent
-        )
-        if (interaction !== 'none') return
         if (args.mouseEvent.which !== 1) return
         const { intersectionPoint } = args
         if (!intersectionPoint?.twoD || !sketchDetails?.sketchPathToNode) return
@@ -412,7 +407,7 @@ export class SceneEntities {
     if (err(sketch)) return Promise.reject(sketch)
     if (!sketch) return Promise.reject('sketch not found')
 
-    if (!isArray(sketch?.paths))
+    if (!isArray(sketch?.value))
       return {
         truncatedAst,
         programMemoryOverride,
@@ -440,7 +435,7 @@ export class SceneEntities {
       maybeModdedAst,
       sketch.start.__geoMeta.sourceRange
     )
-    if (sketch?.paths?.[0]?.type !== 'Circle') {
+    if (sketch?.value?.[0]?.type !== 'Circle') {
       const _profileStart = createProfileStartHandle({
         from: sketch.start.from,
         id: sketch.start.__geoMeta.id,
@@ -456,16 +451,16 @@ export class SceneEntities {
       this.activeSegments[JSON.stringify(segPathToNode)] = _profileStart
     }
     const callbacks: (() => SegmentOverlayPayload | null)[] = []
-    sketch.paths.forEach((segment, index) => {
+    sketch.value.forEach((segment, index) => {
       let segPathToNode = getNodePathFromSourceRange(
         maybeModdedAst,
         segment.__geoMeta.sourceRange
       )
       if (
         draftExpressionsIndices &&
-        (sketch.paths[index - 1] || sketch.start)
+        (sketch.value[index - 1] || sketch.start)
       ) {
-        const previousSegment = sketch.paths[index - 1] || sketch.start
+        const previousSegment = sketch.value[index - 1] || sketch.start
         const previousSegmentPathToNode = getNodePathFromSourceRange(
           maybeModdedAst,
           previousSegment.__geoMeta.sourceRange
@@ -516,7 +511,7 @@ export class SceneEntities {
               to: segment.to,
             }
       const result = initSegment({
-        prevSegment: sketch.paths[index - 1],
+        prevSegment: sketch.value[index - 1],
         callExpName,
         input,
         id: segment.__geoMeta.id,
@@ -615,9 +610,9 @@ export class SceneEntities {
       variableDeclarationName
     )
     if (err(sg)) return Promise.reject(sg)
-    const lastSeg = sg?.paths?.slice(-1)[0] || sg.start
+    const lastSeg = sg?.value?.slice(-1)[0] || sg.start
 
-    const index = sg.paths.length // because we've added a new segment that's not in the memory yet, no need for `-1`
+    const index = sg.value.length // because we've added a new segment that's not in the memory yet, no need for `-1`
     const mod = addNewSketchLn({
       node: _ast,
       programMemory: kclManager.programMemory,
@@ -650,13 +645,7 @@ export class SceneEntities {
     sceneInfra.setCallbacks({
       onClick: async (args) => {
         if (!args) return
-        // If there is a valid camera interaction that matches, do that instead
-        const interaction = sceneInfra.camControls.getInteractionType(
-          args.mouseEvent
-        )
-        if (interaction !== 'none') return
         if (args.mouseEvent.which !== 1) return
-
         const { intersectionPoint } = args
         let intersection2d = intersectionPoint?.twoD
         const profileStart = args.intersects
@@ -665,7 +654,7 @@ export class SceneEntities {
 
         let modifiedAst
         if (profileStart) {
-          const lastSegment = sketch.paths.slice(-1)[0]
+          const lastSegment = sketch.value.slice(-1)[0]
           modifiedAst = addCallExpressionsToPipe({
             node: kclManager.ast,
             programMemory: kclManager.programMemory,
@@ -697,7 +686,7 @@ export class SceneEntities {
           })
           if (trap(modifiedAst)) return Promise.reject(modifiedAst)
         } else if (intersection2d) {
-          const lastSegment = sketch.paths.slice(-1)[0]
+          const lastSegment = sketch.value.slice(-1)[0]
           const tmp = addNewSketchLn({
             node: kclManager.ast,
             programMemory: kclManager.programMemory,
@@ -746,6 +735,7 @@ export class SceneEntities {
           },
         })
       },
+      ...this.mouseEnterLeaveCallbacks(),
     })
   }
   setupDraftRectangle = async (
@@ -827,7 +817,7 @@ export class SceneEntities {
           variableDeclarationName
         )
         if (err(sketch)) return Promise.reject(sketch)
-        const sgPaths = sketch.paths
+        const sgPaths = sketch.value
         const orthoFactor = orthoScale(sceneInfra.camControls.camera)
 
         this.updateSegment(sketch.start, 0, 0, _ast, orthoFactor, sketch)
@@ -836,11 +826,6 @@ export class SceneEntities {
         )
       },
       onClick: async (args) => {
-        // If there is a valid camera interaction that matches, do that instead
-        const interaction = sceneInfra.camControls.getInteractionType(
-          args.mouseEvent
-        )
-        if (interaction !== 'none') return
         // Commit the rectangle to the full AST/code and return to sketch.idle
         const cornerPoint = args.intersectionPoint?.twoD
         if (!cornerPoint || args.mouseEvent.button !== 0) return
@@ -883,7 +868,7 @@ export class SceneEntities {
             variableDeclarationName
           )
           if (err(sketch)) return
-          const sgPaths = sketch.paths
+          const sgPaths = sketch.value
           const orthoFactor = orthoScale(sceneInfra.camControls.camera)
 
           // Update the starting segment of the THREEjs scene
@@ -1000,7 +985,7 @@ export class SceneEntities {
           variableDeclarationName
         )
         if (err(sketch)) return
-        const sgPaths = sketch.paths
+        const sgPaths = sketch.value
         const orthoFactor = orthoScale(sceneInfra.camControls.camera)
 
         this.updateSegment(sketch.start, 0, 0, _ast, orthoFactor, sketch)
@@ -1009,11 +994,6 @@ export class SceneEntities {
         )
       },
       onClick: async (args) => {
-        // If there is a valid camera interaction that matches, do that instead
-        const interaction = sceneInfra.camControls.getInteractionType(
-          args.mouseEvent
-        )
-        if (interaction !== 'none') return
         // Commit the rectangle to the full AST/code and return to sketch.idle
         const cornerPoint = args.intersectionPoint?.twoD
         if (!cornerPoint || args.mouseEvent.button !== 0) return
@@ -1125,7 +1105,7 @@ export class SceneEntities {
 
           const pipeIndex = pathToNode[pathToNodeIndex + 1][0] as number
           if (addingNewSegmentStatus === 'nothing') {
-            const prevSegment = sketch.paths[pipeIndex - 2]
+            const prevSegment = sketch.value[pipeIndex - 2]
             const mod = addNewSketchLn({
               node: kclManager.ast,
               programMemory: kclManager.programMemory,
@@ -1177,11 +1157,6 @@ export class SceneEntities {
       },
       onMove: () => {},
       onClick: (args) => {
-        // If there is a valid camera interaction that matches, do that instead
-        const interaction = sceneInfra.camControls.getInteractionType(
-          args.mouseEvent
-        )
-        if (interaction !== 'none') return
         if (args?.mouseEvent.which !== 1) return
         if (!args || !args.selected) {
           sceneInfra.modelingSend({
@@ -1370,7 +1345,7 @@ export class SceneEntities {
       }
       if (!sketch) return
 
-      const sgPaths = sketch.paths
+      const sgPaths = sketch.value
       const orthoFactor = orthoScale(sceneInfra.camControls.camera)
 
       this.updateSegment(
@@ -1418,7 +1393,7 @@ export class SceneEntities {
       modifiedAst,
       segment.__geoMeta.sourceRange
     )
-    const sgPaths = sketch.paths
+    const sgPaths = sketch.value
     const originalPathToNodeStr = JSON.stringify(segPathToNode)
     segPathToNode[1][0] = varDecIndex
     const pathToNodeStr = JSON.stringify(segPathToNode)
@@ -1726,7 +1701,7 @@ function prepareTruncatedMemoryAndAst(
     variableDeclarationName
   )
   if (err(sg)) return sg
-  const lastSeg = sg?.paths.slice(-1)[0]
+  const lastSeg = sg?.value.slice(-1)[0]
   if (draftSegment) {
     // truncatedAst needs to setup with another segment at the end
     let newSegment

src/clientSideScene/sceneInfra.ts

@@ -213,7 +213,7 @@ export class SceneInfra {
     to: Coords2d
     angle?: number
   }): SegmentOverlayPayload | null {
-    if (!group.userData.draft && group.userData.pathToNode && arrowGroup) {
+    if (group.userData.pathToNode && arrowGroup) {
       const vector = new Vector3(0, 0, 0)
 
       // Get the position of the object3D in world space

src/clientSideScene/segments.ts

@@ -58,7 +58,7 @@ import { err } from 'lib/trap'
 
 interface CreateSegmentArgs {
   input: SegmentInputs
-  prevSegment: Sketch['paths'][number]
+  prevSegment: Sketch['value'][number]
   id: string
   pathToNode: PathToNode
   isDraftSegment?: boolean
@@ -72,7 +72,7 @@ interface CreateSegmentArgs {
 
 interface UpdateSegmentArgs {
   input: SegmentInputs
-  prevSegment: Sketch['paths'][number]
+  prevSegment: Sketch['value'][number]
   group: Group
   sceneInfra: SceneInfra
   scale?: number
@@ -147,7 +147,6 @@ class StraightSegment implements SegmentUtils {
     segmentGroup.name = STRAIGHT_SEGMENT
     segmentGroup.userData = {
       type: STRAIGHT_SEGMENT,
-      draft: isDraftSegment,
       id,
       from,
       to,
@@ -348,7 +347,6 @@ class TangentialArcToSegment implements SegmentUtils {
     mesh.name = meshName
     group.userData = {
       type: TANGENTIAL_ARC_TO_SEGMENT,
-      draft: isDraftSegment,
       id,
       from,
       to,
@@ -517,18 +515,11 @@ class CircleSegment implements SegmentUtils {
     const meshType = isDraftSegment ? CIRCLE_SEGMENT_DASH : CIRCLE_SEGMENT_BODY
     const arrowGroup = createArrowhead(scale, theme, color)
     const circleCenterGroup = createCircleCenterHandle(scale, theme, color)
-    // A radius indicator that appears from the center to the perimeter
-    const radiusIndicatorGroup = createLengthIndicator({
-      from: center,
-      to: [center[0] + radius, center[1]],
-      scale,
-    })
 
     arcMesh.userData.type = meshType
     arcMesh.name = meshType
     group.userData = {
       type: CIRCLE_SEGMENT,
-      draft: isDraftSegment,
       id,
       from,
       radius,
@@ -541,7 +532,7 @@ class CircleSegment implements SegmentUtils {
     }
     group.name = CIRCLE_SEGMENT
 
-    group.add(arcMesh, arrowGroup, circleCenterGroup, radiusIndicatorGroup)
+    group.add(arcMesh, arrowGroup, circleCenterGroup)
     const updateOverlaysCallback = this.update({
       prevSegment,
       input,
@@ -573,9 +564,6 @@ class CircleSegment implements SegmentUtils {
     group.userData.radius = radius
     group.userData.prevSegment = prevSegment
     const arrowGroup = group.getObjectByName(ARROWHEAD) as Group
-    const radiusLengthIndicator = group.getObjectByName(
-      SEGMENT_LENGTH_LABEL
-    ) as Group
     const circleCenterHandle = group.getObjectByName(
       CIRCLE_CENTER_HANDLE
     ) as Group
@@ -593,14 +581,11 @@ class CircleSegment implements SegmentUtils {
     }
 
     if (arrowGroup) {
-      // The arrowhead is placed at the perimeter of the circle,
+      arrowGroup.position.set(
-      // pointing up and to the right
+        center[0] + Math.cos(Math.PI / 4) * radius,
-      const arrowPoint = {
+        center[1] + Math.sin(Math.PI / 4) * radius,
-        x: center[0] + Math.cos(Math.PI / 4) * radius,
+        0
-        y: center[1] + Math.sin(Math.PI / 4) * radius,
+      )
-      }
-
-      arrowGroup.position.set(arrowPoint.x, arrowPoint.y, 0)
 
       const arrowheadAngle = Math.PI / 4
       arrowGroup.quaternion.setFromUnitVectors(
@@ -611,31 +596,6 @@ class CircleSegment implements SegmentUtils {
       arrowGroup.visible = isHandlesVisible
     }
 
-    if (radiusLengthIndicator) {
-      // The radius indicator is placed at the midpoint of the radius,
-      // at a 45 degree CCW angle from the positive X-axis
-      const indicatorPoint = {
-        x: center[0] + (Math.cos(Math.PI / 4) * radius) / 2,
-        y: center[1] + (Math.sin(Math.PI / 4) * radius) / 2,
-      }
-      const labelWrapper = radiusLengthIndicator.getObjectByName(
-        SEGMENT_LENGTH_LABEL_TEXT
-      ) as CSS2DObject
-      const labelWrapperElem = labelWrapper.element as HTMLDivElement
-      const label = labelWrapperElem.children[0] as HTMLParagraphElement
-      label.innerText = `${roundOff(radius)}`
-      label.classList.add(SEGMENT_LENGTH_LABEL_TEXT)
-      const isPlaneBackFace = center[0] > indicatorPoint.x
-      label.style.setProperty(
-        '--degree',
-        `${isPlaneBackFace ? '45' : '-45'}deg`
-      )
-      label.style.setProperty('--x', `0px`)
-      label.style.setProperty('--y', `0px`)
-      labelWrapper.position.set(indicatorPoint.x, indicatorPoint.y, 0)
-      radiusLengthIndicator.visible = isHandlesVisible
-    }
-
     if (circleCenterHandle) {
       circleCenterHandle.position.set(center[0], center[1], 0)
       circleCenterHandle.scale.set(scale, scale, scale)

src/components/FileTree.tsx

@@ -140,13 +140,6 @@ const FileTreeItem = ({
     async (eventType, path) => {
       // Don't try to read a file that was removed.
       if (isCurrentFile && eventType !== 'unlink') {
-        // Prevents a cyclic read / write causing editor problems such as
-        // misplaced cursor positions.
-        if (codeManager.writeCausedByAppCheckedInFileTreeFileSystemWatcher) {
-          codeManager.writeCausedByAppCheckedInFileTreeFileSystemWatcher = false
-          return
-        }
-
         let code = await window.electron.readFile(path, { encoding: 'utf-8' })
         code = normalizeLineEndings(code)
         codeManager.updateCodeStateEditor(code)

src/components/LowerRightControls.tsx

@@ -23,7 +23,6 @@ export function LowerRightControls({
 }) {
   const location = useLocation()
   const filePath = useAbsoluteFilePath()
-
   const linkOverrideClassName =
     '!text-chalkboard-70 hover:!text-chalkboard-80 dark:!text-chalkboard-40 dark:hover:!text-chalkboard-30'
 

src/components/MachineManagerProvider.tsx

@@ -1,123 +0,0 @@
-import { createContext, useEffect, useState } from 'react'
-
-import { engineCommandManager } from 'lib/singletons'
-import { CommandsContext } from 'components/CommandBar/CommandBarProvider'
-import { isDesktop } from 'lib/isDesktop'
-import { components } from 'lib/machine-api'
-import { reportRejection } from 'lib/trap'
-import { toSync } from 'lib/utils'
-
-export type MachinesListing = Array<
-  components['schemas']['MachineInfoResponse']
->
-
-export interface MachineManager {
-  machines: MachinesListing
-  machineApiIp: string | null
-  currentMachine: components['schemas']['MachineInfoResponse'] | null
-  noMachinesReason: () => string | undefined
-  setCurrentMachine: (
-    m: components['schemas']['MachineInfoResponse'] | null
-  ) => void
-}
-
-export const MachineManagerContext = createContext<MachineManager>({
-  machines: [],
-  machineApiIp: null,
-  currentMachine: null,
-  setCurrentMachine: (
-    _: components['schemas']['MachineInfoResponse'] | null
-  ) => {},
-  noMachinesReason: () => undefined,
-})
-
-export const MachineManagerProvider = ({
-  children,
-}: {
-  children: React.ReactNode
-}) => {
-  const [machines, setMachines] = useState<MachinesListing>([])
-  const [machineApiIp, setMachineApiIp] = useState<string | null>(null)
-  const [currentMachine, setCurrentMachine] = useState<
-    components['schemas']['MachineInfoResponse'] | null
-  >(null)
-
-  const commandBarActor = CommandsContext.useActorRef()
-
-  // Get the reason message for why there are no machines.
-  const noMachinesReason = (): string | undefined => {
-    if (machines.length > 0) {
-      return undefined
-    }
-
-    if (machineApiIp === null) {
-      return 'Machine API server was not discovered'
-    }
-
-    return 'Machine API server was discovered, but no machines are available'
-  }
-
-  useEffect(() => {
-    if (!isDesktop()) return
-
-    const update = async () => {
-      const _machineApiIp = await window.electron.getMachineApiIp()
-      if (_machineApiIp === null) return
-
-      setMachineApiIp(_machineApiIp)
-
-      const _machines = await window.electron.listMachines(_machineApiIp)
-      setMachines(_machines)
-    }
-
-    // Start a background job to update the machines every ten seconds.
-    // If MDNS is already watching, this timeout will wait until it's done to trigger the
-    // finding again.
-    let timeoutId: ReturnType<typeof setTimeout> | undefined = undefined
-    const timeoutLoop = () => {
-      clearTimeout(timeoutId)
-      timeoutId = setTimeout(
-        toSync(async () => {
-          await update()
-          timeoutLoop()
-        }, reportRejection),
-        1000
-      )
-    }
-    timeoutLoop()
-    update().catch(reportRejection)
-  }, [])
-
-  // Update engineCommandManager's copy of this data.
-  useEffect(() => {
-    const machineManagerNext = {
-      machines,
-      machineApiIp,
-      currentMachine,
-      noMachinesReason,
-      setCurrentMachine,
-    }
-
-    engineCommandManager.machineManager = machineManagerNext
-
-    commandBarActor.send({
-      type: 'Set machine manager',
-      data: machineManagerNext,
-    })
-  }, [machines, machineApiIp, currentMachine])
-
-  return (
-    <MachineManagerContext.Provider
-      value={{
-        machines,
-        machineApiIp,
-        currentMachine,
-        setCurrentMachine,
-        noMachinesReason,
-      }}
-    >
-      {' '}
-      {children}{' '}
-    </MachineManagerContext.Provider>
-  )
-}

src/components/ModelingMachineProvider.tsx

@@ -1,11 +1,5 @@
 import { useMachine } from '@xstate/react'
-import React, {
+import React, { createContext, useEffect, useMemo, useRef } from 'react'
-  createContext,
-  useEffect,
-  useMemo,
-  useRef,
-  useContext,
-} from 'react'
 import {
   Actor,
   AnyStateMachine,
@@ -34,7 +28,7 @@ import {
   editorManager,
   sceneEntitiesManager,
 } from 'lib/singletons'
-import { MachineManagerContext } from 'components/MachineManagerProvider'
+import { machineManager } from 'lib/machineManager'
 import { useHotkeys } from 'react-hotkeys-hook'
 import { applyConstraintHorzVertDistance } from './Toolbar/SetHorzVertDistance'
 import {
@@ -146,8 +140,6 @@ export const ModelingMachineProvider = ({
   //   >
   // )
 
-  const machineManager = useContext(MachineManagerContext)
-
   const [modelingState, modelingSend, modelingActor] = useMachine(
     modelingMachine.provide({
       actions: {
@@ -416,7 +408,7 @@ export const ModelingMachineProvider = ({
             return {}
           }
         ),
-        Make: ({ context, event }) => {
+        Make: ({ event }) => {
           if (event.type !== 'Make') return
           // Check if we already have an export intent.
           if (engineCommandManager.exportInfo) {
@@ -430,21 +422,7 @@ export const ModelingMachineProvider = ({
           }
 
           // Set the current machine.
-          // Due to our use of singeton pattern, we need to do this to reliably
+          machineManager.currentMachine = event.data.machine
-          // update this object across React and non-React boundary.
-          // We need to do this eagerly because of the exportToEngine call below.
-          if (engineCommandManager.machineManager === null) {
-            console.warn(
-              "engineCommandManager.machineManager is null. It shouldn't be at this point. Aborting operation."
-            )
-            return
-          } else {
-            engineCommandManager.machineManager.currentMachine =
-              event.data.machine
-          }
-
-          // Update the rest of the UI that needs to know the current machine
-          context.machineManager.setCurrentMachine(event.data.machine)
 
           const format: Models['OutputFormat_type'] = {
             type: 'stl',
@@ -666,7 +644,6 @@ export const ModelingMachineProvider = ({
             input.plane
           )
           await kclManager.updateAst(modifiedAst, false)
-          sceneInfra.camControls.enableRotate = false
           sceneInfra.camControls.syncDirection = 'clientToEngine'
 
           await letEngineAnimateAndSyncCamAfter(
@@ -1017,7 +994,6 @@ export const ModelingMachineProvider = ({
           ...modelingMachineDefaultContext.store,
           ...persistedContext,
         },
-        machineManager,
       },
       // devTools: true,
     }

src/components/ModelingSidebar/ModelingPanes/MemoryPane.tsx

@@ -95,7 +95,7 @@ export const processMemory = (programMemory: ProgramMemory) => {
           return rest
         })
       } else if (!err(sg)) {
-        processedMemory[key] = sg.paths.map(({ __geoMeta, ...rest }: Path) => {
+        processedMemory[key] = sg.value.map(({ __geoMeta, ...rest }: Path) => {
           return rest
         })
       } else if ((val.type as any) === 'Function') {

src/components/ModelingSidebar/ModelingSidebar.tsx

@@ -1,12 +1,6 @@
 import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
 import { Resizable } from 're-resizable'
-import {
+import { MouseEventHandler, useCallback, useEffect, useMemo } from 'react'
-  MouseEventHandler,
-  useCallback,
-  useEffect,
-  useMemo,
-  useContext,
-} from 'react'
 import { useHotkeys } from 'react-hotkeys-hook'
 import { SidebarAction, SidebarType, sidebarPanes } from './ModelingPanes'
 import Tooltip from 'components/Tooltip'
@@ -19,7 +13,7 @@ import { CustomIconName } from 'components/CustomIcon'
 import { useCommandsContext } from 'hooks/useCommandsContext'
 import { IconDefinition } from '@fortawesome/free-solid-svg-icons'
 import { useKclContext } from 'lang/KclProvider'
-import { MachineManagerContext } from 'components/MachineManagerProvider'
+import { machineManager } from 'lib/machineManager'
 
 interface ModelingSidebarProps {
   paneOpacity: '' | 'opacity-20' | 'opacity-40'
@@ -35,7 +29,6 @@ function getPlatformString(): 'web' | 'desktop' {
 }
 
 export function ModelingSidebar({ paneOpacity }: ModelingSidebarProps) {
-  const machineManager = useContext(MachineManagerContext)
   const { commandBarSend } = useCommandsContext()
   const kclContext = useKclContext()
   const { settings } = useSettingsAuthContext()

src/components/NetworkMachineIndicator.tsx

@@ -1,9 +1,7 @@
 import { Popover } from '@headlessui/react'
-import { useContext } from 'react'
 import Tooltip from './Tooltip'
+import { machineManager } from 'lib/machineManager'
 import { isDesktop } from 'lib/isDesktop'
-import { components } from 'lib/machine-api'
-import { MachineManagerContext } from 'components/MachineManagerProvider'
 import { CustomIcon } from './CustomIcon'
 
 export const NetworkMachineIndicator = ({
@@ -11,12 +9,9 @@ export const NetworkMachineIndicator = ({
 }: {
   className?: string
 }) => {
-  const {
+  const machineCount = machineManager.machineCount()
-    noMachinesReason,
+  const reason = machineManager.noMachinesReason()
-    machines,
+  const machines = machineManager.machines
-    machines: { length: machineCount },
-  } = useContext(MachineManagerContext)
-  const reason = noMachinesReason()
 
   return isDesktop() ? (
     <Popover className="relative">
@@ -52,8 +47,7 @@ export const NetworkMachineIndicator = ({
         </div>
         {machineCount > 0 && (
           <ul className="divide-y divide-chalkboard-20 dark:divide-chalkboard-80">
-            {machines.map(
+            {machines.map((machine) => {
-              (machine: components['schemas']['MachineInfoResponse']) => {
               return (
                 <li key={machine.id} className={'px-2 py-4 gap-1 last:mb-0 '}>
                   <p className="">{machine.id.toUpperCase()}</p>
@@ -80,8 +74,7 @@ export const NetworkMachineIndicator = ({
                   </p>
                 </li>
               )
-              }
+            })}
-            )}
           </ul>
         )}
       </Popover.Panel>

src/components/ProjectSidebarMenu.tsx

@@ -4,14 +4,14 @@ import { type IndexLoaderData } from 'lib/types'
 import { PATHS } from 'lib/paths'
 import { isDesktop } from '../lib/isDesktop'
 import { Link, useLocation, useNavigate } from 'react-router-dom'
-import { Fragment, useMemo, useContext } from 'react'
+import { Fragment, useMemo } from 'react'
 import { Logo } from './Logo'
 import { APP_NAME } from 'lib/constants'
 import { useCommandsContext } from 'hooks/useCommandsContext'
 import { CustomIcon } from './CustomIcon'
 import { useLspContext } from './LspProvider'
 import { engineCommandManager } from 'lib/singletons'
-import { MachineManagerContext } from 'components/MachineManagerProvider'
+import { machineManager } from 'lib/machineManager'
 import usePlatform from 'hooks/usePlatform'
 import { useAbsoluteFilePath } from 'hooks/useAbsoluteFilePath'
 import Tooltip from './Tooltip'
@@ -96,8 +96,6 @@ function ProjectMenuPopover({
   const location = useLocation()
   const navigate = useNavigate()
   const filePath = useAbsoluteFilePath()
-  const machineManager = useContext(MachineManagerContext)
-
   const { commandBarState, commandBarSend } = useCommandsContext()
   const { onProjectClose } = useLspContext()
   const exportCommandInfo = { name: 'Export', groupId: 'modeling' }
@@ -108,7 +106,7 @@ function ProjectMenuPopover({
         (c) => c.name === obj.name && c.groupId === obj.groupId
       )
     )
-  const machineCount = machineManager.machines.length
+  const machineCount = machineManager.machineCount()
 
   // We filter this memoized list so that no orphan "break" elements are rendered.
   const projectMenuItems = useMemo<(ActionButtonProps | 'break')[]>(

src/components/Stream.tsx

@@ -255,14 +255,10 @@ export const Stream = () => {
   }, [mediaStream])
 
   const handleMouseUp: MouseEventHandler<HTMLDivElement> = (e) => {
-    // If we've got no stream or connection, don't do anything
     if (!isNetworkOkay) return
     if (!videoRef.current) return
-    // If we're in sketch mode, don't send a engine-side select event
     if (state.matches('Sketch')) return
     if (state.matches({ idle: 'showPlanes' })) return
-    // If we're mousing up from a camera drag, don't send a select event
-    if (sceneInfra.camControls.wasDragging === true) return
 
     if (btnName(e.nativeEvent).left) {
       // eslint-disable-next-line @typescript-eslint/no-floating-promises

src/lang/artifact.test.ts

@@ -32,7 +32,7 @@ const mySketch001 = startSketchOn('XY')
             sourceRange: [46, 71],
           },
         },
-        paths: [
+        value: [
           {
             type: 'ToPoint',
             tag: null,
@@ -96,7 +96,7 @@ const mySketch001 = startSketchOn('XY')
         on: expect.any(Object),
         start: expect.any(Object),
         type: 'Sketch',
-        paths: [
+        value: [
           {
             type: 'ToPoint',
             from: [0, 0],
@@ -202,7 +202,7 @@ const sk2 = startSketchOn('XY')
               info: expect.any(Object),
             },
           },
-          paths: [
+          value: [
             {
               type: 'ToPoint',
               from: [0, 0],
@@ -294,7 +294,7 @@ const sk2 = startSketchOn('XY')
               info: expect.any(Object),
             },
           },
-          paths: [
+          value: [
             {
               type: 'ToPoint',
               from: [0, 0],

src/lang/codeManager.ts

@@ -20,8 +20,6 @@ export default class CodeManager {
   private _hotkeys: { [key: string]: () => void } = {}
   private timeoutWriter: ReturnType<typeof setTimeout> | undefined = undefined
 
-  public writeCausedByAppCheckedInFileTreeFileSystemWatcher = false
-
   constructor() {
     if (isDesktop()) {
       this.code = ''
@@ -122,7 +120,6 @@ export default class CodeManager {
       // and file-system watchers which read, will receive empty data during
       // writes.
       clearTimeout(this.timeoutWriter)
-      this.writeCausedByAppCheckedInFileTreeFileSystemWatcher = true
       this.timeoutWriter = setTimeout(() => {
         // Wait one event loop to give a chance for params to be set
         // Save the file to disk

src/lang/executor.test.ts

@@ -58,7 +58,7 @@ const newVar = myVar + 1`
 `
     const mem = await exe(code)
     // geo is three js buffer geometry and is very bloated to have in tests
-    const minusGeo = mem.get('mySketch')?.value?.paths
+    const minusGeo = mem.get('mySketch')?.value?.value
     expect(minusGeo).toEqual([
       {
         type: 'ToPoint',
@@ -175,7 +175,7 @@ const newVar = myVar + 1`
             info: expect.any(Object),
           },
         },
-        paths: [
+        value: [
           {
             type: 'ToPoint',
             to: [1, 1],
@@ -367,7 +367,7 @@ describe('testing math operators', () => {
     const mem = await exe(code)
     const sketch = sketchFromKclValue(mem.get('part001'), 'part001')
     // result of `-legLen(5, min(3, 999))` should be -4
-    const yVal = (sketch as Sketch).paths?.[0]?.to?.[1]
+    const yVal = (sketch as Sketch).value?.[0]?.to?.[1]
     expect(yVal).toBe(-4)
   })
   it('test that % substitution feeds down CallExp->ArrExp->UnaryExp->CallExp', async () => {
@@ -385,8 +385,8 @@ describe('testing math operators', () => {
     const mem = await exe(code)
     const sketch = sketchFromKclValue(mem.get('part001'), 'part001')
     // expect -legLen(segLen('seg01'), myVar) to equal -4 setting the y value back to 0
-    expect((sketch as Sketch).paths?.[1]?.from).toEqual([3, 4])
+    expect((sketch as Sketch).value?.[1]?.from).toEqual([3, 4])
-    expect((sketch as Sketch).paths?.[1]?.to).toEqual([6, 0])
+    expect((sketch as Sketch).value?.[1]?.to).toEqual([6, 0])
     const removedUnaryExp = code.replace(
       `-legLen(segLen(seg01), myVar)`,
       `legLen(segLen(seg01), myVar)`
@@ -398,7 +398,7 @@ describe('testing math operators', () => {
     )
 
     // without the minus sign, the y value should be 8
-    expect((removedUnaryExpMemSketch as Sketch).paths?.[1]?.to).toEqual([6, 8])
+    expect((removedUnaryExpMemSketch as Sketch).value?.[1]?.to).toEqual([6, 8])
   })
   it('with nested callExpression and binaryExpression', async () => {
     const code = 'const myVar = 2 + min(100, -1 + legLen(5, 3))'

src/lang/queryAst.ts

@@ -717,7 +717,7 @@ export function isLinesParallelAndConstrained(
       constraintType === 'angle' || constraintLevel === 'full'
 
     // get the previous segment
-    const prevSegment = sg.paths[secondaryIndex - 1]
+    const prevSegment = sg.value[secondaryIndex - 1]
     const prevSourceRange = prevSegment.__geoMeta.sourceRange
 
     const isParallelAndConstrained =

src/lang/std/engineConnection.ts

@@ -28,7 +28,6 @@ import {
 } from 'lib/constants'
 import { KclManager } from 'lang/KclSingleton'
 import { reportRejection } from 'lib/trap'
-import { MachineManager } from 'components/MachineManagerProvider'
 
 // TODO(paultag): This ought to be tweakable.
 const pingIntervalMs = 5_000
@@ -1416,9 +1415,6 @@ export class EngineCommandManager extends EventTarget {
     (() => {}) as any
   kclManager: null | KclManager = null
 
-  // The current "manufacturing machine" aka 3D printer, CNC, etc.
-  public machineManager: MachineManager | null = null
-
   set exportInfo(info: ExportInfo | null) {
     this._exportInfo = info
   }
@@ -1634,16 +1630,10 @@ export class EngineCommandManager extends EventTarget {
               break
             }
             case ExportIntent.Make: {
-              if (!this.machineManager) {
-                console.warn('Some how, no manufacturing machine is selected.')
-                break
-              }
-
               exportMake(
                 event.data,
                 this.exportInfo.name,
-                this.pendingExport.toastId,
+                this.pendingExport.toastId
-                this.machineManager
               ).then((result) => {
                 if (result) {
                   this.pendingExport?.resolve(null)

src/lang/std/sketch.ts

@@ -64,7 +64,7 @@ const ARC_SEGMENT_ERR = new Error('Invalid input, expected "arc-segment"')
 export type Coords2d = [number, number]
 
 export function getCoordsFromPaths(skGroup: Sketch, index = 0): Coords2d {
-  const currentPath = skGroup?.paths?.[index]
+  const currentPath = skGroup?.value?.[index]
   if (!currentPath && skGroup?.start) {
     return skGroup.start.to
   } else if (!currentPath) {
@@ -1704,7 +1704,7 @@ export const angledLineThatIntersects: SketchLineHelper = {
       varName
     )
     if (err(sketch)) return sketch
-    const intersectPath = sketch.paths.find(
+    const intersectPath = sketch.value.find(
       ({ tag }: Path) => tag && tag.value === intersectTagName
     )
     let offset = 0

src/lang/std/sketchConstraints.ts

@@ -18,7 +18,7 @@ export function getSketchSegmentFromPathToNode(
   pathToNode: PathToNode
 ):
   | {
-      segment: Sketch['paths'][number]
+      segment: Sketch['value'][number]
       index: number
     }
   | Error {
@@ -39,15 +39,15 @@ export function getSketchSegmentFromSourceRange(
   [rangeStart, rangeEnd]: SourceRange
 ):
   | {
-      segment: Sketch['paths'][number]
+      segment: Sketch['value'][number]
       index: number
     }
   | Error {
-  const lineIndex = sketch.paths.findIndex(
+  const lineIndex = sketch.value.findIndex(
     ({ __geoMeta: { sourceRange } }: Path) =>
       sourceRange[0] <= rangeStart && sourceRange[1] >= rangeEnd
   )
-  const line = sketch.paths[lineIndex]
+  const line = sketch.value[lineIndex]
   if (line) {
     return {
       segment: line,

src/lang/std/sketchcombos.ts

@@ -1732,7 +1732,7 @@ export function transformAstSketchLines({
       if (err(_segment)) return _segment
       referencedSegment = _segment.segment
     } else {
-      referencedSegment = sketch.paths.find(
+      referencedSegment = sketch.value.find(
         (path) => path.tag?.value === _referencedSegmentName
       )
     }

src/lang/wasm.ts

@@ -110,6 +110,7 @@ const initialise = async () => {
     const fullUrl = wasmUrl()
     const input = await fetch(fullUrl)
     const buffer = await input.arrayBuffer()
+
     return await init(buffer)
   } catch (e) {
     console.log('Error initialising WASM', e)

src/lib/commandBarConfigs/modelingCommandConfig.ts

@@ -3,6 +3,7 @@ import { StateMachineCommandSetConfig, KclCommandValue } from 'lib/commandTypes'
 import { KCL_DEFAULT_LENGTH, KCL_DEFAULT_DEGREE } from 'lib/constants'
 import { components } from 'lib/machine-api'
 import { Selections } from 'lib/selections'
+import { machineManager } from 'lib/machineManager'
 import { modelingMachine, SketchTool } from 'machines/modelingMachine'
 
 type OutputFormat = Models['OutputFormat_type']
@@ -186,10 +187,9 @@ export const modelingMachineCommandConfig: StateMachineCommandSetConfig<
           machine.make_model.model ||
           machine.make_model.manufacturer ||
           'Unknown Machine',
-        options: (commandBarContext) => {
+        options: () => {
-          return Object.values(
+          return Object.entries(machineManager.machines).map(
-            commandBarContext.machineManager?.machines || []
+            ([_, machine]) => ({
-          ).map((machine: components['schemas']['MachineInfoResponse']) => ({
               name:
                 `${machine.id} (${
                   machine.make_model.model || machine.make_model.manufacturer
@@ -215,12 +215,13 @@ export const modelingMachineCommandConfig: StateMachineCommandSetConfig<
                   : ''),
               isCurrent: false,
               disabled: machine.state.state !== 'idle',
-            value: machine,
+              value: machine as components['schemas']['MachineInfoResponse'],
-          }))
+            })
+          )
         },
-        defaultValue: (commandBarContext) => {
+        defaultValue: () => {
           return Object.values(
-            commandBarContext.machineManager.machines || []
+            machineManager.machines
           )[0] as components['schemas']['MachineInfoResponse']
         },
       },

src/lib/commandTypes.ts

@@ -5,7 +5,6 @@ import { Selection } from './selections'
 import { Identifier, Expr, VariableDeclaration } from 'lang/wasm'
 import { commandBarMachine } from 'machines/commandBarMachine'
 import { ReactNode } from 'react'
-import { MachineManager } from 'components/MachineManagerProvider'
 
 type Icon = CustomIconName
 const PLATFORMS = ['both', 'web', 'desktop'] as const
@@ -128,7 +127,6 @@ export type CommandArgumentConfig<
         | ((
             commandBarContext: {
               argumentsToSubmit: Record<string, unknown>
-              machineManager?: MachineManager
             }, // Should be the commandbarMachine's context, but it creates a circular dependency
             machineContext?: C
           ) => CommandArgumentOption<OutputType>[])

src/lib/engineUtils.ts

@@ -0,0 +1,31 @@
+import EngineUtils from '@engine-utils'
+
+type KCEngineUtilsEvaluatePath = {
+  (sketch: string, t: number): string
+}
+let kcEngineUtilsEvaluatePath: KCEngineUtilsEvaluatePath
+
+export async function init() {
+  return await new Promise((resolve, reject) => {
+    try {
+      EngineUtils().then((module) => {
+        kcEngineUtilsEvaluatePath = module.cwrap(
+          'kcEngineUtilsEvaluatePath',
+          'string',
+          ['string', 'number']
+        )
+        resolve(true)
+      })
+    } catch (e) {
+      reject(e)
+    }
+  })
+}
+
+export async function getTruePathEndPos(sketch: string) {
+  if (!kcEngineUtilsEvaluatePath) {
+    await init()
+  }
+
+  return kcEngineUtilsEvaluatePath(sketch, 1.0)
+}

src/lib/exportMake.ts

@@ -1,5 +1,5 @@
 import { deserialize_files } from 'wasm-lib/pkg/wasm_lib'
-import { MachineManager } from 'components/MachineManagerProvider'
+import { machineManager } from './machineManager'
 import toast from 'react-hot-toast'
 import { components } from './machine-api'
 import ModelingAppFile from './modelingAppFile'
@@ -9,8 +9,7 @@ import { MAKE_TOAST_MESSAGES } from './constants'
 export async function exportMake(
   data: ArrayBuffer,
   name: string,
-  toastId: string,
+  toastId: string
-  machineManager: MachineManager
 ): Promise<Response | null> {
   if (name === '') {
     console.error(MAKE_TOAST_MESSAGES.NO_NAME)
@@ -18,7 +17,7 @@ export async function exportMake(
     return null
   }
 
-  if (machineManager.machines.length === 0) {
+  if (machineManager.machineCount() === 0) {
     console.error(MAKE_TOAST_MESSAGES.NO_MACHINES)
     toast.error(MAKE_TOAST_MESSAGES.NO_MACHINES, { id: toastId })
     return null

src/lib/machine-api.d.ts

@@ -138,11 +138,6 @@ export interface components {
     FdmHardwareConfiguration: {
       /** @description The filaments the printer has access to. */
       filaments: components['schemas']['Filament'][]
-      /**
-       * Format: uint
-       * @description The currently loaded filament index.
-       */
-      loaded_filament_idx?: number | null
       /**
        * Format: double
        * @description Diameter of the extrusion nozzle, in mm.
@@ -196,10 +191,6 @@ export interface components {
           /** @enum {string} */
           type: 'composite'
         }
-      | {
-          /** @enum {string} */
-          type: 'unknown'
-        }
     /** @description The hardware configuration of a machine. */
     HardwareConfiguration:
       | {

src/lib/machineManager.ts

@@ -0,0 +1,105 @@
+import { isDesktop } from './isDesktop'
+import { components } from './machine-api'
+import { reportRejection } from './trap'
+import { toSync } from './utils'
+
+export type MachinesListing = Array<
+  components['schemas']['MachineInfoResponse']
+>
+
+export class MachineManager {
+  private _isDesktop: boolean = isDesktop()
+  private _machines: MachinesListing = []
+  private _machineApiIp: string | null = null
+  private _currentMachine: components['schemas']['MachineInfoResponse'] | null =
+    null
+
+  constructor() {
+    if (!this._isDesktop) {
+      return
+    }
+
+    this.updateMachines().catch(reportRejection)
+  }
+
+  start() {
+    if (!this._isDesktop) {
+      return
+    }
+
+    // Start a background job to update the machines every ten seconds.
+    // If MDNS is already watching, this timeout will wait until it's done to trigger the
+    // finding again.
+    let timeoutId: ReturnType<typeof setTimeout> | undefined = undefined
+    const timeoutLoop = () => {
+      clearTimeout(timeoutId)
+      timeoutId = setTimeout(
+        toSync(async () => {
+          await this.updateMachineApiIp()
+          await this.updateMachines()
+          timeoutLoop()
+        }, reportRejection),
+        10000
+      )
+    }
+    timeoutLoop()
+  }
+
+  get machines(): MachinesListing {
+    return this._machines
+  }
+
+  machineCount(): number {
+    return this._machines.length
+  }
+
+  get machineApiIp(): string | null {
+    return this._machineApiIp
+  }
+
+  // Get the reason message for why there are no machines.
+  noMachinesReason(): string | undefined {
+    if (this.machineCount() > 0) {
+      return undefined
+    }
+
+    if (this.machineApiIp === null) {
+      return 'Machine API server was not discovered'
+    }
+
+    return 'Machine API server was discovered, but no machines are available'
+  }
+
+  get currentMachine(): components['schemas']['MachineInfoResponse'] | null {
+    return this._currentMachine
+  }
+
+  set currentMachine(
+    machine: components['schemas']['MachineInfoResponse'] | null
+  ) {
+    this._currentMachine = machine
+  }
+
+  private async updateMachines(): Promise<void> {
+    if (!this._isDesktop) {
+      return
+    }
+
+    if (this._machineApiIp === null) {
+      return
+    }
+
+    this._machines = await window.electron.listMachines(this._machineApiIp)
+  }
+
+  private async updateMachineApiIp(): Promise<void> {
+    if (!this._isDesktop) {
+      return
+    }
+
+    this._machineApiIp = await window.electron.getMachineApiIp()
+  }
+}
+
+export const machineManager = new MachineManager()
+machineManager.start()

src/machines/commandBarMachine.ts

@@ -7,7 +7,6 @@ import {
 } from 'lib/commandTypes'
 import { Selections } from 'lib/selections'
 import { getCommandArgumentKclValuesOnly } from 'lib/commandUtils'
-import { MachineManager } from 'components/MachineManagerProvider'
 
 export type CommandBarContext = {
   commands: Command[]
@@ -15,7 +14,6 @@ export type CommandBarContext = {
   currentArgument?: CommandArgument<unknown> & { name: string }
   selectionRanges: Selections
   argumentsToSubmit: { [x: string]: unknown }
-  machineManager: MachineManager
 }
 
 export type CommandBarMachineEvent =
@@ -73,7 +71,6 @@ export type CommandBarMachineEvent =
       type: 'Change current argument'
       data: { [x: string]: CommandArgumentWithName<unknown> }
     }
-  | { type: 'Set machine manager'; data: MachineManager }
 
 export const commandBarMachine = setup({
   types: {
@@ -93,12 +90,6 @@ export const commandBarMachine = setup({
         }
       },
     }),
-    'Set machine manager': assign({
-      machineManager: ({ event, context }) => {
-        if (event.type !== 'Set machine manager') return context.machineManager
-        return event.data
-      },
-    }),
     'Execute command': ({ context, event }) => {
       const { selectedCommand } = context
       if (!selectedCommand) return
@@ -348,13 +339,6 @@ export const commandBarMachine = setup({
       codeBasedSelections: [],
     },
     argumentsToSubmit: {},
-    machineManager: {
-      machines: [],
-      machineApiIp: null,
-      currentMachine: null,
-      setCurrentMachine: () => {},
-      noMachinesReason: () => undefined,
-    },
   },
   id: 'Command Bar',
   initial: 'Closed',
@@ -536,11 +520,6 @@ export const commandBarMachine = setup({
     },
   },
   on: {
-    'Set machine manager': {
-      reenter: false,
-      actions: 'Set machine manager',
-    },
-
     Close: {
       target: '.Closed',
     },

src/machines/modelingMachine.ts

@@ -64,7 +64,6 @@ import toast from 'react-hot-toast'
 import { ToolbarModeName } from 'lib/toolbar'
 import { quaternionFromUpNForward } from 'clientSideScene/helpers'
 import { Vector3 } from 'three'
-import { MachineManager } from 'components/MachineManagerProvider'
 
 export const MODELING_PERSIST_KEY = 'MODELING_PERSIST_KEY'
 
@@ -302,7 +301,6 @@ export const getPersistedContext = (): Partial<PersistedModelingContext> => {
 export interface ModelingMachineContext {
   currentMode: ToolbarModeName
   currentTool: SketchTool
-  machineManager: MachineManager
   selection: string[]
   selectionRanges: Selections
   sketchDetails: SketchDetails | null
@@ -317,13 +315,6 @@ export interface ModelingMachineContext {
 export const modelingMachineDefaultContext: ModelingMachineContext = {
   currentMode: 'modeling',
   currentTool: 'none',
-  machineManager: {
-    machines: [],
-    machineApiIp: null,
-    currentMachine: null,
-    setCurrentMachine: () => {},
-    noMachinesReason: () => undefined,
-  },
   selection: [],
   selectionRanges: {
     otherSelections: [],

src/preload.ts

@@ -4,7 +4,7 @@ import fs from 'node:fs/promises'
 import os from 'node:os'
 import fsSync from 'node:fs'
 import packageJson from '../package.json'
-import { MachinesListing } from 'components/MachineManagerProvider'
+import { MachinesListing } from 'lib/machineManager'
 import chokidar from 'chokidar'
 
 const open = (args: any) => ipcRenderer.invoke('dialog.showOpenDialog', args)

src/routes/Onboarding/index.tsx

@@ -23,9 +23,6 @@ import { codeManager, editorManager, kclManager } from 'lib/singletons'
 import { bracket } from 'lib/exampleKcl'
 import { toSync } from 'lib/utils'
 import { reportRejection } from 'lib/trap'
-import { useNetworkContext } from 'hooks/useNetworkContext'
-import { NetworkHealthState } from 'hooks/useNetworkStatus'
-import { EngineConnectionStateType } from 'lang/std/engineConnection'
 
 export const kbdClasses =
   'py-0.5 px-1 text-sm rounded bg-chalkboard-10 dark:bg-chalkboard-100 border border-chalkboard-50 border-b-2'
@@ -83,20 +80,8 @@ export const onboardingRoutes = [
 ]
 
 export function useDemoCode() {
-  const { overallState, immediateState } = useNetworkContext()
-
   useEffect(() => {
-    // Don't run if the editor isn't loaded or the code is already the bracket
+    if (!editorManager.editorView || codeManager.code === bracket) return
-    if (!editorManager.editorView || codeManager.code === bracket) {
-      return
-    }
-    // Don't run if the network isn't healthy or the connection isn't established
-    if (
-      overallState !== NetworkHealthState.Ok ||
-      immediateState.type !== EngineConnectionStateType.ConnectionEstablished
-    ) {
-      return
-    }
     setTimeout(
       toSync(async () => {
         codeManager.updateCodeStateEditor(bracket)
@@ -104,7 +89,7 @@ export function useDemoCode() {
         await codeManager.writeToFile()
       }, reportRejection)
     )
-  }, [editorManager.editorView, immediateState, overallState])
+  }, [editorManager.editorView])
 }
 
 export function useNextClick(newStatus: string) {

src/wasm-lib/Cargo.lock

@@ -176,7 +176,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -187,7 +187,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -204,7 +204,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -465,7 +465,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -656,7 +656,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -667,7 +667,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -722,7 +722,7 @@ checksum = "4078275de501a61ceb9e759d37bdd3d7210e654dbc167ac1a3678ef4435ed57b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.79",
  "synstructure",
 ]
 
@@ -751,7 +751,7 @@ dependencies = [
  "rustfmt-wrapper",
  "serde",
  "serde_tokenstream",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -762,7 +762,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -789,7 +789,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -827,7 +827,7 @@ checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -988,7 +988,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -1084,7 +1084,7 @@ dependencies = [
  "inflections",
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -1542,7 +1542,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-lib"
-version = "0.2.23"
+version = "0.2.22"
 dependencies = [
  "anyhow",
  "approx 0.5.1",
@@ -1612,12 +1612,12 @@ dependencies = [
  "pretty_assertions",
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "kcl-test-server"
-version = "0.1.15"
+version = "0.1.14"
 dependencies = [
  "anyhow",
  "hyper 0.14.30",
@@ -1644,9 +1644,9 @@ dependencies = [
 
 [[package]]
 name = "kittycad"
-version = "0.3.25"
+version = "0.3.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6359cc0a1bbccbcf78775eea17a033cf2aa89d3fe6a9784f8ce94e5f882c185"
+checksum = "71b6f0c34165939697548dd0c94221200dbb8b5d1c84b5d8e803e70f9f720ea7"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -1684,9 +1684,9 @@ dependencies = [
 
 [[package]]
 name = "kittycad-modeling-cmds"
-version = "0.2.71"
+version = "0.2.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6d2160dcb0e5373b1242a760dbf17fb9c12de523c410c11b145381c852b377b"
+checksum = "b135696d07a4fab928e5abace4dd05f4976eafab5d73e5747a85dc5a684b936c"
 dependencies = [
  "anyhow",
  "chrono",
@@ -1716,7 +1716,7 @@ dependencies = [
  "kittycad-modeling-cmds-macros-impl",
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -1727,7 +1727,7 @@ checksum = "6607507a8a0e4273b943179f0a3ef8e90712308d1d3095246040c29cfdbf985b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -2112,7 +2112,7 @@ dependencies = [
  "regex",
  "regex-syntax 0.8.5",
  "structmeta",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -2126,7 +2126,7 @@ dependencies = [
  "regex",
  "regex-syntax 0.8.5",
  "structmeta",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -2166,7 +2166,7 @@ dependencies = [
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -2224,7 +2224,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -2337,9 +2337,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.89"
+version = "1.0.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
+checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9"
 dependencies = [
  "unicode-ident",
 ]
@@ -2391,7 +2391,7 @@ dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -2404,7 +2404,7 @@ dependencies = [
  "proc-macro2",
  "pyo3-build-config",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -2586,9 +2586,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.11.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2925,7 +2925,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -2965,9 +2965,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.213"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
 dependencies = [
  "serde_derive",
 ]
@@ -2983,13 +2983,13 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.213"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -3000,7 +3000,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -3024,7 +3024,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -3045,7 +3045,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -3182,7 +3182,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "structmeta-derive",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -3193,7 +3193,7 @@ checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -3215,7 +3215,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -3237,9 +3237,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.85"
+version = "2.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3263,7 +3263,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -3326,22 +3326,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.65"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5"
+checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.65"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602"
+checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -3437,7 +3437,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -3579,7 +3579,7 @@ checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -3607,7 +3607,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -3689,7 +3689,7 @@ checksum = "0ea0b99e8ec44abd6f94a18f28f7934437809dd062820797c52401298116f70e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.79",
  "termcolor",
 ]
 
@@ -3865,7 +3865,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -3927,7 +3927,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.79",
  "wasm-bindgen-shared",
 ]
 
@@ -3962,7 +3962,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.79",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -4328,7 +4328,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.79",
 ]
 
 [[package]]

src/wasm-lib/Cargo.toml

@@ -71,8 +71,8 @@ members = [
 
 [workspace.dependencies]
 http = "1"
-kittycad = { version = "0.3.25", default-features = false, features = ["js", "requests"] }
+kittycad = { version = "0.3.23", default-features = false, features = ["js", "requests"] }
-kittycad-modeling-cmds = { version = "0.2.71", features = ["websocket"] }
+kittycad-modeling-cmds = { version = "0.2.70", features = ["websocket"] }
 
 [[test]]
 name = "executor"
@@ -83,6 +83,6 @@ name = "modify"
 path = "tests/modify/main.rs"
 
 # Example: how to point modeling-api at a different repo (e.g. a branch or a local clone)
-#[patch.crates-io]
+#[patch."https://github.com/KittyCAD/modeling-api"]
 #kittycad-modeling-cmds = { path = "../../../modeling-api/modeling-cmds" }
 #kittycad-modeling-session = { path = "../../../modeling-api/modeling-session" }

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

@@ -17,13 +17,13 @@ convert_case = "0.6.0"
 once_cell = "1.20.2"
 proc-macro2 = "1"
 quote = "1"
-regex = "1.11"
+regex = "1.10"
-serde = { version = "1.0.213", features = ["derive"] }
+serde = { version = "1.0.210", features = ["derive"] }
 serde_tokenstream = "0.2"
-syn = { version = "2.0.85", features = ["full"] }
+syn = { version = "2.0.79", features = ["full"] }
 
 [dev-dependencies]
-anyhow = "1.0.91"
+anyhow = "1.0.89"
 expectorate = "1.1.0"
 pretty_assertions = "1.4.1"
 rustfmt-wrapper = "0.2.1"

src/wasm-lib/kcl-macros/Cargo.toml

@@ -15,7 +15,7 @@ databake = "0.1.8"
 kcl-lib = { path = "../kcl" }
 proc-macro2 = "1"
 quote = "1"
-syn = { version = "2.0.85", features = ["full"] }
+syn = { version = "2.0.79", features = ["full"] }
 
 [dev-dependencies]
 pretty_assertions = "1.4.1"

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

@@ -1,15 +1,15 @@
 [package]
 name = "kcl-test-server"
 description = "A test server for KCL"
-version = "0.1.15"
+version = "0.1.14"
 edition = "2021"
 license = "MIT"
 
 [dependencies]
-anyhow = "1.0.91"
+anyhow = "1.0.89"
 hyper = { version = "0.14.29", features = ["http1", "server", "tcp"] }
 kcl-lib = { version = "0.2", path = "../kcl" }
 pico-args = "0.5.0"
-serde = { version = "1.0.213", features = ["derive"] }
+serde = { version = "1.0.210", features = ["derive"] }
 serde_json = "1.0.128"
 tokio = { version = "1.40.0", features = ["macros", "rt-multi-thread"] }

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

@@ -31,7 +31,7 @@ pub struct ServerArgs {
     /// Where to find the engine.
     /// If none, uses the prod engine.
     /// This is useful for testing a local engine instance.
-    /// Overridden by the $ZOO_HOST environment variable.
+    /// Overridden by the $LOCAL_ENGINE_ADDR environment variable.
     pub engine_address: Option<String>,
 }
 
@@ -44,8 +44,8 @@ impl ServerArgs {
             num_engine_conns: pargs.opt_value_from_str("--num-engine-conns")?.unwrap_or(1),
             engine_address: pargs.opt_value_from_str("--engine-address")?,
         };
-        if let Ok(addr) = std::env::var("ZOO_HOST") {
+        if let Ok(addr) = std::env::var("LOCAL_ENGINE_ADDR") {
-            println!("Overriding engine address via $ZOO_HOST");
+            println!("Overriding engine address via $LOCAL_ENGINE_ADDR");
             args.engine_address = Some(addr);
         }
         println!("Config is {args:?}");

src/wasm-lib/kcl/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "kcl-lib"
 description = "KittyCAD Language implementation and tools"
-version = "0.2.23"
+version = "0.2.22"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/KittyCAD/modeling-app"
@@ -11,7 +11,7 @@ keywords = ["kcl", "KittyCAD", "CAD"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = { version = "1.0.91", features = ["backtrace"] }
+anyhow = { version = "1.0.89", features = ["backtrace"] }
 async-recursion = "1.1.1"
 async-trait = "0.1.83"
 base64 = "0.22.1"
@@ -38,11 +38,11 @@ pyo3 = { version = "0.22.5", optional = true }
 reqwest = { version = "0.12", default-features = false, features = ["stream", "rustls-tls"] }
 ropey = "1.6.1"
 schemars = { version = "0.8.17", features = ["impl_json_schema", "url", "uuid1", "preserve_order"] }
-serde = { version = "1.0.213", features = ["derive"] }
+serde = { version = "1.0.210", features = ["derive"] }
 serde_json = "1.0.128"
 sha2 = "0.10.8"
 tabled = { version = "0.15.0", optional = true }
-thiserror = "1.0.65"
+thiserror = "1.0.64"
 toml = "0.8.19"
 ts-rs = { version = "10.0.0", features = ["uuid-impl", "url-impl", "chrono-impl", "no-serde-warnings", "serde-json-impl"] }
 url = { version = "2.5.2", features = ["serde"] }
@@ -68,7 +68,7 @@ tokio-tungstenite = { version = "0.24.0", features = ["rustls-tls-native-roots"]
 tower-lsp = { version = "0.20.0", features = ["proposed"] }
 
 [features]
-default = ["engine"]
+default = ["engine"]  # add wasm-engine-utils here when we're ready
 cli = ["dep:clap"]
 # For the lsp server, when run with stdout for rpc we want to disable println.
 # This is used for editor extensions that use the lsp server.
@@ -77,6 +77,10 @@ engine = []
 pyo3 = ["dep:pyo3"]
 # Helper functions also used in benchmarks.
 lsp-test-util = []
+#if enabled, kcl will link directly against a wasm build of the engine utils lib to save latency
+wasm-engine-utils = []
+#if enabled, kcl will link directly against a native build of the engine utils lib to save latency (not yet functional)
+native-engine-utils = []
 
 tabled = ["dep:tabled"]
 

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

@@ -0,0 +1,57 @@
+//! Functions for calling into the engine-utils library (a set of C++ utilities containing various logic for client-side CAD processing)
+//! Note that this binary may not be available to all builds of kcl, so fallbacks that call the engine API should be implemented
+
+use crate::{
+    errors::{KclError, KclErrorDetails},
+    std::Args,
+};
+use anyhow::Result;
+use std::ffi::{CString, CStr};
+use kittycad_modeling_cmds::{length_unit::LengthUnit, shared::Point3d};
+
+mod cpp {
+    use std::os::raw::c_char;
+
+    extern "C" {
+        pub fn kcEngineUtilsEvaluatePath(sketch: *const c_char, t: f64) -> *const c_char;
+    }
+}
+
+
+pub fn is_available() -> bool {
+    true
+}
+
+pub async fn get_true_path_end_pos(sketch: String, args: &Args) -> Result<Point3d<LengthUnit>, KclError> {
+    let c_string = CString::new(sketch).map_err(|e| {
+        KclError::Internal(KclErrorDetails {
+            message: format!("{:?}", e),
+            source_ranges: vec![args.source_range],
+        })
+    })?;
+    let arg = c_string.into_raw();
+    let result_string: String;
+
+    unsafe {
+        let result = cpp::kcEngineUtilsEvaluatePath(arg, 1.0);
+        let result_cstr = CStr::from_ptr(result);
+        let str_slice: &str = result_cstr.to_str().map_err(|e| {
+            KclError::Internal(KclErrorDetails {
+                message: format!("{:?}", e),
+                source_ranges: vec![args.source_range],
+            })
+        })?;
+        let str_buf: String = str_slice.to_owned();    
+        result_string = str_buf.clone();
+        let _ = CString::from_raw(arg);
+    }
+
+    let point: Point3d<f64> = serde_json::from_str(&result_string).map_err(|e| {
+        KclError::Type(KclErrorDetails {
+            message: format!("Failed to path position from json: {}", e),
+            source_ranges: vec![args.source_range],
+        })
+    })?;
+    
+    Ok(Point3d::<f64>::from(point).map(LengthUnit))
+}

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

@@ -0,0 +1,35 @@
+//! Functions for calling into the engine-utils library (a set of C++ utilities containing various logic for client-side CAD processing)
+//! Note that this binary may not be available to all builds of kcl, so fallbacks that call the engine API should be implemented
+
+use crate::{
+    errors::{KclError, KclErrorDetails},
+    std::Args,
+};
+use crate::engine::kcmc::{each_cmd as mcmd, ModelingCmd};
+use anyhow::Result;
+use kittycad_modeling_cmds::{length_unit::LengthUnit, ok_response::OkModelingCmdResponse, shared::Point3d, websocket::OkWebSocketResponseData};
+
+pub fn is_available() -> bool {
+    true
+}
+
+pub async fn get_true_path_end_pos(sketch: String, args: &Args) -> Result<Point3d<LengthUnit>, KclError> {
+    let id = uuid::Uuid::new_v4();
+    
+    let resp = args.send_modeling_cmd(id, ModelingCmd::from(mcmd::EngineUtilEvaluatePath {
+        path_json: sketch,
+        t: 1.0,
+    })).await?;
+
+    let OkWebSocketResponseData::Modeling {
+        modeling_response: OkModelingCmdResponse::EngineUtilEvaluatePath(point),
+    } = &resp 
+    else {
+        return Err(KclError::Engine(KclErrorDetails {
+            message: format!("mcmd::EngineUtilEvaluatePath response was not as expected: {:?}", resp),
+            source_ranges: vec![args.source_range],
+        }));
+    };
+
+    Ok(point.pos)
+}

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

@@ -0,0 +1,56 @@
+//! Functions for calling into the engine-utils library (a set of C++ utilities containing various logic for client-side CAD processing)
+//! Note that this binary may not be available to all builds of kcl, so fallbacks that call the engine API should be implemented
+
+use crate::{
+    errors::{KclError, KclErrorDetails},
+    std::Args,
+};
+use anyhow::Result;
+use kittycad_modeling_cmds::{length_unit::LengthUnit, shared::Point3d};
+mod cpp {
+    use wasm_bindgen::prelude::wasm_bindgen;
+
+    #[wasm_bindgen(module = "/../../lib/engineUtils.ts")]
+    extern "C" {
+        #[wasm_bindgen(js_name = getTruePathEndPos, catch)]
+        pub fn get_true_path_end_pos(sketch: String) -> Result<js_sys::Promise, js_sys::Error>;
+    }
+}
+
+pub fn is_available() -> bool {
+    true
+}
+
+async fn call_cpp<F>(args: &Args, f: F) -> Result<String, KclError>
+where
+    F: FnOnce() -> Result<js_sys::Promise, js_sys::Error>,
+{
+    let promise = f().map_err(|e| {
+        KclError::Internal(KclErrorDetails {
+            message: format!("{:?}", e),
+            source_ranges: vec![args.source_range],
+        })
+    })?;
+
+    let result = crate::wasm::JsFuture::from(promise).await.map_err(|e| {
+        KclError::Internal(KclErrorDetails {
+            message: format!("{:?}", e),
+            source_ranges: vec![args.source_range],
+        })
+    })?;
+
+    Ok(result.as_string().unwrap_or_default())
+}
+
+pub async fn get_true_path_end_pos(sketch: String, args: &Args) -> Result<Point3d<LengthUnit>, KclError> {
+    let result_str = call_cpp(args, || cpp::get_true_path_end_pos(sketch.into())).await?;
+
+    let point: Point3d<f64> = serde_json::from_str(&result_str).map_err(|e| {
+        KclError::Type(KclErrorDetails {
+            message: format!("Failed to path position from json: {}", e),
+            source_ranges: vec![args.source_range],
+        })
+    })?;
+
+    Ok(Point3d::<f64>::from(point).map(LengthUnit))
+}

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

@@ -8,6 +8,17 @@ pub mod conn_mock;
 #[cfg(feature = "engine")]
 pub mod conn_wasm;
 
+#[cfg(not(target_arch = "wasm32"))]
+#[cfg(feature = "native-engine-utils")]
+pub mod engine_utils;
+#[cfg(target_arch = "wasm32")]
+#[cfg(feature = "wasm-engine-utils")]
+pub mod engine_utils_wasm;
+
+#[cfg(feature = "engine")]
+#[cfg(any(not(target_arch = "wasm32"), all(not(feature = "native-engine-utils"), not(feature = "wasm-engine-utils"))))]
+pub mod engine_utils_api;
+
 use std::{
     collections::HashMap,
     sync::{Arc, Mutex},

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

@@ -1127,7 +1127,7 @@ pub struct TagEngineInfo {
     /// The sketch the tag is on.
     pub sketch: uuid::Uuid,
     /// The path the tag is on.
-    pub path: Option<Path>,
+    pub path: Option<BasePath>,
     /// The surface information for the tag.
     pub surface: Option<ExtrudeSurface>,
 }
@@ -1137,10 +1137,10 @@ pub struct TagEngineInfo {
 #[ts(export)]
 #[serde(tag = "type", rename_all = "camelCase")]
 pub struct Sketch {
-    /// The id of the sketch (this will change when the engine's reference to it changes).
+    /// The id of the sketch (this will change when the engine's reference to it changes.
     pub id: uuid::Uuid,
     /// The paths in the sketch.
-    pub paths: Vec<Path>,
+    pub value: Vec<Path>,
     /// What the sketch is on (can be a plane or a face).
     pub on: SketchSurface,
     /// The starting path.
@@ -1206,7 +1206,7 @@ impl Sketch {
         tag_identifier.info = Some(TagEngineInfo {
             id: base.geo_meta.id,
             sketch: self.id,
-            path: Some(current_path.clone()),
+            path: Some(base.clone()),
             surface: None,
         });
 
@@ -1215,7 +1215,7 @@ impl Sketch {
 
     /// Get the path most recently sketched.
     pub(crate) fn latest_path(&self) -> Option<&Path> {
-        self.paths.last()
+        self.value.last()
     }
 
     /// The "pen" is an imaginary pen drawing the path.
@@ -1601,6 +1601,19 @@ pub enum Path {
         #[serde(flatten)]
         base: BasePath,
     },
+    /// An arc (only used for engine-utils arg serialization for now)
+    Arc {
+        #[serde(flatten)]
+        base: BasePath,
+        /// angle range
+        #[ts(type = "[number, number]")]
+        angle_range: [f64; 2],
+        /// center
+        #[ts(type = "[number, number]")]
+        center: [f64; 2],
+        /// the arc's radius
+        radius: f64,
+    },
     /// A arc that is tangential to the last path segment that goes to a point
     TangentialArcTo {
         #[serde(flatten)]
@@ -1620,6 +1633,10 @@ pub enum Path {
         center: [f64; 2],
         /// arc's direction
         ccw: bool,
+        /// the arc's radius
+        radius: f64,
+        /// the arc's angle offset
+        offset: f64,
     },
     // TODO: consolidate segment enums, remove Circle. https://github.com/KittyCAD/modeling-app/issues/3940
     /// a complete arc
@@ -1656,43 +1673,6 @@ pub enum Path {
         #[serde(flatten)]
         base: BasePath,
     },
-    /// A circular arc, not necessarily tangential to the current point.
-    Arc {
-        #[serde(flatten)]
-        base: BasePath,
-        /// Center of the circle that this arc is drawn on.
-        center: [f64; 2],
-        /// Radius of the circle that this arc is drawn on.
-        radius: f64,
-    },
-}
-
-/// What kind of path is this?
-#[derive(Display)]
-enum PathType {
-    ToPoint,
-    Base,
-    TangentialArc,
-    TangentialArcTo,
-    Circle,
-    Horizontal,
-    AngledLineTo,
-    Arc,
-}
-
-impl From<&Path> for PathType {
-    fn from(value: &Path) -> Self {
-        match value {
-            Path::ToPoint { .. } => Self::ToPoint,
-            Path::TangentialArcTo { .. } => Self::TangentialArcTo,
-            Path::TangentialArc { .. } => Self::TangentialArc,
-            Path::Circle { .. } => Self::Circle,
-            Path::Horizontal { .. } => Self::Horizontal,
-            Path::AngledLineTo { .. } => Self::AngledLineTo,
-            Path::Base { .. } => Self::Base,
-            Path::Arc { .. } => Self::Arc,
-        }
-    }
 }
 
 impl Path {
@@ -1735,46 +1715,6 @@ impl Path {
         }
     }
 
-    /// Where does this path segment start?
-    pub fn get_from(&self) -> &[f64; 2] {
-        &self.get_base().from
-    }
-    /// Where does this path segment end?
-    pub fn get_to(&self) -> &[f64; 2] {
-        &self.get_base().to
-    }
-
-    /// Length of this path segment, in cartesian plane.
-    pub fn length(&self) -> f64 {
-        match self {
-            Self::ToPoint { .. } | Self::Base { .. } | Self::Horizontal { .. } | Self::AngledLineTo { .. } => {
-                linear_distance(self.get_from(), self.get_to())
-            }
-            Self::TangentialArc {
-                base: _,
-                center,
-                ccw: _,
-            }
-            | Self::TangentialArcTo {
-                base: _,
-                center,
-                ccw: _,
-            } => {
-                // The radius can be calculated as the linear distance between `to` and `center`,
-                // or between `from` and `center`. They should be the same.
-                let radius = linear_distance(self.get_from(), center);
-                debug_assert_eq!(radius, linear_distance(self.get_to(), center));
-                // TODO: Call engine utils to figure this out.
-                linear_distance(self.get_from(), self.get_to())
-            }
-            Self::Circle { radius, .. } => 2.0 * std::f64::consts::PI * radius,
-            Self::Arc { .. } => {
-                // TODO: Call engine utils to figure this out.
-                linear_distance(self.get_from(), self.get_to())
-            }
-        }
-    }
-
     pub fn get_base_mut(&mut self) -> Option<&mut BasePath> {
         match self {
             Path::ToPoint { base } => Some(base),
@@ -1789,17 +1729,6 @@ impl Path {
     }
 }
 
-/// Compute the straight-line distance between a pair of (2D) points.
-#[rustfmt::skip]
-fn linear_distance(
-    [x0, y0]: &[f64; 2],
-    [x1, y1]: &[f64; 2]
-) -> f64 {
-    let y_sq = (y1 - y0).powi(2);
-    let x_sq = (x1 - x0).powi(2);
-    (y_sq + x_sq).sqrt()
-}
-
 /// An extrude surface.
 #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
@@ -1980,73 +1909,9 @@ impl From<crate::settings::types::ModelingSettings> for ExecutorSettings {
     }
 }
 
-/// Create a new zoo api client.
-#[cfg(not(target_arch = "wasm32"))]
-pub fn new_zoo_client(token: Option<String>, engine_addr: Option<String>) -> Result<kittycad::Client> {
-    let user_agent = concat!(env!("CARGO_PKG_NAME"), ".rs/", env!("CARGO_PKG_VERSION"),);
-    let http_client = reqwest::Client::builder()
-        .user_agent(user_agent)
-        // For file conversions we need this to be long.
-        .timeout(std::time::Duration::from_secs(600))
-        .connect_timeout(std::time::Duration::from_secs(60));
-    let ws_client = reqwest::Client::builder()
-        .user_agent(user_agent)
-        // For file conversions we need this to be long.
-        .timeout(std::time::Duration::from_secs(600))
-        .connect_timeout(std::time::Duration::from_secs(60))
-        .connection_verbose(true)
-        .tcp_keepalive(std::time::Duration::from_secs(600))
-        .http1_only();
-
-    let zoo_token_env = std::env::var("ZOO_API_TOKEN");
-
-    let token = if let Some(token) = token {
-        token
-    } else if let Ok(token) = std::env::var("KITTYCAD_API_TOKEN") {
-        if let Ok(zoo_token) = zoo_token_env {
-            if zoo_token != token {
-                return Err(anyhow::anyhow!(
-                    "Both environment variables KITTYCAD_API_TOKEN=`{}` and ZOO_API_TOKEN=`{}` are set. Use only one.",
-                    token,
-                    zoo_token
-                ));
-            }
-        }
-        token
-    } else if let Ok(token) = zoo_token_env {
-        token
-    } else {
-        return Err(anyhow::anyhow!(
-            "No API token found in environment variables. Use KITTYCAD_API_TOKEN or ZOO_API_TOKEN"
-        ));
-    };
-
-    // Create the client.
-    let mut client = kittycad::Client::new_from_reqwest(token, http_client, ws_client);
-    // Set an engine address if it's set.
-    let kittycad_host_env = std::env::var("KITTYCAD_HOST");
-    if let Some(addr) = engine_addr {
-        client.set_base_url(addr);
-    } else if let Ok(addr) = std::env::var("ZOO_HOST") {
-        if let Ok(kittycad_host) = kittycad_host_env {
-            if kittycad_host != addr {
-                return Err(anyhow::anyhow!(
-                    "Both environment variables KITTYCAD_HOST=`{}` and ZOO_HOST=`{}` are set. Use only one.",
-                    kittycad_host,
-                    addr
-                ));
-            }
-        }
-        client.set_base_url(addr);
-    } else if let Ok(addr) = kittycad_host_env {
-        client.set_base_url(addr);
-    }
-
-    Ok(client)
-}
-
 impl ExecutorContext {
     /// Create a new default executor context.
+    /// Also returns the response HTTP headers from the server.
     #[cfg(not(target_arch = "wasm32"))]
     pub async fn new(client: &kittycad::Client, settings: ExecutorSettings) -> Result<Self> {
         let (ws, _headers) = client
@@ -2091,35 +1956,6 @@ impl ExecutorContext {
         })
     }
 
-    /// Create a new default executor context.
-    /// With a kittycad client.
-    /// This allows for passing in `ZOO_API_TOKEN` and `ZOO_HOST` as environment
-    /// variables.
-    /// But also allows for passing in a token and engine address directly.
-    #[cfg(not(target_arch = "wasm32"))]
-    pub async fn new_with_client(
-        settings: ExecutorSettings,
-        token: Option<String>,
-        engine_addr: Option<String>,
-    ) -> Result<Self> {
-        // Create the client.
-        let client = new_zoo_client(token, engine_addr)?;
-
-        let ctx = Self::new(&client, settings).await?;
-        Ok(ctx)
-    }
-
-    /// Create a new default executor context.
-    /// With the default kittycad client.
-    /// This allows for passing in `ZOO_API_TOKEN` and `ZOO_HOST` as environment
-    /// variables.
-    #[cfg(not(target_arch = "wasm32"))]
-    pub async fn new_with_default_client(settings: ExecutorSettings) -> Result<Self> {
-        // Create the client.
-        let ctx = Self::new_with_client(settings, None, None).await?;
-        Ok(ctx)
-    }
-
     pub fn is_mock(&self) -> bool {
         self.context_type == ContextType::Mock || self.context_type == ContextType::MockCustomForwarded
     }
@@ -2127,7 +1963,35 @@ impl ExecutorContext {
     /// For executing unit tests.
     #[cfg(not(target_arch = "wasm32"))]
     pub async fn new_for_unit_test(units: UnitLength, engine_addr: Option<String>) -> Result<Self> {
-        let ctx = ExecutorContext::new_with_client(
+        let user_agent = concat!(env!("CARGO_PKG_NAME"), ".rs/", env!("CARGO_PKG_VERSION"));
+        let http_client = reqwest::Client::builder()
+            .user_agent(user_agent)
+            // For file conversions we need this to be long.
+            .timeout(std::time::Duration::from_secs(600))
+            .connect_timeout(std::time::Duration::from_secs(60));
+        let ws_client = reqwest::Client::builder()
+            .user_agent(user_agent)
+            // For file conversions we need this to be long.
+            .timeout(std::time::Duration::from_secs(600))
+            .connect_timeout(std::time::Duration::from_secs(60))
+            .connection_verbose(true)
+            .tcp_keepalive(std::time::Duration::from_secs(600))
+            .http1_only();
+
+        let token = std::env::var("KITTYCAD_API_TOKEN").expect("KITTYCAD_API_TOKEN not set");
+
+        // Create the client.
+        let mut client = kittycad::Client::new_from_reqwest(token, http_client, ws_client);
+        // Set a local engine address if it's set.
+        if let Ok(addr) = std::env::var("LOCAL_ENGINE_ADDR") {
+            client.set_base_url(addr);
+        }
+        if let Some(addr) = engine_addr {
+            client.set_base_url(addr);
+        }
+
+        let ctx = ExecutorContext::new(
+            &client,
             ExecutorSettings {
                 units,
                 highlight_edges: true,
@@ -2135,8 +1999,6 @@ impl ExecutorContext {
                 show_grid: false,
                 replay: None,
             },
-            None,
-            engine_addr,
         )
         .await?;
         Ok(ctx)

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

@@ -3,13 +3,41 @@ use std::sync::{Arc, RwLock};
 use anyhow::Result;
 use tower_lsp::LanguageServer;
 
+fn new_zoo_client() -> kittycad::Client {
+    let user_agent = concat!(env!("CARGO_PKG_NAME"), ".rs/", env!("CARGO_PKG_VERSION"),);
+    let http_client = reqwest::Client::builder()
+        .user_agent(user_agent)
+        // For file conversions we need this to be long.
+        .timeout(std::time::Duration::from_secs(600))
+        .connect_timeout(std::time::Duration::from_secs(60));
+    let ws_client = reqwest::Client::builder()
+        .user_agent(user_agent)
+        // For file conversions we need this to be long.
+        .timeout(std::time::Duration::from_secs(600))
+        .connect_timeout(std::time::Duration::from_secs(60))
+        .connection_verbose(true)
+        .tcp_keepalive(std::time::Duration::from_secs(600))
+        .http1_only();
+
+    let token = std::env::var("KITTYCAD_API_TOKEN").expect("KITTYCAD_API_TOKEN not set");
+
+    // Create the client.
+    let mut client = kittycad::Client::new_from_reqwest(token, http_client, ws_client);
+    // Set a local engine address if it's set.
+    if let Ok(addr) = std::env::var("LOCAL_ENGINE_ADDR") {
+        client.set_base_url(addr);
+    }
+
+    client
+}
+
 // Create a fake kcl lsp server for testing.
 pub async fn kcl_lsp_server(execute: bool) -> Result<crate::lsp::kcl::Backend> {
     let stdlib = crate::std::StdLib::new();
     let stdlib_completions = crate::lsp::kcl::get_completions_from_stdlib(&stdlib)?;
     let stdlib_signatures = crate::lsp::kcl::get_signatures_from_stdlib(&stdlib)?;
 
-    let zoo_client = crate::executor::new_zoo_client(None, None)?;
+    let zoo_client = new_zoo_client();
 
     let executor_ctx = if execute {
         Some(crate::executor::ExecutorContext::new(&zoo_client, Default::default()).await?)

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

@@ -141,15 +141,15 @@ pub(crate) async fn do_post_extrude(
     )
     .await?;
 
-    if sketch.paths.is_empty() {
+    if sketch.value.is_empty() {
         return Err(KclError::Type(KclErrorDetails {
             message: "Expected a non-empty sketch".to_string(),
             source_ranges: vec![args.source_range],
         }));
     }
 
-    let edge_id = sketch.paths.iter().find_map(|segment| match segment {
+    let edge_id = sketch.value.iter().find_map(|segment| match segment {
-        Path::ToPoint { base } | Path::Circle { base, .. } | Path::Arc { base, .. } => Some(base.geo_meta.id),
+        Path::ToPoint { base } | Path::Circle { base, .. } => Some(base.geo_meta.id),
         _ => None,
     });
 
@@ -229,15 +229,12 @@ pub(crate) async fn do_post_extrude(
     } = analyze_faces(exec_state, &args, face_infos);
     // Iterate over the sketch.value array and add face_id to GeoMeta
     let new_value = sketch
-        .paths
+        .value
         .iter()
         .flat_map(|path| {
             if let Some(Some(actual_face_id)) = face_id_map.get(&path.get_base().geo_meta.id) {
                 match path {
-                    Path::Arc { .. }
+                    Path::TangentialArc { .. } | Path::TangentialArcTo { .. } | Path::Circle { .. } => {
-                    | Path::TangentialArc { .. }
-                    | Path::TangentialArcTo { .. }
-                    | Path::Circle { .. } => {
                         let extrude_surface = ExtrudeSurface::ExtrudeArc(crate::executor::ExtrudeArc {
                             face_id: *actual_face_id,
                             tag: path.get_base().tag.clone(),
@@ -259,6 +256,7 @@ pub(crate) async fn do_post_extrude(
                         });
                         Some(extrude_surface)
                     }
+                    Path::Arc { .. } => todo!(),
                 }
             } else if args.ctx.is_mock() {
                 // Only pre-populate the extrude surface if we are in mock mode.

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

@@ -42,7 +42,7 @@ fn inner_segment_end_x(tag: &TagIdentifier, exec_state: &mut ExecState, args: Ar
         })
     })?;
 
-    Ok(path.get_base().to[0])
+    Ok(path.to[0])
 }
 
 /// Returns the segment end of y.
@@ -79,7 +79,7 @@ fn inner_segment_end_y(tag: &TagIdentifier, exec_state: &mut ExecState, args: Ar
         })
     })?;
 
-    Ok(path.get_to()[1])
+    Ok(path.to[1])
 }
 
 /// Returns the last segment of x.
@@ -109,7 +109,7 @@ pub async fn last_segment_x(_exec_state: &mut ExecState, args: Args) -> Result<K
 }]
 fn inner_last_segment_x(sketch: Sketch, args: Args) -> Result<f64, KclError> {
     let last_line = sketch
-        .paths
+        .value
         .last()
         .ok_or_else(|| {
             KclError::Type(KclErrorDetails {
@@ -149,7 +149,7 @@ pub async fn last_segment_y(_exec_state: &mut ExecState, args: Args) -> Result<K
 }]
 fn inner_last_segment_y(sketch: Sketch, args: Args) -> Result<f64, KclError> {
     let last_line = sketch
-        .paths
+        .value
         .last()
         .ok_or_else(|| {
             KclError::Type(KclErrorDetails {
@@ -202,7 +202,7 @@ fn inner_segment_length(tag: &TagIdentifier, exec_state: &mut ExecState, args: A
         })
     })?;
 
-    let result = path.length();
+    let result = ((path.from[1] - path.to[1]).powi(2) + (path.from[0] - path.to[0]).powi(2)).sqrt();
 
     Ok(result)
 }
@@ -242,7 +242,7 @@ fn inner_segment_angle(tag: &TagIdentifier, exec_state: &mut ExecState, args: Ar
         })
     })?;
 
-    let result = between(path.get_from().into(), path.get_to().into());
+    let result = between(path.from.into(), path.to.into());
 
     Ok(result.to_degrees())
 }
@@ -286,10 +286,10 @@ fn inner_angle_to_match_length_x(
         })
     })?;
 
-    let length = path.length();
+    let length = ((path.from[1] - path.to[1]).powi(2) + (path.from[0] - path.to[0]).powi(2)).sqrt();
 
     let last_line = sketch
-        .paths
+        .value
         .last()
         .ok_or_else(|| {
             KclError::Type(KclErrorDetails {
@@ -350,10 +350,10 @@ fn inner_angle_to_match_length_y(
         })
     })?;
 
-    let length = path.length();
+    let length = ((path.from[1] - path.to[1]).powi(2) + (path.from[0] - path.to[0]).powi(2)).sqrt();
 
     let last_line = sketch
-        .paths
+        .value
         .last()
         .ok_or_else(|| {
             KclError::Type(KclErrorDetails {

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

@@ -134,7 +134,7 @@ async fn inner_circle(
         new_sketch.add_tag(tag, &current_path);
     }
 
-    new_sketch.paths.push(current_path);
+    new_sketch.value.push(current_path);
 
     args.batch_modeling_cmd(id, ModelingCmd::from(mcmd::ClosePath { path_id: new_sketch.id }))
         .await?;

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

@@ -6,7 +6,7 @@ use anyhow::Result;
 use derive_docs::stdlib;
 use kcmc::shared::Point2d as KPoint2d; // Point2d is already defined in this pkg, to impl ts_rs traits.
 use kcmc::{each_cmd as mcmd, length_unit::LengthUnit, shared::Angle, ModelingCmd};
-use kittycad_modeling_cmds as kcmc;
+use kittycad_modeling_cmds::{self as kcmc, units};
 use kittycad_modeling_cmds::shared::PathSegment;
 use parse_display::{Display, FromStr};
 use schemars::JsonSchema;
@@ -21,13 +21,26 @@ use crate::{
     },
     std::{
         utils::{
-            arc_angles, arc_center_and_end, get_tangent_point_from_previous_arc, get_tangential_arc_to_info,
+            arc_angles, arc_center_and_end, arc_start_center_and_end, get_tangent_point_from_previous_arc,
-            get_x_component, get_y_component, intersection_with_parallel_line, TangentialArcInfoInput,
+            get_tangential_arc_to_info, get_x_component, get_y_component, intersection_with_parallel_line,
+            TangentialArcInfoInput,
         },
         Args,
     },
 };
 
+#[cfg(not(target_arch = "wasm32"))]
+#[cfg(feature = "native-engine-utils")]
+use crate::engine::engine_utils;
+
+#[cfg(target_arch = "wasm32")]
+#[cfg(feature = "wasm-engine-utils")]
+use crate::engine::engine_utils_wasm as engine_utils;
+
+#[cfg(feature = "engine")]
+#[cfg(any(not(target_arch = "wasm32"), all(not(feature = "native-engine-utils"), not(feature = "wasm-engine-utils"))))]
+use crate::engine::engine_utils_api as engine_utils;
+
 /// A tag for a face.
 #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
@@ -154,7 +167,7 @@ async fn inner_line_to(
         new_sketch.add_tag(tag, &current_path);
     }
 
-    new_sketch.paths.push(current_path);
+    new_sketch.value.push(current_path);
 
     Ok(new_sketch)
 }
@@ -323,7 +336,7 @@ async fn inner_line(
         new_sketch.add_tag(tag, &current_path);
     }
 
-    new_sketch.paths.push(current_path);
+    new_sketch.value.push(current_path);
 
     Ok(new_sketch)
 }
@@ -506,7 +519,7 @@ async fn inner_angled_line(
         new_sketch.add_tag(tag, &current_path);
     }
 
-    new_sketch.paths.push(current_path);
+    new_sketch.value.push(current_path);
     Ok(new_sketch)
 }
 
@@ -813,7 +826,7 @@ async fn inner_angled_line_that_intersects(
 
     let from = sketch.current_pen_position()?;
     let to = intersection_with_parallel_line(
-        &[path.get_from().into(), path.get_to().into()],
+        &[path.from.into(), path.to.into()],
         data.offset.unwrap_or_default(),
         data.angle,
         from,
@@ -1237,16 +1250,14 @@ pub(crate) async fn inner_start_profile_at(
         id: path_id,
         original_id: path_id,
         on: sketch_surface.clone(),
-        paths: vec![],
+        value: vec![],
         meta: vec![args.source_range.into()],
         tags: if let Some(tag) = &tag {
             let mut tag_identifier: TagIdentifier = tag.into();
             tag_identifier.info = Some(TagEngineInfo {
                 id: current_path.geo_meta.id,
                 sketch: path_id,
-                path: Some(Path::Base {
+                path: Some(current_path.clone()),
-                    base: current_path.clone(),
-                }),
                 surface: None,
             });
             HashMap::from([(tag.name.to_string(), tag_identifier)])
@@ -1413,7 +1424,7 @@ pub(crate) async fn inner_close(
         new_sketch.add_tag(tag, &current_path);
     }
 
-    new_sketch.paths.push(current_path);
+    new_sketch.value.push(current_path);
 
     Ok(new_sketch)
 }
@@ -1497,7 +1508,45 @@ pub(crate) async fn inner_arc(
         } => {
             let a_start = Angle::from_degrees(*angle_start);
             let a_end = Angle::from_degrees(*angle_end);
-            let (center, end) = arc_center_and_end(from, a_start, a_end, *radius);
+
+            let (_, center, mut end) = arc_start_center_and_end(from, a_start, a_end, *radius);
+
+            if engine_utils::is_available() {
+                let mut path_plus_arc = sketch.clone();
+                let to = [0.0, 0.0];
+                let arc = Path::Arc {
+                    base: BasePath {
+                        from: from.into(),
+                        to,
+                        tag: None,
+                        geo_meta: GeoMeta {
+                            id: uuid::Uuid::new_v4(),
+                            metadata: args.source_range.into(),
+                        },
+                    },
+                    angle_range: [*angle_start, *angle_end],
+                    center: [center.x, center.y],
+                    radius: *radius,
+                };
+
+                path_plus_arc.value.push(arc);
+
+                let sketch_json_value = serde_json::to_string(&path_plus_arc).map_err(|e| {
+                    KclError::Type(KclErrorDetails {
+                        message: format!("Failed to convert sketch to json: {}", e),
+                        source_ranges: vec![args.source_range],
+                    })
+                })?;
+
+                //???? someone double check me on this unit conversion - mike
+                let units = units::UnitLength::Millimeters;
+                let result_end = engine_utils::get_true_path_end_pos(sketch_json_value, &args).await?;
+                end = Point2d { 
+                    x: result_end.x.to_millimeters(units),
+                    y: result_end.y.to_millimeters(units),
+                };
+            }
+
             (center, a_start, a_end, *radius, end)
         }
         ArcData::CenterToRadius { center, to, radius } => {
@@ -1530,7 +1579,7 @@ pub(crate) async fn inner_arc(
     )
     .await?;
 
-    let current_path = Path::Arc {
+    let current_path = Path::ToPoint {
         base: BasePath {
             from: from.into(),
             to: end.into(),
@@ -1540,8 +1589,6 @@ pub(crate) async fn inner_arc(
                 metadata: args.source_range.into(),
             },
         },
-        center: center.into(),
-        radius,
     };
 
     let mut new_sketch = sketch.clone();
@@ -1549,7 +1596,7 @@ pub(crate) async fn inner_arc(
         new_sketch.add_tag(tag, &current_path);
     }
 
-    new_sketch.paths.push(current_path);
+    new_sketch.value.push(current_path);
 
     Ok(new_sketch)
 }
@@ -1620,7 +1667,7 @@ async fn inner_tangential_arc(
 
     let id = exec_state.id_generator.next_uuid();
 
-    let (center, to, ccw) = match data {
+    let (center, to, ccw, radius, offset) = match data {
         TangentialArcData::RadiusAndOffset { radius, offset } => {
             // KCL stdlib types use degrees.
             let offset = Angle::from_degrees(offset);
@@ -1658,13 +1705,15 @@ async fn inner_tangential_arc(
                 }),
             )
             .await?;
-            (center, to.into(), ccw)
+            (center, to.into(), ccw, radius, offset)
         }
     };
 
     let current_path = Path::TangentialArc {
         ccw,
         center: center.into(),
+        radius,
+        offset: offset.to_degrees(),
         base: BasePath {
             from: from.into(),
             to,
@@ -1681,7 +1730,7 @@ async fn inner_tangential_arc(
         new_sketch.add_tag(tag, &current_path);
     }
 
-    new_sketch.paths.push(current_path);
+    new_sketch.value.push(current_path);
 
     Ok(new_sketch)
 }
@@ -1777,7 +1826,7 @@ async fn inner_tangential_arc_to(
         new_sketch.add_tag(tag, &current_path);
     }
 
-    new_sketch.paths.push(current_path);
+    new_sketch.value.push(current_path);
 
     Ok(new_sketch)
 }
@@ -1862,7 +1911,7 @@ async fn inner_tangential_arc_to_relative(
         new_sketch.add_tag(tag, &current_path);
     }
 
-    new_sketch.paths.push(current_path);
+    new_sketch.value.push(current_path);
 
     Ok(new_sketch)
 }
@@ -1955,7 +2004,7 @@ async fn inner_bezier_curve(
         new_sketch.add_tag(tag, &current_path);
     }
 
-    new_sketch.paths.push(current_path);
+    new_sketch.value.push(current_path);
 
     Ok(new_sketch)
 }

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

@@ -21,7 +21,7 @@ pub fn normalize(angle: Angle) -> Angle {
     Angle::from_degrees(if result > 180.0 { result - 360.0 } else { result })
 }
 
-/// Gives the ▲-angle between from and to angles (shortest path)
+/// Gives the ▲-angle between from and to angles (shortest path), use radians.
 ///
 /// Sign of the returned angle denotes direction, positive means counterClockwise 🔄
 /// # Examples
@@ -221,6 +221,33 @@ pub fn arc_center_and_end(from: Point2d, start_angle: Angle, end_angle: Angle, r
     (center, end)
 }
 
+pub fn arc_start_center_and_end(
+    from: Point2d,
+    start_angle: Angle,
+    end_angle: Angle,
+    radius: f64,
+) -> (Point2d, Point2d, Point2d) {
+    let start_angle = start_angle.to_radians();
+    let end_angle = end_angle.to_radians();
+
+    let center = Point2d {
+        x: -1.0 * (radius * start_angle.cos() - from.x),
+        y: -1.0 * (radius * start_angle.sin() - from.y),
+    };
+
+    let start = Point2d {
+        x: center.x + radius * start_angle.cos(),
+        y: center.y + radius * start_angle.sin(),
+    };
+
+    let end = Point2d {
+        x: center.x + radius * end_angle.cos(),
+        y: center.y + radius * end_angle.sin(),
+    };
+
+    (start, center, end)
+}
+
 pub fn arc_angles(
     from: Point2d,
     to: Point2d,

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

@@ -43,7 +43,38 @@ async fn do_execute_and_snapshot(ctx: &ExecutorContext, code: &str) -> anyhow::R
 }
 
 async fn new_context(units: UnitLength, with_auth: bool) -> anyhow::Result<ExecutorContext> {
-    let ctx = ExecutorContext::new_with_client(
+    let user_agent = concat!(env!("CARGO_PKG_NAME"), ".rs/", env!("CARGO_PKG_VERSION"),);
+    let http_client = reqwest::Client::builder()
+        .user_agent(user_agent)
+        // For file conversions we need this to be long.
+        .timeout(std::time::Duration::from_secs(600))
+        .connect_timeout(std::time::Duration::from_secs(60));
+    let ws_client = reqwest::Client::builder()
+        .user_agent(user_agent)
+        // For file conversions we need this to be long.
+        .timeout(std::time::Duration::from_secs(600))
+        .connect_timeout(std::time::Duration::from_secs(60))
+        .connection_verbose(true)
+        .tcp_keepalive(std::time::Duration::from_secs(600))
+        .http1_only();
+
+    let token = if with_auth {
+        std::env::var("KITTYCAD_API_TOKEN").expect("KITTYCAD_API_TOKEN not set")
+    } else {
+        "bad_token".to_string()
+    };
+
+    // Create the client.
+    let mut client = kittycad::Client::new_from_reqwest(token, http_client, ws_client);
+    // Set a local engine address if it's set.
+    if let Ok(addr) = std::env::var("LOCAL_ENGINE_ADDR") {
+        if with_auth {
+            client.set_base_url(addr);
+        }
+    }
+
+    let ctx = ExecutorContext::new(
+        &client,
         ExecutorSettings {
             units,
             highlight_edges: true,
@@ -51,8 +82,6 @@ async fn new_context(units: UnitLength, with_auth: bool) -> anyhow::Result<Execu
             show_grid: false,
             replay: None,
         },
-        if with_auth { None } else { Some("bad_token".to_string()) },
-        None,
     )
     .await?;
     Ok(ctx)

src/wasm-lib/tests/executor/inputs/circular_pattern3d_a_pattern.kcl

@@ -1,15 +0,0 @@
-exampleSketch = startSketchOn('XZ')
-  |> startProfileAt([0, 0], %)
-  |> line([0, 2], %)
-  |> line([3, 1], %)
-  |> line([0, -4], %)
-  |> close(%)
-  |> extrude(1, %)
-
-pattn1 = patternLinear3d({
-       axis: [1, 0, 0],
-       instances: 7,
-       distance: 6
-     }, exampleSketch)
-
-pattn2 = patternCircular3d({axis: [0,0, 1], center: [-20, -20, -20], instances: 41, arcDegrees: 360, rotateDuplicates: false}, pattn1)

src/wasm-lib/tests/executor/inputs/linear_pattern3d_a_pattern.kcl

@@ -1,19 +0,0 @@
-exampleSketch = startSketchOn('XZ')
-  |> startProfileAt([0, 0], %)
-  |> line([0, 2], %)
-  |> line([3, 1], %)
-  |> line([0, -4], %)
-  |> close(%)
-  |> extrude(1, %)
-
-pattn1 = patternLinear3d({
-       axis: [1, 0, 0],
-       instances: 7,
-       distance: 6
-     }, exampleSketch)
-
-pattn2 = patternLinear3d({
-       axis: [0, 0, 1],
-       distance: 1,
-       instances: 7
-     }, pattn1)

src/wasm-lib/tests/executor/inputs/member_expression_sketch.kcl

@@ -1,5 +1,5 @@
-fn square = (pos, scale) => {
+fn cube = (pos, scale) => {
-  sg = startSketchOn('XY')
+  const sg = startSketchOn('XY')
     |> startProfileAt(pos, %)
     |> line([0, scale], %)
     |> line([scale, 0], %)
@@ -9,9 +9,9 @@ fn square = (pos, scale) => {
   return sg
 }
 
-sq = square([0,0], 10)
+const b1 = cube([0,0], 10)
-cb = square([3,3], 4)
+const b2 = cube([3,3], 4)
     |> extrude(10, %)
 
-pt1 = sq.paths[0]
+const pt1 = b1.value[0]
-pt2 = cb.value[0]
+const pt2 = b2.value[0]

src/wasm-lib/tests/executor/inputs/neg_xz_plane.kcl

@@ -1,6 +0,0 @@
-part001 = startSketchOn('-XZ')
-  |> startProfileAt([0, 0], %)
-  |> lineTo([100, 100], %)
-  |> lineTo([100, 0], %)
-  |> close(%)
-  |> extrude(5 + 7, %)

src/wasm-lib/tests/executor/inputs/sketch_on_face_after_fillets_referencing_face.kcl

@@ -1,55 +0,0 @@
-// Shelf Bracket
-// This is a shelf bracket made out of 6061-T6 aluminum sheet metal. The required thickness is calculated based on a point load of 300 lbs applied to the end of the shelf. There are two brackets holding up the shelf, so the moment experienced is divided by 2. The shelf is 1 foot long from the wall.
-
-
-// Define our bracket feet lengths
-shelfMountL = 8 // The length of the bracket holding up the shelf is 6 inches
-wallMountL = 6 // the length of the bracket
-
-
-// Define constants required to calculate the thickness needed to support 300 lbs
-sigmaAllow = 35000 // psi
-width = 6 // inch
-p = 300 // Force on shelf - lbs
-L = 12 // inches
-M = L * p / 2 // Moment experienced at fixed end of bracket
-FOS = 2 // Factor of safety of 2 to be conservative
-
-
-// Calculate the thickness off the bending stress and factor of safety
-thickness = sqrt(6 * M * FOS / (width * sigmaAllow))
-
-// 0.25 inch fillet radius
-filletR = 0.25
-
-// Sketch the bracket and extrude with fillets
-bracket = startSketchOn('XY')
-  |> startProfileAt([0, 0], %)
-  |> line([0, wallMountL], %, $outerEdge)
-  |> line([-shelfMountL, 0], %, $seg01)
-  |> line([0, -thickness], %)
-  |> line([shelfMountL - thickness, 0], %, $innerEdge)
-  |> line([0, -wallMountL + thickness], %)
-  |> close(%)
-  |> extrude(width, %)
-  |> fillet({
-       radius: filletR,
-       tags: [
-         getNextAdjacentEdge(innerEdge)
-       ]
-     }, %)
-  |> fillet({
-       radius: filletR + thickness,
-       tags: [
-         getNextAdjacentEdge(outerEdge)
-       ]
-     }, %)
-
-sketch001 = startSketchOn(bracket, seg01)
-  |> startProfileAt([4.28, 3.83], %)
-  |> line([2.17, -0.03], %)
-  |> line([-0.07, -1.8], %)
-  |> line([-2.07, 0.05], %)
-  |> lineTo([profileStartX(%), profileStartY(%)], %)
-  |> close(%)
-  |> extrude(10, %)

src/wasm-lib/tests/executor/inputs/xz_plane.kcl

@@ -1,6 +0,0 @@
-part001 = startSketchOn('XZ')
-  |> startProfileAt([0, 0], %)
-  |> lineTo([100, 100], %)
-  |> lineTo([100, 0], %)
-  |> close(%)
-  |> extrude(5 + 7, %)

src/wasm-lib/tests/executor/main.rs

@@ -1389,6 +1389,84 @@ extrusion = startSketchOn('XY')
     );
 }
 
+#[tokio::test(flavor = "multi_thread")]
+async fn kcl_test_xz_plane() {
+    let code = r#"part001 = startSketchOn('XZ')
+  |> startProfileAt([0, 0], %)
+  |> lineTo([100, 100], %)
+  |> lineTo([100, 0], %)
+  |> close(%)
+  |> extrude(5 + 7, %)
+"#;
+
+    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    assert_out("xz_plane", &result);
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn kcl_test_neg_xz_plane() {
+    let code = r#"part001 = startSketchOn('-XZ')
+  |> startProfileAt([0, 0], %)
+  |> lineTo([100, 100], %)
+  |> lineTo([100, 0], %)
+  |> close(%)
+  |> extrude(5 + 7, %)
+"#;
+
+    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    assert_out("neg_xz_plane", &result);
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn kcl_test_linear_pattern3d_a_pattern() {
+    let code = r#"exampleSketch = startSketchOn('XZ')
+  |> startProfileAt([0, 0], %)
+  |> line([0, 2], %)
+  |> line([3, 1], %)
+  |> line([0, -4], %)
+  |> close(%)
+  |> extrude(1, %)
+
+pattn1 = patternLinear3d({
+       axis: [1, 0, 0],
+       instances: 7,
+       distance: 6
+     }, exampleSketch)
+
+pattn2 = patternLinear3d({
+       axis: [0, 0, 1],
+       distance: 1,
+       instances: 7
+     }, pattn1)
+"#;
+
+    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    assert_out("linear_pattern3d_a_pattern", &result);
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn kcl_test_circular_pattern3d_a_pattern() {
+    let code = r#"exampleSketch = startSketchOn('XZ')
+  |> startProfileAt([0, 0], %)
+  |> line([0, 2], %)
+  |> line([3, 1], %)
+  |> line([0, -4], %)
+  |> close(%)
+  |> extrude(1, %)
+
+pattn1 = patternLinear3d({
+       axis: [1, 0, 0],
+       instances: 7,
+       distance: 6
+     }, exampleSketch)
+
+pattn2 = patternCircular3d({axis: [0,0, 1], center: [-20, -20, -20], instances: 41, arcDegrees: 360, rotateDuplicates: false}, pattn1)
+"#;
+
+    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    assert_out("circular_pattern3d_a_pattern", &result);
+}
+
 #[tokio::test(flavor = "multi_thread")]
 async fn kcl_test_array_of_sketches() {
     let code = r#"plane001 = startSketchOn('XZ')
@@ -1418,6 +1496,69 @@ extrude(10, sketch001)
     assert_out("array_of_sketches", &result);
 }
 
+#[tokio::test(flavor = "multi_thread")]
+async fn kcl_test_sketch_on_face_after_fillets_referencing_face() {
+    let code = r#"// Shelf Bracket
+// This is a shelf bracket made out of 6061-T6 aluminum sheet metal. The required thickness is calculated based on a point load of 300 lbs applied to the end of the shelf. There are two brackets holding up the shelf, so the moment experienced is divided by 2. The shelf is 1 foot long from the wall.
+
+
+// Define our bracket feet lengths
+shelfMountL = 8 // The length of the bracket holding up the shelf is 6 inches
+wallMountL = 6 // the length of the bracket
+
+
+// Define constants required to calculate the thickness needed to support 300 lbs
+sigmaAllow = 35000 // psi
+width = 6 // inch
+p = 300 // Force on shelf - lbs
+L = 12 // inches
+M = L * p / 2 // Moment experienced at fixed end of bracket
+FOS = 2 // Factor of safety of 2 to be conservative
+
+
+// Calculate the thickness off the bending stress and factor of safety
+thickness = sqrt(6 * M * FOS / (width * sigmaAllow))
+
+// 0.25 inch fillet radius
+filletR = 0.25
+
+// Sketch the bracket and extrude with fillets
+bracket = startSketchOn('XY')
+  |> startProfileAt([0, 0], %)
+  |> line([0, wallMountL], %, $outerEdge)
+  |> line([-shelfMountL, 0], %, $seg01)
+  |> line([0, -thickness], %)
+  |> line([shelfMountL - thickness, 0], %, $innerEdge)
+  |> line([0, -wallMountL + thickness], %)
+  |> close(%)
+  |> extrude(width, %)
+  |> fillet({
+       radius: filletR,
+       tags: [
+         getNextAdjacentEdge(innerEdge)
+       ]
+     }, %)
+  |> fillet({
+       radius: filletR + thickness,
+       tags: [
+         getNextAdjacentEdge(outerEdge)
+       ]
+     }, %)
+
+sketch001 = startSketchOn(bracket, seg01)
+  |> startProfileAt([4.28, 3.83], %)
+  |> line([2.17, -0.03], %)
+  |> line([-0.07, -1.8], %)
+  |> line([-2.07, 0.05], %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)
+  |> extrude(10, %)
+"#;
+
+    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    assert_out("sketch_on_face_after_fillets_referencing_face", &result);
+}
+
 #[tokio::test(flavor = "multi_thread")]
 async fn kcl_test_circular_pattern3d_array_of_extrudes() {
     let code = r#"plane001 = startSketchOn('XZ')

src/wasm-lib/tests/executor/visuals.rs

@@ -19,15 +19,6 @@ macro_rules! kcl_test {
 }
 
 kcl_test!("sketch_on_face", kcl_test_sketch_on_face);
-kcl_test!("neg_xz_plane", kcl_test_neg_xz_plane);
-kcl_test!("xz_plane", kcl_test_xz_plane);
-kcl_test!(
-    "sketch_on_face_after_fillets_referencing_face",
-    kcl_test_sketch_on_face_after_fillets_referencing_face
-);
-kcl_test!("circular_pattern3d_a_pattern", kcl_test_circular_pattern3d_a_pattern);
-kcl_test!("linear_pattern3d_a_pattern", kcl_test_linear_pattern3d_a_pattern);
-
 kcl_test!("tangential_arc", kcl_test_tangential_arc);
 kcl_test!(
     "big_number_angle_to_match_length_x",

src/wasm-lib/tests/modify/main.rs

@@ -8,10 +8,33 @@ use pretty_assertions::assert_eq;
 
 /// Setup the engine and parse code for an ast.
 async fn setup(code: &str, name: &str) -> Result<(ExecutorContext, Program, uuid::Uuid)> {
+    let user_agent = concat!(env!("CARGO_PKG_NAME"), ".rs/", env!("CARGO_PKG_VERSION"),);
+    let http_client = reqwest::Client::builder()
+        .user_agent(user_agent)
+        // For file conversions we need this to be long.
+        .timeout(std::time::Duration::from_secs(600))
+        .connect_timeout(std::time::Duration::from_secs(60));
+    let ws_client = reqwest::Client::builder()
+        .user_agent(user_agent)
+        // For file conversions we need this to be long.
+        .timeout(std::time::Duration::from_secs(600))
+        .connect_timeout(std::time::Duration::from_secs(60))
+        .tcp_keepalive(std::time::Duration::from_secs(600))
+        .http1_only();
+
+    let token = std::env::var("KITTYCAD_API_TOKEN").expect("KITTYCAD_API_TOKEN not set");
+
+    // Create the client.
+    let mut client = kittycad::Client::new_from_reqwest(token, http_client, ws_client);
+    // Set a local engine address if it's set.
+    if let Ok(addr) = std::env::var("LOCAL_ENGINE_ADDR") {
+        client.set_base_url(addr);
+    }
+
     let tokens = kcl_lib::token::lexer(code)?;
     let parser = kcl_lib::parser::Parser::new(tokens);
     let program = parser.ast()?;
-    let ctx = kcl_lib::executor::ExecutorContext::new_with_default_client(Default::default()).await?;
+    let ctx = kcl_lib::executor::ExecutorContext::new(&client, Default::default()).await?;
     let exec_state = ctx.run(&program, None, IdGenerator::default(), None).await?;
 
     // We need to get the sketch ID.

vite.config.ts

@@ -58,6 +58,7 @@ const config = defineConfig({
   resolve: {
     alias: {
       '@kittycad/codemirror-lsp-client': '/packages/codemirror-lsp-client/src',
+      '@engine-utils': '/src/lib/engine-utils/engine.js',
     },
   },
   plugins: [react(), viteTsconfigPaths(), eslint(), version(), lezer()],

yarn.lock

@@ -2597,10 +2597,10 @@
   resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.34.tgz#10964ba0dee6ac4cd462e2795b6bebd407303433"
   integrity sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==
 
-"@types/node@*", "@types/node@^22.7.8":
+"@types/node@*", "@types/node@^22.5.0":
-  version "22.7.8"
+  version "22.5.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.7.8.tgz#a1dbf0dc5f71bdd2642fc89caef65d58747ce825"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.5.0.tgz#10f01fe9465166b4cab72e75f60d8b99d019f958"
-  integrity sha512-a922jJy31vqR5sk+kAdIENJjHblqcZ4RmERviFsER4WJcEONqxKcjNOlk0q7OUfrF5sddT+vng070cdfMlrPLg==
+  integrity sha512-DkFrJOe+rfdHTqqMg0bSNlGlQ85hSoh2TPzZyhHsXnMtligRWpxUySiyw8FY14ITt24HVCiQPWxS3KO/QlGmWg==
   dependencies:
     undici-types "~6.19.2"
 
@@ -8785,16 +8785,7 @@ string-natural-compare@^3.0.1:
   resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-3.0.1.tgz#7a42d58474454963759e8e8b7ae63d71c1e7fdf4"
   integrity sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==
 
-"string-width-cjs@npm:string-width@^4.2.0":
+"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -8888,14 +8879,7 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -9769,16 +9753,7 @@ word-wrap@^1.2.3, word-wrap@^1.2.5:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
   integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
-wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==