WIP

.github/workflows/ci.yml

@@ -55,7 +55,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v4
       - name: Install codespell
         run: |
             python -m pip install codespell
@@ -181,9 +181,6 @@ jobs:
           cd ../../
           cp src/wasm-lib/pkg/wasm_lib_bg.wasm public
 
-      - name: Run vite build (build:both)
-        run: yarn vite build --mode ${{ env.BUILD_RELEASE == 'true' && 'production' || 'development' }}
-
       - name: Fix format
         run: yarn fmt
 
@@ -253,12 +250,10 @@ jobs:
         if: matrix.os == 'ubuntu-latest'
         run: |
           cargo install tauri-driver
-          source .env.${{ env.BUILD_RELEASE == 'true' && 'production' || 'development' }}
-          export VITE_KC_API_BASE_URL
           xvfb-run yarn test:e2e:tauri
         env:
           E2E_APPLICATION: "./src-tauri/target/${{ env.BUILD_RELEASE == 'true' && 'release' || 'debug' }}/kittycad-modeling"
-          KITTYCAD_API_TOKEN: ${{ env.BUILD_RELEASE == 'true' && secrets.KITTYCAD_API_TOKEN || secrets.KITTYCAD_API_TOKEN_DEV }}
+          KITTYCAD_API_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN }}
 
 
   publish-apps-release:
@@ -350,12 +345,12 @@ jobs:
           credentials_json: '${{ secrets.GOOGLE_CLOUD_DL_SA }}'
 
       - name: Set up Google Cloud SDK
-        uses: google-github-actions/setup-gcloud@v2.0.0
+        uses: google-github-actions/setup-gcloud@v1.1.1
         with:
           project_id: kittycadapi
 
       - name: Upload release files to public bucket
-        uses: google-github-actions/upload-cloud-storage@v2.0.0
+        uses: google-github-actions/upload-cloud-storage@v1.0.3
         with:
           path: artifact
           glob: '*/*itty*'
@@ -363,13 +358,13 @@ jobs:
           destination: ${{ env.BUCKET_DIR }}/${{ env.VERSION }}
 
       - name: Upload update endpoint to public bucket
-        uses: google-github-actions/upload-cloud-storage@v2.0.0
+        uses: google-github-actions/upload-cloud-storage@v1.0.3
         with:
           path: last_update.json
           destination: ${{ env.BUCKET_DIR }}
 
       - name: Upload download endpoint to public bucket
-        uses: google-github-actions/upload-cloud-storage@v2.0.0
+        uses: google-github-actions/upload-cloud-storage@v1.0.3
         with:
           path: last_download.json
           destination: ${{ env.BUCKET_DIR }}

.github/workflows/playwright.yml

@@ -14,7 +14,6 @@ jobs:
       with:
         node-version-file: '.nvmrc'
         cache: 'yarn'
-    - uses: KittyCAD/action-install-cli@v0.2.16
     - name: Install dependencies
       run: yarn
     - name: Install Playwright Browsers
@@ -34,7 +33,6 @@ jobs:
       env:
         CI: true
         token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
-        snapshottoken: ${{ secrets.KITTYCAD_API_TOKEN }}
     - uses: actions/upload-artifact@v3
       if: always()
       with:

.gitignore

@@ -37,15 +37,6 @@ src/wasm-lib/lcov.info
 e2e/playwright/playwright-secrets.env
 e2e/playwright/temp1.png
 e2e/playwright/temp2.png
-# exports from snapshot-tests.spec.ts
-e2e/playwright/export-snapshots/*.ply
-e2e/playwright/export-snapshots/*.obj
-e2e/playwright/export-snapshots/*.step
-e2e/playwright/export-snapshots/*.stl
-e2e/playwright/export-snapshots/*binary.gltf
-e2e/playwright/export-snapshots/*embedded.gltf
-
-
 /test-results/
 /playwright-report/
 /blob-report/

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2023 The Zoo Authors
+Copyright (c) 2023 The KittyCAD Authors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,17 +1,17 @@
-![Zoo Modeling App](/public/zma-logomark-outlined.png)
+![KittyCAD Modeling App](/public/kcma-logomark.png)
 
-## Zoo Modeling App
+## KittyCAD Modeling App
 
-live at [app.zoo.dev](https://app.zoo.dev/)
+live at [app.kittycad.io](https://app.kittycad.io/)
 
-A CAD application from the future, brought to you by the [Zoo team](https://zoo.dev).
+A CAD application from the future, brought to you by the [KittyCAD team](https://kittycad.io).
 
-Modeling App is our take on what a modern modelling experience can be. It is applying several lessons learned in the decades since most major CAD tools came into existence:
+The KittyCAD modeling app is our take on what a modern modelling experience can be. It is applying several lessons learned in the decades since most major CAD tools came into existence:
 
 - All artifacts—including parts and assemblies—should be represented as human-readable code. At the end of the day, your CAD project should be "plain text"
   - This makes version control—which is a solved problem in software engineering—trivial for CAD
 - All GUI (or point-and-click) interactions should be actions performed on this code representation under the hood
-  - This unlocks a hybrid approach to modeling. Whether you point-and-click as you always have or you write your own KCL code, you are performing the same action in Modeling App
+  - This unlocks a hybrid approach to modeling. Whether you point-and-click as you always have or you write your own KCL code, you are performing the same action in KittyCAD Modeling App
 - Everything graphics _has_ to be built for the GPU
   - Most CAD applications have had to retrofit support for GPUs, but our geometry engine is made for GPUs (primarily Nvidia's Vulkan), getting the order of magnitude rendering performance boost with it
 - Make the resource-intensive pieces of an application auto-scaling
@@ -19,9 +19,9 @@ Modeling App is our take on what a modern modelling experience can be. It is app
 
 We are excited about what a small team of people could build in a short time with our API. We welcome you to try our API, build your own applications, or contribute to ours!
 
-Modeling App is a _hybrid_ user interface for CAD modeling. You can point-and-click to design parts (and soon assemblies), but everything you make is really just [`kcl` code](https://github.com/KittyCAD/kcl-experiments) under the hood. All of your CAD models can be checked into source control such as GitHub and responsibly versioned, rolled back, and more.
+KittyCAD Modeling App is a _hybrid_ user interface for CAD modeling. You can point-and-click to design parts (and soon assemblies), but everything you make is really just [`kcl` code](https://github.com/KittyCAD/kcl-experiments) under the hood. All of your CAD models can be checked into source control such as GitHub and responsibly versioned, rolled back, and more.
 
-The 3D view in Modeling App is just a video stream from our hosted geometry engine. The app sends new modeling commands to the engine via WebSockets, which returns back video frames of the view within the engine.
+The 3D view in KittyCAD Modeling App is just a video stream from our hosted geometry engine. The app sends new modeling commands to the engine via WebSockets, which returns back video frames of the view within the engine.
 
 ## Tools
 
@@ -183,9 +183,9 @@ For more information on fuzzing you can check out
 First time running plawright locally, you'll need to add the secrets file
 ```bash
 touch ./e2e/playwright/playwright-secrets.env
-echo 'token="your-token"\nsnapshottoken="your-snapshot-token"' > ./e2e/playwright/playwright-secrets2.env
+echo 'token="your-token"' > ./e2e/playwright/playwright-secrets.env
 ```
-then replace "your-token" with a dev token from dev.zoo.dev/account/api-tokens
+then replace "your-token" with a dev token from dev.kittycad.io/account/api-tokens
 
 then:
 run playwright

docs/kcl/std.json

@@ -19765,16 +19765,46 @@
     "tags": [],
     "args": [
       {
-        "name": "to",
-        "type": "[number]",
+        "name": "data",
+        "type": "TangentialArcToData",
         "schema": {
-          "type": "array",
-          "items": {
-            "type": "number",
-            "format": "double"
-          },
-          "maxItems": 2,
-          "minItems": 2
+          "description": "Data to draw a tangential arc to a specific point.",
+          "anyOf": [
+            {
+              "description": "A point with a tag.",
+              "type": "object",
+              "required": [
+                "tag",
+                "to"
+              ],
+              "properties": {
+                "tag": {
+                  "description": "The tag.",
+                  "type": "string"
+                },
+                "to": {
+                  "description": "Where the arc should end. Must lie in the same plane as the current path pen position. Must not be colinear with current path pen position.",
+                  "type": "array",
+                  "items": {
+                    "type": "number",
+                    "format": "double"
+                  },
+                  "maxItems": 2,
+                  "minItems": 2
+                }
+              }
+            },
+            {
+              "description": "A point where the arc should end. Must lie in the same plane as the current path pen position. Must not be colinear with current path pen position.",
+              "type": "array",
+              "items": {
+                "type": "number",
+                "format": "double"
+              },
+              "maxItems": 2,
+              "minItems": 2
+            }
+          ]
         },
         "required": true
       },
@@ -20216,15 +20246,6 @@
           }
         },
         "required": true
-      },
-      {
-        "name": "tag",
-        "type": "String",
-        "schema": {
-          "type": "string",
-          "nullable": true
-        },
-        "required": true
       }
     ],
     "returnValue": {

docs/kcl/std.md

@@ -3905,12 +3905,21 @@ Draw an arc.
 
 
 ```
-tangentialArcTo(to: [number], sketch_group: SketchGroup, tag: String) -> SketchGroup
+tangentialArcTo(data: TangentialArcToData, sketch_group: SketchGroup) -> SketchGroup
 ```
 
 #### Arguments
 
-* `to`: `[number]`
+* `data`: `TangentialArcToData` - Data to draw a tangential arc to a specific point.
+```
+{
+	// The tag.
+	tag: string,
+	// Where the arc should end. Must lie in the same plane as the current path pen position. Must not be colinear with current path pen position.
+	to: [number, number],
+} |
+[number, number]
+```
 * `sketch_group`: `SketchGroup` - A sketch group is a collection of paths.
 ```
 {
@@ -3976,7 +3985,6 @@ tangentialArcTo(to: [number], sketch_group: SketchGroup, tag: String) -> SketchG
 }],
 }
 ```
-* `tag`: `String`
 
 #### Returns
 

e2e/playwright/export-snapshots/obj-.obj

@@ -0,0 +1,189 @@
+v 0 -4 0
+v 0 0 0
+v 0 -4 -1
+v 0 0 -1
+v 3.0950184 -4 -1
+v 3.0950184 0 -1
+v 5.9513144 -4 -3
+v 5.9513144 0 -3
+v 9.5 -4 -3
+v 9.5 0 -3
+v 9.5 -4 -2.5
+v 9.5 0 -2.5
+v 6.108964 -4 -2.5
+v 6.108964 0 -2.5
+v 3.4311862 -4 -0.625
+v 4.323779 -4 -1.25
+v 4.323779 -0 -1.25
+v 3.4311862 -0 -0.625
+v 2.5385938 0 0
+v 2.5385938 -4 0
+v 3.342784 -4 0.375
+v 4.146974 -4 0.75
+v 3.342784 -0 0.375
+v 4.146974 -0 0.75
+v 5.755354 0 1.5
+v 5.755354 -4 1.5
+v 9.5 -4 1.5
+v 9.5 0 1.5
+v 9.5 -4 2
+v 9.5 0 2
+v 5.644507 -4 2
+v 5.644507 0 2
+v 3.5 -4 1
+v 3.5 0 1
+v 0 -4 1
+v 0 0 1
+vt 0.0127 -0.0508
+vt 0.0127 0.0508
+vt -0.0127 -0.0508
+vt -0.0127 0.0508
+vt -0.039306734 0.0508
+vt -0.039306734 -0.0508
+vt 0.039306734 0.0508
+vt 0.039306734 -0.0508
+vt -0.04428355 0.0508
+vt -0.04428355 -0.0508
+vt 0.04428355 0.0508
+vt 0.04428355 -0.0508
+vt -0.045068305 0.0508
+vt -0.045068305 -0.0508
+vt 0.045068305 0.0508
+vt 0.045068305 -0.0508
+vt -0.00635 0.0508
+vt -0.00635 -0.0508
+vt 0.00635 0.0508
+vt 0.00635 -0.0508
+vt 0.04306616 -0.0508
+vt 0.04306616 0.0508
+vt -0.04306616 -0.0508
+vt -0.04306616 0.0508
+vt -0.027677217 -0.0508
+vt 0.000000000000000048572257 -0.0508
+vt 0.000000000000000048572257 0.0508
+vt 0.055354435 -0.0508
+vt 0.055354435 0.0508
+vt -0.027677217 0.0508
+vt -0.055354435 0.0508
+vt -0.055354435 -0.0508
+vt -0.02253807 0.0508
+vt -0.04507614 0.0508
+vt -0.04507614 -0.0508
+vt 0.00000000000000005551115 0.0508
+vt -0.02253807 -0.0508
+vt 0.00000000000000005551115 -0.0508
+vt 0.04507614 -0.0508
+vt 0.04507614 0.0508
+vt -0.047557 0.0508
+vt -0.047557 -0.0508
+vt 0.047557 0.0508
+vt 0.047557 -0.0508
+vt 0.04896476 -0.0508
+vt 0.04896476 0.0508
+vt -0.04896476 -0.0508
+vt -0.04896476 0.0508
+vt 0.03005076 -0.0508
+vt 0.03005076 0.0508
+vt -0.03005076 -0.0508
+vt -0.03005076 0.0508
+vt 0.04445 -0.0508
+vt 0.04445 0.0508
+vt -0.04445 -0.0508
+vt -0.04445 0.0508
+vt 0.08490671 0.009525
+vt 0.06448028 0
+vt 0.0889 0.0254
+vt 0.08715213 -0.015875
+vt 0.10982399 -0.03175
+vt 0.07861347 -0.0254
+vt 0.10533314 0.01905
+vt 0.15116338 -0.0762
+vt 0 -0.0254
+vt 0 0
+vt 0.2413 -0.0762
+vt 0.15516768 -0.0635
+vt 0.2413 -0.0635
+vt 0.14337048 0.0508
+vt 0.146186 0.0381
+vt 0.2413 0.0381
+vt 0.2413 0.0508
+vt 0 0.0254
+vn -1 -0 0
+vn 0 -0 -1
+vn -0.57357645 -0 -0.81915206
+vn 1 -0 0
+vn 0 -0 1
+vn 0.57357645 -0 0.81915206
+vn 0.42261827 -0 -0.9063078
+vn -0.42261827 -0 0.9063078
+vn -0 1 -0
+vn 0 -1 0
+o Unnamed-0
+f 1/1/1 2/2/1 3/3/1
+f 3/3/1 2/2/1 4/4/1
+f 3/5/2 4/6/2 5/7/2
+f 5/7/2 4/6/2 6/8/2
+f 5/9/3 6/10/3 7/11/3
+f 7/11/3 6/10/3 8/12/3
+f 7/13/2 8/14/2 9/15/2
+f 9/15/2 8/14/2 10/16/2
+f 9/17/4 10/18/4 11/19/4
+f 11/19/4 10/18/4 12/20/4
+f 11/21/5 12/22/5 13/23/5
+f 13/23/5 12/22/5 14/24/5
+f 15/25/6 16/26/6 17/27/6
+f 16/26/6 13/28/6 14/29/6
+f 18/30/6 19/31/6 20/32/6
+f 15/25/6 18/30/6 20/32/6
+f 16/26/6 14/29/6 17/27/6
+f 18/30/6 15/25/6 17/27/6
+f 21/33/7 20/34/7 19/35/7
+f 22/36/7 21/33/7 23/37/7
+f 23/37/7 24/38/7 22/36/7
+f 24/38/7 25/39/7 26/40/7
+f 21/33/7 19/35/7 23/37/7
+f 26/40/7 22/36/7 24/38/7
+f 26/41/2 25/42/2 27/43/2
+f 27/43/2 25/42/2 28/44/2
+f 27/17/4 28/18/4 29/19/4
+f 29/19/4 28/18/4 30/20/4
+f 29/45/5 30/46/5 31/47/5
+f 31/47/5 30/46/5 32/48/5
+f 31/49/8 32/50/8 33/51/8
+f 33/51/8 32/50/8 34/52/8
+f 33/53/5 34/54/5 35/55/5
+f 35/55/5 34/54/5 36/56/5
+f 35/1/1 36/2/1 1/3/1
+f 1/3/1 36/2/1 2/4/1
+f 23/57/9 19/58/9 34/59/9
+f 18/60/9 17/61/9 6/62/9
+f 23/57/9 34/59/9 24/63/9
+f 17/61/9 8/64/9 6/62/9
+f 4/65/9 19/58/9 6/62/9
+f 4/65/9 2/66/9 19/58/9
+f 10/67/9 14/68/9 12/69/9
+f 10/67/9 8/64/9 14/68/9
+f 8/64/9 17/61/9 14/68/9
+f 32/70/9 25/71/9 24/63/9
+f 6/62/9 19/58/9 18/60/9
+f 24/63/9 34/59/9 32/70/9
+f 28/72/9 25/71/9 30/73/9
+f 25/71/9 32/70/9 30/73/9
+f 19/58/9 2/66/9 36/74/9
+f 34/59/9 19/58/9 36/74/9
+f 21/57/10 33/59/10 20/58/10
+f 22/63/10 33/59/10 21/57/10
+f 15/60/10 5/62/10 16/61/10
+f 22/63/10 26/71/10 31/70/10
+f 35/74/10 20/58/10 33/59/10
+f 35/74/10 1/66/10 20/58/10
+f 31/70/10 26/71/10 29/73/10
+f 29/73/10 26/71/10 27/72/10
+f 22/63/10 31/70/10 33/59/10
+f 20/58/10 5/62/10 15/60/10
+f 16/61/10 5/62/10 7/64/10
+f 13/68/10 16/61/10 7/64/10
+f 11/69/10 13/68/10 9/67/10
+f 13/68/10 7/64/10 9/67/10
+f 20/58/10 3/65/10 5/62/10
+f 3/65/10 20/58/10 1/66/10

e2e/playwright/export-snapshots/ply-ascii.ply

@@ -0,0 +1,282 @@
+ply
+format ascii 1.0
+comment Generated by kittycad.io
+element vertex 204
+property float x
+property float y
+property float z
+element face 68
+property list uchar uint vertex_indices
+end_header
+0 0 4 
+0 0 0 
+0 -1 4 
+0 -1 4 
+0 0 0 
+0 -1 0 
+0 -1 4 
+0 -1 0 
+3.0950184 -1 4 
+3.0950184 -1 4 
+0 -1 0 
+3.0950184 -1 0 
+3.0950184 -1 4 
+3.0950184 -1 0 
+5.9513144 -3 4 
+5.9513144 -3 4 
+3.0950184 -1 0 
+5.9513144 -3 0 
+5.9513144 -3 4 
+5.9513144 -3 0 
+9.5 -3 4 
+9.5 -3 4 
+5.9513144 -3 0 
+9.5 -3 0 
+9.5 -3 4 
+9.5 -3 0 
+9.5 -2.5 4 
+9.5 -2.5 4 
+9.5 -3 0 
+9.5 -2.5 0 
+9.5 -2.5 4 
+9.5 -2.5 0 
+6.108964 -2.5 4 
+6.108964 -2.5 4 
+9.5 -2.5 0 
+6.108964 -2.5 0 
+3.4311862 -0.625 4 
+4.323779 -1.25 4 
+4.323779 -1.25 0 
+4.323779 -1.25 4 
+6.108964 -2.5 4 
+6.108964 -2.5 0 
+3.4311862 -0.625 0 
+2.5385938 0 0 
+2.5385938 0 4 
+3.4311862 -0.625 4 
+3.4311862 -0.625 0 
+2.5385938 0 4 
+4.323779 -1.25 4 
+6.108964 -2.5 0 
+4.323779 -1.25 0 
+3.4311862 -0.625 0 
+3.4311862 -0.625 4 
+4.323779 -1.25 0 
+3.342784 0.375 4 
+2.5385938 0 4 
+2.5385938 0 0 
+4.146974 0.75 4 
+3.342784 0.375 4 
+3.342784 0.375 0 
+3.342784 0.375 0 
+4.146974 0.75 0 
+4.146974 0.75 4 
+4.146974 0.75 0 
+5.755354 1.5 0 
+5.755354 1.5 4 
+3.342784 0.375 4 
+2.5385938 0 0 
+3.342784 0.375 0 
+5.755354 1.5 4 
+4.146974 0.75 4 
+4.146974 0.75 0 
+5.755354 1.5 4 
+5.755354 1.5 0 
+9.5 1.5 4 
+9.5 1.5 4 
+5.755354 1.5 0 
+9.5 1.5 0 
+9.5 1.5 4 
+9.5 1.5 0 
+9.5 2 4 
+9.5 2 4 
+9.5 1.5 0 
+9.5 2 0 
+9.5 2 4 
+9.5 2 0 
+5.644507 2 4 
+5.644507 2 4 
+9.5 2 0 
+5.644507 2 0 
+5.644507 2 4 
+5.644507 2 0 
+3.5 1 4 
+3.5 1 4 
+5.644507 2 0 
+3.5 1 0 
+3.5 1 4 
+3.5 1 0 
+0 1 4 
+0 1 4 
+3.5 1 0 
+0 1 0 
+0 1 4 
+0 1 0 
+0 0 4 
+0 0 4 
+0 1 0 
+0 0 0 
+3.342784 0.375 0 
+2.5385938 0 0 
+3.5 1 0 
+3.4311862 -0.625 0 
+4.323779 -1.25 0 
+3.0950184 -1 0 
+3.342784 0.375 0 
+3.5 1 0 
+4.146974 0.75 0 
+4.323779 -1.25 0 
+5.9513144 -3 0 
+3.0950184 -1 0 
+0 -1 0 
+2.5385938 0 0 
+3.0950184 -1 0 
+0 -1 0 
+0 0 0 
+2.5385938 0 0 
+9.5 -3 0 
+6.108964 -2.5 0 
+9.5 -2.5 0 
+9.5 -3 0 
+5.9513144 -3 0 
+6.108964 -2.5 0 
+5.9513144 -3 0 
+4.323779 -1.25 0 
+6.108964 -2.5 0 
+5.644507 2 0 
+5.755354 1.5 0 
+4.146974 0.75 0 
+3.0950184 -1 0 
+2.5385938 0 0 
+3.4311862 -0.625 0 
+4.146974 0.75 0 
+3.5 1 0 
+5.644507 2 0 
+9.5 1.5 0 
+5.755354 1.5 0 
+9.5 2 0 
+5.755354 1.5 0 
+5.644507 2 0 
+9.5 2 0 
+2.5385938 0 0 
+0 0 0 
+0 1 0 
+3.5 1 0 
+2.5385938 0 0 
+0 1 0 
+3.342784 0.375 4 
+3.5 1 4 
+2.5385938 0 4 
+4.146974 0.75 4 
+3.5 1 4 
+3.342784 0.375 4 
+3.4311862 -0.625 4 
+3.0950184 -1 4 
+4.323779 -1.25 4 
+4.146974 0.75 4 
+5.755354 1.5 4 
+5.644507 2 4 
+0 1 4 
+2.5385938 0 4 
+3.5 1 4 
+0 1 4 
+0 0 4 
+2.5385938 0 4 
+5.644507 2 4 
+5.755354 1.5 4 
+9.5 2 4 
+9.5 2 4 
+5.755354 1.5 4 
+9.5 1.5 4 
+4.146974 0.75 4 
+5.644507 2 4 
+3.5 1 4 
+2.5385938 0 4 
+3.0950184 -1 4 
+3.4311862 -0.625 4 
+4.323779 -1.25 4 
+3.0950184 -1 4 
+5.9513144 -3 4 
+6.108964 -2.5 4 
+4.323779 -1.25 4 
+5.9513144 -3 4 
+9.5 -2.5 4 
+6.108964 -2.5 4 
+9.5 -3 4 
+6.108964 -2.5 4 
+5.9513144 -3 4 
+9.5 -3 4 
+2.5385938 0 4 
+0 -1 4 
+3.0950184 -1 4 
+0 -1 4 
+2.5385938 0 4 
+0 0 4 
+3 0 1 2 
+3 3 4 5 
+3 6 7 8 
+3 9 10 11 
+3 12 13 14 
+3 15 16 17 
+3 18 19 20 
+3 21 22 23 
+3 24 25 26 
+3 27 28 29 
+3 30 31 32 
+3 33 34 35 
+3 36 37 38 
+3 39 40 41 
+3 42 43 44 
+3 45 46 47 
+3 48 49 50 
+3 51 52 53 
+3 54 55 56 
+3 57 58 59 
+3 60 61 62 
+3 63 64 65 
+3 66 67 68 
+3 69 70 71 
+3 72 73 74 
+3 75 76 77 
+3 78 79 80 
+3 81 82 83 
+3 84 85 86 
+3 87 88 89 
+3 90 91 92 
+3 93 94 95 
+3 96 97 98 
+3 99 100 101 
+3 102 103 104 
+3 105 106 107 
+3 108 109 110 
+3 111 112 113 
+3 114 115 116 
+3 117 118 119 
+3 120 121 122 
+3 123 124 125 
+3 126 127 128 
+3 129 130 131 
+3 132 133 134 
+3 135 136 137 
+3 138 139 140 
+3 141 142 143 
+3 144 145 146 
+3 147 148 149 
+3 150 151 152 
+3 153 154 155 
+3 156 157 158 
+3 159 160 161 
+3 162 163 164 
+3 165 166 167 
+3 168 169 170 
+3 171 172 173 
+3 174 175 176 
+3 177 178 179 
+3 180 181 182 
+3 183 184 185 
+3 186 187 188 
+3 189 190 191 
+3 192 193 194 
+3 195 196 197 
+3 198 199 200 
+3 201 202 203 

e2e/playwright/export-snapshots/step-.step

@@ -74,171 +74,171 @@ DATA;
 #58 = CARTESIAN_POINT('NONE', (0, 0.0254, 0.1016));
 #59 = VERTEX_POINT('NONE', #58);
 #60 = DIRECTION('NONE', (0, -1, 0));
-#61 = VECTOR('NONE', #60, 1);
+#61 = VECTOR('NONE', #60, 0.0254);
 #62 = CARTESIAN_POINT('NONE', (0, 0, -0));
 #63 = LINE('NONE', #62, #61);
 #64 = DIRECTION('NONE', (0, 0, 1));
-#65 = VECTOR('NONE', #64, 1);
+#65 = VECTOR('NONE', #64, 0.1016);
 #66 = CARTESIAN_POINT('NONE', (0, -0.0254, -0));
 #67 = LINE('NONE', #66, #65);
 #68 = DIRECTION('NONE', (0, -1, 0));
-#69 = VECTOR('NONE', #68, 1);
+#69 = VECTOR('NONE', #68, 0.0254);
 #70 = CARTESIAN_POINT('NONE', (0, 0, 0.1016));
 #71 = LINE('NONE', #70, #69);
 #72 = DIRECTION('NONE', (0, 0, 1));
-#73 = VECTOR('NONE', #72, 1);
+#73 = VECTOR('NONE', #72, 0.1016);
 #74 = CARTESIAN_POINT('NONE', (0, 0, -0));
 #75 = LINE('NONE', #74, #73);
 #76 = DIRECTION('NONE', (1, 0, 0));
-#77 = VECTOR('NONE', #76, 1);
+#77 = VECTOR('NONE', #76, 0.07861346939195568);
 #78 = CARTESIAN_POINT('NONE', (0, -0.0254, -0));
 #79 = LINE('NONE', #78, #77);
 #80 = DIRECTION('NONE', (0, 0, 1));
-#81 = VECTOR('NONE', #80, 1);
+#81 = VECTOR('NONE', #80, 0.1016);
 #82 = CARTESIAN_POINT('NONE', (0.07861346939195568, -0.0254, -0));
 #83 = LINE('NONE', #82, #81);
 #84 = DIRECTION('NONE', (1, 0, 0));
-#85 = VECTOR('NONE', #84, 1);
+#85 = VECTOR('NONE', #84, 0.07861346939195568);
 #86 = CARTESIAN_POINT('NONE', (0, -0.0254, 0.1016));
 #87 = LINE('NONE', #86, #85);
 #88 = DIRECTION('NONE', (0.8191520442889919, -0.5735764363510459, 0));
-#89 = VECTOR('NONE', #88, 1);
+#89 = VECTOR('NONE', #88, 0.08856709721755177);
 #90 = CARTESIAN_POINT('NONE', (0.07861346939195568, -0.0254, -0));
 #91 = LINE('NONE', #90, #89);
 #92 = DIRECTION('NONE', (0, 0, 1));
-#93 = VECTOR('NONE', #92, 1);
+#93 = VECTOR('NONE', #92, 0.1016);
 #94 = CARTESIAN_POINT('NONE', (0.1511633881344551, -0.07619999999999998, -0));
 #95 = LINE('NONE', #94, #93);
 #96 = DIRECTION('NONE', (0.8191520442889919, -0.5735764363510459, 0));
-#97 = VECTOR('NONE', #96, 1);
+#97 = VECTOR('NONE', #96, 0.08856709721755177);
 #98 = CARTESIAN_POINT('NONE', (0.07861346939195568, -0.0254, 0.1016));
 #99 = LINE('NONE', #98, #97);
 #100 = DIRECTION('NONE', (1, -0.0000000000000003079278779307945, 0));
-#101 = VECTOR('NONE', #100, 1);
+#101 = VECTOR('NONE', #100, 0.09013661186554489);
 #102 = CARTESIAN_POINT('NONE', (0.1511633881344551, -0.07619999999999998, -0));
 #103 = LINE('NONE', #102, #101);
 #104 = DIRECTION('NONE', (0, 0, 1));
-#105 = VECTOR('NONE', #104, 1);
+#105 = VECTOR('NONE', #104, 0.1016);
 #106 = CARTESIAN_POINT('NONE', (0.2413, -0.0762, -0));
 #107 = LINE('NONE', #106, #105);
 #108 = DIRECTION('NONE', (1, -0.0000000000000003079278779307945, 0));
-#109 = VECTOR('NONE', #108, 1);
+#109 = VECTOR('NONE', #108, 0.09013661186554489);
 #110 = CARTESIAN_POINT('NONE', (0.1511633881344551, -0.07619999999999998, 0.1016));
 #111 = LINE('NONE', #110, #109);
 #112 = DIRECTION('NONE', (0, 1, 0));
-#113 = VECTOR('NONE', #112, 1);
+#113 = VECTOR('NONE', #112, 0.012700000000000003);
 #114 = CARTESIAN_POINT('NONE', (0.2413, -0.0762, -0));
 #115 = LINE('NONE', #114, #113);
 #116 = DIRECTION('NONE', (0, 0, 1));
-#117 = VECTOR('NONE', #116, 1);
+#117 = VECTOR('NONE', #116, 0.1016);
 #118 = CARTESIAN_POINT('NONE', (0.2413, -0.0635, -0));
 #119 = LINE('NONE', #118, #117);
 #120 = DIRECTION('NONE', (0, 1, 0));
-#121 = VECTOR('NONE', #120, 1);
+#121 = VECTOR('NONE', #120, 0.012700000000000003);
 #122 = CARTESIAN_POINT('NONE', (0.2413, -0.0762, 0.1016));
 #123 = LINE('NONE', #122, #121);
 #124 = DIRECTION('NONE', (-1, 0, 0));
-#125 = VECTOR('NONE', #124, 1);
+#125 = VECTOR('NONE', #124, 0.08613231724678178);
 #126 = CARTESIAN_POINT('NONE', (0.2413, -0.0635, -0));
 #127 = LINE('NONE', #126, #125);
 #128 = DIRECTION('NONE', (0, 0, 1));
-#129 = VECTOR('NONE', #128, 1);
+#129 = VECTOR('NONE', #128, 0.1016);
 #130 = CARTESIAN_POINT('NONE', (0.1551676827532182, -0.0635, -0));
 #131 = LINE('NONE', #130, #129);
 #132 = DIRECTION('NONE', (-1, 0, 0));
-#133 = VECTOR('NONE', #132, 1);
+#133 = VECTOR('NONE', #132, 0.08613231724678178);
 #134 = CARTESIAN_POINT('NONE', (0.2413, -0.0635, 0.1016));
 #135 = LINE('NONE', #134, #133);
-#136 = DIRECTION('NONE', (-0.8191520442889919, 0.573576436351046, 0));
-#137 = VECTOR('NONE', #136, 1);
+#136 = DIRECTION('NONE', (-0.8191520442889918, 0.573576436351046, 0));
+#137 = VECTOR('NONE', #136, 0.11070887152193974);
 #138 = CARTESIAN_POINT('NONE', (0.1551676827532182, -0.0635, -0));
 #139 = LINE('NONE', #138, #137);
 #140 = DIRECTION('NONE', (0, 0, 1));
-#141 = VECTOR('NONE', #140, 1);
+#141 = VECTOR('NONE', #140, 0.1016);
 #142 = CARTESIAN_POINT('NONE', (0.06448028432509392, 0, -0));
 #143 = LINE('NONE', #142, #141);
-#144 = DIRECTION('NONE', (-0.8191520442889919, 0.573576436351046, 0));
-#145 = VECTOR('NONE', #144, 1);
+#144 = DIRECTION('NONE', (-0.8191520442889918, 0.573576436351046, 0));
+#145 = VECTOR('NONE', #144, 0.11070887152193974);
 #146 = CARTESIAN_POINT('NONE', (0.1551676827532182, -0.0635, 0.1016));
 #147 = LINE('NONE', #146, #145);
 #148 = DIRECTION('NONE', (0.90630778703665, 0.4226182617406993, 0));
-#149 = VECTOR('NONE', #148, 1);
+#149 = VECTOR('NONE', #148, 0.09015228031811025);
 #150 = CARTESIAN_POINT('NONE', (0.06448028432509392, 0, -0));
 #151 = LINE('NONE', #150, #149);
 #152 = DIRECTION('NONE', (0, 0, 1));
-#153 = VECTOR('NONE', #152, 1);
+#153 = VECTOR('NONE', #152, 0.1016);
 #154 = CARTESIAN_POINT('NONE', (0.14618599799650817, 0.03810000000000001, -0));
 #155 = LINE('NONE', #154, #153);
 #156 = DIRECTION('NONE', (0.90630778703665, 0.4226182617406993, 0));
-#157 = VECTOR('NONE', #156, 1);
+#157 = VECTOR('NONE', #156, 0.09015228031811025);
 #158 = CARTESIAN_POINT('NONE', (0.06448028432509392, 0, 0.1016));
 #159 = LINE('NONE', #158, #157);
 #160 = DIRECTION('NONE', (1, -0.00000000000000007295344279228718, 0));
-#161 = VECTOR('NONE', #160, 1);
+#161 = VECTOR('NONE', #160, 0.09511400200349182);
 #162 = CARTESIAN_POINT('NONE', (0.14618599799650817, 0.03810000000000001, -0));
 #163 = LINE('NONE', #162, #161);
 #164 = DIRECTION('NONE', (0, 0, 1));
-#165 = VECTOR('NONE', #164, 1);
+#165 = VECTOR('NONE', #164, 0.1016);
 #166 = CARTESIAN_POINT('NONE', (0.2413, 0.0381, -0));
 #167 = LINE('NONE', #166, #165);
 #168 = DIRECTION('NONE', (1, -0.00000000000000007295344279228718, 0));
-#169 = VECTOR('NONE', #168, 1);
+#169 = VECTOR('NONE', #168, 0.09511400200349182);
 #170 = CARTESIAN_POINT('NONE', (0.14618599799650817, 0.03810000000000001, 0.1016));
 #171 = LINE('NONE', #170, #169);
 #172 = DIRECTION('NONE', (0, 1, 0));
-#173 = VECTOR('NONE', #172, 1);
+#173 = VECTOR('NONE', #172, 0.012699999999999996);
 #174 = CARTESIAN_POINT('NONE', (0.2413, 0.0381, -0));
 #175 = LINE('NONE', #174, #173);
 #176 = DIRECTION('NONE', (0, 0, 1));
-#177 = VECTOR('NONE', #176, 1);
+#177 = VECTOR('NONE', #176, 0.1016);
 #178 = CARTESIAN_POINT('NONE', (0.2413, 0.0508, -0));
 #179 = LINE('NONE', #178, #177);
 #180 = DIRECTION('NONE', (0, 1, 0));
-#181 = VECTOR('NONE', #180, 1);
+#181 = VECTOR('NONE', #180, 0.012699999999999996);
 #182 = CARTESIAN_POINT('NONE', (0.2413, 0.0381, 0.1016));
 #183 = LINE('NONE', #182, #181);
 #184 = DIRECTION('NONE', (-1, 0, 0));
-#185 = VECTOR('NONE', #184, 1);
+#185 = VECTOR('NONE', #184, 0.0979295242190572);
 #186 = CARTESIAN_POINT('NONE', (0.2413, 0.0508, -0));
 #187 = LINE('NONE', #186, #185);
 #188 = DIRECTION('NONE', (0, 0, 1));
-#189 = VECTOR('NONE', #188, 1);
+#189 = VECTOR('NONE', #188, 0.1016);
 #190 = CARTESIAN_POINT('NONE', (0.14337047578094278, 0.0508, -0));
 #191 = LINE('NONE', #190, #189);
 #192 = DIRECTION('NONE', (-1, 0, 0));
-#193 = VECTOR('NONE', #192, 1);
+#193 = VECTOR('NONE', #192, 0.0979295242190572);
 #194 = CARTESIAN_POINT('NONE', (0.2413, 0.0508, 0.1016));
 #195 = LINE('NONE', #194, #193);
-#196 = DIRECTION('NONE', (-0.90630778703665, -0.42261826174069944, 0));
-#197 = VECTOR('NONE', #196, 1);
+#196 = DIRECTION('NONE', (-0.9063077870366499, -0.42261826174069944, 0));
+#197 = VECTOR('NONE', #196, 0.06010152021207346);
 #198 = CARTESIAN_POINT('NONE', (0.14337047578094278, 0.0508, -0));
 #199 = LINE('NONE', #198, #197);
 #200 = DIRECTION('NONE', (0, 0, 1));
-#201 = VECTOR('NONE', #200, 1);
+#201 = VECTOR('NONE', #200, 0.1016);
 #202 = CARTESIAN_POINT('NONE', (0.08889999999999999, 0.0254, -0));
 #203 = LINE('NONE', #202, #201);
-#204 = DIRECTION('NONE', (-0.90630778703665, -0.42261826174069944, 0));
-#205 = VECTOR('NONE', #204, 1);
+#204 = DIRECTION('NONE', (-0.9063077870366499, -0.42261826174069944, 0));
+#205 = VECTOR('NONE', #204, 0.06010152021207346);
 #206 = CARTESIAN_POINT('NONE', (0.14337047578094278, 0.0508, 0.1016));
 #207 = LINE('NONE', #206, #205);
 #208 = DIRECTION('NONE', (-1, 0, 0));
-#209 = VECTOR('NONE', #208, 1);
+#209 = VECTOR('NONE', #208, 0.08889999999999999);
 #210 = CARTESIAN_POINT('NONE', (0.08889999999999999, 0.0254, -0));
 #211 = LINE('NONE', #210, #209);
 #212 = DIRECTION('NONE', (0, 0, 1));
-#213 = VECTOR('NONE', #212, 1);
+#213 = VECTOR('NONE', #212, 0.1016);
 #214 = CARTESIAN_POINT('NONE', (0, 0.0254, -0));
 #215 = LINE('NONE', #214, #213);
 #216 = DIRECTION('NONE', (-1, 0, 0));
-#217 = VECTOR('NONE', #216, 1);
+#217 = VECTOR('NONE', #216, 0.08889999999999999);
 #218 = CARTESIAN_POINT('NONE', (0.08889999999999999, 0.0254, 0.1016));
 #219 = LINE('NONE', #218, #217);
 #220 = DIRECTION('NONE', (0, -1, 0));
-#221 = VECTOR('NONE', #220, 1);
+#221 = VECTOR('NONE', #220, 0.0254);
 #222 = CARTESIAN_POINT('NONE', (0, 0.0254, -0));
 #223 = LINE('NONE', #222, #221);
 #224 = DIRECTION('NONE', (0, -1, 0));
-#225 = VECTOR('NONE', #224, 1);
+#225 = VECTOR('NONE', #224, 0.0254);
 #226 = CARTESIAN_POINT('NONE', (0, 0.0254, 0.1016));
 #227 = LINE('NONE', #226, #225);
 #228 = EDGE_CURVE('NONE', #5, #7, #63, .T.);

e2e/playwright/flow-tests.spec.ts

@@ -4,7 +4,8 @@ import { EngineCommand } from '../../src/lang/std/engineConnection'
 import { v4 as uuidv4 } from 'uuid'
 import { getUtils } from './test-utils'
 import waitOn from 'wait-on'
-import { Themes } from '../../src/lib/theme'
+import { Models } from '@kittycad/lib'
+import fsp from 'fs/promises'
 
 /*
 debug helper: unfortunately we do rely on exact coord mouse clicks in a few places
@@ -85,26 +86,26 @@ test('Basic sketch', async ({ page }) => {
 
   await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 10)
 
-  const startAt = '[18.26, -24.63]'
-  const num = '18.43'
+  const startAt = '[10.97, -14.79]'
+  const tenish = '11.07'
   await expect(page.locator('.cm-content'))
     .toHaveText(`const part001 = startSketchOn('-XZ')
   |> startProfileAt(${startAt}, %)
-  |> line([${num}, 0], %)`)
+  |> line([${tenish}, 0], %)`)
 
   await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 20)
   await expect(page.locator('.cm-content'))
     .toHaveText(`const part001 = startSketchOn('-XZ')
   |> startProfileAt(${startAt}, %)
-  |> line([${num}, 0], %)
-  |> line([0, ${num}], %)`)
+  |> line([${tenish}, 0], %)
+  |> line([0, ${tenish}], %)`)
   await page.mouse.click(startXPx, 500 - PUR * 20)
   await expect(page.locator('.cm-content'))
     .toHaveText(`const part001 = startSketchOn('-XZ')
   |> startProfileAt(${startAt}, %)
-  |> line([${num}, 0], %)
-  |> line([0, ${num}], %)
-  |> line([-36.69, 0], %)`)
+  |> line([${tenish}, 0], %)
+  |> line([0, ${tenish}], %)
+  |> line([-22.04, 0], %)`)
 
   // deselect line tool
   await u.doAndWaitForCmd(
@@ -132,8 +133,8 @@ test('Basic sketch', async ({ page }) => {
   await expect(page.locator('.cm-content'))
     .toHaveText(`const part001 = startSketchOn('-XZ')
   |> startProfileAt(${startAt}, %)
-  |> line({ to: [${num}, 0], tag: 'seg01' }, %)
-  |> line([0, ${num}], %)
+  |> line({ to: [${tenish}, 0], tag: 'seg01' }, %)
+  |> line([0, ${tenish}], %)
   |> angledLine([180, segLen('seg01', %)], %)`)
 })
 
@@ -182,26 +183,6 @@ test('if you write invalid kcl you get inlined errors', async ({ page }) => {
 
   // wait for .cm-lint-marker-error not to be visible
   await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
-
-  // let's check we get an error when defining the same variable twice
-  await page.getByText('const bottomAng = 25').click()
-  await page.keyboard.press('Enter')
-  await page.keyboard.type("// Let's define the same thing twice")
-  await page.keyboard.press('Enter')
-  await page.keyboard.type('const topAng = 42')
-
-  await expect(page.locator('.cm-lint-marker-error')).toBeVisible()
-  await expect(page.locator('.cm-lintRange.cm-lintRange-error')).toBeVisible()
-
-  await page.locator('.cm-lintRange.cm-lintRange-error').hover()
-  await expect(page.locator('.cm-diagnosticText')).toBeVisible()
-  await expect(page.getByText('Cannot redefine topAng')).toBeVisible()
-
-  const secondTopAng = await page.getByText('topAng').first()
-  await secondTopAng?.dblclick()
-  await page.keyboard.type('otherAng')
-
-  await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
 })
 
 test('executes on load', async ({ page, context }) => {
@@ -507,27 +488,27 @@ test('Selections work on fresh and edited sketch', async ({ page }) => {
 
   await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 10)
 
-  const startAt = '[18.26, -24.63]'
-  const num = '18.43'
-  const num2 = '36.69'
+  const startAt = '[10.97, -14.79]'
+  const tenish = '11.07'
+  const twentyish = '22.04'
   await expect(page.locator('.cm-content'))
     .toHaveText(`const part001 = startSketchOn('-XZ')
   |> startProfileAt(${startAt}, %)
-  |> line([${num}, 0], %)`)
+  |> line([${tenish}, 0], %)`)
 
   await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 20)
   await expect(page.locator('.cm-content'))
     .toHaveText(`const part001 = startSketchOn('-XZ')
   |> startProfileAt(${startAt}, %)
-  |> line([${num}, 0], %)
-  |> line([0, ${num}], %)`)
+  |> line([${tenish}, 0], %)
+  |> line([0, ${tenish}], %)`)
   await page.mouse.click(startXPx, 500 - PUR * 20)
   await expect(page.locator('.cm-content'))
     .toHaveText(`const part001 = startSketchOn('-XZ')
   |> startProfileAt(${startAt}, %)
-  |> line([${num}, 0], %)
-  |> line([0, ${num}], %)
-  |> line([-${num2}, 0], %)`)
+  |> line([${tenish}, 0], %)
+  |> line([0, ${tenish}], %)
+  |> line([-${twentyish}, 0], %)`)
 
   // deselect line tool
   await u.doAndWaitForCmd(
@@ -580,7 +561,7 @@ test('Selections work on fresh and edited sketch', async ({ page }) => {
 
     // check the same selection again by putting cursor in code first then selecting axis
     await u.doAndWaitForCmd(
-      () => page.getByText(`  |> line([-${num2}, 0], %)`).click(),
+      () => page.getByText(`  |> line([-${twentyish}, 0], %)`).click(),
       'select_clear',
       false
     )
@@ -595,7 +576,7 @@ test('Selections work on fresh and edited sketch', async ({ page }) => {
 
     // select segment in editor than another segment in scene and check there are two cursors
     await u.doAndWaitForCmd(
-      () => page.getByText(`  |> line([-${num2}, 0], %)`).click(),
+      () => page.getByText(`  |> line([-${twentyish}, 0], %)`).click(),
       'select_clear',
       false
     )
@@ -632,106 +613,3 @@ test('Selections work on fresh and edited sketch', async ({ page }) => {
   // hover again and check it works
   await selectionSequence()
 })
-
-test('Command bar works and can change a setting', async ({ page }) => {
-  // Brief boilerplate
-  const u = getUtils(page)
-  await page.setViewportSize({ width: 1200, height: 500 })
-  await page.goto('/')
-  await u.waitForAuthSkipAppStart()
-
-  let cmdSearchBar = page.getByPlaceholder('Search commands')
-
-  // First try opening the command bar and closing it
-  // It has a different label on mac and windows/linux, "Meta+K" and "Ctrl+/" respectively
-  await page
-    .getByRole('button', { name: 'Ctrl+/' })
-    .or(page.getByRole('button', { name: '⌘K' }))
-    .click()
-  await expect(cmdSearchBar).toBeVisible()
-  await page.keyboard.press('Escape')
-  await expect(cmdSearchBar).not.toBeVisible()
-
-  // Now try the same, but with the keyboard shortcut, check focus
-  await page.keyboard.press('Meta+K')
-  await expect(cmdSearchBar).toBeVisible()
-  await expect(cmdSearchBar).toBeFocused()
-
-  // Try typing in the command bar
-  await page.keyboard.type('theme')
-  const themeOption = page.getByRole('option', { name: 'Set Theme' })
-  await expect(themeOption).toBeVisible()
-  await themeOption.click()
-  const themeInput = page.getByPlaceholder('Select an option')
-  await expect(themeInput).toBeVisible()
-  await expect(themeInput).toBeFocused()
-  // Select dark theme
-  await page.keyboard.press('ArrowDown')
-  await page.keyboard.press('ArrowDown')
-  await expect(page.getByRole('option', { name: Themes.Dark })).toHaveAttribute(
-    'data-headlessui-state',
-    'active'
-  )
-  await page.keyboard.press('Enter')
-
-  // Check the toast appeared
-  await expect(page.getByText(`Set Theme to "${Themes.Dark}"`)).toBeVisible()
-  // Check that the theme changed
-  await expect(page.locator('body')).toHaveClass(`body-bg ${Themes.Dark}`)
-})
-
-test('Can extrude from the command bar', async ({ page, context }) => {
-  await context.addInitScript(async (token) => {
-    localStorage.setItem(
-      'persistCode',
-      `const part001 = startSketchOn('-XZ')
-    |> startProfileAt([-6.95, 4.98], %)
-    |> line([25.1, 0.41], %)
-    |> line([0.73, -14.93], %)
-    |> line([-23.44, 0.52], %)
-    |> close(%)`
-    )
-  })
-
-  const u = getUtils(page)
-  await page.setViewportSize({ width: 1200, height: 500 })
-  await page.goto('/')
-  await u.waitForAuthSkipAppStart()
-
-  let cmdSearchBar = page.getByPlaceholder('Search commands')
-  await page.keyboard.press('Meta+K')
-  await expect(cmdSearchBar).toBeVisible()
-
-  // Search for extrude command and choose it
-  await page.getByRole('option', { name: 'Extrude' }).click()
-  await expect(page.locator('#arg-form > label')).toContainText(
-    'Please select one face'
-  )
-  await expect(page.getByRole('button', { name: 'selection' })).toBeDisabled()
-
-  // Click to select face and set distance
-  await u.openAndClearDebugPanel()
-  await page.getByText('|> startProfileAt([-6.95, 4.98], %)').click()
-  await u.waitForCmdReceive('select_add')
-  await u.closeDebugPanel()
-  await page.getByRole('button', { name: 'Continue' }).click()
-  await expect(page.getByRole('button', { name: 'distance' })).toBeDisabled()
-  await page.keyboard.press('Enter')
-
-  // Review step and argument hotkeys
-  await page.keyboard.press('2')
-  await expect(page.getByRole('button', { name: '5' })).toBeDisabled()
-  await page.keyboard.press('Enter')
-
-  // Check that the code was updated
-  await page.keyboard.press('Enter')
-  await expect(page.locator('.cm-content')).toHaveText(
-    `const part001 = startSketchOn('-XZ')
-    |> startProfileAt([-6.95, 4.98], %)
-    |> line([25.1, 0.41], %)
-    |> line([0.73, -14.93], %)
-    |> line([-23.44, 0.52], %)
-    |> close(%)
-    |> extrude(5, %)`
-  )
-})

e2e/playwright/secrets.ts

@@ -14,7 +14,6 @@ try {
 } catch (err) {
   // probably running in CI
   secrets.token = process.env.token || ''
-  secrets.snapshottoken = process.env.snapshottoken || ''
   // add more env vars here to make them available in CI
 }
 

e2e/playwright/snapshot-tests.spec.ts

@@ -5,8 +5,6 @@ import { v4 as uuidv4 } from 'uuid'
 import { getUtils } from './test-utils'
 import { Models } from '@kittycad/lib'
 import fsp from 'fs/promises'
-import { spawn } from 'child_process'
-import { APP_NAME } from 'lib/constants'
 
 test.beforeEach(async ({ context, page }) => {
   await context.addInitScript(async (token) => {
@@ -47,7 +45,7 @@ test('change camera, show planes', async ({ page, context }) => {
       type: 'default_camera_look_at',
       center: { x: 0, y: 0, z: 0 },
       up: { x: 0, y: 0, z: 1 },
-      vantage: { x: 0, y: 85, z: 85 },
+      vantage: { x: 0, y: 50, z: 50 },
     },
   }
 
@@ -139,7 +137,6 @@ test('change camera, show planes', async ({ page, context }) => {
 
 test('exports of each format should work', async ({ page, context }) => {
   // FYI this test doesn't work with only engine running locally
-  // And you will need to have the KittyCAD CLI installed
   const u = getUtils(page)
   await context.addInitScript(async () => {
     ;(window as any).playwrightSkipFilePicker = true
@@ -197,16 +194,9 @@ const part001 = startSketchOn('-XZ')
   await page.waitForTimeout(1000)
   await u.clearAndCloseDebugPanel()
 
-  await page.getByRole('button', { name: APP_NAME }).click()
+  await page.getByRole('button', { name: 'KittyCAD Modeling App' }).click()
 
-  interface Paths {
-    modelPath: string
-    imagePath: string
-    outputType: string
-  }
-  const doExport = async (
-    output: Models['OutputFormat_type']
-  ): Promise<Paths> => {
+  const doExport = async (output: Models['OutputFormat_type']) => {
     await page.getByRole('button', { name: 'Export Model' }).click()
 
     const exportSelect = page.getByTestId('export-type')
@@ -220,10 +210,10 @@ const part001 = startSketchOn('-XZ')
     const downloadPromise = page.waitForEvent('download')
     await page.getByRole('button', { name: 'Export', exact: true }).click()
     const download = await downloadPromise
-    const downloadLocationer = (extra = '', isImage = false) =>
+    const downloadLocationer = (extra = '') =>
       `./e2e/playwright/export-snapshots/${output.type}-${
         'storage' in output ? output.storage : ''
-      }${extra}.${isImage ? 'png' : output.type}`
+      }${extra}.${output.type}`
     const downloadLocation = downloadLocationer()
     const downloadLocation2 = downloadLocationer('-2')
 
@@ -259,11 +249,6 @@ const part001 = startSketchOn('-XZ')
       )
       await fsp.writeFile(downloadLocation, newFileContents)
     }
-    return {
-      modelPath: downloadLocation,
-      imagePath: downloadLocationer('', true),
-      outputType: output.type,
-    }
   }
   const axisDirectionPair: Models['AxisDirectionPair_type'] = {
     axis: 'z',
@@ -273,116 +258,67 @@ const part001 = startSketchOn('-XZ')
     forward: axisDirectionPair,
     up: axisDirectionPair,
   }
-
-  const exportLocations: Paths[] = []
-
   // NOTE it was easiest to leverage existing types and have doExport take Models['OutputFormat_type'] as in input
   // just note that only `type` and `storage` are used for selecting the drop downs is the app
   // the rest are only there to make typescript happy
-  exportLocations.push(
-    await doExport({
-      type: 'step',
-      coords: sysType,
-    })
-  )
-  exportLocations.push(
-    await doExport({
-      type: 'ply',
-      coords: sysType,
-      selection: { type: 'default_scene' },
-      storage: 'ascii',
-      units: 'in',
-    })
-  )
-  exportLocations.push(
-    await doExport({
-      type: 'ply',
-      storage: 'binary_little_endian',
-      coords: sysType,
-      selection: { type: 'default_scene' },
-      units: 'in',
-    })
-  )
-  exportLocations.push(
-    await doExport({
-      type: 'ply',
-      storage: 'binary_big_endian',
-      coords: sysType,
-      selection: { type: 'default_scene' },
-      units: 'in',
-    })
-  )
-  exportLocations.push(
-    await doExport({
-      type: 'stl',
-      storage: 'ascii',
-      coords: sysType,
-      units: 'in',
-      selection: { type: 'default_scene' },
-    })
-  )
-  exportLocations.push(
-    await doExport({
-      type: 'stl',
-      storage: 'binary',
-      coords: sysType,
-      units: 'in',
-      selection: { type: 'default_scene' },
-    })
-  )
-  exportLocations.push(
-    await doExport({
-      // obj seems to be a little flaky, times out tests sometimes
-      type: 'obj',
-      coords: sysType,
-      units: 'in',
-    })
-  )
-  exportLocations.push(
-    await doExport({
-      type: 'gltf',
-      storage: 'embedded',
-      presentation: 'pretty',
-    })
-  )
-  exportLocations.push(
-    await doExport({
-      type: 'gltf',
-      storage: 'binary',
-      presentation: 'pretty',
-    })
-  )
-
-  // TODO: gltfs don't seem to work with snap shots. push onto exportLocations once it's figured out
+  await doExport({
+    type: 'step',
+    coords: sysType,
+  })
+  await doExport({
+    type: 'gltf',
+    storage: 'embedded',
+    presentation: 'pretty',
+  })
+  await doExport({
+    type: 'gltf',
+    storage: 'binary',
+    presentation: 'pretty',
+  })
   await doExport({
     type: 'gltf',
     storage: 'standard',
     presentation: 'pretty',
   })
-
-  // close page to disconnect websocket since we can only have one open atm
-  await page.close()
-
-  // snapshot exports, good compromise to capture that exports are healthy without getting bogged down in "did the formatting change" changes
-  // context: https://github.com/KittyCAD/modeling-app/issues/1222
-  for (const { modelPath, imagePath, outputType } of exportLocations) {
-    const cliCommand = `export KITTYCAD_TOKEN=${secrets.snapshottoken} && kittycad file snapshot --output-format=png --src-format=${outputType} ${modelPath} ${imagePath}`
-    const child = spawn(cliCommand, { shell: true })
-    await new Promise((resolve, reject) => {
-      child.on('error', (code: any, msg: any) => {
-        console.log('error', code, msg)
-        reject()
-      })
-      child.on('exit', (code, msg) => {
-        console.log('exit', code, msg)
-        if (code !== 0) {
-          reject(`exit code ${code} for model ${modelPath}`)
-        } else {
-          resolve(true)
-        }
-      })
-      child.stderr.on('data', (data) => console.log(`stderr: ${data}`))
-      child.stdout.on('data', (data) => console.log(`stdout: ${data}`))
-    })
-  }
+  await doExport({
+    type: 'ply',
+    coords: sysType,
+    selection: { type: 'default_scene' },
+    storage: 'ascii',
+    units: 'in',
+  })
+  await doExport({
+    type: 'ply',
+    storage: 'binary_little_endian',
+    coords: sysType,
+    selection: { type: 'default_scene' },
+    units: 'in',
+  })
+  await doExport({
+    type: 'ply',
+    storage: 'binary_big_endian',
+    coords: sysType,
+    selection: { type: 'default_scene' },
+    units: 'in',
+  })
+  await doExport({
+    type: 'stl',
+    storage: 'ascii',
+    coords: sysType,
+    units: 'in',
+    selection: { type: 'default_scene' },
+  })
+  await doExport({
+    type: 'stl',
+    storage: 'binary',
+    coords: sysType,
+    units: 'in',
+    selection: { type: 'default_scene' },
+  })
+  await doExport({
+    // obj seems to be a little flaky, times out tests sometimes
+    type: 'obj',
+    coords: sysType,
+    units: 'in',
+  })
 })

e2e/tauri/specs/auth.e2e.ts

@@ -29,14 +29,13 @@ describe('KCMA (Tauri, Linux)', () => {
       Accept: 'application/json',
       'Content-Type': 'application/json',
     }
-    const apiBaseUrl = process.env.VITE_KC_API_BASE_URL
-    const verifyUrl = `${apiBaseUrl}/oauth2/device/verify?user_code=${userCode}`
+    const verifyUrl = `https://api.kittycad.io/oauth2/device/verify?user_code=${userCode}`
     console.log(`GET ${verifyUrl}`)
     const vr = await fetch(verifyUrl, { headers })
     console.log(vr.status)
 
     // Device flow: confirm
-    const confirmUrl = `${apiBaseUrl}/oauth2/device/confirm`
+    const confirmUrl = 'https://api.kittycad.io/oauth2/device/confirm'
     const data = JSON.stringify({ user_code: userCode })
     console.log(`POST ${confirmUrl} ${data}`)
     const cr = await fetch(confirmUrl, {

index.html

@@ -7,12 +7,12 @@
     <meta name="theme-color" content="#000000" />
     <meta
       name="description"
-      content="An open-source CAD modeling tool from the future by Zoo."
+      content="An open-source CAD modeling tool from the future by KittyCAD."
     />
     <link rel="apple-touch-icon" href="/logo192.png" />
     <link rel="manifest" href="/manifest.json" />
     <script defer data-domain="app.kittycad.io" src="https://plausible.corp.kittycad.io/js/script.js"></script>
-    <title>Modeling App</title>
+    <title>KittyCAD Modeling App</title>
   </head>
   <body class="body-bg">
     <noscript>You need to enable JavaScript to run this app.</noscript>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "untitled-app",
-  "version": "0.13.0",
+  "version": "0.12.0",
   "private": true,
   "dependencies": {
     "@codemirror/autocomplete": "^6.10.2",
@@ -60,7 +60,6 @@
   },
   "scripts": {
     "start": "vite",
-    "start:prod": "vite preview --port=3000",
     "serve": "vite serve --port=3000",
     "build": "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && source \"$HOME/.cargo/env\" && curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh -s -- -y && yarn build:wasm && vite build",
     "build:local": "vite build",
@@ -135,7 +134,7 @@
     "postcss": "^8.4.31",
     "prettier": "^2.8.0",
     "setimmediate": "^1.0.5",
-    "tailwindcss": "^3.3.6",
+    "tailwindcss": "^3.3.5",
     "vite": "^4.5.0",
     "vite-plugin-eslint": "^1.8.1",
     "vite-tsconfig-paths": "^4.2.1",

public/Icon/Icon/Projects/Create File.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4 3H4.5H11H11.2071L11.3536 3.14645L15.8536 7.64646L16 7.7929V8.00001V11.3773C15.6992 11.1362 15.3628 10.9376 15 10.7908V8.50001H11H10.5V8.00001V4H5V16H9.79076C9.93763 16.3628 10.1362 16.6992 10.3773 17H4.5H4V16.5V3.5V3ZM11.5 4.70711L14.2929 7.50001H11.5V4.70711ZM13 12V14H11V15H13V17H14V15H16V14H14V12H13Z" fill="black"/>
+</svg>

public/Icon/Icon/Projects/Create Folder.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.5 3.5H4H7H7.16667L7.3 3.6L9.16667 5H16H16.5V5.5V7.5V10.3773C16.1992 10.1362 15.8628 9.93763 15.5 9.79076V8H4.5V15.5H10.5351C10.7529 15.8764 11.0302 16.2141 11.3542 16.5H4H3.5V16V7.5V4V3.5ZM4.5 4.5V7H15.5V6H9H8.83333L8.7 5.9L6.83333 4.5H4.5ZM13.5 11V13H11.5V14H13.5V16H14.5V14H16.5V13H14.5V11H13.5Z" fill="black"/>
+</svg>

public/Icon/Icon/Projects/File.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11 3.5H4.5V16.5H15.5V8.00001M11 3.5L15.5 8.00001M11 3.5V8.00001H15.5" stroke="black"/>
+</svg>

public/roadmap.md

@@ -1,4 +1,4 @@
-## Zoo Modeling App Roadmap
+## KittyCAD Modeling App Roadmap
 
 This document ties into our [GH Discussions Feature List](https://github.com/KittyCAD/modeling-app/discussions). Please upvote any features that you want to see next, or add ones that are not listed and we will review. 
 

public/zoo-logo.svg

@@ -1,7 +0,0 @@
-<svg width="438" height="145" viewBox="0 0 438 145" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M88.2136 25.3021V3.12744H0.595269V34.3994H79.827L0.609484 120.312H0.595269V120.326L0.581055 120.34L0.595269 120.355V141.364H20.8936L41.3341 119.189V141.364H128.952V110.092H49.7349L128.952 24.1649V3.12744L108.64 3.15587L88.2136 25.3021Z" fill="white"/>
-<path d="M167.36 72.4372C167.36 49.7366 185.824 31.2719 208.525 31.2719C216.514 31.2719 223.976 33.5605 230.288 37.5121L251.78 14.3709C239.698 5.34466 224.73 0 208.525 0C168.582 0 136.088 32.4944 136.088 72.4372C136.088 90.5465 142.769 107.135 153.828 119.857L175.32 96.7156C170.316 89.9069 167.36 81.5061 167.36 72.4372Z" fill="white"/>
-<path d="M241.745 48.1442C246.734 54.9671 249.691 63.3679 249.691 72.4368C249.691 95.1232 231.226 113.588 208.525 113.588C200.537 113.588 193.088 111.299 186.777 107.348L165.271 130.503C177.353 139.515 192.321 144.86 208.525 144.86C248.468 144.86 280.963 112.365 280.963 72.4368C280.963 54.3133 274.282 37.7249 263.223 25.0029L241.745 48.1442Z" fill="white"/>
-<path d="M419.312 25.0029L397.834 48.1442C402.823 54.9671 405.779 63.3679 405.779 72.4368C405.779 95.1232 387.315 113.588 364.614 113.588C356.626 113.588 349.177 111.299 342.866 107.348L321.359 130.503C333.442 139.515 348.41 144.86 364.614 144.86C404.557 144.86 437.051 112.365 437.051 72.4368C437.051 54.3133 430.371 37.7249 419.312 25.0029Z" fill="white"/>
-<path d="M323.449 72.4372C323.449 49.7366 341.913 31.2719 364.614 31.2719C372.603 31.2719 380.065 33.5605 386.376 37.5121L407.869 14.3709C395.786 5.34466 380.819 0 364.614 0C324.671 0 292.177 32.4944 292.177 72.4372C292.177 90.5465 298.858 107.135 309.916 119.857L331.409 96.7156C326.405 89.9069 323.449 81.5061 323.449 72.4372Z" fill="white"/>
-</svg>

src-tauri/Cargo.lock

@@ -547,12 +547,12 @@ dependencies = [
 
 [[package]]
 name = "ctor"
-version = "0.2.6"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e"
+checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
 dependencies = [
  "quote",
- "syn 2.0.33",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -1530,9 +1530,9 @@ dependencies = [
 
 [[package]]
 name = "infer"
-version = "0.13.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f551f8c3a39f68f986517db0d1759de85881894fdc7db798bd2a9df9cb04b7fc"
+checksum = "a898e4b7951673fce96614ce5751d13c40fc5674bc2d759288e46c3ab62598b3"
 dependencies = [
  "cfb",
 ]
@@ -1652,9 +1652,9 @@ dependencies = [
 
 [[package]]
 name = "json-patch"
-version = "1.2.0"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55ff1e1486799e3f64129f8ccad108b38290df9cd7015cd31bed17239f0789d6"
+checksum = "1f54898088ccb91df1b492cc80029a6fdf1c48ca0db7c6822a8babad69c94658"
 dependencies = [
  "serde",
  "serde_json",
@@ -2194,11 +2194,11 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.61"
+version = "0.10.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45"
+checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d"
 dependencies = [
- "bitflags 2.4.0",
+ "bitflags 1.3.2",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -2226,9 +2226,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.97"
+version = "0.9.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b"
+checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6"
 dependencies = [
  "cc",
  "libc",
@@ -2400,17 +2400,9 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
 dependencies = [
+ "phf_macros 0.10.0",
  "phf_shared 0.10.0",
-]
-
-[[package]]
-name = "phf"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
-dependencies = [
- "phf_macros 0.11.2",
- "phf_shared 0.11.2",
+ "proc-macro-hack",
 ]
 
 [[package]]
@@ -2453,16 +2445,6 @@ dependencies = [
  "rand 0.8.5",
 ]
 
-[[package]]
-name = "phf_generator"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
-dependencies = [
- "phf_shared 0.11.2",
- "rand 0.8.5",
-]
-
 [[package]]
 name = "phf_macros"
 version = "0.8.0"
@@ -2479,15 +2461,16 @@ dependencies = [
 
 [[package]]
 name = "phf_macros"
-version = "0.11.2"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
+checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0"
 dependencies = [
- "phf_generator 0.11.2",
- "phf_shared 0.11.2",
+ "phf_generator 0.10.0",
+ "phf_shared 0.10.0",
+ "proc-macro-hack",
  "proc-macro2",
  "quote",
- "syn 2.0.33",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -2508,15 +2491,6 @@ dependencies = [
  "siphasher",
 ]
 
-[[package]]
-name = "phf_shared"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
-dependencies = [
- "siphasher",
-]
-
 [[package]]
 name = "phonenumber"
 version = "0.3.3+8.13.9"
@@ -3760,9 +3734,9 @@ dependencies = [
 
 [[package]]
 name = "tauri"
-version = "1.5.3"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32d563b672acde8d0cc4c1b1f5b855976923f67e8d6fe1eba51df0211e197be2"
+checksum = "9bfe673cf125ef364d6f56b15e8ce7537d9ca7e4dae1cf6fbbdeed2e024db3d9"
 dependencies = [
  "anyhow",
  "bytes",
@@ -3857,9 +3831,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-macros"
-version = "1.4.2"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acea6445eececebd72ed7720cfcca46eee3b5bad8eb408be8f7ef2e3f7411500"
+checksum = "613740228de92d9196b795ac455091d3a5fbdac2654abb8bb07d010b62ab43af"
 dependencies = [
  "heck 0.4.1",
  "proc-macro2",
@@ -3904,9 +3878,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime-wry"
-version = "0.14.2"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "803a01101bc611ba03e13329951a1bde44287a54234189b9024b78619c1bc206"
+checksum = "8141d72b6b65f2008911e9ef5b98a68d1e3413b7a1464e8f85eb3673bb19a895"
 dependencies = [
  "cocoa",
  "gtk",
@@ -3924,9 +3898,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-utils"
-version = "1.5.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a52165bb340e6f6a75f1f5eeeab1bb49f861c12abe3a176067d53642b5454986"
+checksum = "34d55e185904a84a419308d523c2c6891d5e2dbcee740c4997eb42e75a7b0f46"
 dependencies = [
  "brotli",
  "ctor",
@@ -3939,7 +3913,7 @@ dependencies = [
  "kuchikiki",
  "log",
  "memchr",
- "phf 0.11.2",
+ "phf 0.10.1",
  "proc-macro2",
  "quote",
  "semver",
@@ -3949,7 +3923,7 @@ dependencies = [
  "thiserror",
  "url",
  "walkdir",
- "windows-version",
+ "windows 0.39.0",
 ]
 
 [[package]]
@@ -4773,36 +4747,12 @@ dependencies = [
  "windows_x86_64_msvc 0.48.0",
 ]
 
-[[package]]
-name = "windows-targets"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
-dependencies = [
- "windows_aarch64_gnullvm 0.52.0",
- "windows_aarch64_msvc 0.52.0",
- "windows_i686_gnu 0.52.0",
- "windows_i686_msvc 0.52.0",
- "windows_x86_64_gnu 0.52.0",
- "windows_x86_64_gnullvm 0.52.0",
- "windows_x86_64_msvc 0.52.0",
-]
-
 [[package]]
 name = "windows-tokens"
 version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597"
 
-[[package]]
-name = "windows-version"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75aa004c988e080ad34aff5739c39d0312f4684699d6d71fc8a198d057b8b9b4"
-dependencies = [
- "windows-targets 0.52.0",
-]
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.42.2"
@@ -4815,12 +4765,6 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.37.0"
@@ -4845,12 +4789,6 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.37.0"
@@ -4875,12 +4813,6 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.37.0"
@@ -4905,12 +4837,6 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.37.0"
@@ -4935,12 +4861,6 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.2"
@@ -4953,12 +4873,6 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.37.0"
@@ -4983,12 +4897,6 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
-
 [[package]]
 name = "winnow"
 version = "0.5.15"
@@ -5020,9 +4928,9 @@ dependencies = [
 
 [[package]]
 name = "wry"
-version = "0.24.6"
+version = "0.24.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64a70547e8f9d85da0f5af609143f7bde3ac7457a6e1073104d9b73d6c5ac744"
+checksum = "88ef04bdad49eba2e01f06e53688c8413bd6a87b0bc14b72284465cf96e3578e"
 dependencies = [
  "base64 0.13.1",
  "block",

src-tauri/Cargo.toml

@@ -20,7 +20,7 @@ kittycad = "0.2.42"
 oauth2 = "4.4.2"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-tauri = { version = "1.5.3", features = [ "os-all", "dialog-all", "fs-all", "http-request", "path-all", "shell-open", "shell-open-api", "devtools"] }
+tauri = { version = "1.5.2", features = [ "os-all", "dialog-all", "fs-all", "http-request", "path-all", "shell-open", "shell-open-api", "devtools"] }
 tauri-plugin-fs-extra = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
 tokio = { version = "1.34.0", features = ["time"] }
 toml = "0.8.2"

src-tauri/src/main.rs

@@ -76,13 +76,16 @@ async fn login(app: tauri::AppHandle, host: &str) -> Result<String, InvokeError>
     // Here we're using an env var to enable the /tmp file (windows not supported for now)
     // 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 {
+    if (e2e_tauri_enabled) {
         println!(
             "E2E_TAURI_ENABLED is set, won't open {} externally",
             auth_uri.secret()
         );
-        fs::write("/tmp/kittycad_user_code", details.user_code().secret())
-            .expect("Unable to write /tmp/kittycad_user_code file");
+        fs::write(
+            "/tmp/kittycad_user_code",
+            details.user_code().secret().to_string(),
+        )
+        .expect("Unable to write /tmp/kittycad_user_code file");
     } else {
         tauri::api::shell::open(&app.shell_scope(), auth_uri.secret(), None)
             .map_err(|e| InvokeError::from_anyhow(e.into()))?;

src-tauri/tauri.conf.json

@@ -1,13 +1,14 @@
 {
   "$schema": "../node_modules/@tauri-apps/cli/schema.json",
   "build": {
+    "beforeBuildCommand": "yarn build:both",
     "beforeDevCommand": "yarn start",
     "devPath": "http://localhost:3000",
     "distDir": "../build"
   },
   "package": {
     "productName": "kittycad-modeling",
-    "version": "0.13.0"
+    "version": "0.12.0"
   },
   "tauri": {
     "allowlist": {

src/App.test.tsx

@@ -8,7 +8,7 @@ import {
   createRoutesFromElements,
 } from 'react-router-dom'
 import { GlobalStateProvider } from './components/GlobalStateProvider'
-import CommandBarProvider from 'components/CommandBar/CommandBar'
+import CommandBarProvider from 'components/CommandBar'
 import ModelingMachineProvider from 'components/ModelingMachineProvider'
 import { BROWSER_FILE_NAME } from 'Router'
 

src/App.tsx

@@ -172,8 +172,11 @@ export function App() {
       <ModalContainer />
       <Resizable
         className={
-          'pointer-events-none h-full flex flex-col flex-1 z-10 my-5 ml-5 pr-1 transition-opacity transition-duration-75 ' +
-          +paneOpacity
+          'h-full flex flex-col flex-1 z-10 my-5 ml-5 pr-1 transition-opacity transition-duration-75 ' +
+          (buttonDownInStream || onboardingStatus === 'camera'
+            ? ' pointer-events-none '
+            : ' ') +
+          paneOpacity
         }
         defaultSize={{
           width: '550px',
@@ -185,16 +188,10 @@ export function App() {
         maxHeight={'auto'}
         handleClasses={{
           right:
-            'hover:bg-chalkboard-10/50 bg-transparent transition-colors duration-75 transition-ease-out delay-100 ' +
-            (buttonDownInStream || onboardingStatus === 'camera'
-              ? 'pointer-events-none '
-              : 'pointer-events-auto'),
+            'hover:bg-liquid-30/40 dark:hover:bg-liquid-10/40 bg-transparent transition-colors duration-100 transition-ease-out delay-100',
         }}
       >
-        <div
-          id="code-pane"
-          className="h-full flex flex-col justify-between pointer-events-none"
-        >
+        <div id="code-pane" className="h-full flex flex-col justify-between">
           <CollapsiblePanel
             title="Code"
             icon={faCode}

src/Auth.tsx

@@ -8,7 +8,7 @@ export const Auth = ({ children }: React.PropsWithChildren) => {
 
   return isLoggingIn ? (
     <Loading>
-      <span data-testid="initial-load">Loading Modeling App...</span>
+      <span data-testid="initial-load">Loading KittyCAD Modeling App...</span>
     </Loading>
   ) : (
     <>{children}</>

src/Router.tsx

@@ -38,7 +38,7 @@ import {
   settingsMachine,
 } from './machines/settingsMachine'
 import { ContextFrom } from 'xstate'
-import CommandBarProvider from 'components/CommandBar/CommandBar'
+import CommandBarProvider from 'components/CommandBar'
 import { TEST, VITE_KC_SENTRY_DSN } from './env'
 import * as Sentry from '@sentry/react'
 import ModelingMachineProvider from 'components/ModelingMachineProvider'

src/Toolbar.module.css

@@ -0,0 +1,106 @@
+.toolbarWrapper {
+  @apply relative;
+}
+
+.toolbar {
+  @apply flex gap-4 items-center rounded-full;
+  @apply border border-cool-20/30 bg-cool-10/50;
+}
+
+:global(.dark) .toolbar {
+  @apply border-cool-100/50 bg-cool-120/50;
+}
+
+:global(.sketch) .toolbar {
+  @apply border-fern-20/20 bg-fern-10/20;
+}
+
+:global(.dark .sketch) .toolbar {
+  @apply border-fern-120/50 bg-fern-100/30;
+}
+
+.toolbarCap {
+  @apply text-sm font-bold;
+  @apply bg-cool-20/50 text-cool-100;
+}
+
+:global(.dark) .toolbarCap {
+  @apply bg-cool-90/50 text-cool-30;
+}
+
+:global(.sketch) .toolbarCap {
+  @apply bg-fern-20/50 text-fern-100;
+}
+
+:global(.dark .sketch) .toolbarCap {
+  @apply bg-fern-90/50 text-fern-30;
+}
+
+.label {
+  @apply self-stretch flex items-center px-4 py-1;
+  @apply rounded-l-full;
+}
+
+.popoverToggle {
+  @apply self-stretch m-0 flex items-center px-4 py-1;
+  @apply rounded-r-full border-none;
+  @apply hover:bg-cool-20;
+}
+
+.toolbarButtons::-webkit-scrollbar {
+  @apply h-0.5;
+}
+
+.toolbarButtons {
+  @apply flex items-center overflow-x-auto;
+  scrollbar-width: thin;
+}
+
+.toolbarButtons button {
+  @apply text-chalkboard-90 bg-chalkboard-10/50 border-chalkboard-50 whitespace-nowrap;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  @apply gap-1.5 p-0.5 pr-1;
+  @apply rounded-sm;
+}
+:global(.dark) .toolbarButtons button {
+  @apply text-chalkboard-30 bg-chalkboard-90/50 border-chalkboard-50;
+}
+.toolbarButtons button:hover {
+  @apply text-cool-90 bg-cool-10;
+}
+:global(.sketch) .toolbarButtons button:hover {
+  @apply text-fern-90 bg-fern-10;
+}
+.toolbarButtons button:disabled {
+  @apply text-chalkboard-70 bg-chalkboard-30;
+}
+.toolbarButtons button:disabled:hover {
+  @apply !bg-inherit !text-inherit cursor-not-allowed;
+}
+
+:global(.dark) .toolbarButtons button {
+  @apply text-chalkboard-20 border-chalkboard-50;
+}
+:global(.dark) .toolbarButtons button:hover {
+  @apply text-cool-10 border-chalkboard-50 bg-cool-90;
+}
+:global(.dark .sketch) .toolbarButtons button:hover {
+  @apply text-fern-10 border-chalkboard-50 bg-fern-90;
+}
+:global(.dark) .toolbarButtons button:disabled {
+  @apply text-chalkboard-40 bg-chalkboard-80;
+}
+
+:global(.dark) .popoverToggle {
+  @apply hover:bg-cool-90;
+}
+
+:global(.sketch) .popoverToggle {
+  @apply hover:bg-fern-20;
+}
+
+:global(.dark .sketch) .popoverToggle {
+  @apply hover:bg-fern-90;
+}

src/Toolbar.tsx

@@ -1,18 +1,22 @@
-import { WheelEvent, useRef, useMemo } from 'react'
+import { Fragment, WheelEvent, useRef, useMemo } from 'react'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faSearch, faX } from '@fortawesome/free-solid-svg-icons'
+import { Popover, Transition } from '@headlessui/react'
+import styles from './Toolbar.module.css'
 import { isCursorInSketchCommandRange } from 'lang/util'
+import { ActionIcon } from 'components/ActionIcon'
 import { engineCommandManager } from './lang/std/engineConnection'
 import { useModelingContext } from 'hooks/useModelingContext'
-import { useCommandsContext } from 'hooks/useCommandsContext'
-import { ActionButton } from 'components/ActionButton'
-import usePlatform from 'hooks/usePlatform'
+
+export const sketchButtonClassnames = {
+  background:
+    'bg-chalkboard-100 group-hover:bg-chalkboard-90 hover:bg-chalkboard-90 dark:bg-fern-20 dark:group-hover:bg-fern-10 dark:hover:bg-fern-10 group-disabled:bg-chalkboard-50 dark:group-disabled:bg-chalkboard-60 group-hover:group-disabled:bg-chalkboard-50 dark:group-hover:group-disabled:bg-chalkboard-50',
+  icon: 'text-fern-20 h-auto group-hover:text-fern-10 hover:text-fern-10 dark:text-chalkboard-100 dark:group-hover:text-chalkboard-100 dark:hover:text-chalkboard-100 group-disabled:bg-chalkboard-60 hover:group-disabled:text-inherit',
+}
 
 export const Toolbar = () => {
-  const platform = usePlatform()
-  const { commandBarSend } = useCommandsContext()
   const { state, send, context } = useModelingContext()
-  const toolbarButtonsRef = useRef<HTMLUListElement>(null)
-  const bgClassName =
-    'group-enabled:group-hover:bg-energy-10 group-pressed:bg-energy-10 dark:group-enabled:group-hover:bg-chalkboard-80 dark:group-pressed:bg-chalkboard-80'
+  const toolbarButtonsRef = useRef<HTMLSpanElement>(null)
   const pathId = useMemo(
     () =>
       isCursorInSketchCommandRange(
@@ -31,102 +35,72 @@ export const Toolbar = () => {
     span.scrollLeft = span.scrollLeft += ev.deltaY
   }
 
-  function ToolbarButtons({
-    className = '',
-    ...props
-  }: React.HTMLAttributes<HTMLElement>) {
+  function ToolbarButtons({ className }: React.HTMLAttributes<HTMLElement>) {
     return (
-      <ul
-        {...props}
+      <span
         ref={toolbarButtonsRef}
         onWheel={handleToolbarButtonsWheelEvent}
-        className={
-          'm-0 py-1 rounded-l-sm flex gap-2 items-center overflow-x-auto ' +
-          className
-        }
-        style={{ scrollbarWidth: 'thin' }}
+        className={styles.toolbarButtons + ' ' + className}
       >
         {state.nextEvents.includes('Enter sketch') && (
-          <li className="contents">
-            <ActionButton
-              Element="button"
-              onClick={() => send({ type: 'Enter sketch' })}
-              icon={{
-                icon: 'sketch',
-                bgClassName,
-              }}
-            >
-              <span data-testid="start-sketch">Start Sketch</span>
-            </ActionButton>
-          </li>
+          <button
+            onClick={() => send({ type: 'Enter sketch' })}
+            className="group"
+          >
+            <ActionIcon icon="sketch" className="!p-0.5" size="md" />
+            <span data-testid="start-sketch">Start Sketch</span>
+          </button>
         )}
         {state.nextEvents.includes('Enter sketch') && pathId && (
-          <li className="contents">
-            <ActionButton
-              Element="button"
-              onClick={() => send({ type: 'Enter sketch' })}
-              icon={{
-                icon: 'sketch',
-                bgClassName,
-              }}
-            >
-              Edit Sketch
-            </ActionButton>
-          </li>
+          <button
+            onClick={() => send({ type: 'Enter sketch' })}
+            className="group"
+          >
+            <ActionIcon icon="sketch" className="!p-0.5" size="md" />
+            Edit Sketch
+          </button>
         )}
         {state.nextEvents.includes('Cancel') && !state.matches('idle') && (
-          <li className="contents">
-            <ActionButton
-              Element="button"
-              onClick={() => send({ type: 'Cancel' })}
-              icon={{
-                icon: 'arrowLeft',
-                bgClassName,
-              }}
-            >
-              Exit Sketch
-            </ActionButton>
-          </li>
+          <button onClick={() => send({ type: 'Cancel' })} className="group">
+            <ActionIcon icon="exit" className="!p-0.5" size="md" />
+            Exit Sketch
+          </button>
         )}
         {state.matches('Sketch') && !state.matches('idle') && (
-          <li className="contents">
-            <ActionButton
-              Element="button"
-              onClick={() =>
-                state.matches('Sketch.Line Tool')
-                  ? send('CancelSketch')
-                  : send('Equip tool')
-              }
-              aria-pressed={state.matches('Sketch.Line Tool')}
-              className="pressed:bg-energy-10/20 dark:pressed:bg-energy-80"
-              icon={{
-                icon: 'line',
-                bgClassName,
-              }}
-            >
-              Line
-            </ActionButton>
-          </li>
+          <button
+            onClick={() =>
+              state.matches('Sketch.Line Tool')
+                ? send('CancelSketch')
+                : send('Equip tool')
+            }
+            className={
+              'group ' +
+              (state.matches('Sketch.Line Tool')
+                ? '!text-fern-70 !bg-fern-10 !dark:text-fern-20 !border-fern-50'
+                : '')
+            }
+          >
+            <ActionIcon icon="line" className="!p-0.5" size="md" />
+            Line
+          </button>
         )}
         {state.matches('Sketch') && (
-          <li className="contents">
-            <ActionButton
-              Element="button"
-              onClick={() =>
-                state.matches('Sketch.Move Tool')
-                  ? send('CancelSketch')
-                  : send('Equip move tool')
-              }
-              aria-pressed={state.matches('Sketch.Move Tool')}
-              className="pressed:bg-energy-10/20 dark:pressed:bg-energy-80"
-              icon={{
-                icon: 'move',
-                bgClassName,
-              }}
-            >
-              Move
-            </ActionButton>
-          </li>
+          <button
+            onClick={() =>
+              state.matches('Sketch.Move Tool')
+                ? send('CancelSketch')
+                : send('Equip move tool')
+            }
+            className={
+              'group ' +
+              (state.matches('Sketch.Move Tool')
+                ? '!text-fern-70 !bg-fern-10 !dark:text-fern-20 !border-fern-50'
+                : '')
+            }
+          >
+            <ActionIcon icon="move" className="!p-0.5" size="md" />
+            Move
+          </button>
         )}
         {state.matches('Sketch.SketchIdle') &&
           state.nextEvents
@@ -151,71 +125,102 @@ export const Toolbar = () => {
               return 0
             })
             .map((eventName) => (
-              <li className="contents">
-                <ActionButton
-                  Element="button"
-                  className="text-sm"
-                  key={eventName}
-                  onClick={() => send(eventName)}
-                  disabled={
-                    !state.nextEvents
-                      .filter((event) => state.can(event as any))
-                      .includes(eventName)
-                  }
-                  title={eventName}
-                  icon={{
-                    icon: 'line',
-                    bgClassName,
-                  }}
-                >
-                  {eventName
-                    .replace('Make segment ', '')
-                    .replace('Constrain ', '')}
-                </ActionButton>
-              </li>
+              <button
+                key={eventName}
+                onClick={() => send(eventName)}
+                className="group"
+                disabled={
+                  !state.nextEvents
+                    .filter((event) => state.can(event as any))
+                    .includes(eventName)
+                }
+                title={eventName}
+              >
+                <ActionIcon
+                  icon={'line'} // TODO
+                  bgClassName={sketchButtonClassnames.background}
+                  iconClassName={sketchButtonClassnames.icon}
+                  size="md"
+                />
+                {eventName
+                  .replace('Make segment ', '')
+                  .replace('Constrain ', '')}
+              </button>
             ))}
         {state.matches('idle') && (
-          <li className="contents">
-            <ActionButton
-              Element="button"
-              className="text-sm"
-              onClick={() =>
-                commandBarSend({
-                  type: 'Find and select command',
-                  data: { name: 'Extrude', ownerMachine: 'modeling' },
-                })
-              }
-              disabled={!state.can('Extrude')}
-              title={
-                state.can('Extrude')
-                  ? 'extrude'
-                  : 'sketches need to be closed, or not already extruded'
-              }
-              icon={{
-                icon: 'extrude',
-                bgClassName,
-              }}
-            >
-              Extrude
-            </ActionButton>
-          </li>
+          <button
+            onClick={() => send('extrude intent')}
+            disabled={!state.can('extrude intent')}
+            className="group"
+            title={
+              state.can('extrude intent')
+                ? 'extrude'
+                : 'sketches need to be closed, or not already extruded'
+            }
+          >
+            <ActionIcon icon="extrude" className="!p-0.5" size="md" />
+            Extrude
+          </button>
         )}
-      </ul>
+      </span>
     )
   }
 
   return (
-    <div className="max-w-full flex items-stretch rounded-l-sm rounded-r-full bg-chalkboard-10 dark:bg-chalkboard-100 relative">
-      <menu className="flex-1 pl-1 pr-2 py-0 overflow-hidden rounded-l-sm whitespace-nowrap bg-chalkboard-10 dark:bg-chalkboard-100 border-solid border border-energy-10 dark:border-chalkboard-90 border-r-0">
-        <ToolbarButtons />
-      </menu>
-      <ActionButton
-        Element="button"
-        onClick={() => commandBarSend({ type: 'Open' })}
-        className="rounded-r-full pr-4 self-stretch border-energy-10 hover:border-energy-10 dark:border-chalkboard-80 bg-energy-10/50 hover:bg-energy-10 dark:bg-chalkboard-80 dark:text-energy-10"
+    <Popover
+      className={
+        styles.toolbarWrapper + state.matches('Sketch') ? ' sketch' : ''
+      }
+    >
+      <div className={styles.toolbar}>
+        <span className={styles.toolbarCap + ' ' + styles.label}>
+          {state.matches('Sketch') ? '2D' : '3D'}
+        </span>
+        <menu className="flex-1 gap-2 py-0.5 overflow-hidden whitespace-nowrap">
+          <ToolbarButtons />
+        </menu>
+        <Popover.Button
+          className={styles.toolbarCap + ' ' + styles.popoverToggle}
+        >
+          <FontAwesomeIcon icon={faSearch} />
+        </Popover.Button>
+      </div>
+      <Transition
+        as={Fragment}
+        enter="transition ease-out duration-200"
+        enterFrom="opacity-0"
+        enterTo="opacity-100"
+        leave="transition ease-out duration-100"
+        leaveFrom="opacity-100"
+        leaveTo="opacity-0"
       >
-        {platform === 'darwin' ? '⌘K' : 'Ctrl+/'}
-      </ActionButton>
-    </div>
+        <Popover.Overlay className="fixed inset-0 bg-chalkboard-110/20 dark:bg-chalkboard-110/50" />
+      </Transition>
+      <Transition
+        as={Fragment}
+        enter="transition ease-out duration-100"
+        enterFrom="opacity-0 translate-y-1 scale-95"
+        enterTo="opacity-100 translate-y-0 scale-100"
+        leave="transition ease-out duration-75"
+        leaveFrom="opacity-100 translate-y-0"
+        leaveTo="opacity-0 translate-y-2"
+      >
+        <Popover.Panel className="absolute top-0 w-screen max-w-xl left-1/2 -translate-x-1/2 flex flex-col gap-8 bg-chalkboard-10 dark:bg-chalkboard-100 p-5 rounded border border-chalkboard-20/30 dark:border-chalkboard-70/50">
+          <section className="flex justify-between items-center">
+            <p
+              className={`${styles.toolbarCap} ${styles.label} !self-center rounded-r-full w-fit`}
+            >
+              You're in {state.matches('Sketch') ? '2D' : '3D'}
+            </p>
+            <Popover.Button className="p-2 flex items-center justify-center rounded-sm bg-chalkboard-20 text-chalkboard-110 dark:bg-chalkboard-70 dark:text-chalkboard-20 border-none hover:bg-chalkboard-30 dark:hover:bg-chalkboard-60">
+              <FontAwesomeIcon icon={faX} className="w-4 h-4" />
+            </Popover.Button>
+          </section>
+          <section>
+            <ToolbarButtons className="flex-wrap" />
+          </section>
+        </Popover.Panel>
+      </Transition>
+    </Popover>
   )
 }

src/components/ActionButton.tsx

@@ -39,16 +39,16 @@ type ActionButtonProps =
   | ActionButtonAsElement
 
 export const ActionButton = (props: ActionButtonProps) => {
-  const classNames = `action-button m-0 group mono text-sm flex items-center gap-2 rounded-sm border-solid border border-chalkboard-30 hover:border-chalkboard-40 dark:border-chalkboard-70 dark:hover:border-chalkboard-60 dark:bg-chalkboard-90/50 p-[3px] text-chalkboard-100 dark:text-chalkboard-10 ${
+  const classNames = `group mono text-base flex items-center gap-2 rounded-sm border border-chalkboard-40 dark:border-chalkboard-60 hover:border-liquid-40 dark:hover:bg-chalkboard-90 p-[3px] text-chalkboard-110 dark:text-chalkboard-10 hover:text-chalkboard-110 hover:dark:text-chalkboard-10 ${
     props.icon ? 'pr-2' : 'px-2'
-  } ${props.className ? props.className : ''}`
+  } ${props.className || ''}`
 
   switch (props.Element) {
     case 'button': {
       // Note we have to destructure 'className' and 'Element' out of props
       // because we don't want to pass them to the button element;
       // the same is true for the other cases below.
-      const { Element, icon, children, className: _className, ...rest } = props
+      const { Element, icon, children, className, ...rest } = props
       return (
         <button className={classNames} {...rest}>
           {props.icon && <ActionIcon {...icon} />}
@@ -57,14 +57,7 @@ export const ActionButton = (props: ActionButtonProps) => {
       )
     }
     case 'link': {
-      const {
-        Element,
-        to,
-        icon,
-        children,
-        className: _className,
-        ...rest
-      } = props
+      const { Element, to, icon, children, className, ...rest } = props
       return (
         <Link to={to || paths.INDEX} className={classNames} {...rest}>
           {icon && <ActionIcon {...icon} />}
@@ -73,14 +66,7 @@ export const ActionButton = (props: ActionButtonProps) => {
       )
     }
     case 'externalLink': {
-      const {
-        Element,
-        to,
-        icon,
-        children,
-        className: _className,
-        ...rest
-      } = props
+      const { Element, to, icon, children, className, ...rest } = props
       return (
         <Link
           to={to || paths.INDEX}
@@ -94,7 +80,7 @@ export const ActionButton = (props: ActionButtonProps) => {
       )
     }
     default: {
-      const { Element, icon, children, className: _className, ...rest } = props
+      const { Element, icon, children, className, ...rest } = props
       if (!Element) throw new Error('Element is required')
 
       return (

src/components/ActionIcon.tsx

@@ -7,10 +7,10 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { CustomIcon, CustomIconName } from './CustomIcon'
 
 const iconSizes = {
-  xs: 12,
-  sm: 14,
-  md: 20,
-  lg: 24,
+  sm: 12,
+  md: 14.4,
+  lg: 20,
+  xl: 28,
 }
 
 export interface ActionIconProps extends React.PropsWithChildren {
@@ -30,14 +30,20 @@ export const ActionIcon = ({
   children,
 }: ActionIconProps) => {
   // By default, we reverse the icon color and background color in dark mode
-  const computedIconClassName = `h-auto dark:text-energy-10 !group-disabled:text-chalkboard-60 !group-disabled:text-chalkboard-60 ${iconClassName}`
+  const computedIconClassName =
+    iconClassName ||
+    `text-liquid-20 h-auto group-hover:text-liquid-10 hover:text-liquid-10 dark:text-chalkboard-100 dark:group-hover:text-chalkboard-100 dark:hover:text-chalkboard-100 group-disabled:bg-chalkboard-50 dark:group-disabled:bg-chalkboard-60 group-hover:group-disabled:bg-chalkboard-50 dark:group-hover:group-disabled:bg-chalkboard-50`
 
-  const computedBgClassName = `bg-chalkboard-20 dark:bg-chalkboard-90 !group-disabled:bg-chalkboard-30 !dark:group-disabled:bg-chalkboard-80 ${bgClassName}`
+  const computedBgClassName =
+    bgClassName ||
+    `bg-chalkboard-100 group-hover:bg-chalkboard-90 hover:bg-chalkboard-90 dark:bg-liquid-20 dark:group-hover:bg-liquid-10 dark:hover:bg-liquid-10 group-disabled:bg-chalkboard-80 dark:group-disabled:bg-chalkboard-80`
 
   return (
     <div
       className={
-        `w-fit inline-grid place-content-center ${className} ` +
+        `p-${
+          size === 'xl' ? '2' : '1'
+        } w-fit inline-grid place-content-center ${className} ` +
         computedBgClassName
       }
     >

src/components/AppHeader.tsx

@@ -5,9 +5,6 @@ import ProjectSidebarMenu from './ProjectSidebarMenu'
 import { useGlobalStateContext } from 'hooks/useGlobalStateContext'
 import styles from './AppHeader.module.css'
 import { NetworkHealthIndicator } from './NetworkHealthIndicator'
-import { useCommandsContext } from 'hooks/useCommandsContext'
-import { ActionButton } from './ActionButton'
-import usePlatform from 'hooks/usePlatform'
 
 interface AppHeaderProps extends React.PropsWithChildren {
   showToolbar?: boolean
@@ -23,17 +20,15 @@ export const AppHeader = ({
   className = '',
   enableMenu = false,
 }: AppHeaderProps) => {
-  const platform = usePlatform()
-  const { commandBarSend } = useCommandsContext()
   const { auth } = useGlobalStateContext()
   const user = auth?.context?.user
 
   return (
     <header
       className={
-        'w-full grid ' +
+        (showToolbar ? 'w-full grid ' : 'flex justify-between ') +
         styles.header +
-        ' overlaid-panes sticky top-0 z-20 py-1 px-2 bg-chalkboard-10/70 dark:bg-chalkboard-100/50 border-b dark:border-b-2 border-chalkboard-30 dark:border-chalkboard-90 items-center ' +
+        ' overlaid-panes sticky top-0 z-20 py-1 px-5 bg-chalkboard-10/70 dark:bg-chalkboard-100/50 border-b dark:border-b-2 border-chalkboard-30 dark:border-chalkboard-90 items-center ' +
         className
       }
     >
@@ -43,31 +38,18 @@ export const AppHeader = ({
         file={project?.file}
       />
       {/* Toolbar if the context deems it */}
-      <div className="flex-grow flex justify-center max-w-lg md:max-w-xl lg:max-w-2xl xl:max-w-4xl 2xl:max-w-5xl">
-        {showToolbar ? (
+      {showToolbar && (
+        <div className="max-w-lg md:max-w-xl lg:max-w-2xl xl:max-w-4xl 2xl:max-w-5xl">
           <Toolbar />
-        ) : (
-          <ActionButton
-            Element="button"
-            onClick={() => commandBarSend({ type: 'Open' })}
-            className="text-sm self-center flex items-center w-fit gap-3"
-          >
-            Command Palette{' '}
-            <kbd className="bg-energy-10/50 dark:bg-chalkboard-100 dark:text-energy-10 inline-block px-1 py-0.5 border-energy-10 dark:border-chalkboard-90">
-              {platform === 'darwin' ? '⌘K' : 'Ctrl+/'}
-            </kbd>
-          </ActionButton>
-        )}
-      </div>
-      <div className="flex items-center gap-1 ml-auto">
-        {/* If there are children, show them, otherwise show User menu */}
-        {children || (
-          <>
-            <NetworkHealthIndicator />
-            <UserSidebarMenu user={user} />
-          </>
-        )}
-      </div>
+        </div>
+      )}
+      {/* If there are children, show them, otherwise show User menu */}
+      {children || (
+        <div className="flex items-center gap-1 ml-auto">
+          <NetworkHealthIndicator />
+          <UserSidebarMenu user={user} />
+        </div>
+      )}
     </header>
   )
 }

src/components/CodeMenu.module.css

@@ -1,13 +1,13 @@
 .button {
   @apply flex justify-between items-center gap-2 px-2 py-1 text-left border-none rounded-sm;
   @apply font-mono text-xs font-bold select-none text-chalkboard-90;
-  @apply ui-active:bg-energy-10/50 ui-active:text-inherit;
+  @apply ui-active:bg-liquid-10/50 ui-active:text-liquid-90;
   @apply transition-colors ease-out;
 }
 
 :global(.dark) .button {
   @apply text-chalkboard-30;
-  @apply ui-active:bg-chalkboard-80 ui-active:text-energy-10;
+  @apply ui-active:bg-chalkboard-80 ui-active:text-liquid-10;
 }
 
 .button small {

src/components/CodeMenu.tsx

@@ -30,10 +30,8 @@ export const CodeMenu = ({ children }: PropsWithChildren) => {
         <Menu.Button className="p-0 border-none relative">
           <ActionIcon
             icon={faEllipsis}
-            className="p-1"
-            size="sm"
             bgClassName={
-              'bg-chalkboard-20 dark:bg-chalkboard-110 hover:bg-energy-10/50 hover:dark:bg-chalkboard-90 ui-active:bg-chalkboard-80 ui-active:dark:bg-chalkboard-90 rounded-sm'
+              'bg-chalkboard-20 dark:bg-chalkboard-110 hover:bg-liquid-10/50 hover:dark:bg-chalkboard-90 ui-active:bg-chalkboard-80 ui-active:dark:bg-chalkboard-90  rounded'
             }
             iconClassName={'text-chalkboard-90 dark:text-chalkboard-40'}
           />

src/components/CollapsiblePanel.tsx

@@ -24,17 +24,16 @@ export const PanelHeader = ({
 }: CollapsiblePanelProps) => {
   return (
     <summary className={styles.header}>
-      <div className="flex gap-2 items-center flex-1">
+      <div className="flex gap-2 align-center flex-1">
         <ActionIcon
           icon={icon}
-          className="p-1"
-          size="sm"
           bgClassName={
-            'dark:!bg-chalkboard-100 group-open:bg-chalkboard-80 dark:group-open:!bg-chalkboard-90 border border-transparent dark:group-open:border-chalkboard-60 rounded-sm ' +
+            'bg-chalkboard-30 dark:bg-chalkboard-90 group-open:bg-chalkboard-80 rounded ' +
             (iconClassNames?.bg || '')
           }
           iconClassName={
-            'group-open:text-energy-10 ' + (iconClassNames?.icon || '')
+            'text-chalkboard-90 dark:text-chalkboard-40 group-open:text-liquid-10 ' +
+            (iconClassNames?.icon || '')
           }
         />
         {title}
@@ -60,9 +59,7 @@ export const CollapsiblePanel = ({
     <details
       {...props}
       data-testid={detailsTestId}
-      className={
-        styles.panel + ' pointer-events-auto group ' + (className || '')
-      }
+      className={styles.panel + ' group ' + (className || '')}
     >
       <PanelHeader
         title={title}

src/components/CommandBar.tsx

@@ -0,0 +1,290 @@
+import { Combobox, Dialog, Transition } from '@headlessui/react'
+import {
+  Dispatch,
+  Fragment,
+  SetStateAction,
+  createContext,
+  useState,
+} from 'react'
+import { useHotkeys } from 'react-hotkeys-hook'
+import { ActionIcon } from './ActionIcon'
+import { faSearch } from '@fortawesome/free-solid-svg-icons'
+import Fuse from 'fuse.js'
+import { Command, SubCommand } from '../lib/commands'
+import { useCommandsContext } from 'hooks/useCommandsContext'
+
+export type SortedCommand = {
+  item: Partial<Command | SubCommand> & { name: string }
+}
+
+export const CommandsContext = createContext(
+  {} as {
+    commands: Command[]
+    addCommands: (commands: Command[]) => void
+    removeCommands: (commands: Command[]) => void
+    commandBarOpen: boolean
+    setCommandBarOpen: Dispatch<SetStateAction<boolean>>
+  }
+)
+
+export const CommandBarProvider = ({
+  children,
+}: {
+  children: React.ReactNode
+}) => {
+  const [commands, internalSetCommands] = useState([] as Command[])
+  const [commandBarOpen, setCommandBarOpen] = useState(false)
+
+  const addCommands = (newCommands: Command[]) => {
+    internalSetCommands((prevCommands) => [...newCommands, ...prevCommands])
+  }
+  const removeCommands = (newCommands: Command[]) => {
+    internalSetCommands((prevCommands) =>
+      prevCommands.filter((command) => !newCommands.includes(command))
+    )
+  }
+
+  return (
+    <CommandsContext.Provider
+      value={{
+        commands,
+        addCommands,
+        removeCommands,
+        commandBarOpen,
+        setCommandBarOpen,
+      }}
+    >
+      {children}
+      <CommandBar />
+    </CommandsContext.Provider>
+  )
+}
+
+const CommandBar = () => {
+  const { commands, commandBarOpen, setCommandBarOpen } = useCommandsContext()
+  useHotkeys(['meta+k', 'meta+/'], () => {
+    if (commands.length === 0) return
+    setCommandBarOpen(!commandBarOpen)
+  })
+
+  const [selectedCommand, setSelectedCommand] = useState<SortedCommand | null>(
+    null
+  )
+  // keep track of the current subcommand index
+  const [subCommandIndex, setSubCommandIndex] = useState<number>()
+  const [subCommandData, setSubCommandData] = useState<{
+    [key: string]: string
+  }>({})
+
+  // if the subcommand index is null, we're not in a subcommand
+  const inSubCommand =
+    selectedCommand &&
+    'meta' in selectedCommand.item &&
+    selectedCommand.item.meta?.args !== undefined &&
+    subCommandIndex !== undefined
+  const currentSubCommand =
+    inSubCommand && 'meta' in selectedCommand.item
+      ? selectedCommand.item.meta?.args[subCommandIndex]
+      : undefined
+
+  const [query, setQuery] = useState('')
+
+  const availableCommands =
+    inSubCommand && currentSubCommand
+      ? currentSubCommand.type === 'string'
+        ? query
+          ? [{ name: query }]
+          : currentSubCommand.options
+        : currentSubCommand.options
+      : commands
+
+  const fuse = new Fuse(availableCommands || [], {
+    keys: ['name', 'description'],
+  })
+
+  const filteredCommands = query
+    ? fuse.search(query)
+    : availableCommands?.map((c) => ({ item: c } as SortedCommand))
+
+  function clearState() {
+    setQuery('')
+    setCommandBarOpen(false)
+    setSelectedCommand(null)
+    setSubCommandIndex(undefined)
+    setSubCommandData({})
+  }
+
+  function handleCommandSelection(entry: SortedCommand) {
+    // If we have subcommands and have not yet gathered all the
+    // data required from them, set the selected command to the
+    // current command and increment the subcommand index
+    if (selectedCommand === null && 'meta' in entry.item && entry.item.meta) {
+      setSelectedCommand(entry)
+      setSubCommandIndex(0)
+      setQuery('')
+      return
+    }
+
+    const { item } = entry
+    // If we have just selected a command with no subcommands, run it
+    const isCommandWithoutSubcommands =
+      'callback' in item && !('meta' in item && item.meta)
+    if (isCommandWithoutSubcommands) {
+      if (item.callback === undefined) return
+      item.callback()
+      setCommandBarOpen(false)
+      return
+    }
+
+    // If we have subcommands and have not yet gathered all the
+    // data required from them, set the selected command to the
+    // current command and increment the subcommand index
+    if (
+      selectedCommand &&
+      subCommandIndex !== undefined &&
+      'meta' in selectedCommand.item
+    ) {
+      const subCommand = selectedCommand.item.meta?.args[subCommandIndex]
+
+      if (subCommand) {
+        const newSubCommandData = {
+          ...subCommandData,
+          [subCommand.name]: item.name,
+        }
+        const newSubCommandIndex = subCommandIndex + 1
+
+        // If we have subcommands and have gathered all the data required
+        // from them, run the command with the gathered data
+        if (
+          selectedCommand.item.callback &&
+          selectedCommand.item.meta?.args.length === newSubCommandIndex
+        ) {
+          selectedCommand.item.callback(newSubCommandData)
+          setCommandBarOpen(false)
+        } else {
+          // Otherwise, set the subcommand data and increment the subcommand index
+          setSubCommandData(newSubCommandData)
+          setSubCommandIndex(newSubCommandIndex)
+          setQuery('')
+        }
+      }
+    }
+  }
+
+  function getDisplayValue(command: Command) {
+    if (command.meta?.displayValue === undefined || !command.meta.args)
+      return command.name
+    return command.meta?.displayValue(
+      command.meta.args.map((c) =>
+        subCommandData[c.name] ? subCommandData[c.name] : `<${c.name}>`
+      )
+    )
+  }
+
+  return (
+    <Transition.Root
+      show={
+        commandBarOpen &&
+        availableCommands?.length !== undefined &&
+        availableCommands.length > 0
+      }
+      as={Fragment}
+      afterLeave={() => clearState()}
+    >
+      <Dialog
+        onClose={() => {
+          setCommandBarOpen(false)
+          clearState()
+        }}
+        className="fixed inset-0 z-40 overflow-y-auto p-4 pt-[25vh]"
+      >
+        <Transition.Child
+          enter="duration-100 ease-out"
+          enterFrom="opacity-0"
+          enterTo="opacity-100"
+          leave="duration-75 ease-in"
+          leaveFrom="opacity-100"
+          leaveTo="opacity-0"
+          as={Fragment}
+        >
+          <Dialog.Overlay className="fixed inset-0 bg-chalkboard-10/70 dark:bg-chalkboard-110/50" />
+        </Transition.Child>
+        <Transition.Child
+          enter="duration-100 ease-out"
+          enterFrom="opacity-0 scale-95"
+          enterTo="opacity-100 scale-100"
+          leave="duration-75 ease-in"
+          leaveFrom="opacity-100 scale-100"
+          leaveTo="opacity-0 scale-95"
+          as={Fragment}
+        >
+          <Combobox
+            value={selectedCommand}
+            onChange={handleCommandSelection}
+            className="relative w-full max-w-xl p-2 mx-auto border rounded shadow-lg bg-chalkboard-10 dark:bg-chalkboard-100 dark:border-chalkboard-70"
+            as="div"
+          >
+            <div className="flex items-center gap-2">
+              <ActionIcon icon={faSearch} size="xl" className="rounded-sm" />
+              <div>
+                {inSubCommand && (
+                  <p className="text-liquid-70 dark:text-liquid-30">
+                    {selectedCommand.item &&
+                      getDisplayValue(selectedCommand.item as Command)}
+                  </p>
+                )}
+                <Combobox.Input
+                  onChange={(event) => setQuery(event.target.value)}
+                  className="w-full bg-transparent focus:outline-none"
+                  onKeyDown={(event) => {
+                    if (event.metaKey && event.key === 'k')
+                      setCommandBarOpen(false)
+                    if (
+                      inSubCommand &&
+                      event.key === 'Backspace' &&
+                      !event.currentTarget.value
+                    ) {
+                      setSubCommandIndex(subCommandIndex - 1)
+                      setSelectedCommand(null)
+                    }
+                  }}
+                  displayValue={(command: SortedCommand) =>
+                    command !== null ? command.item.name : ''
+                  }
+                  placeholder={
+                    inSubCommand
+                      ? `Enter <${currentSubCommand?.name}>`
+                      : 'Search for a command'
+                  }
+                  value={query}
+                  autoCapitalize="off"
+                  autoComplete="off"
+                  autoCorrect="off"
+                  spellCheck="false"
+                />
+              </div>
+            </div>
+            <Combobox.Options static className="overflow-y-auto max-h-96">
+              {filteredCommands?.map((commandResult) => (
+                <Combobox.Option
+                  key={commandResult.item.name}
+                  value={commandResult}
+                  className="px-2 py-1 my-2 first:mt-4 last:mb-4 ui-active:bg-liquid-10 dark:ui-active:bg-liquid-90"
+                >
+                  <p>{commandResult.item.name}</p>
+                  {(commandResult.item as SubCommand).description && (
+                    <p className="mt-0.5 text-liquid-70 dark:text-liquid-30 text-sm">
+                      {(commandResult.item as SubCommand).description}
+                    </p>
+                  )}
+                </Combobox.Option>
+              ))}
+            </Combobox.Options>
+          </Combobox>
+        </Transition.Child>
+      </Dialog>
+    </Transition.Root>
+  )
+}
+
+export default CommandBarProvider

src/components/CommandBar/CommandArgOptionInput.tsx

@@ -1,114 +0,0 @@
-import { Combobox } from '@headlessui/react'
-import Fuse from 'fuse.js'
-import { useCommandsContext } from 'hooks/useCommandsContext'
-import { CommandArgumentOption } from 'lib/commandTypes'
-import { useEffect, useRef, useState } from 'react'
-
-function CommandArgOptionInput({
-  options,
-  argName,
-  stepBack,
-  onSubmit,
-  placeholder,
-}: {
-  options: CommandArgumentOption<unknown>[]
-  argName: string
-  stepBack: () => void
-  onSubmit: (data: unknown) => void
-  placeholder?: string
-}) {
-  const { commandBarSend, commandBarState } = useCommandsContext()
-  const inputRef = useRef<HTMLInputElement>(null)
-  const formRef = useRef<HTMLFormElement>(null)
-  const [argValue, setArgValue] = useState<(typeof options)[number]['value']>(
-    options.find((o) => 'isCurrent' in o && o.isCurrent)?.value ||
-      commandBarState.context.argumentsToSubmit[argName] ||
-      options[0].value
-  )
-  const [query, setQuery] = useState('')
-  const [filteredOptions, setFilteredOptions] = useState<typeof options>()
-
-  const fuse = new Fuse(options, {
-    keys: ['name', 'description'],
-    threshold: 0.3,
-  })
-
-  useEffect(() => {
-    inputRef.current?.focus()
-    inputRef.current?.select()
-  }, [inputRef])
-
-  useEffect(() => {
-    const results = fuse.search(query).map((result) => result.item)
-    setFilteredOptions(query.length > 0 ? results : options)
-  }, [query])
-
-  function handleSelectOption(option: CommandArgumentOption<unknown>) {
-    setArgValue(option)
-    onSubmit(option.value)
-  }
-
-  function handleSubmit(e: React.FormEvent<HTMLFormElement>) {
-    e.preventDefault()
-    onSubmit(argValue)
-  }
-
-  return (
-    <form id="arg-form" onSubmit={handleSubmit} ref={formRef}>
-      <Combobox value={argValue} onChange={handleSelectOption} name="options">
-        <div className="flex items-center mx-4 mt-4 mb-2">
-          <label
-            htmlFor="option-input"
-            className="capitalize px-2 py-1 rounded-l bg-chalkboard-100 dark:bg-chalkboard-80 text-chalkboard-10 border-b border-b-chalkboard-100 dark:border-b-chalkboard-80"
-          >
-            {argName}
-          </label>
-          <Combobox.Input
-            id="option-input"
-            ref={inputRef}
-            onChange={(event) => setQuery(event.target.value)}
-            className="flex-grow px-2 py-1 border-b border-b-chalkboard-100 dark:border-b-chalkboard-80 !bg-transparent focus:outline-none"
-            onKeyDown={(event) => {
-              if (event.metaKey && event.key === 'k')
-                commandBarSend({ type: 'Close' })
-              if (event.key === 'Backspace' && !event.currentTarget.value) {
-                stepBack()
-              }
-            }}
-            placeholder={
-              (argValue as CommandArgumentOption<unknown>)?.name ||
-              placeholder ||
-              'Select an option for ' + argName
-            }
-            autoCapitalize="off"
-            autoComplete="off"
-            autoCorrect="off"
-            spellCheck="false"
-            autoFocus
-          />
-        </div>
-        <Combobox.Options
-          static
-          className="overflow-y-auto max-h-96 cursor-pointer"
-        >
-          {filteredOptions?.map((option) => (
-            <Combobox.Option
-              key={option.name}
-              value={option}
-              className="flex items-center gap-2 px-4 py-1 first:mt-2 last:mb-2 ui-active:bg-energy-10/50 dark:ui-active:bg-chalkboard-90"
-            >
-              <p className="flex-grow">{option.name} </p>
-              {'isCurrent' in option && option.isCurrent && (
-                <small className="text-chalkboard-70 dark:text-chalkboard-50">
-                  current
-                </small>
-              )}
-            </Combobox.Option>
-          ))}
-        </Combobox.Options>
-      </Combobox>
-    </form>
-  )
-}
-
-export default CommandArgOptionInput

src/components/CommandBar/CommandBar.tsx

@@ -1,166 +0,0 @@
-import { Dialog, Popover, Transition } from '@headlessui/react'
-import { Fragment, createContext, useEffect } from 'react'
-import { useHotkeys } from 'react-hotkeys-hook'
-import { useCommandsContext } from 'hooks/useCommandsContext'
-import { useMachine } from '@xstate/react'
-import { commandBarMachine } from 'machines/commandBarMachine'
-import { EventFrom, StateFrom } from 'xstate'
-import CommandBarArgument from './CommandBarArgument'
-import CommandComboBox from '../CommandComboBox'
-import { useLocation } from 'react-router-dom'
-import CommandBarReview from './CommandBarReview'
-
-type CommandsContextType = {
-  commandBarState: StateFrom<typeof commandBarMachine>
-  commandBarSend: (event: EventFrom<typeof commandBarMachine>) => void
-}
-
-export const CommandsContext = createContext<CommandsContextType>({
-  commandBarState: commandBarMachine.initialState,
-  commandBarSend: () => {},
-})
-
-export const CommandBarProvider = ({
-  children,
-}: {
-  children: React.ReactNode
-}) => {
-  const { pathname } = useLocation()
-  const [commandBarState, commandBarSend] = useMachine(commandBarMachine, {
-    guards: {
-      'Arguments are ready': (context, _) => {
-        return context.selectedCommand?.args
-          ? context.argumentsToSubmit.length ===
-              Object.keys(context.selectedCommand.args)?.length
-          : false
-      },
-      'Command has no arguments': (context, _event) => {
-        return (
-          !context.selectedCommand?.args ||
-          Object.keys(context.selectedCommand?.args).length === 0
-        )
-      },
-    },
-  })
-
-  // Close the command bar when navigating
-  useEffect(() => {
-    commandBarSend({ type: 'Close' })
-  }, [pathname])
-
-  return (
-    <CommandsContext.Provider
-      value={{
-        commandBarState,
-        commandBarSend,
-      }}
-    >
-      {children}
-      <CommandBar />
-    </CommandsContext.Provider>
-  )
-}
-
-const CommandBar = () => {
-  const { commandBarState, commandBarSend } = useCommandsContext()
-  const {
-    context: { selectedCommand, currentArgument, commands },
-  } = commandBarState
-  const isSelectionArgument = currentArgument?.inputType === 'selection'
-  const WrapperComponent = isSelectionArgument ? Popover : Dialog
-
-  useHotkeys(['mod+k', 'mod+/'], () => {
-    if (commandBarState.context.commands.length === 0) return
-    if (commandBarState.matches('Closed')) {
-      commandBarSend({ type: 'Open' })
-    } else {
-      commandBarSend({ type: 'Close' })
-    }
-  })
-
-  function stepBack() {
-    if (!currentArgument) {
-      if (commandBarState.matches('Review')) {
-        const entries = Object.entries(selectedCommand?.args || {})
-
-        commandBarSend({
-          type: commandBarState.matches('Review')
-            ? 'Edit argument'
-            : 'Change current argument',
-          data: {
-            arg: {
-              name: entries[entries.length - 1][0],
-              ...entries[entries.length - 1][1],
-            },
-          },
-        })
-      } else {
-        commandBarSend({ type: 'Deselect command' })
-      }
-    } else {
-      const entries = Object.entries(selectedCommand?.args || {})
-      const index = entries.findIndex(
-        ([key, _]) => key === currentArgument.name
-      )
-
-      if (index === 0) {
-        commandBarSend({ type: 'Deselect command' })
-      } else {
-        commandBarSend({
-          type: 'Change current argument',
-          data: {
-            arg: { name: entries[index - 1][0], ...entries[index - 1][1] },
-          },
-        })
-      }
-    }
-  }
-
-  return (
-    <Transition.Root
-      show={!commandBarState.matches('Closed') || false}
-      afterLeave={() => {
-        if (selectedCommand?.onCancel) selectedCommand.onCancel()
-        commandBarSend({ type: 'Clear' })
-      }}
-      as={Fragment}
-    >
-      <WrapperComponent
-        open={!commandBarState.matches('Closed') || isSelectionArgument}
-        onClose={() => {
-          commandBarSend({ type: 'Close' })
-        }}
-        className={
-          'fixed inset-0 z-50 overflow-y-auto pb-4 pt-1 ' +
-          (isSelectionArgument ? 'pointer-events-none' : '')
-        }
-      >
-        <Transition.Child
-          enter="duration-100 ease-out"
-          enterFrom="opacity-0 scale-95"
-          enterTo="opacity-100 scale-100"
-          leave="duration-75 ease-in"
-          leaveFrom="opacity-100 scale-100"
-          leaveTo="opacity-0 scale-95"
-        >
-          <WrapperComponent.Panel
-            className="relative z-50 pointer-events-auto w-full max-w-xl py-2 mx-auto border rounded shadow-lg bg-chalkboard-10 dark:bg-chalkboard-100 dark:border-chalkboard-70"
-            as="div"
-          >
-            {commandBarState.matches('Selecting command') ? (
-              <CommandComboBox options={commands} />
-            ) : commandBarState.matches('Gathering arguments') ? (
-              <CommandBarArgument stepBack={stepBack} />
-            ) : (
-              commandBarState.matches('Review') && (
-                <CommandBarReview stepBack={stepBack} />
-              )
-            )}
-          </WrapperComponent.Panel>
-        </Transition.Child>
-      </WrapperComponent>
-    </Transition.Root>
-  )
-}
-
-export default CommandBarProvider

src/components/CommandBar/CommandBarArgument.tsx

@@ -1,80 +0,0 @@
-import CommandArgOptionInput from './CommandArgOptionInput'
-import CommandBarBasicInput from './CommandBarBasicInput'
-import CommandBarSelectionInput from './CommandBarSelectionInput'
-import { CommandArgument } from 'lib/commandTypes'
-import { useCommandsContext } from 'hooks/useCommandsContext'
-import CommandBarHeader from './CommandBarHeader'
-
-function CommandBarArgument({ stepBack }: { stepBack: () => void }) {
-  const { commandBarState, commandBarSend } = useCommandsContext()
-  const {
-    context: { currentArgument },
-  } = commandBarState
-
-  function onSubmit(data: unknown) {
-    if (!currentArgument) return
-
-    commandBarSend({
-      type: 'Submit argument',
-      data: {
-        [currentArgument.name]:
-          currentArgument.inputType === 'number'
-            ? parseFloat((data as string) || '0')
-            : data,
-      },
-    })
-  }
-
-  return (
-    currentArgument && (
-      <CommandBarHeader>
-        <ArgumentInput
-          arg={currentArgument}
-          stepBack={stepBack}
-          onSubmit={onSubmit}
-        />
-      </CommandBarHeader>
-    )
-  )
-}
-
-export default CommandBarArgument
-
-function ArgumentInput({
-  arg,
-  stepBack,
-  onSubmit,
-}: {
-  arg: CommandArgument<unknown> & { name: string }
-  stepBack: () => void
-  onSubmit: (event: any) => void
-}) {
-  switch (arg.inputType) {
-    case 'options':
-      return (
-        <CommandArgOptionInput
-          options={arg.options}
-          argName={arg.name}
-          stepBack={stepBack}
-          onSubmit={onSubmit}
-          placeholder="Select an option"
-        />
-      )
-    case 'selection':
-      return (
-        <CommandBarSelectionInput
-          arg={arg}
-          stepBack={stepBack}
-          onSubmit={onSubmit}
-        />
-      )
-    default:
-      return (
-        <CommandBarBasicInput
-          arg={arg}
-          stepBack={stepBack}
-          onSubmit={onSubmit}
-        />
-      )
-  }
-}

src/components/CommandBar/CommandBarBasicInput.tsx

@@ -1,66 +0,0 @@
-import { useCommandsContext } from 'hooks/useCommandsContext'
-import { CommandArgument } from 'lib/commandTypes'
-import { useEffect, useRef } from 'react'
-import { useHotkeys } from 'react-hotkeys-hook'
-
-function CommandBarBasicInput({
-  arg,
-  stepBack,
-  onSubmit,
-}: {
-  arg: CommandArgument<unknown> & {
-    inputType: 'number' | 'string'
-    name: string
-  }
-  stepBack: () => void
-  onSubmit: (event: unknown) => void
-}) {
-  const { commandBarSend, commandBarState } = useCommandsContext()
-  useHotkeys('mod + k, mod + /', () => commandBarSend({ type: 'Close' }))
-  const inputRef = useRef<HTMLInputElement>(null)
-  const inputType = arg.inputType === 'number' ? 'number' : 'text'
-
-  useEffect(() => {
-    if (inputRef.current) {
-      inputRef.current.focus()
-      inputRef.current.select()
-    }
-  }, [arg, inputRef])
-
-  function handleSubmit(e: React.FormEvent<HTMLFormElement>) {
-    e.preventDefault()
-    onSubmit(inputRef.current?.value)
-  }
-
-  return (
-    <form id="arg-form" onSubmit={handleSubmit}>
-      <label className="flex items-center mx-4 my-4">
-        <span className="capitalize px-2 py-1 rounded-l bg-chalkboard-100 dark:bg-chalkboard-80 text-chalkboard-10 border-b border-b-chalkboard-100 dark:border-b-chalkboard-80">
-          {arg.name}
-        </span>
-        <input
-          id="arg-form"
-          name={inputType}
-          ref={inputRef}
-          type={inputType}
-          required
-          className="flex-grow px-2 py-1 border-b border-b-chalkboard-100 dark:border-b-chalkboard-80 !bg-transparent focus:outline-none"
-          placeholder="Enter a value"
-          defaultValue={
-            (commandBarState.context.argumentsToSubmit[arg.name] as
-              | string
-              | undefined) || (arg.defaultValue as string)
-          }
-          onKeyDown={(event) => {
-            if (event.key === 'Backspace' && !event.currentTarget.value) {
-              stepBack()
-            }
-          }}
-          autoFocus
-        />
-      </label>
-    </form>
-  )
-}
-
-export default CommandBarBasicInput

src/components/CommandBar/CommandBarHeader.tsx

@@ -1,171 +0,0 @@
-import { useCommandsContext } from 'hooks/useCommandsContext'
-import { CustomIcon } from '../CustomIcon'
-import React, { useState } from 'react'
-import { ActionButton } from '../ActionButton'
-import { Selections, getSelectionTypeDisplayText } from 'lib/selections'
-import { useHotkeys } from 'react-hotkeys-hook'
-
-function CommandBarHeader({ children }: React.PropsWithChildren<{}>) {
-  const { commandBarState, commandBarSend } = useCommandsContext()
-  const {
-    context: { selectedCommand, currentArgument, argumentsToSubmit },
-  } = commandBarState
-  const isReviewing = commandBarState.matches('Review')
-  const [showShortcuts, setShowShortcuts] = useState(false)
-
-  useHotkeys(
-    'alt',
-    () => setShowShortcuts(true),
-    { enableOnFormTags: true, enableOnContentEditable: true },
-    [showShortcuts]
-  )
-  useHotkeys(
-    'alt',
-    () => setShowShortcuts(false),
-    { keyup: true, enableOnFormTags: true, enableOnContentEditable: true },
-    [showShortcuts]
-  )
-  useHotkeys(
-    [
-      'alt+1',
-      'alt+2',
-      'alt+3',
-      'alt+4',
-      'alt+5',
-      'alt+6',
-      'alt+7',
-      'alt+8',
-      'alt+9',
-      'alt+0',
-    ],
-    (_, b) => {
-      if (b.keys && !Number.isNaN(parseInt(b.keys[0], 10))) {
-        if (!selectedCommand?.args) return
-        const argName = Object.keys(selectedCommand.args)[
-          parseInt(b.keys[0], 10) - 1
-        ]
-        const arg = selectedCommand?.args[argName]
-        commandBarSend({
-          type: 'Change current argument',
-          data: { arg: { ...arg, name: argName } },
-        })
-      }
-    },
-    { keyup: true, enableOnFormTags: true, enableOnContentEditable: true },
-    [argumentsToSubmit, selectedCommand]
-  )
-
-  return (
-    selectedCommand &&
-    argumentsToSubmit && (
-      <>
-        <div className="px-4 text-sm flex gap-4 items-start">
-          <div className="flex flex-1 flex-wrap gap-2">
-            <p
-              data-command-name={selectedCommand?.name}
-              className="pr-4 flex gap-2 items-center"
-            >
-              {selectedCommand &&
-                'icon' in selectedCommand &&
-                selectedCommand.icon && (
-                  <CustomIcon name={selectedCommand.icon} className="w-5 h-5" />
-                )}
-              {selectedCommand?.name}
-            </p>
-            {Object.entries(selectedCommand?.args || {}).map(
-              ([argName, arg], i) => (
-                <button
-                  disabled={!isReviewing && currentArgument?.name === argName}
-                  onClick={() => {
-                    commandBarSend({
-                      type: isReviewing
-                        ? 'Edit argument'
-                        : 'Change current argument',
-                      data: { arg: { ...arg, name: argName } },
-                    })
-                  }}
-                  key={argName}
-                  className={`relative w-fit px-2 py-1 rounded-sm flex gap-2 items-center border ${
-                    argName === currentArgument?.name
-                      ? 'disabled:bg-energy-10/50 dark:disabled:bg-energy-10/20 disabled:border-energy-10 dark:disabled:border-energy-10 disabled:text-chalkboard-100 dark:disabled:text-chalkboard-10'
-                      : 'bg-chalkboard-20/50 dark:bg-chalkboard-80/50 border-chalkboard-20 dark:border-chalkboard-80'
-                  }`}
-                >
-                  {argumentsToSubmit[argName] ? (
-                    arg.inputType === 'selection' ? (
-                      getSelectionTypeDisplayText(
-                        argumentsToSubmit[argName] as Selections
-                      )
-                    ) : typeof argumentsToSubmit[argName] === 'object' ? (
-                      JSON.stringify(argumentsToSubmit[argName])
-                    ) : (
-                      argumentsToSubmit[argName]
-                    )
-                  ) : arg.payload ? (
-                    arg.inputType === 'selection' ? (
-                      getSelectionTypeDisplayText(arg.payload as Selections)
-                    ) : typeof arg.payload === 'object' ? (
-                      JSON.stringify(arg.payload)
-                    ) : (
-                      arg.payload
-                    )
-                  ) : (
-                    <em>{argName}</em>
-                  )}
-                  {showShortcuts && (
-                    <small className="absolute -top-[1px] right-full translate-x-1/2 px-0.5 rounded-sm bg-chalkboard-80 text-chalkboard-10 dark:bg-energy-10 dark:text-chalkboard-100">
-                      <span className="sr-only">Hotkey: </span>
-                      {i + 1}
-                    </small>
-                  )}
-                </button>
-              )
-            )}
-          </div>
-          {isReviewing ? <ReviewingButton /> : <GatheringArgsButton />}
-        </div>
-        <div className="block w-full my-2 h-[1px] bg-chalkboard-20 dark:bg-chalkboard-80" />
-        {children}
-      </>
-    )
-  )
-}
-
-function ReviewingButton() {
-  return (
-    <ActionButton
-      Element="button"
-      autoFocus
-      type="submit"
-      form="review-form"
-      className="w-fit !p-0 rounded-sm border !border-chalkboard-100 dark:!border-energy-10 hover:shadow"
-      icon={{
-        icon: 'checkmark',
-        bgClassName:
-          'p-1 rounded-sm !bg-chalkboard-100 hover:!bg-chalkboard-110 dark:!bg-energy-20 dark:hover:!bg-energy-10',
-        iconClassName: '!text-energy-10 dark:!text-chalkboard-100',
-      }}
-    >
-      <span className="sr-only">Submit command</span>
-    </ActionButton>
-  )
-}
-
-function GatheringArgsButton() {
-  return (
-    <ActionButton
-      Element="button"
-      type="submit"
-      form="arg-form"
-      className="w-fit !p-0 rounded-sm"
-      icon={{
-        icon: 'arrowRight',
-        bgClassName: 'p-1 rounded-sm',
-      }}
-    >
-      <span className="sr-only">Continue</span>
-    </ActionButton>
-  )
-}
-
-export default CommandBarHeader

src/components/CommandBar/CommandBarReview.tsx

@@ -1,81 +0,0 @@
-import { useCommandsContext } from 'hooks/useCommandsContext'
-import CommandBarHeader from './CommandBarHeader'
-import { useHotkeys } from 'react-hotkeys-hook'
-
-function CommandBarReview({ stepBack }: { stepBack: () => void }) {
-  const { commandBarState, commandBarSend } = useCommandsContext()
-  const {
-    context: { argumentsToSubmit, selectedCommand },
-  } = commandBarState
-
-  useHotkeys('backspace', stepBack, {
-    enableOnFormTags: true,
-    enableOnContentEditable: true,
-  })
-
-  useHotkeys(
-    '1, 2, 3, 4, 5, 6, 7, 8, 9, 0',
-    (_, b) => {
-      if (b.keys && !Number.isNaN(parseInt(b.keys[0], 10))) {
-        if (!selectedCommand?.args) return
-        const argName = Object.keys(selectedCommand.args)[
-          parseInt(b.keys[0], 10) - 1
-        ]
-        const arg = selectedCommand?.args[argName]
-        commandBarSend({
-          type: 'Edit argument',
-          data: { arg: { ...arg, name: argName } },
-        })
-      }
-    },
-    { keyup: true, enableOnFormTags: true, enableOnContentEditable: true },
-    [argumentsToSubmit, selectedCommand]
-  )
-
-  Object.keys(argumentsToSubmit).forEach((key, i) => {
-    const arg = selectedCommand?.args ? selectedCommand?.args[key] : undefined
-    if (!arg) return
-  })
-
-  function submitCommand() {
-    commandBarSend({
-      type: 'Submit command',
-      data: argumentsToSubmit,
-    })
-  }
-
-  return (
-    <CommandBarHeader>
-      <p className="px-4">Confirm {selectedCommand?.name}</p>
-      <form
-        id="review-form"
-        className="absolute opacity-0 inset-0 pointer-events-none"
-        onSubmit={submitCommand}
-      >
-        {Object.entries(argumentsToSubmit).map(([key, value], i) => {
-          const arg = selectedCommand?.args
-            ? selectedCommand?.args[key]
-            : undefined
-          if (!arg) return null
-
-          return (
-            <input
-              id={key}
-              name={key}
-              key={key}
-              type="text"
-              defaultValue={
-                typeof value === 'object'
-                  ? JSON.stringify(value)
-                  : (value as string)
-              }
-              hidden
-            />
-          )
-        })}
-      </form>
-    </CommandBarHeader>
-  )
-}
-
-export default CommandBarReview

src/components/CommandBar/CommandBarSelectionInput.tsx

@@ -1,114 +0,0 @@
-import { useSelector } from '@xstate/react'
-import { useCommandsContext } from 'hooks/useCommandsContext'
-import { useKclContext } from 'lang/KclSinglton'
-import { CommandArgument } from 'lib/commandTypes'
-import {
-  ResolvedSelectionType,
-  canSubmitSelectionArg,
-  getSelectionType,
-  getSelectionTypeDisplayText,
-} from 'lib/selections'
-import { modelingMachine } from 'machines/modelingMachine'
-import { useEffect, useRef, useState } from 'react'
-import { useHotkeys } from 'react-hotkeys-hook'
-import { StateFrom } from 'xstate'
-
-const selectionSelector = (snapshot: StateFrom<typeof modelingMachine>) =>
-  snapshot.context.selectionRanges
-
-function CommandBarSelectionInput({
-  arg,
-  stepBack,
-  onSubmit,
-}: {
-  arg: CommandArgument<unknown> & { inputType: 'selection'; name: string }
-  stepBack: () => void
-  onSubmit: (data: unknown) => void
-}) {
-  const { code } = useKclContext()
-  const inputRef = useRef<HTMLInputElement>(null)
-  const { commandBarSend } = useCommandsContext()
-  const [hasSubmitted, setHasSubmitted] = useState(false)
-  const selection = useSelector(arg.actor, selectionSelector)
-  const [selectionsByType, setSelectionsByType] = useState<
-    'none' | ResolvedSelectionType[]
-  >(
-    selection.codeBasedSelections[0]?.range[1] === code.length
-      ? 'none'
-      : getSelectionType(selection)
-  )
-  const [canSubmitSelection, setCanSubmitSelection] = useState<boolean>(
-    canSubmitSelectionArg(selectionsByType, arg)
-  )
-
-  useHotkeys('tab', () => onSubmit(selection), {
-    enableOnFormTags: true,
-    enableOnContentEditable: true,
-    keyup: true,
-  })
-
-  useEffect(() => {
-    inputRef.current?.focus()
-  }, [selection, inputRef])
-
-  useEffect(() => {
-    setSelectionsByType(
-      selection.codeBasedSelections[0]?.range[1] === code.length
-        ? 'none'
-        : getSelectionType(selection)
-    )
-  }, [selection])
-
-  useEffect(() => {
-    setCanSubmitSelection(canSubmitSelectionArg(selectionsByType, arg))
-  }, [selectionsByType, arg])
-
-  function handleChange() {
-    inputRef.current?.focus()
-  }
-
-  function handleSubmit(e: React.FormEvent<HTMLFormElement>) {
-    e.preventDefault()
-
-    if (!canSubmitSelection) {
-      setHasSubmitted(true)
-      return
-    }
-
-    onSubmit(selection)
-  }
-
-  return (
-    <form id="arg-form" onSubmit={handleSubmit}>
-      <label
-        className={
-          'relative flex items-center mx-4 my-4 ' +
-          (!hasSubmitted || canSubmitSelection || 'text-destroy-50')
-        }
-      >
-        {canSubmitSelection
-          ? getSelectionTypeDisplayText(selection) + ' selected'
-          : `Please select ${arg.multiple ? 'one or more faces' : 'one face'}`}
-        <input
-          id="selection"
-          name="selection"
-          ref={inputRef}
-          required
-          placeholder="Select an entity with your mouse"
-          className="absolute inset-0 w-full h-full opacity-0 cursor-pointer"
-          onKeyDown={(event) => {
-            if (event.key === 'Backspace') {
-              stepBack()
-            } else if (event.key === 'Escape') {
-              commandBarSend({ type: 'Close' })
-            }
-          }}
-          onChange={handleChange}
-          value={JSON.stringify(selection || {})}
-        />
-      </label>
-    </form>
-  )
-}
-
-export default CommandBarSelectionInput

src/components/CommandComboBox.tsx

@@ -1,90 +0,0 @@
-import { Combobox } from '@headlessui/react'
-import Fuse from 'fuse.js'
-import { useCommandsContext } from 'hooks/useCommandsContext'
-import { Command } from 'lib/commandTypes'
-import { useEffect, useState } from 'react'
-import { CustomIcon } from './CustomIcon'
-
-function CommandComboBox({
-  options,
-  placeholder,
-}: {
-  options: Command[]
-  placeholder?: string
-}) {
-  const { commandBarSend } = useCommandsContext()
-  const [query, setQuery] = useState('')
-  const [filteredOptions, setFilteredOptions] = useState<typeof options>()
-
-  const defaultOption =
-    options.find((o) => 'isCurrent' in o && o.isCurrent) || null
-
-  const fuse = new Fuse(options, {
-    keys: ['name', 'description'],
-    threshold: 0.3,
-  })
-
-  useEffect(() => {
-    const results = fuse.search(query).map((result) => result.item)
-    setFilteredOptions(query.length > 0 ? results : options)
-  }, [query])
-
-  function handleSelection(command: Command) {
-    commandBarSend({ type: 'Select command', data: { command } })
-  }
-
-  return (
-    <Combobox defaultValue={defaultOption} onChange={handleSelection}>
-      <div className="flex items-center gap-2 px-4 pb-2 border-solid border-0 border-b border-b-chalkboard-20 dark:border-b-chalkboard-80">
-        <CustomIcon
-          name="search"
-          className="w-5 h-5 bg-energy-10/50 dark:bg-chalkboard-90 dark:text-energy-10"
-        />
-        <Combobox.Input
-          onChange={(event) => setQuery(event.target.value)}
-          className="w-full bg-transparent focus:outline-none selection:bg-energy-10/50 dark:selection:bg-energy-10/20 dark:focus:outline-none"
-          onKeyDown={(event) => {
-            if (
-              (event.metaKey && event.key === 'k') ||
-              (event.key === 'Backspace' && !event.currentTarget.value)
-            ) {
-              commandBarSend({ type: 'Close' })
-            }
-          }}
-          placeholder={
-            (defaultOption && defaultOption.name) ||
-            placeholder ||
-            'Search commands'
-          }
-          autoCapitalize="off"
-          autoComplete="off"
-          autoCorrect="off"
-          spellCheck="false"
-          autoFocus
-        />
-      </div>
-      <Combobox.Options
-        static
-        className="overflow-y-auto max-h-96 cursor-pointer"
-      >
-        {filteredOptions?.map((option) => (
-          <Combobox.Option
-            key={option.name}
-            value={option}
-            className="flex items-center gap-2 px-4 py-1 first:mt-2 last:mb-2 ui-active:bg-energy-10/50 dark:ui-active:bg-chalkboard-90"
-          >
-            {'icon' in option && option.icon && (
-              <CustomIcon
-                name={option.icon}
-                className="w-5 h-5 dark:text-energy-10"
-              />
-            )}
-            <p className="flex-grow">{option.name} </p>
-          </Combobox.Option>
-        ))}
-      </Combobox.Options>
-    </Combobox>
-  )
-}
-
-export default CommandComboBox

src/components/CustomIcon.tsx

@@ -1,22 +1,14 @@
 export type CustomIconName =
-  | 'arrowDown'
-  | 'arrowLeft'
-  | 'arrowRight'
-  | 'arrowUp'
-  | 'checkmark'
-  | 'close'
+  | 'createFile'
+  | 'createFolder'
   | 'equal'
+  | 'exit'
   | 'extrude'
   | 'file'
-  | 'filePlus'
-  | 'folder'
-  | 'folderPlus'
-  | 'gear'
   | 'horizontal'
   | 'line'
   | 'move'
   | 'parallel'
-  | 'search'
   | 'sketch'
   | 'vertical'
 
@@ -27,7 +19,7 @@ export const CustomIcon = ({
   name: CustomIconName
 } & React.SVGProps<SVGSVGElement>) => {
   switch (name) {
-    case 'arrowDown':
+    case 'createFile':
       return (
         <svg
           {...props}
@@ -38,12 +30,12 @@ export const CustomIcon = ({
           <path
             fillRule="evenodd"
             clipRule="evenodd"
-            d="M10 17.7071L9.64648 17.3535L6.14648 13.8535L6.85359 13.1464L9.50004 15.7929V2.99997H10.5V15.7929L13.1465 13.1464L13.8536 13.8535L10.3536 17.3535L10 17.7071Z"
+            d="M4 3H4.5H11H11.2071L11.3536 3.14645L15.8536 7.64646L16 7.7929V8.00001V11.3773C15.6992 11.1362 15.3628 10.9376 15 10.7908V8.50001H11H10.5V8.00001V4H5V16H9.79076C9.93763 16.3628 10.1362 16.6992 10.3773 17H4.5H4V16.5V3.5V3ZM11.5 4.70711L14.2929 7.50001H11.5V4.70711ZM13 12V14H11V15H13V17H14V15H16V14H14V12H13Z"
             fill="currentColor"
           />
         </svg>
       )
-    case 'arrowLeft':
+    case 'createFolder':
       return (
         <svg
           {...props}
@@ -54,71 +46,7 @@ export const CustomIcon = ({
           <path
             fillRule="evenodd"
             clipRule="evenodd"
-            d="M2.29291 10L2.64646 9.64645L6.14646 6.14645L6.85357 6.85356L4.20712 9.50001L17 9.50001V10.5L4.20712 10.5L6.85357 13.1465L6.14646 13.8536L2.64646 10.3536L2.29291 10Z"
-            fill="currentColor"
-          />
-        </svg>
-      )
-    case 'arrowRight':
-      return (
-        <svg
-          {...props}
-          viewBox="0 0 20 20"
-          fill="none"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            fillRule="evenodd"
-            clipRule="evenodd"
-            d="M17.7071 10L17.3536 10.3536L13.8536 13.8536L13.1464 13.1465L15.7929 10.5H3V9.50001H15.7929L13.1464 6.85356L13.8536 6.14645L17.3536 9.64645L17.7071 10Z"
-            fill="currentColor"
-          />
-        </svg>
-      )
-    case 'arrowUp':
-      return (
-        <svg
-          {...props}
-          viewBox="0 0 20 20"
-          fill="none"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            fillRule="evenodd"
-            clipRule="evenodd"
-            d="M10 2.29288L10.3536 2.64643L13.8536 6.14643L13.1465 6.85354L10.5 4.20709V17H9.50004V4.20709L6.85359 6.85354L6.14648 6.14643L9.64648 2.64643L10 2.29288Z"
-            fill="currentColor"
-          />
-        </svg>
-      )
-    case 'checkmark':
-      return (
-        <svg
-          {...props}
-          viewBox="0 0 20 20"
-          fill="none"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            fillRule="evenodd"
-            clipRule="evenodd"
-            d="M8.29956 13.5388L13.9537 6L14.7537 6.6L8.75367 14.6L8.00012 14.6536L5 11.6536L5.70709 10.9465L8.29956 13.5388Z"
-            fill="currentColor"
-          />
-        </svg>
-      )
-    case 'close':
-      return (
-        <svg
-          {...props}
-          viewBox="0 0 20 20"
-          fill="none"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            fillRule="evenodd"
-            clipRule="evenodd"
-            d="M9.2929 10L6.46448 7.17158L7.17158 6.46448L10 9.2929L12.8284 6.46448L13.5355 7.17158L10.7071 10L13.5355 12.8284L12.8284 13.5355L10 10.7071L7.17158 13.5355L6.46448 12.8284L9.2929 10Z"
+            d="M3.5 3.5H4H7H7.16667L7.3 3.6L9.16667 5H16H16.5V5.5V7.5V10.3773C16.1992 10.1362 15.8628 9.93763 15.5 9.79076V8H4.5V15.5H10.5351C10.7529 15.8764 11.0302 16.2141 11.3542 16.5H4H3.5V16V7.5V4V3.5ZM4.5 4.5V7H15.5V6H9H8.83333L8.7 5.9L6.83333 4.5H4.5ZM13.5 11V13H11.5V14H13.5V16H14.5V14H16.5V13H14.5V11H13.5Z"
             fill="currentColor"
           />
         </svg>
@@ -137,6 +65,21 @@ export const CustomIcon = ({
           />
         </svg>
       )
+    case 'exit':
+      return (
+        <svg
+          {...props}
+          viewBox="0 0 20 20"
+          fill="none"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M17 10L3 10M3 10L6.5 6.5M3 10L6.5 13.5"
+            stroke="currentColor"
+          />
+        </svg>
+      )
+
     case 'extrude':
       return (
         <svg
@@ -162,74 +105,8 @@ export const CustomIcon = ({
           xmlns="http://www.w3.org/2000/svg"
         >
           <path
-            fillRule="evenodd"
-            clipRule="evenodd"
-            d="M4 3H4.5H11H11.2071L11.3536 3.14645L15.8536 7.64646L16 7.7929V8.00001V16.5V17H15.5H4.5H4V16.5V3.5V3ZM5 4V16H15V8.50001H11H10.5V8.00001V4H5ZM11.5 4.70711L14.2929 7.50001H11.5V4.70711Z"
-            fill="currentColor"
-          />
-        </svg>
-      )
-    case 'filePlus':
-      return (
-        <svg
-          {...props}
-          viewBox="0 0 20 20"
-          fill="none"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            fillRule="evenodd"
-            clipRule="evenodd"
-            d="M4 3H4.5H11H11.2071L11.3536 3.14645L15.8536 7.64646L16 7.7929V8.00001V11.3773C15.6992 11.1362 15.3628 10.9376 15 10.7908V8.50001H11H10.5V8.00001V4H5V16H9.79076C9.93763 16.3628 10.1362 16.6992 10.3773 17H4.5H4V16.5V3.5V3ZM11.5 4.70711L14.2929 7.50001H11.5V4.70711ZM13 12V14H11V15H13V17H14V15H16V14H14V12H13Z"
-            fill="currentColor"
-          />
-        </svg>
-      )
-    case 'folder':
-      return (
-        <svg
-          {...props}
-          viewBox="0 0 20 20"
-          fill="none"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            fillRule="evenodd"
-            clipRule="evenodd"
-            d="M3.5 3.5H4H7H7.16667L7.3 3.6L9.16667 5H16H16.5V5.5V7.5V16V16.5H16H4H3.5V16V7.5V4V3.5ZM4.5 4.5V7H15.5V6H9H8.83333L8.7 5.9L6.83333 4.5H4.5ZM15.5 8H4.5V15.5H15.5V8Z"
-            fill="currentColor"
-          />
-        </svg>
-      )
-    case 'folderPlus':
-      return (
-        <svg
-          {...props}
-          viewBox="0 0 20 20"
-          fill="none"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            fillRule="evenodd"
-            clipRule="evenodd"
-            d="M3.5 3.5H4H7H7.16667L7.3 3.6L9.16667 5H16H16.5V5.5V7.5V10.3773C16.1992 10.1362 15.8628 9.93763 15.5 9.79076V8H4.5V15.5H10.5351C10.7529 15.8764 11.0302 16.2141 11.3542 16.5H4H3.5V16V7.5V4V3.5ZM4.5 4.5V7H15.5V6H9H8.83333L8.7 5.9L6.83333 4.5H4.5ZM13.5 11V13H11.5V14H13.5V16H14.5V14H16.5V13H14.5V11H13.5Z"
-            fill="currentColor"
-          />
-        </svg>
-      )
-    case 'gear':
-      return (
-        <svg
-          {...props}
-          viewBox="0 0 20 20"
-          fill="none"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            fillRule="evenodd"
-            clipRule="evenodd"
-            d="M8.61477 3.0884L5.87402 4.67077L6.50004 5.75505L5.25004 7.92011H4.0047V11.07H5.25004L6.50004 13.2351L5.86973 14.3268L8.62776 15.9191L9.24503 14.85H11.745L12.3647 15.9234L15.1416 14.3202L14.5151 13.2351L15.7651 11.07H16.9951V7.92011H15.7651L14.5151 5.75505L15.1373 4.67741L12.3778 3.08423L11.7451 4.18012H9.24508L8.61477 3.0884ZM10.4999 13C12.4329 13 13.9999 11.433 13.9999 9.50003C13.9999 7.56703 12.4329 6.00003 10.4999 6.00003C8.56687 6.00003 6.99986 7.56703 6.99986 9.50003C6.99986 11.433 8.56687 13 10.4999 13Z"
-            fill="currentColor"
+            d="M11 3.5H4.5V16.5H15.5V8.00001M11 3.5L15.5 8.00001M11 3.5V8.00001H15.5"
+            stroke="currentColor"
           />
         </svg>
       )
@@ -297,22 +174,6 @@ export const CustomIcon = ({
           />
         </svg>
       )
-    case 'search':
-      return (
-        <svg
-          {...props}
-          viewBox="0 0 20 20"
-          fill="none"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            fillRule="evenodd"
-            clipRule="evenodd"
-            d="M14.016 9.00482C14.016 10.662 12.6731 12.0048 11.0172 12.0048C9.3613 12.0048 8.01841 10.662 8.01841 9.00482C8.01841 7.34768 9.3613 6.00482 11.0172 6.00482C12.6731 6.00482 14.016 7.34768 14.016 9.00482ZM15.016 9.00482C15.016 11.214 13.2257 13.0048 11.0172 13.0048C10.082 13.0048 9.22178 12.6837 8.54074 12.1456L5.6912 14.9952L4.98409 14.2881L7.83921 11.433C7.32431 10.7597 7.01841 9.91799 7.01841 9.00482C7.01841 6.79568 8.80873 5.00482 11.0172 5.00482C13.2257 5.00482 15.016 6.79568 15.016 9.00482Z"
-            fill="currentColor"
-          />
-        </svg>
-      )
     case 'sketch':
       return (
         <svg

src/components/DownloadAppBanner.tsx

@@ -1,6 +1,7 @@
 import { Dialog } from '@headlessui/react'
 import { useStore } from '../useStore'
 import { ActionButton } from './ActionButton'
+import { faX } from '@fortawesome/free-solid-svg-icons'
 
 const DownloadAppBanner = () => {
   const { isBannerDismissed, setBannerDismissed } = useStore((s) => ({
@@ -10,48 +11,44 @@ const DownloadAppBanner = () => {
 
   return (
     <Dialog
-      className="fixed inset-0 z-50"
+      className="fixed inset-0 top-auto z-50 bg-warn-20 text-warn-80 px-8 py-4"
       open={!isBannerDismissed}
       onClose={() => ({})}
     >
-      <Dialog.Overlay className="fixed inset-0 bg-chalkboard-100/50" />
-      <Dialog.Panel className="absolute inset-0 top-auto bg-warn-20 text-warn-80 px-8 py-4">
-        <div className="max-w-3xl mx-auto">
-          <div className="flex gap-2 justify-between items-start">
-            <h2 className="text-xl font-bold mb-4">
-              Zoo Modeling App is better as a desktop app!
-            </h2>
-            <ActionButton
-              Element="button"
-              onClick={() => setBannerDismissed(true)}
-              icon={{
-                icon: 'close',
-                className: 'p-1',
-                bgClassName:
-                  'bg-warn-70 hover:bg-warn-80 dark:bg-warn-70 dark:hover:bg-warn-80',
-                iconClassName:
-                  'text-warn-10 group-hover:text-warn-10 dark:text-warn-10 dark:group-hover:text-warn-10',
-              }}
-              className="!p-0 !bg-transparent !border-transparent"
-            />
-          </div>
-          <p>
-            The browser version of the app only saves your data temporarily in{' '}
-            <code className="text-base inline-block px-0.5 bg-warn-30/50 rounded">
-              localStorage
-            </code>
-            , and isn't backed up anywhere! Visit{' '}
-            <a
-              href="https://zoo.dev/modeling-app/download"
-              rel="noopener noreferrer"
-              target="_blank"
-              className="!text-warn-80 dark:!text-warn-80 dark:hover:!text-warn-70 underline"
-            >
-              our website
-            </a>{' '}
-            to download the app for the best experience.
-          </p>
+      <Dialog.Panel className="max-w-3xl mx-auto">
+        <div className="flex gap-2 justify-between items-start">
+          <h2 className="text-xl font-bold mb-4">
+            KittyCAD Modeling App is better as a desktop app!
+          </h2>
+          <ActionButton
+            Element="button"
+            onClick={() => setBannerDismissed(true)}
+            icon={{
+              icon: faX,
+              bgClassName:
+                'bg-warn-70 hover:bg-warn-80 dark:bg-warn-70 dark:hover:bg-warn-80',
+              iconClassName:
+                'text-warn-10 group-hover:text-warn-10 dark:text-warn-10 dark:group-hover:text-warn-10',
+            }}
+            className="!p-0 !bg-transparent !border-transparent"
+          />
         </div>
+        <p>
+          The browser version of the app only saves your data temporarily in{' '}
+          <code className="text-base inline-block px-0.5 bg-warn-30/50 rounded">
+            localStorage
+          </code>
+          , and isn't backed up anywhere! Visit{' '}
+          <a
+            href="https://kittycad.io/modeling-app/download"
+            rel="noopener noreferrer"
+            target="_blank"
+            className="text-warn-80 dark:text-warn-80 dark:hover:text-warn-70 underline"
+          >
+            our website
+          </a>{' '}
+          to download the app for the best experience.
+        </p>
       </Dialog.Panel>
     </Dialog>
   )

src/components/ExportButton.tsx

@@ -118,8 +118,6 @@ export const ExportButton = ({ children, className }: ExportButtonProps) => {
         Element="button"
         icon={{
           icon: faFileExport,
-          className: 'p-1',
-          size: 'sm',
           iconClassName: className?.icon,
           bgClassName: className?.bg,
         }}
@@ -214,7 +212,6 @@ export const ExportButton = ({ children, className }: ExportButtonProps) => {
               onClick={closeModal}
               icon={{
                 icon: faXmark,
-                className: 'p-1',
                 bgClassName: 'bg-destroy-80',
                 iconClassName:
                   'text-destroy-20 group-hover:text-destroy-10 hover:text-destroy-10',
@@ -226,7 +223,7 @@ export const ExportButton = ({ children, className }: ExportButtonProps) => {
             <ActionButton
               Element="button"
               type="submit"
-              icon={{ icon: faFileExport, className: 'p-1' }}
+              icon={{ icon: faFileExport }}
             >
               Export
             </ActionButton>

src/components/FileMachineProvider.tsx

@@ -40,7 +40,7 @@ export const FileMachineProvider = ({
   children: React.ReactNode
 }) => {
   const navigate = useNavigate()
-  const { commandBarSend } = useCommandsContext()
+  const { setCommandBarOpen } = useCommandsContext()
   const { project } = useRouteLoaderData(paths.FILE) as IndexLoaderData
 
   const [state, send] = useMachine(fileMachine, {
@@ -54,7 +54,7 @@ export const FileMachineProvider = ({
         event: EventFrom<typeof fileMachine>
       ) => {
         if (event.data && 'name' in event.data) {
-          commandBarSend({ type: 'Close' })
+          setCommandBarOpen(false)
           navigate(
             `${paths.FILE}/${encodeURIComponent(
               context.selectedDirectory + sep + event.data.name

src/components/FileTree.tsx

@@ -325,17 +325,16 @@ export const FileTree = ({
 
   return (
     <div className={className}>
-      <div className="flex items-center gap-1 px-4 py-1 bg-chalkboard-20/50 dark:bg-chalkboard-80/50 border-b border-b-chalkboard-30 dark:border-b-chalkboard-80">
+      <div className="flex items-center gap-1 px-4 py-1 bg-chalkboard-30/50 dark:bg-chalkboard-70/50">
         <h2 className="flex-1 m-0 p-0 text-sm mono">Files</h2>
         <ActionButton
           Element="button"
           icon={{
-            icon: 'filePlus',
+            icon: 'createFile',
             iconClassName: '!text-energy-80 dark:!text-energy-20',
-            bgClassName:
-              'bg-chalkboard-20/50 hover:bg-energy-10/50 dark:hover:bg-transparent',
+            bgClassName: 'hover:bg-energy-10/50 dark:hover:bg-transparent',
           }}
-          className="!p-0 bg-transparent !outline-none"
+          className="!p-0 border-none bg-transparent !outline-none"
           onClick={createFile}
         >
           <Tooltip position="inlineStart" delay={750}>
@@ -346,12 +345,11 @@ export const FileTree = ({
         <ActionButton
           Element="button"
           icon={{
-            icon: 'folderPlus',
+            icon: 'createFolder',
             iconClassName: '!text-energy-80 dark:!text-energy-20',
-            bgClassName:
-              'bg-chalkboard-20/50 hover:bg-energy-10/50 dark:hover:bg-transparent',
+            bgClassName: 'hover:bg-energy-10/50 dark:hover:bg-transparent',
           }}
-          className="!p-0 bg-transparent !outline-none"
+          className="!p-0 border-none bg-transparent !outline-none"
           onClick={createFolder}
         >
           <Tooltip position="inlineStart" delay={750}>

src/components/GlobalStateProvider.tsx

@@ -1,11 +1,19 @@
 import { useMachine } from '@xstate/react'
 import { useNavigate } from 'react-router-dom'
 import { paths } from '../Router'
-import { authMachine, TOKEN_PERSIST_KEY } from '../machines/authMachine'
+import {
+  authCommandBarMeta,
+  authMachine,
+  TOKEN_PERSIST_KEY,
+} from '../machines/authMachine'
 import withBaseUrl from '../lib/withBaseURL'
 import React, { createContext, useEffect, useRef } from 'react'
 import useStateMachineCommands from '../hooks/useStateMachineCommands'
-import { SETTINGS_PERSIST_KEY, settingsMachine } from 'machines/settingsMachine'
+import {
+  SETTINGS_PERSIST_KEY,
+  settingsCommandBarMeta,
+  settingsMachine,
+} from 'machines/settingsMachine'
 import { toast } from 'react-hot-toast'
 import { setThemeClass, Themes } from 'lib/theme'
 import {
@@ -15,9 +23,8 @@ import {
   Prop,
   StateFrom,
 } from 'xstate'
+import { useCommandsContext } from 'hooks/useCommandsContext'
 import { isTauri } from 'lib/isTauri'
-import { settingsCommandBarConfig } from 'lib/commandBarConfigs/settingsCommandConfig'
-import { authCommandBarConfig } from 'lib/commandBarConfigs/authCommandConfig'
 
 type MachineContext<T extends AnyStateMachine> = {
   state: StateFrom<T>
@@ -38,6 +45,7 @@ export const GlobalStateProvider = ({
   children: React.ReactNode
 }) => {
   const navigate = useNavigate()
+  const { commands } = useCommandsContext()
 
   // Settings machine setup
   const retrievedSettings = useRef(
@@ -73,10 +81,11 @@ export const GlobalStateProvider = ({
   })
 
   useStateMachineCommands({
-    machineId: 'settings',
     state: settingsState,
     send: settingsSend,
-    commandBarConfig: settingsCommandBarConfig,
+    commands,
+    owner: 'settings',
+    commandBarMeta: settingsCommandBarMeta,
   })
 
   // Listen for changes to the system theme and update the app theme accordingly
@@ -112,10 +121,11 @@ export const GlobalStateProvider = ({
   })
 
   useStateMachineCommands({
-    machineId: 'auth',
     state: authState,
     send: authSend,
-    commandBarConfig: authCommandBarConfig,
+    commands,
+    commandBarMeta: authCommandBarMeta,
+    owner: 'auth',
   })
 
   return (

src/components/Loading.tsx

@@ -15,23 +15,23 @@ const Loading = ({ children }: React.PropsWithChildren) => {
       data-testid="loading"
     >
       <svg viewBox="0 0 10 10" className="w-8 h-8">
-        <circle cx="5" cy="5" r="4" stroke="var(--energy-50)" fill="none" />
+        <circle cx="5" cy="5" r="4" stroke="var(--liquid-20)" fill="none" />
         <circle
           cx="5"
           cy="5"
           r="4"
-          stroke="var(--energy-10)"
+          stroke="var(--liquid-10)"
           fill="none"
           strokeDasharray="4, 4"
           className="animate-spin origin-center"
         />
       </svg>
-      <p className="text-base mt-4 text-energy-80 dark:text-energy-30">
+      <p className="text-base mt-4 text-liquid-80 dark:text-liquid-20">
         {children || 'Loading'}
       </p>
       <p
         className={
-          'text-sm mt-4 text-energy-70 dark:text-energy-50 transition-opacity duration-500' +
+          'text-sm mt-4 text-liquid-90 dark:text-liquid-10 transition-opacity duration-500' +
           (hasLongLoadTime ? ' opacity-100' : ' opacity-0')
         }
       >

src/components/Logo.tsx

@@ -1,33 +0,0 @@
-export const Logo = ({
-  className = 'w-auto h-5 text-chalkboard-120 dark:text-chalkboard-10',
-  ...props
-}: React.SVGProps<SVGSVGElement>) => (
-  <svg
-    {...props}
-    className={className}
-    viewBox="0 0 438 145"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-  >
-    <path
-      d="M88.2136 25.3021V3.12744H0.595269V34.3994H79.827L0.609484 120.312H0.595269V120.326L0.581055 120.34L0.595269 120.355V141.364H20.8936L41.3341 119.189V141.364H128.952V110.092H49.7349L128.952 24.1649V3.12744L108.64 3.15587L88.2136 25.3021Z"
-      fill="currentColor"
-    />
-    <path
-      d="M167.36 72.4372C167.36 49.7366 185.824 31.2719 208.525 31.2719C216.514 31.2719 223.976 33.5605 230.288 37.5121L251.78 14.3709C239.698 5.34466 224.73 0 208.525 0C168.582 0 136.088 32.4944 136.088 72.4372C136.088 90.5465 142.769 107.135 153.828 119.857L175.32 96.7156C170.316 89.9069 167.36 81.5061 167.36 72.4372Z"
-      fill="currentColor"
-    />
-    <path
-      d="M241.745 48.1442C246.734 54.9671 249.691 63.3679 249.691 72.4368C249.691 95.1232 231.226 113.588 208.525 113.588C200.537 113.588 193.088 111.299 186.777 107.348L165.271 130.503C177.353 139.515 192.321 144.86 208.525 144.86C248.468 144.86 280.963 112.365 280.963 72.4368C280.963 54.3133 274.282 37.7249 263.223 25.0029L241.745 48.1442Z"
-      fill="currentColor"
-    />
-    <path
-      d="M419.312 25.0029L397.834 48.1442C402.823 54.9671 405.779 63.3679 405.779 72.4368C405.779 95.1232 387.315 113.588 364.614 113.588C356.626 113.588 349.177 111.299 342.866 107.348L321.359 130.503C333.442 139.515 348.41 144.86 364.614 144.86C404.557 144.86 437.051 112.365 437.051 72.4368C437.051 54.3133 430.371 37.7249 419.312 25.0029Z"
-      fill="currentColor"
-    />
-    <path
-      d="M323.449 72.4372C323.449 49.7366 341.913 31.2719 364.614 31.2719C372.603 31.2719 380.065 33.5605 386.376 37.5121L407.869 14.3709C395.786 5.34466 380.819 0 364.614 0C324.671 0 292.177 32.4944 292.177 72.4372C292.177 90.5465 298.858 107.135 309.916 119.857L331.409 96.7156C326.405 89.9069 323.449 81.5061 323.449 72.4372Z"
-      fill="currentColor"
-    />
-  </svg>
-)

src/components/ModelingMachineProvider.tsx

@@ -29,26 +29,19 @@ import {
   addNewSketchLn,
   compareVec2Epsilon,
 } from 'lang/std/sketch'
-import { kclManager, useKclContext } from 'lang/KclSinglton'
+import { kclManager } from 'lang/KclSinglton'
 import { applyConstraintHorzVertDistance } from './Toolbar/SetHorzVertDistance'
 import {
   angleBetweenInfo,
   applyConstraintAngleBetween,
 } from './Toolbar/SetAngleBetween'
 import { applyConstraintAngleLength } from './Toolbar/setAngleLength'
+import { toast } from 'react-hot-toast'
 import { pathMapToSelections } from 'lang/util'
 import { useStore } from 'useStore'
-import {
-  canExtrudeSelection,
-  handleSelectionBatch,
-  handleSelectionWithShift,
-  isSelectionLastLine,
-  isSketchPipe,
-} from 'lib/selections'
+import { handleSelectionBatch, handleSelectionWithShift } from 'lib/selections'
 import { applyConstraintIntersect } from './Toolbar/Intersect'
 import { applyConstraintAbsDistance } from './Toolbar/SetAbsDistance'
-import useStateMachineCommands from 'hooks/useStateMachineCommands'
-import { modelingMachineConfig } from 'lib/commandBarConfigs/modelingCommandConfig'
 
 type MachineContext<T extends AnyStateMachine> = {
   state: StateFrom<T>
@@ -66,7 +59,6 @@ export const ModelingMachineProvider = ({
   children: React.ReactNode
 }) => {
   const { auth } = useGlobalStateContext()
-  const { code } = useKclContext()
   const token = auth?.context?.token
   const streamRef = useRef<HTMLDivElement>(null)
   useSetupEngineManager(streamRef, token)
@@ -76,6 +68,8 @@ export const ModelingMachineProvider = ({
     editorView: s.editorView,
   }))
 
+  // const { commands } = useCommandsContext()
+
   // Settings machine setup
   // const retrievedSettings = useRef(
   // localStorage?.getItem(MODELING_PERSIST_KEY) || '{}'
@@ -89,85 +83,148 @@ export const ModelingMachineProvider = ({
   //   >
   // )
 
-  const [modelingState, modelingSend, modelingActor] = useMachine(
-    modelingMachine,
-    {
-      // context: persistedSettings,
-      actions: {
-        'Modify AST': () => {},
-        'Update code selection cursors': () => {},
-        'show default planes': () => {
-          kclManager.showPlanes()
+  const [modelingState, modelingSend] = useMachine(modelingMachine, {
+    // context: persistedSettings,
+    actions: {
+      'Modify AST': () => {},
+      'Update code selection cursors': () => {},
+      'show default planes': () => {
+        kclManager.showPlanes()
+      },
+      'create path': assign({
+        sketchEnginePathId: () => {
+          const sketchUuid = uuidv4()
+          engineCommandManager.sendSceneCommand({
+            type: 'modeling_cmd_req',
+            cmd_id: sketchUuid,
+            cmd: {
+              type: 'start_path',
+            },
+          })
+          engineCommandManager.sendSceneCommand({
+            type: 'modeling_cmd_req',
+            cmd_id: uuidv4(),
+            cmd: {
+              type: 'edit_mode_enter',
+              target: sketchUuid,
+            },
+          })
+          return sketchUuid
         },
-        'create path': assign({
-          sketchEnginePathId: () => {
-            const sketchUuid = uuidv4()
-            engineCommandManager.sendSceneCommand({
-              type: 'modeling_cmd_req',
-              cmd_id: sketchUuid,
-              cmd: {
-                type: 'start_path',
-              },
-            })
-            engineCommandManager.sendSceneCommand({
-              type: 'modeling_cmd_req',
-              cmd_id: uuidv4(),
-              cmd: {
-                type: 'edit_mode_enter',
-                target: sketchUuid,
-              },
-            })
-            return sketchUuid
-          },
-        }),
-        'AST start new sketch': assign(
-          ({ sketchEnginePathId }, { data: { coords, axis, segmentId } }) => {
-            if (!axis) {
-              // Something really weird must have happened for this to happen.
-              console.error('axis is undefined for starting a new sketch')
-              return {}
+      }),
+      'AST start new sketch': assign(
+        ({ sketchEnginePathId }, { data: { coords, axis, segmentId } }) => {
+          if (!axis) {
+            // Something really weird must have happened for this to happen.
+            console.error('axis is undefined for starting a new sketch')
+            return {}
+          }
+          if (!segmentId) {
+            // Something really weird must have happened for this to happen.
+            console.error('segmentId is undefined for starting a new sketch')
+            return {}
+          }
+
+          const _addStartSketch = addStartSketch(
+            kclManager.ast,
+            axis,
+            [roundOff(coords[0].x), roundOff(coords[0].y)],
+            [
+              roundOff(coords[1].x - coords[0].x),
+              roundOff(coords[1].y - coords[0].y),
+            ]
+          )
+          const _modifiedAst = _addStartSketch.modifiedAst
+          const _pathToNode = _addStartSketch.pathToNode
+          const newCode = recast(_modifiedAst)
+          const astWithUpdatedSource = parse(newCode)
+          const updatedPipeNode = getNodeFromPath<PipeExpression>(
+            astWithUpdatedSource,
+            _pathToNode
+          ).node
+          const startProfileAtCallExp = updatedPipeNode.body.find(
+            (exp) =>
+              exp.type === 'CallExpression' &&
+              exp.callee.name === 'startProfileAt'
+          )
+          if (startProfileAtCallExp)
+            engineCommandManager.artifactMap[sketchEnginePathId] = {
+              type: 'result',
+              range: [startProfileAtCallExp.start, startProfileAtCallExp.end],
+              commandType: 'start_path',
+              data: null,
+              raw: {} as any,
             }
-            if (!segmentId) {
-              // Something really weird must have happened for this to happen.
-              console.error('segmentId is undefined for starting a new sketch')
-              return {}
+          const lineCallExp = updatedPipeNode.body.find(
+            (exp) => exp.type === 'CallExpression' && exp.callee.name === 'line'
+          )
+          if (lineCallExp)
+            engineCommandManager.artifactMap[segmentId] = {
+              type: 'result',
+              range: [lineCallExp.start, lineCallExp.end],
+              commandType: 'extend_path',
+              parentId: sketchEnginePathId,
+              data: null,
+              raw: {} as any,
             }
 
-            const _addStartSketch = addStartSketch(
+          kclManager.executeAstMock(astWithUpdatedSource, true)
+
+          return {
+            sketchPathToNode: _pathToNode,
+          }
+        }
+      ),
+      'AST add line segment': async (
+        { sketchPathToNode, sketchEnginePathId },
+        { data: { coords, segmentId } }
+      ) => {
+        if (!sketchPathToNode) return
+        const lastCoord = coords[coords.length - 1]
+
+        const pathInfo = await engineCommandManager.sendSceneCommand({
+          type: 'modeling_cmd_req',
+          cmd_id: uuidv4(),
+          cmd: {
+            type: 'path_get_info',
+            path_id: sketchEnginePathId,
+          },
+        })
+        const firstSegment = pathInfo?.data?.data?.segments.find(
+          (seg: any) => seg.command === 'line_to'
+        )
+        const firstSegCoords = await engineCommandManager.sendSceneCommand({
+          type: 'modeling_cmd_req',
+          cmd_id: uuidv4(),
+          cmd: {
+            type: 'curve_get_control_points',
+            curve_id: firstSegment.command_id,
+          },
+        })
+        const startPathCoord = firstSegCoords?.data?.data?.control_points[0]
+
+        const isClose = compareVec2Epsilon(
+          [startPathCoord.x, startPathCoord.y],
+          [lastCoord.x, lastCoord.y]
+        )
+
+        let _modifiedAst: Program
+        if (!isClose) {
+          const newSketchLn = addNewSketchLn({
+            node: kclManager.ast,
+            programMemory: kclManager.programMemory,
+            to: [lastCoord.x, lastCoord.y],
+            from: [coords[0].x, coords[0].y],
+            fnName: 'line',
+            pathToNode: sketchPathToNode,
+          })
+          const _modifiedAst = newSketchLn.modifiedAst
+          kclManager.executeAstMock(_modifiedAst, true).then(() => {
+            const lineCallExp = getNodeFromPath<CallExpression>(
               kclManager.ast,
-              axis,
-              [roundOff(coords[0].x), roundOff(coords[0].y)],
-              [
-                roundOff(coords[1].x - coords[0].x),
-                roundOff(coords[1].y - coords[0].y),
-              ]
-            )
-            const _modifiedAst = _addStartSketch.modifiedAst
-            const _pathToNode = _addStartSketch.pathToNode
-            const newCode = recast(_modifiedAst)
-            const astWithUpdatedSource = parse(newCode)
-            const updatedPipeNode = getNodeFromPath<PipeExpression>(
-              astWithUpdatedSource,
-              _pathToNode
+              newSketchLn.pathToNode
             ).node
-            const startProfileAtCallExp = updatedPipeNode.body.find(
-              (exp) =>
-                exp.type === 'CallExpression' &&
-                exp.callee.name === 'startProfileAt'
-            )
-            if (startProfileAtCallExp)
-              engineCommandManager.artifactMap[sketchEnginePathId] = {
-                type: 'result',
-                range: [startProfileAtCallExp.start, startProfileAtCallExp.end],
-                commandType: 'start_path',
-                data: null,
-                raw: {} as any,
-              }
-            const lineCallExp = updatedPipeNode.body.find(
-              (exp) =>
-                exp.type === 'CallExpression' && exp.callee.name === 'line'
-            )
-            if (lineCallExp)
+            if (segmentId)
               engineCommandManager.artifactMap[segmentId] = {
                 type: 'result',
                 range: [lineCallExp.start, lineCallExp.end],
@@ -176,203 +233,112 @@ export const ModelingMachineProvider = ({
                 data: null,
                 raw: {} as any,
               }
-
-            kclManager.executeAstMock(astWithUpdatedSource, true)
-
-            return {
-              sketchPathToNode: _pathToNode,
-            }
-          }
-        ),
-        'AST add line segment': async (
-          { sketchPathToNode, sketchEnginePathId },
-          { data: { coords, segmentId } }
-        ) => {
-          if (!sketchPathToNode) return
-          const lastCoord = coords[coords.length - 1]
-
-          const pathInfo = await engineCommandManager.sendSceneCommand({
+          })
+        } else {
+          _modifiedAst = addCloseToPipe({
+            node: kclManager.ast,
+            programMemory: kclManager.programMemory,
+            pathToNode: sketchPathToNode,
+          })
+          engineCommandManager.sendSceneCommand({
             type: 'modeling_cmd_req',
             cmd_id: uuidv4(),
-            cmd: {
-              type: 'path_get_info',
-              path_id: sketchEnginePathId,
-            },
+            cmd: { type: 'edit_mode_exit' },
           })
-          const firstSegment = pathInfo?.data?.data?.segments.find(
-            (seg: any) => seg.command === 'line_to'
-          )
-          const firstSegCoords = await engineCommandManager.sendSceneCommand({
+          engineCommandManager.sendSceneCommand({
             type: 'modeling_cmd_req',
             cmd_id: uuidv4(),
-            cmd: {
-              type: 'curve_get_control_points',
-              curve_id: firstSegment.command_id,
-            },
+            cmd: { type: 'default_camera_disable_sketch_mode' },
           })
-          const startPathCoord = firstSegCoords?.data?.data?.control_points[0]
+          kclManager.executeAstMock(_modifiedAst, true)
+          // updateAst(_modifiedAst, true)
+        }
+      },
+      'sketch exit execute': () => {
+        kclManager.executeAst()
+      },
+      'set tool': () => {}, // TODO
+      'toast extrude failed': () => {
+        toast.error(
+          'Extrude failed, sketches need to be closed, or not already extruded'
+        )
+      },
+      'Set selection': assign(({ selectionRanges }, event) => {
+        if (event.type !== 'Set selection') return {} // this was needed for ts after adding 'Set selection' action to on done modal events
+        const setSelections = event.data
+        if (!editorView) return {}
+        if (setSelections.selectionType === 'mirrorCodeMirrorSelections')
+          return { selectionRanges: setSelections.selection }
+        else if (setSelections.selectionType === 'otherSelection') {
+          // TODO KittyCAD/engine/issues/1620: send axis highlight when it's working (if that's what we settle on)
+          // const axisAddCmd: EngineCommand = {
+          //   type: 'modeling_cmd_req',
+          //   cmd: {
+          //     type: 'highlight_set_entities',
+          //     entities: [
+          //       setSelections.selection === 'x-axis'
+          //         ? X_AXIS_UUID
+          //         : Y_AXIS_UUID,
+          //     ],
+          //   },
+          //   cmd_id: uuidv4(),
+          // }
 
-          const isClose = compareVec2Epsilon(
-            [startPathCoord.x, startPathCoord.y],
-            [lastCoord.x, lastCoord.y]
-          )
+          // if (!isShiftDown) {
+          //   engineCommandManager
+          //     .sendSceneCommand({
+          //       type: 'modeling_cmd_req',
+          //       cmd: {
+          //         type: 'select_clear',
+          //       },
+          //       cmd_id: uuidv4(),
+          //     })
+          //     .then(() => {
+          //       engineCommandManager.sendSceneCommand(axisAddCmd)
+          //     })
+          // } else {
+          //   engineCommandManager.sendSceneCommand(axisAddCmd)
+          // }
 
-          let _modifiedAst: Program
-          if (!isClose) {
-            const newSketchLn = addNewSketchLn({
-              node: kclManager.ast,
-              programMemory: kclManager.programMemory,
-              to: [lastCoord.x, lastCoord.y],
-              from: [coords[0].x, coords[0].y],
-              fnName: 'line',
-              pathToNode: sketchPathToNode,
+          const {
+            codeMirrorSelection,
+            selectionRangeTypeMap,
+            otherSelections,
+          } = handleSelectionWithShift({
+            otherSelection: setSelections.selection,
+            currentSelections: selectionRanges,
+            isShiftDown,
+          })
+          setTimeout(() => {
+            editorView.dispatch({
+              selection: codeMirrorSelection,
             })
-            const _modifiedAst = newSketchLn.modifiedAst
-            kclManager.executeAstMock(_modifiedAst, true).then(() => {
-              const lineCallExp = getNodeFromPath<CallExpression>(
-                kclManager.ast,
-                newSketchLn.pathToNode
-              ).node
-              if (segmentId)
-                engineCommandManager.artifactMap[segmentId] = {
-                  type: 'result',
-                  range: [lineCallExp.start, lineCallExp.end],
-                  commandType: 'extend_path',
-                  parentId: sketchEnginePathId,
-                  data: null,
-                  raw: {} as any,
-                }
-            })
-          } else {
-            _modifiedAst = addCloseToPipe({
-              node: kclManager.ast,
-              programMemory: kclManager.programMemory,
-              pathToNode: sketchPathToNode,
-            })
-            engineCommandManager.sendSceneCommand({
-              type: 'modeling_cmd_req',
-              cmd_id: uuidv4(),
-              cmd: { type: 'edit_mode_exit' },
-            })
-            engineCommandManager.sendSceneCommand({
-              type: 'modeling_cmd_req',
-              cmd_id: uuidv4(),
-              cmd: { type: 'default_camera_disable_sketch_mode' },
-            })
-            kclManager.executeAstMock(_modifiedAst, true)
-            // updateAst(_modifiedAst, true)
-          }
-        },
-        'sketch exit execute': () => {
-          kclManager.executeAst()
-        },
-        'set tool': () => {}, // TODO
-        'Set selection': assign(({ selectionRanges }, event) => {
-          if (event.type !== 'Set selection') return {} // this was needed for ts after adding 'Set selection' action to on done modal events
-          const setSelections = event.data
-          if (!editorView) return {}
-          if (setSelections.selectionType === 'mirrorCodeMirrorSelections')
-            return { selectionRanges: setSelections.selection }
-          else if (setSelections.selectionType === 'otherSelection') {
-            // TODO KittyCAD/engine/issues/1620: send axis highlight when it's working (if that's what we settle on)
-            // const axisAddCmd: EngineCommand = {
-            //   type: 'modeling_cmd_req',
-            //   cmd: {
-            //     type: 'highlight_set_entities',
-            //     entities: [
-            //       setSelections.selection === 'x-axis'
-            //         ? X_AXIS_UUID
-            //         : Y_AXIS_UUID,
-            //     ],
-            //   },
-            //   cmd_id: uuidv4(),
-            // }
-
-            // if (!isShiftDown) {
-            //   engineCommandManager
-            //     .sendSceneCommand({
-            //       type: 'modeling_cmd_req',
-            //       cmd: {
-            //         type: 'select_clear',
-            //       },
-            //       cmd_id: uuidv4(),
-            //     })
-            //     .then(() => {
-            //       engineCommandManager.sendSceneCommand(axisAddCmd)
-            //     })
-            // } else {
-            //   engineCommandManager.sendSceneCommand(axisAddCmd)
-            // }
-
-            const {
-              codeMirrorSelection,
-              selectionRangeTypeMap,
+          })
+          return {
+            selectionRangeTypeMap,
+            selectionRanges: {
+              codeBasedSelections: selectionRanges.codeBasedSelections,
               otherSelections,
-            } = handleSelectionWithShift({
-              otherSelection: setSelections.selection,
-              currentSelections: selectionRanges,
-              isShiftDown,
-            })
-            setTimeout(() => {
-              editorView.dispatch({
-                selection: codeMirrorSelection,
-              })
-            })
-            return {
-              selectionRangeTypeMap,
-              selectionRanges: {
-                codeBasedSelections: selectionRanges.codeBasedSelections,
-                otherSelections,
-              },
-            }
-          } else if (setSelections.selectionType === 'singleCodeCursor') {
-            // This DOES NOT set the `selectionRanges` in xstate context
-            // instead it updates/dispatches to the editor, which in turn updates the xstate context
-            // I've found this the best way to deal with the editor without causing an infinite loop
-            // and really we want the editor to be in charge of cursor positions and for `selectionRanges` mirror it
-            // because we want to respect the user manually placing the cursor too.
-
-            // for more details on how selections see `src/lib/selections.ts`.
-
-            const {
-              codeMirrorSelection,
-              selectionRangeTypeMap,
-              otherSelections,
-            } = handleSelectionWithShift({
-              codeSelection: setSelections.selection,
-              currentSelections: selectionRanges,
-              isShiftDown,
-            })
-            if (codeMirrorSelection) {
-              setTimeout(() => {
-                editorView.dispatch({
-                  selection: codeMirrorSelection,
-                })
-              })
-            }
-            if (!setSelections.selection) {
-              return {
-                selectionRangeTypeMap,
-                selectionRanges: {
-                  codeBasedSelections: selectionRanges.codeBasedSelections,
-                  otherSelections,
-                },
-              }
-            }
-            return {
-              selectionRangeTypeMap,
-              selectionRanges: {
-                codeBasedSelections: selectionRanges.codeBasedSelections,
-                otherSelections,
-              },
-            }
+            },
           }
+        } else if (setSelections.selectionType === 'singleCodeCursor') {
           // This DOES NOT set the `selectionRanges` in xstate context
-          // same as comment above
-          const { codeMirrorSelection, selectionRangeTypeMap } =
-            handleSelectionBatch({
-              selections: setSelections.selection,
-            })
+          // instead it updates/dispatches to the editor, which in turn updates the xstate context
+          // I've found this the best way to deal with the editor without causing an infinite loop
+          // and really we want the editor to be in charge of cursor positions and for `selectionRanges` mirror it
+          // because we want to respect the user manually placing the cursor too.
+
+          // for more details on how selections see `src/lib/selections.ts`.
+
+          const {
+            codeMirrorSelection,
+            selectionRangeTypeMap,
+            otherSelections,
+          } = handleSelectionWithShift({
+            codeSelection: setSelections.selection,
+            currentSelections: selectionRanges,
+            isShiftDown,
+          })
           if (codeMirrorSelection) {
             setTimeout(() => {
               editorView.dispatch({
@@ -380,167 +346,180 @@ export const ModelingMachineProvider = ({
               })
             })
           }
-          return { selectionRangeTypeMap }
-        }),
-      },
-      guards: {
-        'Selection contains axis': () => true,
-        'Selection contains edge': () => true,
-        'Selection contains face': () => true,
-        'Selection contains line': () => true,
-        'Selection contains point': () => true,
-        'Selection is not empty': () => true,
-        'has valid extrude selection': ({ selectionRanges }) => {
-          // A user can begin extruding if they either have 1+ faces selected or nothing selected
-          // TODO: I believe this guard only allows for extruding a single face at a time
-          if (selectionRanges.codeBasedSelections.length < 1) return false
-          const isPipe = isSketchPipe(selectionRanges)
-
-          if (isSelectionLastLine(selectionRanges, code)) return true
-          if (!isPipe) return false
-
-          return canExtrudeSelection(selectionRanges)
-        },
-        'Selection is one face': ({ selectionRanges }) => {
-          return !!isCursorInSketchCommandRange(
-            engineCommandManager.artifactMap,
-            selectionRanges
-          )
-        },
-      },
-      services: {
-        'Get horizontal info': async ({
-          selectionRanges,
-        }): Promise<SetSelections> => {
-          const { modifiedAst, pathToNodeMap } =
-            await applyConstraintHorzVertDistance({
-              constraint: 'setHorzDistance',
-              selectionRanges,
-            })
-          await kclManager.updateAst(modifiedAst, true)
-          return {
-            selectionType: 'completeSelection',
-            selection: pathMapToSelections(
-              kclManager.ast,
-              selectionRanges,
-              pathToNodeMap
-            ),
-          }
-        },
-        'Get vertical info': async ({
-          selectionRanges,
-        }): Promise<SetSelections> => {
-          const { modifiedAst, pathToNodeMap } =
-            await applyConstraintHorzVertDistance({
-              constraint: 'setVertDistance',
-              selectionRanges,
-            })
-          await kclManager.updateAst(modifiedAst, true)
-          return {
-            selectionType: 'completeSelection',
-            selection: pathMapToSelections(
-              kclManager.ast,
-              selectionRanges,
-              pathToNodeMap
-            ),
-          }
-        },
-        'Get angle info': async ({
-          selectionRanges,
-        }): Promise<SetSelections> => {
-          const { modifiedAst, pathToNodeMap } = await (angleBetweenInfo({
-            selectionRanges,
-          }).enabled
-            ? applyConstraintAngleBetween({
-                selectionRanges,
-              })
-            : applyConstraintAngleLength({
-                selectionRanges,
-                angleOrLength: 'setAngle',
-              }))
-          await kclManager.updateAst(modifiedAst, true)
-          return {
-            selectionType: 'completeSelection',
-            selection: pathMapToSelections(
-              kclManager.ast,
-              selectionRanges,
-              pathToNodeMap
-            ),
-          }
-        },
-        'Get length info': async ({
-          selectionRanges,
-        }): Promise<SetSelections> => {
-          const { modifiedAst, pathToNodeMap } =
-            await applyConstraintAngleLength({ selectionRanges })
-          await kclManager.updateAst(modifiedAst, true)
-          return {
-            selectionType: 'completeSelection',
-            selection: pathMapToSelections(
-              kclManager.ast,
-              selectionRanges,
-              pathToNodeMap
-            ),
-          }
-        },
-        'Get perpendicular distance info': async ({
-          selectionRanges,
-        }): Promise<SetSelections> => {
-          const { modifiedAst, pathToNodeMap } = await applyConstraintIntersect(
-            {
-              selectionRanges,
+          if (!setSelections.selection) {
+            return {
+              selectionRangeTypeMap,
+              selectionRanges: {
+                codeBasedSelections: selectionRanges.codeBasedSelections,
+                otherSelections,
+              },
             }
-          )
-          await kclManager.updateAst(modifiedAst, true)
-          return {
-            selectionType: 'completeSelection',
-            selection: pathMapToSelections(
-              kclManager.ast,
-              selectionRanges,
-              pathToNodeMap
-            ),
           }
-        },
-        'Get ABS X info': async ({
-          selectionRanges,
-        }): Promise<SetSelections> => {
-          const { modifiedAst, pathToNodeMap } =
-            await applyConstraintAbsDistance({
-              constraint: 'xAbs',
-              selectionRanges,
+          return {
+            selectionRangeTypeMap,
+            selectionRanges: {
+              codeBasedSelections: selectionRanges.codeBasedSelections,
+              otherSelections,
+            },
+          }
+        }
+        // This DOES NOT set the `selectionRanges` in xstate context
+        // same as comment above
+        const { codeMirrorSelection, selectionRangeTypeMap } =
+          handleSelectionBatch({
+            selections: setSelections.selection,
+          })
+        if (codeMirrorSelection) {
+          setTimeout(() => {
+            editorView.dispatch({
+              selection: codeMirrorSelection,
             })
-          await kclManager.updateAst(modifiedAst, true)
-          return {
-            selectionType: 'completeSelection',
-            selection: pathMapToSelections(
-              kclManager.ast,
-              selectionRanges,
-              pathToNodeMap
-            ),
-          }
-        },
-        'Get ABS Y info': async ({
-          selectionRanges,
-        }): Promise<SetSelections> => {
-          const { modifiedAst, pathToNodeMap } =
-            await applyConstraintAbsDistance({
-              constraint: 'yAbs',
-              selectionRanges,
-            })
-          await kclManager.updateAst(modifiedAst, true)
-          return {
-            selectionType: 'completeSelection',
-            selection: pathMapToSelections(
-              kclManager.ast,
-              selectionRanges,
-              pathToNodeMap
-            ),
-          }
-        },
+          })
+        }
+        return { selectionRangeTypeMap }
+      }),
+    },
+    guards: {
+      'Selection contains axis': () => true,
+      'Selection contains edge': () => true,
+      'Selection contains face': () => true,
+      'Selection contains line': () => true,
+      'Selection contains point': () => true,
+      'Selection is not empty': () => true,
+      'Selection is one face': ({ selectionRanges }) => {
+        return !!isCursorInSketchCommandRange(
+          engineCommandManager.artifactMap,
+          selectionRanges
+        )
       },
-      devTools: true,
-    }
-  )
+    },
+    services: {
+      'Get horizontal info': async ({
+        selectionRanges,
+      }): Promise<SetSelections> => {
+        const { modifiedAst, pathToNodeMap } =
+          await applyConstraintHorzVertDistance({
+            constraint: 'setHorzDistance',
+            selectionRanges,
+          })
+        await kclManager.updateAst(modifiedAst, true)
+        return {
+          selectionType: 'completeSelection',
+          selection: pathMapToSelections(
+            kclManager.ast,
+            selectionRanges,
+            pathToNodeMap
+          ),
+        }
+      },
+      'Get vertical info': async ({
+        selectionRanges,
+      }): Promise<SetSelections> => {
+        const { modifiedAst, pathToNodeMap } =
+          await applyConstraintHorzVertDistance({
+            constraint: 'setVertDistance',
+            selectionRanges,
+          })
+        await kclManager.updateAst(modifiedAst, true)
+        return {
+          selectionType: 'completeSelection',
+          selection: pathMapToSelections(
+            kclManager.ast,
+            selectionRanges,
+            pathToNodeMap
+          ),
+        }
+      },
+      'Get angle info': async ({ selectionRanges }): Promise<SetSelections> => {
+        const { modifiedAst, pathToNodeMap } = await (angleBetweenInfo({
+          selectionRanges,
+        }).enabled
+          ? applyConstraintAngleBetween({
+              selectionRanges,
+            })
+          : applyConstraintAngleLength({
+              selectionRanges,
+              angleOrLength: 'setAngle',
+            }))
+        await kclManager.updateAst(modifiedAst, true)
+        return {
+          selectionType: 'completeSelection',
+          selection: pathMapToSelections(
+            kclManager.ast,
+            selectionRanges,
+            pathToNodeMap
+          ),
+        }
+      },
+      'Get length info': async ({
+        selectionRanges,
+      }): Promise<SetSelections> => {
+        const { modifiedAst, pathToNodeMap } = await applyConstraintAngleLength(
+          { selectionRanges }
+        )
+        await kclManager.updateAst(modifiedAst, true)
+        return {
+          selectionType: 'completeSelection',
+          selection: pathMapToSelections(
+            kclManager.ast,
+            selectionRanges,
+            pathToNodeMap
+          ),
+        }
+      },
+      'Get perpendicular distance info': async ({
+        selectionRanges,
+      }): Promise<SetSelections> => {
+        const { modifiedAst, pathToNodeMap } = await applyConstraintIntersect({
+          selectionRanges,
+        })
+        await kclManager.updateAst(modifiedAst, true)
+        return {
+          selectionType: 'completeSelection',
+          selection: pathMapToSelections(
+            kclManager.ast,
+            selectionRanges,
+            pathToNodeMap
+          ),
+        }
+      },
+      'Get ABS X info': async ({ selectionRanges }): Promise<SetSelections> => {
+        const { modifiedAst, pathToNodeMap } = await applyConstraintAbsDistance(
+          {
+            constraint: 'xAbs',
+            selectionRanges,
+          }
+        )
+        await kclManager.updateAst(modifiedAst, true)
+        return {
+          selectionType: 'completeSelection',
+          selection: pathMapToSelections(
+            kclManager.ast,
+            selectionRanges,
+            pathToNodeMap
+          ),
+        }
+      },
+      'Get ABS Y info': async ({ selectionRanges }): Promise<SetSelections> => {
+        const { modifiedAst, pathToNodeMap } = await applyConstraintAbsDistance(
+          {
+            constraint: 'yAbs',
+            selectionRanges,
+          }
+        )
+        await kclManager.updateAst(modifiedAst, true)
+        return {
+          selectionType: 'completeSelection',
+          selection: pathMapToSelections(
+            kclManager.ast,
+            selectionRanges,
+            pathToNodeMap
+          ),
+        }
+      },
+    },
+    devTools: true,
+  })
 
   useEffect(() => {
     engineCommandManager.onPlaneSelected((plane_id: string) => {
@@ -559,17 +538,13 @@ export const ModelingMachineProvider = ({
     })
   }, [modelingSend])
 
-  useStateMachineCommands({
-    machineId: 'modeling',
-    state: modelingState,
-    send: modelingSend,
-    actor: modelingActor,
-    commandBarConfig: modelingMachineConfig,
-    onCancel: () => {
-      console.log('firing onCancel!!')
-      modelingSend({ type: 'Cancel' })
-    },
-  })
+  // useStateMachineCommands({
+  //   state: settingsState,
+  //   send: settingsSend,
+  //   commands,
+  //   owner: 'settings',
+  //   commandBarMeta: settingsCommandBarMeta,
+  // })
 
   return (
     <ModelingMachineContext.Provider

src/components/NetworkHealthIndicator.test.tsx

@@ -1,7 +1,8 @@
 import { fireEvent, render, screen } from '@testing-library/react'
+import UserSidebarMenu from './UserSidebarMenu'
 import { BrowserRouter } from 'react-router-dom'
 import { GlobalStateProvider } from './GlobalStateProvider'
-import CommandBarProvider from './CommandBar/CommandBar'
+import CommandBarProvider from './CommandBar'
 import {
   NETWORK_CONTENT,
   NetworkHealthIndicator,

src/components/NetworkHealthIndicator.tsx

@@ -1,4 +1,8 @@
-import { faExclamation, faWifi } from '@fortawesome/free-solid-svg-icons'
+import {
+  faCheck,
+  faExclamation,
+  faWifi,
+} from '@fortawesome/free-solid-svg-icons'
 import { Popover } from '@headlessui/react'
 import { useEffect, useState } from 'react'
 import { ActionIcon } from './ActionIcon'
@@ -42,7 +46,7 @@ export const NetworkHealthIndicator = () => {
     <Popover className="relative">
       <Popover.Button
         className={
-          'p-0 border-none bg-transparent dark:bg-transparent relative ' +
+          'p-0 border-none relative ' +
           (hasIssues
             ? 'focus-visible:outline-destroy-80'
             : 'focus-visible:outline-succeed-80')
@@ -52,17 +56,15 @@ export const NetworkHealthIndicator = () => {
         <span className="sr-only">Network Health</span>
         <ActionIcon
           icon={faWifi}
-          className="p-1"
           iconClassName={
             hasIssues
               ? 'text-destroy-80 dark:text-destroy-30'
               : 'text-succeed-80 dark:text-succeed-30'
           }
           bgClassName={
-            'bg-transparent dark:bg-transparent ' +
-            (hasIssues
+            hasIssues
               ? 'hover:bg-destroy-10/50 hover:dark:bg-destroy-80/50 rounded'
-              : 'hover:bg-succeed-10/50 hover:dark:bg-succeed-80/50 rounded')
+              : 'hover:bg-succeed-10/50 hover:dark:bg-succeed-80/50 rounded'
           }
         />
       </Popover.Button>
@@ -73,8 +75,8 @@ export const NetworkHealthIndicator = () => {
             data-testid="network-good"
           >
             <ActionIcon
-              icon="checkmark"
-              bgClassName={'bg-succeed-10/50 dark:bg-succeed-80/50 rounded-sm'}
+              icon={faCheck}
+              bgClassName={'bg-succeed-10/50 dark:bg-succeed-80/50 rounded'}
               iconClassName={'text-succeed-80 dark:text-succeed-30'}
             />
             {NETWORK_CONTENT.good}

src/components/ProjectCard.tsx

@@ -1,4 +1,4 @@
-import { FormEvent, useEffect, useRef, useState } from 'react'
+import { FormEvent, useEffect, useState } from 'react'
 import { type ProjectWithEntryPointMetadata, paths } from '../Router'
 import { Link } from 'react-router-dom'
 import { ActionButton } from './ActionButton'
@@ -31,11 +31,9 @@ function ProjectCard({
   const [numberOfParts, setNumberOfParts] = useState(1)
   const [numberOfFolders, setNumberOfFolders] = useState(0)
 
-  let inputRef = useRef<HTMLInputElement>(null)
-
   function handleSave(e: FormEvent<HTMLFormElement>) {
     e.preventDefault()
-    void handleRenameProject(e, project).then(() => setIsEditing(false))
+    handleRenameProject(e, project).then(() => setIsEditing(false))
   }
 
   function getDisplayedTime(date: Date) {
@@ -54,48 +52,36 @@ function ProjectCard({
       setNumberOfParts(kclFileCount)
       setNumberOfFolders(kclDirCount)
     }
-    void getNumberOfParts()
+    getNumberOfParts()
   }, [project.path])
 
-  useEffect(() => {
-    if (inputRef.current) {
-      inputRef.current.focus()
-      inputRef.current.select()
-    }
-  }, [inputRef])
-
   return (
     <li
       {...props}
-      className="group relative min-h-[5em] p-1 rounded-sm border border-chalkboard-20 dark:border-chalkboard-90 hover:border-energy-10 dark:hover:border-chalkboard-70 hover:bg-energy-10/20 dark:hover:bg-chalkboard-90"
+      className="group relative min-h-[5em] p-1 rounded-sm border border-chalkboard-20 dark:border-chalkboard-90 hover:border-chalkboard-30 dark:hover:border-chalkboard-80"
     >
       {isEditing ? (
         <form onSubmit={handleSave} className="flex gap-2 items-center">
           <input
-            className="dark:bg-chalkboard-80 dark:border-chalkboard-40 min-w-0 p-1 selection:bg-energy-10/20 focus:outline-none"
+            className="dark:bg-chalkboard-80 dark:border-chalkboard-40 min-w-0 p-1"
             type="text"
             id="newProjectName"
             name="newProjectName"
             autoCorrect="off"
             autoCapitalize="off"
             defaultValue={project.name}
-            ref={inputRef}
+            autoFocus={true}
           />
           <div className="flex gap-1 items-center">
             <ActionButton
               Element="button"
               type="submit"
-              icon={{ icon: faCheck, size: 'sm', className: 'p-1' }}
+              icon={{ icon: faCheck, size: 'sm' }}
               className="!p-0"
             ></ActionButton>
             <ActionButton
               Element="button"
-              icon={{
-                icon: faX,
-                size: 'sm',
-                iconClassName: 'dark:!text-chalkboard-20',
-                className: 'p-1',
-              }}
+              icon={{ icon: faX, size: 'sm' }}
               className="!p-0"
               onClick={() => setIsEditing(false)}
             />
@@ -105,8 +91,8 @@ function ProjectCard({
         <>
           <div className="p-1 flex flex-col h-full gap-2">
             <Link
-              className="flex-1 text-liquid-100 after:content-[''] after:absolute after:inset-0"
               to={`${paths.FILE}/${encodeURIComponent(project.path)}`}
+              className="flex-1 text-liquid-100"
             >
               {project.name?.replace(FILE_EXT, '')}
             </Link>
@@ -120,37 +106,24 @@ function ProjectCard({
             <span className="text-chalkboard-60 text-xs">
               Edited {getDisplayedTime(project.entrypointMetadata.modifiedAt)}
             </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">
+            <div className="absolute bottom-2 right-2 flex gap-1 items-center opacity-0 group-hover:opacity-100 group-focus-within:opacity-100">
               <ActionButton
                 Element="button"
-                icon={{
-                  icon: faPenAlt,
-                  className: 'p-1',
-                  iconClassName: 'dark:!text-chalkboard-20',
-                  size: 'xs',
-                }}
-                onClick={(e) => {
-                  e.stopPropagation()
-                  e.nativeEvent.stopPropagation()
-                  setIsEditing(true)
-                }}
+                icon={{ icon: faPenAlt, size: 'sm' }}
+                onClick={() => setIsEditing(true)}
                 className="!p-0"
               />
               <ActionButton
                 Element="button"
                 icon={{
                   icon: faTrashAlt,
-                  className: 'p-1',
-                  size: 'xs',
-                  bgClassName: 'bg-destroy-80',
-                  iconClassName: '!text-destroy-20 dark:!text-destroy-40',
+                  size: 'sm',
+                  bgClassName: 'bg-destroy-80 hover:bg-destroy-70',
+                  iconClassName:
+                    'text-destroy-20 group-hover:text-destroy-10 hover:text-destroy-10 dark:text-destroy-20 dark:group-hover:text-destroy-10 dark:hover:text-destroy-10',
                 }}
                 className="!p-0 hover:border-destroy-40 dark:hover:border-destroy-40"
-                onClick={(e) => {
-                  e.stopPropagation()
-                  e.nativeEvent.stopPropagation()
-                  setIsConfirmingDelete(true)
-                }}
+                onClick={() => setIsConfirmingDelete(true)}
               />
             </div>
           </div>
@@ -183,9 +156,8 @@ function ProjectCard({
                     icon={{
                       icon: faTrashAlt,
                       bgClassName: 'bg-destroy-80',
-                      className: 'p-1',
-                      size: 'sm',
-                      iconClassName: '!text-destroy-70 dark:!text-destroy-40',
+                      iconClassName:
+                        'text-destroy-20 group-hover:text-destroy-10 hover:text-destroy-10 dark:text-destroy-20 dark:group-hover:text-destroy-10 dark:hover:text-destroy-10',
                     }}
                     className="hover:border-destroy-40 dark:hover:border-destroy-40"
                   >

src/components/ProjectSidebarMenu.test.tsx

@@ -3,8 +3,7 @@ import { BrowserRouter } from 'react-router-dom'
 import ProjectSidebarMenu from './ProjectSidebarMenu'
 import { ProjectWithEntryPointMetadata } from '../Router'
 import { GlobalStateProvider } from './GlobalStateProvider'
-import CommandBarProvider from './CommandBar/CommandBar'
-import { APP_NAME } from 'lib/constants'
+import CommandBarProvider from './CommandBar'
 
 const now = new Date()
 const projectWellFormed = {
@@ -72,7 +71,9 @@ describe('ProjectSidebarMenu tests', () => {
 
     fireEvent.click(screen.getByTestId('project-sidebar-toggle'))
 
-    expect(screen.getByTestId('projectName')).toHaveTextContent(APP_NAME)
+    expect(screen.getByTestId('projectName')).toHaveTextContent(
+      'KittyCAD Modeling App'
+    )
   })
 
   test('Renders as a link if set to do so', () => {

src/components/ProjectSidebarMenu.tsx

@@ -8,8 +8,6 @@ import { ExportButton } from './ExportButton'
 import { Fragment } from 'react'
 import { FileTree } from './FileTree'
 import { sep } from '@tauri-apps/api/path'
-import { Logo } from './Logo'
-import { APP_NAME } from 'lib/constants'
 
 const ProjectSidebarMenu = ({
   project,
@@ -23,29 +21,37 @@ const ProjectSidebarMenu = ({
   return renderAsLink ? (
     <Link
       to={paths.HOME}
-      className="rounded-sm h-9 mr-auto max-h-min min-w-max border-0 py-1 px-2 flex items-center gap-3 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-energy-50 dark:hover:bg-chalkboard-90"
+      className="h-9 max-h-min min-w-max border-0 p-0.5 pr-2 flex items-center gap-4 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-energy-50"
       data-testid="project-sidebar-link"
     >
-      <Logo />
+      <img
+        src="/kitt-8bit-winking.svg"
+        alt="KittyCAD App"
+        className="w-auto h-9"
+      />
       <span
         className="hidden text-sm text-chalkboard-110 dark:text-chalkboard-20 whitespace-nowrap lg:block"
         data-testid="project-sidebar-link-name"
       >
-        {project?.name ? project.name : APP_NAME}
+        {project?.name ? project.name : 'KittyCAD Modeling App'}
       </span>
     </Link>
   ) : (
     <Popover className="relative">
       <Popover.Button
-        className="rounded-sm h-9 mr-auto max-h-min min-w-max border-0 py-1 px-2 flex items-center gap-3 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-energy-50 dark:hover:bg-chalkboard-90"
+        className="h-9 max-h-min min-w-max border-0 p-0.5 pr-2 flex items-center gap-4 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-energy-50"
         data-testid="project-sidebar-toggle"
       >
-        <Logo />
+        <img
+          src="/kitt-8bit-winking.svg"
+          alt="KittyCAD App"
+          className="w-auto h-full"
+        />
         <div className="flex flex-col items-start py-0.5">
           <span className="hidden text-sm text-chalkboard-110 dark:text-chalkboard-20 whitespace-nowrap lg:block">
             {isTauri() && file?.name
               ? file.name.slice(file.name.lastIndexOf(sep) + 1)
-              : APP_NAME}
+              : 'KittyCAD Modeling App'}
           </span>
           {isTauri() && project?.name && (
             <span className="hidden text-xs text-chalkboard-70 dark:text-chalkboard-40 whitespace-nowrap lg:block">
@@ -76,19 +82,24 @@ const ProjectSidebarMenu = ({
         as={Fragment}
       >
         <Popover.Panel
-          className="fixed inset-0 right-auto z-30 grid w-64 h-screen max-h-screen grid-cols-1 border rounded-r-md shadow-md bg-chalkboard-10 dark:bg-chalkboard-100 border-chalkboard-40 dark:border-chalkboard-80"
+          className="fixed inset-0 right-auto z-30 grid w-64 h-screen max-h-screen grid-cols-1 border rounded-r-lg shadow-md bg-chalkboard-10 dark:bg-chalkboard-100 border-energy-100 dark:border-energy-100/50"
           style={{ gridTemplateRows: 'auto 1fr auto' }}
         >
           {({ close }) => (
             <>
-              <div className="flex items-center gap-4 px-4 py-3">
-                <Logo />
+              <div className="flex items-center gap-4 px-4 py-3 bg-energy-10/25 dark:bg-energy-110">
+                <img
+                  src="/kitt-8bit-winking.svg"
+                  alt="KittyCAD App"
+                  className="w-auto h-9"
+                />
+
                 <div>
                   <p
                     className="m-0 text-chalkboard-100 dark:text-energy-10 text-mono"
                     data-testid="projectName"
                   >
-                    {project?.name ? project.name : APP_NAME}
+                    {project?.name ? project.name : 'KittyCAD Modeling App'}
                   </p>
                   {project?.entrypointMetadata && (
                     <p
@@ -104,16 +115,19 @@ const ProjectSidebarMenu = ({
               {isTauri() ? (
                 <FileTree
                   file={file}
-                  className="overflow-hidden border-0 border-y border-chalkboard-30 dark:border-chalkboard-80"
+                  className="overflow-hidden border-0 border-y border-energy-40 dark:border-energy-70"
                   closePanel={close}
                 />
               ) : (
                 <div className="flex-1 overflow-hidden" />
               )}
-              <div className="flex flex-col gap-2 p-4 dark:bg-chalkboard-90">
+              <div className="flex flex-col gap-2 p-4 bg-energy-10/25 dark:bg-energy-110">
                 <ExportButton
                   className={{
-                    button: 'border-transparent dark:border-transparent',
+                    button:
+                      'border-transparent dark:border-transparent hover:border-energy-60',
+                    icon: 'text-energy-10 dark:text-energy-120',
+                    bg: 'bg-energy-120 dark:bg-energy-10',
                   }}
                 >
                   Export Model
@@ -124,10 +138,10 @@ const ProjectSidebarMenu = ({
                     to={paths.HOME}
                     icon={{
                       icon: faHome,
-                      className: 'p-1',
-                      size: 'sm',
+                      iconClassName: 'text-energy-10 dark:text-energy-120',
+                      bgClassName: 'bg-energy-120 dark:bg-energy-10',
                     }}
-                    className="border-transparent dark:border-transparent hover:bg-energy-10/20 dark:hover:bg-chalkboard-90"
+                    className="border-transparent dark:border-transparent hover:border-energy-60"
                   >
                     Go to Home
                   </ActionButton>

src/components/Stream.tsx

@@ -243,14 +243,15 @@ export const Stream = ({ className = '' }) => {
       })
     } else if (
       !didDragInStream &&
-      (state.matches('Sketch.SketchIdle') || state.matches('idle'))
+      (state.matches('Sketch.SketchIdle') ||
+        state.matches('idle') ||
+        state.matches('awaiting selection'))
     ) {
       command.cmd = {
         type: 'select_with_point',
         selected_at_window: { x, y },
         selection_type: 'add',
       }
-
       engineCommandManager.sendSceneCommand(command)
     } else if (!didDragInStream && state.matches('Sketch.Move Tool')) {
       command.cmd = {

src/components/TextEditor.tsx

@@ -64,7 +64,7 @@ export const TextEditor = ({
 
   const { settings: { context: { textWrapping } = {} } = {} } =
     useGlobalStateContext()
-  const { commandBarSend } = useCommandsContext()
+  const { setCommandBarOpen } = useCommandsContext()
   const { enable: convertEnabled, handleClick: convertCallback } =
     useConvertToVariable()
 
@@ -136,7 +136,7 @@ export const TextEditor = ({
         {
           key: 'Meta-k',
           run: () => {
-            commandBarSend({ type: 'Open' })
+            setCommandBarOpen(true)
             return false
           },
         },

src/components/UserSidebarMenu.test.tsx

@@ -8,7 +8,7 @@ import {
 } from 'react-router-dom'
 import { Models } from '@kittycad/lib'
 import { GlobalStateProvider } from './GlobalStateProvider'
-import CommandBarProvider from './CommandBar/CommandBar'
+import CommandBarProvider from './CommandBar'
 
 type User = Models['User_type']
 

src/components/UserSidebarMenu.tsx

@@ -1,6 +1,11 @@
 import { Popover, Transition } from '@headlessui/react'
 import { ActionButton } from './ActionButton'
-import { faBars, faBug, faSignOutAlt } from '@fortawesome/free-solid-svg-icons'
+import {
+  faBars,
+  faBug,
+  faGear,
+  faSignOutAlt,
+} from '@fortawesome/free-solid-svg-icons'
 import { faGithub } from '@fortawesome/free-brands-svg-icons'
 import { useLocation, useNavigate } from 'react-router-dom'
 import { Fragment, useState } from 'react'
@@ -38,14 +43,14 @@ const UserSidebarMenu = ({ user }: { user?: User }) => {
     <Popover className="relative">
       {user?.image && !imageLoadFailed ? (
         <Popover.Button
-          className="border-0 rounded-full w-fit min-w-max p-0 group"
+          className="border-0 rounded-full w-fit min-w-max p-0 focus:outline-none group"
           data-testid="user-sidebar-toggle"
         >
-          <div className="rounded-full border overflow-hidden">
+          <div className="rounded-full border border-chalkboard-70/50 hover:border-liquid-50 group-focus:border-liquid-50 overflow-hidden">
             <img
               src={user?.image || ''}
               alt={user?.name || ''}
-              className="h-8 w-8 rounded-full"
+              className="h-8 w-8"
               referrerPolicy="no-referrer"
               onError={() => setImageLoadFailed(true)}
             />
@@ -82,11 +87,11 @@ const UserSidebarMenu = ({ user }: { user?: User }) => {
         leaveTo="opacity-0 translate-x-4"
         as={Fragment}
       >
-        <Popover.Panel className="fixed inset-0 left-auto z-30 w-64 bg-chalkboard-10 dark:bg-chalkboard-90 border border-chalkboard-30 dark:border-chalkboard-80 shadow-md rounded-l-md overflow-hidden">
+        <Popover.Panel className="fixed inset-0 left-auto z-30 w-64 bg-chalkboard-10 dark:bg-chalkboard-100 border border-liquid-100 dark:border-liquid-100/50 shadow-md rounded-l-lg overflow-hidden">
           {({ close }) => (
             <>
               {user && (
-                <div className="flex items-center gap-4 px-4 py-3 bg-chalkboard-20/50 dark:bg-chalkboard-80/50 border-b border-b-chalkboard-30 dark:border-b-chalkboard-80">
+                <div className="flex items-center gap-4 px-4 py-3 bg-liquid-100">
                   {user.image && !imageLoadFailed && (
                     <div className="rounded-full shadow-inner overflow-hidden">
                       <img
@@ -100,12 +105,15 @@ const UserSidebarMenu = ({ user }: { user?: User }) => {
                   )}
 
                   <div>
-                    <p className="m-0 text-mono" data-testid="username">
+                    <p
+                      className="m-0 text-liquid-10 text-mono"
+                      data-testid="username"
+                    >
                       {displayedName || ''}
                     </p>
                     {displayedName !== user.email && (
                       <p
-                        className="m-0 text-chalkboard-70 dark:text-chalkboard-40 text-xs"
+                        className="m-0 text-liquid-40 text-xs"
                         data-testid="email"
                       >
                         {user.email}
@@ -117,8 +125,8 @@ const UserSidebarMenu = ({ user }: { user?: User }) => {
               <div className="p-4 flex flex-col gap-2">
                 <ActionButton
                   Element="button"
-                  icon={{ icon: 'gear' }}
-                  className="border-transparent dark:border-transparent hover:bg-transparent"
+                  icon={{ icon: faGear }}
+                  className="border-transparent dark:border-transparent dark:hover:border-liquid-60"
                   onClick={() => {
                     // since /settings is a nested route the sidebar doesn't close
                     // automatically when navigating to it
@@ -134,16 +142,16 @@ const UserSidebarMenu = ({ user }: { user?: User }) => {
                 <ActionButton
                   Element="externalLink"
                   to="https://github.com/KittyCAD/modeling-app/discussions"
-                  icon={{ icon: faGithub, className: 'p-1', size: 'sm' }}
-                  className="border-transparent dark:border-transparent"
+                  icon={{ icon: faGithub }}
+                  className="border-transparent dark:border-transparent dark:hover:border-liquid-60"
                 >
                   Request a feature
                 </ActionButton>
                 <ActionButton
                   Element="externalLink"
                   to="https://github.com/KittyCAD/modeling-app/issues/new"
-                  icon={{ icon: faBug, className: 'p-1', size: 'sm' }}
-                  className="border-transparent dark:border-transparent"
+                  icon={{ icon: faBug }}
+                  className="border-transparent dark:border-transparent dark:hover:border-liquid-60"
                 >
                   Report a bug
                 </ActionButton>
@@ -152,13 +160,11 @@ const UserSidebarMenu = ({ user }: { user?: User }) => {
                   onClick={() => send('Log out')}
                   icon={{
                     icon: faSignOutAlt,
-                    className: 'p-1',
                     bgClassName: 'bg-destroy-80',
-                    size: 'sm',
                     iconClassName:
                       'text-destroy-20 group-hover:text-destroy-10 hover:text-destroy-10',
                   }}
-                  className="border-transparent dark:border-transparent hover:border-destroy-40 dark:hover:border-destroy-60 hover:bg-destroy-10/20 dark:hover:bg-destroy-80/20"
+                  className="border-transparent dark:border-transparent hover:border-destroy-40 dark:hover:border-destroy-60"
                   data-testid="user-sidebar-sign-out"
                 >
                   Sign out

src/components/WasmErrBanner.tsx

@@ -1,6 +1,7 @@
 import { Dialog } from '@headlessui/react'
 import { useState } from 'react'
 import { ActionButton } from './ActionButton'
+import { faX } from '@fortawesome/free-solid-svg-icons'
 import { useKclContext } from 'lang/KclSinglton'
 
 export function WasmErrBanner() {
@@ -25,8 +26,7 @@ export function WasmErrBanner() {
             Element="button"
             onClick={() => setBannerDismissed(true)}
             icon={{
-              icon: 'close',
-              className: 'p-1',
+              icon: faX,
               bgClassName:
                 'bg-warn-70 hover:bg-warn-80 dark:bg-warn-70 dark:hover:bg-warn-80',
               iconClassName:

src/hooks/useCommandsContext.ts

@@ -1,4 +1,4 @@
-import { CommandsContext } from 'components/CommandBar/CommandBar'
+import { CommandsContext } from 'components/CommandBar'
 import { useContext } from 'react'
 
 export const useCommandsContext = () => {

src/hooks/usePlatform.ts

@@ -1,27 +0,0 @@
-import { Platform, platform } from '@tauri-apps/api/os'
-import { isTauri } from 'lib/isTauri'
-import { useEffect, useState } from 'react'
-
-export default function usePlatform() {
-  const [platformName, setPlatformName] = useState<Platform | ''>('')
-
-  useEffect(() => {
-    async function getPlatform() {
-      setPlatformName(await platform())
-    }
-
-    if (isTauri()) {
-      void getPlatform()
-    } else {
-      if (navigator.userAgent.indexOf('Mac') !== -1) {
-        setPlatformName('darwin')
-      } else if (navigator.userAgent.indexOf('Win') !== -1) {
-        setPlatformName('win32')
-      } else if (navigator.userAgent.indexOf('Linux') !== -1) {
-        setPlatformName('linux')
-      }
-    }
-  }, [setPlatformName])
-
-  return platformName
-}

src/hooks/useStateMachineCommands.ts

@@ -1,68 +1,42 @@
 import { useEffect } from 'react'
-import { AnyStateMachine, InterpreterFrom, StateFrom } from 'xstate'
-import { createMachineCommand } from '../lib/createMachineCommand'
+import { AnyStateMachine, StateFrom } from 'xstate'
+import { Command, CommandBarMeta, createMachineCommand } from '../lib/commands'
 import { useCommandsContext } from './useCommandsContext'
-import { modelingMachine } from 'machines/modelingMachine'
-import { authMachine } from 'machines/authMachine'
-import { settingsMachine } from 'machines/settingsMachine'
-import { homeMachine } from 'machines/homeMachine'
-import { Command, CommandSetConfig, CommandSetSchema } from 'lib/commandTypes'
 
-// This might not be necessary, AnyStateMachine from xstate is working
-export type AllMachines =
-  | typeof modelingMachine
-  | typeof settingsMachine
-  | typeof authMachine
-  | typeof homeMachine
-
-interface UseStateMachineCommandsArgs<
-  T extends AllMachines,
-  S extends CommandSetSchema<T>
-> {
-  machineId: T['id']
+interface UseStateMachineCommandsArgs<T extends AnyStateMachine> {
   state: StateFrom<T>
   send: Function
-  actor?: InterpreterFrom<T>
-  commandBarConfig?: CommandSetConfig<T, S>
-  onCancel?: () => void
+  commandBarMeta?: CommandBarMeta
+  commands: Command[]
+  owner: string
 }
 
-export default function useStateMachineCommands<
-  T extends AnyStateMachine,
-  S extends CommandSetSchema<T>
->({
-  machineId,
+export default function useStateMachineCommands<T extends AnyStateMachine>({
   state,
   send,
-  actor,
-  commandBarConfig,
-  onCancel,
-}: UseStateMachineCommandsArgs<T, S>) {
-  const { commandBarSend } = useCommandsContext()
+  commandBarMeta,
+  owner,
+}: UseStateMachineCommandsArgs<T>) {
+  const { addCommands, removeCommands } = useCommandsContext()
 
   useEffect(() => {
     const newCommands = state.nextEvents
       .filter((e) => !['done.', 'error.'].some((n) => e.includes(n)))
       .map((type) =>
-        createMachineCommand<T, S>({
-          ownerMachine: machineId,
+        createMachineCommand<T>({
           type,
           state,
           send,
-          actor,
-          commandBarConfig,
-          onCancel,
+          commandBarMeta,
+          owner,
         })
       )
-      .filter((c) => c !== null) as Command[] // TS isn't smart enough to know this filter removes nulls
+      .filter((c) => c !== null) as Command[]
 
-    commandBarSend({ type: 'Add commands', data: { commands: newCommands } })
+    addCommands(newCommands)
 
     return () => {
-      commandBarSend({
-        type: 'Remove commands',
-        data: { commands: newCommands },
-      })
+      removeCommands(newCommands)
     }
   }, [state])
 }

src/index.css

@@ -57,43 +57,27 @@ select {
 }
 
 button {
-  @apply border border-chalkboard-30 m-0.5 px-3 rounded text-xs focus-visible:ring-energy-10;
-}
-
-button:hover {
-  @apply border-chalkboard-40 bg-energy-10/20;
+  @apply border border-chalkboard-100 m-0.5 px-3 rounded text-xs;
 }
 
 .dark button {
-  @apply border-chalkboard-70 focus-visible:ring-energy-10/50;
-}
-
-.dark button:hover {
-  @apply border-chalkboard-60;
+  @apply border-chalkboard-20 hover:border-chalkboard-10 hover:bg-chalkboard-90;
 }
 
 button:disabled {
-  @apply cursor-not-allowed bg-chalkboard-20 text-chalkboard-60 border-chalkboard-20;
+  @apply bg-chalkboard-20 text-chalkboard-60 border-chalkboard-20;
 }
 
 .dark button:disabled {
   @apply bg-chalkboard-90 text-chalkboard-40 border-chalkboard-70;
 }
 
-a:not(.action-button) {
-  @apply text-energy-70 hover:text-energy-60;
+a {
+  @apply text-liquid-80 hover:text-liquid-70;
 }
 
-.dark a:not(.action-button) {
-  @apply text-chalkboard-20 hover:text-energy-10;
-}
-
-input {
-  @apply selection:bg-energy-10/50;
-}
-
-.dark input {
-  @apply selection:bg-energy-10/40;
+.dark a {
+  @apply text-liquid-20 hover:text-liquid-10;
 }
 
 .mono {

src/index.tsx

@@ -4,6 +4,8 @@ import reportWebVitals from './reportWebVitals'
 import { Toaster } from 'react-hot-toast'
 import { Router } from './Router'
 import { HotkeysProvider } from 'react-hotkeys-hook'
+import { inspect } from '@xstate/inspect'
+import { DEV } from 'env'
 
 // uncomment for xstate inspector
 // if (DEV)
@@ -17,20 +19,10 @@ root.render(
   <HotkeysProvider>
     <Router />
     <Toaster
-      position="top-center"
+      position="bottom-center"
       toastOptions={{
-        style: {
-          borderRadius: '0.25rem',
-        },
         className:
-          'bg-chalkboard-10 dark:bg-chalkboard-90 text-chalkboard-110 dark:text-chalkboard-10 rounded-sm border-chalkboard-20/50 dark:border-chalkboard-80/50',
-        success: {
-          iconTheme: {
-            primary: 'oklch(93.31% 0.227 122.3deg)',
-            secondary: 'oklch(24.49% 0.01405 158.7deg)',
-          },
-          duration: 1500,
-        },
+          'bg-chalkboard-10 dark:bg-chalkboard-90 text-chalkboard-110 dark:text-chalkboard-10',
       }}
     />
   </HotkeysProvider>

src/lang/modifyAst.ts

@@ -248,8 +248,7 @@ export function mutateObjExpProp(
 export function extrudeSketch(
   node: Program,
   pathToNode: PathToNode,
-  shouldPipe = true,
-  distance = 4
+  shouldPipe = true
 ): {
   modifiedAst: Program
   pathToNode: PathToNode
@@ -275,7 +274,7 @@ export function extrudeSketch(
     getNodeFromPath<VariableDeclarator>(_node, pathToNode, 'VariableDeclarator')
 
   const extrudeCall = createCallExpressionStdLib('extrude', [
-    createLiteral(distance),
+    createLiteral(4),
     shouldPipe
       ? createPipeSubstitution()
       : {

src/lang/std/engineConnection.ts

@@ -981,11 +981,10 @@ export class EngineCommandManager {
       !(
         command.type === 'modeling_cmd_req' &&
         (command.cmd.type === 'highlight_set_entity' ||
-          command.cmd.type === 'mouse_move' ||
-          command.cmd.type === 'camera_drag_move')
+          command.cmd.type === 'mouse_move')
       )
     ) {
-      // highlight_set_entity, mouse_move and camera_drag_move are sent over the unreliable channel and are too noisy
+      // highlight_set_entity and mouse_move are sent over the unreliable channel and are too noisy
       this.addCommandLog({
         type: 'send-scene',
         data: command,
@@ -1217,7 +1216,7 @@ export class EngineCommandManager {
       type: 'modeling_cmd_req',
       cmd: {
         type: 'make_plane',
-        size: 100,
+        size: 60,
         origin: { x: 0, y: 0, z: 0 },
         x_axis,
         y_axis,

src/lang/std/sketchcombos.ts

@@ -1537,8 +1537,7 @@ export function isLiteralArrayOrStatic(
   if (!val) return false
 
   if (Array.isArray(val)) {
-    const a = val[0]
-    const b = val[1]
+    const [a, b] = val
     return isLiteralArrayOrStatic(a) && isLiteralArrayOrStatic(b)
   }
   return (
@@ -1551,8 +1550,7 @@ export function isNotLiteralArrayOrStatic(
   val: Value | [Value, Value] | [Value, Value, Value]
 ): boolean {
   if (Array.isArray(val)) {
-    const a = val[0]
-    const b = val[1]
+    const [a, b] = val
     return isNotLiteralArrayOrStatic(a) && isNotLiteralArrayOrStatic(b)
   }
   return (

src/lib/commandBarConfigs/authCommandConfig.ts

@@ -1,17 +0,0 @@
-import { CommandSetConfig } from 'lib/commandTypes'
-import { authMachine } from 'machines/authMachine'
-
-type AuthCommandSchema = {}
-
-export const authCommandBarConfig: CommandSetConfig<
-  typeof authMachine,
-  AuthCommandSchema
-> = {
-  'Log in': {
-    hide: 'both',
-  },
-  'Log out': {
-    args: [],
-    icon: 'arrowLeft',
-  },
-}

src/lib/commandBarConfigs/homeCommandConfig.ts

@@ -1,87 +0,0 @@
-import { CommandSetConfig } from 'lib/commandTypes'
-import { homeMachine } from 'machines/homeMachine'
-
-export type HomeCommandSchema = {
-  'Create project': {
-    name: string
-  }
-  'Open project': {
-    name: string
-  }
-  'Delete project': {
-    name: string
-  }
-  'Rename project': {
-    oldName: string
-    newName: string
-  }
-}
-
-export const homeCommandBarConfig: CommandSetConfig<
-  typeof homeMachine,
-  HomeCommandSchema
-> = {
-  'Open project': {
-    icon: 'arrowRight',
-    description: 'Open a project',
-    args: {
-      name: {
-        inputType: 'options',
-        required: true,
-        options: (context) =>
-          context.projects.map((p) => ({
-            name: p.name!,
-            value: p.name!,
-          })),
-      },
-    },
-  },
-  'Create project': {
-    icon: 'folderPlus',
-    description: 'Create a project',
-    args: {
-      name: {
-        inputType: 'string',
-        required: true,
-        defaultValue: (context) => context.defaultProjectName,
-      },
-    },
-  },
-  'Delete project': {
-    icon: 'close',
-    description: 'Delete a project',
-    needsReview: true,
-    args: {
-      name: {
-        inputType: 'options',
-        required: true,
-        options: (context) =>
-          context.projects.map((p) => ({
-            name: p.name!,
-            value: p.name!,
-          })),
-      },
-    },
-  },
-  'Rename project': {
-    icon: 'folder',
-    description: 'Rename a project',
-    needsReview: true,
-    args: {
-      oldName: {
-        inputType: 'options',
-        required: true,
-        options: (context) =>
-          context.projects.map((p) => ({
-            name: p.name!,
-            value: p.name!,
-          })),
-      },
-      newName: {
-        inputType: 'string',
-        required: true,
-        defaultValue: (context) => context.defaultProjectName,
-      },
-    },
-  },
-}

src/lib/commandBarConfigs/modelingCommandConfig.ts

@@ -1,57 +0,0 @@
-import { CommandSetConfig } from 'lib/commandTypes'
-import { Selections } from 'lib/selections'
-import { modelingMachine } from 'machines/modelingMachine'
-
-export const EXTRUSION_RESULTS = [
-  'new',
-  'add',
-  'subtract',
-  'intersect',
-] as const
-
-export type ModelingCommandSchema = {
-  'Enter sketch': {}
-  Extrude: {
-    selection: Selections // & { type: 'face' } would be cool to lock that down
-    // result: (typeof EXTRUSION_RESULTS)[number]
-    distance: number
-  }
-}
-
-export const modelingMachineConfig: CommandSetConfig<
-  typeof modelingMachine,
-  ModelingCommandSchema
-> = {
-  'Enter sketch': {
-    description: 'Enter sketch mode.',
-    icon: 'sketch',
-  },
-  Extrude: {
-    description: 'Pull a sketch into 3D along its normal or perpendicular.',
-    icon: 'extrude',
-    needsReview: true,
-    args: {
-      selection: {
-        inputType: 'selection',
-        selectionTypes: ['face'],
-        multiple: false, // TODO: multiple selection
-        required: true,
-      },
-      // result: {
-      //   inputType: 'options',
-      //   payload: 'add',
-      //   required: true,
-      //   options: EXTRUSION_RESULTS.map((r) => ({
-      //     name: r,
-      //     isCurrent: r === 'add',
-      //     value: r,
-      //   })),
-      // },
-      distance: {
-        inputType: 'number',
-        defaultValue: 5,
-        required: true,
-      },
-    },
-  },
-}

src/lib/commandBarConfigs/settingsCommandConfig.ts

@@ -1,141 +0,0 @@
-import { CommandSetConfig } from '../commandTypes'
-import {
-  BaseUnit,
-  Toggle,
-  UnitSystem,
-  baseUnitsUnion,
-  settingsMachine,
-} from 'machines/settingsMachine'
-import { CameraSystem, cameraSystems } from '../cameraControls'
-import { Themes } from '../theme'
-
-// SETTINGS MACHINE
-export type SettingsCommandSchema = {
-  'Set Base Unit': {
-    baseUnit: BaseUnit
-  }
-  'Set Camera Controls': {
-    cameraControls: CameraSystem
-  }
-  'Set Default Project Name': {
-    defaultProjectName: string
-  }
-  'Set Text Wrapping': {
-    textWrapping: Toggle
-  }
-  'Set Theme': {
-    theme: Themes
-  }
-  'Set Unit System': {
-    unitSystem: UnitSystem
-  }
-}
-
-export const settingsCommandBarConfig: CommandSetConfig<
-  typeof settingsMachine,
-  SettingsCommandSchema
-> = {
-  'Set Base Unit': {
-    icon: 'gear',
-    args: {
-      baseUnit: {
-        inputType: 'options',
-        required: true,
-        defaultValue: (context) => context.baseUnit,
-        options: (context) =>
-          Object.values(baseUnitsUnion).map((v) => ({
-            name: v,
-            value: v,
-            isCurrent: v === context.baseUnit,
-          })),
-      },
-    },
-  },
-  'Set Camera Controls': {
-    icon: 'gear',
-    args: {
-      cameraControls: {
-        inputType: 'options',
-        required: true,
-        defaultValue: (context) => context.cameraControls,
-        options: (context) =>
-          Object.values(cameraSystems).map((v) => ({
-            name: v,
-            value: v,
-            isCurrent: v === context.cameraControls,
-          })),
-      },
-    },
-  },
-  'Set Default Project Name': {
-    icon: 'gear',
-    hide: 'web',
-    args: {
-      defaultProjectName: {
-        inputType: 'string',
-        required: true,
-        defaultValue: (context) => context.defaultProjectName,
-      },
-    },
-  },
-  'Set Text Wrapping': {
-    icon: 'gear',
-    args: {
-      textWrapping: {
-        inputType: 'options',
-        required: true,
-        defaultValue: (context) => context.textWrapping,
-        options: (context) => [
-          {
-            name: 'On',
-            value: 'On' as Toggle,
-            isCurrent: context.textWrapping === 'On',
-          },
-          {
-            name: 'Off',
-            value: 'Off' as Toggle,
-            isCurrent: context.textWrapping === 'Off',
-          },
-        ],
-      },
-    },
-  },
-  'Set Theme': {
-    icon: 'gear',
-    args: {
-      theme: {
-        inputType: 'options',
-        required: true,
-        defaultValue: (context) => context.theme,
-        options: (context) =>
-          Object.values(Themes).map((v) => ({
-            name: v,
-            value: v,
-            isCurrent: v === context.theme,
-          })),
-      },
-    },
-  },
-  'Set Unit System': {
-    icon: 'gear',
-    args: {
-      unitSystem: {
-        inputType: 'options',
-        required: true,
-        defaultValue: (context) => context.unitSystem,
-        options: (context) => [
-          {
-            name: 'Imperial',
-            value: 'imperial' as UnitSystem,
-            isCurrent: context.unitSystem === 'imperial',
-          },
-          {
-            name: 'Metric',
-            value: 'metric' as UnitSystem,
-            isCurrent: context.unitSystem === 'metric',
-          },
-        ],
-      },
-    },
-  },
-}

src/lib/commandTypes.ts

@@ -1,136 +0,0 @@
-import { CustomIconName } from 'components/CustomIcon'
-import { AllMachines } from 'hooks/useStateMachineCommands'
-import {
-  AnyStateMachine,
-  ContextFrom,
-  EventFrom,
-  InterpreterFrom,
-} from 'xstate'
-import { Selection } from './selections'
-
-type Icon = CustomIconName
-const PLATFORMS = ['both', 'web', 'desktop'] as const
-const INPUT_TYPES = ['options', 'string', 'number', 'selection'] as const
-export type CommandInputType = (typeof INPUT_TYPES)[number]
-
-export type CommandSetSchema<T extends AnyStateMachine> = Partial<{
-  [EventType in EventFrom<T>['type']]: Record<string, any>
-}>
-
-export type CommandSet<
-  T extends AllMachines,
-  Schema extends CommandSetSchema<T>
-> = Partial<{
-  [EventType in EventFrom<T>['type']]: Command<
-    T,
-    EventFrom<T>['type'],
-    Schema[EventType]
-  >
-}>
-
-export type CommandSetConfig<
-  T extends AllMachines,
-  Schema extends CommandSetSchema<T>
-> = Partial<{
-  [EventType in EventFrom<T>['type']]: CommandConfig<
-    T,
-    EventFrom<T>['type'],
-    Schema[EventType]
-  >
-}>
-
-export type Command<
-  T extends AnyStateMachine = AnyStateMachine,
-  CommandName extends EventFrom<T>['type'] = EventFrom<T>['type'],
-  CommandSchema extends CommandSetSchema<T>[CommandName] = CommandSetSchema<T>[CommandName]
-> = {
-  name: CommandName
-  ownerMachine: T['id']
-  needsReview: boolean
-  onSubmit: (data?: CommandSchema) => void
-  onCancel?: () => void
-  args?: {
-    [ArgName in keyof CommandSchema]: CommandArgument<CommandSchema[ArgName], T>
-  }
-  description?: string
-  icon?: Icon
-  hide?: (typeof PLATFORMS)[number]
-}
-
-export type CommandConfig<
-  T extends AnyStateMachine = AnyStateMachine,
-  CommandName extends EventFrom<T>['type'] = EventFrom<T>['type'],
-  CommandSchema extends CommandSetSchema<T>[CommandName] = CommandSetSchema<T>[CommandName]
-> = Omit<
-  Command<T, CommandName, CommandSchema>,
-  'name' | 'ownerMachine' | 'onSubmit' | 'onCancel' | 'args' | 'needsReview'
-> & {
-  needsReview?: true
-  args?: {
-    [ArgName in keyof CommandSchema]: CommandArgumentConfig<
-      CommandSchema[ArgName],
-      T
-    >
-  }
-}
-
-export type CommandArgumentConfig<
-  OutputType,
-  T extends AnyStateMachine = AnyStateMachine
-> =
-  | {
-      description?: string
-      required: boolean
-      skip?: true
-      defaultValue?: OutputType | ((context: ContextFrom<T>) => OutputType)
-      payload?: OutputType
-    } & (
-      | {
-          inputType: Extract<CommandInputType, 'options'>
-          options:
-            | CommandArgumentOption<OutputType>[]
-            | ((context: ContextFrom<T>) => CommandArgumentOption<OutputType>[])
-        }
-      | {
-          inputType: Extract<CommandInputType, 'selection'>
-          selectionTypes: Selection['type'][]
-          multiple: boolean
-        }
-      | { inputType: Exclude<CommandInputType, 'options' | 'selection'> }
-    )
-
-export type CommandArgument<
-  OutputType,
-  T extends AnyStateMachine = AnyStateMachine
-> =
-  | {
-      description?: string
-      required: boolean
-      payload?: OutputType // Payload sets the initialized value and more importantly its type
-      defaultValue?: OutputType // Default value is used as the starting value for the input on this argument
-    } & (
-      | {
-          inputType: Extract<CommandInputType, 'options'>
-          options: CommandArgumentOption<OutputType>[]
-        }
-      | {
-          inputType: Extract<CommandInputType, 'selection'>
-          selectionTypes: Selection['type'][]
-          actor: InterpreterFrom<T>
-          multiple: boolean
-        }
-      | { inputType: Exclude<CommandInputType, 'options' | 'selection'> }
-    )
-
-export type CommandArgumentWithName<
-  OutputType,
-  T extends AnyStateMachine = AnyStateMachine
-> = CommandArgument<OutputType, T> & {
-  name: string
-}
-
-export type CommandArgumentOption<A> = {
-  name: string
-  isCurrent?: boolean
-  value: A
-}

src/lib/commands.ts

@@ -0,0 +1,124 @@
+import { AnyStateMachine, EventFrom, StateFrom } from 'xstate'
+import { isTauri } from './isTauri'
+
+type InitialCommandBarMetaArg = {
+  name: string
+  type: 'string' | 'select'
+  description?: string
+  defaultValue?: string
+  options: string | Array<{ name: string }>
+}
+
+type Platform = 'both' | 'web' | 'desktop'
+
+export type CommandBarMeta = {
+  [key: string]:
+    | {
+        displayValue: (args: string[]) => string
+        args: InitialCommandBarMetaArg[]
+        hide?: Platform
+      }
+    | {
+        hide?: Platform
+      }
+}
+
+export type Command = {
+  owner: string
+  name: string
+  callback: Function
+  meta?: {
+    displayValue(args: string[]): string | string
+    args: SubCommand[]
+  }
+}
+
+export type SubCommand = {
+  name: string
+  type: 'select' | 'string'
+  description?: string
+  options?: Partial<{ name: string }>[]
+}
+
+interface CommandBarArgs<T extends AnyStateMachine> {
+  type: EventFrom<T>['type']
+  state: StateFrom<T>
+  commandBarMeta?: CommandBarMeta
+  send: Function
+  owner: string
+}
+
+export function createMachineCommand<T extends AnyStateMachine>({
+  type,
+  state,
+  commandBarMeta,
+  send,
+  owner,
+}: CommandBarArgs<T>): Command | null {
+  const lookedUpMeta = commandBarMeta && commandBarMeta[type]
+  if (lookedUpMeta && 'hide' in lookedUpMeta) {
+    const { hide } = lookedUpMeta
+    if (hide === 'both') return null
+    else if (hide === 'desktop' && isTauri()) return null
+    else if (hide === 'web' && !isTauri()) return null
+  }
+  let replacedArgs
+
+  if (lookedUpMeta && 'args' in lookedUpMeta) {
+    replacedArgs = lookedUpMeta.args.map((arg) => {
+      const optionsFromContext = state.context[
+        arg.options as keyof typeof state.context
+      ] as { name: string }[] | string | undefined
+      const defaultValueFromContext = state.context[
+        arg.defaultValue as keyof typeof state.context
+      ] as string | undefined
+
+      const options =
+        arg.options instanceof Array
+          ? arg.options.map((o) => ({
+              ...o,
+              description:
+                defaultValueFromContext === o.name ? '(current)' : '',
+            }))
+          : !optionsFromContext || typeof optionsFromContext === 'string'
+          ? [
+              {
+                name: optionsFromContext,
+                description: arg.description || '',
+              },
+            ]
+          : optionsFromContext.map((o) => ({
+              name: o.name || '',
+              description: arg.description || '',
+            }))
+
+      return {
+        ...arg,
+        options,
+      }
+    }) as any[]
+  }
+
+  // We have to recreate this object every time,
+  // otherwise we'll have stale state in the CommandBar
+  // after completing our first action
+  const meta = lookedUpMeta
+    ? {
+        ...lookedUpMeta,
+        args: replacedArgs,
+      }
+    : undefined
+
+  return {
+    name: type,
+    owner,
+    callback: (data: EventFrom<T, typeof type>) => {
+      if (data !== undefined && data !== null) {
+        send(type, { data })
+      } else {
+        send(type)
+      }
+    },
+    meta: meta as any,
+  }
+}