Fix to not blow away files with comments

Instead, just add a second reliable executor input file to use.

.codespellrc

@@ -1,3 +1,3 @@
 [codespell]
-ignore-words-list: crate,everytime,inout,co-ordinate,ot,nwo,atleast,ue,afterall,ser,fromM,FromM
+ignore-words-list: crate,everytime,inout,co-ordinate,ot,nwo,atleast,ue,afterall,ser
 skip: **/target,node_modules,build,dist,./out,**/Cargo.lock,./docs/kcl/*.md,.yarn.lock,**/yarn.lock,./openapi/*.json,./packages/codemirror-lang-kcl/test/all.test.ts,./public/kcl-samples,./rust/kcl-lib/tests/kcl_samples,tsconfig.tsbuildinfo

.env.development

@@ -1,6 +1,5 @@
 NODE_ENV=development
 DEV=true
-
 VITE_KC_API_WS_MODELING_URL=wss://api.dev.zoo.dev/ws/modeling/commands
 VITE_KC_API_BASE_URL=https://api.dev.zoo.dev
 VITE_KC_SITE_BASE_URL=https://dev.zoo.dev
@@ -9,5 +8,3 @@ VITE_KC_SKIP_AUTH=false
 VITE_KC_CONNECTION_TIMEOUT_MS=5000
 # ONLY add your token in .env.development.local if you want to skip auth, otherwise this token takes precedence!
 #VITE_KC_DEV_TOKEN="your token from dev.zoo.dev should go in .env.development.local"
-
-FAIL_ON_CONSOLE_ERRORS=true

.envrc

@@ -1,13 +1 @@
-# Load optional shared environment variables
-source_up_if_exists
-
-# Load default development environment variables
-dotenv .env.development
-
-# Load optional environment variables overrides
-dotenv_if_exists .env.development.local
-
-# Load optional testing environment variables
-dotenv_if_exists e2e/playwright/playwright-secrets.env
-
 use flake .

.eslintrc

@@ -0,0 +1,78 @@
+{
+    "parser": "@typescript-eslint/parser",
+    "parserOptions": {
+      "project": "./tsconfig.json"
+    },
+    "plugins": [
+      "react-perf",
+      "css-modules",
+      "jest",
+      "jsx-a11y",
+      "react",
+      "react-hooks",
+      "suggest-no-throw",
+      "testing-library",
+      "@typescript-eslint"
+    ],
+    "extends": [
+      "plugin:css-modules/recommended",
+      "plugin:jsx-a11y/recommended",
+      "plugin:react-hooks/recommended"
+    ],
+    "rules": {
+      "@typescript-eslint/no-floating-promises": "error",
+      "@typescript-eslint/no-misused-promises": "error",
+      "@typescript-eslint/no-unused-vars": ["error", {
+        "varsIgnorePattern": "^_",
+        "argsIgnorePattern": "^_",
+        "ignoreRestSiblings": true,
+        "vars": "all",
+        "args": "none"
+      }],
+      "jsx-a11y/click-events-have-key-events": "off",
+      "jsx-a11y/no-autofocus": "off",
+      "jsx-a11y/no-noninteractive-element-interactions": "off",
+      "no-restricted-globals": [
+        "error",
+        {
+          "name": "isNaN",
+          "message": "Use Number.isNaN() instead."
+        },
+      ],
+      "no-restricted-syntax": [
+        "error",
+        {
+          "selector": "CallExpression[callee.object.name='Array'][callee.property.name='isArray']",
+          "message": "Use isArray() in lib/utils.ts instead of Array.isArray()."
+        }
+      ],
+      "semi": [
+        "error",
+        "never"
+      ],
+      "react-hooks/exhaustive-deps": "off",
+      "suggest-no-throw/suggest-no-throw": "warn",
+    },
+    "overrides": [
+      {
+        "files": ["e2e/**/*.ts"], // Update the pattern based on your file structure
+        "extends": [
+          "plugin:testing-library/react"
+        ],
+        "rules": {
+          "suggest-no-throw/suggest-no-throw": "off",
+          "testing-library/prefer-screen-queries": "off",
+          "jest/valid-expect": "off"
+        }
+      },
+      {
+        "files": ["src/**/*.test.ts"],
+        "extends": [
+          "plugin:testing-library/react"
+        ],
+        "rules": {
+          "suggest-no-throw/suggest-no-throw": "off",
+        }
+      }
+    ]
+}

.eslintrc.json

@@ -1,127 +0,0 @@
-{
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "project": "./tsconfig.json"
-  },
-  "plugins": [
-    "react-perf",
-    "css-modules",
-    "jest",
-    "jsx-a11y",
-    "react",
-    "react-hooks",
-    "suggest-no-throw",
-    "testing-library",
-    "@typescript-eslint"
-  ],
-  "extends": [
-    "plugin:css-modules/recommended",
-    "plugin:jsx-a11y/recommended",
-    "plugin:react-hooks/recommended"
-  ],
-  "rules": {
-    "no-array-constructor": "off", // This is wrong; use the @typescript-eslint one instead.
-    "@typescript-eslint/no-array-constructor": "error",
-    "@typescript-eslint/no-array-delete": "error",
-    "@typescript-eslint/no-duplicate-enum-values": "error",
-    "@typescript-eslint/no-duplicate-type-constituents": "error",
-    "@typescript-eslint/no-empty-object-type": "error",
-    "@typescript-eslint/no-extra-non-null-assertion": "error",
-    "@typescript-eslint/no-floating-promises": "error",
-    "@typescript-eslint/no-for-in-array": "error",
-    "no-implied-eval": "off", // This is wrong; use the @typescript-eslint one instead.
-    "@typescript-eslint/no-implied-eval": "error",
-    "@typescript-eslint/no-misused-new": "error",
-    "@typescript-eslint/no-misused-promises": "error",
-    "@typescript-eslint/no-namespace": "error",
-    "@typescript-eslint/no-non-null-asserted-optional-chain": "error",
-    "@typescript-eslint/no-redundant-type-constituents": "error",
-    "@typescript-eslint/no-this-alias": "warn",
-    "@typescript-eslint/no-unnecessary-type-assertion": "error",
-    "@typescript-eslint/no-unnecessary-type-constraint": "error",
-    "no-unused-vars": "off", // This is wrong; use the @typescript-eslint one instead.
-    "@typescript-eslint/no-unused-vars": [
-      "error",
-      {
-        "varsIgnorePattern": "^_",
-        "argsIgnorePattern": "^_",
-        "ignoreRestSiblings": true,
-        "vars": "all",
-        "args": "none"
-      }
-    ],
-    "@typescript-eslint/no-unsafe-unary-minus": "error",
-    "@typescript-eslint/no-wrapper-object-types": "error",
-    "no-throw-literal": "off", // Use @typescript-eslint/only-throw-error instead.
-    "@typescript-eslint/only-throw-error": "error",
-    "@typescript-eslint/prefer-as-const": "warn",
-    "@typescript-eslint/prefer-namespace-keyword": "error",
-    "@typescript-eslint/consistent-type-imports": "error",
-    "@typescript-eslint/restrict-plus-operands": "error",
-    "jsx-a11y/click-events-have-key-events": "off",
-    "jsx-a11y/no-autofocus": "off",
-    "jsx-a11y/no-noninteractive-element-interactions": "off",
-    "no-restricted-globals": [
-      "error",
-      {
-        "name": "isNaN",
-        "message": "Use Number.isNaN() instead."
-      }
-    ],
-    "no-restricted-syntax": [
-      "error",
-      {
-        "selector": "CallExpression[callee.object.name='Array'][callee.property.name='isArray']",
-        "message": "Use isArray() in lib/utils.ts instead of Array.isArray()."
-      },
-      {
-        "selector": "CallExpression[callee.object.name='TOML'][callee.property.name='stringify']",
-        "message": "Do not use TOML.stringify directly. Use the wrappers in test-utils instead like settingsToToml."
-      },
-      {
-        "selector": "CallExpression[callee.object.name='TOML'][callee.property.name='parse']",
-        "message": "Do not use TOML.parse directly. Use the wrappers in test-utils instead like tomlToSettings."
-      }
-    ],
-    "no-restricted-imports": [
-      "error",
-      {
-        "patterns": [
-          // Restrict all relative imports except for .css files.
-          {
-            "group": ["./*", "../*", "!./*.css", "!../*.css"],
-            "message": "Use absolute imports instead."
-          }
-        ]
-      }
-    ],
-    "semi": ["error", "never"],
-    "react-hooks/exhaustive-deps": "off",
-    "suggest-no-throw/suggest-no-throw": "error"
-  },
-  "overrides": [
-    {
-      "files": ["e2e/**/*.ts"], // Update the pattern based on your file structure
-      "extends": ["plugin:testing-library/react"],
-      "rules": {
-        "suggest-no-throw/suggest-no-throw": "off",
-        "testing-library/prefer-screen-queries": "off",
-        "jest/valid-expect": "off"
-      }
-    },
-    {
-      "files": ["src/**/*.test.ts"],
-      "extends": ["plugin:testing-library/react"],
-      "rules": {
-        "suggest-no-throw/suggest-no-throw": "off"
-      }
-    },
-    {
-      "files": ["packages/**/*.ts", "rust/**/*.ts"],
-      "extends": [],
-      "rules": {
-        "no-restricted-imports": "off"
-      }
-    }
-  ]
-}

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,5 +1,5 @@
 name: Bug Report
-description: File a bug report for the Zoo Design Studio
+description: File a bug report for the Zoo Modeling App
 title: "[BUG]: "
 labels: ["bug"]
 assignees: []
@@ -70,7 +70,7 @@ body:
     id: version
     attributes:
       label: Version
-      description: "The version of the Zoo Design Studio you're using."
+      description: "The version of the Zoo Modeling App you're using."
       placeholder: "example: v0.15.0. You can find this in the settings."
     validations:
       required: true

.github/ci-cd-scripts/start-vector-macos.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-# Install vector
-brew tap vectordotdev/brew && brew install vector
-
-# Configure vector
-mkdir -p /tmp/vector
-cp .github/workflows/vector.toml /tmp/vector.toml
-sed -i '' "s#OS_NAME#${OS_NAME}#g" /tmp/vector.toml
-sed -i '' "s#GITHUB_WORKFLOW#${GITHUB_WORKFLOW}#g" /tmp/vector.toml
-sed -i '' "s#GITHUB_REPOSITORY#${GITHUB_REPOSITORY}#g" /tmp/vector.toml
-sed -i '' "s#GITHUB_SHA#${GITHUB_SHA}#g" /tmp/vector.toml
-sed -i '' "s#GITHUB_REF_NAME#${GITHUB_REF_NAME}#g" /tmp/vector.toml
-sed -i '' "s#GH_ACTIONS_AXIOM_TOKEN#${GH_ACTIONS_AXIOM_TOKEN}#g" /tmp/vector.toml
-
-# Display settings
-echo
-echo 'Vector config:'
-cat /tmp/vector.toml
-echo
-
-# Start in the background
-$(brew --prefix)/opt/vector/bin/vector --config /tmp/vector.toml &

.github/ci-cd-scripts/start-vector-ubuntu.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-# Install vector
-curl --proto '=https' --tlsv1.2 -sSfL https://sh.vector.dev | bash -s -- -y
-
-# Configure vector
-mkdir -p /tmp/vector
-cp .github/workflows/vector.toml /tmp/vector.toml
-sed -i "s#OS_NAME#${OS_NAME}#g" /tmp/vector.toml
-sed -i "s#GITHUB_WORKFLOW#${GITHUB_WORKFLOW}#g" /tmp/vector.toml
-sed -i "s#GITHUB_REPOSITORY#${GITHUB_REPOSITORY}#g" /tmp/vector.toml
-sed -i "s#GITHUB_SHA#${GITHUB_SHA}#g" /tmp/vector.toml
-sed -i "s#GITHUB_REF_NAME#${GITHUB_REF_NAME}#g" /tmp/vector.toml
-sed -i "s#GH_ACTIONS_AXIOM_TOKEN#${GH_ACTIONS_AXIOM_TOKEN}#g" /tmp/vector.toml
-
-# Display settings
-echo
-echo 'Vector config:'
-cat /tmp/vector.toml
-echo
-
-# Start in background
-${HOME}/.vector/bin/vector --config /tmp/vector.toml &

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

@@ -24,7 +24,7 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           cache: false # Configured below.
-      - uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc
+      - uses: taiki-e/install-action@37bdc826eaedac215f638a96472df572feab0f9b
         with:
           tool: wasm-pack
       - name: Rust Cache

.github/workflows/build-apps.yml

@@ -77,7 +77,7 @@ jobs:
         with:
           cache: false # Configured below.
 
-      - uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc
+      - uses: taiki-e/install-action@37bdc826eaedac215f638a96472df572feab0f9b
         if: ${{ steps.wasm.outputs.should-build-wasm == 'true' }}
         with:
           tool: wasm-pack
@@ -241,7 +241,7 @@ jobs:
       - uses: actions/upload-artifact@v4
         with:
           name: out-arm64-${{ matrix.platform }}
-          # first two will pick both Zoo Design Studio-$VERSION-arm64-win.exe and Zoo Design Studio-$VERSION-win.exe
+          # first two will pick both Zoo Modeling App-$VERSION-arm64-win.exe and Zoo Modeling App-$VERSION-win.exe
           path: |
             out/*-${{ env.VERSION_NO_V }}-win.*
             out/*-${{ env.VERSION_NO_V }}-arm64-win.*

.github/workflows/cargo-test.yml

@@ -34,11 +34,20 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           cache: false # Configured below.
-      - name: Start Vector
-        run: .github/ci-cd-scripts/start-vector-ubuntu.sh
-        env:
-          GH_ACTIONS_AXIOM_TOKEN: ${{ secrets.GH_ACTIONS_AXIOM_TOKEN }}
-          OS_NAME: ${{ env.OS_NAME }}
+      - name: Install vector
+        run: |
+          curl --proto '=https' --tlsv1.2 -sSfL https://sh.vector.dev > /tmp/vector.sh
+          chmod +x /tmp/vector.sh
+          /tmp/vector.sh -y -no-modify-path
+          mkdir -p /tmp/vector
+          cp .github/workflows/vector.toml /tmp/vector.toml
+          sed -i "s#GITHUB_WORKFLOW#${GITHUB_WORKFLOW}#g" /tmp/vector.toml
+          sed -i "s#GITHUB_REPOSITORY#${GITHUB_REPOSITORY}#g" /tmp/vector.toml
+          sed -i "s#GITHUB_SHA#${GITHUB_SHA}#g" /tmp/vector.toml
+          sed -i "s#GITHUB_REF_NAME#${GITHUB_REF_NAME}#g" /tmp/vector.toml
+          sed -i "s#GH_ACTIONS_AXIOM_TOKEN#${{secrets.GH_ACTIONS_AXIOM_TOKEN}}#g" /tmp/vector.toml
+          cat /tmp/vector.toml
+          ${HOME}/.vector/bin/vector --config /tmp/vector.toml &
       - uses: taiki-e/install-action@cargo-llvm-cov
       - uses: taiki-e/install-action@nextest
       - name: Install just

.github/workflows/e2e-tests.yml

@@ -1,9 +1,7 @@
 name: E2E Tests
 on:
   push:
-    branches:
-      - main
-      - all-e2e # this bypasses `fixme()` using `orRunWhenFullSuiteEnabled()`
+    branches: [ main ]
   pull_request:
   schedule:
     - cron: 0 * * * *  # hourly
@@ -17,6 +15,7 @@ permissions:
   pull-requests: write
   actions: read
 
+
 jobs:
 
   conditions:
@@ -68,16 +67,14 @@ jobs:
       - name: Display conditions
         shell: bash
         run: |
-          # For debugging purposes
+          # For debugging purposes.
           set -euo pipefail
-          echo "GITHUB_REF: $GITHUB_REF"
-          echo "GITHUB_HEAD_REF: $GITHUB_HEAD_REF"
-          echo "GITHUB_BASE_REF: $GITHUB_BASE_REF"
           echo "significant: ${{ steps.path-changes.outputs.significant }}"
           echo "should-run: ${{ steps.should-run.outputs.should-run }}"
 
+
   prepare-wasm:
-    # separate job on Ubuntu to build or fetch the wasm blob once on the fastest runner
+    # seperate job on Ubuntu to build or fetch the wasm blob once on the fastest runner
     runs-on: runs-on=${{ github.run_id }}/family=i7ie.2xlarge/image=ubuntu22-full-x64
     needs: conditions
     steps:
@@ -140,7 +137,7 @@ jobs:
         with:
           cache: false # Configured below.
 
-      - uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc
+      - uses: taiki-e/install-action@37bdc826eaedac215f638a96472df572feab0f9b
         if: ${{ needs.conditions.outputs.should-run == 'true' && steps.wasm.outputs.should-build-wasm == 'true' }}
         with:
           tool: wasm-pack
@@ -162,6 +159,7 @@ jobs:
           name: prepared-wasm
           path: |
             rust/kcl-wasm-lib/pkg/kcl_wasm_lib*
+  
 
   snapshots:
     name: playwright:snapshots:ubuntu
@@ -229,6 +227,10 @@ jobs:
           timeout_minutes: 30
           max_attempts: 3
         env:
+          CI: true
+          NODE_ENV: development
+          VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
+          VITE_KC_SKIP_AUTH: true
           token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
           snapshottoken: ${{ secrets.KITTYCAD_API_TOKEN }}
 
@@ -241,7 +243,7 @@ jobs:
           retention-days: 30
           overwrite: true
 
-      - name: Check for changes
+      - name: check for changes
         if: ${{ needs.conditions.outputs.should-run == 'true' && github.ref != 'refs/heads/main' }}
         shell: bash
         id: git-check
@@ -253,8 +255,7 @@ jobs:
             fi
 
       - name: Commit changes, if any
-        # TODO: find a more reliable way to detect visual changes
-        if: ${{ false && needs.conditions.outputs.should-run == 'true' && steps.git-check.outputs.modified == 'true' }}
+        if: ${{ needs.conditions.outputs.should-run == 'true' && steps.git-check.outputs.modified == 'true' }}
         shell: bash
         run: |
           git add e2e/playwright/snapshot-tests.spec.ts-snapshots e2e/playwright/snapshots
@@ -281,7 +282,7 @@ jobs:
         os:
           - "runs-on=${{ github.run_id }}/family=i7ie.2xlarge/image=ubuntu22-full-x64"
           - namespace-profile-macos-8-cores
-          - windows-latest-8-cores
+          - windows-latest
         shardIndex: [1, 2, 3, 4]
         shardTotal: [4]
         # Disable macos and windows tests on hourly e2e tests since we only care
@@ -292,7 +293,7 @@ jobs:
         exclude:
           - os: namespace-profile-macos-8-cores
             isScheduled: true
-          - os: windows-latest-8-cores
+          - os: windows-latest
             isScheduled: true
         # TODO: add ref here for main and latest release tag
     runs-on: ${{ matrix.os }}
@@ -339,12 +340,22 @@ jobs:
         if: needs.conditions.outputs.should-run == 'true'
         run: yarn tronb:vite:dev
 
-      - name: Start Vector
-        if: ${{ needs.conditions.outputs.should-run == 'true' && !contains(matrix.os, 'windows') }}
-        run: .github/ci-cd-scripts/start-vector-${{ env.OS_NAME }}.sh
-        env:
-          GH_ACTIONS_AXIOM_TOKEN: ${{ secrets.GH_ACTIONS_AXIOM_TOKEN }}
-          OS_NAME: ${{ env.OS_NAME }}
+      - name: Install vector
+        if: contains(matrix.os, 'ubuntu')
+        shell: bash
+        run: |
+          curl --proto '=https' --tlsv1.2 -sSfL https://sh.vector.dev > /tmp/vector.sh
+          chmod +x /tmp/vector.sh
+          /tmp/vector.sh -y -no-modify-path
+          mkdir -p /tmp/vector
+          cp .github/workflows/vector.toml /tmp/vector.toml
+          sed -i "s#GITHUB_WORKFLOW#${GITHUB_WORKFLOW}#g" /tmp/vector.toml
+          sed -i "s#GITHUB_REPOSITORY#${GITHUB_REPOSITORY}#g" /tmp/vector.toml
+          sed -i "s#GITHUB_SHA#${GITHUB_SHA}#g" /tmp/vector.toml
+          sed -i "s#GITHUB_REF_NAME#${GITHUB_REF_NAME}#g" /tmp/vector.toml
+          sed -i "s#GH_ACTIONS_AXIOM_TOKEN#${{secrets.GH_ACTIONS_AXIOM_TOKEN}}#g" /tmp/vector.toml
+          cat /tmp/vector.toml
+          ${HOME}/.vector/bin/vector --config /tmp/vector.toml &
 
       - uses: actions/download-artifact@v4
         if: ${{ needs.conditions.outputs.should-run == 'true' && !cancelled() && (success() || failure()) }}
@@ -360,10 +371,14 @@ jobs:
         with:
           shell: bash
           command: .github/ci-cd-scripts/playwright-electron.sh ${{matrix.shardIndex}} ${{matrix.shardTotal}} ${{ env.OS_NAME }}
-          timeout_minutes: 30
-          max_attempts: 9
+          timeout_minutes: 45
+          max_attempts: 15
         env:
+          CI: true
           FAIL_ON_CONSOLE_ERRORS: true
+          NODE_ENV: development
+          VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
+          VITE_KC_SKIP_AUTH: true
           token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
 
       - uses: actions/upload-artifact@v4

.github/workflows/static-analysis.yml

@@ -28,87 +28,43 @@ jobs:
       - run: yarn fmt-check
 
   yarn-build-wasm:
-    # Build the wasm blob once on the fastest runner.
-    runs-on: runs-on=${{ github.run_id }}/family=i7ie.2xlarge/image=ubuntu22-full-x64
+    runs-on: ubuntu-22.04
+
     steps:
       - uses: actions/checkout@v4
-
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'yarn'
-
-      - name: Install dependencies
-        run: yarn install
-
-      - name: Use correct Rust toolchain
-        shell: bash
-        run: |
-          [ -e rust-toolchain.toml ] || cp rust/rust-toolchain.toml ./
-
-      - name: Install rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          cache: false # Configured below.
-
-      - uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc
+      - run: yarn install
+      - uses: taiki-e/install-action@37bdc826eaedac215f638a96472df572feab0f9b
         with:
           tool: wasm-pack
+      - run: yarn build:wasm
 
-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2
+  yarn-tsc:
+    runs-on: ubuntu-22.04
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+          cache: 'yarn'
+      - run: yarn install
+      - run: yarn --cwd ./rust/kcl-language-server --modules-folder node_modules install
+      - uses: Swatinem/rust-cache@v2
         with:
           workspaces: './rust'
 
-      - name: Build Wasm
-        shell: bash
-        run: yarn build:wasm
-
-      - uses: actions/upload-artifact@v4
+      - uses: taiki-e/install-action@37bdc826eaedac215f638a96472df572feab0f9b
         with:
-          name: prepared-wasm
-          path: |
-            rust/kcl-wasm-lib/pkg/kcl_wasm_lib*
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: prepared-ts-rs-bindings
-          path: |
-            rust/kcl-lib/bindings/*
-
-  yarn-tsc:
-    runs-on: ubuntu-latest
-    needs: yarn-build-wasm
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'yarn'
-      - run: yarn install
-
-      - name: Download all artifacts
-        uses: actions/download-artifact@v4
-
-      - name: Copy prepared wasm
-        run: |
-          ls -R prepared-wasm
-          cp prepared-wasm/kcl_wasm_lib_bg.wasm public
-          mkdir rust/kcl-wasm-lib/pkg
-          cp prepared-wasm/kcl_wasm_lib* rust/kcl-wasm-lib/pkg
-
-      - name: Copy prepared ts-rs bindings
-        run: |
-          ls -R prepared-ts-rs-bindings
-          mkdir rust/kcl-lib/bindings
-          cp -r prepared-ts-rs-bindings/* rust/kcl-lib/bindings/
-
+          tool: wasm-pack
+      - run: yarn build:wasm
       - run: yarn tsc
 
   yarn-lint:
-    runs-on: ubuntu-latest
-    needs: yarn-build-wasm
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4
@@ -117,55 +73,9 @@ jobs:
           node-version-file: '.nvmrc'
           cache: 'yarn'
       - run: yarn install
-
-      - name: Download all artifacts
-        uses: actions/download-artifact@v4
-
-      - name: Copy prepared wasm
-        run: |
-          ls -R prepared-wasm
-          cp prepared-wasm/kcl_wasm_lib_bg.wasm public
-          mkdir rust/kcl-wasm-lib/pkg
-          cp prepared-wasm/kcl_wasm_lib* rust/kcl-wasm-lib/pkg
-
-      - name: Copy prepared ts-rs bindings
-        run: |
-          ls -R prepared-ts-rs-bindings
-          mkdir rust/kcl-lib/bindings
-          cp -r prepared-ts-rs-bindings/* rust/kcl-lib/bindings/
-
+      - run: yarn --cwd ./rust/kcl-language-server --modules-folder node_modules install
       - run: yarn lint
 
-  yarn-circular-dependencies:
-    runs-on: ubuntu-latest
-    needs: yarn-build-wasm
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'yarn'
-      - run: yarn install
-
-      - name: Download all artifacts
-        uses: actions/download-artifact@v4
-
-      - name: Copy prepared wasm
-        run: |
-          ls -R prepared-wasm
-          cp prepared-wasm/kcl_wasm_lib_bg.wasm public
-          mkdir rust/kcl-wasm-lib/pkg
-          cp prepared-wasm/kcl_wasm_lib* rust/kcl-wasm-lib/pkg
-
-      - name: Copy prepared ts-rs bindings
-        run: |
-          ls -R prepared-ts-rs-bindings
-          mkdir rust/kcl-lib/bindings
-          cp -r prepared-ts-rs-bindings/* rust/kcl-lib/bindings/
-
-      - run: yarn circular-deps:diff
-
   python-codespell:
     runs-on: ubuntu-22.04
     steps:
@@ -181,7 +91,6 @@ jobs:
 
   yarn-unit-test-kcl-samples:
     runs-on: ubuntu-latest
-    needs: yarn-build-wasm
     steps:
       - uses: actions/checkout@v4
 
@@ -191,25 +100,10 @@ jobs:
           cache: 'yarn'
 
       - run: yarn install
-      - uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc
+      - uses: taiki-e/install-action@37bdc826eaedac215f638a96472df572feab0f9b
         with:
           tool: wasm-pack
-
-      - name: Download all artifacts
-        uses: actions/download-artifact@v4
-
-      - name: Copy prepared wasm
-        run: |
-          ls -R prepared-wasm
-          cp prepared-wasm/kcl_wasm_lib_bg.wasm public
-          mkdir rust/kcl-wasm-lib/pkg
-          cp prepared-wasm/kcl_wasm_lib* rust/kcl-wasm-lib/pkg
-
-      - name: Copy prepared ts-rs bindings
-        run: |
-          ls -R prepared-ts-rs-bindings
-          mkdir rust/kcl-lib/bindings
-          cp -r prepared-ts-rs-bindings/* rust/kcl-lib/bindings/
+      - run: yarn build:wasm
 
       - run: yarn simpleserver:bg
         if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
@@ -226,7 +120,6 @@ jobs:
 
   yarn-unit-test:
     runs-on: ubuntu-latest
-    needs: yarn-build-wasm
     steps:
       - uses: actions/checkout@v4
 
@@ -236,25 +129,10 @@ jobs:
           cache: 'yarn'
 
       - run: yarn install
-      - uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc
+      - uses: taiki-e/install-action@37bdc826eaedac215f638a96472df572feab0f9b
         with:
           tool: wasm-pack
-
-      - name: Download all artifacts
-        uses: actions/download-artifact@v4
-
-      - name: Copy prepared wasm
-        run: |
-          ls -R prepared-wasm
-          cp prepared-wasm/kcl_wasm_lib_bg.wasm public
-          mkdir rust/kcl-wasm-lib/pkg
-          cp prepared-wasm/kcl_wasm_lib* rust/kcl-wasm-lib/pkg
-
-      - name: Copy prepared ts-rs bindings
-        run: |
-          ls -R prepared-ts-rs-bindings
-          mkdir rust/kcl-lib/bindings
-          cp -r prepared-ts-rs-bindings/* rust/kcl-lib/bindings/
+      - run: yarn build:wasm
 
       - run: yarn simpleserver:bg
         if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
@@ -263,13 +141,13 @@ jobs:
         if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
         run: yarn playwright install chromium --with-deps
 
-      - name: Run unit tests
+      - name: run unit tests
         if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
         run: xvfb-run -a yarn test:unit
         env:
           VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
 
-      - name: Check for changes
+      - name: check for changes
         if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
         id: git-check
         run: |

.github/workflows/update-e2e-branch.yml

@@ -14,32 +14,16 @@ permissions:
 jobs:
   update-branch:
     runs-on: ubuntu-latest
+
     steps:
-      - uses: actions/create-github-app-token@v1
-        id: app-token
-        with:
-          app-id: ${{ secrets.MODELING_APP_GH_APP_ID }}
-          private-key: ${{ secrets.MODELING_APP_GH_APP_PRIVATE_KEY }}
-          owner: ${{ github.repository_owner }}
-
       - uses: actions/checkout@v4
-        with:
-          token: ${{ steps.app-token.outputs.token }}
-
-      - name: Sync with main
+      - shell: bash
         run: |
-          # Create the branch
+          # checkout our branch
           git checkout all-e2e || git checkout -b all-e2e
-
-          # Reset to main
+          # fetch origin
           git fetch origin
+          # reset to main
           git reset --hard origin/main
-
-          # Get a new SHA to prevent overwriting the commit status on main
-          git config --local user.email "github-actions[bot]@users.noreply.github.com"
-          git config --local user.name "github-actions[bot]"
-          git commit --allow-empty --message="[all-e2e] $(git log --max-count=1 --pretty=%B)"
-
-          # Overwrite the branch
-          git remote set-url origin https://x-access-token:${{ steps.app-token.outputs.token }}@github.com/${{ github.repository }}.git
+          # force push it
           git push --force origin all-e2e

.github/workflows/vector.toml

@@ -8,7 +8,6 @@ include = ["/tmp/github-actions.log"]
 type = "remap"
 inputs = [ "github-actions-file" ]
 source = '''
-.platform = "OS_NAME"
 .action = "GITHUB_WORKFLOW"
 .repo = "GITHUB_REPOSITORY"
 .sha = "GITHUB_SHA"

INSTALL.md

@@ -1,27 +1,27 @@
-# Setting Up Zoo Design Studio
+# Setting Up Zoo Modeling App
 
-Compared to other CAD software, getting Zoo Design Studio up and running is quick and straightforward across platforms. It's about 100MB to download and is quick to install.
+Compared to other CAD software, getting Zoo Modeling App up and running is quick and straightforward across platforms. It's about 100MB to download and is quick to install.
 
 ## Windows
 
-1. Download the [Zoo Design Studio installer](https://zoo.dev/modeling-app/download) for Windows and for your processor type.
+1. Download the [Zoo Modeling App installer](https://zoo.dev/modeling-app/download) for Windows and for your processor type.
 
-2. Once downloaded, run the installer `Zoo Design Studio-{version}-{arch}-win.exe` which should take a few seconds.
+2. Once downloaded, run the installer `Zoo Modeling App-{version}-{arch}-win.exe` which should take a few seconds.
 
-3. The installation happens at `C:\Program Files\Zoo Design Studio`. A shortcut in the start menu is also created so you can run the app easily by clicking on it.
+3. The installation happens at `C:\Program Files\Zoo Modeling App`. A shortcut in the start menu is also created so you can run the app easily by clicking on it.
 
 ## macOS
 
-1. Download the [Zoo Design Studio installer](https://zoo.dev/modeling-app/download) for macOS and for your processor type.
+1. Download the [Zoo Modeling App installer](https://zoo.dev/modeling-app/download) for macOS and for your processor type.
 
-2. Once downloaded, open the disk image `Zoo Design Studio-{version}-{arch}-mac.dmg` and drag the applications to your `Applications` directory.
+2. Once downloaded, open the disk image `Zoo Modeling App-{version}-{arch}-mac.dmg` and drag the applications to your `Applications` directory.
 
-3. You can then open your `Applications` directory and double-click on `Zoo Design Studio` to open.
+3. You can then open your `Applications` directory and double-click on `Zoo Modeling App` to open.
 
 
 ## Linux 
 
-1. Download the [Zoo Design Studio installer](https://zoo.dev/modeling-app/download) for Linux and for your processor type.
+1. Download the [Zoo Modeling App installer](https://zoo.dev/modeling-app/download) for Linux and for your processor type.
 
 2. Install the dependencies needed to run the [AppImage format](https://appimage.org/).
     -  On Ubuntu, install the FUSE library with these commands in a terminal.
@@ -30,7 +30,7 @@ Compared to other CAD software, getting Zoo Design Studio up and running is quic
        sudo apt install libfuse2
        ```
     - Optionally, follow [these steps](https://github.com/probonopd/go-appimage/blob/master/src/appimaged/README.md#initial-setup) to install `appimaged`. It is a daemon that makes interacting with AppImage files more seamless. 
-    - Once installed, copy the downloaded `Zoo Design Studio-{version}-{arch}-linux.AppImage` to the directory of your choice, for instance `~/Applications`.
+    - Once installed, copy the downloaded `Zoo Modeling App-{version}-{arch}-linux.AppImage` to the directory of your choice, for instance `~/Applications`.
 
    - `appimaged` should automatically find it and make it executable. If not, run:
      ```bash

Makefile

@@ -4,69 +4,41 @@ all: install build check
 ###############################################################################
 # INSTALL
 
-ifeq ($(OS),Windows_NT)
-	CARGO ?= ~/.cargo/bin/cargo.exe
-	WASM_PACK ?= ~/.cargo/bin/wasm-pack.exe
-else
-	CARGO ?= ~/.cargo/bin/cargo
-	WASM_PACK ?= ~/.cargo/bin/wasm-pack
-endif
+WASM_PACK ?= ~/.cargo/bin/wasm-pack
 
 .PHONY: install
-install: node_modules/.yarn-integrity $(CARGO) $(WASM_PACK) ## Install dependencies
+install: node_modules/.yarn-integrity $(WASM_PACK) ## Install dependencies
 
 node_modules/.yarn-integrity: package.json yarn.lock
 	yarn install
-ifeq ($(OS),Windows_NT)
-	@ type nul > $@
-else
 	@ touch $@
-endif
-
-$(CARGO):
-ifeq ($(OS),Windows_NT)
-	yarn install:rust:windows
-else
-	yarn install:rust
-endif
 
 $(WASM_PACK):
-ifeq ($(OS),Windows_NT)
-	yarn install:wasm-pack:cargo
-else
+	yarn install:rust
 	yarn install:wasm-pack:sh
-endif
 
 ###############################################################################
 # BUILD
 
-CARGO_SOURCES := rust/.cargo/config.toml $(wildcard rust/Cargo.*) $(wildcard rust/**/Cargo.*)
-RUST_SOURCES := $(wildcard rust/**/*.rs)
-
-REACT_SOURCES := $(wildcard src/*.tsx) $(wildcard src/**/*.tsx)
-TYPESCRIPT_SOURCES := tsconfig.* $(wildcard src/*.ts) $(wildcard src/**/*.ts)
-VITE_SOURCES := $(wildcard vite.*) $(wildcard vite/**/*.tsx)
+RUST_SOURCES := $(wildcard rust/*) $(wildcard rust/**/*)
+TYPESCRIPT_SOURCES := $(wildcard src/**/*.tsx) $(wildcard src/**/*.ts)
 
 .PHONY: build
 build: build-web build-desktop
 
 .PHONY: build-web
-build-web: install public/kcl_wasm_lib_bg.wasm build/index.html
+build-web: public/kcl_wasm_lib_bg.wasm build/index.html
 
 .PHONY: build-desktop
-build-desktop: install public/kcl_wasm_lib_bg.wasm .vite/build/main.js
+build-desktop: public/kcl_wasm_lib_bg.wasm .vite/build/main.js
 
-public/kcl_wasm_lib_bg.wasm: $(CARGO_SOURCES) $(RUST_SOURCES)
-ifeq ($(OS),Windows_NT)
-	yarn build:wasm:dev:windows
-else
-	yarn build:wasm:dev
-endif
+public/kcl_wasm_lib_bg.wasm: $(RUST_SOURCES)
+	yarn build:wasm
 
-build/index.html: $(REACT_SOURCES) $(TYPESCRIPT_SOURCES) $(VITE_SOURCES)
+build/index.html: $(TYPESCRIPT_SOURCES)
 	yarn build:local
 
-.vite/build/main.js: $(REACT_SOURCES) $(TYPESCRIPT_SOURCES) $(VITE_SOURCES)
+.vite/build/main.js: $(TYPESCRIPT_SOURCES)
 	yarn tronb:vite:dev
 
 ###############################################################################
@@ -87,10 +59,8 @@ lint: install ## Lint the code
 ###############################################################################
 # RUN
 
-TARGET ?= desktop
-
 .PHONY: run
-run: run-$(TARGET)
+run: run-web
 
 .PHONY: run-web
 run-web: install build-web ## Start the web app
@@ -103,60 +73,34 @@ run-desktop: install build-desktop ## Start the desktop app
 ###############################################################################
 # TEST
 
-E2E_GREP ?=
-E2E_WORKERS ?=
-E2E_FAILURES ?= 1
+GREP ?= ""
 
 .PHONY: test
 test: test-unit test-e2e
 
 .PHONY: test-unit
 test-unit: install ## Run the unit tests
-	@ curl -fs localhost:3000 >/dev/null || ( echo "Error: localhost:3000 not available, 'make run-web' first" && exit 1 )
+	@ nc -z localhost 3000 || ( echo "Error: localhost:3000 not available, 'make run-web' first" && exit 1 )
 	yarn test:unit
 
 .PHONY: test-e2e
-test-e2e: test-e2e-$(TARGET)
-
-.PHONY: test-e2e-web
-test-e2e-web: install build-web ## Run the web e2e tests
-	@ curl -fs localhost:3000 >/dev/null || ( echo "Error: localhost:3000 not available, 'make run-web' first" && exit 1 )
-ifdef E2E_GREP
-	yarn chrome:test --headed --grep="$(E2E_GREP)" --max-failures=$(E2E_FAILURES)
-else
-	yarn chrome:test --headed --workers='100%'
-endif
-
-.PHONY: test-e2e-desktop
-test-e2e-desktop: install build-desktop ## Run the desktop e2e tests
-ifdef E2E_GREP
-	yarn test:playwright:electron --grep="$(E2E_GREP)" --max-failures=$(E2E_FAILURES)
-else
-	yarn test:playwright:electron --workers='100%'
-endif
+test-e2e: install build-desktop ## Run the e2e tests
+	yarn test:playwright:electron --workers=1 --grep=$(GREP)
 
 ###############################################################################
 # CLEAN
 
 .PHONY: clean
 clean: ## Delete all artifacts
-ifeq ($(OS),Windows_NT)
-	git clean --force -d -X
-else
 	rm -rf .vite/ build/
 	rm -rf trace.zip playwright-report/ test-results/
 	rm -rf public/kcl_wasm_lib_bg.wasm
 	rm -rf rust/*/bindings/ rust/*/pkg/ rust/target/
 	rm -rf node_modules/ rust/*/node_modules/
-endif
 
 .PHONY: help
 help: install
-ifeq ($(OS),Windows_NT)
-	@ powershell -Command "Get-Content $(MAKEFILE_LIST) | Select-String -Pattern '^[^\s]+:.*##\s.*$$' | ForEach-Object { $$line = $$_.Line -split ':.*?##\s+'; Write-Host -NoNewline $$line[0].PadRight(30) -ForegroundColor Cyan; Write-Host $$line[1] }"
-else
 	@ grep -E '^[^[:space:]]+:.*## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
-endif
 
 .DEFAULT_GOAL := help
 

README.md

@@ -1,17 +1,17 @@
-![Zoo Design Studio](/public/zma-logomark-outlined.png)
+![Zoo Modeling App](/public/zma-logomark-outlined.png)
 
-## Zoo Design Studio
+## Zoo Modeling App
 
 download at [zoo.dev/modeling-app/download](https://zoo.dev/modeling-app/download)
 
 A CAD application from the future, brought to you by the [Zoo team](https://zoo.dev).
 
-Design Studio 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:
+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 Design Studio
+  - 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
 - 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 @@ Design Studio is our take on what a modern modelling experience can be. It is ap
 
 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!
 
-Design Studio 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.
+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 Design Studio 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 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
 
@@ -198,13 +198,13 @@ If the prompt doesn't show up, start the app in command line to grab the electro
 
 ```
 # Windows (PowerShell)
-& 'C:\Program Files\Zoo Design Studio\Zoo Design Studio.exe'
+& 'C:\Program Files\Zoo Modeling App\Zoo Modeling App.exe'
 
 # macOS
 /Applications/Zoo\ Modeling\ App.app/Contents/MacOS/Zoo\ Modeling\ App
 
 # Linux
-./Zoo Design Studio-{version}-{arch}-linux.AppImage
+./Zoo Modeling App-{version}-{arch}-linux.AppImage
 ```
 
 #### 4. Publish the release

docs/kcl/appearance.md

@@ -54,7 +54,7 @@ example = extrude(exampleSketch, length = 5)
 // Add color to a revolved solid.
 sketch001 = startSketchOn(XY)
   |> circle(center = [15, 0], radius = 5)
-  |> revolve(angle = 360, axis = Y)
+  |> revolve(angle = 360, axis = 'y')
   |> appearance(color = '#ff0000', metalness = 90, roughness = 90)
 ```
 

docs/kcl/circleThreePoint.md

@@ -10,10 +10,10 @@ Construct a circle derived from 3 points.
 
 ```js
 circleThreePoint(
-  sketchSurfaceOrGroup: SketchOrSurface,
   p1: [number],
   p2: [number],
   p3: [number],
+  sketchSurfaceOrGroup: SketchOrSurface,
   tag?: TagDeclarator,
 ): Sketch
 ```
@@ -23,10 +23,10 @@ circleThreePoint(
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `sketchSurfaceOrGroup` | [`SketchOrSurface`](/docs/kcl/types/SketchOrSurface) | Plane or surface to sketch on. | Yes |
 | `p1` | [`[number]`](/docs/kcl/types/number) | 1st point to derive the circle. | Yes |
 | `p2` | [`[number]`](/docs/kcl/types/number) | 2nd point to derive the circle. | Yes |
 | `p3` | [`[number]`](/docs/kcl/types/number) | 3rd point to derive the circle. | Yes |
+| `sketchSurfaceOrGroup` | [`SketchOrSurface`](/docs/kcl/types/SketchOrSurface) | Plane or surface to sketch on. | Yes |
 | [`tag`](/docs/kcl/types/tag) | [`TagDeclarator`](/docs/kcl/types#tag-declaration) | Identifier for the circle to reference elsewhere. | No |
 
 ### Returns

docs/kcl/consts.md

@@ -9,12 +9,13 @@ layout: manual
 
 ### `std`
 
-- [`X`](/docs/kcl/consts/std-X)
+- [`HALF_TURN`](/docs/kcl/consts/std-HALF_TURN)
+- [`QUARTER_TURN`](/docs/kcl/consts/std-QUARTER_TURN)
+- [`THREE_QUARTER_TURN`](/docs/kcl/consts/std-THREE_QUARTER_TURN)
 - [`XY`](/docs/kcl/consts/std-XY)
 - [`XZ`](/docs/kcl/consts/std-XZ)
-- [`Y`](/docs/kcl/consts/std-Y)
 - [`YZ`](/docs/kcl/consts/std-YZ)
-- [`Z`](/docs/kcl/consts/std-Z)
+- [`ZERO`](/docs/kcl/consts/std-ZERO)
 
 ### `std::math`
 
@@ -22,10 +23,3 @@ layout: manual
 - [`PI`](/docs/kcl/consts/std-math-PI)
 - [`TAU`](/docs/kcl/consts/std-math-TAU)
 
-### `std::turns`
-
-- [`HALF_TURN`](/docs/kcl/consts/std-turns-HALF_TURN)
-- [`QUARTER_TURN`](/docs/kcl/consts/std-turns-QUARTER_TURN)
-- [`THREE_QUARTER_TURN`](/docs/kcl/consts/std-turns-THREE_QUARTER_TURN)
-- [`ZERO`](/docs/kcl/consts/std-turns-ZERO)
-

docs/kcl/consts/std-HALF_TURN.md

@@ -0,0 +1,15 @@
+---
+title: "std::HALF_TURN"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+```js
+std::HALF_TURN: number(deg) = 180deg
+```
+
+

docs/kcl/consts/std-QUARTER_TURN.md

@@ -0,0 +1,15 @@
+---
+title: "std::QUARTER_TURN"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+```js
+std::QUARTER_TURN: number(deg) = 90deg
+```
+
+

docs/kcl/consts/std-THREE_QUARTER_TURN.md

@@ -0,0 +1,15 @@
+---
+title: "std::THREE_QUARTER_TURN"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+```js
+std::THREE_QUARTER_TURN: number(deg) = 270deg
+```
+
+

docs/kcl/consts/std-X.md

@@ -1,15 +0,0 @@
----
-title: "std::X"
-excerpt: ""
-layout: manual
----
-
-
-
-
-
-```js
-std::X
-```
-
-

docs/kcl/consts/std-Z.md

@@ -1,15 +0,0 @@
----
-title: "std::Z"
-excerpt: ""
-layout: manual
----
-
-
-
-
-
-```js
-std::Z
-```
-
-

docs/kcl/consts/std-ZERO.md

@@ -1,5 +1,5 @@
 ---
-title: "std::Y"
+title: "std::ZERO"
 excerpt: ""
 layout: manual
 ---
@@ -9,7 +9,7 @@ layout: manual
 
 
 ```js
-std::Y
+std::ZERO: number = 0
 ```
 
 

docs/kcl/consts/std-math-E.md

@@ -15,7 +15,7 @@ std::math::E: number = 2.71828182845904523536028747135266250_
 ### Examples
 
 ```js
-exampleSketch = startSketchOn(XZ)
+exampleSketch = startSketchOn("XZ")
   |> startProfileAt([0, 0], %)
   |> angledLine({
     angle = 30,

docs/kcl/consts/std-math-PI.md

@@ -17,8 +17,8 @@ std::math::PI: number = 3.14159265358979323846264338327950288_
 ```js
 circumference = 70
 
-exampleSketch = startSketchOn(XZ)
- |> circle(center = [0, 0], radius = circumference / (2 * PI))
+exampleSketch = startSketchOn("XZ")
+ |> circle(center = [0, 0], radius = circumference/ (2 * PI))
 
 example = extrude(exampleSketch, length = 5)
 ```

docs/kcl/consts/std-math-TAU.md

@@ -15,7 +15,7 @@ std::math::TAU: number = 6.28318530717958647692528676655900577_
 ### Examples
 
 ```js
-exampleSketch = startSketchOn(XZ)
+exampleSketch = startSketchOn("XZ")
   |> startProfileAt([0, 0], %)
   |> angledLine({
     angle = 50,

docs/kcl/consts/std-turns-HALF_TURN.md

@@ -1,15 +0,0 @@
----
-title: "std::turns::HALF_TURN"
-excerpt: ""
-layout: manual
----
-
-
-
-
-
-```js
-std::turns::HALF_TURN: number(deg) = 180deg
-```
-
-

docs/kcl/consts/std-turns-QUARTER_TURN.md

@@ -1,15 +0,0 @@
----
-title: "std::turns::QUARTER_TURN"
-excerpt: ""
-layout: manual
----
-
-
-
-
-
-```js
-std::turns::QUARTER_TURN: number(deg) = 90deg
-```
-
-

docs/kcl/consts/std-turns-THREE_QUARTER_TURN.md

@@ -1,15 +0,0 @@
----
-title: "std::turns::THREE_QUARTER_TURN"
-excerpt: ""
-layout: manual
----
-
-
-
-
-
-```js
-std::turns::THREE_QUARTER_TURN: number(deg) = 270deg
-```
-
-

docs/kcl/consts/std-turns-ZERO.md

@@ -1,15 +0,0 @@
----
-title: "std::turns::ZERO"
-excerpt: ""
-layout: manual
----
-
-
-
-
-
-```js
-std::turns::ZERO: number = 0
-```
-
-

docs/kcl/import.md

@@ -12,7 +12,7 @@ Import a CAD file.
 
 For formats lacking unit data (such as STL, OBJ, or PLY files), the default unit of measurement is millimeters. Alternatively you may specify the unit by passing your desired measurement unit in the options parameter. When importing a GLTF file, the bin file will be imported as well. Import paths are relative to the current project directory.
 
-Note: The import command currently only works when using the native Design Studio.
+Note: The import command currently only works when using the native Modeling App.
 
 ```js
 import(

docs/kcl/index.md

@@ -1,6 +1,6 @@
 ---
 title: "KCL Standard Library"
-excerpt: "Documentation for the KCL standard library for the Zoo Design Studio."
+excerpt: "Documentation for the KCL standard library for the Zoo Modeling App."
 layout: manual
 ---
 
@@ -22,22 +22,20 @@ layout: manual
   * [`string`](kcl/types/string)
   * [`tag`](kcl/types/tag)
 * **std**
-  * [`Axis2d`](kcl/types/Axis2d)
-  * [`Axis3d`](kcl/types/Axis3d)
-  * [`Edge`](kcl/types/Edge)
   * [`Face`](kcl/types/Face)
+  * [`HALF_TURN`](kcl/consts/std-HALF_TURN)
   * [`Helix`](kcl/types/Helix)
   * [`Plane`](kcl/types/Plane)
   * [`Point2d`](kcl/types/Point2d)
   * [`Point3d`](kcl/types/Point3d)
+  * [`QUARTER_TURN`](kcl/consts/std-QUARTER_TURN)
   * [`Sketch`](kcl/types/Sketch)
   * [`Solid`](kcl/types/Solid)
-  * [`X`](kcl/consts/std-X)
+  * [`THREE_QUARTER_TURN`](kcl/consts/std-THREE_QUARTER_TURN)
   * [`XY`](kcl/consts/std-XY)
   * [`XZ`](kcl/consts/std-XZ)
-  * [`Y`](kcl/consts/std-Y)
   * [`YZ`](kcl/consts/std-YZ)
-  * [`Z`](kcl/consts/std-Z)
+  * [`ZERO`](kcl/consts/std-ZERO)
   * [`abs`](kcl/abs)
   * [`acos`](kcl/acos)
   * [`angleToMatchLengthX`](kcl/angleToMatchLengthX)
@@ -63,24 +61,23 @@ layout: manual
   * [`bezierCurve`](kcl/bezierCurve)
   * [`ceil`](kcl/ceil)
   * [`chamfer`](kcl/chamfer)
+  * [`circle`](kcl/circle)
   * [`circleThreePoint`](kcl/circleThreePoint)
   * [`close`](kcl/close)
+  * [`cm`](kcl/cm)
   * [`extrude`](kcl/extrude)
   * [`fillet`](kcl/fillet)
   * [`floor`](kcl/floor)
-  * [`fromCm`](kcl/fromCm)
-  * [`fromFt`](kcl/fromFt)
-  * [`fromInches`](kcl/fromInches)
-  * [`fromM`](kcl/fromM)
-  * [`fromMm`](kcl/fromMm)
-  * [`fromYd`](kcl/fromYd)
+  * [`ft`](kcl/ft)
   * [`getCommonEdge`](kcl/getCommonEdge)
   * [`getNextAdjacentEdge`](kcl/getNextAdjacentEdge)
   * [`getOppositeEdge`](kcl/getOppositeEdge)
   * [`getPreviousAdjacentEdge`](kcl/getPreviousAdjacentEdge)
-  * [`helix`](kcl/std-helix)
+  * [`helix`](kcl/helix)
+  * [`helixRevolutions`](kcl/helixRevolutions)
   * [`hole`](kcl/hole)
   * [`hollow`](kcl/hollow)
+  * [`inch`](kcl/inch)
   * [`lastSegX`](kcl/lastSegX)
   * [`lastSegY`](kcl/lastSegY)
   * [`legAngX`](kcl/legAngX)
@@ -92,9 +89,12 @@ layout: manual
   * [`log`](kcl/log)
   * [`log10`](kcl/log10)
   * [`log2`](kcl/log2)
+  * [`m`](kcl/m)
   * [`map`](kcl/map)
   * [`max`](kcl/max)
   * [`min`](kcl/min)
+  * [`mirror2d`](kcl/mirror2d)
+  * [`mm`](kcl/mm)
   * [`offsetPlane`](kcl/offsetPlane)
   * [`patternCircular2d`](kcl/patternCircular2d)
   * [`patternCircular3d`](kcl/patternCircular3d)
@@ -102,6 +102,7 @@ layout: manual
   * [`patternLinear3d`](kcl/patternLinear3d)
   * [`patternTransform`](kcl/patternTransform)
   * [`patternTransform2d`](kcl/patternTransform2d)
+  * [`polar`](kcl/polar)
   * [`polygon`](kcl/polygon)
   * [`pop`](kcl/pop)
   * [`pow`](kcl/pow)
@@ -111,7 +112,7 @@ layout: manual
   * [`push`](kcl/push)
   * [`reduce`](kcl/reduce)
   * [`rem`](kcl/rem)
-  * [`revolve`](kcl/std-revolve)
+  * [`revolve`](kcl/revolve)
   * [`rotate`](kcl/rotate)
   * [`round`](kcl/round)
   * [`scale`](kcl/scale)
@@ -137,19 +138,11 @@ layout: manual
   * [`translate`](kcl/translate)
   * [`xLine`](kcl/xLine)
   * [`yLine`](kcl/yLine)
+  * [`yd`](kcl/yd)
 * **std::math**
   * [`E`](kcl/consts/std-math-E)
   * [`PI`](kcl/consts/std-math-PI)
   * [`TAU`](kcl/consts/std-math-TAU)
   * [`cos`](kcl/std-math-cos)
-  * [`polar`](kcl/std-math-polar)
   * [`sin`](kcl/std-math-sin)
   * [`tan`](kcl/std-math-tan)
-* **std::sketch**
-  * [`circle`](kcl/std-sketch-circle)
-  * [`mirror2d`](kcl/std-sketch-mirror2d)
-* **std::turns**
-  * [`turns::HALF_TURN`](kcl/consts/std-turns-HALF_TURN)
-  * [`turns::QUARTER_TURN`](kcl/consts/std-turns-QUARTER_TURN)
-  * [`turns::THREE_QUARTER_TURN`](kcl/consts/std-turns-THREE_QUARTER_TURN)
-  * [`turns::ZERO`](kcl/consts/std-turns-ZERO)

docs/kcl/known-issues.md

@@ -1,6 +1,6 @@
 ---
 title: "KCL Known Issues"
-excerpt: "Known issues with the KCL standard library for the Zoo Design Studio."
+excerpt: "Known issues with the KCL standard library for the Zoo Modeling App."
 layout: manual
 ---
 

docs/kcl/modules.md

@@ -1,6 +1,6 @@
 ---
 title: "KCL Modules"
-excerpt: "Documentation of modules for the KCL language for the Zoo Design Studio."
+excerpt: "Documentation of modules for the KCL language for the Zoo Modeling App."
 layout: manual
 ---
 
@@ -95,7 +95,7 @@ import "tests/inputs/cube.obj"
 When importing a GLTF file, the bin file will be imported as well.
 
 Import paths are relative to the current project directory. Imports currently only work when
-using the native Design Studio, not in the browser.
+using the native Modeling App, not in the browser.
 
 ### Supported values
 

docs/kcl/settings.md

@@ -1,12 +1,12 @@
 ---
 title: "KCL Settings"
-excerpt: "Documentation of settings for the KCL language and Zoo Design Studio."
+excerpt: "Documentation of settings for the KCL language and Zoo Modeling App."
 layout: manual
 ---
 
 # KCL Settings
 
-There are three levels of settings available in Zoo Design Studio:
+There are three levels of settings available in the KittyCAD modeling application:
 
 1. [User Settings](/docs/kcl/settings/user): Global settings that apply to all projects, stored in `user.toml`
 2. [Project Settings](/docs/kcl/settings/project): Settings specific to a project, stored in `project.toml`
@@ -14,7 +14,7 @@ There are three levels of settings available in Zoo Design Studio:
 
 ## Configuration Files
 
-Zoo Design Studio uses TOML files for configuration:
+The KittyCAD modeling app uses TOML files for configuration:
 
 * **User Settings**: `user.toml` - See [complete documentation](/docs/kcl/settings/user)
 * **Project Settings**: `project.toml` - See [complete documentation](/docs/kcl/settings/project)

docs/kcl/settings/project.md

@@ -35,7 +35,7 @@ base_unit = "in"
 
 #### app
 
-The settings for the Design Studio.
+The settings for the modeling app.
 
 
 **Default:** None

docs/kcl/settings/user.md

@@ -37,7 +37,7 @@ text_wrapping = false
 
 #### app
 
-The settings for the Design Studio.
+The settings for the modeling app.
 
 
 **Default:** None
@@ -96,7 +96,7 @@ Permanently dismiss the banner warning to download the desktop app. This setting
 
 ##### stream_idle_mode
 
-When the user is idle, teardown the stream after some time.
+When the user is idle, and this is true, the stream will be torn down.
 
 
 **Default:** None

docs/kcl/startSketchOn.md

@@ -146,7 +146,7 @@ exampleSketch = startSketchOn(XY)
   |> line(end = [-2, 0])
   |> close()
 
-example = revolve(exampleSketch, axis = Y, angle = 180)
+example = revolve(exampleSketch, axis = 'y', angle = 180)
 
 exampleSketch002 = startSketchOn(example, 'end')
   |> startProfileAt([4.5, -5], %)
@@ -177,7 +177,7 @@ exampleSketch = startSketchOn(XY)
 
 example = revolve(
   exampleSketch,
-  axis = Y,
+  axis = 'y',
   angle = 180,
   tagEnd = $end01,
 )

docs/kcl/std-math-cos.md

@@ -9,7 +9,7 @@ Compute the cosine of a number (in radians).
 
 
 ```js
-cos(@num: number(rad)): number(_)
+cos(num: number(rad)): number(_)
 ```
 
 
@@ -27,7 +27,7 @@ cos(@num: number(rad)): number(_)
 ### Examples
 
 ```js
-exampleSketch = startSketchOn(XZ)
+exampleSketch = startSketchOn("XZ")
   |> startProfileAt([0, 0], %)
   |> angledLine({
     angle = 30,

docs/kcl/std-math-sin.md

@@ -9,7 +9,7 @@ Compute the sine of a number (in radians).
 
 
 ```js
-sin(@num: number(rad)): number(_)
+sin(num: number(rad)): number(_)
 ```
 
 
@@ -27,7 +27,7 @@ sin(@num: number(rad)): number(_)
 ### Examples
 
 ```js
-exampleSketch = startSketchOn(XZ)
+exampleSketch = startSketchOn("XZ")
   |> startProfileAt([0, 0], %)
   |> angledLine({
     angle = 50,

docs/kcl/std-math-tan.md

@@ -9,7 +9,7 @@ Compute the tangent of a number (in radians).
 
 
 ```js
-tan(@num: number(rad)): number(_)
+tan(num: number(rad)): number(_)
 ```
 
 
@@ -27,7 +27,7 @@ tan(@num: number(rad)): number(_)
 ### Examples
 
 ```js
-exampleSketch = startSketchOn(XZ)
+exampleSketch = startSketchOn("XZ")
   |> startProfileAt([0, 0], %)
   |> angledLine({
     angle = 50,

docs/kcl/sweep.md

@@ -74,7 +74,7 @@ helixPath = helix(
   revolutions = 4,
   length = 10,
   radius = 5,
-  axis = Z,
+  axis = 'Z',
 )
 
 // Create a spring by sweeping around the helix path.

docs/kcl/types.md

@@ -1,6 +1,6 @@
 ---
 title: "KCL Types"
-excerpt: "Documentation of types for the KCL standard library for the Zoo Design Studio."
+excerpt: "Documentation of types for the KCL standard library for the Zoo Modeling App."
 layout: manual
 ---
 

docs/kcl/types/Axis2d.md

@@ -1,12 +0,0 @@
----
-title: "std::Axis2d"
-excerpt: "An infinite line in 2d space."
-layout: manual
----
-
-An infinite line in 2d space.
-
-
-
-
-

docs/kcl/types/Axis3d.md

@@ -1,12 +0,0 @@
----
-title: "std::Axis3d"
-excerpt: "An infinite line in 3d space."
-layout: manual
----
-
-An infinite line in 3d space.
-
-
-
-
-

docs/kcl/types/Edge.md

@@ -1,12 +0,0 @@
----
-title: "std::Edge"
-excerpt: "The edge of a solid."
-layout: manual
----
-
-The edge of a solid.
-
-
-
-
-

docs/kcl/types/ExtrudeSurface.md

@@ -28,7 +28,7 @@ An extrude plane.
 | `faceId` |[`string`](/docs/kcl/types/string)| The face id for the extrude plane. | No |
 | [`tag`](/docs/kcl/types/tag) |[`TagDeclarator`](/docs/kcl/types#tag-declaration)| The tag. | No |
 | `id` |[`string`](/docs/kcl/types/string)| The id of the geometry. | No |
-| `sourceRange` |`[integer, integer, integer]`| The source range. | No |
+| `sourceRange` |[`SourceRange`](/docs/kcl/types/SourceRange)| The source range. | No |
 
 
 ----
@@ -48,7 +48,7 @@ An extruded arc.
 | `faceId` |[`string`](/docs/kcl/types/string)| The face id for the extrude plane. | No |
 | [`tag`](/docs/kcl/types/tag) |[`TagDeclarator`](/docs/kcl/types#tag-declaration)| The tag. | No |
 | `id` |[`string`](/docs/kcl/types/string)| The id of the geometry. | No |
-| `sourceRange` |`[integer, integer, integer]`| The source range. | No |
+| `sourceRange` |[`SourceRange`](/docs/kcl/types/SourceRange)| The source range. | No |
 
 
 ----
@@ -68,7 +68,7 @@ Geometry metadata.
 | `faceId` |[`string`](/docs/kcl/types/string)| The id for the chamfer surface. | No |
 | [`tag`](/docs/kcl/types/tag) |[`TagDeclarator`](/docs/kcl/types#tag-declaration)| The tag. | No |
 | `id` |[`string`](/docs/kcl/types/string)| The id of the geometry. | No |
-| `sourceRange` |`[integer, integer, integer]`| The source range. | No |
+| `sourceRange` |[`SourceRange`](/docs/kcl/types/SourceRange)| The source range. | No |
 
 
 ----
@@ -88,7 +88,7 @@ Geometry metadata.
 | `faceId` |[`string`](/docs/kcl/types/string)| The id for the fillet surface. | No |
 | [`tag`](/docs/kcl/types/tag) |[`TagDeclarator`](/docs/kcl/types#tag-declaration)| The tag. | No |
 | `id` |[`string`](/docs/kcl/types/string)| The id of the geometry. | No |
-| `sourceRange` |`[integer, integer, integer]`| The source range. | No |
+| `sourceRange` |[`SourceRange`](/docs/kcl/types/SourceRange)| The source range. | No |
 
 
 ----

docs/kcl/types/GeoMeta.md

@@ -17,6 +17,6 @@ Geometry metadata.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `id` |[`string`](/docs/kcl/types/string)| The id of the geometry. | No |
-| `sourceRange` |`[integer, integer, integer]`| The source range. | No |
+| `sourceRange` |[`SourceRange`](/docs/kcl/types/SourceRange)| The source range. | No |
 
 

docs/kcl/types/HelixValue.md

@@ -17,11 +17,10 @@ A helix.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `value` |[`string`](/docs/kcl/types/string)| The id of the helix. | No |
-| `artifactId` |[`string`](/docs/kcl/types/string)| The artifact ID. | No |
+| `artifactId` |[`ArtifactId`](/docs/kcl/types/ArtifactId)| The artifact ID. | No |
 | `revolutions` |[`number`](/docs/kcl/types/number)| Number of revolutions. | No |
 | `angleStart` |[`number`](/docs/kcl/types/number)| Start angle (in degrees). | No |
 | `ccw` |`boolean`| Is the helix rotation counter clockwise? | No |
-| `cylinderId` |[`string`](/docs/kcl/types/string)| The cylinder the helix was created on. | No |
 | `units` |[`UnitLen`](/docs/kcl/types/UnitLen)| A unit of length. | No |
 
 

docs/kcl/types/KclValue.md

@@ -285,7 +285,7 @@ Data for an imported geometry.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: `Module`|  | No |
-| `value` |`integer`| Identifier of a source file.  Uses a u32 to keep the size small. | No |
+| `value` |[`ModuleId`](/docs/kcl/types/ModuleId)| Identifier of a source file.  Uses a u32 to keep the size small. | No |
 
 
 ----

docs/kcl/types/Point2d.md

@@ -10,8 +10,8 @@ A point in two dimensional space.
 type Point2d = [number; 2]
 ```
 
-[`Point2d`](/docs/kcl/types/Point2d) is an alias for a two-element array of [number](/docs/kcl/types/number)s. To write a value
-with type [`Point2d`](/docs/kcl/types/Point2d), use an array, e.g., `[0, 0]` or `[5.0, 3.14]`.
+`Point2d` is an alias for a two-element array of [number](/docs/kcl/types/number)s. To write a value
+with type `Point2d`, use an array, e.g., `[0, 0]` or `[5.0, 3.14]`.
 
 
 

docs/kcl/types/Point3d.md

@@ -10,8 +10,8 @@ A point in three dimensional space.
 type Point3d = [number; 3]
 ```
 
-[`Point3d`](/docs/kcl/types/Point3d) is an alias for a three-element array of [number](/docs/kcl/types/number)s. To write a value
-with type [`Point3d`](/docs/kcl/types/Point3d), use an array, e.g., `[0, 0, 0]` or `[5.0, 3.14, 6.8]`.
+`Point3d` is an alias for a three-element array of [number](/docs/kcl/types/number)s. To write a value
+with type `Point3d`, use an array, e.g., `[0, 0, 0]` or `[5.0, 3.14, 6.8]`.
 
 
 

docs/kcl/types/PolarCoordsData.md

@@ -0,0 +1,22 @@
+---
+title: "PolarCoordsData"
+excerpt: "Data for polar coordinates."
+layout: manual
+---
+
+Data for polar coordinates.
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `angle` |[`number`](/docs/kcl/types/number)| The angle of the line (in degrees). | No |
+| `length` |[`TyF64`](/docs/kcl/types/TyF64)| The length of the line. | No |
+
+

docs/kcl/types/Sketch.md

@@ -17,7 +17,7 @@ mySketch = startSketchOn('XY')
     |> close()
 ```
 
-The `mySketch` variable will be an executed [`Sketch`](/docs/kcl/types/Sketch) object. Executed being past
+The `mySketch` variable will be an executed `Sketch` object. Executed being past
 tense, because the engine has already executed the commands to create the sketch.
 
 The previous sketch commands will never be executed again, in this case.

docs/kcl/types/SketchSurface.md

@@ -25,7 +25,7 @@ A sketch type.
 |----------|------|-------------|----------|
 | `type` |enum: `plane`|  | No |
 | `id` |[`string`](/docs/kcl/types/string)| The id of the plane. | No |
-| `artifactId` |[`string`](/docs/kcl/types/string)| The artifact ID. | No |
+| `artifactId` |[`ArtifactId`](/docs/kcl/types/ArtifactId)| The artifact ID. | No |
 | `value` |[`PlaneType`](/docs/kcl/types/PlaneType)| Type for a plane. | No |
 | `origin` |[`Point3d`](/docs/kcl/types/Point3d)| Origin of the plane. | No |
 | `xAxis` |[`Point3d`](/docs/kcl/types/Point3d)| What should the plane's X axis be? | No |
@@ -49,7 +49,7 @@ A face.
 |----------|------|-------------|----------|
 | `type` |enum: `face`|  | No |
 | `id` |[`string`](/docs/kcl/types/string)| The id of the face. | No |
-| `artifactId` |[`string`](/docs/kcl/types/string)| The artifact ID. | No |
+| `artifactId` |[`ArtifactId`](/docs/kcl/types/ArtifactId)| The artifact ID. | No |
 | `value` |[`string`](/docs/kcl/types/string)| The tag of the face. | No |
 | `xAxis` |[`Point3d`](/docs/kcl/types/Point3d)| What should the face's X axis be? | No |
 | `yAxis` |[`Point3d`](/docs/kcl/types/Point3d)| What should the face's Y axis be? | No |

docs/kcl/types/Solid.md

@@ -18,7 +18,7 @@ myPart = startSketchOn('XY')
     |> extrude(length = 6)
 ```
 
-The `myPart` variable will be an executed [`Solid`](/docs/kcl/types/Solid) object. Executed being past
+The `myPart` variable will be an executed `Solid` object. Executed being past
 tense, because the engine has already executed the commands to create the solid.
 
 The previous solid commands will never be executed again, in this case.

docs/kcl/types/SourceRange.md

@@ -0,0 +1,15 @@
+---
+title: "SourceRange"
+excerpt: ""
+layout: manual
+---
+
+
+**Type:** `integer` (`uint`)
+
+
+
+
+
+
+

docs/kcl/types/TyF64.md

@@ -5,11 +5,17 @@ layout: manual
 ---
 
 
-**Type:** [`number`](/docs/kcl/types/number) (`double`)
+**Type:** `object`
 
 
 
 
 
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `n` |[`number`](/docs/kcl/types/number)|  | No |
+| `ty` |[`NumericType`](/docs/kcl/types/NumericType)|  | No |
 
 

e2e/playwright/app-header-tests.spec.ts

@@ -1,4 +1,4 @@
-import { expect, test } from '@e2e/playwright/zoo-test'
+import { test, expect } from './zoo-test'
 
 test.describe('Electron app header tests', () => {
   test(

e2e/playwright/basic-sketch.spec.ts

@@ -1,14 +1,13 @@
-import type { Page } from '@playwright/test'
-
-import type { HomePageFixture } from '@e2e/playwright/fixtures/homePageFixture'
+import { Page } from '@playwright/test'
+import { test, expect } from './zoo-test'
 import {
-  PERSIST_MODELING_CONTEXT,
+  getUtils,
   TEST_COLORS,
   commonPoints,
-  getUtils,
+  PERSIST_MODELING_CONTEXT,
   orRunWhenFullSuiteEnabled,
-} from '@e2e/playwright/test-utils'
-import { expect, test } from '@e2e/playwright/zoo-test'
+} from './test-utils'
+import { HomePageFixture } from './fixtures/homePageFixture'
 
 test.setTimeout(120000)
 
@@ -86,7 +85,7 @@ async function doBasicSketch(
   await page.mouse.click(startXPx, 500 - PUR * 20)
   if (openPanes.includes('code')) {
     await expect(u.codeLocator)
-      .toHaveText(`@settings(defaultLengthUnit = in)sketch001 = startSketchOn(XZ)profile001 = startProfileAt(${
+      .toHaveText(`@settings(defaultLengthUnit = in)sketch001 = startSketchOn('XZ')profile001 = startProfileAt(${
       commonPoints.startAt
     }, sketch001)
   |> xLine(length = ${commonPoints.num1})
@@ -120,7 +119,10 @@ async function doBasicSketch(
   await page.waitForTimeout(100)
 
   if (openPanes.includes('code')) {
-    expect(await u.getGreatestPixDiff(line1, TEST_COLORS.BLUE)).toBeLessThan(3)
+    await expect(
+      await u.getGreatestPixDiff(line1, TEST_COLORS.BLUE)
+    ).toBeLessThan(3)
+    await expect(await u.getGreatestPixDiff(line1, [0, 0, 255])).toBeLessThan(3)
   }
 
   // hold down shift
@@ -143,7 +145,7 @@ async function doBasicSketch(
   // Open the code pane.
   await u.openKclCodePanel()
   await expect(u.codeLocator)
-    .toHaveText(`@settings(defaultLengthUnit = in)sketch001 = startSketchOn(XZ)profile001 = startProfileAt(${
+    .toHaveText(`@settings(defaultLengthUnit = in)sketch001 = startSketchOn('XZ')profile001 = startProfileAt(${
     commonPoints.startAt
   }, sketch001)
   |> xLine(length = ${commonPoints.num1}, tag = $seg01)

e2e/playwright/boolean.spec.ts

@@ -1,119 +0,0 @@
-import fs from 'node:fs/promises'
-import path from 'node:path'
-
-import { expect, test } from '@e2e/playwright/zoo-test'
-
-test.describe('Point and click for boolean workflows', () => {
-  // Boolean operations to test
-  const booleanOperations = [
-    {
-      name: 'union',
-      code: 'union([extrude001, extrude006])',
-    },
-    {
-      name: 'subtract',
-      code: 'subtract([extrude001], tools = [extrude006])',
-    },
-    {
-      name: 'intersect',
-      code: 'intersect([extrude001, extrude006])',
-    },
-  ] as const
-  for (let i = 0; i < booleanOperations.length; i++) {
-    const operation = booleanOperations[i]
-    const operationName = operation.name
-    const commandName = `Boolean ${
-      operationName.charAt(0).toUpperCase() + operationName.slice(1)
-    }`
-    test(`Create boolean operation -- ${operationName}`, async ({
-      context,
-      homePage,
-      cmdBar,
-      editor,
-      toolbar,
-      scene,
-      page,
-    }) => {
-      const file = await fs.readFile(
-        path.resolve(
-          __dirname,
-          '../../',
-          './rust/kcl-lib/e2e/executor/inputs/boolean-setup-with-sketch-on-faces.kcl'
-        ),
-        'utf-8'
-      )
-      await context.addInitScript((file) => {
-        localStorage.setItem('persistCode', file)
-      }, file)
-      await homePage.goToModelingScene()
-      await scene.settled(cmdBar)
-
-      // Test coordinates for selection - these might need adjustment based on actual scene layout
-      const cylinderPoint = { x: 592, y: 174 }
-      const secondObjectPoint = { x: 683, y: 273 }
-
-      // Create mouse helpers for selecting objects
-      const [clickFirstObject] = scene.makeMouseHelpers(
-        cylinderPoint.x,
-        cylinderPoint.y,
-        { steps: 10 }
-      )
-      const [clickSecondObject] = scene.makeMouseHelpers(
-        secondObjectPoint.x,
-        secondObjectPoint.y,
-        { steps: 10 }
-      )
-
-      await test.step(`Test ${operationName} operation`, async () => {
-        // Click the boolean operation button in the toolbar
-        await toolbar.selectBoolean(operationName)
-
-        // Verify command bar is showing the right command
-        await expect(cmdBar.page.getByTestId('command-name')).toContainText(
-          commandName
-        )
-
-        // Select first object in the scene, expect there to be a pixel diff from the selection color change
-        await clickFirstObject({ pixelDiff: 50 })
-        await page.waitForTimeout(1000)
-
-        // For subtract, we need to proceed to the next step before selecting the second object
-        if (operationName !== 'subtract') {
-          // should down shift key to select multiple objects
-          await page.keyboard.down('Shift')
-        }
-
-        // Select second object
-        await clickSecondObject({ pixelDiff: 50 })
-
-        await page.waitForTimeout(1000)
-
-        // Confirm the operation in the command bar
-        await cmdBar.progressCmdBar()
-
-        if (operationName === 'union' || operationName === 'intersect') {
-          await cmdBar.expectState({
-            stage: 'review',
-            headerArguments: {
-              Solids: '2 paths',
-            },
-            commandName,
-          })
-        } else if (operationName === 'subtract') {
-          await cmdBar.expectState({
-            stage: 'review',
-            headerArguments: {
-              Tool: '1 path',
-              Target: '1 path',
-            },
-            commandName,
-          })
-        }
-
-        await cmdBar.submit()
-
-        await editor.expectEditor.toContain(operation.code)
-      })
-    })
-  }
-})

e2e/playwright/can-create-sketches-on-all-planes-and-their-back-sides.spec.ts

@@ -1,12 +1,10 @@
-import type { Page } from '@playwright/test'
-import type { EngineCommand } from '@src/lang/std/artifactGraph'
-import { uuidv4 } from '@src/lib/utils'
-
-import type { HomePageFixture } from '@e2e/playwright/fixtures/homePageFixture'
-import type { SceneFixture } from '@e2e/playwright/fixtures/sceneFixture'
-import type { ToolbarFixture } from '@e2e/playwright/fixtures/toolbarFixture'
-import { getUtils } from '@e2e/playwright/test-utils'
-import { expect, test } from '@e2e/playwright/zoo-test'
+import { Page } from '@playwright/test'
+import { test, expect } from './zoo-test'
+import { HomePageFixture } from './fixtures/homePageFixture'
+import { getUtils } from './test-utils'
+import { EngineCommand } from 'lang/std/artifactGraph'
+import { uuidv4 } from 'lib/utils'
+import { SceneFixture } from './fixtures/sceneFixture'
 
 test.describe(
   'Can create sketches on all planes and their back sides',
@@ -16,7 +14,6 @@ test.describe(
       page: Page,
       homePage: HomePageFixture,
       scene: SceneFixture,
-      toolbar: ToolbarFixture,
       plane: string,
       clickCoords: { x: number; y: number }
     ) => {
@@ -49,7 +46,7 @@ test.describe(
         },
       }
 
-      const code = `@settings(defaultLengthUnit = in)sketch001 = startSketchOn(${plane})profile001 = startProfileAt([0.91, -1.22], sketch001)`
+      const code = `@settings(defaultLengthUnit = in)sketch001 = startSketchOn('${plane}')profile001 = startProfileAt([0.91, -1.22], sketch001)`
 
       await u.openDebugPanel()
 
@@ -61,12 +58,9 @@ test.describe(
       await u.sendCustomCmd(updateCamCommand)
 
       await u.closeDebugPanel()
-
       await page.mouse.click(clickCoords.x, clickCoords.y)
       await page.waitForTimeout(600) // wait for animation
 
-      await toolbar.waitUntilSketchingReady()
-
       await expect(
         page.getByRole('button', { name: 'line Line', exact: true })
       ).toBeVisible()
@@ -122,12 +116,11 @@ test.describe(
     ]
 
     for (const config of planeConfigs) {
-      test(config.plane, async ({ page, homePage, scene, toolbar }) => {
+      test(config.plane, async ({ page, homePage, scene }) => {
         await sketchOnPlaneAndBackSideTest(
           page,
           homePage,
           scene,
-          toolbar,
           config.plane,
           config.coords
         )

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

@@ -1,21 +1,19 @@
-import { bracket } from '@src/lib/exampleKcl'
-import fsp from 'fs/promises'
-import { join } from 'path'
-
-import { TEST_CODE_LONG_WITH_ERROR_OUT_OF_VIEW } from '@e2e/playwright/storageStates'
+import { test, expect } from './zoo-test'
 import {
-  executorInputPath,
-  getUtils,
   orRunWhenFullSuiteEnabled,
-} from '@e2e/playwright/test-utils'
-import { expect, test } from '@e2e/playwright/zoo-test'
+  getUtils,
+  executorInputPath,
+} from './test-utils'
+import { join } from 'path'
+import { bracket } from 'lib/exampleKcl'
+import { TEST_CODE_LONG_WITH_ERROR_OUT_OF_VIEW } from './storageStates'
+import fsp from 'fs/promises'
 
 test.describe('Code pane and errors', { tag: ['@skipWin'] }, () => {
   test('Typing KCL errors induces a badge on the code pane button', async ({
     page,
     homePage,
     scene,
-    cmdBar,
   }) => {
     const u = await getUtils(page)
 
@@ -23,21 +21,20 @@ test.describe('Code pane and errors', { tag: ['@skipWin'] }, () => {
     await page.addInitScript(() => {
       localStorage.setItem(
         'persistCode',
-        `@settings(defaultLengthUnit = in)
-// Extruded Triangle
-sketch001 = startSketchOn(XZ)
-  |> startProfileAt([0, 0], %)
-  |> line(end = [10, 0])
-  |> line(end = [-5, 10])
-  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-  |> close()
-extrude001 = extrude(sketch001, length = 5)`
+        `// Extruded Triangle
+  sketch001 = startSketchOn(XZ)
+    |> startProfileAt([0, 0], %)
+    |> line(end = [10, 0])
+    |> line(end = [-5, 10])
+    |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+    |> close()
+  extrude001 = extrude(sketch001, length = 5)`
       )
     })
 
     await page.setBodyDimensions({ width: 1200, height: 500 })
     await homePage.goToModelingScene()
-    await scene.settled(cmdBar)
+    await scene.waitForExecutionDone()
 
     // Ensure no badge is present
     const codePaneButtonHolder = page.locator('#code-button-holder')
@@ -172,8 +169,6 @@ extrude001 = extrude(sketch001, length = 5)`
     context,
     page,
     homePage,
-    scene,
-    cmdBar,
   }) => {
     // Load the app with the working starter code
     await context.addInitScript((code) => {
@@ -183,7 +178,9 @@ extrude001 = extrude(sketch001, length = 5)`
     await page.setBodyDimensions({ width: 1200, height: 500 })
     await homePage.goToModelingScene()
 
-    await scene.settled(cmdBar)
+    // FIXME: await scene.waitForExecutionDone() does not work. It still fails.
+    // I needed to increase this timeout to get this to pass.
+    await page.waitForTimeout(10000)
 
     // Ensure badge is present
     const codePaneButtonHolder = page.locator('#code-button-holder')

e2e/playwright/command-bar-tests.spec.ts

@@ -1,13 +1,12 @@
-import { KCL_DEFAULT_LENGTH } from '@src/lib/constants'
+import { test, expect } from './zoo-test'
 import * as fsp from 'fs/promises'
-import path, { join } from 'path'
-
 import {
   executorInputPath,
   getUtils,
   orRunWhenFullSuiteEnabled,
-} from '@e2e/playwright/test-utils'
-import { expect, test } from '@e2e/playwright/zoo-test'
+} from './test-utils'
+import { KCL_DEFAULT_LENGTH } from 'lib/constants'
+import path, { join } from 'path'
 
 test.describe('Command bar tests', { tag: ['@skipWin'] }, () => {
   test('Extrude from command bar selects extrude line after', async ({
@@ -317,13 +316,9 @@ test.describe('Command bar tests', { tag: ['@skipWin'] }, () => {
   test('Can switch between sketch tools via command bar', async ({
     page,
     homePage,
-    scene,
-    cmdBar,
-    toolbar,
   }) => {
     await page.setBodyDimensions({ width: 1200, height: 500 })
     await homePage.goToModelingScene()
-    await scene.settled(cmdBar)
 
     const sketchButton = page.getByRole('button', { name: 'Start Sketch' })
     const cmdBarButton = page.getByRole('button', { name: 'Commands' })
@@ -347,9 +342,7 @@ test.describe('Command bar tests', { tag: ['@skipWin'] }, () => {
 
     // Start a sketch
     await sketchButton.click()
-
     await page.mouse.click(700, 200)
-    await toolbar.waitUntilSketchingReady()
 
     // Switch between sketch tools via the command bar
     await expect(lineToolButton).toHaveAttribute('aria-pressed', 'true')
@@ -520,8 +513,7 @@ c = 3 + a`
     await homePage.openProject(projectName)
     // TODO: you probably shouldn't need an engine connection to add a parameter,
     // but you do because all modeling commands have that requirement
-    // Don't use scene.settled here
-    await expect(scene.startEditSketchBtn).toBeEnabled({ timeout: 15_000 })
+    await scene.settled(cmdBar)
 
     await test.step(`Create a parameter via command bar`, async () => {
       await cmdBar.cmdBarOpenBtn.click()
@@ -550,12 +542,7 @@ c = 3 + a`
     )
 
     const newValue = `2 * b + a`
-
     await test.step(`Edit the parameter via command bar`, async () => {
-      // TODO: make the command palette command registration more static, and the enabled state more dynamic
-      // so that we can just open the command palette and know all commands will be there.
-      await expect(scene.startEditSketchBtn).toBeEnabled()
-
       await cmdBar.cmdBarOpenBtn.click()
       await cmdBar.chooseCommand('edit parameter')
       await cmdBar.expectState({

e2e/playwright/copilot-ghost-test.spec.ts

@@ -1,5 +1,5 @@
-import { getUtils } from '@e2e/playwright/test-utils'
-import { expect, test } from '@e2e/playwright/zoo-test'
+import { test, expect } from './zoo-test'
+import { getUtils } from './test-utils'
 
 test.describe('Copilot ghost text', () => {
   // eslint-disable-next-line jest/valid-title

e2e/playwright/debug-pane.spec.ts

@@ -1,5 +1,6 @@
-import { getUtils } from '@e2e/playwright/test-utils'
-import { expect, test } from '@e2e/playwright/zoo-test'
+import { test, expect } from './zoo-test'
+
+import { getUtils } from './test-utils'
 
 function countNewlines(input: string): number {
   let count = 0

e2e/playwright/desktop-export.spec.ts

@@ -1,17 +1,16 @@
-import fsp from 'fs/promises'
+import { test, expect } from './zoo-test'
 import path from 'path'
-
 import {
+  getUtils,
   executorInputPath,
   getPlaywrightDownloadDir,
-  getUtils,
-} from '@e2e/playwright/test-utils'
-import { expect, test } from '@e2e/playwright/zoo-test'
+} from './test-utils'
+import fsp from 'fs/promises'
 
 test(
   'export works on the first try',
   { tag: ['@electron', '@skipLocalEngine'] },
-  async ({ page, context, scene, tronApp, cmdBar }, testInfo) => {
+  async ({ page, context, scene, tronApp }, testInfo) => {
     if (!tronApp) {
       fail()
     }
@@ -32,41 +31,57 @@ test(
     })
     await page.setBodyDimensions({ width: 1200, height: 500 })
 
-    await test.step('on open of project', async () => {
-      // Open the project
-      const projectName = page.getByText(`bracket`)
-      await expect(projectName).toBeVisible()
-      await projectName.click()
-      await scene.settled(cmdBar)
+    page.on('console', console.log)
 
-      // Expect zero errors in gutter
+    await test.step('on open of project', async () => {
+      await expect(page.getByText(`bracket`)).toBeVisible()
+
+      // open the project
+      await page.getByText(`bracket`).click()
+
+      // expect zero errors in guter
       await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
 
-      // Click the export button
+      // export the model
       const exportButton = page.getByTestId('export-pane-button')
       await expect(exportButton).toBeVisible()
+
+      // Wait for the model to finish loading
+      const modelStateIndicator = page.getByTestId(
+        'model-state-indicator-execution-done'
+      )
+      await expect(modelStateIndicator).toBeVisible({ timeout: 60000 })
+
+      const gltfOption = page.getByText('glTF')
+      const submitButton = page.getByText('Confirm Export')
+      const exportingToastMessage = page.getByText(`Exporting...`)
+      const errorToastMessage = page.getByText(`Error while exporting`)
+      const engineErrorToastMessage = page.getByText(`Nothing to export`)
+      const alreadyExportingToastMessage = page.getByText(`Already exporting`)
+      // The open file's name is `main.kcl`, so the export file name should be `main.gltf`
+      const exportFileName = `main.gltf`
+
+      // Click the export button
       await exportButton.click()
 
-      // Select the first format option
-      const gltfOption = cmdBar.selectOption({ name: 'glTF' })
-      const exportFileName = `main.gltf` // source file is named `main.kcl`
       await expect(gltfOption).toBeVisible()
+      await expect(page.getByText('STL')).toBeVisible()
+
       await page.keyboard.press('Enter')
 
       // Click the checkbox
-      const submitButton = page.getByText('Confirm Export')
       await expect(submitButton).toBeVisible()
+
+      await page.waitForTimeout(500)
+
       await page.keyboard.press('Enter')
 
+      // Find the toast.
       // Look out for the toast message
-      const exportingToastMessage = page.getByText(`Exporting...`)
-      const alreadyExportingToastMessage = page.getByText(`Already exporting`)
       await expect(exportingToastMessage).toBeVisible()
       await expect(alreadyExportingToastMessage).not.toBeVisible()
 
-      // Expect it to succeed
-      const errorToastMessage = page.getByText(`Error while exporting`)
-      const engineErrorToastMessage = page.getByText(`Nothing to export`)
+      // Expect it to succeed.
       await expect(errorToastMessage).not.toBeVisible()
       await expect(engineErrorToastMessage).not.toBeVisible()
 
@@ -74,7 +89,6 @@ test(
       await expect(successToastMessage).toBeVisible()
       await expect(exportingToastMessage).not.toBeVisible()
 
-      // Check for the exported file
       const firstFileFullPath = path.resolve(
         getPlaywrightDownloadDir(tronApp.projectDirName),
         exportFileName
@@ -101,50 +115,60 @@ test(
       const u = await getUtils(page)
       await u.openFilePanel()
 
-      // Click on the other file
       const otherKclButton = page.getByRole('button', { name: 'other.kcl' })
+
+      // Click the file
       await otherKclButton.click()
 
       // Close the file pane
       await u.closeFilePanel()
-      await scene.settled(cmdBar)
 
-      // Expect zero errors in gutter
+      // FIXME: await scene.waitForExecutionDone() does not work. The modeling indicator stays in -receive-reliable and not execution done
+      await page.waitForTimeout(10000)
+
+      // expect zero errors in guter
       await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
 
-      // Click the export button
+      // export the model
       const exportButton = page.getByTestId('export-pane-button')
       await expect(exportButton).toBeVisible()
+
+      const gltfOption = page.getByText('glTF')
+      const submitButton = page.getByText('Confirm Export')
+      const exportingToastMessage = page.getByText(`Exporting...`)
+      const errorToastMessage = page.getByText(`Error while exporting`)
+      const engineErrorToastMessage = page.getByText(`Nothing to export`)
+      const alreadyExportingToastMessage = page.getByText(`Already exporting`)
+      // The open file's name is `other.kcl`, so the export file name should be `other.gltf`
+      const exportFileName = `other.gltf`
+
+      // Click the export button
       await exportButton.click()
 
-      // Select the first format option
-      const gltfOption = cmdBar.selectOption({ name: 'glTF' })
-      const exportFileName = `other.gltf` // source file is named `other.kcl`
       await expect(gltfOption).toBeVisible()
+      await expect(page.getByText('STL')).toBeVisible()
+
       await page.keyboard.press('Enter')
 
       // Click the checkbox
-      const submitButton = page.getByText('Confirm Export')
       await expect(submitButton).toBeVisible()
+
       await page.keyboard.press('Enter')
 
+      // Find the toast.
       // Look out for the toast message
-      const exportingToastMessage = page.getByText(`Exporting...`)
-      const alreadyExportingToastMessage = page.getByText(`Already exporting`)
       await expect(exportingToastMessage).toBeVisible()
-      await expect(alreadyExportingToastMessage).not.toBeVisible()
-
-      // Expect it to succeed
-      const errorToastMessage = page.getByText(`Error while exporting`)
-      const engineErrorToastMessage = page.getByText(`Nothing to export`)
-      await expect(errorToastMessage).not.toBeVisible()
-      await expect(engineErrorToastMessage).not.toBeVisible()
 
       const successToastMessage = page.getByText(`Exported successfully`)
-      await expect(successToastMessage).toBeVisible()
-      await expect(exportingToastMessage).not.toBeVisible()
+      await test.step('Check the success toast message shows and nothing else', async () =>
+        Promise.all([
+          expect(alreadyExportingToastMessage).not.toBeVisible(),
+          expect(errorToastMessage).not.toBeVisible(),
+          expect(engineErrorToastMessage).not.toBeVisible(),
+          expect(successToastMessage).toBeVisible(),
+          expect(exportingToastMessage).not.toBeVisible(),
+        ]))
 
-      // Check for the exported file=
       const secondFileFullPath = path.resolve(
         getPlaywrightDownloadDir(tronApp.projectDirName),
         exportFileName

e2e/playwright/editor-tests.spec.ts

@@ -1,14 +1,14 @@
-import { uuidv4 } from '@src/lib/utils'
+import { test, expect } from './zoo-test'
 import fsp from 'fs/promises'
-import { join } from 'path'
-
+import { uuidv4 } from 'lib/utils'
 import {
-  TEST_COLORS,
   executorInputPath,
   getUtils,
   orRunWhenFullSuiteEnabled,
-} from '@e2e/playwright/test-utils'
-import { expect, test } from '@e2e/playwright/zoo-test'
+  TEST_COLORS,
+} from './test-utils'
+
+import { join } from 'path'
 
 test.describe('Editor tests', { tag: ['@skipWin'] }, () => {
   test('can comment out code with ctrl+/', async ({ page, homePage }) => {
@@ -34,7 +34,7 @@ test.describe('Editor tests', { tag: ['@skipWin'] }, () => {
 
     await expect(page.locator('.cm-content')).toHaveText(
       `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XY)
+sketch001 = startSketchOn('XY')
   |> startProfileAt([-10, -10], %)
   |> line(end = [20, 0])
   |> line(end = [0, 20])
@@ -49,7 +49,7 @@ sketch001 = startSketchOn(XY)
 
     await expect(page.locator('.cm-content')).toHaveText(
       `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XY)
+sketch001 = startSketchOn('XY')
   |> startProfileAt([-10, -10], %)
   |> line(end = [20, 0])
   |> line(end = [0, 20])
@@ -78,14 +78,12 @@ sketch001 = startSketchOn(XY)
 
     // Ensure we execute the first time.
     await u.openDebugPanel()
-    await expect
-      .poll(() =>
-        page.locator('[data-receive-command-type="scene_clear_all"]').count()
-      )
-      .toBe(1)
-    await expect
-      .poll(() => page.locator('[data-message-type="execution-done"]').count())
-      .toBe(2)
+    await expect(
+      page.locator('[data-receive-command-type="scene_clear_all"]')
+    ).toHaveCount(1)
+    await expect(
+      page.locator('[data-message-type="execution-done"]')
+    ).toHaveCount(2)
 
     // Add whitespace to the end of the code.
     await u.codeLocator.click()
@@ -112,14 +110,12 @@ sketch001 = startSketchOn(XY)
   test('ensure we use the cache, and do not clear on append', async ({
     homePage,
     page,
-    scene,
-    cmdBar,
   }) => {
     const u = await getUtils(page)
     await page.setBodyDimensions({ width: 1000, height: 500 })
 
     await homePage.goToModelingScene()
-    await scene.settled(cmdBar)
+    await u.waitForPageLoad()
 
     await u.codeLocator.click()
     await page.keyboard.type(`sketch001 = startSketchOn(XY)
@@ -188,7 +184,7 @@ sketch001 = startSketchOn(XY)
 
     await expect(page.locator('.cm-content')).toHaveText(
       `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XY)
+sketch001 = startSketchOn('XY')
   |> startProfileAt([-10, -10], %)
   |> line(end = [20, 0])
   |> line(end = [0, 20])
@@ -239,7 +235,7 @@ sketch001 = startSketchOn(XY)
 
     await expect(page.locator('.cm-content')).toHaveText(
       `@settings(defaultLengthUnit = in)
-sketch_001 = startSketchOn(XY)
+sketch_001 = startSketchOn('XY')
   |> startProfileAt([-10, -10], %)
   |> line(end = [20, 0])
   |> line(end = [0, 20])
@@ -483,7 +479,6 @@ sketch_001 = startSketchOn(XY)
   test('if you write kcl with lint errors you get lints', async ({
     page,
     homePage,
-    scene,
   }) => {
     const u = await getUtils(page)
     await page.setBodyDimensions({ width: 1000, height: 500 })
@@ -503,7 +498,10 @@ sketch_001 = startSketchOn(XY)
     await page.keyboard.press('ArrowLeft')
     await page.keyboard.press('ArrowRight')
 
-    await scene.connectionEstablished()
+    // FIXME: lsp errors do not propagate to the frontend until engine is connected and code is executed
+    // This timeout is to wait for engine connection. LSP and code execution errors should be handled differently
+    // LSP can emit errors as fast as it waits and show them in the editor
+    await page.waitForTimeout(10000)
 
     // error in guter
     await expect(page.locator('.cm-lint-marker-info').first()).toBeVisible()
@@ -827,7 +825,7 @@ sketch_001 = startSketchOn(XY)
 
       await expect(page.locator('.cm-content')).toHaveText(
         `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XZ)
+sketch001 = startSketchOn('XZ')
         |> startProfileAt([3.14, 12], %)
         |> xLine(%, length = 5) // lin`.replaceAll('\n', '')
       )
@@ -902,7 +900,7 @@ sketch001 = startSketchOn(XZ)
 
       await expect(page.locator('.cm-content')).toHaveText(
         `@settings(defaultLengthUnit = in)
-sketch001 = startSketchOn(XZ)
+sketch001 = startSketchOn('XZ')
         |> startProfileAt([3.14, 12], %)
         |> xLine(%, length = 5) // lin`.replaceAll('\n', '')
       )
@@ -989,13 +987,12 @@ sketch001 = startSketchOn(XZ)
   test(
     'Can undo a sketch modification with ctrl+z',
     { tag: ['@skipWin'] },
-    async ({ page, homePage, editor }) => {
+    async ({ page, homePage }) => {
       const u = await getUtils(page)
       await page.addInitScript(async () => {
         localStorage.setItem(
           'persistCode',
-          `@settings(defaultLengthUnit=in)
-sketch001 = startSketchOn(XZ)
+          `sketch001 = startSketchOn(XZ)
   |> startProfileAt([4.61, -10.01], %)
   |> line(end = [12.73, -0.09])
   |> tangentialArcTo([24.95, -0.38], %)
@@ -1085,45 +1082,41 @@ sketch001 = startSketchOn(XZ)
       await expect(page.locator('.cm-content')).not.toHaveText(prevContent)
 
       // expect the code to have changed
-      await editor.expectEditor.toContain(
-        `sketch001 = startSketchOn(XZ)
+      await expect(page.locator('.cm-content'))
+        .toHaveText(`sketch001 = startSketchOn(XZ)
     |> startProfileAt([2.71, -2.71], %)
     |> line(end = [15.4, -2.78])
     |> tangentialArcTo([27.6, -3.05], %)
     |> close()
-    |> extrude(length = 5)`,
-        { shouldNormalise: true }
-      )
+    |> extrude(length = 5)
+  `)
 
       // Hit undo
       await page.keyboard.down('Control')
       await page.keyboard.press('KeyZ')
       await page.keyboard.up('Control')
 
-      await editor.expectEditor.toContain(
-        `sketch001 = startSketchOn(XZ)
+      await expect(page.locator('.cm-content'))
+        .toHaveText(`sketch001 = startSketchOn(XZ)
     |> startProfileAt([2.71, -2.71], %)
     |> line(end = [15.4, -2.78])
     |> tangentialArcTo([24.95, -0.38], %)
     |> close()
-    |> extrude(length = 5)`,
-        { shouldNormalise: true }
-      )
+    |> extrude(length = 5)`)
 
       // Hit undo again.
       await page.keyboard.down('Control')
       await page.keyboard.press('KeyZ')
       await page.keyboard.up('Control')
 
-      await editor.expectEditor.toContain(
-        `sketch001 = startSketchOn(XZ)
+      await expect(page.locator('.cm-content'))
+        .toHaveText(`sketch001 = startSketchOn(XZ)
     |> startProfileAt([2.71, -2.71], %)
     |> line(end = [12.73, -0.09])
     |> tangentialArcTo([24.95, -0.38], %)
     |> close()
-    |> extrude(length = 5)`,
-        { shouldNormalise: true }
-      )
+    |> extrude(length = 5)
+  `)
 
       // Hit undo again.
       await page.keyboard.down('Control')
@@ -1131,15 +1124,13 @@ sketch001 = startSketchOn(XZ)
       await page.keyboard.up('Control')
 
       await page.waitForTimeout(100)
-      await editor.expectEditor.toContain(
-        `sketch001 = startSketchOn(XZ)
-    |> startProfileAt([4.61, -10.01], %)
-    |> line(end = [12.73, -0.09])
-    |> tangentialArcTo([24.95, -0.38], %)
-    |> close()
-    |> extrude(length = 5)`,
-        { shouldNormalise: true }
-      )
+      await expect(page.locator('.cm-content'))
+        .toHaveText(`sketch001 = startSketchOn(XZ)
+  |> startProfileAt([4.61, -10.01], %)
+  |> line(end = [12.73, -0.09])
+  |> tangentialArcTo([24.95, -0.38], %)
+  |> close()
+  |> extrude(length = 5)`)
     }
   )
 
@@ -1227,130 +1218,4 @@ sketch001 = startSketchOn(XZ)
       })
     }
   )
-
-  test('Rectangle tool panning with middle click', async ({
-    page,
-    homePage,
-    toolbar,
-    scene,
-    cmdBar,
-    editor,
-  }) => {
-    await page.setBodyDimensions({ width: 1200, height: 900 })
-    await homePage.goToModelingScene()
-
-    // wait until scene is ready to be interacted with
-    await scene.connectionEstablished()
-    await scene.settled(cmdBar)
-
-    await page.getByRole('button', { name: 'Start Sketch' }).click()
-
-    // select an axis plane
-    await page.mouse.click(700, 200)
-
-    // Needed as we don't yet have a way to get a signal from the engine that the camera has animated to the sketch plane
-    await page.waitForTimeout(1000)
-
-    const middleMousePan = async (
-      startX: number,
-      startY: number,
-      endX: number,
-      endY: number
-    ) => {
-      const initialCode = await editor.getCurrentCode()
-
-      await page.mouse.click(startX, startY, { button: 'middle' })
-      await page.mouse.move(endX, endY, {
-        steps: 10,
-      })
-
-      // We expect the code to be the same, middle mouse click should not modify the code, only do panning
-      await editor.expectEditor.toBe(initialCode)
-    }
-
-    await test.step(`Verify corner rectangle panning`, async () => {
-      await page.getByTestId('corner-rectangle').click()
-      await middleMousePan(800, 500, 900, 600)
-    })
-
-    await test.step(`Verify center rectangle panning`, async () => {
-      await toolbar.selectCenterRectangle()
-      await middleMousePan(800, 200, 900, 300)
-    })
-  })
-
-  test('Can select lines on the main axis', async ({
-    page,
-    homePage,
-    toolbar,
-  }) => {
-    await page.addInitScript(async () => {
-      localStorage.setItem(
-        'persistCode',
-        `sketch001 = startSketchOn(XZ)
-  profile001 = startProfileAt([100.00, 100.0], sketch001)
-    |> yLine(length = -100.0)
-    |> xLine(length = 200.0)
-    |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-    |> close()`
-      )
-    })
-
-    const width = 1200
-    const height = 800
-    const viewportSize = { width, height }
-    await page.setBodyDimensions(viewportSize)
-
-    await homePage.goToModelingScene()
-
-    const u = await getUtils(page)
-    await u.waitForPageLoad()
-
-    await toolbar.editSketch(0)
-
-    await page.waitForTimeout(1000)
-
-    // Click on the bottom segment that lies on the x axis
-    await page.mouse.click(width * 0.85, height / 2)
-
-    await page.waitForTimeout(1000)
-
-    // Verify segment is selected (you can check for visual indicators or state)
-    const element = page.locator('[data-overlay-index="1"]')
-    await expect(element).toHaveAttribute('data-overlay-visible', 'true')
-  })
-
-  test(`Only show axis planes when there are no errors`, async ({
-    page,
-    homePage,
-    scene,
-    cmdBar,
-  }) => {
-    await page.addInitScript(async () => {
-      localStorage.setItem(
-        'persistCode',
-        `sketch001 = startSketchOn(XZ)
-    profile001 = circle(sketch001, center = [-100.0, -100.0], radius = 50.0)
-
-    sketch002 = startSketchOn(XZ)
-    profile002 = circle(sketch002, center = [-100.0, 100.0], radius = 50.0)
-    extrude001 = extrude(profile002, length = 0)` // length = 0 is causing the error
-      )
-    })
-
-    const viewportSize = { width: 1200, height: 800 }
-    await page.setBodyDimensions(viewportSize)
-
-    await homePage.goToModelingScene()
-
-    await scene.connectionEstablished()
-    await scene.settled(cmdBar)
-
-    await scene.expectPixelColor(
-      TEST_COLORS.DARK_MODE_BKGD,
-      // This is a position where the blue part of the axis plane is visible if its rendered
-      { x: viewportSize.width * 0.75, y: viewportSize.height * 0.2 },
-      15
-    )
-  })
 })

e2e/playwright/feature-tree-pane.spec.ts

@@ -1,8 +1,7 @@
+import { test, expect } from './zoo-test'
 import * as fsp from 'fs/promises'
 import { join } from 'path'
 
-import { expect, test } from '@e2e/playwright/zoo-test'
-
 const FEATURE_TREE_EXAMPLE_CODE = `export fn timesFive(x) {
   return 5 * x
 }
@@ -22,7 +21,7 @@ sketch001 = startSketchOn(XZ)
   |> angledLine([-45, length001], %)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
-revolve001 = revolve(sketch001, axis = X)
+revolve001 = revolve(sketch001, axis = "X")
 triangle()
   |> extrude(length = 30)
 plane001 = offsetPlane(XY, offset = 10)
@@ -64,7 +63,7 @@ test.describe('Feature Tree pane', () => {
   test(
     'User can go to definition and go to function definition',
     { tag: '@electron' },
-    async ({ context, homePage, scene, editor, toolbar, cmdBar, page }) => {
+    async ({ context, homePage, scene, editor, toolbar }) => {
       await context.folderSetupFn(async (dir) => {
         const bracketDir = join(dir, 'test-sample')
         await fsp.mkdir(bracketDir, { recursive: true })
@@ -86,13 +85,9 @@ test.describe('Feature Tree pane', () => {
           sortBy: 'last-modified-desc',
         })
         await homePage.openProject('test-sample')
-        await scene.connectionEstablished()
-        await scene.settled(cmdBar)
-
+        await scene.waitForExecutionDone()
+        await editor.closePane()
         await toolbar.openFeatureTreePane()
-        await expect
-          .poll(() => page.getByText('Feature tree').count())
-          .toBeGreaterThan(1)
       })
 
       async function testViewSource({
@@ -131,7 +126,7 @@ test.describe('Feature Tree pane', () => {
       await testViewSource({
         operationName: 'Revolve',
         operationIndex: 0,
-        expectedActiveLine: 'revolve001 = revolve(sketch001, axis = X)',
+        expectedActiveLine: 'revolve001 = revolve(sketch001, axis = "X")',
       })
       await testViewSource({
         operationName: 'Triangle',
@@ -258,7 +253,7 @@ test.describe('Feature Tree pane', () => {
         sortBy: 'last-modified-desc',
       })
       await homePage.openProject('test-sample')
-      await scene.settled(cmdBar)
+      await scene.waitForExecutionDone()
       await toolbar.openFeatureTreePane()
     })
 
@@ -343,7 +338,7 @@ test.describe('Feature Tree pane', () => {
         sortBy: 'last-modified-desc',
       })
       await homePage.openProject('test-sample')
-      await scene.settled(cmdBar)
+      await scene.waitForExecutionDone()
       await toolbar.openFeatureTreePane()
     })
 
@@ -418,7 +413,8 @@ profile003 = startProfileAt([0, -4.93], sketch001)
     const planeColor: [number, number, number] = [74, 74, 74]
 
     await homePage.openProject('test-sample')
-    await scene.settled(cmdBar)
+    // FIXME: @lf94 has a better way to verify execution completion, in a PR rn
+    await scene.waitForExecutionDone()
 
     await test.step(`Verify we see the sketch`, async () => {
       await scene.expectPixelColor(sketchColor, testPoint, 10)

e2e/playwright/file-tree.spec.ts

@@ -1,25 +1,20 @@
-import { FILE_EXT } from '@src/lib/constants'
-import * as fs from 'fs'
+import { test, expect } from './zoo-test'
 import * as fsp from 'fs/promises'
-import { join } from 'path'
-
+import * as fs from 'fs'
 import {
   createProject,
   executorInputPath,
   getUtils,
   orRunWhenFullSuiteEnabled,
-  runningOnWindows,
-} from '@e2e/playwright/test-utils'
-import { expect, test } from '@e2e/playwright/zoo-test'
+} from './test-utils'
+import { join } from 'path'
+import { FILE_EXT } from 'lib/constants'
 
 test.describe('integrations tests', () => {
   test(
     'Creating a new file or switching file while in sketchMode should exit sketchMode',
     { tag: '@electron' },
     async ({ page, context, homePage, scene, editor, toolbar, cmdBar }) => {
-      if (runningOnWindows()) {
-        test.fixme(orRunWhenFullSuiteEnabled())
-      }
       await context.folderSetupFn(async (dir) => {
         const bracketDir = join(dir, 'test-sample')
         await fsp.mkdir(bracketDir, { recursive: true })
@@ -47,7 +42,6 @@ test.describe('integrations tests', () => {
         await scene.connectionEstablished()
         await scene.settled(cmdBar)
         await clickObj()
-        await page.waitForTimeout(1000)
         await scene.moveNoWhere()
         await editor.expectState({
           activeLines: [
@@ -73,11 +67,11 @@ test.describe('integrations tests', () => {
       })
       await test.step('setup for next assertion', async () => {
         await toolbar.openFile('main.kcl')
-        await page.waitForTimeout(1000)
+
+        await scene.settled(cmdBar)
+
         await clickObj()
-        await page.waitForTimeout(1000)
         await scene.moveNoWhere()
-        await page.waitForTimeout(1000)
         await editor.expectState({
           activeLines: [
             '|>startProfileAt([75.8,317.2],%)//[$startCapTag,$EndCapTag]',
@@ -90,7 +84,7 @@ test.describe('integrations tests', () => {
         await toolbar.expectFileTreeState(['main.kcl', fileName])
       })
       await test.step('check sketch mode is exited when opening a different file', async () => {
-        await toolbar.openFile(fileName)
+        await toolbar.openFile(fileName, { wait: false })
 
         // check we're out of sketch mode
         await expect(toolbar.exitSketchBtn).not.toBeVisible()

e2e/playwright/fixtures/cmdBarFixture.ts

@@ -1,5 +1,5 @@
-import type { Locator, Page, Request, Route, TestInfo } from '@playwright/test'
-import { expect } from '@playwright/test'
+import type { Page, Locator, Route, Request } from '@playwright/test'
+import { expect, TestInfo } from '@playwright/test'
 import * as fs from 'fs'
 import * as path from 'path'
 
@@ -112,16 +112,22 @@ export class CmdBarFixture {
    * and assumes we are past the `pickCommand` step.
    */
   progressCmdBar = async (shouldFuzzProgressMethod = true) => {
-    await this.page.waitForTimeout(2000)
-    const arrowButton = this.page.getByRole('button', {
-      name: 'arrow right Continue',
-    })
-    if (await arrowButton.isVisible()) {
-      await arrowButton.click()
+    // FIXME: Progressing the command bar is a race condition. We have an async useEffect that reports the final state via useCalculateKclExpression. If this does not run quickly enough, it will not "fail" the continue because you can press continue if the state is not ready. E2E tests do not know this.
+    // Wait 1250ms to assume the await executeAst of the KCL input field is finished
+    await this.page.waitForTimeout(1250)
+    if (shouldFuzzProgressMethod || Math.random() > 0.5) {
+      const arrowButton = this.page.getByRole('button', {
+        name: 'arrow right Continue',
+      })
+      if (await arrowButton.isVisible()) {
+        await arrowButton.click()
+      } else {
+        await this.page
+          .getByRole('button', { name: 'checkmark Submit command' })
+          .click()
+      }
     } else {
-      await this.page
-        .getByRole('button', { name: 'checkmark Submit command' })
-        .click()
+      await this.page.keyboard.press('Enter')
     }
   }