Merge remote-tracking branch 'origin/main' into paultag/machine-api-api

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

@@ -51,8 +51,6 @@ jobs:
         run: |
           VERSION=$(date +'%-y.%-m.%-d') yarn bump-jsons
 
-      # TODO: see if we need to inject updater nightly URL here https://dl.zoo.dev/releases/modeling-app/nightly/last_update.json
-
       - uses: actions/upload-artifact@v3
         with:
           name: prepared-files
@@ -63,12 +61,25 @@ jobs:
       - id: export_version
         run: echo "version=`cat package.json | jq -r '.version'`" >> "$GITHUB_OUTPUT"
 
+      - name: Prepare electron-builder.yml file for nightly
+        if: ${{ github.event_name == 'schedule' }}
+        run: |
+          yq -i '.publish[0].url = "https://dl.zoo.dev/releases/modeling-app/nightly"' electron-builder.yml
+
+      - uses: actions/upload-artifact@v3
+        if: ${{ github.event_name == 'schedule' }}
+        with:
+          name: prepared-files-nightly
+          path: |
+            electron-builder.yml
+
       - name: Prepare electron-builder.yml file for updater test
         if: ${{ env.CUT_RELEASE_PR == 'true' }}
         run: |
           yq -i '.publish[0].url = "https://dl.zoo.dev/releases/modeling-app/updater-test"' electron-builder.yml
 
       - uses: actions/upload-artifact@v3
+        if: ${{ env.CUT_RELEASE_PR == 'true' }}
         with:
           name: prepared-files-updater-test
           path: |
@@ -108,6 +119,16 @@ jobs:
           mkdir src/wasm-lib/pkg
           cp prepared-files/src/wasm-lib/pkg/wasm_lib* src/wasm-lib/pkg
 
+      - uses: actions/download-artifact@v3
+        if: ${{ github.event_name == 'schedule' }}
+        name: prepared-files-nightly
+
+      - name: Copy updated electron-builder.yml file for nightly build
+        if: ${{ github.event_name == 'schedule' }}
+        run: |
+          ls -R prepared-files-nightly
+          cp prepared-files-nightly/electron-builder.yml electron-builder.yml
+
       - name: Sync node version and setup cache
         uses: actions/setup-node@v4
         with:
@@ -152,11 +173,17 @@ jobs:
 
       - uses: actions/upload-artifact@v3
         with:
-          name: out-${{ matrix.os }}
+          name: out-arm64-${{ matrix.os }}
           path: |
-            out/Zoo*.*
+            out/Zoo*arm64*.*
             out/latest*.yml
 
+      - uses: actions/upload-artifact@v3
+        with:
+          name: out-x64-${{ matrix.os }}
+          path: |
+            out/Zoo*x*64*.*
+
       # TODO: add the 'Build for Mac TestFlight (nightly)' stage back
 
       - uses: actions/download-artifact@v3
@@ -176,10 +203,16 @@ jobs:
       - uses: actions/upload-artifact@v3
         if: ${{ env.CUT_RELEASE_PR == 'true' }}
         with:
-          name: updater-test-${{ matrix.os }}
+          name: updater-test-arm64-${{ matrix.os }}
           path: |
-            out/Zoo*.*
-            out/latest*.yml
+            out/Zoo*arm64*.*
+
+      - uses: actions/upload-artifact@v3
+        if: ${{ env.CUT_RELEASE_PR == 'true' }}
+        with:
+          name: updater-test-x64-${{ matrix.os }}
+          path: |
+            out/Zoo*x64*.*
 
 
   publish-apps-release:
@@ -201,17 +234,32 @@ jobs:
 
       - uses: actions/download-artifact@v3
         with:
-          name: out-windows-2022
+          name: out-arm64-windows-2022
           path: out
 
       - uses: actions/download-artifact@v3
         with:
-          name: out-macos-14
+          name: out-x64-windows-2022
           path: out
 
       - uses: actions/download-artifact@v3
         with:
-          name: out-ubuntu-22.04
+          name: out-arm64-macos-14
+          path: out
+
+      - uses: actions/download-artifact@v3
+        with:
+          name: out-x64-macos-14
+          path: out
+
+      - uses: actions/download-artifact@v3
+        with:
+          name: out-arm64-ubuntu-22.04
+          path: out
+
+      - uses: actions/download-artifact@v3
+        with:
+          name: out-x64-ubuntu-22.04
           path: out
 
       - name: Generate the download static endpoint

README.md

@@ -2,7 +2,7 @@
 
 ## Zoo Modeling App
 
-download at [zoo.dev/modeling-app/download](https://zoo.dev/modeling-app/download)
+live at [app.zoo.dev](https://app.zoo.dev/)
 
 A CAD application from the future, brought to you by the [Zoo team](https://zoo.dev).
 
@@ -128,18 +128,7 @@ Before you submit a contribution PR to this repo, please ensure that:
 
 ## Release a new version
 
-#### 1. Bump the versions by running `./make-release.sh`
-
-The `./make-release.sh` script has git commands to pull main but to be sure you can run the following git commands to have a fresh `main` locally.
-
-```
-git branch -D main
-git checkout main
-git pull origin
-./make-release.sh
-# Copy within the back ticks and paste the stdout of the change log
-git push --set-upstream origin <branch name created from ./make-release.sh>
-```
+#### 1. Bump the versions by running `./make-release.sh` and create a Cut Release PR
 
 That will create the branch with the updated json files for you:
 - run `./make-release.sh` or `./make-release.sh patch` for a patch update;
@@ -148,32 +137,28 @@ That will create the branch with the updated json files for you:
 
 After it runs you should just need the push the branch and open a PR.
 
-#### 2. Create a Cut Release PR
-
-When you open the PR copy the change log from the output of the `./make-release.sh` script into the description of the PR.
-
-**Important:** Pull request title needs to be prefixed with `Cut release v` to build in release mode and a few other things to test in the best context possible, the intent would be for instance to have `Cut release v1.2.3` for the `v1.2.3` release candidate.
+**Important:** It needs to be prefixed with `Cut release v` to build in release mode and a few other things to test in the best context possible, the intent would be for instance to have `Cut release v1.2.3` for the `v1.2.3` release candidate.
 
 The PR may then serve as a place to discuss the human-readable changelog and extra QA. The `make-release.sh` tool suggests a changelog for you too to be used as PR description, just make sure to delete lines that are not user facing.
 
-#### 3. Manually test artifacts from the Cut Release PR
+#### 2. Smoke test artifacts from the Cut Release PR
 
 The release builds can be find under the `artifact` zip, at the very bottom of the `ci` action page for each commit on this branch.
 
-Manually test against this [list](https://github.com/KittyCAD/modeling-app/issues/3588) across Windows, MacOS, Linux and posting results as comments in the Cut Release PR.
+We don't have a strict process, but click around and check for anything obvious, posting results as comments in the Cut Release PR.
 
 The other `ci` output in Cut Release PRs is `updater-test`, because we don't have a way to test this fully automated, we have a semi-automated process. Download updater-test zip file, install the app, run it, expect an updater prompt to a dummy v0.99.99, install it and check that the app comes back at that version (on both macOS and Windows).
 
-#### 4. Merge the Cut Release PR
+#### 3. Merge the Cut Release PR
 
 This will kick the `create-release` action, that creates a _Draft_ release out of this Cut Release PR merge after less than a minute, with the new version as title and Cut Release PR as description.
 
 
-#### 5. Publish the release
+#### 4. Publish the release
 
 Head over to https://github.com/KittyCAD/modeling-app/releases, the draft release corresponding to the merged Cut Release PR should show up at the top as _Draft_. Click on it, verify the content, and hit _Publish_.
 
-#### 6. Profit
+#### 5. Profit
 
 A new Action kicks in at https://github.com/KittyCAD/modeling-app/actions, which can be found under `release` event filter.
 

e2e/playwright/fixtures/sceneFixture.ts

@@ -13,13 +13,6 @@ type mouseParams = {
   pixelDiff: number
 }
 
-type SceneSerialised = {
-  camera: {
-    position: [number, number, number]
-    target: [number, number, number]
-  }
-}
-
 export class SceneFixture {
   public page: Page
 
@@ -29,22 +22,6 @@ export class SceneFixture {
     this.page = page
     this.reConstruct(page)
   }
-  private _serialiseScene = async (): Promise<SceneSerialised> => {
-    const camera = await this.getCameraInfo()
-
-    return {
-      camera,
-    }
-  }
-
-  expectState = async (expected: SceneSerialised) => {
-    return expect
-      .poll(() => this._serialiseScene(), {
-        message: `Expected scene state to match`,
-      })
-      .toEqual(expected)
-  }
-
   reConstruct = (page: Page) => {
     this.page = page
 
@@ -54,7 +31,7 @@ export class SceneFixture {
   makeMouseHelpers = (
     x: number,
     y: number,
-    { steps }: { steps: number } = { steps: 20 }
+    { steps }: { steps: number } = { steps: 5000 }
   ) =>
     [
       (clickParams?: mouseParams) => {
@@ -110,36 +87,6 @@ export class SceneFixture {
     )
     await closeDebugPanel(this.page)
   }
-  /** Forces a refresh of the camera position and target displayed
-   *  in the debug panel and then returns the values of the fields
-   */
-  async getCameraInfo() {
-    await openAndClearDebugPanel(this.page)
-    await sendCustomCmd(this.page, {
-      type: 'modeling_cmd_req',
-      cmd_id: uuidv4(),
-      cmd: {
-        type: 'default_camera_get_settings',
-      },
-    })
-    await this.waitForExecutionDone()
-    const position = await Promise.all([
-      this.page.getByTestId('cam-x-position').inputValue().then(Number),
-      this.page.getByTestId('cam-y-position').inputValue().then(Number),
-      this.page.getByTestId('cam-z-position').inputValue().then(Number),
-    ])
-    const target = await Promise.all([
-      this.page.getByTestId('cam-x-target').inputValue().then(Number),
-      this.page.getByTestId('cam-y-target').inputValue().then(Number),
-      this.page.getByTestId('cam-z-target').inputValue().then(Number),
-    ])
-    await closeDebugPanel(this.page)
-    return {
-      position,
-      target,
-    }
-  }
-
   waitForExecutionDone = async () => {
     await expect(this.exeIndicator).toBeVisible()
   }
@@ -167,17 +114,4 @@ export class SceneFixture {
         )
       })
   }
-
-  get gizmo() {
-    return this.page.locator('[aria-label*=gizmo]')
-  }
-
-  async clickGizmoMenuItem(name: string) {
-    await this.gizmo.click({ button: 'right' })
-    const buttonToTest = this.page.getByRole('button', {
-      name: name,
-    })
-    await expect(buttonToTest).toBeVisible()
-    await buttonToTest.click()
-  }
 }

e2e/playwright/testing-gizmo.spec.ts

@@ -1,18 +1,18 @@
-import { _test, _expect } from './playwright-deprecated'
-import { test } from './fixtures/fixtureSetup'
+import { test, expect } from '@playwright/test'
+
 import { getUtils, setup, tearDown } from './test-utils'
 import { uuidv4 } from 'lib/utils'
 import { TEST_CODE_GIZMO } from './storageStates'
 
-_test.beforeEach(async ({ context, page }, testInfo) => {
+test.beforeEach(async ({ context, page }, testInfo) => {
   await setup(context, page, testInfo)
 })
 
-_test.afterEach(async ({ page }, testInfo) => {
+test.afterEach(async ({ page }, testInfo) => {
   await tearDown(page, testInfo)
 })
 
-_test.describe('Testing Gizmo', () => {
+test.describe('Testing Gizmo', () => {
   const cases = [
     {
       testDescription: 'top view',
@@ -57,7 +57,7 @@ _test.describe('Testing Gizmo', () => {
     expectedCameraTarget,
     testDescription,
   } of cases) {
-    _test(`check ${testDescription}`, async ({ page, browserName }) => {
+    test(`check ${testDescription}`, async ({ page, browserName }) => {
       const u = await getUtils(page)
       await page.addInitScript((TEST_CODE_GIZMO) => {
         localStorage.setItem('persistCode', TEST_CODE_GIZMO)
@@ -117,30 +117,30 @@ _test.describe('Testing Gizmo', () => {
 
       await Promise.all([
         // position
-        _expect(page.getByTestId('cam-x-position')).toHaveValue(
+        expect(page.getByTestId('cam-x-position')).toHaveValue(
           expectedCameraPosition.x.toString()
         ),
-        _expect(page.getByTestId('cam-y-position')).toHaveValue(
+        expect(page.getByTestId('cam-y-position')).toHaveValue(
           expectedCameraPosition.y.toString()
         ),
-        _expect(page.getByTestId('cam-z-position')).toHaveValue(
+        expect(page.getByTestId('cam-z-position')).toHaveValue(
           expectedCameraPosition.z.toString()
         ),
         // target
-        _expect(page.getByTestId('cam-x-target')).toHaveValue(
+        expect(page.getByTestId('cam-x-target')).toHaveValue(
           expectedCameraTarget.x.toString()
         ),
-        _expect(page.getByTestId('cam-y-target')).toHaveValue(
+        expect(page.getByTestId('cam-y-target')).toHaveValue(
           expectedCameraTarget.y.toString()
         ),
-        _expect(page.getByTestId('cam-z-target')).toHaveValue(
+        expect(page.getByTestId('cam-z-target')).toHaveValue(
           expectedCameraTarget.z.toString()
         ),
       ])
     })
   }
 
-  _test('Context menu and popover menu', async ({ page }) => {
+  test('Context menu and popover menu', async ({ page }) => {
     const testCase = {
       testDescription: 'Right view',
       expectedCameraPosition: { x: 5660.02, y: -152, z: 26 },
@@ -196,7 +196,7 @@ _test.describe('Testing Gizmo', () => {
     const buttonToTest = page.getByRole('button', {
       name: testCase.testDescription,
     })
-    await _expect(buttonToTest).toBeVisible()
+    await expect(buttonToTest).toBeVisible()
     await buttonToTest.click()
 
     // Now assert we've moved to the correct view
@@ -215,23 +215,23 @@ _test.describe('Testing Gizmo', () => {
 
     await Promise.all([
       // position
-      _expect(page.getByTestId('cam-x-position')).toHaveValue(
+      expect(page.getByTestId('cam-x-position')).toHaveValue(
         testCase.expectedCameraPosition.x.toString()
       ),
-      _expect(page.getByTestId('cam-y-position')).toHaveValue(
+      expect(page.getByTestId('cam-y-position')).toHaveValue(
         testCase.expectedCameraPosition.y.toString()
       ),
-      _expect(page.getByTestId('cam-z-position')).toHaveValue(
+      expect(page.getByTestId('cam-z-position')).toHaveValue(
         testCase.expectedCameraPosition.z.toString()
       ),
       // target
-      _expect(page.getByTestId('cam-x-target')).toHaveValue(
+      expect(page.getByTestId('cam-x-target')).toHaveValue(
         testCase.expectedCameraTarget.x.toString()
       ),
-      _expect(page.getByTestId('cam-y-target')).toHaveValue(
+      expect(page.getByTestId('cam-y-target')).toHaveValue(
         testCase.expectedCameraTarget.y.toString()
       ),
-      _expect(page.getByTestId('cam-z-target')).toHaveValue(
+      expect(page.getByTestId('cam-z-target')).toHaveValue(
         testCase.expectedCameraTarget.z.toString()
       ),
     ])
@@ -242,60 +242,8 @@ _test.describe('Testing Gizmo', () => {
     const gizmoPopoverButton = page.getByRole('button', {
       name: 'view settings',
     })
-    await _expect(gizmoPopoverButton).toBeVisible()
+    await expect(gizmoPopoverButton).toBeVisible()
     await gizmoPopoverButton.click()
-    await _expect(buttonToTest).toBeVisible()
-  })
-})
-
-test.describe(`Testing gizmo, fixture-based`, () => {
-  test('Center on selection from menu', async ({
-    app,
-    cmdBar,
-    editor,
-    toolbar,
-    scene,
-  }) => {
-    test.skip(
-      process.platform === 'win32',
-      'Fails on windows in CI, can not be replicated locally on windows.'
-    )
-
-    await test.step(`Setup`, async () => {
-      const file = await app.getInputFile('test-circle-extrude.kcl')
-      await app.initialise(file)
-      await scene.expectState({
-        camera: {
-          position: [4982.21, -23865.37, 13810.64],
-          target: [4982.21, 0, 2737.1],
-        },
-      })
-    })
-    const [clickCircle, moveToCircle] = scene.makeMouseHelpers(582, 217)
-
-    await test.step(`Select an edge of this circle`, async () => {
-      const circleSnippet =
-        'circle({ center: [318.33, 168.1], radius: 182.8 }, %)'
-      await moveToCircle()
-      await clickCircle()
-      await editor.expectState({
-        activeLines: [circleSnippet.slice(-5)],
-        highlightedCode: circleSnippet,
-        diagnostics: [],
-      })
-    })
-
-    await test.step(`Center on selection from menu`, async () => {
-      await scene.clickGizmoMenuItem('Center view on selection')
-    })
-
-    await test.step(`Verify the camera moved`, async () => {
-      await scene.expectState({
-        camera: {
-          position: [0, -23865.37, 11073.54],
-          target: [0, 0, 0],
-        },
-      })
-    })
+    await expect(buttonToTest).toBeVisible()
   })
 })

e2e/playwright/testing-settings.spec.ts

@@ -9,7 +9,6 @@ import {
   executorInputPath,
 } from './test-utils'
 import { SaveSettingsPayload, SettingsLevel } from 'lib/settings/settingsTypes'
-import { SETTINGS_FILE_NAME } from 'lib/constants'
 import {
   TEST_SETTINGS_KEY,
   TEST_SETTINGS_CORRUPTED,
@@ -344,7 +343,7 @@ test.describe('Testing settings', () => {
 
       // Selectors and constants
       const errorHeading = page.getByRole('heading', {
-        name: 'An unexpected error occurred',
+        name: 'An unextected error occurred',
       })
       const projectDirLink = page.getByText('Loaded from')
 
@@ -373,7 +372,7 @@ test.describe('Testing settings', () => {
 
       // Selectors and constants
       const errorHeading = page.getByRole('heading', {
-        name: 'An unexpected error occurred',
+        name: 'An unextected error occurred',
       })
       const projectDirLink = page.getByText('Loaded from')
 
@@ -385,66 +384,6 @@ test.describe('Testing settings', () => {
     }
   )
 
-  // It was much easier to test the logo color than the background stream color.
-  test(
-    'user settings reload on external change, on project and modeling view',
-    { tag: '@electron' },
-    async ({ browserName }, testInfo) => {
-      const {
-        electronApp,
-        page,
-        dir: projectDirName,
-      } = await setupElectron({
-        testInfo,
-        appSettings: {
-          app: {
-            // Doesn't matter what you set it to. It will
-            // default to 264.5
-            themeColor: '0',
-          },
-        },
-      })
-
-      await page.setViewportSize({ width: 1200, height: 500 })
-
-      const logoLink = page.getByTestId('app-logo')
-      const projectDirLink = page.getByText('Loaded from')
-
-      await test.step('Wait for project view', async () => {
-        await expect(projectDirLink).toBeVisible()
-        await expect(logoLink).toHaveCSS('--primary-hue', '264.5')
-      })
-
-      const changeColor = async (color: string) => {
-        const tempSettingsFilePath = join(projectDirName, SETTINGS_FILE_NAME)
-        let tomlStr = await fsp.readFile(tempSettingsFilePath, 'utf-8')
-        tomlStr = tomlStr.replace(/(themeColor = ")[0-9]+(")/, `$1${color}$2`)
-        await fsp.writeFile(tempSettingsFilePath, tomlStr)
-      }
-
-      await test.step('Check color of logo changed', async () => {
-        await changeColor('99')
-        await expect(logoLink).toHaveCSS('--primary-hue', '99')
-      })
-
-      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')
-      })
-
-      await test.step('Check going back to projects view still changes the color', async () => {
-        await logoLink.click()
-        await expect(projectDirLink).toBeVisible()
-        await changeColor('21')
-        await expect(logoLink).toHaveCSS('--primary-hue', '21')
-      })
-      await electronApp.close()
-    }
-  )
-
   test(
     `Closing settings modal should go back to the original file being viewed`,
     { tag: '@electron' },

electron-builder.yml

@@ -32,10 +32,10 @@ win:
       arch:
         - x64
         - arm64
-    # - target: msi
-    #   arch:
-    #     - x64
-    #     - arm64
+    - target: msi
+      arch:
+        - x64
+        - arm64
   signingHashAlgorithms:
     - sha256
   sign: "./sign-win.js"
@@ -47,9 +47,9 @@ win:
       mimeType: text/vnd.zoo.kcl
       description: Zoo KCL File
       role: Editor
-# msi:
-#   oneClick: false
-#   perMachine: true
+msi:
+  oneClick: false
+  perMachine: true
 nsis:
   oneClick: false
   perMachine: true

interface.d.ts

@@ -23,6 +23,7 @@ export interface IElectronAPI {
     callback: (eventType: string, path: string) => void
   ) => void
   watchFileOff: (path: string) => void
+  watchFileObliterate: () => void
   readFile: (path: string) => ReturnType<fs.readFile>
   writeFile: (
     path: string,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zoo-modeling-app",
-  "version": "0.25.6",
+  "version": "0.25.5",
   "private": true,
   "productName": "Zoo Modeling App",
   "author": {
@@ -26,7 +26,7 @@
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@headlessui/react": "^1.7.19",
     "@headlessui/tailwindcss": "^0.2.0",
-    "@kittycad/lib": "2.0.7",
+    "@kittycad/lib": "^2.0.1",
     "@lezer/highlight": "^1.2.1",
     "@lezer/lr": "^1.4.1",
     "@react-hook/resize-observer": "^2.0.1",
@@ -36,7 +36,6 @@
     "@xstate/inspect": "^0.8.0",
     "@xstate/react": "^4.1.1",
     "bonjour-service": "^1.2.1",
-    "chokidar": "^4.0.1",
     "codemirror": "^6.0.1",
     "decamelize": "^6.0.0",
     "electron-squirrel-startup": "^1.0.1",

src/clientSideScene/CameraControls.ts

@@ -893,7 +893,6 @@ export class CameraControls {
         type: 'zoom_to_fit',
         object_ids: [], // leave empty to zoom to all objects
         padding: 0.2, // padding around the objects
-        animated: false, // don't animate the zoom for now
       },
     })
   }

src/components/CommandBar/CommandBarSelectionInput.tsx

@@ -91,7 +91,7 @@ function CommandBarSelectionInput({
     <form id="arg-form" onSubmit={handleSubmit}>
       <label
         className={
-          'relative flex flex-col mx-4 my-4 ' +
+          'relative flex items-center mx-4 my-4 ' +
           (!hasSubmitted || canSubmitSelection || 'text-destroy-50')
         }
       >
@@ -100,18 +100,13 @@ function CommandBarSelectionInput({
           : `Please select ${
               arg.multiple ? 'one or more ' : 'one '
             }${getSemanticSelectionType(arg.selectionTypes).join(' or ')}`}
-        {arg.warningMessage && (
-          <p className="text-warn-80 bg-warn-10 px-2 py-1 rounded-sm mt-3 mr-2 -mb-2 w-full text-sm cursor-default">
-            {arg.warningMessage}
-          </p>
-        )}
         <input
           id="selection"
           name="selection"
           ref={inputRef}
           required
           placeholder="Select an entity with your mouse"
-          className="absolute inset-0 w-full h-full opacity-0 cursor-default"
+          className="absolute inset-0 w-full h-full opacity-0 cursor-pointer"
           onKeyDown={(event) => {
             if (event.key === 'Backspace') {
               stepBack()

src/components/Gizmo.tsx

@@ -28,7 +28,6 @@ import {
 import { Popover } from '@headlessui/react'
 import { CustomIcon } from './CustomIcon'
 import { reportRejection } from 'lib/trap'
-import { useModelingContext } from 'hooks/useModelingContext'
 
 const CANVAS_SIZE = 80
 const FRUSTUM_SIZE = 0.5
@@ -63,7 +62,6 @@ export default function Gizmo() {
   const raycasterIntersect = useRef<Intersection<Object3D> | null>(null)
   const cameraPassiveUpdateTimer = useRef(0)
   const raycasterPassiveUpdateTimer = useRef(0)
-  const { send: modelingSend } = useModelingContext()
   const menuItems = useMemo(
     () => [
       ...Object.entries(axisNamesSemantic).map(([axisName, axisSemantic]) => (
@@ -78,7 +76,6 @@ export default function Gizmo() {
           {axisSemantic} view
         </ContextMenuItem>
       )),
-      <ContextMenuDivider />,
       <ContextMenuItem
         onClick={() => {
           sceneInfra.camControls.resetCameraPosition().catch(reportRejection)
@@ -86,13 +83,6 @@ export default function Gizmo() {
       >
         Reset view
       </ContextMenuItem>,
-      <ContextMenuItem
-        onClick={() => {
-          modelingSend({ type: 'Center camera on selection' })
-        }}
-      >
-        Center view on selection
-      </ContextMenuItem>,
       <ContextMenuDivider />,
       <ContextMenuItemRefresh />,
     ],

src/components/ModelingMachineProvider.tsx

@@ -83,7 +83,6 @@ import {
 } from 'lang/std/engineConnection'
 import { submitAndAwaitTextToKcl } from 'lib/textToCad'
 import { useFileContext } from 'hooks/useFileContext'
-import { uuidv4 } from 'lib/utils'
 
 type MachineContext<T extends AnyStateMachine> = {
   state: StateFrom<T>
@@ -244,17 +243,6 @@ export const ModelingMachineProvider = ({
             return {}
           },
         }),
-        'Center camera on selection': () => {
-          engineCommandManager
-            .sendSceneCommand({
-              type: 'modeling_cmd_req',
-              cmd_id: uuidv4(),
-              cmd: {
-                type: 'default_camera_center_to_selection',
-              },
-            })
-            .catch(reportRejection)
-        },
         'Set sketchDetails': assign(({ context: { sketchDetails }, event }) => {
           if (event.type !== 'Delete segment') return {}
           if (!sketchDetails) return {}
@@ -1049,11 +1037,6 @@ export const ModelingMachineProvider = ({
     modelingSend({ type: 'Delete selection' })
   })
 
-  // Allow ctrl+alt+c to center to selection
-  useHotkeys(['mod + alt + c'], () => {
-    modelingSend({ type: 'Center camera on selection' })
-  })
-
   useStateMachineCommands({
     machineId: 'modeling',
     state: modelingState,

src/components/SettingsAuthProvider.tsx

@@ -1,10 +1,9 @@
-import { trap } from 'lib/trap'
 import { useMachine } from '@xstate/react'
 import { useNavigate, useRouteLoaderData, useLocation } from 'react-router-dom'
 import { PATHS } from 'lib/paths'
 import { authMachine, TOKEN_PERSIST_KEY } from '../machines/authMachine'
 import withBaseUrl from '../lib/withBaseURL'
-import React, { createContext, useEffect, useState } from 'react'
+import React, { createContext, useEffect } from 'react'
 import useStateMachineCommands from '../hooks/useStateMachineCommands'
 import { settingsMachine } from 'machines/settingsMachine'
 import { toast } from 'react-hot-toast'
@@ -16,6 +15,7 @@ import {
 } from 'lib/theme'
 import decamelize from 'decamelize'
 import { Actor, AnyStateMachine, ContextFrom, Prop, StateFrom } from 'xstate'
+import { isDesktop } from 'lib/isDesktop'
 import { authCommandBarConfig } from 'lib/commandBarConfigs/authCommandConfig'
 import {
   kclManager,
@@ -33,14 +33,8 @@ import {
 import { useCommandsContext } from 'hooks/useCommandsContext'
 import { Command } from 'lib/commandTypes'
 import { BaseUnit } from 'lib/settings/settingsTypes'
-import {
-  saveSettings,
-  loadAndValidateSettings,
-} from 'lib/settings/settingsUtils'
+import { saveSettings } from 'lib/settings/settingsUtils'
 import { reportRejection } from 'lib/trap'
-import { getAppSettingsFilePath } from 'lib/desktop'
-import { isDesktop } from 'lib/isDesktop'
-import { useFileSystemWatcher } from 'hooks/useFileSystemWatcher'
 
 type MachineContext<T extends AnyStateMachine> = {
   state: StateFrom<T>
@@ -105,9 +99,6 @@ export const SettingsAuthProviderBase = ({
   const location = useLocation()
   const navigate = useNavigate()
   const { commandBarSend } = useCommandsContext()
-  const [settingsPath, setSettingsPath] = useState<string | undefined>(
-    undefined
-  )
 
   const [settingsState, settingsSend, settingsActor] = useMachine(
     settingsMachine.provide({
@@ -200,11 +191,7 @@ export const SettingsAuthProviderBase = ({
             console.error('Error executing AST after settings change', e)
           }
         },
-        persistSettings: ({ context, event }) => {
-          // Without this, when a user changes the file, it'd
-          // create a detection loop with the file-system watcher.
-          if (event.doNotPersist) return
-
+        persistSettings: ({ context }) => {
           // eslint-disable-next-line @typescript-eslint/no-floating-promises
           saveSettings(context, loadedProject?.project?.path)
         },
@@ -214,23 +201,6 @@ export const SettingsAuthProviderBase = ({
   )
   settingsStateRef = settingsState.context
 
-  useEffect(() => {
-    if (!isDesktop()) return
-    getAppSettingsFilePath().then(setSettingsPath).catch(trap)
-  }, [])
-
-  useFileSystemWatcher(
-    async () => {
-      const data = await loadAndValidateSettings(loadedProject?.project?.path)
-      settingsSend({
-        type: 'Set all settings',
-        settings: data.settings,
-        doNotPersist: true,
-      })
-    },
-    settingsPath ? [settingsPath] : []
-  )
-
   // Add settings commands to the command bar
   // They're treated slightly differently than other commands
   // Because their state machine doesn't have a meaningful .nextEvents,

src/hooks/useFileSystemWatcher.tsx

@@ -1,5 +1,4 @@
 import { isDesktop } from 'lib/isDesktop'
-import { reportRejection } from 'lib/trap'
 import { useEffect, useState, useRef } from 'react'
 
 type Path = string
@@ -12,13 +11,13 @@ type Path = string
 // watcher.addListener(() => { ... }).
 
 export const useFileSystemWatcher = (
-  callback: (path: Path) => Promise<void>,
+  callback: (path: Path) => void,
   dependencyArray: Path[]
 ): void => {
   // Track a ref to the callback. This is how we get the callback updated
   // across the NodeJS<->Browser boundary.
-  const callbackRef = useRef<{ fn: (path: Path) => Promise<void> }>({
-    fn: async (_path) => {},
+  const callbackRef = useRef<{ fn: (path: Path) => void }>({
+    fn: (_path) => {},
   })
 
   useEffect(() => {
@@ -36,9 +35,7 @@ export const useFileSystemWatcher = (
     if (!isDesktop()) return
 
     return () => {
-      for (let path of dependencyArray) {
-        window.electron.watchFileOff(path)
-      }
+      window.electron.watchFileObliterate()
     }
   }, [])
 
@@ -49,9 +46,6 @@ export const useFileSystemWatcher = (
     ]
   }
 
-  const hasDiff =
-    difference(dependencyArray, dependencyArrayTracked)[0].length !== 0
-
   // Removing 1 watcher at a time is only possible because in a filesystem,
   // a path is unique (there can never be two paths with the same name).
   // Otherwise we would have to obliterate() the whole list and reconstruct it.
@@ -59,8 +53,6 @@ export const useFileSystemWatcher = (
     // The hook is useless on web.
     if (!isDesktop()) return
 
-    if (!hasDiff) return
-
     const [pathsRemoved, pathsRemaining] = difference(
       dependencyArrayTracked,
       dependencyArray
@@ -70,10 +62,10 @@ export const useFileSystemWatcher = (
     }
     const [pathsAdded] = difference(dependencyArray, dependencyArrayTracked)
     for (let path of pathsAdded) {
-      window.electron.watchFileOn(path, (_eventType: string, path: Path) => {
-        callbackRef.current.fn(path).catch(reportRejection)
-      })
+      window.electron.watchFileOn(path, (_eventType: string, path: Path) =>
+        callbackRef.current.fn(path)
+      )
     }
     setDependencyArrayTracked(pathsRemaining.concat(pathsAdded))
-  }, [hasDiff])
+  }, [difference(dependencyArray, dependencyArrayTracked)[0].length !== 0])
 }

src/lang/KclSingleton.ts

@@ -282,7 +282,6 @@ export class KclManager {
             type: 'zoom_to_fit',
             object_ids: zoomObjectId ? [zoomObjectId] : [], // leave empty to zoom to all objects
             padding: 0.1, // padding around the objects
-            animated: false, // don't animate the zoom for now
           },
         })
       }

src/lib/commandBarConfigs/modelingCommandConfig.ts

@@ -281,8 +281,6 @@ export const modelingMachineCommandConfig: StateMachineCommandSetConfig<
         multiple: true,
         required: true,
         skip: false,
-        warningMessage:
-          'Fillets cannot touch other fillets yet. This is under development.',
       },
       radius: {
         inputType: 'kcl',

src/lib/commandTypes.ts

@@ -113,7 +113,6 @@ export type CommandArgumentConfig<
         commandBarContext: { argumentsToSubmit: Record<string, unknown> }, // Should be the commandbarMachine's context, but it creates a circular dependency
         machineContext?: C
       ) => boolean)
-  warningMessage?: string
   skip?: boolean
   /** For showing a summary display of the current value, such as in
    *  the command bar's header
@@ -190,7 +189,6 @@ export type CommandArgument<
       ) => boolean)
   skip?: boolean
   machineActor?: Actor<T>
-  warningMessage?: string
   /** For showing a summary display of the current value, such as in
    *  the command bar's header
    */

src/lib/createMachineCommand.ts

@@ -152,7 +152,6 @@ export function buildCommandArgument<
     skip: arg.skip,
     machineActor,
     valueSummary: arg.valueSummary,
-    warningMessage: arg.warningMessage ?? '',
   } satisfies Omit<CommandArgument<O, T>, 'inputType'>
 
   if (arg.inputType === 'options') {

src/lib/desktop.ts

@@ -379,7 +379,7 @@ const getAppFolderName = () => {
   return window.electron.packageJson.name
 }
 
-export const getAppSettingsFilePath = async () => {
+const getAppSettingsFilePath = async () => {
   const isTestEnv = window.electron.process.env.IS_PLAYWRIGHT === 'true'
   const testSettingsPath = window.electron.process.env.TEST_SETTINGS_FILE_KEY
   const appConfig = await window.electron.getPath('appData')

src/lib/settings/initialKeybindings.ts

@@ -145,13 +145,6 @@ export const interactionMap: Record<
       description:
         'Available while modeling with either a face selected or an empty selection, when not typing in the code editor.',
     },
-    {
-      name: 'center-on-selection',
-      sequence: `${PRIMARY}+Alt+C`,
-      title: 'Center on selection',
-      description:
-        'Centers the view on the selected geometry, or everything if nothing is selected.',
-    },
   ],
   'Code Editor': [
     {

src/lib/settings/settingsUtils.ts

@@ -177,14 +177,14 @@ export async function loadAndValidateSettings(
 
   if (err(appSettingsPayload)) return Promise.reject(appSettingsPayload)
 
-  let settingsNext = createSettings()
+  const settings = createSettings()
   // Because getting the default directory is async, we need to set it after
   if (onDesktop) {
     settings.app.projectDirectory.default = await getInitialDefaultDir()
   }
 
-  settingsNext = setSettingsAtLevel(
-    settingsNext,
+  setSettingsAtLevel(
+    settings,
     'user',
     configurationToSettingsPayload(appSettingsPayload)
   )
@@ -199,8 +199,8 @@ export async function loadAndValidateSettings(
       return Promise.reject(new Error('Invalid project settings'))
 
     const projectSettingsPayload = projectSettings
-    settingsNext = setSettingsAtLevel(
-      settingsNext,
+    setSettingsAtLevel(
+      settings,
       'project',
       projectConfigurationToSettingsPayload(projectSettingsPayload)
     )
@@ -208,7 +208,7 @@ export async function loadAndValidateSettings(
 
   // Return the settings object
   return {
-    settings: settingsNext,
+    settings,
     configuration: appSettingsPayload,
   }
 }

src/lib/singletons.ts

@@ -49,7 +49,6 @@ if (typeof window !== 'undefined') {
         type: 'zoom_to_fit',
         object_ids: [], // leave empty to zoom to all objects
         padding: 0.2, // padding around the objects
-        animated: false, // don't animate the zoom for now
       },
     })
 }

src/lib/textToCad.ts

@@ -249,7 +249,7 @@ export async function submitAndAwaitTextToKcl({
 
 export async function sendTelemetry(
   id: string,
-  feedback: Models['MlFeedback_type'],
+  feedback: Models['AiFeedback_type'],
   token?: string
 ): Promise<void> {
   const url =

src/machines/modelingMachine.ts

@@ -252,9 +252,6 @@ export type ModelingMachineEvent =
       type: 'Set Segment Overlays'
       data: SegmentOverlayPayload
     }
-  | {
-      type: 'Center camera on selection'
-    }
   | {
       type: 'Delete segment'
       data: PathToNode
@@ -941,7 +938,6 @@ export const modelingMachine = setup({
     'Set selection': () => {},
     'Set mouse state': () => {},
     'Set Segment Overlays': () => {},
-    'Center camera on selection': () => {},
     'Engine export': () => {},
     'Submit to Text-to-CAD API': () => {},
     'Set sketchDetails': () => {},
@@ -2109,10 +2105,6 @@ export const modelingMachine = setup({
       reenter: false,
       actions: 'Set Segment Overlays',
     },
-    'Center camera on selection': {
-      reenter: false,
-      actions: 'Center camera on selection',
-    },
   },
 })
 

src/machines/settingsMachine.ts

@@ -19,7 +19,7 @@ export const settingsMachine = setup({
   types: {
     context: {} as ReturnType<typeof createSettings>,
     input: {} as ReturnType<typeof createSettings>,
-    events: {} as (
+    events: {} as
       | WildcardSetEvent<SettingsPaths>
       | SetEventTypes
       | {
@@ -34,8 +34,7 @@ export const settingsMachine = setup({
           type: 'Reset settings'
           level: SettingsLevel
         }
-      | { type: 'Set all settings'; settings: typeof settings }
-    ) & { doNotPersist?: boolean },
+      | { type: 'Set all settings'; settings: typeof settings },
   },
   actions: {
     setEngineTheme: () => {},

src/preload.ts

@@ -5,7 +5,6 @@ import os from 'node:os'
 import fsSync from 'node:fs'
 import packageJson from '../package.json'
 import { MachinesListing } from 'lib/machineManager'
-import chokidar from 'chokidar'
 
 const open = (args: any) => ipcRenderer.invoke('dialog.showOpenDialog', args)
 const save = (args: any) => ipcRenderer.invoke('dialog.showSaveDialog', args)
@@ -24,21 +23,36 @@ const isMac = os.platform() === 'darwin'
 const isWindows = os.platform() === 'win32'
 const isLinux = os.platform() === 'linux'
 
-let fsWatchListeners = new Map<string, ReturnType<typeof chokidar.watch>>()
+let fsWatchListeners = new Map<
+  string,
+  {
+    watcher: fsSync.FSWatcher
+    callback: (eventType: string, path: string) => void
+  }
+>()
 
-const watchFileOn = (path: string, callback: (path: string) => void) => {
-  const watcherMaybe = fsWatchListeners.get(path)
-  if (watcherMaybe) return
-  const watcher = chokidar.watch(path)
-  watcher.on('all', callback)
-  fsWatchListeners.set(path, watcher)
+const watchFileOn = (
+  path: string,
+  callback: (eventType: string, path: string) => void
+) => {
+  const watcher = fsSync.watch(path)
+  watcher.on('change', callback)
+  fsWatchListeners.set(path, { watcher, callback })
 }
 const watchFileOff = (path: string) => {
-  const watcher = fsWatchListeners.get(path)
-  if (!watcher) return
-  watcher.unwatch(path)
+  const entry = fsWatchListeners.get(path)
+  if (!entry) return
+  const { watcher, callback } = entry
+  watcher.off('change', callback)
+  watcher.close()
   fsWatchListeners.delete(path)
 }
+const watchFileObliterate = () => {
+  for (let [pathAsKey] of fsWatchListeners) {
+    watchFileOff(pathAsKey)
+  }
+  fsWatchListeners = new Map()
+}
 const readFile = (path: string) => fs.readFile(path, 'utf-8')
 // It seems like from the node source code this does not actually block but also
 // don't trust me on that (jess).
@@ -89,6 +103,7 @@ contextBridge.exposeInMainWorld('electron', {
   // exported.
   watchFileOn,
   watchFileOff,
+  watchFileObliterate,
   readFile,
   writeFile,
   exists,

src/routes/Home.tsx

@@ -176,7 +176,7 @@ const Home = () => {
 
   // Re-read projects listing if the projectDir has any updates.
   useFileSystemWatcher(
-    async () => {
+    () => {
       setProjectsLoaderTrigger(projectsLoaderTrigger + 1)
     },
     projectsDir ? [projectsDir] : []

src/wasm-lib/Cargo.lock

@@ -934,9 +934,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures"
-version = "0.3.31"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -949,9 +949,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.31"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -959,15 +959,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.31"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.31"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -976,15 +976,15 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.31"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.31"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -993,21 +993,21 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.31"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
 
 [[package]]
 name = "futures-task"
-version = "0.3.31"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
 [[package]]
 name = "futures-util"
-version = "0.3.31"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1966,9 +1966,12 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.20.2"
+version = "1.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1"
+dependencies = [
+ "portable-atomic",
+]
 
 [[package]]
 name = "oncemutex"

src/wasm-lib/Cargo.toml

@@ -35,7 +35,7 @@ uuid = { version = "1.10.0", features = ["v4", "js", "serde"] }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 console_error_panic_hook = "0.1.7"
-futures = "0.3.31"
+futures = "0.3.30"
 js-sys = "0.3.69"
 tower-lsp = { version = "0.20.0", default-features = false, features = ["runtime-agnostic"] }
 wasm-bindgen-futures = { version = "0.4.41", features = ["futures-core-03-stream"] }

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

@@ -14,7 +14,7 @@ proc-macro = true
 [dependencies]
 Inflector = "0.11.4"
 convert_case = "0.6.0"
-once_cell = "1.20.2"
+once_cell = "1.19.0"
 proc-macro2 = "1"
 quote = "1"
 regex = "1.10"

src/wasm-lib/kcl/Cargo.toml

@@ -22,7 +22,7 @@ dashmap = "6.1.0"
 databake = { version = "0.1.8", features = ["derive"] }
 derive-docs = { version = "0.1.29", path = "../derive-docs" }
 form_urlencoded = "1.2.1"
-futures = { version = "0.3.31" }
+futures = { version = "0.3.30" }
 git_rev = "0.1.0"
 gltf-json = "1.4.1"
 http = { workspace = true }

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

@@ -787,14 +787,12 @@ fn test_generate_stdlib_json_schema() {
     let stdlib = StdLib::new();
     let combined = stdlib.combined();
 
-    let json_data: Vec<_> = combined
-        .keys()
-        .sorted()
-        .map(|key| {
-            let internal_fn = combined.get(key).unwrap();
-            internal_fn.to_json().unwrap()
-        })
-        .collect();
+    let mut json_data = vec![];
+
+    for key in combined.keys().sorted() {
+        let internal_fn = combined.get(key).unwrap();
+        json_data.push(internal_fn.to_json().unwrap());
+    }
     expectorate::assert_contents(
         "../../../docs/kcl/std.json",
         &serde_json::to_string_pretty(&json_data).unwrap(),

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

@@ -83,8 +83,6 @@ impl StdLibFnArg {
             return Ok(Some((index, format!("${{{}:{}}}", index, "myTag"))));
         } else if self.type_ == "[KclValue]" && self.required {
             return Ok(Some((index, format!("${{{}:{}}}", index, "[0..9]"))));
-        } else if self.type_ == "KclValue" && self.required {
-            return Ok(Some((index, format!("${{{}:{}}}", index, "3"))));
         }
         get_autocomplete_snippet_from_schema(&self.schema.schema.clone().into(), index)
     }

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

@@ -4,7 +4,7 @@ use serde_json::Value as JValue;
 use super::{args::FromArgs, Args, FnAsArg};
 use crate::{
     errors::{KclError, KclErrorDetails},
-    executor::{ExecState, KclValue, SourceRange, UserVal},
+    executor::{ExecState, KclValue, Sketch, SourceRange, UserVal},
     function_param::FunctionParam,
 };
 
@@ -98,16 +98,7 @@ async fn call_map_closure<'a>(
 
 /// For each item in an array, update a value.
 pub async fn reduce(exec_state: &mut ExecState, args: Args) -> Result<KclValue, KclError> {
-    let (array, start, f): (Vec<JValue>, KclValue, FnAsArg<'_>) = FromArgs::from_args(&args, 0)?;
-    let array: Vec<KclValue> = array
-        .into_iter()
-        .map(|jval| {
-            KclValue::UserVal(UserVal {
-                value: jval,
-                meta: vec![args.source_range.into()],
-            })
-        })
-        .collect();
+    let (array, start, f): (Vec<u64>, Sketch, FnAsArg<'_>) = FromArgs::from_args(&args, 0)?;
     let reduce_fn = FunctionParam {
         inner: f.func,
         fn_expr: f.expr,
@@ -115,7 +106,9 @@ pub async fn reduce(exec_state: &mut ExecState, args: Args) -> Result<KclValue,
         ctx: args.ctx.clone(),
         memory: *f.memory,
     };
-    inner_reduce(array, start, reduce_fn, exec_state, &args).await
+    inner_reduce(array, start, reduce_fn, exec_state, &args)
+        .await
+        .map(|sg| KclValue::UserVal(UserVal::new(sg.meta.clone(), sg)))
 }
 
 /// Take a starting value. Then, for each element of an array, calculate the next value,
@@ -132,52 +125,60 @@ pub async fn reduce(exec_state: &mut ExecState, args: Args) -> Result<KclValue,
 /// }
 /// decagon(5.0) |> close(%)
 /// ```
-/// ```no_run
-/// array = [1, 2, 3]
-/// sum = reduce(array, 0, (i, result_so_far) => { return i + result_so_far })
-/// assertEqual(sum, 6, 0.00001, "1 + 2 + 3 summed is 6")
-/// ```
-/// ```no_run
-/// fn add = (a, b) => { return a + b }
-/// fn sum = (array) => { return reduce(array, 0, add) }
-/// assertEqual(sum([1, 2, 3]), 6, 0.00001, "1 + 2 + 3 summed is 6")
-/// ```
 #[stdlib {
     name = "reduce",
 }]
 async fn inner_reduce<'a>(
-    array: Vec<KclValue>,
-    start: KclValue,
+    array: Vec<u64>,
+    start: Sketch,
     reduce_fn: FunctionParam<'a>,
     exec_state: &mut ExecState,
     args: &'a Args,
-) -> Result<KclValue, KclError> {
+) -> Result<Sketch, KclError> {
     let mut reduced = start;
-    for elem in array {
-        reduced = call_reduce_closure(elem, reduced, &reduce_fn, args.source_range, exec_state).await?;
+    for i in array {
+        reduced = call_reduce_closure(i, reduced, &reduce_fn, args.source_range, exec_state).await?;
     }
 
     Ok(reduced)
 }
 
 async fn call_reduce_closure<'a>(
-    elem: KclValue,
-    start: KclValue,
+    i: u64,
+    start: Sketch,
     reduce_fn: &FunctionParam<'a>,
     source_range: SourceRange,
     exec_state: &mut ExecState,
-) -> Result<KclValue, KclError> {
+) -> Result<Sketch, KclError> {
     // Call the reduce fn for this repetition.
-    let reduce_fn_args = vec![elem, start];
+    let reduce_fn_args = vec![
+        KclValue::UserVal(UserVal {
+            value: serde_json::Value::Number(i.into()),
+            meta: vec![source_range.into()],
+        }),
+        KclValue::new_user_val(start.meta.clone(), start),
+    ];
     let transform_fn_return = reduce_fn.call(exec_state, reduce_fn_args).await?;
 
     // Unpack the returned transform object.
     let source_ranges = vec![source_range];
-    let out = transform_fn_return.ok_or_else(|| {
+    let closure_retval = transform_fn_return.ok_or_else(|| {
         KclError::Semantic(KclErrorDetails {
             message: "Reducer function must return a value".to_string(),
             source_ranges: source_ranges.clone(),
         })
     })?;
+    let Some(out) = closure_retval.as_user_val() else {
+        return Err(KclError::Semantic(KclErrorDetails {
+            message: "Reducer function must return a UserValue".to_string(),
+            source_ranges: source_ranges.clone(),
+        }));
+    };
+    let Some((out, _meta)) = out.get() else {
+        return Err(KclError::Semantic(KclErrorDetails {
+            message: "Reducer function must return a Sketch".to_string(),
+            source_ranges: source_ranges.clone(),
+        }));
+    };
     Ok(out)
 }

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

@@ -21,7 +21,7 @@ use crate::{
     },
     std::{
         utils::{
-            arc_angles, arc_start_center_and_end, get_tangent_point_from_previous_arc, get_tangential_arc_to_info,
+            arc_angles, arc_center_and_end, get_tangent_point_from_previous_arc, get_tangential_arc_to_info,
             get_x_component, get_y_component, intersection_with_parallel_line, TangentialArcInfoInput,
         },
         Args,
@@ -1485,17 +1485,6 @@ pub async fn arc(_exec_state: &mut ExecState, args: Args) -> Result<KclValue, Kc
     Ok(KclValue::new_user_val(new_sketch.meta.clone(), new_sketch))
 }
 
-/// Squared distance between two points
-fn distance_squared(a: Point2d, b: Point2d) -> f64 {
-    let v = Point2d { 
-        x: b.x - a.x,
-        y: b.y - a.y, 
-    };
-    let dot = v.x * v.x + v.y * v.y;
-
-    dot
-}
-
 /// Draw a curved line segment along an imaginary circle.
 /// The arc is constructed such that the current position of the sketch is
 /// placed along an imaginary circle of the specified radius, at angleStart
@@ -1535,31 +1524,9 @@ pub(crate) async fn inner_arc(
             angle_end,
             radius,
         } => {
-            let mut a_start = Angle::from_degrees(*angle_start);
-            let mut a_end = Angle::from_degrees(*angle_end);
-
-            //duplicating engine logic to make sure this is _exactly_ what engine is doing - mike
-            // if a_start.to_degrees() > a_end.to_degrees() {
-            //     // this implies a clockwise arc, so swap the angles to a matching counter-clockwise arc
-            //     std::mem::swap(&mut a_start, &mut a_end);
-            // }
-
-            let (mut start, center, mut end) = arc_start_center_and_end(from, a_start, a_end, *radius);
-            let desired_start = from;            
-            let dist1 = distance_squared(start, desired_start);
-            let dist2 = distance_squared(end, desired_start);
-
-            #[cfg(target_arch = "wasm32")]
-            {
-                web_sys::console::log_1(&format!("testing {dist1} vs {dist2}!").into());
-            }
-
-            if !(dist2 < dist1) { //flipped from engine ????????????
-                #[cfg(target_arch = "wasm32")]
-                web_sys::console::log_1(&format!("swapping!").into());
-                std::mem::swap(&mut start, &mut end);
-            }        
-
+            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);
             (center, a_start, a_end, *radius, end)
         }
         ArcData::CenterToRadius { center, to, radius } => {
@@ -1704,7 +1671,7 @@ async fn inner_tangential_arc(
             // but the above logic *should* capture that behavior
             let start_angle = previous_end_tangent + tangent_to_arc_start_angle;
             let end_angle = start_angle + offset;
-            let (_, center, to) = arc_start_center_and_end(from, start_angle, end_angle, radius);
+            let (center, to) = arc_center_and_end(from, start_angle, end_angle, radius);
 
             args.batch_modeling_cmd(
                 id,

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

@@ -204,76 +204,21 @@ pub fn get_x_component(angle: Angle, y: f64) -> Point2d {
     Point2d { x, y }.scale(sign)
 }
 
-fn arc_center_and_end(from: Point2d, start_angle: Angle, end_angle: Angle, radius: f64) -> (Point2d, Point2d) {
-    let (_, center, end) = arc_start_center_and_end(from, start_angle, end_angle, radius);
-    (center, end)
-}
-
-pub fn arc_start_center_and_end(from: Point2d, start_angle: Angle, end_angle: Angle, radius: f64) -> (Point2d, Point2d, Point2d) {
+pub fn arc_center_and_end(from: Point2d, start_angle: Angle, end_angle: Angle, radius: f64) -> (Point2d, Point2d) {
     let start_angle = start_angle.to_radians();
     let end_angle = end_angle.to_radians();
 
-    let eval = |t: f64, radius: f64, center: Point2d| { //UNUSED (this didn't work either for some reason.. - mike)
-        //HACK - using this as an example to demonstrate that even something as simple as an arc can be problematic to 
-        //duplicate this type of logic on the frontend side because of all the little edge cases 
-        //we must come up with a better strategy to avoid this sort of stuff in the future.
-        //having to manually port this sort of code directly into rust is error-prone, and 
-        //really isn't a good usage of dev time - mike    
-        let sin_of_pi = if ((4.0*PI).sin()).abs() > PI.sin().abs() {
-            4.0*PI.sin().abs()
-        } else {
-            PI.sin().abs()
-        };
-
-        let cos_of_pi_over_2 = if (4.5*PI).cos().abs() > (0.5*PI).sin().abs() {
-            (4.5*PI).cos().abs()
-        } else {
-            (0.5*PI).sin().abs()
-        };
-        
-        let mut c = t.cos();
-        let mut s = t.sin();
-
-        if c.abs() <= cos_of_pi_over_2 {
-            c = 0.0;
-            s = if s < 0.0 { -1.0 } else { 1.0 };
-        } else if s.abs() <= sin_of_pi {
-            s = 0.0;
-            c = if c < 0.0 { -1.0 } else { 1.0 };
-        }
-
-        Point2d {
-            x: center.x + radius * c,
-            y: center.y + radius * s,
-        }
-    };
-
     let center = Point2d {
         x: -1.0 * (radius * start_angle.cos() - from.x),
         y: -1.0 * (radius * start_angle.sin() - from.y),
     };
 
-    //let start = eval(start_angle, radius, center);
-    //let end = eval(end_angle, radius, center);
-
-    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(),
     };
 
-    #[cfg(target_arch = "wasm32")]
-    {
-        let start_deg = start_angle.to_degrees();
-        let end_deg = end_angle.to_degrees();
-        web_sys::console::log_1(&format!("Arc testing {start_deg:?}, {end_deg:?} -> center: {center:?}, start: {start:?} end: {end:?}").into());
-    }
-
-    (start, center, end)
+    (center, end)
 }
 
 pub fn arc_angles(

yarn.lock

@@ -2075,10 +2075,10 @@
     "@jridgewell/resolve-uri" "^3.1.0"
     "@jridgewell/sourcemap-codec" "^1.4.14"
 
-"@kittycad/lib@2.0.7":
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/@kittycad/lib/-/lib-2.0.7.tgz#63e9c81fc7705c9d0c5fab5939e5d839ec6f393b"
-  integrity sha512-P26rRZ0KF8C3zhEG2beLlkTJhTPtJF6Nn1wg7w1MxXNvK9RZF6P7DcXqdIh7nJGQt72+JrXoPmApB8Z/R1gQRg==
+"@kittycad/lib@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@kittycad/lib/-/lib-2.0.1.tgz#d3f1c80d9903452b0b9df378c72ed1e83b19a73d"
+  integrity sha512-VYunezWS+cNZbdKfVkB3zg2YbDCQEb/AjzER85+yyDAlTU5PL4paQDpNlEI6icSglDGRUIR4Er/bRFj68r3UQg==
   dependencies:
     openapi-types "^12.0.0"
     ts-node "^10.9.1"
@@ -3780,13 +3780,6 @@ chokidar@^3.5.3:
   optionalDependencies:
     fsevents "~2.3.2"
 
-chokidar@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-4.0.1.tgz#4a6dff66798fb0f72a94f616abbd7e1a19f31d41"
-  integrity sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==
-  dependencies:
-    readdirp "^4.0.1"
-
 chownr@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
@@ -8162,11 +8155,6 @@ readable-stream@~2.3.6:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readdirp@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-4.0.2.tgz#388fccb8b75665da3abffe2d8f8ed59fe74c230a"
-  integrity sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==
-
 readdirp@~3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
@@ -8785,7 +8773,16 @@ 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@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  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==
@@ -8879,7 +8876,14 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm: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==
@@ -9753,7 +9757,16 @@ 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@^7.0.0:
+"wrap-ansi-cjs@npm: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==