try and reduce loading timeout noise

README.md

@@ -141,7 +141,7 @@ run `./make-release.sh` for a patch update
 run `./make-release.sh "minor"` for minor
 run `./make-release.sh "major"` for major
 
-The PR may serve as a place to discuss the human-readable changelog and extra QA. A quick way of getting PR's merged since the last bump is to [use this PR filter](https://github.com/KittyCAD/modeling-app/pulls?q=is%3Apr+sort%3Aupdated-desc+is%3Amerged+), open up the browser console and paste in the following
+The PR may serve as a place to discuss the human-readable changelog and extra QA. A quick way of getting PR's merged since the last bump is to [use this PR filter](https://github.com/KittyCAD/modeling-app/pulls?q=is%3Apr+sort%3Aupdated-desc+is%3Amerged+), open up the browser console and past in the following
 
 ```typescript
 console.log(

e2e/playwright/snapshot-tests.spec.ts

@@ -1,4 +1,4 @@
-import { test, expect, Download } from '@playwright/test'
+import { test, expect } from '@playwright/test'
 import { secrets } from './secrets'
 import { getUtils } from './test-utils'
 import { Models } from '@kittycad/lib'
@@ -32,6 +32,7 @@ test.beforeEach(async ({ context, page }) => {
 test.setTimeout(60_000)
 
 test('exports of each format should work', async ({ page, context }) => {
+  test.setTimeout(120_000)
   // FYI this test doesn't work with only engine running locally
   // And you will need to have the KittyCAD CLI installed
   const u = getUtils(page)
@@ -99,49 +100,20 @@ const part001 = startSketchOn('-XZ')
     output: Models['OutputFormat_type']
   ): Promise<Paths> => {
     await page.getByRole('button', { name: APP_NAME }).click()
-    await expect(
-      page.getByRole('button', { name: 'Export Part' })
-    ).toBeVisible()
     await page.getByRole('button', { name: 'Export Part' }).click()
-    await expect(page.getByTestId('command-bar')).toBeVisible()
 
     // Go through export via command bar
     await page.getByRole('option', { name: output.type, exact: false }).click()
-    await page.locator('#arg-form').waitFor({ state: 'detached' })
     if ('storage' in output) {
-      await page.getByTestId('arg-name-storage').waitFor({ timeout: 1000 })
       await page.getByRole('button', { name: 'storage', exact: false }).click()
       await page
         .getByRole('option', { name: output.storage, exact: false })
         .click()
-      await page.locator('#arg-form').waitFor({ state: 'detached' })
     }
-    await expect(page.getByText('Confirm Export')).toBeVisible()
-
-    const getPromiseAndResolve = () => {
-      let resolve: any = () => {}
-      const promise = new Promise<Download>((r) => {
-        resolve = r
-      })
-      return [promise, resolve]
-    }
-
-    const [downloadPromise1, downloadResolve1] = getPromiseAndResolve()
-    const [downloadPromise2, downloadResolve2] = getPromiseAndResolve()
-    let downloadCnt = 0
-
-    page.on('download', async (download) => {
-      if (downloadCnt === 0) {
-        downloadResolve1(download)
-      } else if (downloadCnt === 1) {
-        downloadResolve2(download)
-      }
-      downloadCnt++
-    })
     await page.getByRole('button', { name: 'Submit command' }).click()
 
     // Handle download
-    const download = await downloadPromise1
+    const download = await page.waitForEvent('download')
     const downloadLocationer = (extra = '', isImage = false) =>
       `./e2e/playwright/export-snapshots/${output.type}-${
         'storage' in output ? output.storage : ''
@@ -151,7 +123,7 @@ const part001 = startSketchOn('-XZ')
 
     if (output.type === 'gltf' && output.storage === 'standard') {
       // wait for second download
-      const download2 = await downloadPromise2
+      const download2 = await page.waitForEvent('download')
       await download.saveAs(downloadLocation)
       await download2.saveAs(downloadLocation2)
 

e2e/playwright/test-utils.ts

@@ -1,16 +1,23 @@
-import { expect, Page } from '@playwright/test'
+import { expect, Page, errors } from '@playwright/test'
 import { EngineCommand } from '../../src/lang/std/engineConnection'
 import fsp from 'fs/promises'
 import pixelMatch from 'pixelmatch'
 import { PNG } from 'pngjs'
 
 async function waitForPageLoad(page: Page) {
-  // wait for 'Loading stream...' spinner
-  await page.getByTestId('loading-stream').waitFor()
-  // wait for all spinners to be gone
-  await page.getByTestId('loading').waitFor({ state: 'detached' })
-
-  await page.getByTestId('start-sketch').waitFor()
+  try {
+    // wait for 'Loading stream...' spinner
+    await page.getByTestId('loading-stream').waitFor()
+    // wait for all spinners to be gone
+    await page.getByTestId('loading').waitFor({ state: 'detached' })
+    await page.getByTestId('start-sketch').waitFor()
+  } catch (e) {
+    if (e instanceof errors.TimeoutError) {
+      console.log('Timeout while waiting for page load.')
+    } else {
+      throw e // re-throw the error if it is not a TimeoutError
+    }
+  }
 }
 
 async function removeCurrentCode(page: Page) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "untitled-app",
-  "version": "0.15.5",
+  "version": "0.15.4",
   "private": true,
   "dependencies": {
     "@codemirror/autocomplete": "^6.10.2",

src-tauri/Cargo.lock

@@ -1664,9 +1664,9 @@ dependencies = [
 
 [[package]]
 name = "kittycad"
-version = "0.2.59"
+version = "0.2.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4080db4364c103601db486e4a8aa889ea56c011991e4c454373d8050a165d3da"
+checksum = "049c3881ffbe77bf1c3a968372a246ce906eceb79f61cd0bc5fa229bec3504cb"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -1934,9 +1934,9 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.11"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
 dependencies = [
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
@@ -3275,11 +3275,10 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.112"
+version = "1.0.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d1bd37ce2324cf3bf85e5a25f96eb4baf0d5aa6eba43e7ae8958870c4ec48ed"
+checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
 dependencies = [
- "indexmap 2.0.0",
  "itoa 1.0.6",
  "ryu",
  "serde",
@@ -3761,15 +3760,14 @@ dependencies = [
 
 [[package]]
 name = "tauri"
-version = "1.6.0"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0da520ff07c0745199204f7a7a62a8c6ee1666313b792b051ca170eca04649aa"
+checksum = "fd27c04b9543776a972c86ccf70660b517ecabbeced9fb58d8b961a13ad129af"
 dependencies = [
  "anyhow",
  "bytes",
  "cocoa",
  "dirs-next",
- "dunce",
  "embed_plist",
  "encoding_rs",
  "flate2",
@@ -3780,7 +3778,6 @@ dependencies = [
  "heck 0.4.1",
  "http",
  "ignore",
- "indexmap 1.9.3",
  "objc",
  "once_cell",
  "open",
@@ -3875,7 +3872,7 @@ dependencies = [
 [[package]]
 name = "tauri-plugin-fs-extra"
 version = "0.0.0"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#19aa2204115e7304681cb40faf7512aba525bc5e"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#ed682dd96eb765e7cd3cdbc3cc64f794a0d6f9df"
 dependencies = [
  "log",
  "serde",
@@ -3907,9 +3904,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime-wry"
-version = "0.14.5"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "067c56fc153b3caf406d7cd6de4486c80d1d66c0f414f39e94cb2f5543f6445f"
+checksum = "6cae61fbc731f690a4899681c9052dde6d05b159b44563ace8186fc1bfb7d158"
 dependencies = [
  "cocoa",
  "gtk",
@@ -3927,9 +3924,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-utils"
-version = "1.5.3"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75ad0bbb31fccd1f4c56275d0a5c3abdf1f59999f72cb4ef8b79b4ed42082a21"
+checksum = "ece74810b1d3d44f29f732a7ae09a63183d63949bbdd59c61f8ed2a1b70150db"
 dependencies = [
  "brotli",
  "ctor",

src-tauri/Cargo.toml

@@ -16,11 +16,11 @@ tauri-build = { version = "1.5.1", features = [] }
 
 [dependencies]
 anyhow = "1"
-kittycad = "0.2.59"
+kittycad = "0.2.58"
 oauth2 = "4.4.2"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-tauri = { version = "1.6.0", features = [ "os-all", "dialog-all", "fs-all", "http-request", "path-all", "shell-open", "shell-open-api", "devtools"] }
+tauri = { version = "1.5.4", features = [ "os-all", "dialog-all", "fs-all", "http-request", "path-all", "shell-open", "shell-open-api", "devtools"] }
 tauri-plugin-fs-extra = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
 tokio = { version = "1.36.0", features = ["time"] }
 toml = "0.8.2"

src-tauri/tauri.conf.json

@@ -7,7 +7,7 @@
   },
   "package": {
     "productName": "zoo-modeling-app",
-    "version": "0.15.5"
+    "version": "0.15.4"
   },
   "tauri": {
     "allowlist": {

src/components/CommandBar/CommandBar.tsx

@@ -146,7 +146,6 @@ export const CommandBar = () => {
           <WrapperComponent.Panel
             className="relative z-50 pointer-events-auto w-full max-w-xl py-2 mx-auto border rounded shadow-lg bg-chalkboard-10 dark:bg-chalkboard-100 dark:border-chalkboard-70"
             as="div"
-            data-testid="command-bar"
           >
             {commandBarState.matches('Selecting command') ? (
               <CommandComboBox options={commands} />

src/components/CommandBar/CommandBarHeader.tsx

@@ -1,6 +1,6 @@
 import { useCommandsContext } from 'hooks/useCommandsContext'
 import { CustomIcon } from '../CustomIcon'
-import React, { useState } from 'react'
+import React, { ReactNode, useState } from 'react'
 import { ActionButton } from '../ActionButton'
 import { Selections, getSelectionTypeDisplayText } from 'lib/selections'
 import { useHotkeys } from 'react-hotkeys-hook'
@@ -108,12 +108,7 @@ function CommandBarHeader({ children }: React.PropsWithChildren<{}>) {
                         : 'bg-chalkboard-20/50 dark:bg-chalkboard-80/50 border-chalkboard-20 dark:border-chalkboard-80'
                     }`}
                   >
-                    <span
-                      data-testid={`arg-name-${argName.toLowerCase()}`}
-                      className="capitalize"
-                    >
-                      {argName}
-                    </span>
+                    <span className="capitalize">{argName}</span>
                     {argValue ? (
                       arg.inputType === 'selection' ? (
                         getSelectionTypeDisplayText(argValue as Selections)

src/components/CustomIcon.tsx

@@ -18,7 +18,6 @@ export type CustomIconName =
   | 'gear'
   | 'horizontal'
   | 'horizontalDash'
-  | 'kcl'
   | 'line'
   | 'make-variable'
   | 'move'
@@ -340,22 +339,6 @@ export const CustomIcon = ({
           />
         </svg>
       )
-    case 'kcl':
-      return (
-        <svg
-          {...props}
-          viewBox="0 0 40 40"
-          fill="none"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            fillRule="evenodd"
-            clipRule="evenodd"
-            d="M40 0H0V40H40V0ZM7.34715 27.2143V15.6577L2.976 15.987V36.7949H7.34715V32.0645L8.00582 31.5256C8.24533 31.326 8.47487 31.1264 8.69442 30.9268L12.1075 36.7949H17.0475C16.1893 35.3978 15.311 33.9906 14.4128 32.5735C13.5346 31.1563 12.6664 29.7392 11.8081 28.3221L15.8499 24.9389C15.4308 24.4399 15.0017 23.931 14.5625 23.412L13.3051 21.8552L7.34715 27.2143ZM22.2581 26.6754C22.8769 25.9169 23.6753 25.5377 24.6533 25.5377C25.272 25.5377 25.8309 25.6175 26.3299 25.7772C26.8289 25.9169 27.4177 26.1465 28.0963 26.4658L29.3238 23.3521C28.5853 22.7933 27.7371 22.4041 26.779 22.1845C25.8409 21.9649 25.0625 21.8552 24.4437 21.8552C22.0885 21.8552 20.2223 22.5537 18.845 23.9509C17.4878 25.3281 16.8092 27.1944 16.8092 29.5496C16.8092 31.9048 17.4878 33.7611 18.845 35.1183C20.2223 36.4756 22.0885 37.1542 24.4437 37.1542C25.0625 37.1542 25.8509 37.0444 26.8089 36.8249C27.767 36.6053 28.6053 36.2161 29.3238 35.6572L28.0963 32.5435C27.4177 32.8629 26.8289 33.0924 26.3299 33.2321C25.8309 33.3718 25.272 33.4417 24.6533 33.4417C23.6753 33.4417 22.8769 33.0924 22.2581 32.3938C21.6594 31.6753 21.36 30.7272 21.36 29.5496C21.36 28.372 21.6594 27.4139 22.2581 26.6754ZM36.2796 36.7949V15.6577L31.9085 15.987V36.7949H36.2796Z"
-            fill="currentColor"
-          />
-        </svg>
-      )
     case 'line':
       return (
         <svg

src/components/FileMachineProvider.tsx

@@ -50,7 +50,10 @@ export const FileMachineProvider = ({
       selectedDirectory: project,
     },
     actions: {
-      navigateToFile: (context, event) => {
+      navigateToFile: (
+        context: ContextFrom<typeof fileMachine>,
+        event: EventFrom<typeof fileMachine>
+      ) => {
         if (event.data && 'name' in event.data) {
           commandBarSend({ type: 'Close' })
           navigate(
@@ -74,7 +77,10 @@ export const FileMachineProvider = ({
           children: newFiles,
         }
       },
-      createFile: async (context, event) => {
+      createFile: async (
+        context: ContextFrom<typeof fileMachine>,
+        event: EventFrom<typeof fileMachine, 'Create file'>
+      ) => {
         let name = event.data.name.trim() || DEFAULT_FILE_NAME
 
         if (event.data.makeDir) {

src/components/FileTree.tsx

@@ -3,7 +3,7 @@ import { paths } from 'lib/paths'
 import { ActionButton } from './ActionButton'
 import Tooltip from './Tooltip'
 import { FileEntry } from '@tauri-apps/api/fs'
-import { Dispatch, useEffect, useRef, useState } from 'react'
+import { Dispatch, useRef, useState } from 'react'
 import { useNavigate } from 'react-router-dom'
 import { Dialog, Disclosure } from '@headlessui/react'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
@@ -11,10 +11,7 @@ import { faChevronRight, faTrashAlt } from '@fortawesome/free-solid-svg-icons'
 import { useFileContext } from 'hooks/useFileContext'
 import { useHotkeys } from 'react-hotkeys-hook'
 import styles from './FileTree.module.css'
-import { FILE_EXT, sortProject } from 'lib/tauriFS'
-import { CustomIcon } from './CustomIcon'
-import { kclManager } from 'lang/KclSingleton'
-import { useDocumentHasFocus } from 'hooks/useDocumentHasFocus'
+import { sortProject } from 'lib/tauriFS'
 
 function getIndentationCSS(level: number) {
   return `calc(1rem * ${level + 1})`
@@ -160,23 +157,13 @@ const FileTreeItem = ({
       // Show the renaming form
       setIsRenaming(true)
     } else if (e.code === 'Space') {
-      handleDoubleClick()
+      openFile()
     }
   }
 
-  function handleDoubleClick() {
+  function openFile() {
     if (fileOrDir.children !== undefined) return // Don't open directories
-
-    if (fileOrDir.name?.endsWith(FILE_EXT) === false && project?.path) {
-      // Import non-kcl files
-      kclManager.setCodeAndExecute(
-        `import("${fileOrDir.path.replace(project.path, '.')}")\n` +
-          kclManager.code
-      )
-    } else {
-      // Open kcl files
-      navigate(`${paths.FILE}/${encodeURIComponent(fileOrDir.path)}`)
-    }
+    navigate(`${paths.FILE}/${encodeURIComponent(fileOrDir.path)}`)
     closePanel()
   }
 
@@ -193,12 +180,11 @@ const FileTreeItem = ({
             <button
               className="flex gap-1 items-center py-0.5 rounded-none border-none p-0 m-0 text-sm w-full hover:!bg-transparent text-left !text-inherit"
               style={{ paddingInlineStart: getIndentationCSS(level) }}
-              onDoubleClick={handleDoubleClick}
+              onDoubleClick={openFile}
               onClick={(e) => e.currentTarget.focus()}
               onKeyUp={handleKeyUp}
             >
-              <CustomIcon
-                name={fileOrDir.name?.endsWith(FILE_EXT) ? 'kcl' : 'file'}
+              <KclIcon
                 className={
                   'inline-block w-3 ' +
                   (isCurrentFile
@@ -327,15 +313,9 @@ export const FileTree = ({
   closePanel,
 }: FileTreeProps) => {
   const { send, context } = useFileContext()
-  const docuemntHasFocus = useDocumentHasFocus()
   useHotkeys('meta + n', createFile)
   useHotkeys('meta + shift + n', createFolder)
 
-  // Refresh the file tree when the document gets focus
-  useEffect(() => {
-    send({ type: 'Refresh' })
-  }, [docuemntHasFocus])
-
   async function createFile() {
     send({ type: 'Create file', data: { name: '', makeDir: false } })
   }
@@ -401,3 +381,21 @@ export const FileTree = ({
     </div>
   )
 }
+
+function KclIcon({ className = '' }: { className?: string }) {
+  return (
+    <svg
+      className={className}
+      viewBox="0 0 40 40"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M40 0H0V40H40V0ZM7.34715 27.2143V15.6577L2.976 15.987V36.7949H7.34715V32.0645L8.00582 31.5256C8.24533 31.326 8.47487 31.1264 8.69442 30.9268L12.1075 36.7949H17.0475C16.1893 35.3978 15.311 33.9906 14.4128 32.5735C13.5346 31.1563 12.6664 29.7392 11.8081 28.3221L15.8499 24.9389C15.4308 24.4399 15.0017 23.931 14.5625 23.412L13.3051 21.8552L7.34715 27.2143ZM22.2581 26.6754C22.8769 25.9169 23.6753 25.5377 24.6533 25.5377C25.272 25.5377 25.8309 25.6175 26.3299 25.7772C26.8289 25.9169 27.4177 26.1465 28.0963 26.4658L29.3238 23.3521C28.5853 22.7933 27.7371 22.4041 26.779 22.1845C25.8409 21.9649 25.0625 21.8552 24.4437 21.8552C22.0885 21.8552 20.2223 22.5537 18.845 23.9509C17.4878 25.3281 16.8092 27.1944 16.8092 29.5496C16.8092 31.9048 17.4878 33.7611 18.845 35.1183C20.2223 36.4756 22.0885 37.1542 24.4437 37.1542C25.0625 37.1542 25.8509 37.0444 26.8089 36.8249C27.767 36.6053 28.6053 36.2161 29.3238 35.6572L28.0963 32.5435C27.4177 32.8629 26.8289 33.0924 26.3299 33.2321C25.8309 33.3718 25.272 33.4417 24.6533 33.4417C23.6753 33.4417 22.8769 33.0924 22.2581 32.3938C21.6594 31.6753 21.36 30.7272 21.36 29.5496C21.36 28.372 21.6594 27.4139 22.2581 26.6754ZM36.2796 36.7949V15.6577L31.9085 15.987V36.7949H36.2796Z"
+        fill="currentColor"
+      />
+    </svg>
+  )
+}

src/components/Stream.tsx

@@ -144,7 +144,7 @@ export const Stream = ({ className = '' }: { className?: string }) => {
         disablePictureInPicture
         style={{ transitionDuration: '200ms', transitionProperty: 'filter' }}
       />
-      <ClientSideScene cameraControls={settings.context?.cameraControls} />
+      <ClientSideScene cameraControls={settings.context.cameraControls} />
       {!isNetworkOkay && !isLoading && (
         <div className="text-center absolute inset-0">
           <Loading>

src/components/TextEditor.tsx

@@ -108,8 +108,8 @@ export const TextEditor = ({
     state,
   } = useModelingContext()
 
-  const { settings, auth } = useGlobalStateContext()
-  const textWrapping = settings.context?.textWrapping ?? 'On'
+  const { settings: { context: { textWrapping } = {} } = {}, auth } =
+    useGlobalStateContext()
   const { commandBarSend } = useCommandsContext()
   const {
     context: { project },

src/hooks/useDocumentHasFocus.ts

@@ -1,31 +0,0 @@
-// Based on https://learnersbucket.com/examples/interview/usehasfocus-hook-in-react/
-import { useState, useEffect } from 'react'
-
-export const useDocumentHasFocus = () => {
-  // get the initial state
-  const [focus, setFocus] = useState(document.hasFocus())
-
-  useEffect(() => {
-    // helper functions to update the status
-    const onFocus = () => setFocus(true)
-    const onBlur = () => setFocus(false)
-
-    // assign the listener
-    // update the status on the event
-    if (globalThis.window && typeof globalThis.window !== 'undefined') {
-      globalThis.window.addEventListener('focus', onFocus)
-      globalThis.window.addEventListener('blur', onBlur)
-    }
-
-    // remove the listener
-    return () => {
-      if (globalThis.window && typeof globalThis.window !== 'undefined') {
-        globalThis.window.removeEventListener('focus', onFocus)
-        globalThis.window.removeEventListener('blur', onBlur)
-      }
-    }
-  }, [])
-
-  // return the status
-  return focus
-}

src/lang/artifact.test.ts

@@ -80,7 +80,6 @@ const mySketch001 = startSketchOn('XY')
       rotation: [0, 0, 0, 1],
       endCapId: null,
       startCapId: null,
-      sketchGroupValues: expect.any(Array),
       xAxis: { x: 1, y: 0, z: 0 },
       yAxis: { x: 0, y: 1, z: 0 },
       zAxis: { x: 0, y: 0, z: 1 },
@@ -123,7 +122,6 @@ const sk2 = startSketchOn('XY')
         rotation: [0, 0, 0, 1],
         endCapId: null,
         startCapId: null,
-        sketchGroupValues: expect.any(Array),
         xAxis: { x: 1, y: 0, z: 0 },
         yAxis: { x: 0, y: 1, z: 0 },
         zAxis: { x: 0, y: 0, z: 1 },
@@ -139,7 +137,6 @@ const sk2 = startSketchOn('XY')
 
         endCapId: null,
         startCapId: null,
-        sketchGroupValues: expect.any(Array),
         xAxis: { x: 1, y: 0, z: 0 },
         yAxis: { x: 0, y: 1, z: 0 },
         zAxis: { x: 0, y: 0, z: 1 },

src/lib/tauriFS.ts

@@ -15,16 +15,7 @@ export const FILE_EXT = '.kcl'
 export const PROJECT_ENTRYPOINT = 'main' + FILE_EXT
 const INDEX_IDENTIFIER = '$n' // $nn.. will pad the number with 0s
 export const MAX_PADDING = 7
-const RELEVANT_FILE_TYPES = [
-  'kcl',
-  'fbx',
-  'gltf',
-  'glb',
-  'obj',
-  'ply',
-  'step',
-  'stl',
-]
+const RELEVANT_FILE_TYPES = ['kcl']
 
 // Initializes the project directory and returns the path
 export async function initializeProjectDirectory(directory: string) {

src/machines/fileMachine.ts

@@ -7,7 +7,7 @@ export const DEFAULT_FILE_NAME = 'Untitled'
 
 export const fileMachine = createMachine(
   {
-    /** @xstate-layout N4IgpgJg5mDOIC5QDECWAbMACAtgQwGMALVAOzAGI9ZZUpSBtABgF1FQAHAe1oBdUupdiAAeiAKwBGcQDoALACYAHAE4AzGoUA2JXK1yANCACeiabOmSlGpkqsqAvg6NpMuQiXIyAEtSykuLAAzDDgKAGEAJzA8XmwQzGY2JBBuPgEhFLEESTVxWS1xBWVVcTU5PXEjUwRNFRkFWwB2FQVxJia5JnE5JxdQ92IyMB8-BLCAJTBSPBx40KThNNR+QWFslSVZJS1u3TUVSR1xJurEXSYZJslipismbTklPpBXbHwhr19YYNDYCOisXmiVYSx4Kwy6zMeQKRRKKjKFUKZwQPXqkjkmjUTCYWi0TQOCheb0GnhG31+mH+ABEwJg4pSwIsUstVplQNlcvkZIVikpSuVKijdFoZOItJJpEomtcYUTnK8Bh8yaMfuN-gB5DjTRnMzjgtlQnIwnlw-kIwXIkyIdSSGRKHF5XFqSwdYlKjzDVWM-4AZTAvCwsDpYAIcQgWAgqGiYa4kWMetSBshWTMNyaMkOuV0ChUBJUEpRnUuux6WmxGkkTF6CpJyq9URi-FIUEZFAgghGZAAblwANYjAiAuIAWnGidZKY50O5vPhiKF1oQcnF9q0myYCN2FSa4ndbnrXkbsTIrfGFDAkUicZkHHQsSCcZwMiHTbAY4WoJZybWqeNq82ddygUaQHiqJc7BkTRcwUOQjmKHR133d5PS8KYZhwU82w7Lwe37EZogw99xy-fV0l-adalzeQVForY1Ada4ni0FE5CaJRM0UAlmm6LRkNJL10NmLDz0va9Ilve9eEfSJn0I2ZiM-ZIyIhCjREQOoaLospGIxHYUQY0U8VaVoJUdB5+MPEZaXpETQnbTsZDwgcZAgENRxI5Sk3I9l1P-UVci6cUbg0JRlBRcRNkzHRdwUGVaPEOxLNQ6z3LszALyvG87wfJ9XPcxSQS8yc1M5PIMz0aU7gYuQCyOIsegaaUCTCwpnT42sPU+EYpjwKMWx9BzcNIXsXMBCAPypCcf187I7DUGQqweWDGgJNR8SLJ55AY9ibgLPJy2S7qZF6-qzz+IauxG-CZHGya4AYSRipmo15sWnFikUDoNA2pcXVkBQbFo7FuMkJojpVU70rCMTsqkmS5JiCb1WmnzXtyd7lq+tbfpqYoFEzSL9DqNofo6-oDxSigpiCaJYCIVHVNmxAtEaBpyxuZQ8iOaQUTBjNpWJxo2l3TpnheAI3PgFI6xSsE0b-EcWKXJWZBxHF2hAip0ySzrKeOikAh9eWmaNSVriappqy2CpWkkAzqLUJp8Q5h4DgRGsKZQg2xj+E3DT-c2OIlGVdwqFc4rUYUuntB0wesaQmhAvc9e9lVj2bc7MH9qc-OkNjMwFfkygLWqIpxe0cTsWCOiOE4IcE6ZhIG8Yc9KxBFFYlp5EkWirFB6Q1AbrwbIDaG2+ZnIegzTYLWLg59BUYUmAWwHKo3B51HlL2BLQpHoellSA8oooOOsSLGiRdowdY2r7RWu5OhdQLycVfWVS1aZx+-BXKPzmei70VLkvJcKhbBijKHicq3QQLiycEAA */
+    /** @xstate-layout N4IgpgJg5mDOIC5QAkD2BbMACdBDAxgBYCWAdmAHTK6xampYAOATqgFZj4AusAxAMLMwuLthbtOXANoAGALqJQjVLGJdiqUopAAPRAHYAbPooAWABwBGUwE5zAJgeGArM-MAaEAE9EN0wGYKGX97GX1nGVNDS0MbfwBfeM80TBwCEnIqGiZWDm4+ACUwUlxU8TzpeW1lVXVNbT0EcJNg02d-fzt7fU77Tx8EQ0iKCPtnfUsjGRtLGXtE5IxsPCIySmpacsk+QWFRHIluWQUkEBq1DS1TxqN7ChjzOxtXf0t7a37EcwsRibH-ZzRezA8wLEApZbpNZZTa5ba8AAiYAANmB9lsjlVTuc6ldQDdDOYKP5bm0os5TDJDJ8mlEzPpzIZHA4bO9umCIWlVpkNgcKnwAPKMYp8yTHaoqC71a6IEmBUz6BkWZzWDq2Uw0qzOIJAwz+PXWfSmeZJcFLLkZSi7ERkKCi7i8CCaShkABuqAA1pR8EIRGAALQYyonJSS3ENRDA2wUeyvd6dPVhGw0-RhGOp8IA8xGFkc80rS0Ua3qUh2oO8MDMVjMCiMZEiABmqGY6AoPr2AaD4uxYcuEYQoQpQWNNjsMnMgLGKbT3TC7TcOfsNjzqQL0KKJXQtvtXEdzoobs9lCEm87cMxIbOvel+MQqtMQRmS5ks31sZpAUsZkcIX+cQZJIrpC3KUBupTbuWlbVrW9ZcE2LYUCepRnocwYSrUfYyggbzvBQ+jMq49imLYwTUt4iCft+5i-u0-7UfoQEWtCSKoiWZbnruTqZIeXoUBAKJoihFTdqGGE3rod7UdqsQTI8hiGAqrIauRA7RvYeoqhO1jtAqjFrpkLFohBHEVlWzYwY2zatvxrFCWKWKiVKeISdh4yBJE-jGs4fhhA4zg0kRNgxhplhaW0nn4XpUKZEUuAQMZqF8FxLqkO6vG+hAgYcbAIlXmJzmNERdy0RYNiKgpthxDSEU6q8MSTJYjWGFFIEULF8WljuSX7jxx7CJlQY5ZYl44pht4IP61gyPc8njt0lIuH51UKrVVITEyMy2C1hbtQl-KmdBdaWQhGVZYluWjeJjSTf402shMEyuEyljPAFL0UNmMiuN86lWHMiSmvQ-HwKcnL6WA6FOf2k3mESMRDA4RpUm4U4qf6gSEt0QIvvqfjOCaiyrtF6zZPQXWQ+GWFlUEsbmNMf1TV9NLeXDcqRIySnNaaYPEzC5M9vl-b+IyFCjupryPF9jKWP5Kks-cbMWLERHRNt0LFntkgU2NLk4dqsz43YsTK++Kk2C+MbTOOcxzOMrhqzFxTgZ1Qba1dd6BUE1jGsLMxxK9KlDNqm3tMLUQvqYlgO5QhlsTubsFXesTTUuPTfHExshDS0RftRftGgEnTZtHbX9Zr+QJ-2S4Y3qnmTC+4tMyp1EfeOnmeQqdOhyXQrFOXXCV1hCkmLDOnBJYvRRDSsyRzGjiKj0lKdAkANAA */
     id: 'File machine',
 
     initial: 'Reading files',
@@ -24,8 +24,6 @@ export const fileMachine = createMachine(
         })),
         target: '.Reading files',
       },
-
-      Refresh: '.Reading files',
     },
     states: {
       'Has no files': {
@@ -160,8 +158,7 @@ export const fileMachine = createMachine(
             type: 'done.invoke.read-files'
             data: ProjectWithEntryPointMetadata
           }
-        | { type: 'assign'; data: { [key: string]: any } }
-        | { type: 'Refresh' },
+        | { type: 'assign'; data: { [key: string]: any } },
     },
 
     predictableActionArguments: true,

src/wasm-lib/Cargo.lock

@@ -1877,9 +1877,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.69"
+version = "0.3.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -1952,9 +1952,9 @@ dependencies = [
 
 [[package]]
 name = "kittycad"
-version = "0.2.59"
+version = "0.2.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4080db4364c103601db486e4a8aa889ea56c011991e4c454373d8050a165d3da"
+checksum = "049c3881ffbe77bf1c3a968372a246ce906eceb79f61cd0bc5fa229bec3504cb"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2259,9 +2259,9 @@ checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
 
 [[package]]
 name = "mio"
-version = "0.8.11"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
 dependencies = [
  "libc",
  "wasi",
@@ -2427,7 +2427,7 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 [[package]]
 name = "openapitor"
 version = "0.0.9"
-source = "git+https://github.com/KittyCAD/kittycad.rs?branch=main#6f38abe149c74aa9675e9f0d370aa2f78980dc2d"
+source = "git+https://github.com/KittyCAD/kittycad.rs?branch=main#8db292eaa7be0292512a2cdbef09f2d37af7c79c"
 dependencies = [
  "Inflector",
  "anyhow",
@@ -3621,9 +3621,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.114"
+version = "1.0.113"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
+checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
 dependencies = [
  "indexmap 2.2.2",
  "itoa",
@@ -4798,9 +4798,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.92"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -4808,9 +4808,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b"
 dependencies = [
  "bumpalo",
  "log",
@@ -4836,9 +4836,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -4846,9 +4846,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4859,9 +4859,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"
 
 [[package]]
 name = "wasm-lib"

src/wasm-lib/Cargo.toml

@@ -14,7 +14,7 @@ bson = { version = "2.9.0", features = ["uuid-1", "chrono"] }
 gloo-utils = "0.2.0"
 kcl-lib = { path = "kcl" }
 kittycad = { workspace = true }
-serde_json = "1.0.114"
+serde_json = "1.0.108"
 uuid = { version = "1.7.0", features = ["v4", "js", "serde"] }
 wasm-bindgen = "0.2.91"
 wasm-bindgen-futures = "0.4.41"
@@ -31,7 +31,7 @@ uuid = { version = "1.7.0", features = ["v4", "js", "serde"] }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 futures = "0.3.30"
-js-sys = "0.3.69"
+js-sys = "0.3.68"
 tower-lsp = { version = "0.20.0", default-features = false, features = ["runtime-agnostic"] }
 wasm-bindgen-futures = { version = "0.4.41", features = ["futures-core-03-stream"] }
 wasm-streams = "0.4.0"
@@ -58,7 +58,7 @@ members = [
 ]
 
 [workspace.dependencies]
-kittycad = { version = "0.2.59", default-features = false, features = ["js", "requests"] }
+kittycad = { version = "0.2.58", default-features = false, features = ["js", "requests"] }
 kittycad-execution-plan = { git = "https://github.com/KittyCAD/modeling-api", branch = "main" }
 kittycad-execution-plan-macros = { git = "https://github.com/KittyCAD/modeling-api", branch = "main" }
 kittycad-execution-plan-traits = { git = "https://github.com/KittyCAD/modeling-api", branch = "main" }

src/wasm-lib/grackle/Cargo.toml

@@ -19,4 +19,4 @@ uuid = "1.7"
 
 [dev-dependencies]
 pretty_assertions = "1"
-serde_json = "1.0.114"
+serde_json = "1.0.113"

src/wasm-lib/kcl/Cargo.toml

@@ -30,14 +30,14 @@ reqwest = { version = "0.11.24", default-features = false, features = ["stream",
 ropey = "1.6.1"
 schemars = { version = "0.8.16", features = ["impl_json_schema", "url", "uuid1"] }
 serde = { version = "1.0.193", features = ["derive"] }
-serde_json = "1.0.114"
+serde_json = "1.0.108"
 thiserror = "1.0.57"
 ts-rs = { version = "7.1.1", features = ["uuid-impl"] }
 uuid = { version = "1.7.0", features = ["v4", "js", "serde"] }
 winnow = "0.5.40"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-js-sys = { version = "0.3.69" }
+js-sys = { version = "0.3.68" }
 tower-lsp = { version = "0.20.0", default-features = false, features = ["runtime-agnostic"] }
 wasm-bindgen = "0.2.91"
 wasm-bindgen-futures = "0.4.41"

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

@@ -1091,7 +1091,7 @@ impl CallExpression {
                             function_expression.params.len(),
                             fn_args.len(),
                         ),
-                        source_ranges: vec![self.into()],
+                        source_ranges: vec![(function_expression).into()],
                     }));
                 }
 

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

@@ -101,14 +101,20 @@ impl Default for ProgramMemory {
 #[ts(export)]
 #[serde(rename_all = "camelCase", untagged)]
 pub enum ProgramReturn {
-    Arguments,
+    Arguments(Vec<Value>),
     Value(MemoryItem),
 }
 
 impl From<ProgramReturn> for Vec<SourceRange> {
     fn from(item: ProgramReturn) -> Self {
         match item {
-            ProgramReturn::Arguments => Default::default(),
+            ProgramReturn::Arguments(args) => args
+                .iter()
+                .map(|arg| {
+                    let r: SourceRange = arg.into();
+                    r
+                })
+                .collect(),
             ProgramReturn::Value(v) => v.into(),
         }
     }
@@ -118,8 +124,8 @@ impl ProgramReturn {
     pub fn get_value(&self) -> Result<MemoryItem, KclError> {
         match self {
             ProgramReturn::Value(v) => Ok(v.clone()),
-            ProgramReturn::Arguments => Err(KclError::Semantic(KclErrorDetails {
-                message: "Cannot get value from arguments".to_owned(),
+            ProgramReturn::Arguments(args) => Err(KclError::Semantic(KclErrorDetails {
+                message: format!("Cannot get value from arguments: {:?}", args),
                 source_ranges: self.clone().into(),
             })),
         }
@@ -552,8 +558,6 @@ pub struct ExtrudeGroup {
     pub id: uuid::Uuid,
     /// The extrude surfaces.
     pub value: Vec<ExtrudeSurface>,
-    /// The sketch group paths.
-    pub sketch_group_values: Vec<Path>,
     /// The height of the extrude group.
     pub height: f64,
     /// The position of the extrude group.

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

@@ -159,7 +159,6 @@ async fn inner_extrude(length: f64, sketch_group: Box<SketchGroup>, args: Args)
         // sketch group.
         id: sketch_group.id,
         value: new_value,
-        sketch_group_values: sketch_group.value.clone(),
         height: length,
         position: sketch_group.position,
         rotation: sketch_group.rotation,

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

@@ -1,308 +0,0 @@
-//! Standard library fillets.
-
-use anyhow::Result;
-use derive_docs::stdlib;
-use kittycad::types::ModelingCmd;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use uuid::Uuid;
-
-use crate::{
-    errors::{KclError, KclErrorDetails},
-    executor::{ExtrudeGroup, ExtrudeSurface, MemoryItem, UserVal},
-    std::Args,
-};
-
-/// Data for fillets.
-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
-#[ts(export)]
-#[serde(rename_all = "camelCase")]
-pub struct FilletData {
-    /// The radius of the fillet.
-    pub radius: f64,
-    /// The tags of the paths you want to fillet.
-    pub tags: Vec<StringOrUuid>,
-}
-
-/// 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 StringOrUuid {
-    /// A uuid.
-    Uuid(Uuid),
-    /// A string.
-    String(String),
-}
-
-/// Create fillets on tagged paths.
-pub async fn fillet(args: Args) -> Result<MemoryItem, KclError> {
-    let (data, extrude_group): (FilletData, Box<ExtrudeGroup>) = args.get_data_and_extrude_group()?;
-
-    let extrude_group = inner_fillet(data, extrude_group, args).await?;
-    Ok(MemoryItem::ExtrudeGroup(extrude_group))
-}
-
-/// Create fillets on tagged paths.
-#[stdlib {
-    name = "fillet",
-}]
-async fn inner_fillet(
-    data: FilletData,
-    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 {
-            StringOrUuid::Uuid(uuid) => uuid,
-            StringOrUuid::String(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: 0.0000001, // We can let the user set this in the future.
-            },
-        )
-        .await?;
-    }
-
-    Ok(extrude_group)
-}
-
-/// Get the opposite edge to the edge given.
-pub async fn get_opposite_edge(args: Args) -> Result<MemoryItem, KclError> {
-    let (tag, extrude_group): (String, Box<ExtrudeGroup>) = args.get_data_and_extrude_group()?;
-
-    let edge = inner_get_opposite_edge(tag, extrude_group, args.clone()).await?;
-    Ok(MemoryItem::UserVal(UserVal {
-        value: serde_json::to_value(edge).map_err(|e| {
-            KclError::Type(KclErrorDetails {
-                message: format!("Failed to convert Uuid to json: {}", e),
-                source_ranges: vec![args.source_range],
-            })
-        })?,
-        meta: vec![args.source_range.into()],
-    }))
-}
-
-/// Get the opposite edge to the edge given.
-#[stdlib {
-    name = "getOppositeEdge",
-}]
-async fn inner_get_opposite_edge(tag: String, extrude_group: Box<ExtrudeGroup>, args: Args) -> Result<Uuid, KclError> {
-    let tagged_path = 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();
-
-    let face_id = get_adjacent_face_to_tag(&extrude_group, &tag, &args)?;
-
-    let resp = args
-        .send_modeling_cmd(
-            uuid::Uuid::new_v4(),
-            ModelingCmd::Solid3DGetOppositeEdge {
-                edge_id: tagged_path.geo_meta.id,
-                object_id: extrude_group.id,
-                face_id,
-            },
-        )
-        .await?;
-    let kittycad::types::OkWebSocketResponseData::Modeling {
-        modeling_response: kittycad::types::OkModelingCmdResponse::Solid3DGetOppositeEdge { data: opposite_edge },
-    } = &resp
-    else {
-        return Err(KclError::Engine(KclErrorDetails {
-            message: format!("Solid3DGetOppositeEdge response was not as expected: {:?}", resp),
-            source_ranges: vec![args.source_range],
-        }));
-    };
-
-    Ok(opposite_edge.edge)
-}
-
-/// Get the next adjacent edge to the edge given.
-pub async fn get_next_adjacent_edge(args: Args) -> Result<MemoryItem, KclError> {
-    let (tag, extrude_group): (String, Box<ExtrudeGroup>) = args.get_data_and_extrude_group()?;
-
-    let edge = inner_get_next_adjacent_edge(tag, extrude_group, args.clone()).await?;
-    Ok(MemoryItem::UserVal(UserVal {
-        value: serde_json::to_value(edge).map_err(|e| {
-            KclError::Type(KclErrorDetails {
-                message: format!("Failed to convert Uuid to json: {}", e),
-                source_ranges: vec![args.source_range],
-            })
-        })?,
-        meta: vec![args.source_range.into()],
-    }))
-}
-
-/// Get the next adjacent edge to the edge given.
-#[stdlib {
-    name = "getNextAdjacentEdge",
-}]
-async fn inner_get_next_adjacent_edge(
-    tag: String,
-    extrude_group: Box<ExtrudeGroup>,
-    args: Args,
-) -> Result<Uuid, KclError> {
-    let tagged_path = 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();
-
-    let face_id = get_adjacent_face_to_tag(&extrude_group, &tag, &args)?;
-
-    let resp = args
-        .send_modeling_cmd(
-            uuid::Uuid::new_v4(),
-            ModelingCmd::Solid3DGetNextAdjacentEdge {
-                edge_id: tagged_path.geo_meta.id,
-                object_id: extrude_group.id,
-                face_id,
-            },
-        )
-        .await?;
-    let kittycad::types::OkWebSocketResponseData::Modeling {
-        modeling_response: kittycad::types::OkModelingCmdResponse::Solid3DGetNextAdjacentEdge { data: ajacent_edge },
-    } = &resp
-    else {
-        return Err(KclError::Engine(KclErrorDetails {
-            message: format!("Solid3DGetNextAdjacentEdge response was not as expected: {:?}", resp),
-            source_ranges: vec![args.source_range],
-        }));
-    };
-
-    ajacent_edge.edge.ok_or_else(|| {
-        KclError::Type(KclErrorDetails {
-            message: format!("No edge found next adjacent to tag: `{}`", tag),
-            source_ranges: vec![args.source_range],
-        })
-    })
-}
-
-/// Get the previous adjacent edge to the edge given.
-pub async fn get_previous_adjacent_edge(args: Args) -> Result<MemoryItem, KclError> {
-    let (tag, extrude_group): (String, Box<ExtrudeGroup>) = args.get_data_and_extrude_group()?;
-
-    let edge = inner_get_previous_adjacent_edge(tag, extrude_group, args.clone()).await?;
-    Ok(MemoryItem::UserVal(UserVal {
-        value: serde_json::to_value(edge).map_err(|e| {
-            KclError::Type(KclErrorDetails {
-                message: format!("Failed to convert Uuid to json: {}", e),
-                source_ranges: vec![args.source_range],
-            })
-        })?,
-        meta: vec![args.source_range.into()],
-    }))
-}
-
-/// Get the previous adjacent edge to the edge given.
-#[stdlib {
-    name = "getPreviousAdjacentEdge",
-}]
-async fn inner_get_previous_adjacent_edge(
-    tag: String,
-    extrude_group: Box<ExtrudeGroup>,
-    args: Args,
-) -> Result<Uuid, KclError> {
-    let tagged_path = 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();
-
-    let face_id = get_adjacent_face_to_tag(&extrude_group, &tag, &args)?;
-
-    let resp = args
-        .send_modeling_cmd(
-            uuid::Uuid::new_v4(),
-            ModelingCmd::Solid3DGetPrevAdjacentEdge {
-                edge_id: tagged_path.geo_meta.id,
-                object_id: extrude_group.id,
-                face_id,
-            },
-        )
-        .await?;
-    let kittycad::types::OkWebSocketResponseData::Modeling {
-        modeling_response: kittycad::types::OkModelingCmdResponse::Solid3DGetPrevAdjacentEdge { data: ajacent_edge },
-    } = &resp
-    else {
-        return Err(KclError::Engine(KclErrorDetails {
-            message: format!("Solid3DGetPrevAdjacentEdge response was not as expected: {:?}", resp),
-            source_ranges: vec![args.source_range],
-        }));
-    };
-
-    ajacent_edge.edge.ok_or_else(|| {
-        KclError::Type(KclErrorDetails {
-            message: format!("No edge found previous adjacent to tag: `{}`", tag),
-            source_ranges: vec![args.source_range],
-        })
-    })
-}
-
-fn get_adjacent_face_to_tag(extrude_group: &ExtrudeGroup, tag: &str, args: &Args) -> Result<uuid::Uuid, KclError> {
-    extrude_group
-        .value
-        .iter()
-        .find_map(|extrude_surface| match extrude_surface {
-            ExtrudeSurface::ExtrudePlane(extrude_plane) if extrude_plane.name == tag => Some(Ok(extrude_plane.face_id)),
-            ExtrudeSurface::ExtrudeArc(extrude_arc) if extrude_arc.name == tag => Some(Ok(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],
-            })
-        })?
-}

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

@@ -1,7 +1,6 @@
 //! Functions implemented for language execution.
 
 pub mod extrude;
-pub mod fillet;
 pub mod import;
 pub mod kcl_stdlib;
 pub mod math;
@@ -74,10 +73,6 @@ lazy_static! {
         Box::new(crate::std::sketch::Hole),
         Box::new(crate::std::patterns::PatternLinear),
         Box::new(crate::std::patterns::PatternCircular),
-        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::import::Import),
         Box::new(crate::std::math::Cos),
         Box::new(crate::std::math::Sin),
@@ -578,50 +573,6 @@ impl Args {
         Ok((data, sketch_surface))
     }
 
-    fn get_data_and_extrude_group<T: serde::de::DeserializeOwned>(&self) -> Result<(T, Box<ExtrudeGroup>), KclError> {
-        let first_value = self
-            .args
-            .first()
-            .ok_or_else(|| {
-                KclError::Type(KclErrorDetails {
-                    message: format!("Expected a struct as the first argument, found `{:?}`", self.args),
-                    source_ranges: vec![self.source_range],
-                })
-            })?
-            .get_json_value()?;
-
-        let data: T = serde_json::from_value(first_value).map_err(|e| {
-            KclError::Type(KclErrorDetails {
-                message: format!("Failed to deserialize struct from JSON: {}", e),
-                source_ranges: vec![self.source_range],
-            })
-        })?;
-
-        let second_value = self.args.get(1).ok_or_else(|| {
-            KclError::Type(KclErrorDetails {
-                message: format!(
-                    "Expected an ExtrudeGroup as the second argument, found `{:?}`",
-                    self.args
-                ),
-                source_ranges: vec![self.source_range],
-            })
-        })?;
-
-        let extrude_group = if let MemoryItem::ExtrudeGroup(eg) = second_value {
-            eg.clone()
-        } else {
-            return Err(KclError::Type(KclErrorDetails {
-                message: format!(
-                    "Expected an ExtrudeGroup as the second argument, found `{:?}`",
-                    self.args
-                ),
-                source_ranges: vec![self.source_range],
-            }));
-        };
-
-        Ok((data, extrude_group))
-    }
-
     fn get_segment_name_to_number_sketch_group(&self) -> Result<(String, f64, Box<SketchGroup>), KclError> {
         // Iterate over our args, the first argument should be a UserVal with a string value.
         // The second argument should be a number.

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

@@ -203,107 +203,6 @@ const part002 = startSketchOn(part001, "END")
     );
 }
 
-#[tokio::test(flavor = "multi_thread")]
-async fn serial_test_fillet_duplicate_tags() {
-    let code = r#"const part001 = startSketchOn('XY')
-    |> startProfileAt([0,0], %)
-    |> line({to: [0, 10], tag: "thing"}, %)
-    |> line([10, 0], %)
-    |> line({to: [0, -10], tag: "thing2"}, %)
-    |> close(%)
-    |> extrude(10, %)
-    |> fillet({radius: 0.5, tags: ["thing", "thing"]}, %)
-"#;
-
-    let result = execute_and_snapshot(code, kittycad::types::UnitLength::Mm).await;
-    assert!(result.is_err());
-    assert_eq!(
-        result.err().unwrap().to_string(),
-        r#"type: KclErrorDetails { source_ranges: [SourceRange([227, 277])], message: "Duplicate tags are not allowed." }"#,
-    );
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn serial_test_basic_fillet_cube_start() {
-    let code = r#"const part001 = startSketchOn('XY')
-    |> startProfileAt([0,0], %)
-    |> line({to: [0, 10], tag: "thing"}, %)
-    |> line([10, 0], %)
-    |> line({to: [0, -10], tag: "thing2"}, %)
-    |> close(%)
-    |> extrude(10, %)
-    |> fillet({radius: 2, tags: ["thing", "thing2"]}, %)
-"#;
-
-    let result = execute_and_snapshot(code, kittycad::types::UnitLength::Mm)
-        .await
-        .unwrap();
-    twenty_twenty::assert_image("tests/executor/outputs/basic_fillet_cube_start.png", &result, 0.999);
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn serial_test_basic_fillet_cube_end() {
-    let code = r#"const part001 = startSketchOn('XY')
-    |> startProfileAt([0,0], %)
-    |> line({to: [0, 10], tag: "thing"}, %)
-    |> line([10, 0], %)
-    |> line({to: [0, -10], tag: "thing2"}, %)
-    |> close(%)
-    |> extrude(10, %)
-    |> fillet({radius: 2, tags: ["thing", getOppositeEdge("thing", %)]}, %)
-
-"#;
-
-    let result = execute_and_snapshot(code, kittycad::types::UnitLength::Mm)
-        .await
-        .unwrap();
-    twenty_twenty::assert_image("tests/executor/outputs/basic_fillet_cube_end.png", &result, 0.999);
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn serial_test_basic_fillet_cube_next_adjacent() {
-    let code = r#"const part001 = startSketchOn('XY')
-    |> startProfileAt([0,0], %)
-    |> line({to: [0, 10], tag: "thing"}, %)
-    |> line({to: [10, 0], tag: "thing1"}, %)
-    |> line({to: [0, -10], tag: "thing2"}, %)
-    |> close(%)
-    |> extrude(10, %)
-    |> fillet({radius: 2, tags: [getNextAdjacentEdge("thing", %)]}, %)
-"#;
-
-    let result = execute_and_snapshot(code, kittycad::types::UnitLength::Mm)
-        .await
-        .unwrap();
-    twenty_twenty::assert_image(
-        "tests/executor/outputs/basic_fillet_cube_next_adjacent.png",
-        &result,
-        0.999,
-    );
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn serial_test_basic_fillet_cube_previous_adjacent() {
-    let code = r#"const part001 = startSketchOn('XY')
-    |> startProfileAt([0,0], %)
-    |> line({to: [0, 10], tag: "thing"}, %)
-    |> line({to: [10, 0], tag: "thing1"}, %)
-    |> line({to: [0, -10], tag: "thing2"}, %)
-    |> close(%)
-    |> extrude(10, %)
-    |> fillet({radius: 2, tags: [getPreviousAdjacentEdge("thing2", %)]}, %)
-"#;
-
-    let result = execute_and_snapshot(code, kittycad::types::UnitLength::Mm)
-        .await
-        .unwrap();
-    twenty_twenty::assert_image(
-        "tests/executor/outputs/basic_fillet_cube_previous_adjacent.png",
-        &result,
-        0.999,
-    );
-}
-
 #[tokio::test(flavor = "multi_thread")]
 async fn serial_test_execute_with_function_sketch() {
     let code = r#"fn box = (h, l, w) => {
@@ -1215,24 +1114,3 @@ const part003 = startSketchOn(part002, "end")
         .unwrap();
     twenty_twenty::assert_image("tests/executor/outputs/sketch_on_face_of_face.png", &result, 1.0);
 }
-
-#[tokio::test(flavor = "multi_thread")]
-async fn serial_test_stdlib_kcl_error_right_code_path() {
-    let code = r#"const square = startSketchOn('XY')
-  |> startProfileAt([0, 0], %)
-  |> line([0, 10], %)
-  |> line([10, 0], %)
-  |> line([0, -10], %)
-  |> close(%)
-  |> hole(circle([2, 2], .5), %)
-  |> hole(circle('XY', [2, 8], .5), %)
-  |> extrude(2, %)
-"#;
-
-    let result = execute_and_snapshot(code, kittycad::types::UnitLength::Mm).await;
-    assert!(result.is_err());
-    assert_eq!(
-        result.err().unwrap().to_string(),
-        r#"semantic: KclErrorDetails { source_ranges: [SourceRange([157, 175])], message: "this function expected 3 arguments, got 2" }"#
-    );
-}