Merge branch 'main' into lf94/stream-idle-revamp

2025-04-14 08:56:00 -04:00
parent 3078662d22 160f55ede5
commit d3810b21e3
1052 changed files with 211759 additions and 153641 deletions
--- a/.codespellrc
+++ b/.codespellrc
@ -1,3 +1,3 @@
 [codespell]
-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
+ignore-words-list: crate,everytime,inout,co-ordinate,ot,nwo,atleast,ue,afterall,ser,fromM,FromM
+skip: **/target,node_modules,build,dist,./out,**/Cargo.lock,./docs/kcl/*.md,.package-lock.json,**/package-lock.json,./openapi/*.json,./packages/codemirror-lang-kcl/test/all.test.ts,./public/kcl-samples,./rust/kcl-lib/tests/kcl_samples,tsconfig.tsbuildinfo,./src/lib/machine-api.d.ts
--- a/.github/ci-cd-scripts/playwright-electron.sh
+++ b/.github/ci-cd-scripts/playwright-electron.sh
@ -7,11 +7,11 @@ if [[ ! -f "test-results/.last-run.json" ]]; then
    # If no last run artifact, than run Playwright normally
    echo "run playwright normally"
    if [[ "$3" == *ubuntu* ]]; then
-        xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn test:playwright:electron:ubuntu -- --shard=$1/$2 || true
+        xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run test:playwright:electron:ubuntu -- --shard=$1/$2 || true
    elif [[ "$3" == *windows* ]]; then
-        yarn test:playwright:electron:windows -- --shard=$1/$2 || true
+        npm run test:playwright:electron:windows -- --shard=$1/$2 || true
    elif [[ "$3" == *macos* ]]; then
-        yarn test:playwright:electron:macos  -- --shard=$1/$2 || true
+        npm run test:playwright:electron:macos  -- --shard=$1/$2 || true
    else
        echo "Do not run Playwright. Unable to detect os runtime."
        exit 1
@ -31,11 +31,11 @@ while [[ $retry -le $max_retries ]]; do
            echo "retried=true" >>$GITHUB_OUTPUT
            echo "run playwright with last failed tests and retry $retry"
            if [[ "$3" == *ubuntu* ]]; then
-                xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn test:playwright:electron:ubuntu -- --last-failed || true
+                xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run test:playwright:electron:ubuntu -- --last-failed || true
            elif [[ "$3" == *windows* ]]; then
-                yarn test:playwright:electron:windows -- --last-failed || true
+                npm run test:playwright:electron:windows -- --last-failed || true
            elif [[ "$3" == *macos* ]]; then
-                yarn test:playwright:electron:macos -- --last-failed || true
+                npm run test:playwright:electron:macos -- --last-failed || true
            else
                echo "Do not run playwright. Unable to detect os runtime."
                exit 1
--- a/.github/ci-cd-scripts/start-vector-macos.sh
+++ b/.github/ci-cd-scripts/start-vector-macos.sh
@ -0,0 +1,24 @@
+#!/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 &
--- a/.github/ci-cd-scripts/start-vector-ubuntu.sh
+++ b/.github/ci-cd-scripts/start-vector-ubuntu.sh
@ -0,0 +1,24 @@
+#!/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 &
--- a/.github/workflows/build-and-store-wasm.yml
+++ b/.github/workflows/build-and-store-wasm.yml
@ -13,9 +13,9 @@ jobs:
      - uses: actions/setup-node@v4
        with:
          node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'npm'
      - name: Install dependencies
-        run: yarn
+        run: npm install
      - name: Use correct Rust toolchain
        shell: bash
        run: |
@ -24,7 +24,7 @@ jobs:
        uses: actions-rust-lang/setup-rust-toolchain@v1
        with:
          cache: false # Configured below.
-      - uses: taiki-e/install-action@37bdc826eaedac215f638a96472df572feab0f9b
+      - uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc
        with:
          tool: wasm-pack
      - name: Rust Cache
@ -32,7 +32,7 @@ jobs:
        with:
          workspaces: rust
      - name: build wasm
-        run: yarn build:wasm
+        run: npm run build:wasm


      # Upload the WASM bundle as an artifact
--- a/.github/workflows/build-apps.yml
+++ b/.github/workflows/build-apps.yml
@ -29,9 +29,9 @@ jobs:
      - uses: actions/setup-node@v4
        with:
          node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'npm'

-      - run: yarn install
+      - run: npm install

      - id: filter
        name: Check for Rust changes
@ -77,7 +77,7 @@ jobs:
        with:
          cache: false # Configured below.

-      - uses: taiki-e/install-action@37bdc826eaedac215f638a96472df572feab0f9b
+      - uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc
        if: ${{ steps.wasm.outputs.should-build-wasm == 'true' }}
        with:
          tool: wasm-pack
@ -90,20 +90,20 @@ jobs:

      - name: Run build:wasm
        if: ${{ steps.wasm.outputs.should-build-wasm == 'true' }}
-        run: "yarn build:wasm"
+        run: "npm run build:wasm"

      - name: Set nightly version, product name, release notes, and icons
        if: ${{ env.IS_NIGHTLY == 'true' }}
        run: |
          export VERSION=${GITHUB_REF_NAME#nightly-v}
-          yarn files:set-version
-          yarn files:flip-to-nightly
+          npm run files:set-version
+          npm run files:flip-to-nightly

      - name: Set release version
        if: ${{ env.IS_RELEASE == 'true' }}
        run: |
          export VERSION=${GITHUB_REF_NAME#v}
-          yarn files:set-version
+          npm run files:set-version

      - uses: actions/upload-artifact@v4
        with:
@ -172,16 +172,16 @@ jobs:
        uses: actions/setup-node@v4
        with:
          node-version-file: '.nvmrc'
-          cache: 'yarn' # Set this to npm, yarn or pnpm.
+          cache: 'npm' # Set this to npm, npm or pnpm.

-      - name: yarn install
+      - name: npm install
        # Windows is picky sometimes and fails on fetch. Step takes about ~30s
        uses: nick-fields/retry@v3.0.2
        with:
          shell: bash
          timeout_minutes: 2
          max_attempts: 3
-          command: yarn install
+          command: npm install

      - name: Prepare certificate and variables (Windows only)
        if: ${{ (env.IS_RELEASE == 'true' || env.IS_NIGHTLY == 'true') && matrix.os == 'windows-2022' }}
@ -207,13 +207,20 @@ jobs:
          smctl.exe keypair ls
          C:\Windows\System32\certutil.exe -csp "DigiCert Signing Manager KSP" -key -user
          smksp_cert_sync.exe
+          smctl windows certsync
+        # This last line `smctl windows certsync` was added after windows codesign failures started happening
+        # with nightly-v25.4.10. It looks like `smksp_cert_sync.exe` used to do the sync to the local cert store,
+        # but stopped doing it overnight. This extra call that I randomly got from this azure-related doc page
+        # https://docs.digicert.com/en/digicert-keylocker/code-signing/sign-with-third-party-signing-tools/windows-applications/sign-azure-apps-with-signtool-using-ksp-library.html#sync-certificates--windows-only--618365
+        # seems to be doing that extra sync that we need for scripts/sign-win.js to work.
+        # TODO: we still need to make sign-win.js errors fail the workflow, see issue #6276
        shell: cmd

      - name: Build the app (debug)
        if: ${{ env.IS_RELEASE == 'false' && env.IS_NIGHTLY == 'false' }}
        # electron-builder doesn't have a concept of release vs debug,
        # this is just not doing any codesign or release yml generation, and points to dev infra
-        run: yarn tronb:package:dev
+        run: npm run tronb:package:dev

      - name: Build the app (release)
        if: ${{ env.IS_RELEASE == 'true' || env.IS_NIGHTLY == 'true' }}
@ -233,7 +240,7 @@ jobs:
          shell: bash
          timeout_minutes: 10
          max_attempts: 3
-          command: yarn tronb:package:prod
+          command: npm run tronb:package:prod

      - name: List artifacts in out/
        run: ls -R out
@ -295,7 +302,7 @@ jobs:
          shell: bash
          timeout_minutes: 10
          max_attempts: 3
-          command: yarn tronb:package:prod
+          command: npm run tronb:package:prod

      - uses: actions/upload-artifact@v4
        if: ${{ env.IS_RELEASE == 'true' }}
@ -378,7 +385,7 @@ jobs:
          NOTES: ${{ needs.prepare-files.outputs.notes }}
          PUB_DATE: ${{ github.event.repository.updated_at }}
          WEBSITE_DIR: ${{ env.IS_NIGHTLY == 'true' && 'dl.zoo.dev/releases/modeling-app/nightly' || 'dl.zoo.dev/releases/modeling-app' }}
-          URL_CODED_NAME: ${{ env.IS_NIGHTLY == 'true' && 'Zoo%20Modeling%20App%20%28Nightly%29' || 'Zoo%20Modeling%20App' }}
+          URL_CODED_NAME: ${{ env.IS_NIGHTLY == 'true' && 'Zoo%20Design%20Studio%20%28Nightly%29' || 'Zoo%20Design%20Studio' }}
        run: |
          RELEASE_DIR=https://${WEBSITE_DIR}
          jq --null-input \
@ -435,7 +442,7 @@ jobs:
          export TAG="nightly-${VERSION}"
          export PREVIOUS_TAG=$(git tag --list --sort=-committerdate "nightly-v[0-9]*" | head -n2 | tail -n1)
          export NOTES=$(./scripts/get-nightly-changelog.sh)
-          yarn files:set-notes
+          npm run files:set-notes

      - name: Authenticate to Google Cloud
        if: ${{ env.IS_NIGHTLY == 'true' }}
@ -460,4 +467,4 @@ jobs:

      - name: Invalidate bucket cache on latest*.yml and last_download.json files
        if: ${{ env.IS_NIGHTLY == 'true' }}
-        run: yarn files:invalidate-bucket:nightly
+        run: npm run files:invalidate-bucket:nightly
--- a/.github/workflows/cargo-test.yml
+++ b/.github/workflows/cargo-test.yml
@ -34,20 +34,11 @@ jobs:
        uses: actions-rust-lang/setup-rust-toolchain@v1
        with:
          cache: false # Configured below.
-      - 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 &
+      - 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 }}
      - uses: taiki-e/install-action@cargo-llvm-cov
      - uses: taiki-e/install-action@nextest
      - name: Install just
--- a/.github/workflows/check-exampleKcl.yml
+++ b/.github/workflows/check-exampleKcl.yml
@ -5,6 +5,7 @@ on:
    types: [opened, synchronize]
    paths:
      - 'src/lib/exampleKcl.ts'
+      - 'public/kcl-samples/bracket/main.kcl'

 permissions:
  contents: read
@ -22,11 +23,11 @@ jobs:
        uses: actions/github-script@v7
        with:
          script: |
-            const message = '`src/lib/exampleKcl.ts` has been updated in this PR, please review and update the `src/routes/onboarding`, if needed.';
+            const message = '`public/kcl-samples/bracket/main.kcl` or `src/lib/exampleKcl.ts` has been updated in this PR, please review and update the `src/routes/onboarding`, if needed.';
            const issue_number = context.payload.pull_request.number;
            const owner = context.repo.owner;
            const repo = context.repo.repo;
-            
+
            const { data: comments } = await github.rest.issues.listComments({
              owner,
              repo,
@ -43,4 +44,4 @@ jobs:
                issue_number,
                body: message,
              });
-            }
+            }
--- a/.github/workflows/codemirror-lang-kcl.yml
+++ b/.github/workflows/codemirror-lang-kcl.yml
@ -11,7 +11,7 @@ concurrency:
  cancel-in-progress: true

 jobs:
-  yarn-unit-test:
+  npm-unit-test:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
@ -19,14 +19,11 @@ jobs:
      - uses: actions/setup-node@v4
        with:
          node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'npm'

-      - run: yarn install
-        working-directory: packages/codemirror-lang-kcl
+      - run: npm install

-      - run: yarn tsc
-        working-directory: packages/codemirror-lang-kcl
+      - run: npm run tsc --workspace=packages/codemirror-lang-kcl

      - name: run unit tests
-        run: yarn test
-        working-directory: packages/codemirror-lang-kcl
+        run: npm run test --workspace=packages/codemirror-lang-kcl
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@ -97,11 +97,11 @@ jobs:
        if: needs.conditions.outputs.should-run == 'true'
        with:
          node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'npm'

      - name: Install dependencies
        if: needs.conditions.outputs.should-run == 'true'
-        run: yarn
+        run: npm install

      - name: Download Wasm Cache
        id: download-wasm
@ -140,7 +140,7 @@ jobs:
        with:
          cache: false # Configured below.

-      - uses: taiki-e/install-action@37bdc826eaedac215f638a96472df572feab0f9b
+      - uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc
        if: ${{ needs.conditions.outputs.should-run == 'true' && steps.wasm.outputs.should-build-wasm == 'true' }}
        with:
          tool: wasm-pack
@ -154,7 +154,7 @@ jobs:
      - name: Build Wasm
        if: ${{ needs.conditions.outputs.should-run == 'true' && steps.wasm.outputs.should-build-wasm == 'true' }}
        shell: bash
-        run: yarn build:wasm
+        run: npm run build:wasm

      - uses: actions/upload-artifact@v4
        if: needs.conditions.outputs.should-run == 'true'
@ -197,12 +197,12 @@ jobs:
        if: needs.conditions.outputs.should-run == 'true'
        with:
          node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'npm'

      - name: Install dependencies
        id: deps-install
        if: needs.conditions.outputs.should-run == 'true'
-        run: yarn
+        run: npm install

      - name: Cache Playwright Browsers
        if: needs.conditions.outputs.should-run == 'true'
@ -210,27 +210,32 @@ jobs:
        with:
          path: |
            ~/.cache/ms-playwright/
-          key: ${{ runner.os }}-playwright-${{ hashFiles('yarn.lock') }}
+          key: ${{ runner.os }}-playwright-${{ hashFiles('package-lock.json') }}

      - name: Install Playwright Browsers
        if: needs.conditions.outputs.should-run == 'true'
-        run: yarn playwright install --with-deps
+        run: npm run playwright install --with-deps

      - name: build web
        if: needs.conditions.outputs.should-run == 'true'
-        run: yarn tronb:vite:dev
+        run: npm run tronb:vite:dev

      - name: Run ubuntu/chrome snapshots
        if: needs.conditions.outputs.should-run == 'true'
        uses: nick-fields/retry@v3.0.2
        with:
          shell: bash
-          command: yarn test:snapshots
+          command: npm run test:snapshots
          timeout_minutes: 30
          max_attempts: 3
        env:
          token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
          snapshottoken: ${{ secrets.KITTYCAD_API_TOKEN }}
+          TAB_API_URL: ${{ secrets.TAB_API_URL }}
+          TAB_API_KEY: ${{ secrets.TAB_API_KEY }}
+          CI_COMMIT_SHA: ${{ github.event.pull_request.head.sha }}
+          CI_PR_NUMBER: ${{ github.event.pull_request.number }}
+          TARGET: web

      - uses: actions/upload-artifact@v4
        if: ${{ needs.conditions.outputs.should-run == 'true' && !cancelled() && (success() || failure()) }}
@ -316,12 +321,12 @@ jobs:
        if: needs.conditions.outputs.should-run == 'true'
        with:
          node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'npm'

      - name: Install dependencies
        id: deps-install
        if: needs.conditions.outputs.should-run == 'true'
-        run: yarn
+        run: npm install

      - name: Cache Playwright Browsers
        if: needs.conditions.outputs.should-run == 'true'
@ -329,32 +334,22 @@ jobs:
        with:
          path: |
            ~/.cache/ms-playwright/
-          key: ${{ runner.os }}-playwright-${{ hashFiles('yarn.lock') }}
+          key: ${{ runner.os }}-playwright-${{ hashFiles('package-lock.json') }}

      - name: Install Playwright Browsers
        if: needs.conditions.outputs.should-run == 'true'
-        run: yarn playwright install --with-deps
+        run: npm run playwright install --with-deps

      - name: Build web
        if: needs.conditions.outputs.should-run == 'true'
-        run: yarn tronb:vite:dev
+        run: npm run tronb:vite:dev

-      - name: Install vector
-        if: ${{ needs.conditions.outputs.should-run == 'true' && 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 &
+      - 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 }}

      - uses: actions/download-artifact@v4
        if: ${{ needs.conditions.outputs.should-run == 'true' && !cancelled() && (success() || failure()) }}
@ -375,6 +370,11 @@ jobs:
        env:
          FAIL_ON_CONSOLE_ERRORS: true
          token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
+          TAB_API_URL: ${{ secrets.TAB_API_URL }}
+          TAB_API_KEY: ${{ secrets.TAB_API_KEY }}
+          CI_COMMIT_SHA: ${{ github.event.pull_request.head.sha }}
+          CI_PR_NUMBER: ${{ github.event.pull_request.number }}
+          TARGET: desktop

      - uses: actions/upload-artifact@v4
        if: ${{ needs.conditions.outputs.should-run == 'true' && always() }}
--- a/.github/workflows/generate-machine-api-types.yml
+++ b/.github/workflows/generate-machine-api-types.yml
@ -21,10 +21,10 @@ jobs:
      - uses: actions/setup-node@v4
        with:
          node-version-file: '.nvmrc'
-          cache: 'yarn'
-      - run: yarn install
-      - run: yarn generate:machine-api
-      - run: yarn fmt
+          cache: 'npm'
+      - run: npm install
+      - run: npm run generate:machine-api
+      - run: npm run fmt || true
      - name: check for changes
        id: git-check
        run: |
--- a/.github/workflows/kcl-language-server.yml
+++ b/.github/workflows/kcl-language-server.yml
@ -56,21 +56,19 @@ jobs:
          node-version-file: ".nvmrc"
      - name: Install dependencies
        run: |
-          yarn install
-          cd rust/kcl-language-server
-          yarn install
+          npm install
      - name: Run tests
        run: |
          cd rust/kcl-language-server
-          yarn build
-          yarn test-compile
+          npm run build
+          npm run test-compile
          ls -la dist
-          xvfb-run -a yarn test
+          xvfb-run -a npm run test
        if: runner.os == 'Linux'
      - name: Run tests
        run: |
          cd rust/kcl-language-server
-          yarn test
+          npm run test
        if: runner.os != 'Linux'
  build-release:
    strategy:
@ -183,19 +181,20 @@ jobs:
      - name: Install dependencies
        run: |
          cd rust/kcl-language-server
+          # npm will symlink which will cause issues w tarballing later
          yarn install

      - name: Package Extension (release)
        if: startsWith(github.event.ref, 'refs/tags/')
        run: |
          cd rust/kcl-language-server
-          npx vsce package -o "../build/kcl-language-server-${{ matrix.code-target }}.vsix" --target ${{ matrix.code-target }}
+          npx vsce package --yarn -o "../build/kcl-language-server-${{ matrix.code-target }}.vsix" --target ${{ matrix.code-target }}

      - name: Package Extension (nightly)
        if: startsWith(github.event.ref, 'refs/tags/') == false
        run: |
          cd rust/kcl-language-server
-          npx vsce package -o "../build/kcl-language-server-${{ matrix.code-target }}.vsix" --target ${{ matrix.code-target }} --pre-release
+          npx vsce package --yarn -o "../build/kcl-language-server-${{ matrix.code-target }}.vsix" --target ${{ matrix.code-target }} --pre-release

      - name: remove server
        if: matrix.target == 'x86_64-unknown-linux-gnu'
@ -207,13 +206,13 @@ jobs:
        if: matrix.target == 'x86_64-unknown-linux-gnu' && startsWith(github.event.ref, 'refs/tags/')
        run: |
          cd rust/kcl-language-server
-          npx vsce package -o ../build/kcl-language-server-no-server.vsix
+          npx vsce package --yarn -o ../build/kcl-language-server-no-server.vsix

      - name: Package Extension (no server, nightly)
        if: matrix.target == 'x86_64-unknown-linux-gnu' && startsWith(github.event.ref, 'refs/tags/') == false
        run: |
          cd rust/kcl-language-server
-          npx vsce package -o ../build/kcl-language-server-no-server.vsix --pre-release
+          npx vsce package --yarn -o ../build/kcl-language-server-no-server.vsix --pre-release

      - name: Upload artifacts
        uses: actions/upload-artifact@v4
@ -244,8 +243,8 @@ jobs:
            lld \
            musl-dev \
            nodejs \
-            yarn \
-            npm
+            npm \
+            yarn

      - name: Checkout repository
        uses: actions/checkout@v4
@ -272,19 +271,20 @@ jobs:
      - name: Install dependencies
        run: |
          cd rust/kcl-language-server
+          # npm will symlink which will cause issues w tarballing later
          yarn install

      - name: Package Extension (release)
        if: startsWith(github.event.ref, 'refs/tags/')
        run: |
          cd rust/kcl-language-server
-          npx vsce package -o "../build/kcl-language-server-alpine-x64.vsix" --target alpine-x64
+          npx vsce package --yarn -o "../build/kcl-language-server-alpine-x64.vsix" --target alpine-x64

      - name: Package Extension (release)
        if: startsWith(github.event.ref, 'refs/tags/') == false
        run: |
          cd rust/kcl-language-server
-          npx vsce package -o "../build/kcl-language-server-alpine-x64.vsix" --target alpine-x64 --pre-release
+          npx vsce package --yarn -o "../build/kcl-language-server-alpine-x64.vsix" --target alpine-x64 --pre-release

      - name: Upload artifacts
        uses: actions/upload-artifact@v4
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@ -0,0 +1,55 @@
+name: Test Nix Flake
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+jobs:
+  nix-flake-check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - uses: cachix/install-nix-action@v31
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+
+      - name: nix flake check for all platforms
+        run: |
+          nix flake check --all-systems
+
+  nix-build-linux:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - uses: cachix/install-nix-action@v31
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+
+      - name: nix build . for x86_64-linux
+        run: nix build .
+
+  nix-build-macos:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - uses: cachix/install-nix-action@v31
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+
+      - name: nix build . for x86_64-darwin
+        run: nix build .
+
--- a/.github/workflows/publish-apps-release.yml
+++ b/.github/workflows/publish-apps-release.yml
@ -19,7 +19,7 @@ jobs:
      - uses: actions/setup-node@v4
        with:
          node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'npm'

      - name: Find tag workflow id
        id: tag_workflow_id
@ -105,7 +105,7 @@ jobs:
      - name: Override release notes
        env:
          NOTES: ${{ github.event.release.body }}
-        run: yarn files:set-notes
+        run: npm run files:set-notes

      - name: Authenticate to Google Cloud
        uses: 'google-github-actions/auth@v2.1.8'
@ -126,7 +126,7 @@ jobs:
          destination: 'dl.kittycad.io/releases/modeling-app'

      - name: Invalidate bucket cache on latest*.yml and last_download.json files
-        run: yarn files:invalidate-bucket
+        run: npm run files:invalidate-bucket

      - name: Upload release files to Github
        if: ${{ github.event_name == 'release' }}
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@ -16,18 +16,18 @@ permissions:
  actions: read

 jobs:
-  yarn-fmt-check:
+  npm-fmt-check:
    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 fmt-check
+          cache: 'npm'
+      - run: npm install
+      - run: npm run fmt-check

-  yarn-build-wasm:
+  npm-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
    steps:
@ -36,10 +36,10 @@ jobs:
      - uses: actions/setup-node@v4
        with:
          node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'npm'

      - name: Install dependencies
-        run: yarn install
+        run: npm install

      - name: Use correct Rust toolchain
        shell: bash
@ -51,7 +51,7 @@ jobs:
        with:
          cache: false # Configured below.

-      - uses: taiki-e/install-action@37bdc826eaedac215f638a96472df572feab0f9b
+      - uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc
        with:
          tool: wasm-pack

@ -62,7 +62,7 @@ jobs:

      - name: Build Wasm
        shell: bash
-        run: yarn build:wasm
+        run: npm run build:wasm

      - uses: actions/upload-artifact@v4
        with:
@ -76,17 +76,17 @@ jobs:
          path: |
            rust/kcl-lib/bindings/*

-  yarn-tsc:
+  npm-tsc:
    runs-on: ubuntu-latest
-    needs: yarn-build-wasm
+    needs: npm-build-wasm

    steps:
      - uses: actions/checkout@v4
      - uses: actions/setup-node@v4
        with:
          node-version-file: '.nvmrc'
-          cache: 'yarn'
-      - run: yarn install
+          cache: 'npm'
+      - run: npm install

      - name: Download all artifacts
        uses: actions/download-artifact@v4
@ -104,19 +104,19 @@ jobs:
          mkdir rust/kcl-lib/bindings
          cp -r prepared-ts-rs-bindings/* rust/kcl-lib/bindings/

-      - run: yarn tsc
+      - run: npm run tsc

-  yarn-lint:
+  npm-lint:
    runs-on: ubuntu-latest
-    needs: yarn-build-wasm
+    needs: npm-build-wasm

    steps:
      - uses: actions/checkout@v4
      - uses: actions/setup-node@v4
        with:
          node-version-file: '.nvmrc'
-          cache: 'yarn'
-      - run: yarn install
+          cache: 'npm'
+      - run: npm install

      - name: Download all artifacts
        uses: actions/download-artifact@v4
@ -134,19 +134,19 @@ jobs:
          mkdir rust/kcl-lib/bindings
          cp -r prepared-ts-rs-bindings/* rust/kcl-lib/bindings/

-      - run: yarn lint
+      - run: npm run lint

-  yarn-circular-dependencies:
+  npm-circular-dependencies:
    runs-on: ubuntu-latest
-    needs: yarn-build-wasm
+    needs: npm-build-wasm

    steps:
      - uses: actions/checkout@v4
      - uses: actions/setup-node@v4
        with:
          node-version-file: '.nvmrc'
-          cache: 'yarn'
-      - run: yarn install
+          cache: 'npm'
+      - run: npm install

      - name: Download all artifacts
        uses: actions/download-artifact@v4
@ -164,7 +164,7 @@ jobs:
          mkdir rust/kcl-lib/bindings
          cp -r prepared-ts-rs-bindings/* rust/kcl-lib/bindings/

-      - run: yarn circular-deps:diff
+      - run: npm run circular-deps:diff

  python-codespell:
    runs-on: ubuntu-22.04
@ -179,19 +179,19 @@ jobs:
      - name: Run codespell
        run: codespell --config .codespellrc # Edit this file to tweak the typo list and other configuration.

-  yarn-unit-test-kcl-samples:
+  npm-unit-test-kcl-samples:
    runs-on: ubuntu-latest
-    needs: yarn-build-wasm
+    needs: npm-build-wasm
    steps:
      - uses: actions/checkout@v4

      - uses: actions/setup-node@v4
        with:
          node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'npm'

-      - run: yarn install
-      - uses: taiki-e/install-action@37bdc826eaedac215f638a96472df572feab0f9b
+      - run: npm install
+      - uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc
        with:
          tool: wasm-pack

@ -211,32 +211,32 @@ jobs:
          mkdir rust/kcl-lib/bindings
          cp -r prepared-ts-rs-bindings/* rust/kcl-lib/bindings/

-      - run: yarn simpleserver:bg
+      - run: npm run simpleserver:bg
        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}

      - name: Install Chromium Browser
        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
-        run: yarn playwright install chromium --with-deps
+        run: npm run playwright install chromium --with-deps

      - name: run unit tests for kcl samples
        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
-        run: yarn test:unit:kcl-samples
+        run: npm run test:unit:kcl-samples
        env:
          VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}

-  yarn-unit-test:
+  npm-unit-test:
    runs-on: ubuntu-latest
-    needs: yarn-build-wasm
+    needs: npm-build-wasm
    steps:
      - uses: actions/checkout@v4

      - uses: actions/setup-node@v4
        with:
          node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'npm'

-      - run: yarn install
-      - uses: taiki-e/install-action@37bdc826eaedac215f638a96472df572feab0f9b
+      - run: npm install
+      - uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc
        with:
          tool: wasm-pack

@ -256,16 +256,16 @@ jobs:
          mkdir rust/kcl-lib/bindings
          cp -r prepared-ts-rs-bindings/* rust/kcl-lib/bindings/

-      - run: yarn simpleserver:bg
+      - run: npm run simpleserver:bg
        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}

      - name: Install Chromium Browser
        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
-        run: yarn playwright install chromium --with-deps
+        run: npm run playwright install chromium --with-deps

      - name: Run unit tests
        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
-        run: xvfb-run -a yarn test:unit
+        run: xvfb-run -a npm run test:unit
        env:
          VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}

--- a/.github/workflows/tag-nightly.yml
+++ b/.github/workflows/tag-nightly.yml
@ -27,7 +27,7 @@ jobs:
        with:
          node-version-file: '.nvmrc'

-      - run: yarn install
+      - run: npm install

      - name: Push tag
        run: |
--- a/.github/workflows/vector.toml
+++ b/.github/workflows/vector.toml
@ -8,6 +8,7 @@ include = ["/tmp/github-actions.log"]
 type = "remap"
 inputs = [ "github-actions-file" ]
 source = '''
+.platform = "OS_NAME"
 .action = "GITHUB_WORKFLOW"
 .repo = "GITHUB_REPOSITORY"
 .sha = "GITHUB_SHA"
--- a/.gitignore
+++ b/.gitignore
@ -26,10 +26,12 @@ yarn-error.log*
 .idea
 .vscode
 .helix
+result

 # rust
 rust/target
 rust/kcl-lib/bindings
+rust/kcl-language-server/server
 public/kcl_wasm_lib_bg.wasm
 rust/lcov.info
 rust/kcl-wasm-lib/pkg
--- a/.husky/pre-push
+++ b/.husky/pre-push
@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"

-yarn fmt-check
+npm run fmt-check
--- a/.npmrc
+++ b/.npmrc
@ -0,0 +1 @@
+legacy-peer-deps=true
--- a/76
+++ b/76
@ -5,36 +5,38 @@ all: install build check
 # INSTALL

 ifeq ($(OS),Windows_NT)
-	CARGO ?= ~/.cargo/bin/cargo.exe
-	WASM_PACK ?= ~/.cargo/bin/wasm-pack.exe
+export WINDOWS := true
+ifndef MSYSTEM
+export POWERSHELL := true
+endif
+endif
+
+ifdef WINDOWS
+CARGO ?= $(USERPROFILE)/.cargo/bin/cargo.exe
+WASM_PACK ?= $(USERPROFILE)/.cargo/bin/wasm-pack.exe
 else
-	CARGO ?= ~/.cargo/bin/cargo
-	WASM_PACK ?= ~/.cargo/bin/wasm-pack
+CARGO ?= ~/.cargo/bin/cargo
+WASM_PACK ?= ~/.cargo/bin/wasm-pack
 endif

 .PHONY: install
-install: node_modules/.yarn-integrity $(CARGO) $(WASM_PACK) ## Install dependencies
+install: node_modules/.package-lock.json $(CARGO) $(WASM_PACK) ## Install dependencies

-node_modules/.yarn-integrity: package.json yarn.lock
-	yarn install
-ifeq ($(OS),Windows_NT)
-	@ type nul > $@
-else
-	@ touch $@
-endif
+node_modules/.package-lock.json: package.json package-lock.json
+	npm install

 $(CARGO):
-ifeq ($(OS),Windows_NT)
-	yarn install:rust:windows
+ifdef WINDOWS
+	npm run install:rust:windows
 else
-	yarn install:rust
+	npm run install:rust
 endif

 $(WASM_PACK):
-ifeq ($(OS),Windows_NT)
-	yarn install:wasm-pack:cargo
+ifdef WINDOWS
+	npm run install:wasm-pack:cargo
 else
-	yarn install:wasm-pack:sh
+	npm run install:wasm-pack:sh
 endif

 ###############################################################################
@ -57,17 +59,17 @@ build-web: install public/kcl_wasm_lib_bg.wasm build/index.html
 build-desktop: install 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
+ifdef WINDOWS
+	npm run build:wasm:dev:windows
 else
-	yarn build:wasm:dev
+	npm run build:wasm:dev
 endif

 build/index.html: $(REACT_SOURCES) $(TYPESCRIPT_SOURCES) $(VITE_SOURCES)
-	yarn build:local
+	npm run build:local

 .vite/build/main.js: $(REACT_SOURCES) $(TYPESCRIPT_SOURCES) $(VITE_SOURCES)
-	yarn tronb:vite:dev
+	npm run tronb:vite:dev

 ###############################################################################
 # CHECK
@ -77,12 +79,12 @@ check: format lint

 .PHONY: format
 format: install ## Format the code
-	yarn fmt
+	npm run fmt

 .PHONY: lint
 lint: install ## Lint the code
-	yarn tsc
-	yarn lint
+	npm run tsc
+	npm run lint

 ###############################################################################
 # RUN
@ -94,11 +96,11 @@ run: run-$(TARGET)

 .PHONY: run-web
 run-web: install build-web ## Start the web app
-	yarn start
+	npm run start

 .PHONY: run-desktop
 run-desktop: install build-desktop ## Start the desktop app
-	yarn tron:start
+	npm run tron:start

 ###############################################################################
 # TEST
@ -113,7 +115,7 @@ 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 )
-	yarn test:unit
+	npm run test:unit

 .PHONY: test-e2e
 test-e2e: test-e2e-$(TARGET)
@ -122,17 +124,17 @@ test-e2e: test-e2e-$(TARGET)
 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)
+	npm run chrome:test -- --headed --grep="$(E2E_GREP)" --max-failures=$(E2E_FAILURES)
 else
-	yarn chrome:test --headed --workers='100%'
+	npm run 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)
+	npm run test:playwright:electron -- --grep="$(E2E_GREP)" --max-failures=$(E2E_FAILURES)
 else
-	yarn test:playwright:electron --workers='100%'
+	npm run test:playwright:electron -- --workers='100%'
 endif

 ###############################################################################
@ -140,8 +142,8 @@ endif

 .PHONY: clean
 clean: ## Delete all artifacts
-ifeq ($(OS),Windows_NT)
-	git clean --force -d -X
+ifdef POWERSHELL
+	git clean --force -d -x --exclude=.env* --exclude=**/*.env
 else
 	rm -rf .vite/ build/
 	rm -rf trace.zip playwright-report/ test-results/
@ -152,7 +154,7 @@ endif

 .PHONY: help
 help: install
-ifeq ($(OS),Windows_NT)
+ifdef POWERSHELL
 	@ 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}'
@ -167,5 +169,5 @@ endif
 # It should work for you other Linux users.
 lee-electron-test:
 	Xephyr -br -ac -noreset -screen 1200x500 :2 &
-	DISPLAY=:2 NODE_ENV=development PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:4444/ yarn tron:test -g "when using the file tree"
+	DISPLAY=:2 NODE_ENV=development PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:4444/ npm run tron:test -g "when using the file tree"
 	killall Xephyr
--- a/README.md
+++ b/README.md
@ -62,39 +62,39 @@ fnm use
 Install the NPM dependencies with:

 ```
-yarn install
+npm install
 ```

 This project uses a lot of Rust compiled to [WASM](https://webassembly.org/) within it. We have package scripts to run rustup, see `package.json` for reference:

 ```
 # macOS/Linux
-yarn install:rust
-yarn install:wasm-pack:sh
+npm run install:rust
+npm run install:wasm-pack:sh

 # Windows
-yarn install:rust:windows
-yarn install:wasm-pack:cargo
+npm run install:rust:windows
+npm run install:wasm-pack:cargo
 ```

 Then to build the WASM layer, run:

 ```
 # macOS/Linux
-yarn build:wasm
+npm run build:wasm

 # Windows
-yarn build:wasm:windows
+npm run build:wasm:windows
 ```

-Or if you have the `gh` cli installed and want to download the latest main wasm bundle. Note that on Windows, you need to associate .ps1 files with PowerShell, which can be done via the right click menu, selecting `C:\Program Files\PowerShell\7\pwsh.exe`, and you can install tools like `gh` via `yarn install:tools:windows`.
+Or if you have the `gh` cli installed and want to download the latest main wasm bundle. Note that on Windows, you need to associate .ps1 files with PowerShell, which can be done via the right click menu, selecting `C:\Program Files\PowerShell\7\pwsh.exe`, and you can install tools like `gh` via `npm run install:tools:windows`.

 ```
 # macOS/Linux
-yarn fetch:wasm
+npm run fetch:wasm

 # Windows
-yarn fetch:wasm:windows
+npm run fetch:wasm:windows
 ```

 That will build the WASM binary and put in the `public` dir (though gitignored).
@ -102,7 +102,7 @@ That will build the WASM binary and put in the `public` dir (though gitignored).
 Finally, to run the web app only, run:

 ```
-yarn start
+npm start
 ```

 If you're not a Zoo employee you won't be able to access the dev environment, you should copy everything from `.env.production` to `.env.development.local` to make it point to production instead, then when you navigate to `localhost:3000` the easiest way to sign in is to paste `localStorage.setItem('TOKEN_PERSIST_KEY', "your-token-from-https://zoo.dev/account/api-tokens")` replacing the with a real token from https://zoo.dev/account/api-tokens of course, then navigate to `localhost:3000` again. Note that navigating to `localhost:3000/signin` removes your token so you will need to set the token again.
@ -122,17 +122,17 @@ Third-Party Cookies".

 ## Desktop

-To spin up the desktop app, `yarn install` and `yarn build:wasm` need to have been done before hand then:
+To spin up the desktop app, `npm install` and `npm run build:wasm` need to have been done before hand then:

 ```
-yarn tron:start
+npm run tron:start
 ```

 This will start the application and hot-reload on changes.

 Devtools can be opened with the usual Command-Option-I (macOS) or Ctrl-Shift-I (Linux and Windows).

-To package the app for your platform with electron-builder, run `yarn tronb:package:dev` (or `yarn tronb:package:prod` to point to the .env.production variables).
+To package the app for your platform with electron-builder, run `npm run tronb:package:dev` (or `npm run tronb:package:prod` to point to the .env.production variables).

 ## Checking out commits / Bisecting

@ -141,9 +141,9 @@ Which commands from setup are one off vs. need to be run every time?
 The following will need to be run when checking out a new commit and guarantees the build is not stale:

 ```bash
-yarn install
-yarn build:wasm
-yarn start # or yarn build:local && yarn serve for slower but more production-like build
+npm install
+npm run build:wasm
+npm start # or npm run build:local && npm run serve for slower but more production-like build
 ```

 ## Before submitting a PR
@ -153,10 +153,10 @@ Before you submit a contribution PR to this repo, please ensure that:
 - There is a corresponding issue for the changes you want to make, so that discussion of approach can be had before work begins.
 - You have separated out refactoring commits from feature commits as much as possible
 - You have run all of the following commands locally:
-  - `yarn fmt`
-  - `yarn tsc`
-  - `yarn test`
-  - Here they are all together: `yarn fmt && yarn tsc && yarn test`
+  - `npm run fmt`
+  - `npm run tsc`
+  - `npm run test`
+  - Here they are all together: `npm run fmt && npm run tsc && npm run test`

 ## Release a new version

@ -266,7 +266,7 @@ docker run --network host  --rm --init -it playwright/chrome:playwright-x.xx.x
 and in another terminal, run:

 ```bash
-PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:4444/ yarn playwright test --project="Google Chrome" <test suite>
+PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:4444/ npm run playwright test --project="Google Chrome" <test suite>
 ```

 #### Specific example
@ -280,7 +280,7 @@ docker run --network host  --rm --init -it playwright/chrome:playwright-1.46.0
 and in another terminal, run:

 ```bash
-PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:4444/ yarn playwright test --project="Google Chrome" e2e/playwright/command-bar-tests.spec.ts
+PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:4444/ npm run playwright test --project="Google Chrome" e2e/playwright/command-bar-tests.spec.ts
 ```

 run a specific test change the test from `test('...` to `test.only('...`
@ -291,13 +291,13 @@ run a specific test change the test from `test('...` to `test.only('...`
 run headed

 ```
-yarn playwright test --headed
+npm run playwright test --headed
 ```

 run with step through debugger

 ```
-PWDEBUG=1 yarn playwright test
+PWDEBUG=1 npm run playwright test
 ```

 However, if you want a debugger I recommend using VSCode and the `playwright` extension, as the above command is a cruder debugger that steps into every function call which is annoying.
@ -308,7 +308,7 @@ Or comment out browsers in `playwright.config.ts`.

 note chromium has encoder compat issues which is why were testing against the branded 'Google Chrome'

-You may consider using the VSCode extension, it's useful for running individual threads, but some some reason the "record a test" is locked to chromium with we can't use. A work around is to us the CI `yarn playwright codegen -b wk --load-storage ./store localhost:3000`
+You may consider using the VSCode extension, it's useful for running individual threads, but some some reason the "record a test" is locked to chromium with we can't use. A work around is to us the CI `npm run playwright codegen -b wk --load-storage ./store localhost:3000`

 <details>
 <summary>
@ -351,21 +351,21 @@ However because much of our tests involve clicking in the stream at specific loc
 If you already haven't, run the following:

 ```
-yarn
-yarn build:wasm
-yarn start
+npm
+npm run build:wasm
+npm start
 ```

 and finally:

 ```
-yarn test:unit
+npm run test:unit
 ```

 For individual testing:

 ```
-yarn test abstractSyntaxTree -t "unexpected closed curly brace" --silent=false
+npm run test abstractSyntaxTree -t "unexpected closed curly brace" --silent=false
 ```

 Which will run our suite of [Vitest unit](https://vitest.dev/) and [React Testing Library E2E](https://testing-library.com/docs/react-testing-library/intro) tests, in interactive mode by default.
@ -439,16 +439,16 @@ Part of the CI CD pipeline performs static analysis on the code. Use the followi
 The following set of commands should get us closer to one and done commands to instantly retest issues.

 ```
-yarn test-setup
+npm run test-setup
 ```

 > Gotcha, are packages up to date and is the wasm built?

 ```
-yarn tsc
-yarn fmt-check
-yarn lint
-yarn test:unit:local
+npm run tsc
+npm run fmt-check
+npm run lint
+npm run test:unit:local
 ```

 > Gotcha: Our unit tests have integration tests in them. You need to run a localhost server to run the unit tests.
@ -460,10 +460,10 @@ yarn test:unit:local
 These E2E tests run in electron. There are tests that are skipped if they are ran in a windows, linux, or macos environment. We can use playwright tags to implement test skipping.

 ```
-yarn test:playwright:electron:local
-yarn test:playwright:electron:windows:local
-yarn test:playwright:electron:macos:local
-yarn test:playwright:electron:ubuntu:local
+npm run test:playwright:electron:local
+npm run test:playwright:electron:windows:local
+npm run test:playwright:electron:macos:local
+npm run test:playwright:electron:ubuntu:local
 ```

 > Why does it say local? The CI CD commands that run in the pipeline cannot be ran locally. A single command will not properly setup the testing environment locally.
--- a/docs/kcl/abs.md
+++ b/docs/kcl/abs.md
@ -36,9 +36,9 @@ myAngle = -120
 sketch001 = startSketchOn(XZ)
  |> startProfileAt([0, 0], %)
  |> line(end = [8, 0])
-  |> angledLine({ angle = abs(myAngle), length = 5 }, %)
+  |> angledLine(angle = abs(myAngle), length = 5)
  |> line(end = [-5, 0])
-  |> angledLine({ angle = myAngle, length = 5 }, %)
+  |> angledLine(angle = myAngle, length = 5)
  |> close()

 baseExtrusion = extrude(sketch001, length = 5)
--- a/docs/kcl/acos.md
+++ b/docs/kcl/acos.md
@ -33,10 +33,7 @@ acos(num: number): number
 ```js
 sketch001 = startSketchOn(XZ)
  |> startProfileAt([0, 0], %)
-  |> angledLine({
-       angle = toDegrees(acos(0.5)),
-       length = 10
-     }, %)
+  |> angledLine(angle = toDegrees(acos(0.5)), length = 10)
  |> line(end = [5, 0])
  |> line(endAbsolute = [12, 0])
  |> close()
--- a/docs/kcl/angleToMatchLengthX.md
+++ b/docs/kcl/angleToMatchLengthX.md
@ -36,7 +36,7 @@ angleToMatchLengthX(
 sketch001 = startSketchOn(XZ)
  |> startProfileAt([0, 0], %)
  |> line(end = [2, 5], tag = $seg01)
-  |> angledLineToX([-angleToMatchLengthX(seg01, 7, %), 10], %)
+  |> angledLine(angle = -angleToMatchLengthX(seg01, 7, %), endAbsoluteX = 10)
  |> close()

 extrusion = extrude(sketch001, length = 5)
--- a/docs/kcl/angleToMatchLengthY.md
+++ b/docs/kcl/angleToMatchLengthY.md
@ -36,10 +36,7 @@ angleToMatchLengthY(
 sketch001 = startSketchOn(XZ)
  |> startProfileAt([0, 0], %)
  |> line(end = [1, 2], tag = $seg01)
-  |> angledLine({
-       angle = angleToMatchLengthY(seg01, 15, %),
-       length = 5
-     }, %)
+  |> angledLine(angle = angleToMatchLengthY(seg01, 15, %), length = 5)
  |> yLine(endAbsolute = 0)
  |> close()

--- a/docs/kcl/angledLine.md
+++ b/docs/kcl/angledLine.md
@ -10,8 +10,13 @@ Draw a line segment relative to the current origin using the polar measure of so

 ```js
 angledLine(
-  data: AngledLineData,
  sketch: Sketch,
+  angle: number,
+  length?: number,
+  lengthX?: number,
+  lengthY?: number,
+  endAbsoluteX?: number,
+  endAbsoluteY?: number,
  tag?: TagDeclarator,
 ): Sketch
 ```
@ -21,9 +26,14 @@ angledLine(

 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `data` | [`AngledLineData`](/docs/kcl/types/AngledLineData) | Data to draw an angled line. | Yes |
-| `sketch` | [`Sketch`](/docs/kcl/types/Sketch) |  | Yes |
-| [`tag`](/docs/kcl/types/tag) | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | Which sketch should this path be added to? | Yes |
+| `angle` | [`number`](/docs/kcl/types/number) | Which angle should the line be drawn at? | Yes |
+| `length` | [`number`](/docs/kcl/types/number) | Draw the line this distance along the given angle. Only one of `length`, `lengthX`, `lengthY`, `endAbsoluteX`, `endAbsoluteY` can be given. | No |
+| `lengthX` | [`number`](/docs/kcl/types/number) | Draw the line this distance along the X axis. Only one of `length`, `lengthX`, `lengthY`, `endAbsoluteX`, `endAbsoluteY` can be given. | No |
+| `lengthY` | [`number`](/docs/kcl/types/number) | Draw the line this distance along the Y axis. Only one of `length`, `lengthX`, `lengthY`, `endAbsoluteX`, `endAbsoluteY` can be given. | No |
+| `endAbsoluteX` | [`number`](/docs/kcl/types/number) | Draw the line along the given angle until it reaches this point along the X axis. Only one of `length`, `lengthX`, `lengthY`, `endAbsoluteX`, `endAbsoluteY` can be given. | No |
+| `endAbsoluteY` | [`number`](/docs/kcl/types/number) | Draw the line along the given angle until it reaches this point along the Y axis. Only one of `length`, `lengthX`, `lengthY`, `endAbsoluteX`, `endAbsoluteY` can be given. | No |
+| [`tag`](/docs/kcl/types/tag) | [`TagDeclarator`](/docs/kcl/types#tag-declaration) | Create a new tag which refers to this line | No |

 ### Returns

@ -36,7 +46,7 @@ angledLine(
 exampleSketch = startSketchOn(XZ)
  |> startProfileAt([0, 0], %)
  |> yLine(endAbsolute = 15)
-  |> angledLine({ angle = 30, length = 15 }, %)
+  |> angledLine(angle = 30, length = 15)
  |> line(end = [8, -10])
  |> yLine(endAbsolute = 0)
  |> close()
--- a/docs/kcl/angledLineOfXLength.md
+++ b/docs/kcl/angledLineOfXLength.md
--- a/docs/kcl/angledLineOfYLength.md
+++ b/docs/kcl/angledLineOfYLength.md
--- a/docs/kcl/angledLineToX.md
+++ b/docs/kcl/angledLineToX.md
--- a/docs/kcl/angledLineToY.md
+++ b/docs/kcl/angledLineToY.md
--- a/docs/kcl/appearance.md
+++ b/docs/kcl/appearance.md
--- a/docs/kcl/asin.md
+++ b/docs/kcl/asin.md
@ -33,10 +33,7 @@ asin(num: number): number
 ```js
 sketch001 = startSketchOn(XZ)
  |> startProfileAt([0, 0], %)
-  |> angledLine({
-       angle = toDegrees(asin(0.5)),
-       length = 20
-     }, %)
+  |> angledLine(angle = toDegrees(asin(0.5)), length = 20)
  |> yLine(endAbsolute = 0)
  |> close()

--- a/docs/kcl/atan.md
+++ b/docs/kcl/atan.md
@ -33,10 +33,7 @@ atan(num: number): number
 ```js
 sketch001 = startSketchOn(XZ)
  |> startProfileAt([0, 0], %)
-  |> angledLine({
-       angle = toDegrees(atan(1.25)),
-       length = 20
-     }, %)
+  |> angledLine(angle = toDegrees(atan(1.25)), length = 20)
  |> yLine(endAbsolute = 0)
  |> close()

--- a/docs/kcl/atan2.md
+++ b/docs/kcl/atan2.md
@ -24,8 +24,8 @@ atan2(

 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `y` | [`number`](/docs/kcl/types/number) |  | Yes |
-| `x` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `y` | [`number`](/docs/kcl/types/number) | Y | Yes |
+| `x` | [`number`](/docs/kcl/types/number) | X | Yes |

 ### Returns

@ -37,10 +37,7 @@ atan2(
 ```js
 sketch001 = startSketchOn(XZ)
  |> startProfileAt([0, 0], %)
-  |> angledLine({
-       angle = toDegrees(atan2(1.25, 2)),
-       length = 20
-     }, %)
+  |> angledLine(angle = toDegrees(atan2(y = 1.25, x = 2)), length = 20)
  |> yLine(endAbsolute = 0)
  |> close()

--- a/docs/kcl/chamfer.md
+++ b/docs/kcl/chamfer.md
@ -80,7 +80,7 @@ part001 = cube([0, 0], 20)
  // We tag the chamfer to reference it later.
  |> chamfer(length = 10, tags = [getOppositeEdge(line1)], tag = $chamfer1)

-sketch001 = startSketchOn(part001, chamfer1)
+sketch001 = startSketchOn(part001, face = chamfer1)
  |> startProfileAt([10, 10], %)
  |> line(end = [2, 0])
  |> line(end = [0, 2])
--- a/docs/kcl/consts.md
+++ b/docs/kcl/consts.md
@ -9,6 +9,8 @@ layout: manual

 ### `std`

+- [`END`](/docs/kcl/consts/std-END)
+- [`START`](/docs/kcl/consts/std-START)
 - [`X`](/docs/kcl/consts/std-X)
 - [`XY`](/docs/kcl/consts/std-XY)
 - [`XZ`](/docs/kcl/consts/std-XZ)
--- a/docs/kcl/consts/std-END.md
+++ b/docs/kcl/consts/std-END.md
@ -0,0 +1,15 @@
+---
+title: "std::END"
+excerpt: "Identifies the ending face of an extrusion. I.e., the new face created by an extrusion."
+layout: manual
+---
+
+Identifies the ending face of an extrusion. I.e., the new face created by an extrusion.
+
+
+
+```js
+std::END: string = 'end'
+```
+
+
--- a/docs/kcl/consts/std-START.md
+++ b/docs/kcl/consts/std-START.md
@ -0,0 +1,15 @@
+---
+title: "std::START"
+excerpt: "Identifies the starting face of an extrusion. I.e., the face which is extruded."
+layout: manual
+---
+
+Identifies the starting face of an extrusion. I.e., the face which is extruded.
+
+
+
+```js
+std::START: string = 'start'
+```
+
+
--- a/docs/kcl/consts/std-math-E.md
+++ b/docs/kcl/consts/std-math-E.md
@ -17,10 +17,10 @@ std::math::E: number = 2.71828182845904523536028747135266250_
 ```js
 exampleSketch = startSketchOn(XZ)
  |> startProfileAt([0, 0], %)
-  |> angledLine({
+  |> angledLine(
    angle = 30,
    length = 2 * E ^ 2,
-  }, %)
+  )
  |> yLine(endAbsolute = 0)
  |> close()

--- a/docs/kcl/consts/std-math-PI.md
+++ b/docs/kcl/consts/std-math-PI.md
@ -18,7 +18,7 @@ std::math::PI: number = 3.14159265358979323846264338327950288_
 circumference = 70

 exampleSketch = startSketchOn(XZ)
- |> circle(center = [0, 0], radius = circumference/ (2 * PI))
+ |> circle(center = [0, 0], radius = circumference / (2 * PI))

 example = extrude(exampleSketch, length = 5)
 ```
--- a/docs/kcl/consts/std-math-TAU.md
+++ b/docs/kcl/consts/std-math-TAU.md
@ -17,10 +17,10 @@ std::math::TAU: number = 6.28318530717958647692528676655900577_
 ```js
 exampleSketch = startSketchOn(XZ)
  |> startProfileAt([0, 0], %)
-  |> angledLine({
+  |> angledLine(
    angle = 50,
    length = 10 * TAU,
-  }, %)
+  )
  |> yLine(endAbsolute = 0)
  |> close()

--- a/docs/kcl/e.md
+++ b/docs/kcl/e.md
@ -30,7 +30,7 @@ e(): number
 ```js
 exampleSketch = startSketchOn(XZ)
  |> startProfileAt([0, 0], %)
-  |> angledLine({ angle = 30, length = 2 * e() ^ 2 }, %)
+  |> angledLine(angle = 30, length = 2 * e() ^ 2)
  |> yLine(endAbsolute = 0)
  |> close()

--- a/docs/kcl/extrude.md
+++ b/docs/kcl/extrude.md
--- a/docs/kcl/fromCm.md
+++ b/docs/kcl/fromCm.md
--- a/docs/kcl/fromFt.md
+++ b/docs/kcl/fromFt.md
--- a/docs/kcl/fromInches.md
+++ b/docs/kcl/fromInches.md
--- a/docs/kcl/fromM.md
+++ b/docs/kcl/fromM.md
--- a/docs/kcl/fromMm.md
+++ b/docs/kcl/fromMm.md
--- a/docs/kcl/fromYd.md
+++ b/docs/kcl/fromYd.md
--- a/docs/kcl/getNextAdjacentEdge.md
+++ b/docs/kcl/getNextAdjacentEdge.md
@ -30,10 +30,10 @@ getNextAdjacentEdge(tag: TagIdentifier): Uuid
 exampleSketch = startSketchOn(XZ)
  |> startProfileAt([0, 0], %)
  |> line(end = [10, 0])
-  |> angledLine({ angle = 60, length = 10 }, %)
-  |> angledLine({ angle = 120, length = 10 }, %)
+  |> angledLine(angle = 60, length = 10)
+  |> angledLine(angle = 120, length = 10)
  |> line(end = [-10, 0])
-  |> angledLine({ angle = 240, length = 10 }, %, $referenceEdge)
+  |> angledLine(angle = 240, length = 10, tag = $referenceEdge)
  |> close()

 example = extrude(exampleSketch, length = 5)
--- a/docs/kcl/getOppositeEdge.md
+++ b/docs/kcl/getOppositeEdge.md
@ -30,10 +30,10 @@ getOppositeEdge(tag: TagIdentifier): Uuid
 exampleSketch = startSketchOn(XZ)
  |> startProfileAt([0, 0], %)
  |> line(end = [10, 0])
-  |> angledLine({ angle = 60, length = 10 }, %)
-  |> angledLine({ angle = 120, length = 10 }, %)
+  |> angledLine(angle = 60, length = 10)
+  |> angledLine(angle = 120, length = 10)
  |> line(end = [-10, 0])
-  |> angledLine({ angle = 240, length = 10 }, %, $referenceEdge)
+  |> angledLine(angle = 240, length = 10, tag = $referenceEdge)
  |> close()

 example = extrude(exampleSketch, length = 5)
--- a/docs/kcl/getPreviousAdjacentEdge.md
+++ b/docs/kcl/getPreviousAdjacentEdge.md
@ -30,10 +30,10 @@ getPreviousAdjacentEdge(tag: TagIdentifier): Uuid
 exampleSketch = startSketchOn(XZ)
  |> startProfileAt([0, 0], %)
  |> line(end = [10, 0])
-  |> angledLine({ angle = 60, length = 10 }, %)
-  |> angledLine({ angle = 120, length = 10 }, %)
+  |> angledLine(angle = 60, length = 10)
+  |> angledLine(angle = 120, length = 10)
  |> line(end = [-10, 0])
-  |> angledLine({ angle = 240, length = 10 }, %, $referenceEdge)
+  |> angledLine(angle = 240, length = 10, tag = $referenceEdge)
  |> close()

 example = extrude(exampleSketch, length = 5)
--- a/docs/kcl/hollow.md
+++ b/docs/kcl/hollow.md
@ -65,15 +65,15 @@ case = startSketchOn(-XZ)
  |> startProfileAt([-size, -size], %)
  |> line(end = [2 * size, 0])
  |> line(end = [0, 2 * size])
-  |> tangentialArcTo([-size, size], %)
+  |> tangentialArc(endAbsolute = [-size, size])
  |> close()
  |> extrude(length = 65)

-thing1 = startSketchOn(case, 'end')
+thing1 = startSketchOn(case, face = END)
  |> circle(center = [-size / 2, -size / 2], radius = 25)
  |> extrude(length = 50)

-thing2 = startSketchOn(case, 'end')
+thing2 = startSketchOn(case, face = END)
  |> circle(center = [size / 2, -size / 2], radius = 25)
  |> extrude(length = 50)

--- a/docs/kcl/import.md
+++ b/docs/kcl/import.md
--- a/docs/kcl/inch.md
+++ b/docs/kcl/inch.md
--- a/docs/kcl/index.md
+++ b/docs/kcl/index.md
@ -24,12 +24,14 @@ layout: manual
 * **std**
  * [`Axis2d`](kcl/types/Axis2d)
  * [`Axis3d`](kcl/types/Axis3d)
+  * [`END`](kcl/consts/std-END)
  * [`Edge`](kcl/types/Edge)
  * [`Face`](kcl/types/Face)
  * [`Helix`](kcl/types/Helix)
  * [`Plane`](kcl/types/Plane)
  * [`Point2d`](kcl/types/Point2d)
  * [`Point3d`](kcl/types/Point3d)
+  * [`START`](kcl/consts/std-START)
  * [`Sketch`](kcl/types/Sketch)
  * [`Solid`](kcl/types/Solid)
  * [`X`](kcl/consts/std-X)
@ -43,11 +45,7 @@ layout: manual
  * [`angleToMatchLengthX`](kcl/angleToMatchLengthX)
  * [`angleToMatchLengthY`](kcl/angleToMatchLengthY)
  * [`angledLine`](kcl/angledLine)
-  * [`angledLineOfXLength`](kcl/angledLineOfXLength)
-  * [`angledLineOfYLength`](kcl/angledLineOfYLength)
  * [`angledLineThatIntersects`](kcl/angledLineThatIntersects)
-  * [`angledLineToX`](kcl/angledLineToX)
-  * [`angledLineToY`](kcl/angledLineToY)
  * [`appearance`](kcl/appearance)
  * [`arc`](kcl/arc)
  * [`arcTo`](kcl/arcTo)
@ -65,11 +63,15 @@ layout: manual
  * [`chamfer`](kcl/chamfer)
  * [`circleThreePoint`](kcl/circleThreePoint)
  * [`close`](kcl/close)
-  * [`cm`](kcl/cm)
  * [`extrude`](kcl/extrude)
  * [`fillet`](kcl/fillet)
  * [`floor`](kcl/floor)
-  * [`ft`](kcl/ft)
+  * [`fromCm`](kcl/fromCm)
+  * [`fromFt`](kcl/fromFt)
+  * [`fromInches`](kcl/fromInches)
+  * [`fromM`](kcl/fromM)
+  * [`fromMm`](kcl/fromMm)
+  * [`fromYd`](kcl/fromYd)
  * [`getCommonEdge`](kcl/getCommonEdge)
  * [`getNextAdjacentEdge`](kcl/getNextAdjacentEdge)
  * [`getOppositeEdge`](kcl/getOppositeEdge)
@ -77,7 +79,8 @@ layout: manual
  * [`helix`](kcl/std-helix)
  * [`hole`](kcl/hole)
  * [`hollow`](kcl/hollow)
-  * [`inch`](kcl/inch)
+  * [`intersect`](kcl/intersect)
+  * [`involuteCircular`](kcl/involuteCircular)
  * [`lastSegX`](kcl/lastSegX)
  * [`lastSegY`](kcl/lastSegY)
  * [`legAngX`](kcl/legAngX)
@ -89,11 +92,9 @@ layout: manual
  * [`log`](kcl/log)
  * [`log10`](kcl/log10)
  * [`log2`](kcl/log2)
-  * [`m`](kcl/m)
  * [`map`](kcl/map)
  * [`max`](kcl/max)
  * [`min`](kcl/min)
-  * [`mm`](kcl/mm)
  * [`offsetPlane`](kcl/offsetPlane)
  * [`patternCircular2d`](kcl/patternCircular2d)
  * [`patternCircular3d`](kcl/patternCircular3d)
@ -101,7 +102,6 @@ layout: manual
  * [`patternLinear3d`](kcl/patternLinear3d)
  * [`patternTransform`](kcl/patternTransform)
  * [`patternTransform2d`](kcl/patternTransform2d)
-  * [`polar`](kcl/polar)
  * [`polygon`](kcl/polygon)
  * [`pop`](kcl/pop)
  * [`pow`](kcl/pow)
@ -127,22 +127,22 @@ layout: manual
  * [`sqrt`](kcl/sqrt)
  * [`startProfileAt`](kcl/startProfileAt)
  * [`startSketchOn`](kcl/startSketchOn)
+  * [`subtract`](kcl/subtract)
  * [`sweep`](kcl/sweep)
  * [`tangentToEnd`](kcl/tangentToEnd)
  * [`tangentialArc`](kcl/tangentialArc)
-  * [`tangentialArcTo`](kcl/tangentialArcTo)
-  * [`tangentialArcToRelative`](kcl/tangentialArcToRelative)
  * [`toDegrees`](kcl/toDegrees)
  * [`toRadians`](kcl/toRadians)
  * [`translate`](kcl/translate)
+  * [`union`](kcl/union)
  * [`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**
--- a/docs/kcl/intersect.md
+++ b/docs/kcl/intersect.md
--- a/docs/kcl/involuteCircular.md
+++ b/docs/kcl/involuteCircular.md
--- a/docs/kcl/line.md
+++ b/docs/kcl/line.md
@ -37,7 +37,7 @@ line(
 ```js
 triangle = startSketchOn(XZ)
  |> startProfileAt([0, 0], %)
-  // The 'end' argument means it ends at exactly [10, 0].
+  // The END argument means it ends at exactly [10, 0].
  // This is an absolute measurement, it is NOT relative to
  // the start of the sketch.
  |> line(endAbsolute = [10, 0])
--- a/docs/kcl/max.md
+++ b/docs/kcl/max.md
@ -33,10 +33,7 @@ max(args: [number]): number
 ```js
 exampleSketch = startSketchOn(XZ)
  |> startProfileAt([0, 0], %)
-  |> angledLine({
-       angle = 70,
-       length = max(15, 31, 4, 13, 22)
-     }, %)
+  |> angledLine(angle = 70, length = max(15, 31, 4, 13, 22))
  |> line(end = [20, 0])
  |> close()

--- a/docs/kcl/min.md
+++ b/docs/kcl/min.md
@ -33,10 +33,7 @@ min(args: [number]): number
 ```js
 exampleSketch = startSketchOn(XZ)
  |> startProfileAt([0, 0], %)
-  |> angledLine({
-       angle = 70,
-       length = min(15, 31, 4, 13, 22)
-     }, %)
+  |> angledLine(angle = 70, length = min(15, 31, 4, 13, 22))
  |> line(end = [20, 0])
  |> close()

--- a/docs/kcl/offsetPlane.md
+++ b/docs/kcl/offsetPlane.md
@ -20,7 +20,7 @@ offsetPlane(

 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `plane` | [`PlaneData`](/docs/kcl/types/PlaneData) | The plane (e.g. 'XY') which this new plane is created from. | Yes |
+| `plane` | [`PlaneData`](/docs/kcl/types/PlaneData) | The plane (e.g. XY) which this new plane is created from. | Yes |
 | `offset` | [`number`](/docs/kcl/types/number) | Distance from the standard plane this new plane will be created at. | Yes |

 ### Returns
--- a/docs/kcl/patternLinear3d.md
+++ b/docs/kcl/patternLinear3d.md
@ -57,15 +57,15 @@ case = startSketchOn(XY)
  |> startProfileAt([-size, -size], %)
  |> line(end = [2 * size, 0])
  |> line(end = [0, 2 * size])
-  |> tangentialArcTo([-size, size], %)
+  |> tangentialArc(endAbsolute = [-size, size])
  |> close(%)
  |> extrude(length = 65)

-thing1 = startSketchOn(case, 'end')
+thing1 = startSketchOn(case, face = END)
  |> circle(center = [-size / 2, -size / 2], radius = 25)
  |> extrude(length = 50)

-thing2 = startSketchOn(case, 'end')
+thing2 = startSketchOn(case, face = END)
  |> circle(center = [size / 2, -size / 2], radius = 25)
  |> extrude(length = 50)

@ -88,11 +88,11 @@ case = startSketchOn(XY)
  |> startProfileAt([-size, -size], %)
  |> line(end = [2 * size, 0])
  |> line(end = [0, 2 * size])
-  |> tangentialArcTo([-size, size], %)
+  |> tangentialArc(endAbsolute = [-size, size])
  |> close(%)
  |> extrude(length = 65)

-thing1 = startSketchOn(case, 'end')
+thing1 = startSketchOn(case, face = END)
  |> circle(center = [-size / 2, -size / 2], radius = 25)
  |> extrude(length = 50)

--- a/docs/kcl/polar.md
+++ b/docs/kcl/polar.md
--- a/docs/kcl/pow.md
+++ b/docs/kcl/pow.md
@ -37,7 +37,7 @@ pow(
 ```js
 exampleSketch = startSketchOn(XZ)
  |> startProfileAt([0, 0], %)
-  |> angledLine({ angle = 50, length = pow(5, 2) }, %)
+  |> angledLine(angle = 50, length = pow(5, 2))
  |> yLine(endAbsolute = 0)
  |> close()

--- a/docs/kcl/profileStart.md
+++ b/docs/kcl/profileStart.md
@ -29,11 +29,8 @@ profileStart(sketch: Sketch): [number]
 ```js
 sketch001 = startSketchOn(XY)
  |> startProfileAt([5, 2], %)
-  |> angledLine({ angle = 120, length = 50 }, %, $seg01)
-  |> angledLine({
-       angle = segAng(seg01) + 120,
-       length = 50
-     }, %)
+  |> angledLine(angle = 120, length = 50, tag = $seg01)
+  |> angledLine(angle = segAng(seg01) + 120, length = 50)
  |> line(end = profileStart(%))
  |> close()
  |> extrude(length = 20)
--- a/docs/kcl/profileStartX.md
+++ b/docs/kcl/profileStartX.md
--- a/docs/kcl/profileStartY.md
+++ b/docs/kcl/profileStartY.md
--- a/docs/kcl/reduce.md
+++ b/docs/kcl/reduce.md
@ -78,7 +78,7 @@ assertEqual(sum, 6, 0.00001, "1 + 2 + 3 summed is 6")
 ```js
 // Declare a function that sketches a decagon.
 fn decagon(radius) {
-  // Each side of the decagon is turned this many degrees from the previous angle.
+  // Each side of the decagon is turned this many radians from the previous angle.
  stepAngle = 1 / 10 * TAU

  // Start the decagon sketch at this point.
--- a/docs/kcl/rotate.md
+++ b/docs/kcl/rotate.md
--- a/docs/kcl/scale.md
+++ b/docs/kcl/scale.md
--- a/docs/kcl/segAng.md
+++ b/docs/kcl/segAng.md
@ -32,9 +32,9 @@ exampleSketch = startSketchOn(XZ)
  |> line(end = [10, 0])
  |> line(end = [5, 10], tag = $seg01)
  |> line(end = [-10, 0])
-  |> angledLine([segAng(seg01), 10], %)
+  |> angledLine(angle = segAng(seg01), length = 10)
  |> line(end = [-10, 0])
-  |> angledLine([segAng(seg01), -15], %)
+  |> angledLine(angle = segAng(seg01), length = -15)
  |> close()

 example = extrude(exampleSketch, length = 4)
--- a/docs/kcl/segLen.md
+++ b/docs/kcl/segLen.md
@ -29,9 +29,9 @@ segLen(tag: TagIdentifier): number
 ```js
 exampleSketch = startSketchOn(XZ)
  |> startProfileAt([0, 0], %)
-  |> angledLine({ angle = 60, length = 10 }, %, $thing)
-  |> tangentialArc({ offset = -120, radius = 5 }, %)
-  |> angledLine({ angle = -60, length = segLen(thing) }, %)
+  |> angledLine(angle = 60, length = 10, tag = $thing)
+  |> tangentialArc(angle = -120, radius = 5)
+  |> angledLine(angle = -60, length = segLen(thing))
  |> close()

 example = extrude(exampleSketch, length = 5)
--- a/docs/kcl/settings.md
+++ b/docs/kcl/settings.md
@ -6,7 +6,7 @@ layout: manual

 # KCL Settings

-There are three levels of settings available in the KittyCAD Design Studiolication:
+There are three levels of settings available in Zoo Design Studio:

 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 the KittyCAD Design Studiolicati

 ## Configuration Files

-The KittyCAD Design Studio uses TOML files for configuration:
+Zoo Design Studio 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)
--- a/docs/kcl/settings/user.md
+++ b/docs/kcl/settings/user.md
@ -96,7 +96,7 @@ Permanently dismiss the banner warning to download the desktop app. This setting

 ##### stream_idle_mode

-When the user is idle, and this is true, the stream will be torn down.
+When the user is idle, teardown the stream after some time.


 **Default:** None
--- a/docs/kcl/shell.md
+++ b/docs/kcl/shell.md
--- a/docs/kcl/sqrt.md
+++ b/docs/kcl/sqrt.md
@ -33,7 +33,7 @@ sqrt(num: number): number
 ```js
 exampleSketch = startSketchOn(XZ)
  |> startProfileAt([0, 0], %)
-  |> angledLine({ angle = 50, length = sqrt(2500) }, %)
+  |> angledLine(angle = 50, length = sqrt(2500))
  |> yLine(endAbsolute = 0)
  |> close()

--- a/docs/kcl/startSketchOn.md
+++ b/docs/kcl/startSketchOn.md
@ -18,8 +18,8 @@ The point is if you want to export the result of a sketch on a face, you only ne

 ```js
 startSketchOn(
-  data: SketchData,
-  tag?: FaceTag,
+  planeOrSolid: SketchData,
+  face?: FaceTag,
 ): SketchSurface
 ```

@ -28,8 +28,8 @@ startSketchOn(

 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `data` | [`SketchData`](/docs/kcl/types/SketchData) | Data for start sketch on. You can start a sketch on a plane or an solid. | Yes |
-| [`tag`](/docs/kcl/types/tag) | [`FaceTag`](/docs/kcl/types/FaceTag) | A tag for a face. | No |
+| `planeOrSolid` | [`SketchData`](/docs/kcl/types/SketchData) | The plane or solid to sketch on | Yes |
+| `face` | [`FaceTag`](/docs/kcl/types/FaceTag) | Identify a face of a solid if a solid is specified as the input argument (`plane_or_solid`) | No |

 ### Returns

@ -48,7 +48,7 @@ exampleSketch = startSketchOn(XY)

 example = extrude(exampleSketch, length = 5)

-exampleSketch002 = startSketchOn(example, 'end')
+exampleSketch002 = startSketchOn(example, face = END)
  |> startProfileAt([1, 1], %)
  |> line(end = [8, 0])
  |> line(end = [0, 8])
@ -57,7 +57,7 @@ exampleSketch002 = startSketchOn(example, 'end')

 example002 = extrude(exampleSketch002, length = 5)

-exampleSketch003 = startSketchOn(example002, 'end')
+exampleSketch003 = startSketchOn(example002, face = END)
  |> startProfileAt([2, 2], %)
  |> line(end = [6, 0])
  |> line(end = [0, 6])
@ -82,7 +82,7 @@ exampleSketch = startSketchOn(XY)

 example = extrude(exampleSketch, length = 5, tagEnd = $end01)

-exampleSketch002 = startSketchOn(example, end01)
+exampleSketch002 = startSketchOn(example, face = end01)
  |> startProfileAt([1, 1], %)
  |> line(end = [8, 0])
  |> line(end = [0, 8])
@ -91,7 +91,7 @@ exampleSketch002 = startSketchOn(example, end01)

 example002 = extrude(exampleSketch002, length = 5, tagEnd = $end02)

-exampleSketch003 = startSketchOn(example002, end02)
+exampleSketch003 = startSketchOn(example002, face = end02)
  |> startProfileAt([2, 2], %)
  |> line(end = [6, 0])
  |> line(end = [0, 6])
@ -113,7 +113,7 @@ exampleSketch = startSketchOn(XY)

 example = extrude(exampleSketch, length = 10)

-exampleSketch002 = startSketchOn(example, sketchingFace)
+exampleSketch002 = startSketchOn(example, face = sketchingFace)
  |> startProfileAt([1, 1], %)
  |> line(end = [8, 0])
  |> line(end = [0, 8])
@ -122,7 +122,7 @@ exampleSketch002 = startSketchOn(example, sketchingFace)

 example002 = extrude(exampleSketch002, length = 10)

-exampleSketch003 = startSketchOn(example002, sketchingFace002)
+exampleSketch003 = startSketchOn(example002, face = sketchingFace002)
  |> startProfileAt([-8, 12], %)
  |> line(end = [0, 6])
  |> line(end = [6, 0])
@ -148,7 +148,7 @@ exampleSketch = startSketchOn(XY)

 example = revolve(exampleSketch, axis = Y, angle = 180)

-exampleSketch002 = startSketchOn(example, 'end')
+exampleSketch002 = startSketchOn(example, face = END)
  |> startProfileAt([4.5, -5], %)
  |> line(end = [0, 5])
  |> line(end = [5, 0])
@ -182,7 +182,7 @@ example = revolve(
  tagEnd = $end01,
 )

-exampleSketch002 = startSketchOn(example, end01)
+exampleSketch002 = startSketchOn(example, face = end01)
  |> startProfileAt([4.5, -5], %)
  |> line(end = [0, 5])
  |> line(end = [5, 0])
@ -196,12 +196,10 @@ example002 = extrude(exampleSketch002, length = 5)

 ```js
 a1 = startSketchOn({
-       plane = {
-         origin = { x = 0, y = 0, z = 0 },
-         xAxis = { x = 1, y = 0, z = 0 },
-         yAxis = { x = 0, y = 1, z = 0 },
-         zAxis = { x = 0, y = 0, z = 1 }
-       }
+       origin = { x = 0, y = 0, z = 0 },
+       xAxis = { x = 1, y = 0, z = 0 },
+       yAxis = { x = 0, y = 1, z = 0 },
+       zAxis = { x = 0, y = 0, z = 1 }
     })
  |> startProfileAt([0, 0], %)
  |> line(end = [100.0, 0])
--- a/docs/kcl/std-helix.md
+++ b/docs/kcl/std-helix.md
@ -9,7 +9,15 @@ Create a helix.


 ```js
-helix(revolutions: number(_), angleStart: number(deg), ccw?: bool, radius?: number(mm), axis?: Axis3d | Edge, length?: number(mm), cylinder?: Solid): Helix
+helix(
+  revolutions: number(_),
+  angleStart: number(Angle),
+  ccw?: bool,
+  radius?: number(Length),
+  axis?: Axis3d | Edge,
+  length?: number(Length),
+  cylinder?: Solid,
+): Helix
 ```


@ -18,11 +26,11 @@ helix(revolutions: number(_), angleStart: number(deg), ccw?: bool, radius?: numb
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
 | `revolutions` | `number(_)` | Number of revolutions. | Yes |
-| `angleStart` | `number(deg)` | Start angle (in degrees). | Yes |
+| `angleStart` | `number(Angle)` | Start angle (in degrees). | Yes |
 | `ccw` | [`bool`](/docs/kcl/types/bool) | Is the helix rotation counter clockwise? The default is `false`. | No |
-| `radius` | `number(mm)` | Radius of the helix. | No |
+| `radius` | `number(Length)` | Radius of the helix. | No |
 | `axis` | `Axis3d | Edge` | Axis to use for the helix. | No |
-| `length` | `number(mm)` | Length of the helix. This is not necessary if the helix is created around an edge. If not given the length of the edge is used. | No |
+| `length` | `number(Length)` | Length of the helix. This is not necessary if the helix is created around an edge. If not given the length of the edge is used. | No |
 | `cylinder` | [`Solid`](/docs/kcl/types/Solid) | Cylinder to create the helix on. | No |

 ### Returns
--- a/docs/kcl/std-math-cos.md
+++ b/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(Angle)): number(_)
 ```


@ -17,7 +17,7 @@ cos(@num: number(rad)): number(_)

 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `num` | `number(rad)` |  | Yes |
+| `num` | `number(Angle)` |  | Yes |

 ### Returns

@ -29,10 +29,10 @@ cos(@num: number(rad)): number(_)
 ```js
 exampleSketch = startSketchOn(XZ)
  |> startProfileAt([0, 0], %)
-  |> angledLine({
+  |> angledLine(
    angle = 30,
    length = 3 / cos(toRadians(30)),
-  }, %)
+  )
  |> yLine(endAbsolute = 0)
  |> close()

--- a/docs/kcl/std-math-polar.md
+++ b/docs/kcl/std-math-polar.md
--- a/docs/kcl/std-math-sin.md
+++ b/docs/kcl/std-math-sin.md
--- a/docs/kcl/std-math-tan.md
+++ b/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(Angle)): number(_)
 ```


@ -17,7 +17,7 @@ tan(@num: number(rad)): number(_)

 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `num` | `number(rad)` |  | Yes |
+| `num` | `number(Angle)` |  | Yes |

 ### Returns

@ -29,10 +29,10 @@ tan(@num: number(rad)): number(_)
 ```js
 exampleSketch = startSketchOn(XZ)
  |> startProfileAt([0, 0], %)
-  |> angledLine({
+  |> angledLine(
    angle = 50,
    length = 50 * tan(1/2),
-  }, %)
+  )
  |> yLine(endAbsolute = 0)
  |> close()

--- a/docs/kcl/std-revolve.md
+++ b/docs/kcl/std-revolve.md
--- a/docs/kcl/std-sketch-circle.md
+++ b/docs/kcl/std-sketch-circle.md
@ -6,10 +6,16 @@ layout: manual



-Construct a 2-dimensional circle, of the specified radius, centered atthe provided (x, y) origin point.
+Construct a 2-dimensional circle, of the specified radius, centered at
+the provided (x, y) origin point.

 ```js
-circle(@sketch_or_surface: Sketch | Plane | Face, center: Point2d, radius: number, tag?: tag): Sketch
+circle(
+  @sketch_or_surface: Sketch | Plane | Face,
+  center: Point2d,
+  radius: number(Length),
+  tag?: tag,
+): Sketch
 ```


@ -19,7 +25,7 @@ circle(@sketch_or_surface: Sketch | Plane | Face, center: Point2d, radius: numbe
 |----------|------|-------------|----------|
 | `sketch_or_surface` | [`Sketch`](/docs/kcl/types/Sketch) OR [`Plane`](/docs/kcl/types/Plane) OR [`Face`](/docs/kcl/types/Face) | Sketch to extend, or plane or surface to sketch on. | Yes |
 | `center` | [`Point2d`](/docs/kcl/types/Point2d) | The center of the circle. | Yes |
-| `radius` | [`number`](/docs/kcl/types/number) | The radius of the circle. | Yes |
+| `radius` | `number(Length)` | The radius of the circle. | Yes |
 | [`tag`](/docs/kcl/types/tag) | [`tag`](/docs/kcl/types/tag) | Create a new tag which refers to this circle. | No |

 ### Returns
--- a/docs/kcl/std-sketch-mirror2d.md
+++ b/docs/kcl/std-sketch-mirror2d.md
@ -11,7 +11,10 @@ Only works on unclosed sketches for now.
 Mirror occurs around a local sketch axis rather than a global axis.

 ```js
-mirror2d(@sketches: [Sketch; 1+], axis: Axis2d | Edge): Sketch
+mirror2d(
+  @sketches: [Sketch; 1+],
+  axis: Axis2d | Edge,
+): Sketch
 ```


@ -100,14 +103,14 @@ example = extrude(sketch001, length = 10)
 sketch0011 = startSketchOn(XY)
     |> startProfileAt([6.77, 0], %)
     |> yLine(length = 1.27)
-     |> tangentialArcTo([5.96, 2.37], %)
-     |> tangentialArcTo([-6.2, 2.44], %)
-     |> tangentialArcTo([-6.6, 1.82], %)
+     |> tangentialArc(endAbsolute = [5.96, 2.37])
+     |> tangentialArc(endAbsolute = [-6.2, 2.44])
+     |> tangentialArc(endAbsolute = [-6.6, 1.82])
     |> yLine(length = -1.82)
     |> mirror2d( axis = X )
     |> extrude(length = 10)

-sketch002 = startSketchOn(sketch0011, 'END')
+sketch002 = startSketchOn(sketch0011, face = END)
    |> circle( center = [-0.01, 1.58], radius = 1.2 )
    |> extrude(length = 1.2)

--- a/docs/kcl/std.json
+++ b/docs/kcl/std.json
--- a/docs/kcl/subtract.md
+++ b/docs/kcl/subtract.md
--- a/docs/kcl/sweep.md
+++ b/docs/kcl/sweep.md
--- a/docs/kcl/tangentToEnd.md
+++ b/docs/kcl/tangentToEnd.md
@ -31,12 +31,9 @@ tangentToEnd(tag: TagIdentifier): number
 pillSketch = startSketchOn(XZ)
  |> startProfileAt([0, 0], %)
  |> line(end = [20, 0])
-  |> tangentialArcToRelative([0, 10], %, $arc1)
-  |> angledLine({
-       angle = tangentToEnd(arc1),
-       length = 20
-     }, %)
-  |> tangentialArcToRelative([0, -10], %)
+  |> tangentialArc(end = [0, 10], tag = $arc1)
+  |> angledLine(angle = tangentToEnd(arc1), length = 20)
+  |> tangentialArc(end = [0, -10])
  |> close()

 pillExtrude = extrude(pillSketch, length = 10)
@ -49,12 +46,9 @@ pillExtrude = extrude(pillSketch, length = 10)
 pillSketch = startSketchOn(XZ)
  |> startProfileAt([0, 0], %)
  |> line(end = [0, 20])
-  |> tangentialArcTo([10, 20], %, $arc1)
-  |> angledLine({
-       angle = tangentToEnd(arc1),
-       length = 20
-     }, %)
-  |> tangentialArcToRelative([-10, 0], %)
+  |> tangentialArc(endAbsolute = [10, 20], tag = $arc1)
+  |> angledLine(angle = tangentToEnd(arc1), length = 20)
+  |> tangentialArc(end = [-10, 0])
  |> close()

 pillExtrude = extrude(pillSketch, length = 10)
@ -66,10 +60,7 @@ pillExtrude = extrude(pillSketch, length = 10)
 rectangleSketch = startSketchOn(XZ)
  |> startProfileAt([0, 0], %)
  |> line(end = [10, 0], tag = $seg1)
-  |> angledLine({
-       angle = tangentToEnd(seg1),
-       length = 10
-     }, %)
+  |> angledLine(angle = tangentToEnd(seg1), length = 10)
  |> line(end = [0, 10])
  |> line(end = [-20, 0])
  |> close()
@ -83,7 +74,7 @@ rectangleExtrude = extrude(rectangleSketch, length = 10)
 bottom = startSketchOn(XY)
  |> startProfileAt([0, 0], %)
  |> arcTo({ end = [10, 10], interior = [5, 1] }, %, $arc1)
-  |> angledLine([tangentToEnd(arc1), 20], %)
+  |> angledLine(angle = tangentToEnd(arc1), length = 20)
  |> close()
 ```

@ -95,7 +86,7 @@ circSketch = startSketchOn(XY)

 triangleSketch = startSketchOn(XY)
  |> startProfileAt([-5, 0], %)
-  |> angledLine([tangentToEnd(circ), 10], %)
+  |> angledLine(angle = tangentToEnd(circ), length = 10)
  |> line(end = [-15, 0])
  |> close()
 ```
--- a/docs/kcl/tangentialArc.md
+++ b/docs/kcl/tangentialArc.md
--- a/docs/kcl/tangentialArcTo.md
+++ b/docs/kcl/tangentialArcTo.md
@ -35,7 +35,7 @@ tangentialArcTo(
 ```js
 exampleSketch = startSketchOn(XZ)
  |> startProfileAt([0, 0], %)
-  |> angledLine({ angle = 60, length = 10 }, %)
+  |> angledLine(angle = 60, length = 10)
  |> tangentialArcTo([15, 15], %)
  |> line(end = [10, -15])
  |> close()
--- a/docs/kcl/tangentialArcToRelative.md
+++ b/docs/kcl/tangentialArcToRelative.md
@ -35,7 +35,7 @@ tangentialArcToRelative(
 ```js
 exampleSketch = startSketchOn(XZ)
  |> startProfileAt([0, 0], %)
-  |> angledLine({ angle = 45, length = 10 }, %)
+  |> angledLine(angle = 45, length = 10)
  |> tangentialArcToRelative([0, -10], %)
  |> line(end = [-10, 0])
  |> close()
--- a/docs/kcl/tau.md
+++ b/docs/kcl/tau.md
@ -30,7 +30,7 @@ tau(): number
 ```js
 exampleSketch = startSketchOn(XZ)
  |> startProfileAt([0, 0], %)
-  |> angledLine({ angle = 50, length = 10 * tau() }, %)
+  |> angledLine(angle = 50, length = 10 * tau())
  |> yLine(endAbsolute = 0)
  |> close()

--- a/docs/kcl/toDegrees.md
+++ b/docs/kcl/toDegrees.md
@ -33,10 +33,7 @@ toDegrees(num: number): number
 ```js
 exampleSketch = startSketchOn(XZ)
  |> startProfileAt([0, 0], %)
-  |> angledLine({
-       angle = 50,
-       length = 70 * cos(toDegrees(pi() / 4))
-     }, %)
+  |> angledLine(angle = 50, length = 70 * cos(toDegrees(pi() / 4)))
  |> yLine(endAbsolute = 0)
  |> close()

--- a/docs/kcl/toRadians.md
+++ b/docs/kcl/toRadians.md
@ -33,10 +33,7 @@ toRadians(num: number): number
 ```js
 exampleSketch = startSketchOn(XZ)
  |> startProfileAt([0, 0], %)
-  |> angledLine({
-       angle = 50,
-       length = 70 * cos(toRadians(45))
-     }, %)
+  |> angledLine(angle = 50, length = 70 * cos(toRadians(45)))
  |> yLine(endAbsolute = 0)
  |> close()

--- a/docs/kcl/translate.md
+++ b/docs/kcl/translate.md
--- a/docs/kcl/types.md
+++ b/docs/kcl/types.md
@ -184,15 +184,17 @@ way:
 ```norun
 startSketchOn('XZ')
  |> startProfileAt(origin, %)
-  |> angledLine({angle = 0, length = 191.26}, %, $rectangleSegmentA001)
-  |> angledLine({
+  |> angledLine(angle = 0, length = 191.26, tag = $rectangleSegmentA001)
+  |> angledLine(
       angle = segAng(rectangleSegmentA001) - 90,
       length = 196.99,
-     }, %, $rectangleSegmentB001)
-  |> angledLine({
+       tag = $rectangleSegmentB001,
+     )
+  |> angledLine(
       angle = segAng(rectangleSegmentA001),
       length = -segLen(rectangleSegmentA001),
-     }, %, $rectangleSegmentC001)
+       tag = $rectangleSegmentC001,
+     )
  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
  |> close()
 ```
@ -217,15 +219,17 @@ However if the code was written like this:
 fn rect(origin) {
  return startSketchOn('XZ')
    |> startProfileAt(origin, %)
-    |> angledLine({angle = 0, length = 191.26}, %, $rectangleSegmentA001)
-    |> angledLine({
+    |> angledLine(angle = 0, length = 191.26, tag = $rectangleSegmentA001)
+    |> angledLine(
         angle = segAng(rectangleSegmentA001) - 90,
-         length = 196.99
-       }, %, $rectangleSegmentB001)
-    |> angledLine({
+         length = 196.99,
+         tag = $rectangleSegmentB001,
+       )
+    |> angledLine(
         angle = segAng(rectangleSegmentA001),
         length = -segLen(rectangleSegmentA001)
-       }, %, $rectangleSegmentC001)
+         tag = $rectangleSegmentC001,
+       )
    |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
    |> close()
 }
@ -245,15 +249,17 @@ For example the following code works.
 fn rect(origin) {
  return startSketchOn('XZ')
    |> startProfileAt(origin, %)
-    |> angledLine({angle = 0, length = 191.26}, %, $rectangleSegmentA001)
-    |> angledLine({
+    |> angledLine(angle = 0, length = 191.26, tag = $rectangleSegmentA001)
+    |> angledLine(
         angle = segAng(rectangleSegmentA001) - 90,
-         length = 196.99
-       }, %, $rectangleSegmentB001)
-    |> angledLine({
+         length = 196.99,
+         tag = $rectangleSegmentB001,
+       )
+    |> angledLine(
         angle = segAng(rectangleSegmentA001),
         length = -segLen(rectangleSegmentA001)
-       }, %, $rectangleSegmentC001)
+         tag = $rectangleSegmentC001,
+       )
    |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
    |> close()
 }
--- a/docs/kcl/types/AngledLineData.md
+++ b/docs/kcl/types/AngledLineData.md
@ -1,46 +0,0 @@
---
-title: "AngledLineData"
-excerpt: "Data to draw an angled line."
-layout: manual
---
-
-Data to draw an angled line.
-
-
-
-
-**This schema accepts any of the following:**
-
-An angle and length with explicitly named parameters
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `angle` |[`number`](/docs/kcl/types/number)| The angle of the line (in degrees). | No |
-| `length` |[`number`](/docs/kcl/types/number)| The length of the line. | No |
-
-
----
-An angle and length given as a pair
-
-**Type:** `array`
-
-`[number, number]`
-
-
-
-
-
----
-
-
-
-
-
--- a/Show More
+++ b/Show More