Merge branch 'main' into pierremtb/issue7657-Allow-all-sweeps-to-work-on-variable-less-profiles

Bump vite from 5.4.18 to 5.4.19 in the security-major group (#7685 )
* Bump vite from 5.4.18 to 5.4.19 in the security-major group Bumps the security-major group with 1 update: [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite). Updates `vite` from 5.4.18 to 5.4.19 - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v5.4.19/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v5.4.19/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-version: 5.4.19 dependency-type: direct:development dependency-group: security-major ... Signed-off-by: dependabot[bot] <support@github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jonathan Tran <jonnytran@gmail.com>
2025-07-04 11:33:24 -04:00 · 2025-07-03 19:36:15 -04:00 · 2025-07-03 17:05:59 -04:00 · 2025-07-03 20:16:46 +00:00 · 2025-07-03 15:45:32 -04:00 · 2025-07-03 15:00:21 -04:00
63 changed files with 1618 additions and 485 deletions
--- a/.env.development
+++ b/.env.development
@ -3,18 +3,17 @@
 NODE_ENV=development
 DEV=true

+# App
 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_KITTYCAD_API_BASE_URL=https://api.dev.zoo.dev
 VITE_KC_SITE_BASE_URL=https://dev.zoo.dev
 VITE_KC_SITE_APP_URL=https://app.dev.zoo.dev
-VITE_KC_SKIP_AUTH=false
 VITE_KC_CONNECTION_TIMEOUT_MS=5000
-#VITE_WASM_URL="optional way of overriding the wasm url, particular for unit tests which need this if you running not on the default 3000 port"
-#VITE_KC_DEV_TOKEN="optional token to skip auth in the app"
-#token="required token for playwright. TODO: clean up env vars in #3973"
+#VITE_WASM_URL="optional override of Wasm URL if not on default port 3000"
+#VITE_KITTYCAD_API_TOKEN="required for testing, optional to skip auth in the app"
+FAIL_ON_CONSOLE_ERRORS=true

+# KCL
 RUST_BACKTRACE=1
 PYO3_PYTHON=/usr/local/bin/python3
-#KITTYCAD_API_TOKEN="required token for engine testing"
-
-FAIL_ON_CONSOLE_ERRORS=true
+#KITTYCAD_API_TOKEN=$VITE_KITTYCAD_API_TOKEN
--- a/.env.production
+++ b/.env.production
@ -1,7 +1,8 @@
 NODE_ENV=production
+
+# App
 VITE_KC_API_WS_MODELING_URL=wss://api.zoo.dev/ws/modeling/commands
-VITE_KC_API_BASE_URL=https://api.zoo.dev
+VITE_KITTYCAD_API_BASE_URL=https://api.zoo.dev
 VITE_KC_SITE_BASE_URL=https://zoo.dev
 VITE_KC_SITE_APP_URL=https://app.zoo.dev
-VITE_KC_SKIP_AUTH=false
 VITE_KC_CONNECTION_TIMEOUT_MS=15000
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@ -157,7 +157,7 @@ jobs:
          timeout_minutes: 5
          max_attempts: 5
        env:
-          token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
+          VITE_KITTYCAD_API_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 }}
@ -169,7 +169,7 @@ jobs:
        if: always()
        run: npm run test:snapshots -- --last-failed --update-snapshots
        env:
-          token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
+          VITE_KITTYCAD_API_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 }}
@ -284,7 +284,7 @@ jobs:
          timeout_minutes: 5
          max_attempts: 5
        env:
-          token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
+          VITE_KITTYCAD_API_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 }}
@ -410,7 +410,7 @@ jobs:
          max_attempts: 9
        env:
          FAIL_ON_CONSOLE_ERRORS: true
-          token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
+          VITE_KITTYCAD_API_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 }}
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@ -62,7 +62,7 @@ jobs:
        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
        run: xvfb-run -a npm run test:unit
        env:
-          VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
+          VITE_KITTYCAD_API_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}

      - name: Check for changes
        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -65,7 +65,7 @@ If you're not a Zoo employee you won't be able to access the dev environment, yo

 ### Development environment variables

-The Copilot LSP plugin in the editor requires a Zoo API token to run. In production, we authenticate this with a token via cookie in the browser and device auth token in the desktop environment, but this token is inaccessible in the dev browser version because the cookie is considered "cross-site" (from `localhost` to `zoo.dev`). There is an optional environment variable called `VITE_KC_DEV_TOKEN` that you can populate with a dev token in a `.env.development.local` file to not check it into Git, which will use that token instead of other methods for the LSP service.
+The Copilot LSP plugin in the editor requires a Zoo API token to run. In production, we authenticate this with a token via cookie in the browser and device auth token in the desktop environment, but this token is inaccessible in the dev browser version because the cookie is considered "cross-site" (from `localhost` to `zoo.dev`). There is an optional environment variable called `VITE_KITTYCAD_API_TOKEN` that you can populate with a dev token in a `.env.development.local` file to not check it into Git, which will use that token instead of other methods for the LSP service.

 ### Developing in Chrome

@ -96,7 +96,7 @@ To package the app for your platform with electron-builder, run `npm run tronb:p

 Prepare these system dependencies:

- Set $token from https://zoo.dev/account/api-tokens
+- Set `$VITE_KITTYCAD_API_TOKEN` from https://zoo.dev/account/api-tokens

 #### Snapshot tests (Google Chrome on Ubuntu only)

@ -259,7 +259,7 @@ If the application needs to overwrite the known file on disk use this pattern. T
 - `npm run circular-deps:overwrite`
 - `npm run url-checker:overwrite`

-#### Diff baseline and current 
+#### Diff baseline and current

 These commands will write a /tmp/ file on disk and compare it to the known file in the repository. This command will also be used in the CI CD pipeline for automated checks

--- a/2
+++ b/2
@ -49,7 +49,7 @@ 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)
+VITE_SOURCES := $(wildcard vite.*) $(wildcard vite/**/*.tsx) .env*

 .PHONY: build
 build: install public/kcl_wasm_lib_bg.wasm public/kcl-samples/manifest.json .vite/build/main.js
--- a/e2e/playwright/auth.spec.ts
+++ b/e2e/playwright/auth.spec.ts
@ -1,6 +1,5 @@
 import { expect, test } from '@e2e/playwright/zoo-test'

-// test file is for testing auth functionality
 test.describe('Authentication tests', () => {
  test(
    `The user can sign out and back in`,
@ -13,22 +12,12 @@ test.describe('Authentication tests', () => {
      await page.setBodyDimensions({ width: 1000, height: 500 })
      await homePage.projectSection.waitFor()

-      // This is only needed as an override to test-utils' setup() for this test
-      await page.addInitScript(() => {
-        localStorage.setItem('TOKEN_PERSIST_KEY', '')
-      })
-
      await test.step('Click on sign out and expect sign in page', async () => {
        await toolbar.userSidebarButton.click()
        await toolbar.signOutButton.click()
        await expect(signInPage.signInButton).toBeVisible()
      })

-      await test.step("Refresh doesn't log the user back in", async () => {
-        await page.reload()
-        await expect(signInPage.signInButton).toBeVisible()
-      })
-
      await test.step('Click on sign in and cancel, click again and expect different code', async () => {
        await signInPage.signInButton.click()
        await expect(signInPage.userCode).toBeVisible()
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-3-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-3-Google-Chrome-linux.png
--- a/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-4-Google-Chrome-linux.png
+++ b/e2e/playwright/snapshot-tests.spec.ts-snapshots/Draft-segments-should-look-right-4-Google-Chrome-linux.png
--- a/e2e/playwright/test-utils.ts
+++ b/e2e/playwright/test-utils.ts
@ -17,7 +17,7 @@ import dotenv from 'dotenv'

 const NODE_ENV = process.env.NODE_ENV || 'development'
 dotenv.config({ path: [`.env.${NODE_ENV}.local`, `.env.${NODE_ENV}`] })
-export const token = process.env.token || ''
+export const token = process.env.VITE_KITTYCAD_API_TOKEN || ''

 import type { ProjectConfiguration } from '@rust/kcl-lib/bindings/ProjectConfiguration'

--- a/interface.d.ts
+++ b/interface.d.ts
@ -72,16 +72,13 @@ export interface IElectronAPI {
  }
  process: {
    env: {
-      BASE_URL: string
      IS_PLAYWRIGHT: string
-      VITE_KC_DEV_TOKEN: string
+      VITE_KITTYCAD_API_TOKEN: string
      VITE_KC_API_WS_MODELING_URL: string
-      VITE_KC_API_BASE_URL: string
+      VITE_KITTYCAD_API_BASE_URL: string
      VITE_KC_SITE_BASE_URL: string
      VITE_KC_SITE_APP_URL: string
-      VITE_KC_SKIP_AUTH: string
      VITE_KC_CONNECTION_TIMEOUT_MS: string
-      VITE_KC_DEV_TOKEN: string
      NODE_ENV: string
      PROD: string
      DEV: string
--- a/package-lock.json
+++ b/package-lock.json
@ -149,7 +149,7 @@
        "ts-node": "^10.0.0",
        "typescript": "^5.8.3",
        "typescript-eslint": "^8.30.1",
-        "vite": "^5.4.18",
+        "vite": "^5.4.19",
        "vite-plugin-package-version": "^1.1.0",
        "vite-plugin-top-level-await": "^1.5.0",
        "vite-tsconfig-paths": "^4.3.2",
@ -3652,9 +3652,9 @@
      }
    },
    "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.3.tgz",
-      "integrity": "sha512-W8bFfPA8DowP8l//sxjJLSLkD8iEjMc7cBVyP+u4cEv9sM7mdUCkgsj+t0n/BWPFtv7WWCN5Yzj0N6FJNUUqBQ==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.4.tgz",
+      "integrity": "sha512-1VCICWypeQKhVbE9oW/sJaAmjLxhVqacdkvPLEjwlttjfwENRSClS8EjBz0KzRyFSCPDIkuXW34Je/vk7zdB7Q==",
      "cpu": [
        "ppc64"
      ],
@ -3668,9 +3668,9 @@
      }
    },
    "node_modules/@esbuild/android-arm": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.3.tgz",
-      "integrity": "sha512-PuwVXbnP87Tcff5I9ngV0lmiSu40xw1At6i3GsU77U7cjDDB4s0X2cyFuBiDa1SBk9DnvWwnGvVaGBqoFWPb7A==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.4.tgz",
+      "integrity": "sha512-QNdQEps7DfFwE3hXiU4BZeOV68HHzYwGd0Nthhd3uCkkEKK7/R6MTgM0P7H7FAs5pU/DIWsviMmEGxEoxIZ+ZQ==",
      "cpu": [
        "arm"
      ],
@ -3684,9 +3684,9 @@
      }
    },
    "node_modules/@esbuild/android-arm64": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.3.tgz",
-      "integrity": "sha512-XelR6MzjlZuBM4f5z2IQHK6LkK34Cvv6Rj2EntER3lwCBFdg6h2lKbtRjpTTsdEjD/WSe1q8UyPBXP1x3i/wYQ==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.4.tgz",
+      "integrity": "sha512-bBy69pgfhMGtCnwpC/x5QhfxAz/cBgQ9enbtwjf6V9lnPI/hMyT9iWpR1arm0l3kttTr4L0KSLpKmLp/ilKS9A==",
      "cpu": [
        "arm64"
      ],
@ -3700,9 +3700,9 @@
      }
    },
    "node_modules/@esbuild/android-x64": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.3.tgz",
-      "integrity": "sha512-ogtTpYHT/g1GWS/zKM0cc/tIebFjm1F9Aw1boQ2Y0eUQ+J89d0jFY//s9ei9jVIlkYi8AfOjiixcLJSGNSOAdQ==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.4.tgz",
+      "integrity": "sha512-TVhdVtQIFuVpIIR282btcGC2oGQoSfZfmBdTip2anCaVYcqWlZXGcdcKIUklfX2wj0JklNYgz39OBqh2cqXvcQ==",
      "cpu": [
        "x64"
      ],
@ -3716,9 +3716,9 @@
      }
    },
    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.3.tgz",
-      "integrity": "sha512-eESK5yfPNTqpAmDfFWNsOhmIOaQA59tAcF/EfYvo5/QWQCzXn5iUSOnqt3ra3UdzBv073ykTtmeLJZGt3HhA+w==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.4.tgz",
+      "integrity": "sha512-Y1giCfM4nlHDWEfSckMzeWNdQS31BQGs9/rouw6Ub91tkK79aIMTH3q9xHvzH8d0wDru5Ci0kWB8b3up/nl16g==",
      "cpu": [
        "arm64"
      ],
@ -3732,9 +3732,9 @@
      }
    },
    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.3.tgz",
-      "integrity": "sha512-Kd8glo7sIZtwOLcPbW0yLpKmBNWMANZhrC1r6K++uDR2zyzb6AeOYtI6udbtabmQpFaxJ8uduXMAo1gs5ozz8A==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.4.tgz",
+      "integrity": "sha512-CJsry8ZGM5VFVeyUYB3cdKpd/H69PYez4eJh1W/t38vzutdjEjtP7hB6eLKBoOdxcAlCtEYHzQ/PJ/oU9I4u0A==",
      "cpu": [
        "x64"
      ],
@ -3748,9 +3748,9 @@
      }
    },
    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.3.tgz",
-      "integrity": "sha512-EJiyS70BYybOBpJth3M0KLOus0n+RRMKTYzhYhFeMwp7e/RaajXvP+BWlmEXNk6uk+KAu46j/kaQzr6au+JcIw==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.4.tgz",
+      "integrity": "sha512-yYq+39NlTRzU2XmoPW4l5Ifpl9fqSk0nAJYM/V/WUGPEFfek1epLHJIkTQM6bBs1swApjO5nWgvr843g6TjxuQ==",
      "cpu": [
        "arm64"
      ],
@ -3764,9 +3764,9 @@
      }
    },
    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.3.tgz",
-      "integrity": "sha512-Q+wSjaLpGxYf7zC0kL0nDlhsfuFkoN+EXrx2KSB33RhinWzejOd6AvgmP5JbkgXKmjhmpfgKZq24pneodYqE8Q==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.4.tgz",
+      "integrity": "sha512-0FgvOJ6UUMflsHSPLzdfDnnBBVoCDtBTVyn/MrWloUNvq/5SFmh13l3dvgRPkDihRxb77Y17MbqbCAa2strMQQ==",
      "cpu": [
        "x64"
      ],
@ -3780,9 +3780,9 @@
      }
    },
    "node_modules/@esbuild/linux-arm": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.3.tgz",
-      "integrity": "sha512-dUOVmAUzuHy2ZOKIHIKHCm58HKzFqd+puLaS424h6I85GlSDRZIA5ycBixb3mFgM0Jdh+ZOSB6KptX30DD8YOQ==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.4.tgz",
+      "integrity": "sha512-kro4c0P85GMfFYqW4TWOpvmF8rFShbWGnrLqlzp4X1TNWjRY3JMYUfDCtOxPKOIY8B0WC8HN51hGP4I4hz4AaQ==",
      "cpu": [
        "arm"
      ],
@ -3796,9 +3796,9 @@
      }
    },
    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.3.tgz",
-      "integrity": "sha512-xCUgnNYhRD5bb1C1nqrDV1PfkwgbswTTBRbAd8aH5PhYzikdf/ddtsYyMXFfGSsb/6t6QaPSzxtbfAZr9uox4A==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.4.tgz",
+      "integrity": "sha512-+89UsQTfXdmjIvZS6nUnOOLoXnkUTB9hR5QAeLrQdzOSWZvNSAXAtcRDHWtqAUtAmv7ZM1WPOOeSxDzzzMogiQ==",
      "cpu": [
        "arm64"
      ],
@ -3812,9 +3812,9 @@
      }
    },
    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.3.tgz",
-      "integrity": "sha512-yplPOpczHOO4jTYKmuYuANI3WhvIPSVANGcNUeMlxH4twz/TeXuzEP41tGKNGWJjuMhotpGabeFYGAOU2ummBw==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.4.tgz",
+      "integrity": "sha512-yTEjoapy8UP3rv8dB0ip3AfMpRbyhSN3+hY8mo/i4QXFeDxmiYbEKp3ZRjBKcOP862Ua4b1PDfwlvbuwY7hIGQ==",
      "cpu": [
        "ia32"
      ],
@ -3828,9 +3828,9 @@
      }
    },
    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.3.tgz",
-      "integrity": "sha512-P4BLP5/fjyihmXCELRGrLd793q/lBtKMQl8ARGpDxgzgIKJDRJ/u4r1A/HgpBpKpKZelGct2PGI4T+axcedf6g==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.4.tgz",
+      "integrity": "sha512-NeqqYkrcGzFwi6CGRGNMOjWGGSYOpqwCjS9fvaUlX5s3zwOtn1qwg1s2iE2svBe4Q/YOG1q6875lcAoQK/F4VA==",
      "cpu": [
        "loong64"
      ],
@ -3844,9 +3844,9 @@
      }
    },
    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.3.tgz",
-      "integrity": "sha512-eRAOV2ODpu6P5divMEMa26RRqb2yUoYsuQQOuFUexUoQndm4MdpXXDBbUoKIc0iPa4aCO7gIhtnYomkn2x+bag==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.4.tgz",
+      "integrity": "sha512-IcvTlF9dtLrfL/M8WgNI/qJYBENP3ekgsHbYUIzEzq5XJzzVEV/fXY9WFPfEEXmu3ck2qJP8LG/p3Q8f7Zc2Xg==",
      "cpu": [
        "mips64el"
      ],
@ -3860,9 +3860,9 @@
      }
    },
    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.3.tgz",
-      "integrity": "sha512-ZC4jV2p7VbzTlnl8nZKLcBkfzIf4Yad1SJM4ZMKYnJqZFD4rTI+pBG65u8ev4jk3/MPwY9DvGn50wi3uhdaghg==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.4.tgz",
+      "integrity": "sha512-HOy0aLTJTVtoTeGZh4HSXaO6M95qu4k5lJcH4gxv56iaycfz1S8GO/5Jh6X4Y1YiI0h7cRyLi+HixMR+88swag==",
      "cpu": [
        "ppc64"
      ],
@ -3876,9 +3876,9 @@
      }
    },
    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.3.tgz",
-      "integrity": "sha512-LDDODcFzNtECTrUUbVCs6j9/bDVqy7DDRsuIXJg6so+mFksgwG7ZVnTruYi5V+z3eE5y+BJZw7VvUadkbfg7QA==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.4.tgz",
+      "integrity": "sha512-i8JUDAufpz9jOzo4yIShCTcXzS07vEgWzyX3NH2G7LEFVgrLEhjwL3ajFE4fZI3I4ZgiM7JH3GQ7ReObROvSUA==",
      "cpu": [
        "riscv64"
      ],
@ -3892,9 +3892,9 @@
      }
    },
    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.3.tgz",
-      "integrity": "sha512-s+w/NOY2k0yC2p9SLen+ymflgcpRkvwwa02fqmAwhBRI3SC12uiS10edHHXlVWwfAagYSY5UpmT/zISXPMW3tQ==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.4.tgz",
+      "integrity": "sha512-jFnu+6UbLlzIjPQpWCNh5QtrcNfMLjgIavnwPQAfoGx4q17ocOU9MsQ2QVvFxwQoWpZT8DvTLooTvmOQXkO51g==",
      "cpu": [
        "s390x"
      ],
@ -3908,9 +3908,9 @@
      }
    },
    "node_modules/@esbuild/linux-x64": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.3.tgz",
-      "integrity": "sha512-nQHDz4pXjSDC6UfOE1Fw9Q8d6GCAd9KdvMZpfVGWSJztYCarRgSDfOVBY5xwhQXseiyxapkiSJi/5/ja8mRFFA==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.4.tgz",
+      "integrity": "sha512-6e0cvXwzOnVWJHq+mskP8DNSrKBr1bULBvnFLpc1KY+d+irZSgZ02TGse5FsafKS5jg2e4pbvK6TPXaF/A6+CA==",
      "cpu": [
        "x64"
      ],
@ -3924,9 +3924,9 @@
      }
    },
    "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.3.tgz",
-      "integrity": "sha512-1QaLtOWq0mzK6tzzp0jRN3eccmN3hezey7mhLnzC6oNlJoUJz4nym5ZD7mDnS/LZQgkrhEbEiTn515lPeLpgWA==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.4.tgz",
+      "integrity": "sha512-vUnkBYxZW4hL/ie91hSqaSNjulOnYXE1VSLusnvHg2u3jewJBz3YzB9+oCw8DABeVqZGg94t9tyZFoHma8gWZQ==",
      "cpu": [
        "arm64"
      ],
@ -3940,9 +3940,9 @@
      }
    },
    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.3.tgz",
-      "integrity": "sha512-i5Hm68HXHdgv8wkrt+10Bc50zM0/eonPb/a/OFVfB6Qvpiirco5gBA5bz7S2SHuU+Y4LWn/zehzNX14Sp4r27g==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.4.tgz",
+      "integrity": "sha512-XAg8pIQn5CzhOB8odIcAm42QsOfa98SBeKUdo4xa8OvX8LbMZqEtgeWE9P/Wxt7MlG2QqvjGths+nq48TrUiKw==",
      "cpu": [
        "x64"
      ],
@ -3956,9 +3956,9 @@
      }
    },
    "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.3.tgz",
-      "integrity": "sha512-zGAVApJEYTbOC6H/3QBr2mq3upG/LBEXr85/pTtKiv2IXcgKV0RT0QA/hSXZqSvLEpXeIxah7LczB4lkiYhTAQ==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.4.tgz",
+      "integrity": "sha512-Ct2WcFEANlFDtp1nVAXSNBPDxyU+j7+tId//iHXU2f/lN5AmO4zLyhDcpR5Cz1r08mVxzt3Jpyt4PmXQ1O6+7A==",
      "cpu": [
        "arm64"
      ],
@ -3972,9 +3972,9 @@
      }
    },
    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.3.tgz",
-      "integrity": "sha512-fpqctI45NnCIDKBH5AXQBsD0NDPbEFczK98hk/aa6HJxbl+UtLkJV2+Bvy5hLSLk3LHmqt0NTkKNso1A9y1a4w==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.4.tgz",
+      "integrity": "sha512-xAGGhyOQ9Otm1Xu8NT1ifGLnA6M3sJxZ6ixylb+vIUVzvvd6GOALpwQrYrtlPouMqd/vSbgehz6HaVk4+7Afhw==",
      "cpu": [
        "x64"
      ],
@ -3988,9 +3988,9 @@
      }
    },
    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.3.tgz",
-      "integrity": "sha512-ROJhm7d8bk9dMCUZjkS8fgzsPAZEjtRJqCAmVgB0gMrvG7hfmPmz9k1rwO4jSiblFjYmNvbECL9uhaPzONMfgA==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.4.tgz",
+      "integrity": "sha512-Mw+tzy4pp6wZEK0+Lwr76pWLjrtjmJyUB23tHKqEDP74R3q95luY/bXqXZeYl4NYlvwOqoRKlInQialgCKy67Q==",
      "cpu": [
        "x64"
      ],
@ -4004,9 +4004,9 @@
      }
    },
    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.3.tgz",
-      "integrity": "sha512-YWcow8peiHpNBiIXHwaswPnAXLsLVygFwCB3A7Bh5jRkIBFWHGmNQ48AlX4xDvQNoMZlPYzjVOQDYEzWCqufMQ==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.4.tgz",
+      "integrity": "sha512-AVUP428VQTSddguz9dO9ngb+E5aScyg7nOeJDrF1HPYu555gmza3bDGMPhmVXL8svDSoqPCsCPjb265yG/kLKQ==",
      "cpu": [
        "arm64"
      ],
@ -4020,9 +4020,9 @@
      }
    },
    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.3.tgz",
-      "integrity": "sha512-qspTZOIGoXVS4DpNqUYUs9UxVb04khS1Degaw/MnfMe7goQ3lTfQ13Vw4qY/Nj0979BGvMRpAYbs/BAxEvU8ew==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.4.tgz",
+      "integrity": "sha512-i1sW+1i+oWvQzSgfRcxxG2k4I9n3O9NRqy8U+uugaT2Dy7kLO9Y7wI72haOahxceMX8hZAzgGou1FhndRldxRg==",
      "cpu": [
        "ia32"
      ],
@ -4036,9 +4036,9 @@
      }
    },
    "node_modules/@esbuild/win32-x64": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.3.tgz",
-      "integrity": "sha512-ICgUR+kPimx0vvRzf+N/7L7tVSQeE3BYY+NhHRHXS1kBuPO7z2+7ea2HbhDyZdTephgvNvKrlDDKUexuCVBVvg==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.4.tgz",
+      "integrity": "sha512-nOT2vZNw6hJ+z43oP1SPea/G/6AbN6X+bGNhNuq8NtRHy4wsMhw765IKLNmnjek7GvjWBYQ8Q5VBoYTFg9y1UQ==",
      "cpu": [
        "x64"
      ],
@ -13219,9 +13219,9 @@
      "optional": true
    },
    "node_modules/esbuild": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.3.tgz",
-      "integrity": "sha512-qKA6Pvai73+M2FtftpNKRxJ78GIjmFXFxd/1DVBqGo/qNhLSfv+G12n9pNoWdytJC8U00TrViOwpjT0zgqQS8Q==",
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.4.tgz",
+      "integrity": "sha512-8pgjLUcUjcgDg+2Q4NYXnPbo/vncAY4UmyaCm0jZevERqCHZIaWwdJHkf8XQtu4AxSKCdvrUbT0XUr1IdZzI8Q==",
      "dev": true,
      "hasInstallScript": true,
      "bin": {
@ -13231,31 +13231,31 @@
        "node": ">=18"
      },
      "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.25.3",
-        "@esbuild/android-arm": "0.25.3",
-        "@esbuild/android-arm64": "0.25.3",
-        "@esbuild/android-x64": "0.25.3",
-        "@esbuild/darwin-arm64": "0.25.3",
-        "@esbuild/darwin-x64": "0.25.3",
-        "@esbuild/freebsd-arm64": "0.25.3",
-        "@esbuild/freebsd-x64": "0.25.3",
-        "@esbuild/linux-arm": "0.25.3",
-        "@esbuild/linux-arm64": "0.25.3",
-        "@esbuild/linux-ia32": "0.25.3",
-        "@esbuild/linux-loong64": "0.25.3",
-        "@esbuild/linux-mips64el": "0.25.3",
-        "@esbuild/linux-ppc64": "0.25.3",
-        "@esbuild/linux-riscv64": "0.25.3",
-        "@esbuild/linux-s390x": "0.25.3",
-        "@esbuild/linux-x64": "0.25.3",
-        "@esbuild/netbsd-arm64": "0.25.3",
-        "@esbuild/netbsd-x64": "0.25.3",
-        "@esbuild/openbsd-arm64": "0.25.3",
-        "@esbuild/openbsd-x64": "0.25.3",
-        "@esbuild/sunos-x64": "0.25.3",
-        "@esbuild/win32-arm64": "0.25.3",
-        "@esbuild/win32-ia32": "0.25.3",
-        "@esbuild/win32-x64": "0.25.3"
+        "@esbuild/aix-ppc64": "0.25.4",
+        "@esbuild/android-arm": "0.25.4",
+        "@esbuild/android-arm64": "0.25.4",
+        "@esbuild/android-x64": "0.25.4",
+        "@esbuild/darwin-arm64": "0.25.4",
+        "@esbuild/darwin-x64": "0.25.4",
+        "@esbuild/freebsd-arm64": "0.25.4",
+        "@esbuild/freebsd-x64": "0.25.4",
+        "@esbuild/linux-arm": "0.25.4",
+        "@esbuild/linux-arm64": "0.25.4",
+        "@esbuild/linux-ia32": "0.25.4",
+        "@esbuild/linux-loong64": "0.25.4",
+        "@esbuild/linux-mips64el": "0.25.4",
+        "@esbuild/linux-ppc64": "0.25.4",
+        "@esbuild/linux-riscv64": "0.25.4",
+        "@esbuild/linux-s390x": "0.25.4",
+        "@esbuild/linux-x64": "0.25.4",
+        "@esbuild/netbsd-arm64": "0.25.4",
+        "@esbuild/netbsd-x64": "0.25.4",
+        "@esbuild/openbsd-arm64": "0.25.4",
+        "@esbuild/openbsd-x64": "0.25.4",
+        "@esbuild/sunos-x64": "0.25.4",
+        "@esbuild/win32-arm64": "0.25.4",
+        "@esbuild/win32-ia32": "0.25.4",
+        "@esbuild/win32-x64": "0.25.4"
      }
    },
    "node_modules/escalade": {
@ -25132,11 +25132,10 @@
      "optional": true
    },
    "node_modules/vite": {
-      "version": "5.4.18",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.18.tgz",
-      "integrity": "sha512-1oDcnEp3lVyHCuQ2YFelM4Alm2o91xNoMncRm1U7S+JdYfYOvbiGZ3/CxGttrOu2M/KcGz7cRC2DoNUA6urmMA==",
+      "version": "5.4.19",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.19.tgz",
+      "integrity": "sha512-qO3aKv3HoQC8QKiNSTuUM1l9o/XX3+c+VTgLHbJWHZGeTPVAg2XwazI9UWzoxjIJCGCV2zU60uqMzjeLZuULqA==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
        "esbuild": "^0.21.3",
        "postcss": "^8.4.43",
@ -26640,10 +26639,25 @@
        "vscode-uri": "^3.1.0"
      },
      "devDependencies": {
-        "@types/node": "^22.14.1",
+        "@types/node": "^24.0.7",
        "ts-node": "^10.9.2"
      }
    },
+    "packages/codemirror-lsp-client/node_modules/@types/node": {
+      "version": "24.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.0.10.tgz",
+      "integrity": "sha512-ENHwaH+JIRTDIEEbDK6QSQntAYGtbvdDXnMXnZaZ6k13Du1dPMmprkEHIL7ok2Wl2aZevetwTAb5S+7yIF+enA==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~7.8.0"
+      }
+    },
+    "packages/codemirror-lsp-client/node_modules/undici-types": {
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.8.0.tgz",
+      "integrity": "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==",
+      "dev": true
+    },
    "rust/kcl-language-server": {
      "version": "0.0.0",
      "license": "MIT",
@ -26661,7 +26675,7 @@
        "@vscode/test-electron": "^2.4.1",
        "@vscode/vsce": "^3.3.2",
        "cross-env": "^7.0.3",
-        "esbuild": "^0.25.3",
+        "esbuild": "^0.25.4",
        "glob": "^11.0.1",
        "mocha": "^11.1.0",
        "typescript": "^5.8.3"
--- a/package.json
+++ b/package.json
@ -227,7 +227,7 @@
    "ts-node": "^10.0.0",
    "typescript": "^5.8.3",
    "typescript-eslint": "^8.30.1",
-    "vite": "^5.4.18",
+    "vite": "^5.4.19",
    "vite-plugin-package-version": "^1.1.0",
    "vite-plugin-top-level-await": "^1.5.0",
    "vite-tsconfig-paths": "^4.3.2",
--- a/rust/kcl-language-server/package.json
+++ b/rust/kcl-language-server/package.json
@ -123,7 +123,7 @@
    "@vscode/test-electron": "^2.4.1",
    "@vscode/vsce": "^3.3.2",
    "cross-env": "^7.0.3",
-    "esbuild": "^0.25.3",
+    "esbuild": "^0.25.4",
    "glob": "^11.0.1",
    "mocha": "^11.1.0",
    "typescript": "^5.8.3"
--- a/rust/kcl-lib/e2e/executor/outputs/helix_defaults_negative_extrude_output.step
+++ b/rust/kcl-lib/e2e/executor/outputs/helix_defaults_negative_extrude_output.step
@ -10,71 +10,76 @@ DATA;
  NAMED_UNIT(*)
  SI_UNIT($, .METRE.)
 );
-#2 = UNCERTAINTY_MEASURE_WITH_UNIT(0.00001, #1, 'DISTANCE_ACCURACY_VALUE', $);
-#3 = (
+#2 = (
+  NAMED_UNIT(*)
+  PLANE_ANGLE_UNIT()
+  SI_UNIT($, .RADIAN.)
+);
+#3 = UNCERTAINTY_MEASURE_WITH_UNIT(0.00001, #1, 'DISTANCE_ACCURACY_VALUE', $);
+#4 = (
  GEOMETRIC_REPRESENTATION_CONTEXT(3)
-  GLOBAL_UNCERTAINTY_ASSIGNED_CONTEXT((#2))
-  GLOBAL_UNIT_ASSIGNED_CONTEXT((#1))
+  GLOBAL_UNCERTAINTY_ASSIGNED_CONTEXT((#3))
+  GLOBAL_UNIT_ASSIGNED_CONTEXT((#1, #2))
  REPRESENTATION_CONTEXT('', '3D')
 );
-#4 = CARTESIAN_POINT('NONE', (0.015, -0.01, -0.005));
-#5 = VERTEX_POINT('NONE', #4);
-#6 = CARTESIAN_POINT('NONE', (0.015, 0, -0.005));
-#7 = VERTEX_POINT('NONE', #6);
-#8 = DIRECTION('NONE', (1, 0, -0));
-#9 = DIRECTION('NONE', (0, 1, 0));
-#10 = CARTESIAN_POINT('NONE', (0.005, -0.01, -0.005));
-#11 = AXIS2_PLACEMENT_3D('NONE', #10, #9, #8);
-#12 = CIRCLE('NONE', #11, 0.01);
-#13 = DIRECTION('NONE', (0, 1, 0));
-#14 = VECTOR('NONE', #13, 1);
-#15 = CARTESIAN_POINT('NONE', (0.015, -0.01, -0.005));
-#16 = LINE('NONE', #15, #14);
-#17 = DIRECTION('NONE', (1, 0, -0));
-#18 = DIRECTION('NONE', (0, 1, 0));
-#19 = CARTESIAN_POINT('NONE', (0.005, 0, -0.005));
-#20 = AXIS2_PLACEMENT_3D('NONE', #19, #18, #17);
-#21 = CIRCLE('NONE', #20, 0.01);
-#22 = EDGE_CURVE('NONE', #5, #5, #12, .T.);
-#23 = EDGE_CURVE('NONE', #5, #7, #16, .T.);
-#24 = EDGE_CURVE('NONE', #7, #7, #21, .T.);
-#25 = CARTESIAN_POINT('NONE', (0.005, -0.005, -0.005));
-#26 = DIRECTION('NONE', (0, 1, 0));
-#27 = DIRECTION('NONE', (1, 0, -0));
-#28 = AXIS2_PLACEMENT_3D('NONE', #25, #26, #27);
-#29 = CYLINDRICAL_SURFACE('NONE', #28, 0.01);
-#30 = CARTESIAN_POINT('NONE', (0, -0.01, -0));
-#31 = DIRECTION('NONE', (0, 1, 0));
-#32 = AXIS2_PLACEMENT_3D('NONE', #30, #31, $);
-#33 = PLANE('NONE', #32);
-#34 = CARTESIAN_POINT('NONE', (0, 0, -0));
-#35 = DIRECTION('NONE', (0, 1, 0));
-#36 = AXIS2_PLACEMENT_3D('NONE', #34, #35, $);
-#37 = PLANE('NONE', #36);
-#38 = ORIENTED_EDGE('NONE', *, *, #22, .T.);
-#39 = ORIENTED_EDGE('NONE', *, *, #24, .F.);
-#40 = EDGE_LOOP('NONE', (#38));
-#41 = FACE_BOUND('NONE', #40, .T.);
-#42 = EDGE_LOOP('NONE', (#39));
-#43 = FACE_BOUND('NONE', #42, .T.);
-#44 = ADVANCED_FACE('NONE', (#41, #43), #29, .T.);
-#45 = ORIENTED_EDGE('NONE', *, *, #22, .F.);
-#46 = EDGE_LOOP('NONE', (#45));
-#47 = FACE_BOUND('NONE', #46, .T.);
-#48 = ADVANCED_FACE('NONE', (#47), #33, .F.);
-#49 = ORIENTED_EDGE('NONE', *, *, #24, .T.);
-#50 = EDGE_LOOP('NONE', (#49));
-#51 = FACE_BOUND('NONE', #50, .T.);
-#52 = ADVANCED_FACE('NONE', (#51), #37, .T.);
-#53 = CLOSED_SHELL('NONE', (#44, #48, #52));
-#54 = MANIFOLD_SOLID_BREP('NONE', #53);
-#55 = APPLICATION_CONTEXT('configuration controlled 3D design of mechanical parts and assemblies');
-#56 = PRODUCT_DEFINITION_CONTEXT('part definition', #55, 'design');
-#57 = PRODUCT('UNIDENTIFIED_PRODUCT', 'NONE', $, ());
-#58 = PRODUCT_DEFINITION_FORMATION('', $, #57);
-#59 = PRODUCT_DEFINITION('design', $, #58, #56);
-#60 = PRODUCT_DEFINITION_SHAPE('NONE', $, #59);
-#61 = ADVANCED_BREP_SHAPE_REPRESENTATION('NONE', (#54), #3);
-#62 = SHAPE_DEFINITION_REPRESENTATION(#60, #61);
+#5 = CARTESIAN_POINT('NONE', (0.015, -0.01, -0.005));
+#6 = VERTEX_POINT('NONE', #5);
+#7 = CARTESIAN_POINT('NONE', (0.015, 0, -0.005));
+#8 = VERTEX_POINT('NONE', #7);
+#9 = DIRECTION('NONE', (1, 0, -0));
+#10 = DIRECTION('NONE', (0, 1, 0));
+#11 = CARTESIAN_POINT('NONE', (0.005, -0.01, -0.005));
+#12 = AXIS2_PLACEMENT_3D('NONE', #11, #10, #9);
+#13 = CIRCLE('NONE', #12, 0.01);
+#14 = DIRECTION('NONE', (0, 1, 0));
+#15 = VECTOR('NONE', #14, 1);
+#16 = CARTESIAN_POINT('NONE', (0.015, -0.01, -0.005));
+#17 = LINE('NONE', #16, #15);
+#18 = DIRECTION('NONE', (1, 0, -0));
+#19 = DIRECTION('NONE', (0, 1, 0));
+#20 = CARTESIAN_POINT('NONE', (0.005, 0, -0.005));
+#21 = AXIS2_PLACEMENT_3D('NONE', #20, #19, #18);
+#22 = CIRCLE('NONE', #21, 0.01);
+#23 = EDGE_CURVE('NONE', #6, #6, #13, .T.);
+#24 = EDGE_CURVE('NONE', #6, #8, #17, .T.);
+#25 = EDGE_CURVE('NONE', #8, #8, #22, .T.);
+#26 = CARTESIAN_POINT('NONE', (0.005, -0.005, -0.005));
+#27 = DIRECTION('NONE', (0, 1, 0));
+#28 = DIRECTION('NONE', (1, 0, -0));
+#29 = AXIS2_PLACEMENT_3D('NONE', #26, #27, #28);
+#30 = CYLINDRICAL_SURFACE('NONE', #29, 0.01);
+#31 = CARTESIAN_POINT('NONE', (0, -0.01, -0));
+#32 = DIRECTION('NONE', (0, 1, 0));
+#33 = AXIS2_PLACEMENT_3D('NONE', #31, #32, $);
+#34 = PLANE('NONE', #33);
+#35 = CARTESIAN_POINT('NONE', (0, 0, -0));
+#36 = DIRECTION('NONE', (0, 1, 0));
+#37 = AXIS2_PLACEMENT_3D('NONE', #35, #36, $);
+#38 = PLANE('NONE', #37);
+#39 = ORIENTED_EDGE('NONE', *, *, #23, .T.);
+#40 = ORIENTED_EDGE('NONE', *, *, #25, .F.);
+#41 = EDGE_LOOP('NONE', (#39));
+#42 = FACE_BOUND('NONE', #41, .T.);
+#43 = EDGE_LOOP('NONE', (#40));
+#44 = FACE_BOUND('NONE', #43, .T.);
+#45 = ADVANCED_FACE('NONE', (#42, #44), #30, .T.);
+#46 = ORIENTED_EDGE('NONE', *, *, #23, .F.);
+#47 = EDGE_LOOP('NONE', (#46));
+#48 = FACE_BOUND('NONE', #47, .T.);
+#49 = ADVANCED_FACE('NONE', (#48), #34, .F.);
+#50 = ORIENTED_EDGE('NONE', *, *, #25, .T.);
+#51 = EDGE_LOOP('NONE', (#50));
+#52 = FACE_BOUND('NONE', #51, .T.);
+#53 = ADVANCED_FACE('NONE', (#52), #38, .T.);
+#54 = CLOSED_SHELL('NONE', (#45, #49, #53));
+#55 = MANIFOLD_SOLID_BREP('NONE', #54);
+#56 = APPLICATION_CONTEXT('configuration controlled 3D design of mechanical parts and assemblies');
+#57 = PRODUCT_DEFINITION_CONTEXT('part definition', #56, 'design');
+#58 = PRODUCT('UNIDENTIFIED_PRODUCT', 'NONE', $, ());
+#59 = PRODUCT_DEFINITION_FORMATION('', $, #58);
+#60 = PRODUCT_DEFINITION('design', $, #59, #57);
+#61 = PRODUCT_DEFINITION_SHAPE('NONE', $, #60);
+#62 = ADVANCED_BREP_SHAPE_REPRESENTATION('NONE', (#55), #4);
+#63 = SHAPE_DEFINITION_REPRESENTATION(#61, #62);
 ENDSEC;
 END-ISO-10303-21;
--- a/rust/kcl-lib/src/execution/exec_ast.rs
+++ b/rust/kcl-lib/src/execution/exec_ast.rs
@ -864,6 +864,9 @@ impl BinaryPart {
            BinaryPart::CallExpressionKw(call_expression) => call_expression.execute(exec_state, ctx).await,
            BinaryPart::UnaryExpression(unary_expression) => unary_expression.get_result(exec_state, ctx).await,
            BinaryPart::MemberExpression(member_expression) => member_expression.get_result(exec_state, ctx).await,
+            BinaryPart::ArrayExpression(e) => e.execute(exec_state, ctx).await,
+            BinaryPart::ArrayRangeExpression(e) => e.execute(exec_state, ctx).await,
+            BinaryPart::ObjectExpression(e) => e.execute(exec_state, ctx).await,
            BinaryPart::IfExpression(e) => e.get_result(exec_state, ctx).await,
            BinaryPart::AscribedExpression(e) => e.get_result(exec_state, ctx).await,
        }
@ -991,6 +994,39 @@ impl Node<MemberExpression> {

        // Check the property and object match -- e.g. ints for arrays, strs for objects.
        match (object, property, self.computed) {
+            (KclValue::Plane { value: plane }, Property::String(property), false) => match property.as_str() {
+                "yAxis" => {
+                    let (p, u) = plane.info.y_axis.as_3_dims();
+                    Ok(KclValue::array_from_point3d(
+                        p,
+                        NumericType::Known(crate::exec::UnitType::Length(u)),
+                        vec![meta],
+                    ))
+                }
+                "xAxis" => {
+                    let (p, u) = plane.info.x_axis.as_3_dims();
+                    Ok(KclValue::array_from_point3d(
+                        p,
+                        NumericType::Known(crate::exec::UnitType::Length(u)),
+                        vec![meta],
+                    ))
+                }
+                "origin" => {
+                    let (p, u) = plane.info.origin.as_3_dims();
+                    Ok(KclValue::array_from_point3d(
+                        p,
+                        NumericType::Known(crate::exec::UnitType::Length(u)),
+                        vec![meta],
+                    ))
+                }
+                other => Err(KclError::new_undefined_value(
+                    KclErrorDetails::new(
+                        format!("Property '{other}' not found in plane"),
+                        vec![self.clone().into()],
+                    ),
+                    None,
+                )),
+            },
            (KclValue::Object { value: map, meta: _ }, Property::String(property), false) => {
                if let Some(value) = map.get(&property) {
                    Ok(value.to_owned())
@ -1010,7 +1046,22 @@ impl Node<MemberExpression> {
                    vec![self.clone().into()],
                )))
            }
-            (KclValue::Object { .. }, p, _) => {
+            (KclValue::Object { value: map, .. }, p @ Property::UInt(i), _) => {
+                if i == 0
+                    && let Some(value) = map.get("x")
+                {
+                    return Ok(value.to_owned());
+                }
+                if i == 1
+                    && let Some(value) = map.get("y")
+                {
+                    return Ok(value.to_owned());
+                }
+                if i == 2
+                    && let Some(value) = map.get("z")
+                {
+                    return Ok(value.to_owned());
+                }
                let t = p.type_name();
                let article = article_for(t);
                Err(KclError::new_semantic(KclErrorDetails::new(
@ -2202,4 +2253,12 @@ y = x[0mm + 1]
 "#;
        parse_execute(ast).await.unwrap_err();
    }
+
+    #[tokio::test(flavor = "multi_thread")]
+    async fn getting_property_of_plane() {
+        // let ast = include_str!("../../tests/inputs/planestuff.kcl");
+        let ast = std::fs::read_to_string("tests/inputs/planestuff.kcl").unwrap();
+
+        parse_execute(&ast).await.unwrap();
+    }
 }
--- a/rust/kcl-lib/src/execution/geometry.rs
+++ b/rust/kcl-lib/src/execution/geometry.rs
@ -921,6 +921,12 @@ impl Point3d {
            units: UnitLen::Unknown,
        }
    }
+
+    pub fn as_3_dims(&self) -> ([f64; 3], UnitLen) {
+        let p = [self.x, self.y, self.z];
+        let u = self.units;
+        (p, u)
+    }
 }

 impl From<[TyF64; 3]> for Point3d {
--- a/rust/kcl-lib/src/execution/kcl_value.rs
+++ b/rust/kcl-lib/src/execution/kcl_value.rs
@ -458,6 +458,31 @@ impl KclValue {
        }
    }

+    /// Put the point into a KCL point.
+    pub fn array_from_point3d(p: [f64; 3], ty: NumericType, meta: Vec<Metadata>) -> Self {
+        let [x, y, z] = p;
+        Self::HomArray {
+            value: vec![
+                Self::Number {
+                    value: x,
+                    meta: meta.clone(),
+                    ty,
+                },
+                Self::Number {
+                    value: y,
+                    meta: meta.clone(),
+                    ty,
+                },
+                Self::Number {
+                    value: z,
+                    meta: meta.clone(),
+                    ty,
+                },
+            ],
+            ty: ty.into(),
+        }
+    }
+
    pub(crate) fn as_usize(&self) -> Option<usize> {
        match self {
            KclValue::Number { value, .. } => crate::try_f64_to_usize(*value),
--- a/rust/kcl-lib/src/lsp/kcl/hover.rs
+++ b/rust/kcl-lib/src/lsp/kcl/hover.rs
@ -149,6 +149,9 @@ impl BinaryPart {
            BinaryPart::UnaryExpression(unary_expression) => {
                unary_expression.get_hover_value_for_position(pos, code, opts)
            }
+            BinaryPart::ArrayExpression(e) => e.get_hover_value_for_position(pos, code, opts),
+            BinaryPart::ArrayRangeExpression(e) => e.get_hover_value_for_position(pos, code, opts),
+            BinaryPart::ObjectExpression(e) => e.get_hover_value_for_position(pos, code, opts),
            BinaryPart::IfExpression(e) => e.get_hover_value_for_position(pos, code, opts),
            BinaryPart::AscribedExpression(e) => e.expr.get_hover_value_for_position(pos, code, opts),
            BinaryPart::MemberExpression(member_expression) => {
--- a/rust/kcl-lib/src/parsing/ast/digest.rs
+++ b/rust/kcl-lib/src/parsing/ast/digest.rs
@ -161,6 +161,9 @@ impl BinaryPart {
            BinaryPart::CallExpressionKw(ce) => ce.compute_digest(),
            BinaryPart::UnaryExpression(ue) => ue.compute_digest(),
            BinaryPart::MemberExpression(me) => me.compute_digest(),
+            BinaryPart::ArrayExpression(e) => e.compute_digest(),
+            BinaryPart::ArrayRangeExpression(e) => e.compute_digest(),
+            BinaryPart::ObjectExpression(e) => e.compute_digest(),
            BinaryPart::IfExpression(e) => e.compute_digest(),
            BinaryPart::AscribedExpression(e) => e.compute_digest(),
        }
--- a/rust/kcl-lib/src/parsing/ast/mod.rs
+++ b/rust/kcl-lib/src/parsing/ast/mod.rs
@ -51,6 +51,9 @@ impl BinaryPart {
            BinaryPart::CallExpressionKw(call_expression) => call_expression.module_id,
            BinaryPart::UnaryExpression(unary_expression) => unary_expression.module_id,
            BinaryPart::MemberExpression(member_expression) => member_expression.module_id,
+            BinaryPart::ArrayExpression(e) => e.module_id,
+            BinaryPart::ArrayRangeExpression(e) => e.module_id,
+            BinaryPart::ObjectExpression(e) => e.module_id,
            BinaryPart::IfExpression(e) => e.module_id,
            BinaryPart::AscribedExpression(e) => e.module_id,
        }
--- a/rust/kcl-lib/src/parsing/ast/types/mod.rs
+++ b/rust/kcl-lib/src/parsing/ast/types/mod.rs
@ -1214,6 +1214,9 @@ impl From<&BinaryPart> for Expr {
            BinaryPart::CallExpressionKw(call_expression) => Expr::CallExpressionKw(call_expression.clone()),
            BinaryPart::UnaryExpression(unary_expression) => Expr::UnaryExpression(unary_expression.clone()),
            BinaryPart::MemberExpression(member_expression) => Expr::MemberExpression(member_expression.clone()),
+            BinaryPart::ArrayExpression(e) => Expr::ArrayExpression(e.clone()),
+            BinaryPart::ArrayRangeExpression(e) => Expr::ArrayRangeExpression(e.clone()),
+            BinaryPart::ObjectExpression(e) => Expr::ObjectExpression(e.clone()),
            BinaryPart::IfExpression(e) => Expr::IfExpression(e.clone()),
            BinaryPart::AscribedExpression(e) => Expr::AscribedExpression(e.clone()),
        }
@ -1281,6 +1284,9 @@ pub enum BinaryPart {
    CallExpressionKw(BoxNode<CallExpressionKw>),
    UnaryExpression(BoxNode<UnaryExpression>),
    MemberExpression(BoxNode<MemberExpression>),
+    ArrayExpression(BoxNode<ArrayExpression>),
+    ArrayRangeExpression(BoxNode<ArrayRangeExpression>),
+    ObjectExpression(BoxNode<ObjectExpression>),
    IfExpression(BoxNode<IfExpression>),
    AscribedExpression(BoxNode<AscribedExpression>),
 }
@ -1307,6 +1313,9 @@ impl BinaryPart {
            BinaryPart::CallExpressionKw(call_expression) => call_expression.get_constraint_level(),
            BinaryPart::UnaryExpression(unary_expression) => unary_expression.get_constraint_level(),
            BinaryPart::MemberExpression(member_expression) => member_expression.get_constraint_level(),
+            BinaryPart::ArrayExpression(e) => e.get_constraint_level(),
+            BinaryPart::ArrayRangeExpression(e) => e.get_constraint_level(),
+            BinaryPart::ObjectExpression(e) => e.get_constraint_level(),
            BinaryPart::IfExpression(e) => e.get_constraint_level(),
            BinaryPart::AscribedExpression(e) => e.expr.get_constraint_level(),
        }
@ -1320,6 +1329,9 @@ impl BinaryPart {
            BinaryPart::CallExpressionKw(call_expression) => call_expression.replace_value(source_range, new_value),
            BinaryPart::UnaryExpression(unary_expression) => unary_expression.replace_value(source_range, new_value),
            BinaryPart::MemberExpression(_) => {}
+            BinaryPart::ArrayExpression(e) => e.replace_value(source_range, new_value),
+            BinaryPart::ArrayRangeExpression(e) => e.replace_value(source_range, new_value),
+            BinaryPart::ObjectExpression(e) => e.replace_value(source_range, new_value),
            BinaryPart::IfExpression(e) => e.replace_value(source_range, new_value),
            BinaryPart::AscribedExpression(e) => e.expr.replace_value(source_range, new_value),
        }
@ -1333,6 +1345,9 @@ impl BinaryPart {
            BinaryPart::CallExpressionKw(call_expression) => call_expression.start,
            BinaryPart::UnaryExpression(unary_expression) => unary_expression.start,
            BinaryPart::MemberExpression(member_expression) => member_expression.start,
+            BinaryPart::ArrayExpression(e) => e.start,
+            BinaryPart::ArrayRangeExpression(e) => e.start,
+            BinaryPart::ObjectExpression(e) => e.start,
            BinaryPart::IfExpression(e) => e.start,
            BinaryPart::AscribedExpression(e) => e.start,
        }
@ -1346,6 +1361,9 @@ impl BinaryPart {
            BinaryPart::CallExpressionKw(call_expression) => call_expression.end,
            BinaryPart::UnaryExpression(unary_expression) => unary_expression.end,
            BinaryPart::MemberExpression(member_expression) => member_expression.end,
+            BinaryPart::ArrayExpression(e) => e.end,
+            BinaryPart::ArrayRangeExpression(e) => e.end,
+            BinaryPart::ObjectExpression(e) => e.end,
            BinaryPart::IfExpression(e) => e.end,
            BinaryPart::AscribedExpression(e) => e.end,
        }
@ -1360,6 +1378,9 @@ impl BinaryPart {
            BinaryPart::CallExpressionKw(call_expression) => call_expression.rename_identifiers(old_name, new_name),
            BinaryPart::UnaryExpression(unary_expression) => unary_expression.rename_identifiers(old_name, new_name),
            BinaryPart::MemberExpression(member_expression) => member_expression.rename_identifiers(old_name, new_name),
+            BinaryPart::ArrayExpression(e) => e.rename_identifiers(old_name, new_name),
+            BinaryPart::ArrayRangeExpression(e) => e.rename_identifiers(old_name, new_name),
+            BinaryPart::ObjectExpression(e) => e.rename_identifiers(old_name, new_name),
            BinaryPart::IfExpression(if_expression) => if_expression.rename_identifiers(old_name, new_name),
            BinaryPart::AscribedExpression(e) => e.expr.rename_identifiers(old_name, new_name),
        }
--- a/rust/kcl-lib/src/parsing/parser.rs
+++ b/rust/kcl-lib/src/parsing/parser.rs
@ -624,9 +624,6 @@ fn operand(i: &mut TokenSlice) -> ModalResult<BinaryPart> {
                Expr::FunctionExpression(_)
                | Expr::PipeExpression(_)
                | Expr::PipeSubstitution(_)
-                | Expr::ArrayExpression(_)
-                | Expr::ArrayRangeExpression(_)
-                | Expr::ObjectExpression(_)
                | Expr::LabelledExpression(..) => return Err(CompilationError::fatal(source_range, TODO_783)),
                Expr::None(_) => {
                    return Err(CompilationError::fatal(
@ -652,6 +649,9 @@ fn operand(i: &mut TokenSlice) -> ModalResult<BinaryPart> {
                Expr::BinaryExpression(x) => BinaryPart::BinaryExpression(x),
                Expr::CallExpressionKw(x) => BinaryPart::CallExpressionKw(x),
                Expr::MemberExpression(x) => BinaryPart::MemberExpression(x),
+                Expr::ArrayExpression(x) => BinaryPart::ArrayExpression(x),
+                Expr::ArrayRangeExpression(x) => BinaryPart::ArrayRangeExpression(x),
+                Expr::ObjectExpression(x) => BinaryPart::ObjectExpression(x),
                Expr::IfExpression(x) => BinaryPart::IfExpression(x),
                Expr::AscribedExpression(x) => BinaryPart::AscribedExpression(x),
            };
@ -2115,6 +2115,8 @@ fn possible_operands(i: &mut TokenSlice) -> ModalResult<Expr> {
        literal.map(Expr::Literal),
        fn_call_kw.map(Box::new).map(Expr::CallExpressionKw),
        name.map(Box::new).map(Expr::Name),
+        array,
+        object.map(Box::new).map(Expr::ObjectExpression),
        binary_expr_in_parens.map(Box::new).map(Expr::BinaryExpression),
        unnecessarily_bracketed,
    ))
@ -3398,6 +3400,27 @@ mod tests {
        operand.parse(tokens).unwrap();
    }

+    #[test]
+    fn parse_binary_operator_on_array() {
+        let tokens = crate::parsing::token::lex("[0] + 1", ModuleId::default()).unwrap();
+        let tokens = tokens.as_slice();
+        binary_expression.parse(tokens).unwrap();
+    }
+
+    #[test]
+    fn parse_binary_operator_on_object() {
+        let tokens = crate::parsing::token::lex("{ a = 1 } + 2", ModuleId::default()).unwrap();
+        let tokens = tokens.as_slice();
+        binary_expression.parse(tokens).unwrap();
+    }
+
+    #[test]
+    fn parse_call_array_operator() {
+        let tokens = crate::parsing::token::lex("f([0] + 1)", ModuleId::default()).unwrap();
+        let tokens = tokens.as_slice();
+        fn_call_kw.parse(tokens).unwrap();
+    }
+
    #[test]
    fn weird_program_just_a_pipe() {
        let tokens = crate::parsing::token::lex("|", ModuleId::default()).unwrap();
--- a/rust/kcl-lib/src/simulation_tests.rs
+++ b/rust/kcl-lib/src/simulation_tests.rs
@ -779,6 +779,27 @@ mod add_lots {
        super::execute(TEST_NAME, false).await
    }
 }
+mod add_arrays {
+    const TEST_NAME: &str = "add_arrays";
+
+    /// Test parsing KCL.
+    #[test]
+    fn parse() {
+        super::parse(TEST_NAME)
+    }
+
+    /// Test that parsing and unparsing KCL produces the original KCL input.
+    #[tokio::test(flavor = "multi_thread")]
+    async fn unparse() {
+        super::unparse(TEST_NAME).await
+    }
+
+    /// Test that KCL is executed correctly.
+    #[tokio::test(flavor = "multi_thread")]
+    async fn kcl_test_execute() {
+        super::execute(TEST_NAME, false).await
+    }
+}
 mod argument_error {
    //! The argument error points to the problematic argument in the call site,
    //! not the function definition that the variable points to.
--- a/rust/kcl-lib/src/unparser.rs
+++ b/rust/kcl-lib/src/unparser.rs
@ -363,6 +363,9 @@ impl BinaryPart {
            BinaryPart::MemberExpression(member_expression) => {
                member_expression.recast(options, indentation_level, ctxt)
            }
+            BinaryPart::ArrayExpression(e) => e.recast(options, indentation_level, ctxt),
+            BinaryPart::ArrayRangeExpression(e) => e.recast(options, indentation_level, ctxt),
+            BinaryPart::ObjectExpression(e) => e.recast(options, indentation_level, ctxt),
            BinaryPart::IfExpression(e) => e.recast(options, indentation_level, ExprContext::Other),
            BinaryPart::AscribedExpression(e) => e.recast(options, indentation_level, ExprContext::Other),
        }
@ -745,6 +748,9 @@ impl UnaryExpression {
            BinaryPart::Literal(_)
            | BinaryPart::Name(_)
            | BinaryPart::MemberExpression(_)
+            | BinaryPart::ArrayExpression(_)
+            | BinaryPart::ArrayRangeExpression(_)
+            | BinaryPart::ObjectExpression(_)
            | BinaryPart::IfExpression(_)
            | BinaryPart::AscribedExpression(_)
            | BinaryPart::CallExpressionKw(_) => {
--- a/rust/kcl-lib/src/walk/ast_node.rs
+++ b/rust/kcl-lib/src/walk/ast_node.rs
@ -220,6 +220,9 @@ impl<'tree> From<&'tree types::BinaryPart> for Node<'tree> {
            types::BinaryPart::CallExpressionKw(ce) => ce.as_ref().into(),
            types::BinaryPart::UnaryExpression(ue) => ue.as_ref().into(),
            types::BinaryPart::MemberExpression(me) => me.as_ref().into(),
+            types::BinaryPart::ArrayExpression(e) => e.as_ref().into(),
+            types::BinaryPart::ArrayRangeExpression(e) => e.as_ref().into(),
+            types::BinaryPart::ObjectExpression(e) => e.as_ref().into(),
            types::BinaryPart::IfExpression(e) => e.as_ref().into(),
            types::BinaryPart::AscribedExpression(e) => e.as_ref().into(),
        }
--- a/rust/kcl-lib/tests/add_arrays/artifact_commands.snap
+++ b/rust/kcl-lib/tests/add_arrays/artifact_commands.snap
@ -0,0 +1,18 @@
+---
+source: kcl-lib/src/simulation_tests.rs
+description: Artifact commands add_arrays.kcl
+---
+{
+  "rust/kcl-lib/tests/add_arrays/input.kcl": [],
+  "std::appearance": [],
+  "std::array": [],
+  "std::math": [],
+  "std::prelude": [],
+  "std::sketch": [],
+  "std::solid": [],
+  "std::sweep": [],
+  "std::transform": [],
+  "std::turns": [],
+  "std::types": [],
+  "std::units": []
+}
--- a/rust/kcl-lib/tests/add_arrays/artifact_graph_flowchart.snap
+++ b/rust/kcl-lib/tests/add_arrays/artifact_graph_flowchart.snap
@ -0,0 +1,6 @@
+---
+source: kcl-lib/src/simulation_tests.rs
+description: Artifact graph flowchart add_arrays.kcl
+extension: md
+snapshot_kind: binary
+---
--- a/rust/kcl-lib/tests/add_arrays/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/add_arrays/artifact_graph_flowchart.snap.md
@ -0,0 +1,3 @@
+```mermaid
+flowchart LR
+```
--- a/rust/kcl-lib/tests/add_arrays/ast.snap
+++ b/rust/kcl-lib/tests/add_arrays/ast.snap
@ -0,0 +1,106 @@
+---
+source: kcl-lib/src/simulation_tests.rs
+description: Result of parsing add_arrays.kcl
+---
+{
+  "Ok": {
+    "body": [
+      {
+        "commentStart": 0,
+        "declaration": {
+          "commentStart": 0,
+          "end": 0,
+          "id": {
+            "commentStart": 0,
+            "end": 0,
+            "moduleId": 0,
+            "name": "answer",
+            "start": 0,
+            "type": "Identifier"
+          },
+          "init": {
+            "commentStart": 0,
+            "end": 0,
+            "left": {
+              "commentStart": 0,
+              "elements": [
+                {
+                  "commentStart": 0,
+                  "end": 0,
+                  "moduleId": 0,
+                  "raw": "0",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": {
+                    "value": 0.0,
+                    "suffix": "None"
+                  }
+                },
+                {
+                  "commentStart": 0,
+                  "end": 0,
+                  "moduleId": 0,
+                  "raw": "1",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": {
+                    "value": 1.0,
+                    "suffix": "None"
+                  }
+                }
+              ],
+              "end": 0,
+              "moduleId": 0,
+              "start": 0,
+              "type": "ArrayExpression",
+              "type": "ArrayExpression"
+            },
+            "moduleId": 0,
+            "operator": "+",
+            "right": {
+              "commentStart": 0,
+              "elements": [
+                {
+                  "commentStart": 0,
+                  "end": 0,
+                  "moduleId": 0,
+                  "raw": "2",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": {
+                    "value": 2.0,
+                    "suffix": "None"
+                  }
+                }
+              ],
+              "end": 0,
+              "moduleId": 0,
+              "start": 0,
+              "type": "ArrayExpression",
+              "type": "ArrayExpression"
+            },
+            "start": 0,
+            "type": "BinaryExpression",
+            "type": "BinaryExpression"
+          },
+          "moduleId": 0,
+          "start": 0,
+          "type": "VariableDeclarator"
+        },
+        "end": 0,
+        "kind": "const",
+        "moduleId": 0,
+        "start": 0,
+        "type": "VariableDeclaration",
+        "type": "VariableDeclaration"
+      }
+    ],
+    "commentStart": 0,
+    "end": 0,
+    "moduleId": 0,
+    "start": 0
+  }
+}
--- a/rust/kcl-lib/tests/add_arrays/execution_error.snap
+++ b/rust/kcl-lib/tests/add_arrays/execution_error.snap
@ -0,0 +1,12 @@
+---
+source: kcl-lib/src/simulation_tests.rs
+description: Error from executing add_arrays.kcl
+---
+KCL Semantic error
+
+  × semantic: Expected a number, but found an array of `number`, `number`
+   ╭────
+ 1 │ answer = [0, 1] + [2]
+   ·          ───┬──
+   ·             ╰── tests/add_arrays/input.kcl
+   ╰────
--- a/rust/kcl-lib/tests/add_arrays/input.kcl
+++ b/rust/kcl-lib/tests/add_arrays/input.kcl
@ -0,0 +1 @@
+answer = [0, 1] + [2]
--- a/rust/kcl-lib/tests/add_arrays/ops.snap
+++ b/rust/kcl-lib/tests/add_arrays/ops.snap
@ -0,0 +1,96 @@
+---
+source: kcl-lib/src/simulation_tests.rs
+description: Operations executed add_arrays.kcl
+---
+{
+  "rust/kcl-lib/tests/add_arrays/input.kcl": [],
+  "std::appearance": [],
+  "std::array": [],
+  "std::math": [
+    {
+      "type": "VariableDeclaration",
+      "name": "PI",
+      "value": {
+        "type": "Number",
+        "value": 3.141592653589793,
+        "ty": {
+          "type": "Unknown"
+        }
+      },
+      "visibility": "export",
+      "nodePath": {
+        "steps": []
+      },
+      "sourceRange": []
+    },
+    {
+      "type": "VariableDeclaration",
+      "name": "E",
+      "value": {
+        "type": "Number",
+        "value": 2.718281828459045,
+        "ty": {
+          "type": "Known",
+          "type": "Count"
+        }
+      },
+      "visibility": "export",
+      "nodePath": {
+        "steps": []
+      },
+      "sourceRange": []
+    },
+    {
+      "type": "VariableDeclaration",
+      "name": "TAU",
+      "value": {
+        "type": "Number",
+        "value": 6.283185307179586,
+        "ty": {
+          "type": "Known",
+          "type": "Count"
+        }
+      },
+      "visibility": "export",
+      "nodePath": {
+        "steps": []
+      },
+      "sourceRange": []
+    }
+  ],
+  "std::prelude": [
+    {
+      "type": "VariableDeclaration",
+      "name": "START",
+      "value": {
+        "type": "String",
+        "value": "start"
+      },
+      "visibility": "export",
+      "nodePath": {
+        "steps": []
+      },
+      "sourceRange": []
+    },
+    {
+      "type": "VariableDeclaration",
+      "name": "END",
+      "value": {
+        "type": "String",
+        "value": "end"
+      },
+      "visibility": "export",
+      "nodePath": {
+        "steps": []
+      },
+      "sourceRange": []
+    }
+  ],
+  "std::sketch": [],
+  "std::solid": [],
+  "std::sweep": [],
+  "std::transform": [],
+  "std::turns": [],
+  "std::types": [],
+  "std::units": []
+}
--- a/rust/kcl-lib/tests/add_arrays/unparsed.snap
+++ b/rust/kcl-lib/tests/add_arrays/unparsed.snap
@ -0,0 +1,5 @@
+---
+source: kcl-lib/src/simulation_tests.rs
+description: Result of unparsing add_arrays.kcl
+---
+answer = [0, 1] + [2]
--- a/rust/kcl-lib/tests/inputs/planestuff.kcl
+++ b/rust/kcl-lib/tests/inputs/planestuff.kcl
@ -0,0 +1,60 @@
+// There are 3 ways to define a plane in KCL, according to https://zoo.dev/docs/kcl-std/types/std-types-Plane
+//  - A default plane
+//  - Modifying a default plane e.g. via offsetPlane
+//  - Defining your own struct
+// This file tests they all work equivalently.
+
+// Define a plane using struct representation.
+myPlane = {
+    origin = { x = 0, y = 0, z = 0 },
+    xAxis = { x = 1, y = 0, z = 0 },
+    yAxis = { x = 0, y = 1, z = 0 },
+}
+
+// Prove we can get its axes and origin.
+ax = myPlane.xAxis
+assert(ax[0], isEqualTo = 1)
+assert(ax[1], isEqualTo = 0)
+assert(ax[2], isEqualTo = 0)
+ay = myPlane.yAxis
+assert(ay[0], isEqualTo = 0)
+assert(ay[1], isEqualTo = 1)
+assert(ay[2], isEqualTo = 0)
+aorigin = myPlane.origin
+assert(aorigin[0], isEqualTo = 0)
+assert(aorigin[1], isEqualTo = 0)
+assert(aorigin[2], isEqualTo = 0)
+
+// Define a plane using standard planes.
+myOtherPlane = XY
+
+// Prove we can get its axes and origin.
+axOther = myOtherPlane.xAxis
+assert(axOther[0], isEqualTo = 1)
+assert(axOther[1], isEqualTo = 0)
+assert(axOther[2], isEqualTo = 0)
+ayOther = myOtherPlane.yAxis
+assert(ayOther[0], isEqualTo = 0)
+assert(ayOther[1], isEqualTo = 1)
+assert(ayOther[2], isEqualTo = 0)
+aoriginOther = myOtherPlane.origin
+assert(aoriginOther[0], isEqualTo = 0)
+assert(aoriginOther[1], isEqualTo = 0)
+assert(aoriginOther[2], isEqualTo = 0)
+
+// Define a plane using a plane-modifying function like offsetPlane.
+myAlternatePlane = offsetPlane(XY, offset = 0)
+
+// Prove we can get its axes and origin.
+axAlternate = myAlternatePlane.xAxis
+assert(axAlternate[0], isEqualTo = 1)
+assert(axAlternate[1], isEqualTo = 0)
+assert(axAlternate[2], isEqualTo = 0)
+ayAlternate = myAlternatePlane.yAxis
+assert(ayAlternate[0], isEqualTo = 0)
+assert(ayAlternate[1], isEqualTo = 1)
+assert(ayAlternate[2], isEqualTo = 0)
+aoriginAlternate = myAlternatePlane.origin
+assert(aoriginAlternate[0], isEqualTo = 0)
+assert(aoriginAlternate[1], isEqualTo = 0)
+assert(aoriginAlternate[2], isEqualTo = 0)
--- a/scripts/known/urls.txt
+++ b/scripts/known/urls.txt
@ -4,6 +4,8 @@

 URL  STATUS
 000  https://${BASE_URL}
+405  https://api.dev.zoo.dev/oauth2/token/revoke
+401  https://api.dev.zoo.dev/users
 301  https://discord.gg/JQEpHR7Nt2
 404  https://github.com/KittyCAD/engine/issues/3528
 404  https://github.com/KittyCAD/modeling-app/commit/${ref}
--- a/src/components/LspProvider.tsx
+++ b/src/components/LspProvider.tsx
@ -7,7 +7,7 @@ import {
  LanguageServerClient,
  LspWorkerEventType,
 } from '@kittycad/codemirror-lsp-client'
-import { TEST, VITE_KC_API_BASE_URL } from '@src/env'
+import { TEST } from '@src/env'
 import React, { createContext, useContext, useMemo, useState } from 'react'
 import { useNavigate } from 'react-router-dom'
 import type * as LSP from 'vscode-languageserver-protocol'
@ -28,6 +28,7 @@ import type { FileEntry } from '@src/lib/project'
 import { codeManager } from '@src/lib/singletons'
 import { err } from '@src/lib/trap'
 import { useToken } from '@src/lib/singletons'
+import { withAPIBaseURL } from '@src/lib/withBaseURL'

 function getWorkspaceFolders(): LSP.WorkspaceFolder[] {
  return []
@ -85,7 +86,7 @@ export const LspProvider = ({ children }: { children: React.ReactNode }) => {
    const initEvent: KclWorkerOptions = {
      wasmUrl: wasmUrl(),
      token: token,
-      apiBaseUrl: VITE_KC_API_BASE_URL,
+      apiBaseUrl: withAPIBaseURL(''),
    }
    lspWorker.postMessage({
      worker: LspWorker.Kcl,
@ -178,7 +179,7 @@ export const LspProvider = ({ children }: { children: React.ReactNode }) => {
    const initEvent: CopilotWorkerOptions = {
      wasmUrl: wasmUrl(),
      token: token,
-      apiBaseUrl: VITE_KC_API_BASE_URL,
+      apiBaseUrl: withAPIBaseURL(''),
    }
    lspWorker.postMessage({
      worker: LspWorker.Copilot,
--- a/src/env.ts
+++ b/src/env.ts
@ -8,13 +8,14 @@ export const NODE_ENV = env.NODE_ENV as string | undefined
 export const VITE_KC_API_WS_MODELING_URL = env.VITE_KC_API_WS_MODELING_URL as
  | string
  | undefined
-export const VITE_KC_API_BASE_URL = env.VITE_KC_API_BASE_URL
+export const VITE_KITTYCAD_API_BASE_URL = env.VITE_KITTYCAD_API_BASE_URL
 export const VITE_KC_SITE_BASE_URL = env.VITE_KC_SITE_BASE_URL
 export const VITE_KC_SITE_APP_URL = env.VITE_KC_SITE_APP_URL
-export const VITE_KC_SKIP_AUTH = env.VITE_KC_SKIP_AUTH as string | undefined
 export const VITE_KC_CONNECTION_TIMEOUT_MS =
  env.VITE_KC_CONNECTION_TIMEOUT_MS as string | undefined
-export const VITE_KC_DEV_TOKEN = env.VITE_KC_DEV_TOKEN as string | undefined
+export const VITE_KITTYCAD_API_TOKEN = env.VITE_KITTYCAD_API_TOKEN as
+  | string
+  | undefined
 export const PROD = env.PROD as string | undefined
 export const TEST = env.TEST as string | undefined
 export const DEV = env.DEV as string | undefined
--- a/src/lang/modifyAst.test.ts
+++ b/src/lang/modifyAst.test.ts
@ -2,9 +2,12 @@ import type { Node } from '@rust/kcl-lib/bindings/Node'

 import {
  createArrayExpression,
+  createCallExpressionStdLibKw,
  createIdentifier,
+  createLabeledArg,
  createLiteral,
  createLiteralMaybeSuffix,
+  createLocalName,
  createObjectExpression,
  createPipeExpression,
  createPipeSubstitution,
@ -14,12 +17,19 @@ import {
 } from '@src/lang/create'
 import {
  addSketchTo,
+  createPathToNodeForLastVariable,
+  createVariableExpressionsArray,
  deleteSegmentFromPipeExpression,
  moveValueIntoNewVariable,
+  setCallInAst,
  sketchOnExtrudedFace,
  splitPipedProfile,
 } from '@src/lang/modifyAst'
-import { findUsesOfTagInPipe } from '@src/lang/queryAst'
+import {
+  findUsesOfTagInPipe,
+  getNodeFromPath,
+  getVariableExprsFromSelection,
+} from '@src/lang/queryAst'
 import { getNodePathFromSourceRange } from '@src/lang/queryAstNodePathUtils'
 import type { Artifact } from '@src/lang/std/artifactGraph'
 import { codeRefFromRange } from '@src/lang/std/artifactGraph'
@ -31,6 +41,7 @@ import { enginelessExecutor } from '@src/lib/testHelpers'
 import { err } from '@src/lib/trap'
 import { deleteFromSelection } from '@src/lang/modifyAst/deleteFromSelection'
 import { assertNotErr } from '@src/unitTestUtils'
+import type { Selections } from '@src/lib/selections'

 beforeAll(async () => {
  await initPromise
@ -917,3 +928,212 @@ extrude001 = extrude(part001, length = 5)
    expect(result instanceof Error).toBe(true)
  })
 })
+
+describe('Testing createVariableExpressionsArray', () => {
+  it('should return null for any number of pipe substitutions', () => {
+    const onePipe = [createPipeSubstitution()]
+    const twoPipes = [createPipeSubstitution(), createPipeSubstitution()]
+    const threePipes = [
+      createPipeSubstitution(),
+      createPipeSubstitution(),
+      createPipeSubstitution(),
+    ]
+    expect(createVariableExpressionsArray(onePipe)).toBeNull()
+    expect(createVariableExpressionsArray(twoPipes)).toBeNull()
+    expect(createVariableExpressionsArray(threePipes)).toBeNull()
+  })
+
+  it('should create a variable expressions for one variable', () => {
+    const oneVariableName = [createLocalName('var1')]
+    const expr = createVariableExpressionsArray(oneVariableName)
+    if (expr?.type !== 'Name') {
+      throw new Error(`Expected Literal type, got ${expr?.type}`)
+    }
+
+    expect(expr.name.name).toBe('var1')
+  })
+
+  it('should create an array of variable expressions for two variables', () => {
+    const twoVariableNames = [createLocalName('var1'), createLocalName('var2')]
+    const exprs = createVariableExpressionsArray(twoVariableNames)
+    if (exprs?.type !== 'ArrayExpression') {
+      throw new Error('Expected ArrayExpression type')
+    }
+
+    expect(exprs.elements).toHaveLength(2)
+    if (
+      exprs.elements[0].type !== 'Name' ||
+      exprs.elements[1].type !== 'Name'
+    ) {
+      throw new Error(
+        `Expected elements to be of type Name, got ${exprs.elements[0].type} and ${exprs.elements[1].type}`
+      )
+    }
+    expect(exprs.elements[0].name.name).toBe('var1')
+    expect(exprs.elements[1].name.name).toBe('var2')
+  })
+
+  // This would catch the issue at https://github.com/KittyCAD/modeling-app/issues/7669
+  // TODO: fix function to get this test to pass
+  // it('should create one expr if the array of variable names are the same', () => {
+  //   const twoVariableNames = [createLocalName('var1'), createLocalName('var1')]
+  //   const expr = createVariableExpressionsArray(twoVariableNames)
+  //   if (expr?.type !== 'Name') {
+  //     throw new Error(`Expected Literal type, got ${expr?.type}`)
+  //   }
+
+  //   expect(expr.name.name).toBe('var1')
+  // })
+
+  it('should create an array of variable expressions for one variable and a pipe', () => {
+    const oneVarOnePipe = [createPipeSubstitution(), createLocalName('var1')]
+    const exprs = createVariableExpressionsArray(oneVarOnePipe)
+    if (exprs?.type !== 'ArrayExpression') {
+      throw new Error('Expected ArrayExpression type')
+    }
+
+    expect(exprs.elements).toHaveLength(2)
+    expect(exprs.elements[0].type).toBe('PipeSubstitution')
+    if (exprs.elements[1].type !== 'Name') {
+      throw new Error(
+        `Expected elements[1] to be of type Name, got ${exprs.elements[1].type}`
+      )
+    }
+
+    expect(exprs.elements[1].name.name).toBe('var1')
+  })
+})
+
+describe('Testing createPathToNodeForLastVariable', () => {
+  it('should create a path to the last variable in the array', () => {
+    const circleProfileInVar = `sketch001 = startSketchOn(XY)
+profile001 = circle(sketch001, center = [0, 0], radius = 1)
+extrude001 = extrude(profile001, length = 5)
+`
+    const ast = assertParse(circleProfileInVar)
+    const path = createPathToNodeForLastVariable(ast, false)
+    expect(path.length).toEqual(4)
+
+    // Verify we can get the right node
+    const node = getNodeFromPath<any>(ast, path)
+    if (err(node)) {
+      throw node
+    }
+    // With the expected range
+    const startOfExtrudeIndex = circleProfileInVar.indexOf('extrude(')
+    expect(node.node.start).toEqual(startOfExtrudeIndex)
+    expect(node.node.end).toEqual(circleProfileInVar.length - 1)
+  })
+
+  it('should create a path to the first kwarg in the last expression', () => {
+    const circleProfileInVar = `sketch001 = startSketchOn(XY)
+profile001 = circle(sketch001, center = [0, 0], radius = 1)
+extrude001 = extrude(profile001, length = 123)
+`
+    const ast = assertParse(circleProfileInVar)
+    const path = createPathToNodeForLastVariable(ast, true)
+    expect(path.length).toEqual(7)
+
+    // Verify we can get the right node
+    const node = getNodeFromPath<any>(ast, path)
+    if (err(node)) {
+      throw node
+    }
+    // With the expected range
+    const startOfKwargIndex = circleProfileInVar.indexOf('123')
+    expect(node.node.start).toEqual(startOfKwargIndex)
+    expect(node.node.end).toEqual(startOfKwargIndex + 3)
+  })
+})
+
+describe('Testing setCallInAst', () => {
+  it('should push an extrude call with variable on variable profile', () => {
+    const code = `sketch001 = startSketchOn(XY)
+profile001 = circle(sketch001, center = [0, 0], radius = 1)
+`
+    const ast = assertParse(code)
+    const exprs = createVariableExpressionsArray([
+      createLocalName('profile001'),
+    ])
+    const call = createCallExpressionStdLibKw('extrude', exprs, [
+      createLabeledArg('length', createLiteral(5)),
+    ])
+    const pathToNode = setCallInAst(ast, call)
+    if (err(pathToNode)) {
+      throw pathToNode
+    }
+    const newCode = recast(ast)
+    expect(newCode).toContain(code)
+    expect(newCode).toContain(`extrude001 = extrude(profile001, length = 5)`)
+  })
+
+  it('should push an extrude call in pipe is selection was in variable-less pipe', async () => {
+    const code = `startSketchOn(XY)
+  |> circle(center = [0, 0], radius = 1)
+`
+    const ast = assertParse(code)
+    const { artifactGraph } = await enginelessExecutor(ast)
+    const artifact = artifactGraph.values().find((a) => a.type === 'path')
+    if (!artifact) {
+      throw new Error('Artifact not found in the graph')
+    }
+    const selections: Selections = {
+      graphSelections: [
+        {
+          codeRef: artifact.codeRef,
+          artifact,
+        },
+      ],
+      otherSelections: [],
+    }
+    const variableExprs = getVariableExprsFromSelection(selections, ast)
+    if (err(variableExprs)) throw variableExprs
+    const exprs = createVariableExpressionsArray(variableExprs.exprs)
+    const call = createCallExpressionStdLibKw('extrude', exprs, [
+      createLabeledArg('length', createLiteral(5)),
+    ])
+    const lastPathToNode = variableExprs.paths.pop()
+    const pathToNode = setCallInAst(ast, call, undefined, lastPathToNode)
+    if (err(pathToNode)) {
+      throw pathToNode
+    }
+    const newCode = recast(ast)
+    expect(newCode).toContain(code)
+    expect(newCode).toContain(`|> extrude(length = 5)`)
+  })
+
+  it('should push an extrude call with variable if selection was in variable pipe', async () => {
+    const code = `profile001 = startSketchOn(XY)
+  |> circle(center = [0, 0], radius = 1)
+`
+    const ast = assertParse(code)
+    const { artifactGraph } = await enginelessExecutor(ast)
+    const artifact = artifactGraph.values().find((a) => a.type === 'path')
+    if (!artifact) {
+      throw new Error('Artifact not found in the graph')
+    }
+    const selections: Selections = {
+      graphSelections: [
+        {
+          codeRef: artifact.codeRef,
+          artifact,
+        },
+      ],
+      otherSelections: [],
+    }
+    const variableExprs = getVariableExprsFromSelection(selections, ast)
+    if (err(variableExprs)) throw variableExprs
+    const exprs = createVariableExpressionsArray(variableExprs.exprs)
+    const call = createCallExpressionStdLibKw('extrude', exprs, [
+      createLabeledArg('length', createLiteral(5)),
+    ])
+    const lastPathToNode = variableExprs.paths.pop()
+    const pathToNode = setCallInAst(ast, call, undefined, lastPathToNode)
+    if (err(pathToNode)) {
+      throw pathToNode
+    }
+    const newCode = recast(ast)
+    expect(newCode).toContain(code)
+    expect(newCode).toContain(`extrude001 = extrude(profile001, length = 5)`)
+  })
+})
--- a/src/lang/modifyAst.ts
+++ b/src/lang/modifyAst.ts
@ -1209,3 +1209,83 @@ export function insertVariableAndOffsetPathToNode(
    }
  }
 }
+
+// Create an array expression for variables,
+// or keep it null if all are PipeSubstitutions
+export function createVariableExpressionsArray(sketches: Expr[]): Expr | null {
+  let exprs: Expr | null = null
+  if (sketches.every((s) => s.type === 'PipeSubstitution')) {
+    // Keeping null so we don't even put it the % sign
+  } else if (sketches.length === 1) {
+    exprs = sketches[0]
+  } else {
+    exprs = createArrayExpression(sketches)
+  }
+  return exprs
+}
+
+// Create a path to node to the last variable declaroator of an ast
+// Optionally, can point to the first kwarg of the CallExpressionKw
+export function createPathToNodeForLastVariable(
+  ast: Node<Program>,
+  toFirstKwarg = true
+): PathToNode {
+  const argIndex = 0 // first kwarg for all sweeps here
+  const pathToCall: PathToNode = [
+    ['body', ''],
+    [ast.body.length - 1, 'index'],
+    ['declaration', 'VariableDeclaration'],
+    ['init', 'VariableDeclarator'],
+  ]
+  if (toFirstKwarg) {
+    pathToCall.push(
+      ['arguments', 'CallExpressionKw'],
+      [argIndex, ARG_INDEX_FIELD],
+      ['arg', LABELED_ARG_FIELD]
+    )
+  }
+
+  return pathToCall
+}
+
+export function setCallInAst(
+  ast: Node<Program>,
+  call: Node<CallExpressionKw>,
+  nodeToEdit?: PathToNode,
+  lastPathToNode?: PathToNode
+): Error | PathToNode {
+  let pathToNode: PathToNode | undefined
+  if (nodeToEdit) {
+    const result = getNodeFromPath<CallExpressionKw>(
+      ast,
+      nodeToEdit,
+      'CallExpressionKw'
+    )
+    if (err(result)) {
+      return result
+    }
+
+    Object.assign(result.node, call)
+    pathToNode = nodeToEdit
+  } else {
+    if (!call.unlabeled && lastPathToNode) {
+      const pipe = getNodeFromPath<PipeExpression>(
+        ast,
+        lastPathToNode,
+        'PipeExpression'
+      )
+      if (err(pipe)) {
+        return pipe
+      }
+      pipe.node.body.push(call)
+      pathToNode = lastPathToNode
+    } else {
+      const name = findUniqueName(ast, call.callee.name.name)
+      const declaration = createVariableDeclaration(name, call)
+      ast.body.push(declaration)
+      pathToNode = createPathToNodeForLastVariable(ast)
+    }
+  }
+
+  return pathToNode
+}
--- a/src/lang/modifyAst/addEdgeTreatment.test.ts
+++ b/src/lang/modifyAst/addEdgeTreatment.test.ts
@ -1,4 +1,4 @@
-import { VITE_KC_DEV_TOKEN } from '@src/env'
+import { VITE_KITTYCAD_API_TOKEN } from '@src/env'

 import { createLiteral } from '@src/lang/create'
 import type {
@ -40,10 +40,9 @@ import { isOverlap } from '@src/lib/utils'
 beforeAll(async () => {
  await initPromise

-  // THESE TEST WILL FAIL without VITE_KC_DEV_TOKEN set in .env.development.local
  await new Promise((resolve) => {
    engineCommandManager.start({
-      token: VITE_KC_DEV_TOKEN,
+      token: VITE_KITTYCAD_API_TOKEN,
      width: 256,
      height: 256,
      setMediaStream: () => {},
--- a/src/lang/modifyAst/sweeps.test.ts
+++ b/src/lang/modifyAst/sweeps.test.ts
@ -0,0 +1,252 @@
+import {
+  type Artifact,
+  assertParse,
+  type CodeRef,
+  type Program,
+  recast,
+} from '@src/lang/wasm'
+import type { Selection, Selections } from '@src/lib/selections'
+import { enginelessExecutor } from '@src/lib/testHelpers'
+import { err } from '@src/lib/trap'
+import {
+  addExtrude,
+  addLoft,
+  addRevolve,
+  addSweep,
+} from '@src/lang/modifyAst/sweeps'
+import { stringToKclExpression } from '@src/lib/kclHelpers'
+import type { Node } from '@rust/kcl-lib/bindings/Node'
+
+async function getAstAndArtifactGraph(code: string) {
+  const ast = assertParse(code)
+  if (err(ast)) throw ast
+
+  const { artifactGraph } = await enginelessExecutor(ast)
+  return { ast, artifactGraph }
+}
+
+function createSelectionFromPathArtifact(
+  artifacts: (Artifact & { codeRef: CodeRef })[]
+): Selections {
+  const graphSelections = artifacts.map(
+    (artifact) =>
+      ({
+        codeRef: artifact.codeRef,
+        artifact,
+      }) as Selection
+  )
+  return {
+    graphSelections,
+    otherSelections: [],
+  }
+}
+
+async function getAstAndSketchSelections(code: string) {
+  const { ast, artifactGraph } = await getAstAndArtifactGraph(code)
+  const artifacts = [...artifactGraph.values()].filter((a) => a.type === 'path')
+  if (artifacts.length === 0) {
+    throw new Error('Artifact not found in the graph')
+  }
+  const sketches = createSelectionFromPathArtifact(artifacts)
+  return { ast, sketches }
+}
+
+async function getKclCommandValue(value: string) {
+  const result = await stringToKclExpression(value)
+  if (err(result) || 'errors' in result) {
+    throw new Error(`Couldn't create kcl expression`)
+  }
+
+  return result
+}
+
+async function runNewAstAndCheckForSweep(ast: Node<Program>) {
+  const { artifactGraph } = await enginelessExecutor(ast)
+  console.log('artifactGraph', artifactGraph)
+  const sweepArtifact = artifactGraph.values().find((a) => a.type === 'sweep')
+  expect(sweepArtifact).toBeDefined()
+}
+
+describe('Testing addExtrude', () => {
+  it('should push a call in pipe if selection was in variable-less pipe', async () => {
+    const code = `startSketchOn(XY)
+  |> circle(center = [0, 0], radius = 1)
+`
+    const { ast, sketches } = await getAstAndSketchSelections(code)
+    const length = await getKclCommandValue('1')
+    const result = addExtrude({ ast, sketches, length })
+    if (err(result)) throw result
+    const newCode = recast(result.modifiedAst)
+    expect(newCode).toContain(code)
+    expect(newCode).toContain(`|> extrude(length = 1)`)
+    await runNewAstAndCheckForSweep(result.modifiedAst)
+  })
+
+  it('should push a call with variable if selection was in variable profile', async () => {
+    const code = `sketch001 = startSketchOn(XY)
+profile001 = circle(sketch001, center = [0, 0], radius = 1)
+`
+    const { ast, sketches } = await getAstAndSketchSelections(code)
+    const length = await getKclCommandValue('2')
+    const result = addExtrude({ ast, sketches, length })
+    if (err(result)) throw result
+    const newCode = recast(result.modifiedAst)
+    expect(newCode).toContain(code)
+    expect(newCode).toContain(`extrude001 = extrude(profile001, length = 2)`)
+    await runNewAstAndCheckForSweep(result.modifiedAst)
+  })
+
+  it('should push a call with variable if selection was in variable pipe', async () => {
+    const code = `profile001 = startSketchOn(XY)
+  |> circle(center = [0, 0], radius = 1)
+`
+    const { ast, sketches } = await getAstAndSketchSelections(code)
+    const length = await getKclCommandValue('3')
+    const result = addExtrude({ ast, sketches, length })
+    if (err(result)) throw result
+    await runNewAstAndCheckForSweep(result.modifiedAst)
+    const newCode = recast(result.modifiedAst)
+    expect(newCode).toContain(code)
+    expect(newCode).toContain(`extrude001 = extrude(profile001, length = 3)`)
+  })
+
+  it('should push a call with many compatible optional args if asked', async () => {
+    const code = `sketch001 = startSketchOn(XY)
+profile001 = circle(sketch001, center = [0, 0], radius = 1)
+`
+    const { ast, sketches } = await getAstAndSketchSelections(code)
+    const length = await getKclCommandValue('10')
+    const bidirectionalLength = await getKclCommandValue('20')
+    const twistAngle = await getKclCommandValue('30')
+    const result = addExtrude({
+      ast,
+      sketches,
+      length,
+      bidirectionalLength,
+      twistAngle,
+    })
+    if (err(result)) throw result
+    await runNewAstAndCheckForSweep(result.modifiedAst)
+    const newCode = recast(result.modifiedAst)
+    expect(newCode).toContain(code)
+    expect(newCode).toContain(`extrude001 = extrude(
+  profile001,
+  length = 10,
+  bidirectionalLength = 20,
+  twistAngle = 30,
+)`)
+  })
+
+  // TODO: missing edit flow test
+
+  // TODO: missing multi-profile test
+})
+
+describe('Testing addSweep', () => {
+  it('should push a call with variable and all compatible optional args', async () => {
+    const code = `sketch001 = startSketchOn(XY)
+profile001 = circle(sketch001, center = [0, 0], radius = 1)
+sketch002 = startSketchOn(XZ)
+profile002 = startProfile(sketch002, at = [0, 0])
+  |> xLine(length = -5)
+  |> tangentialArc(endAbsolute = [-20, 5])
+`
+    const { ast, artifactGraph } = await getAstAndArtifactGraph(code)
+    const artifact1 = artifactGraph.values().find((a) => a.type === 'path')
+    const artifact2 = [...artifactGraph.values()].findLast(
+      (a) => a.type === 'path'
+    )
+    if (!artifact1 || !artifact2) {
+      throw new Error('Artifact not found in the graph')
+    }
+
+    const sketches = createSelectionFromPathArtifact([artifact1])
+    const path = createSelectionFromPathArtifact([artifact2])
+    const sectional = true
+    const relativeTo = 'sketchPlane'
+    const result = addSweep({
+      ast,
+      sketches,
+      path,
+      sectional,
+      relativeTo,
+    })
+    if (err(result)) throw result
+    await runNewAstAndCheckForSweep(result.modifiedAst)
+    const newCode = recast(result.modifiedAst)
+    expect(newCode).toContain(code)
+    expect(newCode).toContain(`sweep001 = sweep(
+  profile001,
+  path = profile002,
+  sectional = true,
+  relativeTo = 'sketchPlane',
+)`)
+  })
+
+  // TODO: missing edit flow test
+
+  // TODO: missing multi-profile test
+})
+
+describe('Testing addLoft', () => {
+  it('should push a call with variable and all optional args if asked', async () => {
+    const code = `sketch001 = startSketchOn(XZ)
+profile001 = circle(sketch001, center = [0, 0], radius = 30)
+plane001 = offsetPlane(XZ, offset = 50)
+sketch002 = startSketchOn(plane001)
+profile002 = circle(sketch002, center = [0, 0], radius = 20)
+`
+    const { ast, sketches } = await getAstAndSketchSelections(code)
+    expect(sketches.graphSelections).toHaveLength(2)
+    const vDegree = await getKclCommandValue('3')
+    const result = addLoft({
+      ast,
+      sketches,
+      vDegree,
+    })
+    if (err(result)) throw result
+    const newCode = recast(result.modifiedAst)
+    expect(newCode).toContain(code)
+    expect(newCode).toContain(
+      `loft001 = loft([profile001, profile002], vDegree = 3)`
+    )
+    // Don't think we can find the artifact here for loft?
+  })
+
+  // TODO: missing edit flow test
+})
+
+describe('Testing addRevolve', () => {
+  it('should push a call with variable and compatible optional args if asked', async () => {
+    const code = `sketch001 = startSketchOn(XZ)
+profile001 = circle(sketch001, center = [3, 0], radius = 1)
+`
+    const { ast, sketches } = await getAstAndSketchSelections(code)
+    expect(sketches.graphSelections).toHaveLength(1)
+    const result = addRevolve({
+      ast,
+      sketches,
+      angle: await getKclCommandValue('1'),
+      axisOrEdge: 'Axis',
+      axis: 'X',
+      edge: undefined,
+      symmetric: false,
+      bidirectionalAngle: await getKclCommandValue('2'),
+    })
+    if (err(result)) throw result
+    await runNewAstAndCheckForSweep(result.modifiedAst)
+    const newCode = recast(result.modifiedAst)
+    console.log(newCode)
+    expect(newCode).toContain(code)
+    expect(newCode).toContain(`revolve001 = revolve(
+  profile001,
+  angle = 1,
+  axis = X,
+  bidirectionalAngle = 2,
+)`)
+  })
+
+  // TODO: missing edit flow test
+
+  // TODO: missing multi-profile test
+})
--- a/src/lang/modifyAst/addSweep.ts
+++ b/src/lang/modifyAst/addSweep.ts
@ -1,35 +1,28 @@
 import type { Node } from '@rust/kcl-lib/bindings/Node'

 import {
-  createArrayExpression,
  createCallExpressionStdLibKw,
  createLabeledArg,
  createLiteral,
  createLocalName,
-  createVariableDeclaration,
-  findUniqueName,
 } from '@src/lang/create'
-import { insertVariableAndOffsetPathToNode } from '@src/lang/modifyAst'
+import {
+  createVariableExpressionsArray,
+  insertVariableAndOffsetPathToNode,
+  setCallInAst,
+} from '@src/lang/modifyAst'
 import {
  getEdgeTagCall,
  mutateAstWithTagForSketchSegment,
 } from '@src/lang/modifyAst/addEdgeTreatment'
 import {
  getNodeFromPath,
-  getSketchExprsFromSelection,
+  getVariableExprsFromSelection,
  valueOrVariable,
 } from '@src/lang/queryAst'
-import { ARG_INDEX_FIELD, LABELED_ARG_FIELD } from '@src/lang/queryAstConstants'
 import { getNodePathFromSourceRange } from '@src/lang/queryAstNodePathUtils'
-import type {
-  CallExpressionKw,
-  Expr,
-  PathToNode,
-  Program,
-  VariableDeclaration,
-} from '@src/lang/wasm'
+import type { PathToNode, Program, VariableDeclaration } from '@src/lang/wasm'
 import type { KclCommandValue } from '@src/lib/commandTypes'
-import { KCL_DEFAULT_CONSTANT_PREFIXES } from '@src/lib/constants'
 import type { Selections } from '@src/lib/selections'
 import { err } from '@src/lib/trap'

@ -60,13 +53,13 @@ export function addExtrude({

  // 2. Prepare unlabeled and labeled arguments
  // Map the sketches selection into a list of kcl expressions to be passed as unlabelled argument
-  const sketchesExprList = getSketchExprsFromSelection(
+  const variableExpressions = getVariableExprsFromSelection(
    sketches,
    modifiedAst,
    nodeToEdit
  )
-  if (err(sketchesExprList)) {
-    return sketchesExprList
+  if (err(variableExpressions)) {
+    return variableExpressions
  }

  // Extra labeled args expressions
@ -85,7 +78,7 @@ export function addExtrude({
    ? [createLabeledArg('twistAngle', valueOrVariable(twistAngle))]
    : []

-  const sketchesExpr = createSketchExpression(sketchesExprList)
+  const sketchesExpr = createVariableExpressionsArray(variableExpressions.exprs)
  const call = createCallExpressionStdLibKw('extrude', sketchesExpr, [
    createLabeledArg('length', valueOrVariable(length)),
    ...symmetricExpr,
@ -114,27 +107,10 @@ export function addExtrude({

  // 3. If edit, we assign the new function call declaration to the existing node,
  // otherwise just push to the end
-  let pathToNode: PathToNode | undefined
-  if (nodeToEdit) {
-    const result = getNodeFromPath<CallExpressionKw>(
-      modifiedAst,
-      nodeToEdit,
-      'CallExpressionKw'
-    )
-    if (err(result)) {
-      return result
-    }
-
-    Object.assign(result.node, call)
-    pathToNode = nodeToEdit
-  } else {
-    const name = findUniqueName(
-      modifiedAst,
-      KCL_DEFAULT_CONSTANT_PREFIXES.EXTRUDE
-    )
-    const declaration = createVariableDeclaration(name, call)
-    modifiedAst.body.push(declaration)
-    pathToNode = createPathToNode(modifiedAst)
+  const lastPath = variableExpressions.paths.pop() // TODO: check if this is correct
+  const pathToNode = setCallInAst(modifiedAst, call, nodeToEdit, lastPath)
+  if (err(pathToNode)) {
+    return pathToNode
  }

  return {
@ -168,13 +144,13 @@ export function addSweep({

  // 2. Prepare unlabeled and labeled arguments
  // Map the sketches selection into a list of kcl expressions to be passed as unlabelled argument
-  const sketchesExprList = getSketchExprsFromSelection(
+  const variableExprs = getVariableExprsFromSelection(
    sketches,
    modifiedAst,
    nodeToEdit
  )
-  if (err(sketchesExprList)) {
-    return sketchesExprList
+  if (err(variableExprs)) {
+    return variableExprs
  }

  // Find the path declaration for the labeled argument
@ -196,7 +172,7 @@ export function addSweep({
    ? [createLabeledArg('relativeTo', createLiteral(relativeTo))]
    : []

-  const sketchesExpr = createSketchExpression(sketchesExprList)
+  const sketchesExpr = createVariableExpressionsArray(variableExprs.exprs)
  const call = createCallExpressionStdLibKw('sweep', sketchesExpr, [
    createLabeledArg('path', pathExpr),
    ...sectionalExpr,
@ -205,27 +181,10 @@ export function addSweep({

  // 3. If edit, we assign the new function call declaration to the existing node,
  // otherwise just push to the end
-  let pathToNode: PathToNode | undefined
-  if (nodeToEdit) {
-    const result = getNodeFromPath<CallExpressionKw>(
-      modifiedAst,
-      nodeToEdit,
-      'CallExpressionKw'
-    )
-    if (err(result)) {
-      return result
-    }
-
-    Object.assign(result.node, call)
-    pathToNode = nodeToEdit
-  } else {
-    const name = findUniqueName(
-      modifiedAst,
-      KCL_DEFAULT_CONSTANT_PREFIXES.SWEEP
-    )
-    const declaration = createVariableDeclaration(name, call)
-    modifiedAst.body.push(declaration)
-    pathToNode = createPathToNode(modifiedAst)
+  const lastPath = variableExprs.paths.pop() // TODO: check if this is correct
+  const pathToNode = setCallInAst(modifiedAst, call, nodeToEdit, lastPath)
+  if (err(pathToNode)) {
+    return pathToNode
  }

  return {
@ -255,13 +214,13 @@ export function addLoft({

  // 2. Prepare unlabeled and labeled arguments
  // Map the sketches selection into a list of kcl expressions to be passed as unlabelled argument
-  const sketchesExprList = getSketchExprsFromSelection(
+  const variableExprs = getVariableExprsFromSelection(
    sketches,
    modifiedAst,
    nodeToEdit
  )
-  if (err(sketchesExprList)) {
-    return sketchesExprList
+  if (err(variableExprs)) {
+    return variableExprs
  }

  // Extra labeled args expressions
@ -269,7 +228,7 @@ export function addLoft({
    ? [createLabeledArg('vDegree', valueOrVariable(vDegree))]
    : []

-  const sketchesExpr = createSketchExpression(sketchesExprList)
+  const sketchesExpr = createVariableExpressionsArray(variableExprs.exprs)
  const call = createCallExpressionStdLibKw('loft', sketchesExpr, [
    ...vDegreeExpr,
  ])
@ -281,25 +240,10 @@ export function addLoft({

  // 3. If edit, we assign the new function call declaration to the existing node,
  // otherwise just push to the end
-  let pathToNode: PathToNode | undefined
-  if (nodeToEdit) {
-    const result = getNodeFromPath<CallExpressionKw>(
-      modifiedAst,
-      nodeToEdit,
-      'CallExpressionKw'
-    )
-    if (err(result)) {
-      return result
-    }
-
-    Object.assign(result.node, call)
-    pathToNode = nodeToEdit
-  } else {
-    const name = findUniqueName(modifiedAst, KCL_DEFAULT_CONSTANT_PREFIXES.LOFT)
-    const declaration = createVariableDeclaration(name, call)
-    modifiedAst.body.push(declaration)
-    const toFirstKwarg = !!vDegree
-    pathToNode = createPathToNode(modifiedAst, toFirstKwarg)
+  const lastPath = variableExprs.paths.pop() // TODO: check if this is correct
+  const pathToNode = setCallInAst(modifiedAst, call, nodeToEdit, lastPath)
+  if (err(pathToNode)) {
+    return pathToNode
  }

  return {
@ -339,13 +283,13 @@ export function addRevolve({

  // 2. Prepare unlabeled and labeled arguments
  // Map the sketches selection into a list of kcl expressions to be passed as unlabelled argument
-  const sketchesExprList = getSketchExprsFromSelection(
+  const variableExprs = getVariableExprsFromSelection(
    sketches,
    modifiedAst,
    nodeToEdit
  )
-  if (err(sketchesExprList)) {
-    return sketchesExprList
+  if (err(variableExprs)) {
+    return variableExprs
  }

  // Retrieve axis expression depending on mode
@ -372,7 +316,7 @@ export function addRevolve({
      ]
    : []

-  const sketchesExpr = createSketchExpression(sketchesExprList)
+  const sketchesExpr = createVariableExpressionsArray(variableExprs.exprs)
  const call = createCallExpressionStdLibKw('revolve', sketchesExpr, [
    createLabeledArg('angle', valueOrVariable(angle)),
    createLabeledArg('axis', getAxisResult.generatedAxis),
@ -399,27 +343,10 @@ export function addRevolve({

  // 3. If edit, we assign the new function call declaration to the existing node,
  // otherwise just push to the end
-  let pathToNode: PathToNode | undefined
-  if (nodeToEdit) {
-    const result = getNodeFromPath<CallExpressionKw>(
-      modifiedAst,
-      nodeToEdit,
-      'CallExpressionKw'
-    )
-    if (err(result)) {
-      return result
-    }
-
-    Object.assign(result.node, call)
-    pathToNode = nodeToEdit
-  } else {
-    const name = findUniqueName(
-      modifiedAst,
-      KCL_DEFAULT_CONSTANT_PREFIXES.REVOLVE
-    )
-    const declaration = createVariableDeclaration(name, call)
-    modifiedAst.body.push(declaration)
-    pathToNode = createPathToNode(modifiedAst)
+  const lastPath = variableExprs.paths.pop() // TODO: check if this is correct
+  const pathToNode = setCallInAst(modifiedAst, call, nodeToEdit, lastPath)
+  if (err(pathToNode)) {
+    return pathToNode
  }

  return {
@ -430,40 +357,6 @@ export function addRevolve({

 // Utilities

-function createSketchExpression(sketches: Expr[]) {
-  let sketchesExpr: Expr | null = null
-  if (sketches.every((s) => s.type === 'PipeSubstitution')) {
-    // Keeping null so we don't even put it the % sign
-  } else if (sketches.length === 1) {
-    sketchesExpr = sketches[0]
-  } else {
-    sketchesExpr = createArrayExpression(sketches)
-  }
-  return sketchesExpr
-}
-
-function createPathToNode(
-  modifiedAst: Node<Program>,
-  toFirstKwarg = true
-): PathToNode {
-  const argIndex = 0 // first kwarg for all sweeps here
-  const pathToCall: PathToNode = [
-    ['body', ''],
-    [modifiedAst.body.length - 1, 'index'],
-    ['declaration', 'VariableDeclaration'],
-    ['init', 'VariableDeclarator'],
-  ]
-  if (toFirstKwarg) {
-    pathToCall.push(
-      ['arguments', 'CallExpressionKw'],
-      [argIndex, ARG_INDEX_FIELD],
-      ['arg', LABELED_ARG_FIELD]
-    )
-  }
-
-  return pathToCall
-}
-
 export function getAxisExpressionAndIndex(
  axisOrEdge: 'Axis' | 'Edge',
  axis: string | undefined,
--- a/src/lang/modifyAst/tagManagement.test.ts
+++ b/src/lang/modifyAst/tagManagement.test.ts
@ -4,16 +4,15 @@ import { initPromise } from '@src/lang/wasmUtils'
 import { err } from '@src/lib/trap'
 import type { Selection } from '@src/lib/selections'
 import { engineCommandManager, kclManager } from '@src/lib/singletons'
-import { VITE_KC_DEV_TOKEN } from '@src/env'
+import { VITE_KITTYCAD_API_TOKEN } from '@src/env'
 import { modifyAstWithTagsForSelection } from '@src/lang/modifyAst/tagManagement'

 beforeAll(async () => {
  await initPromise

-  // THESE TEST WILL FAIL without VITE_KC_DEV_TOKEN set in .env.development.local
  await new Promise((resolve) => {
    engineCommandManager.start({
-      token: VITE_KC_DEV_TOKEN,
+      token: VITE_KITTYCAD_API_TOKEN,
      width: 256,
      height: 256,
      setMediaStream: () => {},
--- a/src/lang/queryAst.test.ts
+++ b/src/lang/queryAst.test.ts
@ -15,6 +15,7 @@ import {
  findAllPreviousVariables,
  findUsesOfTagInPipe,
  getNodeFromPath,
+  getVariableExprsFromSelection,
  hasSketchPipeBeenExtruded,
  isCursorInFunctionDefinition,
  isNodeSafeToReplace,
@ -27,7 +28,7 @@ import { topLevelRange } from '@src/lang/util'
 import type { Identifier, PathToNode } from '@src/lang/wasm'
 import { assertParse, recast } from '@src/lang/wasm'
 import { initPromise } from '@src/lang/wasmUtils'
-import { type Selection } from '@src/lib/selections'
+import type { Selections, Selection } from '@src/lib/selections'
 import { enginelessExecutor } from '@src/lib/testHelpers'
 import { err } from '@src/lib/trap'

@ -778,3 +779,184 @@ describe('Testing specific sketch getNodeFromPath workflow', () => {
    expect(result).toEqual(false)
  })
 })
+
+describe('Testing getVariableExprsFromSelection', () => {
+  it('should find the variable expr in a simple profile selection', async () => {
+    const circleProfileInVar = `sketch001 = startSketchOn(XY)
+profile001 = circle(sketch001, center = [0, 0], radius = 1)
+`
+    const ast = assertParse(circleProfileInVar)
+    const { artifactGraph } = await enginelessExecutor(ast)
+    const artifact = artifactGraph.values().find((a) => a.type === 'path')
+    if (!artifact) {
+      throw new Error('Artifact not found in the graph')
+    }
+    const selections: Selections = {
+      graphSelections: [
+        {
+          codeRef: artifact.codeRef,
+          artifact,
+        },
+      ],
+      otherSelections: [],
+    }
+    const variableExprs = getVariableExprsFromSelection(selections, ast)
+    if (err(variableExprs)) throw variableExprs
+
+    expect(variableExprs.exprs).toHaveLength(1)
+    if (variableExprs.exprs[0].type !== 'Name') {
+      throw new Error(`Expected Name, got ${variableExprs.exprs[0].type}`)
+    }
+
+    expect(variableExprs.exprs[0].name.name).toEqual('profile001')
+
+    expect(variableExprs.paths).toHaveLength(1)
+    expect(variableExprs.paths[0]).toEqual([
+      ['body', ''],
+      [1, 'index'],
+      ['declaration', 'VariableDeclaration'],
+      ['init', ''],
+    ])
+  })
+
+  it('should return the pipe substitution symbol in a variable-less simple profile selection', async () => {
+    const circleProfileInVar = `startSketchOn(XY)
+  |> circle(center = [0, 0], radius = 1)
+`
+    const ast = assertParse(circleProfileInVar)
+    const { artifactGraph } = await enginelessExecutor(ast)
+    const artifact = artifactGraph.values().find((a) => a.type === 'path')
+    if (!artifact) {
+      throw new Error('Artifact not found in the graph')
+    }
+    const selections: Selections = {
+      graphSelections: [
+        {
+          codeRef: artifact.codeRef,
+          artifact,
+        },
+      ],
+      otherSelections: [],
+    }
+    const variableExprs = getVariableExprsFromSelection(selections, ast)
+    if (err(variableExprs)) throw variableExprs
+
+    expect(variableExprs.exprs).toHaveLength(1)
+    expect(variableExprs.exprs[0].type).toEqual('PipeSubstitution')
+
+    expect(variableExprs.paths).toHaveLength(1)
+    expect(variableExprs.paths[0]).toEqual([
+      ['body', ''],
+      [0, 'index'],
+      ['expression', 'ExpressionStatement'],
+      ['body', 'PipeExpression'],
+      [1, 'index'],
+    ])
+  })
+
+  it('should find the variable exprs in a multi profile selection ', async () => {
+    const circleProfileInVar = `sketch001 = startSketchOn(XY)
+profile001 = circle(sketch001, center = [0, 0], radius = 1)
+profile002 = circle(sketch001, center = [2, 2], radius = 1)
+`
+    const ast = assertParse(circleProfileInVar)
+    const { artifactGraph } = await enginelessExecutor(ast)
+    const artifacts = [...artifactGraph.values()].filter(
+      (a) => a.type === 'path'
+    )
+    if (!artifacts || artifacts.length !== 2) {
+      throw new Error('Artifact not found in the graph')
+    }
+    const selections: Selections = {
+      graphSelections: artifacts.map((artifact) => {
+        return {
+          codeRef: artifact.codeRef,
+          artifact,
+        }
+      }),
+      otherSelections: [],
+    }
+    const variableExprs = getVariableExprsFromSelection(selections, ast)
+    if (err(variableExprs)) throw variableExprs
+
+    expect(variableExprs.exprs).toHaveLength(2)
+    if (variableExprs.exprs[0].type !== 'Name') {
+      throw new Error(`Expected Name, got ${variableExprs.exprs[0].type}`)
+    }
+
+    if (variableExprs.exprs[1].type !== 'Name') {
+      throw new Error(`Expected Name, got ${variableExprs.exprs[1].type}`)
+    }
+
+    expect(variableExprs.exprs[0].name.name).toEqual('profile001')
+    expect(variableExprs.exprs[1].name.name).toEqual('profile002')
+
+    expect(variableExprs.paths).toHaveLength(2)
+    expect(variableExprs.paths[0]).toEqual([
+      ['body', ''],
+      [1, 'index'],
+      ['declaration', 'VariableDeclaration'],
+      ['init', ''],
+    ])
+    expect(variableExprs.paths[1]).toEqual([
+      ['body', ''],
+      [2, 'index'],
+      ['declaration', 'VariableDeclaration'],
+      ['init', ''],
+    ])
+  })
+
+  it('should return the pipe substitution symbol and a variable name in a complex multi profile selection', async () => {
+    const circleProfileInVar = `startSketchOn(XY)
+  |> circle(center = [0, 0], radius = 1)
+profile002 = circle(sketch001, center = [2, 2], radius = 1)
+`
+    const ast = assertParse(circleProfileInVar)
+    const { artifactGraph } = await enginelessExecutor(ast)
+    const artifacts = [...artifactGraph.values()].filter(
+      (a) => a.type === 'path'
+    )
+    if (!artifacts || artifacts.length !== 2) {
+      throw new Error('Artifact not found in the graph')
+    }
+    const selections: Selections = {
+      graphSelections: artifacts.map((artifact) => {
+        return {
+          codeRef: artifact.codeRef,
+          artifact,
+        }
+      }),
+      otherSelections: [],
+    }
+    const variableExprs = getVariableExprsFromSelection(selections, ast)
+    if (err(variableExprs)) throw variableExprs
+
+    expect(variableExprs.exprs).toHaveLength(2)
+    if (variableExprs.exprs[0].type !== 'PipeSubstitution') {
+      throw new Error(
+        `Expected PipeSubstitution, got ${variableExprs.exprs[0].type}`
+      )
+    }
+
+    if (variableExprs.exprs[1].type !== 'Name') {
+      throw new Error(`Expected Name, got ${variableExprs.exprs[1].type}`)
+    }
+
+    expect(variableExprs.exprs[1].name.name).toEqual('profile002')
+
+    expect(variableExprs.paths).toHaveLength(2)
+    expect(variableExprs.paths[0]).toEqual([
+      ['body', ''],
+      [0, 'index'],
+      ['expression', 'ExpressionStatement'],
+      ['body', 'PipeExpression'],
+      [1, 'index'],
+    ])
+    expect(variableExprs.paths[1]).toEqual([
+      ['body', ''],
+      [1, 'index'],
+      ['declaration', 'VariableDeclaration'],
+      ['init', ''],
+    ])
+  })
+})
--- a/src/lang/queryAst.ts
+++ b/src/lang/queryAst.ts
@ -1042,19 +1042,21 @@ export const valueOrVariable = (variable: KclCommandValue) => {

 // Go from a selection of sketches to a list of KCL expressions that
 // can be used to create KCL sweep call declarations.
-export function getSketchExprsFromSelection(
+export function getVariableExprsFromSelection(
  selection: Selections,
  ast: Node<Program>,
  nodeToEdit?: PathToNode
-): Error | Expr[] {
-  const sketches: Expr[] = selection.graphSelections.flatMap((s) => {
+): Error | { exprs: Expr[]; paths: PathToNode[] } {
+  const paths: PathToNode[] = []
+  const exprs: Expr[] = []
+  for (const s of selection.graphSelections) {
    const sketchVariable = getNodeFromPath<VariableDeclarator>(
      ast,
      s?.codeRef.pathToNode,
      'VariableDeclarator'
    )
    if (err(sketchVariable)) {
-      return []
+      continue
    }

    if (sketchVariable.node.id) {
@ -1071,22 +1073,27 @@ export function getSketchExprsFromSelection(
          name === result.node.id.name
        ) {
          // Pointing to same variable case
-          return createPipeSubstitution()
+          paths.push(nodeToEdit)
+          exprs.push(createPipeSubstitution())
+          continue
        }
      }
      // Pointing to different variable case
-      return createLocalName(name)
-    } else {
-      // No variable case
-      return createPipeSubstitution()
+      paths.push(sketchVariable.deepPath)
+      exprs.push(createLocalName(name))
+      continue
    }
-  })

-  if (sketches.length === 0) {
+    // No variable case
+    paths.push(sketchVariable.deepPath)
+    exprs.push(createPipeSubstitution())
+  }
+
+  if (exprs.length === 0) {
    return new Error("Couldn't map selections to program references")
  }

-  return sketches
+  return { exprs, paths }
 }

 // Go from the sketches argument in a KCL sweep call declaration
--- a/src/lang/std/engineConnection.ts
+++ b/src/lang/std/engineConnection.ts
@ -1,5 +1,5 @@
 import type { Models } from '@kittycad/lib'
-import { VITE_KC_API_WS_MODELING_URL, VITE_KC_DEV_TOKEN } from '@src/env'
+import { VITE_KC_API_WS_MODELING_URL, VITE_KITTYCAD_API_TOKEN } from '@src/env'
 import { jsAppSettings } from '@src/lib/settings/settingsUtils'
 import { BSON } from 'bson'

@ -400,7 +400,7 @@ class EngineConnection extends EventTarget {
      this.send({
        type: 'headers',
        headers: {
-          Authorization: `Bearer ${VITE_KC_DEV_TOKEN}`,
+          Authorization: `Bearer ${VITE_KITTYCAD_API_TOKEN}`,
        },
      })
    }
--- a/src/lib/coredump.ts
+++ b/src/lib/coredump.ts
@ -1,4 +1,3 @@
-import { VITE_KC_API_BASE_URL } from '@src/env'
 import { UAParser } from 'ua-parser-js'

 import type { OsInfo } from '@rust/kcl-lib/bindings/OsInfo'
@ -11,6 +10,7 @@ import { isDesktop } from '@src/lib/isDesktop'
 import type RustContext from '@src/lib/rustContext'
 import screenshot from '@src/lib/screenshot'
 import { APP_VERSION } from '@src/routes/utils'
+import { withAPIBaseURL } from '@src/lib/withBaseURL'

 /* eslint-disable suggest-no-throw/suggest-no-throw --
 * All the throws in CoreDumpManager are intentional and should be caught and handled properly
@ -35,7 +35,7 @@ export class CoreDumpManager {
  codeManager: CodeManager
  rustContext: RustContext
  token: string | undefined
-  baseUrl: string = VITE_KC_API_BASE_URL
+  baseUrl: string = withAPIBaseURL('')

  constructor(
    engineCommandManager: EngineCommandManager,
--- a/src/lib/desktop.ts
+++ b/src/lib/desktop.ts
@ -26,6 +26,7 @@ import { err } from '@src/lib/trap'
 import type { DeepPartial } from '@src/lib/types'
 import { getInVariableCase } from '@src/lib/utils'
 import { IS_STAGING } from '@src/routes/utils'
+import { withAPIBaseURL } from '@src/lib/withBaseURL'

 export async function renameProjectDirectory(
  projectPath: string,
@ -697,7 +698,9 @@ export const readTokenFile = async () => {
 export const writeTokenFile = async (token: string) => {
  const tokenFilePath = await getTokenFilePath()
  if (err(token)) return Promise.reject(token)
-  return window.electron.writeFile(tokenFilePath, token)
+  const result = window.electron.writeFile(tokenFilePath, token)
+  console.log('token written to disk')
+  return result
 }

 export const writeTelemetryFile = async (content: string) => {
@ -722,12 +725,9 @@ export const setState = async (state: Project | undefined): Promise<void> => {
  appStateStore = state
 }

-export const getUser = async (
-  token: string,
-  hostname: string
-): Promise<Models['User_type']> => {
+export const getUser = async (token: string): Promise<Models['User_type']> => {
  try {
-    const user = await fetch(`${hostname}/users/me`, {
+    const user = await fetch(withAPIBaseURL('/users/me'), {
      headers: new Headers({
        Authorization: `Bearer ${token}`,
      }),
--- a/src/lib/links.ts
+++ b/src/lib/links.ts
@ -1,4 +1,4 @@
-import { VITE_KC_API_BASE_URL, VITE_KC_SITE_APP_URL } from '@src/env'
+import { VITE_KC_SITE_APP_URL } from '@src/env'
 import toast from 'react-hot-toast'

 import { stringToBase64 } from '@src/lib/base64'
@ -7,6 +7,7 @@ import {
  CREATE_FILE_URL_PARAM,
 } from '@src/lib/constants'
 import { err } from '@src/lib/trap'
+import { withAPIBaseURL } from '@src/lib/withBaseURL'

 export interface FileLinkParams {
  code: string
@ -96,7 +97,7 @@ export async function createShortlink(
  if (password) {
    body.password = password
  }
-  const response = await fetch(`${VITE_KC_API_BASE_URL}/user/shortlinks`, {
+  const response = await fetch(withAPIBaseURL('/user/shortlinks'), {
    method: 'POST',
    headers: {
      'Content-type': 'application/json',
--- a/src/lib/promptToEdit.tsx
+++ b/src/lib/promptToEdit.tsx
@ -1,7 +1,7 @@
 import type { SelectionRange } from '@codemirror/state'
 import { EditorSelection, Transaction } from '@codemirror/state'
 import type { Models } from '@kittycad/lib'
-import { VITE_KC_API_BASE_URL, VITE_KC_SITE_BASE_URL } from '@src/env'
+import { VITE_KC_SITE_BASE_URL } from '@src/env'
 import { diffLines } from 'diff'
 import toast from 'react-hot-toast'
 import type { TextToCadMultiFileIteration_type } from '@kittycad/lib/dist/types/src/models'
@ -28,6 +28,7 @@ import { uuidv4 } from '@src/lib/utils'
 import type { File as KittyCadLibFile } from '@kittycad/lib/dist/types/src/models'
 import type { FileMeta } from '@src/lib/types'
 import type { RequestedKCLFile } from '@src/machines/systemIO/utils'
+import { withAPIBaseURL } from '@src/lib/withBaseURL'

 type KclFileMetaMap = {
  [execStateFileNamesIndex: number]: Extract<FileMeta, { type: 'kcl' }>
@ -77,7 +78,7 @@ async function submitTextToCadRequest(
  })

  const response = await fetch(
-    `${VITE_KC_API_BASE_URL}/ml/text-to-cad/multi-file/iteration`,
+    withAPIBaseURL('/ml/text-to-cad/multi-file/iteration'),
    {
      method: 'POST',
      headers: {
@ -304,7 +305,7 @@ export async function getPromptToEditResult(
  id: string,
  token?: string
 ): Promise<Models['TextToCadMultiFileIteration_type'] | Error> {
-  const url = VITE_KC_API_BASE_URL + '/async/operations/' + id
+  const url = withAPIBaseURL(`/async/operations/${id}`)
  const data: Models['TextToCadMultiFileIteration_type'] | Error =
    await crossPlatformFetch(
      url,
@ -340,7 +341,7 @@ export async function doPromptEdit({
  ;(window as any).process = {
    env: {
      ZOO_API_TOKEN: token,
-      ZOO_HOST: VITE_KC_API_BASE_URL,
+      ZOO_HOST: withAPIBaseURL(''),
    },
  }
  try {
--- a/src/lib/singletons.ts
+++ b/src/lib/singletons.ts
@ -1,4 +1,4 @@
-import { VITE_KC_API_BASE_URL } from '@src/env'
+import { withAPIBaseURL } from '@src/lib/withBaseURL'

 import EditorManager from '@src/editor/manager'
 import { KclManager } from '@src/lang/KclSingleton'
@ -171,7 +171,7 @@ const appMachine = setup({
      systemId: BILLING,
      input: {
        ...BILLING_CONTEXT_DEFAULTS,
-        urlUserService: VITE_KC_API_BASE_URL,
+        urlUserService: withAPIBaseURL(''),
      },
    }),
  ],
--- a/src/lib/textToCad.ts
+++ b/src/lib/textToCad.ts
@ -1,5 +1,4 @@
 import type { Models } from '@kittycad/lib'
-import { VITE_KC_API_BASE_URL } from '@src/env'
 import toast from 'react-hot-toast'
 import type { NavigateFunction } from 'react-router-dom'
 import {
@ -19,6 +18,7 @@ import { err, reportRejection } from '@src/lib/trap'
 import { toSync } from '@src/lib/utils'
 import { getAllSubDirectoriesAtProjectRoot } from '@src/machines/systemIO/snapshotContext'
 import { joinOSPaths } from '@src/lib/paths'
+import { withAPIBaseURL } from '@src/lib/withBaseURL'

 export async function submitTextToCadPrompt(
  prompt: string,
@ -32,7 +32,7 @@ export async function submitTextToCadPrompt(
    kcl_version: kclManager.kclVersion,
  }
  // Glb has a smaller footprint than gltf, should we want to render it.
-  const url = VITE_KC_API_BASE_URL + '/ai/text-to-cad/glb?kcl=true'
+  const url = withAPIBaseURL('/ai/text-to-cad/glb?kcl=true')
  const data: Models['TextToCad_type'] | Error = await crossPlatformFetch(
    url,
    {
@ -58,7 +58,7 @@ export async function getTextToCadResult(
  id: string,
  token?: string
 ): Promise<Models['TextToCad_type'] | Error> {
-  const url = VITE_KC_API_BASE_URL + '/user/text-to-cad/' + id
+  const url = withAPIBaseURL(`/user/text-to-cad/${id}`)
  const data: Models['TextToCad_type'] | Error = await crossPlatformFetch(
    url,
    {
--- a/src/lib/textToCadTelemetry.ts
+++ b/src/lib/textToCadTelemetry.ts
@ -1,14 +1,13 @@
 import type { Models } from '@kittycad/lib/dist/types/src'
-import { VITE_KC_API_BASE_URL } from '@src/env'
 import crossPlatformFetch from '@src/lib/crossPlatformFetch'
+import { withAPIBaseURL } from '@src/lib/withBaseURL'

 export async function sendTelemetry(
  id: string,
  feedback: Models['MlFeedback_type'],
  token?: string
 ): Promise<void> {
-  const url =
-    VITE_KC_API_BASE_URL + '/user/text-to-cad/' + id + '?feedback=' + feedback
+  const url = withAPIBaseURL(`/user/text-to-cad/${id}?feedback=${feedback}`)
  await crossPlatformFetch(
    url,
    {
--- a/src/lib/withBaseURL.test.ts
+++ b/src/lib/withBaseURL.test.ts
@ -0,0 +1,34 @@
+import { withAPIBaseURL } from '@src/lib/withBaseURL'
+
+describe('withBaseURL', () => {
+  /**
+   * running in the development environment
+   * the .env.development should load
+   */
+  describe('withAPIBaseUrl', () => {
+    it('should return base url', () => {
+      const expected = 'https://api.dev.zoo.dev'
+      const actual = withAPIBaseURL('')
+      expect(actual).toBe(expected)
+    })
+    it('should return base url with /users', () => {
+      const expected = 'https://api.dev.zoo.dev/users'
+      const actual = withAPIBaseURL('/users')
+      expect(actual).toBe(expected)
+    })
+    it('should return a longer base url with /oauth2/token/revoke', () => {
+      const expected = 'https://api.dev.zoo.dev/oauth2/token/revoke'
+      const actual = withAPIBaseURL('/oauth2/token/revoke')
+      expect(actual).toBe(expected)
+    })
+    it('should ensure base url does not have ending slash', () => {
+      const expected = 'https://api.dev.zoo.dev'
+      const actual = withAPIBaseURL('')
+      expect(actual).toBe(expected)
+      const expectedEndsWith = expected[expected.length - 1]
+      const actualEndsWith = actual[actual.length - 1]
+      expect(actual).toBe(expected)
+      expect(actualEndsWith).toBe(expectedEndsWith)
+    })
+  })
+})
--- a/src/lib/withBaseURL.ts
+++ b/src/lib/withBaseURL.ts
@ -1,5 +1,5 @@
-import { VITE_KC_API_BASE_URL } from '@src/env'
+import { VITE_KITTYCAD_API_BASE_URL } from '@src/env'

-export default function withBaseUrl(path: string): string {
-  return VITE_KC_API_BASE_URL + path
+export function withAPIBaseURL(path: string): string {
+  return VITE_KITTYCAD_API_BASE_URL + path
 }
--- a/src/machines/authMachine.ts
+++ b/src/machines/authMachine.ts
@ -1,10 +1,5 @@
 import type { Models } from '@kittycad/lib'
-import {
-  DEV,
-  VITE_KC_API_BASE_URL,
-  VITE_KC_DEV_TOKEN,
-  VITE_KC_SKIP_AUTH,
-} from '@src/env'
+import { VITE_KITTYCAD_API_TOKEN } from '@src/env'
 import { assign, fromPromise, setup } from 'xstate'

 import { COOKIE_NAME, OAUTH2_DEVICE_CLIENT_ID } from '@src/lib/constants'
@ -15,32 +10,9 @@ import {
 } from '@src/lib/desktop'
 import { isDesktop } from '@src/lib/isDesktop'
 import { markOnce } from '@src/lib/performance'
-import {
-  default as withBaseURL,
-  default as withBaseUrl,
-} from '@src/lib/withBaseURL'
+import { withAPIBaseURL } from '@src/lib/withBaseURL'
 import { ACTOR_IDS } from '@src/machines/machineConstants'

-const SKIP_AUTH = VITE_KC_SKIP_AUTH === 'true' && DEV
-
-const LOCAL_USER: Models['User_type'] = {
-  id: '8675309',
-  name: 'Test User',
-  email: 'kittycad.sidebar.test@example.com',
-  image: 'https://placekitten.com/200/200',
-  created_at: 'yesteryear',
-  updated_at: 'today',
-  company: 'Test Company',
-  discord: 'Test User#1234',
-  github: 'testuser',
-  phone: '555-555-5555',
-  first_name: 'Test',
-  last_name: 'User',
-  can_train_on_data: false,
-  is_service_account: false,
-  deletion_scheduled: false,
-}
-
 export interface UserContext {
  user?: Models['User_type']
  token: string
@ -56,11 +28,21 @@ export type Events =
    }

 export const TOKEN_PERSIST_KEY = 'TOKEN_PERSIST_KEY'
+
+/**
+ * Determine which token do we have persisted to initialize the auth machine
+ */
+const persistedCookie = getCookie(COOKIE_NAME)
+const persistedLocalStorage = localStorage?.getItem(TOKEN_PERSIST_KEY) || ''
+const persistedDevToken = VITE_KITTYCAD_API_TOKEN
 export const persistedToken =
-  VITE_KC_DEV_TOKEN ||
-  getCookie(COOKIE_NAME) ||
-  localStorage?.getItem(TOKEN_PERSIST_KEY) ||
-  ''
+  persistedDevToken || persistedCookie || persistedLocalStorage
+console.log('Initial persisted token')
+console.table([
+  ['cookie', !!persistedCookie],
+  ['local storage', !!persistedLocalStorage],
+  ['api token', !!persistedDevToken],
+])

 export const authMachine = setup({
  types: {} as {
@ -157,7 +139,7 @@ export const authMachine = setup({

 async function getUser(input: { token?: string }) {
  const token = await getAndSyncStoredToken(input)
-  const url = withBaseURL('/user')
+  const url = withAPIBaseURL('/user')
  const headers: { [key: string]: string } = {
    'Content-Type': 'application/json',
  }
@ -165,21 +147,8 @@ async function getUser(input: { token?: string }) {
  if (!token && isDesktop()) return Promise.reject(new Error('No token found'))
  if (token) headers['Authorization'] = `Bearer ${token}`

-  if (SKIP_AUTH) {
-    // For local tests
-    if (localStorage.getItem('FORCE_NO_IMAGE')) {
-      LOCAL_USER.image = ''
-    }
-
-    markOnce('code/didAuth')
-    return {
-      user: LOCAL_USER,
-      token,
-    }
-  }
-
  const userPromise = isDesktop()
-    ? getUserDesktop(token, VITE_KC_API_BASE_URL)
+    ? getUserDesktop(token)
    : fetch(url, {
        method: 'GET',
        credentials: 'include',
@ -228,12 +197,24 @@ async function getAndSyncStoredToken(input: {
  token?: string
 }): Promise<string> {
  // dev mode
-  if (VITE_KC_DEV_TOKEN) return VITE_KC_DEV_TOKEN
+  if (VITE_KITTYCAD_API_TOKEN) {
+    console.log('Token used for authentication')
+    console.table([['api token', !!VITE_KITTYCAD_API_TOKEN]])
+    return VITE_KITTYCAD_API_TOKEN
+  }

-  const token =
-    input.token && input.token !== ''
-      ? input.token
-      : getCookie(COOKIE_NAME) || localStorage?.getItem(TOKEN_PERSIST_KEY) || ''
+  const inputToken = input.token && input.token !== '' ? input.token : ''
+  const cookieToken = getCookie(COOKIE_NAME)
+  const localStorageToken = localStorage?.getItem(TOKEN_PERSIST_KEY) || ''
+  const token = inputToken || cookieToken || localStorageToken
+
+  console.log('Token used for authentication')
+  console.table([
+    ['persisted token', !!inputToken],
+    ['cookie', !!cookieToken],
+    ['local storage', !!localStorageToken],
+    ['api token', !!VITE_KITTYCAD_API_TOKEN],
+  ])
  if (token) {
    // has just logged in, update storage
    localStorage.setItem(TOKEN_PERSIST_KEY, token)
@ -259,7 +240,7 @@ async function logout() {

      if (token) {
        try {
-          await fetch(withBaseUrl('/oauth2/token/revoke'), {
+          await fetch(withAPIBaseURL('/oauth2/token/revoke'), {
            method: 'POST',
            credentials: 'include',
            headers: {
@ -282,7 +263,7 @@ async function logout() {
    }
  }

-  return fetch(withBaseUrl('/logout'), {
+  return fetch(withAPIBaseURL('/logout'), {
    method: 'POST',
    credentials: 'include',
  })
--- a/src/machines/modelingMachine.test.ts
+++ b/src/machines/modelingMachine.test.ts
@ -11,7 +11,7 @@ import {
  engineCommandManager,
  kclManager,
 } from '@src/lib/singletons'
-import { VITE_KC_DEV_TOKEN } from '@src/env'
+import { VITE_KITTYCAD_API_TOKEN } from '@src/env'
 import { getConstraintInfoKw } from '@src/lang/std/sketch'
 import { getNodeFromPath } from '@src/lang/queryAst'
 import type { Node } from '@rust/kcl-lib/bindings/Node'
@ -29,10 +29,9 @@ import { removeSingleConstraintInfo } from '@src/lang/modifyAst'
 beforeAll(async () => {
  await initPromise

-  // THESE TEST WILL FAIL without VITE_KC_DEV_TOKEN set in .env.development.local
  await new Promise((resolve) => {
    engineCommandManager.start({
-      token: VITE_KC_DEV_TOKEN,
+      token: VITE_KITTYCAD_API_TOKEN,
      width: 256,
      height: 256,
      setMediaStream: () => {},
--- a/src/machines/modelingMachine.ts
+++ b/src/machines/modelingMachine.ts
@ -72,7 +72,7 @@ import {
  addRevolve,
  addSweep,
  getAxisExpressionAndIndex,
-} from '@src/lang/modifyAst/addSweep'
+} from '@src/lang/modifyAst/sweeps'
 import {
  applyIntersectFromTargetOperatorSelections,
  applySubtractFromTargetOperatorSelections,
--- a/src/machines/modifyWithTTC.test.ts
+++ b/src/machines/modifyWithTTC.test.ts
@ -1,5 +1,5 @@
 import { engineCommandManager, kclManager } from '@src/lib/singletons'
-import { VITE_KC_DEV_TOKEN } from '@src/env'
+import { VITE_KITTYCAD_API_TOKEN } from '@src/env'
 import { getModuleIdByFileName, isArray } from '@src/lib/utils'
 import { vi, inject } from 'vitest'
 import { assertParse } from '@src/lang/wasm'
@ -355,10 +355,9 @@ cases.push(
 beforeAll(async () => {
  await initPromise

-  // THESE TEST WILL FAIL without VITE_KC_DEV_TOKEN set in .env.development.local
  await new Promise((resolve) => {
    engineCommandManager.start({
-      token: VITE_KC_DEV_TOKEN,
+      token: VITE_KITTYCAD_API_TOKEN,
      width: 256,
      height: 256,
      setMediaStream: () => {},
--- a/src/main.ts
+++ b/src/main.ts
@ -70,12 +70,10 @@ dotenv.config({ path: [`.env.${NODE_ENV}.local`, `.env.${NODE_ENV}`] })

 // default vite values based on mode
 process.env.NODE_ENV ??= viteEnv.MODE
-process.env.BASE_URL ??= viteEnv.VITE_KC_API_BASE_URL
 process.env.VITE_KC_API_WS_MODELING_URL ??= viteEnv.VITE_KC_API_WS_MODELING_URL
-process.env.VITE_KC_API_BASE_URL ??= viteEnv.VITE_KC_API_BASE_URL
+process.env.VITE_KITTYCAD_API_BASE_URL ??= viteEnv.VITE_KITTYCAD_API_BASE_URL
 process.env.VITE_KC_SITE_BASE_URL ??= viteEnv.VITE_KC_SITE_BASE_URL
 process.env.VITE_KC_SITE_APP_URL ??= viteEnv.VITE_KC_SITE_APP_URL
-process.env.VITE_KC_SKIP_AUTH ??= viteEnv.VITE_KC_SKIP_AUTH
 process.env.VITE_KC_CONNECTION_TIMEOUT_MS ??=
  viteEnv.VITE_KC_CONNECTION_TIMEOUT_MS

--- a/src/preload.ts
+++ b/src/preload.ts
@ -289,12 +289,11 @@ contextBridge.exposeInMainWorld('electron', {
      exposeProcessEnvs([
        'NODE_ENV',
        'VITE_KC_API_WS_MODELING_URL',
-        'VITE_KC_API_BASE_URL',
+        'VITE_KITTYCAD_API_BASE_URL',
        'VITE_KC_SITE_BASE_URL',
        'VITE_KC_SITE_APP_URL',
-        'VITE_KC_SKIP_AUTH',
        'VITE_KC_CONNECTION_TIMEOUT_MS',
-        'VITE_KC_DEV_TOKEN',
+        'VITE_KITTYCAD_API_TOKEN',

        'IS_PLAYWRIGHT',

--- a/src/routes/SignIn.tsx
+++ b/src/routes/SignIn.tsx
@ -6,7 +6,7 @@ import { Link } from 'react-router-dom'
 import { ActionButton } from '@src/components/ActionButton'
 import { CustomIcon } from '@src/components/CustomIcon'
 import { Logo } from '@src/components/Logo'
-import { VITE_KC_API_BASE_URL, VITE_KC_SITE_BASE_URL } from '@src/env'
+import { VITE_KC_SITE_BASE_URL } from '@src/env'
 import { APP_NAME } from '@src/lib/constants'
 import { isDesktop } from '@src/lib/isDesktop'
 import { openExternalBrowserIfDesktop } from '@src/lib/openWindow'
@ -15,6 +15,7 @@ import { reportRejection } from '@src/lib/trap'
 import { toSync } from '@src/lib/utils'
 import { authActor, useSettings } from '@src/lib/singletons'
 import { APP_VERSION, generateSignInUrl } from '@src/routes/utils'
+import { withAPIBaseURL } from '@src/lib/withBaseURL'

 const subtleBorder =
  'border border-solid border-chalkboard-30 dark:border-chalkboard-80'
@ -54,7 +55,7 @@ const SignIn = () => {
  const signInDesktop = async () => {
    // We want to invoke our command to login via device auth.
    const userCodeToDisplay = await window.electron
-      .startDeviceFlow(VITE_KC_API_BASE_URL + location.search)
+      .startDeviceFlow(withAPIBaseURL(location.search))
      .catch(reportError)
    if (!userCodeToDisplay) {
      console.error('No user code received while trying to log in')
Author	SHA1	Message	Date
Pierre Jacquier	cd672d52f6	Merge branch 'main' into pierremtb/issue7657-Allow-all-sweeps-to-work-on-variable-less-profiles	2025-07-04 11:33:24 -04:00
dependabot[bot]	597f4a1d54	Bump vite from 5.4.18 to 5.4.19 in the security-major group (#7685 ) * Bump vite from 5.4.18 to 5.4.19 in the security-major group Bumps the security-major group with 1 update: [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite). Updates `vite` from 5.4.18 to 5.4.19 - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v5.4.19/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v5.4.19/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-version: 5.4.19 dependency-type: direct:development dependency-group: security-major ... Signed-off-by: dependabot[bot] <support@github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jonathan Tran <jonnytran@gmail.com>	2025-07-03 19:36:15 -04:00
Jace Browning	c814c90a9e	Rebuild when the environment changes (#7688 )	2025-07-03 17:05:59 -04:00
dependabot[bot]	64832f9046	Bump esbuild from 0.25.3 to 0.25.4 in the security group (#7684 ) * Bump esbuild from 0.25.3 to 0.25.4 in the security group Bumps the security group with 1 update: [esbuild](https://github.com/evanw/esbuild). Updates `esbuild` from 0.25.3 to 0.25.4 - [Release notes](https://github.com/evanw/esbuild/releases) - [Changelog](https://github.com/evanw/esbuild/blob/main/CHANGELOG.md) - [Commits](https://github.com/evanw/esbuild/compare/v0.25.3...v0.25.4) --- updated-dependencies: - dependency-name: esbuild dependency-version: 0.25.4 dependency-type: direct:development dependency-group: security ... Signed-off-by: dependabot[bot] <support@github.com> * Update snapshots * Update snapshots --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2025-07-03 20:16:46 +00:00
Pierre Jacquier	172e01529c	Add basic addLoft and addRevolve tests, will have to see how to distribute coverage	2025-07-03 15:45:32 -04:00
Pierre Jacquier	5a4a32c044	Add addSweep test	2025-07-03 15:00:21 -04:00
Pierre Jacquier	b955184191	Lint & complete addExtrude tests	2025-07-03 14:31:06 -04:00
Pierre Jacquier	d7914219da	We going	2025-07-03 13:58:10 -04:00
Pierre Jacquier	ead4c1286b	Add other test case	2025-07-03 13:41:31 -04:00
Jace Browning	34494f3bba	Consolidate KittyCAD API token environment variables (#7665 ) * Consolidate KittyCAD API token environment variables * Remove duplicate variable in type definition * Remove unnecessary intermediate steps * Keep base label for concatenation functions	2025-07-03 13:15:21 -04:00
Pierre Jacquier	a0fe33260e	WIP new util function	2025-07-03 12:15:20 -04:00
Pierre Jacquier	8955b5fcd3	Merge branch 'main' into pierremtb/issue7657-Allow-all-sweeps-to-work-on-variable-less-profiles	2025-07-03 11:28:57 -04:00
Kevin Nadro	df6256266c	[Chore] All api urls are now using the helper function (#7672 ) * fix: logging information about the login * chore: improving the withBaseURL workflow * chore: moving VITE_KC_API_BASE_URL to the helper function * fix: env to helper function api base url * chore: fixing another api base url * chore: shortlinks with base api helper function * chore: prompt edit with base helper function * fix: auto fmt * fix: withAPIBaseURL for all urls * fix: AI caught my typo, RIP * fix: expected * fix: renaming this so it is less specific to environment --------- Co-authored-by: Jace Browning <jacebrowning@gmail.com>	2025-07-03 13:54:03 +00:00
Pierre Jacquier	5708b8c64b	Add unit test createPathToNodeForLastVariable	2025-07-03 08:50:08 -04:00
Pierre Jacquier	5b8284e737	Add unit tests for createVariableExpressionsArray	2025-07-03 07:44:29 -04:00
Pierre Jacquier	dd9b0ec5f0	Codespell	2025-07-02 19:38:34 -04:00
Pierre Jacquier	c467568ee4	Add unit tests for getVariableExprsFromSelection	2025-07-02 19:26:28 -04:00
Kevin Nadro	e5d082f441	[Chore] Removing old confusing BASE_URL environment variable. (#7678 ) chore: this is deprecated, we should be using the VITE_KC_*_BASE_URL workflows	2025-07-02 22:51:01 +00:00
alteous	d4d3e179b1	Update test data (#7674 )	2025-07-02 15:04:03 -07:00
Pierre Jacquier	cb976ec31b	Fix circ dep	2025-07-02 17:42:40 -04:00
Pierre Jacquier	cc9eb65456	Fix test	2025-07-02 17:00:17 -04:00
Pierre Jacquier	a589f56e73	Merge branch 'main' into pierremtb/issue7657-Allow-all-sweeps-to-work-on-variable-less-profiles	2025-07-02 12:42:38 -04:00
Adam Chalmers	4f4c44e7c7	KCL: Getter for axes of planes (#7662 ) ## Goal Currently, there's no way in KCL to get fields of a plane, e.g. the underlying X axis, Y axis or origin. This would be useful for geometry calculations in KCL. It would help KCL users write transformations between planes for rotating geometry. For example, this enables ```kcl export fn crossProduct(@vectors) { a = vectors[0] b = vectors[1] x = a[1] * b[2] - (a[2] * b[1]) y = a[2] * b[0] - (a[0] * b[2]) z = a[0] * b[1] - (a[1] * b[0]) return [x, y, z] } export fn normalOf(@plane) { return crossProduct([plane.xAxis, plane.yAxis]) } ``` ## Implementation My goal was just to enable a simple getter for planes, like `myPlane.xAxis` and yAxis and origins. That's nearly what happened, except I discovered that there's two ways to represent a plane: either `KclValue::Plane` or `KclValue::Object` with the right fields. No matter which format your plane is represented as, it should behave consistently when you get its properties. Those properties should be returned as `[number; 3]` because that is how KCL represents points. Unfortunately we actually require planes-as-objects to be defined with axes like `myPlane = { xAxis = { x = 1, y = 0, z = 0 }, ...}`, but that's a mistake in my opinion. So if you do use that representation of a plane, it should still return a [number; 3]. This required some futzing around so that we let you access object fields .x and .y as [0] and [1], which is weird, but whatever, I think it's good. This PR is tested via planestuff.kcl which has a Rust unit test. Part of the hole efforts, see https://github.com/KittyCAD/modeling-app/discussions/7543	2025-07-02 16:24:26 +00:00
Jace Browning	1b75020686	Remove unused code to skip auth (#7280 )	2025-07-02 14:49:34 +00:00
Jonathan Tran	fba62dab98	Add parsing arrays and objects as binary operands (#7661 ) * Add parsing arrays and objects as binary operands * Add sim test showing the error message	2025-07-01 23:33:36 +00:00
Pierre Jacquier	4c1564e2b0	WIP: Allow all sweeps to work on variable-less profiles Fixes #7657	2025-07-01 16:41:14 -04:00