From 4fdbe07ea2edd2f35148a9be261afe306b553809 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 7 Mar 2022 21:25:53 -0800
Subject: [PATCH 001/531] hard code production thoth in env

---
 client/.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/.env b/client/.env
index d1294695d..47fa9983a 100644
--- a/client/.env
+++ b/client/.env
@@ -1,7 +1,7 @@
 EXTEND_ESLINT = true
 
 # This prod site root assumes the netlify build context $URL is available, replace for other hosts
-REACT_APP_SITE_ROOT_URL_PROD=$URL
+REACT_APP_SITE_ROOT_URL_PROD=http://thoth.latitude.io/
 REACT_APP_SITE_ROOT_URL=http://localhost:3001
 REACT_APP_LAPI_ROOT_URL=http://localhost:8000
 REACT_APP_LAPI_ROOT_URL_PROD=https://api.latitude.io

From 8aa8642193a99f4183d22907fff0c9c98012aabd Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Thu, 17 Mar 2022 17:07:46 -0700
Subject: [PATCH 002/531] prevent trimming of newline in map

---
 core/src/components/Generator.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/src/components/Generator.ts b/core/src/components/Generator.ts
index ecc68c157..fea0f609a 100644
--- a/core/src/components/Generator.ts
+++ b/core/src/components/Generator.ts
@@ -118,7 +118,10 @@ export class Generator extends ThothComponent<Promise<WorkerReturn>> {
     const prompt = template(inputs)
 
     const stop = node?.data?.stop
-      ? stopSequence.split(',').map(i => i.trim())
+      ? stopSequence.split(',').map(i => {
+          if (i === '\n') return i
+          return i.trim()
+        })
       : ['\n']
 
     const tempData = node.data.temp as string

From 29a1e1100df98715827711c3b6f6385620de8a00 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Fri, 18 Mar 2022 11:40:03 -0700
Subject: [PATCH 003/531] Fix component import ordering

---
 core/src/components/components.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/src/components/components.ts b/core/src/components/components.ts
index 2ae1b5818..1bc6dc477 100644
--- a/core/src/components/components.ts
+++ b/core/src/components/components.ts
@@ -2,6 +2,12 @@ import { ActionTypeComponent } from './ActionType'
 import { Alert } from './AlertMessage'
 import { BooleanGate } from './BooleanGate'
 import { Code } from './Code'
+import { InputFieldComponent } from './deprecated/InputField'
+import { ModuleInput } from './deprecated/ModuleInput'
+import { ModuleOutput } from './deprecated/ModuleOutput'
+import { PlaytestInput } from './deprecated/PlaytestInput'
+import { PlaytestPrint } from './deprecated/PlaytestPrint'
+import { RunInputComponent } from './deprecated/RunInput'
 import { DifficultyDetectorComponent } from './DifficultyDetector'
 import { EnkiTask } from './EnkiTask'
 import { EntityDetector } from './EntityDetector'
@@ -9,19 +15,11 @@ import { ForEach } from './ForEach'
 import { Generator } from './Generator'
 import { HuggingfaceComponent } from './Huggingface'
 import { InputComponent } from './Input'
-import { InputFieldComponent } from './deprecated/InputField'
 import { ItemTypeComponent } from './ItemDetector'
 import { JoinListComponent } from './JoinList'
 import { ModuleComponent } from './Module'
-import { ModuleInput } from './deprecated/ModuleInput'
-import { ModuleOutput } from './deprecated/ModuleOutput'
-import { TriggerIn } from './TriggerIn'
-import { TriggerOut } from './TriggerOut'
 import { Output } from './Output'
-import { PlaytestInput } from './deprecated/PlaytestInput'
-import { PlaytestPrint } from './deprecated/PlaytestPrint'
 import { ProseToScript } from './ProseToScript'
-import { RunInputComponent } from './deprecated/RunInput'
 import { SafetyVerifier } from './SafetyVerifier'
 import { StateRead } from './StateRead'
 import { StateWrite } from './StateWrite'
@@ -29,6 +27,8 @@ import { StringProcessor } from './StringProcessor'
 import { SwitchGate } from './SwitchGate'
 import { TenseTransformer } from './TenseTransformer'
 import { TimeDetectorComponent } from './TimeDetector'
+import { TriggerIn } from './TriggerIn'
+import { TriggerOut } from './TriggerOut'
 import { VisualGeneration } from './VisualGeneration'
 
 // Here we load up all components of the builder into our editor for usage.

From 72b98a710a8db7e2de4f2e82071e6b2018dd3b46 Mon Sep 17 00:00:00 2001
From: Nick Walton <nickwalton00@gmail.com>
Date: Fri, 18 Mar 2022 13:10:08 -0700
Subject: [PATCH 004/531] generator can select (requires a lapi change)

---
 .../DataControls/DataControls.jsx             |  2 +
 .../DataControls/DropdownSelect.tsx           | 38 +++++++++++++++++++
 client/src/features/common/Select/Select.jsx  | 24 ++++++++++--
 client/src/services/game-api/text.ts          |  7 ++--
 core/src/components/Generator.ts              | 17 ++++++++-
 core/src/dataControls/DropdownControl.ts      | 34 +++++++++++++++++
 6 files changed, 113 insertions(+), 9 deletions(-)
 create mode 100644 client/src/features/Thoth/windows/InspectorWindow/DataControls/DropdownSelect.tsx
 create mode 100644 core/src/dataControls/DropdownControl.ts

diff --git a/client/src/features/Thoth/windows/InspectorWindow/DataControls/DataControls.jsx b/client/src/features/Thoth/windows/InspectorWindow/DataControls/DataControls.jsx
index cac6b7c7e..c8415ba18 100644
--- a/client/src/features/Thoth/windows/InspectorWindow/DataControls/DataControls.jsx
+++ b/client/src/features/Thoth/windows/InspectorWindow/DataControls/DataControls.jsx
@@ -8,6 +8,7 @@ import InputGenerator from './InputGenerator'
 import LongText from './LongTextControl'
 import ModuleSelect from './ModuleSelect'
 import OutputGenerator from './OutputGenerator'
+import DropdownSelect from './DropdownSelect'
 import SocketGenerator from './SocketGenerator'
 import PlaytestControl from './PlaytestControl'
 import SwitchControl from './SwitchControl'
@@ -28,6 +29,7 @@ const controlMap = {
   socketGenerator: SocketGenerator,
   playtest: PlaytestControl,
   switch: SwitchControl,
+  dropdownSelect: DropdownSelect,
 }
 
 const DataControls = ({
diff --git a/client/src/features/Thoth/windows/InspectorWindow/DataControls/DropdownSelect.tsx b/client/src/features/Thoth/windows/InspectorWindow/DataControls/DropdownSelect.tsx
new file mode 100644
index 000000000..d798a2d82
--- /dev/null
+++ b/client/src/features/Thoth/windows/InspectorWindow/DataControls/DropdownSelect.tsx
@@ -0,0 +1,38 @@
+import Select from '../../../../common/Select/Select'
+
+const DropdownSelect = ({ control, updateData, initialValue }) => {
+  const { dataKey, data } = control
+
+  const {values, defaultValue} = data
+
+  const options = values.map((value, index) => ({
+      value: value,
+      label: value,
+    }))
+
+  const value = initialValue?.length > 0 ? initialValue : defaultValue
+
+  const defaultVal = {value, label: value}
+
+  const onChange = async ({ value }) => {
+    update(value)
+  }
+
+  const update = update => {
+    updateData({ [dataKey]: update })
+  }
+
+  return (
+    <div style={{ flex: 1 }}>
+      <Select
+        options={options}
+        onChange={onChange}
+        defaultValue={defaultVal}
+        placeholder="select value"
+        creatable={false}
+      />
+    </div>
+  )
+}
+
+export default DropdownSelect
diff --git a/client/src/features/common/Select/Select.jsx b/client/src/features/common/Select/Select.jsx
index 657b9a42a..2ab83fdd5 100644
--- a/client/src/features/common/Select/Select.jsx
+++ b/client/src/features/common/Select/Select.jsx
@@ -1,6 +1,7 @@
 import React, { useRef } from 'react'
 import { useHotkeys } from 'react-hotkeys-hook'
 import Creatable from 'react-select/creatable'
+import Select from 'react-select'
 
 import Chip from '../Chip/Chip'
 import Icon, { componentCategories } from '../Icon/Icon'
@@ -12,6 +13,7 @@ const BasicSelect = ({
   placeholder,
   style = {},
   focusKey = '',
+  creatable=true,
   nested = false,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   isValidNewOption = (inputValue, selectValue, selectOptions, accessors) =>
@@ -125,7 +127,7 @@ const BasicSelect = ({
       alignItems: 'center',
     }),
     singleValue: () => ({
-      color: 'rgba(255,255,255,0.5)',
+      color: 'rgba(255,255,255)',
     }),
   }
 
@@ -133,11 +135,13 @@ const BasicSelect = ({
     if (!props.creatable) return false
     return isValidNewOption(...args)
   }
-
   return (
     <span className={css['select-dropdown-container']} style={style}>
+
       {options ? (
-        <Creatable
+        <>
+        {creatable && (
+          <Creatable
           isValidNewOption={_isValidNewOption}
           options={options}
           onChange={onChange}
@@ -149,6 +153,20 @@ const BasicSelect = ({
           formatGroupLabel={formatGroupLabel}
           {...props}
         />
+        )}
+        {!creatable && (
+          <Select
+          options={options}
+          onChange={onChange}
+          styles={styles}
+          placeholder={placeholder}
+          components={{ DropdownIndicator }}
+          ref={selectRef}
+          {...props}
+        />
+        )}
+        
+        </>
       ) : (
         <Chip noEvents label={'No options available...'} />
       )}
diff --git a/client/src/services/game-api/text.ts b/client/src/services/game-api/text.ts
index 8e1ee3ab0..19f942169 100644
--- a/client/src/services/game-api/text.ts
+++ b/client/src/services/game-api/text.ts
@@ -3,17 +3,16 @@ import { getAuthHeader } from '../../contexts/AuthProvider'
 
 export const completion = async body => {
   try {
-    const response = await fetch(latitudeApiRootUrl + '/text/completions', {
+    const response = await fetch(latitudeApiRootUrl + '/text/completions/v2', {
       method: 'POST',
-      mode: 'cors',
       headers: {
         'Content-Type': 'application/json',
         ...(await getAuthHeader()),
       },
       body: JSON.stringify({ ...body, prompt: body.prompt.trimEnd() }),
     })
-    const { result } = await response.json()
-    return result
+    const result = await response.json()
+    return result.completions[0].text
   } catch (err) {
     // eslint-disable-next-line no-console
     console.warn('fetch error', err)
diff --git a/core/src/components/Generator.ts b/core/src/components/Generator.ts
index fea0f609a..585476178 100644
--- a/core/src/components/Generator.ts
+++ b/core/src/components/Generator.ts
@@ -9,6 +9,7 @@ import {
 } from '../../types'
 import { FewshotControl } from '../dataControls/FewshotControl'
 import { InputControl } from '../dataControls/InputControl'
+import { DropdownControl } from '../dataControls/DropdownControl'
 import { SocketGeneratorControl } from '../dataControls/SocketGenerator'
 import { EngineContext } from '../engine'
 import { triggerSocket, stringSocket } from '../sockets'
@@ -55,6 +56,13 @@ export class Generator extends ThothComponent<Promise<WorkerReturn>> {
       name: 'Component Name',
     })
 
+    const modelControl = new DropdownControl({
+      dataKey: 'model',
+      name: 'Model',
+      defaultValue: (node.data?.model as string) || 'davinci',
+      values: ['vanilla-davinci', 'aid-jumbo', 'vanilla-jumbo']
+    })
+
     const inputGenerator = new SocketGeneratorControl({
       connectionType: 'input',
       name: 'Input Sockets',
@@ -90,6 +98,7 @@ export class Generator extends ThothComponent<Promise<WorkerReturn>> {
 
     node.inspector
       .add(nameControl)
+      .add(modelControl)
       .add(inputGenerator)
       .add(fewshotControl)
       .add(stopControl)
@@ -112,6 +121,9 @@ export class Generator extends ThothComponent<Promise<WorkerReturn>> {
       return acc
     }, {} as Record<string, unknown>)
 
+    const model = (node.data.model as string) ?? 'vanilla-davinci'
+    // const model = node.data.model || 'davinci'
+
     const fewshot = (node.data.fewshot as string) || ''
     const stopSequence = node.data.stop as string
     const template = Handlebars.compile(fewshot)
@@ -119,10 +131,10 @@ export class Generator extends ThothComponent<Promise<WorkerReturn>> {
 
     const stop = node?.data?.stop
       ? stopSequence.split(',').map(i => {
-          if (i === '\n') return i
+          if (i.includes('\n')) return i
           return i.trim()
         })
-      : ['\n']
+      : ""
 
     const tempData = node.data.temp as string
     const temperature = tempData ? parseFloat(tempData) : 0.7
@@ -134,6 +146,7 @@ export class Generator extends ThothComponent<Promise<WorkerReturn>> {
       : 0
 
     const body = {
+      model,
       prompt,
       stop,
       maxTokens,
diff --git a/core/src/dataControls/DropdownControl.ts b/core/src/dataControls/DropdownControl.ts
new file mode 100644
index 000000000..e207960ca
--- /dev/null
+++ b/core/src/dataControls/DropdownControl.ts
@@ -0,0 +1,34 @@
+import { DataControl } from '../plugins/inspectorPlugin'
+
+export class DropdownControl extends DataControl {
+  constructor({
+    name,
+    dataKey,
+    values,
+    defaultValue,
+    icon = 'properties',
+    write = true,
+
+  }: {
+    name: string
+    dataKey: string
+    defaultValue: string
+    values: string[],
+    icon?: string
+    write?: boolean
+  }) {
+    const options = {
+      dataKey,
+      name: name,
+      component: 'dropdownSelect',
+      write,
+      icon,
+      data: {
+        defaultValue,
+        values,
+      },
+    }
+
+    super(options)
+  }
+}

From c640de124f2afc6fdd2c988f0fe1352d18c5dd46 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 21 Mar 2022 16:51:12 -0700
Subject: [PATCH 005/531] Add type for inspector data and export it

---
 core/src/plugins/inspectorPlugin/Inspector.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/core/src/plugins/inspectorPlugin/Inspector.ts b/core/src/plugins/inspectorPlugin/Inspector.ts
index 5cbe22c99..96ecd7596 100644
--- a/core/src/plugins/inspectorPlugin/Inspector.ts
+++ b/core/src/plugins/inspectorPlugin/Inspector.ts
@@ -16,6 +16,17 @@ type InspectorConstructor = {
 // todo improve this typing
 type DataControlData = Record<string, any>
 
+export type InspectorData = {
+  name: string
+  nodeId: number
+  dataControls: Record<string, any>
+  data: Record<string, unknown>
+  category?: string
+  info: string
+  deprecated: boolean
+  deprecationMessage: string
+}
+
 export class Inspector {
   // Stub of function.  Can be a nodes catch all onData
   cache: Record<string, any> = {}
@@ -238,7 +249,7 @@ export class Inspector {
   get() {}
 
   // returns all data prepared for the pubsub to send it.
-  data() {
+  data(): InspectorData {
     const dataControls = Array.from(this.dataControls.entries()).reduce(
       (acc, [key, val]) => {
         const cache = this.node?.data?.dataControls as DataControlData

From 6ba2252edaac8fae1c87ff476fec710a429e8109 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 21 Mar 2022 16:51:33 -0700
Subject: [PATCH 006/531] Convert open project to typescript.

---
 .../screens/{OpenProject.jsx => OpenProject.tsx}           | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
 rename client/src/features/HomeScreen/screens/{OpenProject.jsx => OpenProject.tsx} (91%)

diff --git a/client/src/features/HomeScreen/screens/OpenProject.jsx b/client/src/features/HomeScreen/screens/OpenProject.tsx
similarity index 91%
rename from client/src/features/HomeScreen/screens/OpenProject.jsx
rename to client/src/features/HomeScreen/screens/OpenProject.tsx
index de06455e8..d09f7e994 100644
--- a/client/src/features/HomeScreen/screens/OpenProject.jsx
+++ b/client/src/features/HomeScreen/screens/OpenProject.tsx
@@ -1,12 +1,14 @@
 import { useNavigate } from 'react-router-dom'
 
-import { useTabManager } from '../../../contexts/TabManagerProvider'
 import Icon from '../../common/Icon/Icon'
 import Panel from '../../common/Panel/Panel'
 import css from '../homeScreen.module.css'
 import thothBanner from '../version-banner-0.0.0beta.jpg'
 import FileInput from '../components/FileInput'
 import ProjectRow from '../components/ProjectRow'
+import { useSelector } from 'react-redux'
+import { selectAllTabs } from '@/state/tabs'
+import { RootState } from '@/state/store'
 
 const getThothVersion = () => '0.0.1'
 
@@ -17,7 +19,7 @@ const OpenProject = ({
   loadFile,
   openSpell,
 }) => {
-  const { tabs } = useTabManager()
+  const tabs = useSelector((state: RootState) => selectAllTabs(state.tabs))
   const navigate = useNavigate()
 
   return (
@@ -46,6 +48,7 @@ const OpenProject = ({
                 key={i}
                 selectedSpell={selectedSpell}
                 label={spell.name}
+                spell={spell}
                 onClick={() => {
                   setSelectedSpell(spell)
                 }}

From 4efb667794be63594a00c8d8de5a975dce59ff9b Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 21 Mar 2022 16:51:58 -0700
Subject: [PATCH 007/531] Convert create new to typescript and strip out tab
 provider

---
 .../screens/{CreateNew.jsx => CreateNew.tsx}  | 69 ++++++++++++-------
 1 file changed, 43 insertions(+), 26 deletions(-)
 rename client/src/features/HomeScreen/screens/{CreateNew.jsx => CreateNew.tsx} (67%)

diff --git a/client/src/features/HomeScreen/screens/CreateNew.jsx b/client/src/features/HomeScreen/screens/CreateNew.tsx
similarity index 67%
rename from client/src/features/HomeScreen/screens/CreateNew.jsx
rename to client/src/features/HomeScreen/screens/CreateNew.tsx
index 6f7791f9f..a3f1a8ba1 100644
--- a/client/src/features/HomeScreen/screens/CreateNew.jsx
+++ b/client/src/features/HomeScreen/screens/CreateNew.tsx
@@ -1,5 +1,5 @@
 import { useSnackbar } from 'notistack'
-import { useState, useEffect } from 'react'
+import { useState } from 'react'
 import { useForm } from 'react-hook-form'
 import {
   uniqueNamesGenerator,
@@ -9,15 +9,14 @@ import {
 import { useNavigate } from 'react-router-dom'
 
 import { useNewSpellMutation } from '@/state/api/spells'
-import { useTabManager } from '@/contexts/TabManagerProvider'
 import Panel from '@common/Panel/Panel'
-import Input from '@common/Input/Input'
 import emptyImg from '../empty.png'
 import enkiImg from '../enki.png'
 import langImg from '../lang.png'
 import css from '../homeScreen.module.css'
 import TemplatePanel from '../components/TemplatePanel'
 import defaultChain from './chains/default'
+import { Spell } from '@latitudegames/thoth-core/types'
 
 const customConfig = {
   dictionaries: [adjectives, colors],
@@ -25,6 +24,12 @@ const customConfig = {
   length: 2,
 }
 
+type Template = {
+  label: string
+  bg: string
+  chain: Spell
+}
+
 const templates = [
   { label: 'Starter', bg: emptyImg, chain: defaultChain },
   { label: 'Language example', bg: langImg, chain: defaultChain },
@@ -32,12 +37,13 @@ const templates = [
 ]
 
 const CreateNew = () => {
-  const [selectedTemplate, setSelectedTemplate] = useState(null)
-  const [error, setError] = useState(null)
+  const [selectedTemplate, setSelectedTemplate] = useState<Template | null>(
+    null
+  )
+  const [error, setError] = useState<string | null>(null)
 
   const { enqueueSnackbar } = useSnackbar()
   const navigate = useNavigate()
-  const { openTab, clearTabs } = useTabManager()
   const [newSpell] = useNewSpellMutation()
 
   const {
@@ -47,29 +53,40 @@ const CreateNew = () => {
   } = useForm()
 
   const onCreate = handleSubmit(async data => {
-    const placeholderName = uniqueNamesGenerator(customConfig)
-    const name = data.name || placeholderName
-    const response = await newSpell({
-      chain: selectedTemplate.chain,
-      name,
-    })
-
-    if (response.error) {
-      const message = response.error.data.error.message
-      setError(message)
-      enqueueSnackbar(`Error saving spell. ${message}.`, {
-        variant: 'error',
+    try {
+      const placeholderName = uniqueNamesGenerator(customConfig)
+      const name = data.name || placeholderName
+      const response = await newSpell({
+        chain: selectedTemplate?.chain,
+        name,
       })
-      return
-    }
 
-    await openTab({
-      name: name,
-      spellId: name,
-      type: 'spell',
-    })
+      if ('error' in response) {
+        console.log('error in response', response.error)
+        if ('status' in response.error) {
+          const err = response.error
+          // I am annoyed by RTK error typing.
+          // @ts-expect-error
+          const errMsg = err.data.error.message
+          setError(errMsg as string)
+          enqueueSnackbar(`Error saving spell. ${errMsg}.`, {
+            variant: 'error',
+          })
+          return
+        }
+      }
 
-    setTimeout(() => navigate('/thoth'), 500)
+      navigate(`/thoth/${name}`)
+      // dispatch(
+      //   openTab({
+      //     name: name,
+      //     spellId: name,
+      //     type: 'spell',
+      //   })
+      // )
+    } catch (err) {
+      console.log('ERROR!!', err)
+    }
   })
 
   return (

From 5bad5c2be3e46722fef7c9630c50c7fad811f0f5 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 21 Mar 2022 16:52:17 -0700
Subject: [PATCH 008/531] Convert layout provider to typescript and strip out
 tab provider

---
 ...{LayoutProvider.jsx => LayoutProvider.tsx} | 140 +++++++++++-------
 1 file changed, 89 insertions(+), 51 deletions(-)
 rename client/src/features/Thoth/contexts/{LayoutProvider.jsx => LayoutProvider.tsx} (61%)

diff --git a/client/src/features/Thoth/contexts/LayoutProvider.jsx b/client/src/features/Thoth/contexts/LayoutProvider.tsx
similarity index 61%
rename from client/src/features/Thoth/contexts/LayoutProvider.jsx
rename to client/src/features/Thoth/contexts/LayoutProvider.tsx
index 1514c0cc5..35fa5c306 100644
--- a/client/src/features/Thoth/contexts/LayoutProvider.jsx
+++ b/client/src/features/Thoth/contexts/LayoutProvider.tsx
@@ -10,10 +10,12 @@ import { useContext, createContext, useEffect, useState, useRef } from 'react'
 
 import LoadingScreen from '@common/LoadingScreen/LoadingScreen'
 import { usePubSub } from '@/contexts/PubSubProvider'
-import { useTabManager } from '@/contexts/TabManagerProvider'
 import { useGetSpellQuery, useSaveSpellMutation } from '@/state/api/spells'
+import { InspectorData } from '@latitudegames/thoth-core/types'
+import { saveTabLayout } from '@/state/tabs'
+import { useDispatch } from 'react-redux'
 // Component types are listed here which are used to load components from the data sent by rete
-const windowTypes = {
+const windowTypes: WindowTypes = {
   TEXT_EDITOR: 'textEditor',
   INSPECTOR: 'inspector',
   STATE_MANAGER: 'stateManager',
@@ -21,25 +23,39 @@ const windowTypes = {
   PLAYTEST: 'playtest',
 }
 
+type WindowType =
+  | 'textEditor'
+  | 'inspector'
+  | 'stateManager'
+  | 'editor'
+  | 'playtest'
+
+type WindowTypes = Record<string, WindowType>
+
 // helpful resources
 // https://github.com/edemaine/comingle/blob/726d42e975307beb5281fddbf576591c36c1022d/client/Room.coffee#L365-L384
 // https://github.com/caplin/FlexLayout/blob/master/examples/demo/App.tsx
 
-const Context = createContext({
-  inspectorData: {},
-  textEditorData: {},
-  createModel: () => {},
-  currentModel: {},
-  currentRef: {},
-  setCurrentRef: () => {},
-  saveInspector: () => {},
-  saveTextEditor: () => {},
-  createOrFocus: () => {},
-  addWindow: () => {},
-  windowTypes: {},
-  workspaceMap: {},
-  getWorkspace: () => {},
-})
+declare global {
+  interface Window {
+    getLayout: any
+  }
+}
+
+type LayoutContext = {
+  inspectorData: InspectorData | null
+  textEditorData: Partial<InspectorData> | null
+  saveTextEditor: Function
+  saveInspector: Function
+  currentModel: Model | null
+  createModel: Function
+  createOrFocus: Function
+  windowTypes: WindowTypes
+  currentRef
+  setCurrentRef
+}
+
+const Context = createContext<LayoutContext>(undefined!)
 
 export const useLayout = () => useContext(Context)
 
@@ -47,50 +63,54 @@ const LayoutProvider = ({ children, tab }) => {
   const { subscribe, publish, events } = usePubSub()
 
   const [saveSpell] = useSaveSpellMutation()
-  const { data: spell } = useGetSpellQuery(tab.spell, {
-    skip: !tab.spell,
+  const { data: spell } = useGetSpellQuery(tab.spellId, {
+    skip: !tab.spellId,
   })
-  const currentModelRef = useRef({})
+  const currentModelRef = useRef<Model | null>(null)
 
-  const [currentModel, setCurrentModel] = useState(null)
+  const [currentModel, setCurrentModel] = useState<Model | null>(null)
   const [currentRef, setCurrentRef] = useState(null)
-  const [inspectorData, setInspectorData] = useState(null)
+  const [inspectorData, setInspectorData] = useState<InspectorData | null>(null)
   const [textEditorData, setTextEditorData] = useState({})
 
-  const updateCurrentModel = model => {
+  const updateCurrentModel = (model: Model) => {
     currentModelRef.current = model
     setCurrentModel(model)
   }
 
   useEffect(() => {
-    window.getLayout = () => currentModelRef.current.toJson()
+    window.getLayout = () =>
+      currentModelRef?.current && currentModelRef?.current?.toJson()
   }, [currentModel])
 
   // inspector subscription
   useEffect(() => {
-    return subscribe(events.$INSPECTOR_SET(tab.id), (event, data) => {
-      if (data?.nodeId !== inspectorData?.nodeId) setInspectorData({})
-      setInspectorData(data)
-
-      if (!data.dataControls) return
-
-      // Handle components in a special way here.  Could probaby abstract this better
-
-      Object.entries(data.dataControls).forEach(([, control]) => {
-        if (control?.options?.editor) {
-          // we relay data to the text editor component for display here as well.
-          const textData = {
-            data: data.data[control.dataKey],
-            nodeId: data.nodeId,
-            name: data.name,
-            control: control,
-            options: control.options,
+    return subscribe(
+      events.$INSPECTOR_SET(tab.id),
+      (event, data: InspectorData) => {
+        if (data?.nodeId !== inspectorData?.nodeId) setInspectorData(null)
+        setInspectorData(data)
+
+        if (!data.dataControls) return
+
+        // Handle components in a special way here.  Could probaby abstract this better
+
+        Object.entries(data.dataControls).forEach(([, control]) => {
+          if (control?.options?.editor) {
+            // we relay data to the text editor component for display here as well.
+            const textData = {
+              data: data.data[control.dataKey],
+              nodeId: data.nodeId,
+              name: data.name,
+              control: control,
+              options: control.options,
+            }
+
+            setTextEditorData(textData)
           }
-
-          setTextEditorData(textData)
-        }
-      })
-    })
+        })
+      }
+    )
   }, [events, subscribe, publish])
 
   // text editor subscription
@@ -112,6 +132,8 @@ const LayoutProvider = ({ children, tab }) => {
       [textData.control.dataKey]: textData.data,
     }
 
+    if (!inspectorData) return
+
     const update = {
       ...inspectorData,
       data: {
@@ -124,13 +146,13 @@ const LayoutProvider = ({ children, tab }) => {
     if (inspectorData) {
       setInspectorData(update)
     }
-    saveSpell(spell)
+    spell && saveSpell(spell)
   }
 
   const saveInspector = inspectorData => {
     setInspectorData(inspectorData)
     publish(events.$NODE_SET(tab.id, inspectorData.nodeId), inspectorData)
-    saveSpell(spell)
+    spell && saveSpell(spell)
   }
 
   const createModel = json => {
@@ -152,13 +174,20 @@ const LayoutProvider = ({ children, tab }) => {
     }
     const currentModel = currentModelRef.current
 
+    if (!currentModel) return
+
+    // TODO the types provided by react flex layout are wrong for these constructors. Fix with a PR or a fork of the library?
     const rootNode = currentModel.getRoot()
+    // @ts-expect-error
     const tabNode = new TabNode(currentModel, tabJson)
+    // @ts-expect-error
     const tabSetNode = new TabSetNode(currentModel, {
       type: 'tabset',
       weight: 12,
     })
 
+    // We are here using a provate variable, so TS isnt picking it up
+    // @ts-expect-error
     rootNode._addChild(tabSetNode)
 
     currentModel.doAction(
@@ -172,8 +201,14 @@ const LayoutProvider = ({ children, tab }) => {
   }
 
   const createOrFocus = (componentName, title) => {
+    if (!currentModelRef.current || !currentModel) return
+
+    // We are here using a provate variable, so TS isnt picking it up
+    // @ts-expect-error
     const component = Object.entries(currentModelRef.current._idMap).find(
       ([, value]) => {
+        // Since there is not type for _idMap, we don't know the type value is.
+        // @ts-expect-error
         return value._attributes?.component === componentName
       }
     )
@@ -200,8 +235,8 @@ const LayoutProvider = ({ children, tab }) => {
 }
 
 export const Layout = ({ json, factory, tab }) => {
+  const dispatch = useDispatch()
   const { currentModel, createModel, setCurrentRef } = useLayout()
-  const { saveTabLayout } = useTabManager()
   const layoutRef = useRef(null)
 
   useEffect(() => {
@@ -214,7 +249,10 @@ export const Layout = ({ json, factory, tab }) => {
   }, [layoutRef, setCurrentRef])
 
   const onModelChange = () => {
-    saveTabLayout(tab.id, currentModel.toJson())
+    if (!currentModel) return
+    dispatch(
+      saveTabLayout({ tabId: tab.id, layoutJson: currentModel.toJson() })
+    )
   }
 
   if (!currentModel) return <LoadingScreen />
@@ -225,7 +263,7 @@ export const Layout = ({ json, factory, tab }) => {
       ref={layoutRef}
       model={currentModel}
       factory={factory}
-      font={{ size: '12px', fontFamily: 'IBM Plex Sans' }}
+      font={{ size: '12px' }}
     />
   )
 }

From 5612c933dffd0314aa17a47b6fed3d112ac7ca1f Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 21 Mar 2022 16:52:31 -0700
Subject: [PATCH 009/531] Convert project row to typescript

---
 .../HomeScreen/components/ProjectRow.tsx      | 58 +++++++++++++++++++
 client/src/features/Thoth/Thoth.tsx           | 31 +++++++---
 2 files changed, 80 insertions(+), 9 deletions(-)
 create mode 100644 client/src/features/HomeScreen/components/ProjectRow.tsx

diff --git a/client/src/features/HomeScreen/components/ProjectRow.tsx b/client/src/features/HomeScreen/components/ProjectRow.tsx
new file mode 100644
index 000000000..0193ad26a
--- /dev/null
+++ b/client/src/features/HomeScreen/components/ProjectRow.tsx
@@ -0,0 +1,58 @@
+import { Spell } from '@/state/api/spells'
+import { CSSProperties } from 'react'
+import Icon from '../../common/Icon/Icon'
+import css from '../homeScreen.module.css'
+
+type ProjectProps = {
+  label: string
+  selectedSpell?: Spell
+  icon?: string
+  onClick: Function
+  spell?: Spell
+  style?: CSSProperties
+  onDelete?: Function
+}
+
+const ProjectRow = ({
+  label,
+  selectedSpell,
+  onClick = () => {},
+  icon = '',
+  spell,
+  style = {},
+  onDelete,
+}: ProjectProps) => {
+  return (
+    <div
+      role="button"
+      className={`${css['project-row']} ${
+        css[selectedSpell?.name === label ? 'selected' : '']
+      }`}
+      onClick={e => {
+        onClick(e)
+      }}
+      style={style}
+    >
+      {icon.length > 0 && (
+        <Icon name={icon} style={{ marginRight: 'var(--extraSmall)' }} />
+      )}
+      {label}
+      {onDelete && (
+        <Icon
+          name="trash"
+          onClick={() => {
+            spell?.name && onDelete(spell.name)
+          }}
+          style={{
+            marginRight: 'var(--extraSmall)',
+            position: 'absolute',
+            right: 'var(--extraSmall)',
+            zIndex: 10,
+          }}
+        />
+      )}
+    </div>
+  )
+}
+
+export default ProjectRow
diff --git a/client/src/features/Thoth/Thoth.tsx b/client/src/features/Thoth/Thoth.tsx
index dfd7fe6fd..edf0a8fb2 100644
--- a/client/src/features/Thoth/Thoth.tsx
+++ b/client/src/features/Thoth/Thoth.tsx
@@ -1,16 +1,21 @@
+import { RootState } from '@/state/store'
+import { activeTabSelector, selectAllTabs, openTab } from '@/state/tabs'
 import { useEffect } from 'react'
 import { useHotkeys } from 'react-hotkeys-hook'
+import { useDispatch, useSelector } from 'react-redux'
 import { useNavigate, useParams } from 'react-router-dom'
 
 import { usePubSub } from '../../contexts/PubSubProvider'
-import { useTabManager } from '../../contexts/TabManagerProvider'
 import LoadingScreen from '../common/LoadingScreen/LoadingScreen'
 import TabLayout from '../common/TabLayout/TabLayout'
 import Workspaces from './workspaces'
 
 const Thoth = ({ empty = false }) => {
+  const dispatch = useDispatch()
   const navigate = useNavigate()
-  const { activeTab, tabs, openTab } = useTabManager()
+  const tabs = useSelector((state: RootState) => selectAllTabs(state.tabs))
+  const activeTab = useSelector(activeTabSelector)
+
   const pubSub = usePubSub()
   const { spellName } = useParams()
 
@@ -19,18 +24,26 @@ const Thoth = ({ empty = false }) => {
   useEffect(() => {
     if (!tabs) return
 
-    if (!activeTab && !spellName) navigate('/home')
+    // If there are still tabs, grab one at random to open to for now.
+    // We should do better at this.  Probably with some kind of tab ordering.
+    // Could fit in well with drag and drop for tabs
+    if (tabs.length > 0 && !activeTab && !spellName)
+      navigate(`/thoth/${tabs[0].spellId}`)
+
+    if (tabs.length === 0 && !activeTab && !spellName) navigate('/home')
   }, [tabs])
 
   useEffect(() => {
     if (!spellName) return
 
-    openTab({
-      spellId: spellName,
-      name: spellName,
-      openNew: false,
-      type: 'spell',
-    })
+    dispatch(
+      openTab({
+        spellId: spellName,
+        name: spellName,
+        openNew: false,
+        type: 'spell',
+      })
+    )
   }, [spellName])
 
   useHotkeys(

From 317d833f0cf2667f5d83f0bdde3e6aeed76c121d Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 21 Mar 2022 16:52:55 -0700
Subject: [PATCH 010/531] Convert menubar to typescript and strip out tab
 provider

---
 .../MenuBar/{MenuBar.js => MenuBar.tsx}       | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)
 rename client/src/features/common/MenuBar/{MenuBar.js => MenuBar.tsx} (88%)

diff --git a/client/src/features/common/MenuBar/MenuBar.js b/client/src/features/common/MenuBar/MenuBar.tsx
similarity index 88%
rename from client/src/features/common/MenuBar/MenuBar.js
rename to client/src/features/common/MenuBar/MenuBar.tsx
index 3183d21b5..6c0dc9067 100644
--- a/client/src/features/common/MenuBar/MenuBar.js
+++ b/client/src/features/common/MenuBar/MenuBar.tsx
@@ -3,20 +3,23 @@ import { useHotkeys } from 'react-hotkeys-hook'
 
 import { useModal } from '../../../contexts/ModalProvider'
 import { usePubSub } from '../../../contexts/PubSubProvider'
-import { useTabManager } from '../../../contexts/TabManagerProvider'
 import css from './menuBar.module.css'
 import thothlogo from './thoth.png'
 import { useNavigate } from 'react-router-dom'
+import { useSelector } from 'react-redux'
+import { activeTabSelector, Tab } from '@/state/tabs'
 
 const MenuBar = () => {
   const navigate = useNavigate()
   const { publish, events } = usePubSub()
-  const { activeTab } = useTabManager()
+  const activeTab = useSelector(activeTabSelector)
+
   const { openModal } = useModal()
 
-  const activeTabRef = useRef(null)
+  const activeTabRef = useRef<Tab | null>(null)
 
   useEffect(() => {
+    if (!activeTab) return
     activeTabRef.current = activeTab
   }, [activeTab])
 
@@ -36,11 +39,12 @@ const MenuBar = () => {
     const toggle = React.useCallback(() => {
       setValue(v => !v)
     }, [])
-    return [value, toggle]
+    return [value, toggle as () => void]
   }
   const [menuVisibility, togglemenuVisibility] = useToggle()
 
   const onSave = () => {
+    if (!activeTabRef.current) return
     publish($SAVE_SPELL(activeTabRef.current.id))
   }
 
@@ -52,6 +56,7 @@ const MenuBar = () => {
   }
 
   const onEdit = () => {
+    if (!activeTabRef.current) return
     openModal({
       modal: 'editSpellModal',
       content: 'This is an example modal',
@@ -69,26 +74,32 @@ const MenuBar = () => {
   }
 
   const onSerialize = () => {
+    if (!activeTabRef.current) return
     publish($SERIALIZE(activeTabRef.current.id))
   }
 
   const onStateManagerCreate = () => {
+    if (!activeTabRef.current) return
     publish($CREATE_STATE_MANAGER(activeTabRef.current.id))
   }
 
   const onPlaytestCreate = () => {
+    if (!activeTabRef.current) return
     publish($CREATE_PLAYTEST(activeTabRef.current.id))
   }
 
   const onInspectorCreate = () => {
+    if (!activeTabRef.current) return
     publish($CREATE_INSPECTOR(activeTabRef.current.id))
   }
 
   const onTextEditorCreate = () => {
+    if (!activeTabRef.current) return
     publish($CREATE_TEXT_EDITOR(activeTabRef.current.id))
   }
 
   const onExport = () => {
+    if (!activeTabRef.current) return
     publish($EXPORT(activeTabRef.current.id))
   }
 
@@ -103,7 +114,7 @@ const MenuBar = () => {
       event.preventDefault()
       onSave()
     },
-    { enableOnTags: 'INPUT' },
+    { enableOnTags: ['INPUT'] },
     [onSave]
   )
 
@@ -113,7 +124,7 @@ const MenuBar = () => {
       event.preventDefault()
       onNew()
     },
-    { enableOnTags: 'INPUT' },
+    { enableOnTags: ['INPUT'] },
     [onNew]
   )
 
@@ -206,7 +217,7 @@ const MenuBar = () => {
   //Menu bar rendering
   const ListItem = ({ item, label, topLevel, onClick }) => {
     label = label ? label.replace(/_/g, ' ') : label
-    let children = null
+    let children
     if (item.items && Object.keys(item.items)) {
       children = (
         <ul className={css['menu-panel']}>
@@ -233,7 +244,7 @@ const MenuBar = () => {
         {label}
         {children && <div className={css['folder-arrow']}> ❯ </div>}
         {!topLevel && <br />}
-        {children}
+        {children || null}
       </li>
     )
   }
@@ -241,7 +252,7 @@ const MenuBar = () => {
   const handleClick = func => {
     //Initially intended to control the visibility with a state, but this triggers a re-render and hides the menu anyway! :D
     //Keeping this intact just in case.
-    togglemenuVisibility(menuVisibility)
+    ;(togglemenuVisibility as Function)(menuVisibility)
     // eslint-disable-next-line no-eval
     eval(func)
   }

From 6003e723e094d57b39db0d21635c9f6154463a77 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 21 Mar 2022 16:53:12 -0700
Subject: [PATCH 011/531] Additional deleted file

---
 .../HomeScreen/components/ProjectRow.jsx      | 44 -------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 client/src/features/HomeScreen/components/ProjectRow.jsx

diff --git a/client/src/features/HomeScreen/components/ProjectRow.jsx b/client/src/features/HomeScreen/components/ProjectRow.jsx
deleted file mode 100644
index bbecd3865..000000000
--- a/client/src/features/HomeScreen/components/ProjectRow.jsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import Icon from '../../common/Icon/Icon'
-import css from '../homeScreen.module.css'
-
-const ProjectRow = ({
-  label,
-  selectedSpell,
-  onClick,
-  icon,
-  spell,
-  style,
-  onDelete = false,
-}) => {
-  return (
-    <div
-      role="button"
-      className={`${css['project-row']} ${
-        css[selectedSpell?.name === label ? 'selected' : '']
-      }`}
-      onClick={onClick}
-      style={style}
-    >
-      {icon && (
-        <Icon name={icon} style={{ marginRight: 'var(--extraSmall)' }} />
-      )}
-      {label}
-      {onDelete && (
-        <Icon
-          name="trash"
-          onClick={() => {
-            onDelete(spell.name)
-          }}
-          style={{
-            marginRight: 'var(--extraSmall)',
-            position: 'absolute',
-            right: 'var(--extraSmall)',
-            zIndex: 10,
-          }}
-        />
-      )}
-    </div>
-  )
-}
-
-export default ProjectRow

From d3c85ec6eeb21d4ad71f2799960b1b45f747e2c2 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 21 Mar 2022 16:53:30 -0700
Subject: [PATCH 012/531] Fix type errors in panel

---
 client/src/features/common/Panel/Panel.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/features/common/Panel/Panel.tsx b/client/src/features/common/Panel/Panel.tsx
index c3b204a35..05dca13a5 100644
--- a/client/src/features/common/Panel/Panel.tsx
+++ b/client/src/features/common/Panel/Panel.tsx
@@ -10,7 +10,7 @@ const Panel = ({
   roundness = '',
   className = '',
   flexRow = false,
-  flexColumn = '',
+  flexColumn = false,
   gap = '',
   ...props
 }) => {
@@ -24,7 +24,7 @@ const Panel = ({
         } ` + className
       }
       style={{
-        display: flexRow ? 'flex' : flexColumn,
+        display: flexRow || flexColumn ? 'flex' : '',
         flexDirection: flexRow ? 'row' : 'column',
         gap: gap,
         backgroundImage: bacgkroundImageURL ? bacgkroundImageURL : undefined,

From b4cf84d71101679b2f8e88c2e817fd4359973fcf Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 21 Mar 2022 16:53:58 -0700
Subject: [PATCH 013/531] Change tab spell references to spell if in composer

---
 client/src/features/Thoth/workspaces/composer/index.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/src/features/Thoth/workspaces/composer/index.tsx b/client/src/features/Thoth/workspaces/composer/index.tsx
index 1b48bc2a7..98964f2eb 100644
--- a/client/src/features/Thoth/workspaces/composer/index.tsx
+++ b/client/src/features/Thoth/workspaces/composer/index.tsx
@@ -42,10 +42,10 @@ const Workspace = ({ tab, tabs, pubSub }) => {
           tabs
             .filter(tab => tab.type === 'spell')
             .forEach(filteredTab => {
-              if (filteredTab.spell) {
+              if (filteredTab.spellId) {
                 const spell = selectSpellById(
                   store.getState(),
-                  filteredTab.spell
+                  filteredTab.spellId
                 )
                 if (
                   spell?.modules &&
@@ -65,8 +65,8 @@ const Workspace = ({ tab, tabs, pubSub }) => {
   }, [spellData])
 
   useEffect(() => {
-    if (!tab || !tab.spell) return
-    loadSpell(tab.spell)
+    if (!tab || !tab.spellId) return
+    loadSpell(tab.spellId)
   }, [tab])
 
   const factory = tab => {

From 147fb2d458a9f72208c1c8bea797e299e6969c16 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 21 Mar 2022 16:54:15 -0700
Subject: [PATCH 014/531] Export inspector data in core types

---
 core/types.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/types.ts b/core/types.ts
index 9f517d248..e9d0219a0 100644
--- a/core/types.ts
+++ b/core/types.ts
@@ -18,6 +18,8 @@ import { EngineContext } from './src/engine'
 import { ThothTask } from './src/thoth-component'
 import { ThothConsole } from './src/plugins/debuggerPlugin/ThothConsole'
 
+export type { InspectorData } from './src/plugins/inspectorPlugin/Inspector'
+
 export type EventsTypes = {
   run: void
   save: void

From 00cedd3c7fce04377232e8cc2787699c2626879f Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 21 Mar 2022 16:54:44 -0700
Subject: [PATCH 015/531] Referencde spell id and not spell in editor provider

---
 client/src/features/Thoth/contexts/EditorProvider.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/features/Thoth/contexts/EditorProvider.tsx b/client/src/features/Thoth/contexts/EditorProvider.tsx
index c9dfcfb7b..f9a9d4178 100644
--- a/client/src/features/Thoth/contexts/EditorProvider.tsx
+++ b/client/src/features/Thoth/contexts/EditorProvider.tsx
@@ -157,7 +157,7 @@ const RawEditor = ({ tab, children }) => {
   useEffect(() => {
     if (!tab) return
 
-    if (tab?.spell) getSpell(tab.spell)
+    if (tab?.spellId) getSpell(tab.spellId)
   }, [tab])
 
   if (!tab || (tab.type === 'spell' && (isLoading || !spell)))

From bcb90623426004e980baccf287d109529715fd84 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 21 Mar 2022 16:55:08 -0700
Subject: [PATCH 016/531] Add spell id to tab type in state

---
 client/src/state/tabs.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/state/tabs.ts b/client/src/state/tabs.ts
index cf4753b21..1d3f91c5e 100644
--- a/client/src/state/tabs.ts
+++ b/client/src/state/tabs.ts
@@ -21,6 +21,7 @@ export interface Tab {
   type?: 'spell' | 'module'
   // probably going to need to insert a proper spell type in here
   spell?: string
+  spellId: string
   // this will also be a ref to a property somewhere else
   module: string
 }

From e56e80fdcc574d4a4ed9d2a09cb8ba6095cc47f2 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 21 Mar 2022 16:55:21 -0700
Subject: [PATCH 017/531] Selector to select tabs by a spell id

---
 client/src/state/tabs.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/client/src/state/tabs.ts b/client/src/state/tabs.ts
index 1d3f91c5e..4d3b07302 100644
--- a/client/src/state/tabs.ts
+++ b/client/src/state/tabs.ts
@@ -41,6 +41,12 @@ const _activeTabSelector = createDraftSafeSelector(
   }
 )
 
+const selectTabBySpellId = createDraftSafeSelector(
+  [tabSelectors.selectAll, (_, spellId) => spellId],
+  (tabs: Tab[], spellId) =>
+    Object.values(tabs).find(tab => tab.spellId === spellId)
+)
+
 // Used to build a tab with various defaults set, as well as workspace json and UUID
 const buildTab = (tab, properties = {}) => ({
   ...tab,

From 114bdf57ec0695f45829f9d094d4f6e58c07a292 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 21 Mar 2022 16:55:33 -0700
Subject: [PATCH 018/531] Export select all tabs from reducer

---
 client/src/state/tabs.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/src/state/tabs.ts b/client/src/state/tabs.ts
index 4d3b07302..23343c938 100644
--- a/client/src/state/tabs.ts
+++ b/client/src/state/tabs.ts
@@ -95,4 +95,6 @@ export const {
 export const activeTabSelector = (state: RootState) =>
   _activeTabSelector(state.tabs)
 
+export const { selectAll: selectAllTabs } = tabSelectors
+
 export default tabSlice.reducer

From a1731ef3288bacbb1859adf18252acb21c2300ac Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 21 Mar 2022 16:56:30 -0700
Subject: [PATCH 019/531] Rename reucer methods in tab reducer to match api of
 tab provider

---
 client/src/state/tabs.ts | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/client/src/state/tabs.ts b/client/src/state/tabs.ts
index 23343c938..3b191199c 100644
--- a/client/src/state/tabs.ts
+++ b/client/src/state/tabs.ts
@@ -64,7 +64,7 @@ export const tabSlice = createSlice({
   name: 'tabs',
   initialState,
   reducers: {
-    tabOpened: (state, action) => {
+    openTab: (state, action) => {
       const activeTab = _activeTabSelector(state) as Tab
       if (activeTab)
         tabAdapater.updateOne(state, {
@@ -75,21 +75,16 @@ export const tabSlice = createSlice({
       const tab = buildTab(action.payload, { active: true })
       tabAdapater.addOne(state, tab)
     },
-    tabClosed: tabAdapater.removeOne,
-    tabSwitched: tabAdapater.updateOne,
-    tabsCleared: tabAdapater.removeAll,
-    tabLayoutSaved: () => {},
+    closeTab: tabAdapater.removeOne,
+    switchTab: tabAdapater.updateOne,
+    clearTabs: tabAdapater.removeAll,
+    saveTabLayout: (state, action) => {},
   },
 })
 
 // actions
-export const {
-  tabOpened,
-  tabClosed,
-  tabSwitched,
-  tabsCleared,
-  tabLayoutSaved,
-} = tabSlice.actions
+export const { openTab, closeTab, switchTab, clearTabs, saveTabLayout } =
+  tabSlice.actions
 
 // selectors
 export const activeTabSelector = (state: RootState) =>

From e2b09286d7e0abcbdef825a3bbf1a016149e1e8a Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 21 Mar 2022 16:56:55 -0700
Subject: [PATCH 020/531] Allow open tab to support switching tabs too

---
 client/src/state/tabs.ts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/client/src/state/tabs.ts b/client/src/state/tabs.ts
index 3b191199c..14afc5ee6 100644
--- a/client/src/state/tabs.ts
+++ b/client/src/state/tabs.ts
@@ -72,6 +72,20 @@ export const tabSlice = createSlice({
           changes: { active: false },
         })
 
+      // Check if the tab is already open.
+      const existingTab = selectTabBySpellId(state, action.payload.spellId)
+
+      if (existingTab && !action.payload.openNew) {
+        tabAdapater.updateOne(state, {
+          id: existingTab.id,
+          changes: {
+            active: true,
+          },
+        })
+        return
+      }
+      //
+
       const tab = buildTab(action.payload, { active: true })
       tabAdapater.addOne(state, tab)
     },

From 891c507eca055b30742e182ca31ff45158872089 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 21 Mar 2022 16:57:11 -0700
Subject: [PATCH 021/531] Drop use of tab manager in app tsx

---
 client/src/App.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/client/src/App.tsx b/client/src/App.tsx
index 6fe2169ed..2b2cf517e 100644
--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@@ -1,6 +1,5 @@
 import { Routes, Route, Navigate } from 'react-router-dom'
 
-import { useTabManager } from './contexts/TabManagerProvider'
 import RequireAuth from './features/common/RequireAuth/RequireAuth'
 import ThothPageWrapper from './features/common/ThothPage/ThothPageWrapper'
 import HomeScreen from './features/HomeScreen/HomeScreen'
@@ -10,11 +9,15 @@ import { useAuth } from './contexts/AuthProvider'
 import 'flexlayout-react/style/dark.css'
 import './design-globals/design-globals.css'
 import './App.css'
+import { activeTabSelector, selectAllTabs } from './state/tabs'
+import { useSelector } from 'react-redux'
+import { RootState } from './state/store'
 //These need to be imported last to override styles.
 
 function App() {
   // Use our routes
-  const { tabs, activeTab } = useTabManager()
+  const tabs = useSelector((state: RootState) => selectAllTabs(state.tabs))
+  const activeTab = useSelector(activeTabSelector)
   const { user } = useAuth()
 
   const redirect = () => {

From 927c96a10ffe1d1138c30f36a3a83fcf97f18360 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 21 Mar 2022 16:57:30 -0700
Subject: [PATCH 022/531] Add global function to window to get layout for devs
 when needed

---
 client/src/global.d.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/client/src/global.d.ts b/client/src/global.d.ts
index a2700b521..fbd2fd5ba 100644
--- a/client/src/global.d.ts
+++ b/client/src/global.d.ts
@@ -1,7 +1,14 @@
 // We need to tell TypeScript that when we write "import styles from './styles.scss' we mean to load a module (to look for a './styles.scss.d.ts').
 declare module '*.css'
 declare module '*.module.css'
+declare module '*.jpg'
 declare module '*.png' {
   const value: any
   export default value
 }
+
+declare global {
+  interface Window {
+    getLayout: any
+  }
+}

From 788869afa4b2185167e2f338a93507f7374a13b5 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 21 Mar 2022 16:57:47 -0700
Subject: [PATCH 023/531] Drop tab manager from edit spell modal

---
 client/src/features/common/Modals/EditSpellModal.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/src/features/common/Modals/EditSpellModal.tsx b/client/src/features/common/Modals/EditSpellModal.tsx
index 3b71a0fe5..dccf9ed22 100644
--- a/client/src/features/common/Modals/EditSpellModal.tsx
+++ b/client/src/features/common/Modals/EditSpellModal.tsx
@@ -1,7 +1,6 @@
 import { useState } from 'react'
 import { useSnackbar } from 'notistack'
 import { usePatchSpellMutation } from '../../../state/api/spells'
-import { useTabManager } from '../../../contexts/TabManagerProvider'
 import { useForm } from 'react-hook-form'
 import Modal from '../Modal/Modal'
 import css from './modalForms.module.css'
@@ -11,8 +10,6 @@ const EditSpellModal = ({ closeModal, spellId, name, tab }) => {
   const [patchSpell, { isLoading }] = usePatchSpellMutation()
   const { enqueueSnackbar } = useSnackbar()
 
-  const { updateTab } = useTabManager()
-
   const {
     register,
     handleSubmit,
@@ -81,3 +78,6 @@ const EditSpellModal = ({ closeModal, spellId, name, tab }) => {
 }
 
 export default EditSpellModal
+function updateTab(id: any, arg1: { name: any; spell: any }) {
+  throw new Error('Function not implemented.')
+}

From a8b1974870213d26d69d1fea3c27838c5d891f75 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 21 Mar 2022 16:57:57 -0700
Subject: [PATCH 024/531] Drop tab manager from save as modal

---
 .../features/common/Modals/SaveAsModal.tsx    | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/client/src/features/common/Modals/SaveAsModal.tsx b/client/src/features/common/Modals/SaveAsModal.tsx
index 9eb8e588b..490523324 100644
--- a/client/src/features/common/Modals/SaveAsModal.tsx
+++ b/client/src/features/common/Modals/SaveAsModal.tsx
@@ -4,18 +4,19 @@ import {
   useGetSpellQuery,
   useSaveSpellMutation,
 } from '../../../state/api/spells'
-import { useTabManager } from '../../../contexts/TabManagerProvider'
 import { useForm } from 'react-hook-form'
 import Modal from '../Modal/Modal'
 import css from './modalForms.module.css'
+import { openTab } from '@/state/tabs'
+import { useDispatch } from 'react-redux'
 
 const EditSpellModal = ({ tab, closeModal }) => {
+  const dispatch = useDispatch()
   const [error, setError] = useState('')
   const [saveSpell, { isLoading }] = useSaveSpellMutation()
   const { data: spell } = useGetSpellQuery(tab.spell, {
-    skip: !tab.spell,
+    skip: !tab.spellId,
   })
-  const { openTab } = useTabManager()
   const { enqueueSnackbar } = useSnackbar()
 
   const {
@@ -43,11 +44,13 @@ const EditSpellModal = ({ tab, closeModal }) => {
 
     // show snackbar
     // open a new tab to the new spell
-    await openTab({
-      name: data.name,
-      spellId: data.name,
-      type: 'spell',
-    })
+    dispatch(
+      openTab({
+        name: data.name,
+        spellId: data.name,
+        type: 'spell',
+      })
+    )
 
     closeModal()
   })
@@ -74,7 +77,7 @@ const EditSpellModal = ({ tab, closeModal }) => {
             <input
               type="text"
               className={css['input']}
-              defaultValue={tab.spell}
+              defaultValue={tab.spellId}
               {...register('name')}
             />
           </div>

From 1582bccd9bf64b92f5acbcd478e696fc9835d8e0 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 21 Mar 2022 16:58:29 -0700
Subject: [PATCH 025/531] Drop tab manager from tab bar

---
 client/src/features/common/TabBar/TabBar.tsx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/client/src/features/common/TabBar/TabBar.tsx b/client/src/features/common/TabBar/TabBar.tsx
index 884b8c7ee..e2e420d9e 100644
--- a/client/src/features/common/TabBar/TabBar.tsx
+++ b/client/src/features/common/TabBar/TabBar.tsx
@@ -1,15 +1,16 @@
+import { closeTab } from '@/state/tabs'
 import classnames from 'classnames'
 import { VscClose } from 'react-icons/vsc'
+import { useDispatch } from 'react-redux'
 import { useNavigate } from 'react-router-dom'
 
-import { useTabManager } from '../../../contexts/TabManagerProvider'
 import Icon from '../Icon/Icon'
 import MenuBar from '../MenuBar/MenuBar'
 import css from './tabBar.module.css'
 
 const Tab = ({ tab, activeTab }) => {
+  const dispatch = useDispatch()
   const navigate = useNavigate()
-  const { closeTab } = useTabManager()
   const active = tab.id === activeTab?.id
 
   const title = `${tab.type}- ${tab.name}`
@@ -20,13 +21,14 @@ const Tab = ({ tab, activeTab }) => {
   })
 
   const onClick = () => {
-    navigate(`/thoth/${tab.spell}`)
+    navigate(`/thoth/${tab.spellId}`)
   }
 
   // Handle selecting the next tab down is none are active.
   const onClose = e => {
     e.stopPropagation()
-    closeTab(tab.id)
+    navigate('/thoth')
+    dispatch(closeTab(tab.id))
   }
 
   return (

From d121f0b81215cd04bb1dbb83cff802ae6ab3db8a Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 21 Mar 2022 16:58:54 -0700
Subject: [PATCH 026/531] Drop tab manager from home screen

---
 client/src/features/HomeScreen/HomeScreen.tsx | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/client/src/features/HomeScreen/HomeScreen.tsx b/client/src/features/HomeScreen/HomeScreen.tsx
index 86e327db8..570121e9f 100644
--- a/client/src/features/HomeScreen/HomeScreen.tsx
+++ b/client/src/features/HomeScreen/HomeScreen.tsx
@@ -7,19 +7,21 @@ import {
   useNewSpellMutation,
 } from '../../state/api/spells'
 import { useDB } from '../../contexts/DatabaseProvider'
-import { useTabManager } from '../../contexts/TabManagerProvider'
 import AllProjects from './screens/AllProjects'
 import CreateNew from './screens/CreateNew'
 import OpenProject from './screens/OpenProject'
 import css from './homeScreen.module.css'
 import LoadingScreen from '../common/LoadingScreen/LoadingScreen'
 import { ModelsType } from '../../types'
+import { closeTab, openTab } from '@/state/tabs'
+import { useDispatch } from 'react-redux'
 
 //MAIN
 
 const StartScreen = () => {
   const { models } = useDB() as unknown as ModelsType
-  const { openTab, closeTabBySpellId } = useTabManager()
+  const dispatch = useDispatch()
+
   const navigate = useNavigate()
 
   const [deleteSpell] = useDeleteSpellMutation()
@@ -48,11 +50,13 @@ const StartScreen = () => {
       name: spellData.name,
     })
 
-    await openTab({
-      name: spellData.name,
-      spellId: spellData.name,
-      type: 'spell',
-    })
+    dispatch(
+      openTab({
+        name: spellData.name,
+        spellId: spellData.name,
+        type: 'spell',
+      })
+    )
 
     navigate('/thoth')
   }
@@ -66,7 +70,7 @@ const StartScreen = () => {
   const onDelete = async spellId => {
     try {
       await deleteSpell(spellId)
-      await closeTabBySpellId(spellId)
+      dispatch(closeTab(spellId))
     } catch (err) {
       console.log('Error deleting spell', err)
     }

From e3bfd6b1200b6fc2b151c98669b6d2076ff00f28 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 21 Mar 2022 16:59:11 -0700
Subject: [PATCH 027/531] Navigate to named route on open spell rather than
 manually openning a tab

---
 client/src/features/HomeScreen/HomeScreen.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/features/HomeScreen/HomeScreen.tsx b/client/src/features/HomeScreen/HomeScreen.tsx
index 570121e9f..a7d4151f2 100644
--- a/client/src/features/HomeScreen/HomeScreen.tsx
+++ b/client/src/features/HomeScreen/HomeScreen.tsx
@@ -77,8 +77,8 @@ const StartScreen = () => {
   }
 
   const openSpell = async spell => {
-    await openTab({ name: spell.name, spellId: spell.name, type: 'spell' })
-    navigate('/thoth')
+    // dispatch(openTab({ name: spell.name, spellId: spell.name, type: 'spell' }))
+    navigate(`/thoth/${spell.name}`)
   }
 
   const [selectedSpell, setSelectedSpell] = useState(null)

From 64030f0682acde9879a4f1683b5fdfc6c1be6c4b Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 21 Mar 2022 16:59:28 -0700
Subject: [PATCH 028/531] use tab spell id in rete provider

---
 client/src/features/Thoth/contexts/ReteProvider.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/features/Thoth/contexts/ReteProvider.tsx b/client/src/features/Thoth/contexts/ReteProvider.tsx
index 7f8aeea67..096a212c5 100644
--- a/client/src/features/Thoth/contexts/ReteProvider.tsx
+++ b/client/src/features/Thoth/contexts/ReteProvider.tsx
@@ -49,8 +49,8 @@ const ReteProvider = ({ children, tab }) => {
   const { events, publish, subscribe } = usePubSub()
   const [fetchFromImageCache] = useFetchFromImageCacheMutation()
   const [saveSpell] = useSaveSpellMutation()
-  const { data: spell } = useGetSpellQuery(tab.spell, {
-    skip: !tab.spell,
+  const { data: spell } = useGetSpellQuery(tab.spellId, {
+    skip: !tab.spellId,
   })
 
   const { models } = useDB() as unknown as ModelsType

From c21a2fc6489ec9a15d81c1098adf9ad7f99914ba Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 21 Mar 2022 16:59:41 -0700
Subject: [PATCH 029/531] Use tab spell id in state manager

---
 client/src/features/Thoth/windows/StateManagerWindow.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/features/Thoth/windows/StateManagerWindow.tsx b/client/src/features/Thoth/windows/StateManagerWindow.tsx
index 0eb40515d..de1cd63a3 100644
--- a/client/src/features/Thoth/windows/StateManagerWindow.tsx
+++ b/client/src/features/Thoth/windows/StateManagerWindow.tsx
@@ -15,8 +15,8 @@ import WindowMessage from '../components/WindowMessage'
 const StateManager = ({ tab, ...props }) => {
   // const dispatch = useDispatch()
   const [saveSpell] = useSaveSpellMutation()
-  const { data: spell } = useGetSpellQuery(tab.spell, {
-    skip: !tab.spell,
+  const { data: spell } = useGetSpellQuery(tab.spellId, {
+    skip: !tab.spellId,
   })
 
   const { enqueueSnackbar } = useSnackbar()

From 1197bf89da396d1a08df061b3c79c11423c44bc4 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 21 Mar 2022 16:59:54 -0700
Subject: [PATCH 030/531] use tab spell id in editor window

---
 client/src/features/Thoth/windows/EditorWindow/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/features/Thoth/windows/EditorWindow/index.jsx b/client/src/features/Thoth/windows/EditorWindow/index.jsx
index ac4702725..b75c329e8 100644
--- a/client/src/features/Thoth/windows/EditorWindow/index.jsx
+++ b/client/src/features/Thoth/windows/EditorWindow/index.jsx
@@ -102,7 +102,7 @@ const EditorWindow = ({ tab }) => {
         open={deployOpen}
         setOpen={setDeployOpen}
         close={closeDeploy}
-        spellId={tab.spell}
+        spellId={tab.spellId}
       />
     </div>
   )

From 0e70b90632f2860eca2de601c220a9b3bd5c9839 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 21 Mar 2022 17:00:13 -0700
Subject: [PATCH 031/531] Clean up module select data control component

---
 .../DataControls/ModuleSelect.tsx             | 22 +++----------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/client/src/features/Thoth/windows/InspectorWindow/DataControls/ModuleSelect.tsx b/client/src/features/Thoth/windows/InspectorWindow/DataControls/ModuleSelect.tsx
index eb5e0bb5f..01673ff72 100644
--- a/client/src/features/Thoth/windows/InspectorWindow/DataControls/ModuleSelect.tsx
+++ b/client/src/features/Thoth/windows/InspectorWindow/DataControls/ModuleSelect.tsx
@@ -1,16 +1,14 @@
 import { useSnackbar } from 'notistack'
 
 import { useAppDispatch } from '../../../../../state/hooks'
-import { tabOpened } from '../../../../../state/tabs'
+import { openTab } from '../../../../../state/tabs'
 import { useModule } from '../../../../../contexts/ModuleProvider'
-import { useTabManager } from '../../../../../contexts/TabManagerProvider'
 import Select from '../../../../common/Select/Select'
 
 const ModuleSelect = ({ control, updateData, initialValue }) => {
   const dispatch = useAppDispatch()
 
   const { modules, newModule, findOneModule } = useModule()
-  const { openTab } = useTabManager()
   const { enqueueSnackbar } = useSnackbar()
   const { dataKey } = control
 
@@ -29,8 +27,8 @@ const ModuleSelect = ({ control, updateData, initialValue }) => {
       openNew: false,
     }
 
-    dispatch(tabOpened(tab))
-    await openTab(tab)
+    dispatch(openTab(tab))
+    // await openTab(tab)
   }
 
   const onChange = async ({ value }) => {
@@ -46,13 +44,6 @@ const ModuleSelect = ({ control, updateData, initialValue }) => {
     const module = _module.toJSON()
 
     await _openTab(module)
-
-    // await openTab({
-    //   name: value,
-    //   type: 'module',
-    //   moduleName: module.name,
-    //   openNew: false,
-    // })
   }
 
   const update = update => {
@@ -65,13 +56,6 @@ const ModuleSelect = ({ control, updateData, initialValue }) => {
 
       await _openTab(module)
 
-      // await openTab({
-      //   name: value,
-      //   type: 'module',
-      //   moduleName: module.name,
-      //   openNew: false,
-      // })
-
       // todo better naming for rete modules.
       // Handle displaying name as using ID for internal mapping
       update(value)

From ecc5ab704d7e91e51aca47022c9edd49c6f03a78 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 21 Mar 2022 17:00:23 -0700
Subject: [PATCH 032/531] Drop tab provider from app providers

---
 client/src/contexts/AppProviders.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/client/src/contexts/AppProviders.tsx b/client/src/contexts/AppProviders.tsx
index 5df77ca46..e3ad052d9 100644
--- a/client/src/contexts/AppProviders.tsx
+++ b/client/src/contexts/AppProviders.tsx
@@ -4,7 +4,6 @@ import AuthProvider from './AuthProvider'
 import DatabaseProvider from './DatabaseProvider'
 import ModuleProvider from './ModuleProvider'
 import PubSubProvider from './PubSubProvider'
-import TabManagerProvider from './TabManagerProvider'
 import ToastProvider from './ToastProvider'
 
 const darkTheme = createTheme({
@@ -20,7 +19,6 @@ const providers = [
   DatabaseProvider,
   AuthProvider,
   ModuleProvider,
-  TabManagerProvider,
 ]
 
 /**

From 456077aa87d54008b448c2c8b9c46ee3273be0f4 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 21 Mar 2022 17:00:30 -0700
Subject: [PATCH 033/531] Delete tab manager

---
 client/src/contexts/TabManagerProvider.jsx | 167 ---------------------
 1 file changed, 167 deletions(-)
 delete mode 100644 client/src/contexts/TabManagerProvider.jsx

diff --git a/client/src/contexts/TabManagerProvider.jsx b/client/src/contexts/TabManagerProvider.jsx
deleted file mode 100644
index 514fdad2d..000000000
--- a/client/src/contexts/TabManagerProvider.jsx
+++ /dev/null
@@ -1,167 +0,0 @@
-import { useContext, createContext, useEffect, useState } from 'react'
-import { v4 as uuidv4 } from 'uuid'
-import { useNavigate } from 'react-router-dom'
-
-import LoadingScreen from '../features/common/LoadingScreen/LoadingScreen'
-import { useDB } from './DatabaseProvider'
-import defaultJson from './layouts/defaultLayout.json'
-import { usePubSub } from './PubSubProvider'
-
-const Context = createContext({
-  tabs: [],
-  activeTab: {},
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  openTab: async options => {},
-  switchTab: x => {},
-  closeTab: x => {},
-  saveTabLayout: () => {},
-  clearTabs: () => {},
-  closeTabBySpellId: spellId => {},
-  updateTab: (tabId, update) => Promise.resolve(),
-})
-
-// Map of workspaces
-const workspaceMap = {
-  default: defaultJson,
-}
-
-export const useTabManager = () => useContext(Context)
-
-const TabManager = ({ children }) => {
-  const { db } = useDB()
-
-  // eslint-disable-next-line no-unused-vars
-  const { events, publish } = usePubSub()
-  const navigate = useNavigate()
-  const [tabs, setTabs] = useState(null)
-  const [activeTab, setActiveTab] = useState(null)
-
-  // Suscribe to changes in the database for active tab, and all tabs
-  useEffect(() => {
-    if (!db) return
-    ;(async () => {
-      refreshTabs()
-    })()
-  }, [db])
-
-  const filterTabs = tabDocs => {
-    return tabDocs
-      .map(tab => tab.toJSON())
-      .map(({ active, ...rest }) => ({ ...rest }))
-  }
-
-  const refreshTabs = async () => {
-    const activeTab = await db.tabs
-      .findOne({ selector: { active: true } })
-      .exec()
-    if (activeTab) setActiveTab(activeTab.toJSON())
-
-    // We want to exclude the 'active' field soince this changes,which causes rerenders we dont want.
-    const tabDocs = await db.tabs.find().exec()
-    const tabs = filterTabs(tabDocs)
-    if (tabs && tabs.length > 0) setTabs(tabs)
-    if (!tabs || tabs.length === 0) setTabs([])
-  }
-
-  const updateTab = async (tabId, update) => {
-    const tab = await db.tabs.findOne({ selector: { id: tabId } }).exec()
-    if (!tab) return
-
-    await tab.atomicPatch(update)
-    await refreshTabs()
-  }
-
-  const openTab = async ({
-    workspace = 'default',
-    name = 'Untitled',
-    type = 'module',
-    moduleName = '',
-    spellId = null,
-    openNew = true,
-  }) => {
-    // don't open a new tab if one is already open
-    if (!openNew && type === 'module') {
-      const tabOpened = await switchTab(null, { module: { $eq: moduleName } })
-      if (tabOpened) return
-    }
-
-    if (!openNew && type === 'spell') {
-      const tabOpened = await switchTab(null, { spell: { $eq: spellId } })
-      if (tabOpened) return
-    }
-
-    const newTab = {
-      layoutJson: workspaceMap[workspace],
-      name,
-      id: uuidv4(),
-      spell: spellId,
-      module: moduleName,
-      type: type,
-      active: true,
-    }
-
-    const newTabDoc = await db.tabs.insert(newTab)
-    refreshTabs()
-  }
-
-  const closeTab = async tabId => {
-    const tab = await db.tabs.findOne({ selector: { id: tabId } }).exec()
-    if (!tab) return
-    publish(events.$CLOSE_EDITOR(tabId))
-    await tab.remove()
-    const tabs = await db.tabs.find().exec()
-    await refreshTabs()
-
-    // Switch to the last tab down.
-    if (tabs.length === 0) {
-      navigate('/home')
-      return
-    }
-    switchTab(tabs[0].id)
-  }
-
-  const switchTab = async (tabId, query) => {
-    const selector = query ? query : { id: tabId }
-    const tab = await db.tabs.findOne({ selector }).exec()
-    if (!tab) return false
-    await tab.atomicPatch({ active: true })
-
-    await refreshTabs()
-    return true
-  }
-
-  const clearTabs = async () => {
-    await db.tabs.find().remove()
-  }
-
-  const closeTabBySpellId = async spellId => {
-    const tab = await db.tabs.findOne({ selector: { spell: spellId } }).exec()
-    if (!tab) return false
-
-    await closeTab(tab.id)
-    return true
-  }
-
-  const saveTabLayout = async (tabId, json) => {
-    const tab = await db.tabs.findOne({ selector: { id: tabId } }).exec()
-    await tab.atomicPatch({ layoutJson: json })
-  }
-
-  const publicInterface = {
-    tabs,
-    activeTab,
-    openTab,
-    switchTab,
-    closeTab,
-    saveTabLayout,
-    clearTabs,
-    updateTab,
-    closeTabBySpellId,
-  }
-
-  if (!tabs) return <LoadingScreen />
-
-  return <Context.Provider value={publicInterface}>{children}</Context.Provider>
-}
-
-export default TabManager

From fe676a6ed598308638fbb9f73e21d568d8088ae5 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 21 Mar 2022 17:05:52 -0700
Subject: [PATCH 034/531] Add some additional comments and todos

---
 client/src/features/Thoth/workspaces/index.tsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/client/src/features/Thoth/workspaces/index.tsx b/client/src/features/Thoth/workspaces/index.tsx
index 5f2309dd7..ae13306cd 100644
--- a/client/src/features/Thoth/workspaces/index.tsx
+++ b/client/src/features/Thoth/workspaces/index.tsx
@@ -1,6 +1,9 @@
 import WorkspaceProvider from '../contexts/WorkspaceProvider'
 import Composer from './composer'
 
+// TODO create a proper workspace component that can take in everything we need it to
+// for a standalone workspace environment.  Factor, events, etc.
+// Workspace should register events with the events provider, etc.
 const workspaceMap = {
   spell: Composer,
   module: Composer,
@@ -10,6 +13,8 @@ const Workspaces = ({ tabs, pubSub, activeTab }) => {
   return (
     <>
       {tabs.map(tab => {
+        //TODO use a tab.fileType instead of tab.type
+        // this will allow us to begin to expand towards a file base approach to the application.
         const Workspace = workspaceMap[tab.type]
 
         const props = {

From 26d6faa780d3af542bcf537758b694ea79ca5a91 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 10:52:01 -0700
Subject: [PATCH 035/531] Convert event handler in typescript

---
 .../{EventHandler.jsx => EventHandler.tsx}    | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)
 rename client/src/features/Thoth/components/{EventHandler.jsx => EventHandler.tsx} (89%)

diff --git a/client/src/features/Thoth/components/EventHandler.jsx b/client/src/features/Thoth/components/EventHandler.tsx
similarity index 89%
rename from client/src/features/Thoth/components/EventHandler.jsx
rename to client/src/features/Thoth/components/EventHandler.tsx
index 4cd94e2a8..2b44b96a3 100644
--- a/client/src/features/Thoth/components/EventHandler.jsx
+++ b/client/src/features/Thoth/components/EventHandler.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useRef } from 'react'
-import { useSelector } from 'react-redux'
+import { Spell as SpellType } from '@latitudegames/thoth-core/types'
 
 import {
   uniqueNamesGenerator,
@@ -9,8 +9,8 @@ import {
 
 import {
   useSaveSpellMutation,
-  useGetSpellsQuery,
-  selectSpellById,
+  useGetSpellQuery,
+  Spell,
 } from '../../../state/api/spells'
 import { useEditor } from '../contexts/EditorProvider'
 import { useLayout } from '../contexts/LayoutProvider'
@@ -28,11 +28,12 @@ const EventHandler = ({ pubSub, tab }) => {
   const { createOrFocus, windowTypes } = useLayout()
 
   const [saveSpellMutation] = useSaveSpellMutation()
-  const { data: spellsData } = useGetSpellsQuery()
-  const spell = useSelector(state => selectSpellById(state, tab?.spell))
+  const { data: spell } = useGetSpellQuery(tab.spellId, {
+    skip: !tab.spellId,
+  })
 
   // Spell ref because callbacks cant hold values from state without them
-  const spellRef = useRef(null)
+  const spellRef = useRef<Spell | null>(null)
   useEffect(() => {
     if (!spell) return
     spellRef.current = spell
@@ -47,7 +48,6 @@ const EventHandler = ({ pubSub, tab }) => {
     $UNDO,
     $REDO,
     $SAVE_SPELL,
-    $SAVE_SPELL_AS,
     $CREATE_STATE_MANAGER,
     $CREATE_PLAYTEST,
     $CREATE_INSPECTOR,
@@ -59,15 +59,11 @@ const EventHandler = ({ pubSub, tab }) => {
 
   const saveSpell = async () => {
     const currentSpell = spellRef.current
-    const chain = serialize(currentSpell)
+    const chain = serialize() as SpellType
 
     await saveSpellMutation({ ...currentSpell, chain })
   }
 
-  const saveSpellAs = async () => {
-    console.log('Save spell as')
-  }
-
   const createStateManager = () => {
     createOrFocus(windowTypes.STATE_MANAGER, 'State Manager')
   }
@@ -100,7 +96,7 @@ const EventHandler = ({ pubSub, tab }) => {
   const onExport = async () => {
     // refetch spell from local DB to ensure it is the most up to date
     const spell = { ...spellRef.current }
-    spell.chain = serialize()
+    spell.chain = serialize() as SpellType
     const modules = await getSpellModules(spell)
     // attach modules to spell to be exported
     spell.modules = modules
@@ -120,6 +116,8 @@ const EventHandler = ({ pubSub, tab }) => {
     // Start download
     link.click()
 
+    if (!link.parentNode) return
+
     // Clean up and remove the link
     link.parentNode.removeChild(link)
   }
@@ -127,7 +125,7 @@ const EventHandler = ({ pubSub, tab }) => {
   // clean up anything inside the editor which we need to shut down.
   // mainly subscriptions, etc.
   const onCloseEditor = () => {
-    const editor = getEditor()
+    const editor = getEditor() as Record<string, any>
     if (editor.moduleSubscription) editor.moduleSubscription.unsubscribe()
   }
 

From 65eafc1f8011f2df24a3c4d1b67ece882d7ef1f3 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 11:05:08 -0700
Subject: [PATCH 036/531] Clean up chain types on event handler

---
 client/src/features/Thoth/components/EventHandler.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/src/features/Thoth/components/EventHandler.tsx b/client/src/features/Thoth/components/EventHandler.tsx
index 2b44b96a3..94da984d9 100644
--- a/client/src/features/Thoth/components/EventHandler.tsx
+++ b/client/src/features/Thoth/components/EventHandler.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useRef } from 'react'
-import { Spell as SpellType } from '@latitudegames/thoth-core/types'
+import { ChainData } from '@latitudegames/thoth-core/types'
 
 import {
   uniqueNamesGenerator,
@@ -59,7 +59,7 @@ const EventHandler = ({ pubSub, tab }) => {
 
   const saveSpell = async () => {
     const currentSpell = spellRef.current
-    const chain = serialize() as SpellType
+    const chain = serialize() as ChainData
 
     await saveSpellMutation({ ...currentSpell, chain })
   }
@@ -96,7 +96,8 @@ const EventHandler = ({ pubSub, tab }) => {
   const onExport = async () => {
     // refetch spell from local DB to ensure it is the most up to date
     const spell = { ...spellRef.current }
-    spell.chain = serialize() as SpellType
+    spell.chain = serialize() as ChainData
+
     const modules = await getSpellModules(spell)
     // attach modules to spell to be exported
     spell.modules = modules

From ed0e57dd44d09029483b3bfc60e901f8250b4b51 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 11:05:22 -0700
Subject: [PATCH 037/531] Improve chain typings in spell api

---
 client/src/state/api/spells.ts | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/client/src/state/api/spells.ts b/client/src/state/api/spells.ts
index 85b7b0478..802782bc9 100644
--- a/client/src/state/api/spells.ts
+++ b/client/src/state/api/spells.ts
@@ -1,11 +1,11 @@
 import { createSelector } from '@reduxjs/toolkit'
 import { FetchBaseQueryError } from '@reduxjs/toolkit/query/react'
-import { Spell as SpellType } from '@latitudegames/thoth-core/types'
 
 import { initDB } from '../../database'
 import { QueryReturnValue } from '@reduxjs/toolkit/dist/query/baseQueryTypes'
 import { Module } from '../../database/schemas/module'
 import { rootApi } from './api'
+import { ChainData } from '@latitudegames/thoth-core/types'
 // function camelize(str) {
 //   return str
 //     .replace(/(?:^\w|[A-Z]|\b\w)/g, function (word, index) {
@@ -24,7 +24,7 @@ export interface Spell {
   id?: string
   user?: Record<string, unknown> | null | undefined
   name: string
-  chain: SpellType
+  chain: ChainData
   modules: Module[]
   gameState: Record<string, unknown>
   createdAt?: number
@@ -37,7 +37,7 @@ export interface DeployedSpellVersion {
   message?: string
   versionName?: string
   url?: string
-  chain?: SpellType
+  chain?: ChainData
 }
 
 export interface DeployArgs {
@@ -150,19 +150,6 @@ export const selectAllSpells = createSelector(
   spellResult => spellResult?.data || emptySpells
 )
 
-export const selectSpellById = createSelector(
-  [
-    selectAllSpells,
-    (state, spellId) => {
-      return spellId
-    },
-  ],
-  (spells, spellId) =>
-    spells.find(spell => {
-      return spell.name === spellId
-    })
-)
-
 export const selectSpellsByModuleName = createSelector(
   [selectAllSpells, (state, moduleName) => moduleName],
   (spells, moduleName) =>

From 4cc37b86dce5bac091f7190eaaea95aa5466c2ea Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 11:05:33 -0700
Subject: [PATCH 038/531] Export chain data from thoth core types

---
 core/types.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/types.ts b/core/types.ts
index e9d0219a0..3f8b9ccb5 100644
--- a/core/types.ts
+++ b/core/types.ts
@@ -17,6 +17,7 @@ import { SocketNameType, SocketType } from './src/sockets'
 import { EngineContext } from './src/engine'
 import { ThothTask } from './src/thoth-component'
 import { ThothConsole } from './src/plugins/debuggerPlugin/ThothConsole'
+import { Data } from 'rete/types/core/data'
 
 export type { InspectorData } from './src/plugins/inspectorPlugin/Inspector'
 
@@ -126,6 +127,8 @@ export type NodeOutputs = {
   }
 }
 
+export type ChainData = Data
+
 export type NodeData = ReteNodeData & {
   fewshot?: string
   display: Function

From aa471b4909d3161c5f6b7e51826cf16ff6fca0ea Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 11:06:07 -0700
Subject: [PATCH 039/531] Strip out all module saving from composer autosave

---
 .../Thoth/workspaces/composer/index.tsx       | 29 +------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

diff --git a/client/src/features/Thoth/workspaces/composer/index.tsx b/client/src/features/Thoth/workspaces/composer/index.tsx
index 98964f2eb..8c79940ec 100644
--- a/client/src/features/Thoth/workspaces/composer/index.tsx
+++ b/client/src/features/Thoth/workspaces/composer/index.tsx
@@ -1,14 +1,8 @@
 import { useEffect, useRef } from 'react'
 
-import { store } from '@/state/store'
 import { useEditor } from '@thoth/contexts/EditorProvider'
 import { Layout } from '@thoth/contexts/LayoutProvider'
-import { useModule } from '@/contexts/ModuleProvider'
-import {
-  useLazyGetSpellQuery,
-  useSaveSpellMutation,
-  selectSpellById,
-} from '@/state/api/spells'
+import { useLazyGetSpellQuery, useSaveSpellMutation } from '@/state/api/spells'
 import { debounce } from '@/utils/debounce'
 import EditorWindow from '@thoth/windows/EditorWindow'
 import EventHandler from '@thoth/components/EventHandler'
@@ -23,7 +17,6 @@ const Workspace = ({ tab, tabs, pubSub }) => {
   const spellRef = useRef<Spell>()
   const [loadSpell, { data: spellData }] = useLazyGetSpellQuery()
   const [saveSpell] = useSaveSpellMutation()
-  const { saveModule } = useModule()
   const { editor } = useEditor()
 
   // Set up autosave for the workspaces
@@ -35,26 +28,6 @@ const Workspace = ({ tab, tabs, pubSub }) => {
         if (tab.type === 'spell') {
           saveSpell({ ...spellRef.current, chain: editor.toJSON() })
         }
-        if (tab.type === 'module') {
-          saveModule(tab.module, { data: editor.toJSON() }, false)
-          // when a module is saved, we look for any open spell tabs, and check if they have the module.
-          /// if they do, we trigger a save to ensure the module change is captured to the server
-          tabs
-            .filter(tab => tab.type === 'spell')
-            .forEach(filteredTab => {
-              if (filteredTab.spellId) {
-                const spell = selectSpellById(
-                  store.getState(),
-                  filteredTab.spellId
-                )
-                if (
-                  spell?.modules &&
-                  spell?.modules.some(module => module.name === tab.module)
-                )
-                  saveSpell({ ...spell })
-              }
-            })
-        }
       }, 500)
     )
   }, [editor])

From 5c9f65a966458b25e7f48d352d782bbe10c35851 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 11:06:21 -0700
Subject: [PATCH 040/531] Improve typing in editor provider

---
 .../features/Thoth/contexts/EditorProvider.tsx | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/client/src/features/Thoth/contexts/EditorProvider.tsx b/client/src/features/Thoth/contexts/EditorProvider.tsx
index f9a9d4178..9c508322e 100644
--- a/client/src/features/Thoth/contexts/EditorProvider.tsx
+++ b/client/src/features/Thoth/contexts/EditorProvider.tsx
@@ -1,4 +1,5 @@
 import { initEditor } from '@latitudegames/thoth-core'
+import { ChainData, IRunContextEditor } from '@latitudegames/thoth-core/types'
 import React, {
   useRef,
   useContext,
@@ -14,7 +15,6 @@ import { MyNode } from '../../common/Node/Node'
 import gridimg from '@/grid.png'
 import { usePubSub } from '../../../contexts/PubSubProvider'
 import { useRete, ReteContext } from './ReteProvider'
-// import { ThothTab } from './TabManagerProvider'
 
 export type ThothTab = {
   layoutJson: string
@@ -26,11 +26,12 @@ export type ThothTab = {
   active: boolean
 }
 
+// TODO give better typing to the editor
 const Context = createContext({
   run: () => {},
-  getEditor: () => {},
-  editor: {} as any,
-  serialize: () => {},
+  getEditor: (): IRunContextEditor | null => null,
+  editor: {} as Record<string, any>,
+  serialize: (): ChainData | undefined => undefined,
   buildEditor: (
     el: HTMLDivElement,
     // todo update this to use proper spell type
@@ -54,10 +55,7 @@ const EditorProvider = ({ children }) => {
     components: [],
     loadGraph: (chain: any) => {},
   })
-  const editorRef = useRef({
-    trigger: (event: string) => {},
-    toJSON: () => {},
-  })
+  const editorRef = useRef<IRunContextEditor | null>(null)
   const pubSub = usePubSub()
 
   const setEditor = editor => {
@@ -66,6 +64,7 @@ const EditorProvider = ({ children }) => {
   }
 
   const getEditor = () => {
+    if (!editorRef.current) return null
     return editorRef.current
   }
 
@@ -101,14 +100,17 @@ const EditorProvider = ({ children }) => {
   }
 
   const undo = () => {
+    if (!editorRef.current) return
     editorRef.current.trigger('undo')
   }
 
   const redo = () => {
+    if (!editorRef.current) return
     editorRef.current.trigger('redo')
   }
 
   const serialize = () => {
+    if (!editorRef.current) return
     return editorRef.current.toJSON()
   }
 

From 8c3b32c8ef67fb06745a1009a0e54bbd1144762c Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 11:06:48 -0700
Subject: [PATCH 041/531] Use get spell query rather than spell by id selector
 in deployement

---
 .../src/features/Thoth/windows/EditorWindow/Deployment.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/src/features/Thoth/windows/EditorWindow/Deployment.tsx b/client/src/features/Thoth/windows/EditorWindow/Deployment.tsx
index 5d4bfe6ce..62e8e8edb 100644
--- a/client/src/features/Thoth/windows/EditorWindow/Deployment.tsx
+++ b/client/src/features/Thoth/windows/EditorWindow/Deployment.tsx
@@ -1,6 +1,5 @@
 import { useEffect, useState } from 'react'
 import { Scrollbars } from 'react-custom-scrollbars-2'
-import { useSelector } from 'react-redux'
 import { useSnackbar } from 'notistack'
 
 import css from './editorwindow.module.css'
@@ -13,10 +12,10 @@ import { useModal } from '@/contexts/ModalProvider'
 
 import {
   useGetDeploymentsQuery,
-  selectSpellById,
   useDeploySpellMutation,
   useLazyGetDeploymentQuery,
   useSaveSpellMutation,
+  useGetSpellQuery,
 } from '@/state/api/spells'
 import { useEditor } from '@thoth/contexts/EditorProvider'
 import { latitudeApiRootUrl } from '@/config'
@@ -30,7 +29,9 @@ const DeploymentView = ({ open, setOpen, spellId, close }) => {
   const [deploySpell] = useDeploySpellMutation()
   const [saveSpell] = useSaveSpellMutation()
   const [getDeplopyment, { data: deploymentData }] = useLazyGetDeploymentQuery()
-  const spell = useSelector(state => selectSpellById(state, spellId))
+  const { data: spell } = useGetSpellQuery(spellId, {
+    skip: !spellId,
+  })
   const name = spell?.name as string
   const { data: deployments, isLoading } = useGetDeploymentsQuery(name, {
     skip: !spell?.name,

From c86f0cd21ec33b8f6ace989ddf8bb54370cb6c44 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 11:10:44 -0700
Subject: [PATCH 042/531] Fix typing in create new

---
 client/src/features/HomeScreen/screens/CreateNew.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/features/HomeScreen/screens/CreateNew.tsx b/client/src/features/HomeScreen/screens/CreateNew.tsx
index a3f1a8ba1..07cff15d9 100644
--- a/client/src/features/HomeScreen/screens/CreateNew.tsx
+++ b/client/src/features/HomeScreen/screens/CreateNew.tsx
@@ -16,7 +16,7 @@ import langImg from '../lang.png'
 import css from '../homeScreen.module.css'
 import TemplatePanel from '../components/TemplatePanel'
 import defaultChain from './chains/default'
-import { Spell } from '@latitudegames/thoth-core/types'
+import { ChainData } from '@latitudegames/thoth-core/types'
 
 const customConfig = {
   dictionaries: [adjectives, colors],
@@ -27,7 +27,7 @@ const customConfig = {
 type Template = {
   label: string
   bg: string
-  chain: Spell
+  chain: ChainData
 }
 
 const templates = [

From f6222ec7119b257d39d17c982962980bfdd01f13 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 11:14:07 -0700
Subject: [PATCH 043/531] Slightly improve caching by separating get endpoint
 to Spells tag rather than spell.

---
 client/src/state/api/spells.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/src/state/api/spells.ts b/client/src/state/api/spells.ts
index 802782bc9..249a170e1 100644
--- a/client/src/state/api/spells.ts
+++ b/client/src/state/api/spells.ts
@@ -58,7 +58,7 @@ export interface PatchArgs {
 export const spellApi = rootApi.injectEndpoints({
   endpoints: builder => ({
     getSpells: builder.query<Spell[], void>({
-      providesTags: ['Spell'],
+      providesTags: ['Spells'],
       query: () => 'game/spells',
     }),
     getSpell: builder.query<Spell, string>({
@@ -93,7 +93,7 @@ export const spellApi = rootApi.injectEndpoints({
       },
     }),
     newSpell: builder.mutation<Spell, Partial<Spell>>({
-      invalidatesTags: ['Spell'],
+      invalidatesTags: ['Spells'],
       query: spellData => ({
         url: 'game/spells',
         method: 'POST',
@@ -113,7 +113,7 @@ export const spellApi = rootApi.injectEndpoints({
       },
     }),
     deleteSpell: builder.mutation<string[], boolean>({
-      invalidatesTags: ['Spell'],
+      invalidatesTags: ['Spells'],
       query: spellId => ({
         url: `game/spells/${spellId}`,
         method: 'DELETE',

From 974cf25a5f489d78a497464ebd542e3e72542c5c Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 11:14:20 -0700
Subject: [PATCH 044/531] Add additional tag type to root API

---
 client/src/state/api/api.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/state/api/api.ts b/client/src/state/api/api.ts
index 398119698..4f69f76a4 100644
--- a/client/src/state/api/api.ts
+++ b/client/src/state/api/api.ts
@@ -14,6 +14,6 @@ export const rootApi = createApi({
       return headers
     },
   }),
-  tagTypes: ['Spell', 'Version'],
+  tagTypes: ['Spell', 'Spells', 'Version'],
   endpoints: () => ({}),
 })

From 33979531aa946155da376ef79a066ea5d799559b Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 11:15:22 -0700
Subject: [PATCH 045/531] Add redux persist

---
 client/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/package.json b/client/package.json
index a380c0f03..e58669dc4 100644
--- a/client/package.json
+++ b/client/package.json
@@ -61,6 +61,7 @@
     "react-simple-code-editor": "^0.11.0",
     "rebass": "^4.0.7",
     "redux": "^4.1.1",
+    "redux-persist": "^6.0.0",
     "regenerator-runtime": "^0.13.9",
     "rete-connection-reroute-plugin": "^0.4.0",
     "rete-context-menu-plugin": "^0.6.0-rc.1",

From fa5ae07dd1b985478e216a1c782cb1174c2bb26c Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 11:15:28 -0700
Subject: [PATCH 046/531] Update yarn lock

---
 yarn.lock | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 976cd9ee3..5c274ca9f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12174,6 +12174,11 @@ reduce-flatten@^2.0.0:
   resolved "https://registry.yarnpkg.com/reduce-flatten/-/reduce-flatten-2.0.0.tgz#734fd84e65f375d7ca4465c69798c25c9d10ae27"
   integrity sha512-EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w==
 
+redux-persist@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/redux-persist/-/redux-persist-6.0.0.tgz#b4d2972f9859597c130d40d4b146fecdab51b3a8"
+  integrity sha512-71LLMbUq2r02ng2We9S215LtPu3fY0KgaGE0k8WRgl6RkqxtGfl7HUozz1Dftwsb0D/5mZ8dwAaPbtnzfvbEwQ==
+
 redux-thunk@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622"
@@ -14276,10 +14281,8 @@ watchpack@^1.7.4:
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453"
   integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==
   dependencies:
-    chokidar "^3.4.1"
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
-    watchpack-chokidar2 "^2.0.1"
   optionalDependencies:
     chokidar "^3.4.1"
     watchpack-chokidar2 "^2.0.1"

From 55a2f8e60e9e0e46dd315d2906f3d36240909c42 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 11:50:07 -0700
Subject: [PATCH 047/531] Move reducers into root reducer

---
 client/src/state/reducers.ts | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 client/src/state/reducers.ts

diff --git a/client/src/state/reducers.ts b/client/src/state/reducers.ts
new file mode 100644
index 000000000..96948d7c8
--- /dev/null
+++ b/client/src/state/reducers.ts
@@ -0,0 +1,9 @@
+import { combineReducers } from '@reduxjs/toolkit'
+
+import { spellApi } from './api/spells'
+import tabReducer from './tabs'
+
+export default combineReducers({
+  tabs: tabReducer,
+  [spellApi.reducerPath]: spellApi.reducer,
+})

From c8db8e66ea6c31d687281fe762357b1903e1b5aa Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 11:50:27 -0700
Subject: [PATCH 048/531] Configure redux persist

---
 client/src/state/store.ts | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/client/src/state/store.ts b/client/src/state/store.ts
index c07352a1e..4c838c1b5 100644
--- a/client/src/state/store.ts
+++ b/client/src/state/store.ts
@@ -1,19 +1,44 @@
 import { configureStore, ThunkAction, Action } from '@reduxjs/toolkit'
 import { setupListeners } from '@reduxjs/toolkit/query/react'
-import tabReducer from './tabs'
+
+import rootReducer from './reducers'
+
+import {
+  persistStore,
+  persistReducer,
+  FLUSH,
+  REHYDRATE,
+  PAUSE,
+  PERSIST,
+  PURGE,
+  REGISTER,
+} from 'redux-persist'
+import storage from 'redux-persist/lib/storage'
+
 import { spellApi } from './api/spells'
 
+const persistConfig = {
+  key: 'root',
+  version: 1,
+  storage,
+}
+
+const persistedReducer = persistReducer(persistConfig, rootReducer)
+
 export const store = configureStore({
-  reducer: {
-    tabs: tabReducer,
-    [spellApi.reducerPath]: spellApi.reducer,
-  },
+  reducer: persistedReducer,
   middleware: getDefaultMiddleware =>
-    getDefaultMiddleware().concat(spellApi.middleware),
+    getDefaultMiddleware({
+      serializableCheck: {
+        ignoredActions: [FLUSH, REHYDRATE, PAUSE, PERSIST, PURGE, REGISTER],
+      },
+    }).concat(spellApi.middleware),
 })
 
 setupListeners(store.dispatch)
 
+export const persistor = persistStore(store)
+
 export type AppDispatch = typeof store.dispatch
 export type RootState = ReturnType<typeof store.getState>
 export type AppThunk<ReturnType = void> = ThunkAction<

From 00531f4a431d24fbb57c39434c07a1b73cd0c521 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 11:50:46 -0700
Subject: [PATCH 049/531] Convert index to typescript and hook up redux persist

---
 client/src/{index.js => index.tsx} | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
 rename client/src/{index.js => index.tsx} (73%)

diff --git a/client/src/index.js b/client/src/index.tsx
similarity index 73%
rename from client/src/index.js
rename to client/src/index.tsx
index df1d8e078..c5e3d1dd2 100644
--- a/client/src/index.js
+++ b/client/src/index.tsx
@@ -4,19 +4,22 @@ import React from 'react'
 import ReactDOM from 'react-dom'
 import { Provider } from 'react-redux'
 import { BrowserRouter as Router } from 'react-router-dom'
+import { PersistGate } from 'redux-persist/integration/react'
 
 import App from './App'
 import AppProviders from './contexts/AppProviders'
 import reportWebVitals from './reportWebVitals'
-import { store } from './state/store'
+import { persistor, store } from './state/store'
 
 ReactDOM.render(
   <React.StrictMode>
     <Router>
       <Provider store={store}>
-        <AppProviders>
-          <App />
-        </AppProviders>
+        <PersistGate loading={null} persistor={persistor}>
+          <AppProviders>
+            <App />
+          </AppProviders>
+        </PersistGate>
       </Provider>
     </Router>
   </React.StrictMode>,

From 3bc18fe8b96fa17e54c7c063c20507299bf306b2 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 11:51:44 -0700
Subject: [PATCH 050/531] Blacklist our API from persistance

---
 client/src/state/store.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/state/store.ts b/client/src/state/store.ts
index 4c838c1b5..1194a25b5 100644
--- a/client/src/state/store.ts
+++ b/client/src/state/store.ts
@@ -21,6 +21,7 @@ const persistConfig = {
   key: 'root',
   version: 1,
   storage,
+  blacklist: [spellApi.reducerPath],
 }
 
 const persistedReducer = persistReducer(persistConfig, rootReducer)

From a226fd5965292b646b81db1c473a80398f2894ca Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 12:11:24 -0700
Subject: [PATCH 051/531] Update webpack config to point to new tsk root index

---
 client/webpack.common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/webpack.common.js b/client/webpack.common.js
index 941474e13..6f2399095 100644
--- a/client/webpack.common.js
+++ b/client/webpack.common.js
@@ -25,7 +25,7 @@ const babelOptions = {
 
 module.exports = () => {
   return {
-    entry: ['regenerator-runtime/runtime.js', './src/index.js'],
+    entry: ['regenerator-runtime/runtime.js', './src/index.tsx'],
     output: {
       path: path.resolve(__dirname, '../build'),
       filename: '[name].[contenthash].bundle.js',

From 482ca5136e6c4a27981926f0db25df64434fa07a Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 12:27:21 -0700
Subject: [PATCH 052/531] Add npm run all to dependencies

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 227df424d..0f57b6f89 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,7 @@
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-import": "^2.24.2",
     "eslint-plugin-prettier": "^4.0.0",
+    "npm-run-all": "^4.1.5",
     "prettier": "^2.4.1"
   }
 }

From bf88df70c3ad53765514ee2328648e778bc488b3 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 12:27:25 -0700
Subject: [PATCH 053/531] Uodate yarn lock

---
 yarn.lock | 122 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 112 insertions(+), 10 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 5c274ca9f..b250dc751 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5488,6 +5488,17 @@ create-require@^1.1.0:
   resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
   integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
 
+cross-spawn@^6.0.5:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
 cross-spawn@^7.0.0, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
@@ -6392,6 +6403,32 @@ es-abstract@^1.17.4, es-abstract@^1.18.0, es-abstract@^1.18.0-next.1, es-abstrac
     string.prototype.trimstart "^1.0.4"
     unbox-primitive "^1.0.1"
 
+es-abstract@^1.19.1:
+  version "1.19.1"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3"
+  integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==
+  dependencies:
+    call-bind "^1.0.2"
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    get-intrinsic "^1.1.1"
+    get-symbol-description "^1.0.0"
+    has "^1.0.3"
+    has-symbols "^1.0.2"
+    internal-slot "^1.0.3"
+    is-callable "^1.2.4"
+    is-negative-zero "^2.0.1"
+    is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.1"
+    is-string "^1.0.7"
+    is-weakref "^1.0.1"
+    object-inspect "^1.11.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.2"
+    string.prototype.trimend "^1.0.4"
+    string.prototype.trimstart "^1.0.4"
+    unbox-primitive "^1.0.1"
+
 es-array-method-boxes-properly@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e"
@@ -8354,6 +8391,11 @@ is-set@^2.0.1, is-set@^2.0.2:
   resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec"
   integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==
 
+is-shared-array-buffer@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
+  integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
+
 is-ssh@^1.3.0:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.3.3.tgz#7f133285ccd7f2c2c7fc897b771b53d95a2b2c7e"
@@ -8423,6 +8465,13 @@ is-weakmap@^2.0.1:
   resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2"
   integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==
 
+is-weakref@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
+  integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
+  dependencies:
+    call-bind "^1.0.2"
+
 is-weakset@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.1.tgz#e9a0af88dbd751589f5e50d80f4c98b780884f83"
@@ -9782,6 +9831,11 @@ memory-fs@^0.5.0:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
+memorystream@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
+  integrity sha1-htcJCzDORV1j+64S3aUaR93K+bI=
+
 meow@^8.0.0:
   version "8.1.2"
   resolved "https://registry.yarnpkg.com/meow/-/meow-8.1.2.tgz#bcbe45bda0ee1729d350c03cffc8395a36c4e897"
@@ -10217,6 +10271,11 @@ nested-error-stacks@~2.0.1:
   resolved "https://registry.yarnpkg.com/nested-error-stacks/-/nested-error-stacks-2.0.1.tgz#d2cc9fc5235ddb371fc44d506234339c8e4b0a4b"
   integrity sha512-SrQrok4CATudVzBS7coSz26QRSmlK9TzzoFbeKfcPBUFPjcQM9Rqvr/DlJkOrwI/0KcgvMub1n1g5Jt9EgRn4A==
 
+nice-try@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
+
 no-case@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d"
@@ -10501,6 +10560,21 @@ npm-registry-fetch@^9.0.0:
     minizlib "^2.0.0"
     npm-package-arg "^8.0.0"
 
+npm-run-all@^4.1.5:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.5.tgz#04476202a15ee0e2e214080861bff12a51d98fba"
+  integrity sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    chalk "^2.4.1"
+    cross-spawn "^6.0.5"
+    memorystream "^0.3.1"
+    minimatch "^3.0.4"
+    pidtree "^0.3.0"
+    read-pkg "^3.0.0"
+    shell-quote "^1.6.1"
+    string.prototype.padend "^3.0.0"
+
 npm-run-path@^4.0.0, npm-run-path@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
@@ -11029,6 +11103,11 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
+path-key@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
+
 path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
@@ -11085,6 +11164,11 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
   integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==
 
+pidtree@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.1.tgz#ef09ac2cc0533df1f3250ccf2c4d366b0d12114a"
+  integrity sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==
+
 pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@@ -12460,14 +12544,6 @@ rete-react-render-plugin@^0.2.1:
   resolved "https://registry.yarnpkg.com/rete-react-render-plugin/-/rete-react-render-plugin-0.2.1.tgz#71a6d73f18f850b85262563f678b40080a7b0e32"
   integrity sha512-2ZMXUP0v+EiejHVMqdrOmUwyDBHC2UDOJ/pFkElaZL1Kn/E40JZA5yzdBXi6ajYZI2DCzoW5ZBcA2Ihjtur8MQ==
 
-"rete@git+https://github.com/latitudegames/rete.git#master":
-  version "1.4.5"
-  uid "24565a81a2bbcdd4cd73b0a725977550cc8ff988"
-  resolved "git+https://github.com/latitudegames/rete.git#24565a81a2bbcdd4cd73b0a725977550cc8ff988"
-  dependencies:
-    lodash "^4.17.21"
-    watch "^1.0.2"
-
 "rete@https://github.com/latitudegames/rete.git#master":
   version "1.4.5"
   resolved "https://github.com/latitudegames/rete.git#24565a81a2bbcdd4cd73b0a725977550cc8ff988"
@@ -12682,7 +12758,7 @@ selfsigned@^1.10.11:
   dependencies:
     node-forge "^0.10.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
+"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -12805,6 +12881,13 @@ shallow-clone@^3.0.0:
   dependencies:
     kind-of "^6.0.2"
 
+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
+  dependencies:
+    shebang-regex "^1.0.0"
+
 shebang-command@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
@@ -12812,11 +12895,21 @@ shebang-command@^2.0.0:
   dependencies:
     shebang-regex "^3.0.0"
 
+shebang-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
+
 shebang-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
+shell-quote@^1.6.1:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123"
+  integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==
+
 side-channel@^1.0.3, side-channel@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
@@ -13254,6 +13347,15 @@ string-width@^4.1.0, string-width@^4.2.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
+string.prototype.padend@^3.0.0:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.1.3.tgz#997a6de12c92c7cb34dc8a201a6c53d9bd88a5f1"
+  integrity sha512-jNIIeokznm8SD/TZISQsZKYu7RJyheFNt84DUPrh482GC8RVp2MKqm2O5oBRdGxbDQoXrhhWtPIWQOiy20svUg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.1"
+
 string.prototype.trim@^1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.4.tgz#6014689baf5efaf106ad031a5fa45157666ed1bd"
@@ -14639,7 +14741,7 @@ which-typed-array@^1.1.2:
     has-tostringtag "^1.0.0"
     is-typed-array "^1.1.7"
 
-which@^1.3.1:
+which@^1.2.9, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==

From 6ff8266d1328c0439d25950dc2a82aabb90c6395 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 12:28:51 -0700
Subject: [PATCH 054/531] Remove concurrently

---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index 0f57b6f89..a7bb8f94a 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,6 @@
   "dependencies": {
     "@typescript-eslint/eslint-plugin": "^4.31.1",
     "@typescript-eslint/parser": "^4.31.1",
-    "concurrently": "^6.2.1",
     "copyfiles": "^2.4.1",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-import": "^2.24.2",

From 3921718daea26db03de833fde6bcc267d3d9a149 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 12:28:57 -0700
Subject: [PATCH 055/531] Update yarn lock

---
 yarn.lock | 34 ++--------------------------------
 1 file changed, 2 insertions(+), 32 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index b250dc751..fb0af1b1b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5170,21 +5170,6 @@ concat-stream@^2.0.0:
     readable-stream "^3.0.2"
     typedarray "^0.0.6"
 
-concurrently@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-6.2.1.tgz#d880fc1d77559084732fa514092a3d5109a0d5bf"
-  integrity sha512-emgwhH+ezkuYKSHZQ+AkgEpoUZZlbpPVYCVv7YZx0r+T7fny1H03r2nYRebpi2DudHR4n1Rgbo2YTxKOxVJ4+g==
-  dependencies:
-    chalk "^4.1.0"
-    date-fns "^2.16.1"
-    lodash "^4.17.21"
-    read-pkg "^5.2.0"
-    rxjs "^6.6.3"
-    spawn-command "^0.0.2-1"
-    supports-color "^8.1.0"
-    tree-kill "^1.2.2"
-    yargs "^16.2.0"
-
 config-chain@^1.1.12:
   version "1.1.13"
   resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"
@@ -5686,11 +5671,6 @@ data-urls@^3.0.0:
     whatwg-mimetype "^3.0.0"
     whatwg-url "^10.0.0"
 
-date-fns@^2.16.1:
-  version "2.24.0"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.24.0.tgz#7d86dc0d93c87b76b63d213b4413337cfd1c105d"
-  integrity sha512-6ujwvwgPID6zbI0o7UbURi2vlLDR9uP26+tW6Lg+Ji3w7dd0i3DOcjcClLjLPranT60SSEFBwdSyYwn/ZkPIuw==
-
 dateformat@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
@@ -12660,7 +12640,7 @@ rxdb@^9.21.0:
     util "0.12.4"
     z-schema "5.0.1"
 
-rxjs@^6.6.0, rxjs@^6.6.3:
+rxjs@^6.6.0:
   version "6.6.7"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
   integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
@@ -13129,11 +13109,6 @@ spark-md5@^3.0.1:
   resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.2.tgz#7952c4a30784347abcee73268e473b9c0167e3fc"
   integrity sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw==
 
-spawn-command@^0.0.2-1:
-  version "0.0.2-1"
-  resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2-1.tgz#62f5e9466981c1b796dc5929937e11c9c6921bd0"
-  integrity sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A=
-
 spdx-correct@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
@@ -13512,7 +13487,7 @@ supports-color@^7.0.0, supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
-supports-color@^8.0.0, supports-color@^8.1.0:
+supports-color@^8.0.0:
   version "8.1.1"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
   integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
@@ -13844,11 +13819,6 @@ tr46@~0.0.3:
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
   integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
 
-tree-kill@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
-  integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
-
 trim-newlines@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"

From 55656d5f41f325300b5dcf51be69463da4f06fe1 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 12:32:57 -0700
Subject: [PATCH 056/531] Use npm run all for root start command

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a7bb8f94a..5d3347652 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
   "scripts": {
     "start:core": "lerna exec --scope @latitudegames/thoth-core -- yarn start",
     "start:client": "lerna exec --scope @thoth/client -- yarn start",
-    "start": "concurrently \"yarn start:core\" \"sleep 15s && yarn start:client\"",
+    "start": "run-p start:core start:client",
     "lint": "lerna run lint --parallel",
     "lint:fix": "lerna run lint:fix --parallel",
     "build": "copyfiles LICENSE.txt client && lerna exec --scope @thoth/client -- yarn build",

From 13eebb89a81bc6266356d1dcd467f4aec2b2f15a Mon Sep 17 00:00:00 2001
From: Nick Walton <nickwalton00@gmail.com>
Date: Tue, 22 Mar 2022 16:10:37 -0700
Subject: [PATCH 057/531] update to v2

---
 client/src/services/game-api/text.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/services/game-api/text.ts b/client/src/services/game-api/text.ts
index 19f942169..f41c89c44 100644
--- a/client/src/services/game-api/text.ts
+++ b/client/src/services/game-api/text.ts
@@ -3,7 +3,7 @@ import { getAuthHeader } from '../../contexts/AuthProvider'
 
 export const completion = async body => {
   try {
-    const response = await fetch(latitudeApiRootUrl + '/text/completions/v2', {
+    const response = await fetch(latitudeApiRootUrl + '/text/completions_v2', {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',

From 845c850b740f88e7bd0f4ec960bd1d46ee830dbe Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 17:12:05 -0700
Subject: [PATCH 058/531] Backup module select

---
 .../DataControls/{ModuleSelect.tsx => ModuleSelect.tsx.bak}       | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename client/src/features/Thoth/windows/InspectorWindow/DataControls/{ModuleSelect.tsx => ModuleSelect.tsx.bak} (100%)

diff --git a/client/src/features/Thoth/windows/InspectorWindow/DataControls/ModuleSelect.tsx b/client/src/features/Thoth/windows/InspectorWindow/DataControls/ModuleSelect.tsx.bak
similarity index 100%
rename from client/src/features/Thoth/windows/InspectorWindow/DataControls/ModuleSelect.tsx
rename to client/src/features/Thoth/windows/InspectorWindow/DataControls/ModuleSelect.tsx.bak

From 4306b688eb7eee02024d5e73951bfe82ccf83d7c Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 17:12:15 -0700
Subject: [PATCH 059/531] Backup module provider

---
 .../src/contexts/{ModuleProvider.tsx => ModuleProvider.tsx.bak}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename client/src/contexts/{ModuleProvider.tsx => ModuleProvider.tsx.bak} (100%)

diff --git a/client/src/contexts/ModuleProvider.tsx b/client/src/contexts/ModuleProvider.tsx.bak
similarity index 100%
rename from client/src/contexts/ModuleProvider.tsx
rename to client/src/contexts/ModuleProvider.tsx.bak

From a755208b8edcb5f048a6e366385523bea4183510 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 17:12:23 -0700
Subject: [PATCH 060/531] Delete database provider

---
 client/src/contexts/DatabaseProvider.jsx | 34 ------------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 client/src/contexts/DatabaseProvider.jsx

diff --git a/client/src/contexts/DatabaseProvider.jsx b/client/src/contexts/DatabaseProvider.jsx
deleted file mode 100644
index 8f89bcd2e..000000000
--- a/client/src/contexts/DatabaseProvider.jsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { useContext, createContext, useState, useEffect } from 'react'
-import { initDB } from '../database'
-import LoadingScreen from '../features/common/LoadingScreen/LoadingScreen'
-
-const Context = createContext(!undefined)
-
-export const useDB = () => useContext(Context)
-
-const DatabaseProvider = ({ children }) => {
-  const [db, setDb] = useState(false)
-  const [models, setModels] = useState(false)
-
-  useEffect(() => {
-    ;(async () => {
-      if (db) return
-
-      const { database, models } = await initDB()
-
-      setDb(database)
-      setModels(models)
-    })()
-  }, [db])
-
-  const publicInterface = {
-    db,
-    models,
-  }
-
-  if (!db || !models) return <LoadingScreen />
-
-  return <Context.Provider value={publicInterface}>{children}</Context.Provider>
-}
-
-export default DatabaseProvider

From 64a55062d9b320cf2cd4cf2789e6e86eff73a1f5 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 17:12:33 -0700
Subject: [PATCH 061/531] Delete database index

---
 client/src/database/index.ts | 117 -----------------------------------
 1 file changed, 117 deletions(-)
 delete mode 100644 client/src/database/index.ts

diff --git a/client/src/database/index.ts b/client/src/database/index.ts
deleted file mode 100644
index 4d6d2ffb9..000000000
--- a/client/src/database/index.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
-// eslint-disable-next-line no-unused-vars
-import { createRxDatabase, addRxPlugin } from 'rxdb'
-
-import loadModuleModel from './models/moduleModel'
-import userModel from './models/userModel'
-import moduleCollection from './schemas/module'
-import settingsCollection from './schemas/settings'
-import tabCollection from './schemas/tab'
-import userCollection from './schemas/user'
-
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-addRxPlugin(require('pouchdb-adapter-idb'))
-
-type Database = {
-  addCollections: Function
-  tabs: Record<string, any>
-}
-
-type DatabaseReturn = {
-  database: Database
-  models: Record<string, any>
-}
-
-let databaseReturn: DatabaseReturn | null = null
-let database: null | Database = null
-const databaseName = 'thoth_alpha'
-const adapter = 'idb'
-
-export const initDB = async () => {
-  if (databaseReturn !== null) return databaseReturn
-
-  // Uncomment this for fast deletion of DB
-  if (process.env.NODE_ENV !== 'production') {
-    // await removeRxDatabase(databaseName, adapter)
-  }
-
-  database = (await createRxDatabase({
-    name: databaseName, // <- name
-    adapter: adapter, // <- storage-adapter
-  })) as Database
-
-  if (!database) return
-
-  const mergeCollections = collectionArr =>
-    collectionArr.reduce((acc, collection) => ({ ...acc, ...collection }), {})
-
-  const collections = [
-    settingsCollection,
-    tabCollection,
-    moduleCollection,
-    userCollection,
-  ]
-
-  await database.addCollections(mergeCollections(collections))
-
-  // middleware hooks
-  database.tabs.preInsert(async doc => {
-    if (doc.active) {
-      const query = database?.tabs
-        .find()
-        .where('active')
-        .eq(true)
-        .and([
-          {
-            id: {
-              $ne: doc.id,
-            },
-          },
-        ])
-
-      await query.update({
-        $set: {
-          active: false,
-        },
-      })
-
-      return doc
-    }
-  }, true)
-
-  database.tabs.preSave(async doc => {
-    if (doc.active) {
-      const query = database?.tabs
-        .find()
-        .where('active')
-        .eq(true)
-        .and([
-          {
-            id: {
-              $ne: doc.id,
-            },
-          },
-        ])
-
-      await query.update({
-        $set: {
-          active: false,
-        },
-      })
-
-      return doc
-    }
-  }, true)
-
-  const models = {
-    modules: loadModuleModel(database),
-    user: userModel(database),
-  }
-
-  databaseReturn = {
-    database,
-    models,
-  }
-
-  return databaseReturn
-}

From ed3e2f5682e8130f2b0b1987cea7da127cab9d5a Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 17:12:48 -0700
Subject: [PATCH 062/531] Backup module model

---
 client/src/database/models/{moduleModel.ts => moduleModel.ts.bak} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename client/src/database/models/{moduleModel.ts => moduleModel.ts.bak} (100%)

diff --git a/client/src/database/models/moduleModel.ts b/client/src/database/models/moduleModel.ts.bak
similarity index 100%
rename from client/src/database/models/moduleModel.ts
rename to client/src/database/models/moduleModel.ts.bak

From c770a85d51fffb117bc8353ff9db23956c43f453 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 17:12:58 -0700
Subject: [PATCH 063/531] Delete user model

---
 client/src/database/models/userModel.ts | 64 -------------------------
 1 file changed, 64 deletions(-)
 delete mode 100644 client/src/database/models/userModel.ts

diff --git a/client/src/database/models/userModel.ts b/client/src/database/models/userModel.ts
deleted file mode 100644
index 9a7d5a5c7..000000000
--- a/client/src/database/models/userModel.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-const loadSpellModel = db => {
-  const getUserById = async id => {
-    return await db.user
-      .findOne({
-        selector: {
-          id,
-        },
-      })
-      .exec()
-  }
-
-  const getUser = async () => {
-    const userDocs = await db.user.find().exec()
-
-    return userDocs.length > 0 ? userDocs[0].toJSON() : null
-  }
-
-  const createUser = async id => {
-    return await db.user.insert({ id })
-  }
-
-  const getOrCreate = async id => {
-    try {
-      let user = await getUserById(id)
-      if (!user) {
-        user = await createUser(id)
-      }
-
-      return user
-    } catch (err) {
-      // eslint-disable-next-line no-console
-      console.warn('error creating user', err)
-      return false
-    }
-  }
-
-  const updateUser = async (id, update) => {
-    const user = await getUserById(id)
-
-    return user.atomicUpdate(oldDoc => {
-      return { ...oldDoc, ...update }
-    })
-  }
-
-  const setAuthData = async (id, authData) => {
-    const user = await getUserById(id)
-
-    return user.atomicUpdate(oldData => {
-      return {
-        ...oldData,
-        authData,
-      }
-    })
-  }
-
-  return {
-    getUser,
-    updateUser,
-    setAuthData,
-    getOrCreate,
-  }
-}
-
-export default loadSpellModel

From caa2b89e65d02b5fad6b0e7208c14cb137b4831d Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 17:13:06 -0700
Subject: [PATCH 064/531] Delete module schema

---
 client/src/database/schemas/module.ts | 47 ---------------------------
 1 file changed, 47 deletions(-)
 delete mode 100644 client/src/database/schemas/module.ts

diff --git a/client/src/database/schemas/module.ts b/client/src/database/schemas/module.ts
deleted file mode 100644
index 5a920ce47..000000000
--- a/client/src/database/schemas/module.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-const moduleSchema = {
-  title: 'Module schema',
-  version: 1,
-  description:
-    'A module is a self contained spell chain which can act as a component inside another spell chain.',
-  type: 'object',
-  properties: {
-    id: {
-      type: 'string',
-    },
-    name: {
-      type: 'string',
-      primary: true,
-    },
-    data: {
-      type: 'object',
-      default: { id: 'demo@0.1.0', nodes: {} },
-    },
-    createdAt: {
-      type: 'number',
-    },
-    updatedAt: {
-      type: 'number',
-    },
-  },
-}
-
-export type Module = {
-  id: String
-  name: string
-  data: object
-  createdAt: number
-  updatedAt: number
-}
-
-const collection = {
-  modules: {
-    schema: moduleSchema,
-    migrationStrategies: {
-      1: function (oldDoc) {
-        return oldDoc
-      },
-    },
-  },
-}
-
-export default collection

From 45b46335b7f97bc17d288356d89289bbf0bc372d Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 17:13:13 -0700
Subject: [PATCH 065/531] Delete settings schema

---
 client/src/database/schemas/settings.ts | 24 ------------------------
 1 file changed, 24 deletions(-)
 delete mode 100644 client/src/database/schemas/settings.ts

diff --git a/client/src/database/schemas/settings.ts b/client/src/database/schemas/settings.ts
deleted file mode 100644
index 4feb104e2..000000000
--- a/client/src/database/schemas/settings.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-const settingsSchema = {
-  title: 'Settings schema',
-  version: 0,
-  description: 'All local settings for a users session',
-  type: 'object',
-  properties: {
-    name: {
-      type: 'string',
-      primary: true,
-    },
-    currentSpell: {
-      ref: 'spell',
-      type: 'string',
-    },
-  },
-}
-
-const collection = {
-  settings: {
-    schema: settingsSchema,
-  },
-}
-
-export default collection

From 45f7cea9264921ce8fd672c4cc80f3b010086e50 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 17:13:20 -0700
Subject: [PATCH 066/531] Delete tab schema

---
 client/src/database/schemas/tab.ts | 50 ------------------------------
 1 file changed, 50 deletions(-)
 delete mode 100644 client/src/database/schemas/tab.ts

diff --git a/client/src/database/schemas/tab.ts b/client/src/database/schemas/tab.ts
deleted file mode 100644
index edcc4f8a1..000000000
--- a/client/src/database/schemas/tab.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-const tabSchema = {
-  title: 'Tab schema',
-  version: 2,
-  description:
-    'Tabs are a high level form of organization and represent a discrete workspace in thoth.',
-  type: 'object',
-  properties: {
-    id: {
-      type: 'string',
-      primary: true,
-    },
-    name: {
-      type: 'string',
-    },
-    active: {
-      type: 'boolean',
-      default: false,
-    },
-    layoutJson: {
-      type: 'object',
-    },
-    type: {
-      type: 'string',
-    },
-    spell: {
-      ref: 'spell',
-      type: ['string', 'null'],
-    },
-    module: {
-      ref: 'module',
-      type: ['string', 'null'],
-    },
-  },
-}
-
-const collection = {
-  tabs: {
-    schema: tabSchema,
-    migrationStrategies: {
-      1: function (oldDoc) {
-        return oldDoc
-      },
-      2: function (oldDoc) {
-        return oldDoc
-      },
-    },
-  },
-}
-
-export default collection

From 7a0a632f2dcac2ff3089191584333d6014de7d48 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 17:13:26 -0700
Subject: [PATCH 067/531] Delete user schema

---
 client/src/database/schemas/user.ts | 38 -----------------------------
 1 file changed, 38 deletions(-)
 delete mode 100644 client/src/database/schemas/user.ts

diff --git a/client/src/database/schemas/user.ts b/client/src/database/schemas/user.ts
deleted file mode 100644
index 4831dc8bf..000000000
--- a/client/src/database/schemas/user.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-const userSchema = {
-  title: 'user schema',
-  version: 0,
-  description: 'The main user object',
-  type: 'object',
-  properties: {
-    id: {
-      type: 'string',
-      primary: true,
-    },
-    username: {
-      type: 'string',
-    },
-    email: {
-      type: 'string',
-    },
-    accessToken: {
-      type: 'string',
-    },
-    groups: {
-      type: 'array',
-    },
-    lastLogin: {
-      type: 'number',
-    },
-    authData: {
-      type: 'string',
-    },
-  },
-}
-
-const collection = {
-  user: {
-    schema: userSchema,
-  },
-}
-
-export default collection

From 4cabecf5e7f780c15d70388ad18e903c5b6455cf Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 17:13:41 -0700
Subject: [PATCH 068/531] Remove database and module provider from app
 providers

---
 client/src/contexts/AppProviders.tsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/client/src/contexts/AppProviders.tsx b/client/src/contexts/AppProviders.tsx
index e3ad052d9..d47344887 100644
--- a/client/src/contexts/AppProviders.tsx
+++ b/client/src/contexts/AppProviders.tsx
@@ -1,8 +1,6 @@
 import { createTheme, ThemeProvider } from '@material-ui/core/styles'
 
 import AuthProvider from './AuthProvider'
-import DatabaseProvider from './DatabaseProvider'
-import ModuleProvider from './ModuleProvider'
 import PubSubProvider from './PubSubProvider'
 import ToastProvider from './ToastProvider'
 
@@ -16,9 +14,7 @@ const providers = [
   PubSubProvider,
   [ThemeProvider, { theme: darkTheme }],
   ToastProvider,
-  DatabaseProvider,
   AuthProvider,
-  ModuleProvider,
 ]
 
 /**

From 77335af71ece1b88b44857b98905406dc5040888 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 17:13:51 -0700
Subject: [PATCH 069/531] Remove db dependence from home screen

---
 client/src/features/HomeScreen/HomeScreen.tsx | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/client/src/features/HomeScreen/HomeScreen.tsx b/client/src/features/HomeScreen/HomeScreen.tsx
index a7d4151f2..786bafb8c 100644
--- a/client/src/features/HomeScreen/HomeScreen.tsx
+++ b/client/src/features/HomeScreen/HomeScreen.tsx
@@ -6,20 +6,17 @@ import {
   useDeleteSpellMutation,
   useNewSpellMutation,
 } from '../../state/api/spells'
-import { useDB } from '../../contexts/DatabaseProvider'
 import AllProjects from './screens/AllProjects'
 import CreateNew from './screens/CreateNew'
 import OpenProject from './screens/OpenProject'
 import css from './homeScreen.module.css'
 import LoadingScreen from '../common/LoadingScreen/LoadingScreen'
-import { ModelsType } from '../../types'
 import { closeTab, openTab } from '@/state/tabs'
 import { useDispatch } from 'react-redux'
 
 //MAIN
 
 const StartScreen = () => {
-  const { models } = useDB() as unknown as ModelsType
   const dispatch = useDispatch()
 
   const navigate = useNavigate()
@@ -36,14 +33,6 @@ const StartScreen = () => {
     }
     // TODO check for proper values here and throw errors
 
-    // Load modules from the spell
-    if (spellData?.modules && spellData.modules.length > 0)
-      await Promise.all(
-        spellData.modules.map(module => {
-          return models.modules.updateOrCreate(module)
-        })
-      )
-
     // Create new spell
     await newSpell({
       chain: spellData.chain,

From 39e644a0e55fe2817563b217a2a5c87356b43b22 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 17:14:07 -0700
Subject: [PATCH 070/531] Remove module dependence from event handler

---
 client/src/features/Thoth/components/EventHandler.tsx | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/client/src/features/Thoth/components/EventHandler.tsx b/client/src/features/Thoth/components/EventHandler.tsx
index 94da984d9..5e6d5fd68 100644
--- a/client/src/features/Thoth/components/EventHandler.tsx
+++ b/client/src/features/Thoth/components/EventHandler.tsx
@@ -14,7 +14,6 @@ import {
 } from '../../../state/api/spells'
 import { useEditor } from '../contexts/EditorProvider'
 import { useLayout } from '../contexts/LayoutProvider'
-import { useModule } from '../../../contexts/ModuleProvider'
 
 // Config for unique name generator
 const customConfig = {
@@ -40,7 +39,6 @@ const EventHandler = ({ pubSub, tab }) => {
   }, [spell])
 
   const { serialize, getEditor, undo, redo } = useEditor()
-  const { getSpellModules } = useModule()
 
   const { events, subscribe } = pubSub
 
@@ -97,10 +95,6 @@ const EventHandler = ({ pubSub, tab }) => {
     // refetch spell from local DB to ensure it is the most up to date
     const spell = { ...spellRef.current }
     spell.chain = serialize() as ChainData
-
-    const modules = await getSpellModules(spell)
-    // attach modules to spell to be exported
-    spell.modules = modules
     spell.name = uniqueNamesGenerator(customConfig)
 
     const json = JSON.stringify(spell)

From 247e71a45e39d9f47a27adb904675e9cd5c1cf02 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 17:14:20 -0700
Subject: [PATCH 071/531] Remove DB dependence from rete provider

---
 client/src/features/Thoth/contexts/ReteProvider.tsx | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/client/src/features/Thoth/contexts/ReteProvider.tsx b/client/src/features/Thoth/contexts/ReteProvider.tsx
index 0faa30565..8a4112dd9 100644
--- a/client/src/features/Thoth/contexts/ReteProvider.tsx
+++ b/client/src/features/Thoth/contexts/ReteProvider.tsx
@@ -4,10 +4,8 @@ import { useContext, createContext, useRef, useEffect } from 'react'
 import { postEnkiCompletion } from '../../../services/game-api/enki'
 import { completion as _completion } from '../../../services/game-api/text'
 import { invokeInference } from '../../../utils/huggingfaceHelper'
-import { useDB } from '../../../contexts/DatabaseProvider'
 import { usePubSub } from '../../../contexts/PubSubProvider'
 import { useFetchFromImageCacheMutation } from '@/state/api/visualGenerationsApi'
-import { ModelsType } from '../../../types'
 import { ThothWorkerInputs } from '@latitudegames/thoth-core/types'
 import {
   Spell,
@@ -28,9 +26,6 @@ export interface ReteContext extends EngineContext {
   sendToDebug: (data) => void
   onDebug: (node, callback) => void
   clearTextEditor: () => void
-  getSpell: Function
-  getModule: Function
-  getModules: Function
   getCurrentGameState: () => Record<string, unknown>
   updateCurrentGameState: (update) => void
   readFromImageCache: (caption, cacheTag, topK) => Promise<Record<string, any>>
@@ -59,8 +54,6 @@ const ReteProvider = ({ children, tab }) => {
     spellRef.current = _spell
   }, [_spell])
 
-  const { models } = useDB() as unknown as ModelsType
-
   const {
     $PLAYTEST_INPUT,
     $PLAYTEST_PRINT,
@@ -212,10 +205,6 @@ const ReteProvider = ({ children, tab }) => {
     getCurrentGameState,
     updateCurrentGameState,
     processCode,
-    ...models.modules,
-
-    // going to need to manuall create theses
-    ...models.spells,
   }
 
   return <Context.Provider value={publicInterface}>{children}</Context.Provider>

From 577aec574320b238002c4467538f709ef767d3f3 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 17:14:33 -0700
Subject: [PATCH 072/531] Disable module select from data controls

---
 .../windows/InspectorWindow/DataControls/DataControls.jsx      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/src/features/Thoth/windows/InspectorWindow/DataControls/DataControls.jsx b/client/src/features/Thoth/windows/InspectorWindow/DataControls/DataControls.jsx
index c8415ba18..207112ea4 100644
--- a/client/src/features/Thoth/windows/InspectorWindow/DataControls/DataControls.jsx
+++ b/client/src/features/Thoth/windows/InspectorWindow/DataControls/DataControls.jsx
@@ -6,7 +6,6 @@ import Info from './Info'
 import Input from './Input'
 import InputGenerator from './InputGenerator'
 import LongText from './LongTextControl'
-import ModuleSelect from './ModuleSelect'
 import OutputGenerator from './OutputGenerator'
 import DropdownSelect from './DropdownSelect'
 import SocketGenerator from './SocketGenerator'
@@ -23,7 +22,7 @@ const controlMap = {
   input: Input,
   inputGenerator: InputGenerator,
   longText: LongText,
-  moduleSelect: ModuleSelect,
+  // moduleSelect: ModuleSelect,
   outputGenerator: OutputGenerator,
   slider: StubComponent,
   socketGenerator: SocketGenerator,

From 1f2f1cd6768a1c9844182e8fc8df8d7517d69dfc Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 17:14:47 -0700
Subject: [PATCH 073/531] Remove modules from spell state api

---
 client/src/state/api/spells.ts | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/client/src/state/api/spells.ts b/client/src/state/api/spells.ts
index 249a170e1..08dc87a0a 100644
--- a/client/src/state/api/spells.ts
+++ b/client/src/state/api/spells.ts
@@ -1,9 +1,7 @@
 import { createSelector } from '@reduxjs/toolkit'
 import { FetchBaseQueryError } from '@reduxjs/toolkit/query/react'
 
-import { initDB } from '../../database'
 import { QueryReturnValue } from '@reduxjs/toolkit/dist/query/baseQueryTypes'
-import { Module } from '../../database/schemas/module'
 import { rootApi } from './api'
 import { ChainData } from '@latitudegames/thoth-core/types'
 // function camelize(str) {
@@ -13,19 +11,12 @@ import { ChainData } from '@latitudegames/thoth-core/types'
 //     })
 //     .replace(/\s+/g, '')
 // }
-
-const _moduleModel = async () => {
-  const db = await initDB()
-  if (!db) return
-  const { modules } = db.models
-  return modules
-}
 export interface Spell {
   id?: string
   user?: Record<string, unknown> | null | undefined
   name: string
   chain: ChainData
-  modules: Module[]
+  // Spells: Module[]
   gameState: Record<string, unknown>
   createdAt?: number
   updatedAt?: number
@@ -73,10 +64,6 @@ export const spellApi = rootApi.injectEndpoints({
       invalidatesTags: ['Spell'],
       // needed to use queryFn as query option didnt seem to allow async functions.
       async queryFn(spell, { dispatch }, extraOptions, baseQuery) {
-        const moduleModel = await _moduleModel()
-        const modules = await moduleModel.getSpellModules(spell)
-        spell.modules = modules
-
         const baseQueryOptions = {
           url: 'game/spells/save',
           body: spell,
@@ -150,16 +137,6 @@ export const selectAllSpells = createSelector(
   spellResult => spellResult?.data || emptySpells
 )
 
-export const selectSpellsByModuleName = createSelector(
-  [selectAllSpells, (state, moduleName) => moduleName],
-  (spells, moduleName) =>
-    spells.filter(
-      spell =>
-        spell.modules &&
-        spell?.modules.some(module => module.name === moduleName)
-    )
-)
-
 export const {
   useGetSpellQuery,
   useGetSpellsQuery,

From 4d1d491de1eca36d8c57d4028f30e5f8e648aadb Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 17:15:06 -0700
Subject: [PATCH 074/531] Set module docs to empty array in core editor

---
 core/src/editor.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/editor.ts b/core/src/editor.ts
index 0cc5d7667..86e87d601 100644
--- a/core/src/editor.ts
+++ b/core/src/editor.ts
@@ -96,6 +96,7 @@ export const initEditor = async function ({
       const { workspaceType } = component
 
       if (component.deprecated) return null
+      if (component.hide) return null
       if (workspaceType && workspaceType !== tabType) return null
       return [component.category]
     },
@@ -109,7 +110,8 @@ export const initEditor = async function ({
     scaleExtent: { min: 0.25, max: 2 },
   })
 
-  const moduleDocs = await thoth.getModules()
+  // const moduleDocs = await thoth.getModules()
+  const moduleDocs = [] as any[]
 
   // Parse modules into dictionary of all modules and JSON values
   let modules: Record<string, ModuleType> = moduleDocs

From 2d4c82d3ceae35a051d4f04070e1fb8f9d79969f Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 17:15:18 -0700
Subject: [PATCH 075/531] Add hide property to thoth components

---
 core/src/thoth-component.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/thoth-component.ts b/core/src/thoth-component.ts
index 7f613ef65..8ef9f987c 100644
--- a/core/src/thoth-component.ts
+++ b/core/src/thoth-component.ts
@@ -44,6 +44,7 @@ export abstract class ThothComponent<
   info: string
   display: boolean
   deprecated: boolean = false
+  hide: boolean = false
   deprecationMessage: string | undefined
   module: ModuleOptions
   contextMenuName: string | undefined

From 4e5024c04489791caa5902ce60787811b9962e48 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 17:15:26 -0700
Subject: [PATCH 076/531] Hide the module component

---
 core/src/components/Module.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/components/Module.ts b/core/src/components/Module.ts
index 39cb0ba25..132e83eae 100644
--- a/core/src/components/Module.ts
+++ b/core/src/components/Module.ts
@@ -20,6 +20,7 @@ export class ModuleComponent extends ThothComponent<ModuleWorkerOutput[]> {
   info
   subscriptionMap: Record<number, Function> = {}
   editor: any
+  hide: true
   noBuildUpdate: boolean
   category: string
 

From 1bccd65f5609e61f1514166f95fe7314d13e1835 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 17:17:04 -0700
Subject: [PATCH 077/531] Remove rxdb and rxjs from dependencies

---
 client/package.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/client/package.json b/client/package.json
index e58669dc4..2de0d0993 100644
--- a/client/package.json
+++ b/client/package.json
@@ -66,8 +66,6 @@
     "rete-connection-reroute-plugin": "^0.4.0",
     "rete-context-menu-plugin": "^0.6.0-rc.1",
     "rete-react-render-plugin": "^0.2.1",
-    "rxdb": "^9.21.0",
-    "rxjs": "^7.2.0",
     "unique-names-generator": "^4.5.0",
     "uuid": "^8.3.2",
     "web-vitals": "^1.0.1",

From 66564a02104e9aaf594258dbc257dfaf948fd8e8 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 17:17:09 -0700
Subject: [PATCH 078/531] Update yarn lock

---
 yarn.lock | 769 ++----------------------------------------------------
 1 file changed, 25 insertions(+), 744 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index fb0af1b1b..e30ae0040 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1025,21 +1025,7 @@
     core-js-pure "^3.16.0"
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@7.14.6":
-  version "7.14.6"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.6.tgz#535203bc0892efc7dec60bdc27b2ecf6e409062d"
-  integrity sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg==
-  dependencies:
-    regenerator-runtime "^0.13.4"
-
-"@babel/runtime@7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz#a9102eb5cadedf3f31d08a9ecf294af7827ea29f"
-  integrity sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==
-  dependencies:
-    regenerator-runtime "^0.13.4"
-
-"@babel/runtime@^7.10.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.10.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.4.tgz#fd17d16bfdf878e6dd02d19753a39fa8a8d9c84a"
   integrity sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==
@@ -2715,14 +2701,6 @@
   dependencies:
     "@babel/types" "^7.3.0"
 
-"@types/body-parser@*":
-  version "1.19.1"
-  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.1.tgz#0c0174c42a7d017b818303d4b5d969cb0b75929c"
-  integrity sha512-a6bTJ21vFOGIkwM0kzh9Yr89ziVxq4vYH2fQ6N8AeipEzai/cFK6aGMArIkUeIdRIgpwQa+2bXiLuUJCpSf2Cg==
-  dependencies:
-    "@types/connect" "*"
-    "@types/node" "*"
-
 "@types/cheerio@^0.22.22":
   version "0.22.30"
   resolved "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.30.tgz#6c1ded70d20d890337f0f5144be2c5e9ce0936e6"
@@ -2730,11 +2708,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/clone@2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@types/clone/-/clone-2.1.0.tgz#cb888a3fe5319275b566ae3a9bc606e310c533d4"
-  integrity sha512-d/aS/lPOnUSruPhgNtT8jW39fHRVTLQy9sodysP1kkG8EdAtdZu1vt8NJaYA8w/6Z9j8izkAsx1A/yJhcYR1CA==
-
 "@types/command-line-args@^5.0.0":
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/@types/command-line-args/-/command-line-args-5.2.0.tgz#adbb77980a1cc376bb208e3f4142e907410430f6"
@@ -2745,35 +2718,6 @@
   resolved "https://registry.yarnpkg.com/@types/command-line-usage/-/command-line-usage-5.0.2.tgz#ba5e3f6ae5a2009d466679cc431b50635bf1a064"
   integrity sha512-n7RlEEJ+4x4TS7ZQddTmNSxP+zziEG0TNsMfiRIxcIVXt71ENJ9ojeXmGO3wPoTdn7pJcU2xc3CJYMktNT6DPg==
 
-"@types/common-tags@1.8.0":
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/@types/common-tags/-/common-tags-1.8.0.tgz#79d55e748d730b997be5b7fce4b74488d8b26a6b"
-  integrity sha512-htRqZr5qn8EzMelhX/Xmx142z218lLyGaeZ3YR8jlze4TATRU9huKKvuBmAJEW4LCC4pnY1N6JAm6p85fMHjhg==
-
-"@types/connect@*":
-  version "3.4.35"
-  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"
-  integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==
-  dependencies:
-    "@types/node" "*"
-
-"@types/cors@2.8.10":
-  version "2.8.10"
-  resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.10.tgz#61cc8469849e5bcdd0c7044122265c39cec10cf4"
-  integrity sha512-C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ==
-
-"@types/debug@*":
-  version "4.1.7"
-  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82"
-  integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==
-  dependencies:
-    "@types/ms" "*"
-
-"@types/deep-equal@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@types/deep-equal/-/deep-equal-1.0.1.tgz#71cfabb247c22bcc16d536111f50c0ed12476b03"
-  integrity sha512-mMUu4nWHLBlHtxXY17Fg6+ucS/MnndyOWyOe7MmwkoMYxvfQU2ajtRaEvqSUv+aVkMqH/C0NCI8UoVfRNQ10yg==
-
 "@types/eslint-scope@^3.7.0":
   version "3.7.1"
   resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.1.tgz#8dc390a7b4f9dd9f1284629efce982e41612116e"
@@ -2800,25 +2744,6 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
   integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
-"@types/express-serve-static-core@^4.17.18":
-  version "4.17.24"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz#ea41f93bf7e0d59cd5a76665068ed6aab6815c07"
-  integrity sha512-3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA==
-  dependencies:
-    "@types/node" "*"
-    "@types/qs" "*"
-    "@types/range-parser" "*"
-
-"@types/express@4.17.12":
-  version "4.17.12"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.12.tgz#4bc1bf3cd0cfe6d3f6f2853648b40db7d54de350"
-  integrity sha512-pTYas6FrP15B1Oa0bkN5tQMNqOcVXa9j4FTFtO8DWI9kppKib+6NJtfTOOLcwxuuYvcX2+dVG6et1SxW/Kc17Q==
-  dependencies:
-    "@types/body-parser" "*"
-    "@types/express-serve-static-core" "^4.17.18"
-    "@types/qs" "*"
-    "@types/serve-static" "*"
-
 "@types/graceful-fs@^4.1.2":
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15"
@@ -2846,13 +2771,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/is-my-json-valid@2.18.0":
-  version "2.18.0"
-  resolved "https://registry.yarnpkg.com/@types/is-my-json-valid/-/is-my-json-valid-2.18.0.tgz#4f2787cc1e5e67186f149680003cc6d2621faf0a"
-  integrity sha512-iVsZirn9cYluADct+CpLx49TTEtHJfcEXD8WcqF3Bq+rfacJBOD9avZOEfNC0k64wCl2dZfXjzzh7KXn6g0N2g==
-  dependencies:
-    is-my-json-valid "*"
-
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762"
@@ -2893,11 +2811,6 @@
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
   integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
 
-"@types/json-schema@7.0.7":
-  version "7.0.7"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
-  integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
-
 "@types/json5@^0.0.29":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
@@ -2908,11 +2821,6 @@
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.174.tgz#b4b06b6eced9850eed6b6a8f1abdd0f5192803c1"
   integrity sha512-KMBLT6+g9qrGXpDt7ohjWPUD34WA/jasrtjTEHStF0NPdEwJ1N9SZ+4GaMVDeuk/y0+X5j9xFm6mNiXS7UoaLQ==
 
-"@types/mime@^1":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
-  integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
-
 "@types/minimatch@^3.0.3":
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
@@ -2923,18 +2831,6 @@
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
   integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
 
-"@types/ms@*":
-  version "0.7.31"
-  resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
-  integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
-
-"@types/node-fetch@*":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-3.0.3.tgz#9d969c9a748e841554a40ee435d26e53fa3ee899"
-  integrity sha512-HhggYPH5N+AQe/OmN6fmhKmRRt2XuNJow+R3pQwJxOOF9GuwM7O2mheyGeIrs5MOIeNjDEdgdoyHBOrFeJBR3g==
-  dependencies:
-    node-fetch "*"
-
 "@types/node@*", "@types/node@^16.4.3":
   version "16.10.1"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.10.1.tgz#f3647623199ca920960006b3dccf633ea905f243"
@@ -2945,55 +2841,11 @@
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
   integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
 
-"@types/object-path@0.11.0":
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/@types/object-path/-/object-path-0.11.0.tgz#0b744309b2573dc8bf867ef589b6288be998e602"
-  integrity sha512-/tuN8jDbOXcPk+VzEVZzzAgw1Byz7s/itb2YI10qkSyy6nykJH02DuhfrflxVdAdE7AZ91h5X6Cn0dmVdFw2TQ==
-
 "@types/parse-json@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
   integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
 
-"@types/pouchdb-core@*":
-  version "7.0.8"
-  resolved "https://registry.yarnpkg.com/@types/pouchdb-core/-/pouchdb-core-7.0.8.tgz#95b20c6be8bff0d7bd820701268ee8d141140215"
-  integrity sha512-99pGWgoxW/m1jLpnWQAfy7QGwXK3uCDSy+VtOG8sjuutjNJzX6nmOesbBq7ZpkquMH+X9vnT9CpWPunBpepEGg==
-  dependencies:
-    "@types/debug" "*"
-    "@types/pouchdb-find" "*"
-
-"@types/pouchdb-core@7.0.6":
-  version "7.0.6"
-  resolved "https://registry.yarnpkg.com/@types/pouchdb-core/-/pouchdb-core-7.0.6.tgz#16ce99513a47fc86da51a605aaae2910e83bdf3c"
-  integrity sha512-MCTtOA3buNN+YVkCWFaojWzP6SsESLRp5uXtXcZE8aUm8RNM/hrVun+RVmzP4NTIGBjKQgO9U9X/bTd9k0jsXA==
-  dependencies:
-    "@types/debug" "*"
-    "@types/node-fetch" "*"
-    "@types/pouchdb-find" "*"
-
-"@types/pouchdb-find@*":
-  version "6.3.7"
-  resolved "https://registry.yarnpkg.com/@types/pouchdb-find/-/pouchdb-find-6.3.7.tgz#f713534a53c1a7f3fd8fbbfb74131a1b04711ddc"
-  integrity sha512-b2dr9xoZRK5Mwl8UiRA9l5j9mmCxNfqXuu63H1KZHwJLILjoIIz7BntCvM0hnlnl7Q8P8wORq0IskuaMq5Nnnw==
-  dependencies:
-    "@types/pouchdb-core" "*"
-
-"@types/pouchdb-find@6.3.6":
-  version "6.3.6"
-  resolved "https://registry.yarnpkg.com/@types/pouchdb-find/-/pouchdb-find-6.3.6.tgz#a0b7bd980e0b2962750e41bd992d013f643c4d75"
-  integrity sha512-qXgkYfmwUIMCtFcX959ywYyFYJp23Er3btfWNwm1wyYpPK9uuJD8Zh7OmcyFLzWKZG7c8eLHVvGGOp4NysHjDg==
-  dependencies:
-    "@types/pouchdb-core" "*"
-
-"@types/pouchdb-replication@6.4.2":
-  version "6.4.2"
-  resolved "https://registry.yarnpkg.com/@types/pouchdb-replication/-/pouchdb-replication-6.4.2.tgz#e523764cdc9872f6493d5e039ce7bf54ee0a2888"
-  integrity sha512-BbuwkCv6nu8RUVjymUvhSw/Oo+VOCWyUpio3ujOoxhVdef/JZ5AUjsotgKWHiG0OtkZ8O5oCbAx5uH1Zf6w9XA==
-  dependencies:
-    "@types/pouchdb-core" "*"
-    "@types/pouchdb-find" "*"
-
 "@types/prettier@^2.1.5":
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.1.tgz#e1303048d5389563e130f5bdd89d37a99acb75eb"
@@ -3009,16 +2861,6 @@
   resolved "https://registry.yarnpkg.com/@types/pubsub-js/-/pubsub-js-1.8.3.tgz#f480a9e4f72f50e1e3cc598ef1b32f3bfbbcd6b6"
   integrity sha512-6BqY04dh2UV1dNV690tyJVJYQ0U6qBH4tU+FCwY1Mhl8jOPOP9qiIvgLnB59cVik/E6/R002oXZpGiDm+2C8eA==
 
-"@types/qs@*":
-  version "6.9.7"
-  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
-  integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==
-
-"@types/range-parser@*":
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
-  integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
-
 "@types/react-dom@^17.0.9":
   version "17.0.9"
   resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.9.tgz#441a981da9d7be117042e1a6fd3dac4b30f55add"
@@ -3062,24 +2904,11 @@
   resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
   integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
 
-"@types/serve-static@*":
-  version "1.13.10"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9"
-  integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==
-  dependencies:
-    "@types/mime" "^1"
-    "@types/node" "*"
-
 "@types/source-list-map@*":
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
   integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
 
-"@types/spark-md5@3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@types/spark-md5/-/spark-md5-3.0.2.tgz#da2e8a778a20335fc4f40b6471c4b0d86b70da55"
-  integrity sha512-82E/lVRaqelV9qmRzzJ1PKTpyrpnT7mwdneKNJB9hUtypZDMggloDfFUCIqRRx3lYRxteCwXSq9c+W71Vf0QnQ==
-
 "@types/stack-utils@^2.0.0":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
@@ -3597,11 +3426,6 @@ acorn-walk@^8.0.0:
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
 
-acorn@^5.2.1:
-  version "5.7.4"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
-  integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
-
 acorn@^6.4.1:
   version "6.4.2"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
@@ -3686,11 +3510,6 @@ ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-amdefine@>=0.0.4:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
-  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
-
 ansi-colors@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
@@ -3867,11 +3686,6 @@ array-includes@^3.1.3:
     get-intrinsic "^1.1.1"
     is-string "^1.0.5"
 
-array-push-at-sort-position@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/array-push-at-sort-position/-/array-push-at-sort-position-1.2.0.tgz#df6c03d4a4c30d5af5537a5a8228ebb9442d89fc"
-  integrity sha512-33YkzjLE7OT+o/idj+n27YFau2NwGxMBN+lLkFpRnQJe4EkJntLY0z4YYfLRBZrqG7lixDk4Rt2iSC10CEmZsQ==
-
 array-union@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
@@ -3972,11 +3786,6 @@ assign-symbols@^1.0.0:
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
   integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
-ast-types@0.9.6:
-  version "0.9.6"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"
-  integrity sha1-ECyenpAF0+fjgpvwxPok7oYu6bk=
-
 async-each@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
@@ -4282,11 +4091,6 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-base62@^1.1.0:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/base62/-/base62-1.2.8.tgz#1264cb0fb848d875792877479dbe8bae6bae3428"
-  integrity sha512-V6YHUbjLxN1ymqNLb1DPHoU1CpfdL7d2YTIp5W3U4hhoG4hhxNmsFDs66M9EXxBiSEke5Bt5dwdfMwwZF70iLA==
-
 base64-js@^1.0.2, base64-js@^1.3.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
@@ -4322,21 +4126,11 @@ before-after-hook@^2.2.0:
   resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.2.tgz#a6e8ca41028d90ee2c24222f201c90956091613e"
   integrity sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ==
 
-big-integer@^1.6.16:
-  version "1.6.49"
-  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.49.tgz#f6817d3ea5d4f3fb19e24df9f4b1b4471a8328ce"
-  integrity sha512-KJ7VhqH+f/BOt9a3yMwJNmcZjG53ijWMTjSAGMveQWyLwqIiwkjNP5PFgDob3Snnx86SjDj6I89fIbv0dkQeNw==
-
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
   integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
 
-binary-decision-diagram@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/binary-decision-diagram/-/binary-decision-diagram-1.3.1.tgz#cf4d93e0a97ee80972f234bacd656450c028f64b"
-  integrity sha512-Sp2bJadovYVc1/GTUtiayR9K3dYVPWHeINNd8S5e4wQ/qAl3NW3QV8USF1dcKd66ofWgml2z3eRhAbDm590P9w==
-
 binary-extensions@^1.0.0:
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
@@ -4438,20 +4232,6 @@ braces@^3.0.1, braces@~3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
-broadcast-channel@3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/broadcast-channel/-/broadcast-channel-3.7.0.tgz#2dfa5c7b4289547ac3f6705f9c00af8723889937"
-  integrity sha512-cIAKJXAxGJceNZGTZSBzMxzyOn72cVgPnKx4dc6LRjQgbaJUQqhy5rzL3zbMxkMWsGKkv2hSFkPRMEXfoMZ2Mg==
-  dependencies:
-    "@babel/runtime" "^7.7.2"
-    detect-node "^2.1.0"
-    js-sha3 "0.8.0"
-    microseconds "0.2.0"
-    nano-time "1.0.0"
-    oblivious-set "1.0.0"
-    rimraf "3.0.2"
-    unload "2.2.0"
-
 brorand@^1.0.1, brorand@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
@@ -4936,11 +4716,6 @@ clone@^1.0.2:
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
   integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
 
-clone@^2.1.1, clone@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
-  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
-
 clsx@^1.0.4, clsx@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188"
@@ -5059,7 +4834,7 @@ command-line-usage@^6.0.0:
     table-layout "^1.0.1"
     typical "^5.2.0"
 
-commander@^2.19.0, commander@^2.20.0, commander@^2.5.0, commander@^2.7.1:
+commander@^2.19.0, commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -5079,31 +4854,11 @@ commander@^7.0.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
   integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
 
-common-tags@1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
-  integrity sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==
-
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
   integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
 
-commoner@^0.10.1:
-  version "0.10.8"
-  resolved "https://registry.yarnpkg.com/commoner/-/commoner-0.10.8.tgz#34fc3672cd24393e8bb47e70caa0293811f4f2c5"
-  integrity sha1-NPw2cs0kOT6LtH5wyqApOBH08sU=
-  dependencies:
-    commander "^2.5.0"
-    detective "^4.3.1"
-    glob "^5.0.15"
-    graceful-fs "^4.1.2"
-    iconv-lite "^0.4.5"
-    mkdirp "^0.5.0"
-    private "^0.1.6"
-    q "^1.1.2"
-    recast "^0.11.17"
-
 compare-func@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-2.0.0.tgz#fb65e75edbddfd2e568554e8b5b05fff7a51fcb3"
@@ -5385,14 +5140,6 @@ core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
-cors@2.8.5:
-  version "2.8.5"
-  resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
-  integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
-  dependencies:
-    object-assign "^4"
-    vary "^1"
-
 cosmiconfig@7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3"
@@ -5510,11 +5257,6 @@ crypto-browserify@^3.11.0, crypto-browserify@^3.12.0:
     randombytes "^2.0.0"
     randomfill "^1.0.3"
 
-crypto-js@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.0.0.tgz#2904ab2677a9d042856a2ea2ef80de92e4a36dcc"
-  integrity sha512-bzHZN8Pn+gS7DQA6n+iUmBfl0hO5DJq++QP3U6uTucDtk/0iGpXd/Gg7CGR0p8tJhofJyaKoWBuJI4eAO00BBg==
-
 css-loader@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.3.0.tgz#334d3500ff0a0c14cfbd4b0670088dbb5b5c1530"
@@ -5612,13 +5354,6 @@ csstype@^3.0.2:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.9.tgz#6410af31b26bd0520933d02cbc64fce9ce3fbf0b"
   integrity sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw==
 
-custom-idle-queue@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/custom-idle-queue/-/custom-idle-queue-3.0.1.tgz#d6f56ac2db8333951712b28aaf4f57b9a58b91e2"
-  integrity sha512-n/c555GViLgmqj1364lrnlxCQtNXGBqZs/W8j/SXnLyZWXHtMq1xjQ2ba8Va8AZu6VZF+1AEnF+gcKfoHVAVNg==
-  dependencies:
-    "@babel/runtime" "7.9.6"
-
 cyclist@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
@@ -5648,11 +5383,6 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-data-uri-to-buffer@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz#594b8973938c5bc2c33046535785341abc4f3636"
-  integrity sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==
-
 data-urls@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
@@ -5742,7 +5472,7 @@ deep-equal@^1.0.1:
     object-keys "^1.1.1"
     regexp.prototype.flags "^1.2.0"
 
-deep-equal@^2.0.1, deep-equal@^2.0.5:
+deep-equal@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.0.5.tgz#55cd2fe326d83f9cbf7261ef0e060b3f724c5cb9"
   integrity sha512-nPiRgmbAtm1a3JsnLCf6/SLfXcjyN5v8L1TXzdCmHrXJ4hx+gW/w1YCcn7z8gJtSiDArZCgYtbao3QqLm/N1Sw==
@@ -5792,11 +5522,6 @@ defaults@^1.0.3:
   dependencies:
     clone "^1.0.2"
 
-defekt@7.2.3:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/defekt/-/defekt-7.2.3.tgz#7a073e482d14fdfe47c07bb8434888aaf737875f"
-  integrity sha512-EG1JyjSSrHl3jpvtGBQHleDFs1Q1eE9R/PJ9SN2502quo3+/41viDM2kqDrfKlQVhR1gnn3EEYyTKueXqFnwNg==
-
 deferred-leveldown@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/deferred-leveldown/-/deferred-leveldown-5.3.0.tgz#27a997ad95408b61161aa69bd489b86c71b78058"
@@ -5839,11 +5564,6 @@ define-property@^2.0.2:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
 
-defined@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
-  integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=
-
 del@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/del/-/del-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952"
@@ -5906,19 +5626,11 @@ detect-newline@^3.0.0:
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
   integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
 
-detect-node@^2.0.4, detect-node@^2.1.0:
+detect-node@^2.0.4:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
   integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
 
-detective@^4.3.1:
-  version "4.7.1"
-  resolved "https://registry.yarnpkg.com/detective/-/detective-4.7.1.tgz#0eca7314338442febb6d65da54c10bb1c82b246e"
-  integrity sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==
-  dependencies:
-    acorn "^5.2.1"
-    defined "^1.0.0"
-
 dezalgo@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
@@ -6190,7 +5902,7 @@ encoding-down@^6.3.0:
     level-codec "^9.0.0"
     level-errors "^2.0.0"
 
-encoding@^0.1.11, encoding@^0.1.12:
+encoding@^0.1.12:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
   integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
@@ -6442,15 +6154,6 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-es3ify@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/es3ify/-/es3ify-0.2.2.tgz#5dae3e650e5be3684b88066513d528d092629862"
-  integrity sha1-Xa4+ZQ5b42hLiAZlE9Uo0JJimGI=
-  dependencies:
-    esprima "^2.7.1"
-    jstransform "~11.0.0"
-    through "~2.3.4"
-
 escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
@@ -6567,26 +6270,11 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-esprima-fb@^15001.1.0-dev-harmony-fb:
-  version "15001.1.0-dev-harmony-fb"
-  resolved "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-15001.1.0-dev-harmony-fb.tgz#30a947303c6b8d5e955bee2b99b1d233206a6901"
-  integrity sha1-MKlHMDxrjV6VW+4rmbHSMyBqaQE=
-
-esprima@^2.7.1:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
-  integrity sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=
-
 esprima@^4.0.0, esprima@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esprima@~3.1.0:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
-  integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
-
 esrecurse@^4.1.0, esrecurse@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
@@ -6619,15 +6307,6 @@ etag@~1.8.1:
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
   integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
 
-event-reduce-js@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/event-reduce-js/-/event-reduce-js-1.4.0.tgz#186efcfca4dfcc66aedc3317cdba05de71129dc9"
-  integrity sha512-44gck8DwQPi1Rqchhtcjn5tq6TRSqbOguLCt8uwLyOt0w+muGHK29pxOk5U7qq4V1vQiwztUHJe0uInMcRy4bA==
-  dependencies:
-    array-push-at-sort-position "1.2.0"
-    binary-decision-diagram "1.3.1"
-    object-path "0.11.5"
-
 event-target-shim@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
@@ -6718,7 +6397,7 @@ expect@^27.2.3:
     jest-message-util "^27.2.3"
     jest-regex-util "^27.0.6"
 
-express@4.17.1, express@^4.17.1:
+express@^4.17.1:
   version "4.17.1"
   resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
   integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
@@ -6869,13 +6548,6 @@ fb-watchman@^2.0.0:
   dependencies:
     bser "2.1.1"
 
-fetch-blob@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/fetch-blob/-/fetch-blob-3.1.2.tgz#6bc438675f3851ecea51758ac91f6a1cd1bacabd"
-  integrity sha512-hunJbvy/6OLjCD0uuhLdp0mMPzP/yd2ssd1t2FCJsaA7wkWhpbp9xfuNVpv7Ll4jFhzp6T4LAupSiV9uOeg0VQ==
-  dependencies:
-    web-streams-polyfill "^3.0.3"
-
 fetch-cookie@0.10.1:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/fetch-cookie/-/fetch-cookie-0.10.1.tgz#5ea88f3d36950543c87997c27ae2aeafb4b5c4d4"
@@ -7193,20 +6865,6 @@ gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
-generate-function@^2.0.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f"
-  integrity sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==
-  dependencies:
-    is-property "^1.0.2"
-
-generate-object-property@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
-  integrity sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=
-  dependencies:
-    is-property "^1.0.0"
-
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
@@ -7217,16 +6875,6 @@ get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-graphql-from-jsonschema@8.0.8:
-  version "8.0.8"
-  resolved "https://registry.yarnpkg.com/get-graphql-from-jsonschema/-/get-graphql-from-jsonschema-8.0.8.tgz#7b21eaa17a8ee1b0554b10b8ae8728d7138dbf9a"
-  integrity sha512-NUEPQedbz4lJs4L/xacW4T2hPJDhelX/fKW85VOrHPzNCbn3TRjeLzoZzehOAEvpLLxj0OxeI2sa4Xvm+AqQPQ==
-  dependencies:
-    "@types/common-tags" "1.8.0"
-    "@types/json-schema" "7.0.7"
-    common-tags "1.8.0"
-    defekt "7.2.3"
-
 get-intrinsic@^1.0.1, get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
@@ -7380,17 +7028,6 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@^5.0.15:
-  version "5.0.15"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
-  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
@@ -7442,13 +7079,6 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
   integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
 
-graphql-client@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/graphql-client/-/graphql-client-2.0.1.tgz#d4a85a9fd2b04a0ef732e242250fac132579a4da"
-  integrity sha512-XXdjUD3mwsBDcUB7g+iXQeRt+3gmIbvA/Yx1nE5aq2RQmaJwiH4hEoYw27AW8cDR90pCrPlHJAb1jJq3zUMbZA==
-  dependencies:
-    isomorphic-fetch "^2.2.1"
-
 gzip-size@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462"
@@ -7826,7 +7456,7 @@ hyphenate-style-name@^1.0.3:
   resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d"
   integrity sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==
 
-iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.5:
+iconv-lite@0.4.24, iconv-lite@^0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -7877,11 +7507,6 @@ immediate@3.3.0, immediate@^3.2.3:
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.3.0.tgz#1aef225517836bcdf7f2a2de2600c79ff0269266"
   integrity sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q==
 
-immediate@~3.0.5:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
-  integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
-
 immer@^9.0.6:
   version "9.0.6"
   resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.6.tgz#7a96bf2674d06c8143e327cbf73539388ddf1a73"
@@ -8179,11 +7804,6 @@ is-docker@^2.0.0, is-docker@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
   integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
 
-is-electron@2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-electron/-/is-electron-2.2.0.tgz#8943084f09e8b731b3a7a0298a7b5d56f6b7eef0"
-  integrity sha512-SpMppC2XR3YdxSzczXReBjqs2zGscWQpBIKqwXYBFic0ERaxNVgwLCHwOLZeESfdJQjX0RDvrJ1lBXX2ij+G1Q==
-
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -8223,13 +7843,6 @@ is-generator-fn@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
   integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
 
-is-generator-function@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72"
-  integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==
-  dependencies:
-    has-tostringtag "^1.0.0"
-
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
@@ -8266,22 +7879,6 @@ is-map@^2.0.1, is-map@^2.0.2:
   resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127"
   integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==
 
-is-my-ip-valid@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824"
-  integrity sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==
-
-is-my-json-valid@*, is-my-json-valid@2.20.5:
-  version "2.20.5"
-  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.20.5.tgz#5eca6a8232a687f68869b7361be1612e7512e5df"
-  integrity sha512-VTPuvvGQtxvCeghwspQu1rBgjYUT6FGxPlvFKbYuFtgc4ADsX3U5ihZOYN0qyU6u+d4X9xXb0IT5O6QpXKt87A==
-  dependencies:
-    generate-function "^2.0.0"
-    generate-object-property "^1.1.0"
-    is-my-ip-valid "^1.0.0"
-    jsonpointer "^4.0.0"
-    xtend "^4.0.0"
-
 is-negative-zero@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
@@ -8353,11 +7950,6 @@ is-potential-custom-element-name@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
   integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
 
-is-property@^1.0.0, is-property@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
-  integrity sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=
-
 is-regex@^1.0.4, is-regex@^1.0.5, is-regex@^1.1.0, is-regex@^1.1.1, is-regex@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
@@ -8383,11 +7975,6 @@ is-ssh@^1.3.0:
   dependencies:
     protocols "^1.1.0"
 
-is-stream@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
-
 is-stream@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
@@ -8419,7 +8006,7 @@ is-text-path@^1.0.1:
   dependencies:
     text-extensions "^1.0.0"
 
-is-typed-array@^1.1.3, is-typed-array@^1.1.7:
+is-typed-array@^1.1.7:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.8.tgz#cbaa6585dc7db43318bc5b89523ea384a6f65e79"
   integrity sha512-HqH41TNZq2fgtGT8WHVFVJhBVGuY3AnP3Q36K8JKXUxSxRgk/d+7NjmwG2vo2mYmXK8UYZKu0qH8bVP5gEisjA==
@@ -8506,14 +8093,6 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
-isomorphic-fetch@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
-  integrity sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=
-  dependencies:
-    node-fetch "^1.0.1"
-    whatwg-fetch ">=0.10.0"
-
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
@@ -9010,11 +8589,6 @@ jest@^27.2.3:
     import-local "^3.0.2"
     jest-cli "^27.2.3"
 
-js-sha3@0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.8.0.tgz#b9b7a5da73afad7dedd0f8c463954cbde6818840"
-  integrity sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==
-
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -9172,16 +8746,6 @@ jsonparse@^1.2.0, jsonparse@^1.3.1:
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
   integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
 
-jsonpointer@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.1.0.tgz#501fb89986a2389765ba09e6053299ceb4f2c2cc"
-  integrity sha512-CXcRvMyTlnR53xMcKnuMzfCA5i/nfblTnnr74CZb6C4vG39eu6w51t7nKmU5MfLfbTgGItliNyjO/ciNPDqClg==
-
-jsonschema-key-compression@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/jsonschema-key-compression/-/jsonschema-key-compression-1.4.0.tgz#49346627f64e132ab3585fd5abd4923d4aedc544"
-  integrity sha512-ADDtLCnu5bUa4b9dDshc2u4Z1XXReX3kGhZLJ9OqZD6f7g+Gm/Dyn9ex4tgOag5tfFLfNK9N7p2I5LkVR/Eyiw==
-
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -9262,17 +8826,6 @@ jss@10.8.0, jss@^10.5.1:
     is-in-browser "^1.1.3"
     tiny-warning "^1.0.2"
 
-jstransform@~11.0.0:
-  version "11.0.3"
-  resolved "https://registry.yarnpkg.com/jstransform/-/jstransform-11.0.3.tgz#09a78993e0ae4d4ef4487f6155a91f6190cb4223"
-  integrity sha1-CaeJk+CuTU70SH9hVakfYZDLQiM=
-  dependencies:
-    base62 "^1.1.0"
-    commoner "^0.10.1"
-    esprima-fb "^15001.1.0-dev-harmony-fb"
-    object-assign "^2.0.0"
-    source-map "^0.4.2"
-
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -9461,13 +9014,6 @@ license-webpack-plugin@^4.0.2:
   dependencies:
     webpack-sources "^3.0.0"
 
-lie@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
-  integrity sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=
-  dependencies:
-    immediate "~3.0.5"
-
 line-diff@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/line-diff/-/line-diff-2.1.1.tgz#a389799b931375a3b1e764964ad0b0b3ce60d6f6"
@@ -9586,7 +9132,7 @@ lodash.flattendeep@^4.4.0:
   resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
   integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=
 
-lodash.get@^4, lodash.get@^4.4.2:
+lodash.get@^4:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
   integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
@@ -9885,11 +9431,6 @@ micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4:
     braces "^3.0.1"
     picomatch "^2.2.3"
 
-microseconds@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/microseconds/-/microseconds-0.2.0.tgz#233b25f50c62a65d861f978a4a4f8ec18797dc39"
-  integrity sha512-n7DHHMjR1avBbSpsTBj6fmMGh2AGrifVV4e+WYc3Q9lO+xnSZ3NyhcBND3vzzatt05LFhoKFRxrIyklmLlUtyA==
-
 miller-rabin@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
@@ -9945,7 +9486,7 @@ minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-"minimatch@2 || 3", minimatch@^3.0.3, minimatch@^3.0.4:
+minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@@ -10076,7 +9617,7 @@ mkdirp-infer-owner@^2.0.0:
     infer-owner "^1.0.4"
     mkdirp "^1.0.3"
 
-mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5:
+mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -10093,14 +9634,6 @@ modify-values@^1.0.0:
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
   integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
 
-modifyjs@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/modifyjs/-/modifyjs-0.3.1.tgz#72469477fb4c470971d617a63ba1bbde9aaac7cf"
-  integrity sha1-ckaUd/tMRwlx1hemO6G73pqqx88=
-  dependencies:
-    clone "^2.1.1"
-    deep-equal "^1.0.1"
-
 module-alias@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/module-alias/-/module-alias-2.2.2.tgz#151cdcecc24e25739ff0aa6e51e1c5716974c0e0"
@@ -10177,13 +9710,6 @@ nan@^2.12.1:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee"
   integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
 
-nano-time@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/nano-time/-/nano-time-1.0.0.tgz#b0554f69ad89e22d0907f7a12b0993a5d96137ef"
-  integrity sha1-sFVPaa2J4i0JB/ehKwmTpdlhN+8=
-  dependencies:
-    big-integer "^1.6.16"
-
 nanocolors@^0.1.0, nanocolors@^0.1.5:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/nanocolors/-/nanocolors-0.1.12.tgz#8577482c58cbd7b5bb1681db4cf48f11a87fd5f6"
@@ -10264,14 +9790,6 @@ no-case@^3.0.4:
     lower-case "^2.0.2"
     tslib "^2.0.3"
 
-node-fetch@*:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.0.0.tgz#79da7146a520036f2c5f644e4a26095f17e411ea"
-  integrity sha512-bKMI+C7/T/SPU1lKnbQbwxptpCrG9ashG+VkytmXCPZyuM9jB6VU+hY0oi4lC8LxTtAeWdckNCTa3nrGsAdA3Q==
-  dependencies:
-    data-uri-to-buffer "^3.0.1"
-    fetch-blob "^3.1.2"
-
 node-fetch@2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
@@ -10282,14 +9800,6 @@ node-fetch@2.6.1:
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
   integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
 
-node-fetch@^1.0.1:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
-  integrity sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==
-  dependencies:
-    encoding "^0.1.11"
-    is-stream "^1.0.1"
-
 node-fetch@^2.6.1:
   version "2.6.5"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz#42735537d7f080a7e5f78b6c549b7146be1742fd"
@@ -10594,12 +10104,7 @@ oauth-sign@~0.9.0:
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
   integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
-object-assign@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-2.1.1.tgz#43c36e5d569ff8e4816c4efa8be02d26967c18aa"
-  integrity sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=
-
-object-assign@^4, object-assign@^4.1.0, object-assign@^4.1.1:
+object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -10631,11 +10136,6 @@ object-keys@^1.0.12, object-keys@^1.1.1:
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object-path@0.11.5:
-  version "0.11.5"
-  resolved "https://registry.yarnpkg.com/object-path/-/object-path-0.11.5.tgz#d4e3cf19601a5140a55a16ad712019a9c50b577a"
-  integrity sha512-jgSbThcoR/s+XumvGMTMf81QVBmah+/Q7K7YduKeKVWL7N111unR2d6pZZarSk6kY/caeNxUDyxOvMWyzoU2eg==
-
 object-visit@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
@@ -10702,11 +10202,6 @@ objectorarray@^1.0.5:
   resolved "https://registry.yarnpkg.com/objectorarray/-/objectorarray-1.0.5.tgz#2c05248bbefabd8f43ad13b41085951aac5e68a5"
   integrity sha512-eJJDYkhJFFbBBAxeh8xW+weHlkI28n2ZdQV/J/DNfWfSKlGEf2xcfAbZTv3riEXHAhL9SVOTs2pRmXiSTf78xg==
 
-oblivious-set@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/oblivious-set/-/oblivious-set-1.0.0.tgz#c8316f2c2fb6ff7b11b6158db3234c49f733c566"
-  integrity sha512-z+pI07qxo4c2CulUHCDf9lcqDlMSo72N/4rLUpRXf6fu+q8vjt8y0xS+Tlf8NTJDdTXHbdeO1n3MlbctwEoXZw==
-
 obuf@^1.0.0, obuf@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
@@ -11295,17 +10790,6 @@ pouchdb-abstract-mapreduce@7.2.2:
     pouchdb-md5 "7.2.2"
     pouchdb-utils "7.2.2"
 
-pouchdb-adapter-http@7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-adapter-http/-/pouchdb-adapter-http-7.2.2.tgz#7b04a247aae5db67af6ea8567cc93b2aca8e282f"
-  integrity sha512-6Z6umJq7b5sRXwDM3CLfHrGhJPMR02M5osUxkwH1PpqcTF0EXPJvX+PtzTjSPcXWfaK6kgH3zNrRKQDdpzjI9A==
-  dependencies:
-    argsarray "0.0.1"
-    pouchdb-binary-utils "7.2.2"
-    pouchdb-errors "7.2.2"
-    pouchdb-fetch "7.2.2"
-    pouchdb-utils "7.2.2"
-
 pouchdb-adapter-idb@^7.2.2:
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/pouchdb-adapter-idb/-/pouchdb-adapter-idb-7.2.2.tgz#0a4b6c6f6639f93e2e50cb20d50b5fb6eaf1e80e"
@@ -11331,17 +10815,6 @@ pouchdb-adapter-utils@7.2.2:
     pouchdb-merge "7.2.2"
     pouchdb-utils "7.2.2"
 
-pouchdb-all-dbs@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/pouchdb-all-dbs/-/pouchdb-all-dbs-1.1.1.tgz#85f04a39cafda52497ec49abf1c93bb5e72813f6"
-  integrity sha512-UUnsdmcnRSQ8MAOYSJjfTwKkQNb/6fvOfd/f7dNNivWZ2YDYVuMfgw1WQdL634yEtcXTxAENZ/EyLRdzPCB41A==
-  dependencies:
-    argsarray "0.0.1"
-    es3ify "^0.2.2"
-    inherits "~2.0.1"
-    pouchdb-promise "6.4.3"
-    tiny-queue "^0.2.0"
-
 pouchdb-binary-utils@7.2.2:
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/pouchdb-binary-utils/-/pouchdb-binary-utils-7.2.2.tgz#0690b348052c543b1e67f032f47092ca82bcb10e"
@@ -11349,23 +10822,6 @@ pouchdb-binary-utils@7.2.2:
   dependencies:
     buffer-from "1.1.1"
 
-pouchdb-changes-filter@7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-changes-filter/-/pouchdb-changes-filter-7.2.2.tgz#e4d1ad5a9b57bd2d756e1ee2814463c4a91822b6"
-  integrity sha512-1txJnTtL/C7zrq+spLt3pH9EDHTWmLLwp2zx8zUQrkt6eQtuLuXUI7G84xe+hfpU0rQvUzp/APYMnko0/6Rw0A==
-  dependencies:
-    pouchdb-errors "7.2.2"
-    pouchdb-selector-core "7.2.2"
-    pouchdb-utils "7.2.2"
-
-pouchdb-checkpointer@7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-checkpointer/-/pouchdb-checkpointer-7.2.2.tgz#8ecc8edf94dbb866a4c79f5e787a018cdeb9f475"
-  integrity sha512-O2i0vjLnZwcuSI41omrdaiyPWofCRLPBs+Sw5ad/GtYQbvxRt0CJEqYCrOaDnAsgIVoRG5PK/9gDzszv2CQsvg==
-  dependencies:
-    pouchdb-collate "7.2.2"
-    pouchdb-utils "7.2.2"
-
 pouchdb-collate@7.2.2, pouchdb-collate@^7.1.1:
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/pouchdb-collate/-/pouchdb-collate-7.2.2.tgz#fc261f5ef837c437e3445fb0abc3f125d982c37c"
@@ -11376,20 +10832,6 @@ pouchdb-collections@7.2.2:
   resolved "https://registry.yarnpkg.com/pouchdb-collections/-/pouchdb-collections-7.2.2.tgz#aeed77f33322429e3f59d59ea233b48ff0e68572"
   integrity sha512-6O9zyAYlp3UdtfneiMYuOCWdUCQNo2bgdjvNsMSacQX+3g8WvIoFQCYJjZZCpTttQGb+MHeRMr8m2U95lhJTew==
 
-pouchdb-core@7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-core/-/pouchdb-core-7.2.2.tgz#519402cf0fcaffcc903db9d484d901fc9dde33d5"
-  integrity sha512-AnMmSH+xx12Vk6oASDRQoElXfV9fSn8MIwfus0oa2lqkxowx4bvidofZbhZfKEiE6QgKwFEOBzs56MS3znI8TQ==
-  dependencies:
-    argsarray "0.0.1"
-    inherits "2.0.4"
-    pouchdb-changes-filter "7.2.2"
-    pouchdb-collections "7.2.2"
-    pouchdb-errors "7.2.2"
-    pouchdb-fetch "7.2.2"
-    pouchdb-merge "7.2.2"
-    pouchdb-utils "7.2.2"
-
 pouchdb-errors@7.2.2:
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/pouchdb-errors/-/pouchdb-errors-7.2.2.tgz#80d811d65c766c9d20b755c6e6cc123f8c3c4792"
@@ -11406,7 +10848,7 @@ pouchdb-fetch@7.2.2:
     fetch-cookie "0.10.1"
     node-fetch "2.6.0"
 
-pouchdb-find@7.2.2, pouchdb-find@^7.1.1, pouchdb-find@^7.2.2:
+pouchdb-find@^7.1.1, pouchdb-find@^7.2.2:
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/pouchdb-find/-/pouchdb-find-7.2.2.tgz#1227afdd761812d508fe0794b3e904518a721089"
   integrity sha512-BmFeFVQ0kHmDehvJxNZl9OmIztCjPlZlVSdpijuFbk/Fi1EFPU1BAv3kLC+6DhZuOqU/BCoaUBY9sn66pPY2ag==
@@ -11419,14 +10861,6 @@ pouchdb-find@7.2.2, pouchdb-find@^7.1.1, pouchdb-find@^7.2.2:
     pouchdb-selector-core "7.2.2"
     pouchdb-utils "7.2.2"
 
-pouchdb-generate-replication-id@7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-generate-replication-id/-/pouchdb-generate-replication-id-7.2.2.tgz#1b38d45836e206e5dd9ea2b5a0cb0a26f1b1d94c"
-  integrity sha512-kBr9jTM3/qEQQDhraXdIhhy+OSi18X6pMJnWCSaT43194XuWZltnjH1Hty0aJ0U9s1UanyxqZwrb7wJT6QUpzg==
-  dependencies:
-    pouchdb-collate "7.2.2"
-    pouchdb-md5 "7.2.2"
-
 pouchdb-json@7.2.2:
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/pouchdb-json/-/pouchdb-json-7.2.2.tgz#b939be24b91a7322e9a24b8880a6e21514ec5e1f"
@@ -11457,24 +10891,6 @@ pouchdb-merge@7.2.2:
   resolved "https://registry.yarnpkg.com/pouchdb-merge/-/pouchdb-merge-7.2.2.tgz#940d85a2b532d6a93a6cab4b250f5648511bcc16"
   integrity sha512-6yzKJfjIchBaS7Tusuk8280WJdESzFfQ0sb4jeMUNnrqs4Cx3b0DIEOYTRRD9EJDM+je7D3AZZ4AT0tFw8gb4A==
 
-pouchdb-promise@6.4.3:
-  version "6.4.3"
-  resolved "https://registry.yarnpkg.com/pouchdb-promise/-/pouchdb-promise-6.4.3.tgz#74516f4acf74957b54debd0fb2c0e5b5a68ca7b3"
-  integrity sha512-ruJaSFXwzsxRHQfwNHjQfsj58LBOY1RzGzde4PM5CWINZwFjCQAhZwfMrch2o/0oZT6d+Xtt0HTWhq35p3b0qw==
-  dependencies:
-    lie "3.1.1"
-
-pouchdb-replication@7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-replication/-/pouchdb-replication-7.2.2.tgz#927abe24f9e69b68951c7b130e4926f14b984b1c"
-  integrity sha512-+Q2zqXWaHPOut0jGMABplmlML+8jUzkefyxZXgU6bXSbC9kEJCBAkjaFeZsF10HpsQZ9tHZ577g5EOqj7V1lTQ==
-  dependencies:
-    inherits "2.0.4"
-    pouchdb-checkpointer "7.2.2"
-    pouchdb-errors "7.2.2"
-    pouchdb-generate-replication-id "7.2.2"
-    pouchdb-utils "7.2.2"
-
 pouchdb-selector-core@7.2.2, pouchdb-selector-core@^7.1.1:
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/pouchdb-selector-core/-/pouchdb-selector-core-7.2.2.tgz#264d7436a8c8ac3801f39960e79875ef7f3879a0"
@@ -11600,11 +11016,6 @@ prismjs@^1.24.0:
   resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.25.0.tgz#6f822df1bdad965734b310b315a23315cf999756"
   integrity sha512-WCjJHl1KEWbnkQom1+SzftbtXMKQoezOCYs5rECqMN+jP+apI7ftoflyqigqzopSO3hMhTEb0mFClA8lkolgEg==
 
-private@^0.1.6, private@~0.1.5:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
-  integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
-
 process-nextick-args@~2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
@@ -11746,7 +11157,7 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-q@^1.1.2, q@^1.5.1:
+q@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
@@ -11818,11 +11229,6 @@ randexp@0.4.6:
     discontinuous-range "1.0.0"
     ret "~0.1.10"
 
-random-token@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/random-token/-/random-token-0.0.8.tgz#1cf845af3fb31e57f7caa4b9a173478c46483b61"
-  integrity sha1-HPhFrz+zHlf3yqS5oXNHjEZIO2E=
-
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
@@ -12208,16 +11614,6 @@ rebass@^4.0.7:
   dependencies:
     reflexbox "^4.0.6"
 
-recast@^0.11.17:
-  version "0.11.23"
-  resolved "https://registry.yarnpkg.com/recast/-/recast-0.11.23.tgz#451fd3004ab1e4df9b4e4b66376b2a21912462d3"
-  integrity sha1-RR/TAEqx5N+bTktmN2sqIZEkYtM=
-  dependencies:
-    ast-types "0.9.6"
-    esprima "~3.1.0"
-    private "~0.1.5"
-    source-map "~0.5.0"
-
 rechoir@^0.7.0:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686"
@@ -12546,13 +11942,6 @@ reusify@^1.0.4:
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
 rimraf@^2.5.4, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
@@ -12560,6 +11949,13 @@ rimraf@^2.5.4, rimraf@^2.6.3:
   dependencies:
     glob "^7.1.3"
 
+rimraf@^3.0.0, rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
@@ -12595,51 +11991,6 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rxdb@^9.21.0:
-  version "9.21.0"
-  resolved "https://registry.yarnpkg.com/rxdb/-/rxdb-9.21.0.tgz#a53e12f711dd4035e387ff70c0edc383e3f8a252"
-  integrity sha512-y7IVPUlSJbIxV726WyfCxtSaPvlU3ZspqafbDXbZa7STwlo55LO4G93QnwqqQp8DDyB0wG6fjMQBaZG/RDgRkw==
-  dependencies:
-    "@babel/runtime" "7.14.6"
-    "@types/clone" "2.1.0"
-    "@types/cors" "2.8.10"
-    "@types/deep-equal" "1.0.1"
-    "@types/express" "4.17.12"
-    "@types/is-my-json-valid" "2.18.0"
-    "@types/object-path" "0.11.0"
-    "@types/pouchdb-core" "7.0.6"
-    "@types/pouchdb-find" "6.3.6"
-    "@types/pouchdb-replication" "6.4.2"
-    "@types/spark-md5" "3.0.2"
-    broadcast-channel "3.7.0"
-    clone "^2.1.2"
-    cors "2.8.5"
-    crypto-js "4.0.0"
-    custom-idle-queue "3.0.1"
-    deep-equal "^2.0.1"
-    event-reduce-js "1.4.0"
-    express "4.17.1"
-    get-graphql-from-jsonschema "8.0.8"
-    graphql-client "2.0.1"
-    is-electron "2.2.0"
-    is-my-json-valid "2.20.5"
-    jsonschema-key-compression "1.4.0"
-    modifyjs "0.3.1"
-    object-path "0.11.5"
-    pouchdb-adapter-http "7.2.2"
-    pouchdb-all-dbs "1.1.1"
-    pouchdb-core "7.2.2"
-    pouchdb-find "7.2.2"
-    pouchdb-md5 "7.2.2"
-    pouchdb-replication "7.2.2"
-    pouchdb-selector-core "7.2.2"
-    pouchdb-utils "7.2.2"
-    random-token "0.0.8"
-    spark-md5 "^3.0.1"
-    url "^0.11.0"
-    util "0.12.4"
-    z-schema "5.0.1"
-
 rxjs@^6.6.0:
   version "6.6.7"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
@@ -12647,13 +11998,6 @@ rxjs@^6.6.0:
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^7.2.0:
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.3.0.tgz#39fe4f3461dc1e50be1475b2b85a0a88c1e938c6"
-  integrity sha512-p2yuGIg9S1epc3vrjKf6iVb3RCaAYjYskkO+jHIaV0IjOPlJop4UnodOoFb2xeNwlguqLYvGw1b1McillYb5Gw==
-  dependencies:
-    tslib "~2.1.0"
-
 safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -13077,14 +12421,7 @@ source-map-url@^0.4.0:
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
   integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
 
-source-map@^0.4.2:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
-  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
-  dependencies:
-    amdefine ">=0.0.4"
-
-source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0:
+source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
@@ -13104,11 +12441,6 @@ spark-md5@3.0.1:
   resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.1.tgz#83a0e255734f2ab4e5c466e5a2cfc9ba2aa2124d"
   integrity sha512-0tF3AGSD1ppQeuffsLDIOWlKUd3lS92tFxcsrh5Pe3ZphhnoK+oXIBTzOAThZCiuINZLvpiLH/1VS1/ANEJVig==
 
-spark-md5@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.2.tgz#7952c4a30784347abcee73268e473b9c0167e3fc"
-  integrity sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw==
-
 spdx-correct@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
@@ -13663,7 +12995,7 @@ through2@^4.0.0:
   dependencies:
     readable-stream "3"
 
-through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6, through@~2.3.4:
+through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
@@ -13680,11 +13012,6 @@ timers-browserify@^2.0.4:
   dependencies:
     setimmediate "^1.0.4"
 
-tiny-queue@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/tiny-queue/-/tiny-queue-0.2.1.tgz#25a67f2c6e253b2ca941977b5ef7442ef97a6046"
-  integrity sha1-JaZ/LG4lOyypQZd7XvdELvl6YEY=
-
 tiny-warning@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
@@ -13886,7 +13213,7 @@ tslib@1.10.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
   integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
 
-tslib@2.1.0, tslib@~2.1.0:
+tslib@2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"
   integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==
@@ -14094,14 +13421,6 @@ universalify@^2.0.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
   integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
 
-unload@2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/unload/-/unload-2.2.0.tgz#ccc88fdcad345faa06a92039ec0f80b488880ef7"
-  integrity sha512-B60uB5TNBLtN6/LsgAf3udH9saB5p7gqJwcFfbOEZ8BcBHnGwCf6G/TGiEqkRAxX7zAFIUtzdrXQSdL3Q/wqNA==
-  dependencies:
-    "@babel/runtime" "^7.6.2"
-    detect-node "^2.0.4"
-
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
@@ -14193,18 +13512,6 @@ util@0.10.3:
   dependencies:
     inherits "2.0.1"
 
-util@0.12.4:
-  version "0.12.4"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.12.4.tgz#66121a31420df8f01ca0c464be15dfa1d1850253"
-  integrity sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==
-  dependencies:
-    inherits "^2.0.3"
-    is-arguments "^1.0.4"
-    is-generator-function "^1.0.7"
-    is-typed-array "^1.1.3"
-    safe-buffer "^5.1.2"
-    which-typed-array "^1.1.2"
-
 util@^0.10.3:
   version "0.10.4"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
@@ -14273,12 +13580,7 @@ validate-npm-package-name@^3.0.0:
   dependencies:
     builtins "^1.0.3"
 
-validator@^13.6.0:
-  version "13.6.0"
-  resolved "https://registry.yarnpkg.com/validator/-/validator-13.6.0.tgz#1e71899c14cdc7b2068463cb24c1cc16f6ec7059"
-  integrity sha512-gVgKbdbHgtxpRyR8K0O6oFZPhhB5tT1jeEHZR0Znr9Svg03U0+r9DXWMrnRAB+HtCStDQKlaIZm42tVsVjqtjg==
-
-vary@^1, vary@~1.1.2:
+vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
@@ -14381,11 +13683,6 @@ wcwidth@^1.0.0:
   dependencies:
     defaults "^1.0.3"
 
-web-streams-polyfill@^3.0.3:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.1.1.tgz#1516f2d4ea8f1bdbfed15eb65cb2df87098c8364"
-  integrity sha512-Czi3fG883e96T4DLEPRvufrF2ydhOOW1+1a6c3gNjH2aIh50DNFBdfwh2AKoOf1rXvpvavAoA11Qdq9+BKjE0Q==
-
 web-vitals@^1.0.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/web-vitals/-/web-vitals-1.1.2.tgz#06535308168986096239aa84716e68b4c6ae6d1c"
@@ -14630,11 +13927,6 @@ whatwg-encoding@^1.0.5:
   dependencies:
     iconv-lite "0.4.24"
 
-whatwg-fetch@>=0.10.0:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c"
-  integrity sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==
-
 whatwg-mimetype@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
@@ -14927,14 +14219,3 @@ yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
-
-z-schema@5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/z-schema/-/z-schema-5.0.1.tgz#f4d4efb1e8763c968b5539e42d11b6a47e91da62"
-  integrity sha512-Gp8xU2lULhREqTWj9t4BEAeA7M835n4fWJ9KjGWksV3wmLUdOJo2hAr+QYvkVZIGOOTyeN274g1f95dKRsgYgQ==
-  dependencies:
-    lodash.get "^4.4.2"
-    lodash.isequal "^4.5.0"
-    validator "^13.6.0"
-  optionalDependencies:
-    commander "^2.7.1"

From 203d992fb06dd13949513290629c1d1ce24b008d Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 17:18:38 -0700
Subject: [PATCH 079/531] Remove pouch db dependencies

---
 client/package.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/client/package.json b/client/package.json
index 2de0d0993..5b2887767 100644
--- a/client/package.json
+++ b/client/package.json
@@ -40,9 +40,6 @@
     "history": "^5.0.1",
     "json-format": "^1.0.1",
     "notistack": "^1.0.9",
-    "pouchdb": "^7.2.2",
-    "pouchdb-adapter-idb": "^7.2.2",
-    "pouchdb-find": "^7.2.2",
     "prism-themes": "^1.7.0",
     "prismjs": "^1.24.0",
     "pubsub-js": "^1.9.3",
@@ -53,7 +50,6 @@
     "react-hook-form": "^7.15.4",
     "react-hotkeys-hook": "^3.3.2",
     "react-icons": "^4.2.0",
-    "react-pouchdb": "^2.1.0",
     "react-redux": "^7.2.5",
     "react-router": "^6.0.0-beta.8",
     "react-router-dom": "6",

From c76d4cf6c6432bb8a2172fc2e2b552eba3b467b9 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 17:18:49 -0700
Subject: [PATCH 080/531] Update yarn lock

---
 yarn.lock | 451 +-----------------------------------------------------
 1 file changed, 7 insertions(+), 444 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e30ae0040..4ea0845a9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1025,7 +1025,7 @@
     core-js-pure "^3.16.0"
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.10.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.10.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.4.tgz#fd17d16bfdf878e6dd02d19753a39fa8a8d9c84a"
   integrity sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==
@@ -3366,35 +3366,6 @@ abbrev@1:
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
-abort-controller@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
-  integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==
-  dependencies:
-    event-target-shim "^5.0.0"
-
-abstract-leveldown@^6.2.1:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-6.3.0.tgz#d25221d1e6612f820c35963ba4bd739928f6026a"
-  integrity sha512-TU5nlYgta8YrBMNpc9FwQzRbiXsj49gsALsXadbGHt9CROPzX5fB0rWDR5mtdpOOKa5XqRFpbj1QroPAoPzVjQ==
-  dependencies:
-    buffer "^5.5.0"
-    immediate "^3.2.3"
-    level-concat-iterator "~2.0.0"
-    level-supports "~1.0.0"
-    xtend "~4.0.0"
-
-abstract-leveldown@~6.2.1, abstract-leveldown@~6.2.3:
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-6.2.3.tgz#036543d87e3710f2528e47040bc3261b77a9a8eb"
-  integrity sha512-BsLm5vFMRUrrLeCcRc+G0t2qOaTzpoJQLOubq2XM72eNpjF5UdU5o/5NvlNhx95XHcAvcl8OMXr4mlg/fRgUXQ==
-  dependencies:
-    buffer "^5.5.0"
-    immediate "^3.2.3"
-    level-concat-iterator "~2.0.0"
-    level-supports "~1.0.0"
-    xtend "~4.0.0"
-
 accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
   version "1.3.7"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
@@ -3617,11 +3588,6 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
-argsarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/argsarray/-/argsarray-0.0.1.tgz#6e7207b4ecdb39b0af88303fa5ae22bda8df61cb"
-  integrity sha1-bnIHtOzbObCviDA/pa4ivajfYcs=
-
 aria-query@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz#0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b"
@@ -4091,7 +4057,7 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-base64-js@^1.0.2, base64-js@^1.3.1:
+base64-js@^1.0.2:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
@@ -4328,11 +4294,6 @@ bser@2.1.1:
   dependencies:
     node-int64 "^0.4.0"
 
-buffer-from@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
-  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
-
 buffer-from@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
@@ -4357,14 +4318,6 @@ buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
-buffer@^5.5.0, buffer@^5.6.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
-  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
-  dependencies:
-    base64-js "^1.3.1"
-    ieee754 "^1.1.13"
-
 builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
@@ -4697,11 +4650,6 @@ cliui@^7.0.2:
     strip-ansi "^6.0.0"
     wrap-ansi "^7.0.0"
 
-clone-buffer@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
-  integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg=
-
 clone-deep@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
@@ -5522,14 +5470,6 @@ defaults@^1.0.3:
   dependencies:
     clone "^1.0.2"
 
-deferred-leveldown@~5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/deferred-leveldown/-/deferred-leveldown-5.3.0.tgz#27a997ad95408b61161aa69bd489b86c71b78058"
-  integrity sha512-a59VOT+oDy7vtAbLRCZwWgxu2BaCfd5Hk7wxJd48ei7I+nsg8Orlb9CLG0PMZienk9BSUKgeAqkO2+Lw+1+Ukw==
-  dependencies:
-    abstract-leveldown "~6.2.1"
-    inherits "^2.0.3"
-
 define-lazy-prop@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
@@ -5821,11 +5761,6 @@ dotenv@^8.0.0, dotenv@^8.2.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"
   integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==
 
-double-ended-queue@2.1.0-0:
-  version "2.1.0-0"
-  resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c"
-  integrity sha1-ED01J/0xUo9AGIEwyEHv3XgmTlw=
-
 duplexer@^0.1.1, duplexer@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
@@ -5892,16 +5827,6 @@ encodeurl@~1.0.2:
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
-encoding-down@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/encoding-down/-/encoding-down-6.3.0.tgz#b1c4eb0e1728c146ecaef8e32963c549e76d082b"
-  integrity sha512-QKrV0iKR6MZVJV08QY0wp1e7vF6QbhnbQhb07bwpEyuz4uZiZgPlEGdkCROuFkUwdxlFaiPIhjyarH1ee/3vhw==
-  dependencies:
-    abstract-leveldown "^6.2.1"
-    inherits "^2.0.3"
-    level-codec "^9.0.0"
-    level-errors "^2.0.0"
-
 encoding@^0.1.12:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
@@ -5916,13 +5841,6 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-end-stream@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/end-stream/-/end-stream-0.1.0.tgz#32003f3f438a2b0143168137f8fa6e9866c81ed5"
-  integrity sha1-MgA/P0OKKwFDFoE3+PpumGbIHtU=
-  dependencies:
-    write-stream "~0.4.3"
-
 endent@^2.0.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/endent/-/endent-2.1.0.tgz#5aaba698fb569e5e18e69e1ff7a28ff35373cd88"
@@ -6057,7 +5975,7 @@ err-code@^2.0.2:
   resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
   integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
 
-errno@^0.1.3, errno@~0.1.1, errno@~0.1.7:
+errno@^0.1.3, errno@~0.1.7:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
   integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==
@@ -6307,11 +6225,6 @@ etag@~1.8.1:
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
   integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
 
-event-target-shim@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
-  integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
-
 eventemitter3@^4.0.0, eventemitter3@^4.0.4:
   version "4.0.7"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
@@ -6548,13 +6461,6 @@ fb-watchman@^2.0.0:
   dependencies:
     bser "2.1.1"
 
-fetch-cookie@0.10.1:
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/fetch-cookie/-/fetch-cookie-0.10.1.tgz#5ea88f3d36950543c87997c27ae2aeafb4b5c4d4"
-  integrity sha512-beB+VEd4cNeVG1PY+ee74+PkuCQnik78pgLi5Ah/7qdUfov8IctU0vLUbBT8/10Ma5GMBeI4wtxhGrEfKNYs2g==
-  dependencies:
-    tough-cookie "^2.3.3 || ^3.0.1 || ^4.0.0"
-
 figgy-pudding@^3.5.1:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
@@ -7475,7 +7381,7 @@ icss-utils@^5.0.0, icss-utils@^5.1.0:
   resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
   integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
 
-ieee754@^1.1.13, ieee754@^1.1.4:
+ieee754@^1.1.4:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
@@ -7502,11 +7408,6 @@ ignore@^5.1.4, ignore@^5.1.8:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
   integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
 
-immediate@3.3.0, immediate@^3.2.3:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.3.0.tgz#1aef225517836bcdf7f2a2de2600c79ff0269266"
-  integrity sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q==
-
 immer@^9.0.6:
   version "9.0.6"
   resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.6.tgz#7a96bf2674d06c8143e327cbf73539388ddf1a73"
@@ -8884,95 +8785,6 @@ levdist@^1.0.0:
   resolved "https://registry.yarnpkg.com/levdist/-/levdist-1.0.0.tgz#91d7a3044964f2ccc421a0477cac827fe75c5718"
   integrity sha1-kdejBElk8szEIaBHfKyCf+dcVxg=
 
-level-codec@9.0.2, level-codec@^9.0.0:
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/level-codec/-/level-codec-9.0.2.tgz#fd60df8c64786a80d44e63423096ffead63d8cbc"
-  integrity sha512-UyIwNb1lJBChJnGfjmO0OR+ezh2iVu1Kas3nvBS/BzGnx79dv6g7unpKIDNPMhfdTEGoc7mC8uAu51XEtX+FHQ==
-  dependencies:
-    buffer "^5.6.0"
-
-level-concat-iterator@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/level-concat-iterator/-/level-concat-iterator-2.0.1.tgz#1d1009cf108340252cb38c51f9727311193e6263"
-  integrity sha512-OTKKOqeav2QWcERMJR7IS9CUo1sHnke2C0gkSmcR7QuEtFNLLzHQAvnMw8ykvEcv0Qtkg0p7FOwP1v9e5Smdcw==
-
-level-errors@^2.0.0, level-errors@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/level-errors/-/level-errors-2.0.1.tgz#2132a677bf4e679ce029f517c2f17432800c05c8"
-  integrity sha512-UVprBJXite4gPS+3VznfgDSU8PTRuVX0NXwoWW50KLxd2yw4Y1t2JUR5In1itQnudZqRMT9DlAM3Q//9NCjCFw==
-  dependencies:
-    errno "~0.1.1"
-
-level-iterator-stream@~4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/level-iterator-stream/-/level-iterator-stream-4.0.2.tgz#7ceba69b713b0d7e22fcc0d1f128ccdc8a24f79c"
-  integrity sha512-ZSthfEqzGSOMWoUGhTXdX9jv26d32XJuHz/5YnuHZzH6wldfWMOVwI9TBtKcya4BKTyTt3XVA0A3cF3q5CY30Q==
-  dependencies:
-    inherits "^2.0.4"
-    readable-stream "^3.4.0"
-    xtend "^4.0.2"
-
-level-js@^5.0.0:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/level-js/-/level-js-5.0.2.tgz#5e280b8f93abd9ef3a305b13faf0b5397c969b55"
-  integrity sha512-SnBIDo2pdO5VXh02ZmtAyPP6/+6YTJg2ibLtl9C34pWvmtMEmRTWpra+qO/hifkUtBTOtfx6S9vLDjBsBK4gRg==
-  dependencies:
-    abstract-leveldown "~6.2.3"
-    buffer "^5.5.0"
-    inherits "^2.0.3"
-    ltgt "^2.1.2"
-
-level-packager@^5.1.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/level-packager/-/level-packager-5.1.1.tgz#323ec842d6babe7336f70299c14df2e329c18939"
-  integrity sha512-HMwMaQPlTC1IlcwT3+swhqf/NUO+ZhXVz6TY1zZIIZlIR0YSn8GtAAWmIvKjNY16ZkEg/JcpAuQskxsXqC0yOQ==
-  dependencies:
-    encoding-down "^6.3.0"
-    levelup "^4.3.2"
-
-level-supports@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/level-supports/-/level-supports-1.0.1.tgz#2f530a596834c7301622521988e2c36bb77d122d"
-  integrity sha512-rXM7GYnW8gsl1vedTJIbzOrRv85c/2uCMpiiCzO2fndd06U/kUXEEU9evYn4zFggBOg36IsBW8LzqIpETwwQzg==
-  dependencies:
-    xtend "^4.0.2"
-
-level-write-stream@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/level-write-stream/-/level-write-stream-1.0.0.tgz#3f7fbb679a55137c0feb303dee766e12ee13c1dc"
-  integrity sha1-P3+7Z5pVE3wP6zA97nZuEu4Twdw=
-  dependencies:
-    end-stream "~0.1.0"
-
-level@6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/level/-/level-6.0.1.tgz#dc34c5edb81846a6de5079eac15706334b0d7cd6"
-  integrity sha512-psRSqJZCsC/irNhfHzrVZbmPYXDcEYhA5TVNwr+V92jF44rbf86hqGp8fiT702FyiArScYIlPSBTDUASCVNSpw==
-  dependencies:
-    level-js "^5.0.0"
-    level-packager "^5.1.0"
-    leveldown "^5.4.0"
-
-leveldown@5.6.0, leveldown@^5.4.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/leveldown/-/leveldown-5.6.0.tgz#16ba937bb2991c6094e13ac5a6898ee66d3eee98"
-  integrity sha512-iB8O/7Db9lPaITU1aA2txU/cBEXAt4vWwKQRrrWuS6XDgbP4QZGj9BL2aNbwb002atoQ/lIotJkfyzz+ygQnUQ==
-  dependencies:
-    abstract-leveldown "~6.2.1"
-    napi-macros "~2.0.0"
-    node-gyp-build "~4.1.0"
-
-levelup@4.4.0, levelup@^4.3.2:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/levelup/-/levelup-4.4.0.tgz#f89da3a228c38deb49c48f88a70fb71f01cafed6"
-  integrity sha512-94++VFO3qN95cM/d6eBXvd894oJE0w3cInq9USsyQzzoJxmiYzPAocNcuGCPGGjoXqDVJcr3C1jzt1TSjyaiLQ==
-  dependencies:
-    deferred-leveldown "~5.3.0"
-    level-errors "~2.0.0"
-    level-iterator-stream "~4.0.0"
-    level-supports "~1.0.0"
-    xtend "~4.0.0"
-
 leven@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
@@ -9208,11 +9020,6 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-ltgt@2.2.1, ltgt@^2.1.2:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ltgt/-/ltgt-2.2.1.tgz#f35ca91c493f7b73da0e07495304f17b31f87ee5"
-  integrity sha1-81ypHEk/e3PaDgdJUwTxezH4fuU=
-
 lz-string@^1.4.4:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz#c0d8eaf36059f705796e1e344811cf4c498d3a26"
@@ -9742,11 +9549,6 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-napi-macros@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/napi-macros/-/napi-macros-2.0.0.tgz#2b6bae421e7b96eb687aa6c77a7858640670001b"
-  integrity sha512-A0xLykHtARfueITVDernsAWdtIMbOJgKgcluwENp3AlsKN/PloyO10HtmoqnFAQAcxPkgZN7wdfPfEd0zNGxbg==
-
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -9790,11 +9592,6 @@ no-case@^3.0.4:
     lower-case "^2.0.2"
     tslib "^2.0.3"
 
-node-fetch@2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
-  integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
-
 node-fetch@2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
@@ -9812,11 +9609,6 @@ node-forge@^0.10.0:
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
   integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
 
-node-gyp-build@~4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.1.1.tgz#d7270b5d86717068d114cc57fff352f96d745feb"
-  integrity sha512-dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ==
-
 node-gyp@^5.0.2:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.1.1.tgz#eb915f7b631c937d282e33aed44cb7a025f62a3e"
@@ -10776,169 +10568,6 @@ postcss@^8.2.15:
     nanoid "^3.1.25"
     source-map-js "^0.6.2"
 
-pouchdb-abstract-mapreduce@7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-abstract-mapreduce/-/pouchdb-abstract-mapreduce-7.2.2.tgz#dd1b10a83f8d24361dce9aaaab054614b39f766f"
-  integrity sha512-7HWN/2yV2JkwMnGnlp84lGvFtnm0Q55NiBUdbBcaT810+clCGKvhssBCrXnmwShD1SXTwT83aszsgiSfW+SnBA==
-  dependencies:
-    pouchdb-binary-utils "7.2.2"
-    pouchdb-collate "7.2.2"
-    pouchdb-collections "7.2.2"
-    pouchdb-errors "7.2.2"
-    pouchdb-fetch "7.2.2"
-    pouchdb-mapreduce-utils "7.2.2"
-    pouchdb-md5 "7.2.2"
-    pouchdb-utils "7.2.2"
-
-pouchdb-adapter-idb@^7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-adapter-idb/-/pouchdb-adapter-idb-7.2.2.tgz#0a4b6c6f6639f93e2e50cb20d50b5fb6eaf1e80e"
-  integrity sha512-swSVQFm/p5CPKP0zyOmtv/hFpTyjtDlPAKTpxH4gEm9V+K30kDZ8ciAHaCkGEBSfWfZFYUI8/VOnAL2L0WIIeA==
-  dependencies:
-    pouchdb-adapter-utils "7.2.2"
-    pouchdb-binary-utils "7.2.2"
-    pouchdb-collections "7.2.2"
-    pouchdb-errors "7.2.2"
-    pouchdb-json "7.2.2"
-    pouchdb-merge "7.2.2"
-    pouchdb-utils "7.2.2"
-
-pouchdb-adapter-utils@7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-adapter-utils/-/pouchdb-adapter-utils-7.2.2.tgz#c64426447d9044ba31517a18500d6d2d28abd47d"
-  integrity sha512-2CzZkTyTyHZkr3ePiWFMTiD5+56lnembMjaTl8ohwegM0+hYhRyJux0biAZafVxgIL4gnCUC4w2xf6WVztzKdg==
-  dependencies:
-    pouchdb-binary-utils "7.2.2"
-    pouchdb-collections "7.2.2"
-    pouchdb-errors "7.2.2"
-    pouchdb-md5 "7.2.2"
-    pouchdb-merge "7.2.2"
-    pouchdb-utils "7.2.2"
-
-pouchdb-binary-utils@7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-binary-utils/-/pouchdb-binary-utils-7.2.2.tgz#0690b348052c543b1e67f032f47092ca82bcb10e"
-  integrity sha512-shacxlmyHbUrNfE6FGYpfyAJx7Q0m91lDdEAaPoKZM3SzAmbtB1i+OaDNtYFztXjJl16yeudkDb3xOeokVL3Qw==
-  dependencies:
-    buffer-from "1.1.1"
-
-pouchdb-collate@7.2.2, pouchdb-collate@^7.1.1:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-collate/-/pouchdb-collate-7.2.2.tgz#fc261f5ef837c437e3445fb0abc3f125d982c37c"
-  integrity sha512-/SMY9GGasslknivWlCVwXMRMnQ8myKHs4WryQ5535nq1Wj/ehpqWloMwxEQGvZE1Sda3LOm7/5HwLTcB8Our+w==
-
-pouchdb-collections@7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-collections/-/pouchdb-collections-7.2.2.tgz#aeed77f33322429e3f59d59ea233b48ff0e68572"
-  integrity sha512-6O9zyAYlp3UdtfneiMYuOCWdUCQNo2bgdjvNsMSacQX+3g8WvIoFQCYJjZZCpTttQGb+MHeRMr8m2U95lhJTew==
-
-pouchdb-errors@7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-errors/-/pouchdb-errors-7.2.2.tgz#80d811d65c766c9d20b755c6e6cc123f8c3c4792"
-  integrity sha512-6GQsiWc+7uPfgEHeavG+7wuzH3JZW29Dnrvz8eVbDFE50kVFxNDVm3EkYHskvo5isG7/IkOx7PV7RPTA3keG3g==
-  dependencies:
-    inherits "2.0.4"
-
-pouchdb-fetch@7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-fetch/-/pouchdb-fetch-7.2.2.tgz#492791236d60c899d7e9973f9aca0d7b9cc02230"
-  integrity sha512-lUHmaG6U3zjdMkh8Vob9GvEiRGwJfXKE02aZfjiVQgew+9SLkuOxNw3y2q4d1B6mBd273y1k2Lm0IAziRNxQnA==
-  dependencies:
-    abort-controller "3.0.0"
-    fetch-cookie "0.10.1"
-    node-fetch "2.6.0"
-
-pouchdb-find@^7.1.1, pouchdb-find@^7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-find/-/pouchdb-find-7.2.2.tgz#1227afdd761812d508fe0794b3e904518a721089"
-  integrity sha512-BmFeFVQ0kHmDehvJxNZl9OmIztCjPlZlVSdpijuFbk/Fi1EFPU1BAv3kLC+6DhZuOqU/BCoaUBY9sn66pPY2ag==
-  dependencies:
-    pouchdb-abstract-mapreduce "7.2.2"
-    pouchdb-collate "7.2.2"
-    pouchdb-errors "7.2.2"
-    pouchdb-fetch "7.2.2"
-    pouchdb-md5 "7.2.2"
-    pouchdb-selector-core "7.2.2"
-    pouchdb-utils "7.2.2"
-
-pouchdb-json@7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-json/-/pouchdb-json-7.2.2.tgz#b939be24b91a7322e9a24b8880a6e21514ec5e1f"
-  integrity sha512-3b2S2ynN+aoB7aCNyDZc/4c0IAdx/ir3nsHB+/RrKE9cM3QkQYbnnE3r/RvOD1Xvr6ji/KOCBie+Pz/6sxoaug==
-  dependencies:
-    vuvuzela "1.0.3"
-
-pouchdb-mapreduce-utils@7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-mapreduce-utils/-/pouchdb-mapreduce-utils-7.2.2.tgz#13a46a3cc2a3f3b8e24861da26966904f2963146"
-  integrity sha512-rAllb73hIkU8rU2LJNbzlcj91KuulpwQu804/F6xF3fhZKC/4JQMClahk+N/+VATkpmLxp1zWmvmgdlwVU4HtQ==
-  dependencies:
-    argsarray "0.0.1"
-    inherits "2.0.4"
-    pouchdb-collections "7.2.2"
-    pouchdb-utils "7.2.2"
-
-pouchdb-md5@7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-md5/-/pouchdb-md5-7.2.2.tgz#415401acc5a844112d765bd1fb4e5d9f38fb0838"
-  integrity sha512-c/RvLp2oSh8PLAWU5vFBnp6ejJABIdKqboZwRRUrWcfGDf+oyX8RgmJFlYlzMMOh4XQLUT1IoaDV8cwlsuryZw==
-  dependencies:
-    pouchdb-binary-utils "7.2.2"
-    spark-md5 "3.0.1"
-
-pouchdb-merge@7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-merge/-/pouchdb-merge-7.2.2.tgz#940d85a2b532d6a93a6cab4b250f5648511bcc16"
-  integrity sha512-6yzKJfjIchBaS7Tusuk8280WJdESzFfQ0sb4jeMUNnrqs4Cx3b0DIEOYTRRD9EJDM+je7D3AZZ4AT0tFw8gb4A==
-
-pouchdb-selector-core@7.2.2, pouchdb-selector-core@^7.1.1:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-selector-core/-/pouchdb-selector-core-7.2.2.tgz#264d7436a8c8ac3801f39960e79875ef7f3879a0"
-  integrity sha512-XYKCNv9oiNmSXV5+CgR9pkEkTFqxQGWplnVhO3W9P154H08lU0ZoNH02+uf+NjZ2kjse7Q1fxV4r401LEcGMMg==
-  dependencies:
-    pouchdb-collate "7.2.2"
-    pouchdb-utils "7.2.2"
-
-pouchdb-utils@7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-utils/-/pouchdb-utils-7.2.2.tgz#c17c4788f1d052b0daf4ef8797bbc4aaa3945aa4"
-  integrity sha512-XmeM5ioB4KCfyB2MGZXu1Bb2xkElNwF1qG+zVFbQsKQij0zvepdOUfGuWvLRHxTOmt4muIuSOmWZObZa3NOgzQ==
-  dependencies:
-    argsarray "0.0.1"
-    clone-buffer "1.0.0"
-    immediate "3.3.0"
-    inherits "2.0.4"
-    pouchdb-collections "7.2.2"
-    pouchdb-errors "7.2.2"
-    pouchdb-md5 "7.2.2"
-    uuid "8.1.0"
-
-pouchdb@^7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb/-/pouchdb-7.2.2.tgz#fcae82862db527e4cf7576ed8549d1384961f364"
-  integrity sha512-5gf5nw5XH/2H/DJj8b0YkvG9fhA/4Jt6kL0Y8QjtztVjb1y4J19Rg4rG+fUbXu96gsUrlyIvZ3XfM0b4mogGmw==
-  dependencies:
-    abort-controller "3.0.0"
-    argsarray "0.0.1"
-    buffer-from "1.1.1"
-    clone-buffer "1.0.0"
-    double-ended-queue "2.1.0-0"
-    fetch-cookie "0.10.1"
-    immediate "3.3.0"
-    inherits "2.0.4"
-    level "6.0.1"
-    level-codec "9.0.2"
-    level-write-stream "1.0.0"
-    leveldown "5.6.0"
-    levelup "4.4.0"
-    ltgt "2.2.1"
-    node-fetch "2.6.0"
-    readable-stream "1.1.14"
-    spark-md5 "3.0.1"
-    through2 "3.0.2"
-    uuid "8.1.0"
-    vuvuzela "1.0.3"
-
 prefix-style@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/prefix-style/-/prefix-style-2.0.1.tgz#66bba9a870cfda308a5dc20e85e9120932c95a06"
@@ -11347,20 +10976,6 @@ react-is@^16.12.0, react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.1, react-
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
-react-pouchdb@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/react-pouchdb/-/react-pouchdb-2.1.0.tgz#1f6956ef90cd7a2636c809b2d639b9ea36901fa2"
-  integrity sha512-6WxazCEEHpsxn1YKahTtp+gBTslKt7LiyQ87O7AR+SOG7A0sWGYNTELxBtWXfY/fTu3xXPOiR1HR2p/SpoiEPA==
-  dependencies:
-    "@babel/runtime" "^7.6.3"
-    fast-json-stable-stringify "^2.0.0"
-    hoist-non-react-statics "^3.3.0"
-    lodash "^4.17.15"
-    pouchdb-collate "^7.1.1"
-    pouchdb-find "^7.1.1"
-    pouchdb-selector-core "^7.1.1"
-    use-subscription "^1.1.1"
-
 react-redux@^7.2.5:
   version "7.2.5"
   resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.5.tgz#213c1b05aa1187d9c940ddfc0b29450957f6a3b8"
@@ -11547,17 +11162,7 @@ read@1, read@~1.0.1:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@1.1.14:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
-  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
-"readable-stream@2 || 3", readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.4.0, readable-stream@^3.5.0, readable-stream@^3.6.0:
+readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.5.0, readable-stream@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
   integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -11566,11 +11171,6 @@ readable-stream@1.1.14:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@~0.0.2:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-0.0.4.tgz#f32d76e3fb863344a548d79923007173665b3b8d"
-  integrity sha1-8y124/uGM0SlSNeZIwBxc2ZbO40=
-
 readable-stream@~1.0.31:
   version "1.0.34"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
@@ -12436,11 +12036,6 @@ source-map@^0.7.3, source-map@~0.7.2:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
 
-spark-md5@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.1.tgz#83a0e255734f2ab4e5c466e5a2cfc9ba2aa2124d"
-  integrity sha512-0tF3AGSD1ppQeuffsLDIOWlKUd3lS92tFxcsrh5Pe3ZphhnoK+oXIBTzOAThZCiuINZLvpiLH/1VS1/ANEJVig==
-
 spdx-correct@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
@@ -12972,14 +12567,6 @@ throat@^6.0.1:
   resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz#d514fedad95740c12c2d7fc70ea863eb51ade375"
   integrity sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==
 
-through2@3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4"
-  integrity sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==
-  dependencies:
-    inherits "^2.0.4"
-    readable-stream "2 || 3"
-
 through2@^2.0.0, through2@^2.0.1:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
@@ -13110,7 +12697,7 @@ totalist@^1.0.0:
   resolved "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df"
   integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==
 
-"tough-cookie@^2.3.3 || ^3.0.1 || ^4.0.0", tough-cookie@^4.0.0:
+tough-cookie@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
   integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==
@@ -13474,13 +13061,6 @@ url@^0.11.0:
     punycode "1.3.2"
     querystring "0.2.0"
 
-use-subscription@^1.1.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/use-subscription/-/use-subscription-1.5.1.tgz#73501107f02fad84c6dd57965beb0b75c68c42d1"
-  integrity sha512-Xv2a1P/yReAjAbhylMfFplFKj9GssgTwN7RlcTxBujFQcloStWNDQdc4g4NRWH9xS4i/FDk04vQBptAXoF3VcA==
-  dependencies:
-    object-assign "^4.1.1"
-
 use@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
@@ -13536,11 +13116,6 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
-uuid@8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.1.0.tgz#6f1536eb43249f473abc6bd58ff983da1ca30d8d"
-  integrity sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg==
-
 uuid@^3.3.2, uuid@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
@@ -13609,11 +13184,6 @@ vue@^2.5.17:
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235"
   integrity sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==
 
-vuvuzela@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/vuvuzela/-/vuvuzela-1.0.3.tgz#3be145e58271c73ca55279dd851f12a682114b0b"
-  integrity sha1-O+FF5YJxxzylUnndhR8SpoIRSws=
-
 w3c-hr-time@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
@@ -14125,13 +13695,6 @@ write-pkg@^4.0.0:
     type-fest "^0.4.1"
     write-json-file "^3.2.0"
 
-write-stream@~0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/write-stream/-/write-stream-0.4.3.tgz#83cc8c0347d0af6057a93862b4e3ae01de5c81c1"
-  integrity sha1-g8yMA0fQr2BXqThitOOuAd5cgcE=
-  dependencies:
-    readable-stream "~0.0.2"
-
 ws@^7.3.1, ws@^7.4.6:
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881"
@@ -14157,7 +13720,7 @@ xmlchars@^2.2.0:
   resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
   integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
 
-xtend@^4.0.0, xtend@^4.0.2, xtend@~4.0.0, xtend@~4.0.1:
+xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==

From 93d8d985c696c5b8707e7f2456a27be9b0c5d63a Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 22 Mar 2022 17:21:38 -0700
Subject: [PATCH 081/531] Add d ts file for deep equal

---
 core/@types/deepEqual.d.ts | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 core/@types/deepEqual.d.ts

diff --git a/core/@types/deepEqual.d.ts b/core/@types/deepEqual.d.ts
new file mode 100644
index 000000000..b6504559f
--- /dev/null
+++ b/core/@types/deepEqual.d.ts
@@ -0,0 +1 @@
+declare module 'deep-equal'

From 8329dd04a3b5ee613a591e3b1138aa82306454bc Mon Sep 17 00:00:00 2001
From: Nick Walton <nickwalton00@gmail.com>
Date: Tue, 22 Mar 2022 20:27:33 -0700
Subject: [PATCH 082/531] deprecate some components

---
 client/package.json                       |  2 +-
 core/src/components/DifficultyDetector.ts |  1 +
 core/src/components/EnkiTask.ts           |  1 +
 core/src/components/Huggingface.ts        |  1 +
 core/src/components/Module.ts             |  1 +
 core/src/components/TriggerOut.ts         |  1 +
 yarn.lock                                 | 20 --------------------
 7 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/client/package.json b/client/package.json
index 5b2887767..346012dd1 100644
--- a/client/package.json
+++ b/client/package.json
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@callstack/async-storage": "^2.0.3",
-    "@latitudegames/thoth-core": "0.0.65",
+    "@latitudegames/thoth-core": "0.0.66",
     "@material-ui/core": "^4.12.1",
     "@material-ui/icons": "^4.11.2",
     "@monaco-editor/react": "^4.2.1",
diff --git a/core/src/components/DifficultyDetector.ts b/core/src/components/DifficultyDetector.ts
index 72fcc64cc..efd0bc529 100644
--- a/core/src/components/DifficultyDetector.ts
+++ b/core/src/components/DifficultyDetector.ts
@@ -65,6 +65,7 @@ export class DifficultyDetectorComponent extends ThothComponent<
     this.category = 'AI/ML'
     this.info = info
     this.display = true
+    this.deprecated = true
   }
 
   displayControl = {}
diff --git a/core/src/components/EnkiTask.ts b/core/src/components/EnkiTask.ts
index 8584e7c81..2c0979aa4 100644
--- a/core/src/components/EnkiTask.ts
+++ b/core/src/components/EnkiTask.ts
@@ -24,6 +24,7 @@ export class EnkiTask extends ThothComponent<
     this.category = 'AI/ML'
     this.display = true
     this.info = info
+    this.deprecated = true
   }
 
   node = {}
diff --git a/core/src/components/Huggingface.ts b/core/src/components/Huggingface.ts
index 11c0a561b..b2d32bded 100644
--- a/core/src/components/Huggingface.ts
+++ b/core/src/components/Huggingface.ts
@@ -42,6 +42,7 @@ export class HuggingfaceComponent extends ThothComponent<
     }
     this.category = 'AI/ML'
     this.info = info
+    this.deprecated = true
   }
 
   builder(node: ThothNode) {
diff --git a/core/src/components/Module.ts b/core/src/components/Module.ts
index 132e83eae..1ef9afefe 100644
--- a/core/src/components/Module.ts
+++ b/core/src/components/Module.ts
@@ -36,6 +36,7 @@ export class ModuleComponent extends ThothComponent<ModuleWorkerOutput[]> {
     this.category = 'Core'
     this.info = info
     this.noBuildUpdate = true
+    this.deprecated = true
   }
 
   builder(node: ThothNode) {
diff --git a/core/src/components/TriggerOut.ts b/core/src/components/TriggerOut.ts
index 91d92da08..c83445988 100644
--- a/core/src/components/TriggerOut.ts
+++ b/core/src/components/TriggerOut.ts
@@ -40,6 +40,7 @@ export class TriggerOut extends ThothComponent<WorkerReturn> {
     this.category = 'I/O'
     this.displayName = 'Trigger Out'
     this.info = info
+    this.deprecated = true
   }
 
   // the builder is used to "assemble" the node component.
diff --git a/yarn.lock b/yarn.lock
index 4ea0845a9..f0f3c60b3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1469,26 +1469,6 @@
     "@types/yargs" "^16.0.0"
     chalk "^4.0.0"
 
-"@latitudegames/thoth-core@0.0.65":
-  version "0.0.65"
-  resolved "https://npm.pkg.github.com/download/@latitudegames/thoth-core/0.0.65/5f38b6af91b27e4285a0b665b572209754c81f865bb988b2dae14f02913d8d4b#10eceb4003a9abcd6e81115203d422ab7cc3bc06"
-  integrity sha512-YRoyD29A6n8vFwj3jACTOq9q+uwMV3PogQoftTJBb8CuUcA3AbKgMhHyNg7z1XDwMyzoOjJ0TMTBhFpInO8nsA==
-  dependencies:
-    deep-equal "^2.0.5"
-    handlebars "^4.7.7"
-    jsdom "^17.0.0"
-    license-webpack-plugin "^4.0.2"
-    path "^0.12.7"
-    react "^17.0.2"
-    regenerator-runtime "^0.13.9"
-    rete "https://github.com/latitudegames/rete.git#master"
-    rete-area-plugin "^0.2.1"
-    rete-connection-plugin "^0.9.0"
-    rete-context-menu-plugin "^0.6.0-rc.1"
-    rete-module-plugin "^0.4.1"
-    rete-react-render-plugin "^0.2.1"
-    uuid "^8.3.2"
-
 "@lerna/add@4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@lerna/add/-/add-4.0.0.tgz#c36f57d132502a57b9e7058d1548b7a565ef183f"

From 2b63600bdb060b87ffe6d5329bd25f6685652a4a Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 23 Mar 2022 10:36:30 -0700
Subject: [PATCH 083/531] Deprecate module component

---
 core/src/components/Module.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/components/Module.ts b/core/src/components/Module.ts
index 132e83eae..3345dede7 100644
--- a/core/src/components/Module.ts
+++ b/core/src/components/Module.ts
@@ -20,7 +20,7 @@ export class ModuleComponent extends ThothComponent<ModuleWorkerOutput[]> {
   info
   subscriptionMap: Record<number, Function> = {}
   editor: any
-  hide: true
+  deprecated = true
   noBuildUpdate: boolean
   category: string
 

From bf5599c8fe3b9d01646a602c311f1d9b0a95b347 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 23 Mar 2022 10:37:03 -0700
Subject: [PATCH 084/531] Move module component into deprecated folder

---
 core/src/components/{ => deprecated}/Module.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename core/src/components/{ => deprecated}/Module.ts (93%)

diff --git a/core/src/components/Module.ts b/core/src/components/deprecated/Module.ts
similarity index 93%
rename from core/src/components/Module.ts
rename to core/src/components/deprecated/Module.ts
index 3345dede7..e09a5f6e2 100644
--- a/core/src/components/Module.ts
+++ b/core/src/components/deprecated/Module.ts
@@ -6,10 +6,10 @@ import {
   NodeData,
   ThothNode,
   ThothWorkerInputs,
-} from '../../types'
-import { ModuleControl } from '../dataControls/ModuleControl'
-import { Task } from '../plugins/taskPlugin/task'
-import { ThothComponent } from '../thoth-component'
+} from '../../../types'
+import { ModuleControl } from '../../dataControls/ModuleControl'
+import { Task } from '../../plugins/taskPlugin/task'
+import { ThothComponent } from '../../thoth-component'
 
 const info = `The Module component allows you to add modules into your chain.  A module is a bundled self contained chain that defines inputs, outputs, and triggers using components.`
 

From 2f13070f841e64bfc081366f546a7edabb61fa3f Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 23 Mar 2022 10:37:15 -0700
Subject: [PATCH 085/531] Update path to module component in components file

---
 core/src/components/components.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/components/components.ts b/core/src/components/components.ts
index 1bc6dc477..5c3b548fc 100644
--- a/core/src/components/components.ts
+++ b/core/src/components/components.ts
@@ -17,7 +17,7 @@ import { HuggingfaceComponent } from './Huggingface'
 import { InputComponent } from './Input'
 import { ItemTypeComponent } from './ItemDetector'
 import { JoinListComponent } from './JoinList'
-import { ModuleComponent } from './Module'
+import { ModuleComponent } from './deprecated/Module'
 import { Output } from './Output'
 import { ProseToScript } from './ProseToScript'
 import { SafetyVerifier } from './SafetyVerifier'

From 76eb3e05792d4ad0267c82f100c3aa4f67a8220a Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 09:35:29 -0700
Subject: [PATCH 086/531] Massive refactoring of folder structure for client

---
 client/src/App.tsx                            |   8 +++----
 .../common => components}/Accordion.tsx       |   0
 .../Button/button.module.css                  |   0
 .../common => components}/Chip/Chip.jsx       |   0
 .../Chip/chip.module.css                      |   0
 .../Chip/chip.module.css.d.ts                 |   0
 .../common => components}/Icon/Icon.tsx       |   0
 .../common => components}/Icon/account.svg    |   0
 .../common => components}/Icon/add.svg        |   0
 .../common => components}/Icon/ankh.svg       |   0
 .../common => components}/Icon/bird.svg       |   0
 .../common => components}/Icon/close.svg      |   0
 .../common => components}/Icon/cloth.svg      |   0
 .../common => components}/Icon/cup.svg        |   0
 .../Icon/dangerTrash.svg                      |   0
 .../common => components}/Icon/feathers.svg   |   0
 .../common => components}/Icon/fewshot.svg    |   0
 .../common => components}/Icon/folder.svg     |   0
 .../common => components}/Icon/hand.svg       |   0
 .../Icon/icon.module.css                      |   0
 .../Icon/icon.module.css.d.ts                 |   0
 .../common => components}/Icon/info.svg       |   0
 .../common => components}/Icon/merge.svg      |   0
 .../common => components}/Icon/minus.svg      |   0
 .../common => components}/Icon/moon.svg       |   0
 .../common => components}/Icon/newnode.svg    |   0
 .../common => components}/Icon/pause.svg      |   0
 .../common => components}/Icon/person.svg     |   0
 .../common => components}/Icon/play-print.svg |   0
 .../common => components}/Icon/play.svg       |   0
 .../common => components}/Icon/properties.svg |   0
 .../common => components}/Icon/refresh.svg    |   0
 .../common => components}/Icon/search.svg     |   0
 .../common => components}/Icon/seive.svg      |   0
 .../common => components}/Icon/snake.svg      |   0
 .../common => components}/Icon/state-read.svg |   0
 .../Icon/state-write.svg                      |   0
 .../common => components}/Icon/state.svg      |   0
 .../common => components}/Icon/stop-sign.svg  |   0
 .../common => components}/Icon/stop.svg       |   0
 .../common => components}/Icon/switch.svg     |   0
 .../Icon/temperature.svg                      |   0
 .../common => components}/Icon/text.svg       |   0
 .../common => components}/Icon/tiles.svg      |   0
 .../common => components}/Icon/time.svg       |   0
 .../common => components}/Icon/trash.svg      |   0
 .../common => components}/Icon/warn.svg       |   0
 .../common => components}/Icon/water-play.svg |   0
 .../common => components}/Icon/water-run.svg  |   0
 .../common => components}/Icon/water.svg      |   0
 .../common => components}/Input/Input.tsx     |   0
 .../Input/input.module.css                    |   0
 .../LoadingScreen/LoadingScreen.jsx           |   0
 .../LoadingScreen/ankh.gif                    | Bin
 .../common => components}/MenuBar/MenuBar.tsx |   4 ++--
 .../MenuBar/menuBar.module.css                |   0
 .../MenuBar/menuBar.module.css.d.ts           |   0
 .../common => components}/MenuBar/thoth.png   | Bin
 .../common => components}/Modal/Modal.jsx     |   2 +-
 .../Modal/modal.module.css                    |   0
 .../Modal/modal.module.css.d.ts               |   0
 .../Modals/DeployModal.jsx                    |   2 +-
 .../Modals/EditSpellModal.tsx                 |   2 +-
 .../Modals/ExampleModal.jsx                   |   2 +-
 .../Modals/InfoModal.jsx                      |   0
 .../Modals/SaveAsModal.tsx                    |   2 +-
 .../common => components}/Modals/index.ts     |   0
 .../Modals/loginModal.module.css.d.ts         |   0
 .../Modals/modalForms.module.css              |   0
 .../Modals/modalForms.module.css.d.ts         |   0
 .../common => components}/Node/Node.js        |   0
 .../Node/Node.module.css                      |   0
 .../Node/Node.module.css.d.ts                 |   0
 .../common => components}/Panel/Panel.tsx     |   0
 .../Panel/panel.module.css                    |   0
 .../Panel/panel.module.css.d.ts               |   0
 .../RequireAuth/RequireAuth.tsx               |   2 +-
 .../common => components}/Select/Select.jsx   |   0
 .../Select/select.module.css                  |   0
 .../Select/select.module.css.d.ts             |   0
 .../common => components}/Switch/Switch.tsx   |   0
 .../common => components}/TabBar/TabBar.tsx   |   0
 .../TabBar/tabBar.module.css                  |   0
 .../TabBar/tabBar.module.css.d.ts             |   0
 .../TabLayout/TabLayout.jsx                   |   0
 .../TabLayout/TabLayout.module.css            |   0
 .../TabLayout/TabLayout.module.css.d.ts       |   0
 .../ThothPage/ThothPageWrapper.tsx            |   2 +-
 .../ThothPage/pagewrapper.module.css          |   0
 .../ThothPage/pagewrapper.module.css.d.ts     |   0
 .../common => components}/Toolbar/Toolbar.tsx |   0
 .../Toolbar/toolbar.module.css                |   0
 .../common => components}/Window/Window.tsx   |   0
 .../Window/WindowToolbar.tsx                  |   0
 .../Window/window.module.css                  |   2 +-
 .../Window/window.module.css.d.ts             |   0
 .../accordion-overrides.css                   |   0
 .../accordion-overrides.css.d.ts              |   0
 .../accordion.module.css                      |   0
 .../accordion.module.css.d.ts                 |   0
 .../z. Don't use/TextInput/TextInput.tsx      |   0
 .../TextInput/textinput.module.css            |   0
 client/src/contexts/AuthProvider.tsx          |   2 +-
 client/src/contexts/ModalProvider.jsx         |   2 +-
 .../HomeScreen/HomeScreen.tsx                 |   2 +-
 .../HomeScreen/components/FileInput.jsx       |   2 +-
 .../HomeScreen/components/ProjectRow.tsx      |   2 +-
 .../HomeScreen/components/TemplatePanel.jsx   |   2 +-
 .../HomeScreen/empty.png                      | Bin
 .../{features => screens}/HomeScreen/enki.png | Bin
 .../HomeScreen/homeScreen.module.css          |   0
 .../HomeScreen/homeScreen.module.css.d.ts     |   0
 .../{features => screens}/HomeScreen/lang.png | Bin
 .../HomeScreen/screens/AllProjects.jsx        |   4 ++--
 .../HomeScreen/screens/CreateNew.tsx          |   2 +-
 .../HomeScreen/screens/OpenProject.tsx        |   4 ++--
 .../HomeScreen/screens/chains/default.ts      |   0
 .../HomeScreen/version-banner-0.0.0beta.jpg   | Bin
 .../src/{features => screens}/Thoth/Thoth.tsx |   6 ++---
 .../Thoth/components/EventHandler.tsx         |   6 ++---
 .../Thoth/thoth.module.css                    |   0
 .../Thoth/thoth.module.css.d.ts               |   0
 client/src/services/Modals.ts                 |   4 ++--
 .../composer}/components/WindowMessage.jsx    |   0
 .../Thoth => }/workspaces/composer/index.tsx  |  22 +++++++++---------
 .../composer}/windows/DebugConsole/index.tsx  |   4 ++--
 .../windows/EditorWindow/Deployment.tsx       |  12 +++++-----
 .../EditorWindow/editorwindow.module.css      |   0
 .../EditorWindow/editorwindow.module.css.d.ts |   0
 .../composer}/windows/EditorWindow/index.jsx  |   6 ++---
 .../DataControls/CodeControl.jsx              |   2 +-
 .../DataControls/DataControls.jsx             |   2 +-
 .../DataControls/DropdownSelect.tsx           |   2 +-
 .../DataControls/EnkiSelect.jsx               |   4 ++--
 .../InspectorWindow/DataControls/Info.jsx     |   0
 .../InspectorWindow/DataControls/Input.jsx    |   2 +-
 .../DataControls/InputGenerator.jsx           |   0
 .../DataControls/LongTextControl.jsx          |   2 +-
 .../DataControls/ModuleSelect.tsx.bak         |   0
 .../DataControls/OutputGenerator.jsx          |   0
 .../DataControls/PlaytestControl.tsx          |   2 +-
 .../DataControls/SocketGenerator.jsx          |   0
 .../DataControls/SwitchControl.tsx            |   2 +-
 .../DataControls/datacontrols.module.css      |   0
 .../DataControls/datacontrols.module.css.d.ts |   0
 .../InspectorWindow/DataControls/index.jsx    |   0
 .../windows/InspectorWindow/index.jsx         |   8 +++----
 .../composer}/windows/PlaytestWindow.jsx      |   4 ++--
 .../composer}/windows/StateManagerWindow.tsx  |   4 ++--
 .../composer}/windows/TextEditorWindow.jsx    |   8 +++----
 .../contexts/EditorProvider.tsx               |  12 +++++-----
 .../contexts/LayoutProvider.tsx               |   6 ++---
 .../contexts/ReteProvider.tsx                 |  10 ++++----
 .../contexts/WorkspaceProvider.jsx            |   0
 .../{features/Thoth => }/workspaces/index.tsx |   2 +-
 client/webpack.common.js                      |   4 ++--
 156 files changed, 93 insertions(+), 93 deletions(-)
 rename client/src/{features/common => components}/Accordion.tsx (100%)
 rename client/src/{features/common => components}/Button/button.module.css (100%)
 rename client/src/{features/common => components}/Chip/Chip.jsx (100%)
 rename client/src/{features/common => components}/Chip/chip.module.css (100%)
 rename client/src/{features/common => components}/Chip/chip.module.css.d.ts (100%)
 rename client/src/{features/common => components}/Icon/Icon.tsx (100%)
 rename client/src/{features/common => components}/Icon/account.svg (100%)
 rename client/src/{features/common => components}/Icon/add.svg (100%)
 rename client/src/{features/common => components}/Icon/ankh.svg (100%)
 rename client/src/{features/common => components}/Icon/bird.svg (100%)
 rename client/src/{features/common => components}/Icon/close.svg (100%)
 rename client/src/{features/common => components}/Icon/cloth.svg (100%)
 rename client/src/{features/common => components}/Icon/cup.svg (100%)
 rename client/src/{features/common => components}/Icon/dangerTrash.svg (100%)
 rename client/src/{features/common => components}/Icon/feathers.svg (100%)
 rename client/src/{features/common => components}/Icon/fewshot.svg (100%)
 rename client/src/{features/common => components}/Icon/folder.svg (100%)
 rename client/src/{features/common => components}/Icon/hand.svg (100%)
 rename client/src/{features/common => components}/Icon/icon.module.css (100%)
 rename client/src/{features/common => components}/Icon/icon.module.css.d.ts (100%)
 rename client/src/{features/common => components}/Icon/info.svg (100%)
 rename client/src/{features/common => components}/Icon/merge.svg (100%)
 rename client/src/{features/common => components}/Icon/minus.svg (100%)
 rename client/src/{features/common => components}/Icon/moon.svg (100%)
 rename client/src/{features/common => components}/Icon/newnode.svg (100%)
 rename client/src/{features/common => components}/Icon/pause.svg (100%)
 rename client/src/{features/common => components}/Icon/person.svg (100%)
 rename client/src/{features/common => components}/Icon/play-print.svg (100%)
 rename client/src/{features/common => components}/Icon/play.svg (100%)
 rename client/src/{features/common => components}/Icon/properties.svg (100%)
 rename client/src/{features/common => components}/Icon/refresh.svg (100%)
 rename client/src/{features/common => components}/Icon/search.svg (100%)
 rename client/src/{features/common => components}/Icon/seive.svg (100%)
 rename client/src/{features/common => components}/Icon/snake.svg (100%)
 rename client/src/{features/common => components}/Icon/state-read.svg (100%)
 rename client/src/{features/common => components}/Icon/state-write.svg (100%)
 rename client/src/{features/common => components}/Icon/state.svg (100%)
 rename client/src/{features/common => components}/Icon/stop-sign.svg (100%)
 rename client/src/{features/common => components}/Icon/stop.svg (100%)
 rename client/src/{features/common => components}/Icon/switch.svg (100%)
 rename client/src/{features/common => components}/Icon/temperature.svg (100%)
 rename client/src/{features/common => components}/Icon/text.svg (100%)
 rename client/src/{features/common => components}/Icon/tiles.svg (100%)
 rename client/src/{features/common => components}/Icon/time.svg (100%)
 rename client/src/{features/common => components}/Icon/trash.svg (100%)
 rename client/src/{features/common => components}/Icon/warn.svg (100%)
 rename client/src/{features/common => components}/Icon/water-play.svg (100%)
 rename client/src/{features/common => components}/Icon/water-run.svg (100%)
 rename client/src/{features/common => components}/Icon/water.svg (100%)
 rename client/src/{features/common => components}/Input/Input.tsx (100%)
 rename client/src/{features/common => components}/Input/input.module.css (100%)
 rename client/src/{features/common => components}/LoadingScreen/LoadingScreen.jsx (100%)
 rename client/src/{features/common => components}/LoadingScreen/ankh.gif (100%)
 rename client/src/{features/common => components}/MenuBar/MenuBar.tsx (98%)
 rename client/src/{features/common => components}/MenuBar/menuBar.module.css (100%)
 rename client/src/{features/common => components}/MenuBar/menuBar.module.css.d.ts (100%)
 rename client/src/{features/common => components}/MenuBar/thoth.png (100%)
 rename client/src/{features/common => components}/Modal/Modal.jsx (96%)
 rename client/src/{features/common => components}/Modal/modal.module.css (100%)
 rename client/src/{features/common => components}/Modal/modal.module.css.d.ts (100%)
 rename client/src/{features/common => components}/Modals/DeployModal.jsx (95%)
 rename client/src/{features/common => components}/Modals/EditSpellModal.tsx (97%)
 rename client/src/{features/common => components}/Modals/ExampleModal.jsx (85%)
 rename client/src/{features/common => components}/Modals/InfoModal.jsx (100%)
 rename client/src/{features/common => components}/Modals/SaveAsModal.tsx (98%)
 rename client/src/{features/common => components}/Modals/index.ts (100%)
 rename client/src/{features/common => components}/Modals/loginModal.module.css.d.ts (100%)
 rename client/src/{features/common => components}/Modals/modalForms.module.css (100%)
 rename client/src/{features/common => components}/Modals/modalForms.module.css.d.ts (100%)
 rename client/src/{features/common => components}/Node/Node.js (100%)
 rename client/src/{features/common => components}/Node/Node.module.css (100%)
 rename client/src/{features/common => components}/Node/Node.module.css.d.ts (100%)
 rename client/src/{features/common => components}/Panel/Panel.tsx (100%)
 rename client/src/{features/common => components}/Panel/panel.module.css (100%)
 rename client/src/{features/common => components}/Panel/panel.module.css.d.ts (100%)
 rename client/src/{features/common => components}/RequireAuth/RequireAuth.tsx (91%)
 rename client/src/{features/common => components}/Select/Select.jsx (100%)
 rename client/src/{features/common => components}/Select/select.module.css (100%)
 rename client/src/{features/common => components}/Select/select.module.css.d.ts (100%)
 rename client/src/{features/common => components}/Switch/Switch.tsx (100%)
 rename client/src/{features/common => components}/TabBar/TabBar.tsx (100%)
 rename client/src/{features/common => components}/TabBar/tabBar.module.css (100%)
 rename client/src/{features/common => components}/TabBar/tabBar.module.css.d.ts (100%)
 rename client/src/{features/common => components}/TabLayout/TabLayout.jsx (100%)
 rename client/src/{features/common => components}/TabLayout/TabLayout.module.css (100%)
 rename client/src/{features/common => components}/TabLayout/TabLayout.module.css.d.ts (100%)
 rename client/src/{features/common => components}/ThothPage/ThothPageWrapper.tsx (85%)
 rename client/src/{features/common => components}/ThothPage/pagewrapper.module.css (100%)
 rename client/src/{features/common => components}/ThothPage/pagewrapper.module.css.d.ts (100%)
 rename client/src/{features/common => components}/Toolbar/Toolbar.tsx (100%)
 rename client/src/{features/common => components}/Toolbar/toolbar.module.css (100%)
 rename client/src/{features/common => components}/Window/Window.tsx (100%)
 rename client/src/{features/common => components}/Window/WindowToolbar.tsx (100%)
 rename client/src/{features/common => components}/Window/window.module.css (95%)
 rename client/src/{features/common => components}/Window/window.module.css.d.ts (100%)
 rename client/src/{features/common => components}/accordion-overrides.css (100%)
 rename client/src/{features/common => components}/accordion-overrides.css.d.ts (100%)
 rename client/src/{features/common => components}/accordion.module.css (100%)
 rename client/src/{features/common => components}/accordion.module.css.d.ts (100%)
 rename client/src/{features/common => components}/z. Don't use/TextInput/TextInput.tsx (100%)
 rename client/src/{features/common => components}/z. Don't use/TextInput/textinput.module.css (100%)
 rename client/src/{features => screens}/HomeScreen/HomeScreen.tsx (97%)
 rename client/src/{features => screens}/HomeScreen/components/FileInput.jsx (92%)
 rename client/src/{features => screens}/HomeScreen/components/ProjectRow.tsx (95%)
 rename client/src/{features => screens}/HomeScreen/components/TemplatePanel.jsx (93%)
 rename client/src/{features => screens}/HomeScreen/empty.png (100%)
 rename client/src/{features => screens}/HomeScreen/enki.png (100%)
 rename client/src/{features => screens}/HomeScreen/homeScreen.module.css (100%)
 rename client/src/{features => screens}/HomeScreen/homeScreen.module.css.d.ts (100%)
 rename client/src/{features => screens}/HomeScreen/lang.png (100%)
 rename client/src/{features => screens}/HomeScreen/screens/AllProjects.jsx (94%)
 rename client/src/{features => screens}/HomeScreen/screens/CreateNew.tsx (98%)
 rename client/src/{features => screens}/HomeScreen/screens/OpenProject.tsx (96%)
 rename client/src/{features => screens}/HomeScreen/screens/chains/default.ts (100%)
 rename client/src/{features => screens}/HomeScreen/version-banner-0.0.0beta.jpg (100%)
 rename client/src/{features => screens}/Thoth/Thoth.tsx (91%)
 rename client/src/{features => screens}/Thoth/components/EventHandler.tsx (94%)
 rename client/src/{features => screens}/Thoth/thoth.module.css (100%)
 rename client/src/{features => screens}/Thoth/thoth.module.css.d.ts (100%)
 rename client/src/{features/Thoth => workspaces/composer}/components/WindowMessage.jsx (100%)
 rename client/src/{features/Thoth => }/workspaces/composer/index.tsx (72%)
 rename client/src/{features/Thoth => workspaces/composer}/windows/DebugConsole/index.tsx (95%)
 rename client/src/{features/Thoth => workspaces/composer}/windows/EditorWindow/Deployment.tsx (94%)
 rename client/src/{features/Thoth => workspaces/composer}/windows/EditorWindow/editorwindow.module.css (100%)
 rename client/src/{features/Thoth => workspaces/composer}/windows/EditorWindow/editorwindow.module.css.d.ts (100%)
 rename client/src/{features/Thoth => workspaces/composer}/windows/EditorWindow/index.jsx (93%)
 rename client/src/{features/Thoth => workspaces/composer}/windows/InspectorWindow/DataControls/CodeControl.jsx (80%)
 rename client/src/{features/Thoth => workspaces/composer}/windows/InspectorWindow/DataControls/DataControls.jsx (97%)
 rename client/src/{features/Thoth => workspaces/composer}/windows/InspectorWindow/DataControls/DropdownSelect.tsx (92%)
 rename client/src/{features/Thoth => workspaces/composer}/windows/InspectorWindow/DataControls/EnkiSelect.jsx (97%)
 rename client/src/{features/Thoth => workspaces/composer}/windows/InspectorWindow/DataControls/Info.jsx (100%)
 rename client/src/{features/Thoth => workspaces/composer}/windows/InspectorWindow/DataControls/Input.jsx (89%)
 rename client/src/{features/Thoth => workspaces/composer}/windows/InspectorWindow/DataControls/InputGenerator.jsx (100%)
 rename client/src/{features/Thoth => workspaces/composer}/windows/InspectorWindow/DataControls/LongTextControl.jsx (80%)
 rename client/src/{features/Thoth => workspaces/composer}/windows/InspectorWindow/DataControls/ModuleSelect.tsx.bak (100%)
 rename client/src/{features/Thoth => workspaces/composer}/windows/InspectorWindow/DataControls/OutputGenerator.jsx (100%)
 rename client/src/{features/Thoth => workspaces/composer}/windows/InspectorWindow/DataControls/PlaytestControl.tsx (94%)
 rename client/src/{features/Thoth => workspaces/composer}/windows/InspectorWindow/DataControls/SocketGenerator.jsx (100%)
 rename client/src/{features/Thoth => workspaces/composer}/windows/InspectorWindow/DataControls/SwitchControl.tsx (89%)
 rename client/src/{features/Thoth => workspaces/composer}/windows/InspectorWindow/DataControls/datacontrols.module.css (100%)
 rename client/src/{features/Thoth => workspaces/composer}/windows/InspectorWindow/DataControls/datacontrols.module.css.d.ts (100%)
 rename client/src/{features/Thoth => workspaces/composer}/windows/InspectorWindow/DataControls/index.jsx (100%)
 rename client/src/{features/Thoth => workspaces/composer}/windows/InspectorWindow/index.jsx (90%)
 rename client/src/{features/Thoth => workspaces/composer}/windows/PlaytestWindow.jsx (95%)
 rename client/src/{features/Thoth => workspaces/composer}/windows/StateManagerWindow.tsx (97%)
 rename client/src/{features/Thoth => workspaces/composer}/windows/TextEditorWindow.jsx (93%)
 rename client/src/{features/Thoth => workspaces}/contexts/EditorProvider.tsx (93%)
 rename client/src/{features/Thoth => workspaces}/contexts/LayoutProvider.tsx (97%)
 rename client/src/{features/Thoth => workspaces}/contexts/ReteProvider.tsx (94%)
 rename client/src/{features/Thoth => workspaces}/contexts/WorkspaceProvider.jsx (100%)
 rename client/src/{features/Thoth => }/workspaces/index.tsx (94%)

diff --git a/client/src/App.tsx b/client/src/App.tsx
index 2b2cf517e..c5920d86f 100644
--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@@ -1,9 +1,9 @@
 import { Routes, Route, Navigate } from 'react-router-dom'
 
-import RequireAuth from './features/common/RequireAuth/RequireAuth'
-import ThothPageWrapper from './features/common/ThothPage/ThothPageWrapper'
-import HomeScreen from './features/HomeScreen/HomeScreen'
-import Thoth from './features/Thoth/Thoth'
+import RequireAuth from './components/RequireAuth/RequireAuth'
+import ThothPageWrapper from './components/ThothPage/ThothPageWrapper'
+import HomeScreen from './screens/HomeScreen/HomeScreen'
+import Thoth from './screens/Thoth/Thoth'
 import { useAuth } from './contexts/AuthProvider'
 
 import 'flexlayout-react/style/dark.css'
diff --git a/client/src/features/common/Accordion.tsx b/client/src/components/Accordion.tsx
similarity index 100%
rename from client/src/features/common/Accordion.tsx
rename to client/src/components/Accordion.tsx
diff --git a/client/src/features/common/Button/button.module.css b/client/src/components/Button/button.module.css
similarity index 100%
rename from client/src/features/common/Button/button.module.css
rename to client/src/components/Button/button.module.css
diff --git a/client/src/features/common/Chip/Chip.jsx b/client/src/components/Chip/Chip.jsx
similarity index 100%
rename from client/src/features/common/Chip/Chip.jsx
rename to client/src/components/Chip/Chip.jsx
diff --git a/client/src/features/common/Chip/chip.module.css b/client/src/components/Chip/chip.module.css
similarity index 100%
rename from client/src/features/common/Chip/chip.module.css
rename to client/src/components/Chip/chip.module.css
diff --git a/client/src/features/common/Chip/chip.module.css.d.ts b/client/src/components/Chip/chip.module.css.d.ts
similarity index 100%
rename from client/src/features/common/Chip/chip.module.css.d.ts
rename to client/src/components/Chip/chip.module.css.d.ts
diff --git a/client/src/features/common/Icon/Icon.tsx b/client/src/components/Icon/Icon.tsx
similarity index 100%
rename from client/src/features/common/Icon/Icon.tsx
rename to client/src/components/Icon/Icon.tsx
diff --git a/client/src/features/common/Icon/account.svg b/client/src/components/Icon/account.svg
similarity index 100%
rename from client/src/features/common/Icon/account.svg
rename to client/src/components/Icon/account.svg
diff --git a/client/src/features/common/Icon/add.svg b/client/src/components/Icon/add.svg
similarity index 100%
rename from client/src/features/common/Icon/add.svg
rename to client/src/components/Icon/add.svg
diff --git a/client/src/features/common/Icon/ankh.svg b/client/src/components/Icon/ankh.svg
similarity index 100%
rename from client/src/features/common/Icon/ankh.svg
rename to client/src/components/Icon/ankh.svg
diff --git a/client/src/features/common/Icon/bird.svg b/client/src/components/Icon/bird.svg
similarity index 100%
rename from client/src/features/common/Icon/bird.svg
rename to client/src/components/Icon/bird.svg
diff --git a/client/src/features/common/Icon/close.svg b/client/src/components/Icon/close.svg
similarity index 100%
rename from client/src/features/common/Icon/close.svg
rename to client/src/components/Icon/close.svg
diff --git a/client/src/features/common/Icon/cloth.svg b/client/src/components/Icon/cloth.svg
similarity index 100%
rename from client/src/features/common/Icon/cloth.svg
rename to client/src/components/Icon/cloth.svg
diff --git a/client/src/features/common/Icon/cup.svg b/client/src/components/Icon/cup.svg
similarity index 100%
rename from client/src/features/common/Icon/cup.svg
rename to client/src/components/Icon/cup.svg
diff --git a/client/src/features/common/Icon/dangerTrash.svg b/client/src/components/Icon/dangerTrash.svg
similarity index 100%
rename from client/src/features/common/Icon/dangerTrash.svg
rename to client/src/components/Icon/dangerTrash.svg
diff --git a/client/src/features/common/Icon/feathers.svg b/client/src/components/Icon/feathers.svg
similarity index 100%
rename from client/src/features/common/Icon/feathers.svg
rename to client/src/components/Icon/feathers.svg
diff --git a/client/src/features/common/Icon/fewshot.svg b/client/src/components/Icon/fewshot.svg
similarity index 100%
rename from client/src/features/common/Icon/fewshot.svg
rename to client/src/components/Icon/fewshot.svg
diff --git a/client/src/features/common/Icon/folder.svg b/client/src/components/Icon/folder.svg
similarity index 100%
rename from client/src/features/common/Icon/folder.svg
rename to client/src/components/Icon/folder.svg
diff --git a/client/src/features/common/Icon/hand.svg b/client/src/components/Icon/hand.svg
similarity index 100%
rename from client/src/features/common/Icon/hand.svg
rename to client/src/components/Icon/hand.svg
diff --git a/client/src/features/common/Icon/icon.module.css b/client/src/components/Icon/icon.module.css
similarity index 100%
rename from client/src/features/common/Icon/icon.module.css
rename to client/src/components/Icon/icon.module.css
diff --git a/client/src/features/common/Icon/icon.module.css.d.ts b/client/src/components/Icon/icon.module.css.d.ts
similarity index 100%
rename from client/src/features/common/Icon/icon.module.css.d.ts
rename to client/src/components/Icon/icon.module.css.d.ts
diff --git a/client/src/features/common/Icon/info.svg b/client/src/components/Icon/info.svg
similarity index 100%
rename from client/src/features/common/Icon/info.svg
rename to client/src/components/Icon/info.svg
diff --git a/client/src/features/common/Icon/merge.svg b/client/src/components/Icon/merge.svg
similarity index 100%
rename from client/src/features/common/Icon/merge.svg
rename to client/src/components/Icon/merge.svg
diff --git a/client/src/features/common/Icon/minus.svg b/client/src/components/Icon/minus.svg
similarity index 100%
rename from client/src/features/common/Icon/minus.svg
rename to client/src/components/Icon/minus.svg
diff --git a/client/src/features/common/Icon/moon.svg b/client/src/components/Icon/moon.svg
similarity index 100%
rename from client/src/features/common/Icon/moon.svg
rename to client/src/components/Icon/moon.svg
diff --git a/client/src/features/common/Icon/newnode.svg b/client/src/components/Icon/newnode.svg
similarity index 100%
rename from client/src/features/common/Icon/newnode.svg
rename to client/src/components/Icon/newnode.svg
diff --git a/client/src/features/common/Icon/pause.svg b/client/src/components/Icon/pause.svg
similarity index 100%
rename from client/src/features/common/Icon/pause.svg
rename to client/src/components/Icon/pause.svg
diff --git a/client/src/features/common/Icon/person.svg b/client/src/components/Icon/person.svg
similarity index 100%
rename from client/src/features/common/Icon/person.svg
rename to client/src/components/Icon/person.svg
diff --git a/client/src/features/common/Icon/play-print.svg b/client/src/components/Icon/play-print.svg
similarity index 100%
rename from client/src/features/common/Icon/play-print.svg
rename to client/src/components/Icon/play-print.svg
diff --git a/client/src/features/common/Icon/play.svg b/client/src/components/Icon/play.svg
similarity index 100%
rename from client/src/features/common/Icon/play.svg
rename to client/src/components/Icon/play.svg
diff --git a/client/src/features/common/Icon/properties.svg b/client/src/components/Icon/properties.svg
similarity index 100%
rename from client/src/features/common/Icon/properties.svg
rename to client/src/components/Icon/properties.svg
diff --git a/client/src/features/common/Icon/refresh.svg b/client/src/components/Icon/refresh.svg
similarity index 100%
rename from client/src/features/common/Icon/refresh.svg
rename to client/src/components/Icon/refresh.svg
diff --git a/client/src/features/common/Icon/search.svg b/client/src/components/Icon/search.svg
similarity index 100%
rename from client/src/features/common/Icon/search.svg
rename to client/src/components/Icon/search.svg
diff --git a/client/src/features/common/Icon/seive.svg b/client/src/components/Icon/seive.svg
similarity index 100%
rename from client/src/features/common/Icon/seive.svg
rename to client/src/components/Icon/seive.svg
diff --git a/client/src/features/common/Icon/snake.svg b/client/src/components/Icon/snake.svg
similarity index 100%
rename from client/src/features/common/Icon/snake.svg
rename to client/src/components/Icon/snake.svg
diff --git a/client/src/features/common/Icon/state-read.svg b/client/src/components/Icon/state-read.svg
similarity index 100%
rename from client/src/features/common/Icon/state-read.svg
rename to client/src/components/Icon/state-read.svg
diff --git a/client/src/features/common/Icon/state-write.svg b/client/src/components/Icon/state-write.svg
similarity index 100%
rename from client/src/features/common/Icon/state-write.svg
rename to client/src/components/Icon/state-write.svg
diff --git a/client/src/features/common/Icon/state.svg b/client/src/components/Icon/state.svg
similarity index 100%
rename from client/src/features/common/Icon/state.svg
rename to client/src/components/Icon/state.svg
diff --git a/client/src/features/common/Icon/stop-sign.svg b/client/src/components/Icon/stop-sign.svg
similarity index 100%
rename from client/src/features/common/Icon/stop-sign.svg
rename to client/src/components/Icon/stop-sign.svg
diff --git a/client/src/features/common/Icon/stop.svg b/client/src/components/Icon/stop.svg
similarity index 100%
rename from client/src/features/common/Icon/stop.svg
rename to client/src/components/Icon/stop.svg
diff --git a/client/src/features/common/Icon/switch.svg b/client/src/components/Icon/switch.svg
similarity index 100%
rename from client/src/features/common/Icon/switch.svg
rename to client/src/components/Icon/switch.svg
diff --git a/client/src/features/common/Icon/temperature.svg b/client/src/components/Icon/temperature.svg
similarity index 100%
rename from client/src/features/common/Icon/temperature.svg
rename to client/src/components/Icon/temperature.svg
diff --git a/client/src/features/common/Icon/text.svg b/client/src/components/Icon/text.svg
similarity index 100%
rename from client/src/features/common/Icon/text.svg
rename to client/src/components/Icon/text.svg
diff --git a/client/src/features/common/Icon/tiles.svg b/client/src/components/Icon/tiles.svg
similarity index 100%
rename from client/src/features/common/Icon/tiles.svg
rename to client/src/components/Icon/tiles.svg
diff --git a/client/src/features/common/Icon/time.svg b/client/src/components/Icon/time.svg
similarity index 100%
rename from client/src/features/common/Icon/time.svg
rename to client/src/components/Icon/time.svg
diff --git a/client/src/features/common/Icon/trash.svg b/client/src/components/Icon/trash.svg
similarity index 100%
rename from client/src/features/common/Icon/trash.svg
rename to client/src/components/Icon/trash.svg
diff --git a/client/src/features/common/Icon/warn.svg b/client/src/components/Icon/warn.svg
similarity index 100%
rename from client/src/features/common/Icon/warn.svg
rename to client/src/components/Icon/warn.svg
diff --git a/client/src/features/common/Icon/water-play.svg b/client/src/components/Icon/water-play.svg
similarity index 100%
rename from client/src/features/common/Icon/water-play.svg
rename to client/src/components/Icon/water-play.svg
diff --git a/client/src/features/common/Icon/water-run.svg b/client/src/components/Icon/water-run.svg
similarity index 100%
rename from client/src/features/common/Icon/water-run.svg
rename to client/src/components/Icon/water-run.svg
diff --git a/client/src/features/common/Icon/water.svg b/client/src/components/Icon/water.svg
similarity index 100%
rename from client/src/features/common/Icon/water.svg
rename to client/src/components/Icon/water.svg
diff --git a/client/src/features/common/Input/Input.tsx b/client/src/components/Input/Input.tsx
similarity index 100%
rename from client/src/features/common/Input/Input.tsx
rename to client/src/components/Input/Input.tsx
diff --git a/client/src/features/common/Input/input.module.css b/client/src/components/Input/input.module.css
similarity index 100%
rename from client/src/features/common/Input/input.module.css
rename to client/src/components/Input/input.module.css
diff --git a/client/src/features/common/LoadingScreen/LoadingScreen.jsx b/client/src/components/LoadingScreen/LoadingScreen.jsx
similarity index 100%
rename from client/src/features/common/LoadingScreen/LoadingScreen.jsx
rename to client/src/components/LoadingScreen/LoadingScreen.jsx
diff --git a/client/src/features/common/LoadingScreen/ankh.gif b/client/src/components/LoadingScreen/ankh.gif
similarity index 100%
rename from client/src/features/common/LoadingScreen/ankh.gif
rename to client/src/components/LoadingScreen/ankh.gif
diff --git a/client/src/features/common/MenuBar/MenuBar.tsx b/client/src/components/MenuBar/MenuBar.tsx
similarity index 98%
rename from client/src/features/common/MenuBar/MenuBar.tsx
rename to client/src/components/MenuBar/MenuBar.tsx
index 6c0dc9067..069925b3a 100644
--- a/client/src/features/common/MenuBar/MenuBar.tsx
+++ b/client/src/components/MenuBar/MenuBar.tsx
@@ -1,8 +1,8 @@
 import React, { useState, useEffect, useRef } from 'react'
 import { useHotkeys } from 'react-hotkeys-hook'
 
-import { useModal } from '../../../contexts/ModalProvider'
-import { usePubSub } from '../../../contexts/PubSubProvider'
+import { useModal } from '../../contexts/ModalProvider'
+import { usePubSub } from '../../contexts/PubSubProvider'
 import css from './menuBar.module.css'
 import thothlogo from './thoth.png'
 import { useNavigate } from 'react-router-dom'
diff --git a/client/src/features/common/MenuBar/menuBar.module.css b/client/src/components/MenuBar/menuBar.module.css
similarity index 100%
rename from client/src/features/common/MenuBar/menuBar.module.css
rename to client/src/components/MenuBar/menuBar.module.css
diff --git a/client/src/features/common/MenuBar/menuBar.module.css.d.ts b/client/src/components/MenuBar/menuBar.module.css.d.ts
similarity index 100%
rename from client/src/features/common/MenuBar/menuBar.module.css.d.ts
rename to client/src/components/MenuBar/menuBar.module.css.d.ts
diff --git a/client/src/features/common/MenuBar/thoth.png b/client/src/components/MenuBar/thoth.png
similarity index 100%
rename from client/src/features/common/MenuBar/thoth.png
rename to client/src/components/MenuBar/thoth.png
diff --git a/client/src/features/common/Modal/Modal.jsx b/client/src/components/Modal/Modal.jsx
similarity index 96%
rename from client/src/features/common/Modal/Modal.jsx
rename to client/src/components/Modal/Modal.jsx
index 4204aaf1d..6fde2ee5c 100644
--- a/client/src/features/common/Modal/Modal.jsx
+++ b/client/src/components/Modal/Modal.jsx
@@ -1,6 +1,6 @@
 /* eslint-disable jsx-a11y/click-events-have-key-events */
 
-import { useModal } from '../../../contexts/ModalProvider'
+import { useModal } from '../../contexts/ModalProvider'
 import Icon from '../Icon/Icon'
 import css from './modal.module.css'
 
diff --git a/client/src/features/common/Modal/modal.module.css b/client/src/components/Modal/modal.module.css
similarity index 100%
rename from client/src/features/common/Modal/modal.module.css
rename to client/src/components/Modal/modal.module.css
diff --git a/client/src/features/common/Modal/modal.module.css.d.ts b/client/src/components/Modal/modal.module.css.d.ts
similarity index 100%
rename from client/src/features/common/Modal/modal.module.css.d.ts
rename to client/src/components/Modal/modal.module.css.d.ts
diff --git a/client/src/features/common/Modals/DeployModal.jsx b/client/src/components/Modals/DeployModal.jsx
similarity index 95%
rename from client/src/features/common/Modals/DeployModal.jsx
rename to client/src/components/Modals/DeployModal.jsx
index 6e4eeca13..b35be1e50 100644
--- a/client/src/features/common/Modals/DeployModal.jsx
+++ b/client/src/components/Modals/DeployModal.jsx
@@ -1,6 +1,6 @@
 import { SettingsRemoteSharp } from '@material-ui/icons'
 import { useState } from 'react'
-import { useModal } from '../../../contexts/ModalProvider'
+import { useModal } from '../../contexts/ModalProvider'
 import Input from '../Input/Input'
 import Modal from '../Modal/Modal'
 
diff --git a/client/src/features/common/Modals/EditSpellModal.tsx b/client/src/components/Modals/EditSpellModal.tsx
similarity index 97%
rename from client/src/features/common/Modals/EditSpellModal.tsx
rename to client/src/components/Modals/EditSpellModal.tsx
index dccf9ed22..6fa4ce226 100644
--- a/client/src/features/common/Modals/EditSpellModal.tsx
+++ b/client/src/components/Modals/EditSpellModal.tsx
@@ -1,6 +1,6 @@
 import { useState } from 'react'
 import { useSnackbar } from 'notistack'
-import { usePatchSpellMutation } from '../../../state/api/spells'
+import { usePatchSpellMutation } from '../../state/api/spells'
 import { useForm } from 'react-hook-form'
 import Modal from '../Modal/Modal'
 import css from './modalForms.module.css'
diff --git a/client/src/features/common/Modals/ExampleModal.jsx b/client/src/components/Modals/ExampleModal.jsx
similarity index 85%
rename from client/src/features/common/Modals/ExampleModal.jsx
rename to client/src/components/Modals/ExampleModal.jsx
index 9f3441d88..992111bbf 100644
--- a/client/src/features/common/Modals/ExampleModal.jsx
+++ b/client/src/components/Modals/ExampleModal.jsx
@@ -1,4 +1,4 @@
-import { useModal } from '../../../contexts/ModalProvider'
+import { useModal } from '../../contexts/ModalProvider'
 import Modal from '../Modal/Modal'
 
 const ExampleModal = ({ content }) => {
diff --git a/client/src/features/common/Modals/InfoModal.jsx b/client/src/components/Modals/InfoModal.jsx
similarity index 100%
rename from client/src/features/common/Modals/InfoModal.jsx
rename to client/src/components/Modals/InfoModal.jsx
diff --git a/client/src/features/common/Modals/SaveAsModal.tsx b/client/src/components/Modals/SaveAsModal.tsx
similarity index 98%
rename from client/src/features/common/Modals/SaveAsModal.tsx
rename to client/src/components/Modals/SaveAsModal.tsx
index 490523324..12b39cb7d 100644
--- a/client/src/features/common/Modals/SaveAsModal.tsx
+++ b/client/src/components/Modals/SaveAsModal.tsx
@@ -3,7 +3,7 @@ import { useSnackbar } from 'notistack'
 import {
   useGetSpellQuery,
   useSaveSpellMutation,
-} from '../../../state/api/spells'
+} from '../../state/api/spells'
 import { useForm } from 'react-hook-form'
 import Modal from '../Modal/Modal'
 import css from './modalForms.module.css'
diff --git a/client/src/features/common/Modals/index.ts b/client/src/components/Modals/index.ts
similarity index 100%
rename from client/src/features/common/Modals/index.ts
rename to client/src/components/Modals/index.ts
diff --git a/client/src/features/common/Modals/loginModal.module.css.d.ts b/client/src/components/Modals/loginModal.module.css.d.ts
similarity index 100%
rename from client/src/features/common/Modals/loginModal.module.css.d.ts
rename to client/src/components/Modals/loginModal.module.css.d.ts
diff --git a/client/src/features/common/Modals/modalForms.module.css b/client/src/components/Modals/modalForms.module.css
similarity index 100%
rename from client/src/features/common/Modals/modalForms.module.css
rename to client/src/components/Modals/modalForms.module.css
diff --git a/client/src/features/common/Modals/modalForms.module.css.d.ts b/client/src/components/Modals/modalForms.module.css.d.ts
similarity index 100%
rename from client/src/features/common/Modals/modalForms.module.css.d.ts
rename to client/src/components/Modals/modalForms.module.css.d.ts
diff --git a/client/src/features/common/Node/Node.js b/client/src/components/Node/Node.js
similarity index 100%
rename from client/src/features/common/Node/Node.js
rename to client/src/components/Node/Node.js
diff --git a/client/src/features/common/Node/Node.module.css b/client/src/components/Node/Node.module.css
similarity index 100%
rename from client/src/features/common/Node/Node.module.css
rename to client/src/components/Node/Node.module.css
diff --git a/client/src/features/common/Node/Node.module.css.d.ts b/client/src/components/Node/Node.module.css.d.ts
similarity index 100%
rename from client/src/features/common/Node/Node.module.css.d.ts
rename to client/src/components/Node/Node.module.css.d.ts
diff --git a/client/src/features/common/Panel/Panel.tsx b/client/src/components/Panel/Panel.tsx
similarity index 100%
rename from client/src/features/common/Panel/Panel.tsx
rename to client/src/components/Panel/Panel.tsx
diff --git a/client/src/features/common/Panel/panel.module.css b/client/src/components/Panel/panel.module.css
similarity index 100%
rename from client/src/features/common/Panel/panel.module.css
rename to client/src/components/Panel/panel.module.css
diff --git a/client/src/features/common/Panel/panel.module.css.d.ts b/client/src/components/Panel/panel.module.css.d.ts
similarity index 100%
rename from client/src/features/common/Panel/panel.module.css.d.ts
rename to client/src/components/Panel/panel.module.css.d.ts
diff --git a/client/src/features/common/RequireAuth/RequireAuth.tsx b/client/src/components/RequireAuth/RequireAuth.tsx
similarity index 91%
rename from client/src/features/common/RequireAuth/RequireAuth.tsx
rename to client/src/components/RequireAuth/RequireAuth.tsx
index e4e3a26e8..d214f2cbc 100644
--- a/client/src/features/common/RequireAuth/RequireAuth.tsx
+++ b/client/src/components/RequireAuth/RequireAuth.tsx
@@ -1,5 +1,5 @@
 import { Outlet } from 'react-router-dom'
-import { useAuth } from '../../../contexts/AuthProvider'
+import { useAuth } from '../../contexts/AuthProvider'
 
 const defaultGroups = ['internal', 'thoth', 'creator-tester']
 
diff --git a/client/src/features/common/Select/Select.jsx b/client/src/components/Select/Select.jsx
similarity index 100%
rename from client/src/features/common/Select/Select.jsx
rename to client/src/components/Select/Select.jsx
diff --git a/client/src/features/common/Select/select.module.css b/client/src/components/Select/select.module.css
similarity index 100%
rename from client/src/features/common/Select/select.module.css
rename to client/src/components/Select/select.module.css
diff --git a/client/src/features/common/Select/select.module.css.d.ts b/client/src/components/Select/select.module.css.d.ts
similarity index 100%
rename from client/src/features/common/Select/select.module.css.d.ts
rename to client/src/components/Select/select.module.css.d.ts
diff --git a/client/src/features/common/Switch/Switch.tsx b/client/src/components/Switch/Switch.tsx
similarity index 100%
rename from client/src/features/common/Switch/Switch.tsx
rename to client/src/components/Switch/Switch.tsx
diff --git a/client/src/features/common/TabBar/TabBar.tsx b/client/src/components/TabBar/TabBar.tsx
similarity index 100%
rename from client/src/features/common/TabBar/TabBar.tsx
rename to client/src/components/TabBar/TabBar.tsx
diff --git a/client/src/features/common/TabBar/tabBar.module.css b/client/src/components/TabBar/tabBar.module.css
similarity index 100%
rename from client/src/features/common/TabBar/tabBar.module.css
rename to client/src/components/TabBar/tabBar.module.css
diff --git a/client/src/features/common/TabBar/tabBar.module.css.d.ts b/client/src/components/TabBar/tabBar.module.css.d.ts
similarity index 100%
rename from client/src/features/common/TabBar/tabBar.module.css.d.ts
rename to client/src/components/TabBar/tabBar.module.css.d.ts
diff --git a/client/src/features/common/TabLayout/TabLayout.jsx b/client/src/components/TabLayout/TabLayout.jsx
similarity index 100%
rename from client/src/features/common/TabLayout/TabLayout.jsx
rename to client/src/components/TabLayout/TabLayout.jsx
diff --git a/client/src/features/common/TabLayout/TabLayout.module.css b/client/src/components/TabLayout/TabLayout.module.css
similarity index 100%
rename from client/src/features/common/TabLayout/TabLayout.module.css
rename to client/src/components/TabLayout/TabLayout.module.css
diff --git a/client/src/features/common/TabLayout/TabLayout.module.css.d.ts b/client/src/components/TabLayout/TabLayout.module.css.d.ts
similarity index 100%
rename from client/src/features/common/TabLayout/TabLayout.module.css.d.ts
rename to client/src/components/TabLayout/TabLayout.module.css.d.ts
diff --git a/client/src/features/common/ThothPage/ThothPageWrapper.tsx b/client/src/components/ThothPage/ThothPageWrapper.tsx
similarity index 85%
rename from client/src/features/common/ThothPage/ThothPageWrapper.tsx
rename to client/src/components/ThothPage/ThothPageWrapper.tsx
index 7e2a41795..7b8081cc4 100644
--- a/client/src/features/common/ThothPage/ThothPageWrapper.tsx
+++ b/client/src/components/ThothPage/ThothPageWrapper.tsx
@@ -1,4 +1,4 @@
-import ModalProvider from '../../../contexts/ModalProvider'
+import ModalProvider from '../../contexts/ModalProvider'
 import TabBar from '../TabBar/TabBar'
 import css from './pagewrapper.module.css'
 
diff --git a/client/src/features/common/ThothPage/pagewrapper.module.css b/client/src/components/ThothPage/pagewrapper.module.css
similarity index 100%
rename from client/src/features/common/ThothPage/pagewrapper.module.css
rename to client/src/components/ThothPage/pagewrapper.module.css
diff --git a/client/src/features/common/ThothPage/pagewrapper.module.css.d.ts b/client/src/components/ThothPage/pagewrapper.module.css.d.ts
similarity index 100%
rename from client/src/features/common/ThothPage/pagewrapper.module.css.d.ts
rename to client/src/components/ThothPage/pagewrapper.module.css.d.ts
diff --git a/client/src/features/common/Toolbar/Toolbar.tsx b/client/src/components/Toolbar/Toolbar.tsx
similarity index 100%
rename from client/src/features/common/Toolbar/Toolbar.tsx
rename to client/src/components/Toolbar/Toolbar.tsx
diff --git a/client/src/features/common/Toolbar/toolbar.module.css b/client/src/components/Toolbar/toolbar.module.css
similarity index 100%
rename from client/src/features/common/Toolbar/toolbar.module.css
rename to client/src/components/Toolbar/toolbar.module.css
diff --git a/client/src/features/common/Window/Window.tsx b/client/src/components/Window/Window.tsx
similarity index 100%
rename from client/src/features/common/Window/Window.tsx
rename to client/src/components/Window/Window.tsx
diff --git a/client/src/features/common/Window/WindowToolbar.tsx b/client/src/components/Window/WindowToolbar.tsx
similarity index 100%
rename from client/src/features/common/Window/WindowToolbar.tsx
rename to client/src/components/Window/WindowToolbar.tsx
diff --git a/client/src/features/common/Window/window.module.css b/client/src/components/Window/window.module.css
similarity index 95%
rename from client/src/features/common/Window/window.module.css
rename to client/src/components/Window/window.module.css
index c0d3c564e..9bbc790ca 100644
--- a/client/src/features/common/Window/window.module.css
+++ b/client/src/components/Window/window.module.css
@@ -15,7 +15,7 @@
   background-color: var(--dark-1);
 }
 .window.grid .window-layout {
-  background-image: url('../../../grid.png');
+  background-image: url('../../grid.png');
   background-color: var(--dark-1);
 }
 .window-layout {
diff --git a/client/src/features/common/Window/window.module.css.d.ts b/client/src/components/Window/window.module.css.d.ts
similarity index 100%
rename from client/src/features/common/Window/window.module.css.d.ts
rename to client/src/components/Window/window.module.css.d.ts
diff --git a/client/src/features/common/accordion-overrides.css b/client/src/components/accordion-overrides.css
similarity index 100%
rename from client/src/features/common/accordion-overrides.css
rename to client/src/components/accordion-overrides.css
diff --git a/client/src/features/common/accordion-overrides.css.d.ts b/client/src/components/accordion-overrides.css.d.ts
similarity index 100%
rename from client/src/features/common/accordion-overrides.css.d.ts
rename to client/src/components/accordion-overrides.css.d.ts
diff --git a/client/src/features/common/accordion.module.css b/client/src/components/accordion.module.css
similarity index 100%
rename from client/src/features/common/accordion.module.css
rename to client/src/components/accordion.module.css
diff --git a/client/src/features/common/accordion.module.css.d.ts b/client/src/components/accordion.module.css.d.ts
similarity index 100%
rename from client/src/features/common/accordion.module.css.d.ts
rename to client/src/components/accordion.module.css.d.ts
diff --git a/client/src/features/common/z. Don't use/TextInput/TextInput.tsx b/client/src/components/z. Don't use/TextInput/TextInput.tsx
similarity index 100%
rename from client/src/features/common/z. Don't use/TextInput/TextInput.tsx
rename to client/src/components/z. Don't use/TextInput/TextInput.tsx
diff --git a/client/src/features/common/z. Don't use/TextInput/textinput.module.css b/client/src/components/z. Don't use/TextInput/textinput.module.css
similarity index 100%
rename from client/src/features/common/z. Don't use/TextInput/textinput.module.css
rename to client/src/components/z. Don't use/TextInput/textinput.module.css
diff --git a/client/src/contexts/AuthProvider.tsx b/client/src/contexts/AuthProvider.tsx
index a619247e7..1d9309e34 100644
--- a/client/src/contexts/AuthProvider.tsx
+++ b/client/src/contexts/AuthProvider.tsx
@@ -11,7 +11,7 @@ import { useQuery } from '../hooks/useQuery'
 import { useLocation } from 'react-router-dom'
 import { oAuthClientId, latitudeApiRootUrl, appRootUrl } from '../config'
 import { callExpire } from '../helpers/Expire'
-import LoadingScreen from '../features/common/LoadingScreen/LoadingScreen'
+import LoadingScreen from '../components/LoadingScreen/LoadingScreen'
 
 interface SessionInfoType {
   id: number
diff --git a/client/src/contexts/ModalProvider.jsx b/client/src/contexts/ModalProvider.jsx
index 82ce2df53..1ffcd1d04 100644
--- a/client/src/contexts/ModalProvider.jsx
+++ b/client/src/contexts/ModalProvider.jsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react'
 
-import { getModals } from '../features/common/Modals'
+import { getModals } from '../components/Modals'
 
 const Context = React.createContext({
   activeModal: '',
diff --git a/client/src/features/HomeScreen/HomeScreen.tsx b/client/src/screens/HomeScreen/HomeScreen.tsx
similarity index 97%
rename from client/src/features/HomeScreen/HomeScreen.tsx
rename to client/src/screens/HomeScreen/HomeScreen.tsx
index 786bafb8c..ada04aef3 100644
--- a/client/src/features/HomeScreen/HomeScreen.tsx
+++ b/client/src/screens/HomeScreen/HomeScreen.tsx
@@ -10,7 +10,7 @@ import AllProjects from './screens/AllProjects'
 import CreateNew from './screens/CreateNew'
 import OpenProject from './screens/OpenProject'
 import css from './homeScreen.module.css'
-import LoadingScreen from '../common/LoadingScreen/LoadingScreen'
+import LoadingScreen from '../../components/LoadingScreen/LoadingScreen'
 import { closeTab, openTab } from '@/state/tabs'
 import { useDispatch } from 'react-redux'
 
diff --git a/client/src/features/HomeScreen/components/FileInput.jsx b/client/src/screens/HomeScreen/components/FileInput.jsx
similarity index 92%
rename from client/src/features/HomeScreen/components/FileInput.jsx
rename to client/src/screens/HomeScreen/components/FileInput.jsx
index dd2b73e43..edf7cc4a1 100644
--- a/client/src/features/HomeScreen/components/FileInput.jsx
+++ b/client/src/screens/HomeScreen/components/FileInput.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 
-import Icon from '../../common/Icon/Icon'
+import Icon from '../../../components/Icon/Icon'
 
 const FileInput = ({ loadFile }) => {
   const hiddenFileInput = React.useRef(null)
diff --git a/client/src/features/HomeScreen/components/ProjectRow.tsx b/client/src/screens/HomeScreen/components/ProjectRow.tsx
similarity index 95%
rename from client/src/features/HomeScreen/components/ProjectRow.tsx
rename to client/src/screens/HomeScreen/components/ProjectRow.tsx
index 0193ad26a..afdcf78c3 100644
--- a/client/src/features/HomeScreen/components/ProjectRow.tsx
+++ b/client/src/screens/HomeScreen/components/ProjectRow.tsx
@@ -1,6 +1,6 @@
 import { Spell } from '@/state/api/spells'
 import { CSSProperties } from 'react'
-import Icon from '../../common/Icon/Icon'
+import Icon from '../../../components/Icon/Icon'
 import css from '../homeScreen.module.css'
 
 type ProjectProps = {
diff --git a/client/src/features/HomeScreen/components/TemplatePanel.jsx b/client/src/screens/HomeScreen/components/TemplatePanel.jsx
similarity index 93%
rename from client/src/features/HomeScreen/components/TemplatePanel.jsx
rename to client/src/screens/HomeScreen/components/TemplatePanel.jsx
index 294c3d73d..eee6238a9 100644
--- a/client/src/features/HomeScreen/components/TemplatePanel.jsx
+++ b/client/src/screens/HomeScreen/components/TemplatePanel.jsx
@@ -1,4 +1,4 @@
-import Panel from '../../common/Panel/Panel'
+import Panel from '../../../components/Panel/Panel'
 import css from '../homeScreen.module.css'
 
 const TemplatePanel = ({ template, setSelectedTemplate, selectedTemplate }) => {
diff --git a/client/src/features/HomeScreen/empty.png b/client/src/screens/HomeScreen/empty.png
similarity index 100%
rename from client/src/features/HomeScreen/empty.png
rename to client/src/screens/HomeScreen/empty.png
diff --git a/client/src/features/HomeScreen/enki.png b/client/src/screens/HomeScreen/enki.png
similarity index 100%
rename from client/src/features/HomeScreen/enki.png
rename to client/src/screens/HomeScreen/enki.png
diff --git a/client/src/features/HomeScreen/homeScreen.module.css b/client/src/screens/HomeScreen/homeScreen.module.css
similarity index 100%
rename from client/src/features/HomeScreen/homeScreen.module.css
rename to client/src/screens/HomeScreen/homeScreen.module.css
diff --git a/client/src/features/HomeScreen/homeScreen.module.css.d.ts b/client/src/screens/HomeScreen/homeScreen.module.css.d.ts
similarity index 100%
rename from client/src/features/HomeScreen/homeScreen.module.css.d.ts
rename to client/src/screens/HomeScreen/homeScreen.module.css.d.ts
diff --git a/client/src/features/HomeScreen/lang.png b/client/src/screens/HomeScreen/lang.png
similarity index 100%
rename from client/src/features/HomeScreen/lang.png
rename to client/src/screens/HomeScreen/lang.png
diff --git a/client/src/features/HomeScreen/screens/AllProjects.jsx b/client/src/screens/HomeScreen/screens/AllProjects.jsx
similarity index 94%
rename from client/src/features/HomeScreen/screens/AllProjects.jsx
rename to client/src/screens/HomeScreen/screens/AllProjects.jsx
index e3b924966..d31524c22 100644
--- a/client/src/features/HomeScreen/screens/AllProjects.jsx
+++ b/client/src/screens/HomeScreen/screens/AllProjects.jsx
@@ -1,7 +1,7 @@
 import { Scrollbars } from 'react-custom-scrollbars-2'
 
-import Icon from '../../common/Icon/Icon'
-import Panel from '../../common/Panel/Panel'
+import Icon from '../../../components/Icon/Icon'
+import Panel from '../../../components/Panel/Panel'
 import css from '../homeScreen.module.css'
 import FileInput from '../components/FileInput'
 import ProjectRow from '../components/ProjectRow'
diff --git a/client/src/features/HomeScreen/screens/CreateNew.tsx b/client/src/screens/HomeScreen/screens/CreateNew.tsx
similarity index 98%
rename from client/src/features/HomeScreen/screens/CreateNew.tsx
rename to client/src/screens/HomeScreen/screens/CreateNew.tsx
index 07cff15d9..09e20ce29 100644
--- a/client/src/features/HomeScreen/screens/CreateNew.tsx
+++ b/client/src/screens/HomeScreen/screens/CreateNew.tsx
@@ -9,7 +9,7 @@ import {
 import { useNavigate } from 'react-router-dom'
 
 import { useNewSpellMutation } from '@/state/api/spells'
-import Panel from '@common/Panel/Panel'
+import Panel from '../../../components/Panel/Panel'
 import emptyImg from '../empty.png'
 import enkiImg from '../enki.png'
 import langImg from '../lang.png'
diff --git a/client/src/features/HomeScreen/screens/OpenProject.tsx b/client/src/screens/HomeScreen/screens/OpenProject.tsx
similarity index 96%
rename from client/src/features/HomeScreen/screens/OpenProject.tsx
rename to client/src/screens/HomeScreen/screens/OpenProject.tsx
index d09f7e994..8ee7a4737 100644
--- a/client/src/features/HomeScreen/screens/OpenProject.tsx
+++ b/client/src/screens/HomeScreen/screens/OpenProject.tsx
@@ -1,7 +1,7 @@
 import { useNavigate } from 'react-router-dom'
 
-import Icon from '../../common/Icon/Icon'
-import Panel from '../../common/Panel/Panel'
+import Icon from '../../../components/Icon/Icon'
+import Panel from '../../../components/Panel/Panel'
 import css from '../homeScreen.module.css'
 import thothBanner from '../version-banner-0.0.0beta.jpg'
 import FileInput from '../components/FileInput'
diff --git a/client/src/features/HomeScreen/screens/chains/default.ts b/client/src/screens/HomeScreen/screens/chains/default.ts
similarity index 100%
rename from client/src/features/HomeScreen/screens/chains/default.ts
rename to client/src/screens/HomeScreen/screens/chains/default.ts
diff --git a/client/src/features/HomeScreen/version-banner-0.0.0beta.jpg b/client/src/screens/HomeScreen/version-banner-0.0.0beta.jpg
similarity index 100%
rename from client/src/features/HomeScreen/version-banner-0.0.0beta.jpg
rename to client/src/screens/HomeScreen/version-banner-0.0.0beta.jpg
diff --git a/client/src/features/Thoth/Thoth.tsx b/client/src/screens/Thoth/Thoth.tsx
similarity index 91%
rename from client/src/features/Thoth/Thoth.tsx
rename to client/src/screens/Thoth/Thoth.tsx
index edf0a8fb2..8fb65a6df 100644
--- a/client/src/features/Thoth/Thoth.tsx
+++ b/client/src/screens/Thoth/Thoth.tsx
@@ -6,9 +6,9 @@ import { useDispatch, useSelector } from 'react-redux'
 import { useNavigate, useParams } from 'react-router-dom'
 
 import { usePubSub } from '../../contexts/PubSubProvider'
-import LoadingScreen from '../common/LoadingScreen/LoadingScreen'
-import TabLayout from '../common/TabLayout/TabLayout'
-import Workspaces from './workspaces'
+import LoadingScreen from '../../components/LoadingScreen/LoadingScreen'
+import TabLayout from '../../components/TabLayout/TabLayout'
+import Workspaces from '../../workspaces'
 
 const Thoth = ({ empty = false }) => {
   const dispatch = useDispatch()
diff --git a/client/src/features/Thoth/components/EventHandler.tsx b/client/src/screens/Thoth/components/EventHandler.tsx
similarity index 94%
rename from client/src/features/Thoth/components/EventHandler.tsx
rename to client/src/screens/Thoth/components/EventHandler.tsx
index 5e6d5fd68..0024e8998 100644
--- a/client/src/features/Thoth/components/EventHandler.tsx
+++ b/client/src/screens/Thoth/components/EventHandler.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useRef } from 'react'
-import { ChainData } from '@latitudegames/thoth-core/types'
+import { ChainData } from '@latitudegames/thoth-core/dist/types'
 
 import {
   uniqueNamesGenerator,
@@ -12,8 +12,8 @@ import {
   useGetSpellQuery,
   Spell,
 } from '../../../state/api/spells'
-import { useEditor } from '../contexts/EditorProvider'
-import { useLayout } from '../contexts/LayoutProvider'
+import { useEditor } from '../../../workspaces/contexts/EditorProvider'
+import { useLayout } from '../../../workspaces/contexts/LayoutProvider'
 
 // Config for unique name generator
 const customConfig = {
diff --git a/client/src/features/Thoth/thoth.module.css b/client/src/screens/Thoth/thoth.module.css
similarity index 100%
rename from client/src/features/Thoth/thoth.module.css
rename to client/src/screens/Thoth/thoth.module.css
diff --git a/client/src/features/Thoth/thoth.module.css.d.ts b/client/src/screens/Thoth/thoth.module.css.d.ts
similarity index 100%
rename from client/src/features/Thoth/thoth.module.css.d.ts
rename to client/src/screens/Thoth/thoth.module.css.d.ts
diff --git a/client/src/services/Modals.ts b/client/src/services/Modals.ts
index ae562220b..122a1d5ec 100644
--- a/client/src/services/Modals.ts
+++ b/client/src/services/Modals.ts
@@ -1,5 +1,5 @@
-import ExampleModal from '../features/common/Modals/ExampleModal'
-import InfoModal from '../features/common/Modals/InfoModal'
+import ExampleModal from '../components/Modals/ExampleModal'
+import InfoModal from '../components/Modals/InfoModal'
 
 const modals = { example: ExampleModal, infoModal: InfoModal }
 
diff --git a/client/src/features/Thoth/components/WindowMessage.jsx b/client/src/workspaces/composer/components/WindowMessage.jsx
similarity index 100%
rename from client/src/features/Thoth/components/WindowMessage.jsx
rename to client/src/workspaces/composer/components/WindowMessage.jsx
diff --git a/client/src/features/Thoth/workspaces/composer/index.tsx b/client/src/workspaces/composer/index.tsx
similarity index 72%
rename from client/src/features/Thoth/workspaces/composer/index.tsx
rename to client/src/workspaces/composer/index.tsx
index 8c79940ec..4678101fe 100644
--- a/client/src/features/Thoth/workspaces/composer/index.tsx
+++ b/client/src/workspaces/composer/index.tsx
@@ -1,17 +1,17 @@
 import { useEffect, useRef } from 'react'
 
-import { useEditor } from '@thoth/contexts/EditorProvider'
-import { Layout } from '@thoth/contexts/LayoutProvider'
+import { useEditor } from '@/workspaces/contexts/EditorProvider'
+import { Layout } from '@/workspaces/contexts/LayoutProvider'
 import { useLazyGetSpellQuery, useSaveSpellMutation } from '@/state/api/spells'
-import { debounce } from '@/utils/debounce'
-import EditorWindow from '@thoth/windows/EditorWindow'
-import EventHandler from '@thoth/components/EventHandler'
-import Inspector from '@thoth/windows/InspectorWindow'
-import Playtest from '@thoth/windows/PlaytestWindow'
-import StateManager from '@thoth/windows/StateManagerWindow'
-import TextEditor from '@thoth/windows/TextEditorWindow'
-import DebugConsole from '@thoth/windows/DebugConsole'
-import { Spell } from '../../../../state/api/spells'
+import { debounce } from 'client/src/utils/debounce'
+import EditorWindow from 'client/Thoth/windows/EditorWindow'
+import EventHandler from '@/screens/Thoth/components/EventHandler'
+import Inspector from 'client/Thoth/windows/InspectorWindow'
+import Playtest from 'client/Thoth/windows/PlaytestWindow'
+import StateManager from '@/workspaces/composer/windows/StateManagerWindow'
+import TextEditor from 'client/Thoth/windows/TextEditorWindow'
+import DebugConsole from 'client/Thoth/windows/DebugConsole'
+import { Spell } from '../../state/api/spells'
 
 const Workspace = ({ tab, tabs, pubSub }) => {
   const spellRef = useRef<Spell>()
diff --git a/client/src/features/Thoth/windows/DebugConsole/index.tsx b/client/src/workspaces/composer/windows/DebugConsole/index.tsx
similarity index 95%
rename from client/src/features/Thoth/windows/DebugConsole/index.tsx
rename to client/src/workspaces/composer/windows/DebugConsole/index.tsx
index 39a8af5c9..3f99bcf12 100644
--- a/client/src/features/Thoth/windows/DebugConsole/index.tsx
+++ b/client/src/workspaces/composer/windows/DebugConsole/index.tsx
@@ -2,8 +2,8 @@ import { useCallback, useEffect, useRef, useState } from 'react'
 import { renderToString } from 'react-dom/server'
 import Terminal from 'react-console-emulator'
 import { useAuth } from '@/contexts/AuthProvider'
-import { usePubSub } from '@/contexts/PubSubProvider'
-import Window from '@/features/common/Window/Window'
+import { usePubSub } from 'client/src/contexts/PubSubProvider'
+import Window from '@/../../../../../components/Window/Window'
 
 export type DebugMessage = {
   message: string
diff --git a/client/src/features/Thoth/windows/EditorWindow/Deployment.tsx b/client/src/workspaces/composer/windows/EditorWindow/Deployment.tsx
similarity index 94%
rename from client/src/features/Thoth/windows/EditorWindow/Deployment.tsx
rename to client/src/workspaces/composer/windows/EditorWindow/Deployment.tsx
index 62e8e8edb..1e2345547 100644
--- a/client/src/features/Thoth/windows/EditorWindow/Deployment.tsx
+++ b/client/src/workspaces/composer/windows/EditorWindow/Deployment.tsx
@@ -4,11 +4,11 @@ import { useSnackbar } from 'notistack'
 
 import css from './editorwindow.module.css'
 
-import WindowToolbar from '@common/Window/WindowToolbar'
-import { SimpleAccordion } from '@common/Accordion'
-import Input from '@common/Input/Input'
-import Panel from '@common/Panel/Panel'
-import { useModal } from '@/contexts/ModalProvider'
+import WindowToolbar from '../../../../components/Window/WindowToolbar'
+import { SimpleAccordion } from '../../../../components/Accordion'
+import Input from '../../../../components/Input/Input'
+import Panel from '../../../../components/Panel/Panel'
+import { useModal } from 'client/src/contexts/ModalProvider'
 
 import {
   useGetDeploymentsQuery,
@@ -17,7 +17,7 @@ import {
   useSaveSpellMutation,
   useGetSpellQuery,
 } from '@/state/api/spells'
-import { useEditor } from '@thoth/contexts/EditorProvider'
+import { useEditor } from '@/workspaces/contexts/EditorProvider'
 import { latitudeApiRootUrl } from '@/config'
 
 const DeploymentView = ({ open, setOpen, spellId, close }) => {
diff --git a/client/src/features/Thoth/windows/EditorWindow/editorwindow.module.css b/client/src/workspaces/composer/windows/EditorWindow/editorwindow.module.css
similarity index 100%
rename from client/src/features/Thoth/windows/EditorWindow/editorwindow.module.css
rename to client/src/workspaces/composer/windows/EditorWindow/editorwindow.module.css
diff --git a/client/src/features/Thoth/windows/EditorWindow/editorwindow.module.css.d.ts b/client/src/workspaces/composer/windows/EditorWindow/editorwindow.module.css.d.ts
similarity index 100%
rename from client/src/features/Thoth/windows/EditorWindow/editorwindow.module.css.d.ts
rename to client/src/workspaces/composer/windows/EditorWindow/editorwindow.module.css.d.ts
diff --git a/client/src/features/Thoth/windows/EditorWindow/index.jsx b/client/src/workspaces/composer/windows/EditorWindow/index.jsx
similarity index 93%
rename from client/src/features/Thoth/windows/EditorWindow/index.jsx
rename to client/src/workspaces/composer/windows/EditorWindow/index.jsx
index b75c329e8..582d9b912 100644
--- a/client/src/features/Thoth/windows/EditorWindow/index.jsx
+++ b/client/src/workspaces/composer/windows/EditorWindow/index.jsx
@@ -1,10 +1,10 @@
 import { useState, useEffect } from 'react'
 import { createNode } from 'rete-context-menu-plugin/src/utils'
 
-import WindowToolbar from '@/features/common/Window/WindowToolbar'
-import { Editor, useEditor } from '../../contexts/EditorProvider'
+import WindowToolbar from '@/../../../../../components/Window/WindowToolbar'
+import { Editor, useEditor } from '../../../contexts/EditorProvider'
 import Deployment from './Deployment'
-import Select from '../../../common/Select/Select'
+import Select from '../../../../components/Select/Select'
 import css from './editorwindow.module.css'
 
 const EditorWindow = ({ tab }) => {
diff --git a/client/src/features/Thoth/windows/InspectorWindow/DataControls/CodeControl.jsx b/client/src/workspaces/composer/windows/InspectorWindow/DataControls/CodeControl.jsx
similarity index 80%
rename from client/src/features/Thoth/windows/InspectorWindow/DataControls/CodeControl.jsx
rename to client/src/workspaces/composer/windows/InspectorWindow/DataControls/CodeControl.jsx
index 438f7c517..04d369863 100644
--- a/client/src/features/Thoth/windows/InspectorWindow/DataControls/CodeControl.jsx
+++ b/client/src/workspaces/composer/windows/InspectorWindow/DataControls/CodeControl.jsx
@@ -1,4 +1,4 @@
-import { useLayout } from '@thoth/contexts/LayoutProvider'
+import { useLayout } from '../../../../contexts/LayoutProvider'
 
 const CodeControl = () => {
   const { createOrFocus, windowTypes } = useLayout()
diff --git a/client/src/features/Thoth/windows/InspectorWindow/DataControls/DataControls.jsx b/client/src/workspaces/composer/windows/InspectorWindow/DataControls/DataControls.jsx
similarity index 97%
rename from client/src/features/Thoth/windows/InspectorWindow/DataControls/DataControls.jsx
rename to client/src/workspaces/composer/windows/InspectorWindow/DataControls/DataControls.jsx
index 207112ea4..fe02f885e 100644
--- a/client/src/features/Thoth/windows/InspectorWindow/DataControls/DataControls.jsx
+++ b/client/src/workspaces/composer/windows/InspectorWindow/DataControls/DataControls.jsx
@@ -1,4 +1,4 @@
-import { SimpleAccordion } from '../../../../common/Accordion'
+import { SimpleAccordion } from '../../../../../components/Accordion'
 import CodeControl from './CodeControl'
 import css from './datacontrols.module.css'
 import EnkiSelect from './EnkiSelect'
diff --git a/client/src/features/Thoth/windows/InspectorWindow/DataControls/DropdownSelect.tsx b/client/src/workspaces/composer/windows/InspectorWindow/DataControls/DropdownSelect.tsx
similarity index 92%
rename from client/src/features/Thoth/windows/InspectorWindow/DataControls/DropdownSelect.tsx
rename to client/src/workspaces/composer/windows/InspectorWindow/DataControls/DropdownSelect.tsx
index d798a2d82..c387ec600 100644
--- a/client/src/features/Thoth/windows/InspectorWindow/DataControls/DropdownSelect.tsx
+++ b/client/src/workspaces/composer/windows/InspectorWindow/DataControls/DropdownSelect.tsx
@@ -1,4 +1,4 @@
-import Select from '../../../../common/Select/Select'
+import Select from '../../../../../components/Select/Select'
 
 const DropdownSelect = ({ control, updateData, initialValue }) => {
   const { dataKey, data } = control
diff --git a/client/src/features/Thoth/windows/InspectorWindow/DataControls/EnkiSelect.jsx b/client/src/workspaces/composer/windows/InspectorWindow/DataControls/EnkiSelect.jsx
similarity index 97%
rename from client/src/features/Thoth/windows/InspectorWindow/DataControls/EnkiSelect.jsx
rename to client/src/workspaces/composer/windows/InspectorWindow/DataControls/EnkiSelect.jsx
index 8c9eb1dcd..5e9ab96fe 100644
--- a/client/src/features/Thoth/windows/InspectorWindow/DataControls/EnkiSelect.jsx
+++ b/client/src/workspaces/composer/windows/InspectorWindow/DataControls/EnkiSelect.jsx
@@ -1,8 +1,8 @@
 import { useState, useEffect } from 'react'
 
 import { getEnkiPrompt, getEnkis } from '../../../../../services/game-api/enki'
-import Chip from '../../../../common/Chip/Chip'
-import Select from '../../../../common/Select/Select'
+import Chip from '../../../../../components/Chip/Chip'
+import Select from '../../../../../components/Select/Select'
 
 const EnkiDetails = ({ initialTask, addThroughput, update }) => {
   const [activeEnki, selectEnki] = useState(initialTask)
diff --git a/client/src/features/Thoth/windows/InspectorWindow/DataControls/Info.jsx b/client/src/workspaces/composer/windows/InspectorWindow/DataControls/Info.jsx
similarity index 100%
rename from client/src/features/Thoth/windows/InspectorWindow/DataControls/Info.jsx
rename to client/src/workspaces/composer/windows/InspectorWindow/DataControls/Info.jsx
diff --git a/client/src/features/Thoth/windows/InspectorWindow/DataControls/Input.jsx b/client/src/workspaces/composer/windows/InspectorWindow/DataControls/Input.jsx
similarity index 89%
rename from client/src/features/Thoth/windows/InspectorWindow/DataControls/Input.jsx
rename to client/src/workspaces/composer/windows/InspectorWindow/DataControls/Input.jsx
index 150c01370..b07bed7a8 100644
--- a/client/src/features/Thoth/windows/InspectorWindow/DataControls/Input.jsx
+++ b/client/src/workspaces/composer/windows/InspectorWindow/DataControls/Input.jsx
@@ -1,6 +1,6 @@
 import { useState } from 'react'
 
-import InputComponent from '../../../../common/Input/Input'
+import InputComponent from '../../../../../components/Input/Input'
 
 const Input = ({ control, updateData, initialValue }) => {
   const [value, setValue] = useState(initialValue)
diff --git a/client/src/features/Thoth/windows/InspectorWindow/DataControls/InputGenerator.jsx b/client/src/workspaces/composer/windows/InspectorWindow/DataControls/InputGenerator.jsx
similarity index 100%
rename from client/src/features/Thoth/windows/InspectorWindow/DataControls/InputGenerator.jsx
rename to client/src/workspaces/composer/windows/InspectorWindow/DataControls/InputGenerator.jsx
diff --git a/client/src/features/Thoth/windows/InspectorWindow/DataControls/LongTextControl.jsx b/client/src/workspaces/composer/windows/InspectorWindow/DataControls/LongTextControl.jsx
similarity index 80%
rename from client/src/features/Thoth/windows/InspectorWindow/DataControls/LongTextControl.jsx
rename to client/src/workspaces/composer/windows/InspectorWindow/DataControls/LongTextControl.jsx
index b3a6cc396..a3895f954 100644
--- a/client/src/features/Thoth/windows/InspectorWindow/DataControls/LongTextControl.jsx
+++ b/client/src/workspaces/composer/windows/InspectorWindow/DataControls/LongTextControl.jsx
@@ -1,4 +1,4 @@
-import { useLayout } from '@thoth/contexts/LayoutProvider'
+import { useLayout } from '../../../../contexts/LayoutProvider'
 
 const LongText = () => {
   const { createOrFocus, windowTypes } = useLayout()
diff --git a/client/src/features/Thoth/windows/InspectorWindow/DataControls/ModuleSelect.tsx.bak b/client/src/workspaces/composer/windows/InspectorWindow/DataControls/ModuleSelect.tsx.bak
similarity index 100%
rename from client/src/features/Thoth/windows/InspectorWindow/DataControls/ModuleSelect.tsx.bak
rename to client/src/workspaces/composer/windows/InspectorWindow/DataControls/ModuleSelect.tsx.bak
diff --git a/client/src/features/Thoth/windows/InspectorWindow/DataControls/OutputGenerator.jsx b/client/src/workspaces/composer/windows/InspectorWindow/DataControls/OutputGenerator.jsx
similarity index 100%
rename from client/src/features/Thoth/windows/InspectorWindow/DataControls/OutputGenerator.jsx
rename to client/src/workspaces/composer/windows/InspectorWindow/DataControls/OutputGenerator.jsx
diff --git a/client/src/features/Thoth/windows/InspectorWindow/DataControls/PlaytestControl.tsx b/client/src/workspaces/composer/windows/InspectorWindow/DataControls/PlaytestControl.tsx
similarity index 94%
rename from client/src/features/Thoth/windows/InspectorWindow/DataControls/PlaytestControl.tsx
rename to client/src/workspaces/composer/windows/InspectorWindow/DataControls/PlaytestControl.tsx
index 85e47f7bb..33dd17815 100644
--- a/client/src/features/Thoth/windows/InspectorWindow/DataControls/PlaytestControl.tsx
+++ b/client/src/workspaces/composer/windows/InspectorWindow/DataControls/PlaytestControl.tsx
@@ -1,6 +1,6 @@
 import { useState } from 'react'
 
-import Switch from '../../../../common/Switch/Switch'
+import Switch from '../../../../../components/Switch/Switch'
 
 type SocketType = {
   name: string
diff --git a/client/src/features/Thoth/windows/InspectorWindow/DataControls/SocketGenerator.jsx b/client/src/workspaces/composer/windows/InspectorWindow/DataControls/SocketGenerator.jsx
similarity index 100%
rename from client/src/features/Thoth/windows/InspectorWindow/DataControls/SocketGenerator.jsx
rename to client/src/workspaces/composer/windows/InspectorWindow/DataControls/SocketGenerator.jsx
diff --git a/client/src/features/Thoth/windows/InspectorWindow/DataControls/SwitchControl.tsx b/client/src/workspaces/composer/windows/InspectorWindow/DataControls/SwitchControl.tsx
similarity index 89%
rename from client/src/features/Thoth/windows/InspectorWindow/DataControls/SwitchControl.tsx
rename to client/src/workspaces/composer/windows/InspectorWindow/DataControls/SwitchControl.tsx
index 4a972008a..126932f2c 100644
--- a/client/src/features/Thoth/windows/InspectorWindow/DataControls/SwitchControl.tsx
+++ b/client/src/workspaces/composer/windows/InspectorWindow/DataControls/SwitchControl.tsx
@@ -1,6 +1,6 @@
 import { useState } from 'react'
 
-import Switch from '../../../../common/Switch/Switch'
+import Switch from '../../../../../components/Switch/Switch'
 
 const SwitchControl = ({ control, updateData, initialValue }) => {
   const { dataKey, data } = control
diff --git a/client/src/features/Thoth/windows/InspectorWindow/DataControls/datacontrols.module.css b/client/src/workspaces/composer/windows/InspectorWindow/DataControls/datacontrols.module.css
similarity index 100%
rename from client/src/features/Thoth/windows/InspectorWindow/DataControls/datacontrols.module.css
rename to client/src/workspaces/composer/windows/InspectorWindow/DataControls/datacontrols.module.css
diff --git a/client/src/features/Thoth/windows/InspectorWindow/DataControls/datacontrols.module.css.d.ts b/client/src/workspaces/composer/windows/InspectorWindow/DataControls/datacontrols.module.css.d.ts
similarity index 100%
rename from client/src/features/Thoth/windows/InspectorWindow/DataControls/datacontrols.module.css.d.ts
rename to client/src/workspaces/composer/windows/InspectorWindow/DataControls/datacontrols.module.css.d.ts
diff --git a/client/src/features/Thoth/windows/InspectorWindow/DataControls/index.jsx b/client/src/workspaces/composer/windows/InspectorWindow/DataControls/index.jsx
similarity index 100%
rename from client/src/features/Thoth/windows/InspectorWindow/DataControls/index.jsx
rename to client/src/workspaces/composer/windows/InspectorWindow/DataControls/index.jsx
diff --git a/client/src/features/Thoth/windows/InspectorWindow/index.jsx b/client/src/workspaces/composer/windows/InspectorWindow/index.jsx
similarity index 90%
rename from client/src/features/Thoth/windows/InspectorWindow/index.jsx
rename to client/src/workspaces/composer/windows/InspectorWindow/index.jsx
index 2014b4622..a5d6bb5ea 100644
--- a/client/src/features/Thoth/windows/InspectorWindow/index.jsx
+++ b/client/src/workspaces/composer/windows/InspectorWindow/index.jsx
@@ -1,11 +1,11 @@
 import { useEffect, useState } from 'react'
 
-import { useLayout } from '@thoth/contexts/LayoutProvider'
+import { useLayout } from '../../../contexts/LayoutProvider'
 import { useModal } from '@/contexts/ModalProvider'
-import Icon, { componentCategories } from '@common/Icon/Icon'
-import Window from '@common/Window/Window'
+import Icon, { componentCategories } from '../../../../components/Icon/Icon'
+import Window from '../../../../components/Window/Window'
 import DataControls from './DataControls'
-import WindowMessage from '@thoth/components/WindowMessage'
+import WindowMessage from '../../components/WindowMessage'
 
 const Inspector = props => {
   const { inspectorData, saveInspector } = useLayout()
diff --git a/client/src/features/Thoth/windows/PlaytestWindow.jsx b/client/src/workspaces/composer/windows/PlaytestWindow.jsx
similarity index 95%
rename from client/src/features/Thoth/windows/PlaytestWindow.jsx
rename to client/src/workspaces/composer/windows/PlaytestWindow.jsx
index 18d0eef61..a0ed73ae1 100644
--- a/client/src/features/Thoth/windows/PlaytestWindow.jsx
+++ b/client/src/workspaces/composer/windows/PlaytestWindow.jsx
@@ -3,8 +3,8 @@ import { Scrollbars } from 'react-custom-scrollbars-2'
 import { useHotkeys } from 'react-hotkeys-hook'
 
 import { usePubSub } from '../../../contexts/PubSubProvider'
-import Window from '../../common/Window/Window'
-import css from '../thoth.module.css'
+import Window from '../../../components/Window/Window'
+import css from '../../../screens/Thoth/thoth.module.css'
 
 const Input = props => {
   const ref = useRef()
diff --git a/client/src/features/Thoth/windows/StateManagerWindow.tsx b/client/src/workspaces/composer/windows/StateManagerWindow.tsx
similarity index 97%
rename from client/src/features/Thoth/windows/StateManagerWindow.tsx
rename to client/src/workspaces/composer/windows/StateManagerWindow.tsx
index de1cd63a3..1659b0bb2 100644
--- a/client/src/features/Thoth/windows/StateManagerWindow.tsx
+++ b/client/src/workspaces/composer/windows/StateManagerWindow.tsx
@@ -7,9 +7,9 @@ import {
   useGetSpellQuery,
   useSaveSpellMutation,
 } from '../../../state/api/spells'
-import Window from '../../common/Window/Window'
+import Window from '../../../components/Window/Window'
 
-import '../thoth.module.css'
+import '../../../screens/Thoth/thoth.module.css'
 import WindowMessage from '../components/WindowMessage'
 
 const StateManager = ({ tab, ...props }) => {
diff --git a/client/src/features/Thoth/windows/TextEditorWindow.jsx b/client/src/workspaces/composer/windows/TextEditorWindow.jsx
similarity index 93%
rename from client/src/features/Thoth/windows/TextEditorWindow.jsx
rename to client/src/workspaces/composer/windows/TextEditorWindow.jsx
index f41b56712..a2e9f9de0 100644
--- a/client/src/features/Thoth/windows/TextEditorWindow.jsx
+++ b/client/src/workspaces/composer/windows/TextEditorWindow.jsx
@@ -2,11 +2,11 @@ import Editor from '@monaco-editor/react'
 import { useSnackbar } from 'notistack'
 import { useState, useEffect } from 'react'
 
-import { useLayout } from '@thoth/contexts/LayoutProvider'
-import Window from '@common/Window/Window.tsx'
-import WindowMessage from '@thoth/components/WindowMessage'
+import { useLayout } from '../../contexts/LayoutProvider'
+import Window from '../../../components/Window/Window.tsx'
+import WindowMessage from '../components/WindowMessage'
 
-import '../thoth.module.css'
+import '../../../screens/Thoth/thoth.module.css'
 
 const TextEditor = props => {
   const [code, setCode] = useState('')
diff --git a/client/src/features/Thoth/contexts/EditorProvider.tsx b/client/src/workspaces/contexts/EditorProvider.tsx
similarity index 93%
rename from client/src/features/Thoth/contexts/EditorProvider.tsx
rename to client/src/workspaces/contexts/EditorProvider.tsx
index 9c508322e..4ebc33097 100644
--- a/client/src/features/Thoth/contexts/EditorProvider.tsx
+++ b/client/src/workspaces/contexts/EditorProvider.tsx
@@ -1,5 +1,5 @@
 import { initEditor } from '@latitudegames/thoth-core'
-import { ChainData, IRunContextEditor } from '@latitudegames/thoth-core/types'
+import { ChainData, IRunContextEditor } from '@latitudegames/thoth-core/dist/types'
 import React, {
   useRef,
   useContext,
@@ -8,12 +8,12 @@ import React, {
   useEffect,
 } from 'react'
 
-import { useLazyGetSpellQuery, Spell } from '../../../state/api/spells'
+import { useLazyGetSpellQuery, Spell } from '../../state/api/spells'
 
-import LoadingScreen from '../../common/LoadingScreen/LoadingScreen'
-import { MyNode } from '../../common/Node/Node'
+import LoadingScreen from '../../components/LoadingScreen/LoadingScreen'
+import { MyNode } from '../../components/Node/Node'
 import gridimg from '@/grid.png'
-import { usePubSub } from '../../../contexts/PubSubProvider'
+import { usePubSub } from '../../contexts/PubSubProvider'
 import { useRete, ReteContext } from './ReteProvider'
 
 export type ThothTab = {
@@ -73,7 +73,7 @@ const EditorProvider = ({ children }) => {
     const newEditor = await initEditor({
       container,
       pubSub,
-      // calling thoth during migration of features
+      // calling thoth during migration of screens
       thoth,
       tab,
       // MyNode is a custom default style for nodes
diff --git a/client/src/features/Thoth/contexts/LayoutProvider.tsx b/client/src/workspaces/contexts/LayoutProvider.tsx
similarity index 97%
rename from client/src/features/Thoth/contexts/LayoutProvider.tsx
rename to client/src/workspaces/contexts/LayoutProvider.tsx
index 35fa5c306..26711134e 100644
--- a/client/src/features/Thoth/contexts/LayoutProvider.tsx
+++ b/client/src/workspaces/contexts/LayoutProvider.tsx
@@ -8,10 +8,10 @@ import {
 } from 'flexlayout-react'
 import { useContext, createContext, useEffect, useState, useRef } from 'react'
 
-import LoadingScreen from '@common/LoadingScreen/LoadingScreen'
-import { usePubSub } from '@/contexts/PubSubProvider'
+import LoadingScreen from '../../components/LoadingScreen/LoadingScreen'
+import { usePubSub } from 'client/src/contexts/PubSubProvider'
 import { useGetSpellQuery, useSaveSpellMutation } from '@/state/api/spells'
-import { InspectorData } from '@latitudegames/thoth-core/types'
+import { InspectorData } from '@latitudegames/thoth-core/dist/types'
 import { saveTabLayout } from '@/state/tabs'
 import { useDispatch } from 'react-redux'
 // Component types are listed here which are used to load components from the data sent by rete
diff --git a/client/src/features/Thoth/contexts/ReteProvider.tsx b/client/src/workspaces/contexts/ReteProvider.tsx
similarity index 94%
rename from client/src/features/Thoth/contexts/ReteProvider.tsx
rename to client/src/workspaces/contexts/ReteProvider.tsx
index 8a4112dd9..c463c73f5 100644
--- a/client/src/features/Thoth/contexts/ReteProvider.tsx
+++ b/client/src/workspaces/contexts/ReteProvider.tsx
@@ -1,12 +1,12 @@
 import { EngineContext } from '@latitudegames/thoth-core'
 import { useContext, createContext, useRef, useEffect } from 'react'
 
-import { postEnkiCompletion } from '../../../services/game-api/enki'
-import { completion as _completion } from '../../../services/game-api/text'
-import { invokeInference } from '../../../utils/huggingfaceHelper'
-import { usePubSub } from '../../../contexts/PubSubProvider'
+import { postEnkiCompletion } from '../../services/game-api/enki'
+import { completion as _completion } from '../../services/game-api/text'
+import { invokeInference } from '../../utils/huggingfaceHelper'
+import { usePubSub } from '../../contexts/PubSubProvider'
 import { useFetchFromImageCacheMutation } from '@/state/api/visualGenerationsApi'
-import { ThothWorkerInputs } from '@latitudegames/thoth-core/types'
+import { ThothWorkerInputs } from '@latitudegames/thoth-core/dist/types'
 import {
   Spell,
   useGetSpellQuery,
diff --git a/client/src/features/Thoth/contexts/WorkspaceProvider.jsx b/client/src/workspaces/contexts/WorkspaceProvider.jsx
similarity index 100%
rename from client/src/features/Thoth/contexts/WorkspaceProvider.jsx
rename to client/src/workspaces/contexts/WorkspaceProvider.jsx
diff --git a/client/src/features/Thoth/workspaces/index.tsx b/client/src/workspaces/index.tsx
similarity index 94%
rename from client/src/features/Thoth/workspaces/index.tsx
rename to client/src/workspaces/index.tsx
index ae13306cd..a92e430ab 100644
--- a/client/src/features/Thoth/workspaces/index.tsx
+++ b/client/src/workspaces/index.tsx
@@ -1,4 +1,4 @@
-import WorkspaceProvider from '../contexts/WorkspaceProvider'
+import WorkspaceProvider from './contexts/WorkspaceProvider'
 import Composer from './composer'
 
 // TODO create a proper workspace component that can take in everything we need it to
diff --git a/client/webpack.common.js b/client/webpack.common.js
index 6f2399095..fe2c25e4a 100644
--- a/client/webpack.common.js
+++ b/client/webpack.common.js
@@ -34,8 +34,8 @@ module.exports = () => {
     resolve: {
       alias: {
         '@': path.resolve(__dirname, 'src'),
-        '@thoth': path.resolve(__dirname, 'src/features/Thoth'),
-        '@common': path.resolve(__dirname, 'src/features/common'),
+        '@thoth': path.resolve(__dirname, 'src/screens/Thoth'),
+        '@common': path.resolve(__dirname, 'src/screens/components'),
       },
       extensions: ['.ts', '.tsx', '.js', '.jsx', '.json', '.css'],
       fallback: {

From 44ccba1321e3dedea89c2b8fecbcf65ab1f4fb9a Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 09:39:05 -0700
Subject: [PATCH 087/531] Move data controls up a few levels into root composer
 workspace

---
 .../InspectorWindow => }/DataControls/CodeControl.jsx  |  2 +-
 .../InspectorWindow => }/DataControls/DataControls.jsx |  2 +-
 .../DataControls/DropdownSelect.tsx                    |  2 +-
 .../InspectorWindow => }/DataControls/EnkiSelect.jsx   |  6 +++---
 .../InspectorWindow => }/DataControls/Info.jsx         |  0
 .../InspectorWindow => }/DataControls/Input.jsx        |  2 +-
 .../DataControls/InputGenerator.jsx                    |  0
 .../DataControls/LongTextControl.jsx                   |  2 +-
 .../DataControls/ModuleSelect.tsx.bak                  |  0
 .../DataControls/OutputGenerator.jsx                   |  0
 .../DataControls/PlaytestControl.tsx                   |  2 +-
 .../DataControls/SocketGenerator.jsx                   |  0
 .../DataControls/SwitchControl.tsx                     |  2 +-
 .../DataControls/datacontrols.module.css               |  0
 .../DataControls/datacontrols.module.css.d.ts          |  0
 .../InspectorWindow => }/DataControls/index.jsx        |  0
 .../workspaces/composer/components/WindowMessage.jsx   |  2 +-
 .../{InspectorWindow/index.jsx => InspectorWindow.jsx} | 10 +++++-----
 18 files changed, 16 insertions(+), 16 deletions(-)
 rename client/src/workspaces/composer/{windows/InspectorWindow => }/DataControls/CodeControl.jsx (80%)
 rename client/src/workspaces/composer/{windows/InspectorWindow => }/DataControls/DataControls.jsx (97%)
 rename client/src/workspaces/composer/{windows/InspectorWindow => }/DataControls/DropdownSelect.tsx (92%)
 rename client/src/workspaces/composer/{windows/InspectorWindow => }/DataControls/EnkiSelect.jsx (95%)
 rename client/src/workspaces/composer/{windows/InspectorWindow => }/DataControls/Info.jsx (100%)
 rename client/src/workspaces/composer/{windows/InspectorWindow => }/DataControls/Input.jsx (89%)
 rename client/src/workspaces/composer/{windows/InspectorWindow => }/DataControls/InputGenerator.jsx (100%)
 rename client/src/workspaces/composer/{windows/InspectorWindow => }/DataControls/LongTextControl.jsx (80%)
 rename client/src/workspaces/composer/{windows/InspectorWindow => }/DataControls/ModuleSelect.tsx.bak (100%)
 rename client/src/workspaces/composer/{windows/InspectorWindow => }/DataControls/OutputGenerator.jsx (100%)
 rename client/src/workspaces/composer/{windows/InspectorWindow => }/DataControls/PlaytestControl.tsx (94%)
 rename client/src/workspaces/composer/{windows/InspectorWindow => }/DataControls/SocketGenerator.jsx (100%)
 rename client/src/workspaces/composer/{windows/InspectorWindow => }/DataControls/SwitchControl.tsx (89%)
 rename client/src/workspaces/composer/{windows/InspectorWindow => }/DataControls/datacontrols.module.css (100%)
 rename client/src/workspaces/composer/{windows/InspectorWindow => }/DataControls/datacontrols.module.css.d.ts (100%)
 rename client/src/workspaces/composer/{windows/InspectorWindow => }/DataControls/index.jsx (100%)
 rename client/src/workspaces/composer/windows/{InspectorWindow/index.jsx => InspectorWindow.jsx} (89%)

diff --git a/client/src/workspaces/composer/windows/InspectorWindow/DataControls/CodeControl.jsx b/client/src/workspaces/composer/DataControls/CodeControl.jsx
similarity index 80%
rename from client/src/workspaces/composer/windows/InspectorWindow/DataControls/CodeControl.jsx
rename to client/src/workspaces/composer/DataControls/CodeControl.jsx
index 04d369863..1618d929e 100644
--- a/client/src/workspaces/composer/windows/InspectorWindow/DataControls/CodeControl.jsx
+++ b/client/src/workspaces/composer/DataControls/CodeControl.jsx
@@ -1,4 +1,4 @@
-import { useLayout } from '../../../../contexts/LayoutProvider'
+import { useLayout } from '../../contexts/LayoutProvider'
 
 const CodeControl = () => {
   const { createOrFocus, windowTypes } = useLayout()
diff --git a/client/src/workspaces/composer/windows/InspectorWindow/DataControls/DataControls.jsx b/client/src/workspaces/composer/DataControls/DataControls.jsx
similarity index 97%
rename from client/src/workspaces/composer/windows/InspectorWindow/DataControls/DataControls.jsx
rename to client/src/workspaces/composer/DataControls/DataControls.jsx
index fe02f885e..870a0adfd 100644
--- a/client/src/workspaces/composer/windows/InspectorWindow/DataControls/DataControls.jsx
+++ b/client/src/workspaces/composer/DataControls/DataControls.jsx
@@ -1,4 +1,4 @@
-import { SimpleAccordion } from '../../../../../components/Accordion'
+import { SimpleAccordion } from '../../../components/Accordion'
 import CodeControl from './CodeControl'
 import css from './datacontrols.module.css'
 import EnkiSelect from './EnkiSelect'
diff --git a/client/src/workspaces/composer/windows/InspectorWindow/DataControls/DropdownSelect.tsx b/client/src/workspaces/composer/DataControls/DropdownSelect.tsx
similarity index 92%
rename from client/src/workspaces/composer/windows/InspectorWindow/DataControls/DropdownSelect.tsx
rename to client/src/workspaces/composer/DataControls/DropdownSelect.tsx
index c387ec600..ea2117092 100644
--- a/client/src/workspaces/composer/windows/InspectorWindow/DataControls/DropdownSelect.tsx
+++ b/client/src/workspaces/composer/DataControls/DropdownSelect.tsx
@@ -1,4 +1,4 @@
-import Select from '../../../../../components/Select/Select'
+import Select from '../../../components/Select/Select'
 
 const DropdownSelect = ({ control, updateData, initialValue }) => {
   const { dataKey, data } = control
diff --git a/client/src/workspaces/composer/windows/InspectorWindow/DataControls/EnkiSelect.jsx b/client/src/workspaces/composer/DataControls/EnkiSelect.jsx
similarity index 95%
rename from client/src/workspaces/composer/windows/InspectorWindow/DataControls/EnkiSelect.jsx
rename to client/src/workspaces/composer/DataControls/EnkiSelect.jsx
index 5e9ab96fe..77ce32645 100644
--- a/client/src/workspaces/composer/windows/InspectorWindow/DataControls/EnkiSelect.jsx
+++ b/client/src/workspaces/composer/DataControls/EnkiSelect.jsx
@@ -1,8 +1,8 @@
 import { useState, useEffect } from 'react'
 
-import { getEnkiPrompt, getEnkis } from '../../../../../services/game-api/enki'
-import Chip from '../../../../../components/Chip/Chip'
-import Select from '../../../../../components/Select/Select'
+import { getEnkiPrompt, getEnkis } from '../../../services/game-api/enki'
+import Chip from '../../../components/Chip/Chip'
+import Select from '../../../components/Select/Select'
 
 const EnkiDetails = ({ initialTask, addThroughput, update }) => {
   const [activeEnki, selectEnki] = useState(initialTask)
diff --git a/client/src/workspaces/composer/windows/InspectorWindow/DataControls/Info.jsx b/client/src/workspaces/composer/DataControls/Info.jsx
similarity index 100%
rename from client/src/workspaces/composer/windows/InspectorWindow/DataControls/Info.jsx
rename to client/src/workspaces/composer/DataControls/Info.jsx
diff --git a/client/src/workspaces/composer/windows/InspectorWindow/DataControls/Input.jsx b/client/src/workspaces/composer/DataControls/Input.jsx
similarity index 89%
rename from client/src/workspaces/composer/windows/InspectorWindow/DataControls/Input.jsx
rename to client/src/workspaces/composer/DataControls/Input.jsx
index b07bed7a8..ad7e6332e 100644
--- a/client/src/workspaces/composer/windows/InspectorWindow/DataControls/Input.jsx
+++ b/client/src/workspaces/composer/DataControls/Input.jsx
@@ -1,6 +1,6 @@
 import { useState } from 'react'
 
-import InputComponent from '../../../../../components/Input/Input'
+import InputComponent from '../../../components/Input/Input'
 
 const Input = ({ control, updateData, initialValue }) => {
   const [value, setValue] = useState(initialValue)
diff --git a/client/src/workspaces/composer/windows/InspectorWindow/DataControls/InputGenerator.jsx b/client/src/workspaces/composer/DataControls/InputGenerator.jsx
similarity index 100%
rename from client/src/workspaces/composer/windows/InspectorWindow/DataControls/InputGenerator.jsx
rename to client/src/workspaces/composer/DataControls/InputGenerator.jsx
diff --git a/client/src/workspaces/composer/windows/InspectorWindow/DataControls/LongTextControl.jsx b/client/src/workspaces/composer/DataControls/LongTextControl.jsx
similarity index 80%
rename from client/src/workspaces/composer/windows/InspectorWindow/DataControls/LongTextControl.jsx
rename to client/src/workspaces/composer/DataControls/LongTextControl.jsx
index a3895f954..66e445543 100644
--- a/client/src/workspaces/composer/windows/InspectorWindow/DataControls/LongTextControl.jsx
+++ b/client/src/workspaces/composer/DataControls/LongTextControl.jsx
@@ -1,4 +1,4 @@
-import { useLayout } from '../../../../contexts/LayoutProvider'
+import { useLayout } from '../../contexts/LayoutProvider'
 
 const LongText = () => {
   const { createOrFocus, windowTypes } = useLayout()
diff --git a/client/src/workspaces/composer/windows/InspectorWindow/DataControls/ModuleSelect.tsx.bak b/client/src/workspaces/composer/DataControls/ModuleSelect.tsx.bak
similarity index 100%
rename from client/src/workspaces/composer/windows/InspectorWindow/DataControls/ModuleSelect.tsx.bak
rename to client/src/workspaces/composer/DataControls/ModuleSelect.tsx.bak
diff --git a/client/src/workspaces/composer/windows/InspectorWindow/DataControls/OutputGenerator.jsx b/client/src/workspaces/composer/DataControls/OutputGenerator.jsx
similarity index 100%
rename from client/src/workspaces/composer/windows/InspectorWindow/DataControls/OutputGenerator.jsx
rename to client/src/workspaces/composer/DataControls/OutputGenerator.jsx
diff --git a/client/src/workspaces/composer/windows/InspectorWindow/DataControls/PlaytestControl.tsx b/client/src/workspaces/composer/DataControls/PlaytestControl.tsx
similarity index 94%
rename from client/src/workspaces/composer/windows/InspectorWindow/DataControls/PlaytestControl.tsx
rename to client/src/workspaces/composer/DataControls/PlaytestControl.tsx
index 33dd17815..30fbcab1d 100644
--- a/client/src/workspaces/composer/windows/InspectorWindow/DataControls/PlaytestControl.tsx
+++ b/client/src/workspaces/composer/DataControls/PlaytestControl.tsx
@@ -1,6 +1,6 @@
 import { useState } from 'react'
 
-import Switch from '../../../../../components/Switch/Switch'
+import Switch from '../../../components/Switch/Switch'
 
 type SocketType = {
   name: string
diff --git a/client/src/workspaces/composer/windows/InspectorWindow/DataControls/SocketGenerator.jsx b/client/src/workspaces/composer/DataControls/SocketGenerator.jsx
similarity index 100%
rename from client/src/workspaces/composer/windows/InspectorWindow/DataControls/SocketGenerator.jsx
rename to client/src/workspaces/composer/DataControls/SocketGenerator.jsx
diff --git a/client/src/workspaces/composer/windows/InspectorWindow/DataControls/SwitchControl.tsx b/client/src/workspaces/composer/DataControls/SwitchControl.tsx
similarity index 89%
rename from client/src/workspaces/composer/windows/InspectorWindow/DataControls/SwitchControl.tsx
rename to client/src/workspaces/composer/DataControls/SwitchControl.tsx
index 126932f2c..d20b16aa8 100644
--- a/client/src/workspaces/composer/windows/InspectorWindow/DataControls/SwitchControl.tsx
+++ b/client/src/workspaces/composer/DataControls/SwitchControl.tsx
@@ -1,6 +1,6 @@
 import { useState } from 'react'
 
-import Switch from '../../../../../components/Switch/Switch'
+import Switch from '../../../components/Switch/Switch'
 
 const SwitchControl = ({ control, updateData, initialValue }) => {
   const { dataKey, data } = control
diff --git a/client/src/workspaces/composer/windows/InspectorWindow/DataControls/datacontrols.module.css b/client/src/workspaces/composer/DataControls/datacontrols.module.css
similarity index 100%
rename from client/src/workspaces/composer/windows/InspectorWindow/DataControls/datacontrols.module.css
rename to client/src/workspaces/composer/DataControls/datacontrols.module.css
diff --git a/client/src/workspaces/composer/windows/InspectorWindow/DataControls/datacontrols.module.css.d.ts b/client/src/workspaces/composer/DataControls/datacontrols.module.css.d.ts
similarity index 100%
rename from client/src/workspaces/composer/windows/InspectorWindow/DataControls/datacontrols.module.css.d.ts
rename to client/src/workspaces/composer/DataControls/datacontrols.module.css.d.ts
diff --git a/client/src/workspaces/composer/windows/InspectorWindow/DataControls/index.jsx b/client/src/workspaces/composer/DataControls/index.jsx
similarity index 100%
rename from client/src/workspaces/composer/windows/InspectorWindow/DataControls/index.jsx
rename to client/src/workspaces/composer/DataControls/index.jsx
diff --git a/client/src/workspaces/composer/components/WindowMessage.jsx b/client/src/workspaces/composer/components/WindowMessage.jsx
index 1a9d7bd95..28491de8d 100644
--- a/client/src/workspaces/composer/components/WindowMessage.jsx
+++ b/client/src/workspaces/composer/components/WindowMessage.jsx
@@ -1,4 +1,4 @@
-import css from '../windows/InspectorWindow/DataControls/datacontrols.module.css'
+import css from '../DataControls/datacontrols.module.css'
 
 const WindowMessage = ({ content = 'No component selected' }) => {
   return <p className={css['message']}>{content}</p>
diff --git a/client/src/workspaces/composer/windows/InspectorWindow/index.jsx b/client/src/workspaces/composer/windows/InspectorWindow.jsx
similarity index 89%
rename from client/src/workspaces/composer/windows/InspectorWindow/index.jsx
rename to client/src/workspaces/composer/windows/InspectorWindow.jsx
index a5d6bb5ea..ab836199f 100644
--- a/client/src/workspaces/composer/windows/InspectorWindow/index.jsx
+++ b/client/src/workspaces/composer/windows/InspectorWindow.jsx
@@ -1,11 +1,11 @@
 import { useEffect, useState } from 'react'
 
-import { useLayout } from '../../../contexts/LayoutProvider'
+import { useLayout } from '../../contexts/LayoutProvider'
 import { useModal } from '@/contexts/ModalProvider'
-import Icon, { componentCategories } from '../../../../components/Icon/Icon'
-import Window from '../../../../components/Window/Window'
-import DataControls from './DataControls'
-import WindowMessage from '../../components/WindowMessage'
+import Icon, { componentCategories } from '../../../components/Icon/Icon'
+import Window from '../../../components/Window/Window'
+import DataControls from '../DataControls'
+import WindowMessage from '../components/WindowMessage'
 
 const Inspector = props => {
   const { inspectorData, saveInspector } = useLayout()

From f356ba4dd15b951280e8d7c9147584cb9c23db42 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 09:40:13 -0700
Subject: [PATCH 088/531] Rename composer workspace to spells

---
 client/src/workspaces/index.tsx                                 | 2 +-
 .../{composer => spells}/DataControls/CodeControl.jsx           | 0
 .../{composer => spells}/DataControls/DataControls.jsx          | 0
 .../{composer => spells}/DataControls/DropdownSelect.tsx        | 0
 .../workspaces/{composer => spells}/DataControls/EnkiSelect.jsx | 0
 .../src/workspaces/{composer => spells}/DataControls/Info.jsx   | 0
 .../src/workspaces/{composer => spells}/DataControls/Input.jsx  | 0
 .../{composer => spells}/DataControls/InputGenerator.jsx        | 0
 .../{composer => spells}/DataControls/LongTextControl.jsx       | 0
 .../{composer => spells}/DataControls/ModuleSelect.tsx.bak      | 0
 .../{composer => spells}/DataControls/OutputGenerator.jsx       | 0
 .../{composer => spells}/DataControls/PlaytestControl.tsx       | 0
 .../{composer => spells}/DataControls/SocketGenerator.jsx       | 0
 .../{composer => spells}/DataControls/SwitchControl.tsx         | 0
 .../{composer => spells}/DataControls/datacontrols.module.css   | 0
 .../DataControls/datacontrols.module.css.d.ts                   | 0
 .../src/workspaces/{composer => spells}/DataControls/index.jsx  | 0
 .../{composer => spells}/components/WindowMessage.jsx           | 0
 client/src/workspaces/{composer => spells}/index.tsx            | 2 +-
 .../{composer => spells}/windows/DebugConsole/index.tsx         | 0
 .../{composer => spells}/windows/EditorWindow/Deployment.tsx    | 0
 .../windows/EditorWindow/editorwindow.module.css                | 0
 .../windows/EditorWindow/editorwindow.module.css.d.ts           | 0
 .../{composer => spells}/windows/EditorWindow/index.jsx         | 0
 .../workspaces/{composer => spells}/windows/InspectorWindow.jsx | 0
 .../workspaces/{composer => spells}/windows/PlaytestWindow.jsx  | 0
 .../{composer => spells}/windows/StateManagerWindow.tsx         | 0
 .../{composer => spells}/windows/TextEditorWindow.jsx           | 0
 28 files changed, 2 insertions(+), 2 deletions(-)
 rename client/src/workspaces/{composer => spells}/DataControls/CodeControl.jsx (100%)
 rename client/src/workspaces/{composer => spells}/DataControls/DataControls.jsx (100%)
 rename client/src/workspaces/{composer => spells}/DataControls/DropdownSelect.tsx (100%)
 rename client/src/workspaces/{composer => spells}/DataControls/EnkiSelect.jsx (100%)
 rename client/src/workspaces/{composer => spells}/DataControls/Info.jsx (100%)
 rename client/src/workspaces/{composer => spells}/DataControls/Input.jsx (100%)
 rename client/src/workspaces/{composer => spells}/DataControls/InputGenerator.jsx (100%)
 rename client/src/workspaces/{composer => spells}/DataControls/LongTextControl.jsx (100%)
 rename client/src/workspaces/{composer => spells}/DataControls/ModuleSelect.tsx.bak (100%)
 rename client/src/workspaces/{composer => spells}/DataControls/OutputGenerator.jsx (100%)
 rename client/src/workspaces/{composer => spells}/DataControls/PlaytestControl.tsx (100%)
 rename client/src/workspaces/{composer => spells}/DataControls/SocketGenerator.jsx (100%)
 rename client/src/workspaces/{composer => spells}/DataControls/SwitchControl.tsx (100%)
 rename client/src/workspaces/{composer => spells}/DataControls/datacontrols.module.css (100%)
 rename client/src/workspaces/{composer => spells}/DataControls/datacontrols.module.css.d.ts (100%)
 rename client/src/workspaces/{composer => spells}/DataControls/index.jsx (100%)
 rename client/src/workspaces/{composer => spells}/components/WindowMessage.jsx (100%)
 rename client/src/workspaces/{composer => spells}/index.tsx (96%)
 rename client/src/workspaces/{composer => spells}/windows/DebugConsole/index.tsx (100%)
 rename client/src/workspaces/{composer => spells}/windows/EditorWindow/Deployment.tsx (100%)
 rename client/src/workspaces/{composer => spells}/windows/EditorWindow/editorwindow.module.css (100%)
 rename client/src/workspaces/{composer => spells}/windows/EditorWindow/editorwindow.module.css.d.ts (100%)
 rename client/src/workspaces/{composer => spells}/windows/EditorWindow/index.jsx (100%)
 rename client/src/workspaces/{composer => spells}/windows/InspectorWindow.jsx (100%)
 rename client/src/workspaces/{composer => spells}/windows/PlaytestWindow.jsx (100%)
 rename client/src/workspaces/{composer => spells}/windows/StateManagerWindow.tsx (100%)
 rename client/src/workspaces/{composer => spells}/windows/TextEditorWindow.jsx (100%)

diff --git a/client/src/workspaces/index.tsx b/client/src/workspaces/index.tsx
index a92e430ab..6920fd40d 100644
--- a/client/src/workspaces/index.tsx
+++ b/client/src/workspaces/index.tsx
@@ -1,5 +1,5 @@
 import WorkspaceProvider from './contexts/WorkspaceProvider'
-import Composer from './composer'
+import Composer from './spells'
 
 // TODO create a proper workspace component that can take in everything we need it to
 // for a standalone workspace environment.  Factor, events, etc.
diff --git a/client/src/workspaces/composer/DataControls/CodeControl.jsx b/client/src/workspaces/spells/DataControls/CodeControl.jsx
similarity index 100%
rename from client/src/workspaces/composer/DataControls/CodeControl.jsx
rename to client/src/workspaces/spells/DataControls/CodeControl.jsx
diff --git a/client/src/workspaces/composer/DataControls/DataControls.jsx b/client/src/workspaces/spells/DataControls/DataControls.jsx
similarity index 100%
rename from client/src/workspaces/composer/DataControls/DataControls.jsx
rename to client/src/workspaces/spells/DataControls/DataControls.jsx
diff --git a/client/src/workspaces/composer/DataControls/DropdownSelect.tsx b/client/src/workspaces/spells/DataControls/DropdownSelect.tsx
similarity index 100%
rename from client/src/workspaces/composer/DataControls/DropdownSelect.tsx
rename to client/src/workspaces/spells/DataControls/DropdownSelect.tsx
diff --git a/client/src/workspaces/composer/DataControls/EnkiSelect.jsx b/client/src/workspaces/spells/DataControls/EnkiSelect.jsx
similarity index 100%
rename from client/src/workspaces/composer/DataControls/EnkiSelect.jsx
rename to client/src/workspaces/spells/DataControls/EnkiSelect.jsx
diff --git a/client/src/workspaces/composer/DataControls/Info.jsx b/client/src/workspaces/spells/DataControls/Info.jsx
similarity index 100%
rename from client/src/workspaces/composer/DataControls/Info.jsx
rename to client/src/workspaces/spells/DataControls/Info.jsx
diff --git a/client/src/workspaces/composer/DataControls/Input.jsx b/client/src/workspaces/spells/DataControls/Input.jsx
similarity index 100%
rename from client/src/workspaces/composer/DataControls/Input.jsx
rename to client/src/workspaces/spells/DataControls/Input.jsx
diff --git a/client/src/workspaces/composer/DataControls/InputGenerator.jsx b/client/src/workspaces/spells/DataControls/InputGenerator.jsx
similarity index 100%
rename from client/src/workspaces/composer/DataControls/InputGenerator.jsx
rename to client/src/workspaces/spells/DataControls/InputGenerator.jsx
diff --git a/client/src/workspaces/composer/DataControls/LongTextControl.jsx b/client/src/workspaces/spells/DataControls/LongTextControl.jsx
similarity index 100%
rename from client/src/workspaces/composer/DataControls/LongTextControl.jsx
rename to client/src/workspaces/spells/DataControls/LongTextControl.jsx
diff --git a/client/src/workspaces/composer/DataControls/ModuleSelect.tsx.bak b/client/src/workspaces/spells/DataControls/ModuleSelect.tsx.bak
similarity index 100%
rename from client/src/workspaces/composer/DataControls/ModuleSelect.tsx.bak
rename to client/src/workspaces/spells/DataControls/ModuleSelect.tsx.bak
diff --git a/client/src/workspaces/composer/DataControls/OutputGenerator.jsx b/client/src/workspaces/spells/DataControls/OutputGenerator.jsx
similarity index 100%
rename from client/src/workspaces/composer/DataControls/OutputGenerator.jsx
rename to client/src/workspaces/spells/DataControls/OutputGenerator.jsx
diff --git a/client/src/workspaces/composer/DataControls/PlaytestControl.tsx b/client/src/workspaces/spells/DataControls/PlaytestControl.tsx
similarity index 100%
rename from client/src/workspaces/composer/DataControls/PlaytestControl.tsx
rename to client/src/workspaces/spells/DataControls/PlaytestControl.tsx
diff --git a/client/src/workspaces/composer/DataControls/SocketGenerator.jsx b/client/src/workspaces/spells/DataControls/SocketGenerator.jsx
similarity index 100%
rename from client/src/workspaces/composer/DataControls/SocketGenerator.jsx
rename to client/src/workspaces/spells/DataControls/SocketGenerator.jsx
diff --git a/client/src/workspaces/composer/DataControls/SwitchControl.tsx b/client/src/workspaces/spells/DataControls/SwitchControl.tsx
similarity index 100%
rename from client/src/workspaces/composer/DataControls/SwitchControl.tsx
rename to client/src/workspaces/spells/DataControls/SwitchControl.tsx
diff --git a/client/src/workspaces/composer/DataControls/datacontrols.module.css b/client/src/workspaces/spells/DataControls/datacontrols.module.css
similarity index 100%
rename from client/src/workspaces/composer/DataControls/datacontrols.module.css
rename to client/src/workspaces/spells/DataControls/datacontrols.module.css
diff --git a/client/src/workspaces/composer/DataControls/datacontrols.module.css.d.ts b/client/src/workspaces/spells/DataControls/datacontrols.module.css.d.ts
similarity index 100%
rename from client/src/workspaces/composer/DataControls/datacontrols.module.css.d.ts
rename to client/src/workspaces/spells/DataControls/datacontrols.module.css.d.ts
diff --git a/client/src/workspaces/composer/DataControls/index.jsx b/client/src/workspaces/spells/DataControls/index.jsx
similarity index 100%
rename from client/src/workspaces/composer/DataControls/index.jsx
rename to client/src/workspaces/spells/DataControls/index.jsx
diff --git a/client/src/workspaces/composer/components/WindowMessage.jsx b/client/src/workspaces/spells/components/WindowMessage.jsx
similarity index 100%
rename from client/src/workspaces/composer/components/WindowMessage.jsx
rename to client/src/workspaces/spells/components/WindowMessage.jsx
diff --git a/client/src/workspaces/composer/index.tsx b/client/src/workspaces/spells/index.tsx
similarity index 96%
rename from client/src/workspaces/composer/index.tsx
rename to client/src/workspaces/spells/index.tsx
index 4678101fe..e16fba286 100644
--- a/client/src/workspaces/composer/index.tsx
+++ b/client/src/workspaces/spells/index.tsx
@@ -8,7 +8,7 @@ import EditorWindow from 'client/Thoth/windows/EditorWindow'
 import EventHandler from '@/screens/Thoth/components/EventHandler'
 import Inspector from 'client/Thoth/windows/InspectorWindow'
 import Playtest from 'client/Thoth/windows/PlaytestWindow'
-import StateManager from '@/workspaces/composer/windows/StateManagerWindow'
+import StateManager from '@/workspaces/spells/windows/StateManagerWindow'
 import TextEditor from 'client/Thoth/windows/TextEditorWindow'
 import DebugConsole from 'client/Thoth/windows/DebugConsole'
 import { Spell } from '../../state/api/spells'
diff --git a/client/src/workspaces/composer/windows/DebugConsole/index.tsx b/client/src/workspaces/spells/windows/DebugConsole/index.tsx
similarity index 100%
rename from client/src/workspaces/composer/windows/DebugConsole/index.tsx
rename to client/src/workspaces/spells/windows/DebugConsole/index.tsx
diff --git a/client/src/workspaces/composer/windows/EditorWindow/Deployment.tsx b/client/src/workspaces/spells/windows/EditorWindow/Deployment.tsx
similarity index 100%
rename from client/src/workspaces/composer/windows/EditorWindow/Deployment.tsx
rename to client/src/workspaces/spells/windows/EditorWindow/Deployment.tsx
diff --git a/client/src/workspaces/composer/windows/EditorWindow/editorwindow.module.css b/client/src/workspaces/spells/windows/EditorWindow/editorwindow.module.css
similarity index 100%
rename from client/src/workspaces/composer/windows/EditorWindow/editorwindow.module.css
rename to client/src/workspaces/spells/windows/EditorWindow/editorwindow.module.css
diff --git a/client/src/workspaces/composer/windows/EditorWindow/editorwindow.module.css.d.ts b/client/src/workspaces/spells/windows/EditorWindow/editorwindow.module.css.d.ts
similarity index 100%
rename from client/src/workspaces/composer/windows/EditorWindow/editorwindow.module.css.d.ts
rename to client/src/workspaces/spells/windows/EditorWindow/editorwindow.module.css.d.ts
diff --git a/client/src/workspaces/composer/windows/EditorWindow/index.jsx b/client/src/workspaces/spells/windows/EditorWindow/index.jsx
similarity index 100%
rename from client/src/workspaces/composer/windows/EditorWindow/index.jsx
rename to client/src/workspaces/spells/windows/EditorWindow/index.jsx
diff --git a/client/src/workspaces/composer/windows/InspectorWindow.jsx b/client/src/workspaces/spells/windows/InspectorWindow.jsx
similarity index 100%
rename from client/src/workspaces/composer/windows/InspectorWindow.jsx
rename to client/src/workspaces/spells/windows/InspectorWindow.jsx
diff --git a/client/src/workspaces/composer/windows/PlaytestWindow.jsx b/client/src/workspaces/spells/windows/PlaytestWindow.jsx
similarity index 100%
rename from client/src/workspaces/composer/windows/PlaytestWindow.jsx
rename to client/src/workspaces/spells/windows/PlaytestWindow.jsx
diff --git a/client/src/workspaces/composer/windows/StateManagerWindow.tsx b/client/src/workspaces/spells/windows/StateManagerWindow.tsx
similarity index 100%
rename from client/src/workspaces/composer/windows/StateManagerWindow.tsx
rename to client/src/workspaces/spells/windows/StateManagerWindow.tsx
diff --git a/client/src/workspaces/composer/windows/TextEditorWindow.jsx b/client/src/workspaces/spells/windows/TextEditorWindow.jsx
similarity index 100%
rename from client/src/workspaces/composer/windows/TextEditorWindow.jsx
rename to client/src/workspaces/spells/windows/TextEditorWindow.jsx

From 787e23c10e9bacaedfe883ba2ab61d980301e50c Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 09:46:46 -0700
Subject: [PATCH 089/531] Fix alias path in tsconfig

---
 client/tsconfig.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/tsconfig.json b/client/tsconfig.json
index a6ebaee4c..0be096775 100644
--- a/client/tsconfig.json
+++ b/client/tsconfig.json
@@ -17,7 +17,7 @@
     "baseUrl": ".",
     "paths": {
       "@/*": ["src/*"],
-      "@common/*": ["src/features/common/*"],
+      "@components/*": ["src/components/*"],
       "@thoth/*": ["src/features/Thoth/*"]
     }
   },

From a319b8a3095650b99bfc0890c04d14bd766d20ef Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 09:46:53 -0700
Subject: [PATCH 090/531] Fix aliases in webpack config

---
 client/webpack.common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/webpack.common.js b/client/webpack.common.js
index fe2c25e4a..6e39464dc 100644
--- a/client/webpack.common.js
+++ b/client/webpack.common.js
@@ -35,7 +35,7 @@ module.exports = () => {
       alias: {
         '@': path.resolve(__dirname, 'src'),
         '@thoth': path.resolve(__dirname, 'src/screens/Thoth'),
-        '@common': path.resolve(__dirname, 'src/screens/components'),
+        '@components': path.resolve(__dirname, 'src/components'),
       },
       extensions: ['.ts', '.tsx', '.js', '.jsx', '.json', '.css'],
       fallback: {

From 304c4349267b3b89a13da8ec4f14aa91f6df01a8 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 09:47:03 -0700
Subject: [PATCH 091/531] Fix layout provider paths

---
 client/src/workspaces/contexts/LayoutProvider.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/workspaces/contexts/LayoutProvider.tsx b/client/src/workspaces/contexts/LayoutProvider.tsx
index 26711134e..57c09079b 100644
--- a/client/src/workspaces/contexts/LayoutProvider.tsx
+++ b/client/src/workspaces/contexts/LayoutProvider.tsx
@@ -9,7 +9,7 @@ import {
 import { useContext, createContext, useEffect, useState, useRef } from 'react'
 
 import LoadingScreen from '../../components/LoadingScreen/LoadingScreen'
-import { usePubSub } from 'client/src/contexts/PubSubProvider'
+import { usePubSub } from '@/contexts/PubSubProvider'
 import { useGetSpellQuery, useSaveSpellMutation } from '@/state/api/spells'
 import { InspectorData } from '@latitudegames/thoth-core/dist/types'
 import { saveTabLayout } from '@/state/tabs'

From a7ddc07646eab4d9ffd66b40b0979edab44c3109 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 09:47:13 -0700
Subject: [PATCH 092/531] Fix paths in spells workspace

---
 client/src/workspaces/spells/index.tsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/src/workspaces/spells/index.tsx b/client/src/workspaces/spells/index.tsx
index e16fba286..6dea76a44 100644
--- a/client/src/workspaces/spells/index.tsx
+++ b/client/src/workspaces/spells/index.tsx
@@ -3,14 +3,14 @@ import { useEffect, useRef } from 'react'
 import { useEditor } from '@/workspaces/contexts/EditorProvider'
 import { Layout } from '@/workspaces/contexts/LayoutProvider'
 import { useLazyGetSpellQuery, useSaveSpellMutation } from '@/state/api/spells'
-import { debounce } from 'client/src/utils/debounce'
-import EditorWindow from 'client/Thoth/windows/EditorWindow'
+import { debounce } from '@/utils/debounce'
+import EditorWindow from './windows/EditorWindow/'
 import EventHandler from '@/screens/Thoth/components/EventHandler'
-import Inspector from 'client/Thoth/windows/InspectorWindow'
-import Playtest from 'client/Thoth/windows/PlaytestWindow'
+import Inspector from './windows/InspectorWindow'
+import Playtest from './windows/PlaytestWindow'
 import StateManager from '@/workspaces/spells/windows/StateManagerWindow'
-import TextEditor from 'client/Thoth/windows/TextEditorWindow'
-import DebugConsole from 'client/Thoth/windows/DebugConsole'
+import TextEditor from './windows/TextEditorWindow'
+import DebugConsole from './windows/DebugConsole'
 import { Spell } from '../../state/api/spells'
 
 const Workspace = ({ tab, tabs, pubSub }) => {

From c870bc22a088b869f9a1ee4d1dd3b59eed36cd99 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 09:47:27 -0700
Subject: [PATCH 093/531] Fix paths in spell windows

---
 client/src/workspaces/spells/windows/DebugConsole/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/workspaces/spells/windows/DebugConsole/index.tsx b/client/src/workspaces/spells/windows/DebugConsole/index.tsx
index 3f99bcf12..8598ae421 100644
--- a/client/src/workspaces/spells/windows/DebugConsole/index.tsx
+++ b/client/src/workspaces/spells/windows/DebugConsole/index.tsx
@@ -2,8 +2,8 @@ import { useCallback, useEffect, useRef, useState } from 'react'
 import { renderToString } from 'react-dom/server'
 import Terminal from 'react-console-emulator'
 import { useAuth } from '@/contexts/AuthProvider'
-import { usePubSub } from 'client/src/contexts/PubSubProvider'
-import Window from '@/../../../../../components/Window/Window'
+import { usePubSub } from '@/contexts/PubSubProvider'
+import Window from '@components/Window/Window'
 
 export type DebugMessage = {
   message: string

From 1c43315729faf3cf283b1cf660b1e3217e7741d2 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 09:47:39 -0700
Subject: [PATCH 094/531] Fix path in deploymnt screen

---
 .../src/workspaces/spells/windows/EditorWindow/Deployment.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/workspaces/spells/windows/EditorWindow/Deployment.tsx b/client/src/workspaces/spells/windows/EditorWindow/Deployment.tsx
index 1e2345547..4cefad72e 100644
--- a/client/src/workspaces/spells/windows/EditorWindow/Deployment.tsx
+++ b/client/src/workspaces/spells/windows/EditorWindow/Deployment.tsx
@@ -8,7 +8,7 @@ import WindowToolbar from '../../../../components/Window/WindowToolbar'
 import { SimpleAccordion } from '../../../../components/Accordion'
 import Input from '../../../../components/Input/Input'
 import Panel from '../../../../components/Panel/Panel'
-import { useModal } from 'client/src/contexts/ModalProvider'
+import { useModal } from '@/contexts/ModalProvider'
 
 import {
   useGetDeploymentsQuery,

From ec5359e33f3e9e2b903db9d0a76eb965069a1534 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 09:54:43 -0700
Subject: [PATCH 095/531] More path fixes in editor window

---
 client/src/workspaces/spells/windows/EditorWindow/index.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/workspaces/spells/windows/EditorWindow/index.jsx b/client/src/workspaces/spells/windows/EditorWindow/index.jsx
index 582d9b912..4b45406d7 100644
--- a/client/src/workspaces/spells/windows/EditorWindow/index.jsx
+++ b/client/src/workspaces/spells/windows/EditorWindow/index.jsx
@@ -1,10 +1,10 @@
 import { useState, useEffect } from 'react'
 import { createNode } from 'rete-context-menu-plugin/src/utils'
 
-import WindowToolbar from '@/../../../../../components/Window/WindowToolbar'
+import WindowToolbar from '@/components/Window/WindowToolbar'
 import { Editor, useEditor } from '../../../contexts/EditorProvider'
 import Deployment from './Deployment'
-import Select from '../../../../components/Select/Select'
+import Select from '@components/Select/Select'
 import css from './editorwindow.module.css'
 
 const EditorWindow = ({ tab }) => {

From 94e5118d8746c158bef69f22a71487ce1c85a4d0 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 09:54:55 -0700
Subject: [PATCH 096/531] Path fixes in deplotment windowe again

---
 .../workspaces/spells/windows/EditorWindow/Deployment.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/src/workspaces/spells/windows/EditorWindow/Deployment.tsx b/client/src/workspaces/spells/windows/EditorWindow/Deployment.tsx
index 4cefad72e..7dded3618 100644
--- a/client/src/workspaces/spells/windows/EditorWindow/Deployment.tsx
+++ b/client/src/workspaces/spells/windows/EditorWindow/Deployment.tsx
@@ -4,10 +4,10 @@ import { useSnackbar } from 'notistack'
 
 import css from './editorwindow.module.css'
 
-import WindowToolbar from '../../../../components/Window/WindowToolbar'
-import { SimpleAccordion } from '../../../../components/Accordion'
-import Input from '../../../../components/Input/Input'
-import Panel from '../../../../components/Panel/Panel'
+import WindowToolbar from '@components/Window/WindowToolbar'
+import { SimpleAccordion } from '@components/Accordion'
+import Input from '@components/Input/Input'
+import Panel from '@components/Panel/Panel'
 import { useModal } from '@/contexts/ModalProvider'
 
 import {

From 2ae2e28bc510beb4a8e8edd2232759979b6abb3f Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 09:56:40 -0700
Subject: [PATCH 097/531] Revert committed client thoth version to 0.0.65

---
 client/package.json |  2 +-
 yarn.lock           | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/client/package.json b/client/package.json
index 346012dd1..5b2887767 100644
--- a/client/package.json
+++ b/client/package.json
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@callstack/async-storage": "^2.0.3",
-    "@latitudegames/thoth-core": "0.0.66",
+    "@latitudegames/thoth-core": "0.0.65",
     "@material-ui/core": "^4.12.1",
     "@material-ui/icons": "^4.11.2",
     "@monaco-editor/react": "^4.2.1",
diff --git a/yarn.lock b/yarn.lock
index f0f3c60b3..5040c321b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1469,6 +1469,26 @@
     "@types/yargs" "^16.0.0"
     chalk "^4.0.0"
 
+"@latitudegames/thoth-core@0.0.65":
+  version "0.0.65"
+  resolved "https://npm.pkg.github.com/download/@latitudegames/thoth-core/0.0.65/5f38b6af91b27e4285a0b665b572209754c81f865bb988b2dae14f02913d8d4b#10eceb4003a9abcd6e81115203d422ab7cc3bc06"
+  integrity sha512-YRoyD29A6n8vFwj3jACTOq9q+uwMV3PogQoftTJBb8CuUcA3AbKgMhHyNg7z1XDwMyzoOjJ0TMTBhFpInO8nsA==
+  dependencies:
+    deep-equal "^2.0.5"
+    handlebars "^4.7.7"
+    jsdom "^17.0.0"
+    license-webpack-plugin "^4.0.2"
+    path "^0.12.7"
+    react "^17.0.2"
+    regenerator-runtime "^0.13.9"
+    rete "https://github.com/latitudegames/rete.git#master"
+    rete-area-plugin "^0.2.1"
+    rete-connection-plugin "^0.9.0"
+    rete-context-menu-plugin "^0.6.0-rc.1"
+    rete-module-plugin "^0.4.1"
+    rete-react-render-plugin "^0.2.1"
+    uuid "^8.3.2"
+
 "@lerna/add@4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@lerna/add/-/add-4.0.0.tgz#c36f57d132502a57b9e7058d1548b7a565ef183f"
@@ -11500,6 +11520,14 @@ rete-react-render-plugin@^0.2.1:
   resolved "https://registry.yarnpkg.com/rete-react-render-plugin/-/rete-react-render-plugin-0.2.1.tgz#71a6d73f18f850b85262563f678b40080a7b0e32"
   integrity sha512-2ZMXUP0v+EiejHVMqdrOmUwyDBHC2UDOJ/pFkElaZL1Kn/E40JZA5yzdBXi6ajYZI2DCzoW5ZBcA2Ihjtur8MQ==
 
+"rete@git+https://github.com/latitudegames/rete.git#master":
+  version "1.4.5"
+  uid "24565a81a2bbcdd4cd73b0a725977550cc8ff988"
+  resolved "git+https://github.com/latitudegames/rete.git#24565a81a2bbcdd4cd73b0a725977550cc8ff988"
+  dependencies:
+    lodash "^4.17.21"
+    watch "^1.0.2"
+
 "rete@https://github.com/latitudegames/rete.git#master":
   version "1.4.5"
   resolved "https://github.com/latitudegames/rete.git#24565a81a2bbcdd4cd73b0a725977550cc8ff988"

From d544212008f78be038c9a45a72864232d9daa8f5 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 10:11:54 -0700
Subject: [PATCH 098/531] Disable gloabl default cursor

---
 client/src/design-globals/design-globals.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/design-globals/design-globals.css b/client/src/design-globals/design-globals.css
index 8e6bfc179..c0d4784e3 100644
--- a/client/src/design-globals/design-globals.css
+++ b/client/src/design-globals/design-globals.css
@@ -2,7 +2,7 @@
 @import url('https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:wght@400;700&display=swap');
 * {
   font-family: 'IBM Plex Sans', 'IBM Plex Mono', sans-serif;
-  cursor: default !important;
+  /* cursor: default !important; */
 }
 
 :root {

From 5cb1682003b1eff5f8ba5b30e72b7bfdbfb7be80 Mon Sep 17 00:00:00 2001
From: Nick Walton <nickwalton00@gmail.com>
Date: Thu, 24 Mar 2022 10:26:48 -0700
Subject: [PATCH 099/531] fix quote issue

---
 core/src/components/Generator.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/src/components/Generator.ts b/core/src/components/Generator.ts
index 585476178..0688c45b8 100644
--- a/core/src/components/Generator.ts
+++ b/core/src/components/Generator.ts
@@ -60,7 +60,7 @@ export class Generator extends ThothComponent<Promise<WorkerReturn>> {
       dataKey: 'model',
       name: 'Model',
       defaultValue: (node.data?.model as string) || 'davinci',
-      values: ['vanilla-davinci', 'aid-jumbo', 'vanilla-jumbo']
+      values: ['vanilla-davinci', 'aid-jumbo', 'vanilla-jumbo'],
     })
 
     const inputGenerator = new SocketGeneratorControl({
@@ -126,7 +126,8 @@ export class Generator extends ThothComponent<Promise<WorkerReturn>> {
 
     const fewshot = (node.data.fewshot as string) || ''
     const stopSequence = node.data.stop as string
-    const template = Handlebars.compile(fewshot)
+
+    const template = Handlebars.compile(fewshot, { noEscape: true })
     const prompt = template(inputs)
 
     const stop = node?.data?.stop
@@ -134,7 +135,7 @@ export class Generator extends ThothComponent<Promise<WorkerReturn>> {
           if (i.includes('\n')) return i
           return i.trim()
         })
-      : ""
+      : ''
 
     const tempData = node.data.temp as string
     const temperature = tempData ? parseFloat(tempData) : 0.7

From b8682578bc2b7b865935ed4edff6db07c96c83cf Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 10:47:46 -0700
Subject: [PATCH 100/531] Rename module select to spell select

---
 .../{ModuleSelect.tsx.bak => SpellSelect.tsx}       | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
 rename client/src/workspaces/spells/DataControls/{ModuleSelect.tsx.bak => SpellSelect.tsx} (85%)

diff --git a/client/src/workspaces/spells/DataControls/ModuleSelect.tsx.bak b/client/src/workspaces/spells/DataControls/SpellSelect.tsx
similarity index 85%
rename from client/src/workspaces/spells/DataControls/ModuleSelect.tsx.bak
rename to client/src/workspaces/spells/DataControls/SpellSelect.tsx
index 01673ff72..c110dcf79 100644
--- a/client/src/workspaces/spells/DataControls/ModuleSelect.tsx.bak
+++ b/client/src/workspaces/spells/DataControls/SpellSelect.tsx
@@ -1,13 +1,17 @@
 import { useSnackbar } from 'notistack'
 
-import { useAppDispatch } from '../../../../../state/hooks'
-import { openTab } from '../../../../../state/tabs'
-import { useModule } from '../../../../../contexts/ModuleProvider'
-import Select from '../../../../common/Select/Select'
+import { useAppDispatch } from '@/state/hooks'
+import { openTab } from '@/state/tabs'
+// import { useModule } from '../../../contexts/ModuleProvider'
+import Select from '@components/Select/Select'
+import { useGetSpellsQuery, useNewSpellMutation } from '@/state/api/spells'
 
 const ModuleSelect = ({ control, updateData, initialValue }) => {
   const dispatch = useAppDispatch()
 
+  const { data: spells } = useGetSpellsQuery()
+  const [newSpell] = useNewSpellMutation()
+
   const { modules, newModule, findOneModule } = useModule()
   const { enqueueSnackbar } = useSnackbar()
   const { dataKey } = control
@@ -52,6 +56,7 @@ const ModuleSelect = ({ control, updateData, initialValue }) => {
 
   const onCreateOption = async value => {
     try {
+      const spell = await newSpell()
       const module = await newModule({ name: value })
 
       await _openTab(module)

From 405105491828ef4e6b2c9e002fa1764318924ea9 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 11:20:21 -0700
Subject: [PATCH 101/531] Rename rete provider to thoth provider

---
 .../workspaces/contexts/{ReteProvider.tsx => ThothProvider.tsx}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename client/src/workspaces/contexts/{ReteProvider.tsx => ThothProvider.tsx} (100%)

diff --git a/client/src/workspaces/contexts/ReteProvider.tsx b/client/src/workspaces/contexts/ThothProvider.tsx
similarity index 100%
rename from client/src/workspaces/contexts/ReteProvider.tsx
rename to client/src/workspaces/contexts/ThothProvider.tsx

From 8a7791a7cef120501fe1ddf00c92f74c5f0e7d14 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 11:20:57 -0700
Subject: [PATCH 102/531] Rename again to thoth interface provider

---
 .../contexts/{ThothProvider.tsx => ThothInterfaceProvider.tsx}    | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename client/src/workspaces/contexts/{ThothProvider.tsx => ThothInterfaceProvider.tsx} (100%)

diff --git a/client/src/workspaces/contexts/ThothProvider.tsx b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
similarity index 100%
rename from client/src/workspaces/contexts/ThothProvider.tsx
rename to client/src/workspaces/contexts/ThothInterfaceProvider.tsx

From f6dc7c509a15c98952bf3370ab04db308844a173 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 11:21:06 -0700
Subject: [PATCH 103/531] Fix paths to thoth interface provider

---
 client/src/workspaces/contexts/EditorProvider.tsx    | 7 +++++--
 client/src/workspaces/contexts/WorkspaceProvider.jsx | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/client/src/workspaces/contexts/EditorProvider.tsx b/client/src/workspaces/contexts/EditorProvider.tsx
index 4ebc33097..bb529cbb6 100644
--- a/client/src/workspaces/contexts/EditorProvider.tsx
+++ b/client/src/workspaces/contexts/EditorProvider.tsx
@@ -1,5 +1,8 @@
 import { initEditor } from '@latitudegames/thoth-core'
-import { ChainData, IRunContextEditor } from '@latitudegames/thoth-core/dist/types'
+import {
+  ChainData,
+  IRunContextEditor,
+} from '@latitudegames/thoth-core/dist/types'
 import React, {
   useRef,
   useContext,
@@ -14,7 +17,7 @@ import LoadingScreen from '../../components/LoadingScreen/LoadingScreen'
 import { MyNode } from '../../components/Node/Node'
 import gridimg from '@/grid.png'
 import { usePubSub } from '../../contexts/PubSubProvider'
-import { useRete, ReteContext } from './ReteProvider'
+import { useRete, ReteContext } from './ThothInterfaceProvider'
 
 export type ThothTab = {
   layoutJson: string
diff --git a/client/src/workspaces/contexts/WorkspaceProvider.jsx b/client/src/workspaces/contexts/WorkspaceProvider.jsx
index c51c1f131..d7184d914 100644
--- a/client/src/workspaces/contexts/WorkspaceProvider.jsx
+++ b/client/src/workspaces/contexts/WorkspaceProvider.jsx
@@ -1,6 +1,6 @@
 import EditorProvider from './EditorProvider'
 import LayoutProvider from './LayoutProvider'
-import ReteProvider from './ReteProvider'
+import ReteProvider from './ThothInterfaceProvider'
 
 const providers = [ReteProvider, EditorProvider, LayoutProvider]
 

From 0b5d93c01273151f9b26d777273ea651ed4e58c7 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 11:21:56 -0700
Subject: [PATCH 104/531] Change to thoth interface context

---
 client/src/workspaces/contexts/ThothInterfaceProvider.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
index c463c73f5..9e3e215db 100644
--- a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
+++ b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
@@ -18,7 +18,7 @@ Some notes here.  The new rete provider, not to be confused with the old rete pr
 Not all functions will be needed on the server, and functions which are not will be labeled as such.
 */
 
-export interface ReteContext extends EngineContext {
+export interface ThothInterfaceContext extends EngineContext {
   onInspector: (node, callback) => void
   onPlaytest: (callback) => void
   sendToPlaytest: (data) => void
@@ -36,7 +36,7 @@ export interface ReteContext extends EngineContext {
   ) => void
 }
 
-const Context = createContext<ReteContext>(undefined!)
+const Context = createContext<ThothInterfaceContext>(undefined!)
 
 export const useRete = () => useContext(Context)
 

From f0db2302a9fdafc136bc8bd1648571011d2ea314 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 11:22:07 -0700
Subject: [PATCH 105/531] Update import of thoth interface context

---
 client/src/workspaces/contexts/EditorProvider.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/workspaces/contexts/EditorProvider.tsx b/client/src/workspaces/contexts/EditorProvider.tsx
index bb529cbb6..686dbf985 100644
--- a/client/src/workspaces/contexts/EditorProvider.tsx
+++ b/client/src/workspaces/contexts/EditorProvider.tsx
@@ -17,7 +17,7 @@ import LoadingScreen from '../../components/LoadingScreen/LoadingScreen'
 import { MyNode } from '../../components/Node/Node'
 import gridimg from '@/grid.png'
 import { usePubSub } from '../../contexts/PubSubProvider'
-import { useRete, ReteContext } from './ThothInterfaceProvider'
+import { useRete, ThothInterfaceContext } from './ThothInterfaceProvider'
 
 export type ThothTab = {
   layoutJson: string
@@ -40,7 +40,7 @@ const Context = createContext({
     // todo update this to use proper spell type
     spell: Spell | undefined,
     tab: ThothTab,
-    reteInterface: ReteContext
+    reteInterface: ThothInterfaceContext
   ) => {},
   setEditor: (editor: any) => {},
   getNodeMap: () => {},

From bfacf619ae242d47fed1f3b0bfc704b37ebd8ba6 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 11:23:34 -0700
Subject: [PATCH 106/531] Update use rete to use thoth interface

---
 client/src/workspaces/contexts/ThothInterfaceProvider.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
index 9e3e215db..4d4dbd8ec 100644
--- a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
+++ b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
@@ -38,7 +38,7 @@ export interface ThothInterfaceContext extends EngineContext {
 
 const Context = createContext<ThothInterfaceContext>(undefined!)
 
-export const useRete = () => useContext(Context)
+export const useThothInterface = () => useContext(Context)
 
 const ReteProvider = ({ children, tab }) => {
   const { events, publish, subscribe } = usePubSub()

From f5ede3b4324527c3666a808811d0efe3abed68f9 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 11:23:45 -0700
Subject: [PATCH 107/531] Fix import of use thoth interface

---
 client/src/workspaces/contexts/EditorProvider.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/client/src/workspaces/contexts/EditorProvider.tsx b/client/src/workspaces/contexts/EditorProvider.tsx
index 686dbf985..175f74737 100644
--- a/client/src/workspaces/contexts/EditorProvider.tsx
+++ b/client/src/workspaces/contexts/EditorProvider.tsx
@@ -17,7 +17,10 @@ import LoadingScreen from '../../components/LoadingScreen/LoadingScreen'
 import { MyNode } from '../../components/Node/Node'
 import gridimg from '@/grid.png'
 import { usePubSub } from '../../contexts/PubSubProvider'
-import { useRete, ThothInterfaceContext } from './ThothInterfaceProvider'
+import {
+  useThothInterface,
+  ThothInterfaceContext,
+} from './ThothInterfaceProvider'
 
 export type ThothTab = {
   layoutJson: string
@@ -157,7 +160,7 @@ const RawEditor = ({ tab, children }) => {
   const [loaded, setLoaded] = useState(false)
   const { buildEditor } = useEditor()
   // This will be the main interface between thoth and rete
-  const reteInterface = useRete()
+  const reteInterface = useThothInterface()
 
   useEffect(() => {
     if (!tab) return

From e283bd1ee7e69f8f297aff900d53ae92a88075dc Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 11:24:50 -0700
Subject: [PATCH 108/531] Change component name to thoth interface provider

---
 client/src/workspaces/contexts/ThothInterfaceProvider.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
index 4d4dbd8ec..c3ee5c948 100644
--- a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
+++ b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
@@ -40,7 +40,7 @@ const Context = createContext<ThothInterfaceContext>(undefined!)
 
 export const useThothInterface = () => useContext(Context)
 
-const ReteProvider = ({ children, tab }) => {
+const ThothInterfaceProvider = ({ children, tab }) => {
   const { events, publish, subscribe } = usePubSub()
   const spellRef = useRef<Spell | null>(null)
   const [fetchFromImageCache] = useFetchFromImageCacheMutation()
@@ -210,4 +210,4 @@ const ReteProvider = ({ children, tab }) => {
   return <Context.Provider value={publicInterface}>{children}</Context.Provider>
 }
 
-export default ReteProvider
+export default ThothInterfaceProvider

From 8da46422b371348ff5aab82045206197311038c1 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 11:25:09 -0700
Subject: [PATCH 109/531] Import proper provider into worksapce providers

---
 client/src/workspaces/contexts/WorkspaceProvider.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/workspaces/contexts/WorkspaceProvider.jsx b/client/src/workspaces/contexts/WorkspaceProvider.jsx
index d7184d914..85a784701 100644
--- a/client/src/workspaces/contexts/WorkspaceProvider.jsx
+++ b/client/src/workspaces/contexts/WorkspaceProvider.jsx
@@ -1,8 +1,8 @@
 import EditorProvider from './EditorProvider'
 import LayoutProvider from './LayoutProvider'
-import ReteProvider from './ThothInterfaceProvider'
+import ThothInterfaceProvider from './ThothInterfaceProvider'
 
-const providers = [ReteProvider, EditorProvider, LayoutProvider]
+const providers = [ThothInterfaceProvider, EditorProvider, LayoutProvider]
 
 function ComposeProviders({ providers, children, ...parentProps }) {
   const _providers = [...providers].reverse()

From c103a597a7e6f2de2c34a3f38aa13a636ef43c67 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 11:29:40 -0700
Subject: [PATCH 110/531] Export thoth templates from create new

---
 client/src/screens/HomeScreen/screens/CreateNew.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/src/screens/HomeScreen/screens/CreateNew.tsx b/client/src/screens/HomeScreen/screens/CreateNew.tsx
index 09e20ce29..4e0362307 100644
--- a/client/src/screens/HomeScreen/screens/CreateNew.tsx
+++ b/client/src/screens/HomeScreen/screens/CreateNew.tsx
@@ -24,13 +24,13 @@ const customConfig = {
   length: 2,
 }
 
-type Template = {
+export type Template = {
   label: string
   bg: string
   chain: ChainData
 }
 
-const templates = [
+export const thothTemplates = [
   { label: 'Starter', bg: emptyImg, chain: defaultChain },
   { label: 'Language example', bg: langImg, chain: defaultChain },
   { label: 'Enki example', bg: enkiImg, chain: defaultChain },
@@ -115,7 +115,7 @@ const CreateNew = () => {
           gap: 'var(--extraSmall)',
         }}
       >
-        {templates.map((template, i) => (
+        {thothTemplates.map((template, i) => (
           <TemplatePanel
             setSelectedTemplate={setSelectedTemplate}
             selectedTemplate={selectedTemplate}

From f196b92791e19841ddeb9041d84928c3a73e2181 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 11:32:04 -0700
Subject: [PATCH 111/531] Move chains into a new folder

---
 client/src/{screens/HomeScreen/screens => data}/chains/default.ts | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename client/src/{screens/HomeScreen/screens => data}/chains/default.ts (100%)

diff --git a/client/src/screens/HomeScreen/screens/chains/default.ts b/client/src/data/chains/default.ts
similarity index 100%
rename from client/src/screens/HomeScreen/screens/chains/default.ts
rename to client/src/data/chains/default.ts

From 203b185048d84158fac485585c135e139c66cc2e Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 11:32:18 -0700
Subject: [PATCH 112/531] Update default chain import path

---
 client/src/screens/HomeScreen/screens/CreateNew.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/screens/HomeScreen/screens/CreateNew.tsx b/client/src/screens/HomeScreen/screens/CreateNew.tsx
index 4e0362307..d09683506 100644
--- a/client/src/screens/HomeScreen/screens/CreateNew.tsx
+++ b/client/src/screens/HomeScreen/screens/CreateNew.tsx
@@ -15,7 +15,7 @@ import enkiImg from '../enki.png'
 import langImg from '../lang.png'
 import css from '../homeScreen.module.css'
 import TemplatePanel from '../components/TemplatePanel'
-import defaultChain from './chains/default'
+import defaultChain from '../../../data/chains/default'
 import { ChainData } from '@latitudegames/thoth-core/types'
 
 const customConfig = {

From 03d19567dc600ef2f5b7aaced6612c20721d305b Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 11:39:16 -0700
Subject: [PATCH 113/531] Move layout json into data folder

---
 client/src/{contexts => data}/layouts/defaultLayout.json | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename client/src/{contexts => data}/layouts/defaultLayout.json (100%)

diff --git a/client/src/contexts/layouts/defaultLayout.json b/client/src/data/layouts/defaultLayout.json
similarity index 100%
rename from client/src/contexts/layouts/defaultLayout.json
rename to client/src/data/layouts/defaultLayout.json

From 2b7015f34253cbc2f62362f74d0eab4085c5d877 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 11:42:25 -0700
Subject: [PATCH 114/531] Uodata path to layouts in data folder

---
 client/src/state/tabs.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/state/tabs.ts b/client/src/state/tabs.ts
index 14afc5ee6..f0aadf6c2 100644
--- a/client/src/state/tabs.ts
+++ b/client/src/state/tabs.ts
@@ -7,7 +7,7 @@ import {
 } from '@reduxjs/toolkit'
 
 import { RootState } from './store'
-import defaultJson from '../contexts/layouts/defaultLayout.json'
+import defaultJson from '../data/layouts/defaultLayout.json'
 
 // Used to set workspaces to tabs
 const workspaceMap = {

From 14a9376827651a886a5d598fb43d1cf5d5de5f63 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 11:43:29 -0700
Subject: [PATCH 115/531] Update layout path in tsconfig

---
 client/tsconfig.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/tsconfig.json b/client/tsconfig.json
index 0be096775..6d2a12b17 100644
--- a/client/tsconfig.json
+++ b/client/tsconfig.json
@@ -27,5 +27,5 @@
       "path": "../core"
     }
   ],
-  "include": ["src", "src/contexts/layouts/defaultLayout.json"]
+  "include": ["src", "src/data/layouts/defaultLayout.json"]
 }

From f5c71a12a8ebd07c819e24a0696e50cabcafd451 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 11:57:29 -0700
Subject: [PATCH 116/531] Fix typescriot in spell select and begin migrating to
 use spells

---
 .../spells/DataControls/SpellSelect.tsx       | 46 ++++++++++---------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/client/src/workspaces/spells/DataControls/SpellSelect.tsx b/client/src/workspaces/spells/DataControls/SpellSelect.tsx
index c110dcf79..1420f86f7 100644
--- a/client/src/workspaces/spells/DataControls/SpellSelect.tsx
+++ b/client/src/workspaces/spells/DataControls/SpellSelect.tsx
@@ -5,6 +5,8 @@ import { openTab } from '@/state/tabs'
 // import { useModule } from '../../../contexts/ModuleProvider'
 import Select from '@components/Select/Select'
 import { useGetSpellsQuery, useNewSpellMutation } from '@/state/api/spells'
+import defaultChain from '@/data/chains/default'
+import { ChainData } from '@latitudegames/thoth-core/types'
 
 const ModuleSelect = ({ control, updateData, initialValue }) => {
   const dispatch = useAppDispatch()
@@ -12,42 +14,40 @@ const ModuleSelect = ({ control, updateData, initialValue }) => {
   const { data: spells } = useGetSpellsQuery()
   const [newSpell] = useNewSpellMutation()
 
-  const { modules, newModule, findOneModule } = useModule()
   const { enqueueSnackbar } = useSnackbar()
   const { dataKey } = control
 
   const optionArray = () => {
-    return modules.map((module, index) => ({
+    if (!spells) return
+    return spells.map((module, index) => ({
       value: module.name,
       label: module.name,
     }))
   }
 
-  const _openTab = async module => {
+  const _openTab = async spell => {
     const tab = {
-      name: module.name,
-      type: 'module',
-      moduleName: module.name,
+      name: spell.name,
+      type: 'spell',
+      moduleName: spell.name,
       openNew: false,
     }
 
     dispatch(openTab(tab))
-    // await openTab(tab)
   }
 
+  // TODO fix on change to handle loading a single spell
   const onChange = async ({ value }) => {
-    const _module = await findOneModule({ name: value })
-    if (!_module) {
-      enqueueSnackbar('No module found', {
-        variant: 'error',
-      })
-      return
-    }
-    update(value)
-
-    const module = _module.toJSON()
-
-    await _openTab(module)
+    // const _spell = await findOneModule({ name: value })
+    // if (!_module) {
+    //   enqueueSnackbar('No module found', {
+    //     variant: 'error',
+    //   })
+    //   return
+    // }
+    // update(value)
+    // const module = _module.toJSON()
+    // await _openTab(module)
   }
 
   const update = update => {
@@ -56,10 +56,12 @@ const ModuleSelect = ({ control, updateData, initialValue }) => {
 
   const onCreateOption = async value => {
     try {
-      const spell = await newSpell()
-      const module = await newModule({ name: value })
+      const spell = await newSpell({
+        name: value,
+        chain: defaultChain as unknown as ChainData,
+      })
 
-      await _openTab(module)
+      await _openTab(spell)
 
       // todo better naming for rete modules.
       // Handle displaying name as using ID for internal mapping

From f8ad602e7e30f48138e4556df1d0f9c480fcb3a6 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 13:47:26 -0700
Subject: [PATCH 117/531] Create inspector provider

---
 .../src/workspaces/contexts/InspectorProvider.tsx | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 client/src/workspaces/contexts/InspectorProvider.tsx

diff --git a/client/src/workspaces/contexts/InspectorProvider.tsx b/client/src/workspaces/contexts/InspectorProvider.tsx
new file mode 100644
index 000000000..22c1844f7
--- /dev/null
+++ b/client/src/workspaces/contexts/InspectorProvider.tsx
@@ -0,0 +1,15 @@
+import { createContext, useContext } from 'react'
+
+type InspectorContext = {}
+
+const Context = createContext<InspectorContext>(undefined!)
+
+export const useInspector = () => useContext(Context)
+
+const InspectorProvider = ({ children }) => {
+  const publicInterface: InspectorContext = {}
+
+  return <Context.Provider value={publicInterface}>{children}</Context.Provider>
+}
+
+export default InspectorProvider

From 1507176a5217fef1e8e2d3db5a3ce5f587b30564 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 13:48:19 -0700
Subject: [PATCH 118/531] Load in empty inspector provider to workspace
 providers

---
 client/src/workspaces/contexts/WorkspaceProvider.jsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/client/src/workspaces/contexts/WorkspaceProvider.jsx b/client/src/workspaces/contexts/WorkspaceProvider.jsx
index 85a784701..a5c551822 100644
--- a/client/src/workspaces/contexts/WorkspaceProvider.jsx
+++ b/client/src/workspaces/contexts/WorkspaceProvider.jsx
@@ -1,8 +1,14 @@
 import EditorProvider from './EditorProvider'
 import LayoutProvider from './LayoutProvider'
 import ThothInterfaceProvider from './ThothInterfaceProvider'
+import InspectorProvider from './InspectorProvider'
 
-const providers = [ThothInterfaceProvider, EditorProvider, LayoutProvider]
+const providers = [
+  ThothInterfaceProvider,
+  EditorProvider,
+  LayoutProvider,
+  InspectorProvider,
+]
 
 function ComposeProviders({ providers, children, ...parentProps }) {
   const _providers = [...providers].reverse()

From 58d58159bd53c047da8efcb7839912171f36515e Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 13:53:01 -0700
Subject: [PATCH 119/531] Import and use pubsub in inspector provider

---
 client/src/workspaces/contexts/InspectorProvider.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/client/src/workspaces/contexts/InspectorProvider.tsx b/client/src/workspaces/contexts/InspectorProvider.tsx
index 22c1844f7..e5b39db61 100644
--- a/client/src/workspaces/contexts/InspectorProvider.tsx
+++ b/client/src/workspaces/contexts/InspectorProvider.tsx
@@ -1,3 +1,4 @@
+import { usePubSub } from '@/contexts/PubSubProvider'
 import { createContext, useContext } from 'react'
 
 type InspectorContext = {}
@@ -7,6 +8,8 @@ const Context = createContext<InspectorContext>(undefined!)
 export const useInspector = () => useContext(Context)
 
 const InspectorProvider = ({ children }) => {
+  const { subscribe, publish, events } = usePubSub()
+
   const publicInterface: InspectorContext = {}
 
   return <Context.Provider value={publicInterface}>{children}</Context.Provider>

From 7e1bd8b43c2a544b470cbf021c08d27cebea135e Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 13:54:38 -0700
Subject: [PATCH 120/531] Hook up subscription to inspector set event in
 provider

---
 .../workspaces/contexts/InspectorProvider.tsx | 36 +++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/client/src/workspaces/contexts/InspectorProvider.tsx b/client/src/workspaces/contexts/InspectorProvider.tsx
index e5b39db61..86a44f5e0 100644
--- a/client/src/workspaces/contexts/InspectorProvider.tsx
+++ b/client/src/workspaces/contexts/InspectorProvider.tsx
@@ -1,5 +1,6 @@
 import { usePubSub } from '@/contexts/PubSubProvider'
-import { createContext, useContext } from 'react'
+import { InspectorData } from '@latitudegames/thoth-core/types'
+import { createContext, useContext, useEffect, useState } from 'react'
 
 type InspectorContext = {}
 
@@ -7,9 +8,40 @@ const Context = createContext<InspectorContext>(undefined!)
 
 export const useInspector = () => useContext(Context)
 
-const InspectorProvider = ({ children }) => {
+const InspectorProvider = ({ children, tab }) => {
   const { subscribe, publish, events } = usePubSub()
 
+  const [inspectorData, setInspectorData] = useState<InspectorData | null>(null)
+
+  // inspector subscription
+  useEffect(() => {
+    return subscribe(
+      events.$INSPECTOR_SET(tab.id),
+      (event, data: InspectorData) => {
+        if (data?.nodeId !== inspectorData?.nodeId) setInspectorData(null)
+        setInspectorData(data)
+
+        if (!data.dataControls) return
+
+        // Handle components in a special way here.  Could probaby abstract this better
+
+        Object.entries(data.dataControls).forEach(([, control]) => {
+          if (control?.options?.editor) {
+            // we relay data to the text editor component for display here as well.
+            // const textData = {
+            //   data: data.data[control.dataKey],
+            //   nodeId: data.nodeId,
+            //   name: data.name,
+            //   control: control,
+            //   options: control.options,
+            // }
+            // setTextEditorData(textData)
+          }
+        })
+      }
+    )
+  }, [events, subscribe, publish])
+
   const publicInterface: InspectorContext = {}
 
   return <Context.Provider value={publicInterface}>{children}</Context.Provider>

From 52941bf02c0141b957951f74bb70b5acbe3a80ab Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 13:57:43 -0700
Subject: [PATCH 121/531] Implement inspector public interface

---
 .../workspaces/contexts/InspectorProvider.tsx | 38 ++++++++++++++-----
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/client/src/workspaces/contexts/InspectorProvider.tsx b/client/src/workspaces/contexts/InspectorProvider.tsx
index 86a44f5e0..dd4a9f034 100644
--- a/client/src/workspaces/contexts/InspectorProvider.tsx
+++ b/client/src/workspaces/contexts/InspectorProvider.tsx
@@ -2,7 +2,12 @@ import { usePubSub } from '@/contexts/PubSubProvider'
 import { InspectorData } from '@latitudegames/thoth-core/types'
 import { createContext, useContext, useEffect, useState } from 'react'
 
-type InspectorContext = {}
+type InspectorContext = {
+  inspectorData: InspectorData | null
+  textEditorData: Partial<InspectorData> | null
+  saveTextEditor: Function
+  saveInspector: Function
+}
 
 const Context = createContext<InspectorContext>(undefined!)
 
@@ -13,12 +18,15 @@ const InspectorProvider = ({ children, tab }) => {
 
   const [inspectorData, setInspectorData] = useState<InspectorData | null>(null)
 
+  const [textEditorData, setTextEditorData] = useState({})
+
   // inspector subscription
   useEffect(() => {
     return subscribe(
       events.$INSPECTOR_SET(tab.id),
       (event, data: InspectorData) => {
         if (data?.nodeId !== inspectorData?.nodeId) setInspectorData(null)
+
         setInspectorData(data)
 
         if (!data.dataControls) return
@@ -28,21 +36,31 @@ const InspectorProvider = ({ children, tab }) => {
         Object.entries(data.dataControls).forEach(([, control]) => {
           if (control?.options?.editor) {
             // we relay data to the text editor component for display here as well.
-            // const textData = {
-            //   data: data.data[control.dataKey],
-            //   nodeId: data.nodeId,
-            //   name: data.name,
-            //   control: control,
-            //   options: control.options,
-            // }
-            // setTextEditorData(textData)
+            const textData = {
+              data: data.data[control.dataKey],
+              nodeId: data.nodeId,
+              name: data.name,
+              control: control,
+              options: control.options,
+            }
+
+            setTextEditorData(textData)
           }
         })
       }
     )
   }, [events, subscribe, publish])
 
-  const publicInterface: InspectorContext = {}
+  const saveTextEditor = () => {}
+
+  const saveInspector = () => {}
+
+  const publicInterface: InspectorContext = {
+    inspectorData,
+    textEditorData,
+    saveTextEditor,
+    saveInspector,
+  }
 
   return <Context.Provider value={publicInterface}>{children}</Context.Provider>
 }

From 765696becc9884b6da33d02037bfb17de86e9baa Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 13:59:00 -0700
Subject: [PATCH 122/531] Move set inspector event into its own constant

---
 .../workspaces/contexts/InspectorProvider.tsx | 43 +++++++++----------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/client/src/workspaces/contexts/InspectorProvider.tsx b/client/src/workspaces/contexts/InspectorProvider.tsx
index dd4a9f034..c9e16c17f 100644
--- a/client/src/workspaces/contexts/InspectorProvider.tsx
+++ b/client/src/workspaces/contexts/InspectorProvider.tsx
@@ -20,35 +20,34 @@ const InspectorProvider = ({ children, tab }) => {
 
   const [textEditorData, setTextEditorData] = useState({})
 
+  const SET_INSPECTOR = events.$INSPECTOR_SET(tab.id)
+
   // inspector subscription
   useEffect(() => {
-    return subscribe(
-      events.$INSPECTOR_SET(tab.id),
-      (event, data: InspectorData) => {
-        if (data?.nodeId !== inspectorData?.nodeId) setInspectorData(null)
-
-        setInspectorData(data)
+    return subscribe(SET_INSPECTOR, (_, data: InspectorData) => {
+      if (data?.nodeId !== inspectorData?.nodeId) setInspectorData(null)
 
-        if (!data.dataControls) return
+      setInspectorData(data)
 
-        // Handle components in a special way here.  Could probaby abstract this better
+      if (!data.dataControls) return
 
-        Object.entries(data.dataControls).forEach(([, control]) => {
-          if (control?.options?.editor) {
-            // we relay data to the text editor component for display here as well.
-            const textData = {
-              data: data.data[control.dataKey],
-              nodeId: data.nodeId,
-              name: data.name,
-              control: control,
-              options: control.options,
-            }
+      // Handle components in a special way here.  Could probaby abstract this better
 
-            setTextEditorData(textData)
+      Object.entries(data.dataControls).forEach(([, control]) => {
+        if (control?.options?.editor) {
+          // we relay data to the text editor component for display here as well.
+          const textData = {
+            data: data.data[control.dataKey],
+            nodeId: data.nodeId,
+            name: data.name,
+            control: control,
+            options: control.options,
           }
-        })
-      }
-    )
+
+          setTextEditorData(textData)
+        }
+      })
+    })
   }, [events, subscribe, publish])
 
   const saveTextEditor = () => {}

From a60abccd156d2426f973d706e2433575c1c7e4b9 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 14:08:25 -0700
Subject: [PATCH 123/531] Subscribe to text editor events in inspector provider

---
 .../workspaces/contexts/InspectorProvider.tsx    | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/client/src/workspaces/contexts/InspectorProvider.tsx b/client/src/workspaces/contexts/InspectorProvider.tsx
index c9e16c17f..ee26c457f 100644
--- a/client/src/workspaces/contexts/InspectorProvider.tsx
+++ b/client/src/workspaces/contexts/InspectorProvider.tsx
@@ -25,8 +25,10 @@ const InspectorProvider = ({ children, tab }) => {
   // inspector subscription
   useEffect(() => {
     return subscribe(SET_INSPECTOR, (_, data: InspectorData) => {
+      // If the incoming data and existing data are at odds, clear inspector data
       if (data?.nodeId !== inspectorData?.nodeId) setInspectorData(null)
 
+      // Set the inspector
       setInspectorData(data)
 
       if (!data.dataControls) return
@@ -50,6 +52,20 @@ const InspectorProvider = ({ children, tab }) => {
     })
   }, [events, subscribe, publish])
 
+  // text editor subscription
+  useEffect(() => {
+    return subscribe(events.$TEXT_EDITOR_SET(tab.id), (event, data) => {
+      setTextEditorData(data)
+    })
+  }, [events, subscribe, publish])
+
+  // clear text editor subscription
+  useEffect(() => {
+    return subscribe(events.$TEXT_EDITOR_CLEAR(tab.id), () => {
+      setTextEditorData({})
+    })
+  }, [events, subscribe, publish])
+
   const saveTextEditor = () => {}
 
   const saveInspector = () => {}

From 5669924f12df563cfe9ad242ee385140c01f6d7a Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 14:17:47 -0700
Subject: [PATCH 124/531] Port last two methods into inspector provider

---
 .../workspaces/contexts/InspectorProvider.tsx | 35 +++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/client/src/workspaces/contexts/InspectorProvider.tsx b/client/src/workspaces/contexts/InspectorProvider.tsx
index ee26c457f..40a4ce4dd 100644
--- a/client/src/workspaces/contexts/InspectorProvider.tsx
+++ b/client/src/workspaces/contexts/InspectorProvider.tsx
@@ -1,4 +1,5 @@
 import { usePubSub } from '@/contexts/PubSubProvider'
+import { useGetSpellQuery, useSaveSpellMutation } from '@/state/api/spells'
 import { InspectorData } from '@latitudegames/thoth-core/types'
 import { createContext, useContext, useEffect, useState } from 'react'
 
@@ -16,6 +17,11 @@ export const useInspector = () => useContext(Context)
 const InspectorProvider = ({ children, tab }) => {
   const { subscribe, publish, events } = usePubSub()
 
+  const [saveSpell] = useSaveSpellMutation()
+  const { data: spell } = useGetSpellQuery(tab.spellId, {
+    skip: !tab.spellId,
+  })
+
   const [inspectorData, setInspectorData] = useState<InspectorData | null>(null)
 
   const [textEditorData, setTextEditorData] = useState({})
@@ -66,9 +72,34 @@ const InspectorProvider = ({ children, tab }) => {
     })
   }, [events, subscribe, publish])
 
-  const saveTextEditor = () => {}
+  //
+  const saveTextEditor = textData => {
+    const textUpdate = {
+      [textData.control.dataKey]: textData.data,
+    }
+
+    if (!inspectorData) return
+
+    const update = {
+      ...inspectorData,
+      data: {
+        ...inspectorData.data,
+        ...textUpdate,
+      },
+    }
+
+    publish(events.$NODE_SET(tab.id, textData.nodeId), update)
+    if (inspectorData) {
+      setInspectorData(update)
+    }
+    spell && saveSpell(spell)
+  }
 
-  const saveInspector = () => {}
+  const saveInspector = inspectorData => {
+    setInspectorData(inspectorData)
+    publish(events.$NODE_SET(tab.id, inspectorData.nodeId), inspectorData)
+    spell && saveSpell(spell)
+  }
 
   const publicInterface: InspectorContext = {
     inspectorData,

From 4a9e03bb071de20d7215b9ecab9894e15ac846a6 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 14:19:16 -0700
Subject: [PATCH 125/531] Strip inspector elements our of layout provider

---
 .../workspaces/contexts/LayoutProvider.tsx    | 91 -------------------
 1 file changed, 91 deletions(-)

diff --git a/client/src/workspaces/contexts/LayoutProvider.tsx b/client/src/workspaces/contexts/LayoutProvider.tsx
index 57c09079b..7ae90ce65 100644
--- a/client/src/workspaces/contexts/LayoutProvider.tsx
+++ b/client/src/workspaces/contexts/LayoutProvider.tsx
@@ -9,9 +9,6 @@ import {
 import { useContext, createContext, useEffect, useState, useRef } from 'react'
 
 import LoadingScreen from '../../components/LoadingScreen/LoadingScreen'
-import { usePubSub } from '@/contexts/PubSubProvider'
-import { useGetSpellQuery, useSaveSpellMutation } from '@/state/api/spells'
-import { InspectorData } from '@latitudegames/thoth-core/dist/types'
 import { saveTabLayout } from '@/state/tabs'
 import { useDispatch } from 'react-redux'
 // Component types are listed here which are used to load components from the data sent by rete
@@ -43,10 +40,6 @@ declare global {
 }
 
 type LayoutContext = {
-  inspectorData: InspectorData | null
-  textEditorData: Partial<InspectorData> | null
-  saveTextEditor: Function
-  saveInspector: Function
   currentModel: Model | null
   createModel: Function
   createOrFocus: Function
@@ -60,18 +53,10 @@ const Context = createContext<LayoutContext>(undefined!)
 export const useLayout = () => useContext(Context)
 
 const LayoutProvider = ({ children, tab }) => {
-  const { subscribe, publish, events } = usePubSub()
-
-  const [saveSpell] = useSaveSpellMutation()
-  const { data: spell } = useGetSpellQuery(tab.spellId, {
-    skip: !tab.spellId,
-  })
   const currentModelRef = useRef<Model | null>(null)
 
   const [currentModel, setCurrentModel] = useState<Model | null>(null)
   const [currentRef, setCurrentRef] = useState(null)
-  const [inspectorData, setInspectorData] = useState<InspectorData | null>(null)
-  const [textEditorData, setTextEditorData] = useState({})
 
   const updateCurrentModel = (model: Model) => {
     currentModelRef.current = model
@@ -83,78 +68,6 @@ const LayoutProvider = ({ children, tab }) => {
       currentModelRef?.current && currentModelRef?.current?.toJson()
   }, [currentModel])
 
-  // inspector subscription
-  useEffect(() => {
-    return subscribe(
-      events.$INSPECTOR_SET(tab.id),
-      (event, data: InspectorData) => {
-        if (data?.nodeId !== inspectorData?.nodeId) setInspectorData(null)
-        setInspectorData(data)
-
-        if (!data.dataControls) return
-
-        // Handle components in a special way here.  Could probaby abstract this better
-
-        Object.entries(data.dataControls).forEach(([, control]) => {
-          if (control?.options?.editor) {
-            // we relay data to the text editor component for display here as well.
-            const textData = {
-              data: data.data[control.dataKey],
-              nodeId: data.nodeId,
-              name: data.name,
-              control: control,
-              options: control.options,
-            }
-
-            setTextEditorData(textData)
-          }
-        })
-      }
-    )
-  }, [events, subscribe, publish])
-
-  // text editor subscription
-  useEffect(() => {
-    return subscribe(events.$TEXT_EDITOR_SET(tab.id), (event, data) => {
-      setTextEditorData(data)
-    })
-  }, [events, subscribe, publish])
-
-  // clear text editor subscription
-  useEffect(() => {
-    return subscribe(events.$TEXT_EDITOR_CLEAR(tab.id), () => {
-      setTextEditorData({})
-    })
-  }, [events, subscribe, publish])
-
-  const saveTextEditor = textData => {
-    const textUpdate = {
-      [textData.control.dataKey]: textData.data,
-    }
-
-    if (!inspectorData) return
-
-    const update = {
-      ...inspectorData,
-      data: {
-        ...inspectorData.data,
-        ...textUpdate,
-      },
-    }
-
-    publish(events.$NODE_SET(tab.id, textData.nodeId), update)
-    if (inspectorData) {
-      setInspectorData(update)
-    }
-    spell && saveSpell(spell)
-  }
-
-  const saveInspector = inspectorData => {
-    setInspectorData(inspectorData)
-    publish(events.$NODE_SET(tab.id, inspectorData.nodeId), inspectorData)
-    spell && saveSpell(spell)
-  }
-
   const createModel = json => {
     const model = Model.fromJson(json)
     updateCurrentModel(model)
@@ -219,10 +132,6 @@ const LayoutProvider = ({ children, tab }) => {
   }
 
   const publicInterface = {
-    inspectorData,
-    textEditorData,
-    saveTextEditor,
-    saveInspector,
     currentModel,
     createModel,
     createOrFocus,

From 38e81ac031e7c06f5e0e80d0067a7ac368db79b1 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 14:34:12 -0700
Subject: [PATCH 126/531] Convert inspector window to ts and import new
 inspector context

---
 ...nspectorWindow.jsx => InspectorWindow.tsx} | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)
 rename client/src/workspaces/spells/windows/{InspectorWindow.jsx => InspectorWindow.tsx} (77%)

diff --git a/client/src/workspaces/spells/windows/InspectorWindow.jsx b/client/src/workspaces/spells/windows/InspectorWindow.tsx
similarity index 77%
rename from client/src/workspaces/spells/windows/InspectorWindow.jsx
rename to client/src/workspaces/spells/windows/InspectorWindow.tsx
index ab836199f..a949ae285 100644
--- a/client/src/workspaces/spells/windows/InspectorWindow.jsx
+++ b/client/src/workspaces/spells/windows/InspectorWindow.tsx
@@ -1,14 +1,15 @@
 import { useEffect, useState } from 'react'
 
-import { useLayout } from '../../contexts/LayoutProvider'
 import { useModal } from '@/contexts/ModalProvider'
 import Icon, { componentCategories } from '../../../components/Icon/Icon'
 import Window from '../../../components/Window/Window'
 import DataControls from '../DataControls'
 import WindowMessage from '../components/WindowMessage'
+import { useInspector } from '@/workspaces/contexts/InspectorProvider'
+import { InspectorData } from '@latitudegames/thoth-core/types'
 
 const Inspector = props => {
-  const { inspectorData, saveInspector } = useLayout()
+  const { inspectorData, saveInspector } = useInspector()
   const [width, setWidth] = useState()
   const { openModal } = useModal()
 
@@ -30,6 +31,7 @@ const Inspector = props => {
   }, [props])
 
   const updateControl = control => {
+    if (!inspectorData) return
     const newData = {
       ...inspectorData,
       dataControls: {
@@ -42,6 +44,7 @@ const Inspector = props => {
   }
 
   const updateData = update => {
+    if (!inspectorData) return
     const newData = {
       ...inspectorData,
       data: {
@@ -57,7 +60,7 @@ const Inspector = props => {
     <>
       <div style={{ flex: 1, display: 'flex', alignItems: 'center' }}>
         <Icon
-          name={componentCategories[inspectorData?.category]}
+          name={componentCategories[inspectorData?.category || 0]}
           style={{ marginRight: 'var(--extraSmall)' }}
         />
         {inspectorData?.name}
@@ -79,16 +82,21 @@ const Inspector = props => {
     </>
   )
 
+  const DeprecationMessage = (inspectorData: InspectorData) => {
+    if (!inspectorData.deprecated) return <></>
+    return (
+      <div style={{ padding: 'var(--c1) var(--c2)' }}>
+        <h2 style={{ color: 'var(--red)' }}>WARNING</h2>
+        <p>{inspectorData.deprecationMessage}</p>
+      </div>
+    )
+  }
+
   if (!inspectorData) return <WindowMessage />
 
   return (
     <Window toolbar={toolbar} darker outline borderless>
-      {inspectorData.deprecated && (
-        <div style={{ padding: 'var(--c1) var(--c2)' }}>
-          <h2 style={{ color: 'var(--red)' }}>WARNING</h2>
-          <p>{inspectorData.deprecationMessage}</p>
-        </div>
-      )}
+      {DeprecationMessage(inspectorData)}
       <DataControls
         inspectorData={inspectorData}
         nodeId={inspectorData.nodeId}

From 4405d2ec542574a2a655163bf1f5f5741dd4819b Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 14:47:46 -0700
Subject: [PATCH 127/531] Convert text editor to ts and use new inspector
 provider

---
 ...tEditorWindow.jsx => TextEditorWindow.tsx} | 37 +++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)
 rename client/src/workspaces/spells/windows/{TextEditorWindow.jsx => TextEditorWindow.tsx} (75%)

diff --git a/client/src/workspaces/spells/windows/TextEditorWindow.jsx b/client/src/workspaces/spells/windows/TextEditorWindow.tsx
similarity index 75%
rename from client/src/workspaces/spells/windows/TextEditorWindow.jsx
rename to client/src/workspaces/spells/windows/TextEditorWindow.tsx
index a2e9f9de0..27a2954a6 100644
--- a/client/src/workspaces/spells/windows/TextEditorWindow.jsx
+++ b/client/src/workspaces/spells/windows/TextEditorWindow.tsx
@@ -2,20 +2,24 @@ import Editor from '@monaco-editor/react'
 import { useSnackbar } from 'notistack'
 import { useState, useEffect } from 'react'
 
-import { useLayout } from '../../contexts/LayoutProvider'
-import Window from '../../../components/Window/Window.tsx'
+import Window from '@components/Window/Window'
 import WindowMessage from '../components/WindowMessage'
 
 import '../../../screens/Thoth/thoth.module.css'
+import {
+  TextEditorData,
+  useInspector,
+} from '@/workspaces/contexts/InspectorProvider'
 
 const TextEditor = props => {
-  const [code, setCode] = useState('')
-  const [data, setData] = useState('')
-  const [height, setHeight] = useState()
-  const [editorOptions, setEditorOptions] = useState()
-  const [typing, setTyping] = useState(null)
-  const [language, setLanguage] = useState(null)
-  const { textEditorData, saveTextEditor } = useLayout()
+  const [code, setCode] = useState<string | undefined>(undefined)
+  const [data, setData] = useState<TextEditorData | null>(null)
+  const [height, setHeight] = useState<number>()
+  const [editorOptions, setEditorOptions] = useState<Record<string, any>>()
+  const [typing, setTyping] = useState<boolean>(false)
+  const [language, setLanguage] = useState<string | undefined>(undefined)
+
+  const { textEditorData, saveTextEditor } = useInspector()
   const { enqueueSnackbar } = useSnackbar()
 
   const bottomHeight = 50
@@ -50,7 +54,7 @@ const TextEditor = props => {
   useEffect(() => {
     if (!textEditorData) return
     setData(textEditorData)
-    setCode(textEditorData.data)
+    setCode(textEditorData.data as string)
     setTyping(false)
 
     if (textEditorData?.options?.language) {
@@ -63,9 +67,12 @@ const TextEditor = props => {
       setHeight(props.node.rect.height - bottomHeight)
 
     // this is to dynamically set the appriopriate height so that Monaco editor doesnt break flexbox when resizing
-    props.node.setEventListener('resize', data => {
-      setTimeout(() => setHeight(data.rect.height - bottomHeight), 0)
-    })
+    props.node.setEventListener(
+      'resize',
+      (data: { rect: { height: number } }) => {
+        setTimeout(() => setHeight(data.rect.height - bottomHeight), 0)
+      }
+    )
   }, [props.node])
 
   // debounce for delayed save
@@ -97,7 +104,7 @@ const TextEditor = props => {
     save(code)
   }
 
-  const updateCode = code => {
+  const updateCode = (code: string) => {
     setCode(code)
     const update = {
       ...data,
@@ -116,7 +123,7 @@ const TextEditor = props => {
     </>
   )
 
-  if (!textEditorData.control)
+  if (!textEditorData?.control)
     return <WindowMessage content="Component has no editable text" />
 
   return (

From f95ca35e8b384ee4f4fe60ad568bdcfea21c0644 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 14:47:57 -0700
Subject: [PATCH 128/531] Add typing for text editor data

---
 client/src/workspaces/contexts/InspectorProvider.tsx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/client/src/workspaces/contexts/InspectorProvider.tsx b/client/src/workspaces/contexts/InspectorProvider.tsx
index 40a4ce4dd..35c9024ec 100644
--- a/client/src/workspaces/contexts/InspectorProvider.tsx
+++ b/client/src/workspaces/contexts/InspectorProvider.tsx
@@ -3,9 +3,16 @@ import { useGetSpellQuery, useSaveSpellMutation } from '@/state/api/spells'
 import { InspectorData } from '@latitudegames/thoth-core/types'
 import { createContext, useContext, useEffect, useState } from 'react'
 
+export type TextEditorData = {
+  options?: Record<string, any> | undefined
+  data?: string
+  control?: Record<string, any> | undefined
+  name?: string
+}
+
 type InspectorContext = {
   inspectorData: InspectorData | null
-  textEditorData: Partial<InspectorData> | null
+  textEditorData: TextEditorData | null
   saveTextEditor: Function
   saveInspector: Function
 }

From 8e3cd49e4797baff21d71a868b3e4b7078140126 Mon Sep 17 00:00:00 2001
From: Nick Walton <nickwalton00@gmail.com>
Date: Thu, 24 Mar 2022 20:29:01 -0700
Subject: [PATCH 129/531] fixed styling issues on the playtest and on the text
 editor

---
 client/src/screens/Thoth/thoth.module.css                 | 5 +++--
 client/src/workspaces/spells/windows/TextEditorWindow.tsx | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/src/screens/Thoth/thoth.module.css b/client/src/screens/Thoth/thoth.module.css
index df5451bd6..c8e73e2d3 100644
--- a/client/src/screens/Thoth/thoth.module.css
+++ b/client/src/screens/Thoth/thoth.module.css
@@ -44,7 +44,7 @@
   background-color: rgba(40, 40, 40, 0.95);
   color: rgba(150, 150, 150, 0.95);
   flex: 1;
-  font-family: "IBM Plex Mono", "mono";
+  font-family: 'IBM Plex Mono', 'mono';
   overflow-y: hidden;
   display: flex;
 }
@@ -76,6 +76,7 @@
 
 .playtest-input input {
   color: #fff;
+  width: 100%;
   border-radius: 4px;
   cursor: default;
   background-color: var(--dark-2);
@@ -117,7 +118,7 @@
   border-radius: var(--extraSmall) var(--extraSmall) 0px 0px;
 }
 .node-bottom-container {
-  font-family: "IBM Plex Mono", monospace !important;
+  font-family: 'IBM Plex Mono', monospace !important;
   padding: var(--extraSmall);
   display: flex;
   flex-direction: row;
diff --git a/client/src/workspaces/spells/windows/TextEditorWindow.tsx b/client/src/workspaces/spells/windows/TextEditorWindow.tsx
index 27a2954a6..367b5e18b 100644
--- a/client/src/workspaces/spells/windows/TextEditorWindow.tsx
+++ b/client/src/workspaces/spells/windows/TextEditorWindow.tsx
@@ -130,7 +130,7 @@ const TextEditor = props => {
     <Window toolbar={toolbar}>
       <Editor
         theme="sds-dark"
-        height={height}
+        // height={height} // This seemed to have been causing issues.
         language={language}
         value={code}
         options={editorOptions}

From f22cb34eac7270847cf1bd89d93af23bcaca7243 Mon Sep 17 00:00:00 2001
From: Nick Walton <nickwalton00@gmail.com>
Date: Thu, 24 Mar 2022 20:31:56 -0700
Subject: [PATCH 130/531] fix typescript issue

---
 .../spells/windows/TextEditorWindow.tsx       | 28 +++++++++----------
 yarn.lock                                     |  8 ------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/client/src/workspaces/spells/windows/TextEditorWindow.tsx b/client/src/workspaces/spells/windows/TextEditorWindow.tsx
index 367b5e18b..b45c015c3 100644
--- a/client/src/workspaces/spells/windows/TextEditorWindow.tsx
+++ b/client/src/workspaces/spells/windows/TextEditorWindow.tsx
@@ -14,7 +14,7 @@ import {
 const TextEditor = props => {
   const [code, setCode] = useState<string | undefined>(undefined)
   const [data, setData] = useState<TextEditorData | null>(null)
-  const [height, setHeight] = useState<number>()
+  // const [height, setHeight] = useState<number>()
   const [editorOptions, setEditorOptions] = useState<Record<string, any>>()
   const [typing, setTyping] = useState<boolean>(false)
   const [language, setLanguage] = useState<string | undefined>(undefined)
@@ -22,7 +22,7 @@ const TextEditor = props => {
   const { textEditorData, saveTextEditor } = useInspector()
   const { enqueueSnackbar } = useSnackbar()
 
-  const bottomHeight = 50
+  // const bottomHeight = 50
   const handleEditorWillMount = monaco => {
     monaco.editor.defineTheme('sds-dark', {
       base: 'vs-dark',
@@ -62,18 +62,18 @@ const TextEditor = props => {
     }
   }, [textEditorData])
 
-  useEffect(() => {
-    if (props?.node?.rect?.height)
-      setHeight(props.node.rect.height - bottomHeight)
-
-    // this is to dynamically set the appriopriate height so that Monaco editor doesnt break flexbox when resizing
-    props.node.setEventListener(
-      'resize',
-      (data: { rect: { height: number } }) => {
-        setTimeout(() => setHeight(data.rect.height - bottomHeight), 0)
-      }
-    )
-  }, [props.node])
+  // useEffect(() => {
+  //   if (props?.node?.rect?.height)
+  //     setHeight(props.node.rect.height - bottomHeight)
+
+  //   // this is to dynamically set the appriopriate height so that Monaco editor doesnt break flexbox when resizing
+  //   props.node.setEventListener(
+  //     'resize',
+  //     (data: { rect: { height: number } }) => {
+  //       setTimeout(() => setHeight(data.rect.height - bottomHeight), 0)
+  //     }
+  //   )
+  // }, [props.node])
 
   // debounce for delayed save
   useEffect(() => {
diff --git a/yarn.lock b/yarn.lock
index 5040c321b..4ea0845a9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11520,14 +11520,6 @@ rete-react-render-plugin@^0.2.1:
   resolved "https://registry.yarnpkg.com/rete-react-render-plugin/-/rete-react-render-plugin-0.2.1.tgz#71a6d73f18f850b85262563f678b40080a7b0e32"
   integrity sha512-2ZMXUP0v+EiejHVMqdrOmUwyDBHC2UDOJ/pFkElaZL1Kn/E40JZA5yzdBXi6ajYZI2DCzoW5ZBcA2Ihjtur8MQ==
 
-"rete@git+https://github.com/latitudegames/rete.git#master":
-  version "1.4.5"
-  uid "24565a81a2bbcdd4cd73b0a725977550cc8ff988"
-  resolved "git+https://github.com/latitudegames/rete.git#24565a81a2bbcdd4cd73b0a725977550cc8ff988"
-  dependencies:
-    lodash "^4.17.21"
-    watch "^1.0.2"
-
 "rete@https://github.com/latitudegames/rete.git#master":
   version "1.4.5"
   resolved "https://github.com/latitudegames/rete.git#24565a81a2bbcdd4cd73b0a725977550cc8ff988"

From 93d8210a3ef9e73118599292b38a1aef4fca91d2 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 21:39:28 -0700
Subject: [PATCH 131/531] Rename module component to spell component

---
 .../src/components/{deprecated/Module.ts => Spell.ts} | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
 rename core/src/components/{deprecated/Module.ts => Spell.ts} (89%)

diff --git a/core/src/components/deprecated/Module.ts b/core/src/components/Spell.ts
similarity index 89%
rename from core/src/components/deprecated/Module.ts
rename to core/src/components/Spell.ts
index 105a8147c..366c4e42f 100644
--- a/core/src/components/deprecated/Module.ts
+++ b/core/src/components/Spell.ts
@@ -6,14 +6,14 @@ import {
   NodeData,
   ThothNode,
   ThothWorkerInputs,
-} from '../../../types'
-import { ModuleControl } from '../../dataControls/ModuleControl'
-import { Task } from '../../plugins/taskPlugin/task'
-import { ThothComponent } from '../../thoth-component'
+} from '../../types'
+import { ModuleControl } from '../dataControls/ModuleControl'
+import { Task } from '../plugins/taskPlugin/task'
+import { ThothComponent } from '../thoth-component'
 
 const info = `The Module component allows you to add modules into your chain.  A module is a bundled self contained chain that defines inputs, outputs, and triggers using components.`
 
-export class ModuleComponent extends ThothComponent<ModuleWorkerOutput[]> {
+export class SpellComponent extends ThothComponent<ModuleWorkerOutput[]> {
   _task: Task
   updateModuleSockets: Function
   task
@@ -36,7 +36,6 @@ export class ModuleComponent extends ThothComponent<ModuleWorkerOutput[]> {
     this.category = 'Core'
     this.info = info
     this.noBuildUpdate = true
-    this.deprecated = true
   }
 
   builder(node: ThothNode) {

From 77e41c0309542476e144aa76c4b9e4756fbe1e10 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 21:39:48 -0700
Subject: [PATCH 132/531] Update import of spell componnet in main components
 loader

---
 core/src/components/components.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/components/components.ts b/core/src/components/components.ts
index 5c3b548fc..5f82f7de5 100644
--- a/core/src/components/components.ts
+++ b/core/src/components/components.ts
@@ -17,7 +17,7 @@ import { HuggingfaceComponent } from './Huggingface'
 import { InputComponent } from './Input'
 import { ItemTypeComponent } from './ItemDetector'
 import { JoinListComponent } from './JoinList'
-import { ModuleComponent } from './deprecated/Module'
+import { SpellComponent } from './Spell'
 import { Output } from './Output'
 import { ProseToScript } from './ProseToScript'
 import { SafetyVerifier } from './SafetyVerifier'
@@ -49,7 +49,7 @@ export const components = {
   inputFieldComponent: () => new InputFieldComponent(),
   itemTypeComponent: () => new ItemTypeComponent(),
   joinListComponent: () => new JoinListComponent(),
-  moduleComponent: () => new ModuleComponent(),
+  moduleComponent: () => new SpellComponent(),
   moduleInput: () => new ModuleInput(),
   moduleOutput: () => new ModuleOutput(),
   output: () => new Output(),

From 1cc85a62824046cd3558b201353c529c672b9e8e Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 21:43:17 -0700
Subject: [PATCH 133/531] Update events form module to subspell

---
 client/src/contexts/PubSubProvider.jsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/src/contexts/PubSubProvider.jsx b/client/src/contexts/PubSubProvider.jsx
index 689f92f05..776106990 100644
--- a/client/src/contexts/PubSubProvider.jsx
+++ b/client/src/contexts/PubSubProvider.jsx
@@ -15,10 +15,10 @@ export { PubSub }
 
 // Might want to namespace these
 export const events = {
-  ADD_MODULE: 'addModule',
-  UPDATE_MODULE: 'updateModule',
-  DELETE_MODULE: 'deleteModule',
-  $MODULE_UPDATED: moduleName => `moduleUpdated:${moduleName}`,
+  ADD_SUBSPELL: 'addModule',
+  UPDATE_SUBSPELL: 'updateModule',
+  DELETE_SUBSPELL: 'deleteModule',
+  $SUBSPELL_UPDATED: moduleName => `moduleUpdated:${moduleName}`,
   $PLAYTEST_INPUT: tabId => `playtestInput:${tabId}`,
   $PLAYTEST_PRINT: tabId => `playtestPrint:${tabId}`,
   $DEBUG_PRINT: tabId => `debugPrint:${tabId}`,

From 5f4e40aead2116c255d52a1bc78c8a1cf0147154 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 21:43:30 -0700
Subject: [PATCH 134/531] update events i backed up module provider

---
 client/src/contexts/ModuleProvider.tsx.bak | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/src/contexts/ModuleProvider.tsx.bak b/client/src/contexts/ModuleProvider.tsx.bak
index 0fac9161c..ceed9fbff 100644
--- a/client/src/contexts/ModuleProvider.tsx.bak
+++ b/client/src/contexts/ModuleProvider.tsx.bak
@@ -20,13 +20,13 @@ const ModuleProvider = ({ children }) => {
   const { events, publish, subscribe } = usePubSub()
   const { enqueueSnackbar } = useSnackbar()
   const { models } = useDB() as unknown as ModelsType
-  const { ADD_MODULE, UPDATE_MODULE, $MODULE_UPDATED } = events
+  const { ADD_SUBSPELL, UPDATE_SUBSPELL, $SUBSPELL_UPDATED } = events
 
   // Subscribe to all general update module events
   // and relay them to the individual module name subscribers
   useEffect(() => {
-    return subscribe(UPDATE_MODULE, (event, module) => {
-      publish($MODULE_UPDATED(module.name), module)
+    return subscribe(UPDATE_SUBSPELL, (event, module) => {
+      publish($SUBSPELL_UPDATED(module.name), module)
     })
   }, [])
 
@@ -53,7 +53,7 @@ const ModuleProvider = ({ children }) => {
 
       const json = module.toJSON()
 
-      publish(UPDATE_MODULE, json)
+      publish(UPDATE_SUBSPELL, json)
 
       return module
     } catch (err) {
@@ -68,7 +68,7 @@ const ModuleProvider = ({ children }) => {
 
   const newModule = async moduleOptions => {
     const module = await models.modules.newModule(moduleOptions)
-    publish(ADD_MODULE, module.toJSON())
+    publish(ADD_SUBSPELL, module.toJSON())
 
     return module
   }

From 459347b5d7f609ffa77e0ee9109bdcc47407ddb8 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 21:43:39 -0700
Subject: [PATCH 135/531] Update events in thoth interface provider

---
 .../workspaces/contexts/ThothInterfaceProvider.tsx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
index c3ee5c948..aa9e9e461 100644
--- a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
+++ b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
@@ -62,9 +62,9 @@ const ThothInterfaceProvider = ({ children, tab }) => {
     $DEBUG_INPUT,
     $TEXT_EDITOR_CLEAR,
     $NODE_SET,
-    ADD_MODULE,
-    UPDATE_MODULE,
-    $MODULE_UPDATED,
+    ADD_SUBSPELL,
+    UPDATE_SUBSPELL,
+    $SUBSPELL_UPDATED,
   } = events
 
   const onInspector = (node, callback) => {
@@ -74,25 +74,25 @@ const ThothInterfaceProvider = ({ children, tab }) => {
   }
 
   const onAddModule = callback => {
-    return subscribe(ADD_MODULE, (event, data) => {
+    return subscribe(ADD_SUBSPELL, (event, data) => {
       callback(data)
     })
   }
 
   const onUpdateModule = callback => {
-    return subscribe(UPDATE_MODULE, (event, data) => {
+    return subscribe(UPDATE_SUBSPELL, (event, data) => {
       callback(data)
     })
   }
 
   const onModuleUpdated = (moduleName, callback) => {
-    return subscribe($MODULE_UPDATED(moduleName), (event, data) => {
+    return subscribe($SUBSPELL_UPDATED(moduleName), (event, data) => {
       callback(data)
     })
   }
 
   const onDeleteModule = callback => {
-    return subscribe(UPDATE_MODULE, (event, data) => {
+    return subscribe(UPDATE_SUBSPELL, (event, data) => {
       callback(data)
     })
   }

From 59869322ad7b7c7c77cab1dbc42bcf1c17b3f5bb Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 21:45:09 -0700
Subject: [PATCH 136/531] Add spell select to data control

---
 client/src/workspaces/spells/DataControls/DataControls.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/src/workspaces/spells/DataControls/DataControls.jsx b/client/src/workspaces/spells/DataControls/DataControls.jsx
index 870a0adfd..5c06a69cb 100644
--- a/client/src/workspaces/spells/DataControls/DataControls.jsx
+++ b/client/src/workspaces/spells/DataControls/DataControls.jsx
@@ -11,6 +11,7 @@ import DropdownSelect from './DropdownSelect'
 import SocketGenerator from './SocketGenerator'
 import PlaytestControl from './PlaytestControl'
 import SwitchControl from './SwitchControl'
+import SpellSelect from './SpellSelect'
 
 const StubComponent = props => <div>{props.name}</div>
 
@@ -22,7 +23,7 @@ const controlMap = {
   input: Input,
   inputGenerator: InputGenerator,
   longText: LongText,
-  // moduleSelect: ModuleSelect,
+  spellSelect: SpellSelect,
   outputGenerator: OutputGenerator,
   slider: StubComponent,
   socketGenerator: SocketGenerator,

From aeb8ea860eb74c374a279fa313ca40c35a49f1d5 Mon Sep 17 00:00:00 2001
From: Nick Walton <nickwalton00@gmail.com>
Date: Thu, 24 Mar 2022 23:12:27 -0700
Subject: [PATCH 137/531] made it so input no longer has a trigger socket even
 with playtest and trigger in and can be triggered by playtest

---
 client/package.json                           |  2 +-
 .../spells/DataControls/PlaytestControl.tsx   | 20 +------
 core/src/components/Input.ts                  | 18 +++---
 core/src/components/TriggerIn.ts              | 59 ++++++++++++++++++-
 core/src/plugins/taskPlugin/task.ts           |  2 +
 yarn.lock                                     | 20 -------
 6 files changed, 69 insertions(+), 52 deletions(-)

diff --git a/client/package.json b/client/package.json
index 5b2887767..346012dd1 100644
--- a/client/package.json
+++ b/client/package.json
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@callstack/async-storage": "^2.0.3",
-    "@latitudegames/thoth-core": "0.0.65",
+    "@latitudegames/thoth-core": "0.0.66",
     "@material-ui/core": "^4.12.1",
     "@material-ui/icons": "^4.11.2",
     "@monaco-editor/react": "^4.2.1",
diff --git a/client/src/workspaces/spells/DataControls/PlaytestControl.tsx b/client/src/workspaces/spells/DataControls/PlaytestControl.tsx
index 30fbcab1d..46a52e456 100644
--- a/client/src/workspaces/spells/DataControls/PlaytestControl.tsx
+++ b/client/src/workspaces/spells/DataControls/PlaytestControl.tsx
@@ -2,13 +2,6 @@ import { useState } from 'react'
 
 import Switch from '../../../components/Switch/Switch'
 
-type SocketType = {
-  name: string
-  socketKey: string
-  socketType: string
-  taskType: string
-}
-
 const SwitchControl = ({ control, updateData, initialValue }) => {
   const { dataKey, data } = control
   const { receivePlaytest } = initialValue
@@ -22,21 +15,10 @@ const SwitchControl = ({ control, updateData, initialValue }) => {
     const playtest = e.target.checked
     setChecked(playtest)
 
-    const outputs = [] as SocketType[]
-
-    if (playtest) {
-      outputs.push({
-        name: 'Playtest trigger',
-        socketKey: 'trigger',
-        socketType: 'triggerSocket',
-        taskType: 'option',
-      })
-    }
-
+    console.log('updating data')
     updateData({
       [dataKey]: {
         receivePlaytest: playtest,
-        outputs,
       },
     })
   }
diff --git a/core/src/components/Input.ts b/core/src/components/Input.ts
index 5898a8dd6..ff19b7885 100644
--- a/core/src/components/Input.ts
+++ b/core/src/components/Input.ts
@@ -67,17 +67,11 @@ export class InputComponent extends ThothComponent<InputReturn> {
         const playtestToggle = node.data.playtestToggle as unknown as {
           receivePlaytest: boolean
         }
+
         if (!playtestToggle.receivePlaytest) return
 
         // attach the text to the nodes data for access in worker
         node.data.text = text
-
-        const task = this.nodeTaskMap[node.id]
-
-        // will need to run this here with the stater rather than the text
-        task?.run(text)
-        task?.reset()
-        this.editor?.trigger('process')
       })
     }
   }
@@ -104,19 +98,19 @@ export class InputComponent extends ThothComponent<InputReturn> {
     const data = node?.data?.playtestToggle as
       | {
           receivePlaytest: boolean
-          outputs: []
         }
       | undefined
 
+    console.log('about to set so data is ', data)
     const togglePlaytest = new PlaytestControl({
       dataKey: 'playtestToggle',
       name: 'Receive from playtest input',
       defaultValue: {
-        receivePlaytest: data?.receivePlaytest || false,
-        outputs: data?.outputs || [],
+        receivePlaytest:
+          data?.receivePlaytest !== undefined ? data?.receivePlaytest : true,
       },
       ignored: ['output'],
-      label: 'Toggle playtest',
+      label: 'Recieve from playtest',
     })
 
     const toggleDefault = new SwitchControl({
@@ -128,6 +122,8 @@ export class InputComponent extends ThothComponent<InputReturn> {
 
     node.inspector.add(nameInput).add(togglePlaytest).add(toggleDefault)
 
+    console.log({ node })
+
     const value = node.data.text ? node.data.text : 'Input text here'
     const input = new TextInputControl({
       editor: this.editor,
diff --git a/core/src/components/TriggerIn.ts b/core/src/components/TriggerIn.ts
index f1c04f742..9b7a2c151 100644
--- a/core/src/components/TriggerIn.ts
+++ b/core/src/components/TriggerIn.ts
@@ -8,7 +8,9 @@ import { NodeData, ThothNode } from '../../types'
 import { InputControl } from '../dataControls/InputControl'
 import { TaskOptions } from '../plugins/taskPlugin/task'
 import { triggerSocket } from '../sockets'
+import { EngineContext } from '../engine'
 import { ThothComponent, ThothTask } from '../thoth-component'
+import { PlaytestControl } from '../dataControls/PlaytestControl'
 const info = `The trigger in allows you to pass values into your spell either from a higher level component or from the server.  There must be one single trigger into a spell for now as the server does not support multiple triggers.  Yet.`
 
 export class TriggerIn extends ThothComponent<void> {
@@ -45,6 +47,38 @@ export class TriggerIn extends ThothComponent<void> {
     this.info = info
   }
 
+  subscriptionMap: Record<string, Function> = {}
+
+  unsubscribe?: () => void
+
+  subscribeToPlaytest(node: ThothNode) {
+    const { onPlaytest } = this.editor?.thoth as EngineContext
+
+    // check node for the right data attribute
+    if (onPlaytest) {
+      // store the unsubscribe function in our node map
+      this.subscriptionMap[node.id] = onPlaytest((text: string) => {
+        // if the node doesnt have playtest toggled on, do nothing
+        const playtestToggle = node.data.playtestToggle as unknown as {
+          receivePlaytest: boolean
+        }
+        if (!playtestToggle.receivePlaytest) return
+
+        const task = this.nodeTaskMap[node.id]
+
+        // will need to run this here with the stater rather than the text
+        task?.run(text)
+        task?.reset()
+        this.editor?.trigger('process')
+      })
+    }
+  }
+
+  destroyed(node: ThothNode) {
+    if (this.subscriptionMap[node.id]) this.subscriptionMap[node.id]()
+    delete this.subscriptionMap[node.id]
+  }
+
   async run(node: ThothNode, data: NodeData) {
     const task = this.nodeTaskMap[node.id]
     await task.run(data)
@@ -54,6 +88,9 @@ export class TriggerIn extends ThothComponent<void> {
   // when we have enki hooked up and have grabbed all few shots, we would use the builder
   // to generate the appropriate inputs and ouputs for the fewshot at build time
   builder(node: ThothNode) {
+    if (this.subscriptionMap[node.id]) this.subscriptionMap[node.id]()
+    delete this.subscriptionMap[node.id]
+
     // create inputs here. First argument is the name, second is the type (matched to other components sockets), and third is the socket the i/o will use
     const out = new Rete.Output('trigger', 'Trigger', triggerSocket)
     node.data.socketKey = node?.data?.socketKey || uuidv4()
@@ -64,7 +101,27 @@ export class TriggerIn extends ThothComponent<void> {
       name: 'Trigger name',
     })
 
-    node.inspector.add(nameInput)
+    // subscribe the node to the playtest input data stream
+    this.subscribeToPlaytest(node)
+
+    const data = node?.data?.playtestToggle as
+      | {
+          receivePlaytest: boolean
+        }
+      | undefined
+
+    const togglePlaytest = new PlaytestControl({
+      dataKey: 'playtestToggle',
+      name: 'Receive from playtest input',
+      defaultValue: {
+        receivePlaytest:
+          data?.receivePlaytest !== undefined ? data?.receivePlaytest : true,
+      },
+      ignored: ['output'],
+      label: 'Receive from playtest',
+    })
+
+    node.inspector.add(nameInput).add(togglePlaytest)
 
     return node.addOutput(out)
   }
diff --git a/core/src/plugins/taskPlugin/task.ts b/core/src/plugins/taskPlugin/task.ts
index d9bd9fc3a..908dc3f7d 100644
--- a/core/src/plugins/taskPlugin/task.ts
+++ b/core/src/plugins/taskPlugin/task.ts
@@ -90,6 +90,8 @@ export class Task {
       fromNode,
     } = options
 
+    console.log({ data })
+
     // garbage means that the nodes output value will be reset after it is all done.
     if (needReset) garbage.push(this)
 
diff --git a/yarn.lock b/yarn.lock
index 4ea0845a9..f0f3c60b3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1469,26 +1469,6 @@
     "@types/yargs" "^16.0.0"
     chalk "^4.0.0"
 
-"@latitudegames/thoth-core@0.0.65":
-  version "0.0.65"
-  resolved "https://npm.pkg.github.com/download/@latitudegames/thoth-core/0.0.65/5f38b6af91b27e4285a0b665b572209754c81f865bb988b2dae14f02913d8d4b#10eceb4003a9abcd6e81115203d422ab7cc3bc06"
-  integrity sha512-YRoyD29A6n8vFwj3jACTOq9q+uwMV3PogQoftTJBb8CuUcA3AbKgMhHyNg7z1XDwMyzoOjJ0TMTBhFpInO8nsA==
-  dependencies:
-    deep-equal "^2.0.5"
-    handlebars "^4.7.7"
-    jsdom "^17.0.0"
-    license-webpack-plugin "^4.0.2"
-    path "^0.12.7"
-    react "^17.0.2"
-    regenerator-runtime "^0.13.9"
-    rete "https://github.com/latitudegames/rete.git#master"
-    rete-area-plugin "^0.2.1"
-    rete-connection-plugin "^0.9.0"
-    rete-context-menu-plugin "^0.6.0-rc.1"
-    rete-module-plugin "^0.4.1"
-    rete-react-render-plugin "^0.2.1"
-    uuid "^8.3.2"
-
 "@lerna/add@4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@lerna/add/-/add-4.0.0.tgz#c36f57d132502a57b9e7058d1548b7a565ef183f"

From c8c67a58e413f2181e1259a7ebc9f02453db8870 Mon Sep 17 00:00:00 2001
From: Nick Walton <nickwalton00@gmail.com>
Date: Thu, 24 Mar 2022 23:13:39 -0700
Subject: [PATCH 138/531] clean up console logs

---
 client/src/workspaces/spells/DataControls/PlaytestControl.tsx | 1 -
 core/src/components/Input.ts                                  | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/client/src/workspaces/spells/DataControls/PlaytestControl.tsx b/client/src/workspaces/spells/DataControls/PlaytestControl.tsx
index 46a52e456..3fb5db4b1 100644
--- a/client/src/workspaces/spells/DataControls/PlaytestControl.tsx
+++ b/client/src/workspaces/spells/DataControls/PlaytestControl.tsx
@@ -15,7 +15,6 @@ const SwitchControl = ({ control, updateData, initialValue }) => {
     const playtest = e.target.checked
     setChecked(playtest)
 
-    console.log('updating data')
     updateData({
       [dataKey]: {
         receivePlaytest: playtest,
diff --git a/core/src/components/Input.ts b/core/src/components/Input.ts
index ff19b7885..57e638ac7 100644
--- a/core/src/components/Input.ts
+++ b/core/src/components/Input.ts
@@ -101,7 +101,6 @@ export class InputComponent extends ThothComponent<InputReturn> {
         }
       | undefined
 
-    console.log('about to set so data is ', data)
     const togglePlaytest = new PlaytestControl({
       dataKey: 'playtestToggle',
       name: 'Receive from playtest input',
@@ -122,8 +121,6 @@ export class InputComponent extends ThothComponent<InputReturn> {
 
     node.inspector.add(nameInput).add(togglePlaytest).add(toggleDefault)
 
-    console.log({ node })
-
     const value = node.data.text ? node.data.text : 'Input text here'
     const input = new TextInputControl({
       editor: this.editor,

From aab4f62ae620ac32a847015cbe944b876a9883b3 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 23:26:47 -0700
Subject: [PATCH 139/531] Add chain helpers to core

---
 core/src/utils/chainHelpers.ts | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 core/src/utils/chainHelpers.ts

diff --git a/core/src/utils/chainHelpers.ts b/core/src/utils/chainHelpers.ts
new file mode 100644
index 000000000..2d6bf16c7
--- /dev/null
+++ b/core/src/utils/chainHelpers.ts
@@ -0,0 +1,25 @@
+import { NodesData } from 'rete/types/core/data'
+import { ChainData, NodeData } from '../../types'
+
+/**
+ * extracts all module inputs based upon a given key
+ */
+export const extractModuleInputKeys = (data: ChainData) =>
+  Object.values(data.nodes).reduce((inputKeys, node: NodeData) => {
+    if (node.name !== 'Universal Input') return inputKeys
+    if (node.data.name && !node.data.useDefault)
+      inputKeys.push(node.data.name as string)
+
+    return inputKeys
+  }, [] as string[])
+
+/**
+ * Extracts nodes from a map of nodes
+ */
+export function extractNodes(nodes: NodesData, map: Set<unknown>) {
+  const names = Array.from(map.keys())
+  return Object.keys(nodes)
+    .filter(k => names.includes(nodes[k].name))
+    .map(k => nodes[k])
+    .sort((n1, n2) => n1.position[1] - n2.position[1])
+}

From 5b25db30388e24bb6e21d216206de6d29844e650 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 23:26:57 -0700
Subject: [PATCH 140/531] Add run chain to core

---
 core/src/utils/runChain.ts | 89 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 89 insertions(+)
 create mode 100644 core/src/utils/runChain.ts

diff --git a/core/src/utils/runChain.ts b/core/src/utils/runChain.ts
new file mode 100644
index 000000000..cd958a164
--- /dev/null
+++ b/core/src/utils/runChain.ts
@@ -0,0 +1,89 @@
+import { ChainData, ModuleComponent, NodeData, Subspell } from '../../types'
+import { EngineContext, ThothEngine } from '../engine'
+import { Module } from '../plugins/modulePlugin/module'
+import { extractNodes } from './chainHelpers'
+
+type RunChainArguments = {
+  graph: ChainData
+  inputs: Record<string, unknown>
+  thoth: EngineContext
+  engine: ThothEngine
+  subspells?: Subspell[]
+}
+
+function getFirstNodeTrigger(data: ChainData, map: Set<unknown>) {
+  const extractedNodes = extractNodes(data.nodes, map)
+  return extractedNodes[0]
+}
+
+export const runChain = async ({
+  graph,
+  inputs,
+  thoth,
+  engine,
+  subspells,
+}: RunChainArguments) => {
+  // The module is an interface that the module system uses to write data to
+  // used internally by the module plugin, and we make use of it here too.
+  // TODO: Test runing nested modules and watch out for unexpected behaviour
+  // when child modules overwrite this with their own.
+
+  const module = new Module()
+
+  // Parse array of modules into a map of modules by module name
+  const subspellMap = subspells?.reduce((subspellList, subspell) => {
+    subspellList[subspell.name] = subspell
+    return subspellList
+  }, {} as Record<string, Subspell>)
+
+  // Update the modules available in the module manager during the graph run time
+  engine.moduleManager.setModules(subspellMap)
+
+  // Eventual outputs of running the Spell
+  const rawOutputs = {} as Record<string, unknown>
+
+  //Attaching inputs to the module, which are passed in when the engine runs.
+  // you can see this at work in the 'workerInputs' function of module-manager
+  // work inputs worker reads from the module inputs via the key in node.data.name
+  // important to note: even single string values are wrapped in arrays due to match the client editor format
+  module.read(inputs)
+
+  // ThothContext: map of services expected by Thoth components,
+  // allowing client and server provide different sets of helpers that match the common interface
+
+  // EngineContext passed down into the engine and is used by workers.
+  const context = {
+    module,
+    thoth,
+    silent: true,
+  }
+  // Engine process to set up the tasks and prime the system for the first 'run' command.
+  await engine?.process(graph as any, null, context)
+
+  // Collect all the "trigger ins" that the module manager has gathered
+  const { triggerIns } = engine.moduleManager
+
+  // Standard default component to start the serverside run sequence from, which has the run function on it.
+  const component = engine?.components.get(
+    'Module Trigger In'
+  ) as ModuleComponent
+
+  // Defaulting to the first node trigger to start our "run"
+  const triggeredNode = getFirstNodeTrigger(graph, triggerIns)
+
+  await component?.run(triggeredNode)
+  // Write all the raw data that was output by the module run to an object
+  module.write(rawOutputs)
+
+  const formattedOutputs: Record<string, unknown> = {}
+
+  // Format raw outputs based on the names assigned to Module Outputs node data in the graph
+  Object.values(graph.nodes)
+    .filter(node => node.name === 'Module Output' || node.name === 'Output')
+    .forEach((node: NodeData) => {
+      formattedOutputs[node.data.name as string] =
+        rawOutputs[node.data.socketKey as string]
+    })
+
+  return formattedOutputs
+}

From 5d17fc22ba660641c668685b90c4128508e59bce Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 23:27:06 -0700
Subject: [PATCH 141/531] Update types to include subspell type

---
 core/types.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/types.ts b/core/types.ts
index 3f8b9ccb5..aa8b54afb 100644
--- a/core/types.ts
+++ b/core/types.ts
@@ -104,6 +104,8 @@ export type OpenAIResponse = {
   finish_reason: string
 }
 
+export type Subspell = { name: string; id: string; data: ChainData }
+
 export type ModuleComponent = Component & {
   run: Function
 }

From b577c8165942be9b61199550d6dcd2fa5d61511b Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 24 Mar 2022 23:29:08 -0700
Subject: [PATCH 142/531] Export run chain and helpers from core

---
 core/src/index.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/src/index.ts b/core/src/index.ts
index 562a0e4f7..e065b3cc9 100644
--- a/core/src/index.ts
+++ b/core/src/index.ts
@@ -6,6 +6,8 @@ export { getComponents } from './components/components'
 export { initEditor } from './editor'
 export type { EngineContext } from './engine'
 export { Task } from './plugins/taskPlugin/task'
+export { runChain } from './utils/runChain'
+export * from './utils/chainHelpers'
 
 export default {
   getComponents,

From e5fda3572896bf49f5d5426f4b2b955a0ea650c2 Mon Sep 17 00:00:00 2001
From: Nick Walton <nickwalton00@gmail.com>
Date: Fri, 25 Mar 2022 09:15:21 -0700
Subject: [PATCH 143/531] revert package

---
 client/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/package.json b/client/package.json
index 346012dd1..5b2887767 100644
--- a/client/package.json
+++ b/client/package.json
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@callstack/async-storage": "^2.0.3",
-    "@latitudegames/thoth-core": "0.0.66",
+    "@latitudegames/thoth-core": "0.0.65",
     "@material-ui/core": "^4.12.1",
     "@material-ui/icons": "^4.11.2",
     "@monaco-editor/react": "^4.2.1",

From 8d3f56f8a32e4a1426c472763f0be5461dc2c33c Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Fri, 25 Mar 2022 11:09:48 -0700
Subject: [PATCH 144/531] git commit -m "conver input control from js to ts"

---
 core/src/dataControls/InputControl.js | 18 ------------------
 core/src/dataControls/InputControl.ts | 27 +++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 18 deletions(-)
 delete mode 100644 core/src/dataControls/InputControl.js
 create mode 100644 core/src/dataControls/InputControl.ts

diff --git a/core/src/dataControls/InputControl.js b/core/src/dataControls/InputControl.js
deleted file mode 100644
index ff2c48fdb..000000000
--- a/core/src/dataControls/InputControl.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { DataControl } from '../plugins/inspectorPlugin'
-
-export class InputControl extends DataControl {
-  constructor({ dataKey, name, icon = 'hand' }) {
-    const options = {
-      dataKey: dataKey,
-      name: name,
-      component: 'input',
-      icon,
-    }
-
-    super(options)
-  }
-
-  onData() {
-    return
-  }
-}
diff --git a/core/src/dataControls/InputControl.ts b/core/src/dataControls/InputControl.ts
new file mode 100644
index 000000000..7f7dc6394
--- /dev/null
+++ b/core/src/dataControls/InputControl.ts
@@ -0,0 +1,27 @@
+import { DataControl } from '../plugins/inspectorPlugin'
+
+export class InputControl extends DataControl {
+  constructor({
+    dataKey = '',
+    name = '',
+    icon = 'hand',
+    defaultValue,
+  }: {
+    dataKey: string
+    name: string
+    icon?: string
+    defaultValue?: unknown
+  }) {
+    super({
+      dataKey: dataKey,
+      name: name,
+      component: 'input',
+      defaultValue,
+      icon,
+    })
+  }
+
+  onData = () => {
+    return
+  }
+}

From 653367d4caab61c4e0650978b0114522264be291 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Fri, 25 Mar 2022 11:10:10 -0700
Subject: [PATCH 145/531] pass default values to the generator inputs

---
 core/src/components/Generator.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/src/components/Generator.ts b/core/src/components/Generator.ts
index fea0f609a..cea1b3683 100644
--- a/core/src/components/Generator.ts
+++ b/core/src/components/Generator.ts
@@ -69,23 +69,27 @@ export class Generator extends ThothComponent<Promise<WorkerReturn>> {
       dataKey: 'stop',
       name: 'Stop',
       icon: 'stop-sign',
+      defaultValue: `\\n`,
     })
 
     const temperatureControl = new InputControl({
       dataKey: 'temp',
       name: 'Temperature',
       icon: 'temperature',
+      defaultValue: 0.7,
     })
 
     const maxTokenControl = new InputControl({
       dataKey: 'maxTokens',
       name: 'Max Tokens',
       icon: 'moon',
+      defaultValue: 50,
     })
 
     const frequencyPenalty = new InputControl({
       dataKey: 'frequencyPenalty',
       name: 'Frequency Penalty',
+      defaultValue: '0',
     })
 
     node.inspector

From b606f98fbc3343dc2f0a44172f3544175e8962e1 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Fri, 25 Mar 2022 11:10:31 -0700
Subject: [PATCH 146/531] strip out forgotten comment

---
 core/src/plugins/inspectorPlugin/DataControl.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/src/plugins/inspectorPlugin/DataControl.ts b/core/src/plugins/inspectorPlugin/DataControl.ts
index b2a640e4f..9f9639578 100644
--- a/core/src/plugins/inspectorPlugin/DataControl.ts
+++ b/core/src/plugins/inspectorPlugin/DataControl.ts
@@ -18,7 +18,6 @@ export abstract class DataControl {
   options: object
   icon: string
   write: boolean
-  //Jake added below
   data: Record<string, unknown>
 
   constructor({

From 18cfdc077af4529658ae90a49e4d74e0f11a9373 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Fri, 25 Mar 2022 15:04:03 -0700
Subject: [PATCH 147/531] change Node from js to ts

---
 client/src/components/Node/{Node.js => Node.tsx} | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
 rename client/src/components/Node/{Node.js => Node.tsx} (96%)

diff --git a/client/src/components/Node/Node.js b/client/src/components/Node/Node.tsx
similarity index 96%
rename from client/src/components/Node/Node.js
rename to client/src/components/Node/Node.tsx
index 668924a95..4624b0860 100644
--- a/client/src/components/Node/Node.js
+++ b/client/src/components/Node/Node.tsx
@@ -1,10 +1,12 @@
-import React from 'react'
 import { Node, Socket, Control } from 'rete-react-render-plugin'
 
 import Icon, { componentCategories } from '../Icon/Icon'
 import css from './Node.module.css'
 
 export class MyNode extends Node {
+  props: { node: any; bindSocket: any; bindControl: any }
+  state: { outputs: any; controls: any; inputs: any; selected: any }
+
   render() {
     const { node, bindSocket, bindControl } = this.props
     const { outputs, controls, inputs, selected } = this.state

From 1b2659a4221e4850dd51fcc476f54796edf1134a Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Fri, 25 Mar 2022 15:04:19 -0700
Subject: [PATCH 148/531] import KeyCodePlugin

---
 core/src/editor.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/editor.ts b/core/src/editor.ts
index 86e87d601..c66d6661e 100644
--- a/core/src/editor.ts
+++ b/core/src/editor.ts
@@ -19,6 +19,7 @@ import SocketGenerator from './plugins/socketGenerator'
 import TaskPlugin from './plugins/taskPlugin'
 import { PubSubContext, ThothComponent } from './thoth-component'
 import DebuggerPlugin from './plugins/debuggerPlugin'
+import KeyCodePlugin from './plugins/keyCodePlugin'
 export class ThothEditor extends NodeEditor<EventsTypes> {
   pubSub: PubSubContext
   thoth: EngineContext

From 3eb69b25e49716a61fbebc41434b765b2a1a0704 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Fri, 25 Mar 2022 15:04:39 -0700
Subject: [PATCH 149/531] install the new keycode plugin

---
 core/src/editor.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/editor.ts b/core/src/editor.ts
index c66d6661e..c9b42e1aa 100644
--- a/core/src/editor.ts
+++ b/core/src/editor.ts
@@ -138,6 +138,7 @@ export const initEditor = async function ({
   editor.use(DebuggerPlugin)
   editor.use(ModulePlugin, { engine, modules } as unknown as void)
   editor.use(TaskPlugin)
+  editor.use(KeyCodePlugin)
 
   // ███╗   ███╗ ██████╗ ██████╗ ██╗   ██╗██╗     ███████╗███████╗
   // ████╗ ████║██╔═══██╗██╔══██╗██║   ██║██║     ██╔════╝██╔════╝

From 6b6af35eddf9267c609dfaa94712215bae620d74 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Fri, 25 Mar 2022 15:05:55 -0700
Subject: [PATCH 150/531] create keycode plugin

---
 core/src/plugins/keyCodePlugin/index.ts | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 core/src/plugins/keyCodePlugin/index.ts

diff --git a/core/src/plugins/keyCodePlugin/index.ts b/core/src/plugins/keyCodePlugin/index.ts
new file mode 100644
index 000000000..9e12248c9
--- /dev/null
+++ b/core/src/plugins/keyCodePlugin/index.ts
@@ -0,0 +1,24 @@
+import { IRunContextEditor, ThothNode } from '../../../types'
+
+function install(editor: IRunContextEditor) {
+  let currentNode: ThothNode | undefined
+
+  editor.on('nodeselect', (node: ThothNode) => {
+    if (currentNode && node.id === currentNode.id) return
+    currentNode = node
+  })
+
+  editor.on('keydown', (event: KeyboardEvent) => {
+    if (!currentNode) return
+    if (event.key === 'Delete') {
+      editor.removeNode(currentNode)
+    }
+  })
+}
+
+const defaultExport = {
+  name: 'keycodePlugin',
+  install,
+}
+
+export default defaultExport

From 3d15dce2bbbdd2fdd71795abdc69bf33362c0bc8 Mon Sep 17 00:00:00 2001
From: Nick Walton <nickwalton00@gmail.com>
Date: Fri, 25 Mar 2022 17:01:10 -0700
Subject: [PATCH 151/531] remove model helper file

---
 core/src/utils/modelHelper.ts | 56 -----------------------------------
 1 file changed, 56 deletions(-)
 delete mode 100644 core/src/utils/modelHelper.ts

diff --git a/core/src/utils/modelHelper.ts b/core/src/utils/modelHelper.ts
deleted file mode 100644
index 517048b7e..000000000
--- a/core/src/utils/modelHelper.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-export const modelMap = {
-  gptj: {
-    name: 'GPT-J',
-    model: 'gpt-j-6b-story-gutenberg-rw-bibliotik-raw',
-    modelSource: 'coreweave',
-    text: 'A long time ago, in a galaxy far far away there was',
-    length: 45,
-    topP: 0.9,
-    n: 4,
-    temperature: 1,
-    universalFormat: true,
-  },
-  jurassicJumbo: {
-    name: 'Jurassic Jumbo',
-    model: 'j1-jumbo',
-    modelSource: 'ai21',
-    prompt: 'A long time ago, in a galaxy far far away there was',
-    maxTokens: 45,
-    n: 3,
-    temperature: 1,
-    stop: '\n',
-    universalFormat: true,
-  },
-  jurassicLarge: {
-    name: 'Jurassic Large',
-    model: 'j1-large',
-    modelSource: 'ai21',
-    prompt: 'A long time ago, in a galaxy far far away there was',
-    maxTokens: 45,
-    n: 3,
-    temperature: 1,
-    stop: '\n',
-    universalFormat: true,
-  },
-  openai: {
-    modelSource: 'openai',
-    model: 'davinci',
-    prompt: 'Once upon a time in a forgotten forest',
-    temperature: 0.7,
-    maxTokens: 120,
-    stop: '\n',
-    n: 3,
-    universalFormat: true,
-  },
-  forefront: {
-    name: 'forefront',
-    modelSource: 'forefront',
-    model: 'forefront model',
-    prompt: 'A long time ago, in a galaxy far far away there was',
-    maxTokens: 50,
-    topP: 0.9,
-    n: 2,
-    universalFormat: true,
-    temperature: 1,
-  },
-}

From 146f9674866b1373d420b1887c23988c6d32fed0 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Fri, 25 Mar 2022 21:20:28 -0700
Subject: [PATCH 152/531] add CreateTab component

---
 client/src/components/TabBar/CreateTab.tsx | 24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 client/src/components/TabBar/CreateTab.tsx

diff --git a/client/src/components/TabBar/CreateTab.tsx b/client/src/components/TabBar/CreateTab.tsx
new file mode 100644
index 000000000..dfb17c247
--- /dev/null
+++ b/client/src/components/TabBar/CreateTab.tsx
@@ -0,0 +1,24 @@
+import css from './tabBar.module.css'
+import { VscAdd } from 'react-icons/vsc'
+import { useNavigate } from 'react-router-dom'
+
+const CreateTab = () => {
+  const navigate = useNavigate()
+
+  const onCreate = () => {
+    navigate('/home/create-new')
+  }
+
+  return (
+    <div
+      className={`${css['tabbar-tab']} ${css['create-spell-tab']}`}
+      onClick={onCreate}
+    >
+      <span>
+        <VscAdd />
+      </span>
+    </div>
+  )
+}
+
+export default CreateTab

From e57d4a37441de126db579a8c2fb279714fe7575e Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Fri, 25 Mar 2022 21:20:37 -0700
Subject: [PATCH 153/531] add styles for create tab component

---
 client/src/components/TabBar/tabBar.module.css | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/client/src/components/TabBar/tabBar.module.css b/client/src/components/TabBar/tabBar.module.css
index e67097239..d7594175f 100644
--- a/client/src/components/TabBar/tabBar.module.css
+++ b/client/src/components/TabBar/tabBar.module.css
@@ -79,3 +79,21 @@
   font-size: var(--c2);
   cursor: pointer !important;
 }
+
+.create-spell-tab {
+  display: flex;
+  color: var(--dark-5);
+  border-radius: 4px;
+  position: relative;
+  height: var(--c4);
+  border: 1px solid var(--dark-2);
+  width: 2vw;
+  align-items: center;
+  justify-content: center;
+  margin-left: 15%;
+  background-color: transparent;
+}
+
+.create-spell-tab:hover {
+  background-color: var(--dark-2);
+}

From 8ab13063a7adcf8df8647055c14e37c58b07950d Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Fri, 25 Mar 2022 21:21:07 -0700
Subject: [PATCH 154/531] add create-spell-tab class name type

---
 .../components/TabBar/tabBar.module.css.d.ts  | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/client/src/components/TabBar/tabBar.module.css.d.ts b/client/src/components/TabBar/tabBar.module.css.d.ts
index ce90a45d7..6f53ccf3f 100644
--- a/client/src/components/TabBar/tabBar.module.css.d.ts
+++ b/client/src/components/TabBar/tabBar.module.css.d.ts
@@ -1,13 +1,14 @@
 // This file is automatically generated.
 // Please do not change this file!
 interface CssExports {
-  'active': string;
-  'inactive': string;
-  'tabbar-section': string;
-  'tabbar-tab': string;
-  'tabbar-user': string;
-  'th-tabbar': string;
-  'thoth-logo': string;
+  active: string
+  'create-spell-tab': string
+  inactive: string
+  'tabbar-section': string
+  'tabbar-tab': string
+  'tabbar-user': string
+  'th-tabbar': string
+  'thoth-logo': string
 }
-export const cssExports: CssExports;
-export default cssExports;
+export const cssExports: CssExports
+export default cssExports

From f327a6644c1ab95efec7836e541e6610c2b4e3c2 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Fri, 25 Mar 2022 21:21:27 -0700
Subject: [PATCH 155/531] add tabbar section for createTab

---
 client/src/components/TabBar/TabBar.tsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/client/src/components/TabBar/TabBar.tsx b/client/src/components/TabBar/TabBar.tsx
index e2e420d9e..81e340c38 100644
--- a/client/src/components/TabBar/TabBar.tsx
+++ b/client/src/components/TabBar/TabBar.tsx
@@ -6,6 +6,7 @@ import { useNavigate } from 'react-router-dom'
 
 import Icon from '../Icon/Icon'
 import MenuBar from '../MenuBar/MenuBar'
+import CreateTab from './createTab'
 import css from './tabBar.module.css'
 
 const Tab = ({ tab, activeTab }) => {
@@ -51,6 +52,10 @@ const TabBar = ({ tabs, activeTab }) => {
         {tabs &&
           tabs.map((tab, i) => <Tab tab={tab} activeTab={activeTab} key={i} />)}
       </div>
+      <div className={css['tabbar-section']}>
+        <CreateTab />
+      </div>
+
       <div className={css['tabbar-user']}>
         {<Icon name="account" size={24} />}
       </div>

From d04c5e5fcdca1b94866cc4829a101fb113b83e8f Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 26 Mar 2022 00:32:17 -0700
Subject: [PATCH 156/531] Update tabbar css d ts

---
 .../components/TabBar/tabBar.module.css.d.ts  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/client/src/components/TabBar/tabBar.module.css.d.ts b/client/src/components/TabBar/tabBar.module.css.d.ts
index 6f53ccf3f..ddf43bf05 100644
--- a/client/src/components/TabBar/tabBar.module.css.d.ts
+++ b/client/src/components/TabBar/tabBar.module.css.d.ts
@@ -1,14 +1,14 @@
 // This file is automatically generated.
 // Please do not change this file!
 interface CssExports {
-  active: string
-  'create-spell-tab': string
-  inactive: string
-  'tabbar-section': string
-  'tabbar-tab': string
-  'tabbar-user': string
-  'th-tabbar': string
-  'thoth-logo': string
+  'active': string;
+  'create-spell-tab': string;
+  'inactive': string;
+  'tabbar-section': string;
+  'tabbar-tab': string;
+  'tabbar-user': string;
+  'th-tabbar': string;
+  'thoth-logo': string;
 }
-export const cssExports: CssExports
-export default cssExports
+export const cssExports: CssExports;
+export default cssExports;

From 6502c6b7462c5bca9a8881e89844350d1160f13a Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 26 Mar 2022 00:32:44 -0700
Subject: [PATCH 157/531] Fix typescript error in spell index from hard typing
 thoth editor to editor state

---
 client/src/workspaces/spells/index.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/src/workspaces/spells/index.tsx b/client/src/workspaces/spells/index.tsx
index 6dea76a44..62bb0dcd3 100644
--- a/client/src/workspaces/spells/index.tsx
+++ b/client/src/workspaces/spells/index.tsx
@@ -22,7 +22,7 @@ const Workspace = ({ tab, tabs, pubSub }) => {
   // Set up autosave for the workspaces
   useEffect(() => {
     if (!editor?.on) return
-    return editor.on(
+    const unsubscribe = editor.on(
       'save nodecreated noderemoved connectioncreated connectionremoved nodetranslated',
       debounce(() => {
         if (tab.type === 'spell') {
@@ -30,6 +30,8 @@ const Workspace = ({ tab, tabs, pubSub }) => {
         }
       }, 500)
     )
+
+    return unsubscribe as () => void
   }, [editor])
 
   useEffect(() => {

From a5734963b1cbfb8d5833fbd751513659ff264dd5 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 26 Mar 2022 00:33:17 -0700
Subject: [PATCH 158/531] Return if no editor in load chain

---
 client/src/workspaces/contexts/EditorProvider.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/src/workspaces/contexts/EditorProvider.tsx b/client/src/workspaces/contexts/EditorProvider.tsx
index 175f74737..aae5e188c 100644
--- a/client/src/workspaces/contexts/EditorProvider.tsx
+++ b/client/src/workspaces/contexts/EditorProvider.tsx
@@ -129,7 +129,8 @@ const EditorProvider = ({ children }) => {
   }
 
   const loadChain = graph => {
-    editor.loadGraph(graph)
+    if (!editorRef.current) return
+    editorRef.current.loadGraph(graph)
   }
 
   const setContainer = () => {

From 08300cda011fceeb0c868926f9cf78cc065b99e8 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 26 Mar 2022 00:33:38 -0700
Subject: [PATCH 159/531] Add thoth editor typing to editor provider

---
 client/src/workspaces/contexts/EditorProvider.tsx | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/client/src/workspaces/contexts/EditorProvider.tsx b/client/src/workspaces/contexts/EditorProvider.tsx
index aae5e188c..0b1330656 100644
--- a/client/src/workspaces/contexts/EditorProvider.tsx
+++ b/client/src/workspaces/contexts/EditorProvider.tsx
@@ -21,6 +21,7 @@ import {
   useThothInterface,
   ThothInterfaceContext,
 } from './ThothInterfaceProvider'
+import { ThothEditor } from '@latitudegames/thoth-core/src/editor'
 
 export type ThothTab = {
   layoutJson: string
@@ -57,11 +58,8 @@ const Context = createContext({
 export const useEditor = () => useContext(Context)
 
 const EditorProvider = ({ children }) => {
-  const [editor, setEditorState] = useState({
-    components: [],
-    loadGraph: (chain: any) => {},
-  })
-  const editorRef = useRef<IRunContextEditor | null>(null)
+  const [editor, setEditorState] = useState<ThothEditor | null>(null)
+  const editorRef = useRef<ThothEditor | null>(null)
   const pubSub = usePubSub()
 
   const setEditor = editor => {

From a59976369346de5c6c749544a6f4fc23afa0a880 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 26 Mar 2022 00:33:54 -0700
Subject: [PATCH 160/531] Add center node function to editor provider

---
 .../workspaces/contexts/EditorProvider.tsx    | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/client/src/workspaces/contexts/EditorProvider.tsx b/client/src/workspaces/contexts/EditorProvider.tsx
index 0b1330656..ed6a3b727 100644
--- a/client/src/workspaces/contexts/EditorProvider.tsx
+++ b/client/src/workspaces/contexts/EditorProvider.tsx
@@ -1,8 +1,5 @@
 import { initEditor } from '@latitudegames/thoth-core'
-import {
-  ChainData,
-  IRunContextEditor,
-} from '@latitudegames/thoth-core/dist/types'
+import { ChainData } from '@latitudegames/thoth-core/dist/types'
 import React, {
   useRef,
   useContext,
@@ -22,6 +19,7 @@ import {
   ThothInterfaceContext,
 } from './ThothInterfaceProvider'
 import { ThothEditor } from '@latitudegames/thoth-core/src/editor'
+import { zoomAt } from '../../../../core/src/plugins/areaPlugin/zoom-at'
 
 export type ThothTab = {
   layoutJson: string
@@ -36,8 +34,8 @@ export type ThothTab = {
 // TODO give better typing to the editor
 const Context = createContext({
   run: () => {},
-  getEditor: (): IRunContextEditor | null => null,
-  editor: {} as Record<string, any>,
+  getEditor: (): ThothEditor | null => null,
+  editor: {} as ThothEditor | null,
   serialize: (): ChainData | undefined => undefined,
   buildEditor: (
     el: HTMLDivElement,
@@ -53,6 +51,7 @@ const Context = createContext({
   setContainer: () => {},
   undo: () => {},
   redo: () => {},
+  centerNode: (nodeId: number): void => {},
 })
 
 export const useEditor = () => useContext(Context)
@@ -108,6 +107,14 @@ const EditorProvider = ({ children }) => {
     editorRef.current.trigger('undo')
   }
 
+  const centerNode = (nodeId: number): void => {
+    if (!editorRef.current) return
+    const editor = editorRef.current
+    const node = editor.nodes.find(n => n.id === +nodeId)
+
+    if (node) zoomAt(editor, [node])
+  }
+
   const redo = () => {
     if (!editorRef.current) return
     editorRef.current.trigger('redo')
@@ -149,6 +156,7 @@ const EditorProvider = ({ children }) => {
     undo,
     redo,
     setContainer,
+    centerNode,
   }
 
   return <Context.Provider value={publicInterface}>{children}</Context.Provider>

From 753b53cc4504cdaf962b1251f29bfe93d9a62e68 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 26 Mar 2022 00:34:05 -0700
Subject: [PATCH 161/531] Add command to center node.

---
 .../workspaces/spells/windows/DebugConsole/index.tsx   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/client/src/workspaces/spells/windows/DebugConsole/index.tsx b/client/src/workspaces/spells/windows/DebugConsole/index.tsx
index 8598ae421..4679210ca 100644
--- a/client/src/workspaces/spells/windows/DebugConsole/index.tsx
+++ b/client/src/workspaces/spells/windows/DebugConsole/index.tsx
@@ -4,6 +4,7 @@ import Terminal from 'react-console-emulator'
 import { useAuth } from '@/contexts/AuthProvider'
 import { usePubSub } from '@/contexts/PubSubProvider'
 import Window from '@components/Window/Window'
+import { useEditor } from '@/workspaces/contexts/EditorProvider'
 
 export type DebugMessage = {
   message: string
@@ -15,6 +16,7 @@ interface Terminal {
 
 const DebugConsole = ({ tab }) => {
   const [scrollToBottom, setScrollToBottom] = useState<boolean>(false)
+  const { centerNode } = useEditor()
   const { user } = useAuth()
   const {
     //  publish,
@@ -99,6 +101,14 @@ const DebugConsole = ({ tab }) => {
         return `${Array.from(arguments).join(' ')}`
       },
     },
+    node: {
+      description: 'Center a node on the editor',
+      usage: 'node <nodeId>',
+      fn: function (nodeId) {
+        centerNode(nodeId)
+        return ''
+      },
+    },
   }
 
   // https://github.com/linuswillner/react-console-emulator/tree/e2b602f631e8b7c57c4a7407491cbfb84f357519

From 3b429d09bd226468d5a6f192a1657eaa12d1e6dc Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 26 Mar 2022 21:02:45 -0700
Subject: [PATCH 162/531] Type type error

---
 client/src/components/TabBar/TabBar.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/TabBar/TabBar.tsx b/client/src/components/TabBar/TabBar.tsx
index 81e340c38..9e70a99d6 100644
--- a/client/src/components/TabBar/TabBar.tsx
+++ b/client/src/components/TabBar/TabBar.tsx
@@ -6,7 +6,7 @@ import { useNavigate } from 'react-router-dom'
 
 import Icon from '../Icon/Icon'
 import MenuBar from '../MenuBar/MenuBar'
-import CreateTab from './createTab'
+import CreateTab from './CreateTab'
 import css from './tabBar.module.css'
 
 const Tab = ({ tab, activeTab }) => {

From 21fb73b23bd2c91902b1aad2579d7d99b914c6ca Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 27 Mar 2022 19:57:07 -0700
Subject: [PATCH 163/531] Stop running engine in every action and add
 runProcess function

---
 core/src/editor.ts | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/core/src/editor.ts b/core/src/editor.ts
index c9b42e1aa..bd988dd04 100644
--- a/core/src/editor.ts
+++ b/core/src/editor.ts
@@ -27,6 +27,7 @@ export class ThothEditor extends NodeEditor<EventsTypes> {
   abort: unknown
   loadGraph: (graph: Data) => Promise<void>
   moduleManager: ModuleManager
+  runProcess: () => Promise<void>
 }
 
 /*
@@ -180,18 +181,6 @@ export const initEditor = async function ({
   editor.bind('run')
   editor.bind('save')
 
-  editor.on(
-    'process nodecreated noderemoved connectioncreated connectionremoved',
-    async () => {
-      // Here we would swap out local processing for an endpoint that we send the serialised JSON too.
-      // Then we run the fewshots, etc on the backend rather than on the client.
-      // Alternative for now is for the client to call our own /openai endpoint.
-      // NOTE need to consider authentication against Latitude API from a web client
-      await engine.abort()
-      await engine.process(editor.toJSON(), null, { thoth: thoth })
-    }
-  )
-
   // ██████╗ ██╗   ██╗██████╗ ██╗     ██╗ ██████╗
   // ██╔══██╗██║   ██║██╔══██╗██║     ██║██╔════╝
   // ██████╔╝██║   ██║██████╔╝██║     ██║██║
@@ -203,6 +192,11 @@ export const initEditor = async function ({
     await engine.abort()
   }
 
+  editor.runProcess = async () => {
+    await engine.abort()
+    await engine.process(editor.toJSON(), null, { thoth: thoth })
+  }
+
   editor.loadGraph = async (_graph: Data) => {
     const graph = JSON.parse(JSON.stringify(_graph))
     await engine.abort()
@@ -210,5 +204,8 @@ export const initEditor = async function ({
     editor.view.resize()
     AreaPlugin.zoomAt(editor)
   }
+
+  // Start the engine off on first load
+  editor.runProcess()
   return editor
 }

From 43e3799d8900986bdb5a96354f006b1f3bdc948b Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 27 Mar 2022 19:57:32 -0700
Subject: [PATCH 164/531] add process event to pubsub

---
 client/src/contexts/PubSubProvider.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/contexts/PubSubProvider.jsx b/client/src/contexts/PubSubProvider.jsx
index 776106990..dd152a336 100644
--- a/client/src/contexts/PubSubProvider.jsx
+++ b/client/src/contexts/PubSubProvider.jsx
@@ -35,6 +35,7 @@ export const events = {
   $CREATE_TEXT_EDITOR: tabId => `createTextEditor:${tabId}`,
   $CREATE_DEBUG_CONSOLE: tabId => `createDebugConsole:${tabId}`,
   $SERIALIZE: tabId => `serialize:${tabId}`,
+  $PROCESS: tabId => `process:${tabId}`,
   $EXPORT: tabId => `export:${tabId}`,
   $UNDO: tabId => `undo:${tabId}`,
   $REDO: tabId => `redo:${tabId}`,

From 5e16ca473656c0337bb54a55674ffeed5c54a0b0 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 27 Mar 2022 19:58:09 -0700
Subject: [PATCH 165/531] Add handler for process event in event handler

---
 client/src/screens/Thoth/components/EventHandler.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/src/screens/Thoth/components/EventHandler.tsx b/client/src/screens/Thoth/components/EventHandler.tsx
index 0024e8998..09d9e1eec 100644
--- a/client/src/screens/Thoth/components/EventHandler.tsx
+++ b/client/src/screens/Thoth/components/EventHandler.tsx
@@ -53,6 +53,7 @@ const EventHandler = ({ pubSub, tab }) => {
     $SERIALIZE,
     $EXPORT,
     $CLOSE_EDITOR,
+    $PROCESS,
   } = events
 
   const saveSpell = async () => {
@@ -83,6 +84,8 @@ const EventHandler = ({ pubSub, tab }) => {
     console.log(serialize())
   }
 
+  const onProcess = () => {}
+
   const onUndo = () => {
     undo()
   }
@@ -135,6 +138,7 @@ const EventHandler = ({ pubSub, tab }) => {
     [$CLOSE_EDITOR(tab.id)]: onCloseEditor,
     [$UNDO(tab.id)]: onUndo,
     [$REDO(tab.id)]: onRedo,
+    [$PROCESS(tab.id)]: onProcess,
   }
 
   useEffect(() => {

From 608662c42073f06c30ed80a4bfb28f62a4fcf0d1 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 27 Mar 2022 20:00:23 -0700
Subject: [PATCH 166/531] Process editor on event handler callback

---
 client/src/screens/Thoth/components/EventHandler.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/client/src/screens/Thoth/components/EventHandler.tsx b/client/src/screens/Thoth/components/EventHandler.tsx
index 09d9e1eec..99225efdf 100644
--- a/client/src/screens/Thoth/components/EventHandler.tsx
+++ b/client/src/screens/Thoth/components/EventHandler.tsx
@@ -84,7 +84,12 @@ const EventHandler = ({ pubSub, tab }) => {
     console.log(serialize())
   }
 
-  const onProcess = () => {}
+  const onProcess = () => {
+    const editor = getEditor()
+    if (!editor) return
+
+    editor.runProcess()
+  }
 
   const onUndo = () => {
     undo()

From 33282498196283369417aeee6ebbbb6bc1c1210d Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 27 Mar 2022 20:05:08 -0700
Subject: [PATCH 167/531] Update event strings to use subspoell rather than
 module

---
 client/src/contexts/PubSubProvider.jsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/src/contexts/PubSubProvider.jsx b/client/src/contexts/PubSubProvider.jsx
index dd152a336..3e693fbcd 100644
--- a/client/src/contexts/PubSubProvider.jsx
+++ b/client/src/contexts/PubSubProvider.jsx
@@ -15,10 +15,10 @@ export { PubSub }
 
 // Might want to namespace these
 export const events = {
-  ADD_SUBSPELL: 'addModule',
-  UPDATE_SUBSPELL: 'updateModule',
-  DELETE_SUBSPELL: 'deleteModule',
-  $SUBSPELL_UPDATED: moduleName => `moduleUpdated:${moduleName}`,
+  ADD_SUBSPELL: 'addSubspell',
+  UPDATE_SUBSPELL: 'updateSubspell',
+  DELETE_SUBSPELL: 'deleteSubspell',
+  $SUBSPELL_UPDATED: moduleName => `subspellUpdated:${moduleName}`,
   $PLAYTEST_INPUT: tabId => `playtestInput:${tabId}`,
   $PLAYTEST_PRINT: tabId => `playtestPrint:${tabId}`,
   $DEBUG_PRINT: tabId => `debugPrint:${tabId}`,

From 119bc17554e8dfa5775015e3c00528062d322853 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 27 Mar 2022 20:09:03 -0700
Subject: [PATCH 168/531] Add callback to runProcess command

---
 core/src/editor.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/editor.ts b/core/src/editor.ts
index bd988dd04..56b0cbcac 100644
--- a/core/src/editor.ts
+++ b/core/src/editor.ts
@@ -27,7 +27,7 @@ export class ThothEditor extends NodeEditor<EventsTypes> {
   abort: unknown
   loadGraph: (graph: Data) => Promise<void>
   moduleManager: ModuleManager
-  runProcess: () => Promise<void>
+  runProcess: (callback?: Function) => Promise<void>
 }
 
 /*
@@ -192,9 +192,11 @@ export const initEditor = async function ({
     await engine.abort()
   }
 
-  editor.runProcess = async () => {
+  editor.runProcess = async (callback: Function) => {
+    console.log()
     await engine.abort()
     await engine.process(editor.toJSON(), null, { thoth: thoth })
+    if (callback) callback()
   }
 
   editor.loadGraph = async (_graph: Data) => {

From effc1befa3a71bf98634033a8eafeba7f8659b09 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 27 Mar 2022 20:21:33 -0700
Subject: [PATCH 169/531] Remove console log

---
 core/src/plugins/taskPlugin/task.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/core/src/plugins/taskPlugin/task.ts b/core/src/plugins/taskPlugin/task.ts
index 908dc3f7d..d9bd9fc3a 100644
--- a/core/src/plugins/taskPlugin/task.ts
+++ b/core/src/plugins/taskPlugin/task.ts
@@ -90,8 +90,6 @@ export class Task {
       fromNode,
     } = options
 
-    console.log({ data })
-
     // garbage means that the nodes output value will be reset after it is all done.
     if (needReset) garbage.push(this)
 

From 8d26e80925b1937eada14d1d60b26b745b724973 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 27 Mar 2022 20:21:57 -0700
Subject: [PATCH 170/531] Remove another console log

---
 core/src/editor.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/src/editor.ts b/core/src/editor.ts
index 56b0cbcac..cb25ea721 100644
--- a/core/src/editor.ts
+++ b/core/src/editor.ts
@@ -193,7 +193,6 @@ export const initEditor = async function ({
   }
 
   editor.runProcess = async (callback: Function) => {
-    console.log()
     await engine.abort()
     await engine.process(editor.toJSON(), null, { thoth: thoth })
     if (callback) callback()

From c5fd569a69bdce4f6a513e94d7dc9551ad525db1 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 27 Mar 2022 20:22:19 -0700
Subject: [PATCH 171/531] Publish process before running playtest

---
 client/src/workspaces/contexts/ThothInterfaceProvider.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
index aa9e9e461..59cd6a714 100644
--- a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
+++ b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
@@ -65,6 +65,7 @@ const ThothInterfaceProvider = ({ children, tab }) => {
     ADD_SUBSPELL,
     UPDATE_SUBSPELL,
     $SUBSPELL_UPDATED,
+    $PROCESS,
   } = events
 
   const onInspector = (node, callback) => {
@@ -117,6 +118,7 @@ const ThothInterfaceProvider = ({ children, tab }) => {
 
   const onPlaytest = callback => {
     return subscribe($PLAYTEST_INPUT(tab.id), (event, data) => {
+      publish($PROCESS(tab.id))
       callback(data)
     })
   }

From fdb5daf614a8ff7a58d1e328ee1e3c442b14e2f8 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 27 Mar 2022 20:28:40 -0700
Subject: [PATCH 172/531] Use a set timeout of 0 to let pubsub to finish
 processing

---
 client/src/workspaces/contexts/ThothInterfaceProvider.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
index 59cd6a714..e76c08de6 100644
--- a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
+++ b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
@@ -119,7 +119,9 @@ const ThothInterfaceProvider = ({ children, tab }) => {
   const onPlaytest = callback => {
     return subscribe($PLAYTEST_INPUT(tab.id), (event, data) => {
       publish($PROCESS(tab.id))
-      callback(data)
+      // weird hack.  This staggers the process slightly to allow the published event to finish before the callback runs.
+      // No super elegant, but we need a better more centralised way to run the engine than these callbacks.
+      setTimeout(() => callback(data), 0)
     })
   }
 

From cfac45415574442fe6905782f8ad46d0716a3308 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 27 Mar 2022 23:58:46 -0700
Subject: [PATCH 173/531] Add json0 package

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 5d3347652..4907dd23c 100644
--- a/package.json
+++ b/package.json
@@ -36,6 +36,7 @@
     "lerna": "^4.0.0"
   },
   "dependencies": {
+    "@plotdb/json0": "^0.0.5",
     "@typescript-eslint/eslint-plugin": "^4.31.1",
     "@typescript-eslint/parser": "^4.31.1",
     "copyfiles": "^2.4.1",

From 44c0cde68c10e1df8c95240e8ed3f1d0d5c96959 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 27 Mar 2022 23:58:56 -0700
Subject: [PATCH 174/531] Update yarn lock file

---
 yarn.lock | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/yarn.lock b/yarn.lock
index f0f3c60b3..5067385e1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2442,6 +2442,15 @@
   dependencies:
     "@octokit/openapi-types" "^10.6.1"
 
+"@plotdb/json0@^0.0.5":
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/@plotdb/json0/-/json0-0.0.5.tgz#080b51f472796dc680d21f92aef1ce9f5f0de2b9"
+  integrity sha512-eerS2BBMXCL7QZ6y5w2TLcRsfRhXudf/LMRyfJ1+/XVaZTGAFPuZFjV0ys4RvWfQ9uW9/rkQJQRQ1rcO1Jx25g==
+  dependencies:
+    diff-match-patch "^1.0.4"
+    json0-ot-diff "^1.0.5"
+    ot-json0 "^1.1.0"
+
 "@polka/url@^1.0.0-next.20":
   version "1.0.0-next.20"
   resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.20.tgz#111b5db0f501aa89b05076fa31f0ea0e0c292cd3"
@@ -5559,6 +5568,11 @@ dezalgo@^1.0.0:
     asap "^2.0.0"
     wrappy "1"
 
+diff-match-patch@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.5.tgz#abb584d5f10cd1196dfc55aa03701592ae3f7b37"
+  integrity sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==
+
 diff-sequences@^26.6.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1"
@@ -8599,6 +8613,13 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
+json0-ot-diff@^1.0.5:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/json0-ot-diff/-/json0-ot-diff-1.1.2.tgz#3565b8b016992b750c364558f5b5ffd56a0749c2"
+  integrity sha512-je6cDbmPc+BkbfyvKo7y1jgQLTrX81L8fkKEIPXRUGFSxK4HTSF6u44ELR35i12tEIWh5+8KfIJH2aJgzKrFww==
+  dependencies:
+    deep-equal "^1.0.1"
+
 json5@2.x, json5@^2.1.2:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
@@ -10054,6 +10075,11 @@ osenv@^0.1.4:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
+ot-json0@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/ot-json0/-/ot-json0-1.1.0.tgz#f5edeff162673b62f0f136bb64724c40ac5e590d"
+  integrity sha512-wf5fci7GGpMYRDnbbdIFQymvhsbFACMHtxjivQo5KgvAHlxekyfJ9aPsRr6YfFQthQkk4bmsl5yESrZwC/oMYQ==
+
 p-each-series@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.2.0.tgz#105ab0357ce72b202a8a8b94933672657b5e2a9a"

From 91aae176f399846fc61628ccad9975570a470546 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 28 Mar 2022 11:28:37 -0700
Subject: [PATCH 175/531] fix missing quotes

---
 .../components/TabBar/tabBar.module.css.d.ts  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/client/src/components/TabBar/tabBar.module.css.d.ts b/client/src/components/TabBar/tabBar.module.css.d.ts
index 6f53ccf3f..ddf43bf05 100644
--- a/client/src/components/TabBar/tabBar.module.css.d.ts
+++ b/client/src/components/TabBar/tabBar.module.css.d.ts
@@ -1,14 +1,14 @@
 // This file is automatically generated.
 // Please do not change this file!
 interface CssExports {
-  active: string
-  'create-spell-tab': string
-  inactive: string
-  'tabbar-section': string
-  'tabbar-tab': string
-  'tabbar-user': string
-  'th-tabbar': string
-  'thoth-logo': string
+  'active': string;
+  'create-spell-tab': string;
+  'inactive': string;
+  'tabbar-section': string;
+  'tabbar-tab': string;
+  'tabbar-user': string;
+  'th-tabbar': string;
+  'thoth-logo': string;
 }
-export const cssExports: CssExports
-export default cssExports
+export const cssExports: CssExports;
+export default cssExports;

From b55878aef36b3bd85d7ab628055f620a364ebf3f Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 28 Mar 2022 11:28:53 -0700
Subject: [PATCH 176/531] update CreateTab import path

---
 client/src/components/TabBar/TabBar.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/TabBar/TabBar.tsx b/client/src/components/TabBar/TabBar.tsx
index 81e340c38..9e70a99d6 100644
--- a/client/src/components/TabBar/TabBar.tsx
+++ b/client/src/components/TabBar/TabBar.tsx
@@ -6,7 +6,7 @@ import { useNavigate } from 'react-router-dom'
 
 import Icon from '../Icon/Icon'
 import MenuBar from '../MenuBar/MenuBar'
-import CreateTab from './createTab'
+import CreateTab from './CreateTab'
 import css from './tabBar.module.css'
 
 const Tab = ({ tab, activeTab }) => {

From b608eed8e983129580f1ed62e8d7897f61a1e29c Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 28 Mar 2022 11:29:08 -0700
Subject: [PATCH 177/531] define new Delete event

---
 client/src/contexts/PubSubProvider.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/contexts/PubSubProvider.jsx b/client/src/contexts/PubSubProvider.jsx
index 689f92f05..89f7a2327 100644
--- a/client/src/contexts/PubSubProvider.jsx
+++ b/client/src/contexts/PubSubProvider.jsx
@@ -38,6 +38,7 @@ export const events = {
   $EXPORT: tabId => `export:${tabId}`,
   $UNDO: tabId => `undo:${tabId}`,
   $REDO: tabId => `redo:${tabId}`,
+  $DELETE: tabId => `delete:${tabId}`,
 }
 
 const PubSubProvider = ({ children }) => {

From bdd5f944f12c8b420b45e4f9bf67a11c586b135d Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 28 Mar 2022 11:29:25 -0700
Subject: [PATCH 178/531] add delete hotkey

---
 client/src/screens/Thoth/Thoth.tsx | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/client/src/screens/Thoth/Thoth.tsx b/client/src/screens/Thoth/Thoth.tsx
index 8fb65a6df..8a631e37f 100644
--- a/client/src/screens/Thoth/Thoth.tsx
+++ b/client/src/screens/Thoth/Thoth.tsx
@@ -65,6 +65,15 @@ const Thoth = ({ empty = false }) => {
     [pubSub, activeTab]
   )
 
+  useHotkeys(
+    'Control+Delete',
+    () => {
+      if (!pubSub || !activeTab) return
+      publish(events.$DELETE(activeTab.id))
+    },
+    [pubSub, activeTab]
+  )
+
   if (!activeTab) return <LoadingScreen />
 
   return (

From ce4e2039f69053119fb3d2e1a5bdc6c41be06c31 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 28 Mar 2022 11:31:02 -0700
Subject: [PATCH 179/531] destructure delete event from events

---
 client/src/screens/Thoth/components/EventHandler.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/screens/Thoth/components/EventHandler.tsx b/client/src/screens/Thoth/components/EventHandler.tsx
index 0024e8998..73681ce95 100644
--- a/client/src/screens/Thoth/components/EventHandler.tsx
+++ b/client/src/screens/Thoth/components/EventHandler.tsx
@@ -43,6 +43,7 @@ const EventHandler = ({ pubSub, tab }) => {
   const { events, subscribe } = pubSub
 
   const {
+    $DELETE,
     $UNDO,
     $REDO,
     $SAVE_SPELL,

From 12f9eb4f1191709fc0ac135bb3ed72df16a921c5 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 28 Mar 2022 11:32:51 -0700
Subject: [PATCH 180/531] destructure del from useEditor

---
 client/src/screens/Thoth/components/EventHandler.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/screens/Thoth/components/EventHandler.tsx b/client/src/screens/Thoth/components/EventHandler.tsx
index 73681ce95..a99c3b8cd 100644
--- a/client/src/screens/Thoth/components/EventHandler.tsx
+++ b/client/src/screens/Thoth/components/EventHandler.tsx
@@ -38,7 +38,7 @@ const EventHandler = ({ pubSub, tab }) => {
     spellRef.current = spell
   }, [spell])
 
-  const { serialize, getEditor, undo, redo } = useEditor()
+  const { serialize, getEditor, undo, redo, del } = useEditor()
 
   const { events, subscribe } = pubSub
 

From 419bcbb474a845de972ee6d8448e79e606d22d1d Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 28 Mar 2022 11:33:13 -0700
Subject: [PATCH 181/531] define onDelete helper

---
 client/src/screens/Thoth/components/EventHandler.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/src/screens/Thoth/components/EventHandler.tsx b/client/src/screens/Thoth/components/EventHandler.tsx
index a99c3b8cd..37ce7e0b7 100644
--- a/client/src/screens/Thoth/components/EventHandler.tsx
+++ b/client/src/screens/Thoth/components/EventHandler.tsx
@@ -92,6 +92,10 @@ const EventHandler = ({ pubSub, tab }) => {
     redo()
   }
 
+  const onDelete = () => {
+    del()
+  }
+
   const onExport = async () => {
     // refetch spell from local DB to ensure it is the most up to date
     const spell = { ...spellRef.current }

From bb03a230c2763ba144d080237743a9b83bf59451 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 28 Mar 2022 11:33:40 -0700
Subject: [PATCH 182/531] add delete to handlerMap

---
 client/src/screens/Thoth/components/EventHandler.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/screens/Thoth/components/EventHandler.tsx b/client/src/screens/Thoth/components/EventHandler.tsx
index 37ce7e0b7..202a5f02c 100644
--- a/client/src/screens/Thoth/components/EventHandler.tsx
+++ b/client/src/screens/Thoth/components/EventHandler.tsx
@@ -140,6 +140,7 @@ const EventHandler = ({ pubSub, tab }) => {
     [$CLOSE_EDITOR(tab.id)]: onCloseEditor,
     [$UNDO(tab.id)]: onUndo,
     [$REDO(tab.id)]: onRedo,
+    [$DELETE(tab.id)]: onDelete,
   }
 
   useEffect(() => {

From 664f551b575a0dc7e743d06a97536a0d30cdee8b Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 28 Mar 2022 11:34:00 -0700
Subject: [PATCH 183/531] add del to context

---
 client/src/workspaces/contexts/EditorProvider.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/workspaces/contexts/EditorProvider.tsx b/client/src/workspaces/contexts/EditorProvider.tsx
index 175f74737..94b24c946 100644
--- a/client/src/workspaces/contexts/EditorProvider.tsx
+++ b/client/src/workspaces/contexts/EditorProvider.tsx
@@ -52,6 +52,7 @@ const Context = createContext({
   setContainer: () => {},
   undo: () => {},
   redo: () => {},
+  del: () => {},
 })
 
 export const useEditor = () => useContext(Context)

From 53197ca010e87a93b6ac00c0e6b0fa4ea05424e2 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 28 Mar 2022 11:34:16 -0700
Subject: [PATCH 184/531] add del helper

---
 client/src/workspaces/contexts/EditorProvider.tsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/client/src/workspaces/contexts/EditorProvider.tsx b/client/src/workspaces/contexts/EditorProvider.tsx
index 94b24c946..ede09ce39 100644
--- a/client/src/workspaces/contexts/EditorProvider.tsx
+++ b/client/src/workspaces/contexts/EditorProvider.tsx
@@ -116,6 +116,11 @@ const EditorProvider = ({ children }) => {
     editorRef.current.trigger('redo')
   }
 
+  const del = () => {
+    if (!editorRef.current) return
+    editorRef.current.trigger('delete')
+  }
+
   const serialize = () => {
     if (!editorRef.current) return
     return editorRef.current.toJSON()

From b2ddec46e4f3aae8d72b8c3c85c04d68f381e327 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 28 Mar 2022 11:34:31 -0700
Subject: [PATCH 185/531] add del to publicInterface

---
 client/src/workspaces/contexts/EditorProvider.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/workspaces/contexts/EditorProvider.tsx b/client/src/workspaces/contexts/EditorProvider.tsx
index ede09ce39..122ddde99 100644
--- a/client/src/workspaces/contexts/EditorProvider.tsx
+++ b/client/src/workspaces/contexts/EditorProvider.tsx
@@ -155,6 +155,7 @@ const EditorProvider = ({ children }) => {
     getEditor,
     undo,
     redo,
+    del,
     setContainer,
   }
 

From 1895d7541376d4e81ca133018338d6bd15d43ef4 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 28 Mar 2022 11:35:02 -0700
Subject: [PATCH 186/531] bind delete to editor

---
 core/src/plugins/keyCodePlugin/index.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/src/plugins/keyCodePlugin/index.ts b/core/src/plugins/keyCodePlugin/index.ts
index 9e12248c9..76bee379c 100644
--- a/core/src/plugins/keyCodePlugin/index.ts
+++ b/core/src/plugins/keyCodePlugin/index.ts
@@ -1,6 +1,8 @@
 import { IRunContextEditor, ThothNode } from '../../../types'
 
 function install(editor: IRunContextEditor) {
+  editor.bind('delete')
+
   let currentNode: ThothNode | undefined
 
   editor.on('nodeselect', (node: ThothNode) => {

From 153eeb08fd361d6879d107f4c666d2a065291d96 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 28 Mar 2022 11:35:30 -0700
Subject: [PATCH 187/531] update keycode plugin to use new delete message

---
 core/src/plugins/keyCodePlugin/index.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/src/plugins/keyCodePlugin/index.ts b/core/src/plugins/keyCodePlugin/index.ts
index 76bee379c..42f039f47 100644
--- a/core/src/plugins/keyCodePlugin/index.ts
+++ b/core/src/plugins/keyCodePlugin/index.ts
@@ -10,11 +10,9 @@ function install(editor: IRunContextEditor) {
     currentNode = node
   })
 
-  editor.on('keydown', (event: KeyboardEvent) => {
+  editor.on('delete', () => {
     if (!currentNode) return
-    if (event.key === 'Delete') {
-      editor.removeNode(currentNode)
-    }
+    editor.removeNode(currentNode)
   })
 }
 

From f42ec1b8b462b3aa62e5f510d66e0f3564f8a2d4 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 28 Mar 2022 11:43:09 -0700
Subject: [PATCH 188/531] Add json0 and diff match patch to package json

---
 package.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package.json b/package.json
index 4907dd23c..7c911b21d 100644
--- a/package.json
+++ b/package.json
@@ -40,9 +40,11 @@
     "@typescript-eslint/eslint-plugin": "^4.31.1",
     "@typescript-eslint/parser": "^4.31.1",
     "copyfiles": "^2.4.1",
+    "diff-match-patch": "^1.0.5",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-import": "^2.24.2",
     "eslint-plugin-prettier": "^4.0.0",
+    "json0-ot-diff": "^1.1.2",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.4.1"
   }

From 85f93503adbfbb16924a696d0f4cbab89d9e532c Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 28 Mar 2022 11:43:17 -0700
Subject: [PATCH 189/531] Update yarn lock

---
 yarn.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 5067385e1..5e84bb140 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5568,7 +5568,7 @@ dezalgo@^1.0.0:
     asap "^2.0.0"
     wrappy "1"
 
-diff-match-patch@^1.0.4:
+diff-match-patch@^1.0.4, diff-match-patch@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.5.tgz#abb584d5f10cd1196dfc55aa03701592ae3f7b37"
   integrity sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==
@@ -8613,7 +8613,7 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
-json0-ot-diff@^1.0.5:
+json0-ot-diff@^1.0.5, json0-ot-diff@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/json0-ot-diff/-/json0-ot-diff-1.1.2.tgz#3565b8b016992b750c364558f5b5ffd56a0749c2"
   integrity sha512-je6cDbmPc+BkbfyvKo7y1jgQLTrX81L8fkKEIPXRUGFSxK4HTSF6u44ELR35i12tEIWh5+8KfIJH2aJgzKrFww==

From 560695212505d165080cf9ded4b579f2c415e153 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 28 Mar 2022 11:43:34 -0700
Subject: [PATCH 190/531] Add save diff to spell API state

---
 client/src/state/api/spells.ts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/client/src/state/api/spells.ts b/client/src/state/api/spells.ts
index 08dc87a0a..9750dbfeb 100644
--- a/client/src/state/api/spells.ts
+++ b/client/src/state/api/spells.ts
@@ -22,6 +22,11 @@ export interface Spell {
   updatedAt?: number
 }
 
+export interface Diff {
+  name: string
+  diff: Record<string, unknown>
+}
+
 export interface DeployedSpellVersion {
   spellId: string
   version: string
@@ -60,6 +65,14 @@ export const spellApi = rootApi.injectEndpoints({
         }
       },
     }),
+    saveDiff: builder.mutation<void, Diff>({
+      invalidatesTags: ['Spells'],
+      query: diffData => ({
+        url: 'game/spells/saveDiff',
+        method: 'POST',
+        body: diffData,
+      }),
+    }),
     saveSpell: builder.mutation<Partial<Spell>, Partial<Spell> | Spell>({
       invalidatesTags: ['Spell'],
       // needed to use queryFn as query option didnt seem to allow async functions.
@@ -144,6 +157,7 @@ export const {
   useNewSpellMutation,
   useDeleteSpellMutation,
   useSaveSpellMutation,
+  useSaveDiffMutation,
   useDeploySpellMutation,
   usePatchSpellMutation,
   useGetDeploymentsQuery,

From 5a6858942467871c16c40995ab51a794870fff50 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 28 Mar 2022 11:43:43 -0700
Subject: [PATCH 191/531] Add helper library for json0 operations

---
 client/src/utils/json0.ts | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 client/src/utils/json0.ts

diff --git a/client/src/utils/json0.ts b/client/src/utils/json0.ts
new file mode 100644
index 000000000..a9a5153f2
--- /dev/null
+++ b/client/src/utils/json0.ts
@@ -0,0 +1,4 @@
+import jsonDiff from 'json0-ot-diff'
+import diffMatchPatch from 'diff-match-patch'
+
+export const diff = (obj1, obj2) => jsonDiff(obj1, obj2, diffMatchPatch)

From bffb52fdeb30c19e0b6f94c56f73bb72da1b52c1 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 28 Mar 2022 11:44:11 -0700
Subject: [PATCH 192/531] Utilize json0 for applying state changes in autosave

---
 client/src/workspaces/spells/index.tsx | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/client/src/workspaces/spells/index.tsx b/client/src/workspaces/spells/index.tsx
index 62bb0dcd3..2dfcf38d5 100644
--- a/client/src/workspaces/spells/index.tsx
+++ b/client/src/workspaces/spells/index.tsx
@@ -1,8 +1,9 @@
 import { useEffect, useRef } from 'react'
 
+import { diff } from '../../utils/json0'
 import { useEditor } from '@/workspaces/contexts/EditorProvider'
 import { Layout } from '@/workspaces/contexts/LayoutProvider'
-import { useLazyGetSpellQuery, useSaveSpellMutation } from '@/state/api/spells'
+import { useLazyGetSpellQuery, useSaveDiffMutation } from '@/state/api/spells'
 import { debounce } from '@/utils/debounce'
 import EditorWindow from './windows/EditorWindow/'
 import EventHandler from '@/screens/Thoth/components/EventHandler'
@@ -16,7 +17,8 @@ import { Spell } from '../../state/api/spells'
 const Workspace = ({ tab, tabs, pubSub }) => {
   const spellRef = useRef<Spell>()
   const [loadSpell, { data: spellData }] = useLazyGetSpellQuery()
-  const [saveSpell] = useSaveSpellMutation()
+  // const [saveSpell] = useSaveSpellMutation()
+  const [saveDiff] = useSaveDiffMutation()
   const { editor } = useEditor()
 
   // Set up autosave for the workspaces
@@ -24,9 +26,20 @@ const Workspace = ({ tab, tabs, pubSub }) => {
     if (!editor?.on) return
     const unsubscribe = editor.on(
       'save nodecreated noderemoved connectioncreated connectionremoved nodetranslated',
-      debounce(() => {
-        if (tab.type === 'spell') {
-          saveSpell({ ...spellRef.current, chain: editor.toJSON() })
+      debounce(async data => {
+        if (tab.type === 'spell' && spellRef.current) {
+          const jsonDiff = diff(spellRef.current?.chain, editor.toJSON())
+
+          console.log('DIFF', jsonDiff)
+
+          const response = await saveDiff({
+            name: spellRef.current.name,
+            diff: jsonDiff,
+          })
+
+          console.log('diff response', response)
+
+          // saveSpell({ ...spellRef.current, chain: editor.toJSON() })
         }
       }, 500)
     )

From 49b9c5ada4116c747cf860f93ecc227e7fb61e2e Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 28 Mar 2022 11:45:37 -0700
Subject: [PATCH 193/531] Dont invalidate spell tag from save diff mutation

---
 client/src/state/api/spells.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/src/state/api/spells.ts b/client/src/state/api/spells.ts
index 9750dbfeb..a9a8eb6b1 100644
--- a/client/src/state/api/spells.ts
+++ b/client/src/state/api/spells.ts
@@ -66,7 +66,8 @@ export const spellApi = rootApi.injectEndpoints({
       },
     }),
     saveDiff: builder.mutation<void, Diff>({
-      invalidatesTags: ['Spells'],
+      // TODO this may introruce bugs.  Though I don't think we need to invalidate the spell cache here since the chain is loaded in live to the rete editor.
+      // invalidatesTags: ['Spell'],
       query: diffData => ({
         url: 'game/spells/saveDiff',
         method: 'POST',

From 2fa87b479c36ccc331e15338ca2d3939bf342394 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 28 Mar 2022 11:47:35 -0700
Subject: [PATCH 194/531] Show snackbar on autosave error

---
 client/src/workspaces/spells/index.tsx | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/client/src/workspaces/spells/index.tsx b/client/src/workspaces/spells/index.tsx
index 2dfcf38d5..60adc9428 100644
--- a/client/src/workspaces/spells/index.tsx
+++ b/client/src/workspaces/spells/index.tsx
@@ -13,9 +13,11 @@ import StateManager from '@/workspaces/spells/windows/StateManagerWindow'
 import TextEditor from './windows/TextEditorWindow'
 import DebugConsole from './windows/DebugConsole'
 import { Spell } from '../../state/api/spells'
+import { useSnackbar } from 'notistack'
 
 const Workspace = ({ tab, tabs, pubSub }) => {
   const spellRef = useRef<Spell>()
+  const { enqueueSnackbar } = useSnackbar()
   const [loadSpell, { data: spellData }] = useLazyGetSpellQuery()
   // const [saveSpell] = useSaveSpellMutation()
   const [saveDiff] = useSaveDiffMutation()
@@ -37,9 +39,11 @@ const Workspace = ({ tab, tabs, pubSub }) => {
             diff: jsonDiff,
           })
 
-          console.log('diff response', response)
-
-          // saveSpell({ ...spellRef.current, chain: editor.toJSON() })
+          if ('error' in response) {
+            enqueueSnackbar('Error saving spell', {
+              variant: 'error',
+            })
+          }
         }
       }, 500)
     )

From bc3ea47a83654089ed4977b177d8e37265387c14 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 28 Mar 2022 11:47:55 -0700
Subject: [PATCH 195/531] Clean up commented out constants

---
 client/src/workspaces/spells/index.tsx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/client/src/workspaces/spells/index.tsx b/client/src/workspaces/spells/index.tsx
index 60adc9428..536c909a2 100644
--- a/client/src/workspaces/spells/index.tsx
+++ b/client/src/workspaces/spells/index.tsx
@@ -19,7 +19,6 @@ const Workspace = ({ tab, tabs, pubSub }) => {
   const spellRef = useRef<Spell>()
   const { enqueueSnackbar } = useSnackbar()
   const [loadSpell, { data: spellData }] = useLazyGetSpellQuery()
-  // const [saveSpell] = useSaveSpellMutation()
   const [saveDiff] = useSaveDiffMutation()
   const { editor } = useEditor()
 
@@ -32,8 +31,6 @@ const Workspace = ({ tab, tabs, pubSub }) => {
         if (tab.type === 'spell' && spellRef.current) {
           const jsonDiff = diff(spellRef.current?.chain, editor.toJSON())
 
-          console.log('DIFF', jsonDiff)
-
           const response = await saveDiff({
             name: spellRef.current.name,
             diff: jsonDiff,

From 85a51ae94e8ace0db4014f164f50f65f4fc68d0c Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 28 Mar 2022 14:49:46 -0700
Subject: [PATCH 196/531] pass in gamestate to newSpell onReaderLoad

---
 client/src/screens/HomeScreen/HomeScreen.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/screens/HomeScreen/HomeScreen.tsx b/client/src/screens/HomeScreen/HomeScreen.tsx
index ada04aef3..85ccfba4d 100644
--- a/client/src/screens/HomeScreen/HomeScreen.tsx
+++ b/client/src/screens/HomeScreen/HomeScreen.tsx
@@ -37,6 +37,7 @@ const StartScreen = () => {
     await newSpell({
       chain: spellData.chain,
       name: spellData.name,
+      gameState: spellData.gameState,
     })
 
     dispatch(

From f9e64c34cca0f070771cf1a1befab64f63fa3691 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 11:09:04 -0700
Subject: [PATCH 197/531] Rename module control to spell control

---
 core/src/dataControls/ModuleControl.ts | 23 -----------------------
 core/src/dataControls/SpellControl.ts  | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 23 deletions(-)
 delete mode 100644 core/src/dataControls/ModuleControl.ts
 create mode 100644 core/src/dataControls/SpellControl.ts

diff --git a/core/src/dataControls/ModuleControl.ts b/core/src/dataControls/ModuleControl.ts
deleted file mode 100644
index 8066820be..000000000
--- a/core/src/dataControls/ModuleControl.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { DataControl } from '../plugins/inspectorPlugin'
-
-export class ModuleControl extends DataControl {
-  constructor({
-    name,
-    icon = 'sieve',
-    write = false,
-  }: {
-    name: string
-    icon?: string
-    write: boolean
-  }) {
-    const options = {
-      dataKey: 'module',
-      name: name,
-      component: 'moduleSelect',
-      write,
-      icon,
-    }
-
-    super(options)
-  }
-}
diff --git a/core/src/dataControls/SpellControl.ts b/core/src/dataControls/SpellControl.ts
new file mode 100644
index 000000000..5107a4817
--- /dev/null
+++ b/core/src/dataControls/SpellControl.ts
@@ -0,0 +1,14 @@
+import { DataControl } from '../plugins/inspectorPlugin'
+
+export class SpellControl extends DataControl {
+  constructor({ name, icon = 'sieve' }: { name: string; icon?: string }) {
+    const options = {
+      dataKey: 'spell',
+      name: name,
+      component: 'spellSelect',
+      icon,
+    }
+
+    super(options)
+  }
+}

From cb5e5350f29b36a1751093ec3d9dc7a632b057da Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 11:09:28 -0700
Subject: [PATCH 198/531] Use spell control and rip out module stuff from
 builder

---
 core/src/components/Spell.ts | 28 ++++------------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index 366c4e42f..68c7dc054 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -7,7 +7,7 @@ import {
   ThothNode,
   ThothWorkerInputs,
 } from '../../types'
-import { ModuleControl } from '../dataControls/ModuleControl'
+import { SpellControl } from '../dataControls/SpellControl'
 import { Task } from '../plugins/taskPlugin/task'
 import { ThothComponent } from '../thoth-component'
 
@@ -20,12 +20,11 @@ export class SpellComponent extends ThothComponent<ModuleWorkerOutput[]> {
   info
   subscriptionMap: Record<number, Function> = {}
   editor: any
-  deprecated = true
   noBuildUpdate: boolean
   category: string
 
   constructor() {
-    super('Module')
+    super('Spell')
     this.module = {
       nodeType: 'module',
     }
@@ -39,37 +38,18 @@ export class SpellComponent extends ThothComponent<ModuleWorkerOutput[]> {
   }
 
   builder(node: ThothNode) {
-    const moduleControl = new ModuleControl({
-      name: 'Module select',
-      write: false,
+    const moduleControl = new SpellControl({
+      name: 'Spell Select',
     })
 
-    if (node.data.module) {
-      this.subscribe(node)
-    }
-
     moduleControl.onData = (moduleName: string) => {
       this.updateSockets(node, moduleName)
-      this.subscribe(node)
     }
 
     node.inspector.add(moduleControl)
 
     return node
   }
-
-  destroyed(node: ThothNode) {
-    this.unsubscribe(node)
-  }
-
-  unsubscribe(node: ThothNode) {
-    if (!this.subscriptionMap[node.id]) return
-
-    this.subscriptionMap[node.id]()
-
-    delete this.subscriptionMap[node.id]
-  }
-
   async subscribe(node: ThothNode) {
     if (!node.data.module) return
     let cache: ModuleType

From 91cf1a8d752a5ea0f5849c792e0373163da5464b Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 11:09:45 -0700
Subject: [PATCH 199/531] Dont use module plugin in editor

---
 core/src/editor.ts | 42 ++----------------------------------------
 1 file changed, 2 insertions(+), 40 deletions(-)

diff --git a/core/src/editor.ts b/core/src/editor.ts
index cb25ea721..1dafd2e0c 100644
--- a/core/src/editor.ts
+++ b/core/src/editor.ts
@@ -5,7 +5,7 @@ import ContextMenuPlugin from 'rete-context-menu-plugin'
 import ReactRenderPlugin from 'rete-react-render-plugin'
 import { Data } from 'rete/types/core/data'
 
-import { EventsTypes, ModuleType } from '../types'
+import { EventsTypes } from '../types'
 import { getComponents } from './components/components'
 import { EngineContext, initSharedEngine } from './engine'
 import AreaPlugin from './plugins/areaPlugin'
@@ -13,7 +13,6 @@ import DisplayPlugin from './plugins/displayPlugin'
 import HistoryPlugin from './plugins/historyPlugin'
 import InspectorPlugin from './plugins/inspectorPlugin'
 import LifecyclePlugin from './plugins/lifecyclePlugin'
-import ModulePlugin from './plugins/modulePlugin'
 import { ModuleManager } from './plugins/modulePlugin/module-manager'
 import SocketGenerator from './plugins/socketGenerator'
 import TaskPlugin from './plugins/taskPlugin'
@@ -112,19 +111,6 @@ export const initEditor = async function ({
     scaleExtent: { min: 0.25, max: 2 },
   })
 
-  // const moduleDocs = await thoth.getModules()
-  const moduleDocs = [] as any[]
-
-  // Parse modules into dictionary of all modules and JSON values
-  let modules: Record<string, ModuleType> = moduleDocs
-    .map((doc: { toJSON: Function }) => doc.toJSON())
-    .reduce((acc: Record<string, ModuleType>, module: ModuleType) => {
-      // todo handle better mapping
-      // see moduleSelect.tsx
-      acc[module.name] = module
-      return acc
-    }, {} as Record<string, ModuleType>)
-
   // The engine is used to process/run the rete graph
 
   const engine = initSharedEngine({
@@ -137,34 +123,10 @@ export const initEditor = async function ({
 
   // WARNING: ModulePlugin needs to be initialized before TaskPlugin during engine setup
   editor.use(DebuggerPlugin)
-  editor.use(ModulePlugin, { engine, modules } as unknown as void)
+  // editor.use(ModulePlugin, { engine, modules } as unknown as void)
   editor.use(TaskPlugin)
   editor.use(KeyCodePlugin)
 
-  // ███╗   ███╗ ██████╗ ██████╗ ██╗   ██╗██╗     ███████╗███████╗
-  // ████╗ ████║██╔═══██╗██╔══██╗██║   ██║██║     ██╔════╝██╔════╝
-  // ██╔████╔██║██║   ██║██║  ██║██║   ██║██║     █████╗  ███████╗
-  // ██║╚██╔╝██║██║   ██║██║  ██║██║   ██║██║     ██╔══╝  ╚════██║
-  // ██║ ╚═╝ ██║╚██████╔╝██████╔╝╚██████╔╝███████╗███████╗███████║
-  // ╚═╝     ╚═╝ ╚═════╝ ╚═════╝  ╚═════╝ ╚══════╝╚══════╝╚══════╝
-
-  // add initial modules to the module manager
-  editor.moduleManager.setModules(modules)
-
-  // listen for pubsub onAddModule event to add modules
-  thoth.onAddModule((module: ModuleType) => {
-    editor.moduleManager.addModule(module)
-  })
-
-  // listen for update module event to update a module
-  thoth.onUpdateModule((module: ModuleType) => {
-    editor.moduleManager.updateModule(module)
-  })
-
-  thoth.onDeleteModule((module: ModuleType) => {
-    editor.moduleManager.deleteModule(module)
-  })
-
   // WARNING all the plugins from the editor get installed onto the component and modify it.  This effects the components registered in the engine, which already have plugins installed.
   components.forEach(c => {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment

From 342b2e58d78b8051de3f0ba63b2e905156be0063 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 12:00:57 -0700
Subject: [PATCH 200/531] Add option to prevent switching to a tab when desired

---
 client/src/state/tabs.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/client/src/state/tabs.ts b/client/src/state/tabs.ts
index f0aadf6c2..b040f1adb 100644
--- a/client/src/state/tabs.ts
+++ b/client/src/state/tabs.ts
@@ -65,8 +65,11 @@ export const tabSlice = createSlice({
   initialState,
   reducers: {
     openTab: (state, action) => {
+      const switchActive =
+        'switchActive' in action.payload ? action.payload.switchActive : true
+
       const activeTab = _activeTabSelector(state) as Tab
-      if (activeTab)
+      if (activeTab && switchActive)
         tabAdapater.updateOne(state, {
           id: activeTab.id,
           changes: { active: false },
@@ -75,11 +78,13 @@ export const tabSlice = createSlice({
       // Check if the tab is already open.
       const existingTab = selectTabBySpellId(state, action.payload.spellId)
 
+      if (existingTab && !switchActive) return
+
       if (existingTab && !action.payload.openNew) {
         tabAdapater.updateOne(state, {
           id: existingTab.id,
           changes: {
-            active: true,
+            active: switchActive,
           },
         })
         return

From 6b8c3ee1b0e1c56644a731f45805a1bc241a7478 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 12:01:04 -0700
Subject: [PATCH 201/531] Remove console logs

---
 client/src/contexts/AuthProvider.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/client/src/contexts/AuthProvider.tsx b/client/src/contexts/AuthProvider.tsx
index 1d9309e34..8327b9027 100644
--- a/client/src/contexts/AuthProvider.tsx
+++ b/client/src/contexts/AuthProvider.tsx
@@ -114,7 +114,6 @@ const AuthProvider = ({ children }: { children: ReactElement }) => {
     ) {
       setSessionInfo(sessionInfoParam)
       setUserInfo(userInfo)
-      console.log(userInfo)
 
       let search = window.location.search.toString()
       initialize(search)
@@ -145,7 +144,6 @@ const AuthProvider = ({ children }: { children: ReactElement }) => {
         // Check if User has an existing sessionId in local storage
         const sessionId = await getSessionId()
 
-        console.log('im running', sessionId)
         if (sessionId) {
           const sessionReq = await fetch(
             `${latitudeApiRootUrl}/user/auth/info?access_token=${sessionId}`

From 298d49372663d06a62b75d2f7ca789626f002c78 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 12:01:30 -0700
Subject: [PATCH 202/531] Get spell and update with it on spell select

---
 .../spells/DataControls/SpellSelect.tsx       | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/client/src/workspaces/spells/DataControls/SpellSelect.tsx b/client/src/workspaces/spells/DataControls/SpellSelect.tsx
index 1420f86f7..91dc1b877 100644
--- a/client/src/workspaces/spells/DataControls/SpellSelect.tsx
+++ b/client/src/workspaces/spells/DataControls/SpellSelect.tsx
@@ -4,19 +4,33 @@ import { useAppDispatch } from '@/state/hooks'
 import { openTab } from '@/state/tabs'
 // import { useModule } from '../../../contexts/ModuleProvider'
 import Select from '@components/Select/Select'
-import { useGetSpellsQuery, useNewSpellMutation } from '@/state/api/spells'
+import {
+  useLazyGetSpellQuery,
+  useGetSpellsQuery,
+  useNewSpellMutation,
+} from '@/state/api/spells'
 import defaultChain from '@/data/chains/default'
 import { ChainData } from '@latitudegames/thoth-core/types'
+import { useEffect } from 'react'
 
 const ModuleSelect = ({ control, updateData, initialValue }) => {
   const dispatch = useAppDispatch()
 
+  const [getSpell, { data: spell }] = useLazyGetSpellQuery()
   const { data: spells } = useGetSpellsQuery()
   const [newSpell] = useNewSpellMutation()
 
   const { enqueueSnackbar } = useSnackbar()
   const { dataKey } = control
 
+  // Handle what happens when a new spell is selected and fetched
+  useEffect(() => {
+    if (!spell) return
+
+    update(spell)
+    _openTab(spell)
+  }, [spell])
+
   const optionArray = () => {
     if (!spells) return
     return spells.map((module, index) => ({
@@ -28,9 +42,10 @@ const ModuleSelect = ({ control, updateData, initialValue }) => {
   const _openTab = async spell => {
     const tab = {
       name: spell.name,
+      spellId: spell.name,
       type: 'spell',
-      moduleName: spell.name,
       openNew: false,
+      switchActive: false,
     }
 
     dispatch(openTab(tab))
@@ -38,6 +53,8 @@ const ModuleSelect = ({ control, updateData, initialValue }) => {
 
   // TODO fix on change to handle loading a single spell
   const onChange = async ({ value }) => {
+    getSpell(value)
+
     // const _spell = await findOneModule({ name: value })
     // if (!_module) {
     //   enqueueSnackbar('No module found', {

From 3ad77785d8d034dd10cd0e7f750151540bfe3249 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 12:01:43 -0700
Subject: [PATCH 203/531] Rip out some more stuff from spell component

---
 core/src/components/Spell.ts | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index 68c7dc054..0cd4500a8 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -38,35 +38,20 @@ export class SpellComponent extends ThothComponent<ModuleWorkerOutput[]> {
   }
 
   builder(node: ThothNode) {
-    const moduleControl = new SpellControl({
+    const spellControl = new SpellControl({
       name: 'Spell Select',
+      write: false,
     })
 
-    moduleControl.onData = (moduleName: string) => {
-      this.updateSockets(node, moduleName)
+    spellControl.onData = (spellName: string) => {
+      console.log('selected spell', spellName)
+      // this.updateSockets(node, moduleName)
     }
 
-    node.inspector.add(moduleControl)
+    node.inspector.add(spellControl)
 
     return node
   }
-  async subscribe(node: ThothNode) {
-    if (!node.data.module) return
-    let cache: ModuleType
-
-    // this.unsubscribe(node)
-
-    this.subscriptionMap[node.id] = this.editor.thoth.onModuleUpdated(
-      node.data.module,
-      (module: ModuleType) => {
-        if (!isEqual(cache, module)) {
-          this.editor.moduleManager.updateModule(module)
-          this.updateSockets(node, module.name)
-        }
-        cache = module
-      }
-    )
-  }
 
   updateSockets(node: ThothNode, moduleName: string) {
     node.data.module = moduleName

From 5ba1b34944b9dc54d96479252489bae83708b9d7 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 12:01:57 -0700
Subject: [PATCH 204/531] Add write false back into spell select control

---
 core/src/dataControls/SpellControl.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/core/src/dataControls/SpellControl.ts b/core/src/dataControls/SpellControl.ts
index 5107a4817..c3a148a66 100644
--- a/core/src/dataControls/SpellControl.ts
+++ b/core/src/dataControls/SpellControl.ts
@@ -1,11 +1,20 @@
 import { DataControl } from '../plugins/inspectorPlugin'
 
 export class SpellControl extends DataControl {
-  constructor({ name, icon = 'sieve' }: { name: string; icon?: string }) {
+  constructor({
+    name,
+    icon = 'sieve',
+    write = false,
+  }: {
+    name: string
+    icon?: string
+    write: boolean
+  }) {
     const options = {
       dataKey: 'spell',
       name: name,
       component: 'spellSelect',
+      write,
       icon,
     }
 

From f404264985679b57eb3aa177d0846e932371ffe1 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 15:48:27 -0700
Subject: [PATCH 205/531] Remove is valid option check from crreatable select

---
 client/src/components/Select/Select.jsx | 57 +++++++++++--------------
 1 file changed, 25 insertions(+), 32 deletions(-)

diff --git a/client/src/components/Select/Select.jsx b/client/src/components/Select/Select.jsx
index 2ab83fdd5..46ee79d3a 100644
--- a/client/src/components/Select/Select.jsx
+++ b/client/src/components/Select/Select.jsx
@@ -13,7 +13,7 @@ const BasicSelect = ({
   placeholder,
   style = {},
   focusKey = '',
-  creatable=true,
+  creatable = true,
   nested = false,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   isValidNewOption = (inputValue, selectValue, selectOptions, accessors) =>
@@ -131,41 +131,34 @@ const BasicSelect = ({
     }),
   }
 
-  const _isValidNewOption = (...args) => {
-    if (!props.creatable) return false
-    return isValidNewOption(...args)
-  }
   return (
     <span className={css['select-dropdown-container']} style={style}>
-
       {options ? (
         <>
-        {creatable && (
-          <Creatable
-          isValidNewOption={_isValidNewOption}
-          options={options}
-          onChange={onChange}
-          styles={styles}
-          placeholder={placeholder}
-          components={{ DropdownIndicator }}
-          isSearchable={props.searchable}
-          ref={selectRef}
-          formatGroupLabel={formatGroupLabel}
-          {...props}
-        />
-        )}
-        {!creatable && (
-          <Select
-          options={options}
-          onChange={onChange}
-          styles={styles}
-          placeholder={placeholder}
-          components={{ DropdownIndicator }}
-          ref={selectRef}
-          {...props}
-        />
-        )}
-        
+          {creatable && (
+            <Creatable
+              options={options}
+              onChange={onChange}
+              styles={styles}
+              placeholder={placeholder}
+              components={{ DropdownIndicator }}
+              isSearchable={props.searchable}
+              ref={selectRef}
+              formatGroupLabel={formatGroupLabel}
+              {...props}
+            />
+          )}
+          {!creatable && (
+            <Select
+              options={options}
+              onChange={onChange}
+              styles={styles}
+              placeholder={placeholder}
+              components={{ DropdownIndicator }}
+              ref={selectRef}
+              {...props}
+            />
+          )}
         </>
       ) : (
         <Chip noEvents label={'No options available...'} />

From 881ea48abf67b1fc6f30a30ac304c7b90b176c25 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 15:48:35 -0700
Subject: [PATCH 206/531] Clean up dependencies

---
 core/src/components/Spell.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index 0cd4500a8..e4a52b413 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -1,7 +1,4 @@
-import isEqual from 'lodash/isEqual'
-
 import {
-  ModuleType,
   ModuleWorkerOutput,
   NodeData,
   ThothNode,

From 5515edebc48c30db6d849973615f294afc04518b Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 15:51:01 -0700
Subject: [PATCH 207/531] Delete unused code

---
 .../workspaces/spells/DataControls/SpellSelect.tsx    | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/client/src/workspaces/spells/DataControls/SpellSelect.tsx b/client/src/workspaces/spells/DataControls/SpellSelect.tsx
index 91dc1b877..02f30c033 100644
--- a/client/src/workspaces/spells/DataControls/SpellSelect.tsx
+++ b/client/src/workspaces/spells/DataControls/SpellSelect.tsx
@@ -54,17 +54,6 @@ const ModuleSelect = ({ control, updateData, initialValue }) => {
   // TODO fix on change to handle loading a single spell
   const onChange = async ({ value }) => {
     getSpell(value)
-
-    // const _spell = await findOneModule({ name: value })
-    // if (!_module) {
-    //   enqueueSnackbar('No module found', {
-    //     variant: 'error',
-    //   })
-    //   return
-    // }
-    // update(value)
-    // const module = _module.toJSON()
-    // await _openTab(module)
   }
 
   const update = update => {

From f7b5c3437d4a513560b69193a0ffa123f21743e5 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 15:51:16 -0700
Subject: [PATCH 208/531] Call getSpell inside on create

---
 .../src/workspaces/spells/DataControls/SpellSelect.tsx   | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/client/src/workspaces/spells/DataControls/SpellSelect.tsx b/client/src/workspaces/spells/DataControls/SpellSelect.tsx
index 02f30c033..7179ba346 100644
--- a/client/src/workspaces/spells/DataControls/SpellSelect.tsx
+++ b/client/src/workspaces/spells/DataControls/SpellSelect.tsx
@@ -67,14 +67,7 @@ const ModuleSelect = ({ control, updateData, initialValue }) => {
         chain: defaultChain as unknown as ChainData,
       })
 
-      await _openTab(spell)
-
-      // todo better naming for rete modules.
-      // Handle displaying name as using ID for internal mapping
-      update(value)
-
-      // add data to node
-      //
+      getSpell(value)
     } catch (err) {
       // eslint-disable-next-line no-console
       console.warn('Error creating module', err)

From 1a3384fa9dd5230a1011ddd0b6b7648642f28d14 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 15:51:35 -0700
Subject: [PATCH 209/531] Dont satore new spell in variable in on create

---
 client/src/workspaces/spells/DataControls/SpellSelect.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/workspaces/spells/DataControls/SpellSelect.tsx b/client/src/workspaces/spells/DataControls/SpellSelect.tsx
index 7179ba346..faef88fb4 100644
--- a/client/src/workspaces/spells/DataControls/SpellSelect.tsx
+++ b/client/src/workspaces/spells/DataControls/SpellSelect.tsx
@@ -62,7 +62,7 @@ const ModuleSelect = ({ control, updateData, initialValue }) => {
 
   const onCreateOption = async value => {
     try {
-      const spell = await newSpell({
+      await newSpell({
         name: value,
         chain: defaultChain as unknown as ChainData,
       })

From af535d7ca13f3076918d62d7fb2976ba8c65bea0 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 15:53:49 -0700
Subject: [PATCH 210/531] Delete console log in inspector

---
 core/src/plugins/inspectorPlugin/Inspector.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/src/plugins/inspectorPlugin/Inspector.ts b/core/src/plugins/inspectorPlugin/Inspector.ts
index 96ecd7596..78edb3840 100644
--- a/core/src/plugins/inspectorPlugin/Inspector.ts
+++ b/core/src/plugins/inspectorPlugin/Inspector.ts
@@ -185,7 +185,6 @@ export class Inspector {
   }
 
   handleData(update: Record<string, any>) {
-    console.log('Handling data!', update)
     // store all data controls inside the nodes data
     // WATCH in case our graphs start getting quite large.
     if (update.dataControls) this.cacheControls(update.dataControls)

From 5db071fcd5420e47c098fccb18e5c382fed88616 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 15:57:40 -0700
Subject: [PATCH 211/531] Add override to module options type

---
 core/src/thoth-component.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/thoth-component.ts b/core/src/thoth-component.ts
index 8ef9f987c..95c98e027 100644
--- a/core/src/thoth-component.ts
+++ b/core/src/thoth-component.ts
@@ -29,6 +29,7 @@ export interface ThothTask extends Task {
 export interface ModuleOptions {
   nodeType: 'input' | 'output' | 'triggerIn' | 'triggerOut' | 'module'
   socket?: Socket
+  override?: boolean
 }
 
 export abstract class ThothComponent<

From 8480e230290e5ca540bdf6e85a8150f27aea6a2e Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 16:00:25 -0700
Subject: [PATCH 212/531] Change override to skip in module options

---
 core/src/thoth-component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/thoth-component.ts b/core/src/thoth-component.ts
index 95c98e027..ef2e77fd7 100644
--- a/core/src/thoth-component.ts
+++ b/core/src/thoth-component.ts
@@ -29,7 +29,7 @@ export interface ThothTask extends Task {
 export interface ModuleOptions {
   nodeType: 'input' | 'output' | 'triggerIn' | 'triggerOut' | 'module'
   socket?: Socket
-  override?: boolean
+  skip?: boolean
 }
 
 export abstract class ThothComponent<

From 907420113631aedccd5024ca7a3f2afb2087d531 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 16:17:29 -0700
Subject: [PATCH 213/531] Drop old Spell type from core

---
 core/types.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/types.ts b/core/types.ts
index aa8b54afb..b5e10a522 100644
--- a/core/types.ts
+++ b/core/types.ts
@@ -147,10 +147,10 @@ export type NodeData = ReteNodeData & {
 //   position: number[]
 // }
 
-export type Spell = {
-  id: string
-  nodes: Record<number, Node>
-}
+// export type Spell = {
+//   id: string
+//   nodes: Record<number, Node>
+// }
 
 export type ThothReteInput = {
   type: TaskOutputTypes

From 610b911f3827d6a5a831bdd9d1b40ee38efacf75 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 16:17:47 -0700
Subject: [PATCH 214/531] Add new Spell type to core to represent API spell
 type

---
 core/types.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/core/types.ts b/core/types.ts
index b5e10a522..982c7540e 100644
--- a/core/types.ts
+++ b/core/types.ts
@@ -36,6 +36,17 @@ export type EventsTypes = {
   resetconnection: void
 }
 
+export interface Spell {
+  id?: string
+  user?: Record<string, unknown> | null | undefined
+  name: string
+  chain: ChainData
+  // Spells: Module[]
+  gameState: Record<string, unknown>
+  createdAt?: number
+  updatedAt?: number
+}
+
 export interface IRunContextEditor extends NodeEditor {
   thoth: EngineContext
   abort: Function

From 45bf552f8468c0c8571d59a2271268350c988ac7 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 16:17:54 -0700
Subject: [PATCH 215/531] Fix typing in engine

---
 core/src/engine.ts | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/core/src/engine.ts b/core/src/engine.ts
index 4d3242967..d8114ea8a 100644
--- a/core/src/engine.ts
+++ b/core/src/engine.ts
@@ -1,12 +1,11 @@
 import Rete, { Engine } from 'rete'
-import { Node } from 'rete/types'
 
 import {
+  ChainData,
   ModelCompletionOpts,
   ModuleType,
   NodeData,
   OpenAIResultChoice,
-  Spell,
   ThothWorkerInputs,
 } from '../types'
 import debuggerPlugin from './plugins/debuggerPlugin'
@@ -104,10 +103,7 @@ export const initSharedEngine = ({
 }
 
 // this parses through all the nodes in the data and finds the nodes associated with the given map
-export const extractNodes = (
-  nodes: Record<string, Node>,
-  map: Set<unknown>
-) => {
+export const extractNodes = (nodes: ChainData['nodes'], map: Set<unknown>) => {
   const names = Array.from(map.keys())
 
   return Object.keys(nodes)
@@ -118,7 +114,7 @@ export const extractNodes = (
 
 // This will get the node that was triggered given a socketKey associated with that node.
 export const getTriggeredNode = (
-  data: Spell,
+  data: ChainData,
   socketKey: string,
   map: Set<unknown>
 ) => {

From 9badc79dc3ea2d91e9c7a50364621bc1c375234b Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 16:21:44 -0700
Subject: [PATCH 216/531] Remove spell from state api

---
 client/src/state/api/spells.ts | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/client/src/state/api/spells.ts b/client/src/state/api/spells.ts
index a9a8eb6b1..f66367f25 100644
--- a/client/src/state/api/spells.ts
+++ b/client/src/state/api/spells.ts
@@ -3,7 +3,7 @@ import { FetchBaseQueryError } from '@reduxjs/toolkit/query/react'
 
 import { QueryReturnValue } from '@reduxjs/toolkit/dist/query/baseQueryTypes'
 import { rootApi } from './api'
-import { ChainData } from '@latitudegames/thoth-core/types'
+import { ChainData, Spell } from '@latitudegames/thoth-core/types'
 // function camelize(str) {
 //   return str
 //     .replace(/(?:^\w|[A-Z]|\b\w)/g, function (word, index) {
@@ -11,17 +11,6 @@ import { ChainData } from '@latitudegames/thoth-core/types'
 //     })
 //     .replace(/\s+/g, '')
 // }
-export interface Spell {
-  id?: string
-  user?: Record<string, unknown> | null | undefined
-  name: string
-  chain: ChainData
-  // Spells: Module[]
-  gameState: Record<string, unknown>
-  createdAt?: number
-  updatedAt?: number
-}
-
 export interface Diff {
   name: string
   diff: Record<string, unknown>

From 94bfc2fb35ecf19e53185d2bb86020d5fd760c61 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 16:21:53 -0700
Subject: [PATCH 217/531] Fix project row spell type import

---
 client/src/screens/HomeScreen/components/ProjectRow.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/screens/HomeScreen/components/ProjectRow.tsx b/client/src/screens/HomeScreen/components/ProjectRow.tsx
index afdcf78c3..61ed81627 100644
--- a/client/src/screens/HomeScreen/components/ProjectRow.tsx
+++ b/client/src/screens/HomeScreen/components/ProjectRow.tsx
@@ -1,4 +1,4 @@
-import { Spell } from '@/state/api/spells'
+import { Spell } from '@latitudegames/thoth-core/types'
 import { CSSProperties } from 'react'
 import Icon from '../../../components/Icon/Icon'
 import css from '../homeScreen.module.css'

From 23e9a54a8110196cafdcae8a0519961f46a5c53c Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 16:22:02 -0700
Subject: [PATCH 218/531] Fix event handler spell type import

---
 client/src/screens/Thoth/components/EventHandler.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/src/screens/Thoth/components/EventHandler.tsx b/client/src/screens/Thoth/components/EventHandler.tsx
index 113392494..412c111c2 100644
--- a/client/src/screens/Thoth/components/EventHandler.tsx
+++ b/client/src/screens/Thoth/components/EventHandler.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useRef } from 'react'
-import { ChainData } from '@latitudegames/thoth-core/dist/types'
+import { ChainData, Spell } from '@latitudegames/thoth-core/dist/types'
 
 import {
   uniqueNamesGenerator,
@@ -10,7 +10,6 @@ import {
 import {
   useSaveSpellMutation,
   useGetSpellQuery,
-  Spell,
 } from '../../../state/api/spells'
 import { useEditor } from '../../../workspaces/contexts/EditorProvider'
 import { useLayout } from '../../../workspaces/contexts/LayoutProvider'

From 4f1444573921a88f972d3912d7b455a4699fd83b Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 16:22:11 -0700
Subject: [PATCH 219/531] Fix editor provide spell type import

---
 client/src/workspaces/contexts/EditorProvider.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/workspaces/contexts/EditorProvider.tsx b/client/src/workspaces/contexts/EditorProvider.tsx
index 4b008d8e1..8421cf552 100644
--- a/client/src/workspaces/contexts/EditorProvider.tsx
+++ b/client/src/workspaces/contexts/EditorProvider.tsx
@@ -1,5 +1,5 @@
 import { initEditor } from '@latitudegames/thoth-core'
-import { ChainData } from '@latitudegames/thoth-core/dist/types'
+import { ChainData, Spell } from '@latitudegames/thoth-core/dist/types'
 import React, {
   useRef,
   useContext,
@@ -8,7 +8,7 @@ import React, {
   useEffect,
 } from 'react'
 
-import { useLazyGetSpellQuery, Spell } from '../../state/api/spells'
+import { useLazyGetSpellQuery } from '../../state/api/spells'
 
 import LoadingScreen from '../../components/LoadingScreen/LoadingScreen'
 import { MyNode } from '../../components/Node/Node'

From 18226eaf3dbd2aeaa4439b8a46ea93ef5eb875d0 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 16:22:26 -0700
Subject: [PATCH 220/531] Fix thoth interface spell type import

---
 client/src/workspaces/contexts/ThothInterfaceProvider.tsx | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
index e76c08de6..d210a2c49 100644
--- a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
+++ b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
@@ -6,12 +6,8 @@ import { completion as _completion } from '../../services/game-api/text'
 import { invokeInference } from '../../utils/huggingfaceHelper'
 import { usePubSub } from '../../contexts/PubSubProvider'
 import { useFetchFromImageCacheMutation } from '@/state/api/visualGenerationsApi'
-import { ThothWorkerInputs } from '@latitudegames/thoth-core/dist/types'
-import {
-  Spell,
-  useGetSpellQuery,
-  useSaveSpellMutation,
-} from '@/state/api/spells'
+import { Spell, ThothWorkerInputs } from '@latitudegames/thoth-core/dist/types'
+import { useGetSpellQuery, useSaveSpellMutation } from '@/state/api/spells'
 
 /*
 Some notes here.  The new rete provider, not to be confused with the old rete provider renamed to the editor provider, is designed to serve as the single source of truth for interfacing with the rete internal system.  This unified interface will also allow us to replicate the same API in the server, where rete expects certain functions to exist but doesn't care what is behind these functions so long as they work.

From fed4e27aa56d65beb14856f1196bd418de2cf04e Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 16:22:41 -0700
Subject: [PATCH 221/531] Fixworkspace index spell type import

---
 client/src/workspaces/spells/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/workspaces/spells/index.tsx b/client/src/workspaces/spells/index.tsx
index 536c909a2..1ab0f2026 100644
--- a/client/src/workspaces/spells/index.tsx
+++ b/client/src/workspaces/spells/index.tsx
@@ -12,8 +12,8 @@ import Playtest from './windows/PlaytestWindow'
 import StateManager from '@/workspaces/spells/windows/StateManagerWindow'
 import TextEditor from './windows/TextEditorWindow'
 import DebugConsole from './windows/DebugConsole'
-import { Spell } from '../../state/api/spells'
 import { useSnackbar } from 'notistack'
+import { Spell } from '@latitudegames/thoth-core/types'
 
 const Workspace = ({ tab, tabs, pubSub }) => {
   const spellRef = useRef<Spell>()

From 3f34465ff5f023d2a3e7d51f436645d67805821c Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 16:23:02 -0700
Subject: [PATCH 222/531] Load module plugin again in editor

---
 core/src/editor.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/editor.ts b/core/src/editor.ts
index 1dafd2e0c..ab0934bb0 100644
--- a/core/src/editor.ts
+++ b/core/src/editor.ts
@@ -19,6 +19,7 @@ import TaskPlugin from './plugins/taskPlugin'
 import { PubSubContext, ThothComponent } from './thoth-component'
 import DebuggerPlugin from './plugins/debuggerPlugin'
 import KeyCodePlugin from './plugins/keyCodePlugin'
+import ModulePlugin from './plugins/modulePlugin'
 export class ThothEditor extends NodeEditor<EventsTypes> {
   pubSub: PubSubContext
   thoth: EngineContext
@@ -123,7 +124,7 @@ export const initEditor = async function ({
 
   // WARNING: ModulePlugin needs to be initialized before TaskPlugin during engine setup
   editor.use(DebuggerPlugin)
-  // editor.use(ModulePlugin, { engine, modules } as unknown as void)
+  editor.use(ModulePlugin, { engine, modules: {} } as unknown as void)
   editor.use(TaskPlugin)
   editor.use(KeyCodePlugin)
 

From 6c86a05aa9b48d7ec0edb78476088d363ac09f0c Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 17:05:13 -0700
Subject: [PATCH 223/531] Remove grpah data from types

---
 core/types.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/types.ts b/core/types.ts
index 982c7540e..b38eec65b 100644
--- a/core/types.ts
+++ b/core/types.ts
@@ -11,7 +11,6 @@ import {
 } from 'rete/types/core/data'
 
 import { Inspector } from './src/plugins/inspectorPlugin/Inspector'
-import { ModuleGraphData } from './src/plugins/modulePlugin/module-manager'
 import { TaskOutputTypes } from './src/plugins/taskPlugin/task'
 import { SocketNameType, SocketType } from './src/sockets'
 import { EngineContext } from './src/engine'
@@ -75,7 +74,7 @@ export type ThothNode = Node & {
 export type ModuleType = {
   id: string
   name: string
-  data: ModuleGraphData
+  data: ChainData
   createdAt: number
   updatedAt: number
 }

From 4fb28e3b6f8ee8cb54c44525baf32a7d00560849 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 17:05:32 -0700
Subject: [PATCH 224/531] Add skip to module options type

---
 core/src/plugins/modulePlugin/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/plugins/modulePlugin/index.ts b/core/src/plugins/modulePlugin/index.ts
index 2846393f6..1722b8163 100644
--- a/core/src/plugins/modulePlugin/index.ts
+++ b/core/src/plugins/modulePlugin/index.ts
@@ -21,6 +21,7 @@ export interface IRunContextEditor extends NodeEditor {
 type ModuleOptions = {
   socket: Socket
   nodeType: 'input' | 'output' | 'triggerIn' | 'triggerOut' | 'module'
+  skip?: boolean
 }
 
 interface IModuleComponent extends Component {

From 5671055ad19a204ab757cdc3d0d64c8f6f55521b Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 17:05:47 -0700
Subject: [PATCH 225/531] destructure skip from component module options

---
 core/src/plugins/modulePlugin/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/plugins/modulePlugin/index.ts b/core/src/plugins/modulePlugin/index.ts
index 1722b8163..b0441b54e 100644
--- a/core/src/plugins/modulePlugin/index.ts
+++ b/core/src/plugins/modulePlugin/index.ts
@@ -44,7 +44,7 @@ function install(
     if (!component.module) return
 
     // socket - Rete.Socket instance or function that returns a socket instance
-    const { nodeType, socket } = component.module
+    const { nodeType, socket, skip } = component.module
     const name = component.name
 
     switch (nodeType) {

From 238e94db52ebc4b275ecc0d77350f53d07a17ab2 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 17:06:07 -0700
Subject: [PATCH 226/531] Use skip to prevent worker overridding

---
 core/src/plugins/modulePlugin/index.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/src/plugins/modulePlugin/index.ts b/core/src/plugins/modulePlugin/index.ts
index b0441b54e..3bf2b282f 100644
--- a/core/src/plugins/modulePlugin/index.ts
+++ b/core/src/plugins/modulePlugin/index.ts
@@ -53,6 +53,8 @@ function install(
 
         moduleManager.registerInput(name, socket)
 
+        if (skip) return
+
         component.worker = (
           node: NodeData,
           inputs: WorkerInputs,
@@ -75,6 +77,8 @@ function install(
 
         moduleManager.registerTriggerOut(name, socket)
 
+        if (skip) return
+
         component.worker = (
           node: NodeData,
           inputs: WorkerInputs,
@@ -105,6 +109,8 @@ function install(
 
         moduleManager.registerTriggerIn(name, socket)
 
+        if (skip) return
+
         component.worker = (
           node: NodeData,
           inputs: WorkerInputs,

From 6a168ae650e0868828a27947266017e276b82386 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 17:06:31 -0700
Subject: [PATCH 227/531] Accept a chain into update module sockets

---
 core/src/plugins/modulePlugin/index.ts | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/core/src/plugins/modulePlugin/index.ts b/core/src/plugins/modulePlugin/index.ts
index 3bf2b282f..472040f73 100644
--- a/core/src/plugins/modulePlugin/index.ts
+++ b/core/src/plugins/modulePlugin/index.ts
@@ -132,15 +132,22 @@ function install(
         const builder: Function | undefined = component.builder
 
         if (builder) {
-          component.updateModuleSockets = (node: ThothNode) => {
+          component.updateModuleSockets = (
+            node: ThothNode,
+            chainData?: ChainData
+          ) => {
             const modules = moduleManager.modules
             const currentNodeModule = node.data.module as string
-            if (!node.data.module || !modules[currentNodeModule]) return
+            if (!modules[currentNodeModule] && !chainData) return
 
             if (!node.data.inputs) node.data.inputs = []
             if (!node.data.outputs) node.data.outputs = []
 
-            const data = modules[currentNodeModule].data
+            const data = modules[currentNodeModule]
+              ? modules[currentNodeModule].data
+              : chainData
+
+            if (!data) return
             const inputs = moduleManager.getInputs(data)
             const outputs = moduleManager.getOutputs(data)
             const triggerOuts = moduleManager.getTriggerOuts(data)

From 6d52b6c3f0695a4acaef54f6582ca3eaf1fdb4e9 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 17:06:49 -0700
Subject: [PATCH 228/531] More skip overrides

---
 core/src/plugins/modulePlugin/index.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/src/plugins/modulePlugin/index.ts b/core/src/plugins/modulePlugin/index.ts
index 472040f73..29a03deea 100644
--- a/core/src/plugins/modulePlugin/index.ts
+++ b/core/src/plugins/modulePlugin/index.ts
@@ -177,6 +177,8 @@ function install(
 
         const moduleWorker = component.worker
 
+        if (skip) return
+
         component.worker = async (
           node: NodeData,
           inputs: WorkerInputs,
@@ -203,6 +205,8 @@ function install(
 
         moduleManager.registerOutput(name, socket)
 
+        if (skip) return
+
         component.worker = (
           node: NodeData,
           inputs: WorkerInputs,

From d5db7fd1204f7c9f840e5159bb39d138ceb7a522 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 17:07:03 -0700
Subject: [PATCH 229/531] Import chain data type

---
 core/src/plugins/modulePlugin/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/plugins/modulePlugin/index.ts b/core/src/plugins/modulePlugin/index.ts
index 29a03deea..47623d974 100644
--- a/core/src/plugins/modulePlugin/index.ts
+++ b/core/src/plugins/modulePlugin/index.ts
@@ -2,7 +2,7 @@
 import { Engine, NodeEditor, Component, Socket } from 'rete/types'
 import { NodeData, WorkerInputs, WorkerOutputs } from 'rete/types/core/data'
 
-import { ThothNode } from '../../../types'
+import { ChainData, ThothNode } from '../../../types'
 import { Module } from './module'
 import { ModuleManager } from './module-manager'
 import { addIO, removeIO } from './utils'

From c06bd715957ba885c682a2fcb35f3e64d99d9d86 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 17:07:24 -0700
Subject: [PATCH 230/531] Use skip on spell component module options

---
 core/src/components/Spell.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index e4a52b413..c626205a8 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -24,6 +24,7 @@ export class SpellComponent extends ThothComponent<ModuleWorkerOutput[]> {
     super('Spell')
     this.module = {
       nodeType: 'module',
+      skip: true,
     }
     this.task = {
       outputs: {},

From 583f8f0743fd4396fd926c9b303f1ef7c71beb56 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 17:07:42 -0700
Subject: [PATCH 231/531] Call update sockets on spell change

---
 core/src/components/Spell.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index c626205a8..44580603b 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -41,9 +41,9 @@ export class SpellComponent extends ThothComponent<ModuleWorkerOutput[]> {
       write: false,
     })
 
-    spellControl.onData = (spellName: string) => {
-      console.log('selected spell', spellName)
-      // this.updateSockets(node, moduleName)
+    spellControl.onData = (spell: Spell) => {
+      console.log('selected spell', spell)
+      this.updateSockets(node, spell)
     }
 
     node.inspector.add(spellControl)

From 12cdc22125085f7446d3f102c66310251489f566 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 17:08:05 -0700
Subject: [PATCH 232/531] Copy spell chain data to new object and pass into
 update module sockets

---
 core/src/components/Spell.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index 44580603b..3796ce81b 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -51,9 +51,9 @@ export class SpellComponent extends ThothComponent<ModuleWorkerOutput[]> {
     return node
   }
 
-  updateSockets(node: ThothNode, moduleName: string) {
-    node.data.module = moduleName
-    this.updateModuleSockets(node)
+  updateSockets(node: ThothNode, spell: Spell) {
+    const chain = JSON.parse(JSON.stringify(spell.chain))
+    this.updateModuleSockets(node, chain)
     this.editor.trigger('process')
     node.update()
   }

From 8fd8580d1ee85c4016917c8834434e1db409107c Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 17:08:29 -0700
Subject: [PATCH 233/531] Import spell type into spell component

---
 core/src/components/Spell.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index 3796ce81b..dc6606244 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -1,6 +1,7 @@
 import {
   ModuleWorkerOutput,
   NodeData,
+  Spell,
   ThothNode,
   ThothWorkerInputs,
 } from '../../types'

From c7d260283e9de1925f2d523f7e65b79fe7746fc5 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 17:08:45 -0700
Subject: [PATCH 234/531] Fix typing in module manager to use chains data

---
 .../plugins/modulePlugin/module-manager.ts    | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/core/src/plugins/modulePlugin/module-manager.ts b/core/src/plugins/modulePlugin/module-manager.ts
index abec20d17..498c6b4c7 100644
--- a/core/src/plugins/modulePlugin/module-manager.ts
+++ b/core/src/plugins/modulePlugin/module-manager.ts
@@ -2,6 +2,7 @@ import { Engine, Socket, Component } from 'rete'
 import { Socket as SocketType } from 'rete/types'
 
 import {
+  ChainData,
   ModuleType,
   ModuleWorkerOutput,
   ThothNode,
@@ -11,6 +12,7 @@ import {
 import { SocketNameType } from '../../sockets'
 import { Module } from './module'
 import { extractNodes } from './utils'
+import { NodeData } from 'rete/types/core/data'
 interface ModuleComponent extends Component {
   run: Function
 }
@@ -56,7 +58,7 @@ export class ModuleManager {
   }
 
   getSockets(
-    data: { nodes: Record<string, ThothNode> },
+    data: ChainData,
     typeMap: Map<string, Socket>,
     defaultName: string
   ): ModuleSocketType[] {
@@ -72,24 +74,24 @@ export class ModuleManager {
     )
   }
 
-  getInputs(data: ModuleGraphData): ModuleSocketType[] {
+  getInputs(data: ChainData): ModuleSocketType[] {
     return this.getSockets(data, this.inputs, 'input')
   }
 
-  getOutputs(data: ModuleGraphData): ModuleSocketType[] {
+  getOutputs(data: ChainData): ModuleSocketType[] {
     return this.getSockets(data, this.outputs, 'output')
   }
 
-  getTriggerOuts(data: ModuleGraphData): ModuleSocketType[] {
+  getTriggerOuts(data: ChainData): ModuleSocketType[] {
     return this.getSockets(data, this.triggerOuts, 'trigger')
   }
 
-  getTriggerIns(data: ModuleGraphData) {
+  getTriggerIns(data: ChainData) {
     return this.getSockets(data, this.triggerIns, 'trigger')
   }
 
   socketFactory(
-    node: ThothNode,
+    node: NodeData,
     socket: Socket | Function | undefined
   ): SocketType {
     // eslint-disable-next-line no-param-reassign
@@ -119,10 +121,7 @@ export class ModuleManager {
     this.outputs.set(name, socket)
   }
 
-  getTriggeredNode(
-    data: { nodes: Record<string, ThothNode> },
-    socketKey: string
-  ) {
+  getTriggeredNode(data: ChainData, socketKey: string) {
     return extractNodes(data.nodes, this.triggerIns).find(
       node => node.data.socketKey === socketKey
     )

From cf60e4179532eb3a5ada9c96f6b5e90e51e9a6fa Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 17:09:00 -0700
Subject: [PATCH 235/531] improve typing in module plugin utils

---
 core/src/plugins/modulePlugin/utils.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/plugins/modulePlugin/utils.ts b/core/src/plugins/modulePlugin/utils.ts
index 909136e1a..6a9395506 100644
--- a/core/src/plugins/modulePlugin/utils.ts
+++ b/core/src/plugins/modulePlugin/utils.ts
@@ -1,13 +1,13 @@
 import { Input, NodeEditor, Output, Socket } from 'rete'
 
 import { IRunContextEditor } from '.'
-import { DataSocketType, ThothNode } from '../../../types'
+import { ChainData, DataSocketType, ThothNode } from '../../../types'
 import { socketNameMap, SocketNameType } from '../../sockets'
 import { ModuleSocketType } from './module-manager'
 export type ThroughPutType = 'outputs' | 'inputs'
 
 export function extractNodes(
-  nodes: Record<string, ThothNode>,
+  nodes: ChainData['nodes'],
   map: Map<string, Socket>
 ) {
   const names = Array.from(map.keys())

From 2c867212d93d1280d1f19b327c16aa8588c11e5e Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 17:21:37 -0700
Subject: [PATCH 236/531] Add runSpell to engine context type

---
 core/src/engine.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/engine.ts b/core/src/engine.ts
index d8114ea8a..e4227f9f1 100644
--- a/core/src/engine.ts
+++ b/core/src/engine.ts
@@ -53,6 +53,7 @@ export type EngineContext = {
     model: string,
     request: string
   ) => Promise<{ error: unknown; [key: string]: unknown }>
+  runSpell: Function
   readFromImageCache: Function
   onPlaytest?: Function
   sendToDebug?: Function

From 39e201123627f2e1afc12687e31fc2f67d12b0e9 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 17:28:25 -0700
Subject: [PATCH 237/531] Add typing to run spell in thoth interface type

---
 client/src/workspaces/contexts/ThothInterfaceProvider.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
index d210a2c49..a8bf78272 100644
--- a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
+++ b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
@@ -22,6 +22,7 @@ export interface ThothInterfaceContext extends EngineContext {
   sendToDebug: (data) => void
   onDebug: (node, callback) => void
   clearTextEditor: () => void
+  runSpell: (inputs: Record<string, any>, spellId: string) => void
   getCurrentGameState: () => Record<string, unknown>
   updateCurrentGameState: (update) => void
   readFromImageCache: (caption, cacheTag, topK) => Promise<Record<string, any>>
@@ -161,6 +162,8 @@ const ThothInterfaceProvider = ({ children, tab }) => {
     )
   }
 
+  const runSpell = (inputs, spellId) => {}
+
   const clearTextEditor = () => {
     publish($TEXT_EDITOR_CLEAR(tab.id))
   }
@@ -205,6 +208,7 @@ const ThothInterfaceProvider = ({ children, tab }) => {
     getCurrentGameState,
     updateCurrentGameState,
     processCode,
+    runSpell,
   }
 
   return <Context.Provider value={publicInterface}>{children}</Context.Provider>

From 6722428932af07d0cb74a9ce08b0866b1ef8e71f Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 17:29:02 -0700
Subject: [PATCH 238/531] Attach spell ID to spell control on data

---
 core/src/components/Spell.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index dc6606244..9d0fab535 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -44,6 +44,7 @@ export class SpellComponent extends ThothComponent<ModuleWorkerOutput[]> {
 
     spellControl.onData = (spell: Spell) => {
       console.log('selected spell', spell)
+      node.data.spellId = spell.id
       this.updateSockets(node, spell)
     }
 

From 9b5e018303f4eb9912c0ac6a5dff71d49a58615d Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 17:29:24 -0700
Subject: [PATCH 239/531] Only run module worker if there is a module provided

---
 core/src/components/Spell.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index 9d0fab535..7e92f6597 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -64,8 +64,12 @@ export class SpellComponent extends ThothComponent<ModuleWorkerOutput[]> {
     node: NodeData,
     inputs: ThothWorkerInputs,
     outputs: { [key: string]: string },
-    { module }: { module: { outputs: ModuleWorkerOutput[] } }
+    {
+      module,
+      thoth,
+    }: { module: { outputs: ModuleWorkerOutput[] }; thoth: EngineContext }
   ) {
+    if (module) {
     const open = Object.entries(module.outputs)
       .filter(([, value]) => typeof value === 'boolean' && value)
       .map(([key]) => key)
@@ -76,5 +80,7 @@ export class SpellComponent extends ThothComponent<ModuleWorkerOutput[]> {
       .filter((out: string) => !open.includes(out))
 
     return module.outputs
+    }
+
   }
 }

From c472d4b5198fd703d75c338e0f108ad88019b9d1 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 17:29:35 -0700
Subject: [PATCH 240/531] Add flattened outputs

---
 core/src/components/Spell.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index 7e92f6597..a589fd17a 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -82,5 +82,12 @@ export class SpellComponent extends ThothComponent<ModuleWorkerOutput[]> {
     return module.outputs
     }
 
+    const flattenedInputs = Object.entries(inputs).reduce(
+      (acc, [key, value]) => {
+        acc[key] = value[0]
+        return acc
+      },
+      {} as Record<string, any>
+    )
   }
 }

From de4b19e8563d00767add03ca3d53c21bb7941198 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 21:21:53 -0700
Subject: [PATCH 241/531] Remove trigger out deprecation

---
 core/src/components/TriggerOut.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/src/components/TriggerOut.ts b/core/src/components/TriggerOut.ts
index c83445988..91d92da08 100644
--- a/core/src/components/TriggerOut.ts
+++ b/core/src/components/TriggerOut.ts
@@ -40,7 +40,6 @@ export class TriggerOut extends ThothComponent<WorkerReturn> {
     this.category = 'I/O'
     this.displayName = 'Trigger Out'
     this.info = info
-    this.deprecated = true
   }
 
   // the builder is used to "assemble" the node component.

From 48ef34d0734bff854789a63fec99956e2bd26ffb Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 21:22:08 -0700
Subject: [PATCH 242/531] Addf runspell type

---
 client/src/state/api/spells.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/client/src/state/api/spells.ts b/client/src/state/api/spells.ts
index f66367f25..45f2476d8 100644
--- a/client/src/state/api/spells.ts
+++ b/client/src/state/api/spells.ts
@@ -40,6 +40,12 @@ export interface PatchArgs {
   update: Partial<Spell>
 }
 
+export interface RunSpell {
+  spellId: string
+  version?: string
+  inputs: Record<string, any>
+}
+
 export const spellApi = rootApi.injectEndpoints({
   endpoints: builder => ({
     getSpells: builder.query<Spell[], void>({

From 01e791b5899a5f7c8685f0239ac13b6d2c06f0e8 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 21:22:22 -0700
Subject: [PATCH 243/531] Add ruin spell to rtk query spell api

---
 client/src/state/api/spells.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/client/src/state/api/spells.ts b/client/src/state/api/spells.ts
index 45f2476d8..65551348d 100644
--- a/client/src/state/api/spells.ts
+++ b/client/src/state/api/spells.ts
@@ -60,6 +60,13 @@ export const spellApi = rootApi.injectEndpoints({
         }
       },
     }),
+    runSpell: builder.mutation<Record<string, any>, RunSpell>({
+      query: ({ spellId, version = 'latest', inputs }) => ({
+        url: `game/chains/${spellId}/${version}`,
+        method: 'POST',
+        body: inputs,
+      }),
+    }),
     saveDiff: builder.mutation<void, Diff>({
       // TODO this may introruce bugs.  Though I don't think we need to invalidate the spell cache here since the chain is loaded in live to the rete editor.
       // invalidatesTags: ['Spell'],
@@ -152,6 +159,7 @@ export const {
   useLazyGetSpellQuery,
   useNewSpellMutation,
   useDeleteSpellMutation,
+  useRunSpellMutation,
   useSaveSpellMutation,
   useSaveDiffMutation,
   useDeploySpellMutation,

From 5f61a9eac35bc71d1b1b7f2af649b5ca20b98d46 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 21:22:39 -0700
Subject: [PATCH 244/531] Add run spell to thoth context

---
 .../contexts/ThothInterfaceProvider.tsx           | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
index a8bf78272..eeff346d1 100644
--- a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
+++ b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
@@ -7,7 +7,11 @@ import { invokeInference } from '../../utils/huggingfaceHelper'
 import { usePubSub } from '../../contexts/PubSubProvider'
 import { useFetchFromImageCacheMutation } from '@/state/api/visualGenerationsApi'
 import { Spell, ThothWorkerInputs } from '@latitudegames/thoth-core/dist/types'
-import { useGetSpellQuery, useSaveSpellMutation } from '@/state/api/spells'
+import {
+  useGetSpellQuery,
+  useSaveSpellMutation,
+  useRunSpellMutation,
+} from '@/state/api/spells'
 
 /*
 Some notes here.  The new rete provider, not to be confused with the old rete provider renamed to the editor provider, is designed to serve as the single source of truth for interfacing with the rete internal system.  This unified interface will also allow us to replicate the same API in the server, where rete expects certain functions to exist but doesn't care what is behind these functions so long as they work.
@@ -41,6 +45,7 @@ const ThothInterfaceProvider = ({ children, tab }) => {
   const { events, publish, subscribe } = usePubSub()
   const spellRef = useRef<Spell | null>(null)
   const [fetchFromImageCache] = useFetchFromImageCacheMutation()
+  const [_runSpell] = useRunSpellMutation()
   const [saveSpell] = useSaveSpellMutation()
   const { data: _spell } = useGetSpellQuery(tab.spell, {
     skip: !tab.spell,
@@ -162,7 +167,13 @@ const ThothInterfaceProvider = ({ children, tab }) => {
     )
   }
 
-  const runSpell = (inputs, spellId) => {}
+  const runSpell = async (inputs, spellId) => {
+    console.log('RUN SPELL')
+    const response = await _runSpell({ inputs, spellId })
+
+    console.log('RESPONSE', response)
+    return response
+  }
 
   const clearTextEditor = () => {
     publish($TEXT_EDITOR_CLEAR(tab.id))

From e5771d88c956ae9f2fc095fd155900163c8c65ec Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 21:23:27 -0700
Subject: [PATCH 245/531] Add node helpers to utils

---
 core/src/utils/nodeHelpers.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 core/src/utils/nodeHelpers.ts

diff --git a/core/src/utils/nodeHelpers.ts b/core/src/utils/nodeHelpers.ts
new file mode 100644
index 000000000..70a12a385
--- /dev/null
+++ b/core/src/utils/nodeHelpers.ts
@@ -0,0 +1,12 @@
+import { NodeData } from '../../types'
+
+type Inputs = {
+  socketKey: string
+  name: string
+}
+
+export const inputNameFromSocketKey = (node: NodeData, socketKey: string) => {
+  return (node.data.inputs as Inputs[]).find(
+    input => input.socketKey === socketKey
+  )?.name
+}

From b76dc5647e119b4016b25d4494d11d4b06fcc9d7 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 21:23:43 -0700
Subject: [PATCH 246/531] Get proper name from socket key inside flatten inputs

---
 core/src/components/Spell.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index a589fd17a..61f1aa623 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -84,7 +84,10 @@ export class SpellComponent extends ThothComponent<ModuleWorkerOutput[]> {
 
     const flattenedInputs = Object.entries(inputs).reduce(
       (acc, [key, value]) => {
-        acc[key] = value[0]
+        const name = inputNameFromSocketKey(node, key)
+        if (!name) return acc
+
+        acc[name] = value[0]
         return acc
       },
       {} as Record<string, any>

From 20920ff2b8a4a14a4863e0c08b6f70f6eff46c1d Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 21:24:11 -0700
Subject: [PATCH 247/531] set spell id to spell name in spell on data

---
 core/src/components/Spell.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index 61f1aa623..85870657f 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -43,8 +43,7 @@ export class SpellComponent extends ThothComponent<ModuleWorkerOutput[]> {
     })
 
     spellControl.onData = (spell: Spell) => {
-      console.log('selected spell', spell)
-      node.data.spellId = spell.id
+      node.data.spellId = spell.name
       this.updateSockets(node, spell)
     }
 

From 35769a572f77aa704f7be8120c6f09b9bbbaee83 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 21:24:35 -0700
Subject: [PATCH 248/531] Run spell in spell component

---
 core/src/components/Spell.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index 85870657f..5a92173c6 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -91,5 +91,8 @@ export class SpellComponent extends ThothComponent<ModuleWorkerOutput[]> {
       },
       {} as Record<string, any>
     )
+
+    const response = thoth.runSpell(flattenedInputs, node.data.spellId)
+
   }
 }

From 9ac1af7f761421a6b5565ec6aa5d10d8ddf4e2a6 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 21:26:16 -0700
Subject: [PATCH 249/531] Await run spell response

---
 core/src/components/Spell.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index 5a92173c6..c04331322 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -92,7 +92,7 @@ export class SpellComponent extends ThothComponent<ModuleWorkerOutput[]> {
       {} as Record<string, any>
     )
 
-    const response = thoth.runSpell(flattenedInputs, node.data.spellId)
+    const response = await thoth.runSpell(flattenedInputs, node.data.spellId)
 
   }
 }

From f4de3323f1712500828bdd74f6a2d60baf8c7c0c Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 21:26:26 -0700
Subject: [PATCH 250/531] Make worker async in spell component

---
 core/src/components/Spell.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index c04331322..b5a6b29bf 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -59,7 +59,7 @@ export class SpellComponent extends ThothComponent<ModuleWorkerOutput[]> {
     node.update()
   }
 
-  worker(
+  async worker(
     node: NodeData,
     inputs: ThothWorkerInputs,
     outputs: { [key: string]: string },

From 385e6c9182da2089b2dc644d24e7ee2f08ae8d03 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 21:26:46 -0700
Subject: [PATCH 251/531] Fix worker return type to return a promise

---
 core/src/components/Spell.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index b5a6b29bf..0ed9091af 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -11,7 +11,9 @@ import { ThothComponent } from '../thoth-component'
 
 const info = `The Module component allows you to add modules into your chain.  A module is a bundled self contained chain that defines inputs, outputs, and triggers using components.`
 
-export class SpellComponent extends ThothComponent<ModuleWorkerOutput[]> {
+export class SpellComponent extends ThothComponent<
+  Promise<ModuleWorkerOutput[]>
+> {
   _task: Task
   updateModuleSockets: Function
   task

From ab48d2787b73875f354ec6919f160d2aff875d2a Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 21:26:54 -0700
Subject: [PATCH 252/531] Fix imports

---
 core/src/components/Spell.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index 0ed9091af..d9c5f3961 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -6,8 +6,10 @@ import {
   ThothWorkerInputs,
 } from '../../types'
 import { SpellControl } from '../dataControls/SpellControl'
+import { EngineContext } from '../engine'
 import { Task } from '../plugins/taskPlugin/task'
 import { ThothComponent } from '../thoth-component'
+import { inputNameFromSocketKey } from '../utils/nodeHelpers'
 
 const info = `The Module component allows you to add modules into your chain.  A module is a bundled self contained chain that defines inputs, outputs, and triggers using components.`
 

From f9141a3d7263f07de3276f52e02f0dfbf664873a Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 21:27:09 -0700
Subject: [PATCH 253/531] Handle error from response

---
 core/src/components/Spell.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index d9c5f3961..157fcf74f 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -98,5 +98,9 @@ export class SpellComponent extends ThothComponent<
 
     const response = await thoth.runSpell(flattenedInputs, node.data.spellId)
 
+    if ('error' in response) {
+      throw new Error(`Error running spell ${node.data.spellId}`)
+    }
+
   }
 }

From 4ed663fa5a87a11d725f7b77edf0f3ada707839b Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 21:28:06 -0700
Subject: [PATCH 254/531] return response data outputs

---
 core/src/components/Spell.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index 157fcf74f..a6dd3e94d 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -102,5 +102,6 @@ export class SpellComponent extends ThothComponent<
       throw new Error(`Error running spell ${node.data.spellId}`)
     }
 
+    return response.data.outputs
   }
 }

From d76c5d56c0269b4fb6db3b053b850101448e9a36 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 21:28:27 -0700
Subject: [PATCH 255/531] Formatting

---
 core/src/components/Spell.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index a6dd3e94d..ea99fa648 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -73,16 +73,16 @@ export class SpellComponent extends ThothComponent<
     }: { module: { outputs: ModuleWorkerOutput[] }; thoth: EngineContext }
   ) {
     if (module) {
-    const open = Object.entries(module.outputs)
-      .filter(([, value]) => typeof value === 'boolean' && value)
-      .map(([key]) => key)
-    // close all triggers first
-    const dataOutputs = node.data.outputs as ModuleWorkerOutput[]
-    this._task.closed = dataOutputs
-      .map((out: { name: string }) => out.name)
-      .filter((out: string) => !open.includes(out))
+      const open = Object.entries(module.outputs)
+        .filter(([, value]) => typeof value === 'boolean' && value)
+        .map(([key]) => key)
+      // close all triggers first
+      const dataOutputs = node.data.outputs as ModuleWorkerOutput[]
+      this._task.closed = dataOutputs
+        .map((out: { name: string }) => out.name)
+        .filter((out: string) => !open.includes(out))
 
-    return module.outputs
+      return module.outputs
     }
 
     const flattenedInputs = Object.entries(inputs).reduce(

From 27dcda4a774f2f4340ad701a78e7b90f1fb40dd0 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 21:35:52 -0700
Subject: [PATCH 256/531] Rename and fix typing on subspell updated in thoth
 interface

---
 client/src/workspaces/contexts/ThothInterfaceProvider.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
index eeff346d1..77509073b 100644
--- a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
+++ b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
@@ -88,8 +88,8 @@ const ThothInterfaceProvider = ({ children, tab }) => {
     })
   }
 
-  const onModuleUpdated = (moduleName, callback) => {
-    return subscribe($SUBSPELL_UPDATED(moduleName), (event, data) => {
+  const onSubspellUpdated = (spellId: string, callback: Function) => {
+    return subscribe($SUBSPELL_UPDATED(spellId), (event, data) => {
       callback(data)
     })
   }

From 8a45f9fdb00d9009afd3e08397f8ac087e993aaa Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 21:36:08 -0700
Subject: [PATCH 257/531] Export subspell updated from thoth interface

---
 client/src/workspaces/contexts/ThothInterfaceProvider.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
index 77509073b..4fc0e446a 100644
--- a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
+++ b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
@@ -205,7 +205,7 @@ const ThothInterfaceProvider = ({ children, tab }) => {
     onAddModule,
     onUpdateModule,
     onDeleteModule,
-    onModuleUpdated,
+    onSubspellUpdated,
     sendToInspector,
     sendToDebug,
     onDebug,

From ab382c92bd5c093c170b2df7d6d08e4d701cbcc5 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 21:36:23 -0700
Subject: [PATCH 258/531] Add on spell updated to editor type

---
 core/src/editor.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/editor.ts b/core/src/editor.ts
index ab0934bb0..146b572d8 100644
--- a/core/src/editor.ts
+++ b/core/src/editor.ts
@@ -28,6 +28,7 @@ export class ThothEditor extends NodeEditor<EventsTypes> {
   loadGraph: (graph: Data) => Promise<void>
   moduleManager: ModuleManager
   runProcess: (callback?: Function) => Promise<void>
+  onSpellUpdated: (spellId: string, callback: Function) => Function
 }
 
 /*

From 0470bcfab765d22f7c89c7b98fe24ff27352add4 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 21:36:38 -0700
Subject: [PATCH 259/531] Implement on spell updated listener in editor

---
 core/src/editor.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/src/editor.ts b/core/src/editor.ts
index 146b572d8..116810657 100644
--- a/core/src/editor.ts
+++ b/core/src/editor.ts
@@ -123,6 +123,10 @@ export const initEditor = async function ({
   })
   // @seang TODO: update types for editor.use rather than casting as unknown here, we may want to bring our custom rete directly into the monorepo at this point
 
+  editor.onSpellUpdated = (spellId: string, callback: Function) => {
+    return thoth.onSubspellUpdated(spellId, callback)
+  }
+
   // WARNING: ModulePlugin needs to be initialized before TaskPlugin during engine setup
   editor.use(DebuggerPlugin)
   editor.use(ModulePlugin, { engine, modules: {} } as unknown as void)

From 62a1669e4e90b3cf2bb41f1d68d048c9d72da704 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 29 Mar 2022 21:41:23 -0700
Subject: [PATCH 260/531] Subscribe to spell changes inside spell builder to
 update sockets

---
 core/src/components/Spell.ts | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index ea99fa648..84f920571 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -6,6 +6,7 @@ import {
   ThothWorkerInputs,
 } from '../../types'
 import { SpellControl } from '../dataControls/SpellControl'
+import { ThothEditor } from '../editor'
 import { EngineContext } from '../engine'
 import { Task } from '../plugins/taskPlugin/task'
 import { ThothComponent } from '../thoth-component'
@@ -21,7 +22,7 @@ export class SpellComponent extends ThothComponent<
   task
   info
   subscriptionMap: Record<number, Function> = {}
-  editor: any
+  editor: ThothEditor
   noBuildUpdate: boolean
   category: string
 
@@ -48,7 +49,21 @@ export class SpellComponent extends ThothComponent<
 
     spellControl.onData = (spell: Spell) => {
       node.data.spellId = spell.name
+
+      // If it has a subscription remove it here.
+      if (this.subscriptionMap[node.id]) this.subscriptionMap[node.id]()
+
+      // Update the sockets
       this.updateSockets(node, spell)
+
+      // Subscribe to any changes to that spell here
+      this.subscriptionMap[node.id] = this.editor.onSpellUpdated(
+        spell.name,
+        (spell: Spell) => {
+          // this can probably be better optimise this
+          this.updateSockets(node, spell)
+        }
+      )
     }
 
     node.inspector.add(spellControl)

From 8a10379b61179cea1880bfbbcd6a6b362706f201 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 30 Mar 2022 11:41:41 -0700
Subject: [PATCH 261/531] Update netlify toml

---
 netlify.toml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/netlify.toml b/netlify.toml
index 13e64e2fb..e4288cd27 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -14,5 +14,8 @@
 [[context.deploy-preview.plugins]]
     package = "/netlify/plugins/conditional-canary"
 
+[[context.staging.plugins]]
+    package = "/netlify/plugins/conditional-canary"
+
 [context.deploy-preview.environment]
     REACT_APP_API_URL="https://latitude-api-staging.herokuapp.com"
\ No newline at end of file

From 3d25c57e7bacb94173d2507e41061aeefcb54268 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 30 Mar 2022 11:50:53 -0700
Subject: [PATCH 262/531] Export thoth editor from core types

---
 core/types.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/types.ts b/core/types.ts
index b38eec65b..c03c7f7a8 100644
--- a/core/types.ts
+++ b/core/types.ts
@@ -17,6 +17,7 @@ import { EngineContext } from './src/engine'
 import { ThothTask } from './src/thoth-component'
 import { ThothConsole } from './src/plugins/debuggerPlugin/ThothConsole'
 import { Data } from 'rete/types/core/data'
+export { ThothEditor } from './src/editor'
 
 export type { InspectorData } from './src/plugins/inspectorPlugin/Inspector'
 

From 12b664724618a7bd1351dc94729ab750f17dfca9 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 30 Mar 2022 11:51:04 -0700
Subject: [PATCH 263/531] Export zoomAt from core index

---
 core/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/index.ts b/core/index.ts
index e9e386913..1e99395cd 100644
--- a/core/index.ts
+++ b/core/index.ts
@@ -3,6 +3,7 @@ import { initEditor } from './src/editor'
 import { initSharedEngine } from './src/engine'
 import { Task } from './src/plugins/taskPlugin/task'
 import { ThothComponent } from './src/thoth-component'
+export { zoomAt } from './src/plugins/areaPlugin/zoom-at'
 
 export { getComponents } from './src/components/components'
 export { initEditor } from './src/editor'

From 3a746993ad069c0e52cad97a3279899724a48128 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 30 Mar 2022 11:51:23 -0700
Subject: [PATCH 264/531] Fix import paths in editor provider to use exported
 core package members and not relative paths

---
 client/src/workspaces/contexts/EditorProvider.tsx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/client/src/workspaces/contexts/EditorProvider.tsx b/client/src/workspaces/contexts/EditorProvider.tsx
index 8421cf552..3262c18eb 100644
--- a/client/src/workspaces/contexts/EditorProvider.tsx
+++ b/client/src/workspaces/contexts/EditorProvider.tsx
@@ -1,5 +1,9 @@
-import { initEditor } from '@latitudegames/thoth-core'
-import { ChainData, Spell } from '@latitudegames/thoth-core/dist/types'
+import { initEditor, zoomAt } from '@latitudegames/thoth-core'
+import {
+  ChainData,
+  Spell,
+  ThothEditor,
+} from '@latitudegames/thoth-core/dist/types'
 import React, {
   useRef,
   useContext,
@@ -18,8 +22,6 @@ import {
   useThothInterface,
   ThothInterfaceContext,
 } from './ThothInterfaceProvider'
-import { ThothEditor } from '@latitudegames/thoth-core/src/editor'
-import { zoomAt } from '../../../../core/src/plugins/areaPlugin/zoom-at'
 
 export type ThothTab = {
   layoutJson: string

From 9521660f47d7e6e2b0d46bb50ce83b95e292a6ae Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 30 Mar 2022 11:53:14 -0700
Subject: [PATCH 265/531] Update netlify toml with staging app api url

---
 netlify.toml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/netlify.toml b/netlify.toml
index e4288cd27..39b2d9eac 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -11,11 +11,16 @@
     to = "/index.html"
     status = 200
 
+#  ALL DEPLOY PREVIEWS
 [[context.deploy-preview.plugins]]
     package = "/netlify/plugins/conditional-canary"
 
+[context.deploy-preview.environment]
+    REACT_APP_API_URL="https://latitude-api-staging.herokuapp.com"
+
+#  STAGING DEPLOYMENT
 [[context.staging.plugins]]
     package = "/netlify/plugins/conditional-canary"
 
-[context.deploy-preview.environment]
-    REACT_APP_API_URL="https://latitude-api-staging.herokuapp.com"
\ No newline at end of file
+[context.staging.environment]
+    REACT_APP_API_URL="https://latitude-api-staging.herokuapp.com"

From 62cb03e2ac463084eb305027511eed2c6767a6f8 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 30 Mar 2022 13:23:25 -0700
Subject: [PATCH 266/531] Add more staging env variables to netlify toml

---
 netlify.toml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/netlify.toml b/netlify.toml
index 39b2d9eac..e5a9782f2 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -23,4 +23,6 @@
     package = "/netlify/plugins/conditional-canary"
 
 [context.staging.environment]
+    REACT_APP_LAPI_ROOT_URL_PROD="https://latitude-api-staging.herokuapp.com"
     REACT_APP_API_URL="https://latitude-api-staging.herokuapp.com"
+    REACT_APP_SITE_ROOT_URL_PROD="https://staging.thoth.latitude.io"
\ No newline at end of file

From a2921e775e647e22735e12d9cd41442d97058e5d Mon Sep 17 00:00:00 2001
From: Nick Walton <nickwalton00@gmail.com>
Date: Wed, 30 Mar 2022 13:40:10 -0700
Subject: [PATCH 267/531] change back to vanilla-davinci

---
 core/src/components/Generator.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/components/Generator.ts b/core/src/components/Generator.ts
index 6e4709943..68992a7d1 100644
--- a/core/src/components/Generator.ts
+++ b/core/src/components/Generator.ts
@@ -59,7 +59,7 @@ export class Generator extends ThothComponent<Promise<WorkerReturn>> {
     const modelControl = new DropdownControl({
       dataKey: 'model',
       name: 'Model',
-      defaultValue: (node.data?.model as string) || 'davinci',
+      defaultValue: (node.data?.model as string) || 'vanilla-davinci',
       values: ['vanilla-davinci', 'aid-jumbo', 'vanilla-jumbo'],
     })
 

From 6af244b273082c153d528d2f15a6758873d0876b Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 30 Mar 2022 13:41:38 -0700
Subject: [PATCH 268/531] Add oauth client id to netlify toml

---
 netlify.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/netlify.toml b/netlify.toml
index e5a9782f2..88b2115cf 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -25,4 +25,5 @@
 [context.staging.environment]
     REACT_APP_LAPI_ROOT_URL_PROD="https://latitude-api-staging.herokuapp.com"
     REACT_APP_API_URL="https://latitude-api-staging.herokuapp.com"
-    REACT_APP_SITE_ROOT_URL_PROD="https://staging.thoth.latitude.io"
\ No newline at end of file
+    REACT_APP_SITE_ROOT_URL_PROD="https://staging.thoth.latitude.io"
+    REACT_APP_OAUTH_CLIENT_ID="20b80581-c3fb-405c-964d-db9556e0033f"
\ No newline at end of file

From 3a39a31a2200b57d854408639fb042c214ea15e8 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 30 Mar 2022 14:03:38 -0700
Subject: [PATCH 269/531] Add staging canary plugin

---
 netlify/plugins/staging-canary/index.js | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 netlify/plugins/staging-canary/index.js

diff --git a/netlify/plugins/staging-canary/index.js b/netlify/plugins/staging-canary/index.js
new file mode 100644
index 000000000..1be3e5bf5
--- /dev/null
+++ b/netlify/plugins/staging-canary/index.js
@@ -0,0 +1,5 @@
+module.exports = {
+  onPreBuild: ({ netlifyConfig, utils: { git } }) => {
+    netlifyConfig.build.command = `cd client && yarn add @latitudegames/thoth-core@canary && cd .. && ${netlifyConfig.build.command}`
+  },
+}

From 474c02f999ff4e00f521437e5e9c97994b2bc77e Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 30 Mar 2022 14:03:50 -0700
Subject: [PATCH 270/531] Manifest for staging canary

---
 netlify/plugins/staging-canary/manifest.yml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 netlify/plugins/staging-canary/manifest.yml

diff --git a/netlify/plugins/staging-canary/manifest.yml b/netlify/plugins/staging-canary/manifest.yml
new file mode 100644
index 000000000..0e87f3f7a
--- /dev/null
+++ b/netlify/plugins/staging-canary/manifest.yml
@@ -0,0 +1 @@
+name: staging-canary

From 4b6d316b5b3f3db82f4e8518d2df7b48cf261d1d Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 30 Mar 2022 14:04:06 -0700
Subject: [PATCH 271/531] Use staging canary plugin in staging deploy netlify
 toml

---
 netlify.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netlify.toml b/netlify.toml
index 88b2115cf..89d27c957 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -20,7 +20,7 @@
 
 #  STAGING DEPLOYMENT
 [[context.staging.plugins]]
-    package = "/netlify/plugins/conditional-canary"
+    package = "/netlify/plugins/staging-canary"
 
 [context.staging.environment]
     REACT_APP_LAPI_ROOT_URL_PROD="https://latitude-api-staging.herokuapp.com"

From 2698ebf6d31f746ced17bdcc450695f95b85b79e Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 30 Mar 2022 14:14:11 -0700
Subject: [PATCH 272/531] Use spell ID in subspell updated

---
 client/src/contexts/PubSubProvider.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/contexts/PubSubProvider.jsx b/client/src/contexts/PubSubProvider.jsx
index 2465e4965..3fbc8b14f 100644
--- a/client/src/contexts/PubSubProvider.jsx
+++ b/client/src/contexts/PubSubProvider.jsx
@@ -18,7 +18,7 @@ export const events = {
   ADD_SUBSPELL: 'addSubspell',
   UPDATE_SUBSPELL: 'updateSubspell',
   DELETE_SUBSPELL: 'deleteSubspell',
-  $SUBSPELL_UPDATED: moduleName => `subspellUpdated:${moduleName}`,
+  $SUBSPELL_UPDATED: spellId => `subspellUpdated:${spellId}`,
   $PLAYTEST_INPUT: tabId => `playtestInput:${tabId}`,
   $PLAYTEST_PRINT: tabId => `playtestPrint:${tabId}`,
   $DEBUG_PRINT: tabId => `debugPrint:${tabId}`,

From c51053f03772a2bd8d73b31d94ec049b4d1a56a2 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 30 Mar 2022 14:22:27 -0700
Subject: [PATCH 273/531] Update client key for staging in netlify toml

---
 netlify.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netlify.toml b/netlify.toml
index 89d27c957..19ef49149 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -26,4 +26,4 @@
     REACT_APP_LAPI_ROOT_URL_PROD="https://latitude-api-staging.herokuapp.com"
     REACT_APP_API_URL="https://latitude-api-staging.herokuapp.com"
     REACT_APP_SITE_ROOT_URL_PROD="https://staging.thoth.latitude.io"
-    REACT_APP_OAUTH_CLIENT_ID="20b80581-c3fb-405c-964d-db9556e0033f"
\ No newline at end of file
+    REACT_APP_OAUTH_CLIENT_ID="a89bb9dc-074c-4376-a5a4-a48c24bc4c42"
\ No newline at end of file

From 1bf029f99bfaa12c1e1b22865bae0e2fcd5fe7ad Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 30 Mar 2022 15:26:03 -0700
Subject: [PATCH 274/531] New subscription in spell index to send subspell
 updated events

---
 client/src/workspaces/spells/index.tsx | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/client/src/workspaces/spells/index.tsx b/client/src/workspaces/spells/index.tsx
index 1ab0f2026..a0ca05a6c 100644
--- a/client/src/workspaces/spells/index.tsx
+++ b/client/src/workspaces/spells/index.tsx
@@ -14,10 +14,12 @@ import TextEditor from './windows/TextEditorWindow'
 import DebugConsole from './windows/DebugConsole'
 import { useSnackbar } from 'notistack'
 import { Spell } from '@latitudegames/thoth-core/types'
+import { usePubSub } from '@/contexts/PubSubProvider'
 
 const Workspace = ({ tab, tabs, pubSub }) => {
   const spellRef = useRef<Spell>()
   const { enqueueSnackbar } = useSnackbar()
+  const { events, publish } = usePubSub()
   const [loadSpell, { data: spellData }] = useLazyGetSpellQuery()
   const [saveDiff] = useSaveDiffMutation()
   const { editor } = useEditor()
@@ -48,6 +50,22 @@ const Workspace = ({ tab, tabs, pubSub }) => {
     return unsubscribe as () => void
   }, [editor])
 
+  useEffect(() => {
+    if (!editor?.on) return
+
+    const unsubscribe = editor.on('nodecreated noderemoved', () => {
+      if (!spellRef.current) return
+      const event = events.$SUBSPELL_UPDATED(editor.toJSON())
+      const spell = {
+        ...spellRef.current,
+        chain: editor.toJSON(),
+      }
+      publish(event, spell)
+    }) as Function
+
+    return unsubscribe as () => void
+  }, [editor])
+
   useEffect(() => {
     if (!spellData) return
     spellRef.current = spellData

From bc3abc287aed7395f3114b9a652fb670a5ae757b Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 30 Mar 2022 15:26:19 -0700
Subject: [PATCH 275/531] New spell component subscribe method

---
 core/src/components/Spell.ts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index 84f920571..32c126f33 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -41,6 +41,20 @@ export class SpellComponent extends ThothComponent<
     this.noBuildUpdate = true
   }
 
+  subscribe(node: ThothNode, spellId: string) {
+    if (this.subscriptionMap[node.id]) this.subscriptionMap[node.id]()
+
+    // Subscribe to any changes to that spell here
+    this.subscriptionMap[node.id] = this.editor.onSpellUpdated(
+      spellId,
+      (spell: Spell) => {
+        // this can probably be better optimise this
+        console.log('SPELL UPDATED')
+        this.updateSockets(node, spell)
+      }
+    )
+  }
+
   builder(node: ThothNode) {
     const spellControl = new SpellControl({
       name: 'Spell Select',

From c99846f80a3d392881792cb596779256913cab0f Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 30 Mar 2022 15:26:47 -0700
Subject: [PATCH 276/531] Subscribe on first build if node has a spell id

---
 core/src/components/Spell.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index 32c126f33..fb27c9df8 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -61,12 +61,11 @@ export class SpellComponent extends ThothComponent<
       write: false,
     })
 
+    if (node.data.spellId) this.subscribe(node, node.data.spellId as string)
+
     spellControl.onData = (spell: Spell) => {
       node.data.spellId = spell.name
 
-      // If it has a subscription remove it here.
-      if (this.subscriptionMap[node.id]) this.subscriptionMap[node.id]()
-
       // Update the sockets
       this.updateSockets(node, spell)
 

From 8725a8175ef5b573e27ad1573aa3af48a5e5114e Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 30 Mar 2022 15:27:10 -0700
Subject: [PATCH 277/531] Refactor spell control on data listener and add
 comments

---
 core/src/components/Spell.ts | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index fb27c9df8..469a66c6d 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -69,14 +69,9 @@ export class SpellComponent extends ThothComponent<
       // Update the sockets
       this.updateSockets(node, spell)
 
-      // Subscribe to any changes to that spell here
-      this.subscriptionMap[node.id] = this.editor.onSpellUpdated(
-        spell.name,
-        (spell: Spell) => {
-          // this can probably be better optimise this
-          this.updateSockets(node, spell)
-        }
-      )
+      // subscribe to changes form the spell to update the sockets if there are changes
+      // Note: We could store all spells in a spell map here and rather than receive the whole spell, only receive the diff, make the changes, update the sockets, etc.  Mayb improve speed?
+      this.subscribe(node, spell.name)
     }
 
     node.inspector.add(spellControl)

From 41192d25633d896a698a0c3a04cdad85fbf595e2 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 30 Mar 2022 15:42:59 -0700
Subject: [PATCH 278/531] Add selection plugin

---
 core/src/plugins/selectionPlugin/index.ts | 294 ++++++++++++++++++++++
 1 file changed, 294 insertions(+)
 create mode 100644 core/src/plugins/selectionPlugin/index.ts

diff --git a/core/src/plugins/selectionPlugin/index.ts b/core/src/plugins/selectionPlugin/index.ts
new file mode 100644
index 000000000..38d2e4f54
--- /dev/null
+++ b/core/src/plugins/selectionPlugin/index.ts
@@ -0,0 +1,294 @@
+import { NodeEditor } from 'rete'
+
+declare module 'rete/types/events' {
+  interface EventsTypes {
+    multiselection: boolean
+  }
+}
+
+export interface Cfg {
+  selectionArea?: {
+    className?: string
+  }
+  selectionMode?: {
+    className?: string
+  }
+  enabled?: boolean
+  mode?: [string, string]
+}
+
+export interface Position {
+  x: number
+  y: number
+}
+
+export interface Size {
+  width: number
+  height: number
+}
+
+const MOUSE_LEFT_BUTTON = 0
+
+function drawSelectionArea(
+  area: HTMLDivElement,
+  position: Position,
+  size: Size
+) {
+  area.style.left = `${position.x}px`
+  area.style.top = `${position.y}px`
+  area.style.width = `${size.width}px`
+  area.style.height = `${size.height}px`
+  area.style.opacity = '0.2'
+}
+
+function cleanSelectionArea(area: HTMLDivElement) {
+  area.style.left = '0px'
+  area.style.top = '0px'
+  area.style.width = '0px'
+  area.style.height = '0px'
+  area.style.opacity = '0'
+}
+
+function applyTransform(
+  translateX: number,
+  translateY: number,
+  scale: number,
+  position: Position
+): Position {
+  return {
+    x: (position.x - translateX) / scale,
+    y: (position.y - translateY) / scale,
+  }
+}
+
+function install(editor: NodeEditor, params: Cfg) {
+  editor.bind('multiselection')
+
+  const cfg = params ?? {}
+
+  // #region
+  let accumulate = false
+  let pressing = false
+  const selection: [Position, Position] = [
+    { x: 0, y: 0 },
+    { x: 0, y: 0 },
+  ]
+  // #endregion
+
+  const canvas = editor.view.container.firstElementChild as HTMLDivElement
+
+  // #region
+  const getNodesFromSelectionArea = () => {
+    if (!cfg.enabled) {
+      return []
+    }
+
+    const {
+      x: translateX,
+      y: translateY,
+      k: scale,
+    } = editor.view.area.transform
+    const areaStart = applyTransform(translateX, translateY, scale, {
+      ...selection[0],
+    })
+    const areaEnd = applyTransform(translateX, translateY, scale, {
+      ...selection[1],
+    })
+
+    if (areaEnd.x < areaStart.x) {
+      const num = areaStart.x
+      areaStart.x = areaEnd.x
+      areaEnd.x = num
+    }
+    if (areaEnd.y < areaStart.y) {
+      const num = areaStart.y
+      areaStart.y = areaEnd.y
+      areaEnd.y = num
+    }
+
+    return editor.nodes.filter(item => {
+      const [x, y] = item.position
+      return (
+        x >= areaStart.x && x <= areaEnd.x && y >= areaStart.y && y <= areaEnd.y
+      )
+    })
+  }
+  // #endregion
+
+  // #region
+  const selectionArea = document.createElement('div')
+  selectionArea.classList.add('selection-area')
+  selectionArea.style.position = 'absolute'
+  selectionArea.style.boxSizing = 'border-box'
+  selectionArea.style.pointerEvents = 'none'
+  cleanSelectionArea(selectionArea)
+
+  const selectionMode = document.createElement('div')
+  selectionMode.classList.add('selection-mode')
+  selectionMode.style.position = 'absolute'
+  selectionMode.style.pointerEvents = 'none'
+  selectionMode.innerText = (cfg.mode ?? [])[0] ?? '单选模式'
+  // #endregion
+
+  // #region
+  {
+    const className = cfg.selectionArea?.className
+    if (className) {
+      selectionMode.classList.add(...className.split(' '))
+    } else {
+      selectionArea.style.backgroundColor = '#E3F2FD'
+      selectionArea.style.border = 'solid 1px #42A5F5'
+      selectionArea.style.borderRadius = '4px'
+    }
+  }
+  {
+    const className = cfg.selectionMode?.className
+    if (className) {
+      selectionMode.classList.add(...className.split(' '))
+    } else {
+      selectionMode.style.top = '16px'
+      selectionMode.style.left = '16px'
+    }
+  }
+  // #endregion
+
+  const handleMouseDown = (e: MouseEvent) => {
+    if (!cfg.enabled) {
+      return
+    }
+
+    if (e.button !== MOUSE_LEFT_BUTTON) {
+      return
+    }
+    if (!e.shiftKey) {
+      return
+    }
+
+    e.preventDefault()
+    e.stopPropagation()
+
+    pressing = true
+
+    canvas.style.pointerEvents = 'none'
+    Array.from(canvas.querySelectorAll('path')).forEach(item => {
+      ;(item as SVGElement).style.pointerEvents = 'none'
+    })
+
+    cleanSelectionArea(selectionArea)
+    selection[0] = { x: e.offsetX, y: e.offsetY }
+    selection[1] = { x: e.offsetX, y: e.offsetY }
+  }
+
+  const handleMouseUp = (e: MouseEvent) => {
+    //e.preventDefault()
+    //e.stopPropagation()
+
+    const selectedNodes = getNodesFromSelectionArea()
+
+    pressing = false
+
+    canvas.style.pointerEvents = 'auto'
+    Array.from(canvas.querySelectorAll('path')).forEach(item => {
+      ;(item as SVGElement).style.pointerEvents = 'auto'
+    })
+
+    cleanSelectionArea(selectionArea)
+    selection[0] = { x: 0, y: 0 }
+    selection[1] = { x: 0, y: 0 }
+
+    if (!cfg.enabled) {
+      return
+    }
+    if (!e.shiftKey) {
+      return
+    }
+
+    selectedNodes.forEach(node => {
+      editor.selectNode(node, accumulate)
+    })
+  }
+
+  const handleMouseMove = (e: MouseEvent) => {
+    if (!cfg.enabled) {
+      return
+    }
+    if (!e.shiftKey) {
+      return
+    }
+    if (!pressing) {
+      return
+    }
+    if (editor.selected.list.length > 0) {
+      return
+    }
+
+    e.preventDefault()
+    e.stopPropagation()
+
+    selection[1] = { x: e.offsetX, y: e.offsetY }
+
+    const size: Size = {
+      width: Math.abs(selection[1].x - selection[0].x),
+      height: Math.abs(selection[1].y - selection[0].y),
+    }
+    const position = { ...selection[0] }
+
+    if (selection[1].x < selection[0].x) {
+      position.x = selection[1].x
+    }
+    if (selection[1].y < selection[0].y) {
+      position.y = selection[1].y
+    }
+
+    drawSelectionArea(selectionArea, position, size)
+  }
+  // #endregion
+
+  // #region
+  editor.view.container.style.position = 'relative'
+  editor.view.container.appendChild(selectionArea)
+  editor.view.container.appendChild(selectionMode)
+
+  editor.view.container.addEventListener('mousedown', handleMouseDown)
+  editor.view.container.addEventListener('mouseup', handleMouseUp)
+  editor.view.container.addEventListener('mouseout', handleMouseUp)
+  editor.view.container.addEventListener('mousemove', handleMouseMove)
+
+  editor.on('destroy', () => {
+    editor.view.container.removeChild(selectionArea)
+    editor.view.container.removeChild(selectionMode)
+
+    editor.view.container.removeEventListener('mousedown', handleMouseDown)
+    editor.view.container.removeEventListener('mouseup', handleMouseUp)
+    editor.view.container.removeEventListener('mouseout', handleMouseUp)
+    editor.view.container.removeEventListener('mousemove', handleMouseMove)
+  })
+
+  editor.on('multiselection', enabled => {
+    cfg.enabled = enabled
+  })
+
+  editor.on('keydown', e => {
+    if (e.ctrlKey) {
+      accumulate = true
+      selectionMode.innerText = (cfg.mode ?? [])[1] ?? 'multi'
+    }
+  })
+
+  editor.on('keyup', () => {
+    if (accumulate) {
+      accumulate = false
+      selectionMode.innerText = (cfg.mode ?? [])[0] ?? 'single'
+    }
+  })
+
+  editor.on('translate', () => {
+    return !accumulate
+  })
+  // #endregion
+}
+
+export default {
+  name: 'rete-selection-plugin',
+  install,
+}

From 9ffeea6c1754af50c84f2a2c746c2e1de9d8dcd5 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 30 Mar 2022 15:44:59 -0700
Subject: [PATCH 279/531] Fix save modal get spell

---
 client/src/workspaces/contexts/ThothInterfaceProvider.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
index f28c137dd..a9b9f20e3 100644
--- a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
+++ b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
@@ -47,8 +47,8 @@ const ThothInterfaceProvider = ({ children, tab }) => {
   const [fetchFromImageCache] = useFetchFromImageCacheMutation()
   const [_runSpell] = useRunSpellMutation()
   const [saveSpell] = useSaveSpellMutation()
-  const { data: _spell } = useGetSpellQuery(tab.spell, {
-    skip: !tab.spell,
+  const { data: _spell } = useGetSpellQuery(tab.spellId, {
+    skip: !tab.spellId,
   })
 
   useEffect(() => {

From d982ea91a5c62a6fe1e879a19a12fa2785fddd03 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 30 Mar 2022 15:45:17 -0700
Subject: [PATCH 280/531] Fix save as modal

---
 client/src/components/Modals/SaveAsModal.tsx | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/client/src/components/Modals/SaveAsModal.tsx b/client/src/components/Modals/SaveAsModal.tsx
index 12b39cb7d..544ef89df 100644
--- a/client/src/components/Modals/SaveAsModal.tsx
+++ b/client/src/components/Modals/SaveAsModal.tsx
@@ -1,9 +1,6 @@
 import { useState } from 'react'
 import { useSnackbar } from 'notistack'
-import {
-  useGetSpellQuery,
-  useSaveSpellMutation,
-} from '../../state/api/spells'
+import { useGetSpellQuery, useSaveSpellMutation } from '../../state/api/spells'
 import { useForm } from 'react-hook-form'
 import Modal from '../Modal/Modal'
 import css from './modalForms.module.css'
@@ -14,7 +11,7 @@ const EditSpellModal = ({ tab, closeModal }) => {
   const dispatch = useDispatch()
   const [error, setError] = useState('')
   const [saveSpell, { isLoading }] = useSaveSpellMutation()
-  const { data: spell } = useGetSpellQuery(tab.spell, {
+  const { data: spell } = useGetSpellQuery(tab.spellId, {
     skip: !tab.spellId,
   })
   const { enqueueSnackbar } = useSnackbar()

From afaaa5f599149b32b7213f22849cf616771ef374 Mon Sep 17 00:00:00 2001
From: Nick Walton <nickwalton00@gmail.com>
Date: Wed, 30 Mar 2022 16:31:53 -0700
Subject: [PATCH 281/531] fix Reeds issue with ai generation being weird

---
 client/package.json                                       | 2 +-
 client/src/workspaces/spells/windows/TextEditorWindow.tsx | 3 ++-
 core/src/components/Generator.ts                          | 7 +++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/client/package.json b/client/package.json
index 5b2887767..346012dd1 100644
--- a/client/package.json
+++ b/client/package.json
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@callstack/async-storage": "^2.0.3",
-    "@latitudegames/thoth-core": "0.0.65",
+    "@latitudegames/thoth-core": "0.0.66",
     "@material-ui/core": "^4.12.1",
     "@material-ui/icons": "^4.11.2",
     "@monaco-editor/react": "^4.2.1",
diff --git a/client/src/workspaces/spells/windows/TextEditorWindow.tsx b/client/src/workspaces/spells/windows/TextEditorWindow.tsx
index b45c015c3..b01a7e20a 100644
--- a/client/src/workspaces/spells/windows/TextEditorWindow.tsx
+++ b/client/src/workspaces/spells/windows/TextEditorWindow.tsx
@@ -104,7 +104,8 @@ const TextEditor = props => {
     save(code)
   }
 
-  const updateCode = (code: string) => {
+  const updateCode = (rawCode: string) => {
+    const code = rawCode.replace('\r\n', '\n')
     setCode(code)
     const update = {
       ...data,
diff --git a/core/src/components/Generator.ts b/core/src/components/Generator.ts
index 68992a7d1..71e4360ea 100644
--- a/core/src/components/Generator.ts
+++ b/core/src/components/Generator.ts
@@ -125,10 +125,11 @@ export class Generator extends ThothComponent<Promise<WorkerReturn>> {
       return acc
     }, {} as Record<string, unknown>)
 
-    const model = (node.data.model as string) ?? 'vanilla-davinci'
+    const model = (node.data.model as string) || 'vanilla-davinci'
     // const model = node.data.model || 'davinci'
 
-    const fewshot = (node.data.fewshot as string) || ''
+    // Replace carriage returns with newlines because that's what the language models expect
+    const fewshot = (node.data.fewshot as string).replace('\r\n', '\n') || ''
     const stopSequence = node.data.stop as string
 
     const template = Handlebars.compile(fewshot, { noEscape: true })
@@ -150,6 +151,8 @@ export class Generator extends ThothComponent<Promise<WorkerReturn>> {
       ? parseFloat(frequencyPenaltyData)
       : 0
 
+    console.log({ model })
+
     const body = {
       model,
       prompt,

From b630682eba64a536e4b041dd318b66633220acc0 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Wed, 30 Mar 2022 17:00:37 -0700
Subject: [PATCH 282/531] import ImageType into ThothInterfaceProvider

---
 client/src/workspaces/contexts/ThothInterfaceProvider.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
index f28c137dd..d5c358b35 100644
--- a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
+++ b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
@@ -12,6 +12,7 @@ import {
   useSaveSpellMutation,
   useRunSpellMutation,
 } from '@/state/api/spells'
+import { ImageType } from '@latitudegames/thoth-core/src/components/VisualGeneration'
 
 /*
 Some notes here.  The new rete provider, not to be confused with the old rete provider renamed to the editor provider, is designed to serve as the single source of truth for interfacing with the rete internal system.  This unified interface will also allow us to replicate the same API in the server, where rete expects certain functions to exist but doesn't care what is behind these functions so long as they work.

From bfec337df8289088755bdc98750cc7134de4cc1d Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Wed, 30 Mar 2022 17:01:01 -0700
Subject: [PATCH 283/531] add return type to readFromImageCache

---
 client/src/workspaces/contexts/ThothInterfaceProvider.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
index d5c358b35..f29bbc39b 100644
--- a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
+++ b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
@@ -30,7 +30,7 @@ export interface ThothInterfaceContext extends EngineContext {
   runSpell: (inputs: Record<string, any>, spellId: string) => void
   getCurrentGameState: () => Record<string, unknown>
   updateCurrentGameState: (update) => void
-  readFromImageCache: (caption, cacheTag, topK) => Promise<Record<string, any>>
+  readFromImageCache: (caption, cacheTag, topK) => Promise<ImageType[]>
   processCode: (
     code: unknown,
     inputs: ThothWorkerInputs,

From 175044b7b90ed690d1178fe5e6ae10c951a6079d Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Wed, 30 Mar 2022 17:01:19 -0700
Subject: [PATCH 284/531] throw error in readFromImageCache

---
 client/src/workspaces/contexts/ThothInterfaceProvider.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
index f29bbc39b..b2788b2a7 100644
--- a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
+++ b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
@@ -149,7 +149,8 @@ const ThothInterfaceProvider = ({ children, tab }) => {
       cacheTag,
       topK,
     })
-    if ('error' in result) return {}
+    if ('error' in result) throw new Error('Error reading from image cache')
+
     return result.data
   }
 

From 3dde22b826854b70a7a2a8f3e38d1072e1f75360 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Wed, 30 Mar 2022 17:01:36 -0700
Subject: [PATCH 285/531] import ImageType into engine.ts

---
 core/src/engine.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/engine.ts b/core/src/engine.ts
index e4227f9f1..6272baea2 100644
--- a/core/src/engine.ts
+++ b/core/src/engine.ts
@@ -8,6 +8,7 @@ import {
   OpenAIResultChoice,
   ThothWorkerInputs,
 } from '../types'
+import { ImageType } from './components/VisualGeneration'
 import debuggerPlugin from './plugins/debuggerPlugin'
 import ModulePlugin from './plugins/modulePlugin'
 import TaskPlugin from './plugins/taskPlugin'

From 1dc01ec89408443add572c0cfa3472439c128d85 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Wed, 30 Mar 2022 17:01:50 -0700
Subject: [PATCH 286/531] add stringType to inputs

---
 core/src/engine.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/engine.ts b/core/src/engine.ts
index 6272baea2..8a48855a1 100644
--- a/core/src/engine.ts
+++ b/core/src/engine.ts
@@ -48,7 +48,7 @@ export type EngineContext = {
   updateCurrentGameState: (update: Record<string, unknown>) => void
   enkiCompletion: (
     taskName: string,
-    inputs: string[]
+    inputs: string[] | string
   ) => Promise<{ outputs: string[] }>
   huggingface: (
     model: string,

From b0df0f801d4ade51c56cf0c6d38165ae05cdce0e Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Wed, 30 Mar 2022 17:02:10 -0700
Subject: [PATCH 287/531] add optional to runSpell

---
 core/src/engine.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/src/engine.ts b/core/src/engine.ts
index 8a48855a1..9a7b0bbac 100644
--- a/core/src/engine.ts
+++ b/core/src/engine.ts
@@ -53,9 +53,7 @@ export type EngineContext = {
   huggingface: (
     model: string,
     request: string
-  ) => Promise<{ error: unknown; [key: string]: unknown }>
-  runSpell: Function
-  readFromImageCache: Function
+  runSpell?: Function
   onPlaytest?: Function
   sendToDebug?: Function
   onAddModule?: Function

From 2ff456c3924173c3ee9a1a1ba93906e46b42b0b6 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Wed, 30 Mar 2022 17:02:27 -0700
Subject: [PATCH 288/531] add optional to error in hugginface return type

---
 core/src/engine.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/engine.ts b/core/src/engine.ts
index 9a7b0bbac..9966256d8 100644
--- a/core/src/engine.ts
+++ b/core/src/engine.ts
@@ -53,6 +53,7 @@ export type EngineContext = {
   huggingface: (
     model: string,
     request: string
+  ) => Promise<{ error?: unknown; [key: string]: unknown }>
   runSpell?: Function
   onPlaytest?: Function
   sendToDebug?: Function

From 88b02e1d0d701c9c7a67e3814c517ace6624cfc7 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Wed, 30 Mar 2022 17:02:45 -0700
Subject: [PATCH 289/531] add return type to readFromImageCache

---
 core/src/engine.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/src/engine.ts b/core/src/engine.ts
index 9966256d8..73c27ee0f 100644
--- a/core/src/engine.ts
+++ b/core/src/engine.ts
@@ -55,6 +55,11 @@ export type EngineContext = {
     request: string
   ) => Promise<{ error?: unknown; [key: string]: unknown }>
   runSpell?: Function
+  readFromImageCache: (
+    caption: string,
+    cacheTag?: string,
+    topK?: number
+  ) => Promise<ImageType[]>
   onPlaytest?: Function
   sendToDebug?: Function
   onAddModule?: Function

From 2bde6c0bf4b839e5266d1a34a8bebbcf33859615 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Wed, 30 Mar 2022 17:02:59 -0700
Subject: [PATCH 290/531] make default value a number not a string

---
 core/src/components/Generator.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/components/Generator.ts b/core/src/components/Generator.ts
index 68992a7d1..3968dcaa3 100644
--- a/core/src/components/Generator.ts
+++ b/core/src/components/Generator.ts
@@ -97,7 +97,7 @@ export class Generator extends ThothComponent<Promise<WorkerReturn>> {
     const frequencyPenalty = new InputControl({
       dataKey: 'frequencyPenalty',
       name: 'Frequency Penalty',
-      defaultValue: '0',
+      defaultValue: 0,
     })
 
     node.inspector

From 667c5bbee6ead48555d4b80e0f483bf8addbddbf Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Wed, 30 Mar 2022 17:03:52 -0700
Subject: [PATCH 291/531] throw Error in generator

---
 core/src/components/Generator.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/components/Generator.ts b/core/src/components/Generator.ts
index 3968dcaa3..15d539020 100644
--- a/core/src/components/Generator.ts
+++ b/core/src/components/Generator.ts
@@ -168,7 +168,9 @@ export class Generator extends ThothComponent<Promise<WorkerReturn>> {
         composed,
       }
     } catch (err) {
-      throw new Error('Error in Generator component.')
+      // Typescript reporting wrong about number of arguments for error constructor
+      //@ts-ignore:next-line
+      throw new Error('Error in Generator component.', { cause: err })
     }
   }
 }

From b30f1e9b9bbb96acf8a2f7c91cf07fd0e5967166 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Wed, 30 Mar 2022 17:04:43 -0700
Subject: [PATCH 292/531] change ?? for || in generator

---
 core/src/components/Generator.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/components/Generator.ts b/core/src/components/Generator.ts
index 15d539020..7f8629fc5 100644
--- a/core/src/components/Generator.ts
+++ b/core/src/components/Generator.ts
@@ -125,8 +125,8 @@ export class Generator extends ThothComponent<Promise<WorkerReturn>> {
       return acc
     }, {} as Record<string, unknown>)
 
-    const model = (node.data.model as string) ?? 'vanilla-davinci'
-    // const model = node.data.model || 'davinci'
+    const model = (node.data.model as string) || 'vanilla-davinci'
+    // const model = node.data.model || 'vanilla-davinci'
 
     const fewshot = (node.data.fewshot as string) || ''
     const stopSequence = node.data.stop as string

From 52db799029dc69d04d75fd1d2229c9c9b3cea67f Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Wed, 30 Mar 2022 17:05:38 -0700
Subject: [PATCH 293/531] change worker return for imagetype return in visual
 generation component

---
 core/src/components/VisualGeneration.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/core/src/components/VisualGeneration.ts b/core/src/components/VisualGeneration.ts
index ea23a2f6b..a30b302c7 100644
--- a/core/src/components/VisualGeneration.ts
+++ b/core/src/components/VisualGeneration.ts
@@ -25,11 +25,7 @@ export type ImageType = {
   score: number | string
 }
 
-type WorkerReturn = {
-  images: ImageType[]
-}
-
-export class VisualGeneration extends ThothComponent<Promise<WorkerReturn>> {
+export class VisualGeneration extends ThothComponent<Promise<ImageType[]>> {
   constructor() {
     super('VisualGeneration')
     this.task = {

From 0d58e9685283feb0234d4d120708c6bdcce96c73 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Wed, 30 Mar 2022 17:06:15 -0700
Subject: [PATCH 294/531] cast types for readFromImageCache arguments

---
 core/src/components/VisualGeneration.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/src/components/VisualGeneration.ts b/core/src/components/VisualGeneration.ts
index a30b302c7..48efa51f1 100644
--- a/core/src/components/VisualGeneration.ts
+++ b/core/src/components/VisualGeneration.ts
@@ -81,10 +81,13 @@ export class VisualGeneration extends ThothComponent<Promise<ImageType[]>> {
     const cacheTag = node.data.cacheTag ?? undefined
 
     try {
-      const images = await readFromImageCache(caption, cacheTag, node.data.topK)
-      return {
-        images,
-      }
+      const images = await readFromImageCache(
+        caption as string,
+        cacheTag as string,
+        node.data.topK as number
+      )
+
+      return images
     } catch (err) {
       throw new Error('Error in VisualGeneration component')
     }

From 8d21dd4ac355cc2d318b731963af41374f738720 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 30 Mar 2022 18:17:27 -0700
Subject: [PATCH 295/531] Install selection plugin

---
 core/src/editor.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/editor.ts b/core/src/editor.ts
index 116810657..295af2801 100644
--- a/core/src/editor.ts
+++ b/core/src/editor.ts
@@ -20,6 +20,7 @@ import { PubSubContext, ThothComponent } from './thoth-component'
 import DebuggerPlugin from './plugins/debuggerPlugin'
 import KeyCodePlugin from './plugins/keyCodePlugin'
 import ModulePlugin from './plugins/modulePlugin'
+import SelectionPlugin from './plugins/selectionPlugin'
 export class ThothEditor extends NodeEditor<EventsTypes> {
   pubSub: PubSubContext
   thoth: EngineContext
@@ -80,7 +81,6 @@ export const initEditor = async function ({
   editor.use(ConnectionPlugin)
   // @seang: temporarily disabling because dependencies of ConnectionReroutePlugin are failing validation on server import of thoth-core
   editor.use(ConnectionReroutePlugin)
-
   // React rendering for the editor
   editor.use(ReactRenderPlugin, {
     // this component parameter is a custom default style for nodes
@@ -132,6 +132,7 @@ export const initEditor = async function ({
   editor.use(ModulePlugin, { engine, modules: {} } as unknown as void)
   editor.use(TaskPlugin)
   editor.use(KeyCodePlugin)
+  editor.use(SelectionPlugin)
 
   // WARNING all the plugins from the editor get installed onto the component and modify it.  This effects the components registered in the engine, which already have plugins installed.
   components.forEach(c => {

From 46d028a1e64525ca649fec96619c6c80e43cc4aa Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 30 Mar 2022 20:43:43 -0700
Subject: [PATCH 296/531] Fix type error in huggingface

---
 core/src/components/Huggingface.ts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/core/src/components/Huggingface.ts b/core/src/components/Huggingface.ts
index b2d32bded..075b25419 100644
--- a/core/src/components/Huggingface.ts
+++ b/core/src/components/Huggingface.ts
@@ -20,12 +20,10 @@ NOTE:  Hugginface models are on demand, and sometimes require time to "boot up".
 Also note that you will likely need to parse the return from huggingface yourself inside a code component, or similar.`
 
 type WorkerReturn = {
-  result?:
-    | {
-        [key: string]: unknown
-        error: unknown
-      }
-    | undefined
+  result: {
+    [key: string]: unknown
+    error?: unknown
+  }
 }
 
 export class HuggingfaceComponent extends ThothComponent<

From b97043d13d610091593b0dc8738b5f9e8a29e139 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 30 Mar 2022 20:43:57 -0700
Subject: [PATCH 297/531] Fix type error in spell component

---
 core/src/components/Spell.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index 469a66c6d..603643380 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -119,6 +119,7 @@ export class SpellComponent extends ThothComponent<
       {} as Record<string, any>
     )
 
+    if (!thoth.runSpell) return
     const response = await thoth.runSpell(flattenedInputs, node.data.spellId)
 
     if ('error' in response) {

From 953ddf15b56b991d7f56bb7f76e3fd53335d3f7e Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Thu, 31 Mar 2022 11:23:13 -0700
Subject: [PATCH 298/531] remove ImageType return

---
 client/src/state/api/visualGenerationsApi.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/src/state/api/visualGenerationsApi.ts b/client/src/state/api/visualGenerationsApi.ts
index dae127db2..bd0cd6da9 100644
--- a/client/src/state/api/visualGenerationsApi.ts
+++ b/client/src/state/api/visualGenerationsApi.ts
@@ -1,10 +1,9 @@
 import { rootApi } from './api'
-import { ImageType } from '@latitudegames/thoth-core/src/components/VisualGeneration'
 
 export const visualGenerationsApi = rootApi.injectEndpoints({
   endpoints: builder => ({
     fetchFromImageCache: builder.mutation<
-      ImageType[],
+      any,
       { caption: string; cacheTag?: string; topK?: number }
     >({
       query: searchOptions => ({

From 66de1e1b3149014c226c8c81df962e204fea74a9 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Thu, 31 Mar 2022 11:24:01 -0700
Subject: [PATCH 299/531] change readFromImageCache return type

---
 client/src/workspaces/contexts/ThothInterfaceProvider.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
index a770723f7..d6327d6f6 100644
--- a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
+++ b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
@@ -30,7 +30,7 @@ export interface ThothInterfaceContext extends EngineContext {
   runSpell: (inputs: Record<string, any>, spellId: string) => void
   getCurrentGameState: () => Record<string, unknown>
   updateCurrentGameState: (update) => void
-  readFromImageCache: (caption, cacheTag, topK) => Promise<ImageType[]>
+  readFromImageCache: (caption, cacheTag, topK) => Promise<any>
   processCode: (
     code: unknown,
     inputs: ThothWorkerInputs,

From d0ee0932ef92edffe4aec58ad3d7d65189cc532f Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Thu, 31 Mar 2022 11:24:16 -0700
Subject: [PATCH 300/531] remove imagetype import

---
 client/src/workspaces/contexts/ThothInterfaceProvider.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
index d6327d6f6..6af88237a 100644
--- a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
+++ b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
@@ -12,7 +12,6 @@ import {
   useSaveSpellMutation,
   useRunSpellMutation,
 } from '@/state/api/spells'
-import { ImageType } from '@latitudegames/thoth-core/src/components/VisualGeneration'
 
 /*
 Some notes here.  The new rete provider, not to be confused with the old rete provider renamed to the editor provider, is designed to serve as the single source of truth for interfacing with the rete internal system.  This unified interface will also allow us to replicate the same API in the server, where rete expects certain functions to exist but doesn't care what is behind these functions so long as they work.

From 8c080a550dbd0c5c3a9b5527ad65a5528b0dd8fa Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Thu, 31 Mar 2022 11:24:45 -0700
Subject: [PATCH 301/531] add images key to result.data

---
 client/src/workspaces/contexts/ThothInterfaceProvider.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
index 6af88237a..491c6bba7 100644
--- a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
+++ b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
@@ -149,8 +149,7 @@ const ThothInterfaceProvider = ({ children, tab }) => {
       topK,
     })
     if ('error' in result) throw new Error('Error reading from image cache')
-
-    return result.data
+    return { images: result.data }
   }
 
   const processCode = (code, inputs, data) => {

From 86b93bd0ddbd7e9370e4c71fccab30bdc1b9291f Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Thu, 31 Mar 2022 15:13:29 -0700
Subject: [PATCH 302/531] remove object with images key from eradFromImageCache
 return

---
 client/src/workspaces/contexts/ThothInterfaceProvider.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
index 491c6bba7..0b1c9c167 100644
--- a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
+++ b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
@@ -149,7 +149,7 @@ const ThothInterfaceProvider = ({ children, tab }) => {
       topK,
     })
     if ('error' in result) throw new Error('Error reading from image cache')
-    return { images: result.data }
+    return result.data
   }
 
   const processCode = (code, inputs, data) => {

From da74c3d242f90d09fcb46ff5441b3c9ed6caae21 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Thu, 31 Mar 2022 15:13:45 -0700
Subject: [PATCH 303/531] update huggingface error type to be optional

---
 core/src/components/Huggingface.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/components/Huggingface.ts b/core/src/components/Huggingface.ts
index b2d32bded..50675d0af 100644
--- a/core/src/components/Huggingface.ts
+++ b/core/src/components/Huggingface.ts
@@ -23,7 +23,7 @@ type WorkerReturn = {
   result?:
     | {
         [key: string]: unknown
-        error: unknown
+        error?: unknown
       }
     | undefined
 }

From f3f621979f28fa1b010ed2d5d41df155d1dc7da5 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Thu, 31 Mar 2022 15:14:08 -0700
Subject: [PATCH 304/531] add null check for thoth.runSpell

---
 core/src/components/Spell.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index 469a66c6d..603643380 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -119,6 +119,7 @@ export class SpellComponent extends ThothComponent<
       {} as Record<string, any>
     )
 
+    if (!thoth.runSpell) return
     const response = await thoth.runSpell(flattenedInputs, node.data.spellId)
 
     if ('error' in response) {

From d9431ab2c527477a1767cfb77358a565754ac47e Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 31 Mar 2022 20:39:53 -0700
Subject: [PATCH 305/531] add d.ts file for comment plugin

---
 core/@types/rete-comment-plugin.d.ts | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 core/@types/rete-comment-plugin.d.ts

diff --git a/core/@types/rete-comment-plugin.d.ts b/core/@types/rete-comment-plugin.d.ts
new file mode 100644
index 000000000..042ac41a9
--- /dev/null
+++ b/core/@types/rete-comment-plugin.d.ts
@@ -0,0 +1 @@
+declare module 'rete-comment-plugin'

From b83917463e3f0d6c1808857ff6dcd808508e378d Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 31 Mar 2022 20:40:33 -0700
Subject: [PATCH 306/531] Initalize comment plugin

---
 core/src/editor.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/src/editor.ts b/core/src/editor.ts
index 295af2801..3f1e07553 100644
--- a/core/src/editor.ts
+++ b/core/src/editor.ts
@@ -113,6 +113,10 @@ export const initEditor = async function ({
     scaleExtent: { min: 0.25, max: 2 },
   })
 
+  editor.use(CommentPlugin, {
+    margin: 20, // indent for new frame comments by default 30 (px)
+  })
+
   // The engine is used to process/run the rete graph
 
   const engine = initSharedEngine({

From 20fa04f32c59e14c6f72557f326f25468fba06cd Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 31 Mar 2022 20:40:52 -0700
Subject: [PATCH 307/531] Enable selection plugin

---
 core/src/editor.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/editor.ts b/core/src/editor.ts
index 3f1e07553..bdeec9390 100644
--- a/core/src/editor.ts
+++ b/core/src/editor.ts
@@ -136,11 +136,12 @@ export const initEditor = async function ({
   editor.use(ModulePlugin, { engine, modules: {} } as unknown as void)
   editor.use(TaskPlugin)
   editor.use(KeyCodePlugin)
-  editor.use(SelectionPlugin)
+
+  editor.use(SelectionPlugin, { enabled: true })
 
   // WARNING all the plugins from the editor get installed onto the component and modify it.  This effects the components registered in the engine, which already have plugins installed.
   components.forEach(c => {
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // eslint-disable-next-line @typescrip``t-eslint/ban-ts-comment
     //@ts-ignore
     // the problematic type here is coming directly from node modules, we may need to revisit further customizing the Editor Register type expectations or it's class
     editor.register(c)

From ad1ab3d1ae471b01f415caa7bbe32d8de222cf97 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 31 Mar 2022 20:41:23 -0700
Subject: [PATCH 308/531] Switch selection keydown to shift

---
 core/src/plugins/selectionPlugin/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/plugins/selectionPlugin/index.ts b/core/src/plugins/selectionPlugin/index.ts
index 38d2e4f54..f3a5a25dd 100644
--- a/core/src/plugins/selectionPlugin/index.ts
+++ b/core/src/plugins/selectionPlugin/index.ts
@@ -269,7 +269,7 @@ function install(editor: NodeEditor, params: Cfg) {
   })
 
   editor.on('keydown', e => {
-    if (e.ctrlKey) {
+    if (e.shiftKey) {
       accumulate = true
       selectionMode.innerText = (cfg.mode ?? [])[1] ?? 'multi'
     }

From 9736694a76c603d65a8c101610dcabbf57f0b810 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 31 Mar 2022 20:41:45 -0700
Subject: [PATCH 309/531] Import comment plugin

---
 core/src/editor.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/editor.ts b/core/src/editor.ts
index bdeec9390..537acbfe0 100644
--- a/core/src/editor.ts
+++ b/core/src/editor.ts
@@ -3,6 +3,7 @@ import ConnectionPlugin from 'rete-connection-plugin'
 import ConnectionReroutePlugin from 'rete-connection-reroute-plugin'
 import ContextMenuPlugin from 'rete-context-menu-plugin'
 import ReactRenderPlugin from 'rete-react-render-plugin'
+import CommentPlugin from 'rete-comment-plugin'
 import { Data } from 'rete/types/core/data'
 
 import { EventsTypes } from '../types'

From 54417ba53dab318d1e357937d017b3f451a3f860 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 31 Mar 2022 20:42:06 -0700
Subject: [PATCH 310/531] Deselect node(s) on click

---
 core/src/editor.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/src/editor.ts b/core/src/editor.ts
index 537acbfe0..53e306858 100644
--- a/core/src/editor.ts
+++ b/core/src/editor.ts
@@ -153,6 +153,10 @@ export const initEditor = async function ({
     return source !== 'dblclick'
   })
 
+  editor.on(['click'], () => {
+    editor.selected.list = []
+  })
+
   editor.bind('run')
   editor.bind('save')
 

From 005f41696ed584c38d54aa90fadc2b70f1b5bfc6 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 31 Mar 2022 20:42:22 -0700
Subject: [PATCH 311/531] Import rete comment plugin

---
 client/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/package.json b/client/package.json
index 346012dd1..16b878a78 100644
--- a/client/package.json
+++ b/client/package.json
@@ -59,6 +59,7 @@
     "redux": "^4.1.1",
     "redux-persist": "^6.0.0",
     "regenerator-runtime": "^0.13.9",
+    "rete-comment-plugin": "^0.7.0-rc.1",
     "rete-connection-reroute-plugin": "^0.4.0",
     "rete-context-menu-plugin": "^0.6.0-rc.1",
     "rete-react-render-plugin": "^0.2.1",

From 25692ffc4bbafa8313a8f8485a3f9977da9609f3 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 31 Mar 2022 20:42:35 -0700
Subject: [PATCH 312/531] update yarn lock

---
 yarn.lock | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/yarn.lock b/yarn.lock
index 5e84bb140..0208b19d6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11495,6 +11495,11 @@ rete-area-plugin@^0.2.1:
   resolved "https://registry.yarnpkg.com/rete-area-plugin/-/rete-area-plugin-0.2.1.tgz#0afe4581baf99c36c904d08e4f0a835ed6604d86"
   integrity sha512-MOeQRmSC/gjkZIMo0fNuomzunRplALqd86V+jSzuhBYchCw0wshv2/iXu4xRxVZkw9r1HpZxlz9gLkbatCbXMw==
 
+rete-comment-plugin@^0.7.0-rc.1:
+  version "0.7.0-rc.1"
+  resolved "https://registry.yarnpkg.com/rete-comment-plugin/-/rete-comment-plugin-0.7.0-rc.1.tgz#a8cc0e0858a655e543eb432b4bd1b82fa631a50d"
+  integrity sha512-Bc8HOFaR6IMozikpbeRzq8OFlDFpIpaIh3WbNkVvXiEINHgyBAmZw2gEtwtpf62F1MHWR7gdxvuwiMaVHKYeUQ==
+
 rete-connection-plugin@^0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/rete-connection-plugin/-/rete-connection-plugin-0.9.0.tgz#3a6df36f55493a5c2ea021ae3147a0f0a6ada6ed"

From 26d169709d9e3b00b0f02c7de7ddf763f050fc53 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 31 Mar 2022 20:43:41 -0700
Subject: [PATCH 313/531] Put thoth core in client back to 65

---
 client/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/package.json b/client/package.json
index 16b878a78..648f5b715 100644
--- a/client/package.json
+++ b/client/package.json
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@callstack/async-storage": "^2.0.3",
-    "@latitudegames/thoth-core": "0.0.66",
+    "@latitudegames/thoth-core": "0.0.65",
     "@material-ui/core": "^4.12.1",
     "@material-ui/icons": "^4.11.2",
     "@monaco-editor/react": "^4.2.1",

From c106a050e721015745e52e637a6cefb97ad37e40 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 31 Mar 2022 20:45:21 -0700
Subject: [PATCH 314/531] Add comment plugin locally

---
 client/package.json                           |   2 +-
 core/src/plugins/commentPlugin/comment.js     |  94 ++++++++++++
 core/src/plugins/commentPlugin/draggable.js   |  65 ++++++++
 .../plugins/commentPlugin/frame-comment.js    |  52 +++++++
 core/src/plugins/commentPlugin/index.js       | 145 ++++++++++++++++++
 .../plugins/commentPlugin/inline-comment.js   |  42 +++++
 core/src/plugins/commentPlugin/manager.js     |  82 ++++++++++
 core/src/plugins/commentPlugin/style.sass     |  22 +++
 core/src/plugins/commentPlugin/utils.js       |  50 ++++++
 9 files changed, 553 insertions(+), 1 deletion(-)
 create mode 100644 core/src/plugins/commentPlugin/comment.js
 create mode 100644 core/src/plugins/commentPlugin/draggable.js
 create mode 100644 core/src/plugins/commentPlugin/frame-comment.js
 create mode 100644 core/src/plugins/commentPlugin/index.js
 create mode 100644 core/src/plugins/commentPlugin/inline-comment.js
 create mode 100644 core/src/plugins/commentPlugin/manager.js
 create mode 100644 core/src/plugins/commentPlugin/style.sass
 create mode 100644 core/src/plugins/commentPlugin/utils.js

diff --git a/client/package.json b/client/package.json
index 648f5b715..16b878a78 100644
--- a/client/package.json
+++ b/client/package.json
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@callstack/async-storage": "^2.0.3",
-    "@latitudegames/thoth-core": "0.0.65",
+    "@latitudegames/thoth-core": "0.0.66",
     "@material-ui/core": "^4.12.1",
     "@material-ui/icons": "^4.11.2",
     "@monaco-editor/react": "^4.2.1",
diff --git a/core/src/plugins/commentPlugin/comment.js b/core/src/plugins/commentPlugin/comment.js
new file mode 100644
index 000000000..a9fcddbc9
--- /dev/null
+++ b/core/src/plugins/commentPlugin/comment.js
@@ -0,0 +1,94 @@
+import Draggable from './draggable';
+
+export default class Comment {
+    constructor(text, editor) {
+        this.editor = editor;
+        this.text = text;
+        this.scale = 1;
+        this.x = 0;
+        this.y = 0;
+        this.dragPosition = [0, 0];
+        this.links = [];
+ 
+        this.initView();
+        this.update();
+    }
+
+    initView() {
+        this.el = document.createElement('div');
+        this.el.tabIndex = 1;
+        this.el.addEventListener('contextmenu', this.onContextMenu.bind(this));
+        this.el.addEventListener('focus', this.onFocus.bind(this));
+        this.el.addEventListener('blur', this.onBlur.bind(this));
+    
+        this.draggable = new Draggable(this.el, () => this.onStart(), (dx, dy) => this.onTranslate(dx, dy));
+    }
+
+    linkTo(ids) {
+        this.links = ids || [];
+    }
+
+    linkedTo(node) {
+        return this.links.includes(node.id);
+    }
+
+    k() {
+        return 1;
+    }
+
+    onContextMenu(e) {
+        e.preventDefault();
+        e.stopPropagation();
+
+        this.editor.trigger('editcomment', this);
+    }
+
+    onFocus() {
+        this.scale = Math.max(1, 1 / this.k());
+        this.update();
+        this.editor.trigger('commentselected', this)
+    }
+
+    focused() {
+        return document.activeElement === this.el;
+    }
+
+    onBlur() {
+        this.scale = 1;
+        this.update()
+    }
+
+    blur() {
+        this.el.blur();
+    }
+
+    onStart() {
+        this.dragPosition = [this.x, this.y];
+    }
+
+    onTranslate (dx, dy) {
+        const [x, y] = this.dragPosition;
+
+        this.x = x + this.scale * dx;
+        this.y = y + this.scale * dy;
+        
+        this.update();
+    }
+
+    update() {
+        this.el.innerText = this.text;
+        this.el.style.transform = `translate(${this.x}px, ${this.y}px) scale(${this.scale})`;
+    }
+
+    toJSON() {
+        return {
+            text: this.text,
+            position: [ this.x, this.y ],
+            links: this.links
+        }
+    }
+
+    destroy() {
+        this.draggable.destroy();
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/commentPlugin/draggable.js b/core/src/plugins/commentPlugin/draggable.js
new file mode 100644
index 000000000..6724e5b11
--- /dev/null
+++ b/core/src/plugins/commentPlugin/draggable.js
@@ -0,0 +1,65 @@
+import { listenWindow } from './utils';
+
+export default class Draggable {
+
+    constructor(el, onStart = () => {}, onTranslate = () => {}, onDrag = () => {}) {
+        this.mouseStart = null;
+
+        this.el = el;
+        this.onStart = onStart;
+        this.onTranslate = onTranslate;
+        this.onDrag = onDrag;
+
+        this.destroy = this.initEvents(el);
+    }
+
+    initEvents(el) {
+        el.addEventListener('pointerdown', this.down.bind(this));
+        
+        const destroyMove = listenWindow('pointermove', this.move.bind(this))
+        const destroyUp = listenWindow('pointerup', this.up.bind(this));
+
+        return () => {
+            destroyMove();
+            destroyUp();
+        }
+    }
+
+    getCoords(e) {
+        const props = e.touches ? e.touches[0] : e;
+
+        return [props.pageX, props.pageY];
+    }
+
+    down(e) {
+        e.stopPropagation();
+
+        if (e.which === 1) {
+            this.mouseStart = this.getCoords(e);
+            this.onStart();
+        }
+    }
+
+    move(e) {
+        if (!this.mouseStart) return;
+        e.preventDefault();
+        e.stopPropagation();
+
+        let [x, y] = this.getCoords(e);
+        let delta = [x - this.mouseStart[0], y - this.mouseStart[1]];
+        let zoom = this.el.getBoundingClientRect().width / this.el.offsetWidth;
+
+        this.onTranslate(delta[0] / zoom, delta[1] / zoom);
+    }
+
+    up() {
+        if (this.mouseStart) {
+            this.onDrag();
+        }
+
+        this.mouseStart = null;
+    }
+
+    // mutable method
+    destroy() { }
+}
diff --git a/core/src/plugins/commentPlugin/frame-comment.js b/core/src/plugins/commentPlugin/frame-comment.js
new file mode 100644
index 000000000..542c1272c
--- /dev/null
+++ b/core/src/plugins/commentPlugin/frame-comment.js
@@ -0,0 +1,52 @@
+import Comment from './comment';
+import { containsRect } from './utils';
+
+export default class FrameComment extends Comment {
+    constructor(text, editor) {
+        super(text, editor);
+        
+        this.width = 0;
+        this.height = 0;
+        this.links = [];
+        this.el.className = 'frame-comment';
+    }
+
+    linkedNodesView() {
+        return this.links
+            .map(id => this.editor.nodes.find(n => n.id === id))
+            .map(node => this.editor.view.nodes.get(node));
+    }
+
+    onStart() {
+        super.onStart();
+        this.linkedNodesView().map(nodeView => nodeView.onStart())
+    }
+
+    onTranslate(dx, dy) {
+        super.onTranslate(dx, dy);
+        this.linkedNodesView().map(nodeView => nodeView.onDrag(dx, dy))
+    }
+
+    isContains(node) {
+        const commRect = this.el.getBoundingClientRect();
+        const view = this.editor.view.nodes.get(node);
+    
+        return containsRect(commRect, view.el.getBoundingClientRect());
+    }
+
+    update() {
+        super.update();
+
+        this.el.style.width = this.width+'px';
+        this.el.style.height = this.height+'px';
+    }
+
+    toJSON() {
+        return {
+            ...super.toJSON(),
+            type: 'frame',
+            width: this.width,
+            height: this.height
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/commentPlugin/index.js b/core/src/plugins/commentPlugin/index.js
new file mode 100644
index 000000000..b4186d280
--- /dev/null
+++ b/core/src/plugins/commentPlugin/index.js
@@ -0,0 +1,145 @@
+import './style.sass';
+import CommentManager from './manager';
+import FrameComment from './frame-comment';
+import InlineComment from './inline-comment';
+import { nodesBBox, listenWindow } from './utils';
+
+// eslint-disable-next-line max-statements
+function install(editor, { 
+    margin = 30,
+    disableBuiltInEdit = false,
+    frameCommentKeys = { code: 'KeyF', shiftKey: true, ctrlKey: false, altKey: false },
+    inlineCommentKeys = { code: 'KeyC', shiftKey: true, ctrlKey: false, altKey: false },
+    deleteCommentKeys = { code: 'Delete', shiftKey: false, ctrlKey: false, altKey: false }
+}) {
+    editor.bind('commentselected');
+    editor.bind('commentcreated');
+    editor.bind('commentremoved');
+    editor.bind('syncframes');
+    editor.bind('addcomment');
+    editor.bind('removecomment');
+    editor.bind('editcomment');
+
+    const manager = new CommentManager(editor);
+
+    if (!disableBuiltInEdit) { 
+        editor.on('editcomment', (comment) => {
+            comment.text = prompt('Edit comment', comment.text)
+            comment.update();
+        });
+    }
+
+    const destroyKeyListener = listenWindow('keydown', function handleKey(e) {
+        const keyCombosMap = [frameCommentKeys, inlineCommentKeys, deleteCommentKeys]
+            .map(function(x) {
+                return e.code === x.code && e.shiftKey === x.shiftKey && 
+                    e.ctrlKey === x.ctrlKey && e.altKey === x.altKey;
+            });
+
+        if (keyCombosMap[0]) {
+            const ids = editor.selected.list.map(node => node.id);
+            const nodes = ids.map(id => editor.nodes.find(n => n.id === id));
+    
+            editor.trigger('addcomment', ({ type: 'frame', nodes }))
+        } else if (keyCombosMap[1]) {
+            const position = Object.values(editor.view.area.mouse);
+
+            editor.trigger('addcomment', ({ type: 'inline', position }))
+        } else if (keyCombosMap[2]) {
+            manager.deleteFocusedComment();
+        }
+    });
+
+    editor.on('addcomment', ({ type, text, nodes, position }) => {
+        if (type === 'inline') {
+            manager.addInlineComment(text, position);
+        } else if (type === 'frame') {
+            const { left, top, width, height } = nodesBBox(editor, nodes, margin);
+            const ids = nodes.map(n => n.id);
+        
+            manager.addFrameComment(text, position || [ left, top ], ids, width, height);
+        } else {
+            throw new Error(`type '${type}' not supported`);
+        }
+    })
+
+    editor.on('removecomment', ({ comment, type }) => {
+        if (comment) {
+            manager.deleteComment(comment)
+        } else if (type === 'inline') {
+            manager.comments
+                .filter(c => c instanceof InlineComment)
+                .map(c => manager.deleteComment(c))
+        } else if (type === 'frame') {
+            manager.comments
+                .filter(c => c instanceof FrameComment)
+                .map(c => manager.deleteComment(c))
+        }
+    });
+
+    editor.on('syncframes', () => {
+        manager.comments
+            .filter(comment => comment instanceof FrameComment)
+            .map(comment => {
+                const nodes = comment.links.map(id => editor.nodes.find(n => n.id === id));
+                const { left, top, width, height } = nodesBBox(editor, nodes, margin);
+
+                comment.x = left;
+                comment.y = top;
+                comment.width = width;
+                comment.height = height;
+                
+                comment.update()
+            });
+    })
+
+    editor.on('nodetranslated', ({ node, prev }) => {
+        const dx = node.position[0] - prev[0];
+        const dy = node.position[1] - prev[1];
+
+        manager.comments
+            .filter(comment => comment instanceof InlineComment)
+            .filter(comment => comment.linkedTo(node))
+            .map(comment => comment.offset(dx, dy));
+    });
+
+    editor.on('nodedraged', node => {
+        manager.comments
+            .filter(comment => comment instanceof FrameComment)
+            .filter(comment => {
+                const contains = comment.isContains(node);
+                const links = comment.links.filter(id => id !== node.id);
+
+                comment.links = contains ? [...links, node.id] : links;
+            });
+    });
+
+    editor.on('commentselected', () => {
+        const list = [...editor.selected.list];
+
+        editor.selected.clear();
+        list.map(node => node.update ? node.update() : null);
+    })
+
+    editor.on('export', data => {
+        data.comments = manager.toJSON();
+    });
+
+    editor.on('import', data => {
+        manager.fromJSON(data.comments || []);
+    });
+
+    if (editor.exist('clear')) { // compatibility with previous versions
+        editor.on('clear', () => manager.deleteComments())
+    }
+
+    editor.on('destroy', () => {
+        manager.destroy()
+        destroyKeyListener();
+    });
+}
+
+export default {
+    name: 'comment',
+    install
+}
\ No newline at end of file
diff --git a/core/src/plugins/commentPlugin/inline-comment.js b/core/src/plugins/commentPlugin/inline-comment.js
new file mode 100644
index 000000000..4f98e539a
--- /dev/null
+++ b/core/src/plugins/commentPlugin/inline-comment.js
@@ -0,0 +1,42 @@
+import Comment from './comment';
+import { intersectRect } from './utils';
+
+export default class InlineComment extends Comment {
+    constructor(text, editor) {
+        super(text, editor);
+        
+        this.el.className = 'inline-comment';
+        this.el.addEventListener('mouseup', this.onDrag.bind(this));
+    }
+
+    onDrag() {
+        const intersection = this.getIntersectNode();
+
+        this.linkTo(intersection ? [intersection.node.id] : []);
+    }
+
+    getIntersectNode() {
+        const commRect = this.el.getBoundingClientRect();
+
+        return Array.from(this.editor.view.nodes)
+            .map(([node, view]) => {
+                return { node, rect: view.el.getBoundingClientRect() };
+            })
+            .find(({ rect }) => {
+                return intersectRect(commRect, rect);
+            });
+    }
+
+    offset(dx, dy) {
+        this.x += dx;
+        this.y += dy;
+        this.update();
+    } 
+
+    toJSON() {
+        return {
+            ...super.toJSON(),
+            type: 'inline'
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/commentPlugin/manager.js b/core/src/plugins/commentPlugin/manager.js
new file mode 100644
index 000000000..30f3708cc
--- /dev/null
+++ b/core/src/plugins/commentPlugin/manager.js
@@ -0,0 +1,82 @@
+import FrameComment from './frame-comment';
+import InlineComment from './inline-comment';
+
+export default class CommentManager {
+    constructor(editor) {
+        this.editor = editor;
+        this.comments = [];
+
+        editor.on('zoomed', () => {
+            this.comments.map(c => c.blur.call(c));
+        });
+    }
+
+    addInlineComment(text, [ x, y ], links = []) {
+        let comment = new InlineComment(text, this.editor);
+
+        comment.k = () => this.editor.view.area.transform.k;
+        comment.x = x;
+        comment.y = y;
+        comment.linkTo(links);
+
+        this.addComment(comment);
+    }
+
+    addFrameComment(text, [ x, y ], links = [], width = 0, height = 0) {
+        let comment = new FrameComment(text, this.editor);
+
+        comment.x = x;
+        comment.y = y;
+        comment.width = width;
+        comment.height = height;
+        comment.linkTo(links);
+        
+        this.addComment(comment);
+    }
+
+    addComment(comment) {
+        comment.update();
+        this.comments.push(comment);
+
+        this.editor.view.area.appendChild(comment.el);
+        this.editor.trigger('commentcreated', comment);
+    }
+
+    deleteComment(comment) {
+        this.editor.view.area.removeChild(comment.el);
+        this.comments.splice(this.comments.indexOf(comment), 1);
+        comment.destroy();
+
+        this.editor.trigger('commentremoved', comment);
+    }
+
+    deleteFocusedComment() {
+        const focused = this.comments.find(c => c.focused());
+        
+        if (focused)
+            this.deleteComment(focused)
+    }
+
+    deleteComments() {
+        [...this.comments].map(c => this.deleteComment(c));
+    }
+
+    toJSON() {
+        return this.comments.map(c => c.toJSON())
+    }
+
+    fromJSON(list) {
+        this.deleteComments();
+        list.map(item => {
+            if (item.type === 'frame') {
+                this.addFrameComment(item.text, item.position, item.links, item.width, item.height)
+            } else {
+                this.addInlineComment(item.text, item.position, item.links);
+            }
+        });
+    }
+
+    destroy() {
+        this.comments.forEach(comment => comment.destroy());
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/commentPlugin/style.sass b/core/src/plugins/commentPlugin/style.sass
new file mode 100644
index 000000000..5a1346f98
--- /dev/null
+++ b/core/src/plugins/commentPlugin/style.sass
@@ -0,0 +1,22 @@
+.inline-comment, .frame-comment
+    color: black
+    padding: 12px
+    font-size: 140%
+    color: white
+    position: absolute
+    cursor: move
+    border-radius: 16px
+    &:focus
+        outline: none
+        border-color: #ffd92c
+    
+.inline-comment
+    z-index: 4
+    background: #aec4ff
+    border: 3px solid #aec4ff
+
+.frame-comment
+    z-index: -10
+    background: rgba(15, 80, 255, 0.2)
+    border: 6px solid transparent
+
diff --git a/core/src/plugins/commentPlugin/utils.js b/core/src/plugins/commentPlugin/utils.js
new file mode 100644
index 000000000..91bb94667
--- /dev/null
+++ b/core/src/plugins/commentPlugin/utils.js
@@ -0,0 +1,50 @@
+const min = (arr) => arr.length === 0 ? 0 : Math.min(...arr);
+const max = (arr) => arr.length === 0 ? 0 : Math.max(...arr);
+
+export function intersectRect(r1, r2) {
+    return !(
+        r2.left > r1.right || 
+        r2.right < r1.left || 
+        r2.top > r1.bottom ||
+        r2.bottom < r1.top
+    );
+}
+
+export function containsRect(r1, r2) {
+    return (
+        r2.left > r1.left && 
+        r2.right < r1.right && 
+        r2.top > r1.top &&
+        r2.bottom < r1.bottom
+    );
+}
+
+export function nodesBBox(editor, nodes, margin) {
+    const left = min(nodes.map(node => node.position[0])) - margin;
+    const top = min(nodes.map(node => node.position[1])) - margin;
+    const right = max(nodes.map(node => node.position[0] + editor.view.nodes.get(node).el.clientWidth)) + 2 * margin;
+    const bottom = max(nodes.map(node => node.position[1] + editor.view.nodes.get(node).el.clientHeight)) + 2 * margin;
+    
+    return {
+        left,
+        right,
+        top,
+        bottom,
+        width: Math.abs(left - right),
+        height: Math.abs(top - bottom),
+        getCenter: () => {
+            return [
+                (left + right) / 2,
+                (top + bottom) / 2
+            ];
+        }
+    };
+}
+
+export function listenWindow(event, handler) {
+    window.addEventListener(event, handler);
+    
+    return () => {
+        window.removeEventListener(event, handler);
+    }
+}
\ No newline at end of file

From 5f31451a7adb0e51d5991930f8bcd168cf38ed0b Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 31 Mar 2022 20:48:36 -0700
Subject: [PATCH 315/531] Convert comment plugin styling from sass to css

---
 core/src/plugins/commentPlugin/style.css  | 28 +++++++++++++++++++++++
 core/src/plugins/commentPlugin/style.sass | 22 ------------------
 2 files changed, 28 insertions(+), 22 deletions(-)
 create mode 100644 core/src/plugins/commentPlugin/style.css
 delete mode 100644 core/src/plugins/commentPlugin/style.sass

diff --git a/core/src/plugins/commentPlugin/style.css b/core/src/plugins/commentPlugin/style.css
new file mode 100644
index 000000000..b33fb6329
--- /dev/null
+++ b/core/src/plugins/commentPlugin/style.css
@@ -0,0 +1,28 @@
+.inline-comment,
+.frame-comment {
+  color: black;
+  padding: 12px;
+  font-size: 140%;
+  color: white;
+  position: absolute;
+  cursor: move;
+  border-radius: 16px;
+}
+
+.frame-comment:focus,
+.inline-comment:focus {
+  outline: none;
+  border-color: #ffd92c;
+}
+
+.inline-comment {
+  z-index: 4;
+  background: #aec4ff;
+  border: 3px solid #aec4ff;
+}
+
+.frame-comment {
+  z-index: -10;
+  background: rgba(15, 80, 255, 0.2);
+  border: 6px solid transparent;
+}
diff --git a/core/src/plugins/commentPlugin/style.sass b/core/src/plugins/commentPlugin/style.sass
deleted file mode 100644
index 5a1346f98..000000000
--- a/core/src/plugins/commentPlugin/style.sass
+++ /dev/null
@@ -1,22 +0,0 @@
-.inline-comment, .frame-comment
-    color: black
-    padding: 12px
-    font-size: 140%
-    color: white
-    position: absolute
-    cursor: move
-    border-radius: 16px
-    &:focus
-        outline: none
-        border-color: #ffd92c
-    
-.inline-comment
-    z-index: 4
-    background: #aec4ff
-    border: 3px solid #aec4ff
-
-.frame-comment
-    z-index: -10
-    background: rgba(15, 80, 255, 0.2)
-    border: 6px solid transparent
-

From 429e117e0654637a38d630a6dc1dc761a71ac062 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 31 Mar 2022 20:49:07 -0700
Subject: [PATCH 316/531] Fix style import path

---
 core/src/plugins/commentPlugin/index.js | 292 +++++++++++++-----------
 1 file changed, 160 insertions(+), 132 deletions(-)

diff --git a/core/src/plugins/commentPlugin/index.js b/core/src/plugins/commentPlugin/index.js
index b4186d280..be8ead1ff 100644
--- a/core/src/plugins/commentPlugin/index.js
+++ b/core/src/plugins/commentPlugin/index.js
@@ -1,145 +1,173 @@
-import './style.sass';
-import CommentManager from './manager';
-import FrameComment from './frame-comment';
-import InlineComment from './inline-comment';
-import { nodesBBox, listenWindow } from './utils';
+import './style.css'
+import CommentManager from './manager'
+import FrameComment from './frame-comment'
+import InlineComment from './inline-comment'
+import { nodesBBox, listenWindow } from './utils'
 
 // eslint-disable-next-line max-statements
-function install(editor, { 
+function install(
+  editor,
+  {
     margin = 30,
     disableBuiltInEdit = false,
-    frameCommentKeys = { code: 'KeyF', shiftKey: true, ctrlKey: false, altKey: false },
-    inlineCommentKeys = { code: 'KeyC', shiftKey: true, ctrlKey: false, altKey: false },
-    deleteCommentKeys = { code: 'Delete', shiftKey: false, ctrlKey: false, altKey: false }
-}) {
-    editor.bind('commentselected');
-    editor.bind('commentcreated');
-    editor.bind('commentremoved');
-    editor.bind('syncframes');
-    editor.bind('addcomment');
-    editor.bind('removecomment');
-    editor.bind('editcomment');
-
-    const manager = new CommentManager(editor);
-
-    if (!disableBuiltInEdit) { 
-        editor.on('editcomment', (comment) => {
-            comment.text = prompt('Edit comment', comment.text)
-            comment.update();
-        });
-    }
-
-    const destroyKeyListener = listenWindow('keydown', function handleKey(e) {
-        const keyCombosMap = [frameCommentKeys, inlineCommentKeys, deleteCommentKeys]
-            .map(function(x) {
-                return e.code === x.code && e.shiftKey === x.shiftKey && 
-                    e.ctrlKey === x.ctrlKey && e.altKey === x.altKey;
-            });
-
-        if (keyCombosMap[0]) {
-            const ids = editor.selected.list.map(node => node.id);
-            const nodes = ids.map(id => editor.nodes.find(n => n.id === id));
-    
-            editor.trigger('addcomment', ({ type: 'frame', nodes }))
-        } else if (keyCombosMap[1]) {
-            const position = Object.values(editor.view.area.mouse);
-
-            editor.trigger('addcomment', ({ type: 'inline', position }))
-        } else if (keyCombosMap[2]) {
-            manager.deleteFocusedComment();
-        }
-    });
-
-    editor.on('addcomment', ({ type, text, nodes, position }) => {
-        if (type === 'inline') {
-            manager.addInlineComment(text, position);
-        } else if (type === 'frame') {
-            const { left, top, width, height } = nodesBBox(editor, nodes, margin);
-            const ids = nodes.map(n => n.id);
-        
-            manager.addFrameComment(text, position || [ left, top ], ids, width, height);
-        } else {
-            throw new Error(`type '${type}' not supported`);
-        }
-    })
-
-    editor.on('removecomment', ({ comment, type }) => {
-        if (comment) {
-            manager.deleteComment(comment)
-        } else if (type === 'inline') {
-            manager.comments
-                .filter(c => c instanceof InlineComment)
-                .map(c => manager.deleteComment(c))
-        } else if (type === 'frame') {
-            manager.comments
-                .filter(c => c instanceof FrameComment)
-                .map(c => manager.deleteComment(c))
-        }
-    });
-
-    editor.on('syncframes', () => {
-        manager.comments
-            .filter(comment => comment instanceof FrameComment)
-            .map(comment => {
-                const nodes = comment.links.map(id => editor.nodes.find(n => n.id === id));
-                const { left, top, width, height } = nodesBBox(editor, nodes, margin);
-
-                comment.x = left;
-                comment.y = top;
-                comment.width = width;
-                comment.height = height;
-                
-                comment.update()
-            });
+    frameCommentKeys = {
+      code: 'KeyF',
+      shiftKey: true,
+      ctrlKey: false,
+      altKey: false,
+    },
+    inlineCommentKeys = {
+      code: 'KeyC',
+      shiftKey: true,
+      ctrlKey: false,
+      altKey: false,
+    },
+    deleteCommentKeys = {
+      code: 'Delete',
+      shiftKey: false,
+      ctrlKey: false,
+      altKey: false,
+    },
+  }
+) {
+  editor.bind('commentselected')
+  editor.bind('commentcreated')
+  editor.bind('commentremoved')
+  editor.bind('syncframes')
+  editor.bind('addcomment')
+  editor.bind('removecomment')
+  editor.bind('editcomment')
+
+  const manager = new CommentManager(editor)
+
+  if (!disableBuiltInEdit) {
+    editor.on('editcomment', comment => {
+      comment.text = prompt('Edit comment', comment.text)
+      comment.update()
     })
-
-    editor.on('nodetranslated', ({ node, prev }) => {
-        const dx = node.position[0] - prev[0];
-        const dy = node.position[1] - prev[1];
-
-        manager.comments
-            .filter(comment => comment instanceof InlineComment)
-            .filter(comment => comment.linkedTo(node))
-            .map(comment => comment.offset(dx, dy));
-    });
-
-    editor.on('nodedraged', node => {
-        manager.comments
-            .filter(comment => comment instanceof FrameComment)
-            .filter(comment => {
-                const contains = comment.isContains(node);
-                const links = comment.links.filter(id => id !== node.id);
-
-                comment.links = contains ? [...links, node.id] : links;
-            });
-    });
-
-    editor.on('commentselected', () => {
-        const list = [...editor.selected.list];
-
-        editor.selected.clear();
-        list.map(node => node.update ? node.update() : null);
+  }
+
+  const destroyKeyListener = listenWindow('keydown', function handleKey(e) {
+    const keyCombosMap = [
+      frameCommentKeys,
+      inlineCommentKeys,
+      deleteCommentKeys,
+    ].map(function (x) {
+      return (
+        e.code === x.code &&
+        e.shiftKey === x.shiftKey &&
+        e.ctrlKey === x.ctrlKey &&
+        e.altKey === x.altKey
+      )
     })
 
-    editor.on('export', data => {
-        data.comments = manager.toJSON();
-    });
+    if (keyCombosMap[0]) {
+      const ids = editor.selected.list.map(node => node.id)
+      const nodes = ids.map(id => editor.nodes.find(n => n.id === id))
 
-    editor.on('import', data => {
-        manager.fromJSON(data.comments || []);
-    });
+      editor.trigger('addcomment', { type: 'frame', nodes })
+    } else if (keyCombosMap[1]) {
+      const position = Object.values(editor.view.area.mouse)
 
-    if (editor.exist('clear')) { // compatibility with previous versions
-        editor.on('clear', () => manager.deleteComments())
+      editor.trigger('addcomment', { type: 'inline', position })
+    } else if (keyCombosMap[2]) {
+      manager.deleteFocusedComment()
     }
-
-    editor.on('destroy', () => {
-        manager.destroy()
-        destroyKeyListener();
-    });
+  })
+
+  editor.on('addcomment', ({ type, text, nodes, position }) => {
+    if (type === 'inline') {
+      manager.addInlineComment(text, position)
+    } else if (type === 'frame') {
+      const { left, top, width, height } = nodesBBox(editor, nodes, margin)
+      const ids = nodes.map(n => n.id)
+
+      manager.addFrameComment(text, position || [left, top], ids, width, height)
+    } else {
+      throw new Error(`type '${type}' not supported`)
+    }
+  })
+
+  editor.on('removecomment', ({ comment, type }) => {
+    if (comment) {
+      manager.deleteComment(comment)
+    } else if (type === 'inline') {
+      manager.comments
+        .filter(c => c instanceof InlineComment)
+        .map(c => manager.deleteComment(c))
+    } else if (type === 'frame') {
+      manager.comments
+        .filter(c => c instanceof FrameComment)
+        .map(c => manager.deleteComment(c))
+    }
+  })
+
+  editor.on('syncframes', () => {
+    manager.comments
+      .filter(comment => comment instanceof FrameComment)
+      .map(comment => {
+        const nodes = comment.links.map(id =>
+          editor.nodes.find(n => n.id === id)
+        )
+        const { left, top, width, height } = nodesBBox(editor, nodes, margin)
+
+        comment.x = left
+        comment.y = top
+        comment.width = width
+        comment.height = height
+
+        comment.update()
+      })
+  })
+
+  editor.on('nodetranslated', ({ node, prev }) => {
+    const dx = node.position[0] - prev[0]
+    const dy = node.position[1] - prev[1]
+
+    manager.comments
+      .filter(comment => comment instanceof InlineComment)
+      .filter(comment => comment.linkedTo(node))
+      .map(comment => comment.offset(dx, dy))
+  })
+
+  editor.on('nodedraged', node => {
+    manager.comments
+      .filter(comment => comment instanceof FrameComment)
+      .filter(comment => {
+        const contains = comment.isContains(node)
+        const links = comment.links.filter(id => id !== node.id)
+
+        comment.links = contains ? [...links, node.id] : links
+      })
+  })
+
+  editor.on('commentselected', () => {
+    const list = [...editor.selected.list]
+
+    editor.selected.clear()
+    list.map(node => (node.update ? node.update() : null))
+  })
+
+  editor.on('export', data => {
+    data.comments = manager.toJSON()
+  })
+
+  editor.on('import', data => {
+    manager.fromJSON(data.comments || [])
+  })
+
+  if (editor.exist('clear')) {
+    // compatibility with previous versions
+    editor.on('clear', () => manager.deleteComments())
+  }
+
+  editor.on('destroy', () => {
+    manager.destroy()
+    destroyKeyListener()
+  })
 }
 
 export default {
-    name: 'comment',
-    install
-}
\ No newline at end of file
+  name: 'comment',
+  install,
+}

From 56ba60acb6e90614687a9efb571be16f9a7bc4b5 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Thu, 31 Mar 2022 20:50:00 -0700
Subject: [PATCH 317/531] Use local comment plugin

---
 core/src/editor.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/editor.ts b/core/src/editor.ts
index 53e306858..926a3b88a 100644
--- a/core/src/editor.ts
+++ b/core/src/editor.ts
@@ -3,12 +3,12 @@ import ConnectionPlugin from 'rete-connection-plugin'
 import ConnectionReroutePlugin from 'rete-connection-reroute-plugin'
 import ContextMenuPlugin from 'rete-context-menu-plugin'
 import ReactRenderPlugin from 'rete-react-render-plugin'
-import CommentPlugin from 'rete-comment-plugin'
 import { Data } from 'rete/types/core/data'
 
 import { EventsTypes } from '../types'
 import { getComponents } from './components/components'
 import { EngineContext, initSharedEngine } from './engine'
+import CommentPlugin from './plugins/commentPlugin'
 import AreaPlugin from './plugins/areaPlugin'
 import DisplayPlugin from './plugins/displayPlugin'
 import HistoryPlugin from './plugins/historyPlugin'

From 6170cac328a93d9ecfa3fc3f8580b609cacd5b0d Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Fri, 1 Apr 2022 00:02:30 -0700
Subject: [PATCH 318/531] Move comment plugin

---
 core/src/editor.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/editor.ts b/core/src/editor.ts
index 926a3b88a..32f2aa934 100644
--- a/core/src/editor.ts
+++ b/core/src/editor.ts
@@ -114,10 +114,6 @@ export const initEditor = async function ({
     scaleExtent: { min: 0.25, max: 2 },
   })
 
-  editor.use(CommentPlugin, {
-    margin: 20, // indent for new frame comments by default 30 (px)
-  })
-
   // The engine is used to process/run the rete graph
 
   const engine = initSharedEngine({
@@ -140,6 +136,10 @@ export const initEditor = async function ({
 
   editor.use(SelectionPlugin, { enabled: true })
 
+  editor.use(CommentPlugin, {
+    margin: 20, // indent for new frame comments by default 30 (px)
+  })
+
   // WARNING all the plugins from the editor get installed onto the component and modify it.  This effects the components registered in the engine, which already have plugins installed.
   components.forEach(c => {
     // eslint-disable-next-line @typescrip``t-eslint/ban-ts-comment

From ffffb1f5f38cf0137c3950e4a4e29e4b19237893 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Fri, 1 Apr 2022 20:05:34 -0700
Subject: [PATCH 319/531] Export init shared engine properly

---
 core/server.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/server.ts b/core/server.ts
index 0f9108f08..f6af79f9d 100644
--- a/core/server.ts
+++ b/core/server.ts
@@ -6,6 +6,7 @@ import { ThothComponent } from './src/thoth-component'
 export { getComponents } from './src/components/components'
 export type { EngineContext } from './src/engine'
 export { Task } from './src/plugins/taskPlugin/task'
+export { initSharedEngine }
 
 export default {
   components,

From de3addce0cead56e18ca13667b738b7c7ef2d533 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Fri, 1 Apr 2022 20:24:17 -0700
Subject: [PATCH 320/531] convert chip from js to ts

---
 client/src/components/Chip/{Chip.jsx => Chip.tsx} | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
 rename client/src/components/Chip/{Chip.jsx => Chip.tsx} (54%)

diff --git a/client/src/components/Chip/Chip.jsx b/client/src/components/Chip/Chip.tsx
similarity index 54%
rename from client/src/components/Chip/Chip.jsx
rename to client/src/components/Chip/Chip.tsx
index 6d713ede9..ffbf10105 100644
--- a/client/src/components/Chip/Chip.jsx
+++ b/client/src/components/Chip/Chip.tsx
@@ -1,10 +1,18 @@
 import Icon from '../Icon/Icon'
 import css from './chip.module.css'
 
-const Chip = ({ label, onClick, noEvents }) => {
+const Chip = ({
+  label,
+  onClick,
+  noEvents,
+}: {
+  label: string
+  onClick?: () => {}
+  noEvents?: boolean
+}) => {
   return (
     <div
-      className={`${css['chip']} ${css[noEvents && 'no-events']}`}
+      className={`${css['chip']} ${noEvents && css['no-events']}`}
       onClick={onClick}
     >
       {label}

From f8c2d660e727895bf0d6b532ceaa9e4307399a22 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Fri, 1 Apr 2022 20:24:46 -0700
Subject: [PATCH 321/531] remove unneeded import from ts conversion

---
 .../Select/{Select.jsx => Select.tsx}         | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)
 rename client/src/components/Select/{Select.jsx => Select.tsx} (88%)

diff --git a/client/src/components/Select/Select.jsx b/client/src/components/Select/Select.tsx
similarity index 88%
rename from client/src/components/Select/Select.jsx
rename to client/src/components/Select/Select.tsx
index 46ee79d3a..84b6d1bdc 100644
--- a/client/src/components/Select/Select.jsx
+++ b/client/src/components/Select/Select.tsx
@@ -1,4 +1,4 @@
-import React, { useRef } from 'react'
+import { useRef } from 'react'
 import { useHotkeys } from 'react-hotkeys-hook'
 import Creatable from 'react-select/creatable'
 import Select from 'react-select'
@@ -20,11 +20,11 @@ const BasicSelect = ({
     true,
   ...props
 }) => {
-  const selectRef = useRef(null)
+  const selectRef = useRef<HTMLInputElement | null>(null)
 
   const DropdownIndicator = () => {
     return props.searchable ? (
-      <Icon name="search" size={'var(--small)'} />
+      <Icon name="search" size={16} />
     ) : (
       <div className={css['dropdown-indicator']}>❯</div>
     )
@@ -40,23 +40,26 @@ const BasicSelect = ({
     </span>
   )
 
-  const focusSelect = () => {
-    selectRef.current.focus()
-  }
+  // const focusSelect = () => {
+  //   if (!selectRef.current) return
+  //   // selectRef.current.focus()
+  // }
 
   const blurSelect = () => {
+    if (!selectRef.current) return
     selectRef.current.blur()
   }
 
-  useHotkeys(
-    focusKey,
-    event => {
-      event.preventDefault()
-      focusSelect()
-    },
-    { enableOnTags: 'INPUT' },
-    [focusSelect]
-  )
+  // useHotkeys(
+  //   focusKey,
+  //   event => {
+  //     console.log('event', event)
+  //     event.preventDefault()
+  //     focusSelect()
+  //   },
+  //   { enableOnTags: 'INPUT' as any },
+  //   [focusSelect]
+  // )
 
   useHotkeys(
     'enter, esc',
@@ -64,7 +67,7 @@ const BasicSelect = ({
       event.preventDefault()
       blurSelect()
     },
-    { enableOnTags: 'INPUT' },
+    { enableOnTags: 'INPUT' as any },
     [blurSelect]
   )
 

From fe9a1b3d547771cbf52b65a2c1c59c1aa9abff35 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Fri, 1 Apr 2022 20:28:38 -0700
Subject: [PATCH 322/531] change name to shorthand object assignment

---
 core/src/dataControls/DropdownControl.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/src/dataControls/DropdownControl.ts b/core/src/dataControls/DropdownControl.ts
index e207960ca..4bc619137 100644
--- a/core/src/dataControls/DropdownControl.ts
+++ b/core/src/dataControls/DropdownControl.ts
@@ -8,18 +8,17 @@ export class DropdownControl extends DataControl {
     defaultValue,
     icon = 'properties',
     write = true,
-
   }: {
     name: string
     dataKey: string
     defaultValue: string
-    values: string[],
+    values: string[]
     icon?: string
     write?: boolean
   }) {
     const options = {
       dataKey,
-      name: name,
+      name,
       component: 'dropdownSelect',
       write,
       icon,

From 4ec577fff8b18b47496a8720dd8afeedb48f64ca Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Fri, 1 Apr 2022 20:29:12 -0700
Subject: [PATCH 323/531] reorganize code for semantic clarity

---
 core/src/components/Generator.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/components/Generator.ts b/core/src/components/Generator.ts
index e843063ac..11d8f605d 100644
--- a/core/src/components/Generator.ts
+++ b/core/src/components/Generator.ts
@@ -65,8 +65,8 @@ export class Generator extends ThothComponent<Promise<WorkerReturn>> {
 
     const inputGenerator = new SocketGeneratorControl({
       connectionType: 'input',
-      name: 'Input Sockets',
       ignored: ['trigger'],
+      name: 'Input Sockets',
     })
 
     const fewshotControl = new FewshotControl({
@@ -101,9 +101,9 @@ export class Generator extends ThothComponent<Promise<WorkerReturn>> {
     })
 
     node.inspector
-      .add(nameControl)
       .add(modelControl)
       .add(inputGenerator)
+      .add(nameControl)
       .add(fewshotControl)
       .add(stopControl)
       .add(temperatureControl)

From 8c201ab29a56e02c8275adb2bfb2f6bf14c2ac86 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Fri, 1 Apr 2022 20:30:07 -0700
Subject: [PATCH 324/531] change build url to use chains rather than spells

---
 .../src/workspaces/spells/windows/EditorWindow/Deployment.tsx  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/src/workspaces/spells/windows/EditorWindow/Deployment.tsx b/client/src/workspaces/spells/windows/EditorWindow/Deployment.tsx
index 7dded3618..eda8a15f3 100644
--- a/client/src/workspaces/spells/windows/EditorWindow/Deployment.tsx
+++ b/client/src/workspaces/spells/windows/EditorWindow/Deployment.tsx
@@ -44,7 +44,8 @@ const DeploymentView = ({ open, setOpen, spellId, close }) => {
   }
 
   const buildUrl = version => {
-    return encodeURI(`${latitudeApiRootUrl}/games/spells/${spellId}/${version}`)
+    // return encodeURI(`${latitudeApiRootUrl}/games/spells/${spellId}/${version}`)
+    return encodeURI(`${latitudeApiRootUrl}/games/chains/${spellId}/${version}`)
   }
 
   const loadVersion = async version => {

From 54418950330d2c43b2a2ef3b9da78ca249792e81 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Fri, 1 Apr 2022 20:30:29 -0700
Subject: [PATCH 325/531] add defaultVal null check

---
 client/src/workspaces/spells/DataControls/DropdownSelect.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/workspaces/spells/DataControls/DropdownSelect.tsx b/client/src/workspaces/spells/DataControls/DropdownSelect.tsx
index ea2117092..4ff6adcac 100644
--- a/client/src/workspaces/spells/DataControls/DropdownSelect.tsx
+++ b/client/src/workspaces/spells/DataControls/DropdownSelect.tsx
@@ -22,6 +22,7 @@ const DropdownSelect = ({ control, updateData, initialValue }) => {
     updateData({ [dataKey]: update })
   }
 
+  if (!defaultVal) return
   return (
     <div style={{ flex: 1 }}>
       <Select

From a5ed3be449385345e20605969b78e167e6258745 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Fri, 1 Apr 2022 20:31:02 -0700
Subject: [PATCH 326/531] remove unneeded index declaration

---
 .../spells/DataControls/DropdownSelect.tsx           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/src/workspaces/spells/DataControls/DropdownSelect.tsx b/client/src/workspaces/spells/DataControls/DropdownSelect.tsx
index 4ff6adcac..9ee8c5fbd 100644
--- a/client/src/workspaces/spells/DataControls/DropdownSelect.tsx
+++ b/client/src/workspaces/spells/DataControls/DropdownSelect.tsx
@@ -3,16 +3,16 @@ import Select from '../../../components/Select/Select'
 const DropdownSelect = ({ control, updateData, initialValue }) => {
   const { dataKey, data } = control
 
-  const {values, defaultValue} = data
+  const { values, defaultValue } = data
 
-  const options = values.map((value, index) => ({
-      value: value,
-      label: value,
-    }))
+  const options = values.map(value => ({
+    value: value,
+    label: value,
+  }))
 
   const value = initialValue?.length > 0 ? initialValue : defaultValue
 
-  const defaultVal = {value, label: value}
+  const defaultVal = { value, label: value }
 
   const onChange = async ({ value }) => {
     update(value)

From 9d28f17962ea95507ace1841730a8f0d4c1e0ecd Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Fri, 1 Apr 2022 20:57:42 -0700
Subject: [PATCH 327/531] Fix ordering

---
 core/src/components/components.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/components/components.ts b/core/src/components/components.ts
index 5f82f7de5..9a07fbee3 100644
--- a/core/src/components/components.ts
+++ b/core/src/components/components.ts
@@ -17,10 +17,10 @@ import { HuggingfaceComponent } from './Huggingface'
 import { InputComponent } from './Input'
 import { ItemTypeComponent } from './ItemDetector'
 import { JoinListComponent } from './JoinList'
-import { SpellComponent } from './Spell'
 import { Output } from './Output'
 import { ProseToScript } from './ProseToScript'
 import { SafetyVerifier } from './SafetyVerifier'
+import { SpellComponent } from './Spell'
 import { StateRead } from './StateRead'
 import { StateWrite } from './StateWrite'
 import { StringProcessor } from './StringProcessor'

From 2929cf880dd6fad494687520886bd1cf581ab285 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Fri, 1 Apr 2022 20:57:54 -0700
Subject: [PATCH 328/531] Start work on spell runner class

---
 server/src/helpers/runSpell.ts | 66 ++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 server/src/helpers/runSpell.ts

diff --git a/server/src/helpers/runSpell.ts b/server/src/helpers/runSpell.ts
new file mode 100644
index 000000000..fd39aa60e
--- /dev/null
+++ b/server/src/helpers/runSpell.ts
@@ -0,0 +1,66 @@
+import { Data } from 'rete/types/core/data'
+import { EngineContext } from '@latitudegames/thoth-core/dist/src/engine'
+import {
+  getComponents,
+  initSharedEngine,
+} from '@latitudegames/thoth-core/server'
+import { Module } from 'src/routes/spells/module'
+import { Graph, Spell } from 'src/routes/spells/types'
+import { extractNodes, ThothEngine } from '../../../core/src/engine'
+
+type RunSpellConstructor = {
+  thothInterface: EngineContext
+}
+
+class RunSpell {
+  engine: ThothEngine
+  currentSpell!: Spell
+  module: Module
+  thothInterface: EngineContext
+
+  constructor({ thothInterface }: RunSpellConstructor) {
+    // Initialize the engine
+    this.engine = initSharedEngine({
+      name: 'demo@0.1.0',
+      components: getComponents(),
+      server: true,
+      modules: {},
+    }) as ThothEngine
+
+    // Set up the module to interface with the runtime processes
+    this.module = new Module()
+
+    // Set the interface that this runner will use when running workers
+    this.thothInterface = thothInterface
+
+    // We should probably load up here all the "modules" the spell needds to run
+    // This would basicallyt be an array of spells pulled from the DB
+  }
+
+  // getter method for all triggers ins of the loaded spell
+  get triggerIns() {
+    return this.engine.moduleManager.triggerIns
+  }
+
+  get context() {
+    return {
+      module: this.module,
+      thoth: this.thothInterface,
+      silent: true,
+    }
+  }
+
+  loadSpell(spell: Spell) {
+    this.currentSpell = spell
+
+    // We process the graph for the new spell which will set up all the task workers
+    this.engine.process(spell.graph as Data, null, this.context)
+  }
+
+  getFirstNodeTrigger(data: Graph) {
+    const extractedNodes = extractNodes(data.nodes, triggerIns)
+    return extractedNodes[0]
+  }
+}
+
+export default RunSpell

From 85ce48da9bb039f7dffa13374aae83f98d16a281 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Fri, 1 Apr 2022 20:58:59 -0700
Subject: [PATCH 329/531] delete helpers in server folder :(

---
 server/src/helpers/runSpell.ts | 66 ----------------------------------
 1 file changed, 66 deletions(-)
 delete mode 100644 server/src/helpers/runSpell.ts

diff --git a/server/src/helpers/runSpell.ts b/server/src/helpers/runSpell.ts
deleted file mode 100644
index fd39aa60e..000000000
--- a/server/src/helpers/runSpell.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { Data } from 'rete/types/core/data'
-import { EngineContext } from '@latitudegames/thoth-core/dist/src/engine'
-import {
-  getComponents,
-  initSharedEngine,
-} from '@latitudegames/thoth-core/server'
-import { Module } from 'src/routes/spells/module'
-import { Graph, Spell } from 'src/routes/spells/types'
-import { extractNodes, ThothEngine } from '../../../core/src/engine'
-
-type RunSpellConstructor = {
-  thothInterface: EngineContext
-}
-
-class RunSpell {
-  engine: ThothEngine
-  currentSpell!: Spell
-  module: Module
-  thothInterface: EngineContext
-
-  constructor({ thothInterface }: RunSpellConstructor) {
-    // Initialize the engine
-    this.engine = initSharedEngine({
-      name: 'demo@0.1.0',
-      components: getComponents(),
-      server: true,
-      modules: {},
-    }) as ThothEngine
-
-    // Set up the module to interface with the runtime processes
-    this.module = new Module()
-
-    // Set the interface that this runner will use when running workers
-    this.thothInterface = thothInterface
-
-    // We should probably load up here all the "modules" the spell needds to run
-    // This would basicallyt be an array of spells pulled from the DB
-  }
-
-  // getter method for all triggers ins of the loaded spell
-  get triggerIns() {
-    return this.engine.moduleManager.triggerIns
-  }
-
-  get context() {
-    return {
-      module: this.module,
-      thoth: this.thothInterface,
-      silent: true,
-    }
-  }
-
-  loadSpell(spell: Spell) {
-    this.currentSpell = spell
-
-    // We process the graph for the new spell which will set up all the task workers
-    this.engine.process(spell.graph as Data, null, this.context)
-  }
-
-  getFirstNodeTrigger(data: Graph) {
-    const extractedNodes = extractNodes(data.nodes, triggerIns)
-    return extractedNodes[0]
-  }
-}
-
-export default RunSpell

From 0faf1eb517c42bb1f934eceea73de32ad9343d23 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Fri, 1 Apr 2022 20:59:06 -0700
Subject: [PATCH 330/531] Start work on spell runner

---
 core/src/utils/runSpell.ts | 121 +++++++++++++++++++++++++++++++++++++
 1 file changed, 121 insertions(+)
 create mode 100644 core/src/utils/runSpell.ts

diff --git a/core/src/utils/runSpell.ts b/core/src/utils/runSpell.ts
new file mode 100644
index 000000000..555efeb3b
--- /dev/null
+++ b/core/src/utils/runSpell.ts
@@ -0,0 +1,121 @@
+import {
+  getComponents,
+  initSharedEngine,
+} from '@latitudegames/thoth-core/server'
+import { ChainData, ModuleComponent, Spell } from '../../types'
+import { EngineContext, extractNodes, ThothEngine } from '../engine'
+import { Module } from '../plugins/modulePlugin/module'
+
+type RunSpellConstructor = {
+  thothInterface: EngineContext
+}
+
+class RunSpell {
+  engine: ThothEngine
+  currentSpell!: Spell
+  module: Module
+  thothInterface: EngineContext
+
+  constructor({ thothInterface }: RunSpellConstructor) {
+    // Initialize the engine
+    this.engine = initSharedEngine({
+      name: 'demo@0.1.0',
+      components: getComponents(),
+      server: true,
+      modules: {},
+    }) as ThothEngine
+
+    // Set up the module to interface with the runtime processes
+    this.module = new Module()
+
+    // Set the interface that this runner will use when running workers
+    this.thothInterface = thothInterface
+
+    // We should probably load up here all the "modules" the spell needds to run
+    // This would basicallyt be an array of spells pulled from the DB
+  }
+
+  // getter method for all triggers ins of the loaded spell
+  get triggerIns() {
+    return this.engine.moduleManager.triggerIns
+  }
+
+  get context() {
+    return {
+      module: this.module,
+      thoth: this.thothInterface,
+      silent: true,
+    }
+  }
+
+  private _getComponent(componentName: string) {
+    return this.engine.components.get(componentName)
+  }
+
+  private _loadInputs(inputs: Record<string, any>) {
+    this.module.read(inputs)
+  }
+
+  private _formatOutputs(rawOutputs: Record<string, any>) {
+    const outputs = {} as Record<string, unknown>
+    const graph = this.currentSpell.chain
+
+    Object.values(graph.nodes)
+      .filter((node: any) => {
+        return node.name.includes('Output')
+      })
+      .forEach((node: any) => {
+        outputs[(node as any).data.name as string] =
+          rawOutputs[(node as any).data.socketKey as string]
+      })
+
+    return outputs
+  }
+
+  /**
+   * temporary method until we have a better way to target specific nodes
+   * this is basically just using a "Default" trigger in
+   * and does not support multipel triggers in to a spell yet
+   */
+  private _getFirstNodeTrigger() {
+    const extractedNodes = extractNodes(
+      this.currentSpell.chain.nodes,
+      this.triggerIns
+    )
+    return extractedNodes[0]
+  }
+
+  getOutputs() {
+    const rawOutputs = {}
+    this.module.write(rawOutputs)
+    return this._formatOutputs(rawOutputs)
+  }
+
+  loadSpell(spell: Spell) {
+    this.currentSpell = spell
+
+    // We process the graph for the new spell which will set up all the task workers
+    this.engine.process(spell.chain as ChainData, null, this.context)
+  }
+
+  /**
+   * Main spell runner.  Processes inputs, gets the right component that starts the
+   * running.  Would be even better iof we just took a node identifier, got its
+   * component, and ran the one triggered rather than this slightly hacky hard coded
+   * method.
+   */
+  async runComponent(inputs: Record<string, any>, componentName: string) {
+    this._loadInputs(inputs)
+
+    const component = this._getComponent(componentName) as ModuleComponent
+    const triggeredNopde = this._getFirstNodeTrigger()
+
+    // this running is where the main "work" happens.
+    // I do wonder whether we could make this even more elegant by having the node
+    // subscribe to a run pubsub and then we just use that.  This would treat running
+    // from a trigger in node like any other data stream. Or even just pass in socket IO.
+    await component.run(triggeredNopde)
+  }
+}
+
+export default RunSpell

From b38cf427ddcb2f58a0f587de78c3aca1eb966df0 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Fri, 1 Apr 2022 20:59:20 -0700
Subject: [PATCH 331/531] Add tasks to editor and reset on process

---
 core/src/plugins/taskPlugin/index.ts | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/core/src/plugins/taskPlugin/index.ts b/core/src/plugins/taskPlugin/index.ts
index f7f9483ad..90f427cc2 100644
--- a/core/src/plugins/taskPlugin/index.ts
+++ b/core/src/plugins/taskPlugin/index.ts
@@ -1,12 +1,16 @@
-import { NodeEditor } from 'rete'
+import { Component } from 'rete'
 import { NodeData } from 'rete/types/core/data'
 
-import { ThothWorkerInputs } from '../../../types'
+import { ThothEditor, ThothWorkerInputs } from '../../../types'
 import { ThothComponent } from '../../thoth-component'
 import { Task } from './task'
 
-function install(editor: NodeEditor) {
-  editor.on('componentregister', (component: ThothComponent<unknown>) => {
+function install(editor: ThothEditor) {
+  editor.on('componentregister', (_component: Component) => {
+    editor.tasks = []
+
+    const component = _component as unknown as ThothComponent<unknown>
+
     if (!component.task)
       throw new Error('Task plugin requires a task property in component')
     if (component.task.outputs.constructor !== Object)
@@ -80,6 +84,13 @@ function install(editor: NodeEditor) {
       Object.keys(allOutputs).forEach(key => {
         outputs[key] = { type: taskOptions.outputs[key], key, task }
       })
+
+      // Probably need to reset this when spells change
+      editor.tasks.push(task)
+
+      editor.on('process', () => {
+        editor.tasks = []
+      })
     }
   })
 }

From 83b17c54b69ac40e1ed46660d62b5a91ee8cb846 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Fri, 1 Apr 2022 20:59:37 -0700
Subject: [PATCH 332/531] Add tasks array to thoth editor type

---
 core/src/editor.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/editor.ts b/core/src/editor.ts
index 32f2aa934..27f7c0e9d 100644
--- a/core/src/editor.ts
+++ b/core/src/editor.ts
@@ -16,13 +16,14 @@ import InspectorPlugin from './plugins/inspectorPlugin'
 import LifecyclePlugin from './plugins/lifecyclePlugin'
 import { ModuleManager } from './plugins/modulePlugin/module-manager'
 import SocketGenerator from './plugins/socketGenerator'
-import TaskPlugin from './plugins/taskPlugin'
+import TaskPlugin, { Task } from './plugins/taskPlugin'
 import { PubSubContext, ThothComponent } from './thoth-component'
 import DebuggerPlugin from './plugins/debuggerPlugin'
 import KeyCodePlugin from './plugins/keyCodePlugin'
 import ModulePlugin from './plugins/modulePlugin'
 import SelectionPlugin from './plugins/selectionPlugin'
 export class ThothEditor extends NodeEditor<EventsTypes> {
+  tasks: Task[]
   pubSub: PubSubContext
   thoth: EngineContext
   tab: { type: string }

From d10fda34f7d25b9cd5e1f40d8b10a7ec776838cc Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Fri, 1 Apr 2022 21:00:42 -0700
Subject: [PATCH 333/531] reset closed sockets on task reset

---
 core/src/plugins/taskPlugin/task.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/plugins/taskPlugin/task.ts b/core/src/plugins/taskPlugin/task.ts
index d9bd9fc3a..98f854a30 100644
--- a/core/src/plugins/taskPlugin/task.ts
+++ b/core/src/plugins/taskPlugin/task.ts
@@ -79,6 +79,7 @@ export class Task {
 
   reset() {
     this.outputData = null
+    this.closed = []
   }
 
   async run(data: unknown = {}, options: RunOptions = {}) {

From c28196caa170b7b117803833b5e0cf9acf5f083e Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Fri, 1 Apr 2022 21:02:12 -0700
Subject: [PATCH 334/531] Add tasks to engine type

---
 core/src/engine.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/engine.ts b/core/src/engine.ts
index 73c27ee0f..2cc8e6e86 100644
--- a/core/src/engine.ts
+++ b/core/src/engine.ts
@@ -11,13 +11,14 @@ import {
 import { ImageType } from './components/VisualGeneration'
 import debuggerPlugin from './plugins/debuggerPlugin'
 import ModulePlugin from './plugins/modulePlugin'
-import TaskPlugin from './plugins/taskPlugin'
+import TaskPlugin, { Task } from './plugins/taskPlugin'
 
 interface WorkerOutputs {
   [key: string]: unknown
 }
 
 export interface ThothEngine extends Engine {
+  tasks: Task[]
   activateDebugger?: Function
   moduleManager?: any
 }

From 721f83b6213a502d136944764423fe658ef17f26 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Fri, 1 Apr 2022 21:02:25 -0700
Subject: [PATCH 335/531] Add reset tasks function to ensure smooth running

---
 core/src/utils/runSpell.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/core/src/utils/runSpell.ts b/core/src/utils/runSpell.ts
index 555efeb3b..3e4944a14 100644
--- a/core/src/utils/runSpell.ts
+++ b/core/src/utils/runSpell.ts
@@ -85,6 +85,10 @@ class RunSpell {
     return extractedNodes[0]
   }
 
+  private _resetTasks() {
+    this.engine.tasks.forEach(t => t.reset())
+  }
+
   getOutputs() {
     const rawOutputs = {}
     this.module.write(rawOutputs)
@@ -105,6 +109,10 @@ class RunSpell {
    * method.
    */
   async runComponent(inputs: Record<string, any>, componentName: string) {
+    // ensaure we run from a clean sloate
+    this._resetTasks()
+
+    // laod the inputs into module memory
     this._loadInputs(inputs)
 
     const component = this._getComponent(componentName) as ModuleComponent

From 5cbb57f7ce53ee68ac712f29fcb8dd49f1aa582b Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 2 Apr 2022 14:08:56 -0700
Subject: [PATCH 336/531] Add input keys getter

---
 core/src/utils/runSpell.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/src/utils/runSpell.ts b/core/src/utils/runSpell.ts
index 3e4944a14..651f45a82 100644
--- a/core/src/utils/runSpell.ts
+++ b/core/src/utils/runSpell.ts
@@ -5,6 +5,7 @@ import {
 import { ChainData, ModuleComponent, Spell } from '../../types'
 import { EngineContext, extractNodes, ThothEngine } from '../engine'
 import { Module } from '../plugins/modulePlugin/module'
+import { extractModuleInputKeys } from './chainHelpers'
 
 type RunSpellConstructor = {
   thothInterface: EngineContext
@@ -48,6 +49,10 @@ class RunSpell {
     }
   }
 
+  get inputKeys() {
+    return extractModuleInputKeys(this.currentSpell.chain)
+  }
+
   private _getComponent(componentName: string) {
     return this.engine.components.get(componentName)
   }

From 0bea7995a64eb166e47ae757c87226767bb0dd3c Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 2 Apr 2022 14:09:34 -0700
Subject: [PATCH 337/531] Add output data getter

---
 core/src/utils/runSpell.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/src/utils/runSpell.ts b/core/src/utils/runSpell.ts
index 651f45a82..dd0423c7c 100644
--- a/core/src/utils/runSpell.ts
+++ b/core/src/utils/runSpell.ts
@@ -53,6 +53,12 @@ class RunSpell {
     return extractModuleInputKeys(this.currentSpell.chain)
   }
 
+  get outputData() {
+    const rawOutputs = {}
+    this.module.write(rawOutputs)
+    return this._formatOutputs(rawOutputs)
+  }
+
   private _getComponent(componentName: string) {
     return this.engine.components.get(componentName)
   }

From 84fc1cda6218e66d0a6fc3bffd4ec67e14e8fb56 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 2 Apr 2022 14:09:54 -0700
Subject: [PATCH 338/531] Return output data from run component

---
 core/src/utils/runSpell.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/src/utils/runSpell.ts b/core/src/utils/runSpell.ts
index dd0423c7c..c7d4d3d4a 100644
--- a/core/src/utils/runSpell.ts
+++ b/core/src/utils/runSpell.ts
@@ -134,6 +134,11 @@ class RunSpell {
     // subscribe to a run pubsub and then we just use that.  This would treat running
     // from a trigger in node like any other data stream. Or even just pass in socket IO.
     await component.run(triggeredNopde)
+
+    return this.outputData
+  }
+
+  /**
   }
 }
 

From 77aa92932978275646ddb95c061c93885b3f4171 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 2 Apr 2022 14:10:24 -0700
Subject: [PATCH 339/531] Remove get outputs function

---
 core/src/utils/runSpell.ts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/core/src/utils/runSpell.ts b/core/src/utils/runSpell.ts
index c7d4d3d4a..fcb477140 100644
--- a/core/src/utils/runSpell.ts
+++ b/core/src/utils/runSpell.ts
@@ -100,12 +100,6 @@ class RunSpell {
     this.engine.tasks.forEach(t => t.reset())
   }
 
-  getOutputs() {
-    const rawOutputs = {}
-    this.module.write(rawOutputs)
-    return this._formatOutputs(rawOutputs)
-  }
-
   loadSpell(spell: Spell) {
     this.currentSpell = spell
 

From 9d8bac26a3a4e0903dc7b9ba662e86e3c3371d91 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 2 Apr 2022 14:10:41 -0700
Subject: [PATCH 340/531] Add a temporary default run

---
 core/src/utils/runSpell.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/src/utils/runSpell.ts b/core/src/utils/runSpell.ts
index fcb477140..a0c18e290 100644
--- a/core/src/utils/runSpell.ts
+++ b/core/src/utils/runSpell.ts
@@ -133,6 +133,10 @@ class RunSpell {
   }
 
   /**
+   * temporary function to be backwards compatible with current use of run spell
+   */
+  async defaultRun(inputs: Record<string, any>) {
+    return this.runComponent(inputs, 'Module Trigger In')
   }
 }
 

From cf5706bf59b2f8e151958ab24a35fadee3cc42ef Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 2 Apr 2022 14:19:24 -0700
Subject: [PATCH 341/531] Add save spell diff event

---
 client/src/contexts/PubSubProvider.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/contexts/PubSubProvider.jsx b/client/src/contexts/PubSubProvider.jsx
index 3fbc8b14f..6fd427964 100644
--- a/client/src/contexts/PubSubProvider.jsx
+++ b/client/src/contexts/PubSubProvider.jsx
@@ -29,6 +29,7 @@ export const events = {
   $CLOSE_EDITOR: tabId => `closeEditor:${tabId}`,
   $NODE_SET: (tabId, nodeId) => `nodeSet:${tabId}:${nodeId}`,
   $SAVE_SPELL: tabId => `saveSpell:${tabId}`,
+  $SAVE_SPELL_DIFF: tabId => `saveSpell:${tabId}`,
   $CREATE_STATE_MANAGER: tabId => `createStateManage:${tabId}`,
   $CREATE_PLAYTEST: tabId => `createPlaytest:${tabId}`,
   $CREATE_INSPECTOR: tabId => `createInspector:${tabId}`,

From 7f5eb6dc6640d6c51ffd1accb2d07f95ec6aced4 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 2 Apr 2022 14:34:32 -0700
Subject: [PATCH 342/531] Add on diff save handler to event handler

---
 client/src/screens/Thoth/components/EventHandler.tsx | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/client/src/screens/Thoth/components/EventHandler.tsx b/client/src/screens/Thoth/components/EventHandler.tsx
index 412c111c2..df303721e 100644
--- a/client/src/screens/Thoth/components/EventHandler.tsx
+++ b/client/src/screens/Thoth/components/EventHandler.tsx
@@ -13,6 +13,7 @@ import {
 } from '../../../state/api/spells'
 import { useEditor } from '../../../workspaces/contexts/EditorProvider'
 import { useLayout } from '../../../workspaces/contexts/LayoutProvider'
+import { diff } from '@/utils/json0'
 
 // Config for unique name generator
 const customConfig = {
@@ -63,6 +64,17 @@ const EventHandler = ({ pubSub, tab }) => {
     await saveSpellMutation({ ...currentSpell, chain })
   }
 
+  const onSaveDiff = async (event, update) => {
+    const currentSpell = spellRef.current
+    const updatedSpell = {
+      ...currentSpell,
+      ...update,
+    }
+    const jsonDiff = diff(currentSpell, updatedSpell)
+
+    console.log('JSON DIFF', jsonDiff)
+  }
+
   const createStateManager = () => {
     createOrFocus(windowTypes.STATE_MANAGER, 'State Manager')
   }

From fa2d80fc68bdf32f90d58ba8ea568d9ae6ebd655 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 2 Apr 2022 14:34:49 -0700
Subject: [PATCH 343/531] destructure save spell diff event

---
 client/src/screens/Thoth/components/EventHandler.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/screens/Thoth/components/EventHandler.tsx b/client/src/screens/Thoth/components/EventHandler.tsx
index df303721e..c02c4a98a 100644
--- a/client/src/screens/Thoth/components/EventHandler.tsx
+++ b/client/src/screens/Thoth/components/EventHandler.tsx
@@ -47,6 +47,7 @@ const EventHandler = ({ pubSub, tab }) => {
     $UNDO,
     $REDO,
     $SAVE_SPELL,
+    $SAVE_SPELL_DIFF,
     $CREATE_STATE_MANAGER,
     $CREATE_PLAYTEST,
     $CREATE_INSPECTOR,

From 4dfeb14be3b914d86fbff568405e1220462277ad Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 2 Apr 2022 14:35:03 -0700
Subject: [PATCH 344/531] Add save spell diff to event handler map

---
 client/src/screens/Thoth/components/EventHandler.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/screens/Thoth/components/EventHandler.tsx b/client/src/screens/Thoth/components/EventHandler.tsx
index c02c4a98a..2f14716ec 100644
--- a/client/src/screens/Thoth/components/EventHandler.tsx
+++ b/client/src/screens/Thoth/components/EventHandler.tsx
@@ -162,6 +162,7 @@ const EventHandler = ({ pubSub, tab }) => {
     [$REDO(tab.id)]: onRedo,
     [$DELETE(tab.id)]: onDelete,
     [$PROCESS(tab.id)]: onProcess,
+    [$SAVE_SPELL_DIFF(tab.id)]: onSaveDiff,
   }
 
   useEffect(() => {

From eba292cb6832110d3bed1778aa8e32b10353f981 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 2 Apr 2022 14:35:18 -0700
Subject: [PATCH 345/531] Send save diff on editor change

---
 client/src/workspaces/spells/index.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/client/src/workspaces/spells/index.tsx b/client/src/workspaces/spells/index.tsx
index a0ca05a6c..56239bf1e 100644
--- a/client/src/workspaces/spells/index.tsx
+++ b/client/src/workspaces/spells/index.tsx
@@ -22,16 +22,19 @@ const Workspace = ({ tab, tabs, pubSub }) => {
   const { events, publish } = usePubSub()
   const [loadSpell, { data: spellData }] = useLazyGetSpellQuery()
   const [saveDiff] = useSaveDiffMutation()
-  const { editor } = useEditor()
+  const { serialize, editor } = useEditor()
 
   // Set up autosave for the workspaces
   useEffect(() => {
     if (!editor?.on) return
+
     const unsubscribe = editor.on(
       'save nodecreated noderemoved connectioncreated connectionremoved nodetranslated',
       debounce(async data => {
         if (tab.type === 'spell' && spellRef.current) {
-          const jsonDiff = diff(spellRef.current?.chain, editor.toJSON())
+          publish(events.$SAVE_SPELL_DIFF(tab.id), { chain: serialize() })
+
+          const jsonDiff = diff(spellRef.current?.chain, serialize())
 
           const response = await saveDiff({
             name: spellRef.current.name,

From 51845001a9535b7a4cbc9ead235de7366a96c54f Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 2 Apr 2022 15:26:23 -0700
Subject: [PATCH 346/531] Check is spell reff is null before proceeding in save
 diff

---
 client/src/screens/Thoth/components/EventHandler.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/src/screens/Thoth/components/EventHandler.tsx b/client/src/screens/Thoth/components/EventHandler.tsx
index 2f14716ec..52ab3347f 100644
--- a/client/src/screens/Thoth/components/EventHandler.tsx
+++ b/client/src/screens/Thoth/components/EventHandler.tsx
@@ -66,6 +66,8 @@ const EventHandler = ({ pubSub, tab }) => {
   }
 
   const onSaveDiff = async (event, update) => {
+    if (!spellRef.current) return
+
     const currentSpell = spellRef.current
     const updatedSpell = {
       ...currentSpell,

From 8b1658c45afe78c9da7cba2fe5abe79e818311e9 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 2 Apr 2022 15:26:39 -0700
Subject: [PATCH 347/531] Stop save diff if there is no diff

---
 client/src/screens/Thoth/components/EventHandler.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/src/screens/Thoth/components/EventHandler.tsx b/client/src/screens/Thoth/components/EventHandler.tsx
index 52ab3347f..d9c0986c4 100644
--- a/client/src/screens/Thoth/components/EventHandler.tsx
+++ b/client/src/screens/Thoth/components/EventHandler.tsx
@@ -75,7 +75,9 @@ const EventHandler = ({ pubSub, tab }) => {
     }
     const jsonDiff = diff(currentSpell, updatedSpell)
 
-    console.log('JSON DIFF', jsonDiff)
+    // no point saving if nothing has changed
+    if (jsonDiff.length === 0) return
+
   }
 
   const createStateManager = () => {

From 10dd4f107f4daa1de1f29e18b5aebeefeaeaee0d Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 2 Apr 2022 15:26:53 -0700
Subject: [PATCH 348/531] Send diff via save diff mutation

---
 client/src/screens/Thoth/components/EventHandler.tsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/client/src/screens/Thoth/components/EventHandler.tsx b/client/src/screens/Thoth/components/EventHandler.tsx
index d9c0986c4..227c7346e 100644
--- a/client/src/screens/Thoth/components/EventHandler.tsx
+++ b/client/src/screens/Thoth/components/EventHandler.tsx
@@ -78,6 +78,11 @@ const EventHandler = ({ pubSub, tab }) => {
     // no point saving if nothing has changed
     if (jsonDiff.length === 0) return
 
+    const response = await saveDiff({
+      name: currentSpell.name,
+      diff: jsonDiff,
+    })
+
   }
 
   const createStateManager = () => {

From 1326851d572271a7a9bc9838a8deabc46b3d55e7 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 2 Apr 2022 15:27:16 -0700
Subject: [PATCH 349/531] Import and use save dif mutation

---
 client/src/screens/Thoth/components/EventHandler.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/src/screens/Thoth/components/EventHandler.tsx b/client/src/screens/Thoth/components/EventHandler.tsx
index 227c7346e..da7e61c93 100644
--- a/client/src/screens/Thoth/components/EventHandler.tsx
+++ b/client/src/screens/Thoth/components/EventHandler.tsx
@@ -10,6 +10,7 @@ import {
 import {
   useSaveSpellMutation,
   useGetSpellQuery,
+  useSaveDiffMutation,
 } from '../../../state/api/spells'
 import { useEditor } from '../../../workspaces/contexts/EditorProvider'
 import { useLayout } from '../../../workspaces/contexts/LayoutProvider'
@@ -27,9 +28,8 @@ const EventHandler = ({ pubSub, tab }) => {
   const { createOrFocus, windowTypes } = useLayout()
 
   const [saveSpellMutation] = useSaveSpellMutation()
-  const { data: spell } = useGetSpellQuery(tab.spellId, {
-    skip: !tab.spellId,
-  })
+  const [saveDiff] = useSaveDiffMutation()
+  const { data: spell } = useGetSpellQuery(tab.spellId)
 
   // Spell ref because callbacks cant hold values from state without them
   const spellRef = useRef<Spell | null>(null)

From f4fc857ff6e78367fb4387e6732515b1a4f08d0e Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 2 Apr 2022 15:27:42 -0700
Subject: [PATCH 350/531] Show snackbar on save diff error

---
 client/src/screens/Thoth/components/EventHandler.tsx | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/client/src/screens/Thoth/components/EventHandler.tsx b/client/src/screens/Thoth/components/EventHandler.tsx
index da7e61c93..490c77308 100644
--- a/client/src/screens/Thoth/components/EventHandler.tsx
+++ b/client/src/screens/Thoth/components/EventHandler.tsx
@@ -15,6 +15,7 @@ import {
 import { useEditor } from '../../../workspaces/contexts/EditorProvider'
 import { useLayout } from '../../../workspaces/contexts/LayoutProvider'
 import { diff } from '@/utils/json0'
+import { useSnackbar } from 'notistack'
 
 // Config for unique name generator
 const customConfig = {
@@ -26,6 +27,7 @@ const customConfig = {
 const EventHandler = ({ pubSub, tab }) => {
   // only using this to handle events, so not rendering anything with it.
   const { createOrFocus, windowTypes } = useLayout()
+  const { enqueueSnackbar } = useSnackbar()
 
   const [saveSpellMutation] = useSaveSpellMutation()
   const [saveDiff] = useSaveDiffMutation()
@@ -83,6 +85,13 @@ const EventHandler = ({ pubSub, tab }) => {
       diff: jsonDiff,
     })
 
+    if ('error' in response) {
+      enqueueSnackbar('Error saving spell', {
+        variant: 'error',
+      })
+      return
+    }
+
   }
 
   const createStateManager = () => {

From 7c89588895863c5eeffa7b28bb68feb501aecf25 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 2 Apr 2022 15:27:53 -0700
Subject: [PATCH 351/531] Show snackbar on save diff success

---
 client/src/screens/Thoth/components/EventHandler.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/src/screens/Thoth/components/EventHandler.tsx b/client/src/screens/Thoth/components/EventHandler.tsx
index 490c77308..61d1926f7 100644
--- a/client/src/screens/Thoth/components/EventHandler.tsx
+++ b/client/src/screens/Thoth/components/EventHandler.tsx
@@ -35,6 +35,7 @@ const EventHandler = ({ pubSub, tab }) => {
 
   // Spell ref because callbacks cant hold values from state without them
   const spellRef = useRef<Spell | null>(null)
+
   useEffect(() => {
     if (!spell) return
     spellRef.current = spell
@@ -92,6 +93,9 @@ const EventHandler = ({ pubSub, tab }) => {
       return
     }
 
+    enqueueSnackbar('Spell saved', {
+      variant: 'success',
+    })
   }
 
   const createStateManager = () => {

From 2dfc2b4d6a51319e4b4804bfb2e3b14aad0b300b Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 2 Apr 2022 15:28:05 -0700
Subject: [PATCH 352/531] Invalidate spell tags (for now)

---
 client/src/state/api/spells.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/state/api/spells.ts b/client/src/state/api/spells.ts
index 65551348d..8342beb76 100644
--- a/client/src/state/api/spells.ts
+++ b/client/src/state/api/spells.ts
@@ -69,7 +69,7 @@ export const spellApi = rootApi.injectEndpoints({
     }),
     saveDiff: builder.mutation<void, Diff>({
       // TODO this may introruce bugs.  Though I don't think we need to invalidate the spell cache here since the chain is loaded in live to the rete editor.
-      // invalidatesTags: ['Spell'],
+      invalidatesTags: ['Spell'],
       query: diffData => ({
         url: 'game/spells/saveDiff',
         method: 'POST',

From 025e2e1cbe8c336b3bbfbc0748cd110a3303291a Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 2 Apr 2022 15:28:23 -0700
Subject: [PATCH 353/531] Turn off save spell in inspector

---
 .../workspaces/contexts/InspectorProvider.tsx | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/client/src/workspaces/contexts/InspectorProvider.tsx b/client/src/workspaces/contexts/InspectorProvider.tsx
index 35c9024ec..9108eb3cf 100644
--- a/client/src/workspaces/contexts/InspectorProvider.tsx
+++ b/client/src/workspaces/contexts/InspectorProvider.tsx
@@ -1,7 +1,7 @@
 import { usePubSub } from '@/contexts/PubSubProvider'
-import { useGetSpellQuery, useSaveSpellMutation } from '@/state/api/spells'
 import { InspectorData } from '@latitudegames/thoth-core/types'
 import { createContext, useContext, useEffect, useState } from 'react'
+// import { useEditor } from './EditorProvider'
 
 export type TextEditorData = {
   options?: Record<string, any> | undefined
@@ -23,17 +23,13 @@ export const useInspector = () => useContext(Context)
 
 const InspectorProvider = ({ children, tab }) => {
   const { subscribe, publish, events } = usePubSub()
-
-  const [saveSpell] = useSaveSpellMutation()
-  const { data: spell } = useGetSpellQuery(tab.spellId, {
-    skip: !tab.spellId,
-  })
+  // const { serialize } = useEditor()
 
   const [inspectorData, setInspectorData] = useState<InspectorData | null>(null)
-
   const [textEditorData, setTextEditorData] = useState({})
 
   const SET_INSPECTOR = events.$INSPECTOR_SET(tab.id)
+  // const SAVE_SPELL_DIFF = events.$SAVE_SPELL_DIFF(tab.id)
 
   // inspector subscription
   useEffect(() => {
@@ -79,6 +75,14 @@ const InspectorProvider = ({ children, tab }) => {
     })
   }, [events, subscribe, publish])
 
+  // const saveSpellDiff = () => {
+  //   const update = {
+  //     chain: serialize(),
+  //   }
+
+  //   publish(SAVE_SPELL_DIFF, update)
+  // }
+
   //
   const saveTextEditor = textData => {
     const textUpdate = {
@@ -99,13 +103,15 @@ const InspectorProvider = ({ children, tab }) => {
     if (inspectorData) {
       setInspectorData(update)
     }
-    spell && saveSpell(spell)
+    // saveSpellDiff()
+    // spell && saveSpell(spell)
   }
 
   const saveInspector = inspectorData => {
     setInspectorData(inspectorData)
     publish(events.$NODE_SET(tab.id, inspectorData.nodeId), inspectorData)
-    spell && saveSpell(spell)
+    // saveSpellDiff()
+    // spell && saveSpell(spell)
   }
 
   const publicInterface: InspectorContext = {

From c013ffea3e4bb279be4623c5391ab4e0dd8e29a0 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 2 Apr 2022 15:28:41 -0700
Subject: [PATCH 354/531] Clean up unused code

---
 .../workspaces/spells/windows/TextEditorWindow.tsx  | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/client/src/workspaces/spells/windows/TextEditorWindow.tsx b/client/src/workspaces/spells/windows/TextEditorWindow.tsx
index b01a7e20a..3158e1cd4 100644
--- a/client/src/workspaces/spells/windows/TextEditorWindow.tsx
+++ b/client/src/workspaces/spells/windows/TextEditorWindow.tsx
@@ -62,19 +62,6 @@ const TextEditor = props => {
     }
   }, [textEditorData])
 
-  // useEffect(() => {
-  //   if (props?.node?.rect?.height)
-  //     setHeight(props.node.rect.height - bottomHeight)
-
-  //   // this is to dynamically set the appriopriate height so that Monaco editor doesnt break flexbox when resizing
-  //   props.node.setEventListener(
-  //     'resize',
-  //     (data: { rect: { height: number } }) => {
-  //       setTimeout(() => setHeight(data.rect.height - bottomHeight), 0)
-  //     }
-  //   )
-  // }, [props.node])
-
   // debounce for delayed save
   useEffect(() => {
     if (!typing) return

From ce28f409a1fe9ab7ebe4c84dcc97227af2403bcc Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 2 Apr 2022 15:29:03 -0700
Subject: [PATCH 355/531] Dont show snackbar in text editor save

---
 client/src/workspaces/spells/windows/TextEditorWindow.tsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/client/src/workspaces/spells/windows/TextEditorWindow.tsx b/client/src/workspaces/spells/windows/TextEditorWindow.tsx
index 3158e1cd4..5c248e43c 100644
--- a/client/src/workspaces/spells/windows/TextEditorWindow.tsx
+++ b/client/src/workspaces/spells/windows/TextEditorWindow.tsx
@@ -81,10 +81,6 @@ const TextEditor = props => {
     }
     setData(update)
     saveTextEditor(update)
-    enqueueSnackbar('Editor saved', {
-      preventDuplicate: true,
-      variant: 'success',
-    })
   }
 
   const onSave = () => {

From b3fcd94933e6e254c463da05db5b9a9f1a94d7d9 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 2 Apr 2022 15:29:18 -0700
Subject: [PATCH 356/531] Remove unused imports

---
 client/src/workspaces/spells/windows/TextEditorWindow.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/client/src/workspaces/spells/windows/TextEditorWindow.tsx b/client/src/workspaces/spells/windows/TextEditorWindow.tsx
index 5c248e43c..3b0a8cf78 100644
--- a/client/src/workspaces/spells/windows/TextEditorWindow.tsx
+++ b/client/src/workspaces/spells/windows/TextEditorWindow.tsx
@@ -1,5 +1,4 @@
 import Editor from '@monaco-editor/react'
-import { useSnackbar } from 'notistack'
 import { useState, useEffect } from 'react'
 
 import Window from '@components/Window/Window'
@@ -20,7 +19,6 @@ const TextEditor = props => {
   const [language, setLanguage] = useState<string | undefined>(undefined)
 
   const { textEditorData, saveTextEditor } = useInspector()
-  const { enqueueSnackbar } = useSnackbar()
 
   // const bottomHeight = 50
   const handleEditorWillMount = monaco => {

From d8e239191977f27cec8408dff9d4725f2be147e2 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 2 Apr 2022 15:29:46 -0700
Subject: [PATCH 357/531] Clean up old save code inside spell index

---
 client/src/workspaces/spells/index.tsx | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/client/src/workspaces/spells/index.tsx b/client/src/workspaces/spells/index.tsx
index 56239bf1e..359effe8a 100644
--- a/client/src/workspaces/spells/index.tsx
+++ b/client/src/workspaces/spells/index.tsx
@@ -33,19 +33,6 @@ const Workspace = ({ tab, tabs, pubSub }) => {
       debounce(async data => {
         if (tab.type === 'spell' && spellRef.current) {
           publish(events.$SAVE_SPELL_DIFF(tab.id), { chain: serialize() })
-
-          const jsonDiff = diff(spellRef.current?.chain, serialize())
-
-          const response = await saveDiff({
-            name: spellRef.current.name,
-            diff: jsonDiff,
-          })
-
-          if ('error' in response) {
-            enqueueSnackbar('Error saving spell', {
-              variant: 'error',
-            })
-          }
         }
       }, 500)
     )

From 4f9c1cc047d3e75c337200ea12330ec73872f87c Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 2 Apr 2022 15:30:17 -0700
Subject: [PATCH 358/531] Remove unused dependencies

---
 client/src/workspaces/spells/index.tsx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/client/src/workspaces/spells/index.tsx b/client/src/workspaces/spells/index.tsx
index 359effe8a..5a88e8f33 100644
--- a/client/src/workspaces/spells/index.tsx
+++ b/client/src/workspaces/spells/index.tsx
@@ -1,9 +1,8 @@
 import { useEffect, useRef } from 'react'
 
-import { diff } from '../../utils/json0'
 import { useEditor } from '@/workspaces/contexts/EditorProvider'
 import { Layout } from '@/workspaces/contexts/LayoutProvider'
-import { useLazyGetSpellQuery, useSaveDiffMutation } from '@/state/api/spells'
+import { useLazyGetSpellQuery } from '@/state/api/spells'
 import { debounce } from '@/utils/debounce'
 import EditorWindow from './windows/EditorWindow/'
 import EventHandler from '@/screens/Thoth/components/EventHandler'
@@ -12,16 +11,13 @@ import Playtest from './windows/PlaytestWindow'
 import StateManager from '@/workspaces/spells/windows/StateManagerWindow'
 import TextEditor from './windows/TextEditorWindow'
 import DebugConsole from './windows/DebugConsole'
-import { useSnackbar } from 'notistack'
 import { Spell } from '@latitudegames/thoth-core/types'
 import { usePubSub } from '@/contexts/PubSubProvider'
 
 const Workspace = ({ tab, tabs, pubSub }) => {
   const spellRef = useRef<Spell>()
-  const { enqueueSnackbar } = useSnackbar()
   const { events, publish } = usePubSub()
   const [loadSpell, { data: spellData }] = useLazyGetSpellQuery()
-  const [saveDiff] = useSaveDiffMutation()
   const { serialize, editor } = useEditor()
 
   // Set up autosave for the workspaces

From 7c1f95bf118b8a48a7236a7d4209a04ff900dd44 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 2 Apr 2022 15:33:35 -0700
Subject: [PATCH 359/531] Drop spell saving from text editor

---
 .../spells/windows/StateManagerWindow.tsx          | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/client/src/workspaces/spells/windows/StateManagerWindow.tsx b/client/src/workspaces/spells/windows/StateManagerWindow.tsx
index 1659b0bb2..cfa8069b4 100644
--- a/client/src/workspaces/spells/windows/StateManagerWindow.tsx
+++ b/client/src/workspaces/spells/windows/StateManagerWindow.tsx
@@ -93,20 +93,8 @@ const StateManager = ({ tab, ...props }) => {
         ...spell,
         gameState: parsedState,
       }
-      const res = await saveSpell(spellUpdate)
-      if ('error' in res) {
-        enqueueSnackbar('Error saving state', {
-          preventDuplicate: true,
-          variant: 'error',
-        })
-        throw new Error('Error saving spell')
-      }
-      res.data.gameState && setCode(JSON.stringify(res.data.gameState?.state))
 
-      enqueueSnackbar('State saved', {
-        preventDuplicate: true,
-        variant: 'success',
-      })
+      publish(SAVE_SPELL_DIFF, spellUpdate)
     } catch (err) {
       console.log(err)
     }

From 517847d7ebc378bbcca77909a9c8ad8edadc0054 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 2 Apr 2022 15:33:56 -0700
Subject: [PATCH 360/531] Drop unneeded height effect in text editor

---
 .../spells/windows/StateManagerWindow.tsx      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/client/src/workspaces/spells/windows/StateManagerWindow.tsx b/client/src/workspaces/spells/windows/StateManagerWindow.tsx
index cfa8069b4..a0805fd51 100644
--- a/client/src/workspaces/spells/windows/StateManagerWindow.tsx
+++ b/client/src/workspaces/spells/windows/StateManagerWindow.tsx
@@ -48,15 +48,15 @@ const StateManager = ({ tab, ...props }) => {
     })
   }
 
-  useEffect(() => {
-    if (props?.node?.rect?.height)
-      setHeight((props.node.rect.height - bottomHeight) as number)
-
-    // this is to dynamically set the appriopriate height so that Monaco editor doesnt break flexbox when resizing
-    props.node.setEventListener('resize', data => {
-      setTimeout(() => setHeight(data.rect.height - bottomHeight), 0)
-    })
-  }, [props.node])
+  // useEffect(() => {
+  //   if (props?.node?.rect?.height)
+  //     setHeight((props.node.rect.height - bottomHeight) as number)
+
+  //   // this is to dynamically set the appriopriate height so that Monaco editor doesnt break flexbox when resizing
+  //   props.node.setEventListener('resize', data => {
+  //     setTimeout(() => setHeight(data.rect.height - bottomHeight), 0)
+  //   })
+  // }, [props.node])
 
   useEffect(() => {
     if (!typing) return

From f6bbd32dbfd98a6d5ab553d0f572cab06a12464c Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 2 Apr 2022 15:34:26 -0700
Subject: [PATCH 361/531] Import pubsub and event to state manager

---
 .../spells/windows/StateManagerWindow.tsx           | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/client/src/workspaces/spells/windows/StateManagerWindow.tsx b/client/src/workspaces/spells/windows/StateManagerWindow.tsx
index a0805fd51..8fdd3c984 100644
--- a/client/src/workspaces/spells/windows/StateManagerWindow.tsx
+++ b/client/src/workspaces/spells/windows/StateManagerWindow.tsx
@@ -3,28 +3,23 @@ import jsonFormat from 'json-format'
 // import debounce from 'lodash.debounce'
 import { useSnackbar } from 'notistack'
 import { useState, useEffect } from 'react'
-import {
-  useGetSpellQuery,
-  useSaveSpellMutation,
-} from '../../../state/api/spells'
+import { useGetSpellQuery } from '../../../state/api/spells'
 import Window from '../../../components/Window/Window'
 
 import '../../../screens/Thoth/thoth.module.css'
 import WindowMessage from '../components/WindowMessage'
+import { usePubSub } from '@/contexts/PubSubProvider'
 
 const StateManager = ({ tab, ...props }) => {
-  // const dispatch = useDispatch()
-  const [saveSpell] = useSaveSpellMutation()
+  const { publish, events } = usePubSub()
   const { data: spell } = useGetSpellQuery(tab.spellId, {
     skip: !tab.spellId,
   })
 
-  const { enqueueSnackbar } = useSnackbar()
   const [typing, setTyping] = useState<boolean>(false)
   const [code, setCode] = useState('{}')
-  const [height, setHeight] = useState<number>()
 
-  const bottomHeight = 50
+  const SAVE_SPELL_DIFF = events.$SAVE_SPELL_DIFF(tab.id)
 
   const editorOptions = {
     lineNumbers: false,

From 053104ebcc425d66fd531a909fc08545af7655ec Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 2 Apr 2022 15:34:38 -0700
Subject: [PATCH 362/531] Clean up text editor

---
 client/src/workspaces/spells/windows/StateManagerWindow.tsx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/client/src/workspaces/spells/windows/StateManagerWindow.tsx b/client/src/workspaces/spells/windows/StateManagerWindow.tsx
index 8fdd3c984..a3b875240 100644
--- a/client/src/workspaces/spells/windows/StateManagerWindow.tsx
+++ b/client/src/workspaces/spells/windows/StateManagerWindow.tsx
@@ -1,7 +1,5 @@
 import Editor from '@monaco-editor/react'
 import jsonFormat from 'json-format'
-// import debounce from 'lodash.debounce'
-import { useSnackbar } from 'notistack'
 import { useState, useEffect } from 'react'
 import { useGetSpellQuery } from '../../../state/api/spells'
 import Window from '../../../components/Window/Window'
@@ -113,7 +111,6 @@ const StateManager = ({ tab, ...props }) => {
     <Window toolbar={toolbar}>
       <Editor
         theme="sds-dark"
-        height={height}
         defaultLanguage="json"
         value={code}
         options={editorOptions}

From 8a40fd62dd45977db4fce60717a229d755ea193d Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 2 Apr 2022 15:46:56 -0700
Subject: [PATCH 363/531] Clean up comments in inspector

---
 .../src/workspaces/contexts/InspectorProvider.tsx | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/client/src/workspaces/contexts/InspectorProvider.tsx b/client/src/workspaces/contexts/InspectorProvider.tsx
index 9108eb3cf..d82c0bdc6 100644
--- a/client/src/workspaces/contexts/InspectorProvider.tsx
+++ b/client/src/workspaces/contexts/InspectorProvider.tsx
@@ -1,7 +1,6 @@
 import { usePubSub } from '@/contexts/PubSubProvider'
 import { InspectorData } from '@latitudegames/thoth-core/types'
 import { createContext, useContext, useEffect, useState } from 'react'
-// import { useEditor } from './EditorProvider'
 
 export type TextEditorData = {
   options?: Record<string, any> | undefined
@@ -23,13 +22,11 @@ export const useInspector = () => useContext(Context)
 
 const InspectorProvider = ({ children, tab }) => {
   const { subscribe, publish, events } = usePubSub()
-  // const { serialize } = useEditor()
 
   const [inspectorData, setInspectorData] = useState<InspectorData | null>(null)
   const [textEditorData, setTextEditorData] = useState({})
 
   const SET_INSPECTOR = events.$INSPECTOR_SET(tab.id)
-  // const SAVE_SPELL_DIFF = events.$SAVE_SPELL_DIFF(tab.id)
 
   // inspector subscription
   useEffect(() => {
@@ -75,14 +72,6 @@ const InspectorProvider = ({ children, tab }) => {
     })
   }, [events, subscribe, publish])
 
-  // const saveSpellDiff = () => {
-  //   const update = {
-  //     chain: serialize(),
-  //   }
-
-  //   publish(SAVE_SPELL_DIFF, update)
-  // }
-
   //
   const saveTextEditor = textData => {
     const textUpdate = {
@@ -103,15 +92,11 @@ const InspectorProvider = ({ children, tab }) => {
     if (inspectorData) {
       setInspectorData(update)
     }
-    // saveSpellDiff()
-    // spell && saveSpell(spell)
   }
 
   const saveInspector = inspectorData => {
     setInspectorData(inspectorData)
     publish(events.$NODE_SET(tab.id, inspectorData.nodeId), inspectorData)
-    // saveSpellDiff()
-    // spell && saveSpell(spell)
   }
 
   const publicInterface: InspectorContext = {

From d7265218031bed925de78310c08b3306f4558196 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 2 Apr 2022 15:47:18 -0700
Subject: [PATCH 364/531] Use save diff event in thoth interface provider

---
 .../contexts/ThothInterfaceProvider.tsx         | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
index 0b1c9c167..c4e8ed238 100644
--- a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
+++ b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
@@ -7,11 +7,7 @@ import { invokeInference } from '../../utils/huggingfaceHelper'
 import { usePubSub } from '../../contexts/PubSubProvider'
 import { useFetchFromImageCacheMutation } from '@/state/api/visualGenerationsApi'
 import { Spell, ThothWorkerInputs } from '@latitudegames/thoth-core/dist/types'
-import {
-  useGetSpellQuery,
-  useSaveSpellMutation,
-  useRunSpellMutation,
-} from '@/state/api/spells'
+import { useGetSpellQuery, useRunSpellMutation } from '@/state/api/spells'
 
 /*
 Some notes here.  The new rete provider, not to be confused with the old rete provider renamed to the editor provider, is designed to serve as the single source of truth for interfacing with the rete internal system.  This unified interface will also allow us to replicate the same API in the server, where rete expects certain functions to exist but doesn't care what is behind these functions so long as they work.
@@ -46,7 +42,6 @@ const ThothInterfaceProvider = ({ children, tab }) => {
   const spellRef = useRef<Spell | null>(null)
   const [fetchFromImageCache] = useFetchFromImageCacheMutation()
   const [_runSpell] = useRunSpellMutation()
-  const [saveSpell] = useSaveSpellMutation()
   const { data: _spell } = useGetSpellQuery(tab.spellId, {
     skip: !tab.spellId,
   })
@@ -63,6 +58,7 @@ const ThothInterfaceProvider = ({ children, tab }) => {
     $DEBUG_PRINT,
     $DEBUG_INPUT,
     $TEXT_EDITOR_CLEAR,
+    $SAVE_SPELL_DIFF,
     $NODE_SET,
     ADD_SUBSPELL,
     UPDATE_SUBSPELL,
@@ -185,19 +181,18 @@ const ThothInterfaceProvider = ({ children, tab }) => {
     return spellRef.current?.gameState ?? {}
   }
 
-  const updateCurrentGameState = update => {
+  const updateCurrentGameState = _update => {
     if (!spellRef.current) return
     const spell = spellRef.current
 
-    const newSpell = {
-      ...spell,
+    const update = {
       gameState: {
         ...spell.gameState,
-        ...update,
+        ..._update,
       },
     }
 
-    saveSpell(newSpell as Spell)
+    publish($SAVE_SPELL_DIFF(tab.id), update)
   }
 
   const publicInterface = {

From 80958f2707704e298fcb5b6e81e7eed4a6ddd4e2 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sat, 2 Apr 2022 15:47:29 -0700
Subject: [PATCH 365/531] Increase editor listener save debounce time

---
 client/src/workspaces/spells/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/workspaces/spells/index.tsx b/client/src/workspaces/spells/index.tsx
index 5a88e8f33..341dbc1fa 100644
--- a/client/src/workspaces/spells/index.tsx
+++ b/client/src/workspaces/spells/index.tsx
@@ -30,7 +30,7 @@ const Workspace = ({ tab, tabs, pubSub }) => {
         if (tab.type === 'spell' && spellRef.current) {
           publish(events.$SAVE_SPELL_DIFF(tab.id), { chain: serialize() })
         }
-      }, 500)
+      }, 1000)
     )
 
     return unsubscribe as () => void

From 12390773cbefa4f6e32ae1d8a969c1df22017f23 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 3 Apr 2022 20:36:05 -0700
Subject: [PATCH 366/531] Add sharedb workspace

---
 package.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7c911b21d..34e73dbbd 100644
--- a/package.json
+++ b/package.json
@@ -12,12 +12,14 @@
   "workspaces": {
     "packages": [
       "client",
-      "core"
+      "core",
+      "sharedb"
     ]
   },
   "scripts": {
     "start:core": "lerna exec --scope @latitudegames/thoth-core -- yarn start",
     "start:client": "lerna exec --scope @thoth/client -- yarn start",
+    "start:sharedb": "lerna exec --scope @thoth/sharedb -- yarn start",
     "start": "run-p start:core start:client",
     "lint": "lerna run lint --parallel",
     "lint:fix": "lerna run lint:fix --parallel",

From d1e70caf9e61f6beb7faa4f23c35b050c1db9bd0 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 3 Apr 2022 20:36:17 -0700
Subject: [PATCH 367/531] Add sharedb ts file

---
 sharedb/tsconfig.json | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 sharedb/tsconfig.json

diff --git a/sharedb/tsconfig.json b/sharedb/tsconfig.json
new file mode 100644
index 000000000..5b169a6c3
--- /dev/null
+++ b/sharedb/tsconfig.json
@@ -0,0 +1,41 @@
+{
+  "compileOnSave": true,
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "allowJs": true,
+    "jsx": "react-jsx",
+
+    "allowUnreachableCode": false,
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "moduleResolution": "node",
+    "module": "commonjs",
+    "outDir": "dist",
+    "removeComments": true,
+    "skipLibCheck": true,
+    "sourceMap": true,
+    "target": "ES2021",
+    "typeRoots": ["./@types", "node_modules/@types"],
+    "types": ["node", "jest"],
+    "baseUrl": ".",
+    "paths": {
+      "gpt-3-encoder": ["@types/gpt-3-encoder.d.ts"],
+      "ot-json0": ["@types/ot-json0.d.ts"],
+      "@latitudegames/thoth-core": ["@types/thoth-core.d.ts"],
+      "@teamwork/websocket-json-stream": [
+        "@types/@teamwork/websocket-json-stream"
+      ]
+    },
+    "noImplicitAny": true,
+    "strictNullChecks": true
+  },
+  "include": [
+    "hocs/**/*.ts",
+    "jobs/**/*.ts",
+    "src/**/*.ts",
+    "@types/**/*.d.ts",
+    "__tests__/**/*.ts",
+    "index.ts"
+  ]
+}

From f473e885a4e10d3f583b73a62410592b416107fd Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 3 Apr 2022 20:36:35 -0700
Subject: [PATCH 368/531] Add package json to sharebd with dependencies

---
 sharedb/package.json | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 sharedb/package.json

diff --git a/sharedb/package.json b/sharedb/package.json
new file mode 100644
index 000000000..cd2190e16
--- /dev/null
+++ b/sharedb/package.json
@@ -0,0 +1,25 @@
+{
+  "name": "@thoth/sharedb",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "start": "nodemon index.ts",
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@teamwork/websocket-json-stream": "^2.0.0",
+    "express": "^4.17.3",
+    "sharedb": "^2.2.5",
+    "ws": "^8.5.0"
+  },
+  "devDependencies": {
+    "@types/express": "^4.17.13",
+    "@types/sharedb": "^2.2.0",
+    "@types/ws": "^8.5.3",
+    "nodemon": "^2.0.15"
+  }
+}

From c5f33adba9e51a11ab73f5ba701cfedda2f2e39c Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 3 Apr 2022 20:36:46 -0700
Subject: [PATCH 369/531] Update yarn lock

---
 yarn.lock | 656 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 644 insertions(+), 12 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 0208b19d6..236526990 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2490,6 +2490,11 @@
     estree-walker "^1.0.1"
     picomatch "^2.2.2"
 
+"@sindresorhus/is@^0.14.0":
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
+  integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
+
 "@sinonjs/commons@^1.7.0":
   version "1.8.3"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d"
@@ -2603,6 +2608,18 @@
     "@styled-system/core" "^5.1.2"
     "@styled-system/css" "^5.1.5"
 
+"@szmarczak/http-timer@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
+  integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==
+  dependencies:
+    defer-to-connect "^1.0.1"
+
+"@teamwork/websocket-json-stream@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@teamwork/websocket-json-stream/-/websocket-json-stream-2.0.0.tgz#4eba02b1fde23112beef0080a84a4e6db251877e"
+  integrity sha512-SCEM44hjNyxYwrtyJrjlHmeTd9RJlZr04BAMbHSBhdW0M2IXv0SC+4XeuRXPiY7U7pJ0W8TSUwVP/28MV/ds0w==
+
 "@testing-library/dom@^7.28.1":
   version "7.31.2"
   resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.31.2.tgz#df361db38f5212b88555068ab8119f5d841a8c4a"
@@ -2652,6 +2669,10 @@
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
   integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
 
+"@types/@teamwork/websocket-json-stream":
+  version "2.0.0"
+  resolved "https://codeload.github.com/teamwork/websocket-json-stream/tar.gz/4a449d0fe859df8143a6f49be36281acaf5c2458"
+
 "@types/aria-query@^4.2.0":
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.2.tgz#ed4e0ad92306a704f9fb132a0cfcf77486dbe2bc"
@@ -2690,6 +2711,14 @@
   dependencies:
     "@babel/types" "^7.3.0"
 
+"@types/body-parser@*":
+  version "1.19.2"
+  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0"
+  integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==
+  dependencies:
+    "@types/connect" "*"
+    "@types/node" "*"
+
 "@types/cheerio@^0.22.22":
   version "0.22.30"
   resolved "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.30.tgz#6c1ded70d20d890337f0f5144be2c5e9ce0936e6"
@@ -2707,6 +2736,13 @@
   resolved "https://registry.yarnpkg.com/@types/command-line-usage/-/command-line-usage-5.0.2.tgz#ba5e3f6ae5a2009d466679cc431b50635bf1a064"
   integrity sha512-n7RlEEJ+4x4TS7ZQddTmNSxP+zziEG0TNsMfiRIxcIVXt71ENJ9ojeXmGO3wPoTdn7pJcU2xc3CJYMktNT6DPg==
 
+"@types/connect@*":
+  version "3.4.35"
+  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"
+  integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==
+  dependencies:
+    "@types/node" "*"
+
 "@types/eslint-scope@^3.7.0":
   version "3.7.1"
   resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.1.tgz#8dc390a7b4f9dd9f1284629efce982e41612116e"
@@ -2733,6 +2769,25 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
   integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
+"@types/express-serve-static-core@^4.17.18":
+  version "4.17.28"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8"
+  integrity sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig==
+  dependencies:
+    "@types/node" "*"
+    "@types/qs" "*"
+    "@types/range-parser" "*"
+
+"@types/express@^4.17.13":
+  version "4.17.13"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034"
+  integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==
+  dependencies:
+    "@types/body-parser" "*"
+    "@types/express-serve-static-core" "^4.17.18"
+    "@types/qs" "*"
+    "@types/serve-static" "*"
+
 "@types/graceful-fs@^4.1.2":
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15"
@@ -2810,6 +2865,11 @@
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.174.tgz#b4b06b6eced9850eed6b6a8f1abdd0f5192803c1"
   integrity sha512-KMBLT6+g9qrGXpDt7ohjWPUD34WA/jasrtjTEHStF0NPdEwJ1N9SZ+4GaMVDeuk/y0+X5j9xFm6mNiXS7UoaLQ==
 
+"@types/mime@^1":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
+  integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
+
 "@types/minimatch@^3.0.3":
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
@@ -2850,6 +2910,16 @@
   resolved "https://registry.yarnpkg.com/@types/pubsub-js/-/pubsub-js-1.8.3.tgz#f480a9e4f72f50e1e3cc598ef1b32f3bfbbcd6b6"
   integrity sha512-6BqY04dh2UV1dNV690tyJVJYQ0U6qBH4tU+FCwY1Mhl8jOPOP9qiIvgLnB59cVik/E6/R002oXZpGiDm+2C8eA==
 
+"@types/qs@*":
+  version "6.9.7"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
+  integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==
+
+"@types/range-parser@*":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
+  integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
+
 "@types/react-dom@^17.0.9":
   version "17.0.9"
   resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.9.tgz#441a981da9d7be117042e1a6fd3dac4b30f55add"
@@ -2893,6 +2963,19 @@
   resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
   integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
 
+"@types/serve-static@*":
+  version "1.13.10"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9"
+  integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==
+  dependencies:
+    "@types/mime" "^1"
+    "@types/node" "*"
+
+"@types/sharedb@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@types/sharedb/-/sharedb-2.2.0.tgz#61a1ab5d1bc5596bf8b0933a7eafb5b7fad8b2f6"
+  integrity sha512-VbsWaKdU/m9I9CUBtBSj+hcWMT8jr0mEg0qAebUxEwR2nreRKHC6/3WbhXKYqqaC36jDXleKv3TXnMMgTUioSQ==
+
 "@types/source-list-map@*":
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
@@ -2948,6 +3031,13 @@
     anymatch "^3.0.0"
     source-map "^0.6.0"
 
+"@types/ws@^8.5.3":
+  version "8.5.3"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.3.tgz#7d25a1ffbecd3c4f2d35068d0b283c037003274d"
+  integrity sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==
+  dependencies:
+    "@types/node" "*"
+
 "@types/yargs-parser@*":
   version "20.2.1"
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz#3b9ce2489919d9e4fea439b76916abc34b2df129"
@@ -3363,6 +3453,14 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
     mime-types "~2.1.24"
     negotiator "0.6.2"
 
+accepts@~1.3.8:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
+  integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
+  dependencies:
+    mime-types "~2.1.34"
+    negotiator "0.6.3"
+
 acorn-globals@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"
@@ -3470,6 +3568,13 @@ ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+ansi-align@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59"
+  integrity sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==
+  dependencies:
+    string-width "^4.1.0"
+
 ansi-colors@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
@@ -3691,6 +3796,11 @@ array.prototype.flat@^1.2.3, array.prototype.flat@^1.2.4:
     define-properties "^1.1.3"
     es-abstract "^1.18.0-next.1"
 
+arraydiff@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/arraydiff/-/arraydiff-0.1.3.tgz#86a5436d7b72f1bdda5fd6d74e8724e42f83ce4d"
+  integrity sha1-hqVDbXty8b3aX9bXTock5C+Dzk0=
+
 arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
@@ -3746,7 +3856,7 @@ async-each@^1.0.1:
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
   integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
 
-async@^2.6.2:
+async@^2.6.2, async@^2.6.3:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
   integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
@@ -4134,6 +4244,22 @@ body-parser@1.19.0:
     raw-body "2.4.0"
     type-is "~1.6.17"
 
+body-parser@1.19.2:
+  version "1.19.2"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.2.tgz#4714ccd9c157d44797b8b5607d72c0b89952f26e"
+  integrity sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==
+  dependencies:
+    bytes "3.1.2"
+    content-type "~1.0.4"
+    debug "2.6.9"
+    depd "~1.1.2"
+    http-errors "1.8.1"
+    iconv-lite "0.4.24"
+    on-finished "~2.3.0"
+    qs "6.9.7"
+    raw-body "2.4.3"
+    type-is "~1.6.18"
+
 bonjour@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
@@ -4156,6 +4282,20 @@ bottleneck@^2.15.3:
   resolved "https://registry.yarnpkg.com/bottleneck/-/bottleneck-2.19.5.tgz#5df0b90f59fd47656ebe63c78a98419205cadd91"
   integrity sha512-VHiNCbI1lKdl44tGrhNfU3lup0Tj/ZBMJB5/2ZbNXRCPuRCO7ed2mgcK4r17y+KB2EfuYuRaVlwNbAeaWGSpbw==
 
+boxen@^5.0.0:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50"
+  integrity sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==
+  dependencies:
+    ansi-align "^3.0.0"
+    camelcase "^6.2.0"
+    chalk "^4.1.0"
+    cli-boxes "^2.2.1"
+    string-width "^4.2.2"
+    type-fest "^0.20.2"
+    widest-line "^3.1.0"
+    wrap-ansi "^7.0.0"
+
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -4337,6 +4477,11 @@ bytes@3.1.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
   integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
 
+bytes@3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
+  integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
+
 cacache@^12.0.2:
   version "12.0.4"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c"
@@ -4397,6 +4542,19 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
+cacheable-request@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912"
+  integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==
+  dependencies:
+    clone-response "^1.0.2"
+    get-stream "^5.1.0"
+    http-cache-semantics "^4.0.0"
+    keyv "^3.0.0"
+    lowercase-keys "^2.0.0"
+    normalize-url "^4.1.0"
+    responselike "^1.0.2"
+
 call-bind@^1.0.0, call-bind@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
@@ -4553,6 +4711,21 @@ chokidar@^3.4.1, chokidar@^3.5.1:
   optionalDependencies:
     fsevents "~2.3.2"
 
+chokidar@^3.5.2:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
+  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
+  dependencies:
+    anymatch "~3.1.2"
+    braces "~3.0.2"
+    glob-parent "~5.1.2"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.6.0"
+  optionalDependencies:
+    fsevents "~2.3.2"
+
 chownr@^1.1.1, chownr@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
@@ -4618,6 +4791,11 @@ clean-stack@^2.0.0:
   resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
   integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
 
+cli-boxes@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
+  integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==
+
 cli-cursor@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
@@ -4648,6 +4826,13 @@ clone-deep@^4.0.1:
     kind-of "^6.0.2"
     shallow-clone "^3.0.0"
 
+clone-response@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
+  integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
+  dependencies:
+    mimic-response "^1.0.0"
+
 clone@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
@@ -4870,6 +5055,18 @@ config-chain@^1.1.12:
     ini "^1.3.4"
     proto-list "~1.2.1"
 
+configstore@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"
+  integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==
+  dependencies:
+    dot-prop "^5.2.0"
+    graceful-fs "^4.1.2"
+    make-dir "^3.0.0"
+    unique-string "^2.0.0"
+    write-file-atomic "^3.0.0"
+    xdg-basedir "^4.0.0"
+
 confusing-browser-globals@^1.0.10:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.10.tgz#30d1e7f3d1b882b25ec4933d1d1adac353d20a59"
@@ -4902,6 +5099,13 @@ content-disposition@0.5.3:
   dependencies:
     safe-buffer "5.1.2"
 
+content-disposition@0.5.4:
+  version "0.5.4"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
+  integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==
+  dependencies:
+    safe-buffer "5.2.1"
+
 content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
@@ -5006,6 +5210,11 @@ cookie@0.4.0:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
   integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
 
+cookie@0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
+  integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
+
 copy-concurrently@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
@@ -5194,6 +5403,11 @@ crypto-browserify@^3.11.0, crypto-browserify@^3.12.0:
     randombytes "^2.0.0"
     randomfill "^1.0.3"
 
+crypto-random-string@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
+  integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
+
 css-loader@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.3.0.tgz#334d3500ff0a0c14cfbd4b0670088dbb5b5c1530"
@@ -5392,6 +5606,13 @@ decode-uri-component@^0.2.0:
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
   integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
+decompress-response@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
+  integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
+  dependencies:
+    mimic-response "^1.0.0"
+
 dedent@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
@@ -5459,6 +5680,11 @@ defaults@^1.0.3:
   dependencies:
     clone "^1.0.2"
 
+defer-to-connect@^1.0.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
+  integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
+
 define-lazy-prop@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
@@ -5722,7 +5948,7 @@ dot-case@^3.0.4:
     no-case "^3.0.4"
     tslib "^2.0.3"
 
-dot-prop@^5.1.0:
+dot-prop@^5.1.0, dot-prop@^5.2.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
   integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==
@@ -5755,6 +5981,11 @@ dotenv@^8.0.0, dotenv@^8.2.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"
   integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==
 
+duplexer3@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
+  integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
+
 duplexer@^0.1.1, duplexer@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
@@ -6071,6 +6302,11 @@ escalade@^3.1.1:
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
   integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
+escape-goat@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675"
+  integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==
+
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@@ -6340,6 +6576,42 @@ express@^4.17.1:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
+express@^4.17.3:
+  version "4.17.3"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz#f6c7302194a4fb54271b73a1fe7a06478c8f85a1"
+  integrity sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==
+  dependencies:
+    accepts "~1.3.8"
+    array-flatten "1.1.1"
+    body-parser "1.19.2"
+    content-disposition "0.5.4"
+    content-type "~1.0.4"
+    cookie "0.4.2"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "~1.1.2"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    finalhandler "~1.1.2"
+    fresh "0.5.2"
+    merge-descriptors "1.0.1"
+    methods "~1.1.2"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    path-to-regexp "0.1.7"
+    proxy-addr "~2.0.7"
+    qs "6.9.7"
+    range-parser "~1.2.1"
+    safe-buffer "5.2.1"
+    send "0.17.2"
+    serve-static "1.14.2"
+    setprototypeof "1.2.0"
+    statuses "~1.5.0"
+    type-is "~1.6.18"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
+
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -6393,6 +6665,11 @@ extsprintf@^1.2.0:
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
   integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
+fast-deep-equal@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
+  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
+
 fast-deep-equal@^3.1.1:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
@@ -6812,7 +7089,14 @@ get-port@^5.1.1:
   resolved "https://registry.yarnpkg.com/get-port/-/get-port-5.1.1.tgz#0469ed07563479de6efb986baf053dcd7d4e3193"
   integrity sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==
 
-get-stream@^5.0.0:
+get-stream@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
+  dependencies:
+    pump "^3.0.0"
+
+get-stream@^5.0.0, get-stream@^5.1.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
   integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
@@ -6940,6 +7224,13 @@ glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+global-dirs@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686"
+  integrity sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==
+  dependencies:
+    ini "2.0.0"
+
 globals@^11.1.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
@@ -6974,6 +7265,23 @@ globby@^7.1.1:
     pify "^3.0.0"
     slash "^1.0.0"
 
+got@^9.6.0:
+  version "9.6.0"
+  resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
+  integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==
+  dependencies:
+    "@sindresorhus/is" "^0.14.0"
+    "@szmarczak/http-timer" "^1.1.2"
+    cacheable-request "^6.0.0"
+    decompress-response "^3.3.0"
+    duplexer3 "^0.1.4"
+    get-stream "^4.1.0"
+    lowercase-keys "^1.0.1"
+    mimic-response "^1.0.1"
+    p-cancelable "^1.0.0"
+    to-readable-stream "^1.0.0"
+    url-parse-lax "^3.0.0"
+
 graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.3, graceful-fs@^4.2.4, graceful-fs@^4.2.6:
   version "4.2.8"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
@@ -7091,6 +7399,11 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
+has-yarn@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"
+  integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==
+
 has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
@@ -7115,6 +7428,11 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
+hat@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/hat/-/hat-0.0.3.tgz#bb014a9e64b3788aed8005917413d4ff3d502d8a"
+  integrity sha1-uwFKnmSzeIrtgAWRdBPU/z1QLYo=
+
 he@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
@@ -7236,7 +7554,7 @@ htmlparser2@^6.1.0:
     domutils "^2.5.2"
     entities "^2.0.0"
 
-http-cache-semantics@^4.1.0:
+http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
   integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
@@ -7257,6 +7575,17 @@ http-errors@1.7.2:
     statuses ">= 1.5.0 < 2"
     toidentifier "1.0.0"
 
+http-errors@1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c"
+  integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.4"
+    setprototypeof "1.2.0"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.1"
+
 http-errors@~1.6.2:
   version "1.6.3"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
@@ -7385,6 +7714,11 @@ iferr@^0.1.5:
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
   integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
+ignore-by-default@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
+  integrity sha1-SMptcvbGo68Aqa1K5odr44ieKwk=
+
 ignore-walk@^3.0.3:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335"
@@ -7429,6 +7763,11 @@ import-from@^3.0.0:
   dependencies:
     resolve-from "^5.0.0"
 
+import-lazy@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
+  integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=
+
 import-local@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6"
@@ -7475,6 +7814,11 @@ inherits@2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
+ini@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
+  integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
+
 ini@^1.3.2, ini@^1.3.4, ini@~1.3.0:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
@@ -7757,6 +8101,14 @@ is-in-browser@^1.0.2, is-in-browser@^1.1.3:
   resolved "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.3.tgz#56ff4db683a078c6082eb95dad7dc62e1d04f835"
   integrity sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU=
 
+is-installed-globally@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520"
+  integrity sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==
+  dependencies:
+    global-dirs "^3.0.0"
+    is-path-inside "^3.0.2"
+
 is-ip@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-ip/-/is-ip-3.1.0.tgz#2ae5ddfafaf05cb8008a62093cf29734f657c5d8"
@@ -7779,6 +8131,11 @@ is-negative-zero@^2.0.1:
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
   integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
 
+is-npm@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8"
+  integrity sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==
+
 is-number-object@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0"
@@ -7956,6 +8313,11 @@ is-wsl@^2.2.0:
   dependencies:
     is-docker "^2.0.0"
 
+is-yarn-global@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232"
+  integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==
+
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
@@ -8583,6 +8945,11 @@ jsesc@~0.5.0:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
   integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
 
+json-buffer@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
+  integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
+
 json-format@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-format/-/json-format-1.0.1.tgz#143f67e62af129d6bffed288a46265ea23d0df0c"
@@ -8728,6 +9095,13 @@ jss@10.8.0, jss@^10.5.1:
     is-in-browser "^1.1.3"
     tiny-warning "^1.0.2"
 
+keyv@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
+  integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==
+  dependencies:
+    json-buffer "3.0.0"
+
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -8757,6 +9131,13 @@ kleur@^3.0.3:
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
+latest-version@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face"
+  integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==
+  dependencies:
+    package-json "^6.3.0"
+
 lerna@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/lerna/-/lerna-4.0.0.tgz#b139d685d50ea0ca1be87713a7c2f44a5b678e9e"
@@ -9007,6 +9388,16 @@ lower-case@^2.0.2:
   dependencies:
     tslib "^2.0.3"
 
+lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
+  integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
+
+lowercase-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
+  integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
+
 lru-cache@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
@@ -9252,6 +9643,11 @@ mime-db@1.49.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz#f3dfde60c99e9cf3bc9701d687778f537001cbed"
   integrity sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==
 
+mime-db@1.52.0:
+  version "1.52.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
+
 "mime-db@>= 1.43.0 < 2":
   version "1.50.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.50.0.tgz#abd4ac94e98d3c0e185016c67ab45d5fde40c11f"
@@ -9264,6 +9660,13 @@ mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17,
   dependencies:
     mime-db "1.49.0"
 
+mime-types@~2.1.34:
+  version "2.1.35"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
+  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
+  dependencies:
+    mime-db "1.52.0"
+
 mime@1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
@@ -9279,6 +9682,11 @@ mimic-fn@^2.1.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
+mimic-response@^1.0.0, mimic-response@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
+  integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
+
 min-indent@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
@@ -9479,7 +9887,7 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@^2.0.0, ms@^2.1.1:
+ms@2.1.3, ms@^2.0.0, ms@^2.1.1:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -9570,6 +9978,11 @@ negotiator@0.6.2, negotiator@^0.6.2:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
   integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
 
+negotiator@0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
+  integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
+
 neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1, neo-async@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
@@ -9687,6 +10100,22 @@ node-releases@^1.1.76:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.76.tgz#df245b062b0cafbd5282ab6792f7dccc2d97f36e"
   integrity sha512-9/IECtNr8dXNmPWmFXepT0/7o5eolGesHUa3mtr0KlgnCvnZxwh2qensKL42JJY2vQKC3nIBXetFAqR+PW1CmA==
 
+nodemon@^2.0.15:
+  version "2.0.15"
+  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.15.tgz#504516ce3b43d9dc9a955ccd9ec57550a31a8d4e"
+  integrity sha512-gdHMNx47Gw7b3kWxJV64NI+Q5nfl0y5DgDbiVtShiwa7Z0IZ07Ll4RLFo6AjrhzMtoEZn5PDE3/c2AbVsiCkpA==
+  dependencies:
+    chokidar "^3.5.2"
+    debug "^3.2.7"
+    ignore-by-default "^1.0.1"
+    minimatch "^3.0.4"
+    pstree.remy "^1.1.8"
+    semver "^5.7.1"
+    supports-color "^5.5.0"
+    touch "^3.1.0"
+    undefsafe "^2.0.5"
+    update-notifier "^5.1.0"
+
 noms@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/noms/-/noms-0.0.0.tgz#da8ebd9f3af9d6760919b27d9cdc8092a7332859"
@@ -9710,6 +10139,13 @@ nopt@^5.0.0:
   dependencies:
     abbrev "1"
 
+nopt@~1.0.10:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"
+  integrity sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=
+  dependencies:
+    abbrev "1"
+
 normalize-package-data@^2.0.0, normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -9742,6 +10178,11 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
+normalize-url@^4.1.0:
+  version "4.5.1"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a"
+  integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
+
 normalize-url@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
@@ -10075,11 +10516,16 @@ osenv@^0.1.4:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
-ot-json0@^1.1.0:
+ot-json0@^1.0.1, ot-json0@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/ot-json0/-/ot-json0-1.1.0.tgz#f5edeff162673b62f0f136bb64724c40ac5e590d"
   integrity sha512-wf5fci7GGpMYRDnbbdIFQymvhsbFACMHtxjivQo5KgvAHlxekyfJ9aPsRr6YfFQthQkk4bmsl5yESrZwC/oMYQ==
 
+p-cancelable@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
+  integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
+
 p-each-series@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.2.0.tgz#105ab0357ce72b202a8a8b94933672657b5e2a9a"
@@ -10201,6 +10647,16 @@ p-waterfall@^2.1.1:
   dependencies:
     p-reduce "^2.0.0"
 
+package-json@^6.3.0:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0"
+  integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==
+  dependencies:
+    got "^9.6.0"
+    registry-auth-token "^4.0.0"
+    registry-url "^5.0.0"
+    semver "^6.2.0"
+
 pacote@^11.2.6:
   version "11.3.5"
   resolved "https://registry.yarnpkg.com/pacote/-/pacote-11.3.5.tgz#73cf1fc3772b533f575e39efa96c50be8c3dc9d2"
@@ -10584,6 +11040,11 @@ prelude-ls@~1.1.2:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
   integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
+prepend-http@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
+  integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
+
 prettier-linter-helpers@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
@@ -10717,7 +11178,7 @@ protocols@^1.1.0, protocols@^1.4.0:
   resolved "https://registry.yarnpkg.com/protocols/-/protocols-1.4.8.tgz#48eea2d8f58d9644a4a32caae5d5db290a075ce8"
   integrity sha512-IgjKyaUSjsROSO8/D49Ab7hP8mJgTYcqApOqdPhLoPxAplXmkp+zRvsrSQjFn5by0rhm4VH0GAUELIPpx7B1yg==
 
-proxy-addr@~2.0.5:
+proxy-addr@~2.0.5, proxy-addr@~2.0.7:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
   integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==
@@ -10735,6 +11196,11 @@ psl@^1.1.28, psl@^1.1.33:
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
   integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
 
+pstree.remy@^1.1.8:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.8.tgz#c242224f4a67c21f686839bbdb4ac282b8373d3a"
+  integrity sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==
+
 public-encrypt@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
@@ -10792,6 +11258,13 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
+pupa@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62"
+  integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==
+  dependencies:
+    escape-goat "^2.0.0"
+
 q@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
@@ -10802,6 +11275,11 @@ qs@6.7.0:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
   integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
 
+qs@6.9.7:
+  version "6.9.7"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe"
+  integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==
+
 qs@^6.9.4:
   version "6.10.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz#4931482fa8d647a5aab799c5271d2133b981fb6a"
@@ -10894,6 +11372,16 @@ raw-body@2.4.0:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
+raw-body@2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.3.tgz#8f80305d11c2a0a545c2d9d89d7a0286fcead43c"
+  integrity sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==
+  dependencies:
+    bytes "3.1.2"
+    http-errors "1.8.1"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
 rc@^1.2.8, rc@~1.2.7:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
@@ -11335,7 +11823,14 @@ regexpu-core@^4.7.1:
     unicode-match-property-ecmascript "^2.0.0"
     unicode-match-property-value-ecmascript "^2.0.0"
 
-registry-url@^5.1.0:
+registry-auth-token@^4.0.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250"
+  integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==
+  dependencies:
+    rc "^1.2.8"
+
+registry-url@^5.0.0, registry-url@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009"
   integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==
@@ -11477,6 +11972,13 @@ resolve@~1.7.1:
   dependencies:
     path-parse "^1.0.5"
 
+responselike@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
+  integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=
+  dependencies:
+    lowercase-keys "^1.0.0"
+
 restore-cursor@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
@@ -11614,7 +12116,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
+safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -11693,6 +12195,13 @@ selfsigned@^1.10.11:
   dependencies:
     node-forge "^0.10.0"
 
+semver-diff@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b"
+  integrity sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==
+  dependencies:
+    semver "^6.3.0"
+
 "semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
@@ -11710,7 +12219,7 @@ semver@7.x, semver@^7.0.0, semver@^7.1.1, semver@^7.1.3, semver@^7.3.2, semver@^
   dependencies:
     lru-cache "^6.0.0"
 
-semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
+semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
@@ -11734,6 +12243,25 @@ send@0.17.1:
     range-parser "~1.2.1"
     statuses "~1.5.0"
 
+send@0.17.2:
+  version "0.17.2"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820"
+  integrity sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==
+  dependencies:
+    debug "2.6.9"
+    depd "~1.1.2"
+    destroy "~1.0.4"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    fresh "0.5.2"
+    http-errors "1.8.1"
+    mime "1.6.0"
+    ms "2.1.3"
+    on-finished "~2.3.0"
+    range-parser "~1.2.1"
+    statuses "~1.5.0"
+
 serialize-javascript@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
@@ -11771,6 +12299,16 @@ serve-static@1.14.1:
     parseurl "~1.3.3"
     send "0.17.1"
 
+serve-static@1.14.2:
+  version "1.14.2"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz#722d6294b1d62626d41b43a013ece4598d292bfa"
+  integrity sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==
+  dependencies:
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    parseurl "~1.3.3"
+    send "0.17.2"
+
 set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -11801,6 +12339,11 @@ setprototypeof@1.1.1:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
   integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
 
+setprototypeof@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
+  integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
+
 sha.js@^2.4.0, sha.js@^2.4.8:
   version "2.4.11"
   resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
@@ -11816,6 +12359,17 @@ shallow-clone@^3.0.0:
   dependencies:
     kind-of "^6.0.2"
 
+sharedb@^2.2.5:
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/sharedb/-/sharedb-2.2.5.tgz#8f6e0b4db86a89c226ebb09e0c98dcec4116f467"
+  integrity sha512-uCy8Npx8Azf21PmNUGqfIKRbnisH2U+N9Z0CJILWq23+HqcWRAA5n35m/dMm4ZuTQalYeWlR2/kaV8Wm0nXr3g==
+  dependencies:
+    arraydiff "^0.1.1"
+    async "^2.6.3"
+    fast-deep-equal "^2.0.1"
+    hat "0.0.3"
+    ot-json0 "^1.0.1"
+
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -12251,7 +12805,7 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string-width@^4.1.0, string-width@^4.2.0:
+string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -12411,7 +12965,7 @@ supports-color@^2.0.0:
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
   integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
 
-supports-color@^5.3.0:
+supports-color@^5.3.0, supports-color@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
@@ -12666,6 +13220,11 @@ to-object-path@^0.3.0:
   dependencies:
     kind-of "^3.0.2"
 
+to-readable-stream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
+  integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==
+
 to-regex-range@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
@@ -12703,11 +13262,23 @@ toidentifier@1.0.0:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
   integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
 
+toidentifier@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
+  integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
+
 totalist@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df"
   integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==
 
+touch@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b"
+  integrity sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==
+  dependencies:
+    nopt "~1.0.10"
+
 tough-cookie@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
@@ -12867,6 +13438,11 @@ type-fest@^0.18.0:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
   integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==
 
+type-fest@^0.20.2:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
+  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
+
 type-fest@^0.21.1, type-fest@^0.21.3:
   version "0.21.3"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
@@ -12952,6 +13528,11 @@ unbox-primitive@^1.0.1:
     has-symbols "^1.0.2"
     which-boxed-primitive "^1.0.2"
 
+undefsafe@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.5.tgz#38733b9327bdcd226db889fb723a6efd162e6e2c"
+  integrity sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==
+
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
@@ -13004,6 +13585,13 @@ unique-slug@^2.0.0:
   dependencies:
     imurmurhash "^0.1.4"
 
+unique-string@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
+  integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==
+  dependencies:
+    crypto-random-string "^2.0.0"
+
 universal-user-agent@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.0.tgz#3381f8503b251c0d9cd21bc1de939ec9df5480ee"
@@ -13047,6 +13635,26 @@ upath@^2.0.1:
   resolved "https://registry.yarnpkg.com/upath/-/upath-2.0.1.tgz#50c73dea68d6f6b990f51d279ce6081665d61a8b"
   integrity sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==
 
+update-notifier@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9"
+  integrity sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==
+  dependencies:
+    boxen "^5.0.0"
+    chalk "^4.1.0"
+    configstore "^5.0.1"
+    has-yarn "^2.1.0"
+    import-lazy "^2.1.0"
+    is-ci "^2.0.0"
+    is-installed-globally "^0.4.0"
+    is-npm "^5.0.0"
+    is-yarn-global "^0.3.0"
+    latest-version "^5.1.0"
+    pupa "^2.1.1"
+    semver "^7.3.4"
+    semver-diff "^3.1.1"
+    xdg-basedir "^4.0.0"
+
 uri-js@^4.2.2:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
@@ -13064,6 +13672,13 @@ url-join@^4.0.0:
   resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.1.tgz#b642e21a2646808ffa178c4c5fda39844e12cde7"
   integrity sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==
 
+url-parse-lax@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
+  integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=
+  dependencies:
+    prepend-http "^2.0.0"
+
 url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
@@ -13605,6 +14220,13 @@ wide-align@^1.1.0:
   dependencies:
     string-width "^1.0.2 || 2"
 
+widest-line@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca"
+  integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==
+  dependencies:
+    string-width "^4.0.0"
+
 wildcard@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"
@@ -13721,6 +14343,16 @@ ws@^8.1.0:
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.2.tgz#ca684330c6dd6076a737250ed81ac1606cb0a63e"
   integrity sha512-Q6B6H2oc8QY3llc3cB8kVmQ6pnJWVQbP7Q5algTcIxx7YEpc0oU4NBVHlztA7Ekzfhw2r0rPducMUiCGWKQRzw==
 
+ws@^8.5.0:
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f"
+  integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==
+
+xdg-basedir@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
+  integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==
+
 xml-name-validator@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"

From 750ae0c6847938d9909ebd53c098e093dec636db Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 3 Apr 2022 20:37:01 -0700
Subject: [PATCH 370/531] Add d ts file for json websocket stream library

---
 sharedb/@types/@teamwork/websocket-json-stream.d.ts | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 sharedb/@types/@teamwork/websocket-json-stream.d.ts

diff --git a/sharedb/@types/@teamwork/websocket-json-stream.d.ts b/sharedb/@types/@teamwork/websocket-json-stream.d.ts
new file mode 100644
index 000000000..4a56e5fd4
--- /dev/null
+++ b/sharedb/@types/@teamwork/websocket-json-stream.d.ts
@@ -0,0 +1 @@
+declare module '@teamwork/websocket-json-stream'

From 82f7ee1a57a0c73fad3ed6fb616fba292c79a52a Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 3 Apr 2022 20:37:12 -0700
Subject: [PATCH 371/531] Add basic server for sharedb

---
 sharedb/index.ts | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 sharedb/index.ts

diff --git a/sharedb/index.ts b/sharedb/index.ts
new file mode 100644
index 000000000..debb352fb
--- /dev/null
+++ b/sharedb/index.ts
@@ -0,0 +1,21 @@
+import express from 'express'
+import http from 'http'
+import WebSocket from 'ws'
+import ShareDB from 'sharedb'
+import WebSocketJSONStream from '@teamwork/websocket-json-stream'
+
+const app = express()
+const server = http.createServer(app)
+const webSocketServer = new WebSocket.Server({ server: server })
+
+const backend = new ShareDB()
+
+webSocketServer.on('connection', webSocket => {
+  console.log('SHARE DB RUNNING!')
+  const stream = new WebSocketJSONStream(webSocket)
+  backend.listen(stream)
+})
+
+server.listen(8080, () => {
+  console.log('server listening on port 8080')
+})

From 411a93c4598d333552c92c78539f89a08e5030b8 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 3 Apr 2022 20:43:15 -0700
Subject: [PATCH 372/531] Add empty share db provider with conditional env
 check

---
 client/src/contexts/SharedbProvider.tsx | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 client/src/contexts/SharedbProvider.tsx

diff --git a/client/src/contexts/SharedbProvider.tsx b/client/src/contexts/SharedbProvider.tsx
new file mode 100644
index 000000000..084126006
--- /dev/null
+++ b/client/src/contexts/SharedbProvider.tsx
@@ -0,0 +1,21 @@
+import { sharedb } from '@/config'
+import { useContext, createContext } from 'react'
+
+const Context = createContext({})
+
+export const useSharedb = () => useContext(Context)
+
+// Might want to namespace these
+const PubSubProvider = ({ children }) => {
+  const publicInterface = {}
+
+  return <Context.Provider value={publicInterface}>{children}</Context.Provider>
+}
+
+const ConditionalProvider = ({ children }) => {
+  if (!sharedb) return <>{children}</>
+
+  return PubSubProvider
+}
+
+export default ConditionalProvider

From 1a38e709d7e4a4defaf3cb5051c10e428203222d Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 3 Apr 2022 20:43:25 -0700
Subject: [PATCH 373/531] Add sharedb env flag to config

---
 client/src/config.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/src/config.ts b/client/src/config.ts
index 77a294c01..005526834 100644
--- a/client/src/config.ts
+++ b/client/src/config.ts
@@ -9,3 +9,5 @@ export const appRootUrl =
   process.env.NODE_ENV === 'production'
     ? process.env.REACT_APP_SITE_ROOT_URL_PROD
     : process.env.REACT_APP_SITE_ROOT_URL
+
+export const sharedb = process.env.REACT_APP_SHAREDB

From b1769f6c84e9696e8e7efd72f62a25cf1212608b Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 3 Apr 2022 20:46:24 -0700
Subject: [PATCH 374/531] Add sharedb and websockets to client dependencies

---
 client/package.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/package.json b/client/package.json
index 16b878a78..d0842bce2 100644
--- a/client/package.json
+++ b/client/package.json
@@ -56,6 +56,7 @@
     "react-select": "^4.3.1",
     "react-simple-code-editor": "^0.11.0",
     "rebass": "^4.0.7",
+    "reconnecting-websocket": "^4.4.0",
     "redux": "^4.1.1",
     "redux-persist": "^6.0.0",
     "regenerator-runtime": "^0.13.9",
@@ -63,6 +64,7 @@
     "rete-connection-reroute-plugin": "^0.4.0",
     "rete-context-menu-plugin": "^0.6.0-rc.1",
     "rete-react-render-plugin": "^0.2.1",
+    "sharedb": "^2.2.5",
     "unique-names-generator": "^4.5.0",
     "uuid": "^8.3.2",
     "web-vitals": "^1.0.1",

From 455f7df138a7a9363463068fcf00c1f082bdf47c Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 3 Apr 2022 20:46:34 -0700
Subject: [PATCH 375/531] Update yarn lock

---
 yarn.lock | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 236526990..5b091ca79 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2669,10 +2669,6 @@
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
   integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
 
-"@types/@teamwork/websocket-json-stream":
-  version "2.0.0"
-  resolved "https://codeload.github.com/teamwork/websocket-json-stream/tar.gz/4a449d0fe859df8143a6f49be36281acaf5c2458"
-
 "@types/aria-query@^4.2.0":
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.2.tgz#ed4e0ad92306a704f9fb132a0cfcf77486dbe2bc"
@@ -11715,6 +11711,11 @@ rechoir@^0.7.0:
   dependencies:
     resolve "^1.9.0"
 
+reconnecting-websocket@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/reconnecting-websocket/-/reconnecting-websocket-4.4.0.tgz#3b0e5b96ef119e78a03135865b8bb0af1b948783"
+  integrity sha512-D2E33ceRPga0NvTDhJmphEgJ7FUYF0v4lr1ki0csq06OdlxKfugGzN0dSkxM/NfqCxYELK4KcaTOUOjTV6Dcng==
+
 redent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"

From 6e4b2b14fb48d9a8fd653f6bbd92f833d0818087 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 3 Apr 2022 20:46:51 -0700
Subject: [PATCH 376/531] Include sharedb in app provider

---
 client/src/contexts/AppProviders.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/src/contexts/AppProviders.tsx b/client/src/contexts/AppProviders.tsx
index d47344887..aa1ba3b6f 100644
--- a/client/src/contexts/AppProviders.tsx
+++ b/client/src/contexts/AppProviders.tsx
@@ -2,6 +2,7 @@ import { createTheme, ThemeProvider } from '@material-ui/core/styles'
 
 import AuthProvider from './AuthProvider'
 import PubSubProvider from './PubSubProvider'
+import SharedbProvider from './SharedbProvider'
 import ToastProvider from './ToastProvider'
 
 const darkTheme = createTheme({
@@ -15,6 +16,7 @@ const providers = [
   [ThemeProvider, { theme: darkTheme }],
   ToastProvider,
   AuthProvider,
+  SharedbProvider,
 ]
 
 /**

From c45f4fc88af6cba08a8b3e2a4c959acf8ed180c2 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 3 Apr 2022 21:03:21 -0700
Subject: [PATCH 377/531] Add websocket url to config

---
 client/src/config.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/config.ts b/client/src/config.ts
index 005526834..c1f272530 100644
--- a/client/src/config.ts
+++ b/client/src/config.ts
@@ -11,3 +11,4 @@ export const appRootUrl =
     : process.env.REACT_APP_SITE_ROOT_URL
 
 export const sharedb = process.env.REACT_APP_SHAREDB
+export const websocketUrl = 'ws://localhost:8080'

From cdf94dfe5fd49167d811d94503ddc47e88788e93 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Sun, 3 Apr 2022 21:03:40 -0700
Subject: [PATCH 378/531] Set up basic connection in sharedb provider

---
 client/src/contexts/SharedbProvider.tsx | 36 +++++++++++++++++++------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/client/src/contexts/SharedbProvider.tsx b/client/src/contexts/SharedbProvider.tsx
index 084126006..b3a32ad77 100644
--- a/client/src/contexts/SharedbProvider.tsx
+++ b/client/src/contexts/SharedbProvider.tsx
@@ -1,21 +1,41 @@
-import { sharedb } from '@/config'
-import { useContext, createContext } from 'react'
+import { sharedb, websocketUrl } from '@/config'
+import { useContext, createContext, useEffect, useState } from 'react'
+
+import ReconnectingWebSocket from 'reconnecting-websocket'
+import client from 'sharedb/lib/client'
+import { Socket } from 'sharedb/lib/sharedb'
+
+const Connection = client.Connection
 
 const Context = createContext({})
 
 export const useSharedb = () => useContext(Context)
 
 // Might want to namespace these
-const PubSubProvider = ({ children }) => {
-  const publicInterface = {}
+const SharedbProvider = ({ children }) => {
+  const [socket, setSocket] = useState<Socket | null>(null)
+  const [connection, setConnection] = useState<client.Connection | null>(null)
+
+  useEffect(() => {
+    console.log('CONNECTING TO SAHAREDB')
+    const _socket = new ReconnectingWebSocket(websocketUrl)
+    const _connection = new Connection(_socket as Socket)
+    setConnection(_connection)
+    setSocket(_socket as Socket)
+  }, [])
+
+  const publicInterface = {
+    socket,
+    connection,
+  }
 
   return <Context.Provider value={publicInterface}>{children}</Context.Provider>
 }
 
-const ConditionalProvider = ({ children }) => {
-  if (!sharedb) return <>{children}</>
-
-  return PubSubProvider
+const ConditionalProvider = props => {
+  console.log('sharedb', sharedb)
+  if (!sharedb) return props.children
+  return <SharedbProvider {...props} />
 }
 
 export default ConditionalProvider

From 3cc5236dea3fb78c68b952222d5b565ef6f14d35 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 4 Apr 2022 00:04:51 -0700
Subject: [PATCH 379/531] Add get spell docs to sharedb provider

---
 client/src/contexts/SharedbProvider.tsx | 41 +++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/client/src/contexts/SharedbProvider.tsx b/client/src/contexts/SharedbProvider.tsx
index b3a32ad77..5a2f4fc2f 100644
--- a/client/src/contexts/SharedbProvider.tsx
+++ b/client/src/contexts/SharedbProvider.tsx
@@ -1,34 +1,69 @@
 import { sharedb, websocketUrl } from '@/config'
 import { useContext, createContext, useEffect, useState } from 'react'
+import { Doc } from 'sharedb'
 
 import ReconnectingWebSocket from 'reconnecting-websocket'
 import client from 'sharedb/lib/client'
 import { Socket } from 'sharedb/lib/sharedb'
+import { Spell } from '@latitudegames/thoth-core/types'
+import LoadingScreen from '@/components/LoadingScreen/LoadingScreen'
 
 const Connection = client.Connection
 
-const Context = createContext({})
+interface SharedbContext {
+  connection: client.Connection | null
+  socket: Socket | null
+  getSpellDoc: (spell: Spell) => Doc
+}
+
+const Context = createContext<SharedbContext>(undefined!)
 
 export const useSharedb = () => useContext(Context)
 
+export const docMap = new Map()
+
 // Might want to namespace these
 const SharedbProvider = ({ children }) => {
   const [socket, setSocket] = useState<Socket | null>(null)
   const [connection, setConnection] = useState<client.Connection | null>(null)
 
   useEffect(() => {
-    console.log('CONNECTING TO SAHAREDB')
     const _socket = new ReconnectingWebSocket(websocketUrl)
     const _connection = new Connection(_socket as Socket)
     setConnection(_connection)
     setSocket(_socket as Socket)
   }, [])
 
-  const publicInterface = {
+  const getSpellDoc = (spell: Spell) => {
+    if (!connection) return
+    const key = spell.name
+    if (docMap.has(key)) return docMap.get(key)
+
+    const doc = connection.get('spell', key)
+    docMap.set(key, doc)
+
+    doc.subscribe(error => {
+      if (error) return console.error(error)
+
+      // If doc.type is undefined, the document has not been created, so let's create it
+      if (!doc.type) {
+        doc.create(spell, error => {
+          if (error) console.error(error)
+        })
+      }
+    })
+
+    return doc
+  }
+
+  const publicInterface: SharedbContext = {
     socket,
     connection,
+    getSpellDoc,
   }
 
+  if (!connection) return <LoadingScreen />
+
   return <Context.Provider value={publicInterface}>{children}</Context.Provider>
 }
 

From 96db07f9af165149b0cf3270c71295e0b1ccbba5 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 4 Apr 2022 00:05:10 -0700
Subject: [PATCH 380/531] Submit op in event handler diff save

---
 client/src/screens/Thoth/components/EventHandler.tsx | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/client/src/screens/Thoth/components/EventHandler.tsx b/client/src/screens/Thoth/components/EventHandler.tsx
index 61d1926f7..2c3aa6bb3 100644
--- a/client/src/screens/Thoth/components/EventHandler.tsx
+++ b/client/src/screens/Thoth/components/EventHandler.tsx
@@ -16,6 +16,8 @@ import { useEditor } from '../../../workspaces/contexts/EditorProvider'
 import { useLayout } from '../../../workspaces/contexts/LayoutProvider'
 import { diff } from '@/utils/json0'
 import { useSnackbar } from 'notistack'
+import { sharedb } from '@/config'
+import { useSharedb } from '@/contexts/SharedbProvider'
 
 // Config for unique name generator
 const customConfig = {
@@ -28,6 +30,7 @@ const EventHandler = ({ pubSub, tab }) => {
   // only using this to handle events, so not rendering anything with it.
   const { createOrFocus, windowTypes } = useLayout()
   const { enqueueSnackbar } = useSnackbar()
+  const { getSpellDoc } = useSharedb()
 
   const [saveSpellMutation] = useSaveSpellMutation()
   const [saveDiff] = useSaveDiffMutation()
@@ -78,6 +81,8 @@ const EventHandler = ({ pubSub, tab }) => {
     }
     const jsonDiff = diff(currentSpell, updatedSpell)
 
+    console.log('JSON DIFF', jsonDiff)
+
     // no point saving if nothing has changed
     if (jsonDiff.length === 0) return
 
@@ -96,6 +101,11 @@ const EventHandler = ({ pubSub, tab }) => {
     enqueueSnackbar('Spell saved', {
       variant: 'success',
     })
+
+    if (sharedb) {
+      const doc = getSpellDoc(currentSpell as Spell)
+      doc.submitOp(jsonDiff)
+    }
   }
 
   const createStateManager = () => {

From 03f6b97486bdac513b122f626951c0c4436d068e Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 4 Apr 2022 00:05:32 -0700
Subject: [PATCH 381/531] Handle (badly) reception of op in spell index

---
 client/src/workspaces/spells/index.tsx | 29 +++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/client/src/workspaces/spells/index.tsx b/client/src/workspaces/spells/index.tsx
index 341dbc1fa..d57e85001 100644
--- a/client/src/workspaces/spells/index.tsx
+++ b/client/src/workspaces/spells/index.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useRef } from 'react'
+import { useEffect, useRef, useState } from 'react'
 
 import { useEditor } from '@/workspaces/contexts/EditorProvider'
 import { Layout } from '@/workspaces/contexts/LayoutProvider'
@@ -13,13 +13,19 @@ import TextEditor from './windows/TextEditorWindow'
 import DebugConsole from './windows/DebugConsole'
 import { Spell } from '@latitudegames/thoth-core/types'
 import { usePubSub } from '@/contexts/PubSubProvider'
+import { useSharedb } from '@/contexts/SharedbProvider'
+import { sharedb } from '@/config'
+import { diff } from '@/utils/json0'
 
 const Workspace = ({ tab, tabs, pubSub }) => {
   const spellRef = useRef<Spell>()
   const { events, publish } = usePubSub()
+  const { getSpellDoc } = useSharedb()
   const [loadSpell, { data: spellData }] = useLazyGetSpellQuery()
   const { serialize, editor } = useEditor()
 
+  const [docLoaded, setDocLoaded] = useState<boolean>(false)
+
   // Set up autosave for the workspaces
   useEffect(() => {
     if (!editor?.on) return
@@ -28,6 +34,7 @@ const Workspace = ({ tab, tabs, pubSub }) => {
       'save nodecreated noderemoved connectioncreated connectionremoved nodetranslated',
       debounce(async data => {
         if (tab.type === 'spell' && spellRef.current) {
+          console.log('SENDING SAVE SPELL DIFF.  SPELL CHANGED.')
           publish(events.$SAVE_SPELL_DIFF(tab.id), { chain: serialize() })
         }
       }, 1000)
@@ -57,6 +64,26 @@ const Workspace = ({ tab, tabs, pubSub }) => {
     spellRef.current = spellData
   }, [spellData])
 
+  useEffect(() => {
+    if (!spellData || !sharedb || docLoaded || !editor) return
+
+    const doc = getSpellDoc(spellData as Spell)
+
+    if (!doc) return
+
+    doc.on('op', (op, origin) => {
+      if (origin) return
+      console.log('updating graph')
+      const jsonDiff = diff(spellData.chain, doc.data.chain)
+      if (jsonDiff.length > 0) {
+        editor.clear()
+        editor.loadGraph(doc.data.chain, true)
+      }
+    })
+
+    setDocLoaded(true)
+  }, [spellData, editor])
+
   useEffect(() => {
     if (!tab || !tab.spellId) return
     loadSpell(tab.spellId)

From 64a0d6e5e26cde8a423f2e91e1bff1936526ec3b Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 4 Apr 2022 00:05:54 -0700
Subject: [PATCH 382/531] Update load graph function to not reposition viewport
 all the time

---
 core/src/editor.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/src/editor.ts b/core/src/editor.ts
index 27f7c0e9d..95dbbcd52 100644
--- a/core/src/editor.ts
+++ b/core/src/editor.ts
@@ -28,7 +28,7 @@ export class ThothEditor extends NodeEditor<EventsTypes> {
   thoth: EngineContext
   tab: { type: string }
   abort: unknown
-  loadGraph: (graph: Data) => Promise<void>
+  loadGraph: (graph: Data, relaoding?: boolean) => Promise<void>
   moduleManager: ModuleManager
   runProcess: (callback?: Function) => Promise<void>
   onSpellUpdated: (spellId: string, callback: Function) => Function
@@ -178,12 +178,13 @@ export const initEditor = async function ({
     if (callback) callback()
   }
 
-  editor.loadGraph = async (_graph: Data) => {
+  editor.loadGraph = async (_graph: Data, reloading = false) => {
     const graph = JSON.parse(JSON.stringify(_graph))
     await engine.abort()
     editor.fromJSON(graph)
+
     editor.view.resize()
-    AreaPlugin.zoomAt(editor)
+    if (!reloading) AreaPlugin.zoomAt(editor)
   }
 
   // Start the engine off on first load

From 56277ac471a94111b7a71a55983d4917fa22e39d Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 4 Apr 2022 11:11:06 -0700
Subject: [PATCH 383/531] Add comment events to save listener

---
 client/src/workspaces/spells/index.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/src/workspaces/spells/index.tsx b/client/src/workspaces/spells/index.tsx
index d57e85001..3a0970b62 100644
--- a/client/src/workspaces/spells/index.tsx
+++ b/client/src/workspaces/spells/index.tsx
@@ -31,7 +31,7 @@ const Workspace = ({ tab, tabs, pubSub }) => {
     if (!editor?.on) return
 
     const unsubscribe = editor.on(
-      'save nodecreated noderemoved connectioncreated connectionremoved nodetranslated',
+      'save nodecreated noderemoved connectioncreated connectionremoved nodetranslated commentremoved commentcreated addcomment removecomment editcomment',
       debounce(async data => {
         if (tab.type === 'spell' && spellRef.current) {
           console.log('SENDING SAVE SPELL DIFF.  SPELL CHANGED.')
@@ -71,12 +71,13 @@ const Workspace = ({ tab, tabs, pubSub }) => {
 
     if (!doc) return
 
+    console.log('SUBSCRIBING TO CHANGES')
     doc.on('op', (op, origin) => {
       if (origin) return
       console.log('updating graph')
       const jsonDiff = diff(spellData.chain, doc.data.chain)
       if (jsonDiff.length > 0) {
-        editor.clear()
+        console.log('UPDATED CHAIN', spellData.chain)
         editor.loadGraph(doc.data.chain, true)
       }
     })

From 69f0cae111d7828aeeb2cc3936eb113d82f34dca Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 4 Apr 2022 11:26:51 -0700
Subject: [PATCH 384/531] coerce sharedb env to boolean

---
 client/src/config.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/src/config.ts b/client/src/config.ts
index c1f272530..210ecaf97 100644
--- a/client/src/config.ts
+++ b/client/src/config.ts
@@ -10,5 +10,6 @@ export const appRootUrl =
     ? process.env.REACT_APP_SITE_ROOT_URL_PROD
     : process.env.REACT_APP_SITE_ROOT_URL
 
-export const sharedb = process.env.REACT_APP_SHAREDB
+// coercing this into a boolean
+export const sharedb = process.env.REACT_APP_SHAREDB === 'true'
 export const websocketUrl = 'ws://localhost:8080'

From 78e85ba44c9ff00619edbeb72b7e80b2a09ae650 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 4 Apr 2022 11:27:38 -0700
Subject: [PATCH 385/531] Fix typescript ewrror for possibly null doc

---
 client/src/screens/Thoth/components/EventHandler.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/screens/Thoth/components/EventHandler.tsx b/client/src/screens/Thoth/components/EventHandler.tsx
index 2c3aa6bb3..cebde1b67 100644
--- a/client/src/screens/Thoth/components/EventHandler.tsx
+++ b/client/src/screens/Thoth/components/EventHandler.tsx
@@ -104,6 +104,7 @@ const EventHandler = ({ pubSub, tab }) => {
 
     if (sharedb) {
       const doc = getSpellDoc(currentSpell as Spell)
+      if (!doc) return
       doc.submitOp(jsonDiff)
     }
   }

From 0a0aaf9f5705701b4282336dbda9e0f22b9a274f Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 4 Apr 2022 11:27:55 -0700
Subject: [PATCH 386/531] Add sharedb to env and set to false

---
 client/.env | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/client/.env b/client/.env
index 1f93d77af..a17d2ddf5 100644
--- a/client/.env
+++ b/client/.env
@@ -1,6 +1,7 @@
 EXTEND_ESLINT = true
 
 # This prod site root assumes the netlify build context $URL is available, replace for other hosts
+
 REACT_APP_SITE_ROOT_URL_PROD=https://thoth.latitude.io
 
 REACT_APP_SITE_ROOT_URL=http://localhost:3001
@@ -10,4 +11,7 @@ REACT_APP_LAPI_ROOT_URL_PROD=https://api.latitude.io
 REACT_APP_SITE_STAGING=https://62264f21c3a9860ad1e5bdd3--optimistic-turing-def916.netlify.app/
 
 # Oauth Client Id
-REACT_APP_OAUTH_CLIENT_ID=a6b51c87-7565-42ab-a4b0-38a07f3b6c56
\ No newline at end of file
+
+REACT_APP_OAUTH_CLIENT_ID=a6b51c87-7565-42ab-a4b0-38a07f3b6c56
+
+REACT_APP_SHAREDB=false

From cccaeff9ab8d03e1f798f548b5bd879c769ae347 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 4 Apr 2022 11:28:16 -0700
Subject: [PATCH 387/531] Add empty context to sharedb provider

---
 client/src/contexts/SharedbProvider.tsx | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/client/src/contexts/SharedbProvider.tsx b/client/src/contexts/SharedbProvider.tsx
index 5a2f4fc2f..c85e099f1 100644
--- a/client/src/contexts/SharedbProvider.tsx
+++ b/client/src/contexts/SharedbProvider.tsx
@@ -13,10 +13,14 @@ const Connection = client.Connection
 interface SharedbContext {
   connection: client.Connection | null
   socket: Socket | null
-  getSpellDoc: (spell: Spell) => Doc
+  getSpellDoc: (spell: Spell) => Doc | null
 }
 
-const Context = createContext<SharedbContext>(undefined!)
+const Context = createContext<SharedbContext>({
+  connection: null,
+  socket: null,
+  getSpellDoc: () => null,
+})
 
 export const useSharedb = () => useContext(Context)
 
@@ -68,8 +72,10 @@ const SharedbProvider = ({ children }) => {
 }
 
 const ConditionalProvider = props => {
-  console.log('sharedb', sharedb)
+  console.log('USING SHAREDB!!!', sharedb)
   if (!sharedb) return props.children
+
+  console.log('returning sharerdb provider!')
   return <SharedbProvider {...props} />
 }
 

From 59a732e17fcc739f43b38a63c2ef585bd85c1ee5 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 4 Apr 2022 11:35:11 -0700
Subject: [PATCH 388/531] Object Transform notes for rete migration

---
 ot-notes.md | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 ot-notes.md

diff --git a/ot-notes.md b/ot-notes.md
new file mode 100644
index 000000000..13e650568
--- /dev/null
+++ b/ot-notes.md
@@ -0,0 +1,10 @@
+Important operations
+
+- delete node
+- add node
+- modify node
+  - node translated
+  - connection added
+  - connection removed
+  - data updated
+  - socket added/removed

From 7d399bc588f0230bfe73a9f740926d1e2a5820cd Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 4 Apr 2022 11:37:03 -0700
Subject: [PATCH 389/531] Remove console logs

---
 client/src/contexts/SharedbProvider.tsx              | 2 --
 client/src/screens/Thoth/components/EventHandler.tsx | 2 --
 client/src/workspaces/spells/index.tsx               | 1 -
 3 files changed, 5 deletions(-)

diff --git a/client/src/contexts/SharedbProvider.tsx b/client/src/contexts/SharedbProvider.tsx
index c85e099f1..dd9e438f5 100644
--- a/client/src/contexts/SharedbProvider.tsx
+++ b/client/src/contexts/SharedbProvider.tsx
@@ -72,10 +72,8 @@ const SharedbProvider = ({ children }) => {
 }
 
 const ConditionalProvider = props => {
-  console.log('USING SHAREDB!!!', sharedb)
   if (!sharedb) return props.children
 
-  console.log('returning sharerdb provider!')
   return <SharedbProvider {...props} />
 }
 
diff --git a/client/src/screens/Thoth/components/EventHandler.tsx b/client/src/screens/Thoth/components/EventHandler.tsx
index cebde1b67..e98737984 100644
--- a/client/src/screens/Thoth/components/EventHandler.tsx
+++ b/client/src/screens/Thoth/components/EventHandler.tsx
@@ -81,8 +81,6 @@ const EventHandler = ({ pubSub, tab }) => {
     }
     const jsonDiff = diff(currentSpell, updatedSpell)
 
-    console.log('JSON DIFF', jsonDiff)
-
     // no point saving if nothing has changed
     if (jsonDiff.length === 0) return
 
diff --git a/client/src/workspaces/spells/index.tsx b/client/src/workspaces/spells/index.tsx
index 3a0970b62..71ecbb5ed 100644
--- a/client/src/workspaces/spells/index.tsx
+++ b/client/src/workspaces/spells/index.tsx
@@ -34,7 +34,6 @@ const Workspace = ({ tab, tabs, pubSub }) => {
       'save nodecreated noderemoved connectioncreated connectionremoved nodetranslated commentremoved commentcreated addcomment removecomment editcomment',
       debounce(async data => {
         if (tab.type === 'spell' && spellRef.current) {
-          console.log('SENDING SAVE SPELL DIFF.  SPELL CHANGED.')
           publish(events.$SAVE_SPELL_DIFF(tab.id), { chain: serialize() })
         }
       }, 1000)

From f40d7de1ab8c34cde8b786114b5865265af21272 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 4 Apr 2022 14:19:24 -0700
Subject: [PATCH 390/531] add lock-bar class name to css.d.ts

---
 client/src/components/Window/window.module.css.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/components/Window/window.module.css.d.ts b/client/src/components/Window/window.module.css.d.ts
index 436b63cc3..bb79e5f82 100644
--- a/client/src/components/Window/window.module.css.d.ts
+++ b/client/src/components/Window/window.module.css.d.ts
@@ -5,6 +5,7 @@ interface CssExports {
   'darkened': string;
   'darker': string;
   'grid': string;
+  'lock-bar': string;
   'unpadded': string;
   'window': string;
   'window-layout': string;

From 22d5d09779a28d0483cdb6b1b63bffb23e55fdec Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 4 Apr 2022 14:19:38 -0700
Subject: [PATCH 391/531] remove top border on window.bordered

---
 client/src/components/Window/window.module.css | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/client/src/components/Window/window.module.css b/client/src/components/Window/window.module.css
index 9bbc790ca..da521a548 100644
--- a/client/src/components/Window/window.module.css
+++ b/client/src/components/Window/window.module.css
@@ -7,6 +7,7 @@
 }
 .window.bordered .window-layout {
   border: 1px solid var(--dark-2);
+  border-top: none;
 }
 .window.darkened .window-layout {
   background-color: var(--dark-2);
@@ -35,17 +36,22 @@
   justify-content: flex-end;
   padding-bottom: var(--c1);
   gap: var(--extraSmall);
+  border-bottom: 1px solid var(--dark-1);
 }
+
+.lock-bar {
+  border-bottom: none;
+}
+
 .window.unpadded {
   padding: 0;
   padding-bottom: var(--c1);
 }
-.window.unpadded .window-toolbar{
+.window.unpadded .window-toolbar {
   padding: var(--c1);
 }
-.window.unpadded .window-layout{
+.window.unpadded .window-layout {
   border-radius: 0;
   border-left: 0;
   border-right: 0;
 }
-

From 8e02578c1b9b411c095c0426a7511cf164f33399 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 4 Apr 2022 14:20:03 -0700
Subject: [PATCH 392/531] add lock to window props

---
 client/src/components/Window/Window.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/components/Window/Window.tsx b/client/src/components/Window/Window.tsx
index 875d3ab93..2f4693c70 100644
--- a/client/src/components/Window/Window.tsx
+++ b/client/src/components/Window/Window.tsx
@@ -29,6 +29,7 @@ type Props = {
   grid?: boolean
   scrollToBottom?: boolean
   toolbar?: ReactElement<any, any> | false
+  lock?: ReactElement<any, any> | false
   children: ReactElement<any, any> | ReactElement<any, any>[]
 }
 

From a1d993f6b80af60174c8993a502b10170bf77388 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 4 Apr 2022 14:20:17 -0700
Subject: [PATCH 393/531] destructur lock from props

---
 client/src/components/Window/Window.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/components/Window/Window.tsx b/client/src/components/Window/Window.tsx
index 2f4693c70..4613472b9 100644
--- a/client/src/components/Window/Window.tsx
+++ b/client/src/components/Window/Window.tsx
@@ -41,6 +41,7 @@ const Window = (props: Props) => {
     darker = false,
     grid = false,
     toolbar = false,
+    lock = false,
     scrollToBottom = false,
   } = props
 

From 43ac17c2c6f5f634c8d07ee51e381d286291f26d Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 4 Apr 2022 14:20:33 -0700
Subject: [PATCH 394/531] add lock window toolbar

---
 client/src/components/Window/Window.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/components/Window/Window.tsx b/client/src/components/Window/Window.tsx
index 4613472b9..e7d0d109b 100644
--- a/client/src/components/Window/Window.tsx
+++ b/client/src/components/Window/Window.tsx
@@ -57,6 +57,7 @@ const Window = (props: Props) => {
       `}
     >
       {toolbar && <WindowToolbar>{props.toolbar}</WindowToolbar>}
+      {lock && <WindowToolbar>{props.lock}</WindowToolbar>}
       <WindowLayout scrollToBottom={scrollToBottom}>
         {props.children}
       </WindowLayout>

From 6ccc4e1c6e8272670a6d5838b9323bbd8ca8eb39 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 4 Apr 2022 14:22:22 -0700
Subject: [PATCH 395/531] import switch to inspector window

---
 client/src/workspaces/spells/windows/InspectorWindow.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/workspaces/spells/windows/InspectorWindow.tsx b/client/src/workspaces/spells/windows/InspectorWindow.tsx
index a949ae285..363e78f36 100644
--- a/client/src/workspaces/spells/windows/InspectorWindow.tsx
+++ b/client/src/workspaces/spells/windows/InspectorWindow.tsx
@@ -7,6 +7,7 @@ import DataControls from '../DataControls'
 import WindowMessage from '../components/WindowMessage'
 import { useInspector } from '@/workspaces/contexts/InspectorProvider'
 import { InspectorData } from '@latitudegames/thoth-core/types'
+import SwitchComponent from '@/components/Switch/Switch'
 
 const Inspector = props => {
   const { inspectorData, saveInspector } = useInspector()

From 8f29e05f6e7f1b38cd17eb0d76bdaf48a7030828 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 4 Apr 2022 14:22:35 -0700
Subject: [PATCH 396/531] add onLock helper

---
 client/src/workspaces/spells/windows/InspectorWindow.tsx | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/client/src/workspaces/spells/windows/InspectorWindow.tsx b/client/src/workspaces/spells/windows/InspectorWindow.tsx
index 363e78f36..d4138bb7d 100644
--- a/client/src/workspaces/spells/windows/InspectorWindow.tsx
+++ b/client/src/workspaces/spells/windows/InspectorWindow.tsx
@@ -57,6 +57,14 @@ const Inspector = props => {
     saveInspector(newData)
   }
 
+  const onLock = () => {
+    const data = {
+      nodeLocked: !inspectorData?.data.nodeLocked,
+    }
+
+    updateData(data)
+  }
+
   const toolbar = (
     <>
       <div style={{ flex: 1, display: 'flex', alignItems: 'center' }}>

From 3636d39243ce073cd85668713404301d6afd1ffe Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 4 Apr 2022 14:22:54 -0700
Subject: [PATCH 397/531] add lock component

---
 .../spells/windows/InspectorWindow.tsx          | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/client/src/workspaces/spells/windows/InspectorWindow.tsx b/client/src/workspaces/spells/windows/InspectorWindow.tsx
index d4138bb7d..9fabeb404 100644
--- a/client/src/workspaces/spells/windows/InspectorWindow.tsx
+++ b/client/src/workspaces/spells/windows/InspectorWindow.tsx
@@ -91,6 +91,23 @@ const Inspector = props => {
     </>
   )
 
+  const lock = (
+    <>
+      <div style={{ flex: 1, display: 'flex', alignItems: 'center' }}>
+        <Icon
+          name={componentCategories[inspectorData?.category || 0]}
+          style={{ marginRight: 'var(--extraSmall)' }}
+        />
+        Node Lock
+      </div>
+      <SwitchComponent
+        label={inspectorData?.data.nodeLocked ? 'Locked' : 'Unlocked'}
+        checked={inspectorData?.data.nodeLocked ? true : false}
+        onChange={onLock}
+      />
+    </>
+  )
+
   const DeprecationMessage = (inspectorData: InspectorData) => {
     if (!inspectorData.deprecated) return <></>
     return (

From 38623de633e7681e44e19a90ee7186ac61833b5d Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 4 Apr 2022 14:23:06 -0700
Subject: [PATCH 398/531] pass in lock to window props

---
 client/src/workspaces/spells/windows/InspectorWindow.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/workspaces/spells/windows/InspectorWindow.tsx b/client/src/workspaces/spells/windows/InspectorWindow.tsx
index 9fabeb404..8bb7a00ef 100644
--- a/client/src/workspaces/spells/windows/InspectorWindow.tsx
+++ b/client/src/workspaces/spells/windows/InspectorWindow.tsx
@@ -121,7 +121,7 @@ const Inspector = props => {
   if (!inspectorData) return <WindowMessage />
 
   return (
-    <Window toolbar={toolbar} darker outline borderless>
+    <Window toolbar={toolbar} lock={lock} darker outline borderless>
       {DeprecationMessage(inspectorData)}
       <DataControls
         inspectorData={inspectorData}

From 581de74394581128114cf5e15efab647b7691308 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 4 Apr 2022 15:10:27 -0700
Subject: [PATCH 399/531] Remove sharedb stuff from on save diff

---
 client/src/screens/Thoth/components/EventHandler.tsx | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/client/src/screens/Thoth/components/EventHandler.tsx b/client/src/screens/Thoth/components/EventHandler.tsx
index e98737984..077ce2028 100644
--- a/client/src/screens/Thoth/components/EventHandler.tsx
+++ b/client/src/screens/Thoth/components/EventHandler.tsx
@@ -99,12 +99,6 @@ const EventHandler = ({ pubSub, tab }) => {
     enqueueSnackbar('Spell saved', {
       variant: 'success',
     })
-
-    if (sharedb) {
-      const doc = getSpellDoc(currentSpell as Spell)
-      if (!doc) return
-      doc.submitOp(jsonDiff)
-    }
   }
 
   const createStateManager = () => {

From a4b6e3d30d2a36d7b7c3c8547ac0a829004ffcf6 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 4 Apr 2022 15:11:07 -0700
Subject: [PATCH 400/531] Create sharedDiff handler for development withg
 ternary switch in handler map

---
 .../screens/Thoth/components/EventHandler.tsx | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/client/src/screens/Thoth/components/EventHandler.tsx b/client/src/screens/Thoth/components/EventHandler.tsx
index 077ce2028..38f192205 100644
--- a/client/src/screens/Thoth/components/EventHandler.tsx
+++ b/client/src/screens/Thoth/components/EventHandler.tsx
@@ -71,6 +71,25 @@ const EventHandler = ({ pubSub, tab }) => {
     await saveSpellMutation({ ...currentSpell, chain })
   }
 
+  const sharedbDiff = async (event, update) => {
+    if (!spellRef.current) return
+    const doc = getSpellDoc(spellRef.current as Spell)
+    if (!doc) return
+
+    const updatedSpell = {
+      ...doc.data,
+      ...update,
+    }
+
+    const jsonDiff = diff(doc.data, updatedSpell)
+
+    if (jsonDiff.length === 0) return
+
+    console.log('JSON DIFF IN SHAREDB DIFF', jsonDiff)
+
+    doc.submitOp(jsonDiff)
+  }
+
   const onSaveDiff = async (event, update) => {
     if (!spellRef.current) return
 
@@ -187,7 +206,7 @@ const EventHandler = ({ pubSub, tab }) => {
     [$REDO(tab.id)]: onRedo,
     [$DELETE(tab.id)]: onDelete,
     [$PROCESS(tab.id)]: onProcess,
-    [$SAVE_SPELL_DIFF(tab.id)]: onSaveDiff,
+    [$SAVE_SPELL_DIFF(tab.id)]: sharedb ? sharedbDiff : onSaveDiff,
   }
 
   useEffect(() => {

From 047f15fc17959209c85a9df619b74b885fc95628 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 4 Apr 2022 15:11:30 -0700
Subject: [PATCH 401/531] Watch for batch ops in spell sharedb watcher

---
 client/src/workspaces/spells/index.tsx | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/client/src/workspaces/spells/index.tsx b/client/src/workspaces/spells/index.tsx
index 71ecbb5ed..2da001483 100644
--- a/client/src/workspaces/spells/index.tsx
+++ b/client/src/workspaces/spells/index.tsx
@@ -15,7 +15,6 @@ import { Spell } from '@latitudegames/thoth-core/types'
 import { usePubSub } from '@/contexts/PubSubProvider'
 import { useSharedb } from '@/contexts/SharedbProvider'
 import { sharedb } from '@/config'
-import { diff } from '@/utils/json0'
 
 const Workspace = ({ tab, tabs, pubSub }) => {
   const spellRef = useRef<Spell>()
@@ -47,6 +46,8 @@ const Workspace = ({ tab, tabs, pubSub }) => {
 
     const unsubscribe = editor.on('nodecreated noderemoved', () => {
       if (!spellRef.current) return
+      // TODO we can probably send this update to a spell namespace for this spell.
+      // then spells can subscribe to only their dependency updates.
       const event = events.$SUBSPELL_UPDATED(editor.toJSON())
       const spell = {
         ...spellRef.current,
@@ -70,15 +71,10 @@ const Workspace = ({ tab, tabs, pubSub }) => {
 
     if (!doc) return
 
-    console.log('SUBSCRIBING TO CHANGES')
-    doc.on('op', (op, origin) => {
+    doc.on('op batch', (op, origin) => {
       if (origin) return
-      console.log('updating graph')
-      const jsonDiff = diff(spellData.chain, doc.data.chain)
-      if (jsonDiff.length > 0) {
-        console.log('UPDATED CHAIN', spellData.chain)
-        editor.loadGraph(doc.data.chain, true)
-      }
+      console.log('UPDATED CHAIN', spellData.chain)
+      editor.loadGraph(doc.data.chain, true)
     })
 
     setDocLoaded(true)

From 6b3ede1b6f3fc2a0a3b5de627ea143ff7352e16d Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 4 Apr 2022 15:11:49 -0700
Subject: [PATCH 402/531] Clean up menubar.  Add empty console window function
 and menu item

---
 client/src/components/MenuBar/MenuBar.tsx | 33 ++++++++---------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/client/src/components/MenuBar/MenuBar.tsx b/client/src/components/MenuBar/MenuBar.tsx
index 069925b3a..e5f61c409 100644
--- a/client/src/components/MenuBar/MenuBar.tsx
+++ b/client/src/components/MenuBar/MenuBar.tsx
@@ -103,8 +103,8 @@ const MenuBar = () => {
     publish($EXPORT(activeTabRef.current.id))
   }
 
-  const onModal = () => {
-    openModal({ modal: 'example', content: 'This is an example modal' })
+  const onConsole = () => {
+    if (!activeTabRef.current) return
   }
 
   //Menu bar hotkeys
@@ -187,29 +187,18 @@ const MenuBar = () => {
             playtest: {
               onClick: onPlaytestCreate,
             },
-            enki: {
-              items: {
-                fewshots: {},
-                serialization: {},
-                preamble: {},
-              },
-            },
-            test: {
-              items: {
-                'open modal ...': {
-                  onClick: onModal,
-                },
-              },
+            console: {
+              onClick: onConsole,
             },
           },
         },
-        change_layout: {
-          items: {
-            multishot_editing: {},
-            enki_fewshot_editing: {},
-            node_editing: {},
-          },
-        },
+        // change_layout: {
+        //   items: {
+        //     multishot_editing: {},
+        //     enki_fewshot_editing: {},
+        //     node_editing: {},
+        //   },
+        // },
       },
     },
   }

From c3968bc4784d0fa5d2b9104326e0385e79b22dbd Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 4 Apr 2022 15:18:33 -0700
Subject: [PATCH 403/531] Rename console create event in pubsub

---
 client/src/contexts/PubSubProvider.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/contexts/PubSubProvider.jsx b/client/src/contexts/PubSubProvider.jsx
index 6fd427964..b7fedcfb3 100644
--- a/client/src/contexts/PubSubProvider.jsx
+++ b/client/src/contexts/PubSubProvider.jsx
@@ -34,7 +34,7 @@ export const events = {
   $CREATE_PLAYTEST: tabId => `createPlaytest:${tabId}`,
   $CREATE_INSPECTOR: tabId => `createInspector:${tabId}`,
   $CREATE_TEXT_EDITOR: tabId => `createTextEditor:${tabId}`,
-  $CREATE_DEBUG_CONSOLE: tabId => `createDebugConsole:${tabId}`,
+  $CREATE_CONSOLE: tabId => `createDebugConsole:${tabId}`,
   $SERIALIZE: tabId => `serialize:${tabId}`,
   $PROCESS: tabId => `process:${tabId}`,
   $EXPORT: tabId => `export:${tabId}`,

From 1bd7f8c4677b1defd7c796b5f833dde2a2d651c4 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 4 Apr 2022 15:18:59 -0700
Subject: [PATCH 404/531] Populate onConsole menunbar handler

---
 client/src/components/MenuBar/MenuBar.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/src/components/MenuBar/MenuBar.tsx b/client/src/components/MenuBar/MenuBar.tsx
index e5f61c409..9705cf167 100644
--- a/client/src/components/MenuBar/MenuBar.tsx
+++ b/client/src/components/MenuBar/MenuBar.tsx
@@ -30,6 +30,7 @@ const MenuBar = () => {
     $CREATE_PLAYTEST,
     $CREATE_INSPECTOR,
     $CREATE_TEXT_EDITOR,
+    $CREATE_CONSOLE,
     $SERIALIZE,
     $EXPORT,
   } = events
@@ -105,6 +106,7 @@ const MenuBar = () => {
 
   const onConsole = () => {
     if (!activeTabRef.current) return
+    publish($CREATE_CONSOLE(activeTabRef.current.id))
   }
 
   //Menu bar hotkeys

From 159c17809ff4b052467eda9498a804b64339f86b Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 4 Apr 2022 15:19:14 -0700
Subject: [PATCH 405/531] Clean up and reorganise menubar

---
 client/src/components/MenuBar/MenuBar.tsx | 67 +++++++++--------------
 1 file changed, 26 insertions(+), 41 deletions(-)

diff --git a/client/src/components/MenuBar/MenuBar.tsx b/client/src/components/MenuBar/MenuBar.tsx
index 9705cf167..15678cdf8 100644
--- a/client/src/components/MenuBar/MenuBar.tsx
+++ b/client/src/components/MenuBar/MenuBar.tsx
@@ -134,27 +134,23 @@ const MenuBar = () => {
   const menuBarItems = {
     file: {
       items: {
-        new_project: {
+        new_spell: {
           onClick: onNew,
         },
-        open_project: {
+        open_spell: {
           onClick: onOpen,
         },
-        edit_project: {
+        edit_spell: {
           onClick: onEdit,
         },
-        save: {
-          items: {
-            save_project: {
-              onClick: onSave,
-            },
-            save_project_as: {
-              onClick: onSaveAs,
-            },
-            export_project: {
-              onClick: onExport,
-            },
-          },
+        save_spell: {
+          onClick: onSave,
+        },
+        save_spell_as: {
+          onClick: onSaveAs,
+        },
+        export_spell: {
+          onClick: onExport,
         },
       },
     },
@@ -173,34 +169,23 @@ const MenuBar = () => {
         },
       },
     },
-    studio: {
+    windows: {
       items: {
-        tools: {
-          items: {
-            text_editor: {
-              onClick: onTextEditorCreate,
-            },
-            inspector: {
-              onClick: onInspectorCreate,
-            },
-            state_manager: {
-              onClick: onStateManagerCreate,
-            },
-            playtest: {
-              onClick: onPlaytestCreate,
-            },
-            console: {
-              onClick: onConsole,
-            },
-          },
+        text_editor: {
+          onClick: onTextEditorCreate,
+        },
+        inspector: {
+          onClick: onInspectorCreate,
+        },
+        state_manager: {
+          onClick: onStateManagerCreate,
+        },
+        playtest: {
+          onClick: onPlaytestCreate,
+        },
+        console: {
+          onClick: onConsole,
         },
-        // change_layout: {
-        //   items: {
-        //     multishot_editing: {},
-        //     enki_fewshot_editing: {},
-        //     node_editing: {},
-        //   },
-        // },
       },
     },
   }

From 72ec0a79ff39f35a5f8b0ac7d9965f75feaf1db7 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 4 Apr 2022 15:19:34 -0700
Subject: [PATCH 406/531] Add event handler for creating console window

---
 client/src/screens/Thoth/components/EventHandler.tsx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/client/src/screens/Thoth/components/EventHandler.tsx b/client/src/screens/Thoth/components/EventHandler.tsx
index 38f192205..db96c05fa 100644
--- a/client/src/screens/Thoth/components/EventHandler.tsx
+++ b/client/src/screens/Thoth/components/EventHandler.tsx
@@ -57,6 +57,7 @@ const EventHandler = ({ pubSub, tab }) => {
     $CREATE_STATE_MANAGER,
     $CREATE_PLAYTEST,
     $CREATE_INSPECTOR,
+    $CREATE_CONSOLE,
     $CREATE_TEXT_EDITOR,
     $SERIALIZE,
     $EXPORT,
@@ -136,6 +137,10 @@ const EventHandler = ({ pubSub, tab }) => {
     createOrFocus(windowTypes.TEXT_EDITOR, 'Text Editor')
   }
 
+  const createConsole = () => {
+    createOrFocus(windowTypes.CONSOLE, 'Console')
+  }
+
   const onSerialize = () => {
     // eslint-disable-next-line no-console
     console.log(serialize())
@@ -199,6 +204,7 @@ const EventHandler = ({ pubSub, tab }) => {
     [$CREATE_PLAYTEST(tab.id)]: createPlaytest,
     [$CREATE_INSPECTOR(tab.id)]: createInspector,
     [$CREATE_TEXT_EDITOR(tab.id)]: createTextEditor,
+    [$CREATE_CONSOLE(tab.id)]: createConsole,
     [$SERIALIZE(tab.id)]: onSerialize,
     [$EXPORT(tab.id)]: onExport,
     [$CLOSE_EDITOR(tab.id)]: onCloseEditor,

From ffc1f511ea38ae83170868041e8e073bc084d4ae Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 4 Apr 2022 15:19:50 -0700
Subject: [PATCH 407/531] Add proper typing to window types ion layout provider

---
 client/src/workspaces/contexts/LayoutProvider.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/src/workspaces/contexts/LayoutProvider.tsx b/client/src/workspaces/contexts/LayoutProvider.tsx
index 7ae90ce65..ae0887574 100644
--- a/client/src/workspaces/contexts/LayoutProvider.tsx
+++ b/client/src/workspaces/contexts/LayoutProvider.tsx
@@ -18,6 +18,7 @@ const windowTypes: WindowTypes = {
   STATE_MANAGER: 'stateManager',
   EDITOR: 'editor',
   PLAYTEST: 'playtest',
+  CONSOLE: 'debugConsole',
 }
 
 type WindowType =
@@ -26,6 +27,7 @@ type WindowType =
   | 'stateManager'
   | 'editor'
   | 'playtest'
+  | 'debugConsole'
 
 type WindowTypes = Record<string, WindowType>
 

From 89b1868b750880e5a5ea5bf85df6a1a8117960af Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 4 Apr 2022 15:53:39 -0700
Subject: [PATCH 408/531] create LockedOverlay component

---
 .../spells/windows/InspectorWindow.tsx         | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/client/src/workspaces/spells/windows/InspectorWindow.tsx b/client/src/workspaces/spells/windows/InspectorWindow.tsx
index 8bb7a00ef..e06ca7a5a 100644
--- a/client/src/workspaces/spells/windows/InspectorWindow.tsx
+++ b/client/src/workspaces/spells/windows/InspectorWindow.tsx
@@ -118,6 +118,24 @@ const Inspector = props => {
     )
   }
 
+  const LockedOverlay = ({ isLocked }) => {
+    return (
+      <>
+        <div
+          className="locked-overlay"
+          style={{
+            backgroundColor: `${isLocked ? 'red' : 'none'}`,
+            width: '100%',
+            height: '100%',
+            position: 'absolute',
+            zIndex: 10,
+            opacity: '50%',
+          }}
+        />
+      </>
+    )
+  }
+
   if (!inspectorData) return <WindowMessage />
 
   return (

From 951a5ac8af3a7cc0defb6998e0cc30fa93fb2216 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 4 Apr 2022 15:53:52 -0700
Subject: [PATCH 409/531] apply LockedOverlay

---
 client/src/workspaces/spells/windows/InspectorWindow.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/workspaces/spells/windows/InspectorWindow.tsx b/client/src/workspaces/spells/windows/InspectorWindow.tsx
index e06ca7a5a..41a33813d 100644
--- a/client/src/workspaces/spells/windows/InspectorWindow.tsx
+++ b/client/src/workspaces/spells/windows/InspectorWindow.tsx
@@ -141,6 +141,7 @@ const Inspector = props => {
   return (
     <Window toolbar={toolbar} lock={lock} darker outline borderless>
       {DeprecationMessage(inspectorData)}
+      <LockedOverlay isLocked={inspectorData?.data.nodeLocked} />
       <DataControls
         inspectorData={inspectorData}
         nodeId={inspectorData.nodeId}

From 4b774b7023edd45329264cb93feb41cf0a1b5092 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 4 Apr 2022 15:54:28 -0700
Subject: [PATCH 410/531] create handle lock helper

---
 core/src/plugins/inspectorPlugin/Inspector.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/src/plugins/inspectorPlugin/Inspector.ts b/core/src/plugins/inspectorPlugin/Inspector.ts
index 78edb3840..152940815 100644
--- a/core/src/plugins/inspectorPlugin/Inspector.ts
+++ b/core/src/plugins/inspectorPlugin/Inspector.ts
@@ -184,6 +184,11 @@ export class Inspector {
     this.node.data.dataControls = cache
   }
 
+  handleLock(update: Record<string, any>) {
+    if (!('nodeLocked' in update)) return
+    this.node.data.nodeLocked = update.nodeLocked
+  }
+
   handleData(update: Record<string, any>) {
     // store all data controls inside the nodes data
     // WATCH in case our graphs start getting quite large.

From 5dd5560418ea89aa0bd8884c6ffa6699a74c46ed Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 4 Apr 2022 15:54:47 -0700
Subject: [PATCH 411/531] pass update to handleLock helper

---
 core/src/plugins/inspectorPlugin/Inspector.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/plugins/inspectorPlugin/Inspector.ts b/core/src/plugins/inspectorPlugin/Inspector.ts
index 152940815..92d8fc305 100644
--- a/core/src/plugins/inspectorPlugin/Inspector.ts
+++ b/core/src/plugins/inspectorPlugin/Inspector.ts
@@ -195,6 +195,7 @@ export class Inspector {
     if (update.dataControls) this.cacheControls(update.dataControls)
 
     const { data } = update
+    this.handleLock(update)
 
     // Send data to a possibel node global handler
     // Turned off until the pattern might be useful

From 015e851b08ae470f04b79bf32c66995abf9989dd Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Mon, 4 Apr 2022 16:39:13 -0700
Subject: [PATCH 412/531] Fix lock data save handling with proper object path

---
 core/src/plugins/inspectorPlugin/Inspector.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/plugins/inspectorPlugin/Inspector.ts b/core/src/plugins/inspectorPlugin/Inspector.ts
index 92d8fc305..ec7539190 100644
--- a/core/src/plugins/inspectorPlugin/Inspector.ts
+++ b/core/src/plugins/inspectorPlugin/Inspector.ts
@@ -185,8 +185,8 @@ export class Inspector {
   }
 
   handleLock(update: Record<string, any>) {
-    if (!('nodeLocked' in update)) return
-    this.node.data.nodeLocked = update.nodeLocked
+    if (!('nodeLocked' in update.data)) return
+    this.node.data.nodeLocked = update.data.nodeLocked
   }
 
   handleData(update: Record<string, any>) {

From 2158987b500a756c07de40b6296321dcb8ff04c1 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 4 Apr 2022 16:52:00 -0700
Subject: [PATCH 413/531] add lock svg

---
 client/src/components/Icon/Lock.svg | 59 +++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 client/src/components/Icon/Lock.svg

diff --git a/client/src/components/Icon/Lock.svg b/client/src/components/Icon/Lock.svg
new file mode 100644
index 000000000..da90f6c38
--- /dev/null
+++ b/client/src/components/Icon/Lock.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 -256 1792 1792"
+   id="svg2989"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   width="100%"
+   height="100%"
+   sodipodi:docname="lock_font_awesome.svg">
+  <metadata
+     id="metadata2999">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs2997" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview2995"
+     showgrid="false"
+     inkscape:zoom="0.13169643"
+     inkscape:cx="896"
+     inkscape:cy="896"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2989" />
+  <g
+     transform="matrix(1,0,0,-1,318.91525,1346.1695)"
+     id="g2991">
+    <path
+       d="m 704,512 q 0,53 -37.5,90.5 Q 629,640 576,640 523,640 485.5,602.5 448,565 448,512 q 0,-37 19,-67 19,-30 51,-47 L 449,169 q -5,-15 5,-28 10,-13 26,-13 h 192 q 16,0 26,13 10,13 5,28 l -69,229 q 32,17 51,47 19,30 19,67 z M 320,768 h 512 v 192 q 0,106 -75,181 -75,75 -181,75 -106,0 -181,-75 -75,-75 -75,-181 V 768 z m 832,-96 V 96 Q 1152,56 1124,28 1096,0 1056,0 H 96 Q 56,0 28,28 0,56 0,96 v 576 q 0,40 28,68 28,28 68,28 h 32 v 192 q 0,184 132,316 132,132 316,132 184,0 316,-132 132,-132 132,-316 V 768 h 32 q 40,0 68,-28 28,-28 28,-68 z"
+       id="path2993"
+       inkscape:connector-curvature="0"
+       style="fill:currentColor" />
+  </g>
+</svg>

From dde0227bf476c38539322959a9d2d74172b64a50 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 4 Apr 2022 16:52:18 -0700
Subject: [PATCH 414/531] add lock icon to icon module

---
 client/src/components/Icon/icon.module.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/src/components/Icon/icon.module.css b/client/src/components/Icon/icon.module.css
index 64f115710..6da7757f9 100644
--- a/client/src/components/Icon/icon.module.css
+++ b/client/src/components/Icon/icon.module.css
@@ -136,3 +136,7 @@
 .trash:hover {
   background-image: url('dangerTrash.svg');
 }
+
+.lock {
+  background-image: url('Lock.svg');
+}

From 307b25357e779104ce3f07fd7275df9dfc6a7d61 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 4 Apr 2022 16:52:30 -0700
Subject: [PATCH 415/531] add lock to CssExports type

---
 client/src/components/Icon/icon.module.css.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/components/Icon/icon.module.css.d.ts b/client/src/components/Icon/icon.module.css.d.ts
index 59645227f..dc07bd5ec 100644
--- a/client/src/components/Icon/icon.module.css.d.ts
+++ b/client/src/components/Icon/icon.module.css.d.ts
@@ -14,6 +14,7 @@ interface CssExports {
   'hand': string;
   'icon': string;
   'info': string;
+  'lock': string;
   'merge': string;
   'minus': string;
   'moon': string;

From 912211e633aa0529b02ec027d46a1e5d66ad2ded Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 4 Apr 2022 16:52:43 -0700
Subject: [PATCH 416/531] import css to inspector window

---
 client/src/workspaces/spells/windows/InspectorWindow.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/workspaces/spells/windows/InspectorWindow.tsx b/client/src/workspaces/spells/windows/InspectorWindow.tsx
index 41a33813d..8c6ecb5e3 100644
--- a/client/src/workspaces/spells/windows/InspectorWindow.tsx
+++ b/client/src/workspaces/spells/windows/InspectorWindow.tsx
@@ -8,6 +8,7 @@ import WindowMessage from '../components/WindowMessage'
 import { useInspector } from '@/workspaces/contexts/InspectorProvider'
 import { InspectorData } from '@latitudegames/thoth-core/types'
 import SwitchComponent from '@/components/Switch/Switch'
+import css from '../../../components/Icon/icon.module.css'
 
 const Inspector = props => {
   const { inspectorData, saveInspector } = useInspector()

From dc486fea6a5239af1ded9e2b76edab9abe3cd712 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 4 Apr 2022 16:53:01 -0700
Subject: [PATCH 417/531] add icon to locked overlay

---
 .../spells/windows/InspectorWindow.tsx           | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/client/src/workspaces/spells/windows/InspectorWindow.tsx b/client/src/workspaces/spells/windows/InspectorWindow.tsx
index 8c6ecb5e3..2ed67b802 100644
--- a/client/src/workspaces/spells/windows/InspectorWindow.tsx
+++ b/client/src/workspaces/spells/windows/InspectorWindow.tsx
@@ -123,14 +123,24 @@ const Inspector = props => {
     return (
       <>
         <div
-          className="locked-overlay"
           style={{
-            backgroundColor: `${isLocked ? 'red' : 'none'}`,
+            backgroundColor: `${isLocked ? 'var(--dark-1)' : 'none'}`,
             width: '100%',
             height: '100%',
             position: 'absolute',
             zIndex: 10,
-            opacity: '50%',
+            opacity: '0.7',
+          }}
+        />
+        <div
+          className={`${isLocked && css['lock']} ${isLocked && css['icon']}`}
+          style={{
+            width: '100%',
+            height: '100%',
+            position: 'absolute',
+            opacity: 1,
+            zIndex: 11,
+            backgroundPosition: '0 18vh',
           }}
         />
       </>

From 0181af64cd9e81744566f7b4f54745aeb13ce49b Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Mon, 4 Apr 2022 17:12:45 -0700
Subject: [PATCH 418/531] fix overlay blocking inspector when off

---
 .../spells/windows/InspectorWindow.tsx        | 46 ++++++++++---------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/client/src/workspaces/spells/windows/InspectorWindow.tsx b/client/src/workspaces/spells/windows/InspectorWindow.tsx
index 2ed67b802..f6246de25 100644
--- a/client/src/workspaces/spells/windows/InspectorWindow.tsx
+++ b/client/src/workspaces/spells/windows/InspectorWindow.tsx
@@ -122,27 +122,31 @@ const Inspector = props => {
   const LockedOverlay = ({ isLocked }) => {
     return (
       <>
-        <div
-          style={{
-            backgroundColor: `${isLocked ? 'var(--dark-1)' : 'none'}`,
-            width: '100%',
-            height: '100%',
-            position: 'absolute',
-            zIndex: 10,
-            opacity: '0.7',
-          }}
-        />
-        <div
-          className={`${isLocked && css['lock']} ${isLocked && css['icon']}`}
-          style={{
-            width: '100%',
-            height: '100%',
-            position: 'absolute',
-            opacity: 1,
-            zIndex: 11,
-            backgroundPosition: '0 18vh',
-          }}
-        />
+        {isLocked && (
+          <>
+            <div
+              style={{
+                backgroundColor: 'var(--dark-1)',
+                width: '100%',
+                height: '100%',
+                position: 'absolute',
+                zIndex: 10,
+                opacity: '0.7',
+              }}
+            />
+            <div
+              className={`${css['lock']} ${css['icon']}`}
+              style={{
+                width: '100%',
+                height: '100%',
+                position: 'absolute',
+                opacity: 1,
+                zIndex: 11,
+                backgroundPosition: '0 18vh',
+              }}
+            />
+          </>
+        )}
       </>
     )
   }

From 3be3403d036fa67cb7bae19bac84cab908f276ad Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Tue, 5 Apr 2022 10:52:44 -0700
Subject: [PATCH 419/531] remove editor.on 'process' in task plugin

---
 core/src/plugins/taskPlugin/index.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/core/src/plugins/taskPlugin/index.ts b/core/src/plugins/taskPlugin/index.ts
index 90f427cc2..4c7d5b920 100644
--- a/core/src/plugins/taskPlugin/index.ts
+++ b/core/src/plugins/taskPlugin/index.ts
@@ -87,10 +87,6 @@ function install(editor: ThothEditor) {
 
       // Probably need to reset this when spells change
       editor.tasks.push(task)
-
-      editor.on('process', () => {
-        editor.tasks = []
-      })
     }
   })
 }

From 9c0aab75566821a1c5d5234f8f1a56078e6b8283 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Tue, 5 Apr 2022 10:53:14 -0700
Subject: [PATCH 420/531] wrap task.run in try catch

---
 core/src/components/TriggerIn.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/src/components/TriggerIn.ts b/core/src/components/TriggerIn.ts
index 9b7a2c151..2cc817222 100644
--- a/core/src/components/TriggerIn.ts
+++ b/core/src/components/TriggerIn.ts
@@ -81,7 +81,11 @@ export class TriggerIn extends ThothComponent<void> {
 
   async run(node: ThothNode, data: NodeData) {
     const task = this.nodeTaskMap[node.id]
-    await task.run(data)
+    try {
+      await task.run(data)
+    } catch (err: any) {
+      throw err
+    }
   }
 
   // the builder is used to "assemble" the node component.

From e63cacaf8fbe5e00101b7ba993fdda097abccaf5 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 11:08:46 -0700
Subject: [PATCH 421/531] Update to MUI 5

---
 client/package.json | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/client/package.json b/client/package.json
index d0842bce2..bc1885b67 100644
--- a/client/package.json
+++ b/client/package.json
@@ -21,10 +21,15 @@
   },
   "dependencies": {
     "@callstack/async-storage": "^2.0.3",
+    "@emotion/react": "^11.8.2",
+    "@emotion/styled": "^11.8.1",
     "@latitudegames/thoth-core": "0.0.66",
-    "@material-ui/core": "^4.12.1",
-    "@material-ui/icons": "^4.11.2",
+    "@material-ui/core": "^4.12.4",
+    "@material-ui/icons": "^4.11.3",
     "@monaco-editor/react": "^4.2.1",
+    "@mui/icons-material": "^5.5.1",
+    "@mui/material": "^5.5.3",
+    "@mui/styles": "^5.5.3",
     "@rebass/forms": "^4.0.6",
     "@reduxjs/toolkit": "^1.6.2",
     "@types/jest": "^26.0.24",
@@ -32,6 +37,7 @@
     "@types/react": "^17.0.15",
     "@types/react-dom": "^17.0.9",
     "@types/react-redux": "^7.1.18",
+    "add": "^2.0.6",
     "classnames": "^2.3.1",
     "deep-equal": "^2.0.5",
     "eslint-config-react-app": "^6.0.0",

From 231695e2c1fea626ff7bbc78b7d114f06587e503 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 11:08:53 -0700
Subject: [PATCH 422/531] Update yarn lock

---
 yarn.lock | 370 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 339 insertions(+), 31 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 5b091ca79..e6de99e27 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -263,6 +263,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9"
   integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==
 
+"@babel/helper-plugin-utils@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5"
+  integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==
+
 "@babel/helper-remap-async-to-generator@^7.14.5", "@babel/helper-remap-async-to-generator@^7.15.4":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz#2637c0731e4c90fbf58ac58b50b2b5a192fc970f"
@@ -546,6 +551,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-jsx@^7.12.13":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.7.tgz#50b6571d13f764266a113d77c82b4a6508bbe665"
+  integrity sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
 "@babel/plugin-syntax-jsx@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.14.5.tgz#000e2e25d8673cce49300517a3eda44c263e4201"
@@ -1032,6 +1044,13 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
+"@babel/runtime@^7.17.2":
+  version "7.17.8"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.8.tgz#3e56e4aff81befa55ac3ac6a0967349fd1c5bca2"
+  integrity sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
 "@babel/template@^7.15.4", "@babel/template@^7.3.3":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.15.4.tgz#51898d35dcf3faa670c4ee6afcfd517ee139f194"
@@ -1090,6 +1109,24 @@
   resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz#9283c9ce5b289a3c4f61c12757469e59377f81f3"
   integrity sha512-6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA==
 
+"@emotion/babel-plugin@^11.7.1":
+  version "11.7.2"
+  resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.7.2.tgz#fec75f38a6ab5b304b0601c74e2a5e77c95e5fa0"
+  integrity sha512-6mGSCWi9UzXut/ZAN6lGFu33wGR3SJisNl3c0tvlmb8XChH1b2SUvxvnOh7hvLpqyRdHHU9AiazV3Cwbk5SXKQ==
+  dependencies:
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/plugin-syntax-jsx" "^7.12.13"
+    "@babel/runtime" "^7.13.10"
+    "@emotion/hash" "^0.8.0"
+    "@emotion/memoize" "^0.7.5"
+    "@emotion/serialize" "^1.0.2"
+    babel-plugin-macros "^2.6.1"
+    convert-source-map "^1.5.0"
+    escape-string-regexp "^4.0.0"
+    find-root "^1.1.0"
+    source-map "^0.5.7"
+    stylis "4.0.13"
+
 "@emotion/cache@^10.0.27":
   version "10.0.29"
   resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.29.tgz#87e7e64f412c060102d589fe7c6dc042e6f9d1e0"
@@ -1111,6 +1148,17 @@
     "@emotion/weak-memoize" "^0.2.5"
     stylis "^4.0.3"
 
+"@emotion/cache@^11.7.1":
+  version "11.7.1"
+  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.7.1.tgz#08d080e396a42e0037848214e8aa7bf879065539"
+  integrity sha512-r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A==
+  dependencies:
+    "@emotion/memoize" "^0.7.4"
+    "@emotion/sheet" "^1.1.0"
+    "@emotion/utils" "^1.0.0"
+    "@emotion/weak-memoize" "^0.2.5"
+    stylis "4.0.13"
+
 "@emotion/core@^10.0.0":
   version "10.1.1"
   resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.1.1.tgz#c956c1365f2f2481960064bcb8c4732e5fb612c3"
@@ -1144,12 +1192,19 @@
   dependencies:
     "@emotion/memoize" "0.7.4"
 
+"@emotion/is-prop-valid@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.2.tgz#34ad6e98e871aa6f7a20469b602911b8b11b3a95"
+  integrity sha512-3QnhqeL+WW88YjYbQL5gUIkthuMw7a0NGbZ7wfFVk2kg/CK5w8w5FFa0RzWjyY1+sujN0NWbtSHH6OJmWHtJpQ==
+  dependencies:
+    "@emotion/memoize" "^0.7.4"
+
 "@emotion/memoize@0.7.4":
   version "0.7.4"
   resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb"
   integrity sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==
 
-"@emotion/memoize@^0.7.1", "@emotion/memoize@^0.7.4":
+"@emotion/memoize@^0.7.1", "@emotion/memoize@^0.7.4", "@emotion/memoize@^0.7.5":
   version "0.7.5"
   resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.5.tgz#2c40f81449a4e554e9fc6396910ed4843ec2be50"
   integrity sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ==
@@ -1167,6 +1222,19 @@
     "@emotion/weak-memoize" "^0.2.5"
     hoist-non-react-statics "^3.3.1"
 
+"@emotion/react@^11.8.2":
+  version "11.8.2"
+  resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.8.2.tgz#e51f5e6372e22e82780836c9288da19af4b51e70"
+  integrity sha512-+1bcHBaNJv5nkIIgnGKVsie3otS0wF9f1T1hteF3WeVvMNQEtfZ4YyFpnphGoot3ilU/wWMgP2SgIDuHLE/wAA==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@emotion/babel-plugin" "^11.7.1"
+    "@emotion/cache" "^11.7.1"
+    "@emotion/serialize" "^1.0.2"
+    "@emotion/utils" "^1.1.0"
+    "@emotion/weak-memoize" "^0.2.5"
+    hoist-non-react-statics "^3.3.1"
+
 "@emotion/serialize@^0.11.15", "@emotion/serialize@^0.11.16":
   version "0.11.16"
   resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.11.16.tgz#dee05f9e96ad2fb25a5206b6d759b2d1ed3379ad"
@@ -1199,6 +1267,11 @@
   resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.0.2.tgz#1d9ffde531714ba28e62dac6a996a8b1089719d0"
   integrity sha512-QQPB1B70JEVUHuNtzjHftMGv6eC3Y9wqavyarj4x4lg47RACkeSfNo5pxIOKizwS9AEFLohsqoaxGQj4p0vSIw==
 
+"@emotion/sheet@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.0.tgz#56d99c41f0a1cda2726a05aa6a20afd4c63e58d2"
+  integrity sha512-u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g==
+
 "@emotion/styled-base@^10.0.27":
   version "10.0.31"
   resolved "https://registry.yarnpkg.com/@emotion/styled-base/-/styled-base-10.0.31.tgz#940957ee0aa15c6974adc7d494ff19765a2f742a"
@@ -1217,6 +1290,17 @@
     "@emotion/styled-base" "^10.0.27"
     babel-plugin-emotion "^10.0.27"
 
+"@emotion/styled@^11.8.1":
+  version "11.8.1"
+  resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-11.8.1.tgz#856f6f63aceef0eb783985fa2322e2bf66d04e17"
+  integrity sha512-OghEVAYBZMpEquHZwuelXcRjRJQOVayvbmNR0zr174NHdmMgrNkLC6TljKC5h9lZLkN5WGrdUcrKlOJ4phhoTQ==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@emotion/babel-plugin" "^11.7.1"
+    "@emotion/is-prop-valid" "^1.1.2"
+    "@emotion/serialize" "^1.0.2"
+    "@emotion/utils" "^1.1.0"
+
 "@emotion/stylis@0.8.5":
   version "0.8.5"
   resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.5.tgz#deacb389bd6ee77d1e7fcaccce9e16c5c7e78e04"
@@ -1237,6 +1321,11 @@
   resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.0.0.tgz#abe06a83160b10570816c913990245813a2fd6af"
   integrity sha512-mQC2b3XLDs6QCW+pDQDiyO/EdGZYOygE8s5N5rrzjSI4M3IejPE/JPndCBwRT9z982aqQNi6beWs1UeayrQxxA==
 
+"@emotion/utils@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.1.0.tgz#86b0b297f3f1a0f2bdb08eeac9a2f49afd40d0cf"
+  integrity sha512-iRLa/Y4Rs5H/f2nimczYmS5kFJEbpiVvgN3XVfZ022IYhuNA1IRSHEizcof88LtCTXtl9S2Cxt32KgaXEu72JQ==
+
 "@emotion/weak-memoize@0.2.5", "@emotion/weak-memoize@^0.2.5":
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46"
@@ -2140,16 +2229,16 @@
     npmlog "^4.1.2"
     write-file-atomic "^3.0.3"
 
-"@material-ui/core@^4.12.1":
-  version "4.12.3"
-  resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.12.3.tgz#80d665caf0f1f034e52355c5450c0e38b099d3ca"
-  integrity sha512-sdpgI/PL56QVsEJldwEe4FFaFTLUqN+rd7sSZiRCdx2E/C7z5yK0y/khAWVBH24tXwto7I1hCzNWfJGZIYJKnw==
+"@material-ui/core@^4.12.4":
+  version "4.12.4"
+  resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.12.4.tgz#4ac17488e8fcaf55eb6a7f5efb2a131e10138a73"
+  integrity sha512-tr7xekNlM9LjA6pagJmL8QCgZXaubWUwkJnoYcMKd4gw/t4XiyvnTkjdGrUVicyB2BsdaAv1tvow45bPM4sSwQ==
   dependencies:
     "@babel/runtime" "^7.4.4"
-    "@material-ui/styles" "^4.11.4"
-    "@material-ui/system" "^4.12.1"
+    "@material-ui/styles" "^4.11.5"
+    "@material-ui/system" "^4.12.2"
     "@material-ui/types" "5.1.0"
-    "@material-ui/utils" "^4.11.2"
+    "@material-ui/utils" "^4.11.3"
     "@types/react-transition-group" "^4.2.0"
     clsx "^1.0.4"
     hoist-non-react-statics "^3.3.2"
@@ -2158,22 +2247,22 @@
     react-is "^16.8.0 || ^17.0.0"
     react-transition-group "^4.4.0"
 
-"@material-ui/icons@^4.11.2":
-  version "4.11.2"
-  resolved "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.11.2.tgz#b3a7353266519cd743b6461ae9fdfcb1b25eb4c5"
-  integrity sha512-fQNsKX2TxBmqIGJCSi3tGTO/gZ+eJgWmMJkgDiOfyNaunNaxcklJQFaFogYcFl0qFuaEz1qaXYXboa/bUXVSOQ==
+"@material-ui/icons@^4.11.3":
+  version "4.11.3"
+  resolved "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.11.3.tgz#b0693709f9b161ce9ccde276a770d968484ecff1"
+  integrity sha512-IKHlyx6LDh8n19vzwH5RtHIOHl9Tu90aAAxcbWME6kp4dmvODM3UvOHJeMIDzUbd4muuJKHmlNoBN+mDY4XkBA==
   dependencies:
     "@babel/runtime" "^7.4.4"
 
-"@material-ui/styles@^4.11.4":
-  version "4.11.4"
-  resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.11.4.tgz#eb9dfccfcc2d208243d986457dff025497afa00d"
-  integrity sha512-KNTIZcnj/zprG5LW0Sao7zw+yG3O35pviHzejMdcSGCdWbiO8qzRgOYL8JAxAsWBKOKYwVZxXtHWaB5T2Kvxew==
+"@material-ui/styles@^4.11.5":
+  version "4.11.5"
+  resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.11.5.tgz#19f84457df3aafd956ac863dbe156b1d88e2bbfb"
+  integrity sha512-o/41ot5JJiUsIETME9wVLAJrmIWL3j0R0Bj2kCOLbSfqEkKf0fmaPt+5vtblUh5eXr2S+J/8J3DaCb10+CzPGA==
   dependencies:
     "@babel/runtime" "^7.4.4"
     "@emotion/hash" "^0.8.0"
     "@material-ui/types" "5.1.0"
-    "@material-ui/utils" "^4.11.2"
+    "@material-ui/utils" "^4.11.3"
     clsx "^1.0.4"
     csstype "^2.5.2"
     hoist-non-react-statics "^3.3.2"
@@ -2187,13 +2276,13 @@
     jss-plugin-vendor-prefixer "^10.5.1"
     prop-types "^15.7.2"
 
-"@material-ui/system@^4.12.1":
-  version "4.12.1"
-  resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.12.1.tgz#2dd96c243f8c0a331b2bb6d46efd7771a399707c"
-  integrity sha512-lUdzs4q9kEXZGhbN7BptyiS1rLNHe6kG9o8Y307HCvF4sQxbCgpL2qi+gUk+yI8a2DNk48gISEQxoxpgph0xIw==
+"@material-ui/system@^4.12.2":
+  version "4.12.2"
+  resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.12.2.tgz#f5c389adf3fce4146edd489bf4082d461d86aa8b"
+  integrity sha512-6CSKu2MtmiJgcCGf6nBQpM8fLkuB9F55EKfbdTC80NND5wpTmKzwdhLYLH3zL4cLlK0gVaaltW7/wMuyTnN0Lw==
   dependencies:
     "@babel/runtime" "^7.4.4"
-    "@material-ui/utils" "^4.11.2"
+    "@material-ui/utils" "^4.11.3"
     csstype "^2.5.2"
     prop-types "^15.7.2"
 
@@ -2202,10 +2291,10 @@
   resolved "https://registry.yarnpkg.com/@material-ui/types/-/types-5.1.0.tgz#efa1c7a0b0eaa4c7c87ac0390445f0f88b0d88f2"
   integrity sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A==
 
-"@material-ui/utils@^4.11.2":
-  version "4.11.2"
-  resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.11.2.tgz#f1aefa7e7dff2ebcb97d31de51aecab1bb57540a"
-  integrity sha512-Uul8w38u+PICe2Fg2pDKCaIG7kOyhowZ9vjiC1FsVwPABTW8vPPKfF6OvxRq3IiBaI1faOJmgdvMG7rMJARBhA==
+"@material-ui/utils@^4.11.3":
+  version "4.11.3"
+  resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.11.3.tgz#232bd86c4ea81dab714f21edad70b7fdf0253942"
+  integrity sha512-ZuQPV4rBK/V1j2dIkSSEcH5uT6AaHuKWFfotADHsC0wVL1NLd2WkFCm4ZZbX33iO4ydl6V0GPngKm8HZQ2oujg==
   dependencies:
     "@babel/runtime" "^7.4.4"
     prop-types "^15.7.2"
@@ -2226,6 +2315,116 @@
     "@monaco-editor/loader" "^1.1.1"
     prop-types "^15.7.2"
 
+"@mui/base@5.0.0-alpha.74":
+  version "5.0.0-alpha.74"
+  resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.74.tgz#15509242e7911446d5957375b1b18cbb72b3a750"
+  integrity sha512-pw3T1xNXpW8pLo9+BvtyazZb0CSjNJsjbzznlbV/aNkBfjNPXQVI3X1NDm3WSI8y6M96WDIVO7XrHAohOwALSQ==
+  dependencies:
+    "@babel/runtime" "^7.17.2"
+    "@emotion/is-prop-valid" "^1.1.2"
+    "@mui/types" "^7.1.3"
+    "@mui/utils" "^5.5.3"
+    "@popperjs/core" "^2.11.4"
+    clsx "^1.1.1"
+    prop-types "^15.7.2"
+    react-is "^17.0.2"
+
+"@mui/icons-material@^5.5.1":
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.5.1.tgz#848a57972617411370775980cbc6990588d4aafb"
+  integrity sha512-40f68p5+Yhq3dCn3QYHqQt5RETPyR3AkDw+fma8PtcjqvZ+d+jF84kFmT6NqwA3he7TlwluEtkyAmPzUE4uPdA==
+  dependencies:
+    "@babel/runtime" "^7.17.2"
+
+"@mui/material@^5.5.3":
+  version "5.5.3"
+  resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.5.3.tgz#411e53a69da3f9d6664e99f1bdcdaf2760540fdc"
+  integrity sha512-eADa3kUYbbr1jNjcufn0a7HeU8cSo0agbrkj720hodxVFNIfzq7a2e58Z+PaZqll55kMGBvlYJ7rTcXU399x5A==
+  dependencies:
+    "@babel/runtime" "^7.17.2"
+    "@mui/base" "5.0.0-alpha.74"
+    "@mui/system" "^5.5.3"
+    "@mui/types" "^7.1.3"
+    "@mui/utils" "^5.5.3"
+    "@types/react-transition-group" "^4.4.4"
+    clsx "^1.1.1"
+    csstype "^3.0.11"
+    hoist-non-react-statics "^3.3.2"
+    prop-types "^15.7.2"
+    react-is "^17.0.2"
+    react-transition-group "^4.4.2"
+
+"@mui/private-theming@^5.5.3":
+  version "5.5.3"
+  resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.5.3.tgz#c232a39dd3c268fdef7e92ccc40d51bda9eec3ab"
+  integrity sha512-Wf7NurY7lk8SBWelSBY2U02zxLt1773JpIcXTHuEC9/GZdQA4CXCJGl2cVQzheKhee5rZ+8JwGulrRiVl1m+4A==
+  dependencies:
+    "@babel/runtime" "^7.17.2"
+    "@mui/utils" "^5.5.3"
+    prop-types "^15.7.2"
+
+"@mui/styled-engine@^5.5.2":
+  version "5.5.2"
+  resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.5.2.tgz#1f92dd27d76f0b7df7aa52c7c7a710e59b2275a6"
+  integrity sha512-jkz5AHHbA43akBo5L3y1X1/X0f+RvXvCp3eXKt+iOf3qnKSAausbtlVz7gBbC4xIWDnP1Jb/6T+t/0/7gObRYA==
+  dependencies:
+    "@babel/runtime" "^7.17.2"
+    "@emotion/cache" "^11.7.1"
+    prop-types "^15.7.2"
+
+"@mui/styles@^5.5.3":
+  version "5.5.3"
+  resolved "https://registry.yarnpkg.com/@mui/styles/-/styles-5.5.3.tgz#e462adec9a24ee4f6982394c172f20221bef30d7"
+  integrity sha512-jxiXgyzYXDh5pUdfKvs5ZTJqQRNFUgbG9Q/hOPh0nHrKYmlrikt2Z3b9Rjrkp2QCh9R3kuy8LHlv/u+QjnnIqg==
+  dependencies:
+    "@babel/runtime" "^7.17.2"
+    "@emotion/hash" "^0.8.0"
+    "@mui/private-theming" "^5.5.3"
+    "@mui/types" "^7.1.3"
+    "@mui/utils" "^5.5.3"
+    clsx "^1.1.1"
+    csstype "^3.0.11"
+    hoist-non-react-statics "^3.3.2"
+    jss "^10.8.2"
+    jss-plugin-camel-case "^10.8.2"
+    jss-plugin-default-unit "^10.8.2"
+    jss-plugin-global "^10.8.2"
+    jss-plugin-nested "^10.8.2"
+    jss-plugin-props-sort "^10.8.2"
+    jss-plugin-rule-value-function "^10.8.2"
+    jss-plugin-vendor-prefixer "^10.8.2"
+    prop-types "^15.7.2"
+
+"@mui/system@^5.5.3":
+  version "5.5.3"
+  resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.5.3.tgz#c78d4c16009430389ffd3495d694945422d72ca5"
+  integrity sha512-J9JcySJuEqfEoP334K/2gEWm2vOx73Uqjii3qlFVhWRBOAJ0Pjyk0sN5W/eVRbwhUm95DNgh2V5s8dRK3vzyVw==
+  dependencies:
+    "@babel/runtime" "^7.17.2"
+    "@mui/private-theming" "^5.5.3"
+    "@mui/styled-engine" "^5.5.2"
+    "@mui/types" "^7.1.3"
+    "@mui/utils" "^5.5.3"
+    clsx "^1.1.1"
+    csstype "^3.0.11"
+    prop-types "^15.7.2"
+
+"@mui/types@^7.1.3":
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.1.3.tgz#d7636f3046110bcccc63e6acfd100e2ad9ca712a"
+  integrity sha512-DDF0UhMBo4Uezlk+6QxrlDbchF79XG6Zs0zIewlR4c0Dt6GKVFfUtzPtHCH1tTbcSlq/L2bGEdiaoHBJ9Y1gSA==
+
+"@mui/utils@^5.5.3":
+  version "5.5.3"
+  resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.5.3.tgz#f6e1f10c0e8f4d0bf750588c2c3a96ad819c5b65"
+  integrity sha512-t627eVRpl3SlxVya0cIVNs8jPl4KCEiGaTSWY9iKKTcMNaeDbuRML+zv/CFHDPr1zFv+FjJSP02ySB+tZ8xIag==
+  dependencies:
+    "@babel/runtime" "^7.17.2"
+    "@types/prop-types" "^15.7.4"
+    "@types/react-is" "^16.7.1 || ^17.0.0"
+    prop-types "^15.7.2"
+    react-is "^17.0.2"
+
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -2456,6 +2655,11 @@
   resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.20.tgz#111b5db0f501aa89b05076fa31f0ea0e0c292cd3"
   integrity sha512-88p7+M0QGxKpmnkfXjS4V26AnoC/eiqZutE8GLdaI5X12NY75bXSdTY9NkmYb2Xyk1O+MmkuO6Frmsj84V6I8Q==
 
+"@popperjs/core@^2.11.4":
+  version "2.11.5"
+  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.5.tgz#db5a11bf66bdab39569719555b0f76e138d7bd64"
+  integrity sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==
+
 "@rebass/forms@^4.0.6":
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/@rebass/forms/-/forms-4.0.6.tgz#19a3af64f855baa65dec65aecadda5cd95a09dd7"
@@ -2896,7 +3100,7 @@
   resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.1.tgz#e1303048d5389563e130f5bdd89d37a99acb75eb"
   integrity sha512-Fo79ojj3vdEZOHg3wR9ksAMRz4P3S5fDB5e/YWZiFnyFQI1WY2Vftu9XoXVVtJfxB7Bpce/QTqWSSntkz2Znrw==
 
-"@types/prop-types@*":
+"@types/prop-types@*", "@types/prop-types@^15.7.4":
   version "15.7.4"
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11"
   integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==
@@ -2923,6 +3127,13 @@
   dependencies:
     "@types/react" "*"
 
+"@types/react-is@^16.7.1 || ^17.0.0":
+  version "17.0.3"
+  resolved "https://registry.yarnpkg.com/@types/react-is/-/react-is-17.0.3.tgz#2d855ba575f2fc8d17ef9861f084acc4b90a137a"
+  integrity sha512-aBTIWg1emtu95bLTLx0cpkxwGW3ueZv71nE2YFBpL8k/z5czEW8yYpOo8Dp+UUAFAtKwNaOsh/ioSeQnWlZcfw==
+  dependencies:
+    "@types/react" "*"
+
 "@types/react-redux@^7.1.16", "@types/react-redux@^7.1.18":
   version "7.1.18"
   resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.18.tgz#2bf8fd56ebaae679a90ebffe48ff73717c438e04"
@@ -2940,6 +3151,13 @@
   dependencies:
     "@types/react" "*"
 
+"@types/react-transition-group@^4.4.4":
+  version "4.4.4"
+  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.4.tgz#acd4cceaa2be6b757db61ed7b432e103242d163e"
+  integrity sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug==
+  dependencies:
+    "@types/react" "*"
+
 "@types/react@*", "@types/react@^17.0.15":
   version "17.0.24"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.24.tgz#7e1b3f78d0fc53782543f9bce6d949959a5880bd"
@@ -3505,6 +3723,11 @@ add-stream@^1.0.0:
   resolved "https://registry.yarnpkg.com/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa"
   integrity sha1-anmQQ3ynNtXhKI25K9MmbV9csqo=
 
+add@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/add/-/add-2.0.6.tgz#248f0a9f6e5a528ef2295dbeec30532130ae2235"
+  integrity sha1-JI8Kn25aUo7yKV2+7DBTITCuIjU=
+
 agent-base@6, agent-base@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
@@ -4019,7 +4242,7 @@ babel-plugin-jest-hoist@^27.2.0:
     "@types/babel__core" "^7.0.0"
     "@types/babel__traverse" "^7.0.6"
 
-babel-plugin-macros@^2.0.0:
+babel-plugin-macros@^2.0.0, babel-plugin-macros@^2.6.1:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138"
   integrity sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==
@@ -4834,7 +5057,7 @@ clone@^1.0.2:
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
   integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
 
-clsx@^1.0.4, clsx@^1.1.0:
+clsx@^1.0.4, clsx@^1.1.0, clsx@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188"
   integrity sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==
@@ -5496,6 +5719,11 @@ csstype@^2.5.2, csstype@^2.5.7:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.18.tgz#980a8b53085f34af313410af064f2bd241784218"
   integrity sha512-RSU6Hyeg14am3Ah4VZEmeX8H7kLwEEirXe6aU2IPfKNvhXwTflK5HQRDNI0ypQXoqmm+QPyG2IaPuQE5zMwSIQ==
 
+csstype@^3.0.11:
+  version "3.0.11"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz#d66700c5eacfac1940deb4e3ee5642792d85cd33"
+  integrity sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==
+
 csstype@^3.0.2:
   version "3.0.9"
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.9.tgz#6410af31b26bd0520933d02cbc64fce9ce3fbf0b"
@@ -6318,6 +6546,11 @@ escape-string-regexp@^2.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
   integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
 
+escape-string-regexp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
 escodegen@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd"
@@ -9030,6 +9263,15 @@ jss-plugin-camel-case@^10.5.1:
     hyphenate-style-name "^1.0.3"
     jss "10.8.0"
 
+jss-plugin-camel-case@^10.8.2:
+  version "10.9.0"
+  resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.9.0.tgz#4921b568b38d893f39736ee8c4c5f1c64670aaf7"
+  integrity sha512-UH6uPpnDk413/r/2Olmw4+y54yEF2lRIV8XIZyuYpgPYTITLlPOsq6XB9qeqv+75SQSg3KLocq5jUBXW8qWWww==
+  dependencies:
+    "@babel/runtime" "^7.3.1"
+    hyphenate-style-name "^1.0.3"
+    jss "10.9.0"
+
 jss-plugin-default-unit@^10.5.1:
   version "10.8.0"
   resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.8.0.tgz#98db5962e62abbf43f1cc111e62cb70ffb09db59"
@@ -9038,6 +9280,14 @@ jss-plugin-default-unit@^10.5.1:
     "@babel/runtime" "^7.3.1"
     jss "10.8.0"
 
+jss-plugin-default-unit@^10.8.2:
+  version "10.9.0"
+  resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.9.0.tgz#bb23a48f075bc0ce852b4b4d3f7582bc002df991"
+  integrity sha512-7Ju4Q9wJ/MZPsxfu4T84mzdn7pLHWeqoGd/D8O3eDNNJ93Xc8PxnLmV8s8ZPNRYkLdxZqKtm1nPQ0BM4JRlq2w==
+  dependencies:
+    "@babel/runtime" "^7.3.1"
+    jss "10.9.0"
+
 jss-plugin-global@^10.5.1:
   version "10.8.0"
   resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.8.0.tgz#0c2b0c056087f5846d600f3332eeb7a1a8b9c9f2"
@@ -9046,6 +9296,14 @@ jss-plugin-global@^10.5.1:
     "@babel/runtime" "^7.3.1"
     jss "10.8.0"
 
+jss-plugin-global@^10.8.2:
+  version "10.9.0"
+  resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.9.0.tgz#fc07a0086ac97aca174e37edb480b69277f3931f"
+  integrity sha512-4G8PHNJ0x6nwAFsEzcuVDiBlyMsj2y3VjmFAx/uHk/R/gzJV+yRHICjT4MKGGu1cJq2hfowFWCyrr/Gg37FbgQ==
+  dependencies:
+    "@babel/runtime" "^7.3.1"
+    jss "10.9.0"
+
 jss-plugin-nested@^10.5.1:
   version "10.8.0"
   resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.8.0.tgz#7ef9a815e9c9fbede41a8f52ce75cffb4c3b86d5"
@@ -9055,6 +9313,15 @@ jss-plugin-nested@^10.5.1:
     jss "10.8.0"
     tiny-warning "^1.0.2"
 
+jss-plugin-nested@^10.8.2:
+  version "10.9.0"
+  resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.9.0.tgz#cc1c7d63ad542c3ccc6e2c66c8328c6b6b00f4b3"
+  integrity sha512-2UJnDrfCZpMYcpPYR16oZB7VAC6b/1QLsRiAutOt7wJaaqwCBvNsosLEu/fUyKNQNGdvg2PPJFDO5AX7dwxtoA==
+  dependencies:
+    "@babel/runtime" "^7.3.1"
+    jss "10.9.0"
+    tiny-warning "^1.0.2"
+
 jss-plugin-props-sort@^10.5.1:
   version "10.8.0"
   resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.8.0.tgz#2a83e8ca80d72828495bad57b485f7d55a33543b"
@@ -9063,6 +9330,14 @@ jss-plugin-props-sort@^10.5.1:
     "@babel/runtime" "^7.3.1"
     jss "10.8.0"
 
+jss-plugin-props-sort@^10.8.2:
+  version "10.9.0"
+  resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.9.0.tgz#30e9567ef9479043feb6e5e59db09b4de687c47d"
+  integrity sha512-7A76HI8bzwqrsMOJTWKx/uD5v+U8piLnp5bvru7g/3ZEQOu1+PjHvv7bFdNO3DwNPC9oM0a//KwIJsIcDCjDzw==
+  dependencies:
+    "@babel/runtime" "^7.3.1"
+    jss "10.9.0"
+
 jss-plugin-rule-value-function@^10.5.1:
   version "10.8.0"
   resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.8.0.tgz#e011ed180789229e7ea8f75c222d34810bcab520"
@@ -9072,6 +9347,15 @@ jss-plugin-rule-value-function@^10.5.1:
     jss "10.8.0"
     tiny-warning "^1.0.2"
 
+jss-plugin-rule-value-function@^10.8.2:
+  version "10.9.0"
+  resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.9.0.tgz#379fd2732c0746fe45168011fe25544c1a295d67"
+  integrity sha512-IHJv6YrEf8pRzkY207cPmdbBstBaE+z8pazhPShfz0tZSDtRdQua5jjg6NMz3IbTasVx9FdnmptxPqSWL5tyJg==
+  dependencies:
+    "@babel/runtime" "^7.3.1"
+    jss "10.9.0"
+    tiny-warning "^1.0.2"
+
 jss-plugin-vendor-prefixer@^10.5.1:
   version "10.8.0"
   resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.8.0.tgz#024b6d77be50b68e5dfca2c75f68091d8b722d61"
@@ -9081,6 +9365,15 @@ jss-plugin-vendor-prefixer@^10.5.1:
     css-vendor "^2.0.8"
     jss "10.8.0"
 
+jss-plugin-vendor-prefixer@^10.8.2:
+  version "10.9.0"
+  resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.9.0.tgz#aa9df98abfb3f75f7ed59a3ec50a5452461a206a"
+  integrity sha512-MbvsaXP7iiVdYVSEoi+blrW+AYnTDvHTW6I6zqi7JcwXdc6I9Kbm234nEblayhF38EftoenbM+5218pidmC5gA==
+  dependencies:
+    "@babel/runtime" "^7.3.1"
+    css-vendor "^2.0.8"
+    jss "10.9.0"
+
 jss@10.8.0, jss@^10.5.1:
   version "10.8.0"
   resolved "https://registry.yarnpkg.com/jss/-/jss-10.8.0.tgz#5063ee73aabd9f228ea3849df7962f0d2e213a42"
@@ -9091,6 +9384,16 @@ jss@10.8.0, jss@^10.5.1:
     is-in-browser "^1.1.3"
     tiny-warning "^1.0.2"
 
+jss@10.9.0, jss@^10.8.2:
+  version "10.9.0"
+  resolved "https://registry.yarnpkg.com/jss/-/jss-10.9.0.tgz#7583ee2cdc904a83c872ba695d1baab4b59c141b"
+  integrity sha512-YpzpreB6kUunQBbrlArlsMpXYyndt9JATbt95tajx0t4MTJJcCJdd4hdNpHmOIDiUJrF/oX5wtVFrS3uofWfGw==
+  dependencies:
+    "@babel/runtime" "^7.3.1"
+    csstype "^3.0.2"
+    is-in-browser "^1.1.3"
+    tiny-warning "^1.0.2"
+
 keyv@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
@@ -11461,7 +11764,7 @@ react-is@^16.12.0, react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.1, react-
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
-"react-is@^16.8.0 || ^17.0.0", react-is@^17.0.1:
+"react-is@^16.8.0 || ^17.0.0", react-is@^17.0.1, react-is@^17.0.2:
   version "17.0.2"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
@@ -11526,7 +11829,7 @@ react-test-renderer@^16.0.0-0:
     react-is "^16.8.6"
     scheduler "^0.19.1"
 
-react-transition-group@^4.3.0, react-transition-group@^4.4.0:
+react-transition-group@^4.3.0, react-transition-group@^4.4.0, react-transition-group@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470"
   integrity sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==
@@ -12956,6 +13259,11 @@ styled-system@^5.0.0, styled-system@^5.1.5:
     "@styled-system/variant" "^5.1.5"
     object-assign "^4.1.1"
 
+stylis@4.0.13:
+  version "4.0.13"
+  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz#f5db332e376d13cc84ecfe5dace9a2a51d954c91"
+  integrity sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag==
+
 stylis@^4.0.3:
   version "4.0.10"
   resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.10.tgz#446512d1097197ab3f02fb3c258358c3f7a14240"

From 1e15f89e153873be8946e6e74fae03197dc4c461 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 11:09:06 -0700
Subject: [PATCH 423/531] Migrate theme provider to v5

---
 client/src/contexts/AppProviders.tsx | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/client/src/contexts/AppProviders.tsx b/client/src/contexts/AppProviders.tsx
index aa1ba3b6f..74891f2a4 100644
--- a/client/src/contexts/AppProviders.tsx
+++ b/client/src/contexts/AppProviders.tsx
@@ -1,15 +1,27 @@
-import { createTheme, ThemeProvider } from '@material-ui/core/styles'
+import {
+  createTheme,
+  ThemeProvider,
+  Theme,
+  adaptV4Theme,
+} from '@mui/material/styles'
 
 import AuthProvider from './AuthProvider'
 import PubSubProvider from './PubSubProvider'
 import SharedbProvider from './SharedbProvider'
 import ToastProvider from './ToastProvider'
 
-const darkTheme = createTheme({
-  palette: {
-    type: 'dark',
-  },
-})
+declare module '@mui/styles/defaultTheme' {
+  // eslint-disable-next-line @typescript-eslint/no-empty-interface
+  interface DefaultTheme extends Theme {}
+}
+
+const darkTheme = createTheme(
+  adaptV4Theme({
+    palette: {
+      mode: 'dark',
+    },
+  })
+)
 
 const providers = [
   PubSubProvider,

From b0748e7d02a98219f62ef6bbcfcb88e7152db491 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Tue, 5 Apr 2022 11:20:44 -0700
Subject: [PATCH 424/531] remove lock toolbar

---
 client/src/components/Window/Window.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/client/src/components/Window/Window.tsx b/client/src/components/Window/Window.tsx
index e7d0d109b..2f4693c70 100644
--- a/client/src/components/Window/Window.tsx
+++ b/client/src/components/Window/Window.tsx
@@ -41,7 +41,6 @@ const Window = (props: Props) => {
     darker = false,
     grid = false,
     toolbar = false,
-    lock = false,
     scrollToBottom = false,
   } = props
 
@@ -57,7 +56,6 @@ const Window = (props: Props) => {
       `}
     >
       {toolbar && <WindowToolbar>{props.toolbar}</WindowToolbar>}
-      {lock && <WindowToolbar>{props.lock}</WindowToolbar>}
       <WindowLayout scrollToBottom={scrollToBottom}>
         {props.children}
       </WindowLayout>

From 1cfd47bd56735453a443cd9d1d34db278450ab8c Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Tue, 5 Apr 2022 11:21:27 -0700
Subject: [PATCH 425/531] move lock into toolbar

---
 .../spells/windows/InspectorWindow.tsx        | 23 +++++--------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/client/src/workspaces/spells/windows/InspectorWindow.tsx b/client/src/workspaces/spells/windows/InspectorWindow.tsx
index f6246de25..3d881f68d 100644
--- a/client/src/workspaces/spells/windows/InspectorWindow.tsx
+++ b/client/src/workspaces/spells/windows/InspectorWindow.tsx
@@ -75,6 +75,12 @@ const Inspector = props => {
         />
         {inspectorData?.name}
       </div>
+      <div style={{ display: 'flex', alignItems: 'center' }}>Node Lock</div>
+      <SwitchComponent
+        label={inspectorData?.data.nodeLocked ? 'Locked' : 'Unlocked'}
+        checked={inspectorData?.data.nodeLocked ? true : false}
+        onChange={onLock}
+      />
       {/* I would like to make an "icon button" for this instead of "Help." Leaving it as help just for the function for now.*/}
       {inspectorData?.info && (
         <button
@@ -92,23 +98,6 @@ const Inspector = props => {
     </>
   )
 
-  const lock = (
-    <>
-      <div style={{ flex: 1, display: 'flex', alignItems: 'center' }}>
-        <Icon
-          name={componentCategories[inspectorData?.category || 0]}
-          style={{ marginRight: 'var(--extraSmall)' }}
-        />
-        Node Lock
-      </div>
-      <SwitchComponent
-        label={inspectorData?.data.nodeLocked ? 'Locked' : 'Unlocked'}
-        checked={inspectorData?.data.nodeLocked ? true : false}
-        onChange={onLock}
-      />
-    </>
-  )
-
   const DeprecationMessage = (inspectorData: InspectorData) => {
     if (!inspectorData.deprecated) return <></>
     return (

From 540ed23d255e779912e8f3c9a3d24579355c851d Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Tue, 5 Apr 2022 11:21:44 -0700
Subject: [PATCH 426/531] remove lock prop in Window

---
 client/src/workspaces/spells/windows/InspectorWindow.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/workspaces/spells/windows/InspectorWindow.tsx b/client/src/workspaces/spells/windows/InspectorWindow.tsx
index 3d881f68d..a1279e2a0 100644
--- a/client/src/workspaces/spells/windows/InspectorWindow.tsx
+++ b/client/src/workspaces/spells/windows/InspectorWindow.tsx
@@ -143,7 +143,7 @@ const Inspector = props => {
   if (!inspectorData) return <WindowMessage />
 
   return (
-    <Window toolbar={toolbar} lock={lock} darker outline borderless>
+    <Window toolbar={toolbar} darker outline borderless>
       {DeprecationMessage(inspectorData)}
       <LockedOverlay isLocked={inspectorData?.data.nodeLocked} />
       <DataControls

From fb9fbd2863e8fdf97d36509375eb5c4a752b1d93 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 11:52:20 -0700
Subject: [PATCH 427/531] Migrate accordion to MUI 5

---
 client/src/components/Accordion.tsx | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/client/src/components/Accordion.tsx b/client/src/components/Accordion.tsx
index 783e94c7d..ebd4cd10c 100644
--- a/client/src/components/Accordion.tsx
+++ b/client/src/components/Accordion.tsx
@@ -1,9 +1,9 @@
-import Accordion from '@material-ui/core/Accordion'
-import AccordionDetails from '@material-ui/core/AccordionDetails'
-import AccordionSummary from '@material-ui/core/AccordionSummary'
-import { makeStyles } from '@material-ui/core/styles'
-import Typography from '@material-ui/core/Typography'
-import ExpandMoreIcon from '@material-ui/icons/ExpandMore'
+import Accordion from '@mui/material/Accordion'
+import AccordionDetails from '@mui/material/AccordionDetails'
+import AccordionSummary from '@mui/material/AccordionSummary'
+import makeStyles from '@mui/styles/makeStyles'
+import Typography from '@mui/material/Typography'
+import ExpandMoreIcon from '@mui/icons-material/ExpandMore'
 
 import css from './accordion.module.css'
 import Icon from './Icon/Icon'
@@ -12,7 +12,7 @@ import './accordion-overrides.css'
 const useStyles = makeStyles(theme => ({
   root: {
     width: '100%',
-    backgroundColor: 'var(--dark-3)',
+    backgroundColor: 'var(--dark-3) !important',
     boxShadow: 'none',
     padding: '0',
   },
@@ -59,7 +59,8 @@ export const SimpleAccordion = ({ setExpanded = x => {}, ...props }) => {
           className={classes.accordionSummary}
           classes={{
             root: classes.root,
-            expandIcon: classes.expandIcon,
+            expandIconWrapper: classes.expandIcon,
+            // content: classes.root,
             // accordionSummaryContent: classes.summaryContent
           }}
           id="panel1a-header"

From c5bb36e5ff4b3a48d55552b1ef79adc5344caf4c Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 11:52:54 -0700
Subject: [PATCH 428/531] Migrate deploy modal to MUI 5

---
 client/src/components/Modals/DeployModal.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/Modals/DeployModal.jsx b/client/src/components/Modals/DeployModal.jsx
index b35be1e50..e4547a1b1 100644
--- a/client/src/components/Modals/DeployModal.jsx
+++ b/client/src/components/Modals/DeployModal.jsx
@@ -1,4 +1,4 @@
-import { SettingsRemoteSharp } from '@material-ui/icons'
+import { SettingsRemoteSharp } from '@mui/icons-material'
 import { useState } from 'react'
 import { useModal } from '../../contexts/ModalProvider'
 import Input from '../Input/Input'

From 8f89b29ea92d5047ea9611fa33290cde261c2a8b Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 11:53:26 -0700
Subject: [PATCH 429/531] Migrate switch to MUI 5

---
 client/src/components/Switch/Switch.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/components/Switch/Switch.tsx b/client/src/components/Switch/Switch.tsx
index 478035c03..71622a1d9 100644
--- a/client/src/components/Switch/Switch.tsx
+++ b/client/src/components/Switch/Switch.tsx
@@ -1,5 +1,5 @@
-import Switch from '@material-ui/core/Switch'
-import FormControlLabel from '@material-ui/core/FormControlLabel'
+import Switch from '@mui/material/Switch'
+import FormControlLabel from '@mui/material/FormControlLabel'
 
 const SwitchComponent = ({ label: _label, checked, onChange }) => {
   const label = { inputProps: { 'aria-label': _label } }

From aff7e1622296a61d9a4302ecc664a17bdd630bad Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 11:53:42 -0700
Subject: [PATCH 430/531] Migrate toast provider to v5

---
 client/src/contexts/ToastProvider.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/contexts/ToastProvider.jsx b/client/src/contexts/ToastProvider.jsx
index 908ca41d3..a54e1a73f 100644
--- a/client/src/contexts/ToastProvider.jsx
+++ b/client/src/contexts/ToastProvider.jsx
@@ -1,4 +1,4 @@
-import { makeStyles } from '@material-ui/core/styles'
+import makeStyles from '@mui/styles/makeStyles';
 import { SnackbarProvider } from 'notistack'
 
 const useStyles = makeStyles(() => ({

From de64acfc333b460b96077937541e075ddd1e7676 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Tue, 5 Apr 2022 12:07:50 -0700
Subject: [PATCH 431/531] update node-lock icon

---
 client/src/components/Icon/icon.module.css      | 4 ++--
 client/src/components/Icon/icon.module.css.d.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/src/components/Icon/icon.module.css b/client/src/components/Icon/icon.module.css
index 6da7757f9..c96935730 100644
--- a/client/src/components/Icon/icon.module.css
+++ b/client/src/components/Icon/icon.module.css
@@ -137,6 +137,6 @@
   background-image: url('dangerTrash.svg');
 }
 
-.lock {
-  background-image: url('Lock.svg');
+.node-lock {
+  background-image: url('node-lock.svg');
 }
diff --git a/client/src/components/Icon/icon.module.css.d.ts b/client/src/components/Icon/icon.module.css.d.ts
index dc07bd5ec..d96641326 100644
--- a/client/src/components/Icon/icon.module.css.d.ts
+++ b/client/src/components/Icon/icon.module.css.d.ts
@@ -14,11 +14,11 @@ interface CssExports {
   'hand': string;
   'icon': string;
   'info': string;
-  'lock': string;
   'merge': string;
   'minus': string;
   'moon': string;
   'newnode': string;
+  'node-lock': string;
   'pause': string;
   'person': string;
   'play': string;

From fb380ece176e673c460077118b2f24a422cb3644 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Tue, 5 Apr 2022 12:08:16 -0700
Subject: [PATCH 432/531] add new lock svg

---
 client/src/components/Icon/node-lock.svg | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 client/src/components/Icon/node-lock.svg

diff --git a/client/src/components/Icon/node-lock.svg b/client/src/components/Icon/node-lock.svg
new file mode 100644
index 000000000..86a39d67a
--- /dev/null
+++ b/client/src/components/Icon/node-lock.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M10 16c0-1.104.896-2 2-2s2 .896 2 2c0 .738-.404 1.376-1 1.723v2.277h-2v-2.277c-.596-.347-1-.985-1-1.723zm11-6v14h-18v-14h3v-4c0-3.313 2.687-6 6-6s6 2.687 6 6v4h3zm-13 0h8v-4c0-2.206-1.795-4-4-4s-4 1.794-4 4v4zm11 2h-14v10h14v-10z"/></svg>
\ No newline at end of file

From 05b0c75b90f51c7a0610d9b42fcc77d8cdf2ad42 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Tue, 5 Apr 2022 12:08:42 -0700
Subject: [PATCH 433/531] add node locked style

---
 client/src/components/Node/Node.module.css | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/client/src/components/Node/Node.module.css b/client/src/components/Node/Node.module.css
index d2fcbeadc..ff472ae3f 100644
--- a/client/src/components/Node/Node.module.css
+++ b/client/src/components/Node/Node.module.css
@@ -141,3 +141,16 @@
   align-items: center;
   display: flex;
 }
+
+.node-locked {
+  background-color: var(--dark-3);
+  position: absolute;
+  top: 0;
+  right: 0;
+  left: 0;
+  bottom: 0;
+  opacity: 0.6;
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: 40%;
+}

From 01f26ef60e8fe5b7a5d09f59db120d00df9a20e1 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Tue, 5 Apr 2022 12:08:53 -0700
Subject: [PATCH 434/531] add new style to css.d.ts

---
 client/src/components/Node/Node.module.css.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/components/Node/Node.module.css.d.ts b/client/src/components/Node/Node.module.css.d.ts
index 46fdd2f27..735037df9 100644
--- a/client/src/components/Node/Node.module.css.d.ts
+++ b/client/src/components/Node/Node.module.css.d.ts
@@ -11,6 +11,7 @@ interface CssExports {
   'node': string;
   'node-depricated': string;
   'node-id': string;
+  'node-locked': string;
   'node-title': string;
   'nodeGenesis': string;
   'out': string;

From b82d7788869d610bae1adca6c8307c0f90f8656c Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Tue, 5 Apr 2022 12:09:14 -0700
Subject: [PATCH 435/531] import icon css module in node

---
 client/src/components/Node/Node.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/components/Node/Node.tsx b/client/src/components/Node/Node.tsx
index 4624b0860..cc83473ef 100644
--- a/client/src/components/Node/Node.tsx
+++ b/client/src/components/Node/Node.tsx
@@ -2,6 +2,7 @@ import { Node, Socket, Control } from 'rete-react-render-plugin'
 
 import Icon, { componentCategories } from '../Icon/Icon'
 import css from './Node.module.css'
+import icons from '../Icon/icon.module.css'
 
 export class MyNode extends Node {
   props: { node: any; bindSocket: any; bindControl: any }

From 69531651ba07d5b612589b38ecf405f785d08e93 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Tue, 5 Apr 2022 12:09:24 -0700
Subject: [PATCH 436/531] add node locked check

---
 client/src/components/Node/Node.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/components/Node/Node.tsx b/client/src/components/Node/Node.tsx
index cc83473ef..3ff28da10 100644
--- a/client/src/components/Node/Node.tsx
+++ b/client/src/components/Node/Node.tsx
@@ -16,6 +16,7 @@ export class MyNode extends Node {
     const fullName = node.data.name ? `${name} - ${node.data.name}` : name
     const hasError = node.data.error
     const hasSuccess = node.data.success
+    const nodeLocked = node.data.nodeLocked
 
     return (
       <div

From 686c2982fb3b2084c82f6ae2e75b4d1860f53dc4 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Tue, 5 Apr 2022 12:09:39 -0700
Subject: [PATCH 437/531] add node locked overlay on node

---
 client/src/components/Node/Node.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/client/src/components/Node/Node.tsx b/client/src/components/Node/Node.tsx
index 3ff28da10..f993ad09d 100644
--- a/client/src/components/Node/Node.tsx
+++ b/client/src/components/Node/Node.tsx
@@ -25,6 +25,9 @@ export class MyNode extends Node {
         } ${css[hasSuccess ? 'success' : '']}`}
       >
         {node.deprecated && <div className={css['deprecated-overlay']}></div>}
+        {nodeLocked && (
+          <div className={`${css['node-locked']} ${icons['node-lock']}`}></div>
+        )}
         <div
           className={`${css['node-id']} ${hasError ? css['error'] : ''} ${
             hasSuccess ? css['success'] : ''

From 6761fbb4da80fea9c9a9b1f8fde5812f0a3b2763 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Tue, 5 Apr 2022 12:09:57 -0700
Subject: [PATCH 438/531] update class name to utilize noew lock svg

---
 client/src/workspaces/spells/windows/InspectorWindow.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/workspaces/spells/windows/InspectorWindow.tsx b/client/src/workspaces/spells/windows/InspectorWindow.tsx
index a1279e2a0..4af94b986 100644
--- a/client/src/workspaces/spells/windows/InspectorWindow.tsx
+++ b/client/src/workspaces/spells/windows/InspectorWindow.tsx
@@ -124,7 +124,7 @@ const Inspector = props => {
               }}
             />
             <div
-              className={`${css['lock']} ${css['icon']}`}
+              className={`${css['node-lock']} ${css['icon']}`}
               style={{
                 width: '100%',
                 height: '100%',

From 0197543027330fd6fa8df524474c751bf9a77a62 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 12:12:19 -0700
Subject: [PATCH 439/531] remove editor.on form task plugin index

---
 core/src/plugins/taskPlugin/index.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/core/src/plugins/taskPlugin/index.ts b/core/src/plugins/taskPlugin/index.ts
index 90f427cc2..4c7d5b920 100644
--- a/core/src/plugins/taskPlugin/index.ts
+++ b/core/src/plugins/taskPlugin/index.ts
@@ -87,10 +87,6 @@ function install(editor: ThothEditor) {
 
       // Probably need to reset this when spells change
       editor.tasks.push(task)
-
-      editor.on('process', () => {
-        editor.tasks = []
-      })
     }
   })
 }

From dfde7e151d05a0b1e533c22fc01b094b9fa3d08a Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 12:12:33 -0700
Subject: [PATCH 440/531] Update notistack

---
 client/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/package.json b/client/package.json
index bc1885b67..f17688ea3 100644
--- a/client/package.json
+++ b/client/package.json
@@ -45,7 +45,7 @@
     "handlebars": "^4.7.7",
     "history": "^5.0.1",
     "json-format": "^1.0.1",
-    "notistack": "^1.0.9",
+    "notistack": "^2.0.3",
     "prism-themes": "^1.7.0",
     "prismjs": "^1.24.0",
     "pubsub-js": "^1.9.3",

From 18c8394484e7b6de3974cd1954690281af5ec1bc Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 12:12:46 -0700
Subject: [PATCH 441/531] Update yarn lock

---
 yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e6de99e27..51b1aaa4e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10487,10 +10487,10 @@ normalize-url@^6.1.0:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
   integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
 
-notistack@^1.0.9:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/notistack/-/notistack-1.0.10.tgz#8db90830034383467a04184f1fa8ff77f4fc58a5"
-  integrity sha512-z0y4jJaVtOoH3kc3GtNUlhNTY+5LE04QDeLVujX3VPhhzg67zw055mZjrBF+nzpv3V9aiPNph1EgRU4+t8kQTQ==
+notistack@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/notistack/-/notistack-2.0.3.tgz#9007550e5cbc14df84d1d54e7a55ac0948eb59e8"
+  integrity sha512-krmVFtTO9kEY1Pa4NrbyexrjiRcV6TqBM2xLx8nuDea1g96Z/OZfkvVLmYKkTvoSJ3jyQntWK16z86ssW5kt4A==
   dependencies:
     clsx "^1.1.0"
     hoist-non-react-statics "^3.3.0"

From 956909f564b4c097e65b74a3c5487dff6b3d415d Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 12:13:10 -0700
Subject: [PATCH 442/531] Add connctionpath event to spell save listener for
 saving new spell path changes

---
 client/src/workspaces/spells/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/workspaces/spells/index.tsx b/client/src/workspaces/spells/index.tsx
index 71ecbb5ed..d916e43bf 100644
--- a/client/src/workspaces/spells/index.tsx
+++ b/client/src/workspaces/spells/index.tsx
@@ -31,7 +31,7 @@ const Workspace = ({ tab, tabs, pubSub }) => {
     if (!editor?.on) return
 
     const unsubscribe = editor.on(
-      'save nodecreated noderemoved connectioncreated connectionremoved nodetranslated commentremoved commentcreated addcomment removecomment editcomment',
+      'save nodecreated noderemoved connectioncreated connectionremoved nodetranslated commentremoved commentcreated addcomment removecomment editcomment connectionpath',
       debounce(async data => {
         if (tab.type === 'spell' && spellRef.current) {
           publish(events.$SAVE_SPELL_DIFF(tab.id), { chain: serialize() })

From f3732539c4f4105202633b6d53fe2062a68b3e3d Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 12:13:25 -0700
Subject: [PATCH 443/531] Make state write a runOneInput component

---
 core/src/components/StateWrite.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/components/StateWrite.ts b/core/src/components/StateWrite.ts
index a9f615544..edd0a969f 100644
--- a/core/src/components/StateWrite.ts
+++ b/core/src/components/StateWrite.ts
@@ -21,6 +21,7 @@ export class StateWrite extends ThothComponent<void> {
     super('State Write')
 
     this.task = {
+      runOneInput: true,
       outputs: {},
     }
 

From 8524323c8c4d7877770dae2b2fb323c22122d005 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 12:24:53 -0700
Subject: [PATCH 444/531] Fix toast provider styling

---
 client/src/contexts/ToastProvider.jsx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/client/src/contexts/ToastProvider.jsx b/client/src/contexts/ToastProvider.jsx
index a54e1a73f..051754000 100644
--- a/client/src/contexts/ToastProvider.jsx
+++ b/client/src/contexts/ToastProvider.jsx
@@ -1,28 +1,30 @@
-import makeStyles from '@mui/styles/makeStyles';
+import makeStyles from '@mui/styles/makeStyles'
 import { SnackbarProvider } from 'notistack'
 
 const useStyles = makeStyles(() => ({
   success: {
     border: '1px solid var(--green)',
-    background: 'var(--dark-2)',
+    backgroundColor: 'var(--dark-2) !important',
   },
   error: {
     border: '1px solid var(--red)',
-    background: 'var(--dark-2)',
+    backgroundColor: 'var(--dark-2) !important',
   },
   warning: {
     border: '1px solid var(--yellow)',
-    background: 'var(--dark-2)',
+    backgroundColor: 'var(--dark-2) !important',
   },
   info: {
     border: '1px solid var(--blue)',
-    background: 'var(--dark-2)',
+    backgroundColor: 'var(--dark-2) !important',
   },
 }))
 
 const ToastProvider = ({ children }) => {
   const classes = useStyles()
 
+  console.log('TOIAST CLASSES', classes)
+
   return (
     <SnackbarProvider
       maxSnack="3"

From 550d3f371f5cf2cd4da1558c1846a292842d2e8e Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 12:25:05 -0700
Subject: [PATCH 445/531] Modify size of lock icon inside nodes

---
 client/src/components/Node/Node.module.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/Node/Node.module.css b/client/src/components/Node/Node.module.css
index ff472ae3f..bcf657c66 100644
--- a/client/src/components/Node/Node.module.css
+++ b/client/src/components/Node/Node.module.css
@@ -152,5 +152,5 @@
   opacity: 0.6;
   background-repeat: no-repeat;
   background-position: center;
-  background-size: 40%;
+  background-size: 20%;
 }

From a6cb59fa30fcb7374cdd33d68fc29cd0d52f371f Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 12:25:20 -0700
Subject: [PATCH 446/531] Remove node locked text from top control

---
 client/src/workspaces/spells/windows/InspectorWindow.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/src/workspaces/spells/windows/InspectorWindow.tsx b/client/src/workspaces/spells/windows/InspectorWindow.tsx
index 4af94b986..63dc61354 100644
--- a/client/src/workspaces/spells/windows/InspectorWindow.tsx
+++ b/client/src/workspaces/spells/windows/InspectorWindow.tsx
@@ -75,7 +75,6 @@ const Inspector = props => {
         />
         {inspectorData?.name}
       </div>
-      <div style={{ display: 'flex', alignItems: 'center' }}>Node Lock</div>
       <SwitchComponent
         label={inspectorData?.data.nodeLocked ? 'Locked' : 'Unlocked'}
         checked={inspectorData?.data.nodeLocked ? true : false}

From 06ad2c301c82124898b882b0e9f01334445cfee2 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 12:34:32 -0700
Subject: [PATCH 447/531] Add state input socket to spell component

---
 core/src/components/Spell.ts | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index 603643380..ac4c58a9c 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -1,3 +1,4 @@
+import Rete from 'rete'
 import {
   ModuleWorkerOutput,
   NodeData,
@@ -9,6 +10,7 @@ import { SpellControl } from '../dataControls/SpellControl'
 import { ThothEditor } from '../editor'
 import { EngineContext } from '../engine'
 import { Task } from '../plugins/taskPlugin/task'
+import { objectSocket } from '../sockets'
 import { ThothComponent } from '../thoth-component'
 import { inputNameFromSocketKey } from '../utils/nodeHelpers'
 
@@ -63,6 +65,8 @@ export class SpellComponent extends ThothComponent<
 
     if (node.data.spellId) this.subscribe(node, node.data.spellId as string)
 
+    const stateSocket = new Rete.Input('state', 'State', objectSocket)
+
     spellControl.onData = (spell: Spell) => {
       node.data.spellId = spell.name
 
@@ -74,6 +78,7 @@ export class SpellComponent extends ThothComponent<
       this.subscribe(node, spell.name)
     }
 
+    node.addInput(stateSocket)
     node.inspector.add(spellControl)
 
     return node
@@ -95,19 +100,21 @@ export class SpellComponent extends ThothComponent<
       thoth,
     }: { module: { outputs: ModuleWorkerOutput[] }; thoth: EngineContext }
   ) {
-    if (module) {
-      const open = Object.entries(module.outputs)
-        .filter(([, value]) => typeof value === 'boolean' && value)
-        .map(([key]) => key)
-      // close all triggers first
-      const dataOutputs = node.data.outputs as ModuleWorkerOutput[]
-      this._task.closed = dataOutputs
-        .map((out: { name: string }) => out.name)
-        .filter((out: string) => !open.includes(out))
-
-      return module.outputs
-    }
-
+    // // If there is a module present, this is runnign via the module plugin
+    // if (module) {
+    //   const open = Object.entries(module.outputs)
+    //     .filter(([, value]) => typeof value === 'boolean' && value)
+    //     .map(([key]) => key)
+    //   // close all triggers first
+    //   const dataOutputs = node.data.outputs as ModuleWorkerOutput[]
+    //   this._task.closed = dataOutputs
+    //     .map((out: { name: string }) => out.name)
+    //     .filter((out: string) => !open.includes(out))
+
+    //   return module.outputs
+    // }
+
+    // Otherwise, if we are, this is running serverside.
     const flattenedInputs = Object.entries(inputs).reduce(
       (acc, [key, value]) => {
         const name = inputNameFromSocketKey(node, key)

From e5fafc25fcf9288743b721a3b5fee298f319a8a6 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 13:03:21 -0700
Subject: [PATCH 448/531] Ensure we dont overwrite any existing values with the
 default in inspector add

---
 core/src/plugins/inspectorPlugin/Inspector.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/plugins/inspectorPlugin/Inspector.ts b/core/src/plugins/inspectorPlugin/Inspector.ts
index ec7539190..704b1f13f 100644
--- a/core/src/plugins/inspectorPlugin/Inspector.ts
+++ b/core/src/plugins/inspectorPlugin/Inspector.ts
@@ -62,7 +62,8 @@ export class Inspector {
     control.component = this.component
     control.id = uuidv4()
 
-    if (control.defaultValue)
+    // If we gave a dewfault value and there isnt already one on the node, add it.
+    if (control.defaultValue && !this.node.data[control.dataKey])
       this.node.data[control.dataKey] = control.defaultValue
 
     list.set(control.dataKey, control)

From 3913623a83aaea49a52a6d58798e611c880b0537 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 13:03:33 -0700
Subject: [PATCH 449/531] Use default value in spell control

---
 core/src/dataControls/SpellControl.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/src/dataControls/SpellControl.ts b/core/src/dataControls/SpellControl.ts
index c3a148a66..166fd1fa3 100644
--- a/core/src/dataControls/SpellControl.ts
+++ b/core/src/dataControls/SpellControl.ts
@@ -5,15 +5,18 @@ export class SpellControl extends DataControl {
     name,
     icon = 'sieve',
     write = false,
+    defaultValue = '',
   }: {
     name: string
     icon?: string
     write: boolean
+    defaultValue?: string
   }) {
     const options = {
       dataKey: 'spell',
       name: name,
       component: 'spellSelect',
+      defaultValue,
       write,
       icon,
     }

From 1c3e779047847e62efd54b52be9516233022474f Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 13:03:52 -0700
Subject: [PATCH 450/531] Pass default value in to spell control from spell
 component builder

---
 core/src/components/Spell.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index ac4c58a9c..eb49cb621 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -61,6 +61,7 @@ export class SpellComponent extends ThothComponent<
     const spellControl = new SpellControl({
       name: 'Spell Select',
       write: false,
+      defaultValue: (node.data.spell as string) || '',
     })
 
     if (node.data.spellId) this.subscribe(node, node.data.spellId as string)

From 717f8fdc563ff02721c373d7cc8555be8d1a15d5 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 13:04:21 -0700
Subject: [PATCH 451/531] Write only spell name to nodes data in spell
 component

---
 core/src/components/Spell.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index eb49cb621..d69ee7a3b 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -74,6 +74,9 @@ export class SpellComponent extends ThothComponent<
       // Update the sockets
       this.updateSockets(node, spell)
 
+      // here we handle writing the spells name to the spell itself
+      node.data.spell = spell.name
+
       // subscribe to changes form the spell to update the sockets if there are changes
       // Note: We could store all spells in a spell map here and rather than receive the whole spell, only receive the diff, make the changes, update the sockets, etc.  Mayb improve speed?
       this.subscribe(node, spell.name)

From 169098b8864a092c525e6defab61fdc2a16e3472 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 13:04:36 -0700
Subject: [PATCH 452/531] Update node name with spell name in spell component

---
 core/src/components/Spell.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index d69ee7a3b..62f5c3db3 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -77,6 +77,9 @@ export class SpellComponent extends ThothComponent<
       // here we handle writing the spells name to the spell itself
       node.data.spell = spell.name
 
+      // Uodate the data name to display inside the node
+      node.data.name = spell.name
+
       // subscribe to changes form the spell to update the sockets if there are changes
       // Note: We could store all spells in a spell map here and rather than receive the whole spell, only receive the diff, make the changes, update the sockets, etc.  Mayb improve speed?
       this.subscribe(node, spell.name)

From c4ea0ab0d2e1978677c9ce57fe7f17d324fd7ab7 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 13:04:57 -0700
Subject: [PATCH 453/531] Add comment and cvhange wording in spell select
 control

---
 client/src/workspaces/spells/DataControls/SpellSelect.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/src/workspaces/spells/DataControls/SpellSelect.tsx b/client/src/workspaces/spells/DataControls/SpellSelect.tsx
index faef88fb4..02de9044f 100644
--- a/client/src/workspaces/spells/DataControls/SpellSelect.tsx
+++ b/client/src/workspaces/spells/DataControls/SpellSelect.tsx
@@ -27,6 +27,8 @@ const ModuleSelect = ({ control, updateData, initialValue }) => {
   useEffect(() => {
     if (!spell) return
 
+    // here we send the whole spell so the control can modify the nodes sockets.
+    // However, we only store the name of the spell after processing the full spell.
     update(spell)
     _openTab(spell)
   }, [spell])
@@ -78,7 +80,7 @@ const ModuleSelect = ({ control, updateData, initialValue }) => {
   }
 
   const noOptionsMessage = inputValue => {
-    return <span>Start typing to create a module</span>
+    return <span>Start typing to find or creat a spell</span>
   }
 
   const isValidNewOption = (inputValue, selectValue, selectOptions) => {

From 41a99e544d0f477d28153a761e71e0b44f1332a5 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 13:14:36 -0700
Subject: [PATCH 454/531] Bug fix.  Run worker as async with await in debugger
 plugin

---
 core/src/plugins/debuggerPlugin/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/plugins/debuggerPlugin/index.ts b/core/src/plugins/debuggerPlugin/index.ts
index c68d5b30b..46263322b 100644
--- a/core/src/plugins/debuggerPlugin/index.ts
+++ b/core/src/plugins/debuggerPlugin/index.ts
@@ -17,7 +17,7 @@ function install(
   editor.on('componentregister', (component: ThothComponent<unknown>) => {
     const worker = component.worker
 
-    component.worker = (node, inputs, outputs, data, ...args) => {
+    component.worker = async (node, inputs, outputs, data, ...args) => {
       node.console = new ThothConsole({
         node,
         component,
@@ -27,7 +27,7 @@ function install(
       })
 
       try {
-        const result = worker.apply(component, [
+        const result = await worker.apply(component, [
           node,
           inputs,
           outputs,

From 6a24f7e9c0cd2a8d6033b76453b3c166b8356482 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Tue, 5 Apr 2022 14:33:20 -0700
Subject: [PATCH 455/531] import thoth node type in editor.ts

---
 core/src/editor.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/editor.ts b/core/src/editor.ts
index 95dbbcd52..7a30d6d39 100644
--- a/core/src/editor.ts
+++ b/core/src/editor.ts
@@ -1,3 +1,4 @@
+import { ThothNode } from './../types'
 import { NodeEditor } from 'rete'
 import ConnectionPlugin from 'rete-connection-plugin'
 import ConnectionReroutePlugin from 'rete-connection-reroute-plugin'

From ebf46ae7bed9462d9fbfad6dc88da61e8d01967b Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Tue, 5 Apr 2022 14:33:58 -0700
Subject: [PATCH 456/531] remove Delete form the context menu if the node is
 locked

---
 core/src/editor.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/core/src/editor.ts b/core/src/editor.ts
index 7a30d6d39..b665316bc 100644
--- a/core/src/editor.ts
+++ b/core/src/editor.ts
@@ -96,6 +96,15 @@ export const initEditor = async function ({
     rename(component: { contextMenuName: any; name: any }) {
       return component.contextMenuName || component.name
     },
+    nodeItems: (node: ThothNode) => {
+      if (node.data.nodeLocked) {
+        return { Delete: false }
+      }
+      return {
+        Deleted: true,
+        Clone: true,
+      }
+    },
     allocate: (component: ThothComponent<unknown>) => {
       //@seang: disabling component filtering in anticipation of needing to treat spells as "top level modules" in the publishing workflow
       const tabType = editor.tab.type

From 47a5b5aa732dd116344c4c5edf5448ccee04f49c Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Tue, 5 Apr 2022 14:35:22 -0700
Subject: [PATCH 457/531] prevent hotkey deletion if node locked

---
 core/src/plugins/keyCodePlugin/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/plugins/keyCodePlugin/index.ts b/core/src/plugins/keyCodePlugin/index.ts
index 42f039f47..80287b1f1 100644
--- a/core/src/plugins/keyCodePlugin/index.ts
+++ b/core/src/plugins/keyCodePlugin/index.ts
@@ -12,6 +12,7 @@ function install(editor: IRunContextEditor) {
 
   editor.on('delete', () => {
     if (!currentNode) return
+    if (currentNode.data.nodeLocked) return
     editor.removeNode(currentNode)
   })
 }

From 42d7b6c4a7e46c52eb9e3611fb578bbb0cdc4f30 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 14:46:06 -0700
Subject: [PATCH 458/531] Prune unused dependencies and move types to dev
 dependencies

---
 client/package.json | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/client/package.json b/client/package.json
index f17688ea3..6d0f25876 100644
--- a/client/package.json
+++ b/client/package.json
@@ -24,19 +24,12 @@
     "@emotion/react": "^11.8.2",
     "@emotion/styled": "^11.8.1",
     "@latitudegames/thoth-core": "0.0.66",
-    "@material-ui/core": "^4.12.4",
-    "@material-ui/icons": "^4.11.3",
     "@monaco-editor/react": "^4.2.1",
     "@mui/icons-material": "^5.5.1",
     "@mui/material": "^5.5.3",
     "@mui/styles": "^5.5.3",
     "@rebass/forms": "^4.0.6",
     "@reduxjs/toolkit": "^1.6.2",
-    "@types/jest": "^26.0.24",
-    "@types/node": "^16.4.3",
-    "@types/react": "^17.0.15",
-    "@types/react-dom": "^17.0.9",
-    "@types/react-redux": "^7.1.18",
     "add": "^2.0.6",
     "classnames": "^2.3.1",
     "deep-equal": "^2.0.5",
@@ -73,8 +66,7 @@
     "sharedb": "^2.2.5",
     "unique-names-generator": "^4.5.0",
     "uuid": "^8.3.2",
-    "web-vitals": "^1.0.1",
-    "wouter": "^2.7.4"
+    "web-vitals": "^1.0.1"
   },
   "devDependencies": {
     "@babel/plugin-external-helpers": "^7.14.5",
@@ -86,6 +78,11 @@
     "@testing-library/jest-dom": "^5.11.4",
     "@testing-library/react": "^11.1.0",
     "@testing-library/user-event": "^12.1.10",
+    "@types/jest": "^26.0.24",
+    "@types/node": "^16.4.3",
+    "@types/react": "^17.0.15",
+    "@types/react-dom": "^17.0.9",
+    "@types/react-redux": "^7.1.18",
     "@welldone-software/why-did-you-render": "^6.2.1",
     "babel-loader": "^8.2.2",
     "babel-plugin-transform-class-properties": "^6.24.1",

From 34dca95f388ac2808ca3231ce7324dc7ca87ab2b Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 14:46:13 -0700
Subject: [PATCH 459/531] Update yarn lock

---
 yarn.lock | 168 ++----------------------------------------------------
 1 file changed, 5 insertions(+), 163 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 51b1aaa4e..06ed3c673 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1037,7 +1037,7 @@
     core-js-pure "^3.16.0"
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.10.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.10.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.4.tgz#fd17d16bfdf878e6dd02d19753a39fa8a8d9c84a"
   integrity sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==
@@ -2229,77 +2229,6 @@
     npmlog "^4.1.2"
     write-file-atomic "^3.0.3"
 
-"@material-ui/core@^4.12.4":
-  version "4.12.4"
-  resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.12.4.tgz#4ac17488e8fcaf55eb6a7f5efb2a131e10138a73"
-  integrity sha512-tr7xekNlM9LjA6pagJmL8QCgZXaubWUwkJnoYcMKd4gw/t4XiyvnTkjdGrUVicyB2BsdaAv1tvow45bPM4sSwQ==
-  dependencies:
-    "@babel/runtime" "^7.4.4"
-    "@material-ui/styles" "^4.11.5"
-    "@material-ui/system" "^4.12.2"
-    "@material-ui/types" "5.1.0"
-    "@material-ui/utils" "^4.11.3"
-    "@types/react-transition-group" "^4.2.0"
-    clsx "^1.0.4"
-    hoist-non-react-statics "^3.3.2"
-    popper.js "1.16.1-lts"
-    prop-types "^15.7.2"
-    react-is "^16.8.0 || ^17.0.0"
-    react-transition-group "^4.4.0"
-
-"@material-ui/icons@^4.11.3":
-  version "4.11.3"
-  resolved "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.11.3.tgz#b0693709f9b161ce9ccde276a770d968484ecff1"
-  integrity sha512-IKHlyx6LDh8n19vzwH5RtHIOHl9Tu90aAAxcbWME6kp4dmvODM3UvOHJeMIDzUbd4muuJKHmlNoBN+mDY4XkBA==
-  dependencies:
-    "@babel/runtime" "^7.4.4"
-
-"@material-ui/styles@^4.11.5":
-  version "4.11.5"
-  resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.11.5.tgz#19f84457df3aafd956ac863dbe156b1d88e2bbfb"
-  integrity sha512-o/41ot5JJiUsIETME9wVLAJrmIWL3j0R0Bj2kCOLbSfqEkKf0fmaPt+5vtblUh5eXr2S+J/8J3DaCb10+CzPGA==
-  dependencies:
-    "@babel/runtime" "^7.4.4"
-    "@emotion/hash" "^0.8.0"
-    "@material-ui/types" "5.1.0"
-    "@material-ui/utils" "^4.11.3"
-    clsx "^1.0.4"
-    csstype "^2.5.2"
-    hoist-non-react-statics "^3.3.2"
-    jss "^10.5.1"
-    jss-plugin-camel-case "^10.5.1"
-    jss-plugin-default-unit "^10.5.1"
-    jss-plugin-global "^10.5.1"
-    jss-plugin-nested "^10.5.1"
-    jss-plugin-props-sort "^10.5.1"
-    jss-plugin-rule-value-function "^10.5.1"
-    jss-plugin-vendor-prefixer "^10.5.1"
-    prop-types "^15.7.2"
-
-"@material-ui/system@^4.12.2":
-  version "4.12.2"
-  resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.12.2.tgz#f5c389adf3fce4146edd489bf4082d461d86aa8b"
-  integrity sha512-6CSKu2MtmiJgcCGf6nBQpM8fLkuB9F55EKfbdTC80NND5wpTmKzwdhLYLH3zL4cLlK0gVaaltW7/wMuyTnN0Lw==
-  dependencies:
-    "@babel/runtime" "^7.4.4"
-    "@material-ui/utils" "^4.11.3"
-    csstype "^2.5.2"
-    prop-types "^15.7.2"
-
-"@material-ui/types@5.1.0":
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/@material-ui/types/-/types-5.1.0.tgz#efa1c7a0b0eaa4c7c87ac0390445f0f88b0d88f2"
-  integrity sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A==
-
-"@material-ui/utils@^4.11.3":
-  version "4.11.3"
-  resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.11.3.tgz#232bd86c4ea81dab714f21edad70b7fdf0253942"
-  integrity sha512-ZuQPV4rBK/V1j2dIkSSEcH5uT6AaHuKWFfotADHsC0wVL1NLd2WkFCm4ZZbX33iO4ydl6V0GPngKm8HZQ2oujg==
-  dependencies:
-    "@babel/runtime" "^7.4.4"
-    prop-types "^15.7.2"
-    react-is "^16.8.0 || ^17.0.0"
-
 "@monaco-editor/loader@^1.1.1":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@monaco-editor/loader/-/loader-1.1.1.tgz#37db648c81a86946d0febd391de00df9c28a0a3d"
@@ -3144,13 +3073,6 @@
     hoist-non-react-statics "^3.3.0"
     redux "^4.0.0"
 
-"@types/react-transition-group@^4.2.0":
-  version "4.4.3"
-  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.3.tgz#b0994da0a7023d67dbb4a8910a62112bc00d5688"
-  integrity sha512-fUx5muOWSYP8Bw2BUQ9M9RK9+W1XBK/7FLJ8PTQpnpTEkn0ccyMffyEQvan4C3h53gHdx7KE5Qrxi/LnUGQtdg==
-  dependencies:
-    "@types/react" "*"
-
 "@types/react-transition-group@^4.4.4":
   version "4.4.4"
   resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.4.tgz#acd4cceaa2be6b757db61ed7b432e103242d163e"
@@ -5057,7 +4979,7 @@ clone@^1.0.2:
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
   integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
 
-clsx@^1.0.4, clsx@^1.1.0, clsx@^1.1.1:
+clsx@^1.1.0, clsx@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188"
   integrity sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==
@@ -5714,7 +5636,7 @@ cssstyle@^2.3.0:
   dependencies:
     cssom "~0.3.6"
 
-csstype@^2.5.2, csstype@^2.5.7:
+csstype@^2.5.7:
   version "2.6.18"
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.18.tgz#980a8b53085f34af313410af064f2bd241784218"
   integrity sha512-RSU6Hyeg14am3Ah4VZEmeX8H7kLwEEirXe6aU2IPfKNvhXwTflK5HQRDNI0ypQXoqmm+QPyG2IaPuQE5zMwSIQ==
@@ -9254,15 +9176,6 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
-jss-plugin-camel-case@^10.5.1:
-  version "10.8.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.8.0.tgz#575fd849202d36713a6970796458e375754446c7"
-  integrity sha512-yxlXrXwcCdGw+H4BC187dEu/RFyW8joMcWfj8Rk9UPgWTKu2Xh7Sib4iW3xXjHe/t5phOHF1rBsHleHykWix7g==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    hyphenate-style-name "^1.0.3"
-    jss "10.8.0"
-
 jss-plugin-camel-case@^10.8.2:
   version "10.9.0"
   resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.9.0.tgz#4921b568b38d893f39736ee8c4c5f1c64670aaf7"
@@ -9272,14 +9185,6 @@ jss-plugin-camel-case@^10.8.2:
     hyphenate-style-name "^1.0.3"
     jss "10.9.0"
 
-jss-plugin-default-unit@^10.5.1:
-  version "10.8.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.8.0.tgz#98db5962e62abbf43f1cc111e62cb70ffb09db59"
-  integrity sha512-9XJV546cY9zV9OvIE/v/dOaxSi4062VfYQQfwbplRExcsU2a79Yn+qDz/4ciw6P4LV1Naq90U+OffAGRHfNq/Q==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    jss "10.8.0"
-
 jss-plugin-default-unit@^10.8.2:
   version "10.9.0"
   resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.9.0.tgz#bb23a48f075bc0ce852b4b4d3f7582bc002df991"
@@ -9288,14 +9193,6 @@ jss-plugin-default-unit@^10.8.2:
     "@babel/runtime" "^7.3.1"
     jss "10.9.0"
 
-jss-plugin-global@^10.5.1:
-  version "10.8.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.8.0.tgz#0c2b0c056087f5846d600f3332eeb7a1a8b9c9f2"
-  integrity sha512-H/8h/bHd4e7P0MpZ9zaUG8NQSB2ie9rWo/vcCP6bHVerbKLGzj+dsY22IY3+/FNRS8zDmUyqdZx3rD8k4nmH4w==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    jss "10.8.0"
-
 jss-plugin-global@^10.8.2:
   version "10.9.0"
   resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.9.0.tgz#fc07a0086ac97aca174e37edb480b69277f3931f"
@@ -9304,15 +9201,6 @@ jss-plugin-global@^10.8.2:
     "@babel/runtime" "^7.3.1"
     jss "10.9.0"
 
-jss-plugin-nested@^10.5.1:
-  version "10.8.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.8.0.tgz#7ef9a815e9c9fbede41a8f52ce75cffb4c3b86d5"
-  integrity sha512-MhmINZkSxyFILcFBuDoZmP1+wj9fik/b9SsjoaggkGjdvMQCES21mj4K5ZnRGVm448gIXyi9j/eZjtDzhaHUYQ==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    jss "10.8.0"
-    tiny-warning "^1.0.2"
-
 jss-plugin-nested@^10.8.2:
   version "10.9.0"
   resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.9.0.tgz#cc1c7d63ad542c3ccc6e2c66c8328c6b6b00f4b3"
@@ -9322,14 +9210,6 @@ jss-plugin-nested@^10.8.2:
     jss "10.9.0"
     tiny-warning "^1.0.2"
 
-jss-plugin-props-sort@^10.5.1:
-  version "10.8.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.8.0.tgz#2a83e8ca80d72828495bad57b485f7d55a33543b"
-  integrity sha512-VY+Wt5WX5GMsXDmd+Ts8+O16fpiCM81svbox++U3LDbJSM/g9FoMx3HPhwUiDfmgHL9jWdqEuvSl/JAk+mh6mQ==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    jss "10.8.0"
-
 jss-plugin-props-sort@^10.8.2:
   version "10.9.0"
   resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.9.0.tgz#30e9567ef9479043feb6e5e59db09b4de687c47d"
@@ -9338,15 +9218,6 @@ jss-plugin-props-sort@^10.8.2:
     "@babel/runtime" "^7.3.1"
     jss "10.9.0"
 
-jss-plugin-rule-value-function@^10.5.1:
-  version "10.8.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.8.0.tgz#e011ed180789229e7ea8f75c222d34810bcab520"
-  integrity sha512-R8N8Ma6Oye1F9HroiUuHhVjpPsVq97uAh+rMI6XwKLqirIu2KFb5x33hPj+vNBMxSHc9jakhf5wG0BbQ7fSDOg==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    jss "10.8.0"
-    tiny-warning "^1.0.2"
-
 jss-plugin-rule-value-function@^10.8.2:
   version "10.9.0"
   resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.9.0.tgz#379fd2732c0746fe45168011fe25544c1a295d67"
@@ -9356,15 +9227,6 @@ jss-plugin-rule-value-function@^10.8.2:
     jss "10.9.0"
     tiny-warning "^1.0.2"
 
-jss-plugin-vendor-prefixer@^10.5.1:
-  version "10.8.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.8.0.tgz#024b6d77be50b68e5dfca2c75f68091d8b722d61"
-  integrity sha512-G1zD0J8dFwKZQ+GaZaay7A/Tg7lhDw0iEkJ/iFFA5UPuvZFpMprCMQttXcTBhLlhhWnyZ8YPn4yqp+amrhQekw==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    css-vendor "^2.0.8"
-    jss "10.8.0"
-
 jss-plugin-vendor-prefixer@^10.8.2:
   version "10.9.0"
   resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.9.0.tgz#aa9df98abfb3f75f7ed59a3ec50a5452461a206a"
@@ -9374,16 +9236,6 @@ jss-plugin-vendor-prefixer@^10.8.2:
     css-vendor "^2.0.8"
     jss "10.9.0"
 
-jss@10.8.0, jss@^10.5.1:
-  version "10.8.0"
-  resolved "https://registry.yarnpkg.com/jss/-/jss-10.8.0.tgz#5063ee73aabd9f228ea3849df7962f0d2e213a42"
-  integrity sha512-6fAMLJrVQ8epM5ghghxWqCwRR0ZamP2cKbOAtzPudcCMSNdAqtvmzQvljUZYR8OXJIeb/IpZeOXA1sDXms4R1w==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-    csstype "^3.0.2"
-    is-in-browser "^1.1.3"
-    tiny-warning "^1.0.2"
-
 jss@10.9.0, jss@^10.8.2:
   version "10.9.0"
   resolved "https://registry.yarnpkg.com/jss/-/jss-10.9.0.tgz#7583ee2cdc904a83c872ba695d1baab4b59c141b"
@@ -11260,11 +11112,6 @@ pkg-up@^2.0.0:
   dependencies:
     find-up "^2.1.0"
 
-popper.js@1.16.1-lts:
-  version "1.16.1-lts"
-  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1-lts.tgz#cf6847b807da3799d80ee3d6d2f90df8a3f50b05"
-  integrity sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA==
-
 portfinder@^1.0.28:
   version "1.0.28"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
@@ -11764,7 +11611,7 @@ react-is@^16.12.0, react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.1, react-
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
-"react-is@^16.8.0 || ^17.0.0", react-is@^17.0.1, react-is@^17.0.2:
+react-is@^17.0.1, react-is@^17.0.2:
   version "17.0.2"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
@@ -11829,7 +11676,7 @@ react-test-renderer@^16.0.0-0:
     react-is "^16.8.6"
     scheduler "^0.19.1"
 
-react-transition-group@^4.3.0, react-transition-group@^4.4.0, react-transition-group@^4.4.2:
+react-transition-group@^4.3.0, react-transition-group@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470"
   integrity sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==
@@ -14566,11 +14413,6 @@ worker-farm@^1.7.0:
   dependencies:
     errno "~0.1.7"
 
-wouter@^2.7.4:
-  version "2.7.5"
-  resolved "https://registry.yarnpkg.com/wouter/-/wouter-2.7.5.tgz#c7466a2630bed3a4ec010aea0cda42a5bae69e5d"
-  integrity sha512-TOI9gD1wa7a8wW+lh3rjg0C+MjYGKMV3eC+++6D+7n1z36ZJIBPWe2G9Hs1jYNPsV7oKiPTI3UFC5TGhZjQfrQ==
-
 wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"

From 2bf7cb973c5d4fa09090a3e181f10b34103a07b2 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Tue, 5 Apr 2022 14:57:50 -0700
Subject: [PATCH 460/531] merge lock icon div into its sibling

---
 .../workspaces/spells/windows/InspectorWindow.tsx  | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/client/src/workspaces/spells/windows/InspectorWindow.tsx b/client/src/workspaces/spells/windows/InspectorWindow.tsx
index 63dc61354..729a3e592 100644
--- a/client/src/workspaces/spells/windows/InspectorWindow.tsx
+++ b/client/src/workspaces/spells/windows/InspectorWindow.tsx
@@ -113,6 +113,7 @@ const Inspector = props => {
         {isLocked && (
           <>
             <div
+              className={`${css['node-lock']} ${css['icon']}`}
               style={{
                 backgroundColor: 'var(--dark-1)',
                 width: '100%',
@@ -120,17 +121,8 @@ const Inspector = props => {
                 position: 'absolute',
                 zIndex: 10,
                 opacity: '0.7',
-              }}
-            />
-            <div
-              className={`${css['node-lock']} ${css['icon']}`}
-              style={{
-                width: '100%',
-                height: '100%',
-                position: 'absolute',
-                opacity: 1,
-                zIndex: 11,
-                backgroundPosition: '0 18vh',
+                backgroundPositionY: '18vh',
+                backgroundSize: '50%',
               }}
             />
           </>

From 469ab55d69c2611d6f85232420e1be3006d92ec8 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 15:21:01 -0700
Subject: [PATCH 461/531] Update module outputs type

---
 core/types.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/types.ts b/core/types.ts
index c03c7f7a8..07af95aad 100644
--- a/core/types.ts
+++ b/core/types.ts
@@ -177,8 +177,9 @@ export type TaskOutput = {
 }
 
 export type ModuleWorkerOutput = WorkerOutputs & {
-  [key: string]: string | string[]
+  [key: string]: any
 }
+
 export type ThothWorkerInput = string | unknown | unknown[]
 export type ThothWorkerInputs = { [key: string]: ThothWorkerInput[] }
 export type ThothWorkerOutputs = WorkerOutputs & {

From 15124dc4f9db650183ff72e69f685446fb8d7068 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 15:21:47 -0700
Subject: [PATCH 462/531] Refactor formatted outputs into class function

---
 core/src/components/Spell.ts | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index 62f5c3db3..0b4ab299f 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -98,6 +98,16 @@ export class SpellComponent extends ThothComponent<
     node.update()
   }
 
+  formatInputs(node: NodeData, inputs: Record<string, any>) {
+    return Object.entries(inputs).reduce((acc, [key, value]) => {
+      const name = inputNameFromSocketKey(node, key)
+      if (!name) return acc
+
+      acc[name] = value[0]
+      return acc
+    }, {} as Record<string, any>)
+  }
+
   async worker(
     node: NodeData,
     inputs: ThothWorkerInputs,
@@ -122,18 +132,9 @@ export class SpellComponent extends ThothComponent<
     // }
 
     // Otherwise, if we are, this is running serverside.
-    const flattenedInputs = Object.entries(inputs).reduce(
-      (acc, [key, value]) => {
-        const name = inputNameFromSocketKey(node, key)
-        if (!name) return acc
-
-        acc[name] = value[0]
-        return acc
-      },
-      {} as Record<string, any>
-    )
+    const flattenedInputs = this.formatInputs(node, inputs)
 
-    if (!thoth.runSpell) return
+    if (!thoth.runSpell) return {}
     const response = await thoth.runSpell(flattenedInputs, node.data.spellId)
 
     if ('error' in response) {

From 8cdc7d740e64df6594f67bf8fbc38d9e1c89b3c4 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 15:22:11 -0700
Subject: [PATCH 463/531] Add format ouputs class function to spell component

---
 core/src/components/Spell.ts | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index 0b4ab299f..66dfa7820 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -12,7 +12,10 @@ import { EngineContext } from '../engine'
 import { Task } from '../plugins/taskPlugin/task'
 import { objectSocket } from '../sockets'
 import { ThothComponent } from '../thoth-component'
-import { inputNameFromSocketKey } from '../utils/nodeHelpers'
+import {
+  inputNameFromSocketKey,
+  socketKeyFromOutputName,
+} from '../utils/nodeHelpers'
 
 const info = `The Module component allows you to add modules into your chain.  A module is a bundled self contained chain that defines inputs, outputs, and triggers using components.`
 
@@ -98,6 +101,15 @@ export class SpellComponent extends ThothComponent<
     node.update()
   }
 
+  formatOutputs(node: NodeData, outputs: Record<string, any>) {
+    return Object.entries(outputs).reduce((acc, [key, value]) => {
+      const socketKey = socketKeyFromOutputName(node, key)
+      if (!socketKey) return acc
+      acc[socketKey] = value
+      return acc
+    }, {} as Record<string, any>)
+  }
+
   formatInputs(node: NodeData, inputs: Record<string, any>) {
     return Object.entries(inputs).reduce((acc, [key, value]) => {
       const name = inputNameFromSocketKey(node, key)

From 3d013fd33d07314b7cba2f09cce8c5be2626b2e0 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 15:22:28 -0700
Subject: [PATCH 464/531] Format outputs before returning

---
 core/src/components/Spell.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index 66dfa7820..ad4bf0c46 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -153,6 +153,10 @@ export class SpellComponent extends ThothComponent<
       throw new Error(`Error running spell ${node.data.spellId}`)
     }
 
-    return response.data.outputs
+    // There should be a cleaner way to do this.  Problem is that the modules update sockets adds outputs to the task options that use the socket key.  Not helpful in our case and we need to swap the outputs for the proper socket keys.
+    const formattedOutputs = this.formatOutputs(node, response.data.outputs)
+
+    if (!formattedOutputs) return {}
+    return formattedOutputs
   }
 }

From e6d77fc00ee5bbc04c217bb6c6631eb727b9c430 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 16:17:49 -0700
Subject: [PATCH 465/531] Add helper to get socket keys from output name

---
 core/src/utils/nodeHelpers.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/core/src/utils/nodeHelpers.ts b/core/src/utils/nodeHelpers.ts
index 70a12a385..690924bec 100644
--- a/core/src/utils/nodeHelpers.ts
+++ b/core/src/utils/nodeHelpers.ts
@@ -5,8 +5,15 @@ type Inputs = {
   name: string
 }
 
+type Outputs = Inputs
+
 export const inputNameFromSocketKey = (node: NodeData, socketKey: string) => {
   return (node.data.inputs as Inputs[]).find(
     input => input.socketKey === socketKey
   )?.name
 }
+
+export const socketKeyFromOutputName = (node: NodeData, name: string) => {
+  return (node.data.outputs as Outputs[]).find(output => output.name === name)
+    ?.socketKey
+}

From 759d2c5dd7be114a13733c6e375bf0f56503b28d Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 16:18:24 -0700
Subject: [PATCH 466/531] Refactor add socket util to accept useSocketName
 option

---
 core/src/plugins/modulePlugin/utils.ts | 87 ++++++++++++++++++++------
 1 file changed, 67 insertions(+), 20 deletions(-)

diff --git a/core/src/plugins/modulePlugin/utils.ts b/core/src/plugins/modulePlugin/utils.ts
index 6a9395506..768eac90d 100644
--- a/core/src/plugins/modulePlugin/utils.ts
+++ b/core/src/plugins/modulePlugin/utils.ts
@@ -95,12 +95,21 @@ const updateSockets = (node: ThothNode, sockets: ModuleSocketType[]) => {
   })
 }
 
-const addSockets = (
-  node: ThothNode,
-  sockets: ModuleSocketType[],
-  connectionType: 'input' | 'output',
-  taskType: 'option' | 'output' = 'output'
-) => {
+type AddSockets = {
+  node: ThothNode
+  sockets: ModuleSocketType[]
+  connectionType: 'input' | 'output'
+  taskType?: 'option' | 'output'
+  useSocketName?: boolean
+}
+
+const addSockets = ({
+  node,
+  sockets,
+  connectionType,
+  taskType = 'output',
+  useSocketName = false,
+}: AddSockets) => {
   const uniqueCount = new Set(sockets.map(i => i.name)).size
   const currentConnection = node.data[
     (connectionType + 's') as ThroughPutType
@@ -131,34 +140,72 @@ const addSockets = (
       const currentConnection = node.data[
         (connectionType + 's') as ThroughPutType
       ] as DataSocketType[]
+      const key = useSocketName ? name : socketKey
+
       currentConnection.push({
         name: name as SocketNameType,
         taskType: taskType,
-        socketKey: socketKey,
+        socketKey: key,
         connectionType: connectionType,
         socketType: socketNameMap[socket.name as SocketNameType],
       })
 
       node[addMethod](
-        new Socket(socketKey, name, socket, taskType === 'option') as Input &
-          Output
+        new Socket(key, name, socket, taskType === 'option') as Input & Output
       )
       if (connectionType === 'output')
-        node.inspector.component.task.outputs[socketKey] = taskType
+        node.inspector.component.task.outputs[key] = taskType
     })
 }
 
-export function addIO(
-  node: ThothNode,
-  inputs: ModuleSocketType[],
-  outputs: ModuleSocketType[],
-  triggerOuts: ModuleSocketType[],
+type AddIO = {
+  node: ThothNode
+  inputs: ModuleSocketType[]
+  outputs: ModuleSocketType[]
+  triggerOuts: ModuleSocketType[]
   triggerIns: ModuleSocketType[]
-) {
-  if (inputs?.length > 0) addSockets(node, inputs, 'input')
-  if (triggerIns?.length > 0) addSockets(node, triggerIns, 'input', 'option')
-  if (outputs?.length > 0) addSockets(node, outputs, 'output')
-  if (triggerOuts?.length > 0) addSockets(node, triggerOuts, 'output', 'option')
+  useSocketName: boolean
+}
+
+export function addIO({
+  node,
+  inputs,
+  outputs,
+  triggerOuts,
+  triggerIns,
+  useSocketName,
+}: AddIO) {
+  // This is SOOOOO messy.
+  if (inputs?.length > 0)
+    addSockets({
+      node,
+      sockets: inputs,
+      connectionType: 'input',
+      useSocketName,
+    })
+  if (triggerIns?.length > 0)
+    addSockets({
+      node,
+      sockets: triggerIns,
+      connectionType: 'input',
+      taskType: 'option',
+      useSocketName,
+    })
+  if (outputs?.length > 0)
+    addSockets({
+      node,
+      sockets: outputs,
+      connectionType: 'output',
+      useSocketName,
+    })
+  if (triggerOuts?.length > 0)
+    addSockets({
+      node,
+      sockets: triggerOuts,
+      connectionType: 'output',
+      taskType: 'option',
+      useSocketName,
+    })
 }
 
 // here we can only remove the inputs and outputs that are not supposed to be on the node.

From 57419a1451b2b451f4d02f5c95da15b545faf065 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 16:18:53 -0700
Subject: [PATCH 467/531] Use new addIO argument shape with use socket name
 option

---
 core/src/plugins/modulePlugin/index.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/core/src/plugins/modulePlugin/index.ts b/core/src/plugins/modulePlugin/index.ts
index 47623d974..b47abc0c9 100644
--- a/core/src/plugins/modulePlugin/index.ts
+++ b/core/src/plugins/modulePlugin/index.ts
@@ -134,7 +134,8 @@ function install(
         if (builder) {
           component.updateModuleSockets = (
             node: ThothNode,
-            chainData?: ChainData
+            chainData?: ChainData,
+            useSocketName: boolean = false
           ) => {
             const modules = moduleManager.modules
             const currentNodeModule = node.data.module as string
@@ -163,7 +164,14 @@ function install(
 
             try {
               // The arguments for this are getting bit crazy
-              addIO(node, inputs, outputs, triggerOuts, triggerIns)
+              addIO({
+                node,
+                inputs,
+                outputs,
+                triggerOuts,
+                triggerIns,
+                useSocketName,
+              })
             } catch (e) {
               return runContext.trigger('warn', e)
             }

From c600210528f88516d219382ae697943da9ef5c07 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 16:19:15 -0700
Subject: [PATCH 468/531] Fix worker return type of spell component

---
 core/src/components/Spell.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index ad4bf0c46..c3e37929f 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -20,7 +20,7 @@ import {
 const info = `The Module component allows you to add modules into your chain.  A module is a bundled self contained chain that defines inputs, outputs, and triggers using components.`
 
 export class SpellComponent extends ThothComponent<
-  Promise<ModuleWorkerOutput[]>
+  Promise<ModuleWorkerOutput>
 > {
   _task: Task
   updateModuleSockets: Function

From c4132d6ba85870b623a2c10adc7ca53c4bce400b Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 16:19:41 -0700
Subject: [PATCH 469/531] Use new socket name option in update sockets of spell
 component

---
 core/src/components/Spell.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index c3e37929f..09763a391 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -96,7 +96,7 @@ export class SpellComponent extends ThothComponent<
 
   updateSockets(node: ThothNode, spell: Spell) {
     const chain = JSON.parse(JSON.stringify(spell.chain))
-    this.updateModuleSockets(node, chain)
+    this.updateModuleSockets(node, chain, true)
     this.editor.trigger('process')
     node.update()
   }

From 27739167d43529af3be6e6378177acfb212f8086 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 16:19:56 -0700
Subject: [PATCH 470/531] Clean up spell worker return

---
 core/src/components/Spell.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index 09763a391..67f4cf5a6 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -153,10 +153,6 @@ export class SpellComponent extends ThothComponent<
       throw new Error(`Error running spell ${node.data.spellId}`)
     }
 
-    // There should be a cleaner way to do this.  Problem is that the modules update sockets adds outputs to the task options that use the socket key.  Not helpful in our case and we need to swap the outputs for the proper socket keys.
-    const formattedOutputs = this.formatOutputs(node, response.data.outputs)
-
-    if (!formattedOutputs) return {}
-    return formattedOutputs
+    return response.data.outputs
   }
 }

From 711ae5701ed6895aeef387a21af0d34ab5f54b39 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 16:20:10 -0700
Subject: [PATCH 471/531] Add some helpful comments, hopefully.

---
 core/src/components/Spell.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index 67f4cf5a6..eaf7931af 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -143,7 +143,7 @@ export class SpellComponent extends ThothComponent<
     //   return module.outputs
     // }
 
-    // Otherwise, if we are, this is running serverside.
+    // We format the inputs since these inputs rely on the use of the socket keys.
     const flattenedInputs = this.formatInputs(node, inputs)
 
     if (!thoth.runSpell) return {}

From 9a1efc0de83d4f29a288fc281c95589bb350399a Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 16:36:08 -0700
Subject: [PATCH 472/531] Pass tab down into data controls

---
 client/src/workspaces/spells/windows/InspectorWindow.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/workspaces/spells/windows/InspectorWindow.tsx b/client/src/workspaces/spells/windows/InspectorWindow.tsx
index 729a3e592..889642901 100644
--- a/client/src/workspaces/spells/windows/InspectorWindow.tsx
+++ b/client/src/workspaces/spells/windows/InspectorWindow.tsx
@@ -145,6 +145,7 @@ const Inspector = props => {
         width={width}
         updateData={updateData}
         updateControl={updateControl}
+        tab={props.tab}
       />
     </Window>
   )

From a5d349363472c112483a77c11722a49fb0a4aeaf Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 16:36:32 -0700
Subject: [PATCH 473/531] Pass tab from data controls down into individual data
 controls

---
 client/src/workspaces/spells/DataControls/DataControls.jsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/src/workspaces/spells/DataControls/DataControls.jsx b/client/src/workspaces/spells/DataControls/DataControls.jsx
index 5c06a69cb..f30d2e6f7 100644
--- a/client/src/workspaces/spells/DataControls/DataControls.jsx
+++ b/client/src/workspaces/spells/DataControls/DataControls.jsx
@@ -40,6 +40,7 @@ const DataControls = ({
   data,
   inspectorData,
   nodeId,
+  tab,
 }) => {
   if (!dataControls)
     return <p className={css['message']}>No component selected</p>
@@ -61,6 +62,7 @@ const DataControls = ({
           name: inspectorData.name,
           initialValue: data[control.dataKey] || '',
           updateData,
+          tab,
         }
 
         const Component = controlMap[control.component]

From 2e03ef4457299121fb98b8a9655650f30b6fc335 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 16:36:50 -0700
Subject: [PATCH 474/531] Filter available spells to make sure current spell
 doesnt show up.

---
 .../spells/DataControls/SpellSelect.tsx         | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/client/src/workspaces/spells/DataControls/SpellSelect.tsx b/client/src/workspaces/spells/DataControls/SpellSelect.tsx
index 02de9044f..4c34c412e 100644
--- a/client/src/workspaces/spells/DataControls/SpellSelect.tsx
+++ b/client/src/workspaces/spells/DataControls/SpellSelect.tsx
@@ -13,7 +13,7 @@ import defaultChain from '@/data/chains/default'
 import { ChainData } from '@latitudegames/thoth-core/types'
 import { useEffect } from 'react'
 
-const ModuleSelect = ({ control, updateData, initialValue }) => {
+const SpellSelect = ({ control, updateData, initialValue, tab }) => {
   const dispatch = useAppDispatch()
 
   const [getSpell, { data: spell }] = useLazyGetSpellQuery()
@@ -35,10 +35,15 @@ const ModuleSelect = ({ control, updateData, initialValue }) => {
 
   const optionArray = () => {
     if (!spells) return
-    return spells.map((module, index) => ({
-      value: module.name,
-      label: module.name,
-    }))
+    return (
+      spells
+        // Make sure we don't allow someone to  select the current spell as a submodule.  No infinite loops.
+        .filter(spell => spell.name !== tab.id)
+        .map((spell, index) => ({
+          value: spell.name,
+          label: spell.name,
+        }))
+    )
   }
 
   const _openTab = async spell => {
@@ -108,4 +113,4 @@ const ModuleSelect = ({ control, updateData, initialValue }) => {
   )
 }
 
-export default ModuleSelect
+export default SpellSelect

From 116c73e6c5805b6f6ff952241a036d2841d557e6 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Tue, 5 Apr 2022 18:12:08 -0700
Subject: [PATCH 475/531] added flex to list item

---
 .../src/components/MenuBar/menuBar.module.css | 50 ++++++++++---------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/client/src/components/MenuBar/menuBar.module.css b/client/src/components/MenuBar/menuBar.module.css
index ff2bd2426..55a42ba10 100644
--- a/client/src/components/MenuBar/menuBar.module.css
+++ b/client/src/components/MenuBar/menuBar.module.css
@@ -1,51 +1,53 @@
 ul {
   margin: 0;
-	list-style: none;
-	position: relative;
+  list-style: none;
+  position: relative;
   border-radius: 3px;
-	}
-	
+}
+
 .list-item {
   border: 1px solid var(--dark-3);
   border-top: 0;
   border-bottom: 0;
   position: relative;
-	display: inline-block;
-	background-color: var(--dark-2);
+  display: inline-block;
+  background-color: var(--dark-2);
   padding: var(--extraSmall);
   padding-left: var(--small);
   text-transform: capitalize;
+  display: flex;
+  justify-content: space-between;
 }
 .list-item:hover {
-  background-color: var(--primary)
+  background-color: var(--primary);
 }
 
 /* Hide Dropdowns by Default */
 ul ul {
-	display: none;
-	position: absolute; 
-	top: var(--c4); /* the height of the main nav */
+  display: none;
+  position: absolute;
+  top: var(--c4); /* the height of the main nav */
   transform: translateX(calc(var(--c7) * -1));
 }
-	
+
 /* Display Dropdowns on Hover */
 ul li:hover > ul {
-	display:inherit;
+  display: inherit;
 }
-	
+
 /* Fisrt Tier Dropdown */
 ul ul li {
-	width:  var(--c20);
-	float:none;
-	display:list-item;
-	position: relative;
+  width: var(--c20);
+  float: none;
+  display: list-item;
+  position: relative;
 }
 
 /* Second, Third and more Tiers	*/
 ul ul ul li {
-	position: relative;
-	top:calc(var(--c4) * -1); 
-	left: var(--c23);
+  position: relative;
+  top: calc(var(--c4) * -1);
+  left: var(--c23);
 }
 
 li.list-item:first-child {
@@ -79,7 +81,7 @@ li.list-item:only-child {
 .thoth-logo {
   position: relative;
   top: 2px;
-  margin-left: calc( var(--c2) + 2px);
+  margin-left: calc(var(--c2) + 2px);
   margin-right: var(--c3);
   height: var(--c2);
 }
@@ -90,7 +92,7 @@ li.list-item:only-child {
   padding: var(--extraSmall);
   padding-left: var(--small);
   padding-right: var(--small);
-  font-family: "IBM Plex Mono";
+  font-family: 'IBM Plex Mono';
   text-transform: uppercase;
   list-style: none;
 
@@ -100,7 +102,7 @@ li.list-item:only-child {
 }
 .menu-bar-item:hover {
   background-color: var(--dark-2);
-  filter: drop-shadow(0px 5px 5px rgba(0,0,0,0.3));
+  filter: drop-shadow(0px 5px 5px rgba(0, 0, 0, 0.3));
 }
 .folder-arrow {
   display: none;
@@ -113,4 +115,4 @@ li.list-item:only-child {
   top: 49%;
   right: var(--small);
   transform: translateY(-50%);
-}
\ No newline at end of file
+}

From ce4b741a5ce95d5aeda3dc2b495f5e1a85fb86cd Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Tue, 5 Apr 2022 18:12:27 -0700
Subject: [PATCH 476/531] add hotKey strings to menu bar items

---
 client/src/components/MenuBar/MenuBar.tsx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/client/src/components/MenuBar/MenuBar.tsx b/client/src/components/MenuBar/MenuBar.tsx
index 15678cdf8..03cfdfff6 100644
--- a/client/src/components/MenuBar/MenuBar.tsx
+++ b/client/src/components/MenuBar/MenuBar.tsx
@@ -136,21 +136,27 @@ const MenuBar = () => {
       items: {
         new_spell: {
           onClick: onNew,
+          hotKey: 'option+n',
         },
         open_spell: {
           onClick: onOpen,
+          hotKey: 'option+o',
         },
         edit_spell: {
           onClick: onEdit,
+          hotKey: 'option+e',
         },
         save_spell: {
           onClick: onSave,
+          hotKey: 'option+s',
         },
         save_spell_as: {
           onClick: onSaveAs,
+          hotKey: 'option+shift+s',
         },
         export_spell: {
           onClick: onExport,
+          hotKey: 'option+shift+e',
         },
       },
     },

From 6de5617987e7d4d3d30ce4915015db561a086ca3 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Tue, 5 Apr 2022 18:12:45 -0700
Subject: [PATCH 477/531] hide copy and paste for now

---
 client/src/components/MenuBar/MenuBar.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/components/MenuBar/MenuBar.tsx b/client/src/components/MenuBar/MenuBar.tsx
index 03cfdfff6..921a3473a 100644
--- a/client/src/components/MenuBar/MenuBar.tsx
+++ b/client/src/components/MenuBar/MenuBar.tsx
@@ -164,8 +164,8 @@ const MenuBar = () => {
       items: {
         undo: {},
         redo: {},
-        copy: {},
-        paste: {},
+        // copy: {},
+        // paste: {},
       },
     },
     dev: {

From 0fc9b2739069509fbf7780d8f02fdc512c6f1cca Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Tue, 5 Apr 2022 18:13:02 -0700
Subject: [PATCH 478/531] add parse string to unicode helper

---
 client/src/components/MenuBar/MenuBar.tsx | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/client/src/components/MenuBar/MenuBar.tsx b/client/src/components/MenuBar/MenuBar.tsx
index 921a3473a..55871323d 100644
--- a/client/src/components/MenuBar/MenuBar.tsx
+++ b/client/src/components/MenuBar/MenuBar.tsx
@@ -196,6 +196,15 @@ const MenuBar = () => {
     },
   }
 
+  const parseStringToUnicode = commandString => {
+    let formattedCommand = commandString
+    formattedCommand = formattedCommand.replace('option', '\u2325')
+    formattedCommand = formattedCommand.replace('shift', '\u21E7')
+    formattedCommand = formattedCommand.replace('cmd', '\u2318')
+    formattedCommand = formattedCommand.replace(/[`+`]/g, ' ')
+    return formattedCommand
+  }
+
   //Menu bar rendering
   const ListItem = ({ item, label, topLevel, onClick }) => {
     label = label ? label.replace(/_/g, ' ') : label

From 1900f1d8de2d64ed96a29b539f27de34f6188079 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Tue, 5 Apr 2022 18:13:20 -0700
Subject: [PATCH 479/531] add hotKeyLabel to ListItem props

---
 client/src/components/MenuBar/MenuBar.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/MenuBar/MenuBar.tsx b/client/src/components/MenuBar/MenuBar.tsx
index 55871323d..895bc7ce7 100644
--- a/client/src/components/MenuBar/MenuBar.tsx
+++ b/client/src/components/MenuBar/MenuBar.tsx
@@ -206,7 +206,7 @@ const MenuBar = () => {
   }
 
   //Menu bar rendering
-  const ListItem = ({ item, label, topLevel, onClick }) => {
+  const ListItem = ({ item, label, topLevel, onClick, hotKeyLabel }) => {
     label = label ? label.replace(/_/g, ' ') : label
     let children
     if (item.items && Object.keys(item.items)) {

From b1790b92080d5aba4353efa5f46f2c76b9faf54a Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Tue, 5 Apr 2022 18:13:43 -0700
Subject: [PATCH 480/531] refactor ListItem component to be less confusing

---
 client/src/components/MenuBar/MenuBar.tsx | 35 ++++++++++++++++-------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/client/src/components/MenuBar/MenuBar.tsx b/client/src/components/MenuBar/MenuBar.tsx
index 895bc7ce7..e5e7c10a4 100644
--- a/client/src/components/MenuBar/MenuBar.tsx
+++ b/client/src/components/MenuBar/MenuBar.tsx
@@ -212,17 +212,30 @@ const MenuBar = () => {
     if (item.items && Object.keys(item.items)) {
       children = (
         <ul className={css['menu-panel']}>
-          {Object.keys(item.items).map((i, x) => {
-            return (
-              <ListItem
-                item={item?.items[i]}
-                label={Object.keys(item.items)[x]}
-                topLevel={false}
-                key={x}
-                onClick={item?.items[i].onClick}
-              />
-            )
-          })}
+          {Object.entries(item.items).map(
+            ([key, item]: [string, Record<string, any>]) => {
+              useHotkeys(
+                item.hotKey,
+                event => {
+                  event.preventDefault()
+                  item.onClick()
+                },
+                { enableOnTags: ['INPUT'] },
+                [item.onClick]
+              )
+
+              return (
+                <ListItem
+                  item={item}
+                  label={key}
+                  topLevel={false}
+                  key={key}
+                  onClick={item.onClick}
+                  hotKeyLabel={item.hotKey}
+                />
+              )
+            }
+          )}
         </ul>
       )
     }

From 20af59647f977e0121704e3c1617426841493ca2 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Tue, 5 Apr 2022 18:14:13 -0700
Subject: [PATCH 481/531] add parsed hotkeylabel to the list items

---
 client/src/components/MenuBar/MenuBar.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/components/MenuBar/MenuBar.tsx b/client/src/components/MenuBar/MenuBar.tsx
index e5e7c10a4..f1a86f9d3 100644
--- a/client/src/components/MenuBar/MenuBar.tsx
+++ b/client/src/components/MenuBar/MenuBar.tsx
@@ -246,6 +246,7 @@ const MenuBar = () => {
         onClick={onClick}
       >
         {label}
+        {hotKeyLabel && <span>{parseStringToUnicode(hotKeyLabel)}</span>}
         {children && <div className={css['folder-arrow']}> ❯ </div>}
         {!topLevel && <br />}
         {children || null}

From 5a0008c727321cc104ec09eb4341124b7db40f7d Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Tue, 5 Apr 2022 18:14:35 -0700
Subject: [PATCH 482/531] change children operand to use && rather than ||

---
 client/src/components/MenuBar/MenuBar.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/src/components/MenuBar/MenuBar.tsx b/client/src/components/MenuBar/MenuBar.tsx
index f1a86f9d3..52dd86a0d 100644
--- a/client/src/components/MenuBar/MenuBar.tsx
+++ b/client/src/components/MenuBar/MenuBar.tsx
@@ -248,8 +248,7 @@ const MenuBar = () => {
         {label}
         {hotKeyLabel && <span>{parseStringToUnicode(hotKeyLabel)}</span>}
         {children && <div className={css['folder-arrow']}> ❯ </div>}
-        {!topLevel && <br />}
-        {children || null}
+        {children && children}
       </li>
     )
   }

From 56ee6f476c1787f0df9983339e6fff9e99ff15b7 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Tue, 5 Apr 2022 18:14:51 -0700
Subject: [PATCH 483/531] comment out toplevel <br> for now

---
 client/src/components/MenuBar/MenuBar.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/components/MenuBar/MenuBar.tsx b/client/src/components/MenuBar/MenuBar.tsx
index 52dd86a0d..4ed2ca15b 100644
--- a/client/src/components/MenuBar/MenuBar.tsx
+++ b/client/src/components/MenuBar/MenuBar.tsx
@@ -248,6 +248,7 @@ const MenuBar = () => {
         {label}
         {hotKeyLabel && <span>{parseStringToUnicode(hotKeyLabel)}</span>}
         {children && <div className={css['folder-arrow']}> ❯ </div>}
+        {/* {!topLevel && <br />} */}
         {children && children}
       </li>
     )

From 1c444e40ce5dcd7f30b9fc9a97d67f72955c4b23 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Tue, 5 Apr 2022 18:15:11 -0700
Subject: [PATCH 484/531] add the hotKeyLabel to the rendered list item

---
 client/src/components/MenuBar/MenuBar.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/components/MenuBar/MenuBar.tsx b/client/src/components/MenuBar/MenuBar.tsx
index 4ed2ca15b..7dc788ce1 100644
--- a/client/src/components/MenuBar/MenuBar.tsx
+++ b/client/src/components/MenuBar/MenuBar.tsx
@@ -271,6 +271,7 @@ const MenuBar = () => {
           label={Object.keys(menuBarItems)[index]}
           topLevel={true}
           key={index}
+          hotKeyLabel={menuBarItems[item].hotKeyLabel}
           onClick={() => {
             handleClick(menuBarItems[item].onClick)
           }}

From c8b93ff521810aadb8e1c596725d999f1cce1b45 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Tue, 5 Apr 2022 18:24:37 -0700
Subject: [PATCH 485/531] update over lay width and height

---
 client/src/components/Node/Node.module.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/client/src/components/Node/Node.module.css b/client/src/components/Node/Node.module.css
index bcf657c66..cfe2d2908 100644
--- a/client/src/components/Node/Node.module.css
+++ b/client/src/components/Node/Node.module.css
@@ -28,6 +28,7 @@
   position: absolute;
   right: 10px;
   color: var(--red);
+  border-radius: var(--extraSmall);
 }
 .deprecated-overlay {
   background-color: var(--red);
@@ -153,4 +154,8 @@
   background-repeat: no-repeat;
   background-position: center;
   background-size: 20%;
+  border-radius: var(--extraSmall);
+  width: 99%;
+  height: 99%;
+  margin: auto;
 }

From b773853efa120241eaa7123ce533c75239044b77 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 21:34:59 -0700
Subject: [PATCH 486/531] Fix spell subscription in spell index

---
 client/src/workspaces/spells/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/workspaces/spells/index.tsx b/client/src/workspaces/spells/index.tsx
index 5079ec1da..0651310b7 100644
--- a/client/src/workspaces/spells/index.tsx
+++ b/client/src/workspaces/spells/index.tsx
@@ -48,7 +48,7 @@ const Workspace = ({ tab, tabs, pubSub }) => {
       if (!spellRef.current) return
       // TODO we can probably send this update to a spell namespace for this spell.
       // then spells can subscribe to only their dependency updates.
-      const event = events.$SUBSPELL_UPDATED(editor.toJSON())
+      const event = events.$SUBSPELL_UPDATED(spellRef.current.name)
       const spell = {
         ...spellRef.current,
         chain: editor.toJSON(),

From f65225ed182f7bf0334dc8e5e8652cb050e4baff Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 21:35:24 -0700
Subject: [PATCH 487/531] Add cache in spell subscribe

---
 core/src/components/Spell.ts | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index eaf7931af..bcfac3507 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -1,3 +1,4 @@
+import isEqual from 'lodash/isEqual'
 import Rete from 'rete'
 import {
   ModuleWorkerOutput,
@@ -49,13 +50,18 @@ export class SpellComponent extends ThothComponent<
   subscribe(node: ThothNode, spellId: string) {
     if (this.subscriptionMap[node.id]) this.subscriptionMap[node.id]()
 
+    let cache: Spell
+
     // Subscribe to any changes to that spell here
     this.subscriptionMap[node.id] = this.editor.onSpellUpdated(
       spellId,
       (spell: Spell) => {
-        // this can probably be better optimise this
-        console.log('SPELL UPDATED')
-        this.updateSockets(node, spell)
+        if (!isEqual(spell, cache)) {
+          // this can probably be better optimise this
+          this.updateSockets(node, spell)
+        }
+
+        cache = spell
       }
     )
   }

From a0a44c4d9eaf720085dc9689a5513a665ef5dcc1 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 21:36:16 -0700
Subject: [PATCH 488/531] Use timeout before subscribing to spell to prevent
 socket overwritting

---
 core/src/components/Spell.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index bcfac3507..bb43cd1a4 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -97,6 +97,12 @@ export class SpellComponent extends ThothComponent<
     node.addInput(stateSocket)
     node.inspector.add(spellControl)
 
+    if (node.data.spellId) {
+      setTimeout(() => {
+        this.subscribe(node, node.data.spellId as string)
+      }, 1000)
+    }
+
     return node
   }
 

From 15823f1febeb99bc89072c427db8be83611715cf Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 21:39:28 -0700
Subject: [PATCH 489/531] If spell hasnt changed dont run spell control on data

---
 core/src/components/Spell.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index bb43cd1a4..e1e0e3a62 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -73,11 +73,11 @@ export class SpellComponent extends ThothComponent<
       defaultValue: (node.data.spell as string) || '',
     })
 
-    if (node.data.spellId) this.subscribe(node, node.data.spellId as string)
-
     const stateSocket = new Rete.Input('state', 'State', objectSocket)
 
     spellControl.onData = (spell: Spell) => {
+      // break out of it the nodes data already exists.
+      if (spell.name === node.data.spellId) return
       node.data.spellId = spell.name
 
       // Update the sockets

From 97c5aa377a12c524fbd855250e44ec94ffad4f6a Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Tue, 5 Apr 2022 21:39:49 -0700
Subject: [PATCH 490/531] Remove editor process in update sockets function

---
 core/src/components/Spell.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index e1e0e3a62..e6f9b82f9 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -109,7 +109,6 @@ export class SpellComponent extends ThothComponent<
   updateSockets(node: ThothNode, spell: Spell) {
     const chain = JSON.parse(JSON.stringify(spell.chain))
     this.updateModuleSockets(node, chain, true)
-    this.editor.trigger('process')
     node.update()
   }
 

From 4a87cd0658268d9b1f1075ad8df5dbc312959c82 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 00:03:58 -0700
Subject: [PATCH 491/531] Remove runSpell form engine context extension

---
 client/src/workspaces/contexts/ThothInterfaceProvider.tsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
index c4e8ed238..79ec14484 100644
--- a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
+++ b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
@@ -22,7 +22,6 @@ export interface ThothInterfaceContext extends EngineContext {
   sendToDebug: (data) => void
   onDebug: (node, callback) => void
   clearTextEditor: () => void
-  runSpell: (inputs: Record<string, any>, spellId: string) => void
   getCurrentGameState: () => Record<string, unknown>
   updateCurrentGameState: (update) => void
   readFromImageCache: (caption, cacheTag, topK) => Promise<any>
@@ -167,8 +166,11 @@ const ThothInterfaceProvider = ({ children, tab }) => {
     console.log('RUN SPELL')
     const response = await _runSpell({ inputs, spellId })
 
-    console.log('RESPONSE', response)
-    return response
+    if ('error' in response) {
+      throw new Error(`Error running spell ${spellId}`)
+    }
+
+    return response.data.outputs
   }
 
   const clearTextEditor = () => {

From 1cf14a7df5e122b0fe3d52672f8925fd9069b11f Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 00:04:16 -0700
Subject: [PATCH 492/531] Change run spell to spell runner and fix some bugs

---
 .../src/utils/{runSpell.ts => SpellRunner.ts} | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)
 rename core/src/utils/{runSpell.ts => SpellRunner.ts} (88%)

diff --git a/core/src/utils/runSpell.ts b/core/src/utils/SpellRunner.ts
similarity index 88%
rename from core/src/utils/runSpell.ts
rename to core/src/utils/SpellRunner.ts
index a0c18e290..dda44c9c9 100644
--- a/core/src/utils/runSpell.ts
+++ b/core/src/utils/SpellRunner.ts
@@ -2,7 +2,7 @@ import {
   getComponents,
   initSharedEngine,
 } from '@latitudegames/thoth-core/server'
-import { ChainData, ModuleComponent, Spell } from '../../types'
+import { ChainData, ModuleComponent, Spell as SpellType } from '../../types'
 import { EngineContext, extractNodes, ThothEngine } from '../engine'
 import { Module } from '../plugins/modulePlugin/module'
 import { extractModuleInputKeys } from './chainHelpers'
@@ -11,9 +11,9 @@ type RunSpellConstructor = {
   thothInterface: EngineContext
 }
 
-class RunSpell {
+class SpellRunner {
   engine: ThothEngine
-  currentSpell!: Spell
+  currentSpell!: SpellType
   module: Module
   thothInterface: EngineContext
 
@@ -100,11 +100,11 @@ class RunSpell {
     this.engine.tasks.forEach(t => t.reset())
   }
 
-  loadSpell(spell: Spell) {
+  async loadSpell(spell: SpellType) {
     this.currentSpell = spell
 
     // We process the graph for the new spell which will set up all the task workers
-    this.engine.process(spell.chain as ChainData, null, this.context)
+    await this.engine.process(spell.chain as ChainData, null, this.context)
   }
 
   /**
@@ -121,15 +121,19 @@ class RunSpell {
     this._loadInputs(inputs)
 
     const component = this._getComponent(componentName) as ModuleComponent
-    const triggeredNopde = this._getFirstNodeTrigger()
+    const triggeredNode = this._getFirstNodeTrigger()
 
     // this running is where the main "work" happens.
     // I do wonder whether we could make this even more elegant by having the node
     // subscribe to a run pubsub and then we just use that.  This would treat running
     // from a trigger in node like any other data stream. Or even just pass in socket IO.
-    await component.run(triggeredNopde)
-
-    return this.outputData
+    try {
+      await component.run(triggeredNode)
+      return this.outputData
+    } catch (err) {
+      console.log('err', err)
+      throw new Error('Error running spell')
+    }
   }
 
   /**
@@ -140,4 +144,4 @@ class RunSpell {
   }
 }
 
-export default RunSpell
+export default SpellRunner

From cfce5cb54de80df4b1165a223cc5d3b194953fdf Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 00:04:30 -0700
Subject: [PATCH 493/531] Export spell runner from server index

---
 core/server.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/server.ts b/core/server.ts
index f6af79f9d..8d76d2add 100644
--- a/core/server.ts
+++ b/core/server.ts
@@ -2,11 +2,13 @@ import { getComponents, components } from './src/components/components'
 import { initSharedEngine } from './src/engine'
 import { Task } from './src/plugins/taskPlugin/task'
 import { ThothComponent } from './src/thoth-component'
+import SpellRunner from './src/utils/SpellRunner'
 
 export { getComponents } from './src/components/components'
 export type { EngineContext } from './src/engine'
 export { Task } from './src/plugins/taskPlugin/task'
 export { initSharedEngine }
+export { SpellRunner }
 
 export default {
   components,
@@ -14,4 +16,5 @@ export default {
   initSharedEngine,
   Task,
   ThothComponent,
+  SpellRunner,
 }

From 3cac58f3f15e1820e982063f0125d627a7a3413a Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 00:04:41 -0700
Subject: [PATCH 494/531] Add runSpell to engine context type

---
 core/src/engine.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/src/engine.ts b/core/src/engine.ts
index 2cc8e6e86..e6071aa3d 100644
--- a/core/src/engine.ts
+++ b/core/src/engine.ts
@@ -55,7 +55,10 @@ export type EngineContext = {
     model: string,
     request: string
   ) => Promise<{ error?: unknown; [key: string]: unknown }>
-  runSpell?: Function
+  runSpell?: (
+    flattenedInputs: Record<string, any>,
+    spellId: string
+  ) => Record<string, any>
   readFromImageCache: (
     caption: string,
     cacheTag?: string,

From 7d57b607672cfa0f073bc56d1aed57373a904d5e Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 00:05:03 -0700
Subject: [PATCH 495/531] Clean up spell worker

---
 core/src/components/Spell.ts | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index e6f9b82f9..a6b3d24be 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -134,36 +134,21 @@ export class SpellComponent extends ThothComponent<
   async worker(
     node: NodeData,
     inputs: ThothWorkerInputs,
-    outputs: { [key: string]: string },
+    _outputs: { [key: string]: string },
     {
       module,
       thoth,
     }: { module: { outputs: ModuleWorkerOutput[] }; thoth: EngineContext }
   ) {
-    // // If there is a module present, this is runnign via the module plugin
-    // if (module) {
-    //   const open = Object.entries(module.outputs)
-    //     .filter(([, value]) => typeof value === 'boolean' && value)
-    //     .map(([key]) => key)
-    //   // close all triggers first
-    //   const dataOutputs = node.data.outputs as ModuleWorkerOutput[]
-    //   this._task.closed = dataOutputs
-    //     .map((out: { name: string }) => out.name)
-    //     .filter((out: string) => !open.includes(out))
-
-    //   return module.outputs
-    // }
-
     // We format the inputs since these inputs rely on the use of the socket keys.
     const flattenedInputs = this.formatInputs(node, inputs)
 
     if (!thoth.runSpell) return {}
-    const response = await thoth.runSpell(flattenedInputs, node.data.spellId)
-
-    if ('error' in response) {
-      throw new Error(`Error running spell ${node.data.spellId}`)
-    }
+    const outputs = await thoth.runSpell(
+      flattenedInputs,
+      node.data.spellId as string
+    )
 
-    return response.data.outputs
+    return outputs
   }
 }

From 1f5042d0f5ffa7de83e613c079a5ccef05c4b0e2 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 09:13:11 -0700
Subject: [PATCH 496/531] Refactor thoth interface type into types and make it
 EditorContext

---
 core/types.ts | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/core/types.ts b/core/types.ts
index 07af95aad..79315a07b 100644
--- a/core/types.ts
+++ b/core/types.ts
@@ -13,14 +13,64 @@ import {
 import { Inspector } from './src/plugins/inspectorPlugin/Inspector'
 import { TaskOutputTypes } from './src/plugins/taskPlugin/task'
 import { SocketNameType, SocketType } from './src/sockets'
-import { EngineContext } from './src/engine'
 import { ThothTask } from './src/thoth-component'
 import { ThothConsole } from './src/plugins/debuggerPlugin/ThothConsole'
 import { Data } from 'rete/types/core/data'
+import { ImageType } from './src/components/VisualGeneration'
 export { ThothEditor } from './src/editor'
 
 export type { InspectorData } from './src/plugins/inspectorPlugin/Inspector'
 
+export type EngineContext = {
+  completion: (
+    body: ModelCompletionOpts
+  ) => Promise<string | OpenAIResultChoice | undefined>
+  getCurrentGameState: () => Record<string, unknown>
+  updateCurrentGameState: (update: Record<string, unknown>) => void
+  enkiCompletion: (
+    taskName: string,
+    inputs: string[] | string
+  ) => Promise<{ outputs: string[] }>
+  huggingface: (
+    model: string,
+    request: string
+  ) => Promise<{ error?: unknown; [key: string]: unknown }>
+  runSpell: (
+    flattenedInputs: Record<string, any>,
+    spellId: string,
+    state: Record<string, any>
+  ) => Record<string, any>
+  readFromImageCache: (
+    caption: string,
+    cacheTag?: string,
+    topK?: number
+  ) => Promise<ImageType[]>
+  processCode: (
+    code: unknown,
+    inputs: ThothWorkerInputs,
+    data: Record<string, any>
+  ) => void
+}
+
+export type EventPayload = Record<string, any>
+
+export interface EditorContext extends EngineContext {
+  onInspector: (node: NodeData, callback: Function) => void
+  onPlaytest: (callback: Function) => void
+  sendToPlaytest: (data: EventPayload) => void
+  sendToInspector: (data: EventPayload) => void
+  sendToDebug: (data: EventPayload) => void
+  onDebug: (node: NodeData, callback: Function) => void
+  clearTextEditor: () => void
+  getCurrentGameState: () => Record<string, unknown>
+  updateCurrentGameState: (update: EventPayload) => void
+  processCode: (
+    code: unknown,
+    inputs: ThothWorkerInputs,
+    data: Record<string, any>
+  ) => void
+}
+
 export type EventsTypes = {
   run: void
   save: void

From 740444e6fe2ea5a7ef2cc8a5ceb786db930c457b Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 09:13:20 -0700
Subject: [PATCH 497/531] Remove EngineContext from engine file

---
 core/src/engine.ts | 47 +---------------------------------------------
 1 file changed, 1 insertion(+), 46 deletions(-)

diff --git a/core/src/engine.ts b/core/src/engine.ts
index e6071aa3d..5eb19934f 100644
--- a/core/src/engine.ts
+++ b/core/src/engine.ts
@@ -1,14 +1,6 @@
 import Rete, { Engine } from 'rete'
 
-import {
-  ChainData,
-  ModelCompletionOpts,
-  ModuleType,
-  NodeData,
-  OpenAIResultChoice,
-  ThothWorkerInputs,
-} from '../types'
-import { ImageType } from './components/VisualGeneration'
+import { ChainData, ModuleType, NodeData, ThothWorkerInputs } from '../types'
 import debuggerPlugin from './plugins/debuggerPlugin'
 import ModulePlugin from './plugins/modulePlugin'
 import TaskPlugin, { Task } from './plugins/taskPlugin'
@@ -41,43 +33,6 @@ export abstract class ThothEngineComponent<WorkerReturnType> {
 }
 
 // TODO separate the engine context out from the editor context for cleaner typing.
-export type EngineContext = {
-  completion: (
-    body: ModelCompletionOpts
-  ) => Promise<string | OpenAIResultChoice | undefined>
-  getCurrentGameState: () => Record<string, unknown>
-  updateCurrentGameState: (update: Record<string, unknown>) => void
-  enkiCompletion: (
-    taskName: string,
-    inputs: string[] | string
-  ) => Promise<{ outputs: string[] }>
-  huggingface: (
-    model: string,
-    request: string
-  ) => Promise<{ error?: unknown; [key: string]: unknown }>
-  runSpell?: (
-    flattenedInputs: Record<string, any>,
-    spellId: string
-  ) => Record<string, any>
-  readFromImageCache: (
-    caption: string,
-    cacheTag?: string,
-    topK?: number
-  ) => Promise<ImageType[]>
-  onPlaytest?: Function
-  sendToDebug?: Function
-  onAddModule?: Function
-  onUpdateModule?: Function
-  sendToPlaytest?: Function
-  onInspector?: Function
-  sendToInspector?: Function
-  clearTextEditor?: Function
-  processCode?: (
-    code: unknown,
-    inputs: ThothWorkerInputs,
-    data: Record<string, any>
-  ) => void
-}
 
 export type InitEngineArguments = {
   name: string

From adde349cdea79e28d7827c7b7fde6611337eb5a8 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 09:14:00 -0700
Subject: [PATCH 498/531] Fix spell engine context import

---
 core/src/components/Spell.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index a6b3d24be..5c456e568 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -1,6 +1,7 @@
 import isEqual from 'lodash/isEqual'
 import Rete from 'rete'
 import {
+  EngineContext,
   ModuleWorkerOutput,
   NodeData,
   Spell,
@@ -9,7 +10,6 @@ import {
 } from '../../types'
 import { SpellControl } from '../dataControls/SpellControl'
 import { ThothEditor } from '../editor'
-import { EngineContext } from '../engine'
 import { Task } from '../plugins/taskPlugin/task'
 import { objectSocket } from '../sockets'
 import { ThothComponent } from '../thoth-component'
@@ -146,7 +146,8 @@ export class SpellComponent extends ThothComponent<
     if (!thoth.runSpell) return {}
     const outputs = await thoth.runSpell(
       flattenedInputs,
-      node.data.spellId as string
+      node.data.spellId as string,
+      flattenedInputs.state
     )
 
     return outputs

From 116ccbec81bbed138430b7670181e1b3b7afbe29 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 09:14:41 -0700
Subject: [PATCH 499/531] Fix engine context import in action type

---
 core/src/components/ActionType.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/components/ActionType.ts b/core/src/components/ActionType.ts
index 2c42e0591..e4b490ca4 100644
--- a/core/src/components/ActionType.ts
+++ b/core/src/components/ActionType.ts
@@ -1,13 +1,13 @@
 import Rete from 'rete'
 
 import {
+  EngineContext,
   NodeData,
   ThothNode,
   ThothWorkerInputs,
   ThothWorkerOutputs,
 } from '../../types'
 import { FewshotControl } from '../dataControls/FewshotControl'
-import { EngineContext } from '../engine'
 import { stringSocket, triggerSocket } from '../sockets'
 import { ThothComponent } from '../thoth-component'
 const fewshot = `Given an action classify the type of action it is

From 2df4d7fc5b85a4008085d336abb675da4f1ea678 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 09:15:06 -0700
Subject: [PATCH 500/531] Fix engine context import in  code component

---
 core/src/components/Code.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/components/Code.ts b/core/src/components/Code.ts
index 59ba6ed59..7b80cb814 100644
--- a/core/src/components/Code.ts
+++ b/core/src/components/Code.ts
@@ -1,6 +1,7 @@
 import Rete from 'rete'
 
 import {
+  EngineContext,
   NodeData,
   ThothNode,
   ThothWorkerInputs,
@@ -12,7 +13,6 @@ import { CodeControl } from '../dataControls/CodeControl'
 //@ts-ignore
 import { InputControl } from '../dataControls/InputControl'
 import { SocketGeneratorControl } from '../dataControls/SocketGenerator'
-import { EngineContext } from '../engine'
 import { triggerSocket } from '../sockets'
 import { ThothComponent } from '../thoth-component'
 

From b8df01d75510eadeb36549d65fb1c056e30fecb7 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 09:54:45 -0700
Subject: [PATCH 501/531] Add better return types to editor context

---
 core/types.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/types.ts b/core/types.ts
index 79315a07b..ea9b8cbab 100644
--- a/core/types.ts
+++ b/core/types.ts
@@ -55,12 +55,12 @@ export type EngineContext = {
 export type EventPayload = Record<string, any>
 
 export interface EditorContext extends EngineContext {
-  onInspector: (node: NodeData, callback: Function) => void
-  onPlaytest: (callback: Function) => void
-  sendToPlaytest: (data: EventPayload) => void
-  sendToInspector: (data: EventPayload) => void
-  sendToDebug: (data: EventPayload) => void
-  onDebug: (node: NodeData, callback: Function) => void
+  onInspector: (node: ThothNode, callback: Function) => Function
+  onPlaytest: (callback: Function) => Function
+  sendToPlaytest: (data: string) => Function
+  sendToInspector: (data: EventPayload) => Function
+  sendToDebug: (data: EventPayload) => Function
+  onDebug: (node: NodeData, callback: Function) => Function
   clearTextEditor: () => void
   getCurrentGameState: () => Record<string, unknown>
   updateCurrentGameState: (update: EventPayload) => void
@@ -98,7 +98,7 @@ export interface Spell {
 }
 
 export interface IRunContextEditor extends NodeEditor {
-  thoth: EngineContext
+  thoth: EditorContext
   abort: Function
 }
 

From cb331cbe08b6ab4ebe6ec4e2dd4e1a44332fcff0 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 09:55:05 -0700
Subject: [PATCH 502/531] Remove export of engine context form root index files

---
 core/index.ts     | 1 -
 core/server.ts    | 1 -
 core/src/index.ts | 1 -
 3 files changed, 3 deletions(-)

diff --git a/core/index.ts b/core/index.ts
index 1e99395cd..904a13bd8 100644
--- a/core/index.ts
+++ b/core/index.ts
@@ -7,7 +7,6 @@ export { zoomAt } from './src/plugins/areaPlugin/zoom-at'
 
 export { getComponents } from './src/components/components'
 export { initEditor } from './src/editor'
-export type { EngineContext } from './src/engine'
 export { Task } from './src/plugins/taskPlugin/task'
 
 export default {
diff --git a/core/server.ts b/core/server.ts
index 8d76d2add..d9327daac 100644
--- a/core/server.ts
+++ b/core/server.ts
@@ -5,7 +5,6 @@ import { ThothComponent } from './src/thoth-component'
 import SpellRunner from './src/utils/SpellRunner'
 
 export { getComponents } from './src/components/components'
-export type { EngineContext } from './src/engine'
 export { Task } from './src/plugins/taskPlugin/task'
 export { initSharedEngine }
 export { SpellRunner }
diff --git a/core/src/index.ts b/core/src/index.ts
index e065b3cc9..6514e5d38 100644
--- a/core/src/index.ts
+++ b/core/src/index.ts
@@ -4,7 +4,6 @@ import { Task } from './plugins/taskPlugin/task'
 
 export { getComponents } from './components/components'
 export { initEditor } from './editor'
-export type { EngineContext } from './engine'
 export { Task } from './plugins/taskPlugin/task'
 export { runChain } from './utils/runChain'
 export * from './utils/chainHelpers'

From d6d19c5d1d0d7864d611b8f1217635a36358473c Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 09:55:18 -0700
Subject: [PATCH 503/531] Use editor context in editor

---
 core/src/editor.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/editor.ts b/core/src/editor.ts
index b665316bc..2a2ccb444 100644
--- a/core/src/editor.ts
+++ b/core/src/editor.ts
@@ -6,9 +6,9 @@ import ContextMenuPlugin from 'rete-context-menu-plugin'
 import ReactRenderPlugin from 'rete-react-render-plugin'
 import { Data } from 'rete/types/core/data'
 
-import { EventsTypes } from '../types'
+import { EventsTypes, EditorContext } from '../types'
 import { getComponents } from './components/components'
-import { EngineContext, initSharedEngine } from './engine'
+import { initSharedEngine } from './engine'
 import CommentPlugin from './plugins/commentPlugin'
 import AreaPlugin from './plugins/areaPlugin'
 import DisplayPlugin from './plugins/displayPlugin'
@@ -26,7 +26,7 @@ import SelectionPlugin from './plugins/selectionPlugin'
 export class ThothEditor extends NodeEditor<EventsTypes> {
   tasks: Task[]
   pubSub: PubSubContext
-  thoth: EngineContext
+  thoth: EditorContext
   tab: { type: string }
   abort: unknown
   loadGraph: (graph: Data, relaoding?: boolean) => Promise<void>

From 6eddc8d870a18e383266cc799ec6846d87b8b64a Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 09:55:49 -0700
Subject: [PATCH 504/531] Fix typing in root thoth component class

---
 core/src/thoth-component.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/thoth-component.ts b/core/src/thoth-component.ts
index ef2e77fd7..13e3f42fd 100644
--- a/core/src/thoth-component.ts
+++ b/core/src/thoth-component.ts
@@ -1,7 +1,7 @@
 import { Node, NodeEditor, Socket } from 'rete'
 
-import { PubSubBase, ThothNode } from '../types'
-import { EngineContext, ThothEngineComponent } from './engine'
+import { EditorContext, PubSubBase, ThothNode } from '../types'
+import { ThothEngineComponent } from './engine'
 import { Task, TaskOptions } from './plugins/taskPlugin/task'
 
 // Note: We do this so Typescript knows what extra properties we're
@@ -16,7 +16,7 @@ export type PubSubContext = {
 
 class ThothReteNodeEditor extends NodeEditor {
   pubSub: PubSubContext
-  thoth: EngineContext
+  thoth: EditorContext
   tab: unknown
 }
 

From 222e8ef33b90acca98357c205921fbd0e470049f Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 09:56:06 -0700
Subject: [PATCH 505/531] Fix typing in all components

---
 core/src/components/DifficultyDetector.ts       | 2 +-
 core/src/components/EnkiTask.ts                 | 2 +-
 core/src/components/EntityDetector.ts           | 2 +-
 core/src/components/Generator.ts                | 2 +-
 core/src/components/Huggingface.ts              | 2 +-
 core/src/components/Input.ts                    | 5 +++--
 core/src/components/ItemDetector.ts             | 2 +-
 core/src/components/Output.ts                   | 6 +++---
 core/src/components/ProseToScript.ts            | 2 +-
 core/src/components/SafetyVerifier.ts           | 2 +-
 core/src/components/StateRead.ts                | 2 +-
 core/src/components/StateWrite.ts               | 2 +-
 core/src/components/TenseTransformer.ts         | 2 +-
 core/src/components/TimeDetector.ts             | 2 +-
 core/src/components/TriggerIn.ts                | 5 ++---
 core/src/components/VisualGeneration.ts         | 2 +-
 core/src/components/deprecated/PlaytestInput.ts | 4 ++--
 17 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/core/src/components/DifficultyDetector.ts b/core/src/components/DifficultyDetector.ts
index efd0bc529..575723810 100644
--- a/core/src/components/DifficultyDetector.ts
+++ b/core/src/components/DifficultyDetector.ts
@@ -7,7 +7,7 @@ import {
   ThothWorkerOutputs,
 } from '../../types'
 import { FewshotControl } from '../dataControls/FewshotControl'
-import { EngineContext } from '../engine'
+import { EngineContext } from '../../types'
 import { stringSocket, triggerSocket } from '../sockets'
 import { ThothComponent } from '../thoth-component'
 // For simplicity quests should be ONE thing not complete X and Y
diff --git a/core/src/components/EnkiTask.ts b/core/src/components/EnkiTask.ts
index 2c0979aa4..7c1d28c9b 100644
--- a/core/src/components/EnkiTask.ts
+++ b/core/src/components/EnkiTask.ts
@@ -5,7 +5,7 @@ import {
   ThothWorkerOutputs,
 } from '../../types'
 import { EnkiThroughputControl } from '../dataControls/EnkiThroughputControl'
-import { EngineContext } from '../engine'
+import { EngineContext } from '../../types'
 import { ThothComponent } from '../thoth-component'
 const info = `Enki is a tool for building both fewshots, as well as entire data sets.  The enki component allows you to select an enki which you or someone else has made in the Enki tool and utilize it in your spell chains.
 
diff --git a/core/src/components/EntityDetector.ts b/core/src/components/EntityDetector.ts
index 4223cd8c1..db3ec3db9 100644
--- a/core/src/components/EntityDetector.ts
+++ b/core/src/components/EntityDetector.ts
@@ -7,7 +7,7 @@ import {
   ThothWorkerOutputs,
 } from '../../types'
 import { FewshotControl } from '../dataControls/FewshotControl'
-import { EngineContext } from '../engine'
+import { EngineContext } from '../../types'
 import { TaskOptions } from '../plugins/taskPlugin/task'
 import { stringSocket, triggerSocket, arraySocket } from '../sockets'
 import { ThothComponent } from '../thoth-component'
diff --git a/core/src/components/Generator.ts b/core/src/components/Generator.ts
index 11d8f605d..387ea8fbf 100644
--- a/core/src/components/Generator.ts
+++ b/core/src/components/Generator.ts
@@ -11,7 +11,7 @@ import { FewshotControl } from '../dataControls/FewshotControl'
 import { InputControl } from '../dataControls/InputControl'
 import { DropdownControl } from '../dataControls/DropdownControl'
 import { SocketGeneratorControl } from '../dataControls/SocketGenerator'
-import { EngineContext } from '../engine'
+import { EngineContext } from '../../types'
 import { triggerSocket, stringSocket } from '../sockets'
 import { ThothComponent } from '../thoth-component'
 const info = `The generator component is our general purpose completion component.  You can define any number of inputs, and utilize those inputs in a templating language known as Handlebars.  Any value which is wrapped like {{this}} in double braces will be replaced with the corresponding value coming in to the input with the same name.  This allows you to write almost any fewshot you might need, and input values from anywhere else in your chain.
diff --git a/core/src/components/Huggingface.ts b/core/src/components/Huggingface.ts
index 075b25419..93f71ea0e 100644
--- a/core/src/components/Huggingface.ts
+++ b/core/src/components/Huggingface.ts
@@ -10,7 +10,7 @@ import {
 import { FewshotControl } from '../dataControls/FewshotControl'
 import { InputControl } from '../dataControls/InputControl'
 import { SocketGeneratorControl } from '../dataControls/SocketGenerator'
-import { EngineContext } from '../engine'
+import { EngineContext } from '../../types'
 import { triggerSocket, stringSocket } from '../sockets'
 import { ThothComponent } from '../thoth-component'
 const info = `The huggingface component is used to access models on huggingface.co.  For now it is very simple.  You define a number of inputs with the input generator, and you can use those in forming the request to your huggingface inference model.  You input the name of the model from hugginface into the model name field, and you run it.  It will call the model, and return the result.
diff --git a/core/src/components/Input.ts b/core/src/components/Input.ts
index 57e638ac7..199f4cae3 100644
--- a/core/src/components/Input.ts
+++ b/core/src/components/Input.ts
@@ -3,6 +3,7 @@ import Rete from 'rete'
 import { v4 as uuidv4 } from 'uuid'
 
 import {
+  EditorContext,
   NodeData,
   ThothNode,
   ThothWorkerInputs,
@@ -12,7 +13,7 @@ import { TextInputControl } from '../controls/TextInputControl'
 import { InputControl } from '../dataControls/InputControl'
 import { PlaytestControl } from '../dataControls/PlaytestControl'
 import { SwitchControl } from '../dataControls/SwitchControl'
-import { EngineContext } from '../engine'
+import {} from '../../types'
 import { Task } from '../plugins/taskPlugin/task'
 
 import { anySocket } from '../sockets'
@@ -57,7 +58,7 @@ export class InputComponent extends ThothComponent<InputReturn> {
   unsubscribe?: () => void
 
   subscribeToPlaytest(node: ThothNode) {
-    const { onPlaytest } = this.editor?.thoth as EngineContext
+    const { onPlaytest } = this.editor?.thoth as EditorContext
 
     // check node for the right data attribute
     if (onPlaytest) {
diff --git a/core/src/components/ItemDetector.ts b/core/src/components/ItemDetector.ts
index a3a5807e4..d272eb8b3 100644
--- a/core/src/components/ItemDetector.ts
+++ b/core/src/components/ItemDetector.ts
@@ -7,7 +7,7 @@ import {
   ThothWorkerOutputs,
 } from '../../types'
 import { FewshotControl } from '../dataControls/FewshotControl'
-import { EngineContext } from '../engine'
+import { EngineContext } from '../../types'
 import { stringSocket, triggerSocket } from '../sockets'
 import { ThothComponent } from '../thoth-component'
 // For simplicity quests should be ONE thing not complete X and Y
diff --git a/core/src/components/Output.ts b/core/src/components/Output.ts
index 80e1d2ed3..f81122ed9 100644
--- a/core/src/components/Output.ts
+++ b/core/src/components/Output.ts
@@ -2,6 +2,7 @@ import Rete from 'rete'
 import { v4 as uuidv4 } from 'uuid'
 
 import {
+  EditorContext,
   NodeData,
   ThothNode,
   ThothWorkerInputs,
@@ -9,7 +10,6 @@ import {
 } from '../../types'
 import { InputControl } from '../dataControls/InputControl'
 import { SwitchControl } from '../dataControls/SwitchControl'
-import { EngineContext } from '../engine'
 import { triggerSocket, anySocket } from '../sockets'
 import { ThothComponent } from '../thoth-component'
 const info = `The output component will pass values out from your spell.  You can have multiple outputs in a spell and all output values will be collected. It also has an option to send the output to the playtest area for easy testing.`
@@ -72,11 +72,11 @@ export class Output extends ThothComponent<void> {
     node: NodeData,
     inputs: ThothWorkerInputs,
     outputs: ThothWorkerOutputs,
-    { silent, thoth }: { silent: boolean; thoth: EngineContext }
+    { silent, thoth }: { silent: boolean; thoth: EditorContext }
   ) {
     if (!inputs.input) throw new Error('No input provided to output component')
 
-    const text = inputs.input.filter(Boolean)[0]
+    const text = inputs.input.filter(Boolean)[0] as string
 
     //just need a new check here for playtest send boolean
     const { sendToPlaytest } = thoth
diff --git a/core/src/components/ProseToScript.ts b/core/src/components/ProseToScript.ts
index 81e33450c..46e0cf081 100644
--- a/core/src/components/ProseToScript.ts
+++ b/core/src/components/ProseToScript.ts
@@ -6,7 +6,7 @@ import {
   ThothWorkerInputs,
   ThothWorkerOutputs,
 } from '../../types'
-import { EngineContext } from '../engine'
+import { EngineContext } from '../../types'
 import { stringSocket, triggerSocket } from '../sockets'
 import { ThothComponent } from '../thoth-component'
 const fewshot = (prose: string) => {
diff --git a/core/src/components/SafetyVerifier.ts b/core/src/components/SafetyVerifier.ts
index b932404a9..4e675204b 100644
--- a/core/src/components/SafetyVerifier.ts
+++ b/core/src/components/SafetyVerifier.ts
@@ -7,7 +7,7 @@ import {
   ThothWorkerOutputs,
 } from '../../types'
 import { FewshotControl } from '../dataControls/FewshotControl'
-import { EngineContext } from '../engine'
+import { EngineContext } from '../../types'
 import { stringSocket, triggerSocket, booleanSocket } from '../sockets'
 import { ThothComponent } from '../thoth-component'
 
diff --git a/core/src/components/StateRead.ts b/core/src/components/StateRead.ts
index 99efd88cc..842d0d461 100644
--- a/core/src/components/StateRead.ts
+++ b/core/src/components/StateRead.ts
@@ -5,7 +5,7 @@ import {
   ThothWorkerOutputs,
 } from '../../types'
 import { SocketGeneratorControl } from '../dataControls/SocketGenerator'
-import { EngineContext } from '../engine'
+import { EngineContext } from '../../types'
 import { ThothComponent } from '../thoth-component'
 const info = `The State Read component allows you to read values from the state.  These can be found in and are managed by the State Manager window.  This window consists of a JSON object.  You can define any number of outputs where an outputs name corresponds to a key in the state manager.  Whatever value is assigned to that key will be read ans passed into your chain.`
 export class StateRead extends ThothComponent<
diff --git a/core/src/components/StateWrite.ts b/core/src/components/StateWrite.ts
index edd0a969f..a651fc147 100644
--- a/core/src/components/StateWrite.ts
+++ b/core/src/components/StateWrite.ts
@@ -7,7 +7,7 @@ import {
 } from '../../types'
 
 import { SocketGeneratorControl } from '../dataControls/SocketGenerator'
-import { EngineContext } from '../engine'
+import { EngineContext } from '../../types'
 import { triggerSocket } from '../sockets'
 import { ThothComponent } from '../thoth-component'
 
diff --git a/core/src/components/TenseTransformer.ts b/core/src/components/TenseTransformer.ts
index 5d7afbf9f..a61326f36 100644
--- a/core/src/components/TenseTransformer.ts
+++ b/core/src/components/TenseTransformer.ts
@@ -7,7 +7,7 @@ import {
   ThothWorkerOutputs,
 } from '../../types'
 import { FewshotControl } from '../dataControls/FewshotControl'
-import { EngineContext } from '../engine'
+import { EngineContext } from '../../types'
 import { stringSocket, triggerSocket } from '../sockets'
 // @seang todo: convert data controls to typescript to remove this
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
diff --git a/core/src/components/TimeDetector.ts b/core/src/components/TimeDetector.ts
index ccef9e25b..ea31e9eb7 100644
--- a/core/src/components/TimeDetector.ts
+++ b/core/src/components/TimeDetector.ts
@@ -7,7 +7,7 @@ import {
   ThothWorkerOutputs,
 } from '../../types'
 import { FewshotControl } from '../dataControls/FewshotControl'
-import { EngineContext } from '../engine'
+import { EngineContext } from '../../types'
 import { stringSocket, triggerSocket } from '../sockets'
 import { ThothComponent } from '../thoth-component'
 // For simplicity quests should be ONE thing not complete X and Y
diff --git a/core/src/components/TriggerIn.ts b/core/src/components/TriggerIn.ts
index 2cc817222..506ba1606 100644
--- a/core/src/components/TriggerIn.ts
+++ b/core/src/components/TriggerIn.ts
@@ -4,11 +4,10 @@ import Rete from 'rete'
 //@ts-ignore
 import { v4 as uuidv4 } from 'uuid'
 
-import { NodeData, ThothNode } from '../../types'
+import { EditorContext, NodeData, ThothNode } from '../../types'
 import { InputControl } from '../dataControls/InputControl'
 import { TaskOptions } from '../plugins/taskPlugin/task'
 import { triggerSocket } from '../sockets'
-import { EngineContext } from '../engine'
 import { ThothComponent, ThothTask } from '../thoth-component'
 import { PlaytestControl } from '../dataControls/PlaytestControl'
 const info = `The trigger in allows you to pass values into your spell either from a higher level component or from the server.  There must be one single trigger into a spell for now as the server does not support multiple triggers.  Yet.`
@@ -52,7 +51,7 @@ export class TriggerIn extends ThothComponent<void> {
   unsubscribe?: () => void
 
   subscribeToPlaytest(node: ThothNode) {
-    const { onPlaytest } = this.editor?.thoth as EngineContext
+    const { onPlaytest } = this.editor?.thoth as EditorContext
 
     // check node for the right data attribute
     if (onPlaytest) {
diff --git a/core/src/components/VisualGeneration.ts b/core/src/components/VisualGeneration.ts
index 48efa51f1..240814c9f 100644
--- a/core/src/components/VisualGeneration.ts
+++ b/core/src/components/VisualGeneration.ts
@@ -6,7 +6,7 @@ import {
   ThothWorkerOutputs,
 } from '../../types'
 import { InputControl } from '../dataControls/InputControl'
-import { EngineContext } from '../engine'
+import { EngineContext } from '../../types'
 import { triggerSocket, stringSocket, arraySocket } from '../sockets'
 import { ThothComponent } from '../thoth-component'
 
diff --git a/core/src/components/deprecated/PlaytestInput.ts b/core/src/components/deprecated/PlaytestInput.ts
index 5f87f087a..f3f4217a0 100644
--- a/core/src/components/deprecated/PlaytestInput.ts
+++ b/core/src/components/deprecated/PlaytestInput.ts
@@ -5,8 +5,8 @@ import {
   ThothNode,
   ThothWorkerInputs,
   ThothWorkerOutputs,
+  EditorContext,
 } from '../../../types'
-import { EngineContext } from '../../engine'
 import { Task } from '../../plugins/taskPlugin/task'
 import { triggerSocket, stringSocket } from '../../sockets'
 import { ThothComponent, ThothTask } from '../../thoth-component'
@@ -47,7 +47,7 @@ export class PlaytestInput extends ThothComponent<WorkerReturn> {
   unsubscribe?: () => void
 
   subscribeToPlaytest(node: ThothNode) {
-    const { onPlaytest } = this.editor?.thoth as EngineContext
+    const { onPlaytest } = this.editor?.thoth as EditorContext
 
     if (onPlaytest) {
       // store the unsubscribe function in our node map

From 5e1e6ee9468eb39b67a57d8b8109bb65e2ec00bd Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 09:56:14 -0700
Subject: [PATCH 506/531] Fix typing in run chain

---
 core/src/utils/runChain.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/src/utils/runChain.ts b/core/src/utils/runChain.ts
index cd958a164..78085832c 100644
--- a/core/src/utils/runChain.ts
+++ b/core/src/utils/runChain.ts
@@ -1,5 +1,11 @@
-import { ChainData, ModuleComponent, NodeData, Subspell } from '../../types'
-import { EngineContext, ThothEngine } from '../engine'
+import {
+  EngineContext,
+  ChainData,
+  ModuleComponent,
+  NodeData,
+  Subspell,
+} from '../../types'
+import { ThothEngine } from '../engine'
 import { Module } from '../plugins/modulePlugin/module'
 import { extractNodes } from './chainHelpers'
 

From 3c32638348131228e183515c07c4ba7652377fc8 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 09:56:20 -0700
Subject: [PATCH 507/531] Fix typing in spell runner

---
 core/src/utils/SpellRunner.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/core/src/utils/SpellRunner.ts b/core/src/utils/SpellRunner.ts
index dda44c9c9..b72b39ade 100644
--- a/core/src/utils/SpellRunner.ts
+++ b/core/src/utils/SpellRunner.ts
@@ -2,8 +2,13 @@ import {
   getComponents,
   initSharedEngine,
 } from '@latitudegames/thoth-core/server'
-import { ChainData, ModuleComponent, Spell as SpellType } from '../../types'
-import { EngineContext, extractNodes, ThothEngine } from '../engine'
+import {
+  EngineContext,
+  ChainData,
+  ModuleComponent,
+  Spell as SpellType,
+} from '../../types'
+import { extractNodes, ThothEngine } from '../engine'
 import { Module } from '../plugins/modulePlugin/module'
 import { extractModuleInputKeys } from './chainHelpers'
 
@@ -132,7 +137,6 @@ class SpellRunner {
       return this.outputData
     } catch (err) {
       console.log('err', err)
-      throw new Error('Error running spell')
     }
   }
 

From d6fc0e85dba36ab712153cb5d308db531a6ca2cf Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Wed, 6 Apr 2022 10:18:06 -0700
Subject: [PATCH 508/531] destructure UNDO and REDO from events

---
 client/src/components/MenuBar/MenuBar.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/src/components/MenuBar/MenuBar.tsx b/client/src/components/MenuBar/MenuBar.tsx
index 7dc788ce1..29b0389d6 100644
--- a/client/src/components/MenuBar/MenuBar.tsx
+++ b/client/src/components/MenuBar/MenuBar.tsx
@@ -33,6 +33,8 @@ const MenuBar = () => {
     $CREATE_CONSOLE,
     $SERIALIZE,
     $EXPORT,
+    $UNDO,
+    $REDO,
   } = events
 
   const useToggle = (initialValue = false) => {

From fd94c2813c159f2c7481f64029f50181f685d11a Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Wed, 6 Apr 2022 10:18:19 -0700
Subject: [PATCH 509/531] add undo redo helpers

---
 client/src/components/MenuBar/MenuBar.tsx | 27 +++++++----------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/client/src/components/MenuBar/MenuBar.tsx b/client/src/components/MenuBar/MenuBar.tsx
index 29b0389d6..114f89ea1 100644
--- a/client/src/components/MenuBar/MenuBar.tsx
+++ b/client/src/components/MenuBar/MenuBar.tsx
@@ -111,26 +111,15 @@ const MenuBar = () => {
     publish($CREATE_CONSOLE(activeTabRef.current.id))
   }
 
-  //Menu bar hotkeys
-  useHotkeys(
-    'cmd+s, crtl+s',
-    event => {
-      event.preventDefault()
-      onSave()
-    },
-    { enableOnTags: ['INPUT'] },
-    [onSave]
-  )
+  const onUndo = () => {
+    if (!activeTabRef.current) return
+    publish($UNDO(activeTabRef.current.id))
+  }
 
-  useHotkeys(
-    'option+n, crtl+n',
-    event => {
-      event.preventDefault()
-      onNew()
-    },
-    { enableOnTags: ['INPUT'] },
-    [onNew]
-  )
+  const onRedo = () => {
+    if (!activeTabRef.current) return
+    publish($REDO(activeTabRef.current.id))
+  }
 
   //Menu bar entries
   const menuBarItems = {

From 08301f2573087677ea666c760d322f100354be85 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Wed, 6 Apr 2022 10:19:02 -0700
Subject: [PATCH 510/531] add undo and redo hotkeys to menu

---
 client/src/components/MenuBar/MenuBar.tsx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/client/src/components/MenuBar/MenuBar.tsx b/client/src/components/MenuBar/MenuBar.tsx
index 114f89ea1..f67acd12c 100644
--- a/client/src/components/MenuBar/MenuBar.tsx
+++ b/client/src/components/MenuBar/MenuBar.tsx
@@ -153,10 +153,14 @@ const MenuBar = () => {
     },
     edit: {
       items: {
-        undo: {},
-        redo: {},
-        // copy: {},
-        // paste: {},
+        undo: {
+          onClick: onUndo,
+          hotKey: 'option+z',
+        },
+        redo: {
+          onClick: onRedo,
+          hotKey: 'option+shift+z',
+        },
       },
     },
     dev: {

From 297c00c6a675e38b93b7fc2249504548813ca795 Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Wed, 6 Apr 2022 10:19:55 -0700
Subject: [PATCH 511/531] moved undo and redo to menu bar

---
 client/src/screens/Thoth/Thoth.tsx | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/client/src/screens/Thoth/Thoth.tsx b/client/src/screens/Thoth/Thoth.tsx
index 8a631e37f..df51a865c 100644
--- a/client/src/screens/Thoth/Thoth.tsx
+++ b/client/src/screens/Thoth/Thoth.tsx
@@ -47,26 +47,7 @@ const Thoth = ({ empty = false }) => {
   }, [spellName])
 
   useHotkeys(
-    'Control+z',
-    () => {
-      if (!pubSub || !activeTab) return
-
-      publish(events.$UNDO(activeTab.id))
-    },
-    [pubSub, activeTab]
-  )
-
-  useHotkeys(
-    'Control+Shift+z',
-    () => {
-      if (!pubSub || !activeTab) return
-      publish(events.$REDO(activeTab.id))
-    },
-    [pubSub, activeTab]
-  )
-
-  useHotkeys(
-    'Control+Delete',
+    'Option+Delete',
     () => {
       if (!pubSub || !activeTab) return
       publish(events.$DELETE(activeTab.id))

From 8f8fdc40af10a1c617bc12b22f76438b3001a5f0 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 10:33:32 -0700
Subject: [PATCH 512/531] Fix type errors

---
 core/src/components/deprecated/PlaytestPrint.ts |  6 +++---
 core/src/components/deprecated/RunInput.ts      | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/src/components/deprecated/PlaytestPrint.ts b/core/src/components/deprecated/PlaytestPrint.ts
index b77de0ad0..c23a8159f 100644
--- a/core/src/components/deprecated/PlaytestPrint.ts
+++ b/core/src/components/deprecated/PlaytestPrint.ts
@@ -1,12 +1,12 @@
 import Rete from 'rete'
 
 import {
+  EditorContext,
   NodeData,
   ThothNode,
   ThothWorkerInputs,
   ThothWorkerOutputs,
 } from '../../../types'
-import { EngineContext } from '../../engine'
 import { triggerSocket, anySocket } from '../../sockets'
 import { ThothComponent } from '../../thoth-component'
 const info = `The Playtest Print component will print whatever value is attached to its input and print that valyue back to the playtest window.`
@@ -58,9 +58,9 @@ export class PlaytestPrint extends ThothComponent<void> {
     outputs: ThothWorkerOutputs,
     { silent }: { silent: boolean }
   ) {
-    const { sendToPlaytest } = this.editor?.thoth as EngineContext
+    const { sendToPlaytest } = this.editor?.thoth as EditorContext
     if (!inputs || !inputs.text) return {}
-    const text = inputs.text.filter(Boolean)[0]
+    const text = inputs.text.filter(Boolean)[0] as string
 
     if (sendToPlaytest) {
       sendToPlaytest(text)
diff --git a/core/src/components/deprecated/RunInput.ts b/core/src/components/deprecated/RunInput.ts
index a4c399579..6f14aafd2 100644
--- a/core/src/components/deprecated/RunInput.ts
+++ b/core/src/components/deprecated/RunInput.ts
@@ -37,13 +37,13 @@ export class RunInputComponent extends ThothComponent<WorkerReturn> {
         // subscribe to the run function
         // TODO abstract this into something more reusable.
         // maybe modifyy the task plugin to set a run function to the node itself?
-        const unsubscribe = this.editor?.on('run', args => {
-          if (args.nodeId === node.id) {
-            task.run()
-          }
-        })
+        // const unsubscribe = this.editor?.on('run', args => {
+        //   if (args.nodeId === node.id) {
+        //     task.run()
+        //   }
+        // })
 
-        this.subscriptionMap[node.id] = unsubscribe
+        // this.subscriptionMap[node.id] = unsubscribe
       },
     }
     this.category = 'I/O'

From cc368b7c8a2b0d4201215eb67cce77da4c99c48f Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 10:42:03 -0700
Subject: [PATCH 513/531] Clean up thoth component and add dev flag

---
 core/src/thoth-component.ts | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/core/src/thoth-component.ts b/core/src/thoth-component.ts
index 13e3f42fd..70e02f7a2 100644
--- a/core/src/thoth-component.ts
+++ b/core/src/thoth-component.ts
@@ -1,6 +1,6 @@
-import { Node, NodeEditor, Socket } from 'rete'
+import { Node, Socket } from 'rete'
 
-import { EditorContext, PubSubBase, ThothNode } from '../types'
+import { PubSubBase, ThothEditor, ThothNode } from '../types'
 import { ThothEngineComponent } from './engine'
 import { Task, TaskOptions } from './plugins/taskPlugin/task'
 
@@ -14,12 +14,6 @@ export type PubSubContext = {
   PubSub: PubSubBase
 }
 
-class ThothReteNodeEditor extends NodeEditor {
-  pubSub: PubSubContext
-  thoth: EditorContext
-  tab: unknown
-}
-
 export interface ThothTask extends Task {
   outputs?: { [key: string]: string }
   init?: (task?: ThothTask, node?: ThothNode) => void
@@ -39,12 +33,13 @@ export abstract class ThothComponent<
   task: TaskOptions
   _task: ThothTask
   // Original Class: https://github.com/latitudegames/rete/blob/master/src/component.ts
-  editor: ThothReteNodeEditor | null = null
+  editor: ThothEditor | null = null
   data: unknown = {}
   category: string
   info: string
   display: boolean
   deprecated: boolean = false
+  dev: boolean = false
   hide: boolean = false
   deprecationMessage: string | undefined
   module: ModuleOptions

From aabd46221d759615b731a4fe9022ca854a26267a Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 10:43:14 -0700
Subject: [PATCH 514/531] Make spell component dev component

---
 core/src/components/Spell.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/components/Spell.ts b/core/src/components/Spell.ts
index 5c456e568..9fbe0389e 100644
--- a/core/src/components/Spell.ts
+++ b/core/src/components/Spell.ts
@@ -30,7 +30,7 @@ export class SpellComponent extends ThothComponent<
   subscriptionMap: Record<number, Function> = {}
   editor: ThothEditor
   noBuildUpdate: boolean
-  category: string
+  dev = true
 
   constructor() {
     super('Spell')

From e258678cd4876dece723809db10d35581b031834 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 11:03:23 -0700
Subject: [PATCH 515/531] Update pubsub provider to typescript

---
 .../{PubSubProvider.jsx => PubSubProvider.tsx}   | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
 rename client/src/contexts/{PubSubProvider.jsx => PubSubProvider.tsx} (86%)

diff --git a/client/src/contexts/PubSubProvider.jsx b/client/src/contexts/PubSubProvider.tsx
similarity index 86%
rename from client/src/contexts/PubSubProvider.jsx
rename to client/src/contexts/PubSubProvider.tsx
index b7fedcfb3..849548ee6 100644
--- a/client/src/contexts/PubSubProvider.jsx
+++ b/client/src/contexts/PubSubProvider.tsx
@@ -2,12 +2,16 @@
 import PubSub from 'pubsub-js'
 import { useContext, createContext } from 'react'
 
-const Context = createContext({
-  publish: (_event, _data) => {},
-  subscribe: (_event, _callback) => {},
-  PubSub: () => {},
-  events: {},
-})
+type PubSubData = Record<string, any> | string | any[]
+
+type PubSubContext = {
+  publish: (event: string, data?: PubSubData) => void
+  subscribe: (event: string, callback: Function) => Function
+  PubSub: typeof PubSub
+  events: Record<string, any>
+}
+
+const Context = createContext<PubSubContext>(undefined!)
 
 export const usePubSub = () => useContext(Context)
 

From 22fc874f106a53ecbce85b9a3d7355283d88679f Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 11:03:36 -0700
Subject: [PATCH 516/531] Fix editor provider type issues

---
 client/src/workspaces/contexts/EditorProvider.tsx | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/client/src/workspaces/contexts/EditorProvider.tsx b/client/src/workspaces/contexts/EditorProvider.tsx
index 3262c18eb..1273e6435 100644
--- a/client/src/workspaces/contexts/EditorProvider.tsx
+++ b/client/src/workspaces/contexts/EditorProvider.tsx
@@ -1,6 +1,7 @@
 import { initEditor, zoomAt } from '@latitudegames/thoth-core'
 import {
   ChainData,
+  EditorContext,
   Spell,
   ThothEditor,
 } from '@latitudegames/thoth-core/dist/types'
@@ -18,10 +19,7 @@ import LoadingScreen from '../../components/LoadingScreen/LoadingScreen'
 import { MyNode } from '../../components/Node/Node'
 import gridimg from '@/grid.png'
 import { usePubSub } from '../../contexts/PubSubProvider'
-import {
-  useThothInterface,
-  ThothInterfaceContext,
-} from './ThothInterfaceProvider'
+import { useThothInterface } from './ThothInterfaceProvider'
 
 export type ThothTab = {
   layoutJson: string
@@ -44,7 +42,7 @@ const Context = createContext({
     // todo update this to use proper spell type
     spell: Spell | undefined,
     tab: ThothTab,
-    reteInterface: ThothInterfaceContext
+    reteInterface: EditorContext
   ) => {},
   setEditor: (editor: any) => {},
   getNodeMap: () => {},

From 9c97ff42a878ea4aed6e5782d195bbfa96e7cad5 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 11:03:45 -0700
Subject: [PATCH 517/531] Fix inspector provider type errors

---
 client/src/workspaces/contexts/InspectorProvider.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/src/workspaces/contexts/InspectorProvider.tsx b/client/src/workspaces/contexts/InspectorProvider.tsx
index d82c0bdc6..d06029dfb 100644
--- a/client/src/workspaces/contexts/InspectorProvider.tsx
+++ b/client/src/workspaces/contexts/InspectorProvider.tsx
@@ -55,21 +55,21 @@ const InspectorProvider = ({ children, tab }) => {
           setTextEditorData(textData)
         }
       })
-    })
+    }) as () => void
   }, [events, subscribe, publish])
 
   // text editor subscription
   useEffect(() => {
     return subscribe(events.$TEXT_EDITOR_SET(tab.id), (event, data) => {
       setTextEditorData(data)
-    })
+    }) as () => void
   }, [events, subscribe, publish])
 
   // clear text editor subscription
   useEffect(() => {
     return subscribe(events.$TEXT_EDITOR_CLEAR(tab.id), () => {
       setTextEditorData({})
-    })
+    }) as () => void
   }, [events, subscribe, publish])
 
   //

From b829d401f696aef942af2c901d0bd95f6616206f Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 11:04:09 -0700
Subject: [PATCH 518/531] Replace thoth interface context with edfitor context
 type

---
 .../contexts/ThothInterfaceProvider.tsx       | 27 +++++--------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
index 79ec14484..4e0e74595 100644
--- a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
+++ b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
@@ -1,4 +1,8 @@
-import { EngineContext } from '@latitudegames/thoth-core'
+import {
+  EditorContext,
+  Spell,
+  ThothWorkerInputs,
+} from '@latitudegames/thoth-core/dist/types'
 import { useContext, createContext, useRef, useEffect } from 'react'
 
 import { postEnkiCompletion } from '../../services/game-api/enki'
@@ -6,7 +10,6 @@ import { completion as _completion } from '../../services/game-api/text'
 import { invokeInference } from '../../utils/huggingfaceHelper'
 import { usePubSub } from '../../contexts/PubSubProvider'
 import { useFetchFromImageCacheMutation } from '@/state/api/visualGenerationsApi'
-import { Spell, ThothWorkerInputs } from '@latitudegames/thoth-core/dist/types'
 import { useGetSpellQuery, useRunSpellMutation } from '@/state/api/spells'
 
 /*
@@ -14,25 +17,7 @@ Some notes here.  The new rete provider, not to be confused with the old rete pr
 Not all functions will be needed on the server, and functions which are not will be labeled as such.
 */
 
-export interface ThothInterfaceContext extends EngineContext {
-  onInspector: (node, callback) => void
-  onPlaytest: (callback) => void
-  sendToPlaytest: (data) => void
-  sendToInspector: (data) => void
-  sendToDebug: (data) => void
-  onDebug: (node, callback) => void
-  clearTextEditor: () => void
-  getCurrentGameState: () => Record<string, unknown>
-  updateCurrentGameState: (update) => void
-  readFromImageCache: (caption, cacheTag, topK) => Promise<any>
-  processCode: (
-    code: unknown,
-    inputs: ThothWorkerInputs,
-    data: Record<string, any>
-  ) => void
-}
-
-const Context = createContext<ThothInterfaceContext>(undefined!)
+const Context = createContext<EditorContext>(undefined!)
 
 export const useThothInterface = () => useContext(Context)
 

From 941c59abf40bc1b98361887e9c08b5b6d648134b Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 11:04:22 -0700
Subject: [PATCH 519/531] Fix debug console type issues

---
 client/src/workspaces/spells/windows/DebugConsole/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/workspaces/spells/windows/DebugConsole/index.tsx b/client/src/workspaces/spells/windows/DebugConsole/index.tsx
index 4679210ca..b441dd413 100644
--- a/client/src/workspaces/spells/windows/DebugConsole/index.tsx
+++ b/client/src/workspaces/spells/windows/DebugConsole/index.tsx
@@ -87,7 +87,7 @@ const DebugConsole = ({ tab }) => {
   useEffect(() => {
     const unsubscribe = subscribe($DEBUG_PRINT(tab.id), printToDebugger)
 
-    return unsubscribe
+    return unsubscribe as () => void
   }, [subscribe, printToDebugger, $DEBUG_PRINT])
 
   /**

From 8cf761aa8fb5c3a6157b5b45763e4f3bc3b93107 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 11:04:50 -0700
Subject: [PATCH 520/531] rearrange editor context types to group pub and sub

---
 core/types.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/types.ts b/core/types.ts
index ea9b8cbab..dc99f8446 100644
--- a/core/types.ts
+++ b/core/types.ts
@@ -55,11 +55,11 @@ export type EngineContext = {
 export type EventPayload = Record<string, any>
 
 export interface EditorContext extends EngineContext {
+  sendToPlaytest: (data: string) => void
+  sendToInspector: (data: EventPayload) => void
+  sendToDebug: (data: EventPayload) => void
   onInspector: (node: ThothNode, callback: Function) => Function
   onPlaytest: (callback: Function) => Function
-  sendToPlaytest: (data: string) => Function
-  sendToInspector: (data: EventPayload) => Function
-  sendToDebug: (data: EventPayload) => Function
   onDebug: (node: NodeData, callback: Function) => Function
   clearTextEditor: () => void
   getCurrentGameState: () => Record<string, unknown>

From 7b3ec7c499ad8f5acdf4ccb7dbe9a7e2ec32ec66 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 11:05:11 -0700
Subject: [PATCH 521/531] Add flag to filter dev components out of prod
 component menu

---
 core/src/editor.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/src/editor.ts b/core/src/editor.ts
index 2a2ccb444..a31f29dd8 100644
--- a/core/src/editor.ts
+++ b/core/src/editor.ts
@@ -106,10 +106,12 @@ export const initEditor = async function ({
       }
     },
     allocate: (component: ThothComponent<unknown>) => {
+      const isProd = process.env.NODE_ENV === 'production'
       //@seang: disabling component filtering in anticipation of needing to treat spells as "top level modules" in the publishing workflow
       const tabType = editor.tab.type
       const { workspaceType } = component
 
+      if (isProd && component.dev) return null
       if (component.deprecated) return null
       if (component.hide) return null
       if (workspaceType && workspaceType !== tabType) return null

From c7f0cfe1d8d1f92dd4ad65d1d6db63957697602f Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Wed, 6 Apr 2022 11:11:40 -0700
Subject: [PATCH 522/531] add modal to warn when unlocking output and input
 nodes

---
 client/src/workspaces/spells/windows/InspectorWindow.tsx | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/client/src/workspaces/spells/windows/InspectorWindow.tsx b/client/src/workspaces/spells/windows/InspectorWindow.tsx
index 889642901..b094028b9 100644
--- a/client/src/workspaces/spells/windows/InspectorWindow.tsx
+++ b/client/src/workspaces/spells/windows/InspectorWindow.tsx
@@ -59,6 +59,15 @@ const Inspector = props => {
   }
 
   const onLock = () => {
+    if (inspectorData?.data.nodeLocked && inspectorData?.category === 'I/O') {
+      openModal({
+        modal: 'infoModal',
+        content:
+          'Editing this node could break connection with your front end template. You must ensure your templates input and output have the same name as the spells input and output',
+        title: 'Warning',
+      })
+    }
+
     const data = {
       nodeLocked: !inspectorData?.data.nodeLocked,
     }

From 1bc32f64c94ed81b7cdf64ae6eeba919c18e61be Mon Sep 17 00:00:00 2001
From: Jakob Grant <haruhunab1320@gmail.com>
Date: Wed, 6 Apr 2022 11:18:31 -0700
Subject: [PATCH 523/531] update warning message

---
 client/src/workspaces/spells/windows/InspectorWindow.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/src/workspaces/spells/windows/InspectorWindow.tsx b/client/src/workspaces/spells/windows/InspectorWindow.tsx
index b094028b9..374112c2e 100644
--- a/client/src/workspaces/spells/windows/InspectorWindow.tsx
+++ b/client/src/workspaces/spells/windows/InspectorWindow.tsx
@@ -62,8 +62,7 @@ const Inspector = props => {
     if (inspectorData?.data.nodeLocked && inspectorData?.category === 'I/O') {
       openModal({
         modal: 'infoModal',
-        content:
-          'Editing this node could break connection with your front end template. You must ensure your templates input and output have the same name as the spells input and output',
+        content: 'Editing this node could break connection with your app.',
         title: 'Warning',
       })
     }

From 40f3add68422c0e78f9b4e0295fc533243446bcb Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 12:09:28 -0700
Subject: [PATCH 524/531] Filter out undefined values in game state update

---
 client/src/workspaces/contexts/ThothInterfaceProvider.tsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
index 4e0e74595..1e8403a92 100644
--- a/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
+++ b/client/src/workspaces/contexts/ThothInterfaceProvider.tsx
@@ -172,6 +172,11 @@ const ThothInterfaceProvider = ({ children, tab }) => {
     if (!spellRef.current) return
     const spell = spellRef.current
 
+    // lets delete out all undefined properties coming in
+    Object.keys(_update).forEach(
+      key => _update[key] === undefined && delete _update[key]
+    )
+
     const update = {
       gameState: {
         ...spell.gameState,

From 07b2bb78ff9bef719cd4ed5f3aec1a4a002e69f2 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 12:09:46 -0700
Subject: [PATCH 525/531] Add image cache types to root types file

---
 core/types.ts | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/core/types.ts b/core/types.ts
index dc99f8446..9f301869b 100644
--- a/core/types.ts
+++ b/core/types.ts
@@ -16,11 +16,24 @@ import { SocketNameType, SocketType } from './src/sockets'
 import { ThothTask } from './src/thoth-component'
 import { ThothConsole } from './src/plugins/debuggerPlugin/ThothConsole'
 import { Data } from 'rete/types/core/data'
-import { ImageType } from './src/components/VisualGeneration'
+
 export { ThothEditor } from './src/editor'
 
 export type { InspectorData } from './src/plugins/inspectorPlugin/Inspector'
 
+export type ImageType = {
+  id: string
+  captionId: string
+  imageCaption: string
+  imageUrl: string
+  tag: string
+  score: number | string
+}
+
+export type ImageCacheResponse = {
+  images: ImageType[]
+}
+
 export type EngineContext = {
   completion: (
     body: ModelCompletionOpts
@@ -44,7 +57,7 @@ export type EngineContext = {
     caption: string,
     cacheTag?: string,
     topK?: number
-  ) => Promise<ImageType[]>
+  ) => Promise<ImageCacheResponse>
   processCode: (
     code: unknown,
     inputs: ThothWorkerInputs,

From fde1be7a2dd7ccb5156a27cf6a14e15d25f65b54 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 12:10:01 -0700
Subject: [PATCH 526/531] Properly type visual generation state api return

---
 client/src/state/api/visualGenerationsApi.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/src/state/api/visualGenerationsApi.ts b/client/src/state/api/visualGenerationsApi.ts
index bd0cd6da9..de14ca4a6 100644
--- a/client/src/state/api/visualGenerationsApi.ts
+++ b/client/src/state/api/visualGenerationsApi.ts
@@ -1,9 +1,10 @@
+import { ImageCacheResponse } from '@latitudegames/thoth-core/types'
 import { rootApi } from './api'
 
 export const visualGenerationsApi = rootApi.injectEndpoints({
   endpoints: builder => ({
     fetchFromImageCache: builder.mutation<
-      any,
+      ImageCacheResponse,
       { caption: string; cacheTag?: string; topK?: number }
     >({
       query: searchOptions => ({

From 644893226a480b00f68d4cd7ed34785fecab9028 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 12:10:12 -0700
Subject: [PATCH 527/531] Add model name to tense transformer

---
 core/src/components/TenseTransformer.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/components/TenseTransformer.ts b/core/src/components/TenseTransformer.ts
index a61326f36..3966d6ae2 100644
--- a/core/src/components/TenseTransformer.ts
+++ b/core/src/components/TenseTransformer.ts
@@ -138,6 +138,7 @@ export class TenseTransformer extends ThothComponent<Promise<WorkerReturn>> {
       stop: ['\n'],
       maxTokens: 100,
       temperature: 0.0,
+      model: 'vanilla-davinci',
     }
 
     try {

From d1a7f040c66374496e4cc017030a12f4b251536a Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 12:10:45 -0700
Subject: [PATCH 528/531] use imported types in visual generation component and
 fix worker return type

---
 core/src/components/VisualGeneration.ts | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/core/src/components/VisualGeneration.ts b/core/src/components/VisualGeneration.ts
index 240814c9f..877b834f6 100644
--- a/core/src/components/VisualGeneration.ts
+++ b/core/src/components/VisualGeneration.ts
@@ -1,5 +1,6 @@
 import Rete from 'rete'
 import {
+  ImageCacheResponse,
   NodeData,
   ThothNode,
   ThothWorkerInputs,
@@ -16,16 +17,9 @@ caption- is a string related to what type of image you want to search for.
 
 topK- number of (k) matches for a particular description. IE: if you submit as a caption: "castle" and k was 5, it would return a fortress, a keep, a battlement, a gatehouse, and a tower. The k=5 images most similar to the word "castle`
 
-export type ImageType = {
-  id: string
-  captionId: string
-  imageCaption: string
-  imageUrl: string
-  tag: string
-  score: number | string
-}
-
-export class VisualGeneration extends ThothComponent<Promise<ImageType[]>> {
+export class VisualGeneration extends ThothComponent<
+  Promise<ImageCacheResponse>
+> {
   constructor() {
     super('VisualGeneration')
     this.task = {

From ae5eb47a1836b66816be65fa3aae48236d0f6ca5 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 13:28:00 -0700
Subject: [PATCH 529/531] Turn off run one input on state write

---
 core/src/components/Output.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/components/Output.ts b/core/src/components/Output.ts
index f81122ed9..50cd78a90 100644
--- a/core/src/components/Output.ts
+++ b/core/src/components/Output.ts
@@ -19,7 +19,7 @@ export class Output extends ThothComponent<void> {
     super('Output')
 
     this.task = {
-      runOneInput: true,
+      // runOneInput: true,
       outputs: {
         text: 'output',
         trigger: 'option',

From 6519c8438c24b87250abf061d483fdcbd31ff0b6 Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 14:34:14 -0700
Subject: [PATCH 530/531] Turn run one output back on for output component

---
 core/src/components/Output.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/components/Output.ts b/core/src/components/Output.ts
index 50cd78a90..f81122ed9 100644
--- a/core/src/components/Output.ts
+++ b/core/src/components/Output.ts
@@ -19,7 +19,7 @@ export class Output extends ThothComponent<void> {
     super('Output')
 
     this.task = {
-      // runOneInput: true,
+      runOneInput: true,
       outputs: {
         text: 'output',
         trigger: 'option',

From a12933644b35d9e24c822fbe7c16fcf248134a6a Mon Sep 17 00:00:00 2001
From: Michael Sharpe <m.sharpe@project89.org>
Date: Wed, 6 Apr 2022 14:42:48 -0700
Subject: [PATCH 531/531] Turn off run one input on state write component

---
 core/src/components/StateWrite.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/src/components/StateWrite.ts b/core/src/components/StateWrite.ts
index a651fc147..91cc20038 100644
--- a/core/src/components/StateWrite.ts
+++ b/core/src/components/StateWrite.ts
@@ -21,7 +21,6 @@ export class StateWrite extends ThothComponent<void> {
     super('State Write')
 
     this.task = {
-      runOneInput: true,
       outputs: {},
     }