circular dependencies refactor (#1863)

* circular dependencies refactor

* clean up

src/hooks/useEngineConnectionSubscriptions.ts

@@ -1,6 +1,6 @@
 import { useEffect } from 'react'
 import { useStore } from 'useStore'
-import { engineCommandManager } from '../lang/std/engineConnection'
+import { engineCommandManager } from 'lib/singletons'
 import { useModelingContext } from './useModelingContext'
 import { getEventForSelectWithPoint } from 'lib/selections'
 

src/hooks/useSetupEngineManager.ts

@@ -1,9 +1,8 @@
 import { useLayoutEffect, useEffect, useRef } from 'react'
 import { parse } from '../lang/wasm'
 import { useStore } from '../useStore'
-import { engineCommandManager } from '../lang/std/engineConnection'
+import { engineCommandManager, kclManager } from 'lib/singletons'
 import { deferExecution } from 'lib/utils'
-import { kclManager } from 'lang/KclSingleton'
 
 export function useSetupEngineManager(
   streamRef: React.RefObject<HTMLDivElement>,

src/hooks/useStateMachineCommands.ts

@@ -11,7 +11,7 @@ import {
   NetworkHealthState,
   useNetworkStatus,
 } from 'components/NetworkHealthIndicator'
-import { useKclContext } from 'lang/KclSingleton'
+import { useKclContext } from 'lang/KclProvider'
 import { useStore } from 'useStore'
 
 // This might not be necessary, AnyStateMachine from xstate is working

src/hooks/useToolbarGuards.ts

@@ -2,7 +2,7 @@ import {
   SetVarNameModal,
   createSetVarNameModal,
 } from 'components/SetVarNameModal'
-import { kclManager } from 'lang/KclSingleton'
+import { kclManager } from 'lib/singletons'
 import { moveValueIntoNewVariable } from 'lang/modifyAst'
 import { isNodeSafeToReplace } from 'lang/queryAst'
 import { useEffect, useState } from 'react'