Merge branch 'main' into pierremtb/issue3528-Add-electron-updater

2024-08-27 05:29:22 -04:00
parent e0eb254453 b231a26115
commit d7403c111d
30 changed files with 1276 additions and 351 deletions
--- a/.codespellrc
+++ b/.codespellrc
@ -1,3 +1,3 @@
 [codespell]
 ignore-words-list: crate,everytime,inout,co-ordinate,ot,nwo,absolutey,atleast,ue,afterall
-skip: **/target,node_modules,build,**/Cargo.lock,./docs/kcl/*.md,./src-tauri/gen/schemas,.yarn.lock,**/yarn.lock
+skip: **/target,node_modules,build,**/Cargo.lock,./docs/kcl/*.md,.yarn.lock,**/yarn.lock
--- a/.github/workflows/cargo-test.yml
+++ b/.github/workflows/cargo-test.yml
@ -38,11 +38,6 @@ jobs:
        with:
          toolchain: stable
          override: true
-      - name: install dependencies
-        if: matrix.dir ==  'src-tauri'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
      - name: Install vector
        run: |
          curl --proto '=https' --tlsv1.2 -sSfL https://sh.vector.dev > /tmp/vector.sh
--- a/.github/workflows/playwright.yml
+++ b/.github/workflows/playwright.yml
@ -423,14 +423,14 @@ jobs:
    - uses: actions/upload-artifact@v4
      if: ${{ !cancelled() && (success() || failure()) }}
      with:
-        name: test-results-electron-${{ github.sha }}
+        name: test-results-electron-${{ matrix.os }}-${{ github.sha }}
        path: test-results/
        retention-days: 30
        overwrite: true
    - uses: actions/upload-artifact@v4
      if: ${{ !cancelled() && (success() || failure()) }}
      with:
-        name: playwright-report-electron-${{ github.sha }}
+        name: playwright-report-electron-${{ matrix.os }}-${{ github.sha }}
        path: playwright-report/
        retention-days: 30
        overwrite: true
--- a/.gitignore
+++ b/.gitignore
@ -54,7 +54,6 @@ e2e/playwright/export-snapshots/*

 ## generated files
 src/**/*.typegen.ts
-src-tauri/gen

 src/wasm-lib/grackle/stdlib_cube_partial.json
 Mac_App_Distribution.provisionprofile
@ -66,7 +65,3 @@ venv

 # electron
 out/
-
-src-tauri/target
-electron-test-projects-dir
-electron-test-projects-dir-2
--- a/Info.plist
+++ b/Info.plist
@ -0,0 +1,344 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>CFBundleDocumentTypes</key>
+        <array>
+            <dict>
+                <key>LSItemContentTypes</key>
+                <array>
+                    <string>dev.zoo.kcl</string>
+                </array>
+                <key>CFBundleTypeName</key>
+                <string>KCL</string>
+                <key>CFBundleTypeRole</key>
+                <string>Editor</string>
+                <key>LSTypeIsPackage</key>
+                <false/>
+                <key>LSHandlerRank</key>
+                <string>Owner</string>
+            </dict>
+            <dict>
+                <key>LSItemContentTypes</key>
+                <array>
+                    <string>dev.zoo.toml</string>
+                </array>
+                <key>CFBundleTypeName</key>
+                <string>TOML</string>
+                <key>CFBundleTypeRole</key>
+                <string>Editor</string>
+                <key>LSTypeIsPackage</key>
+                <false/>
+                <key>LSHandlerRank</key>
+                <string>Default</string>
+            </dict>
+            <dict>
+                <key>LSItemContentTypes</key>
+                <array>
+                    <string>dev.zoo.gltf</string>
+                </array>
+                <key>CFBundleTypeName</key>
+                <string>glTF</string>
+                <key>CFBundleTypeRole</key>
+                <string>Editor</string>
+                <key>LSTypeIsPackage</key>
+                <false/>
+                <key>LSHandlerRank</key>
+                <string>Default</string>
+            </dict>
+            <dict>
+                <key>LSItemContentTypes</key>
+                <array>
+                    <string>dev.zoo.glb</string>
+                </array>
+                <key>CFBundleTypeName</key>
+                <string>glb</string>
+                <key>CFBundleTypeRole</key>
+                <string>Editor</string>
+                <key>LSTypeIsPackage</key>
+                <false/>
+                <key>LSHandlerRank</key>
+                <string>Default</string>
+            </dict>
+            <dict>
+                <key>LSItemContentTypes</key>
+                <array>
+                    <string>dev.zoo.step</string>
+                </array>
+                <key>CFBundleTypeName</key>
+                <string>STEP</string>
+                <key>CFBundleTypeRole</key>
+                <string>Editor</string>
+                <key>LSTypeIsPackage</key>
+                <false/>
+                <key>LSHandlerRank</key>
+                <string>Default</string>
+            </dict>
+            <dict>
+                <key>LSItemContentTypes</key>
+                <array>
+                    <string>dev.zoo.fbx</string>
+                </array>
+                <key>CFBundleTypeName</key>
+                <string>FBX</string>
+                <key>CFBundleTypeRole</key>
+                <string>Editor</string>
+                <key>LSTypeIsPackage</key>
+                <false/>
+                <key>LSHandlerRank</key>
+                <string>Default</string>
+            </dict>
+            <dict>
+                <key>LSItemContentTypes</key>
+                <array>
+                    <string>dev.zoo.sldprt</string>
+                </array>
+                <key>CFBundleTypeName</key>
+                <string>Solidworks Part</string>
+                <key>CFBundleTypeRole</key>
+                <string>Viewer</string>
+                <key>LSTypeIsPackage</key>
+                <false/>
+                <key>LSHandlerRank</key>
+                <string>Default</string>
+            </dict>
+            <dict>
+                <key>LSItemContentTypes</key>
+                <array>
+                    <string>public.geometry-definition-format</string>
+                </array>
+                <key>CFBundleTypeName</key>
+                <string>OBJ</string>
+                <key>CFBundleTypeRole</key>
+                <string>Editor</string>
+                <key>LSTypeIsPackage</key>
+                <false/>
+                <key>LSHandlerRank</key>
+                <string>Default</string>
+            </dict>
+            <dict>
+                <key>LSItemContentTypes</key>
+                <array>
+                    <string>public.polygon-file-format</string>
+                </array>
+                <key>CFBundleTypeName</key>
+                <string>PLY</string>
+                <key>CFBundleTypeRole</key>
+                <string>Editor</string>
+                <key>LSTypeIsPackage</key>
+                <false/>
+                <key>LSHandlerRank</key>
+                <string>Default</string>
+            </dict>
+            <dict>
+                <key>LSItemContentTypes</key>
+                <array>
+                    <string>public.standard-tesselated-geometry-format</string>
+                </array>
+                <key>CFBundleTypeName</key>
+                <string>STL</string>
+                <key>CFBundleTypeRole</key>
+                <string>Editor</string>
+                <key>LSTypeIsPackage</key>
+                <false/>
+                <key>LSHandlerRank</key>
+                <string>Default</string>
+            </dict>
+            <dict>
+                <key>LSItemContentTypes</key>
+                <array>
+                    <string>public.folder</string>
+                </array>
+                <key>CFBundleTypeName</key>
+                <string>Folders</string>
+                <key>CFBundleTypeRole</key>
+                <string>Viewer</string>
+                <key>LSHandlerRank</key>
+                <string>Alternate</string>
+            </dict>
+        </array>
+        <key>UTExportedTypeDeclarations</key>
+        <array>
+            <dict>
+                <key>UTTypeIdentifier</key>
+                <string>dev.zoo.kcl</string>
+                <key>UTTypeReferenceURL</key>
+                <string>https://zoo.dev/docs/kcl</string>
+                <key>UTTypeConformsTo</key>
+                <array>
+                    <string>public.source-code</string>
+                    <string>public.data</string>
+                    <string>public.text</string>
+                    <string>public.plain-text</string>
+                    <string>public.3d-content</string>
+                    <string>public.script</string>
+                </array>
+                <key>UTTypeDescription</key>
+                <string>KCL (KittyCAD Language) document</string>
+                <key>UTTypeTagSpecification</key>
+                <dict>
+                    <key>public.filename-extension</key>
+                    <array>
+                        <string>kcl</string>
+                    </array>
+                    <key>public.mime-type</key>
+                    <array>
+                        <string>text/vnd.zoo.kcl</string>
+                    </array>
+                </dict>
+            </dict>
+            <dict>
+                <key>UTTypeIdentifier</key>
+                <string>dev.zoo.gltf</string>
+                <key>UTTypeReferenceURL</key>
+                <string>https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html</string>
+                <key>UTTypeConformsTo</key>
+                <array>
+                    <string>public.data</string>
+                    <string>public.text</string>
+                    <string>public.plain-text</string>
+                    <string>public.3d-content</string>
+                    <string>public.json</string>
+                </array>
+                <key>UTTypeDescription</key>
+                <string>Graphics Library Transmission Format (glTF)</string>
+                <key>UTTypeTagSpecification</key>
+                <dict>
+                    <key>public.filename-extension</key>
+                    <array>
+                        <string>gltf</string>
+                    </array>
+                    <key>public.mime-type</key>
+                    <array>
+                        <string>model/gltf+json</string>
+                    </array>
+                </dict>
+            </dict>
+            <dict>
+                <key>UTTypeIdentifier</key>
+                <string>dev.zoo.glb</string>
+                <key>UTTypeReferenceURL</key>
+                <string>https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html</string>
+                <key>UTTypeConformsTo</key>
+                <array>
+                    <string>public.data</string>
+                    <string>public.3d-content</string>
+                </array>
+                <key>UTTypeDescription</key>
+                <string>Graphics Library Transmission Format (glTF) binary</string>
+                <key>UTTypeTagSpecification</key>
+                <dict>
+                    <key>public.filename-extension</key>
+                    <array>
+                        <string>glb</string>
+                    </array>
+                    <key>public.mime-type</key>
+                    <array>
+                        <string>model/gltf-binary</string>
+                    </array>
+                </dict>
+            </dict>
+            <dict>
+                <key>UTTypeIdentifier</key>
+                <string>dev.zoo.step</string>
+                <key>UTTypeReferenceURL</key>
+                <string>https://www.loc.gov/preservation/digital/formats/fdd/fdd000448.shtml</string>
+                <key>UTTypeConformsTo</key>
+                <array>
+                    <string>public.data</string>
+                    <string>public.3d-content</string>
+                    <string>public.text</string>
+                    <string>public.plain-text</string>
+                </array>
+                <key>UTTypeDescription</key>
+                <string>STEP-file, ISO 10303-21</string>
+                <key>UTTypeTagSpecification</key>
+                <dict>
+                    <key>public.filename-extension</key>
+                    <array>
+                        <string>step</string>
+                        <string>stp</string>
+                    </array>
+                    <key>public.mime-type</key>
+                    <array>
+                        <string>model/step</string>
+                    </array>
+                </dict>
+            </dict>
+            <dict>
+                <key>UTTypeIdentifier</key>
+                <string>dev.zoo.sldprt</string>
+                <key>UTTypeReferenceURL</key>
+                <string>https://docs.fileformat.com/cad/sldprt/</string>
+                <key>UTTypeConformsTo</key>
+                <array>
+                    <string>public.data</string>
+                    <string>public.3d-content</string>
+                </array>
+                <key>UTTypeDescription</key>
+                <string>Solidworks Part</string>
+                <key>UTTypeTagSpecification</key>
+                <dict>
+                    <key>public.filename-extension</key>
+                    <array>
+                        <string>sldprt</string>
+                    </array>
+                    <key>public.mime-type</key>
+                    <array>
+                        <string>model/vnd.solidworks.sldprt</string>
+                    </array>
+                </dict>
+            </dict>
+            <dict>
+                <key>UTTypeIdentifier</key>
+                <string>dev.zoo.fbx</string>
+                <key>UTTypeReferenceURL</key>
+                <string>https://en.wikipedia.org/wiki/FBX</string>
+                <key>UTTypeConformsTo</key>
+                <array>
+                    <string>public.data</string>
+                    <string>public.3d-content</string>
+                </array>
+                <key>UTTypeDescription</key>
+                <string>Autodesk Filmbox (FBX) format</string>
+                <key>UTTypeTagSpecification</key>
+                <dict>
+                    <key>public.filename-extension</key>
+                    <array>
+                        <string>fbx</string>
+                        <string>fbxb</string>
+                    </array>
+                    <key>public.mime-type</key>
+                    <array>
+                        <string>model/vnd.autodesk.fbx</string>
+                    </array>
+                </dict>
+            </dict>
+            <dict>
+                <key>UTTypeIdentifier</key>
+                <string>dev.zoo.toml</string>
+                <key>UTTypeReferenceURL</key>
+                <string>https://toml.io/en/</string>
+                <key>UTTypeConformsTo</key>
+                <array>
+                    <string>public.data</string>
+                    <string>public.text</string>
+                    <string>public.plain-text</string>
+                </array>
+                <key>UTTypeDescription</key>
+                <string>Tom's Obvious Minimal Language</string>
+                <key>UTTypeTagSpecification</key>
+                <dict>
+                    <key>public.filename-extension</key>
+                    <array>
+                        <string>kcl</string>
+                    </array>
+                    <key>public.mime-type</key>
+                    <array>
+                        <string>text/toml</string>
+                    </array>
+                </dict>
+            </dict>
+        </array>
+    </dict>
+</plist>
--- a/README.md
+++ b/README.md
@ -110,7 +110,6 @@ Which commands from setup are one off vs need to be run every time?
 The following will need to be run when checking out a new commit and guarantees the build is not stale:
 ```bash
 yarn install
-yarn wasm-prep
 yarn build:wasm-dev # or yarn build:wasm for slower but more production-like build
 yarn start # or yarn build:local && yarn serve for slower but more production-like build
 ```
@ -374,3 +373,14 @@ yarn wdio run wdio.conf.ts
 ## KCL

 For how to contribute to KCL, [see our KCL README](https://github.com/KittyCAD/modeling-app/tree/main/src/wasm-lib/kcl).
+
+
+- Theme removed as a project setting
+- Rename kcl Value to Expr, MemoryItem to KclValue
+- Remove ProgramReturn
+- Macro to make KCL snapshot tests easier
+- Add logical not operator using bang !
+- ensure we never execute over ourselves 
+- Unify KCL expression execution (2 + draw() didn't work)
+- Text-CAD-integration
+
--- a/e2e/playwright/editor-tests.spec.ts
+++ b/e2e/playwright/editor-tests.spec.ts
@ -84,6 +84,63 @@ test.describe('Editor tests', () => {
    |> close(%)`)
  })

+  test('if you click the format button it formats your code and executes so lints are still there', async ({
+    page,
+  }) => {
+    const u = await getUtils(page)
+    await page.setViewportSize({ width: 1000, height: 500 })
+
+    await u.waitForAuthSkipAppStart()
+
+    // check no error to begin with
+    await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
+
+    await u.codeLocator.click()
+    await page.keyboard.type(`const sketch_001 = startSketchOn('XY')
+  |> startProfileAt([-10, -10], %)
+  |> line([20, 0], %)
+  |> line([0, 20], %)
+  |> line([-20, 0], %)
+  |> close(%)`)
+
+    await u.openDebugPanel()
+    await u.expectCmdLog('[data-message-type="execution-done"]')
+    await u.closeDebugPanel()
+
+    // error in guter
+    await expect(page.locator('.cm-lint-marker-info').first()).toBeVisible()
+
+    // error text on hover
+    await page.hover('.cm-lint-marker-info')
+    await expect(
+      page.getByText('Identifiers must be lowerCamelCase').first()
+    ).toBeVisible()
+
+    await page.locator('#code-pane button:first-child').click()
+    await page.locator('button:has-text("Format code")').click()
+
+    await u.openDebugPanel()
+    await u.expectCmdLog('[data-message-type="execution-done"]')
+    await u.closeDebugPanel()
+
+    await expect(page.locator('.cm-content'))
+      .toHaveText(`const sketch_001 = startSketchOn('XY')
+    |> startProfileAt([-10, -10], %)
+    |> line([20, 0], %)
+    |> line([0, 20], %)
+    |> line([-20, 0], %)
+    |> close(%)`)
+
+    // error in guter
+    await expect(page.locator('.cm-lint-marker-info').first()).toBeVisible()
+
+    // error text on hover
+    await page.hover('.cm-lint-marker-info')
+    await expect(
+      page.getByText('Identifiers must be lowerCamelCase').first()
+    ).toBeVisible()
+  })
+
  test('fold gutters work', async ({ page }) => {
    const u = await getUtils(page)

@ -241,6 +298,67 @@ test.describe('Editor tests', () => {
    |> close(%)`)
  })

+  test('if you use the format keyboard binding it formats your code and executes so lints are shown', async ({
+    page,
+  }) => {
+    const u = await getUtils(page)
+    await page.addInitScript(async () => {
+      localStorage.setItem(
+        'persistCode',
+        `const sketch_001 = startSketchOn('XY')
+  |> startProfileAt([-10, -10], %)
+  |> line([20, 0], %)
+  |> line([0, 20], %)
+  |> line([-20, 0], %)
+  |> close(%)`
+      )
+      localStorage.setItem('disableAxis', 'true')
+    })
+    await page.setViewportSize({ width: 1000, height: 500 })
+
+    await u.waitForAuthSkipAppStart()
+
+    await u.openDebugPanel()
+    await u.expectCmdLog('[data-message-type="execution-done"]')
+    await u.closeDebugPanel()
+
+    // error in guter
+    await expect(page.locator('.cm-lint-marker-info').first()).toBeVisible()
+
+    // error text on hover
+    await page.hover('.cm-lint-marker-info')
+    await expect(
+      page.getByText('Identifiers must be lowerCamelCase').first()
+    ).toBeVisible()
+
+    // focus the editor
+    await u.codeLocator.click()
+
+    // Hit alt+shift+f to format the code
+    await page.keyboard.press('Alt+Shift+KeyF')
+
+    await u.openDebugPanel()
+    await u.expectCmdLog('[data-message-type="execution-done"]')
+    await u.closeDebugPanel()
+
+    await expect(page.locator('.cm-content'))
+      .toHaveText(`const sketch_001 = startSketchOn('XY')
+    |> startProfileAt([-10, -10], %)
+    |> line([20, 0], %)
+    |> line([0, 20], %)
+    |> line([-20, 0], %)
+    |> close(%)`)
+
+    // error in guter
+    await expect(page.locator('.cm-lint-marker-info').first()).toBeVisible()
+
+    // error text on hover
+    await page.hover('.cm-lint-marker-info')
+    await expect(
+      page.getByText('Identifiers must be lowerCamelCase').first()
+    ).toBeVisible()
+  })
+
  test('if you write kcl with lint errors you get lints', async ({ page }) => {
    const u = await getUtils(page)
    await page.setViewportSize({ width: 1000, height: 500 })
@ -399,7 +517,7 @@ test.describe('Editor tests', () => {
  const width = 0.500
  const height = 0.500
  const dia = 4
-  
+
  fn squareHole = (l, w) => {
    const squareHoleSketch = startSketchOn('XY')
    |> startProfileAt([-width / 2, -length / 2], %)
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Zoom-to-fit-on-load---solid-2d-1-Google-Chrome-win32.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Zoom-to-fit-on-load---solid-2d-1-Google-Chrome-win32.png
--- a/e2e/playwright/text-to-cad-tests.spec.ts
+++ b/e2e/playwright/text-to-cad-tests.spec.ts
@ -6,6 +6,8 @@ import {
  setupElectron,
  createProjectAndRenameIt,
 } from './test-utils'
+import { join } from 'path'
+import fs from 'fs'

 test.beforeEach(async ({ context, page }) => {
  await setup(context, page)
@ -694,10 +696,9 @@ test(
  'Text-to-CAD functionality',
  { tag: '@electron' },
  async ({ browserName }, testInfo) => {
-    const { electronApp, page } = await setupElectron({
-      testInfo,
-      folderSetupFn: async () => {},
-    })
+    const { electronApp, page, dir } = await setupElectron({ testInfo })
+    const fileExists = () =>
+      fs.existsSync(join(dir, 'test-000', 'lego-2x4.kcl'))

    await page.setViewportSize({ width: 1200, height: 500 })

@ -721,6 +722,7 @@ test(
      // File is considered created if it shows up in the Project Files pane
      const file = page.getByRole('button', { name: 'lego-2x4.kcl' })
      await expect(file).toBeVisible({ timeout: 20_000 })
+      expect(fileExists()).toBeTruthy()
    })

    await test.step(`Test file navigation`, async () => {
@ -741,6 +743,7 @@ test(
        `Successfully deleted file "lego-2x4.kcl"`
      )
      await expect(submittingToastMessage).toBeVisible()
+      expect(fileExists()).toBeFalsy()
    })

    await electronApp.close()
--- a/forge.config.ts
+++ b/forge.config.ts
@ -6,10 +6,17 @@ import { MakerZIP } from '@electron-forge/maker-zip'
 import { MakerDeb } from '@electron-forge/maker-deb'
 import { MakerRpm } from '@electron-forge/maker-rpm'
 import { VitePlugin } from '@electron-forge/plugin-vite'
+import { MakerWix, MakerWixConfig } from '@electron-forge/maker-wix'
 import { FusesPlugin } from '@electron-forge/plugin-fuses'
 import { FuseV1Options, FuseVersion } from '@electron/fuses'
 import path from 'path'

+interface ExtendedMakerWixConfig extends MakerWixConfig {
+  // see https://github.com/electron/forge/issues/3673
+  // this is an undocumented property of electron-wix-msi
+  associateExtensions?: string
+}
+
 const rootDir = process.cwd()

 const config: ForgeConfig = {
@ -25,6 +32,13 @@ const config: ForgeConfig = {
      undefined,
    executableName: process.platform === 'linux' ? 'zoo-modeling-app' : 'Zoo Modeling App',
    icon: path.resolve(rootDir, 'assets', 'icon'),
+    protocols: [
+      {
+        name: 'Zoo Studio',
+        schemes: ['zoo-studio'],
+      },
+    ],
+    extendInfo: 'Info.plist', // Information for file associations.
  },
  rebuildConfig: {},
  makers: [
@ -33,12 +47,6 @@ const config: ForgeConfig = {
      remoteReleases: `https://${process.env.WEBSITE_DIR}/win32/${arch}`,
      setupIcon: path.resolve(rootDir, 'assets', 'icon.ico'),
    })),
-    new MakerWix({
-      features: {
-        autoLaunch: true,
-        autoUpdate: true,
-      },
-    }),
    new MakerDMG(),
    new MakerZIP(
      (arch) => ({
@ -46,6 +54,14 @@ const config: ForgeConfig = {
      }),
      ['darwin']
    ),
+    new MakerWix({
+      features: {
+        autoLaunch: true,
+        autoUpdate: true,
+      },
+      icon: path.resolve(rootDir, 'assets', 'icon.ico'),
+      associateExtensions: 'kcl',
+    } as ExtendedMakerWixConfig),
    new MakerRpm({
      options: {
        icon: path.resolve(rootDir, 'assets', 'icon.png'),
--- a/package.json
+++ b/package.json
@ -84,13 +84,12 @@
    "fmt-check": "prettier --check ./src *.ts *.json *.js ./e2e ./packages",
    "fetch:wasm": "./get-latest-wasm-bundle.sh",
    "isomorphic-copy-wasm": "(copy src/wasm-lib/pkg/wasm_lib_bg.wasm public || cp src/wasm-lib/pkg/wasm_lib_bg.wasm public)",
-    "build:wasm-dev": "(cd src/wasm-lib && wasm-pack build --dev --target web --out-dir pkg && cargo test -p kcl-lib export_bindings) && yarn isomorphic-copy-wasm && yarn fmt",
-    "build:wasm": "cd src/wasm-lib && wasm-pack build --release --target web --out-dir pkg && cargo test -p kcl-lib export_bindings && cd ../.. && yarn isomorphic-copy-wasm && yarn fmt",
-    "build:wasm-clean": "yarn wasm-prep && yarn build:wasm",
+    "build:wasm-dev": "yarn wasm-prep && (cd src/wasm-lib && wasm-pack build --dev --target web --out-dir pkg && cargo test -p kcl-lib export_bindings) && yarn isomorphic-copy-wasm && yarn fmt",
+    "build:wasm": "yarn wasm-prep && cd src/wasm-lib && wasm-pack build --release --target web --out-dir pkg && cargo test -p kcl-lib export_bindings && cd ../.. && yarn isomorphic-copy-wasm && yarn fmt",
    "remove-importmeta": "sed -i 's/import.meta.url/window.location.origin/g' \"./src/wasm-lib/pkg/wasm_lib.js\"; sed -i '' 's/import.meta.url/window.location.origin/g' \"./src/wasm-lib/pkg/wasm_lib.js\" || echo \"sed for both mac and linux\"",
    "wasm-prep": "rm -rf src/wasm-lib/pkg && mkdir src/wasm-lib/pkg && rm -rf src/wasm-lib/kcl/bindings",
    "lint": "eslint --fix src e2e",
-    "bump-jsons": "echo \"$(jq --arg v \"$VERSION\" '.version=$v' package.json --indent 2)\" > package.json && echo \"$(jq --arg v \"$VERSION\" '.version=$v' src-tauri/tauri.conf.json --indent 2)\" > src-tauri/tauri.conf.json",
+    "bump-jsons": "echo \"$(jq --arg v \"$VERSION\" '.version=$v' package.json --indent 2)\" > package.json",
    "postinstall": "yarn xstate:typegen && ./node_modules/.bin/electron-rebuild",
    "xstate:typegen": "yarn xstate typegen \"src/**/*.ts?(x)\"",
    "make:dev": "make dev",
--- a/src/clientSideScene/CameraControls.ts
+++ b/src/clientSideScene/CameraControls.ts
@ -1,4 +1,4 @@
-import { MouseGuard } from 'lib/cameraControls'
+import { cameraMouseDragGuards, MouseGuard } from 'lib/cameraControls'
 import {
  Euler,
  MathUtils,
@ -81,24 +81,7 @@ export class CameraControls {
  pendingZoom: number | null = null
  pendingRotation: Vector2 | null = null
  pendingPan: Vector2 | null = null
-  interactionGuards: MouseGuard = {
-    pan: {
-      description: 'Right click + Shift + drag or middle click + drag',
-      callback: (e) => !!(e.buttons & 4) && !e.ctrlKey,
-    },
-    zoom: {
-      description: 'Scroll wheel or Right click + Ctrl + drag',
-      dragCallback: (e) => e.button === 2 && e.ctrlKey,
-      scrollCallback: () => true,
-    },
-    rotate: {
-      description: 'Right click + drag',
-      callback: (e) => {
-        console.log('event', e)
-        return !!(e.buttons & 2)
-      },
-    },
-  }
+  interactionGuards: MouseGuard = cameraMouseDragGuards.KittyCAD
  isFovAnimationInProgress = false
  fovBeforeOrtho = 45
  get isPerspective() {
--- a/src/components/AppHeader.module.css
+++ b/src/components/AppHeader.module.css
@ -4,4 +4,21 @@
 */
 .header {
  grid-template-columns: 1fr auto 1fr;
+  -webkit-app-region: drag; /* Make the header of the app draggable */
+}
+
+.header button {
+  -webkit-app-region: no-drag; /* Make the button not draggable */
+}
+
+.header a {
+  -webkit-app-region: no-drag; /* Make the link not draggable */
+}
+
+.header textarea {
+  -webkit-app-region: no-drag; /* Make the textarea not draggable */
+}
+
+.header input {
+  -webkit-app-region: no-drag; /* Make the input not draggable */
 }
--- a/src/components/ProjectSidebarMenu.tsx
+++ b/src/components/ProjectSidebarMenu.tsx
@ -25,8 +25,17 @@ const ProjectSidebarMenu = ({
  project?: IndexLoaderData['project']
  file?: IndexLoaderData['file']
 }) => {
+  // Make room for traffic lights on desktop left side.
+  // TODO: make sure this doesn't look like shit on Linux or Windows
+  const trafficLightsOffset =
+    isDesktop() && window.electron.os.isMac ? 'ml-20' : ''
  return (
-    <div className="!no-underline h-full mr-auto max-h-min min-h-12 min-w-max flex items-center gap-2">
+    <div
+      className={
+        '!no-underline h-full mr-auto max-h-min min-h-12 min-w-max flex items-center gap-2 ' +
+        trafficLightsOffset
+      }
+    >
      <AppLogoLink project={project} file={file} />
      {enableMenu ? (
        <ProjectMenuPopover project={project} file={file} />
--- a/src/lang/KclSingleton.ts
+++ b/src/lang/KclSingleton.ts
@ -399,6 +399,9 @@ export class KclManager {
    codeManager.updateCodeStateEditor(code)
    // Write back to the file system.
    codeManager.writeToFile()
+
+    // execute the code.
+    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.
--- a/src/lang/modifyAst/addFillet.test.ts
+++ b/src/lang/modifyAst/addFillet.test.ts
@ -6,9 +6,13 @@ import {
  Expr,
  Program,
  CallExpression,
+  makeDefaultPlanes,
+  PipeExpression,
+  VariableDeclaration,
 } from '../wasm'
 import {
  addFillet,
+  getPathToExtrudeForSegmentSelection,
  hasValidFilletSelection,
  isTagUsedInFillet,
 } from './addFillet'
@ -16,9 +20,204 @@ import { getNodeFromPath, getNodePathFromSourceRange } from '../queryAst'
 import { createLiteral } from 'lang/modifyAst'
 import { err } from 'lib/trap'
 import { Selections } from 'lib/selections'
+import { engineCommandManager, kclManager } from 'lib/singletons'
+import { VITE_KC_DEV_TOKEN } from 'env'

 beforeAll(async () => {
-  await initPromise // Initialize the WASM environment before running tests
+  await initPromise
+
+  // THESE TEST WILL FAIL without VITE_KC_DEV_TOKEN set in .env.development.local
+  await new Promise((resolve) => {
+    engineCommandManager.start({
+      token: VITE_KC_DEV_TOKEN,
+      width: 256,
+      height: 256,
+      makeDefaultPlanes: () => makeDefaultPlanes(engineCommandManager),
+      setMediaStream: () => {},
+      setIsStreamReady: () => {},
+      modifyGrid: async () => {},
+      callbackOnEngineLiteConnect: async () => {
+        resolve(true)
+      },
+    })
+  })
+}, 20_000)
+
+afterAll(() => {
+  engineCommandManager.tearDown()
+})
+
+const runGetPathToExtrudeForSegmentSelectionTest = async (
+  code: string,
+  selectedSegmentSnippet: string,
+  expectedExtrudeSnippet: string
+) => {
+  // helpers
+  function getExtrudeExpression(
+    ast: Program,
+    pathToExtrudeNode: PathToNode
+  ): CallExpression | PipeExpression | undefined | Error {
+    if (pathToExtrudeNode.length === 0) return undefined // no extrude node
+
+    const extrudeNodeResult = getNodeFromPath(ast, pathToExtrudeNode)
+    if (err(extrudeNodeResult)) {
+      return extrudeNodeResult
+    }
+    return extrudeNodeResult.node as CallExpression | PipeExpression
+  }
+  function getExpectedExtrudeExpression(
+    ast: Program,
+    code: string,
+    expectedExtrudeSnippet: string
+  ): CallExpression | PipeExpression | Error {
+    const extrudeRange: [number, number] = [
+      code.indexOf(expectedExtrudeSnippet),
+      code.indexOf(expectedExtrudeSnippet) + expectedExtrudeSnippet.length,
+    ]
+    const expedtedExtrudePath = getNodePathFromSourceRange(ast, extrudeRange)
+    const expedtedExtrudeNodeResult = getNodeFromPath(ast, expedtedExtrudePath)
+    if (err(expedtedExtrudeNodeResult)) {
+      return expedtedExtrudeNodeResult
+    }
+    const expectedExtrudeNode =
+      expedtedExtrudeNodeResult.node as VariableDeclaration
+    return expectedExtrudeNode.declarations[0].init as
+      | CallExpression
+      | PipeExpression
+  }
+
+  // ast
+  const astOrError = parse(code)
+  if (err(astOrError)) return new Error('AST not found')
+  const ast = astOrError as Program
+
+  // selection
+  const segmentRange: [number, number] = [
+    code.indexOf(selectedSegmentSnippet),
+    code.indexOf(selectedSegmentSnippet) + selectedSegmentSnippet.length,
+  ]
+  const selection: Selections = {
+    codeBasedSelections: [
+      {
+        range: segmentRange,
+        type: 'default',
+      },
+    ],
+    otherSelections: [],
+  }
+
+  // programMemory and artifactGraph
+  await kclManager.executeAst({ ast })
+  const programMemory = kclManager.programMemory
+  const artifactGraph = engineCommandManager.artifactGraph
+
+  // get extrude expression
+  const pathResult = getPathToExtrudeForSegmentSelection(
+    ast,
+    selection,
+    programMemory,
+    artifactGraph
+  )
+  if (err(pathResult)) return pathResult
+  const { pathToExtrudeNode } = pathResult
+  const extrudeExpression = getExtrudeExpression(ast, pathToExtrudeNode)
+
+  // test
+  if (expectedExtrudeSnippet) {
+    const expectedExtrudeExpression = getExpectedExtrudeExpression(
+      ast,
+      code,
+      expectedExtrudeSnippet
+    )
+    if (err(expectedExtrudeExpression)) return expectedExtrudeExpression
+    expect(extrudeExpression).toEqual(expectedExtrudeExpression)
+  } else {
+    expect(extrudeExpression).toBeUndefined()
+  }
+}
+describe('Testing getPathToExtrudeForSegmentSelection', () => {
+  it('should return the correct paths for a valid selection and extrusion', async () => {
+    const code = `const sketch001 = startSketchOn('XY')
+  |> startProfileAt([-10, 10], %)
+  |> line([20, 0], %)
+  |> line([0, -20], %)
+  |> line([-20, 0], %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)
+const extrude001 = extrude(-15, sketch001)`
+    const selectedSegmentSnippet = `line([20, 0], %)`
+    const expectedExtrudeSnippet = `const extrude001 = extrude(-15, sketch001)`
+    await runGetPathToExtrudeForSegmentSelectionTest(
+      code,
+      selectedSegmentSnippet,
+      expectedExtrudeSnippet
+    )
+  })
+  it('should return the correct paths for a valid selection and extrusion in case of several extrusions and sketches', async () => {
+    const code = `const sketch001 = startSketchOn('XY')
+  |> startProfileAt([-30, 30], %)
+  |> line([15, 0], %)
+  |> line([0, -15], %)
+  |> line([-15, 0], %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)
+const sketch002 = startSketchOn('XY')
+  |> startProfileAt([30, 30], %)
+  |> line([20, 0], %)
+  |> line([0, -20], %)
+  |> line([-20, 0], %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)
+const sketch003 = startSketchOn('XY')
+  |> startProfileAt([30, -30], %)
+  |> line([25, 0], %)
+  |> line([0, -25], %)
+  |> line([-25, 0], %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)
+const extrude001 = extrude(-15, sketch001)
+const extrude002 = extrude(-15, sketch002)
+const extrude003 = extrude(-15, sketch003)`
+    const selectedSegmentSnippet = `line([20, 0], %)`
+    const expectedExtrudeSnippet = `const extrude002 = extrude(-15, sketch002)`
+    await runGetPathToExtrudeForSegmentSelectionTest(
+      code,
+      selectedSegmentSnippet,
+      expectedExtrudeSnippet
+    )
+  })
+  it('should not return any path for missing extrusion', async () => {
+    const code = `const sketch001 = startSketchOn('XY')
+  |> startProfileAt([-30, 30], %)
+  |> line([15, 0], %)
+  |> line([0, -15], %)
+  |> line([-15, 0], %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)
+const sketch002 = startSketchOn('XY')
+  |> startProfileAt([30, 30], %)
+  |> line([20, 0], %)
+  |> line([0, -20], %)
+  |> line([-20, 0], %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)
+const sketch003 = startSketchOn('XY')
+  |> startProfileAt([30, -30], %)
+  |> line([25, 0], %)
+  |> line([0, -25], %)
+  |> line([-25, 0], %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)
+const extrude001 = extrude(-15, sketch001)
+const extrude003 = extrude(-15, sketch003)`
+    const selectedSegmentSnippet = `line([20, 0], %)`
+    const expectedExtrudeSnippet = ``
+    await runGetPathToExtrudeForSegmentSelectionTest(
+      code,
+      selectedSegmentSnippet,
+      expectedExtrudeSnippet
+    )
+  })
 })

 const runFilletTest = async (
@ -57,8 +256,6 @@ const runFilletTest = async (
    return new Error('Path to extrude node not found')
  }

-  // const radius = createLiteral(5) as Expr
-
  const result = addFillet(ast, pathToSegmentNode, pathToExtrudeNode, radius)
  if (err(result)) {
    return result
@ -68,7 +265,6 @@ const runFilletTest = async (

  expect(newCode).toContain(expectedCode)
 }
-
 describe('Testing addFillet', () => {
  /**
   * 1. Ideal Case
--- a/src/lang/modifyAst/addFillet.ts
+++ b/src/lang/modifyAst/addFillet.ts
@ -4,9 +4,11 @@ import {
  ObjectExpression,
  PathToNode,
  Program,
+  ProgramMemory,
  Expr,
  VariableDeclaration,
  VariableDeclarator,
+  sketchGroupFromKclValue,
 } from '../wasm'
 import {
  createCallExpressionStdLib,
@ -28,62 +30,210 @@ import {
  getTagFromCallExpression,
  sketchLineHelperMap,
 } from '../std/sketch'
-import { err } from 'lib/trap'
+import { err, trap } from 'lib/trap'
 import { Selections, canFilletSelection } from 'lib/selections'
+import { KclCommandValue } from 'lib/commandTypes'
+import {
+  ArtifactGraph,
+  getExtrusionFromSuspectedPath,
+} from 'lang/std/artifactGraph'
+import { kclManager, engineCommandManager, editorManager } from 'lib/singletons'
+
+/**
+ * Apply Fillet To Selection
+ */
+
+export function applyFilletToSelection(
+  selection: Selections,
+  radius: KclCommandValue
+): void | Error {
+  // 1. get AST
+  let ast = kclManager.ast
+  const astResult = insertRadiusIntoAst(ast, radius)
+  if (err(astResult)) return astResult
+
+  // 2. get path
+  const programMemory = kclManager.programMemory
+  const artifactGraph = engineCommandManager.artifactGraph
+  const getPathToExtrudeForSegmentSelectionResult =
+    getPathToExtrudeForSegmentSelection(
+      ast,
+      selection,
+      programMemory,
+      artifactGraph
+    )
+  if (err(getPathToExtrudeForSegmentSelectionResult))
+    return getPathToExtrudeForSegmentSelectionResult
+  const { pathToSegmentNode, pathToExtrudeNode } =
+    getPathToExtrudeForSegmentSelectionResult
+
+  // 3. add fillet
+  const addFilletResult = addFillet(
+    ast,
+    pathToSegmentNode,
+    pathToExtrudeNode,
+    'variableName' in radius ? radius.variableIdentifierAst : radius.valueAst
+  )
+  if (trap(addFilletResult)) return addFilletResult
+  const { modifiedAst, pathToFilletNode } = addFilletResult
+
+  // 4. update ast
+  updateAstAndFocus(modifiedAst, pathToFilletNode)
+}
+
+function insertRadiusIntoAst(
+  ast: Program,
+  radius: KclCommandValue
+): { ast: Program } | Error {
+  try {
+    // Validate and update AST
+    if (
+      'variableName' in radius &&
+      radius.variableName &&
+      radius.insertIndex !== undefined
+    ) {
+      const newAst = structuredClone(ast)
+      newAst.body.splice(radius.insertIndex, 0, radius.variableDeclarationAst)
+      return { ast: newAst }
+    }
+    return { ast }
+  } catch (error) {
+    return new Error(`Failed to handle AST: ${(error as Error).message}`)
+  }
+}
+
+export function getPathToExtrudeForSegmentSelection(
+  ast: Program,
+  selection: Selections,
+  programMemory: ProgramMemory,
+  artifactGraph: ArtifactGraph
+): { pathToSegmentNode: PathToNode; pathToExtrudeNode: PathToNode } | Error {
+  const pathToSegmentNode = getNodePathFromSourceRange(
+    ast,
+    selection.codeBasedSelections[0].range
+  )
+
+  const varDecNode = getNodeFromPath<VariableDeclaration>(
+    ast,
+    pathToSegmentNode,
+    'VariableDeclaration'
+  )
+  if (err(varDecNode)) return varDecNode
+  const sketchVar = varDecNode.node.declarations[0].id.name
+
+  const sketchGroup = sketchGroupFromKclValue(
+    kclManager.programMemory.get(sketchVar),
+    sketchVar
+  )
+  if (trap(sketchGroup)) return sketchGroup
+
+  const extrusion = getExtrusionFromSuspectedPath(sketchGroup.id, artifactGraph)
+  if (err(extrusion)) return extrusion
+
+  const pathToExtrudeNode = getNodePathFromSourceRange(
+    ast,
+    extrusion.codeRef.range
+  )
+  if (err(pathToExtrudeNode)) return pathToExtrudeNode
+
+  return { pathToSegmentNode, pathToExtrudeNode }
+}
+
+async function updateAstAndFocus(
+  modifiedAst: Program,
+  pathToFilletNode: PathToNode
+) {
+  const updatedAst = await kclManager.updateAst(modifiedAst, true, {
+    focusPath: pathToFilletNode,
+  })
+  if (updatedAst?.selections) {
+    editorManager.selectRange(updatedAst?.selections)
+  }
+}
+
+/**
+ * Add Fillet
+ */

 export function addFillet(
-  node: Program,
+  ast: Program,
  pathToSegmentNode: PathToNode,
  pathToExtrudeNode: PathToNode,
-  radius = createLiteral(5) as Expr
-  // shouldPipe = false, // TODO: Implement this feature
+  radius: Expr = createLiteral(5)
 ): { modifiedAst: Program; pathToFilletNode: PathToNode } | Error {
-  // clone ast to make mutations safe
-  let _node = structuredClone(node)
+  // Clone AST to ensure safe mutations
+  const astClone = structuredClone(ast)

-  /**
-   * Add Tag to the Segment Expression
-   */
+  // Modify AST clone : TAG the sketch segment and retrieve tag
+  const segmentResult = mutateAstWithTagForSketchSegment(
+    astClone,
+    pathToSegmentNode
+  )
+  if (err(segmentResult)) return segmentResult
+  const { tag } = segmentResult

-  // Find the specific sketch segment to tag with the new tag
-  const sketchSegmentChunk = getNodeFromPath(
-    _node,
+  // Modify AST clone : Insert FILLET node and retrieve path to fillet
+  const filletResult = mutateAstWithFilletNode(
+    astClone,
+    pathToExtrudeNode,
+    radius,
+    tag
+  )
+  if (err(filletResult)) return filletResult
+  const { pathToFilletNode } = filletResult
+
+  return { modifiedAst: astClone, pathToFilletNode }
+}
+
+function mutateAstWithTagForSketchSegment(
+  astClone: Program,
+  pathToSegmentNode: PathToNode
+): { modifiedAst: Program; tag: string } | Error {
+  const segmentNode = getNodeFromPath<CallExpression>(
+    astClone,
    pathToSegmentNode,
    'CallExpression'
  )
-  if (err(sketchSegmentChunk)) return sketchSegmentChunk
-  const { node: sketchSegmentNode } = sketchSegmentChunk as {
-    node: CallExpression
-  }
+  if (err(segmentNode)) return segmentNode

-  // Check whether selection is a valid segment from sketchLineHelpersMap
-  if (!(sketchSegmentNode.callee.name in sketchLineHelperMap)) {
+  // Check whether selection is a valid segment
+  if (!(segmentNode.node.callee.name in sketchLineHelperMap)) {
    return new Error('Selection is not a sketch segment')
  }

  // Add tag to the sketch segment or use existing tag
+  // a helper function that creates the updated node and applies the changes to the AST
  const taggedSegment = addTagForSketchOnFace(
    {
-      // previousProgramMemory: programMemory,
      pathToNode: pathToSegmentNode,
-      node: _node,
+      node: astClone,
    },
-    sketchSegmentNode.callee.name
+    segmentNode.node.callee.name
  )
  if (err(taggedSegment)) return taggedSegment
  const { tag } = taggedSegment

-  /**
-   * Find Extrude Expression automatically
-   */
+  return { modifiedAst: astClone, tag }
+}

-  // 1. Get the sketch name
+function mutateAstWithFilletNode(
+  astClone: Program,
+  pathToExtrudeNode: PathToNode,
+  radius: Expr,
+  tag: string
+): { modifiedAst: Program; pathToFilletNode: PathToNode } | Error {
+  // Locate the extrude call
+  const locatedExtrudeDeclarator = locateExtrudeDeclarator(
+    astClone,
+    pathToExtrudeNode
+  )
+  if (err(locatedExtrudeDeclarator)) return locatedExtrudeDeclarator
+  const { extrudeDeclarator } = locatedExtrudeDeclarator

  /**
-   * Add Fillet to the Extrude expression
+   * Prepare changes to the AST
   */

-  // Create the fillet call expression in one line
  const filletCall = createCallExpressionStdLib('fillet', [
    createObjectExpression({
      radius: radius,
@ -92,104 +242,36 @@ export function addFillet(
    createPipeSubstitution(),
  ])

-  // Locate the extrude call
-  const extrudeChunk = getNodeFromPath<VariableDeclaration>(
-    _node,
-    pathToExtrudeNode,
-    'VariableDeclaration'
-  )
-  if (err(extrudeChunk)) return extrudeChunk
-  const { node: extrudeVarDecl } = extrudeChunk
-
-  const extrudeDeclarator = extrudeVarDecl.declarations[0]
-  const extrudeInit = extrudeDeclarator.init
-
-  if (
-    !extrudeDeclarator ||
-    (extrudeInit.type !== 'CallExpression' &&
-      extrudeInit.type !== 'PipeExpression')
-  ) {
-    return new Error('Extrude PipeExpression / CallExpression not found.')
-  }
-
-  // determine if extrude is in a PipeExpression or CallExpression
+  /**
+   * Mutate the AST
+   */

  // CallExpression - no fillet
  // PipeExpression - fillet exists

-  const getPathToNodeOfFilletLiteral = (
-    pathToExtrudeNode: PathToNode,
-    extrudeDeclarator: VariableDeclarator,
-    tag: string
-  ): PathToNode => {
-    let pathToFilletObj: any
-    let inFillet = false
-    traverse(extrudeDeclarator.init, {
-      enter(node, path) {
-        if (node.type === 'CallExpression' && node.callee.name === 'fillet') {
-          inFillet = true
-        }
-        if (inFillet && node.type === 'ObjectExpression') {
-          const hasTag = node.properties.some((prop) => {
-            const isTagProp = prop.key.name === 'tags'
-            if (isTagProp && prop.value.type === 'ArrayExpression') {
-              return prop.value.elements.some(
-                (element) =>
-                  element.type === 'Identifier' && element.name === tag
-              )
-            }
-            return false
-          })
-          if (!hasTag) return false
-          pathToFilletObj = path
-          node.properties.forEach((prop, index) => {
-            if (prop.key.name === 'radius') {
-              pathToFilletObj.push(
-                ['properties', 'ObjectExpression'],
-                [index, 'index'],
-                ['value', 'Property']
-              )
-            }
-          })
-        }
-      },
-      leave(node) {
-        if (node.type === 'CallExpression' && node.callee.name === 'fillet') {
-          inFillet = false
-        }
-      },
-    })
-    let indexOfPipeExpression = pathToExtrudeNode.findIndex(
-      (path) => path[1] === 'PipeExpression'
+  let pathToFilletNode: PathToNode = []
+
+  if (extrudeDeclarator.init.type === 'CallExpression') {
+    // 1. case when no fillet exists
+
+    // modify ast with new fillet call by mutating the extrude node
+    extrudeDeclarator.init = createPipeExpression([
+      extrudeDeclarator.init,
+      filletCall,
+    ])
+
+    // get path to the fillet node
+    pathToFilletNode = getPathToNodeOfFilletLiteral(
+      pathToExtrudeNode,
+      extrudeDeclarator,
+      tag
    )
-    indexOfPipeExpression =
-      indexOfPipeExpression === -1
-        ? pathToExtrudeNode.length
-        : indexOfPipeExpression

-    return [
-      ...pathToExtrudeNode.slice(0, indexOfPipeExpression),
-      ...pathToFilletObj,
-    ]
-  }
+    return { modifiedAst: astClone, pathToFilletNode }
+  } else if (extrudeDeclarator.init.type === 'PipeExpression') {
+    // 2. case when fillet exists

-  if (extrudeInit.type === 'CallExpression') {
-    // 1. no fillet case
-    extrudeDeclarator.init = createPipeExpression([extrudeInit, filletCall])
-    return {
-      modifiedAst: _node,
-      pathToFilletNode: getPathToNodeOfFilletLiteral(
-        pathToExtrudeNode,
-        extrudeDeclarator,
-        tag
-      ),
-    }
-  } else if (extrudeInit.type === 'PipeExpression') {
-    // 2. fillet case
-
-    // there are 2 options here:
-
-    const existingFilletCall = extrudeInit.body.find((node) => {
+    const existingFilletCall = extrudeDeclarator.init.body.find((node) => {
      return node.type === 'CallExpression' && node.callee.name === 'fillet'
    })

@ -198,25 +280,13 @@ export function addFillet(
    }

    // check if the existing fillet has the same tag as the new fillet
-    let filletTag = null
-    if (existingFilletCall.arguments[0].type === 'ObjectExpression') {
-      const properties = (existingFilletCall.arguments[0] as ObjectExpression)
-        .properties
-      const tagsProperty = properties.find((prop) => prop.key.name === 'tags')
-      if (tagsProperty && tagsProperty.value.type === 'ArrayExpression') {
-        const elements = (tagsProperty.value as ArrayExpression).elements
-        if (elements.length > 0 && elements[0].type === 'Identifier') {
-          filletTag = elements[0].name
-        }
-      }
-    } else {
-      return new Error('Expected an ObjectExpression node')
-    }
+    const filletTag = getFilletTag(existingFilletCall)

    if (filletTag !== tag) {
-      extrudeInit.body.push(filletCall)
+      // mutate the extrude node with the new fillet call
+      extrudeDeclarator.init.body.push(filletCall)
      return {
-        modifiedAst: _node,
+        modifiedAst: astClone,
        pathToFilletNode: getPathToNodeOfFilletLiteral(
          pathToExtrudeNode,
          extrudeDeclarator,
@ -228,9 +298,124 @@ export function addFillet(
    return new Error('Unsupported extrude type.')
  }

-  return new Error('Unsupported extrude type.')
+  return { modifiedAst: astClone, pathToFilletNode }
 }

+function locateExtrudeDeclarator(
+  node: Program,
+  pathToExtrudeNode: PathToNode
+): { extrudeDeclarator: VariableDeclarator } | Error {
+  const extrudeChunk = getNodeFromPath<VariableDeclaration>(
+    node,
+    pathToExtrudeNode,
+    'VariableDeclaration'
+  )
+  if (err(extrudeChunk)) return extrudeChunk
+
+  const { node: extrudeVarDecl } = extrudeChunk
+  const extrudeDeclarator = extrudeVarDecl.declarations[0]
+  if (!extrudeDeclarator) {
+    return new Error('Extrude Declarator not found.')
+  }
+
+  const extrudeInit = extrudeDeclarator?.init
+  if (!extrudeInit) {
+    return new Error('Extrude Init not found.')
+  }
+
+  if (
+    extrudeInit.type !== 'CallExpression' &&
+    extrudeInit.type !== 'PipeExpression'
+  ) {
+    return new Error('Extrude must be a PipeExpression or CallExpression')
+  }
+
+  return { extrudeDeclarator }
+}
+
+function getPathToNodeOfFilletLiteral(
+  pathToExtrudeNode: PathToNode,
+  extrudeDeclarator: VariableDeclarator,
+  tag: string
+): PathToNode {
+  let pathToFilletObj: PathToNode = []
+  let inFillet = false
+
+  traverse(extrudeDeclarator.init, {
+    enter(node, path) {
+      if (node.type === 'CallExpression' && node.callee.name === 'fillet') {
+        inFillet = true
+      }
+      if (inFillet && node.type === 'ObjectExpression') {
+        if (!hasTag(node, tag)) return false
+        pathToFilletObj = getPathToRadiusLiteral(node, path)
+      }
+    },
+    leave(node) {
+      if (node.type === 'CallExpression' && node.callee.name === 'fillet') {
+        inFillet = false
+      }
+    },
+  })
+  let indexOfPipeExpression = pathToExtrudeNode.findIndex(
+    (path) => path[1] === 'PipeExpression'
+  )
+
+  indexOfPipeExpression =
+    indexOfPipeExpression === -1
+      ? pathToExtrudeNode.length
+      : indexOfPipeExpression
+
+  return [
+    ...pathToExtrudeNode.slice(0, indexOfPipeExpression),
+    ...pathToFilletObj,
+  ]
+}
+
+function hasTag(node: ObjectExpression, tag: string): boolean {
+  return node.properties.some((prop) => {
+    if (prop.key.name === 'tags' && prop.value.type === 'ArrayExpression') {
+      return prop.value.elements.some(
+        (element) => element.type === 'Identifier' && element.name === tag
+      )
+    }
+    return false
+  })
+}
+
+function getPathToRadiusLiteral(node: ObjectExpression, path: any): PathToNode {
+  let pathToFilletObj = path
+  node.properties.forEach((prop, index) => {
+    if (prop.key.name === 'radius') {
+      pathToFilletObj.push(
+        ['properties', 'ObjectExpression'],
+        [index, 'index'],
+        ['value', 'Property']
+      )
+    }
+  })
+  return pathToFilletObj
+}
+
+function getFilletTag(existingFilletCall: CallExpression): string | null {
+  if (existingFilletCall.arguments[0].type === 'ObjectExpression') {
+    const properties = (existingFilletCall.arguments[0] as ObjectExpression)
+      .properties
+    const tagsProperty = properties.find((prop) => prop.key.name === 'tags')
+    if (tagsProperty && tagsProperty.value.type === 'ArrayExpression') {
+      const elements = (tagsProperty.value as ArrayExpression).elements
+      if (elements.length > 0 && elements[0].type === 'Identifier') {
+        return elements[0].name
+      }
+    }
+  }
+  return null
+}
+
+/**
+ * Button states
+ */
+
 export const hasValidFilletSelection = ({
  selectionRanges,
  ast,
--- a/src/lib/cameraControls.ts
+++ b/src/lib/cameraControls.ts
@ -1,4 +1,10 @@
 import { MouseControlType } from 'wasm-lib/kcl/bindings/MouseControlType'
+import { platform } from './utils'
+
+const PLATFORM = platform()
+const META =
+  PLATFORM === 'macos' ? 'Cmd' : PLATFORM === 'windows' ? 'Win' : 'Super'
+const ALT = PLATFORM === 'macos' ? 'Option' : 'Alt'

 const noModifiersPressed = (e: React.MouseEvent) =>
  !e.ctrlKey && !e.shiftKey && !e.altKey && !e.metaKey
@ -73,99 +79,99 @@ export const btnName = (e: React.MouseEvent) => ({
 export const cameraMouseDragGuards: Record<CameraSystem, MouseGuard> = {
  KittyCAD: {
    pan: {
-      description: 'Right click + Shift + drag or middle click + drag',
+      description: 'Shift + Right click drag or middle click drag',
      callback: (e) =>
        (btnName(e).middle && noModifiersPressed(e)) ||
        (btnName(e).right && e.shiftKey),
    },
    zoom: {
-      description: 'Scroll wheel or Right click + Ctrl + drag',
+      description: 'Scroll or Ctrl + Right click drag',
      dragCallback: (e) => !!(e.buttons & 2) && e.ctrlKey,
      scrollCallback: () => true,
    },
    rotate: {
-      description: 'Right click + drag',
+      description: 'Right click drag',
      callback: (e) => btnName(e).right && noModifiersPressed(e),
    },
  },
  OnShape: {
    pan: {
-      description: 'Right click + Ctrl + drag or middle click + drag',
+      description: 'Ctrl + Right click drag or middle click drag',
      callback: (e) =>
        (btnName(e).right && e.ctrlKey) ||
        (btnName(e).middle && noModifiersPressed(e)),
    },
    zoom: {
-      description: 'Scroll wheel',
+      description: 'Scroll',
      dragCallback: () => false,
      scrollCallback: () => true,
    },
    rotate: {
-      description: 'Right click + drag',
+      description: 'Right click drag',
      callback: (e) => btnName(e).right && noModifiersPressed(e),
    },
  },
  'Trackpad Friendly': {
    pan: {
-      description: 'Left click + Alt + Shift + drag or middle click + drag',
+      description: `${ALT} + Shift + Left click drag or middle click drag`,
      callback: (e) =>
        (btnName(e).left && e.altKey && e.shiftKey && !e.metaKey) ||
        (btnName(e).middle && noModifiersPressed(e)),
    },
    zoom: {
-      description: 'Scroll wheel or Left click + Alt + OS + drag',
+      description: `Scroll or ${ALT} + ${META} + Left click drag`,
      dragCallback: (e) => btnName(e).left && e.altKey && e.metaKey,
      scrollCallback: () => true,
    },
    rotate: {
-      description: 'Left click + Alt + drag',
+      description: `${ALT} + Left click drag`,
      callback: (e) => btnName(e).left && e.altKey && !e.shiftKey && !e.metaKey,
      lenientDragStartButton: 0,
    },
  },
  Solidworks: {
    pan: {
-      description: 'Right click + Ctrl + drag',
+      description: 'Ctrl + Right click drag',
      callback: (e) => btnName(e).right && e.ctrlKey,
      lenientDragStartButton: 2,
    },
    zoom: {
-      description: 'Scroll wheel or Middle click + Shift + drag',
+      description: 'Scroll or Shift + Middle click drag',
      dragCallback: (e) => btnName(e).middle && e.shiftKey,
      scrollCallback: () => true,
    },
    rotate: {
-      description: 'Middle click + drag',
+      description: 'Middle click drag',
      callback: (e) => btnName(e).middle && noModifiersPressed(e),
    },
  },
  NX: {
    pan: {
-      description: 'Middle click + Shift + drag',
+      description: 'Shift + Middle click drag',
      callback: (e) => btnName(e).middle && e.shiftKey,
    },
    zoom: {
-      description: 'Scroll wheel or Middle click + Ctrl + drag',
+      description: 'Scroll or Ctrl + Middle click drag',
      dragCallback: (e) => btnName(e).middle && e.ctrlKey,
      scrollCallback: () => true,
    },
    rotate: {
-      description: 'Middle click + drag',
+      description: 'Middle click drag',
      callback: (e) => btnName(e).middle && noModifiersPressed(e),
    },
  },
  Creo: {
    pan: {
-      description: 'Left click + Ctrl + drag',
+      description: 'Ctrl + Left click drag',
      callback: (e) => btnName(e).left && !btnName(e).right && e.ctrlKey,
    },
    zoom: {
-      description: 'Scroll wheel or Right click + Ctrl + drag',
+      description: 'Scroll or Ctrl + Right click drag',
      dragCallback: (e) => btnName(e).right && !btnName(e).left && e.ctrlKey,
      scrollCallback: () => true,
    },
    rotate: {
-      description: 'Middle (or Left + Right) click + Ctrl + drag',
+      description: 'Ctrl + Middle (or Left + Right) click drag',
      callback: (e) => {
        const b = btnName(e)
        return (b.middle || (b.left && b.right)) && e.ctrlKey
@ -174,16 +180,16 @@ export const cameraMouseDragGuards: Record<CameraSystem, MouseGuard> = {
  },
  AutoCAD: {
    pan: {
-      description: 'Middle click + drag',
+      description: 'Middle click drag',
      callback: (e) => btnName(e).middle && noModifiersPressed(e),
    },
    zoom: {
-      description: 'Scroll wheel',
+      description: 'Scroll',
      dragCallback: () => false,
      scrollCallback: () => true,
    },
    rotate: {
-      description: 'Middle click + Shift + drag',
+      description: 'Shift + Middle click drag',
      callback: (e) => btnName(e).middle && e.shiftKey,
    },
  },
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@ -60,6 +60,7 @@ export const TEST_SETTINGS_FILE_KEY = 'playwright-test-settings'

 export const DEFAULT_HOST = 'https://api.zoo.dev'
 export const SETTINGS_FILE_NAME = 'settings.toml'
+export const TOKEN_FILE_NAME = 'token.txt'
 export const PROJECT_SETTINGS_FILE_NAME = 'project.toml'
 export const COOKIE_NAME = '__Secure-next-auth.session-token'

--- a/src/lib/desktop.ts
+++ b/src/lib/desktop.ts
@ -13,6 +13,7 @@ import {
  PROJECT_FOLDER,
  PROJECT_SETTINGS_FILE_NAME,
  SETTINGS_FILE_NAME,
+  TOKEN_FILE_NAME,
 } from './constants'
 import { DeepPartial } from './types'
 import { ProjectConfiguration } from 'wasm-lib/kcl/bindings/ProjectConfiguration'
@ -396,6 +397,23 @@ const getAppSettingsFilePath = async () => {
  }
  return window.electron.path.join(fullPath, SETTINGS_FILE_NAME)
 }
+const getTokenFilePath = async () => {
+  const isTestEnv = window.electron.process.env.IS_PLAYWRIGHT === 'true'
+  const testSettingsPath = window.electron.process.env.TEST_SETTINGS_FILE_KEY
+  const appConfig = await window.electron.getPath('appData')
+  const fullPath = isTestEnv
+    ? testSettingsPath
+    : window.electron.path.join(appConfig, getAppFolderName())
+  try {
+    await window.electron.stat(fullPath)
+  } catch (e) {
+    // File/path doesn't exist
+    if (e === 'ENOENT') {
+      await window.electron.mkdir(fullPath, { recursive: true })
+    }
+  }
+  return window.electron.path.join(fullPath, TOKEN_FILE_NAME)
+}

 const getProjectSettingsFilePath = async (projectPath: string) => {
  try {
@ -475,6 +493,34 @@ export const writeAppSettingsFile = async (tomlStr: string) => {
  return window.electron.writeFile(appSettingsFilePath, tomlStr)
 }

+export const readTokenFile = async () => {
+  let settingsPath = await getTokenFilePath()
+
+  if (window.electron.exists(settingsPath)) {
+    const token: string = await window.electron.readFile(settingsPath)
+    if (!token) return ''
+
+    return token
+  }
+  return ''
+}
+
+export const writeTokenFile = async (token: string) => {
+  const tokenFilePath = await getTokenFilePath()
+  if (err(token)) return Promise.reject(token)
+  return window.electron.writeFile(tokenFilePath, token)
+}
+
+let appStateStore: Project | undefined = undefined
+
+export const getState = async (): Promise<Project | undefined> => {
+  return Promise.resolve(appStateStore)
+}
+
+export const setState = async (state: Project | undefined): Promise<void> => {
+  appStateStore = state
+}
+
 export const getUser = async (
  token: string,
  hostname: string
--- a/src/machines/authMachine.ts
+++ b/src/machines/authMachine.ts
@ -8,7 +8,11 @@ import {
  VITE_KC_SKIP_AUTH,
  DEV,
 } from 'env'
-import { getUser as getUserDesktop } from 'lib/desktop'
+import {
+  getUser as getUserDesktop,
+  readTokenFile,
+  writeTokenFile,
+} from 'lib/desktop'
 import { COOKIE_NAME } from 'lib/constants'

 const SKIP_AUTH = VITE_KC_SKIP_AUTH === 'true' && DEV
@ -53,6 +57,7 @@ const persistedToken =

 export const authMachine = createMachine<UserContext, Events>(
  {
+    /** @xstate-layout N4IgpgJg5mDOIC5QEECuAXAFgOgMabFwGsBJAMwBkB7KGCEgOwGIIqGxsBLBgNyqI75CRALQAbGnRHcA2gAYAuolAAHKrE7pObZSAAeiAIwBmAEzYA7ABYAbAFZTcgBzGbN44adWANCACeiKbGdthypk4AnBFyVs6uQXYAvom+aFh4BMTk1LSQjExgAE6FVIXYKmIAhuhkpQC2GcLikpDSDPJKSCBqGlo6XQYIrk7YETYWctYRxmMWFk6+AUPj2I5OdjZyrnZOFmbJqRg4Ern0zDkABFQYHbo9mtoMuoOGFhHYxlZOhvbOsUGGRaIL4WbBONzWQxWYwWOx2H4HEBpY4tCAAeQwTEuskUd3UD36oEGIlMNlCuzk8Js0TcVisgP8iG2lmcGysb0mW3ByRSIAYVAgcF0yLxvUez0QIms5ImVJpNjpDKWxmw9PGdLh4Te00+iORjSylFRjFFBKeA0QThGQWcexMwWhniBCGiqrepisUVMdlszgieqO2BOdBNXXufXNRKMHtGVuphlJkXs4Wdriso2CCasdgipOidID6WDkAx6FNEYlCAT5jmcjrckMdj2b3GzpsjbBMVMWezDbGPMSQA */
    id: 'Auth',
    initial: 'checkIfLoggedIn',
    states: {
@ -85,6 +90,9 @@ export const authMachine = createMachine<UserContext, Events>(
        on: {
          'Log out': {
            target: 'loggedOut',
+            actions: () => {
+              if (isDesktop()) writeTokenFile('')
+            },
          },
        },
      },
@ -96,7 +104,6 @@ export const authMachine = createMachine<UserContext, Events>(
            actions: assign({
              token: (_, event) => {
                const token = event.token || ''
-                localStorage.setItem(TOKEN_PERSIST_KEY, token)
                return token
              },
            }),
@ -120,11 +127,7 @@ export const authMachine = createMachine<UserContext, Events>(
 )

 async function getUser(context: UserContext) {
-  const token = VITE_KC_DEV_TOKEN
-    ? VITE_KC_DEV_TOKEN
-    : context.token && context.token !== ''
-    ? context.token
-    : getCookie(COOKIE_NAME) || localStorage?.getItem(TOKEN_PERSIST_KEY)
+  const token = await getAndSyncStoredToken(context)
  const url = withBaseURL('/user')
  const headers: { [key: string]: string } = {
    'Content-Type': 'application/json',
@ -189,3 +192,26 @@ function getCookie(cname: string): string | null {
  }
  return null
 }
+
+async function getAndSyncStoredToken(context: UserContext): Promise<string> {
+  // dev mode
+  if (VITE_KC_DEV_TOKEN) return VITE_KC_DEV_TOKEN
+
+  const token =
+    context.token && context.token !== ''
+      ? context.token
+      : getCookie(COOKIE_NAME) || localStorage?.getItem(TOKEN_PERSIST_KEY) || ''
+  if (token) {
+    // has just logged in, update storage
+    localStorage.setItem(TOKEN_PERSIST_KEY, token)
+    isDesktop() && writeTokenFile(token)
+    return token
+  }
+  if (!isDesktop()) return ''
+  const fileToken = isDesktop() ? await readTokenFile() : ''
+  // prefer other above, but file will ensure login persists after app updates
+  if (!fileToken) return ''
+  // has token in file, update localStorage
+  localStorage.setItem(TOKEN_PERSIST_KEY, fileToken)
+  return fileToken
+}
--- a/src/machines/modelingMachine.ts
+++ b/src/machines/modelingMachine.ts
@ -4,7 +4,6 @@ import {
  VariableDeclarator,
  parse,
  recast,
-  sketchGroupFromKclValue,
 } from 'lang/wasm'
 import { Axis, Selection, Selections, updateSelections } from 'lib/selections'
 import { assign, createMachine } from 'xstate'
@ -35,7 +34,7 @@ import {
  setEqualLengthInfo,
 } from 'components/Toolbar/EqualLength'
 import { deleteFromSelection, extrudeSketch } from 'lang/modifyAst'
-import { addFillet } from 'lang/modifyAst/addFillet'
+import { applyFilletToSelection } from 'lang/modifyAst/addFillet'
 import { getNodeFromPath } from '../lang/queryAst'
 import {
  applyConstraintEqualAngle,
@ -59,7 +58,6 @@ import { Coords2d } from 'lang/std/sketch'
 import { deleteSegment } from 'clientSideScene/ClientSideSceneComp'
 import { executeAst } from 'lang/langHelpers'
 import toast from 'react-hot-toast'
-import { getExtrusionFromSuspectedPath } from 'lang/std/artifactGraph'

 export const MODELING_PERSIST_KEY = 'MODELING_PERSIST_KEY'

@ -1163,65 +1161,16 @@ export const modelingMachine = createMachine(
      'AST fillet': async (_, event) => {
        if (!event.data) return

+        // Extract inputs
        const { selection, radius } = event.data
-        let ast = kclManager.ast

-        if (
-          'variableName' in radius &&
-          radius.variableName &&
-          radius.insertIndex !== undefined
-        ) {
-          const newBody = [...ast.body]
-          newBody.splice(radius.insertIndex, 0, radius.variableDeclarationAst)
-          ast.body = newBody
-        }
-
-        const pathToSegmentNode = getNodePathFromSourceRange(
-          ast,
-          selection.codeBasedSelections[0].range
+        // Apply fillet to selection
+        const applyFilletToSelectionResult = applyFilletToSelection(
+          selection,
+          radius
        )
-
-        const varDecNode = getNodeFromPath<VariableDeclaration>(
-          ast,
-          pathToSegmentNode,
-          'VariableDeclaration'
-        )
-        if (err(varDecNode)) return
-        const sketchVar = varDecNode.node.declarations[0].id.name
-        const sketchGroup = sketchGroupFromKclValue(
-          kclManager.programMemory.get(sketchVar),
-          sketchVar
-        )
-        if (trap(sketchGroup)) return
-        const extrusion = getExtrusionFromSuspectedPath(
-          sketchGroup.id,
-          engineCommandManager.artifactGraph
-        )
-        const pathToExtrudeNode = err(extrusion)
-          ? []
-          : getNodePathFromSourceRange(ast, extrusion.codeRef.range)
-
-        // we assume that there is only one body related to the sketch
-        // and apply the fillet to it
-
-        const addFilletResult = addFillet(
-          ast,
-          pathToSegmentNode,
-          pathToExtrudeNode,
-          'variableName' in radius
-            ? radius.variableIdentifierAst
-            : radius.valueAst
-        )
-
-        if (trap(addFilletResult)) return
-        const { modifiedAst, pathToFilletNode } = addFilletResult
-
-        const updatedAst = await kclManager.updateAst(modifiedAst, true, {
-          focusPath: pathToFilletNode,
-        })
-        if (updatedAst?.selections) {
-          editorManager.selectRange(updatedAst?.selections)
-        }
+        if (err(applyFilletToSelectionResult))
+          return applyFilletToSelectionResult
      },
      'conditionally equip line tool': (_, { type }) => {
        if (type === 'done.invoke.animate-to-face') {
--- a/src/main.ts
+++ b/src/main.ts
@ -12,6 +12,8 @@ import { updateElectronApp, UpdateSourceType } from 'update-electron-app'
 import minimist from 'minimist'
 import getCurrentProjectFile from 'lib/getCurrentProjectFile'

+let mainWindow: BrowserWindow | null = null
+
 // Check the command line arguments for a project path
 const args = parseCLIArgs()

@ -28,12 +30,25 @@ if (require('electron-squirrel-startup')) {
  app.quit()
 }

-// Global app listeners
-// Must be done before ready event
-registerListeners()
+const ZOO_STUDIO_PROTOCOL = 'zoo-studio'

-const createWindow = () => {
-  const mainWindow = new BrowserWindow({
+/// Register our application to handle all "electron-fiddle://" protocols.
+if (process.defaultApp) {
+  if (process.argv.length >= 2) {
+    app.setAsDefaultProtocolClient(ZOO_STUDIO_PROTOCOL, process.execPath, [
+      path.resolve(process.argv[1]),
+    ])
+  }
+} else {
+  app.setAsDefaultProtocolClient(ZOO_STUDIO_PROTOCOL)
+}
+
+// Global app listeners
+// Must be done before ready event.
+registerStartupListeners()
+
+const createWindow = (): BrowserWindow => {
+  const newWindow = new BrowserWindow({
    autoHideMenuBar: true,
    show: false,
    width: 1800,
@ -45,13 +60,15 @@ const createWindow = () => {
      preload: path.join(__dirname, './preload.js'),
    },
    icon: path.resolve(process.cwd(), 'assets', 'icon.png'),
+    frame: false,
+    titleBarStyle: 'hiddenInset',
  })

  // and load the index.html of the app.
  if (MAIN_WINDOW_VITE_DEV_SERVER_URL) {
-    mainWindow.loadURL(MAIN_WINDOW_VITE_DEV_SERVER_URL)
+    newWindow.loadURL(MAIN_WINDOW_VITE_DEV_SERVER_URL)
  } else {
-    mainWindow.loadFile(
+    newWindow.loadFile(
      path.join(__dirname, `../renderer/${MAIN_WINDOW_VITE_NAME}/index.html`)
    )
  }
@ -59,7 +76,9 @@ const createWindow = () => {
  // Open the DevTools.
  // mainWindow.webContents.openDevTools()

-  mainWindow.show()
+  newWindow.show()
+
+  return newWindow
 }

 // Quit when all windows are closed, except on macOS. There, it's common
@ -74,7 +93,10 @@ app.on('window-all-closed', () => {
 // This method will be called when Electron has finished
 // initialization and is ready to create browser windows.
 // Some APIs can only be used after this event occurs.
-app.on('ready', createWindow)
+app.on('ready', (event, data) => {
+  // Create the mainWindow
+  mainWindow = createWindow()
+})

 // For now there is no good reason to separate these out to another file(s)
 // There is just not enough code to warrant it and further abstracts everything
@ -201,16 +223,13 @@ ipcMain.handle('loadProjectAtStartup', async () => {
  global['macOpenFiles'] = macOpenFilesEmpty

  // macOS: open-url events that were received before the app is ready
-  const getOpenUrls: string[] = ((global as any).getOpenUrls() ||
-    []) as string[]
+  const getOpenUrls: string[] = (global as any).getOpenUrls
  if (getOpenUrls && getOpenUrls.length > 0) {
    projectPath = getOpenUrls[0] // We only do one project at a
  }
  // Reset this so we don't accidentally use it again.
  // @ts-ignore
-  global['getOpenUrls'] = function () {
-    return []
-  }
+  global['getOpenUrls'] = []

  // Check if we have a project path in the command line arguments
  // If we do, we will load the project at that path
@ -243,7 +262,7 @@ function parseCLIArgs(): minimist.ParsedArgs {
  return minimist(process.argv, {})
 }

-function registerListeners() {
+function registerStartupListeners() {
  /**
   * macOS: when someone drops a file to the not-yet running VSCode, the open-file event fires even before
   * the app-ready event. We listen very early for open-file and remember this upon startup as path to open.
@ -252,13 +271,21 @@ function registerListeners() {
  // @ts-ignore
  global['macOpenFiles'] = macOpenFiles
  app.on('open-file', function (event, path) {
+    event.preventDefault()
+
    macOpenFiles.push(path)
+    // If we have a mainWindow, lets open another window.
+    if (mainWindow) {
+      createWindow()
+    }
  })

  /**
   * macOS: react to open-url requests.
   */
  const openUrls: string[] = []
+  // @ts-ignore
+  global['openUrls'] = openUrls
  const onOpenUrl = function (
    event: { preventDefault: () => void },
    url: string
@ -266,16 +293,13 @@ function registerListeners() {
    event.preventDefault()

    openUrls.push(url)
+    // If we have a mainWindow, lets open another window.
+    if (mainWindow) {
+      createWindow()
+    }
  }

  app.on('will-finish-launching', function () {
    app.on('open-url', onOpenUrl)
  })
-
-  // @ts-ignore
-  global['getOpenUrls'] = function () {
-    app.removeListener('open-url', onOpenUrl)
-
-    return openUrls
-  }
 }
--- a/src/wasm-lib/Cargo.lock
+++ b/src/wasm-lib/Cargo.lock
@ -127,7 +127,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]

 [[package]]
@ -138,7 +138,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]

 [[package]]
@ -149,7 +149,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]

 [[package]]
@ -397,7 +397,7 @@ dependencies = [
 "heck 0.5.0",
 "proc-macro2",
 "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]

 [[package]]
@ -591,7 +591,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "strsim",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]

 [[package]]
@ -602,7 +602,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
 dependencies = [
 "darling_core",
 "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]

 [[package]]
@ -657,7 +657,7 @@ checksum = "4078275de501a61ceb9e759d37bdd3d7210e654dbc167ac1a3678ef4435ed57b"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 "synstructure",
 ]

@ -686,7 +686,7 @@ dependencies = [
 "rustfmt-wrapper",
 "serde",
 "serde_tokenstream",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]

 [[package]]
@ -697,7 +697,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]

 [[package]]
@ -724,7 +724,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]

 [[package]]
@ -896,7 +896,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]

 [[package]]
@ -986,7 +986,7 @@ dependencies = [
 "inflections",
 "proc-macro2",
 "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]

 [[package]]
@ -1412,7 +1412,7 @@ dependencies = [
 "pretty_assertions",
 "proc-macro2",
 "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]

 [[package]]
@ -1799,7 +1799,7 @@ dependencies = [
 "regex",
 "regex-syntax 0.8.3",
 "structmeta",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]

 [[package]]
@ -1817,7 +1817,7 @@ dependencies = [
 "bincode",
 "either",
 "fnv",
- "itertools 0.10.5",
+ "itertools 0.12.1",
 "lazy_static",
 "nom",
 "quick-xml",
@ -1852,7 +1852,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]

 [[package]]
@ -2016,7 +2016,7 @@ dependencies = [
 "proc-macro2",
 "pyo3-macros-backend",
 "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]

 [[package]]
@ -2029,7 +2029,7 @@ dependencies = [
 "proc-macro2",
 "pyo3-build-config",
 "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]

 [[package]]
@ -2491,7 +2491,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "serde_derive_internals",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]

 [[package]]
@ -2541,9 +2541,9 @@ checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"

 [[package]]
 name = "serde"
-version = "1.0.208"
+version = "1.0.209"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2"
+checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
 dependencies = [
 "serde_derive",
 ]
@ -2559,13 +2559,13 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.208"
+version = "1.0.209"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf"
+checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]

 [[package]]
@ -2576,14 +2576,14 @@ checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]

 [[package]]
 name = "serde_json"
-version = "1.0.125"
+version = "1.0.127"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed"
+checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
 dependencies = [
 "indexmap 2.2.5",
 "itoa",
@ -2600,7 +2600,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]

 [[package]]
@ -2621,7 +2621,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "serde",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]

 [[package]]
@ -2752,7 +2752,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "structmeta-derive",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]

 [[package]]
@ -2763,7 +2763,7 @@ checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]

 [[package]]
@ -2807,9 +2807,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "2.0.75"
+version = "2.0.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9"
+checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525"
 dependencies = [
 "proc-macro2",
 "quote",
@ -2830,7 +2830,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]

 [[package]]
@ -2937,7 +2937,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]

 [[package]]
@ -3032,7 +3032,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]

 [[package]]
@ -3185,7 +3185,7 @@ checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]

 [[package]]
@ -3213,7 +3213,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]

 [[package]]
@ -3290,7 +3290,7 @@ checksum = "c88cc88fd23b5a04528f3a8436024f20010a16ec18eb23c164b1242f65860130"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 "termcolor",
 ]

@ -3448,7 +3448,7 @@ dependencies = [
 "proc-macro-error",
 "proc-macro2",
 "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]

 [[package]]
@ -3509,7 +3509,7 @@ dependencies = [
 "once_cell",
 "proc-macro2",
 "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 "wasm-bindgen-shared",
 ]

@ -3544,7 +3544,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
 ]
@ -3869,7 +3869,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]

 [[package]]
--- a/src/wasm-lib/Cargo.toml
+++ b/src/wasm-lib/Cargo.toml
@ -15,7 +15,7 @@ data-encoding = "2.6.0"
 gloo-utils = "0.2.0"
 kcl-lib = { path = "kcl" }
 kittycad.workspace = true
-serde_json = "1.0.125"
+serde_json = "1.0.127"
 tokio = { version = "1.39.3", features = ["sync"] }
 toml = "0.8.19"
 uuid = { version = "1.10.0", features = ["v4", "js", "serde"] }
--- a/src/wasm-lib/derive-docs/Cargo.toml
+++ b/src/wasm-lib/derive-docs/Cargo.toml
@ -18,9 +18,9 @@ once_cell = "1.19.0"
 proc-macro2 = "1"
 quote = "1"
 regex = "1.10"
-serde = { version = "1.0.208", features = ["derive"] }
+serde = { version = "1.0.209", features = ["derive"] }
 serde_tokenstream = "0.2"
-syn = { version = "2.0.75", features = ["full"] }
+syn = { version = "2.0.76", features = ["full"] }

 [dev-dependencies]
 anyhow = "1.0.86"
--- a/src/wasm-lib/kcl-macros/Cargo.toml
+++ b/src/wasm-lib/kcl-macros/Cargo.toml
@ -15,7 +15,7 @@ databake = "0.1.8"
 kcl-lib = { path = "../kcl" }
 proc-macro2 = "1"
 quote = "1"
-syn = { version = "2.0.75", features = ["full"] }
+syn = { version = "2.0.76", features = ["full"] }

 [dev-dependencies]
 pretty_assertions = "1.4.0"
--- a/src/wasm-lib/kcl-test-server/Cargo.toml
+++ b/src/wasm-lib/kcl-test-server/Cargo.toml
@ -10,6 +10,6 @@ anyhow = "1.0.86"
 hyper = { version = "0.14.29", features = ["server"] }
 kcl-lib = { version = "0.2", path = "../kcl" }
 pico-args = "0.5.0"
-serde = { version = "1.0.208", features = ["derive"] }
-serde_json = "1.0.125"
+serde = { version = "1.0.209", features = ["derive"] }
+serde_json = "1.0.127"
 tokio = { version = "1.39.3", features = ["macros", "rt-multi-thread"] }
--- a/src/wasm-lib/kcl/Cargo.toml
+++ b/src/wasm-lib/kcl/Cargo.toml
@ -36,8 +36,8 @@ pyo3 = { version = "0.22.2", optional = true }
 reqwest = { version = "0.11.26", default-features = false, features = ["stream", "rustls-tls"] }
 ropey = "1.6.1"
 schemars = { version = "0.8.17", features = ["impl_json_schema", "url", "uuid1"] }
-serde = { version = "1.0.208", features = ["derive"] }
-serde_json = "1.0.125"
+serde = { version = "1.0.209", features = ["derive"] }
+serde_json = "1.0.127"
 sha2 = "0.10.8"
 tabled = { version = "0.15.0", optional = true }
 thiserror = "1.0.63"
--- a/yarn.lock
+++ b/yarn.lock
@ -6993,9 +6993,9 @@ methods@~1.1.2:
  integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==

 micromatch@^4.0.4, micromatch@^4.0.5:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.7.tgz#33e8190d9fe474a9895525f5618eee136d46c2e5"
-  integrity sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
+  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
  dependencies:
    braces "^3.0.3"
    picomatch "^2.3.1"