Comments and rename vars

TODO: Concurrency control

.codespellrc

@@ -1,3 +1,3 @@
 [codespell]
-ignore-words-list: crate,everytime,inout,co-ordinate,ot,nwo,absolutey,atleast
+ignore-words-list: crate,everytime,inout,co-ordinate,ot,nwo,absolutey,atleast,ue
 skip: **/target,node_modules,build,**/Cargo.lock,./docs/kcl/*.md,./src-tauri/gen/schemas

.github/workflows/cargo-clippy.yml

@@ -54,3 +54,8 @@ jobs:
         run: |
           cd "${{ matrix.dir }}"
           cargo clippy --all --tests --benches -- -D warnings
+      # If this fails, run "cargo check" to update Cargo.lock,
+      # then add Cargo.lock to the PR.
+      - name: Check Cargo.lock doesn't need updating
+        run: |
+          cargo check --locked || echo "Pls run cargo check and commit the changed Cargo.lock"

.github/workflows/cargo-test.yml

@@ -59,11 +59,21 @@ jobs:
       - uses: taiki-e/install-action@nextest
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2.6.1
-      - name: cargo test
+      - name: Compile tests
+        run: |-
+          cd "${{ matrix.dir }}"
+          cargo nextest archive --archive-file tests.tar.zst --workspace --profile ci
+      - name: Start test KCL server
+        run: |-
+          cd "${{ matrix.dir }}"
+          cargo build --quiet --bin kcl-test-server --workspace && ./target/debug/kcl-test-server &
+        env:
+          KITTYCAD_API_TOKEN: ${{secrets.KITTYCAD_API_TOKEN}}
+      - name: Run tests
         shell: bash
         run: |-
           cd "${{ matrix.dir }}"
-          cargo llvm-cov nextest --all --lcov --output-path lcov.info --test-threads=1 --no-fail-fast -P ci 2>&1 | tee /tmp/github-actions.log
+          cargo llvm-cov nextest --lcov --output-path lcov.info --test-threads=1 --no-fail-fast --profile ci --archive-file tests.tar.zst 2>&1 | tee /tmp/github-actions.log
         env:
           KITTYCAD_API_TOKEN: ${{secrets.KITTYCAD_API_TOKEN}}
           RUST_MIN_STACK: 10485760000

docs/kcl/index.md

@@ -23,6 +23,7 @@ layout: manual
 * [`atan`](kcl/atan)
 * [`bezierCurve`](kcl/bezierCurve)
 * [`ceil`](kcl/ceil)
+* [`chamfer`](kcl/chamfer)
 * [`circle`](kcl/circle)
 * [`close`](kcl/close)
 * [`cos`](kcl/cos)
@@ -64,6 +65,7 @@ layout: manual
 * [`segEndX`](kcl/segEndX)
 * [`segEndY`](kcl/segEndY)
 * [`segLen`](kcl/segLen)
+* [`shell`](kcl/shell)
 * [`sin`](kcl/sin)
 * [`sqrt`](kcl/sqrt)
 * [`startProfileAt`](kcl/startProfileAt)

e2e/playwright/flow-tests.spec.ts

@@ -411,6 +411,47 @@ test('ensure the Zoo logo is not a link in browser app', async ({ page }) => {
   await expect(zooLogo).not.toHaveAttribute('href')
 })
 
+test('if you write kcl with lint errors you get lints', async ({ page }) => {
+  const u = await getUtils(page)
+  await page.setViewportSize({ width: 1000, height: 500 })
+  await page.goto('/')
+
+  await u.waitForAuthSkipAppStart()
+
+  // check no error to begin with
+  await expect(page.locator('.cm-lint-marker-info')).not.toBeVisible()
+
+  await u.codeLocator.click()
+  await page.keyboard.type('const my_snake_case_var = 5')
+  await page.keyboard.press('Enter')
+  await page.keyboard.type('const myCamelCaseVar = 5')
+  await page.keyboard.press('Enter')
+
+  // press arrows to clear autocomplete
+  await page.keyboard.press('ArrowLeft')
+  await page.keyboard.press('ArrowRight')
+
+  // error in guter
+  await expect(page.locator('.cm-lint-marker-info')).toBeVisible()
+
+  // error text on hover
+  await page.hover('.cm-lint-marker-info')
+  await expect(
+    page.getByText('Identifiers must be lowerCamelCase')
+  ).toBeVisible()
+
+  // select the line that's causing the error and delete it
+  await page.getByText('const my_snake_case_var = 5').click()
+  await page.keyboard.press('End')
+  await page.keyboard.down('Shift')
+  await page.keyboard.press('Home')
+  await page.keyboard.up('Shift')
+  await page.keyboard.press('Backspace')
+
+  // wait for .cm-lint-marker-info not to be visible
+  await expect(page.locator('.cm-lint-marker-info')).not.toBeVisible()
+})
+
 test('if you write invalid kcl you get inlined errors', async ({ page }) => {
   const u = await getUtils(page)
   await page.setViewportSize({ width: 1000, height: 500 })
@@ -421,8 +462,8 @@ test('if you write invalid kcl you get inlined errors', async ({ page }) => {
   // check no error to begin with
   await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
 
-  /* add the following code to the editor (# error is not a valid line)
-    # error
+  /* add the following code to the editor ($ error is not a valid line)
+    $ error
     const topAng = 30
     const bottomAng = 25
    */
@@ -463,6 +504,8 @@ test('if you write invalid kcl you get inlined errors', async ({ page }) => {
   await page.keyboard.type("// Let's define the same thing twice")
   await page.keyboard.press('Enter')
   await page.keyboard.type('const topAng = 42')
+  await page.keyboard.press('ArrowLeft')
+  await page.keyboard.press('ArrowRight')
 
   await expect(page.locator('.cm-lint-marker-error')).toBeVisible()
   await expect(page.locator('.cm-lintRange.cm-lintRange-error')).toBeVisible()

package.json

@@ -10,7 +10,7 @@
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@headlessui/react": "^1.7.19",
     "@headlessui/tailwindcss": "^0.2.0",
-    "@kittycad/lib": "^0.0.64",
+    "@kittycad/lib": "^0.0.67",
     "@lezer/javascript": "^1.4.9",
     "@open-rpc/client-js": "^1.8.1",
     "@react-hook/resize-observer": "^2.0.1",

src-tauri/Cargo.lock

@@ -601,9 +601,9 @@ dependencies = [
 
 [[package]]
 name = "bson"
-version = "2.10.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d43b38e074cc0de2957f10947e376a1d88b9c4dbab340b590800cc1b2e066b2"
+checksum = "d8a88e82b9106923b5c4d6edfca9e7db958d4e98a478ec115022e81b9b38e2c8"
 dependencies = [
  "ahash 0.8.11",
  "base64 0.13.1",
@@ -1160,9 +1160,9 @@ checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a"
 
 [[package]]
 name = "databake"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82175d72e69414ceafbe2b49686794d3a8bed846e0d50267355f83ea8fdd953a"
+checksum = "6a04fbfbecca8f0679c8c06fef907594adcc3e2052e11163a6d30535a1a5604d"
 dependencies = [
  "databake-derive",
  "proc-macro2",
@@ -1171,9 +1171,9 @@ dependencies = [
 
 [[package]]
 name = "databake-derive"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "377af281d8f23663862a7c84623bc5dcf7f8c44b13c7496a590bdc157f941a43"
+checksum = "4078275de501a61ceb9e759d37bdd3d7210e654dbc167ac1a3678ef4435ed57b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2470,6 +2470,15 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "0.4.8"
@@ -2616,9 +2625,9 @@ dependencies = [
 
 [[package]]
 name = "kittycad"
-version = "0.3.3"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0cbef813153197e60c0e96f59eea0b75f8418380f414b20250ee81b60e522c3"
+checksum = "df75feef10313fa1cb15b7cecd0f579877312ba3d42bb5b8b4c1d4b1d0fcabf0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2631,7 +2640,7 @@ dependencies = [
  "format_serde_error",
  "futures",
  "http 0.2.12",
- "itertools",
+ "itertools 0.13.0",
  "log",
  "mime_guess",
  "parse-display",
@@ -2719,7 +2728,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.5",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -3530,7 +3539,7 @@ dependencies = [
  "bincode",
  "either",
  "fnv",
- "itertools",
+ "itertools 0.12.1",
  "lazy_static",
  "nom",
  "quick-xml",

src-tauri/Cargo.toml

@@ -16,7 +16,7 @@ tauri-build = { version = "2.0.0-beta.13", features = [] }
 [dependencies]
 anyhow = "1"
 kcl-lib = { version = "0.1.53", path = "../src/wasm-lib/kcl" }
-kittycad = "0.3.0"
+kittycad = "0.3.5"
 log = "0.4.21"
 oauth2 = "4.4.2"
 serde_json = "1.0"

src/components/CustomIcon.tsx

@@ -71,6 +71,16 @@ const CustomIconMap = {
       />
     </svg>
   ),
+  bug: (
+    <svg viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        fill-rule="evenodd"
+        clip-rule="evenodd"
+        d="M10.8209 5.99884C10.6403 5.73962 10.3399 5.57001 10 5.57001C9.65984 5.57001 9.35936 5.73984 9.17871 5.99935C9.43724 5.95129 9.71142 5.92578 10.0012 5.92578C10.29 5.92578 10.5633 5.95111 10.8209 5.99884ZM10 4.57001C8.9459 4.57001 8.08227 5.38548 8.00554 6.41997C7.58916 6.65398 7.23724 6.95989 6.95014 7.31304L5.85355 6.21645L5.14645 6.92356L6.40931 8.18642C6.20774 8.62503 6.08043 9.09624 6.0278 9.57001H5V10.57H6.01946C6.06396 11.1581 6.1867 11.8173 6.4071 12.4558L5.14645 13.7165L5.85355 14.4236L6.8408 13.4363C7.46354 14.555 8.47307 15.4258 10.0012 15.4258C11.529 15.4258 12.5378 14.5554 13.16 13.4371L14.1464 14.4236L14.8536 13.7165L13.5934 12.4563C13.8136 11.8177 13.9362 11.1583 13.9806 10.57H15V9.57001H13.9722C13.9197 9.0961 13.7925 8.62474 13.5911 8.18602L14.8536 6.92356L14.1464 6.21645L13.0505 7.31239C12.7633 6.95894 12.4112 6.65285 11.9944 6.41883C11.9171 5.38488 11.0537 4.57001 10 4.57001ZM10.5 14.3801V8.57001H9.5V14.3796C8.72105 14.2298 8.15885 13.7245 7.7428 12.9999C7.22316 12.095 7 10.937 7 10.07C7 8.46381 8.04281 6.92578 10.0012 6.92578C11.9589 6.92578 13 8.4629 13 10.07C13 10.9373 12.7773 12.0954 12.2582 13.0003C11.8422 13.7254 11.2799 14.2309 10.5 14.3801Z"
+        fill="currentColor"
+      />
+    </svg>
+  ),
   checkmark: (
     <svg viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
       <path

src/components/LowerRightControls.tsx

@@ -33,7 +33,7 @@ export function LowerRightControls(props: React.PropsWithChildren) {
           rel="noopener noreferrer"
         >
           <CustomIcon
-            name="exclamationMark"
+            name="bug"
             className={`w-5 h-5 ${linkOverrideClassName}`}
           />
           <Tooltip position="top">Report a bug</Tooltip>

src/components/RefreshButton.tsx

@@ -24,9 +24,9 @@ export function RefreshButton() {
   return (
     <button
       onClick={refresh}
-      className="p-1 m-0 bg-chalkboard-10/80 dark:bg-chalkboard-100/50 hover:bg-chalkboard-10 dark:hover:bg-chalkboard-100 rounded-full border border-solid border-chalkboard-10 dark:border-chalkboard-100"
+      className="p-1 m-0 bg-chalkboard-10/80 dark:bg-chalkboard-100/50 hover:bg-chalkboard-10 dark:hover:bg-chalkboard-100 rounded-full border border-solid border-chalkboard-20 dark:border-chalkboard-90"
     >
-      <CustomIcon name="arrowRotateRight" className="w-5 h-5" />
+      <CustomIcon name="exclamationMark" className="w-5 h-5" />
       <Tooltip position="bottom-right">
         <span>Refresh and report</span>
         <br />

src/components/SettingsAuthProvider.tsx

@@ -171,7 +171,9 @@ export const SettingsAuthProviderBase = ({
           })
         },
         'Execute AST': () => kclManager.executeCode(true, true),
-        persistSettings: (context) =>
+      },
+      services: {
+        'Persist settings': (context) =>
           saveSettings(context, loadedProject?.project?.path),
       },
     }

src/components/Tooltip.module.css

@@ -11,30 +11,8 @@
   --_p-inline: calc(50% + calc(var(--isRTL) * var(--_triangle-width) / 2));
   --_p-block: 4px;
   --_bg: var(--chalkboard-10);
-  --_shadow-alpha: 5%;
+  --_shadow-alpha: 8%;
   --_theme-alpha: 0.15;
-  --_theme-outline: drop-shadow(
-      0 1px 0
-        oklch(
-          var(--primary-lightness) var(--primary-chroma) var(--primary-hue) /
-            var(--_theme-alpha)
-        )
-    )
-    drop-shadow(
-      0 -1px 0 oklch(var(--primary-lightness) var(--primary-chroma)
-            var(--primary-hue) / var(--_theme-alpha))
-    )
-    drop-shadow(
-      1px 0 0
-        oklch(
-          var(--primary-lightness) var(--primary-chroma) var(--primary-hue) /
-            var(--_theme-alpha)
-        )
-    )
-    drop-shadow(
-      -1px 0 0 oklch(var(--primary-lightness) var(--primary-chroma)
-            var(--primary-hue) / var(--_theme-alpha))
-    );
 
   pointer-events: none;
   user-select: none;
@@ -61,16 +39,15 @@
   background: var(--_bg);
   @apply text-chalkboard-110;
   will-change: filter;
-  filter: drop-shadow(0 1px 3px hsl(0 0% 0% / var(--_shadow-alpha)))
-    drop-shadow(0 4px 8px hsl(0 0% 0% / var(--_shadow-alpha)))
-    var(--_theme-outline);
+  filter: drop-shadow(0 1px 2px hsl(0 0% 0% / var(--_shadow-alpha)))
+    drop-shadow(0 4px 6px hsl(0 0% 0% / calc(var(--_shadow-alpha) / 2)));
 }
 
 :global(.dark) .tooltip {
-  --_bg: var(--chalkboard-110);
+  --_bg: var(--chalkboard-90);
   --_theme-alpha: 40%;
+  --_shadow-alpha: 16%;
   @apply text-chalkboard-10;
-  filter: var(--_theme-outline);
 }
 
 .tooltip:dir(rtl) {
@@ -109,7 +86,7 @@
 }
 
 /* Sometimes there's no visible label,
- * so we'll use the tooltip as the label  
+ * so we'll use the tooltip as the label
 */
 .tooltip:only-child::before {
   content: 'Tooltip:';

src/editor/manager.ts

@@ -7,7 +7,11 @@ import { Selections, processCodeMirrorRanges, Selection } from 'lib/selections'
 import { undo, redo } from '@codemirror/commands'
 import { CommandBarMachineEvent } from 'machines/commandBarMachine'
 import { addLineHighlight } from './highlightextension'
-import { setDiagnostics, Diagnostic } from '@codemirror/lint'
+import { forEachDiagnostic, setDiagnostics, Diagnostic } from '@codemirror/lint'
+
+function diagnosticIsEqual(d1: Diagnostic, d2: Diagnostic): boolean {
+  return d1.from === d2.from && d1.to === d2.to && d1.message === d2.message
+}
 
 export default class EditorManager {
   private _editorView: EditorView | null = null
@@ -91,11 +95,38 @@ export default class EditorManager {
     }
   }
 
+  clearDiagnostics(): void {
+    if (!this.editorView) return
+    this.editorView.dispatch(setDiagnostics(this.editorView.state, []))
+  }
+
   setDiagnostics(diagnostics: Diagnostic[]): void {
     if (!this.editorView) return
     this.editorView.dispatch(setDiagnostics(this.editorView.state, diagnostics))
   }
 
+  addDiagnostics(diagnostics: Diagnostic[]): void {
+    if (!this.editorView) return
+
+    forEachDiagnostic(this.editorView.state, function (diag) {
+      diagnostics.push(diag)
+    })
+
+    const uniqueDiagnostics = new Set<Diagnostic>()
+    diagnostics.forEach((diagnostic) => {
+      for (const knownDiagnostic of uniqueDiagnostics.values()) {
+        if (diagnosticIsEqual(diagnostic, knownDiagnostic)) {
+          return
+        }
+      }
+      uniqueDiagnostics.add(diagnostic)
+    })
+
+    this.editorView.dispatch(
+      setDiagnostics(this.editorView.state, [...uniqueDiagnostics])
+    )
+  }
+
   undo() {
     if (this._editorView) {
       undo(this._editorView)

src/editor/plugins/lsp/plugin.ts

@@ -382,9 +382,14 @@ export class LanguageServerPlugin implements PluginValue {
     try {
       switch (notification.method) {
         case 'textDocument/publishDiagnostics':
-          //const params = notification.params as PublishDiagnosticsParams
+          console.log(
+            '[lsp] [window/publishDiagnostics]',
+            this.client.getName(),
+            notification.params
+          )
+          const params = notification.params as PublishDiagnosticsParams
           // this is sometimes slower than our actual typing.
-          //this.processDiagnostics(params)
+          this.processDiagnostics(params)
           break
         case 'window/logMessage':
           console.log(

src/lang/KclSingleton.ts

@@ -89,9 +89,10 @@ export class KclManager {
     return this._kclErrors
   }
   set kclErrors(kclErrors) {
+    console.log('[lsp] not lsp, actually typescript: ', kclErrors)
     this._kclErrors = kclErrors
     let diagnostics = kclErrorsToDiagnostics(kclErrors)
-    editorManager.setDiagnostics(diagnostics)
+    editorManager.addDiagnostics(diagnostics)
     this._kclErrorsCallBack(kclErrors)
   }
 
@@ -185,6 +186,11 @@ export class KclManager {
     const currentExecutionId = executionId || Date.now()
     this._cancelTokens.set(currentExecutionId, false)
 
+    // here we're going to clear diagnostics since we're the first
+    // one in. We're the only location where diagnostics are cleared;
+    // everything from here on out should be *appending*.
+    editorManager.clearDiagnostics()
+
     this.isExecuting = true
     await this.ensureWasmInit()
     const { logs, errors, programMemory } = await executeAst({
@@ -234,6 +240,7 @@ export class KclManager {
     } = { updates: 'none' }
   ) {
     await this.ensureWasmInit()
+
     const newCode = recast(ast)
     const newAst = this.safeParse(newCode)
     if (!newAst) return
@@ -243,6 +250,11 @@ export class KclManager {
     await this?.engineCommandManager?.waitForReady
     this._ast = { ...newAst }
 
+    // here we're going to clear diagnostics since we're the first
+    // one in. We're the only location where diagnostics are cleared;
+    // everything from here on out should be *appending*.
+    editorManager.clearDiagnostics()
+
     const { logs, errors, programMemory } = await executeAst({
       ast: newAst,
       engineCommandManager: this.engineCommandManager,

src/lib/paths.ts

@@ -17,15 +17,17 @@ const prependRoutes =
     )
   }
 
+type OnboardingPaths = {
+  [K in keyof typeof onboardingPaths]: `/onboarding${(typeof onboardingPaths)[K]}`
+}
+
 export const paths = {
   INDEX: '/',
   HOME: '/home',
   FILE: '/file',
   SETTINGS: '/settings',
   SIGN_IN: '/signin',
-  ONBOARDING: prependRoutes(onboardingPaths)(
-    '/onboarding'
-  ) as typeof onboardingPaths,
+  ONBOARDING: prependRoutes(onboardingPaths)('/onboarding') as OnboardingPaths,
 } as const
 export const BROWSER_PATH = `%2F${BROWSER_PROJECT_NAME}%2F${BROWSER_FILE_NAME}${FILE_EXT}`
 

src/machines/settingsMachine.ts

@@ -11,98 +11,98 @@ import {
 
 export const settingsMachine = createMachine(
   {
-    /** @xstate-layout N4IgpgJg5mDOIC5QGUwBc0EsB2VYDpMIAbMAYlnXwEMAHW-Ae2wCNHqAnCHKZNatAFdYAbQAMAXUShajWJizNpIAB6IAbAFZN+AOwAWAIwAOYwE4AzGYBM+-ZosAaEAE9Eh62LP51ls+v0LMWt1awMAX3DnVAweAiJSCio6BjQACzAAWzAAYUZiRg5xKSQQWXlFbGU1BA9vQ0N1CwCxdVbdY1DnNwQzPp8zTTFje1D1QwtjSOj0LFx4knJKNHxMxggwYh58DYAzakFiNABVbAVi5XKFTCVSmotNY3w7YysHRuNDTXV1bvdG7w-IKTcbaazWCzTEAxOZ4QiLJIrFL4dJZMAXUpXSrVDTGazPMQPR4GXRBAx-XoGfDWIadMx4n6EqEwuLwxLLVbrTbbNKYKBpLb8tAAUWgcAxMjk11uoHumn0+DEw2sJkMulCgWsFL6YnwfX0ELsYg61jMumZs1ZCXIACU4OgAATLWGiSSXKXYu4aLz4UwWBr6DqBYYUzSePXqUlBLxmyZmC2xeZs8gxB3UYjEJ2W+YSsoem5VL0IKy6z6EsJifQ2Czq0MTHzq8Yjfz6MQmBMu5NkABUuaxBZxCDD+DD5lJgUjxssFP0xl0I+0pm06uMmg8kSiIGwXPgpRZ83dFQHRYAtA0LCO2tZjGIHJNdB5fq5EK3dc1OsNGkrA+oO1bFoe0qFrKiAnlol7BDed5zo+FK+Doc7qhCNaVv4UwbkAA */
+    /** @xstate-layout N4IgpgJg5mDOIC5QGUwBc0EsB2VYDpMIAbMAYlnXwEMAHW-Ae2wCNHqAnCHKZNatAFdYAbQAMAXUShajWJizNpIAB6IALAFYAnPgBMARgDsBsQDY969QGYjmzQBoQAT0SnrADnwePY61r0PAwNtMyMAX3CnVAweAiJSCio6BjQACzAAWzAAYUZiRg5xKSQQWXlFbGU1BD1PfFtfE3UzTUNNaydXBCD1b209PTEPTTMtdQNNSOj0LFx4knJKNHxMxggwYh58DYAzakFiNABVbAVi5XKFTCVSmsGxfCMPM08PQaDNU0cXRG1tLwedTaKxif7+UJTKIgGJzPCERZJFYpfDpLJgC6lK6VaqIEx6fBmCw2Do2IJ6MxdRDvTT4MRDdRGEzWbQ6ELTGGzOIIxLLVbrTbbNKYKBpLaitAAUWgcExMjk11uoBqVgM3jMYhsAIMrVs6ipPWChOeYhC9KMFhGHNh3IS5AASnB0AACZZw0SSS4KnF3PFafADTV1YZ2IxiH7dNpGfCaIzAgE+IzWMzBa1c+Y88gxZ3UYjEV3pvBysrem5VX0IFq0y3aTXWOp6JmU34IKMxuz0joGEYWsxp2IZu1kABUxexZdxtRG+EmQMZmne3dNBs0jKewLBsbCwI81n77vwtDAHHksDhBYHeDIEGYYEI2AAbowANZ3o8nzBnm3zMelpWqRAAFp62sJ4jEsZ4AT0UJGwjPFzH6cwNW0AwWXpbRImhbABXgUpvzwL0KgnCtgJMMCII8KCYLsA11EGOkXneDxmXMCk92hfCFlIQjFXLZUgLjddWhaFkgRCaxOhbEYzBnXwXkmOjAjjfduXfU9zzdOIeJ9fiEEA6ckwMClQ2BFpmJXMF9DjYI6hZfxmMw8IgA */
     id: 'Settings',
     predictableActionArguments: true,
     context: {} as ReturnType<typeof createSettings>,
     initial: 'idle',
     states: {
       idle: {
-        entry: ['setThemeClass', 'setClientSideSceneUnits', 'persistSettings'],
+        entry: ['setThemeClass', 'setClientSideSceneUnits'],
 
         on: {
           '*': {
-            target: 'idle',
-            internal: true,
-            actions: ['setSettingAtLevel', 'toastSuccess', 'persistSettings'],
+            target: 'persisting settings',
+            actions: ['setSettingAtLevel', 'toastSuccess'],
           },
 
           'set.app.onboardingStatus': {
-            target: 'idle',
-            internal: true,
-            actions: ['setSettingAtLevel', 'persistSettings'], // No toast
+            target: 'persisting settings',
+
+            // No toast
+            actions: ['setSettingAtLevel'],
           },
           'set.app.themeColor': {
-            target: 'idle',
-            internal: true,
-            actions: ['setSettingAtLevel', 'persistSettings'], // No toast
+            target: 'persisting settings',
+
+            // No toast
+            actions: ['setSettingAtLevel'],
           },
 
           'set.modeling.defaultUnit': {
-            target: 'idle',
-            internal: true,
+            target: 'persisting settings',
+
             actions: [
               'setSettingAtLevel',
               'toastSuccess',
               'setClientSideSceneUnits',
               'Execute AST',
-              'persistSettings',
             ],
           },
 
           'set.app.theme': {
-            target: 'idle',
-            internal: true,
+            target: 'persisting settings',
+
             actions: [
               'setSettingAtLevel',
               'toastSuccess',
               'setThemeClass',
               'setEngineTheme',
-              'persistSettings',
               'setClientTheme',
             ],
           },
 
           'set.modeling.highlightEdges': {
-            target: 'idle',
-            internal: true,
-            actions: [
-              'setSettingAtLevel',
-              'toastSuccess',
-              'setEngineEdges',
-              'persistSettings',
-            ],
+            target: 'persisting settings',
+
+            actions: ['setSettingAtLevel', 'toastSuccess', 'setEngineEdges'],
           },
 
           'Reset settings': {
-            target: 'idle',
-            internal: true,
+            target: 'persisting settings',
+
             actions: [
               'resetSettings',
               'setThemeClass',
               'setEngineTheme',
               'setClientSideSceneUnits',
               'Execute AST',
-              'persistSettings',
               'setClientTheme',
             ],
           },
 
           'Set all settings': {
-            target: 'idle',
-            internal: true,
+            target: 'persisting settings',
+
             actions: [
               'setAllSettings',
               'setThemeClass',
               'setEngineTheme',
               'setClientSideSceneUnits',
               'Execute AST',
-              'persistSettings',
               'setClientTheme',
             ],
           },
         },
       },
+
+      'persisting settings': {
+        invoke: {
+          src: 'Persist settings',
+          id: 'persistSettings',
+          onDone: 'idle',
+        },
+      },
     },
     tsTypes: {} as import('./settingsMachine.typegen').Typegen0,
     schema: {

src/routes/Onboarding/index.tsx

@@ -3,7 +3,7 @@ import { Outlet, useNavigate } from 'react-router-dom'
 import Introduction from './Introduction'
 import Camera from './Camera'
 import Sketching from './Sketching'
-import { useCallback } from 'react'
+import { useCallback, useEffect } from 'react'
 import makeUrlPathRelative from '../../lib/makeUrlPathRelative'
 import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
 import Streaming from './Streaming'
@@ -94,17 +94,31 @@ export function useNextClick(newStatus: string) {
 export function useDismiss() {
   const filePath = useAbsoluteFilePath()
   const {
-    settings: { send },
+    settings: { state, send },
   } = useSettingsAuthContext()
   const navigate = useNavigate()
 
-  return useCallback(() => {
+  const settingsCallback = useCallback(() => {
     send({
       type: 'set.app.onboardingStatus',
       data: { level: 'user', value: 'dismissed' },
     })
-    navigate(filePath)
-  }, [send, navigate, filePath])
+  }, [send])
+
+  /**
+   * A "listener" for the XState to return to "idle" state
+   * when the user dismisses the onboarding, using the callback above
+   */
+  useEffect(() => {
+    if (
+      state.context.app.onboardingStatus.user === 'dismissed' &&
+      state.matches('idle')
+    ) {
+      navigate(filePath)
+    }
+  }, [filePath, navigate, state])
+
+  return settingsCallback
 }
 
 // Get the 1-indexed step number of the current onboarding step

src/wasm-lib/.config/nextest.toml

@@ -1,3 +1,8 @@
+# experimental = ["setup-scripts"]
+
+# [script.test-server]
+# command = "just start-test-server"
+
 # Each test can have at most 4 threads, but if its name contains "serial_test_", then it
 # also requires 4 threads.
 # This means such tests run one at a time, with 4 threads.
@@ -14,12 +19,20 @@ slow-timeout = { period = "50s", terminate-after = 5 }
 [[profile.default.overrides]]
 filter = "test(serial_test_)"
 test-group = "serial-integration"
-threads-required = 2
+threads-required = 4
+
+# [[profile.default.scripts]]
+# filter = 'test(serial_test_)'
+# setup = 'test-server'
 
 [[profile.ci.overrides]]
 filter = "test(serial_test_)"
 test-group = "serial-integration"
-threads-required = 2
+threads-required = 4
+
+# [[profile.default.scripts]]
+# filter = 'test(serial_test_)'
+# setup = 'test-server'
 
 [[profile.default.overrides]]
 filter = "test(parser::parser_impl::snapshot_tests)"

src/wasm-lib/Cargo.lock

@@ -297,9 +297,9 @@ dependencies = [
 
 [[package]]
 name = "bson"
-version = "2.10.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d43b38e074cc0de2957f10947e376a1d88b9c4dbab340b590800cc1b2e066b2"
+checksum = "d8a88e82b9106923b5c4d6edfca9e7db958d4e98a478ec115022e81b9b38e2c8"
 dependencies = [
  "ahash",
  "base64 0.13.1",
@@ -406,9 +406,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.4"
+version = "4.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
+checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -416,9 +416,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.2"
+version = "4.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
+checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f"
 dependencies = [
  "anstream",
  "anstyle",
@@ -430,9 +430,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.4"
+version = "4.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
+checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -670,9 +670,9 @@ checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
 
 [[package]]
 name = "databake"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82175d72e69414ceafbe2b49686794d3a8bed846e0d50267355f83ea8fdd953a"
+checksum = "6a04fbfbecca8f0679c8c06fef907594adcc3e2052e11163a6d30535a1a5604d"
 dependencies = [
  "databake-derive",
  "proc-macro2",
@@ -681,9 +681,9 @@ dependencies = [
 
 [[package]]
 name = "databake-derive"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "377af281d8f23663862a7c84623bc5dcf7f8c44b13c7496a590bdc157f941a43"
+checksum = "4078275de501a61ceb9e759d37bdd3d7210e654dbc167ac1a3678ef4435ed57b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1369,7 +1369,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-lib"
-version = "0.1.58"
+version = "0.1.59"
 dependencies = [
  "anyhow",
  "approx",
@@ -1434,11 +1434,24 @@ dependencies = [
  "syn 2.0.66",
 ]
 
+[[package]]
+name = "kcl-test-server"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "hyper",
+ "kcl-lib",
+ "pico-args",
+ "serde",
+ "serde_json",
+ "tokio",
+]
+
 [[package]]
 name = "kittycad"
-version = "0.3.3"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0cbef813153197e60c0e96f59eea0b75f8418380f414b20250ee81b60e522c3"
+checksum = "df75feef10313fa1cb15b7cecd0f579877312ba3d42bb5b8b4c1d4b1d0fcabf0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -1451,7 +1464,7 @@ dependencies = [
  "format_serde_error",
  "futures",
  "http 0.2.12",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "log",
  "mime_guess",
  "parse-display",
@@ -1815,6 +1828,12 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "pico-args"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
+
 [[package]]
 name = "pin-project"
 version = "1.1.5"
@@ -2037,9 +2056,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.4"
+version = "1.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2378,9 +2397,9 @@ dependencies = [
 
 [[package]]
 name = "schemars"
-version = "0.8.20"
+version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0218ceea14babe24a4a5836f86ade86c1effbc198164e619194cb5069187e29"
+checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92"
 dependencies = [
  "bigdecimal",
  "bytes",
@@ -2395,9 +2414,9 @@ dependencies = [
 
 [[package]]
 name = "schemars_derive"
-version = "0.8.20"
+version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed5a1ccce8ff962e31a165d41f6e2a2dd1245099dc4d594f5574a86cd90f4d3"
+checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2492,9 +2511,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.116"
+version = "1.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
+checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
 dependencies = [
  "indexmap 2.2.5",
  "itoa",
@@ -2945,9 +2964,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-tungstenite"
-version = "0.23.0"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "becd34a233e7e31a3dbf7c7241b38320f57393dcae8e7324b0167d21b8e320b0"
+checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd"
 dependencies = [
  "futures-util",
  "log",

src/wasm-lib/Cargo.toml

@@ -10,14 +10,14 @@ rust-version = "1.73"
 crate-type = ["cdylib"]
 
 [dependencies]
-bson = { version = "2.10.0", features = ["uuid-1", "chrono"] }
-clap = "4.5.4"
+bson = { version = "2.11.0", features = ["uuid-1", "chrono"] }
+clap = "4.5.7"
 gloo-utils = "0.2.0"
 kcl-lib = { path = "kcl" }
-kittycad = { workspace = true }
+kittycad.workspace = true
 serde_json = "1.0.116"
 tokio = { version = "1.38.0", features = ["sync"] }
-toml = "0.8.14"
+toml = "0.8.13"
 uuid = { version = "1.8.0", features = ["v4", "js", "serde"] }
 wasm-bindgen = "0.2.91"
 wasm-bindgen-futures = "0.4.42"
@@ -65,10 +65,11 @@ members = [
 	"derive-docs",
 	"kcl",
 	"kcl-macros",
+	"kcl-test-server",
 ]
 
 [workspace.dependencies]
-kittycad = { version = "0.3.3", default-features = false, features = ["js", "requests"] }
+kittycad = { version = "0.3.5", default-features = false, features = ["js", "requests"] }
 kittycad-modeling-session = "0.1.4"
 
 [[test]]

src/wasm-lib/justfile

@@ -0,0 +1,2 @@
+start-test-server:
+    cargo build --quiet --bin kcl-test-server --workspace && ./target/debug/kcl-test-server

src/wasm-lib/kcl-macros/Cargo.toml

@@ -11,7 +11,7 @@ repository = "https://github.com/KittyCAD/modeling-app"
 proc-macro = true
 
 [dependencies]
-databake = "0.1.7"
+databake = "0.1.8"
 kcl-lib = { path = "../kcl" }
 proc-macro2 = "1"
 quote = "1"

src/wasm-lib/kcl-test-server/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "kcl-test-server"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+anyhow = "1.0.86"
+hyper = { version = "0.14.29", features = ["server"] }
+kcl-lib = { path = "../kcl" }
+pico-args = "0.5.0"
+serde = { version = "1.0.203", features = ["derive"] }
+serde_json = "1.0.117"
+tokio = { version = "1.38.0", features = ["macros", "rt-multi-thread"] }

src/wasm-lib/kcl-test-server/src/main.rs

@@ -0,0 +1,210 @@
+//! Executes KCL programs.
+//! The server reuses the same engine session for each KCL program it receives.
+use std::net::SocketAddr;
+use std::sync::atomic::{AtomicUsize, Ordering};
+use std::sync::Arc;
+use std::time::Duration;
+
+use hyper::body::Bytes;
+use hyper::header::CONTENT_TYPE;
+use hyper::service::{make_service_fn, service_fn};
+use hyper::{Body, Error, Response, Server};
+use kcl_lib::executor::ExecutorContext;
+use kcl_lib::settings::types::UnitLength;
+use kcl_lib::test_server::RequestBody;
+use tokio::sync::{mpsc, oneshot};
+use tokio::task::JoinHandle;
+use tokio::time::sleep;
+
+#[tokio::main]
+async fn main() -> anyhow::Result<()> {
+    // Parse the CLI arguments.
+    let pargs = pico_args::Arguments::from_env();
+    let args = ServerArgs::parse(pargs)?;
+    // Run the actual server.
+    start_server(args).await
+}
+
+#[derive(Debug)]
+struct ServerArgs {
+    /// What port this server should listen on.
+    listen_on: SocketAddr,
+    /// How many connections to establish with the engine.
+    num_engine_conns: u8,
+}
+
+impl ServerArgs {
+    fn parse(mut pargs: pico_args::Arguments) -> Result<Self, pico_args::Error> {
+        let args = ServerArgs {
+            listen_on: pargs
+                .opt_value_from_str("--listen-on")?
+                .unwrap_or("0.0.0.0:3333".parse().unwrap()),
+            num_engine_conns: pargs.opt_value_from_str("--num-engine-conns")?.unwrap_or(1),
+        };
+        println!("Config is {args:?}");
+        Ok(args)
+    }
+}
+
+/// Sent from the server to each worker.
+struct WorkerReq {
+    /// A KCL program, in UTF-8.
+    body: Bytes,
+    /// A channel to send the HTTP response back.
+    resp: oneshot::Sender<Response<Body>>,
+}
+
+/// Each worker has a connection to the engine, and accepts
+/// KCL programs. When it receives one (over the mpsc channel)
+/// it executes it and returns the result via a oneshot channel.
+fn start_worker(i: u8) -> mpsc::Sender<WorkerReq> {
+    println!("Starting worker {i}");
+    // Make a work queue for this worker.
+    let (tx, mut rx) = mpsc::channel(1);
+    tokio::task::spawn(async move {
+        let state = ExecutorContext::new_for_unit_test(UnitLength::Mm).await.unwrap();
+        println!("Worker {i} ready");
+        while let Some(req) = rx.recv().await {
+            let req: WorkerReq = req;
+            let resp = snapshot_endpoint(req.body, state.clone()).await;
+            if req.resp.send(resp).is_err() {
+                println!("\tWorker {i} exiting");
+            }
+        }
+        println!("\tWorker {i} exiting");
+    });
+    tx
+}
+
+struct ServerState {
+    workers: Vec<mpsc::Sender<WorkerReq>>,
+    req_num: AtomicUsize,
+}
+
+async fn start_server(args: ServerArgs) -> anyhow::Result<()> {
+    let ServerArgs {
+        listen_on,
+        num_engine_conns,
+    } = args;
+    let workers: Vec<_> = (0..num_engine_conns).map(start_worker).collect();
+    let state = Arc::new(ServerState {
+        workers,
+        req_num: 0.into(),
+    });
+    // In hyper, a `MakeService` is basically your server.
+    // It makes a `Service` for each connection, which manages the connection.
+    let make_service = make_service_fn(
+        // This closure is run for each connection.
+        move |_conn_info| {
+            // eprintln!("Connected to a client");
+            let state = state.clone();
+            async move {
+                // This is the `Service` which handles the connection.
+                // `service_fn` converts a function which returns a Response
+                // into a `Service`.
+                Ok::<_, Error>(service_fn(move |req| {
+                    // eprintln!("Received a request");
+                    let state = state.clone();
+                    async move { handle_request(req, state).await }
+                }))
+            }
+        },
+    );
+    let server = Server::bind(&listen_on).serve(make_service);
+    println!("Listening on {listen_on}");
+    println!("PID is {}", std::process::id());
+    if let Err(e) = server.await {
+        eprintln!("Server error: {e}");
+        return Err(e.into());
+    }
+    Ok(())
+}
+
+async fn handle_request(req: hyper::Request<Body>, state3: Arc<ServerState>) -> Result<Response<Body>, Error> {
+    let body = hyper::body::to_bytes(req.into_body()).await?;
+
+    // Round robin requests between each available worker.
+    let req_num = state3.req_num.fetch_add(1, Ordering::Relaxed);
+    let worker_id = req_num % state3.workers.len();
+    // println!("Sending request {req_num} to worker {worker_id}");
+    let worker = state3.workers[worker_id].clone();
+    let (tx, rx) = oneshot::channel();
+    let req_sent = worker.send(WorkerReq { body, resp: tx }).await;
+    req_sent.unwrap();
+    let resp = rx.await.unwrap();
+    Ok(resp)
+}
+
+/// Execute a KCL program, then respond with a PNG snapshot.
+/// KCL errors (from engine or the executor) respond with HTTP Bad Gateway.
+/// Malformed requests are HTTP Bad Request.
+/// Successful requests contain a PNG as the body.
+async fn snapshot_endpoint(body: Bytes, state: ExecutorContext) -> Response<Body> {
+    let body = match serde_json::from_slice::<RequestBody>(body.as_ref()) {
+        Ok(bd) => bd,
+        Err(e) => return bad_request(format!("Invalid request JSON: {e}")),
+    };
+    let RequestBody { kcl_program, test_name } = body;
+    let parser = match kcl_lib::token::lexer(&kcl_program) {
+        Ok(ts) => kcl_lib::parser::Parser::new(ts),
+        Err(e) => return bad_request(format!("tokenization error: {e}")),
+    };
+    let program = match parser.ast() {
+        Ok(pr) => pr,
+        Err(e) => return bad_request(format!("Parse error: {e}")),
+    };
+    eprintln!("Executing {test_name}");
+    if let Err(e) = state.reset_scene().await {
+        return kcl_err(e);
+    }
+    // Let users know if the test is taking a long time.
+    let (done_tx, done_rx) = oneshot::channel::<()>();
+    let timer = time_until(done_rx);
+    let snapshot = match state.execute_and_prepare_snapshot(program).await {
+        Ok(sn) => sn,
+        Err(e) => return kcl_err(e),
+    };
+    let _ = done_tx.send(());
+    timer.abort();
+    eprintln!("\tServing response");
+    let png_bytes = snapshot.contents.0;
+    let mut resp = Response::new(Body::from(png_bytes));
+    resp.headers_mut().insert(CONTENT_TYPE, "image/png".parse().unwrap());
+    resp
+}
+
+fn bad_request(msg: String) -> Response<Body> {
+    eprintln!("\tBad request");
+    let mut resp = Response::new(Body::from(msg));
+    *resp.status_mut() = hyper::StatusCode::BAD_REQUEST;
+    resp
+}
+
+fn bad_gateway(msg: String) -> Response<Body> {
+    eprintln!("\tBad gateway");
+    let mut resp = Response::new(Body::from(msg));
+    *resp.status_mut() = hyper::StatusCode::BAD_GATEWAY;
+    resp
+}
+
+fn kcl_err(err: anyhow::Error) -> Response<Body> {
+    eprintln!("\tBad KCL");
+    bad_gateway(format!("{err}"))
+}
+
+fn time_until(done: oneshot::Receiver<()>) -> JoinHandle<()> {
+    tokio::task::spawn(async move {
+        let period = 10;
+        tokio::pin!(done);
+        for i in 1..=3 {
+            tokio::select! {
+                biased;
+                // If the test is done, no need for this timer anymore.
+                _ = &mut done => return,
+                _ = sleep(Duration::from_secs(period)) => {
+                    eprintln!("\tTest has taken {}s", period * i);
+                },
+            };
+        }
+    })
+}

src/wasm-lib/kcl/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "kcl-lib"
 description = "KittyCAD Language implementation and tools"
-version = "0.1.58"
+version = "0.1.59"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/KittyCAD/modeling-app"
@@ -16,9 +16,9 @@ async-recursion = "1.1.1"
 async-trait = "0.1.80"
 base64 = "0.22.1"
 chrono = "0.4.38"
-clap = { version = "4.5.4", default-features = false, optional = true }
+clap = { version = "4.5.7", default-features = false, optional = true }
 dashmap = "5.5.3"
-databake = { version = "0.1.7", features = ["derive"] }
+databake = { version = "0.1.8", features = ["derive"] }
 derive-docs = { version = "0.1.18",  path = "../derive-docs" }
 form_urlencoded = "1.2.1"
 futures = { version = "0.3.30" }
@@ -54,9 +54,9 @@ web-sys = { version = "0.3.69", features = ["console"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 approx = "0.5"
-bson = { version = "2.10.0", features = ["uuid-1", "chrono"] }
+bson = { version = "2.11.0", features = ["uuid-1", "chrono"] }
 tokio = { version = "1.38.0", features = ["full"] }
-tokio-tungstenite = { version = "0.23.0", features = ["rustls-tls-native-roots"] }
+tokio-tungstenite = { version = "0.23.1", features = ["rustls-tls-native-roots"] }
 tower-lsp = { version = "0.20.0", features = ["proposed"] }
 
 [features]

src/wasm-lib/kcl/src/engine/conn.rs

@@ -40,23 +40,54 @@ pub struct TcpRead {
     stream: futures::stream::SplitStream<tokio_tungstenite::WebSocketStream<reqwest::Upgraded>>,
 }
 
+/// Occurs when client couldn't read from the WebSocket to the engine.
+// #[derive(Debug)]
+pub enum WebSocketReadError {
+    /// Could not read a message due to WebSocket errors.
+    Read(tokio_tungstenite::tungstenite::Error),
+    /// WebSocket message didn't contain a valid message that the KCL Executor could parse.
+    Deser(anyhow::Error),
+}
+
+impl From<anyhow::Error> for WebSocketReadError {
+    fn from(e: anyhow::Error) -> Self {
+        Self::Deser(e)
+    }
+}
+
 impl TcpRead {
-    pub async fn read(&mut self) -> Result<WebSocketResponse> {
+    pub async fn read(&mut self) -> std::result::Result<WebSocketResponse, WebSocketReadError> {
         let Some(msg) = self.stream.next().await else {
-            anyhow::bail!("Failed to read from websocket");
+            return Err(anyhow::anyhow!("Failed to read from WebSocket").into());
         };
-        let msg: WebSocketResponse = match msg? {
-            WsMsg::Text(text) => serde_json::from_str(&text)?,
-            WsMsg::Binary(bin) => bson::from_slice(&bin)?,
-            other => anyhow::bail!("Unexpected websocket message from server: {}", other),
+        let msg = match msg {
+            Ok(msg) => msg,
+            Err(e) if matches!(e, tokio_tungstenite::tungstenite::Error::Protocol(_)) => {
+                return Err(WebSocketReadError::Read(e))
+            }
+            Err(e) => return Err(anyhow::anyhow!("Error reading from engine's WebSocket: {e}").into()),
+        };
+        let msg: WebSocketResponse = match msg {
+            WsMsg::Text(text) => serde_json::from_str(&text)
+                .map_err(anyhow::Error::from)
+                .map_err(WebSocketReadError::from)?,
+            WsMsg::Binary(bin) => bson::from_slice(&bin)
+                .map_err(anyhow::Error::from)
+                .map_err(WebSocketReadError::from)?,
+            other => return Err(anyhow::anyhow!("Unexpected WebSocket message from engine API: {other}").into()),
         };
         Ok(msg)
     }
 }
 
-#[derive(Debug)]
 pub struct TcpReadHandle {
-    handle: Arc<tokio::task::JoinHandle<Result<()>>>,
+    handle: Arc<tokio::task::JoinHandle<Result<(), WebSocketReadError>>>,
+}
+
+impl std::fmt::Debug for TcpReadHandle {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "TcpReadHandle")
+    }
 }
 
 impl Drop for TcpReadHandle {
@@ -150,14 +181,17 @@ impl EngineConnection {
                 match tcp_read.read().await {
                     Ok(ws_resp) => {
                         for e in ws_resp.errors.iter().flatten() {
-                            println!("got error message: {e}");
+                            println!("got error message: {} {}", e.error_code, e.message);
                         }
                         if let Some(id) = ws_resp.request_id {
                             responses_clone.insert(id, ws_resp.clone());
                         }
                     }
                     Err(e) => {
-                        println!("got ws error: {:?}", e);
+                        match &e {
+                            WebSocketReadError::Read(e) => eprintln!("could not read from WS: {:?}", e),
+                            WebSocketReadError::Deser(e) => eprintln!("could not deserialize msg from WS: {:?}", e),
+                        }
                         *socket_health_tcp_read.lock().unwrap() = SocketHealth::Inactive;
                         return Err(e);
                     }

src/wasm-lib/kcl/src/errors.rs

@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 use thiserror::Error;
 use tower_lsp::lsp_types::{Diagnostic, DiagnosticSeverity};
 
-use crate::executor::SourceRange;
+use crate::{executor::SourceRange, lsp::IntoDiagnostic};
 
 #[derive(Error, Debug, Serialize, Deserialize, ts_rs::TS, Clone, PartialEq, Eq)]
 #[ts(export)]
@@ -42,19 +42,9 @@ pub struct KclErrorDetails {
 }
 
 impl KclError {
-    /// Get the error message, line and column from the error and input code.
-    pub fn get_message_line_column(&self, input: &str) -> (String, Option<usize>, Option<usize>) {
-        // Calculate the line and column of the error from the source range.
-        let (line, column) = if let Some(range) = self.source_ranges().first() {
-            let line = input[..range.0[0]].lines().count();
-            let column = input[..range.0[0]].lines().last().map(|l| l.len()).unwrap_or_default();
-
-            (Some(line), Some(column))
-        } else {
-            (None, None)
-        };
-
-        (format!("{}: {}", self.error_type(), self.message()), line, column)
+    /// Get the error message.
+    pub fn get_message(&self) -> String {
+        format!("{}: {}", self.error_type(), self.message())
     }
 
     pub fn error_type(&self) -> &'static str {
@@ -106,24 +96,6 @@ impl KclError {
         }
     }
 
-    pub fn to_lsp_diagnostic(&self, code: &str) -> Diagnostic {
-        let (message, _, _) = self.get_message_line_column(code);
-        let source_ranges = self.source_ranges();
-
-        Diagnostic {
-            range: source_ranges.first().map(|r| r.to_lsp_range(code)).unwrap_or_default(),
-            severity: Some(DiagnosticSeverity::ERROR),
-            code: None,
-            // TODO: this is neat we can pass a URL to a help page here for this specific error.
-            code_description: None,
-            source: Some("kcl".to_string()),
-            message,
-            related_information: None,
-            tags: None,
-            data: None,
-        }
-    }
-
     pub fn override_source_ranges(&self, source_ranges: Vec<SourceRange>) -> Self {
         let mut new = self.clone();
         match &mut new {
@@ -163,6 +135,26 @@ impl KclError {
     }
 }
 
+impl IntoDiagnostic for KclError {
+    fn to_lsp_diagnostic(&self, code: &str) -> Diagnostic {
+        let message = self.get_message();
+        let source_ranges = self.source_ranges();
+
+        Diagnostic {
+            range: source_ranges.first().map(|r| r.to_lsp_range(code)).unwrap_or_default(),
+            severity: Some(DiagnosticSeverity::ERROR),
+            code: None,
+            // TODO: this is neat we can pass a URL to a help page here for this specific error.
+            code_description: None,
+            source: Some("kcl".to_string()),
+            message,
+            related_information: None,
+            tags: None,
+            data: None,
+        }
+    }
+}
+
 /// This is different than to_string() in that it will serialize the Error
 /// the struct as JSON so we can deserialize it on the js side.
 impl From<KclError> for String {

src/wasm-lib/kcl/src/executor.rs

@@ -15,6 +15,7 @@ use crate::{
     engine::EngineManager,
     errors::{KclError, KclErrorDetails},
     fs::FileManager,
+    settings::types::UnitLength,
     std::{FunctionKind, StdLib},
 };
 
@@ -992,7 +993,7 @@ pub struct ExecutorContext {
 #[derive(Debug, Clone)]
 pub struct ExecutorSettings {
     /// The unit to use in modeling dimensions.
-    pub units: crate::settings::types::UnitLength,
+    pub units: UnitLength,
     /// Highlight edges of 3D objects?
     pub highlight_edges: bool,
     /// Whether or not Screen Space Ambient Occlusion (SSAO) is enabled.
@@ -1083,6 +1084,57 @@ impl ExecutorContext {
         })
     }
 
+    /// For executing unit tests.
+    #[cfg(not(target_arch = "wasm32"))]
+    pub async fn new_for_unit_test(units: UnitLength) -> Result<Self> {
+        let user_agent = concat!(env!("CARGO_PKG_NAME"), ".rs/", env!("CARGO_PKG_VERSION"),);
+        let http_client = reqwest::Client::builder()
+            .user_agent(user_agent)
+            // For file conversions we need this to be long.
+            .timeout(std::time::Duration::from_secs(600))
+            .connect_timeout(std::time::Duration::from_secs(60));
+        let ws_client = reqwest::Client::builder()
+            .user_agent(user_agent)
+            // For file conversions we need this to be long.
+            .timeout(std::time::Duration::from_secs(600))
+            .connect_timeout(std::time::Duration::from_secs(60))
+            .connection_verbose(true)
+            .tcp_keepalive(std::time::Duration::from_secs(600))
+            .http1_only();
+
+        let token = std::env::var("KITTYCAD_API_TOKEN").expect("KITTYCAD_API_TOKEN not set");
+
+        // Create the client.
+        let mut client = kittycad::Client::new_from_reqwest(token, http_client, ws_client);
+        // Set a local engine address if it's set.
+        if let Ok(addr) = std::env::var("LOCAL_ENGINE_ADDR") {
+            client.set_base_url(addr);
+        }
+
+        let ctx = ExecutorContext::new(
+            &client,
+            ExecutorSettings {
+                units,
+                highlight_edges: true,
+                enable_ssao: false,
+            },
+        )
+        .await?;
+        Ok(ctx)
+    }
+
+    /// Clear everything in the scene.
+    pub async fn reset_scene(&self) -> Result<()> {
+        self.engine
+            .send_modeling_cmd(
+                uuid::Uuid::new_v4(),
+                SourceRange::default(),
+                kittycad::types::ModelingCmd::SceneClearAll {},
+            )
+            .await?;
+        Ok(())
+    }
+
     /// Perform the execution of a program.
     /// You can optionally pass in some initialization memory.
     /// Kurt uses this for partial execution.
@@ -1309,7 +1361,7 @@ impl ExecutorContext {
     }
 
     /// Update the units for the executor.
-    pub fn update_units(&mut self, units: crate::settings::types::UnitLength) {
+    pub fn update_units(&mut self, units: UnitLength) {
         self.settings.units = units;
     }
 

src/wasm-lib/kcl/src/lib.rs

@@ -11,10 +11,12 @@ pub mod engine;
 pub mod errors;
 pub mod executor;
 pub mod fs;
+pub mod lint;
 pub mod lsp;
 pub mod parser;
 pub mod settings;
 pub mod std;
+pub mod test_server;
 pub mod thread;
 pub mod token;
 #[cfg(target_arch = "wasm32")]

src/wasm-lib/kcl/src/lint/ast_node.rs

@@ -0,0 +1,64 @@
+use crate::ast::types;
+
+/// The "Node" type wraps all the AST elements we're able to find in a KCL
+/// file. Tokens we walk through will be one of these.
+#[derive(Clone, Debug)]
+pub enum Node<'a> {
+    Program(&'a types::Program),
+
+    ExpressionStatement(&'a types::ExpressionStatement),
+    VariableDeclaration(&'a types::VariableDeclaration),
+    ReturnStatement(&'a types::ReturnStatement),
+
+    VariableDeclarator(&'a types::VariableDeclarator),
+
+    Literal(&'a types::Literal),
+    Identifier(&'a types::Identifier),
+    BinaryExpression(&'a types::BinaryExpression),
+    FunctionExpression(&'a types::FunctionExpression),
+    CallExpression(&'a types::CallExpression),
+    PipeExpression(&'a types::PipeExpression),
+    PipeSubstitution(&'a types::PipeSubstitution),
+    ArrayExpression(&'a types::ArrayExpression),
+    ObjectExpression(&'a types::ObjectExpression),
+    MemberExpression(&'a types::MemberExpression),
+    UnaryExpression(&'a types::UnaryExpression),
+
+    Parameter(&'a types::Parameter),
+
+    ObjectProperty(&'a types::ObjectProperty),
+
+    MemberObject(&'a types::MemberObject),
+    LiteralIdentifier(&'a types::LiteralIdentifier),
+}
+
+macro_rules! impl_from {
+    ($node:ident, $t: ident) => {
+        impl<'a> From<&'a types::$t> for Node<'a> {
+            fn from(v: &'a types::$t) -> Self {
+                Node::$t(v)
+            }
+        }
+    };
+}
+
+impl_from!(Node, Program);
+impl_from!(Node, ExpressionStatement);
+impl_from!(Node, VariableDeclaration);
+impl_from!(Node, ReturnStatement);
+impl_from!(Node, VariableDeclarator);
+impl_from!(Node, Literal);
+impl_from!(Node, Identifier);
+impl_from!(Node, BinaryExpression);
+impl_from!(Node, FunctionExpression);
+impl_from!(Node, CallExpression);
+impl_from!(Node, PipeExpression);
+impl_from!(Node, PipeSubstitution);
+impl_from!(Node, ArrayExpression);
+impl_from!(Node, ObjectExpression);
+impl_from!(Node, MemberExpression);
+impl_from!(Node, UnaryExpression);
+impl_from!(Node, Parameter);
+impl_from!(Node, ObjectProperty);
+impl_from!(Node, MemberObject);
+impl_from!(Node, LiteralIdentifier);

src/wasm-lib/kcl/src/lint/ast_walk.rs

@@ -0,0 +1,233 @@
+use super::Node;
+use crate::ast::types::{
+    BinaryPart, BodyItem, LiteralIdentifier, MemberExpression, MemberObject, ObjectExpression, ObjectProperty,
+    Parameter, Program, UnaryExpression, Value, VariableDeclarator,
+};
+use anyhow::Result;
+
+/// Walker is implemented by things that are able to walk an AST tree to
+/// produce lints. This trait is implemented automatically for a few of the
+/// common types, but can be manually implemented too.
+pub trait Walker<'a> {
+    /// Walk will visit every element of the AST.
+    fn walk(&self, n: Node<'a>) -> Result<bool>;
+}
+
+impl<'a, FnT> Walker<'a> for FnT
+where
+    FnT: Fn(Node<'a>) -> Result<bool>,
+{
+    fn walk(&self, n: Node<'a>) -> Result<bool> {
+        self(n)
+    }
+}
+
+/// Run the Walker against all [Node]s in a [Program].
+pub fn walk<'a, WalkT>(prog: &'a Program, f: &WalkT) -> Result<()>
+where
+    WalkT: Walker<'a>,
+{
+    f.walk(prog.into())?;
+
+    for bi in &prog.body {
+        walk_body_item(bi, f)?;
+    }
+    Ok(())
+}
+
+fn walk_variable_declarator<'a, WalkT>(node: &'a VariableDeclarator, f: &WalkT) -> Result<()>
+where
+    WalkT: Walker<'a>,
+{
+    f.walk(node.into())?;
+    f.walk((&node.id).into())?;
+    walk_value(&node.init, f)?;
+    Ok(())
+}
+
+fn walk_parameter<'a, WalkT>(node: &'a Parameter, f: &WalkT) -> Result<()>
+where
+    WalkT: Walker<'a>,
+{
+    f.walk(node.into())?;
+    f.walk((&node.identifier).into())?;
+    Ok(())
+}
+
+fn walk_member_object<'a, WalkT>(node: &'a MemberObject, f: &WalkT) -> Result<()>
+where
+    WalkT: Walker<'a>,
+{
+    f.walk(node.into())?;
+    Ok(())
+}
+
+fn walk_literal_identifier<'a, WalkT>(node: &'a LiteralIdentifier, f: &WalkT) -> Result<()>
+where
+    WalkT: Walker<'a>,
+{
+    f.walk(node.into())?;
+    Ok(())
+}
+
+fn walk_member_expression<'a, WalkT>(node: &'a MemberExpression, f: &WalkT) -> Result<()>
+where
+    WalkT: Walker<'a>,
+{
+    f.walk(node.into())?;
+
+    walk_member_object(&node.object, f)?;
+    walk_literal_identifier(&node.property, f)?;
+
+    Ok(())
+}
+
+fn walk_binary_part<'a, WalkT>(node: &'a BinaryPart, f: &WalkT) -> Result<()>
+where
+    WalkT: Walker<'a>,
+{
+    match node {
+        BinaryPart::Literal(lit) => f.walk(lit.as_ref().into())?,
+        BinaryPart::Identifier(id) => f.walk(id.as_ref().into())?,
+        BinaryPart::BinaryExpression(be) => f.walk(be.as_ref().into())?,
+        BinaryPart::CallExpression(ce) => f.walk(ce.as_ref().into())?,
+        BinaryPart::UnaryExpression(ue) => {
+            walk_unary_expression(ue, f)?;
+            true
+        }
+        BinaryPart::MemberExpression(me) => {
+            walk_member_expression(me, f)?;
+            true
+        }
+    };
+
+    Ok(())
+}
+
+fn walk_value<'a, WalkT>(node: &'a Value, f: &WalkT) -> Result<()>
+where
+    WalkT: Walker<'a>,
+{
+    match node {
+        Value::Literal(lit) => {
+            f.walk(lit.as_ref().into())?;
+        }
+
+        Value::Identifier(id) => {
+            // sometimes there's a bare Identifier without a Value::Identifier.
+            f.walk(id.as_ref().into())?;
+        }
+
+        Value::BinaryExpression(be) => {
+            f.walk(be.as_ref().into())?;
+
+            walk_binary_part(&be.left, f)?;
+            walk_binary_part(&be.right, f)?;
+        }
+        Value::FunctionExpression(fe) => {
+            f.walk(fe.as_ref().into())?;
+
+            for arg in &fe.params {
+                walk_parameter(arg, f)?;
+            }
+            walk(&fe.body, f)?;
+        }
+        Value::CallExpression(ce) => {
+            f.walk(ce.as_ref().into())?;
+            f.walk((&ce.callee).into())?;
+            for e in &ce.arguments {
+                walk_value::<WalkT>(e, f)?;
+            }
+        }
+        Value::PipeExpression(pe) => {
+            f.walk(pe.as_ref().into())?;
+
+            for e in &pe.body {
+                walk_value::<WalkT>(e, f)?;
+            }
+        }
+        Value::PipeSubstitution(ps) => {
+            f.walk(ps.as_ref().into())?;
+        }
+        Value::ArrayExpression(ae) => {
+            f.walk(ae.as_ref().into())?;
+            for e in &ae.elements {
+                walk_value::<WalkT>(e, f)?;
+            }
+        }
+        Value::ObjectExpression(oe) => {
+            walk_object_expression(oe, f)?;
+        }
+        Value::MemberExpression(me) => {
+            walk_member_expression(me, f)?;
+        }
+        Value::UnaryExpression(ue) => {
+            walk_unary_expression(ue, f)?;
+        }
+        _ => {
+            println!("{:?}", node);
+            unimplemented!()
+        }
+    }
+
+    Ok(())
+}
+
+/// Walk through an [ObjectProperty].
+fn walk_object_property<'a, WalkT>(node: &'a ObjectProperty, f: &WalkT) -> Result<()>
+where
+    WalkT: Walker<'a>,
+{
+    f.walk(node.into())?;
+    walk_value(&node.value, f)?;
+    Ok(())
+}
+
+/// Walk through an [ObjectExpression].
+fn walk_object_expression<'a, WalkT>(node: &'a ObjectExpression, f: &WalkT) -> Result<()>
+where
+    WalkT: Walker<'a>,
+{
+    f.walk(node.into())?;
+    for prop in &node.properties {
+        walk_object_property(prop, f)?;
+    }
+    Ok(())
+}
+
+/// walk through an [UnaryExpression].
+fn walk_unary_expression<'a, WalkT>(node: &'a UnaryExpression, f: &WalkT) -> Result<()>
+where
+    WalkT: Walker<'a>,
+{
+    f.walk(node.into())?;
+    walk_binary_part(&node.argument, f)?;
+    Ok(())
+}
+
+/// walk through a [BodyItem].
+fn walk_body_item<'a, WalkT>(node: &'a BodyItem, f: &WalkT) -> Result<()>
+where
+    WalkT: Walker<'a>,
+{
+    // We don't walk a BodyItem since it's an enum itself.
+
+    match node {
+        BodyItem::ExpressionStatement(xs) => {
+            f.walk(xs.into())?;
+            walk_value(&xs.expression, f)?;
+        }
+        BodyItem::VariableDeclaration(vd) => {
+            f.walk(vd.into())?;
+            for dec in &vd.declarations {
+                walk_variable_declarator(dec, f)?;
+            }
+        }
+        BodyItem::ReturnStatement(rs) => {
+            f.walk(rs.into())?;
+            walk_value(&rs.argument, f)?;
+        }
+    }
+
+    Ok(())
+}

src/wasm-lib/kcl/src/lint/checks/camel_case.rs

@@ -0,0 +1,131 @@
+use crate::{
+    ast::types::VariableDeclarator,
+    executor::SourceRange,
+    lint::{
+        rule::{def_finding, Discovered, Finding},
+        Node,
+    },
+};
+
+use anyhow::Result;
+
+def_finding!(
+    Z0001,
+    "Identifiers must be lowerCamelCase",
+    "\
+By convention, variable names are lowerCamelCase, not snake_case, kebab-case,
+nor CammelCase. 🐪
+
+For instance, a good identifier for the variable representing 'box height'
+would be 'boxHeight', not 'BOX_HEIGHT', 'box_height' nor 'BoxHeight'. For
+more information there's a pretty good Wikipedia page at
+
+https://en.wikipedia.org/wiki/Camel_case
+"
+);
+
+fn lint_lower_camel_case(decl: &VariableDeclarator) -> Result<Vec<Discovered>> {
+    let mut findings = vec![];
+    let ident = &decl.id;
+    let name = &ident.name;
+
+    if !name.chars().next().unwrap().is_lowercase() {
+        findings.push(Z0001.at(format!("found '{}'", name), SourceRange::new(ident.start, ident.end)));
+        return Ok(findings);
+    }
+
+    if name.contains('-') || name.contains('_') {
+        findings.push(Z0001.at(format!("found '{}'", name), SourceRange::new(ident.start, ident.end)));
+        return Ok(findings);
+    }
+
+    Ok(findings)
+}
+
+pub fn lint_variables(decl: Node) -> Result<Vec<Discovered>> {
+    let Node::VariableDeclaration(decl) = decl else {
+        return Ok(vec![]);
+    };
+
+    Ok(decl
+        .declarations
+        .iter()
+        .flat_map(|v| lint_lower_camel_case(v).unwrap_or_default())
+        .collect())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{lint_variables, Z0001};
+    use crate::lint::rule::{assert_finding, test_finding, test_no_finding};
+
+    #[test]
+    fn z0001_const() {
+        assert_finding!(lint_variables, Z0001, "const Thickness = 0.5");
+        assert_finding!(lint_variables, Z0001, "const THICKNESS = 0.5");
+        assert_finding!(lint_variables, Z0001, "const THICC_NES = 0.5");
+        assert_finding!(lint_variables, Z0001, "const thicc_nes = 0.5");
+    }
+
+    test_finding!(z0001_full_bad, lint_variables, Z0001, "\
+// Define constants
+const pipeLength = 40
+const pipeSmallDia = 10
+const pipeLargeDia = 20
+const thickness = 0.5
+
+// Create the sketch to be revolved around the y-axis. Use the small diameter, large diameter, length, and thickness to define the sketch.
+const Part001 = startSketchOn('XY')
+  |> startProfileAt([pipeLargeDia - (thickness / 2), 38], %)
+  |> line([thickness, 0], %)
+  |> line([0, -1], %)
+  |> angledLineToX({
+       angle: 60,
+       to: pipeSmallDia + thickness
+     }, %)
+  |> line([0, -pipeLength], %)
+  |> angledLineToX({
+       angle: -60,
+       to: pipeLargeDia + thickness
+     }, %)
+  |> line([0, -1], %)
+  |> line([-thickness, 0], %)
+  |> line([0, 1], %)
+  |> angledLineToX({ angle: 120, to: pipeSmallDia }, %)
+  |> line([0, pipeLength], %)
+  |> angledLineToX({ angle: 60, to: pipeLargeDia }, %)
+  |> close(%)
+  |> revolve({ axis: 'y' }, %)
+");
+
+    test_no_finding!(z0001_full_good, lint_variables, Z0001, "\
+// Define constants
+const pipeLength = 40
+const pipeSmallDia = 10
+const pipeLargeDia = 20
+const thickness = 0.5
+
+// Create the sketch to be revolved around the y-axis. Use the small diameter, large diameter, length, and thickness to define the sketch.
+const part001 = startSketchOn('XY')
+  |> startProfileAt([pipeLargeDia - (thickness / 2), 38], %)
+  |> line([thickness, 0], %)
+  |> line([0, -1], %)
+  |> angledLineToX({
+       angle: 60,
+       to: pipeSmallDia + thickness
+     }, %)
+  |> line([0, -pipeLength], %)
+  |> angledLineToX({
+       angle: -60,
+       to: pipeLargeDia + thickness
+     }, %)
+  |> line([0, -1], %)
+  |> line([-thickness, 0], %)
+  |> line([0, 1], %)
+  |> angledLineToX({ angle: 120, to: pipeSmallDia }, %)
+  |> line([0, pipeLength], %)
+  |> angledLineToX({ angle: 60, to: pipeLargeDia }, %)
+  |> close(%)
+  |> revolve({ axis: 'y' }, %)
+");
+}

src/wasm-lib/kcl/src/lint/checks/mod.rs

@@ -0,0 +1,4 @@
+mod camel_case;
+
+#[allow(unused_imports)]
+pub use camel_case::{lint_variables, Z0001};

src/wasm-lib/kcl/src/lint/mod.rs

@@ -0,0 +1,9 @@
+mod ast_node;
+mod ast_walk;
+pub mod checks;
+mod rule;
+
+pub use ast_node::Node;
+pub use ast_walk::walk;
+// pub(crate) use rule::{def_finding, finding};
+pub use rule::{lint, Discovered, Finding};

src/wasm-lib/kcl/src/lint/rule.rs

@@ -0,0 +1,180 @@
+use super::{walk, Node};
+use crate::{ast::types::Program, executor::SourceRange, lsp::IntoDiagnostic};
+use anyhow::Result;
+use std::sync::{Arc, Mutex};
+use tower_lsp::lsp_types::{Diagnostic, DiagnosticSeverity};
+
+/// Check the provided AST for any found rule violations.
+///
+/// The Rule trait is automatically implemented for a few other types,
+/// but it can also be manually implemented as required.
+pub trait Rule<'a> {
+    /// Check the AST at this specific node for any Finding(s).
+    fn check(&self, node: Node<'a>) -> Result<Vec<Discovered>>;
+}
+
+impl<'a, FnT> Rule<'a> for FnT
+where
+    FnT: Fn(Node<'a>) -> Result<Vec<Discovered>>,
+{
+    fn check(&self, n: Node<'a>) -> Result<Vec<Discovered>> {
+        self(n)
+    }
+}
+
+/// Specific discovered lint rule Violation of a particular Finding.
+#[derive(Clone, Debug)]
+pub struct Discovered {
+    /// Zoo Lint Finding information.
+    pub finding: Finding,
+
+    /// Further information about the specific finding.
+    pub description: String,
+
+    /// Source code location.
+    pub pos: SourceRange,
+
+    /// Is this discovered issue overridden by the programmer?
+    pub overridden: bool,
+}
+
+impl IntoDiagnostic for Discovered {
+    fn to_lsp_diagnostic(&self, code: &str) -> Diagnostic {
+        let message = self.finding.title.to_owned();
+        let source_range = self.pos;
+
+        Diagnostic {
+            range: source_range.to_lsp_range(code),
+            severity: Some(DiagnosticSeverity::INFORMATION),
+            code: None,
+            // TODO: this is neat we can pass a URL to a help page here for this specific error.
+            code_description: None,
+            source: Some("lint".to_string()),
+            message,
+            related_information: None,
+            tags: None,
+            data: None,
+        }
+    }
+}
+
+/// Abstract lint problem type.
+#[derive(Clone, Debug, PartialEq)]
+pub struct Finding {
+    /// Unique identifier for this particular issue.
+    pub code: &'static str,
+
+    /// Short one-line description of this issue.
+    pub title: &'static str,
+
+    /// Long human-readable description of this issue.
+    pub description: &'static str,
+
+    /// Is this discovered issue experimental?
+    pub experimental: bool,
+}
+
+impl Finding {
+    /// Create a new Discovered finding at the specific Position.
+    pub fn at(&self, description: String, pos: SourceRange) -> Discovered {
+        Discovered {
+            description,
+            finding: self.clone(),
+            pos,
+            overridden: false,
+        }
+    }
+}
+
+macro_rules! def_finding {
+    ( $code:ident, $title:expr, $description:expr ) => {
+        /// Generated Finding
+        pub const $code: Finding = $crate::lint::rule::finding!($code, $title, $description);
+    };
+}
+pub(crate) use def_finding;
+
+macro_rules! finding {
+    ( $code:ident, $title:expr, $description:expr ) => {
+        $crate::lint::rule::Finding {
+            code: stringify!($code),
+            title: $title,
+            description: $description,
+            experimental: false,
+        }
+    };
+}
+pub(crate) use finding;
+
+#[cfg(test)]
+pub(crate) use test::{assert_finding, assert_no_finding, test_finding, test_no_finding};
+
+/// Check the provided Program for any Findings.
+pub fn lint<'a, RuleT>(prog: &'a Program, rule: RuleT) -> Result<Vec<Discovered>>
+where
+    RuleT: Rule<'a>,
+{
+    let v = Arc::new(Mutex::new(vec![]));
+    walk(prog, &|node: Node<'a>| {
+        let mut findings = v.lock().map_err(|_| anyhow::anyhow!("mutex"))?;
+        findings.append(&mut rule.check(node)?);
+        Ok(true)
+    })?;
+    let x = v.lock().unwrap();
+    Ok(x.clone())
+}
+
+#[cfg(test)]
+mod test {
+
+    macro_rules! assert_no_finding {
+        ( $check:expr, $finding:expr, $kcl:expr ) => {
+            let tokens = $crate::token::lexer($kcl).unwrap();
+            let parser = $crate::parser::Parser::new(tokens);
+            let prog = parser.ast().unwrap();
+            for discovered_finding in $crate::lint::lint(&prog, $check).unwrap() {
+                if discovered_finding.finding == $finding {
+                    assert!(false, "Finding {:?} was emitted", $finding.code);
+                }
+            }
+        };
+    }
+
+    macro_rules! assert_finding {
+        ( $check:expr, $finding:expr, $kcl:expr ) => {
+            let tokens = $crate::token::lexer($kcl).unwrap();
+            let parser = $crate::parser::Parser::new(tokens);
+            let prog = parser.ast().unwrap();
+
+            for discovered_finding in $crate::lint::lint(&prog, $check).unwrap() {
+                if discovered_finding.finding == $finding {
+                    return;
+                }
+            }
+            assert!(false, "Finding {:?} was not emitted", $finding.code);
+        };
+    }
+
+    macro_rules! test_finding {
+        ( $name:ident, $check:expr, $finding:expr, $kcl:expr ) => {
+            #[test]
+            fn $name() {
+                $crate::lint::rule::assert_finding!($check, $finding, $kcl);
+            }
+        };
+    }
+
+    macro_rules! test_no_finding {
+        ( $name:ident, $check:expr, $finding:expr, $kcl:expr ) => {
+            #[test]
+            fn $name() {
+                $crate::lint::rule::assert_no_finding!($check, $finding, $kcl);
+            }
+        };
+    }
+
+    pub(crate) use assert_finding;
+    pub(crate) use assert_no_finding;
+    pub(crate) use test_finding;
+    pub(crate) use test_no_finding;
+}

src/wasm-lib/kcl/src/lsp/kcl/mod.rs

@@ -36,9 +36,9 @@ use tower_lsp::{
 use super::backend::{InnerHandle, UpdateHandle};
 use crate::{
     ast::types::VariableKind,
-    errors::KclError,
     executor::SourceRange,
-    lsp::{backend::Backend as _, safemap::SafeMap},
+    lint::{checks, lint},
+    lsp::{backend::Backend as _, safemap::SafeMap, util::IntoDiagnostic},
     parser::PIPE_OPERATOR,
 };
 
@@ -166,6 +166,7 @@ impl crate::lsp::backend::Backend for Backend {
     }
 
     async fn inner_on_change(&self, params: TextDocumentItem, force: bool) {
+        self.clear_diagnostics_map(&params.uri).await;
         // We already updated the code map in the shared backend.
 
         // Lets update the tokens.
@@ -251,14 +252,14 @@ impl crate::lsp::backend::Backend for Backend {
         // Execute the code if we have an executor context.
         // This function automatically executes if we should & updates the diagnostics if we got
         // errors.
-        let result = self.execute(&params, ast).await;
-        if result.is_err() {
-            // We return early because we got errors, and we don't want to clear the diagnostics.
+        if self.execute(&params, ast.clone()).await.is_err() {
+            // if there was an issue, let's bail and avoid trying to lint.
             return;
         }
 
-        // Lets update the diagnostics, since we got no errors.
-        self.clear_diagnostics(&params.uri).await;
+        for discovered_finding in lint(&ast, checks::lint_variables).into_iter().flatten() {
+            self.add_to_diagnostics(&params, discovered_finding).await;
+        }
     }
 }
 
@@ -356,30 +357,7 @@ impl Backend {
             .await;
     }
 
-    async fn add_to_diagnostics(&self, params: &TextDocumentItem, err: KclError) {
-        let diagnostic = err.to_lsp_diagnostic(&params.text);
-        // We got errors, update the diagnostics.
-        self.diagnostics_map
-            .insert(
-                params.uri.to_string(),
-                DocumentDiagnosticReport::Full(RelatedFullDocumentDiagnosticReport {
-                    related_documents: None,
-                    full_document_diagnostic_report: FullDocumentDiagnosticReport {
-                        result_id: None,
-                        items: vec![diagnostic.clone()],
-                    },
-                }),
-            )
-            .await;
-
-        // Publish the diagnostic.
-        // If the client supports it.
-        self.client
-            .publish_diagnostics(params.uri.clone(), vec![diagnostic], None)
-            .await;
-    }
-
-    async fn clear_diagnostics(&self, uri: &url::Url) {
+    async fn clear_diagnostics_map(&self, uri: &url::Url) {
         self.diagnostics_map
             .insert(
                 uri.to_string(),
@@ -392,10 +370,43 @@ impl Backend {
                 }),
             )
             .await;
+    }
 
-        // Publish the diagnostic, we reset it here so the client knows the code compiles now.
-        // If the client supports it.
-        self.client.publish_diagnostics(uri.clone(), vec![], None).await;
+    async fn add_to_diagnostics<DiagT: IntoDiagnostic + std::fmt::Debug>(
+        &self,
+        params: &TextDocumentItem,
+        diagnostic: DiagT,
+    ) {
+        self.client
+            .log_message(MessageType::INFO, format!("adding {:?} to diag", diagnostic))
+            .await;
+
+        let diagnostic = diagnostic.to_lsp_diagnostic(&params.text);
+
+        let DocumentDiagnosticReport::Full(mut report) = self
+            .diagnostics_map
+            .get(params.uri.clone().as_str())
+            .await
+            .unwrap_or(DocumentDiagnosticReport::Full(RelatedFullDocumentDiagnosticReport {
+                related_documents: None,
+                full_document_diagnostic_report: FullDocumentDiagnosticReport {
+                    result_id: None,
+                    items: vec![],
+                },
+            }))
+        else {
+            unreachable!();
+        };
+
+        report.full_document_diagnostic_report.items.push(diagnostic);
+
+        self.diagnostics_map
+            .insert(params.uri.to_string(), DocumentDiagnosticReport::Full(report.clone()))
+            .await;
+
+        self.client
+            .publish_diagnostics(params.uri.clone(), report.full_document_diagnostic_report.items, None)
+            .await;
     }
 
     async fn execute(&self, params: &TextDocumentItem, ast: crate::ast::types::Program) -> Result<()> {

src/wasm-lib/kcl/src/lsp/mod.rs

@@ -7,3 +7,5 @@ mod safemap;
 #[cfg(test)]
 mod tests;
 pub mod util;
+
+pub use util::IntoDiagnostic;

src/wasm-lib/kcl/src/lsp/tests.rs

@@ -1498,6 +1498,53 @@ async fn test_kcl_lsp_diagnostic_has_errors() {
     }
 }
 
+#[tokio::test(flavor = "multi_thread")]
+async fn test_kcl_lsp_diagnostic_has_lints() {
+    let server = kcl_lsp_server(false).await.unwrap();
+
+    // Send open file.
+    server
+        .did_open(tower_lsp::lsp_types::DidOpenTextDocumentParams {
+            text_document: tower_lsp::lsp_types::TextDocumentItem {
+                uri: "file:///testlint.kcl".try_into().unwrap(),
+                language_id: "kcl".to_string(),
+                version: 1,
+                text: r#"let THING = 10"#.to_string(),
+            },
+        })
+        .await;
+    server.wait_on_handle().await;
+
+    // Send diagnostics request.
+    let diagnostics = server
+        .diagnostic(tower_lsp::lsp_types::DocumentDiagnosticParams {
+            text_document: tower_lsp::lsp_types::TextDocumentIdentifier {
+                uri: "file:///testlint.kcl".try_into().unwrap(),
+            },
+            partial_result_params: Default::default(),
+            work_done_progress_params: Default::default(),
+            identifier: None,
+            previous_result_id: None,
+        })
+        .await
+        .unwrap();
+
+    // Check the diagnostics.
+    if let tower_lsp::lsp_types::DocumentDiagnosticReportResult::Report(diagnostics) = diagnostics {
+        if let tower_lsp::lsp_types::DocumentDiagnosticReport::Full(diagnostics) = diagnostics {
+            assert_eq!(diagnostics.full_document_diagnostic_report.items.len(), 1);
+            assert_eq!(
+                diagnostics.full_document_diagnostic_report.items[0].message,
+                "Identifiers must be lowerCamelCase"
+            );
+        } else {
+            panic!("Expected full diagnostics");
+        }
+    } else {
+        panic!("Expected diagnostics");
+    }
+}
+
 #[tokio::test(flavor = "multi_thread")]
 async fn test_copilot_lsp_set_editor_info() {
     let server = copilot_lsp_server().await.unwrap();

src/wasm-lib/kcl/src/lsp/util.rs

@@ -1,7 +1,7 @@
 //! Utility functions for working with ropes and positions.
 
 use ropey::Rope;
-use tower_lsp::lsp_types::Position;
+use tower_lsp::lsp_types::{Diagnostic, Position};
 
 pub fn position_to_offset(position: Position, rope: &Rope) -> Option<usize> {
     Some(rope.try_line_to_char(position.line as usize).ok()? + position.character as usize)
@@ -31,3 +31,10 @@ pub fn get_line_before(pos: Position, rope: &Rope) -> Option<String> {
     let line_start = offset - char_offset;
     Some(rope.slice(line_start..offset).to_string())
 }
+
+/// Convert an object into a [lsp_types::Diagnostic] given the
+/// [TextDocumentItem]'s `.text` field.
+pub trait IntoDiagnostic {
+    /// Convert the traited object to a [lsp_types::Diagnostic].
+    fn to_lsp_diagnostic(&self, text: &str) -> Diagnostic;
+}

src/wasm-lib/kcl/src/std/chamfer.rs

@@ -0,0 +1,126 @@
+//! Standard library chamfers.
+
+use anyhow::Result;
+use derive_docs::stdlib;
+use kittycad::types::ModelingCmd;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
+use crate::{
+    errors::{KclError, KclErrorDetails},
+    executor::{ExtrudeGroup, MemoryItem},
+    std::Args,
+};
+
+pub(crate) const DEFAULT_TOLERANCE: f64 = 0.0000001;
+
+/// Data for chamfers.
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub struct ChamferData {
+    /// The radius of the chamfer.
+    pub radius: f64,
+    /// The tags of the paths you want to chamfer.
+    pub tags: Vec<EdgeReference>,
+}
+
+/// A string or a uuid.
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Ord, PartialOrd, Eq, Hash)]
+#[ts(export)]
+#[serde(untagged)]
+pub enum EdgeReference {
+    /// A uuid of an edge.
+    Uuid(uuid::Uuid),
+    /// A tag name of an edge.
+    Tag(String),
+}
+
+/// Create chamfers on tagged paths.
+pub async fn chamfer(args: Args) -> Result<MemoryItem, KclError> {
+    let (data, extrude_group): (ChamferData, Box<ExtrudeGroup>) = args.get_data_and_extrude_group()?;
+
+    let extrude_group = inner_chamfer(data, extrude_group, args).await?;
+    Ok(MemoryItem::ExtrudeGroup(extrude_group))
+}
+
+/// Create chamfers on tagged paths.
+///
+/// ```no_run
+/// const width = 20
+/// const length = 10
+/// const thickness = 1
+/// const chamferRadius = 2
+///
+/// const mountingPlateSketch = startSketchOn("XY")
+///   |> startProfileAt([-width/2, -length/2], %)
+///   |> lineTo([width/2, -length/2], %, 'edge1')
+///   |> lineTo([width/2, length/2], %, 'edge2')
+///   |> lineTo([-width/2, length/2], %, 'edge3')
+///   |> close(%, 'edge4')
+///
+/// const mountingPlate = extrude(thickness, mountingPlateSketch)
+///   |> chamfer({
+///     radius: chamferRadius,
+///     tags: [
+///       getNextAdjacentEdge('edge1', %),
+///       getNextAdjacentEdge('edge2', %),
+///       getNextAdjacentEdge('edge3', %),
+///       getNextAdjacentEdge('edge4', %)
+///     ],
+///   }, %)
+/// ```
+#[stdlib {
+    name = "chamfer",
+}]
+async fn inner_chamfer(
+    data: ChamferData,
+    extrude_group: Box<ExtrudeGroup>,
+    args: Args,
+) -> Result<Box<ExtrudeGroup>, KclError> {
+    // Check if tags contains any duplicate values.
+    let mut tags = data.tags.clone();
+    tags.sort();
+    tags.dedup();
+    if tags.len() != data.tags.len() {
+        return Err(KclError::Type(KclErrorDetails {
+            message: "Duplicate tags are not allowed.".to_string(),
+            source_ranges: vec![args.source_range],
+        }));
+    }
+
+    for tag in data.tags {
+        let edge_id = match tag {
+            EdgeReference::Uuid(uuid) => uuid,
+            EdgeReference::Tag(tag) => {
+                extrude_group
+                    .sketch_group_values
+                    .iter()
+                    .find(|p| p.get_name() == tag)
+                    .ok_or_else(|| {
+                        KclError::Type(KclErrorDetails {
+                            message: format!("No edge found with tag: `{}`", tag),
+                            source_ranges: vec![args.source_range],
+                        })
+                    })?
+                    .get_base()
+                    .geo_meta
+                    .id
+            }
+        };
+
+        args.send_modeling_cmd(
+            uuid::Uuid::new_v4(),
+            ModelingCmd::Solid3DFilletEdge {
+                edge_id,
+                object_id: extrude_group.id,
+                radius: data.radius,
+                tolerance: DEFAULT_TOLERANCE, // We can let the user set this in the future.
+                cut_type: Some(kittycad::types::CutType::Chamfer),
+            },
+        )
+        .await?;
+    }
+
+    Ok(extrude_group)
+}

src/wasm-lib/kcl/src/std/fillet.rs

@@ -117,6 +117,7 @@ async fn inner_fillet(
                 object_id: extrude_group.id,
                 radius: data.radius,
                 tolerance: DEFAULT_TOLERANCE, // We can let the user set this in the future.
+                cut_type: Some(kittycad::types::CutType::Fillet),
             },
         )
         .await?;

src/wasm-lib/kcl/src/std/math.rs

@@ -275,7 +275,7 @@ pub async fn min(args: Args) -> Result<MemoryItem, KclError> {
     tags = ["math"],
 }]
 fn inner_min(args: Vec<f64>) -> f64 {
-    let mut min = std::f64::MAX;
+    let mut min = f64::MAX;
     for arg in args.iter() {
         if *arg < min {
             min = *arg;
@@ -312,7 +312,7 @@ pub async fn max(args: Args) -> Result<MemoryItem, KclError> {
     tags = ["math"],
 }]
 fn inner_max(args: Vec<f64>) -> f64 {
-    let mut max = std::f64::MIN;
+    let mut max = f64::MIN;
     for arg in args.iter() {
         if *arg > max {
             max = *arg;

src/wasm-lib/kcl/src/std/mod.rs

@@ -1,5 +1,6 @@
 //! Functions implemented for language execution.
 
+pub mod chamfer;
 pub mod extrude;
 pub mod fillet;
 pub mod helix;
@@ -10,6 +11,7 @@ pub mod patterns;
 pub mod revolve;
 pub mod segment;
 pub mod shapes;
+pub mod shell;
 pub mod sketch;
 pub mod types;
 pub mod utils;
@@ -81,11 +83,13 @@ lazy_static! {
         Box::new(crate::std::patterns::PatternLinear3D),
         Box::new(crate::std::patterns::PatternCircular2D),
         Box::new(crate::std::patterns::PatternCircular3D),
+        Box::new(crate::std::chamfer::Chamfer),
         Box::new(crate::std::fillet::Fillet),
         Box::new(crate::std::fillet::GetOppositeEdge),
         Box::new(crate::std::fillet::GetNextAdjacentEdge),
         Box::new(crate::std::fillet::GetPreviousAdjacentEdge),
         Box::new(crate::std::helix::Helix),
+        Box::new(crate::std::shell::Shell),
         Box::new(crate::std::revolve::Revolve),
         Box::new(crate::std::revolve::GetEdge),
         Box::new(crate::std::import::Import),

src/wasm-lib/kcl/src/std/shell.rs

@@ -0,0 +1,140 @@
+//! Standard library shells.
+
+use anyhow::Result;
+use derive_docs::stdlib;
+use kittycad::types::ModelingCmd;
+use parse_display::{Display, FromStr};
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
+use crate::{
+    errors::{KclError, KclErrorDetails},
+    executor::{ExtrudeGroup, ExtrudeSurface, MemoryItem},
+    std::{sketch::StartOrEnd, Args},
+};
+
+/// A tag for a face.
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, FromStr, Display)]
+#[ts(export)]
+#[serde(rename_all = "snake_case", untagged)]
+#[display("{0}")]
+pub enum FaceTag {
+    StartOrEnd(StartOrEnd),
+    /// A string tag for the face you want to sketch on.
+    String(String),
+}
+
+/// Data for shells.
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub struct ShellData {
+    /// The thickness of the shell.
+    pub thickness: f64,
+    /// The faces you want removed.
+    pub faces: Vec<FaceTag>,
+}
+
+/// Create a shell.
+pub async fn shell(args: Args) -> Result<MemoryItem, KclError> {
+    let (data, extrude_group): (ShellData, Box<ExtrudeGroup>) = args.get_data_and_extrude_group()?;
+
+    let extrude_group = inner_shell(data, extrude_group, args).await?;
+    Ok(MemoryItem::ExtrudeGroup(extrude_group))
+}
+
+/// Shell a solid.
+///
+/// ```no_run
+/// const firstSketch = startSketchOn('XY')
+///     |> startProfileAt([-12, 12], %)
+///     |> line([24, 0], %)
+///     |> line([0, -24], %)
+///     |> line([-24, 0], %)
+///     |> close(%)
+///     |> extrude(6, %)
+///
+/// // Remove the end face for the extrusion.
+/// shell({
+///     faces: ['end'],
+///     thickness: 0.25,
+/// }, firstSketch)
+/// ```
+#[stdlib {
+    name = "shell",
+}]
+async fn inner_shell(
+    data: ShellData,
+    extrude_group: Box<ExtrudeGroup>,
+    args: Args,
+) -> Result<Box<ExtrudeGroup>, KclError> {
+    if data.faces.is_empty() {
+        return Err(KclError::Type(KclErrorDetails {
+            message: "Expected at least one face".to_string(),
+            source_ranges: vec![args.source_range],
+        }));
+    }
+
+    let mut face_ids = Vec::new();
+    for tag in data.faces {
+        let extrude_plane_id = match tag {
+            FaceTag::String(ref s) => {
+                if s.is_empty() {
+                    return Err(KclError::Type(KclErrorDetails {
+                        message: "Expected a non-empty tag for the face".to_string(),
+                        source_ranges: vec![args.source_range],
+                    }));
+                }
+                extrude_group
+                    .value
+                    .iter()
+                    .find_map(|extrude_surface| match extrude_surface {
+                        ExtrudeSurface::ExtrudePlane(extrude_plane) if extrude_plane.name == *s => {
+                            Some(extrude_plane.face_id)
+                        }
+                        ExtrudeSurface::ExtrudeArc(extrude_arc) if extrude_arc.name == *s => Some(extrude_arc.face_id),
+                        ExtrudeSurface::ExtrudePlane(_) | ExtrudeSurface::ExtrudeArc(_) => None,
+                    })
+                    .ok_or_else(|| {
+                        KclError::Type(KclErrorDetails {
+                            message: format!("Expected a face with the tag `{}`", tag),
+                            source_ranges: vec![args.source_range],
+                        })
+                    })?
+            }
+            FaceTag::StartOrEnd(StartOrEnd::Start) => extrude_group.start_cap_id.ok_or_else(|| {
+                KclError::Type(KclErrorDetails {
+                    message: "Expected a start face".to_string(),
+                    source_ranges: vec![args.source_range],
+                })
+            })?,
+            FaceTag::StartOrEnd(StartOrEnd::End) => extrude_group.end_cap_id.ok_or_else(|| {
+                KclError::Type(KclErrorDetails {
+                    message: "Expected an end face".to_string(),
+                    source_ranges: vec![args.source_range],
+                })
+            })?,
+        };
+
+        face_ids.push(extrude_plane_id);
+    }
+
+    if face_ids.is_empty() {
+        return Err(KclError::Type(KclErrorDetails {
+            message: "Expected at least one valid face".to_string(),
+            source_ranges: vec![args.source_range],
+        }));
+    }
+
+    args.send_modeling_cmd(
+        uuid::Uuid::new_v4(),
+        ModelingCmd::Solid3DShellFace {
+            face_ids,
+            object_id: extrude_group.id,
+            shell_thickness: data.thickness,
+        },
+    )
+    .await?;
+
+    Ok(extrude_group)
+}

src/wasm-lib/kcl/src/test_server.rs

@@ -0,0 +1,8 @@
+//! Types used to send data to the test server.
+
+#[derive(serde::Deserialize, serde::Serialize)]
+pub struct RequestBody {
+    pub kcl_program: String,
+    #[serde(default)]
+    pub test_name: String,
+}

src/wasm-lib/tests/executor/main.rs

@@ -1,58 +1,39 @@
+use std::io::Cursor;
+
 use anyhow::Result;
-use kcl_lib::{
-    executor::{ExecutorContext, ExecutorSettings},
-    settings::types::UnitLength,
-};
+use image::io::Reader as ImageReader;
+use kcl_lib::{executor::ExecutorContext, settings::types::UnitLength};
+use kittycad::types::TakeSnapshot;
 
-// mod server;
-
-async fn new_context(units: UnitLength) -> Result<ExecutorContext> {
-    let user_agent = concat!(env!("CARGO_PKG_NAME"), ".rs/", env!("CARGO_PKG_VERSION"),);
-    let http_client = reqwest::Client::builder()
-        .user_agent(user_agent)
-        // For file conversions we need this to be long.
-        .timeout(std::time::Duration::from_secs(600))
-        .connect_timeout(std::time::Duration::from_secs(60));
-    let ws_client = reqwest::Client::builder()
-        .user_agent(user_agent)
-        // For file conversions we need this to be long.
-        .timeout(std::time::Duration::from_secs(600))
-        .connect_timeout(std::time::Duration::from_secs(60))
-        .connection_verbose(true)
-        .tcp_keepalive(std::time::Duration::from_secs(600))
-        .http1_only();
-
-    let token = std::env::var("KITTYCAD_API_TOKEN").expect("KITTYCAD_API_TOKEN not set");
-
-    // Create the client.
-    let mut client = kittycad::Client::new_from_reqwest(token, http_client, ws_client);
-    // Set a local engine address if it's set.
-    if let Ok(addr) = std::env::var("LOCAL_ENGINE_ADDR") {
-        client.set_base_url(addr);
-    }
-
-    let ctx = ExecutorContext::new(
-        &client,
-        ExecutorSettings {
-            units,
-            highlight_edges: true,
-            enable_ssao: false,
-        },
-    )
-    .await?;
-    Ok(ctx)
+macro_rules! test_name {
+    () => {{
+        fn f() {}
+        fn type_name_of<T>(_: T) -> &'static str {
+            std::any::type_name::<T>()
+        }
+        let name = type_name_of(f);
+        name.strip_suffix("::f")
+            .unwrap()
+            .strip_suffix("::{{closure}}")
+            .unwrap()
+            .strip_prefix("executor::serial_test_")
+            .unwrap()
+    }};
 }
 
 /// Executes a kcl program and takes a snapshot of the result.
 /// This returns the bytes of the snapshot.
 async fn execute_and_snapshot(code: &str, units: UnitLength) -> Result<image::DynamicImage> {
-    let ctx = new_context(units).await?;
+    let ctx = ExecutorContext::new_for_unit_test(units).await?;
     let tokens = kcl_lib::token::lexer(code)?;
     let parser = kcl_lib::parser::Parser::new(tokens);
     let program = parser.ast()?;
 
     let snapshot = ctx.execute_and_prepare_snapshot(program).await?;
+    to_disk(snapshot)
+}
 
+fn to_disk(snapshot: TakeSnapshot) -> Result<image::DynamicImage> {
     // Create a temporary file to write the output to.
     let output_file = std::env::temp_dir().join(format!("kcl_output_{}.png", uuid::Uuid::new_v4()));
     // Save the snapshot locally, to that temporary file.
@@ -81,28 +62,28 @@ const part002 = startSketchOn(part001, "here")
   |> extrude(5, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/sketch_on_face.png", &result, 0.999);
 }
 
 #[tokio::test(flavor = "multi_thread")]
 async fn serial_test_riddle_small() {
     let code = include_str!("inputs/riddle_small.kcl");
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/riddle_small.png", &result, 0.999);
 }
 
 #[tokio::test(flavor = "multi_thread")]
 async fn serial_test_lego() {
     let code = include_str!("inputs/lego.kcl");
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/lego.png", &result, 0.999);
 }
 
 #[tokio::test(flavor = "multi_thread")]
 async fn serial_test_pipe_as_arg() {
     let code = include_str!("inputs/pipe_as_arg.kcl");
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/pipe_as_arg.png", &result, 0.999);
 }
 
@@ -137,14 +118,14 @@ const part002 = startSketchOn(part001, "start")
   |> extrude(5, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/sketch_on_face_start.png", &result, 0.999);
 }
 
 #[tokio::test(flavor = "multi_thread")]
 async fn serial_test_mike_stress_lines() {
     let code = include_str!("inputs/mike_stress_test.kcl");
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/mike_stress_test.png", &result, 0.999);
 }
 
@@ -172,7 +153,7 @@ const part002 = startSketchOn(part001, "END")
   |> extrude(5, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/sketch_on_face_end.png", &result, 0.999);
 }
 
@@ -200,7 +181,7 @@ const part002 = startSketchOn(part001, "END")
   |> extrude(-5, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image(
         "tests/executor/outputs/sketch_on_face_end_negative_extrude.png",
         &result,
@@ -220,7 +201,7 @@ async fn serial_test_fillet_duplicate_tags() {
     |> fillet({radius: 0.5, tags: ["thing", "thing"]}, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await;
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await;
     assert!(result.is_err());
     assert_eq!(
         result.err().unwrap().to_string(),
@@ -240,7 +221,7 @@ async fn serial_test_basic_fillet_cube_start() {
     |> fillet({radius: 2, tags: ["thing", "thing2"]}, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/basic_fillet_cube_start.png", &result, 0.999);
 }
 
@@ -257,7 +238,7 @@ async fn serial_test_basic_fillet_cube_end() {
 
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/basic_fillet_cube_end.png", &result, 0.999);
 }
 
@@ -274,7 +255,7 @@ async fn serial_test_basic_fillet_cube_close_opposite() {
 
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image(
         "tests/executor/outputs/basic_fillet_cube_close_opposite.png",
         &result,
@@ -294,7 +275,7 @@ async fn serial_test_basic_fillet_cube_next_adjacent() {
     |> fillet({radius: 2, tags: [getNextAdjacentEdge("thing3", %)]}, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image(
         "tests/executor/outputs/basic_fillet_cube_next_adjacent.png",
         &result,
@@ -314,7 +295,7 @@ async fn serial_test_basic_fillet_cube_previous_adjacent() {
     |> fillet({radius: 2, tags: [getPreviousAdjacentEdge("thing3", %)]}, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image(
         "tests/executor/outputs/basic_fillet_cube_previous_adjacent.png",
         &result,
@@ -339,7 +320,7 @@ async fn serial_test_execute_with_function_sketch() {
 const fnBox = box(3, 6, 10)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/function_sketch.png", &result, 0.999);
 }
 
@@ -359,7 +340,7 @@ async fn serial_test_execute_with_function_sketch_with_position() {
 
 const thing = box([0,0], 3, 6, 10)"#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image(
         "tests/executor/outputs/function_sketch_with_position.png",
         &result,
@@ -380,7 +361,7 @@ async fn serial_test_execute_with_angled_line() {
   |> extrude(4, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/angled_line.png", &result, 0.999);
 }
 
@@ -406,7 +387,7 @@ const bracket = startSketchOn('XY')
   |> extrude(width, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/parametric.png", &result, 0.999);
 }
 
@@ -440,7 +421,7 @@ const bracket = startSketchAt([0, 0])
   |> extrude(width, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/parametric_with_tan_arc.png", &result, 0.999);
 }
 
@@ -455,7 +436,7 @@ async fn serial_test_execute_engine_error_return() {
   |> extrude(4, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await;
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await;
     assert!(result.is_err());
     assert_eq!(
         result.err().unwrap().to_string(),
@@ -468,7 +449,7 @@ async fn serial_test_execute_i_shape() {
     // This is some code from lee that starts a pipe expression with a variable.
     let code = include_str!("inputs/i_shape.kcl");
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/i_shape.png", &result, 0.999);
 }
 
@@ -477,7 +458,7 @@ async fn serial_test_execute_i_shape() {
 async fn serial_test_execute_pipes_on_pipes() {
     let code = include_str!("inputs/pipes_on_pipes.kcl");
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/pipes_on_pipes.png", &result, 0.999);
 }
 
@@ -485,7 +466,7 @@ async fn serial_test_execute_pipes_on_pipes() {
 async fn serial_test_execute_cylinder() {
     let code = include_str!("inputs/cylinder.kcl");
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/cylinder.png", &result, 0.999);
 }
 
@@ -493,7 +474,7 @@ async fn serial_test_execute_cylinder() {
 async fn serial_test_execute_kittycad_svg() {
     let code = include_str!("inputs/kittycad_svg.kcl");
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/kittycad_svg.png", &result, 0.999);
 }
 
@@ -518,7 +499,7 @@ const pt1 = b1.value[0]
 const pt2 = b2.value[0]
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image(
         "tests/executor/outputs/member_expression_sketch_group.png",
         &result,
@@ -534,7 +515,7 @@ async fn serial_test_helix_defaults() {
      |> helix({revolutions: 16, angle_start: 0}, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/helix_defaults.png", &result, 1.0);
 }
 
@@ -546,7 +527,7 @@ async fn serial_test_helix_defaults_negative_extrude() {
      |> helix({revolutions: 16, angle_start: 0}, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image(
         "tests/executor/outputs/helix_defaults_negative_extrude.png",
         &result,
@@ -562,7 +543,7 @@ async fn serial_test_helix_ccw() {
      |> helix({revolutions: 16, angle_start: 0, ccw: true}, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/helix_ccw.png", &result, 1.0);
 }
 
@@ -574,7 +555,7 @@ async fn serial_test_helix_with_length() {
      |> helix({revolutions: 16, angle_start: 0, length: 3}, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/helix_with_length.png", &result, 1.0);
 }
 
@@ -589,7 +570,7 @@ async fn serial_test_dimensions_match() {
   |> extrude(10, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/dimensions_match.png", &result, 1.0);
 }
 
@@ -606,7 +587,7 @@ const body = startSketchOn('XY')
       |> extrude(height, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/close_arc.png", &result, 0.999);
 }
 
@@ -632,7 +613,7 @@ box(10, 23, 8)
 let thing = box(-12, -15, 10)
 box(-20, -5, 10)"#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/negative_args.png", &result, 0.999);
 }
 
@@ -645,7 +626,7 @@ async fn serial_test_basic_tangential_arc() {
     |> extrude(10, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/tangential_arc.png", &result, 0.999);
 }
 
@@ -658,7 +639,7 @@ async fn serial_test_basic_tangential_arc_with_point() {
     |> extrude(10, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/tangential_arc_with_point.png", &result, 0.999);
 }
 
@@ -671,7 +652,7 @@ async fn serial_test_basic_tangential_arc_to() {
     |> extrude(10, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/tangential_arc_to.png", &result, 0.999);
 }
 
@@ -698,7 +679,7 @@ box(30, 43, 18, '-xy')
 let thing = box(-12, -15, 10, 'yz')
 box(-20, -5, 10, 'xy')"#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image(
         "tests/executor/outputs/different_planes_same_drawing.png",
         &result,
@@ -760,7 +741,7 @@ const part004 = startSketchOn('YZ')
   |> close(%)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/lots_of_planes.png", &result, 0.999);
 }
 
@@ -777,7 +758,7 @@ async fn serial_test_holes() {
   |> extrude(2, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/holes.png", &result, 0.999);
 }
 
@@ -796,7 +777,7 @@ async fn optional_params() {
 
 const thing = other_circle([2, 2], 20)
 "#;
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/optional_params.png", &result, 0.999);
 }
 
@@ -832,7 +813,7 @@ const part = roundedRectangle([0, 0], 20, 20, 4)
   |> extrude(2, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/rounded_with_holes.png", &result, 0.999);
 }
 
@@ -840,7 +821,7 @@ const part = roundedRectangle([0, 0], 20, 20, 4)
 async fn serial_test_top_level_expression() {
     let code = r#"startSketchOn('XY') |> circle([0,0], 22, %) |> extrude(14, %)"#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/top_level_expression.png", &result, 0.999);
 }
 
@@ -854,7 +835,7 @@ const part =  startSketchOn('XY')
     |> extrude(1, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image(
         "tests/executor/outputs/patterns_linear_basic_with_math.png",
         &result,
@@ -870,7 +851,7 @@ async fn serial_test_patterns_linear_basic() {
     |> extrude(1, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/patterns_linear_basic.png", &result, 0.999);
 }
 
@@ -886,7 +867,7 @@ async fn serial_test_patterns_linear_basic_3d() {
     |> patternLinear3d({axis: [1, 0, 1], repetitions: 3, distance: 6}, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/patterns_linear_basic_3d.png", &result, 0.999);
 }
 
@@ -898,7 +879,7 @@ async fn serial_test_patterns_linear_basic_negative_distance() {
     |> extrude(1, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image(
         "tests/executor/outputs/patterns_linear_basic_negative_distance.png",
         &result,
@@ -914,7 +895,7 @@ async fn serial_test_patterns_linear_basic_negative_axis() {
     |> extrude(1, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image(
         "tests/executor/outputs/patterns_linear_basic_negative_axis.png",
         &result,
@@ -939,7 +920,7 @@ const rectangle = startSketchOn('XY')
 
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/patterns_linear_basic_holes.png", &result, 0.999);
 }
 
@@ -951,7 +932,7 @@ async fn serial_test_patterns_circular_basic_2d() {
     |> extrude(1, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/patterns_circular_basic_2d.png", &result, 0.999);
 }
 
@@ -967,7 +948,7 @@ async fn serial_test_patterns_circular_basic_3d() {
     |> patternCircular3d({axis: [0,0, 1], center: [-20, -20, -20], repetitions: 40, arcDegrees: 360, rotateDuplicates: false}, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/patterns_circular_basic_3d.png", &result, 0.999);
 }
 
@@ -983,7 +964,7 @@ async fn serial_test_patterns_circular_3d_tilted_axis() {
     |> patternCircular3d({axis: [1,1,0], center: [10, 0, 10], repetitions: 10, arcDegrees: 360, rotateDuplicates: true}, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image(
         "tests/executor/outputs/patterns_circular_3d_tilted_axis.png",
         &result,
@@ -995,7 +976,7 @@ async fn serial_test_patterns_circular_3d_tilted_axis() {
 async fn serial_test_import_file_doesnt_exist() {
     let code = r#"const model = import("thing.obj")"#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await;
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await;
     assert!(result.is_err());
     assert_eq!(
         result.err().unwrap().to_string(),
@@ -1007,7 +988,7 @@ async fn serial_test_import_file_doesnt_exist() {
 async fn serial_test_import_obj_with_mtl() {
     let code = r#"const model = import("tests/executor/inputs/cube.obj")"#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/import_obj_with_mtl.png", &result, 0.999);
 }
 
@@ -1015,7 +996,7 @@ async fn serial_test_import_obj_with_mtl() {
 async fn serial_test_import_obj_with_mtl_units() {
     let code = r#"const model = import("tests/executor/inputs/cube.obj", {type: "obj", units: "m"})"#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/import_obj_with_mtl_units.png", &result, 0.999);
 }
 
@@ -1023,7 +1004,7 @@ async fn serial_test_import_obj_with_mtl_units() {
 async fn serial_test_import_gltf_with_bin() {
     let code = r#"const model = import("tests/executor/inputs/cube.gltf")"#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/import_gltf_with_bin.png", &result, 0.999);
 }
 
@@ -1031,7 +1012,7 @@ async fn serial_test_import_gltf_with_bin() {
 async fn serial_test_import_gltf_embedded() {
     let code = r#"const model = import("tests/executor/inputs/cube-embedded.gltf")"#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/import_gltf_embedded.png", &result, 0.999);
 }
 
@@ -1039,7 +1020,7 @@ async fn serial_test_import_gltf_embedded() {
 async fn serial_test_import_glb() {
     let code = r#"const model = import("tests/executor/inputs/cube.glb")"#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/import_glb.png", &result, 0.999);
 }
 
@@ -1047,7 +1028,7 @@ async fn serial_test_import_glb() {
 async fn serial_test_import_glb_no_assign() {
     let code = r#"import("tests/executor/inputs/cube.glb")"#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/import_glb_no_assign.png", &result, 0.999);
 }
 
@@ -1055,7 +1036,7 @@ async fn serial_test_import_glb_no_assign() {
 async fn serial_test_import_ext_doesnt_match() {
     let code = r#"const model = import("tests/executor/inputs/cube.gltf", {type: "obj", units: "m"})"#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await;
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await;
     assert!(result.is_err());
     assert_eq!(
         result.err().unwrap().to_string(),
@@ -1080,7 +1061,7 @@ async fn serial_test_cube_mm() {
 const myCube = cube([0,0], 10)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/cube_mm.png", &result, 1.0);
 }
 
@@ -1213,7 +1194,7 @@ const part002 = startSketchOn(part001, "here")
   |> extrude(1, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await;
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await;
 
     assert!(result.is_err());
     assert_eq!(
@@ -1254,7 +1235,7 @@ const part003 = startSketchOn(part002, "end")
   |> extrude(5, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/sketch_on_face_of_face.png", &result, 1.0);
 }
 
@@ -1271,7 +1252,7 @@ async fn serial_test_stdlib_kcl_error_right_code_path() {
   |> extrude(2, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await;
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await;
     assert!(result.is_err());
     assert_eq!(
         result.err().unwrap().to_string(),
@@ -1299,7 +1280,7 @@ const part002 = startSketchOn(part001, "end")
   |> extrude(5, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/sketch_on_face_circle.png", &result, 1.0);
 }
 
@@ -1323,7 +1304,7 @@ const part002 = startSketchOn(part001, "end")
   |> extrude(5, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/sketch_on_face_circle_tagged.png", &result, 1.0);
 }
 
@@ -1365,7 +1346,7 @@ const part = rectShape([0, 0], 20, 20)
      }, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await;
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await;
     assert!(result.is_err());
     assert_eq!(
         result.err().unwrap().to_string(),
@@ -1386,7 +1367,7 @@ async fn serial_test_big_number_angle_to_match_length_x() {
   |> extrude(10, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image(
         "tests/executor/outputs/big_number_angle_to_match_length_x.png",
         &result,
@@ -1407,7 +1388,7 @@ async fn serial_test_big_number_angle_to_match_length_y() {
   |> extrude(10, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image(
         "tests/executor/outputs/big_number_angle_to_match_length_y.png",
         &result,
@@ -1431,7 +1412,7 @@ async fn serial_test_simple_revolve() {
 
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/simple_revolve.png", &result, 1.0);
 }
 
@@ -1451,7 +1432,7 @@ async fn serial_test_simple_revolve_uppercase() {
 
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/simple_revolve_uppercase.png", &result, 1.0);
 }
 
@@ -1471,7 +1452,7 @@ async fn serial_test_simple_revolve_negative() {
 
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/simple_revolve_negative.png", &result, 1.0);
 }
 
@@ -1491,7 +1472,7 @@ async fn serial_test_revolve_bad_angle_low() {
 
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await;
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await;
 
     assert!(result.is_err());
     assert_eq!(
@@ -1516,7 +1497,7 @@ async fn serial_test_revolve_bad_angle_high() {
 
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await;
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await;
 
     assert!(result.is_err());
     assert_eq!(
@@ -1541,7 +1522,7 @@ async fn serial_test_simple_revolve_custom_angle() {
 
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/simple_revolve_custom_angle.png", &result, 1.0);
 }
 
@@ -1561,7 +1542,7 @@ async fn serial_test_simple_revolve_custom_axis() {
 
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/simple_revolve_custom_axis.png", &result, 1.0);
 }
 
@@ -1585,7 +1566,7 @@ const sketch001 = startSketchOn(box, "end")
 
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/revolve_on_edge.png", &result, 1.0);
 }
 
@@ -1609,7 +1590,7 @@ const sketch001 = startSketchOn(box, "revolveAxis")
 
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await;
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await;
 
     assert!(result.is_err());
     assert_eq!(
@@ -1636,7 +1617,7 @@ const sketch001 = startSketchOn(box, "END")
     }, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/revolve_on_face_circle_edge.png", &result, 1.0);
 }
 
@@ -1658,7 +1639,7 @@ const sketch001 = startSketchOn(box, "END")
     }, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/revolve_on_face_circle.png", &result, 1.0);
 }
 
@@ -1684,7 +1665,7 @@ const sketch001 = startSketchOn(box, "end")
   }, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/revolve_on_face.png", &result, 1.0);
 }
 
@@ -1698,7 +1679,7 @@ async fn serial_test_basic_revolve_circle() {
     }, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/basic_revolve_circle.png", &result, 1.0);
 }
 
@@ -1725,7 +1706,7 @@ const part002 = startSketchOn(part001, 'end')
     |> extrude(5, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/simple_revolve_sketch_on_edge.png", &result, 1.0);
 }
 
@@ -1786,7 +1767,7 @@ const plumbus1 = make_circle(p, 'b', [0, 0], 2.5)
       }, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/plumbus_fillets.png", &result, 1.0);
 }
 
@@ -1794,7 +1775,7 @@ const plumbus1 = make_circle(p, 'b', [0, 0], 2.5)
 async fn serial_test_empty_file_is_ok() {
     let code = r#""#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await;
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await;
     assert!(result.is_ok());
 }
 
@@ -1824,7 +1805,7 @@ async fn serial_test_member_expression_in_params() {
 capScrew([0, 0.5, 0], 50, 37.5, 50, 25)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/member_expression_in_params.png", &result, 1.0);
 }
 
@@ -1869,7 +1850,7 @@ const bracket = startSketchOn('XY')
      }, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await;
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await;
     assert!(result.is_err());
     assert_eq!(
         result.err().unwrap().to_string(),
@@ -1893,7 +1874,7 @@ const secondSketch = startSketchOn(part001, '')
   |> extrude(20, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await;
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await;
     assert!(result.is_err());
     assert_eq!(
         result.err().unwrap().to_string(),
@@ -1924,7 +1905,7 @@ const extrusion = startSketchOn('XY')
   |> extrude(height, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await;
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await;
     assert!(result.is_err());
     assert_eq!(
         result.err().unwrap().to_string(),
@@ -1942,7 +1923,7 @@ async fn serial_test_xz_plane() {
   |> extrude(5 + 7, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/xz_plane.png", &result, 1.0);
 }
 
@@ -1956,6 +1937,38 @@ async fn serial_test_neg_xz_plane() {
   |> extrude(5 + 7, %)
 "#;
 
-    let result = execute_and_snapshot(code, UnitLength::Mm).await.unwrap();
+    let result = snapshot_on_test_server(code.to_owned(), test_name!()).await.unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/neg_xz_plane.png", &result, 1.0);
 }
+
+async fn snapshot_on_test_server(code: String, test_name: &str) -> Result<image::DynamicImage> {
+    let default_addr = "0.0.0.0:3333";
+    let server_url = std::env::var("TEST_EXECUTOR_ADDR").unwrap_or(default_addr.to_owned());
+    let client = reqwest::Client::new();
+    let body = serde_json::json!({
+      "kcl_program": code,
+      "test_name": test_name,
+    });
+    let body = serde_json::to_vec(&body).unwrap();
+    let resp = match client.post(format!("http://{server_url}")).body(body).send().await {
+        Ok(r) => r,
+        Err(e) if e.is_connect() => {
+            eprintln!("Received a connection error. Is the test server running?");
+            eprintln!("If so, is it running at {server_url}?");
+            panic!("Connection error: {e}");
+        }
+        Err(e) => panic!("{e}"),
+    };
+    let status = resp.status();
+    let bytes = resp.bytes().await?;
+    if status.is_success() {
+        let img = ImageReader::new(Cursor::new(bytes)).with_guessed_format()?.decode()?;
+        Ok(img)
+    } else if status == hyper::StatusCode::BAD_GATEWAY {
+        let err = String::from_utf8(bytes.into()).unwrap();
+        anyhow::bail!("{err}")
+    } else {
+        let err = String::from_utf8(bytes.into()).unwrap();
+        panic!("{err}");
+    }
+}