fix merge conflicts

.github/workflows/ci.yml

@@ -25,7 +25,8 @@ jobs:
         - name: cargo test
           shell: bash
           run: |
-            cargo llvm-cov nextest --all-features --lcov --output-path lcov.info
+            export KITTYCAD_API_TOKEN=${{secrets.KITTYCAD_API_TOKEN}}
+            cargo llvm-cov nextest --all-features --workspace --lcov --output-path lcov.info
           env:
             RUST_BACKTRACE: 1
 
@@ -95,10 +96,23 @@ jobs:
           # Edit this file to tweak the typo list and other configuration.
           run: codespell --config .codespellrc
 
+    cargo-toml-sorted:
+      name: Check Cargo.toml is sorted
+      runs-on: ubuntu-latest
+      steps:
+        - name: Checkout
+          uses: actions/checkout@v4
+        - name: Install cargo-sort
+          run: cargo install cargo-sort
+        - name: Run check
+          run: cargo sort --workspace --check
+
     semver-checks:
       runs-on: ubuntu-latest
       steps:
         - name: Checkout
           uses: actions/checkout@v4
         - name: Check semver
           uses: obi1kenobi/cargo-semver-checks-action@v2
+          with:
+            package: kittycad-modeling-cmds

CONTRIBUTING.md

@@ -0,0 +1,9 @@
+# Adding a new modeling command
+
+ - In `each_command.rs` add your new `struct MyNewCommand` with one field for each parameter the command has.
+ - In `def_enum.rs` add a new variant of `ModelingCmd` with your type, e.g. `MyNewCommand(MyNewCommand)`.
+ - If your command responds with data:
+   - In `output.rs`, add a `struct MyNewCommand` following the existing examples.
+   - Then scroll to the end of the file and `impl ModelingCmdOutput for MyNewCommand {}`
+   - In `ok_response.rs` add your new type to the `build_enum!` macro.
+ - In `impl_traits.rs` follow the examples to implement `ModelingCmdVariant` for your type `MyNewCommand` using either the `impl_variant_output!` or the `impl_variant_empty!` macro. If your command responds with data, use the former. If your command has no response, use the latter.