Check settings file exists before checking its contents

.github/ci-cd-scripts/playwright-browser-chrome.sh

@@ -4,9 +4,9 @@ set -euo pipefail
 if [[ ! -f "test-results/.last-run.json" ]]; then
     # if no last run artifact, than run plawright normally
     echo "run playwright normally"
-    if [[ "$3" == ubuntu-latest* ]]; then
+    if [[ "$3" == "ubuntu-latest" ]]; then
         yarn test:playwright:browser:chrome:ubuntu -- --shard=$1/$2 || true
-    elif [[ "$3" == windows-latest* ]]; then
+    elif [[ "$3" == "windows-latest" ]]; then
         yarn test:playwright:browser:chrome:windows -- --shard=$1/$2 || true
     else
         echo "Do not run playwright. Unable to detect os runtime."
@@ -26,9 +26,9 @@ while [[ $retry -le $max_retrys ]]; do
         if [[ $failed_tests -gt 0 ]]; then
             echo "retried=true" >>$GITHUB_OUTPUT
             echo "run playwright with last failed tests and retry $retry"
-            if [[ "$3" == ubuntu-latest* ]]; then
+            if [[ "$3" == "ubuntu-latest" ]]; then
                 yarn test:playwright:browser:chrome:ubuntu -- --last-failed || true
-            elif [[ "$3" == windows-latest* ]]; then
+            elif [[ "$3" == "windows-latest" ]]; then
                 yarn test:playwright:browser:chrome:windows -- --last-failed || true
             else
                 echo "Do not run playwright. Unable to detect os runtime."

.github/ci-cd-scripts/playwright-electron.sh

@@ -4,11 +4,11 @@ set -euo pipefail
 if [[ ! -f "test-results/.last-run.json" ]]; then
     # if no last run artifact, than run plawright normally
     echo "run playwright normally"
-        if [[ "$1" == ubuntu-latest* ]]; then
+        if [[ "$1" == "ubuntu-latest" ]]; then
             xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn test:playwright:electron:ubuntu || true
-        elif [[ "$1" == windows-latest* ]]; then
+        elif [[ "$1" == "windows-latest" ]]; then
             yarn test:playwright:electron:windows || true
-        elif [[ "$1" == macos-14* ]]; then
+        elif [[ "$1" == "macos-14" ]]; then
             yarn test:playwright:electron:macos || true
         else
             echo "Do not run playwright. Unable to detect os runtime."
@@ -28,11 +28,11 @@ while [[ $retry -le $max_retrys ]]; do
         if [[ $failed_tests -gt 0 ]]; then
             echo "retried=true" >>$GITHUB_OUTPUT
             echo "run playwright with last failed tests and retry $retry"
-            if [[ "$1" == ubuntu-latest* ]]; then
+            if [[ "$1" == "ubuntu-latest" ]]; then
                 xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn test:playwright:electron:ubuntu -- --last-failed || true
-            elif [[ "$1" == windows-latest* ]]; then
+            elif [[ "$1" == "windows-latest" ]]; then
                 yarn test:playwright:electron:windows -- --last-failed || true
-            elif [[ "$1" == macos-14* ]]; then
+            elif [[ "$1" == "macos-14" ]]; then
                 yarn test:playwright:electron:macos -- --last-failed || true
             else
                 echo "Do not run playwright. Unable to detect os runtime."

.github/dependabot.yml

@@ -8,21 +8,21 @@ updates:
     - package-ecosystem: 'npm' # See documentation for possible values
       directory: '/' # Location of package manifests
       schedule:
-          interval: 'weekly'
+          interval: 'daily'
       reviewers:
           - franknoirot
           - irev-dev
     - package-ecosystem: 'github-actions' # See documentation for possible values
       directory: '/' # Location of package manifests
       schedule:
-          interval: 'weekly'
+          interval: 'daily'
       reviewers:
           - adamchalmers
           - jessfraz
     - package-ecosystem: 'cargo' # See documentation for possible values
       directory: '/src/wasm-lib/' # Location of package manifests
       schedule:
-          interval: 'weekly'
+          interval: 'daily'
       reviewers:
           - adamchalmers
           - jessfraz

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

@@ -85,7 +85,7 @@ jobs:
       - 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
+          yq -i '.publish[0].url = "https://dl.zoo.dev/releases/modeling-app/updater-test-release-notes"' electron-builder.yml
 
       - uses: actions/upload-artifact@v3
         if: ${{ env.CUT_RELEASE_PR == 'true' }}
@@ -181,7 +181,6 @@ jobs:
       - name: Build the app (release)
         if: ${{ env.BUILD_RELEASE == 'true' }}
         env:
-          PUBLISH_FOR_PULL_REQUEST: true
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
           APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
@@ -361,17 +360,17 @@ jobs:
         run: "ls -R out"
 
       - name: Authenticate to Google Cloud
-        uses: 'google-github-actions/auth@v2.1.7'
+        uses: 'google-github-actions/auth@v2.1.6'
         with:
           credentials_json: '${{ secrets.GOOGLE_CLOUD_DL_SA }}'
 
       - name: Set up Google Cloud SDK
-        uses: google-github-actions/setup-gcloud@v2.1.2
+        uses: google-github-actions/setup-gcloud@v2.1.0
         with:
           project_id: ${{ env.GOOGLE_CLOUD_PROJECT_ID }}
 
       - name: Upload release files to public bucket
-        uses: google-github-actions/upload-cloud-storage@v2.2.1
+        uses: google-github-actions/upload-cloud-storage@v2.2.0
         with:
           path: out
           glob: 'Zoo*'
@@ -379,7 +378,7 @@ jobs:
           destination: ${{ env.BUCKET_DIR }}
 
       - name: Upload update endpoint to public bucket
-        uses: google-github-actions/upload-cloud-storage@v2.2.1
+        uses: google-github-actions/upload-cloud-storage@v2.2.0
         with:
           path: out
           glob: 'latest*'
@@ -387,7 +386,7 @@ jobs:
           destination: ${{ env.BUCKET_DIR }}
 
       - name: Upload download endpoint to public bucket
-        uses: google-github-actions/upload-cloud-storage@v2.2.1
+        uses: google-github-actions/upload-cloud-storage@v2.2.0
         with:
           path: last_download.json
           destination: ${{ env.BUCKET_DIR }}

.github/workflows/e2e-tests.yml

@@ -39,7 +39,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest-8-cores, windows-latest-8-cores]
+        os: [ubuntu-latest, windows-latest]
         shardIndex: [1, 2, 3, 4]
         shardTotal: [4]
     runs-on: ${{ matrix.os }}
@@ -227,7 +227,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest-8-cores, windows-latest-8-cores, macos-14-large]
+        os: [ubuntu-latest, windows-latest, macos-14]
     timeout-minutes: 60
     runs-on: ${{ matrix.os }}
     needs: check-rust-changes
@@ -287,7 +287,7 @@ jobs:
         brew install gnu-sed
         echo "/opt/homebrew/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH
     - name: Install vector
-      if:  ${{ startsWith(matrix.os, 'ubuntu') }}
+      if:  ${{ !startsWith(matrix.os, 'windows') }}
       shell: bash
       run: |
         curl --proto '=https' --tlsv1.2 -sSfL https://sh.vector.dev > /tmp/vector.sh

.github/workflows/static-analysis.yml

@@ -81,31 +81,6 @@ jobs:
       - name: Run codespell
         run: codespell --config .codespellrc # Edit this file to tweak the typo list and other configuration.
 
-  yarn-unit-test-kcl-samples:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'yarn'
-
-      - run: yarn install
-      - run: yarn build:wasm
-
-      - run: yarn simpleserver:bg
-        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
-
-      - name: Install Chromium Browser
-        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
-        run: yarn playwright install chromium --with-deps
-
-      - name: run unit tests for kcl samples
-        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
-        run: yarn test:unit:kcl-samples
-        env:
-          VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
 
   yarn-unit-test:
     runs-on: ubuntu-latest

docs/kcl/index.md

@@ -84,13 +84,9 @@ layout: manual
 * [`rem`](kcl/rem)
 * [`revolve`](kcl/revolve)
 * [`segAng`](kcl/segAng)
-* [`segEnd`](kcl/segEnd)
 * [`segEndX`](kcl/segEndX)
 * [`segEndY`](kcl/segEndY)
 * [`segLen`](kcl/segLen)
-* [`segStart`](kcl/segStart)
-* [`segStartX`](kcl/segStartX)
-* [`segStartY`](kcl/segStartY)
 * [`shell`](kcl/shell)
 * [`sin`](kcl/sin)
 * [`sqrt`](kcl/sqrt)

e2e/playwright/editor-tests.spec.ts

@@ -632,18 +632,16 @@ test.describe('Editor tests', () => {
 
       await u.waitForAuthSkipAppStart()
 
+      // this test might be brittle as we add and remove functions
+      // but should also be easy to update.
       // tests clicking on an option, selection the first option
       // and arrowing down to an option
 
       await u.codeLocator.click()
       await page.keyboard.type('sketch001 = start')
 
-      // expect there to be some auto complete options
+      // expect there to be six auto complete options
-      // exact number depends on the KCL stdlib, so let's just check it's > 0 for now.
+      await expect(page.locator('.cm-completionLabel')).toHaveCount(8)
-      await expect(async () => {
-        const children = await page.locator('.cm-completionLabel').count()
-        expect(children).toBeGreaterThan(0)
-      }).toPass()
       // this makes sure we can accept a completion with click
       await page.getByText('startSketchOn').click()
       await page.keyboard.type("'XZ'")
@@ -987,7 +985,7 @@ test.describe('Editor tests', () => {
     |> extrude(5, %)`)
   })
 
-  test.fixme(
+  test(
     `Can use the import stdlib function on a local OBJ file`,
     { tag: '@electron' },
     async ({ browserName }, testInfo) => {

e2e/playwright/file-tree.spec.ts

@@ -26,6 +26,10 @@ test.describe('integrations tests', () => {
     'Creating a new file or switching file while in sketchMode should exit sketchMode',
     { tag: '@electron' },
     async ({ tronApp, homePage, scene, editor, toolbar }) => {
+      test.skip(
+        process.platform === 'win32',
+        'windows times out will waiting for the execution indicator?'
+      )
       await tronApp.initialise({
         fixtures: { homePage, scene, editor, toolbar },
         folderSetupFn: async (dir) => {
@@ -51,6 +55,7 @@ test.describe('integrations tests', () => {
           sortBy: 'last-modified-desc',
         })
         await homePage.openProject('test-sample')
+        // windows times out here, hence the skip above
         await scene.waitForExecutionDone()
       })
       await test.step('enter sketch mode', async () => {
@@ -66,13 +71,10 @@ test.describe('integrations tests', () => {
         await toolbar.editSketch()
         await expect(toolbar.exitSketchBtn).toBeVisible()
       })
-
-      const fileName = 'Untitled.kcl'
       await test.step('check sketch mode is exited when creating new file', async () => {
         await toolbar.fileTreeBtn.click()
         await toolbar.expectFileTreeState(['main.kcl'])
-
+        await toolbar.createFile({ wait: true })
-        await toolbar.createFile({ fileName, waitForToastToDisappear: true })
 
         // check we're out of sketch mode
         await expect(toolbar.exitSketchBtn).not.toBeVisible()
@@ -91,10 +93,10 @@ test.describe('integrations tests', () => {
         })
         await toolbar.editSketch()
         await expect(toolbar.exitSketchBtn).toBeVisible()
-        await toolbar.expectFileTreeState(['main.kcl', fileName])
+        await toolbar.expectFileTreeState(['main.kcl', 'Untitled.kcl'])
       })
       await test.step('check sketch mode is exited when opening a different file', async () => {
-        await toolbar.openFile(fileName, { wait: false })
+        await toolbar.openFile('untitled.kcl', { wait: false })
 
         // check we're out of sketch mode
         await expect(toolbar.exitSketchBtn).not.toBeVisible()
@@ -107,7 +109,7 @@ test.describe('when using the file tree to', () => {
   const fromFile = 'main.kcl'
   const toFile = 'hello.kcl'
 
-  test.fixme(
+  test(
     `rename ${fromFile} to ${toFile}, and doesn't crash on reload and settings load`,
     { tag: '@electron' },
     async ({ browser: _, tronApp }, testInfo) => {
@@ -155,7 +157,7 @@ test.describe('when using the file tree to', () => {
     }
   )
 
-  test.fixme(
+  test(
     `create many new untitled files they increment their names`,
     { tag: '@electron' },
     async ({ browser: _, tronApp }, testInfo) => {
@@ -296,7 +298,7 @@ test.describe('when using the file tree to', () => {
     }
   )
 
-  test.fixme(
+  test(
     'loading small file, then large, then back to small',
     {
       tag: '@electron',

e2e/playwright/fixtures/sceneFixture.ts

@@ -195,7 +195,7 @@ export class SceneFixture {
   }
 
   waitForExecutionDone = async () => {
-    await expect(this.exeIndicator).toBeVisible({ timeout: 30000 })
+    await expect(this.exeIndicator).toBeVisible()
   }
 
   expectPixelColor = async (

e2e/playwright/fixtures/toolbarFixture.ts

@@ -16,7 +16,6 @@ export class ToolbarFixture {
   fileCreateToast!: Locator
   filePane!: Locator
   exeIndicator!: Locator
-  treeInputField!: Locator
 
   constructor(page: Page) {
     this.page = page
@@ -32,7 +31,6 @@ export class ToolbarFixture {
     this.editSketchBtn = page.getByText('Edit Sketch')
     this.fileTreeBtn = page.locator('[id="files-button-holder"]')
     this.createFileBtn = page.getByTestId('create-file-button')
-    this.treeInputField = page.getByTestId('tree-input-field')
 
     this.filePane = page.locator('#files-pane')
     this.fileCreateToast = page.getByText('Successfully created')
@@ -61,15 +59,10 @@ export class ToolbarFixture {
   expectFileTreeState = async (expected: string[]) => {
     await expect.poll(this._serialiseFileTree).toEqual(expected)
   }
-  createFile = async (args: {
+  createFile = async ({ wait }: { wait: boolean } = { wait: false }) => {
-    fileName: string
-    waitForToastToDisappear: boolean
-  }) => {
     await this.createFileBtn.click()
-    await this.treeInputField.fill(args.fileName)
-    await this.treeInputField.press('Enter')
     await expect(this.fileCreateToast).toBeVisible()
-    if (args.waitForToastToDisappear) {
+    if (wait) {
       await this.fileCreateToast.waitFor({ state: 'detached' })
     }
   }

e2e/playwright/lib/console-error-whitelist.ts

@@ -18,7 +18,7 @@ export const isErrorWhitelisted = (exception: Error) => {
     {
       name: '"{"kind"',
       message:
-        '"engine","sourceRanges":[[0,0,0]],"msg":"Failed to get string from response from engine: `JsValue(undefined)`"}"',
+        '"engine","sourceRanges":[[0,0]],"msg":"Failed to get string from response from engine: `JsValue(undefined)`"}"',
       stack: '',
       foundInSpec: 'e2e/playwright/testing-settings.spec.ts',
       project: 'Google Chrome',
@@ -156,8 +156,8 @@ export const isErrorWhitelisted = (exception: Error) => {
     {
       name: 'Unhandled Promise Rejection',
       message:
-        '{"kind":"engine","sourceRanges":[[0,0,0]],"msg":"Failed to get string from response from engine: `JsValue(undefined)`"}',
+        '{"kind":"engine","sourceRanges":[[0,0]],"msg":"Failed to get string from response from engine: `JsValue(undefined)`"}',
-      stack: `Unhandled Promise Rejection: {"kind":"engine","sourceRanges":[[0,0,0]],"msg":"Failed to get string from response from engine: \`JsValue(undefined)\`"}
+      stack: `Unhandled Promise Rejection: {"kind":"engine","sourceRanges":[[0,0]],"msg":"Failed to get string from response from engine: \`JsValue(undefined)\`"}
     at unknown (http://localhost:3000/src/lang/std/engineConnection.ts:1245:26)`,
       foundInSpec:
         'e2e/playwright/onboarding-tests.spec.ts Click through each onboarding step',
@@ -253,7 +253,7 @@ export const isErrorWhitelisted = (exception: Error) => {
     {
       name: '{"kind"',
       stack: ``,
-      message: `engine","sourceRanges":[[0,0,0]],"msg":"Failed to wait for promise from engine: JsValue(\\"Force interrupt, executionIsStale, new AST requested\\")"}`,
+      message: `engine","sourceRanges":[[0,0]],"msg":"Failed to wait for promise from engine: JsValue(\\"Force interrupt, executionIsStale, new AST requested\\")"}`,
       project: 'Google Chrome',
       foundInSpec: 'e2e/playwright/testing-settings.spec.ts',
     },

e2e/playwright/projects.spec.ts

@@ -854,7 +854,7 @@ test(
   }
 )
 
-test.fixme(
+test(
   'Deleting projects, can delete individual project, can still create projects after deleting all',
   { tag: '@electron' },
   async ({ browserName }, testInfo) => {
@@ -1490,6 +1490,7 @@ test(
           'function_sketch.kcl',
           'function_sketch_with_position.kcl',
           'global-tags.kcl',
+          'helix_ccw.kcl',
           'helix_defaults.kcl',
           'helix_defaults_negative_extrude.kcl',
           'helix_with_length.kcl',
@@ -1669,8 +1670,7 @@ test(
   }
 )
 
-// Flaky
+test(
-test.fixme(
   'Original project name persist after onboarding',
   { tag: '@electron' },
   async ({ browserName }, testInfo) => {

e2e/playwright/snapshot-tests.spec.ts

@@ -1031,7 +1031,7 @@ test.describe('Grid visibility', { tag: '@snapshot' }, () => {
   })
 })
 
-test.fixme('theme persists', async ({ page, context }) => {
+test('theme persists', async ({ page, context }) => {
   const u = await getUtils(page)
   await context.addInitScript(async () => {
     localStorage.setItem(

e2e/playwright/testing-settings.spec.ts

@@ -1,5 +1,6 @@
 import { test, expect } from '@playwright/test'
 import * as fsp from 'fs/promises'
+import * as fs from 'fs'
 import { join } from 'path'
 import {
   getUtils,
@@ -304,6 +305,21 @@ test.describe('Testing settings', () => {
       const projectLink = page.getByText('bracket')
       const logoLink = page.getByTestId('app-logo')
 
+      async function confirmThemeWasWritten(filePath: string, value: string) {
+        return expect
+          .poll(
+            async () => {
+              const fileExists = await fs.existsSync(filePath)
+              return fileExists ? fsp.readFile(filePath, 'utf-8') : ''
+            },
+            {
+              message: 'Setting should now be written to the file',
+              timeout: 5_000,
+            }
+          )
+          .toContain(`themeColor = "${value}"`)
+      }
+
       await test.step('Set user theme color on home', async () => {
         await expect(settingsOpenButton).toBeVisible()
         await settingsOpenButton.click()
@@ -311,14 +327,8 @@ test.describe('Testing settings', () => {
         await expect(userSettingsTab).toBeChecked()
         await themeColorSetting.fill(userThemeColor)
         await expect(logoLink).toHaveCSS('--primary-hue', userThemeColor)
+        await confirmThemeWasWritten(tempUserSettingsFilePath, userThemeColor)
         await settingsCloseButton.click()
-        await expect
-          .poll(async () => fsp.readFile(tempUserSettingsFilePath, 'utf-8'), {
-            message: 'Setting should now be written to the file',
-            timeout: 5_000,
-          })
-          .toContain(`themeColor = "${userThemeColor}"`)
-        // Only close the button after we've confirmed
       })
 
       await test.step('Set project theme color', async () => {
@@ -329,29 +339,25 @@ test.describe('Testing settings', () => {
         await expect(projectSettingsTab).toBeChecked()
         await themeColorSetting.fill(projectThemeColor)
         await expect(logoLink).toHaveCSS('--primary-hue', projectThemeColor)
-        await settingsCloseButton.click()
         // Make sure that the project settings file has been written to before continuing
-        await expect
+        await confirmThemeWasWritten(
-          .poll(
+          tempProjectSettingsFilePath,
-            async () => fsp.readFile(tempProjectSettingsFilePath, 'utf-8'),
+          projectThemeColor
-            {
-              message: 'Setting should now be written to the file',
-              timeout: 5_000,
-            }
         )
-          .toContain(`themeColor = "${projectThemeColor}"`)
+        await settingsCloseButton.click()
       })
 
       await test.step('Refresh the application and see project setting applied', async () => {
         // Make sure we're done navigating before we reload
         await expect(settingsCloseButton).not.toBeVisible()
-
         await page.reload({ waitUntil: 'domcontentloaded' })
+
         await expect(logoLink).toHaveCSS('--primary-hue', projectThemeColor)
       })
 
       await test.step(`Navigate back to the home view and see user setting applied`, async () => {
         await logoLink.click()
+        await page.screenshot({ path: 'out.png' })
         await expect(logoLink).toHaveCSS('--primary-hue', userThemeColor)
       })
 
@@ -415,7 +421,7 @@ test.describe('Testing settings', () => {
   )
 
   // It was much easier to test the logo color than the background stream color.
-  test.fixme(
+  test(
     'user settings reload on external change, on project and modeling view',
     { tag: '@electron' },
     async ({ browserName }, testInfo) => {

e2e/playwright/various.spec.ts

@@ -256,17 +256,13 @@ test('First escape in tool pops you out of tool, second exits sketch mode', asyn
   ).not.toBeVisible()
 })
 
-test.fixme(
+test('Basic default modeling and sketch hotkeys work', async ({ page }) => {
-  'Basic default modeling and sketch hotkeys work',
-  async ({ page }) => {
   const u = await getUtils(page)
 
   // This test can run long if it takes a little too long to load
   // the engine.
   test.setTimeout(90000)
   // This test has a weird bug on ubuntu
-    // Funny, it's flaking on Windows too :). I think there is just something
-    // actually wrong.
   test.skip(
     process.platform === 'linux',
     'weird playwright bug on ubuntu https://github.com/KittyCAD/modeling-app/issues/2444'
@@ -434,8 +430,7 @@ test.fixme(
     await page.keyboard.press('Escape')
     await page.waitForTimeout(100)
   }
-  }
+})
-)
 
 test('Delete key does not navigate back', async ({ page }) => {
   await page.setViewportSize({ width: 1200, height: 500 })

interface.d.ts

@@ -78,7 +78,6 @@ export interface IElectronAPI {
   ) => Electron.IpcRenderer
   onUpdateError: (callback: (value: { error: Error }) => void) => Electron
   appRestart: () => void
-  getArgvParsed: () => any
 }
 
 declare global {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zoo-modeling-app",
-  "version": "0.26.3",
+  "version": "0.26.2",
   "private": true,
   "productName": "Zoo Modeling App",
   "author": {
@@ -14,7 +14,7 @@
   "dependencies": {
     "@codemirror/autocomplete": "^6.17.0",
     "@codemirror/commands": "^6.6.0",
-    "@codemirror/language": "^6.10.3",
+    "@codemirror/language": "^6.10.2",
     "@codemirror/lint": "^6.8.1",
     "@codemirror/search": "^6.5.6",
     "@codemirror/state": "^6.4.1",
@@ -40,7 +40,7 @@
     "codemirror": "^6.0.1",
     "decamelize": "^6.0.0",
     "electron-squirrel-startup": "^1.0.1",
-    "electron-updater": "^6.3.9",
+    "electron-updater": "^6.3.0",
     "fuse.js": "^7.0.0",
     "html2canvas-pro": "^1.5.8",
     "isomorphic-fetch": "^3.0.0",
@@ -60,13 +60,12 @@
     "sketch-helpers": "^0.0.4",
     "three": "^0.166.1",
     "ua-parser-js": "^1.0.37",
-    "uuid": "^11.0.2",
+    "uuid": "^9.0.1",
     "vscode-jsonrpc": "^8.2.1",
     "vscode-languageserver-protocol": "^3.17.5",
     "vscode-uri": "^3.0.8",
     "web-vitals": "^3.5.2",
-    "xstate": "^5.17.4",
+    "xstate": "^5.17.4"
-    "yargs": "^17.7.2"
   },
   "scripts": {
     "start": "vite",
@@ -106,8 +105,7 @@
     "tronb:package": "electron-builder --config electron-builder.yml",
     "test-setup": "yarn install && yarn build:wasm",
     "test": "vitest --mode development",
-    "test:unit": "vitest run --mode development --exclude **/kclSamples.test.ts",
+    "test:unit": "vitest run --mode development",
-    "test:unit:kcl-samples": "vitest run --mode development ./src/lang/kclSamples.test.ts",
     "test:playwright:browser:chrome": "playwright test --project='Google Chrome' --config=playwright.ci.config.ts --grep-invert='@snapshot|@electron'",
     "test:playwright:browser:chrome:windows": "playwright test --project=\"Google Chrome\" --config=playwright.ci.config.ts --grep-invert=\"@snapshot|@electron|@skipWin\"",
     "test:playwright:browser:chrome:ubuntu": "playwright test --project='Google Chrome' --config=playwright.ci.config.ts --grep-invert='@snapshot|@electron|@skipLinux'",
@@ -119,8 +117,7 @@
     "test:playwright:electron:windows:local": "yarn tron:package && NODE_ENV=development playwright test --config=playwright.electron.config.ts --grep=@electron --grep-invert=@skipWin",
     "test:playwright:electron:macos:local": "yarn tron:package && NODE_ENV=development playwright test --config=playwright.electron.config.ts --grep=@electron --grep-invert=@skipMacos",
     "test:playwright:electron:ubuntu:local": "yarn tron:package && NODE_ENV=development playwright test --config=playwright.electron.config.ts --grep=@electron --grep-invert=@skipLinux",
-    "test:unit:local": "yarn simpleserver:bg && yarn test:unit; kill-port 3000",
+    "test:unit:local": "yarn simpleserver:bg && yarn test:unit; kill-port 3000"
-    "test:unit:kcl-samples:local": "yarn simpleserver:bg && yarn test:unit:kcl-samples; kill-port 3000"
   },
   "prettier": {
     "trailingComma": "es5",
@@ -147,8 +144,8 @@
     "@electron-forge/maker-deb": "^7.4.0",
     "@electron-forge/maker-rpm": "^7.4.0",
     "@electron-forge/maker-squirrel": "^7.4.0",
-    "@electron-forge/maker-wix": "^7.5.0",
+    "@electron-forge/maker-wix": "^7.4.0",
-    "@electron-forge/maker-zip": "^7.5.0",
+    "@electron-forge/maker-zip": "^7.4.0",
     "@electron-forge/plugin-auto-unpack-natives": "^7.4.0",
     "@electron-forge/plugin-fuses": "^7.4.0",
     "@electron-forge/plugin-vite": "^7.4.0",
@@ -174,7 +171,7 @@
     "@types/ua-parser-js": "^0.7.39",
     "@types/uuid": "^9.0.8",
     "@types/wicg-file-system-access": "^2023.10.5",
-    "@types/ws": "^8.5.13",
+    "@types/ws": "^8.5.10",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
     "@typescript-eslint/parser": "^5.0.0",
     "@vitejs/plugin-react": "^4.3.0",
@@ -190,7 +187,7 @@
     "eslint-plugin-css-modules": "^2.12.0",
     "eslint-plugin-import": "^2.30.0",
     "eslint-plugin-suggest-no-throw": "^1.0.0",
-    "happy-dom": "^15.10.2",
+    "happy-dom": "^14.3.10",
     "http-server": "^14.1.1",
     "husky": "^9.1.5",
     "kill-port": "^2.0.1",

src/App.tsx

@@ -22,10 +22,6 @@ import Gizmo from 'components/Gizmo'
 import { CoreDumpManager } from 'lib/coredump'
 import { UnitsMenu } from 'components/UnitsMenu'
 import { CameraProjectionToggle } from 'components/CameraProjectionToggle'
-import { maybeWriteToDisk } from 'lib/telemetry'
-maybeWriteToDisk()
-  .then(() => {})
-  .catch(() => {})
 
 export function App() {
   const { project, file } = useLoaderData() as IndexLoaderData

src/Router.tsx

@@ -8,7 +8,6 @@ import {
 } from 'react-router-dom'
 import { ErrorPage } from './components/ErrorPage'
 import { Settings } from './routes/Settings'
-import { Telemetry } from './routes/Telemetry'
 import Onboarding, { onboardingRoutes } from './routes/Onboarding'
 import SignIn from './routes/SignIn'
 import { Auth } from './Auth'
@@ -29,7 +28,6 @@ import {
   homeLoader,
   onboardingRedirectLoader,
   settingsLoader,
-  telemetryLoader,
 } from 'lib/routeLoaders'
 import { CommandBarProvider } from 'components/CommandBar/CommandBarProvider'
 import SettingsAuthProvider from 'components/SettingsAuthProvider'
@@ -45,7 +43,6 @@ import { coreDump } from 'lang/wasm'
 import { useMemo } from 'react'
 import { AppStateProvider } from 'AppState'
 import { reportRejection } from 'lib/trap'
-import { RouteProvider } from 'components/RouteProvider'
 import { ProjectsContextProvider } from 'components/ProjectsContextProvider'
 
 const createRouter = isDesktop() ? createHashRouter : createBrowserRouter
@@ -59,7 +56,6 @@ const router = createRouter([
      * inefficient re-renders, use the react profiler to see. */
     element: (
       <CommandBarProvider>
-        <RouteProvider>
         <SettingsAuthProvider>
           <LspProvider>
             <ProjectsContextProvider>
@@ -73,7 +69,6 @@ const router = createRouter([
             </ProjectsContextProvider>
           </LspProvider>
         </SettingsAuthProvider>
-        </RouteProvider>
       </CommandBarProvider>
     ),
     errorElement: <ErrorPage />,
@@ -129,16 +124,6 @@ const router = createRouter([
               },
             ],
           },
-          {
-            id: PATHS.FILE + 'TELEMETRY',
-            loader: telemetryLoader,
-            children: [
-              {
-                path: makeUrlPathRelative(PATHS.TELEMETRY),
-                element: <Telemetry />,
-              },
-            ],
-          },
         ],
       },
       {
@@ -164,11 +149,6 @@ const router = createRouter([
             loader: settingsLoader,
             element: <Settings />,
           },
-          {
-            path: makeUrlPathRelative(PATHS.TELEMETRY),
-            loader: telemetryLoader,
-            element: <Telemetry />,
-          },
         ],
       },
       {

src/commandLineArgs.ts

@@ -1,12 +0,0 @@
-import yargs from 'yargs'
-import { hideBin } from 'yargs/helpers'
-
-const argv = yargs(hideBin(process.argv))
-  .option('telemetry', {
-    alias: 't',
-    type: 'boolean',
-    description: 'Writes startup telemetry to file on disk.',
-  })
-  .parse()
-
-export default argv

src/components/CustomIcon.tsx

@@ -1161,29 +1161,6 @@ const CustomIconMap = {
       />
     </svg>
   ),
-  stopwatch: (
-    <svg
-      width="20"
-      height="20"
-      viewBox="0 0 20 20"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        fill-rule="evenodd"
-        clip-rule="evenodd"
-        d="M7.95705 5.99046C7.05643 6.44935 6.33654 7.19809 5.91336 8.11602C5.49019 9.03396 5.38838 10.0676 5.62434 11.0505C5.8603 12.0334 6.42029 12.9081 7.21408 13.5339C8.00787 14.1597 8.98922 14.5 10 14.5C11.0108 14.5 11.9921 14.1597 12.7859 13.5339C13.5797 12.9082 14.1397 12.0334 14.3757 11.0505C14.6116 10.0676 14.5098 9.03396 14.0866 8.11603C13.6635 7.19809 12.9436 6.44935 12.043 5.99046L12.497 5.09946C13.5977 5.66032 14.4776 6.57544 14.9948 7.69737C15.512 8.81929 15.6364 10.0827 15.348 11.2839C15.0596 12.4852 14.3752 13.5544 13.405 14.3192C12.4348 15.0841 11.2354 15.5 10 15.5C8.7646 15.5 7.56517 15.0841 6.59499 14.3192C5.6248 13.5544 4.94037 12.4852 4.65197 11.2839C4.36357 10.0827 4.488 8.81929 5.00522 7.69736C5.52243 6.57544 6.40231 5.66032 7.50306 5.09946L7.95705 5.99046Z"
-        fill="currentColor"
-      />
-      <path d="M10 5.5V4M10 4H8M10 4H12" stroke="currentColor" />
-      <path
-        fill-rule="evenodd"
-        clip-rule="evenodd"
-        d="M12.8536 7.85356L10.3536 10.3536C10.1583 10.5488 9.84171 10.5488 9.64645 10.3536C9.45118 10.1583 9.45118 9.84172 9.64645 9.64645L12.1464 7.14645L12.8536 7.85356Z"
-        fill="currentColor"
-      />
-    </svg>
-  ),
 } as const
 
 export type CustomIconName = keyof typeof CustomIconMap

src/components/FileMachineProvider.tsx

@@ -29,7 +29,6 @@ import {
   KclSamplesManifestItem,
 } from 'lib/getKclSamplesManifest'
 import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
-import { markOnce } from 'lib/performance'
 
 type MachineContext<T extends AnyStateMachine> = {
   state: StateFrom<T>
@@ -55,7 +54,6 @@ export const FileMachineProvider = ({
   )
 
   useEffect(() => {
-    markOnce('code/didLoadFile')
     async function fetchKclSamples() {
       setKclSamples(await getKclSamplesManifest())
     }

src/components/FileTree.tsx

@@ -6,10 +6,10 @@ import { Dispatch, useCallback, useRef, useState } from 'react'
 import { useNavigate, useRouteLoaderData } from 'react-router-dom'
 import { Disclosure } from '@headlessui/react'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import { faChevronRight, faPencil } from '@fortawesome/free-solid-svg-icons'
+import { faChevronRight } from '@fortawesome/free-solid-svg-icons'
 import { useFileContext } from 'hooks/useFileContext'
 import styles from './FileTree.module.css'
-import { sortFilesAndDirectories } from 'lib/desktopFS'
+import { sortProject } from 'lib/desktopFS'
 import { FILE_EXT } from 'lib/constants'
 import { CustomIcon } from './CustomIcon'
 import { codeManager, kclManager } from 'lib/singletons'
@@ -27,36 +27,6 @@ function getIndentationCSS(level: number) {
   return `calc(1rem * ${level + 1})`
 }
 
-function TreeEntryInput(props: {
-  level: number
-  onSubmit: (value: string) => void
-}) {
-  const [value, setValue] = useState('')
-  const onKeyPress = (e: React.KeyboardEvent<HTMLInputElement>) => {
-    if (e.key !== 'Enter') return
-    props.onSubmit(value)
-  }
-
-  return (
-    <label>
-      <span className="sr-only">Entry input</span>
-      <input
-        data-testid="tree-input-field"
-        type="text"
-        autoFocus
-        autoCapitalize="off"
-        autoCorrect="off"
-        className="w-full py-1 bg-transparent text-chalkboard-100 placeholder:text-chalkboard-70 dark:text-chalkboard-10 dark:placeholder:text-chalkboard-50 focus:outline-none focus:ring-0"
-        onBlur={() => props.onSubmit(value)}
-        onChange={(e) => setValue(e.target.value)}
-        onKeyPress={onKeyPress}
-        style={{ paddingInlineStart: getIndentationCSS(props.level) }}
-        value={value}
-      />
-    </label>
-  )
-}
-
 function RenameForm({
   fileOrDir,
   onSubmit,
@@ -143,44 +113,23 @@ function DeleteFileTreeItemDialog({
 }
 
 const FileTreeItem = ({
-  parentDir,
   project,
   currentFile,
-  lastDirectoryClicked,
   fileOrDir,
   onNavigateToFile,
-  onClickDirectory,
-  onCreateFile,
-  onCreateFolder,
-  newTreeEntry,
   level = 0,
-  treeSelection,
-  setTreeSelection,
 }: {
-  parentDir: FileEntry | undefined
   project?: IndexLoaderData['project']
   currentFile?: IndexLoaderData['file']
-  lastDirectoryClicked?: FileEntry
   fileOrDir: FileEntry
   onNavigateToFile?: () => void
-  onClickDirectory: (
-    open: boolean,
-    path: FileEntry,
-    parentDir: FileEntry | undefined
-  ) => void
-  onCreateFile: (name: string) => void
-  onCreateFolder: (name: string) => void
-  newTreeEntry: TreeEntry
   level?: number
-  treeSelection: FileEntry | undefined
-  setTreeSelection: Dispatch<React.SetStateAction<FileEntry | undefined>>
 }) => {
   const { send: fileSend, context: fileContext } = useFileContext()
   const { onFileOpen, onFileClose } = useLspContext()
   const navigate = useNavigate()
   const [isConfirmingDelete, setIsConfirmingDelete] = useState(false)
   const isCurrentFile = fileOrDir.path === currentFile?.path
-  const isFileOrDirHighlighted = treeSelection?.path === fileOrDir?.path
   const itemRef = useRef(null)
 
   // Since every file or directory gets its own FileTreeItem, we can do this.
@@ -189,6 +138,8 @@ const FileTreeItem = ({
   // the ReactNodes are destroyed, so is this listener :)
   useFileSystemWatcher(
     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) {
@@ -196,8 +147,6 @@ const FileTreeItem = ({
           return
         }
 
-      // Don't try to read a file that was removed.
-      if (isCurrentFile && eventType !== 'unlink') {
         let code = await window.electron.readFile(path, { encoding: 'utf-8' })
         code = normalizeLineEndings(code)
         codeManager.updateCodeStateEditor(code)
@@ -207,10 +156,6 @@ const FileTreeItem = ({
     [fileOrDir.path]
   )
 
-  const showNewTreeEntry =
-    newTreeEntry !== undefined &&
-    fileOrDir.path === fileContext.selectedDirectory.path
-
   const isRenaming = fileContext.itemsBeingRenamed.includes(fileOrDir.path)
   const removeCurrentItemFromRenaming = useCallback(
     () =>
@@ -234,6 +179,13 @@ const FileTreeItem = ({
     })
   }, [fileContext.itemsBeingRenamed, fileOrDir.path, fileSend])
 
+  const clickDirectory = () => {
+    fileSend({
+      type: 'Set selected directory',
+      directory: fileOrDir,
+    })
+  }
+
   function handleKeyUp(e: React.KeyboardEvent<HTMLButtonElement>) {
     if (e.metaKey && e.key === 'Backspace') {
       // Open confirmation dialog
@@ -242,13 +194,11 @@ const FileTreeItem = ({
       // Show the renaming form
       addCurrentItemToRenaming()
     } else if (e.code === 'Space') {
-      void handleClick()
+      handleClick()
     }
   }
 
-  async function handleClick() {
+  function handleClick() {
-    setTreeSelection(fileOrDir)
-
     if (fileOrDir.children !== null) return // Don't open directories
 
     if (fileOrDir.name?.endsWith(FILE_EXT) === false && project?.path) {
@@ -258,10 +208,12 @@ const FileTreeItem = ({
         `import("${fileOrDir.path.replace(project.path, '.')}")\n` +
           codeManager.code
       )
-      await codeManager.writeToFile()
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
+      codeManager.writeToFile()
 
       // Prevent seeing the model built one piece at a time when changing files
-      await kclManager.executeCode(true)
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
+      kclManager.executeCode(true)
     } else {
       // Let the lsp servers know we closed a file.
       onFileClose(currentFile?.path || null, project?.path || null)
@@ -270,19 +222,16 @@ const FileTreeItem = ({
       // Open kcl files
       navigate(`${PATHS.FILE}/${encodeURIComponent(fileOrDir.path)}`)
     }
-
     onNavigateToFile?.()
   }
 
-  // The below handles both the "root" of all directories and all subs. It's
-  // why some code is duplicated.
   return (
     <div className="contents" data-testid="file-tree-item" ref={itemRef}>
       {fileOrDir.children === null ? (
         <li
           className={
             'group m-0 p-0 border-solid border-0 hover:bg-primary/5 focus-within:bg-primary/5 dark:hover:bg-primary/20 dark:focus-within:bg-primary/20 ' +
-            (isFileOrDirHighlighted || isCurrentFile
+            (isCurrentFile
               ? '!bg-primary/10 !text-primary dark:!bg-primary/20 dark:!text-inherit'
               : '')
           }
@@ -293,7 +242,7 @@ const FileTreeItem = ({
               style={{ paddingInlineStart: getIndentationCSS(level) }}
               onClick={(e) => {
                 e.currentTarget.focus()
-                void handleClick()
+                handleClick()
               }}
               onKeyUp={handleKeyUp}
             >
@@ -319,13 +268,14 @@ const FileTreeItem = ({
                 <Disclosure.Button
                   className={
                     ' group border-none text-sm rounded-none p-0 m-0 flex items-center justify-start w-full py-0.5 hover:text-primary hover:bg-primary/5 dark:hover:text-inherit dark:hover:bg-primary/10' +
-                    (isFileOrDirHighlighted ? ' ui-open:bg-primary/10' : '')
+                    (fileContext.selectedDirectory.path.includes(fileOrDir.path)
+                      ? ' ui-open:bg-primary/10'
+                      : '')
                   }
                   style={{ paddingInlineStart: getIndentationCSS(level) }}
-                  onClick={(e) => {
+                  onClick={(e) => e.currentTarget.focus()}
-                    e.stopPropagation()
+                  onClickCapture={clickDirectory}
-                    onClickDirectory(open, fileOrDir, parentDir)
+                  onFocusCapture={clickDirectory}
-                  }}
                   onKeyDown={(e) => e.key === 'Enter' && e.preventDefault()}
                   onKeyUp={handleKeyUp}
                 >
@@ -367,69 +317,35 @@ const FileTreeItem = ({
               >
                 <ul
                   className="m-0 p-0"
-                  onClick={(e) => {
+                  onClickCapture={(e) => {
-                    e.stopPropagation()
+                    fileSend({
-                    onClickDirectory(open, fileOrDir, parentDir)
+                      type: 'Set selected directory',
+                      directory: fileOrDir,
+                    })
                   }}
-                >
+                  onFocusCapture={(e) =>
-                  {showNewTreeEntry && (
+                    fileSend({
-                    <div
+                      type: 'Set selected directory',
-                      className="flex items-center"
+                      directory: fileOrDir,
-                      style={{
+                    })
-                        paddingInlineStart: getIndentationCSS(level + 1),
-                      }}
-                    >
-                      <FontAwesomeIcon
-                        icon={faPencil}
-                        className="inline-block mr-2 m-0 p-0 w-2 h-2"
-                      />
-                      <TreeEntryInput
-                        level={-1}
-                        onSubmit={(value: string) =>
-                          newTreeEntry === 'file'
-                            ? onCreateFile(value)
-                            : onCreateFolder(value)
                   }
-                      />
+                >
-                    </div>
+                  {fileOrDir.children?.map((child) => (
-                  )}
-                  {sortFilesAndDirectories(fileOrDir.children || []).map(
-                    (child) => (
                     <FileTreeItem
-                        parentDir={fileOrDir}
                       fileOrDir={child}
                       project={project}
                       currentFile={currentFile}
-                        onCreateFile={onCreateFile}
-                        onCreateFolder={onCreateFolder}
-                        newTreeEntry={newTreeEntry}
-                        lastDirectoryClicked={lastDirectoryClicked}
-                        onClickDirectory={onClickDirectory}
                       onNavigateToFile={onNavigateToFile}
                       level={level + 1}
                       key={level + '-' + child.path}
-                        treeSelection={treeSelection}
-                        setTreeSelection={setTreeSelection}
                     />
-                    )
+                  ))}
-                  )}
-                  {!showNewTreeEntry && fileOrDir.children?.length === 0 && (
-                    <div
-                      className="flex items-center text-chalkboard-50"
-                      style={{
-                        paddingInlineStart: getIndentationCSS(level + 1),
-                      }}
-                    >
-                      <div>No files</div>
-                    </div>
-                  )}
                 </ul>
               </Disclosure.Panel>
             </div>
           )}
         </Disclosure>
       )}
-
       {isConfirmingDelete && (
         <DeleteFileTreeItemDialog
           fileOrDir={fileOrDir}
@@ -493,15 +409,27 @@ interface FileTreeProps {
   ) => void
 }
 
-export const FileTreeMenu = ({
+export const FileTreeMenu = () => {
-  onCreateFile,
+  const { send } = useFileContext()
-  onCreateFolder,
+  const { send: modelingSend } = useModelingContext()
-}: {
+
-  onCreateFile: () => void
+  function createFile() {
-  onCreateFolder: () => void
+    send({
-}) => {
+      type: 'Create file',
-  useHotkeyWrapper(['mod + n'], onCreateFile)
+      data: { name: '', makeDir: false, shouldSetToRename: true },
-  useHotkeyWrapper(['mod + shift + n'], onCreateFolder)
+    })
+    modelingSend({ type: 'Cancel' })
+  }
+
+  function createFolder() {
+    send({
+      type: 'Create file',
+      data: { name: '', makeDir: true, shouldSetToRename: true },
+    })
+  }
+
+  useHotkeyWrapper(['mod + n'], createFile)
+  useHotkeyWrapper(['mod + shift + n'], createFolder)
 
   return (
     <>
@@ -514,7 +442,7 @@ export const FileTreeMenu = ({
           bgClassName: 'bg-transparent',
         }}
         className="!p-0 !bg-transparent hover:text-primary border-transparent hover:border-primary !outline-none"
-        onClick={onCreateFile}
+        onClick={createFile}
       >
         <Tooltip position="bottom-right" delay={750}>
           Create file
@@ -530,7 +458,7 @@ export const FileTreeMenu = ({
           bgClassName: 'bg-transparent',
         }}
         className="!p-0 !bg-transparent hover:text-primary border-transparent hover:border-primary !outline-none"
-        onClick={onCreateFolder}
+        onClick={createFolder}
       >
         <Tooltip position="bottom-right" delay={750}>
           Create folder
@@ -540,110 +468,30 @@ export const FileTreeMenu = ({
   )
 }
 
-type TreeEntry = 'file' | 'folder' | undefined
-
-export const useFileTreeOperations = () => {
-  const { send } = useFileContext()
-  const { send: modelingSend } = useModelingContext()
-
-  // As long as this is undefined, a new "file tree entry prompt" is not shown.
-  const [newTreeEntry, setNewTreeEntry] = useState<TreeEntry>(undefined)
-
-  function createFile(args: { dryRun: boolean; name?: string }) {
-    if (args.dryRun) {
-      setNewTreeEntry('file')
-      return
-    }
-
-    // Clear so that the entry prompt goes away.
-    setNewTreeEntry(undefined)
-
-    if (!args.name) return
-
-    send({
-      type: 'Create file',
-      data: { name: args.name, makeDir: false, shouldSetToRename: false },
-    })
-    modelingSend({ type: 'Cancel' })
-  }
-
-  function createFolder(args: { dryRun: boolean; name?: string }) {
-    if (args.dryRun) {
-      setNewTreeEntry('folder')
-      return
-    }
-
-    setNewTreeEntry(undefined)
-
-    if (!args.name) return
-
-    send({
-      type: 'Create file',
-      data: { name: args.name, makeDir: true, shouldSetToRename: false },
-    })
-  }
-
-  return {
-    createFile,
-    createFolder,
-    newTreeEntry,
-  }
-}
-
 export const FileTree = ({
   className = '',
   onNavigateToFile: closePanel,
 }: FileTreeProps) => {
-  const { createFile, createFolder, newTreeEntry } = useFileTreeOperations()
-
   return (
     <div className={className}>
       <div className="flex items-center gap-1 px-4 py-1 bg-chalkboard-20/40 dark:bg-chalkboard-80/50 border-b border-b-chalkboard-30 dark:border-b-chalkboard-80">
         <h2 className="flex-1 m-0 p-0 text-sm mono">Files</h2>
-        <FileTreeMenu
+        <FileTreeMenu />
-          onCreateFile={() => createFile({ dryRun: true })}
-          onCreateFolder={() => createFolder({ dryRun: true })}
-        />
       </div>
-      <FileTreeInner
+      <FileTreeInner onNavigateToFile={closePanel} />
-        onNavigateToFile={closePanel}
-        newTreeEntry={newTreeEntry}
-        onCreateFile={(name: string) => createFile({ dryRun: false, name })}
-        onCreateFolder={(name: string) => createFolder({ dryRun: false, name })}
-      />
     </div>
   )
 }
 
 export const FileTreeInner = ({
   onNavigateToFile,
-  onCreateFile,
-  onCreateFolder,
-  newTreeEntry,
 }: {
-  onCreateFile: (name: string) => void
-  onCreateFolder: (name: string) => void
-  newTreeEntry: TreeEntry
   onNavigateToFile?: () => void
 }) => {
   const loaderData = useRouteLoaderData(PATHS.FILE) as IndexLoaderData
   const { send: fileSend, context: fileContext } = useFileContext()
   const { send: modelingSend } = useModelingContext()
 
-  const [lastDirectoryClicked, setLastDirectoryClicked] = useState<
-    FileEntry | undefined
-  >(undefined)
-
-  const [treeSelection, setTreeSelection] = useState<FileEntry | undefined>(
-    loaderData.file
-  )
-
-  const onNavigateToFile_ = () => {
-    // Reset modeling state when navigating to a new file
-    onNavigateToFile?.()
-    modelingSend({ type: 'Cancel' })
-  }
-
   // Refresh the file tree when there are changes.
   useFileSystemWatcher(
     async (eventType, path) => {
@@ -653,13 +501,6 @@ export const FileTreeInner = ({
       const isCurrentFile = loaderData.file?.path === path
       const hasChanged = eventType === 'change'
       if (isCurrentFile && hasChanged) return
-
-      // If it's a settings file we wrote to already from the app ignore it.
-      if (codeManager.writeCausedByAppCheckedInFileTreeFileSystemWatcher) {
-        codeManager.writeCausedByAppCheckedInFileTreeFileSystemWatcher = false
-        return
-      }
-
       fileSend({ type: 'Refresh' })
     },
     [loaderData?.project?.path, fileContext.selectedDirectory.path].filter(
@@ -667,82 +508,34 @@ export const FileTreeInner = ({
     )
   )
 
-  const onTreeEntryInputSubmit = (value: string) => {
+  const clickDirectory = () => {
-    if (newTreeEntry === 'file') {
-      onCreateFile(value)
-      onNavigateToFile_()
-    } else {
-      onCreateFolder(value)
-    }
-  }
-
-  const onClickDirectory = (
-    open_: boolean,
-    fileOrDir: FileEntry,
-    parentDir: FileEntry | undefined
-  ) => {
-    // open true is closed... it's broken. Save me. I've inverted it here for
-    // sanity.
-    const open = !open_
-
-    const target = open ? fileOrDir : parentDir
-
-    // We're at the root, can't select anything further
-    if (!target) return
-
-    setTreeSelection(target)
-    setLastDirectoryClicked(target)
     fileSend({
       type: 'Set selected directory',
-      directory: target,
+      directory: fileContext.project,
     })
   }
 
-  const showNewTreeEntry =
-    newTreeEntry !== undefined &&
-    fileContext.selectedDirectory.path === loaderData.project?.path
-
   return (
-    <div className="relative">
     <div
       className="overflow-auto pb-12 absolute inset-0"
       data-testid="file-pane-scroll-container"
     >
-        <ul className="m-0 p-0 text-sm">
+      <ul className="m-0 p-0 text-sm" onClickCapture={clickDirectory}>
-          {showNewTreeEntry && (
+        {sortProject(fileContext.project?.children || []).map((fileOrDir) => (
-            <div
-              className="flex items-center"
-              style={{ paddingInlineStart: getIndentationCSS(0) }}
-            >
-              <FontAwesomeIcon
-                icon={faPencil}
-                className="inline-block mr-2 m-0 p-0 w-2 h-2"
-              />
-              <TreeEntryInput level={-1} onSubmit={onTreeEntryInputSubmit} />
-            </div>
-          )}
-          {sortFilesAndDirectories(fileContext.project?.children || []).map(
-            (fileOrDir) => (
           <FileTreeItem
-                parentDir={fileContext.project}
             project={fileContext.project}
             currentFile={loaderData?.file}
-                lastDirectoryClicked={lastDirectoryClicked}
             fileOrDir={fileOrDir}
-                onCreateFile={onCreateFile}
+            onNavigateToFile={() => {
-                onCreateFolder={onCreateFolder}
+              // Reset modeling state when navigating to a new file
-                newTreeEntry={newTreeEntry}
+              modelingSend({ type: 'Cancel' })
-                onClickDirectory={onClickDirectory}
+              onNavigateToFile?.()
-                onNavigateToFile={onNavigateToFile_}
+            }}
             key={fileOrDir.path}
-                treeSelection={treeSelection}
-                setTreeSelection={setTreeSelection}
           />
-            )
+        ))}
-          )}
       </ul>
     </div>
-    </div>
   )
 }
 

src/components/LowerRightControls.tsx

@@ -96,23 +96,6 @@ export function LowerRightControls({
             Report a bug
           </Tooltip>
         </a>
-        <Link
-          to={
-            location.pathname.includes(PATHS.FILE)
-              ? filePath + PATHS.TELEMETRY + '?tab=project'
-              : PATHS.HOME + PATHS.TELEMETRY
-          }
-          data-testid="telemetry-link"
-        >
-          <CustomIcon
-            name="stopwatch"
-            className={`w-5 h-5 ${linkOverrideClassName}`}
-          />
-          <span className="sr-only">Telemetry</span>
-          <Tooltip position="top" contentClassName="text-xs">
-            Telemetry
-          </Tooltip>
-        </Link>
         <Link
           to={
             location.pathname.includes(PATHS.FILE)

src/components/ModelingMachineProvider.tsx

@@ -158,12 +158,8 @@ export const ModelingMachineProvider = ({
         'enable copilot': () => {
           editorManager.setCopilotEnabled(true)
         },
-        // tsc reports this typing as perfectly fine, but eslint is complaining.
+        'sketch exit execute': ({ context: { store } }) => {
-        // It's actually nonsensical, so I'm quieting.
+          ;(async () => {
-        // eslint-disable-next-line @typescript-eslint/no-misused-promises
-        'sketch exit execute': async ({
-          context: { store },
-        }): Promise<void> => {
             // When cancelling the sketch mode we should disable sketch mode within the engine.
             await engineCommandManager.sendSceneCommand({
               type: 'modeling_cmd_req',
@@ -181,7 +177,7 @@ export const ModelingMachineProvider = ({
 
             store.videoElement?.pause()
 
-          return kclManager
+            kclManager
               .executeCode()
               .then(() => {
                 if (engineCommandManager.engineConnection?.idleMode) return
@@ -191,6 +187,7 @@ export const ModelingMachineProvider = ({
                 })
               })
               .catch(reportRejection)
+          })().catch(reportRejection)
         },
         'Set mouse state': assign(({ context, event }) => {
           if (event.type !== 'Set mouse state') return {}

src/components/ModelingSidebar/ModelingPane.tsx

@@ -48,7 +48,7 @@ export const ModelingPaneHeader = ({
           bgClassName: 'bg-transparent dark:bg-transparent',
         }}
         className="!p-0 !bg-transparent hover:text-primary border-transparent dark:!border-transparent hover:!border-primary dark:hover:!border-chalkboard-70 !outline-none"
-        onClick={() => onClose()}
+        onClick={onClose}
       >
         <Tooltip position="bottom-right" delay={750}>
           Close
@@ -59,12 +59,14 @@ export const ModelingPaneHeader = ({
 }
 
 export const ModelingPane = ({
+  title,
+  icon,
   id,
   children,
   className,
+  Menu,
   detailsTestId,
   onClose,
-  title,
   ...props
 }: ModelingPaneProps) => {
   const { settings } = useSettingsAuthContext()
@@ -76,7 +78,6 @@ export const ModelingPane = ({
   return (
     <section
       {...props}
-      title={title && typeof title === 'string' ? title : ''}
       data-testid={detailsTestId}
       id={id}
       className={
@@ -87,7 +88,14 @@ export const ModelingPane = ({
         (className || '')
       }
     >
-      {children}
+      <ModelingPaneHeader
+        id={id}
+        icon={icon}
+        title={title}
+        Menu={Menu}
+        onClose={onClose}
+      />
+      <div className="relative w-full">{children}</div>
     </section>
   )
 }

src/components/ModelingSidebar/ModelingPanes/DebugPane.tsx

@@ -5,7 +5,6 @@ import { CamDebugSettings } from 'clientSideScene/ClientSideSceneComp'
 
 export const DebugPane = () => {
   return (
-    <div className="relative">
     <section
       data-testid="debug-panel"
       className="absolute inset-0 p-2 box-border overflow-auto"
@@ -17,6 +16,5 @@ export const DebugPane = () => {
         <DebugFeatureTree />
       </div>
     </section>
-    </div>
   )
 }

src/components/ModelingSidebar/ModelingPanes/KclEditorPane.tsx

@@ -4,7 +4,7 @@ import { Themes, getSystemTheme } from 'lib/theme'
 import { useMemo, useRef } from 'react'
 import { highlightSelectionMatches, searchKeymap } from '@codemirror/search'
 import { lineHighlightField } from 'editor/highlightextension'
-import { onMouseDragMakeANewNumber, onMouseDragRegex } from 'lib/utils'
+import { roundOff } from 'lib/utils'
 import {
   lineNumbers,
   rectangularSelection,
@@ -129,9 +129,7 @@ export const KclEditorPane = () => {
         closeBrackets(),
         highlightActiveLine(),
         highlightSelectionMatches(),
-        syntaxHighlighting(defaultHighlightStyle, {
+        syntaxHighlighting(defaultHighlightStyle, { fallback: true }),
-          fallback: true,
-        }),
         rectangularSelection(),
         dropCursor(),
         interact({
@@ -139,12 +137,29 @@ export const KclEditorPane = () => {
             // a rule for a number dragger
             {
               // the regexp matching the value
-              regexp: onMouseDragRegex,
+              regexp: /-?\b\d+\.?\d*\b/g,
               // set cursor to "ew-resize" on hover
               cursor: 'ew-resize',
               // change number value based on mouse X movement on drag
               onDrag: (text, setText, e) => {
-                onMouseDragMakeANewNumber(text, setText, e)
+                const multiplier =
+                  e.shiftKey && e.metaKey
+                    ? 0.01
+                    : e.metaKey
+                    ? 0.1
+                    : e.shiftKey
+                    ? 10
+                    : 1
+
+                const delta = e.movementX * multiplier
+
+                const newVal = roundOff(
+                  Number(text) + delta,
+                  multiplier === 0.01 ? 2 : multiplier === 0.1 ? 1 : 0
+                )
+
+                if (isNaN(newVal)) return
+                setText(newVal.toString())
               },
             },
           ],
@@ -159,12 +174,9 @@ export const KclEditorPane = () => {
   const initialCode = useRef(codeManager.code)
 
   return (
-    <div className="relative">
     <div
       id="code-mirror-override"
-        className={
+      className={'absolute inset-0 ' + (cursorBlinking.current ? 'blink' : '')}
-          'absolute inset-0 ' + (cursorBlinking.current ? 'blink' : '')
-        }
     >
       <CodeEditor
         initialDocValue={initialCode.current}
@@ -184,6 +196,5 @@ export const KclEditorPane = () => {
         }}
       />
     </div>
-    </div>
   )
 }

src/components/ModelingSidebar/ModelingPanes/MemoryPane.test.tsx

@@ -43,14 +43,14 @@ describe('processMemory', () => {
           tag: null,
           id: expect.any(String),
           faceId: expect.any(String),
-          sourceRange: [170, 194, 0],
+          sourceRange: [170, 194],
         },
         {
           type: 'extrudePlane',
           tag: null,
           id: expect.any(String),
           faceId: expect.any(String),
-          sourceRange: [202, 230, 0],
+          sourceRange: [202, 230],
         },
       ],
       theSketch: [

src/components/ModelingSidebar/ModelingPanes/index.tsx

@@ -2,17 +2,11 @@ import { IconDefinition, faBugSlash } from '@fortawesome/free-solid-svg-icons'
 import { KclEditorMenu } from 'components/ModelingSidebar/ModelingPanes/KclEditorMenu'
 import { CustomIconName } from 'components/CustomIcon'
 import { KclEditorPane } from 'components/ModelingSidebar/ModelingPanes/KclEditorPane'
-import { ModelingPaneHeader } from 'components/ModelingSidebar/ModelingPane'
 import { MouseEventHandler, ReactNode } from 'react'
 import { MemoryPane, MemoryPaneMenu } from './MemoryPane'
 import { LogsPane } from './LoggingPanes'
 import { DebugPane } from './DebugPane'
-import {
+import { FileTreeInner, FileTreeMenu, FileTreeRoot } from 'components/FileTree'
-  FileTreeInner,
-  FileTreeMenu,
-  FileTreeRoot,
-  useFileTreeOperations,
-} from 'components/FileTree'
 import { useKclContext } from 'lang/KclProvider'
 import { editorManager } from 'lib/singletons'
 import { ContextFrom } from 'xstate'
@@ -44,19 +38,20 @@ interface PaneCallbackProps {
 
 export type SidebarPane = {
   id: SidebarType
-  sidebarName: string
+  title: ReactNode
+  sidebarName?: string
   icon: CustomIconName | IconDefinition
   keybinding: string
-  Content: React.FC<{ id: SidebarType; onClose: () => void }>
+  Content: ReactNode | React.FC
+  Menu?: ReactNode | React.FC
   hide?: boolean | ((props: PaneCallbackProps) => boolean)
   showBadge?: BadgeInfo
 }
 
 export type SidebarAction = {
   id: string
-  sidebarName: string
-  icon: CustomIconName
   title: ReactNode
+  icon: CustomIconName
   iconClassName?: string // Just until we get rid of FontAwesome icons
   keybinding: string
   action: () => void
@@ -64,30 +59,14 @@ export type SidebarAction = {
   disable?: () => string | undefined
 }
 
-// For now a lot of icons are the same but the reality is they could totally
-// be different, like an icon based on some data for the pane, or the icon
-// changes to be a spinning loader on loading.
-
 export const sidebarPanes: SidebarPane[] = [
   {
     id: 'code',
+    title: 'KCL Code',
     icon: 'code',
-    sidebarName: 'KCL Code',
+    Content: KclEditorPane,
-    Content: (props: { id: SidebarType; onClose: () => void }) => {
-      return (
-        <>
-          <ModelingPaneHeader
-            id={props.id}
-            icon="code"
-            title="KCL Code"
-            Menu={<KclEditorMenu />}
-            onClose={props.onClose}
-          />
-          <KclEditorPane />
-        </>
-      )
-    },
     keybinding: 'Shift + C',
+    Menu: KclEditorMenu,
     showBadge: {
       value: ({ kclContext }) => {
         return kclContext.errors.length
@@ -100,96 +79,34 @@ export const sidebarPanes: SidebarPane[] = [
   },
   {
     id: 'files',
-    icon: 'folder',
+    title: <FileTreeRoot />,
     sidebarName: 'Project Files',
-    Content: (props: { id: SidebarType; onClose: () => void }) => {
+    icon: 'folder',
-      const { createFile, createFolder, newTreeEntry } = useFileTreeOperations()
+    Content: FileTreeInner,
-
-      return (
-        <>
-          <ModelingPaneHeader
-            id={props.id}
-            icon="folder"
-            title={<FileTreeRoot />}
-            Menu={
-              <FileTreeMenu
-                onCreateFile={() => createFile({ dryRun: true })}
-                onCreateFolder={() => createFolder({ dryRun: true })}
-              />
-            }
-            onClose={props.onClose}
-          />
-          <FileTreeInner
-            onCreateFile={(name: string) => createFile({ dryRun: false, name })}
-            onCreateFolder={(name: string) =>
-              createFolder({ dryRun: false, name })
-            }
-            newTreeEntry={newTreeEntry}
-          />
-        </>
-      )
-    },
     keybinding: 'Shift + F',
+    Menu: FileTreeMenu,
     hide: ({ platform }) => platform === 'web',
   },
   {
     id: 'variables',
+    title: 'Variables',
     icon: 'make-variable',
-    sidebarName: 'Variables',
+    Content: MemoryPane,
-    Content: (props: { id: SidebarType; onClose: () => void }) => {
+    Menu: MemoryPaneMenu,
-      return (
-        <>
-          <ModelingPaneHeader
-            id={props.id}
-            icon="make-variable"
-            title="Variables"
-            Menu={<MemoryPaneMenu />}
-            onClose={props.onClose}
-          />
-          <MemoryPane />
-        </>
-      )
-    },
     keybinding: 'Shift + V',
   },
   {
     id: 'logs',
+    title: 'Logs',
     icon: 'logs',
-    sidebarName: 'Logs',
+    Content: LogsPane,
-    Content: (props: { id: SidebarType; onClose: () => void }) => {
-      return (
-        <>
-          <ModelingPaneHeader
-            id={props.id}
-            icon="logs"
-            title="Logs"
-            Menu={null}
-            onClose={props.onClose}
-          />
-          <LogsPane />
-        </>
-      )
-    },
     keybinding: 'Shift + L',
   },
   {
     id: 'debug',
+    title: 'Debug',
     icon: faBugSlash,
-    sidebarName: 'Debug',
+    Content: DebugPane,
-    Content: (props: { id: SidebarType; onClose: () => void }) => {
-      return (
-        <>
-          <ModelingPaneHeader
-            id={props.id}
-            icon={faBugSlash}
-            title="Debug"
-            Menu={null}
-            onClose={props.onClose}
-          />
-          <DebugPane />
-        </>
-      )
-    },
     keybinding: 'Shift + D',
     hide: ({ settings }) => !settings.modeling.showDebugPanel.current,
   },

src/components/ModelingSidebar/ModelingSidebar.module.css

@@ -0,0 +1,11 @@
+.grid {
+  display: grid;
+  grid-template-columns: auto 1fr;
+  grid-template-rows: 1fr 1fr;
+  row-gap: 0.25rem;
+  align-items: stretch;
+  position: relative;
+  padding-block: 1px;
+  max-width: 100%;
+  flex: 1 1 0;
+}

src/components/ModelingSidebar/ModelingSidebar.tsx

@@ -5,12 +5,14 @@ import {
   useCallback,
   useEffect,
   useMemo,
+  ReactNode,
   useContext,
 } from 'react'
 import { useHotkeys } from 'react-hotkeys-hook'
 import { SidebarAction, SidebarType, sidebarPanes } from './ModelingPanes'
 import Tooltip from 'components/Tooltip'
 import { ActionIcon } from 'components/ActionIcon'
+import styles from './ModelingSidebar.module.css'
 import { ModelingPane } from './ModelingPane'
 import { isDesktop } from 'lib/isDesktop'
 import { useModelingContext } from 'hooks/useModelingContext'
@@ -60,7 +62,6 @@ export function ModelingSidebar({ paneOpacity }: ModelingSidebarProps) {
     {
       id: 'export',
       title: 'Export part',
-      sidebarName: 'Export part',
       icon: 'floppyDiskArrow',
       keybinding: 'Ctrl + Shift + E',
       action: () =>
@@ -72,7 +73,6 @@ export function ModelingSidebar({ paneOpacity }: ModelingSidebarProps) {
     {
       id: 'make',
       title: 'Make part',
-      sidebarName: 'Make part',
       icon: 'printer3d',
       keybinding: 'Ctrl + Shift + M',
       // eslint-disable-next-line @typescript-eslint/no-misused-promises
@@ -182,7 +182,7 @@ export function ModelingSidebar({ paneOpacity }: ModelingSidebarProps) {
         bottomRight: 'hidden',
       }}
     >
-      <div id="app-sidebar" className="flex flex-row h-full">
+      <div id="app-sidebar" className={styles.grid + ' flex-1'}>
         <ul
           className={
             (context.store?.openPanes.length === 0 ? 'rounded-r ' : '') +
@@ -220,7 +220,7 @@ export function ModelingSidebar({ paneOpacity }: ModelingSidebarProps) {
                     key={action.id}
                     paneConfig={{
                       id: action.id,
-                      sidebarName: action.sidebarName,
+                      title: action.title,
                       icon: action.icon,
                       keybinding: action.keybinding,
                       iconClassName: action.iconClassName,
@@ -237,8 +237,10 @@ export function ModelingSidebar({ paneOpacity }: ModelingSidebarProps) {
         <ul
           id="pane-section"
           className={
-            'ml-[-1px] col-start-2 col-span-1 flex flex-col items-stretch gap-2 ' +
+            'ml-[-1px] col-start-2 col-span-1 flex flex-col gap-2 ' +
-            (context.store?.openPanes.length >= 1 ? `w-full` : `hidden`)
+            (context.store?.openPanes.length >= 1
+              ? `row-start-1 row-end-3`
+              : `hidden`)
           }
         >
           {filteredPanes
@@ -247,15 +249,13 @@ export function ModelingSidebar({ paneOpacity }: ModelingSidebarProps) {
               <ModelingPane
                 key={pane.id}
                 icon={pane.icon}
-                title={pane.sidebarName}
-                onClose={() => {}}
                 id={`${pane.id}-pane`}
+                title={pane.title}
+                Menu={pane.Menu}
+                onClose={() => togglePane(pane.id)}
               >
                 {pane.Content instanceof Function ? (
-                  <pane.Content
+                  <pane.Content />
-                    id={pane.id}
-                    onClose={() => togglePane(pane.id)}
-                  />
                 ) : (
                   pane.Content
                 )}
@@ -271,7 +271,8 @@ interface ModelingPaneButtonProps
   extends React.HTMLAttributes<HTMLButtonElement> {
   paneConfig: {
     id: string
-    sidebarName: string
+    title: ReactNode
+    sidebarName?: string
     icon: CustomIconName | IconDefinition
     keybinding: string
     iconClassName?: string
@@ -300,7 +301,10 @@ function ModelingPaneButton({
       <button
         className="group pointer-events-auto flex items-center justify-center border-transparent dark:border-transparent disabled:!border-transparent p-0 m-0 rounded-sm !outline-0 focus-visible:border-primary"
         onClick={onClick}
-        name={paneConfig.sidebarName}
+        name={
+          paneConfig.sidebarName ??
+          (typeof paneConfig.title === 'string' ? paneConfig.title : '')
+        }
         data-testid={paneConfig.id + '-pane-button'}
         disabled={disabledText !== undefined}
         aria-disabled={disabledText !== undefined}
@@ -316,7 +320,7 @@ function ModelingPaneButton({
           }
         />
         <span className="sr-only">
-          {paneConfig.sidebarName}
+          {paneConfig.sidebarName ?? paneConfig.title}
           {paneIsOpen !== undefined ? ` pane` : ''}
         </span>
         <Tooltip
@@ -325,7 +329,7 @@ function ModelingPaneButton({
           hoverOnly
         >
           <span className="flex-1">
-            {paneConfig.sidebarName}
+            {paneConfig.sidebarName ?? paneConfig.title}
             {disabledText !== undefined ? ` (${disabledText})` : ''}
             {paneIsOpen !== undefined ? ` pane` : ''}
           </span>

src/components/RouteProvider.tsx

@@ -1,33 +0,0 @@
-import { useEffect, useState, createContext, ReactNode } from 'react'
-import { useNavigation, useLocation } from 'react-router-dom'
-import { PATHS } from 'lib/paths'
-import { markOnce } from 'lib/performance'
-
-export const RouteProviderContext = createContext({})
-
-export function RouteProvider({ children }: { children: ReactNode }) {
-  const [first, setFirstState] = useState(true)
-  const navigation = useNavigation()
-  const location = useLocation()
-  useEffect(() => {
-    // On initialization, the react-router-dom does not send a 'loading' state event.
-    // it sends an idle event first.
-    const pathname = first ? location.pathname : navigation.location?.pathname
-    const isHome = pathname === PATHS.HOME
-    const isFile =
-      pathname?.includes(PATHS.FILE) &&
-      pathname?.substring(pathname?.length - 4) === '.kcl'
-    if (isHome) {
-      markOnce('code/willLoadHome')
-    } else if (isFile) {
-      markOnce('code/willLoadFile')
-    }
-    setFirstState(false)
-  }, [navigation])
-
-  return (
-    <RouteProviderContext.Provider value={{}}>
-      {children}
-    </RouteProviderContext.Provider>
-  )
-}

src/components/SettingsAuthProvider.tsx

@@ -1,7 +1,7 @@
 import { trap } from 'lib/trap'
 import { useMachine } from '@xstate/react'
 import { useNavigate, useRouteLoaderData, useLocation } from 'react-router-dom'
-import { PATHS, BROWSER_PATH } from 'lib/paths'
+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'
@@ -41,8 +41,6 @@ import { reportRejection } from 'lib/trap'
 import { getAppSettingsFilePath } from 'lib/desktop'
 import { isDesktop } from 'lib/isDesktop'
 import { useFileSystemWatcher } from 'hooks/useFileSystemWatcher'
-import { codeManager } from 'lib/singletons'
-import { createRouteCommands } from 'lib/commandBarConfigs/routeCommandConfig'
 
 type MachineContext<T extends AnyStateMachine> = {
   state: StateFrom<T>
@@ -202,13 +200,13 @@ export const SettingsAuthProviderBase = ({
             console.error('Error executing AST after settings change', e)
           }
         },
-        async persistSettings({ context, event }) {
+        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
 
-          codeManager.writeCausedByAppCheckedInFileTreeFileSystemWatcher = true
+          // eslint-disable-next-line @typescript-eslint/no-floating-promises
-          return saveSettings(context, loadedProject?.project?.path)
+          saveSettings(context, loadedProject?.project?.path)
         },
       },
     }),
@@ -222,7 +220,7 @@ export const SettingsAuthProviderBase = ({
   }, [])
 
   useFileSystemWatcher(
-    async (eventType: string) => {
+    async () => {
       // If there is a projectPath but it no longer exists it means
       // it was exterally removed. If we let the code past this condition
       // execute it will recreate the directory due to code in
@@ -236,9 +234,6 @@ export const SettingsAuthProviderBase = ({
         }
       }
 
-      // Only reload if there are changes. Ignore everything else.
-      if (eventType !== 'change') return
-
       const data = await loadAndValidateSettings(loadedProject?.project?.path)
       settingsSend({
         type: 'Set all settings',
@@ -289,44 +284,6 @@ export const SettingsAuthProviderBase = ({
     settingsWithCommandConfigs,
   ])
 
-  // Due to the route provider, i've moved this to the SettingsAuthProvider instead of CommandBarProvider
-  // This will register the commands to route to Telemetry, Home, and Settings.
-  useEffect(() => {
-    const filePath =
-      PATHS.FILE +
-      '/' +
-      encodeURIComponent(loadedProject?.file?.path || BROWSER_PATH)
-    const { RouteTelemetryCommand, RouteHomeCommand, RouteSettingsCommand } =
-      createRouteCommands(navigate, location, filePath)
-    commandBarSend({
-      type: 'Remove commands',
-      data: {
-        commands: [
-          RouteTelemetryCommand,
-          RouteHomeCommand,
-          RouteSettingsCommand,
-        ],
-      },
-    })
-    if (location.pathname === PATHS.HOME) {
-      commandBarSend({
-        type: 'Add commands',
-        data: { commands: [RouteTelemetryCommand, RouteSettingsCommand] },
-      })
-    } else if (location.pathname.includes(PATHS.FILE)) {
-      commandBarSend({
-        type: 'Add commands',
-        data: {
-          commands: [
-            RouteTelemetryCommand,
-            RouteSettingsCommand,
-            RouteHomeCommand,
-          ],
-        },
-      })
-    }
-  }, [location])
-
   // Listen for changes to the system theme and update the app theme accordingly
   // This is only done if the theme setting is set to 'system'.
   // It can't be done in XState (in an invoked callback, for example)

src/components/TelemetryExplorer.tsx

@@ -1,72 +0,0 @@
-import { getMarks } from 'lib/performance'
-
-import {
-  printDeltaTotal,
-  printInvocationCount,
-  printMarkDownTable,
-  printRawMarks,
-} from 'lib/telemetry'
-
-export function TelemetryExplorer() {
-  const marks = getMarks()
-  const markdownTable = printMarkDownTable(marks)
-  const rawMarks = printRawMarks(marks)
-  const deltaTotalTable = printDeltaTotal(marks)
-  const invocationCount = printInvocationCount(marks)
-  // TODO data-telemetry-type
-  // TODO data-telemetry-name
-  return (
-    <div>
-      <h1 className="pb-4">Marks</h1>
-      <div className="max-w-xl max-h-64 overflow-auto select-all">
-        {marks.map((mark, index) => {
-          return (
-            <pre className="text-xs" key={index}>
-              <code key={index}>{JSON.stringify(mark, null, 2)}</code>
-            </pre>
-          )
-        })}
-      </div>
-      <h1 className="pb-4">Startup Performance</h1>
-      <div className="max-w-xl max-h-64 overflow-auto select-all">
-        {markdownTable.map((line, index) => {
-          return (
-            <pre className="text-xs" key={index}>
-              <code key={index}>{line}</code>
-            </pre>
-          )
-        })}
-      </div>
-      <h1 className="pb-4">Delta and Totals</h1>
-      <div className="max-w-xl max-h-64 overflow-auto select-all">
-        {deltaTotalTable.map((line, index) => {
-          return (
-            <pre className="text-xs" key={index}>
-              <code key={index}>{line}</code>
-            </pre>
-          )
-        })}
-      </div>
-      <h1 className="pb-4">Raw Marks</h1>
-      <div className="max-w-xl max-h-64 overflow-auto select-all">
-        {rawMarks.map((line, index) => {
-          return (
-            <pre className="text-xs" key={index}>
-              <code key={index}>{line}</code>
-            </pre>
-          )
-        })}
-      </div>
-      <h1 className="pb-4">Invocation Count</h1>
-      <div className="max-w-xl max-h-64 overflow-auto select-all">
-        {invocationCount.map((line, index) => {
-          return (
-            <pre className="text-xs" key={index}>
-              <code key={index}>{line}</code>
-            </pre>
-          )
-        })}
-      </div>
-    </div>
-  )
-}

src/editor/manager.ts

@@ -1,5 +1,4 @@
 import { EditorView, ViewUpdate } from '@codemirror/view'
-import { syntaxTree } from '@codemirror/language'
 import { EditorSelection, Annotation, Transaction } from '@codemirror/state'
 import { engineCommandManager } from 'lib/singletons'
 import { modelingMachine, ModelingMachineEvent } from 'machines/modelingMachine'
@@ -13,7 +12,6 @@ import {
   setDiagnosticsEffect,
 } from '@codemirror/lint'
 import { StateFrom } from 'xstate'
-import { markOnce } from 'lib/performance'
 
 const updateOutsideEditorAnnotation = Annotation.define<boolean>()
 export const updateOutsideEditorEvent = updateOutsideEditorAnnotation.of(true)
@@ -61,48 +59,6 @@ export default class EditorManager {
 
   setEditorView(editorView: EditorView) {
     this._editorView = editorView
-    this.overrideTreeHighlighterUpdateForPerformanceTracking()
-  }
-
-  overrideTreeHighlighterUpdateForPerformanceTracking() {
-    // @ts-ignore
-    this._editorView?.plugins.forEach((e) => {
-      let sawATreeDiff = false
-
-      // we cannot use <>.constructor.name since it will get destroyed
-      // when packaging the application.
-      const isTreeHighlightPlugin =
-        e.value.hasOwnProperty('tree') &&
-        e.value.hasOwnProperty('decoratedTo') &&
-        e.value.hasOwnProperty('decorations')
-
-      if (isTreeHighlightPlugin) {
-        let originalUpdate = e.value.update
-        // @ts-ignore
-        function performanceTrackingUpdate(args) {
-          /**
-           * TreeHighlighter.update will be called multiple times on start up.
-           * We do not want to track the highlight performance of an empty update.
-           * mark the syntax highlight one time when the new tree comes in with the
-           * initial code
-           */
-          const treeIsDifferent =
-            // @ts-ignore
-            !sawATreeDiff && this.tree !== syntaxTree(args.state)
-          if (treeIsDifferent && !sawATreeDiff) {
-            markOnce('code/willSyntaxHighlight')
-          }
-          // Call the original function
-          // @ts-ignore
-          originalUpdate.apply(this, [args])
-          if (treeIsDifferent && !sawATreeDiff) {
-            markOnce('code/didSyntaxHighlight')
-            sawATreeDiff = true
-          }
-        }
-        e.value.update = performanceTrackingUpdate
-      }
-    })
   }
 
   get editorView(): EditorView | null {

src/editor/plugins/lsp/kcl/index.ts

@@ -96,10 +96,10 @@ export class KclPlugin implements PluginValue {
 
     const newCode = viewUpdate.state.doc.toString()
     codeManager.code = newCode
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
+    codeManager.writeToFile()
 
-    void codeManager.writeToFile().then(() => {
     this.scheduleUpdateDoc()
-    })
   }
 
   scheduleUpdateDoc() {

src/hooks/useRefreshSettings.ts

@@ -26,7 +26,6 @@ export function useRefreshSettings(routeId: string = PATHS.INDEX) {
     ctx.settings.send({
       type: 'Set all settings',
       settings: routeData,
-      doNotPersist: true,
     })
   }, [])
 }

src/index.tsx

@@ -8,10 +8,8 @@ import ModalContainer from 'react-modal-promise'
 import { isDesktop } from 'lib/isDesktop'
 import { AppStreamProvider } from 'AppState'
 import { ToastUpdate } from 'components/ToastUpdate'
-import { markOnce } from 'lib/performance'
 import { AUTO_UPDATER_TOAST_ID } from 'lib/constants'
 
-markOnce('code/willAuth')
 // uncomment for xstate inspector
 // import { DEV } from 'env'
 // import { inspect } from '@xstate/inspect'

src/lang/KclSingleton.ts

@@ -21,7 +21,6 @@ import {
 import { getNodeFromPath } from './queryAst'
 import { codeManager, editorManager, sceneInfra } from 'lib/singletons'
 import { Diagnostic } from '@codemirror/lint'
-import { markOnce } from 'lib/performance'
 import { Node } from 'wasm-lib/kcl/bindings/Node'
 
 interface ExecuteArgs {
@@ -39,7 +38,6 @@ export class KclManager {
     body: [],
     start: 0,
     end: 0,
-    moduleId: 0,
     nonCodeMeta: {
       nonCodeNodes: {},
       startNodes: [],
@@ -206,7 +204,6 @@ export class KclManager {
       body: [],
       start: 0,
       end: 0,
-      moduleId: 0,
       nonCodeMeta: {
         nonCodeNodes: {},
         startNodes: [],
@@ -258,7 +255,6 @@ export class KclManager {
     }
 
     const ast = args.ast || this.ast
-    markOnce('code/startExecuteAst')
 
     const currentExecutionId = args.executionId || Date.now()
     this._cancelTokens.set(currentExecutionId, false)
@@ -333,7 +329,6 @@ export class KclManager {
     })
 
     this._cancelTokens.delete(currentExecutionId)
-    markOnce('code/endExecuteAst')
   }
   // NOTE: this always updates the code state and editor.
   // DO NOT CALL THIS from codemirror ever.
@@ -434,9 +429,13 @@ export class KclManager {
 
     // Update the code state and the editor.
     codeManager.updateCodeStateEditor(code)
-
     // Write back to the file system.
-    void codeManager.writeToFile().then(() => this.executeCode())
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
+    codeManager.writeToFile()
+
+    // execute the code.
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
+    this.executeCode()
   }
   // There's overlapping responsibility between updateAst and executeAst.
   // updateAst was added as it was used a lot before xState migration so makes the port easier.

src/lang/abstractSyntaxTree.test.ts

@@ -1903,6 +1903,6 @@ describe('parsing errors', () => {
     const error = result as KCLError
     expect(error.kind).toBe('syntax')
     expect(error.msg).toBe('Unexpected token: (')
-    expect(error.sourceRanges).toEqual([[27, 28, 0]])
+    expect(error.sourceRanges).toEqual([[27, 28]])
   })
 })

src/lang/artifact.test.ts

@@ -19,7 +19,7 @@ const mySketch001 = startSketchOn('XY')
     const sketch001 = execState.memory.get('mySketch001')
     expect(sketch001).toEqual({
       type: 'UserVal',
-      __meta: [{ sourceRange: [46, 71, 0] }],
+      __meta: [{ sourceRange: [46, 71] }],
       value: {
         type: 'Sketch',
         on: expect.any(Object),
@@ -29,7 +29,7 @@ const mySketch001 = startSketchOn('XY')
           tag: null,
           __geoMeta: {
             id: expect.any(String),
-            sourceRange: [46, 71, 0],
+            sourceRange: [46, 71],
           },
         },
         paths: [
@@ -39,7 +39,7 @@ const mySketch001 = startSketchOn('XY')
             to: [-1.59, -1.54],
             from: [0, 0],
             __geoMeta: {
-              sourceRange: [77, 102, 0],
+              sourceRange: [77, 102],
               id: expect.any(String),
             },
           },
@@ -49,13 +49,13 @@ const mySketch001 = startSketchOn('XY')
             from: [-1.59, -1.54],
             tag: null,
             __geoMeta: {
-              sourceRange: [108, 132, 0],
+              sourceRange: [108, 132],
               id: expect.any(String),
             },
           },
         ],
         id: expect.any(String),
-        __meta: [{ sourceRange: [46, 71, 0] }],
+        __meta: [{ sourceRange: [46, 71] }],
       },
     })
   })
@@ -80,14 +80,14 @@ const mySketch001 = startSketchOn('XY')
           faceId: expect.any(String),
           tag: null,
           id: expect.any(String),
-          sourceRange: [77, 102, 0],
+          sourceRange: [77, 102],
         },
         {
           type: 'extrudePlane',
           faceId: expect.any(String),
           tag: null,
           id: expect.any(String),
-          sourceRange: [108, 132, 0],
+          sourceRange: [108, 132],
         },
       ],
       sketch: {
@@ -104,7 +104,7 @@ const mySketch001 = startSketchOn('XY')
             tag: null,
             __geoMeta: {
               id: expect.any(String),
-              sourceRange: [77, 102, 0],
+              sourceRange: [77, 102],
             },
           },
           {
@@ -114,7 +114,7 @@ const mySketch001 = startSketchOn('XY')
             tag: null,
             __geoMeta: {
               id: expect.any(String),
-              sourceRange: [108, 132, 0],
+              sourceRange: [108, 132],
             },
           },
         ],
@@ -122,7 +122,7 @@ const mySketch001 = startSketchOn('XY')
       height: 2,
       startCapId: expect.any(String),
       endCapId: expect.any(String),
-      __meta: [{ sourceRange: [46, 71, 0] }],
+      __meta: [{ sourceRange: [46, 71] }],
     })
   })
   test('sketch extrude and sketch on one of the faces', async () => {
@@ -162,7 +162,7 @@ const sk2 = startSketchOn('XY')
             faceId: expect.any(String),
             tag: null,
             id: expect.any(String),
-            sourceRange: [69, 89, 0],
+            sourceRange: [69, 89],
           },
           {
             type: 'extrudePlane',
@@ -174,14 +174,14 @@ const sk2 = startSketchOn('XY')
               value: 'p',
             },
             id: expect.any(String),
-            sourceRange: [95, 117, 0],
+            sourceRange: [95, 117],
           },
           {
             type: 'extrudePlane',
             faceId: expect.any(String),
             tag: null,
             id: expect.any(String),
-            sourceRange: [123, 142, 0],
+            sourceRange: [123, 142],
           },
         ],
         sketch: {
@@ -194,7 +194,7 @@ const sk2 = startSketchOn('XY')
             p: {
               __meta: [
                 {
-                  sourceRange: [114, 116, 0],
+                  sourceRange: [114, 116],
                 },
               ],
               type: 'TagIdentifier',
@@ -210,7 +210,7 @@ const sk2 = startSketchOn('XY')
               tag: null,
               __geoMeta: {
                 id: expect.any(String),
-                sourceRange: [69, 89, 0],
+                sourceRange: [69, 89],
               },
             },
             {
@@ -225,7 +225,7 @@ const sk2 = startSketchOn('XY')
               },
               __geoMeta: {
                 id: expect.any(String),
-                sourceRange: [95, 117, 0],
+                sourceRange: [95, 117],
               },
             },
             {
@@ -235,7 +235,7 @@ const sk2 = startSketchOn('XY')
               tag: null,
               __geoMeta: {
                 id: expect.any(String),
-                sourceRange: [123, 142, 0],
+                sourceRange: [123, 142],
               },
             },
           ],
@@ -243,7 +243,7 @@ const sk2 = startSketchOn('XY')
         height: 2,
         startCapId: expect.any(String),
         endCapId: expect.any(String),
-        __meta: [{ sourceRange: [38, 63, 0] }],
+        __meta: [{ sourceRange: [38, 63] }],
       },
       {
         type: 'Solid',
@@ -254,7 +254,7 @@ const sk2 = startSketchOn('XY')
             faceId: expect.any(String),
             tag: null,
             id: expect.any(String),
-            sourceRange: [373, 393, 0],
+            sourceRange: [373, 393],
           },
           {
             type: 'extrudePlane',
@@ -266,14 +266,14 @@ const sk2 = startSketchOn('XY')
               value: 'o',
             },
             id: expect.any(String),
-            sourceRange: [399, 420, 0],
+            sourceRange: [399, 420],
           },
           {
             type: 'extrudePlane',
             faceId: expect.any(String),
             tag: null,
             id: expect.any(String),
-            sourceRange: [426, 445, 0],
+            sourceRange: [426, 445],
           },
         ],
         sketch: {
@@ -286,7 +286,7 @@ const sk2 = startSketchOn('XY')
             o: {
               __meta: [
                 {
-                  sourceRange: [417, 419, 0],
+                  sourceRange: [417, 419],
                 },
               ],
               type: 'TagIdentifier',
@@ -302,7 +302,7 @@ const sk2 = startSketchOn('XY')
               tag: null,
               __geoMeta: {
                 id: expect.any(String),
-                sourceRange: [373, 393, 0],
+                sourceRange: [373, 393],
               },
             },
             {
@@ -317,7 +317,7 @@ const sk2 = startSketchOn('XY')
               },
               __geoMeta: {
                 id: expect.any(String),
-                sourceRange: [399, 420, 0],
+                sourceRange: [399, 420],
               },
             },
             {
@@ -327,7 +327,7 @@ const sk2 = startSketchOn('XY')
               tag: null,
               __geoMeta: {
                 id: expect.any(String),
-                sourceRange: [426, 445, 0],
+                sourceRange: [426, 445],
               },
             },
           ],
@@ -335,7 +335,7 @@ const sk2 = startSketchOn('XY')
         height: 2,
         startCapId: expect.any(String),
         endCapId: expect.any(String),
-        __meta: [{ sourceRange: [342, 367, 0] }],
+        __meta: [{ sourceRange: [342, 367] }],
       },
     ])
   })

src/lang/codeManager.ts

@@ -121,28 +121,20 @@ export default class CodeManager {
       // Only write our buffer contents to file once per second. Any faster
       // and file-system watchers which read, will receive empty data during
       // writes.
-
       clearTimeout(this.timeoutWriter)
       this.writeCausedByAppCheckedInFileTreeFileSystemWatcher = true
-
-      return new Promise((resolve, reject) => {
       this.timeoutWriter = setTimeout(() => {
-          if (!this._currentFilePath)
-            return reject(new Error('currentFilePath not set'))
-
         // Wait one event loop to give a chance for params to be set
         // Save the file to disk
+        this._currentFilePath &&
           window.electron
             .writeFile(this._currentFilePath, this.code ?? '')
-            .then(resolve)
             .catch((err: Error) => {
               // TODO: add tracing per GH issue #254 (https://github.com/KittyCAD/modeling-app/issues/254)
               console.error('error saving file', err)
               toast.error('Error saving file, please check file permissions')
-              reject(err)
             })
       }, 1000)
-      })
     } else {
       safeLSSetItem(PERSIST_CODE_KEY, this.code)
     }

src/lang/errors.test.ts

@@ -9,8 +9,8 @@ describe('test kclErrToDiagnostic', () => {
         kind: 'semantic',
         msg: 'Semantic error',
         sourceRanges: [
-          [0, 1, 0],
+          [0, 1],
-          [2, 3, 0],
+          [2, 3],
         ],
       },
       {
@@ -19,8 +19,8 @@ describe('test kclErrToDiagnostic', () => {
         kind: 'type',
         msg: 'Type error',
         sourceRanges: [
-          [4, 5, 0],
+          [4, 5],
-          [6, 7, 0],
+          [6, 7],
         ],
       },
     ]

src/lang/errors.ts

@@ -4,17 +4,15 @@ import { posToOffset } from '@kittycad/codemirror-lsp-client'
 import { Diagnostic as LspDiagnostic } from 'vscode-languageserver-protocol'
 import { Text } from '@codemirror/state'
 
-const TOP_LEVEL_MODULE_ID = 0
-
 type ExtractKind<T> = T extends { kind: infer K } ? K : never
 export class KCLError extends Error {
   kind: ExtractKind<RustKclError> | 'name'
-  sourceRanges: [number, number, number][]
+  sourceRanges: [number, number][]
   msg: string
   constructor(
     kind: ExtractKind<RustKclError> | 'name',
     msg: string,
-    sourceRanges: [number, number, number][]
+    sourceRanges: [number, number][]
   ) {
     super()
     this.kind = kind
@@ -25,63 +23,63 @@ export class KCLError extends Error {
 }
 
 export class KCLLexicalError extends KCLError {
-  constructor(msg: string, sourceRanges: [number, number, number][]) {
+  constructor(msg: string, sourceRanges: [number, number][]) {
     super('lexical', msg, sourceRanges)
     Object.setPrototypeOf(this, KCLSyntaxError.prototype)
   }
 }
 
 export class KCLInternalError extends KCLError {
-  constructor(msg: string, sourceRanges: [number, number, number][]) {
+  constructor(msg: string, sourceRanges: [number, number][]) {
     super('internal', msg, sourceRanges)
     Object.setPrototypeOf(this, KCLSyntaxError.prototype)
   }
 }
 
 export class KCLSyntaxError extends KCLError {
-  constructor(msg: string, sourceRanges: [number, number, number][]) {
+  constructor(msg: string, sourceRanges: [number, number][]) {
     super('syntax', msg, sourceRanges)
     Object.setPrototypeOf(this, KCLSyntaxError.prototype)
   }
 }
 
 export class KCLSemanticError extends KCLError {
-  constructor(msg: string, sourceRanges: [number, number, number][]) {
+  constructor(msg: string, sourceRanges: [number, number][]) {
     super('semantic', msg, sourceRanges)
     Object.setPrototypeOf(this, KCLSemanticError.prototype)
   }
 }
 
 export class KCLTypeError extends KCLError {
-  constructor(msg: string, sourceRanges: [number, number, number][]) {
+  constructor(msg: string, sourceRanges: [number, number][]) {
     super('type', msg, sourceRanges)
     Object.setPrototypeOf(this, KCLTypeError.prototype)
   }
 }
 
 export class KCLUnimplementedError extends KCLError {
-  constructor(msg: string, sourceRanges: [number, number, number][]) {
+  constructor(msg: string, sourceRanges: [number, number][]) {
     super('unimplemented', msg, sourceRanges)
     Object.setPrototypeOf(this, KCLUnimplementedError.prototype)
   }
 }
 
 export class KCLUnexpectedError extends KCLError {
-  constructor(msg: string, sourceRanges: [number, number, number][]) {
+  constructor(msg: string, sourceRanges: [number, number][]) {
     super('unexpected', msg, sourceRanges)
     Object.setPrototypeOf(this, KCLUnexpectedError.prototype)
   }
 }
 
 export class KCLValueAlreadyDefined extends KCLError {
-  constructor(key: string, sourceRanges: [number, number, number][]) {
+  constructor(key: string, sourceRanges: [number, number][]) {
     super('name', `Key ${key} was already defined elsewhere`, sourceRanges)
     Object.setPrototypeOf(this, KCLValueAlreadyDefined.prototype)
   }
 }
 
 export class KCLUndefinedValueError extends KCLError {
-  constructor(key: string, sourceRanges: [number, number, number][]) {
+  constructor(key: string, sourceRanges: [number, number][]) {
     super('name', `Key ${key} has not been defined`, sourceRanges)
     Object.setPrototypeOf(this, KCLUndefinedValueError.prototype)
   }
@@ -99,22 +97,13 @@ export function lspDiagnosticsToKclErrors(
     .flatMap(
       ({ range, message }) =>
         new KCLError('unexpected', message, [
-          [
+          [posToOffset(doc, range.start)!, posToOffset(doc, range.end)!],
-            posToOffset(doc, range.start)!,
-            posToOffset(doc, range.end)!,
-            TOP_LEVEL_MODULE_ID,
-          ],
         ])
     )
     .filter(({ sourceRanges }) => {
-      const [from, to, moduleId] = sourceRanges[0]
+      const [from, to] = sourceRanges[0]
       return (
-        from !== null &&
+        from !== null && to !== null && from !== undefined && to !== undefined
-        to !== null &&
-        from !== undefined &&
-        to !== undefined &&
-        // Filter out errors that are not from the top-level module.
-        moduleId === TOP_LEVEL_MODULE_ID
       )
     })
     .sort((a, b) => {
@@ -138,16 +127,8 @@ export function kclErrorsToDiagnostics(
   errors: KCLError[]
 ): CodeMirrorDiagnostic[] {
   return errors?.flatMap((err) => {
-    const sourceRanges: CodeMirrorDiagnostic[] = err.sourceRanges
+    return err.sourceRanges.map(([from, to]) => {
-      // Filter out errors that are not from the top-level module.
-      .filter(([_start, _end, moduleId]) => moduleId === TOP_LEVEL_MODULE_ID)
-      .map(([from, to]) => {
       return { from, to, message: err.msg, severity: 'error' }
     })
-    // Make sure we didn't filter out all the source ranges.
-    if (sourceRanges.length === 0) {
-      sourceRanges.push({ from: 0, to: 0, message: err.msg, severity: 'error' })
-    }
-    return sourceRanges
   })
 }

src/lang/executor.test.ts

@@ -65,7 +65,7 @@ const newVar = myVar + 1`
         to: [0, 2],
         from: [0, 0],
         __geoMeta: {
-          sourceRange: [72, 97, 0],
+          sourceRange: [72, 97],
           id: expect.any(String),
         },
         tag: {
@@ -81,7 +81,7 @@ const newVar = myVar + 1`
         from: [0, 2],
         tag: null,
         __geoMeta: {
-          sourceRange: [103, 119, 0],
+          sourceRange: [103, 119],
           id: expect.any(String),
         },
       },
@@ -90,7 +90,7 @@ const newVar = myVar + 1`
         to: [5, -1],
         from: [2, 3],
         __geoMeta: {
-          sourceRange: [125, 154, 0],
+          sourceRange: [125, 154],
           id: expect.any(String),
         },
         tag: {
@@ -160,14 +160,14 @@ const newVar = myVar + 1`
           tag: null,
           __geoMeta: {
             id: expect.any(String),
-            sourceRange: [39, 63, 0],
+            sourceRange: [39, 63],
           },
         },
         tags: {
           myPath: {
             __meta: [
               {
-                sourceRange: [109, 116, 0],
+                sourceRange: [109, 116],
               },
             ],
             type: 'TagIdentifier',
@@ -182,7 +182,7 @@ const newVar = myVar + 1`
             from: [0, 0],
             tag: null,
             __geoMeta: {
-              sourceRange: [69, 85, 0],
+              sourceRange: [69, 85],
               id: expect.any(String),
             },
           },
@@ -191,7 +191,7 @@ const newVar = myVar + 1`
             to: [0, 1],
             from: [1, 1],
             __geoMeta: {
-              sourceRange: [91, 117, 0],
+              sourceRange: [91, 117],
               id: expect.any(String),
             },
             tag: {
@@ -207,15 +207,15 @@ const newVar = myVar + 1`
             from: [0, 1],
             tag: null,
             __geoMeta: {
-              sourceRange: [123, 139, 0],
+              sourceRange: [123, 139],
               id: expect.any(String),
             },
           },
         ],
         id: expect.any(String),
-        __meta: [{ sourceRange: [39, 63, 0] }],
+        __meta: [{ sourceRange: [39, 63] }],
       },
-      __meta: [{ sourceRange: [39, 63, 0] }],
+      __meta: [{ sourceRange: [39, 63] }],
     })
   })
   it('execute array expression', async () => {
@@ -229,7 +229,7 @@ const newVar = myVar + 1`
       value: 3,
       __meta: [
         {
-          sourceRange: [14, 15, 0],
+          sourceRange: [14, 15],
         },
       ],
     })
@@ -238,7 +238,7 @@ const newVar = myVar + 1`
       value: [1, '2', 3, 9],
       __meta: [
         {
-          sourceRange: [27, 49, 0],
+          sourceRange: [27, 49],
         },
       ],
     })
@@ -257,7 +257,7 @@ const newVar = myVar + 1`
       value: { aStr: 'str', anum: 2, identifier: 3, binExp: 9 },
       __meta: [
         {
-          sourceRange: [27, 83, 0],
+          sourceRange: [27, 83],
         },
       ],
     })
@@ -272,7 +272,7 @@ const newVar = myVar + 1`
       value: '123',
       __meta: [
         {
-          sourceRange: [41, 50, 0],
+          sourceRange: [41, 50],
         },
       ],
     })
@@ -426,7 +426,7 @@ const theExtrude = startSketchOn('XY')
       new KCLError(
         'undefined_value',
         'memory item key `myVarZ` is not defined',
-        [[129, 135, 0]]
+        [[129, 135]]
       )
     )
   })

src/lang/kclSamples.test.ts

@@ -1,87 +0,0 @@
-import { parse, initPromise, programMemoryInit } from './wasm'
-import { enginelessExecutor } from '../lib/testHelpers'
-import { assert } from 'vitest'
-// These unit tests makes web requests to a public github repository.
-
-interface KclSampleFile {
-  file: string
-  title: string
-  filename: string
-  description: string
-}
-
-beforeAll(async () => {
-  await initPromise
-})
-
-// Only used to actually fetch an older version of KCL code that will break in the parser.
-/* eslint-disable @typescript-eslint/no-unused-vars */
-async function getBrokenSampleCodeForLocalTesting() {
-  const result = await fetch(
-    'https://raw.githubusercontent.com/KittyCAD/kcl-samples/5ccd04a1773ebdbfd02684057917ce5dbe0eaab3/80-20-rail.kcl'
-  )
-  const text = await result.text()
-  return text
-}
-
-async function getKclSampleCodeFromGithub(file: string): Promise<string> {
-  const result = await fetch(
-    `https://raw.githubusercontent.com/KittyCAD/kcl-samples/refs/heads/main/${file}/${file}.kcl`
-  )
-  const text = await result.text()
-  return text
-}
-
-async function getFileNamesFromManifestJSON(): Promise<KclSampleFile[]> {
-  const result = await fetch(
-    'https://raw.githubusercontent.com/KittyCAD/kcl-samples/refs/heads/main/manifest.json'
-  )
-  const json = await result.json()
-  json.forEach((file: KclSampleFile) => {
-    const filenameWithoutExtension = file.file.split('.')[0]
-    file.filename = filenameWithoutExtension
-  })
-  return json
-}
-
-// Value to use across all tests!
-let files: KclSampleFile[] = []
-
-describe('Test KCL Samples from public Github repository', () => {
-  describe('When parsing source code', () => {
-    // THIS RUNS ACROSS OTHER TESTS!
-    it('should fetch files', async () => {
-      files = await getFileNamesFromManifestJSON()
-    })
-    // Run through all of the files in the manifest json. This will allow us to be automatically updated
-    // with the latest changes in github. We won't be hard coding the filenames
-    it(
-      'should run through all the files',
-      async () => {
-        for (let i = 0; i < files.length; i++) {
-          const file: KclSampleFile = files[i]
-          const code = await getKclSampleCodeFromGithub(file.filename)
-          const parsed = parse(code)
-          assert(!(parsed instanceof Error))
-        }
-      },
-      files.length * 1000
-    )
-  })
-
-  describe('when performing enginelessExecutor', () => {
-    it(
-      'should run through all the files',
-      async () => {
-        for (let i = 0; i < files.length; i++) {
-          const file: KclSampleFile = files[i]
-          const code = await getKclSampleCodeFromGithub(file.filename)
-          const parsed = parse(code)
-          assert(!(parsed instanceof Error))
-          await enginelessExecutor(parsed, programMemoryInit())
-        }
-      },
-      files.length * 1000
-    )
-  })
-})

src/lang/modifyAst.test.ts

@@ -101,15 +101,15 @@ describe('Testing findUniqueName', () => {
   it('should find a unique name', () => {
     const result = findUniqueName(
       JSON.stringify([
-        { type: 'Identifier', name: 'yo01', start: 0, end: 0, moduleId: 0 },
+        { type: 'Identifier', name: 'yo01', start: 0, end: 0 },
-        { type: 'Identifier', name: 'yo02', start: 0, end: 0, moduleId: 0 },
+        { type: 'Identifier', name: 'yo02', start: 0, end: 0 },
-        { type: 'Identifier', name: 'yo03', start: 0, end: 0, moduleId: 0 },
+        { type: 'Identifier', name: 'yo03', start: 0, end: 0 },
-        { type: 'Identifier', name: 'yo04', start: 0, end: 0, moduleId: 0 },
+        { type: 'Identifier', name: 'yo04', start: 0, end: 0 },
-        { type: 'Identifier', name: 'yo05', start: 0, end: 0, moduleId: 0 },
+        { type: 'Identifier', name: 'yo05', start: 0, end: 0 },
-        { type: 'Identifier', name: 'yo06', start: 0, end: 0, moduleId: 0 },
+        { type: 'Identifier', name: 'yo06', start: 0, end: 0 },
-        { type: 'Identifier', name: 'yo07', start: 0, end: 0, moduleId: 0 },
+        { type: 'Identifier', name: 'yo07', start: 0, end: 0 },
-        { type: 'Identifier', name: 'yo08', start: 0, end: 0, moduleId: 0 },
+        { type: 'Identifier', name: 'yo08', start: 0, end: 0 },
-        { type: 'Identifier', name: 'yo09', start: 0, end: 0, moduleId: 0 },
+        { type: 'Identifier', name: 'yo09', start: 0, end: 0 },
       ] satisfies Node<Identifier>[]),
       'yo',
       2
@@ -124,7 +124,6 @@ describe('Testing addSketchTo', () => {
         body: [],
         start: 0,
         end: 0,
-        moduleId: 0,
         nonCodeMeta: { nonCodeNodes: {}, startNodes: [] },
       },
       'yz'

src/lang/modifyAst.ts

@@ -242,7 +242,6 @@ export function mutateObjExpProp(
         value: updateWith,
         start: 0,
         end: 0,
-        moduleId: 0,
       })
     }
   }
@@ -578,7 +577,6 @@ export function createLiteral(value: string | number): Node<Literal> {
     type: 'Literal',
     start: 0,
     end: 0,
-    moduleId: 0,
     value,
     raw: `${value}`,
   }
@@ -589,7 +587,6 @@ export function createTagDeclarator(value: string): Node<TagDeclarator> {
     type: 'TagDeclarator',
     start: 0,
     end: 0,
-    moduleId: 0,
 
     value,
   }
@@ -600,7 +597,6 @@ export function createIdentifier(name: string): Node<Identifier> {
     type: 'Identifier',
     start: 0,
     end: 0,
-    moduleId: 0,
 
     name,
   }
@@ -611,7 +607,6 @@ export function createPipeSubstitution(): Node<PipeSubstitution> {
     type: 'PipeSubstitution',
     start: 0,
     end: 0,
-    moduleId: 0,
   }
 }
 
@@ -623,12 +618,10 @@ export function createCallExpressionStdLib(
     type: 'CallExpression',
     start: 0,
     end: 0,
-    moduleId: 0,
     callee: {
       type: 'Identifier',
       start: 0,
       end: 0,
-      moduleId: 0,
 
       name,
     },
@@ -645,12 +638,10 @@ export function createCallExpression(
     type: 'CallExpression',
     start: 0,
     end: 0,
-    moduleId: 0,
     callee: {
       type: 'Identifier',
       start: 0,
       end: 0,
-      moduleId: 0,
 
       name,
     },
@@ -666,7 +657,6 @@ export function createArrayExpression(
     type: 'ArrayExpression',
     start: 0,
     end: 0,
-    moduleId: 0,
 
     nonCodeMeta: nonCodeMetaEmpty(),
     elements,
@@ -680,7 +670,6 @@ export function createPipeExpression(
     type: 'PipeExpression',
     start: 0,
     end: 0,
-    moduleId: 0,
 
     body,
     nonCodeMeta: nonCodeMetaEmpty(),
@@ -697,14 +686,12 @@ export function createVariableDeclaration(
     type: 'VariableDeclaration',
     start: 0,
     end: 0,
-    moduleId: 0,
 
     declarations: [
       {
         type: 'VariableDeclarator',
         start: 0,
         end: 0,
-        moduleId: 0,
 
         id: createIdentifier(varName),
         init,
@@ -722,14 +709,12 @@ export function createObjectExpression(properties: {
     type: 'ObjectExpression',
     start: 0,
     end: 0,
-    moduleId: 0,
 
     nonCodeMeta: nonCodeMetaEmpty(),
     properties: Object.entries(properties).map(([key, value]) => ({
       type: 'ObjectProperty',
       start: 0,
       end: 0,
-      moduleId: 0,
       key: createIdentifier(key),
 
       value,
@@ -745,7 +730,6 @@ export function createUnaryExpression(
     type: 'UnaryExpression',
     start: 0,
     end: 0,
-    moduleId: 0,
 
     operator,
     argument,
@@ -761,7 +745,6 @@ export function createBinaryExpression([left, operator, right]: [
     type: 'BinaryExpression',
     start: 0,
     end: 0,
-    moduleId: 0,
 
     operator,
     left,

src/lang/std/__snapshots__/artifactGraph.test.ts.snap

@@ -13,7 +13,6 @@ Map {
       "range": [
         37,
         64,
-        0,
       ],
     },
     "pathIds": [
@@ -32,7 +31,6 @@ Map {
       "range": [
         37,
         64,
-        0,
       ],
     },
     "planeId": "UUID",
@@ -58,7 +56,6 @@ Map {
       "range": [
         70,
         86,
-        0,
       ],
     },
     "edgeIds": [
@@ -80,7 +77,6 @@ Map {
       "range": [
         92,
         119,
-        0,
       ],
     },
     "edgeCutId": "UUID",
@@ -103,7 +99,6 @@ Map {
       "range": [
         125,
         150,
-        0,
       ],
     },
     "edgeIds": [
@@ -125,7 +120,6 @@ Map {
       "range": [
         156,
         203,
-        0,
       ],
     },
     "edgeIds": [
@@ -147,7 +141,6 @@ Map {
       "range": [
         209,
         217,
-        0,
       ],
     },
     "edgeIds": [],
@@ -169,7 +162,6 @@ Map {
       "range": [
         231,
         254,
-        0,
       ],
     },
     "edgeIds": [
@@ -297,7 +289,6 @@ Map {
       "range": [
         260,
         299,
-        0,
       ],
     },
     "consumedEdgeId": "UUID",
@@ -316,7 +307,6 @@ Map {
       "range": [
         350,
         377,
-        0,
       ],
     },
     "planeId": "UUID",
@@ -341,7 +331,6 @@ Map {
       "range": [
         383,
         398,
-        0,
       ],
     },
     "edgeIds": [
@@ -363,7 +352,6 @@ Map {
       "range": [
         404,
         420,
-        0,
       ],
     },
     "edgeIds": [
@@ -385,7 +373,6 @@ Map {
       "range": [
         426,
         473,
-        0,
       ],
     },
     "edgeIds": [
@@ -407,7 +394,6 @@ Map {
       "range": [
         479,
         487,
-        0,
       ],
     },
     "edgeIds": [],
@@ -429,7 +415,6 @@ Map {
       "range": [
         501,
         522,
-        0,
       ],
     },
     "edgeIds": [

src/lang/std/artifactGraph.test.ts

@@ -49,26 +49,6 @@ sketch002 = startSketchOn(extrude001, seg02)
 extrude002 = extrude(5, sketch002)
 `
 
-const exampleCodeNo3D = `sketch003 = startSketchOn('YZ')
-  |> startProfileAt([5.82, 0], %)
-  |> angledLine([180, 11.54], %, $rectangleSegmentA001)
-  |> angledLine([
-       segAng(rectangleSegmentA001) - 90,
-       8.21
-     ], %, $rectangleSegmentB001)
-  |> angledLine([
-       segAng(rectangleSegmentA001),
-       -segLen(rectangleSegmentA001)
-     ], %, $rectangleSegmentC001)
-  |> lineTo([profileStartX(%), profileStartY(%)], %)
-  |> close(%)
-sketch004 = startSketchOn('-XZ')
-  |> startProfileAt([0, 14.36], %)
-  |> line([15.49, 0.05], %)
-  |> tangentialArcTo([0, 0], %)
-  |> tangentialArcTo([-6.8, 8.17], %)
-`
-
 const sketchOnFaceOnFaceEtc = `sketch001 = startSketchOn('XZ')
 |> startProfileAt([0, 0], %)
 |> line([4, 8], %)
@@ -103,7 +83,6 @@ extrude004 = extrude(3, sketch004)
 const codeToWriteCacheFor = {
   exampleCode1,
   sketchOnFaceOnFaceEtc,
-  exampleCodeNo3D,
 } as const
 
 type CodeKey = keyof typeof codeToWriteCacheFor
@@ -257,69 +236,6 @@ describe('testing createArtifactGraph', () => {
       await GraphTheGraph(theMap, 2000, 2000, 'exampleCode1.png')
     }, 20000)
   })
-
-  describe(`code with sketches but no extrusions or other 3D elements`, () => {
-    let ast: Program
-    let theMap: ReturnType<typeof createArtifactGraph>
-    it(`setup`, () => {
-      // putting this logic in here because describe blocks runs before beforeAll has finished
-      const {
-        orderedCommands,
-        responseMap,
-        ast: _ast,
-      } = getCommands('exampleCodeNo3D')
-      ast = _ast
-      theMap = createArtifactGraph({ orderedCommands, responseMap, ast })
-    })
-
-    it('there should be two planes, one for each sketch path', () => {
-      const planes = [...filterArtifacts({ types: ['plane'] }, theMap)].map(
-        (plane) => expandPlane(plane[1], theMap)
-      )
-      expect(planes).toHaveLength(2)
-      planes.forEach((path) => {
-        expect(path.type).toBe('plane')
-      })
-    })
-    it('there should be two paths, one on each plane', () => {
-      const paths = [...filterArtifacts({ types: ['path'] }, theMap)].map(
-        (path) => expandPath(path[1], theMap)
-      )
-      expect(paths).toHaveLength(2)
-      paths.forEach((path) => {
-        if (err(path)) throw path
-        expect(path.type).toBe('path')
-      })
-    })
-
-    it(`there should be 1 solid2D, just for the first closed path`, () => {
-      const solid2Ds = [...filterArtifacts({ types: ['solid2D'] }, theMap)]
-      expect(solid2Ds).toHaveLength(1)
-    })
-
-    it('there should be no extrusions', () => {
-      const extrusions = [...filterArtifacts({ types: ['sweep'] }, theMap)].map(
-        (extrusion) => expandSweep(extrusion[1], theMap)
-      )
-      expect(extrusions).toHaveLength(0)
-    })
-
-    it('there should be 8 segments, 4 + 1 (close) from the first sketch and 3 from the second', () => {
-      const segments = [...filterArtifacts({ types: ['segment'] }, theMap)].map(
-        (segment) => expandSegment(segment[1], theMap)
-      )
-      expect(segments).toHaveLength(8)
-    })
-
-    it('screenshot graph', async () => {
-      // Ostensibly this takes a screen shot of the graph of the artifactGraph
-      // but it's it also tests that all of the id links are correct because if one
-      // of the edges refers to a non-existent node, the graph will throw.
-      // further more we can check that each edge is bi-directional, if it's not
-      // by checking the arrow heads going both ways, on the graph.
-      await GraphTheGraph(theMap, 2000, 2000, 'exampleCodeNo3D.png')
-    }, 20000)
-  })
 })
 
 describe('capture graph of sketchOnFaceOnFace...', () => {
@@ -541,10 +457,7 @@ async function GraphTheGraph(
     `./src/lang/std/artifactMapGraphs/${imageName}`
   )
   // chop the top 30 pixels off the image
-  const originalImgExists = fs.existsSync(originalImgPath)
+  const originalImg = PNG.sync.read(fs.readFileSync(originalImgPath))
-  const originalImg = originalImgExists
-    ? PNG.sync.read(fs.readFileSync(originalImgPath))
-    : null
   // const img1Data = new Uint8Array(img1.data)
   // const img1DataChopped = img1Data.slice(30 * img1.width * 4)
   // img1.data = Buffer.from(img1DataChopped)
@@ -555,10 +468,10 @@ async function GraphTheGraph(
   const newImageDataChopped = newImageData.slice(30 * newImage.width * 4)
   newImage.data = Buffer.from(newImageDataChopped)
 
-  const { width, height } = originalImg ?? newImage
+  const { width, height } = originalImg
   const diff = new PNG({ width, height })
 
-  const imageSizeDifferent = originalImg?.data.length !== newImage.data.length
+  const imageSizeDifferent = originalImg.data.length !== newImage.data.length
   let numDiffPixels = 0
   if (!imageSizeDifferent) {
     numDiffPixels = pixelmatch(
@@ -610,7 +523,7 @@ describe('testing getArtifactsToUpdate', () => {
         sweepId: '',
         codeRef: {
           pathToNode: [['body', '']],
-          range: [37, 64, 0],
+          range: [37, 64],
         },
       },
     ])
@@ -622,7 +535,7 @@ describe('testing getArtifactsToUpdate', () => {
         surfaceIds: [],
         edgeIds: [],
         codeRef: {
-          range: [231, 254, 0],
+          range: [231, 254],
           pathToNode: [['body', '']],
         },
       },
@@ -632,7 +545,7 @@ describe('testing getArtifactsToUpdate', () => {
         planeId: expect.any(String),
         sweepId: expect.any(String),
         codeRef: {
-          range: [37, 64, 0],
+          range: [37, 64],
           pathToNode: [['body', '']],
         },
         solid2dId: expect.any(String),
@@ -645,7 +558,7 @@ describe('testing getArtifactsToUpdate', () => {
         surfaceId: '',
         edgeIds: [],
         codeRef: {
-          range: [70, 86, 0],
+          range: [70, 86],
           pathToNode: [['body', '']],
         },
       },
@@ -655,7 +568,7 @@ describe('testing getArtifactsToUpdate', () => {
         planeId: expect.any(String),
         sweepId: expect.any(String),
         codeRef: {
-          range: [37, 64, 0],
+          range: [37, 64],
           pathToNode: [['body', '']],
         },
         solid2dId: expect.any(String),
@@ -669,7 +582,7 @@ describe('testing getArtifactsToUpdate', () => {
         edgeIds: [],
         surfaceId: '',
         codeRef: {
-          range: [260, 299, 0],
+          range: [260, 299],
           pathToNode: [['body', '']],
         },
       },
@@ -679,7 +592,7 @@ describe('testing getArtifactsToUpdate', () => {
         surfaceId: expect.any(String),
         edgeIds: expect.any(Array),
         codeRef: {
-          range: [92, 119, 0],
+          range: [92, 119],
           pathToNode: [['body', '']],
         },
         edgeCutId: expect.any(String),
@@ -699,7 +612,7 @@ describe('testing getArtifactsToUpdate', () => {
         surfaceId: expect.any(String),
         edgeIds: expect.any(Array),
         codeRef: {
-          range: [156, 203, 0],
+          range: [156, 203],
           pathToNode: [['body', '']],
         },
       },
@@ -710,7 +623,7 @@ describe('testing getArtifactsToUpdate', () => {
         surfaceIds: expect.any(Array),
         edgeIds: expect.any(Array),
         codeRef: {
-          range: [231, 254, 0],
+          range: [231, 254],
           pathToNode: [['body', '']],
         },
       },
@@ -727,7 +640,7 @@ describe('testing getArtifactsToUpdate', () => {
         surfaceId: expect.any(String),
         edgeIds: expect.any(Array),
         codeRef: {
-          range: [125, 150, 0],
+          range: [125, 150],
           pathToNode: [['body', '']],
         },
       },
@@ -738,7 +651,7 @@ describe('testing getArtifactsToUpdate', () => {
         surfaceIds: expect.any(Array),
         edgeIds: expect.any(Array),
         codeRef: {
-          range: [231, 254, 0],
+          range: [231, 254],
           pathToNode: [['body', '']],
         },
       },
@@ -755,7 +668,7 @@ describe('testing getArtifactsToUpdate', () => {
         surfaceId: expect.any(String),
         edgeIds: expect.any(Array),
         codeRef: {
-          range: [92, 119, 0],
+          range: [92, 119],
           pathToNode: [['body', '']],
         },
         edgeCutId: expect.any(String),
@@ -767,7 +680,7 @@ describe('testing getArtifactsToUpdate', () => {
         surfaceIds: expect.any(Array),
         edgeIds: expect.any(Array),
         codeRef: {
-          range: [231, 254, 0],
+          range: [231, 254],
           pathToNode: [['body', '']],
         },
       },
@@ -784,7 +697,7 @@ describe('testing getArtifactsToUpdate', () => {
         surfaceId: expect.any(String),
         edgeIds: expect.any(Array),
         codeRef: {
-          range: [70, 86, 0],
+          range: [70, 86],
           pathToNode: [['body', '']],
         },
       },
@@ -795,7 +708,7 @@ describe('testing getArtifactsToUpdate', () => {
         surfaceIds: expect.any(Array),
         edgeIds: expect.any(Array),
         codeRef: {
-          range: [231, 254, 0],
+          range: [231, 254],
           pathToNode: [['body', '']],
         },
       },
@@ -813,7 +726,7 @@ describe('testing getArtifactsToUpdate', () => {
         surfaceIds: expect.any(Array),
         edgeIds: expect.any(Array),
         codeRef: {
-          range: [231, 254, 0],
+          range: [231, 254],
           pathToNode: [['body', '']],
         },
       },
@@ -831,7 +744,7 @@ describe('testing getArtifactsToUpdate', () => {
         surfaceIds: expect.any(Array),
         edgeIds: expect.any(Array),
         codeRef: {
-          range: [231, 254, 0],
+          range: [231, 254],
           pathToNode: [['body', '']],
         },
       },

src/lang/std/artifactGraph.ts

@@ -36,12 +36,9 @@ interface solid2D {
 }
 export interface PathArtifactRich {
   type: 'path'
-  /** A path must always lie on a plane */
   plane: PlaneArtifact | WallArtifact
-  /** A path must always contain 0 or more segments */
   segments: Array<SegmentArtifact>
-  /** A path may not result in a sweep artifact */
+  sweep: SweepArtifact
-  sweep?: SweepArtifact
   codeRef: CommonCommandProperties
 }
 
@@ -590,15 +587,13 @@ export function expandPath(
     { keys: path.segIds, types: ['segment'] },
     artifactGraph
   )
-  const sweep = path.sweepId
+  const sweep = getArtifactOfTypes(
-    ? getArtifactOfTypes(
     {
       key: path.sweepId,
       types: ['sweep'],
     },
     artifactGraph
   )
-    : undefined
   const plane = getArtifactOfTypes(
     { key: path.planeId, types: ['plane', 'wall'] },
     artifactGraph

src/lang/std/engineConnection.ts

@@ -28,7 +28,6 @@ import {
 } from 'lib/constants'
 import { KclManager } from 'lang/KclSingleton'
 import { reportRejection } from 'lib/trap'
-import { markOnce } from 'lib/performance'
 import { MachineManager } from 'components/MachineManagerProvider'
 
 // TODO(paultag): This ought to be tweakable.
@@ -331,7 +330,6 @@ class EngineConnection extends EventTarget {
     token?: string
     callbackOnEngineLiteConnect?: () => void
   }) {
-    markOnce('code/startInitialEngineConnect')
     super()
 
     this.engineCommandManager = engineCommandManager
@@ -787,7 +785,6 @@ class EngineConnection extends EventTarget {
             this.dispatchEvent(
               new CustomEvent(EngineConnectionEvents.Opened, { detail: this })
             )
-            markOnce('code/endInitialEngineConnect')
           }
           this.unreliableDataChannel?.addEventListener(
             'open',

src/lang/std/sketch.ts

@@ -1823,13 +1823,11 @@ export const updateStartProfileAtArgs: SketchLineHelper['updateArgs'] = ({
       modifiedAst: {
         start: 0,
         end: 0,
-        moduleId: 0,
         body: [],
 
         nonCodeMeta: {
           start: 0,
           end: 0,
-          moduleId: 0,
           startNodes: [],
           nonCodeNodes: [],
         },

src/lang/wasm.ts

@@ -120,8 +120,8 @@ const initialise = async () => {
 
 export const initPromise = initialise()
 
-export const rangeTypeFix = (ranges: number[][]): [number, number, number][] =>
+export const rangeTypeFix = (ranges: number[][]): [number, number][] =>
-  ranges.map(([start, end, moduleId]) => [start, end, moduleId])
+  ranges.map(([start, end]) => [start, end])
 
 export const parse = (code: string | Error): Node<Program> | Error => {
   if (err(code)) return code