try

* adding dark edge lines in light mode + enabling SSAO

* A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu)

* Rerun CI

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Frank Noirot <frank@zoo.dev>
Co-authored-by: Frank Noirot <frank@kittycad.io>

.env.development

@@ -1,5 +1,6 @@
 VITE_KC_API_WS_MODELING_URL=wss://api.dev.zoo.dev/ws/modeling/commands
 VITE_KC_API_BASE_URL=https://api.dev.zoo.dev
 VITE_KC_SITE_BASE_URL=https://dev.zoo.dev
+VITE_KC_WASM_OVERRIDE_URL=""
 VITE_KC_SKIP_AUTH=false
 VITE_KC_CONNECTION_TIMEOUT_MS=5000

.env.production

@@ -1,5 +1,6 @@
 VITE_KC_API_WS_MODELING_URL=wss://api.zoo.dev/ws/modeling/commands
 VITE_KC_API_BASE_URL=https://api.zoo.dev
 VITE_KC_SITE_BASE_URL=https://zoo.dev
+VITE_KC_WASM_OVERRIDE_URL=""
 VITE_KC_SKIP_AUTH=false
 VITE_KC_CONNECTION_TIMEOUT_MS=15000

.github/workflows/playwright.yml

@@ -14,9 +14,31 @@ permissions:
   pull-requests: write
 
 jobs:
+  check-wasm-lib-changes:
+    runs-on: ubuntu-latest
+    outputs:
+      url: ${{ steps.set-output.outputs.url }}
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0 # Fetches all history for all branches and tags
+
+      - name: Check for changes in src/wasm-lib
+        id: set-output
+        run: |
+          if git diff --quiet origin/main...HEAD -- src/wasm-lib; then
+            echo "url=https://app.zoo.dev" >> $GITHUB_OUTPUT
+            echo "No changes detected in src/wasm-lib"
+          else
+            echo "Changes detected in src/wasm-lib"
+            echo "url=" >> $GITHUB_OUTPUT
+          fi
+
+
   playwright-ubuntu:
     timeout-minutes: 60
     runs-on: ubuntu-latest-8-cores
+    needs: check-wasm-lib-changes
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
@@ -28,13 +50,19 @@ jobs:
       run: yarn
     - name: Install Playwright Browsers
       run: yarn playwright install --with-deps
+    - name: Print WASM Lib Changes URL
+      run: |
+        echo "WASM Lib Changes URL: ${{ needs.check-wasm-lib-changes.outputs.url }}"
     - name: Setup Rust
+      if: ${{ needs.check-wasm-lib-changes.outputs.url }} == ''
       uses: dtolnay/rust-toolchain@stable
     - name: Cache wasm
+      if: ${{ needs.check-wasm-lib-changes.outputs.url }} == ''
       uses: Swatinem/rust-cache@v2
       with:
         workspaces: './src/wasm-lib'
     - name: build wasm
+      if: ${{ needs.check-wasm-lib-changes.outputs.url }} == ''
       run: yarn build:wasm
     - name: build web
       run: yarn build:local
@@ -44,6 +72,7 @@ jobs:
         CI: true
         token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
         snapshottoken: ${{ secrets.KITTYCAD_API_TOKEN }}
+        WASM_OVERRIDE: ${{ steps.check-wasm-lib-changes.outputs.url }}
     - uses: actions/upload-artifact@v3
       if: always()
       with:
@@ -79,6 +108,7 @@ jobs:
       env:
         CI: true
         token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
+        WASM_OVERRIDE: ${{ steps.check-wasm-lib-changes.outputs.url }}
     - uses: actions/upload-artifact@v3
       if: always()
       with:
@@ -89,6 +119,7 @@ jobs:
   playwright-macos:
     timeout-minutes: 60
     runs-on: macos-14
+    needs: check-wasm-lib-changes
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
@@ -100,12 +131,15 @@ jobs:
     - name: Install Playwright Browsers
       run: yarn playwright install --with-deps
     - name: Setup Rust
+      if: needs.check-wasm-lib-changes.outputs.url == ''
       uses: dtolnay/rust-toolchain@stable
     - name: Cache wasm
+      if: needs.check-wasm-lib-changes.outputs.url == ''
       uses: Swatinem/rust-cache@v2
       with:
         workspaces: './src/wasm-lib'
     - name: build wasm
+      if: needs.check-wasm-lib-changes.outputs.url == ''
       run: yarn build:wasm
     - name: build web
       run: yarn build:local
@@ -116,6 +150,7 @@ jobs:
       env:
         CI: true
         token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
+        WASM_OVERRIDE: ${{ steps.check-wasm-lib-changes.outputs.url }}
     - uses: actions/upload-artifact@v3
       if: always()
       with:

e2e/playwright/flow-tests.spec.ts

@@ -565,7 +565,9 @@ test('Auto complete works', async ({ page }) => {
 
   await page.keyboard.press('Tab')
   await page.keyboard.type('12')
+  await page.waitForTimeout(100)
   await page.keyboard.press('Tab')
+  await page.waitForTimeout(100)
   await page.keyboard.press('Tab')
   await page.keyboard.press('Tab')
   await page.keyboard.press('Enter')
@@ -1033,6 +1035,7 @@ const part001 = startSketchOn('-XZ')
 })
 
 test('Can add multiple sketches', async ({ page }) => {
+  test.skip(process.platform === 'darwin', 'Can add multiple sketches')
   const u = getUtils(page)
   await page.setViewportSize({ width: 1200, height: 500 })
   const PUR = 400 / 37.5 //pixeltoUnitRatio

e2e/playwright/storageStates.ts

@@ -7,6 +7,7 @@ export const TEST_SETTINGS = {
     theme: Themes.Dark,
     onboardingStatus: 'dismissed',
     projectDirectory: '',
+    enableSSAO: false,
   },
   modeling: {
     defaultUnit: 'in',

e2e/playwright/test-utils.ts

@@ -6,7 +6,7 @@ import { PNG } from 'pngjs'
 
 async function waitForPageLoad(page: Page) {
   // wait for 'Loading stream...' spinner
-  // await page.getByTestId('loading-stream').waitFor()
+  await page.getByTestId('loading-stream').waitFor()
   // wait for all spinners to be gone
   await page.getByTestId('loading').waitFor({ state: 'detached' })
 

playwright.config.ts

@@ -18,7 +18,7 @@ export default defineConfig({
   /* Retry on CI only */
   retries: process.env.CI ? 3 : 0,
   /* Opt out of parallel tests on CI. */
-  workers: process.env.CI ? 1 : 1,
+  workers: process.env.CI ? 2 : 1,
   /* Reporter to use. See https://playwright.dev/docs/test-reporters */
   reporter: 'html',
   /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
@@ -72,7 +72,7 @@ export default defineConfig({
 
   /* Run your local dev server before starting the tests */
   webServer: {
-    command: 'yarn serve',
+    command: 'VITE_KC_WASM_OVERRIDE_URL=$WASM_OVERRIDE yarn serve',
     // url: 'http://127.0.0.1:3000',
     reuseExistingServer: !process.env.CI,
   },

src-tauri/Cargo.lock

@@ -1592,7 +1592,7 @@ version = "0.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc"
 dependencies = [
- "heck",
+ "heck 0.4.1",
  "proc-macro-crate 2.0.2",
  "proc-macro-error",
  "proc-macro2",
@@ -1735,6 +1735,12 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
 [[package]]
 name = "hermit-abi"
 version = "0.2.6"
@@ -2199,9 +2205,9 @@ dependencies = [
 
 [[package]]
 name = "kittycad"
-version = "0.2.67"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc460442c165c8e707b1154551cefd08938d10bb80c78940e10cd9869487c325"
+checksum = "ddc922f0da3abc22661bf49423c9bfcc02ce6ae92dae007ede6990874789545b"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -4322,7 +4328,7 @@ version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
 dependencies = [
- "heck",
+ "heck 0.4.1",
  "proc-macro2",
  "quote",
  "rustversion",
@@ -4411,7 +4417,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5fa6fb9ee296c0dc2df41a656ca7948546d061958115ddb0bcaae43ad0d17d2"
 dependencies = [
  "cfg-expr",
- "heck",
+ "heck 0.4.1",
  "pkg-config",
  "toml 0.7.8",
  "version-compare",
@@ -4508,7 +4514,7 @@ dependencies = [
  "getrandom 0.2.14",
  "glob",
  "gtk",
- "heck",
+ "heck 0.4.1",
  "http 1.1.0",
  "jni",
  "libc",
@@ -4543,15 +4549,15 @@ dependencies = [
 
 [[package]]
 name = "tauri-build"
-version = "2.0.0-beta.12"
+version = "2.0.0-beta.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33de24aabe2b9c340d67005800cb6dd40aac5283126a42896fc8eec0b87cbe45"
+checksum = "abcf98a9b4527567c3e5ca9723431d121e001c2145651b3fa044d22b5e025a7e"
 dependencies = [
  "anyhow",
  "cargo_toml",
  "dirs-next",
  "glob",
- "heck",
+ "heck 0.5.0",
  "json-patch",
  "schemars",
  "semver",
@@ -4596,7 +4602,7 @@ version = "2.0.0-beta.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b096f63f2724a1280ae0f5a34d0731de18ca18305e2ef6e5e9a39bb2710e8a85"
 dependencies = [
- "heck",
+ "heck 0.4.1",
  "proc-macro2",
  "quote",
  "syn 2.0.48",
@@ -4623,9 +4629,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-dialog"
-version = "2.0.0-beta.5"
+version = "2.0.0-beta.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db4476c824a1488a52f4672d2b419a71fbf3dc97249013ef3c2c08fae2a23b71"
+checksum = "87caf6f2b704b0d27b4c64ef1fdd1f6ef97e2f5293216e230ad1efe61de54131"
 dependencies = [
  "dunce",
  "log",
@@ -4641,9 +4647,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-fs"
-version = "2.0.0-beta.5"
+version = "2.0.0-beta.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c138126392c350aa68554e3461529b02680062c9146ab7b41d3ef97a2deaf93b"
+checksum = "609f53d90f08808679ecdd81455d9a4d0053291b92780695569f7400fdba27d5"
 dependencies = [
  "anyhow",
  "glob",
@@ -4660,9 +4666,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-http"
-version = "2.0.0-beta.5"
+version = "2.0.0-beta.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f27b2c90ed5473e1c068f523927fa0024212bc3a3f3a47c2a9c0b10b4b2e3ee4"
+checksum = "b7c32962a2e2141b3bc034e5c04f363635965e59435794b6bdcf97a027f0925a"
 dependencies = [
  "data-url",
  "http 1.1.0",
@@ -4800,16 +4806,16 @@ dependencies = [
 
 [[package]]
 name = "tauri-utils"
-version = "2.0.0-beta.12"
+version = "2.0.0-beta.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "760ac613d7f0de95067bcbcbcea175fe1df88fc4ab59c7f0b2cc2d01dc16a199"
+checksum = "d4709765385f035338ecc330f3fba753b8ee283c659c235da9768949cdb25469"
 dependencies = [
  "brotli",
  "cargo_metadata",
  "ctor",
  "dunce",
  "glob",
- "heck",
+ "heck 0.5.0",
  "html5ever",
  "infer",
  "json-patch",

src-tauri/Cargo.toml

@@ -12,18 +12,18 @@ rust-version = "1.70"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = { version = "2.0.0-beta.12", features = [] }
+tauri-build = { version = "2.0.0-beta.13", features = [] }
 
 [dependencies]
 anyhow = "1"
-kittycad = "0.2.67"
+kittycad = "0.3.0"
 oauth2 = "4.4.2"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 tauri = { version = "2.0.0-beta.15", features = [ "devtools", "unstable"] }
-tauri-plugin-dialog = { version = "2.0.0-beta.5" }
+tauri-plugin-dialog = { version = "2.0.0-beta.6" }
-tauri-plugin-fs = { version = "2.0.0-beta.5" }
+tauri-plugin-fs = { version = "2.0.0-beta.6" }
-tauri-plugin-http = { version = "2.0.0-beta.5" }
+tauri-plugin-http = { version = "2.0.0-beta.6" }
 tauri-plugin-os = { version = "2.0.0-beta.2" }
 tauri-plugin-process = { version = "2.0.0-beta.2" }
 tauri-plugin-shell = { version = "2.0.0-beta.2" }

src/components/CommandBar/CommandBarSelectionInput.tsx

@@ -3,13 +3,12 @@ import { useCommandsContext } from 'hooks/useCommandsContext'
 import { useKclContext } from 'lang/KclProvider'
 import { CommandArgument } from 'lib/commandTypes'
 import {
-  ResolvedSelectionType,
   canSubmitSelectionArg,
   getSelectionType,
   getSelectionTypeDisplayText,
 } from 'lib/selections'
 import { modelingMachine } from 'machines/modelingMachine'
-import { useEffect, useRef, useState } from 'react'
+import { useCallback, useEffect, useRef, useState } from 'react'
 import { useHotkeys } from 'react-hotkeys-hook'
 import { StateFrom } from 'xstate'
 
@@ -30,13 +29,13 @@ function CommandBarSelectionInput({
   const { commandBarState, commandBarSend } = useCommandsContext()
   const [hasSubmitted, setHasSubmitted] = useState(false)
   const selection = useSelector(arg.machineActor, selectionSelector)
-  const [selectionsByType, setSelectionsByType] = useState<
+  const initSelectionsByType = useCallback(() => {
-    'none' | ResolvedSelectionType[]
+    const selectionRangeEnd = selection.codeBasedSelections[0]?.range[1]
-  >(
+    return !selectionRangeEnd || selectionRangeEnd === code.length
-    selection.codeBasedSelections[0]?.range[1] === code.length
       ? 'none'
       : getSelectionType(selection)
-  )
+  }, [selection, code])
+  const selectionsByType = initSelectionsByType()
   const [canSubmitSelection, setCanSubmitSelection] = useState<boolean>(
     canSubmitSelectionArg(selectionsByType, arg)
   )
@@ -51,17 +50,14 @@ function CommandBarSelectionInput({
     inputRef.current?.focus()
   }, [selection, inputRef])
 
-  useEffect(() => {
-    setSelectionsByType(
-      selection.codeBasedSelections[0]?.range[1] === code.length
-        ? 'none'
-        : getSelectionType(selection)
-    )
-  }, [selection])
-
   // Fast-forward through this arg if it's marked as skippable
   // and we have a valid selection already
   useEffect(() => {
+    console.log('selection input effect', {
+      selectionsByType,
+      canSubmitSelection,
+      arg,
+    })
     setCanSubmitSelection(canSubmitSelectionArg(selectionsByType, arg))
     const argValue = commandBarState.context.argumentsToSubmit[arg.name]
     if (canSubmitSelection && arg.skip && argValue === undefined) {

src/components/ModelingMachineProvider.tsx

@@ -77,7 +77,7 @@ export const ModelingMachineProvider = ({
     auth,
     settings: {
       context: {
-        app: { theme },
+        app: { theme, enableSSAO },
         modeling: { defaultUnit, highlightEdges },
       },
     },
@@ -87,6 +87,7 @@ export const ModelingMachineProvider = ({
   useSetupEngineManager(streamRef, token, {
     theme: theme.current,
     highlightEdges: highlightEdges.current,
+    enableSSAO: enableSSAO.current,
   })
   const { htmlRef } = useStore((s) => ({
     htmlRef: s.htmlRef,
@@ -267,10 +268,12 @@ export const ModelingMachineProvider = ({
         'has valid extrude selection': ({ selectionRanges }) => {
           // A user can begin extruding if they either have 1+ faces selected or nothing selected
           // TODO: I believe this guard only allows for extruding a single face at a time
-          if (selectionRanges.codeBasedSelections.length < 1) return false
           const isPipe = isSketchPipe(selectionRanges)
 
-          if (isSelectionLastLine(selectionRanges, codeManager.code))
+          if (
+            selectionRanges.codeBasedSelections.length === 0 ||
+            isSelectionLastLine(selectionRanges, codeManager.code)
+          )
             return true
           if (!isPipe) return false
 

src/components/ModelingSidebar/ModelingPanes/KclEditorPane.tsx

@@ -16,7 +16,6 @@ import {
   EditorView,
   dropCursor,
   drawSelection,
-  ViewUpdate,
 } from '@codemirror/view'
 import {
   indentWithTab,
@@ -191,9 +190,6 @@ export const KclEditorPane = () => {
     return extensions
   }, [kclLSP, copilotLSP, textWrapping.current, cursorBlinking.current])
 
-  let debounceTimer: ReturnType<typeof setTimeout> | null = null
-  const updateDelay = 100
-
   return (
     <div
       id="code-mirror-override"
@@ -206,17 +202,6 @@ export const KclEditorPane = () => {
         onCreateEditor={(_editorView) =>
           editorManager.setEditorView(_editorView)
         }
-        onUpdate={(view: ViewUpdate) => {
-          // debounce the view update.
-          // otherwise it is laggy for typing.
-          if (debounceTimer) {
-            clearTimeout(debounceTimer)
-          }
-
-          debounceTimer = setTimeout(() => {
-            editorManager.handleOnViewUpdate(view)
-          }, updateDelay)
-        }}
         indentWithTab={false}
         basicSetup={false}
       />

src/components/SettingsAuthProvider.tsx

@@ -7,7 +7,12 @@ import React, { createContext, useEffect } from 'react'
 import useStateMachineCommands from '../hooks/useStateMachineCommands'
 import { settingsMachine } from 'machines/settingsMachine'
 import { toast } from 'react-hot-toast'
-import { getThemeColorForEngine, setThemeClass, Themes } from 'lib/theme'
+import {
+  getThemeColorForEngine,
+  getOppositeTheme,
+  setThemeClass,
+  Themes,
+} from 'lib/theme'
 import decamelize from 'decamelize'
 import {
   AnyStateMachine,
@@ -99,6 +104,9 @@ export const SettingsAuthProviderBase = ({
     {
       context: loadedSettings,
       actions: {
+        //TODO: batch all these and if that's difficult to do from tsx,
+        // make it easy to do
+
         setClientSideSceneUnits: (context, event) => {
           const newBaseUnit =
             event.type === 'set.modeling.defaultUnit'
@@ -115,6 +123,16 @@ export const SettingsAuthProviderBase = ({
               color: getThemeColorForEngine(context.app.theme.current),
             },
           })
+
+          const opposingTheme = getOppositeTheme(context.app.theme.current)
+          engineCommandManager.sendSceneCommand({
+            cmd_id: uuidv4(),
+            type: 'modeling_cmd_req',
+            cmd: {
+              type: 'set_default_system_properties',
+              color: getThemeColorForEngine(opposingTheme),
+            },
+          })
         },
         setEngineEdges: (context) => {
           engineCommandManager.sendSceneCommand({

src/editor/plugins/lsp/plugin.ts

@@ -39,6 +39,8 @@ const CompletionItemKindMap = Object.fromEntries(
 ) as Record<CompletionItemKind, string>
 
 const changesDelay = 600
+let debounceTimer: ReturnType<typeof setTimeout> | null = null
+const updateDelay = 100
 
 export class LanguageServerPlugin implements PluginValue {
   public client: LanguageServerClient
@@ -47,6 +49,7 @@ export class LanguageServerPlugin implements PluginValue {
   public workspaceFolders: LSP.WorkspaceFolder[]
   private documentVersion: number
   private foldingRanges: LSP.FoldingRange[] | null = null
+  private viewUpdate: ViewUpdate | null = null
   private _defferer = deferExecution((code: string) => {
     try {
       // Update the state (not the editor) with the new code.
@@ -57,8 +60,9 @@ export class LanguageServerPlugin implements PluginValue {
         },
         contentChanges: [{ text: code }],
       })
-      if (editorManager.editorView) {
+
-        //editorManager.handleOnViewUpdate(editorManager.editorView)
+      if (this.viewUpdate) {
+        editorManager.handleOnViewUpdate(this.viewUpdate)
       }
     } catch (e) {
       console.error(e)
@@ -83,14 +87,27 @@ export class LanguageServerPlugin implements PluginValue {
     })
   }
 
-  update({ docChanged }: ViewUpdate) {
+  update(viewUpdate: ViewUpdate) {
-    if (!docChanged) return
+    this.viewUpdate = viewUpdate
+    if (!viewUpdate.docChanged) {
+      // debounce the view update.
+      // otherwise it is laggy for typing.
+      if (debounceTimer) {
+        clearTimeout(debounceTimer)
+      }
+
+      debounceTimer = setTimeout(() => {
+        editorManager.handleOnViewUpdate(viewUpdate)
+      }, updateDelay)
+      return
+    }
 
     const newCode = this.view.state.doc.toString()
 
     codeManager.code = newCode
     codeManager.writeToFile()
     kclManager.executeCode()
+
     this.sendChange({
       documentText: newCode,
     })

src/env.ts

@@ -7,5 +7,7 @@ export const VITE_KC_API_BASE_URL = import.meta.env.VITE_KC_API_BASE_URL
 export const VITE_KC_SITE_BASE_URL = import.meta.env.VITE_KC_SITE_BASE_URL
 export const VITE_KC_CONNECTION_TIMEOUT_MS = import.meta.env
   .VITE_KC_CONNECTION_TIMEOUT_MS
+export const VITE_KC_WASM_OVERRIDE_URL = import.meta.env
+  .VITE_KC_WASM_OVERRIDE_URL
 export const TEST = import.meta.env.TEST
 export const DEV = import.meta.env.DEV

src/hooks/useSetupEngineManager.ts

@@ -11,9 +11,11 @@ export function useSetupEngineManager(
   settings = {
     theme: Themes.System,
     highlightEdges: true,
+    enableSSAO: true,
   } as {
     theme: Themes
     highlightEdges: boolean
+    enableSSAO: boolean
   }
 ) {
   const {

src/lang/recast.test.ts

@@ -266,9 +266,9 @@ const mySk1 = startSketchAt([0, 0])
 
 
   |> rx(45, %)
-  /*
+/*
-  one more for good measure
+one more for good measure
-  */
+*/
 `
     const { ast } = code2ast(code)
     const recasted = recast(ast)
@@ -285,7 +285,7 @@ const mySk1 = startSketchAt([0, 0])
   // and another with just white space between others below
   |> ry(45, %)
   |> rx(45, %)
-  /* one more for good measure */
+/* one more for good measure */
 `)
   })
 })

src/lang/std/engineConnection.ts

@@ -4,7 +4,7 @@ import { Models } from '@kittycad/lib'
 import { exportSave } from 'lib/exportSave'
 import { uuidv4 } from 'lib/utils'
 import { getNodePathFromSourceRange } from 'lang/queryAst'
-import { Themes, getThemeColorForEngine } from 'lib/theme'
+import { Themes, getThemeColorForEngine, getOppositeTheme } from 'lib/theme'
 import { DefaultPlanes } from 'wasm-lib/kcl/bindings/DefaultPlanes'
 
 let lastMessage = ''
@@ -941,6 +941,7 @@ export class EngineCommandManager {
     settings = {
       theme: Themes.Dark,
       highlightEdges: true,
+      enableSSAO: true,
     },
   }: {
     setMediaStream: (stream: MediaStream) => void
@@ -953,6 +954,7 @@ export class EngineCommandManager {
     settings?: {
       theme: Themes
       highlightEdges: boolean
+      enableSSAO: boolean
     }
   }) {
     this.makeDefaultPlanes = makeDefaultPlanes
@@ -969,7 +971,8 @@ export class EngineCommandManager {
       return
     }
 
-    const url = `${VITE_KC_API_WS_MODELING_URL}?video_res_width=${width}&video_res_height=${height}`
+    const additionalSettings = settings.enableSSAO ? '&post_effect=ssao' : ''
+    const url = `${VITE_KC_API_WS_MODELING_URL}?video_res_width=${width}&video_res_height=${height}${additionalSettings}`
     this.engineConnection = new EngineConnection({
       engineCommandManager: this,
       url,
@@ -989,6 +992,18 @@ export class EngineCommandManager {
             color: getThemeColorForEngine(settings.theme),
           },
         })
+
+        // Sets the default line colors
+        const opposingTheme = getOppositeTheme(settings.theme)
+        this.sendSceneCommand({
+          cmd_id: uuidv4(),
+          type: 'modeling_cmd_req',
+          cmd: {
+            type: 'set_default_system_properties',
+            color: getThemeColorForEngine(opposingTheme),
+          },
+        })
+
         // Set the edge lines visibility
         this.sendSceneCommand({
           type: 'modeling_cmd_req',
@@ -1326,6 +1341,17 @@ export class EngineCommandManager {
     this.lastArtifactMap = this.artifactMap
     this.artifactMap = {}
     await this.initPlanes()
+    await this.sendSceneCommand({
+      type: 'modeling_cmd_req',
+      cmd_id: uuidv4(),
+      cmd: {
+        type: 'make_axes_gizmo',
+        clobber: false,
+        // If true, axes gizmo will be placed in the corner of the screen.
+        // If false, it will be placed at the origin of the scene.
+        gizmo_mode: true,
+      },
+    })
   }
   subscribeTo<T extends ModelTypes>({
     event,

src/lang/std/sketch.test.ts

@@ -102,7 +102,7 @@ describe('testing changeSketchArguments', () => {
   |> startProfileAt([0, 0], %)
   |> ${line}
   |> lineTo([0.46, -5.82], %)
-  // |> rx(45, %)
+// |> rx(45, %)
 `
     const code = genCode(lineToChange)
     const expectedCode = genCode(lineAfterChange)

src/lang/wasm.ts

@@ -25,7 +25,7 @@ import { AppInfo } from 'wasm-lib/kcl/bindings/AppInfo'
 import { CoreDumpManager } from 'lib/coredump'
 import openWindow from 'lib/openWindow'
 import { DefaultPlanes } from 'wasm-lib/kcl/bindings/DefaultPlanes'
-import { TEST } from 'env'
+import { TEST, VITE_KC_WASM_OVERRIDE_URL } from 'env'
 
 export type { Program } from '../wasm-lib/kcl/bindings/Program'
 export type { Value } from '../wasm-lib/kcl/bindings/Value'
@@ -76,18 +76,19 @@ export type { MemoryItem } from '../wasm-lib/kcl/bindings/MemoryItem'
 export type { ExtrudeSurface } from '../wasm-lib/kcl/bindings/ExtrudeSurface'
 
 export const wasmUrl = () => {
-  const baseUrl =
+  const baseUrl = VITE_KC_WASM_OVERRIDE_URL
-    typeof window === 'undefined'
+    ? VITE_KC_WASM_OVERRIDE_URL
-      ? 'http://127.0.0.1:3000'
+    : typeof window === 'undefined'
-      : window.location.origin.includes('tauri://localhost')
+    ? 'http://127.0.0.1:3000'
-      ? 'tauri://localhost' // custom protocol for macOS
+    : window.location.origin.includes('tauri://localhost')
-      : window.location.origin.includes('tauri.localhost')
+    ? 'tauri://localhost' // custom protocol for macOS
-      ? 'http://tauri.localhost' // fallback for Windows
+    : window.location.origin.includes('tauri.localhost')
-      : window.location.origin.includes('localhost')
+    ? 'http://tauri.localhost' // fallback for Windows
-      ? 'http://localhost:3000'
+    : window.location.origin.includes('localhost')
-      : window.location.origin && window.location.origin !== 'null'
+    ? 'http://localhost:3000'
-      ? window.location.origin
+    : window.location.origin && window.location.origin !== 'null'
-      : 'http://localhost:3000'
+    ? window.location.origin
+    : 'http://localhost:3000'
   const fullUrl = baseUrl + '/wasm_lib_bg.wasm'
   console.log(`Full URL for WASM: ${fullUrl}`)
 

src/lib/selections.ts

@@ -420,7 +420,13 @@ export function getSelectionTypeDisplayText(
   const selectionsByType = getSelectionType(selection)
 
   return (selectionsByType as Exclude<typeof selectionsByType, 'none'>)
-    .map(([type, count]) => `${count} ${type}${count > 1 ? 's' : ''}`)
+    .map(
+      // Hack for showing "face" instead of "extrude-wall" in command bar text
+      ([type, count]) =>
+        `${count} ${type.replace('extrude-wall', 'face')}${
+          count > 1 ? 's' : ''
+        }`
+    )
     .join(', ')
 }
 

src/lib/settings/initialSettings.tsx

@@ -156,6 +156,13 @@ export function createSettings() {
           </div>
         ),
       }),
+      enableSSAO: new Setting<boolean>({
+        defaultValue: true,
+        description:
+          'Whether or not Screen Space Ambient Occlusion (SSAO) is enabled',
+        validate: (v) => typeof v === 'boolean',
+        hideOnPlatform: 'both', //for now
+      }),
       onboardingStatus: new Setting<string>({
         defaultValue: '',
         validate: (v) => typeof v === 'string',

src/lib/theme.ts

@@ -23,6 +23,17 @@ export function setThemeClass(theme: Themes) {
   }
 }
 
+// Returns the resolved theme in use (Dark || Light)
+export function getResolvedTheme(theme: Themes) {
+  return theme === Themes.System ? getSystemTheme() : theme
+}
+
+// Returns the opposing theme
+export function getOppositeTheme(theme: Themes) {
+  const resolvedTheme = getResolvedTheme(theme)
+  return resolvedTheme === Themes.Dark ? Themes.Light : Themes.Dark
+}
+
 /**
  * The engine takes RGBA values from 0-1
  * So we convert from the conventional 0-255 found in Figma
@@ -30,7 +41,7 @@ export function setThemeClass(theme: Themes) {
  * @returns { r: number, g: number, b: number, a: number }
  */
 export function getThemeColorForEngine(theme: Themes) {
-  const resolvedTheme = theme === Themes.System ? getSystemTheme() : theme
+  const resolvedTheme = getResolvedTheme(theme)
   const dark = 28 / 255
   const light = 249 / 255
   return resolvedTheme === Themes.Dark

src/lib/useCalculateKclExpression.ts

@@ -31,9 +31,11 @@ export function useCalculateKclExpression({
   newVariableInsertIndex: number
   setNewVariableName: (a: string) => void
 } {
-  const { programMemory } = useKclContext()
+  const { programMemory, code } = useKclContext()
   const { context } = useModelingContext()
-  const selectionRange = context.selectionRanges.codeBasedSelections[0].range
+  const selectionRange:
+    | (typeof context.selectionRanges.codeBasedSelections)[number]['range']
+    | undefined = context.selectionRanges.codeBasedSelections[0]?.range
   const inputRef = useRef<HTMLInputElement>(null)
   const [availableVarInfo, setAvailableVarInfo] = useState<
     ReturnType<typeof findAllPreviousVariables>
@@ -67,7 +69,7 @@ export function useCalculateKclExpression({
     } else {
       setIsNewVariableNameUnique(true)
     }
-  }, [newVariableName])
+  }, [programMemory, newVariableName])
 
   useEffect(() => {
     if (!programMemory || !selectionRange) return
@@ -81,8 +83,8 @@ export function useCalculateKclExpression({
 
   useEffect(() => {
     const execAstAndSetResult = async () => {
-      const code = `const __result__ = ${value}`
+      const _code = `const __result__ = ${value}`
-      const ast = parse(code)
+      const ast = parse(_code)
       const _programMem: any = { root: {}, return: null }
       availableVarInfo.variables.forEach(({ key, value }) => {
         _programMem.root[key] = { type: 'userVal', value, __meta: [] }
@@ -111,7 +113,7 @@ export function useCalculateKclExpression({
       setCalcResult('NAN')
       setValueNode(null)
     })
-  }, [value, availableVarInfo])
+  }, [value, availableVarInfo, code, kclManager.programMemory])
 
   return {
     valueNode,

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

@@ -6,10 +6,10 @@
 serial-integration = { max-threads = 4 }
 
 [profile.default]
-slow-timeout = { period = "10s", terminate-after = 1 }
+slow-timeout = { period = "30s", terminate-after = 1 }
 
 [profile.ci]
-slow-timeout = { period = "30s", terminate-after = 5 }
+slow-timeout = { period = "50s", terminate-after = 5 }
 
 [[profile.default.overrides]]
 filter = "test(serial_test_)"

src/wasm-lib/Cargo.lock

@@ -927,7 +927,7 @@ dependencies = [
 
 [[package]]
 name = "derive-docs"
-version = "0.1.14"
+version = "0.1.16"
 dependencies = [
  "Inflector",
  "anyhow",
@@ -1854,7 +1854,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-lib"
-version = "0.1.47"
+version = "0.1.50"
 dependencies = [
  "anyhow",
  "approx 0.5.1",
@@ -1921,9 +1921,9 @@ dependencies = [
 
 [[package]]
 name = "kittycad"
-version = "0.2.67"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc460442c165c8e707b1154551cefd08938d10bb80c78940e10cd9869487c325"
+checksum = "ddc922f0da3abc22661bf49423c9bfcc02ce6ae92dae007ede6990874789545b"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -1959,9 +1959,9 @@ dependencies = [
 
 [[package]]
 name = "kittycad-execution-plan"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acf8ffb148bd09de8889a8a2b3075a23ee86446c3a6e1c6dcf66b40fdc778158"
+checksum = "ae99665cd699f8800da8ea4b01889c0c9c61619d2a9dc62d1d5028f1b21110bd"
 dependencies = [
  "bytes",
  "gltf-json",
@@ -2004,9 +2004,9 @@ dependencies = [
 
 [[package]]
 name = "kittycad-modeling-cmds"
-version = "0.2.19"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35bb4946fa7bbcfd5270448e31834286c62e30e0f4599ef102a5b63e63b1f50b"
+checksum = "e326955e8f315590a1926c17ff6a6082d3013f472c881aba56d73bfa170cf5b3"
 dependencies = [
  "anyhow",
  "chrono",
@@ -2044,9 +2044,9 @@ dependencies = [
 
 [[package]]
 name = "kittycad-modeling-session"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bae9bc47fcc3cc30727b35e738c35666b97e1e5f48f3f4c60ddaeccb69b66559"
+checksum = "241d45ca828af2953bf538f312a3e9d6fa7fe83055c90f6b6b9ffa76f53b6285"
 dependencies = [
  "futures",
  "kittycad",
@@ -3963,18 +3963,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.58"
+version = "1.0.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
+checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.58"
+version = "1.0.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
+checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
 dependencies = [
  "proc-macro2",
  "quote",

src/wasm-lib/Cargo.toml

@@ -61,12 +61,12 @@ members = [
 ]
 
 [workspace.dependencies]
-kittycad = { version = "0.2.67", default-features = false, features = ["js", "requests"] }
+kittycad = { version = "0.3.0", default-features = false, features = ["js", "requests"] }
-kittycad-execution-plan = "0.1.4"
+kittycad-execution-plan = "0.1.5"
 kittycad-execution-plan-macros = "0.1.9"
 kittycad-execution-plan-traits = "0.1.14"
-kittycad-modeling-cmds = "0.2.19"
+kittycad-modeling-cmds = "0.2.21"
-kittycad-modeling-session = "0.1.3"
+kittycad-modeling-session = "0.1.4"
 
 [[test]]
 name = "executor"

src/wasm-lib/derive-docs/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "derive-docs"
 description = "A tool for generating documentation from Rust derive macros"
-version = "0.1.14"
+version = "0.1.16"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/KittyCAD/modeling-app"

src/wasm-lib/derive-docs/src/lib.rs

@@ -788,17 +788,14 @@ fn generate_code_block_test(
 
             ctx.run(program, None).await.unwrap();
 
-            let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
+            // Zoom to fit.
-
             ctx.engine
                 .send_modeling_cmd(
                     uuid::Uuid::new_v4(),
                     crate::executor::SourceRange::default(),
-                    kittycad::types::ModelingCmd::DefaultCameraLookAt {
+                    kittycad::types::ModelingCmd::ZoomToFit {
-                        center: kittycad::types::Point3D { x: 0.0, y: 0.0, z: 0.0 },
+                        object_ids: Default::default(),
-                        up: kittycad::types::Point3D { x: 0.0, y: 0.0, z: 1.0 },
+                        padding: 0.1,
-                        vantage: kittycad::types::Point3D { x: 0.0, y: -x, z: y },
-                        sequence: None,
                     },
                 )
                 .await.unwrap();

src/wasm-lib/derive-docs/tests/array.gen

@@ -33,28 +33,13 @@ mod test_examples_show {
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
-        let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
         ctx.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
                 crate::executor::SourceRange::default(),
-                kittycad::types::ModelingCmd::DefaultCameraLookAt {
+                kittycad::types::ModelingCmd::ZoomToFit {
-                    center: kittycad::types::Point3D {
+                    object_ids: Default::default(),
-                        x: 0.0,
+                    padding: 0.1,
-                        y: 0.0,
-                        z: 0.0,
-                    },
-                    up: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 1.0,
-                    },
-                    vantage: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: -x,
-                        z: y,
-                    },
-                    sequence: None,
                 },
             )
             .await
@@ -125,28 +110,13 @@ mod test_examples_show {
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
-        let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
         ctx.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
                 crate::executor::SourceRange::default(),
-                kittycad::types::ModelingCmd::DefaultCameraLookAt {
+                kittycad::types::ModelingCmd::ZoomToFit {
-                    center: kittycad::types::Point3D {
+                    object_ids: Default::default(),
-                        x: 0.0,
+                    padding: 0.1,
-                        y: 0.0,
-                        z: 0.0,
-                    },
-                    up: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 1.0,
-                    },
-                    vantage: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: -x,
-                        z: y,
-                    },
-                    sequence: None,
                 },
             )
             .await

src/wasm-lib/derive-docs/tests/box.gen

@@ -33,28 +33,13 @@ mod test_examples_show {
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
-        let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
         ctx.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
                 crate::executor::SourceRange::default(),
-                kittycad::types::ModelingCmd::DefaultCameraLookAt {
+                kittycad::types::ModelingCmd::ZoomToFit {
-                    center: kittycad::types::Point3D {
+                    object_ids: Default::default(),
-                        x: 0.0,
+                    padding: 0.1,
-                        y: 0.0,
-                        z: 0.0,
-                    },
-                    up: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 1.0,
-                    },
-                    vantage: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: -x,
-                        z: y,
-                    },
-                    sequence: None,
                 },
             )
             .await

src/wasm-lib/derive-docs/tests/doc_comment_with_code.gen

@@ -34,28 +34,13 @@ mod test_examples_my_func {
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
-        let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
         ctx.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
                 crate::executor::SourceRange::default(),
-                kittycad::types::ModelingCmd::DefaultCameraLookAt {
+                kittycad::types::ModelingCmd::ZoomToFit {
-                    center: kittycad::types::Point3D {
+                    object_ids: Default::default(),
-                        x: 0.0,
+                    padding: 0.1,
-                        y: 0.0,
-                        z: 0.0,
-                    },
-                    up: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 1.0,
-                    },
-                    vantage: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: -x,
-                        z: y,
-                    },
-                    sequence: None,
                 },
             )
             .await
@@ -126,28 +111,13 @@ mod test_examples_my_func {
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
-        let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
         ctx.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
                 crate::executor::SourceRange::default(),
-                kittycad::types::ModelingCmd::DefaultCameraLookAt {
+                kittycad::types::ModelingCmd::ZoomToFit {
-                    center: kittycad::types::Point3D {
+                    object_ids: Default::default(),
-                        x: 0.0,
+                    padding: 0.1,
-                        y: 0.0,
-                        z: 0.0,
-                    },
-                    up: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 1.0,
-                    },
-                    vantage: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: -x,
-                        z: y,
-                    },
-                    sequence: None,
                 },
             )
             .await

src/wasm-lib/derive-docs/tests/doc_comment_with_code_on_ignored_function.gen

@@ -35,28 +35,13 @@ mod test_examples_import {
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
-        let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
         ctx.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
                 crate::executor::SourceRange::default(),
-                kittycad::types::ModelingCmd::DefaultCameraLookAt {
+                kittycad::types::ModelingCmd::ZoomToFit {
-                    center: kittycad::types::Point3D {
+                    object_ids: Default::default(),
-                        x: 0.0,
+                    padding: 0.1,
-                        y: 0.0,
-                        z: 0.0,
-                    },
-                    up: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 1.0,
-                    },
-                    vantage: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: -x,
-                        z: y,
-                    },
-                    sequence: None,
                 },
             )
             .await
@@ -128,28 +113,13 @@ mod test_examples_import {
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
-        let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
         ctx.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
                 crate::executor::SourceRange::default(),
-                kittycad::types::ModelingCmd::DefaultCameraLookAt {
+                kittycad::types::ModelingCmd::ZoomToFit {
-                    center: kittycad::types::Point3D {
+                    object_ids: Default::default(),
-                        x: 0.0,
+                    padding: 0.1,
-                        y: 0.0,
-                        z: 0.0,
-                    },
-                    up: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 1.0,
-                    },
-                    vantage: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: -x,
-                        z: y,
-                    },
-                    sequence: None,
                 },
             )
             .await

src/wasm-lib/derive-docs/tests/lineTo.gen

@@ -34,28 +34,13 @@ mod test_examples_line_to {
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
-        let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
         ctx.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
                 crate::executor::SourceRange::default(),
-                kittycad::types::ModelingCmd::DefaultCameraLookAt {
+                kittycad::types::ModelingCmd::ZoomToFit {
-                    center: kittycad::types::Point3D {
+                    object_ids: Default::default(),
-                        x: 0.0,
+                    padding: 0.1,
-                        y: 0.0,
-                        z: 0.0,
-                    },
-                    up: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 1.0,
-                    },
-                    vantage: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: -x,
-                        z: y,
-                    },
-                    sequence: None,
                 },
             )
             .await
@@ -126,28 +111,13 @@ mod test_examples_line_to {
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
-        let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
         ctx.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
                 crate::executor::SourceRange::default(),
-                kittycad::types::ModelingCmd::DefaultCameraLookAt {
+                kittycad::types::ModelingCmd::ZoomToFit {
-                    center: kittycad::types::Point3D {
+                    object_ids: Default::default(),
-                        x: 0.0,
+                    padding: 0.1,
-                        y: 0.0,
-                        z: 0.0,
-                    },
-                    up: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 1.0,
-                    },
-                    vantage: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: -x,
-                        z: y,
-                    },
-                    sequence: None,
                 },
             )
             .await

src/wasm-lib/derive-docs/tests/min.gen

@@ -33,28 +33,13 @@ mod test_examples_min {
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
-        let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
         ctx.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
                 crate::executor::SourceRange::default(),
-                kittycad::types::ModelingCmd::DefaultCameraLookAt {
+                kittycad::types::ModelingCmd::ZoomToFit {
-                    center: kittycad::types::Point3D {
+                    object_ids: Default::default(),
-                        x: 0.0,
+                    padding: 0.1,
-                        y: 0.0,
-                        z: 0.0,
-                    },
-                    up: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 1.0,
-                    },
-                    vantage: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: -x,
-                        z: y,
-                    },
-                    sequence: None,
                 },
             )
             .await
@@ -125,28 +110,13 @@ mod test_examples_min {
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
-        let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
         ctx.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
                 crate::executor::SourceRange::default(),
-                kittycad::types::ModelingCmd::DefaultCameraLookAt {
+                kittycad::types::ModelingCmd::ZoomToFit {
-                    center: kittycad::types::Point3D {
+                    object_ids: Default::default(),
-                        x: 0.0,
+                    padding: 0.1,
-                        y: 0.0,
-                        z: 0.0,
-                    },
-                    up: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 1.0,
-                    },
-                    vantage: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: -x,
-                        z: y,
-                    },
-                    sequence: None,
                 },
             )
             .await

src/wasm-lib/derive-docs/tests/option.gen

@@ -33,28 +33,13 @@ mod test_examples_show {
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
-        let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
         ctx.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
                 crate::executor::SourceRange::default(),
-                kittycad::types::ModelingCmd::DefaultCameraLookAt {
+                kittycad::types::ModelingCmd::ZoomToFit {
-                    center: kittycad::types::Point3D {
+                    object_ids: Default::default(),
-                        x: 0.0,
+                    padding: 0.1,
-                        y: 0.0,
-                        z: 0.0,
-                    },
-                    up: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 1.0,
-                    },
-                    vantage: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: -x,
-                        z: y,
-                    },
-                    sequence: None,
                 },
             )
             .await

src/wasm-lib/derive-docs/tests/option_input_format.gen

@@ -33,28 +33,13 @@ mod test_examples_import {
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
-        let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
         ctx.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
                 crate::executor::SourceRange::default(),
-                kittycad::types::ModelingCmd::DefaultCameraLookAt {
+                kittycad::types::ModelingCmd::ZoomToFit {
-                    center: kittycad::types::Point3D {
+                    object_ids: Default::default(),
-                        x: 0.0,
+                    padding: 0.1,
-                        y: 0.0,
-                        z: 0.0,
-                    },
-                    up: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 1.0,
-                    },
-                    vantage: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: -x,
-                        z: y,
-                    },
-                    sequence: None,
                 },
             )
             .await

src/wasm-lib/derive-docs/tests/return_vec_box_sketch_group.gen

@@ -33,28 +33,13 @@ mod test_examples_import {
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
-        let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
         ctx.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
                 crate::executor::SourceRange::default(),
-                kittycad::types::ModelingCmd::DefaultCameraLookAt {
+                kittycad::types::ModelingCmd::ZoomToFit {
-                    center: kittycad::types::Point3D {
+                    object_ids: Default::default(),
-                        x: 0.0,
+                    padding: 0.1,
-                        y: 0.0,
-                        z: 0.0,
-                    },
-                    up: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 1.0,
-                    },
-                    vantage: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: -x,
-                        z: y,
-                    },
-                    sequence: None,
                 },
             )
             .await

src/wasm-lib/derive-docs/tests/return_vec_sketch_group.gen

@@ -33,28 +33,13 @@ mod test_examples_import {
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
-        let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
         ctx.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
                 crate::executor::SourceRange::default(),
-                kittycad::types::ModelingCmd::DefaultCameraLookAt {
+                kittycad::types::ModelingCmd::ZoomToFit {
-                    center: kittycad::types::Point3D {
+                    object_ids: Default::default(),
-                        x: 0.0,
+                    padding: 0.1,
-                        y: 0.0,
-                        z: 0.0,
-                    },
-                    up: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 1.0,
-                    },
-                    vantage: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: -x,
-                        z: y,
-                    },
-                    sequence: None,
                 },
             )
             .await

src/wasm-lib/derive-docs/tests/show.gen

@@ -33,28 +33,13 @@ mod test_examples_show {
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
-        let (x, y) = crate::std::utils::get_camera_zoom_magnitude_per_unit_length(units);
         ctx.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
                 crate::executor::SourceRange::default(),
-                kittycad::types::ModelingCmd::DefaultCameraLookAt {
+                kittycad::types::ModelingCmd::ZoomToFit {
-                    center: kittycad::types::Point3D {
+                    object_ids: Default::default(),
-                        x: 0.0,
+                    padding: 0.1,
-                        y: 0.0,
-                        z: 0.0,
-                    },
-                    up: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: 0.0,
-                        z: 1.0,
-                    },
-                    vantage: kittycad::types::Point3D {
-                        x: 0.0,
-                        y: -x,
-                        z: y,
-                    },
-                    sequence: None,
                 },
             )
             .await

src/wasm-lib/grackle/Cargo.toml

@@ -14,7 +14,7 @@ kittycad-execution-plan-traits = { workspace = true }
 kittycad-execution-plan-macros = { workspace = true }
 kittycad-modeling-cmds = { workspace = true }
 kittycad-modeling-session = { workspace = true }
-thiserror = "1.0.58"
+thiserror = "1.0.59"
 tokio = { version = "1.37.0", features = ["macros", "rt"] }
 twenty-twenty = "0.7.0"
 uuid = "1.8"

src/wasm-lib/kcl/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "kcl-lib"
 description = "KittyCAD Language implementation and tools"
-version = "0.1.47"
+version = "0.1.50"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/KittyCAD/modeling-app"
@@ -19,7 +19,7 @@ chrono = "0.4.38"
 clap = { version = "4.5.4", features = ["cargo", "derive", "env", "unicode"], optional = true }
 dashmap = "5.5.3"
 databake = { version = "0.1.7", features = ["derive"] }
-derive-docs = { version = "0.1.14",  path = "../derive-docs" }
+derive-docs = { version = "0.1.16",  path = "../derive-docs" }
 form_urlencoded = "1.2.1"
 futures = { version = "0.3.30" }
 git_rev = "0.1.0"
@@ -36,7 +36,7 @@ schemars = { version = "0.8.16", features = ["impl_json_schema", "url", "uuid1"]
 serde = { version = "1.0.198", features = ["derive"] }
 serde_json = "1.0.116"
 sha2 = "0.10.8"
-thiserror = "1.0.58"
+thiserror = "1.0.59"
 ts-rs = { version = "7.1.1", features = ["uuid-impl", "url-impl"] }
 url = { version = "2.5.0", features = ["serde"] }
 uuid = { version = "1.8.0", features = ["v4", "js", "serde"] }

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

@@ -1864,7 +1864,13 @@ impl ObjectExpression {
             "{{ {} }}",
             self.properties
                 .iter()
-                .map(|prop| { format!("{}: {}", prop.key.name, prop.value.recast(options, 0, false)) })
+                .map(|prop| {
+                    format!(
+                        "{}: {}",
+                        prop.key.name,
+                        prop.value.recast(options, indentation_level + 1, is_in_pipe)
+                    )
+                })
                 .collect::<Vec<String>>()
                 .join(", ")
         );
@@ -1880,7 +1886,13 @@ impl ObjectExpression {
                 inner_indentation,
                 self.properties
                     .iter()
-                    .map(|prop| { format!("{}: {}", prop.key.name, prop.value.recast(options, 0, false)) })
+                    .map(|prop| {
+                        format!(
+                            "{}: {}",
+                            prop.key.name,
+                            prop.value.recast(options, indentation_level + 1, is_in_pipe)
+                        )
+                    })
                     .collect::<Vec<String>>()
                     .join(format!(",\n{}", inner_indentation).as_str()),
                 if is_in_pipe {
@@ -2657,7 +2669,12 @@ impl PipeExpression {
                 let non_code_meta = self.non_code_meta.clone();
                 if let Some(non_code_meta_value) = non_code_meta.non_code_nodes.get(&index) {
                     for val in non_code_meta_value {
-                        let formatted = val.format(&indentation).trim_end_matches('\n').to_string();
+                        let formatted = if val.end == self.end {
+                            let indentation = options.get_indentation(indentation_level);
+                            val.format(&indentation).trim_end_matches('\n').to_string()
+                        } else {
+                            val.format(&indentation).trim_end_matches('\n').to_string()
+                        };
                         if let NonCodeValue::BlockComment { .. } = val.value {
                             s += "\n";
                             s += &formatted;
@@ -3256,6 +3273,244 @@ fn ghi = (x) => {
         assert_eq!(recasted, r#""#);
     }
 
+    #[test]
+    fn test_recast_large_file() {
+        let some_program_string = r#"// define constants
+const radius = 6.0
+const width = 144.0
+const length = 83.0
+const depth = 45.0
+const thk = 5
+const hole_diam = 5
+// define a rectangular shape func
+fn rectShape = (pos, w, l) => {
+  const rr = startSketchOn('xy')
+    |> startProfileAt([pos[0] - (w / 2), pos[1] - (l / 2)], %)
+    |> lineTo([pos[0] + w / 2, pos[1] - (l / 2)], %, "edge1")
+    |> lineTo([pos[0] + w / 2, pos[1] + l / 2], %, "edge2")
+    |> lineTo([pos[0] - (w / 2), pos[1] + l / 2], %, "edge3")
+    |> close(%, "edge4")
+  return rr
+}
+// build the body of the focusrite scarlett solo gen 4
+// only used for visualization
+const scarlett_body = rectShape([0, 0], width, length)
+  |> extrude(depth, %)
+  |> fillet({
+       radius: radius,
+       tags: [
+  getEdge("edge2", %),
+  getEdge("edge4", %),
+  getOppositeEdge("edge2", %),
+  getOppositeEdge("edge4", %)
+]
+     }, %)
+  // build the bracket sketch around the body
+fn bracketSketch = (w, d, t) => {
+  const s = startSketchOn({
+         plane: {
+  origin: { x: 0, y: length / 2 + thk, z: 0 },
+  x_axis: { x: 1, y: 0, z: 0 },
+  y_axis: { x: 0, y: 0, z: 1 },
+  z_axis: { x: 0, y: 1, z: 0 }
+}
+       })
+    |> startProfileAt([-w / 2 - t, d + t], %)
+    |> lineTo([-w / 2 - t, -t], %, "edge1")
+    |> lineTo([w / 2 + t, -t], %, "edge2")
+    |> lineTo([w / 2 + t, d + t], %, "edge3")
+    |> lineTo([w / 2, d + t], %, "edge4")
+    |> lineTo([w / 2, 0], %, "edge5")
+    |> lineTo([-w / 2, 0], %, "edge6")
+    |> lineTo([-w / 2, d + t], %, "edge7")
+    |> close(%, "edge8")
+  return s
+}
+// build the body of the bracket
+const bracket_body = bracketSketch(width, depth, thk)
+  |> extrude(length + 10, %)
+  |> fillet({
+       radius: radius,
+       tags: [
+  getNextAdjacentEdge("edge7", %),
+  getNextAdjacentEdge("edge2", %),
+  getNextAdjacentEdge("edge3", %),
+  getNextAdjacentEdge("edge6", %)
+]
+     }, %)
+  // build the tabs of the mounting bracket (right side)
+const tabs_r = startSketchOn({
+       plane: {
+  origin: { x: 0, y: 0, z: depth + thk },
+  x_axis: { x: 1, y: 0, z: 0 },
+  y_axis: { x: 0, y: 1, z: 0 },
+  z_axis: { x: 0, y: 0, z: 1 }
+}
+     })
+  |> startProfileAt([width / 2 + thk, length / 2 + thk], %)
+  |> line([10, -5], %)
+  |> line([0, -10], %)
+  |> line([-10, -5], %)
+  |> close(%)
+  |> hole(circle([
+       width / 2 + thk + hole_diam,
+       length / 2 - hole_diam
+     ], hole_diam / 2, %), %)
+  |> extrude(-thk, %)
+  |> patternLinear3d({
+       axis: [0, -1, 0],
+       repetitions: 1,
+       distance: length - 10
+     }, %)
+  // build the tabs of the mounting bracket (left side)
+const tabs_l = startSketchOn({
+       plane: {
+  origin: { x: 0, y: 0, z: depth + thk },
+  x_axis: { x: 1, y: 0, z: 0 },
+  y_axis: { x: 0, y: 1, z: 0 },
+  z_axis: { x: 0, y: 0, z: 1 }
+}
+     })
+  |> startProfileAt([-width / 2 - thk, length / 2 + thk], %)
+  |> line([-10, -5], %)
+  |> line([0, -10], %)
+  |> line([10, -5], %)
+  |> close(%)
+  |> hole(circle([
+       -width / 2 - thk - hole_diam,
+       length / 2 - hole_diam
+     ], hole_diam / 2, %), %)
+  |> extrude(-thk, %)
+  |> patternLinear3d({
+       axis: [0, -1, 0],
+       repetitions: 1,
+       distance: length - 10
+     }, %)
+"#;
+        let tokens = crate::token::lexer(some_program_string).unwrap();
+        let parser = crate::parser::Parser::new(tokens);
+        let program = parser.ast().unwrap();
+        println!("{:#?}", program);
+
+        let recasted = program.recast(&Default::default(), 0);
+        // Its VERY important this comes back with zero new lines.
+        assert_eq!(
+            recasted,
+            r#"// define constants
+const radius = 6.0
+const width = 144.0
+const length = 83.0
+const depth = 45.0
+const thk = 5
+const hole_diam = 5
+// define a rectangular shape func
+fn rectShape = (pos, w, l) => {
+  const rr = startSketchOn('xy')
+    |> startProfileAt([pos[0] - (w / 2), pos[1] - (l / 2)], %)
+    |> lineTo([pos[0] + w / 2, pos[1] - (l / 2)], %, "edge1")
+    |> lineTo([pos[0] + w / 2, pos[1] + l / 2], %, "edge2")
+    |> lineTo([pos[0] - (w / 2), pos[1] + l / 2], %, "edge3")
+    |> close(%, "edge4")
+  return rr
+}
+// build the body of the focusrite scarlett solo gen 4
+// only used for visualization
+const scarlett_body = rectShape([0, 0], width, length)
+  |> extrude(depth, %)
+  |> fillet({
+       radius: radius,
+       tags: [
+         getEdge("edge2", %),
+         getEdge("edge4", %),
+         getOppositeEdge("edge2", %),
+         getOppositeEdge("edge4", %)
+       ]
+     }, %)
+// build the bracket sketch around the body
+fn bracketSketch = (w, d, t) => {
+  const s = startSketchOn({
+         plane: {
+           origin: { x: 0, y: length / 2 + thk, z: 0 },
+           x_axis: { x: 1, y: 0, z: 0 },
+           y_axis: { x: 0, y: 0, z: 1 },
+           z_axis: { x: 0, y: 1, z: 0 }
+         }
+       })
+    |> startProfileAt([-w / 2 - t, d + t], %)
+    |> lineTo([-w / 2 - t, -t], %, "edge1")
+    |> lineTo([w / 2 + t, -t], %, "edge2")
+    |> lineTo([w / 2 + t, d + t], %, "edge3")
+    |> lineTo([w / 2, d + t], %, "edge4")
+    |> lineTo([w / 2, 0], %, "edge5")
+    |> lineTo([-w / 2, 0], %, "edge6")
+    |> lineTo([-w / 2, d + t], %, "edge7")
+    |> close(%, "edge8")
+  return s
+}
+// build the body of the bracket
+const bracket_body = bracketSketch(width, depth, thk)
+  |> extrude(length + 10, %)
+  |> fillet({
+       radius: radius,
+       tags: [
+         getNextAdjacentEdge("edge7", %),
+         getNextAdjacentEdge("edge2", %),
+         getNextAdjacentEdge("edge3", %),
+         getNextAdjacentEdge("edge6", %)
+       ]
+     }, %)
+// build the tabs of the mounting bracket (right side)
+const tabs_r = startSketchOn({
+       plane: {
+         origin: { x: 0, y: 0, z: depth + thk },
+         x_axis: { x: 1, y: 0, z: 0 },
+         y_axis: { x: 0, y: 1, z: 0 },
+         z_axis: { x: 0, y: 0, z: 1 }
+       }
+     })
+  |> startProfileAt([width / 2 + thk, length / 2 + thk], %)
+  |> line([10, -5], %)
+  |> line([0, -10], %)
+  |> line([-10, -5], %)
+  |> close(%)
+  |> hole(circle([
+       width / 2 + thk + hole_diam,
+       length / 2 - hole_diam
+     ], hole_diam / 2, %), %)
+  |> extrude(-thk, %)
+  |> patternLinear3d({
+       axis: [0, -1, 0],
+       repetitions: 1,
+       distance: length - 10
+     }, %)
+// build the tabs of the mounting bracket (left side)
+const tabs_l = startSketchOn({
+       plane: {
+         origin: { x: 0, y: 0, z: depth + thk },
+         x_axis: { x: 1, y: 0, z: 0 },
+         y_axis: { x: 0, y: 1, z: 0 },
+         z_axis: { x: 0, y: 0, z: 1 }
+       }
+     })
+  |> startProfileAt([-width / 2 - thk, length / 2 + thk], %)
+  |> line([-10, -5], %)
+  |> line([0, -10], %)
+  |> line([10, -5], %)
+  |> close(%)
+  |> hole(circle([
+       -width / 2 - thk - hole_diam,
+       length / 2 - hole_diam
+     ], hole_diam / 2, %), %)
+  |> extrude(-thk, %)
+  |> patternLinear3d({
+       axis: [0, -1, 0],
+       repetitions: 1,
+       distance: length - 10
+     }, %)
+"#
+        );
+    }
+
     #[test]
     fn test_recast_nested_var_declaration_in_fn_body() {
         let some_program_string = r#"fn cube = (pos, scale) => {
@@ -3543,7 +3798,7 @@ const mySk1 = startSketchOn('XY')
   // and another with just white space between others below
   |> ry(45, %)
   |> rx(45, %)
-  // one more for good measure
+// one more for good measure
 "#
         );
     }

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

@@ -62,7 +62,11 @@ impl StdLibFnArg {
     }
 
     pub fn get_autocomplete_snippet(&self, index: usize) -> Result<Option<(usize, String)>> {
-        if self.type_ == "SketchGroup" || self.type_ == "ExtrudeGroup" || self.type_ == "SketchSurface" {
+        if self.type_ == "SketchGroup"
+            || self.type_ == "ExtrudeGroup"
+            || self.type_ == "SketchSurface"
+            || self.type_ == "SketchGroupSet"
+        {
             return Ok(Some((index, format!("${{{}:{}}}", index, "%"))));
         }
         get_autocomplete_snippet_from_schema(&self.schema.clone(), index)
@@ -319,7 +323,12 @@ pub fn get_type_string_from_schema(schema: &schemars::schema::Schema) -> Result<
             if let Some(format) = &o.format {
                 if format == "uuid" {
                     return Ok((Primitive::Uuid.to_string(), false));
-                } else if format == "double" || format == "uint" || format == "int64" || format == "uint32" {
+                } else if format == "double"
+                    || format == "uint"
+                    || format == "int64"
+                    || format == "uint32"
+                    || format == "uint64"
+                {
                     return Ok((Primitive::Number.to_string(), false));
                 } else {
                     anyhow::bail!("unknown format: {}", format);
@@ -456,7 +465,12 @@ pub fn get_autocomplete_snippet_from_schema(
             if let Some(format) = &o.format {
                 if format == "uuid" {
                     return Ok(Some((index, format!(r#"${{{}:"tag_or_edge_fn"}}"#, index))));
-                } else if format == "double" || format == "uint" || format == "int64" || format == "uint32" {
+                } else if format == "double"
+                    || format == "uint"
+                    || format == "int64"
+                    || format == "uint32"
+                    || format == "uint64"
+                {
                     return Ok(Some((index, format!(r#"${{{}:3.14}}"#, index))));
                 } else {
                     anyhow::bail!("unknown format: {}", format);
@@ -610,7 +624,12 @@ pub fn get_autocomplete_string_from_schema(schema: &schemars::schema::Schema) ->
             if let Some(format) = &o.format {
                 if format == "uuid" {
                     return Ok(Primitive::Uuid.to_string());
-                } else if format == "double" || format == "uint" || format == "int64" || format == "uint32" {
+                } else if format == "double"
+                    || format == "uint"
+                    || format == "int64"
+                    || format == "uint32"
+                    || format == "uint64"
+                {
                     return Ok(Primitive::Number.to_string());
                 } else {
                     anyhow::bail!("unknown format: {}", format);
@@ -736,10 +755,12 @@ pub fn completion_item_from_enum_schema(
         anyhow::bail!("expected at least one enum value: {:#?}", o);
     }
 
-    let label = enum_values[0].to_string();
+    let serde_json::Value::String(ref enum_value) = enum_values[0] else {
+        anyhow::bail!("expected string enum value: {:#?}", enum_values[0]);
+    };
 
     Ok(CompletionItem {
-        label,
+        label: enum_value.to_string(),
         label_details: None,
         kind: Some(kind),
         detail: Some(description.to_string()),

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

@@ -124,7 +124,7 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
         let batched_requests = WebSocketRequest::ModelingCmdBatchReq {
             requests,
             batch_id: uuid::Uuid::new_v4(),
-            responses: Some(false),
+            responses: false,
         };
 
         let final_req = if self.batch().lock().unwrap().len() == 1 {
@@ -365,6 +365,7 @@ pub fn is_cmd_with_return_values(cmd: &kittycad::types::ModelingCmd) -> bool {
     | kittycad::types::ModelingCmd::EntityGetDistance { .. }
     | kittycad::types::ModelingCmd::EntityLinearPattern { .. }
     | kittycad::types::ModelingCmd::EntityCircularPattern { .. }
+    | kittycad::types::ModelingCmd::ZoomToFit { .. }
     | kittycad::types::ModelingCmd::Solid3DGetExtrusionFaceInfo { .. }) = cmd
     else {
         return false;

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

@@ -191,6 +191,15 @@ pub enum SketchGroupSet {
     SketchGroups(Vec<Box<SketchGroup>>),
 }
 
+/// A extrude group or a group of extrude groups.
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
+#[ts(export)]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum ExtrudeGroupSet {
+    ExtrudeGroup(Box<ExtrudeGroup>),
+    ExtrudeGroups(Vec<Box<ExtrudeGroup>>),
+}
+
 /// Data for an imported geometry.
 #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]

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

@@ -793,6 +793,56 @@ st"#
     }
 }
 
+#[tokio::test(flavor = "multi_thread")]
+async fn test_kcl_lsp_completions_const_raw() {
+    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:///test.kcl".try_into().unwrap(),
+                language_id: "kcl".to_string(),
+                version: 1,
+                text: r#"con"#.to_string(),
+            },
+        })
+        .await;
+
+    // Send completion request.
+    let completions = server
+        .completion(tower_lsp::lsp_types::CompletionParams {
+            text_document_position: tower_lsp::lsp_types::TextDocumentPositionParams {
+                text_document: tower_lsp::lsp_types::TextDocumentIdentifier {
+                    uri: "file:///test.kcl".try_into().unwrap(),
+                },
+                position: tower_lsp::lsp_types::Position { line: 0, character: 2 },
+            },
+            context: None,
+            partial_result_params: Default::default(),
+            work_done_progress_params: Default::default(),
+        })
+        .await
+        .unwrap()
+        .unwrap();
+
+    // Check the completions.
+    if let tower_lsp::lsp_types::CompletionResponse::Array(completions) = completions {
+        assert!(completions.len() > 10);
+        // Find the one with label "const".
+        let const_completion = completions
+            .iter()
+            .find(|completion| completion.label == "const")
+            .unwrap();
+        assert_eq!(
+            const_completion.kind,
+            Some(tower_lsp::lsp_types::CompletionItemKind::KEYWORD)
+        );
+    } else {
+        panic!("Expected array of completions");
+    }
+}
+
 #[tokio::test(flavor = "multi_thread")]
 async fn test_kcl_lsp_on_hover() {
     let server = kcl_lsp_server(false).await.unwrap();