Merge branch 'main' into iterion/enable-last-win32-test

* Remove isFirstRender because isExecuting means the same and remove building scene

* add small makefile util

* Remove waiting for building scene prompt

* Add a new model state indicator

* fmt lint tsc

---------

Co-authored-by: Frank Noirot <frank@kittycad.io>

.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

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

@@ -1,4 +1,4 @@
-name: build-test-publish-apps
+name: build-publish-apps
 
 on:
   pull_request:
@@ -21,7 +21,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  prepare-json-files:
+  prepare-files:
     runs-on: ubuntu-22.04  # seperate job on Ubuntu for easy string manipulations (compared to Windows)
     outputs:
       version: ${{ steps.export_version.outputs.version }}
@@ -33,6 +33,19 @@ jobs:
           node-version-file: '.nvmrc'
           cache: 'yarn'
 
+      - run: yarn install
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: './src/wasm-lib'
+
+      # TODO: see if we can fetch from main instead if no diff at src/wasm-lib
+      - name: Run build:wasm
+        run: "yarn build:wasm${{ env.BUILD_RELEASE == 'true' && '-dev' || ''}}"
+
       - name: Set nightly version
         if: github.event_name == 'schedule'
         run: |
@@ -42,36 +55,50 @@ jobs:
       # TODO: see if we ned to add updater test URL here https://dl.zoo.dev/releases/modeling-app/updater-test/last_update.json
 
       - uses: actions/upload-artifact@v3
-        if: ${{ github.event_name == 'schedule' || env.CUT_RELEASE_PR == 'true' }}
         with:
+          name: prepared-files
           path: |
             package.json
+            src/wasm-lib/pkg/wasm_lib*
 
       - id: export_version
         run: echo "version=`cat package.json | jq -r '.version'`" >> "$GITHUB_OUTPUT"
 
 
-  build-test-app-macos:
-    needs: [prepare-json-files]
-    runs-on: macos-14
+  build-apps:
+    needs: [prepare-files]
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-14, windows-2022, ubuntu-22.04]
+    runs-on: ${{ matrix.os }}
     env:
       APPLE_ID: ${{ secrets.APPLE_ID }}
       APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
+      APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
       APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-      APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
-      APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
-      APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
+      CSC_LINK: ${{ secrets.APPLE_CERTIFICATE }}
+      CSC_KEY_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+      CSC_KEYCHAIN: ${{ secrets.APPLE_SIGNING_IDENTITY }}
+      CSC_FOR_PULL_REQUEST: true
+      TAURI_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
+      TAURI_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
+      VERSION: ${{ github.event_name == 'schedule' && needs.prepare-files.outputs.version || format('v{0}', needs.prepare-files.outputs.version) }}
+      VERSION_NO_V: ${{ needs.prepare-files.outputs.version }}
+      WINDOWS_CERTIFICATE_THUMBPRINT: F4C9A52FF7BC26EE5E054946F6B11DEEA94C748D
     steps:
       - uses: actions/checkout@v4
 
       - uses: actions/download-artifact@v3
-        if: github.event_name == 'schedule'
+        name: prepared-files
 
-      - name: Copy updated .json files
-        if: github.event_name == 'schedule'
+      - name: Copy prepared files
         run: |
-          ls -l artifact
-          cp artifact/package.json package.json
+          ls -R prepared-files
+          cp prepared-files/package.json package.json
+          cp prepared-files/src/wasm-lib/pkg/wasm_lib_bg.wasm public
+          mkdir src/wasm-lib/pkg
+          cp prepared-files/src/wasm-lib/pkg/wasm_lib* src/wasm-lib/pkg
 
       - name: Sync node version and setup cache
         uses: actions/setup-node@v4
@@ -81,79 +108,10 @@ jobs:
 
       - run: yarn install
 
-      - name: Setup Rust
-        uses: dtolnay/rust-toolchain@stable
-
-      - uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: './src/wasm-lib'
-
-      - name: Run build:wasm
-        run: "yarn build:wasm${{ env.BUILD_RELEASE == 'true' && '-dev' || ''}}"
-
-      # TODO: sign the app (and updater bundle potentially)
-      - name: Add signing certificate
-        if: ${{ env.BUILD_RELEASE == 'true' }}
-        run: chmod +x add-osx-cert.sh && ./add-osx-cert.sh
-
-      - name: Build the app for arm64
-        run: "yarn electron-forge make"
-
-      - name: Build the app for x64
-        run: "yarn electron-forge make --arch x64"
-
-      - name: List artifacts
-        run: "ls -R out/make"
-
-      # TODO: add the 'Build for Mac TestFlight (nightly)' stage back
-
-      - uses: actions/upload-artifact@v3
-        with:
-          path: "out/make/*/*/*/*"
-
-
-  build-test-app-windows:
-    needs: [prepare-json-files]
-    runs-on: windows-2022
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/download-artifact@v3
-
-      - name: Copy updated .json files
-        if: github.event_name == 'schedule'
-        run: |
-          ls -l artifact
-          cp artifact/package.json package.json
-
-      - name: Sync node version and setup cache
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'yarn' # Set this to npm, yarn or pnpm.
-
-      - run: yarn install
-
-      - name: Setup Rust
-        uses: dtolnay/rust-toolchain@stable
-
-      - uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: './src/wasm-lib'
-
-      - name: Run build:wasm manually
-        shell: bash
-        env:
-          MODE: ${{ env.BUILD_RELEASE == 'true' && '--release' || '--debug' }}
-        run: |
-          mkdir src/wasm-lib/pkg; cd src/wasm-lib
-          echo "building with ${{ env.MODE }}"
-          npx wasm-pack build --target web --out-dir pkg ${{ env.MODE }}
-          cd ../../
-          cp src/wasm-lib/pkg/wasm_lib_bg.wasm public
+      - run: yarn tronb:vite
 
       - name: Prepare certificate and variables (Windows only)
-        if: ${{ env.BUILD_RELEASE == 'true' }}
+        if: ${{ env.BUILD_RELEASE == 'true' && matrix.os == 'windows-2022' }}
         run: |
           echo "${{secrets.SM_CLIENT_CERT_FILE_B64 }}" | base64 --decode > /d/Certificate_pkcs12.p12
           cat /d/Certificate_pkcs12.p12
@@ -168,7 +126,7 @@ jobs:
         shell: bash
 
       - name: Setup certicate with SSM KSP (Windows only)
-        if: ${{ env.BUILD_RELEASE == 'true' }}
+        if: ${{ env.BUILD_RELEASE == 'true' && matrix.os == 'windows-2022' }}
         run: |
           curl -X GET  https://one.digicert.com/signingmanager/api-ui/v1/releases/smtools-windows-x64.msi/download -H "x-api-key:%SM_API_KEY%" -o smtools-windows-x64.msi
           msiexec /i smtools-windows-x64.msi /quiet /qn
@@ -178,83 +136,47 @@ jobs:
           smksp_cert_sync.exe
         shell: cmd
 
-      - name: Build the app for x64
-        run: "yarn electron-forge make --arch x64"
+      - name: Build the app
+        run: yarn electron-builder --config ${{ env.BUILD_RELEASE && '--publish always' || '' }}
 
-      - name: Build the app for arm64
-        run: "yarn electron-forge make --arch arm64"
+      - name: List artifacts in out/
+        run: ls -R out
 
-      - name: List artifacts
-        run: "ls -R out/make"
-
-      - name: Sign using Signtool
-        if: ${{ env.BUILD_RELEASE == 'true' }}
-        env:
-          THUMBPRINT: "F4C9A52FF7BC26EE5E054946F6B11DEEA94C748D"
-          X64_FILE: "D:\\a\\modeling-app\\modeling-app\\out\\make\\squirrel.windows\\x64\\Zoo Modeling App-*Setup.exe"
-          ARM64_FILE: "D:\\a\\modeling-app\\modeling-app\\out\\make\\squirrel.windows\\arm64\\Zoo Modeling App-*Setup.exe"
+      - name: Prepare the tauri update bundles (macOS)
+        if: ${{ env.BUILD_RELEASE && matrix.os == 'macos-14' }}
         run: |
-          signtool.exe sign /sha1 ${{ env.THUMBPRINT }} /tr http://timestamp.digicert.com /td SHA256 /fd SHA256 "${{ env.X64_FILE }}"
-          signtool.exe verify /v /pa "${{ env.X64_FILE }}"
-          signtool.exe sign /sha1 ${{ env.THUMBPRINT }} /tr http://timestamp.digicert.com /td SHA256 /fd SHA256 "${{ env.ARM64_FILE }}"
-          signtool.exe verify /v /pa "${{ env.ARM64_FILE }}"
+          for ARCH in arm64 x64; do
+            TAURI_DIR=out/tauri/$VERSION/macos
+            TEMP_DIR=temp/$ARCH
+            mkdir -p $TAURI_DIR
+            mkdir -p $TEMP_DIR
+            unzip out/*-$ARCH-mac.zip -d $TEMP_DIR
+            tar -czvf "$TAURI_DIR/Zoo Modeling App-$ARCH.app.tar.gz" -C $TEMP_DIR "Zoo Modeling App.app" 
+            yarn tauri signer sign "$TAURI_DIR/Zoo Modeling App-$ARCH.app.tar.gz"
+          done
+          ls -R out
+
+      - name: Prepare the tauri update bundles (Windows)
+        if: ${{ env.BUILD_RELEASE && matrix.os == 'windows-2022' }}
+        run: |
+          $env:TAURI_DIR="out/tauri/${env:VERSION}/nsis"
+          mkdir -p ${env:TAURI_DIR}
+          $env:OUT_FILE="${env:TAURI_DIR}/Zoo Modeling App_${env:VERSION_NO_V}_x64-setup.nsis.zip"
+          7z a -mm=Copy "${env:OUT_FILE}" ./out/*-x64-win.exe
+          yarn tauri signer sign "${env:OUT_FILE}"
+          ls -R out
 
       - uses: actions/upload-artifact@v3
         with:
-          path: "out/make/*/*/*"
-
-      # TODO: Run e2e tests
-
-
-  build-test-app-ubuntu:
-    needs: [prepare-json-files]
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/download-artifact@v3
-        if: github.event_name == 'schedule'
-
-      - name: Copy updated .json files
-        if: github.event_name == 'schedule'
-        run: |
-          ls -l artifact
-          cp artifact/package.json package.json
-
-      - name: Sync node version and setup cache
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'yarn' # Set this to npm, yarn or pnpm.
-
-      - run: yarn install
-
-      - name: Setup Rust
-        uses: dtolnay/rust-toolchain@stable
-
-      - uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: './src/wasm-lib'
-
-      - name: Run build:wasm
-        run: "yarn build:wasm${{ env.BUILD_RELEASE == 'true' && '-dev' || ''}}"
-
-      - name: Build the app for arm64
-        run: "yarn electron-forge make --arch arm64"
-
-      - name: Build the app for x64
-        run: "yarn electron-forge make --arch x64"
-
-      - name: List artifacts
-        run: "ls -R out/make"
+          name: out-${{ matrix.os }}
+          path: |
+            out/Zoo*.*
+            out/latest*.yml
+            out/tauri
 
       # TODO: add the 'Build for Mac TestFlight (nightly)' stage back
 
-      # TODO: sign the app (and updater bundle potentially)
-
-      - uses: actions/upload-artifact@v3
-        with:
-          path: "out/make/*/*/*"
+      # TODO: add the updater tests back
 
 
   publish-apps-release:
@@ -262,87 +184,107 @@ jobs:
     permissions:
       contents: write
     if: ${{ github.event_name == 'release' || github.event_name == 'schedule' }}
-    needs: [prepare-json-files, build-test-app-macos, build-test-app-windows, build-test-app-ubuntu]
+    needs: [prepare-files, build-apps]
     env:
-      VERSION_NO_V: ${{ needs.prepare-json-files.outputs.version }}
-      VERSION: ${{ github.event_name == 'release' && format('v{0}', needs.prepare-json-files.outputs.version) || needs.prepare-json-files.outputs.version }}
+      VERSION_NO_V: ${{ needs.prepare-files.outputs.version }}
+      VERSION: ${{ github.event_name == 'schedule' && needs.prepare-files.outputs.version || format('v{0}', needs.prepare-files.outputs.version) }}
       PUB_DATE: ${{ github.event_name == 'release' && github.event.release.created_at || github.event.repository.updated_at }}
-      NOTES: ${{ github.event_name == 'release' && github.event.release.body || format('Nightly build, commit {0}', github.sha) }}
-      BUCKET_DIR: ${{ github.event_name == 'release' && 'dl.kittycad.io/releases/modeling-app' || 'dl.kittycad.io/releases/modeling-app/nightly' }}
-      WEBSITE_DIR: ${{ github.event_name == 'release' && 'dl.zoo.dev/releases/modeling-app' || 'dl.zoo.dev/releases/modeling-app/nightly' }}
+      NOTES: ${{ github.event_name == 'release' && github.event.release.body || format('Non-release build, commit {0}', github.sha) }}
+      BUCKET_DIR: ${{ github.event_name == 'schedule' && 'dl.kittycad.io/releases/modeling-app/nightly' || 'dl.kittycad.io/releases/modeling-app' }}
+      WEBSITE_DIR: ${{ github.event_name == 'schedule' && 'dl.zoo.dev/releases/modeling-app/nightly' || 'dl.zoo.dev/releases/modeling-app' }}
+      BUCKET_DIR_TAURI: 'dl.kittycad.io/releases/modeling-app/tauri-compat'
+      WEBSITE_DIR_TAURI: 'dl.zoo.dev/releases/modeling-app/tauri-compat'
       URL_CODED_NAME: ${{ github.event_name == 'schedule' && 'Zoo%20Modeling%20App%20%28Nightly%29' || 'Zoo%20Modeling%20App' }}
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/checkout@v4
 
-      - name: Generate the update static endpoint
+      - uses: actions/download-artifact@v3
+        with:
+          name: out-windows-2022
+          path: out
+
+      - uses: actions/download-artifact@v3
+        with:
+          name: out-macos-14
+          path: out
+
+      - uses: actions/download-artifact@v3
+        with:
+          name: out-ubuntu-22.04
+          path: out
+      
+      - name: Generate the download static endpoint
         run: |
-          ls -l artifact/*/*oo*
-          DARWIN_SIG=`cat artifact/macos/*.app.tar.gz.sig`
-          WINDOWS_X86_64_SIG=`cat artifact/msi/*x64*.msi.zip.sig`
-          WINDOWS_AARCH64_SIG=`cat artifact/msi/*arm64*.msi.zip.sig`
-          RELEASE_DIR=https://${WEBSITE_DIR}/${VERSION}
+          RELEASE_DIR=https://${WEBSITE_DIR}
           jq --null-input \
             --arg version "${VERSION}" \
             --arg pub_date "${PUB_DATE}" \
             --arg notes "${NOTES}" \
-            --arg darwin_sig "$DARWIN_SIG" \
-            --arg darwin_url "$RELEASE_DIR/macos/${{ env.URL_CODED_NAME }}.app.tar.gz" \
-            --arg windows_x86_64_sig "$WINDOWS_X86_64_SIG" \
-            --arg windows_x86_64_url "$RELEASE_DIR/msi/${{ env.URL_CODED_NAME }}_${VERSION_NO_V}_x64_en-US.msi.zip" \
-            --arg windows_aarch64_sig "$WINDOWS_AARCH64_SIG" \
-            --arg windows_aarch64_url "$RELEASE_DIR/msi/${{ env.URL_CODED_NAME }}_${VERSION_NO_V}_arm64_en-US.msi.zip" \
+            --arg mac_arm64_url "$RELEASE_DIR/${{ env.URL_CODED_NAME }}-${VERSION_NO_V}-arm64-mac.dmg" \
+            --arg mac_x64_url "$RELEASE_DIR/${{ env.URL_CODED_NAME }}-${VERSION_NO_V}-x64-mac.dmg" \
+            --arg windows_arm64_url "$RELEASE_DIR/${{ env.URL_CODED_NAME }}-${VERSION_NO_V}-arm64-win.msi" \
+            --arg windows_x64_url "$RELEASE_DIR/${{ env.URL_CODED_NAME }}-${VERSION_NO_V}-x64-win.msi" \
+            '{
+              "version": $version,
+              "pub_date": $pub_date,
+              "notes": $notes,
+              "platforms": {
+                "dmg-arm64": {
+                  "url": $mac_arm64_url
+                },
+                "dmg-x64": {
+                  "url": $mac_x64_url
+                },
+                "msi-arm64": {
+                  "url": $windows_arm64_url
+                },
+                "msi-x64": {
+                  "url": $windows_x64_url
+                }
+              }
+            }' > last_download.json
+            cat last_download.json
+
+      - name: Generate the update static endpoint for tauri
+        run: |
+          TAURI_DIR=out/tauri/$VERSION
+          MAC_ARM64_SIG=`cat $TAURI_DIR/macos/*-arm64.app.tar.gz.sig`
+          MAC_X64_SIG=`cat $TAURI_DIR/macos/*-x64.app.tar.gz.sig`
+          WINDOWS_SIG=`cat $TAURI_DIR/nsis/*.nsis.zip.sig`
+          RELEASE_DIR=https://${WEBSITE_DIR_TAURI}/${VERSION}
+          jq --null-input \
+            --arg version "${VERSION}" \
+            --arg pub_date "${PUB_DATE}" \
+            --arg notes "${NOTES}" \
+            --arg mac_arm64_sig "$MAC_ARM64_SIG" \
+            --arg mac_arm64_url "$RELEASE_DIR/macos/${{ env.URL_CODED_NAME }}-arm64.app.tar.gz" \
+            --arg mac_x64_sig "$MAC_X64_SIG" \
+            --arg mac_x64_url "$RELEASE_DIR/macos/${{ env.URL_CODED_NAME }}-x64.app.tar.gz" \
+            --arg windows_sig "$WINDOWS_SIG" \
+            --arg windows_url "$RELEASE_DIR/nsis/${{ env.URL_CODED_NAME }}_${VERSION_NO_V}_x64-setup.nsis.zip" \
             '{
               "version": $version,
               "pub_date": $pub_date,
               "notes": $notes,
               "platforms": {
                 "darwin-x86_64": {
-                  "signature": $darwin_sig,
-                  "url": $darwin_url
+                  "signature": $mac_x64_sig,
+                  "url": $mac_x64_url
                 },
                 "darwin-aarch64": {
-                  "signature": $darwin_sig,
-                  "url": $darwin_url
+                  "signature": $mac_arm64_sig,
+                  "url": $mac_arm64_url
                 },
                 "windows-x86_64": {
-                  "signature": $windows_x86_64_sig,
-                  "url": $windows_x86_64_url
-                },
-                "windows-aarch64": {
-                  "signature": $windows_aarch64_sig,
-                  "url": $windows_aarch64_url
+                  "signature": $windows_sig,
+                  "url": $windows_url
                 }
               }
             }' > last_update.json
             cat last_update.json
 
-      - name: Generate the download static endpoint
-        run: |
-          RELEASE_DIR=https://${WEBSITE_DIR}/${VERSION}
-          jq --null-input \
-            --arg version "${VERSION}" \
-            --arg pub_date "${PUB_DATE}" \
-            --arg notes "${NOTES}" \
-            --arg darwin_url "$RELEASE_DIR/dmg/${{ env.URL_CODED_NAME }}_${VERSION_NO_V}_universal.dmg" \
-            --arg windows_x86_64_url "$RELEASE_DIR/msi/${{ env.URL_CODED_NAME }}_${VERSION_NO_V}_x64_en-US.msi" \
-            --arg windows_aarch64_url "$RELEASE_DIR/msi/${{ env.URL_CODED_NAME }}_${VERSION_NO_V}_arm64_en-US.msi" \
-            '{
-              "version": $version,
-              "pub_date": $pub_date,
-              "notes": $notes,
-              "platforms": {
-                "dmg-universal": {
-                  "url": $darwin_url
-                },
-                "msi-x86_64": {
-                  "url": $windows_x86_64_url
-                },
-                "msi-aarch64": {
-                  "url": $windows_aarch64_url
-                }
-              }
-            }' > last_download.json
-            cat last_download.json
+      - name: List artifacts
+        run: "ls -R out"
 
       - name: Authenticate to Google Cloud
         uses: 'google-github-actions/auth@v2.1.5'
@@ -352,33 +294,51 @@ jobs:
       - name: Set up Google Cloud SDK
         uses: google-github-actions/setup-gcloud@v2.1.0
         with:
-          project_id: kittycadapi
+          project_id: ${{ env.GOOGLE_CLOUD_PROJECT_ID }}
 
       - name: Upload release files to public bucket
-        uses: google-github-actions/upload-cloud-storage@v2.1.3
+        uses: google-github-actions/upload-cloud-storage@v2.2.0
         with:
-          path: artifact
-          glob: '*/Zoo*'
+          path: out
+          glob: 'Zoo*'
           parent: false
-          destination: ${{ env.BUCKET_DIR }}/${{ env.VERSION }}
-
-      - name: Upload update endpoint to public bucket
-        uses: google-github-actions/upload-cloud-storage@v2.1.3
-        with:
-          path: last_update.json
           destination: ${{ env.BUCKET_DIR }}
 
+      - name: Upload update endpoint to public bucket
+        uses: google-github-actions/upload-cloud-storage@v2.2.0
+        with:
+          path: out
+          glob: 'latest*'
+          parent: false
+          destination: ${{ env.BUCKET_DIR }} 
+
       - name: Upload download endpoint to public bucket
-        uses: google-github-actions/upload-cloud-storage@v2.1.3
+        uses: google-github-actions/upload-cloud-storage@v2.2.0
         with:
           path: last_download.json
           destination: ${{ env.BUCKET_DIR }}
 
+      - name: Upload release files to public bucket for tauri
+        uses: google-github-actions/upload-cloud-storage@v2.1.1
+        with:
+          path: "out/tauri/${{ env.VERSION }}" 
+          glob: '*/Zoo*'
+          parent: false
+          destination: ${{ env.BUCKET_DIR_TAURI }}/${{ env.VERSION }}
+
+      - name: Upload update endpoint to public bucket for tauri
+        uses: google-github-actions/upload-cloud-storage@v2.1.1
+        with:
+          path: last_update.json
+          destination: ${{ env.BUCKET_DIR }}
+
       - name: Upload release files to Github
         if: ${{ github.event_name == 'release' }}
         uses: softprops/action-gh-release@v2
         with:
-          files: 'artifact/*/Zoo*'
+          files: 'out/Zoo*'
+
+      # TODO: Add GitHub publisher
 
   announce_release:
     needs: [publish-apps-release]

.github/workflows/cargo-check.yml

@@ -37,4 +37,4 @@ jobs:
           # We specifically want to test the disable-println feature
           # Since it is not enabled by default, we need to specify it
           # This is used in kcl-lsp
-          cargo check --all --features disable-println --features pyo3
+          cargo check --all --features disable-println --features pyo3 --features cli

.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

.github/workflows/playwright.yml

@@ -139,7 +139,7 @@ jobs:
     - uses: actions/upload-artifact@v4
       if: ${{ !cancelled() && (success() || failure()) }}
       with:
-        name: playwright-report-ubuntu-snapshot-${{ matrix.shardIndex }}-${{ github.sha }}
+        name: playwright-report-${{ matrix.os }}-snapshot-${{ matrix.shardIndex }}-${{ github.sha }}
         path: playwright-report/
         retention-days: 30
         overwrite: true
@@ -174,14 +174,14 @@ jobs:
     - uses: actions/upload-artifact@v4
       if: steps.git-check.outputs.modified == 'true'
       with:
-        name: playwright-report-ubuntu-${{ matrix.shardIndex }}-${{ github.sha }}
+        name: playwright-report-${{ matrix.os }}-${{ matrix.shardIndex }}-${{ github.sha }}
         path: playwright-report/
         retention-days: 30
     - uses: actions/download-artifact@v4
       if: ${{ !cancelled() && (success() || failure()) }}
       continue-on-error: true
       with:
-        name: test-results-ubuntu-${{ matrix.shardIndex }}-${{ github.sha }}
+        name: test-results-${{ matrix.os }}-${{ matrix.shardIndex }}-${{ github.sha }}
         path: test-results/
     - name: Run playwright/chrome flow (with retries)
       id: retry
@@ -244,14 +244,14 @@ jobs:
     - uses: actions/upload-artifact@v4
       if: always()
       with:
-        name: test-results-ubuntu-${{ matrix.shardIndex }}-${{ github.sha }}
+        name: test-results-${{ matrix.os }}-${{ matrix.shardIndex }}-${{ github.sha }}
         path: test-results/
         retention-days: 30
         overwrite: true
     - uses: actions/upload-artifact@v4
       if: always()
       with:
-        name: playwright-report-ubuntu-${{ matrix.shardIndex }}-${{ github.sha }}
+        name: playwright-report-${{ matrix.os }}-${{ matrix.shardIndex }}-${{ github.sha }}
         path: playwright-report/
         retention-days: 30
         overwrite: true
@@ -262,7 +262,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-14]
-    timeout-minutes: 30
+    timeout-minutes: 40
     runs-on: ${{ matrix.os }}
     needs: check-rust-changes
     steps:
@@ -351,7 +351,7 @@ jobs:
       if: ${{ !cancelled() && (success() || failure()) }}
       continue-on-error: true
       with:
-        name: test-results-ubuntu-${{ github.sha }}
+        name: test-results-${{ matrix.os }}-${{ github.sha }}
         path: test-results/
     - name: Run electron tests (with retries)
       id: retry
@@ -381,7 +381,7 @@ jobs:
                     echo "retried=true" >>$GITHUB_OUTPUT
                     echo "run playwright with last failed tests and retry $retry"
                     if [[ "$IS_UBUNTU" == "true" ]]; then
-                      xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn playwright test --config=playwright.electron.config.ts --grep=@electron || true
+                      xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn playwright test --config=playwright.electron.config.ts --last-failed --grep=@electron || true
                     else
                       yarn playwright test --config=playwright.electron.config.ts --grep=@electron || true
                     fi
@@ -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

.gitignore

@@ -54,19 +54,15 @@ e2e/playwright/export-snapshots/*
 
 ## generated files
 src/**/*.typegen.ts
-src-tauri/gen
 
 src/wasm-lib/grackle/stdlib_cube_partial.json
 Mac_App_Distribution.provisionprofile
 
 *.tsbuildinfo
+src/wasm-lib/pkg
 
 venv
 .vite/
 
 # electron
 out/
-
-src-tauri/target
-electron-test-projects-dir
-electron-test-projects-dir-2

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>

Makefile

@@ -7,6 +7,14 @@ XSTATE_TYPEGENS := $(wildcard src/machines/*.typegen.ts)
 dev: node_modules public/wasm_lib_bg.wasm $(XSTATE_TYPEGENS)
 	yarn start
 
+# I'm sorry this is so specific to my setup you may as well ignore this.
+# This is so you don't have to deal with electron windows popping up constantly.
+# It should work for you other Linux users.
+lee-electron-test:
+	Xephyr -br -ac -noreset -screen 1200x500 :2 &
+	DISPLAY=:2 NODE_ENV=development PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:4444/ yarn tron:test -g "when using the file tree"
+	killall Xephyr
+
 $(XSTATE_TYPEGENS): $(TS_SRC)
 	yarn xstate typegen 'src/**/*.ts?(x)'
 

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
 ```
@@ -189,12 +188,22 @@ For more information on fuzzing you can check out
 
 ### Playwright tests
 
+You will need a `./e2e/playwright/playwright-secrets.env` file:
+
+```bash
+$ touch ./e2e/playwright/playwright-secrets.env
+$ cat ./e2e/playwright/playwright-secrets.env
+token=<dev.zoo.dev/account/api-tokens>
+snapshottoken=<your-snapshot-token>
+```
+
 For a portable way to run Playwright you'll need Docker.
 
+#### Generic example
 After that, open a terminal and run:
 
 ```bash
-docker run --network host  --rm --init -it playwright/chrome:playwright-1.43.1
+docker run --network host  --rm --init -it playwright/chrome:playwright-x.xx.x
 ```
 
 and in another terminal, run:
@@ -203,21 +212,27 @@ and in another terminal, run:
 PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:4444/ yarn playwright test --project="Google Chrome" <test suite>
 ```
 
-An example of a `<test suite>` is: `e2e/playwright/flow-tests.spec.ts`
 
-YOU WILL NEED A PLAYWRIGHT-SECRETS.ENV FILE:
+#### Specific example
 
+open a terminal and run:
 
 ```bash
-# ./e2e/playwright/playwright-secrets.env
-token=<your-token>
-snapshottoken=<your-snapshot-token>
+docker run --network host  --rm --init -it playwright/chrome:playwright-1.46.0
+```
+
+and in another terminal, run:
+
+```bash
+PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:4444/ yarn playwright test --project="Google Chrome" e2e/playwright/command-bar-tests.spec.ts
 ```
-then replace "your-token" with a dev token from dev.zoo.dev/account/api-tokens
 
 run a specific test change the test from `test('...` to `test.only('...`
 (note if you commit this, the tests will instantly fail without running any of the tests)
 
+
+**Gotcha**: running the docker container with a mismatched image against your `./node_modules/playwright` will cause a failure. Make sure the versions are matched and up to date.
+
 run headed
 
 ```

add-osx-cert.sh

@@ -1,24 +0,0 @@
-#!/usr/bin/env sh
-# From https://dev.to/rwwagner90/signing-electron-apps-with-github-actions-4cof
-
-KEY_CHAIN=build.keychain
-CERTIFICATE_P12=certificate.p12
-
-# Recreate the certificate from the secure environment variable
-echo $APPLE_CERTIFICATE | base64 --decode > $CERTIFICATE_P12
-
-#create a keychain
-security create-keychain -p actions $KEY_CHAIN
-
-# Make the keychain the default so identities are found
-security default-keychain -s $KEY_CHAIN
-
-# Unlock the keychain
-security unlock-keychain -p actions $KEY_CHAIN
-
-security import $CERTIFICATE_P12 -k $KEY_CHAIN -P $APPLE_CERTIFICATE_PASSWORD -T /usr/bin/codesign;
-
-security set-key-partition-list -S apple-tool:,apple: -s -k actions $KEY_CHAIN
-
-# remove certs
-rm -fr *.p12

docs/kcl/index.md

@@ -88,6 +88,7 @@ layout: manual
 * [`tan`](kcl/tan)
 * [`tangentialArc`](kcl/tangentialArc)
 * [`tangentialArcTo`](kcl/tangentialArcTo)
+* [`tangentialArcToRelative`](kcl/tangentialArcToRelative)
 * [`tau`](kcl/tau)
 * [`toDegrees`](kcl/toDegrees)
 * [`toRadians`](kcl/toRadians)

docs/kcl/tangentialArc.md

@@ -37,8 +37,7 @@ const example = extrude(10, exampleSketch)
 	offset: number,
 	// Radius of the arc. Not to be confused with Raiders of the Lost Ark.
 	radius: number,
-} |
-[number, number]
+}
 ```
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths. (REQUIRED)
 ```js

e2e/playwright/basic-sketch.spec.ts

@@ -96,33 +96,49 @@ async function doBasicSketch(page: Page, openPanes: string[]) {
   }
 
   // deselect line tool
-  await page.getByTestId('line').click()
+  const btnLine = page.getByTestId('line')
+  const btnLineAriaPressed = await btnLine.getAttribute('aria-pressed')
+  if (btnLineAriaPressed === 'true') {
+    await btnLine.click()
+  }
+
+  await page.waitForTimeout(100)
 
   const line1 = await u.getSegmentBodyCoords(`[data-overlay-index="${0}"]`, 0)
   if (openPanes.includes('code')) {
     await expect
       .poll(async () => u.getGreatestPixDiff(line1, TEST_COLORS.WHITE))
       .toBeLessThan(3)
+    await page.waitForTimeout(100)
     await expect
-      .poll(() => u.getGreatestPixDiff(line1, [249, 249, 249]))
+      .poll(async () => u.getGreatestPixDiff(line1, [249, 249, 249]))
       .toBeLessThan(3)
+    await page.waitForTimeout(100)
   }
+
   // click between first two clicks to get center of the line
   await page.mouse.click(startXPx + PUR * 15, 500 - PUR * 10)
   await page.waitForTimeout(100)
+
   if (openPanes.includes('code')) {
-    expect(await u.getGreatestPixDiff(line1, TEST_COLORS.BLUE)).toBeLessThan(3)
+    await expect(
+      await u.getGreatestPixDiff(line1, TEST_COLORS.BLUE)
+    ).toBeLessThan(3)
     await expect(await u.getGreatestPixDiff(line1, [0, 0, 255])).toBeLessThan(3)
   }
 
   // hold down shift
   await page.keyboard.down('Shift')
+  await page.waitForTimeout(100)
+
   // click between the latest two clicks to get center of the line
   await page.mouse.click(startXPx + PUR * 10, 500 - PUR * 20)
+  await page.waitForTimeout(100)
 
   // selected two lines therefore there should be two cursors
   if (openPanes.includes('code')) {
     await expect(page.locator('.cm-cursor')).toHaveCount(2)
+    await page.waitForTimeout(100)
   }
 
   await page.getByRole('button', { name: 'Length: open menu' }).click()

e2e/playwright/code-pane-and-errors.spec.ts

@@ -27,9 +27,19 @@ test.describe('Code pane and errors', () => {
     const u = await getUtils(page)
 
     // Load the app with the working starter code
-    await page.addInitScript((code) => {
-      localStorage.setItem('persistCode', code)
-    }, bracket)
+    await page.addInitScript(() => {
+      localStorage.setItem(
+        'persistCode',
+        `// Extruded Triangle
+const sketch001 = startSketchOn('XZ')
+  |> startProfileAt([0, 0], %)
+  |> line([10, 0], %)
+  |> line([-5, 10], %)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)
+const extrude001 = extrude(5, sketch001)`
+      )
+    })
 
     await page.setViewportSize({ width: 1200, height: 500 })
     await u.waitForAuthSkipAppStart()

e2e/playwright/desktop-export.spec.ts

@@ -43,12 +43,6 @@ test(
       // open the project
       await page.getByText(`bracket`).click()
 
-      // wait for the project to load
-      await expect(page.getByTestId('loading')).toBeAttached()
-      await expect(page.getByTestId('loading')).not.toBeAttached({
-        timeout: 20_000,
-      })
-
       // expect zero errors in guter
       await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
 
@@ -56,6 +50,12 @@ test(
       const exportButton = page.getByTestId('export-pane-button')
       await expect(exportButton).toBeVisible()
 
+      // Wait for the model to finish loading
+      const modelStateIndicator = page.getByTestId(
+        'model-state-indicator-execution-done'
+      )
+      await expect(modelStateIndicator).toBeVisible({ timeout: 60000 })
+
       const gltfOption = page.getByText('glTF')
       const submitButton = page.getByText('Confirm Export')
       const exportingToastMessage = page.getByText(`Exporting...`)
@@ -104,7 +104,7 @@ test(
             },
             { timeout: 15_000 }
           )
-          .toBe(477327)
+          .toBe(477481)
 
         // clean up output.gltf
         await fsp.rm('output.gltf')

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], %)

e2e/playwright/file-tree.spec.ts

@@ -0,0 +1,204 @@
+import { test, expect } from '@playwright/test'
+import * as fsp from 'fs/promises'
+import { getUtils, setup, setupElectron, tearDown } from './test-utils'
+
+test.beforeEach(async ({ context, page }) => {
+  await setup(context, page)
+})
+
+test.afterEach(async ({ page }, testInfo) => {
+  await tearDown(page, testInfo)
+})
+
+test.describe('when using the file tree to', () => {
+  const fromFile = 'main.kcl'
+  const toFile = 'hello.kcl'
+
+  test(
+    `rename ${fromFile} to ${toFile}, and doesn't crash on reload and settings load`,
+    { tag: '@electron' },
+    async ({ browser: _ }, testInfo) => {
+      const { electronApp, page } = await setupElectron({
+        testInfo,
+        folderSetupFn: async () => {},
+      })
+
+      const {
+        panesOpen,
+        createAndSelectProject,
+        pasteCodeInEditor,
+        renameFile,
+        editorTextMatches,
+      } = await getUtils(page, test)
+
+      await page.setViewportSize({ width: 1200, height: 500 })
+      page.on('console', console.log)
+
+      await panesOpen(['files', 'code'])
+
+      await createAndSelectProject('project-000')
+
+      // File the main.kcl with contents
+      const kclCube = await fsp.readFile(
+        'src/wasm-lib/tests/executor/inputs/cube.kcl',
+        'utf-8'
+      )
+      await pasteCodeInEditor(kclCube)
+
+      await renameFile(fromFile, toFile)
+      await page.reload()
+
+      await test.step('Postcondition: editor has same content as before the rename', async () => {
+        await editorTextMatches(kclCube)
+      })
+
+      await test.step('Postcondition: opening and closing settings works', async () => {
+        const settingsOpenButton = page.getByRole('link', {
+          name: 'settings Settings',
+        })
+        const settingsCloseButton = page.getByTestId('settings-close-button')
+        await settingsOpenButton.click()
+        await settingsCloseButton.click()
+      })
+
+      await electronApp.close()
+    }
+  )
+
+  test(
+    `create many new untitled files they increment their names`,
+    { tag: '@electron' },
+    async ({ browser: _ }, testInfo) => {
+      const { electronApp, page } = await setupElectron({
+        testInfo,
+        folderSetupFn: async () => {},
+      })
+
+      const { panesOpen, createAndSelectProject, createNewFile } =
+        await getUtils(page, test)
+
+      await page.setViewportSize({ width: 1200, height: 500 })
+      page.on('console', console.log)
+
+      await panesOpen(['files'])
+
+      await createAndSelectProject('project-000')
+
+      await createNewFile('')
+      await createNewFile('')
+      await createNewFile('')
+      await createNewFile('')
+      await createNewFile('')
+
+      await test.step('Postcondition: there are 5 new Untitled-*.kcl files', async () => {
+        await expect(
+          page
+            .locator('[data-testid="file-pane-scroll-container"] button')
+            .filter({ hasText: /Untitled[-]?[0-5]?/ })
+        ).toHaveCount(5)
+      })
+
+      await electronApp.close()
+    }
+  )
+
+  test(
+    'create a new file with the same name as an existing file cancels the operation',
+    { tag: '@electron' },
+    async ({ browser: _ }, testInfo) => {
+      const { electronApp, page } = await setupElectron({
+        testInfo,
+        folderSetupFn: async () => {},
+      })
+
+      const {
+        panesOpen,
+        createAndSelectProject,
+        pasteCodeInEditor,
+        createNewFileAndSelect,
+        renameFile,
+        selectFile,
+        editorTextMatches,
+      } = await getUtils(page, test)
+
+      await page.setViewportSize({ width: 1200, height: 500 })
+      page.on('console', console.log)
+
+      await panesOpen(['files', 'code'])
+
+      await createAndSelectProject('project-000')
+      // File the main.kcl with contents
+      const kclCube = await fsp.readFile(
+        'src/wasm-lib/tests/executor/inputs/cube.kcl',
+        'utf-8'
+      )
+      await pasteCodeInEditor(kclCube)
+
+      const kcl1 = 'main.kcl'
+      const kcl2 = '2.kcl'
+
+      await createNewFileAndSelect(kcl2)
+      const kclCylinder = await fsp.readFile(
+        'src/wasm-lib/tests/executor/inputs/cylinder.kcl',
+        'utf-8'
+      )
+      await pasteCodeInEditor(kclCylinder)
+
+      await renameFile(kcl2, kcl1)
+
+      await test.step(`Postcondition: ${kcl1} still has the original content`, async () => {
+        await selectFile(kcl1)
+        await editorTextMatches(kclCube)
+      })
+
+      await test.step(`Postcondition: ${kcl2} still exists with the original content`, async () => {
+        await selectFile(kcl2)
+        await editorTextMatches(kclCylinder)
+      })
+
+      await electronApp.close()
+    }
+  )
+
+  test(
+    'deleting all files recreates a default main.kcl with no code',
+    { tag: '@electron' },
+    async ({ browser: _ }, testInfo) => {
+      const { electronApp, page } = await setupElectron({
+        testInfo,
+        folderSetupFn: async () => {},
+      })
+
+      const {
+        panesOpen,
+        createAndSelectProject,
+        pasteCodeInEditor,
+        deleteFile,
+        editorTextMatches,
+      } = await getUtils(page, test)
+
+      await page.setViewportSize({ width: 1200, height: 500 })
+      page.on('console', console.log)
+
+      await panesOpen(['files', 'code'])
+
+      await createAndSelectProject('project-000')
+      // File the main.kcl with contents
+      const kclCube = await fsp.readFile(
+        'src/wasm-lib/tests/executor/inputs/cube.kcl',
+        'utf-8'
+      )
+      await pasteCodeInEditor(kclCube)
+
+      const kcl1 = 'main.kcl'
+
+      await deleteFile(kcl1)
+
+      await test.step(`Postcondition: ${kcl1} is recreated but has no content`, async () => {
+        await editorTextMatches('')
+      })
+
+      await electronApp.close()
+    }
+  )
+})

e2e/playwright/projects.spec.ts

@@ -173,10 +173,10 @@ test.describe('Can export from electron app', () => {
           // gray at this pixel means the stream has loaded in the most
           // user way we can verify it (pixel color)
           await expect
-            .poll(() => u.getGreatestPixDiff(pointOnModel, [75, 75, 75]), {
+            .poll(() => u.getGreatestPixDiff(pointOnModel, [85, 85, 85]), {
               timeout: 10_000,
             })
-            .toBeLessThan(10)
+            .toBeLessThan(15)
         })
 
         const exportLocations: Array<Paths> = []
@@ -207,7 +207,7 @@ test.describe('Can export from electron app', () => {
               },
               { timeout: 15_000 }
             )
-            .toBe(477327)
+            .toBe(477481)
 
           // clean up output.gltf
           await fsp.rm('output.gltf')
@@ -454,6 +454,7 @@ test(
     await electronApp.close()
   }
 )
+
 test(
   'File in the file pane should open with a single click',
   { tag: '@electron' },
@@ -494,10 +495,6 @@ test(
 
     await file.click()
 
-    await expect(page.getByTestId('loading')).toBeAttached()
-    await expect(page.getByTestId('loading')).not.toBeAttached({
-      timeout: 20_000,
-    })
     await expect(u.codeLocator).toContainText(
       'A mounting bracket for the Focusrite Scarlett Solo audio interface'
     )
@@ -506,6 +503,69 @@ test(
   }
 )
 
+test(
+  'Nested directories in project without main.kcl do not create main.kcl',
+  { tag: '@electron' },
+  async ({ browserName }, testInfo) => {
+    let testDir: string | undefined
+    const { electronApp, page } = await setupElectron({
+      testInfo,
+      folderSetupFn: async (dir) => {
+        await fsp.mkdir(join(dir, 'router-template-slate', 'nested'), {
+          recursive: true,
+        })
+        await fsp.copyFile(
+          executorInputPath('router-template-slate.kcl'),
+          join(dir, 'router-template-slate', 'nested', 'slate.kcl')
+        )
+        await fsp.copyFile(
+          executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
+          join(dir, 'router-template-slate', 'nested', 'bracket.kcl')
+        )
+        testDir = dir
+      },
+    })
+    const u = await getUtils(page)
+    await page.setViewportSize({ width: 1200, height: 500 })
+
+    page.on('console', console.log)
+
+    await test.step('Open the project', async () => {
+      await page.getByText('router-template-slate').click()
+      await expect(page.getByTestId('loading')).toBeAttached()
+      await expect(page.getByTestId('loading')).not.toBeAttached({
+        timeout: 20_000,
+      })
+
+      // It actually loads.
+      await expect(u.codeLocator).toContainText('mounting bracket')
+      await expect(u.codeLocator).toContainText('const radius =')
+    })
+
+    await u.openFilePanel()
+
+    // Find the current file.
+    const filesPane = page.locator('#files-pane')
+    await expect(filesPane.getByText('bracket.kcl')).toBeVisible()
+    // But there's no main.kcl in the file tree browser.
+    await expect(filesPane.getByText('main.kcl')).not.toBeVisible()
+    // No main.kcl file is created on the filesystem.
+    expect(testDir).toBeDefined()
+    if (testDir !== undefined) {
+      // eslint-disable-next-line jest/no-conditional-expect
+      await expect(
+        fsp.access(join(testDir, 'router-template-slate', 'main.kcl'))
+      ).rejects.toThrow()
+      // eslint-disable-next-line jest/no-conditional-expect
+      await expect(
+        fsp.access(join(testDir, 'router-template-slate', 'nested', 'main.kcl'))
+      ).rejects.toThrow()
+    }
+
+    await electronApp.close()
+  }
+)
+
 test(
   'Deleting projects, can delete individual project, can still create projects after deleting all',
   { tag: '@electron' },
@@ -792,10 +852,10 @@ const extrude001 = extrude(200, sketch001)`)
     // gray at this pixel means the stream has loaded in the most
     // user way we can verify it (pixel color)
     await expect
-      .poll(() => u.getGreatestPixDiff(pointOnModel, [132, 132, 132]), {
+      .poll(() => u.getGreatestPixDiff(pointOnModel, [143, 143, 143]), {
         timeout: 10_000,
       })
-      .toBeLessThan(10)
+      .toBeLessThan(15)
 
     await expect(async () => {
       await page.mouse.move(0, 0, { steps: 5 })
@@ -803,8 +863,8 @@ const extrude001 = extrude(200, sketch001)`)
       await page.mouse.click(pointOnModel.x, pointOnModel.y)
       // check user can interact with model by checking it turns yellow
       await expect
-        .poll(() => u.getGreatestPixDiff(pointOnModel, [176, 180, 132]))
-        .toBeLessThan(10)
+        .poll(() => u.getGreatestPixDiff(pointOnModel, [180, 180, 137]))
+        .toBeLessThan(15)
     }).toPass({ timeout: 40_000, intervals: [1_000] })
 
     await page.getByTestId('app-logo').click()
@@ -892,10 +952,10 @@ test(
       // gray at this pixel means the stream has loaded in the most
       // user way we can verify it (pixel color)
       await expect
-        .poll(() => u.getGreatestPixDiff(pointOnModel, [75, 75, 75]), {
+        .poll(() => u.getGreatestPixDiff(pointOnModel, [85, 85, 85]), {
           timeout: 10_000,
         })
-        .toBeLessThan(10)
+        .toBeLessThan(15)
     })
 
     await test.step('Clicking the logo takes us back to the projects page / home', async () => {
@@ -926,10 +986,10 @@ test(
       // gray at this pixel means the stream has loaded in the most
       // user way we can verify it (pixel color)
       await expect
-        .poll(() => u.getGreatestPixDiff(pointOnModel, [132, 132, 132]), {
+        .poll(() => u.getGreatestPixDiff(pointOnModel, [143, 143, 143]), {
           timeout: 10_000,
         })
-        .toBeLessThan(10)
+        .toBeLessThan(15)
     })
 
     await test.step('Opening the router-template project should load the stream', async () => {

e2e/playwright/regression-tests.spec.ts

@@ -358,6 +358,7 @@ const sketch001 = startSketchAt([-0, -0])
       await page.addInitScript(
         async ({ code }) => {
           localStorage.setItem('persistCode', code)
+          ;(window as any).playwrightSkipFilePicker = true
         },
         {
           code: bracket,
@@ -393,20 +394,22 @@ const sketch001 = startSketchAt([-0, -0])
       await test.step('The second export is blocked', async () => {
         // Find the toast.
         // Look out for the toast message
-        await expect(exportingToastMessage).toBeVisible()
-        await expect(alreadyExportingToastMessage).toBeVisible()
-
-        await page.waitForTimeout(1000)
+        await Promise.all([
+          expect(exportingToastMessage.first()).toBeVisible(),
+          expect(alreadyExportingToastMessage).toBeVisible(),
+        ])
       })
 
       await test.step('The first export still succeeds', async () => {
-        await expect(exportingToastMessage).not.toBeVisible()
-        await expect(errorToastMessage).not.toBeVisible()
-        await expect(engineErrorToastMessage).not.toBeVisible()
-
-        await expect(successToastMessage).toBeVisible()
-
-        await expect(alreadyExportingToastMessage).not.toBeVisible()
+        await Promise.all([
+          expect(exportingToastMessage).not.toBeVisible({ timeout: 15_000 }),
+          expect(errorToastMessage).not.toBeVisible(),
+          expect(engineErrorToastMessage).not.toBeVisible(),
+          expect(successToastMessage).toBeVisible({ timeout: 15_000 }),
+          expect(alreadyExportingToastMessage).not.toBeVisible({
+            timeout: 15_000,
+          }),
+        ])
       })
     })
 
@@ -419,10 +422,12 @@ const sketch001 = startSketchAt([-0, -0])
       await expect(exportingToastMessage).toBeVisible()
 
       // Expect it to succeed.
-      await expect(exportingToastMessage).not.toBeVisible()
-      await expect(errorToastMessage).not.toBeVisible()
-      await expect(engineErrorToastMessage).not.toBeVisible()
-      await expect(alreadyExportingToastMessage).not.toBeVisible()
+      await Promise.all([
+        expect(exportingToastMessage).not.toBeVisible(),
+        expect(errorToastMessage).not.toBeVisible(),
+        expect(engineErrorToastMessage).not.toBeVisible(),
+        expect(alreadyExportingToastMessage).not.toBeVisible(),
+      ])
 
       await expect(successToastMessage).toBeVisible()
     })

e2e/playwright/test-utils.ts

@@ -511,10 +511,7 @@ export async function getUtils(page: Page, test_?: typeof test) {
 
     editorTextMatches: async (code: string) => {
       const editor = page.locator(editorSelector)
-      const editorText = await editor.textContent()
-      return expect(util.toNormalizedCode(editorText || '')).toBe(
-        util.toNormalizedCode(code)
-      )
+      return expect(editor).toHaveText(code, { useInnerText: true })
     },
 
     pasteCodeInEditor: async (code: string) => {
@@ -532,18 +529,62 @@ export async function getUtils(page: Page, test_?: typeof test) {
       })
     },
 
+    createNewFile: async (name: string) => {
+      return test?.step(`Create a file named ${name}`, async () => {
+        await page.getByTestId('create-file-button').click()
+        await page.getByTestId('file-rename-field').fill(name)
+        await page.keyboard.press('Enter')
+      })
+    },
+
+    selectFile: async (name: string) => {
+      return test?.step(`Select ${name}`, async () => {
+        await page
+          .locator('[data-testid="file-pane-scroll-container"] button')
+          .filter({ hasText: name })
+          .click()
+      })
+    },
+
     createNewFileAndSelect: async (name: string) => {
       return test?.step(`Create a file named ${name}, select it`, async () => {
         await page.getByTestId('create-file-button').click()
         await page.getByTestId('file-rename-field').fill(name)
         await page.keyboard.press('Enter')
         await page
-          .getByTestId('file-pane-scroll-container')
+          .locator('[data-testid="file-pane-scroll-container"] button')
           .filter({ hasText: name })
           .click()
       })
     },
 
+    renameFile: async (fromName: string, toName: string) => {
+      return test?.step(`Rename ${fromName} to ${toName}`, async () => {
+        await page
+          .locator('[data-testid="file-pane-scroll-container"] button')
+          .filter({ hasText: fromName })
+          .click({ button: 'right' })
+        await page.getByTestId('context-menu-rename').click()
+        await page.getByTestId('file-rename-field').fill(toName)
+        await page.keyboard.press('Enter')
+        await page
+          .locator('[data-testid="file-pane-scroll-container"] button')
+          .filter({ hasText: toName })
+          .click()
+      })
+    },
+
+    deleteFile: async (name: string) => {
+      return test?.step(`Delete ${name}`, async () => {
+        await page
+          .locator('[data-testid="file-pane-scroll-container"] button')
+          .filter({ hasText: name })
+          .click({ button: 'right' })
+        await page.getByTestId('context-menu-delete').click()
+        await page.getByTestId('delete-confirmation').click()
+      })
+    },
+
     panesOpen: async (paneIds: PaneId[]) => {
       return test?.step(`Setting ${paneIds} panes to be open`, async () => {
         await page.addInitScript(
@@ -772,7 +813,6 @@ export async function setup(context: BrowserContext, page: Page) {
       localStorage.setItem('persistCode', ``)
       localStorage.setItem(settingsKey, settings)
       localStorage.setItem(IS_PLAYWRIGHT_KEY, 'true')
-      console.log('TEST_SETTINGS.projects', settings)
     },
     {
       token: secrets.token,

e2e/playwright/testing-selections.spec.ts

@@ -773,9 +773,9 @@ const extrude001 = extrude(50, sketch001)
 
     await page.waitForTimeout(1000)
 
-    let noHoverColor: [number, number, number] = [82, 82, 82]
-    let hoverColor: [number, number, number] = [116, 116, 116]
-    let selectColor: [number, number, number] = [144, 148, 97]
+    let noHoverColor: [number, number, number] = [92, 92, 92]
+    let hoverColor: [number, number, number] = [127, 127, 127]
+    let selectColor: [number, number, number] = [155, 155, 105]
 
     const extrudeWall = { x: 670, y: 275 }
     const extrudeText = `line([170.36, -121.61], %, $seg01)`
@@ -787,7 +787,7 @@ const extrude001 = extrude(50, sketch001)
 
     await expect
       .poll(() => u.getGreatestPixDiff(extrudeWall, noHoverColor))
-      .toBeLessThan(5)
+      .toBeLessThan(15)
     await page.mouse.move(nothing.x, nothing.y)
     await page.waitForTimeout(100)
     await page.mouse.move(extrudeWall.x, extrudeWall.y)
@@ -798,43 +798,43 @@ const extrude001 = extrude(50, sketch001)
     await page.waitForTimeout(200)
     await expect(
       await u.getGreatestPixDiff(extrudeWall, hoverColor)
-    ).toBeLessThan(6)
+    ).toBeLessThan(15)
     await page.mouse.click(extrudeWall.x, extrudeWall.y)
     await expect(page.locator('.cm-activeLine')).toHaveText(`|> ${extrudeText}`)
     await page.waitForTimeout(200)
     await expect(
       await u.getGreatestPixDiff(extrudeWall, selectColor)
-    ).toBeLessThan(6)
+    ).toBeLessThan(15)
     await page.waitForTimeout(1000)
     // check color stays there, i.e. not overridden (this was a bug previously)
     await expect(
       await u.getGreatestPixDiff(extrudeWall, selectColor)
-    ).toBeLessThan(6)
+    ).toBeLessThan(15)
 
     await page.mouse.move(nothing.x, nothing.y)
     await page.waitForTimeout(300)
     await expect(page.getByTestId('hover-highlight')).not.toBeVisible()
 
     // because of shading, color is not exact everywhere on the face
-    noHoverColor = [104, 104, 104]
-    hoverColor = [134, 134, 134]
-    selectColor = [158, 162, 110]
+    noHoverColor = [115, 115, 115]
+    hoverColor = [145, 145, 145]
+    selectColor = [168, 168, 120]
 
-    await expect(await u.getGreatestPixDiff(cap, noHoverColor)).toBeLessThan(6)
+    await expect(await u.getGreatestPixDiff(cap, noHoverColor)).toBeLessThan(15)
     await page.mouse.move(cap.x, cap.y)
     await expect(page.getByTestId('hover-highlight').first()).toBeVisible()
     await expect(page.getByTestId('hover-highlight').first()).toContainText(
       removeAfterFirstParenthesis(capText)
     )
     await page.waitForTimeout(200)
-    await expect(await u.getGreatestPixDiff(cap, hoverColor)).toBeLessThan(6)
+    await expect(await u.getGreatestPixDiff(cap, hoverColor)).toBeLessThan(15)
     await page.mouse.click(cap.x, cap.y)
     await expect(page.locator('.cm-activeLine')).toHaveText(`|> ${capText}`)
     await page.waitForTimeout(200)
-    await expect(await u.getGreatestPixDiff(cap, selectColor)).toBeLessThan(6)
+    await expect(await u.getGreatestPixDiff(cap, selectColor)).toBeLessThan(15)
     await page.waitForTimeout(1000)
     // check color stays there, i.e. not overridden (this was a bug previously)
-    await expect(await u.getGreatestPixDiff(cap, selectColor)).toBeLessThan(6)
+    await expect(await u.getGreatestPixDiff(cap, selectColor)).toBeLessThan(15)
   })
   test("Various pipe expressions should and shouldn't allow edit and or extrude", async ({
     page,

e2e/playwright/testing-settings.spec.ts

@@ -233,10 +233,6 @@ test.describe('Testing settings', () => {
     `Project settings override user settings on desktop`,
     { tag: '@electron' },
     async ({ browser: _ }, testInfo) => {
-      test.skip(
-        process.platform === 'win32',
-        'TODO: remove this skip https://github.com/KittyCAD/modeling-app/issues/3557'
-      )
       const { electronApp, page } = await setupElectron({
         testInfo,
         folderSetupFn: async (dir) => {
@@ -276,11 +272,26 @@ test.describe('Testing settings', () => {
         await expect(logoLink).toHaveCSS('--primary-hue', userThemeColor)
         await settingsCloseButton.click()
       })
+      let screenshot = await page.screenshot()
+      await testInfo.attach('screenshot1', {
+        body: screenshot,
+        contentType: 'image/png',
+      })
 
       await test.step('Set project theme color', async () => {
         // Open the project
         await projectLink.click()
+        screenshot = await page.screenshot()
+        await testInfo.attach('screenshot2', {
+          body: screenshot,
+          contentType: 'image/png',
+        })
         await settingsOpenButton.click()
+        screenshot = await page.screenshot()
+        await testInfo.attach('screenshot3', {
+          body: screenshot,
+          contentType: 'image/png',
+        })
         // The project tab should be selected by default within a project
         await expect(projectSettingsTab).toBeChecked()
         await themeColorSetting.fill(projectThemeColor)
@@ -367,4 +378,130 @@ test.describe('Testing settings', () => {
       await electronApp.close()
     }
   )
+
+  test('Changing modeling default unit', async ({ page }) => {
+    const u = await getUtils(page)
+    await page.setViewportSize({ width: 1200, height: 500 })
+    await u.waitForAuthSkipAppStart()
+    await page
+      .getByRole('button', { name: 'Start Sketch' })
+      .waitFor({ state: 'visible' })
+
+    const userSettingsTab = page.getByRole('radio', { name: 'User' })
+
+    // Open the settings modal with lower-right button
+    await page.getByRole('link', { name: 'Settings' }).last().click()
+    await expect(
+      page.getByRole('heading', { name: 'Settings', exact: true })
+    ).toBeVisible()
+
+    const resetButton = page.getByRole('button', {
+      name: 'Restore default settings',
+    })
+    // Default unit should be mm
+    await resetButton.click()
+
+    await test.step('Change modeling default unit within project tab', async () => {
+      const changeUnitOfMeasureInProjectTab = async (unitOfMeasure: string) => {
+        await test.step(`Set modeling default unit to ${unitOfMeasure}`, async () => {
+          await page
+            .getByTestId('modeling-defaultUnit')
+            .selectOption(`${unitOfMeasure}`)
+          const toastMessage = page.getByText(
+            `Set default unit to "${unitOfMeasure}" for this project`
+          )
+          await expect(toastMessage).toBeVisible()
+        })
+      }
+      await changeUnitOfMeasureInProjectTab('in')
+      await changeUnitOfMeasureInProjectTab('ft')
+      await changeUnitOfMeasureInProjectTab('yd')
+      await changeUnitOfMeasureInProjectTab('mm')
+      await changeUnitOfMeasureInProjectTab('cm')
+      await changeUnitOfMeasureInProjectTab('m')
+    })
+
+    // Go to the user tab
+    await userSettingsTab.click()
+    await test.step('Change modeling default unit within user tab', async () => {
+      const changeUnitOfMeasureInUserTab = async (unitOfMeasure: string) => {
+        await test.step(`Set modeling default unit to ${unitOfMeasure}`, async () => {
+          await page
+            .getByTestId('modeling-defaultUnit')
+            .selectOption(`${unitOfMeasure}`)
+          const toastMessage = page.getByText(
+            `Set default unit to "${unitOfMeasure}" as a user default`
+          )
+          await expect(toastMessage).toBeVisible()
+        })
+      }
+      await changeUnitOfMeasureInUserTab('in')
+      await changeUnitOfMeasureInUserTab('ft')
+      await changeUnitOfMeasureInUserTab('yd')
+      await changeUnitOfMeasureInUserTab('mm')
+      await changeUnitOfMeasureInUserTab('cm')
+      await changeUnitOfMeasureInUserTab('m')
+    })
+
+    // Close settings
+    const settingsCloseButton = page.getByTestId('settings-close-button')
+    await settingsCloseButton.click()
+
+    await test.step('Change modeling default unit within command bar', async () => {
+      const commands = page.getByRole('button', { name: 'Commands' })
+      const changeUnitOfMeasureInCommandBar = async (unitOfMeasure: string) => {
+        // Open command bar
+        await commands.click()
+        const settingsModelingDefaultUnitCommand = page.getByText(
+          'Settings · modeling · default unit'
+        )
+        await settingsModelingDefaultUnitCommand.click()
+
+        const commandOption = page.getByRole('option', {
+          name: unitOfMeasure,
+          exact: true,
+        })
+        await commandOption.click()
+
+        const toastMessage = page.getByText(
+          `Set default unit to "${unitOfMeasure}" for this project`
+        )
+        await expect(toastMessage).toBeVisible()
+      }
+      await changeUnitOfMeasureInCommandBar('in')
+      await changeUnitOfMeasureInCommandBar('ft')
+      await changeUnitOfMeasureInCommandBar('yd')
+      await changeUnitOfMeasureInCommandBar('mm')
+      await changeUnitOfMeasureInCommandBar('cm')
+      await changeUnitOfMeasureInCommandBar('m')
+    })
+
+    await test.step('Change modeling default unit within gizmo', async () => {
+      const changeUnitOfMeasureInGizmo = async (
+        unitOfMeasure: string,
+        copy: string
+      ) => {
+        const gizmo = page.getByRole('button', {
+          name: 'Current units are: ',
+        })
+        await gizmo.click()
+        const button = page.getByRole('button', {
+          name: copy,
+          exact: true,
+        })
+        await button.click()
+        const toastMessage = page.getByText(
+          `Set default unit to "${unitOfMeasure}" for this project`
+        )
+        await expect(toastMessage).toBeVisible()
+      }
+
+      await changeUnitOfMeasureInGizmo('in', 'Inches')
+      await changeUnitOfMeasureInGizmo('ft', 'Feet')
+      await changeUnitOfMeasureInGizmo('yd', 'Yards')
+      await changeUnitOfMeasureInGizmo('mm', 'Millimeters')
+      await changeUnitOfMeasureInGizmo('cm', 'Centimeters')
+      await changeUnitOfMeasureInGizmo('m', 'Meters')
+    })
+  })
 })

e2e/playwright/text-to-cad-tests.spec.ts

@@ -1,5 +1,7 @@
 import { test, expect, Page } from '@playwright/test'
-import { getUtils, setup, tearDown } from './test-utils'
+import { getUtils, setup, tearDown, setupElectron } from './test-utils'
+import { join } from 'path'
+import fs from 'fs'
 
 test.beforeEach(async ({ context, page }) => {
   await setup(context, page)
@@ -683,3 +685,60 @@ async function sendPromptFromCommandBar(page: Page, promptStr: string) {
     await page.keyboard.press('Enter')
   })
 }
+
+test(
+  'Text-to-CAD functionality',
+  { tag: '@electron' },
+  async ({ browserName }, testInfo) => {
+    const { electronApp, page, dir } = await setupElectron({ testInfo })
+    const fileExists = () =>
+      fs.existsSync(join(dir, 'project-000', 'lego-2x4.kcl'))
+
+    const { createAndSelectProject, panesOpen } = await getUtils(page, test)
+
+    await page.setViewportSize({ width: 1200, height: 500 })
+
+    await panesOpen(['code', 'files'])
+
+    // Create and navigate to the project
+    await createAndSelectProject('project-000')
+
+    // Wait for Start Sketch otherwise you will not have access Text-to-CAD command
+    await expect(
+      page.getByRole('button', { name: 'Start Sketch' })
+    ).toBeEnabled({
+      timeout: 20_000,
+    })
+
+    await test.step(`Test file creation`, async () => {
+      await sendPromptFromCommandBar(page, 'lego 2x4')
+      // 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 () => {
+      const file = page.getByRole('button', { name: 'lego-2x4.kcl' })
+      await file.click()
+      const kclComment = page.getByText('Lego 2x4 Brick')
+      // File can be navigated and loaded assuming a specific KCL comment is loaded into the KCL code pane
+      await expect(kclComment).toBeVisible({ timeout: 20_000 })
+    })
+
+    await test.step(`Test file deletion on rejection`, async () => {
+      const rejectButton = page.getByRole('button', { name: 'Reject' })
+      // A file is created and can be navigated to while this prompt is still opened
+      // Click the "Reject" button within the prompt and it will delete the file.
+      await rejectButton.click()
+
+      const submittingToastMessage = page.getByText(
+        `Successfully deleted file "lego-2x4.kcl"`
+      )
+      await expect(submittingToastMessage).toBeVisible()
+      expect(fileExists()).toBeFalsy()
+    })
+
+    await electronApp.close()
+  }
+)

electron-builder.yml

@@ -0,0 +1,64 @@
+appId: dev.zoo.modeling-app
+
+directories:
+  output: out
+  buildResources: assets
+
+files:
+  - .vite/**
+
+mac:
+  category: public.app-category.developer-tools
+  artifactName: "${productName}-${version}-${arch}-${os}.${ext}"
+  target:
+    - target: dmg 
+      arch:
+        - x64
+        - arm64
+    - target: zip 
+      arch:
+        - x64
+        - arm64
+  notarize:
+    teamId: 92H8YB3B95
+
+win:
+  artifactName: "${productName}-${version}-${arch}-${os}.${ext}"
+  target:
+    - target: nsis
+      arch:
+        - x64
+        - arm64
+    - target: msi
+      arch:
+        - x64
+        - arm64
+  signingHashAlgorithms:
+    - sha256
+  sign: "./sign-win.js"
+  publisherName: "KittyCAD Inc"  # needs to be exactly like on Digicert
+  icon: "assets/icon.ico"
+
+msi:
+  oneClick: false
+  perMachine: true
+
+nsis:
+  oneClick: false
+  perMachine: true
+  allowElevation: true
+  installerIcon: "assets/icon.ico"
+  include: "./installer.nsh"
+
+linux:
+  artifactName: "${productName}-${version}-${arch}-${os}.${ext}"
+  target:
+    - target: appImage
+      arch:
+        - x64
+        - arm64
+
+publish:
+  - provider: generic
+    url: https://dl.zoo.dev/releases/modeling-app/test/electron-builder
+    channel: latest

forge.config.ts

@@ -4,10 +4,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 = {
@@ -23,12 +30,23 @@ const config: ForgeConfig = {
       undefined,
     executableName: '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: [
     new MakerSquirrel({
       setupIcon: path.resolve(rootDir, 'assets', 'icon.ico'),
     }),
+    new MakerWix({
+      icon: path.resolve(rootDir, 'assets', 'icon.ico'),
+      associateExtensions: 'kcl',
+    } as ExtendedMakerWixConfig),
     new MakerZIP({}, ['darwin']),
     new MakerRpm({
       options: {

installer.nsh

@@ -0,0 +1,8 @@
+!macro preInit
+	SetRegView 64
+	WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Zoo Modeling App"
+	WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Zoo Modeling App"
+	SetRegView 32
+	WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Zoo Modeling App"
+	WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Zoo Modeling App"
+!macroend

interface.d.ts

@@ -31,6 +31,7 @@ export interface IElectronAPI {
   sep: typeof path.sep
   rename: (prev: string, next: string) => typeof fs.rename
   setBaseUrl: (value: string) => void
+  loadProjectAtStartup: () => Promise<ProjectState | null>
   packageJson: {
     name: string
   }

package.json

@@ -39,11 +39,13 @@
     "codemirror": "^6.0.1",
     "decamelize": "^6.0.0",
     "electron-squirrel-startup": "^1.0.1",
+    "electron-updater": "^6.3.0",
     "fuse.js": "^7.0.0",
     "html2canvas-pro": "^1.5.8",
     "isomorphic-fetch": "^3.0.0",
     "json-rpc-2.0": "^1.6.0",
     "jszip": "^3.10.1",
+    "minimist": "^1.2.8",
     "openid-client": "^5.6.5",
     "re-resizable": "^6.9.11",
     "react": "^18.3.1",
@@ -82,14 +84,13 @@
     "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",
+    "wasm-prep": "rimraf src/wasm-lib/pkg && mkdirp src/wasm-lib/pkg && rimraf 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",
-    "postinstall": "yarn xstate:typegen",
+    "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",
     "generate:machine-api": "npx openapi-typescript ./openapi/machine-api.json -o src/lib/machine-api.d.ts",
@@ -97,7 +98,9 @@
     "tron:package": "electron-forge package",
     "tron:make": "electron-forge make",
     "tron:publish": "electron-forge publish",
-    "tron:test": "NODE_ENV=development yarn playwright test --config=playwright.electron.config.ts --grep=@electron"
+    "tron:test": "NODE_ENV=development yarn playwright test --config=playwright.electron.config.ts --grep=@electron",
+    "tronb:vite": "vite build -c vite.main.config.ts && vite build -c vite.preload.config.ts && vite build -c vite.renderer.config.ts",
+    "tronb:package": "electron-builder --config electron-builder.yml"
   },
   "prettier": {
     "trailingComma": "es5",
@@ -124,19 +127,23 @@
     "@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.4.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",
     "@electron/fuses": "^1.8.0",
+    "@electron/rebuild": "^3.6.0",
     "@iarna/toml": "^2.2.5",
     "@lezer/generator": "^1.7.1",
     "@playwright/test": "^1.46.1",
+    "@tauri-apps/cli": "^2.0.0-rc.9",
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^15.0.2",
     "@types/d3-force": "^3.0.10",
     "@types/electron": "^1.6.10",
     "@types/isomorphic-fetch": "^0.0.39",
+    "@types/minimist": "^1.2.5",
     "@types/mocha": "^10.0.6",
     "@types/node": "^22.5.0",
     "@types/pixelmatch": "^5.2.6",
@@ -147,7 +154,6 @@
     "@types/three": "^0.163.0",
     "@types/ua-parser-js": "^0.7.39",
     "@types/uuid": "^9.0.8",
-    "@types/wait-on": "^5.3.4",
     "@types/wicg-file-system-access": "^2023.10.5",
     "@types/ws": "^8.5.10",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
@@ -158,6 +164,8 @@
     "autoprefixer": "^10.4.19",
     "d3-force": "^3.0.0",
     "electron": "^32.0.1",
+    "electron-builder": "^24.13.3",
+    "electron-notarize": "^1.2.2",
     "eslint": "^8.0.1",
     "eslint-config-react-app": "^7.0.1",
     "eslint-plugin-css-modules": "^2.12.0",
@@ -169,7 +177,7 @@
     "node-fetch": "^3.3.2",
     "pixelmatch": "^5.3.0",
     "pngjs": "^7.0.0",
-    "postcss": "^8.4.31",
+    "postcss": "^8.4.43",
     "postinstall-postinstall": "^2.1.0",
     "prettier": "^2.8.8",
     "setimmediate": "^1.0.5",
@@ -182,7 +190,6 @@
     "vite-tsconfig-paths": "^4.3.2",
     "vitest": "^1.6.0",
     "vitest-webgl-canvas-mock": "^1.1.0",
-    "wait-on": "^7.2.0",
     "wasm-pack": "^0.13.0",
     "ws": "^8.17.0",
     "yarn": "^1.22.22"

playwright-electron.config.ts

@@ -1,31 +0,0 @@
-import { defineConfig, devices } from '@playwright/test'
-import dotenv from 'dotenv'
-
-/**
- * See https://playwright.dev/docs/test-configuration.
- */
-export default defineConfig({
-  timeout: 120_000, // override the default 30s timeout
-  testDir: './e2e/playwright',
-  /* Run tests in files in parallel */
-  fullyParallel: true,
-  /* Fail the build on CI if you accidentally left test.only in the source code. */
-  forbidOnly: !!process.env.CI,
-  /* Do not retry */
-  retries: process.env.CI ? 0 : 0,
-  /* Different amount of parallelism on CI and local. */
-  workers: process.env.CI ? 1 : 4,
-  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-  reporter: [
-    [process.env.CI ? 'dot' : 'list'],
-    ['json', { outputFile: './test-results/report.json' }],
-    ['html'],
-  ],
-  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
-  use: {
-    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-    trace: 'retain-on-failure',
-    actionTimeout: 15000,
-    screenshot: 'only-on-failure',
-  },
-})

sign-win.js

@@ -0,0 +1,38 @@
+// From https://github.com/OpenBuilds/OpenBuilds-CONTROL/blob/4800540ffaa517925fc2cff26670809efa341ffe/signWin.js
+const { execSync } = require('node:child_process')
+
+exports.default = async (configuration) => {
+  if (!process.env.SM_API_KEY) {
+    console.error(
+      'Signing using signWin.js script: failed: SM_API_KEY ENV VAR NOT FOUND'
+    )
+    return
+  }
+
+  if (!process.env.WINDOWS_CERTIFICATE_THUMBPRINT) {
+    console.error(
+      'Signing using signWin.js script: failed: FINGERPRINT ENV VAR NOT FOUND'
+    )
+    return
+  }
+
+  if (!configuration.path) {
+    throw new Error(
+      `Signing using signWin.js script: failed: TARGET PATH NOT FOUND`
+    )
+  }
+
+  try {
+    execSync(
+      `smctl sign --fingerprint="${
+        process.env.WINDOWS_CERTIFICATE_THUMBPRINT
+      }" --input "${String(configuration.path)}"`,
+      {
+        stdio: 'inherit',
+      }
+    )
+    console.log('Signing using signWin.js script: successful')
+  } catch (error) {
+    console.error('Signing using signWin.js script: failed:', error)
+  }
+}

src/App.tsx

@@ -119,6 +119,15 @@ export function App() {
           paneOpacity +
           (context.store?.buttonDownInStream ? ' pointer-events-none' : '')
         }
+        // Override the electron window draggable region behavior as well
+        // when the button is down in the stream
+        style={
+          {
+            '-webkit-app-region': context.store?.buttonDownInStream
+              ? 'no-drag'
+              : '',
+          } as React.CSSProperties
+        }
         project={{ project, file }}
         enableMenu={true}
       />

src/Router.tsx

@@ -33,7 +33,6 @@ import SettingsAuthProvider from 'components/SettingsAuthProvider'
 import LspProvider from 'components/LspProvider'
 import { KclContextProvider } from 'lang/KclProvider'
 import { BROWSER_PROJECT_NAME } from 'lib/constants'
-import { getState, setState } from 'lib/desktop'
 import { CoreDumpManager } from 'lib/coredump'
 import { codeManager, engineCommandManager } from 'lib/singletons'
 import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
@@ -71,17 +70,13 @@ const router = createRouter([
         loader: async () => {
           const onDesktop = isDesktop()
           if (onDesktop) {
-            const appState = await getState()
-
-            if (appState) {
-              // Reset the state.
-              // We do this so that we load the initial state from the cli but everything
-              // else we can ignore.
-              await setState(undefined)
+            const projectStartupFile =
+              await window.electron.loadProjectAtStartup()
+            if (projectStartupFile !== null) {
               // Redirect to the file if we have a file path.
-              if (appState.current_file) {
+              if (projectStartupFile.length > 0) {
                 return redirect(
-                  PATHS.FILE + '/' + encodeURIComponent(appState.current_file)
+                  PATHS.FILE + '/' + encodeURIComponent(projectStartupFile)
                 )
               }
             }

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() {

src/components/ActionButton.tsx

@@ -42,7 +42,13 @@ export type ActionButtonProps =
 
 export const ActionButton = forwardRef((props: ActionButtonProps, ref) => {
   const classNames = `action-button p-0 m-0 group mono text-xs leading-none flex items-center gap-2 rounded-sm border-solid border border-chalkboard-30 hover:border-chalkboard-40 enabled:dark:border-chalkboard-70 dark:hover:border-chalkboard-60 dark:bg-chalkboard-90/50 text-chalkboard-100 dark:text-chalkboard-10 ${
-    props.iconStart ? (props.iconEnd ? 'px-0' : 'pr-2') : 'px-2'
+    props.iconStart
+      ? props.iconEnd
+        ? 'px-0'
+        : 'pr-2'
+      : props.iconEnd
+      ? 'px-2'
+      : 'pl-2'
   } ${props.className ? props.className : ''}`
 
   switch (props.Element) {

src/components/ActionIcon.tsx

@@ -35,7 +35,7 @@ export const ActionIcon = ({
   return (
     <div
       className={
-        `w-fit inline-grid place-content-center ${className} ` +
+        `w-fit self-stretch inline-grid place-content-center ${className} ` +
         computedBgClassName
       }
     >

src/components/AppHeader.module.css

@@ -4,4 +4,11 @@
  */
 .header {
   grid-template-columns: 1fr auto 1fr;
+  user-select: none;
+  -webkit-user-select: none;
+  /* Make the header act as a handle to drag the electron app window,
+   * per the electron docs: https://www.electronjs.org/docs/latest/tutorial/window-customization#set-custom-draggable-region
+   * all interactive elements opt-out of this behavior by default in src/index.css
+  */
+  -webkit-app-region: drag;
 }

src/components/AppHeader.tsx

@@ -12,6 +12,7 @@ interface AppHeaderProps extends React.PropsWithChildren {
   project?: Omit<IndexLoaderData, 'code'>
   className?: string
   enableMenu?: boolean
+  style?: React.CSSProperties
 }
 
 export const AppHeader = ({
@@ -19,6 +20,7 @@ export const AppHeader = ({
   project,
   children,
   className = '',
+  style,
   enableMenu = false,
 }: AppHeaderProps) => {
   const { auth } = useSettingsAuthContext()
@@ -33,6 +35,7 @@ export const AppHeader = ({
         ' overlaid-panes sticky top-0 z-20 px-2 items-start ' +
         className
       }
+      style={style}
     >
       <ProjectSidebarMenu
         enableMenu={enableMenu}

src/components/ContextMenu.tsx

@@ -135,16 +135,15 @@ interface ContextMenuItemProps {
   icon?: ActionIconProps['icon']
   onClick?: () => void
   hotkey?: string
+  'data-testid'?: string
 }
 
-export function ContextMenuItem({
-  children,
-  icon,
-  onClick,
-  hotkey,
-}: ContextMenuItemProps) {
+export function ContextMenuItem(props: ContextMenuItemProps) {
+  const { children, icon, onClick, hotkey } = props
+
   return (
     <button
+      data-testid={props['data-testid']}
       className="flex items-center gap-2 py-1 px-2 cursor-pointer hover:bg-chalkboard-20 dark:hover:bg-chalkboard-80 border-none text-left"
       onClick={onClick}
     >

src/components/CustomIcon.tsx

@@ -332,7 +332,7 @@ const CustomIconMap = {
         fillRule="evenodd"
         clipRule="evenodd"
         d="M5.5 4C4.11929 4 3 5.11929 3 6.5V7C3 10.0376 5.46243 12.5 8.5 12.5H8.96482C9.46635 12.5 9.93469 12.2493 10.2129 11.8321L10.5173 11.3755C11.1396 12.0849 12.0423 12.5 13 12.5H13.75H15V14C15 14.2626 14.9483 14.5227 14.8478 14.7654C14.7472 15.008 14.5999 15.2285 14.4142 15.4142C14.2285 15.5999 14.008 15.7472 13.7654 15.8478C13.5227 15.9483 13.2626 16 13 16C12.7374 16 12.4773 15.9483 12.2346 15.8478C11.992 15.7472 11.7715 15.5999 11.5858 15.4142C11.4001 15.2285 11.2528 15.008 11.1522 14.7654C11.1164 14.6789 11.0868 14.5902 11.0635 14.5H11.8544C11.9168 14.6431 12.0056 14.7734 12.1161 14.8839C12.2322 15 12.37 15.092 12.5216 15.1548C12.6733 15.2177 12.8358 15.25 13 15.25C13.1642 15.25 13.3267 15.2177 13.4784 15.1548C13.63 15.092 13.7678 15 13.8839 14.8839C14 14.7678 14.092 14.63 14.1548 14.4784C14.2177 14.3267 14.25 14.1642 14.25 14V13H13.25V14C13.25 14.0328 13.2435 14.0653 13.231 14.0957C13.2184 14.126 13.2 14.1536 13.1768 14.1768C13.1536 14.2 13.126 14.2184 13.0957 14.231C13.0653 14.2435 13.0328 14.25 13 14.25C12.9672 14.25 12.9347 14.2435 12.9043 14.231C12.874 14.2184 12.8464 14.2 12.8232 14.1768C12.8 14.1536 12.7816 14.126 12.769 14.0957C12.7565 14.0653 12.75 14.0328 12.75 14V13.5H12.25H10.5H10V14C10 14.394 10.0776 14.7841 10.2284 15.1481C10.3791 15.512 10.6001 15.8427 10.8787 16.1213C11.1573 16.3999 11.488 16.6209 11.8519 16.7716C12.2159 16.9224 12.606 17 13 17C13.394 17 13.7841 16.9224 14.1481 16.7716C14.512 16.6209 14.8427 16.3999 15.1213 16.1213C15.3999 15.8427 15.6209 15.512 15.7716 15.1481C15.9224 14.7841 16 14.394 16 14V12.5H17V11.5H16V8.5C16 6.01472 13.9853 4 11.5 4H5.5ZM11.084 10.4746L10.9226 10.2326L9.42875 7.74275L8.57125 8.25725L9.90846 10.4859L9.38084 11.2773C9.28811 11.4164 9.13199 11.5 8.96482 11.5H8.5C6.01472 11.5 4 9.48528 4 7V6.5C4 5.67157 4.67157 5 5.5 5H11.5C13.433 5 15 6.567 15 8.5V11.5H13.75H13C12.2301 11.5 11.5111 11.1152 11.084 10.4746ZM13.5 8.5C13.5 9.05228 13.0523 9.5 12.5 9.5C11.9477 9.5 11.5 9.05228 11.5 8.5C11.5 7.94772 11.9477 7.5 12.5 7.5C13.0523 7.5 13.5 7.94772 13.5 8.5Z"
-        fill="black"
+        fill="currentColor"
       />
     </svg>
   ),

src/components/EngineCommands.tsx

@@ -2,7 +2,7 @@ import { CommandLog } from 'lang/std/engineConnection'
 import { engineCommandManager } from 'lib/singletons'
 import { useState, useEffect } from 'react'
 
-function useEngineCommands(): [CommandLog[], () => void] {
+export function useEngineCommands(): [CommandLog[], () => void] {
   const [engineCommands, setEngineCommands] = useState<CommandLog[]>(
     engineCommandManager.commandLogs
   )

src/components/FileMachineProvider.tsx

@@ -16,7 +16,11 @@ import {
 import { useCommandsContext } from 'hooks/useCommandsContext'
 import { fileMachine } from 'machines/fileMachine'
 import { isDesktop } from 'lib/isDesktop'
-import { DEFAULT_FILE_NAME, FILE_EXT } from 'lib/constants'
+import {
+  DEFAULT_FILE_NAME,
+  DEFAULT_PROJECT_KCL_FILE,
+  FILE_EXT,
+} from 'lib/constants'
 import { getProjectInfo } from 'lib/desktop'
 import { getNextDirName, getNextFileName } from 'lib/desktopFS'
 
@@ -167,6 +171,25 @@ export const FileMachineProvider = ({
           name
         )
 
+        // no-op
+        if (oldPath === newPath) {
+          return {
+            message: `Old is the same as new.`,
+            newPath,
+            oldPath,
+          }
+        }
+
+        // if there are any siblings with the same name, report error.
+        const entries = await window.electron.readdir(
+          window.electron.path.dirname(newPath)
+        )
+        for (let entry of entries) {
+          if (entry === newName) {
+            return Promise.reject(new Error('Filename already exists.'))
+          }
+        }
+
         window.electron.rename(oldPath, newPath)
 
         if (!file) {
@@ -209,6 +232,27 @@ export const FileMachineProvider = ({
             .catch((e) => console.error('Error deleting file', e))
         }
 
+        // If there are no more files at all in the project, create a main.kcl
+        // for when we navigate to the root.
+        if (!project?.path) {
+          return Promise.reject(new Error('Project path not set.'))
+        }
+
+        const entries = await window.electron.readdir(project.path)
+        const hasKclEntries =
+          entries.filter((e: string) => e.endsWith('.kcl')).length !== 0
+        if (!hasKclEntries) {
+          await window.electron.writeFile(
+            window.electron.path.join(project.path, DEFAULT_PROJECT_KCL_FILE),
+            ''
+          )
+          // Refresh the route selected above because it's possible we're on
+          // the same path on the navigate, which doesn't cause anything to
+          // refresh, leaving a stale execution state.
+          navigate(0)
+          return
+        }
+
         // If we just deleted the current file or one of its parent directories,
         // navigate to the project root
         if (

src/components/FileTree.tsx

@@ -1,4 +1,4 @@
-import type { FileEntry, IndexLoaderData } from 'lib/types'
+import type { IndexLoaderData } from 'lib/types'
 import { PATHS } from 'lib/paths'
 import { ActionButton } from './ActionButton'
 import Tooltip from './Tooltip'
@@ -20,6 +20,7 @@ import { useModelingContext } from 'hooks/useModelingContext'
 import { DeleteConfirmationDialog } from './ProjectCard/DeleteProjectDialog'
 import { ContextMenu, ContextMenuItem } from './ContextMenu'
 import usePlatform from 'hooks/usePlatform'
+import { FileEntry } from 'lib/project'
 
 function getIndentationCSS(level: number) {
   return `calc(1rem * ${level + 1})`
@@ -178,10 +179,7 @@ const FileTreeItem = ({
       codeManager.writeToFile()
 
       // Prevent seeing the model built one piece at a time when changing files
-      kclManager.isFirstRender = true
-      kclManager.executeCode(true).then(() => {
-        kclManager.isFirstRender = false
-      })
+      kclManager.executeCode(true)
     } else {
       // Let the lsp servers know we closed a file.
       onFileClose(currentFile?.path || null, project?.path || null)
@@ -357,10 +355,18 @@ function FileTreeContextMenu({
     <ContextMenu
       menuTargetElement={itemRef}
       items={[
-        <ContextMenuItem onClick={onRename} hotkey="Enter">
+        <ContextMenuItem
+          data-testid="context-menu-rename"
+          onClick={onRename}
+          hotkey="Enter"
+        >
           Rename
         </ContextMenuItem>,
-        <ContextMenuItem onClick={onDelete} hotkey={metaKey + ' + Del'}>
+        <ContextMenuItem
+          data-testid="context-menu-delete"
+          onClick={onDelete}
+          hotkey={metaKey + ' + Del'}
+        >
           Delete
         </ContextMenuItem>,
       ]}

src/components/Loading.tsx

@@ -11,6 +11,8 @@ import {
 
 import { engineCommandManager } from '../lib/singletons'
 
+import { Spinner } from './Spinner'
+
 const Loading = ({ children }: React.PropsWithChildren) => {
   const [error, setError] = useState<ConnectionError>(ConnectionError.Unset)
 
@@ -65,17 +67,7 @@ const Loading = ({ children }: React.PropsWithChildren) => {
       className="body-bg flex flex-col items-center justify-center h-screen"
       data-testid="loading"
     >
-      <svg viewBox="0 0 10 10" className="w-8 h-8">
-        <circle
-          cx="5"
-          cy="5"
-          r="4"
-          stroke="var(--primary)"
-          fill="none"
-          strokeDasharray="4, 4"
-          className="animate-spin origin-center"
-        />
-      </svg>
+      <Spinner />
       <p className="text-base mt-4 text-primary">{children || 'Loading'}</p>
       <p
         className={

src/components/LowerRightControls.tsx

@@ -11,6 +11,7 @@ import toast from 'react-hot-toast'
 import { CoreDumpManager } from 'lib/coredump'
 import openWindow, { openExternalBrowserIfDesktop } from 'lib/openWindow'
 import { NetworkMachineIndicator } from './NetworkMachineIndicator'
+import { ModelStateIndicator } from './ModelStateIndicator'
 
 export function LowerRightControls({
   children,
@@ -65,6 +66,7 @@ export function LowerRightControls({
     <section className="fixed bottom-2 right-2 flex flex-col items-end gap-3 pointer-events-none">
       {children}
       <menu className="flex items-center justify-end gap-3 pointer-events-auto">
+        {!location.pathname.startsWith(PATHS.HOME) && <ModelStateIndicator />}
         <a
           onClick={openExternalBrowserIfDesktop(
             `https://github.com/KittyCAD/modeling-app/releases/tag/v${APP_VERSION}`

src/components/LspProvider.tsx

@@ -15,7 +15,7 @@ import { Extension } from '@codemirror/state'
 import { LanguageSupport } from '@codemirror/language'
 import { useNavigate } from 'react-router-dom'
 import { PATHS } from 'lib/paths'
-import { FileEntry } from 'lib/types'
+import { FileEntry } from 'lib/project'
 import Worker from 'editor/plugins/lsp/worker.ts?worker'
 import {
   KclWorkerOptions,

src/components/ModelStateIndicator.tsx

@@ -0,0 +1,39 @@
+import { useEngineCommands } from './EngineCommands'
+import { Spinner } from './Spinner'
+import { CustomIcon } from './CustomIcon'
+
+export const ModelStateIndicator = () => {
+  const [commands] = useEngineCommands()
+
+  const lastCommandType = commands[commands.length - 1]?.type
+
+  let className = 'w-6 h-6 '
+  let icon = <Spinner className={className} />
+  let dataTestId = 'model-state-indicator'
+
+  if (lastCommandType === 'receive-reliable') {
+    className +=
+      'bg-chalkboard-20 dark:bg-chalkboard-80 !group-disabled:bg-chalkboard-30 !dark:group-disabled:bg-chalkboard-80 rounded-sm bg-succeed-10/30 dark:bg-succeed'
+    icon = (
+      <CustomIcon
+        data-testid={dataTestId + '-receive-reliable'}
+        name="checkmark"
+      />
+    )
+  } else if (lastCommandType === 'execution-done') {
+    className +=
+      'border-6 border border-solid border-chalkboard-60 dark:border-chalkboard-80 bg-chalkboard-20 dark:bg-chalkboard-80 !group-disabled:bg-chalkboard-30 !dark:group-disabled:bg-chalkboard-80 rounded-sm bg-succeed-10/30 dark:bg-succeed'
+    icon = (
+      <CustomIcon
+        data-testid={dataTestId + '-execution-done'}
+        name="checkmark"
+      />
+    )
+  }
+
+  return (
+    <div className={className} data-testid="model-state-indicator">
+      {icon}
+    </div>
+  )
+}

src/components/ModelingMachineProvider.tsx

@@ -66,7 +66,6 @@ import {
   hasExtrudableGeometry,
   isSingleCursorInPipe,
 } from 'lang/queryAst'
-import { TEST } from 'env'
 import { exportFromEngine } from 'lib/exportFromEngine'
 import { Models } from '@kittycad/lib/dist/types/src'
 import toast from 'react-hot-toast'
@@ -161,9 +160,7 @@ export const ModelingMachineProvider = ({
 
             store.videoElement?.pause()
 
-            kclManager.isFirstRender = true
             kclManager.executeCode().then(() => {
-              kclManager.isFirstRender = false
               if (engineCommandManager.engineConnection?.idleMode) return
 
               store.videoElement?.play().catch((e) => {
@@ -363,7 +360,7 @@ export const ModelingMachineProvider = ({
           return {}
         }),
         Make: async (_, event) => {
-          if (event.type !== 'Make' || TEST) return
+          if (event.type !== 'Make') return
           // Check if we already have an export intent.
           if (engineCommandManager.exportIntent) {
             toast.error('Already exporting')
@@ -407,7 +404,7 @@ export const ModelingMachineProvider = ({
           )
         },
         'Engine export': async (_, event) => {
-          if (event.type !== 'Export' || TEST) return
+          if (event.type !== 'Export') return
           if (engineCommandManager.exportIntent) {
             toast.error('Already exporting')
             return

src/components/NetworkMachineIndicator.tsx

@@ -49,7 +49,11 @@ export const NetworkMachineIndicator = ({
             {Object.entries(machineManager.machines).map(
               ([hostname, machine]) => (
                 <li key={hostname} className={'px-2 py-4 gap-1 last:mb-0 '}>
-                  <p className="">{machine.model || machine.manufacturer}</p>
+                  <p className="">
+                    {machine.make_model.model ||
+                      machine.make_model.manufacturer ||
+                      'Unknown Machine'}
+                  </p>
                   <p className="text-chalkboard-60 dark:text-chalkboard-50 text-xs">
                     Hostname {hostname}
                   </p>

src/components/ProjectCard/ProjectCard.tsx

@@ -7,7 +7,7 @@ import { useHotkeys } from 'react-hotkeys-hook'
 import Tooltip from '../Tooltip'
 import { DeleteConfirmationDialog } from './DeleteProjectDialog'
 import { ProjectCardRenameForm } from './ProjectCardRenameForm'
-import { Project } from 'wasm-lib/kcl/bindings/Project'
+import { Project } from 'lib/project'
 
 function ProjectCard({
   project,

src/components/ProjectCard/ProjectCardRenameForm.tsx

@@ -1,7 +1,7 @@
 import { ActionButton } from 'components/ActionButton'
 import Tooltip from 'components/Tooltip'
 import { HTMLProps, forwardRef } from 'react'
-import { Project } from 'wasm-lib/kcl/bindings/Project'
+import { Project } from 'lib/project'
 
 interface ProjectCardRenameFormProps extends HTMLProps<HTMLFormElement> {
   project: Project

src/components/ProjectSearchBar.tsx

@@ -1,4 +1,4 @@
-import { Project } from 'wasm-lib/kcl/bindings/Project'
+import { Project } from 'lib/project'
 import { CustomIcon } from './CustomIcon'
 import { useEffect, useRef, useState } from 'react'
 import { useHotkeys } from 'react-hotkeys-hook'

src/components/ProjectSidebarMenu.test.tsx

@@ -3,7 +3,7 @@ import { BrowserRouter } from 'react-router-dom'
 import ProjectSidebarMenu from './ProjectSidebarMenu'
 import { SettingsAuthProviderJest } from './SettingsAuthProvider'
 import { CommandBarProvider } from './CommandBar/CommandBarProvider'
-import { Project } from 'wasm-lib/kcl/bindings/Project'
+import { Project } from 'lib/project'
 
 const now = new Date()
 const projectWellFormed = {

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} />

src/components/SettingsAuthProvider.tsx

@@ -193,10 +193,7 @@ export const SettingsAuthProviderBase = ({
               resetSettingsIncludesUnitChange
             ) {
               // Unit changes requires a re-exec of code
-              kclManager.isFirstRender = true
-              kclManager.executeCode(true).then(() => {
-                kclManager.isFirstRender = false
-              })
+              kclManager.executeCode(true)
             } else {
               // For any future logging we'd like to do
               // console.log(

src/components/Spinner.tsx

@@ -0,0 +1,17 @@
+import { SVGProps } from 'react'
+
+export const Spinner = (props: SVGProps<SVGSVGElement>) => {
+  return (
+    <svg viewBox="0 0 10 10" className={'w-8 h-8'} {...props}>
+      <circle
+        cx="5"
+        cy="5"
+        r="4"
+        stroke="var(--primary)"
+        fill="none"
+        strokeDasharray="4, 4"
+        className="animate-spin origin-center"
+      />
+    </svg>
+  )
+}

src/components/Stream.tsx

@@ -54,12 +54,10 @@ export const Stream = () => {
    * central place, we can move this code there.
    */
   async function executeCodeAndPlayStream() {
-    kclManager.isFirstRender = true
     kclManager.executeCode(true).then(() => {
       videoRef.current?.play().catch((e) => {
         console.warn('Video playing was prevented', e, videoRef.current)
       })
-      kclManager.isFirstRender = false
       setStreamState(StreamState.Playing)
     })
   }
@@ -219,7 +217,7 @@ export const Stream = () => {
    * Play the vid
    */
   useEffect(() => {
-    if (!kclManager.isFirstRender) {
+    if (!kclManager.isExecuting) {
       setTimeout(() =>
         // execute in the next event loop
         videoRef.current?.play().catch((e) => {
@@ -227,7 +225,7 @@ export const Stream = () => {
         })
       )
     }
-  }, [kclManager.isFirstRender])
+  }, [kclManager.isExecuting])
 
   useEffect(() => {
     if (
@@ -382,15 +380,15 @@ export const Stream = () => {
           </div>
         </div>
       )}
-      {(!isNetworkOkay || isLoading || kclManager.isFirstRender) && (
+      {(!isNetworkOkay || isLoading) && (
         <div className="text-center absolute inset-0">
           <Loading>
-            {!isNetworkOkay && !isLoading && !kclManager.isFirstRender ? (
+            {!isNetworkOkay && !isLoading ? (
               <span data-testid="loading-stream">Stream disconnected...</span>
-            ) : !isLoading && kclManager.isFirstRender ? (
-              <span data-testid="loading-stream">Building scene...</span>
             ) : (
-              <span data-testid="loading-stream">Loading stream...</span>
+              !isLoading && (
+                <span data-testid="loading-stream">Loading stream...</span>
+              )
             )}
           </Loading>
         </div>

src/components/UserSidebarMenu.tsx

@@ -217,7 +217,7 @@ const UserSidebarMenu = ({ user }: { user?: User }) => {
                   </p>
                   {displayedName !== user.email && (
                     <p
-                      className="m-0 text-chalkboard-70 dark:text-chalkboard-40 text-xs"
+                      className="m-0 overflow-ellipsis overflow-hidden text-chalkboard-70 dark:text-chalkboard-40 text-xs"
                       data-testid="email"
                     >
                       {user.email}

src/hooks/useEngineConnectionSubscriptions.ts

@@ -9,6 +9,7 @@ import { useModelingContext } from './useModelingContext'
 import { getEventForSelectWithPoint } from 'lib/selections'
 import {
   getCapCodeRef,
+  getExtrudeEdgeCodeRef,
   getExtrusionFromSuspectedExtrudeSurface,
   getSolid2dCodeRef,
   getWallCodeRef,
@@ -60,6 +61,13 @@ export function useEngineConnectionSubscriptions() {
                 ? [codeRef.range]
                 : [codeRef.range, extrusion.codeRef.range]
             )
+          } else if (artifact?.type === 'extrudeEdge') {
+            const codeRef = getExtrudeEdgeCodeRef(
+              artifact,
+              engineCommandManager.artifactGraph
+            )
+            if (err(codeRef)) return
+            editorManager.setHighlightRange([codeRef.range])
           } else if (artifact?.type === 'segment') {
             editorManager.setHighlightRange([
               artifact?.codeRef?.range || [0, 0],

src/index.css

@@ -4,6 +4,18 @@
 @tailwind components;
 @tailwind utilities;
 
+button,
+input,
+select,
+textarea,
+a {
+  /* Make all interactive elements not act as handles
+   * to drag the electron app window by default,
+   * per the electron docs: https://www.electronjs.org/docs/latest/tutorial/window-customization#set-custom-draggable-region
+  */
+  -webkit-app-region: no-drag;
+}
+
 body {
   margin: 0;
   @apply font-sans;
@@ -97,7 +109,7 @@ button:disabled {
 }
 
 a {
-  @apply text-primary underline hover:hue-rotate-15;
+  @apply text-primary hover:hue-rotate-15;
 }
 
 .dark a {
@@ -274,6 +286,35 @@ code {
   }
 }
 
+@layer utilities {
+  /* Modified from the very helpful https://www.transition.style/#in:circle:hesitate */
+  @keyframes circle-in-hesitate {
+    0% {
+      clip-path: circle(
+        var(--circle-size-start, 0%) at var(--circle-x, 50%)
+          var(--circle-y, 50%)
+      );
+    }
+    40% {
+      clip-path: circle(
+        var(--circle-size-mid, 40%) at var(--circle-x, 50%) var(--circle-y, 50%)
+      );
+    }
+    100% {
+      clip-path: circle(
+        var(--circle-size-end, 125%) at var(--circle-x, 50%)
+          var(--circle-y, 50%)
+      );
+    }
+  }
+
+  .in-circle-hesitate {
+    animation: var(--circle-duration, 2.5s)
+      var(--circle-timing, cubic-bezier(0.25, 1, 0.3, 1)) circle-in-hesitate
+      both;
+  }
+}
+
 #code-mirror-override .cm-scroller,
 #code-mirror-override .cm-editor {
   height: 100% !important;

src/lang/KclSingleton.ts

@@ -4,6 +4,7 @@ import { KCLError, kclErrorsToDiagnostics } from './errors'
 import { uuidv4 } from 'lib/utils'
 import { EngineCommandManager } from './std/engineConnection'
 import { err } from 'lib/trap'
+import { EXECUTE_AST_INTERRUPT_ERROR_MESSAGE } from 'lib/constants'
 
 import {
   CallExpression,
@@ -59,8 +60,6 @@ export class KclManager {
   private _wasmInitFailedCallback: (arg: boolean) => void = () => {}
   private _executeCallback: () => void = () => {}
 
-  isFirstRender = true
-
   get ast() {
     return this._ast
   }
@@ -122,6 +121,7 @@ export class KclManager {
   get isExecuting() {
     return this._isExecuting
   }
+
   set isExecuting(isExecuting) {
     this._isExecuting = isExecuting
     // If we have finished executing, but the execute is stale, we should
@@ -232,6 +232,12 @@ export class KclManager {
   async executeAst(args: ExecuteArgs = {}): Promise<void> {
     if (this.isExecuting) {
       this.executeIsStale = args
+
+      // The previous execteAst will be rejected and cleaned up. The execution will be marked as stale.
+      // A new executeAst will start.
+      this.engineCommandManager.rejectAllModelingCommands(
+        EXECUTE_AST_INTERRUPT_ERROR_MESSAGE
+      )
       // Exit early if we are already executing.
       return
     }
@@ -245,44 +251,38 @@ export class KclManager {
     // Make sure we clear before starting again. End session will do this.
     this.engineCommandManager?.endSession()
     await this.ensureWasmInit()
-    const { logs, errors, programMemory } = await executeAst({
+    const { logs, errors, programMemory, isInterrupted } = await executeAst({
       ast,
       engineCommandManager: this.engineCommandManager,
     })
 
-    this.lints = await lintAst({ ast: ast })
+    // Program was not interrupted, setup the scene
+    // Do not send send scene commands if the program was interrupted, go to clean up
+    if (!isInterrupted) {
+      this.lints = await lintAst({ ast: ast })
 
-    sceneInfra.modelingSend({ type: 'code edit during sketch' })
-    defaultSelectionFilter(programMemory, this.engineCommandManager)
-    await this.engineCommandManager.waitForAllCommands()
+      sceneInfra.modelingSend({ type: 'code edit during sketch' })
+      defaultSelectionFilter(programMemory, this.engineCommandManager)
 
-    if (args.zoomToFit) {
-      let zoomObjectId: string | undefined = ''
-      if (args.zoomOnRangeAndType) {
-        zoomObjectId = this.engineCommandManager?.mapRangeToObjectId(
-          args.zoomOnRangeAndType.range,
-          args.zoomOnRangeAndType.type
-        )
+      if (args.zoomToFit) {
+        let zoomObjectId: string | undefined = ''
+        if (args.zoomOnRangeAndType) {
+          zoomObjectId = this.engineCommandManager?.mapRangeToObjectId(
+            args.zoomOnRangeAndType.range,
+            args.zoomOnRangeAndType.type
+          )
+        }
+
+        await this.engineCommandManager.sendSceneCommand({
+          type: 'modeling_cmd_req',
+          cmd_id: uuidv4(),
+          cmd: {
+            type: 'zoom_to_fit',
+            object_ids: zoomObjectId ? [zoomObjectId] : [], // leave empty to zoom to all objects
+            padding: 0.1, // padding around the objects
+          },
+        })
       }
-
-      await this.engineCommandManager.sendSceneCommand({
-        type: 'modeling_cmd_req',
-        cmd_id: uuidv4(),
-        cmd: {
-          type: 'zoom_to_fit',
-          object_ids: zoomObjectId ? [zoomObjectId] : [], // leave empty to zoom to all objects
-          padding: 0.1, // padding around the objects
-        },
-      })
-      await this.engineCommandManager.sendSceneCommand({
-        type: 'modeling_cmd_req',
-        cmd_id: uuidv4(),
-        cmd: {
-          type: 'zoom_to_fit',
-          object_ids: zoomObjectId ? [zoomObjectId] : [], // leave empty to zoom to all objects
-          padding: 0.1, // padding around the objects
-        },
-      })
     }
 
     this.isExecuting = false
@@ -293,7 +293,8 @@ export class KclManager {
       return
     }
     this.logs = logs
-    this.addKclErrors(errors)
+    // Do not add the errors since the program was interrupted and the error is not a real KCL error
+    this.addKclErrors(isInterrupted ? [] : errors)
     this.programMemory = programMemory
     this.ast = { ...ast }
     this._executeCallback()
@@ -301,6 +302,7 @@ export class KclManager {
       type: 'execution-done',
       data: null,
     })
+
     this._cancelTokens.delete(currentExecutionId)
   }
   // NOTE: this always updates the code state and editor.
@@ -399,6 +401,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.

src/lang/langHelpers.ts

@@ -54,10 +54,12 @@ export async function executeAst({
   engineCommandManager: EngineCommandManager
   useFakeExecutor?: boolean
   programMemoryOverride?: ProgramMemory
+  isInterrupted?: boolean
 }): Promise<{
   logs: string[]
   errors: KCLError[]
   programMemory: ProgramMemory
+  isInterrupted: boolean
 }> {
   try {
     if (!useFakeExecutor) {
@@ -73,13 +75,23 @@ export async function executeAst({
       logs: [],
       errors: [],
       programMemory,
+      isInterrupted: false,
     }
   } catch (e: any) {
+    let isInterrupted = false
     if (e instanceof KCLError) {
+      // Detect if it is a force interrupt error which is not a KCL processing error.
+      if (
+        e.msg ===
+        'Failed to wait for promise from engine: JsValue("Force interrupt, executionIsStale, new AST requested")'
+      ) {
+        isInterrupted = true
+      }
       return {
         errors: [e],
         logs: [],
         programMemory: ProgramMemory.empty(),
+        isInterrupted,
       }
     } else {
       console.log(e)
@@ -87,6 +99,7 @@ export async function executeAst({
         logs: [e],
         errors: [],
         programMemory: ProgramMemory.empty(),
+        isInterrupted,
       }
     }
   }

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
+    )
+  }, 5_000)
+  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

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,
@@ -284,6 +469,9 @@ export const hasValidFilletSelection = ({
       if (segmentNode.node.type === 'CallExpression') {
         const segmentName = segmentNode.node.callee.name
         if (segmentName in sketchLineHelperMap) {
+          // Add check whether the tag exists at all:
+          if (!(segmentNode.node.arguments.length === 3)) return true
+          // If the tag exists, check if it is already filleted
           const edges = isTagUsedInFillet({
             ast,
             callExp: segmentNode.node,

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

@@ -58,7 +58,10 @@ Map {
         92,
       ],
     },
-    "edgeIds": [],
+    "edgeIds": [
+      "UUID",
+      "UUID",
+    ],
     "pathId": "UUID",
     "surfaceId": "UUID",
     "type": "segment",
@@ -77,7 +80,10 @@ Map {
       ],
     },
     "edgeCutId": "UUID",
-    "edgeIds": [],
+    "edgeIds": [
+      "UUID",
+      "UUID",
+    ],
     "pathId": "UUID",
     "surfaceId": "UUID",
     "type": "segment",
@@ -95,7 +101,10 @@ Map {
         156,
       ],
     },
-    "edgeIds": [],
+    "edgeIds": [
+      "UUID",
+      "UUID",
+    ],
     "pathId": "UUID",
     "surfaceId": "UUID",
     "type": "segment",
@@ -113,7 +122,10 @@ Map {
         209,
       ],
     },
-    "edgeIds": [],
+    "edgeIds": [
+      "UUID",
+      "UUID",
+    ],
     "pathId": "UUID",
     "surfaceId": "UUID",
     "type": "segment",
@@ -152,7 +164,16 @@ Map {
         266,
       ],
     },
-    "edgeIds": [],
+    "edgeIds": [
+      "UUID",
+      "UUID",
+      "UUID",
+      "UUID",
+      "UUID",
+      "UUID",
+      "UUID",
+      "UUID",
+    ],
     "pathId": "UUID",
     "surfaceIds": [
       "UUID",
@@ -209,6 +230,54 @@ Map {
     "type": "cap",
   },
   "UUID-15" => {
+    "extrusionId": "UUID",
+    "segId": "UUID",
+    "subType": "opposite",
+    "type": "extrudeEdge",
+  },
+  "UUID-16" => {
+    "extrusionId": "UUID",
+    "segId": "UUID",
+    "subType": "adjacent",
+    "type": "extrudeEdge",
+  },
+  "UUID-17" => {
+    "extrusionId": "UUID",
+    "segId": "UUID",
+    "subType": "opposite",
+    "type": "extrudeEdge",
+  },
+  "UUID-18" => {
+    "extrusionId": "UUID",
+    "segId": "UUID",
+    "subType": "adjacent",
+    "type": "extrudeEdge",
+  },
+  "UUID-19" => {
+    "extrusionId": "UUID",
+    "segId": "UUID",
+    "subType": "opposite",
+    "type": "extrudeEdge",
+  },
+  "UUID-20" => {
+    "extrusionId": "UUID",
+    "segId": "UUID",
+    "subType": "adjacent",
+    "type": "extrudeEdge",
+  },
+  "UUID-21" => {
+    "extrusionId": "UUID",
+    "segId": "UUID",
+    "subType": "opposite",
+    "type": "extrudeEdge",
+  },
+  "UUID-22" => {
+    "extrusionId": "UUID",
+    "segId": "UUID",
+    "subType": "adjacent",
+    "type": "extrudeEdge",
+  },
+  "UUID-23" => {
     "codeRef": {
       "pathToNode": [
         [
@@ -226,7 +295,7 @@ Map {
     "subType": "fillet",
     "type": "edgeCut",
   },
-  "UUID-16" => {
+  "UUID-24" => {
     "codeRef": {
       "pathToNode": [
         [
@@ -250,7 +319,7 @@ Map {
     "solid2dId": "UUID",
     "type": "path",
   },
-  "UUID-17" => {
+  "UUID-25" => {
     "codeRef": {
       "pathToNode": [
         [
@@ -263,12 +332,15 @@ Map {
         416,
       ],
     },
-    "edgeIds": [],
+    "edgeIds": [
+      "UUID",
+      "UUID",
+    ],
     "pathId": "UUID",
     "surfaceId": "UUID",
     "type": "segment",
   },
-  "UUID-18" => {
+  "UUID-26" => {
     "codeRef": {
       "pathToNode": [
         [
@@ -281,12 +353,15 @@ Map {
         438,
       ],
     },
-    "edgeIds": [],
+    "edgeIds": [
+      "UUID",
+      "UUID",
+    ],
     "pathId": "UUID",
     "surfaceId": "UUID",
     "type": "segment",
   },
-  "UUID-19" => {
+  "UUID-27" => {
     "codeRef": {
       "pathToNode": [
         [
@@ -299,12 +374,15 @@ Map {
         491,
       ],
     },
-    "edgeIds": [],
+    "edgeIds": [
+      "UUID",
+      "UUID",
+    ],
     "pathId": "UUID",
     "surfaceId": "UUID",
     "type": "segment",
   },
-  "UUID-20" => {
+  "UUID-28" => {
     "codeRef": {
       "pathToNode": [
         [
@@ -321,11 +399,11 @@ Map {
     "pathId": "UUID",
     "type": "segment",
   },
-  "UUID-21" => {
+  "UUID-29" => {
     "pathId": "UUID",
     "type": "solid2D",
   },
-  "UUID-22" => {
+  "UUID-30" => {
     "codeRef": {
       "pathToNode": [
         [
@@ -338,7 +416,14 @@ Map {
         546,
       ],
     },
-    "edgeIds": [],
+    "edgeIds": [
+      "UUID",
+      "UUID",
+      "UUID",
+      "UUID",
+      "UUID",
+      "UUID",
+    ],
     "pathId": "UUID",
     "surfaceIds": [
       "UUID",
@@ -349,40 +434,76 @@ Map {
     ],
     "type": "extrusion",
   },
-  "UUID-23" => {
+  "UUID-31" => {
     "edgeCutEdgeIds": [],
     "extrusionId": "UUID",
     "pathIds": [],
     "segId": "UUID",
     "type": "wall",
   },
-  "UUID-24" => {
+  "UUID-32" => {
     "edgeCutEdgeIds": [],
     "extrusionId": "UUID",
     "pathIds": [],
     "segId": "UUID",
     "type": "wall",
   },
-  "UUID-25" => {
+  "UUID-33" => {
     "edgeCutEdgeIds": [],
     "extrusionId": "UUID",
     "pathIds": [],
     "segId": "UUID",
     "type": "wall",
   },
-  "UUID-26" => {
+  "UUID-34" => {
     "edgeCutEdgeIds": [],
     "extrusionId": "UUID",
     "pathIds": [],
     "subType": "start",
     "type": "cap",
   },
-  "UUID-27" => {
+  "UUID-35" => {
     "edgeCutEdgeIds": [],
     "extrusionId": "UUID",
     "pathIds": [],
     "subType": "end",
     "type": "cap",
   },
+  "UUID-36" => {
+    "extrusionId": "UUID",
+    "segId": "UUID",
+    "subType": "opposite",
+    "type": "extrudeEdge",
+  },
+  "UUID-37" => {
+    "extrusionId": "UUID",
+    "segId": "UUID",
+    "subType": "adjacent",
+    "type": "extrudeEdge",
+  },
+  "UUID-38" => {
+    "extrusionId": "UUID",
+    "segId": "UUID",
+    "subType": "opposite",
+    "type": "extrudeEdge",
+  },
+  "UUID-39" => {
+    "extrusionId": "UUID",
+    "segId": "UUID",
+    "subType": "adjacent",
+    "type": "extrudeEdge",
+  },
+  "UUID-40" => {
+    "extrusionId": "UUID",
+    "segId": "UUID",
+    "subType": "opposite",
+    "type": "extrudeEdge",
+  },
+  "UUID-41" => {
+    "extrusionId": "UUID",
+    "segId": "UUID",
+    "subType": "adjacent",
+    "type": "extrudeEdge",
+  },
 }
 `;

src/lang/std/artifactGraph.test.ts

@@ -247,7 +247,7 @@ describe('testing createArtifactGraph', () => {
       // 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, 1400, 1400, 'exampleCode1.png')
+      await GraphTheGraph(theMap, 2000, 2000, 'exampleCode1.png')
     }, 20000)
   })
 })
@@ -271,7 +271,7 @@ describe('capture graph of sketchOnFaceOnFace...', () => {
       // 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, 2500, 2500, 'sketchOnFaceOnFaceEtc.png')
+      await GraphTheGraph(theMap, 3000, 3000, 'sketchOnFaceOnFaceEtc.png')
     }, 20000)
   })
 })
@@ -603,7 +603,7 @@ describe('testing getArtifactsToUpdate', () => {
         type: 'segment',
         pathId: expect.any(String),
         surfaceId: expect.any(String),
-        edgeIds: [],
+        edgeIds: expect.any(Array),
         codeRef: {
           range: [98, 125],
           pathToNode: [['body', '']],
@@ -623,7 +623,7 @@ describe('testing getArtifactsToUpdate', () => {
         type: 'segment',
         pathId: expect.any(String),
         surfaceId: expect.any(String),
-        edgeIds: [],
+        edgeIds: expect.any(Array),
         codeRef: {
           range: [162, 209],
           pathToNode: [['body', '']],
@@ -633,7 +633,7 @@ describe('testing getArtifactsToUpdate', () => {
         type: 'extrusion',
         pathId: expect.any(String),
         surfaceIds: expect.any(Array),
-        edgeIds: [],
+        edgeIds: expect.any(Array),
         codeRef: {
           range: [243, 266],
           pathToNode: [['body', '']],
@@ -650,7 +650,7 @@ describe('testing getArtifactsToUpdate', () => {
         type: 'segment',
         pathId: expect.any(String),
         surfaceId: expect.any(String),
-        edgeIds: [],
+        edgeIds: expect.any(Array),
         codeRef: {
           range: [131, 156],
           pathToNode: [['body', '']],
@@ -660,7 +660,7 @@ describe('testing getArtifactsToUpdate', () => {
         type: 'extrusion',
         pathId: expect.any(String),
         surfaceIds: expect.any(Array),
-        edgeIds: [],
+        edgeIds: expect.any(Array),
         codeRef: {
           range: [243, 266],
           pathToNode: [['body', '']],
@@ -677,7 +677,7 @@ describe('testing getArtifactsToUpdate', () => {
         type: 'segment',
         pathId: expect.any(String),
         surfaceId: expect.any(String),
-        edgeIds: [],
+        edgeIds: expect.any(Array),
         codeRef: {
           range: [98, 125],
           pathToNode: [['body', '']],
@@ -688,7 +688,7 @@ describe('testing getArtifactsToUpdate', () => {
         type: 'extrusion',
         pathId: expect.any(String),
         surfaceIds: expect.any(Array),
-        edgeIds: [],
+        edgeIds: expect.any(Array),
         codeRef: {
           range: [243, 266],
           pathToNode: [['body', '']],
@@ -705,7 +705,7 @@ describe('testing getArtifactsToUpdate', () => {
         type: 'segment',
         pathId: expect.any(String),
         surfaceId: expect.any(String),
-        edgeIds: [],
+        edgeIds: expect.any(Array),
         codeRef: {
           range: [76, 92],
           pathToNode: [['body', '']],
@@ -715,7 +715,7 @@ describe('testing getArtifactsToUpdate', () => {
         type: 'extrusion',
         pathId: expect.any(String),
         surfaceIds: expect.any(Array),
-        edgeIds: [],
+        edgeIds: expect.any(Array),
         codeRef: {
           range: [243, 266],
           pathToNode: [['body', '']],
@@ -732,7 +732,7 @@ describe('testing getArtifactsToUpdate', () => {
         type: 'extrusion',
         pathId: expect.any(String),
         surfaceIds: expect.any(Array),
-        edgeIds: [],
+        edgeIds: expect.any(Array),
         codeRef: {
           range: [243, 266],
           pathToNode: [['body', '']],
@@ -749,7 +749,7 @@ describe('testing getArtifactsToUpdate', () => {
         type: 'extrusion',
         pathId: expect.any(String),
         surfaceIds: expect.any(Array),
-        edgeIds: [],
+        edgeIds: expect.any(Array),
         codeRef: {
           range: [243, 266],
           pathToNode: [['body', '']],

src/lang/std/artifactGraph.ts

@@ -91,7 +91,7 @@ interface ExtrudeEdge {
   type: 'extrudeEdge'
   segId: string
   extrusionId: string
-  edgeId: string
+  subType: 'opposite' | 'adjacent'
 }
 
 /** A edgeCut is a more generic term for both fillet or chamfer */
@@ -422,6 +422,56 @@ export function getArtifactsToUpdate({
       }
     })
     return returnArr
+  } else if (
+    // is opposite edge
+    (cmd.type === 'solid3d_get_opposite_edge' &&
+      response.type === 'modeling' &&
+      response.data.modeling_response.type === 'solid3d_get_opposite_edge' &&
+      response.data.modeling_response.data.edge) ||
+    // or is adjacent edge
+    (cmd.type === 'solid3d_get_prev_adjacent_edge' &&
+      response.type === 'modeling' &&
+      response.data.modeling_response.type ===
+        'solid3d_get_prev_adjacent_edge' &&
+      response.data.modeling_response.data.edge)
+  ) {
+    const wall = getArtifact(cmd.face_id)
+    if (wall?.type !== 'wall') return returnArr
+    const extrusion = getArtifact(wall.extrusionId)
+    if (extrusion?.type !== 'extrusion') return returnArr
+    const path = getArtifact(extrusion.pathId)
+    if (path?.type !== 'path') return returnArr
+    const segment = getArtifact(cmd.edge_id)
+    if (segment?.type !== 'segment') return returnArr
+
+    return [
+      {
+        id: response.data.modeling_response.data.edge,
+        artifact: {
+          type: 'extrudeEdge',
+          subType:
+            cmd.type === 'solid3d_get_prev_adjacent_edge'
+              ? 'adjacent'
+              : 'opposite',
+          segId: cmd.edge_id,
+          extrusionId: path.extrusionId,
+        },
+      },
+      {
+        id: cmd.edge_id,
+        artifact: {
+          ...segment,
+          edgeIds: [response.data.modeling_response.data.edge],
+        },
+      },
+      {
+        id: path.extrusionId,
+        artifact: {
+          ...extrusion,
+          edgeIds: [response.data.modeling_response.data.edge],
+        },
+      },
+    ]
   } else if (cmd.type === 'solid3d_fillet_edge') {
     returnArr.push({
       id,
@@ -655,6 +705,18 @@ export function getWallCodeRef(
   return seg.codeRef
 }
 
+export function getExtrudeEdgeCodeRef(
+  edge: ExtrudeEdge,
+  artifactGraph: ArtifactGraph
+): CommonCommandProperties | Error {
+  const seg = getArtifactOfTypes(
+    { key: edge.segId, types: ['segment'] },
+    artifactGraph
+  )
+  if (err(seg)) return seg
+  return seg.codeRef
+}
+
 export function getExtrusionFromSuspectedExtrudeSurface(
   id: string,
   artifactGraph: ArtifactGraph

src/lang/std/engineConnection.ts

@@ -16,6 +16,8 @@ import { useModelingContext } from 'hooks/useModelingContext'
 import { exportMake } from 'lib/exportMake'
 import toast from 'react-hot-toast'
 import { SettingsViaQueryString } from 'lib/settings/settingsTypes'
+import { EXECUTE_AST_INTERRUPT_ERROR_MESSAGE } from 'lib/constants'
+import { KclManager } from 'lang/KclSingleton'
 
 // TODO(paultag): This ought to be tweakable.
 const pingIntervalMs = 5_000
@@ -1279,6 +1281,7 @@ interface PendingMessage {
   resolve: (data: [Models['WebSocketResponse_type']]) => void
   reject: (reason: string) => void
   promise: Promise<[Models['WebSocketResponse_type']]>
+  isSceneCommand: boolean
 }
 export class EngineCommandManager extends EventTarget {
   /**
@@ -1379,6 +1382,7 @@ export class EngineCommandManager extends EventTarget {
   }: CustomEvent<NewTrackArgs>) => {}
   modelingSend: ReturnType<typeof useModelingContext>['send'] =
     (() => {}) as any
+  kclManager: null | KclManager = null
 
   set exportIntent(intent: ExportIntent | null) {
     this._exportIntent = intent
@@ -1932,11 +1936,21 @@ export class EngineCommandManager extends EventTarget {
       ;(cmd as any).sequence = this.outSequence++
     }
     // since it's not mouse drag or highlighting send over TCP and keep track of the command
-    return this.sendCommand(command.cmd_id, {
-      command,
-      idToRangeMap: {},
-      range: [0, 0],
-    }).then(([a]) => a)
+    return this.sendCommand(
+      command.cmd_id,
+      {
+        command,
+        idToRangeMap: {},
+        range: [0, 0],
+      },
+      true // isSceneCommand
+    )
+      .then(([a]) => a)
+      .catch((e) => {
+        // TODO: Previously was never caught, we are not rejecting these pendingCommands but this needs to be handled at some point.
+        /*noop*/
+        return null
+      })
   }
   /**
    * A wrapper around the sendCommand where all inputs are JSON strings
@@ -1963,6 +1977,12 @@ export class EngineCommandManager extends EventTarget {
     const idToRangeMap: { [key: string]: SourceRange } =
       JSON.parse(idToRangeStr)
 
+    // Current executeAst is stale, going to interrupt, a new executeAst will trigger
+    // Used in conjunction with rejectAllModelingCommands
+    if (this?.kclManager?.executeIsStale) {
+      return Promise.reject(EXECUTE_AST_INTERRUPT_ERROR_MESSAGE)
+    }
+
     const resp = await this.sendCommand(id, {
       command,
       range,
@@ -1980,7 +2000,8 @@ export class EngineCommandManager extends EventTarget {
       command: PendingMessage['command']
       range: PendingMessage['range']
       idToRangeMap: PendingMessage['idToRangeMap']
-    }
+    },
+    isSceneCommand = false
   ): Promise<[Models['WebSocketResponse_type']]> {
     const { promise, resolve, reject } = promiseFactory<any>()
     this.pendingCommands[id] = {
@@ -1990,7 +2011,9 @@ export class EngineCommandManager extends EventTarget {
       command: message.command,
       range: message.range,
       idToRangeMap: message.idToRangeMap,
+      isSceneCommand,
     }
+
     if (message.command.type === 'modeling_cmd_req') {
       this.orderedCommands.push({
         command: message.command,
@@ -2037,6 +2060,19 @@ export class EngineCommandManager extends EventTarget {
       this.deferredArtifactPopulated(null)
     }
   }
+
+  /**
+   * Reject all of the modeling pendingCommands created from sendModelingCommandFromWasm
+   * This interrupts the runtime of executeAst. Stops the AST processing and stops sending commands
+   * to the engine
+   */
+  rejectAllModelingCommands(rejectionMessage: string) {
+    Object.values(this.pendingCommands).forEach(
+      ({ reject, isSceneCommand }) =>
+        !isSceneCommand && reject(rejectionMessage)
+    )
+  }
+
   async initPlanes() {
     if (this.planesInitialized()) return
     const planes = await this.makeDefaultPlanes()

src/lang/wasm.ts

@@ -95,8 +95,6 @@ export const wasmUrl = () => {
       document.location.pathname.split('/').slice(0, -1).join('/') +
       '/wasm_lib_bg.wasm'
 
-  console.log(`Full URL for WASM: ${fullUrl}`)
-
   return fullUrl
 }
 

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,
     },
   },

src/lib/commandBarConfigs/modelingCommandConfig.ts

@@ -25,7 +25,7 @@ export type ModelingCommandSchema = {
     storage?: StorageUnion
   }
   Make: {
-    machine: components['schemas']['Machine']
+    machine: components['schemas']['MachineInfoResponse']
   }
   Extrude: {
     selection: Selections // & { type: 'face' } would be cool to lock that down
@@ -179,21 +179,25 @@ export const modelingMachineCommandConfig: StateMachineCommandSetConfig<
       machine: {
         inputType: 'options',
         required: true,
-        valueSummary: (machine: components['schemas']['Machine']) =>
-          machine.model || machine.manufacturer,
+        valueSummary: (machine: components['schemas']['MachineInfoResponse']) =>
+          machine.make_model.model ||
+          machine.make_model.manufacturer ||
+          'Unknown Machine',
         options: () => {
           return Object.entries(machineManager.machines).map(
-            ([hostname, machine]) => ({
-              name: `${machine.model || machine.manufacturer}, ${hostname}`,
+            ([_, machine]) => ({
+              name: `${machine.id} (${
+                machine.make_model.model || machine.make_model.manufacturer
+              }) via ${machineManager.machineApiIp || 'the local network'}`,
               isCurrent: false,
-              value: machine as components['schemas']['Machine'],
+              value: machine as components['schemas']['MachineInfoResponse'],
             })
           )
         },
         defaultValue: () => {
           return Object.values(
             machineManager.machines
-          )[0] as components['schemas']['Machine']
+          )[0] as components['schemas']['MachineInfoResponse']
         },
       },
     },

src/lib/constants.ts

@@ -8,6 +8,7 @@ export const MAX_PADDING = 7
  * This is available for users to edit as a setting.
  */
 export const DEFAULT_PROJECT_NAME = 'project-$nnn'
+export const DEFAULT_PROJECT_KCL_FILE = 'main.kcl'
 /** Name given the temporary "project" in the browser version of the app */
 export const BROWSER_PROJECT_NAME = 'browser'
 /** Name given the temporary file in the browser version of the app */
@@ -60,8 +61,14 @@ 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'
 
 /** localStorage key to determine if we're in Playwright tests */
 export const PLAYWRIGHT_KEY = 'playwright'
+
+/** Custom error message to match when rejectAllModelCommands is called
+ * allows us to match if the execution of executeAst was interrupted */
+export const EXECUTE_AST_INTERRUPT_ERROR_MESSAGE =
+  'Force interrupt, executionIsStale, new AST requested'

src/lib/desktop.ts

@@ -1,8 +1,6 @@
 import { err } from 'lib/trap'
 import { Models } from '@kittycad/lib'
-import { Project } from 'wasm-lib/kcl/bindings/Project'
-import { ProjectState } from 'wasm-lib/kcl/bindings/ProjectState'
-import { FileEntry } from 'wasm-lib/kcl/bindings/FileEntry'
+import { Project, FileEntry } from 'lib/project'
 
 import {
   defaultAppSettings,
@@ -15,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'
@@ -398,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 {
@@ -477,15 +493,31 @@ export const writeAppSettingsFile = async (tomlStr: string) => {
   return window.electron.writeFile(appSettingsFilePath, tomlStr)
 }
 
-let appStateStore: ProjectState | undefined = undefined
+export const readTokenFile = async () => {
+  let settingsPath = await getTokenFilePath()
 
-export const getState = async (): Promise<ProjectState | undefined> => {
+  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: ProjectState | undefined
-): Promise<void> => {
+export const setState = async (state: Project | undefined): Promise<void> => {
   appStateStore = state
 }
 

src/lib/desktopFS.ts

@@ -1,5 +1,5 @@
 import { isDesktop } from './isDesktop'
-import type { FileEntry } from 'lib/types'
+import type { FileEntry } from 'lib/project'
 import {
   FILE_EXT,
   INDEX_IDENTIFIER,

src/lib/exampleKcl.ts

@@ -31,11 +31,11 @@ const bracket = startSketchOn('XY')
   |> extrude(width, %)
   |> fillet({
        radius: filletR,
-       tags: [getPreviousAdjacentEdge(innerEdge)]
+       tags: [getNextAdjacentEdge(innerEdge)]
      }, %)
   |> fillet({
        radius: filletR + thickness,
-       tags: [getPreviousAdjacentEdge(outerEdge)]
+       tags: [getNextAdjacentEdge(outerEdge)]
      }, %)`
 
 /**

src/lib/exportMake.ts

@@ -26,15 +26,7 @@ export async function exportMake(data: ArrayBuffer): Promise<Response | null> {
     return null
   }
 
-  let machineId = null
-  if ('id' in currentMachine) {
-    machineId = currentMachine.id
-  } else if ('hostname' in currentMachine && currentMachine.hostname) {
-    machineId = currentMachine.hostname
-  } else if ('ip' in currentMachine && currentMachine.ip) {
-    machineId = currentMachine.ip
-  }
-
+  let machineId = currentMachine?.id
   if (!machineId) {
     console.error('No machine id available', currentMachine)
     toast.error('No machine id available')

src/lib/getCurrentProjectFile.test.ts

@@ -0,0 +1,98 @@
+import { promises as fs } from 'fs'
+import path from 'path'
+import os from 'os'
+import { v4 as uuidv4 } from 'uuid'
+import getCurrentProjectFile from './getCurrentProjectFile'
+
+describe('getCurrentProjectFile', () => {
+  test('with explicit open file with space (URL encoded)', async () => {
+    const name = `kittycad-modeling-projects-${uuidv4()}`
+    const tmpProjectDir = path.join(os.tmpdir(), name)
+
+    await fs.mkdir(tmpProjectDir, { recursive: true })
+    await fs.writeFile(path.join(tmpProjectDir, 'i have a space.kcl'), '')
+
+    const state = await getCurrentProjectFile(
+      path.join(tmpProjectDir, 'i%20have%20a%20space.kcl')
+    )
+
+    expect(state).toBe(path.join(tmpProjectDir, 'i have a space.kcl'))
+
+    await fs.rm(tmpProjectDir, { recursive: true, force: true })
+  })
+
+  test('with explicit open file with space', async () => {
+    const name = `kittycad-modeling-projects-${uuidv4()}`
+    const tmpProjectDir = path.join(os.tmpdir(), name)
+
+    await fs.mkdir(tmpProjectDir, { recursive: true })
+    await fs.writeFile(path.join(tmpProjectDir, 'i have a space.kcl'), '')
+
+    const state = await getCurrentProjectFile(
+      path.join(tmpProjectDir, 'i have a space.kcl')
+    )
+
+    expect(state).toBe(path.join(tmpProjectDir, 'i have a space.kcl'))
+
+    await fs.rm(tmpProjectDir, { recursive: true, force: true })
+  })
+
+  test('with source path dot', async () => {
+    const name = `kittycad-modeling-projects-${uuidv4()}`
+    const tmpProjectDir = path.join(os.tmpdir(), name)
+    await fs.mkdir(tmpProjectDir, { recursive: true })
+
+    // Set the current directory to the temp project directory.
+    const originalCwd = process.cwd()
+    process.chdir(tmpProjectDir)
+
+    try {
+      const state = await getCurrentProjectFile('.')
+
+      if (state instanceof Error) {
+        throw state
+      }
+
+      expect(state.replace('/private', '')).toBe(
+        path.join(tmpProjectDir, 'main.kcl')
+      )
+    } finally {
+      process.chdir(originalCwd)
+      await fs.rm(tmpProjectDir, { recursive: true, force: true })
+    }
+  })
+
+  test('with main.kcl not existing', async () => {
+    const name = `kittycad-modeling-projects-${uuidv4()}`
+    const tmpProjectDir = path.join(os.tmpdir(), name)
+    await fs.mkdir(tmpProjectDir, { recursive: true })
+
+    try {
+      const state = await getCurrentProjectFile(tmpProjectDir)
+
+      expect(state).toBe(path.join(tmpProjectDir, 'main.kcl'))
+    } finally {
+      await fs.rm(tmpProjectDir, { recursive: true, force: true })
+    }
+  })
+
+  test('with directory, main.kcl not existing, other.kcl does', async () => {
+    const name = `kittycad-modeling-projects-${uuidv4()}`
+    const tmpProjectDir = path.join(os.tmpdir(), name)
+    await fs.mkdir(tmpProjectDir, { recursive: true })
+    await fs.writeFile(path.join(tmpProjectDir, 'other.kcl'), '')
+
+    try {
+      const state = await getCurrentProjectFile(tmpProjectDir)
+
+      expect(state).toBe(path.join(tmpProjectDir, 'other.kcl'))
+
+      // make sure we didn't create a main.kcl file
+      await expect(
+        fs.access(path.join(tmpProjectDir, 'main.kcl'))
+      ).rejects.toThrow()
+    } finally {
+      await fs.rm(tmpProjectDir, { recursive: true, force: true })
+    }
+  })
+})

src/lib/getCurrentProjectFile.ts

@@ -0,0 +1,116 @@
+import * as path from 'path'
+import * as fs from 'fs/promises'
+import { Models } from '@kittycad/lib/dist/types/src'
+import { PROJECT_ENTRYPOINT } from './constants'
+
+// Create a const object with the values
+const FILE_IMPORT_FORMATS = {
+  fbx: 'fbx',
+  gltf: 'gltf',
+  obj: 'obj',
+  ply: 'ply',
+  sldprt: 'sldprt',
+  step: 'step',
+  stl: 'stl',
+} as const
+
+// Extract the values into an array
+const fileImportFormats: Models['FileImportFormat_type'][] =
+  Object.values(FILE_IMPORT_FORMATS)
+export const allFileImportFormats: string[] = [
+  ...fileImportFormats,
+  'stp',
+  'fbxb',
+  'glb',
+]
+export const relevantExtensions = ['kcl', ...allFileImportFormats]
+
+/// Get the current project file from the path.
+/// This is used for double-clicking on a file in the file explorer,
+/// or the command line args, or deep linking.
+export default async function getCurrentProjectFile(
+  pathString: string
+): Promise<string | Error> {
+  // Fix for "." path, which is the current directory.
+  let sourcePath = pathString === '.' ? process.cwd() : pathString
+
+  // URL decode the path.
+  sourcePath = decodeURIComponent(sourcePath)
+
+  // If the path does not start with a slash, it is a relative path.
+  // We need to convert it to an absolute path.
+  sourcePath = path.isAbsolute(sourcePath)
+    ? sourcePath
+    : path.join(process.cwd(), sourcePath)
+
+  // If the path is a directory, let's assume it is a project directory.
+  const stats = await fs.stat(sourcePath)
+  if (stats.isDirectory()) {
+    // Walk the directory and look for a kcl file.
+    const files = await fs.readdir(sourcePath)
+    const kclFiles = files.filter((file) => path.extname(file) === '.kcl')
+
+    if (kclFiles.length === 0) {
+      let projectFile = path.join(sourcePath, PROJECT_ENTRYPOINT)
+      // Check if we have a main.kcl file in the project.
+      try {
+        await fs.access(projectFile)
+      } catch {
+        // Create the default file in the project.
+        await fs.writeFile(projectFile, '')
+      }
+
+      return projectFile
+    }
+
+    // If a project entrypoint file exists, use it.
+    // Otherwise, use the first kcl file in the project.
+    const gotMain = files.filter((file) => file === PROJECT_ENTRYPOINT)
+    if (gotMain.length === 0) {
+      return path.join(sourcePath, kclFiles[0])
+    }
+    return path.join(sourcePath, PROJECT_ENTRYPOINT)
+  }
+
+  // Check if the extension on what we are trying to open is a relevant file type.
+  const extension = path.extname(sourcePath).slice(1)
+
+  if (!relevantExtensions.includes(extension) && extension !== 'toml') {
+    return new Error(
+      `File type (${extension}) cannot be opened with this app: '${sourcePath}', try opening one of the following file types: ${relevantExtensions.join(
+        ', '
+      )}`
+    )
+  }
+
+  // We were given a file path, not a directory.
+  // Let's get the parent directory of the file.
+  const parent = path.dirname(sourcePath)
+
+  // If we got an import model file, we need to check if we have a file in the project for
+  // this import model.
+  if (allFileImportFormats.includes(extension)) {
+    const importFileName = path.basename(sourcePath)
+    // Check if we have a file in the project for this import model.
+    const kclWrapperFilename = `${importFileName}.kcl`
+    const kclWrapperFilePath = path.join(parent, kclWrapperFilename)
+
+    try {
+      await fs.access(kclWrapperFilePath)
+    } catch {
+      // Create the file in the project with the default import content.
+      const content = `// This file was automatically generated by the application when you
+// double-clicked on the model file.
+// You can edit this file to add your own content.
+// But we recommend you keep the import statement as it is.
+// For more information on the import statement, see the documentation at:
+// https://zoo.dev/docs/kcl/import
+const model = import("${importFileName}")`
+      await fs.writeFile(kclWrapperFilePath, content)
+    }
+
+    return kclWrapperFilePath
+  }
+
+  return sourcePath
+}

src/lib/machine-api.d.ts

@@ -93,587 +93,56 @@ export interface paths {
 export type webhooks = Record<string, never>
 export interface components {
   schemas: {
-    /** @description The type of accessory. */
-    AccessoryType: 'none'
     /** @description Error information from a response. */
     Error: {
       error_code?: string
       message: string
       request_id: string
     }
-    /** @description An info command. */
-    Info: {
-      /** @enum {string} */
-      command: 'get_version'
-      /** @description The info module. */
-      module: components['schemas']['InfoModule'][]
-      /** @description The reason of the info command. */
-      reason?: components['schemas']['Reason'] | null
-      /** @description The result of the info command. */
-      result?: components['schemas']['Result'] | null
-      /** @description The sequence id. */
-      sequence_id: components['schemas']['SequenceId']
-    } & {
-      [key: string]: unknown
+    /** @description Extra machine-specific information regarding a connected machine. */
+    ExtraMachineInfoResponse:
+      | {
+          Moonraker: Record<string, never>
+        }
+      | {
+          Usb: Record<string, never>
+        }
+      | {
+          Bambu: Record<string, never>
+        }
+    /** @description Information regarding a connected machine. */
+    MachineInfoResponse: {
+      /** @description Additional, per-machine information which is specific to the underlying machine type. */
+      extra?: components['schemas']['ExtraMachineInfoResponse'] | null
+      /** @description Machine Identifier (ID) for the specific Machine. */
+      id: string
+      /** @description Information regarding the method of manufacture. */
+      machine_type: components['schemas']['MachineType']
+      /** @description Information regarding the make and model of the attached Machine. */
+      make_model: components['schemas']['MachineMakeModel']
+      /** @description Maximum part size that can be manufactured by this device. This may be some sort of theoretical upper bound, getting close to this limit seems like maybe a bad idea.
+       *
+       *     This may be `None` if the maximum size is not knowable by the Machine API.
+       *
+       *     What "close" means is up to you! */
+      max_part_volume?: components['schemas']['Volume'] | null
     }
-    /** @description An info module. */
-    InfoModule: {
-      /** @description The hardware version. */
-      hw_ver: string
-      /** @description The loader version. */
-      loader_ver?: string | null
-      /** @description The module name. */
-      name: string
-      /** @description The ota version. */
-      ota_ver?: string | null
-      /** @description The project name. */
-      project_name?: string | null
-      /** @description The serial number. */
-      sn: string
-      /** @description The software version. */
-      sw_ver: string
-    }
-    /** @description The mode for the led. */
-    LedMode: 'on' | 'off' | 'flashing'
-    /** @description The node for the led. */
-    LedNode: 'chamber_light' | 'work_light'
-    /** @description A liveview message. */
-    LiveView: {
-      /** @enum {string} */
-      command: 'init'
-      /** @description The op protocols. */
-      op_protocols: components['schemas']['OperationProtocol'][]
-      /** @description The peer host. */
-      peer_host: string
-      /** @description The reason for the message. */
-      reason?: components['schemas']['Reason'] | null
-      /** @description The result of the command. */
-      result: components['schemas']['Result']
-      /** @description The sequence id. */
-      sequence_id: components['schemas']['SequenceId']
-    } & {
-      [key: string]: unknown
-    }
-    /** @description Details for a 3d printer connected over USB. */
-    Machine:
-      | {
-          id: string
-          manufacturer: string
-          model: string
-          port: string
-          /** @enum {string} */
-          type: 'UsbPrinter'
-        }
-      | {
-          /** @description The hostname of the printer. */
-          hostname?: string | null
-          /**
-           * Format: ip
-           * @description The IP address of the printer.
-           */
-          ip: string
-          /** @description The manufacturer of the printer. */
-          manufacturer: components['schemas']['NetworkPrinterManufacturer']
-          /** @description The model of the printer. */
-          model?: string | null
-          /**
-           * Format: uint16
-           * @description The port of the printer.
-           */
-          port?: number | null
-          /** @description The serial number of the printer. */
-          serial?: string | null
-          /** @enum {string} */
-          type: 'NetworkPrinter'
-        }
-    /** @description A message from a machine. */
-    Message:
-      | {
-          UsbPrinter: components['schemas']['Message2']
-        }
-      | {
-          NetworkPrinter: components['schemas']['Message3']
-        }
-    /**
-     * @description A message from the printer.
-     * @enum {string}
-     */
-    Message2: 'ok'
-    /** @description A message from the printer. */
-    Message3:
-      | {
-          Bambu: components['schemas']['Message4']
-        }
-      | {
-          Formlabs: Record<string, never>
-        }
-    /** @description A message from/to the printer. */
-    Message4:
-      | {
-          print: components['schemas']['Print']
-        }
-      | {
-          info: components['schemas']['Info']
-        }
-      | {
-          system: components['schemas']['System']
-        }
-      | {
-          security: components['schemas']['Security']
-        }
-      | {
-          live_view: components['schemas']['LiveView']
-        }
-      | {
-          json: unknown
-        }
-      | {
-          unknown: string | null
-        }
-    /** @description Network printer manufacturer. */
-    NetworkPrinterManufacturer: 'Bambu' | 'Formlabs'
-    /** @description A nozzle type. */
-    NozzleType: 'hardened_steel' | 'stainless_steel'
-    /** @description An operation protocol. */
-    OperationProtocol: {
-      /** @description The protocol. */
-      protocol: string
-      /** @description The version. */
-      version: string
-    } & {
-      [key: string]: unknown
+    /** @description Information regarding the make/model of a discovered endpoint. */
+    MachineMakeModel: {
+      /** @description The manufacturer that built the connected Machine. */
+      manufacturer?: string | null
+      /** @description The model of the connected Machine. */
+      model?: string | null
+      /** @description The unique serial number of the connected Machine. */
+      serial?: string | null
     }
+    /** @description Specific technique by which this Machine takes a design, and produces a real-world 3D object. */
+    MachineType: 'Stereolithography' | 'FusedDeposition' | 'Cnc'
     /** @description The response from the `/ping` endpoint. */
     Pong: {
       /** @description The pong response. */
       message: string
     }
-    /** @description A print command. */
-    Print:
-      | ({
-          /** @enum {string} */
-          command: 'ams_control'
-          /** @description The param. */
-          param?: string | null
-          /** @description The reason for the message. */
-          reason: components['schemas']['Reason']
-          /** @description The result of the command. */
-          result: components['schemas']['Result']
-          /** @description The sequence id. */
-          sequence_id: components['schemas']['SequenceId']
-        } & {
-          [key: string]: unknown
-        })
-      | ({
-          /** @enum {string} */
-          command: 'ams_change_filament'
-          /**
-           * Format: int64
-           * @description The error number.
-           */
-          errorno?: number | null
-          /** @description The reason for the message. */
-          reason?: components['schemas']['Reason'] | null
-          /** @description The result of the command. */
-          result: components['schemas']['Result']
-          /** @description The sequence id. */
-          sequence_id: components['schemas']['SequenceId']
-          /**
-           * Format: int64
-           * @description The target temperature.
-           */
-          tar_temp?: number | null
-          /**
-           * Format: int64
-           * @description The target.
-           */
-          target: number
-        } & {
-          [key: string]: unknown
-        })
-      | ({
-          /** @enum {string} */
-          command: 'calibration'
-          /**
-           * Format: int64
-           * @description The option.
-           */
-          option: number
-          /** @description The reason for the message. */
-          reason?: components['schemas']['Reason'] | null
-          /** @description The result of the command. */
-          result: components['schemas']['Result']
-          /** @description The sequence id. */
-          sequence_id: components['schemas']['SequenceId']
-        } & {
-          [key: string]: unknown
-        })
-      | ({
-          /** @description The ams. */
-          ams?: components['schemas']['PrintAms'] | null
-          /**
-           * Format: int64
-           * @description The ams rfid status.
-           */
-          ams_rfid_status?: number | null
-          /**
-           * Format: int64
-           * @description The ams status.
-           */
-          ams_status?: number | null
-          /** @description The aux part fan. */
-          aux_part_fan?: boolean | null
-          /**
-           * Format: double
-           * @description The target bed temperature.
-           */
-          bed_target_temper?: number | null
-          /**
-           * Format: double
-           * @description The bed temperature.
-           */
-          bed_temper?: number | null
-          /** @description The big fan 1 speed. */
-          big_fan1_speed?: string | null
-          /** @description The big fan 2 speed. */
-          big_fan2_speed?: string | null
-          /**
-           * Format: double
-           * @description The chamber temperature.
-           */
-          chamber_temper?: number | null
-          /** @enum {string} */
-          command: 'push_status'
-          /** @description The cooling fan speed. */
-          cooling_fan_speed?: string | null
-          /**
-           * Format: int64
-           * @description The fan gear.
-           */
-          fan_gear?: number | null
-          /** @description Force upgrade? */
-          force_upgrade?: boolean | null
-          /** @description The gcode file. */
-          gcode_file?: string | null
-          /** @description The gcode file prepare percent. */
-          gcode_file_prepare_percent?: string | null
-          /** @description The gcode state. */
-          gcode_state?: string | null
-          /** @description The heatbreak fan speed. */
-          heatbreak_fan_speed?: string | null
-          /** @description The hms. */
-          hms?: unknown[] | null
-          /**
-           * Format: int64
-           * @description The home flag.
-           */
-          home_flag?: number | null
-          /**
-           * Format: int64
-           * @description The hw switch state.
-           */
-          hw_switch_state?: number | null
-          /** @description The ipcam. */
-          ipcam?: components['schemas']['PrintIpcam'] | null
-          /**
-           * Format: int64
-           * @description The layer num.
-           */
-          layer_num?: number | null
-          /** @description The lifecycle. */
-          lifecycle?: string | null
-          /** @description The lights report. */
-          lights_report?: components['schemas']['PrintLightsReport'][] | null
-          /**
-           * Format: int64
-           * @description The percentage of the print completed.
-           */
-          mc_percent?: number | null
-          /** @description The mc print line number. */
-          mc_print_line_number?: string | null
-          /** @description The print stage. */
-          mc_print_stage?: string | null
-          /**
-           * Format: int64
-           * @description The mc print sub stage.
-           */
-          mc_print_sub_stage?: number | null
-          /**
-           * Format: int64
-           * @description The remaining time of the print.
-           */
-          mc_remaining_time?: number | null
-          /** @description The mess production state. */
-          mess_production_state?: string | null
-          /**
-           * Format: int64
-           * @description The message.
-           */
-          msg?: number | null
-          /** @description The nozzle diameter. */
-          nozzle_diameter?: string | null
-          /**
-           * Format: double
-           * @description The target nozzle temperature.
-           */
-          nozzle_target_temper?: number | null
-          /**
-           * Format: double
-           * @description The nozzle temperature.
-           */
-          nozzle_temper?: number | null
-          /** @description The nozzle type. */
-          nozzle_type?: components['schemas']['NozzleType'] | null
-          /** @description Online status. */
-          online?: components['schemas']['PrintOnline'] | null
-          /**
-           * Format: int64
-           * @description The print error.
-           */
-          print_error?: number | null
-          /** @description The print type. */
-          print_type?: string | null
-          /** @description The profile id. */
-          profile_id?: string | null
-          /** @description The project id. */
-          project_id?: string | null
-          /**
-           * Format: int64
-           * @description The queue est.
-           */
-          queue_est?: number | null
-          /**
-           * Format: int64
-           * @description The queue number.
-           */
-          queue_number?: number | null
-          /**
-           * Format: int64
-           * @description The queue sts.
-           */
-          queue_sts?: number | null
-          /**
-           * Format: int64
-           * @description The queue total.
-           */
-          queue_total?: number | null
-          /** @description The s obj. */
-          s_obj?: unknown[] | null
-          /** @description Sdcard? */
-          sdcard?: boolean | null
-          /** @description The sequence id. */
-          sequence_id: components['schemas']['SequenceId']
-          /**
-           * Format: int64
-           * @description The spd lvl.
-           */
-          spd_lvl?: number | null
-          /**
-           * Format: int64
-           * @description The spd mag.
-           */
-          spd_mag?: number | null
-          /** @description The stg. */
-          stg?: unknown[] | null
-          /**
-           * Format: int64
-           * @description The stg cur.
-           */
-          stg_cur?: number | null
-          /** @description The subtask id. */
-          subtask_id?: string | null
-          /** @description The subtask name. */
-          subtask_name?: string | null
-          /** @description The task id. */
-          task_id?: string | null
-          /**
-           * Format: int64
-           * @description The total layer num.
-           */
-          total_layer_num?: number | null
-          /** @description The upgrade state. */
-          upgrade_state?: components['schemas']['PrintUpgradeState'] | null
-          /** @description The upload. */
-          upload?: components['schemas']['PrintUpload'] | null
-          /** @description The tray. */
-          vt_tray?: components['schemas']['PrintTray'] | null
-          /** @description The wifi signal. */
-          wifi_signal?: string | null
-        } & {
-          [key: string]: unknown
-        })
-      | ({
-          /** @enum {string} */
-          command: 'gcode_line'
-          /** @description The gcode line. */
-          param?: string | null
-          /** @description The reason for the message. */
-          reason: components['schemas']['Reason']
-          /** @description The result of the command. */
-          result: components['schemas']['Result']
-          /** @description The return code. */
-          return_code?: string | null
-          /** @description The sequence id. */
-          sequence_id: components['schemas']['SequenceId']
-          /**
-           * Format: int64
-           * @description The source.
-           */
-          source?: number | null
-        } & {
-          [key: string]: unknown
-        })
-      | ({
-          /** @enum {string} */
-          command: 'gcode_file'
-          /** @description The param. */
-          param?: string | null
-          /** @description The print type. */
-          print_type?: string | null
-          /** @description The reason for the message. */
-          reason: components['schemas']['Reason']
-          /** @description The result of the command. */
-          result: components['schemas']['Result']
-          /** @description The sequence id. */
-          sequence_id: components['schemas']['SequenceId']
-        } & {
-          [key: string]: unknown
-        })
-      | ({
-          /** @enum {string} */
-          command: 'project_file'
-          /** @description The gcode file. */
-          gcode_file?: string | null
-          /** @description The profile id. */
-          profile_id: string
-          /** @description The project id. */
-          project_id: string
-          /** @description The sequence id. */
-          sequence_id: components['schemas']['SequenceId']
-          /** @description The subtask id. */
-          subtask_id: string
-          /** @description The subtask name. */
-          subtask_name: string
-          /** @description The task id. */
-          task_id: string
-        } & {
-          [key: string]: unknown
-        })
-      | ({
-          /** @enum {string} */
-          command: 'pause'
-          /** @description The reason for the message. */
-          reason: components['schemas']['Reason']
-          /** @description The result of the command. */
-          result: components['schemas']['Result']
-          /** @description The sequence id. */
-          sequence_id: components['schemas']['SequenceId']
-        } & {
-          [key: string]: unknown
-        })
-      | ({
-          /** @enum {string} */
-          command: 'print_speed'
-          /** @description The param. */
-          param: string
-          /** @description The reason for the message. */
-          reason?: components['schemas']['Reason'] | null
-          /** @description The result of the command. */
-          result: components['schemas']['Result']
-          /** @description The sequence id. */
-          sequence_id: components['schemas']['SequenceId']
-        } & {
-          [key: string]: unknown
-        })
-      | ({
-          /** @enum {string} */
-          command: 'resume'
-          /** @description The reason for the message. */
-          reason: components['schemas']['Reason']
-          /** @description The result of the command. */
-          result: components['schemas']['Result']
-          /** @description The sequence id. */
-          sequence_id: components['schemas']['SequenceId']
-        } & {
-          [key: string]: unknown
-        })
-      | ({
-          /** @enum {string} */
-          command: 'stop'
-          /** @description The sequence id. */
-          sequence_id: components['schemas']['SequenceId']
-        } & {
-          [key: string]: unknown
-        })
-      | ({
-          /** @enum {string} */
-          command: 'extrusion_cali_get'
-          /** @description The sequence id. */
-          sequence_id: components['schemas']['SequenceId']
-        } & {
-          [key: string]: unknown
-        })
-    /** @description The print ams. */
-    PrintAms: {
-      /** @description The ams. */
-      ams?: components['schemas']['PrintAmsData'][] | null
-      /** @description The ams exist bits. */
-      ams_exist_bits?: string | null
-      /** @description The insert flag. */
-      insert_flag?: boolean | null
-      /** @description The power on flag. */
-      power_on_flag?: boolean | null
-      /** @description The tray exist bits. */
-      tray_exist_bits?: string | null
-      /** @description The tray is bbl bits. */
-      tray_is_bbl_bits?: string | null
-      /** @description The tray now. */
-      tray_now?: string | null
-      /** @description The tray pre. */
-      tray_pre?: string | null
-      /** @description The tray read done bits. */
-      tray_read_done_bits?: string | null
-      /** @description The tray reading bits. */
-      tray_reading_bits?: string | null
-      /** @description The tray tar. */
-      tray_tar?: string | null
-      /**
-       * Format: int64
-       * @description The version.
-       */
-      version?: number | null
-    } & {
-      [key: string]: unknown
-    }
-    /** @description The print ams data. */
-    PrintAmsData: {
-      /** @description The humidity. */
-      humidity: string
-      /** @description The id. */
-      id: string
-      /** @description The temperature. */
-      temp: string
-      /** @description The tray. */
-      tray: components['schemas']['PrintTray'][]
-    } & {
-      [key: string]: unknown
-    }
-    /** @description The print ipcam. */
-    PrintIpcam: {
-      /** @description The ipcam dev. */
-      ipcam_dev?: string | null
-      /** @description The ipcam record. */
-      ipcam_record?: string | null
-      /**
-       * Format: int64
-       * @description The mode bits.
-       */
-      mode_bits?: number | null
-      /** @description The timelapse. */
-      timelapse?: string | null
-    } & {
-      [key: string]: unknown
-    }
     /** @description The response from the `/print` endpoint. */
     PrintJobResponse: {
       /** @description The job id used for this print. */
@@ -681,29 +150,6 @@ export interface components {
       /** @description The parameters used for this print. */
       parameters: components['schemas']['PrintParameters']
     }
-    /** @description A print lights report. */
-    PrintLightsReport: {
-      /** @description The mode. */
-      mode: components['schemas']['LedMode']
-      /** @description The node. */
-      node: components['schemas']['LedNode']
-    } & {
-      [key: string]: unknown
-    }
-    /** @description The print online. */
-    PrintOnline: {
-      /** @description The ahb. */
-      ahb: boolean
-      /** @description The rfid. */
-      rfid?: boolean | null
-      /**
-       * Format: int64
-       * @description The version.
-       */
-      version: number
-    } & {
-      [key: string]: unknown
-    }
     /** @description Parameters for printing. */
     PrintParameters: {
       /** @description The name for the job. */
@@ -711,219 +157,26 @@ export interface components {
       /** @description The machine id to print to. */
       machine_id: string
     }
-    /** @description The print tray. */
-    PrintTray: {
-      /** @description The bed temperature. */
-      bed_temp?: string | null
-      /** @description The bed temperature type. */
-      bed_temp_type?: string | null
-      /** @description The id. */
-      id: string
+    /** @description Set of three values to represent the extent of a 3-D Volume. This contains the width, depth, and height values, generally used to represent some maximum or minimum.
+     *
+     *     All measurements are in millimeters. */
+    Volume: {
       /**
        * Format: double
-       * @description The tray k.
+       * @description Depth of the volume ("front to back"), in millimeters.
        */
-      k?: number | null
+      depth: number
       /**
-       * Format: int64
-       * @description The tray n.
+       * Format: double
+       * @description Height of the volume ("up and down"), in millimeters.
        */
-      n?: number | null
-      /** @description The nozzle temperature max. */
-      nozzle_temp_max?: string | null
-      /** @description The nozzle temperature min. */
-      nozzle_temp_min?: string | null
+      height: number
       /**
-       * Format: int64
-       * @description The tray remain.
+       * Format: double
+       * @description Width of the volume ("left and right"), in millimeters.
        */
-      remain?: number | null
-      /** @description The tag uid. */
-      tag_uid?: string | null
-      /** @description The tray color. */
-      tray_color?: string | null
-      /** @description The tray diameter. */
-      tray_diameter?: string | null
-      /** @description The tray id name. */
-      tray_id_name?: string | null
-      /** @description The tray info index. */
-      tray_info_idx?: string | null
-      /** @description The tray sub brands. */
-      tray_sub_brands?: string | null
-      /** @description The tray temperature. */
-      tray_temp?: string | null
-      /** @description The tray time. */
-      tray_time?: string | null
-      /** @description The tray type. */
-      tray_type?: string | null
-      /** @description The tray uuid. */
-      tray_uuid?: string | null
-      /** @description The tray weight. */
-      tray_weight?: string | null
-      /** @description The xcam info. */
-      xcam_info?: string | null
-    } & {
-      [key: string]: unknown
+      width: number
     }
-    /** @description A print upgrade state. */
-    PrintUpgradeState: {
-      /** @description The consistency request. */
-      consistency_request?: boolean | null
-      /**
-       * Format: int64
-       * @description The dis state.
-       */
-      dis_state?: number | null
-      /**
-       * Format: int64
-       * @description The error code.
-       */
-      err_code?: number | null
-      /** @description Force upgrade? */
-      force_upgrade?: boolean | null
-      /** @description The message. */
-      message?: string | null
-      /** @description The module. */
-      module?: string | null
-      /** @description The new version list. */
-      new_ver_list?: unknown[] | null
-      /**
-       * Format: int64
-       * @description The new version state.
-       */
-      new_version_state?: number | null
-      /** @description The progress. */
-      progress?: string | null
-      /**
-       * Format: int64
-       * @description The sequence id.
-       */
-      sequence_id?: number | null
-      /** @description The status. */
-      status?: string | null
-    } & {
-      [key: string]: unknown
-    }
-    /** @description The print upload. */
-    PrintUpload: {
-      /** @description The message. */
-      message: string
-      /**
-       * Format: int64
-       * @description The progress.
-       */
-      progress: number
-      /** @description The status. */
-      status: string
-    } & {
-      [key: string]: unknown
-    }
-    /** @description A reason for a message. */
-    Reason:
-      | 'SUCCESS'
-      | 'FAIL'
-      | {
-          UNKNOWN: string
-        }
-    /** @description The result of a message. */
-    Result: 'SUCCESS' | 'FAIL'
-    /** @description A security message. */
-    Security: {
-      /**
-       * Format: int64
-       * @description The address.
-       */
-      address: number
-      /** @description The chip sn. */
-      chip_sn: string
-      /**
-       * Format: int64
-       * @description The chip sn length.
-       */
-      chipsn_len: number
-      /** @enum {string} */
-      command: 'get_sn'
-      /**
-       * Format: int64
-       * @description The length.
-       */
-      length: number
-      /** @description The module. */
-      module: string
-      /** @description The reason for the message. */
-      reason?: components['schemas']['Reason'] | null
-      /** @description The sequence id. */
-      sequence_id: components['schemas']['SequenceId']
-      /** @description The serial number. */
-      sn: string
-      /** @description The status. */
-      status: string
-    } & {
-      [key: string]: unknown
-    }
-    /** @description The sequence id type. */
-    SequenceId: string | number
-    /** @description A system command. */
-    System:
-      | ({
-          /** @enum {string} */
-          command: 'ledctrl'
-          /**
-           * Format: uint32
-           * @description The interval time.
-           */
-          interval_time: number
-          /** @description The LED mode. */
-          led_mode: components['schemas']['LedMode']
-          /** @description The LED node. */
-          led_node: components['schemas']['LedNode']
-          /**
-           * Format: uint32
-           * @description The LED off time.
-           */
-          led_off_time: number
-          /**
-           * Format: uint32
-           * @description The LED on time.
-           */
-          led_on_time: number
-          /**
-           * Format: uint32
-           * @description The loop times.
-           */
-          loop_times: number
-          /** @description The reason for the message. */
-          reason?: components['schemas']['Reason'] | null
-          /** @description The result of the command. */
-          result: components['schemas']['Result']
-          /** @description The sequence id. */
-          sequence_id: components['schemas']['SequenceId']
-        } & {
-          [key: string]: unknown
-        })
-      | ({
-          /** @description The accessory type. */
-          accessory_type: components['schemas']['AccessoryType']
-          /** @description The aux part fan. */
-          aux_part_fan: boolean
-          /** @enum {string} */
-          command: 'get_accessories'
-          /**
-           * Format: double
-           * @description The nozzle diameter.
-           */
-          nozzle_diameter: number
-          /** @description The nozzle type. */
-          nozzle_type: components['schemas']['NozzleType']
-          /** @description The reason for the message. */
-          reason?: components['schemas']['Reason'] | null
-          /** @description The result of the command. */
-          result: components['schemas']['Result']
-          /** @description The sequence id. */
-          sequence_id: components['schemas']['SequenceId']
-        } & {
-          [key: string]: unknown
-        })
   }
   responses: {
     /** @description Error */
@@ -980,9 +233,7 @@ export interface operations {
           [name: string]: unknown
         }
         content: {
-          'application/json': {
-            [key: string]: components['schemas']['Machine']
-          }
+          'application/json': components['schemas']['MachineInfoResponse'][]
         }
       }
       '4XX': components['responses']['Error']
@@ -1007,7 +258,7 @@ export interface operations {
           [name: string]: unknown
         }
         content: {
-          'application/json': components['schemas']['Message']
+          'application/json': components['schemas']['MachineInfoResponse']
         }
       }
       '4XX': components['responses']['Error']

src/lib/machineManager.ts

@@ -1,15 +1,16 @@
 import { isDesktop } from './isDesktop'
 import { components } from './machine-api'
 
-export type MachinesListing = {
-  [key: string]: components['schemas']['Machine']
-}
+export type MachinesListing = Array<
+  components['schemas']['MachineInfoResponse']
+>
 
 export class MachineManager {
   private _isDesktop: boolean = isDesktop()
-  private _machines: MachinesListing = {}
+  private _machines: MachinesListing = []
   private _machineApiIp: string | null = null
-  private _currentMachine: components['schemas']['Machine'] | null = null
+  private _currentMachine: components['schemas']['MachineInfoResponse'] | null =
+    null
 
   constructor() {
     if (!this._isDesktop) {
@@ -44,7 +45,7 @@ export class MachineManager {
   }
 
   machineCount(): number {
-    return Object.keys(this._machines).length
+    return this._machines.length
   }
 
   get machineApiIp(): string | null {
@@ -64,11 +65,13 @@ export class MachineManager {
     return 'Machine API server was discovered, but no machines are available'
   }
 
-  get currentMachine(): components['schemas']['Machine'] | null {
+  get currentMachine(): components['schemas']['MachineInfoResponse'] | null {
     return this._currentMachine
   }
 
-  set currentMachine(machine: components['schemas']['Machine'] | null) {
+  set currentMachine(
+    machine: components['schemas']['MachineInfoResponse'] | null
+  ) {
     this._currentMachine = machine
   }
 
@@ -78,7 +81,6 @@ export class MachineManager {
     }
 
     this._machines = await window.electron.listMachines()
-    console.log('Machines:', this._machines)
   }
 
   private async updateMachineApiIp(): Promise<void> {

src/lib/project.d.ts

@@ -0,0 +1,46 @@
+/**
+ * The permissions of a file.
+ */
+export type FilePermission = 'read' | 'write' | 'execute'
+
+/**
+ * The type of a file.
+ */
+export type FileType = 'file' | 'directory' | 'symlink'
+
+/**
+ * Metadata about a file or directory.
+ */
+export type FileMetadata = {
+  accessed: string | null
+  created: string | null
+  type: FileType | null
+  size: number
+  modified: string | null
+  permission: FilePermission | null
+}
+
+/**
+ * Information about a file or directory.
+ */
+export type FileEntry = {
+  path: string
+  name: string
+  children: Array<FileEntry> | null
+}
+
+/**
+ * Information about project.
+ */
+export type Project = {
+  metadata: FileMetadata | null
+  kcl_file_count: number
+  directory_count: number
+  /**
+   * The default file to open on load.
+   */
+  default_file: string
+  path: string
+  name: string
+  children: Array<FileEntry> | null
+}

src/lib/routeLoaders.ts

@@ -90,12 +90,24 @@ export const fileLoader: LoaderFunction = async (
     let code = ''
 
     if (!urlObj.pathname.endsWith('/settings')) {
-      if (!currentFileName || !currentFilePath || !projectName) {
+      const fallbackFile = isDesktop()
+        ? (await getProjectInfo(projectPath)).default_file
+        : ''
+      let fileExists = isDesktop()
+      if (currentFilePath && fileExists) {
+        try {
+          await window.electron.stat(currentFilePath)
+        } catch (e) {
+          if (e === 'ENOENT') {
+            fileExists = false
+          }
+        }
+      }
+
+      if (!fileExists || !currentFileName || !currentFilePath || !projectName) {
         return redirect(
           `${PATHS.FILE}/${encodeURIComponent(
-            isDesktop()
-              ? (await getProjectInfo(projectPath)).default_file
-              : params.id + '/' + PROJECT_ENTRYPOINT
+            isDesktop() ? fallbackFile : params.id + '/' + PROJECT_ENTRYPOINT
           )}`
         )
       }

src/lib/selections.ts

@@ -33,6 +33,7 @@ import {
   getArtifactOfTypes,
   getArtifactsOfTypes,
   getCapCodeRef,
+  getExtrudeEdgeCodeRef,
   getSolid2dCodeRef,
   getWallCodeRef,
 } from 'lang/std/artifactGraph'
@@ -141,6 +142,20 @@ export async function getEventForSelectWithPoint({
       },
     }
   }
+  if (_artifact.type === 'extrudeEdge') {
+    const codeRef = getExtrudeEdgeCodeRef(
+      _artifact,
+      engineCommandManager.artifactGraph
+    )
+    if (err(codeRef)) return null
+    return {
+      type: 'Set selection',
+      data: {
+        selectionType: 'singleCodeCursor',
+        selection: { range: codeRef.range, type: 'edge' },
+      },
+    }
+  }
   return null
 }
 

src/lib/singletons.ts

@@ -16,7 +16,7 @@ window.tearDown = engineCommandManager.tearDown
 
 // This needs to be after codeManager is created.
 export const kclManager = new KclManager(engineCommandManager)
-kclManager.isFirstRender = true
+engineCommandManager.kclManager = kclManager
 
 engineCommandManager.getAstCb = () => kclManager.ast
 

src/lib/sorting.ts

@@ -1,5 +1,5 @@
 import { CustomIconName } from 'components/CustomIcon'
-import { Project } from 'wasm-lib/kcl/bindings/Project'
+import { Project } from 'lib/project'
 
 const DESC = ':desc'
 

src/lib/types.ts

@@ -1,7 +1,4 @@
-import { FileEntry } from 'wasm-lib/kcl/bindings/FileEntry'
-import { Project } from 'wasm-lib/kcl/bindings/Project'
-
-export type { FileEntry } from 'wasm-lib/kcl/bindings/FileEntry'
+import { Project, FileEntry } from 'lib/project'
 
 export type IndexLoaderData = {
   code: string | null

src/lib/utils.ts

@@ -147,7 +147,7 @@ export function platform(): Platform {
       case 'sunos':
         return 'linux'
       default:
-        console.error('Unknown platform:', platform)
+        console.error('Unknown desktop platform:', platform)
         return ''
     }
   }
@@ -156,11 +156,14 @@ export function platform(): Platform {
   // it's more accurate than userAgent and userAgentData in Playwright.
   if (
     navigator.platform?.indexOf('Mac') === 0 ||
-    navigator.platform === 'iPhone'
+    navigator.platform?.indexOf('iPhone') === 0 ||
+    navigator.platform?.indexOf('iPad') === 0 ||
+    // Vite tests running in HappyDOM.
+    navigator.platform?.indexOf('Darwin') >= 0
   ) {
     return 'macos'
   }
-  if (navigator.platform === 'Win32') {
+  if (navigator.platform === 'Windows' || navigator.platform === 'Win32') {
     return 'windows'
   }
 
@@ -185,7 +188,7 @@ export function platform(): Platform {
     return 'linux'
   }
   console.error(
-    'Unknown platform userAgent:',
+    'Unknown web platform:',
     navigator.platform,
     userAgentDataPlatform,
     navigator.userAgent

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
+}

src/machines/fileMachine.ts

@@ -1,6 +1,5 @@
 import { assign, createMachine } from 'xstate'
-import type { FileEntry } from 'lib/types'
-import { Project } from 'wasm-lib/kcl/bindings/Project'
+import { Project, FileEntry } from 'lib/project'
 
 export const fileMachine = createMachine(
   {