diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3825180bb..fa45bea27 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2.1
 
 orbs:
   snyk: snyk/snyk@2.0.3
-  codecov: codecov/codecov@4.0.0
+  codecov: codecov/codecov@4.1.0
 
 workflows:
   test-build:
diff --git a/README.md b/README.md
index c388b4abe..e929eabad 100644
--- a/README.md
+++ b/README.md
@@ -39,8 +39,9 @@ What is Speckle? Check our [![YouTube Video Views](https://img.shields.io/youtub
 
 Give Speckle a try in no time by:
 
-- [![speckle](https://img.shields.io/badge/https://-app.speckle.systems-0069ff?style=flat-square&logo=hackthebox&logoColor=white)](https://app.speckle.systems) ⇒ creating an account
-- [![create a droplet](https://img.shields.io/badge/Create%20a%20Droplet-0069ff?style=flat-square&logo=digitalocean&logoColor=white)](https://marketplace.digitalocean.com/apps/speckle-server?refcode=947a2b5d7dc1) ⇒ deploying an instance in 1 click
+- [![app.speckle.systems](https://img.shields.io/badge/https://-app.speckle.systems-0069ff?style=flat-square&logo=hackthebox&logoColor=white)](https://app.speckle.systems) ⇒ Create an account at app.speckle.systems
+- [![Deploy on your own infrastructure with docker compose](https://img.shields.io/badge/https://-speckle.guide-0069ff?style=flat-square&logo=hackthebox&logoColor=white)](<[https://](https://speckle.guide/dev/server-manualsetup.html)>) ⇒ Deploy on your own infrastructure with Docker Compose
+- [![Deploy on your own infrastructure with docker compose](https://img.shields.io/badge/https://-speckle.guide-0069ff?style=flat-square&logo=hackthebox&logoColor=white)](<[https://](https://speckle.guide/dev/server-setup-k8s.html)>) ⇒ Deploy on your own infrastructure with Kubernetes
 
 ## Resources
 
diff --git a/package.json b/package.json
index 5a491c5bc..9fa9db991 100644
--- a/package.json
+++ b/package.json
@@ -28,8 +28,8 @@
     "dev:kind:helm:ci": "tilt ci --file ./.circleci/deployment/Tiltfile.helm --context kind-speckle-server --timeout 10m",
     "dev": "yarn workspaces foreach -pivW -j unlimited run dev",
     "dev:no-server": "yarn workspaces foreach --exclude @speckle/server -pivW -j unlimited run dev",
-    "dev:minimal": "yarn workspaces foreach -pivW -j unlimited --include '{@speckle/server,@speckle/frontend,@speckle/shared}' run dev",
-    "gqlgen": "yarn workspaces foreach -pivW -j unlimited --include '{@speckle/server,@speckle/frontend,@speckle/frontend-2}' run gqlgen",
+    "dev:minimal": "yarn workspaces foreach -pivW -j unlimited --include '{@speckle/server,@speckle/frontend-2}' run dev",
+    "gqlgen": "yarn workspaces foreach -pivW -j unlimited --include '{@speckle/server,@speckle/frontend,@speckle/frontend-2,@speckle/dui3}' run gqlgen",
     "dev:server": "yarn workspace @speckle/server dev",
     "dev:frontend": "yarn workspace @speckle/frontend dev",
     "dev:frontend-2": "yarn workspace @speckle/frontend-2 dev",
@@ -65,35 +65,32 @@
     "zx": "^8.1.2"
   },
   "resolutions": {
-    "@babel/traverse": ">=7.23.2",
+    "@aws-sdk/client-sts/fast-xml-parser": ">=4.2.5",
+    "@aws-sdk/client-s3/fast-xml-parser": ">=4.2.5",
+    "@bull-board/express/express": ">=4.19.2",
+    "@datadog/datadog-ci/ws": "^7.5.10",
     "@microsoft/api-extractor/semver": "^7.5.4",
     "@rushstack/node-core-library/semver": "^7.5.4",
     "@typescript-eslint/eslint-plugin": "^7.12.0",
     "@typescript-eslint/parser": "^7.12.0",
-    "typescript-eslint": "^7.12.0",
     "@types/react": "file:./packages/frontend-2/type-augmentations/stubs/types__react",
-    "axios": ">=1.6.0",
     "core-js": "3.22.4",
     "core-js-compat/semver": "^7.5.4",
     "eslint": "^9.4.0",
     "eslint-config-prettier": "^9.1.0",
-    "express": ">=4.19.2",
-    "fast-xml-parser": ">=4.2.5",
     "graphql": "^15.3.0",
     "levelup/bl": ">=1.2.3",
     "levelup/semver": ">=5.7.2",
+    "mocha/serialize-javascript": ">=6.0.2",
     "prettier": "^2.8.7",
-    "serialize-javascript": ">=6.0.2",
+    "puppeteer-core/ws": "^8.17.1",
+    "request/tough-cookie": ">=4.1.3",
+    "rollup-plugin-terser/serialize-javascript": ">=6.0.2",
     "simple-update-notifier/semver": "^7.5.4",
-    "tough-cookie": ">=4.1.3",
     "tslib": "^2.3.1",
     "typescript": "^5.2.2",
-    "undici": "^5.28.4",
-    "wait-on": ">=7.2.0",
-    "word-wrap": "npm:@aashutoshrathi/word-wrap@^1.2.4",
-    "xml2js": ">=0.5.0",
-    "puppeteer-core/ws": "^8.17.1",
-    "@datadog/datadog-ci/ws": "^7.5.10"
+    "typescript-eslint": "^7.12.0",
+    "wait-on": ">=7.2.0"
   },
   "config": {
     "commitizen": {
diff --git a/packages/frontend-2/components/projects/Dashboard.vue b/packages/frontend-2/components/projects/Dashboard.vue
index 52f4c5a83..e294c1926 100644
--- a/packages/frontend-2/components/projects/Dashboard.vue
+++ b/packages/frontend-2/components/projects/Dashboard.vue
@@ -18,10 +18,6 @@
     </div>
 
     <PromoBannersWrapper v-if="promoBanners.length" :banners="promoBanners" />
-    <div v-if="showErrorTest" class="w-full">
-      <FormButton @click="testError">Test error</FormButton>
-    </div>
-
     <div
       v-if="!showEmptyState"
       class="flex flex-col space-y-2 md:flex-row md:items-center mb-8 pt-4"
@@ -134,7 +130,6 @@ const promoBanners = ref<PromoBanner[]>([
   }
 ])
 
-const route = useRoute()
 const { activeUser, isGuest } = useActiveUser()
 const { triggerNotification } = useGlobalToast()
 const areQueriesLoading = useQueryLoading()
@@ -160,8 +155,6 @@ const { onResult: onUserProjectsUpdate } = useSubscription(
   onUserProjectsUpdateSubscription
 )
 
-const showErrorTest = computed(() => route.query.showErrorButton === '1')
-
 const projects = computed(() => projectsPanelResult.value?.activeUser?.projects)
 const showEmptyState = computed(() => {
   const isFiltering =
@@ -340,8 +333,4 @@ const clearSearch = () => {
   selectedRoles.value = []
   updateSearchImmediately()
 }
-
-const testError = () => {
-  throw new Error('what duhh hell')
-}
 </script>
diff --git a/packages/frontend-2/components/viewer/compare-changes/Panel.vue b/packages/frontend-2/components/viewer/compare-changes/Panel.vue
index 725aab0c2..dccf00e71 100644
--- a/packages/frontend-2/components/viewer/compare-changes/Panel.vue
+++ b/packages/frontend-2/components/viewer/compare-changes/Panel.vue
@@ -66,7 +66,7 @@ import { ChevronLeftIcon } from '@heroicons/vue/24/solid'
 import { VisualDiffMode } from '@speckle/viewer'
 import { useInjectedViewerState } from '~~/lib/viewer/composables/setup'
 import { uniqBy, debounce } from 'lodash-es'
-import type { SpeckleObject } from '~~/lib/common/helpers/sceneExplorer'
+import type { SpeckleObject } from '~~/lib/viewer/helpers/sceneExplorer'
 import { useMixpanel } from '~~/lib/core/composables/mp'
 
 defineEmits<{
diff --git a/packages/frontend-2/components/viewer/explorer/Explorer.vue b/packages/frontend-2/components/viewer/explorer/Explorer.vue
index db9277dc1..87f04d706 100644
--- a/packages/frontend-2/components/viewer/explorer/Explorer.vue
+++ b/packages/frontend-2/components/viewer/explorer/Explorer.vue
@@ -53,8 +53,7 @@
           class="bg-foundation rounded-lg"
         >
           <ViewerExplorerTreeItem
-            :item-id="(rootNode.data?.id as string)"
-            :tree-item="markRaw(rootNode)"
+            :tree-item="rootNode"
             :sub-header="'Model Version'"
             :debug="false"
             :expand-level="expandLevel"
@@ -75,14 +74,17 @@ import {
   CodeBracketIcon
 } from '@heroicons/vue/24/solid'
 import { ViewerEvent } from '@speckle/viewer'
-import type { ExplorerNode } from '~~/lib/common/helpers/sceneExplorer'
+import type {
+  ExplorerNode,
+  TreeItemComponentModel
+} from '~~/lib/viewer/helpers/sceneExplorer'
 import {
   useInjectedViewer,
   useInjectedViewerLoadedResources,
   useInjectedViewerState
 } from '~~/lib/viewer/composables/setup'
-import { markRaw } from 'vue'
 import { useViewerEventListener } from '~~/lib/viewer/composables/viewer'
+import { sortBy, flatten } from 'lodash-es'
 
 defineEmits(['close'])
 
@@ -121,13 +123,21 @@ const rootNodes = computed(() => {
   if (!worldTree.value) return []
   // eslint-disable-next-line vue/no-side-effects-in-computed-properties
   expandLevel.value = -1
-  const nodes = []
   const rootNodes = worldTree.value._root.children as ExplorerNode[]
+
+  const results: Record<number, ExplorerNode[]> = {}
+  const unmatchedNodes: ExplorerNode[] = []
+
   for (const node of rootNodes) {
     const objectId = ((node.model as Record<string, unknown>).id as string)
       .split('/')
       .reverse()[0] as string
-    const resourceItem = resourceItems.value.find((res) => res.objectId === objectId)
+    const resourceItemIdx = resourceItems.value.findIndex(
+      (res) => res.objectId === objectId
+    )
+    const resourceItem =
+      resourceItemIdx !== -1 ? resourceItems.value[resourceItemIdx] : null
+
     const raw = node.model?.raw as Record<string, unknown>
     if (resourceItem?.modelId) {
       // Model resource
@@ -140,9 +150,24 @@ const rootNodes = computed(() => {
       raw.name = 'Object'
       raw.type = 'Single Object'
     }
-    nodes.push(node.model as ExplorerNode)
+
+    const res = node.model as ExplorerNode
+    if (resourceItem) {
+      ;(results[resourceItemIdx] = results[resourceItemIdx] || []).push(res)
+    } else {
+      unmatchedNodes.push(res)
+    }
   }
 
-  return nodes
+  const nodes = [
+    ...flatten(sortBy(Object.entries(results), (i) => i[0]).map((i) => i[1])),
+    ...unmatchedNodes
+  ]
+
+  return nodes.map(
+    (n): TreeItemComponentModel => ({
+      rawNode: markRaw(n)
+    })
+  )
 })
 </script>
diff --git a/packages/frontend-2/components/viewer/explorer/Filters.vue b/packages/frontend-2/components/viewer/explorer/Filters.vue
index f73b27bf9..741610108 100644
--- a/packages/frontend-2/components/viewer/explorer/Filters.vue
+++ b/packages/frontend-2/components/viewer/explorer/Filters.vue
@@ -70,7 +70,7 @@
                 refreshColorsIfSetOrActiveFilterIsNumeric()
             "
           >
-            {{ filter.key }}
+            {{ getPropertyName(filter.key) }}
           </button>
         </div>
         <div v-if="itemCount < relevantFiltersSearched.length" class="mb-2">
@@ -82,11 +82,11 @@
     </div>
     <div v-if="activeFilter">
       <ViewerExplorerStringFilter
-        v-if="activeFilter.type === 'string'"
+        v-if="stringActiveFilter"
         :filter="stringActiveFilter"
       />
       <ViewerExplorerNumericFilter
-        v-if="activeFilter.type === 'number'"
+        v-if="numericActiveFilter"
         :filter="numericActiveFilter"
       />
     </div>
@@ -95,13 +95,13 @@
 <script setup lang="ts">
 import { ChevronDownIcon, ChevronUpIcon } from '@heroicons/vue/24/solid'
 import { ArrowPathIcon } from '@heroicons/vue/24/outline'
-import type {
-  PropertyInfo,
-  StringPropertyInfo,
-  NumericPropertyInfo
-} from '@speckle/viewer'
+import type { PropertyInfo } from '@speckle/viewer'
 import { useFilterUtilities } from '~~/lib/viewer/composables/ui'
 import { useMixpanel } from '~~/lib/core/composables/mp'
+import {
+  isNumericPropertyInfo,
+  isStringPropertyInfo
+} from '~/lib/viewer/helpers/sceneExplorer'
 
 const {
   setPropertyFilter,
@@ -111,6 +111,8 @@ const {
   filters: { propertyFilter }
 } = useFilterUtilities()
 
+const revitPropertyRegex = /^parameters\./
+
 const showAllFilters = ref(false)
 
 const props = defineProps<{
@@ -142,7 +144,7 @@ const relevantFilters = computed(() => {
       return false
     }
     // handle revit params: the actual one single value we're interested is in paramters.HOST_BLA BLA_.value, the rest are not needed
-    if (f.key.startsWith('parameters')) {
+    if (isRevitProperty(f.key)) {
       if (f.key.endsWith('.value')) return true
       else return false
     }
@@ -150,9 +152,8 @@ const relevantFilters = computed(() => {
   })
 })
 
-const speckleTypeFilter = computed(
-  () =>
-    relevantFilters.value.find((f) => f.key === 'speckle_type') as StringPropertyInfo
+const speckleTypeFilter = computed(() =>
+  relevantFilters.value.find((f) => f.key === 'speckle_type')
 )
 const activeFilter = computed(
   () => propertyFilter.filter.value || speckleTypeFilter.value
@@ -169,18 +170,26 @@ watch(activeFilter, (newVal) => {
   })
 })
 
-// Using these as casting activeFilter as XXX in the prop causes some syntax highliting bug to show. Apologies :)
-const stringActiveFilter = computed(() => activeFilter.value as StringPropertyInfo)
-const numericActiveFilter = computed(() => activeFilter.value as NumericPropertyInfo)
+const stringActiveFilter = computed(() =>
+  isStringPropertyInfo(activeFilter.value) ? activeFilter.value : undefined
+)
+const numericActiveFilter = computed(() =>
+  isNumericPropertyInfo(activeFilter.value) ? activeFilter.value : undefined
+)
 
 const searchString = ref<string | undefined>(undefined)
 const relevantFiltersSearched = computed(() => {
   if (!searchString.value) return relevantFilters.value
+  const searchLower = searchString.value.toLowerCase()
   // eslint-disable-next-line vue/no-side-effects-in-computed-properties
   itemCount.value = 30 // nasty, but yolo - reset max limit on search change
-  return relevantFilters.value.filter((f) =>
-    f.key.toLowerCase().includes((searchString.value as string).toLowerCase())
-  )
+  return relevantFilters.value.filter((f) => {
+    const userFriendlyName = getPropertyName(f.key).toLowerCase()
+    return (
+      f.key.toLowerCase().includes(searchLower) ||
+      userFriendlyName.includes(searchLower)
+    )
+  })
 })
 
 const itemCount = ref(30)
@@ -190,28 +199,7 @@ const relevantFiltersLimited = computed(() => {
     .sort((a, b) => a.key.length - b.key.length)
 })
 
-// Too lazy to follow up in here for now, as i think we need a bit of a better strategy in connectors first :/
-const title = computed(() => {
-  const currentFilterKey = activeFilter.value?.key
-  if (!currentFilterKey) return 'Loading'
-
-  if (currentFilterKey === 'level.name') return 'Level Name'
-  if (currentFilterKey === 'speckle_type') return 'Object Type'
-
-  // Handle revit names :/
-  if (
-    currentFilterKey.startsWith('parameters.') &&
-    currentFilterKey.endsWith('.value')
-  ) {
-    return (
-      props.filters.find(
-        (f) => f.key === currentFilterKey.replace('.value', '.name')
-      ) as StringPropertyInfo
-    ).valueGroups[0].value
-  }
-
-  return currentFilterKey
-})
+const title = computed(() => getPropertyName(activeFilter.value?.key ?? ''))
 
 const colors = computed(() => !!propertyFilter.isApplied.value)
 
@@ -229,7 +217,7 @@ const toggleColors = () => {
 // Handles a rather complicated ux flow: user sets a numeric filter which only makes sense with colors on. we set the force colors flag in that scenario, so we can revert it if user selects a non-numeric filter afterwards.
 let forcedColors = false
 const refreshColorsIfSetOrActiveFilterIsNumeric = () => {
-  if (activeFilter.value.type === 'number' && !colors.value) {
+  if (!!numericActiveFilter.value && !colors.value) {
     forcedColors = true
     applyPropertyFilter()
     return
@@ -246,4 +234,27 @@ const refreshColorsIfSetOrActiveFilterIsNumeric = () => {
   // removePropertyFilter()
   applyPropertyFilter()
 }
+
+const isRevitProperty = (key: string): boolean => {
+  return revitPropertyRegex.test(key)
+}
+
+const getPropertyName = (key: string): string => {
+  if (!key) return 'Loading'
+
+  if (key === 'level.name') return 'Level Name'
+  if (key === 'speckle_type') return 'Object Type'
+
+  if (isRevitProperty(key) && key.endsWith('.value')) {
+    const correspondingProperty = props.filters.find(
+      (f) => f.key === key.replace('.value', '.name')
+    )
+    if (correspondingProperty && isStringPropertyInfo(correspondingProperty)) {
+      return correspondingProperty.valueGroups[0]?.value || key
+    }
+  }
+
+  // Return the key as is for non-Revit properties
+  return key
+}
 </script>
diff --git a/packages/frontend-2/components/viewer/explorer/StringFilterItem.vue b/packages/frontend-2/components/viewer/explorer/StringFilterItem.vue
index c9c64aa2c..f1b02bd4a 100644
--- a/packages/frontend-2/components/viewer/explorer/StringFilterItem.vue
+++ b/packages/frontend-2/components/viewer/explorer/StringFilterItem.vue
@@ -2,10 +2,11 @@
 <template>
   <div>
     <!-- eslint-disable-next-line vuejs-accessibility/click-events-have-key-events -->
-    <div
+    <button
       :class="`flex group pl-1 justify-between items-center w-full max-w-full overflow-hidden select-none space-x-2 rounded border-l-4 hover:bg-primary-muted hover:shadow-md text-foreground cursor-pointer ${
         isSelected ? 'border-primary bg-primary-muted' : 'border-transparent'
       }`"
+      :title="item.value"
       @click="setSelection()"
     >
       <div class="flex gap-1 items-center flex-shrink truncate text-xs sm:text-sm">
@@ -15,7 +16,7 @@
           :style="`background-color: #${color};`"
         ></span>
         <span class="truncate">
-          {{ item.value.split('.').reverse()[0] || item.value || 'No Name' }}
+          {{ item.value || 'No Name' }}
         </span>
         <div class="flex">
           <span
@@ -57,7 +58,7 @@
         <FunnelIcon v-else class="h-3 w-3" />
         <!-- </button> -->
       </div>
-    </div>
+    </button>
     <!-- Debugging info -->
     <!-- <div v-if="true" class="text-xs text-foreground-2">
       selected: {{ isSelected }}; isHidden {{ isHidden }}; isIsolated: {{ isIsolated }}
diff --git a/packages/frontend-2/components/viewer/explorer/TreeItem.vue b/packages/frontend-2/components/viewer/explorer/TreeItem.vue
index e34495df7..d26d58942 100644
--- a/packages/frontend-2/components/viewer/explorer/TreeItem.vue
+++ b/packages/frontend-2/components/viewer/explorer/TreeItem.vue
@@ -95,10 +95,13 @@
       <!-- If we have array collections -->
       <div v-if="isMultipleCollection">
         <!-- mul col items -->
-        <div v-for="collection in arrayCollections" :key="collection?.raw?.name">
+        <div
+          v-for="(item, idx) in arrayCollections"
+          :key="item?.rawNode.raw?.name || idx"
+        >
           <TreeItem
-            :item-id="(collection.raw?.id as string)"
-            :tree-item="collection"
+            :item-id="(item.rawNode.raw?.id as string)"
+            :tree-item="item"
             :depth="depth + 1"
             :expand-level="props.expandLevel"
             :manual-expand-level="manualExpandLevel"
@@ -111,9 +114,12 @@
       <!-- If we have a single model collection -->
       <div v-if="isSingleCollection">
         <!-- single col items -->
-        <div v-for="item in singleCollectionItemsPaginated" :key="item.raw?.id">
+        <div
+          v-for="(item, idx) in singleCollectionItemsPaginated"
+          :key="item.rawNode.raw?.id || idx"
+        >
           <TreeItem
-            :item-id="(item.raw?.id as string)"
+            :item-id="(item.rawNode.raw?.id as string)"
             :tree-item="item"
             :depth="depth + 1"
             :expand-level="props.expandLevel"
@@ -143,8 +149,9 @@ import { FunnelIcon as FunnelIconOutline } from '@heroicons/vue/24/outline'
 import type {
   ExplorerNode,
   SpeckleObject,
-  SpeckleReference
-} from '~~/lib/common/helpers/sceneExplorer'
+  SpeckleReference,
+  TreeItemComponentModel
+} from '~~/lib/viewer/helpers/sceneExplorer'
 import { useInjectedViewerState } from '~~/lib/viewer/composables/setup'
 import {
   getHeaderAndSubheaderForSpeckleObject,
@@ -159,8 +166,8 @@ import {
 
 const props = withDefaults(
   defineProps<{
-    treeItem: ExplorerNode
-    parent?: ExplorerNode
+    treeItem: TreeItemComponentModel
+    parent?: TreeItemComponentModel
     depth?: number
     debug?: boolean
     expandLevel: number
@@ -186,9 +193,9 @@ const { hideObjects, showObjects, isolateObjects, unIsolateObjects } =
   useFilterUtilities()
 const { highlightObjects, unhighlightObjects } = useHighlightedObjectsUtilities()
 
-const isAtomic = computed(() => props.treeItem.atomic === true)
-const speckleData = props.treeItem?.raw as SpeckleObject
-const rawSpeckleData = props.treeItem?.raw as SpeckleObject
+const isAtomic = computed(() => props.treeItem.rawNode.atomic === true)
+const rawSpeckleData = computed(() => props.treeItem?.rawNode.raw as SpeckleObject)
+const speckleData = rawSpeckleData
 
 function getNestedModelHeader(name: string): string {
   const parts = name.split('/')
@@ -196,7 +203,9 @@ function getNestedModelHeader(name: string): string {
 }
 
 const headerAndSubheader = computed(() => {
-  const { header, subheader } = getHeaderAndSubheaderForSpeckleObject(rawSpeckleData)
+  const { header, subheader } = getHeaderAndSubheaderForSpeckleObject(
+    rawSpeckleData.value
+  )
   return {
     header: getNestedModelHeader(header),
     subheader
@@ -204,32 +213,45 @@ const headerAndSubheader = computed(() => {
 })
 
 const childrenLength = computed(() => {
-  if (rawSpeckleData.elements && Array.isArray(rawSpeckleData.elements))
-    return rawSpeckleData.elements.length
-  if (rawSpeckleData.children && Array.isArray(rawSpeckleData.children))
-    return rawSpeckleData.children.length
+  if (rawSpeckleData.value.elements && Array.isArray(rawSpeckleData.value.elements))
+    return rawSpeckleData.value.elements.length
+  if (rawSpeckleData.value.children && Array.isArray(rawSpeckleData.value.children))
+    return rawSpeckleData.value.children.length
   return 0
 })
 
 const isSingleCollection = computed(() => {
   return (
-    isNonEmptyObjectArray(speckleData.children) ||
-    isNonEmptyObjectArray(speckleData.elements)
+    isNonEmptyObjectArray(speckleData.value.children) ||
+    isNonEmptyObjectArray(speckleData.value.elements)
   )
 })
 
 const singleCollectionItems = computed(() => {
-  const treeItems = props.treeItem.children.filter((child) => !!child.raw?.id) // filter out random tree children (no id means they're not actual objects)
+  const treeItems = props.treeItem.rawNode.children.filter(
+    (child) => !!child.raw?.id && isAllowedType(child)
+    // filter out random tree children (no id means they're not actual objects)
+  )
   // Handle the case of a wall, roof or other atomic objects that have nested children
-  if (isNonEmptyObjectArray(speckleData.elements) && isAtomic.value) {
+  if (isNonEmptyObjectArray(speckleData.value.elements) && isAtomic.value) {
     // We need to filter out children that are not direct descendants of `elements`
     // Note: this is a current assumption convention.
-    const ids = (speckleData.elements as SpeckleReference[]).map(
+    const ids = (speckleData.value.elements as SpeckleReference[]).map(
       (obj) => obj.referencedId
     )
-    return treeItems.filter((item) => ids.includes(item.raw?.id as string))
+    return treeItems
+      .filter((item) => ids.includes(item.raw?.id as string))
+      .map(
+        (i): TreeItemComponentModel => ({
+          rawNode: i
+        })
+      )
   }
-  return treeItems
+  return treeItems.map(
+    (i): TreeItemComponentModel => ({
+      rawNode: i
+    })
+  )
 })
 
 const itemCount = ref(10)
@@ -242,17 +264,17 @@ const singleCollectionItemsPaginated = computed(() => {
 // object { @boat: [obj, obj, obj], @harbour: [obj, obj, obj], etc. }
 // @boat and @harbour would ideally be model collections, but, alas, connectors don't have that yet.
 const arrayCollections = computed(() => {
-  const arr = [] as ExplorerNode[]
+  const arr = [] as TreeItemComponentModel[]
   for (const k of Object.keys(rawSpeckleData)) {
     if (k === 'children' || k === 'elements' || k.includes('displayValue')) continue
 
-    const val = rawSpeckleData[k] as SpeckleReference[]
+    const val = rawSpeckleData.value[k] as SpeckleReference[]
     if (!isNonEmptyObjectArray(val)) continue
 
     const ids = val.map((ref) => ref.referencedId) // NOTE: we're assuming all collections have refs inside; might revisit/to think re edge cases
 
-    const actualRawRefs = props.treeItem.children.filter((node) =>
-      ids.includes(node.raw?.id as string)
+    const actualRawRefs = props.treeItem.rawNode.children.filter(
+      (node) => ids.includes(node.raw?.id as string) && isAllowedType(node)
     )
 
     if (actualRawRefs.length === 0) continue // bypasses chunks: if the actual object is not part of the tree item's children, it means it's a sublimated type (ie, a chunk). the assumption we're making is that any list of actual atomic objects is not chunked.
@@ -267,7 +289,9 @@ const arrayCollections = computed(() => {
       children: actualRawRefs,
       expanded: false
     }
-    arr.push(modelCollectionItem)
+    arr.push({
+      rawNode: modelCollectionItem
+    })
   }
 
   return arr
@@ -283,6 +307,9 @@ const isNonEmptyObjectArray = (x: unknown) => isNonEmptyArray(x) && isObject(x[0
 const isObject = (x: unknown) =>
   typeof x === 'object' && !Array.isArray(x) && x !== null
 
+const isAllowedType = (node: ExplorerNode) =>
+  !['Objects.Other.DisplayStyle'].includes(node.raw?.speckle_type || '')
+
 const unfold = ref(false)
 
 // NOTE: not happy with how unfolding and collapsing panned out :(
@@ -320,7 +347,7 @@ const manualUnfoldToggle = () => {
 }
 
 const isSelected = computed(() => {
-  return !!objects.value.find((o) => o.id === speckleData.id)
+  return !!objects.value.find((o) => o.id === speckleData.value.id)
 })
 
 const setSelection = (e: MouseEvent) => {
@@ -329,19 +356,19 @@ const setSelection = (e: MouseEvent) => {
     return
   }
   if (isSelected.value && e.shiftKey) {
-    removeFromSelection(rawSpeckleData)
+    removeFromSelection(rawSpeckleData.value)
     return
   }
   if (!e.shiftKey) clearSelection()
-  addToSelection(rawSpeckleData)
+  addToSelection(rawSpeckleData.value)
 }
 
 const highlightObject = () => {
-  highlightObjects(getTargetObjectIds(rawSpeckleData))
+  highlightObjects(getTargetObjectIds(rawSpeckleData.value))
 }
 
 const unhighlightObject = () => {
-  unhighlightObjects(getTargetObjectIds(rawSpeckleData))
+  unhighlightObjects(getTargetObjectIds(rawSpeckleData.value))
 }
 
 const hiddenObjects = computed(() => filteringState.value?.hiddenObjects)
@@ -349,7 +376,7 @@ const isolatedObjects = computed(() => filteringState.value?.isolatedObjects)
 
 const isHidden = computed(() => {
   if (!hiddenObjects.value) return false
-  const ids = getTargetObjectIds(rawSpeckleData)
+  const ids = getTargetObjectIds(rawSpeckleData.value)
   return containsAll(ids, hiddenObjects.value)
 })
 
@@ -360,12 +387,12 @@ const stateHasIsolatedObjectsInGeneral = computed(() => {
 
 const isIsolated = computed(() => {
   if (!isolatedObjects.value) return false
-  const ids = getTargetObjectIds(rawSpeckleData)
+  const ids = getTargetObjectIds(rawSpeckleData.value)
   return containsAll(ids, isolatedObjects.value)
 })
 
 const hideOrShowObject = () => {
-  const ids = getTargetObjectIds(rawSpeckleData)
+  const ids = getTargetObjectIds(rawSpeckleData.value)
   if (!isHidden.value) {
     hideObjects(ids)
     return
@@ -375,7 +402,7 @@ const hideOrShowObject = () => {
 }
 
 const isolateOrUnisolateObject = () => {
-  const ids = getTargetObjectIds(rawSpeckleData)
+  const ids = getTargetObjectIds(rawSpeckleData.value)
   if (!isIsolated.value) {
     isolateObjects(ids)
     return
diff --git a/packages/frontend-2/components/viewer/selection/Object.vue b/packages/frontend-2/components/viewer/selection/Object.vue
index 5fe966e91..aa2dcadfd 100644
--- a/packages/frontend-2/components/viewer/selection/Object.vue
+++ b/packages/frontend-2/components/viewer/selection/Object.vue
@@ -131,7 +131,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import { ChevronDownIcon } from '@heroicons/vue/24/solid'
 import { ClipboardDocumentIcon } from '@heroicons/vue/24/outline'
-import type { SpeckleObject } from '~~/lib/common/helpers/sceneExplorer'
+import type { SpeckleObject } from '~~/lib/viewer/helpers/sceneExplorer'
 import { getHeaderAndSubheaderForSpeckleObject } from '~~/lib/object-sidebar/helpers'
 import { useInjectedViewerState } from '~~/lib/viewer/composables/setup'
 import { useHighlightedObjectsUtilities } from '~/lib/viewer/composables/ui'
diff --git a/packages/frontend-2/lib/common/generated/gql/graphql.ts b/packages/frontend-2/lib/common/generated/gql/graphql.ts
index be7694819..ac1b09012 100644
--- a/packages/frontend-2/lib/common/generated/gql/graphql.ts
+++ b/packages/frontend-2/lib/common/generated/gql/graphql.ts
@@ -375,62 +375,6 @@ export type AutomationCollection = {
   totalCount: Scalars['Int']['output'];
 };
 
-export type AutomationCreateInput = {
-  automationId: Scalars['String']['input'];
-  automationName: Scalars['String']['input'];
-  automationRevisionId: Scalars['String']['input'];
-  modelId: Scalars['String']['input'];
-  projectId: Scalars['String']['input'];
-  webhookId?: InputMaybe<Scalars['String']['input']>;
-};
-
-export type AutomationFunctionRun = {
-  __typename?: 'AutomationFunctionRun';
-  contextView?: Maybe<Scalars['String']['output']>;
-  elapsed: Scalars['Float']['output'];
-  functionId: Scalars['String']['output'];
-  functionLogo?: Maybe<Scalars['String']['output']>;
-  functionName: Scalars['String']['output'];
-  id: Scalars['ID']['output'];
-  resultVersions: Array<Version>;
-  /**
-   * NOTE: this is the schema for the results field below!
-   * Current schema: {
-   *   version: "1.0.0",
-   *   values: {
-   *     objectResults: Record<str, {
-   *       category: string
-   *       level: ObjectResultLevel
-   *       objectIds: string[]
-   *       message: str | null
-   *       metadata: Records<str, unknown> | null
-   *       visualoverrides: Records<str, unknown> | null
-   *     }[]>
-   *     blobIds?: string[]
-   *   }
-   * }
-   */
-  results?: Maybe<Scalars['JSONObject']['output']>;
-  status: AutomationRunStatus;
-  statusMessage?: Maybe<Scalars['String']['output']>;
-};
-
-export type AutomationMutations = {
-  __typename?: 'AutomationMutations';
-  create: Scalars['Boolean']['output'];
-  functionRunStatusReport: Scalars['Boolean']['output'];
-};
-
-
-export type AutomationMutationsCreateArgs = {
-  input: AutomationCreateInput;
-};
-
-
-export type AutomationMutationsFunctionRunStatusReportArgs = {
-  input: AutomationRunStatusUpdateInput;
-};
-
 export type AutomationRevision = {
   __typename?: 'AutomationRevision';
   functions: Array<AutomationRevisionFunction>;
@@ -454,44 +398,8 @@ export type AutomationRevisionFunction = {
 
 export type AutomationRevisionTriggerDefinition = VersionCreatedTriggerDefinition;
 
-export type AutomationRun = {
-  __typename?: 'AutomationRun';
-  automationId: Scalars['String']['output'];
-  automationName: Scalars['String']['output'];
-  createdAt: Scalars['DateTime']['output'];
-  functionRuns: Array<AutomationFunctionRun>;
-  id: Scalars['ID']['output'];
-  /** Resolved from all function run statuses */
-  status: AutomationRunStatus;
-  updatedAt: Scalars['DateTime']['output'];
-  versionId: Scalars['String']['output'];
-};
-
-export enum AutomationRunStatus {
-  Failed = 'FAILED',
-  Initializing = 'INITIALIZING',
-  Running = 'RUNNING',
-  Succeeded = 'SUCCEEDED'
-}
-
-export type AutomationRunStatusUpdateInput = {
-  automationId: Scalars['String']['input'];
-  automationRevisionId: Scalars['String']['input'];
-  automationRunId: Scalars['String']['input'];
-  functionRuns: Array<FunctionRunStatusInput>;
-  versionId: Scalars['String']['input'];
-};
-
 export type AutomationRunTrigger = VersionCreatedTrigger;
 
-export type AutomationsStatus = {
-  __typename?: 'AutomationsStatus';
-  automationRuns: Array<AutomationRun>;
-  id: Scalars['ID']['output'];
-  status: AutomationRunStatus;
-  statusMessage?: Maybe<Scalars['String']['output']>;
-};
-
 export type AvatarUser = {
   __typename?: 'AvatarUser';
   avatar?: Maybe<Scalars['String']['output']>;
@@ -936,27 +844,6 @@ export type FileUpload = {
   userId: Scalars['String']['output'];
 };
 
-export type FunctionRunStatusInput = {
-  contextView?: InputMaybe<Scalars['String']['input']>;
-  elapsed: Scalars['Float']['input'];
-  functionId: Scalars['String']['input'];
-  functionLogo?: InputMaybe<Scalars['String']['input']>;
-  functionName: Scalars['String']['input'];
-  resultVersionIds: Array<Scalars['String']['input']>;
-  /**
-   * Current schema: {
-   *   version: "1.0.0",
-   *   values: {
-   *     speckleObjects: Record<ObjectId, {level: string; statusMessage: string}[]>
-   *     blobIds?: string[]
-   *   }
-   * }
-   */
-  results?: InputMaybe<Scalars['JSONObject']['input']>;
-  status: AutomationRunStatus;
-  statusMessage?: InputMaybe<Scalars['String']['input']>;
-};
-
 export type GendoAiRender = {
   __typename?: 'GendoAIRender';
   camera?: Maybe<Scalars['JSONObject']['output']>;
@@ -1082,7 +969,6 @@ export type LimitedUserTimelineArgs = {
 export type Model = {
   __typename?: 'Model';
   author: LimitedUser;
-  automationStatus?: Maybe<AutomationsStatus>;
   automationsStatus?: Maybe<TriggeredAutomationsStatus>;
   /** Return a model tree of children */
   childrenTree: Array<ModelsTreeItem>;
@@ -1215,7 +1101,6 @@ export type Mutation = {
   appUpdate: Scalars['Boolean']['output'];
   automateFunctionRunStatusReport: Scalars['Boolean']['output'];
   automateMutations: AutomateMutations;
-  automationMutations: AutomationMutations;
   branchCreate: Scalars['String']['output'];
   branchDelete: Scalars['Boolean']['output'];
   branchUpdate: Scalars['Boolean']['output'];
@@ -1901,14 +1786,6 @@ export type ProjectAutomationUpdateInput = {
   name?: InputMaybe<Scalars['String']['input']>;
 };
 
-export type ProjectAutomationsStatusUpdatedMessage = {
-  __typename?: 'ProjectAutomationsStatusUpdatedMessage';
-  model: Model;
-  project: Project;
-  status: AutomationsStatus;
-  version: Version;
-};
-
 export type ProjectAutomationsUpdatedMessage = {
   __typename?: 'ProjectAutomationsUpdatedMessage';
   automation?: Maybe<Automation>;
@@ -2875,7 +2752,6 @@ export type Subscription = {
   commitDeleted?: Maybe<Scalars['JSONObject']['output']>;
   /** Subscribe to commit updated event. */
   commitUpdated?: Maybe<Scalars['JSONObject']['output']>;
-  projectAutomationsStatusUpdated: ProjectAutomationsStatusUpdatedMessage;
   /** Subscribe to updates to automations in the project */
   projectAutomationsUpdated: ProjectAutomationsUpdatedMessage;
   /**
@@ -2971,11 +2847,6 @@ export type SubscriptionCommitUpdatedArgs = {
 };
 
 
-export type SubscriptionProjectAutomationsStatusUpdatedArgs = {
-  projectId: Scalars['String']['input'];
-};
-
-
 export type SubscriptionProjectAutomationsUpdatedArgs = {
   projectId: Scalars['String']['input'];
 };
@@ -3317,7 +3188,6 @@ export type UserUpdateInput = {
 export type Version = {
   __typename?: 'Version';
   authorUser?: Maybe<LimitedUser>;
-  automationStatus?: Maybe<AutomationsStatus>;
   automationsStatus?: Maybe<TriggeredAutomationsStatus>;
   /** All comment threads in this version */
   commentThreads: CommentCollection;
diff --git a/packages/frontend-2/lib/common/helpers/sceneExplorer.ts b/packages/frontend-2/lib/common/helpers/sceneExplorer.ts
deleted file mode 100644
index 2f2a812c5..000000000
--- a/packages/frontend-2/lib/common/helpers/sceneExplorer.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { type SpeckleObject, type SpeckleReference } from '@speckle/viewer'
-
-// Note: minor typing hacks for less squiggly lines in the explorer.
-// TODO: ask alex re viewer data tree types
-
-export type ExplorerNode = {
-  guid?: string
-  data?: SpeckleObject
-  raw?: SpeckleObject
-  atomic?: boolean
-  model?: Record<string, unknown> & { id?: string }
-  children: ExplorerNode[]
-}
-
-export type { SpeckleObject, SpeckleReference }
diff --git a/packages/frontend-2/lib/core/composables/error.ts b/packages/frontend-2/lib/core/composables/error.ts
index 1f97fca50..c7355eaad 100644
--- a/packages/frontend-2/lib/core/composables/error.ts
+++ b/packages/frontend-2/lib/core/composables/error.ts
@@ -1,9 +1,10 @@
 import { useScopedState } from '~~/lib/common/composables/scopedState'
 import * as Observability from '@speckle/shared/dist/esm/observability/index'
-import type {
-  AbstractErrorHandler,
-  AbstractErrorHandlerParams,
-  AbstractUnhandledErrorHandler
+import {
+  prettify,
+  type AbstractErrorHandler,
+  type AbstractErrorHandlerParams,
+  type AbstractUnhandledErrorHandler
 } from '~/lib/core/helpers/observability'
 
 const ENTER_STATE_AT_ERRORS_PER_MIN = 100
@@ -65,7 +66,11 @@ export const useGetErrorLoggingTransports = () => {
 export const useLogToErrorLoggingTransports = () => {
   const transports = useGetErrorLoggingTransports()
   const invokeTransportsWithPayload = (payload: AbstractErrorHandlerParams) => {
-    transports.forEach((handler) => handler.onError(payload))
+    transports.forEach((handler) =>
+      handler.onError(payload, {
+        prettifyMessage: (msg) => prettify(payload.otherData || {}, msg)
+      })
+    )
   }
 
   return {
diff --git a/packages/frontend-2/lib/core/configs/apollo.ts b/packages/frontend-2/lib/core/configs/apollo.ts
index 997571498..d5deb8d9c 100644
--- a/packages/frontend-2/lib/core/configs/apollo.ts
+++ b/packages/frontend-2/lib/core/configs/apollo.ts
@@ -8,7 +8,7 @@ import createUploadLink from 'apollo-upload-client/createUploadLink.mjs'
 import { WebSocketLink } from '@apollo/client/link/ws'
 import { getMainDefinition } from '@apollo/client/utilities'
 import { Kind } from 'graphql'
-import type { OperationDefinitionNode } from 'graphql'
+import type { GraphQLError, OperationDefinitionNode } from 'graphql'
 import type { CookieRef, NuxtApp } from '#app'
 import type { Optional } from '@speckle/shared'
 import { useAuthCookie } from '~~/lib/auth/composables/auth'
@@ -22,7 +22,7 @@ import { onError } from '@apollo/client/link/error'
 import { useNavigateToLogin, loginRoute } from '~~/lib/common/helpers/route'
 import { useAppErrorState } from '~~/lib/core/composables/error'
 import { isInvalidAuth } from '~~/lib/common/helpers/graphql'
-import { isBoolean, omit } from 'lodash-es'
+import { isArray, isBoolean, omit } from 'lodash-es'
 import { useRequestId } from '~/lib/core/composables/server'
 
 const appName = 'frontend-2'
@@ -337,12 +337,15 @@ function createLink(params: {
       ? skipLoggingErrors
       : skipLoggingErrors?.(res)
     if (!isSubTokenMissingError && !shouldSkip) {
-      const errMsg = res.networkError?.message || res.graphQLErrors?.[0]?.message
+      const gqlErrors: Array<GraphQLError> = isArray(res.graphQLErrors)
+        ? res.graphQLErrors
+        : []
+      const errMsg = res.networkError?.message || gqlErrors[0]?.message
       logger.error(
         {
           ...omit(res, ['forward', 'response']),
           networkErrorMessage: res.networkError?.message,
-          gqlErrorMessages: res.graphQLErrors?.map((e) => e.message),
+          gqlErrorMessages: gqlErrors.map((e) => e.message),
           errorMessage: errMsg,
           graphql: true
         },
diff --git a/packages/frontend-2/lib/core/helpers/observability.ts b/packages/frontend-2/lib/core/helpers/observability.ts
index 2a82f0ae9..b2aa8bf58 100644
--- a/packages/frontend-2/lib/core/helpers/observability.ts
+++ b/packages/frontend-2/lib/core/helpers/observability.ts
@@ -19,7 +19,7 @@ import type { Logger } from 'pino'
 /**
  * Add pino-pretty like formatting
  */
-const prettify = (log: object, msg: string) =>
+export const prettify = (log: object, msg: string) =>
   msg.replace(/{([^{}]+)}/g, (match: string, p1: string) => {
     const val = get(log, p1)
     if (val === undefined) return match
@@ -33,7 +33,7 @@ const prettify = (log: object, msg: string) =>
  * Wrap any logger call w/ logic that prettifies the error message like pino-pretty does
  * and emits bindings if they are provided
  */
-const log =
+const prettifiedLoggerFactory =
   (logger: (...args: unknown[]) => void, bindings?: () => Record<string, unknown>) =>
   (...vals: unknown[]) => {
     const finalVals = vals.slice()
@@ -72,16 +72,16 @@ export function buildFakePinoLogger(
   const errLogger = (...args: unknown[]) => {
     const { onError } = options || {}
     if (onError) onError(...args)
-    log(console.error, bindings)(...args)
+    prettifiedLoggerFactory(console.error, bindings)(...args)
   }
 
   const logger = {
-    debug: log(console.debug, bindings),
-    info: log(console.info, bindings),
-    warn: log(console.warn, bindings),
+    debug: prettifiedLoggerFactory(console.debug, bindings),
+    info: prettifiedLoggerFactory(console.info, bindings),
+    warn: prettifiedLoggerFactory(console.warn, bindings),
     error: errLogger,
     fatal: errLogger,
-    trace: log(console.trace, bindings),
+    trace: prettifiedLoggerFactory(console.trace, bindings),
     silent: noop
   } as unknown as ReturnType<typeof Observability.getLogger>
 
@@ -121,13 +121,18 @@ export const formatAppError = (err: SimpleError) => {
   }
 }
 
-export type AbstractErrorHandler = (params: {
-  args: unknown[]
-  firstString: Optional<string>
-  firstError: Optional<Error>
-  otherData: Record<string, unknown>
-  nonObjectOtherData: unknown[]
-}) => void
+export type AbstractErrorHandler = (
+  params: {
+    args: unknown[]
+    firstString: Optional<string>
+    firstError: Optional<Error>
+    otherData: Record<string, unknown>
+    nonObjectOtherData: unknown[]
+  },
+  helpers: {
+    prettifyMessage: (msg: string) => string
+  }
+) => void
 
 export type AbstractUnhandledErrorHandler = (params: {
   event: ErrorEvent | PromiseRejectionEvent
@@ -175,13 +180,16 @@ export function enableCustomErrorHandling(params: {
               {},
               ...otherDataObjects
             ) as Record<string, unknown>
-            onError({
-              args,
-              firstError,
-              firstString,
-              otherData: mergedOtherDataObject,
-              nonObjectOtherData: otherDataNonObjects
-            })
+            onError(
+              {
+                args,
+                firstError,
+                firstString,
+                otherData: mergedOtherDataObject,
+                nonObjectOtherData: otherDataNonObjects
+              },
+              { prettifyMessage: (msg) => prettify(mergedOtherDataObject, msg) }
+            )
           }
 
           return log(...args)
diff --git a/packages/frontend-2/lib/object-sidebar/helpers.ts b/packages/frontend-2/lib/object-sidebar/helpers.ts
index c74e4d17e..0847a0c93 100644
--- a/packages/frontend-2/lib/object-sidebar/helpers.ts
+++ b/packages/frontend-2/lib/object-sidebar/helpers.ts
@@ -1,4 +1,4 @@
-import type { SpeckleObject } from '~~/lib/common/helpers/sceneExplorer'
+import type { SpeckleObject } from '~/lib/viewer/helpers/sceneExplorer'
 
 export type HeaderSubheader = {
   header: string
diff --git a/packages/frontend-2/lib/viewer/composables/setup.ts b/packages/frontend-2/lib/viewer/composables/setup.ts
index 5bf8cd0d0..654f59533 100644
--- a/packages/frontend-2/lib/viewer/composables/setup.ts
+++ b/packages/frontend-2/lib/viewer/composables/setup.ts
@@ -49,7 +49,7 @@ import { nanoid } from 'nanoid'
 import { ToastNotificationType, useGlobalToast } from '~~/lib/common/composables/toast'
 import type { CommentBubbleModel } from '~~/lib/viewer/composables/commentBubbles'
 import { setupUrlHashState } from '~~/lib/viewer/composables/setup/urlHashState'
-import type { SpeckleObject } from '~~/lib/common/helpers/sceneExplorer'
+import type { SpeckleObject } from '~/lib/viewer/helpers/sceneExplorer'
 import type { Box3 } from 'three'
 import { Vector3 } from 'three'
 import { writableAsyncComputed } from '~~/lib/common/composables/async'
@@ -111,11 +111,18 @@ export type InjectableViewerState = Readonly<{
      * Various values that represent the current Viewer instance state
      */
     metadata: {
+      /**
+       * Based on a shallow ref
+       */
       worldTree: ComputedRef<Optional<WorldTree>>
       availableFilters: ComputedRef<Optional<PropertyInfo[]>>
       views: ComputedRef<SpeckleView[]>
       filteringState: ComputedRef<Optional<FilteringState>>
     }
+    /**
+     * Whether the Viewer has finished doing the initial object loading
+     */
+    hasDoneInitialLoad: Ref<boolean>
   }
   /**
    * Loaded/loadable resources
@@ -395,6 +402,7 @@ function setupInitialState(params: UseSetupViewerParams): InitialSetupState {
     createViewerDataBuilder({ viewerDebug })
   ) || { initPromise: Promise.resolve() }
   initPromise.then(() => (isInitialized.value = true))
+  const hasDoneInitialLoad = ref(false)
 
   return {
     projectId,
@@ -412,7 +420,8 @@ function setupInitialState(params: UseSetupViewerParams): InitialSetupState {
             availableFilters: computed(() => undefined),
             views: computed(() => []),
             filteringState: computed(() => undefined)
-          }
+          },
+          hasDoneInitialLoad
         } as unknown as InitialSetupState['viewer'])
       : {
           instance,
@@ -421,7 +430,8 @@ function setupInitialState(params: UseSetupViewerParams): InitialSetupState {
             promise: initPromise,
             ref: computed(() => isInitialized.value)
           },
-          metadata: setupViewerMetadata({ viewer: instance })
+          metadata: setupViewerMetadata({ viewer: instance }),
+          hasDoneInitialLoad
         },
     urlHashState: setupUrlHashState()
   }
diff --git a/packages/frontend-2/lib/viewer/composables/setup/postSetup.ts b/packages/frontend-2/lib/viewer/composables/setup/postSetup.ts
index 2d1759984..bd319d124 100644
--- a/packages/frontend-2/lib/viewer/composables/setup/postSetup.ts
+++ b/packages/frontend-2/lib/viewer/composables/setup/postSetup.ts
@@ -82,7 +82,8 @@ function useViewerObjectAutoLoading() {
     projectId,
     viewer: {
       instance: viewer,
-      init: { ref: isInitialized }
+      init: { ref: isInitialized },
+      hasDoneInitialLoad
     },
     resources: {
       response: { resourceItems }
@@ -112,21 +113,24 @@ function useViewerObjectAutoLoading() {
     uniq(resourceItems.map((i) => i.objectId))
 
   watch(
-    () => <const>[resourceItems.value, isInitialized.value],
-    async ([newResources, newIsInitialized], oldData) => {
+    () => <const>[resourceItems.value, isInitialized.value, hasDoneInitialLoad.value],
+    async ([newResources, newIsInitialized, newHasDoneInitialLoad], oldData) => {
       // Wait till viewer loaded in
       if (!newIsInitialized) return
 
-      const [oldResources, oldIsInitialized] = oldData || [[], false]
+      const [oldResources] = oldData || [[], false]
       const zoomToObject = !focusedThreadId.value // we want to zoom to the thread instead
 
       // Viewer initialized - load in all resources
-      if (newIsInitialized && !oldIsInitialized) {
+      if (!newHasDoneInitialLoad) {
         const allObjectIds = getUniqueObjectIds(newResources)
 
-        await Promise.all(
+        const res = await Promise.all(
           allObjectIds.map((i) => loadObject(i, false, { zoomToObject }))
         )
+        if (res.length) {
+          hasDoneInitialLoad.value = true
+        }
 
         return
       }
@@ -139,7 +143,7 @@ function useViewerObjectAutoLoading() {
 
       await Promise.all(removableObjectIds.map((i) => loadObject(i, true)))
       await Promise.all(
-        addableObjectIds.map((i) => loadObject(i, false, { zoomToObject }))
+        addableObjectIds.map((i) => loadObject(i, false, { zoomToObject: false }))
       )
     },
     { deep: true, immediate: true }
diff --git a/packages/frontend-2/lib/viewer/composables/setup/selection.ts b/packages/frontend-2/lib/viewer/composables/setup/selection.ts
index 172c4d64e..9459bc033 100644
--- a/packages/frontend-2/lib/viewer/composables/setup/selection.ts
+++ b/packages/frontend-2/lib/viewer/composables/setup/selection.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 
 import { MeasurementType } from '@speckle/viewer'
-import type { SpeckleObject } from '~~/lib/common/helpers/sceneExplorer'
+import type { SpeckleObject } from '~/lib/viewer/helpers/sceneExplorer'
 import { useMixpanel } from '~~/lib/core/composables/mp'
 import { useInjectedViewerState } from '~~/lib/viewer/composables/setup'
 import { useCameraUtilities, useSelectionUtilities } from '~~/lib/viewer/composables/ui'
diff --git a/packages/frontend-2/lib/viewer/composables/ui.ts b/packages/frontend-2/lib/viewer/composables/ui.ts
index 3332c42c4..328a0036c 100644
--- a/packages/frontend-2/lib/viewer/composables/ui.ts
+++ b/packages/frontend-2/lib/viewer/composables/ui.ts
@@ -4,7 +4,7 @@ import { CameraController, MeasurementsExtension } from '@speckle/viewer'
 import { until } from '@vueuse/shared'
 import { difference, isString, uniq } from 'lodash-es'
 import { useEmbedState } from '~/lib/viewer/composables/setup/embed'
-import type { SpeckleObject } from '~~/lib/common/helpers/sceneExplorer'
+import type { SpeckleObject } from '~/lib/viewer/helpers/sceneExplorer'
 import { isNonNullable } from '~~/lib/common/helpers/utils'
 import {
   useInjectedViewer,
diff --git a/packages/frontend-2/lib/viewer/composables/viewer.ts b/packages/frontend-2/lib/viewer/composables/viewer.ts
index 9cd5424a9..a329ddff4 100644
--- a/packages/frontend-2/lib/viewer/composables/viewer.ts
+++ b/packages/frontend-2/lib/viewer/composables/viewer.ts
@@ -16,7 +16,7 @@ import {
   type SelectionEvent,
   type TreeNode
 } from '@speckle/viewer'
-import type { SpeckleObject } from '~~/lib/common/helpers/sceneExplorer'
+import type { SpeckleObject } from '~/lib/viewer/helpers/sceneExplorer'
 
 // NOTE: this is a preformance optimisation - this function is hot, and has to do
 // potentially large searches if many elements are hidden/isolated. We cache the
diff --git a/packages/frontend-2/lib/viewer/helpers/sceneExplorer.ts b/packages/frontend-2/lib/viewer/helpers/sceneExplorer.ts
new file mode 100644
index 000000000..5102f6d8e
--- /dev/null
+++ b/packages/frontend-2/lib/viewer/helpers/sceneExplorer.ts
@@ -0,0 +1,34 @@
+import type { MaybeNullOrUndefined } from '@speckle/shared'
+import {
+  type NumericPropertyInfo,
+  type PropertyInfo,
+  type SpeckleObject,
+  type SpeckleReference,
+  type StringPropertyInfo
+} from '@speckle/viewer'
+import type { Raw } from 'vue'
+
+export const isStringPropertyInfo = (
+  info: MaybeNullOrUndefined<PropertyInfo>
+): info is StringPropertyInfo => info?.type === 'string'
+export const isNumericPropertyInfo = (
+  info: MaybeNullOrUndefined<PropertyInfo>
+): info is NumericPropertyInfo => info?.type === 'number'
+
+// Note: minor typing hacks for less squiggly lines in the explorer.
+// TODO: ask alex re viewer data tree types
+
+export type ExplorerNode = {
+  guid?: string
+  data?: SpeckleObject
+  raw?: SpeckleObject
+  atomic?: boolean
+  model?: Record<string, unknown> & { id?: string }
+  children: ExplorerNode[]
+}
+
+export type TreeItemComponentModel = {
+  rawNode: Raw<ExplorerNode>
+}
+
+export type { SpeckleObject, SpeckleReference }
diff --git a/packages/frontend-2/plugins/001-logger.ts b/packages/frontend-2/plugins/001-logger.ts
index 633368f62..bab646709 100644
--- a/packages/frontend-2/plugins/001-logger.ts
+++ b/packages/frontend-2/plugins/001-logger.ts
@@ -136,6 +136,10 @@ export default defineNuxtPlugin(async (nuxtApp) => {
       ...collectMainInfo({ isBrowser: true })
     })
 
+    logger = buildFakePinoLogger({
+      consoleBindings: logCsrEmitProps ? collectCoreInfo : undefined
+    })
+
     // SEQ Browser integration
     if (logClientApiToken?.length && logClientApiEndpoint?.length) {
       const seq = await import('seq-logging/browser')
@@ -195,24 +199,15 @@ export default defineNuxtPlugin(async (nuxtApp) => {
         })
       }
       errorHandlers.push(errorLogger)
-
-      logger = buildFakePinoLogger({
-        consoleBindings: logCsrEmitProps ? collectCoreInfo : undefined
-      })
       logger.debug('Set up seq ingestion...')
-    } else {
-      // No seq integration, fallback to basic console logging
-      logger = buildFakePinoLogger({
-        consoleBindings: logCsrEmitProps ? collectCoreInfo : undefined
-      })
     }
   }
 
   // Register seq transports, if any
   if (errorHandlers.length) {
     registerErrorTransport({
-      onError: (params) => {
-        errorHandlers.forEach((handler) => handler(params))
+      onError: (...params) => {
+        errorHandlers.forEach((handler) => handler(...params))
       },
       onUnhandledError: (event) => {
         unhandledErrorHandlers.forEach((handler) => handler(event))
@@ -220,19 +215,19 @@ export default defineNuxtPlugin(async (nuxtApp) => {
     })
   }
 
-  // Global error handler - handle all transports
+  // Global error handler - handle all transports besides the core pino/console.log logger
   const transports = useGetErrorLoggingTransports()
   let serverFatalError: Optional<AbstractErrorHandlerParams> = undefined
   logger = enableCustomErrorHandling({
     logger,
-    onError: (params) => {
+    onError: (params, helpers) => {
       const { otherData } = params
 
       if (import.meta.server && otherData?.isAppError) {
         serverFatalError = params
       }
 
-      transports.forEach((handler) => handler.onError(params))
+      transports.forEach((handler) => handler.onError(params, helpers))
     }
   })
 
diff --git a/packages/frontend-2/plugins/002-rum.ts b/packages/frontend-2/plugins/002-rum.ts
index 490287ae6..91089625f 100644
--- a/packages/frontend-2/plugins/002-rum.ts
+++ b/packages/frontend-2/plugins/002-rum.ts
@@ -7,6 +7,7 @@ import type { Plugin } from 'nuxt/dist/app/nuxt'
 import { isH3Error } from '~/lib/common/helpers/error'
 import { useRequestId, useServerRequestId } from '~/lib/core/composables/server'
 import { isBrave, isSafari } from '@speckle/shared'
+import { isString } from 'lodash-es'
 
 type PluginNuxtApp = Parameters<Plugin>[0]
 
@@ -69,15 +70,28 @@ function initRumClient(app: PluginNuxtApp) {
           : {}
 
       registerErrorTransport({
-        onError: ({ args, firstError, firstString, otherData, nonObjectOtherData }) => {
+        onError: (
+          { args, firstError, firstString, otherData, nonObjectOtherData },
+          { prettifyMessage }
+        ) => {
           if (!datadog || !('addError' in datadog)) return
 
-          const error = firstError || firstString || args[0]
+          let error = firstError || firstString || args[0]
+          const mainErrorMessageTemplate = firstString
+          const mainErrorMessage = mainErrorMessageTemplate
+            ? prettifyMessage(mainErrorMessageTemplate)
+            : undefined
+
+          if (isString(error)) {
+            error = prettifyMessage(error)
+          }
+
           datadog.addError(error, {
             ...otherData,
             ...resolveH3Data(firstError),
             extraData: nonObjectOtherData,
-            mainErrorMessage: firstString,
+            mainErrorMessageTemplate,
+            mainErrorMessage,
             isProperlySentError: true
           })
         },
diff --git a/packages/frontend/src/graphql/generated/graphql.ts b/packages/frontend/src/graphql/generated/graphql.ts
index 80ae4f93b..cea571cc3 100644
--- a/packages/frontend/src/graphql/generated/graphql.ts
+++ b/packages/frontend/src/graphql/generated/graphql.ts
@@ -5,26 +5,28 @@ export type InputMaybe<T> = Maybe<T>;
 export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
 export type MakeOptional<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]?: Maybe<T[SubKey]> };
 export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]: Maybe<T[SubKey]> };
+export type MakeEmpty<T extends { [key: string]: unknown }, K extends keyof T> = { [_ in K]?: never };
+export type Incremental<T> = T | { [P in keyof T]?: P extends ' $fragmentName' | '__typename' ? T[P] : never };
 /** All built-in and custom scalars, mapped to their actual values */
 export type Scalars = {
-  ID: string;
-  String: string;
-  Boolean: boolean;
-  Int: number;
-  Float: number;
+  ID: { input: string; output: string; }
+  String: { input: string; output: string; }
+  Boolean: { input: boolean; output: boolean; }
+  Int: { input: number; output: number; }
+  Float: { input: number; output: number; }
   /** The `BigInt` scalar type represents non-fractional signed whole numeric values. */
-  BigInt: any;
+  BigInt: { input: any; output: any; }
   /** A date-time string at UTC, such as 2007-12-03T10:15:30Z, compliant with the `date-time` format outlined in section 5.6 of the RFC 3339 profile of the ISO 8601 standard for representation of dates and times using the Gregorian calendar. */
-  DateTime: string;
-  EmailAddress: any;
+  DateTime: { input: string; output: string; }
+  EmailAddress: { input: any; output: any; }
   /** The `JSONObject` scalar type represents JSON objects as specified by [ECMA-404](http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf). */
-  JSONObject: Record<string, unknown>;
+  JSONObject: { input: Record<string, unknown>; output: Record<string, unknown>; }
 };
 
 export type ActiveUserMutations = {
   __typename?: 'ActiveUserMutations';
   /** Mark onboarding as complete */
-  finishOnboarding: Scalars['Boolean'];
+  finishOnboarding: Scalars['Boolean']['output'];
   /** Edit a user's profile */
   update: User;
 };
@@ -36,29 +38,29 @@ export type ActiveUserMutationsUpdateArgs = {
 
 export type Activity = {
   __typename?: 'Activity';
-  actionType: Scalars['String'];
-  id: Scalars['ID'];
-  info: Scalars['JSONObject'];
-  message: Scalars['String'];
-  resourceId: Scalars['String'];
-  resourceType: Scalars['String'];
-  streamId?: Maybe<Scalars['String']>;
-  time: Scalars['DateTime'];
-  userId: Scalars['String'];
+  actionType: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  info: Scalars['JSONObject']['output'];
+  message: Scalars['String']['output'];
+  resourceId: Scalars['String']['output'];
+  resourceType: Scalars['String']['output'];
+  streamId?: Maybe<Scalars['String']['output']>;
+  time: Scalars['DateTime']['output'];
+  userId: Scalars['String']['output'];
 };
 
 export type ActivityCollection = {
   __typename?: 'ActivityCollection';
-  cursor?: Maybe<Scalars['String']>;
+  cursor?: Maybe<Scalars['String']['output']>;
   items?: Maybe<Array<Maybe<Activity>>>;
-  totalCount: Scalars['Int'];
+  totalCount: Scalars['Int']['output'];
 };
 
 export type AdminInviteList = {
   __typename?: 'AdminInviteList';
-  cursor?: Maybe<Scalars['String']>;
+  cursor?: Maybe<Scalars['String']['output']>;
   items: Array<ServerInvite>;
-  totalCount: Scalars['Int'];
+  totalCount: Scalars['Int']['output'];
 };
 
 export type AdminQueries = {
@@ -71,50 +73,50 @@ export type AdminQueries = {
 
 
 export type AdminQueriesInviteListArgs = {
-  cursor?: InputMaybe<Scalars['String']>;
-  limit?: Scalars['Int'];
-  query?: InputMaybe<Scalars['String']>;
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  limit?: Scalars['Int']['input'];
+  query?: InputMaybe<Scalars['String']['input']>;
 };
 
 
 export type AdminQueriesProjectListArgs = {
-  cursor?: InputMaybe<Scalars['String']>;
-  limit?: Scalars['Int'];
-  orderBy?: InputMaybe<Scalars['String']>;
-  query?: InputMaybe<Scalars['String']>;
-  visibility?: InputMaybe<Scalars['String']>;
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  limit?: Scalars['Int']['input'];
+  orderBy?: InputMaybe<Scalars['String']['input']>;
+  query?: InputMaybe<Scalars['String']['input']>;
+  visibility?: InputMaybe<Scalars['String']['input']>;
 };
 
 
 export type AdminQueriesUserListArgs = {
-  cursor?: InputMaybe<Scalars['String']>;
-  limit?: Scalars['Int'];
-  query?: InputMaybe<Scalars['String']>;
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  limit?: Scalars['Int']['input'];
+  query?: InputMaybe<Scalars['String']['input']>;
   role?: InputMaybe<ServerRole>;
 };
 
 export type AdminUserList = {
   __typename?: 'AdminUserList';
-  cursor?: Maybe<Scalars['String']>;
+  cursor?: Maybe<Scalars['String']['output']>;
   items: Array<AdminUserListItem>;
-  totalCount: Scalars['Int'];
+  totalCount: Scalars['Int']['output'];
 };
 
 export type AdminUserListItem = {
   __typename?: 'AdminUserListItem';
-  avatar?: Maybe<Scalars['String']>;
-  company?: Maybe<Scalars['String']>;
-  email?: Maybe<Scalars['String']>;
-  id: Scalars['ID'];
-  name: Scalars['String'];
-  role?: Maybe<Scalars['String']>;
-  verified?: Maybe<Scalars['Boolean']>;
+  avatar?: Maybe<Scalars['String']['output']>;
+  company?: Maybe<Scalars['String']['output']>;
+  email?: Maybe<Scalars['String']['output']>;
+  id: Scalars['ID']['output'];
+  name: Scalars['String']['output'];
+  role?: Maybe<Scalars['String']['output']>;
+  verified?: Maybe<Scalars['Boolean']['output']>;
 };
 
 export type AdminUsersListCollection = {
   __typename?: 'AdminUsersListCollection';
   items: Array<AdminUsersListItem>;
-  totalCount: Scalars['Int'];
+  totalCount: Scalars['Int']['output'];
 };
 
 /**
@@ -123,185 +125,316 @@ export type AdminUsersListCollection = {
  */
 export type AdminUsersListItem = {
   __typename?: 'AdminUsersListItem';
-  id: Scalars['String'];
+  id: Scalars['String']['output'];
   invitedUser?: Maybe<ServerInvite>;
   registeredUser?: Maybe<User>;
 };
 
 export type ApiToken = {
   __typename?: 'ApiToken';
-  createdAt: Scalars['DateTime'];
-  id: Scalars['String'];
-  lastChars: Scalars['String'];
-  lastUsed: Scalars['DateTime'];
-  lifespan: Scalars['BigInt'];
-  name: Scalars['String'];
-  scopes: Array<Maybe<Scalars['String']>>;
+  createdAt: Scalars['DateTime']['output'];
+  id: Scalars['String']['output'];
+  lastChars: Scalars['String']['output'];
+  lastUsed: Scalars['DateTime']['output'];
+  lifespan: Scalars['BigInt']['output'];
+  name: Scalars['String']['output'];
+  scopes: Array<Maybe<Scalars['String']['output']>>;
 };
 
 export type ApiTokenCreateInput = {
-  lifespan?: InputMaybe<Scalars['BigInt']>;
-  name: Scalars['String'];
-  scopes: Array<Scalars['String']>;
+  lifespan?: InputMaybe<Scalars['BigInt']['input']>;
+  name: Scalars['String']['input'];
+  scopes: Array<Scalars['String']['input']>;
 };
 
 export type AppAuthor = {
   __typename?: 'AppAuthor';
-  avatar?: Maybe<Scalars['String']>;
-  id: Scalars['String'];
-  name: Scalars['String'];
+  avatar?: Maybe<Scalars['String']['output']>;
+  id: Scalars['String']['output'];
+  name: Scalars['String']['output'];
 };
 
 export type AppCreateInput = {
-  description: Scalars['String'];
-  logo?: InputMaybe<Scalars['String']>;
-  name: Scalars['String'];
-  public?: InputMaybe<Scalars['Boolean']>;
-  redirectUrl: Scalars['String'];
-  scopes: Array<InputMaybe<Scalars['String']>>;
-  termsAndConditionsLink?: InputMaybe<Scalars['String']>;
+  description: Scalars['String']['input'];
+  logo?: InputMaybe<Scalars['String']['input']>;
+  name: Scalars['String']['input'];
+  public?: InputMaybe<Scalars['Boolean']['input']>;
+  redirectUrl: Scalars['String']['input'];
+  scopes: Array<InputMaybe<Scalars['String']['input']>>;
+  termsAndConditionsLink?: InputMaybe<Scalars['String']['input']>;
 };
 
 export type AppTokenCreateInput = {
-  lifespan?: InputMaybe<Scalars['BigInt']>;
+  lifespan?: InputMaybe<Scalars['BigInt']['input']>;
   /** Optionally limit the token to only have access to specific resources */
   limitResources?: InputMaybe<Array<TokenResourceIdentifierInput>>;
-  name: Scalars['String'];
-  scopes: Array<Scalars['String']>;
+  name: Scalars['String']['input'];
+  scopes: Array<Scalars['String']['input']>;
 };
 
 export type AppUpdateInput = {
-  description: Scalars['String'];
-  id: Scalars['String'];
-  logo?: InputMaybe<Scalars['String']>;
-  name: Scalars['String'];
-  public?: InputMaybe<Scalars['Boolean']>;
-  redirectUrl: Scalars['String'];
-  scopes: Array<InputMaybe<Scalars['String']>>;
-  termsAndConditionsLink?: InputMaybe<Scalars['String']>;
+  description: Scalars['String']['input'];
+  id: Scalars['String']['input'];
+  logo?: InputMaybe<Scalars['String']['input']>;
+  name: Scalars['String']['input'];
+  public?: InputMaybe<Scalars['Boolean']['input']>;
+  redirectUrl: Scalars['String']['input'];
+  scopes: Array<InputMaybe<Scalars['String']['input']>>;
+  termsAndConditionsLink?: InputMaybe<Scalars['String']['input']>;
 };
 
 export type AuthStrategy = {
   __typename?: 'AuthStrategy';
-  color?: Maybe<Scalars['String']>;
-  icon: Scalars['String'];
-  id: Scalars['String'];
-  name: Scalars['String'];
-  url: Scalars['String'];
+  color?: Maybe<Scalars['String']['output']>;
+  icon: Scalars['String']['output'];
+  id: Scalars['String']['output'];
+  name: Scalars['String']['output'];
+  url: Scalars['String']['output'];
 };
 
-export type AutomationCreateInput = {
-  automationId: Scalars['String'];
-  automationName: Scalars['String'];
-  automationRevisionId: Scalars['String'];
-  modelId: Scalars['String'];
-  projectId: Scalars['String'];
-  webhookId?: InputMaybe<Scalars['String']>;
+export type AutomateAuthCodePayloadTest = {
+  action: Scalars['String']['input'];
+  code: Scalars['String']['input'];
+  userId: Scalars['String']['input'];
 };
 
-export type AutomationFunctionRun = {
-  __typename?: 'AutomationFunctionRun';
-  contextView?: Maybe<Scalars['String']>;
-  elapsed: Scalars['Float'];
-  functionId: Scalars['String'];
-  functionLogo?: Maybe<Scalars['String']>;
-  functionName: Scalars['String'];
-  id: Scalars['ID'];
-  resultVersions: Array<Version>;
-  /**
-   * NOTE: this is the schema for the results field below!
-   * Current schema: {
-   *   version: "1.0.0",
-   *   values: {
-   *     objectResults: Record<str, {
-   *       category: string
-   *       level: ObjectResultLevel
-   *       objectIds: string[]
-   *       message: str | null
-   *       metadata: Records<str, unknown> | null
-   *       visualoverrides: Records<str, unknown> | null
-   *     }[]>
-   *     blobIds?: string[]
-   *   }
-   * }
-   */
-  results?: Maybe<Scalars['JSONObject']>;
-  status: AutomationRunStatus;
-  statusMessage?: Maybe<Scalars['String']>;
-};
-
-export type AutomationMutations = {
-  __typename?: 'AutomationMutations';
-  create: Scalars['Boolean'];
-  functionRunStatusReport: Scalars['Boolean'];
+export type AutomateFunction = {
+  __typename?: 'AutomateFunction';
+  automationCount: Scalars['Int']['output'];
+  /** Only returned if user is a part of this speckle server */
+  creator?: Maybe<LimitedUser>;
+  description: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  isFeatured: Scalars['Boolean']['output'];
+  logo?: Maybe<Scalars['String']['output']>;
+  name: Scalars['String']['output'];
+  releases: AutomateFunctionReleaseCollection;
+  repo: BasicGitRepositoryMetadata;
+  /** SourceAppNames values from @speckle/shared. Empty array means - all of them */
+  supportedSourceApps: Array<Scalars['String']['output']>;
+  tags: Array<Scalars['String']['output']>;
 };
 
 
-export type AutomationMutationsCreateArgs = {
-  input: AutomationCreateInput;
+export type AutomateFunctionReleasesArgs = {
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  filter?: InputMaybe<AutomateFunctionReleasesFilter>;
+  limit?: InputMaybe<Scalars['Int']['input']>;
 };
 
-
-export type AutomationMutationsFunctionRunStatusReportArgs = {
-  input: AutomationRunStatusUpdateInput;
+export type AutomateFunctionCollection = {
+  __typename?: 'AutomateFunctionCollection';
+  cursor?: Maybe<Scalars['String']['output']>;
+  items: Array<AutomateFunction>;
+  totalCount: Scalars['Int']['output'];
 };
 
-export type AutomationRun = {
-  __typename?: 'AutomationRun';
-  automationId: Scalars['String'];
-  automationName: Scalars['String'];
-  createdAt: Scalars['DateTime'];
-  functionRuns: Array<AutomationFunctionRun>;
-  id: Scalars['ID'];
-  /** Resolved from all function run statuses */
-  status: AutomationRunStatus;
-  updatedAt: Scalars['DateTime'];
-  versionId: Scalars['String'];
+export type AutomateFunctionRelease = {
+  __typename?: 'AutomateFunctionRelease';
+  commitId: Scalars['String']['output'];
+  createdAt: Scalars['DateTime']['output'];
+  function: AutomateFunction;
+  functionId: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  inputSchema?: Maybe<Scalars['JSONObject']['output']>;
+  versionTag: Scalars['String']['output'];
 };
 
-export enum AutomationRunStatus {
-  Failed = 'FAILED',
-  Initializing = 'INITIALIZING',
-  Running = 'RUNNING',
-  Succeeded = 'SUCCEEDED'
+export type AutomateFunctionReleaseCollection = {
+  __typename?: 'AutomateFunctionReleaseCollection';
+  cursor?: Maybe<Scalars['String']['output']>;
+  items: Array<AutomateFunctionRelease>;
+  totalCount: Scalars['Int']['output'];
+};
+
+export type AutomateFunctionReleasesFilter = {
+  search?: InputMaybe<Scalars['String']['input']>;
+};
+
+export type AutomateFunctionRun = {
+  __typename?: 'AutomateFunctionRun';
+  contextView?: Maybe<Scalars['String']['output']>;
+  createdAt: Scalars['DateTime']['output'];
+  elapsed: Scalars['Float']['output'];
+  /** Nullable, in case the function is not retrievable due to poor network conditions */
+  function?: Maybe<AutomateFunction>;
+  functionId?: Maybe<Scalars['String']['output']>;
+  functionReleaseId?: Maybe<Scalars['String']['output']>;
+  id: Scalars['ID']['output'];
+  /** AutomateTypes.ResultsSchema type from @speckle/shared */
+  results?: Maybe<Scalars['JSONObject']['output']>;
+  status: AutomateRunStatus;
+  statusMessage?: Maybe<Scalars['String']['output']>;
+  updatedAt: Scalars['DateTime']['output'];
+};
+
+export type AutomateFunctionRunStatusReportInput = {
+  contextView?: InputMaybe<Scalars['String']['input']>;
+  functionRunId: Scalars['String']['input'];
+  /** AutomateTypes.ResultsSchema type from @speckle/shared */
+  results?: InputMaybe<Scalars['JSONObject']['input']>;
+  status: AutomateRunStatus;
+  statusMessage?: InputMaybe<Scalars['String']['input']>;
+};
+
+export type AutomateFunctionTemplate = {
+  __typename?: 'AutomateFunctionTemplate';
+  id: AutomateFunctionTemplateLanguage;
+  logo: Scalars['String']['output'];
+  title: Scalars['String']['output'];
+  url: Scalars['String']['output'];
+};
+
+export enum AutomateFunctionTemplateLanguage {
+  DotNet = 'DOT_NET',
+  Python = 'PYTHON',
+  Typescript = 'TYPESCRIPT'
 }
 
-export type AutomationRunStatusUpdateInput = {
-  automationId: Scalars['String'];
-  automationRevisionId: Scalars['String'];
-  automationRunId: Scalars['String'];
-  functionRuns: Array<FunctionRunStatusInput>;
-  versionId: Scalars['String'];
+export type AutomateFunctionsFilter = {
+  featuredFunctionsOnly?: InputMaybe<Scalars['Boolean']['input']>;
+  /** By default we skip functions without releases. Set this to true to include them. */
+  functionsWithoutReleases?: InputMaybe<Scalars['Boolean']['input']>;
+  search?: InputMaybe<Scalars['String']['input']>;
 };
 
-export type AutomationsStatus = {
-  __typename?: 'AutomationsStatus';
-  automationRuns: Array<AutomationRun>;
-  id: Scalars['ID'];
-  status: AutomationRunStatus;
-  statusMessage?: Maybe<Scalars['String']>;
+export type AutomateMutations = {
+  __typename?: 'AutomateMutations';
+  createFunction: AutomateFunction;
+  updateFunction: AutomateFunction;
+};
+
+
+export type AutomateMutationsCreateFunctionArgs = {
+  input: CreateAutomateFunctionInput;
+};
+
+
+export type AutomateMutationsUpdateFunctionArgs = {
+  input: UpdateAutomateFunctionInput;
+};
+
+export type AutomateRun = {
+  __typename?: 'AutomateRun';
+  automation: Automation;
+  automationId: Scalars['String']['output'];
+  createdAt: Scalars['DateTime']['output'];
+  functionRuns: Array<AutomateFunctionRun>;
+  id: Scalars['ID']['output'];
+  status: AutomateRunStatus;
+  trigger: AutomationRunTrigger;
+  updatedAt: Scalars['DateTime']['output'];
+};
+
+export type AutomateRunCollection = {
+  __typename?: 'AutomateRunCollection';
+  cursor?: Maybe<Scalars['String']['output']>;
+  items: Array<AutomateRun>;
+  totalCount: Scalars['Int']['output'];
+};
+
+export enum AutomateRunStatus {
+  Canceled = 'CANCELED',
+  Exception = 'EXCEPTION',
+  Failed = 'FAILED',
+  Initializing = 'INITIALIZING',
+  Pending = 'PENDING',
+  Running = 'RUNNING',
+  Succeeded = 'SUCCEEDED',
+  Timeout = 'TIMEOUT'
+}
+
+export enum AutomateRunTriggerType {
+  VersionCreated = 'VERSION_CREATED'
+}
+
+export type Automation = {
+  __typename?: 'Automation';
+  createdAt: Scalars['DateTime']['output'];
+  /** Only accessible to automation owners */
+  creationPublicKeys: Array<Scalars['String']['output']>;
+  currentRevision?: Maybe<AutomationRevision>;
+  enabled: Scalars['Boolean']['output'];
+  id: Scalars['ID']['output'];
+  isTestAutomation: Scalars['Boolean']['output'];
+  name: Scalars['String']['output'];
+  runs: AutomateRunCollection;
+  updatedAt: Scalars['DateTime']['output'];
+};
+
+
+export type AutomationRunsArgs = {
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  limit?: InputMaybe<Scalars['Int']['input']>;
+};
+
+export type AutomationCollection = {
+  __typename?: 'AutomationCollection';
+  cursor?: Maybe<Scalars['String']['output']>;
+  items: Array<Automation>;
+  totalCount: Scalars['Int']['output'];
+};
+
+export type AutomationRevision = {
+  __typename?: 'AutomationRevision';
+  functions: Array<AutomationRevisionFunction>;
+  id: Scalars['ID']['output'];
+  triggerDefinitions: Array<AutomationRevisionTriggerDefinition>;
+};
+
+export type AutomationRevisionCreateFunctionInput = {
+  functionId: Scalars['String']['input'];
+  functionReleaseId: Scalars['String']['input'];
+  /** Should be encrypted from the client side */
+  parameters?: InputMaybe<Scalars['String']['input']>;
+};
+
+export type AutomationRevisionFunction = {
+  __typename?: 'AutomationRevisionFunction';
+  /** The secrets in parameters are redacted with six asterisks - ****** */
+  parameters?: Maybe<Scalars['JSONObject']['output']>;
+  release: AutomateFunctionRelease;
+};
+
+export type AutomationRevisionTriggerDefinition = VersionCreatedTriggerDefinition;
+
+export type AutomationRunTrigger = VersionCreatedTrigger;
+
+export type AvatarUser = {
+  __typename?: 'AvatarUser';
+  avatar?: Maybe<Scalars['String']['output']>;
+  id: Scalars['ID']['output'];
+  name: Scalars['String']['output'];
+};
+
+export type BasicGitRepositoryMetadata = {
+  __typename?: 'BasicGitRepositoryMetadata';
+  id: Scalars['ID']['output'];
+  name: Scalars['String']['output'];
+  owner: Scalars['String']['output'];
+  url: Scalars['String']['output'];
 };
 
 export type BlobMetadata = {
   __typename?: 'BlobMetadata';
-  createdAt: Scalars['DateTime'];
-  fileHash?: Maybe<Scalars['String']>;
-  fileName: Scalars['String'];
-  fileSize?: Maybe<Scalars['Int']>;
-  fileType: Scalars['String'];
-  id: Scalars['String'];
-  streamId: Scalars['String'];
-  uploadError?: Maybe<Scalars['String']>;
-  uploadStatus: Scalars['Int'];
-  userId: Scalars['String'];
+  createdAt: Scalars['DateTime']['output'];
+  fileHash?: Maybe<Scalars['String']['output']>;
+  fileName: Scalars['String']['output'];
+  fileSize?: Maybe<Scalars['Int']['output']>;
+  fileType: Scalars['String']['output'];
+  id: Scalars['String']['output'];
+  streamId: Scalars['String']['output'];
+  uploadError?: Maybe<Scalars['String']['output']>;
+  uploadStatus: Scalars['Int']['output'];
+  userId: Scalars['String']['output'];
 };
 
 export type BlobMetadataCollection = {
   __typename?: 'BlobMetadataCollection';
-  cursor?: Maybe<Scalars['String']>;
+  cursor?: Maybe<Scalars['String']['output']>;
   items?: Maybe<Array<BlobMetadata>>;
-  totalCount: Scalars['Int'];
-  totalSize: Scalars['Int'];
+  totalCount: Scalars['Int']['output'];
+  totalSize: Scalars['Int']['output'];
 };
 
 export type Branch = {
@@ -310,124 +443,124 @@ export type Branch = {
   activity?: Maybe<ActivityCollection>;
   author?: Maybe<User>;
   commits?: Maybe<CommitCollection>;
-  createdAt?: Maybe<Scalars['DateTime']>;
-  description?: Maybe<Scalars['String']>;
-  id: Scalars['String'];
-  name: Scalars['String'];
+  createdAt?: Maybe<Scalars['DateTime']['output']>;
+  description?: Maybe<Scalars['String']['output']>;
+  id: Scalars['String']['output'];
+  name: Scalars['String']['output'];
 };
 
 
 export type BranchActivityArgs = {
-  actionType?: InputMaybe<Scalars['String']>;
-  after?: InputMaybe<Scalars['DateTime']>;
-  before?: InputMaybe<Scalars['DateTime']>;
-  cursor?: InputMaybe<Scalars['DateTime']>;
-  limit?: Scalars['Int'];
+  actionType?: InputMaybe<Scalars['String']['input']>;
+  after?: InputMaybe<Scalars['DateTime']['input']>;
+  before?: InputMaybe<Scalars['DateTime']['input']>;
+  cursor?: InputMaybe<Scalars['DateTime']['input']>;
+  limit?: Scalars['Int']['input'];
 };
 
 
 export type BranchCommitsArgs = {
-  cursor?: InputMaybe<Scalars['String']>;
-  limit?: Scalars['Int'];
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  limit?: Scalars['Int']['input'];
 };
 
 export type BranchCollection = {
   __typename?: 'BranchCollection';
-  cursor?: Maybe<Scalars['String']>;
+  cursor?: Maybe<Scalars['String']['output']>;
   items?: Maybe<Array<Branch>>;
-  totalCount: Scalars['Int'];
+  totalCount: Scalars['Int']['output'];
 };
 
 export type BranchCreateInput = {
-  description?: InputMaybe<Scalars['String']>;
-  name: Scalars['String'];
-  streamId: Scalars['String'];
+  description?: InputMaybe<Scalars['String']['input']>;
+  name: Scalars['String']['input'];
+  streamId: Scalars['String']['input'];
 };
 
 export type BranchDeleteInput = {
-  id: Scalars['String'];
-  streamId: Scalars['String'];
+  id: Scalars['String']['input'];
+  streamId: Scalars['String']['input'];
 };
 
 export type BranchUpdateInput = {
-  description?: InputMaybe<Scalars['String']>;
-  id: Scalars['String'];
-  name?: InputMaybe<Scalars['String']>;
-  streamId: Scalars['String'];
+  description?: InputMaybe<Scalars['String']['input']>;
+  id: Scalars['String']['input'];
+  name?: InputMaybe<Scalars['String']['input']>;
+  streamId: Scalars['String']['input'];
 };
 
 export type Comment = {
   __typename?: 'Comment';
-  archived: Scalars['Boolean'];
+  archived: Scalars['Boolean']['output'];
   author: LimitedUser;
-  authorId: Scalars['String'];
-  createdAt: Scalars['DateTime'];
+  authorId: Scalars['String']['output'];
+  createdAt: Scalars['DateTime']['output'];
   /**
    * Legacy comment viewer data field
    * @deprecated Use the new viewerState field instead
    */
-  data?: Maybe<Scalars['JSONObject']>;
+  data?: Maybe<Scalars['JSONObject']['output']>;
   /** Whether or not comment is a reply to another comment */
-  hasParent: Scalars['Boolean'];
-  id: Scalars['String'];
+  hasParent: Scalars['Boolean']['output'];
+  id: Scalars['String']['output'];
   /** Parent thread, if there's any */
   parent?: Maybe<Comment>;
   /** Plain-text version of the comment text, ideal for previews */
-  rawText: Scalars['String'];
+  rawText: Scalars['String']['output'];
   /** @deprecated Not actually implemented */
-  reactions?: Maybe<Array<Maybe<Scalars['String']>>>;
+  reactions?: Maybe<Array<Maybe<Scalars['String']['output']>>>;
   /** Gets the replies to this comment. */
   replies: CommentCollection;
   /** Get authors of replies to this comment */
   replyAuthors: CommentReplyAuthorCollection;
   /** Resources that this comment targets. Can be a mixture of either one stream, or multiple commits and objects. */
   resources: Array<ResourceIdentifier>;
-  screenshot?: Maybe<Scalars['String']>;
+  screenshot?: Maybe<Scalars['String']['output']>;
   text: SmartTextEditorValue;
   /** The time this comment was last updated. Corresponds also to the latest reply to this comment, if any. */
-  updatedAt: Scalars['DateTime'];
+  updatedAt: Scalars['DateTime']['output'];
   /** The last time you viewed this comment. Present only if an auth'ed request. Relevant only if a top level commit. */
-  viewedAt?: Maybe<Scalars['DateTime']>;
+  viewedAt?: Maybe<Scalars['DateTime']['output']>;
   /** Resource identifiers as defined and implemented in the Viewer of the new frontend */
   viewerResources: Array<ViewerResourceItem>;
   /** SerializedViewerState */
-  viewerState?: Maybe<Scalars['JSONObject']>;
+  viewerState?: Maybe<Scalars['JSONObject']['output']>;
 };
 
 
 export type CommentRepliesArgs = {
-  cursor?: InputMaybe<Scalars['String']>;
-  limit?: InputMaybe<Scalars['Int']>;
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  limit?: InputMaybe<Scalars['Int']['input']>;
 };
 
 
 export type CommentReplyAuthorsArgs = {
-  limit?: Scalars['Int'];
+  limit?: Scalars['Int']['input'];
 };
 
 export type CommentActivityMessage = {
   __typename?: 'CommentActivityMessage';
   comment: Comment;
-  type: Scalars['String'];
+  type: Scalars['String']['output'];
 };
 
 export type CommentCollection = {
   __typename?: 'CommentCollection';
-  cursor?: Maybe<Scalars['String']>;
+  cursor?: Maybe<Scalars['String']['output']>;
   items: Array<Comment>;
-  totalCount: Scalars['Int'];
+  totalCount: Scalars['Int']['output'];
 };
 
 export type CommentContentInput = {
-  blobIds?: InputMaybe<Array<Scalars['String']>>;
-  doc?: InputMaybe<Scalars['JSONObject']>;
+  blobIds?: InputMaybe<Array<Scalars['String']['input']>>;
+  doc?: InputMaybe<Scalars['JSONObject']['input']>;
 };
 
 /** Deprecated: Used by old stream-based mutations */
 export type CommentCreateInput = {
   /** IDs of uploaded blobs that should be attached to this comment */
-  blobIds: Array<Scalars['String']>;
-  data: Scalars['JSONObject'];
+  blobIds: Array<Scalars['String']['input']>;
+  data: Scalars['JSONObject']['input'];
   /**
    * Specifies the resources this comment is linked to. There are several use cases:
    * - a comment targets only one resource (commit or object)
@@ -435,55 +568,55 @@ export type CommentCreateInput = {
    * - a comment targets only a stream
    */
   resources: Array<InputMaybe<ResourceIdentifierInput>>;
-  screenshot?: InputMaybe<Scalars['String']>;
-  streamId: Scalars['String'];
+  screenshot?: InputMaybe<Scalars['String']['input']>;
+  streamId: Scalars['String']['input'];
   /** ProseMirror document object */
-  text?: InputMaybe<Scalars['JSONObject']>;
+  text?: InputMaybe<Scalars['JSONObject']['input']>;
 };
 
 export type CommentDataFilters = {
   __typename?: 'CommentDataFilters';
-  hiddenIds?: Maybe<Array<Scalars['String']>>;
-  isolatedIds?: Maybe<Array<Scalars['String']>>;
-  passMax?: Maybe<Scalars['Float']>;
-  passMin?: Maybe<Scalars['Float']>;
-  propertyInfoKey?: Maybe<Scalars['String']>;
-  sectionBox?: Maybe<Scalars['JSONObject']>;
+  hiddenIds?: Maybe<Array<Scalars['String']['output']>>;
+  isolatedIds?: Maybe<Array<Scalars['String']['output']>>;
+  passMax?: Maybe<Scalars['Float']['output']>;
+  passMin?: Maybe<Scalars['Float']['output']>;
+  propertyInfoKey?: Maybe<Scalars['String']['output']>;
+  sectionBox?: Maybe<Scalars['JSONObject']['output']>;
 };
 
 /** Equivalent to frontend-1's LocalFilterState */
 export type CommentDataFiltersInput = {
-  hiddenIds?: InputMaybe<Array<Scalars['String']>>;
-  isolatedIds?: InputMaybe<Array<Scalars['String']>>;
-  passMax?: InputMaybe<Scalars['Float']>;
-  passMin?: InputMaybe<Scalars['Float']>;
-  propertyInfoKey?: InputMaybe<Scalars['String']>;
-  sectionBox?: InputMaybe<Scalars['JSONObject']>;
+  hiddenIds?: InputMaybe<Array<Scalars['String']['input']>>;
+  isolatedIds?: InputMaybe<Array<Scalars['String']['input']>>;
+  passMax?: InputMaybe<Scalars['Float']['input']>;
+  passMin?: InputMaybe<Scalars['Float']['input']>;
+  propertyInfoKey?: InputMaybe<Scalars['String']['input']>;
+  sectionBox?: InputMaybe<Scalars['JSONObject']['input']>;
 };
 
 /** Deprecated: Used by old stream-based mutations */
 export type CommentEditInput = {
   /** IDs of uploaded blobs that should be attached to this comment */
-  blobIds: Array<Scalars['String']>;
-  id: Scalars['String'];
-  streamId: Scalars['String'];
+  blobIds: Array<Scalars['String']['input']>;
+  id: Scalars['String']['input'];
+  streamId: Scalars['String']['input'];
   /** ProseMirror document object */
-  text?: InputMaybe<Scalars['JSONObject']>;
+  text?: InputMaybe<Scalars['JSONObject']['input']>;
 };
 
 export type CommentMutations = {
   __typename?: 'CommentMutations';
-  archive: Scalars['Boolean'];
+  archive: Scalars['Boolean']['output'];
   create: Comment;
   edit: Comment;
-  markViewed: Scalars['Boolean'];
+  markViewed: Scalars['Boolean']['output'];
   reply: Comment;
 };
 
 
 export type CommentMutationsArchiveArgs = {
-  archived?: Scalars['Boolean'];
-  commentId: Scalars['String'];
+  archived?: Scalars['Boolean']['input'];
+  commentId: Scalars['String']['input'];
 };
 
 
@@ -498,7 +631,7 @@ export type CommentMutationsEditArgs = {
 
 
 export type CommentMutationsMarkViewedArgs = {
-  commentId: Scalars['String'];
+  commentId: Scalars['String']['input'];
 };
 
 
@@ -509,25 +642,25 @@ export type CommentMutationsReplyArgs = {
 export type CommentReplyAuthorCollection = {
   __typename?: 'CommentReplyAuthorCollection';
   items: Array<LimitedUser>;
-  totalCount: Scalars['Int'];
+  totalCount: Scalars['Int']['output'];
 };
 
 export type CommentThreadActivityMessage = {
   __typename?: 'CommentThreadActivityMessage';
-  data?: Maybe<Scalars['JSONObject']>;
+  data?: Maybe<Scalars['JSONObject']['output']>;
   reply?: Maybe<Comment>;
-  type: Scalars['String'];
+  type: Scalars['String']['output'];
 };
 
 export type Commit = {
   __typename?: 'Commit';
   /** All the recent activity on this commit in chronological order */
   activity?: Maybe<ActivityCollection>;
-  authorAvatar?: Maybe<Scalars['String']>;
-  authorId?: Maybe<Scalars['String']>;
-  authorName?: Maybe<Scalars['String']>;
+  authorAvatar?: Maybe<Scalars['String']['output']>;
+  authorId?: Maybe<Scalars['String']['output']>;
+  authorName?: Maybe<Scalars['String']['output']>;
   branch?: Maybe<Branch>;
-  branchName?: Maybe<Scalars['String']>;
+  branchName?: Maybe<Scalars['String']['output']>;
   /**
    * The total number of comments for this commit. To actually get the comments, use the comments query and pass in a resource array consisting of of this commit's id.
    * E.g.,
@@ -538,126 +671,148 @@ export type Commit = {
    *   }
    * ```
    */
-  commentCount: Scalars['Int'];
-  createdAt?: Maybe<Scalars['DateTime']>;
-  id: Scalars['String'];
-  message?: Maybe<Scalars['String']>;
-  parents?: Maybe<Array<Maybe<Scalars['String']>>>;
-  referencedObject: Scalars['String'];
-  sourceApplication?: Maybe<Scalars['String']>;
+  commentCount: Scalars['Int']['output'];
+  createdAt?: Maybe<Scalars['DateTime']['output']>;
+  id: Scalars['String']['output'];
+  message?: Maybe<Scalars['String']['output']>;
+  parents?: Maybe<Array<Maybe<Scalars['String']['output']>>>;
+  referencedObject: Scalars['String']['output'];
+  sourceApplication?: Maybe<Scalars['String']['output']>;
   /**
    * Will throw an authorization error if active user isn't authorized to see it, for example,
    * if a stream isn't public and the user doesn't have the appropriate rights.
    */
   stream: Stream;
   /** @deprecated Use the stream field instead */
-  streamId?: Maybe<Scalars['String']>;
+  streamId?: Maybe<Scalars['String']['output']>;
   /** @deprecated Use the stream field instead */
-  streamName?: Maybe<Scalars['String']>;
-  totalChildrenCount?: Maybe<Scalars['Int']>;
+  streamName?: Maybe<Scalars['String']['output']>;
+  totalChildrenCount?: Maybe<Scalars['Int']['output']>;
 };
 
 
 export type CommitActivityArgs = {
-  actionType?: InputMaybe<Scalars['String']>;
-  after?: InputMaybe<Scalars['DateTime']>;
-  before?: InputMaybe<Scalars['DateTime']>;
-  cursor?: InputMaybe<Scalars['DateTime']>;
-  limit?: Scalars['Int'];
+  actionType?: InputMaybe<Scalars['String']['input']>;
+  after?: InputMaybe<Scalars['DateTime']['input']>;
+  before?: InputMaybe<Scalars['DateTime']['input']>;
+  cursor?: InputMaybe<Scalars['DateTime']['input']>;
+  limit?: Scalars['Int']['input'];
 };
 
 export type CommitCollection = {
   __typename?: 'CommitCollection';
-  cursor?: Maybe<Scalars['String']>;
+  cursor?: Maybe<Scalars['String']['output']>;
   items?: Maybe<Array<Commit>>;
-  totalCount: Scalars['Int'];
+  totalCount: Scalars['Int']['output'];
 };
 
 export type CommitCreateInput = {
-  branchName: Scalars['String'];
-  message?: InputMaybe<Scalars['String']>;
-  objectId: Scalars['String'];
-  parents?: InputMaybe<Array<InputMaybe<Scalars['String']>>>;
-  sourceApplication?: InputMaybe<Scalars['String']>;
-  streamId: Scalars['String'];
-  totalChildrenCount?: InputMaybe<Scalars['Int']>;
+  branchName: Scalars['String']['input'];
+  message?: InputMaybe<Scalars['String']['input']>;
+  objectId: Scalars['String']['input'];
+  parents?: InputMaybe<Array<InputMaybe<Scalars['String']['input']>>>;
+  sourceApplication?: InputMaybe<Scalars['String']['input']>;
+  streamId: Scalars['String']['input'];
+  totalChildrenCount?: InputMaybe<Scalars['Int']['input']>;
 };
 
 export type CommitDeleteInput = {
-  id: Scalars['String'];
-  streamId: Scalars['String'];
+  id: Scalars['String']['input'];
+  streamId: Scalars['String']['input'];
 };
 
 export type CommitObjectViewerState = {
   __typename?: 'CommitObjectViewerState';
-  addingComment: Scalars['Boolean'];
-  commentReactions: Array<Scalars['String']>;
-  currentFilterState?: Maybe<Scalars['JSONObject']>;
-  emojis: Array<Scalars['String']>;
-  localFilterPropKey?: Maybe<Scalars['String']>;
-  objectProperties?: Maybe<Array<Maybe<Scalars['JSONObject']>>>;
-  preventCommentCollapse: Scalars['Boolean'];
-  sectionBox?: Maybe<Scalars['Boolean']>;
+  addingComment: Scalars['Boolean']['output'];
+  commentReactions: Array<Scalars['String']['output']>;
+  currentFilterState?: Maybe<Scalars['JSONObject']['output']>;
+  emojis: Array<Scalars['String']['output']>;
+  localFilterPropKey?: Maybe<Scalars['String']['output']>;
+  objectProperties?: Maybe<Array<Maybe<Scalars['JSONObject']['output']>>>;
+  preventCommentCollapse: Scalars['Boolean']['output'];
+  sectionBox?: Maybe<Scalars['Boolean']['output']>;
   selectedCommentMetaData?: Maybe<SelectedCommentMetaData>;
-  selectedObjects?: Maybe<Array<Maybe<Scalars['JSONObject']>>>;
-  viewerBusy: Scalars['Boolean'];
+  selectedObjects?: Maybe<Array<Maybe<Scalars['JSONObject']['output']>>>;
+  viewerBusy: Scalars['Boolean']['output'];
 };
 
 export type CommitReceivedInput = {
-  commitId: Scalars['String'];
-  message?: InputMaybe<Scalars['String']>;
-  sourceApplication: Scalars['String'];
-  streamId: Scalars['String'];
+  commitId: Scalars['String']['input'];
+  message?: InputMaybe<Scalars['String']['input']>;
+  sourceApplication: Scalars['String']['input'];
+  streamId: Scalars['String']['input'];
 };
 
 export type CommitUpdateInput = {
-  id: Scalars['String'];
-  message?: InputMaybe<Scalars['String']>;
+  id: Scalars['String']['input'];
+  message?: InputMaybe<Scalars['String']['input']>;
   /** To move the commit to a different branch, please the name of the branch. */
-  newBranchName?: InputMaybe<Scalars['String']>;
-  streamId: Scalars['String'];
+  newBranchName?: InputMaybe<Scalars['String']['input']>;
+  streamId: Scalars['String']['input'];
 };
 
 export type CommitsDeleteInput = {
-  commitIds: Array<Scalars['String']>;
+  commitIds: Array<Scalars['String']['input']>;
 };
 
 export type CommitsMoveInput = {
-  commitIds: Array<Scalars['String']>;
-  targetBranch: Scalars['String'];
+  commitIds: Array<Scalars['String']['input']>;
+  targetBranch: Scalars['String']['input'];
+};
+
+/**
+ * Can be used instead of a full item collection, when the implementation doesn't call for it yet. Because
+ * of the structure, it can be swapped out to a full item collection in the future
+ */
+export type CountOnlyCollection = {
+  __typename?: 'CountOnlyCollection';
+  totalCount: Scalars['Int']['output'];
+};
+
+export type CreateAutomateFunctionInput = {
+  description: Scalars['String']['input'];
+  /** Base64 encoded image data string */
+  logo?: InputMaybe<Scalars['String']['input']>;
+  name: Scalars['String']['input'];
+  /** GitHub organization to create the repository in */
+  org?: InputMaybe<Scalars['String']['input']>;
+  /** SourceAppNames values from @speckle/shared */
+  supportedSourceApps: Array<Scalars['String']['input']>;
+  tags: Array<Scalars['String']['input']>;
+  template: AutomateFunctionTemplateLanguage;
 };
 
 export type CreateCommentInput = {
   content: CommentContentInput;
-  projectId: Scalars['String'];
+  projectId: Scalars['String']['input'];
   /** Resources that this comment should be attached to */
-  resourceIdString: Scalars['String'];
-  screenshot?: InputMaybe<Scalars['String']>;
+  resourceIdString: Scalars['String']['input'];
+  screenshot?: InputMaybe<Scalars['String']['input']>;
   /**
    * SerializedViewerState. If omitted, comment won't render (correctly) inside the
    * viewer, but will still be retrievable through the API
    */
-  viewerState?: InputMaybe<Scalars['JSONObject']>;
+  viewerState?: InputMaybe<Scalars['JSONObject']['input']>;
 };
 
 export type CreateCommentReplyInput = {
   content: CommentContentInput;
-  threadId: Scalars['String'];
+  threadId: Scalars['String']['input'];
 };
 
 export type CreateModelInput = {
-  description?: InputMaybe<Scalars['String']>;
-  name: Scalars['String'];
-  projectId: Scalars['ID'];
+  description?: InputMaybe<Scalars['String']['input']>;
+  name: Scalars['String']['input'];
+  projectId: Scalars['ID']['input'];
 };
 
 export type DeleteModelInput = {
-  id: Scalars['ID'];
-  projectId: Scalars['ID'];
+  id: Scalars['ID']['input'];
+  projectId: Scalars['ID']['input'];
 };
 
 export type DeleteVersionsInput = {
-  versionIds: Array<Scalars['String']>;
+  versionIds: Array<Scalars['String']['input']>;
 };
 
 export enum DiscoverableStreamsSortType {
@@ -671,58 +826,72 @@ export type DiscoverableStreamsSortingInput = {
 };
 
 export type EditCommentInput = {
-  commentId: Scalars['String'];
+  commentId: Scalars['String']['input'];
   content: CommentContentInput;
 };
 
 export type FileUpload = {
   __typename?: 'FileUpload';
-  branchName: Scalars['String'];
+  branchName: Scalars['String']['output'];
   /** If present, the conversion result is stored in this commit. */
-  convertedCommitId?: Maybe<Scalars['String']>;
-  convertedLastUpdate: Scalars['DateTime'];
+  convertedCommitId?: Maybe<Scalars['String']['output']>;
+  convertedLastUpdate: Scalars['DateTime']['output'];
   /** Holds any errors or info. */
-  convertedMessage?: Maybe<Scalars['String']>;
+  convertedMessage?: Maybe<Scalars['String']['output']>;
   /** 0 = queued, 1 = processing, 2 = success, 3 = error */
-  convertedStatus: Scalars['Int'];
+  convertedStatus: Scalars['Int']['output'];
   /** Alias for convertedCommitId */
-  convertedVersionId?: Maybe<Scalars['String']>;
-  fileName: Scalars['String'];
-  fileSize: Scalars['Int'];
-  fileType: Scalars['String'];
-  id: Scalars['String'];
+  convertedVersionId?: Maybe<Scalars['String']['output']>;
+  fileName: Scalars['String']['output'];
+  fileSize: Scalars['Int']['output'];
+  fileType: Scalars['String']['output'];
+  id: Scalars['String']['output'];
   /** Model associated with the file upload, if it exists already */
   model?: Maybe<Model>;
   /** Alias for branchName */
-  modelName: Scalars['String'];
+  modelName: Scalars['String']['output'];
   /** Alias for streamId */
-  projectId: Scalars['String'];
-  streamId: Scalars['String'];
-  uploadComplete: Scalars['Boolean'];
-  uploadDate: Scalars['DateTime'];
+  projectId: Scalars['String']['output'];
+  streamId: Scalars['String']['output'];
+  uploadComplete: Scalars['Boolean']['output'];
+  uploadDate: Scalars['DateTime']['output'];
   /** The user's id that uploaded this file. */
-  userId: Scalars['String'];
+  userId: Scalars['String']['output'];
 };
 
-export type FunctionRunStatusInput = {
-  contextView?: InputMaybe<Scalars['String']>;
-  elapsed: Scalars['Float'];
-  functionId: Scalars['String'];
-  functionLogo?: InputMaybe<Scalars['String']>;
-  functionName: Scalars['String'];
-  resultVersionIds: Array<Scalars['String']>;
-  /**
-   * Current schema: {
-   *   version: "1.0.0",
-   *   values: {
-   *     speckleObjects: Record<ObjectId, {level: string; statusMessage: string}[]>
-   *     blobIds?: string[]
-   *   }
-   * }
-   */
-  results?: InputMaybe<Scalars['JSONObject']>;
-  status: AutomationRunStatus;
-  statusMessage?: InputMaybe<Scalars['String']>;
+export type GendoAiRender = {
+  __typename?: 'GendoAIRender';
+  camera?: Maybe<Scalars['JSONObject']['output']>;
+  createdAt: Scalars['String']['output'];
+  gendoGenerationId?: Maybe<Scalars['String']['output']>;
+  id: Scalars['ID']['output'];
+  modelId: Scalars['String']['output'];
+  projectId: Scalars['String']['output'];
+  prompt: Scalars['String']['output'];
+  /** This is a blob id. */
+  responseImage?: Maybe<Scalars['String']['output']>;
+  status: Scalars['String']['output'];
+  updatedAt: Scalars['String']['output'];
+  user?: Maybe<AvatarUser>;
+  userId: Scalars['String']['output'];
+  versionId: Scalars['String']['output'];
+};
+
+export type GendoAiRenderCollection = {
+  __typename?: 'GendoAIRenderCollection';
+  items: Array<Maybe<GendoAiRender>>;
+  totalCount: Scalars['Int']['output'];
+};
+
+export type GendoAiRenderInput = {
+  /** Base64 encoded image of the depthmap. */
+  baseImage: Scalars['String']['input'];
+  camera: Scalars['JSONObject']['input'];
+  modelId: Scalars['ID']['input'];
+  projectId: Scalars['ID']['input'];
+  /** The generation prompt. */
+  prompt: Scalars['String']['input'];
+  versionId: Scalars['ID']['input'];
 };
 
 export type LegacyCommentViewerData = {
@@ -731,15 +900,15 @@ export type LegacyCommentViewerData = {
    * An array representing a user's camera position:
    * [camPos.x, camPos.y, camPos.z, camTarget.x, camTarget.y, camTarget.z, isOrtho, zoomNumber]
    */
-  camPos: Array<Scalars['Float']>;
+  camPos: Array<Scalars['Float']['output']>;
   /** Old FE LocalFilterState type */
   filters: CommentDataFilters;
   /** THREE.Vector3 {x, y, z} */
-  location: Scalars['JSONObject'];
+  location: Scalars['JSONObject']['output'];
   /** Viewer.getCurrentSectionBox(): THREE.Box3 */
-  sectionBox?: Maybe<Scalars['JSONObject']>;
+  sectionBox?: Maybe<Scalars['JSONObject']['output']>;
   /** Currently unused. Ideally comments should keep track of selected objects. */
-  selection?: Maybe<Scalars['JSONObject']>;
+  selection?: Maybe<Scalars['JSONObject']['output']>;
 };
 
 /**
@@ -750,21 +919,21 @@ export type LimitedUser = {
   __typename?: 'LimitedUser';
   /** All the recent activity from this user in chronological order */
   activity?: Maybe<ActivityCollection>;
-  avatar?: Maybe<Scalars['String']>;
-  bio?: Maybe<Scalars['String']>;
+  avatar?: Maybe<Scalars['String']['output']>;
+  bio?: Maybe<Scalars['String']['output']>;
   /** Get public stream commits authored by the user */
   commits?: Maybe<CommitCollection>;
-  company?: Maybe<Scalars['String']>;
-  id: Scalars['ID'];
-  name: Scalars['String'];
-  role?: Maybe<Scalars['String']>;
+  company?: Maybe<Scalars['String']['output']>;
+  id: Scalars['ID']['output'];
+  name: Scalars['String']['output'];
+  role?: Maybe<Scalars['String']['output']>;
   /** Returns all discoverable streams that the user is a collaborator on */
   streams: StreamCollection;
   /** The user's timeline in chronological order */
   timeline?: Maybe<ActivityCollection>;
   /** Total amount of favorites attached to streams owned by the user */
-  totalOwnedStreamsFavorites: Scalars['Int'];
-  verified?: Maybe<Scalars['Boolean']>;
+  totalOwnedStreamsFavorites: Scalars['Int']['output'];
+  verified?: Maybe<Scalars['Boolean']['output']>;
 };
 
 
@@ -773,11 +942,11 @@ export type LimitedUser = {
  * to another user
  */
 export type LimitedUserActivityArgs = {
-  actionType?: InputMaybe<Scalars['String']>;
-  after?: InputMaybe<Scalars['DateTime']>;
-  before?: InputMaybe<Scalars['DateTime']>;
-  cursor?: InputMaybe<Scalars['DateTime']>;
-  limit?: Scalars['Int'];
+  actionType?: InputMaybe<Scalars['String']['input']>;
+  after?: InputMaybe<Scalars['DateTime']['input']>;
+  before?: InputMaybe<Scalars['DateTime']['input']>;
+  cursor?: InputMaybe<Scalars['DateTime']['input']>;
+  limit?: Scalars['Int']['input'];
 };
 
 
@@ -786,8 +955,8 @@ export type LimitedUserActivityArgs = {
  * to another user
  */
 export type LimitedUserCommitsArgs = {
-  cursor?: InputMaybe<Scalars['String']>;
-  limit?: Scalars['Int'];
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  limit?: Scalars['Int']['input'];
 };
 
 
@@ -796,8 +965,8 @@ export type LimitedUserCommitsArgs = {
  * to another user
  */
 export type LimitedUserStreamsArgs = {
-  cursor?: InputMaybe<Scalars['String']>;
-  limit?: Scalars['Int'];
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  limit?: Scalars['Int']['input'];
 };
 
 
@@ -806,69 +975,69 @@ export type LimitedUserStreamsArgs = {
  * to another user
  */
 export type LimitedUserTimelineArgs = {
-  after?: InputMaybe<Scalars['DateTime']>;
-  before?: InputMaybe<Scalars['DateTime']>;
-  cursor?: InputMaybe<Scalars['DateTime']>;
-  limit?: Scalars['Int'];
+  after?: InputMaybe<Scalars['DateTime']['input']>;
+  before?: InputMaybe<Scalars['DateTime']['input']>;
+  cursor?: InputMaybe<Scalars['DateTime']['input']>;
+  limit?: Scalars['Int']['input'];
 };
 
 export type Model = {
   __typename?: 'Model';
   author: LimitedUser;
-  automationStatus?: Maybe<AutomationsStatus>;
+  automationsStatus?: Maybe<TriggeredAutomationsStatus>;
   /** Return a model tree of children */
   childrenTree: Array<ModelsTreeItem>;
   /** All comment threads in this model */
   commentThreads: CommentCollection;
-  createdAt: Scalars['DateTime'];
-  description?: Maybe<Scalars['String']>;
+  createdAt: Scalars['DateTime']['output'];
+  description?: Maybe<Scalars['String']['output']>;
   /** The shortened/display name that doesn't include the names of parent models */
-  displayName: Scalars['String'];
-  id: Scalars['ID'];
+  displayName: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
   /** Full name including the names of parent models delimited by forward slashes */
-  name: Scalars['String'];
+  name: Scalars['String']['output'];
   /** Returns a list of versions that are being created from a file import */
   pendingImportedVersions: Array<FileUpload>;
-  previewUrl?: Maybe<Scalars['String']>;
-  updatedAt: Scalars['DateTime'];
+  previewUrl?: Maybe<Scalars['String']['output']>;
+  updatedAt: Scalars['DateTime']['output'];
   version: Version;
   versions: VersionCollection;
 };
 
 
 export type ModelCommentThreadsArgs = {
-  cursor?: InputMaybe<Scalars['String']>;
-  limit?: Scalars['Int'];
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  limit?: Scalars['Int']['input'];
 };
 
 
 export type ModelPendingImportedVersionsArgs = {
-  limit?: InputMaybe<Scalars['Int']>;
+  limit?: InputMaybe<Scalars['Int']['input']>;
 };
 
 
 export type ModelVersionArgs = {
-  id: Scalars['String'];
+  id: Scalars['String']['input'];
 };
 
 
 export type ModelVersionsArgs = {
-  cursor?: InputMaybe<Scalars['String']>;
+  cursor?: InputMaybe<Scalars['String']['input']>;
   filter?: InputMaybe<ModelVersionsFilter>;
-  limit?: Scalars['Int'];
+  limit?: Scalars['Int']['input'];
 };
 
 export type ModelCollection = {
   __typename?: 'ModelCollection';
-  cursor?: Maybe<Scalars['String']>;
+  cursor?: Maybe<Scalars['String']['output']>;
   items: Array<Model>;
-  totalCount: Scalars['Int'];
+  totalCount: Scalars['Int']['output'];
 };
 
 export type ModelMutations = {
   __typename?: 'ModelMutations';
   create: Model;
-  delete: Scalars['Boolean'];
+  delete: Scalars['Boolean']['output'];
   update: Model;
 };
 
@@ -889,167 +1058,182 @@ export type ModelMutationsUpdateArgs = {
 
 export type ModelVersionsFilter = {
   /** Make sure these specified versions are always loaded first */
-  priorityIds?: InputMaybe<Array<Scalars['String']>>;
+  priorityIds?: InputMaybe<Array<Scalars['String']['input']>>;
   /** Only return versions specified in `priorityIds` */
-  priorityIdsOnly?: InputMaybe<Scalars['Boolean']>;
+  priorityIdsOnly?: InputMaybe<Scalars['Boolean']['input']>;
 };
 
 export type ModelsTreeItem = {
   __typename?: 'ModelsTreeItem';
   children: Array<ModelsTreeItem>;
-  fullName: Scalars['String'];
+  fullName: Scalars['String']['output'];
   /** Whether or not this item has nested children models */
-  hasChildren: Scalars['Boolean'];
-  id: Scalars['ID'];
+  hasChildren: Scalars['Boolean']['output'];
+  id: Scalars['ID']['output'];
   /**
    * Nullable cause the item can represent a parent that doesn't actually exist as a model on its own.
    * E.g. A model named "foo/bar" is supposed to be a child of "foo" and will be represented as such,
    * even if "foo" doesn't exist as its own model.
    */
   model?: Maybe<Model>;
-  name: Scalars['String'];
-  updatedAt: Scalars['DateTime'];
+  name: Scalars['String']['output'];
+  updatedAt: Scalars['DateTime']['output'];
 };
 
 export type ModelsTreeItemCollection = {
   __typename?: 'ModelsTreeItemCollection';
-  cursor?: Maybe<Scalars['String']>;
+  cursor?: Maybe<Scalars['String']['output']>;
   items: Array<ModelsTreeItem>;
-  totalCount: Scalars['Int'];
+  totalCount: Scalars['Int']['output'];
 };
 
 export type MoveVersionsInput = {
   /** If the name references a nonexistant model, it will be created */
-  targetModelName: Scalars['String'];
-  versionIds: Array<Scalars['String']>;
+  targetModelName: Scalars['String']['input'];
+  versionIds: Array<Scalars['String']['input']>;
 };
 
 export type Mutation = {
   __typename?: 'Mutation';
   /** The void stares back. */
-  _?: Maybe<Scalars['String']>;
+  _?: Maybe<Scalars['String']['output']>;
   /** Various Active User oriented mutations */
   activeUserMutations: ActiveUserMutations;
-  adminDeleteUser: Scalars['Boolean'];
+  adminDeleteUser: Scalars['Boolean']['output'];
   /** Creates an personal api token. */
-  apiTokenCreate: Scalars['String'];
+  apiTokenCreate: Scalars['String']['output'];
   /** Revokes (deletes) an personal api token/app token. */
-  apiTokenRevoke: Scalars['Boolean'];
+  apiTokenRevoke: Scalars['Boolean']['output'];
   /** Register a new third party application. */
-  appCreate: Scalars['String'];
+  appCreate: Scalars['String']['output'];
   /** Deletes a thirty party application. */
-  appDelete: Scalars['Boolean'];
+  appDelete: Scalars['Boolean']['output'];
   /** Revokes (de-authorizes) an application that you have previously authorized. */
-  appRevokeAccess?: Maybe<Scalars['Boolean']>;
+  appRevokeAccess?: Maybe<Scalars['Boolean']['output']>;
   /** Create an app token. Only apps can create app tokens and they don't show up under personal access tokens. */
-  appTokenCreate: Scalars['String'];
+  appTokenCreate: Scalars['String']['output'];
   /** Update an existing third party application. **Note: This will invalidate all existing tokens, refresh tokens and access codes and will require existing users to re-authorize it.** */
-  appUpdate: Scalars['Boolean'];
-  automationMutations: AutomationMutations;
-  branchCreate: Scalars['String'];
-  branchDelete: Scalars['Boolean'];
-  branchUpdate: Scalars['Boolean'];
+  appUpdate: Scalars['Boolean']['output'];
+  automateFunctionRunStatusReport: Scalars['Boolean']['output'];
+  automateMutations: AutomateMutations;
+  branchCreate: Scalars['String']['output'];
+  branchDelete: Scalars['Boolean']['output'];
+  branchUpdate: Scalars['Boolean']['output'];
   /** Broadcast user activity in the viewer */
-  broadcastViewerUserActivity: Scalars['Boolean'];
+  broadcastViewerUserActivity: Scalars['Boolean']['output'];
   /**
    * Archives a comment.
    * @deprecated Use commentMutations version
    */
-  commentArchive: Scalars['Boolean'];
+  commentArchive: Scalars['Boolean']['output'];
   /**
    * Creates a comment
    * @deprecated Use commentMutations version
    */
-  commentCreate: Scalars['String'];
+  commentCreate: Scalars['String']['output'];
   /**
    * Edits a comment.
    * @deprecated Use commentMutations version
    */
-  commentEdit: Scalars['Boolean'];
+  commentEdit: Scalars['Boolean']['output'];
   commentMutations: CommentMutations;
   /**
    * Adds a reply to a comment.
    * @deprecated Use commentMutations version
    */
-  commentReply: Scalars['String'];
+  commentReply: Scalars['String']['output'];
   /**
    * Flags a comment as viewed by you (the logged in user).
    * @deprecated Use commentMutations version
    */
-  commentView: Scalars['Boolean'];
-  commitCreate: Scalars['String'];
-  commitDelete: Scalars['Boolean'];
-  commitReceive: Scalars['Boolean'];
-  commitUpdate: Scalars['Boolean'];
+  commentView: Scalars['Boolean']['output'];
+  commitCreate: Scalars['String']['output'];
+  commitDelete: Scalars['Boolean']['output'];
+  commitReceive: Scalars['Boolean']['output'];
+  commitUpdate: Scalars['Boolean']['output'];
   /** Delete a batch of commits */
-  commitsDelete: Scalars['Boolean'];
+  commitsDelete: Scalars['Boolean']['output'];
   /** Move a batch of commits to a new branch */
-  commitsMove: Scalars['Boolean'];
-  /** Delete a pending invite */
-  inviteDelete: Scalars['Boolean'];
-  /** Re-send a pending invite */
-  inviteResend: Scalars['Boolean'];
+  commitsMove: Scalars['Boolean']['output'];
+  /**
+   * Delete a pending invite
+   * Note: The required scope to invoke this is not given out to app or personal access tokens
+   */
+  inviteDelete: Scalars['Boolean']['output'];
+  /**
+   * Re-send a pending invite
+   * Note: The required scope to invoke this is not given out to app or personal access tokens
+   */
+  inviteResend: Scalars['Boolean']['output'];
   modelMutations: ModelMutations;
-  objectCreate: Array<Maybe<Scalars['String']>>;
+  objectCreate: Array<Maybe<Scalars['String']['output']>>;
   projectMutations: ProjectMutations;
   /** (Re-)send the account verification e-mail */
-  requestVerification: Scalars['Boolean'];
-  requestVerificationByEmail: Scalars['Boolean'];
-  serverInfoUpdate?: Maybe<Scalars['Boolean']>;
-  serverInviteBatchCreate: Scalars['Boolean'];
+  requestVerification: Scalars['Boolean']['output'];
+  requestVerificationByEmail: Scalars['Boolean']['output'];
+  serverInfoUpdate?: Maybe<Scalars['Boolean']['output']>;
+  /** Note: The required scope to invoke this is not given out to app or personal access tokens */
+  serverInviteBatchCreate: Scalars['Boolean']['output'];
   /** Invite a new user to the speckle server and return the invite ID */
-  serverInviteCreate: Scalars['Boolean'];
+  serverInviteCreate: Scalars['Boolean']['output'];
   /** Request access to a specific stream */
   streamAccessRequestCreate: StreamAccessRequest;
   /** Accept or decline a stream access request. Must be a stream owner to invoke this. */
-  streamAccessRequestUse: Scalars['Boolean'];
+  streamAccessRequestUse: Scalars['Boolean']['output'];
   /** Creates a new stream. */
-  streamCreate?: Maybe<Scalars['String']>;
+  streamCreate?: Maybe<Scalars['String']['output']>;
   /** Deletes an existing stream. */
-  streamDelete: Scalars['Boolean'];
+  streamDelete: Scalars['Boolean']['output'];
   streamFavorite?: Maybe<Stream>;
-  streamInviteBatchCreate: Scalars['Boolean'];
-  /** Cancel a pending stream invite. Can only be invoked by a stream owner. */
-  streamInviteCancel: Scalars['Boolean'];
-  /** Invite a new or registered user to the specified stream */
-  streamInviteCreate: Scalars['Boolean'];
+  /** Note: The required scope to invoke this is not given out to app or personal access tokens */
+  streamInviteBatchCreate: Scalars['Boolean']['output'];
+  /**
+   * Cancel a pending stream invite. Can only be invoked by a stream owner.
+   * Note: The required scope to invoke this is not given out to app or personal access tokens
+   */
+  streamInviteCancel: Scalars['Boolean']['output'];
+  /**
+   * Invite a new or registered user to the specified stream
+   * Note: The required scope to invoke this is not given out to app or personal access tokens
+   */
+  streamInviteCreate: Scalars['Boolean']['output'];
   /** Accept or decline a stream invite */
-  streamInviteUse: Scalars['Boolean'];
+  streamInviteUse: Scalars['Boolean']['output'];
   /** Remove yourself from stream collaborators (not possible for the owner) */
-  streamLeave: Scalars['Boolean'];
+  streamLeave: Scalars['Boolean']['output'];
   /** Revokes the permissions of a user on a given stream. */
-  streamRevokePermission?: Maybe<Scalars['Boolean']>;
+  streamRevokePermission?: Maybe<Scalars['Boolean']['output']>;
   /** Updates an existing stream. */
-  streamUpdate: Scalars['Boolean'];
+  streamUpdate: Scalars['Boolean']['output'];
   /** Update permissions of a user on a given stream. */
-  streamUpdatePermission?: Maybe<Scalars['Boolean']>;
-  streamsDelete: Scalars['Boolean'];
+  streamUpdatePermission?: Maybe<Scalars['Boolean']['output']>;
+  streamsDelete: Scalars['Boolean']['output'];
   /**
    * Used for broadcasting real time typing status in comment threads. Does not persist any info.
    * @deprecated Use broadcastViewerUserActivity
    */
-  userCommentThreadActivityBroadcast: Scalars['Boolean'];
+  userCommentThreadActivityBroadcast: Scalars['Boolean']['output'];
   /** Delete a user's account. */
-  userDelete: Scalars['Boolean'];
-  userNotificationPreferencesUpdate?: Maybe<Scalars['Boolean']>;
-  userRoleChange: Scalars['Boolean'];
+  userDelete: Scalars['Boolean']['output'];
+  userNotificationPreferencesUpdate?: Maybe<Scalars['Boolean']['output']>;
+  userRoleChange: Scalars['Boolean']['output'];
   /**
    * Edits a user's profile.
    * @deprecated Use activeUserMutations version
    */
-  userUpdate: Scalars['Boolean'];
+  userUpdate: Scalars['Boolean']['output'];
   /**
    * Used for broadcasting real time chat head bubbles and status. Does not persist any info.
    * @deprecated Use broadcastViewerUserActivity
    */
-  userViewerActivityBroadcast: Scalars['Boolean'];
+  userViewerActivityBroadcast: Scalars['Boolean']['output'];
   versionMutations: VersionMutations;
   /** Creates a new webhook on a stream */
-  webhookCreate: Scalars['String'];
+  webhookCreate: Scalars['String']['output'];
   /** Deletes an existing webhook */
-  webhookDelete: Scalars['String'];
+  webhookDelete: Scalars['String']['output'];
   /** Updates an existing webhook */
-  webhookUpdate: Scalars['String'];
+  webhookUpdate: Scalars['String']['output'];
 };
 
 
@@ -1064,7 +1248,7 @@ export type MutationApiTokenCreateArgs = {
 
 
 export type MutationApiTokenRevokeArgs = {
-  token: Scalars['String'];
+  token: Scalars['String']['input'];
 };
 
 
@@ -1074,12 +1258,12 @@ export type MutationAppCreateArgs = {
 
 
 export type MutationAppDeleteArgs = {
-  appId: Scalars['String'];
+  appId: Scalars['String']['input'];
 };
 
 
 export type MutationAppRevokeAccessArgs = {
-  appId: Scalars['String'];
+  appId: Scalars['String']['input'];
 };
 
 
@@ -1093,6 +1277,11 @@ export type MutationAppUpdateArgs = {
 };
 
 
+export type MutationAutomateFunctionRunStatusReportArgs = {
+  input: AutomateFunctionRunStatusReportInput;
+};
+
+
 export type MutationBranchCreateArgs = {
   branch: BranchCreateInput;
 };
@@ -1110,15 +1299,15 @@ export type MutationBranchUpdateArgs = {
 
 export type MutationBroadcastViewerUserActivityArgs = {
   message: ViewerUserActivityMessageInput;
-  projectId: Scalars['String'];
-  resourceIdString: Scalars['String'];
+  projectId: Scalars['String']['input'];
+  resourceIdString: Scalars['String']['input'];
 };
 
 
 export type MutationCommentArchiveArgs = {
-  archived?: Scalars['Boolean'];
-  commentId: Scalars['String'];
-  streamId: Scalars['String'];
+  archived?: Scalars['Boolean']['input'];
+  commentId: Scalars['String']['input'];
+  streamId: Scalars['String']['input'];
 };
 
 
@@ -1138,8 +1327,8 @@ export type MutationCommentReplyArgs = {
 
 
 export type MutationCommentViewArgs = {
-  commentId: Scalars['String'];
-  streamId: Scalars['String'];
+  commentId: Scalars['String']['input'];
+  streamId: Scalars['String']['input'];
 };
 
 
@@ -1174,12 +1363,12 @@ export type MutationCommitsMoveArgs = {
 
 
 export type MutationInviteDeleteArgs = {
-  inviteId: Scalars['String'];
+  inviteId: Scalars['String']['input'];
 };
 
 
 export type MutationInviteResendArgs = {
-  inviteId: Scalars['String'];
+  inviteId: Scalars['String']['input'];
 };
 
 
@@ -1189,7 +1378,7 @@ export type MutationObjectCreateArgs = {
 
 
 export type MutationRequestVerificationByEmailArgs = {
-  email: Scalars['String'];
+  email: Scalars['String']['input'];
 };
 
 
@@ -1209,13 +1398,13 @@ export type MutationServerInviteCreateArgs = {
 
 
 export type MutationStreamAccessRequestCreateArgs = {
-  streamId: Scalars['String'];
+  streamId: Scalars['String']['input'];
 };
 
 
 export type MutationStreamAccessRequestUseArgs = {
-  accept: Scalars['Boolean'];
-  requestId: Scalars['String'];
+  accept: Scalars['Boolean']['input'];
+  requestId: Scalars['String']['input'];
   role?: StreamRole;
 };
 
@@ -1226,13 +1415,13 @@ export type MutationStreamCreateArgs = {
 
 
 export type MutationStreamDeleteArgs = {
-  id: Scalars['String'];
+  id: Scalars['String']['input'];
 };
 
 
 export type MutationStreamFavoriteArgs = {
-  favorited: Scalars['Boolean'];
-  streamId: Scalars['String'];
+  favorited: Scalars['Boolean']['input'];
+  streamId: Scalars['String']['input'];
 };
 
 
@@ -1242,8 +1431,8 @@ export type MutationStreamInviteBatchCreateArgs = {
 
 
 export type MutationStreamInviteCancelArgs = {
-  inviteId: Scalars['String'];
-  streamId: Scalars['String'];
+  inviteId: Scalars['String']['input'];
+  streamId: Scalars['String']['input'];
 };
 
 
@@ -1253,14 +1442,14 @@ export type MutationStreamInviteCreateArgs = {
 
 
 export type MutationStreamInviteUseArgs = {
-  accept: Scalars['Boolean'];
-  streamId: Scalars['String'];
-  token: Scalars['String'];
+  accept: Scalars['Boolean']['input'];
+  streamId: Scalars['String']['input'];
+  token: Scalars['String']['input'];
 };
 
 
 export type MutationStreamLeaveArgs = {
-  streamId: Scalars['String'];
+  streamId: Scalars['String']['input'];
 };
 
 
@@ -1280,14 +1469,14 @@ export type MutationStreamUpdatePermissionArgs = {
 
 
 export type MutationStreamsDeleteArgs = {
-  ids?: InputMaybe<Array<Scalars['String']>>;
+  ids?: InputMaybe<Array<Scalars['String']['input']>>;
 };
 
 
 export type MutationUserCommentThreadActivityBroadcastArgs = {
-  commentId: Scalars['String'];
-  data?: InputMaybe<Scalars['JSONObject']>;
-  streamId: Scalars['String'];
+  commentId: Scalars['String']['input'];
+  data?: InputMaybe<Scalars['JSONObject']['input']>;
+  streamId: Scalars['String']['input'];
 };
 
 
@@ -1297,7 +1486,7 @@ export type MutationUserDeleteArgs = {
 
 
 export type MutationUserNotificationPreferencesUpdateArgs = {
-  preferences: Scalars['JSONObject'];
+  preferences: Scalars['JSONObject']['input'];
 };
 
 
@@ -1312,9 +1501,9 @@ export type MutationUserUpdateArgs = {
 
 
 export type MutationUserViewerActivityBroadcastArgs = {
-  data?: InputMaybe<Scalars['JSONObject']>;
-  resourceId: Scalars['String'];
-  streamId: Scalars['String'];
+  data?: InputMaybe<Scalars['JSONObject']['input']>;
+  resourceId: Scalars['String']['input'];
+  streamId: Scalars['String']['input'];
 };
 
 
@@ -1334,7 +1523,7 @@ export type MutationWebhookUpdateArgs = {
 
 export type Object = {
   __typename?: 'Object';
-  applicationId?: Maybe<Scalars['String']>;
+  applicationId?: Maybe<Scalars['String']['output']>;
   /**
    * Get any objects that this object references. In the case of commits, this will give you a commit's constituent objects.
    * **NOTE**: Providing any of the two last arguments ( `query`, `orderBy` ) will trigger a different code branch that executes a much more expensive SQL query. It is not recommended to do so for basic clients that are interested in purely getting all the objects of a given commit.
@@ -1350,43 +1539,43 @@ export type Object = {
    *   }
    * ```
    */
-  commentCount: Scalars['Int'];
-  createdAt?: Maybe<Scalars['DateTime']>;
+  commentCount: Scalars['Int']['output'];
+  createdAt?: Maybe<Scalars['DateTime']['output']>;
   /** The full object, with all its props & other things. **NOTE:** If you're requesting objects for the purpose of recreating & displaying, you probably only want to request this specific field. */
-  data?: Maybe<Scalars['JSONObject']>;
-  id: Scalars['String'];
-  speckleType?: Maybe<Scalars['String']>;
-  totalChildrenCount?: Maybe<Scalars['Int']>;
+  data?: Maybe<Scalars['JSONObject']['output']>;
+  id: Scalars['String']['output'];
+  speckleType?: Maybe<Scalars['String']['output']>;
+  totalChildrenCount?: Maybe<Scalars['Int']['output']>;
 };
 
 
 export type ObjectChildrenArgs = {
-  cursor?: InputMaybe<Scalars['String']>;
-  depth?: Scalars['Int'];
-  limit?: Scalars['Int'];
-  orderBy?: InputMaybe<Scalars['JSONObject']>;
-  query?: InputMaybe<Array<Scalars['JSONObject']>>;
-  select?: InputMaybe<Array<InputMaybe<Scalars['String']>>>;
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  depth?: Scalars['Int']['input'];
+  limit?: Scalars['Int']['input'];
+  orderBy?: InputMaybe<Scalars['JSONObject']['input']>;
+  query?: InputMaybe<Array<Scalars['JSONObject']['input']>>;
+  select?: InputMaybe<Array<InputMaybe<Scalars['String']['input']>>>;
 };
 
 export type ObjectCollection = {
   __typename?: 'ObjectCollection';
-  cursor?: Maybe<Scalars['String']>;
+  cursor?: Maybe<Scalars['String']['output']>;
   objects: Array<Maybe<Object>>;
-  totalCount: Scalars['Int'];
+  totalCount: Scalars['Int']['output'];
 };
 
 export type ObjectCreateInput = {
   /** The objects you want to create. */
-  objects: Array<InputMaybe<Scalars['JSONObject']>>;
+  objects: Array<InputMaybe<Scalars['JSONObject']['input']>>;
   /** The stream against which these objects will be created. */
-  streamId: Scalars['String'];
+  streamId: Scalars['String']['input'];
 };
 
 export type PasswordStrengthCheckFeedback = {
   __typename?: 'PasswordStrengthCheckFeedback';
-  suggestions: Array<Scalars['String']>;
-  warning?: Maybe<Scalars['String']>;
+  suggestions: Array<Scalars['String']['output']>;
+  warning?: Maybe<Scalars['String']['output']>;
 };
 
 export type PasswordStrengthCheckResults = {
@@ -1401,35 +1590,41 @@ export type PasswordStrengthCheckResults = {
    * 3 safely unguessable: moderate protection from offline slow-hash scenario. (guesses < 10^10)
    * 4 very unguessable: strong protection from offline slow-hash scenario. (guesses >= 10^10)
    */
-  score: Scalars['Int'];
+  score: Scalars['Int']['output'];
 };
 
 export type PendingStreamCollaborator = {
   __typename?: 'PendingStreamCollaborator';
-  id: Scalars['String'];
-  inviteId: Scalars['String'];
+  id: Scalars['String']['output'];
+  inviteId: Scalars['String']['output'];
   invitedBy: LimitedUser;
-  projectId: Scalars['String'];
-  projectName: Scalars['String'];
-  role: Scalars['String'];
-  streamId: Scalars['String'];
-  streamName: Scalars['String'];
+  projectId: Scalars['String']['output'];
+  projectName: Scalars['String']['output'];
+  role: Scalars['String']['output'];
+  streamId: Scalars['String']['output'];
+  streamName: Scalars['String']['output'];
   /** E-mail address or name of the invited user */
-  title: Scalars['String'];
+  title: Scalars['String']['output'];
   /** Only available if the active user is the pending stream collaborator */
-  token?: Maybe<Scalars['String']>;
+  token?: Maybe<Scalars['String']['output']>;
   /** Set only if user is registered */
   user?: Maybe<LimitedUser>;
 };
 
 export type Project = {
   __typename?: 'Project';
-  allowPublicComments: Scalars['Boolean'];
+  allowPublicComments: Scalars['Boolean']['output'];
+  /** Get a single automation by id. Error will be thrown if automation is not found or inaccessible. */
+  automation: Automation;
+  automations: AutomationCollection;
+  blob?: Maybe<BlobMetadata>;
+  /** Get the metadata collection of blobs stored for this stream. */
+  blobs?: Maybe<BlobMetadataCollection>;
   /** All comment threads in this project */
   commentThreads: ProjectCommentCollection;
-  createdAt: Scalars['DateTime'];
-  description?: Maybe<Scalars['String']>;
-  id: Scalars['ID'];
+  createdAt: Scalars['DateTime']['output'];
+  description?: Maybe<Scalars['String']['output']>;
+  id: Scalars['ID']['output'];
   /** Collaborators who have been invited, but not yet accepted. */
   invitedTeam?: Maybe<Array<PendingStreamCollaborator>>;
   /** Returns a specific model by its ID */
@@ -1443,15 +1638,15 @@ export type Project = {
    * real or fake (e.g., with a foo/bar model, it will be nested under foo even if such a model doesn't actually exist)
    */
   modelsTree: ModelsTreeItemCollection;
-  name: Scalars['String'];
+  name: Scalars['String']['output'];
   /** Returns a list models that are being created from a file import */
   pendingImportedModels: Array<FileUpload>;
   /** Active user's role for this project. `null` if request is not authenticated, or the project is not explicitly shared with you. */
-  role?: Maybe<Scalars['String']>;
+  role?: Maybe<Scalars['String']['output']>;
   /** Source apps used in any models of this project */
-  sourceApps: Array<Scalars['String']>;
+  sourceApps: Array<Scalars['String']['output']>;
   team: Array<ProjectCollaborator>;
-  updatedAt: Scalars['DateTime'];
+  updatedAt: Scalars['DateTime']['output'];
   /** Retrieve a specific project version by its ID */
   version?: Maybe<Version>;
   /** Returns a flat list of all project versions */
@@ -1463,113 +1658,207 @@ export type Project = {
 };
 
 
+export type ProjectAutomationArgs = {
+  id: Scalars['String']['input'];
+};
+
+
+export type ProjectAutomationsArgs = {
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  filter?: InputMaybe<Scalars['String']['input']>;
+  limit?: InputMaybe<Scalars['Int']['input']>;
+};
+
+
+export type ProjectBlobArgs = {
+  id: Scalars['String']['input'];
+};
+
+
+export type ProjectBlobsArgs = {
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  limit?: InputMaybe<Scalars['Int']['input']>;
+  query?: InputMaybe<Scalars['String']['input']>;
+};
+
+
 export type ProjectCommentThreadsArgs = {
-  cursor?: InputMaybe<Scalars['String']>;
+  cursor?: InputMaybe<Scalars['String']['input']>;
   filter?: InputMaybe<ProjectCommentsFilter>;
-  limit?: Scalars['Int'];
+  limit?: Scalars['Int']['input'];
 };
 
 
 export type ProjectModelArgs = {
-  id: Scalars['String'];
+  id: Scalars['String']['input'];
 };
 
 
 export type ProjectModelChildrenTreeArgs = {
-  fullName: Scalars['String'];
+  fullName: Scalars['String']['input'];
 };
 
 
 export type ProjectModelsArgs = {
-  cursor?: InputMaybe<Scalars['String']>;
+  cursor?: InputMaybe<Scalars['String']['input']>;
   filter?: InputMaybe<ProjectModelsFilter>;
-  limit?: Scalars['Int'];
+  limit?: Scalars['Int']['input'];
 };
 
 
 export type ProjectModelsTreeArgs = {
-  cursor?: InputMaybe<Scalars['String']>;
+  cursor?: InputMaybe<Scalars['String']['input']>;
   filter?: InputMaybe<ProjectModelsTreeFilter>;
-  limit?: Scalars['Int'];
+  limit?: Scalars['Int']['input'];
 };
 
 
 export type ProjectPendingImportedModelsArgs = {
-  limit?: InputMaybe<Scalars['Int']>;
+  limit?: InputMaybe<Scalars['Int']['input']>;
 };
 
 
 export type ProjectVersionArgs = {
-  id: Scalars['String'];
+  id: Scalars['String']['input'];
 };
 
 
 export type ProjectVersionsArgs = {
-  cursor?: InputMaybe<Scalars['String']>;
-  limit?: Scalars['Int'];
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  limit?: Scalars['Int']['input'];
 };
 
 
 export type ProjectViewerResourcesArgs = {
-  loadedVersionsOnly?: InputMaybe<Scalars['Boolean']>;
-  resourceIdString: Scalars['String'];
+  loadedVersionsOnly?: InputMaybe<Scalars['Boolean']['input']>;
+  resourceIdString: Scalars['String']['input'];
 };
 
 
 export type ProjectWebhooksArgs = {
-  id?: InputMaybe<Scalars['String']>;
+  id?: InputMaybe<Scalars['String']['input']>;
 };
 
-export type ProjectAutomationsStatusUpdatedMessage = {
-  __typename?: 'ProjectAutomationsStatusUpdatedMessage';
-  model: Model;
-  project: Project;
-  status: AutomationsStatus;
-  version: Version;
+export type ProjectAutomationCreateInput = {
+  enabled: Scalars['Boolean']['input'];
+  name: Scalars['String']['input'];
 };
 
+export type ProjectAutomationMutations = {
+  __typename?: 'ProjectAutomationMutations';
+  create: Automation;
+  createRevision: AutomationRevision;
+  createTestAutomation: Automation;
+  createTestAutomationRun: TestAutomationRun;
+  /**
+   * Trigger an automation with a fake "version created" trigger. The "version created" will
+   * just refer to the last version of the model.
+   */
+  trigger: Scalars['String']['output'];
+  update: Automation;
+};
+
+
+export type ProjectAutomationMutationsCreateArgs = {
+  input: ProjectAutomationCreateInput;
+};
+
+
+export type ProjectAutomationMutationsCreateRevisionArgs = {
+  input: ProjectAutomationRevisionCreateInput;
+};
+
+
+export type ProjectAutomationMutationsCreateTestAutomationArgs = {
+  input: ProjectTestAutomationCreateInput;
+};
+
+
+export type ProjectAutomationMutationsCreateTestAutomationRunArgs = {
+  automationId: Scalars['ID']['input'];
+};
+
+
+export type ProjectAutomationMutationsTriggerArgs = {
+  automationId: Scalars['ID']['input'];
+};
+
+
+export type ProjectAutomationMutationsUpdateArgs = {
+  input: ProjectAutomationUpdateInput;
+};
+
+export type ProjectAutomationRevisionCreateInput = {
+  automationId: Scalars['ID']['input'];
+  functions: Array<AutomationRevisionCreateFunctionInput>;
+  /** AutomateTypes.TriggerDefinitionsSchema type from @speckle/shared */
+  triggerDefinitions: Scalars['JSONObject']['input'];
+};
+
+export type ProjectAutomationUpdateInput = {
+  enabled?: InputMaybe<Scalars['Boolean']['input']>;
+  id: Scalars['ID']['input'];
+  name?: InputMaybe<Scalars['String']['input']>;
+};
+
+export type ProjectAutomationsUpdatedMessage = {
+  __typename?: 'ProjectAutomationsUpdatedMessage';
+  automation?: Maybe<Automation>;
+  automationId: Scalars['String']['output'];
+  /** Only set if type === CREATED_REVISION */
+  revision?: Maybe<AutomationRevision>;
+  type: ProjectAutomationsUpdatedMessageType;
+};
+
+export enum ProjectAutomationsUpdatedMessageType {
+  Created = 'CREATED',
+  CreatedRevision = 'CREATED_REVISION',
+  Updated = 'UPDATED'
+}
+
 export type ProjectCollaborator = {
   __typename?: 'ProjectCollaborator';
-  role: Scalars['String'];
+  id: Scalars['ID']['output'];
+  role: Scalars['String']['output'];
   user: LimitedUser;
 };
 
 export type ProjectCollection = {
   __typename?: 'ProjectCollection';
-  cursor?: Maybe<Scalars['String']>;
+  cursor?: Maybe<Scalars['String']['output']>;
   items: Array<Project>;
-  totalCount: Scalars['Int'];
+  totalCount: Scalars['Int']['output'];
 };
 
 export type ProjectCommentCollection = {
   __typename?: 'ProjectCommentCollection';
-  cursor?: Maybe<Scalars['String']>;
+  cursor?: Maybe<Scalars['String']['output']>;
   items: Array<Comment>;
-  totalArchivedCount: Scalars['Int'];
-  totalCount: Scalars['Int'];
+  totalArchivedCount: Scalars['Int']['output'];
+  totalCount: Scalars['Int']['output'];
 };
 
 export type ProjectCommentsFilter = {
   /** Whether or not to include archived/resolved threads */
-  includeArchived?: InputMaybe<Scalars['Boolean']>;
+  includeArchived?: InputMaybe<Scalars['Boolean']['input']>;
   /**
    * By default if resourceIdString is set, the "versionId" part of model resource identifiers will be ignored
    * and all comments of all versions of any of the referenced models will be returned. If `loadedVersionsOnly` is
    * enabled, then only comment threads of loaded/referenced versions in resourceIdString will be returned.
    */
-  loadedVersionsOnly?: InputMaybe<Scalars['Boolean']>;
+  loadedVersionsOnly?: InputMaybe<Scalars['Boolean']['input']>;
   /**
    * Only request comments belonging to the resources identified by this
    * comma-delimited resouce string (same format that's used in the viewer URL)
    */
-  resourceIdString?: InputMaybe<Scalars['String']>;
+  resourceIdString?: InputMaybe<Scalars['String']['input']>;
 };
 
 export type ProjectCommentsUpdatedMessage = {
   __typename?: 'ProjectCommentsUpdatedMessage';
   /** Null if deleted */
   comment?: Maybe<Comment>;
-  id: Scalars['String'];
+  id: Scalars['String']['output'];
   type: ProjectCommentsUpdatedMessageType;
 };
 
@@ -1581,15 +1870,15 @@ export enum ProjectCommentsUpdatedMessageType {
 
 /** Any values left null will be ignored */
 export type ProjectCreateInput = {
-  description?: InputMaybe<Scalars['String']>;
-  name?: InputMaybe<Scalars['String']>;
+  description?: InputMaybe<Scalars['String']['input']>;
+  name?: InputMaybe<Scalars['String']['input']>;
   visibility?: InputMaybe<ProjectVisibility>;
 };
 
 export type ProjectFileImportUpdatedMessage = {
   __typename?: 'ProjectFileImportUpdatedMessage';
   /** Upload ID */
-  id: Scalars['String'];
+  id: Scalars['String']['output'];
   type: ProjectFileImportUpdatedMessageType;
   upload: FileUpload;
 };
@@ -1601,13 +1890,13 @@ export enum ProjectFileImportUpdatedMessageType {
 
 export type ProjectInviteCreateInput = {
   /** Either this or userId must be filled */
-  email?: InputMaybe<Scalars['String']>;
+  email?: InputMaybe<Scalars['String']['input']>;
   /** Defaults to the contributor role, if not specified */
-  role?: InputMaybe<Scalars['String']>;
+  role?: InputMaybe<Scalars['String']['input']>;
   /** Can only be specified if guest mode is on or if the user is an admin */
-  serverRole?: InputMaybe<Scalars['String']>;
+  serverRole?: InputMaybe<Scalars['String']['input']>;
   /** Either this or email must be filled */
-  userId?: InputMaybe<Scalars['String']>;
+  userId?: InputMaybe<Scalars['String']['input']>;
 };
 
 export type ProjectInviteMutations = {
@@ -1619,25 +1908,25 @@ export type ProjectInviteMutations = {
   /** Invite a new or registered user to be a project collaborator. Can only be invoked by a project owner. */
   create: Project;
   /** Accept or decline a project invite */
-  use: Scalars['Boolean'];
+  use: Scalars['Boolean']['output'];
 };
 
 
 export type ProjectInviteMutationsBatchCreateArgs = {
   input: Array<ProjectInviteCreateInput>;
-  projectId: Scalars['ID'];
+  projectId: Scalars['ID']['input'];
 };
 
 
 export type ProjectInviteMutationsCancelArgs = {
-  inviteId: Scalars['String'];
-  projectId: Scalars['ID'];
+  inviteId: Scalars['String']['input'];
+  projectId: Scalars['ID']['input'];
 };
 
 
 export type ProjectInviteMutationsCreateArgs = {
   input: ProjectInviteCreateInput;
-  projectId: Scalars['ID'];
+  projectId: Scalars['ID']['input'];
 };
 
 
@@ -1646,39 +1935,39 @@ export type ProjectInviteMutationsUseArgs = {
 };
 
 export type ProjectInviteUseInput = {
-  accept: Scalars['Boolean'];
-  projectId: Scalars['ID'];
-  token: Scalars['String'];
+  accept: Scalars['Boolean']['input'];
+  projectId: Scalars['ID']['input'];
+  token: Scalars['String']['input'];
 };
 
 export type ProjectModelsFilter = {
   /** Filter by IDs of contributors who participated in models */
-  contributors?: InputMaybe<Array<Scalars['String']>>;
+  contributors?: InputMaybe<Array<Scalars['String']['input']>>;
   /** Excldue models w/ the specified IDs */
-  excludeIds?: InputMaybe<Array<Scalars['String']>>;
+  excludeIds?: InputMaybe<Array<Scalars['String']['input']>>;
   /** Only select models w/ the specified IDs */
-  ids?: InputMaybe<Array<Scalars['String']>>;
+  ids?: InputMaybe<Array<Scalars['String']['input']>>;
   /** Filter out models that don't have any versions */
-  onlyWithVersions?: InputMaybe<Scalars['Boolean']>;
+  onlyWithVersions?: InputMaybe<Scalars['Boolean']['input']>;
   /** Filter by model names */
-  search?: InputMaybe<Scalars['String']>;
+  search?: InputMaybe<Scalars['String']['input']>;
   /** Filter by source apps used in models */
-  sourceApps?: InputMaybe<Array<Scalars['String']>>;
+  sourceApps?: InputMaybe<Array<Scalars['String']['input']>>;
 };
 
 export type ProjectModelsTreeFilter = {
   /** Filter by IDs of contributors who participated in models */
-  contributors?: InputMaybe<Array<Scalars['String']>>;
+  contributors?: InputMaybe<Array<Scalars['String']['input']>>;
   /** Search for specific models. If used, tree items from different levels may be mixed. */
-  search?: InputMaybe<Scalars['String']>;
+  search?: InputMaybe<Scalars['String']['input']>;
   /** Filter by source apps used in models */
-  sourceApps?: InputMaybe<Array<Scalars['String']>>;
+  sourceApps?: InputMaybe<Array<Scalars['String']['input']>>;
 };
 
 export type ProjectModelsUpdatedMessage = {
   __typename?: 'ProjectModelsUpdatedMessage';
   /** Model ID */
-  id: Scalars['String'];
+  id: Scalars['String']['output'];
   /** Null if model was deleted */
   model?: Maybe<Model>;
   type: ProjectModelsUpdatedMessageType;
@@ -1692,6 +1981,7 @@ export enum ProjectModelsUpdatedMessageType {
 
 export type ProjectMutations = {
   __typename?: 'ProjectMutations';
+  automationMutations: ProjectAutomationMutations;
   /** Create new project */
   create: Project;
   /**
@@ -1700,11 +1990,11 @@ export type ProjectMutations = {
    */
   createForOnboarding: Project;
   /** Delete an existing project */
-  delete: Scalars['Boolean'];
+  delete: Scalars['Boolean']['output'];
   /** Invite related mutations */
   invites: ProjectInviteMutations;
   /** Leave a project. Only possible if you're not the last remaining owner. */
-  leave: Scalars['Boolean'];
+  leave: Scalars['Boolean']['output'];
   /** Updates an existing project */
   update: Project;
   /** Update role for a collaborator */
@@ -1712,18 +2002,23 @@ export type ProjectMutations = {
 };
 
 
+export type ProjectMutationsAutomationMutationsArgs = {
+  projectId: Scalars['ID']['input'];
+};
+
+
 export type ProjectMutationsCreateArgs = {
   input?: InputMaybe<ProjectCreateInput>;
 };
 
 
 export type ProjectMutationsDeleteArgs = {
-  id: Scalars['String'];
+  id: Scalars['String']['input'];
 };
 
 
 export type ProjectMutationsLeaveArgs = {
-  id: Scalars['String'];
+  id: Scalars['String']['input'];
 };
 
 
@@ -1739,7 +2034,7 @@ export type ProjectMutationsUpdateRoleArgs = {
 export type ProjectPendingModelsUpdatedMessage = {
   __typename?: 'ProjectPendingModelsUpdatedMessage';
   /** Upload ID */
-  id: Scalars['String'];
+  id: Scalars['String']['output'];
   model: FileUpload;
   type: ProjectPendingModelsUpdatedMessageType;
 };
@@ -1752,7 +2047,7 @@ export enum ProjectPendingModelsUpdatedMessageType {
 export type ProjectPendingVersionsUpdatedMessage = {
   __typename?: 'ProjectPendingVersionsUpdatedMessage';
   /** Upload ID */
-  id: Scalars['String'];
+  id: Scalars['String']['output'];
   type: ProjectPendingVersionsUpdatedMessageType;
   version: FileUpload;
 };
@@ -1762,26 +2057,46 @@ export enum ProjectPendingVersionsUpdatedMessageType {
   Updated = 'UPDATED'
 }
 
+export type ProjectTestAutomationCreateInput = {
+  functionId: Scalars['String']['input'];
+  modelId: Scalars['String']['input'];
+  name: Scalars['String']['input'];
+};
+
+export type ProjectTriggeredAutomationsStatusUpdatedMessage = {
+  __typename?: 'ProjectTriggeredAutomationsStatusUpdatedMessage';
+  model: Model;
+  project: Project;
+  run: AutomateRun;
+  type: ProjectTriggeredAutomationsStatusUpdatedMessageType;
+  version: Version;
+};
+
+export enum ProjectTriggeredAutomationsStatusUpdatedMessageType {
+  RunCreated = 'RUN_CREATED',
+  RunUpdated = 'RUN_UPDATED'
+}
+
 /** Any values left null will be ignored, so only set the properties that you want updated */
 export type ProjectUpdateInput = {
-  allowPublicComments?: InputMaybe<Scalars['Boolean']>;
-  description?: InputMaybe<Scalars['String']>;
-  id: Scalars['ID'];
-  name?: InputMaybe<Scalars['String']>;
+  allowPublicComments?: InputMaybe<Scalars['Boolean']['input']>;
+  description?: InputMaybe<Scalars['String']['input']>;
+  id: Scalars['ID']['input'];
+  name?: InputMaybe<Scalars['String']['input']>;
   visibility?: InputMaybe<ProjectVisibility>;
 };
 
 export type ProjectUpdateRoleInput = {
-  projectId: Scalars['String'];
+  projectId: Scalars['String']['input'];
   /** Leave role as null to revoke access entirely */
-  role?: InputMaybe<Scalars['String']>;
-  userId: Scalars['String'];
+  role?: InputMaybe<Scalars['String']['input']>;
+  userId: Scalars['String']['input'];
 };
 
 export type ProjectUpdatedMessage = {
   __typename?: 'ProjectUpdatedMessage';
   /** Project ID */
-  id: Scalars['String'];
+  id: Scalars['String']['output'];
   /** Project entity, null if project was deleted */
   project?: Maybe<Project>;
   /** Message type */
@@ -1795,17 +2110,17 @@ export enum ProjectUpdatedMessageType {
 
 export type ProjectVersionsPreviewGeneratedMessage = {
   __typename?: 'ProjectVersionsPreviewGeneratedMessage';
-  objectId: Scalars['String'];
-  projectId: Scalars['String'];
-  versionId: Scalars['String'];
+  objectId: Scalars['String']['output'];
+  projectId: Scalars['String']['output'];
+  versionId: Scalars['String']['output'];
 };
 
 export type ProjectVersionsUpdatedMessage = {
   __typename?: 'ProjectVersionsUpdatedMessage';
   /** Version ID */
-  id: Scalars['String'];
+  id: Scalars['String']['output'];
   /** Only set if version was deleted, in other scenarios can be queried from 'version' */
-  modelId?: Maybe<Scalars['String']>;
+  modelId?: Maybe<Scalars['String']['output']>;
   type: ProjectVersionsUpdatedMessageType;
   /** Null if version was deleted */
   version?: Maybe<Version>;
@@ -1826,7 +2141,7 @@ export enum ProjectVisibility {
 export type Query = {
   __typename?: 'Query';
   /** Stare into the void. */
-  _?: Maybe<Scalars['String']>;
+  _?: Maybe<Scalars['String']['output']>;
   /** Gets the profile of the authenticated user or null if not authenticated */
   activeUser?: Maybe<User>;
   admin: AdminQueries;
@@ -1847,6 +2162,11 @@ export type Query = {
   apps?: Maybe<Array<Maybe<ServerAppListItem>>>;
   /** If user is authenticated using an app token, this will describe the app */
   authenticatedAsApp?: Maybe<ServerAppListItem>;
+  /** Get a single automate function by id. Error will be thrown if function is not found or inaccessible. */
+  automateFunction: AutomateFunction;
+  automateFunctions: AutomateFunctionCollection;
+  /** Part of the automation/function creation handshake mechanism */
+  automateValidateAuthCode: Scalars['Boolean']['output'];
   comment?: Maybe<Comment>;
   /**
    * This query can be used in the following ways:
@@ -1911,129 +2231,146 @@ export type Query = {
 
 
 export type QueryAdminStreamsArgs = {
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  orderBy?: InputMaybe<Scalars['String']>;
-  query?: InputMaybe<Scalars['String']>;
-  visibility?: InputMaybe<Scalars['String']>;
+  limit?: InputMaybe<Scalars['Int']['input']>;
+  offset?: InputMaybe<Scalars['Int']['input']>;
+  orderBy?: InputMaybe<Scalars['String']['input']>;
+  query?: InputMaybe<Scalars['String']['input']>;
+  visibility?: InputMaybe<Scalars['String']['input']>;
 };
 
 
 export type QueryAdminUsersArgs = {
-  limit?: Scalars['Int'];
-  offset?: Scalars['Int'];
-  query?: InputMaybe<Scalars['String']>;
+  limit?: Scalars['Int']['input'];
+  offset?: Scalars['Int']['input'];
+  query?: InputMaybe<Scalars['String']['input']>;
 };
 
 
 export type QueryAppArgs = {
-  id: Scalars['String'];
+  id: Scalars['String']['input'];
+};
+
+
+export type QueryAutomateFunctionArgs = {
+  id: Scalars['ID']['input'];
+};
+
+
+export type QueryAutomateFunctionsArgs = {
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  filter?: InputMaybe<AutomateFunctionsFilter>;
+  limit?: InputMaybe<Scalars['Int']['input']>;
+};
+
+
+export type QueryAutomateValidateAuthCodeArgs = {
+  payload: AutomateAuthCodePayloadTest;
 };
 
 
 export type QueryCommentArgs = {
-  id: Scalars['String'];
-  streamId: Scalars['String'];
+  id: Scalars['String']['input'];
+  streamId: Scalars['String']['input'];
 };
 
 
 export type QueryCommentsArgs = {
-  archived?: Scalars['Boolean'];
-  cursor?: InputMaybe<Scalars['String']>;
-  limit?: InputMaybe<Scalars['Int']>;
+  archived?: Scalars['Boolean']['input'];
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  limit?: InputMaybe<Scalars['Int']['input']>;
   resources?: InputMaybe<Array<InputMaybe<ResourceIdentifierInput>>>;
-  streamId: Scalars['String'];
+  streamId: Scalars['String']['input'];
 };
 
 
 export type QueryDiscoverableStreamsArgs = {
-  cursor?: InputMaybe<Scalars['String']>;
-  limit?: Scalars['Int'];
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  limit?: Scalars['Int']['input'];
   sort?: InputMaybe<DiscoverableStreamsSortingInput>;
 };
 
 
 export type QueryOtherUserArgs = {
-  id: Scalars['String'];
+  id: Scalars['String']['input'];
 };
 
 
 export type QueryProjectArgs = {
-  id: Scalars['String'];
+  id: Scalars['String']['input'];
 };
 
 
 export type QueryProjectInviteArgs = {
-  projectId: Scalars['String'];
-  token?: InputMaybe<Scalars['String']>;
+  projectId: Scalars['String']['input'];
+  token?: InputMaybe<Scalars['String']['input']>;
 };
 
 
 export type QueryServerInviteByTokenArgs = {
-  token: Scalars['String'];
+  token: Scalars['String']['input'];
 };
 
 
 export type QueryStreamArgs = {
-  id: Scalars['String'];
+  id: Scalars['String']['input'];
 };
 
 
 export type QueryStreamAccessRequestArgs = {
-  streamId: Scalars['String'];
+  streamId: Scalars['String']['input'];
 };
 
 
 export type QueryStreamInviteArgs = {
-  streamId: Scalars['String'];
-  token?: InputMaybe<Scalars['String']>;
+  streamId: Scalars['String']['input'];
+  token?: InputMaybe<Scalars['String']['input']>;
 };
 
 
 export type QueryStreamsArgs = {
-  cursor?: InputMaybe<Scalars['String']>;
-  limit?: InputMaybe<Scalars['Int']>;
-  query?: InputMaybe<Scalars['String']>;
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  limit?: InputMaybe<Scalars['Int']['input']>;
+  query?: InputMaybe<Scalars['String']['input']>;
 };
 
 
 export type QueryUserArgs = {
-  id?: InputMaybe<Scalars['String']>;
+  id?: InputMaybe<Scalars['String']['input']>;
 };
 
 
 export type QueryUserPwdStrengthArgs = {
-  pwd: Scalars['String'];
+  pwd: Scalars['String']['input'];
 };
 
 
 export type QueryUserSearchArgs = {
-  archived?: InputMaybe<Scalars['Boolean']>;
-  cursor?: InputMaybe<Scalars['String']>;
-  emailOnly?: InputMaybe<Scalars['Boolean']>;
-  limit?: Scalars['Int'];
-  query: Scalars['String'];
+  archived?: InputMaybe<Scalars['Boolean']['input']>;
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  emailOnly?: InputMaybe<Scalars['Boolean']['input']>;
+  limit?: Scalars['Int']['input'];
+  query: Scalars['String']['input'];
 };
 
 /** Deprecated: Used by old stream-based mutations */
 export type ReplyCreateInput = {
   /** IDs of uploaded blobs that should be attached to this reply */
-  blobIds: Array<Scalars['String']>;
-  data?: InputMaybe<Scalars['JSONObject']>;
-  parentComment: Scalars['String'];
-  streamId: Scalars['String'];
+  blobIds: Array<Scalars['String']['input']>;
+  data?: InputMaybe<Scalars['JSONObject']['input']>;
+  parentComment: Scalars['String']['input'];
+  streamId: Scalars['String']['input'];
   /** ProseMirror document object */
-  text?: InputMaybe<Scalars['JSONObject']>;
+  text?: InputMaybe<Scalars['JSONObject']['input']>;
 };
 
 export type ResourceIdentifier = {
   __typename?: 'ResourceIdentifier';
-  resourceId: Scalars['String'];
+  resourceId: Scalars['String']['output'];
   resourceType: ResourceType;
 };
 
 export type ResourceIdentifierInput = {
-  resourceId: Scalars['String'];
+  resourceId: Scalars['String']['input'];
   resourceType: ResourceType;
 };
 
@@ -2046,107 +2383,113 @@ export enum ResourceType {
 
 export type Role = {
   __typename?: 'Role';
-  description: Scalars['String'];
-  name: Scalars['String'];
-  resourceTarget: Scalars['String'];
+  description: Scalars['String']['output'];
+  name: Scalars['String']['output'];
+  resourceTarget: Scalars['String']['output'];
 };
 
 /** Available scopes. */
 export type Scope = {
   __typename?: 'Scope';
-  description: Scalars['String'];
-  name: Scalars['String'];
+  description: Scalars['String']['output'];
+  name: Scalars['String']['output'];
 };
 
 export type SelectedCommentMetaData = {
   __typename?: 'SelectedCommentMetaData';
-  id: Scalars['String'];
-  selectionLocation: Scalars['JSONObject'];
+  id: Scalars['String']['output'];
+  selectionLocation: Scalars['JSONObject']['output'];
 };
 
 export type ServerApp = {
   __typename?: 'ServerApp';
   author?: Maybe<AppAuthor>;
-  createdAt: Scalars['DateTime'];
-  description?: Maybe<Scalars['String']>;
-  id: Scalars['String'];
-  logo?: Maybe<Scalars['String']>;
-  name: Scalars['String'];
-  public?: Maybe<Scalars['Boolean']>;
-  redirectUrl: Scalars['String'];
+  createdAt: Scalars['DateTime']['output'];
+  description?: Maybe<Scalars['String']['output']>;
+  id: Scalars['String']['output'];
+  logo?: Maybe<Scalars['String']['output']>;
+  name: Scalars['String']['output'];
+  public?: Maybe<Scalars['Boolean']['output']>;
+  redirectUrl: Scalars['String']['output'];
   scopes: Array<Scope>;
-  secret?: Maybe<Scalars['String']>;
-  termsAndConditionsLink?: Maybe<Scalars['String']>;
-  trustByDefault?: Maybe<Scalars['Boolean']>;
+  secret?: Maybe<Scalars['String']['output']>;
+  termsAndConditionsLink?: Maybe<Scalars['String']['output']>;
+  trustByDefault?: Maybe<Scalars['Boolean']['output']>;
 };
 
 export type ServerAppListItem = {
   __typename?: 'ServerAppListItem';
   author?: Maybe<AppAuthor>;
-  description?: Maybe<Scalars['String']>;
-  id: Scalars['String'];
-  logo?: Maybe<Scalars['String']>;
-  name: Scalars['String'];
-  redirectUrl: Scalars['String'];
-  termsAndConditionsLink?: Maybe<Scalars['String']>;
-  trustByDefault?: Maybe<Scalars['Boolean']>;
+  description?: Maybe<Scalars['String']['output']>;
+  id: Scalars['String']['output'];
+  logo?: Maybe<Scalars['String']['output']>;
+  name: Scalars['String']['output'];
+  redirectUrl: Scalars['String']['output'];
+  termsAndConditionsLink?: Maybe<Scalars['String']['output']>;
+  trustByDefault?: Maybe<Scalars['Boolean']['output']>;
+};
+
+export type ServerAutomateInfo = {
+  __typename?: 'ServerAutomateInfo';
+  availableFunctionTemplates: Array<AutomateFunctionTemplate>;
 };
 
 /** Information about this server. */
 export type ServerInfo = {
   __typename?: 'ServerInfo';
-  adminContact?: Maybe<Scalars['String']>;
+  adminContact?: Maybe<Scalars['String']['output']>;
   /** The authentication strategies available on this server. */
   authStrategies: Array<AuthStrategy>;
+  automate: ServerAutomateInfo;
   /** Base URL of Speckle Automate, if set */
-  automateUrl?: Maybe<Scalars['String']>;
-  blobSizeLimitBytes: Scalars['Int'];
-  canonicalUrl?: Maybe<Scalars['String']>;
-  company?: Maybe<Scalars['String']>;
-  description?: Maybe<Scalars['String']>;
+  automateUrl?: Maybe<Scalars['String']['output']>;
+  blobSizeLimitBytes: Scalars['Int']['output'];
+  canonicalUrl?: Maybe<Scalars['String']['output']>;
+  company?: Maybe<Scalars['String']['output']>;
+  description?: Maybe<Scalars['String']['output']>;
   /** Whether or not to show messaging about FE2 (banners etc.) */
-  enableNewWebUiMessaging?: Maybe<Scalars['Boolean']>;
-  guestModeEnabled: Scalars['Boolean'];
-  inviteOnly?: Maybe<Scalars['Boolean']>;
+  enableNewWebUiMessaging?: Maybe<Scalars['Boolean']['output']>;
+  guestModeEnabled: Scalars['Boolean']['output'];
+  inviteOnly?: Maybe<Scalars['Boolean']['output']>;
   /** Server relocation / migration info */
   migration?: Maybe<ServerMigration>;
-  name: Scalars['String'];
+  name: Scalars['String']['output'];
   /** @deprecated Use role constants from the @speckle/shared npm package instead */
   roles: Array<Role>;
   scopes: Array<Scope>;
   serverRoles: Array<ServerRoleItem>;
-  termsOfService?: Maybe<Scalars['String']>;
-  version?: Maybe<Scalars['String']>;
+  termsOfService?: Maybe<Scalars['String']['output']>;
+  version?: Maybe<Scalars['String']['output']>;
 };
 
 export type ServerInfoUpdateInput = {
-  adminContact?: InputMaybe<Scalars['String']>;
-  company?: InputMaybe<Scalars['String']>;
-  description?: InputMaybe<Scalars['String']>;
-  guestModeEnabled?: InputMaybe<Scalars['Boolean']>;
-  inviteOnly?: InputMaybe<Scalars['Boolean']>;
-  name: Scalars['String'];
-  termsOfService?: InputMaybe<Scalars['String']>;
+  adminContact?: InputMaybe<Scalars['String']['input']>;
+  company?: InputMaybe<Scalars['String']['input']>;
+  description?: InputMaybe<Scalars['String']['input']>;
+  guestModeEnabled?: InputMaybe<Scalars['Boolean']['input']>;
+  inviteOnly?: InputMaybe<Scalars['Boolean']['input']>;
+  name: Scalars['String']['input'];
+  termsOfService?: InputMaybe<Scalars['String']['input']>;
 };
 
 export type ServerInvite = {
   __typename?: 'ServerInvite';
-  email: Scalars['String'];
-  id: Scalars['String'];
+  email: Scalars['String']['output'];
+  id: Scalars['String']['output'];
   invitedBy: LimitedUser;
 };
 
 export type ServerInviteCreateInput = {
-  email: Scalars['String'];
-  message?: InputMaybe<Scalars['String']>;
+  email: Scalars['String']['input'];
+  message?: InputMaybe<Scalars['String']['input']>;
   /** Can only be specified if guest mode is on or if the user is an admin */
-  serverRole?: InputMaybe<Scalars['String']>;
+  serverRole?: InputMaybe<Scalars['String']['input']>;
 };
 
 export type ServerMigration = {
   __typename?: 'ServerMigration';
-  movedFrom?: Maybe<Scalars['String']>;
-  movedTo?: Maybe<Scalars['String']>;
+  movedFrom?: Maybe<Scalars['String']['output']>;
+  movedTo?: Maybe<Scalars['String']['output']>;
 };
 
 export enum ServerRole {
@@ -2158,31 +2501,31 @@ export enum ServerRole {
 
 export type ServerRoleItem = {
   __typename?: 'ServerRoleItem';
-  id: Scalars['String'];
-  title: Scalars['String'];
+  id: Scalars['String']['output'];
+  title: Scalars['String']['output'];
 };
 
 export type ServerStatistics = {
   __typename?: 'ServerStatistics';
-  totalPendingInvites: Scalars['Int'];
-  totalProjectCount: Scalars['Int'];
-  totalUserCount: Scalars['Int'];
+  totalPendingInvites: Scalars['Int']['output'];
+  totalProjectCount: Scalars['Int']['output'];
+  totalUserCount: Scalars['Int']['output'];
 };
 
 export type ServerStats = {
   __typename?: 'ServerStats';
   /** An array of objects currently structured as { created_month: Date, count: int }. */
-  commitHistory?: Maybe<Array<Maybe<Scalars['JSONObject']>>>;
+  commitHistory?: Maybe<Array<Maybe<Scalars['JSONObject']['output']>>>;
   /** An array of objects currently structured as { created_month: Date, count: int }. */
-  objectHistory?: Maybe<Array<Maybe<Scalars['JSONObject']>>>;
+  objectHistory?: Maybe<Array<Maybe<Scalars['JSONObject']['output']>>>;
   /** An array of objects currently structured as { created_month: Date, count: int }. */
-  streamHistory?: Maybe<Array<Maybe<Scalars['JSONObject']>>>;
-  totalCommitCount: Scalars['Int'];
-  totalObjectCount: Scalars['Int'];
-  totalStreamCount: Scalars['Int'];
-  totalUserCount: Scalars['Int'];
+  streamHistory?: Maybe<Array<Maybe<Scalars['JSONObject']['output']>>>;
+  totalCommitCount: Scalars['Int']['output'];
+  totalObjectCount: Scalars['Int']['output'];
+  totalStreamCount: Scalars['Int']['output'];
+  totalUserCount: Scalars['Int']['output'];
   /** An array of objects currently structured as { created_month: Date, count: int }. */
-  userHistory?: Maybe<Array<Maybe<Scalars['JSONObject']>>>;
+  userHistory?: Maybe<Array<Maybe<Scalars['JSONObject']['output']>>>;
 };
 
 export type SmartTextEditorValue = {
@@ -2193,11 +2536,11 @@ export type SmartTextEditorValue = {
    * The actual (ProseMirror) document representing the text. Can be empty,
    * if there are attachments.
    */
-  doc?: Maybe<Scalars['JSONObject']>;
+  doc?: Maybe<Scalars['JSONObject']['output']>;
   /** The type of editor value (comment, blog post etc.) */
-  type: Scalars['String'];
+  type: Scalars['String']['output'];
   /** The version of the schema */
-  version: Scalars['String'];
+  version: Scalars['String']['output'];
 };
 
 export enum SortDirection {
@@ -2209,7 +2552,7 @@ export type Stream = {
   __typename?: 'Stream';
   /** All the recent activity on this stream in chronological order */
   activity?: Maybe<ActivityCollection>;
-  allowPublicComments: Scalars['Boolean'];
+  allowPublicComments: Scalars['Boolean']['output'];
   blob?: Maybe<BlobMetadata>;
   /** Get the metadata collection of blobs stored for this stream. */
   blobs?: Maybe<BlobMetadataCollection>;
@@ -2226,154 +2569,154 @@ export type Stream = {
    *   }
    * ```
    */
-  commentCount: Scalars['Int'];
+  commentCount: Scalars['Int']['output'];
   commit?: Maybe<Commit>;
   commits?: Maybe<CommitCollection>;
-  createdAt: Scalars['DateTime'];
-  description?: Maybe<Scalars['String']>;
+  createdAt: Scalars['DateTime']['output'];
+  description?: Maybe<Scalars['String']['output']>;
   /** Date when you favorited this stream. `null` if stream isn't viewed from a specific user's perspective or if it isn't favorited. */
-  favoritedDate?: Maybe<Scalars['DateTime']>;
-  favoritesCount: Scalars['Int'];
+  favoritedDate?: Maybe<Scalars['DateTime']['output']>;
+  favoritesCount: Scalars['Int']['output'];
   /** Returns a specific file upload that belongs to this stream. */
   fileUpload?: Maybe<FileUpload>;
   /** Returns a list of all the file uploads for this stream. */
   fileUploads: Array<FileUpload>;
-  id: Scalars['String'];
+  id: Scalars['String']['output'];
   /**
    * Whether the stream (if public) can be found on public stream exploration pages
    * and searches
    */
-  isDiscoverable: Scalars['Boolean'];
+  isDiscoverable: Scalars['Boolean']['output'];
   /** Whether the stream can be viewed by non-contributors */
-  isPublic: Scalars['Boolean'];
-  name: Scalars['String'];
+  isPublic: Scalars['Boolean']['output'];
+  name: Scalars['String']['output'];
   object?: Maybe<Object>;
   /** Pending stream access requests */
   pendingAccessRequests?: Maybe<Array<StreamAccessRequest>>;
   /** Collaborators who have been invited, but not yet accepted. */
   pendingCollaborators?: Maybe<Array<PendingStreamCollaborator>>;
   /** Your role for this stream. `null` if request is not authenticated, or the stream is not explicitly shared with you. */
-  role?: Maybe<Scalars['String']>;
-  size?: Maybe<Scalars['String']>;
-  updatedAt: Scalars['DateTime'];
+  role?: Maybe<Scalars['String']['output']>;
+  size?: Maybe<Scalars['String']['output']>;
+  updatedAt: Scalars['DateTime']['output'];
   webhooks: WebhookCollection;
 };
 
 
 export type StreamActivityArgs = {
-  actionType?: InputMaybe<Scalars['String']>;
-  after?: InputMaybe<Scalars['DateTime']>;
-  before?: InputMaybe<Scalars['DateTime']>;
-  cursor?: InputMaybe<Scalars['DateTime']>;
-  limit?: Scalars['Int'];
+  actionType?: InputMaybe<Scalars['String']['input']>;
+  after?: InputMaybe<Scalars['DateTime']['input']>;
+  before?: InputMaybe<Scalars['DateTime']['input']>;
+  cursor?: InputMaybe<Scalars['DateTime']['input']>;
+  limit?: Scalars['Int']['input'];
 };
 
 
 export type StreamBlobArgs = {
-  id: Scalars['String'];
+  id: Scalars['String']['input'];
 };
 
 
 export type StreamBlobsArgs = {
-  cursor?: InputMaybe<Scalars['String']>;
-  limit?: InputMaybe<Scalars['Int']>;
-  query?: InputMaybe<Scalars['String']>;
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  limit?: InputMaybe<Scalars['Int']['input']>;
+  query?: InputMaybe<Scalars['String']['input']>;
 };
 
 
 export type StreamBranchArgs = {
-  name?: InputMaybe<Scalars['String']>;
+  name?: InputMaybe<Scalars['String']['input']>;
 };
 
 
 export type StreamBranchesArgs = {
-  cursor?: InputMaybe<Scalars['String']>;
-  limit?: Scalars['Int'];
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  limit?: Scalars['Int']['input'];
 };
 
 
 export type StreamCommitArgs = {
-  id?: InputMaybe<Scalars['String']>;
+  id?: InputMaybe<Scalars['String']['input']>;
 };
 
 
 export type StreamCommitsArgs = {
-  cursor?: InputMaybe<Scalars['String']>;
-  limit?: Scalars['Int'];
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  limit?: Scalars['Int']['input'];
 };
 
 
 export type StreamFileUploadArgs = {
-  id: Scalars['String'];
+  id: Scalars['String']['input'];
 };
 
 
 export type StreamObjectArgs = {
-  id: Scalars['String'];
+  id: Scalars['String']['input'];
 };
 
 
 export type StreamWebhooksArgs = {
-  id?: InputMaybe<Scalars['String']>;
+  id?: InputMaybe<Scalars['String']['input']>;
 };
 
 /** Created when a user requests to become a contributor on a stream */
 export type StreamAccessRequest = {
   __typename?: 'StreamAccessRequest';
-  createdAt: Scalars['DateTime'];
-  id: Scalars['ID'];
+  createdAt: Scalars['DateTime']['output'];
+  id: Scalars['ID']['output'];
   requester: LimitedUser;
-  requesterId: Scalars['String'];
+  requesterId: Scalars['String']['output'];
   /** Can only be selected if authed user has proper access */
   stream: Stream;
-  streamId: Scalars['String'];
+  streamId: Scalars['String']['output'];
 };
 
 export type StreamCollaborator = {
   __typename?: 'StreamCollaborator';
-  avatar?: Maybe<Scalars['String']>;
-  company?: Maybe<Scalars['String']>;
-  id: Scalars['String'];
-  name: Scalars['String'];
-  role: Scalars['String'];
-  serverRole: Scalars['String'];
+  avatar?: Maybe<Scalars['String']['output']>;
+  company?: Maybe<Scalars['String']['output']>;
+  id: Scalars['String']['output'];
+  name: Scalars['String']['output'];
+  role: Scalars['String']['output'];
+  serverRole: Scalars['String']['output'];
 };
 
 export type StreamCollection = {
   __typename?: 'StreamCollection';
-  cursor?: Maybe<Scalars['String']>;
+  cursor?: Maybe<Scalars['String']['output']>;
   items?: Maybe<Array<Stream>>;
-  totalCount: Scalars['Int'];
+  totalCount: Scalars['Int']['output'];
 };
 
 export type StreamCreateInput = {
-  description?: InputMaybe<Scalars['String']>;
+  description?: InputMaybe<Scalars['String']['input']>;
   /**
    * Whether the stream (if public) can be found on public stream exploration pages
    * and searches
    */
-  isDiscoverable?: InputMaybe<Scalars['Boolean']>;
+  isDiscoverable?: InputMaybe<Scalars['Boolean']['input']>;
   /** Whether the stream can be viewed by non-contributors */
-  isPublic?: InputMaybe<Scalars['Boolean']>;
-  name?: InputMaybe<Scalars['String']>;
+  isPublic?: InputMaybe<Scalars['Boolean']['input']>;
+  name?: InputMaybe<Scalars['String']['input']>;
   /** Optionally specify user IDs of users that you want to invite to be contributors to this stream */
-  withContributors?: InputMaybe<Array<Scalars['String']>>;
+  withContributors?: InputMaybe<Array<Scalars['String']['input']>>;
 };
 
 export type StreamInviteCreateInput = {
-  email?: InputMaybe<Scalars['String']>;
-  message?: InputMaybe<Scalars['String']>;
+  email?: InputMaybe<Scalars['String']['input']>;
+  message?: InputMaybe<Scalars['String']['input']>;
   /** Defaults to the contributor role, if not specified */
-  role?: InputMaybe<Scalars['String']>;
+  role?: InputMaybe<Scalars['String']['input']>;
   /** Can only be specified if guest mode is on or if the user is an admin */
-  serverRole?: InputMaybe<Scalars['String']>;
-  streamId: Scalars['String'];
-  userId?: InputMaybe<Scalars['String']>;
+  serverRole?: InputMaybe<Scalars['String']['input']>;
+  streamId: Scalars['String']['input'];
+  userId?: InputMaybe<Scalars['String']['input']>;
 };
 
 export type StreamRevokePermissionInput = {
-  streamId: Scalars['String'];
-  userId: Scalars['String'];
+  streamId: Scalars['String']['input'];
+  userId: Scalars['String']['input'];
 };
 
 export enum StreamRole {
@@ -2383,35 +2726,35 @@ export enum StreamRole {
 }
 
 export type StreamUpdateInput = {
-  allowPublicComments?: InputMaybe<Scalars['Boolean']>;
-  description?: InputMaybe<Scalars['String']>;
-  id: Scalars['String'];
+  allowPublicComments?: InputMaybe<Scalars['Boolean']['input']>;
+  description?: InputMaybe<Scalars['String']['input']>;
+  id: Scalars['String']['input'];
   /**
    * Whether the stream (if public) can be found on public stream exploration pages
    * and searches
    */
-  isDiscoverable?: InputMaybe<Scalars['Boolean']>;
+  isDiscoverable?: InputMaybe<Scalars['Boolean']['input']>;
   /** Whether the stream can be viewed by non-contributors */
-  isPublic?: InputMaybe<Scalars['Boolean']>;
-  name?: InputMaybe<Scalars['String']>;
+  isPublic?: InputMaybe<Scalars['Boolean']['input']>;
+  name?: InputMaybe<Scalars['String']['input']>;
 };
 
 export type StreamUpdatePermissionInput = {
-  role: Scalars['String'];
-  streamId: Scalars['String'];
-  userId: Scalars['String'];
+  role: Scalars['String']['input'];
+  streamId: Scalars['String']['input'];
+  userId: Scalars['String']['input'];
 };
 
 export type Subscription = {
   __typename?: 'Subscription';
   /** It's lonely in the void. */
-  _?: Maybe<Scalars['String']>;
+  _?: Maybe<Scalars['String']['output']>;
   /** Subscribe to branch created event */
-  branchCreated?: Maybe<Scalars['JSONObject']>;
+  branchCreated?: Maybe<Scalars['JSONObject']['output']>;
   /** Subscribe to branch deleted event */
-  branchDeleted?: Maybe<Scalars['JSONObject']>;
+  branchDeleted?: Maybe<Scalars['JSONObject']['output']>;
   /** Subscribe to branch updated event. */
-  branchUpdated?: Maybe<Scalars['JSONObject']>;
+  branchUpdated?: Maybe<Scalars['JSONObject']['output']>;
   /**
    * Subscribe to new comment events. There's two ways to use this subscription:
    * - for a whole stream: do not pass in any resourceIds; this sub will get called whenever a comment (not reply) is added to any of the stream's resources.
@@ -2427,12 +2770,13 @@ export type Subscription = {
    */
   commentThreadActivity: CommentThreadActivityMessage;
   /** Subscribe to commit created event */
-  commitCreated?: Maybe<Scalars['JSONObject']>;
+  commitCreated?: Maybe<Scalars['JSONObject']['output']>;
   /** Subscribe to commit deleted event */
-  commitDeleted?: Maybe<Scalars['JSONObject']>;
+  commitDeleted?: Maybe<Scalars['JSONObject']['output']>;
   /** Subscribe to commit updated event. */
-  commitUpdated?: Maybe<Scalars['JSONObject']>;
-  projectAutomationsStatusUpdated: ProjectAutomationsStatusUpdatedMessage;
+  commitUpdated?: Maybe<Scalars['JSONObject']['output']>;
+  /** Subscribe to updates to automations in the project */
+  projectAutomationsUpdated: ProjectAutomationsUpdatedMessage;
   /**
    * Subscribe to updates to resource comments/threads. Optionally specify resource ID string to only receive
    * updates regarding comments for those resources.
@@ -2446,84 +2790,88 @@ export type Subscription = {
   projectPendingModelsUpdated: ProjectPendingModelsUpdatedMessage;
   /** Subscribe to changes to a project's pending versions */
   projectPendingVersionsUpdated: ProjectPendingVersionsUpdatedMessage;
+  /** Subscribe to updates to any triggered automations statuses in the project */
+  projectTriggeredAutomationsStatusUpdated: ProjectTriggeredAutomationsStatusUpdatedMessage;
   /** Track updates to a specific project */
   projectUpdated: ProjectUpdatedMessage;
+  projectVersionGendoAIRenderCreated: GendoAiRender;
+  projectVersionGendoAIRenderUpdated: GendoAiRender;
   /** Subscribe to when a project's versions get their preview image fully generated. */
   projectVersionsPreviewGenerated: ProjectVersionsPreviewGeneratedMessage;
   /** Subscribe to changes to a project's versions. */
   projectVersionsUpdated: ProjectVersionsUpdatedMessage;
   /** Subscribes to stream deleted event. Use this in clients/components that pertain only to this stream. */
-  streamDeleted?: Maybe<Scalars['JSONObject']>;
+  streamDeleted?: Maybe<Scalars['JSONObject']['output']>;
   /** Subscribes to stream updated event. Use this in clients/components that pertain only to this stream. */
-  streamUpdated?: Maybe<Scalars['JSONObject']>;
+  streamUpdated?: Maybe<Scalars['JSONObject']['output']>;
   /** Track newly added or deleted projects owned by the active user */
   userProjectsUpdated: UserProjectsUpdatedMessage;
   /**
    * Subscribes to new stream added event for your profile. Use this to display an up-to-date list of streams.
    * **NOTE**: If someone shares a stream with you, this subscription will be triggered with an extra value of `sharedBy` in the payload.
    */
-  userStreamAdded?: Maybe<Scalars['JSONObject']>;
+  userStreamAdded?: Maybe<Scalars['JSONObject']['output']>;
   /**
    * Subscribes to stream removed event for your profile. Use this to display an up-to-date list of streams for your profile.
    * **NOTE**: If someone revokes your permissions on a stream, this subscription will be triggered with an extra value of `revokedBy` in the payload.
    */
-  userStreamRemoved?: Maybe<Scalars['JSONObject']>;
+  userStreamRemoved?: Maybe<Scalars['JSONObject']['output']>;
   /**
    * Broadcasts "real-time" location data for viewer users.
    * @deprecated Use viewerUserActivityBroadcasted
    */
-  userViewerActivity?: Maybe<Scalars['JSONObject']>;
+  userViewerActivity?: Maybe<Scalars['JSONObject']['output']>;
   /** Track user activities in the viewer relating to the specified resources */
   viewerUserActivityBroadcasted: ViewerUserActivityMessage;
 };
 
 
 export type SubscriptionBranchCreatedArgs = {
-  streamId: Scalars['String'];
+  streamId: Scalars['String']['input'];
 };
 
 
 export type SubscriptionBranchDeletedArgs = {
-  streamId: Scalars['String'];
+  streamId: Scalars['String']['input'];
 };
 
 
 export type SubscriptionBranchUpdatedArgs = {
-  branchId?: InputMaybe<Scalars['String']>;
-  streamId: Scalars['String'];
+  branchId?: InputMaybe<Scalars['String']['input']>;
+  streamId: Scalars['String']['input'];
 };
 
 
 export type SubscriptionCommentActivityArgs = {
-  resourceIds?: InputMaybe<Array<InputMaybe<Scalars['String']>>>;
-  streamId: Scalars['String'];
+  resourceIds?: InputMaybe<Array<InputMaybe<Scalars['String']['input']>>>;
+  streamId: Scalars['String']['input'];
 };
 
 
 export type SubscriptionCommentThreadActivityArgs = {
-  commentId: Scalars['String'];
-  streamId: Scalars['String'];
+  commentId: Scalars['String']['input'];
+  streamId: Scalars['String']['input'];
 };
 
 
 export type SubscriptionCommitCreatedArgs = {
-  streamId: Scalars['String'];
+  streamId: Scalars['String']['input'];
 };
 
 
 export type SubscriptionCommitDeletedArgs = {
-  streamId: Scalars['String'];
+  streamId: Scalars['String']['input'];
 };
 
 
 export type SubscriptionCommitUpdatedArgs = {
-  commitId?: InputMaybe<Scalars['String']>;
-  streamId: Scalars['String'];
+  commitId?: InputMaybe<Scalars['String']['input']>;
+  streamId: Scalars['String']['input'];
 };
 
 
-export type SubscriptionProjectAutomationsStatusUpdatedArgs = {
-  projectId: Scalars['String'];
+export type SubscriptionProjectAutomationsUpdatedArgs = {
+  projectId: Scalars['String']['input'];
 };
 
 
@@ -2533,70 +2881,106 @@ export type SubscriptionProjectCommentsUpdatedArgs = {
 
 
 export type SubscriptionProjectFileImportUpdatedArgs = {
-  id: Scalars['String'];
+  id: Scalars['String']['input'];
 };
 
 
 export type SubscriptionProjectModelsUpdatedArgs = {
-  id: Scalars['String'];
-  modelIds?: InputMaybe<Array<Scalars['String']>>;
+  id: Scalars['String']['input'];
+  modelIds?: InputMaybe<Array<Scalars['String']['input']>>;
 };
 
 
 export type SubscriptionProjectPendingModelsUpdatedArgs = {
-  id: Scalars['String'];
+  id: Scalars['String']['input'];
 };
 
 
 export type SubscriptionProjectPendingVersionsUpdatedArgs = {
-  id: Scalars['String'];
+  id: Scalars['String']['input'];
+};
+
+
+export type SubscriptionProjectTriggeredAutomationsStatusUpdatedArgs = {
+  projectId: Scalars['String']['input'];
 };
 
 
 export type SubscriptionProjectUpdatedArgs = {
-  id: Scalars['String'];
+  id: Scalars['String']['input'];
+};
+
+
+export type SubscriptionProjectVersionGendoAiRenderCreatedArgs = {
+  id: Scalars['String']['input'];
+  versionId: Scalars['String']['input'];
+};
+
+
+export type SubscriptionProjectVersionGendoAiRenderUpdatedArgs = {
+  id: Scalars['String']['input'];
+  versionId: Scalars['String']['input'];
 };
 
 
 export type SubscriptionProjectVersionsPreviewGeneratedArgs = {
-  id: Scalars['String'];
+  id: Scalars['String']['input'];
 };
 
 
 export type SubscriptionProjectVersionsUpdatedArgs = {
-  id: Scalars['String'];
+  id: Scalars['String']['input'];
 };
 
 
 export type SubscriptionStreamDeletedArgs = {
-  streamId?: InputMaybe<Scalars['String']>;
+  streamId?: InputMaybe<Scalars['String']['input']>;
 };
 
 
 export type SubscriptionStreamUpdatedArgs = {
-  streamId?: InputMaybe<Scalars['String']>;
+  streamId?: InputMaybe<Scalars['String']['input']>;
 };
 
 
 export type SubscriptionUserViewerActivityArgs = {
-  resourceId: Scalars['String'];
-  streamId: Scalars['String'];
+  resourceId: Scalars['String']['input'];
+  streamId: Scalars['String']['input'];
 };
 
 
 export type SubscriptionViewerUserActivityBroadcastedArgs = {
-  sessionId?: InputMaybe<Scalars['String']>;
+  sessionId?: InputMaybe<Scalars['String']['input']>;
   target: ViewerUpdateTrackingTarget;
 };
 
+export type TestAutomationRun = {
+  __typename?: 'TestAutomationRun';
+  automationRunId: Scalars['String']['output'];
+  functionRunId: Scalars['String']['output'];
+  triggers: Array<TestAutomationRunTrigger>;
+};
+
+export type TestAutomationRunTrigger = {
+  __typename?: 'TestAutomationRunTrigger';
+  payload: TestAutomationRunTriggerPayload;
+  triggerType: Scalars['String']['output'];
+};
+
+export type TestAutomationRunTriggerPayload = {
+  __typename?: 'TestAutomationRunTriggerPayload';
+  modelId: Scalars['String']['output'];
+  versionId: Scalars['String']['output'];
+};
+
 export type TokenResourceIdentifier = {
   __typename?: 'TokenResourceIdentifier';
-  id: Scalars['String'];
+  id: Scalars['String']['output'];
   type: TokenResourceIdentifierType;
 };
 
 export type TokenResourceIdentifierInput = {
-  id: Scalars['String'];
+  id: Scalars['String']['input'];
   type: TokenResourceIdentifierType;
 };
 
@@ -2604,17 +2988,36 @@ export enum TokenResourceIdentifierType {
   Project = 'project'
 }
 
+export type TriggeredAutomationsStatus = {
+  __typename?: 'TriggeredAutomationsStatus';
+  automationRuns: Array<AutomateRun>;
+  id: Scalars['ID']['output'];
+  status: AutomateRunStatus;
+  statusMessage?: Maybe<Scalars['String']['output']>;
+};
+
+/** Any null values will be ignored */
+export type UpdateAutomateFunctionInput = {
+  description?: InputMaybe<Scalars['String']['input']>;
+  id: Scalars['ID']['input'];
+  logo?: InputMaybe<Scalars['String']['input']>;
+  name?: InputMaybe<Scalars['String']['input']>;
+  /** SourceAppNames values from @speckle/shared */
+  supportedSourceApps?: InputMaybe<Array<Scalars['String']['input']>>;
+  tags?: InputMaybe<Array<Scalars['String']['input']>>;
+};
+
 export type UpdateModelInput = {
-  description?: InputMaybe<Scalars['String']>;
-  id: Scalars['ID'];
-  name?: InputMaybe<Scalars['String']>;
-  projectId: Scalars['ID'];
+  description?: InputMaybe<Scalars['String']['input']>;
+  id: Scalars['ID']['input'];
+  name?: InputMaybe<Scalars['String']['input']>;
+  projectId: Scalars['ID']['input'];
 };
 
 /** Only non-null values will be updated */
 export type UpdateVersionInput = {
-  message?: InputMaybe<Scalars['String']>;
-  versionId: Scalars['String'];
+  message?: InputMaybe<Scalars['String']['input']>;
+  versionId: Scalars['String']['input'];
 };
 
 /**
@@ -2629,36 +3032,37 @@ export type User = {
   apiTokens: Array<ApiToken>;
   /** Returns the apps you have authorized. */
   authorizedApps?: Maybe<Array<ServerAppListItem>>;
-  avatar?: Maybe<Scalars['String']>;
-  bio?: Maybe<Scalars['String']>;
+  automateInfo: UserAutomateInfo;
+  avatar?: Maybe<Scalars['String']['output']>;
+  bio?: Maybe<Scalars['String']['output']>;
   /**
    * Get commits authored by the user. If requested for another user, then only commits
    * from public streams will be returned.
    */
   commits?: Maybe<CommitCollection>;
-  company?: Maybe<Scalars['String']>;
+  company?: Maybe<Scalars['String']['output']>;
   /** Returns the apps you have created. */
   createdApps?: Maybe<Array<ServerApp>>;
-  createdAt?: Maybe<Scalars['DateTime']>;
-  email?: Maybe<Scalars['String']>;
+  createdAt?: Maybe<Scalars['DateTime']['output']>;
+  email?: Maybe<Scalars['String']['output']>;
   /**
    * All the streams that a active user has favorited.
    * Note: You can't use this to retrieve another user's favorite streams.
    */
   favoriteStreams: StreamCollection;
   /** Whether the user has a pending/active email verification token */
-  hasPendingVerification?: Maybe<Scalars['Boolean']>;
-  id: Scalars['ID'];
+  hasPendingVerification?: Maybe<Scalars['Boolean']['output']>;
+  id: Scalars['ID']['output'];
   /** Whether post-sign up onboarding has been finished or skipped entirely */
-  isOnboardingFinished?: Maybe<Scalars['Boolean']>;
-  name: Scalars['String'];
-  notificationPreferences: Scalars['JSONObject'];
-  profiles?: Maybe<Scalars['JSONObject']>;
+  isOnboardingFinished?: Maybe<Scalars['Boolean']['output']>;
+  name: Scalars['String']['output'];
+  notificationPreferences: Scalars['JSONObject']['output'];
+  profiles?: Maybe<Scalars['JSONObject']['output']>;
   /** Get all invitations to projects that the active user has */
   projectInvites: Array<PendingStreamCollaborator>;
   /** Get projects that the user participates in */
   projects: ProjectCollection;
-  role?: Maybe<Scalars['String']>;
+  role?: Maybe<Scalars['String']['output']>;
   /**
    * Returns all streams that the user is a collaborator on. If requested for a user, who isn't the
    * authenticated user, then this will only return discoverable streams.
@@ -2667,8 +3071,15 @@ export type User = {
   /** The user's timeline in chronological order */
   timeline?: Maybe<ActivityCollection>;
   /** Total amount of favorites attached to streams owned by the user */
-  totalOwnedStreamsFavorites: Scalars['Int'];
-  verified?: Maybe<Scalars['Boolean']>;
+  totalOwnedStreamsFavorites: Scalars['Int']['output'];
+  verified?: Maybe<Scalars['Boolean']['output']>;
+  /**
+   * Get (count of) user's versions. By default gets all versions of all projects the user has access to.
+   * Set authoredOnly=true to only retrieve versions authored by the user.
+   *
+   * Note: Only count resolution is currently implemented
+   */
+  versions: CountOnlyCollection;
 };
 
 
@@ -2677,11 +3088,11 @@ export type User = {
  * when a user is reading/writing info about himself
  */
 export type UserActivityArgs = {
-  actionType?: InputMaybe<Scalars['String']>;
-  after?: InputMaybe<Scalars['DateTime']>;
-  before?: InputMaybe<Scalars['DateTime']>;
-  cursor?: InputMaybe<Scalars['DateTime']>;
-  limit?: Scalars['Int'];
+  actionType?: InputMaybe<Scalars['String']['input']>;
+  after?: InputMaybe<Scalars['DateTime']['input']>;
+  before?: InputMaybe<Scalars['DateTime']['input']>;
+  cursor?: InputMaybe<Scalars['DateTime']['input']>;
+  limit?: Scalars['Int']['input'];
 };
 
 
@@ -2690,8 +3101,8 @@ export type UserActivityArgs = {
  * when a user is reading/writing info about himself
  */
 export type UserCommitsArgs = {
-  cursor?: InputMaybe<Scalars['String']>;
-  limit?: Scalars['Int'];
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  limit?: Scalars['Int']['input'];
 };
 
 
@@ -2700,8 +3111,8 @@ export type UserCommitsArgs = {
  * when a user is reading/writing info about himself
  */
 export type UserFavoriteStreamsArgs = {
-  cursor?: InputMaybe<Scalars['String']>;
-  limit?: Scalars['Int'];
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  limit?: Scalars['Int']['input'];
 };
 
 
@@ -2710,9 +3121,9 @@ export type UserFavoriteStreamsArgs = {
  * when a user is reading/writing info about himself
  */
 export type UserProjectsArgs = {
-  cursor?: InputMaybe<Scalars['String']>;
+  cursor?: InputMaybe<Scalars['String']['input']>;
   filter?: InputMaybe<UserProjectsFilter>;
-  limit?: Scalars['Int'];
+  limit?: Scalars['Int']['input'];
 };
 
 
@@ -2721,8 +3132,8 @@ export type UserProjectsArgs = {
  * when a user is reading/writing info about himself
  */
 export type UserStreamsArgs = {
-  cursor?: InputMaybe<Scalars['String']>;
-  limit?: Scalars['Int'];
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  limit?: Scalars['Int']['input'];
 };
 
 
@@ -2731,27 +3142,43 @@ export type UserStreamsArgs = {
  * when a user is reading/writing info about himself
  */
 export type UserTimelineArgs = {
-  after?: InputMaybe<Scalars['DateTime']>;
-  before?: InputMaybe<Scalars['DateTime']>;
-  cursor?: InputMaybe<Scalars['DateTime']>;
-  limit?: Scalars['Int'];
+  after?: InputMaybe<Scalars['DateTime']['input']>;
+  before?: InputMaybe<Scalars['DateTime']['input']>;
+  cursor?: InputMaybe<Scalars['DateTime']['input']>;
+  limit?: Scalars['Int']['input'];
+};
+
+
+/**
+ * Full user type, should only be used in the context of admin operations or
+ * when a user is reading/writing info about himself
+ */
+export type UserVersionsArgs = {
+  authoredOnly?: Scalars['Boolean']['input'];
+  limit?: Scalars['Int']['input'];
+};
+
+export type UserAutomateInfo = {
+  __typename?: 'UserAutomateInfo';
+  availableGithubOrgs: Array<Scalars['String']['output']>;
+  hasAutomateGithubApp: Scalars['Boolean']['output'];
 };
 
 export type UserDeleteInput = {
-  email: Scalars['String'];
+  email: Scalars['String']['input'];
 };
 
 export type UserProjectsFilter = {
   /** Only include projects where user has the specified roles */
-  onlyWithRoles?: InputMaybe<Array<Scalars['String']>>;
+  onlyWithRoles?: InputMaybe<Array<Scalars['String']['input']>>;
   /** Filter out projects by name */
-  search?: InputMaybe<Scalars['String']>;
+  search?: InputMaybe<Scalars['String']['input']>;
 };
 
 export type UserProjectsUpdatedMessage = {
   __typename?: 'UserProjectsUpdatedMessage';
   /** Project ID */
-  id: Scalars['String'];
+  id: Scalars['String']['output'];
   /** Project entity, null if project was deleted */
   project?: Maybe<Project>;
   /** Message type */
@@ -2764,57 +3191,78 @@ export enum UserProjectsUpdatedMessageType {
 }
 
 export type UserRoleInput = {
-  id: Scalars['String'];
-  role: Scalars['String'];
+  id: Scalars['String']['input'];
+  role: Scalars['String']['input'];
 };
 
 export type UserSearchResultCollection = {
   __typename?: 'UserSearchResultCollection';
-  cursor?: Maybe<Scalars['String']>;
+  cursor?: Maybe<Scalars['String']['output']>;
   items: Array<LimitedUser>;
 };
 
 export type UserUpdateInput = {
-  avatar?: InputMaybe<Scalars['String']>;
-  bio?: InputMaybe<Scalars['String']>;
-  company?: InputMaybe<Scalars['String']>;
-  name?: InputMaybe<Scalars['String']>;
+  avatar?: InputMaybe<Scalars['String']['input']>;
+  bio?: InputMaybe<Scalars['String']['input']>;
+  company?: InputMaybe<Scalars['String']['input']>;
+  name?: InputMaybe<Scalars['String']['input']>;
 };
 
 export type Version = {
   __typename?: 'Version';
   authorUser?: Maybe<LimitedUser>;
-  automationStatus?: Maybe<AutomationsStatus>;
+  automationsStatus?: Maybe<TriggeredAutomationsStatus>;
   /** All comment threads in this version */
   commentThreads: CommentCollection;
-  createdAt: Scalars['DateTime'];
-  id: Scalars['ID'];
-  message?: Maybe<Scalars['String']>;
+  createdAt: Scalars['DateTime']['output'];
+  gendoAIRender: GendoAiRender;
+  gendoAIRenders: GendoAiRenderCollection;
+  id: Scalars['ID']['output'];
+  message?: Maybe<Scalars['String']['output']>;
   model: Model;
-  parents?: Maybe<Array<Maybe<Scalars['String']>>>;
-  previewUrl: Scalars['String'];
-  referencedObject: Scalars['String'];
-  sourceApplication?: Maybe<Scalars['String']>;
-  totalChildrenCount?: Maybe<Scalars['Int']>;
+  parents?: Maybe<Array<Maybe<Scalars['String']['output']>>>;
+  previewUrl: Scalars['String']['output'];
+  referencedObject: Scalars['String']['output'];
+  sourceApplication?: Maybe<Scalars['String']['output']>;
+  totalChildrenCount?: Maybe<Scalars['Int']['output']>;
 };
 
 
 export type VersionCommentThreadsArgs = {
-  cursor?: InputMaybe<Scalars['String']>;
-  limit?: Scalars['Int'];
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  limit?: Scalars['Int']['input'];
+};
+
+
+export type VersionGendoAiRenderArgs = {
+  id: Scalars['String']['input'];
 };
 
 export type VersionCollection = {
   __typename?: 'VersionCollection';
-  cursor?: Maybe<Scalars['String']>;
+  cursor?: Maybe<Scalars['String']['output']>;
   items: Array<Version>;
-  totalCount: Scalars['Int'];
+  totalCount: Scalars['Int']['output'];
+};
+
+export type VersionCreatedTrigger = {
+  __typename?: 'VersionCreatedTrigger';
+  model?: Maybe<Model>;
+  type: AutomateRunTriggerType;
+  version?: Maybe<Version>;
+};
+
+export type VersionCreatedTriggerDefinition = {
+  __typename?: 'VersionCreatedTriggerDefinition';
+  model?: Maybe<Model>;
+  type: AutomateRunTriggerType;
 };
 
 export type VersionMutations = {
   __typename?: 'VersionMutations';
-  delete: Scalars['Boolean'];
+  delete: Scalars['Boolean']['output'];
   moveToModel: Model;
+  requestGendoAIRender: Scalars['Boolean']['output'];
   update: Version;
 };
 
@@ -2829,6 +3277,11 @@ export type VersionMutationsMoveToModelArgs = {
 };
 
 
+export type VersionMutationsRequestGendoAiRenderArgs = {
+  input: GendoAiRenderInput;
+};
+
+
 export type VersionMutationsUpdateArgs = {
   input: UpdateVersionInput;
 };
@@ -2836,7 +3289,7 @@ export type VersionMutationsUpdateArgs = {
 export type ViewerResourceGroup = {
   __typename?: 'ViewerResourceGroup';
   /** Resource identifier used to refer to a collection of resource items */
-  identifier: Scalars['String'];
+  identifier: Scalars['String']['output'];
   /** Viewer resources that the identifier refers to */
   items: Array<ViewerResourceItem>;
 };
@@ -2844,10 +3297,10 @@ export type ViewerResourceGroup = {
 export type ViewerResourceItem = {
   __typename?: 'ViewerResourceItem';
   /** Null if resource represents an object */
-  modelId?: Maybe<Scalars['String']>;
-  objectId: Scalars['String'];
+  modelId?: Maybe<Scalars['String']['output']>;
+  objectId: Scalars['String']['output'];
   /** Null if resource represents an object */
-  versionId?: Maybe<Scalars['String']>;
+  versionId?: Maybe<Scalars['String']['output']>;
 };
 
 export type ViewerUpdateTrackingTarget = {
@@ -2856,33 +3309,33 @@ export type ViewerUpdateTrackingTarget = {
    * and all updates to of all versions of any of the referenced models will be returned. If `loadedVersionsOnly` is
    * enabled, then only updates of loaded/referenced versions in resourceIdString will be returned.
    */
-  loadedVersionsOnly?: InputMaybe<Scalars['Boolean']>;
-  projectId: Scalars['String'];
+  loadedVersionsOnly?: InputMaybe<Scalars['Boolean']['input']>;
+  projectId: Scalars['String']['input'];
   /**
    * Only request updates to the resources identified by this
    * comma-delimited resouce string (same format that's used in the viewer URL)
    */
-  resourceIdString: Scalars['String'];
+  resourceIdString: Scalars['String']['input'];
 };
 
 export type ViewerUserActivityMessage = {
   __typename?: 'ViewerUserActivityMessage';
-  sessionId: Scalars['String'];
+  sessionId: Scalars['String']['output'];
   /** SerializedViewerState, only null if DISCONNECTED */
-  state?: Maybe<Scalars['JSONObject']>;
+  state?: Maybe<Scalars['JSONObject']['output']>;
   status: ViewerUserActivityStatus;
   user?: Maybe<LimitedUser>;
-  userId?: Maybe<Scalars['String']>;
-  userName: Scalars['String'];
+  userId?: Maybe<Scalars['String']['output']>;
+  userName: Scalars['String']['output'];
 };
 
 export type ViewerUserActivityMessageInput = {
-  sessionId: Scalars['String'];
+  sessionId: Scalars['String']['input'];
   /** SerializedViewerState, only null if DISCONNECTED */
-  state?: InputMaybe<Scalars['JSONObject']>;
+  state?: InputMaybe<Scalars['JSONObject']['input']>;
   status: ViewerUserActivityStatus;
-  userId?: InputMaybe<Scalars['String']>;
-  userName: Scalars['String'];
+  userId?: InputMaybe<Scalars['String']['input']>;
+  userName: Scalars['String']['input'];
 };
 
 export enum ViewerUserActivityStatus {
@@ -2892,86 +3345,86 @@ export enum ViewerUserActivityStatus {
 
 export type Webhook = {
   __typename?: 'Webhook';
-  description?: Maybe<Scalars['String']>;
-  enabled?: Maybe<Scalars['Boolean']>;
-  hasSecret: Scalars['Boolean'];
+  description?: Maybe<Scalars['String']['output']>;
+  enabled?: Maybe<Scalars['Boolean']['output']>;
+  hasSecret: Scalars['Boolean']['output'];
   history?: Maybe<WebhookEventCollection>;
-  id: Scalars['String'];
-  projectId: Scalars['String'];
-  streamId: Scalars['String'];
-  triggers: Array<Scalars['String']>;
-  url: Scalars['String'];
+  id: Scalars['String']['output'];
+  projectId: Scalars['String']['output'];
+  streamId: Scalars['String']['output'];
+  triggers: Array<Scalars['String']['output']>;
+  url: Scalars['String']['output'];
 };
 
 
 export type WebhookHistoryArgs = {
-  limit?: Scalars['Int'];
+  limit?: Scalars['Int']['input'];
 };
 
 export type WebhookCollection = {
   __typename?: 'WebhookCollection';
   items: Array<Webhook>;
-  totalCount: Scalars['Int'];
+  totalCount: Scalars['Int']['output'];
 };
 
 export type WebhookCreateInput = {
-  description?: InputMaybe<Scalars['String']>;
-  enabled?: InputMaybe<Scalars['Boolean']>;
-  secret?: InputMaybe<Scalars['String']>;
-  streamId: Scalars['String'];
-  triggers: Array<InputMaybe<Scalars['String']>>;
-  url: Scalars['String'];
+  description?: InputMaybe<Scalars['String']['input']>;
+  enabled?: InputMaybe<Scalars['Boolean']['input']>;
+  secret?: InputMaybe<Scalars['String']['input']>;
+  streamId: Scalars['String']['input'];
+  triggers: Array<InputMaybe<Scalars['String']['input']>>;
+  url: Scalars['String']['input'];
 };
 
 export type WebhookDeleteInput = {
-  id: Scalars['String'];
-  streamId: Scalars['String'];
+  id: Scalars['String']['input'];
+  streamId: Scalars['String']['input'];
 };
 
 export type WebhookEvent = {
   __typename?: 'WebhookEvent';
-  id: Scalars['String'];
-  lastUpdate: Scalars['DateTime'];
-  payload: Scalars['String'];
-  retryCount: Scalars['Int'];
-  status: Scalars['Int'];
-  statusInfo: Scalars['String'];
-  webhookId: Scalars['String'];
+  id: Scalars['String']['output'];
+  lastUpdate: Scalars['DateTime']['output'];
+  payload: Scalars['String']['output'];
+  retryCount: Scalars['Int']['output'];
+  status: Scalars['Int']['output'];
+  statusInfo: Scalars['String']['output'];
+  webhookId: Scalars['String']['output'];
 };
 
 export type WebhookEventCollection = {
   __typename?: 'WebhookEventCollection';
   items?: Maybe<Array<Maybe<WebhookEvent>>>;
-  totalCount?: Maybe<Scalars['Int']>;
+  totalCount?: Maybe<Scalars['Int']['output']>;
 };
 
 export type WebhookUpdateInput = {
-  description?: InputMaybe<Scalars['String']>;
-  enabled?: InputMaybe<Scalars['Boolean']>;
-  id: Scalars['String'];
-  secret?: InputMaybe<Scalars['String']>;
-  streamId: Scalars['String'];
-  triggers?: InputMaybe<Array<InputMaybe<Scalars['String']>>>;
-  url?: InputMaybe<Scalars['String']>;
+  description?: InputMaybe<Scalars['String']['input']>;
+  enabled?: InputMaybe<Scalars['Boolean']['input']>;
+  id: Scalars['String']['input'];
+  secret?: InputMaybe<Scalars['String']['input']>;
+  streamId: Scalars['String']['input'];
+  triggers?: InputMaybe<Array<InputMaybe<Scalars['String']['input']>>>;
+  url?: InputMaybe<Scalars['String']['input']>;
 };
 
 export type GetStreamAccessRequestQueryVariables = Exact<{
-  streamId: Scalars['String'];
+  streamId: Scalars['String']['input'];
 }>;
 
 
 export type GetStreamAccessRequestQuery = { __typename?: 'Query', streamAccessRequest?: { __typename?: 'StreamAccessRequest', id: string, streamId: string, createdAt: string } | null };
 
 export type CreateStreamAccessRequestMutationVariables = Exact<{
-  streamId: Scalars['String'];
+  streamId: Scalars['String']['input'];
 }>;
 
 
 export type CreateStreamAccessRequestMutation = { __typename?: 'Mutation', streamAccessRequestCreate: { __typename?: 'StreamAccessRequest', id: string, streamId: string, createdAt: string } };
 
 export type UseStreamAccessRequestMutationVariables = Exact<{
-  requestId: Scalars['String'];
-  accept: Scalars['Boolean'];
+  requestId: Scalars['String']['input'];
+  accept: Scalars['Boolean']['input'];
   role?: InputMaybe<StreamRole>;
 }>;
 
@@ -2979,24 +3432,24 @@ export type UseStreamAccessRequestMutationVariables = Exact<{
 export type UseStreamAccessRequestMutation = { __typename?: 'Mutation', streamAccessRequestUse: boolean };
 
 export type StreamWithBranchQueryVariables = Exact<{
-  streamId: Scalars['String'];
-  branchName: Scalars['String'];
-  cursor?: InputMaybe<Scalars['String']>;
+  streamId: Scalars['String']['input'];
+  branchName: Scalars['String']['input'];
+  cursor?: InputMaybe<Scalars['String']['input']>;
 }>;
 
 
 export type StreamWithBranchQuery = { __typename?: 'Query', stream?: { __typename?: 'Stream', id: string, name: string, role?: string | null, branch?: { __typename?: 'Branch', id: string, name: string, description?: string | null, commits?: { __typename?: 'CommitCollection', totalCount: number, cursor?: string | null, items?: Array<{ __typename?: 'Commit', id: string, authorName?: string | null, authorId?: string | null, authorAvatar?: string | null, sourceApplication?: string | null, message?: string | null, referencedObject: string, createdAt?: string | null, commentCount: number }> | null } | null } | null } | null };
 
 export type BranchCreatedSubscriptionVariables = Exact<{
-  streamId: Scalars['String'];
+  streamId: Scalars['String']['input'];
 }>;
 
 
 export type BranchCreatedSubscription = { __typename?: 'Subscription', branchCreated?: Record<string, unknown> | null };
 
 export type StreamAllBranchesQueryVariables = Exact<{
-  streamId: Scalars['String'];
-  cursor?: InputMaybe<Scalars['String']>;
+  streamId: Scalars['String']['input'];
+  cursor?: InputMaybe<Scalars['String']['input']>;
 }>;
 
 
@@ -3005,15 +3458,15 @@ export type StreamAllBranchesQuery = { __typename?: 'Query', stream?: { __typena
 export type CommentFullInfoFragment = { __typename?: 'Comment', id: string, archived: boolean, authorId: string, data?: Record<string, unknown> | null, screenshot?: string | null, createdAt: string, updatedAt: string, viewedAt?: string | null, text: { __typename?: 'SmartTextEditorValue', doc?: Record<string, unknown> | null, attachments?: Array<{ __typename?: 'BlobMetadata', id: string, fileName: string, streamId: string, fileType: string, fileSize?: number | null }> | null }, replies: { __typename?: 'CommentCollection', totalCount: number }, resources: Array<{ __typename?: 'ResourceIdentifier', resourceId: string, resourceType: ResourceType }> };
 
 export type StreamCommitQueryQueryVariables = Exact<{
-  streamId: Scalars['String'];
-  id: Scalars['String'];
+  streamId: Scalars['String']['input'];
+  id: Scalars['String']['input'];
 }>;
 
 
 export type StreamCommitQueryQuery = { __typename?: 'Query', stream?: { __typename?: 'Stream', id: string, name: string, role?: string | null, commit?: { __typename?: 'Commit', id: string, message?: string | null, referencedObject: string, authorName?: string | null, authorId?: string | null, authorAvatar?: string | null, createdAt?: string | null, branchName?: string | null, sourceApplication?: string | null } | null } | null };
 
 export type StreamBranchesSelectorQueryVariables = Exact<{
-  streamId: Scalars['String'];
+  streamId: Scalars['String']['input'];
 }>;
 
 
@@ -3052,8 +3505,8 @@ export type StreamCollaboratorFieldsFragment = { __typename?: 'StreamCollaborato
 export type UsersOwnInviteFieldsFragment = { __typename?: 'PendingStreamCollaborator', id: string, inviteId: string, streamId: string, streamName: string, token?: string | null, invitedBy: { __typename?: 'LimitedUser', id: string, name: string, bio?: string | null, company?: string | null, avatar?: string | null, verified?: boolean | null } };
 
 export type StreamInviteQueryVariables = Exact<{
-  streamId: Scalars['String'];
-  token?: InputMaybe<Scalars['String']>;
+  streamId: Scalars['String']['input'];
+  token?: InputMaybe<Scalars['String']['input']>;
 }>;
 
 
@@ -3065,31 +3518,31 @@ export type UserStreamInvitesQueryVariables = Exact<{ [key: string]: never; }>;
 export type UserStreamInvitesQuery = { __typename?: 'Query', streamInvites: Array<{ __typename?: 'PendingStreamCollaborator', id: string, inviteId: string, streamId: string, streamName: string, token?: string | null, invitedBy: { __typename?: 'LimitedUser', id: string, name: string, bio?: string | null, company?: string | null, avatar?: string | null, verified?: boolean | null } }> };
 
 export type UseStreamInviteMutationVariables = Exact<{
-  accept: Scalars['Boolean'];
-  streamId: Scalars['String'];
-  token: Scalars['String'];
+  accept: Scalars['Boolean']['input'];
+  streamId: Scalars['String']['input'];
+  token: Scalars['String']['input'];
 }>;
 
 
 export type UseStreamInviteMutation = { __typename?: 'Mutation', streamInviteUse: boolean };
 
 export type CancelStreamInviteMutationVariables = Exact<{
-  streamId: Scalars['String'];
-  inviteId: Scalars['String'];
+  streamId: Scalars['String']['input'];
+  inviteId: Scalars['String']['input'];
 }>;
 
 
 export type CancelStreamInviteMutation = { __typename?: 'Mutation', streamInviteCancel: boolean };
 
 export type DeleteInviteMutationVariables = Exact<{
-  inviteId: Scalars['String'];
+  inviteId: Scalars['String']['input'];
 }>;
 
 
 export type DeleteInviteMutation = { __typename?: 'Mutation', inviteDelete: boolean };
 
 export type ResendInviteMutationVariables = Exact<{
-  inviteId: Scalars['String'];
+  inviteId: Scalars['String']['input'];
 }>;
 
 
@@ -3110,16 +3563,16 @@ export type BatchInviteToStreamsMutationVariables = Exact<{
 export type BatchInviteToStreamsMutation = { __typename?: 'Mutation', streamInviteBatchCreate: boolean };
 
 export type StreamObjectQueryVariables = Exact<{
-  streamId: Scalars['String'];
-  id: Scalars['String'];
+  streamId: Scalars['String']['input'];
+  id: Scalars['String']['input'];
 }>;
 
 
 export type StreamObjectQuery = { __typename?: 'Query', stream?: { __typename?: 'Stream', id: string, object?: { __typename?: 'Object', totalChildrenCount?: number | null, id: string, speckleType?: string | null, data?: Record<string, unknown> | null } | null } | null };
 
 export type StreamObjectNoDataQueryVariables = Exact<{
-  streamId: Scalars['String'];
-  id: Scalars['String'];
+  streamId: Scalars['String']['input'];
+  id: Scalars['String']['input'];
 }>;
 
 
@@ -3154,14 +3607,14 @@ export type AvailableServerRolesQueryVariables = Exact<{ [key: string]: never; }
 export type AvailableServerRolesQuery = { __typename?: 'Query', serverInfo: { __typename?: 'ServerInfo', guestModeEnabled: boolean, serverRoles: Array<{ __typename?: 'ServerRoleItem', id: string, title: string }> } };
 
 export type StreamCommitsQueryVariables = Exact<{
-  id: Scalars['String'];
+  id: Scalars['String']['input'];
 }>;
 
 
 export type StreamCommitsQuery = { __typename?: 'Query', stream?: { __typename?: 'Stream', id: string, role?: string | null, commits?: { __typename?: 'CommitCollection', totalCount: number, items?: Array<{ __typename?: 'Commit', id: string, authorId?: string | null, authorName?: string | null, authorAvatar?: string | null, createdAt?: string | null, message?: string | null, referencedObject: string, branchName?: string | null, sourceApplication?: string | null }> | null } | null } | null };
 
 export type StreamsQueryVariables = Exact<{
-  cursor?: InputMaybe<Scalars['String']>;
+  cursor?: InputMaybe<Scalars['String']['input']>;
 }>;
 
 
@@ -3170,29 +3623,29 @@ export type StreamsQuery = { __typename?: 'Query', streams?: { __typename?: 'Str
 export type CommonStreamFieldsFragment = { __typename?: 'Stream', id: string, name: string, description?: string | null, role?: string | null, isPublic: boolean, createdAt: string, updatedAt: string, commentCount: number, favoritedDate?: string | null, favoritesCount: number, collaborators: Array<{ __typename?: 'StreamCollaborator', id: string, name: string, role: string, company?: string | null, avatar?: string | null, serverRole: string }>, commits?: { __typename?: 'CommitCollection', totalCount: number } | null, branches?: { __typename?: 'BranchCollection', totalCount: number } | null };
 
 export type StreamQueryVariables = Exact<{
-  id: Scalars['String'];
+  id: Scalars['String']['input'];
 }>;
 
 
 export type StreamQuery = { __typename?: 'Query', stream?: { __typename?: 'Stream', id: string, name: string, description?: string | null, role?: string | null, isPublic: boolean, createdAt: string, updatedAt: string, commentCount: number, favoritedDate?: string | null, favoritesCount: number, collaborators: Array<{ __typename?: 'StreamCollaborator', id: string, name: string, role: string, company?: string | null, avatar?: string | null, serverRole: string }>, commits?: { __typename?: 'CommitCollection', totalCount: number } | null, branches?: { __typename?: 'BranchCollection', totalCount: number } | null } | null };
 
 export type StreamWithCollaboratorsQueryVariables = Exact<{
-  id: Scalars['String'];
+  id: Scalars['String']['input'];
 }>;
 
 
 export type StreamWithCollaboratorsQuery = { __typename?: 'Query', stream?: { __typename?: 'Stream', id: string, name: string, isPublic: boolean, role?: string | null, collaborators: Array<{ __typename?: 'StreamCollaborator', id: string, name: string, role: string, company?: string | null, avatar?: string | null, serverRole: string }>, pendingCollaborators?: Array<{ __typename?: 'PendingStreamCollaborator', title: string, inviteId: string, role: string, user?: { __typename?: 'LimitedUser', id: string, name: string, bio?: string | null, company?: string | null, avatar?: string | null, verified?: boolean | null } | null }> | null, pendingAccessRequests?: Array<{ __typename?: 'StreamAccessRequest', id: string, streamId: string, createdAt: string, requester: { __typename?: 'LimitedUser', id: string, name: string, bio?: string | null, company?: string | null, avatar?: string | null, verified?: boolean | null } }> | null } | null };
 
 export type StreamWithActivityQueryVariables = Exact<{
-  id: Scalars['String'];
-  cursor?: InputMaybe<Scalars['DateTime']>;
+  id: Scalars['String']['input'];
+  cursor?: InputMaybe<Scalars['DateTime']['input']>;
 }>;
 
 
 export type StreamWithActivityQuery = { __typename?: 'Query', stream?: { __typename?: 'Stream', id: string, name: string, createdAt: string, commits?: { __typename?: 'CommitCollection', totalCount: number } | null, branches?: { __typename?: 'BranchCollection', totalCount: number } | null, activity?: { __typename?: 'ActivityCollection', totalCount: number, cursor?: string | null, items?: Array<{ __typename?: 'Activity', id: string, actionType: string, info: Record<string, unknown>, userId: string, streamId?: string | null, resourceId: string, resourceType: string, time: string, message: string } | null> | null } | null } | null };
 
 export type LeaveStreamMutationVariables = Exact<{
-  streamId: Scalars['String'];
+  streamId: Scalars['String']['input'];
 }>;
 
 
@@ -3206,29 +3659,29 @@ export type UpdateStreamPermissionMutationVariables = Exact<{
 export type UpdateStreamPermissionMutation = { __typename?: 'Mutation', streamUpdatePermission?: boolean | null };
 
 export type StreamFirstCommitQueryVariables = Exact<{
-  id: Scalars['String'];
+  id: Scalars['String']['input'];
 }>;
 
 
 export type StreamFirstCommitQuery = { __typename?: 'Query', stream?: { __typename?: 'Stream', id: string, commits?: { __typename?: 'CommitCollection', totalCount: number, items?: Array<{ __typename?: 'Commit', id: string, referencedObject: string }> | null } | null } | null };
 
 export type StreamBranchFirstCommitQueryVariables = Exact<{
-  id: Scalars['String'];
-  branch: Scalars['String'];
+  id: Scalars['String']['input'];
+  branch: Scalars['String']['input'];
 }>;
 
 
 export type StreamBranchFirstCommitQuery = { __typename?: 'Query', stream?: { __typename?: 'Stream', id: string, branch?: { __typename?: 'Branch', commits?: { __typename?: 'CommitCollection', totalCount: number, items?: Array<{ __typename?: 'Commit', id: string, referencedObject: string }> | null } | null } | null } | null };
 
 export type StreamSettingsQueryVariables = Exact<{
-  id: Scalars['String'];
+  id: Scalars['String']['input'];
 }>;
 
 
 export type StreamSettingsQuery = { __typename?: 'Query', stream?: { __typename?: 'Stream', id: string, name: string, description?: string | null, isPublic: boolean, isDiscoverable: boolean, allowPublicComments: boolean, role?: string | null } | null };
 
 export type SearchStreamsQueryVariables = Exact<{
-  query?: InputMaybe<Scalars['String']>;
+  query?: InputMaybe<Scalars['String']['input']>;
 }>;
 
 
@@ -3242,21 +3695,21 @@ export type UpdateStreamSettingsMutationVariables = Exact<{
 export type UpdateStreamSettingsMutation = { __typename?: 'Mutation', streamUpdate: boolean };
 
 export type DeleteStreamMutationVariables = Exact<{
-  id: Scalars['String'];
+  id: Scalars['String']['input'];
 }>;
 
 
 export type DeleteStreamMutation = { __typename?: 'Mutation', streamDelete: boolean };
 
 export type ShareableStreamQueryVariables = Exact<{
-  id: Scalars['String'];
+  id: Scalars['String']['input'];
 }>;
 
 
 export type ShareableStreamQuery = { __typename?: 'Query', stream?: { __typename?: 'Stream', id: string, isPublic: boolean, role?: string | null, collaborators: Array<{ __typename?: 'StreamCollaborator', id: string, name: string, role: string, company?: string | null, avatar?: string | null, serverRole: string }> } | null };
 
 export type StreamFileUploadsUpdatedSubscriptionVariables = Exact<{
-  id: Scalars['String'];
+  id: Scalars['String']['input'];
 }>;
 
 
@@ -3265,7 +3718,7 @@ export type StreamFileUploadsUpdatedSubscription = { __typename?: 'Subscription'
 export type CommonUserFieldsFragment = { __typename?: 'User', id: string, email?: string | null, name: string, bio?: string | null, company?: string | null, avatar?: string | null, verified?: boolean | null, hasPendingVerification?: boolean | null, profiles?: Record<string, unknown> | null, role?: string | null, streams: { __typename?: 'StreamCollection', totalCount: number }, commits?: { __typename?: 'CommitCollection', totalCount: number, items?: Array<{ __typename?: 'Commit', id: string, createdAt?: string | null }> | null } | null };
 
 export type UserFavoriteStreamsQueryVariables = Exact<{
-  cursor?: InputMaybe<Scalars['String']>;
+  cursor?: InputMaybe<Scalars['String']['input']>;
 }>;
 
 
@@ -3282,10 +3735,10 @@ export type ProfileSelfQueryVariables = Exact<{ [key: string]: never; }>;
 export type ProfileSelfQuery = { __typename?: 'Query', activeUser?: { __typename?: 'User', totalOwnedStreamsFavorites: number, notificationPreferences: Record<string, unknown>, id: string, email?: string | null, name: string, bio?: string | null, company?: string | null, avatar?: string | null, verified?: boolean | null, hasPendingVerification?: boolean | null, profiles?: Record<string, unknown> | null, role?: string | null, streams: { __typename?: 'StreamCollection', totalCount: number }, commits?: { __typename?: 'CommitCollection', totalCount: number, items?: Array<{ __typename?: 'Commit', id: string, createdAt?: string | null }> | null } | null } | null };
 
 export type UserSearchQueryVariables = Exact<{
-  query: Scalars['String'];
-  limit: Scalars['Int'];
-  cursor?: InputMaybe<Scalars['String']>;
-  archived?: InputMaybe<Scalars['Boolean']>;
+  query: Scalars['String']['input'];
+  limit: Scalars['Int']['input'];
+  cursor?: InputMaybe<Scalars['String']['input']>;
+  archived?: InputMaybe<Scalars['Boolean']['input']>;
 }>;
 
 
@@ -3297,23 +3750,23 @@ export type IsLoggedInQueryVariables = Exact<{ [key: string]: never; }>;
 export type IsLoggedInQuery = { __typename?: 'Query', activeUser?: { __typename?: 'User', id: string } | null };
 
 export type AdminUsersListQueryVariables = Exact<{
-  limit?: InputMaybe<Scalars['Int']>;
-  offset?: InputMaybe<Scalars['Int']>;
-  query?: InputMaybe<Scalars['String']>;
+  limit?: InputMaybe<Scalars['Int']['input']>;
+  offset?: InputMaybe<Scalars['Int']['input']>;
+  query?: InputMaybe<Scalars['String']['input']>;
 }>;
 
 
 export type AdminUsersListQuery = { __typename?: 'Query', adminUsers?: { __typename?: 'AdminUsersListCollection', totalCount: number, items: Array<{ __typename?: 'AdminUsersListItem', id: string, registeredUser?: { __typename?: 'User', id: string, email?: string | null, name: string, bio?: string | null, company?: string | null, avatar?: string | null, verified?: boolean | null, profiles?: Record<string, unknown> | null, role?: string | null, authorizedApps?: Array<{ __typename?: 'ServerAppListItem', name: string }> | null } | null, invitedUser?: { __typename?: 'ServerInvite', id: string, email: string, invitedBy: { __typename?: 'LimitedUser', id: string, name: string } } | null }> } | null };
 
 export type UserTimelineQueryVariables = Exact<{
-  cursor?: InputMaybe<Scalars['DateTime']>;
+  cursor?: InputMaybe<Scalars['DateTime']['input']>;
 }>;
 
 
 export type UserTimelineQuery = { __typename?: 'Query', activeUser?: { __typename?: 'User', id: string, timeline?: { __typename?: 'ActivityCollection', totalCount: number, cursor?: string | null, items?: Array<{ __typename?: 'Activity', id: string, actionType: string, info: Record<string, unknown>, userId: string, streamId?: string | null, resourceId: string, resourceType: string, time: string, message: string } | null> | null } | null } | null };
 
 export type ValidatePasswordStrengthQueryVariables = Exact<{
-  pwd: Scalars['String'];
+  pwd: Scalars['String']['input'];
 }>;
 
 
@@ -3330,36 +3783,36 @@ export type RequestVerificationMutationVariables = Exact<{ [key: string]: never;
 export type RequestVerificationMutation = { __typename?: 'Mutation', requestVerification: boolean };
 
 export type UpdateUserNotificationPreferencesMutationVariables = Exact<{
-  preferences: Scalars['JSONObject'];
+  preferences: Scalars['JSONObject']['input'];
 }>;
 
 
 export type UpdateUserNotificationPreferencesMutation = { __typename?: 'Mutation', userNotificationPreferencesUpdate?: boolean | null };
 
 export type UserByIdQueryVariables = Exact<{
-  id: Scalars['String'];
+  id: Scalars['String']['input'];
 }>;
 
 
 export type UserByIdQuery = { __typename?: 'Query', otherUser?: { __typename?: 'LimitedUser', id: string, name: string, bio?: string | null, company?: string | null, avatar?: string | null, verified?: boolean | null } | null };
 
 export type UserProfileQueryVariables = Exact<{
-  id: Scalars['String'];
+  id: Scalars['String']['input'];
 }>;
 
 
 export type UserProfileQuery = { __typename?: 'Query', otherUser?: { __typename?: 'LimitedUser', id: string, name: string, bio?: string | null, company?: string | null, avatar?: string | null, verified?: boolean | null } | null };
 
 export type WebhookQueryVariables = Exact<{
-  streamId: Scalars['String'];
-  webhookId: Scalars['String'];
+  streamId: Scalars['String']['input'];
+  webhookId: Scalars['String']['input'];
 }>;
 
 
 export type WebhookQuery = { __typename?: 'Query', stream?: { __typename?: 'Stream', id: string, role?: string | null, webhooks: { __typename?: 'WebhookCollection', items: Array<{ __typename?: 'Webhook', id: string, streamId: string, url: string, description?: string | null, triggers: Array<string>, enabled?: boolean | null, history?: { __typename?: 'WebhookEventCollection', items?: Array<{ __typename?: 'WebhookEvent', status: number, statusInfo: string } | null> | null } | null }> } } | null };
 
 export type WebhooksQueryVariables = Exact<{
-  streamId: Scalars['String'];
+  streamId: Scalars['String']['input'];
 }>;
 
 
@@ -4224,19 +4677,19 @@ export const ActivityMainFieldsFragmentDoc = {"kind":"Document","definitions":[{
 export const LimitedCommitActivityFieldsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"LimitedCommitActivityFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Activity"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"info"}},{"kind":"Field","name":{"kind":"Name","value":"time"}},{"kind":"Field","name":{"kind":"Name","value":"userId"}},{"kind":"Field","name":{"kind":"Name","value":"message"}}]}}]} as unknown as DocumentNode<LimitedCommitActivityFieldsFragment, unknown>;
 export const BasicStreamAccessRequestFieldsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"BasicStreamAccessRequestFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"StreamAccessRequest"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"streamId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}}]} as unknown as DocumentNode<BasicStreamAccessRequestFieldsFragment, unknown>;
 export const LimitedUserFieldsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"LimitedUserFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"LimitedUser"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"bio"}},{"kind":"Field","name":{"kind":"Name","value":"company"}},{"kind":"Field","name":{"kind":"Name","value":"avatar"}},{"kind":"Field","name":{"kind":"Name","value":"verified"}}]}}]} as unknown as DocumentNode<LimitedUserFieldsFragment, unknown>;
-export const FullStreamAccessRequestFieldsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"FullStreamAccessRequestFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"StreamAccessRequest"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BasicStreamAccessRequestFields"}},{"kind":"Field","name":{"kind":"Name","value":"requester"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"LimitedUserFields"}}]}}]}}]} as unknown as DocumentNode<FullStreamAccessRequestFieldsFragment, unknown>;
-export const StreamPendingAccessRequestsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"StreamPendingAccessRequests"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Stream"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"pendingAccessRequests"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"FullStreamAccessRequestFields"}}]}}]}}]} as unknown as DocumentNode<StreamPendingAccessRequestsFragment, unknown>;
+export const FullStreamAccessRequestFieldsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"FullStreamAccessRequestFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"StreamAccessRequest"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BasicStreamAccessRequestFields"}},{"kind":"Field","name":{"kind":"Name","value":"requester"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"LimitedUserFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"BasicStreamAccessRequestFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"StreamAccessRequest"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"streamId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"LimitedUserFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"LimitedUser"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"bio"}},{"kind":"Field","name":{"kind":"Name","value":"company"}},{"kind":"Field","name":{"kind":"Name","value":"avatar"}},{"kind":"Field","name":{"kind":"Name","value":"verified"}}]}}]} as unknown as DocumentNode<FullStreamAccessRequestFieldsFragment, unknown>;
+export const StreamPendingAccessRequestsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"StreamPendingAccessRequests"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Stream"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"pendingAccessRequests"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"FullStreamAccessRequestFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"BasicStreamAccessRequestFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"StreamAccessRequest"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"streamId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"LimitedUserFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"LimitedUser"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"bio"}},{"kind":"Field","name":{"kind":"Name","value":"company"}},{"kind":"Field","name":{"kind":"Name","value":"avatar"}},{"kind":"Field","name":{"kind":"Name","value":"verified"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"FullStreamAccessRequestFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"StreamAccessRequest"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BasicStreamAccessRequestFields"}},{"kind":"Field","name":{"kind":"Name","value":"requester"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"LimitedUserFields"}}]}}]}}]} as unknown as DocumentNode<StreamPendingAccessRequestsFragment, unknown>;
 export const StreamFileUploadFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"StreamFileUpload"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"FileUpload"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"convertedCommitId"}},{"kind":"Field","name":{"kind":"Name","value":"userId"}},{"kind":"Field","name":{"kind":"Name","value":"convertedStatus"}},{"kind":"Field","name":{"kind":"Name","value":"convertedMessage"}},{"kind":"Field","name":{"kind":"Name","value":"fileName"}},{"kind":"Field","name":{"kind":"Name","value":"fileType"}},{"kind":"Field","name":{"kind":"Name","value":"uploadComplete"}},{"kind":"Field","name":{"kind":"Name","value":"uploadDate"}},{"kind":"Field","name":{"kind":"Name","value":"convertedLastUpdate"}}]}}]} as unknown as DocumentNode<StreamFileUploadFragment, unknown>;
-export const UsersOwnInviteFieldsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"UsersOwnInviteFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"PendingStreamCollaborator"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"inviteId"}},{"kind":"Field","name":{"kind":"Name","value":"streamId"}},{"kind":"Field","name":{"kind":"Name","value":"streamName"}},{"kind":"Field","name":{"kind":"Name","value":"token"}},{"kind":"Field","name":{"kind":"Name","value":"invitedBy"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"LimitedUserFields"}}]}}]}}]} as unknown as DocumentNode<UsersOwnInviteFieldsFragment, unknown>;
+export const UsersOwnInviteFieldsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"UsersOwnInviteFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"PendingStreamCollaborator"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"inviteId"}},{"kind":"Field","name":{"kind":"Name","value":"streamId"}},{"kind":"Field","name":{"kind":"Name","value":"streamName"}},{"kind":"Field","name":{"kind":"Name","value":"token"}},{"kind":"Field","name":{"kind":"Name","value":"invitedBy"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"LimitedUserFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"LimitedUserFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"LimitedUser"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"bio"}},{"kind":"Field","name":{"kind":"Name","value":"company"}},{"kind":"Field","name":{"kind":"Name","value":"avatar"}},{"kind":"Field","name":{"kind":"Name","value":"verified"}}]}}]} as unknown as DocumentNode<UsersOwnInviteFieldsFragment, unknown>;
 export const ServerInfoBlobSizeFieldsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ServerInfoBlobSizeFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ServerInfo"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"blobSizeLimitBytes"}}]}}]} as unknown as DocumentNode<ServerInfoBlobSizeFieldsFragment, unknown>;
 export const MainServerInfoFieldsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"MainServerInfoFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ServerInfo"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"company"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"adminContact"}},{"kind":"Field","name":{"kind":"Name","value":"canonicalUrl"}},{"kind":"Field","name":{"kind":"Name","value":"termsOfService"}},{"kind":"Field","name":{"kind":"Name","value":"inviteOnly"}},{"kind":"Field","name":{"kind":"Name","value":"version"}},{"kind":"Field","name":{"kind":"Name","value":"guestModeEnabled"}},{"kind":"Field","name":{"kind":"Name","value":"enableNewWebUiMessaging"}},{"kind":"Field","name":{"kind":"Name","value":"migration"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"movedTo"}}]}}]}}]} as unknown as DocumentNode<MainServerInfoFieldsFragment, unknown>;
 export const ServerInfoRolesFieldsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ServerInfoRolesFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ServerInfo"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"serverRoles"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}}]}}]}}]} as unknown as DocumentNode<ServerInfoRolesFieldsFragment, unknown>;
 export const ServerInfoScopesFieldsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ServerInfoScopesFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ServerInfo"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"scopes"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}}]}}]}}]} as unknown as DocumentNode<ServerInfoScopesFieldsFragment, unknown>;
 export const StreamCollaboratorFieldsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"StreamCollaboratorFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"StreamCollaborator"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"company"}},{"kind":"Field","name":{"kind":"Name","value":"avatar"}},{"kind":"Field","name":{"kind":"Name","value":"serverRole"}}]}}]} as unknown as DocumentNode<StreamCollaboratorFieldsFragment, unknown>;
-export const CommonStreamFieldsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CommonStreamFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Stream"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"isPublic"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"commentCount"}},{"kind":"Field","name":{"kind":"Name","value":"collaborators"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"StreamCollaboratorFields"}}]}},{"kind":"Field","name":{"kind":"Name","value":"commits"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"IntValue","value":"1"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}}]}},{"kind":"Field","name":{"kind":"Name","value":"branches"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}}]}},{"kind":"Field","name":{"kind":"Name","value":"favoritedDate"}},{"kind":"Field","name":{"kind":"Name","value":"favoritesCount"}}]}}]} as unknown as DocumentNode<CommonStreamFieldsFragment, unknown>;
+export const CommonStreamFieldsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CommonStreamFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Stream"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"isPublic"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"commentCount"}},{"kind":"Field","name":{"kind":"Name","value":"collaborators"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"StreamCollaboratorFields"}}]}},{"kind":"Field","name":{"kind":"Name","value":"commits"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"IntValue","value":"1"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}}]}},{"kind":"Field","name":{"kind":"Name","value":"branches"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}}]}},{"kind":"Field","name":{"kind":"Name","value":"favoritedDate"}},{"kind":"Field","name":{"kind":"Name","value":"favoritesCount"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"StreamCollaboratorFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"StreamCollaborator"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"company"}},{"kind":"Field","name":{"kind":"Name","value":"avatar"}},{"kind":"Field","name":{"kind":"Name","value":"serverRole"}}]}}]} as unknown as DocumentNode<CommonStreamFieldsFragment, unknown>;
 export const CommonUserFieldsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CommonUserFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"User"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"email"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"bio"}},{"kind":"Field","name":{"kind":"Name","value":"company"}},{"kind":"Field","name":{"kind":"Name","value":"avatar"}},{"kind":"Field","name":{"kind":"Name","value":"verified"}},{"kind":"Field","name":{"kind":"Name","value":"hasPendingVerification"}},{"kind":"Field","name":{"kind":"Name","value":"profiles"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"streams"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}}]}},{"kind":"Field","name":{"kind":"Name","value":"commits"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"IntValue","value":"1"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}},{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}}]}}]}}]} as unknown as DocumentNode<CommonUserFieldsFragment, unknown>;
-export const GetStreamAccessRequestDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetStreamAccessRequest"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"streamAccessRequest"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"streamId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BasicStreamAccessRequestFields"}}]}}]}},...BasicStreamAccessRequestFieldsFragmentDoc.definitions]} as unknown as DocumentNode<GetStreamAccessRequestQuery, GetStreamAccessRequestQueryVariables>;
-export const CreateStreamAccessRequestDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateStreamAccessRequest"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"streamAccessRequestCreate"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"streamId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BasicStreamAccessRequestFields"}}]}}]}},...BasicStreamAccessRequestFieldsFragmentDoc.definitions]} as unknown as DocumentNode<CreateStreamAccessRequestMutation, CreateStreamAccessRequestMutationVariables>;
+export const GetStreamAccessRequestDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetStreamAccessRequest"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"streamAccessRequest"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"streamId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BasicStreamAccessRequestFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"BasicStreamAccessRequestFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"StreamAccessRequest"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"streamId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}}]} as unknown as DocumentNode<GetStreamAccessRequestQuery, GetStreamAccessRequestQueryVariables>;
+export const CreateStreamAccessRequestDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateStreamAccessRequest"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"streamAccessRequestCreate"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"streamId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BasicStreamAccessRequestFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"BasicStreamAccessRequestFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"StreamAccessRequest"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"streamId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}}]} as unknown as DocumentNode<CreateStreamAccessRequestMutation, CreateStreamAccessRequestMutationVariables>;
 export const UseStreamAccessRequestDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UseStreamAccessRequest"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"requestId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"accept"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"role"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"StreamRole"}},"defaultValue":{"kind":"EnumValue","value":"STREAM_CONTRIBUTOR"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"streamAccessRequestUse"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"requestId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"requestId"}}},{"kind":"Argument","name":{"kind":"Name","value":"accept"},"value":{"kind":"Variable","name":{"kind":"Name","value":"accept"}}},{"kind":"Argument","name":{"kind":"Name","value":"role"},"value":{"kind":"Variable","name":{"kind":"Name","value":"role"}}}]}]}}]} as unknown as DocumentNode<UseStreamAccessRequestMutation, UseStreamAccessRequestMutationVariables>;
 export const StreamWithBranchDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"StreamWithBranch"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"branchName"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"cursor"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"stream"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"branch"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"name"},"value":{"kind":"Variable","name":{"kind":"Name","value":"branchName"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"commits"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"cursor"},"value":{"kind":"Variable","name":{"kind":"Name","value":"cursor"}}},{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"IntValue","value":"4"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}},{"kind":"Field","name":{"kind":"Name","value":"cursor"}},{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"authorName"}},{"kind":"Field","name":{"kind":"Name","value":"authorId"}},{"kind":"Field","name":{"kind":"Name","value":"authorAvatar"}},{"kind":"Field","name":{"kind":"Name","value":"sourceApplication"}},{"kind":"Field","name":{"kind":"Name","value":"message"}},{"kind":"Field","name":{"kind":"Name","value":"referencedObject"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"commentCount"}}]}}]}}]}}]}}]}}]} as unknown as DocumentNode<StreamWithBranchQuery, StreamWithBranchQueryVariables>;
 export const BranchCreatedDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"subscription","name":{"kind":"Name","value":"BranchCreated"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"branchCreated"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"streamId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}}}]}]}}]} as unknown as DocumentNode<BranchCreatedSubscription, BranchCreatedSubscriptionVariables>;
@@ -4245,8 +4698,8 @@ export const StreamCommitQueryDocument = {"kind":"Document","definitions":[{"kin
 export const StreamBranchesSelectorDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"StreamBranchesSelector"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"stream"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"branches"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"IntValue","value":"100"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}}]}}]}}]} as unknown as DocumentNode<StreamBranchesSelectorQuery, StreamBranchesSelectorQueryVariables>;
 export const MoveCommitsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"MoveCommits"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CommitsMoveInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"commitsMove"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}]}]}}]} as unknown as DocumentNode<MoveCommitsMutation, MoveCommitsMutationVariables>;
 export const DeleteCommitsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteCommits"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CommitsDeleteInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"commitsDelete"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}]}]}}]} as unknown as DocumentNode<DeleteCommitsMutation, DeleteCommitsMutationVariables>;
-export const StreamInviteDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"StreamInvite"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"token"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"streamInvite"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"streamId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}}},{"kind":"Argument","name":{"kind":"Name","value":"token"},"value":{"kind":"Variable","name":{"kind":"Name","value":"token"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"UsersOwnInviteFields"}}]}}]}},...UsersOwnInviteFieldsFragmentDoc.definitions,...LimitedUserFieldsFragmentDoc.definitions]} as unknown as DocumentNode<StreamInviteQuery, StreamInviteQueryVariables>;
-export const UserStreamInvitesDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"UserStreamInvites"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"streamInvites"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"UsersOwnInviteFields"}}]}}]}},...UsersOwnInviteFieldsFragmentDoc.definitions,...LimitedUserFieldsFragmentDoc.definitions]} as unknown as DocumentNode<UserStreamInvitesQuery, UserStreamInvitesQueryVariables>;
+export const StreamInviteDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"StreamInvite"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"token"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"streamInvite"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"streamId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}}},{"kind":"Argument","name":{"kind":"Name","value":"token"},"value":{"kind":"Variable","name":{"kind":"Name","value":"token"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"UsersOwnInviteFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"LimitedUserFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"LimitedUser"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"bio"}},{"kind":"Field","name":{"kind":"Name","value":"company"}},{"kind":"Field","name":{"kind":"Name","value":"avatar"}},{"kind":"Field","name":{"kind":"Name","value":"verified"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"UsersOwnInviteFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"PendingStreamCollaborator"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"inviteId"}},{"kind":"Field","name":{"kind":"Name","value":"streamId"}},{"kind":"Field","name":{"kind":"Name","value":"streamName"}},{"kind":"Field","name":{"kind":"Name","value":"token"}},{"kind":"Field","name":{"kind":"Name","value":"invitedBy"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"LimitedUserFields"}}]}}]}}]} as unknown as DocumentNode<StreamInviteQuery, StreamInviteQueryVariables>;
+export const UserStreamInvitesDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"UserStreamInvites"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"streamInvites"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"UsersOwnInviteFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"LimitedUserFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"LimitedUser"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"bio"}},{"kind":"Field","name":{"kind":"Name","value":"company"}},{"kind":"Field","name":{"kind":"Name","value":"avatar"}},{"kind":"Field","name":{"kind":"Name","value":"verified"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"UsersOwnInviteFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"PendingStreamCollaborator"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"inviteId"}},{"kind":"Field","name":{"kind":"Name","value":"streamId"}},{"kind":"Field","name":{"kind":"Name","value":"streamName"}},{"kind":"Field","name":{"kind":"Name","value":"token"}},{"kind":"Field","name":{"kind":"Name","value":"invitedBy"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"LimitedUserFields"}}]}}]}}]} as unknown as DocumentNode<UserStreamInvitesQuery, UserStreamInvitesQueryVariables>;
 export const UseStreamInviteDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UseStreamInvite"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"accept"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"token"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"streamInviteUse"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"accept"},"value":{"kind":"Variable","name":{"kind":"Name","value":"accept"}}},{"kind":"Argument","name":{"kind":"Name","value":"streamId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}}},{"kind":"Argument","name":{"kind":"Name","value":"token"},"value":{"kind":"Variable","name":{"kind":"Name","value":"token"}}}]}]}}]} as unknown as DocumentNode<UseStreamInviteMutation, UseStreamInviteMutationVariables>;
 export const CancelStreamInviteDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CancelStreamInvite"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"inviteId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"streamInviteCancel"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"streamId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}}},{"kind":"Argument","name":{"kind":"Name","value":"inviteId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"inviteId"}}}]}]}}]} as unknown as DocumentNode<CancelStreamInviteMutation, CancelStreamInviteMutationVariables>;
 export const DeleteInviteDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteInvite"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"inviteId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"inviteDelete"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"inviteId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"inviteId"}}}]}]}}]} as unknown as DocumentNode<DeleteInviteMutation, DeleteInviteMutationVariables>;
@@ -4255,15 +4708,15 @@ export const BatchInviteToServerDocument = {"kind":"Document","definitions":[{"k
 export const BatchInviteToStreamsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"BatchInviteToStreams"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"paramsArray"}},"type":{"kind":"NonNullType","type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"StreamInviteCreateInput"}}}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"streamInviteBatchCreate"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"paramsArray"}}}]}]}}]} as unknown as DocumentNode<BatchInviteToStreamsMutation, BatchInviteToStreamsMutationVariables>;
 export const StreamObjectDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"StreamObject"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"stream"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"object"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalChildrenCount"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"speckleType"}},{"kind":"Field","name":{"kind":"Name","value":"data"}}]}}]}}]}}]} as unknown as DocumentNode<StreamObjectQuery, StreamObjectQueryVariables>;
 export const StreamObjectNoDataDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"StreamObjectNoData"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"stream"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"object"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalChildrenCount"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"speckleType"}}]}}]}}]}}]} as unknown as DocumentNode<StreamObjectNoDataQuery, StreamObjectNoDataQueryVariables>;
-export const MainServerInfoDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"MainServerInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"serverInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"MainServerInfoFields"}}]}}]}},...MainServerInfoFieldsFragmentDoc.definitions]} as unknown as DocumentNode<MainServerInfoQuery, MainServerInfoQueryVariables>;
-export const FullServerInfoDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"FullServerInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"serverInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"MainServerInfoFields"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"ServerInfoRolesFields"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"ServerInfoScopesFields"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"ServerInfoBlobSizeFields"}}]}}]}},...MainServerInfoFieldsFragmentDoc.definitions,...ServerInfoRolesFieldsFragmentDoc.definitions,...ServerInfoScopesFieldsFragmentDoc.definitions,...ServerInfoBlobSizeFieldsFragmentDoc.definitions]} as unknown as DocumentNode<FullServerInfoQuery, FullServerInfoQueryVariables>;
-export const ServerInfoBlobSizeLimitDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ServerInfoBlobSizeLimit"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"serverInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ServerInfoBlobSizeFields"}}]}}]}},...ServerInfoBlobSizeFieldsFragmentDoc.definitions]} as unknown as DocumentNode<ServerInfoBlobSizeLimitQuery, ServerInfoBlobSizeLimitQueryVariables>;
+export const MainServerInfoDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"MainServerInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"serverInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"MainServerInfoFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"MainServerInfoFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ServerInfo"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"company"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"adminContact"}},{"kind":"Field","name":{"kind":"Name","value":"canonicalUrl"}},{"kind":"Field","name":{"kind":"Name","value":"termsOfService"}},{"kind":"Field","name":{"kind":"Name","value":"inviteOnly"}},{"kind":"Field","name":{"kind":"Name","value":"version"}},{"kind":"Field","name":{"kind":"Name","value":"guestModeEnabled"}},{"kind":"Field","name":{"kind":"Name","value":"enableNewWebUiMessaging"}},{"kind":"Field","name":{"kind":"Name","value":"migration"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"movedTo"}}]}}]}}]} as unknown as DocumentNode<MainServerInfoQuery, MainServerInfoQueryVariables>;
+export const FullServerInfoDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"FullServerInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"serverInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"MainServerInfoFields"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"ServerInfoRolesFields"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"ServerInfoScopesFields"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"ServerInfoBlobSizeFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"MainServerInfoFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ServerInfo"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"company"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"adminContact"}},{"kind":"Field","name":{"kind":"Name","value":"canonicalUrl"}},{"kind":"Field","name":{"kind":"Name","value":"termsOfService"}},{"kind":"Field","name":{"kind":"Name","value":"inviteOnly"}},{"kind":"Field","name":{"kind":"Name","value":"version"}},{"kind":"Field","name":{"kind":"Name","value":"guestModeEnabled"}},{"kind":"Field","name":{"kind":"Name","value":"enableNewWebUiMessaging"}},{"kind":"Field","name":{"kind":"Name","value":"migration"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"movedTo"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ServerInfoRolesFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ServerInfo"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"serverRoles"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ServerInfoScopesFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ServerInfo"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"scopes"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ServerInfoBlobSizeFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ServerInfo"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"blobSizeLimitBytes"}}]}}]} as unknown as DocumentNode<FullServerInfoQuery, FullServerInfoQueryVariables>;
+export const ServerInfoBlobSizeLimitDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ServerInfoBlobSizeLimit"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"serverInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ServerInfoBlobSizeFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ServerInfoBlobSizeFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ServerInfo"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"blobSizeLimitBytes"}}]}}]} as unknown as DocumentNode<ServerInfoBlobSizeLimitQuery, ServerInfoBlobSizeLimitQueryVariables>;
 export const AvailableServerRolesDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"AvailableServerRoles"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"serverInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"serverRoles"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}}]}},{"kind":"Field","name":{"kind":"Name","value":"guestModeEnabled"}}]}}]}}]} as unknown as DocumentNode<AvailableServerRolesQuery, AvailableServerRolesQueryVariables>;
 export const StreamCommitsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"StreamCommits"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"stream"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"commits"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}},{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"authorId"}},{"kind":"Field","name":{"kind":"Name","value":"authorName"}},{"kind":"Field","name":{"kind":"Name","value":"authorAvatar"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"message"}},{"kind":"Field","name":{"kind":"Name","value":"referencedObject"}},{"kind":"Field","name":{"kind":"Name","value":"branchName"}},{"kind":"Field","name":{"kind":"Name","value":"sourceApplication"}}]}}]}}]}}]}}]} as unknown as DocumentNode<StreamCommitsQuery, StreamCommitsQueryVariables>;
 export const StreamsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"Streams"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"cursor"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"streams"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"cursor"},"value":{"kind":"Variable","name":{"kind":"Name","value":"cursor"}}},{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"IntValue","value":"10"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}},{"kind":"Field","name":{"kind":"Name","value":"cursor"}},{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"isPublic"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"commentCount"}},{"kind":"Field","name":{"kind":"Name","value":"collaborators"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"company"}},{"kind":"Field","name":{"kind":"Name","value":"avatar"}},{"kind":"Field","name":{"kind":"Name","value":"role"}}]}},{"kind":"Field","name":{"kind":"Name","value":"commits"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"IntValue","value":"1"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}},{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"message"}},{"kind":"Field","name":{"kind":"Name","value":"authorId"}},{"kind":"Field","name":{"kind":"Name","value":"branchName"}},{"kind":"Field","name":{"kind":"Name","value":"authorName"}},{"kind":"Field","name":{"kind":"Name","value":"authorAvatar"}},{"kind":"Field","name":{"kind":"Name","value":"referencedObject"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"branches"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}}]}},{"kind":"Field","name":{"kind":"Name","value":"favoritedDate"}},{"kind":"Field","name":{"kind":"Name","value":"favoritesCount"}}]}}]}}]}}]} as unknown as DocumentNode<StreamsQuery, StreamsQueryVariables>;
-export const StreamDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"Stream"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"stream"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CommonStreamFields"}}]}}]}},...CommonStreamFieldsFragmentDoc.definitions,...StreamCollaboratorFieldsFragmentDoc.definitions]} as unknown as DocumentNode<StreamQuery, StreamQueryVariables>;
-export const StreamWithCollaboratorsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"StreamWithCollaborators"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"stream"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"isPublic"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"collaborators"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"StreamCollaboratorFields"}}]}},{"kind":"Field","name":{"kind":"Name","value":"pendingCollaborators"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"inviteId"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"LimitedUserFields"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"pendingAccessRequests"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"FullStreamAccessRequestFields"}}]}}]}}]}},...StreamCollaboratorFieldsFragmentDoc.definitions,...LimitedUserFieldsFragmentDoc.definitions,...FullStreamAccessRequestFieldsFragmentDoc.definitions,...BasicStreamAccessRequestFieldsFragmentDoc.definitions]} as unknown as DocumentNode<StreamWithCollaboratorsQuery, StreamWithCollaboratorsQueryVariables>;
-export const StreamWithActivityDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"StreamWithActivity"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"cursor"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"DateTime"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"stream"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"commits"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}}]}},{"kind":"Field","name":{"kind":"Name","value":"branches"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}}]}},{"kind":"Field","name":{"kind":"Name","value":"activity"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"cursor"},"value":{"kind":"Variable","name":{"kind":"Name","value":"cursor"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}},{"kind":"Field","name":{"kind":"Name","value":"cursor"}},{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ActivityMainFields"}}]}}]}}]}}]}},...ActivityMainFieldsFragmentDoc.definitions]} as unknown as DocumentNode<StreamWithActivityQuery, StreamWithActivityQueryVariables>;
+export const StreamDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"Stream"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"stream"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CommonStreamFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"StreamCollaboratorFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"StreamCollaborator"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"company"}},{"kind":"Field","name":{"kind":"Name","value":"avatar"}},{"kind":"Field","name":{"kind":"Name","value":"serverRole"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CommonStreamFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Stream"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"isPublic"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"commentCount"}},{"kind":"Field","name":{"kind":"Name","value":"collaborators"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"StreamCollaboratorFields"}}]}},{"kind":"Field","name":{"kind":"Name","value":"commits"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"IntValue","value":"1"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}}]}},{"kind":"Field","name":{"kind":"Name","value":"branches"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}}]}},{"kind":"Field","name":{"kind":"Name","value":"favoritedDate"}},{"kind":"Field","name":{"kind":"Name","value":"favoritesCount"}}]}}]} as unknown as DocumentNode<StreamQuery, StreamQueryVariables>;
+export const StreamWithCollaboratorsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"StreamWithCollaborators"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"stream"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"isPublic"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"collaborators"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"StreamCollaboratorFields"}}]}},{"kind":"Field","name":{"kind":"Name","value":"pendingCollaborators"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"inviteId"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"LimitedUserFields"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"pendingAccessRequests"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"FullStreamAccessRequestFields"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"BasicStreamAccessRequestFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"StreamAccessRequest"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"streamId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"LimitedUserFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"LimitedUser"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"bio"}},{"kind":"Field","name":{"kind":"Name","value":"company"}},{"kind":"Field","name":{"kind":"Name","value":"avatar"}},{"kind":"Field","name":{"kind":"Name","value":"verified"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"StreamCollaboratorFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"StreamCollaborator"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"company"}},{"kind":"Field","name":{"kind":"Name","value":"avatar"}},{"kind":"Field","name":{"kind":"Name","value":"serverRole"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"FullStreamAccessRequestFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"StreamAccessRequest"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"BasicStreamAccessRequestFields"}},{"kind":"Field","name":{"kind":"Name","value":"requester"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"LimitedUserFields"}}]}}]}}]} as unknown as DocumentNode<StreamWithCollaboratorsQuery, StreamWithCollaboratorsQueryVariables>;
+export const StreamWithActivityDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"StreamWithActivity"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"cursor"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"DateTime"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"stream"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"commits"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}}]}},{"kind":"Field","name":{"kind":"Name","value":"branches"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}}]}},{"kind":"Field","name":{"kind":"Name","value":"activity"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"cursor"},"value":{"kind":"Variable","name":{"kind":"Name","value":"cursor"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}},{"kind":"Field","name":{"kind":"Name","value":"cursor"}},{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ActivityMainFields"}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ActivityMainFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Activity"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"actionType"}},{"kind":"Field","name":{"kind":"Name","value":"info"}},{"kind":"Field","name":{"kind":"Name","value":"userId"}},{"kind":"Field","name":{"kind":"Name","value":"streamId"}},{"kind":"Field","name":{"kind":"Name","value":"resourceId"}},{"kind":"Field","name":{"kind":"Name","value":"resourceType"}},{"kind":"Field","name":{"kind":"Name","value":"time"}},{"kind":"Field","name":{"kind":"Name","value":"message"}}]}}]} as unknown as DocumentNode<StreamWithActivityQuery, StreamWithActivityQueryVariables>;
 export const LeaveStreamDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"LeaveStream"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"streamLeave"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"streamId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"streamId"}}}]}]}}]} as unknown as DocumentNode<LeaveStreamMutation, LeaveStreamMutationVariables>;
 export const UpdateStreamPermissionDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateStreamPermission"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"params"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"StreamUpdatePermissionInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"streamUpdatePermission"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"permissionParams"},"value":{"kind":"Variable","name":{"kind":"Name","value":"params"}}}]}]}}]} as unknown as DocumentNode<UpdateStreamPermissionMutation, UpdateStreamPermissionMutationVariables>;
 export const StreamFirstCommitDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"StreamFirstCommit"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"stream"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"commits"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"IntValue","value":"1"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}},{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"referencedObject"}}]}}]}}]}}]}}]} as unknown as DocumentNode<StreamFirstCommitQuery, StreamFirstCommitQueryVariables>;
@@ -4272,15 +4725,15 @@ export const StreamSettingsDocument = {"kind":"Document","definitions":[{"kind":
 export const SearchStreamsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"SearchStreams"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"query"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"streams"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"query"},"value":{"kind":"Variable","name":{"kind":"Name","value":"query"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}},{"kind":"Field","name":{"kind":"Name","value":"cursor"}},{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]}}]} as unknown as DocumentNode<SearchStreamsQuery, SearchStreamsQueryVariables>;
 export const UpdateStreamSettingsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateStreamSettings"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"StreamUpdateInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"streamUpdate"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"stream"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}]}]}}]} as unknown as DocumentNode<UpdateStreamSettingsMutation, UpdateStreamSettingsMutationVariables>;
 export const DeleteStreamDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteStream"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"streamDelete"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}]}]}}]} as unknown as DocumentNode<DeleteStreamMutation, DeleteStreamMutationVariables>;
-export const ShareableStreamDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ShareableStream"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"stream"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"isPublic"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"collaborators"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"StreamCollaboratorFields"}}]}}]}}]}},...StreamCollaboratorFieldsFragmentDoc.definitions]} as unknown as DocumentNode<ShareableStreamQuery, ShareableStreamQueryVariables>;
-export const StreamFileUploadsUpdatedDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"subscription","name":{"kind":"Name","value":"StreamFileUploadsUpdated"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"projectFileImportUpdated"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"upload"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"StreamFileUpload"}}]}}]}}]}},...StreamFileUploadFragmentDoc.definitions]} as unknown as DocumentNode<StreamFileUploadsUpdatedSubscription, StreamFileUploadsUpdatedSubscriptionVariables>;
-export const UserFavoriteStreamsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"UserFavoriteStreams"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"cursor"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activeUser"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CommonUserFields"}},{"kind":"Field","name":{"kind":"Name","value":"favoriteStreams"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"cursor"},"value":{"kind":"Variable","name":{"kind":"Name","value":"cursor"}}},{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"IntValue","value":"10"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}},{"kind":"Field","name":{"kind":"Name","value":"cursor"}},{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CommonStreamFields"}}]}}]}}]}}]}},...CommonUserFieldsFragmentDoc.definitions,...CommonStreamFieldsFragmentDoc.definitions,...StreamCollaboratorFieldsFragmentDoc.definitions]} as unknown as DocumentNode<UserFavoriteStreamsQuery, UserFavoriteStreamsQueryVariables>;
-export const MainUserDataDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"MainUserData"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activeUser"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CommonUserFields"}}]}}]}},...CommonUserFieldsFragmentDoc.definitions]} as unknown as DocumentNode<MainUserDataQuery, MainUserDataQueryVariables>;
-export const ProfileSelfDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ProfileSelf"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activeUser"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CommonUserFields"}},{"kind":"Field","name":{"kind":"Name","value":"totalOwnedStreamsFavorites"}},{"kind":"Field","name":{"kind":"Name","value":"notificationPreferences"}}]}}]}},...CommonUserFieldsFragmentDoc.definitions]} as unknown as DocumentNode<ProfileSelfQuery, ProfileSelfQueryVariables>;
-export const UserSearchDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"UserSearch"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"query"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"limit"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"cursor"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"archived"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"userSearch"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"query"},"value":{"kind":"Variable","name":{"kind":"Name","value":"query"}}},{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"Variable","name":{"kind":"Name","value":"limit"}}},{"kind":"Argument","name":{"kind":"Name","value":"cursor"},"value":{"kind":"Variable","name":{"kind":"Name","value":"cursor"}}},{"kind":"Argument","name":{"kind":"Name","value":"archived"},"value":{"kind":"Variable","name":{"kind":"Name","value":"archived"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"cursor"}},{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"LimitedUserFields"}}]}}]}}]}},...LimitedUserFieldsFragmentDoc.definitions]} as unknown as DocumentNode<UserSearchQuery, UserSearchQueryVariables>;
+export const ShareableStreamDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ShareableStream"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"stream"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"isPublic"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"collaborators"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"StreamCollaboratorFields"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"StreamCollaboratorFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"StreamCollaborator"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"company"}},{"kind":"Field","name":{"kind":"Name","value":"avatar"}},{"kind":"Field","name":{"kind":"Name","value":"serverRole"}}]}}]} as unknown as DocumentNode<ShareableStreamQuery, ShareableStreamQueryVariables>;
+export const StreamFileUploadsUpdatedDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"subscription","name":{"kind":"Name","value":"StreamFileUploadsUpdated"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"projectFileImportUpdated"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"upload"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"StreamFileUpload"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"StreamFileUpload"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"FileUpload"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"convertedCommitId"}},{"kind":"Field","name":{"kind":"Name","value":"userId"}},{"kind":"Field","name":{"kind":"Name","value":"convertedStatus"}},{"kind":"Field","name":{"kind":"Name","value":"convertedMessage"}},{"kind":"Field","name":{"kind":"Name","value":"fileName"}},{"kind":"Field","name":{"kind":"Name","value":"fileType"}},{"kind":"Field","name":{"kind":"Name","value":"uploadComplete"}},{"kind":"Field","name":{"kind":"Name","value":"uploadDate"}},{"kind":"Field","name":{"kind":"Name","value":"convertedLastUpdate"}}]}}]} as unknown as DocumentNode<StreamFileUploadsUpdatedSubscription, StreamFileUploadsUpdatedSubscriptionVariables>;
+export const UserFavoriteStreamsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"UserFavoriteStreams"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"cursor"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activeUser"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CommonUserFields"}},{"kind":"Field","name":{"kind":"Name","value":"favoriteStreams"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"cursor"},"value":{"kind":"Variable","name":{"kind":"Name","value":"cursor"}}},{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"IntValue","value":"10"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}},{"kind":"Field","name":{"kind":"Name","value":"cursor"}},{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CommonStreamFields"}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"StreamCollaboratorFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"StreamCollaborator"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"company"}},{"kind":"Field","name":{"kind":"Name","value":"avatar"}},{"kind":"Field","name":{"kind":"Name","value":"serverRole"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CommonUserFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"User"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"email"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"bio"}},{"kind":"Field","name":{"kind":"Name","value":"company"}},{"kind":"Field","name":{"kind":"Name","value":"avatar"}},{"kind":"Field","name":{"kind":"Name","value":"verified"}},{"kind":"Field","name":{"kind":"Name","value":"hasPendingVerification"}},{"kind":"Field","name":{"kind":"Name","value":"profiles"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"streams"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}}]}},{"kind":"Field","name":{"kind":"Name","value":"commits"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"IntValue","value":"1"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}},{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CommonStreamFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Stream"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"isPublic"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"commentCount"}},{"kind":"Field","name":{"kind":"Name","value":"collaborators"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"StreamCollaboratorFields"}}]}},{"kind":"Field","name":{"kind":"Name","value":"commits"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"IntValue","value":"1"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}}]}},{"kind":"Field","name":{"kind":"Name","value":"branches"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}}]}},{"kind":"Field","name":{"kind":"Name","value":"favoritedDate"}},{"kind":"Field","name":{"kind":"Name","value":"favoritesCount"}}]}}]} as unknown as DocumentNode<UserFavoriteStreamsQuery, UserFavoriteStreamsQueryVariables>;
+export const MainUserDataDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"MainUserData"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activeUser"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CommonUserFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CommonUserFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"User"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"email"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"bio"}},{"kind":"Field","name":{"kind":"Name","value":"company"}},{"kind":"Field","name":{"kind":"Name","value":"avatar"}},{"kind":"Field","name":{"kind":"Name","value":"verified"}},{"kind":"Field","name":{"kind":"Name","value":"hasPendingVerification"}},{"kind":"Field","name":{"kind":"Name","value":"profiles"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"streams"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}}]}},{"kind":"Field","name":{"kind":"Name","value":"commits"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"IntValue","value":"1"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}},{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}}]}}]}}]} as unknown as DocumentNode<MainUserDataQuery, MainUserDataQueryVariables>;
+export const ProfileSelfDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ProfileSelf"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activeUser"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CommonUserFields"}},{"kind":"Field","name":{"kind":"Name","value":"totalOwnedStreamsFavorites"}},{"kind":"Field","name":{"kind":"Name","value":"notificationPreferences"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CommonUserFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"User"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"email"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"bio"}},{"kind":"Field","name":{"kind":"Name","value":"company"}},{"kind":"Field","name":{"kind":"Name","value":"avatar"}},{"kind":"Field","name":{"kind":"Name","value":"verified"}},{"kind":"Field","name":{"kind":"Name","value":"hasPendingVerification"}},{"kind":"Field","name":{"kind":"Name","value":"profiles"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"streams"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}}]}},{"kind":"Field","name":{"kind":"Name","value":"commits"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"IntValue","value":"1"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}},{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}}]}}]}}]} as unknown as DocumentNode<ProfileSelfQuery, ProfileSelfQueryVariables>;
+export const UserSearchDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"UserSearch"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"query"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"limit"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"cursor"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"archived"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"userSearch"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"query"},"value":{"kind":"Variable","name":{"kind":"Name","value":"query"}}},{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"Variable","name":{"kind":"Name","value":"limit"}}},{"kind":"Argument","name":{"kind":"Name","value":"cursor"},"value":{"kind":"Variable","name":{"kind":"Name","value":"cursor"}}},{"kind":"Argument","name":{"kind":"Name","value":"archived"},"value":{"kind":"Variable","name":{"kind":"Name","value":"archived"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"cursor"}},{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"LimitedUserFields"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"LimitedUserFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"LimitedUser"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"bio"}},{"kind":"Field","name":{"kind":"Name","value":"company"}},{"kind":"Field","name":{"kind":"Name","value":"avatar"}},{"kind":"Field","name":{"kind":"Name","value":"verified"}}]}}]} as unknown as DocumentNode<UserSearchQuery, UserSearchQueryVariables>;
 export const IsLoggedInDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"IsLoggedIn"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activeUser"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]} as unknown as DocumentNode<IsLoggedInQuery, IsLoggedInQueryVariables>;
 export const AdminUsersListDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"AdminUsersList"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"limit"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"offset"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"query"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"adminUsers"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"Variable","name":{"kind":"Name","value":"limit"}}},{"kind":"Argument","name":{"kind":"Name","value":"offset"},"value":{"kind":"Variable","name":{"kind":"Name","value":"offset"}}},{"kind":"Argument","name":{"kind":"Name","value":"query"},"value":{"kind":"Variable","name":{"kind":"Name","value":"query"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}},{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"registeredUser"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"email"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"bio"}},{"kind":"Field","name":{"kind":"Name","value":"company"}},{"kind":"Field","name":{"kind":"Name","value":"avatar"}},{"kind":"Field","name":{"kind":"Name","value":"verified"}},{"kind":"Field","name":{"kind":"Name","value":"profiles"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"authorizedApps"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"invitedUser"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"email"}},{"kind":"Field","name":{"kind":"Name","value":"invitedBy"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}}]}}]}}]}}]} as unknown as DocumentNode<AdminUsersListQuery, AdminUsersListQueryVariables>;
-export const UserTimelineDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"UserTimeline"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"cursor"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"DateTime"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activeUser"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"timeline"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"cursor"},"value":{"kind":"Variable","name":{"kind":"Name","value":"cursor"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}},{"kind":"Field","name":{"kind":"Name","value":"cursor"}},{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ActivityMainFields"}}]}}]}}]}}]}},...ActivityMainFieldsFragmentDoc.definitions]} as unknown as DocumentNode<UserTimelineQuery, UserTimelineQueryVariables>;
+export const UserTimelineDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"UserTimeline"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"cursor"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"DateTime"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activeUser"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"timeline"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"cursor"},"value":{"kind":"Variable","name":{"kind":"Name","value":"cursor"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}},{"kind":"Field","name":{"kind":"Name","value":"cursor"}},{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ActivityMainFields"}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ActivityMainFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Activity"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"actionType"}},{"kind":"Field","name":{"kind":"Name","value":"info"}},{"kind":"Field","name":{"kind":"Name","value":"userId"}},{"kind":"Field","name":{"kind":"Name","value":"streamId"}},{"kind":"Field","name":{"kind":"Name","value":"resourceId"}},{"kind":"Field","name":{"kind":"Name","value":"resourceType"}},{"kind":"Field","name":{"kind":"Name","value":"time"}},{"kind":"Field","name":{"kind":"Name","value":"message"}}]}}]} as unknown as DocumentNode<UserTimelineQuery, UserTimelineQueryVariables>;
 export const ValidatePasswordStrengthDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ValidatePasswordStrength"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"pwd"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"userPwdStrength"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"pwd"},"value":{"kind":"Variable","name":{"kind":"Name","value":"pwd"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"score"}},{"kind":"Field","name":{"kind":"Name","value":"feedback"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"warning"}},{"kind":"Field","name":{"kind":"Name","value":"suggestions"}}]}}]}}]}}]} as unknown as DocumentNode<ValidatePasswordStrengthQuery, ValidatePasswordStrengthQueryVariables>;
 export const EmailVerificationBannerStateDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"EmailVerificationBannerState"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activeUser"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"email"}},{"kind":"Field","name":{"kind":"Name","value":"verified"}},{"kind":"Field","name":{"kind":"Name","value":"hasPendingVerification"}}]}}]}}]} as unknown as DocumentNode<EmailVerificationBannerStateQuery, EmailVerificationBannerStateQueryVariables>;
 export const RequestVerificationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"RequestVerification"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"requestVerification"}}]}}]} as unknown as DocumentNode<RequestVerificationMutation, RequestVerificationMutationVariables>;
diff --git a/packages/objectsender/src/utils/Serializer.ts b/packages/objectsender/src/utils/Serializer.ts
index e263e416e..33a3be01c 100644
--- a/packages/objectsender/src/utils/Serializer.ts
+++ b/packages/objectsender/src/utils/Serializer.ts
@@ -53,7 +53,7 @@ export class Serializer implements IDisposable {
     for (const propKey in obj) {
       const value = obj[propKey]
       // 0. skip some props
-      if (!value || propKey === 'id' || propKey.startsWith('_')) continue
+      if (value === undefined || propKey === 'id' || propKey.startsWith('_')) continue
 
       // 1. primitives (numbers, bools, strings)
       if (typeof value !== 'object') {
diff --git a/packages/preview-service/bin/www b/packages/preview-service/bin/www
index c075d2132..aff48a639 100755
--- a/packages/preview-service/bin/www
+++ b/packages/preview-service/bin/www
@@ -83,7 +83,7 @@ function onError(error) {
 
 function onListening() {
   const addr = server.address()
-  const bind = typeof addr === 'string' ? 'pipe ' + addr : 'port ' + addr.port
+  const bind = typeof addr === 'string' ? 'pipe ' + addr : 'port ' + addr?.port
   serverLogger.info('Listening on ' + bind)
 
   startPreviewService()
diff --git a/packages/preview-service/routes/preview.js b/packages/preview-service/routes/preview.js
index c3ec6d998..c910641a0 100644
--- a/packages/preview-service/routes/preview.js
+++ b/packages/preview-service/routes/preview.js
@@ -62,11 +62,11 @@ async function getScreenshot(objectUrl, boundLogger = logger) {
     headless: shouldBeHeadless,
     userDataDir: '/tmp/puppeteer',
     executablePath: '/usr/bin/google-chrome-stable',
-    args: ['--disable-dev-shm-usage']
+    // we trust the web content that is running, so can disable the sandbox
+    // disabling the sandbox allows us to run the docker image without linux kernel privileges
+    args: ['--no-sandbox', '--disable-setuid-sandbox', '--disable-dev-shm-usage']
   }
-  // if ( process.env.PUPPETEER_SKIP_CHROMIUM_DOWNLOAD === 'true' ) {
-  //   launchParams.executablePath = 'chromium'
-  // }
+
   const browser = await puppeteer.launch(launchParams)
   const page = await browser.newPage()
 
diff --git a/packages/server/assets/betaAutomations/typedefs/betaAutomations.graphql b/packages/server/assets/betaAutomations/typedefs/betaAutomations.graphql
deleted file mode 100644
index 3b8e374f1..000000000
--- a/packages/server/assets/betaAutomations/typedefs/betaAutomations.graphql
+++ /dev/null
@@ -1,147 +0,0 @@
-enum AutomationRunStatus {
-  INITIALIZING
-  RUNNING
-  SUCCEEDED
-  FAILED
-}
-
-extend type Model {
-  automationStatus: AutomationsStatus
-}
-
-extend type Version {
-  automationStatus: AutomationsStatus
-}
-
-type AutomationsStatus {
-  id: ID!
-  status: AutomationRunStatus!
-  statusMessage: String
-  automationRuns: [AutomationRun!]!
-}
-
-# TODO: Currently not needed
-# type Automation {
-#   automationName: String!
-#   automationId: String!
-#   automationRevisionId: String!
-#   createdAt: DateTime!
-#   runs(cursor: String, limit: Int! = 25): AutomationRunsCollection!
-# }
-
-# type AutomationRunsCollection {
-#   totalCount: Int!
-#   cursor: String
-#   items: [AutomationRun!]!
-# }
-
-type AutomationRun {
-  id: ID!
-  automationId: String!
-  automationName: String!
-  versionId: String!
-  createdAt: DateTime!
-  updatedAt: DateTime!
-  functionRuns: [AutomationFunctionRun!]!
-  """
-  Resolved from all function run statuses
-  """
-  status: AutomationRunStatus!
-}
-
-type AutomationFunctionRun {
-  id: ID!
-  functionId: String!
-  functionName: String!
-  functionLogo: String
-  elapsed: Float!
-  status: AutomationRunStatus!
-  # Context view is just a url (most likely overlaid models)
-  contextView: String
-  resultVersions: [Version!]!
-  statusMessage: String
-  """
-  NOTE: this is the schema for the results field below!
-  Current schema: {
-    version: "1.0.0",
-    values: {
-      objectResults: Record<str, {
-        category: string
-        level: ObjectResultLevel
-        objectIds: string[]
-        message: str | null
-        metadata: Records<str, unknown> | null
-        visualoverrides: Records<str, unknown> | null
-      }[]>
-      blobIds?: string[]
-    }
-  }
-  """
-  results: JSONObject # blobIds are in here
-}
-
-input AutomationCreateInput {
-  projectId: String!
-  modelId: String!
-  automationName: String!
-  automationId: String!
-  automationRevisionId: String!
-  webhookId: String
-}
-
-input FunctionRunStatusInput {
-  # we cannot strictly require these values, cause local testers of function, wont have it...
-  # Or should we?
-  functionId: String!
-  functionName: String!
-  functionLogo: String
-  elapsed: Float!
-  status: AutomationRunStatus!
-  contextView: String
-  resultVersionIds: [String!]!
-  statusMessage: String
-  """
-  Current schema: {
-    version: "1.0.0",
-    values: {
-      speckleObjects: Record<ObjectId, {level: string; statusMessage: string}[]>
-      blobIds?: string[]
-    }
-  }
-  """
-  results: JSONObject
-}
-
-input AutomationRunStatusUpdateInput {
-  versionId: String!
-  automationId: String!
-  automationRevisionId: String!
-  automationRunId: String!
-  functionRuns: [FunctionRunStatusInput!]!
-}
-
-type AutomationMutations {
-  functionRunStatusReport(input: AutomationRunStatusUpdateInput!): Boolean!
-    @hasServerRole(role: SERVER_USER)
-    @hasScope(scope: "automate:report-results")
-  create(input: AutomationCreateInput!): Boolean!
-    @hasServerRole(role: SERVER_USER)
-    @hasScope(scope: "automate:report-results")
-}
-
-extend type Mutation {
-  automationMutations: AutomationMutations!
-}
-
-type ProjectAutomationsStatusUpdatedMessage {
-  status: AutomationsStatus!
-  version: Version!
-  model: Model!
-  project: Project!
-}
-
-extend type Subscription {
-  projectAutomationsStatusUpdated(
-    projectId: String!
-  ): ProjectAutomationsStatusUpdatedMessage!
-}
diff --git a/packages/server/codegen.yml b/packages/server/codegen.yml
index 7ed6dabc3..8341f73f1 100644
--- a/packages/server/codegen.yml
+++ b/packages/server/codegen.yml
@@ -32,8 +32,6 @@ generates:
         Comment: '@/modules/comments/helpers/graphTypes#CommentGraphQLReturn'
         PendingStreamCollaborator: '@/modules/serverinvites/helpers/graphTypes#PendingStreamCollaboratorGraphQLReturn'
         FileUpload: '@/modules/fileuploads/helpers/types#FileUploadGraphQLReturn'
-        AutomationMutations: '@/modules/core/helpers/graphTypes#MutationsObjectGraphQLReturn'
-        AutomationFunctionRun: '@/modules/betaAutomations/helpers/graphTypes#AutomationFunctionRunGraphQLReturn'
         AutomateFunction: '@/modules/automate/helpers/graphTypes#AutomateFunctionGraphQLReturn'
         AutomateFunctionRelease: '@/modules/automate/helpers/graphTypes#AutomateFunctionReleaseGraphQLReturn'
         Automation: '@/modules/automate/helpers/graphTypes#AutomationGraphQLReturn'
diff --git a/packages/server/modules/accessrequests/services/stream.ts b/packages/server/modules/accessrequests/services/stream.ts
index d44e567c0..f5126abf9 100644
--- a/packages/server/modules/accessrequests/services/stream.ts
+++ b/packages/server/modules/accessrequests/services/stream.ts
@@ -15,7 +15,7 @@ import {
   ServerAccessRequestRecord
 } from '@/modules/accessrequests/repositories'
 import { StreamInvalidAccessError } from '@/modules/core/errors/stream'
-import { TokenResourceIdentifier } from '@/modules/core/graph/generated/graphql'
+import { TokenResourceIdentifier } from '@/modules/core/domain/tokens/types'
 import { Roles, StreamRoles } from '@/modules/core/helpers/mainConstants'
 import { getStream } from '@/modules/core/repositories/streams'
 import {
diff --git a/packages/server/modules/auth/defaultApps.ts b/packages/server/modules/auth/defaultApps.ts
index abbe6d1e9..86dd4ef34 100644
--- a/packages/server/modules/auth/defaultApps.ts
+++ b/packages/server/modules/auth/defaultApps.ts
@@ -1,5 +1,9 @@
 import { Scopes } from '@/modules/core/helpers/mainConstants'
-import { speckleAutomateUrl, getServerOrigin } from '@/modules/shared/helpers/envHelper'
+import {
+  speckleAutomateUrl,
+  getServerOrigin,
+  getFeatureFlags
+} from '@/modules/shared/helpers/envHelper'
 
 export enum DefaultAppIds {
   Web = 'spklwebapp',
@@ -123,7 +127,9 @@ const SpeckleAutomate = {
     Scopes.Tokens.Write,
     Scopes.Streams.Read,
     Scopes.Streams.Write,
-    Scopes.Automate.ReportResults
+    ...(getFeatureFlags().FF_AUTOMATE_MODULE_ENABLED
+      ? [Scopes.Automate.ReportResults]
+      : [])
   ]
 }
 
diff --git a/packages/server/modules/auth/strategies/azure-ad.js b/packages/server/modules/auth/strategies/azure-ad.js
index 63a5f69fe..22719595e 100644
--- a/packages/server/modules/auth/strategies/azure-ad.js
+++ b/packages/server/modules/auth/strategies/azure-ad.js
@@ -16,6 +16,11 @@ const {
   UserInputError,
   UnverifiedEmailSSOLoginError
 } = require('@/modules/core/errors/userinput')
+const db = require('@/db/knex')
+const {
+  deleteServerOnlyInvitesFactory,
+  updateAllInviteTargetsFactory
+} = require('@/modules/serverinvites/repositories/serverInvites')
 
 module.exports = async (app, session, sessionStorage, finalizeAuth) => {
   const strategy = new OIDCStrategy(
@@ -95,7 +100,10 @@ module.exports = async (app, session, sessionStorage, finalizeAuth) => {
 
           // process invites
           if (myUser.isNewUser) {
-            await finalizeInvitedServerRegistration(user.email, myUser.id)
+            await finalizeInvitedServerRegistration({
+              deleteServerOnlyInvites: deleteServerOnlyInvitesFactory({ db }),
+              updateAllInviteTargets: updateAllInviteTargetsFactory({ db })
+            })(user.email, myUser.id)
           }
 
           return next()
@@ -126,7 +134,10 @@ module.exports = async (app, session, sessionStorage, finalizeAuth) => {
         req.log = req.log.child({ userId: myUser.id })
 
         // use the invite
-        await finalizeInvitedServerRegistration(user.email, myUser.id)
+        await finalizeInvitedServerRegistration({
+          deleteServerOnlyInvites: deleteServerOnlyInvitesFactory({ db }),
+          updateAllInviteTargets: updateAllInviteTargetsFactory({ db })
+        })(user.email, myUser.id)
 
         // Resolve redirect path
         req.authRedirectPath = resolveAuthRedirectPath(validInvite)
diff --git a/packages/server/modules/auth/strategies/github.js b/packages/server/modules/auth/strategies/github.js
index 595d54a86..432278624 100644
--- a/packages/server/modules/auth/strategies/github.js
+++ b/packages/server/modules/auth/strategies/github.js
@@ -17,6 +17,11 @@ const {
   UserInputError,
   UnverifiedEmailSSOLoginError
 } = require('@/modules/core/errors/userinput')
+const db = require('@/db/knex')
+const {
+  deleteServerOnlyInvitesFactory,
+  updateAllInviteTargetsFactory
+} = require('@/modules/serverinvites/repositories/serverInvites')
 
 module.exports = async (app, session, sessionStorage, finalizeAuth) => {
   const strategy = {
@@ -72,7 +77,10 @@ module.exports = async (app, session, sessionStorage, finalizeAuth) => {
 
           // process invites
           if (myUser.isNewUser) {
-            await finalizeInvitedServerRegistration(user.email, myUser.id)
+            await finalizeInvitedServerRegistration({
+              deleteServerOnlyInvites: deleteServerOnlyInvitesFactory({ db }),
+              updateAllInviteTargets: updateAllInviteTargetsFactory({ db })
+            })(user.email, myUser.id)
           }
 
           return done(null, myUser)
@@ -98,7 +106,10 @@ module.exports = async (app, session, sessionStorage, finalizeAuth) => {
         })
 
         // use the invite
-        await finalizeInvitedServerRegistration(user.email, myUser.id)
+        await finalizeInvitedServerRegistration({
+          deleteServerOnlyInvites: deleteServerOnlyInvitesFactory({ db }),
+          updateAllInviteTargets: updateAllInviteTargetsFactory({ db })
+        })(user.email, myUser.id)
 
         // Resolve redirect path
         req.authRedirectPath = resolveAuthRedirectPath(validInvite)
diff --git a/packages/server/modules/auth/strategies/google.js b/packages/server/modules/auth/strategies/google.js
index 99432a7fe..26fae70ce 100644
--- a/packages/server/modules/auth/strategies/google.js
+++ b/packages/server/modules/auth/strategies/google.js
@@ -15,6 +15,11 @@ const {
   UserInputError,
   UnverifiedEmailSSOLoginError
 } = require('@/modules/core/errors/userinput')
+const db = require('@/db/knex')
+const {
+  deleteServerOnlyInvitesFactory,
+  updateAllInviteTargetsFactory
+} = require('@/modules/serverinvites/repositories/serverInvites')
 
 module.exports = async (app, session, sessionStorage, finalizeAuth) => {
   const strategy = {
@@ -66,7 +71,10 @@ module.exports = async (app, session, sessionStorage, finalizeAuth) => {
 
           // process invites
           if (myUser.isNewUser) {
-            await finalizeInvitedServerRegistration(user.email, myUser.id)
+            await finalizeInvitedServerRegistration({
+              deleteServerOnlyInvites: deleteServerOnlyInvitesFactory({ db }),
+              updateAllInviteTargets: updateAllInviteTargetsFactory({ db })
+            })(user.email, myUser.id)
           }
 
           return done(null, myUser)
@@ -92,7 +100,10 @@ module.exports = async (app, session, sessionStorage, finalizeAuth) => {
         })
 
         // use the invite
-        await finalizeInvitedServerRegistration(user.email, myUser.id)
+        await finalizeInvitedServerRegistration({
+          deleteServerOnlyInvites: deleteServerOnlyInvitesFactory({ db }),
+          updateAllInviteTargets: updateAllInviteTargetsFactory({ db })
+        })(user.email, myUser.id)
 
         // Resolve redirect path
         req.authRedirectPath = resolveAuthRedirectPath(validInvite)
diff --git a/packages/server/modules/auth/strategies/local.js b/packages/server/modules/auth/strategies/local.js
index ae46eabbc..290818969 100644
--- a/packages/server/modules/auth/strategies/local.js
+++ b/packages/server/modules/auth/strategies/local.js
@@ -21,6 +21,12 @@ const {
   UserInputError,
   PasswordTooShortError
 } = require('@/modules/core/errors/userinput')
+const {
+  findServerInviteFactory,
+  deleteServerOnlyInvitesFactory,
+  updateAllInviteTargetsFactory
+} = require('@/modules/serverinvites/repositories/serverInvites')
+const db = require('@/db/knex')
 
 module.exports = async (app, session, sessionAppId, finalizeAuth) => {
   const strategy = {
@@ -82,10 +88,12 @@ module.exports = async (app, session, sessionAppId, finalizeAuth) => {
           )
 
         // 2. if you have an invite it must be valid, both for invite only and public servers
-        /** @type {import('@/modules/serverinvites/helpers/types').ServerInviteRecord} */
+        /** @type {import('@/modules/serverinvites/domain/types').ServerInviteRecord} */
         let invite
         if (req.session.token) {
-          invite = await validateServerInvite(user.email, req.session.token)
+          invite = await validateServerInvite({
+            findServerInvite: findServerInviteFactory({ db })
+          })(user.email, req.session.token)
         }
 
         // 3. at this point we know, that we have one of these cases:
@@ -106,7 +114,10 @@ module.exports = async (app, session, sessionAppId, finalizeAuth) => {
         req.log = req.log.child({ userId })
 
         // 4. use up all server-only invites the email had attached to it
-        await finalizeInvitedServerRegistration(user.email, userId)
+        await finalizeInvitedServerRegistration({
+          deleteServerOnlyInvites: deleteServerOnlyInvitesFactory({ db }),
+          updateAllInviteTargets: updateAllInviteTargetsFactory({ db })
+        })(user.email, userId)
 
         // Resolve redirect path
         req.authRedirectPath = resolveAuthRedirectPath(invite)
diff --git a/packages/server/modules/auth/strategies/oidc.js b/packages/server/modules/auth/strategies/oidc.js
index 95ca8fe77..31a9176a9 100644
--- a/packages/server/modules/auth/strategies/oidc.js
+++ b/packages/server/modules/auth/strategies/oidc.js
@@ -21,6 +21,11 @@ const {
 } = require('@/modules/shared/helpers/envHelper')
 const { passportAuthenticate } = require('@/modules/auth/services/passportService')
 const { UnverifiedEmailSSOLoginError } = require('@/modules/core/errors/userinput')
+const {
+  deleteServerOnlyInvitesFactory,
+  updateAllInviteTargetsFactory
+} = require('@/modules/serverinvites/repositories/serverInvites')
+const db = require('@/db/knex')
 const { getNameFromUserInfo } = require('@/modules/auth/domain/logic')
 
 module.exports = async (app, session, sessionStorage, finalizeAuth) => {
@@ -83,7 +88,10 @@ module.exports = async (app, session, sessionStorage, finalizeAuth) => {
 
             // process invites
             if (myUser.isNewUser) {
-              await finalizeInvitedServerRegistration(user.email, myUser.id)
+              await finalizeInvitedServerRegistration({
+                deleteServerOnlyInvites: deleteServerOnlyInvitesFactory({ db }),
+                updateAllInviteTargets: updateAllInviteTargetsFactory({ db })
+              })(user.email, myUser.id)
             }
             return done(null, myUser)
           }
@@ -108,7 +116,10 @@ module.exports = async (app, session, sessionStorage, finalizeAuth) => {
             rawProfile: userinfo
           })
 
-          await finalizeInvitedServerRegistration(user.email, myUser.id)
+          await finalizeInvitedServerRegistration({
+            deleteServerOnlyInvites: deleteServerOnlyInvitesFactory({ db }),
+            updateAllInviteTargets: updateAllInviteTargetsFactory({ db })
+          })(user.email, myUser.id)
 
           // Resolve redirect path
           req.authRedirectPath = resolveAuthRedirectPath(validInvite)
diff --git a/packages/server/modules/auth/tests/auth.spec.js b/packages/server/modules/auth/tests/auth.spec.js
index 53969e074..f8a28e159 100644
--- a/packages/server/modules/auth/tests/auth.spec.js
+++ b/packages/server/modules/auth/tests/auth.spec.js
@@ -9,10 +9,15 @@ const { getUserByEmail } = require('@/modules/core/services/users')
 const { TIME } = require('@speckle/shared')
 const { RATE_LIMITERS, createConsumer } = require('@/modules/core/services/ratelimiter')
 const { beforeEachContext, initializeTestServer } = require('@/test/hooks')
-const { createInviteDirectly } = require('@/test/speckle-helpers/inviteHelper')
-const { getInvite } = require('@/modules/serverinvites/repositories')
+const { createInviteDirectlyFactory } = require('@/test/speckle-helpers/inviteHelper')
 const { RateLimiterMemory } = require('rate-limiter-flexible')
+const {
+  findInviteFactory
+} = require('@/modules/serverinvites/repositories/serverInvites')
+const db = require('@/db/knex')
 
+const createInviteDirectly = createInviteDirectlyFactory({ db })
+const findInvite = findInviteFactory({ db })
 const expect = chai.expect
 
 let app
@@ -155,7 +160,7 @@ describe('Auth @auth', () => {
         expect(newUser).to.be.ok
 
         // Check that in the case of a stream invite, it remainds valid post registration
-        const inviteRecord = await getInvite(inviteId)
+        const inviteRecord = await findInvite(inviteId)
         if (streamInvite) {
           expect(inviteRecord).to.be.ok
         } else {
diff --git a/packages/server/modules/betaAutomations/migrations/20230905162038_automations.ts b/packages/server/modules/automate/migrations/20230905162038_automations.ts
similarity index 100%
rename from packages/server/modules/betaAutomations/migrations/20230905162038_automations.ts
rename to packages/server/modules/automate/migrations/20230905162038_automations.ts
diff --git a/packages/server/modules/betaAutomations/migrations/20230912114629_automations_tables_normalization.ts b/packages/server/modules/automate/migrations/20230912114629_automations_tables_normalization.ts
similarity index 100%
rename from packages/server/modules/betaAutomations/migrations/20230912114629_automations_tables_normalization.ts
rename to packages/server/modules/automate/migrations/20230912114629_automations_tables_normalization.ts
diff --git a/packages/server/modules/betaAutomations/migrations/20230914071540_make_function_run_results_nullable.ts b/packages/server/modules/automate/migrations/20230914071540_make_function_run_results_nullable.ts
similarity index 100%
rename from packages/server/modules/betaAutomations/migrations/20230914071540_make_function_run_results_nullable.ts
rename to packages/server/modules/automate/migrations/20230914071540_make_function_run_results_nullable.ts
diff --git a/packages/server/modules/betaAutomations/migrations/20230920130032_fix_project_delete_cascade.ts b/packages/server/modules/automate/migrations/20230920130032_fix_project_delete_cascade.ts
similarity index 100%
rename from packages/server/modules/betaAutomations/migrations/20230920130032_fix_project_delete_cascade.ts
rename to packages/server/modules/automate/migrations/20230920130032_fix_project_delete_cascade.ts
diff --git a/packages/server/modules/betaAutomations/migrations/20231025100054_automation_function_name_and_logo.ts b/packages/server/modules/automate/migrations/20231025100054_automation_function_name_and_logo.ts
similarity index 100%
rename from packages/server/modules/betaAutomations/migrations/20231025100054_automation_function_name_and_logo.ts
rename to packages/server/modules/automate/migrations/20231025100054_automation_function_name_and_logo.ts
diff --git a/packages/server/modules/betaAutomations/migrations/20240304143445_rename_tables.ts b/packages/server/modules/automate/migrations/20240304143445_rename_tables.ts
similarity index 100%
rename from packages/server/modules/betaAutomations/migrations/20240304143445_rename_tables.ts
rename to packages/server/modules/automate/migrations/20240304143445_rename_tables.ts
diff --git a/packages/server/modules/automate/migrations/20240620105859_drop_beta_tables.ts b/packages/server/modules/automate/migrations/20240620105859_drop_beta_tables.ts
new file mode 100644
index 000000000..29b8421dd
--- /dev/null
+++ b/packages/server/modules/automate/migrations/20240620105859_drop_beta_tables.ts
@@ -0,0 +1,102 @@
+import { Knex } from 'knex'
+
+const AUTOMATIONS_TABLE_NAME_NEW = 'beta_automations'
+const AUTOMATION_RUNS_TABLE_NAME_NEW = 'beta_automation_runs'
+const AUTOMATION_FUNCTION_RUNS_TABLE_NAME_NEW = 'beta_automation_function_runs'
+const AUTOMATION_FUNCTION_RUNS_RESULT_VERSIONS_TABLE_NAME_NEW =
+  'beta_automation_function_runs_result_versions'
+
+const tableNames = [
+  AUTOMATION_FUNCTION_RUNS_RESULT_VERSIONS_TABLE_NAME_NEW,
+  AUTOMATION_FUNCTION_RUNS_TABLE_NAME_NEW,
+  AUTOMATION_RUNS_TABLE_NAME_NEW,
+  AUTOMATIONS_TABLE_NAME_NEW
+]
+
+const currentBetaTableCreationScript = `
+create table beta_automations
+(
+    "automationId"         varchar(255)                                          not null,
+    "automationRevisionId" varchar(255)                                          not null,
+    "automationName"       varchar(255)                                          not null,
+    "projectId"            varchar(255)                                          not null
+        constraint automations_projectid_foreign
+            references streams
+            on delete cascade,
+    "modelId"              varchar(255)                                          not null
+        constraint automations_modelid_foreign
+            references branches
+            on delete cascade,
+    "createdAt"            timestamp(3) with time zone default CURRENT_TIMESTAMP not null,
+    "updatedAt"            timestamp(3) with time zone default CURRENT_TIMESTAMP not null,
+    "webhookId"            varchar(255)
+        constraint automations_webhookid_foreign
+            references webhooks_config
+            on delete set null,
+    constraint automations_pkey
+        primary key ("automationId", "automationRevisionId")
+);
+
+create table beta_automation_runs
+(
+    "automationId"         varchar(255)                                          not null,
+    "automationRevisionId" varchar(255)                                          not null,
+    "versionId"            varchar(255)                                          not null
+        constraint automation_runs_versionid_foreign
+            references commits
+            on delete cascade,
+    "automationRunId"      varchar(255)                                          not null
+        constraint automation_runs_pkey
+            primary key,
+    "createdAt"            timestamp(3) with time zone default CURRENT_TIMESTAMP not null,
+    "updatedAt"            timestamp(3) with time zone default CURRENT_TIMESTAMP not null,
+    constraint automation_runs_automationid_automationrevisionid_foreign
+        foreign key ("automationId", "automationRevisionId") references beta_automations
+            on delete cascade
+);
+
+create table beta_automation_function_runs
+(
+    "automationRunId" varchar(255)                                                not null
+        constraint automation_function_runs_automationrunid_foreign
+            references beta_automation_runs
+            on delete cascade,
+    "functionId"      varchar(255)                                                not null,
+    elapsed           real                                                        not null,
+    status            varchar(255)                                                not null,
+    "contextView"     varchar(255),
+    "statusMessage"   varchar(255),
+    results           jsonb,
+    "functionName"    varchar(255) default 'majestic function'::character varying not null,
+    "functionLogo"    text,
+    constraint automation_function_runs_pkey
+        primary key ("automationRunId", "functionId")
+);
+
+create table beta_automation_function_runs_result_versions
+(
+    "automationRunId" varchar(255) not null,
+    "functionId"      varchar(255) not null,
+    "resultVersionId" varchar(255) not null
+        constraint automation_function_runs_result_versions_resultversionid_foreig
+            references commits
+            on delete cascade,
+    constraint automation_function_runs_result_versions_pkey
+        primary key ("automationRunId", "functionId", "resultVersionId"),
+    constraint automation_function_runs_result_versions_automationrunid_functi
+        foreign key ("automationRunId", "functionId") references beta_automation_function_runs
+            on delete cascade
+);
+`
+
+export async function up(knex: Knex): Promise<void> {
+  // Delete in order
+  for (const tableName of tableNames) {
+    await knex.schema.dropTableIfExists(tableName)
+  }
+}
+
+export async function down(knex: Knex): Promise<void> {
+  // recreate tables from script
+  await knex.raw(currentBetaTableCreationScript)
+}
diff --git a/packages/server/modules/betaAutomations/errors/automations.ts b/packages/server/modules/betaAutomations/errors/automations.ts
deleted file mode 100644
index eebe99048..000000000
--- a/packages/server/modules/betaAutomations/errors/automations.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { BaseError } from '@/modules/shared/errors/base'
-
-export class AutomationNotFoundError extends BaseError {
-  static defaultMessage = 'Attempting to work with a non-existant automation'
-  static code = 'AUTOMATION_NOT_FOUND'
-}
diff --git a/packages/server/modules/betaAutomations/graph/resolvers/automations.ts b/packages/server/modules/betaAutomations/graph/resolvers/automations.ts
deleted file mode 100644
index 86b41e35b..000000000
--- a/packages/server/modules/betaAutomations/graph/resolvers/automations.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-import {
-  createModelAutomation,
-  getAutomationsStatus,
-  upsertModelAutomationRunResult
-} from '@/modules/betaAutomations/services/management'
-import { formatResults } from '@/modules/betaAutomations/services/results'
-import { Resolvers } from '@/modules/core/graph/generated/graphql'
-import { getStream } from '@/modules/core/repositories/streams'
-import {
-  ProjectSubscriptions,
-  filteredSubscribe
-} from '@/modules/shared/utils/subscriptions'
-import { ForbiddenError } from 'apollo-server-express'
-
-export = {
-  Model: {
-    async automationStatus(parent, _, ctx) {
-      const modelId = parent.id
-      const projectId = parent.streamId
-      const latestCommit = await ctx.loaders.branches.getLatestCommit.load(parent.id)
-
-      // if the model has no versions, no automations could have run
-      if (!latestCommit) return null
-
-      return await getAutomationsStatus({
-        projectId,
-        modelId,
-        versionId: latestCommit.id
-      })
-    }
-  },
-  Version: {
-    async automationStatus(parent, _, ctx) {
-      const versionId = parent.id
-      const branch = await ctx.loaders.commits.getCommitBranch.load(versionId)
-      if (!branch) throw Error('Invalid version Id')
-
-      const projectId = branch.streamId
-      const modelId = branch.id
-      return await getAutomationsStatus({
-        projectId,
-        modelId,
-        versionId
-      })
-    }
-  },
-  AutomationFunctionRun: {
-    async resultVersions(parent, _, ctx) {
-      return ctx.loaders.automationFunctionRuns.getResultVersions.load([
-        parent.automationRunId,
-        parent.functionId
-      ])
-    },
-    async results(parent) {
-      const originalResults = parent.results
-      if (!originalResults) return null
-      return formatResults(originalResults)
-    },
-    id(parent) {
-      return `${parent.automationRunId}-${parent.functionId}`
-    }
-  },
-  Mutation: {
-    automationMutations: () => ({})
-  },
-  AutomationMutations: {
-    async create(_, args, context) {
-      await createModelAutomation(args.input, context.userId)
-      return true
-    },
-    async functionRunStatusReport(_, args, context) {
-      const { userId, log } = context
-      await upsertModelAutomationRunResult({ userId, input: args.input, logger: log })
-      return true
-    }
-  },
-  Subscription: {
-    projectAutomationsStatusUpdated: {
-      subscribe: filteredSubscribe(
-        ProjectSubscriptions.ProjectAutomationStatusUpdated,
-        async (payload, variables, context) => {
-          if (payload.projectId !== variables.projectId) return false
-
-          const stream = await getStream({
-            streamId: variables.projectId,
-            userId: context.userId
-          })
-          if (
-            !stream ||
-            (!(stream.isDiscoverable || stream.isPublic) && !stream.role)
-          ) {
-            throw new ForbiddenError('You are not authorized.')
-          }
-
-          return true
-        }
-      )
-    }
-  }
-} as Resolvers
diff --git a/packages/server/modules/betaAutomations/helpers/graphTypes.ts b/packages/server/modules/betaAutomations/helpers/graphTypes.ts
deleted file mode 100644
index 0e48c2715..000000000
--- a/packages/server/modules/betaAutomations/helpers/graphTypes.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { AutomationFunctionRunRecord } from '@/modules/betaAutomations/helpers/types'
-
-export type AutomationFunctionRunGraphQLReturn = AutomationFunctionRunRecord
diff --git a/packages/server/modules/betaAutomations/helpers/inputTypes.ts b/packages/server/modules/betaAutomations/helpers/inputTypes.ts
deleted file mode 100644
index a5ff8cbc5..000000000
--- a/packages/server/modules/betaAutomations/helpers/inputTypes.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import { AutomationRunStatus } from '@/modules/core/graph/generated/graphql'
-import { z } from 'zod'
-
-const CurrentObjectResultsVersion = '1.0.0'
-
-const SupportedObjectResultsVersions = [CurrentObjectResultsVersion] as const
-
-const ObjectResultLevel = ['INFO', 'WARNING', 'ERROR'] as const
-
-const ObjectResultLevelEnum = z.enum(ObjectResultLevel)
-
-const ObjectResultValuesSchema = z.object({
-  level: ObjectResultLevelEnum,
-  message: z.string().nullable(),
-  category: z.string(),
-  objectIds: z.string().array().nonempty(),
-  metadata: z.record(z.string(), z.unknown()).nullable(),
-  visualOverrides: z.record(z.string(), z.unknown()).nullable()
-})
-
-const FirstVersionResultsSchema = z.object({
-  version: z.enum(SupportedObjectResultsVersions),
-  values: z.object({
-    objectResults: ObjectResultValuesSchema.array(),
-    blobIds: z.string().array().optional()
-  })
-})
-
-export type FirstVersionResults = z.infer<typeof FirstVersionResultsSchema>
-
-export type CurrentVersionResults = FirstVersionResults
-
-// As new versions are added, add the type to this union
-export type Results = FirstVersionResults // | SecondVersionResults | ThirdVersionResults
-
-const FunctionRunStatusSchema = z
-  .object({
-    functionId: z.string().min(1),
-    functionName: z.string().min(1),
-    functionLogo: z.string().nullable(),
-    elapsed: z.number(),
-    status: z.nativeEnum(AutomationRunStatus),
-    contextView: z
-      .string()
-      .nullable()
-      .default(null)
-      .refine(
-        (v) => {
-          if (v === null) return true
-          return !!/^\/projects\/[a-zA-Z0-9]+\/models\//i.exec(v)
-        },
-        { message: 'Invalid relative viewer URL' }
-      ),
-    resultVersionIds: z.string().array(),
-    statusMessage: z.string().nullable().default(null),
-    results: FirstVersionResultsSchema.nullable().default(null)
-  })
-  .refine(
-    (schema) => {
-      if (schema.status === AutomationRunStatus.Succeeded && !schema.results) {
-        return false
-      }
-
-      return true
-    },
-    { message: 'Results must be provided for successful runs' }
-  )
-
-export const AutomationRunSchema = z.object({
-  automationId: z.string().min(1),
-  automationRevisionId: z.string().min(1),
-  automationRunId: z.string().min(1),
-  versionId: z.string().min(1),
-  createdAt: z.date(),
-  updatedAt: z.date(),
-  functionRuns: z.array(FunctionRunStatusSchema).min(1)
-})
-
-export type AutomationRun = z.infer<typeof AutomationRunSchema>
diff --git a/packages/server/modules/betaAutomations/helpers/types.ts b/packages/server/modules/betaAutomations/helpers/types.ts
deleted file mode 100644
index 00677f91b..000000000
--- a/packages/server/modules/betaAutomations/helpers/types.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { Results } from '@/modules/betaAutomations/helpers/inputTypes'
-import { AutomationRunStatus } from '@/modules/core/graph/generated/graphql'
-import { Nullable } from '@speckle/shared'
-
-export type AutomationRecord = {
-  automationId: string
-  projectId: string
-  modelId: string
-  createdAt: Date
-  updatedAt: Date
-  automationRevisionId: string
-  automationName: string
-}
-
-export type AutomationRunRecord = {
-  automationId: string
-  automationRevisionId: string
-  automationRunId: string
-  versionId: string
-  createdAt: Date
-  updatedAt: Date
-  automationName: string
-}
-
-export type AutomationFunctionRunRecord = {
-  automationRunId: string
-  functionId: string
-  functionName: string
-  functionLogo: string | null
-  elapsed: number
-  status: AutomationRunStatus
-  contextView: Nullable<string>
-  statusMessage: Nullable<string>
-  results: Nullable<Results>
-}
-
-export type AutomationFunctionRunsResultVersionRecord = {
-  automationRunId: string
-  functionId: string
-  resultVersionId: string
-}
diff --git a/packages/server/modules/betaAutomations/index.ts b/packages/server/modules/betaAutomations/index.ts
deleted file mode 100644
index 622d8d636..000000000
--- a/packages/server/modules/betaAutomations/index.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { moduleLogger } from '@/logging/logging'
-import { TokenScopeData } from '@/modules/shared/domain/rolesAndScopes/types'
-import { registerOrUpdateScope } from '@/modules/shared/repositories/scopes'
-import { SpeckleModule } from '@/modules/shared/helpers/typeHelper'
-import { Scopes } from '@speckle/shared'
-import db from '@/db/knex'
-
-async function initScopes() {
-  const scopes: TokenScopeData[] = [
-    {
-      name: Scopes.Automate.ReportResults,
-      description: 'Report automation results to the server.',
-      public: true
-    }
-  ]
-
-  const registerFunc = registerOrUpdateScope({ db })
-  for (const scope of scopes) {
-    await registerFunc({ scope })
-  }
-}
-
-const automationModule: SpeckleModule = {
-  async init() {
-    moduleLogger.info('🤖 Init BETA automate module')
-    await initScopes()
-  }
-}
-
-export = automationModule
diff --git a/packages/server/modules/betaAutomations/repositories/automations.ts b/packages/server/modules/betaAutomations/repositories/automations.ts
deleted file mode 100644
index cdb5c4dd3..000000000
--- a/packages/server/modules/betaAutomations/repositories/automations.ts
+++ /dev/null
@@ -1,216 +0,0 @@
-import { Logger } from '@/logging/logging'
-import {
-  AutomationFunctionRunRecord,
-  AutomationFunctionRunsResultVersionRecord,
-  AutomationRecord,
-  AutomationRunRecord
-} from '@/modules/betaAutomations/helpers/types'
-import {
-  BetaAutomations,
-  BetaAutomationRuns,
-  BetaAutomationFunctionRuns,
-  BetaAutomationFunctionRunsResultVersions,
-  Commits
-} from '@/modules/core/dbSchema'
-import { CommitRecord } from '@/modules/core/helpers/types'
-import { Optional } from '@speckle/shared'
-import { isArray, pick } from 'lodash'
-import { SetOptional } from 'type-fest'
-
-export const upsertAutomation = async (
-  automation: SetOptional<AutomationRecord, 'createdAt' | 'updatedAt'>
-) =>
-  await BetaAutomations.knex()
-    .insert(pick(automation, BetaAutomations.withoutTablePrefix.cols))
-    .onConflict([
-      BetaAutomations.withoutTablePrefix.col.automationId,
-      BetaAutomations.withoutTablePrefix.col.automationRevisionId
-    ])
-    .merge(
-      BetaAutomations.withoutTablePrefix.cols.filter(
-        (c) => c !== BetaAutomations.withoutTablePrefix.col.createdAt
-      )
-    )
-
-export const getAutomation = async (
-  automationId: string
-): Promise<Optional<AutomationRecord>> => {
-  return await BetaAutomations.knex<AutomationRecord>()
-    .where({ [BetaAutomations.col.automationId]: automationId })
-    .first()
-}
-
-export const upsertAutomationRunData = async (automationRun: AutomationRunRecord) => {
-  const insertModel = pick(
-    automationRun,
-    BetaAutomationRuns.withoutTablePrefix.cols
-  ) as AutomationRunRecord
-
-  return await BetaAutomationRuns.knex()
-    .insert(insertModel)
-    .onConflict(BetaAutomationRuns.withoutTablePrefix.col.automationRunId)
-    .merge()
-}
-
-export const upsertAutomationFunctionRunData = async (
-  automationFunctionRuns: AutomationFunctionRunRecord | AutomationFunctionRunRecord[],
-  logger: Logger
-) => {
-  const runs = isArray(automationFunctionRuns)
-    ? automationFunctionRuns
-    : [automationFunctionRuns]
-
-  logger.info({ runs }, 'Upserting runs.')
-  const normalizedModels = runs.map((run) => {
-    return pick(
-      run,
-      BetaAutomationFunctionRuns.withoutTablePrefix.cols
-    ) as AutomationFunctionRunRecord
-  })
-
-  logger.info({ normalizedModels }, 'Normalized runs.')
-  return await BetaAutomationFunctionRuns.knex()
-    .insert(normalizedModels)
-    .onConflict([
-      BetaAutomationFunctionRuns.withoutTablePrefix.col.automationRunId,
-      BetaAutomationFunctionRuns.withoutTablePrefix.col.functionId
-    ])
-    .merge()
-}
-
-export const insertAutomationFunctionRunResultVersion = async (
-  functionRunVersions:
-    | AutomationFunctionRunsResultVersionRecord
-    | AutomationFunctionRunsResultVersionRecord[]
-) => {
-  const versions = isArray(functionRunVersions)
-    ? functionRunVersions
-    : [functionRunVersions]
-  if (!versions.length) return
-
-  const normalizedModels = versions.map((run) => {
-    return pick(
-      run,
-      BetaAutomationFunctionRunsResultVersions.withoutTablePrefix.cols
-    ) as AutomationFunctionRunsResultVersionRecord
-  })
-
-  return await BetaAutomationFunctionRunsResultVersions.knex().insert(normalizedModels)
-}
-
-export const deleteResultVersionsForRuns = async (
-  keyPairs: [functionId: string, automationRunId: string][]
-) => {
-  return await BetaAutomationFunctionRunsResultVersions.knex()
-    .whereIn(
-      [
-        BetaAutomationFunctionRunsResultVersions.col.functionId,
-        BetaAutomationFunctionRunsResultVersions.col.automationRunId
-      ],
-      keyPairs
-    )
-    .del()
-}
-
-export const getAutomationRun = async (
-  automationRunId: string
-): Promise<Optional<AutomationRunRecord>> => {
-  return await BetaAutomationRuns.knex<AutomationRunRecord>()
-    .where({ [BetaAutomationRuns.col.automationRunId]: automationRunId })
-    .first()
-}
-
-export const getLatestAutomationRunsFor = async (
-  params: {
-    projectId: string
-    modelId: string
-    versionId: string
-  },
-  options?: Partial<{
-    limit: number
-  }>
-): Promise<AutomationRunRecord[]> => {
-  const { projectId, modelId, versionId } = params
-  const { limit = 20 } = options || {}
-
-  const runs = await BetaAutomationRuns.knex()
-    .select<AutomationRunRecord[]>([
-      ...BetaAutomationRuns.cols,
-      `${BetaAutomations.name}.${BetaAutomations.withoutTablePrefix.col.automationName}`
-    ])
-    .join(
-      BetaAutomations.name,
-      BetaAutomationRuns.col.automationId,
-      BetaAutomations.col.automationId
-    )
-    .where({ [BetaAutomations.col.projectId]: projectId })
-    .andWhere({ [BetaAutomations.col.modelId]: modelId })
-    .andWhere({ [BetaAutomationRuns.col.versionId]: versionId })
-    .distinctOn(BetaAutomationRuns.col.automationId)
-    .orderBy([
-      { column: BetaAutomationRuns.col.automationId },
-      { column: BetaAutomationRuns.col.createdAt, order: 'desc' }
-    ])
-    .limit(limit)
-
-  return runs
-}
-
-/**
- * Get function runs for automation runs. The result is an object keyed by automationRunId,
- * with each value being a map between functionId and function run.
- */
-export const getFunctionRunsForAutomationRuns = async (
-  automationRunids: string[]
-): Promise<Record<string, Record<string, AutomationFunctionRunRecord>>> => {
-  const runs = await BetaAutomationFunctionRuns.knex()
-    .select<AutomationFunctionRunRecord[]>(BetaAutomationFunctionRuns.cols)
-    .whereIn(BetaAutomationFunctionRuns.col.automationRunId, automationRunids)
-
-  const grouped = runs.reduce((acc, run) => {
-    if (!acc[run.automationRunId]) acc[run.automationRunId] = {}
-    acc[run.automationRunId][run.functionId] = run
-    return acc
-  }, {} as Record<string, Record<string, AutomationFunctionRunRecord>>)
-
-  return grouped
-}
-
-/**
- * Get versions/commits for specified function runs. The result is an object keyed by automationRunId,
- * with each value being a map between functionId and a commit.
- */
-export const getAutomationFunctionRunResultVersions = async (
-  idPairs: Array<[automationRunId: string, functionId: string]>
-): Promise<Record<string, Record<string, CommitRecord[]>>> => {
-  const q = BetaAutomationFunctionRunsResultVersions.knex()
-    .select<Array<CommitRecord & AutomationFunctionRunsResultVersionRecord>>(
-      ...Commits.cols,
-      ...BetaAutomationFunctionRunsResultVersions.cols
-    )
-    .innerJoin(
-      Commits.name,
-      BetaAutomationFunctionRunsResultVersions.col.resultVersionId,
-      Commits.col.id
-    )
-    .whereIn(
-      [
-        BetaAutomationFunctionRunsResultVersions.col.automationRunId,
-        BetaAutomationFunctionRunsResultVersions.col.functionId
-      ],
-      idPairs
-    )
-
-  const versions = await q
-
-  const grouped = versions.reduce((acc, version) => {
-    if (!acc[version.automationRunId]) acc[version.automationRunId] = {}
-    if (!acc[version.automationRunId][version.functionId])
-      acc[version.automationRunId][version.functionId] = []
-
-    acc[version.automationRunId][version.functionId].push(version)
-    return acc
-  }, {} as Record<string, Record<string, CommitRecord[]>>)
-
-  return grouped
-}
diff --git a/packages/server/modules/betaAutomations/services/management.ts b/packages/server/modules/betaAutomations/services/management.ts
deleted file mode 100644
index 0a2ff2a08..000000000
--- a/packages/server/modules/betaAutomations/services/management.ts
+++ /dev/null
@@ -1,283 +0,0 @@
-import { getBranchById } from '@/modules/core/repositories/branches'
-import { getStream } from '@/modules/core/repositories/streams'
-import { MaybeNullOrUndefined, Roles } from '@speckle/shared'
-import {
-  getAutomationRun,
-  getAutomation,
-  upsertAutomation,
-  upsertAutomationFunctionRunData,
-  insertAutomationFunctionRunResultVersion,
-  getLatestAutomationRunsFor,
-  getFunctionRunsForAutomationRuns,
-  deleteResultVersionsForRuns
-} from '@/modules/betaAutomations/repositories/automations'
-import _, { flatMap, uniqBy } from 'lodash'
-import {
-  AutomationCreateInput,
-  AutomationRunStatusUpdateInput,
-  AutomationRunStatus,
-  AutomationRun
-} from '@/modules/core/graph/generated/graphql'
-import { upsertAutomationRunData } from '@/modules/betaAutomations/repositories/automations'
-import {
-  AutomationFunctionRunRecord,
-  AutomationFunctionRunsResultVersionRecord,
-  AutomationRunRecord
-} from '@/modules/betaAutomations/helpers/types'
-import { ForbiddenError } from '@/modules/shared/errors'
-import { Merge } from 'type-fest'
-import { AutomationFunctionRunGraphQLReturn } from '@/modules/betaAutomations/helpers/graphTypes'
-import { AutomationRunSchema } from '@/modules/betaAutomations/helpers/inputTypes'
-import { StreamNotFoundError } from '@/modules/core/errors/stream'
-import { BranchNotFoundError } from '@/modules/core/errors/branch'
-import {
-  getCommits,
-  getCommit,
-  getCommitBranch
-} from '@/modules/core/repositories/commits'
-import { AutomationNotFoundError } from '@/modules/betaAutomations/errors/automations'
-import { CommitNotFoundError } from '@/modules/core/errors/commit'
-import { ProjectSubscriptions, publish } from '@/modules/shared/utils/subscriptions'
-import { Logger } from '@/logging/logging'
-
-type AutomationRunWithFunctionRunsRecord = AutomationRunRecord & {
-  functionRuns: AutomationFunctionRunRecord[]
-}
-
-export const createModelAutomation = async (
-  automation: AutomationCreateInput,
-  userId?: string
-) => {
-  // stream acl for user
-  const stream = await getStream({ userId, streamId: automation.projectId })
-  if (!stream) throw new StreamNotFoundError('Project not found')
-  if (stream.role !== Roles.Stream.Owner)
-    throw new ForbiddenError('Only project owners are allowed.')
-
-  const branch = await getBranchById(automation.modelId, {
-    streamId: automation.projectId
-  })
-  if (!branch) throw new BranchNotFoundError('Model not found')
-
-  const insertModel = { ...automation, modelId: branch.id, createdAt: new Date() }
-  await upsertAutomation(insertModel)
-}
-
-export async function upsertModelAutomationRunResult({
-  userId,
-  input,
-  logger
-}: {
-  userId: MaybeNullOrUndefined<string>
-  input: AutomationRunStatusUpdateInput
-  logger: Logger
-}) {
-  logger.info({ input }, 'Received automation run result data')
-  // validate input against schema
-  const validatedInput = AutomationRunSchema.parse({
-    ...input,
-    createdAt: new Date(),
-    updatedAt: new Date()
-  })
-
-  logger.info({ validatedInput }, 'Validated automation run result data')
-
-  // get the automation from the DB
-  const automation = await getAutomation(input.automationId)
-  if (!automation) throw new AutomationNotFoundError()
-
-  const [stream, version, model] = await Promise.all([
-    getStream({
-      userId: userId || undefined,
-      streamId: automation.projectId
-    }),
-    getCommit(validatedInput.versionId, {
-      streamId: automation.projectId
-    }),
-    getCommitBranch(validatedInput.versionId)
-  ])
-
-  // this is never going to happen, cause the automation has an FK to the streamId
-  if (!stream) throw new StreamNotFoundError('Project not found')
-  if (stream.role !== Roles.Stream.Owner)
-    throw new ForbiddenError('Only project owners are allowed')
-  if (!version) throw new CommitNotFoundError()
-  if (!model) throw new BranchNotFoundError()
-
-  // store the result of the run, if it already exists, patch it
-  const maybeAutomationRun = await getAutomationRun(input.automationRunId)
-  if (maybeAutomationRun) {
-    // some bits we do not allow overriding
-    validatedInput.createdAt = maybeAutomationRun.createdAt
-    validatedInput.versionId = maybeAutomationRun.versionId
-    validatedInput.automationId = maybeAutomationRun.automationId
-    validatedInput.automationRevisionId = maybeAutomationRun.automationRevisionId
-  }
-
-  await upsertAutomationRunData({ ...validatedInput, automationName: 'pasta' })
-
-  // upsert run function runs
-  const runs = uniqBy(
-    validatedInput.functionRuns.map(
-      (s): AutomationFunctionRunRecord => ({
-        ...s,
-        automationRunId: validatedInput.automationRunId
-      })
-    ),
-    (v) => `${v.automationRunId}-${v.functionId}`
-  )
-  logger.info({ runs }, 'Uniqued automation run result data')
-  await upsertAutomationFunctionRunData(runs, logger)
-
-  // create new result version records
-  const versionsRecords: AutomationFunctionRunsResultVersionRecord[] = flatMap(
-    validatedInput.functionRuns
-      .filter((s) => s.resultVersionIds?.length)
-      .map((s) => ({
-        functionId: s.functionId,
-        automationRunId: validatedInput.automationRunId,
-        resultVersionIds: s.resultVersionIds
-      })),
-    (i) => {
-      return i.resultVersionIds.map((v) => ({
-        functionId: i.functionId,
-        automationRunId: i.automationRunId,
-        resultVersionId: v
-      }))
-    }
-  )
-  logger.info({ versionsRecords }, 'Version records flat mapped')
-  const validatedVersions = await getCommits(
-    versionsRecords.map((r) => r.resultVersionId)
-  )
-  const validVersionsRecords = uniqBy(
-    versionsRecords.filter((r) =>
-      validatedVersions.find(
-        (vv) => vv.id === r.resultVersionId && vv.streamId === stream.id
-      )
-    ),
-    (v) => `${v.automationRunId}-${v.functionId}-${v.resultVersionId}`
-  )
-
-  // delete old/stale versions and re-insert new valid ones (in case this is an update to an existing run)
-  await deleteResultVersionsForRuns(
-    validatedInput.functionRuns.map((s) => [
-      s.functionId,
-      validatedInput.automationRunId
-    ])
-  )
-  await insertAutomationFunctionRunResultVersion(validVersionsRecords)
-
-  // Emit subscription
-  const newStatus = await getAutomationsStatus({
-    modelId: version.branchId,
-    projectId: stream.id,
-    versionId: version.id
-  })
-  logger.info({ newStatus }, 'Emiting new status event')
-  if (newStatus) {
-    await publish(ProjectSubscriptions.ProjectAutomationStatusUpdated, {
-      projectId: stream.id,
-      projectAutomationsStatusUpdated: {
-        status: newStatus,
-        version,
-        project: stream,
-        model
-      }
-    })
-  }
-}
-
-const anyFunctionRunsHaveStatus = (
-  ar: AutomationRunWithFunctionRunsRecord,
-  status: AutomationRunStatus
-) => ar.functionRuns.some((st) => st.status === status)
-
-const anyFunctionRunsHaveFailed = (ar: AutomationRunWithFunctionRunsRecord): boolean =>
-  anyFunctionRunsHaveStatus(ar, AutomationRunStatus.Failed)
-
-const anyFunctionRunsRunning = (ar: AutomationRunWithFunctionRunsRecord): boolean =>
-  anyFunctionRunsHaveStatus(ar, AutomationRunStatus.Running)
-
-const anyFunctionRunsInitializing = (
-  ar: AutomationRunWithFunctionRunsRecord
-): boolean => anyFunctionRunsHaveStatus(ar, AutomationRunStatus.Initializing)
-
-export const getAutomationsStatus = async ({
-  projectId,
-  modelId,
-  versionId
-}: {
-  projectId: string
-  modelId: string
-  versionId: string
-}) => {
-  const automationRunRecords = await getLatestAutomationRunsFor({
-    projectId,
-    modelId,
-    versionId
-  })
-  if (!automationRunRecords.length) return null
-
-  const functionRuns = await getFunctionRunsForAutomationRuns(
-    automationRunRecords.map((r) => r.automationRunId)
-  )
-  const runsWithFunctionRuns: AutomationRunWithFunctionRunsRecord[] =
-    automationRunRecords.map((ar) => {
-      return {
-        ...ar,
-        functionRuns: Object.values(functionRuns[ar.automationRunId] || {})
-      }
-    })
-
-  const automationRuns: Array<
-    Merge<AutomationRun, { functionRuns: AutomationFunctionRunGraphQLReturn[] }>
-  > = runsWithFunctionRuns.map((ar) => {
-    let status: AutomationRunStatus = AutomationRunStatus.Succeeded
-    if (anyFunctionRunsHaveFailed(ar)) {
-      status = AutomationRunStatus.Failed
-    } else if (anyFunctionRunsRunning(ar)) {
-      status = AutomationRunStatus.Running
-    } else if (anyFunctionRunsInitializing(ar)) {
-      status = AutomationRunStatus.Initializing
-    }
-    return { ..._.cloneDeep(ar), status, id: ar.automationRunId }
-  })
-
-  const failedAutomations = automationRuns.filter(
-    (a) => a.status === AutomationRunStatus.Failed
-  )
-
-  const runningAutomations = automationRuns.filter(
-    (a) => a.status === AutomationRunStatus.Running
-  )
-  const initializingAutomations = automationRuns.filter(
-    (a) => a.status === AutomationRunStatus.Initializing
-  )
-
-  let status = AutomationRunStatus.Succeeded
-  let statusMessage = 'All automations have succeeded'
-
-  if (failedAutomations.length) {
-    status = AutomationRunStatus.Failed
-    statusMessage = 'Some automations have failed:'
-    for (const fa of failedAutomations) {
-      for (const functionRunStatus of fa.functionRuns) {
-        if (functionRunStatus.status === AutomationRunStatus.Failed)
-          statusMessage += `\n${functionRunStatus.statusMessage}`
-      }
-    }
-  } else if (runningAutomations.length) {
-    status = AutomationRunStatus.Running
-    statusMessage = 'Some automations are running'
-  } else if (initializingAutomations.length) {
-    status = AutomationRunStatus.Initializing
-    statusMessage = 'Some automations are initializing'
-  }
-  return {
-    status,
-    automationRuns,
-    statusMessage,
-    id: versionId
-  }
-}
diff --git a/packages/server/modules/betaAutomations/services/results.ts b/packages/server/modules/betaAutomations/services/results.ts
deleted file mode 100644
index e96bfa220..000000000
--- a/packages/server/modules/betaAutomations/services/results.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import {
-  Results,
-  CurrentVersionResults
-} from '@/modules/betaAutomations/helpers/inputTypes'
-
-export const formatResults = (results: Results): CurrentVersionResults => {
-  // TODO: As new versions are introduced, make sure this function is updated
-  // and able to convert all of them to `CurrentVersionResults`
-  return results
-}
diff --git a/packages/server/modules/core/dbSchema.ts b/packages/server/modules/core/dbSchema.ts
index 511de61a6..24cb328ff 100644
--- a/packages/server/modules/core/dbSchema.ts
+++ b/packages/server/modules/core/dbSchema.ts
@@ -490,46 +490,6 @@ export const FileUploads = buildTableHelper('file_uploads', [
   'convertedCommitId'
 ])
 
-export const BetaAutomations = buildTableHelper('beta_automations', [
-  'automationId',
-  'automationRevisionId',
-  'automationName',
-  'projectId',
-  'modelId',
-  'createdAt',
-  'updatedAt',
-  'webhookId'
-])
-
-export const BetaAutomationRuns = buildTableHelper('beta_automation_runs', [
-  'automationId',
-  'automationRevisionId',
-  'automationRunId',
-  'versionId',
-  'createdAt',
-  'updatedAt'
-])
-
-export const BetaAutomationFunctionRuns = buildTableHelper(
-  'beta_automation_function_runs',
-  [
-    'automationRunId',
-    'functionId',
-    'functionName',
-    'functionLogo',
-    'elapsed',
-    'status',
-    'contextView',
-    'statusMessage',
-    'results'
-  ]
-)
-
-export const BetaAutomationFunctionRunsResultVersions = buildTableHelper(
-  'beta_automation_function_runs_result_versions',
-  ['automationRunId', 'functionId', 'resultVersionId']
-)
-
 export const ServerAppsScopes = buildTableHelper('server_apps_scopes', [
   'appId',
   'scopeName'
diff --git a/packages/server/modules/core/domain/tokens/types.ts b/packages/server/modules/core/domain/tokens/types.ts
new file mode 100644
index 000000000..33b58e5bb
--- /dev/null
+++ b/packages/server/modules/core/domain/tokens/types.ts
@@ -0,0 +1,9 @@
+export const TokenResourceIdentifierType = {
+  Project: 'project'
+} as const
+
+export type TokenResourceIdentifierType =
+  (typeof TokenResourceIdentifierType)[keyof typeof TokenResourceIdentifierType]
+
+// TODO: these should be moved to domain
+export type TokenResourceIdentifier = { id: string; type: TokenResourceIdentifierType }
diff --git a/packages/server/modules/core/graph/generated/graphql.ts b/packages/server/modules/core/graph/generated/graphql.ts
index 55ac15129..53ffaf7f9 100644
--- a/packages/server/modules/core/graph/generated/graphql.ts
+++ b/packages/server/modules/core/graph/generated/graphql.ts
@@ -4,7 +4,6 @@ import { StreamAccessRequestGraphQLReturn } from '@/modules/accessrequests/helpe
 import { CommentReplyAuthorCollectionGraphQLReturn, CommentGraphQLReturn } from '@/modules/comments/helpers/graphTypes';
 import { PendingStreamCollaboratorGraphQLReturn } from '@/modules/serverinvites/helpers/graphTypes';
 import { FileUploadGraphQLReturn } from '@/modules/fileuploads/helpers/types';
-import { AutomationFunctionRunGraphQLReturn } from '@/modules/betaAutomations/helpers/graphTypes';
 import { AutomateFunctionGraphQLReturn, AutomateFunctionReleaseGraphQLReturn, AutomationGraphQLReturn, AutomationRevisionGraphQLReturn, AutomationRevisionFunctionGraphQLReturn, AutomateRunGraphQLReturn, AutomationRunTriggerGraphQLReturn, AutomationRevisionTriggerDefinitionGraphQLReturn, AutomateFunctionRunGraphQLReturn, TriggeredAutomationsStatusGraphQLReturn, ProjectAutomationMutationsGraphQLReturn, ProjectTriggeredAutomationsStatusUpdatedMessageGraphQLReturn, ProjectAutomationsUpdatedMessageGraphQLReturn, UserAutomateInfoGraphQLReturn } from '@/modules/automate/helpers/graphTypes';
 import { GraphQLContext } from '@/modules/shared/helpers/typeHelper';
 export type Maybe<T> = T | null;
@@ -384,62 +383,6 @@ export type AutomationCollection = {
   totalCount: Scalars['Int']['output'];
 };
 
-export type AutomationCreateInput = {
-  automationId: Scalars['String']['input'];
-  automationName: Scalars['String']['input'];
-  automationRevisionId: Scalars['String']['input'];
-  modelId: Scalars['String']['input'];
-  projectId: Scalars['String']['input'];
-  webhookId?: InputMaybe<Scalars['String']['input']>;
-};
-
-export type AutomationFunctionRun = {
-  __typename?: 'AutomationFunctionRun';
-  contextView?: Maybe<Scalars['String']['output']>;
-  elapsed: Scalars['Float']['output'];
-  functionId: Scalars['String']['output'];
-  functionLogo?: Maybe<Scalars['String']['output']>;
-  functionName: Scalars['String']['output'];
-  id: Scalars['ID']['output'];
-  resultVersions: Array<Version>;
-  /**
-   * NOTE: this is the schema for the results field below!
-   * Current schema: {
-   *   version: "1.0.0",
-   *   values: {
-   *     objectResults: Record<str, {
-   *       category: string
-   *       level: ObjectResultLevel
-   *       objectIds: string[]
-   *       message: str | null
-   *       metadata: Records<str, unknown> | null
-   *       visualoverrides: Records<str, unknown> | null
-   *     }[]>
-   *     blobIds?: string[]
-   *   }
-   * }
-   */
-  results?: Maybe<Scalars['JSONObject']['output']>;
-  status: AutomationRunStatus;
-  statusMessage?: Maybe<Scalars['String']['output']>;
-};
-
-export type AutomationMutations = {
-  __typename?: 'AutomationMutations';
-  create: Scalars['Boolean']['output'];
-  functionRunStatusReport: Scalars['Boolean']['output'];
-};
-
-
-export type AutomationMutationsCreateArgs = {
-  input: AutomationCreateInput;
-};
-
-
-export type AutomationMutationsFunctionRunStatusReportArgs = {
-  input: AutomationRunStatusUpdateInput;
-};
-
 export type AutomationRevision = {
   __typename?: 'AutomationRevision';
   functions: Array<AutomationRevisionFunction>;
@@ -463,44 +406,8 @@ export type AutomationRevisionFunction = {
 
 export type AutomationRevisionTriggerDefinition = VersionCreatedTriggerDefinition;
 
-export type AutomationRun = {
-  __typename?: 'AutomationRun';
-  automationId: Scalars['String']['output'];
-  automationName: Scalars['String']['output'];
-  createdAt: Scalars['DateTime']['output'];
-  functionRuns: Array<AutomationFunctionRun>;
-  id: Scalars['ID']['output'];
-  /** Resolved from all function run statuses */
-  status: AutomationRunStatus;
-  updatedAt: Scalars['DateTime']['output'];
-  versionId: Scalars['String']['output'];
-};
-
-export enum AutomationRunStatus {
-  Failed = 'FAILED',
-  Initializing = 'INITIALIZING',
-  Running = 'RUNNING',
-  Succeeded = 'SUCCEEDED'
-}
-
-export type AutomationRunStatusUpdateInput = {
-  automationId: Scalars['String']['input'];
-  automationRevisionId: Scalars['String']['input'];
-  automationRunId: Scalars['String']['input'];
-  functionRuns: Array<FunctionRunStatusInput>;
-  versionId: Scalars['String']['input'];
-};
-
 export type AutomationRunTrigger = VersionCreatedTrigger;
 
-export type AutomationsStatus = {
-  __typename?: 'AutomationsStatus';
-  automationRuns: Array<AutomationRun>;
-  id: Scalars['ID']['output'];
-  status: AutomationRunStatus;
-  statusMessage?: Maybe<Scalars['String']['output']>;
-};
-
 export type AvatarUser = {
   __typename?: 'AvatarUser';
   avatar?: Maybe<Scalars['String']['output']>;
@@ -950,27 +857,6 @@ export type FileUpload = {
   userId: Scalars['String']['output'];
 };
 
-export type FunctionRunStatusInput = {
-  contextView?: InputMaybe<Scalars['String']['input']>;
-  elapsed: Scalars['Float']['input'];
-  functionId: Scalars['String']['input'];
-  functionLogo?: InputMaybe<Scalars['String']['input']>;
-  functionName: Scalars['String']['input'];
-  resultVersionIds: Array<Scalars['String']['input']>;
-  /**
-   * Current schema: {
-   *   version: "1.0.0",
-   *   values: {
-   *     speckleObjects: Record<ObjectId, {level: string; statusMessage: string}[]>
-   *     blobIds?: string[]
-   *   }
-   * }
-   */
-  results?: InputMaybe<Scalars['JSONObject']['input']>;
-  status: AutomationRunStatus;
-  statusMessage?: InputMaybe<Scalars['String']['input']>;
-};
-
 export type GendoAiRender = {
   __typename?: 'GendoAIRender';
   camera?: Maybe<Scalars['JSONObject']['output']>;
@@ -1096,7 +982,6 @@ export type LimitedUserTimelineArgs = {
 export type Model = {
   __typename?: 'Model';
   author: LimitedUser;
-  automationStatus?: Maybe<AutomationsStatus>;
   automationsStatus?: Maybe<TriggeredAutomationsStatus>;
   /** Return a model tree of children */
   childrenTree: Array<ModelsTreeItem>;
@@ -1229,7 +1114,6 @@ export type Mutation = {
   appUpdate: Scalars['Boolean']['output'];
   automateFunctionRunStatusReport: Scalars['Boolean']['output'];
   automateMutations: AutomateMutations;
-  automationMutations: AutomationMutations;
   branchCreate: Scalars['String']['output'];
   branchDelete: Scalars['Boolean']['output'];
   branchUpdate: Scalars['Boolean']['output'];
@@ -1915,14 +1799,6 @@ export type ProjectAutomationUpdateInput = {
   name?: InputMaybe<Scalars['String']['input']>;
 };
 
-export type ProjectAutomationsStatusUpdatedMessage = {
-  __typename?: 'ProjectAutomationsStatusUpdatedMessage';
-  model: Model;
-  project: Project;
-  status: AutomationsStatus;
-  version: Version;
-};
-
 export type ProjectAutomationsUpdatedMessage = {
   __typename?: 'ProjectAutomationsUpdatedMessage';
   automation?: Maybe<Automation>;
@@ -2889,7 +2765,6 @@ export type Subscription = {
   commitDeleted?: Maybe<Scalars['JSONObject']['output']>;
   /** Subscribe to commit updated event. */
   commitUpdated?: Maybe<Scalars['JSONObject']['output']>;
-  projectAutomationsStatusUpdated: ProjectAutomationsStatusUpdatedMessage;
   /** Subscribe to updates to automations in the project */
   projectAutomationsUpdated: ProjectAutomationsUpdatedMessage;
   /**
@@ -2985,11 +2860,6 @@ export type SubscriptionCommitUpdatedArgs = {
 };
 
 
-export type SubscriptionProjectAutomationsStatusUpdatedArgs = {
-  projectId: Scalars['String']['input'];
-};
-
-
 export type SubscriptionProjectAutomationsUpdatedArgs = {
   projectId: Scalars['String']['input'];
 };
@@ -3331,7 +3201,6 @@ export type UserUpdateInput = {
 export type Version = {
   __typename?: 'Version';
   authorUser?: Maybe<LimitedUser>;
-  automationStatus?: Maybe<AutomationsStatus>;
   automationsStatus?: Maybe<TriggeredAutomationsStatus>;
   /** All comment threads in this version */
   commentThreads: CommentCollection;
@@ -3634,18 +3503,11 @@ export type ResolversTypes = {
   AutomateRunTriggerType: AutomateRunTriggerType;
   Automation: ResolverTypeWrapper<AutomationGraphQLReturn>;
   AutomationCollection: ResolverTypeWrapper<Omit<AutomationCollection, 'items'> & { items: Array<ResolversTypes['Automation']> }>;
-  AutomationCreateInput: AutomationCreateInput;
-  AutomationFunctionRun: ResolverTypeWrapper<AutomationFunctionRunGraphQLReturn>;
-  AutomationMutations: ResolverTypeWrapper<MutationsObjectGraphQLReturn>;
   AutomationRevision: ResolverTypeWrapper<AutomationRevisionGraphQLReturn>;
   AutomationRevisionCreateFunctionInput: AutomationRevisionCreateFunctionInput;
   AutomationRevisionFunction: ResolverTypeWrapper<AutomationRevisionFunctionGraphQLReturn>;
   AutomationRevisionTriggerDefinition: ResolverTypeWrapper<AutomationRevisionTriggerDefinitionGraphQLReturn>;
-  AutomationRun: ResolverTypeWrapper<Omit<AutomationRun, 'functionRuns'> & { functionRuns: Array<ResolversTypes['AutomationFunctionRun']> }>;
-  AutomationRunStatus: AutomationRunStatus;
-  AutomationRunStatusUpdateInput: AutomationRunStatusUpdateInput;
   AutomationRunTrigger: ResolverTypeWrapper<AutomationRunTriggerGraphQLReturn>;
-  AutomationsStatus: ResolverTypeWrapper<Omit<AutomationsStatus, 'automationRuns'> & { automationRuns: Array<ResolversTypes['AutomationRun']> }>;
   AvatarUser: ResolverTypeWrapper<AvatarUser>;
   BasicGitRepositoryMetadata: ResolverTypeWrapper<BasicGitRepositoryMetadata>;
   BigInt: ResolverTypeWrapper<Scalars['BigInt']['output']>;
@@ -3690,7 +3552,6 @@ export type ResolversTypes = {
   EmailAddress: ResolverTypeWrapper<Scalars['EmailAddress']['output']>;
   FileUpload: ResolverTypeWrapper<FileUploadGraphQLReturn>;
   Float: ResolverTypeWrapper<Scalars['Float']['output']>;
-  FunctionRunStatusInput: FunctionRunStatusInput;
   GendoAIRender: ResolverTypeWrapper<GendoAiRender>;
   GendoAIRenderCollection: ResolverTypeWrapper<GendoAiRenderCollection>;
   GendoAIRenderInput: GendoAiRenderInput;
@@ -3718,7 +3579,6 @@ export type ResolversTypes = {
   ProjectAutomationMutations: ResolverTypeWrapper<ProjectAutomationMutationsGraphQLReturn>;
   ProjectAutomationRevisionCreateInput: ProjectAutomationRevisionCreateInput;
   ProjectAutomationUpdateInput: ProjectAutomationUpdateInput;
-  ProjectAutomationsStatusUpdatedMessage: ResolverTypeWrapper<Omit<ProjectAutomationsStatusUpdatedMessage, 'model' | 'project' | 'status' | 'version'> & { model: ResolversTypes['Model'], project: ResolversTypes['Project'], status: ResolversTypes['AutomationsStatus'], version: ResolversTypes['Version'] }>;
   ProjectAutomationsUpdatedMessage: ResolverTypeWrapper<ProjectAutomationsUpdatedMessageGraphQLReturn>;
   ProjectAutomationsUpdatedMessageType: ProjectAutomationsUpdatedMessageType;
   ProjectCollaborator: ResolverTypeWrapper<Omit<ProjectCollaborator, 'user'> & { user: ResolversTypes['LimitedUser'] }>;
@@ -3858,17 +3718,11 @@ export type ResolversParentTypes = {
   AutomateRunCollection: Omit<AutomateRunCollection, 'items'> & { items: Array<ResolversParentTypes['AutomateRun']> };
   Automation: AutomationGraphQLReturn;
   AutomationCollection: Omit<AutomationCollection, 'items'> & { items: Array<ResolversParentTypes['Automation']> };
-  AutomationCreateInput: AutomationCreateInput;
-  AutomationFunctionRun: AutomationFunctionRunGraphQLReturn;
-  AutomationMutations: MutationsObjectGraphQLReturn;
   AutomationRevision: AutomationRevisionGraphQLReturn;
   AutomationRevisionCreateFunctionInput: AutomationRevisionCreateFunctionInput;
   AutomationRevisionFunction: AutomationRevisionFunctionGraphQLReturn;
   AutomationRevisionTriggerDefinition: AutomationRevisionTriggerDefinitionGraphQLReturn;
-  AutomationRun: Omit<AutomationRun, 'functionRuns'> & { functionRuns: Array<ResolversParentTypes['AutomationFunctionRun']> };
-  AutomationRunStatusUpdateInput: AutomationRunStatusUpdateInput;
   AutomationRunTrigger: AutomationRunTriggerGraphQLReturn;
-  AutomationsStatus: Omit<AutomationsStatus, 'automationRuns'> & { automationRuns: Array<ResolversParentTypes['AutomationRun']> };
   AvatarUser: AvatarUser;
   BasicGitRepositoryMetadata: BasicGitRepositoryMetadata;
   BigInt: Scalars['BigInt']['output'];
@@ -3912,7 +3766,6 @@ export type ResolversParentTypes = {
   EmailAddress: Scalars['EmailAddress']['output'];
   FileUpload: FileUploadGraphQLReturn;
   Float: Scalars['Float']['output'];
-  FunctionRunStatusInput: FunctionRunStatusInput;
   GendoAIRender: GendoAiRender;
   GendoAIRenderCollection: GendoAiRenderCollection;
   GendoAIRenderInput: GendoAiRenderInput;
@@ -3940,7 +3793,6 @@ export type ResolversParentTypes = {
   ProjectAutomationMutations: ProjectAutomationMutationsGraphQLReturn;
   ProjectAutomationRevisionCreateInput: ProjectAutomationRevisionCreateInput;
   ProjectAutomationUpdateInput: ProjectAutomationUpdateInput;
-  ProjectAutomationsStatusUpdatedMessage: Omit<ProjectAutomationsStatusUpdatedMessage, 'model' | 'project' | 'status' | 'version'> & { model: ResolversParentTypes['Model'], project: ResolversParentTypes['Project'], status: ResolversParentTypes['AutomationsStatus'], version: ResolversParentTypes['Version'] };
   ProjectAutomationsUpdatedMessage: ProjectAutomationsUpdatedMessageGraphQLReturn;
   ProjectCollaborator: Omit<ProjectCollaborator, 'user'> & { user: ResolversParentTypes['LimitedUser'] };
   ProjectCollection: Omit<ProjectCollection, 'items'> & { items: Array<ResolversParentTypes['Project']> };
@@ -4265,26 +4117,6 @@ export type AutomationCollectionResolvers<ContextType = GraphQLContext, ParentTy
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
-export type AutomationFunctionRunResolvers<ContextType = GraphQLContext, ParentType extends ResolversParentTypes['AutomationFunctionRun'] = ResolversParentTypes['AutomationFunctionRun']> = {
-  contextView?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  elapsed?: Resolver<ResolversTypes['Float'], ParentType, ContextType>;
-  functionId?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
-  functionLogo?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  functionName?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
-  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
-  resultVersions?: Resolver<Array<ResolversTypes['Version']>, ParentType, ContextType>;
-  results?: Resolver<Maybe<ResolversTypes['JSONObject']>, ParentType, ContextType>;
-  status?: Resolver<ResolversTypes['AutomationRunStatus'], ParentType, ContextType>;
-  statusMessage?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
-};
-
-export type AutomationMutationsResolvers<ContextType = GraphQLContext, ParentType extends ResolversParentTypes['AutomationMutations'] = ResolversParentTypes['AutomationMutations']> = {
-  create?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType, RequireFields<AutomationMutationsCreateArgs, 'input'>>;
-  functionRunStatusReport?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType, RequireFields<AutomationMutationsFunctionRunStatusReportArgs, 'input'>>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
-};
-
 export type AutomationRevisionResolvers<ContextType = GraphQLContext, ParentType extends ResolversParentTypes['AutomationRevision'] = ResolversParentTypes['AutomationRevision']> = {
   functions?: Resolver<Array<ResolversTypes['AutomationRevisionFunction']>, ParentType, ContextType>;
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
@@ -4302,30 +4134,10 @@ export type AutomationRevisionTriggerDefinitionResolvers<ContextType = GraphQLCo
   __resolveType: TypeResolveFn<'VersionCreatedTriggerDefinition', ParentType, ContextType>;
 };
 
-export type AutomationRunResolvers<ContextType = GraphQLContext, ParentType extends ResolversParentTypes['AutomationRun'] = ResolversParentTypes['AutomationRun']> = {
-  automationId?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
-  automationName?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
-  createdAt?: Resolver<ResolversTypes['DateTime'], ParentType, ContextType>;
-  functionRuns?: Resolver<Array<ResolversTypes['AutomationFunctionRun']>, ParentType, ContextType>;
-  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
-  status?: Resolver<ResolversTypes['AutomationRunStatus'], ParentType, ContextType>;
-  updatedAt?: Resolver<ResolversTypes['DateTime'], ParentType, ContextType>;
-  versionId?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
-};
-
 export type AutomationRunTriggerResolvers<ContextType = GraphQLContext, ParentType extends ResolversParentTypes['AutomationRunTrigger'] = ResolversParentTypes['AutomationRunTrigger']> = {
   __resolveType: TypeResolveFn<'VersionCreatedTrigger', ParentType, ContextType>;
 };
 
-export type AutomationsStatusResolvers<ContextType = GraphQLContext, ParentType extends ResolversParentTypes['AutomationsStatus'] = ResolversParentTypes['AutomationsStatus']> = {
-  automationRuns?: Resolver<Array<ResolversTypes['AutomationRun']>, ParentType, ContextType>;
-  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
-  status?: Resolver<ResolversTypes['AutomationRunStatus'], ParentType, ContextType>;
-  statusMessage?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
-};
-
 export type AvatarUserResolvers<ContextType = GraphQLContext, ParentType extends ResolversParentTypes['AvatarUser'] = ResolversParentTypes['AvatarUser']> = {
   avatar?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
@@ -4569,7 +4381,6 @@ export type LimitedUserResolvers<ContextType = GraphQLContext, ParentType extend
 
 export type ModelResolvers<ContextType = GraphQLContext, ParentType extends ResolversParentTypes['Model'] = ResolversParentTypes['Model']> = {
   author?: Resolver<ResolversTypes['LimitedUser'], ParentType, ContextType>;
-  automationStatus?: Resolver<Maybe<ResolversTypes['AutomationsStatus']>, ParentType, ContextType>;
   automationsStatus?: Resolver<Maybe<ResolversTypes['TriggeredAutomationsStatus']>, ParentType, ContextType>;
   childrenTree?: Resolver<Array<ResolversTypes['ModelsTreeItem']>, ParentType, ContextType>;
   commentThreads?: Resolver<ResolversTypes['CommentCollection'], ParentType, ContextType, RequireFields<ModelCommentThreadsArgs, 'limit'>>;
@@ -4631,7 +4442,6 @@ export type MutationResolvers<ContextType = GraphQLContext, ParentType extends R
   appUpdate?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType, RequireFields<MutationAppUpdateArgs, 'app'>>;
   automateFunctionRunStatusReport?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType, RequireFields<MutationAutomateFunctionRunStatusReportArgs, 'input'>>;
   automateMutations?: Resolver<ResolversTypes['AutomateMutations'], ParentType, ContextType>;
-  automationMutations?: Resolver<ResolversTypes['AutomationMutations'], ParentType, ContextType>;
   branchCreate?: Resolver<ResolversTypes['String'], ParentType, ContextType, RequireFields<MutationBranchCreateArgs, 'branch'>>;
   branchDelete?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType, RequireFields<MutationBranchDeleteArgs, 'branch'>>;
   branchUpdate?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType, RequireFields<MutationBranchUpdateArgs, 'branch'>>;
@@ -4769,14 +4579,6 @@ export type ProjectAutomationMutationsResolvers<ContextType = GraphQLContext, Pa
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
-export type ProjectAutomationsStatusUpdatedMessageResolvers<ContextType = GraphQLContext, ParentType extends ResolversParentTypes['ProjectAutomationsStatusUpdatedMessage'] = ResolversParentTypes['ProjectAutomationsStatusUpdatedMessage']> = {
-  model?: Resolver<ResolversTypes['Model'], ParentType, ContextType>;
-  project?: Resolver<ResolversTypes['Project'], ParentType, ContextType>;
-  status?: Resolver<ResolversTypes['AutomationsStatus'], ParentType, ContextType>;
-  version?: Resolver<ResolversTypes['Version'], ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
-};
-
 export type ProjectAutomationsUpdatedMessageResolvers<ContextType = GraphQLContext, ParentType extends ResolversParentTypes['ProjectAutomationsUpdatedMessage'] = ResolversParentTypes['ProjectAutomationsUpdatedMessage']> = {
   automation?: Resolver<Maybe<ResolversTypes['Automation']>, ParentType, ContextType>;
   automationId?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
@@ -5112,7 +4914,6 @@ export type SubscriptionResolvers<ContextType = GraphQLContext, ParentType exten
   commitCreated?: SubscriptionResolver<Maybe<ResolversTypes['JSONObject']>, "commitCreated", ParentType, ContextType, RequireFields<SubscriptionCommitCreatedArgs, 'streamId'>>;
   commitDeleted?: SubscriptionResolver<Maybe<ResolversTypes['JSONObject']>, "commitDeleted", ParentType, ContextType, RequireFields<SubscriptionCommitDeletedArgs, 'streamId'>>;
   commitUpdated?: SubscriptionResolver<Maybe<ResolversTypes['JSONObject']>, "commitUpdated", ParentType, ContextType, RequireFields<SubscriptionCommitUpdatedArgs, 'streamId'>>;
-  projectAutomationsStatusUpdated?: SubscriptionResolver<ResolversTypes['ProjectAutomationsStatusUpdatedMessage'], "projectAutomationsStatusUpdated", ParentType, ContextType, RequireFields<SubscriptionProjectAutomationsStatusUpdatedArgs, 'projectId'>>;
   projectAutomationsUpdated?: SubscriptionResolver<ResolversTypes['ProjectAutomationsUpdatedMessage'], "projectAutomationsUpdated", ParentType, ContextType, RequireFields<SubscriptionProjectAutomationsUpdatedArgs, 'projectId'>>;
   projectCommentsUpdated?: SubscriptionResolver<ResolversTypes['ProjectCommentsUpdatedMessage'], "projectCommentsUpdated", ParentType, ContextType, RequireFields<SubscriptionProjectCommentsUpdatedArgs, 'target'>>;
   projectFileImportUpdated?: SubscriptionResolver<ResolversTypes['ProjectFileImportUpdatedMessage'], "projectFileImportUpdated", ParentType, ContextType, RequireFields<SubscriptionProjectFileImportUpdatedArgs, 'id'>>;
@@ -5218,7 +5019,6 @@ export type UserSearchResultCollectionResolvers<ContextType = GraphQLContext, Pa
 
 export type VersionResolvers<ContextType = GraphQLContext, ParentType extends ResolversParentTypes['Version'] = ResolversParentTypes['Version']> = {
   authorUser?: Resolver<Maybe<ResolversTypes['LimitedUser']>, ParentType, ContextType>;
-  automationStatus?: Resolver<Maybe<ResolversTypes['AutomationsStatus']>, ParentType, ContextType>;
   automationsStatus?: Resolver<Maybe<ResolversTypes['TriggeredAutomationsStatus']>, ParentType, ContextType>;
   commentThreads?: Resolver<ResolversTypes['CommentCollection'], ParentType, ContextType, RequireFields<VersionCommentThreadsArgs, 'limit'>>;
   createdAt?: Resolver<ResolversTypes['DateTime'], ParentType, ContextType>;
@@ -5346,14 +5146,10 @@ export type Resolvers<ContextType = GraphQLContext> = {
   AutomateRunCollection?: AutomateRunCollectionResolvers<ContextType>;
   Automation?: AutomationResolvers<ContextType>;
   AutomationCollection?: AutomationCollectionResolvers<ContextType>;
-  AutomationFunctionRun?: AutomationFunctionRunResolvers<ContextType>;
-  AutomationMutations?: AutomationMutationsResolvers<ContextType>;
   AutomationRevision?: AutomationRevisionResolvers<ContextType>;
   AutomationRevisionFunction?: AutomationRevisionFunctionResolvers<ContextType>;
   AutomationRevisionTriggerDefinition?: AutomationRevisionTriggerDefinitionResolvers<ContextType>;
-  AutomationRun?: AutomationRunResolvers<ContextType>;
   AutomationRunTrigger?: AutomationRunTriggerResolvers<ContextType>;
-  AutomationsStatus?: AutomationsStatusResolvers<ContextType>;
   AvatarUser?: AvatarUserResolvers<ContextType>;
   BasicGitRepositoryMetadata?: BasicGitRepositoryMetadataResolvers<ContextType>;
   BigInt?: GraphQLScalarType;
@@ -5392,7 +5188,6 @@ export type Resolvers<ContextType = GraphQLContext> = {
   PendingStreamCollaborator?: PendingStreamCollaboratorResolvers<ContextType>;
   Project?: ProjectResolvers<ContextType>;
   ProjectAutomationMutations?: ProjectAutomationMutationsResolvers<ContextType>;
-  ProjectAutomationsStatusUpdatedMessage?: ProjectAutomationsStatusUpdatedMessageResolvers<ContextType>;
   ProjectAutomationsUpdatedMessage?: ProjectAutomationsUpdatedMessageResolvers<ContextType>;
   ProjectCollaborator?: ProjectCollaboratorResolvers<ContextType>;
   ProjectCollection?: ProjectCollectionResolvers<ContextType>;
diff --git a/packages/server/modules/core/graph/resolvers/projects.ts b/packages/server/modules/core/graph/resolvers/projects.ts
index 3f1760072..8929b869b 100644
--- a/packages/server/modules/core/graph/resolvers/projects.ts
+++ b/packages/server/modules/core/graph/resolvers/projects.ts
@@ -1,3 +1,4 @@
+import db from '@/db/knex'
 import { RateLimitError } from '@/modules/core/errors/ratelimit'
 import { StreamNotFoundError } from '@/modules/core/errors/stream'
 import {
@@ -26,13 +27,27 @@ import {
 import { createOnboardingStream } from '@/modules/core/services/streams/onboarding'
 import { removeStreamCollaborator } from '@/modules/core/services/streams/streamAccessService'
 import { InviteCreateValidationError } from '@/modules/serverinvites/errors'
-import { cancelStreamInvite } from '@/modules/serverinvites/services/inviteProcessingService'
+import {
+  deleteInvitesByTargetFactory,
+  deleteStreamInviteFactory,
+  findResourceFactory,
+  findStreamInviteFactory,
+  findUserByTargetFactory,
+  insertInviteAndDeleteOldFactory,
+  queryAllStreamInvitesFactory,
+  queryAllUserStreamInvitesFactory
+} from '@/modules/serverinvites/repositories/serverInvites'
+import { createAndSendInviteFactory } from '@/modules/serverinvites/services/inviteCreationService'
+import {
+  cancelStreamInvite,
+  finalizeStreamInvite
+} from '@/modules/serverinvites/services/inviteProcessingService'
 import {
   getPendingStreamCollaborators,
   getUserPendingStreamInvites
 } from '@/modules/serverinvites/services/inviteRetrievalService'
 import {
-  createStreamInviteAndNotify,
+  createStreamInviteAndNotifyFactory,
   useStreamInviteAndNotify
 } from '@/modules/serverinvites/services/management'
 import { authorizeResolver, validateScopes } from '@/modules/shared'
@@ -129,7 +144,14 @@ export = {
         Roles.Stream.Owner,
         ctx.resourceAccessRules
       )
-      await createStreamInviteAndNotify(
+      const createAndSendInvite = createAndSendInviteFactory({
+        findResource: findResourceFactory(),
+        findUserByTarget: findUserByTargetFactory(),
+        insertInviteAndDeleteOld: insertInviteAndDeleteOldFactory({ db })
+      })
+      await createStreamInviteAndNotifyFactory({
+        createAndSendInvite
+      })(
         {
           ...args.input,
           projectId: args.projectId
@@ -158,7 +180,15 @@ export = {
       for (const batch of inputBatches) {
         await Promise.all(
           batch.map((i) =>
-            createStreamInviteAndNotify(
+            createStreamInviteAndNotifyFactory({
+              createAndSendInvite: createAndSendInviteFactory({
+                findResource: findResourceFactory(),
+                findUserByTarget: findUserByTargetFactory(),
+                insertInviteAndDeleteOld: insertInviteAndDeleteOldFactory({
+                  db
+                })
+              })
+            })(
               { ...i, projectId: args.projectId },
               ctx.userId!,
               ctx.resourceAccessRules
@@ -169,7 +199,12 @@ export = {
       return ctx.loaders.streams.getStream.load(args.projectId)
     },
     async use(_parent, args, ctx) {
-      await useStreamInviteAndNotify(args.input, ctx.userId!, ctx.resourceAccessRules)
+      await useStreamInviteAndNotify({
+        finalizeStreamInvite: finalizeStreamInvite({
+          findStreamInvite: findStreamInviteFactory({ db }),
+          deleteInvitesByTarget: deleteInvitesByTargetFactory({ db })
+        })
+      })(args.input, ctx.userId!, ctx.resourceAccessRules)
       return true
     },
     async cancel(_parent, args, ctx) {
@@ -179,7 +214,10 @@ export = {
         Roles.Stream.Owner,
         ctx.resourceAccessRules
       )
-      await cancelStreamInvite(args.projectId, args.inviteId)
+      await cancelStreamInvite({
+        findStreamInvite: findStreamInviteFactory({ db }),
+        deleteStreamInvite: deleteStreamInviteFactory({ db })
+      })(args.projectId, args.inviteId)
       return ctx.loaders.streams.getStream.load(args.projectId)
     }
   },
@@ -216,7 +254,11 @@ export = {
     },
     async projectInvites(_parent, _args, context) {
       const { userId } = context
-      return await getUserPendingStreamInvites(userId!)
+      return await getUserPendingStreamInvites({
+        queryAllUserStreamInvites: queryAllUserStreamInvitesFactory({
+          db
+        })
+      })(userId!)
     }
   },
   Project: {
@@ -238,7 +280,9 @@ export = {
       return ctx.loaders.streams.getSourceApps.load(parent.id) || []
     },
     async invitedTeam(parent) {
-      return await getPendingStreamCollaborators(parent.id)
+      return getPendingStreamCollaborators({
+        queryAllStreamInvites: queryAllStreamInvitesFactory({ db })
+      })(parent.id)
     },
     async visibility(parent) {
       const { isPublic, isDiscoverable } = parent
diff --git a/packages/server/modules/core/graph/resolvers/streams.js b/packages/server/modules/core/graph/resolvers/streams.js
index de772304f..4d96c9d47 100644
--- a/packages/server/modules/core/graph/resolvers/streams.js
+++ b/packages/server/modules/core/graph/resolvers/streams.js
@@ -57,6 +57,10 @@ const {
 const {
   TokenResourceIdentifierType
 } = require('@/modules/core/graph/generated/graphql')
+const {
+  queryAllStreamInvitesFactory
+} = require('@/modules/serverinvites/repositories/serverInvites')
+const db = require('@/db/knex')
 
 // subscription events
 const USER_STREAM_ADDED = StreamPubsubEvents.UserStreamAdded
@@ -167,7 +171,9 @@ module.exports = {
 
     async pendingCollaborators(parent) {
       const { id: streamId } = parent
-      return await getPendingStreamCollaborators(streamId)
+      return await getPendingStreamCollaborators({
+        queryAllStreamInvites: queryAllStreamInvitesFactory({ db })
+      })(streamId)
     },
 
     async favoritedDate(parent, _args, ctx) {
diff --git a/packages/server/modules/core/graph/resolvers/users.js b/packages/server/modules/core/graph/resolvers/users.js
index f3732d49f..396d89dd2 100644
--- a/packages/server/modules/core/graph/resolvers/users.js
+++ b/packages/server/modules/core/graph/resolvers/users.js
@@ -14,13 +14,20 @@ const { ActionTypes } = require('@/modules/activitystream/helpers/types')
 const { validateScopes } = require(`@/modules/shared`)
 const zxcvbn = require('zxcvbn')
 const {
-  getAdminUsersListCollection
+  getAdminUsersListCollection,
+  getTotalCounts
 } = require('@/modules/core/services/users/adminUsersListService')
 const { Roles, Scopes } = require('@speckle/shared')
 const { markOnboardingComplete } = require('@/modules/core/repositories/users')
 const { UsersMeta } = require('@/modules/core/dbSchema')
 const { getServerInfo } = require('@/modules/core/services/generic')
 const { throwForNotHavingServerRole } = require('@/modules/shared/authz')
+const {
+  deleteAllUserInvitesFactory,
+  countServerInvitesFactory,
+  findServerInvitesFactory
+} = require('@/modules/serverinvites/repositories/serverInvites')
+const db = require('@/db/knex')
 
 /** @type {import('@/modules/core/graph/generated/graphql').Resolvers} */
 module.exports = {
@@ -60,7 +67,12 @@ module.exports = {
     },
 
     async adminUsers(_parent, args) {
-      return await getAdminUsersListCollection(args)
+      return await getAdminUsersListCollection({
+        findServerInvites: findServerInvitesFactory({ db }),
+        getTotalCounts: getTotalCounts({
+          countServerInvites: countServerInvitesFactory({ db })
+        })
+      })(args)
     },
 
     async userSearch(parent, args, context) {
@@ -151,7 +163,9 @@ module.exports = {
       const user = await getUserByEmail({ email: args.userConfirmation.email })
       if (!user) return false
 
-      await deleteUser(user.id)
+      await deleteUser({
+        deleteAllUserInvites: deleteAllUserInvitesFactory({ db })
+      })(user.id)
       return true
     },
 
@@ -168,7 +182,9 @@ module.exports = {
       await throwForNotHavingServerRole(context, Roles.Server.Guest)
       await validateScopes(context.scopes, Scopes.Profile.Delete)
 
-      await deleteUser(context.userId, args.user)
+      await deleteUser({
+        deleteAllUserInvites: deleteAllUserInvitesFactory({ db })
+      })(context.userId, args.user)
 
       await saveActivity({
         streamId: null,
diff --git a/packages/server/modules/core/helpers/token.ts b/packages/server/modules/core/helpers/token.ts
index 9cf24c43b..d1752ca12 100644
--- a/packages/server/modules/core/helpers/token.ts
+++ b/packages/server/modules/core/helpers/token.ts
@@ -1,10 +1,11 @@
-import { TokenCreateError } from '@/modules/core/errors/user'
 import {
   TokenResourceIdentifier,
   TokenResourceIdentifierType
-} from '@/modules/core/graph/generated/graphql'
+} from '@/modules/core/domain/tokens/types'
+import { TokenCreateError } from '@/modules/core/errors/user'
 import { TokenResourceAccessRecord } from '@/modules/core/helpers/types'
 import { ResourceTargets } from '@/modules/serverinvites/helpers/inviteHelper'
+import {} from '@/modules/serverinvites/services/operations'
 import { MaybeNullOrUndefined, Nullable, Optional, Scopes } from '@speckle/shared'
 import { differenceBy } from 'lodash'
 
@@ -24,7 +25,7 @@ export const roleResourceTypeToTokenResourceType = (
 ): Nullable<TokenResourceIdentifierType> => {
   switch (type) {
     case ResourceTargets.Streams:
-      return TokenResourceIdentifierType.Project
+      return 'project'
     default:
       return null
   }
@@ -52,9 +53,7 @@ export const isNewResourceAllowed = (params: {
 export const toProjectIdWhitelist = (
   resourceAccessRules: ContextResourceAccessRules
 ): Optional<string[]> => {
-  const projectRules = resourceAccessRules?.filter(
-    (r) => r.type === TokenResourceIdentifierType.Project
-  )
+  const projectRules = resourceAccessRules?.filter((r) => r.type === 'project')
   return projectRules?.map((r) => r.id)
 }
 
diff --git a/packages/server/modules/core/helpers/types.ts b/packages/server/modules/core/helpers/types.ts
index 04f783eba..7fbf3342c 100644
--- a/packages/server/modules/core/helpers/types.ts
+++ b/packages/server/modules/core/helpers/types.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { TokenResourceIdentifierType } from '@/modules/core/graph/generated/graphql'
+import { TokenResourceIdentifierType } from '@/modules/core/domain/tokens/types'
 import { BaseMetaRecord } from '@/modules/core/helpers/meta'
 import { Nullable } from '@/modules/shared/helpers/typeHelper'
 import { ServerRoles } from '@speckle/shared'
diff --git a/packages/server/modules/core/loaders.ts b/packages/server/modules/core/loaders.ts
index 8f0ea4ebe..82735b4de 100644
--- a/packages/server/modules/core/loaders.ts
+++ b/packages/server/modules/core/loaders.ts
@@ -12,7 +12,6 @@ import {
 } from '@/modules/core/repositories/streams'
 import { UserWithOptionalRole, getUsers } from '@/modules/core/repositories/users'
 import { keyBy } from 'lodash'
-import { getInvites } from '@/modules/serverinvites/repositories'
 import { AuthContext } from '@/modules/shared/authz'
 import {
   BranchRecord,
@@ -23,7 +22,7 @@ import {
   UsersMetaRecord
 } from '@/modules/core/helpers/types'
 import { Nullable } from '@/modules/shared/helpers/typeHelper'
-import { ServerInviteRecord } from '@/modules/serverinvites/helpers/types'
+import { ServerInviteRecord } from '@/modules/serverinvites/domain/types'
 import {
   getCommitBranches,
   getCommits,
@@ -55,7 +54,6 @@ import { metaHelpers } from '@/modules/core/helpers/meta'
 import { Users } from '@/modules/core/dbSchema'
 import { getStreamPendingModels } from '@/modules/fileuploads/repositories/fileUploads'
 import { FileUploadRecord } from '@/modules/fileuploads/helpers/types'
-import { getAutomationFunctionRunResultVersions } from '@/modules/betaAutomations/repositories/automations'
 import { getAppScopes } from '@/modules/auth/repositories'
 import {
   AutomateRevisionFunctionRecord,
@@ -85,6 +83,8 @@ import {
   ExecutionEngineFailedResponseError,
   ExecutionEngineNetworkError
 } from '@/modules/automate/errors/executionEngine'
+import { queryInvitesFactory } from '@/modules/serverinvites/repositories/serverInvites'
+import db from '@/db/knex'
 
 const simpleTupleCacheKey = (key: [string, string]) => `${key[0]}:${key[1]}`
 
@@ -519,7 +519,7 @@ export function buildRequestLoaders(
        */
       getInvite: createLoader<string, Nullable<ServerInviteRecord>>(
         async (inviteIds) => {
-          const results = keyBy(await getInvites(inviteIds), 'id')
+          const results = keyBy(await queryInvitesFactory({ db })(inviteIds), 'id')
           return inviteIds.map((i) => results[i] || null)
         }
       )
@@ -530,25 +530,6 @@ export function buildRequestLoaders(
         return appIds.map((i) => results[i] || [])
       })
     },
-    automationFunctionRuns: {
-      /**
-       * Get result versions/commits from function runs
-       */
-      getResultVersions: createLoader<
-        [automationRunId: string, functionId: string],
-        CommitRecord[],
-        string
-      >(
-        async (ids) => {
-          const results = await getAutomationFunctionRunResultVersions(ids.slice())
-          return ids.map((i) => {
-            const [automationRunId, functionId] = i
-            return results[automationRunId]?.[functionId] || []
-          })
-        },
-        { cacheKeyFn: (key) => `${key[0]}:${key[1]}` }
-      )
-    },
     automations: {
       getFunctionAutomationCount: createLoader<string, number>(async (functionIds) => {
         const results = await getFunctionAutomationCounts({
diff --git a/packages/server/modules/core/repositories/streams.ts b/packages/server/modules/core/repositories/streams.ts
index dc7221210..8eecdca12 100644
--- a/packages/server/modules/core/repositories/streams.ts
+++ b/packages/server/modules/core/repositories/streams.ts
@@ -143,9 +143,9 @@ export async function getStreams(
  * Get a single stream. If userId is specified, the role will be resolved as well.
  */
 export async function getStream(
-  params: { streamId: string; userId?: string },
+  params: { streamId?: string; userId?: string },
   options?: Partial<{ trx: Knex.Transaction }>
-) {
+): Promise<Optional<StreamWithOptionalRole>> {
   const { streamId, userId } = params
   if (!streamId) throw new InvalidArgumentError('Invalid stream ID')
 
diff --git a/packages/server/modules/core/services/admin.ts b/packages/server/modules/core/services/admin.ts
index 6d4dddca3..043971a23 100644
--- a/packages/server/modules/core/services/admin.ts
+++ b/packages/server/modules/core/services/admin.ts
@@ -1,12 +1,13 @@
+import db from '@/db/knex'
 import { ServerInviteGraphQLReturnType } from '@/modules/core/helpers/graphTypes'
 import { StreamRecord, UserRecord } from '@/modules/core/helpers/types'
 import { listUsers, countUsers } from '@/modules/core/repositories/users'
 import { getStreams } from '@/modules/core/services/streams'
-import { ServerInviteRecord } from '@/modules/serverinvites/helpers/types'
+import { ServerInviteRecord } from '@/modules/serverinvites/domain/types'
 import {
-  countServerInvites,
-  queryServerInvites
-} from '@/modules/serverinvites/repositories'
+  countServerInvitesFactory,
+  queryServerInvitesFactory
+} from '@/modules/serverinvites/repositories/serverInvites'
 import { BaseError } from '@/modules/shared/errors/base'
 import { ServerRoles } from '@speckle/shared'
 
@@ -75,9 +76,10 @@ export const adminInviteList = async (
   args: CollectionQueryArgs
 ): Promise<Collection<ServerInviteGraphQLReturnType>> => {
   const parsedCursor = args.cursor ? parseCursorToDate(args.cursor) : null
+  // TODO: injection
   const [totalCount, inviteItems] = await Promise.all([
-    countServerInvites(args.query),
-    queryServerInvites(args.query, args.limit, parsedCursor)
+    countServerInvitesFactory({ db })(args.query),
+    queryServerInvitesFactory({ db })(args.query, args.limit, parsedCursor)
   ])
   const items = inviteItems.map((invite: ServerInviteRecord) => {
     return {
diff --git a/packages/server/modules/core/services/streams/management.ts b/packages/server/modules/core/services/streams/management.ts
index 1cada4ddd..83ca399d7 100644
--- a/packages/server/modules/core/services/streams/management.ts
+++ b/packages/server/modules/core/services/streams/management.ts
@@ -11,9 +11,7 @@ import {
   StreamCreateInput,
   StreamRevokePermissionInput,
   StreamUpdateInput,
-  StreamUpdatePermissionInput,
-  TokenResourceIdentifier,
-  TokenResourceIdentifierType
+  StreamUpdatePermissionInput
 } from '@/modules/core/graph/generated/graphql'
 import { StreamRecord } from '@/modules/core/helpers/types'
 import {
@@ -23,7 +21,10 @@ import {
   updateStream
 } from '@/modules/core/repositories/streams'
 import { createBranch } from '@/modules/core/services/branches'
-import { inviteUsersToStream } from '@/modules/serverinvites/services/inviteCreationService'
+import {
+  createAndSendInviteFactory,
+  inviteUsersToStreamFactory
+} from '@/modules/serverinvites/services/inviteCreationService'
 import {
   StreamInvalidAccessError,
   StreamUpdateError
@@ -35,12 +36,22 @@ import {
   isStreamCollaborator,
   removeStreamCollaborator
 } from '@/modules/core/services/streams/streamAccessService'
-import { deleteAllStreamInvites } from '@/modules/serverinvites/repositories'
 import {
   ContextResourceAccessRules,
   isNewResourceAllowed
 } from '@/modules/core/helpers/token'
 import { authorizeResolver } from '@/modules/shared'
+import {
+  deleteAllStreamInvitesFactory,
+  findResourceFactory,
+  findUserByTargetFactory,
+  insertInviteAndDeleteOldFactory
+} from '@/modules/serverinvites/repositories/serverInvites'
+import db from '@/db/knex'
+import {
+  TokenResourceIdentifier,
+  TokenResourceIdentifierType
+} from '@/modules/core/domain/tokens/types'
 
 export async function createStreamReturnRecord(
   params: (StreamCreateInput | ProjectCreateInput) & {
@@ -75,12 +86,14 @@ export async function createStreamReturnRecord(
 
   // Invite contributors?
   if (!isProjectCreateInput(params) && params.withContributors?.length) {
-    await inviteUsersToStream(
-      ownerId,
-      streamId,
-      params.withContributors,
-      ownerResourceAccessRules
-    )
+    // TODO: should be injected in the resolver
+    await inviteUsersToStreamFactory({
+      createAndSendInvite: createAndSendInviteFactory({
+        findResource: findResourceFactory(),
+        findUserByTarget: findUserByTargetFactory(),
+        insertInviteAndDeleteOld: insertInviteAndDeleteOldFactory({ db })
+      })
+    })(ownerId, streamId, params.withContributors, ownerResourceAccessRules)
   }
 
   // Save activity
@@ -126,7 +139,9 @@ export async function deleteStreamAndNotify(
   // delay deletion by a bit so we can do auth checks
   await wait(250)
 
+  // TODO: use proper injection once we refactor this module
   // Delete after event so we can do authz
+  const deleteAllStreamInvites = deleteAllStreamInvitesFactory({ db })
   await Promise.all([deleteAllStreamInvites(streamId), deleteStream(streamId)])
   return true
 }
diff --git a/packages/server/modules/core/services/streams/streamAccessService.js b/packages/server/modules/core/services/streams/streamAccessService.js
index 75d78db85..1e1c281ad 100644
--- a/packages/server/modules/core/services/streams/streamAccessService.js
+++ b/packages/server/modules/core/services/streams/streamAccessService.js
@@ -41,7 +41,7 @@ async function isStreamCollaborator(userId, streamId) {
  * @param {string} [userId] If falsy, will throw for non-public streams
  * @param {string} streamId
  * @param {string} [expectedRole] Defaults to reviewer
- * @param {import('@/modules/core/graph/generated/graphql').TokenResourceIdentifier[] | undefined | null} [userResourceAccessLimits]
+ * @param {import('@/modules/serverinvites/services/operations').TokenResourceIdentifier[] | undefined | null} [userResourceAccessLimits]
  * @returns {Promise<boolean>}
  */
 async function validateStreamAccess(
@@ -90,7 +90,7 @@ async function validateStreamAccess(
  * @param {string} streamId
  * @param {string} userId ID of user that should be removed
  * @param {string} removedById ID of user that is doing the removing
- * @param {import('@/modules/core/graph/generated/graphql').TokenResourceIdentifier[] | undefined | null} [removerResourceAccessRules] Resource access rules (if any) for the user doing the removing
+ * @param {import('@/modules/serverinvites/services/operations').TokenResourceIdentifier[] | undefined | null} [removerResourceAccessRules] Resource access rules (if any) for the user doing the removing
  */
 async function removeStreamCollaborator(
   streamId,
@@ -134,7 +134,7 @@ async function removeStreamCollaborator(
  * @param {string} userId ID of user who is being added
  * @param {string} role
  * @param {string} addedById ID of user who is adding the new collaborator
- * @param {import('@/modules/core/graph/generated/graphql').TokenResourceIdentifier[] | undefined | null} [adderResourceAccessRules] Resource access rules (if any) for the user doing the adding
+ * @param {import('@/modules/serverinvites/services/operations').TokenResourceIdentifier[] | undefined | null} [adderResourceAccessRules] Resource access rules (if any) for the user doing the adding
  * @param {{
  *  fromInvite?: boolean,
  * }} param4
diff --git a/packages/server/modules/core/services/users.js b/packages/server/modules/core/services/users.js
index 19a250ac1..b7c46e95e 100644
--- a/packages/server/modules/core/services/users.js
+++ b/packages/server/modules/core/services/users.js
@@ -17,7 +17,6 @@ const Acl = () => ServerAclSchema.knex()
 
 const { deleteStream } = require('./streams')
 const { LIMITED_USER_FIELDS } = require('@/modules/core/helpers/userHelper')
-const { deleteAllUserInvites } = require('@/modules/serverinvites/repositories')
 const { getUserByEmail } = require('@/modules/core/repositories/users')
 const { UsersEmitter, UsersEvents } = require('@/modules/core/events/usersEmitter')
 const { pick } = require('lodash')
@@ -228,12 +227,16 @@ module.exports = {
     })
   },
 
-  async deleteUser(id) {
-    //TODO: check for the last admin user to survive
-    dbLogger.info('Deleting user ' + id)
-    await _ensureAtleastOneAdminRemains(id)
-    const streams = await knex.raw(
-      `
+  /**
+   * @param {{ deleteAllUserInvites: import('@/modules/serverinvites/domain/operations').DeleteAllUserInvites }} param0
+   */
+  deleteUser({ deleteAllUserInvites }) {
+    return async (id) => {
+      //TODO: check for the last admin user to survive
+      dbLogger.info('Deleting user ' + id)
+      await _ensureAtleastOneAdminRemains(id)
+      const streams = await knex.raw(
+        `
       -- Get the stream ids with only this user as owner
       SELECT "resourceId" as id
       FROM (
@@ -251,16 +254,18 @@ module.exports = {
       ) AS soc
       WHERE cnt = 1
       `,
-      [id]
-    )
-    for (const i in streams.rows) {
-      await deleteStream({ streamId: streams.rows[i].id })
+        [id]
+      )
+      for (const i in streams.rows) {
+        await deleteStream({ streamId: streams.rows[i].id })
+      }
+
+      // Delete all invites (they don't have a FK, so we need to do this manually)
+      // THIS REALLY SHOULD BE A REACTION TO THE USER DELETED EVENT EMITTED HER
+      await deleteAllUserInvites(id)
+
+      return await Users().where({ id }).del()
     }
-
-    // Delete all invites (they don't have a FK, so we need to do this manually)
-    await deleteAllUserInvites(id)
-
-    return await Users().where({ id }).del()
   },
 
   /**
diff --git a/packages/server/modules/core/services/users/adminUsersListService.js b/packages/server/modules/core/services/users/adminUsersListService.js
index 85d0d381c..21383bf28 100644
--- a/packages/server/modules/core/services/users/adminUsersListService.js
+++ b/packages/server/modules/core/services/users/adminUsersListService.js
@@ -1,9 +1,5 @@
 const { countUsers, getUsers } = require('@/modules/core/services/users')
 const { resolveTarget } = require('@/modules/serverinvites/helpers/inviteHelper')
-const {
-  countServerInvites,
-  findServerInvites
-} = require('@/modules/serverinvites/repositories')
 const { clamp } = require('lodash')
 
 /**
@@ -64,21 +60,27 @@ function sanitizeParams(params) {
 
 /**
  * Get total users & invites that we can find using these params
- * @param {PaginationParams} params
- * @returns {Promise<TotalCounts>}
+ * @param {{ countServerInvites: import('@/modules/serverinvites/domain/operations').CountServerInvites}} param0
  */
-async function getTotalCounts(params) {
-  const { query } = params
+function getTotalCounts({ countServerInvites }) {
+  /**
+   * Get total users & invites that we can find using these params
+   * @param {PaginationParams} params
+   * @returns {Promise<TotalCounts>}
+   */
+  return async (params) => {
+    const { query } = params
 
-  const [userCount, inviteCount] = await Promise.all([
-    // Actual users
-    countUsers(query),
-    // Invites
-    countServerInvites(query)
-  ])
-  const totalCount = userCount + inviteCount
+    const [userCount, inviteCount] = await Promise.all([
+      // Actual users
+      countUsers(query),
+      // Invites
+      countServerInvites(query)
+    ])
+    const totalCount = userCount + inviteCount
 
-  return { userCount, inviteCount, totalCount }
+    return { userCount, inviteCount, totalCount }
+  }
 }
 
 /**
@@ -118,7 +120,7 @@ function mapUserToListItem(user) {
 }
 
 /**
- * @param {import('@/modules/serverinvites/helpers/types').ServerInviteRecord} invite
+ * @param {import('@/modules/serverinvites/domain/types').ServerInviteRecord} invite
  * @returns {AdminUsersListItem}
  */
 function mapInviteToListItem(invite) {
@@ -134,49 +136,62 @@ function mapInviteToListItem(invite) {
 }
 
 /**
- * Retrieve all list items from DB and convert them to the target model
- * @param {PaginationParams} params
- * @param {TotalCounts} counts
- * @returns {Promise<AdminUsersListItem[]>}
+ *
+ * @param {{findServerInvites: import('@/modules/serverinvites/domain/operations').FindServerInvites}} param0
  */
-async function retrieveItems(params, counts) {
-  const { invitesFilter, usersFilter } = resolveLimitsAndOffsets(params, counts)
-  const { query } = params
+function retrieveItems({ findServerInvites }) {
+  /**
+   * Retrieve all list items from DB and convert them to the target model
+   * @param {PaginationParams} params
+   * @param {TotalCounts} counts
+   * @returns {Promise<AdminUsersListItem[]>}
+   */
+  return async (params, counts) => {
+    const { invitesFilter, usersFilter } = resolveLimitsAndOffsets(params, counts)
+    const { query } = params
 
-  const [invites, users] = await Promise.all([
-    // Invites
-    invitesFilter
-      ? findServerInvites(query, invitesFilter.limit, invitesFilter.offset)
-      : [],
-    // Users
-    usersFilter ? getUsers(usersFilter.limit, usersFilter.offset, query) : []
-  ])
+    const [invites, users] = await Promise.all([
+      // Invites
+      invitesFilter
+        ? findServerInvites(query, invitesFilter.limit, invitesFilter.offset)
+        : [],
+      // Users
+      usersFilter ? getUsers(usersFilter.limit, usersFilter.offset, query) : []
+    ])
 
-  return [
-    // Invites first
-    ...invites.map((i) => mapInviteToListItem(i)),
-    // Users after
-    ...users.map((u) => mapUserToListItem(u))
-  ]
+    return [
+      // Invites first
+      ...invites.map((i) => mapInviteToListItem(i)),
+      // Users after
+      ...users.map((u) => mapUserToListItem(u))
+    ]
+  }
 }
 
 /**
- * Resolve admin users list data using the specified filter params
- * @param {PaginationParams} params
- * @returns {Promise<AdminUsersListCollection>}
+ *
+ * @param {{ getTotalCounts: (params: PaginationParams) => Promise<number>, findServerInvites: import('@/modules/serverinvites/domain/operations').FindServerInvites}} param0
  */
-async function getAdminUsersListCollection(params) {
-  sanitizeParams(params)
+function getAdminUsersListCollection({ getTotalCounts, findServerInvites }) {
+  /**
+   * Resolve admin users list data using the specified filter params
+   * @param {PaginationParams} params
+   * @returns {Promise<AdminUsersListCollection>}
+   */
+  return async (params) => {
+    sanitizeParams(params)
 
-  const totalCounts = await getTotalCounts(params)
-  const items = await retrieveItems(params, totalCounts)
+    const totalCounts = await getTotalCounts(params)
+    const items = await retrieveItems({ findServerInvites })(params, totalCounts)
 
-  return {
-    items,
-    totalCount: totalCounts.totalCount
+    return {
+      items,
+      totalCount: totalCounts.totalCount
+    }
   }
 }
 
 module.exports = {
-  getAdminUsersListCollection
+  getAdminUsersListCollection,
+  getTotalCounts
 }
diff --git a/packages/server/modules/core/tests/users.spec.js b/packages/server/modules/core/tests/users.spec.js
index 0c9a487e8..23d79f32f 100644
--- a/packages/server/modules/core/tests/users.spec.js
+++ b/packages/server/modules/core/tests/users.spec.js
@@ -226,7 +226,7 @@ describe('Actors & Tokens @user-services', () => {
         authorId: ballmerUserId
       })
 
-      await deleteUser(ballmerUserId)
+      await deleteUser({ deleteAllUserInvites: async () => true })(ballmerUserId)
 
       if ((await getStream({ streamId: soloOwnerStream.id })) !== undefined) {
         assert.fail('user stream not deleted')
@@ -263,7 +263,7 @@ describe('Actors & Tokens @user-services', () => {
 
     it('Should not delete the last admin user', async () => {
       try {
-        await deleteUser(myTestActor.id)
+        await deleteUser({ deleteAllUserInvites: async () => true })(myTestActor.id)
         assert.fail('boom')
       } catch (err) {
         expect(err.message).to.equal(
diff --git a/packages/server/modules/core/tests/usersAdmin.spec.js b/packages/server/modules/core/tests/usersAdmin.spec.js
index de9162192..919fbc398 100644
--- a/packages/server/modules/core/tests/usersAdmin.spec.js
+++ b/packages/server/modules/core/tests/usersAdmin.spec.js
@@ -48,7 +48,7 @@ describe('User admin @user-services', () => {
 
     expect(await countUsers()).to.equal(2)
 
-    await deleteUser(actorId)
+    await deleteUser({ deleteAllUserInvites: async () => true })(actorId)
     expect(await countUsers()).to.equal(1)
   })
 
diff --git a/packages/server/modules/core/tests/usersAdminList.spec.ts b/packages/server/modules/core/tests/usersAdminList.spec.ts
index ac389e18c..de30065b6 100644
--- a/packages/server/modules/core/tests/usersAdminList.spec.ts
+++ b/packages/server/modules/core/tests/usersAdminList.spec.ts
@@ -3,7 +3,7 @@ import { truncateTables } from '@/test/hooks'
 import { createUser } from '@/modules/core/services/users'
 import { createStream } from '@/modules/core/services/streams'
 import { times, clamp } from 'lodash'
-import { createInviteDirectly } from '@/test/speckle-helpers/inviteHelper'
+import { createInviteDirectlyFactory } from '@/test/speckle-helpers/inviteHelper'
 import { getAdminUsersList } from '@/test/graphql/users'
 import { buildApolloServer } from '@/app'
 import { addLoadersToCtx } from '@/modules/shared/middleware'
@@ -12,10 +12,13 @@ import { expect } from 'chai'
 import { ApolloServer } from 'apollo-server-express'
 import { Optional } from '@/modules/shared/helpers/typeHelper'
 import { wait } from '@speckle/shared'
+import db from '@/db/knex'
 
 // To ensure that the invites are created in the correct order, we need to wait a bit between each creation
 const WAIT_TIMEOUT = 5
 
+const createInviteDirectly = createInviteDirectlyFactory({ db })
+
 function randomEl<T>(array: T[]): T {
   return array[Math.floor(Math.random() * array.length)]
 }
diff --git a/packages/server/modules/cross-server-sync/graph/generated/graphql.ts b/packages/server/modules/cross-server-sync/graph/generated/graphql.ts
index e3b54f267..3edd92793 100644
--- a/packages/server/modules/cross-server-sync/graph/generated/graphql.ts
+++ b/packages/server/modules/cross-server-sync/graph/generated/graphql.ts
@@ -373,62 +373,6 @@ export type AutomationCollection = {
   totalCount: Scalars['Int']['output'];
 };
 
-export type AutomationCreateInput = {
-  automationId: Scalars['String']['input'];
-  automationName: Scalars['String']['input'];
-  automationRevisionId: Scalars['String']['input'];
-  modelId: Scalars['String']['input'];
-  projectId: Scalars['String']['input'];
-  webhookId?: InputMaybe<Scalars['String']['input']>;
-};
-
-export type AutomationFunctionRun = {
-  __typename?: 'AutomationFunctionRun';
-  contextView?: Maybe<Scalars['String']['output']>;
-  elapsed: Scalars['Float']['output'];
-  functionId: Scalars['String']['output'];
-  functionLogo?: Maybe<Scalars['String']['output']>;
-  functionName: Scalars['String']['output'];
-  id: Scalars['ID']['output'];
-  resultVersions: Array<Version>;
-  /**
-   * NOTE: this is the schema for the results field below!
-   * Current schema: {
-   *   version: "1.0.0",
-   *   values: {
-   *     objectResults: Record<str, {
-   *       category: string
-   *       level: ObjectResultLevel
-   *       objectIds: string[]
-   *       message: str | null
-   *       metadata: Records<str, unknown> | null
-   *       visualoverrides: Records<str, unknown> | null
-   *     }[]>
-   *     blobIds?: string[]
-   *   }
-   * }
-   */
-  results?: Maybe<Scalars['JSONObject']['output']>;
-  status: AutomationRunStatus;
-  statusMessage?: Maybe<Scalars['String']['output']>;
-};
-
-export type AutomationMutations = {
-  __typename?: 'AutomationMutations';
-  create: Scalars['Boolean']['output'];
-  functionRunStatusReport: Scalars['Boolean']['output'];
-};
-
-
-export type AutomationMutationsCreateArgs = {
-  input: AutomationCreateInput;
-};
-
-
-export type AutomationMutationsFunctionRunStatusReportArgs = {
-  input: AutomationRunStatusUpdateInput;
-};
-
 export type AutomationRevision = {
   __typename?: 'AutomationRevision';
   functions: Array<AutomationRevisionFunction>;
@@ -452,44 +396,8 @@ export type AutomationRevisionFunction = {
 
 export type AutomationRevisionTriggerDefinition = VersionCreatedTriggerDefinition;
 
-export type AutomationRun = {
-  __typename?: 'AutomationRun';
-  automationId: Scalars['String']['output'];
-  automationName: Scalars['String']['output'];
-  createdAt: Scalars['DateTime']['output'];
-  functionRuns: Array<AutomationFunctionRun>;
-  id: Scalars['ID']['output'];
-  /** Resolved from all function run statuses */
-  status: AutomationRunStatus;
-  updatedAt: Scalars['DateTime']['output'];
-  versionId: Scalars['String']['output'];
-};
-
-export enum AutomationRunStatus {
-  Failed = 'FAILED',
-  Initializing = 'INITIALIZING',
-  Running = 'RUNNING',
-  Succeeded = 'SUCCEEDED'
-}
-
-export type AutomationRunStatusUpdateInput = {
-  automationId: Scalars['String']['input'];
-  automationRevisionId: Scalars['String']['input'];
-  automationRunId: Scalars['String']['input'];
-  functionRuns: Array<FunctionRunStatusInput>;
-  versionId: Scalars['String']['input'];
-};
-
 export type AutomationRunTrigger = VersionCreatedTrigger;
 
-export type AutomationsStatus = {
-  __typename?: 'AutomationsStatus';
-  automationRuns: Array<AutomationRun>;
-  id: Scalars['ID']['output'];
-  status: AutomationRunStatus;
-  statusMessage?: Maybe<Scalars['String']['output']>;
-};
-
 export type AvatarUser = {
   __typename?: 'AvatarUser';
   avatar?: Maybe<Scalars['String']['output']>;
@@ -939,27 +847,6 @@ export type FileUpload = {
   userId: Scalars['String']['output'];
 };
 
-export type FunctionRunStatusInput = {
-  contextView?: InputMaybe<Scalars['String']['input']>;
-  elapsed: Scalars['Float']['input'];
-  functionId: Scalars['String']['input'];
-  functionLogo?: InputMaybe<Scalars['String']['input']>;
-  functionName: Scalars['String']['input'];
-  resultVersionIds: Array<Scalars['String']['input']>;
-  /**
-   * Current schema: {
-   *   version: "1.0.0",
-   *   values: {
-   *     speckleObjects: Record<ObjectId, {level: string; statusMessage: string}[]>
-   *     blobIds?: string[]
-   *   }
-   * }
-   */
-  results?: InputMaybe<Scalars['JSONObject']['input']>;
-  status: AutomationRunStatus;
-  statusMessage?: InputMaybe<Scalars['String']['input']>;
-};
-
 export type GendoAiRender = {
   __typename?: 'GendoAIRender';
   camera?: Maybe<Scalars['JSONObject']['output']>;
@@ -1085,7 +972,6 @@ export type LimitedUserTimelineArgs = {
 export type Model = {
   __typename?: 'Model';
   author: LimitedUser;
-  automationStatus?: Maybe<AutomationsStatus>;
   automationsStatus?: Maybe<TriggeredAutomationsStatus>;
   /** Return a model tree of children */
   childrenTree: Array<ModelsTreeItem>;
@@ -1218,7 +1104,6 @@ export type Mutation = {
   appUpdate: Scalars['Boolean']['output'];
   automateFunctionRunStatusReport: Scalars['Boolean']['output'];
   automateMutations: AutomateMutations;
-  automationMutations: AutomationMutations;
   branchCreate: Scalars['String']['output'];
   branchDelete: Scalars['Boolean']['output'];
   branchUpdate: Scalars['Boolean']['output'];
@@ -1904,14 +1789,6 @@ export type ProjectAutomationUpdateInput = {
   name?: InputMaybe<Scalars['String']['input']>;
 };
 
-export type ProjectAutomationsStatusUpdatedMessage = {
-  __typename?: 'ProjectAutomationsStatusUpdatedMessage';
-  model: Model;
-  project: Project;
-  status: AutomationsStatus;
-  version: Version;
-};
-
 export type ProjectAutomationsUpdatedMessage = {
   __typename?: 'ProjectAutomationsUpdatedMessage';
   automation?: Maybe<Automation>;
@@ -2878,7 +2755,6 @@ export type Subscription = {
   commitDeleted?: Maybe<Scalars['JSONObject']['output']>;
   /** Subscribe to commit updated event. */
   commitUpdated?: Maybe<Scalars['JSONObject']['output']>;
-  projectAutomationsStatusUpdated: ProjectAutomationsStatusUpdatedMessage;
   /** Subscribe to updates to automations in the project */
   projectAutomationsUpdated: ProjectAutomationsUpdatedMessage;
   /**
@@ -2974,11 +2850,6 @@ export type SubscriptionCommitUpdatedArgs = {
 };
 
 
-export type SubscriptionProjectAutomationsStatusUpdatedArgs = {
-  projectId: Scalars['String']['input'];
-};
-
-
 export type SubscriptionProjectAutomationsUpdatedArgs = {
   projectId: Scalars['String']['input'];
 };
@@ -3320,7 +3191,6 @@ export type UserUpdateInput = {
 export type Version = {
   __typename?: 'Version';
   authorUser?: Maybe<LimitedUser>;
-  automationStatus?: Maybe<AutomationsStatus>;
   automationsStatus?: Maybe<TriggeredAutomationsStatus>;
   /** All comment threads in this version */
   commentThreads: CommentCollection;
diff --git a/packages/server/modules/index.js b/packages/server/modules/index.js
index 738766cc1..349d81e7a 100644
--- a/packages/server/modules/index.js
+++ b/packages/server/modules/index.js
@@ -48,7 +48,6 @@ const getEnabledModuleNames = () => {
     'activitystream',
     'apiexplorer',
     'auth',
-    'betaAutomations',
     'blobstorage',
     'comments',
     'core',
diff --git a/packages/server/modules/serverinvites/domain/operations.ts b/packages/server/modules/serverinvites/domain/operations.ts
new file mode 100644
index 000000000..673e39e2b
--- /dev/null
+++ b/packages/server/modules/serverinvites/domain/operations.ts
@@ -0,0 +1,114 @@
+import { ServerRoles, StreamRoles } from '@speckle/shared'
+import { UserWithOptionalRole } from '@/modules/core/repositories/users'
+import { ResourceTargets } from '@/modules/serverinvites/helpers/inviteHelper'
+import {
+  ServerInviteRecord,
+  StreamInviteRecord
+} from '@/modules/serverinvites/domain/types'
+import { StreamWithOptionalRole } from '@/modules/core/repositories/streams'
+
+export type QueryAllUserStreamInvites = (
+  userId: string
+) => Promise<StreamInviteRecord[]>
+
+type FindStreamInviteArgs = {
+  target?: string | null
+  token?: string | null
+  inviteId?: string | null
+}
+
+export type FindStreamInvite = (
+  streamId: string,
+  args: FindStreamInviteArgs
+) => Promise<StreamInviteRecord | null>
+
+export type FindUserByTarget = (target: string) => Promise<UserWithOptionalRole | null>
+
+type Invite = {
+  resourceId?: string | null
+  resourceTarget?: typeof ResourceTargets.Streams | null
+}
+
+export type FindResource = (
+  args: Invite
+) => Promise<StreamWithOptionalRole | undefined | null>
+
+type ServerInviteRecordInsertModel = Pick<
+  ServerInviteRecord,
+  | 'id'
+  | 'target'
+  | 'inviterId'
+  | 'message'
+  | 'resourceTarget'
+  | 'resourceId'
+  | 'role'
+  | 'token'
+  | 'serverRole'
+>
+
+export type InsertInviteAndDeleteOld = (
+  invite: ServerInviteRecordInsertModel,
+  alternateTargets: string[]
+) => Promise<number[]>
+
+export type FindServerInvite = (
+  email?: string,
+  token?: string
+) => Promise<ServerInviteRecord | null>
+
+export type QueryAllStreamInvites = (streamId: string) => Promise<StreamInviteRecord[]>
+
+export type DeleteAllStreamInvites = (streamId: string) => Promise<boolean>
+
+export type DeleteServerOnlyInvites = (email?: string) => Promise<number | undefined>
+
+export type UpdateAllInviteTargets = (
+  oldTargets?: string | string[],
+  newTarget?: string
+) => Promise<void>
+
+export type DeleteStreamInvite = (inviteId?: string) => Promise<number | undefined>
+
+export type CountServerInvites = (searchQuery: string | null) => Promise<number>
+
+export type FindServerInvites = (
+  searchQuery: string | null,
+  limit: number,
+  offset: number
+) => Promise<ServerInviteRecord[]>
+
+export type QueryServerInvites = (
+  searchQuery: string | null,
+  limit: number,
+  cursor: Date | null
+) => Promise<ServerInviteRecord[]>
+
+export type FindInvite = (inviteId?: string) => Promise<ServerInviteRecord | null>
+
+export type DeleteInvite = (inviteId?: string) => Promise<boolean>
+
+export type DeleteInvitesByTarget = (
+  targets?: string | string[],
+  resourceTarget?: string,
+  resourceId?: string
+) => Promise<boolean>
+
+export type QueryInvites = (
+  inviteIds?: readonly string[]
+) => Promise<ServerInviteRecord[]>
+
+export type DeleteAllUserInvites = (userId: string) => Promise<boolean>
+
+export type FindInviteByToken = (
+  inviteToken?: string
+) => Promise<ServerInviteRecord | null>
+
+export type CreateInviteParams = {
+  target: string
+  inviterId: string
+  message?: string | null
+  resourceTarget?: typeof ResourceTargets.Streams
+  resourceId?: string
+  role?: StreamRoles
+  serverRole?: ServerRoles | null
+}
diff --git a/packages/server/modules/serverinvites/helpers/types.ts b/packages/server/modules/serverinvites/domain/types.ts
similarity index 100%
rename from packages/server/modules/serverinvites/helpers/types.ts
rename to packages/server/modules/serverinvites/domain/types.ts
diff --git a/packages/server/modules/serverinvites/graph/resolvers/serverInvites.ts b/packages/server/modules/serverinvites/graph/resolvers/serverInvites.ts
index be5b1af36..749537649 100644
--- a/packages/server/modules/serverinvites/graph/resolvers/serverInvites.ts
+++ b/packages/server/modules/serverinvites/graph/resolvers/serverInvites.ts
@@ -5,15 +5,19 @@ import {
   buildUserTarget,
   ResourceTargets
 } from '@/modules/serverinvites/helpers/inviteHelper'
-import { createAndSendInvite } from '@/modules/serverinvites/services/inviteCreationService'
 import {
-  createStreamInviteAndNotify,
+  createAndSendInviteFactory,
+  resendInviteEmailFactory
+} from '@/modules/serverinvites/services/inviteCreationService'
+import {
+  createStreamInviteAndNotifyFactory,
   useStreamInviteAndNotify
 } from '@/modules/serverinvites/services/management'
 import {
   cancelStreamInvite,
   resendInvite,
-  deleteInvite
+  deleteInvite,
+  finalizeStreamInvite
 } from '@/modules/serverinvites/services/inviteProcessingService'
 import {
   getServerInviteForToken,
@@ -23,24 +27,48 @@ import {
 import { authorizeResolver } from '@/modules/shared'
 import { chunk } from 'lodash'
 import { Resolvers } from '@/modules/core/graph/generated/graphql'
+import db from '@/db/knex'
+import { ServerRoles, StreamRoles } from '@speckle/shared'
+import {
+  deleteInvitesByTargetFactory,
+  deleteStreamInviteFactory,
+  findInviteFactory,
+  findResourceFactory,
+  findServerInviteFactory,
+  findStreamInviteFactory,
+  findUserByTargetFactory,
+  insertInviteAndDeleteOldFactory,
+  queryAllUserStreamInvitesFactory,
+  deleteInviteFactory
+} from '@/modules/serverinvites/repositories/serverInvites'
 
 export = {
   Query: {
     async streamInvite(_parent, args, context) {
       const { streamId, token } = args
-      return await getUserPendingStreamInvite(streamId, context.userId, token)
+      return getUserPendingStreamInvite({
+        findStreamInvite: findStreamInviteFactory({ db })
+      })(streamId, context.userId, token)
     },
     async projectInvite(_parent, args, context) {
       const { projectId, token } = args
-      return await getUserPendingStreamInvite(projectId, context.userId, token)
+      return await getUserPendingStreamInvite({
+        findStreamInvite: findStreamInviteFactory({ db })
+      })(projectId, context.userId, token)
     },
     async streamInvites(_parent, _args, context) {
       const { userId } = context
-      return await getUserPendingStreamInvites(userId!)
+      return getUserPendingStreamInvites({
+        queryAllUserStreamInvites: queryAllUserStreamInvitesFactory({
+          db
+        })
+      })(userId!)
     },
     async serverInviteByToken(_parent, args) {
       const { token } = args
-      return await getServerInviteForToken(token)
+      return getServerInviteForToken({
+        findServerInvite: findServerInviteFactory({ db })
+      })(token)
     }
   },
   ServerInvite: {
@@ -54,12 +82,16 @@ export = {
   },
   Mutation: {
     async serverInviteCreate(_parent, args, context) {
-      await createAndSendInvite(
+      await createAndSendInviteFactory({
+        findResource: findResourceFactory(),
+        findUserByTarget: findUserByTargetFactory(),
+        insertInviteAndDeleteOld: insertInviteAndDeleteOldFactory({ db })
+      })(
         {
           target: args.input.email,
           inviterId: context.userId!,
           message: args.input.message,
-          serverRole: args.input.serverRole
+          serverRole: args.input.serverRole as null | undefined | ServerRoles
         },
         context.resourceAccessRules
       )
@@ -74,11 +106,15 @@ export = {
         Roles.Stream.Owner,
         context.resourceAccessRules
       )
-      await createStreamInviteAndNotify(
-        args.input,
-        context.userId!,
-        context.resourceAccessRules
-      )
+      await createStreamInviteAndNotifyFactory({
+        createAndSendInvite: createAndSendInviteFactory({
+          findResource: findResourceFactory(),
+          findUserByTarget: findUserByTargetFactory(),
+          insertInviteAndDeleteOld: insertInviteAndDeleteOldFactory({
+            db
+          })
+        })
+      })(args.input, context.userId!, context.resourceAccessRules)
 
       return true
     },
@@ -98,12 +134,18 @@ export = {
       for (const paramsBatchArray of batches) {
         await Promise.all(
           paramsBatchArray.map((params) =>
-            createAndSendInvite(
+            createAndSendInviteFactory({
+              findResource: findResourceFactory(),
+              findUserByTarget: findUserByTargetFactory(),
+              insertInviteAndDeleteOld: insertInviteAndDeleteOldFactory({
+                db
+              })
+            })(
               {
                 target: params.email,
                 inviterId: context.userId!,
                 message: params.message,
-                serverRole: params.serverRole
+                serverRole: params.serverRole as ServerRoles | null | undefined
               },
               context.resourceAccessRules
             )
@@ -134,15 +176,21 @@ export = {
           paramsBatchArray.map((params) => {
             const { email, userId, message, streamId, role, serverRole } = params
             const target = (userId ? buildUserTarget(userId) : email)!
-            return createAndSendInvite(
+            return createAndSendInviteFactory({
+              findResource: findResourceFactory(),
+              findUserByTarget: findUserByTargetFactory(),
+              insertInviteAndDeleteOld: insertInviteAndDeleteOldFactory({
+                db
+              })
+            })(
               {
                 target,
                 inviterId: context.userId!,
                 message,
                 resourceTarget: ResourceTargets.Streams,
                 resourceId: streamId,
-                role: role || Roles.Stream.Contributor,
-                serverRole
+                role: (role as unknown as StreamRoles) || Roles.Stream.Contributor,
+                serverRole: serverRole as ServerRoles | null | undefined
               },
               context.resourceAccessRules
             )
@@ -154,7 +202,12 @@ export = {
     },
 
     async streamInviteUse(_parent, args, ctx) {
-      await useStreamInviteAndNotify(args, ctx.userId!, ctx.resourceAccessRules)
+      await useStreamInviteAndNotify({
+        finalizeStreamInvite: finalizeStreamInvite({
+          findStreamInvite: findStreamInviteFactory({ db }),
+          deleteInvitesByTarget: deleteInvitesByTargetFactory({ db })
+        })
+      })(args, ctx.userId!, ctx.resourceAccessRules)
       return true
     },
 
@@ -163,7 +216,10 @@ export = {
       const { userId, resourceAccessRules } = ctx
 
       await authorizeResolver(userId, streamId, Roles.Stream.Owner, resourceAccessRules)
-      await cancelStreamInvite(streamId, inviteId)
+      await cancelStreamInvite({
+        findStreamInvite: findStreamInviteFactory({ db }),
+        deleteStreamInvite: deleteStreamInviteFactory({ db })
+      })(streamId, inviteId)
 
       return true
     },
@@ -171,7 +227,13 @@ export = {
     async inviteResend(_parent, args) {
       const { inviteId } = args
 
-      await resendInvite(inviteId)
+      await resendInvite({
+        findInvite: findInviteFactory({ db }),
+        resendInviteEmail: resendInviteEmailFactory({
+          findResource: findResourceFactory(),
+          findUserByTarget: findUserByTargetFactory()
+        })
+      })(inviteId)
 
       return true
     },
@@ -179,7 +241,10 @@ export = {
     async inviteDelete(_parent, args) {
       const { inviteId } = args
 
-      await deleteInvite(inviteId)
+      await deleteInvite({
+        findInvite: findInviteFactory({ db }),
+        deleteInvite: deleteInviteFactory({ db })
+      })(inviteId)
 
       return true
     }
diff --git a/packages/server/modules/serverinvites/helpers/inviteHelper.js b/packages/server/modules/serverinvites/helpers/inviteHelper.js
index e1ad6e077..d06fc5aa9 100644
--- a/packages/server/modules/serverinvites/helpers/inviteHelper.js
+++ b/packages/server/modules/serverinvites/helpers/inviteHelper.js
@@ -4,8 +4,8 @@ const ResourceTargets = Object.freeze({
 
 /**
  * @typedef {{
- *  resourceTarget?: string,
- *  resourceId?: string
+ *  resourceTarget?: string | null,
+ *  resourceId?: string | null
  * }} InviteResourceData
  */
 
@@ -77,7 +77,7 @@ function buildUserTarget(userId) {
 
 /**
  * Resolve a display name for the user being invited
- * @param {import('@/modules/serverinvites/helpers/types').ServerInviteRecord} invite
+ * @param {import('@/modules/serverinvites/domain/types').ServerInviteRecord} invite
  * @param {import("@/modules/core/helpers/userHelper").LimitedUserRecord | null} user The user,
  * if invite targets a registered user.
  * @returns {string}
diff --git a/packages/server/modules/serverinvites/repositories/index.js b/packages/server/modules/serverinvites/repositories/index.js
deleted file mode 100644
index 95d8712ab..000000000
--- a/packages/server/modules/serverinvites/repositories/index.js
+++ /dev/null
@@ -1,398 +0,0 @@
-const { ServerInvites, Streams, knex } = require('@/modules/core/dbSchema')
-const { getUserByEmail, getUser } = require('@/modules/core/repositories/users')
-const { ResourceNotResolvableError } = require('@/modules/serverinvites/errors')
-const {
-  resolveTarget,
-  ResourceTargets,
-  buildUserTarget,
-  isServerInvite
-} = require('@/modules/serverinvites/helpers/inviteHelper')
-const { uniq, isArray } = require('lodash')
-const { getStream } = require('@/modules/core/repositories/streams')
-
-/**
- * Use this wherever you're retrieving invites, not necessarily where you're writing to them
- */
-const getInvitesBaseQuery = (sort = 'asc') => {
-  const q = ServerInvites.knex().select(ServerInvites.cols)
-
-  // join just to ensure we don't retrieve invalid invites
-  q.leftJoin(Streams.name, (j) => {
-    j.onNotNull(ServerInvites.col.resourceId)
-      .andOnVal(ServerInvites.col.resourceTarget, ResourceTargets.Streams)
-      .andOn(Streams.col.id, ServerInvites.col.resourceId)
-  }).where((w1) => {
-    w1.whereNull(ServerInvites.col.resourceId).orWhereNotNull(Streams.col.id)
-  })
-
-  q.orderBy(ServerInvites.col.createdAt, sort)
-
-  return q
-}
-
-/**
- *
- * Resolve resource from invite
- * @param {import('@/modules/serverinvites/helpers/inviteHelper').InviteResourceData} invite
- * @returns {Promise<Object>}
- */
-async function getResource(invite) {
-  if (isServerInvite(invite)) return null
-
-  const { resourceId, resourceTarget } = invite
-  if (resourceTarget === ResourceTargets.Streams) {
-    return await getStream({ streamId: resourceId })
-  } else {
-    throw new ResourceNotResolvableError('Unexpected invite resource type')
-  }
-}
-
-/**
- * Try to find a user using the target value
- * @param {string} target
- * @returns {Promise<import('@/modules/core/repositories/users').UserWithOptionalRole | undefined>}
- */
-async function getUserFromTarget(target) {
-  const { userEmail, userId } = resolveTarget(target)
-  return userEmail
-    ? await getUserByEmail(userEmail, { withRole: true })
-    : await getUser(userId, { withRole: true })
-}
-
-/**
- * Insert a new invite and delete the old ones
- * @param {import('@/modules/serverinvites/helpers/types').ServerInviteRecord} invite
- * @param {string[]} alternateTargets If there are alternate targets for the same user
- * (e.g. user ID & email), you can specify them to ensure those will be cleaned up
- * also
- */
-async function insertInviteAndDeleteOld(invite, alternateTargets = []) {
-  const allTargets = uniq(
-    [invite.target, ...alternateTargets].map((t) => t.toLowerCase())
-  )
-
-  // Delete old
-  await ServerInvites.knex()
-    .where({
-      [ServerInvites.col.resourceId]: invite.resourceId || null,
-      [ServerInvites.col.resourceTarget]: invite.resourceTarget || null
-    })
-    .whereIn(ServerInvites.col.target, allTargets)
-    .delete()
-
-  // Insert new
-  invite.target = invite.target.toLowerCase() // Extra safety cause our schema is case sensitive
-  await ServerInvites.knex().insert(invite)
-}
-
-/**
- * Retrieve a valid server invite for the specified target
- * @param {string|undefined} email Email address
- * @param {string|undefined} token Specify an invite token, if you're looking for
- * a specific invite. For backwards compatibility purposes, the token can also just be the invite ID.
- * @returns {import('@/modules/serverinvites/helpers/types').ServerInviteRecord | null}
- */
-async function getServerInvite(email = undefined, token = undefined) {
-  if (!email && !token) return null
-
-  const q = getInvitesBaseQuery()
-
-  if (email) {
-    q.andWhere({
-      [ServerInvites.col.target]: email.toLowerCase()
-    })
-  }
-
-  if (token) {
-    q.andWhere(ServerInvites.col.token, token)
-  }
-
-  return await q.first()
-}
-
-/**
- * Use up/delete all server-only for the specified email
- * @param {string} email
- */
-async function deleteServerOnlyInvites(email) {
-  if (!email) return
-
-  await ServerInvites.knex()
-    .where({
-      [ServerInvites.col.target]: email.toLowerCase(),
-      [ServerInvites.col.resourceTarget]: null
-    })
-    .delete()
-}
-
-/**
- * Update all invites that have the specified targets to have a new target value
- * @param {string[]|string} oldTargets A single target or an array of targets
- * @param {string} newTarget
- * @returns
- */
-async function updateAllInviteTargets(oldTargets, newTarget) {
-  if (!oldTargets || !newTarget) return
-  oldTargets = isArray(oldTargets) ? oldTargets : [oldTargets]
-  oldTargets = oldTargets.map((t) => t.toLowerCase())
-  if (!oldTargets.length) return
-
-  // PostgreSQL doesn't support aliases in update calls for some reason...
-  const ServerInvitesCols = ServerInvites.with({ withoutTablePrefix: true }).col
-  await ServerInvites.knex()
-    .whereIn(ServerInvitesCols.target, oldTargets)
-    .update(ServerInvitesCols.target, newTarget.toLowerCase())
-}
-
-/**
- * Get all pending stream invites
- * @param {string} streamId
- * @returns {Promise<import('@/modules/serverinvites/helpers/types').StreamInviteRecord[]>}
- */
-async function getAllStreamInvites(streamId) {
-  if (!streamId) return []
-
-  const q = getInvitesBaseQuery().where({
-    [ServerInvites.col.resourceTarget]: ResourceTargets.Streams,
-    [ServerInvites.col.resourceId]: streamId
-  })
-
-  return await q
-}
-
-/**
- * Get all invitations to streams that the specified user has
- * @param {string} userId
- * @returns {Promise<import('@/modules/serverinvites/helpers/types').StreamInviteRecord[]>}
- */
-async function getAllUserStreamInvites(userId) {
-  if (!userId) return []
-  const target = buildUserTarget(userId)
-
-  const q = getInvitesBaseQuery().where({
-    [ServerInvites.col.target]: target,
-    [ServerInvites.col.resourceTarget]: ResourceTargets.Streams
-  })
-
-  return await q
-}
-
-/**
- * Retrieve a stream invite for the specified target, token or both.
- * Note: Either the target, inviteId or token must be set
- * @param {string} streamId
- * @param {{target?: string|null|undefined, token?: string|null|undefined, inviteId?: string|null|undefined}} [param2]
- * @returns {Promise<import('@/modules/serverinvites/helpers/types').StreamInviteRecord | null>}
- */
-async function getStreamInvite(
-  streamId,
-  { target = null, token = null, inviteId = null } = {}
-) {
-  if (!target && !token && !inviteId) return null
-
-  const q = getInvitesBaseQuery().where({
-    [ServerInvites.col.resourceTarget]: ResourceTargets.Streams,
-    [ServerInvites.col.resourceId]: streamId
-  })
-
-  if (target) {
-    q.andWhere({
-      [ServerInvites.col.target]: target.toLowerCase()
-    })
-  } else if (inviteId) {
-    q.andWhere({
-      [ServerInvites.col.id]: inviteId
-    })
-  } else if (token) {
-    q.andWhere({
-      [ServerInvites.col.token]: token
-    })
-  }
-
-  return await q.first()
-}
-
-/**
- * Delete a single stream invite
- * @param {string} inviteId
- */
-async function deleteStreamInvite(inviteId) {
-  if (!inviteId) return
-
-  await ServerInvites.knex()
-    .where({
-      [ServerInvites.col.id]: inviteId,
-      [ServerInvites.col.resourceTarget]: ResourceTargets.Streams
-    })
-    .delete()
-}
-
-function findServerInvitesBaseQuery(searchQuery, sort) {
-  const q = getInvitesBaseQuery(sort)
-
-  if (searchQuery) {
-    // TODO: Is this safe from SQL injection?
-    q.andWhere(ServerInvites.col.target, 'ILIKE', `%${searchQuery}%`)
-  }
-
-  // Not an invite for an already registered user
-  q.andWhere(ServerInvites.col.target, 'NOT ILIKE', '@%')
-
-  return q
-}
-
-/**
- * Count all server invites, optionally filtering out unnecessary ones with the search query
- * @param {string|null} searchQuery
- * @returns {Promise<number>}
- */
-async function countServerInvites(searchQuery) {
-  const q = findServerInvitesBaseQuery(searchQuery)
-  const [count] = await knex().count().from(q.as('sq1'))
-  return parseInt(count.count)
-}
-
-/**
- *
- * @param {string|null} searchQuery
- * @param {number} limit
- * @param {number} offset
- * @returns {Promise<import('@/modules/serverinvites/helpers/types').ServerInviteRecord[]>}
- */
-async function findServerInvites(searchQuery, limit, offset) {
-  const q = findServerInvitesBaseQuery(searchQuery)
-  q.limit(limit).offset(offset)
-
-  return await q
-}
-
-/**
- *
- * @param {string|null} searchQuery
- * @param {number} limit
- * @param {Date|null} cursor
- * @returns {Promise<import('@/modules/serverinvites/helpers/types').ServerInviteRecord[]>}
- */
-async function queryServerInvites(searchQuery, limit, cursor) {
-  const q = findServerInvitesBaseQuery(searchQuery, 'desc').limit(limit)
-
-  if (cursor) q.where(ServerInvites.col.createdAt, '<', cursor.toISOString())
-  return await q
-}
-
-/**
- * Retrieve a specific invite (irregardless of the type)
- * @param {string} inviteId
- * @returns {Promise<import('@/modules/serverinvites/helpers/types').ServerInviteRecord | null>}
- */
-async function getInvite(inviteId) {
-  if (!inviteId) return null
-  return await getInvitesBaseQuery().where(ServerInvites.col.id, inviteId).first()
-}
-
-/**
- * Retrieve a specific invite (irregardless of the type) by the token
- * @param {string} inviteId
- * @returns {Promise<import('@/modules/serverinvites/helpers/types').ServerInviteRecord | null>}
- */
-async function getInviteByToken(inviteToken) {
-  if (!inviteToken) return null
-  return await getInvitesBaseQuery().where(ServerInvites.col.token, inviteToken).first()
-}
-
-/**
- * Delete a specific invite (irregardless of the type)
- * @param {string} inviteId
- * @returns {Promise<boolean>}
- */
-async function deleteInvite(inviteId) {
-  if (!inviteId) return false
-  await ServerInvites.knex().where(ServerInvites.col.id, inviteId).delete()
-  return true
-}
-
-/**
- * Delete invites by target - useful when there are potentially duplicate invites that need cleaning up
- * (e.g. same target, but multiple inviters)
- * @param {string|string[]} targets
- * @param {string} resourceTarget
- * @param {string} resourceId
- * @returns
- */
-async function deleteInvitesByTarget(targets, resourceTarget, resourceId) {
-  if (!targets) return false
-  targets = isArray(targets) ? targets : [targets]
-  if (!targets.length) return
-
-  resourceTarget = resourceTarget || null
-  resourceId = resourceId || null
-
-  await ServerInvites.knex()
-    .where({
-      [ServerInvites.col.resourceTarget]: resourceTarget,
-      [ServerInvites.col.resourceId]: resourceId
-    })
-    .whereIn(ServerInvites.col.target, targets)
-    .delete()
-
-  return true
-}
-
-/**
- * Delete all invites that target the specified user
- * @param {string} userId
- * @returns {Promise<boolean>}
- */
-async function deleteAllUserInvites(userId) {
-  if (!userId) return false
-  await ServerInvites.knex()
-    .where(ServerInvites.col.target, buildUserTarget(userId))
-    .delete()
-  return true
-}
-
-/**
- * Delete all invites for the specified stream
- * @param {string} streamId
- * @returns {Promise<boolean>}
- */
-async function deleteAllStreamInvites(streamId) {
-  if (!streamId) return false
-  await ServerInvites.knex()
-    .where(ServerInvites.col.resourceId, streamId)
-    .andWhere(ServerInvites.col.resourceTarget, ResourceTargets.Streams)
-    .delete()
-  return true
-}
-
-/**
- * Get all invites by IDs
- * @returns {Promise<import('@/modules/serverinvites/helpers/types').ServerInviteRecord[]>}
- */
-async function getInvites(inviteIds) {
-  if (!inviteIds?.length) return []
-  return await getInvitesBaseQuery().whereIn(ServerInvites.col.id, inviteIds)
-}
-
-module.exports = {
-  insertInviteAndDeleteOld,
-  getServerInvite,
-  deleteServerOnlyInvites,
-  getUserFromTarget,
-  updateAllInviteTargets,
-  getStreamInvite,
-  deleteStreamInvite,
-  getAllStreamInvites,
-  countServerInvites,
-  findServerInvites,
-  getInvite,
-  deleteInvite,
-  deleteInvitesByTarget,
-  deleteAllUserInvites,
-  getResource,
-  getAllUserStreamInvites,
-  getInvites,
-  getInviteByToken,
-  deleteAllStreamInvites,
-  queryServerInvites
-}
diff --git a/packages/server/modules/serverinvites/repositories/serverInvites.ts b/packages/server/modules/serverinvites/repositories/serverInvites.ts
new file mode 100644
index 000000000..c71396e39
--- /dev/null
+++ b/packages/server/modules/serverinvites/repositories/serverInvites.ts
@@ -0,0 +1,352 @@
+import { ServerInvites, Streams } from '@/modules/core/dbSchema'
+import {
+  getUserByEmail,
+  getUser,
+  UserWithOptionalRole
+} from '@/modules/core/repositories/users'
+import { ResourceNotResolvableError } from '@/modules/serverinvites/errors'
+import {
+  resolveTarget,
+  ResourceTargets,
+  buildUserTarget,
+  isServerInvite
+} from '@/modules/serverinvites/helpers/inviteHelper'
+import { uniq } from 'lodash'
+import { StreamWithOptionalRole, getStream } from '@/modules/core/repositories/streams'
+import { ServerInviteRecord } from '@/modules/serverinvites/domain/types'
+import { Knex } from 'knex'
+import {
+  CountServerInvites,
+  DeleteAllStreamInvites,
+  DeleteAllUserInvites,
+  DeleteInvite,
+  DeleteInvitesByTarget,
+  DeleteServerOnlyInvites,
+  DeleteStreamInvite,
+  FindInvite,
+  FindInviteByToken,
+  FindServerInvite,
+  FindServerInvites,
+  FindStreamInvite,
+  InsertInviteAndDeleteOld,
+  QueryAllStreamInvites,
+  QueryAllUserStreamInvites,
+  QueryInvites,
+  QueryServerInvites,
+  UpdateAllInviteTargets
+} from '@/modules/serverinvites/domain/operations'
+
+/**
+ * Use this wherever you're retrieving invites, not necessarily where you're writing to them
+ */
+const buildInvitesBaseQuery =
+  ({ db }: { db: Knex }) =>
+  (sort: 'asc' | 'desc' = 'asc') => {
+    // join just to ensure we don't retrieve invalid invites
+    const q = db<ServerInviteRecord>(ServerInvites.name)
+      .select(ServerInvites.cols)
+      .leftJoin(Streams.name, (j) => {
+        j.onNotNull(ServerInvites.col.resourceId)
+          .andOnVal(ServerInvites.col.resourceTarget, ResourceTargets.Streams)
+          .andOn(Streams.col.id, ServerInvites.col.resourceId)
+      })
+      .where((w1) => {
+        w1.whereNull(ServerInvites.col.resourceId).orWhereNotNull(Streams.col.id)
+      })
+      .orderBy(ServerInvites.col.createdAt, sort)
+    return q
+  }
+
+/**
+ * Resolve resource from invite
+ */
+export const findResourceFactory =
+  () =>
+  async (invite: {
+    resourceId?: string | null
+    resourceTarget?: typeof ResourceTargets.Streams | null
+  }): Promise<StreamWithOptionalRole | undefined | null> => {
+    if (isServerInvite(invite)) return null
+
+    const { resourceId, resourceTarget } = invite
+    if (resourceTarget === ResourceTargets.Streams) {
+      return getStream({ streamId: resourceId ?? undefined })
+    } else {
+      throw new ResourceNotResolvableError('Unexpected invite resource type')
+    }
+  }
+
+/**
+ * Try to find a user using the target value
+ */
+export const findUserByTargetFactory =
+  () =>
+  (target: string): Promise<UserWithOptionalRole | null> => {
+    const { userEmail, userId } = resolveTarget(target)
+    return userEmail
+      ? getUserByEmail(userEmail, { withRole: true })
+      : getUser(userId!, { withRole: true })
+  }
+
+/**
+ * Insert a new invite and delete the old ones
+ * If there are alternate targets for the same user
+ * (e.g. user ID & email), you can specify them to ensure those will be cleaned up
+ * also
+ */
+export const insertInviteAndDeleteOldFactory =
+  ({ db }: { db: Knex }): InsertInviteAndDeleteOld =>
+  async (invite, alternateTargets = []) => {
+    const allTargets = uniq(
+      [invite.target, ...alternateTargets].map((t) => t.toLowerCase())
+    )
+
+    // Delete old
+    await db<ServerInviteRecord>(ServerInvites.name)
+      .where({
+        [ServerInvites.col.resourceId]: invite.resourceId || null,
+        [ServerInvites.col.resourceTarget]: invite.resourceTarget || null
+      })
+      .whereIn(ServerInvites.col.target, allTargets)
+      .delete()
+
+    // Insert new
+    invite.target = invite.target.toLowerCase() // Extra safety cause our schema is case sensitive
+    return db<ServerInviteRecord>(ServerInvites.name).insert(invite)
+  }
+
+/**
+ * Get all invitations to streams that the specified user has
+ */
+export const queryAllUserStreamInvitesFactory =
+  ({ db }: { db: Knex }): QueryAllUserStreamInvites =>
+  async (userId) => {
+    if (!userId) return []
+    const target = buildUserTarget(userId)
+
+    return buildInvitesBaseQuery({ db })().where({
+      [ServerInvites.col.target]: target,
+      [ServerInvites.col.resourceTarget]: ResourceTargets.Streams
+    })
+  }
+
+/**
+ * Retrieve a stream invite for the specified target, token or both.
+ * Note: Either the target, inviteId or token must be set
+ */
+export const findStreamInviteFactory =
+  ({ db }: { db: Knex }): FindStreamInvite =>
+  async (streamId, { target = null, token = null, inviteId = null } = {}) => {
+    if (!target && !token && !inviteId) return null
+
+    const q = buildInvitesBaseQuery({ db })().where({
+      [ServerInvites.col.resourceTarget]: ResourceTargets.Streams,
+      [ServerInvites.col.resourceId]: streamId
+    })
+
+    if (target) {
+      q.andWhere({
+        [ServerInvites.col.target]: target.toLowerCase()
+      })
+    } else if (inviteId) {
+      q.andWhere({
+        [ServerInvites.col.id]: inviteId
+      })
+    } else if (token) {
+      q.andWhere({
+        [ServerInvites.col.token]: token
+      })
+    }
+
+    return q.first()
+  }
+
+export const findServerInviteFactory =
+  ({ db }: { db: Knex }): FindServerInvite =>
+  async (email, token) => {
+    if (!email && !token) return null
+
+    const q = buildInvitesBaseQuery({ db })()
+
+    if (email) {
+      q.andWhere({
+        [ServerInvites.col.target]: email.toLowerCase()
+      })
+    }
+
+    if (token) {
+      q.andWhere(ServerInvites.col.token, token)
+    }
+
+    return q.first()
+  }
+
+export const queryAllStreamInvitesFactory =
+  ({ db }: { db: Knex }): QueryAllStreamInvites =>
+  async (streamId) => {
+    if (!streamId) return []
+
+    return buildInvitesBaseQuery({ db })().where({
+      [ServerInvites.col.resourceTarget]: ResourceTargets.Streams,
+      [ServerInvites.col.resourceId]: streamId
+    })
+  }
+
+export const deleteAllStreamInvitesFactory =
+  ({ db }: { db: Knex }): DeleteAllStreamInvites =>
+  async (streamId) => {
+    if (!streamId) return false
+    await db(ServerInvites.name)
+      .where(ServerInvites.col.resourceId, streamId)
+      .andWhere(ServerInvites.col.resourceTarget, ResourceTargets.Streams)
+      .delete()
+    return true
+  }
+
+export const deleteServerOnlyInvitesFactory =
+  ({ db }: { db: Knex }): DeleteServerOnlyInvites =>
+  async (email) => {
+    if (!email) return
+
+    return db<ServerInviteRecord>(ServerInvites.name)
+      .where({
+        [ServerInvites.col.target]: email.toLowerCase(),
+        [ServerInvites.col.resourceTarget]: null
+      })
+      .delete()
+  }
+
+export const updateAllInviteTargetsFactory =
+  ({ db }: { db: Knex }): UpdateAllInviteTargets =>
+  async (oldTargets, newTarget) => {
+    if (!oldTargets || !newTarget) return
+    oldTargets = Array.isArray(oldTargets) ? oldTargets : [oldTargets]
+    oldTargets = oldTargets.map((t) => t.toLowerCase())
+    if (!oldTargets.length) return
+
+    // PostgreSQL doesn't support aliases in update calls for some reason...
+    const ServerInvitesCols = ServerInvites.with({ withoutTablePrefix: true }).col
+    return db(ServerInvites.name)
+      .whereIn(ServerInvitesCols.target, oldTargets)
+      .update(ServerInvitesCols.target, newTarget.toLowerCase())
+  }
+
+export const deleteStreamInviteFactory =
+  ({ db }: { db: Knex }): DeleteStreamInvite =>
+  async (inviteId) => {
+    if (!inviteId) return
+
+    return db(ServerInvites.name)
+      .where({
+        [ServerInvites.col.id]: inviteId,
+        [ServerInvites.col.resourceTarget]: ResourceTargets.Streams
+      })
+      .delete()
+  }
+
+const findServerInvitesBaseQueryFactory =
+  ({ db }: { db: Knex }) =>
+  (searchQuery: string | null, sort: 'asc' | 'desc' = 'asc'): Knex.QueryBuilder => {
+    const q = buildInvitesBaseQuery({ db })(sort)
+
+    if (searchQuery) {
+      // TODO: Is this safe from SQL injection?
+      q.andWhere(ServerInvites.col.target, 'ILIKE', `%${searchQuery}%`)
+    }
+
+    // Not an invite for an already registered user
+    q.andWhere(ServerInvites.col.target, 'NOT ILIKE', '@%')
+    return q
+  }
+
+export const countServerInvitesFactory =
+  ({ db }: { db: Knex }): CountServerInvites =>
+  async (searchQuery) => {
+    const q = findServerInvitesBaseQueryFactory({ db })(searchQuery)
+    const [count] = await db()
+      .count()
+      .from((q as Knex.QueryBuilder).as('sq1'))
+    return parseInt(count.count.toString())
+  }
+
+export const findServerInvitesFactory =
+  ({ db }: { db: Knex }): FindServerInvites =>
+  async (searchQuery, limit, offset) => {
+    const q = findServerInvitesBaseQueryFactory({ db })(
+      searchQuery
+    ) as Knex.QueryBuilder
+    return q.limit(limit).offset(offset) as Promise<ServerInviteRecord[]>
+  }
+
+export const queryServerInvitesFactory =
+  ({ db }: { db: Knex }): QueryServerInvites =>
+  async (searchQuery, limit, cursor) => {
+    const q = findServerInvitesBaseQueryFactory({ db })(searchQuery, 'desc')
+    q.limit(limit)
+
+    if (cursor) q.where(ServerInvites.col.createdAt, '<', cursor.toISOString())
+    return q
+  }
+
+export const findInviteFactory =
+  ({ db }: { db: Knex }): FindInvite =>
+  async (inviteId) => {
+    if (!inviteId) return null
+    return buildInvitesBaseQuery({ db })().where(ServerInvites.col.id, inviteId).first()
+  }
+
+export const deleteInviteFactory =
+  ({ db }: { db: Knex }): DeleteInvite =>
+  async (inviteId) => {
+    if (!inviteId) return false
+    await db(ServerInvites.name).where(ServerInvites.col.id, inviteId).delete()
+    return true
+  }
+
+/**
+ * Delete invites by target - useful when there are potentially duplicate invites that need cleaning up
+ * (e.g. same target, but multiple inviters)
+ */
+export const deleteInvitesByTargetFactory =
+  ({ db }: { db: Knex }): DeleteInvitesByTarget =>
+  async (targets, resourceTarget, resourceId) => {
+    if (!targets) return false
+    targets = Array.isArray(targets) ? targets : [targets]
+    if (!targets.length) return false
+
+    await db(ServerInvites.name)
+      .where({
+        [ServerInvites.col.resourceTarget]: resourceTarget,
+        [ServerInvites.col.resourceId]: resourceId
+      })
+      .whereIn(ServerInvites.col.target, targets)
+      .delete()
+
+    return true
+  }
+
+export const queryInvitesFactory =
+  ({ db }: { db: Knex }): QueryInvites =>
+  async (inviteIds) => {
+    if (!inviteIds?.length) return []
+    return buildInvitesBaseQuery({ db })().whereIn(ServerInvites.col.id, inviteIds)
+  }
+
+export const deleteAllUserInvitesFactory =
+  ({ db }: { db: Knex }): DeleteAllUserInvites =>
+  async (userId) => {
+    if (!userId) return false
+    await db(ServerInvites.name)
+      .where(ServerInvites.col.target, buildUserTarget(userId))
+      .delete()
+    return true
+  }
+
+export const findInviteByTokenFactory =
+  ({ db }: { db: Knex }): FindInviteByToken =>
+  async (inviteToken) => {
+    if (!inviteToken) return null
+    return buildInvitesBaseQuery({ db })()
+      .where(ServerInvites.col.token, inviteToken)
+      .first()
+  }
diff --git a/packages/server/modules/serverinvites/services/buildEmailContents.ts b/packages/server/modules/serverinvites/services/buildEmailContents.ts
new file mode 100644
index 000000000..7491bd1a9
--- /dev/null
+++ b/packages/server/modules/serverinvites/services/buildEmailContents.ts
@@ -0,0 +1,273 @@
+import { ServerInfo, UserRecord } from '@/modules/core/helpers/types'
+import { ServerInviteRecord } from '@/modules/serverinvites/domain/types'
+import { getServerInfo } from '@/modules/core/services/generic'
+import {
+  ResourceTargets,
+  isServerInvite
+} from '@/modules/serverinvites/helpers/inviteHelper'
+import {
+  getRegistrationRoute,
+  getStreamRoute
+} from '@/modules/core/helpers/routeHelper'
+import { getFrontendOrigin } from '@/modules/shared/helpers/envHelper'
+import { InviteCreateValidationError } from '@/modules/serverinvites/errors'
+import {
+  EmailTemplateParams,
+  renderEmail
+} from '@/modules/emails/services/emailRendering'
+import sanitizeHtml from 'sanitize-html'
+import { CreateInviteParams } from '@/modules/serverinvites/domain/operations'
+
+type InviteOrInputParams =
+  | CreateInviteParams
+  | Pick<
+      ServerInviteRecord,
+      | 'id'
+      | 'target'
+      | 'inviterId'
+      | 'message'
+      | 'resourceTarget'
+      | 'resourceId'
+      | 'role'
+      | 'token'
+      | 'serverRole'
+    >
+
+/**
+ * Build invite email contents
+ */
+export async function buildEmailContents(
+  invite: Pick<
+    ServerInviteRecord,
+    | 'id'
+    | 'target'
+    | 'inviterId'
+    | 'message'
+    | 'resourceTarget'
+    | 'resourceId'
+    | 'role'
+    | 'token'
+    | 'serverRole'
+  >,
+  inviter: UserRecord,
+  resource?: { name: string } | null,
+  targetUser?: UserRecord | null
+): Promise<{ to: string; subject: string; text: string; html: string }> {
+  const email = targetUser ? targetUser.email : invite.target
+  const serverInfo = await getServerInfo()
+  const inviteLink = buildInviteLink(invite)
+  const resourceName = resolveResourceName(invite, resource)
+
+  const templateParams = buildEmailTemplateParams(
+    invite,
+    inviter,
+    serverInfo,
+    inviteLink,
+    resourceName
+  )
+  const subject = buildEmailSubject(invite, inviter, resourceName)
+
+  const { text, html } = await renderEmail(
+    templateParams,
+    serverInfo,
+    targetUser || null
+  )
+  return {
+    to: email,
+    subject,
+    text,
+    html
+  }
+}
+
+function buildInviteLink(
+  invite: Pick<
+    ServerInviteRecord,
+    | 'id'
+    | 'target'
+    | 'inviterId'
+    | 'message'
+    | 'resourceTarget'
+    | 'resourceId'
+    | 'role'
+    | 'token'
+    | 'serverRole'
+  >
+) {
+  const { resourceTarget, resourceId, token } = invite
+
+  if (isServerInvite(invite)) {
+    return new URL(
+      `${getRegistrationRoute()}?token=${token}`,
+      getFrontendOrigin()
+    ).toString()
+  }
+
+  if (resourceTarget === 'streams') {
+    return new URL(
+      `${getStreamRoute(resourceId!)}?token=${token}&accept=true`,
+      getFrontendOrigin()
+    ).toString()
+  } else {
+    throw new InviteCreateValidationError('Unexpected resource target type')
+  }
+}
+
+/**
+ * Build the email subject line
+ */
+function buildEmailSubject(
+  invite: Pick<
+    ServerInviteRecord,
+    | 'id'
+    | 'target'
+    | 'inviterId'
+    | 'message'
+    | 'resourceTarget'
+    | 'resourceId'
+    | 'role'
+    | 'token'
+    | 'serverRole'
+  >,
+  inviter: UserRecord,
+  resourceName: string | null
+): string {
+  const { resourceTarget } = invite
+
+  if (isServerInvite(invite)) {
+    return 'Speckle Invitation from ' + inviter.name
+  }
+
+  if (resourceTarget === 'streams') {
+    return `${inviter.name} wants to share the project "${resourceName}" on Speckle with you`
+  } else {
+    throw new InviteCreateValidationError('Unexpected resource target type')
+  }
+}
+
+function buildEmailTemplateParams(
+  invite: Pick<
+    ServerInviteRecord,
+    | 'id'
+    | 'target'
+    | 'inviterId'
+    | 'message'
+    | 'resourceTarget'
+    | 'resourceId'
+    | 'role'
+    | 'token'
+    | 'serverRole'
+  >,
+  inviter: UserRecord,
+  serverInfo: ServerInfo,
+  inviteLink: string,
+  resourceName: string | null
+): EmailTemplateParams {
+  return {
+    mjml: buildMjmlPreamble(invite, inviter, serverInfo, resourceName), // TODO: what happens when resourceName is null?
+    text: buildTextPreamble(invite, inviter, serverInfo, resourceName), // TODO: what happens when resourceName is null?
+    cta: {
+      title: 'Accept the invitation',
+      url: inviteLink
+    }
+  }
+}
+
+function buildMjmlPreamble(
+  invite: Pick<
+    ServerInviteRecord,
+    | 'id'
+    | 'target'
+    | 'inviterId'
+    | 'message'
+    | 'resourceTarget'
+    | 'resourceId'
+    | 'role'
+    | 'token'
+    | 'serverRole'
+  >,
+  inviter: UserRecord,
+  serverInfo: ServerInfo,
+  resourceName: string | null
+) {
+  const { message } = invite
+  const forServer = isServerInvite(invite)
+
+  const dynamicText = forServer
+    ? `join the <b>${serverInfo.name}</b> Speckle Server`
+    : `become a collaborator on the <b>${resourceName}</b> project`
+
+  const bodyStart = `
+  <mj-text>
+  Hello!
+  <br />
+  <br />
+  ${inviter.name} has just sent you this invitation to ${dynamicText}!
+  ${message ? inviter.name + ' said: <em>"' + message + '"</em>' : ''}
+  </mj-text>
+  `
+
+  return {
+    bodyStart,
+    bodyEnd:
+      '<mj-text>Feel free to ignore this invite if you do not know the person sending it.</mj-text>'
+  }
+}
+
+function buildTextPreamble(
+  invite: Pick<
+    ServerInviteRecord,
+    | 'id'
+    | 'target'
+    | 'inviterId'
+    | 'message'
+    | 'resourceTarget'
+    | 'resourceId'
+    | 'role'
+    | 'token'
+    | 'serverRole'
+  >,
+  inviter: UserRecord,
+  serverInfo: ServerInfo,
+  resourceName: string | null
+) {
+  const { message } = invite
+  const forServer = isServerInvite(invite)
+
+  const dynamicText = forServer
+    ? `join the ${serverInfo.name} Speckle Server`
+    : `become a collaborator on the "${resourceName}" project`
+
+  const bodyStart = `Hello!
+
+${inviter.name} has just sent you this invitation to ${dynamicText}!
+
+${message ? inviter.name + ' said: "' + sanitizeMessage(message, true) + '"' : ''}`
+
+  return {
+    bodyStart,
+    bodyEnd: 'Feel free to ignore this invite if you do not know the person sending it.'
+  }
+}
+
+/**
+ * Sanitize message that potentially has HTML in it
+ */
+function sanitizeMessage(message: string, stripAll: boolean = false): string {
+  return sanitizeHtml(message, {
+    allowedTags: stripAll ? [] : ['b', 'i', 'em', 'strong']
+  })
+}
+
+function resolveResourceName(
+  params: InviteOrInputParams,
+  resource?: { name: string } | null
+) {
+  const { resourceTarget } = params
+
+  if (resourceTarget === ResourceTargets.Streams) {
+    return resource?.name || null
+  }
+
+  return null
+}
diff --git a/packages/server/modules/serverinvites/services/inviteCreationService.js b/packages/server/modules/serverinvites/services/inviteCreationService.js
deleted file mode 100644
index bf681ed52..000000000
--- a/packages/server/modules/serverinvites/services/inviteCreationService.js
+++ /dev/null
@@ -1,486 +0,0 @@
-const crs = require('crypto-random-string')
-const { getServerInfo } = require('@/modules/core/services/generic')
-const { sendEmail } = require('@/modules/emails')
-const { InviteCreateValidationError } = require('@/modules/serverinvites/errors')
-const { authorizeResolver } = require('@/modules/shared')
-const {
-  insertInviteAndDeleteOld,
-  getUserFromTarget,
-  getResource
-} = require('@/modules/serverinvites/repositories')
-const { getStreamCollaborator } = require('@/modules/core/repositories/streams')
-const { Roles } = require('@/modules/core/helpers/mainConstants')
-const sanitizeHtml = require('sanitize-html')
-const {
-  getRegistrationRoute,
-  getStreamRoute
-} = require('@/modules/core/helpers/routeHelper')
-const {
-  isServerInvite,
-  resolveTarget,
-  buildUserTarget,
-  ResourceTargets
-} = require('@/modules/serverinvites/helpers/inviteHelper')
-const { getUsers, getUser } = require('@/modules/core/repositories/users')
-const {
-  addStreamInviteSentOutActivity
-} = require('@/modules/activitystream/services/streamActivity')
-const { renderEmail } = require('@/modules/emails/services/emailRendering')
-const { getFrontendOrigin } = require('@/modules/shared/helpers/envHelper')
-
-/**
- * @typedef {{
- *  target: string;
- *  inviterId: string;
- *  message?: string | null;
- *  resourceTarget?: string;
- *  resourceId?: string;
- *  role?: string;
- *  serverRole?: string | null
- * }} CreateInviteParams
- */
-
-/**
- * @typedef {CreateInviteParams|import('@/modules/serverinvites/helpers/types').ServerInviteRecord} InviteOrInputParams
- */
-
-/**
- * @param {InviteOrInputParams} params
- * @param {Object | null} resource invite resource (e.g. stream)
- */
-function resolveResourceName(params, resource) {
-  const { resourceTarget } = params
-
-  if (resourceTarget === ResourceTargets.Streams) {
-    return resource.name
-  }
-
-  return null
-}
-
-/**
- * Validate that the inviter has access to the resources he's trying to invite people to
- * @param {CreateInviteParams} params
- * @param {import('@/modules/core/helpers/userHelper').UserRecord} inviter
- * @param {import('@/modules/core/graph/generated/graphql').TokenResourceIdentifier[] | undefined | null} inviterResourceAccessLimits
- */
-async function validateInviter(params, inviter, inviterResourceAccessLimits) {
-  const { resourceId, resourceTarget } = params
-  if (!inviter) throw new InviteCreateValidationError('Invalid inviter')
-  if (isServerInvite(params)) return
-
-  try {
-    if (resourceTarget === ResourceTargets.Streams) {
-      await authorizeResolver(
-        inviter.id,
-        resourceId,
-        Roles.Stream.Owner,
-        inviterResourceAccessLimits
-      )
-    } else {
-      throw new InviteCreateValidationError('Unexpected resource target type')
-    }
-  } catch (e) {
-    throw new InviteCreateValidationError(
-      "Inviter doesn't have proper access to the resource",
-      { cause: e }
-    )
-  }
-}
-
-/**
- * Validate the target
- * @param {CreateInviteParams} params
- * @param {import('@/modules/core/helpers/userHelper').UserRecord | undefined} targetUser
- */
-function validateTargetUser(params, targetUser) {
-  const { target } = params
-  const { userId } = resolveTarget(target)
-
-  if (userId && !targetUser) {
-    throw new InviteCreateValidationError('Attempting to invite an invalid user')
-  }
-
-  if (isServerInvite(params) && targetUser) {
-    throw new InviteCreateValidationError(
-      'This email is already associated with an account on this server'
-    )
-  }
-}
-
-/**
- * Validate the target resource
- * @param {CreateInviteParams} params
- * @param {Object | null} resource
- * @param {import('@/modules/core/helpers/userHelper').UserRecord | undefined} targetUser Target user, if one exists in our DB
- */
-async function validateResource(params, resource, targetUser) {
-  const { resourceId, resourceTarget, role } = params
-
-  if (resourceId && !resource) {
-    throw new InviteCreateValidationError("Couldn't resolve invite resource")
-  }
-
-  if (resourceTarget === ResourceTargets.Streams) {
-    if (targetUser) {
-      // Check if user isn't already associated with the stream
-      const isStreamCollaborator = !!(await getStreamCollaborator(
-        resourceId,
-        targetUser.id
-      ))
-      if (isStreamCollaborator) {
-        throw new InviteCreateValidationError(
-          'The target user is already a collaborator of the specified project'
-        )
-      }
-    }
-
-    if (!Object.values(Roles.Stream).includes(role)) {
-      throw new InviteCreateValidationError('Unexpected stream invite role')
-    }
-  }
-}
-
-/**
- * Validate invite creation input data
- * @param {CreateInviteParams} params
- * @param {import('@/modules/core/helpers/userHelper').UserRecord} inviter Inviter, resolved from DB
- * @param {import('@/modules/core/helpers/userHelper').UserRecord | undefined} targetUser Target user, if one exists in our DB
- * @param {Object | null} resource Invite resource (stream or null)
- * @param {import('@/modules/core/graph/generated/graphql').TokenResourceIdentifier[] | undefined | null} inviterResourceAccessLimits
- */
-async function validateInput(
-  params,
-  inviter,
-  targetUser,
-  resource,
-  inviterResourceAccessLimits
-) {
-  const { message } = params
-
-  // validate inviter & invitee
-  validateTargetUser(params, targetUser)
-  await validateInviter(params, inviter, inviterResourceAccessLimits)
-
-  // validate resource
-  await validateResource(params, resource, targetUser)
-
-  // check if message too long
-  if (message) {
-    if (message.length >= 1024) {
-      throw new InviteCreateValidationError('Personal message too long')
-    }
-  }
-}
-
-/**
- * Sanitize message that potentially has HTML in it
- * @param {string} message
- * @returns {string}
- */
-function sanitizeMessage(message, stripAll = false) {
-  return sanitizeHtml(message, {
-    allowedTags: stripAll ? [] : [('b', 'i', 'em', 'strong')]
-  })
-}
-
-/**
- * Build the email subject line
- * @param {import('@/modules/serverinvites/helpers/types').ServerInviteRecord} invite
- * @param {import('@/modules/core/helpers/userHelper').UserRecord} inviter
- * @param {string | null} resourceName
- * @returns {string}
- */
-function buildEmailSubject(invite, inviter, resourceName) {
-  const { resourceTarget } = invite
-
-  if (isServerInvite(invite)) {
-    return 'Speckle Invitation from ' + inviter.name
-  }
-
-  if (resourceTarget === 'streams') {
-    return `${inviter.name} wants to share the project "${resourceName}" on Speckle with you`
-  } else {
-    throw new InviteCreateValidationError('Unexpected resource target type')
-  }
-}
-
-/**
- * Build invite link URL
- * @param {import('@/modules/serverinvites/helpers/types').ServerInviteRecord} invite
- * @returns {string}
- */
-function buildInviteLink(invite) {
-  const { resourceTarget, resourceId, token } = invite
-
-  if (isServerInvite(invite)) {
-    return new URL(
-      `${getRegistrationRoute()}?token=${token}`,
-      getFrontendOrigin()
-    ).toString()
-  }
-
-  if (resourceTarget === 'streams') {
-    return new URL(
-      `${getStreamRoute(resourceId)}?token=${token}&accept=true`,
-      getFrontendOrigin()
-    ).toString()
-  } else {
-    throw new InviteCreateValidationError('Unexpected resource target type')
-  }
-}
-
-function buildMjmlPreamble(invite, inviter, serverInfo, resourceName) {
-  const { message } = invite
-  const forServer = isServerInvite(invite)
-
-  const dynamicText = forServer
-    ? `join the <b>${serverInfo.name}</b> Speckle Server`
-    : `become a collaborator on the <b>${resourceName}</b> project`
-
-  const bodyStart = `
-  <mj-text>
-  Hello!
-  <br />
-  <br />
-  ${inviter.name} has just sent you this invitation to ${dynamicText}! 
-  ${message ? inviter.name + ' said: <em>"' + message + '"</em>' : ''}
-  </mj-text>
-  `
-
-  return {
-    bodyStart,
-    bodyEnd:
-      '<mj-text>Feel free to ignore this invite if you do not know the person sending it.</mj-text>'
-  }
-}
-
-function buildTextPreamble(invite, inviter, serverInfo, resourceName) {
-  const { message } = invite
-  const forServer = isServerInvite(invite)
-
-  const dynamicText = forServer
-    ? `join the ${serverInfo.name} Speckle Server`
-    : `become a collaborator on the "${resourceName}" project`
-
-  const bodyStart = `Hello!
-
-${inviter.name} has just sent you this invitation to ${dynamicText}!
-
-${message ? inviter.name + ' said: "' + sanitizeMessage(message, true) + '"' : ''}`
-
-  return {
-    bodyStart,
-    bodyEnd: 'Feel free to ignore this invite if you do not know the person sending it.'
-  }
-}
-
-/**
- * @param {import('@/modules/serverinvites/helpers/types').ServerInviteRecord} invite
- * @param {import('@/modules/core/helpers/userHelper').UserRecord} inviter
- * @param {import('@/modules/core/helpers/types').ServerInfo} serverInfo
- * @param {string} resourceName
- * @returns {import('@/modules/emails/services/emailRendering').EmailTemplateParams}
- */
-function buildEmailTemplateParams(
-  invite,
-  inviter,
-  serverInfo,
-  inviteLink,
-  resourceName
-) {
-  return {
-    mjml: buildMjmlPreamble(invite, inviter, serverInfo, resourceName),
-    text: buildTextPreamble(invite, inviter, serverInfo, resourceName),
-    cta: {
-      title: 'Accept the invitation',
-      url: inviteLink
-    }
-  }
-}
-
-/**
- * Build invite email contents
- * @param {import('@/modules/serverinvites/helpers/types').ServerInviteRecord} invite
- * @param {import('@/modules/core/helpers/userHelper').UserRecord} inviter
- * @param {import('@/modules/core/helpers/userHelper').UserRecord | undefined} targetUser
- * @param {Object | null} resource
- * @returns {Promise<{to: string, subject: string, text: string, html: string}>}
- */
-async function buildEmailContents(invite, inviter, targetUser, resource) {
-  const email = targetUser ? targetUser.email : invite.target
-  const serverInfo = await getServerInfo()
-  const inviteLink = buildInviteLink(invite)
-  const resourceName = resolveResourceName(invite, resource)
-
-  const templateParams = buildEmailTemplateParams(
-    invite,
-    inviter,
-    serverInfo,
-    inviteLink,
-    resourceName
-  )
-  const subject = buildEmailSubject(invite, inviter, resourceName)
-
-  const { text, html } = await renderEmail(
-    templateParams,
-    serverInfo,
-    targetUser || null
-  )
-  return {
-    to: email,
-    subject,
-    text,
-    html
-  }
-}
-
-/**
- * Create and send out an invite
- * @param {CreateInviteParams} params
- * @param {import('@/modules/core/graph/generated/graphql').TokenResourceIdentifier[] | undefined | null} inviterResourceAccessLimits
- * @returns {Promise<string>} The ID of the created invite
- */
-async function createAndSendInvite(params, inviterResourceAccessLimits) {
-  const { inviterId, resourceTarget, resourceId, role, serverRole } = params
-  let { message, target } = params
-
-  const [inviter, targetUser, resource, serverInfo] = await Promise.all([
-    getUser(inviterId, { withRole: true }),
-    getUserFromTarget(target),
-    getResource(params),
-    getServerInfo()
-  ])
-
-  // if target user found, always use the user ID
-  if (targetUser) target = buildUserTarget(targetUser.id)
-  const { userEmail, userId } = resolveTarget(target)
-
-  // validate inputs
-  await validateInput(
-    params,
-    inviter,
-    targetUser,
-    resource,
-    inviterResourceAccessLimits
-  )
-
-  // Sanitize msg
-  // TODO: We should just use TipTap here
-  if (message) {
-    message = sanitizeMessage(message)
-  }
-
-  // validate server role
-  if (serverRole && !Object.values(Roles.Server).includes(serverRole)) {
-    throw new InviteCreateValidationError('Invalid server role')
-  }
-  if (inviter.role !== Roles.Server.Admin && serverRole === Roles.Server.Admin) {
-    throw new InviteCreateValidationError(
-      'Only server admins can assign the admin server role'
-    )
-  }
-  if (serverRole === Roles.Server.Guest && !serverInfo.guestModeEnabled) {
-    throw new InviteCreateValidationError('Guest mode is not enabled on this server')
-  }
-  if (targetUser && targetUser.role === Roles.Server.Guest) {
-    if (role === Roles.Stream.Owner) {
-      throw new InviteCreateValidationError('Guest users cannot be owners of projects')
-    }
-  }
-
-  // write to DB
-  const invite = {
-    id: crs({ length: 20 }),
-    target,
-    inviterId,
-    message,
-    resourceTarget,
-    resourceId,
-    role,
-    token: crs({ length: 50 }),
-    serverRole
-  }
-  await insertInviteAndDeleteOld(
-    invite,
-    targetUser ? [targetUser.email, buildUserTarget(targetUser.id)] : []
-  )
-
-  // generate and send email
-  const emailParams = await buildEmailContents(invite, inviter, targetUser, resource)
-
-  // send email and create activity stream item, if stream invite
-  await Promise.all([
-    sendEmail(emailParams),
-    ...(resourceTarget === ResourceTargets.Streams
-      ? [
-          addStreamInviteSentOutActivity({
-            streamId: resourceId,
-            inviterId,
-            inviteTargetEmail: userEmail,
-            inviteTargetId: userId
-          })
-        ]
-      : [])
-  ])
-
-  return {
-    inviteId: invite.id,
-    token: invite.token
-  }
-}
-
-/**
- * Re-send existing invite email
- * @param {import('@/modules/serverinvites/helpers/types').ServerInviteRecord} invite
- */
-async function resendInviteEmail(invite) {
-  const { inviterId, target } = invite
-
-  const [inviter, targetUser, resource] = await Promise.all([
-    getUser(inviterId),
-    getUserFromTarget(target),
-    getResource(invite)
-  ])
-
-  const emailParams = await buildEmailContents(invite, inviter, targetUser, resource)
-  await sendEmail(emailParams)
-}
-
-/**
- * Invite users to be contributors for the specified stream
- * @param {string} inviterId
- * @param {string} streamId
- * @param {string[]} userIds
- * @param {import('@/modules/core/graph/generated/graphql').TokenResourceIdentifier[] | undefined | null} inviterResourceAccessLimits
- * @returns {Promise<boolean>}
- */
-async function inviteUsersToStream(
-  inviterId,
-  streamId,
-  userIds,
-  inviterResourceAccessLimits
-) {
-  const users = await getUsers(userIds)
-  if (!users.length) return false
-
-  const inviteParamsArray = users.map((u) => ({
-    target: buildUserTarget(u.id),
-    inviterId,
-    resourceTarget: ResourceTargets.Streams,
-    resourceId: streamId,
-    role: Roles.Stream.Contributor
-  }))
-
-  await Promise.all(
-    inviteParamsArray.map((p) => createAndSendInvite(p, inviterResourceAccessLimits))
-  )
-
-  return true
-}
-
-module.exports = {
-  createAndSendInvite,
-  resendInviteEmail,
-  inviteUsersToStream
-}
diff --git a/packages/server/modules/serverinvites/services/inviteCreationService.ts b/packages/server/modules/serverinvites/services/inviteCreationService.ts
new file mode 100644
index 000000000..79b18cbfa
--- /dev/null
+++ b/packages/server/modules/serverinvites/services/inviteCreationService.ts
@@ -0,0 +1,197 @@
+import crs from 'crypto-random-string'
+import { getServerInfo } from '@/modules/core/services/generic'
+import emailsModule from '@/modules/emails'
+import { InviteCreateValidationError } from '@/modules/serverinvites/errors'
+import { Roles } from '@/modules/core/helpers/mainConstants'
+import sanitizeHtml from 'sanitize-html'
+import {
+  resolveTarget,
+  buildUserTarget,
+  ResourceTargets
+} from '@/modules/serverinvites/helpers/inviteHelper'
+import { getUser, getUsers } from '@/modules/core/repositories/users'
+import { addStreamInviteSentOutActivity } from '@/modules/activitystream/services/streamActivity'
+import { TokenResourceIdentifier } from '@/modules/core/domain/tokens/types'
+import {
+  FindResource,
+  FindUserByTarget,
+  InsertInviteAndDeleteOld
+} from '@/modules/serverinvites/domain/operations'
+import { validateInput } from '@/modules/serverinvites/services/validation'
+import { buildEmailContents } from '@/modules/serverinvites/services/buildEmailContents'
+import {
+  CreateAndSendInvite,
+  ResendInviteEmail
+} from '@/modules/serverinvites/services/operations'
+
+/**
+ * Create and send out an invite
+ */
+export const createAndSendInviteFactory =
+  ({
+    findUserByTarget,
+    findResource,
+    insertInviteAndDeleteOld
+  }: {
+    findUserByTarget: FindUserByTarget
+    findResource: FindResource
+    insertInviteAndDeleteOld: InsertInviteAndDeleteOld
+  }): CreateAndSendInvite =>
+  async (params, inviterResourceAccessLimits?) => {
+    const { inviterId, resourceTarget, resourceId, role, serverRole } = params
+    let { message, target } = params
+
+    const [inviter, targetUser, resource, serverInfo] = await Promise.all([
+      getUser(inviterId, { withRole: true }),
+      findUserByTarget(target),
+      findResource(params),
+      getServerInfo()
+    ])
+
+    // if target user found, always use the user ID
+    if (targetUser) target = buildUserTarget(targetUser.id)!
+    const { userEmail, userId } = resolveTarget(target)
+
+    // validate inputs
+    await validateInput(
+      params,
+      inviter,
+      resource,
+      targetUser,
+      inviterResourceAccessLimits
+    )
+
+    // Sanitize msg
+    // TODO: We should just use TipTap here
+    if (message) {
+      message = sanitizeMessage(message)
+    }
+
+    // validate server role
+    if (serverRole && !Object.values(Roles.Server).includes(serverRole)) {
+      throw new InviteCreateValidationError('Invalid server role')
+    }
+    if (inviter?.role !== Roles.Server.Admin && serverRole === Roles.Server.Admin) {
+      throw new InviteCreateValidationError(
+        'Only server admins can assign the admin server role'
+      )
+    }
+    if (serverRole === Roles.Server.Guest && !serverInfo.guestModeEnabled) {
+      throw new InviteCreateValidationError('Guest mode is not enabled on this server')
+    }
+    if (targetUser && targetUser.role === Roles.Server.Guest) {
+      if (role === Roles.Stream.Owner) {
+        throw new InviteCreateValidationError(
+          'Guest users cannot be owners of projects'
+        )
+      }
+    }
+
+    // write to DB
+    const invite = {
+      id: crs({ length: 20 }),
+      target,
+      inviterId,
+      message: message ?? null,
+      resourceTarget: resourceTarget ?? null,
+      resourceId: resourceId ?? null,
+      role: role ?? null,
+      token: crs({ length: 50 }),
+      serverRole: serverRole ?? null
+    }
+    await insertInviteAndDeleteOld(
+      invite,
+      targetUser ? [targetUser.email, buildUserTarget(targetUser.id)!] : []
+    )
+
+    // generate and send email
+    const emailParams = await buildEmailContents(invite, inviter!, resource, targetUser)
+
+    // send email and create activity stream item, if stream invite
+    await Promise.all([
+      emailsModule.sendEmail(emailParams),
+      ...(resourceTarget === ResourceTargets.Streams
+        ? [
+            addStreamInviteSentOutActivity({
+              streamId: resourceId!, // TODO: check null
+              inviterId,
+              inviteTargetEmail: userEmail!, // TODO: this should be properly typed
+              inviteTargetId: userId! // TODO: this should be properly typed
+            })
+          ]
+        : [])
+    ])
+
+    return {
+      inviteId: invite.id,
+      token: invite.token
+    }
+  }
+
+/**
+ * Sanitize message that potentially has HTML in it
+ */
+function sanitizeMessage(message: string, stripAll: boolean = false) {
+  return sanitizeHtml(message, {
+    allowedTags: stripAll ? [] : ['b', 'i', 'em', 'strong']
+  })
+}
+
+/**
+ * Re-send existing invite email
+ */
+export const resendInviteEmailFactory =
+  ({
+    findResource,
+    findUserByTarget
+  }: {
+    findResource: FindResource
+    findUserByTarget: FindUserByTarget
+  }): ResendInviteEmail =>
+  async (invite) => {
+    const { inviterId, target } = invite
+
+    const [inviter, targetUser, resource] = await Promise.all([
+      getUser(inviterId),
+      findUserByTarget(target),
+      findResource(
+        invite as {
+          resourceId?: string | null
+          resourceTarget?: typeof ResourceTargets.Streams | null
+        }
+      )
+    ])
+
+    // TODO: check nullable inviter
+    const emailParams = await buildEmailContents(invite, inviter!, resource, targetUser)
+    await emailsModule.sendEmail(emailParams)
+  }
+
+/**
+ * Invite users to be contributors for the specified stream
+ */
+export const inviteUsersToStreamFactory =
+  ({ createAndSendInvite }: { createAndSendInvite: CreateAndSendInvite }) =>
+  async (
+    inviterId: string,
+    streamId: string,
+    userIds: string[],
+    inviterResourceAccessLimits?: TokenResourceIdentifier[] | null
+  ): Promise<boolean> => {
+    const users = await getUsers(userIds)
+    if (!users.length) return false
+
+    const inviteParamsArray = users.map((u) => ({
+      target: buildUserTarget(u.id)!,
+      inviterId,
+      resourceTarget: ResourceTargets.Streams,
+      resourceId: streamId,
+      role: Roles.Stream.Contributor
+    }))
+
+    await Promise.all(
+      inviteParamsArray.map((p) => createAndSendInvite(p, inviterResourceAccessLimits))
+    )
+
+    return true
+  }
diff --git a/packages/server/modules/serverinvites/services/inviteProcessingService.js b/packages/server/modules/serverinvites/services/inviteProcessingService.js
deleted file mode 100644
index 34906798a..000000000
--- a/packages/server/modules/serverinvites/services/inviteProcessingService.js
+++ /dev/null
@@ -1,196 +0,0 @@
-const { Roles } = require('@/modules/core/helpers/mainConstants')
-const { getStreamRoute } = require('@/modules/core/helpers/routeHelper')
-const { NoInviteFoundError } = require('@/modules/serverinvites/errors')
-const {
-  isStreamInvite,
-  buildUserTarget,
-  ResourceTargets
-} = require('@/modules/serverinvites/helpers/inviteHelper')
-const {
-  getServerInvite,
-  deleteServerOnlyInvites,
-  updateAllInviteTargets,
-  getStreamInvite,
-  deleteStreamInvite,
-  getInvite,
-  deleteInvite: deleteInviteFromDb,
-  deleteInvitesByTarget
-} = require('@/modules/serverinvites/repositories')
-const {
-  resendInviteEmail
-} = require('@/modules/serverinvites/services/inviteCreationService')
-const {
-  addOrUpdateStreamCollaborator
-} = require('@/modules/core/services/streams/streamAccessService')
-const {
-  addStreamInviteDeclinedActivity
-} = require('@/modules/activitystream/services/streamActivity')
-const { getFrontendOrigin } = require('@/modules/shared/helpers/envHelper')
-
-/**
- * Resolve the relative auth redirect path, after registering with an invite
- * Note: Important auth query string params like the access_code are added separately
- * in auth middlewares
- * @param {import('@/modules/serverinvites/helpers/types').ServerInviteRecord | undefined} invite
- * @returns {string}
- */
-function resolveAuthRedirectPath(invite) {
-  if (invite) {
-    const { resourceId } = invite
-
-    if (isStreamInvite(invite)) {
-      return `${getStreamRoute(resourceId)}`
-    }
-  }
-
-  // Fall-back to base URL (for server invites)
-  return getFrontendOrigin()
-}
-
-/**
- * Validate that the new user has a valid invite for registering to the server
- * @param {Object} email User's email address
- * @param {string} token Invite token
- * @returns {import('@/modules/serverinvites/helpers/types').ServerInviteRecord}
- */
-async function validateServerInvite(email, token) {
-  const invite = await getServerInvite(email, token)
-  if (!invite) {
-    throw new NoInviteFoundError(
-      token
-        ? "Wrong e-mail address or invite token. Make sure you're using the same e-mail address that received the invite."
-        : "Wrong e-mail address. Make sure you're using the same e-mail address that received the invite.",
-      {
-        info: {
-          email,
-          token
-        }
-      }
-    )
-  }
-
-  return invite
-}
-
-/**
- * Finalize server registration by deleting unnecessary invites and updating
- * the remaining ones
- * @param {string} email
- * @param {string} userId
- */
-async function finalizeInvitedServerRegistration(email, userId) {
-  // Delete all server-only invites for this email
-  await deleteServerOnlyInvites(email)
-
-  // Update all remaining invites to use a userId target, not the e-mail
-  // (in case the user changes his e-mail right after)
-  await updateAllInviteTargets(email, buildUserTarget(userId))
-}
-
-/**
- * Accept or decline a stream invite
- * @param {boolean} accept
- * @param {string} streamId
- * @param {string} token
- * @param {string} userId User who's accepting the invite
- */
-async function finalizeStreamInvite(accept, streamId, token, userId) {
-  const invite = await getStreamInvite(streamId, {
-    token,
-    target: buildUserTarget(userId)
-  })
-  if (!invite) {
-    throw new NoInviteFoundError('Attempted to finalize nonexistant stream invite', {
-      info: {
-        streamId,
-        token,
-        userId
-      }
-    })
-  }
-
-  // Invite found - accept or decline
-  if (accept) {
-    // Add access for user
-    const { role = Roles.Stream.Contributor, inviterId } = invite
-    await addOrUpdateStreamCollaborator(streamId, userId, role, inviterId, null, {
-      fromInvite: true
-    })
-
-    // Delete all invites to this stream
-    await deleteInvitesByTarget(
-      buildUserTarget(userId),
-      ResourceTargets.Streams,
-      streamId
-    )
-  } else {
-    await addStreamInviteDeclinedActivity({
-      streamId,
-      inviteTargetId: userId,
-      inviterId: invite.inviterId
-    })
-  }
-
-  // Delete all invites to this stream
-  await deleteInvitesByTarget(
-    buildUserTarget(userId),
-    ResourceTargets.Streams,
-    streamId
-  )
-}
-
-/**
- * Cancel/decline a stream invite
- * @param {string} streamId
- * @param {string} inviteId
- */
-async function cancelStreamInvite(streamId, inviteId) {
-  const invite = await getStreamInvite(streamId, { inviteId })
-  if (!invite) {
-    throw new NoInviteFoundError('Attempted to process nonexistant stream invite', {
-      info: {
-        streamId,
-        inviteId
-      }
-    })
-  }
-
-  // Delete invite
-  await deleteStreamInvite(invite.id)
-}
-
-/**
- * Re-send pending invite e-mail, without creating a new invite
- * @param {string} inviteId
- */
-async function resendInvite(inviteId) {
-  const invite = await getInvite(inviteId)
-  if (!invite) {
-    throw new NoInviteFoundError('Attempted to re-send a nonexistant invite')
-  }
-
-  await resendInviteEmail(invite)
-}
-
-/**
- * Delete pending invite
- * @param {string} inviteId
- */
-async function deleteInvite(inviteId) {
-  const invite = await getInvite(inviteId)
-  if (!invite) {
-    throw new NoInviteFoundError('Attempted to delete a nonexistant invite')
-  }
-
-  await deleteInviteFromDb(invite.id)
-}
-
-module.exports = {
-  validateServerInvite,
-  resolveAuthRedirectPath,
-  finalizeInvitedServerRegistration,
-  finalizeStreamInvite,
-  cancelStreamInvite,
-  resendInvite,
-  deleteInvite
-}
diff --git a/packages/server/modules/serverinvites/services/inviteProcessingService.ts b/packages/server/modules/serverinvites/services/inviteProcessingService.ts
new file mode 100644
index 000000000..77a4defa3
--- /dev/null
+++ b/packages/server/modules/serverinvites/services/inviteProcessingService.ts
@@ -0,0 +1,212 @@
+import { Roles } from '@/modules/core/helpers/mainConstants'
+import { getStreamRoute } from '@/modules/core/helpers/routeHelper'
+import { NoInviteFoundError } from '@/modules/serverinvites/errors'
+import {
+  isStreamInvite,
+  buildUserTarget,
+  ResourceTargets
+} from '@/modules/serverinvites/helpers/inviteHelper'
+import { addOrUpdateStreamCollaborator } from '@/modules/core/services/streams/streamAccessService'
+import { addStreamInviteDeclinedActivity } from '@/modules/activitystream/services/streamActivity'
+import { getFrontendOrigin } from '@/modules/shared/helpers/envHelper'
+import { ServerInviteRecord } from '@/modules/serverinvites/domain/types'
+import {
+  DeleteInvite,
+  DeleteInvitesByTarget,
+  DeleteServerOnlyInvites,
+  DeleteStreamInvite,
+  FindInvite,
+  FindServerInvite,
+  FindStreamInvite,
+  UpdateAllInviteTargets
+} from '@/modules/serverinvites/domain/operations'
+import {
+  FinalizeStreamInvite,
+  ResendInviteEmail
+} from '@/modules/serverinvites/services/operations'
+
+/**
+ * Resolve the relative auth redirect path, after registering with an invite
+ * Note: Important auth query string params like the access_code are added separately
+ * in auth middlewares
+ */
+export const resolveAuthRedirectPath = () => (invite?: ServerInviteRecord) => {
+  if (invite) {
+    const { resourceId } = invite
+
+    if (isStreamInvite(invite)) {
+      // TODO: check nullability
+      return `${getStreamRoute(resourceId!)}`
+    }
+  }
+
+  // Fall-back to base URL (for server invites)
+  return getFrontendOrigin()
+}
+
+/**
+ * Validate that the new user has a valid invite for registering to the server
+ */
+export const validateServerInvite =
+  ({ findServerInvite }: { findServerInvite: FindServerInvite }) =>
+  async (email: string, token: string): Promise<ServerInviteRecord> => {
+    const invite = await findServerInvite(email, token)
+    if (!invite) {
+      throw new NoInviteFoundError(
+        token
+          ? "Wrong e-mail address or invite token. Make sure you're using the same e-mail address that received the invite."
+          : "Wrong e-mail address. Make sure you're using the same e-mail address that received the invite.",
+        {
+          info: {
+            email,
+            token
+          }
+        }
+      )
+    }
+
+    return invite
+  }
+
+/**
+ * Finalize server registration by deleting unnecessary invites and updating
+ * the remaining ones
+ */
+export const finalizeInvitedServerRegistration =
+  ({
+    deleteServerOnlyInvites,
+    updateAllInviteTargets
+  }: {
+    deleteServerOnlyInvites: DeleteServerOnlyInvites
+    updateAllInviteTargets: UpdateAllInviteTargets
+  }) =>
+  async (email: string, userId: string) => {
+    // Delete all server-only invites for this email
+    await deleteServerOnlyInvites(email)
+
+    // Update all remaining invites to use a userId target, not the e-mail
+    // (in case the user changes his e-mail right after)
+    await updateAllInviteTargets(email, buildUserTarget(userId)!)
+  }
+
+/**
+ * Accept or decline a stream invite
+ */
+export const finalizeStreamInvite =
+  ({
+    findStreamInvite,
+    deleteInvitesByTarget
+  }: {
+    findStreamInvite: FindStreamInvite
+    deleteInvitesByTarget: DeleteInvitesByTarget
+  }): FinalizeStreamInvite =>
+  async (accept, streamId, token, userId) => {
+    const invite = await findStreamInvite(streamId, {
+      token,
+      target: buildUserTarget(userId)
+    })
+    if (!invite) {
+      throw new NoInviteFoundError('Attempted to finalize nonexistant stream invite', {
+        info: {
+          streamId,
+          token,
+          userId
+        }
+      })
+    }
+
+    // Invite found - accept or decline
+    if (accept) {
+      // Add access for user
+      const { role = Roles.Stream.Contributor, inviterId } = invite
+      // TODO: check role nullability
+      await addOrUpdateStreamCollaborator(streamId, userId, role!, inviterId, null, {
+        fromInvite: true
+      })
+
+      // Delete all invites to this stream
+      await deleteInvitesByTarget(
+        buildUserTarget(userId)!,
+        ResourceTargets.Streams,
+        streamId
+      )
+    } else {
+      await addStreamInviteDeclinedActivity({
+        streamId,
+        inviteTargetId: userId,
+        inviterId: invite.inviterId
+      })
+    }
+
+    // Delete all invites to this stream
+    await deleteInvitesByTarget(
+      buildUserTarget(userId)!,
+      ResourceTargets.Streams,
+      streamId
+    )
+  }
+
+/**
+ * Cancel/decline a stream invite
+ */
+export const cancelStreamInvite =
+  ({
+    findStreamInvite,
+    deleteStreamInvite
+  }: {
+    findStreamInvite: FindStreamInvite
+    deleteStreamInvite: DeleteStreamInvite
+  }) =>
+  async (streamId: string, inviteId: string) => {
+    const invite = await findStreamInvite(streamId, {
+      inviteId
+    })
+    if (!invite) {
+      throw new NoInviteFoundError('Attempted to process nonexistant stream invite', {
+        info: {
+          streamId,
+          inviteId
+        }
+      })
+    }
+    await deleteStreamInvite(invite.id)
+  }
+
+/**
+ * Re-send pending invite e-mail, without creating a new invite
+ */
+export const resendInvite =
+  ({
+    findInvite,
+    resendInviteEmail
+  }: {
+    resendInviteEmail: ResendInviteEmail
+    findInvite: FindInvite
+  }) =>
+  async (inviteId: string) => {
+    const invite = await findInvite(inviteId)
+    if (!invite) {
+      throw new NoInviteFoundError('Attempted to re-send a nonexistant invite')
+    }
+    await resendInviteEmail(invite)
+  }
+
+/**
+ * Delete pending invite
+ */
+export const deleteInvite =
+  ({
+    findInvite,
+    deleteInvite
+  }: {
+    findInvite: FindInvite
+    deleteInvite: DeleteInvite
+  }) =>
+  async (inviteId: string) => {
+    const invite = await findInvite(inviteId)
+    if (!invite) {
+      throw new NoInviteFoundError('Attempted to delete a nonexistant invite')
+    }
+
+    await deleteInvite(invite.id)
+  }
diff --git a/packages/server/modules/serverinvites/services/inviteRetrievalService.ts b/packages/server/modules/serverinvites/services/inviteRetrievalService.ts
index 3b1bf80d7..0a7c9a48b 100644
--- a/packages/server/modules/serverinvites/services/inviteRetrievalService.ts
+++ b/packages/server/modules/serverinvites/services/inviteRetrievalService.ts
@@ -12,15 +12,15 @@ import {
 import {
   ServerInviteRecord,
   StreamInviteRecord
-} from '@/modules/serverinvites/helpers/types'
-import {
-  getAllStreamInvites,
-  getStreamInvite,
-  getAllUserStreamInvites,
-  getServerInvite
-} from '@/modules/serverinvites/repositories'
+} from '@/modules/serverinvites/domain/types'
 import { MaybeNullOrUndefined, Nullable, Roles } from '@speckle/shared'
 import { keyBy, uniq } from 'lodash'
+import {
+  FindServerInvite,
+  FindStreamInvite,
+  QueryAllStreamInvites,
+  QueryAllUserStreamInvites
+} from '@/modules/serverinvites/domain/operations'
 
 /**
  * The token field is intentionally ommited from this and only managed through the .token resolver
@@ -67,82 +67,89 @@ async function getInvitationTargetUsers(invites: ServerInviteRecord[]) {
 /**
  * Get pending stream collaborators (invited, but not accepted)
  */
-export async function getPendingStreamCollaborators(
-  streamId: string
-): Promise<PendingStreamCollaboratorGraphQLType[]> {
-  // Get all pending invites
-  const invites = await getAllStreamInvites(streamId)
+export const getPendingStreamCollaborators =
+  ({ queryAllStreamInvites }: { queryAllStreamInvites: QueryAllStreamInvites }) =>
+  async (streamId: string): Promise<PendingStreamCollaboratorGraphQLType[]> => {
+    // Get all pending invites
+    const invites = await queryAllStreamInvites(streamId)
 
-  // Get all target users, if any
-  const usersById = await getInvitationTargetUsers(invites)
+    // Get all target users, if any
+    const usersById = await getInvitationTargetUsers(invites)
 
-  // Build results
-  const results = []
-  for (const invite of invites) {
-    /** @type {import("@/modules/core/helpers/userHelper").LimitedUserRecord} */
-    let user
-    const { userId } = resolveTarget(invite.target)
-    if (userId && usersById[userId]) {
-      user = removePrivateFields(usersById[userId])
+    // Build results
+    const results = []
+    for (const invite of invites) {
+      let user: LimitedUserRecord | null = null
+      const { userId } = resolveTarget(invite.target)
+      if (userId && usersById[userId]) {
+        user = removePrivateFields(usersById[userId])
+      }
+
+      results.push(buildPendingStreamCollaboratorModel(invite, user))
     }
 
-    results.push(buildPendingStreamCollaboratorModel(invite, user || null))
+    return results
   }
 
-  return results
-}
-
 /**
  * Find a pending invitation to the specified stream for the specified user
  * Either the user ID or invite ID must be set
  */
-export async function getUserPendingStreamInvite(
-  streamId: string,
-  userId: MaybeNullOrUndefined<string>,
-  token: MaybeNullOrUndefined<string>
-): Promise<Nullable<PendingStreamCollaboratorGraphQLType>> {
-  if (!userId && !token) return null
+export const getUserPendingStreamInvite =
+  ({ findStreamInvite }: { findStreamInvite: FindStreamInvite }) =>
+  async (
+    streamId: string,
+    userId: MaybeNullOrUndefined<string>,
+    token: MaybeNullOrUndefined<string>
+  ): Promise<Nullable<PendingStreamCollaboratorGraphQLType>> => {
+    if (!userId && !token) return null
 
-  const invite = await getStreamInvite(streamId, {
-    target: buildUserTarget(userId),
-    token
-  })
-  if (!invite) return null
+    const invite = await findStreamInvite(streamId, {
+      target: buildUserTarget(userId),
+      token
+    })
+    if (!invite) return null
 
-  const targetUser = userId ? await getUser(userId) : null
+    // TODO: user repo should be injected
+    const targetUser = userId ? await getUser(userId) : null
 
-  return buildPendingStreamCollaboratorModel(invite, targetUser)
-}
+    return buildPendingStreamCollaboratorModel(invite, targetUser)
+  }
 
 /**
  * Get all pending invitations to streams that this user has
  */
-export async function getUserPendingStreamInvites(
-  userId: string
-): Promise<PendingStreamCollaboratorGraphQLType[]> {
-  if (!userId) return []
+export const getUserPendingStreamInvites =
+  ({
+    queryAllUserStreamInvites
+  }: {
+    queryAllUserStreamInvites: QueryAllUserStreamInvites
+  }) =>
+  async (userId: string): Promise<PendingStreamCollaboratorGraphQLType[]> => {
+    if (!userId) return []
 
-  const targetUser = await getUser(userId)
-  if (!targetUser) {
-    throw new NoInviteFoundError('Nonexistant user specified')
+    // TODO: user repository should be injected
+    const targetUser = await getUser(userId)
+    if (!targetUser) {
+      throw new NoInviteFoundError('Nonexistant user specified')
+    }
+
+    const invites = await queryAllUserStreamInvites(userId)
+    return invites.map((i) => buildPendingStreamCollaboratorModel(i, targetUser))
   }
 
-  const invites = await getAllUserStreamInvites(userId)
-  return invites.map((i) => buildPendingStreamCollaboratorModel(i, targetUser))
-}
+export const getServerInviteForToken =
+  ({ findServerInvite }: { findServerInvite: FindServerInvite }) =>
+  async (token: string): Promise<Nullable<ServerInviteGraphQLReturnType>> => {
+    const invite = await findServerInvite(undefined, token)
+    if (!invite) return null
 
-export async function getServerInviteForToken(
-  token: string
-): Promise<Nullable<ServerInviteGraphQLReturnType>> {
-  const invite = await getServerInvite(undefined, token)
-  if (!invite) return null
+    const target = resolveTarget(invite.target)
+    if (!target.userEmail) return null
 
-  const target = resolveTarget(invite.target)
-  if (!target.userEmail) return null
-
-  return {
-    id: invite.id,
-    invitedById: invite.inviterId,
-    email: target.userEmail
+    return {
+      id: invite.id,
+      invitedById: invite.inviterId,
+      email: target.userEmail
+    }
   }
-}
diff --git a/packages/server/modules/serverinvites/services/management.ts b/packages/server/modules/serverinvites/services/management.ts
index 6a4f0a3c1..19ee6c874 100644
--- a/packages/server/modules/serverinvites/services/management.ts
+++ b/packages/server/modules/serverinvites/services/management.ts
@@ -1,25 +1,26 @@
-import { MaybeNullOrUndefined, Roles } from '@speckle/shared'
+import { MaybeNullOrUndefined, Roles, ServerRoles, StreamRoles } from '@speckle/shared'
 import {
   MutationStreamInviteUseArgs,
   ProjectInviteCreateInput,
   ProjectInviteUseInput,
-  StreamInviteCreateInput,
-  TokenResourceIdentifier,
-  TokenResourceIdentifierType
+  StreamInviteCreateInput
 } from '@/modules/core/graph/generated/graphql'
 import { InviteCreateValidationError } from '@/modules/serverinvites/errors'
 import {
   buildUserTarget,
   ResourceTargets
 } from '@/modules/serverinvites/helpers/inviteHelper'
-import { createAndSendInvite } from '@/modules/serverinvites/services/inviteCreationService'
 import { has } from 'lodash'
-import { finalizeStreamInvite } from '@/modules/serverinvites/services/inviteProcessingService'
 import {
   ContextResourceAccessRules,
   isResourceAllowed
 } from '@/modules/core/helpers/token'
 import { StreamInvalidAccessError } from '@/modules/core/errors/stream'
+import {
+  CreateAndSendInvite,
+  FinalizeStreamInvite
+} from '@/modules/serverinvites/services/operations'
+import { TokenResourceIdentifier } from '@/modules/core/domain/tokens/types'
 
 type FullProjectInviteCreateInput = ProjectInviteCreateInput & { projectId: string }
 
@@ -27,68 +28,72 @@ const isStreamInviteCreateInput = (
   i: StreamInviteCreateInput | FullProjectInviteCreateInput
 ): i is StreamInviteCreateInput => has(i, 'streamId')
 
-export async function createStreamInviteAndNotify(
-  input: StreamInviteCreateInput | FullProjectInviteCreateInput,
-  inviterId: string,
-  inviterResourceAccessRules: MaybeNullOrUndefined<TokenResourceIdentifier[]>
-) {
-  const { email, userId, role } = input
+export const createStreamInviteAndNotifyFactory =
+  ({ createAndSendInvite }: { createAndSendInvite: CreateAndSendInvite }) =>
+  async (
+    input: StreamInviteCreateInput | FullProjectInviteCreateInput,
+    inviterId: string,
+    inviterResourceAccessRules: MaybeNullOrUndefined<TokenResourceIdentifier[]>
+  ) => {
+    const { email, userId, role } = input
 
-  if (!email && !userId) {
-    throw new InviteCreateValidationError('Either email or userId must be specified')
+    if (!email && !userId) {
+      throw new InviteCreateValidationError('Either email or userId must be specified')
+    }
+
+    const target = (userId ? buildUserTarget(userId) : email)!
+    await createAndSendInvite(
+      {
+        target,
+        inviterId,
+        resourceTarget: ResourceTargets.Streams,
+        resourceId: isStreamInviteCreateInput(input) ? input.streamId : input.projectId,
+        role: (role as StreamRoles) || Roles.Stream.Contributor,
+        message: isStreamInviteCreateInput(input)
+          ? input.message || undefined
+          : undefined,
+        serverRole: (input.serverRole as ServerRoles) || undefined
+      },
+      inviterResourceAccessRules
+    )
   }
 
-  const target = (userId ? buildUserTarget(userId) : email)!
-  await createAndSendInvite(
-    {
-      target,
-      inviterId,
-      resourceTarget: ResourceTargets.Streams,
-      resourceId: isStreamInviteCreateInput(input) ? input.streamId : input.projectId,
-      role: role || Roles.Stream.Contributor,
-      message: isStreamInviteCreateInput(input)
-        ? input.message || undefined
-        : undefined,
-      serverRole: input.serverRole || undefined
-    },
-    inviterResourceAccessRules
-  )
-}
-
 const isStreamInviteUseArgs = (
   i: MutationStreamInviteUseArgs | ProjectInviteUseInput
 ): i is MutationStreamInviteUseArgs => has(i, 'streamId')
 
-export async function useStreamInviteAndNotify(
-  input: MutationStreamInviteUseArgs | ProjectInviteUseInput,
-  userId: string,
-  userResourceAccessRules: ContextResourceAccessRules
-) {
-  const { accept, token } = input
+export const useStreamInviteAndNotify =
+  ({ finalizeStreamInvite }: { finalizeStreamInvite: FinalizeStreamInvite }) =>
+  async (
+    input: MutationStreamInviteUseArgs | ProjectInviteUseInput,
+    userId: string,
+    userResourceAccessRules: ContextResourceAccessRules
+  ) => {
+    const { accept, token } = input
 
-  if (
-    !isResourceAllowed({
-      resourceId: isStreamInviteUseArgs(input) ? input.streamId : input.projectId,
-      resourceType: TokenResourceIdentifierType.Project,
-      resourceAccessRules: userResourceAccessRules
-    })
-  ) {
-    throw new StreamInvalidAccessError(
-      'You are not allowed to process an invite for this stream',
-      {
-        info: {
-          userId,
-          userResourceAccessRules,
-          input
+    if (
+      !isResourceAllowed({
+        resourceId: isStreamInviteUseArgs(input) ? input.streamId : input.projectId,
+        resourceType: 'project',
+        resourceAccessRules: userResourceAccessRules
+      })
+    ) {
+      throw new StreamInvalidAccessError(
+        'You are not allowed to process an invite for this stream',
+        {
+          info: {
+            userId,
+            userResourceAccessRules,
+            input
+          }
         }
-      }
+      )
+    }
+
+    await finalizeStreamInvite(
+      accept,
+      isStreamInviteUseArgs(input) ? input.streamId : input.projectId,
+      token,
+      userId
     )
   }
-
-  await finalizeStreamInvite(
-    accept,
-    isStreamInviteUseArgs(input) ? input.streamId : input.projectId,
-    token,
-    userId
-  )
-}
diff --git a/packages/server/modules/serverinvites/services/operations.ts b/packages/server/modules/serverinvites/services/operations.ts
new file mode 100644
index 000000000..e41738bbd
--- /dev/null
+++ b/packages/server/modules/serverinvites/services/operations.ts
@@ -0,0 +1,21 @@
+import { TokenResourceIdentifier } from '@/modules/core/domain/tokens/types'
+import { CreateInviteParams } from '@/modules/serverinvites/domain/operations'
+import { ServerInviteRecord } from '@/modules/serverinvites/domain/types'
+
+export type InviteResult = {
+  inviteId: string
+  token: string
+}
+export type CreateAndSendInvite = (
+  params: CreateInviteParams,
+  inviterResourceAccessLimits?: TokenResourceIdentifier[] | null
+) => Promise<InviteResult>
+
+export type FinalizeStreamInvite = (
+  accept: boolean,
+  streamId: string,
+  token: string,
+  userId: string
+) => Promise<void>
+
+export type ResendInviteEmail = (invite: ServerInviteRecord) => Promise<void>
diff --git a/packages/server/modules/serverinvites/services/validation.ts b/packages/server/modules/serverinvites/services/validation.ts
new file mode 100644
index 000000000..4c3df1d8c
--- /dev/null
+++ b/packages/server/modules/serverinvites/services/validation.ts
@@ -0,0 +1,120 @@
+import { UserRecord } from '@/modules/core/helpers/types'
+import { CreateInviteParams } from '@/modules/serverinvites/domain/operations'
+import { InviteCreateValidationError } from '@/modules/serverinvites/errors'
+import { ResourceTargets, isServerInvite, resolveTarget } from '../helpers/inviteHelper'
+import { UserWithOptionalRole } from '@/modules/core/repositories/users'
+import { authorizeResolver } from '@/modules/shared'
+import { Roles } from '@speckle/shared'
+import { getStreamCollaborator } from '@/modules/core/repositories/streams'
+import { TokenResourceIdentifier } from '@/modules/core/domain/tokens/types'
+
+/**
+ * Validate invite creation input data
+ */
+export async function validateInput(
+  params: CreateInviteParams,
+  inviter: UserRecord | null,
+  resource?: { name: string } | null,
+  targetUser?: UserWithOptionalRole | null,
+  inviterResourceAccessLimits?: TokenResourceIdentifier[] | null
+) {
+  const { message } = params
+
+  // validate inviter & invitee
+  validateTargetUser(params, targetUser)
+  await validateInviter(params, inviter, inviterResourceAccessLimits)
+
+  // validate resource
+  await validateResource(params, resource, targetUser)
+
+  // check if message too long
+  if (message) {
+    if (message.length >= 1024) {
+      throw new InviteCreateValidationError('Personal message too long')
+    }
+  }
+}
+
+function validateTargetUser(
+  params: CreateInviteParams,
+  targetUser?: UserRecord | null
+) {
+  const { target } = params
+  const { userId } = resolveTarget(target)
+
+  if (userId && !targetUser) {
+    throw new InviteCreateValidationError('Attempting to invite an invalid user')
+  }
+
+  if (isServerInvite(params) && targetUser) {
+    throw new InviteCreateValidationError(
+      'This email is already associated with an account on this server'
+    )
+  }
+}
+
+/**
+ * Validate that the inviter has access to the resources he's trying to invite people to
+ */
+async function validateInviter(
+  params: CreateInviteParams,
+  inviter: UserRecord | null,
+  inviterResourceAccessLimits?: TokenResourceIdentifier[] | null
+) {
+  const { resourceId, resourceTarget } = params
+  if (!inviter) throw new InviteCreateValidationError('Invalid inviter')
+  if (isServerInvite(params)) return
+
+  try {
+    if (resourceTarget === ResourceTargets.Streams) {
+      await authorizeResolver(
+        inviter.id,
+        resourceId!, // TODO: check null
+        Roles.Stream.Owner,
+        inviterResourceAccessLimits
+      )
+    } else {
+      throw new InviteCreateValidationError('Unexpected resource target type')
+    }
+  } catch (e) {
+    throw new InviteCreateValidationError(
+      "Inviter doesn't have proper access to the resource",
+      { cause: e as Error }
+    )
+  }
+}
+
+/**
+ * Validate the target resource
+ */
+async function validateResource(
+  params: CreateInviteParams,
+  resource?: { name: string } | null,
+  targetUser?: UserRecord | null
+) {
+  const { resourceId, resourceTarget, role } = params
+
+  if (resourceId && !resource) {
+    throw new InviteCreateValidationError("Couldn't resolve invite resource")
+  }
+
+  if (resourceTarget === ResourceTargets.Streams) {
+    if (targetUser) {
+      // Check if user isn't already associated with the stream
+      const isStreamCollaborator = !!(await getStreamCollaborator(
+        resourceId!, // TODO: verify this null
+        targetUser.id
+      ))
+      if (isStreamCollaborator) {
+        throw new InviteCreateValidationError(
+          'The target user is already a collaborator of the specified project'
+        )
+      }
+    }
+
+    // TODO: check null role
+    if (!Object.values(Roles.Stream).includes(role!)) {
+      throw new InviteCreateValidationError('Unexpected stream invite role')
+    }
+  }
+}
diff --git a/packages/server/modules/serverinvites/tests/invites.spec.js b/packages/server/modules/serverinvites/tests/invites.spec.js
index f4edaedd8..1df0c2544 100644
--- a/packages/server/modules/serverinvites/tests/invites.spec.js
+++ b/packages/server/modules/serverinvites/tests/invites.spec.js
@@ -10,12 +10,12 @@ const {
   resendInvite,
   batchCreateServerInvites,
   batchCreateStreamInvites,
-  deleteInvite,
   getStreamInvite,
   useUpStreamInvite,
   cancelStreamInvite,
   getStreamPendingCollaborators,
-  getStreamInvites
+  getStreamInvites,
+  deleteInvite
 } = require('@/test/graphql/serverInvites')
 const { truncateTables } = require('@/test/hooks')
 const { expect } = require('chai')
@@ -23,30 +23,35 @@ const {
   createStream,
   grantPermissionsStream
 } = require('@/modules/core/services/streams')
-const {
-  getInviteByToken,
-  getInvite: getInviteFromDB
-} = require('@/modules/serverinvites/repositories')
 const { getUserStreamRole } = require('@/test/speckle-helpers/streamHelper')
-const { createInviteDirectly } = require('@/test/speckle-helpers/inviteHelper')
+const { createInviteDirectlyFactory } = require('@/test/speckle-helpers/inviteHelper')
 const { buildAuthenticatedApolloServer } = require('@/test/serverHelper')
 const { EmailSendingServiceMock } = require('@/test/mocks/global')
+const db = require('@/db/knex')
+const {
+  findInviteByTokenFactory,
+  findInviteFactory
+} = require('@/modules/serverinvites/repositories/serverInvites')
 
 async function cleanup() {
   await truncateTables([ServerInvites.name, Streams.name, Users.name])
 }
 
+const findInviteByToken = findInviteByTokenFactory({ db })
+const findInvite = findInviteFactory({ db })
+
 function getInviteTokenFromEmailParams(emailParams) {
   const { text } = emailParams
   const [, inviteId] = text.match(/\?token=(.*?)(\s|&)/i)
   return inviteId
 }
+const createInviteDirectly = createInviteDirectlyFactory({ db })
 
 async function validateInviteExistanceFromEmail(emailParams) {
   // Validate that invite exists
   const token = getInviteTokenFromEmailParams(emailParams)
   expect(token).to.be.ok
-  const invite = await getInviteByToken(token)
+  const invite = await findInviteByToken(token)
   expect(invite).to.be.ok
 
   return invite
@@ -466,14 +471,16 @@ describe('[Stream & Server Invites]', () => {
 
         // Delete all invites
         for (const invite of deletableInvites) {
-          const result = await deleteInvite(apollo, { inviteId: invite.inviteId })
+          const result = await deleteInvite(apollo, {
+            inviteId: invite.inviteId
+          })
           expect(result.data?.inviteDelete).to.be.ok
           expect(result.errors).to.not.be.ok
         }
 
         // Validate that invites no longer exist
         const invitesInDb = await Promise.all(
-          deletableInvites.map((i) => getInviteFromDB(i.inviteId))
+          deletableInvites.map((i) => findInvite(i.inviteId))
         )
         expect(invitesInDb.every((i) => !i)).to.be.true
       })
@@ -623,7 +630,7 @@ describe('[Stream & Server Invites]', () => {
 
           expect(data?.streamInviteUse).to.be.ok
           expect(errors).to.not.be.ok
-          expect(await getInviteFromDB(inviteId)).to.be.not.ok
+          expect(await findInvite(inviteId)).to.be.not.ok
 
           const userStreamRole = await getUserStreamRole(me.id, streamId)
           expect(userStreamRole).to.eq(accept ? Roles.Stream.Contributor : null)
@@ -710,7 +717,7 @@ describe('[Stream & Server Invites]', () => {
 
         expect(data?.streamInviteCancel).to.be.ok
         expect(errors).to.be.not.ok
-        expect(await getInviteFromDB(inviteId)).to.be.not.ok
+        expect(await findInvite(inviteId)).to.be.not.ok
       })
 
       it('own pending collaborators can be retrieved', async () => {
diff --git a/packages/server/modules/shared/authz.ts b/packages/server/modules/shared/authz.ts
index 296e2ed51..76f24ab87 100644
--- a/packages/server/modules/shared/authz.ts
+++ b/packages/server/modules/shared/authz.ts
@@ -11,16 +11,13 @@ import {
 } from '@/modules/shared/errors'
 import { adminOverrideEnabled } from '@/modules/shared/helpers/envHelper'
 import {
+  AvailableRoles,
   MaybeNullOrUndefined,
   Nullable,
-  AvailableRoles,
-  StreamRoles,
-  ServerRoles
+  ServerRoles,
+  StreamRoles
 } from '@speckle/shared'
-import {
-  TokenResourceIdentifier,
-  TokenResourceIdentifierType
-} from '@/modules/core/graph/generated/graphql'
+import { TokenResourceIdentifier } from '@/modules/core/domain/tokens/types'
 import { isResourceAllowed } from '@/modules/core/helpers/token'
 import { getAutomationProject } from '@/modules/automate/repositories/automations'
 import { UserRoleData } from '@/modules/shared/domain/rolesAndScopes/types'
@@ -176,7 +173,7 @@ export const validateResourceAccess: AuthPipelineFunction = async ({
 
   const hasAccess = isResourceAllowed({
     resourceId: streamId,
-    resourceType: TokenResourceIdentifierType.Project,
+    resourceType: 'project',
     resourceAccessRules
   })
 
diff --git a/packages/server/modules/shared/index.js b/packages/server/modules/shared/index.js
index 1222defe1..4e48049dd 100644
--- a/packages/server/modules/shared/index.js
+++ b/packages/server/modules/shared/index.js
@@ -40,7 +40,7 @@ async function validateScopes(scopes, scope) {
  * @param  {string | null | undefined} userId
  * @param  {string} resourceId
  * @param  {string} requiredRole
- * @param {import('@/modules/core/graph/generated/graphql').TokenResourceIdentifier[] | undefined | null} [userResourceAccessLimits]
+ * @param {import('@/modules/serverinvites/services/operations').TokenResourceIdentifier[] | undefined | null} [userResourceAccessLimits]
  */
 async function authorizeResolver(
   userId,
diff --git a/packages/server/modules/shared/utils/subscriptions.ts b/packages/server/modules/shared/utils/subscriptions.ts
index 0b824e207..be03ecfc0 100644
--- a/packages/server/modules/shared/utils/subscriptions.ts
+++ b/packages/server/modules/shared/utils/subscriptions.ts
@@ -5,9 +5,6 @@ import Redis from 'ioredis'
 import { withFilter } from 'graphql-subscriptions'
 import { GraphQLContext } from '@/modules/shared/helpers/typeHelper'
 import {
-  AutomationRun,
-  AutomationsStatus,
-  ProjectAutomationsStatusUpdatedMessage,
   ProjectCommentsUpdatedMessage,
   ProjectFileImportUpdatedMessage,
   ProjectModelsUpdatedMessage,
@@ -16,7 +13,6 @@ import {
   ProjectUpdatedMessage,
   ProjectVersionsPreviewGeneratedMessage,
   ProjectVersionsUpdatedMessage,
-  SubscriptionProjectAutomationsStatusUpdatedArgs,
   SubscriptionProjectAutomationsUpdatedArgs,
   SubscriptionProjectCommentsUpdatedArgs,
   SubscriptionProjectFileImportUpdatedArgs,
@@ -44,7 +40,6 @@ import {
 } from '@/modules/core/helpers/graphTypes'
 import { CommentGraphQLReturn } from '@/modules/comments/helpers/graphTypes'
 import { FileUploadGraphQLReturn } from '@/modules/fileuploads/helpers/types'
-import { AutomationFunctionRunGraphQLReturn } from '@/modules/betaAutomations/helpers/graphTypes'
 import {
   ProjectTriggeredAutomationsStatusUpdatedMessageGraphQLReturn,
   ProjectAutomationsUpdatedMessageGraphQLReturn
@@ -100,7 +95,6 @@ export enum ProjectSubscriptions {
   ProjectVersionsPreviewGenerated = 'PROJECT_VERSIONS_PREVIEW_GENERATED',
   ProjectCommentsUpdated = 'PROJECT_COMMENTS_UPDATED',
   // old beta subscription:
-  ProjectAutomationStatusUpdated = 'PROJECT_AUTOMATION_STATUS_UPDATED',
   ProjectTriggeredAutomationsStatusUpdated = 'PROJECT_TRIGGERED_AUTOMATION_STATUS_UPDATED',
   ProjectAutomationsUpdated = 'PROJECT_AUTOMATIONS_UPDATED',
   ProjectVersionGendoAIRenderUpdated = 'PROJECT_VERSION_GENDO_AI_RENDER_UPDATED',
@@ -229,31 +223,6 @@ type SubscriptionTypeMap = {
     }
     variables: SubscriptionProjectFileImportUpdatedArgs
   }
-  [ProjectSubscriptions.ProjectAutomationStatusUpdated]: {
-    payload: {
-      projectAutomationsStatusUpdated: Merge<
-        ProjectAutomationsStatusUpdatedMessage,
-        {
-          version: VersionGraphQLReturn
-          model: ModelGraphQLReturn
-          project: ProjectGraphQLReturn
-          status: Merge<
-            AutomationsStatus,
-            {
-              automationRuns: Array<
-                Merge<
-                  AutomationRun,
-                  { functionRuns: AutomationFunctionRunGraphQLReturn[] }
-                >
-              >
-            }
-          >
-        }
-      >
-      projectId: string
-    }
-    variables: SubscriptionProjectAutomationsStatusUpdatedArgs
-  }
   [ProjectSubscriptions.ProjectTriggeredAutomationsStatusUpdated]: {
     payload: {
       projectTriggeredAutomationsStatusUpdated: ProjectTriggeredAutomationsStatusUpdatedMessageGraphQLReturn
diff --git a/packages/server/test/graphql/generated/graphql.ts b/packages/server/test/graphql/generated/graphql.ts
index 9d8edbb83..6236283e9 100644
--- a/packages/server/test/graphql/generated/graphql.ts
+++ b/packages/server/test/graphql/generated/graphql.ts
@@ -374,62 +374,6 @@ export type AutomationCollection = {
   totalCount: Scalars['Int']['output'];
 };
 
-export type AutomationCreateInput = {
-  automationId: Scalars['String']['input'];
-  automationName: Scalars['String']['input'];
-  automationRevisionId: Scalars['String']['input'];
-  modelId: Scalars['String']['input'];
-  projectId: Scalars['String']['input'];
-  webhookId?: InputMaybe<Scalars['String']['input']>;
-};
-
-export type AutomationFunctionRun = {
-  __typename?: 'AutomationFunctionRun';
-  contextView?: Maybe<Scalars['String']['output']>;
-  elapsed: Scalars['Float']['output'];
-  functionId: Scalars['String']['output'];
-  functionLogo?: Maybe<Scalars['String']['output']>;
-  functionName: Scalars['String']['output'];
-  id: Scalars['ID']['output'];
-  resultVersions: Array<Version>;
-  /**
-   * NOTE: this is the schema for the results field below!
-   * Current schema: {
-   *   version: "1.0.0",
-   *   values: {
-   *     objectResults: Record<str, {
-   *       category: string
-   *       level: ObjectResultLevel
-   *       objectIds: string[]
-   *       message: str | null
-   *       metadata: Records<str, unknown> | null
-   *       visualoverrides: Records<str, unknown> | null
-   *     }[]>
-   *     blobIds?: string[]
-   *   }
-   * }
-   */
-  results?: Maybe<Scalars['JSONObject']['output']>;
-  status: AutomationRunStatus;
-  statusMessage?: Maybe<Scalars['String']['output']>;
-};
-
-export type AutomationMutations = {
-  __typename?: 'AutomationMutations';
-  create: Scalars['Boolean']['output'];
-  functionRunStatusReport: Scalars['Boolean']['output'];
-};
-
-
-export type AutomationMutationsCreateArgs = {
-  input: AutomationCreateInput;
-};
-
-
-export type AutomationMutationsFunctionRunStatusReportArgs = {
-  input: AutomationRunStatusUpdateInput;
-};
-
 export type AutomationRevision = {
   __typename?: 'AutomationRevision';
   functions: Array<AutomationRevisionFunction>;
@@ -453,44 +397,8 @@ export type AutomationRevisionFunction = {
 
 export type AutomationRevisionTriggerDefinition = VersionCreatedTriggerDefinition;
 
-export type AutomationRun = {
-  __typename?: 'AutomationRun';
-  automationId: Scalars['String']['output'];
-  automationName: Scalars['String']['output'];
-  createdAt: Scalars['DateTime']['output'];
-  functionRuns: Array<AutomationFunctionRun>;
-  id: Scalars['ID']['output'];
-  /** Resolved from all function run statuses */
-  status: AutomationRunStatus;
-  updatedAt: Scalars['DateTime']['output'];
-  versionId: Scalars['String']['output'];
-};
-
-export enum AutomationRunStatus {
-  Failed = 'FAILED',
-  Initializing = 'INITIALIZING',
-  Running = 'RUNNING',
-  Succeeded = 'SUCCEEDED'
-}
-
-export type AutomationRunStatusUpdateInput = {
-  automationId: Scalars['String']['input'];
-  automationRevisionId: Scalars['String']['input'];
-  automationRunId: Scalars['String']['input'];
-  functionRuns: Array<FunctionRunStatusInput>;
-  versionId: Scalars['String']['input'];
-};
-
 export type AutomationRunTrigger = VersionCreatedTrigger;
 
-export type AutomationsStatus = {
-  __typename?: 'AutomationsStatus';
-  automationRuns: Array<AutomationRun>;
-  id: Scalars['ID']['output'];
-  status: AutomationRunStatus;
-  statusMessage?: Maybe<Scalars['String']['output']>;
-};
-
 export type AvatarUser = {
   __typename?: 'AvatarUser';
   avatar?: Maybe<Scalars['String']['output']>;
@@ -940,27 +848,6 @@ export type FileUpload = {
   userId: Scalars['String']['output'];
 };
 
-export type FunctionRunStatusInput = {
-  contextView?: InputMaybe<Scalars['String']['input']>;
-  elapsed: Scalars['Float']['input'];
-  functionId: Scalars['String']['input'];
-  functionLogo?: InputMaybe<Scalars['String']['input']>;
-  functionName: Scalars['String']['input'];
-  resultVersionIds: Array<Scalars['String']['input']>;
-  /**
-   * Current schema: {
-   *   version: "1.0.0",
-   *   values: {
-   *     speckleObjects: Record<ObjectId, {level: string; statusMessage: string}[]>
-   *     blobIds?: string[]
-   *   }
-   * }
-   */
-  results?: InputMaybe<Scalars['JSONObject']['input']>;
-  status: AutomationRunStatus;
-  statusMessage?: InputMaybe<Scalars['String']['input']>;
-};
-
 export type GendoAiRender = {
   __typename?: 'GendoAIRender';
   camera?: Maybe<Scalars['JSONObject']['output']>;
@@ -1086,7 +973,6 @@ export type LimitedUserTimelineArgs = {
 export type Model = {
   __typename?: 'Model';
   author: LimitedUser;
-  automationStatus?: Maybe<AutomationsStatus>;
   automationsStatus?: Maybe<TriggeredAutomationsStatus>;
   /** Return a model tree of children */
   childrenTree: Array<ModelsTreeItem>;
@@ -1219,7 +1105,6 @@ export type Mutation = {
   appUpdate: Scalars['Boolean']['output'];
   automateFunctionRunStatusReport: Scalars['Boolean']['output'];
   automateMutations: AutomateMutations;
-  automationMutations: AutomationMutations;
   branchCreate: Scalars['String']['output'];
   branchDelete: Scalars['Boolean']['output'];
   branchUpdate: Scalars['Boolean']['output'];
@@ -1905,14 +1790,6 @@ export type ProjectAutomationUpdateInput = {
   name?: InputMaybe<Scalars['String']['input']>;
 };
 
-export type ProjectAutomationsStatusUpdatedMessage = {
-  __typename?: 'ProjectAutomationsStatusUpdatedMessage';
-  model: Model;
-  project: Project;
-  status: AutomationsStatus;
-  version: Version;
-};
-
 export type ProjectAutomationsUpdatedMessage = {
   __typename?: 'ProjectAutomationsUpdatedMessage';
   automation?: Maybe<Automation>;
@@ -2879,7 +2756,6 @@ export type Subscription = {
   commitDeleted?: Maybe<Scalars['JSONObject']['output']>;
   /** Subscribe to commit updated event. */
   commitUpdated?: Maybe<Scalars['JSONObject']['output']>;
-  projectAutomationsStatusUpdated: ProjectAutomationsStatusUpdatedMessage;
   /** Subscribe to updates to automations in the project */
   projectAutomationsUpdated: ProjectAutomationsUpdatedMessage;
   /**
@@ -2975,11 +2851,6 @@ export type SubscriptionCommitUpdatedArgs = {
 };
 
 
-export type SubscriptionProjectAutomationsStatusUpdatedArgs = {
-  projectId: Scalars['String']['input'];
-};
-
-
 export type SubscriptionProjectAutomationsUpdatedArgs = {
   projectId: Scalars['String']['input'];
 };
@@ -3321,7 +3192,6 @@ export type UserUpdateInput = {
 export type Version = {
   __typename?: 'Version';
   authorUser?: Maybe<LimitedUser>;
-  automationStatus?: Maybe<AutomationsStatus>;
   automationsStatus?: Maybe<TriggeredAutomationsStatus>;
   /** All comment threads in this version */
   commentThreads: CommentCollection;
diff --git a/packages/server/test/speckle-helpers/inviteHelper.js b/packages/server/test/speckle-helpers/inviteHelper.js
deleted file mode 100644
index 03ffa7f27..000000000
--- a/packages/server/test/speckle-helpers/inviteHelper.js
+++ /dev/null
@@ -1,44 +0,0 @@
-const { Roles } = require('@/modules/core/helpers/mainConstants')
-const {
-  buildUserTarget,
-  ResourceTargets
-} = require('@/modules/serverinvites/helpers/inviteHelper')
-const {
-  createAndSendInvite
-} = require('@/modules/serverinvites/services/inviteCreationService')
-
-/**
- * Create a new invite. User & userId are alternatives for each other, and so
- * are stream & streamId
- * @param {{
- *  email?: string,
- *  user?: import("@/modules/core/helpers/userHelper").UserRecord,
- *  userId?: string,
- *  message?: string,
- *  stream?: Object,
- *  streamId?: string
- * }} invite
- * @param {string} creatorId
- *
- * @returns {Promise<{inviteId: string, token: string}>}
- */
-function createInviteDirectly(invite, creatorId) {
-  const userId = invite.userId || invite.user?.id || null
-  const email = invite.email || null
-  if (!userId && !email) throw new Error('Either user/userId or email must be set')
-
-  const streamId = invite.streamId || invite.stream?.id || null
-
-  return createAndSendInvite({
-    target: email || buildUserTarget(userId),
-    inviterId: creatorId,
-    message: invite.message,
-    resourceTarget: streamId ? ResourceTargets.Streams : null,
-    resourceId: streamId || null,
-    role: streamId ? Roles.Stream.Contributor : null
-  })
-}
-
-module.exports = {
-  createInviteDirectly
-}
diff --git a/packages/server/test/speckle-helpers/inviteHelper.ts b/packages/server/test/speckle-helpers/inviteHelper.ts
new file mode 100644
index 000000000..e012012a1
--- /dev/null
+++ b/packages/server/test/speckle-helpers/inviteHelper.ts
@@ -0,0 +1,58 @@
+import { Roles } from '@speckle/shared'
+
+import {
+  buildUserTarget,
+  ResourceTargets
+} from '@/modules/serverinvites/helpers/inviteHelper'
+import { InviteResult } from '@/modules/serverinvites/services/operations'
+import { StreamRecord, UserRecord } from '@/modules/core/helpers/types'
+import {
+  findResourceFactory,
+  findUserByTargetFactory,
+  insertInviteAndDeleteOldFactory
+} from '@/modules/serverinvites/repositories/serverInvites'
+import { Knex } from 'knex'
+import { createAndSendInviteFactory } from '@/modules/serverinvites/services/inviteCreationService'
+
+/**
+ * Create a new invite. User & userId are alternatives for each other, and so
+ * are stream & streamId
+ */
+export const createInviteDirectlyFactory =
+  // This is a test helper, so im ok, with leaking the internal abstractions here
+
+
+    ({ db }: { db: Knex }) =>
+    async (
+      invite: {
+        email?: string
+        user?: UserRecord
+        userId?: string
+        message?: string
+        stream?: StreamRecord
+        streamId?: string
+      },
+      creatorId: string
+    ): Promise<InviteResult> => {
+      const userId = invite.userId || invite.user?.id || null
+      const email = invite.email || null
+      if (!userId && !email) throw new Error('Either user/userId or email must be set')
+
+      const streamId = invite.streamId || invite.stream?.id
+
+      const target = email || buildUserTarget(userId)
+      if (!target) throw new Error('Cannot create invite without a target')
+
+      return await createAndSendInviteFactory({
+        findUserByTarget: findUserByTargetFactory(),
+        findResource: findResourceFactory(),
+        insertInviteAndDeleteOld: insertInviteAndDeleteOldFactory({ db })
+      })({
+        target,
+        inviterId: creatorId,
+        message: invite.message,
+        resourceTarget: streamId ? ResourceTargets.Streams : undefined,
+        resourceId: streamId,
+        role: streamId ? Roles.Stream.Contributor : undefined
+      })
+    }
diff --git a/packages/shared/src/environment/index.ts b/packages/shared/src/environment/index.ts
index aa65aecea..694663839 100644
--- a/packages/shared/src/environment/index.ts
+++ b/packages/shared/src/environment/index.ts
@@ -4,17 +4,28 @@ import { z } from 'zod'
 function parseFeatureFlags() {
   //INFO
   // As a convention all feature flags should be prefixed with a FF_
-  const featureFlagSchema = z.object({
+  return parseEnv(process.env, {
     // Enables the automate module.
-    FF_AUTOMATE_MODULE_ENABLED: z.boolean().default(false),
+    FF_AUTOMATE_MODULE_ENABLED: {
+      schema: z.boolean(),
+      defaults: { production: false, _: true }
+    },
     // Enables the gendo ai integration
-    FF_GENDOAI_MODULE_ENABLED: z.boolean().default(false),
+    FF_GENDOAI_MODULE_ENABLED: {
+      schema: z.boolean(),
+      defaults: { production: false, _: true }
+    },
     // Disables writing to the closure table in the create objects batched services (re object upload routes)
-    FF_NO_CLOSURE_WRITES: z.boolean().default(false),
     // Enables the workspaces module
-    FF_WORKSPACES_MODULE_ENABLED: z.boolean().default(false)
+    FF_WORKSPACES_MODULE_ENABLED: {
+      schema: z.boolean(),
+      defaults: { production: false, _: true }
+    },
+    FF_NO_CLOSURE_WRITES: {
+      schema: z.boolean(),
+      defaults: { production: false, _: false }
+    }
   })
-  return parseEnv(process.env, featureFlagSchema.shape)
 }
 
 let parsedFlags: ReturnType<typeof parseFeatureFlags> | undefined
diff --git a/utils/1click_image_scripts/download.sh b/utils/1click_image_scripts/download.sh
deleted file mode 100644
index 68d446a25..000000000
--- a/utils/1click_image_scripts/download.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-echo "* Getting latest version of SpeckleServer Setup files..."
-
-mkdir -p /opt/speckle-server
-cd /opt/speckle-server || exit 1
-
-wget https://raw.githubusercontent.com/specklesystems/speckle-server/main/utils/1click_image_scripts/setup.py -O setup.py
-wget https://raw.githubusercontent.com/specklesystems/speckle-server/main/utils/1click_image_scripts/template-nginx-site.conf -O template-nginx-site.conf
-wget https://raw.githubusercontent.com/specklesystems/speckle-server/main/utils/1click_image_scripts/template-docker-compose.yml -O template-docker-compose.yml
-
-docker image rm {speckle/speckle-preview-service:2,speckle/speckle-webhook-service:2,speckle/speckle-server:2,speckle/speckle-frontend:2} || true
-chmod +x setup.py
-
-echo "* Getting the docker images for the latest SpeckleServer release..."
-docker compose -f template-docker-compose.yml pull
diff --git a/utils/1click_image_scripts/setup.py b/utils/1click_image_scripts/setup.py
index 0d8f133b1..c93cb184e 100755
--- a/utils/1click_image_scripts/setup.py
+++ b/utils/1click_image_scripts/setup.py
@@ -1,14 +1,5 @@
 #!/usr/bin/env python3
 
-import os
-import socket
-import subprocess
-import secrets
-import ruamel.yaml  # this module preserves yaml comments and whitespaces
-from ruamel.yaml.scalarstring import DoubleQuotedScalarString
-
-FILE_PATH = os.path.dirname(os.path.abspath(__file__))
-
 LOGO_STR = """
  _____                 _    _      _____
 /  ___|               | |  | |    /  ___|
@@ -21,202 +12,22 @@ LOGO_STR = """
 """
 
 
-def get_local_ip():
-    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-    s.connect(("8.8.8.8", 80))
-    ip = s.getsockname()[0]
-    s.close()
-    if not ip:
-        print("Error: Can't get local IP address")
-        exit(1)
-    return ip
-
-
-def read_domain(ip):
-    print("\nYou can set up a domain name for this Speckle server.")
-    print(
-        "Important: To use a domain name, you must first configure it to point to this VM address (so we can issue the SSL certificate)"
-    )
-    print(f"VM address: {ip}")
-    while True:
-        domain = input("Domain name (leave blank to use the IP address): ").strip()
-        if not domain:
-            return None
-        try:
-            domain_ip = socket.gethostbyname(domain.strip())
-        except Exception as ex:
-            print(f"Error: Domain '{domain}' cannot be resolved: {str(ex)}")
-            continue
-
-        if domain_ip != ip:
-            print(f"Error: Domain '{domain}' points to {domain_ip} instead of {ip}")
-            continue
-
-        return domain
-
-
-def read_email_settings(domain):
-    print(
-        "\nYou should configure an email provider to allow the Speckle Server to send emails."
-    )
-    print(
-        "Supported vendors: Any email provider that can provide SMTP connection details (mailjet, mailgun, etc)."
-    )
-    print(
-        "Important: If you don't configure email details, some features that require sending emails will not work, nevertheless the server should be functional."
-    )
-    while True:
-        enable_email = False
-        while True:
-            enable_email = input("Enable emails? [Y/n]: ").strip().lower()
-            if enable_email in ["n", "no"]:
-                enable_email = False
-                break
-            elif enable_email in ["", "y", "yes"]:
-                enable_email = True
-                break
-            else:
-                print("Unrecognized option")
-                continue
-
-        if not enable_email:
-            return None
-
-        print("Enter your SMTP connection details offered by your email provider")
-        smtp_host = input("SMTP server / host: ").strip()
-        smtp_port = input("SMTP port: ").strip()
-        try:
-            int(smtp_port)
-        except Exception:
-            print("Error: SMTP port must be a number. Retrying...")
-            continue
-        smtp_user = input("SMTP Username: ").strip()
-        smtp_pass = input("SMTP Password: ").strip()
-
-        if domain:
-            default_from_email = "no-reply@" + domain
-        else:
-            default_from_email = ""
-        email_from = input(f"Email address to send email as [{default_from_email}]: ")
-        if not email_from.strip():
-            email_from = default_from_email
-
-        if (
-            not smtp_host
-            or not smtp_port
-            or not smtp_user
-            or not smtp_pass
-            or not email_from
-        ):
-            print("Error: One or more fields were empty. Retrying...")
-            continue
-
-        return {
-            "host": smtp_host,
-            "port": smtp_port,
-            "user": smtp_user,
-            "pass": smtp_pass,
-            "from": email_from,
-        }
-
-
 def main():
     print(LOGO_STR)
-    ip = get_local_ip()
-
-    ###
-    ### Read user input
-    #########
-    domain = read_domain(ip)
-    if domain:
-        canonical_url = f"https://{domain}"
-    else:
-        canonical_url = f"http://{ip}"
-
-    email = read_email_settings(domain)
-
-    ###
-    ### Create docker-compose.yml from the template
-    #########
-    print("\nConfiguring docker containers...")
-
-    yaml = ruamel.yaml.YAML()
-    yaml.preserve_quotes = True
-    with open(os.path.join(FILE_PATH, "template-docker-compose.yml"), "r") as f:
-        yml_doc = yaml.load(f)
-    env = yml_doc["services"]["speckle-server"]["environment"]
-    env["CANONICAL_URL"] = DoubleQuotedScalarString(canonical_url)
-    env["FRONTEND_ORIGIN"] = DoubleQuotedScalarString(canonical_url)
-    env["SESSION_SECRET"] = DoubleQuotedScalarString(secrets.token_hex(32))
-    if email:
-        env["EMAIL"] = DoubleQuotedScalarString("true")
-        env["EMAIL_HOST"] = DoubleQuotedScalarString(email["host"])
-        env["EMAIL_PORT"] = DoubleQuotedScalarString(email["port"])
-        env["EMAIL_USERNAME"] = DoubleQuotedScalarString(email["user"])
-        env["EMAIL_PASSWORD"] = DoubleQuotedScalarString(email["pass"])
-        env["EMAIL_FROM"] = DoubleQuotedScalarString(email["from"])
-    else:
-        env["EMAIL"] = DoubleQuotedScalarString("false")
-
-    fe2env = yml_doc["services"]["speckle-frontend-2"]["environment"]
-    fe2env["NUXT_PUBLIC_SERVER_NAME"] = DoubleQuotedScalarString(canonical_url)
-    fe2env["NUXT_PUBLIC_API_ORIGIN"] = DoubleQuotedScalarString(canonical_url)
-    fe2env["NUXT_PUBLIC_BASE_URL"] = DoubleQuotedScalarString(canonical_url)
-
-    with open(os.path.join(FILE_PATH, "docker-compose.yml"), "w") as f:
-        f.write("# This file was generated by SpeckleServer setup.\n")
-        f.write("# If the setup is re-run, this file will be overwritten.\n\n")
-        yaml.dump(yml_doc, f)
-
-    ###
-    ### Run the new docker compose file (will update containers if already running)
-    #########
-    subprocess.run(
-        ["bash", "-c", f'cd "{FILE_PATH}"; docker compose up -d'], check=True
-    )
-
-    ###
-    ### Update nginx config and restart nginx
-    #########
-    print("\nConfiguring local nginx...")
-
-    nginx_conf_str = "# This file is managed by SpeckleServer setup script.\n"
-    nginx_conf_str += (
-        "# Any modifications will be removed when the setup script is re-executed\n\n"
-    )
-    with open(os.path.join(FILE_PATH, "template-nginx-site.conf"), "r") as f:
-        nginx_conf_str += f.read()
-    if domain:
-        nginx_conf_str = nginx_conf_str.replace("TODO_REPLACE_WITH_SERVER_NAME", domain)
-    else:
-        nginx_conf_str = nginx_conf_str.replace("TODO_REPLACE_WITH_SERVER_NAME", "_")
-    with open("/etc/nginx/sites-available/speckle-server", "w") as f:
-        f.write(nginx_conf_str)
-    subprocess.run(["nginx", "-s", "reload"], check=True)
-
-    ###
-    ### Run letsencrypt on new config
-    #########
-    if domain:
-        print("\n***")
-        print(
-            "*** Will now run LetsEncrypt utility to generate https certificate. Please answer any questions that are presented"
-        )
-        print(
-            "*** We highly recommend setting a good email address so that you are notified if there is any action needed to renew certificates"
-        )
-        print("***")
-        subprocess.run(["certbot", "--nginx", "-d", domain])
-
-    print("\nConfiguration complete!")
-    print("You can access your speckle server at: " + canonical_url)
-    print(LOGO_STR)
-    print("\nOne more thing and you are ready to roll:")
     print(
-        f" - Go to {canonical_url} in your browser and create an account. The first user to register will be granted administrator rights."
+        "\nAs of March 2024, Speckle server DigitalOcean 1-click setup script is no longer supported."
     )
     print(
-        " - Fill in information about your server under your profile page (in the lower left corner)."
+        "\nPlease use the official Speckle Server installation guide to install Speckle Server on your own infrastructure."
+    )
+    print(
+        "\nThis could be on a DigitalOcean Droplet that you have created yourself using an Ubuntu image."
+    )
+    print(
+        "\nOur documentation can be found at https://speckle.guide/dev/server-manualsetup.html"
+    )
+    print(
+        "\nIf you require to view previous versions of the 1-click setup script, please review the history of the speckle-server repository on GitHub."
     )
     print("\nHappy Speckling!")
 
diff --git a/utils/1click_image_scripts/template-docker-compose.yml b/utils/1click_image_scripts/template-docker-compose.yml
deleted file mode 100644
index b57d90ee8..000000000
--- a/utils/1click_image_scripts/template-docker-compose.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-version: '2.3'
-services:
-  ####
-  # Speckle Server dependencies
-  #######
-  postgres:
-    image: 'postgres:14.5-alpine'
-    restart: always
-    environment:
-      POSTGRES_DB: speckle
-      POSTGRES_USER: speckle
-      POSTGRES_PASSWORD: speckle
-    volumes:
-      - ./postgres-data:/var/lib/postgresql/data/
-    ports:
-      - '127.0.0.1:5432:5432'
-
-  redis:
-    image: 'redis:7.0-alpine'
-    restart: always
-    volumes:
-      - ./redis-data:/data
-    ports:
-      - '127.0.0.1:6379:6379'
-
-  minio:
-    image: 'minio/minio'
-    command: server /data --console-address ":9001"
-    restart: always
-    volumes:
-      - ./minio-data:/data
-    ports:
-      - '127.0.0.1:9000:9000'
-      - '127.0.0.1:9001:9001'
-
-  ####
-  # Speckle Server
-  #######
-  speckle-frontend-2:
-    image: speckle/speckle-frontend-2:2
-    restart: always
-    ports:
-      - '127.0.0.1:8080:8080'
-    environment:
-      NUXT_PUBLIC_SERVER_NAME: 'TODO: change' # e.g. 'my-speckle-server'
-      NUXT_PUBLIC_API_ORIGIN: 'TODO: change' # e.g. 'http://127.0.0.1'
-      NUXT_PUBLIC_BASE_URL: 'TODO: change' # e.g. 'http://127.0.0.1'
-      NUXT_PUBLIC_BACKEND_API_ORIGIN: 'http://speckle-server:3000'
-      NUXT_PUBLIC_LOG_LEVEL: 'warn'
-      NUXT_REDIS_URL: 'redis://redis'
-
-  speckle-server:
-    image: speckle/speckle-server:2
-    restart: always
-    healthcheck:
-      test:
-        - CMD
-        - node
-        - -e
-        - "try { require('node:http').request({headers: {'Content-Type': 'application/json'}, port:3000, hostname:'127.0.0.1', path:'/liveness', method: 'GET', timeout: 2000 }, (res) => { body = ''; res.on('data', (chunk) => {body += chunk;}); res.on('end', () => {process.exit(res.statusCode != 200 || body.toLowerCase().includes('error'));}); }).end(); } catch { process.exit(1); }"
-      interval: 10s
-      timeout: 10s
-      retries: 3
-      start_period: 90s
-    ports:
-      - '127.0.0.1:3000:3000'
-    environment:
-      CANONICAL_URL: 'TODO: change'
-      SESSION_SECRET: 'TODO: change'
-
-      STRATEGY_LOCAL: 'true'
-      LOG_LEVEL: 'info'
-
-      POSTGRES_URL: 'postgres'
-      POSTGRES_USER: 'speckle'
-      POSTGRES_PASSWORD: 'speckle'
-      POSTGRES_DB: 'speckle'
-
-      REDIS_URL: 'redis://redis'
-      WAIT_HOSTS: 'postgres:5432, redis:6379, minio:9000'
-
-      EMAIL: 'false'
-      EMAIL_HOST: 'TODO'
-      EMAIL_PORT: 'TODO'
-      EMAIL_USERNAME: 'TODO'
-      EMAIL_PASSWORD: 'TODO'
-      EMAIL_FROM: 'TODO'
-
-      EMAIL_SECURE: 'false'
-
-      S3_ENDPOINT: 'http://minio:9000'
-      S3_ACCESS_KEY: 'minioadmin'
-      S3_SECRET_KEY: 'minioadmin'
-      S3_BUCKET: 'speckle-server'
-      S3_CREATE_BUCKET: 'true'
-      S3_REGION: '' # optional, defaults to 'us-east-1'
-
-      FILE_SIZE_LIMIT_MB: 100
-
-      USE_FRONTEND_2: 'true'
-      FRONTEND_ORIGIN: 'TODO: change'
-
-  speckle-preview-service:
-    image: speckle/speckle-preview-service:2
-    restart: always
-    mem_limit: '1000m'
-    memswap_limit: '1000m'
-
-    environment:
-      LOG_LEVEL: 'info'
-      PG_CONNECTION_STRING: 'postgres://speckle:speckle@postgres/speckle'
-      WAIT_HOSTS: 'postgres:5432'
-
-  speckle-webhook-service:
-    image: speckle/speckle-webhook-service:2
-    restart: always
-    environment:
-      LOG_LEVEL: 'info'
-      PG_CONNECTION_STRING: 'postgres://speckle:speckle@postgres/speckle'
-      WAIT_HOSTS: 'postgres:5432'
-
-  fileimport-service:
-    image: speckle/speckle-fileimport-service:2
-    restart: always
-    environment:
-      LOG_LEVEL: 'info'
-      PG_CONNECTION_STRING: 'postgres://speckle:speckle@postgres/speckle'
-      WAIT_HOSTS: 'postgres:5432'
-      SPECKLE_SERVER_URL: 'http://speckle-server:3000'
diff --git a/utils/1click_image_scripts/template-nginx-site.conf b/utils/1click_image_scripts/template-nginx-site.conf
deleted file mode 100644
index b978f6cfa..000000000
--- a/utils/1click_image_scripts/template-nginx-site.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-server {
-    listen 80 default_server;
-    listen [::]:80 default_server;
-
-    server_name TODO_REPLACE_WITH_SERVER_NAME;
-
-    client_max_body_size 100m;
-
-    location / {
-        client_max_body_size 100m;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_pass http://localhost:8080;
-
-        proxy_buffering off;
-        proxy_request_buffering off;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-    }
-
-    location ~* ^/(graphql|explorer|(auth/.*)|(objects/.*)|(preview/.*)|(api/.*)|(static/.*)) {
-        client_max_body_size 100m;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_pass http://localhost:3000;
-
-        proxy_buffering off;
-        proxy_request_buffering off;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-    }
-}
-
diff --git a/utils/helm/speckle-server/templates/master.ingress.yml b/utils/helm/speckle-server/templates/master.ingress.yml
index 5edc093f0..5960db637 100644
--- a/utils/helm/speckle-server/templates/master.ingress.yml
+++ b/utils/helm/speckle-server/templates/master.ingress.yml
@@ -12,7 +12,6 @@ metadata:
     {{- end }}
     nginx.ingress.kubernetes.io/proxy-body-size: {{ (printf "%dm" (int .Values.file_size_limit_mb)) | quote }}
     nginx.org/client-max-body-size: {{ (printf "%dm" (int .Values.file_size_limit_mb)) | quote }}
-    nginx.ingress.kubernetes.io/use-regex: "true"
 spec:
   ingressClassName: nginx
   {{- if .Values.cert_manager_issuer }}
diff --git a/utils/helm/speckle-server/templates/minion.ingress.yml b/utils/helm/speckle-server/templates/minion.ingress.yml
index f110ee9a2..f770dad9c 100644
--- a/utils/helm/speckle-server/templates/minion.ingress.yml
+++ b/utils/helm/speckle-server/templates/minion.ingress.yml
@@ -11,7 +11,6 @@ metadata:
     cert-manager.io/cluster-issuer: {{ .Values.cert_manager_issuer }}
     {{- end }}
     nginx.ingress.kubernetes.io/proxy-body-size: {{ (printf "%dm" (int .Values.file_size_limit_mb)) | quote }}
-    nginx.ingress.kubernetes.io/use-regex: "true"
 spec:
   ingressClassName: nginx
   rules:
@@ -36,14 +35,49 @@ spec:
               name: www
       {{- end }}
       - pathType: Exact
-        path: "/(graphql|explorer|(auth/.*)|(static/.*))"
+        path: "/graphql"
         backend:
           service:
             name: speckle-server
             port:
               name: web
       - pathType: Exact
-        path: "/((objects/.*)|(api/.*)|(preview/.*))"
+        path: "/explorer"
+        backend:
+          service:
+            name: speckle-server
+            port:
+              name: web
+      - pathType: Prefix
+        path: "/auth/"
+        backend:
+          service:
+            name: speckle-server
+            port:
+              name: web
+      - pathType: Prefix
+        path: "/static/"
+        backend:
+          service:
+            name: speckle-server
+            port:
+              name: web
+      - pathType: Prefix
+        path: "/objects/"
+        backend:
+          service:
+            name: speckle-objects
+            port:
+              name: web
+      - pathType: Prefix
+        path: "/api/"
+        backend:
+          service:
+            name: speckle-objects
+            port:
+              name: web
+      - pathType: Prefix
+        path: "/preview/"
         backend:
           service:
             name: speckle-objects
diff --git a/utils/helm/speckle-server/templates/preview_service/deployment.yml b/utils/helm/speckle-server/templates/preview_service/deployment.yml
index 7c3b78357..f7cf8ed58 100644
--- a/utils/helm/speckle-server/templates/preview_service/deployment.yml
+++ b/utils/helm/speckle-server/templates/preview_service/deployment.yml
@@ -25,7 +25,7 @@ spec:
 
         ports:
           - name: metrics
-            containerPort: 9094
+            containerPort: {{ .Values.preview_service.monitoring.metricsPort }}
             protocol: TCP
 
         livenessProbe:
@@ -50,10 +50,8 @@ spec:
           capabilities:
             drop:
               - ALL
-            add:
-              - SYS_ADMIN #TODO remove this and replace with sec comp profile: https://stackoverflow.com/a/53975412
           privileged: false
-          # readOnlyRootFilesystem: true # this breaks chromium
+          # readOnlyRootFilesystem: true #FIXME this currently breaks chromium. Need to identify which directories should be mounted.
           runAsNonRoot: true
           runAsUser: 800
 
@@ -64,6 +62,12 @@ spec:
         {{- end }}
 
         env:
+          - name: PORT
+            value: {{ .Values.preview_service.port | quote }}
+
+          - name: PROMETHEUS_METRICS_PORT
+            value: {{ .Values.preview_service.monitoring.metricsPort | quote }}
+
           - name: PG_CONNECTION_STRING
             valueFrom:
               secretKeyRef:
@@ -101,8 +105,8 @@ spec:
         fsGroup: 25000
         fsGroupChangePolicy: OnRootMismatch
         runAsGroup: 30000
-        # seccompProfile:
-        #   type: RuntimeDefault #TODO: uncomment this when we have a profile for chromium
+        seccompProfile:
+          type: RuntimeDefault
 
       # Should be > preview generation time ( 1 hour for good measure )
       terminationGracePeriodSeconds: 3600
diff --git a/utils/helm/speckle-server/templates/preview_service/service.yml b/utils/helm/speckle-server/templates/preview_service/service.yml
index 37f423fa7..41d1fc579 100644
--- a/utils/helm/speckle-server/templates/preview_service/service.yml
+++ b/utils/helm/speckle-server/templates/preview_service/service.yml
@@ -12,5 +12,5 @@ spec:
   ports:
     - protocol: TCP
       name: web
-      port: 9094
+      port: {{ .Values.preview_service.monitoring.metricsPort }}
       targetPort: metrics
diff --git a/utils/helm/speckle-server/values.schema.json b/utils/helm/speckle-server/values.schema.json
index 5720b2887..ac2c5940f 100644
--- a/utils/helm/speckle-server/values.schema.json
+++ b/utils/helm/speckle-server/values.schema.json
@@ -1601,6 +1601,21 @@
           "description": "The Docker image to be used for the Speckle Preview Service component. If blank, defaults to speckle/speckle-preview-service:{{ .Values.docker_image_tag }}. If provided, this value should be the full path including tag. The docker_image_tag value will be ignored.",
           "default": ""
         },
+        "port": {
+          "type": "string",
+          "description": "The port on which the Preview Service will run. This is not exposed, but used within its own local network within the pod.",
+          "default": "3001"
+        },
+        "monitoring": {
+          "type": "object",
+          "properties": {
+            "metricsPort": {
+              "type": "string",
+              "description": "The port on which the metrics server will be exposed.",
+              "default": "9094"
+            }
+          }
+        },
         "requests": {
           "type": "object",
           "properties": {
diff --git a/utils/helm/speckle-server/values.yaml b/utils/helm/speckle-server/values.yaml
index 7e8202167..5e8342780 100644
--- a/utils/helm/speckle-server/values.yaml
+++ b/utils/helm/speckle-server/values.yaml
@@ -1022,6 +1022,13 @@ preview_service:
   ##
   image: ''
 
+  ## @param preview_service.port The port on which the Preview Service will run. This is not exposed, but used within its own local network within the pod.
+  port: '3001'
+
+  monitoring:
+    ## @param preview_service.monitoring.metricsPort The port on which the metrics server will be exposed.
+    metricsPort: '9094'
+
   requests:
     ## @param preview_service.requests.cpu The CPU that should be available on a node when scheduling this pod.
     ## ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
diff --git a/yarn.lock b/yarn.lock
index a559c31b9..32fdd79ea 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3473,15 +3473,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-hoist-variables@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-hoist-variables@npm:7.22.5"
-  dependencies:
-    "@babel/types": "npm:^7.22.5"
-  checksum: 10/394ca191b4ac908a76e7c50ab52102669efe3a1c277033e49467913c7ed6f7c64d7eacbeabf3bed39ea1f41731e22993f763b1edce0f74ff8563fd1f380d92cc
-  languageName: node
-  linkType: hard
-
 "@babel/helper-hoist-variables@npm:^7.24.7":
   version: 7.24.7
   resolution: "@babel/helper-hoist-variables@npm:7.24.7"
@@ -8272,21 +8263,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:>=7.23.2":
-  version: 7.23.2
-  resolution: "@babel/traverse@npm:7.23.2"
+"@babel/traverse@npm:^7.0.0, @babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.14.0, @babel/traverse@npm:^7.16.7, @babel/traverse@npm:^7.16.8, @babel/traverse@npm:^7.17.10, @babel/traverse@npm:^7.17.3, @babel/traverse@npm:^7.17.9, @babel/traverse@npm:^7.18.0, @babel/traverse@npm:^7.18.2, @babel/traverse@npm:^7.18.5, @babel/traverse@npm:^7.19.0, @babel/traverse@npm:^7.19.1, @babel/traverse@npm:^7.19.4, @babel/traverse@npm:^7.19.6, @babel/traverse@npm:^7.20.10, @babel/traverse@npm:^7.20.12, @babel/traverse@npm:^7.20.7, @babel/traverse@npm:^7.21.0, @babel/traverse@npm:^7.21.2, @babel/traverse@npm:^7.21.5, @babel/traverse@npm:^7.22.11, @babel/traverse@npm:^7.22.5, @babel/traverse@npm:^7.22.6, @babel/traverse@npm:^7.22.8, @babel/traverse@npm:^7.23.2, @babel/traverse@npm:^7.23.3, @babel/traverse@npm:^7.23.4, @babel/traverse@npm:^7.23.9, @babel/traverse@npm:^7.24.0, @babel/traverse@npm:^7.24.1, @babel/traverse@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/traverse@npm:7.24.7"
   dependencies:
-    "@babel/code-frame": "npm:^7.22.13"
-    "@babel/generator": "npm:^7.23.0"
-    "@babel/helper-environment-visitor": "npm:^7.22.20"
-    "@babel/helper-function-name": "npm:^7.23.0"
-    "@babel/helper-hoist-variables": "npm:^7.22.5"
-    "@babel/helper-split-export-declaration": "npm:^7.22.6"
-    "@babel/parser": "npm:^7.23.0"
-    "@babel/types": "npm:^7.23.0"
-    debug: "npm:^4.1.0"
+    "@babel/code-frame": "npm:^7.24.7"
+    "@babel/generator": "npm:^7.24.7"
+    "@babel/helper-environment-visitor": "npm:^7.24.7"
+    "@babel/helper-function-name": "npm:^7.24.7"
+    "@babel/helper-hoist-variables": "npm:^7.24.7"
+    "@babel/helper-split-export-declaration": "npm:^7.24.7"
+    "@babel/parser": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
+    debug: "npm:^4.3.1"
     globals: "npm:^11.1.0"
-  checksum: 10/e4fcb8f8395804956df4ae1301230a14b6eb35b74a7058a0e0b40f6f4be7281e619e6dafe400e833d4512da5d61cf17ea177d04b00a8f7cf3d8d69aff83ca3d8
+  checksum: 10/785cf26383a992740e492efba7016de964cd06c05c9d7146fa1b5ead409e054c444f50b36dc37856884a56e32cf9d3105ddf1543486b6df68300bffb117a245a
   languageName: node
   linkType: hard
 
@@ -23481,14 +23472,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axios@npm:>=1.6.0":
-  version: 1.6.4
-  resolution: "axios@npm:1.6.4"
+"axios@npm:^1.0.0, axios@npm:^1.6.0, axios@npm:^1.6.1, axios@npm:^1.6.5, axios@npm:^1.6.8":
+  version: 1.7.2
+  resolution: "axios@npm:1.7.2"
   dependencies:
-    follow-redirects: "npm:^1.15.4"
+    follow-redirects: "npm:^1.15.6"
     form-data: "npm:^4.0.0"
     proxy-from-env: "npm:^1.1.0"
-  checksum: 10/ed15229f447dd81a5a9e3dac5c84d64f8598145b1102fb6f8c5feb0d02d0dafaef7bf071d2575a7687dd0c014b9da2edbcff59ee9a57b59da941ae673b938919
+  checksum: 10/6ae80dda9736bb4762ce717f1a26ff997d94672d3a5799ad9941c24d4fb019c1dff45be8272f08d1975d7950bac281f3ba24aff5ecd49ef5a04d872ec428782f
   languageName: node
   linkType: hard
 
@@ -30143,7 +30134,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"express@npm:>=4.19.2":
+"express@npm:>=4.19.2, express@npm:^4.17.3, express@npm:^4.19.2":
   version: 4.19.2
   resolution: "express@npm:4.19.2"
   dependencies:
@@ -30392,14 +30383,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-xml-parser@npm:>=4.2.5":
-  version: 4.2.6
-  resolution: "fast-xml-parser@npm:4.2.6"
+"fast-xml-parser@npm:4.2.5":
+  version: 4.2.5
+  resolution: "fast-xml-parser@npm:4.2.5"
   dependencies:
     strnum: "npm:^1.0.5"
   bin:
     fxparser: src/cli/cli.js
-  checksum: 10/b44fff2405149cf485114eeb9148566efb0b8078f9618d352455f655d35a81c0e30d93f2aecfc8307e4da17d0486c052bf7a986cad343ee5e1730045bac2c961
+  checksum: 10/4be7ebe24d6a9a60c278e1423cd86a7da9a77ec64c95563e2c552363caf7a777e0c87c9de1255c2f4e8dea9bce8905dc2bdc58a34e9f2b73c4693654456ad284
+  languageName: node
+  linkType: hard
+
+"fast-xml-parser@npm:>=4.2.5, fast-xml-parser@npm:^4.2.5":
+  version: 4.4.0
+  resolution: "fast-xml-parser@npm:4.4.0"
+  dependencies:
+    strnum: "npm:^1.0.5"
+  bin:
+    fxparser: src/cli/cli.js
+  checksum: 10/f1592fa810d3923c46c7037d5adf1c309580d1d14780312019f33e4967f6ffcb5632168a5e889fe9d30794f6a087a0a095bb21cdf62320a96c6b304395212658
   languageName: node
   linkType: hard
 
@@ -30817,7 +30819,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.15.4":
+"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.15.6":
   version: 1.15.6
   resolution: "follow-redirects@npm:1.15.6"
   peerDependenciesMeta:
@@ -46165,7 +46167,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"serialize-javascript@npm:>=6.0.2":
+"serialize-javascript@npm:>=6.0.2, serialize-javascript@npm:^6.0.0, serialize-javascript@npm:^6.0.1":
   version: 6.0.2
   resolution: "serialize-javascript@npm:6.0.2"
   dependencies:
@@ -48673,15 +48675,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tough-cookie@npm:>=4.1.3":
-  version: 4.1.3
-  resolution: "tough-cookie@npm:4.1.3"
+"tough-cookie@npm:>=4.1.3, tough-cookie@npm:^4.1.2, tough-cookie@npm:^4.1.3":
+  version: 4.1.4
+  resolution: "tough-cookie@npm:4.1.4"
   dependencies:
     psl: "npm:^1.1.33"
     punycode: "npm:^2.1.1"
     universalify: "npm:^0.2.0"
     url-parse: "npm:^1.5.3"
-  checksum: 10/cf148c359b638a7069fc3ba9a5257bdc9616a6948a98736b92c3570b3f8401cf9237a42bf716878b656f372a1fb65b74dd13a46ccff8eceba14ffd053d33f72a
+  checksum: 10/75663f4e2cd085f16af0b217e4218772adf0617fb3227171102618a54ce0187a164e505d61f773ed7d65988f8ff8a8f935d381f87da981752c1171b076b4afac
   languageName: node
   linkType: hard
 
@@ -49459,7 +49461,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"undici@npm:^5.28.4":
+"undici@npm:^5.22.1, undici@npm:^5.28.2, undici@npm:^5.28.4":
   version: 5.28.4
   resolution: "undici@npm:5.28.4"
   dependencies:
@@ -52451,10 +52453,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"word-wrap@npm:@aashutoshrathi/word-wrap@^1.2.4":
-  version: 1.2.6
-  resolution: "@aashutoshrathi/word-wrap@npm:1.2.6"
-  checksum: 10/6eebd12a5cd03cee38fcb915ef9f4ea557df6a06f642dfc7fe8eb4839eb5c9ca55a382f3604d52c14200b0c214c12af5e1f23d2a6d8e23ef2d016b105a9d6c0a
+"word-wrap@npm:^1.0.3, word-wrap@npm:^1.2.5":
+  version: 1.2.5
+  resolution: "word-wrap@npm:1.2.5"
+  checksum: 10/1ec6f6089f205f83037be10d0c4b34c9183b0b63fca0834a5b3cee55dd321429d73d40bb44c8fc8471b5203d6e8f8275717f49a8ff4b2b0ab41d7e1b563e0854
   languageName: node
   linkType: hard
 
@@ -52667,13 +52669,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"xml2js@npm:>=0.5.0":
-  version: 0.6.2
-  resolution: "xml2js@npm:0.6.2"
+"xml2js@npm:0.5.0":
+  version: 0.5.0
+  resolution: "xml2js@npm:0.5.0"
   dependencies:
     sax: "npm:>=0.6.0"
     xmlbuilder: "npm:~11.0.0"
-  checksum: 10/df29de8eeedb762c367d87945c39bcf54db19a2c522607491c266ed6184b5a749e37ff29cfaed0ac149da9ba332ac3dcf8e5ff2bd0a206be3343eca95faa941d
+  checksum: 10/27c4d759214e99be5ec87ee5cb1290add427fa43df509d3b92d10152b3806fd2f7c9609697a18b158ccf2caa01e96af067cdba93196f69ca10c90e4f79a08896
   languageName: node
   linkType: hard