Merge branch 'main' into franknoirot/prevent-reload-on-deletion

.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,.yarn.lock,**/yarn.lock,./openapi/*.json,./src/lib/machine-api.d.ts
+skip: **/target,node_modules,build,**/Cargo.lock,./docs/kcl/*.md,.yarn.lock,**/yarn.lock

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

@@ -15,7 +15,6 @@ on:
 env:
   CUT_RELEASE_PR: ${{ github.event_name == 'pull_request' && (contains(github.event.pull_request.title, 'Cut release v')) }}
   BUILD_RELEASE: ${{ github.event_name == 'release' || github.event_name == 'schedule' || github.event_name == 'pull_request' && (contains(github.event.pull_request.title, 'Cut release v')) }}
-  NOTES: ${{ github.event_name == 'release' && github.event.release.body || format('Non-release build, commit {0}', github.sha) }}
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -26,6 +25,7 @@ jobs:
     runs-on: ubuntu-22.04  # seperate job on Ubuntu for easy string manipulations (compared to Windows)
     outputs:
       version: ${{ steps.export_version.outputs.version }}
+      notes: ${{ steps.export_version.outputs.notes }}
     steps:
       - uses: actions/checkout@v4
 
@@ -55,6 +55,8 @@ jobs:
       # TODO: see if we need to inject updater nightly URL here https://dl.zoo.dev/releases/modeling-app/nightly/last_update.json
 
       - name: Generate release notes
+        env:
+          NOTES: ${{ github.event_name == 'release' && github.event.release.body || format('Non-release build, commit {0}', github.sha) }}
         run: |
           echo "$NOTES" > release-notes.md
           cat release-notes.md
@@ -70,17 +72,8 @@ jobs:
       - id: export_version
         run: echo "version=`cat package.json | jq -r '.version'`" >> "$GITHUB_OUTPUT"
 
-      - name: Prepare electron-builder.yml file for nightly
-        if: ${{ github.event_name == 'schedule' }}
-        run: |
-          yq -i '.publish[0].url = "https://dl.zoo.dev/releases/modeling-app/nightly"' electron-builder.yml
-
-      - uses: actions/upload-artifact@v3
-        if: ${{ github.event_name == 'schedule' }}
-        with:
-          name: prepared-files-nightly
-          path: |
-            electron-builder.yml
+      - id: export_notes
+        run: echo "notes=`cat release-notes.md'`" >> "$GITHUB_OUTPUT"
 
       - name: Prepare electron-builder.yml file for updater test
         if: ${{ env.CUT_RELEASE_PR == 'true' }}
@@ -88,7 +81,6 @@ jobs:
           yq -i '.publish[0].url = "https://dl.zoo.dev/releases/modeling-app/updater-test-release-notes"' electron-builder.yml
 
       - uses: actions/upload-artifact@v3
-        if: ${{ env.CUT_RELEASE_PR == 'true' }}
         with:
           name: prepared-files-updater-test
           path: |
@@ -100,17 +92,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - os: macos-14
-            platform: mac
-          - os: windows-2022
-            platform: win
-          - os: ubuntu-22.04
-            platform: linux
+        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 }}
+      CSC_LINK: ${{ secrets.APPLE_CERTIFICATE }}
+      CSC_KEY_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+      CSC_KEYCHAIN: ${{ secrets.APPLE_SIGNING_IDENTITY }}
+      CSC_FOR_PULL_REQUEST: true
       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
 
@@ -126,16 +121,6 @@ jobs:
           cp prepared-files/src/wasm-lib/pkg/wasm_lib* src/wasm-lib/pkg
           cp prepared-files/release-notes.md release-notes.md
 
-      - uses: actions/download-artifact@v3
-        if: ${{ github.event_name == 'schedule' }}
-        name: prepared-files-nightly
-
-      - name: Copy updated electron-builder.yml file for nightly build
-        if: ${{ github.event_name == 'schedule' }}
-        run: |
-          ls -R prepared-files-nightly
-          cp prepared-files-nightly/electron-builder.yml electron-builder.yml
-
       - name: Sync node version and setup cache
         uses: actions/setup-node@v4
         with:
@@ -172,52 +157,17 @@ jobs:
           smksp_cert_sync.exe
         shell: cmd
 
-      - name: Build the app (debug)
-        if: ${{ env.BUILD_RELEASE == 'false' }}
-        # electron-builder doesn't have a concept of release vs debug,
-        # this is just not doing any codesign or release yml generation
-        run: yarn electron-builder --config
-
-      - name: Build the app (release)
-        if: ${{ env.BUILD_RELEASE == 'true' }}
-        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 }}
-          CSC_LINK: ${{ secrets.APPLE_CERTIFICATE }}
-          CSC_KEY_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
-          CSC_KEYCHAIN: ${{ secrets.APPLE_SIGNING_IDENTITY }}
-          CSC_FOR_PULL_REQUEST: true
-          WINDOWS_CERTIFICATE_THUMBPRINT: ${{ secrets.WINDOWS_CERTIFICATE_THUMBPRINT }}
-        run: yarn electron-builder --config --publish always
+      - name: Build the app
+        run: yarn electron-builder --config ${{ env.BUILD_RELEASE && '--publish always' || '' }}
 
       - name: List artifacts in out/
         run: ls -R out
 
       - uses: actions/upload-artifact@v3
         with:
-          name: out-arm64-${{ matrix.platform }}
-          # first two will pick both Zoo Modeling App-$VERSION-arm64-win.exe and Zoo Modeling App-$VERSION-win.exe
-          path: |
-            out/*-${{ env.VERSION_NO_V }}-win.*
-            out/*-${{ env.VERSION_NO_V }}-arm64-win.*
-            out/*-arm64-mac.*
-            out/*-arm64-linux.*
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: out-x64-${{ matrix.platform }}
-          path: |
-            out/*-x64-win.*
-            out/*-x64-mac.*
-            out/*-x86_64-linux.*
-
-      - uses: actions/upload-artifact@v3
-        if: ${{ env.BUILD_RELEASE == 'true' }}
-        with:
-          name: out-yml
+          name: out-${{ matrix.os }}
           path: |
+            out/Zoo*.*
             out/latest*.yml
 
       # TODO: add the 'Build for Mac TestFlight (nightly)' stage back
@@ -234,35 +184,15 @@ jobs:
 
       - name: Build the app (updater-test)
         if: ${{ env.CUT_RELEASE_PR == 'true' }}
-        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 }}
-          CSC_LINK: ${{ secrets.APPLE_CERTIFICATE }}
-          CSC_KEY_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
-          CSC_KEYCHAIN: ${{ secrets.APPLE_SIGNING_IDENTITY }}
-          CSC_FOR_PULL_REQUEST: true
-          WINDOWS_CERTIFICATE_THUMBPRINT: ${{ secrets.WINDOWS_CERTIFICATE_THUMBPRINT }}
-        run: yarn electron-builder --config --publish always
+        run: yarn electron-builder --config ${{ env.BUILD_RELEASE && '--publish always' || '' }}
 
       - uses: actions/upload-artifact@v3
         if: ${{ env.CUT_RELEASE_PR == 'true' }}
         with:
-          name: updater-test-arm64-${{ matrix.platform }}
+          name: updater-test-${{ matrix.os }}
           path: |
-            out/*-arm64-win.exe
-            out/*-arm64-mac.dmg
-            out/*-arm64-linux.AppImage
-
-      - uses: actions/upload-artifact@v3
-        if: ${{ env.CUT_RELEASE_PR == 'true' }}
-        with:
-          name: updater-test-x64-${{ matrix.platform }}
-          path: |
-            out/*-x64-win.exe
-            out/*-x64-mac.dmg
-            out/*-x86_64-linux.AppImage
+            out/Zoo*.*
+            out/latest*.yml
 
 
   publish-apps-release:
@@ -275,6 +205,7 @@ jobs:
       VERSION_NO_V: ${{ needs.prepare-files.outputs.version }}
       VERSION: ${{ github.event_name == 'schedule' && needs.prepare-files.outputs.version || format('v{0}', needs.prepare-files.outputs.version) }}
       PUB_DATE: ${{ github.event_name == 'release' && github.event.release.created_at || github.event.repository.updated_at }}
+      NOTES: ${{ needs.prepare-files.outputs.notes }}
       BUCKET_DIR: ${{ github.event_name == 'schedule' && 'dl.kittycad.io/releases/modeling-app/nightly' || 'dl.kittycad.io/releases/modeling-app' }}
       WEBSITE_DIR: ${{ github.event_name == 'schedule' && 'dl.zoo.dev/releases/modeling-app/nightly' || 'dl.zoo.dev/releases/modeling-app' }}
       URL_CODED_NAME: ${{ github.event_name == 'schedule' && 'Zoo%20Modeling%20App%20%28Nightly%29' || 'Zoo%20Modeling%20App' }}
@@ -283,37 +214,17 @@ jobs:
 
       - uses: actions/download-artifact@v3
         with:
-          name: out-arm64-win
+          name: out-windows-2022
           path: out
 
       - uses: actions/download-artifact@v3
         with:
-          name: out-x64-win
+          name: out-macos-14
           path: out
 
       - uses: actions/download-artifact@v3
         with:
-          name: out-arm64-mac
-          path: out
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: out-x64-mac
-          path: out
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: out-arm64-linux
-          path: out
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: out-x64-linux
-          path: out
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: out-yml
+          name: out-ubuntu-22.04
           path: out
 
       - name: Generate the download static endpoint

.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 --workspace --features disable-println --features pyo3 --features cli
+          cargo check --all --features disable-println --features pyo3 --features cli

.github/workflows/cargo-test.yml

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

.nvmrc

@@ -1 +1 @@
-v21.7.3
+v21.7.1

README.md

@@ -158,29 +158,11 @@ The PR may then serve as a place to discuss the human-readable changelog and ext
 
 #### 3. Manually test artifacts from the Cut Release PR
 
-##### Release builds
-
-The release builds can be found under the `out-{platform}` zip, at the very bottom of the `build-publish-apps` summary page for each commit on this branch.
+The release builds can be find under the `artifact` zip, at the very bottom of the `ci` action page for each commit on this branch.
 
 Manually test against this [list](https://github.com/KittyCAD/modeling-app/issues/3588) across Windows, MacOS, Linux and posting results as comments in the Cut Release PR.
 
-##### Updater-test builds
-
-The other `build-publish-apps` output in Cut Release PRs is `updater-test-{platform}`. As we don't have a way to test this fully automatically, we have a semi-automated process. For macOS, Windows, and Linux, download the corresponding updater-test artifact file, install the app, run it, expect an updater prompt to a dummy v0.255.255, install it and check that the app comes back at that version. 
-
-The only difference with these builds is that they point to a different update location on the release bucket, with this dummy v0.255.255 always available. This helps ensuring that the version we release will be able to update to the next one available.
-
-If the prompt doesn't show up, start the app in command line to grab the electron-updater logs. This is likely an issue with the current build that needs addressing (or the updater-test location in the storage bucket).
-```
-# Windows (PowerShell)
-& 'C:\Program Files\Zoo Modeling App\Zoo Modeling App.exe'
-
-# macOS
-/Applications/Zoo\ Modeling\ App.app/Contents/MacOS/Zoo\ Modeling\ App
-
-# Linux
-./Zoo Modeling App-{version}-{arch}-linux.AppImage
-```
+The other `ci` output in Cut Release PRs is `updater-test`, because we don't have a way to test this fully automated, we have a semi-automated process. Download updater-test zip file, install the app, run it, expect an updater prompt to a dummy v0.99.99, install it and check that the app comes back at that version (on both macOS and Windows).
 
 #### 4. Merge the Cut Release PR
 

docs/kcl/index.md

@@ -74,12 +74,10 @@ layout: manual
 * [`patternTransform`](kcl/patternTransform)
 * [`pi`](kcl/pi)
 * [`polar`](kcl/polar)
-* [`polygon`](kcl/polygon)
 * [`pow`](kcl/pow)
 * [`profileStart`](kcl/profileStart)
 * [`profileStartX`](kcl/profileStartX)
 * [`profileStartY`](kcl/profileStartY)
-* [`push`](kcl/push)
 * [`reduce`](kcl/reduce)
 * [`rem`](kcl/rem)
 * [`revolve`](kcl/revolve)

docs/kcl/types/BinaryPart.md

@@ -23,11 +23,11 @@ layout: manual
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: `Literal`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `value` |[`LiteralValue`](/docs/kcl/types/LiteralValue)|  | No |
 | `raw` |`string`|  | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 
 ----
@@ -43,10 +43,10 @@ layout: manual
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: [`Identifier`](/docs/kcl/types/Identifier)|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `name` |`string`|  | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 
 ----
@@ -62,12 +62,12 @@ layout: manual
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: `BinaryExpression`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `operator` |[`BinaryOperator`](/docs/kcl/types/BinaryOperator)|  | No |
 | `left` |[`BinaryPart`](/docs/kcl/types/BinaryPart)|  | No |
 | `right` |[`BinaryPart`](/docs/kcl/types/BinaryPart)|  | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 
 ----
@@ -83,12 +83,12 @@ layout: manual
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: `CallExpression`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `callee` |[`Identifier`](/docs/kcl/types/Identifier)|  | No |
 | `arguments` |`[` [`Expr`](/docs/kcl/types/Expr) `]`|  | No |
 | `optional` |`boolean`|  | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 
 ----
@@ -104,11 +104,11 @@ layout: manual
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: `UnaryExpression`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `operator` |[`UnaryOperator`](/docs/kcl/types/UnaryOperator)|  | No |
 | `argument` |[`BinaryPart`](/docs/kcl/types/BinaryPart)|  | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 
 ----
@@ -124,12 +124,12 @@ layout: manual
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: `MemberExpression`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `object` |[`MemberObject`](/docs/kcl/types/MemberObject)|  | No |
 | `property` |[`LiteralIdentifier`](/docs/kcl/types/LiteralIdentifier)|  | No |
 | `computed` |`boolean`|  | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 
 ----
@@ -145,13 +145,13 @@ layout: manual
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: `IfExpression`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `cond` |[`Expr`](/docs/kcl/types/Expr)|  | No |
 | `then_val` |[`Program`](/docs/kcl/types/Program)|  | No |
 | `else_ifs` |`[` [`ElseIf`](/docs/kcl/types/ElseIf) `]`|  | No |
 | `final_else` |[`Program`](/docs/kcl/types/Program)|  | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 
 ----

docs/kcl/types/BodyItem.md

@@ -23,12 +23,12 @@ layout: manual
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: `ImportStatement`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `items` |`[` [`ImportItem`](/docs/kcl/types/ImportItem) `]`|  | No |
 | `path` |`string`|  | No |
 | `raw_path` |`string`|  | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 
 ----
@@ -44,10 +44,10 @@ layout: manual
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: `ExpressionStatement`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `expression` |[`Expr`](/docs/kcl/types/Expr)|  | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 
 ----
@@ -63,12 +63,12 @@ layout: manual
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: `VariableDeclaration`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `declarations` |`[` [`VariableDeclarator`](/docs/kcl/types/VariableDeclarator) `]`|  | No |
 | `visibility` |[`ItemVisibility`](/docs/kcl/types/ItemVisibility)|  | No |
 | `kind` |[`VariableKind`](/docs/kcl/types/VariableKind)|  | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 
 ----
@@ -84,10 +84,10 @@ layout: manual
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: `ReturnStatement`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `argument` |[`Expr`](/docs/kcl/types/Expr)|  | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 
 ----

docs/kcl/types/ElseIf.md

@@ -15,10 +15,10 @@ layout: manual
 
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `cond` |[`Expr`](/docs/kcl/types/Expr)|  | No |
 | `then_val` |[`Program`](/docs/kcl/types/Program)|  | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 

docs/kcl/types/Environment.md

@@ -16,6 +16,6 @@ layout: manual
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `bindings` |`object`|  | No |
-| `parent` |`integer`|  | No |
+| `parent` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 

docs/kcl/types/Expr.md

@@ -24,11 +24,11 @@ An expression can be evaluated to yield a single KCL value.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: `Literal`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `value` |[`LiteralValue`](/docs/kcl/types/LiteralValue)| An expression can be evaluated to yield a single KCL value. | No |
 | `raw` |`string`|  | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 
 ----
@@ -44,10 +44,10 @@ An expression can be evaluated to yield a single KCL value.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: [`Identifier`](/docs/kcl/types/Identifier)|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `name` |`string`|  | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 
 ----
@@ -63,10 +63,10 @@ An expression can be evaluated to yield a single KCL value.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: [`TagDeclarator`](/docs/kcl/types#tag-declaration)|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `value` |`string`|  | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 
 ----
@@ -82,12 +82,12 @@ An expression can be evaluated to yield a single KCL value.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: `BinaryExpression`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `operator` |[`BinaryOperator`](/docs/kcl/types/BinaryOperator)| An expression can be evaluated to yield a single KCL value. | No |
 | `left` |[`BinaryPart`](/docs/kcl/types/BinaryPart)| An expression can be evaluated to yield a single KCL value. | No |
 | `right` |[`BinaryPart`](/docs/kcl/types/BinaryPart)| An expression can be evaluated to yield a single KCL value. | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 
 ----
@@ -103,11 +103,11 @@ An expression can be evaluated to yield a single KCL value.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: [`FunctionExpression`](/docs/kcl/types/FunctionExpression)|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `params` |`[` [`Parameter`](/docs/kcl/types/Parameter) `]`|  | No |
 | `body` |[`Program`](/docs/kcl/types/Program)| An expression can be evaluated to yield a single KCL value. | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 
 ----
@@ -123,12 +123,12 @@ An expression can be evaluated to yield a single KCL value.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: `CallExpression`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `callee` |[`Identifier`](/docs/kcl/types/Identifier)| An expression can be evaluated to yield a single KCL value. | No |
 | `arguments` |`[` [`Expr`](/docs/kcl/types/Expr) `]`|  | No |
 | `optional` |`boolean`|  | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 
 ----
@@ -144,11 +144,11 @@ An expression can be evaluated to yield a single KCL value.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: `PipeExpression`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `body` |`[` [`Expr`](/docs/kcl/types/Expr) `]`|  | No |
 | `nonCodeMeta` |[`NonCodeMeta`](/docs/kcl/types/NonCodeMeta)| An expression can be evaluated to yield a single KCL value. | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 
 ----
@@ -164,9 +164,9 @@ An expression can be evaluated to yield a single KCL value.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: `PipeSubstitution`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 
 ----
@@ -182,11 +182,11 @@ An expression can be evaluated to yield a single KCL value.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: `ArrayExpression`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `elements` |`[` [`Expr`](/docs/kcl/types/Expr) `]`|  | No |
 | `nonCodeMeta` |[`NonCodeMeta`](/docs/kcl/types/NonCodeMeta)| An expression can be evaluated to yield a single KCL value. | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 
 ----
@@ -202,12 +202,12 @@ An expression can be evaluated to yield a single KCL value.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: `ArrayRangeExpression`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `startElement` |[`Expr`](/docs/kcl/types/Expr)| An expression can be evaluated to yield a single KCL value. | No |
 | `endElement` |[`Expr`](/docs/kcl/types/Expr)| An expression can be evaluated to yield a single KCL value. | No |
 | `endInclusive` |`boolean`| Is the `end_element` included in the range? | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 
 ----
@@ -223,11 +223,11 @@ An expression can be evaluated to yield a single KCL value.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: `ObjectExpression`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `properties` |`[` [`ObjectProperty`](/docs/kcl/types/ObjectProperty) `]`|  | No |
 | `nonCodeMeta` |[`NonCodeMeta`](/docs/kcl/types/NonCodeMeta)| An expression can be evaluated to yield a single KCL value. | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 
 ----
@@ -243,12 +243,12 @@ An expression can be evaluated to yield a single KCL value.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: `MemberExpression`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `object` |[`MemberObject`](/docs/kcl/types/MemberObject)| An expression can be evaluated to yield a single KCL value. | No |
 | `property` |[`LiteralIdentifier`](/docs/kcl/types/LiteralIdentifier)| An expression can be evaluated to yield a single KCL value. | No |
 | `computed` |`boolean`|  | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 
 ----
@@ -264,11 +264,11 @@ An expression can be evaluated to yield a single KCL value.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: `UnaryExpression`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `operator` |[`UnaryOperator`](/docs/kcl/types/UnaryOperator)| An expression can be evaluated to yield a single KCL value. | No |
 | `argument` |[`BinaryPart`](/docs/kcl/types/BinaryPart)| An expression can be evaluated to yield a single KCL value. | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 
 ----
@@ -284,13 +284,13 @@ An expression can be evaluated to yield a single KCL value.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: `IfExpression`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `cond` |[`Expr`](/docs/kcl/types/Expr)| An expression can be evaluated to yield a single KCL value. | No |
 | `then_val` |[`Program`](/docs/kcl/types/Program)| An expression can be evaluated to yield a single KCL value. | No |
 | `else_ifs` |`[` [`ElseIf`](/docs/kcl/types/ElseIf) `]`|  | No |
 | `final_else` |[`Program`](/docs/kcl/types/Program)| An expression can be evaluated to yield a single KCL value. | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 
 ----
@@ -307,8 +307,8 @@ KCL value for an optional parameter which was not given an argument. (remember,
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: `None`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 
 ----

docs/kcl/types/FunctionExpression.md

@@ -15,10 +15,10 @@ layout: manual
 
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `params` |`[` [`Parameter`](/docs/kcl/types/Parameter) `]`|  | No |
 | `body` |[`Program`](/docs/kcl/types/Program)|  | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 

docs/kcl/types/Identifier.md

@@ -15,9 +15,9 @@ layout: manual
 
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `name` |`string`|  | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 

docs/kcl/types/ImportItem.md

@@ -17,8 +17,8 @@ layout: manual
 |----------|------|-------------|----------|
 | `name` |[`Identifier`](/docs/kcl/types/Identifier)| Name of the item to import. | No |
 | `alias` |[`Identifier`](/docs/kcl/types/Identifier)| Rename the item using an identifier after "as". | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 

docs/kcl/types/KclValue.md

@@ -59,10 +59,10 @@ Any KCL value.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: [`TagDeclarator`](/docs/kcl/types#tag-declaration)|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `value` |`string`|  | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 
 ----

docs/kcl/types/LiteralIdentifier.md

@@ -23,10 +23,10 @@ layout: manual
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: [`Identifier`](/docs/kcl/types/Identifier)|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `name` |`string`|  | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 
 ----
@@ -42,11 +42,11 @@ layout: manual
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: `Literal`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `value` |[`LiteralValue`](/docs/kcl/types/LiteralValue)|  | No |
 | `raw` |`string`|  | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 
 ----

docs/kcl/types/MemberObject.md

@@ -23,12 +23,12 @@ layout: manual
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: `MemberExpression`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `object` |[`MemberObject`](/docs/kcl/types/MemberObject)|  | No |
 | `property` |[`LiteralIdentifier`](/docs/kcl/types/LiteralIdentifier)|  | No |
 | `computed` |`boolean`|  | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 
 ----
@@ -44,10 +44,10 @@ layout: manual
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: [`Identifier`](/docs/kcl/types/Identifier)|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `name` |`string`|  | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 
 ----

docs/kcl/types/NonCodeMeta.md

@@ -16,7 +16,7 @@ layout: manual
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `nonCodeNodes` |`object`|  | No |
-| `startNodes` |`[` [`NonCodeNode`](/docs/kcl/types/NonCodeNode) `]`|  | No |
+| `start` |`[` [`NonCodeNode`](/docs/kcl/types/NonCodeNode) `]`|  | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
 
 

docs/kcl/types/NonCodeNode.md

@@ -15,9 +15,9 @@ layout: manual
 
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `value` |[`NonCodeValue`](/docs/kcl/types/NonCodeValue)|  | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 

docs/kcl/types/ObjectProperty.md

@@ -15,10 +15,10 @@ layout: manual
 
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `key` |[`Identifier`](/docs/kcl/types/Identifier)|  | No |
 | `value` |[`Expr`](/docs/kcl/types/Expr)|  | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 

docs/kcl/types/Path.md

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

docs/kcl/types/PolygonData.md

@@ -1,24 +0,0 @@
----
-title: "PolygonData"
-excerpt: "Data for drawing a polygon"
-layout: manual
----
-
-Data for drawing a polygon
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `radius` |`number`| The radius of the polygon | No |
-| `numSides` |`integer`| The number of sides in the polygon | No |
-| `center` |`[number, number]`| The center point of the polygon | No |
-| `inscribed` |`boolean`| Whether the polygon is inscribed (true) or circumscribed (false) about a circle with the specified radius | No |
-
-

docs/kcl/types/Program.md

@@ -16,10 +16,10 @@ A KCL program top level, or function body.
 
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `body` |`[` [`BodyItem`](/docs/kcl/types/BodyItem) `]`|  | No |
 | `nonCodeMeta` |[`NonCodeMeta`](/docs/kcl/types/NonCodeMeta)| A KCL program top level, or function body. | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 

docs/kcl/types/ProgramMemory.md

@@ -16,7 +16,7 @@ layout: manual
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `environments` |`[` [`Environment`](/docs/kcl/types/Environment) `]`|  | No |
-| `currentEnv` |`integer`|  | No |
+| `currentEnv` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `return` |[`KclValue`](/docs/kcl/types/KclValue)|  | No |
 
 

docs/kcl/types/Sketch.md

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

docs/kcl/types/SketchSet.md

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

docs/kcl/types/TagEngineInfo.md

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

docs/kcl/types/VariableDeclarator.md

@@ -15,10 +15,10 @@ layout: manual
 
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `id` |[`Identifier`](/docs/kcl/types/Identifier)| The identifier of the variable. | No |
 | `init` |[`Expr`](/docs/kcl/types/Expr)| The value of the variable. | No |
 | `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
 
 

e2e/playwright/basic-sketch.spec.ts

@@ -86,7 +86,7 @@ async function doBasicSketch(page: Page, openPanes: string[]) {
   |> startProfileAt(${commonPoints.startAt}, %)
   |> line([${commonPoints.num1}, 0], %)
   |> line([0, ${commonPoints.num1 + 0.01}], %)
-  |> lineTo([0, ${commonPoints.num3}], %)`)
+  |> line([-${commonPoints.num2}, 0], %)`)
   }
 
   // deselect line tool

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

@@ -313,45 +313,3 @@ test(
     await electronApp.close()
   }
 )
-
-test(
-  'external change of file contents are reflected in editor',
-  { tag: '@electron' },
-  async ({ browserName }, testInfo) => {
-    const PROJECT_DIR_NAME = 'lee-was-here'
-    const {
-      electronApp,
-      page,
-      dir: projectsDir,
-    } = await setupElectron({
-      testInfo,
-      folderSetupFn: async (dir) => {
-        const aProjectDir = join(dir, PROJECT_DIR_NAME)
-        await fsp.mkdir(aProjectDir, { recursive: true })
-      },
-    })
-
-    const u = await getUtils(page)
-    await page.setViewportSize({ width: 1200, height: 500 })
-
-    await test.step('Open the project', async () => {
-      await expect(page.getByText(PROJECT_DIR_NAME)).toBeVisible()
-      await page.getByText(PROJECT_DIR_NAME).click()
-      await u.waitForPageLoad()
-    })
-
-    await u.openFilePanel()
-    await u.openKclCodePanel()
-
-    await test.step('Write to file externally and check for changed content', async () => {
-      const content = 'ha he ho ho ha blap scap be dap'
-      await fsp.writeFile(
-        join(projectsDir, PROJECT_DIR_NAME, 'main.kcl'),
-        content
-      )
-      await u.editorTextMatches(content)
-    })
-
-    await electronApp.close()
-  }
-)

e2e/playwright/desktop-export.spec.ts

@@ -104,7 +104,7 @@ test(
             },
             { timeout: 15_000 }
           )
-          .toBeGreaterThan(300_000)
+          .toBe(431341)
 
         // clean up output.gltf
         await fsp.rm('output.gltf')
@@ -179,7 +179,7 @@ test(
             },
             { timeout: 15_000 }
           )
-          .toBeGreaterThan(100_000)
+          .toBe(102040)
 
         // clean up output.gltf
         await fsp.rm('output.gltf')

e2e/playwright/editor-tests.spec.ts

@@ -1,16 +1,6 @@
 import { test, expect } from '@playwright/test'
-import fsp from 'fs/promises'
 import { uuidv4 } from 'lib/utils'
-import {
-  darkModeBgColor,
-  darkModePlaneColorXZ,
-  executorInputPath,
-  getUtils,
-  setup,
-  setupElectron,
-  tearDown,
-} from './test-utils'
-import { join } from 'path'
+import { getUtils, setup, tearDown } from './test-utils'
 
 test.beforeEach(async ({ context, page }, testInfo) => {
   await setup(context, page, testInfo)
@@ -984,84 +974,4 @@ test.describe('Editor tests', () => {
     |> close(%)
     |> extrude(5, %)`)
   })
-
-  test(
-    `Can use the import stdlib function on a local OBJ file`,
-    { tag: '@electron' },
-    async ({ browserName }, testInfo) => {
-      const { electronApp, page } = await setupElectron({
-        testInfo,
-        folderSetupFn: async (dir) => {
-          const bracketDir = join(dir, 'cube')
-          await fsp.mkdir(bracketDir, { recursive: true })
-          await fsp.copyFile(
-            executorInputPath('cube.obj'),
-            join(bracketDir, 'cube.obj')
-          )
-          await fsp.writeFile(join(bracketDir, 'main.kcl'), '')
-        },
-      })
-      const viewportSize = { width: 1200, height: 500 }
-      await page.setViewportSize(viewportSize)
-
-      // Locators and constants
-      const u = await getUtils(page)
-      const projectLink = page.getByRole('link', { name: 'cube' })
-      const gizmo = page.locator('[aria-label*=gizmo]')
-      const resetCameraButton = page.getByRole('button', { name: 'Reset view' })
-      const locationToHavColor = async (
-        position: { x: number; y: number },
-        color: [number, number, number]
-      ) => {
-        return u.getGreatestPixDiff(position, color)
-      }
-      const notTheOrigin = {
-        x: viewportSize.width * 0.55,
-        y: viewportSize.height * 0.3,
-      }
-      const origin = { x: viewportSize.width / 2, y: viewportSize.height / 2 }
-      const errorIndicators = page.locator('.cm-lint-marker-error')
-
-      await test.step(`Open the empty file, see the default planes`, async () => {
-        await projectLink.click()
-        await u.waitForPageLoad()
-        await expect
-          .poll(
-            async () => locationToHavColor(notTheOrigin, darkModePlaneColorXZ),
-            {
-              timeout: 5000,
-              message: 'XZ plane color is visible',
-            }
-          )
-          .toBeLessThan(15)
-      })
-      await test.step(`Write the import function line`, async () => {
-        await u.codeLocator.fill(`import('cube.obj')`)
-        await page.waitForTimeout(800)
-      })
-      await test.step(`Reset the camera before checking`, async () => {
-        await u.doAndWaitForCmd(async () => {
-          await gizmo.click({ button: 'right' })
-          await resetCameraButton.click()
-        }, 'zoom_to_fit')
-      })
-      await test.step(`Verify that we see the imported geometry and no errors`, async () => {
-        await expect(errorIndicators).toHaveCount(0)
-        await expect
-          .poll(async () => locationToHavColor(origin, darkModePlaneColorXZ), {
-            timeout: 3000,
-            message: 'Plane color should not be visible',
-          })
-          .toBeGreaterThan(15)
-        await expect
-          .poll(async () => locationToHavColor(origin, darkModeBgColor), {
-            timeout: 3000,
-            message: 'Background color should not be visible',
-          })
-          .toBeGreaterThan(15)
-      })
-
-      await electronApp.close()
-    }
-  )
 })

e2e/playwright/file-tree.spec.ts

@@ -3,7 +3,6 @@ import { test, expect } from './fixtures/fixtureSetup'
 import * as fsp from 'fs/promises'
 import * as fs from 'fs'
 import {
-  createProject,
   executorInputPath,
   getUtils,
   setup,
@@ -115,15 +114,20 @@ test.describe('when using the file tree to', () => {
     async ({ browser: _, tronApp }, testInfo) => {
       await tronApp.initialise()
 
-      const { panesOpen, pasteCodeInEditor, renameFile, editorTextMatches } =
-        await getUtils(tronApp.page, test)
+      const {
+        panesOpen,
+        createAndSelectProject,
+        pasteCodeInEditor,
+        renameFile,
+        editorTextMatches,
+      } = await getUtils(tronApp.page, test)
 
       await tronApp.page.setViewportSize({ width: 1200, height: 500 })
       tronApp.page.on('console', console.log)
 
       await panesOpen(['files', 'code'])
 
-      await createProject({ name: 'project-000', page: tronApp.page })
+      await createAndSelectProject('project-000')
 
       // File the main.kcl with contents
       const kclCube = await fsp.readFile(
@@ -132,9 +136,6 @@ test.describe('when using the file tree to', () => {
       )
       await pasteCodeInEditor(kclCube)
 
-      // TODO: We have a timeout of 1s between edits to write to disk. If you reload the page too quickly it won't write to disk.
-      await tronApp.page.waitForTimeout(2000)
-
       await renameFile(fromFile, toFile)
       await tronApp.page.reload()
 
@@ -163,14 +164,15 @@ test.describe('when using the file tree to', () => {
     async ({ browser: _, tronApp }, testInfo) => {
       await tronApp.initialise()
 
-      const { panesOpen, createNewFile } = await getUtils(tronApp.page, test)
+      const { panesOpen, createAndSelectProject, createNewFile } =
+        await getUtils(tronApp.page, test)
 
       await tronApp.page.setViewportSize({ width: 1200, height: 500 })
       tronApp.page.on('console', console.log)
 
       await panesOpen(['files'])
 
-      await createProject({ name: 'project-000', page: tronApp.page })
+      await createAndSelectProject('project-000')
 
       await createNewFile('')
       await createNewFile('')
@@ -193,74 +195,57 @@ test.describe('when using the file tree to', () => {
   test(
     'create a new file with the same name as an existing file cancels the operation',
     { tag: '@electron' },
-    async (
-      { browser: _, tronApp, homePage, scene, editor, toolbar },
-      testInfo
-    ) => {
-      const projectName = 'cube'
-      const mainFile = 'main.kcl'
-      const secondFile = 'cylinder.kcl'
-      const kclCube = await fsp.readFile(executorInputPath('cube.kcl'), 'utf-8')
-      const kclCylinder = await fsp.readFile(
-        executorInputPath('cylinder.kcl'),
-        'utf-8'
-      )
-      await tronApp.initialise({
-        fixtures: { homePage, scene, editor, toolbar },
-        folderSetupFn: async (dir) => {
-          const cubeDir = join(dir, projectName)
-          await fsp.mkdir(cubeDir, { recursive: true })
-          await fsp.copyFile(
-            executorInputPath('cube.kcl'),
-            join(cubeDir, mainFile)
-          )
-          await fsp.copyFile(
-            executorInputPath('cylinder.kcl'),
-            join(cubeDir, secondFile)
-          )
-        },
-      })
+    async ({ browser: _, tronApp }, testInfo) => {
+      await tronApp.initialise()
 
       const {
+        openKclCodePanel,
         openFilePanel,
+        createAndSelectProject,
+        pasteCodeInEditor,
+        createNewFileAndSelect,
         renameFile,
         selectFile,
         editorTextMatches,
-        waitForPageLoad,
       } = await getUtils(tronApp.page, _test)
 
-      await test.step(`Setup: Open project and navigate to ${secondFile}`, async () => {
-        await homePage.expectState({
-          projectCards: [
-            {
-              title: projectName,
-              fileCount: 2,
-              folderCount: 2, // TODO: This is a pre-existing bug, there are no folders within the project
-            },
-          ],
-          sortBy: 'last-modified-desc',
-        })
-        await homePage.openProject(projectName)
-        await waitForPageLoad()
-        await openFilePanel()
-        await selectFile(secondFile)
-      })
+      await tronApp.page.setViewportSize({ width: 1200, height: 500 })
+      tronApp.page.on('console', console.log)
 
-      await test.step(`Attempt to rename ${secondFile} to ${mainFile}`, async () => {
-        await renameFile(secondFile, mainFile)
-      })
+      await createAndSelectProject('project-000')
+      await openKclCodePanel()
+      await openFilePanel()
+      // 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 test.step(`Postcondition: ${mainFile} still has the original content`, async () => {
-        await selectFile(mainFile)
+      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 tronApp.page.waitForTimeout(500)
 
-      await test.step(`Postcondition: ${secondFile} still exists with the original content`, async () => {
-        await selectFile(secondFile)
+      await test.step(`Postcondition: ${kcl2} still exists with the original content`, async () => {
+        await selectFile(kcl2)
         await editorTextMatches(kclCylinder)
       })
 
-      await tronApp.close()
+      await tronApp?.close?.()
     }
   )
 
@@ -270,15 +255,20 @@ test.describe('when using the file tree to', () => {
     async ({ browser: _, tronApp }, testInfo) => {
       await tronApp.initialise()
 
-      const { panesOpen, pasteCodeInEditor, deleteFile, editorTextMatches } =
-        await getUtils(tronApp.page, _test)
+      const {
+        panesOpen,
+        createAndSelectProject,
+        pasteCodeInEditor,
+        deleteFile,
+        editorTextMatches,
+      } = await getUtils(tronApp.page, _test)
 
       await tronApp.page.setViewportSize({ width: 1200, height: 500 })
       tronApp.page.on('console', console.log)
 
       await panesOpen(['files', 'code'])
 
-      await createProject({ name: 'project-000', page: tronApp.page })
+      await createAndSelectProject('project-000')
       // File the main.kcl with contents
       const kclCube = await fsp.readFile(
         'src/wasm-lib/tests/executor/inputs/cube.kcl',
@@ -286,11 +276,11 @@ test.describe('when using the file tree to', () => {
       )
       await pasteCodeInEditor(kclCube)
 
-      const mainFile = 'main.kcl'
+      const kcl1 = 'main.kcl'
 
-      await deleteFile(mainFile)
+      await deleteFile(kcl1)
 
-      await test.step(`Postcondition: ${mainFile} is recreated but has no content`, async () => {
+      await test.step(`Postcondition: ${kcl1} is recreated but has no content`, async () => {
         await editorTextMatches('')
       })
 
@@ -308,6 +298,7 @@ test.describe('when using the file tree to', () => {
 
       const {
         panesOpen,
+        createAndSelectProject,
         pasteCodeInEditor,
         createNewFile,
         openDebugPanel,
@@ -319,7 +310,7 @@ test.describe('when using the file tree to', () => {
       tronApp.page.on('console', console.log)
 
       await panesOpen(['files', 'code'])
-      await createProject({ name: 'project-000', page: tronApp.page })
+      await createAndSelectProject('project-000')
 
       // Create a small file
       const kclCube = await fsp.readFile(
@@ -723,7 +714,7 @@ _test.describe('Renaming in the file tree', () => {
       })
 
       await _test.step('Rename the folder', async () => {
-        await page.waitForTimeout(1000)
+        await page.waitForTimeout(60000)
         await folderToRename.click({ button: 'right' })
         await _expect(renameMenuItem).toBeVisible()
         await renameMenuItem.click()
@@ -969,171 +960,4 @@ _test.describe('Deleting items from the file pane', () => {
     'TODO - delete folder we are in, with no main.kcl',
     async () => {}
   )
-
-  // Copied from tests above.
-  _test(
-    `external deletion of project navigates back home`,
-    { tag: '@electron' },
-    async ({ browserName }, testInfo) => {
-      const TEST_PROJECT_NAME = 'Test Project'
-      const {
-        electronApp,
-        page,
-        dir: projectsDirName,
-      } = await setupElectron({
-        testInfo,
-        folderSetupFn: async (dir) => {
-          await fsp.mkdir(join(dir, TEST_PROJECT_NAME), { recursive: true })
-          await fsp.mkdir(join(dir, TEST_PROJECT_NAME, 'folderToDelete'), {
-            recursive: true,
-          })
-          await fsp.copyFile(
-            executorInputPath('basic_fillet_cube_end.kcl'),
-            join(dir, TEST_PROJECT_NAME, 'main.kcl')
-          )
-          await fsp.copyFile(
-            executorInputPath('cylinder.kcl'),
-            join(dir, TEST_PROJECT_NAME, 'folderToDelete', 'someFileWithin.kcl')
-          )
-        },
-      })
-      const u = await getUtils(page)
-      await page.setViewportSize({ width: 1200, height: 500 })
-
-      // Constants and locators
-      const projectCard = page.getByText(TEST_PROJECT_NAME)
-      const projectMenuButton = page.getByTestId('project-sidebar-toggle')
-      const folderToDelete = page.getByRole('button', {
-        name: 'folderToDelete',
-      })
-      const fileWithinFolder = page.getByRole('listitem').filter({
-        has: page.getByRole('button', { name: 'someFileWithin.kcl' }),
-      })
-
-      await _test.step(
-        'Open project and navigate into folderToDelete',
-        async () => {
-          await projectCard.click()
-          await u.waitForPageLoad()
-          await _expect(projectMenuButton).toContainText('main.kcl')
-          await u.closeKclCodePanel()
-          await u.openFilePanel()
-
-          await folderToDelete.click()
-          await _expect(fileWithinFolder).toBeVisible()
-          await fileWithinFolder.click()
-          await _expect(projectMenuButton).toContainText('someFileWithin.kcl')
-        }
-      )
-
-      // Point of divergence. Delete the project folder and see if it goes back
-      // to the home view.
-      await _test.step(
-        'Delete projectsDirName/<project-name> externally',
-        async () => {
-          await fsp.rm(join(projectsDirName, TEST_PROJECT_NAME), {
-            recursive: true,
-            force: true,
-          })
-        }
-      )
-
-      await _test.step('Check the app is back on the home view', async () => {
-        const projectsDirLink = page.getByText('Loaded from')
-        await _expect(projectsDirLink).toBeVisible()
-      })
-
-      await electronApp.close()
-    }
-  )
-
-  // Similar to the above
-  _test(
-    `external deletion of file in sub-directory updates the file tree and recreates it on code editor typing`,
-    { tag: '@electron' },
-    async ({ browserName }, testInfo) => {
-      const TEST_PROJECT_NAME = 'Test Project'
-      const {
-        electronApp,
-        page,
-        dir: projectsDirName,
-      } = await setupElectron({
-        testInfo,
-        folderSetupFn: async (dir) => {
-          await fsp.mkdir(join(dir, TEST_PROJECT_NAME), { recursive: true })
-          await fsp.mkdir(join(dir, TEST_PROJECT_NAME, 'folderToDelete'), {
-            recursive: true,
-          })
-          await fsp.copyFile(
-            executorInputPath('basic_fillet_cube_end.kcl'),
-            join(dir, TEST_PROJECT_NAME, 'main.kcl')
-          )
-          await fsp.copyFile(
-            executorInputPath('cylinder.kcl'),
-            join(dir, TEST_PROJECT_NAME, 'folderToDelete', 'someFileWithin.kcl')
-          )
-        },
-      })
-      const u = await getUtils(page)
-      await page.setViewportSize({ width: 1200, height: 500 })
-
-      // Constants and locators
-      const projectCard = page.getByText(TEST_PROJECT_NAME)
-      const projectMenuButton = page.getByTestId('project-sidebar-toggle')
-      const folderToDelete = page.getByRole('button', {
-        name: 'folderToDelete',
-      })
-      const fileWithinFolder = page.getByRole('listitem').filter({
-        has: page.getByRole('button', { name: 'someFileWithin.kcl' }),
-      })
-
-      await _test.step(
-        'Open project and navigate into folderToDelete',
-        async () => {
-          await projectCard.click()
-          await u.waitForPageLoad()
-          await _expect(projectMenuButton).toContainText('main.kcl')
-
-          await u.openFilePanel()
-
-          await folderToDelete.click()
-          await _expect(fileWithinFolder).toBeVisible()
-          await fileWithinFolder.click()
-          await _expect(projectMenuButton).toContainText('someFileWithin.kcl')
-        }
-      )
-
-      await _test.step(
-        'Delete projectsDirName/<project-name> externally',
-        async () => {
-          await fsp.rm(
-            join(
-              projectsDirName,
-              TEST_PROJECT_NAME,
-              'folderToDelete',
-              'someFileWithin.kcl'
-            )
-          )
-        }
-      )
-
-      await _test.step('Check the file is gone in the file tree', async () => {
-        await _expect(
-          page.getByTestId('file-pane-scroll-container')
-        ).not.toContainText('someFileWithin.kcl')
-      })
-
-      await _test.step(
-        'Check the file is back in the file tree after typing in code editor',
-        async () => {
-          await u.pasteCodeInEditor('hello = 1')
-          await _expect(
-            page.getByTestId('file-pane-scroll-container')
-          ).toContainText('someFileWithin.kcl')
-        }
-      )
-
-      await electronApp.close()
-    }
-  )
 })

e2e/playwright/fixtures/editorFixture.ts

@@ -1,11 +1,6 @@
 import type { Page, Locator } from '@playwright/test'
 import { expect } from '@playwright/test'
-import {
-  closePane,
-  checkIfPaneIsOpen,
-  openPane,
-  sansWhitespace,
-} from '../test-utils'
+import { sansWhitespace } from '../test-utils'
 
 interface EditorState {
   activeLines: Array<string>
@@ -16,7 +11,6 @@ interface EditorState {
 export class EditorFixture {
   public page: Page
 
-  private paneButtonTestId = 'code-pane-button'
   private diagnosticsTooltip!: Locator
   private diagnosticsGutterIcon!: Locator
   private codeContent!: Locator
@@ -37,32 +31,19 @@ export class EditorFixture {
 
   private _expectEditorToContain =
     (not = false) =>
-    async (
+    (
       code: string,
       {
         shouldNormalise = false,
         timeout = 5_000,
       }: { shouldNormalise?: boolean; timeout?: number } = {}
     ) => {
-      const wasPaneOpen = await this.checkIfPaneIsOpen()
-      if (!wasPaneOpen) {
-        await this.openPane()
-      }
-      const resetPane = async () => {
-        if (!wasPaneOpen) {
-          await this.closePane()
-        }
-      }
       if (!shouldNormalise) {
         const expectStart = expect(this.codeContent)
         if (not) {
-          const result = await expectStart.not.toContainText(code, { timeout })
-          await resetPane()
-          return result
+          return expectStart.not.toContainText(code, { timeout })
         }
-        const result = await expectStart.toContainText(code, { timeout })
-        await resetPane()
-        return result
+        return expectStart.toContainText(code, { timeout })
       }
       const normalisedCode = code.replaceAll(/\s+/g, '').trim()
       const expectStart = expect.poll(
@@ -75,13 +56,9 @@ export class EditorFixture {
         }
       )
       if (not) {
-        const result = await expectStart.not.toContain(normalisedCode)
-        await resetPane()
-        return result
+        return expectStart.not.toContain(normalisedCode)
       }
-      const result = await expectStart.toContain(normalisedCode)
-      await resetPane()
-      return result
+      return expectStart.toContain(normalisedCode)
     }
   expectEditor = {
     toContain: this._expectEditorToContain(),
@@ -138,13 +115,4 @@ export class EditorFixture {
     code = code.replace(findCode, replaceCode)
     await this.codeContent.fill(code)
   }
-  checkIfPaneIsOpen() {
-    return checkIfPaneIsOpen(this.page, this.paneButtonTestId)
-  }
-  closePane() {
-    return closePane(this.page, this.paneButtonTestId)
-  }
-  openPane() {
-    return openPane(this.page, this.paneButtonTestId)
-  }
 }

e2e/playwright/fixtures/fixtureSetup.ts

@@ -20,7 +20,6 @@ export class AuthenticatedApp {
   public readonly page: Page
   public readonly context: BrowserContext
   public readonly testInfo: TestInfo
-  public readonly viewPortSize = { width: 1000, height: 500 }
 
   constructor(context: BrowserContext, page: Page, testInfo: TestInfo) {
     this.page = page
@@ -37,7 +36,7 @@ export class AuthenticatedApp {
       ;(window as any).playwrightSkipFilePicker = true
     }, code)
 
-    await this.page.setViewportSize(this.viewPortSize)
+    await this.page.setViewportSize({ width: 1000, height: 500 })
 
     await u.waitForAuthSkipAppStart()
   }

e2e/playwright/fixtures/sceneFixture.ts

@@ -10,13 +10,7 @@ import {
 } from '../test-utils'
 
 type mouseParams = {
-  pixelDiff?: number
-}
-type mouseDragToParams = mouseParams & {
-  fromPoint: { x: number; y: number }
-}
-type mouseDragFromParams = mouseParams & {
-  toPoint: { x: number; y: number }
+  pixelDiff: number
 }
 
 type SceneSerialised = {
@@ -26,13 +20,6 @@ type SceneSerialised = {
   }
 }
 
-type ClickHandler = (clickParams?: mouseParams) => Promise<void | boolean>
-type MoveHandler = (moveParams?: mouseParams) => Promise<void | boolean>
-type DragToHandler = (dragParams: mouseDragToParams) => Promise<void | boolean>
-type DragFromHandler = (
-  dragParams: mouseDragFromParams
-) => Promise<void | boolean>
-
 export class SceneFixture {
   public page: Page
 
@@ -68,7 +55,7 @@ export class SceneFixture {
     x: number,
     y: number,
     { steps }: { steps: number } = { steps: 20 }
-  ): [ClickHandler, MoveHandler] =>
+  ) =>
     [
       (clickParams?: mouseParams) => {
         if (clickParams?.pixelDiff) {
@@ -91,47 +78,6 @@ export class SceneFixture {
         return this.page.mouse.move(x, y, { steps })
       },
     ] as const
-  makeDragHelpers = (
-    x: number,
-    y: number,
-    { steps }: { steps: number } = { steps: 20 }
-  ): [DragToHandler, DragFromHandler] =>
-    [
-      (dragToParams: mouseDragToParams) => {
-        if (dragToParams?.pixelDiff) {
-          return doAndWaitForImageDiff(
-            this.page,
-            () =>
-              this.page.dragAndDrop('#stream', '#stream', {
-                sourcePosition: dragToParams.fromPoint,
-                targetPosition: { x, y },
-              }),
-            dragToParams.pixelDiff
-          )
-        }
-        return this.page.dragAndDrop('#stream', '#stream', {
-          sourcePosition: dragToParams.fromPoint,
-          targetPosition: { x, y },
-        })
-      },
-      (dragFromParams: mouseDragFromParams) => {
-        if (dragFromParams?.pixelDiff) {
-          return doAndWaitForImageDiff(
-            this.page,
-            () =>
-              this.page.dragAndDrop('#stream', '#stream', {
-                sourcePosition: { x, y },
-                targetPosition: dragFromParams.toPoint,
-              }),
-            dragFromParams.pixelDiff
-          )
-        }
-        return this.page.dragAndDrop('#stream', '#stream', {
-          sourcePosition: { x, y },
-          targetPosition: dragFromParams.toPoint,
-        })
-      },
-    ] as const
 
   /** Likely no where, there's a chance it will click something in the scene, depending what you have in the scene.
    *

e2e/playwright/fixtures/toolbarFixture.ts

@@ -7,7 +7,6 @@ export class ToolbarFixture {
 
   extrudeButton!: Locator
   startSketchBtn!: Locator
-  lineBtn!: Locator
   rectangleBtn!: Locator
   exitSketchBtn!: Locator
   editSketchBtn!: Locator
@@ -25,7 +24,6 @@ export class ToolbarFixture {
     this.page = page
     this.extrudeButton = page.getByTestId('extrude')
     this.startSketchBtn = page.getByTestId('sketch')
-    this.lineBtn = page.getByTestId('line')
     this.rectangleBtn = page.getByTestId('corner-rectangle')
     this.exitSketchBtn = page.getByTestId('sketch-exit')
     this.editSketchBtn = page.getByText('Edit Sketch')

e2e/playwright/onboarding-tests.spec.ts

@@ -7,7 +7,6 @@ import {
   setupElectron,
   tearDown,
   executorInputPath,
-  createProject,
 } from './test-utils'
 import { bracket } from 'lib/exampleKcl'
 import { onboardingPaths } from 'routes/Onboarding/paths'
@@ -56,48 +55,6 @@ test.describe('Onboarding tests', () => {
     await expect(page.locator('.cm-content')).toContainText('// Shelf Bracket')
   })
 
-  test(
-    'Desktop: fresh onboarding executes and loads',
-    { tag: '@electron' },
-    async ({ browserName: _ }, testInfo) => {
-      const { electronApp, page } = await setupElectron({
-        testInfo,
-        appSettings: {
-          app: {
-            onboardingStatus: 'incomplete',
-          },
-        },
-        cleanProjectDir: true,
-      })
-
-      const u = await getUtils(page)
-
-      const viewportSize = { width: 1200, height: 500 }
-      await page.setViewportSize(viewportSize)
-
-      await test.step(`Create a project and open to the onboarding`, async () => {
-        await createProject({ name: 'project-link', page })
-        await test.step(`Ensure the engine connection works by testing the sketch button`, async () => {
-          await u.waitForPageLoad()
-        })
-      })
-
-      await test.step(`Ensure we see the onboarding stuff`, async () => {
-        // Test that the onboarding pane loaded
-        await expect(
-          page.getByText('Welcome to Modeling App! This')
-        ).toBeVisible()
-
-        // *and* that the code is shown in the editor
-        await expect(page.locator('.cm-content')).toContainText(
-          '// Shelf Bracket'
-        )
-      })
-
-      await electronApp.close()
-    }
-  )
-
   test('Code resets after confirmation', async ({ page }) => {
     const initialCode = `sketch001 = startSketchOn('XZ')`
 
@@ -421,9 +378,7 @@ test(
     const restartConfirmationButton = page.getByRole('button', {
       name: 'Make a new project',
     })
-    const tutorialProjectIndicator = page
-      .getByTestId('project-sidebar-toggle')
-      .filter({ hasText: 'Tutorial Project 00' })
+    const tutorialProjectIndicator = page.getByText('Tutorial Project 00')
     const tutorialModalText = page.getByText('Welcome to Modeling App!')
     const tutorialDismissButton = page.getByRole('button', { name: 'Dismiss' })
     const userMenuButton = page.getByTestId('user-sidebar-toggle')

e2e/playwright/point-click.spec.ts

@@ -451,103 +451,3 @@ sketch002 = startSketchOn(extrude001, seg03)
     }
   )
 })
-
-test(`Verify axis and origin snapping`, async ({
-  app,
-  editor,
-  toolbar,
-  scene,
-}) => {
-  // Constants and locators
-  // These are mappings from screenspace to KCL coordinates,
-  // until we merge in our coordinate system helpers
-  const xzPlane = [
-    app.viewPortSize.width * 0.65,
-    app.viewPortSize.height * 0.3,
-  ] as const
-  const originSloppy = {
-    screen: [
-      app.viewPortSize.width / 2 + 3, // 3px off the center of the screen
-      app.viewPortSize.height / 2,
-    ],
-    kcl: [0, 0],
-  } as const
-  const xAxisSloppy = {
-    screen: [
-      app.viewPortSize.width * 0.75,
-      app.viewPortSize.height / 2 - 3, // 3px off the X-axis
-    ],
-    kcl: [16.95, 0],
-  } as const
-  const offYAxis = {
-    screen: [
-      app.viewPortSize.width * 0.6, // Well off the Y-axis, out of snapping range
-      app.viewPortSize.height * 0.3,
-    ],
-    kcl: [6.78, 6.78],
-  } as const
-  const yAxisSloppy = {
-    screen: [
-      app.viewPortSize.width / 2 + 5, // 5px off the Y-axis
-      app.viewPortSize.height * 0.3,
-    ],
-    kcl: [0, 6.78],
-  } as const
-  const [clickOnXzPlane, moveToXzPlane] = scene.makeMouseHelpers(...xzPlane)
-  const [clickOriginSloppy] = scene.makeMouseHelpers(...originSloppy.screen)
-  const [clickXAxisSloppy, moveXAxisSloppy] = scene.makeMouseHelpers(
-    ...xAxisSloppy.screen
-  )
-  const [dragToOffYAxis, dragFromOffAxis] = scene.makeDragHelpers(
-    ...offYAxis.screen
-  )
-
-  const expectedCodeSnippets = {
-    sketchOnXzPlane: `sketch001 = startSketchOn('XZ')`,
-    pointAtOrigin: `startProfileAt([${originSloppy.kcl[0]}, ${originSloppy.kcl[1]}], %)`,
-    segmentOnXAxis: `lineTo([${xAxisSloppy.kcl[0]}, ${xAxisSloppy.kcl[1]}], %)`,
-    afterSegmentDraggedOffYAxis: `startProfileAt([${offYAxis.kcl[0]}, ${offYAxis.kcl[1]}], %)`,
-    afterSegmentDraggedOnYAxis: `startProfileAt([${yAxisSloppy.kcl[0]}, ${yAxisSloppy.kcl[1]}], %)`,
-  }
-
-  await app.initialise()
-
-  await test.step(`Start a sketch on the XZ plane`, async () => {
-    await editor.closePane()
-    await toolbar.startSketchPlaneSelection()
-    await moveToXzPlane()
-    await clickOnXzPlane()
-    // timeout wait for engine animation is unavoidable
-    await app.page.waitForTimeout(600)
-    await editor.expectEditor.toContain(expectedCodeSnippets.sketchOnXzPlane)
-  })
-  await test.step(`Place a point a few pixels off the middle, verify it still snaps to 0,0`, async () => {
-    await clickOriginSloppy()
-    await editor.expectEditor.toContain(expectedCodeSnippets.pointAtOrigin)
-  })
-  await test.step(`Add a segment on x-axis after moving the mouse a bit, verify it snaps`, async () => {
-    await moveXAxisSloppy()
-    await clickXAxisSloppy()
-    await editor.expectEditor.toContain(expectedCodeSnippets.segmentOnXAxis)
-  })
-  await test.step(`Unequip line tool`, async () => {
-    await toolbar.lineBtn.click()
-    await expect(toolbar.lineBtn).not.toHaveAttribute('aria-pressed', 'true')
-  })
-  await test.step(`Drag the origin point up and to the right, verify it's past snapping`, async () => {
-    await dragToOffYAxis({
-      fromPoint: { x: originSloppy.screen[0], y: originSloppy.screen[1] },
-    })
-    await editor.expectEditor.toContain(
-      expectedCodeSnippets.afterSegmentDraggedOffYAxis
-    )
-  })
-  await test.step(`Drag the origin point left to the y-axis, verify it snaps back`, async () => {
-    await dragFromOffAxis({
-      toPoint: { x: yAxisSloppy.screen[0], y: yAxisSloppy.screen[1] },
-    })
-    await editor.expectEditor.toContain(
-      expectedCodeSnippets.afterSegmentDraggedOnYAxis
-    )
-  })
-})

e2e/playwright/projects.spec.ts

@@ -7,7 +7,7 @@ import {
   Paths,
   setupElectron,
   tearDown,
-  createProject,
+  createProjectAndRenameIt,
 } from './test-utils'
 import fsp from 'fs/promises'
 import fs from 'fs'
@@ -255,7 +255,7 @@ test.describe('Can export from electron app', () => {
               },
               { timeout: 15_000 }
             )
-            .toBeGreaterThan(300_000)
+            .toBe(431341)
 
           // clean up output.gltf
           await fsp.rm('output.gltf')
@@ -503,261 +503,21 @@ test(
   }
 )
 
-test.describe(`Project management commands`, () => {
-  test(
-    `Rename from project page`,
-    { tag: '@electron' },
-    async ({ browserName }, testInfo) => {
-      const projectName = `my_project_to_rename`
-      const { electronApp, page } = await setupElectron({
-        testInfo,
-        folderSetupFn: async (dir) => {
-          await fsp.mkdir(`${dir}/${projectName}`, { recursive: true })
-          await fsp.copyFile(
-            'src/wasm-lib/tests/executor/inputs/router-template-slate.kcl',
-            `${dir}/${projectName}/main.kcl`
-          )
-        },
-      })
-      const u = await getUtils(page)
-
-      // Constants and locators
-      const projectHomeLink = page.getByTestId('project-link')
-      const commandButton = page.getByRole('button', { name: 'Commands' })
-      const commandOption = page.getByRole('option', { name: 'rename project' })
-      const projectNameOption = page.getByRole('option', { name: projectName })
-      const projectRenamedName = `project-000`
-      // const projectMenuButton = page.getByTestId('project-sidebar-toggle')
-      const commandContinueButton = page.getByRole('button', {
-        name: 'Continue',
-      })
-      const commandSubmitButton = page.getByRole('button', {
-        name: 'Submit command',
-      })
-      const toastMessage = page.getByText(`Successfully renamed`)
-
-      await test.step(`Setup`, async () => {
-        await page.setViewportSize({ width: 1200, height: 500 })
-        page.on('console', console.log)
-
-        await projectHomeLink.click()
-        await u.waitForPageLoad()
-      })
-
-      await test.step(`Run rename command via command palette`, async () => {
-        await commandButton.click()
-        await commandOption.click()
-        await projectNameOption.click()
-
-        await expect(commandContinueButton).toBeVisible()
-        await commandContinueButton.click()
-
-        await expect(commandSubmitButton).toBeVisible()
-        await commandSubmitButton.click()
-
-        await expect(toastMessage).toBeVisible()
-      })
-
-      // TODO: in future I'd like the behavior to be to
-      // navigate to the new project's page directly,
-      // see ProjectContextProvider.tsx:158
-      await test.step(`Check the project was renamed and we navigated home`, async () => {
-        await expect(projectHomeLink.first()).toBeVisible()
-        await expect(projectHomeLink.first()).toContainText(projectRenamedName)
-      })
-
-      await electronApp.close()
-    }
-  )
-
-  test(
-    `Delete from project page`,
-    { tag: '@electron' },
-    async ({ browserName: _ }, testInfo) => {
-      const projectName = `my_project_to_delete`
-      const { electronApp, page } = await setupElectron({
-        testInfo,
-        folderSetupFn: async (dir) => {
-          await fsp.mkdir(`${dir}/${projectName}`, { recursive: true })
-          await fsp.copyFile(
-            'src/wasm-lib/tests/executor/inputs/router-template-slate.kcl',
-            `${dir}/${projectName}/main.kcl`
-          )
-        },
-      })
-      const u = await getUtils(page)
-
-      // Constants and locators
-      const projectHomeLink = page.getByTestId('project-link')
-      const commandButton = page.getByRole('button', { name: 'Commands' })
-      const commandOption = page.getByRole('option', { name: 'delete project' })
-      const projectNameOption = page.getByRole('option', { name: projectName })
-      const commandWarning = page.getByText('Are you sure you want to delete?')
-      const commandSubmitButton = page.getByRole('button', {
-        name: 'Submit command',
-      })
-      const toastMessage = page.getByText(`Successfully deleted`)
-      const noProjectsMessage = page.getByText('No Projects found')
-
-      await test.step(`Setup`, async () => {
-        await page.setViewportSize({ width: 1200, height: 500 })
-        page.on('console', console.log)
-
-        await projectHomeLink.click()
-        await u.waitForPageLoad()
-      })
-
-      await test.step(`Run delete command via command palette`, async () => {
-        await commandButton.click()
-        await commandOption.click()
-        await projectNameOption.click()
-
-        await expect(commandWarning).toBeVisible()
-        await expect(commandSubmitButton).toBeVisible()
-        await commandSubmitButton.click()
-
-        await expect(toastMessage).toBeVisible()
-      })
-
-      await test.step(`Check the project was deleted and we navigated home`, async () => {
-        await expect(noProjectsMessage).toBeVisible()
-      })
-
-      await electronApp.close()
-    }
-  )
-  test(
-    `Rename from home page`,
-    { tag: '@electron' },
-    async ({ browserName: _ }, testInfo) => {
-      const projectName = `my_project_to_rename`
-      const { electronApp, page } = await setupElectron({
-        testInfo,
-        folderSetupFn: async (dir) => {
-          await fsp.mkdir(`${dir}/${projectName}`, { recursive: true })
-          await fsp.copyFile(
-            'src/wasm-lib/tests/executor/inputs/router-template-slate.kcl',
-            `${dir}/${projectName}/main.kcl`
-          )
-        },
-      })
-
-      // Constants and locators
-      const projectHomeLink = page.getByTestId('project-link')
-      const commandButton = page.getByRole('button', { name: 'Commands' })
-      const commandOption = page.getByRole('option', { name: 'rename project' })
-      const projectNameOption = page.getByRole('option', { name: projectName })
-      const projectRenamedName = `project-000`
-      const commandContinueButton = page.getByRole('button', {
-        name: 'Continue',
-      })
-      const commandSubmitButton = page.getByRole('button', {
-        name: 'Submit command',
-      })
-      const toastMessage = page.getByText(`Successfully renamed`)
-
-      await test.step(`Setup`, async () => {
-        await page.setViewportSize({ width: 1200, height: 500 })
-        page.on('console', console.log)
-        await expect(projectHomeLink).toBeVisible()
-      })
-
-      await test.step(`Run rename command via command palette`, async () => {
-        await commandButton.click()
-        await commandOption.click()
-        await projectNameOption.click()
-
-        await expect(commandContinueButton).toBeVisible()
-        await commandContinueButton.click()
-
-        await expect(commandSubmitButton).toBeVisible()
-        await commandSubmitButton.click()
-
-        await expect(toastMessage).toBeVisible()
-      })
-
-      await test.step(`Check the project was renamed`, async () => {
-        await expect(
-          page.getByRole('link', { name: projectRenamedName })
-        ).toBeVisible()
-        await expect(projectHomeLink).not.toHaveText(projectName)
-      })
-
-      await electronApp.close()
-    }
-  )
-  test(
-    `Delete from home page`,
-    { tag: '@electron' },
-    async ({ browserName: _ }, testInfo) => {
-      const projectName = `my_project_to_delete`
-      const { electronApp, page } = await setupElectron({
-        testInfo,
-        folderSetupFn: async (dir) => {
-          await fsp.mkdir(`${dir}/${projectName}`, { recursive: true })
-          await fsp.copyFile(
-            'src/wasm-lib/tests/executor/inputs/router-template-slate.kcl',
-            `${dir}/${projectName}/main.kcl`
-          )
-        },
-      })
-
-      // Constants and locators
-      const projectHomeLink = page.getByTestId('project-link')
-      const commandButton = page.getByRole('button', { name: 'Commands' })
-      const commandOption = page.getByRole('option', { name: 'delete project' })
-      const projectNameOption = page.getByRole('option', { name: projectName })
-      const commandWarning = page.getByText('Are you sure you want to delete?')
-      const commandSubmitButton = page.getByRole('button', {
-        name: 'Submit command',
-      })
-      const toastMessage = page.getByText(`Successfully deleted`)
-      const noProjectsMessage = page.getByText('No Projects found')
-
-      await test.step(`Setup`, async () => {
-        await page.setViewportSize({ width: 1200, height: 500 })
-        page.on('console', console.log)
-        await expect(projectHomeLink).toBeVisible()
-      })
-
-      await test.step(`Run delete command via command palette`, async () => {
-        await commandButton.click()
-        await commandOption.click()
-        await projectNameOption.click()
-
-        await expect(commandWarning).toBeVisible()
-        await expect(commandSubmitButton).toBeVisible()
-        await commandSubmitButton.click()
-
-        await expect(toastMessage).toBeVisible()
-      })
-
-      await test.step(`Check the project was deleted`, async () => {
-        await expect(projectHomeLink).not.toBeVisible()
-        await expect(noProjectsMessage).toBeVisible()
-      })
-
-      await electronApp.close()
-    }
-  )
-})
-
 test(
   'File in the file pane should open with a single click',
   { tag: '@electron' },
   async ({ browserName }, testInfo) => {
-    const projectName = 'router-template-slate'
     const { electronApp, page } = await setupElectron({
       testInfo,
       folderSetupFn: async (dir) => {
-        await fsp.mkdir(`${dir}/${projectName}`, { recursive: true })
+        await fsp.mkdir(`${dir}/router-template-slate`, { recursive: true })
         await fsp.copyFile(
           'src/wasm-lib/tests/executor/inputs/router-template-slate.kcl',
-          `${dir}/${projectName}/main.kcl`
+          `${dir}/router-template-slate/main.kcl`
         )
         await fsp.copyFile(
           'src/wasm-lib/tests/executor/inputs/focusrite_scarlett_mounting_braket.kcl',
-          `${dir}/${projectName}/otherThingToClickOn.kcl`
+          `${dir}/router-template-slate/otherThingToClickOn.kcl`
         )
       },
     })
@@ -766,7 +526,7 @@ test(
 
     page.on('console', console.log)
 
-    await page.getByText(projectName).click()
+    await page.getByText('router-template-slate').click()
     await expect(page.getByTestId('loading')).toBeAttached()
     await expect(page.getByTestId('loading')).not.toBeAttached({
       timeout: 20_000,
@@ -883,7 +643,7 @@ test(
     page.on('console', console.log)
 
     await test.step('delete the middle project, i.e. the bracket project', async () => {
-      const project = page.getByTestId('project-link').getByText('bracket')
+      const project = page.getByText('bracket')
 
       await project.hover()
       await project.focus()
@@ -927,10 +687,10 @@ test(
     })
 
     await test.step('Check we can still create a project', async () => {
-      await createProject({ name: 'project-000', page, returnHome: true })
-      await expect(
-        page.getByTestId('project-link').filter({ hasText: 'project-000' })
-      ).toBeVisible()
+      await page.getByRole('button', { name: 'New project' }).click()
+      await expect(page.getByText('Successfully created')).toBeVisible()
+      await expect(page.getByText('Successfully created')).not.toBeVisible()
+      await expect(page.getByText('project-000')).toBeVisible()
     })
 
     await electronApp.close()
@@ -1091,7 +851,7 @@ test(
   }
 )
 
-test.fixme(
+test(
   'When the project folder is empty, user can create new project and open it.',
   { tag: '@electron' },
   async ({ browserName }, testInfo) => {
@@ -1101,24 +861,28 @@ test.fixme(
 
     page.on('console', console.log)
 
-    // Locators and constants
-    const gizmo = page.locator('[aria-label*=gizmo]')
-    const resetCameraButton = page.getByRole('button', { name: 'Reset view' })
-    const pointOnModel = { x: 660, y: 250 }
-    const expectedStartCamZPosition = 15633.47
-
-    // Constants and locators
-    const projectLinks = page.getByTestId('project-link')
-
     // expect to see text "No Projects found"
     await expect(page.getByText('No Projects found')).toBeVisible()
 
-    await createProject({ name: 'project-000', page, returnHome: true })
-    await expect(projectLinks.getByText('project-000')).toBeVisible()
+    await page.getByRole('button', { name: 'New project' }).click()
 
-    await projectLinks.getByText('project-000').click()
+    await expect(page.getByText('Successfully created')).toBeVisible()
+    await expect(page.getByText('Successfully created')).not.toBeVisible()
 
-    await u.waitForPageLoad()
+    await expect(page.getByText('project-000')).toBeVisible()
+
+    await page.getByText('project-000').click()
+
+    await expect(page.getByTestId('loading')).toBeAttached()
+    await expect(page.getByTestId('loading')).not.toBeAttached({
+      timeout: 20_000,
+    })
+
+    await expect(
+      page.getByRole('button', { name: 'Start Sketch' })
+    ).toBeEnabled({
+      timeout: 20_000,
+    })
 
     await page.locator('.cm-content').fill(`sketch001 = startSketchOn('XZ')
   |> startProfileAt([-87.4, 282.92], %)
@@ -1128,28 +892,8 @@ test.fixme(
   |> lineTo([profileStartX(%), profileStartY(%)], %)
   |> close(%)
 extrude001 = extrude(200, sketch001)`)
-    await page.waitForTimeout(800)
 
-    async function getCameraZValue() {
-      return page
-        .getByTestId('cam-z-position')
-        .inputValue()
-        .then((value) => parseFloat(value))
-    }
-
-    await test.step(`Reset camera`, async () => {
-      await u.openDebugPanel()
-      await u.clearCommandLogs()
-      await u.doAndWaitForCmd(async () => {
-        await gizmo.click({ button: 'right' })
-        await resetCameraButton.click()
-      }, 'zoom_to_fit')
-      await expect
-        .poll(getCameraZValue, {
-          message: 'Camera Z should be at expected position after reset',
-        })
-        .toEqual(expectedStartCamZPosition)
-    })
+    const pointOnModel = { x: 660, y: 250 }
 
     // gray at this pixel means the stream has loaded in the most
     // user way we can verify it (pixel color)
@@ -1157,7 +901,7 @@ extrude001 = extrude(200, sketch001)`)
       .poll(() => u.getGreatestPixDiff(pointOnModel, [143, 143, 143]), {
         timeout: 10_000,
       })
-      .toBeLessThan(30)
+      .toBeLessThan(15)
 
     await expect(async () => {
       await page.mouse.move(0, 0, { steps: 5 })
@@ -1175,10 +919,16 @@ extrude001 = extrude(200, sketch001)`)
       page.getByRole('button', { name: 'New project' })
     ).toBeVisible()
 
+    const createProject = async (projectNum: number) => {
+      await page.getByRole('button', { name: 'New project' }).click()
+      await expect(page.getByText('Successfully created')).toBeVisible()
+      await expect(page.getByText('Successfully created')).not.toBeVisible()
+
+      const projectNumStr = projectNum.toString().padStart(3, '0')
+      await expect(page.getByText(`project-${projectNumStr}`)).toBeVisible()
+    }
     for (let i = 1; i <= 10; i++) {
-      const name = `project-${i.toString().padStart(3, '0')}`
-      await createProject({ name, page, returnHome: true })
-      await expect(projectLinks.getByText(name)).toBeVisible()
+      await createProject(i)
     }
     await electronApp.close()
   }
@@ -1353,10 +1103,11 @@ test(
       await page.getByTestId('settings-close-button').click()
 
       await expect(page.getByText('No Projects found')).toBeVisible()
-      await createProject({ name: 'project-000', page, returnHome: true })
-      await expect(
-        page.getByTestId('project-link').filter({ hasText: 'project-000' })
-      ).toBeVisible()
+      await page.getByRole('button', { name: 'New project' }).click()
+      await expect(page.getByText('Successfully created')).toBeVisible()
+      await expect(page.getByText('Successfully created')).not.toBeVisible()
+
+      await expect(page.getByText(`project-000`)).toBeVisible()
     })
 
     await test.step('We can change back to the original root project directory', async () => {
@@ -1497,7 +1248,6 @@ test(
           'i_shape.kcl',
           'kittycad_svg.kcl',
           'lego.kcl',
-          'lsystem.kcl',
           'math.kcl',
           'member_expression_sketch.kcl',
           'mike_stress_test.kcl',
@@ -1683,7 +1433,7 @@ test(
     page.on('console', console.log)
 
     await test.step('Should create and name a project called wrist brace', async () => {
-      await createProject({ name: 'wrist brace', page, returnHome: true })
+      await createProjectAndRenameIt({ name: 'wrist brace', page })
     })
 
     await test.step('Should go through onboarding', async () => {

e2e/playwright/sketch-tests.spec.ts

@@ -637,6 +637,7 @@ test.describe('Sketch tests', () => {
     |> revolve({ axis: "X" }, %)`)
   })
   test('Can add multiple sketches', async ({ page }) => {
+    test.skip(process.platform === 'darwin', 'Can add multiple sketches')
     const u = await getUtils(page)
     const viewportSize = { width: 1200, height: 500 }
     await page.setViewportSize(viewportSize)
@@ -674,16 +675,15 @@ test.describe('Sketch tests', () => {
 
     await click00r(50, 0)
     await page.waitForTimeout(100)
-    codeStr += `  |> lineTo(${toSU([50, 0])}, %)`
+    codeStr += `  |> line(${toSU([50, 0])}, %)`
     await expect(u.codeLocator).toHaveText(codeStr)
 
     await click00r(0, 50)
     codeStr += `  |> line(${toSU([0, 50])}, %)`
     await expect(u.codeLocator).toHaveText(codeStr)
 
-    let clickCoords = await click00r(-50, 0)
-    expect(clickCoords).not.toBeUndefined()
-    codeStr += `  |> lineTo(${toSU(clickCoords!)}, %)`
+    await click00r(-50, 0)
+    codeStr += `  |> line(${toSU([-50, 0])}, %)`
     await expect(u.codeLocator).toHaveText(codeStr)
 
     // exit the sketch, reset relative clicker
@@ -709,10 +709,8 @@ test.describe('Sketch tests', () => {
     codeStr += `  |> startProfileAt([2.03, 0], %)`
     await expect(u.codeLocator).toHaveText(codeStr)
 
-    // TODO: I couldn't use `toSU` here because of some rounding error causing
-    // it to be off by 0.01
     await click00r(30, 0)
-    codeStr += `  |> lineTo([4.07, 0], %)`
+    codeStr += `  |> line([2.04, 0], %)`
     await expect(u.codeLocator).toHaveText(codeStr)
 
     await click00r(0, 30)

e2e/playwright/snapshot-tests.spec.ts

@@ -471,7 +471,7 @@ test(
 
     await page.mouse.move(startXPx + PUR * 30, 500 - PUR * 20, { steps: 10 })
 
-    await page.waitForTimeout(1000)
+    await page.waitForTimeout(300)
 
     await expect(page).toHaveScreenshot({
       maxDiffPixels: 100,
@@ -528,7 +528,6 @@ test(
     // Draw the rectangle
     await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 30)
     await page.mouse.move(startXPx + PUR * 10, 500 - PUR * 10, { steps: 5 })
-    await page.waitForTimeout(800)
 
     // Ensure the draft rectangle looks the same as it usually does
     await expect(page).toHaveScreenshot({
@@ -896,7 +895,7 @@ test(
     // Wait for the second extrusion to appear
     // TODO: Find a way to truly know that the objects have finished
     // rendering, because an execution-done message is not sufficient.
-    await page.waitForTimeout(2000)
+    await page.waitForTimeout(1000)
 
     await expect(page).toHaveScreenshot({
       maxDiffPixels: 100,
@@ -940,7 +939,7 @@ test(
     // Wait for the second extrusion to appear
     // TODO: Find a way to truly know that the objects have finished
     // rendering, because an execution-done message is not sufficient.
-    await page.waitForTimeout(2000)
+    await page.waitForTimeout(1000)
 
     await expect(page).toHaveScreenshot({
       maxDiffPixels: 100,

e2e/playwright/test-network-and-connection-issues.spec.ts

@@ -219,7 +219,7 @@ test.describe('Test network and connection issues', () => {
   |> startProfileAt([12.34, -12.34], %)
   |> line([12.34, 0], %)
   |> line([-12.34, 12.34], %)
-  |> lineTo([0, -12.34], %)
+  |> line([-12.34, 0], %)
 
 `)
 

e2e/playwright/test-utils.ts

@@ -45,17 +45,7 @@ export const commonPoints = {
   startAt: '[7.19, -9.7]',
   num1: 7.25,
   num2: 14.44,
-  /** The Y-value of a common lineTo move we perform in tests */
-  num3: -2.44,
-} as const
-
-/** A semi-reliable color to check the default XZ plane on
- * in dark mode in the default camera position
- */
-export const darkModePlaneColorXZ: [number, number, number] = [50, 50, 99]
-
-/** A semi-reliable color to check the default dark mode bg color against */
-export const darkModeBgColor: [number, number, number] = [27, 27, 27]
+}
 
 export const editorSelector = '[role="textbox"][data-language="kcl"]'
 type PaneId = 'variables' | 'code' | 'files' | 'logs'
@@ -120,32 +110,15 @@ async function waitForDefaultPlanesToBeVisible(page: Page) {
   )
 }
 
-export async function checkIfPaneIsOpen(page: Page, testId: string) {
-  const paneButtonLocator = page.getByTestId(testId)
-  await expect(paneButtonLocator).toBeVisible()
-  return (await paneButtonLocator?.getAttribute('aria-pressed')) === 'true'
-}
-
-export async function openPane(page: Page, testId: string) {
-  const paneButtonLocator = page.getByTestId(testId)
-  await expect(paneButtonLocator).toBeVisible()
-  const isOpen = await checkIfPaneIsOpen(page, testId)
+async function openPane(page: Page, testId: string) {
+  const locator = page.getByTestId(testId)
+  await expect(locator).toBeVisible()
+  const isOpen = (await locator?.getAttribute('aria-pressed')) === 'true'
 
   if (!isOpen) {
-    await paneButtonLocator.click()
+    await locator.click()
+    await expect(locator).toHaveAttribute('aria-pressed', 'true')
   }
-  await expect(paneButtonLocator).toHaveAttribute('aria-pressed', 'true')
-}
-
-export async function closePane(page: Page, testId: string) {
-  const paneButtonLocator = page.getByTestId(testId)
-  await expect(paneButtonLocator).toBeVisible()
-  const isOpen = await checkIfPaneIsOpen(page, testId)
-
-  if (isOpen) {
-    await paneButtonLocator.click()
-  }
-  await expect(paneButtonLocator).toHaveAttribute('aria-pressed', 'false')
 }
 
 async function openKclCodePanel(page: Page) {
@@ -486,6 +459,17 @@ export async function getUtils(page: Page, test_?: typeof test) {
       return text.replace(/\s+/g, '')
     },
 
+    createAndSelectProject: async (hasText: string) => {
+      return test_?.step(
+        `Create and select project with text "${hasText}"`,
+        async () => {
+          await page.getByTestId('home-new-file').click()
+          const projectLinksPost = page.getByTestId('project-link')
+          await projectLinksPost.filter({ hasText }).click()
+        }
+      )
+    },
+
     editorTextMatches: async (code: string) => {
       const editor = page.locator(editorSelector)
       return expect(editor).toHaveText(code, { useInnerText: true })
@@ -508,11 +492,6 @@ export async function getUtils(page: Page, test_?: typeof test) {
 
     createNewFile: async (name: string) => {
       return test?.step(`Create a file named ${name}`, async () => {
-        // If the application is in the middle of connecting a stream
-        // then creating a new file won't work in the end.
-        await expect(
-          page.getByRole('button', { name: 'Start Sketch' })
-        ).not.toBeDisabled()
         await page.getByTestId('create-file-button').click()
         await page.getByTestId('file-rename-field').fill(name)
         await page.keyboard.press('Enter')
@@ -525,9 +504,6 @@ export async function getUtils(page: Page, test_?: typeof test) {
           .locator('[data-testid="file-pane-scroll-container"] button')
           .filter({ hasText: name })
           .click()
-        await expect(page.getByTestId('project-sidebar-toggle')).toContainText(
-          name
-        )
       })
     },
 
@@ -896,20 +872,10 @@ export async function setupElectron({
     const tempSettingsFilePath = join(projectDirName, SETTINGS_FILE_NAME)
     const settingsOverrides = TOML.stringify(
       appSettings
-        ? {
-            settings: {
-              ...TEST_SETTINGS,
-              ...appSettings,
-              app: {
-                ...TEST_SETTINGS.app,
-                projectDirectory: projectDirName,
-                ...appSettings.app,
-              },
-            },
-          }
+        ? { settings: appSettings }
         : {
+            ...TEST_SETTINGS,
             settings: {
-              ...TEST_SETTINGS,
               app: {
                 ...TEST_SETTINGS.app,
                 projectDirectory: projectDirName,
@@ -988,25 +954,30 @@ export async function isOutOfViewInScrollContainer(
   return isOutOfView
 }
 
-export async function createProject({
+export async function createProjectAndRenameIt({
   name,
   page,
-  returnHome = false,
 }: {
   name: string
   page: Page
-  returnHome?: boolean
 }) {
-  await test.step(`Create project and navigate to it`, async () => {
-    await page.getByRole('button', { name: 'New project' }).click()
-    await page.getByRole('textbox', { name: 'Name' }).fill(name)
-    await page.getByRole('button', { name: 'Continue' }).click()
+  await page.getByRole('button', { name: 'New project' }).click()
+  await expect(page.getByText('Successfully created')).toBeVisible()
+  await expect(page.getByText('Successfully created')).not.toBeVisible()
 
-    if (returnHome) {
-      await page.waitForURL('**/file/**', { waitUntil: 'domcontentloaded' })
-      await page.getByTestId('app-logo').click()
-    }
-  })
+  await expect(page.getByText(`project-000`)).toBeVisible()
+  await page.getByText(`project-000`).hover()
+  await page.getByText(`project-000`).focus()
+
+  await page.getByLabel('sketch').first().click()
+
+  await page.waitForTimeout(100)
+
+  // type the name passed in
+  await page.keyboard.press('Backspace')
+  await page.keyboard.type(name)
+
+  await page.getByLabel('checkmark').last().click()
 }
 
 export function executorInputPath(fileName: string): string {

e2e/playwright/testing-gizmo.spec.ts

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

e2e/playwright/testing-selections.spec.ts

@@ -96,7 +96,7 @@ test.describe('Testing selections', () => {
     |> startProfileAt(${commonPoints.startAt}, %)
     |> line([${commonPoints.num1}, 0], %)
     |> line([0, ${commonPoints.num1 + 0.01}], %)
-    |> lineTo([0, ${commonPoints.num3}], %)`)
+    |> line([-${commonPoints.num2}, 0], %)`)
 
       // deselect line tool
       await page.getByRole('button', { name: 'line Line', exact: true }).click()
@@ -157,9 +157,7 @@ test.describe('Testing selections', () => {
         await emptySpaceClick()
 
         // check the same selection again by putting cursor in code first then selecting axis
-        await page
-          .getByText(`  |> lineTo([0, ${commonPoints.num3}], %)`)
-          .click()
+        await page.getByText(`  |> line([-${commonPoints.num2}, 0], %)`).click()
         await page.keyboard.down('Shift')
         await constrainButton.click()
         await expect(absYButton).toBeDisabled()
@@ -182,9 +180,7 @@ test.describe('Testing selections', () => {
           process.platform === 'linux' ? 'Control' : 'Meta'
         )
         await page.waitForTimeout(100)
-        await page
-          .getByText(`  |> lineTo([0, ${commonPoints.num3}], %)`)
-          .click()
+        await page.getByText(`  |> line([-${commonPoints.num2}, 0], %)`).click()
 
         await expect(page.locator('.cm-cursor')).toHaveCount(2)
         await page.waitForTimeout(500)

e2e/playwright/testing-settings.spec.ts

@@ -1,6 +1,5 @@
 import { test, expect } from '@playwright/test'
 import * as fsp from 'fs/promises'
-import * as fs from 'fs'
 import { join } from 'path'
 import {
   getUtils,
@@ -8,10 +7,9 @@ import {
   setupElectron,
   tearDown,
   executorInputPath,
-  createProject,
 } from './test-utils'
 import { SaveSettingsPayload, SettingsLevel } from 'lib/settings/settingsTypes'
-import { SETTINGS_FILE_NAME, PROJECT_SETTINGS_FILE_NAME } from 'lib/constants'
+import { SETTINGS_FILE_NAME } from 'lib/constants'
 import {
   TEST_SETTINGS_KEY,
   TEST_SETTINGS_CORRUPTED,
@@ -267,15 +265,10 @@ test.describe('Testing settings', () => {
         process.platform === 'win32',
         'TODO: remove this skip https://github.com/KittyCAD/modeling-app/issues/3557'
       )
-      const projectName = 'bracket'
-      const {
-        electronApp,
-        page,
-        dir: projectDirName,
-      } = await setupElectron({
+      const { electronApp, page } = await setupElectron({
         testInfo,
         folderSetupFn: async (dir) => {
-          const bracketDir = join(dir, projectName)
+          const bracketDir = join(dir, 'bracket')
           await fsp.mkdir(bracketDir, { recursive: true })
           await fsp.copyFile(
             executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
@@ -287,12 +280,6 @@ test.describe('Testing settings', () => {
       await page.setViewportSize({ width: 1200, height: 500 })
 
       // Selectors and constants
-      const tempProjectSettingsFilePath = join(
-        projectDirName,
-        projectName,
-        PROJECT_SETTINGS_FILE_NAME
-      )
-      const tempUserSettingsFilePath = join(projectDirName, SETTINGS_FILE_NAME)
       const userThemeColor = '120'
       const projectThemeColor = '50'
       const settingsOpenButton = page.getByRole('link', {
@@ -305,21 +292,6 @@ test.describe('Testing settings', () => {
       const projectLink = page.getByText('bracket')
       const logoLink = page.getByTestId('app-logo')
 
-      async function confirmThemeWasWritten(filePath: string, value: string) {
-        return expect
-          .poll(
-            async () => {
-              const fileExists = await fs.existsSync(filePath)
-              return fileExists ? fsp.readFile(filePath, 'utf-8') : ''
-            },
-            {
-              message: 'Setting should now be written to the file',
-              timeout: 5_000,
-            }
-          )
-          .toContain(`themeColor = "${value}"`)
-      }
-
       await test.step('Set user theme color on home', async () => {
         await expect(settingsOpenButton).toBeVisible()
         await settingsOpenButton.click()
@@ -327,7 +299,6 @@ test.describe('Testing settings', () => {
         await expect(userSettingsTab).toBeChecked()
         await themeColorSetting.fill(userThemeColor)
         await expect(logoLink).toHaveCSS('--primary-hue', userThemeColor)
-        await confirmThemeWasWritten(tempUserSettingsFilePath, userThemeColor)
         await settingsCloseButton.click()
       })
 
@@ -339,11 +310,6 @@ test.describe('Testing settings', () => {
         await expect(projectSettingsTab).toBeChecked()
         await themeColorSetting.fill(projectThemeColor)
         await expect(logoLink).toHaveCSS('--primary-hue', projectThemeColor)
-        // Make sure that the project settings file has been written to before continuing
-        await confirmThemeWasWritten(
-          tempProjectSettingsFilePath,
-          projectThemeColor
-        )
         await settingsCloseButton.click()
       })
 
@@ -357,7 +323,6 @@ test.describe('Testing settings', () => {
 
       await test.step(`Navigate back to the home view and see user setting applied`, async () => {
         await logoLink.click()
-        await page.screenshot({ path: 'out.png' })
         await expect(logoLink).toHaveCSS('--primary-hue', userThemeColor)
       })
 
@@ -463,7 +428,9 @@ test.describe('Testing settings', () => {
       })
 
       await test.step('Check color of logo changed when in modeling view', async () => {
-        await createProject({ name: 'project-000', page })
+        await page.getByRole('button', { name: 'New project' }).click()
+        await page.getByTestId('project-link').first().click()
+        await page.getByRole('button', { name: 'Dismiss' }).click()
         await changeColor('58')
         await expect(logoLink).toHaveCSS('--primary-hue', '58')
       })
@@ -478,54 +445,6 @@ test.describe('Testing settings', () => {
     }
   )
 
-  test(
-    'project settings reload on external change',
-    { tag: '@electron' },
-    async ({ browserName: _ }, testInfo) => {
-      const {
-        electronApp,
-        page,
-        dir: projectDirName,
-      } = await setupElectron({
-        testInfo,
-      })
-
-      await page.setViewportSize({ width: 1200, height: 500 })
-
-      const logoLink = page.getByTestId('app-logo')
-      const projectDirLink = page.getByText('Loaded from')
-
-      await test.step('Wait for project view', async () => {
-        await expect(projectDirLink).toBeVisible()
-      })
-
-      await createProject({ name: 'project-000', page })
-
-      const changeColorFs = async (color: string) => {
-        const tempSettingsFilePath = join(
-          projectDirName,
-          'project-000',
-          PROJECT_SETTINGS_FILE_NAME
-        )
-        await fsp.writeFile(
-          tempSettingsFilePath,
-          `[settings.app]\nthemeColor = "${color}"`
-        )
-      }
-
-      await test.step('Check the color is first starting as we expect', async () => {
-        await expect(logoLink).toHaveCSS('--primary-hue', '264.5')
-      })
-
-      await test.step('Check color of logo changed', async () => {
-        await changeColorFs('99')
-        await expect(logoLink).toHaveCSS('--primary-hue', '99')
-      })
-
-      await electronApp.close()
-    }
-  )
-
   test(
     `Closing settings modal should go back to the original file being viewed`,
     { tag: '@electron' },

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

@@ -1,11 +1,5 @@
 import { test, expect, Page } from '@playwright/test'
-import {
-  getUtils,
-  setup,
-  tearDown,
-  setupElectron,
-  createProject,
-} from './test-utils'
+import { getUtils, setup, tearDown, setupElectron } from './test-utils'
 import { join } from 'path'
 import fs from 'fs'
 
@@ -706,17 +700,17 @@ test(
     const fileExists = () =>
       fs.existsSync(join(dir, projectName, textToCadFileName))
 
-    const { openFilePanel, openKclCodePanel, waitForPageLoad } = await getUtils(
-      page,
-      test
-    )
+    const {
+      createAndSelectProject,
+      openFilePanel,
+      openKclCodePanel,
+      waitForPageLoad,
+    } = await getUtils(page, test)
 
     await page.setViewportSize({ width: 1200, height: 500 })
 
     // Locators
-    const projectMenuButton = page
-      .getByTestId('project-sidebar-toggle')
-      .filter({ hasText: projectName })
+    const projectMenuButton = page.getByRole('button', { name: projectName })
     const textToCadFileButton = page.getByRole('listitem').filter({
       has: page.getByRole('button', { name: textToCadFileName }),
     })
@@ -725,7 +719,7 @@ test(
     )
 
     // Create and navigate to the project
-    await createProject({ name: 'project-000', page })
+    await createAndSelectProject('project-000')
 
     // Wait for Start Sketch otherwise you will not have access Text-to-CAD command
     await waitForPageLoad()

interface.d.ts

@@ -2,7 +2,7 @@ import fs from 'node:fs/promises'
 import fsSync from 'node:fs'
 import path from 'path'
 import { dialog, shell } from 'electron'
-import { MachinesListing } from 'components/MachineManagerProvider'
+import { MachinesListing } from 'lib/machineManager'
 
 type EnvFn = (value?: string) => string
 
@@ -20,11 +20,10 @@ export interface IElectronAPI {
   version: typeof process.env.version
   watchFileOn: (
     path: string,
-    key: string,
     callback: (eventType: string, path: string) => void
   ) => void
-  readFile: typeof fs.readFile
-  watchFileOff: (path: string, key: string) => void
+  watchFileOff: (path: string) => void
+  readFile: (path: string) => ReturnType<fs.readFile>
   writeFile: (
     path: string,
     data: string | Uint8Array
@@ -68,7 +67,7 @@ export interface IElectronAPI {
     }
   }
   kittycad: (access: string, args: any) => any
-  listMachines: (machineApiIp: string) => Promise<MachinesListing>
+  listMachines: () => Promise<MachinesListing>
   getMachineApiIp: () => Promise<string | null>
   onUpdateDownloadStart: (
     callback: (value: { version: string }) => void

make-release.sh

@@ -70,7 +70,7 @@ echo ""
 echo "Suggested changelog:"
 echo "\`\`\`"
 echo "## What's Changed"
-git log $(git describe --tags --match="v[0-9]*" --abbrev=0)..HEAD --oneline --pretty=format:%s | grep -v Bump | grep -v 'Cut release v' | awk '{print "* "toupper(substr($0,0,1))substr($0,2)}'
+git log $(git describe --tags --abbrev=0)..HEAD --oneline --pretty=format:%s | grep -v Bump | grep -v 'Cut release v' | awk '{print "* "toupper(substr($0,0,1))substr($0,2)}'
 echo ""
 echo "**Full Changelog**: https://github.com/KittyCAD/modeling-app/compare/${latest_tag}...${new_version}"
 echo "\`\`\`"

openapi/machine-api.json

@@ -36,319 +36,38 @@
         "description": "Extra machine-specific information regarding a connected machine.",
         "oneOf": [
           {
+            "additionalProperties": false,
             "properties": {
-              "type": {
-                "enum": [
-                  "moonraker"
-                ],
-                "type": "string"
+              "Moonraker": {
+                "type": "object"
               }
             },
             "required": [
-              "type"
+              "Moonraker"
             ],
             "type": "object"
           },
           {
+            "additionalProperties": false,
             "properties": {
-              "type": {
-                "enum": [
-                  "usb"
-                ],
-                "type": "string"
+              "Usb": {
+                "type": "object"
               }
             },
             "required": [
-              "type"
+              "Usb"
             ],
             "type": "object"
           },
           {
+            "additionalProperties": false,
             "properties": {
-              "current_stage": {
-                "allOf": [
-                  {
-                    "$ref": "#/components/schemas/Stage"
-                  }
-                ],
-                "description": "The current stage of the machine as defined by Bambu which can include errors, etc.",
-                "nullable": true
-              },
-              "nozzle_diameter": {
-                "allOf": [
-                  {
-                    "$ref": "#/components/schemas/NozzleDiameter"
-                  }
-                ],
-                "description": "The nozzle diameter of the machine."
-              },
-              "type": {
-                "enum": [
-                  "bambu"
-                ],
-                "type": "string"
+              "Bambu": {
+                "type": "object"
               }
             },
             "required": [
-              "nozzle_diameter",
-              "type"
-            ],
-            "type": "object"
-          }
-        ]
-      },
-      "FdmHardwareConfiguration": {
-        "description": "Configuration for a FDM-based printer.",
-        "properties": {
-          "filaments": {
-            "description": "The filaments the printer has access to.",
-            "items": {
-              "$ref": "#/components/schemas/Filament"
-            },
-            "type": "array"
-          },
-          "loaded_filament_idx": {
-            "description": "The currently loaded filament index.",
-            "format": "uint",
-            "minimum": 0,
-            "nullable": true,
-            "type": "integer"
-          },
-          "nozzle_diameter": {
-            "description": "Diameter of the extrusion nozzle, in mm.",
-            "format": "double",
-            "type": "number"
-          }
-        },
-        "required": [
-          "filaments",
-          "nozzle_diameter"
-        ],
-        "type": "object"
-      },
-      "Filament": {
-        "description": "Information about the filament being used in a FDM printer.",
-        "properties": {
-          "color": {
-            "description": "The color (as hex without the `#`) of the filament, this is likely specific to the manufacturer.",
-            "maxLength": 6,
-            "minLength": 6,
-            "nullable": true,
-            "type": "string"
-          },
-          "material": {
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/FilamentMaterial"
-              }
-            ],
-            "description": "The material that the filament is made of."
-          },
-          "name": {
-            "description": "The name of the filament, this is likely specfic to the manufacturer.",
-            "nullable": true,
-            "type": "string"
-          }
-        },
-        "required": [
-          "material"
-        ],
-        "type": "object"
-      },
-      "FilamentMaterial": {
-        "description": "The material that the filament is made of.",
-        "oneOf": [
-          {
-            "description": "Polylactic acid based plastics",
-            "properties": {
-              "type": {
-                "enum": [
-                  "pla"
-                ],
-                "type": "string"
-              }
-            },
-            "required": [
-              "type"
-            ],
-            "type": "object"
-          },
-          {
-            "description": "Pla support",
-            "properties": {
-              "type": {
-                "enum": [
-                  "pla_support"
-                ],
-                "type": "string"
-              }
-            },
-            "required": [
-              "type"
-            ],
-            "type": "object"
-          },
-          {
-            "description": "acrylonitrile butadiene styrene based plastics",
-            "properties": {
-              "type": {
-                "enum": [
-                  "abs"
-                ],
-                "type": "string"
-              }
-            },
-            "required": [
-              "type"
-            ],
-            "type": "object"
-          },
-          {
-            "description": "polyethylene terephthalate glycol based plastics",
-            "properties": {
-              "type": {
-                "enum": [
-                  "petg"
-                ],
-                "type": "string"
-              }
-            },
-            "required": [
-              "type"
-            ],
-            "type": "object"
-          },
-          {
-            "description": "unsuprisingly, nylon based",
-            "properties": {
-              "type": {
-                "enum": [
-                  "nylon"
-                ],
-                "type": "string"
-              }
-            },
-            "required": [
-              "type"
-            ],
-            "type": "object"
-          },
-          {
-            "description": "thermoplastic polyurethane based urethane material",
-            "properties": {
-              "type": {
-                "enum": [
-                  "tpu"
-                ],
-                "type": "string"
-              }
-            },
-            "required": [
-              "type"
-            ],
-            "type": "object"
-          },
-          {
-            "description": "polyvinyl alcohol based material",
-            "properties": {
-              "type": {
-                "enum": [
-                  "pva"
-                ],
-                "type": "string"
-              }
-            },
-            "required": [
-              "type"
-            ],
-            "type": "object"
-          },
-          {
-            "description": "high impact polystyrene based material",
-            "properties": {
-              "type": {
-                "enum": [
-                  "hips"
-                ],
-                "type": "string"
-              }
-            },
-            "required": [
-              "type"
-            ],
-            "type": "object"
-          },
-          {
-            "description": "composite material with stuff in other stuff, something like PLA mixed with carbon fiber, kevlar, or fiberglass",
-            "properties": {
-              "type": {
-                "enum": [
-                  "composite"
-                ],
-                "type": "string"
-              }
-            },
-            "required": [
-              "type"
-            ],
-            "type": "object"
-          },
-          {
-            "description": "Unknown material",
-            "properties": {
-              "type": {
-                "enum": [
-                  "unknown"
-                ],
-                "type": "string"
-              }
-            },
-            "required": [
-              "type"
-            ],
-            "type": "object"
-          }
-        ]
-      },
-      "HardwareConfiguration": {
-        "description": "The hardware configuration of a machine.",
-        "oneOf": [
-          {
-            "description": "No configuration is possible. This isn't the same conceptually as an `Option<HardwareConfiguration>`, because this indicates we positively know there is no possible configuration changes that are possible with this method of manufcture.",
-            "properties": {
-              "type": {
-                "enum": [
-                  "none"
-                ],
-                "type": "string"
-              }
-            },
-            "required": [
-              "type"
-            ],
-            "type": "object"
-          },
-          {
-            "description": "Hardware configuration specific to FDM based printers",
-            "properties": {
-              "config": {
-                "allOf": [
-                  {
-                    "$ref": "#/components/schemas/FdmHardwareConfiguration"
-                  }
-                ],
-                "description": "The configuration for the FDM printer."
-              },
-              "type": {
-                "enum": [
-                  "fdm"
-                ],
-                "type": "string"
-              }
-            },
-            "required": [
-              "config",
-              "type"
+              "Bambu"
             ],
             "type": "object"
           }
@@ -366,14 +85,6 @@
             "description": "Additional, per-machine information which is specific to the underlying machine type.",
             "nullable": true
           },
-          "hardware_configuration": {
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/HardwareConfiguration"
-              }
-            ],
-            "description": "Information about how the Machine is currently configured."
-          },
           "id": {
             "description": "Machine Identifier (ID) for the specific Machine.",
             "type": "string"
@@ -403,12 +114,6 @@
             "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.\n\nThis may be `None` if the maximum size is not knowable by the Machine API.\n\nWhat \"close\" means is up to you!",
             "nullable": true
           },
-          "progress": {
-            "description": "Progress of the current print, if printing.",
-            "format": "double",
-            "nullable": true,
-            "type": "number"
-          },
           "state": {
             "allOf": [
               {
@@ -419,7 +124,6 @@
           }
         },
         "required": [
-          "hardware_configuration",
           "id",
           "machine_type",
           "make_model",
@@ -453,111 +157,57 @@
         "oneOf": [
           {
             "description": "If a print state can not be resolved at this time, an Unknown may be returned.",
-            "properties": {
-              "state": {
-                "enum": [
-                  "unknown"
-                ],
-                "type": "string"
-              }
-            },
-            "required": [
-              "state"
+            "enum": [
+              "Unknown"
             ],
-            "type": "object"
+            "type": "string"
           },
           {
             "description": "Idle, and ready for another job.",
-            "properties": {
-              "state": {
-                "enum": [
-                  "idle"
-                ],
-                "type": "string"
-              }
-            },
-            "required": [
-              "state"
+            "enum": [
+              "Idle"
             ],
-            "type": "object"
+            "type": "string"
           },
           {
             "description": "Running a job -- 3D printing or CNC-ing a part.",
-            "properties": {
-              "state": {
-                "enum": [
-                  "running"
-                ],
-                "type": "string"
-              }
-            },
-            "required": [
-              "state"
+            "enum": [
+              "Running"
             ],
-            "type": "object"
+            "type": "string"
           },
           {
             "description": "Machine is currently offline or unreachable.",
-            "properties": {
-              "state": {
-                "enum": [
-                  "offline"
-                ],
-                "type": "string"
-              }
-            },
-            "required": [
-              "state"
+            "enum": [
+              "Offline"
             ],
-            "type": "object"
+            "type": "string"
           },
           {
             "description": "Job is underway but halted, waiting for some action to take place.",
-            "properties": {
-              "state": {
-                "enum": [
-                  "paused"
-                ],
-                "type": "string"
-              }
-            },
-            "required": [
-              "state"
+            "enum": [
+              "Paused"
             ],
-            "type": "object"
+            "type": "string"
           },
           {
             "description": "Job is finished, but waiting manual action to move back to Idle.",
-            "properties": {
-              "state": {
-                "enum": [
-                  "complete"
-                ],
-                "type": "string"
-              }
-            },
-            "required": [
-              "state"
+            "enum": [
+              "Complete"
             ],
-            "type": "object"
+            "type": "string"
           },
           {
+            "additionalProperties": false,
             "description": "The printer has failed and is in an unknown state that may require manual attention to resolve. The inner value is a human readable description of what specifically has failed.",
             "properties": {
-              "message": {
-                "description": "A human-readable message describing the failure.",
+              "Failed": {
                 "nullable": true,
                 "type": "string"
-              },
-              "state": {
-                "enum": [
-                  "failed"
-                ],
-                "type": "string"
               }
             },
             "required": [
-              "state"
+              "Failed"
             ],
             "type": "object"
           }
@@ -569,54 +219,21 @@
           {
             "description": "Use light to cure a resin to build up layers.",
             "enum": [
-              "stereolithography"
+              "Stereolithography"
             ],
             "type": "string"
           },
           {
             "description": "Fused Deposition Modeling, layers of melted plastic.",
             "enum": [
-              "fused_deposition"
+              "FusedDeposition"
             ],
             "type": "string"
           },
           {
             "description": "\"Computer numerical control\" - machine that grinds away material from a hunk of material to construct a part.",
             "enum": [
-              "cnc"
-            ],
-            "type": "string"
-          }
-        ]
-      },
-      "NozzleDiameter": {
-        "description": "A nozzle diameter.",
-        "oneOf": [
-          {
-            "description": "0.2mm.",
-            "enum": [
-              "0.2"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "0.4mm.",
-            "enum": [
-              "0.4"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "0.6mm.",
-            "enum": [
-              "0.6"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "0.8mm.",
-            "enum": [
-              "0.8"
+              "Cnc"
             ],
             "type": "string"
           }
@@ -667,15 +284,6 @@
           "machine_id": {
             "description": "The machine id to print to.",
             "type": "string"
-          },
-          "slicer_configuration": {
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/SlicerConfiguration"
-              }
-            ],
-            "description": "Requested design-specific slicer configurations.",
-            "nullable": true
           }
         },
         "required": [
@@ -684,283 +292,6 @@
         ],
         "type": "object"
       },
-      "SlicerConfiguration": {
-        "description": "The slicer configuration is a set of parameters that are passed to the slicer to control how the gcode is generated.",
-        "properties": {
-          "filament_idx": {
-            "description": "The filament to use for the print.",
-            "format": "uint",
-            "minimum": 0,
-            "nullable": true,
-            "type": "integer"
-          }
-        },
-        "type": "object"
-      },
-      "Stage": {
-        "description": "The print stage. These come from: https://github.com/SoftFever/OrcaSlicer/blob/431978baf17961df90f0d01871b0ad1d839d7f5d/src/slic3r/GUI/DeviceManager.cpp#L78",
-        "oneOf": [
-          {
-            "description": "Nothing.",
-            "enum": [
-              "nothing"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Empty.",
-            "enum": [
-              "empty"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Auto bed leveling.",
-            "enum": [
-              "auto_bed_leveling"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Heatbed preheating.",
-            "enum": [
-              "heatbed_preheating"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Sweeping XY mech mode.",
-            "enum": [
-              "sweeping_xy_mech_mode"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Changing filament.",
-            "enum": [
-              "changing_filament"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "M400 pause.",
-            "enum": [
-              "m400_pause"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Paused due to filament runout.",
-            "enum": [
-              "paused_due_to_filament_runout"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Heating hotend.",
-            "enum": [
-              "heating_hotend"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Calibrating extrusion.",
-            "enum": [
-              "calibrating_extrusion"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Scanning bed surface.",
-            "enum": [
-              "scanning_bed_surface"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Inspecting first layer.",
-            "enum": [
-              "inspecting_first_layer"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Identifying build plate type.",
-            "enum": [
-              "identifying_build_plate_type"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Calibrating micro lidar.",
-            "enum": [
-              "calibrating_micro_lidar"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Homing toolhead.",
-            "enum": [
-              "homing_toolhead"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Cleaning nozzle tip.",
-            "enum": [
-              "cleaning_nozzle_tip"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Checking extruder temperature.",
-            "enum": [
-              "checking_extruder_temperature"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Printing was paused by the user.",
-            "enum": [
-              "printing_was_paused_by_the_user"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Pause of front cover falling.",
-            "enum": [
-              "pause_of_front_cover_falling"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Calibrating micro lidar.",
-            "enum": [
-              "calibrating_micro_lidar2"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Calibrating extrusion flow.",
-            "enum": [
-              "calibrating_extrusion_flow"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Paused due to nozzle temperature malfunction.",
-            "enum": [
-              "paused_due_to_nozzle_temperature_malfunction"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Paused due to heat bed temperature malfunction.",
-            "enum": [
-              "paused_due_to_heat_bed_temperature_malfunction"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Filament unloading.",
-            "enum": [
-              "filament_unloading"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Skip step pause.",
-            "enum": [
-              "skip_step_pause"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Filament loading.",
-            "enum": [
-              "filament_loading"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Motor noise calibration.",
-            "enum": [
-              "motor_noise_calibration"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Paused due to AMS lost.",
-            "enum": [
-              "paused_due_to_ams_lost"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Paused due to low speed of the heat break fan.",
-            "enum": [
-              "paused_due_to_low_speed_of_the_heat_break_fan"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Paused due to chamber temperature control error.",
-            "enum": [
-              "paused_due_to_chamber_temperature_control_error"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Cooling chamber.",
-            "enum": [
-              "cooling_chamber"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Paused by the Gcode inserted by the user.",
-            "enum": [
-              "paused_by_the_gcode_inserted_by_the_user"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Motor noise showoff.",
-            "enum": [
-              "motor_noise_showoff"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Nozzle filament covered detected pause.",
-            "enum": [
-              "nozzle_filament_covered_detected_pause"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Cutter error pause.",
-            "enum": [
-              "cutter_error_pause"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "First layer error pause.",
-            "enum": [
-              "first_layer_error_pause"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "Nozzle clog pause.",
-            "enum": [
-              "nozzle_clog_pause"
-            ],
-            "type": "string"
-          }
-        ]
-      },
       "Volume": {
         "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.\n\nAll measurements are in millimeters.",
         "properties": {
@@ -996,7 +327,7 @@
     },
     "description": "",
     "title": "machine-api",
-    "version": "0.1.1"
+    "version": "0.1.0"
   },
   "openapi": "3.0.3",
   "paths": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zoo-modeling-app",
-  "version": "0.26.2",
+  "version": "0.25.6",
   "private": true,
   "productName": "Zoo Modeling App",
   "author": {
@@ -56,7 +56,7 @@
     "react-json-view": "^1.21.3",
     "react-modal": "^3.16.1",
     "react-modal-promise": "^1.0.2",
-    "react-router-dom": "^6.27.0",
+    "react-router-dom": "^6.26.1",
     "sketch-helpers": "^0.0.4",
     "three": "^0.166.1",
     "ua-parser-js": "^1.0.37",
@@ -76,7 +76,7 @@
     "build:both": "vite build",
     "build:both:local": "yarn build:wasm && vite build",
     "pretest": "yarn remove-importmeta",
-    "test:rust": "(cd src/wasm-lib && cargo test --workspace && cargo clippy --workspace --all-targets)",
+    "test:rust": "(cd src/wasm-lib && cargo test --all && cargo clippy --all --tests --benches)",
     "simpleserver": "yarn pretest && http-server ./public --cors -p 3000",
     "simpleserver:ci": "yarn pretest && http-server ./public --cors -p 3000 &",
     "simpleserver:bg": "yarn pretest && http-server ./public --cors -p 3000 &",
@@ -161,7 +161,7 @@
     "@types/isomorphic-fetch": "^0.0.39",
     "@types/minimist": "^1.2.5",
     "@types/mocha": "^10.0.6",
-    "@types/node": "^22.7.8",
+    "@types/node": "^22.5.0",
     "@types/pixelmatch": "^5.2.6",
     "@types/pngjs": "^6.0.4",
     "@types/react": "^18.3.4",

public/kcl-samples-manifest-fallback.json

@@ -34,11 +34,6 @@
     "title": "Car Wheel Assembly",
     "description": "A car wheel assembly with a rotor, tire, and lug nuts."
   },
-  {
-    "file": "dodecahedron.kcl",
-    "title": "Hollow Dodecahedron",
-    "description": "A regular dodecahedron or pentagonal dodecahedron is a dodecahedron composed of regular pentagonal faces, three meeting at each vertex. This example shows constructing the individual faces of the dodecahedron and extruding inwards."
-  },
   {
     "file": "enclosure.kcl",
     "title": "Enclosure",
@@ -59,11 +54,6 @@
     "title": "A mounting bracket for the Focusrite Scarlett Solo audio interface",
     "description": "This is a bracket that holds an audio device underneath a desk or shelf. The audio device has dimensions of 144mm wide, 80mm length and 45mm depth with fillets of 6mm. This mounting bracket is designed to be 3D printed with PLA material"
   },
-  {
-    "file": "food-service-spatula.kcl",
-    "title": "Food Service Spatula",
-    "description": "Use these spatulas for mixing, flipping, and scraping."
-  },
   {
     "file": "french-press.kcl",
     "title": "French Press",
@@ -71,7 +61,7 @@
   },
   {
     "file": "gear.kcl",
-    "title": "Spur Gear",
+    "title": "Gear",
     "description": "A rotating machine part having cut teeth or, in the case of a cogwheel, inserted teeth (called cogs), which mesh with another toothed part to transmit torque. Geared devices can change the speed, torque, and direction of a power source. The two elements that define a gear are its circular shape and the teeth that are integrated into its outer edge, which are designed to fit into the teeth of another gear."
   },
   {

src/Router.tsx

@@ -21,7 +21,6 @@ import { WasmErrBanner } from 'components/WasmErrBanner'
 import { CommandBar } from 'components/CommandBar/CommandBar'
 import ModelingMachineProvider from 'components/ModelingMachineProvider'
 import FileMachineProvider from 'components/FileMachineProvider'
-import { MachineManagerProvider } from 'components/MachineManagerProvider'
 import { PATHS } from 'lib/paths'
 import {
   fileLoader,
@@ -43,7 +42,6 @@ import { coreDump } from 'lang/wasm'
 import { useMemo } from 'react'
 import { AppStateProvider } from 'AppState'
 import { reportRejection } from 'lib/trap'
-import { ProjectsContextProvider } from 'components/ProjectsContextProvider'
 
 const createRouter = isDesktop() ? createHashRouter : createBrowserRouter
 
@@ -51,22 +49,17 @@ const router = createRouter([
   {
     loader: settingsLoader,
     id: PATHS.INDEX,
-    // TODO: Re-evaluate if this is true
     /* Make sure auth is the outermost provider or else we will have
      * inefficient re-renders, use the react profiler to see. */
     element: (
       <CommandBarProvider>
         <SettingsAuthProvider>
           <LspProvider>
-            <ProjectsContextProvider>
-              <KclContextProvider>
-                <AppStateProvider>
-                  <MachineManagerProvider>
-                    <Outlet />
-                  </MachineManagerProvider>
-                </AppStateProvider>
-              </KclContextProvider>
-            </ProjectsContextProvider>
+            <KclContextProvider>
+              <AppStateProvider>
+                <Outlet />
+              </AppStateProvider>
+            </KclContextProvider>
           </LspProvider>
         </SettingsAuthProvider>
       </CommandBarProvider>

src/Toolbar.tsx

@@ -100,11 +100,6 @@ export function Toolbar({
     function resolveItemConfig(
       maybeIconConfig: ToolbarItem
     ): ToolbarItemResolved {
-      const isDisabled =
-        disableAllButtons ||
-        maybeIconConfig.status !== 'available' ||
-        maybeIconConfig.disabled?.(state) === true
-
       return {
         ...maybeIconConfig,
         title:
@@ -118,11 +113,10 @@ export function Toolbar({
           typeof maybeIconConfig.hotkey === 'string'
             ? maybeIconConfig.hotkey
             : maybeIconConfig.hotkey?.(state),
-        disabled: isDisabled,
-        disabledReason:
-          typeof maybeIconConfig.disabledReason === 'function'
-            ? maybeIconConfig.disabledReason(state)
-            : maybeIconConfig.disabledReason,
+        disabled:
+          disableAllButtons ||
+          maybeIconConfig.status !== 'available' ||
+          maybeIconConfig.disabled?.(state) === true,
         disableHotkey: maybeIconConfig.disableHotkey?.(state),
         status: maybeIconConfig.status,
       }
@@ -279,8 +273,6 @@ const ToolbarItemTooltip = memo(function ToolbarItemContents({
   itemConfig: ToolbarItemResolved
   configCallbackProps: ToolbarItemCallbackProps
 }) {
-  const { state } = useModelingContext()
-
   useHotkeys(
     itemConfig.hotkey || '',
     () => {
@@ -344,17 +336,6 @@ const ToolbarItemTooltip = memo(function ToolbarItemContents({
         )}
       </div>
       <p className="px-2 text-ch font-sans">{itemConfig.description}</p>
-      {/* Add disabled reason if item is disabled */}
-      {itemConfig.disabled && itemConfig.disabledReason && (
-        <>
-          <hr className="border-chalkboard-20 dark:border-chalkboard-80" />
-          <p className="px-2 text-ch font-sans text-chalkboard-70 dark:text-chalkboard-40">
-            {typeof itemConfig.disabledReason === 'function'
-              ? itemConfig.disabledReason(state)
-              : itemConfig.disabledReason}
-          </p>
-        </>
-      )}
       {itemConfig.links.length > 0 && (
         <>
           <hr className="border-chalkboard-20 dark:border-chalkboard-80" />

src/clientSideScene/CameraControls.ts

@@ -64,27 +64,6 @@ export type ReactCameraProperties =
 
 const lastCmdDelay = 50
 
-class CameraRateLimiter {
-  lastSend?: Date = undefined
-  rateLimitMs: number = 16 //60 FPS
-
-  send = (f: () => void) => {
-    let now = new Date()
-
-    if (
-      this.lastSend === undefined ||
-      now.getTime() - this.lastSend.getTime() > this.rateLimitMs
-    ) {
-      f()
-      this.lastSend = now
-    }
-  }
-
-  reset = () => {
-    this.lastSend = undefined
-  }
-}
-
 export class CameraControls {
   engineCommandManager: EngineCommandManager
   syncDirection: 'clientToEngine' | 'engineToClient' = 'engineToClient'
@@ -92,15 +71,15 @@ export class CameraControls {
   target: Vector3
   domElement: HTMLCanvasElement
   isDragging: boolean
-  wasDragging: boolean
   mouseDownPosition: Vector2
   mouseNewPosition: Vector2
   rotationSpeed = 0.3
   enableRotate = true
   enablePan = true
   enableZoom = true
-  moveSender: CameraRateLimiter = new CameraRateLimiter()
-  zoomSender: CameraRateLimiter = new CameraRateLimiter()
+  zoomDataFromLastFrame?: number = undefined
+  // holds coordinates, and interaction
+  moveDataFromLastFrame?: [number, number, string] = undefined
   lastPerspectiveFov: number = 45
   pendingZoom: number | null = null
   pendingRotation: Vector2 | null = null
@@ -192,36 +171,6 @@ export class CameraControls {
     }
   }
 
-  doMove = (interaction: any, coordinates: any) => {
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    this.engineCommandManager.sendSceneCommand({
-      type: 'modeling_cmd_req',
-      cmd: {
-        type: 'camera_drag_move',
-        interaction: interaction,
-        window: {
-          x: coordinates[0],
-          y: coordinates[1],
-        },
-      },
-      cmd_id: uuidv4(),
-    })
-  }
-
-  doZoom = (zoom: number) => {
-    this.handleStart()
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    this.engineCommandManager.sendSceneCommand({
-      type: 'modeling_cmd_req',
-      cmd: {
-        type: 'default_camera_zoom',
-        magnitude: (-1 * zoom) / window.devicePixelRatio,
-      },
-      cmd_id: uuidv4(),
-    })
-    this.handleEnd()
-  }
-
   constructor(
     isOrtho = false,
     domElement: HTMLCanvasElement,
@@ -234,7 +183,6 @@ export class CameraControls {
     this.target = new Vector3()
     this.domElement = domElement
     this.isDragging = false
-    this.wasDragging = false
     this.mouseDownPosition = new Vector2()
     this.mouseNewPosition = new Vector2()
 
@@ -310,6 +258,49 @@ export class CameraControls {
       this.onCameraChange()
     }
 
+    // Our stream is never more than 60fps.
+    // We can get away with capping our "virtual fps" to 60 then.
+    const FPS_VIRTUAL = 60
+
+    const doZoom = () => {
+      if (this.zoomDataFromLastFrame !== undefined) {
+        this.handleStart()
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
+        this.engineCommandManager.sendSceneCommand({
+          type: 'modeling_cmd_req',
+          cmd: {
+            type: 'default_camera_zoom',
+            magnitude:
+              (-1 * this.zoomDataFromLastFrame) / window.devicePixelRatio,
+          },
+          cmd_id: uuidv4(),
+        })
+        this.handleEnd()
+      }
+      this.zoomDataFromLastFrame = undefined
+    }
+    setInterval(doZoom, 1000 / FPS_VIRTUAL)
+
+    const doMove = () => {
+      if (this.moveDataFromLastFrame !== undefined) {
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
+        this.engineCommandManager.sendSceneCommand({
+          type: 'modeling_cmd_req',
+          cmd: {
+            type: 'camera_drag_move',
+            interaction: this.moveDataFromLastFrame[2] as any,
+            window: {
+              x: this.moveDataFromLastFrame[0],
+              y: this.moveDataFromLastFrame[1],
+            },
+          },
+          cmd_id: uuidv4(),
+        })
+      }
+      this.moveDataFromLastFrame = undefined
+    }
+    setInterval(doMove, 1000 / FPS_VIRTUAL)
+
     setTimeout(() => {
       this.engineCommandManager.subscribeTo({
         event: 'camera_drag_end',
@@ -365,8 +356,6 @@ export class CameraControls {
   onMouseDown = (event: PointerEvent) => {
     this.domElement.setPointerCapture(event.pointerId)
     this.isDragging = true
-    // Reset the wasDragging flag to false when starting a new drag
-    this.wasDragging = false
     this.mouseDownPosition.set(event.clientX, event.clientY)
     let interaction = this.getInteractionType(event)
     if (interaction === 'none') return
@@ -396,18 +385,11 @@ export class CameraControls {
       const interaction = this.getInteractionType(event)
       if (interaction === 'none') return
 
-      // If there's a valid interaction and the mouse is moving,
-      // our past (and current) interaction was a drag.
-      this.wasDragging = true
-
       if (this.syncDirection === 'engineToClient') {
-        this.moveSender.send(() => {
-          this.doMove(interaction, [event.clientX, event.clientY])
-        })
+        this.moveDataFromLastFrame = [event.clientX, event.clientY, interaction]
         return
       }
 
-      // else "clientToEngine" (Sketch Mode) or forceUpdate
       // Implement camera movement logic here based on deltaMove
       // For example, for rotating the camera around the target:
       if (interaction === 'rotate') {
@@ -436,9 +418,6 @@ export class CameraControls {
        * under the cursor. This recently moved from being handled in App.tsx.
        * This might not be the right spot, but it is more consolidated.
        */
-
-      // Clear any previous drag state
-      this.wasDragging = false
       if (this.syncDirection === 'engineToClient') {
         const newCmdId = uuidv4()
 
@@ -480,9 +459,7 @@ export class CameraControls {
 
     if (this.syncDirection === 'engineToClient') {
       if (interaction === 'zoom') {
-        this.zoomSender.send(() => {
-          this.doZoom(event.deltaY)
-        })
+        this.zoomDataFromLastFrame = event.deltaY
       } else {
         // This case will get handled when we add pan and rotate using Apple trackpad.
         console.error(

src/clientSideScene/ClientSideSceneComp.tsx

@@ -44,7 +44,6 @@ import {
 import { ActionButton } from 'components/ActionButton'
 import { err, reportRejection, trap } from 'lib/trap'
 import { useCommandsContext } from 'hooks/useCommandsContext'
-import { Node } from 'wasm-lib/kcl/bindings/Node'
 
 function useShouldHideScene(): { hideClient: boolean; hideServer: boolean } {
   const [isCamMoving, setIsCamMoving] = useState(false)
@@ -202,7 +201,7 @@ const Overlay = ({
   let xAlignment = overlay.angle < 0 ? '0%' : '-100%'
   let yAlignment = overlay.angle < -90 || overlay.angle >= 90 ? '0%' : '-100%'
 
-  const _node1 = getNodeFromPath<Node<CallExpression>>(
+  const _node1 = getNodeFromPath<CallExpression>(
     kclManager.ast,
     overlay.pathToNode,
     'CallExpression'
@@ -382,7 +381,7 @@ export async function deleteSegment({
   pathToNode: PathToNode
   sketchDetails: SketchDetails | null
 }) {
-  let modifiedAst: Node<Program> | Error = kclManager.ast
+  let modifiedAst: Program | Error = kclManager.ast
   const dependentRanges = findUsesOfTagInPipe(modifiedAst, pathToNode)
 
   const shouldContinueSegDelete = dependentRanges.length

src/clientSideScene/sceneEntities.ts

@@ -19,8 +19,6 @@ import {
 import {
   ARROWHEAD,
   AXIS_GROUP,
-  DRAFT_POINT,
-  DRAFT_POINT_GROUP,
   getSceneScale,
   INTERSECTION_PLANE_LAYER,
   OnClickCallbackArgs,
@@ -55,7 +53,7 @@ import {
   editorManager,
 } from 'lib/singletons'
 import { getNodeFromPath, getNodePathFromSourceRange } from 'lang/queryAst'
-import { executeAst, ToolTip } from 'lang/langHelpers'
+import { executeAst } from 'lang/langHelpers'
 import {
   createProfileStartHandle,
   SegmentUtils,
@@ -94,7 +92,6 @@ import { err, reportRejection, trap } from 'lib/trap'
 import { CSS2DObject } from 'three/examples/jsm/renderers/CSS2DRenderer'
 import { Point3d } from 'wasm-lib/kcl/bindings/Point3d'
 import { SegmentInputs } from 'lang/std/stdTypes'
-import { Node } from 'wasm-lib/kcl/bindings/Node'
 
 type DraftSegment = 'line' | 'tangentialArcTo'
 
@@ -316,27 +313,6 @@ export class SceneEntities {
     const intersectionPlane = this.scene.getObjectByName(RAYCASTABLE_PLANE)
     if (intersectionPlane) this.scene.remove(intersectionPlane)
   }
-  getDraftPoint() {
-    return this.scene.getObjectByName(DRAFT_POINT)
-  }
-  createDraftPoint({ point, group }: { point: Vector2; group: Group }) {
-    const dummy = new Mesh()
-    dummy.position.set(0, 0, 0)
-    const scale = sceneInfra.getClientSceneScaleFactor(dummy)
-
-    const draftPoint = createProfileStartHandle({
-      isDraft: true,
-      from: [point.x, point.y],
-      scale,
-      theme: sceneInfra._theme,
-    })
-    draftPoint.layers.set(SKETCH_LAYER)
-    group.add(draftPoint)
-  }
-  removeDraftPoint() {
-    const draftPoint = this.getDraftPoint()
-    if (draftPoint) draftPoint.removeFromParent()
-  }
 
   setupNoPointsListener({
     sketchDetails,
@@ -345,106 +321,30 @@ export class SceneEntities {
     sketchDetails: SketchDetails
     afterClick: (args: OnClickCallbackArgs) => void
   }) {
-    // TODO: Consolidate shared logic between this and setupSketch
-    // Which should just fire when the sketch mode is entered,
-    // instead of in these two separate XState states.
+    // Create a THREEjs plane to raycast clicks onto
     this.createIntersectionPlane()
-    const draftPointGroup = new Group()
-    draftPointGroup.name = DRAFT_POINT_GROUP
-    sketchDetails.origin &&
-      draftPointGroup.position.set(...sketchDetails.origin)
-    if (!(sketchDetails.yAxis && sketchDetails)) {
-      console.error('No sketch quaternion or sketch details found')
-      return
-    }
-    this.currentSketchQuaternion = quaternionFromUpNForward(
-      new Vector3(...sketchDetails.yAxis),
-      new Vector3(...sketchDetails.zAxis)
-    )
-    draftPointGroup.setRotationFromQuaternion(this.currentSketchQuaternion)
-    this.scene.add(draftPointGroup)
-
     const quaternion = quaternionFromUpNForward(
       new Vector3(...sketchDetails.yAxis),
       new Vector3(...sketchDetails.zAxis)
     )
 
     // Position the click raycast plane
-    this.intersectionPlane!.setRotationFromQuaternion(quaternion)
-    this.intersectionPlane!.position.copy(
-      new Vector3(...(sketchDetails?.origin || [0, 0, 0]))
-    )
+    if (this.intersectionPlane) {
+      this.intersectionPlane.setRotationFromQuaternion(quaternion)
+      this.intersectionPlane.position.copy(
+        new Vector3(...(sketchDetails?.origin || [0, 0, 0]))
+      )
+    }
     sceneInfra.setCallbacks({
-      onMove: (args) => {
-        if (!args.intersects.length) return
-        const axisIntersection = args.intersects.find(
-          (sceneObject) =>
-            sceneObject.object.name === X_AXIS ||
-            sceneObject.object.name === Y_AXIS
-        )
-        if (!axisIntersection) return
-        const { intersectionPoint } = args
-        // We're hovering over an axis, so we should show a draft point
-        const snappedPoint = intersectionPoint.twoD.clone()
-        if (axisIntersection.object.name === X_AXIS) {
-          snappedPoint.setComponent(1, 0)
-        } else {
-          snappedPoint.setComponent(0, 0)
-        }
-        // Either create a new one or update the existing one
-        const draftPoint = this.getDraftPoint()
-
-        if (!draftPoint) {
-          this.createDraftPoint({
-            point: snappedPoint,
-            group: draftPointGroup,
-          })
-        } else {
-          // Ignore if there are huge jumps in the mouse position,
-          // that is likely a strange behavior
-          if (
-            draftPoint.position.distanceTo(
-              new Vector3(snappedPoint.x, snappedPoint.y, 0)
-            ) > 100
-          ) {
-            return
-          }
-          draftPoint.position.set(snappedPoint.x, snappedPoint.y, 0)
-        }
-      },
-      onMouseLeave: () => {
-        this.removeDraftPoint()
-      },
       onClick: async (args) => {
-        this.removeDraftPoint()
         if (!args) return
-        // If there is a valid camera interaction that matches, do that instead
-        const interaction = sceneInfra.camControls.getInteractionType(
-          args.mouseEvent
-        )
-        if (interaction !== 'none') return
         if (args.mouseEvent.which !== 1) return
         const { intersectionPoint } = args
         if (!intersectionPoint?.twoD || !sketchDetails?.sketchPathToNode) return
-
-        // Snap to either or both axes
-        // if the click intersects their meshes
-        const yAxisIntersection = args.intersects.find(
-          (sceneObject) => sceneObject.object.name === Y_AXIS
-        )
-        const xAxisIntersection = args.intersects.find(
-          (sceneObject) => sceneObject.object.name === X_AXIS
-        )
-
-        const snappedClickPoint = {
-          x: yAxisIntersection ? 0 : intersectionPoint.twoD.x,
-          y: xAxisIntersection ? 0 : intersectionPoint.twoD.y,
-        }
-
         const addStartProfileAtRes = addStartProfileAt(
           kclManager.ast,
           sketchDetails.sketchPathToNode,
-          [snappedClickPoint.x, snappedClickPoint.y]
+          [intersectionPoint.twoD.x, intersectionPoint.twoD.y]
         )
 
         if (trap(addStartProfileAtRes)) return
@@ -452,7 +352,6 @@ export class SceneEntities {
 
         await kclManager.updateAst(modifiedAst, false)
         this.removeIntersectionPlane()
-        this.scene.remove(draftPointGroup)
 
         // Now perform the caller-specified action
         afterClick(args)
@@ -470,14 +369,14 @@ export class SceneEntities {
     selectionRanges,
   }: {
     sketchPathToNode: PathToNode
-    maybeModdedAst: Node<Program>
+    maybeModdedAst: Program
     draftExpressionsIndices?: { start: number; end: number }
     forward: [number, number, number]
     up: [number, number, number]
     position?: [number, number, number]
     selectionRanges?: Selections
   }): Promise<{
-    truncatedAst: Node<Program>
+    truncatedAst: Program
     programMemoryOverride: ProgramMemory
     sketch: Sketch
     variableDeclarationName: string
@@ -508,7 +407,7 @@ export class SceneEntities {
     if (err(sketch)) return Promise.reject(sketch)
     if (!sketch) return Promise.reject('sketch not found')
 
-    if (!isArray(sketch?.paths))
+    if (!isArray(sketch?.value))
       return {
         truncatedAst,
         programMemoryOverride,
@@ -525,20 +424,24 @@ export class SceneEntities {
     const dummy = new Mesh()
     // TODO: When we actually have sketch positions and rotations we can use them here.
     dummy.position.set(0, 0, 0)
-    const scale = sceneInfra.getClientSceneScaleFactor(dummy)
+    const orthoFactor = orthoScale(sceneInfra.camControls.camera)
+    const factor =
+      (sceneInfra.camControls.camera instanceof OrthographicCamera
+        ? orthoFactor
+        : perspScale(sceneInfra.camControls.camera, dummy)) /
+      sceneInfra._baseUnitMultiplier
 
     const segPathToNode = getNodePathFromSourceRange(
       maybeModdedAst,
       sketch.start.__geoMeta.sourceRange
     )
-    if (sketch?.paths?.[0]?.type !== 'Circle') {
+    if (sketch?.value?.[0]?.type !== 'Circle') {
       const _profileStart = createProfileStartHandle({
         from: sketch.start.from,
         id: sketch.start.__geoMeta.id,
         pathToNode: segPathToNode,
-        scale,
+        scale: factor,
         theme: sceneInfra._theme,
-        isDraft: false,
       })
       _profileStart.layers.set(SKETCH_LAYER)
       _profileStart.traverse((child) => {
@@ -548,16 +451,16 @@ export class SceneEntities {
       this.activeSegments[JSON.stringify(segPathToNode)] = _profileStart
     }
     const callbacks: (() => SegmentOverlayPayload | null)[] = []
-    sketch.paths.forEach((segment, index) => {
+    sketch.value.forEach((segment, index) => {
       let segPathToNode = getNodePathFromSourceRange(
         maybeModdedAst,
         segment.__geoMeta.sourceRange
       )
       if (
         draftExpressionsIndices &&
-        (sketch.paths[index - 1] || sketch.start)
+        (sketch.value[index - 1] || sketch.start)
       ) {
-        const previousSegment = sketch.paths[index - 1] || sketch.start
+        const previousSegment = sketch.value[index - 1] || sketch.start
         const previousSegmentPathToNode = getNodePathFromSourceRange(
           maybeModdedAst,
           previousSegment.__geoMeta.sourceRange
@@ -608,13 +511,13 @@ export class SceneEntities {
               to: segment.to,
             }
       const result = initSegment({
-        prevSegment: sketch.paths[index - 1],
+        prevSegment: sketch.value[index - 1],
         callExpName,
         input,
         id: segment.__geoMeta.id,
         pathToNode: segPathToNode,
         isDraftSegment,
-        scale,
+        scale: factor,
         texture: sceneInfra.extraSegmentTexture,
         theme: sceneInfra._theme,
         isSelected,
@@ -658,7 +561,7 @@ export class SceneEntities {
   }
   updateAstAndRejigSketch = async (
     sketchPathToNode: PathToNode,
-    modifiedAst: Node<Program> | Error,
+    modifiedAst: Program | Error,
     forward: [number, number, number],
     up: [number, number, number],
     origin: [number, number, number]
@@ -707,9 +610,9 @@ export class SceneEntities {
       variableDeclarationName
     )
     if (err(sg)) return Promise.reject(sg)
-    const lastSeg = sg?.paths?.slice(-1)[0] || sg.start
+    const lastSeg = sg?.value?.slice(-1)[0] || sg.start
 
-    const index = sg.paths.length // because we've added a new segment that's not in the memory yet, no need for `-1`
+    const index = sg.value.length // because we've added a new segment that's not in the memory yet, no need for `-1`
     const mod = addNewSketchLn({
       node: _ast,
       programMemory: kclManager.programMemory,
@@ -742,24 +645,16 @@ export class SceneEntities {
     sceneInfra.setCallbacks({
       onClick: async (args) => {
         if (!args) return
-        // If there is a valid camera interaction that matches, do that instead
-        const interaction = sceneInfra.camControls.getInteractionType(
-          args.mouseEvent
-        )
-        if (interaction !== 'none') return
         if (args.mouseEvent.which !== 1) return
-
         const { intersectionPoint } = args
         let intersection2d = intersectionPoint?.twoD
-        const intersectsProfileStart = args.intersects
+        const profileStart = args.intersects
           .map(({ object }) => getParentGroup(object, [PROFILE_START]))
           .find((a) => a?.name === PROFILE_START)
 
         let modifiedAst
-
-        // Snapping logic for the profile start handle
-        if (intersectsProfileStart) {
-          const lastSegment = sketch.paths.slice(-1)[0]
+        if (profileStart) {
+          const lastSegment = sketch.value.slice(-1)[0]
           modifiedAst = addCallExpressionsToPipe({
             node: kclManager.ast,
             programMemory: kclManager.programMemory,
@@ -791,39 +686,19 @@ export class SceneEntities {
           })
           if (trap(modifiedAst)) return Promise.reject(modifiedAst)
         } else if (intersection2d) {
-          const intersectsYAxis = args.intersects.find(
-            (sceneObject) => sceneObject.object.name === Y_AXIS
-          )
-          const intersectsXAxis = args.intersects.find(
-            (sceneObject) => sceneObject.object.name === X_AXIS
-          )
-
-          const lastSegment = sketch.paths.slice(-1)[0]
-          const snappedPoint = {
-            x: intersectsYAxis ? 0 : intersection2d.x,
-            y: intersectsXAxis ? 0 : intersection2d.y,
-          }
-
-          let resolvedFunctionName: ToolTip = 'line'
-
-          // This might need to become its own function if we want more
-          // case-based logic for different segment types
-          if (lastSegment.type === 'TangentialArcTo') {
-            resolvedFunctionName = 'tangentialArcTo'
-          } else if (snappedPoint.x === 0 || snappedPoint.y === 0) {
-            // We consider a point placed on axes or origin to be absolute
-            resolvedFunctionName = 'lineTo'
-          }
-
+          const lastSegment = sketch.value.slice(-1)[0]
           const tmp = addNewSketchLn({
             node: kclManager.ast,
             programMemory: kclManager.programMemory,
             input: {
               type: 'straight-segment',
               from: [lastSegment.to[0], lastSegment.to[1]],
-              to: [snappedPoint.x, snappedPoint.y],
+              to: [intersection2d.x, intersection2d.y],
             },
-            fnName: resolvedFunctionName,
+            fnName:
+              lastSegment.type === 'TangentialArcTo'
+                ? 'tangentialArcTo'
+                : 'line',
             pathToNode: sketchPathToNode,
           })
           if (trap(tmp)) return Promise.reject(tmp)
@@ -835,7 +710,7 @@ export class SceneEntities {
         }
 
         await kclManager.executeAstMock(modifiedAst)
-        if (intersectsProfileStart) {
+        if (profileStart) {
           sceneInfra.modelingSend({ type: 'CancelSketch' })
         } else {
           await this.setUpDraftSegment(
@@ -860,6 +735,7 @@ export class SceneEntities {
           },
         })
       },
+      ...this.mouseEnterLeaveCallbacks(),
     })
   }
   setupDraftRectangle = async (
@@ -941,7 +817,7 @@ export class SceneEntities {
           variableDeclarationName
         )
         if (err(sketch)) return Promise.reject(sketch)
-        const sgPaths = sketch.paths
+        const sgPaths = sketch.value
         const orthoFactor = orthoScale(sceneInfra.camControls.camera)
 
         this.updateSegment(sketch.start, 0, 0, _ast, orthoFactor, sketch)
@@ -950,11 +826,6 @@ export class SceneEntities {
         )
       },
       onClick: async (args) => {
-        // If there is a valid camera interaction that matches, do that instead
-        const interaction = sceneInfra.camControls.getInteractionType(
-          args.mouseEvent
-        )
-        if (interaction !== 'none') return
         // Commit the rectangle to the full AST/code and return to sketch.idle
         const cornerPoint = args.intersectionPoint?.twoD
         if (!cornerPoint || args.mouseEvent.button !== 0) return
@@ -997,7 +868,7 @@ export class SceneEntities {
             variableDeclarationName
           )
           if (err(sketch)) return
-          const sgPaths = sketch.paths
+          const sgPaths = sketch.value
           const orthoFactor = orthoScale(sceneInfra.camControls.camera)
 
           // Update the starting segment of the THREEjs scene
@@ -1114,7 +985,7 @@ export class SceneEntities {
           variableDeclarationName
         )
         if (err(sketch)) return
-        const sgPaths = sketch.paths
+        const sgPaths = sketch.value
         const orthoFactor = orthoScale(sceneInfra.camControls.camera)
 
         this.updateSegment(sketch.start, 0, 0, _ast, orthoFactor, sketch)
@@ -1123,11 +994,6 @@ export class SceneEntities {
         )
       },
       onClick: async (args) => {
-        // If there is a valid camera interaction that matches, do that instead
-        const interaction = sceneInfra.camControls.getInteractionType(
-          args.mouseEvent
-        )
-        if (interaction !== 'none') return
         // Commit the rectangle to the full AST/code and return to sketch.idle
         const cornerPoint = args.intersectionPoint?.twoD
         if (!cornerPoint || args.mouseEvent.button !== 0) return
@@ -1239,7 +1105,7 @@ export class SceneEntities {
 
           const pipeIndex = pathToNode[pathToNodeIndex + 1][0] as number
           if (addingNewSegmentStatus === 'nothing') {
-            const prevSegment = sketch.paths[pipeIndex - 2]
+            const prevSegment = sketch.value[pipeIndex - 2]
             const mod = addNewSketchLn({
               node: kclManager.ast,
               programMemory: kclManager.programMemory,
@@ -1291,11 +1157,6 @@ export class SceneEntities {
       },
       onMove: () => {},
       onClick: (args) => {
-        // If there is a valid camera interaction that matches, do that instead
-        const interaction = sceneInfra.camControls.getInteractionType(
-          args.mouseEvent
-        )
-        if (interaction !== 'none') return
         if (args?.mouseEvent.which !== 1) return
         if (!args || !args.selected) {
           sceneInfra.modelingSend({
@@ -1316,7 +1177,7 @@ export class SceneEntities {
   }
   prepareTruncatedMemoryAndAst = (
     sketchPathToNode: PathToNode,
-    ast?: Node<Program>,
+    ast?: Program,
     draftSegment?: DraftSegment
   ) =>
     prepareTruncatedMemoryAndAst(
@@ -1337,35 +1198,20 @@ export class SceneEntities {
     sketchPathToNode: PathToNode
     intersects: Intersection<Object3D<Object3DEventMap>>[]
     draftInfo?: {
-      truncatedAst: Node<Program>
+      truncatedAst: Program
       programMemoryOverride: ProgramMemory
       variableDeclarationName: string
     }
   }) {
-    const intersectsProfileStart =
+    const profileStart =
       draftInfo &&
       intersects
         .map(({ object }) => getParentGroup(object, [PROFILE_START]))
         .find((a) => a?.name === PROFILE_START)
-    const intersection2d = intersectsProfileStart
-      ? new Vector2(
-          intersectsProfileStart.position.x,
-          intersectsProfileStart.position.y
-        )
+    const intersection2d = profileStart
+      ? new Vector2(profileStart.position.x, profileStart.position.y)
       : _intersection2d
 
-    const intersectsYAxis = intersects.find(
-      (sceneObject) => sceneObject.object.name === Y_AXIS
-    )
-    const intersectsXAxis = intersects.find(
-      (sceneObject) => sceneObject.object.name === X_AXIS
-    )
-
-    const snappedPoint = new Vector2(
-      intersectsYAxis ? 0 : intersection2d.x,
-      intersectsXAxis ? 0 : intersection2d.y
-    )
-
     const group = getParentGroup(object, SEGMENT_BODIES_PLUS_PROFILE_START)
     const subGroup = getParentGroup(object, [ARROWHEAD, CIRCLE_CENTER_HANDLE])
     if (!group) return
@@ -1385,10 +1231,10 @@ export class SceneEntities {
       group.userData.from[0],
       group.userData.from[1],
     ]
-    const dragTo: [number, number] = [snappedPoint.x, snappedPoint.y]
+    const dragTo: [number, number] = [intersection2d.x, intersection2d.y]
     let modifiedAst = draftInfo ? draftInfo.truncatedAst : { ...kclManager.ast }
 
-    const _node = getNodeFromPath<Node<CallExpression>>(
+    const _node = getNodeFromPath<CallExpression>(
       modifiedAst,
       pathToNode,
       'CallExpression'
@@ -1400,7 +1246,7 @@ export class SceneEntities {
 
     let modded:
       | {
-          modifiedAst: Node<Program>
+          modifiedAst: Program
           pathToNode: PathToNode
         }
       | Error
@@ -1499,7 +1345,7 @@ export class SceneEntities {
       }
       if (!sketch) return
 
-      const sgPaths = sketch.paths
+      const sgPaths = sketch.value
       const orthoFactor = orthoScale(sceneInfra.camControls.camera)
 
       this.updateSegment(
@@ -1547,7 +1393,7 @@ export class SceneEntities {
       modifiedAst,
       segment.__geoMeta.sourceRange
     )
-    const sgPaths = sketch.paths
+    const sgPaths = sketch.value
     const originalPathToNodeStr = JSON.stringify(segPathToNode)
     segPathToNode[1][0] = varDecIndex
     const pathToNodeStr = JSON.stringify(segPathToNode)
@@ -1695,7 +1541,7 @@ export class SceneEntities {
         if (parent?.userData?.pathToNode) {
           const updatedAst = parse(recast(kclManager.ast))
           if (trap(updatedAst)) return
-          const _node = getNodeFromPath<Node<CallExpression>>(
+          const _node = getNodeFromPath<CallExpression>(
             updatedAst,
             parent.userData.pathToNode,
             'CallExpression'
@@ -1830,12 +1676,12 @@ export type DefaultPlaneStr = 'XY' | 'XZ' | 'YZ' | '-XY' | '-XZ' | '-YZ'
 
 function prepareTruncatedMemoryAndAst(
   sketchPathToNode: PathToNode,
-  ast: Node<Program>,
+  ast: Program,
   programMemory: ProgramMemory,
   draftSegment?: DraftSegment
 ):
   | {
-      truncatedAst: Node<Program>
+      truncatedAst: Program
       programMemoryOverride: ProgramMemory
       variableDeclarationName: string
     }
@@ -1843,7 +1689,7 @@ function prepareTruncatedMemoryAndAst(
   const bodyIndex = Number(sketchPathToNode?.[1]?.[0]) || 0
   const _ast = structuredClone(ast)
 
-  const _node = getNodeFromPath<Node<VariableDeclaration>>(
+  const _node = getNodeFromPath<VariableDeclaration>(
     _ast,
     sketchPathToNode || [],
     'VariableDeclaration'
@@ -1855,7 +1701,7 @@ function prepareTruncatedMemoryAndAst(
     variableDeclarationName
   )
   if (err(sg)) return sg
-  const lastSeg = sg?.paths.slice(-1)[0]
+  const lastSeg = sg?.value.slice(-1)[0]
   if (draftSegment) {
     // truncatedAst needs to setup with another segment at the end
     let newSegment
@@ -1893,15 +1739,15 @@ function prepareTruncatedMemoryAndAst(
     ).body.slice(-1)[0].start = lastPipeItem.start
 
     _ast.end = lastPipeItem.end
-    const varDec = _ast.body[bodyIndex] as Node<VariableDeclaration>
+    const varDec = _ast.body[bodyIndex] as VariableDeclaration
     varDec.end = lastPipeItem.end
     const declarator = varDec.declarations[0]
     declarator.end = lastPipeItem.end
-    const init = declarator.init as Node<PipeExpression>
+    const init = declarator.init as PipeExpression
     init.end = lastPipeItem.end
     init.body.slice(-1)[0].end = lastPipeItem.end
   }
-  const truncatedAst: Node<Program> = {
+  const truncatedAst: Program = {
     ..._ast,
     body: [structuredClone(_ast.body[bodyIndex])],
   }

src/clientSideScene/sceneInfra.ts

@@ -30,7 +30,6 @@ import { MouseState, SegmentOverlayPayload } from 'machines/modelingMachine'
 import { getAngle, throttle } from 'lib/utils'
 import { Themes } from 'lib/theme'
 import { CSS2DRenderer } from 'three/examples/jsm/renderers/CSS2DRenderer'
-import { orthoScale, perspScale } from './helpers'
 
 type SendType = ReturnType<typeof useModelingContext>['send']
 
@@ -50,10 +49,6 @@ export const RAYCASTABLE_PLANE = 'raycastable-plane'
 
 export const X_AXIS = 'xAxis'
 export const Y_AXIS = 'yAxis'
-/** the THREEjs representation of the group surrounding a "snapped" point that is not yet placed */
-export const DRAFT_POINT_GROUP = 'draft-point-group'
-/** the THREEjs representation of a "snapped" point that is not yet placed */
-export const DRAFT_POINT = 'draft-point'
 export const AXIS_GROUP = 'axisGroup'
 export const SKETCH_GROUP_SEGMENTS = 'sketch-group-segments'
 export const ARROWHEAD = 'arrowhead'
@@ -65,11 +60,6 @@ export interface OnMouseEnterLeaveArgs {
   selected: Object3D<Object3DEventMap>
   dragSelected?: Object3D<Object3DEventMap>
   mouseEvent: MouseEvent
-  /** The intersection of the mouse with the THREEjs raycast plane */
-  intersectionPoint?: {
-    twoD?: Vector2
-    threeD?: Vector3
-  }
 }
 
 interface OnDragCallbackArgs extends OnMouseEnterLeaveArgs {
@@ -223,7 +213,7 @@ export class SceneInfra {
     to: Coords2d
     angle?: number
   }): SegmentOverlayPayload | null {
-    if (!group.userData.draft && group.userData.pathToNode && arrowGroup) {
+    if (group.userData.pathToNode && arrowGroup) {
       const vector = new Vector3(0, 0, 0)
 
       // Get the position of the object3D in world space
@@ -358,42 +348,29 @@ export class SceneInfra {
     window.removeEventListener('resize', this.onWindowResize)
     // Dispose of any other resources like geometries, materials, textures
   }
-  getClientSceneScaleFactor(meshOrGroup: Mesh | Group) {
-    const orthoFactor = orthoScale(this.camControls.camera)
-    const factor =
-      (this.camControls.camera instanceof OrthographicCamera
-        ? orthoFactor
-        : perspScale(this.camControls.camera, meshOrGroup)) /
-      this._baseUnitMultiplier
-    return factor
-  }
   getPlaneIntersectPoint = (): {
     twoD?: Vector2
     threeD?: Vector3
     intersection: Intersection<Object3D<Object3DEventMap>>
   } | null => {
-    // Get the orientations from the camera and mouse position
     this.planeRaycaster.setFromCamera(
       this.currentMouseVector,
       this.camControls.camera
     )
-    // Get the intersection of the ray with the default planes
     const planeIntersects = this.planeRaycaster.intersectObjects(
       this.scene.children,
       true
     )
-    if (!planeIntersects.length) return null
-
-    // Find the intersection with the raycastable (or sketch) plane
-    const raycastablePlaneIntersection = planeIntersects.find(
+    const recastablePlaneIntersect = planeIntersects.find(
       (intersect) => intersect.object.name === RAYCASTABLE_PLANE
     )
-    if (!raycastablePlaneIntersection)
-      return { intersection: planeIntersects[0] }
-    const planePosition = raycastablePlaneIntersection.object.position
-    const inversePlaneQuaternion =
-      raycastablePlaneIntersection.object.quaternion.clone().invert()
-    const intersectPoint = raycastablePlaneIntersection.point
+    if (!planeIntersects.length) return null
+    if (!recastablePlaneIntersect) return { intersection: planeIntersects[0] }
+    const planePosition = planeIntersects[0].object.position
+    const inversePlaneQuaternion = planeIntersects[0].object.quaternion
+      .clone()
+      .invert()
+    const intersectPoint = planeIntersects[0].point
     let transformedPoint = intersectPoint.clone()
     if (transformedPoint) {
       transformedPoint.applyQuaternion(inversePlaneQuaternion)
@@ -470,26 +447,18 @@ export class SceneInfra {
 
     if (intersects[0]) {
       const firstIntersectObject = intersects[0].object
-      const planeIntersectPoint = this.getPlaneIntersectPoint()
-      const intersectionPoint = {
-        twoD: planeIntersectPoint?.twoD,
-        threeD: planeIntersectPoint?.threeD,
-      }
-
       if (this.hoveredObject !== firstIntersectObject) {
         const hoveredObj = this.hoveredObject
         this.hoveredObject = null
         await this.onMouseLeave({
           selected: hoveredObj,
           mouseEvent: mouseEvent,
-          intersectionPoint,
         })
         this.hoveredObject = firstIntersectObject
         await this.onMouseEnter({
           selected: this.hoveredObject,
           dragSelected: this.selected?.object,
           mouseEvent: mouseEvent,
-          intersectionPoint,
         })
         if (!this.selected)
           this.updateMouseState({

src/clientSideScene/segments.ts

@@ -45,7 +45,6 @@ import {
 import { getTangentPointFromPreviousArc } from 'lib/utils2d'
 import {
   ARROWHEAD,
-  DRAFT_POINT,
   SceneInfra,
   SEGMENT_LENGTH_LABEL,
   SEGMENT_LENGTH_LABEL_OFFSET_PX,
@@ -59,7 +58,7 @@ import { err } from 'lib/trap'
 
 interface CreateSegmentArgs {
   input: SegmentInputs
-  prevSegment: Sketch['paths'][number]
+  prevSegment: Sketch['value'][number]
   id: string
   pathToNode: PathToNode
   isDraftSegment?: boolean
@@ -73,7 +72,7 @@ interface CreateSegmentArgs {
 
 interface UpdateSegmentArgs {
   input: SegmentInputs
-  prevSegment: Sketch['paths'][number]
+  prevSegment: Sketch['value'][number]
   group: Group
   sceneInfra: SceneInfra
   scale?: number
@@ -148,7 +147,6 @@ class StraightSegment implements SegmentUtils {
     segmentGroup.name = STRAIGHT_SEGMENT
     segmentGroup.userData = {
       type: STRAIGHT_SEGMENT,
-      draft: isDraftSegment,
       id,
       from,
       to,
@@ -349,7 +347,6 @@ class TangentialArcToSegment implements SegmentUtils {
     mesh.name = meshName
     group.userData = {
       type: TANGENTIAL_ARC_TO_SEGMENT,
-      draft: isDraftSegment,
       id,
       from,
       to,
@@ -518,18 +515,11 @@ class CircleSegment implements SegmentUtils {
     const meshType = isDraftSegment ? CIRCLE_SEGMENT_DASH : CIRCLE_SEGMENT_BODY
     const arrowGroup = createArrowhead(scale, theme, color)
     const circleCenterGroup = createCircleCenterHandle(scale, theme, color)
-    // A radius indicator that appears from the center to the perimeter
-    const radiusIndicatorGroup = createLengthIndicator({
-      from: center,
-      to: [center[0] + radius, center[1]],
-      scale,
-    })
 
     arcMesh.userData.type = meshType
     arcMesh.name = meshType
     group.userData = {
       type: CIRCLE_SEGMENT,
-      draft: isDraftSegment,
       id,
       from,
       radius,
@@ -542,7 +532,7 @@ class CircleSegment implements SegmentUtils {
     }
     group.name = CIRCLE_SEGMENT
 
-    group.add(arcMesh, arrowGroup, circleCenterGroup, radiusIndicatorGroup)
+    group.add(arcMesh, arrowGroup, circleCenterGroup)
     const updateOverlaysCallback = this.update({
       prevSegment,
       input,
@@ -574,9 +564,6 @@ class CircleSegment implements SegmentUtils {
     group.userData.radius = radius
     group.userData.prevSegment = prevSegment
     const arrowGroup = group.getObjectByName(ARROWHEAD) as Group
-    const radiusLengthIndicator = group.getObjectByName(
-      SEGMENT_LENGTH_LABEL
-    ) as Group
     const circleCenterHandle = group.getObjectByName(
       CIRCLE_CENTER_HANDLE
     ) as Group
@@ -594,14 +581,11 @@ class CircleSegment implements SegmentUtils {
     }
 
     if (arrowGroup) {
-      // The arrowhead is placed at the perimeter of the circle,
-      // pointing up and to the right
-      const arrowPoint = {
-        x: center[0] + Math.cos(Math.PI / 4) * radius,
-        y: center[1] + Math.sin(Math.PI / 4) * radius,
-      }
-
-      arrowGroup.position.set(arrowPoint.x, arrowPoint.y, 0)
+      arrowGroup.position.set(
+        center[0] + Math.cos(Math.PI / 4) * radius,
+        center[1] + Math.sin(Math.PI / 4) * radius,
+        0
+      )
 
       const arrowheadAngle = Math.PI / 4
       arrowGroup.quaternion.setFromUnitVectors(
@@ -612,31 +596,6 @@ class CircleSegment implements SegmentUtils {
       arrowGroup.visible = isHandlesVisible
     }
 
-    if (radiusLengthIndicator) {
-      // The radius indicator is placed at the midpoint of the radius,
-      // at a 45 degree CCW angle from the positive X-axis
-      const indicatorPoint = {
-        x: center[0] + (Math.cos(Math.PI / 4) * radius) / 2,
-        y: center[1] + (Math.sin(Math.PI / 4) * radius) / 2,
-      }
-      const labelWrapper = radiusLengthIndicator.getObjectByName(
-        SEGMENT_LENGTH_LABEL_TEXT
-      ) as CSS2DObject
-      const labelWrapperElem = labelWrapper.element as HTMLDivElement
-      const label = labelWrapperElem.children[0] as HTMLParagraphElement
-      label.innerText = `${roundOff(radius)}`
-      label.classList.add(SEGMENT_LENGTH_LABEL_TEXT)
-      const isPlaneBackFace = center[0] > indicatorPoint.x
-      label.style.setProperty(
-        '--degree',
-        `${isPlaneBackFace ? '45' : '-45'}deg`
-      )
-      label.style.setProperty('--x', `0px`)
-      label.style.setProperty('--y', `0px`)
-      labelWrapper.position.set(indicatorPoint.x, indicatorPoint.y, 0)
-      radiusLengthIndicator.visible = isHandlesVisible
-    }
-
     if (circleCenterHandle) {
       circleCenterHandle.position.set(center[0], center[1], 0)
       circleCenterHandle.scale.set(scale, scale, scale)
@@ -687,20 +646,19 @@ class CircleSegment implements SegmentUtils {
 
 export function createProfileStartHandle({
   from,
-  isDraft = false,
+  id,
+  pathToNode,
   scale = 1,
   theme,
   isSelected,
-  ...rest
 }: {
   from: Coords2d
+  id: string
+  pathToNode: PathToNode
   scale?: number
   theme: Themes
   isSelected?: boolean
-} & (
-  | { isDraft: true }
-  | { isDraft: false; id: string; pathToNode: PathToNode }
-)) {
+}) {
   const group = new Group()
 
   const geometry = new BoxGeometry(12, 12, 12) // in pixels scaled later
@@ -713,12 +671,13 @@ export function createProfileStartHandle({
 
   group.userData = {
     type: PROFILE_START,
+    id,
     from,
+    pathToNode,
     isSelected,
     baseColor,
-    ...rest,
   }
-  group.name = isDraft ? DRAFT_POINT : PROFILE_START
+  group.name = PROFILE_START
   group.position.set(from[0], from[1], 0)
   group.scale.set(scale, scale, scale)
   return group

src/components/CommandBar/CommandArgOptionInput.tsx

@@ -135,9 +135,7 @@ function CommandArgOptionInput({
           <Combobox.Input
             id="option-input"
             ref={inputRef}
-            onChange={(event) =>
-              !event.target.disabled && setQuery(event.target.value)
-            }
+            onChange={(event) => setQuery(event.target.value)}
             className="flex-grow px-2 py-1 border-b border-b-chalkboard-100 dark:border-b-chalkboard-80 !bg-transparent focus:outline-none"
             onKeyDown={(event) => {
               if (event.metaKey && event.key === 'k')
@@ -177,18 +175,9 @@ function CommandArgOptionInput({
             <Combobox.Option
               key={option.name}
               value={option}
-              disabled={option.disabled}
               className="flex items-center gap-2 px-4 py-1 first:mt-2 last:mb-2 ui-active:bg-primary/10 dark:ui-active:bg-chalkboard-90"
             >
-              <p
-                className={`flex-grow ${
-                  (option.disabled &&
-                    'text-chalkboard-70 dark:text-chalkboard-50 cursor-not-allowed') ||
-                  ''
-                }`}
-              >
-                {option.name}
-              </p>
+              <p className="flex-grow">{option.name} </p>
               {option.value === currentOption?.value && (
                 <small className="text-chalkboard-70 dark:text-chalkboard-50">
                   current

src/components/FileMachineProvider.tsx

@@ -259,7 +259,7 @@ export const FileMachineProvider = ({
             // 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)
+            navigate('.')
             return {
               message: 'No more files in project, created main.kcl',
             }

src/components/FileTree.tsx

@@ -2,7 +2,7 @@ import type { IndexLoaderData } from 'lib/types'
 import { PATHS } from 'lib/paths'
 import { ActionButton } from './ActionButton'
 import Tooltip from './Tooltip'
-import { Dispatch, useCallback, useRef, useState } from 'react'
+import { Dispatch, useCallback, useEffect, useRef, useState } from 'react'
 import { useNavigate, useRouteLoaderData } from 'react-router-dom'
 import { Disclosure } from '@headlessui/react'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
@@ -13,6 +13,7 @@ import { sortProject } from 'lib/desktopFS'
 import { FILE_EXT } from 'lib/constants'
 import { CustomIcon } from './CustomIcon'
 import { codeManager, kclManager } from 'lib/singletons'
+import { useDocumentHasFocus } from 'hooks/useDocumentHasFocus'
 import { useLspContext } from './LspProvider'
 import useHotkeyWrapper from 'lib/hotkeyWrapper'
 import { useModelingContext } from 'hooks/useModelingContext'
@@ -20,8 +21,6 @@ import { DeleteConfirmationDialog } from './ProjectCard/DeleteProjectDialog'
 import { ContextMenu, ContextMenuItem } from './ContextMenu'
 import usePlatform from 'hooks/usePlatform'
 import { FileEntry } from 'lib/project'
-import { useFileSystemWatcher } from 'hooks/useFileSystemWatcher'
-import { normalizeLineEndings } from 'lib/codeEditor'
 
 function getIndentationCSS(level: number) {
   return `calc(1rem * ${level + 1})`
@@ -132,30 +131,6 @@ const FileTreeItem = ({
   const isCurrentFile = fileOrDir.path === currentFile?.path
   const itemRef = useRef(null)
 
-  // Since every file or directory gets its own FileTreeItem, we can do this.
-  // Because subtrees only render when they are opened, that means this
-  // only listens when they open. Because this acts like a useEffect, when
-  // the ReactNodes are destroyed, so is this listener :)
-  useFileSystemWatcher(
-    async (eventType, path) => {
-      // Don't try to read a file that was removed.
-      if (isCurrentFile && eventType !== 'unlink') {
-        // Prevents a cyclic read / write causing editor problems such as
-        // misplaced cursor positions.
-        if (codeManager.writeCausedByAppCheckedInFileTreeFileSystemWatcher) {
-          codeManager.writeCausedByAppCheckedInFileTreeFileSystemWatcher = false
-          return
-        }
-
-        let code = await window.electron.readFile(path, { encoding: 'utf-8' })
-        code = normalizeLineEndings(code)
-        codeManager.updateCodeStateEditor(code)
-      }
-      fileSend({ type: 'Refresh' })
-    },
-    [fileOrDir.path]
-  )
-
   const isRenaming = fileContext.itemsBeingRenamed.includes(fileOrDir.path)
   const removeCurrentItemFromRenaming = useCallback(
     () =>
@@ -179,13 +154,6 @@ const FileTreeItem = ({
     })
   }, [fileContext.itemsBeingRenamed, fileOrDir.path, fileSend])
 
-  const clickDirectory = () => {
-    fileSend({
-      type: 'Set selected directory',
-      directory: fileOrDir,
-    })
-  }
-
   function handleKeyUp(e: React.KeyboardEvent<HTMLButtonElement>) {
     if (e.metaKey && e.key === 'Backspace') {
       // Open confirmation dialog
@@ -274,8 +242,18 @@ const FileTreeItem = ({
                   }
                   style={{ paddingInlineStart: getIndentationCSS(level) }}
                   onClick={(e) => e.currentTarget.focus()}
-                  onClickCapture={clickDirectory}
-                  onFocusCapture={clickDirectory}
+                  onClickCapture={(e) =>
+                    fileSend({
+                      type: 'Set selected directory',
+                      directory: fileOrDir,
+                    })
+                  }
+                  onFocusCapture={(e) =>
+                    fileSend({
+                      type: 'Set selected directory',
+                      directory: fileOrDir,
+                    })
+                  }
                   onKeyDown={(e) => e.key === 'Enter' && e.preventDefault()}
                   onKeyUp={handleKeyUp}
                 >
@@ -491,36 +469,27 @@ export const FileTreeInner = ({
   const loaderData = useRouteLoaderData(PATHS.FILE) as IndexLoaderData
   const { send: fileSend, context: fileContext } = useFileContext()
   const { send: modelingSend } = useModelingContext()
+  const documentHasFocus = useDocumentHasFocus()
 
-  // Refresh the file tree when there are changes.
-  useFileSystemWatcher(
-    async (eventType, path) => {
-      // Our other watcher races with this watcher on the current file changes,
-      // so we need to stop this one from reacting at all, otherwise Bad Things
-      // Happen™.
-      const isCurrentFile = loaderData.file?.path === path
-      const hasChanged = eventType === 'change'
-      if (isCurrentFile && hasChanged) return
-      fileSend({ type: 'Refresh' })
-    },
-    [loaderData?.project?.path, fileContext.selectedDirectory.path].filter(
-      (x: string | undefined) => x !== undefined
-    )
-  )
-
-  const clickDirectory = () => {
-    fileSend({
-      type: 'Set selected directory',
-      directory: fileContext.project,
-    })
-  }
+  // Refresh the file tree when the document gets focus
+  useEffect(() => {
+    fileSend({ type: 'Refresh' })
+  }, [documentHasFocus])
 
   return (
     <div
       className="overflow-auto pb-12 absolute inset-0"
       data-testid="file-pane-scroll-container"
     >
-      <ul className="m-0 p-0 text-sm" onClickCapture={clickDirectory}>
+      <ul
+        className="m-0 p-0 text-sm"
+        onClickCapture={(e) => {
+          fileSend({
+            type: 'Set selected directory',
+            directory: fileContext.project,
+          })
+        }}
+      >
         {sortProject(fileContext.project?.children || []).map((fileOrDir) => (
           <FileTreeItem
             project={fileContext.project}
@@ -538,19 +507,3 @@ export const FileTreeInner = ({
     </div>
   )
 }
-
-export const FileTreeRoot = () => {
-  const loaderData = useRouteLoaderData(PATHS.FILE) as IndexLoaderData
-  const { project } = loaderData
-
-  // project.path should never be empty here but I guess during initial loading
-  // it can be.
-  return (
-    <div
-      className="max-w-xs text-ellipsis overflow-hidden cursor-pointer"
-      title={project?.path ?? ''}
-    >
-      {project?.name ?? ''}
-    </div>
-  )
-}

src/components/HelpMenu.tsx

@@ -4,7 +4,7 @@ import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
 import { CustomIcon } from './CustomIcon'
 import { useLocation, useNavigate } from 'react-router-dom'
 import { PATHS } from 'lib/paths'
-import { createAndOpenNewTutorialProject } from 'lib/desktopFS'
+import { createAndOpenNewProject } from 'lib/desktopFS'
 import { useAbsoluteFilePath } from 'hooks/useAbsoluteFilePath'
 import { useLspContext } from './LspProvider'
 import { openExternalBrowserIfDesktop } from 'lib/openWindow'
@@ -116,10 +116,9 @@ export function HelpMenu(props: React.PropsWithChildren) {
             if (isInProject) {
               navigate(filePath + PATHS.ONBOARDING.INDEX)
             } else {
-              createAndOpenNewTutorialProject({
-                onProjectOpen,
-                navigate,
-              }).catch(reportRejection)
+              createAndOpenNewProject({ onProjectOpen, navigate }).catch(
+                reportRejection
+              )
             }
           }}
         >

src/components/LowerRightControls.tsx

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

src/components/MachineManagerProvider.tsx

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

src/components/ModelingMachineProvider.tsx

@@ -1,11 +1,5 @@
 import { useMachine } from '@xstate/react'
-import React, {
-  createContext,
-  useEffect,
-  useMemo,
-  useRef,
-  useContext,
-} from 'react'
+import React, { createContext, useEffect, useMemo, useRef } from 'react'
 import {
   Actor,
   AnyStateMachine,
@@ -34,7 +28,7 @@ import {
   editorManager,
   sceneEntitiesManager,
 } from 'lib/singletons'
-import { MachineManagerContext } from 'components/MachineManagerProvider'
+import { machineManager } from 'lib/machineManager'
 import { useHotkeys } from 'react-hotkeys-hook'
 import { applyConstraintHorzVertDistance } from './Toolbar/SetHorzVertDistance'
 import {
@@ -75,7 +69,7 @@ import { exportFromEngine } from 'lib/exportFromEngine'
 import { Models } from '@kittycad/lib/dist/types/src'
 import toast from 'react-hot-toast'
 import { EditorSelection, Transaction } from '@codemirror/state'
-import { useLoaderData, useNavigate, useSearchParams } from 'react-router-dom'
+import { useNavigate, useSearchParams } from 'react-router-dom'
 import { letEngineAnimateAndSyncCamAfter } from 'clientSideScene/CameraControls'
 import { getVarNameModal } from 'hooks/useToolbarGuards'
 import { err, reportRejection, trap } from 'lib/trap'
@@ -90,8 +84,6 @@ import {
 import { submitAndAwaitTextToKcl } from 'lib/textToCad'
 import { useFileContext } from 'hooks/useFileContext'
 import { uuidv4 } from 'lib/utils'
-import { IndexLoaderData } from 'lib/types'
-import { Node } from 'wasm-lib/kcl/bindings/Node'
 
 type MachineContext<T extends AnyStateMachine> = {
   state: StateFrom<T>
@@ -124,7 +116,6 @@ export const ModelingMachineProvider = ({
   } = useSettingsAuthContext()
   const navigate = useNavigate()
   const { context, send: fileMachineSend } = useFileContext()
-  const { file } = useLoaderData() as IndexLoaderData
   const token = auth?.context?.token
   const streamRef = useRef<HTMLDivElement>(null)
   const persistedContext = useMemo(() => getPersistedContext(), [])
@@ -147,8 +138,6 @@ export const ModelingMachineProvider = ({
   //   >
   // )
 
-  const machineManager = useContext(MachineManagerContext)
-
   const [modelingState, modelingSend, modelingActor] = useMachine(
     modelingMachine.provide({
       actions: {
@@ -417,35 +406,18 @@ export const ModelingMachineProvider = ({
             return {}
           }
         ),
-        Make: ({ context, event }) => {
+        Make: ({ event }) => {
           if (event.type !== 'Make') return
           // Check if we already have an export intent.
-          if (engineCommandManager.exportInfo) {
+          if (engineCommandManager.exportIntent) {
             toast.error('Already exporting')
             return
           }
           // Set the export intent.
-          engineCommandManager.exportInfo = {
-            intent: ExportIntent.Make,
-            name: file?.name || '',
-          }
+          engineCommandManager.exportIntent = ExportIntent.Make
 
           // Set the current machine.
-          // Due to our use of singeton pattern, we need to do this to reliably
-          // update this object across React and non-React boundary.
-          // We need to do this eagerly because of the exportToEngine call below.
-          if (engineCommandManager.machineManager === null) {
-            console.warn(
-              "engineCommandManager.machineManager is null. It shouldn't be at this point. Aborting operation."
-            )
-            return
-          } else {
-            engineCommandManager.machineManager.currentMachine =
-              event.data.machine
-          }
-
-          // Update the rest of the UI that needs to know the current machine
-          context.machineManager.setCurrentMachine(event.data.machine)
+          machineManager.currentMachine = event.data.machine
 
           const format: Models['OutputFormat_type'] = {
             type: 'stl',
@@ -471,16 +443,12 @@ export const ModelingMachineProvider = ({
         },
         'Engine export': ({ event }) => {
           if (event.type !== 'Export') return
-          if (engineCommandManager.exportInfo) {
+          if (engineCommandManager.exportIntent) {
             toast.error('Already exporting')
             return
           }
           // Set the export intent.
-          engineCommandManager.exportInfo = {
-            intent: ExportIntent.Save,
-            // This never gets used its only for make.
-            name: '',
-          }
+          engineCommandManager.exportIntent = ExportIntent.Save
 
           const format = {
             ...event.data,
@@ -667,7 +635,6 @@ export const ModelingMachineProvider = ({
             input.plane
           )
           await kclManager.updateAst(modifiedAst, false)
-          sceneInfra.camControls.enableRotate = false
           sceneInfra.camControls.syncDirection = 'clientToEngine'
 
           await letEngineAnimateAndSyncCamAfter(
@@ -972,7 +939,7 @@ export const ModelingMachineProvider = ({
             })
             let parsed = parse(recast(kclManager.ast))
             if (trap(parsed)) return Promise.reject(parsed)
-            parsed = parsed as Node<Program>
+            parsed = parsed as Program
 
             const { modifiedAst: _modifiedAst, pathToReplacedNode } =
               moveValueIntoNewVariablePath(
@@ -983,7 +950,7 @@ export const ModelingMachineProvider = ({
               )
             parsed = parse(recast(_modifiedAst))
             if (trap(parsed)) return Promise.reject(parsed)
-            parsed = parsed as Node<Program>
+            parsed = parsed as Program
             if (!pathToReplacedNode)
               return Promise.reject(new Error('No path to replaced node'))
 
@@ -1018,7 +985,6 @@ export const ModelingMachineProvider = ({
           ...modelingMachineDefaultContext.store,
           ...persistedContext,
         },
-        machineManager,
       },
       // devTools: true,
     }

src/components/ModelingSidebar/ModelingPane.tsx

@@ -1,4 +1,3 @@
-import { ReactNode } from 'react'
 import styles from './ModelingPane.module.css'
 import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
 import { ActionButton } from 'components/ActionButton'
@@ -7,24 +6,22 @@ import { CustomIconName } from 'components/CustomIcon'
 import { IconDefinition } from '@fortawesome/free-solid-svg-icons'
 import { ActionIcon } from 'components/ActionIcon'
 
-export interface ModelingPaneProps {
-  id: string
-  children: ReactNode | ReactNode[]
-  className?: string
+export interface ModelingPaneProps
+  extends React.PropsWithChildren,
+    React.HTMLAttributes<HTMLDivElement> {
   icon?: CustomIconName | IconDefinition
-  title: ReactNode
+  title: string
   Menu?: React.ReactNode | React.FC
   detailsTestId?: string
   onClose: () => void
 }
 
 export const ModelingPaneHeader = ({
-  id,
   icon,
   title,
   Menu,
   onClose,
-}: Pick<ModelingPaneProps, 'id' | 'icon' | 'title' | 'Menu' | 'onClose'>) => {
+}: Pick<ModelingPaneProps, 'icon' | 'title' | 'Menu' | 'onClose'>) => {
   return (
     <div className={styles.header}>
       <div className="flex gap-2 items-center flex-1">
@@ -37,7 +34,7 @@ export const ModelingPaneHeader = ({
             bgClassName="!bg-transparent"
           />
         )}
-        <span data-testid={id + '-header'}>{title}</span>
+        <span>{title}</span>
       </div>
       {Menu instanceof Function ? <Menu /> : Menu}
       <ActionButton
@@ -89,7 +86,6 @@ export const ModelingPane = ({
       }
     >
       <ModelingPaneHeader
-        id={id}
         icon={icon}
         title={title}
         Menu={Menu}

src/components/ModelingSidebar/ModelingPanes/MemoryPane.tsx

@@ -88,30 +88,25 @@ export const MemoryPane = () => {
 export const processMemory = (programMemory: ProgramMemory) => {
   const processedMemory: any = {}
   for (const [key, val] of programMemory?.visibleEntries()) {
-    if (
-      (val.type === 'UserVal' && val.value.type === 'Sketch') ||
-      // @ts-ignore
-      (val.type !== 'Function' && val.type !== 'UserVal')
-    ) {
-      const sg = sketchFromKclValue(val, key)
+    if (typeof val.value !== 'function') {
+      const sg = sketchFromKclValue(val, null)
       if (val.type === 'Solid') {
         processedMemory[key] = val.value.map(({ ...rest }: ExtrudeSurface) => {
           return rest
         })
       } else if (!err(sg)) {
-        processedMemory[key] = sg.paths.map(({ __geoMeta, ...rest }: Path) => {
+        processedMemory[key] = sg.value.map(({ __geoMeta, ...rest }: Path) => {
           return rest
         })
+      } else if ((val.type as any) === 'Function') {
+        processedMemory[key] = `__function(${(val as any)?.expression?.params
+          ?.map?.(({ identifier }: any) => identifier?.name || '')
+          .join(', ')})__`
       } else {
         processedMemory[key] = val.value
       }
-      //@ts-ignore
-    } else if (val.type === 'Function') {
-      processedMemory[key] = `__function(${(val as any)?.expression?.params
-        ?.map?.(({ identifier }: any) => identifier?.name || '')
-        .join(', ')})__`
-    } else {
-      processedMemory[key] = val.value
+    } else if (key !== 'log') {
+      processedMemory[key] = '__function__'
     }
   }
   return processedMemory

src/components/ModelingSidebar/ModelingPanes/index.ts

@@ -6,7 +6,7 @@ import { MouseEventHandler, ReactNode } from 'react'
 import { MemoryPane, MemoryPaneMenu } from './MemoryPane'
 import { LogsPane } from './LoggingPanes'
 import { DebugPane } from './DebugPane'
-import { FileTreeInner, FileTreeMenu, FileTreeRoot } from 'components/FileTree'
+import { FileTreeInner, FileTreeMenu } from 'components/FileTree'
 import { useKclContext } from 'lang/KclProvider'
 import { editorManager } from 'lib/singletons'
 import { ContextFrom } from 'xstate'
@@ -38,8 +38,7 @@ interface PaneCallbackProps {
 
 export type SidebarPane = {
   id: SidebarType
-  title: ReactNode
-  sidebarName?: string
+  title: string
   icon: CustomIconName | IconDefinition
   keybinding: string
   Content: ReactNode | React.FC
@@ -50,7 +49,7 @@ export type SidebarPane = {
 
 export type SidebarAction = {
   id: string
-  title: ReactNode
+  title: string
   icon: CustomIconName
   iconClassName?: string // Just until we get rid of FontAwesome icons
   keybinding: string
@@ -79,8 +78,7 @@ export const sidebarPanes: SidebarPane[] = [
   },
   {
     id: 'files',
-    title: <FileTreeRoot />,
-    sidebarName: 'Project Files',
+    title: 'Project Files',
     icon: 'folder',
     Content: FileTreeInner,
     keybinding: 'Shift + F',

src/components/ModelingSidebar/ModelingSidebar.tsx

@@ -1,13 +1,6 @@
 import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
 import { Resizable } from 're-resizable'
-import {
-  MouseEventHandler,
-  useCallback,
-  useEffect,
-  useMemo,
-  ReactNode,
-  useContext,
-} from 'react'
+import { MouseEventHandler, useCallback, useEffect, useMemo } from 'react'
 import { useHotkeys } from 'react-hotkeys-hook'
 import { SidebarAction, SidebarType, sidebarPanes } from './ModelingPanes'
 import Tooltip from 'components/Tooltip'
@@ -20,7 +13,7 @@ import { CustomIconName } from 'components/CustomIcon'
 import { useCommandsContext } from 'hooks/useCommandsContext'
 import { IconDefinition } from '@fortawesome/free-solid-svg-icons'
 import { useKclContext } from 'lang/KclProvider'
-import { MachineManagerContext } from 'components/MachineManagerProvider'
+import { machineManager } from 'lib/machineManager'
 
 interface ModelingSidebarProps {
   paneOpacity: '' | 'opacity-20' | 'opacity-40'
@@ -36,7 +29,6 @@ function getPlatformString(): 'web' | 'desktop' {
 }
 
 export function ModelingSidebar({ paneOpacity }: ModelingSidebarProps) {
-  const machineManager = useContext(MachineManagerContext)
   const { commandBarSend } = useCommandsContext()
   const kclContext = useKclContext()
   const { settings } = useSettingsAuthContext()
@@ -271,8 +263,7 @@ interface ModelingPaneButtonProps
   extends React.HTMLAttributes<HTMLButtonElement> {
   paneConfig: {
     id: string
-    title: ReactNode
-    sidebarName?: string
+    title: string
     icon: CustomIconName | IconDefinition
     keybinding: string
     iconClassName?: string
@@ -301,10 +292,7 @@ function ModelingPaneButton({
       <button
         className="group pointer-events-auto flex items-center justify-center border-transparent dark:border-transparent disabled:!border-transparent p-0 m-0 rounded-sm !outline-0 focus-visible:border-primary"
         onClick={onClick}
-        name={
-          paneConfig.sidebarName ??
-          (typeof paneConfig.title === 'string' ? paneConfig.title : '')
-        }
+        name={paneConfig.title}
         data-testid={paneConfig.id + '-pane-button'}
         disabled={disabledText !== undefined}
         aria-disabled={disabledText !== undefined}
@@ -320,7 +308,7 @@ function ModelingPaneButton({
           }
         />
         <span className="sr-only">
-          {paneConfig.sidebarName ?? paneConfig.title}
+          {paneConfig.title}
           {paneIsOpen !== undefined ? ` pane` : ''}
         </span>
         <Tooltip
@@ -329,7 +317,7 @@ function ModelingPaneButton({
           hoverOnly
         >
           <span className="flex-1">
-            {paneConfig.sidebarName ?? paneConfig.title}
+            {paneConfig.title}
             {disabledText !== undefined ? ` (${disabledText})` : ''}
             {paneIsOpen !== undefined ? ` pane` : ''}
           </span>

src/components/NetworkMachineIndicator.tsx

@@ -1,9 +1,7 @@
 import { Popover } from '@headlessui/react'
-import { useContext } from 'react'
 import Tooltip from './Tooltip'
+import { machineManager } from 'lib/machineManager'
 import { isDesktop } from 'lib/isDesktop'
-import { components } from 'lib/machine-api'
-import { MachineManagerContext } from 'components/MachineManagerProvider'
 import { CustomIcon } from './CustomIcon'
 
 export const NetworkMachineIndicator = ({
@@ -11,12 +9,8 @@ export const NetworkMachineIndicator = ({
 }: {
   className?: string
 }) => {
-  const {
-    noMachinesReason,
-    machines,
-    machines: { length: machineCount },
-  } = useContext(MachineManagerContext)
-  const reason = noMachinesReason()
+  const machineCount = machineManager.machineCount()
+  const reason = machineManager.noMachinesReason()
 
   return isDesktop() ? (
     <Popover className="relative">
@@ -52,35 +46,19 @@ export const NetworkMachineIndicator = ({
         </div>
         {machineCount > 0 && (
           <ul className="divide-y divide-chalkboard-20 dark:divide-chalkboard-80">
-            {machines.map(
-              (machine: components['schemas']['MachineInfoResponse']) => {
-                return (
-                  <li key={machine.id} className={'px-2 py-4 gap-1 last:mb-0 '}>
-                    <p className="">{machine.id.toUpperCase()}</p>
-                    <p className="text-chalkboard-60 dark:text-chalkboard-50 text-xs">
-                      {machine.make_model.model}
-                    </p>
-                    {machine.extra &&
-                      machine.extra.type === 'bambu' &&
-                      machine.extra.nozzle_diameter && (
-                        <p className="text-chalkboard-60 dark:text-chalkboard-50 text-xs">
-                          Nozzle Diameter: {machine.extra.nozzle_diameter}
-                        </p>
-                      )}
-                    <p className="text-chalkboard-60 dark:text-chalkboard-50 text-xs">
-                      {`Status: ${machine.state.state
-                        .charAt(0)
-                        .toUpperCase()}${machine.state.state.slice(1)}`}
-                      {machine.state.state === 'failed' && machine.state.message
-                        ? ` (${machine.state.message})`
-                        : ''}
-                      {machine.state.state === 'running' && machine.progress
-                        ? ` (${Math.round(machine.progress)}%)`
-                        : ''}
-                    </p>
-                  </li>
-                )
-              }
+            {Object.entries(machineManager.machines).map(
+              ([hostname, machine]) => (
+                <li key={hostname} className={'px-2 py-4 gap-1 last:mb-0 '}>
+                  <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>
+                </li>
+              )
             )}
           </ul>
         )}

src/components/ProjectSidebarMenu.tsx

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

src/components/ProjectsContextProvider.tsx

@@ -1,289 +0,0 @@
-import { useMachine } from '@xstate/react'
-import { useCommandsContext } from 'hooks/useCommandsContext'
-import { useFileSystemWatcher } from 'hooks/useFileSystemWatcher'
-import { useProjectsLoader } from 'hooks/useProjectsLoader'
-import { projectsMachine } from 'machines/projectsMachine'
-import { createContext, useEffect, useState } from 'react'
-import { Actor, AnyStateMachine, fromPromise, Prop, StateFrom } from 'xstate'
-import { useLspContext } from './LspProvider'
-import toast from 'react-hot-toast'
-import { useLocation, useNavigate } from 'react-router-dom'
-import { PATHS } from 'lib/paths'
-import {
-  createNewProjectDirectory,
-  listProjects,
-  renameProjectDirectory,
-} from 'lib/desktop'
-import {
-  getNextProjectIndex,
-  interpolateProjectNameWithIndex,
-  doesProjectNameNeedInterpolated,
-} from 'lib/desktopFS'
-import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
-import useStateMachineCommands from 'hooks/useStateMachineCommands'
-import { projectsCommandBarConfig } from 'lib/commandBarConfigs/projectsCommandConfig'
-import { isDesktop } from 'lib/isDesktop'
-
-type MachineContext<T extends AnyStateMachine> = {
-  state?: StateFrom<T>
-  send: Prop<Actor<T>, 'send'>
-}
-
-export const ProjectsMachineContext = createContext(
-  {} as MachineContext<typeof projectsMachine>
-)
-
-/**
- * Watches the project directory and provides project management-related commands,
- * like "Create project", "Open project", "Delete project", etc.
- *
- * If in the future we implement full-fledge project management in the web version,
- * we can unify these components but for now, we need this to be only for the desktop version.
- */
-export const ProjectsContextProvider = ({
-  children,
-}: {
-  children: React.ReactNode
-}) => {
-  return isDesktop() ? (
-    <ProjectsContextDesktop>{children}</ProjectsContextDesktop>
-  ) : (
-    <ProjectsContextWeb>{children}</ProjectsContextWeb>
-  )
-}
-
-const ProjectsContextWeb = ({ children }: { children: React.ReactNode }) => {
-  return (
-    <ProjectsMachineContext.Provider
-      value={{
-        state: undefined,
-        send: () => {},
-      }}
-    >
-      {children}
-    </ProjectsMachineContext.Provider>
-  )
-}
-
-const ProjectsContextDesktop = ({
-  children,
-}: {
-  children: React.ReactNode
-}) => {
-  const navigate = useNavigate()
-  const location = useLocation()
-  const { commandBarSend } = useCommandsContext()
-  const { onProjectOpen } = useLspContext()
-  const {
-    settings: { context: settings },
-  } = useSettingsAuthContext()
-
-  useEffect(() => {
-    console.log(
-      'project directory changed',
-      settings.app.projectDirectory.current
-    )
-  }, [settings.app.projectDirectory.current])
-
-  const [projectsLoaderTrigger, setProjectsLoaderTrigger] = useState(0)
-  const { projectPaths, projectsDir } = useProjectsLoader([
-    projectsLoaderTrigger,
-  ])
-
-  // Re-read projects listing if the projectDir has any updates.
-  useFileSystemWatcher(
-    async () => {
-      return setProjectsLoaderTrigger(projectsLoaderTrigger + 1)
-    },
-    projectsDir ? [projectsDir] : []
-  )
-
-  const [state, send, actor] = useMachine(
-    projectsMachine.provide({
-      actions: {
-        navigateToProject: ({ context, event }) => {
-          const nameFromEventData =
-            'data' in event &&
-            event.data &&
-            'name' in event.data &&
-            event.data.name
-          const nameFromOutputData =
-            'output' in event &&
-            event.output &&
-            'name' in event.output &&
-            event.output.name
-
-          const name = nameFromEventData || nameFromOutputData
-
-          if (name) {
-            let projectPath =
-              context.defaultDirectory + window.electron.path.sep + name
-            onProjectOpen(
-              {
-                name,
-                path: projectPath,
-              },
-              null
-            )
-            commandBarSend({ type: 'Close' })
-            const newPathName = `${PATHS.FILE}/${encodeURIComponent(
-              projectPath
-            )}`
-            navigate(newPathName)
-          }
-        },
-        navigateToProjectIfNeeded: ({ event }) => {
-          if (
-            event.type.startsWith('xstate.done.actor.') &&
-            'output' in event
-          ) {
-            const isInAProject = location.pathname.startsWith(PATHS.FILE)
-            const isInDeletedProject =
-              event.type === 'xstate.done.actor.delete-project' &&
-              isInAProject &&
-              decodeURIComponent(location.pathname).includes(event.output.name)
-            if (isInDeletedProject) {
-              navigate(PATHS.HOME)
-              return
-            }
-
-            const isInRenamedProject =
-              event.type === 'xstate.done.actor.rename-project' &&
-              isInAProject &&
-              decodeURIComponent(location.pathname).includes(
-                event.output.oldName
-              )
-
-            if (isInRenamedProject) {
-              // TODO: In future, we can navigate to the new project path
-              // directly, but we need to coordinate with
-              // @lf94's useFileSystemWatcher in SettingsAuthProvider.tsx:224
-              // Because it's beating us to the punch and updating the route
-              // const newPathName = location.pathname.replace(
-              //   encodeURIComponent(event.output.oldName),
-              //   encodeURIComponent(event.output.newName)
-              // )
-              // navigate(newPathName)
-              return
-            }
-          }
-        },
-        toastSuccess: ({ event }) =>
-          toast.success(
-            ('data' in event && typeof event.data === 'string' && event.data) ||
-              ('output' in event &&
-                'message' in event.output &&
-                typeof event.output.message === 'string' &&
-                event.output.message) ||
-              ''
-          ),
-        toastError: ({ event }) =>
-          toast.error(
-            ('data' in event && typeof event.data === 'string' && event.data) ||
-              ('output' in event &&
-                typeof event.output === 'string' &&
-                event.output) ||
-              ''
-          ),
-      },
-      actors: {
-        readProjects: fromPromise(() => listProjects()),
-        createProject: fromPromise(async ({ input }) => {
-          let name = (
-            input && 'name' in input && input.name
-              ? input.name
-              : settings.projects.defaultProjectName.current
-          ).trim()
-
-          if (doesProjectNameNeedInterpolated(name)) {
-            const nextIndex = getNextProjectIndex(name, input.projects)
-            name = interpolateProjectNameWithIndex(name, nextIndex)
-          }
-
-          await createNewProjectDirectory(name)
-
-          return {
-            message: `Successfully created "${name}"`,
-            name,
-          }
-        }),
-        renameProject: fromPromise(async ({ input }) => {
-          const {
-            oldName,
-            newName,
-            defaultProjectName,
-            defaultDirectory,
-            projects,
-          } = input
-          let name = newName ? newName : defaultProjectName
-          if (doesProjectNameNeedInterpolated(name)) {
-            const nextIndex = getNextProjectIndex(name, projects)
-            name = interpolateProjectNameWithIndex(name, nextIndex)
-          }
-
-          console.log('from Project')
-
-          await renameProjectDirectory(
-            window.electron.path.join(defaultDirectory, oldName),
-            name
-          )
-          return {
-            message: `Successfully renamed "${oldName}" to "${name}"`,
-            oldName: oldName,
-            newName: name,
-          }
-        }),
-        deleteProject: fromPromise(async ({ input }) => {
-          await window.electron.rm(
-            window.electron.path.join(input.defaultDirectory, input.name),
-            {
-              recursive: true,
-            }
-          )
-          return {
-            message: `Successfully deleted "${input.name}"`,
-            name: input.name,
-          }
-        }),
-      },
-      guards: {
-        'Has at least 1 project': ({ event }) => {
-          if (event.type !== 'xstate.done.actor.read-projects') return false
-          console.log(`from has at least 1 project: ${event.output.length}`)
-          return event.output.length ? event.output.length >= 1 : false
-        },
-      },
-    }),
-    {
-      input: {
-        projects: projectPaths,
-        defaultProjectName: settings.projects.defaultProjectName.current,
-        defaultDirectory: settings.app.projectDirectory.current,
-      },
-    }
-  )
-
-  useEffect(() => {
-    send({ type: 'Read projects', data: {} })
-  }, [projectPaths])
-
-  // register all project-related command palette commands
-  useStateMachineCommands({
-    machineId: 'projects',
-    send,
-    state,
-    commandBarConfig: projectsCommandBarConfig,
-    actor,
-  })
-
-  return (
-    <ProjectsMachineContext.Provider
-      value={{
-        state,
-        send,
-      }}
-    >
-      {children}
-    </ProjectsMachineContext.Provider>
-  )
-}

src/components/Settings/AllSettingsFields.tsx

@@ -15,10 +15,7 @@ import { SettingsFieldInput } from './SettingsFieldInput'
 import toast from 'react-hot-toast'
 import { APP_VERSION } from 'routes/Settings'
 import { PATHS } from 'lib/paths'
-import {
-  createAndOpenNewTutorialProject,
-  getSettingsFolderPaths,
-} from 'lib/desktopFS'
+import { createAndOpenNewProject, getSettingsFolderPaths } from 'lib/desktopFS'
 import { useDotDotSlash } from 'hooks/useDotDotSlash'
 import { ForwardedRef, forwardRef, useEffect } from 'react'
 import { useLspContext } from 'components/LspProvider'
@@ -82,7 +79,7 @@ export const AllSettingsFields = forwardRef(
           } else {
             // If we're in the global settings, create a new project and navigate
             // to the onboarding start in that project
-            await createAndOpenNewTutorialProject({ onProjectOpen, navigate })
+            await createAndOpenNewProject({ onProjectOpen, navigate })
           }
         }
       }