diff --git a/packages/frontend-2/components/settings/workspaces/Regions.vue b/packages/frontend-2/components/settings/workspaces/Regions.vue
index 185749a329..59305df303 100644
--- a/packages/frontend-2/components/settings/workspaces/Regions.vue
+++ b/packages/frontend-2/components/settings/workspaces/Regions.vue
@@ -45,11 +45,18 @@ const props = defineProps<{
   workspaceId: string
 }>()
 
+const pageFetchPolicy = usePageQueryStandardFetchPolicy()
 const isLoading = useMutationLoading()
 const setDefaultWorkspaceRegion = useSetDefaultWorkspaceRegion()
-const { result } = useQuery(settingsWorkspaceRegionsQuery, () => ({
-  workspaceId: props.workspaceId
-}))
+const { result } = useQuery(
+  settingsWorkspaceRegionsQuery,
+  () => ({
+    workspaceId: props.workspaceId
+  }),
+  () => ({
+    fetchPolicy: pageFetchPolicy.value
+  })
+)
 
 const defaultRegion = ref<SettingsWorkspacesRegionsSelect_ServerRegionItemFragment>()
 const availableRegions = computed(() => result.value?.workspace.availableRegions || [])
diff --git a/packages/frontend-2/components/viewer/anchored-point/Thread.vue b/packages/frontend-2/components/viewer/anchored-point/Thread.vue
index 5c5e4d0925..d3943f0c07 100644
--- a/packages/frontend-2/components/viewer/anchored-point/Thread.vue
+++ b/packages/frontend-2/components/viewer/anchored-point/Thread.vue
@@ -393,7 +393,11 @@ const isThreadResourceLoaded = computed(() => {
 })
 
 const toggleCommentResolvedStatus = async () => {
-  await archiveComment(props.modelValue.id, !props.modelValue.archived)
+  await archiveComment({
+    commentId: props.modelValue.id,
+    projectId: projectId.value,
+    archived: !props.modelValue.archived
+  })
   mp.track('Comment Action', {
     type: 'action',
     name: 'archive',
diff --git a/packages/frontend-2/components/viewer/anchored-point/thread/NewReply.vue b/packages/frontend-2/components/viewer/anchored-point/thread/NewReply.vue
index 5182eb5724..91e7bc1df2 100644
--- a/packages/frontend-2/components/viewer/anchored-point/thread/NewReply.vue
+++ b/packages/frontend-2/components/viewer/anchored-point/thread/NewReply.vue
@@ -34,6 +34,7 @@
 <script setup lang="ts">
 import { PaperAirplaneIcon, PaperClipIcon } from '@heroicons/vue/24/solid'
 import type { Nullable } from '@speckle/shared'
+import { useInjectedViewerState } from '~/lib/viewer/composables/setup'
 import { useMixpanel } from '~~/lib/core/composables/mp'
 import { useIsTypingUpdateEmitter } from '~~/lib/viewer/composables/commentBubbles'
 import type { CommentBubbleModel } from '~~/lib/viewer/composables/commentBubbles'
@@ -54,6 +55,7 @@ const emit = defineEmits<{
 
 const createReply = useSubmitReply()
 const { onKeyDownHandler, updateIsTyping } = useIsTypingUpdateEmitter()
+const { projectId } = useInjectedViewerState()
 
 const loading = ref(false)
 const editor = ref(null as Nullable<{ openFilePicker: () => void }>)
@@ -75,7 +77,8 @@ const onSubmit = async () => {
   loading.value = true
   await createReply({
     content,
-    threadId: threadId.value
+    threadId: threadId.value,
+    projectId: projectId.value
   })
   updateIsTyping(false)
 
diff --git a/packages/frontend-2/components/viewer/comments/ListItem.vue b/packages/frontend-2/components/viewer/comments/ListItem.vue
index 1ffa813340..7a9e000e99 100644
--- a/packages/frontend-2/components/viewer/comments/ListItem.vue
+++ b/packages/frontend-2/components/viewer/comments/ListItem.vue
@@ -77,6 +77,15 @@ const {
   threads: { openThread }
 } = useInjectedViewerInterfaceState()
 const { open: openThreadRaw } = useThreadUtilities()
+const { activeUser } = useActiveUser()
+const archiveComment = useArchiveComment()
+const { triggerNotification } = useGlobalToast()
+const {
+  projectId,
+  resources: {
+    response: { project }
+  }
+} = useInjectedViewerState()
 
 const mp = useMixpanel()
 const open = (id: string) => {
@@ -125,15 +134,6 @@ const threadAuthors = computed(() => {
   return authors
 })
 
-const { activeUser } = useActiveUser()
-const archiveComment = useArchiveComment()
-const { triggerNotification } = useGlobalToast()
-const {
-  resources: {
-    response: { project }
-  }
-} = useInjectedViewerState()
-
 const canArchiveOrUnarchive = computed(
   () =>
     activeUser.value &&
@@ -142,7 +142,11 @@ const canArchiveOrUnarchive = computed(
 )
 
 const toggleCommentResolvedStatus = async () => {
-  await archiveComment(props.thread.id, !props.thread.archived)
+  await archiveComment({
+    commentId: props.thread.id,
+    projectId: projectId.value,
+    archived: !props.thread.archived
+  })
   mp.track('Comment Action', {
     type: 'action',
     name: 'archive',
diff --git a/packages/frontend-2/lib/common/generated/gql/gql.ts b/packages/frontend-2/lib/common/generated/gql/gql.ts
index d44dcee160..9e6b13f277 100644
--- a/packages/frontend-2/lib/common/generated/gql/gql.ts
+++ b/packages/frontend-2/lib/common/generated/gql/gql.ts
@@ -11,6 +11,7 @@ import type { TypedDocumentNode as DocumentNode } from '@graphql-typed-document-
  * 3. It does not support dead code elimination, so it will add unused operations.
  *
  * Therefore it is highly recommended to use the babel or swc plugin for production.
+ * Learn more about it here: https://the-guild.dev/graphql/codegen/plugins/presets/preset-client#reducing-bundle-size
  */
 const documents = {
     "\n  fragment AuthLoginWithEmailBlock_PendingWorkspaceCollaborator on PendingWorkspaceCollaborator {\n    id\n    email\n    user {\n      id\n    }\n  }\n": types.AuthLoginWithEmailBlock_PendingWorkspaceCollaboratorFragmentDoc,
@@ -310,10 +311,10 @@ const documents = {
     "\n  fragment ViewerCommentThread on Comment {\n    ...ViewerCommentsListItem\n    ...ViewerCommentBubblesData\n    ...ViewerCommentsReplyItem\n  }\n": types.ViewerCommentThreadFragmentDoc,
     "\n  fragment ViewerCommentsReplyItem on Comment {\n    id\n    archived\n    rawText\n    text {\n      doc\n    }\n    author {\n      ...LimitedUserAvatar\n    }\n    createdAt\n    ...ThreadCommentAttachment\n  }\n": types.ViewerCommentsReplyItemFragmentDoc,
     "\n  mutation BroadcastViewerUserActivity(\n    $projectId: String!\n    $resourceIdString: String!\n    $message: ViewerUserActivityMessageInput!\n  ) {\n    broadcastViewerUserActivity(\n      projectId: $projectId\n      resourceIdString: $resourceIdString\n      message: $message\n    )\n  }\n": types.BroadcastViewerUserActivityDocument,
-    "\n  mutation MarkCommentViewed($threadId: String!) {\n    commentMutations {\n      markViewed(commentId: $threadId)\n    }\n  }\n": types.MarkCommentViewedDocument,
+    "\n  mutation MarkCommentViewed($input: MarkCommentViewedInput!) {\n    commentMutations {\n      markViewed(input: $input)\n    }\n  }\n": types.MarkCommentViewedDocument,
     "\n  mutation CreateCommentThread($input: CreateCommentInput!) {\n    commentMutations {\n      create(input: $input) {\n        ...ViewerCommentThread\n      }\n    }\n  }\n": types.CreateCommentThreadDocument,
     "\n  mutation CreateCommentReply($input: CreateCommentReplyInput!) {\n    commentMutations {\n      reply(input: $input) {\n        ...ViewerCommentsReplyItem\n      }\n    }\n  }\n": types.CreateCommentReplyDocument,
-    "\n  mutation ArchiveComment($commentId: String!, $archived: Boolean) {\n    commentMutations {\n      archive(commentId: $commentId, archived: $archived)\n    }\n  }\n": types.ArchiveCommentDocument,
+    "\n  mutation ArchiveComment($input: ArchiveCommentInput!) {\n    commentMutations {\n      archive(input: $input)\n    }\n  }\n": types.ArchiveCommentDocument,
     "\n  query ProjectViewerResources($projectId: String!, $resourceUrlString: String!) {\n    project(id: $projectId) {\n      id\n      viewerResources(resourceIdString: $resourceUrlString) {\n        identifier\n        items {\n          modelId\n          versionId\n          objectId\n        }\n      }\n    }\n  }\n": types.ProjectViewerResourcesDocument,
     "\n  query ViewerLoadedResources(\n    $projectId: String!\n    $modelIds: [String!]!\n    $versionIds: [String!]\n  ) {\n    project(id: $projectId) {\n      id\n      role\n      allowPublicComments\n      models(filter: { ids: $modelIds }) {\n        totalCount\n        items {\n          id\n          name\n          updatedAt\n          loadedVersion: versions(\n            filter: { priorityIds: $versionIds, priorityIdsOnly: true }\n          ) {\n            items {\n              ...ViewerModelVersionCardItem\n              automationsStatus {\n                id\n                automationRuns {\n                  ...AutomateViewerPanel_AutomateRun\n                }\n              }\n            }\n          }\n          versions(limit: 5) {\n            totalCount\n            cursor\n            items {\n              ...ViewerModelVersionCardItem\n            }\n          }\n        }\n      }\n      ...ProjectPageLatestItemsModels\n      ...ModelPageProject\n      ...HeaderNavShare_Project\n    }\n  }\n": types.ViewerLoadedResourcesDocument,
     "\n  query ViewerModelVersions(\n    $projectId: String!\n    $modelId: String!\n    $versionsCursor: String\n  ) {\n    project(id: $projectId) {\n      id\n      role\n      model(id: $modelId) {\n        id\n        versions(cursor: $versionsCursor, limit: 5) {\n          totalCount\n          cursor\n          items {\n            ...ViewerModelVersionCardItem\n          }\n        }\n      }\n    }\n  }\n": types.ViewerModelVersionsDocument,
@@ -1556,7 +1557,7 @@ export function graphql(source: "\n  mutation BroadcastViewerUserActivity(\n
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  mutation MarkCommentViewed($threadId: String!) {\n    commentMutations {\n      markViewed(commentId: $threadId)\n    }\n  }\n"): (typeof documents)["\n  mutation MarkCommentViewed($threadId: String!) {\n    commentMutations {\n      markViewed(commentId: $threadId)\n    }\n  }\n"];
+export function graphql(source: "\n  mutation MarkCommentViewed($input: MarkCommentViewedInput!) {\n    commentMutations {\n      markViewed(input: $input)\n    }\n  }\n"): (typeof documents)["\n  mutation MarkCommentViewed($input: MarkCommentViewedInput!) {\n    commentMutations {\n      markViewed(input: $input)\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
@@ -1568,7 +1569,7 @@ export function graphql(source: "\n  mutation CreateCommentReply($input: CreateC
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  mutation ArchiveComment($commentId: String!, $archived: Boolean) {\n    commentMutations {\n      archive(commentId: $commentId, archived: $archived)\n    }\n  }\n"): (typeof documents)["\n  mutation ArchiveComment($commentId: String!, $archived: Boolean) {\n    commentMutations {\n      archive(commentId: $commentId, archived: $archived)\n    }\n  }\n"];
+export function graphql(source: "\n  mutation ArchiveComment($input: ArchiveCommentInput!) {\n    commentMutations {\n      archive(input: $input)\n    }\n  }\n"): (typeof documents)["\n  mutation ArchiveComment($input: ArchiveCommentInput!) {\n    commentMutations {\n      archive(input: $input)\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/packages/frontend-2/lib/common/generated/gql/graphql.ts b/packages/frontend-2/lib/common/generated/gql/graphql.ts
index b29bf4c1fb..7eb2e0746a 100644
--- a/packages/frontend-2/lib/common/generated/gql/graphql.ts
+++ b/packages/frontend-2/lib/common/generated/gql/graphql.ts
@@ -196,6 +196,12 @@ export type AppUpdateInput = {
   termsAndConditionsLink?: InputMaybe<Scalars['String']['input']>;
 };
 
+export type ArchiveCommentInput = {
+  archived: Scalars['Boolean']['input'];
+  commentId: Scalars['String']['input'];
+  projectId: Scalars['String']['input'];
+};
+
 export type AuthStrategy = {
   __typename?: 'AuthStrategy';
   color?: Maybe<Scalars['String']['output']>;
@@ -653,8 +659,7 @@ export type CommentMutations = {
 
 
 export type CommentMutationsArchiveArgs = {
-  archived?: Scalars['Boolean']['input'];
-  commentId: Scalars['String']['input'];
+  input: ArchiveCommentInput;
 };
 
 
@@ -669,7 +674,7 @@ export type CommentMutationsEditArgs = {
 
 
 export type CommentMutationsMarkViewedArgs = {
-  commentId: Scalars['String']['input'];
+  input: MarkCommentViewedInput;
 };
 
 
@@ -824,6 +829,7 @@ export type CreateCommentInput = {
 
 export type CreateCommentReplyInput = {
   content: CommentContentInput;
+  projectId: Scalars['String']['input'];
   threadId: Scalars['String']['input'];
 };
 
@@ -886,6 +892,7 @@ export type DiscoverableStreamsSortingInput = {
 export type EditCommentInput = {
   commentId: Scalars['String']['input'];
   content: CommentContentInput;
+  projectId: Scalars['String']['input'];
 };
 
 export type EmailVerificationRequestInput = {
@@ -1089,6 +1096,11 @@ export type LimitedWorkspace = {
   slug: Scalars['String']['output'];
 };
 
+export type MarkCommentViewedInput = {
+  commentId: Scalars['String']['input'];
+  projectId: Scalars['String']['input'];
+};
+
 export type MarkReceivedVersionInput = {
   message?: InputMaybe<Scalars['String']['input']>;
   projectId: Scalars['String']['input'];
@@ -5802,7 +5814,7 @@ export type BroadcastViewerUserActivityMutationVariables = Exact<{
 export type BroadcastViewerUserActivityMutation = { __typename?: 'Mutation', broadcastViewerUserActivity: boolean };
 
 export type MarkCommentViewedMutationVariables = Exact<{
-  threadId: Scalars['String']['input'];
+  input: MarkCommentViewedInput;
 }>;
 
 
@@ -5823,8 +5835,7 @@ export type CreateCommentReplyMutationVariables = Exact<{
 export type CreateCommentReplyMutation = { __typename?: 'Mutation', commentMutations: { __typename?: 'CommentMutations', reply: { __typename?: 'Comment', id: string, archived: boolean, rawText: string, createdAt: string, text: { __typename?: 'SmartTextEditorValue', doc?: {} | null, attachments?: Array<{ __typename?: 'BlobMetadata', id: string, fileName: string, fileType: string, fileSize?: number | null }> | null }, author: { __typename?: 'LimitedUser', id: string, name: string, avatar?: string | null } } } };
 
 export type ArchiveCommentMutationVariables = Exact<{
-  commentId: Scalars['String']['input'];
-  archived?: InputMaybe<Scalars['Boolean']['input']>;
+  input: ArchiveCommentInput;
 }>;
 
 
@@ -6365,10 +6376,10 @@ export const UpdateNotificationPreferencesDocument = {"kind":"Document","definit
 export const DeleteAccountDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteAccount"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UserDeleteInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"userDelete"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"userConfirmation"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}]}]}}]} as unknown as DocumentNode<DeleteAccountMutation, DeleteAccountMutationVariables>;
 export const ProfileEditDialogDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ProfileEditDialog"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activeUser"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"SettingsUserProfileDetails_User"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"SettingsUserNotifications_User"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"SettingsUserProfileDeleteAccount_User"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ActiveUserAvatar"},"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":"name"}},{"kind":"Field","name":{"kind":"Name","value":"avatar"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"UserProfileEditDialogAvatar_User"},"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":"avatar"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"ActiveUserAvatar"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"SettingsUserProfileDetails_User"},"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":"name"}},{"kind":"Field","name":{"kind":"Name","value":"company"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"UserProfileEditDialogAvatar_User"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"SettingsUserNotifications_User"},"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":"notificationPreferences"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"SettingsUserProfileDeleteAccount_User"},"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"}}]}}]} as unknown as DocumentNode<ProfileEditDialogQuery, ProfileEditDialogQueryVariables>;
 export const BroadcastViewerUserActivityDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"BroadcastViewerUserActivity"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"projectId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"resourceIdString"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"message"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ViewerUserActivityMessageInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"broadcastViewerUserActivity"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"projectId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"projectId"}}},{"kind":"Argument","name":{"kind":"Name","value":"resourceIdString"},"value":{"kind":"Variable","name":{"kind":"Name","value":"resourceIdString"}}},{"kind":"Argument","name":{"kind":"Name","value":"message"},"value":{"kind":"Variable","name":{"kind":"Name","value":"message"}}}]}]}}]} as unknown as DocumentNode<BroadcastViewerUserActivityMutation, BroadcastViewerUserActivityMutationVariables>;
-export const MarkCommentViewedDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"MarkCommentViewed"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"threadId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"commentMutations"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"markViewed"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"commentId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"threadId"}}}]}]}}]}}]} as unknown as DocumentNode<MarkCommentViewedMutation, MarkCommentViewedMutationVariables>;
+export const MarkCommentViewedDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"MarkCommentViewed"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"MarkCommentViewedInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"commentMutations"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"markViewed"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}]}]}}]}}]} as unknown as DocumentNode<MarkCommentViewedMutation, MarkCommentViewedMutationVariables>;
 export const CreateCommentThreadDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateCommentThread"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CreateCommentInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"commentMutations"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"create"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewerCommentThread"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"LimitedUserAvatar"},"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":"avatar"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ThreadCommentAttachment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Comment"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"text"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"attachments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"fileName"}},{"kind":"Field","name":{"kind":"Name","value":"fileType"}},{"kind":"Field","name":{"kind":"Name","value":"fileSize"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewerCommentsReplyItem"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Comment"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"archived"}},{"kind":"Field","name":{"kind":"Name","value":"rawText"}},{"kind":"Field","name":{"kind":"Name","value":"text"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"doc"}}]}},{"kind":"Field","name":{"kind":"Name","value":"author"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"LimitedUserAvatar"}}]}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"ThreadCommentAttachment"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"FormUsersSelectItem"},"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":"avatar"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewerCommentsListItem"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Comment"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"rawText"}},{"kind":"Field","name":{"kind":"Name","value":"archived"}},{"kind":"Field","name":{"kind":"Name","value":"author"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"LimitedUserAvatar"}}]}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"viewedAt"}},{"kind":"Field","name":{"kind":"Name","value":"replies"},"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":"ViewerCommentsReplyItem"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"replyAuthors"},"arguments":[{"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":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"FormUsersSelectItem"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"resources"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"resourceId"}},{"kind":"Field","name":{"kind":"Name","value":"resourceType"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewerCommentBubblesData"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Comment"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"viewedAt"}},{"kind":"Field","name":{"kind":"Name","value":"viewerState"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewerCommentThread"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Comment"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewerCommentsListItem"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewerCommentBubblesData"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewerCommentsReplyItem"}}]}}]} as unknown as DocumentNode<CreateCommentThreadMutation, CreateCommentThreadMutationVariables>;
 export const CreateCommentReplyDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateCommentReply"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CreateCommentReplyInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"commentMutations"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"reply"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewerCommentsReplyItem"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"LimitedUserAvatar"},"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":"avatar"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ThreadCommentAttachment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Comment"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"text"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"attachments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"fileName"}},{"kind":"Field","name":{"kind":"Name","value":"fileType"}},{"kind":"Field","name":{"kind":"Name","value":"fileSize"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewerCommentsReplyItem"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Comment"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"archived"}},{"kind":"Field","name":{"kind":"Name","value":"rawText"}},{"kind":"Field","name":{"kind":"Name","value":"text"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"doc"}}]}},{"kind":"Field","name":{"kind":"Name","value":"author"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"LimitedUserAvatar"}}]}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"ThreadCommentAttachment"}}]}}]} as unknown as DocumentNode<CreateCommentReplyMutation, CreateCommentReplyMutationVariables>;
-export const ArchiveCommentDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"ArchiveComment"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"commentId"}},"type":{"kind":"NonNullType","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":"commentMutations"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"archive"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"commentId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"commentId"}}},{"kind":"Argument","name":{"kind":"Name","value":"archived"},"value":{"kind":"Variable","name":{"kind":"Name","value":"archived"}}}]}]}}]}}]} as unknown as DocumentNode<ArchiveCommentMutation, ArchiveCommentMutationVariables>;
+export const ArchiveCommentDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"ArchiveComment"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ArchiveCommentInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"commentMutations"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"archive"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}]}]}}]}}]} as unknown as DocumentNode<ArchiveCommentMutation, ArchiveCommentMutationVariables>;
 export const ProjectViewerResourcesDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ProjectViewerResources"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"projectId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"resourceUrlString"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"project"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"projectId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"viewerResources"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"resourceIdString"},"value":{"kind":"Variable","name":{"kind":"Name","value":"resourceUrlString"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"identifier"}},{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"modelId"}},{"kind":"Field","name":{"kind":"Name","value":"versionId"}},{"kind":"Field","name":{"kind":"Name","value":"objectId"}}]}}]}}]}}]}}]} as unknown as DocumentNode<ProjectViewerResourcesQuery, ProjectViewerResourcesQueryVariables>;
 export const ViewerLoadedResourcesDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ViewerLoadedResources"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"projectId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"modelIds"}},"type":{"kind":"NonNullType","type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"versionIds"}},"type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"project"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"projectId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"allowPublicComments"}},{"kind":"Field","name":{"kind":"Name","value":"models"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"filter"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"ids"},"value":{"kind":"Variable","name":{"kind":"Name","value":"modelIds"}}}]}}],"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":"name"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","alias":{"kind":"Name","value":"loadedVersion"},"name":{"kind":"Name","value":"versions"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"filter"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"priorityIds"},"value":{"kind":"Variable","name":{"kind":"Name","value":"versionIds"}}},{"kind":"ObjectField","name":{"kind":"Name","value":"priorityIdsOnly"},"value":{"kind":"BooleanValue","value":true}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewerModelVersionCardItem"}},{"kind":"Field","name":{"kind":"Name","value":"automationsStatus"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"automationRuns"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"AutomateViewerPanel_AutomateRun"}}]}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"versions"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"IntValue","value":"5"}}],"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":"ViewerModelVersionCardItem"}}]}}]}}]}}]}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"ProjectPageLatestItemsModels"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"ModelPageProject"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"HeaderNavShare_Project"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"LimitedUserAvatar"},"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":"avatar"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"AutomateViewerPanelFunctionRunRow_AutomateFunctionRun"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"AutomateFunctionRun"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"results"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"statusMessage"}},{"kind":"Field","name":{"kind":"Name","value":"contextView"}},{"kind":"Field","name":{"kind":"Name","value":"function"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"logo"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"AutomationsStatusOrderedRuns_AutomationRun"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"AutomateRun"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"automation"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"functionRuns"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ProjectsPageTeamDialogManagePermissions_Project"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Project"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"visibility"}},{"kind":"Field","name":{"kind":"Name","value":"role"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ProjectsModelPageEmbed_Project"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Project"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"ProjectsPageTeamDialogManagePermissions_Project"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ProjectPageModelsActions_Project"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Project"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"ProjectsModelPageEmbed_Project"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ProjectPageModelsStructureItem_Project"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Project"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"ProjectPageModelsActions_Project"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewerModelVersionCardItem"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Version"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"message"}},{"kind":"Field","name":{"kind":"Name","value":"referencedObject"}},{"kind":"Field","name":{"kind":"Name","value":"sourceApplication"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"previewUrl"}},{"kind":"Field","name":{"kind":"Name","value":"authorUser"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"LimitedUserAvatar"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"AutomateViewerPanel_AutomateRun"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"AutomateRun"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"functionRuns"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"AutomateViewerPanelFunctionRunRow_AutomateFunctionRun"}}]}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"AutomationsStatusOrderedRuns_AutomationRun"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ProjectPageLatestItemsModels"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Project"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"visibility"}},{"kind":"Field","alias":{"kind":"Name","value":"modelCount"},"name":{"kind":"Name","value":"models"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"IntValue","value":"0"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}}]}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"ProjectPageModelsStructureItem_Project"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ModelPageProject"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Project"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"visibility"}},{"kind":"Field","name":{"kind":"Name","value":"workspace"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"HeaderNavShare_Project"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Project"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"visibility"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"ProjectsModelPageEmbed_Project"}}]}}]} as unknown as DocumentNode<ViewerLoadedResourcesQuery, ViewerLoadedResourcesQueryVariables>;
 export const ViewerModelVersionsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ViewerModelVersions"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"projectId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"modelId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"versionsCursor"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"project"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"projectId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"model"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"modelId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"versions"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"cursor"},"value":{"kind":"Variable","name":{"kind":"Name","value":"versionsCursor"}}},{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"IntValue","value":"5"}}],"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":"ViewerModelVersionCardItem"}}]}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"LimitedUserAvatar"},"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":"avatar"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewerModelVersionCardItem"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Version"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"message"}},{"kind":"Field","name":{"kind":"Name","value":"referencedObject"}},{"kind":"Field","name":{"kind":"Name","value":"sourceApplication"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"previewUrl"}},{"kind":"Field","name":{"kind":"Name","value":"authorUser"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"LimitedUserAvatar"}}]}}]}}]} as unknown as DocumentNode<ViewerModelVersionsQuery, ViewerModelVersionsQueryVariables>;
diff --git a/packages/frontend-2/lib/viewer/composables/commentManagement.ts b/packages/frontend-2/lib/viewer/composables/commentManagement.ts
index dd7116db2e..6fd4117018 100644
--- a/packages/frontend-2/lib/viewer/composables/commentManagement.ts
+++ b/packages/frontend-2/lib/viewer/composables/commentManagement.ts
@@ -6,6 +6,7 @@ import dayjs from 'dayjs'
 import type { Get } from 'type-fest'
 import { useActiveUser } from '~~/lib/auth/composables/activeUser'
 import type {
+  ArchiveCommentInput,
   CommentContentInput,
   CreateCommentReplyInput,
   OnViewerCommentsUpdatedSubscription
@@ -75,8 +76,10 @@ export function useMarkThreadViewed() {
       .mutate({
         mutation: markCommentViewedMutation,
         variables: {
-          projectId,
-          threadId
+          input: {
+            projectId,
+            commentId: threadId
+          }
         },
         update: (cache, { data }) => {
           if (!data?.commentMutations.markViewed) return
@@ -190,15 +193,16 @@ export function useArchiveComment() {
   const client = useApolloClient().client
   const { triggerNotification } = useGlobalToast()
 
-  return async (commentId: string, archived = true) => {
-    if (!isLoggedIn.value || !commentId) return false
+  return async (input: ArchiveCommentInput) => {
+    const { commentId, projectId } = input
+
+    if (!isLoggedIn.value || !commentId || !projectId) return false
 
     const { data, errors } = await client
       .mutate({
         mutation: archiveCommentMutation,
         variables: {
-          commentId,
-          archived
+          input
         }
       })
       .catch(convertThrowIntoFetchResult)
diff --git a/packages/frontend-2/lib/viewer/graphql/mutations.ts b/packages/frontend-2/lib/viewer/graphql/mutations.ts
index 3caa521d80..b27fb1242d 100644
--- a/packages/frontend-2/lib/viewer/graphql/mutations.ts
+++ b/packages/frontend-2/lib/viewer/graphql/mutations.ts
@@ -15,9 +15,9 @@ export const broadcastViewerUserActivityMutation = graphql(`
 `)
 
 export const markCommentViewedMutation = graphql(`
-  mutation MarkCommentViewed($threadId: String!) {
+  mutation MarkCommentViewed($input: MarkCommentViewedInput!) {
     commentMutations {
-      markViewed(commentId: $threadId)
+      markViewed(input: $input)
     }
   }
 `)
@@ -43,9 +43,9 @@ export const createCommentReplyMutation = graphql(`
 `)
 
 export const archiveCommentMutation = graphql(`
-  mutation ArchiveComment($commentId: String!, $archived: Boolean) {
+  mutation ArchiveComment($input: ArchiveCommentInput!) {
     commentMutations {
-      archive(commentId: $commentId, archived: $archived)
+      archive(input: $input)
     }
   }
 `)
diff --git a/packages/server/assets/comments/typedefs/comments.gql b/packages/server/assets/comments/typedefs/comments.gql
index 95896530b0..30546a932d 100644
--- a/packages/server/assets/comments/typedefs/comments.gql
+++ b/packages/server/assets/comments/typedefs/comments.gql
@@ -311,6 +311,7 @@ input ReplyCreateInput {
 input CreateCommentReplyInput {
   content: CommentContentInput!
   threadId: String!
+  projectId: String!
 }
 
 """
@@ -331,15 +332,27 @@ input CommentEditInput {
 
 input EditCommentInput {
   commentId: String!
+  projectId: String!
   content: CommentContentInput!
 }
 
+input MarkCommentViewedInput {
+  commentId: String!
+  projectId: String!
+}
+
+input ArchiveCommentInput {
+  commentId: String!
+  projectId: String!
+  archived: Boolean!
+}
+
 type CommentMutations {
-  markViewed(commentId: String!): Boolean!
+  markViewed(input: MarkCommentViewedInput!): Boolean!
   create(input: CreateCommentInput!): Comment!
   reply(input: CreateCommentReplyInput!): Comment!
   edit(input: EditCommentInput!): Comment!
-  archive(commentId: String!, archived: Boolean! = true): Boolean!
+  archive(input: ArchiveCommentInput!): Boolean!
 }
 
 extend type Mutation {
diff --git a/packages/server/modules/cli/commands/download/project.ts b/packages/server/modules/cli/commands/download/project.ts
index 1460937807..7321f9b214 100644
--- a/packages/server/modules/cli/commands/download/project.ts
+++ b/packages/server/modules/cli/commands/download/project.ts
@@ -117,8 +117,8 @@ const command: CommandModule<
   },
   handler: async (argv) => {
     let projectDb = db
-    console.log(argv)
     let regionKey: string | undefined = undefined
+
     if (argv.workspaceId) {
       await authorizeResolver(
         argv.authorId,
@@ -130,10 +130,9 @@ const command: CommandModule<
         workspaceId: argv.workspaceId
       })
       regionKey = workspaceDefaultRegion?.key
-      console.log(workspaceDefaultRegion)
-      console.log(regionKey)
       projectDb = await getDb({ regionKey })
     }
+
     const getStream = getStreamFactory({ db: projectDb })
     const getObject = getObjectFactory({ db: projectDb })
     const markCommitStreamUpdated = markCommitStreamUpdatedFactory({ db: projectDb })
diff --git a/packages/server/modules/comments/graph/resolvers/comments.ts b/packages/server/modules/comments/graph/resolvers/comments.ts
index 1359d5af9d..165bfa3359 100644
--- a/packages/server/modules/comments/graph/resolvers/comments.ts
+++ b/packages/server/modules/comments/graph/resolvers/comments.ts
@@ -80,7 +80,7 @@ import {
 import { Resolvers, ResourceType } from '@/modules/core/graph/generated/graphql'
 import { GraphQLContext } from '@/modules/shared/helpers/typeHelper'
 import { CommentRecord } from '@/modules/comments/helpers/types'
-import { db } from '@/db/knex'
+import { db, mainDb } from '@/db/knex'
 import { CommentsEmitter } from '@/modules/comments/events/emitter'
 import { getBlobsFactory } from '@/modules/blobstorage/repositories'
 import { ResourceIdentifier } from '@/modules/comments/domain/types'
@@ -97,181 +97,78 @@ import {
 import { getStreamObjectsFactory } from '@/modules/core/repositories/objects'
 import { getStreamFactory } from '@/modules/core/repositories/streams'
 import { saveActivityFactory } from '@/modules/activitystream/repositories'
+import { getProjectDbClient } from '@/modules/multiregion/dbSelector'
+import { Knex } from 'knex'
 
+// We can use the main DB for these
 const getStream = getStreamFactory({ db })
-const streamResourceCheck = streamResourceCheckFactory({
-  checkStreamResourceAccess: checkStreamResourceAccessFactory({ db })
-})
-const markCommentViewed = markCommentViewedFactory({ db })
-const validateInputAttachments = validateInputAttachmentsFactory({
-  getBlobs: getBlobsFactory({ db })
-})
-const insertComments = insertCommentsFactory({ db })
-const insertCommentLinks = insertCommentLinksFactory({ db })
-const deleteComment = deleteCommentFactory({ db })
-const createComment = createCommentFactory({
-  checkStreamResourcesAccess: streamResourceCheck,
-  validateInputAttachments,
-  insertComments,
-  insertCommentLinks,
-  deleteComment,
-  markCommentViewed,
-  commentsEventsEmit: CommentsEmitter.emit
-})
-const createCommentReply = createCommentReplyFactory({
-  validateInputAttachments,
-  insertComments,
-  insertCommentLinks,
-  checkStreamResourcesAccess: streamResourceCheck,
-  deleteComment,
-  markCommentUpdated: markCommentUpdatedFactory({ db }),
-  commentsEventsEmit: CommentsEmitter.emit
-})
-const getComment = getCommentFactory({ db })
-const updateComment = updateCommentFactory({ db })
-const editComment = editCommentFactory({
-  getComment,
-  validateInputAttachments,
-  updateComment,
-  commentsEventsEmit: CommentsEmitter.emit
-})
-const archiveComment = archiveCommentFactory({
-  getComment,
-  getStream,
-  updateComment
-})
-const getResourceCommentCount = getResourceCommentCountFactory({ db })
-
-const getStreamObjects = getStreamObjectsFactory({ db })
-const getCommentsResources = getCommentsResourcesFactory({ db })
-const getViewerResourcesFromLegacyIdentifiers =
-  getViewerResourcesFromLegacyIdentifiersFactory({
-    getViewerResourcesForComments: getViewerResourcesForCommentsFactory({
-      getCommentsResources: getCommentsResourcesFactory({ db }),
-      getViewerResourcesFromLegacyIdentifiers: (...args) =>
-        getViewerResourcesFromLegacyIdentifiers(...args) // recursive dep
-    }),
-    getCommitsAndTheirBranchIds: getCommitsAndTheirBranchIdsFactory({ db }),
-    getStreamObjects
-  })
-
-const getViewerResourcesForComment = getViewerResourcesForCommentFactory({
-  getCommentsResources,
-  getViewerResourcesFromLegacyIdentifiers
-})
-const convertLegacyDataToState = convertLegacyDataToStateFactory({
-  getViewerResourcesForComments: getViewerResourcesForCommentsFactory({
-    getCommentsResources,
-    getViewerResourcesFromLegacyIdentifiers
-  })
-})
-
 const authorizeProjectCommentsAccess = authorizeProjectCommentsAccessFactory({
   getStream,
   adminOverrideEnabled
 })
-const authorizeCommentAccess = authorizeCommentAccessFactory({
-  getStream,
-  adminOverrideEnabled,
-  getComment
-})
 
-const getViewerResourceItemsUngrouped = getViewerResourceItemsUngroupedFactory({
-  getViewerResourceGroups: getViewerResourceGroupsFactory({
-    getStreamObjects,
-    getBranchLatestCommits: getBranchLatestCommitsFactory({ db }),
-    getStreamBranchesByName: getStreamBranchesByNameFactory({ db }),
-    getSpecificBranchCommits: getSpecificBranchCommitsFactory({ db }),
-    getAllBranchCommits: getAllBranchCommitsFactory({ db })
+const buildAuthorizeCommentAccess = (deps: { db: Knex; mainDb: Knex }) =>
+  authorizeCommentAccessFactory({
+    getStream: getStreamFactory({ db: deps.mainDb }),
+    adminOverrideEnabled,
+    getComment: getCommentFactory(deps)
   })
-})
-const createCommentThreadAndNotify = createCommentThreadAndNotifyFactory({
-  getViewerResourceItemsUngrouped,
-  validateInputAttachments,
-  insertComments,
-  insertCommentLinks,
-  markCommentViewed,
-  commentsEventsEmit: CommentsEmitter.emit,
-  addCommentCreatedActivity: addCommentCreatedActivityFactory({
-    getViewerResourcesFromLegacyIdentifiers,
-    getViewerResourceItemsUngrouped,
-    saveActivity: saveActivityFactory({ db }),
-    publish
-  })
-})
-const createCommentReplyAndNotify = createCommentReplyAndNotifyFactory({
-  getComment,
-  validateInputAttachments,
-  insertComments,
-  insertCommentLinks,
-  markCommentUpdated: markCommentUpdatedFactory({ db }),
-  commentsEventsEmit: CommentsEmitter.emit,
-  addReplyAddedActivity: addReplyAddedActivityFactory({
-    getViewerResourcesForComment: getViewerResourcesForCommentFactory({
-      getCommentsResources: getCommentsResourcesFactory({ db }),
-      getViewerResourcesFromLegacyIdentifiers
-    }),
-    saveActivity: saveActivityFactory({ db }),
-    publish
-  })
-})
-const editCommentAndNotify = editCommentAndNotifyFactory({
-  getComment,
-  validateInputAttachments,
-  updateComment,
-  commentsEventsEmit: CommentsEmitter.emit
-})
-const archiveCommentAndNotify = archiveCommentAndNotifyFactory({
-  getComment,
-  getStream,
-  updateComment,
-  addCommentArchivedActivity: addCommentArchivedActivityFactory({
-    getViewerResourcesForComment,
-    saveActivity: saveActivityFactory({ db }),
-    publish
-  })
-})
-const getPaginatedCommitComments = getPaginatedCommitCommentsFactory({
-  getPaginatedCommitCommentsPage: getPaginatedCommitCommentsPageFactory({ db }),
-  getPaginatedCommitCommentsTotalCount: getPaginatedCommitCommentsTotalCountFactory({
-    db
-  })
-})
-const getPaginatedBranchComments = getPaginatedBranchCommentsFactory({
-  getPaginatedBranchCommentsPage: getPaginatedBranchCommentsPageFactory({ db }),
-  getPaginatedBranchCommentsTotalCount: getPaginatedBranchCommentsTotalCountFactory({
-    db
-  })
-})
-const getPaginatedProjectComments = getPaginatedProjectCommentsFactory({
-  resolvePaginatedProjectCommentsLatestModelResources:
-    resolvePaginatedProjectCommentsLatestModelResourcesFactory({ db }),
-  getPaginatedProjectCommentsPage: getPaginatedProjectCommentsPageFactory({ db }),
-  getPaginatedProjectCommentsTotalCount: getPaginatedProjectCommentsTotalCountFactory({
-    db
-  })
-})
 
-const getStreamComment = async (
-  { streamId, commentId }: { streamId: string; commentId: string },
-  ctx: GraphQLContext
-) => {
-  await authorizeProjectCommentsAccess({
-    projectId: streamId,
-    authCtx: ctx
+const buildGetViewerResourcesFromLegacyIdentifiers = (deps: { db: Knex }) => {
+  const getViewerResourcesFromLegacyIdentifiers =
+    getViewerResourcesFromLegacyIdentifiersFactory({
+      getViewerResourcesForComments: getViewerResourcesForCommentsFactory({
+        getCommentsResources: getCommentsResourcesFactory(deps),
+        getViewerResourcesFromLegacyIdentifiers: (...args) =>
+          getViewerResourcesFromLegacyIdentifiers(...args) // recursive dep
+      }),
+      getCommitsAndTheirBranchIds: getCommitsAndTheirBranchIdsFactory(deps),
+      getStreamObjects: getStreamObjectsFactory(deps)
+    })
+  return getViewerResourcesFromLegacyIdentifiers
+}
+
+const buildGetViewerResourceItemsUngrouped = (deps: { db: Knex }) =>
+  getViewerResourceItemsUngroupedFactory({
+    getViewerResourceGroups: getViewerResourceGroupsFactory({
+      getStreamObjects: getStreamObjectsFactory(deps),
+      getBranchLatestCommits: getBranchLatestCommitsFactory(deps),
+      getStreamBranchesByName: getStreamBranchesByNameFactory(deps),
+      getSpecificBranchCommits: getSpecificBranchCommitsFactory(deps),
+      getAllBranchCommits: getAllBranchCommitsFactory(deps)
+    })
   })
 
-  const comment = await getComment({ id: commentId, userId: ctx.userId })
-  if (comment?.streamId !== streamId)
-    throw new ForbiddenError('You do not have access to this comment.')
+const getStreamCommentFactory =
+  (deps: { db: Knex; mainDb: Knex }) =>
+  async (
+    { streamId, commentId }: { streamId: string; commentId: string },
+    ctx: GraphQLContext
+  ) => {
+    const authorizeProjectCommentsAccess = authorizeProjectCommentsAccessFactory({
+      getStream: getStreamFactory(deps),
+      adminOverrideEnabled
+    })
+    await authorizeProjectCommentsAccess({
+      projectId: streamId,
+      authCtx: ctx
+    })
 
-  return comment
-}
+    const getComment = getCommentFactory(deps)
+    const comment = await getComment({ id: commentId, userId: ctx.userId })
+    if (comment?.streamId !== streamId)
+      throw new ForbiddenError('You do not have access to this comment.')
+
+    return comment
+  }
 
-// FIXME: Non-null assertions considered unsafe but are parity with previous .js logic
 export = {
   Query: {
     async comment(_parent, args, context) {
+      const projectId = args.streamId
+      const projectDb = await getProjectDbClient({ projectId })
+      const getStreamComment = getStreamCommentFactory({ db: projectDb, mainDb })
+
       return await getStreamComment(
         { streamId: args.streamId, commentId: args.id },
         context
@@ -279,11 +176,14 @@ export = {
     },
 
     async comments(_parent, args, context) {
+      const projectId = args.streamId
+      const projectDb = await getProjectDbClient({ projectId })
+
       await authorizeProjectCommentsAccess({
         projectId: args.streamId,
         authCtx: context
       })
-      const getComments = getCommentsLegacyFactory({ db })
+      const getComments = getCommentsLegacyFactory({ db: projectDb })
       return {
         ...(await getComments({
           ...args,
@@ -295,17 +195,22 @@ export = {
   },
   Comment: {
     async replies(parent, args, ctx) {
+      const projectId = parent.streamId
+      const projectDb = await getProjectDbClient({ projectId })
+
       // If limit=0, short-cut full execution and use data loader
       if (args.limit === 0) {
         return {
-          totalCount: await ctx.loaders.comments.getReplyCount.load(parent.id),
+          totalCount: await ctx.loaders
+            .forRegion({ db: projectDb })
+            .comments.getReplyCount.load(parent.id),
           items: [],
           cursor: null
         }
       }
 
       const resources = [{ resourceId: parent.id, resourceType: ResourceType.Comment }]
-      const getComments = getCommentsLegacyFactory({ db })
+      const getComments = getCommentsLegacyFactory({ db: projectDb })
       return await getComments({
         resources,
         replies: true,
@@ -331,7 +236,12 @@ export = {
       return !!parent.parentComment
     },
     async parent(parent, _args, ctx) {
-      return ctx.loaders.comments.getReplyParent.load(parent.id)
+      const projectId = parent.streamId
+      const projectDb = await getProjectDbClient({ projectId })
+
+      return ctx.loaders
+        .forRegion({ db: projectDb })
+        .comments.getReplyParent.load(parent.id)
     },
     /**
      * Resolve resources, if they weren't already preloaded
@@ -339,24 +249,54 @@ export = {
     async resources(parent, _args, ctx) {
       if (has(parent, 'resources'))
         return (parent as CommentRecord & { resources: ResourceIdentifier[] }).resources
-      return await ctx.loaders.comments.getResources.load(parent.id)
+
+      const projectId = parent.streamId
+      const projectDb = await getProjectDbClient({ projectId })
+
+      return await ctx.loaders
+        .forRegion({ db: projectDb })
+        .comments.getResources.load(parent.id)
     },
     async viewedAt(parent, _args, ctx) {
       if (has(parent, 'viewedAt'))
         return (parent as CommentRecord & { viewedAt: Date }).viewedAt
-      return await ctx.loaders.comments.getViewedAt.load(parent.id)
+
+      const projectId = parent.streamId
+      const projectDb = await getProjectDbClient({ projectId })
+
+      return await ctx.loaders
+        .forRegion({ db: projectDb })
+        .comments.getViewedAt.load(parent.id)
     },
     async author(parent, _args, ctx) {
       return ctx.loaders.users.getUser.load(parent.authorId)
     },
     async replyAuthors(parent, args, ctx) {
-      const authorIds = await ctx.loaders.comments.getReplyAuthorIds.load(parent.id)
+      const projectId = parent.streamId
+      const projectDb = await getProjectDbClient({ projectId })
+
+      const authorIds = await ctx.loaders
+        .forRegion({ db: projectDb })
+        .comments.getReplyAuthorIds.load(parent.id)
+
       return {
         totalCount: authorIds.length,
         authorIds: authorIds.slice(0, args.limit || 25)
       }
     },
     async viewerResources(parent) {
+      const projectId = parent.streamId
+      const projectDb = await getProjectDbClient({ projectId })
+
+      const getCommentsResources = getCommentsResourcesFactory({ db: projectDb })
+      const getViewerResourcesFromLegacyIdentifiers =
+        buildGetViewerResourcesFromLegacyIdentifiers({ db: projectDb })
+
+      const getViewerResourcesForComment = getViewerResourcesForCommentFactory({
+        getCommentsResources,
+        getViewerResourcesFromLegacyIdentifiers
+      })
+
       return await getViewerResourcesForComment(parent.streamId, parent.id)
     },
     /**
@@ -388,6 +328,9 @@ export = {
      * SerializedViewerState
      */
     async viewerState(parent) {
+      const projectId = parent.streamId
+      const projectDb = await getProjectDbClient({ projectId })
+
       const parentData = parent.data
       if (!parentData) return null
 
@@ -397,6 +340,15 @@ export = {
       }
 
       if (isLegacyData(parentData)) {
+        const getViewerResourcesFromLegacyIdentifiers =
+          buildGetViewerResourcesFromLegacyIdentifiers({ db: projectDb })
+        const convertLegacyDataToState = convertLegacyDataToStateFactory({
+          getViewerResourcesForComments: getViewerResourcesForCommentsFactory({
+            getCommentsResources: getCommentsResourcesFactory({ db: projectDb }),
+            getViewerResourcesFromLegacyIdentifiers
+          })
+        })
+
         return convertLegacyDataToState(parentData, parent)
       }
 
@@ -414,6 +366,20 @@ export = {
         projectId: parent.id,
         authCtx: context
       })
+
+      const projectDb = await getProjectDbClient({ projectId: parent.id })
+      const getPaginatedProjectComments = getPaginatedProjectCommentsFactory({
+        resolvePaginatedProjectCommentsLatestModelResources:
+          resolvePaginatedProjectCommentsLatestModelResourcesFactory({ db: projectDb }),
+        getPaginatedProjectCommentsPage: getPaginatedProjectCommentsPageFactory({
+          db: projectDb
+        }),
+        getPaginatedProjectCommentsTotalCount:
+          getPaginatedProjectCommentsTotalCountFactory({
+            db: projectDb
+          })
+      })
+
       return await getPaginatedProjectComments({
         ...args,
         projectId: parent.id,
@@ -425,6 +391,9 @@ export = {
       })
     },
     async comment(parent, args, context) {
+      const projectId = parent.id
+      const projectDb = await getProjectDbClient({ projectId })
+      const getStreamComment = getStreamCommentFactory({ db: projectDb, mainDb })
       return await getStreamComment(
         { streamId: parent.id, commentId: args.id },
         context
@@ -433,11 +402,23 @@ export = {
   },
   Version: {
     async commentThreads(parent, args, context) {
-      const stream = await context.loaders.commits.getCommitStream.load(parent.id)
+      const projectId = parent.streamId
       await authorizeProjectCommentsAccess({
-        projectId: stream!.id,
+        projectId,
         authCtx: context
       })
+
+      const projectDb = await getProjectDbClient({ projectId })
+      const getPaginatedCommitComments = getPaginatedCommitCommentsFactory({
+        getPaginatedCommitCommentsPage: getPaginatedCommitCommentsPageFactory({
+          db: projectDb
+        }),
+        getPaginatedCommitCommentsTotalCount:
+          getPaginatedCommitCommentsTotalCountFactory({
+            db: projectDb
+          })
+      })
+
       return await getPaginatedCommitComments({
         ...args,
         commitId: parent.id,
@@ -450,10 +431,23 @@ export = {
   },
   Model: {
     async commentThreads(parent, args, context) {
+      const projectId = parent.streamId
       await authorizeProjectCommentsAccess({
-        projectId: parent.streamId,
+        projectId,
         authCtx: context
       })
+      const projectDb = await getProjectDbClient({ projectId })
+
+      const getPaginatedBranchComments = getPaginatedBranchCommentsFactory({
+        getPaginatedBranchCommentsPage: getPaginatedBranchCommentsPageFactory({
+          db: projectDb
+        }),
+        getPaginatedBranchCommentsTotalCount:
+          getPaginatedBranchCommentsTotalCountFactory({
+            db: projectDb
+          })
+      })
+
       return await getPaginatedBranchComments({
         ...args,
         branchId: parent.id,
@@ -465,7 +459,7 @@ export = {
     }
   },
   ViewerUserActivityMessage: {
-    async user(parent, args, context) {
+    async user(parent, _args, context) {
       const { userId } = parent
       return context.loaders.users.getUser.load(userId!)
     }
@@ -474,74 +468,222 @@ export = {
     async commentCount(parent, _args, context) {
       if (context.role === Roles.Server.ArchivedUser)
         throw new ForbiddenError('You are not authorized.')
-      return await context.loaders.streams.getCommentThreadCount.load(parent.id)
+
+      const projectId = parent.id
+      const projectDb = await getProjectDbClient({ projectId })
+
+      return await context.loaders
+        .forRegion({ db: projectDb })
+        .streams.getCommentThreadCount.load(parent.id)
     }
   },
   Commit: {
-    async commentCount(parent, args, context) {
+    async commentCount(parent, _args, context) {
       if (context.role === Roles.Server.ArchivedUser)
         throw new ForbiddenError('You are not authorized.')
+
+      const projectId = parent.streamId
+      const projectDb = await getProjectDbClient({ projectId })
+      const getResourceCommentCount = getResourceCommentCountFactory({ db: projectDb })
+
       return await getResourceCommentCount({ resourceId: parent.id })
     }
   },
   Object: {
-    async commentCount(parent, args, context) {
+    async commentCount(parent, _args, context) {
       if (context.role === Roles.Server.ArchivedUser)
         throw new ForbiddenError('You are not authorized.')
+
+      const projectId = parent.streamId
+      const projectDb = await getProjectDbClient({ projectId })
+      const getResourceCommentCount = getResourceCommentCountFactory({ db: projectDb })
+
       return await getResourceCommentCount({ resourceId: parent.id })
     }
   },
   CommentMutations: {
     async markViewed(_parent, args, ctx) {
+      const projectDb = await getProjectDbClient({ projectId: args.input.projectId })
+      const authorizeCommentAccess = buildAuthorizeCommentAccess({
+        db: projectDb,
+        mainDb
+      })
       await authorizeCommentAccess({
         authCtx: ctx,
-        commentId: args.commentId
+        commentId: args.input.commentId
       })
-      await markCommentViewed(args.commentId, ctx.userId!)
+
+      const markCommentViewed = markCommentViewedFactory({ db: projectDb })
+      await markCommentViewed(args.input.commentId, ctx.userId!)
+
       return true
     },
     async create(_parent, args, ctx) {
+      const projectId = args.input.projectId
+
       await authorizeProjectCommentsAccess({
-        projectId: args.input.projectId,
+        projectId,
         authCtx: ctx,
         requireProjectRole: true
       })
+
+      const projectDb = await getProjectDbClient({ projectId })
+
+      const getViewerResourceItemsUngrouped = buildGetViewerResourceItemsUngrouped({
+        db: projectDb
+      })
+      const getViewerResourcesFromLegacyIdentifiers =
+        buildGetViewerResourcesFromLegacyIdentifiers({ db: projectDb })
+
+      const validateInputAttachments = validateInputAttachmentsFactory({
+        getBlobs: getBlobsFactory({ db: projectDb })
+      })
+      const insertComments = insertCommentsFactory({ db: projectDb })
+      const insertCommentLinks = insertCommentLinksFactory({ db: projectDb })
+      const markCommentViewed = markCommentViewedFactory({ db: projectDb })
+
+      const createCommentThreadAndNotify = createCommentThreadAndNotifyFactory({
+        getViewerResourceItemsUngrouped,
+        validateInputAttachments,
+        insertComments,
+        insertCommentLinks,
+        markCommentViewed,
+        commentsEventsEmit: CommentsEmitter.emit,
+        addCommentCreatedActivity: addCommentCreatedActivityFactory({
+          getViewerResourcesFromLegacyIdentifiers,
+          getViewerResourceItemsUngrouped,
+          saveActivity: saveActivityFactory({ db: mainDb }),
+          publish
+        })
+      })
+
       return await createCommentThreadAndNotify(args.input, ctx.userId!)
     },
     async reply(_parent, args, ctx) {
+      const projectDb = await getProjectDbClient({ projectId: args.input.projectId })
+      const authorizeCommentAccess = buildAuthorizeCommentAccess({
+        db: projectDb,
+        mainDb
+      })
       await authorizeCommentAccess({
         commentId: args.input.threadId,
         authCtx: ctx,
         requireProjectRole: true
       })
+
+      const getComment = getCommentFactory({ db: projectDb })
+      const validateInputAttachments = validateInputAttachmentsFactory({
+        getBlobs: getBlobsFactory({ db: projectDb })
+      })
+      const insertComments = insertCommentsFactory({ db: projectDb })
+      const insertCommentLinks = insertCommentLinksFactory({ db: projectDb })
+      const getViewerResourcesFromLegacyIdentifiers =
+        buildGetViewerResourcesFromLegacyIdentifiers({ db: projectDb })
+
+      const createCommentReplyAndNotify = createCommentReplyAndNotifyFactory({
+        getComment,
+        validateInputAttachments,
+        insertComments,
+        insertCommentLinks,
+        markCommentUpdated: markCommentUpdatedFactory({ db: projectDb }),
+        commentsEventsEmit: CommentsEmitter.emit,
+        addReplyAddedActivity: addReplyAddedActivityFactory({
+          getViewerResourcesForComment: getViewerResourcesForCommentFactory({
+            getCommentsResources: getCommentsResourcesFactory({ db: projectDb }),
+            getViewerResourcesFromLegacyIdentifiers
+          }),
+          saveActivity: saveActivityFactory({ db: mainDb }),
+          publish
+        })
+      })
+
       return await createCommentReplyAndNotify(args.input, ctx.userId!)
     },
     async edit(_parent, args, ctx) {
+      const projectDb = await getProjectDbClient({
+        projectId: args.input.projectId
+      })
+      const authorizeCommentAccess = buildAuthorizeCommentAccess({
+        db: projectDb,
+        mainDb
+      })
       await authorizeCommentAccess({
         authCtx: ctx,
         commentId: args.input.commentId,
         requireProjectRole: true
       })
+
+      const getComment = getCommentFactory({ db: projectDb })
+      const validateInputAttachments = validateInputAttachmentsFactory({
+        getBlobs: getBlobsFactory({ db: projectDb })
+      })
+      const updateComment = updateCommentFactory({ db: projectDb })
+
+      const editCommentAndNotify = editCommentAndNotifyFactory({
+        getComment,
+        validateInputAttachments,
+        updateComment,
+        commentsEventsEmit: CommentsEmitter.emit
+      })
+
       return await editCommentAndNotify(args.input, ctx.userId!)
     },
     async archive(_parent, args, ctx) {
+      const projectDb = await getProjectDbClient({
+        projectId: args.input.projectId
+      })
+      const authorizeCommentAccess = buildAuthorizeCommentAccess({
+        db: projectDb,
+        mainDb
+      })
       await authorizeCommentAccess({
         authCtx: ctx,
-        commentId: args.commentId,
+        commentId: args.input.commentId,
         requireProjectRole: true
       })
-      await archiveCommentAndNotify(args.commentId, ctx.userId!, args.archived)
+
+      const getComment = getCommentFactory({ db: projectDb })
+      const getStream = getStreamFactory({ db: projectDb })
+      const updateComment = updateCommentFactory({ db: projectDb })
+      const getViewerResourcesFromLegacyIdentifiers =
+        buildGetViewerResourcesFromLegacyIdentifiers({ db: projectDb })
+      const getViewerResourcesForComment = getViewerResourcesForCommentFactory({
+        getCommentsResources: getCommentsResourcesFactory({ db: projectDb }),
+        getViewerResourcesFromLegacyIdentifiers
+      })
+      const archiveCommentAndNotify = archiveCommentAndNotifyFactory({
+        getComment,
+        getStream,
+        updateComment,
+        addCommentArchivedActivity: addCommentArchivedActivityFactory({
+          getViewerResourcesForComment,
+          saveActivity: saveActivityFactory({ db: mainDb }),
+          publish
+        })
+      })
+
+      await archiveCommentAndNotify(
+        args.input.commentId,
+        ctx.userId!,
+        args.input.archived
+      )
       return true
     }
   },
   Mutation: {
     commentMutations: () => ({}),
     async broadcastViewerUserActivity(_parent, args, context) {
+      const projectId = args.projectId
       await authorizeProjectCommentsAccess({
-        projectId: args.projectId,
+        projectId,
         authCtx: context
       })
 
+      const projectDb = await getProjectDbClient({ projectId })
+      const getViewerResourceItemsUngrouped = buildGetViewerResourceItemsUngrouped({
+        db: projectDb
+      })
+
       await publish(ViewerSubscriptions.UserActivityBroadcasted, {
         projectId: args.projectId,
         resourceItems: await getViewerResourceItemsUngrouped(args),
@@ -551,7 +693,7 @@ export = {
       return true
     },
 
-    async userViewerActivityBroadcast(parent, args, context) {
+    async userViewerActivityBroadcast(_parent, args, context) {
       await authorizeProjectCommentsAccess({
         projectId: args.streamId,
         authCtx: context
@@ -565,7 +707,7 @@ export = {
       })
       return true
     },
-    async userCommentThreadActivityBroadcast(parent, args, context) {
+    async userCommentThreadActivityBroadcast(_parent, args, context) {
       if (!context.userId) return false
 
       const stream = await getStream({
@@ -584,7 +726,7 @@ export = {
       return true
     },
 
-    async commentCreate(parent, args, context) {
+    async commentCreate(_parent, args, context) {
       if (!context.userId)
         throw new ForbiddenError('Only registered users can comment.')
 
@@ -596,34 +738,36 @@ export = {
       if (!stream?.allowPublicComments && !stream?.role)
         throw new ForbiddenError('You are not authorized.')
 
+      const projectDb = await getProjectDbClient({ projectId: args.input.streamId })
+
+      const createComment = createCommentFactory({
+        checkStreamResourcesAccess: streamResourceCheckFactory({
+          checkStreamResourceAccess: checkStreamResourceAccessFactory({ db: projectDb })
+        }),
+        validateInputAttachments: validateInputAttachmentsFactory({
+          getBlobs: getBlobsFactory({ db: projectDb })
+        }),
+        insertComments: insertCommentsFactory({ db: projectDb }),
+        insertCommentLinks: insertCommentLinksFactory({ db: projectDb }),
+        deleteComment: deleteCommentFactory({ db: projectDb }),
+        markCommentViewed: markCommentViewedFactory({ db: projectDb }),
+        commentsEventsEmit: CommentsEmitter.emit
+      })
       const comment = await createComment({
         userId: context.userId,
         input: args.input
       })
 
-      const getViewerResourceItemsUngrouped = getViewerResourceItemsUngroupedFactory({
-        getViewerResourceGroups: getViewerResourceGroupsFactory({
-          getStreamObjects,
-          getBranchLatestCommits: getBranchLatestCommitsFactory({ db }),
-          getStreamBranchesByName: getStreamBranchesByNameFactory({ db }),
-          getSpecificBranchCommits: getSpecificBranchCommitsFactory({ db }),
-          getAllBranchCommits: getAllBranchCommitsFactory({ db })
-        })
+      const getViewerResourceItemsUngrouped = buildGetViewerResourceItemsUngrouped({
+        db: projectDb
       })
       const getViewerResourcesFromLegacyIdentifiers =
-        getViewerResourcesFromLegacyIdentifiersFactory({
-          getViewerResourcesForComments: getViewerResourcesForCommentsFactory({
-            getCommentsResources: getCommentsResourcesFactory({ db }),
-            getViewerResourcesFromLegacyIdentifiers: (...args) =>
-              getViewerResourcesFromLegacyIdentifiers(...args) // recursive dep
-          }),
-          getCommitsAndTheirBranchIds: getCommitsAndTheirBranchIdsFactory({ db }),
-          getStreamObjects
-        })
+        buildGetViewerResourcesFromLegacyIdentifiers({ db: projectDb })
+
       await addCommentCreatedActivityFactory({
         getViewerResourceItemsUngrouped,
         getViewerResourcesFromLegacyIdentifiers,
-        saveActivity: saveActivityFactory({ db }),
+        saveActivity: saveActivityFactory({ db: mainDb }),
         publish
       })({
         streamId: args.input.streamId,
@@ -635,7 +779,7 @@ export = {
       return comment.id
     },
 
-    async commentEdit(parent, args, context) {
+    async commentEdit(_parent, args, context) {
       // NOTE: This is NOT in use anywhere
       const stream = await authorizeProjectCommentsAccess({
         projectId: args.input.streamId,
@@ -643,32 +787,59 @@ export = {
         requireProjectRole: true
       })
       const matchUser = !stream.role
+
+      const projectDb = await getProjectDbClient({ projectId: args.input.streamId })
+      const editComment = editCommentFactory({
+        getComment: getCommentFactory({ db: projectDb }),
+        validateInputAttachments: validateInputAttachmentsFactory({
+          getBlobs: getBlobsFactory({ db: projectDb })
+        }),
+        updateComment: updateCommentFactory({ db: projectDb }),
+        commentsEventsEmit: CommentsEmitter.emit
+      })
+
       await editComment({ userId: context.userId!, input: args.input, matchUser })
       return true
     },
 
     // used for flagging a comment as viewed
-    async commentView(parent, args, context) {
+    async commentView(_parent, args, context) {
       await authorizeProjectCommentsAccess({
         projectId: args.streamId,
         authCtx: context
       })
+
+      const projectDb = await getProjectDbClient({ projectId: args.streamId })
+      const markCommentViewed = markCommentViewedFactory({ db: projectDb })
+
       await markCommentViewed(args.commentId, context.userId!)
       return true
     },
 
-    async commentArchive(parent, args, context) {
+    async commentArchive(_parent, args, context) {
       await authorizeProjectCommentsAccess({
         projectId: args.streamId,
         authCtx: context,
         requireProjectRole: true
       })
 
+      const projectDb = await getProjectDbClient({ projectId: args.streamId })
+      const archiveComment = archiveCommentFactory({
+        getComment: getCommentFactory({ db: projectDb }),
+        getStream,
+        updateComment: updateCommentFactory({ db: projectDb })
+      })
       const updatedComment = await archiveComment({ ...args, userId: context.userId! }) // NOTE: permissions check inside service
 
+      const getViewerResourcesFromLegacyIdentifiers =
+        buildGetViewerResourcesFromLegacyIdentifiers({ db: projectDb })
+      const getViewerResourcesForComment = getViewerResourcesForCommentFactory({
+        getCommentsResources: getCommentsResourcesFactory({ db: projectDb }),
+        getViewerResourcesFromLegacyIdentifiers
+      })
       await addCommentArchivedActivityFactory({
         getViewerResourcesForComment,
-        saveActivity: saveActivityFactory({ db }),
+        saveActivity: saveActivityFactory({ db: mainDb }),
         publish
       })({
         streamId: args.streamId,
@@ -681,7 +852,7 @@ export = {
       return true
     },
 
-    async commentReply(parent, args, context) {
+    async commentReply(_parent, args, context) {
       if (!context.userId)
         throw new ForbiddenError('Only registered users can comment.')
 
@@ -693,6 +864,21 @@ export = {
       if (!stream?.allowPublicComments && !stream?.role)
         throw new ForbiddenError('You are not authorized.')
 
+      const projectDb = await getProjectDbClient({ projectId: args.input.streamId })
+
+      const createCommentReply = createCommentReplyFactory({
+        validateInputAttachments: validateInputAttachmentsFactory({
+          getBlobs: getBlobsFactory({ db: projectDb })
+        }),
+        insertComments: insertCommentsFactory({ db: projectDb }),
+        insertCommentLinks: insertCommentLinksFactory({ db: projectDb }),
+        checkStreamResourcesAccess: streamResourceCheckFactory({
+          checkStreamResourceAccess: checkStreamResourceAccessFactory({ db: projectDb })
+        }),
+        deleteComment: deleteCommentFactory({ db: projectDb }),
+        markCommentUpdated: markCommentUpdatedFactory({ db: projectDb }),
+        commentsEventsEmit: CommentsEmitter.emit
+      })
       const reply = await createCommentReply({
         authorId: context.userId,
         parentCommentId: args.input.parentComment,
@@ -702,12 +888,14 @@ export = {
         blobIds: args.input.blobIds
       })
 
+      const getViewerResourcesFromLegacyIdentifiers =
+        buildGetViewerResourcesFromLegacyIdentifiers({ db: projectDb })
       await addReplyAddedActivityFactory({
         getViewerResourcesForComment: getViewerResourcesForCommentFactory({
-          getCommentsResources: getCommentsResourcesFactory({ db }),
+          getCommentsResources: getCommentsResourcesFactory({ db: projectDb }),
           getViewerResourcesFromLegacyIdentifiers
         }),
-        saveActivity: saveActivityFactory({ db }),
+        saveActivity: saveActivityFactory({ db: mainDb }),
         publish
       })({
         streamId: args.input.streamId,
@@ -761,6 +949,13 @@ export = {
             return payload.streamId === variables.streamId
           }
 
+          const projectDb = await getProjectDbClient({ projectId: payload.streamId })
+          const streamResourceCheck = streamResourceCheckFactory({
+            checkStreamResourceAccess: checkStreamResourceAccessFactory({
+              db: projectDb
+            })
+          })
+
           // otherwise perform a deeper check
           try {
             // prevents comment exfiltration by listening in to a auth'ed stream, but different commit ("stream hopping" for subscriptions)
@@ -823,6 +1018,11 @@ export = {
           if (!target.resourceIdString.trim().length) return false
           if (payload.projectId !== target.projectId) return false
 
+          const projectDb = await getProjectDbClient({ projectId: payload.projectId })
+          const getViewerResourceItemsUngrouped = buildGetViewerResourceItemsUngrouped({
+            db: projectDb
+          })
+
           const [stream, requestedResourceItems] = await Promise.all([
             getStream({
               streamId: payload.projectId,
@@ -858,6 +1058,11 @@ export = {
           const target = variables.target
           if (payload.projectId !== target.projectId) return false
 
+          const projectDb = await getProjectDbClient({ projectId: payload.projectId })
+          const getViewerResourceItemsUngrouped = buildGetViewerResourceItemsUngrouped({
+            db: projectDb
+          })
+
           const [stream, requestedResourceItems] = await Promise.all([
             getStream({
               streamId: payload.projectId,
diff --git a/packages/server/modules/comments/tests/comments.spec.js b/packages/server/modules/comments/tests/comments.spec.js
index 149d35f238..a88a4974a3 100644
--- a/packages/server/modules/comments/tests/comments.spec.js
+++ b/packages/server/modules/comments/tests/comments.spec.js
@@ -1337,7 +1337,8 @@ describe('Comments @comments', () => {
               // Legacy
               {
                 id: 'a',
-                text: 'hey dude! welcome to my legacy-type comment!'
+                text: 'hey dude! welcome to my legacy-type comment!',
+                streamId: stream.id
               },
               // New
               {
@@ -1346,14 +1347,16 @@ describe('Comments @comments', () => {
                   buildCommentTextFromInput({
                     doc: buildCommentInputFromString('new comment schema here')
                   })
-                )
+                ),
+                streamId: stream.id
               },
               // New, but for some reason the text object is already deserialized
               {
                 id: 'c',
                 text: buildCommentTextFromInput({
                   doc: buildCommentInputFromString('another new comment schema here')
-                })
+                }),
+                streamId: stream.id
               }
             ],
             cursor: new Date().toISOString(),
@@ -1363,14 +1366,15 @@ describe('Comments @comments', () => {
 
         const { data, errors } = await readComments()
 
-        expect(data?.comments?.items?.length || 0).to.eq(3)
         expect(errors?.length || 0).to.eq(0)
+        expect(data?.comments?.items?.length || 0).to.eq(3)
       })
 
       it('legacy comment with a single link is formatted correctly', async () => {
         const item = {
           id: '1',
-          text: 'https://aaa.com:3000/h3ll0-world/_?a=1&b=2#aaa'
+          text: 'https://aaa.com:3000/h3ll0-world/_?a=1&b=2#aaa',
+          streamId: stream.id
         }
 
         commentRepoMock.enable()
@@ -1409,7 +1413,8 @@ describe('Comments @comments', () => {
 
         const item = {
           id: '1',
-          text: textParts.join('')
+          text: textParts.join(''),
+          streamId: stream.id
         }
 
         commentRepoMock.enable()
diff --git a/packages/server/modules/core/graph/generated/graphql.ts b/packages/server/modules/core/graph/generated/graphql.ts
index 02c2a0e16c..02e90f6622 100644
--- a/packages/server/modules/core/graph/generated/graphql.ts
+++ b/packages/server/modules/core/graph/generated/graphql.ts
@@ -213,6 +213,12 @@ export type AppUpdateInput = {
   termsAndConditionsLink?: InputMaybe<Scalars['String']['input']>;
 };
 
+export type ArchiveCommentInput = {
+  archived: Scalars['Boolean']['input'];
+  commentId: Scalars['String']['input'];
+  projectId: Scalars['String']['input'];
+};
+
 export type AuthStrategy = {
   __typename?: 'AuthStrategy';
   color?: Maybe<Scalars['String']['output']>;
@@ -670,8 +676,7 @@ export type CommentMutations = {
 
 
 export type CommentMutationsArchiveArgs = {
-  archived?: Scalars['Boolean']['input'];
-  commentId: Scalars['String']['input'];
+  input: ArchiveCommentInput;
 };
 
 
@@ -686,7 +691,7 @@ export type CommentMutationsEditArgs = {
 
 
 export type CommentMutationsMarkViewedArgs = {
-  commentId: Scalars['String']['input'];
+  input: MarkCommentViewedInput;
 };
 
 
@@ -846,6 +851,7 @@ export type CreateCommentInput = {
 
 export type CreateCommentReplyInput = {
   content: CommentContentInput;
+  projectId: Scalars['String']['input'];
   threadId: Scalars['String']['input'];
 };
 
@@ -908,6 +914,7 @@ export type DiscoverableStreamsSortingInput = {
 export type EditCommentInput = {
   commentId: Scalars['String']['input'];
   content: CommentContentInput;
+  projectId: Scalars['String']['input'];
 };
 
 export type EmailVerificationRequestInput = {
@@ -1111,6 +1118,11 @@ export type LimitedWorkspace = {
   slug: Scalars['String']['output'];
 };
 
+export type MarkCommentViewedInput = {
+  commentId: Scalars['String']['input'];
+  projectId: Scalars['String']['input'];
+};
+
 export type MarkReceivedVersionInput = {
   message?: InputMaybe<Scalars['String']['input']>;
   projectId: Scalars['String']['input'];
@@ -4536,6 +4548,7 @@ export type ResolversTypes = {
   AppCreateInput: AppCreateInput;
   AppTokenCreateInput: AppTokenCreateInput;
   AppUpdateInput: AppUpdateInput;
+  ArchiveCommentInput: ArchiveCommentInput;
   AuthStrategy: ResolverTypeWrapper<AuthStrategy>;
   AutomateAuthCodePayloadTest: AutomateAuthCodePayloadTest;
   AutomateFunction: ResolverTypeWrapper<AutomateFunctionGraphQLReturn>;
@@ -4622,6 +4635,7 @@ export type ResolversTypes = {
   LegacyCommentViewerData: ResolverTypeWrapper<LegacyCommentViewerData>;
   LimitedUser: ResolverTypeWrapper<LimitedUserGraphQLReturn>;
   LimitedWorkspace: ResolverTypeWrapper<LimitedWorkspace>;
+  MarkCommentViewedInput: MarkCommentViewedInput;
   MarkReceivedVersionInput: MarkReceivedVersionInput;
   Model: ResolverTypeWrapper<ModelGraphQLReturn>;
   ModelCollection: ResolverTypeWrapper<Omit<ModelCollection, 'items'> & { items: Array<ResolversTypes['Model']> }>;
@@ -4819,6 +4833,7 @@ export type ResolversParentTypes = {
   AppCreateInput: AppCreateInput;
   AppTokenCreateInput: AppTokenCreateInput;
   AppUpdateInput: AppUpdateInput;
+  ArchiveCommentInput: ArchiveCommentInput;
   AuthStrategy: AuthStrategy;
   AutomateAuthCodePayloadTest: AutomateAuthCodePayloadTest;
   AutomateFunction: AutomateFunctionGraphQLReturn;
@@ -4899,6 +4914,7 @@ export type ResolversParentTypes = {
   LegacyCommentViewerData: LegacyCommentViewerData;
   LimitedUser: LimitedUserGraphQLReturn;
   LimitedWorkspace: LimitedWorkspace;
+  MarkCommentViewedInput: MarkCommentViewedInput;
   MarkReceivedVersionInput: MarkReceivedVersionInput;
   Model: ModelGraphQLReturn;
   ModelCollection: Omit<ModelCollection, 'items'> & { items: Array<ResolversParentTypes['Model']> };
@@ -5430,10 +5446,10 @@ export type CommentDataFiltersResolvers<ContextType = GraphQLContext, ParentType
 };
 
 export type CommentMutationsResolvers<ContextType = GraphQLContext, ParentType extends ResolversParentTypes['CommentMutations'] = ResolversParentTypes['CommentMutations']> = {
-  archive?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType, RequireFields<CommentMutationsArchiveArgs, 'archived' | 'commentId'>>;
+  archive?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType, RequireFields<CommentMutationsArchiveArgs, 'input'>>;
   create?: Resolver<ResolversTypes['Comment'], ParentType, ContextType, RequireFields<CommentMutationsCreateArgs, 'input'>>;
   edit?: Resolver<ResolversTypes['Comment'], ParentType, ContextType, RequireFields<CommentMutationsEditArgs, 'input'>>;
-  markViewed?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType, RequireFields<CommentMutationsMarkViewedArgs, 'commentId'>>;
+  markViewed?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType, RequireFields<CommentMutationsMarkViewedArgs, 'input'>>;
   reply?: Resolver<ResolversTypes['Comment'], ParentType, ContextType, RequireFields<CommentMutationsReplyArgs, 'input'>>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
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 acc81a416a..26bd441c75 100644
--- a/packages/server/modules/cross-server-sync/graph/generated/graphql.ts
+++ b/packages/server/modules/cross-server-sync/graph/generated/graphql.ts
@@ -194,6 +194,12 @@ export type AppUpdateInput = {
   termsAndConditionsLink?: InputMaybe<Scalars['String']['input']>;
 };
 
+export type ArchiveCommentInput = {
+  archived: Scalars['Boolean']['input'];
+  commentId: Scalars['String']['input'];
+  projectId: Scalars['String']['input'];
+};
+
 export type AuthStrategy = {
   __typename?: 'AuthStrategy';
   color?: Maybe<Scalars['String']['output']>;
@@ -651,8 +657,7 @@ export type CommentMutations = {
 
 
 export type CommentMutationsArchiveArgs = {
-  archived?: Scalars['Boolean']['input'];
-  commentId: Scalars['String']['input'];
+  input: ArchiveCommentInput;
 };
 
 
@@ -667,7 +672,7 @@ export type CommentMutationsEditArgs = {
 
 
 export type CommentMutationsMarkViewedArgs = {
-  commentId: Scalars['String']['input'];
+  input: MarkCommentViewedInput;
 };
 
 
@@ -827,6 +832,7 @@ export type CreateCommentInput = {
 
 export type CreateCommentReplyInput = {
   content: CommentContentInput;
+  projectId: Scalars['String']['input'];
   threadId: Scalars['String']['input'];
 };
 
@@ -889,6 +895,7 @@ export type DiscoverableStreamsSortingInput = {
 export type EditCommentInput = {
   commentId: Scalars['String']['input'];
   content: CommentContentInput;
+  projectId: Scalars['String']['input'];
 };
 
 export type EmailVerificationRequestInput = {
@@ -1092,6 +1099,11 @@ export type LimitedWorkspace = {
   slug: Scalars['String']['output'];
 };
 
+export type MarkCommentViewedInput = {
+  commentId: Scalars['String']['input'];
+  projectId: Scalars['String']['input'];
+};
+
 export type MarkReceivedVersionInput = {
   message?: InputMaybe<Scalars['String']['input']>;
   projectId: Scalars['String']['input'];
diff --git a/packages/server/modules/cross-server-sync/services/commit.ts b/packages/server/modules/cross-server-sync/services/commit.ts
index 7930d375af..a7fce52de7 100644
--- a/packages/server/modules/cross-server-sync/services/commit.ts
+++ b/packages/server/modules/cross-server-sync/services/commit.ts
@@ -444,7 +444,8 @@ const saveNewThreadsFactory =
                   doc: r.text.doc,
                   blobIds: []
                 },
-                threadId: newComment.id
+                threadId: newComment.id,
+                projectId: targetStream.id
               },
               commentAuthor.id
             )
diff --git a/packages/server/test/graphql/generated/graphql.ts b/packages/server/test/graphql/generated/graphql.ts
index 027596cebf..ae1ab8a913 100644
--- a/packages/server/test/graphql/generated/graphql.ts
+++ b/packages/server/test/graphql/generated/graphql.ts
@@ -195,6 +195,12 @@ export type AppUpdateInput = {
   termsAndConditionsLink?: InputMaybe<Scalars['String']['input']>;
 };
 
+export type ArchiveCommentInput = {
+  archived: Scalars['Boolean']['input'];
+  commentId: Scalars['String']['input'];
+  projectId: Scalars['String']['input'];
+};
+
 export type AuthStrategy = {
   __typename?: 'AuthStrategy';
   color?: Maybe<Scalars['String']['output']>;
@@ -652,8 +658,7 @@ export type CommentMutations = {
 
 
 export type CommentMutationsArchiveArgs = {
-  archived?: Scalars['Boolean']['input'];
-  commentId: Scalars['String']['input'];
+  input: ArchiveCommentInput;
 };
 
 
@@ -668,7 +673,7 @@ export type CommentMutationsEditArgs = {
 
 
 export type CommentMutationsMarkViewedArgs = {
-  commentId: Scalars['String']['input'];
+  input: MarkCommentViewedInput;
 };
 
 
@@ -828,6 +833,7 @@ export type CreateCommentInput = {
 
 export type CreateCommentReplyInput = {
   content: CommentContentInput;
+  projectId: Scalars['String']['input'];
   threadId: Scalars['String']['input'];
 };
 
@@ -890,6 +896,7 @@ export type DiscoverableStreamsSortingInput = {
 export type EditCommentInput = {
   commentId: Scalars['String']['input'];
   content: CommentContentInput;
+  projectId: Scalars['String']['input'];
 };
 
 export type EmailVerificationRequestInput = {
@@ -1093,6 +1100,11 @@ export type LimitedWorkspace = {
   slug: Scalars['String']['output'];
 };
 
+export type MarkCommentViewedInput = {
+  commentId: Scalars['String']['input'];
+  projectId: Scalars['String']['input'];
+};
+
 export type MarkReceivedVersionInput = {
   message?: InputMaybe<Scalars['String']['input']>;
   projectId: Scalars['String']['input'];