try

.env.development

@@ -1,6 +1,6 @@
 VITE_KC_API_WS_MODELING_URL=wss://api.dev.zoo.dev/ws/modeling/commands
 VITE_KC_API_BASE_URL=https://api.dev.zoo.dev
 VITE_KC_SITE_BASE_URL=https://dev.zoo.dev
+VITE_KC_WASM_OVERRIDE_URL=""
 VITE_KC_SKIP_AUTH=false
 VITE_KC_CONNECTION_TIMEOUT_MS=5000
-VITE_KC_DEV_TOKEN="your token from dev.zoo.dev should go in .env.development.local"

.env.production

@@ -1,5 +1,6 @@
 VITE_KC_API_WS_MODELING_URL=wss://api.zoo.dev/ws/modeling/commands
 VITE_KC_API_BASE_URL=https://api.zoo.dev
 VITE_KC_SITE_BASE_URL=https://zoo.dev
+VITE_KC_WASM_OVERRIDE_URL=""
 VITE_KC_SKIP_AUTH=false
 VITE_KC_CONNECTION_TIMEOUT_MS=15000

.github/workflows/build-and-store-wasm.yml

@@ -1,33 +0,0 @@
-name: Build and Store WASM
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  build-and-upload:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'yarn'
-      - name: Install dependencies
-        run: yarn
-      - name: Setup Rust
-        uses: dtolnay/rust-toolchain@stable
-      - name: Cache wasm
-        uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: './src/wasm-lib'
-      - name: build wasm
-        run: yarn build:wasm
-
-
-      # Upload the WASM bundle as an artifact
-      - uses: actions/upload-artifact@v3
-        with:
-          name: wasm-bundle
-          path: src/wasm-lib/pkg

.github/workflows/cargo-clippy.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        dir: ['src/wasm-lib', 'src-tauri']
+        dir: ['src/wasm-lib']
     steps:
       - uses: actions/checkout@v4
       - name: Install latest rust
@@ -31,22 +31,9 @@ jobs:
 
       - name: install dependencies
         if: matrix.dir ==  'src-tauri'
-        shell: bash
         run: |
           sudo apt-get update
-          sudo apt-get install -y \
+          sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
-            libgtk-3-dev \
-            libayatana-appindicator3-dev \
-            webkit2gtk-driver \
-            libsoup-3.0-dev \
-            libjavascriptcoregtk-4.1-dev \
-            libwebkit2gtk-4.1-dev \
-            at-spi2-core \
-            xvfb
-          yarn install
-          yarn build:wasm
-          yarn build:local
-
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2.6.1
 

.github/workflows/cargo-test-tauri.yml

@@ -1,57 +0,0 @@
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - 'src-tauri/**.rs'
-      - '**/Cargo.toml'
-      - '**/Cargo.lock'
-      - '**/rust-toolchain.toml'
-      - .github/workflows/cargo-test-tauri.yml
-  pull_request:
-    paths:
-      - 'src-tauri/**.rs'
-      - '**/Cargo.toml'
-      - '**/Cargo.lock'
-      - '**/rust-toolchain.toml'
-      - .github/workflows/cargo-test-tauri.yml
-  workflow_dispatch:
-permissions: read-all
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-name: cargo test of tauri
-jobs:
-  cargotest:
-    name: cargo test
-    runs-on: ubuntu-latest-8-cores
-    strategy:
-      matrix:
-        dir: ['src-tauri']
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install latest rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          override: true
-      - name: install dependencies
-        if: matrix.dir ==  'src-tauri'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y \
-            libgtk-3-dev \
-            libayatana-appindicator3-dev \
-            webkit2gtk-driver \
-            libsoup-3.0-dev \
-            libjavascriptcoregtk-4.1-dev \
-            libwebkit2gtk-4.1-dev \
-            at-spi2-core \
-            xvfb
-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2.6.1
-      - name: cargo test
-        shell: bash
-        run: |-
-          cd "${{ matrix.dir }}"
-          cargo test --all

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ on:
   # Will checkout the last commit from the default branch (main as of 2023-10-04)
 
 env:
-  BUILD_RELEASE: ${{ github.event_name == 'release' || github.event_name == 'schedule' || 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') }}
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -130,9 +130,7 @@ jobs:
       matrix:
         os: [macos-14, ubuntu-latest, windows-latest]
     env:
-      # Specific Apple Universal target for macos
       TAURI_ARGS_MACOS: ${{ matrix.os == 'macos-14' && '--target universal-apple-darwin' || '' }}
-      # Only build executable on linux (no appimage or deb)
       TAURI_ARGS_UBUNTU: ${{ matrix.os == 'ubuntu-latest' && '--bundles' || '' }}
     steps:
       - uses: actions/checkout@v4
@@ -149,16 +147,16 @@ jobs:
 
       - name: Install ubuntu system dependencies
         if: matrix.os == 'ubuntu-latest'
-        run: |
+        run: >
-          sudo apt-get update
+          sudo apt-get update &&
-          sudo apt-get install -y \
+          sudo apt-get install -y
-            libgtk-3-dev \
+          libgtk-3-dev
-            libayatana-appindicator3-dev \
+          libayatana-appindicator3-dev
-            webkit2gtk-driver \
+          webkit2gtk-driver
-            libsoup-3.0-dev \
+          libsoup-3.0-dev
-            libjavascriptcoregtk-4.1-dev \
+          libjavascriptcoregtk-4.1-dev
-            libwebkit2gtk-4.1-dev \
+          libwebkit2gtk-4.1-dev
-            at-spi2-core \
+          at-spi2-core
           xvfb
 
       - name: Sync node version and setup cache
@@ -239,96 +237,6 @@ jobs:
           includeDebug: true
           args: "${{ env.TAURI_ARGS_MACOS }} ${{ env.TAURI_ARGS_UBUNTU }}"
 
-      - name: Build for Mac TestFlight (nightly)
-        if: ${{ github.event_name == 'schedule' && matrix.os == 'macos-14' }}
-        shell: bash
-        run: |
-          unset APPLE_SIGNING_IDENTITY
-          unset APPLE_CERTIFICATE
-          sign_app="3rd Party Mac Developer Application: KittyCAD Inc (${APPLE_TEAM_ID})"
-          sign_install="3rd Party Mac Developer Installer: KittyCAD Inc (${APPLE_TEAM_ID})"
-          profile="src-tauri/entitlements/Mac_App_Distribution.provisionprofile"
-
-          mkdir -p src-tauri/entitlements
-          echo -n "${APPLE_STORE_PROVISIONING_PROFILE}" | base64 --decode -o "${profile}"
-
-          echo -n "${APPLE_STORE_DISTRIBUTION_CERT}" | base64 --decode -o "dist.cer"
-          echo -n "${APPLE_STORE_INSTALLER_CERT}" | base64 --decode -o "installer.cer"
-
-          KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
-          KEYCHAIN_PASSWORD="password"
-
-          # create temporary keychain
-          security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
-          security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
-          security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
-
-          # import certificate to keychain
-          security import "dist.cer" -P "$APPLE_STORE_P12_PASSWORD" -k $KEYCHAIN_PATH -f pkcs12 -t cert -A
-          security import "installer.cer" -P "$APPLE_STORE_P12_PASSWORD" -k $KEYCHAIN_PATH -f pkcs12 -t cert -A
-
-          security set-key-partition-list -S apple-tool:,apple: -k "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
-          security list-keychain -d user -s $KEYCHAIN_PATH
-
-          target="universal-apple-darwin"
-
-          # Turn off the default target
-          # We don't want to install the updater for the apple store build
-          sed -i.bu "s/default =/# default =/" src-tauri/Cargo.toml
-          rm src-tauri/Cargo.toml.bu
-          git diff src-tauri/Cargo.toml
-
-          yarn tauri build --target "${target}" --verbose --config src-tauri/tauri.app-store.conf.json
-
-          app_path="src-tauri/target/${target}/release/bundle/macos/Zoo Modeling App.app"
-          build_name="src-tauri/target/${target}/release/bundle/macos/Zoo Modeling App.pkg"
-          cp_dir="src-tauri/target/${target}/release/bundle/macos/Zoo Modeling App.app/Contents/embedded.provisionprofile"
-          entitlements="src-tauri/entitlements/app-store.entitlements"
-
-          cp "${profile}" "${cp_dir}"
-
-          codesign --deep --force -s "${sign_app}" --entitlements "${entitlements}" "${app_path}"
-
-          productbuild --component "${app_path}" /Applications/ --sign "${sign_install}" "${build_name}"
-
-          # Undo the changes to the Cargo.toml
-          git checkout src-tauri/Cargo.toml
-
-        env:
-          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-          APPLE_STORE_PROVISIONING_PROFILE: ${{ secrets.APPLE_STORE_PROVISIONING_PROFILE }}
-          APPLE_STORE_DISTRIBUTION_CERT: ${{ secrets.APPLE_STORE_DISTRIBUTION_CERT }}
-          APPLE_STORE_INSTALLER_CERT: ${{ secrets.APPLE_STORE_INSTALLER_CERT }}
-          APPLE_STORE_P12_PASSWORD: ${{ secrets.APPLE_STORE_P12_PASSWORD }}
-
-
-      - name: 'Upload to Mac TestFlight (nightly)'
-        uses: apple-actions/upload-testflight-build@v1
-        if: ${{ github.event_name == 'schedule' && matrix.os == 'macos-14' }}
-        with:
-          app-path: 'src-tauri/target/universal-apple-darwin/release/bundle/macos/Zoo Modeling App.pkg'
-          issuer-id: ${{ secrets.APPLE_STORE_ISSUER_ID }}
-          api-key-id: ${{ secrets.APPLE_STORE_API_KEY_ID }}
-          api-private-key: ${{ secrets.APPLE_STORE_API_PRIVATE_KEY }}
-          app-type: osx
-
-
-      - name: Clean up after Mac TestFlight (nightly)
-        if: ${{ github.event_name == 'schedule' && matrix.os == 'macos-14' }}
-        shell: bash
-        run: |
-          git status
-          # remove our target builds because we want to make sure the later build
-          # includes the updater, and that anything we changed with the target
-          # does not persist
-          rm -rf src-tauri/target
-          # Lets get rid of the info.plist for the normal mac builds since its
-          # being sketchy.
-          rm src-tauri/Info.plist
-
-      # We do this after the apple store because the apple store build is
-      # specific and we want to overwrite it with the this new build after and
-      # not upload the apple store build to the public bucket
       - name: Build the app (release) and sign
         uses: tauri-apps/tauri-action@v0
         if: ${{ env.BUILD_RELEASE == 'true' }}
@@ -353,10 +261,11 @@ jobs:
         with:
           path: "${{ env.PREFIX }}/${{ env.MODE }}/bundle/*/*"
 
+      # TODO: re-enable linux e2e tests when possible
       - name: Run e2e tests (linux only)
-        if: ${{ matrix.os == 'ubuntu-latest' && github.event_name != 'release' && github.event_name != 'schedule' }}
+        if: false
         run: |
-          cargo install tauri-driver --force
+          cargo install tauri-driver
           source .env.${{ env.BUILD_RELEASE == 'true' && 'production' || 'development' }}
           export VITE_KC_API_BASE_URL
           xvfb-run yarn test:e2e:tauri

.github/workflows/create-release.yml

@@ -1,37 +0,0 @@
-name: Create Release
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  create-release:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: read
-    if: contains(github.event.head_commit.message, 'Cut release v')
-    steps:
-      - uses: actions/github-script@v7
-        name: Read Cut release PR info and create release
-        with:
-          script: |
-            const { owner, repo } = context.repo
-            const pulls = await github.rest.repos.listPullRequestsAssociatedWithCommit({
-              owner,
-              repo,
-              commit_sha: context.sha,
-            })
-            const { title, body } = pulls.data[0]
-            const version = title.split('Cut release ')[1]
-
-            const result = await github.rest.repos.createRelease({
-              owner,
-              repo,
-              body,
-              tag_name: version,
-              name: version,
-              draft: true,
-            })
-            console.log(result)

.github/workflows/playwright.yml

@@ -12,31 +12,33 @@ concurrency:
 permissions:
   contents: write
   pull-requests: write
-  actions: read
-  
 
 jobs:
-
+  check-wasm-lib-changes:
-  check-rust-changes:
     runs-on: ubuntu-latest
     outputs:
-      rust-changed: ${{ steps.filter.outputs.rust }}
+      url: ${{ steps.set-output.outputs.url }}
-
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
-
-      - id: filter
-        name: Check for Rust changes
-        uses: dorny/paths-filter@v3
         with:
-          filters: |
+          fetch-depth: 0 # Fetches all history for all branches and tags
-            rust:
+
-              - 'src/wasm-lib/**'
+      - name: Check for changes in src/wasm-lib
+        id: set-output
+        run: |
+          if git diff --quiet origin/main...HEAD -- src/wasm-lib; then
+            echo "url=https://app.zoo.dev" >> $GITHUB_OUTPUT
+            echo "No changes detected in src/wasm-lib"
+          else
+            echo "Changes detected in src/wasm-lib"
+            echo "url=" >> $GITHUB_OUTPUT
+          fi
+
 
   playwright-ubuntu:
     timeout-minutes: 60
     runs-on: ubuntu-latest-8-cores
-    needs: check-rust-changes
+    needs: check-wasm-lib-changes
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
@@ -48,38 +50,19 @@ jobs:
       run: yarn
     - name: Install Playwright Browsers
       run: yarn playwright install --with-deps
-    - name: Download Wasm Cache
+    - name: Print WASM Lib Changes URL
-      id: download-wasm
+      run: |
-      if: needs.check-rust-changes.outputs.rust-changed == 'false'
+        echo "WASM Lib Changes URL: ${{ needs.check-wasm-lib-changes.outputs.url }}"
-      uses: dawidd6/action-download-artifact@v3
-      continue-on-error: true
-      with:
-        github_token: ${{secrets.GITHUB_TOKEN}}
-        name: wasm-bundle
-        workflow: build-and-store-wasm.yml
-        branch: main
-        path: src/wasm-lib/pkg
-    - name: copy wasm blob
-      if: needs.check-rust-changes.outputs.rust-changed == 'false'
-      run: cp src/wasm-lib/pkg/wasm_lib_bg.wasm public
-      continue-on-error: true
     - name: Setup Rust
+      if: ${{ needs.check-wasm-lib-changes.outputs.url }} == ''
       uses: dtolnay/rust-toolchain@stable
-    - name: Cache Wasm (because rust diff)
+    - name: Cache wasm
-      if: needs.check-rust-changes.outputs.rust-changed == 'true'
+      if: ${{ needs.check-wasm-lib-changes.outputs.url }} == ''
       uses: Swatinem/rust-cache@v2
       with:
         workspaces: './src/wasm-lib'
-    - name: OR Cache Wasm (because wasm cache failed)
+    - name: build wasm
-      if: steps.download-wasm.outcome == 'failure'
+      if: ${{ needs.check-wasm-lib-changes.outputs.url }} == ''
-      uses: Swatinem/rust-cache@v2
-      with:
-        workspaces: './src/wasm-lib'
-    - name: Build Wasm (because rust diff)
-      if: needs.check-rust-changes.outputs.rust-changed == 'true'
-      run: yarn build:wasm
-    - name: OR Build Wasm (because wasm cache failed)
-      if: steps.download-wasm.outcome == 'failure'
       run: yarn build:wasm
     - name: build web
       run: yarn build:local
@@ -89,6 +72,7 @@ jobs:
         CI: true
         token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
         snapshottoken: ${{ secrets.KITTYCAD_API_TOKEN }}
+        WASM_OVERRIDE: ${{ steps.check-wasm-lib-changes.outputs.url }}
     - uses: actions/upload-artifact@v3
       if: always()
       with:
@@ -124,6 +108,7 @@ jobs:
       env:
         CI: true
         token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
+        WASM_OVERRIDE: ${{ steps.check-wasm-lib-changes.outputs.url }}
     - uses: actions/upload-artifact@v3
       if: always()
       with:
@@ -134,7 +119,7 @@ jobs:
   playwright-macos:
     timeout-minutes: 60
     runs-on: macos-14
-    needs: check-rust-changes
+    needs: check-wasm-lib-changes
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
@@ -145,38 +130,16 @@ jobs:
       run: yarn
     - name: Install Playwright Browsers
       run: yarn playwright install --with-deps
-    - name: Download Wasm Cache
-      id: download-wasm
-      if: needs.check-rust-changes.outputs.rust-changed == 'false'
-      uses: dawidd6/action-download-artifact@v3
-      continue-on-error: true
-      with:
-        github_token: ${{secrets.GITHUB_TOKEN}}
-        name: wasm-bundle
-        workflow: build-and-store-wasm.yml
-        branch: main
-        path: src/wasm-lib/pkg
-    - name: copy wasm blob
-      if: needs.check-rust-changes.outputs.rust-changed == 'false'
-      run: cp src/wasm-lib/pkg/wasm_lib_bg.wasm public
-      continue-on-error: true
     - name: Setup Rust
+      if: needs.check-wasm-lib-changes.outputs.url == ''
       uses: dtolnay/rust-toolchain@stable
-    - name: Cache Wasm (because rust diff)
+    - name: Cache wasm
-      if: needs.check-rust-changes.outputs.rust-changed == 'true'
+      if: needs.check-wasm-lib-changes.outputs.url == ''
       uses: Swatinem/rust-cache@v2
       with:
         workspaces: './src/wasm-lib'
-    - name: OR Cache Wasm (because wasm cache failed)
+    - name: build wasm
-      if: steps.download-wasm.outcome == 'failure'
+      if: needs.check-wasm-lib-changes.outputs.url == ''
-      uses: Swatinem/rust-cache@v2
-      with:
-        workspaces: './src/wasm-lib'
-    - name: Build Wasm (because rust diff)
-      if: needs.check-rust-changes.outputs.rust-changed == 'true'
-      run: yarn build:wasm
-    - name: OR Build Wasm (because wasm cache failed)
-      if: steps.download-wasm.outcome == 'failure'
       run: yarn build:wasm
     - name: build web
       run: yarn build:local
@@ -187,6 +150,7 @@ jobs:
       env:
         CI: true
         token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
+        WASM_OVERRIDE: ${{ steps.check-wasm-lib-changes.outputs.url }}
     - uses: actions/upload-artifact@v3
       if: always()
       with:

.gitignore

@@ -54,4 +54,3 @@ src/**/*.typegen.ts
 src-tauri/gen
 
 src/wasm-lib/grackle/stdlib_cube_partial.json
-Mac_App_Distribution.provisionprofile

README.md

@@ -59,10 +59,6 @@ followed by:
 ```
 yarn build:wasm-dev
 ```
-or if you have the gh cli installed
-```
-./get-latest-wasm-bundle.sh # this will download the latest main wasm bundle
-```
 
 That will build the WASM binary and put in the `public` dir (though gitignored)
 
@@ -72,13 +68,7 @@ finally, to run the web app only, run:
 yarn start
 ```
 
-If you're not an KittyCAD employee you won't be able to access the dev environment, you should copy everything from `.env.production` to `.env.development` to make it point to production instead, then when you navigate to `localhost:3000` the easiest way to sign in is to paste `localStorage.setItem('TOKEN_PERSIST_KEY', "your-token-from-https://zoo.dev/account/api-tokens")` replacing the with a real token from https://zoo.dev/account/api-tokens ofcourse, then navigate to localhost:3000 again. Note that navigating to localhost:3000/signin removes your token so you will need to set the token again.
+## Developing in Chrome
-
-### Development environment variables
-
-The Copilot LSP plugin in the editor requires a Zoo API token to run. In production, we authenticate this with a token via cookie in the browser and device auth token in the desktop environment, but this token is inaccessible in the dev browser version because the cookie is considered "cross-site" (from `localhost` to `dev.zoo.dev`). There is an optional environment variable called `VITE_KC_DEV_TOKEN` that you can populate with a dev token in a `.env.development.local` file to not check it into Git, which will use that token instead of other methods for the LSP service.
-
-### Developing in Chrome
 
 Chrome is in the process of rolling out a new default which
 [blocks Third-Party Cookies](https://developer.chrome.com/en/docs/privacy-sandbox/third-party-cookie-phase-out/).

docs/kcl/std.json

@@ -1068,7 +1068,7 @@
     "unpublished": false,
     "deprecated": false,
     "examples": [
-      "const part001 = startSketchOn('XY')\n  |> startProfileAt([0, 0], %)\n  |> line([1, 3.82], %, 'seg01')\n  |> angledLineToX([\n       -angleToMatchLengthX('seg01', 10, %),\n       5\n     ], %)\n  |> close(%)\n  |> extrude(5, %)"
+      "const part001 = startSketchOn('XY')\n  |> startProfileAt([0, 0], %)\n  |> line([1, 3.82], %, 'seg01')\n  |> angledLineToX([\n       -angleToMatchLengthX('seg01', 10, %),\n       5\n     ], %)\n  |> close(%)"
     ]
   },
   {
@@ -2074,7 +2074,7 @@
     "unpublished": false,
     "deprecated": false,
     "examples": [
-      "const part001 = startSketchOn('XY')\n  |> startProfileAt([0, 0], %)\n  |> line([1, 3.82], %, 'seg01')\n  |> angledLineToX([\n       -angleToMatchLengthY('seg01', 10, %),\n       5\n     ], %)\n  |> close(%)\n  |> extrude(5, %)"
+      "const part001 = startSketchOn('XY')\n  |> startProfileAt([0, 0], %)\n  |> line([1, 3.82], %, 'seg01')\n  |> angledLineToX([\n       -angleToMatchLengthY('seg01', 10, %),\n       5\n     ], %)\n  |> close(%)"
     ]
   },
   {
@@ -22380,8 +22380,8 @@
     "unpublished": false,
     "deprecated": false,
     "examples": [
-      "startSketchOn('XZ')\n  |> startProfileAt([0, 0], %)\n  |> line([10, 10], %)\n  |> line([10, 0], %)\n  |> close(%)\n  |> extrude(10, %)",
+      "startSketchOn('XZ')\n  |> startProfileAt([0, 0], %)\n  |> line([10, 10], %)\n  |> line([10, 0], %)\n  |> close(%)",
-      "startSketchOn('YZ')\n  |> startProfileAt([0, 0], %)\n  |> line([10, 10], %)\n  |> line([10, 0], %)\n  |> close(%, \"edge1\")\n  |> extrude(10, %)"
+      "startSketchOn('YZ')\n  |> startProfileAt([0, 0], %)\n  |> line([10, 10], %)\n  |> line([10, 0], %)\n  |> close(%, \"edge1\")"
     ]
   },
   {
@@ -43695,7 +43695,7 @@
     "unpublished": false,
     "deprecated": false,
     "examples": [
-      "fn rectShape = (pos, w, l) => {\n  const rr = startSketchOn('YZ')\n    |> startProfileAt([pos[0] - (w / 2), pos[1] - (l / 2)], %)\n    |> lineTo([pos[0] + w / 2, pos[1] - (l / 2)], %, \"edge1\")\n    |> lineTo([pos[0] + w / 2, pos[1] + l / 2], %, \"edge2\")\n    |> lineTo([pos[0] - (w / 2), pos[1] + l / 2], %, \"edge3\")\n    |> close(%, \"edge4\")\n  return rr\n}\n\n// Create the mounting plate extrusion, holes, and fillets\nconst part = rectShape([0, 0], 20, 20)\n  |> extrude(10, %)"
+      "fn rectShape = (pos, w, l) => {\n  const rr = startSketchOn('YZ')\n    |> startProfileAt([pos[0] - (w / 2), pos[1] - (l / 2)], %)\n    |> lineTo([pos[0] + w / 2, pos[1] - (l / 2)], %, \"edge1\")\n    |> lineTo([pos[0] + w / 2, pos[1] + l / 2], %, \"edge2\")\n    |> lineTo([pos[0] - (w / 2), pos[1] + l / 2], %, \"edge3\")\n    |> close(%, \"edge4\")\n  return rr\n}\n\n// Create the mounting plate extrusion, holes, and fillets\nconst part = rectShape([0, 0], 20, 20)"
     ]
   },
   {
@@ -45900,7 +45900,7 @@
     "unpublished": false,
     "deprecated": false,
     "examples": [
-      "const part = startSketchOn('XY')\n  |> circle([0, 0], 2, %)\n  |> patternCircular2d({\n       center: [20, 20],\n       repetitions: 12,\n       arcDegrees: 210,\n       rotateDuplicates: true\n     }, %)\n  |> extrude(1, %)"
+      "const part = startSketchOn('XY')\n  |> circle([0, 0], 2, %)\n  |> patternCircular2d({\n       center: [20, 20],\n       repetitions: 12,\n       arcDegrees: 210,\n       rotateDuplicates: true\n     }, %)"
     ]
   },
   {
@@ -50459,7 +50459,7 @@
     "unpublished": false,
     "deprecated": false,
     "examples": [
-      "const part = startSketchOn('XY')\n  |> circle([0, 0], 2, %)\n  |> patternLinear2d({\n       axis: [0, 1],\n       repetitions: 12,\n       distance: 2\n     }, %)\n  |> extrude(1, %)"
+      "const part = startSketchOn('XY')\n  |> circle([0, 0], 2, %)\n  |> patternLinear2d({\n       axis: [0, 1],\n       repetitions: 12,\n       distance: 2\n     }, %)"
     ]
   },
   {
@@ -59318,7 +59318,7 @@
     "unpublished": false,
     "deprecated": false,
     "examples": [
-      "startSketchOn('XY')\n  |> startProfileAt([0, 0], %)\n  |> line([10, 10], %)\n  |> line([10, 0], %)\n  |> close(%)\n  |> extrude(10, %)"
+      "startSketchOn('XY')\n  |> startProfileAt([0, 0], %)\n  |> line([10, 10], %)"
     ]
   },
   {
@@ -60312,7 +60312,7 @@
     "unpublished": false,
     "deprecated": false,
     "examples": [
-      "startSketchAt([0, 0])\n  |> line([10, 10], %)\n  |> line([20, 10], %, \"edge1\")\n  |> close(%, \"edge2\")\n  |> extrude(10, %)"
+      "startSketchAt([0, 0])\n  |> line([10, 10], %)"
     ]
   },
   {
@@ -61585,7 +61585,7 @@
     "unpublished": false,
     "deprecated": false,
     "examples": [
-      "startSketchOn('XY')\n  |> startProfileAt([0, 0], %)\n  |> line([10, 10], %)\n  |> line([20, 10], %, \"edge1\")\n  |> close(%, \"edge2\")\n  |> extrude(10, %)",
+      "startSketchOn('XY')\n  |> startProfileAt([0, 0], %)\n  |> line([10, 10], %)\n  |> line([20, 10], %, \"edge1\")\n  |> close(%, \"edge2\")",
       "fn cube = (pos, scale) => {\n  const sg = startSketchOn('XY')\n    |> startProfileAt(pos, %)\n    |> line([0, scale], %)\n    |> line([scale, 0], %)\n    |> line([0, -scale], %)\n    |> close(%)\n    |> extrude(scale, %)\n\n  return sg\n}\n\nconst box = cube([0, 0], 20)\n\nconst part001 = startSketchOn(box, \"start\")\n  |> startProfileAt([0, 0], %)\n  |> line([10, 10], %)\n  |> line([20, 10], %, \"edge1\")\n  |> close(%)\n  |> extrude(20, %)"
     ]
   },
@@ -65584,7 +65584,7 @@
     "unpublished": false,
     "deprecated": false,
     "examples": [
-      "startSketchOn('-YZ')\n  |> startProfileAt([0, 0], %)\n  |> line([10, 10], %, \"edge0\")\n  |> tangentialArcTo([10, 0], %)\n  |> close(%)\n  |> extrude(10, %)"
+      "startSketchOn('-YZ')\n  |> startProfileAt([0, 0], %)\n  |> line([10, 10], %, \"edge0\")\n  |> tangentialArcTo([10, 0], %)\n  |> close(%)"
     ]
   },
   {

e2e/playwright/flow-tests.spec.ts

@@ -1,5 +1,5 @@
 import { test, expect } from '@playwright/test'
-import { makeTemplate, getUtils } from './test-utils'
+import { getUtils } from './test-utils'
 import waitOn from 'wait-on'
 import { roundOff } from 'lib/utils'
 import { SaveSettingsPayload } from 'lib/settings/settingsTypes'
@@ -8,8 +8,7 @@ import {
   TEST_SETTINGS,
   TEST_SETTINGS_KEY,
   TEST_SETTINGS_CORRUPTED,
-  TEST_SETTINGS_ONBOARDING_EXPORT,
+  TEST_SETTINGS_ONBOARDING,
-  TEST_SETTINGS_ONBOARDING_START,
 } from './storageStates'
 import * as TOML from '@iarna/toml'
 
@@ -279,7 +278,7 @@ test('if you write invalid kcl you get inlined errors', async ({ page }) => {
     const bottomAng = 25
    */
   await page.click('.cm-content')
-  await page.keyboard.type('$ error')
+  await page.keyboard.type('# error')
 
   // press arrows to clear autocomplete
   await page.keyboard.press('ArrowLeft')
@@ -296,10 +295,10 @@ test('if you write invalid kcl you get inlined errors', async ({ page }) => {
 
   // error text on hover
   await page.hover('.cm-lint-marker-error')
-  await expect(page.getByText("found unknown token '$'")).toBeVisible()
+  await expect(page.getByText("found unknown token '#'")).toBeVisible()
 
   // select the line that's causing the error and delete it
-  await page.getByText('$ error').click()
+  await page.getByText('# error').click()
   await page.keyboard.press('End')
   await page.keyboard.down('Shift')
   await page.keyboard.press('Home')
@@ -528,10 +527,6 @@ test.describe('Can create sketches on all planes and their back sides', () => {
 })
 
 test('Auto complete works', async ({ page }) => {
-  test.skip(
-    true,
-    'CORS issue stopping the kcl lsp from working, enable again later'
-  )
   const u = getUtils(page)
   // const PUR = 400 / 37.5 //pixeltoUnitRatio
   await page.setViewportSize({ width: 1200, height: 500 })
@@ -601,12 +596,13 @@ test('Auto complete works', async ({ page }) => {
 
 test('Stored settings are validated and fall back to defaults', async ({
   page,
+  context,
 }) => {
   const u = getUtils(page)
 
   // Override beforeEach test setup
   // with corrupted settings
-  await page.addInitScript(
+  await context.addInitScript(
     async ({ settingsKey, settings }) => {
       localStorage.setItem(settingsKey, settings)
     },
@@ -623,18 +619,18 @@ test('Stored settings are validated and fall back to defaults', async ({
   // Check the settings were reset
   const storedSettings = TOML.parse(
     await page.evaluate(
-      ({ settingsKey }) => localStorage.getItem(settingsKey) || '',
+      ({ settingsKey }) => localStorage.getItem(settingsKey) || '{}',
       { settingsKey: TEST_SETTINGS_KEY }
     )
   ) as { settings: SaveSettingsPayload }
 
-  expect(storedSettings.settings?.app?.theme).toBe(undefined)
+  expect(storedSettings.settings.app?.theme).toBe('dark')
 
   // Check that the invalid settings were removed
-  expect(storedSettings.settings?.modeling?.defaultUnit).toBe(undefined)
+  expect(storedSettings.settings.modeling?.defaultUnit).toBe(undefined)
-  expect(storedSettings.settings?.modeling?.mouseControls).toBe(undefined)
+  expect(storedSettings.settings.modeling?.mouseControls).toBe(undefined)
-  expect(storedSettings.settings?.app?.projectDirectory).toBe(undefined)
+  expect(storedSettings.settings.app?.projectDirectory).toBe(undefined)
-  expect(storedSettings.settings?.projects?.defaultProjectName).toBe(undefined)
+  expect(storedSettings.settings.projects?.defaultProjectName).toBe(undefined)
 })
 
 test('Project settings can be set and override user settings', async ({
@@ -685,45 +681,6 @@ test('Project settings can be set and override user settings', async ({
   await expect(page.locator('select[name="app-theme"]')).toHaveValue('light')
 })
 
-test('Click through each onboarding step', async ({ page }) => {
-  const u = getUtils(page)
-
-  // Override beforeEach test setup
-  await page.addInitScript(
-    async ({ settingsKey, settings }) => {
-      // Give no initial code, so that the onboarding start is shown immediately
-      localStorage.setItem('persistCode', '')
-      localStorage.setItem(settingsKey, settings)
-    },
-    {
-      settingsKey: TEST_SETTINGS_KEY,
-      settings: TOML.stringify({ settings: TEST_SETTINGS_ONBOARDING_START }),
-    }
-  )
-
-  await page.setViewportSize({ width: 1200, height: 1080 })
-  await page.goto('/')
-  await u.waitForAuthSkipAppStart()
-
-  // Test that the onboarding pane loaded
-  await expect(page.getByText('Welcome to Modeling App! This')).toBeVisible()
-
-  const nextButton = page.getByTestId('onboarding-next')
-
-  while ((await nextButton.innerText()) !== 'Finish') {
-    await expect(nextButton).toBeVisible()
-    await nextButton.click()
-  }
-
-  // Finish the onboarding
-  await expect(nextButton).toBeVisible()
-  await nextButton.click()
-
-  // Test that the onboarding pane is gone
-  await expect(page.getByTestId('onboarding-content')).not.toBeVisible()
-  await expect(page.url()).not.toContain('onboarding')
-})
-
 test('Onboarding redirects and code updating', async ({ page }) => {
   const u = getUtils(page)
 
@@ -736,7 +693,7 @@ test('Onboarding redirects and code updating', async ({ page }) => {
     },
     {
       settingsKey: TEST_SETTINGS_KEY,
-      settings: TOML.stringify({ settings: TEST_SETTINGS_ONBOARDING_EXPORT }),
+      settings: TOML.stringify({ settings: TEST_SETTINGS_ONBOARDING }),
     }
   )
 
@@ -1002,9 +959,9 @@ test.describe('Command bar tests', () => {
         'persistCode',
         `const distance = sqrt(20)
         const part001 = startSketchOn('-XZ')
-      |> startProfileAt([-6.95, 10.98], %)
+  |> startProfileAt([-6.95, 4.98], %)
   |> line([25.1, 0.41], %)
-      |> line([0.73, -20.93], %)
+  |> line([0.73, -14.93], %)
   |> line([-23.44, 0.52], %)
   |> close(%)
         `
@@ -1024,6 +981,7 @@ test.describe('Command bar tests', () => {
       page.getByRole('button', { name: 'Start Sketch' })
     ).not.toBeDisabled()
     await u.clearCommandLogs()
+    await page.getByText('|> line([0.73, -14.93], %)').click()
     await page.getByRole('button', { name: 'Extrude' }).isEnabled()
 
     let cmdSearchBar = page.getByPlaceholder('Search commands')
@@ -1033,12 +991,6 @@ test.describe('Command bar tests', () => {
     // Search for extrude command and choose it
     await page.getByRole('option', { name: 'Extrude' }).click()
 
-    // Assert that we're on the selection step
-    await expect(page.getByRole('button', { name: 'selection' })).toBeDisabled()
-    // Select a face
-    await page.mouse.move(700, 200)
-    await page.mouse.click(700, 200)
-
     // Assert that we're on the distance step
     await expect(page.getByRole('button', { name: 'distance' })).toBeDisabled()
 
@@ -1072,9 +1024,9 @@ test.describe('Command bar tests', () => {
       `const distance = sqrt(20)
 const distance001 = 5 + 7
 const part001 = startSketchOn('-XZ')
-    |> startProfileAt([-6.95, 10.98], %)
+    |> startProfileAt([-6.95, 4.98], %)
     |> line([25.1, 0.41], %)
-    |> line([0.73, -20.93], %)
+    |> line([0.73, -14.93], %)
     |> line([-23.44, 0.52], %)
     |> close(%)
     |> extrude(distance001, %)`.replace(/(\r\n|\n|\r)/gm, '') // remove newlines
@@ -1399,7 +1351,7 @@ test('Deselecting line tool should mean nothing happens on click', async ({
     `const part001 = startSketchOn('-XZ')`
   )
 
-  await page.waitForTimeout(600)
+  await page.waitForTimeout(300)
 
   let previousCodeContent = await page.locator('.cm-content').innerText()
 
@@ -1698,13 +1650,14 @@ test('Sketch on face', async ({ page }) => {
   await expect(page.locator('.cm-content')).not.toHaveText(previousCodeContent)
   previousCodeContent = await page.locator('.cm-content').innerText()
 
-  const result = makeTemplate`const part002 = startSketchOn(part001, 'seg01')
+  await expect(page.locator('.cm-content'))
-  |> startProfileAt([-12.83, 6.7], %)
+    .toContainText(`const part002 = startSketchOn(part001, 'seg01')
-  |> line([${[2.28, 2.35]}, -${0.07}], %)
+|> startProfileAt([-12.83, 6.7], %)
-  |> line([-3.05, -1.47], %)
+|> line([${process?.env?.CI ? 2.28 : 2.28}, -${
-  |> close(%)`
+    process?.env?.CI ? 0.07 : 0.07
-
+  }], %)
-  await expect(page.locator('.cm-content')).toHaveText(result.regExp)
+|> line([-3.05, -1.47], %)
+|> close(%)`)
 
   // exit sketch
   await u.openAndClearDebugPanel()
@@ -1723,9 +1676,15 @@ test('Sketch on face', async ({ page }) => {
   await expect(page.getByText('Confirm Extrude')).toBeVisible()
   await page.keyboard.press('Enter')
 
-  const result2 = result.genNext`
+  await expect(page.locator('.cm-content'))
-  |> extrude(${[5, 5]} + 7, %)`
+    .toContainText(`const part002 = startSketchOn(part001, 'seg01')
-  await expect(page.locator('.cm-content')).toHaveText(result2.regExp)
+|> startProfileAt([-12.83, 6.7], %)
+|> line([${process?.env?.CI ? 2.28 : 2.28}, -${
+    process?.env?.CI ? 0.07 : 0.07
+  }], %)
+|> line([-3.05, -1.47], %)
+|> close(%)
+|> extrude(5 + 7, %)`)
 })
 
 test('Can code mod a line length', async ({ page }) => {

e2e/playwright/snapshot-tests.spec.ts

@@ -507,7 +507,7 @@ test('Draft rectangles should look right', async ({ page, context }) => {
     `const part001 = startSketchOn('-XZ')`
   )
 
-  await page.waitForTimeout(500) // TODO detect animation ending, or disable animation
+  await page.waitForTimeout(300) // TODO detect animation ending, or disable animation
   await u.closeDebugPanel()
 
   const startXPx = 600
@@ -597,15 +597,12 @@ test.describe('Client side scene scale should match engine scale', () => {
 
     // exit sketch
     await u.openAndClearDebugPanel()
-    await u.doAndWaitForImageDiff(
+    await page.getByRole('button', { name: 'Exit Sketch' }).click()
-      () => page.getByRole('button', { name: 'Exit Sketch' }).click(),
-      200
-    )
 
     // wait for execution done
     await u.expectCmdLog('[data-message-type="execution-done"]')
     await u.clearAndCloseDebugPanel()
-    await page.waitForTimeout(300)
+    await page.waitForTimeout(200)
 
     // second screen shot should look almost identical, i.e. scale should be the same.
     await expect(page).toHaveScreenshot({
@@ -699,15 +696,12 @@ test.describe('Client side scene scale should match engine scale', () => {
 
     // exit sketch
     await u.openAndClearDebugPanel()
-    await u.doAndWaitForImageDiff(
+    await page.getByRole('button', { name: 'Exit Sketch' }).click()
-      () => page.getByRole('button', { name: 'Exit Sketch' }).click(),
-      200
-    )
 
     // wait for execution done
     await u.expectCmdLog('[data-message-type="execution-done"]')
     await u.clearAndCloseDebugPanel()
-    await page.waitForTimeout(300)
+    await page.waitForTimeout(200)
 
     // second screen shot should look almost identical, i.e. scale should be the same.
     await expect(page).toHaveScreenshot({

e2e/playwright/storageStates.ts

@@ -1,7 +1,7 @@
 import { SaveSettingsPayload } from 'lib/settings/settingsTypes'
 import { Themes } from 'lib/theme'
 
-export const TEST_SETTINGS_KEY = '/settings.toml'
+export const TEST_SETTINGS_KEY = '/user.toml'
 export const TEST_SETTINGS = {
   app: {
     theme: Themes.Dark,
@@ -22,14 +22,9 @@ export const TEST_SETTINGS = {
   },
 } satisfies Partial<SaveSettingsPayload>
 
-export const TEST_SETTINGS_ONBOARDING_EXPORT = {
+export const TEST_SETTINGS_ONBOARDING = {
   ...TEST_SETTINGS,
-  app: { ...TEST_SETTINGS.app, onboardingStatus: '/export' },
+  app: { ...TEST_SETTINGS.app, onboardingStatus: '/export ' },
-} satisfies Partial<SaveSettingsPayload>
-
-export const TEST_SETTINGS_ONBOARDING_START = {
-  ...TEST_SETTINGS,
-  app: { ...TEST_SETTINGS.app, onboardingStatus: '' },
 } satisfies Partial<SaveSettingsPayload>
 
 export const TEST_SETTINGS_CORRUPTED = {

e2e/playwright/test-utils.ts

@@ -182,76 +182,3 @@ export function getUtils(page: Page) {
       }),
   }
 }
-
-type TemplateOptions = Array<number | Array<number>>
-
-type makeTemplateReturn = {
-  regExp: RegExp
-  genNext: (
-    templateParts: TemplateStringsArray,
-    ...options: TemplateOptions
-  ) => makeTemplateReturn
-}
-
-const escapeRegExp = (string: string) => {
-  return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') // $& means the whole matched string
-}
-
-const _makeTemplate = (
-  templateParts: TemplateStringsArray,
-  ...options: TemplateOptions
-) => {
-  const length = Math.max(...options.map((a) => (Array.isArray(a) ? a[0] : 0)))
-  let reExpTemplate = ''
-  for (let i = 0; i < length; i++) {
-    const currentStr = templateParts.map((str, index) => {
-      const currentOptions = options[index]
-      return (
-        escapeRegExp(str) +
-        String(
-          Array.isArray(currentOptions)
-            ? currentOptions[i]
-            : typeof currentOptions === 'number'
-            ? currentOptions
-            : ''
-        )
-      )
-    })
-    reExpTemplate += '|' + currentStr.join('')
-  }
-  return new RegExp(reExpTemplate)
-}
-
-/**
- * Tool for making templates to match code snippets in the editor with some fudge factor,
- * as there's some level of non-determinism.
- *
- * Usage is as such:
- * ```typescript
- * const result = makeTemplate`const myVar = aFunc(${[1, 2, 3]})`
- * await expect(page.locator('.cm-content')).toHaveText(result.regExp)
- * ```
- * Where the value `1`, `2` or `3` are all valid and should make the test pass.
- *
- * The function also has a `genNext` function that allows you to chain multiple templates
- * together without having to repeat previous parts of the template.
- * ```typescript
- * const result2 = result.genNext`const myVar2 = aFunc(${[4, 5, 6]})`
- * ```
- */
-export const makeTemplate: (
-  templateParts: TemplateStringsArray,
-  ...values: TemplateOptions
-) => makeTemplateReturn = (templateParts, ...options) => {
-  return {
-    regExp: _makeTemplate(templateParts, ...options),
-    genNext: (
-      nextTemplateParts: TemplateStringsArray,
-      ...nextOptions: TemplateOptions
-    ) =>
-      makeTemplate(
-        [...templateParts, ...nextTemplateParts] as any as TemplateStringsArray,
-        [...options, ...nextOptions] as any
-      ),
-  }
-}

e2e/tauri/specs/auth.e2e.ts

@@ -2,7 +2,7 @@ import { browser, $, expect } from '@wdio/globals'
 import fs from 'fs/promises'
 
 const documentsDir = `${process.env.HOME}/Documents`
-const userSettingsDir = `${process.env.HOME}/.config/dev.zoo.modeling-app`
+const userSettingsFile = `${process.env.HOME}/.config/dev.zoo.modeling-app/user.toml`
 const defaultProjectDir = `${documentsDir}/zoo-modeling-app-projects`
 const newProjectDir = `${documentsDir}/a-different-directory`
 const userCodeDir = '/tmp/kittycad_user_code'
@@ -29,10 +29,8 @@ describe('ZMA (Tauri, Linux)', () => {
     // Clean up filesystem from previous tests
     await new Promise((resolve) => setTimeout(resolve, 100))
     await fs.rm(defaultProjectDir, { force: true, recursive: true })
-    await fs.rm(newProjectDir, { force: true, recursive: true })
     await fs.rm(userCodeDir, { force: true })
-    await fs.rm(userSettingsDir, { force: true, recursive: true })
+    await fs.rm(userSettingsFile, { force: true })
-    await fs.mkdir(defaultProjectDir, { recursive: true })
     await fs.mkdir(newProjectDir, { recursive: true })
 
     const signInButton = await $('[data-testid="sign-in-button"]')
@@ -72,9 +70,8 @@ describe('ZMA (Tauri, Linux)', () => {
     console.log(cr.status)
 
     // Now should be signed in
-    await new Promise((resolve) => setTimeout(resolve, 10000))
     const newFileButton = await $('[data-testid="home-new-file"]')
-    expect(await newFileButton.getText()).toEqual('New project')
+    expect(await newFileButton.getText()).toEqual('New file')
   })
 
   it('opens the settings page, checks filesystem settings, and closes the settings page', async () => {
@@ -120,8 +117,8 @@ describe('ZMA (Tauri, Linux)', () => {
   it('opens the new file and expects a loading stream', async () => {
     const projectLink = await $('[data-testid="project-link"]')
     await click(projectLink)
-    const errorText = await $('[data-testid="unexpected-error"]')
+    const loadingText = await $('[data-testid="loading-stream"]')
-    expect(await errorText.getText()).toContain('unexpected error')
+    expect(await loadingText.getText()).toContain('Loading stream...')
     await browser.execute('window.location.href = "tauri://localhost/home"')
   })
 

get-latest-wasm-bundle.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-
-# Set the repository owner and name
-REPO_OWNER="KittyCAD"
-REPO_NAME="modeling-app"
-WORKFLOW_NAME="build-and-store-wasm.yml"
-ARTIFACT_NAME="wasm-bundle"
-
-# Fetch the latest completed workflow run ID for the specified workflow
-# RUN_ID=$(gh api repos/$REPO_OWNER/$REPO_NAME/actions/workflows/$WORKFLOW_NAME/runs --paginate --jq '.workflow_runs[] | select(.status=="completed") | .id' | head -n 1)
-RUN_ID=$(gh api repos/$REPO_OWNER/$REPO_NAME/actions/workflows/$WORKFLOW_NAME/runs --paginate --jq '.workflow_runs[] | select(.status=="completed" and .conclusion=="success") | .id' | head -n 1)
-
-echo $RUN_ID
-
-# Check if a valid RUN_ID was found
-if [ -z "$RUN_ID" ]; then
-  echo "Failed to find a workflow run for $WORKFLOW_NAME."
-  exit 1
-fi
-
-gh run download $RUN_ID --repo $REPO_OWNER/$REPO_NAME --name $ARTIFACT_NAME --dir ./src/wasm-lib/pkg
-
-cp src/wasm-lib/pkg/wasm_lib_bg.wasm public
-echo "latest wasm copied to public folder"

index.html

@@ -15,7 +15,7 @@
     <script
       defer
       data-domain="app.zoo.dev"
-      src="https://plausible.corp.zoo.dev/js/script.tagged-events.js"
+      src="https://plausible.corp.zoo.dev/js/script.js"
     ></script>
     <title>Zoo Modeling App</title>
   </head>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "untitled-app",
-  "version": "0.20.2",
+  "version": "0.18.1",
   "private": true,
   "dependencies": {
     "@codemirror/autocomplete": "^6.16.0",
@@ -10,7 +10,7 @@
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@headlessui/react": "^1.7.19",
     "@headlessui/tailwindcss": "^0.2.0",
-    "@kittycad/lib": "^0.0.60",
+    "@kittycad/lib": "^0.0.58",
     "@lezer/javascript": "^1.4.9",
     "@open-rpc/client-js": "^1.8.1",
     "@react-hook/resize-observer": "^1.2.6",
@@ -86,7 +86,6 @@
     "simpleserver": "yarn pretest && http-server ./public --cors -p 3000",
     "fmt": "prettier --write ./src *.ts *.json *.js ./e2e",
     "fmt-check": "prettier --check ./src *.ts *.json *.js ./e2e",
-    "fetch:wasm": "./get-latest-wasm-bundle.sh",
     "build:wasm-dev": "(cd src/wasm-lib && wasm-pack build --dev --target web --out-dir pkg && cargo test -p kcl-lib export_bindings) && cp src/wasm-lib/pkg/wasm_lib_bg.wasm public && yarn fmt",
     "build:wasm": "(cd src/wasm-lib && wasm-pack build --target web --out-dir pkg && cargo test -p kcl-lib export_bindings) && cp src/wasm-lib/pkg/wasm_lib_bg.wasm public && yarn fmt",
     "build:wasm-clean": "yarn wasm-prep && yarn build:wasm",
@@ -123,7 +122,6 @@
     "@tauri-apps/cli": "^2.0.0-beta.13",
     "@types/crypto-js": "^4.2.2",
     "@types/debounce-promise": "^3.1.9",
-    "@types/mocha": "^10.0.6",
     "@types/pixelmatch": "^5.2.6",
     "@types/pngjs": "^6.0.4",
     "@types/react-modal": "^3.16.3",

playwright.config.ts

@@ -18,7 +18,7 @@ export default defineConfig({
   /* Retry on CI only */
   retries: process.env.CI ? 3 : 0,
   /* Opt out of parallel tests on CI. */
-  workers: process.env.CI ? 1 : 1,
+  workers: process.env.CI ? 2 : 1,
   /* Reporter to use. See https://playwright.dev/docs/test-reporters */
   reporter: 'html',
   /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
@@ -27,7 +27,7 @@ export default defineConfig({
     baseURL: 'http://localhost:3000',
 
     /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-    trace: 'retain-on-failure',
+    trace: 'on-first-retry',
   },
 
   /* Configure projects for major browsers */
@@ -72,7 +72,7 @@ export default defineConfig({
 
   /* Run your local dev server before starting the tests */
   webServer: {
-    command: 'yarn serve',
+    command: 'VITE_KC_WASM_OVERRIDE_URL=$WASM_OVERRIDE yarn serve',
     // url: 'http://127.0.0.1:3000',
     reuseExistingServer: !process.env.CI,
   },

public/.well-known/apple-app-site-association

@@ -1,15 +0,0 @@
-{
-  "applinks": {
-    "details": [
-      {
-        "appIDs": ["92H8YB3B95.dev.zoo.modeling-app"],
-        "components": [
-          {
-            "/": "/file/*",
-            "comment": "Matches any URL whose path starts with /file/"
-          }
-        ]
-      }
-    ]
-  }
-}

src-tauri/Cargo.toml

@@ -1,13 +1,14 @@
 [package]
 name = "app"
 version = "0.1.0"
-description = "The Zoo Modeling App"
+description = "A Tauri App"
-authors = ["Zoo Engineers <eng@zoo.dev>"]
+authors = ["you"]
 license = ""
 repository = "https://github.com/KittyCAD/modeling-app"
 default-run = "app"
 edition = "2021"
 rust-version = "1.70"
+
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
@@ -15,30 +16,23 @@ tauri-build = { version = "2.0.0-beta.13", features = [] }
 
 [dependencies]
 anyhow = "1"
-kcl-lib = { version = "0.1.53", path = "../src/wasm-lib/kcl" }
 kittycad = "0.3.0"
-log = "0.4.21"
 oauth2 = "4.4.2"
+serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 tauri = { version = "2.0.0-beta.15", features = [ "devtools", "unstable"] }
-tauri-plugin-cli = { version = "2.0.0-beta.3" }
-tauri-plugin-deep-link = { version = "2.0.0-beta.3" }
 tauri-plugin-dialog = { version = "2.0.0-beta.6" }
 tauri-plugin-fs = { version = "2.0.0-beta.6" }
 tauri-plugin-http = { version = "2.0.0-beta.6" }
-tauri-plugin-log = { version = "2.0.0-beta.4" }
 tauri-plugin-os = { version = "2.0.0-beta.2" }
 tauri-plugin-process = { version = "2.0.0-beta.2" }
 tauri-plugin-shell = { version = "2.0.0-beta.2" }
 tauri-plugin-updater = { version = "2.0.0-beta.4" }
-tokio = { version = "1.37.0", features = ["time", "fs", "process"] }
+tokio = { version = "1.37.0", features = ["time"] }
 toml = "0.8.2"
-url = "2.5.0"
 
 [features]
-default = ["updater"]
 # this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled.
 # If you use cargo directly instead of tauri's cli you can use this feature flag to switch between tauri's `dev` and `build` modes.
 # DO NOT REMOVE!!
 custom-protocol = ["tauri/custom-protocol"]
-updater = []

src-tauri/Info.plist

@@ -1,376 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-    <dict>
-        <key>CFBundleDevelopmentRegion</key>
-        <string>en</string>
-        <key>NSPrincipalClass</key>
-        <string>NSApplication</string>
-        <key>CFBundlePackageType</key>
-        <string>APPL</string>
-        <key>NSDesktopFolderUsageDescription</key>
-        <string>Zoo Modeling App accesses the Desktop to load and save your project files and/or exported files here</string>
-        <key>NSDocumentsFolderUsageDescription</key>
-        <string>Zoo Modeling App accesses the Documents folder to load and save your project files and/or exported files here</string>
-        <key>NSDownloadsFolderUsageDescription</key>
-        <string>Zoo Modeling App accesses the Downloads folder to load and save your project files and/or exported files here</string>
-        <key>ITSAppUsesNonExemptEncryption</key>
-        <false/>
-        <key>DTXcode</key>
-        <string>1501</string>
-        <key>DTXcodeBuild</key>
-        <string>15A507</string>
-        <key>CFBundleURLTypes</key>
-        <array>
-            <dict>
-                <key>CFBundleURLName</key>
-                <string>dev.zoo.modeling-app</string>
-                <key>CFBundleURLSchemes</key>
-                <array>
-                    <string>zoo-modeling-app</string>
-                    <string>zoo</string>
-                </array>
-            </dict>
-        </array>
-        <key>LSFileQuarantineEnabled</key>
-        <false/>
-        <key>CFBundleDocumentTypes</key>
-        <array>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>dev.zoo.kcl</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>KCL</string>
-                <key>CFBundleTypeRole</key>
-                <string>Editor</string>
-                <key>LSTypeIsPackage</key>
-                <false/>
-                <key>LSHandlerRank</key>
-                <string>Owner</string>
-            </dict>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>dev.zoo.toml</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>TOML</string>
-                <key>CFBundleTypeRole</key>
-                <string>Editor</string>
-                <key>LSTypeIsPackage</key>
-                <false/>
-                <key>LSHandlerRank</key>
-                <string>Default</string>
-            </dict>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>dev.zoo.gltf</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>glTF</string>
-                <key>CFBundleTypeRole</key>
-                <string>Editor</string>
-                <key>LSTypeIsPackage</key>
-                <false/>
-                <key>LSHandlerRank</key>
-                <string>Default</string>
-            </dict>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>dev.zoo.glb</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>glb</string>
-                <key>CFBundleTypeRole</key>
-                <string>Editor</string>
-                <key>LSTypeIsPackage</key>
-                <false/>
-                <key>LSHandlerRank</key>
-                <string>Default</string>
-            </dict>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>dev.zoo.step</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>STEP</string>
-                <key>CFBundleTypeRole</key>
-                <string>Editor</string>
-                <key>LSTypeIsPackage</key>
-                <false/>
-                <key>LSHandlerRank</key>
-                <string>Default</string>
-            </dict>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>dev.zoo.fbx</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>FBX</string>
-                <key>CFBundleTypeRole</key>
-                <string>Editor</string>
-                <key>LSTypeIsPackage</key>
-                <false/>
-                <key>LSHandlerRank</key>
-                <string>Default</string>
-            </dict>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>dev.zoo.sldprt</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>Solidworks Part</string>
-                <key>CFBundleTypeRole</key>
-                <string>Viewer</string>
-                <key>LSTypeIsPackage</key>
-                <false/>
-                <key>LSHandlerRank</key>
-                <string>Default</string>
-            </dict>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>public.geometry-definition-format</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>OBJ</string>
-                <key>CFBundleTypeRole</key>
-                <string>Editor</string>
-                <key>LSTypeIsPackage</key>
-                <false/>
-                <key>LSHandlerRank</key>
-                <string>Default</string>
-            </dict>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>public.polygon-file-format</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>PLY</string>
-                <key>CFBundleTypeRole</key>
-                <string>Editor</string>
-                <key>LSTypeIsPackage</key>
-                <false/>
-                <key>LSHandlerRank</key>
-                <string>Default</string>
-            </dict>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>public.standard-tesselated-geometry-format</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>STL</string>
-                <key>CFBundleTypeRole</key>
-                <string>Editor</string>
-                <key>LSTypeIsPackage</key>
-                <false/>
-                <key>LSHandlerRank</key>
-                <string>Default</string>
-            </dict>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>public.folder</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>Folders</string>
-                <key>CFBundleTypeRole</key>
-                <string>Viewer</string>
-                <key>LSHandlerRank</key>
-                <string>Alternate</string>
-            </dict>
-        </array>
-        <key>UTExportedTypeDeclarations</key>
-        <array>
-            <dict>
-                <key>UTTypeIdentifier</key>
-                <string>dev.zoo.kcl</string>
-                <key>UTTypeReferenceURL</key>
-                <string>https://zoo.dev/docs/kcl</string>
-                <key>UTTypeConformsTo</key>
-                <array>
-                    <string>public.source-code</string>
-                    <string>public.data</string>
-                    <string>public.text</string>
-                    <string>public.plain-text</string>
-                    <string>public.3d-content</string>
-                    <string>public.script</string>
-                </array>
-                <key>UTTypeDescription</key>
-                <string>KCL (KittyCAD Language) document</string>
-                <key>UTTypeTagSpecification</key>
-                <dict>
-                    <key>public.filename-extension</key>
-                    <array>
-                        <string>kcl</string>
-                    </array>
-                    <key>public.mime-type</key>
-                    <array>
-                        <string>text/vnd.zoo.kcl</string>
-                    </array>
-                </dict>
-            </dict>
-            <dict>
-                <key>UTTypeIdentifier</key>
-                <string>dev.zoo.gltf</string>
-                <key>UTTypeReferenceURL</key>
-                <string>https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html</string>
-                <key>UTTypeConformsTo</key>
-                <array>
-                    <string>public.data</string>
-                    <string>public.text</string>
-                    <string>public.plain-text</string>
-                    <string>public.3d-content</string>
-                    <string>public.json</string>
-                </array>
-                <key>UTTypeDescription</key>
-                <string>Graphics Library Transmission Format (glTF)</string>
-                <key>UTTypeTagSpecification</key>
-                <dict>
-                    <key>public.filename-extension</key>
-                    <array>
-                        <string>gltf</string>
-                    </array>
-                    <key>public.mime-type</key>
-                    <array>
-                        <string>model/gltf+json</string>
-                    </array>
-                </dict>
-            </dict>
-            <dict>
-                <key>UTTypeIdentifier</key>
-                <string>dev.zoo.glb</string>
-                <key>UTTypeReferenceURL</key>
-                <string>https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html</string>
-                <key>UTTypeConformsTo</key>
-                <array>
-                    <string>public.data</string>
-                    <string>public.3d-content</string>
-                </array>
-                <key>UTTypeDescription</key>
-                <string>Graphics Library Transmission Format (glTF) binary</string>
-                <key>UTTypeTagSpecification</key>
-                <dict>
-                    <key>public.filename-extension</key>
-                    <array>
-                        <string>glb</string>
-                    </array>
-                    <key>public.mime-type</key>
-                    <array>
-                        <string>model/gltf-binary</string>
-                    </array>
-                </dict>
-            </dict>
-            <dict>
-                <key>UTTypeIdentifier</key>
-                <string>dev.zoo.step</string>
-                <key>UTTypeReferenceURL</key>
-                <string>https://www.loc.gov/preservation/digital/formats/fdd/fdd000448.shtml</string>
-                <key>UTTypeConformsTo</key>
-                <array>
-                    <string>public.data</string>
-                    <string>public.3d-content</string>
-                    <string>public.text</string>
-                    <string>public.plain-text</string>
-                </array>
-                <key>UTTypeDescription</key>
-                <string>STEP-file, ISO 10303-21</string>
-                <key>UTTypeTagSpecification</key>
-                <dict>
-                    <key>public.filename-extension</key>
-                    <array>
-                        <string>step</string>
-                        <string>stp</string>
-                    </array>
-                    <key>public.mime-type</key>
-                    <array>
-                        <string>model/step</string>
-                    </array>
-                </dict>
-            </dict>
-            <dict>
-                <key>UTTypeIdentifier</key>
-                <string>dev.zoo.sldprt</string>
-                <key>UTTypeReferenceURL</key>
-                <string>https://docs.fileformat.com/cad/sldprt/</string>
-                <key>UTTypeConformsTo</key>
-                <array>
-                    <string>public.data</string>
-                    <string>public.3d-content</string>
-                </array>
-                <key>UTTypeDescription</key>
-                <string>Solidworks Part</string>
-                <key>UTTypeTagSpecification</key>
-                <dict>
-                    <key>public.filename-extension</key>
-                    <array>
-                        <string>sldprt</string>
-                    </array>
-                    <key>public.mime-type</key>
-                    <array>
-                        <string>model/vnd.solidworks.sldprt</string>
-                    </array>
-                </dict>
-            </dict>
-            <dict>
-                <key>UTTypeIdentifier</key>
-                <string>dev.zoo.fbx</string>
-                <key>UTTypeReferenceURL</key>
-                <string>https://en.wikipedia.org/wiki/FBX</string>
-                <key>UTTypeConformsTo</key>
-                <array>
-                    <string>public.data</string>
-                    <string>public.3d-content</string>
-                </array>
-                <key>UTTypeDescription</key>
-                <string>Autodesk Filmbox (FBX) format</string>
-                <key>UTTypeTagSpecification</key>
-                <dict>
-                    <key>public.filename-extension</key>
-                    <array>
-                        <string>fbx</string>
-                        <string>fbxb</string>
-                    </array>
-                    <key>public.mime-type</key>
-                    <array>
-                        <string>model/vnd.autodesk.fbx</string>
-                    </array>
-                </dict>
-            </dict>
-            <dict>
-                <key>UTTypeIdentifier</key>
-                <string>dev.zoo.toml</string>
-                <key>UTTypeReferenceURL</key>
-                <string>https://toml.io/en/</string>
-                <key>UTTypeConformsTo</key>
-                <array>
-                    <string>public.data</string>
-                    <string>public.text</string>
-                    <string>public.plain-text</string>
-                </array>
-                <key>UTTypeDescription</key>
-                <string>Tom's Obvious Minimal Language</string>
-                <key>UTTypeTagSpecification</key>
-                <dict>
-                    <key>public.filename-extension</key>
-                    <array>
-                        <string>kcl</string>
-                    </array>
-                    <key>public.mime-type</key>
-                    <array>
-                        <string>text/toml</string>
-                    </array>
-                </dict>
-            </dict>
-        </array>
-    </dict>
-</plist>

src-tauri/capabilities/desktop.json

@@ -7,9 +7,6 @@
     "main"
   ],
   "permissions": [
-    "cli:default",
-    "deep-link:default",
-    "log:default",
     "path:default",
     "event:default",
     "window:default",
@@ -26,6 +23,7 @@
     "fs:allow-copy-file",
     "fs:allow-mkdir",
     "fs:allow-remove",
+    "fs:allow-remove",
     "fs:allow-rename",
     "fs:allow-exists",
     "fs:allow-stat",

src-tauri/entitlements/app-store.entitlements

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-    <dict>
-        <key>com.apple.security.app-sandbox</key>
-        <true/>
-        <key>com.apple.security.network.server</key>
-        <true/>
-        <key>com.apple.security.network.client</key>
-        <true/>
-        <key>com.apple.security.files.user-selected.read-write</key>
-        <true/>
-        <key>com.apple.security.files.downloads.read-write</key>
-        <true/>
-        <key>com.apple.application-identifier</key>
-        <string>92H8YB3B95.dev.zoo.modeling-app</string>
-        <key>com.apple.developer.team-identifier</key>
-        <string>92H8YB3B95</string>
-        <key>com.apple.developer.associated-domains</key>
-        <array>
-            <string>applinks:app.zoo.dev</string>
-        </array>
-    </dict>
-</plist>

src-tauri/rustfmt.toml

@@ -1,6 +0,0 @@
-max_width = 120
-edition = "2018"
-format_code_in_doc_comments = true
-format_strings = false
-imports_granularity = "Crate"
-group_imports = "StdExternalCrate"

src-tauri/src/main.rs

@@ -1,232 +1,98 @@
 // Prevents additional console window on Windows in release, DO NOT REMOVE!!
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
-pub(crate) mod state;
+use std::env;
-
+use std::fs;
-use std::{
+use std::io::Read;
-    env,
+use std::path::Path;
-    path::{Path, PathBuf},
+use std::path::PathBuf;
-};
 
 use anyhow::Result;
-use kcl_lib::settings::types::{
-    file::{FileEntry, Project, ProjectRoute, ProjectState},
-    project::ProjectConfiguration,
-    Configuration,
-};
 use oauth2::TokenResponse;
-use tauri::{ipc::InvokeError, Manager};
+use serde::Serialize;
-use tauri_plugin_cli::CliExt;
+use std::process::Command;
+use tauri::ipc::InvokeError;
 use tauri_plugin_shell::ShellExt;
-use tokio::process::Command;
+const DEFAULT_HOST: &str = "https://api.kittycad.io";
-
-const DEFAULT_HOST: &str = "https://api.zoo.dev";
-const SETTINGS_FILE_NAME: &str = "settings.toml";
-const PROJECT_SETTINGS_FILE_NAME: &str = "project.toml";
-const PROJECT_FOLDER: &str = "zoo-modeling-app-projects";
 
+/// This command returns the a json string parse from a toml file at the path.
 #[tauri::command]
-fn get_initial_default_dir(app: tauri::AppHandle) -> Result<PathBuf, InvokeError> {
+fn read_toml(path: &str) -> Result<String, InvokeError> {
-    let dir = match app.path().document_dir() {
+    let mut file = std::fs::File::open(path).map_err(|e| InvokeError::from_anyhow(e.into()))?;
-        Ok(dir) => dir,
+    let mut contents = String::new();
-        Err(_) => {
+    file.read_to_string(&mut contents)
-            // for headless Linux (eg. Github Actions)
-            let home_dir = app.path().home_dir()?;
-            home_dir.join("Documents")
-        }
-    };
-
-    Ok(dir.join(PROJECT_FOLDER))
-}
-
-#[tauri::command]
-async fn get_state(app: tauri::AppHandle) -> Result<Option<ProjectState>, InvokeError> {
-    let store = app.state::<state::Store>();
-    Ok(store.get().await)
-}
-
-#[tauri::command]
-async fn set_state(app: tauri::AppHandle, state: Option<ProjectState>) -> Result<(), InvokeError> {
-    let store = app.state::<state::Store>();
-    store.set(state).await;
-    Ok(())
-}
-
-async fn get_app_settings_file_path(app: &tauri::AppHandle) -> Result<PathBuf, InvokeError> {
-    let app_config_dir = app.path().app_config_dir()?;
-
-    // Ensure this directory exists.
-    if !app_config_dir.exists() {
-        tokio::fs::create_dir_all(&app_config_dir)
-            .await
         .map_err(|e| InvokeError::from_anyhow(e.into()))?;
-    }
+    let value =
-
+        toml::from_str::<toml::Value>(&contents).map_err(|e| InvokeError::from_anyhow(e.into()))?;
-    Ok(app_config_dir.join(SETTINGS_FILE_NAME))
+    let value = serde_json::to_string(&value).map_err(|e| InvokeError::from_anyhow(e.into()))?;
+    Ok(value)
 }
 
+/// From https://github.com/tauri-apps/tauri/blob/1.x/core/tauri/src/api/dir.rs#L51
+/// Removed from tauri v2
+#[derive(Debug, Serialize)]
+pub struct DiskEntry {
+    /// The path to the entry.
+    pub path: PathBuf,
+    /// The name of the entry (file name with extension or directory name).
+    pub name: Option<String>,
+    /// The children of this entry if it's a directory.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub children: Option<Vec<DiskEntry>>,
+}
+
+/// From https://github.com/tauri-apps/tauri/blob/1.x/core/tauri/src/api/dir.rs#L51
+/// Removed from tauri v2
+fn is_dir<P: AsRef<Path>>(path: P) -> Result<bool> {
+    std::fs::metadata(path)
+        .map(|md| md.is_dir())
+        .map_err(Into::into)
+}
+
+/// From https://github.com/tauri-apps/tauri/blob/1.x/core/tauri/src/api/dir.rs#L51
+/// Removed from tauri v2
 #[tauri::command]
-async fn read_app_settings_file(app: tauri::AppHandle) -> Result<Configuration, InvokeError> {
+fn read_dir_recursive(path: &str) -> Result<Vec<DiskEntry>, InvokeError> {
-    let mut settings_path = get_app_settings_file_path(&app).await?;
+    let mut files_and_dirs: Vec<DiskEntry> = vec![];
-    let mut needs_migration = false;
+    // let path = path.as_ref();
+    for entry in fs::read_dir(path).map_err(|e| InvokeError::from_anyhow(e.into()))? {
+        let path = entry
+            .map_err(|e| InvokeError::from_anyhow(e.into()))?
+            .path();
 
-    // Check if this file exists.
+        if let Ok(flag) = is_dir(&path) {
-    if !settings_path.exists() {
+            files_and_dirs.push(DiskEntry {
-        // Try the backwards compatible path.
+                path: path.clone(),
-        // TODO: Remove this after a few releases.
+                children: if flag {
-        let app_config_dir = app.path().app_config_dir()?;
+                    Some(read_dir_recursive(path.to_str().expect("No path"))?)
-        settings_path = format!(
+                } else {
-            "{}user.toml",
+                    None
-            app_config_dir.display().to_string().trim_end_matches('/')
+                },
-        )
+                name: path
-        .into();
+                    .file_name()
-        needs_migration = true;
+                    .map(|name| name.to_string_lossy())
-        // Check if this path exists.
+                    .map(|name| name.to_string()),
-        if !settings_path.exists() {
+            });
-            let mut default = Configuration::default();
-            default.settings.project.directory = get_initial_default_dir(app.clone())?;
-            // Return the default configuration.
-            return Ok(default);
         }
     }
+    Ok(files_and_dirs)
+}
 
-    let contents = tokio::fs::read_to_string(&settings_path)
+/// This command returns a string that is the contents of a file at the path.
-        .await
+#[tauri::command]
+fn read_txt_file(path: &str) -> Result<String, InvokeError> {
+    let mut file = std::fs::File::open(path).map_err(|e| InvokeError::from_anyhow(e.into()))?;
+    let mut contents = String::new();
+    file.read_to_string(&mut contents)
         .map_err(|e| InvokeError::from_anyhow(e.into()))?;
-    let mut parsed = Configuration::backwards_compatible_toml_parse(&contents).map_err(InvokeError::from_anyhow)?;
+    Ok(contents)
-    if parsed.settings.project.directory == PathBuf::new() {
-        parsed.settings.project.directory = get_initial_default_dir(app.clone())?;
-    }
-
-    // TODO: Remove this after a few releases.
-    if needs_migration {
-        write_app_settings_file(app, parsed.clone()).await?;
-        // Delete the old file.
-        tokio::fs::remove_file(settings_path)
-            .await
-            .map_err(|e| InvokeError::from_anyhow(e.into()))?;
-    }
-
-    Ok(parsed)
-}
-
-#[tauri::command]
-async fn write_app_settings_file(app: tauri::AppHandle, configuration: Configuration) -> Result<(), InvokeError> {
-    let settings_path = get_app_settings_file_path(&app).await?;
-    let contents = toml::to_string_pretty(&configuration).map_err(|e| InvokeError::from_anyhow(e.into()))?;
-    tokio::fs::write(settings_path, contents.as_bytes())
-        .await
-        .map_err(|e| InvokeError::from_anyhow(e.into()))?;
-
-    Ok(())
-}
-
-async fn get_project_settings_file_path(
-    app_settings: Configuration,
-    project_name: &str,
-) -> Result<PathBuf, InvokeError> {
-    let project_dir = app_settings.settings.project.directory.join(project_name);
-
-    if !project_dir.exists() {
-        tokio::fs::create_dir_all(&project_dir)
-            .await
-            .map_err(|e| InvokeError::from_anyhow(e.into()))?;
-    }
-
-    Ok(project_dir.join(PROJECT_SETTINGS_FILE_NAME))
-}
-
-#[tauri::command]
-async fn read_project_settings_file(
-    app_settings: Configuration,
-    project_name: &str,
-) -> Result<ProjectConfiguration, InvokeError> {
-    let settings_path = get_project_settings_file_path(app_settings, project_name).await?;
-
-    // Check if this file exists.
-    if !settings_path.exists() {
-        // Return the default configuration.
-        return Ok(ProjectConfiguration::default());
-    }
-
-    let contents = tokio::fs::read_to_string(&settings_path)
-        .await
-        .map_err(|e| InvokeError::from_anyhow(e.into()))?;
-    let parsed = ProjectConfiguration::backwards_compatible_toml_parse(&contents).map_err(InvokeError::from_anyhow)?;
-
-    Ok(parsed)
-}
-
-#[tauri::command]
-async fn write_project_settings_file(
-    app_settings: Configuration,
-    project_name: &str,
-    configuration: ProjectConfiguration,
-) -> Result<(), InvokeError> {
-    let settings_path = get_project_settings_file_path(app_settings, project_name).await?;
-    let contents = toml::to_string_pretty(&configuration).map_err(|e| InvokeError::from_anyhow(e.into()))?;
-    tokio::fs::write(settings_path, contents.as_bytes())
-        .await
-        .map_err(|e| InvokeError::from_anyhow(e.into()))?;
-
-    Ok(())
-}
-
-/// Initialize the directory that holds all the projects.
-#[tauri::command]
-async fn initialize_project_directory(configuration: Configuration) -> Result<PathBuf, InvokeError> {
-    configuration
-        .ensure_project_directory_exists()
-        .await
-        .map_err(InvokeError::from_anyhow)
-}
-
-/// Create a new project directory.
-#[tauri::command]
-async fn create_new_project_directory(
-    configuration: Configuration,
-    project_name: &str,
-    initial_code: Option<&str>,
-) -> Result<Project, InvokeError> {
-    configuration
-        .create_new_project_directory(project_name, initial_code)
-        .await
-        .map_err(InvokeError::from_anyhow)
-}
-
-/// List all the projects in the project directory.
-#[tauri::command]
-async fn list_projects(configuration: Configuration) -> Result<Vec<Project>, InvokeError> {
-    configuration.list_projects().await.map_err(InvokeError::from_anyhow)
-}
-
-/// Get information about a project.
-#[tauri::command]
-async fn get_project_info(configuration: Configuration, project_path: &str) -> Result<Project, InvokeError> {
-    configuration
-        .get_project_info(project_path)
-        .await
-        .map_err(InvokeError::from_anyhow)
-}
-
-/// Parse the project route.
-#[tauri::command]
-async fn parse_project_route(configuration: Configuration, route: &str) -> Result<ProjectRoute, InvokeError> {
-    ProjectRoute::from_route(&configuration, route).map_err(InvokeError::from_anyhow)
-}
-
-#[tauri::command]
-async fn read_dir_recursive(path: &str) -> Result<FileEntry, InvokeError> {
-    kcl_lib::settings::utils::walk_dir(&Path::new(path).to_path_buf())
-        .await
-        .map_err(InvokeError::from_anyhow)
 }
 
 /// This command instantiates a new window with auth.
 /// The string returned from this method is the access token.
 #[tauri::command]
 async fn login(app: tauri::AppHandle, host: &str) -> Result<String, InvokeError> {
-    log::debug!("Logging in...");
+    println!("Logging in...");
     // Do an OAuth 2.0 Device Authorization Grant dance to get a token.
     let device_auth_url = oauth2::DeviceAuthorizationUrl::new(format!("{host}/oauth2/device/auth"))
         .map_err(|e| InvokeError::from_anyhow(e.into()))?;
@@ -237,7 +103,8 @@ async fn login(app: tauri::AppHandle, host: &str) -> Result<String, InvokeError>
     let auth_client = oauth2::basic::BasicClient::new(
         oauth2::ClientId::new(client_id),
         None,
-        oauth2::AuthUrl::new(format!("{host}/authorize")).map_err(|e| InvokeError::from_anyhow(e.into()))?,
+        oauth2::AuthUrl::new(format!("{host}/authorize"))
+            .map_err(|e| InvokeError::from_anyhow(e.into()))?,
         Some(
             oauth2::TokenUrl::new(format!("{host}/oauth2/device/token"))
                 .map_err(|e| InvokeError::from_anyhow(e.into()))?,
@@ -265,10 +132,12 @@ async fn login(app: tauri::AppHandle, host: &str) -> Result<String, InvokeError>
     // and bypass the shell::open call as it fails on GitHub Actions.
     let e2e_tauri_enabled = env::var("E2E_TAURI_ENABLED").is_ok();
     if e2e_tauri_enabled {
-        log::warn!("E2E_TAURI_ENABLED is set, won't open {} externally", auth_uri.secret());
+        println!(
-        tokio::fs::write("/tmp/kittycad_user_code", details.user_code().secret())
+            "E2E_TAURI_ENABLED is set, won't open {} externally",
-            .await
+            auth_uri.secret()
-            .map_err(|e| InvokeError::from_anyhow(e.into()))?;
+        );
+        fs::write("/tmp/kittycad_user_code", details.user_code().secret())
+            .expect("Unable to write /tmp/kittycad_user_code file");
     } else {
         app.shell()
             .open(auth_uri.secret(), None)
@@ -291,7 +160,10 @@ async fn login(app: tauri::AppHandle, host: &str) -> Result<String, InvokeError>
 ///This command returns the KittyCAD user info given a token.
 /// The string returned from this method is the user info as a json string.
 #[tauri::command]
-async fn get_user(token: &str, hostname: &str) -> Result<kittycad::types::User, InvokeError> {
+async fn get_user(
+    token: Option<String>,
+    hostname: &str,
+) -> Result<kittycad::types::User, InvokeError> {
     // Use the host passed in if it's set.
     // Otherwise, use the default host.
     let host = if hostname.is_empty() {
@@ -308,10 +180,10 @@ async fn get_user(token: &str, hostname: &str) -> Result<kittycad::types::User,
             baseurl = format!("http://{host}")
         }
     }
-    log::debug!("Getting user info...");
+    println!("Getting user info...");
 
     // use kittycad library to fetch the user info from /user/me
-    let mut client = kittycad::Client::new(token);
+    let mut client = kittycad::Client::new(token.unwrap());
 
     if baseurl != DEFAULT_HOST {
         client.set_base_url(&baseurl);
@@ -330,186 +202,50 @@ async fn get_user(token: &str, hostname: &str) -> Result<kittycad::types::User,
 /// From this GitHub comment: https://github.com/tauri-apps/tauri/issues/4062#issuecomment-1338048169
 /// But with the Linux support removed since we don't need it for now.
 #[tauri::command]
-fn show_in_folder(path: &str) -> Result<(), InvokeError> {
+fn show_in_folder(path: String) {
-    #[cfg(not(unix))]
+    #[cfg(target_os = "windows")]
     {
         Command::new("explorer")
-            .args(["/select,", path]) // The comma after select is not a typo
+            .args(["/select,", &path]) // The comma after select is not a typo
             .spawn()
-            .map_err(|e| InvokeError::from_anyhow(e.into()))?;
+            .unwrap();
     }
 
-    #[cfg(unix)]
+    #[cfg(target_os = "macos")]
     {
-        Command::new("open")
+        Command::new("open").args(["-R", &path]).spawn().unwrap();
-            .args(["-R", path])
-            .spawn()
-            .map_err(|e| InvokeError::from_anyhow(e.into()))?;
-    }
-
-    Ok(())
-}
-
-#[allow(dead_code)]
-fn open_url_sync(app: &tauri::AppHandle, url: &url::Url) {
-    log::debug!("Opening URL: {:?}", url);
-    let cloned_url = url.clone();
-    let runner: tauri::async_runtime::JoinHandle<Result<ProjectState>> = tauri::async_runtime::spawn(async move {
-        let url_str = cloned_url.path().to_string();
-
-        log::debug!("Opening URL path : {}", url_str);
-        let path = Path::new(url_str.as_str());
-        ProjectState::new_from_path(path.to_path_buf()).await
-    });
-
-    // Block on the handle.
-    match tauri::async_runtime::block_on(runner) {
-        Ok(Ok(store)) => {
-            // Create a state object to hold the project.
-            app.manage(state::Store::new(store));
-        }
-        Err(e) => {
-            log::warn!("Error opening URL:{} {:?}", url, e);
-        }
-        Ok(Err(e)) => {
-            log::warn!("Error opening URL:{} {:?}", url, e);
-        }
     }
 }
 
-fn main() -> Result<()> {
+fn main() {
     tauri::Builder::default()
+        .setup(|_app| {
+            #[cfg(debug_assertions)]
+            {
+                use tauri::Manager;
+                _app.get_webview("main").unwrap().open_devtools();
+            }
+            #[cfg(not(debug_assertions))]
+            {
+                _app.handle()
+                    .plugin(tauri_plugin_updater::Builder::new().build())?;
+            }
+            Ok(())
+        })
         .invoke_handler(tauri::generate_handler![
-            get_state,
-            set_state,
-            get_initial_default_dir,
-            initialize_project_directory,
-            create_new_project_directory,
-            list_projects,
-            get_project_info,
-            parse_project_route,
             get_user,
             login,
+            read_toml,
+            read_txt_file,
             read_dir_recursive,
             show_in_folder,
-            read_app_settings_file,
-            write_app_settings_file,
-            read_project_settings_file,
-            write_project_settings_file,
         ])
-        .plugin(tauri_plugin_cli::init())
-        .plugin(tauri_plugin_deep_link::init())
         .plugin(tauri_plugin_dialog::init())
         .plugin(tauri_plugin_fs::init())
         .plugin(tauri_plugin_http::init())
-        .plugin(
-            tauri_plugin_log::Builder::new()
-                .targets([
-                    tauri_plugin_log::Target::new(tauri_plugin_log::TargetKind::Stdout),
-                    tauri_plugin_log::Target::new(tauri_plugin_log::TargetKind::LogDir { file_name: None }),
-                ])
-                .level(log::LevelFilter::Debug)
-                .build(),
-        )
         .plugin(tauri_plugin_os::init())
         .plugin(tauri_plugin_process::init())
         .plugin(tauri_plugin_shell::init())
-        .setup(|app| {
+        .run(tauri::generate_context!())
-            // Do update things.
+        .expect("error while running tauri application");
-            #[cfg(debug_assertions)]
-            {
-                app.get_webview("main").unwrap().open_devtools();
-            }
-            #[cfg(not(debug_assertions))]
-            #[cfg(feature = "updater")]
-            {
-                app.handle().plugin(tauri_plugin_updater::Builder::new().build())?;
-            }
-
-            let mut verbose = false;
-            let mut source_path: Option<PathBuf> = None;
-            match app.cli().matches() {
-                // `matches` here is a Struct with { args, subcommand }.
-                // `args` is `HashMap<String, ArgData>` where `ArgData` is a struct with { value, occurrences }.
-                // `subcommand` is `Option<Box<SubcommandMatches>>` where `SubcommandMatches` is a struct with { name, matches }.
-                Ok(matches) => {
-                    if let Some(verbose_flag) = matches.args.get("verbose") {
-                        let Some(value) = verbose_flag.value.as_bool() else {
-                            return Err(
-                                anyhow::anyhow!("Error parsing CLI arguments: verbose flag is not a boolean").into(),
-                            );
-                        };
-                        verbose = value;
-                    }
-
-                    // Get the path we are trying to open.
-                    if let Some(source_arg) = matches.args.get("source") {
-                        // We don't do an else here because this can be null.
-                        if let Some(value) = source_arg.value.as_str() {
-                            log::info!("Got path in cli argument: {}", value);
-                            source_path = Some(Path::new(value).to_path_buf());
-                        }
-                    }
-                }
-                Err(err) => {
-                    return Err(anyhow::anyhow!("Error parsing CLI arguments: {:?}", err).into());
-                }
-            }
-
-            if verbose {
-                log::debug!("Verbose mode enabled.");
-            }
-
-            // If we have a source path to open, make sure it exists.
-            let Some(source_path) = source_path else {
-                // The user didn't provide a source path to open.
-                // Run the app as normal.
-                app.manage(state::Store::default());
-                return Ok(());
-            };
-
-            if !source_path.exists() {
-                return Err(anyhow::anyhow!(
-                    "Error: the path `{}` you are trying to open does not exist",
-                    source_path.display()
-                )
-                .into());
-            }
-
-            let runner: tauri::async_runtime::JoinHandle<Result<ProjectState>> =
-                tauri::async_runtime::spawn(async move { ProjectState::new_from_path(source_path).await });
-
-            // Block on the handle.
-            let store = tauri::async_runtime::block_on(runner)??;
-
-            // Create a state object to hold the project.
-            app.manage(state::Store::new(store));
-
-            // Listen on the deep links.
-            app.listen("deep-link://new-url", |event| {
-                log::info!("got deep-link url: {:?}", event);
-                // TODO: open_url_sync(app.handle(), event.url);
-            });
-
-            Ok(())
-        })
-        .build(tauri::generate_context!())?
-        .run(
-            #[allow(unused_variables)]
-            |app, event| {
-                #[cfg(any(target_os = "macos", target_os = "ios"))]
-                if let tauri::RunEvent::Opened { urls } = event {
-                    log::info!("Opened URLs: {:?}", urls);
-
-                    // Handle the first URL.
-                    // TODO: do we want to handle more than one URL?
-                    // Under what conditions would we even have more than one?
-                    if let Some(url) = urls.first() {
-                        open_url_sync(app, url);
-                    }
-                }
-            },
-        );
-
-    Ok(())
 }

src-tauri/src/state.rs

@@ -1,21 +0,0 @@
-//! State management for the application.
-
-use kcl_lib::settings::types::file::ProjectState;
-use tokio::sync::Mutex;
-
-#[derive(Debug, Default)]
-pub struct Store(Mutex<Option<ProjectState>>);
-
-impl Store {
-    pub fn new(p: ProjectState) -> Self {
-        Self(Mutex::new(Some(p)))
-    }
-
-    pub async fn get(&self) -> Option<ProjectState> {
-        self.0.lock().await.clone()
-    }
-
-    pub async fn set(&self, p: Option<ProjectState>) {
-        *self.0.lock().await = p;
-    }
-}

src-tauri/tauri.app-store.conf.json

@@ -1,8 +0,0 @@
-{
-  "$schema": "../node_modules/@tauri-apps/cli/schema.json",
-  "bundle": {
-    "macOS": {
-      "entitlements": "entitlements/app-store.entitlements"
-    }
-  }
-}

src-tauri/tauri.conf.json

@@ -37,42 +37,23 @@
       }
     },
     "longDescription": "",
-    "macOS": {},
+    "macOS": {
+      "entitlements": null,
+      "exceptionDomain": "",
+      "frameworks": [],
+      "providerShortName": null,
+      "signingIdentity": null
+    },
     "resources": [],
     "shortDescription": "",
     "targets": "all"
   },
   "identifier": "dev.zoo.modeling-app",
   "plugins": {
-    "cli": {
-      "description": "Zoo Modeling App CLI",
-      "args": [
-        {
-          "short": "v",
-          "name": "verbose",
-          "description": "Verbosity level"
-        },
-        {
-          "name": "source",
-          "description": "The file or directory to open",
-          "required": false,
-          "index": 1,
-          "takesValue": true
-        }
-      ],
-      "subcommands": {}
-    },
-    "deep-link": {
-      "domains": [
-        {
-          "host": "app.zoo.dev"
-        }
-      ]
-    },
     "shell": {
       "open": true
     }
   },
   "productName": "Zoo Modeling App",
-  "version": "0.20.2"
+  "version": "0.18.1"
 }

src-tauri/tauri.release.conf.json

@@ -5,45 +5,7 @@
       "certificateThumbprint": "F4C9A52FF7BC26EE5E054946F6B11DEEA94C748D",
       "digestAlgorithm": "sha256",
       "timestampUrl": "http://timestamp.digicert.com"
-    },
-    "fileAssociations": [
-      {
-        "ext": ["kcl"],
-        "mimeType": "text/vnd.zoo.kcl"
-      },
-      {
-        "ext": ["obj"],
-        "mimeType": "model/obj"
-      },
-      {
-        "ext": ["gltf"],
-        "mimeType": "model/gltf+json"
-      },
-      {
-        "ext": ["glb"],
-        "mimeType": "model/gltf+binary"
-      },
-      {
-        "ext": ["fbx", "fbxb"],
-        "mimeType": "model/fbx"
-      },
-      {
-        "ext": ["stl"],
-        "mimeType": "model/stl"
-      },
-      {
-        "ext": ["ply"],
-        "mimeType": "model/ply"
-      },
-      {
-        "ext": ["step", "stp"],
-        "mimeType": "model/step"
-      },
-      {
-        "ext": ["sldprt"],
-        "mimeType": "model/sldprt"
     }
-    ]
   },
   "plugins": {
     "updater": {

src/Router.tsx

@@ -30,7 +30,6 @@ import SettingsAuthProvider from 'components/SettingsAuthProvider'
 import LspProvider from 'components/LspProvider'
 import { KclContextProvider } from 'lang/KclProvider'
 import { BROWSER_PROJECT_NAME } from 'lib/constants'
-import { getState, setState } from 'lib/tauri'
 
 const router = createBrowserRouter([
   {
@@ -53,29 +52,10 @@ const router = createBrowserRouter([
     children: [
       {
         path: paths.INDEX,
-        loader: async () => {
+        loader: () =>
-          const inTauri = isTauri()
+          isTauri()
-          if (inTauri) {
-            const appState = await getState()
-
-            if (appState) {
-              // Reset the state.
-              // We do this so that we load the initial state from the cli but everything
-              // else we can ignore.
-              await setState(undefined)
-              // Redirect to the file if we have a file path.
-              if (appState.current_file) {
-                return redirect(
-                  paths.FILE + '/' + encodeURIComponent(appState.current_file)
-                )
-              }
-            }
-          }
-
-          return inTauri
             ? redirect(paths.HOME)
-            : redirect(paths.FILE + '/%2F' + BROWSER_PROJECT_NAME)
+            : redirect(paths.FILE + '/%2F' + BROWSER_PROJECT_NAME),
-        },
       },
       {
         loader: fileLoader,

src/clientSideScene/sceneEntities.ts

@@ -964,7 +964,7 @@ export class SceneEntities {
       if (!draftInfo)
         // don't want to mod the user's code yet as they have't committed to the change yet
         // plus this would be the truncated ast being recast, it would be wrong
-        codeManager.updateCodeEditor(code)
+        codeManager.updateCodeStateEditor(code)
       const { programMemory } = await executeAst({
         ast: truncatedAst,
         useFakeExecutor: true,

src/components/AppHeader.tsx

@@ -1,13 +1,12 @@
 import { Toolbar } from '../Toolbar'
-import UserSidebarMenu from 'components/UserSidebarMenu'
+import UserSidebarMenu from './UserSidebarMenu'
 import { type IndexLoaderData } from 'lib/types'
 import ProjectSidebarMenu from './ProjectSidebarMenu'
 import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
 import styles from './AppHeader.module.css'
 import { useCommandsContext } from 'hooks/useCommandsContext'
-import { ActionButton } from 'components/ActionButton'
+import { ActionButton } from './ActionButton'
 import usePlatform from 'hooks/usePlatform'
-import { RefreshButton } from 'components/RefreshButton'
 
 interface AppHeaderProps extends React.PropsWithChildren {
   showToolbar?: boolean
@@ -61,12 +60,7 @@ export const AppHeader = ({
       </div>
       <div className="flex items-center gap-1 py-1 ml-auto">
         {/* If there are children, show them, otherwise show User menu */}
-        {children || (
+        {children || <UserSidebarMenu user={user} />}
-          <>
-            <RefreshButton />
-            <UserSidebarMenu user={user} />
-          </>
-        )}
       </div>
     </header>
   )

src/components/CommandBar/CommandBarSelectionInput.tsx

@@ -7,7 +7,6 @@ import {
   getSelectionType,
   getSelectionTypeDisplayText,
 } from 'lib/selections'
-import { kclManager } from 'lib/singletons'
 import { modelingMachine } from 'machines/modelingMachine'
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { useHotkeys } from 'react-hotkeys-hook'
@@ -51,14 +50,6 @@ function CommandBarSelectionInput({
     inputRef.current?.focus()
   }, [selection, inputRef])
 
-  // Exit engine's edit mode when this input step is active,
-  // and re-enter it when it's not.
-  // In future the engine's edit mode will go away and this will be handled differently.
-  useEffect(() => {
-    kclManager.exitEditMode()
-    return () => kclManager.enterEditMode()
-  }, [])
-
   // Fast-forward through this arg if it's marked as skippable
   // and we have a valid selection already
   useEffect(() => {

src/components/CustomIcon.tsx

@@ -41,16 +41,6 @@ const CustomIconMap = {
       />
     </svg>
   ),
-  arrowRotateRight: (
-    <svg viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-      <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M15.5 7.59684L15.5 8.09684L15 8.09684L10.7931 8.09684L10.7931 7.09684L13.769 7.09684C13.3052 6.54751 12.7147 6.11526 12.0452 5.83941C11.2133 5.49662 10.2977 5.41109 9.41668 5.59387C8.53566 5.77666 7.72967 6.21935 7.10277 6.8648C6.47588 7.51025 6.05687 8.32881 5.89986 9.21478C5.74284 10.1008 5.85503 11.0134 6.22194 11.835C6.58884 12.6566 7.19361 13.3493 7.95816 13.8237C8.7227 14.2981 9.61192 14.5325 10.511 14.4964C11.41 14.4604 12.2776 14.1557 13.0018 13.6216L13.5953 14.4264C12.7103 15.0792 11.6499 15.4516 10.551 15.4956C9.45216 15.5397 8.36535 15.2533 7.4309 14.6734C6.49646 14.0936 5.75729 13.2469 5.30885 12.2428C4.86041 11.2386 4.7233 10.1231 4.9152 9.04027C5.10711 7.95742 5.61923 6.95696 6.38543 6.16808C7.15164 5.3792 8.13674 4.83812 9.21354 4.61472C10.2903 4.39132 11.4094 4.49586 12.4262 4.91483C13.2286 5.24545 13.9382 5.7599 14.5 6.41286L14.5 3.38998L15.5 3.38998L15.5 7.59684Z"
-        fill="currentColor"
-      />
-    </svg>
-  ),
   arrowUp: (
     <svg viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
       <path

src/components/ErrorPage.tsx

@@ -16,7 +16,7 @@ export const ErrorPage = () => {
   return (
     <div className="flex flex-col items-center justify-center h-screen">
       <section className="max-w-full xl:max-w-4xl mx-auto">
-        <h1 className="text-4xl mb-8 font-bold" data-testid="unexpected-error">
+        <h1 className="text-4xl mb-8 font-bold">
           An unexpected error occurred
         </h1>
         {isRouteErrorResponse(error) && (
@@ -26,12 +26,7 @@ export const ErrorPage = () => {
         )}
         <div className="flex justify-between gap-2 mt-6">
           {isTauri() && (
-            <ActionButton
+            <ActionButton Element="link" to={'/'} icon={{ icon: faHome }}>
-              Element="link"
-              to={'/'}
-              icon={{ icon: faHome }}
-              data-testid="unexpected-error-home"
-            >
               Go Home
             </ActionButton>
           )}

src/components/FileMachineProvider.tsx

@@ -15,10 +15,10 @@ import {
 import { useCommandsContext } from 'hooks/useCommandsContext'
 import { fileMachine } from 'machines/fileMachine'
 import { mkdir, remove, rename, create } from '@tauri-apps/plugin-fs'
+import { readProject } from 'lib/tauriFS'
 import { isTauri } from 'lib/isTauri'
 import { join, sep } from '@tauri-apps/api/path'
 import { DEFAULT_FILE_NAME, FILE_EXT } from 'lib/constants'
-import { getProjectInfo } from 'lib/tauri'
 
 type MachineContext<T extends AnyStateMachine> = {
   state: StateFrom<T>
@@ -62,7 +62,7 @@ export const FileMachineProvider = ({
     services: {
       readFiles: async (context: ContextFrom<typeof fileMachine>) => {
         const newFiles = isTauri()
-          ? (await getProjectInfo(context.project.path)).children
+          ? await readProject(context.project.path)
           : []
         return {
           ...context.project,

src/components/FileTree.tsx

@@ -3,7 +3,7 @@ import { paths } from 'lib/paths'
 import { ActionButton } from './ActionButton'
 import Tooltip from './Tooltip'
 import { Dispatch, useEffect, useRef, useState } from 'react'
-import { useNavigate, useRouteLoaderData } from 'react-router-dom'
+import { useNavigate } from 'react-router-dom'
 import { Dialog, Disclosure } from '@headlessui/react'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faChevronRight, faTrashAlt } from '@fortawesome/free-solid-svg-icons'
@@ -133,13 +133,18 @@ const FileTreeItem = ({
   project,
   currentFile,
   fileOrDir,
-  onDoubleClick,
+  closePanel,
   level = 0,
 }: {
   project?: IndexLoaderData['project']
   currentFile?: IndexLoaderData['file']
   fileOrDir: FileEntry
-  onDoubleClick?: () => void
+  closePanel: (
+    focusableElement?:
+      | HTMLElement
+      | React.MutableRefObject<HTMLElement | null>
+      | undefined
+  ) => void
   level?: number
 }) => {
   const { send, context } = useFileContext()
@@ -181,7 +186,7 @@ const FileTreeItem = ({
       // Open kcl files
       navigate(`${paths.FILE}/${encodeURIComponent(fileOrDir.path)}`)
     }
-    onDoubleClick?.()
+    closePanel()
   }
 
   return (
@@ -189,10 +194,8 @@ const FileTreeItem = ({
       {fileOrDir.children === undefined ? (
         <li
           className={
-            'group m-0 p-0 border-solid border-0 hover:bg-primary/5 focus-within:bg-primary/5 dark:hover:bg-primary/20 dark:focus-within:bg-primary/20 ' +
+            'group m-0 p-0 border-solid border-0 hover:text-primary hover:bg-primary/5 focus-within:bg-primary/5 ' +
-            (isCurrentFile
+            (isCurrentFile ? '!bg-primary/10 !text-primary' : '')
-              ? '!bg-primary/10 !text-primary dark:!bg-primary/20 dark:!text-inherit'
-              : '')
           }
         >
           {!isRenaming ? (
@@ -224,9 +227,9 @@ const FileTreeItem = ({
               {!isRenaming ? (
                 <Disclosure.Button
                   className={
-                    ' group border-none text-sm rounded-none p-0 m-0 flex items-center justify-start w-full py-0.5 hover:text-primary hover:bg-primary/5 dark:hover:text-inherit dark:hover:bg-primary/10' +
+                    ' group border-none text-sm rounded-none p-0 m-0 flex items-center justify-start w-full py-0.5 hover:text-primary hover:bg-primary/5' +
                     (context.selectedDirectory.path.includes(fileOrDir.path)
-                      ? ' ui-open:bg-primary/10'
+                      ? ' ui-open:text-primary'
                       : '')
                   }
                   style={{ paddingInlineStart: getIndentationCSS(level) }}
@@ -290,7 +293,7 @@ const FileTreeItem = ({
                       fileOrDir={child}
                       project={project}
                       currentFile={currentFile}
-                      onDoubleClick={onDoubleClick}
+                      closePanel={closePanel}
                       level={level + 1}
                       key={level + '-' + child.path}
                     />
@@ -322,8 +325,20 @@ interface FileTreeProps {
   ) => void
 }
 
-export const FileTreeMenu = () => {
+export const FileTree = ({
-  const { send } = useFileContext()
+  className = '',
+  file,
+  closePanel,
+}: FileTreeProps) => {
+  const { send, context } = useFileContext()
+  const docuemntHasFocus = useDocumentHasFocus()
+  useHotkeys('meta + n', createFile)
+  useHotkeys('meta + shift + n', createFolder)
+
+  // Refresh the file tree when the document gets focus
+  useEffect(() => {
+    send({ type: 'Refresh' })
+  }, [docuemntHasFocus])
 
   async function createFile() {
     send({ type: 'Create file', data: { name: '', makeDir: false } })
@@ -333,11 +348,10 @@ export const FileTreeMenu = () => {
     send({ type: 'Create file', data: { name: '', makeDir: true } })
   }
 
-  useHotkeys('meta + n', createFile)
-  useHotkeys('meta + shift + n', createFolder)
-
   return (
-    <>
+    <div className={className}>
+      <div className="flex items-center gap-1 px-4 py-1 bg-chalkboard-20/40 dark:bg-chalkboard-80/50 border-b border-b-chalkboard-30 dark:border-b-chalkboard-80">
+        <h2 className="flex-1 m-0 p-0 text-sm mono">Files</h2>
         <ActionButton
           Element="button"
           icon={{
@@ -367,37 +381,7 @@ export const FileTreeMenu = () => {
             Create folder
           </Tooltip>
         </ActionButton>
-    </>
-  )
-}
-
-export const FileTree = ({ className = '', closePanel }: FileTreeProps) => {
-  return (
-    <div className={className}>
-      <div className="flex items-center gap-1 px-4 py-1 bg-chalkboard-20/40 dark:bg-chalkboard-80/50 border-b border-b-chalkboard-30 dark:border-b-chalkboard-80">
-        <h2 className="flex-1 m-0 p-0 text-sm mono">Files</h2>
-        <FileTreeMenu />
       </div>
-      <FileTreeInner onDoubleClick={closePanel} />
-    </div>
-  )
-}
-
-export const FileTreeInner = ({
-  onDoubleClick,
-}: {
-  onDoubleClick?: () => void
-}) => {
-  const loaderData = useRouteLoaderData(paths.FILE) as IndexLoaderData
-  const { send, context } = useFileContext()
-  const documentHasFocus = useDocumentHasFocus()
-
-  // Refresh the file tree when the document gets focus
-  useEffect(() => {
-    send({ type: 'Refresh' })
-  }, [documentHasFocus])
-
-  return (
       <div className="overflow-auto max-h-full pb-12">
         <ul
           className="m-0 p-0 text-sm"
@@ -408,13 +392,14 @@ export const FileTreeInner = ({
           {sortProject(context.project.children || []).map((fileOrDir) => (
             <FileTreeItem
               project={context.project}
-            currentFile={loaderData?.file}
+              currentFile={file}
               fileOrDir={fileOrDir}
-            onDoubleClick={onDoubleClick}
+              closePanel={closePanel}
               key={fileOrDir.path}
             />
           ))}
         </ul>
       </div>
+    </div>
   )
 }

src/components/HelpMenu.tsx

@@ -94,7 +94,10 @@ export function HelpMenu(props: React.PropsWithChildren) {
             if (isInProject) {
               navigate('onboarding')
             } else {
-              createAndOpenNewProject(navigate)
+              createAndOpenNewProject(
+                settings.context.app.projectDirectory.current,
+                navigate
+              )
             }
           }}
         >

src/components/LspProvider.tsx

@@ -3,7 +3,7 @@ import type * as LSP from 'vscode-languageserver-protocol'
 import React, { createContext, useMemo, useEffect, useContext } from 'react'
 import { FromServer, IntoServer } from 'editor/plugins/lsp/codec'
 import Client from '../editor/plugins/lsp/client'
-import { TEST, VITE_KC_API_BASE_URL } from 'env'
+import { DEV, TEST } from 'env'
 import kclLanguage from 'editor/plugins/lsp/kcl/language'
 import { copilotPlugin } from 'editor/plugins/lsp/copilot'
 import { useStore } from 'useStore'
@@ -85,7 +85,7 @@ export const LspProvider = ({ children }: { children: React.ReactNode }) => {
       },
     },
   } = useSettingsAuthContext()
-  const token = auth?.context.token
+  const token = auth?.context?.token
   const navigate = useNavigate()
   const { overallState } = useNetworkStatus()
   const isNetworkOkay = overallState === NetworkHealthState.Ok
@@ -103,7 +103,7 @@ export const LspProvider = ({ children }: { children: React.ReactNode }) => {
       wasmUrl: wasmUrl(),
       token: token,
       baseUnit: defaultUnit.current,
-      apiBaseUrl: VITE_KC_API_BASE_URL,
+      devMode: DEV,
     }
     lspWorker.postMessage({
       worker: LspWorker.Kcl,
@@ -177,7 +177,7 @@ export const LspProvider = ({ children }: { children: React.ReactNode }) => {
     const initEvent: CopilotWorkerOptions = {
       wasmUrl: wasmUrl(),
       token: token,
-      apiBaseUrl: VITE_KC_API_BASE_URL,
+      devMode: DEV,
     }
     lspWorker.postMessage({
       worker: LspWorker.Copilot,

src/components/ModelingMachineProvider.tsx

@@ -56,7 +56,6 @@ import toast from 'react-hot-toast'
 import { EditorSelection } from '@uiw/react-codemirror'
 import { CoreDumpManager } from 'lib/coredump'
 import { useHotkeys } from 'react-hotkeys-hook'
-import { useSearchParams } from 'react-router-dom'
 import { letEngineAnimateAndSyncCamAfter } from 'clientSideScene/CameraControls'
 
 type MachineContext<T extends AnyStateMachine> = {
@@ -85,12 +84,7 @@ export const ModelingMachineProvider = ({
   } = useSettingsAuthContext()
   const token = auth?.context?.token
   const streamRef = useRef<HTMLDivElement>(null)
-
-  let [searchParams] = useSearchParams()
-  const pool = searchParams.get('pool')
-
   useSetupEngineManager(streamRef, token, {
-    pool: pool,
     theme: theme.current,
     highlightEdges: highlightEdges.current,
     enableSSAO: enableSSAO.current,

src/components/ModelingSidebar/ModelingPane.tsx

@@ -24,7 +24,6 @@ export const ModelingPaneHeader = ({
 
 export const ModelingPane = ({
   title,
-  id,
   children,
   className,
   Menu,
@@ -44,7 +43,6 @@ export const ModelingPane = ({
     <section
       {...props}
       data-testid={detailsTestId}
-      id={id}
       className={
         pointerEventsCssClass + styles.panel + ' group ' + (className || '')
       }

src/components/ModelingSidebar/ModelingPanes/KclEditorPane.tsx

@@ -2,7 +2,7 @@ import ReactCodeMirror from '@uiw/react-codemirror'
 import { TEST } from 'env'
 import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
 import { Themes, getSystemTheme } from 'lib/theme'
-import { useEffect, useMemo, useRef } from 'react'
+import { useEffect, useMemo } from 'react'
 import { highlightSelectionMatches, searchKeymap } from '@codemirror/search'
 import { lineHighlightField } from 'editor/highlightextension'
 import { roundOff } from 'lib/utils'
@@ -190,15 +190,13 @@ export const KclEditorPane = () => {
     return extensions
   }, [kclLSP, copilotLSP, textWrapping.current, cursorBlinking.current])
 
-  const initialCode = useRef(codeManager.code)
-
   return (
     <div
       id="code-mirror-override"
       className={'absolute inset-0 ' + (cursorBlinking.current ? 'blink' : '')}
     >
       <ReactCodeMirror
-        value={initialCode.current}
+        value={codeManager.code}
         extensions={editorExtensions}
         theme={theme}
         onCreateEditor={(_editorView) =>

src/components/ModelingSidebar/ModelingPanes/index.ts

@@ -10,32 +10,21 @@ import { KclEditorMenu } from 'components/ModelingSidebar/ModelingPanes/KclEdito
 import { CustomIconName } from 'components/CustomIcon'
 import { KclEditorPane } from 'components/ModelingSidebar/ModelingPanes/KclEditorPane'
 import { ReactNode } from 'react'
+import type { PaneType } from 'useStore'
 import { MemoryPane } from './MemoryPane'
 import { KclErrorsPane, LogsPane } from './LoggingPanes'
 import { DebugPane } from './DebugPane'
-import { FileTreeInner, FileTreeMenu } from 'components/FileTree'
 
-export type SidebarType =
+export type Pane = {
-  | 'code'
+  id: PaneType
-  | 'debug'
-  | 'export'
-  | 'files'
-  | 'kclErrors'
-  | 'logs'
-  | 'lspMessages'
-  | 'variables'
-
-export type SidebarPane = {
-  id: SidebarType
   title: string
   icon: CustomIconName | IconDefinition
-  keybinding: string
   Content: ReactNode | React.FC
   Menu?: ReactNode | React.FC
-  hideOnPlatform?: 'desktop' | 'web'
+  keybinding: string
 }
 
-export const topPanes: SidebarPane[] = [
+export const topPanes: Pane[] = [
   {
     id: 'code',
     title: 'KCL Code',
@@ -44,18 +33,9 @@ export const topPanes: SidebarPane[] = [
     keybinding: 'shift + c',
     Menu: KclEditorMenu,
   },
-  {
-    id: 'files',
-    title: 'Project Files',
-    icon: 'folder',
-    Content: FileTreeInner,
-    keybinding: 'shift + f',
-    Menu: FileTreeMenu,
-    hideOnPlatform: 'web',
-  },
 ]
 
-export const bottomPanes: SidebarPane[] = [
+export const bottomPanes: Pane[] = [
   {
     id: 'variables',
     title: 'Variables',

src/components/ModelingSidebar/ModelingSidebar.tsx

@@ -2,19 +2,13 @@ import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
 import { Resizable } from 're-resizable'
 import { useCallback, useEffect, useState } from 'react'
 import { useHotkeys } from 'react-hotkeys-hook'
-import { useStore } from 'useStore'
+import { PaneType, useStore } from 'useStore'
 import { Tab } from '@headlessui/react'
-import {
+import { Pane, bottomPanes, topPanes } from './ModelingPanes'
-  SidebarPane,
-  SidebarType,
-  bottomPanes,
-  topPanes,
-} from './ModelingPanes'
 import Tooltip from 'components/Tooltip'
 import { ActionIcon } from 'components/ActionIcon'
 import styles from './ModelingSidebar.module.css'
 import { ModelingPane } from './ModelingPane'
-import { isTauri } from 'lib/isTauri'
 
 interface ModelingSidebarProps {
   paneOpacity: '' | 'opacity-20' | 'opacity-40'
@@ -58,7 +52,7 @@ export function ModelingSidebar({ paneOpacity }: ModelingSidebarProps) {
 }
 
 interface ModelingSidebarSectionProps {
-  panes: SidebarPane[]
+  panes: Pane[]
   alignButtons?: 'start' | 'end'
 }
 
@@ -75,11 +69,11 @@ function ModelingSidebarSection({
   }))
   const foundOpenPane = openPanes.find((pane) => paneIds.includes(pane))
   const [currentPane, setCurrentPane] = useState(
-    foundOpenPane || ('none' as SidebarType | 'none')
+    foundOpenPane || ('none' as PaneType | 'none')
   )
 
   const togglePane = useCallback(
-    (newPane: SidebarType | 'none') => {
+    (newPane: PaneType | 'none') => {
       if (newPane === 'none') {
         setOpenPanes(openPanes.filter((p) => p !== currentPane))
         setCurrentPane('none')
@@ -96,15 +90,9 @@ function ModelingSidebarSection({
 
   // Filter out the debug panel if it's not supposed to be shown
   // TODO: abstract out for allowing user to configure which panes to show
-  const filteredPanes = (
+  const filteredPanes = showDebugPanel.current
-    showDebugPanel.current ? panes : panes.filter((pane) => pane.id !== 'debug')
+    ? panes
-  ).filter(
+    : panes.filter((pane) => pane.id !== 'debug')
-    (pane) =>
-      !pane.hideOnPlatform ||
-      (isTauri()
-        ? pane.hideOnPlatform === 'web'
-        : pane.hideOnPlatform === 'desktop')
-  )
   useEffect(() => {
     if (
       !showDebugPanel.current &&
@@ -165,11 +153,7 @@ function ModelingSidebarSection({
         <Tab.Panel key="none" />
         {filteredPanes.map((pane) => (
           <Tab.Panel key={pane.id} className="h-full">
-            <ModelingPane
+            <ModelingPane title={pane.title} Menu={pane.Menu}>
-              id={`${pane.id}-pane`}
-              title={pane.title}
-              Menu={pane.Menu}
-            >
               {pane.Content instanceof Function ? (
                 <pane.Content />
               ) : (
@@ -184,8 +168,8 @@ function ModelingSidebarSection({
 }
 
 interface ModelingPaneButtonProps {
-  paneConfig: SidebarPane
+  paneConfig: Pane
-  currentPane: SidebarType | 'none'
+  currentPane: PaneType | 'none'
   togglePane: () => void
 }
 

src/components/ProjectCard.tsx

@@ -1,4 +1,5 @@
 import { FormEvent, useEffect, useRef, useState } from 'react'
+import { type ProjectWithEntryPointMetadata } from 'lib/types'
 import { paths } from 'lib/paths'
 import { Link } from 'react-router-dom'
 import { ActionButton } from './ActionButton'
@@ -8,11 +9,11 @@ import {
   faTrashAlt,
   faX,
 } from '@fortawesome/free-solid-svg-icons'
+import { getPartsCount, readProject } from '../lib/tauriFS'
 import { FILE_EXT } from 'lib/constants'
 import { Dialog } from '@headlessui/react'
 import { useHotkeys } from 'react-hotkeys-hook'
 import Tooltip from './Tooltip'
-import { Project } from 'wasm-lib/kcl/bindings/Project'
 
 function ProjectCard({
   project,
@@ -20,17 +21,17 @@ function ProjectCard({
   handleDeleteProject,
   ...props
 }: {
-  project: Project
+  project: ProjectWithEntryPointMetadata
   handleRenameProject: (
     e: FormEvent<HTMLFormElement>,
-    f: Project
+    f: ProjectWithEntryPointMetadata
   ) => Promise<void>
-  handleDeleteProject: (f: Project) => Promise<void>
+  handleDeleteProject: (f: ProjectWithEntryPointMetadata) => Promise<void>
 }) {
   useHotkeys('esc', () => setIsEditing(false))
   const [isEditing, setIsEditing] = useState(false)
   const [isConfirmingDelete, setIsConfirmingDelete] = useState(false)
-  const [numberOfFiles, setNumberOfFiles] = useState(1)
+  const [numberOfParts, setNumberOfParts] = useState(1)
   const [numberOfFolders, setNumberOfFolders] = useState(0)
 
   let inputRef = useRef<HTMLInputElement>(null)
@@ -40,8 +41,7 @@ function ProjectCard({
     void handleRenameProject(e, project).then(() => setIsEditing(false))
   }
 
-  function getDisplayedTime(dateStr: string) {
+  function getDisplayedTime(date: Date) {
-    const date = new Date(dateStr)
     const startOfToday = new Date()
     startOfToday.setHours(0, 0, 0, 0)
     return date.getTime() < startOfToday.getTime()
@@ -50,12 +50,15 @@ function ProjectCard({
   }
 
   useEffect(() => {
-    async function getNumberOfFiles() {
+    async function getNumberOfParts() {
-      setNumberOfFiles(project.kcl_file_count)
+      const { kclFileCount, kclDirCount } = getPartsCount(
-      setNumberOfFolders(project.directory_count)
+        await readProject(project.path)
+      )
+      setNumberOfParts(kclFileCount)
+      setNumberOfFolders(kclDirCount)
     }
-    void getNumberOfFiles()
+    void getNumberOfParts()
-  }, [project.kcl_file_count, project.directory_count])
+  }, [project.path])
 
   useEffect(() => {
     if (inputRef.current) {
@@ -126,7 +129,7 @@ function ProjectCard({
               {project.name?.replace(FILE_EXT, '')}
             </Link>
             <span className="text-chalkboard-60 text-xs">
-              {numberOfFiles} file{numberOfFiles === 1 ? '' : 's'}{' '}
+              {numberOfParts} part{numberOfParts === 1 ? '' : 's'}{' '}
               {numberOfFolders > 0 &&
                 `/ ${numberOfFolders} folder${
                   numberOfFolders === 1 ? '' : 's'
@@ -134,8 +137,8 @@ function ProjectCard({
             </span>
             <span className="text-chalkboard-60 text-xs">
               Edited{' '}
-              {project.metadata && project.metadata?.modified
+              {project.entrypointMetadata.mtime
-                ? getDisplayedTime(project.metadata.modified)
+                ? getDisplayedTime(project.entrypointMetadata.mtime)
                 : 'never'}
             </span>
             <div className="absolute z-10 bottom-2 right-2 flex gap-1 items-center opacity-0 group-hover:opacity-100 group-focus-within:opacity-100">

src/components/ProjectSidebarMenu.test.tsx

@@ -1,10 +1,10 @@
 import { fireEvent, render, screen } from '@testing-library/react'
 import { BrowserRouter } from 'react-router-dom'
 import ProjectSidebarMenu from './ProjectSidebarMenu'
+import { type ProjectWithEntryPointMetadata } from 'lib/types'
 import { SettingsAuthProviderJest } from './SettingsAuthProvider'
 import { APP_NAME } from 'lib/constants'
 import { CommandBarProvider } from './CommandBar/CommandBarProvider'
-import { Project } from 'wasm-lib/kcl/bindings/Project'
 
 const now = new Date()
 const projectWellFormed = {
@@ -14,17 +14,29 @@ const projectWellFormed = {
     {
       name: 'main.kcl',
       path: '/some/path/Simple Box/main.kcl',
-      children: [],
     },
   ],
-  metadata: {
+  entrypointMetadata: {
-    created: now.toISOString(),
+    atime: now,
-    modified: now.toISOString(),
+    blksize: 32,
+    blocks: 32,
+    birthtime: now,
+    dev: 1,
+    gid: 1,
+    ino: 1,
+    isDirectory: false,
+    isFile: true,
+    isSymlink: false,
+    mode: 1,
+    mtime: now,
+    nlink: 1,
+    readonly: false,
+    rdev: 1,
     size: 32,
+    uid: 1,
+    fileAttributes: null,
   },
-  kcl_file_count: 1,
+} satisfies ProjectWithEntryPointMetadata
-  directory_count: 0,
-} satisfies Project
 
 describe('ProjectSidebarMenu tests', () => {
   test('Renders the project name', () => {

src/components/ProjectSidebarMenu.tsx

@@ -133,13 +133,13 @@ function ProjectMenuPopover({
                   <p className="m-0 text-mono" data-testid="projectName">
                     {project?.name ? project.name : APP_NAME}
                   </p>
-                  {project?.metadata && project.metadata.created && (
+                  {project?.entrypointMetadata && (
                     <p
                       className="m-0 text-xs text-chalkboard-80 dark:text-chalkboard-40"
                       data-testid="createdAt"
                     >
                       Created{' '}
-                      {new Date(project.metadata.created).toLocaleDateString()}
+                      {project.entrypointMetadata.birthtime?.toLocaleDateString()}
                     </p>
                   )}
                 </div>

src/components/RefreshButton.tsx

@@ -1,37 +0,0 @@
-import { CustomIcon } from './CustomIcon'
-import Tooltip from './Tooltip'
-
-export function RefreshButton() {
-  async function refresh() {
-    if (window && 'plausible' in window) {
-      const p = window.plausible as (
-        event: string,
-        options?: { props: Record<string, string> }
-      ) => Promise<void>
-      // Send a refresh event to Plausible so we can track how often users get stuck
-      await p('Refresh', {
-        props: {
-          method: 'UI button',
-          // TODO: add more coredump data here
-        },
-      })
-    }
-
-    // Window may not be available in some environments
-    window?.location.reload()
-  }
-
-  return (
-    <button
-      onClick={refresh}
-      className="p-1 m-0 bg-chalkboard-10/80 dark:bg-chalkboard-100/50 hover:bg-chalkboard-10 dark:hover:bg-chalkboard-100 rounded-full border border-solid border-chalkboard-10 dark:border-chalkboard-100"
-    >
-      <CustomIcon name="arrowRotateRight" className="w-5 h-5" />
-      <Tooltip position="bottom-right">
-        <span>Refresh and report</span>
-        <br />
-        <span className="text-xs">Send us data on how you got stuck</span>
-      </Tooltip>
-    </button>
-  )
-}

src/components/Settings/SettingsFieldInput.tsx

@@ -1,152 +0,0 @@
-import { Toggle } from 'components/Toggle/Toggle'
-import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
-import { Setting } from 'lib/settings/initialSettings'
-import {
-  SetEventTypes,
-  SettingsLevel,
-  WildcardSetEvent,
-} from 'lib/settings/settingsTypes'
-import { getSettingInputType } from 'lib/settings/settingsUtils'
-import { useMemo } from 'react'
-import { Event } from 'xstate'
-
-interface SettingsFieldInputProps {
-  // We don't need the fancy types here,
-  // it doesn't help us with autocomplete or anything
-  category: string
-  settingName: string
-  settingsLevel: SettingsLevel
-  setting: Setting<unknown>
-}
-
-export function SettingsFieldInput({
-  category,
-  settingName,
-  settingsLevel,
-  setting,
-}: SettingsFieldInputProps) {
-  const {
-    settings: { context, send },
-  } = useSettingsAuthContext()
-  const options = useMemo(() => {
-    return setting.commandConfig &&
-      'options' in setting.commandConfig &&
-      setting.commandConfig.options
-      ? setting.commandConfig.options instanceof Array
-        ? setting.commandConfig.options
-        : setting.commandConfig.options(
-            {
-              argumentsToSubmit: {
-                level: settingsLevel,
-              },
-            },
-            context
-          )
-      : []
-  }, [setting, settingsLevel, context])
-  const inputType = getSettingInputType(setting)
-
-  switch (inputType) {
-    case 'component':
-      return (
-        setting.Component && (
-          <setting.Component
-            value={setting[settingsLevel] || setting.getFallback(settingsLevel)}
-            updateValue={(newValue) => {
-              send({
-                type: `set.${category}.${settingName}`,
-                data: {
-                  level: settingsLevel,
-                  value: newValue,
-                },
-              } as unknown as Event<WildcardSetEvent>)
-            }}
-          />
-        )
-      )
-    case 'boolean':
-      return (
-        <Toggle
-          offLabel="Off"
-          onLabel="On"
-          onChange={(e) =>
-            send({
-              type: `set.${category}.${settingName}`,
-              data: {
-                level: settingsLevel,
-                value: Boolean(e.target.checked),
-              },
-            } as SetEventTypes)
-          }
-          checked={Boolean(
-            setting[settingsLevel] !== undefined
-              ? setting[settingsLevel]
-              : setting.getFallback(settingsLevel)
-          )}
-          name={`${category}-${settingName}`}
-          data-testid={`${category}-${settingName}`}
-        />
-      )
-    case 'options':
-      return (
-        <select
-          name={`${category}-${settingName}`}
-          data-testid={`${category}-${settingName}`}
-          className="p-1 bg-transparent border rounded-sm border-chalkboard-30 w-full"
-          value={String(
-            setting[settingsLevel] || setting.getFallback(settingsLevel)
-          )}
-          onChange={(e) =>
-            send({
-              type: `set.${category}.${settingName}`,
-              data: {
-                level: settingsLevel,
-                value: e.target.value,
-              },
-            } as unknown as Event<WildcardSetEvent>)
-          }
-        >
-          {options &&
-            options.length > 0 &&
-            options.map((option) => (
-              <option key={option.name} value={String(option.value)}>
-                {option.name}
-              </option>
-            ))}
-        </select>
-      )
-    case 'string':
-      return (
-        <input
-          name={`${category}-${settingName}`}
-          data-testid={`${category}-${settingName}`}
-          type="text"
-          className="p-1 bg-transparent border rounded-sm border-chalkboard-30 w-full"
-          defaultValue={String(
-            setting[settingsLevel] || setting.getFallback(settingsLevel)
-          )}
-          onBlur={(e) => {
-            if (
-              setting[settingsLevel] === undefined
-                ? setting.getFallback(settingsLevel) !== e.target.value
-                : setting[settingsLevel] !== e.target.value
-            ) {
-              send({
-                type: `set.${category}.${settingName}`,
-                data: {
-                  level: settingsLevel,
-                  value: e.target.value,
-                },
-              } as unknown as Event<WildcardSetEvent>)
-            }
-          }}
-        />
-      )
-  }
-  return (
-    <p className="text-destroy-70 dark:text-destroy-20">
-      No component or input type found for setting {settingName} in category{' '}
-      {category}
-    </p>
-  )
-}

src/components/Settings/SettingsSearchBar.tsx

@@ -1,110 +0,0 @@
-import { Combobox } from '@headlessui/react'
-import { CustomIcon } from 'components/CustomIcon'
-import decamelize from 'decamelize'
-import Fuse from 'fuse.js'
-import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
-import { Setting } from 'lib/settings/initialSettings'
-import { useEffect, useMemo, useRef, useState } from 'react'
-import { useHotkeys } from 'react-hotkeys-hook'
-import { useNavigate } from 'react-router-dom'
-
-export function SettingsSearchBar() {
-  const inputRef = useRef<HTMLInputElement>(null)
-  useHotkeys(
-    'Ctrl+.',
-    (e) => {
-      e.preventDefault()
-      inputRef.current?.focus()
-    },
-    { enableOnFormTags: true }
-  )
-  const navigate = useNavigate()
-  const [query, setQuery] = useState('')
-  const { settings } = useSettingsAuthContext()
-  const settingsAsSearchable = useMemo(
-    () =>
-      Object.entries(settings.state.context).flatMap(
-        ([category, categorySettings]) =>
-          Object.entries(categorySettings).flatMap(([settingName, setting]) => {
-            const s = setting as Setting
-            return ['project', 'user']
-              .filter((l) => s.hideOnLevel !== l)
-              .map((l) => ({
-                category: decamelize(category, { separator: ' ' }),
-                settingName: settingName,
-                settingNameDisplay: decamelize(settingName, { separator: ' ' }),
-                setting: s,
-                level: l,
-              }))
-          })
-      ),
-    [settings.state.context]
-  )
-  const [searchResults, setSearchResults] = useState(settingsAsSearchable)
-
-  const fuse = new Fuse(settingsAsSearchable, {
-    keys: ['category', 'settingNameDisplay', 'setting.description'],
-    includeScore: true,
-  })
-
-  useEffect(() => {
-    const results = fuse.search(query).map((result) => result.item)
-    setSearchResults(query.length > 0 ? results : settingsAsSearchable)
-  }, [query])
-
-  function handleSelection({
-    level,
-    settingName,
-  }: {
-    category: string
-    settingName: string
-    setting: Setting<unknown>
-    level: string
-  }) {
-    navigate(`?tab=${level}#${settingName}`)
-  }
-
-  return (
-    <Combobox onChange={handleSelection}>
-      <div className="relative group">
-        <div className="flex items-center gap-2 py-0.5 pr-1 pl-2 rounded border-solid border border-primary/10 dark:border-chalkboard-80 focus-within:border-primary dark:focus-within:border-chalkboard-30">
-          <Combobox.Input
-            ref={inputRef}
-            onChange={(event) => setQuery(event.target.value)}
-            className="w-full bg-transparent focus:outline-none selection:bg-primary/20 dark:selection:bg-primary/40 dark:focus:outline-none"
-            placeholder="Search settings (^.)"
-            autoCapitalize="off"
-            autoComplete="off"
-            autoCorrect="off"
-            spellCheck="false"
-            autoFocus
-          />
-          <CustomIcon
-            name="search"
-            className="w-5 h-5 rounded-sm bg-primary/10 text-primary group-focus-within:bg-primary group-focus-within:text-chalkboard-10"
-          />
-        </div>
-        <Combobox.Options className="absolute top-full mt-2 right-0 w-80 overflow-y-auto z-50 max-h-96 cursor-pointer bg-chalkboard-10 dark:bg-chalkboard-100 border border-solid border-primary dark:border-chalkboard-30 rounded">
-          {searchResults?.map((option) => (
-            <Combobox.Option
-              key={`${option.category}-${option.settingName}-${option.level}`}
-              value={option}
-              className="flex flex-col items-start gap-2 px-4 py-2 ui-active:bg-primary/10 dark:ui-active:bg-chalkboard-90"
-            >
-              <p className="flex-grow text-base capitalize m-0 leading-none">
-                {option.level} ·{' '}
-                {decamelize(option.category, { separator: ' ' })} ·{' '}
-                {option.settingNameDisplay}
-              </p>
-              {option.setting.description && (
-                <p className="text-xs leading-tight text-chalkboard-70 dark:text-chalkboard-50">
-                  {option.setting.description}
-                </p>
-              )}
-            </Combobox.Option>
-          ))}
-        </Combobox.Options>
-      </div>
-    </Combobox>
-  )
-}

src/components/Settings/SettingsSection.tsx

@@ -1,60 +0,0 @@
-import { CustomIcon } from 'components/CustomIcon'
-import Tooltip from 'components/Tooltip'
-import { SettingsLevel } from 'lib/settings/settingsTypes'
-
-interface SettingsSectionProps extends React.HTMLProps<HTMLDivElement> {
-  title: string
-  description?: string
-  className?: string
-  parentLevel?: SettingsLevel | 'default'
-  onFallback?: () => void
-  settingHasChanged?: boolean
-  headingClassName?: string
-}
-
-export function SettingsSection({
-  title,
-  id,
-  description,
-  className,
-  children,
-  parentLevel,
-  settingHasChanged,
-  onFallback,
-  headingClassName = 'text-lg font-normal capitalize tracking-wide',
-}: SettingsSectionProps) {
-  return (
-    <section
-      id={id}
-      className={
-        'group p-2 pl-0 grid grid-cols-2 gap-6 items-start ' +
-        className +
-        (settingHasChanged ? ' border-0 border-l-2 -ml-0.5 border-primary' : '')
-      }
-    >
-      <div className="ml-2">
-        <div className="flex items-center gap-2">
-          <h2 className={headingClassName}>{title}</h2>
-          {onFallback && parentLevel && settingHasChanged && (
-            <button
-              onClick={onFallback}
-              className="hidden group-hover:block group-focus-within:block border-none p-0 hover:bg-warn-10 dark:hover:bg-warn-80 focus:bg-warn-10 dark:focus:bg-warn-80 focus:outline-none"
-            >
-              <CustomIcon name="refresh" className="w-4 h-4" />
-              <span className="sr-only">Roll back {title}</span>
-              <Tooltip position="right">
-                Roll back to match {parentLevel}
-              </Tooltip>
-            </button>
-          )}
-        </div>
-        {description && (
-          <p className="mt-2 text-xs text-chalkboard-80 dark:text-chalkboard-30">
-            {description}
-          </p>
-        )}
-      </div>
-      <div>{children}</div>
-    </section>
-  )
-}

src/components/Settings/SettingsTabButton.tsx

@@ -1,28 +0,0 @@
-import { CustomIcon, CustomIconName } from 'components/CustomIcon'
-
-interface SettingsTabButtonProps {
-  checked: boolean
-  icon: CustomIconName
-  text: string
-}
-
-export function SettingsTabButton(props: SettingsTabButtonProps) {
-  const { checked, icon, text } = props
-  return (
-    <div
-      className={`cursor-pointer select-none flex items-center gap-1 p-1 pr-2 -mb-[1px] border-0 border-b ${
-        checked
-          ? 'border-primary'
-          : 'border-chalkboard-20 dark:border-chalkboard-30 hover:bg-primary/20 dark:hover:bg-primary/50'
-      }`}
-    >
-      <CustomIcon
-        name={icon}
-        className={
-          'w-5 h-5 ' + (checked ? 'bg-primary !text-chalkboard-10' : '')
-        }
-      />
-      <span>{text}</span>
-    </div>
-  )
-}

src/components/Settings/SettingsTabs.tsx

@@ -1,39 +0,0 @@
-import { RadioGroup } from '@headlessui/react'
-import { SettingsTabButton } from './SettingsTabButton'
-
-interface SettingsTabButtonProps {
-  value: string
-  onChange: (value: string) => void
-  showProjectTab: boolean
-}
-
-export function SettingsTabs({
-  value,
-  onChange,
-  showProjectTab,
-}: SettingsTabButtonProps) {
-  return (
-    <RadioGroup
-      value={value}
-      onChange={onChange}
-      className="flex justify-start pl-4 pr-5 gap-5 border-0 border-b border-b-chalkboard-20 dark:border-b-chalkboard-90"
-    >
-      <RadioGroup.Option value="user">
-        {({ checked }) => (
-          <SettingsTabButton checked={checked} icon="person" text="User" />
-        )}
-      </RadioGroup.Option>
-      {showProjectTab && (
-        <RadioGroup.Option value="project">
-          {({ checked }) => (
-            <SettingsTabButton
-              checked={checked}
-              icon="folder"
-              text="This project"
-            />
-          )}
-        </RadioGroup.Option>
-      )}
-    </RadioGroup>
-  )
-}

src/components/SettingsAuthProvider.tsx

@@ -168,7 +168,7 @@ export const SettingsAuthProviderBase = ({
         },
         'Execute AST': () => kclManager.executeCode(true),
         persistSettings: (context) =>
-          saveSettings(context, loadedProject?.project?.name),
+          saveSettings(context, loadedProject?.project?.path),
       },
     }
   )

src/components/Toggle/Toggle.module.css

@@ -1,13 +1,7 @@
 .toggle {
   @apply flex items-center gap-2 w-fit;
-  @apply text-chalkboard-110;
+  --toggle-size: 1.25rem;
-  --toggle-size: 0.75rem;
   --padding: 0.25rem;
-  --border: 1px;
-}
-
-:global(.dark) .toggle {
-  @apply text-chalkboard-10;
 }
 
 .toggle:focus-within > span {
@@ -19,12 +13,9 @@
 }
 
 .toggle > span {
-  @apply relative rounded border border-chalkboard-70 hover:border-chalkboard-80 cursor-pointer;
+  @apply relative rounded border border-chalkboard-110 hover:border-chalkboard-100 cursor-pointer;
-  border-width: var(--border);
+  width: calc(2 * (var(--toggle-size) + var(--padding)));
-  width: calc(
+  height: calc(var(--toggle-size) + var(--padding));
-    2 * (var(--toggle-size) + var(--padding) * 2 - var(--border) * 2)
-  );
-  height: calc(var(--toggle-size) + var(--padding) * 2 - var(--border) * 2);
 }
 
 :global(.dark) .toggle > span {
@@ -32,26 +23,18 @@
 }
 
 .toggle > span::after {
-  width: var(--toggle-size);
-  height: var(--toggle-size);
-  border-radius: calc(var(--toggle-size) / 8);
   content: '';
-  @apply absolute bg-chalkboard-70;
+  @apply absolute w-4 h-4 rounded-sm bg-chalkboard-110;
   top: 50%;
   left: 50%;
-  translate: calc(-100% - var(--padding) + var(--border)) -50%;
+  translate: calc(-100% - var(--padding)) -50%;
   transition: translate 0.08s ease-out;
 }
 
 :global(.dark) .toggle > span::after {
-  @apply bg-chalkboard-50;
+  @apply bg-chalkboard-10;
 }
 
 .toggle input:checked + span::after {
-  translate: calc(50% - var(--padding) + var(--border)) -50%;
+  translate: calc(50% - var(--padding)) -50%;
-  @apply bg-chalkboard-110;
-}
-
-:global(.dark) .toggle input:checked + span::after {
-  @apply bg-chalkboard-10;
 }

src/components/Toggle/Toggle.tsx

@@ -19,11 +19,7 @@ export const Toggle = ({
 }: ToggleProps) => {
   return (
     <label className={`${styles.toggle} ${className}`}>
-      <p
-        className={checked ? 'text-chalkboard-70 dark:text-chalkboard-50' : ''}
-      >
       {offLabel}
-      </p>
       <input
         type="checkbox"
         name={name}
@@ -32,11 +28,7 @@ export const Toggle = ({
         onChange={onChange}
       />
       <span></span>
-      <p
-        className={!checked ? 'text-chalkboard-70 dark:text-chalkboard-50' : ''}
-      >
       {onLabel}
-      </p>
     </label>
   )
 }

src/editor/manager.ts

@@ -189,7 +189,6 @@ export default class EditorManager {
     const ignoreEvents: ModelingMachineEvent['type'][] = [
       'Equip Line tool',
       'Equip tangential arc to',
-      'Equip rectangle tool',
     ]
 
     if (!this._modelingEvent) {

src/editor/plugins/lsp/plugin.ts

@@ -167,7 +167,6 @@ export class LanguageServerPlugin implements PluginValue {
     if (pos === null) return null
     const dom = document.createElement('div')
     dom.classList.add('documentation')
-    dom.style.zIndex = '99999999'
     if (this.allowHTMLContent) dom.innerHTML = formatContents(contents)
     else dom.textContent = formatContents(contents)
     return { pos, end, create: (view) => ({ dom }), above: true }

src/editor/plugins/lsp/types.ts

@@ -8,13 +8,13 @@ export interface KclWorkerOptions {
   wasmUrl: string
   token: string
   baseUnit: UnitLength
-  apiBaseUrl: string
+  devMode: boolean
 }
 
 export interface CopilotWorkerOptions {
   wasmUrl: string
   token: string
-  apiBaseUrl: string
+  devMode: boolean
 }
 
 export enum LspWorkerEventType {

src/editor/plugins/lsp/worker.ts

@@ -28,11 +28,11 @@ const initialise = async (wasmUrl: string) => {
 export async function copilotLspRun(
   config: ServerConfig,
   token: string,
-  baseUrl: string
+  devMode: boolean = false
 ) {
   try {
     console.log('starting copilot lsp')
-    await copilot_lsp_run(config, token, baseUrl)
+    await copilot_lsp_run(config, token, devMode)
   } catch (e: any) {
     console.log('copilot lsp failed', e)
     // We can't restart here because a moved value, we should do this another way.
@@ -44,11 +44,11 @@ export async function kclLspRun(
   engineCommandManager: EngineCommandManager | null,
   token: string,
   baseUnit: string,
-  baseUrl: string
+  devMode: boolean = false
 ) {
   try {
     console.log('start kcl lsp')
-    await kcl_lsp_run(config, engineCommandManager, baseUnit, token, baseUrl)
+    await kcl_lsp_run(config, engineCommandManager, baseUnit, token, devMode)
   } catch (e: any) {
     console.log('kcl lsp failed', e)
     // We can't restart here because a moved value, we should do this another way.
@@ -80,12 +80,12 @@ onmessage = function (event) {
                 null,
                 kclData.token,
                 kclData.baseUnit,
-                kclData.apiBaseUrl
+                kclData.devMode
               )
               break
             case LspWorker.Copilot:
               let copilotData = eventData as CopilotWorkerOptions
-              copilotLspRun(config, copilotData.token, copilotData.apiBaseUrl)
+              copilotLspRun(config, copilotData.token, copilotData.devMode)
               break
           }
         })

src/env.ts

@@ -7,8 +7,7 @@ export const VITE_KC_API_BASE_URL = import.meta.env.VITE_KC_API_BASE_URL
 export const VITE_KC_SITE_BASE_URL = import.meta.env.VITE_KC_SITE_BASE_URL
 export const VITE_KC_CONNECTION_TIMEOUT_MS = import.meta.env
   .VITE_KC_CONNECTION_TIMEOUT_MS
-export const VITE_KC_DEV_TOKEN = import.meta.env.VITE_KC_DEV_TOKEN as
+export const VITE_KC_WASM_OVERRIDE_URL = import.meta.env
-  | string
+  .VITE_KC_WASM_OVERRIDE_URL
-  | undefined
 export const TEST = import.meta.env.TEST
 export const DEV = import.meta.env.DEV

src/hooks/useSetupEngineManager.ts

@@ -9,12 +9,10 @@ export function useSetupEngineManager(
   streamRef: React.RefObject<HTMLDivElement>,
   token?: string,
   settings = {
-    pool: null,
     theme: Themes.System,
     highlightEdges: true,
     enableSSAO: true,
   } as {
-    pool: string | null
     theme: Themes
     highlightEdges: boolean
     enableSSAO: boolean
@@ -37,12 +35,6 @@ export function useSetupEngineManager(
 
   const hasSetNonZeroDimensions = useRef<boolean>(false)
 
-  if (settings.pool) {
-    // override the pool param (?pool=) to request a specific engine instance
-    // from a particular pool.
-    engineCommandManager.pool = settings.pool
-  }
-
   useLayoutEffect(() => {
     // Load the engine command manager once with the initial width and height,
     // then we do not want to reload it.

src/lang/KclSingleton.ts

@@ -17,7 +17,7 @@ import {
   ExtrudeGroup,
 } from 'lang/wasm'
 import { getNodeFromPath } from './queryAst'
-import { codeManager, editorManager, sceneInfra } from 'lib/singletons'
+import { codeManager, editorManager } from 'lib/singletons'
 
 export class KclManager {
   private _ast: Program = {
@@ -187,7 +187,6 @@ export class KclManager {
       ast,
       engineCommandManager: this.engineCommandManager,
     })
-    sceneInfra.modelingSend({ type: 'code edit during sketch' })
     enterEditMode(programMemory, this.engineCommandManager)
     this.isExecuting = false
     // Check the cancellation token for this execution before applying side effects
@@ -220,7 +219,7 @@ export class KclManager {
     const newCode = recast(ast)
     const newAst = this.safeParse(newCode)
     if (!newAst) return
-    codeManager.updateCodeEditor(newCode)
+    codeManager.updateCodeStateEditor(newCode)
     // Write the file to disk.
     await codeManager.writeToFile()
     await this?.engineCommandManager?.waitForReady
@@ -317,7 +316,7 @@ export class KclManager {
     if (execute) {
       // Call execute on the set ast.
       // Update the code state and editor.
-      codeManager.updateCodeEditor(newCode)
+      codeManager.updateCodeStateEditor(newCode)
       // Write the file to disk.
       await codeManager.writeToFile()
       await this.executeAst(astWithUpdatedSource)

src/lang/codeManager.ts

@@ -11,7 +11,8 @@ const PERSIST_CODE_TOKEN = 'persistCode'
 
 export default class CodeManager {
   private _code: string = bracket
-  #updateState: (arg: string) => void = () => {}
+  private _updateState: (arg: string) => void = () => {}
+  private _updateEditor: (arg: string) => void = () => {}
   private _currentFilePath: string | null = null
 
   constructor() {
@@ -45,7 +46,7 @@ export default class CodeManager {
   }
 
   registerCallBacks({ setCode }: { setCode: (arg: string) => void }) {
-    this.#updateState = setCode
+    this._updateState = setCode
   }
 
   updateCurrentFilePath(path: string) {
@@ -56,20 +57,18 @@ export default class CodeManager {
   updateCodeState(code: string): void {
     if (this._code !== code) {
       this.code = code
-      this.#updateState(code)
+      this._updateState(code)
     }
   }
 
   // Update the code in the editor.
   updateCodeEditor(code: string): void {
+    const lastCode = this._code
     this.code = code
+    this._updateEditor(code)
     if (editorManager.editorView) {
       editorManager.editorView.dispatch({
-        changes: {
+        changes: { from: 0, to: lastCode.length, insert: code },
-          from: 0,
-          to: editorManager.editorView.state.doc.length,
-          insert: code,
-        },
       })
     }
   }
@@ -78,7 +77,8 @@ export default class CodeManager {
   updateCodeStateEditor(code: string): void {
     if (this._code !== code) {
       this.code = code
-      this.#updateState(code)
+      this._updateState(code)
+      this._updateEditor(code)
     }
   }
 

src/lang/std/engineConnection.ts

@@ -335,9 +335,7 @@ class EngineConnection {
     // Information on the connect transaction
 
     const createPeerConnection = () => {
-      this.pc = new RTCPeerConnection({
+      this.pc = new RTCPeerConnection()
-        bundlePolicy: 'max-bundle',
-      })
 
       // Data channels MUST BE specified before SDP offers because requesting
       // them affects what our needs are!
@@ -654,9 +652,7 @@ failed cmd type was ${artifactThatFailed?.commandType}`
           // No ICE servers can be valid in a local dev. env.
           if (ice_servers?.length === 0) {
             console.warn('No ICE servers')
-            this.pc?.setConfiguration({
+            this.pc?.setConfiguration({})
-              bundlePolicy: 'max-bundle',
-            })
           } else {
             // When we set the Configuration, we want to always force
             // iceTransportPolicy to 'relay', since we know the topology
@@ -664,7 +660,6 @@ failed cmd type was ${artifactThatFailed?.commandType}`
             // talk to the engine in any configuration /other/ than relay
             // from a infra POV.
             this.pc?.setConfiguration({
-              bundlePolicy: 'max-bundle',
               iceServers: ice_servers,
               iceTransportPolicy: 'relay',
             })
@@ -893,7 +888,6 @@ export class EngineCommandManager {
   sceneCommandArtifacts: ArtifactMap = {}
   outSequence = 1
   inSequence = 1
-  pool?: string
   engineConnection?: EngineConnection
   defaultPlanes: DefaultPlanes | null = null
   commandLogs: CommandLog[] = []
@@ -920,9 +914,8 @@ export class EngineCommandManager {
   callbacksEngineStateConnection: ((state: EngineConnectionState) => void)[] =
     []
 
-  constructor(pool?: string) {
+  constructor() {
     this.engineConnection = undefined
-    this.pool = pool
   }
 
   private _camControlsCameraChange = () => {}
@@ -979,8 +972,7 @@ export class EngineCommandManager {
     }
 
     const additionalSettings = settings.enableSSAO ? '&post_effect=ssao' : ''
-    const pool = this.pool === undefined ? '' : `&pool=${this.pool}`
+    const url = `${VITE_KC_API_WS_MODELING_URL}?video_res_width=${width}&video_res_height=${height}${additionalSettings}`
-    const url = `${VITE_KC_API_WS_MODELING_URL}?video_res_width=${width}&video_res_height=${height}${additionalSettings}${pool}`
     this.engineConnection = new EngineConnection({
       engineCommandManager: this,
       url,

src/lang/std/fileSystemManager.ts

@@ -1,7 +1,8 @@
 import { readFile, exists as tauriExists } from '@tauri-apps/plugin-fs'
 import { isTauri } from 'lib/isTauri'
 import { join } from '@tauri-apps/api/path'
-import { readDirRecursive } from 'lib/tauri'
+import { invoke } from '@tauri-apps/api/core'
+import { FileEntry } from 'lib/types'
 
 /// FileSystemManager is a class that provides a way to read files from the local file system.
 /// It assumes that you are in a project since it is solely used by the std lib
@@ -68,7 +69,9 @@ class FileSystemManager {
         throw new Error(`Error joining dir: ${error}`)
       })
       .then((p) => {
-        readDirRecursive(p)
+        invoke<FileEntry[]>('read_dir_recursive', {
+          path: p,
+        })
           .catch((error) => {
             throw new Error(`Error reading dir: ${error}`)
           })

src/lang/wasm.ts

@@ -10,11 +10,7 @@ import init, {
   make_default_planes,
   coredump,
   toml_stringify,
-  default_app_settings,
+  toml_parse,
-  parse_app_settings,
-  parse_project_settings,
-  default_project_settings,
-  parse_project_route,
 } from '../wasm-lib/pkg/wasm_lib'
 import { KCLError } from './errors'
 import { KclError as RustKclError } from '../wasm-lib/kcl/bindings/KclError'
@@ -29,10 +25,7 @@ import { AppInfo } from 'wasm-lib/kcl/bindings/AppInfo'
 import { CoreDumpManager } from 'lib/coredump'
 import openWindow from 'lib/openWindow'
 import { DefaultPlanes } from 'wasm-lib/kcl/bindings/DefaultPlanes'
-import { TEST } from 'env'
+import { TEST, VITE_KC_WASM_OVERRIDE_URL } from 'env'
-import { Configuration } from 'wasm-lib/kcl/bindings/Configuration'
-import { ProjectConfiguration } from 'wasm-lib/kcl/bindings/ProjectConfiguration'
-import { ProjectRoute } from 'wasm-lib/kcl/bindings/ProjectRoute'
 
 export type { Program } from '../wasm-lib/kcl/bindings/Program'
 export type { Value } from '../wasm-lib/kcl/bindings/Value'
@@ -83,8 +76,9 @@ export type { MemoryItem } from '../wasm-lib/kcl/bindings/MemoryItem'
 export type { ExtrudeSurface } from '../wasm-lib/kcl/bindings/ExtrudeSurface'
 
 export const wasmUrl = () => {
-  const baseUrl =
+  const baseUrl = VITE_KC_WASM_OVERRIDE_URL
-    typeof window === 'undefined'
+    ? VITE_KC_WASM_OVERRIDE_URL
+    : typeof window === 'undefined'
     ? 'http://127.0.0.1:3000'
     : window.location.origin.includes('tauri://localhost')
     ? 'tauri://localhost' // custom protocol for macOS
@@ -356,53 +350,11 @@ export function tomlStringify(toml: any): string {
   }
 }
 
-export function defaultAppSettings(): Configuration {
+export function tomlParse(toml: string): any {
   try {
-    const settings: Configuration = default_app_settings()
+    const parsed: any = toml_parse(toml)
-    return settings
+    return parsed
   } catch (e: any) {
-    throw new Error(`Error getting default app settings: ${e}`)
+    throw new Error(`Error parsing toml: ${e}`)
-  }
-}
-
-export function parseAppSettings(toml: string): Configuration {
-  try {
-    const settings: Configuration = parse_app_settings(toml)
-    return settings
-  } catch (e: any) {
-    throw new Error(`Error parsing app settings: ${e}`)
-  }
-}
-
-export function defaultProjectSettings(): ProjectConfiguration {
-  try {
-    const settings: ProjectConfiguration = default_project_settings()
-    return settings
-  } catch (e: any) {
-    throw new Error(`Error getting default project settings: ${e}`)
-  }
-}
-
-export function parseProjectSettings(toml: string): ProjectConfiguration {
-  try {
-    const settings: ProjectConfiguration = parse_project_settings(toml)
-    return settings
-  } catch (e: any) {
-    throw new Error(`Error parsing project settings: ${e}`)
-  }
-}
-
-export function parseProjectRoute(
-  configuration: Configuration,
-  route_str: string
-): ProjectRoute {
-  try {
-    const route: ProjectRoute = parse_project_route(
-      JSON.stringify(configuration),
-      route_str
-    )
-    return route
-  } catch (e: any) {
-    throw new Error(`Error parsing project route: ${e}`)
   }
 }

src/lib/cameraControls.ts

@@ -1,5 +1,3 @@
-import { MouseControlType } from 'wasm-lib/kcl/bindings/MouseControlType'
-
 const noModifiersPressed = (e: React.MouseEvent) =>
   !e.ctrlKey && !e.shiftKey && !e.altKey && !e.metaKey
 
@@ -22,29 +20,6 @@ export const cameraSystems: CameraSystem[] = [
   'AutoCAD',
 ]
 
-export function mouseControlsToCameraSystem(
-  mouseControl: MouseControlType | undefined
-): CameraSystem | undefined {
-  switch (mouseControl) {
-    case 'kitty_cad':
-      return 'KittyCAD'
-    case 'on_shape':
-      return 'OnShape'
-    case 'trackpad_friendly':
-      return 'Trackpad Friendly'
-    case 'solidworks':
-      return 'Solidworks'
-    case 'nx':
-      return 'NX'
-    case 'creo':
-      return 'Creo'
-    case 'auto_cad':
-      return 'AutoCAD'
-    default:
-      return undefined
-  }
-}
-
 interface MouseGuardHandler {
   description: string
   callback: (e: React.MouseEvent) => boolean

src/lib/constants.ts

@@ -8,6 +8,8 @@ export const MAX_PADDING = 7
  * This is available for users to edit as a setting.
  */
 export const DEFAULT_PROJECT_NAME = 'project-$nnn'
+/** The file name for settings files, both at the user and project level */
+export const SETTINGS_FILE_EXT = '.toml'
 /** Name given the temporary "project" in the browser version of the app */
 export const BROWSER_PROJECT_NAME = 'browser'
 /** Name given the temporary file in the browser version of the app */