From 67ca63dace7ed7a190c3a8c3aa15390ca257fab7 Mon Sep 17 00:00:00 2001
From: Andrey Sobolev <haiodo@gmail.com>
Date: Sat, 18 Jan 2025 23:38:46 +0700
Subject: [PATCH 01/21] QFIX: PG query

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
---
 server/postgres/src/storage.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/postgres/src/storage.ts b/server/postgres/src/storage.ts
index 2286109a4e..3fdb7d997d 100644
--- a/server/postgres/src/storage.ts
+++ b/server/postgres/src/storage.ts
@@ -1267,7 +1267,8 @@ abstract class PostgresAdapterBase implements DbAdapter {
             switch (type) {
               case 'common':
                 if (Array.isArray(val) && val.includes(null)) {
-                  res.push(`(${tkey} = ANY(${vars.addArray(val, inferType(val))})) OR ${tkey} IS NULL`)
+                  const vv = vars.addArray(val, inferType(val))
+                  res.push(`(${tkey} = ANY(${vv}) OR ${tkey} IS NULL)`)
                 } else {
                   if (val.length > 0) {
                     res.push(`${tkey} = ANY(${vars.addArray(val, inferType(val))})`)

From 46084e0c8299e21573e1900394c11d22bf414f36 Mon Sep 17 00:00:00 2001
From: Andrey Sobolev <haiodo@users.noreply.github.com>
Date: Mon, 20 Jan 2025 12:11:03 +0700
Subject: [PATCH 02/21] UBERF-9165: Fix archived workspace select (#7712)

Fix workspace loading issue when click on archived

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
---
 plugins/login-assets/lang/cs.json             |  3 +-
 plugins/login-assets/lang/de.json             |  3 +-
 plugins/login-assets/lang/en.json             |  3 +-
 plugins/login-assets/lang/es.json             |  3 +-
 plugins/login-assets/lang/fr.json             |  3 +-
 plugins/login-assets/lang/it.json             |  3 +-
 plugins/login-assets/lang/pt.json             |  3 +-
 plugins/login-assets/lang/ru.json             |  3 +-
 plugins/login-assets/lang/zh.json             |  3 +-
 .../src/components/AdminWorkspaces.svelte     |  6 +++-
 .../src/components/SelectWorkspace.svelte     | 35 +++++++++++++------
 plugins/login/src/index.ts                    |  4 ++-
 server/account/src/operations.ts              |  2 +-
 13 files changed, 52 insertions(+), 22 deletions(-)

diff --git a/plugins/login-assets/lang/cs.json b/plugins/login-assets/lang/cs.json
index b3f3ebf249..d611b97dba 100644
--- a/plugins/login-assets/lang/cs.json
+++ b/plugins/login-assets/lang/cs.json
@@ -57,6 +57,7 @@
     "Next": "Další",
     "Skip": "Přeskočit",
     "SignUpCompleted": "Registrace dokončena",
-    "StartUsingHuly": "Začněte používat Huly"
+    "StartUsingHuly": "Začněte používat Huly",
+    "WorkspaceIsArchived": "Pracovní prostor je archivován kvůli nečinnosti. Kontaktujte nás prosím pro obnovení..."
   }
 }
\ No newline at end of file
diff --git a/plugins/login-assets/lang/de.json b/plugins/login-assets/lang/de.json
index 3467b0224c..93efdd2b0e 100644
--- a/plugins/login-assets/lang/de.json
+++ b/plugins/login-assets/lang/de.json
@@ -57,6 +57,7 @@
     "Next": "Weiter",
     "Skip": "Überspringen",
     "SignUpCompleted": "Registrierung abgeschlossen",
-    "StartUsingHuly": "Starten Sie mit Huly"
+    "StartUsingHuly": "Starten Sie mit Huly",
+    "WorkspaceArchivedDesc": "Workspace wurde wegen Inaktivität archiviert. Bitte kontaktieren Sie uns zur Wiederherstellung..."
   }
 }
diff --git a/plugins/login-assets/lang/en.json b/plugins/login-assets/lang/en.json
index efd8b57ede..64d0f6106b 100644
--- a/plugins/login-assets/lang/en.json
+++ b/plugins/login-assets/lang/en.json
@@ -57,6 +57,7 @@
     "Next": "Next",
     "Skip": "Skip",
     "SignUpCompleted": "Sign up completed",
-    "StartUsingHuly": "Start using Huly"
+    "StartUsingHuly": "Start using Huly",
+    "WorkspaceArchivedDesc": "Workspace is archived because of being unused, Please contact us to restore..."
   }
 }
diff --git a/plugins/login-assets/lang/es.json b/plugins/login-assets/lang/es.json
index 8dd31dde43..b723fc6b0b 100644
--- a/plugins/login-assets/lang/es.json
+++ b/plugins/login-assets/lang/es.json
@@ -57,6 +57,7 @@
     "Next": "Siguiente",
     "Skip": "Saltar",
     "SignUpCompleted": "Registro completado",
-    "StartUsingHuly": "Comienza a usar Huly"
+    "StartUsingHuly": "Comienza a usar Huly",
+    "WorkspaceArchivedDesc": "El espacio de trabajo está archivado por no estar en uso, por favor contáctenos para restaurarlo..."
   }
 }
\ No newline at end of file
diff --git a/plugins/login-assets/lang/fr.json b/plugins/login-assets/lang/fr.json
index b442b854c1..7df88de47b 100644
--- a/plugins/login-assets/lang/fr.json
+++ b/plugins/login-assets/lang/fr.json
@@ -57,6 +57,7 @@
     "Next": "Suivant",
     "Skip": "Passer",
     "SignUpCompleted": "Inscription terminée",
-    "StartUsingHuly": "Commencez à utiliser Huly"
+    "StartUsingHuly": "Commencez à utiliser Huly",
+    "WorkspaceArchivedDesc": "L'espace de travail est archivé en raison de son inactivité, veuillez nous contacter pour le restaurer..." 
   }
 }
\ No newline at end of file
diff --git a/plugins/login-assets/lang/it.json b/plugins/login-assets/lang/it.json
index 9f59687b01..d7c8c39e1a 100644
--- a/plugins/login-assets/lang/it.json
+++ b/plugins/login-assets/lang/it.json
@@ -57,6 +57,7 @@
     "Next": "Avanti",
     "Skip": "Salta",
     "SignUpCompleted": "Registrazione completata",
-    "StartUsingHuly": "Inizia a usare Huly"
+    "StartUsingHuly": "Inizia a usare Huly",
+    "WorkspaceArchivedDesc": "Il workspace è stato archiviato perché inutilizzato. Si prega di contattarci per ripristinarlo..."
   }
 }
diff --git a/plugins/login-assets/lang/pt.json b/plugins/login-assets/lang/pt.json
index 754b9f81a4..82cbcec990 100644
--- a/plugins/login-assets/lang/pt.json
+++ b/plugins/login-assets/lang/pt.json
@@ -57,6 +57,7 @@
     "Next": "Seguinte",
     "Skip": "Saltar",
     "SignUpCompleted": "Registo concluído",
-    "StartUsingHuly": "Começar a usar Huly"
+    "StartUsingHuly": "Começar a usar Huly",
+    "WorkspaceArchivedDesc": "O espaço de trabalho está arquivado por estar inativo, por favor, entre em contato conosco para restaurá-lo..."
   }
 }
\ No newline at end of file
diff --git a/plugins/login-assets/lang/ru.json b/plugins/login-assets/lang/ru.json
index 0d49a61cbf..53a29a7703 100644
--- a/plugins/login-assets/lang/ru.json
+++ b/plugins/login-assets/lang/ru.json
@@ -57,6 +57,7 @@
     "Next": "Дальше",
     "Skip": "Пропустить",
     "SignUpCompleted": "Регистрация завершена",
-    "StartUsingHuly": "Начать использовать Huly"
+    "StartUsingHuly": "Начать использовать Huly",
+    "WorkspaceArchivedDesc": "Рабочее пространство архивировано из-за неиспользования, пожалуйста, свяжитесь с нами для восстановления..."
   }
 }
diff --git a/plugins/login-assets/lang/zh.json b/plugins/login-assets/lang/zh.json
index e5c44c87d6..8670f49447 100644
--- a/plugins/login-assets/lang/zh.json
+++ b/plugins/login-assets/lang/zh.json
@@ -57,6 +57,7 @@
     "Next": "下一个",
     "Skip": "跳过",
     "SignUpCompleted": "注册完成",
-    "StartUsingHuly": "开始使用 Huly"
+    "StartUsingHuly": "开始使用 Huly",
+    "WorkspaceArchivedDesc": "工作区因未使用而归档，请与我们联系以恢复..."
   }
 }
diff --git a/plugins/login-resources/src/components/AdminWorkspaces.svelte b/plugins/login-resources/src/components/AdminWorkspaces.svelte
index 6c90755d23..827f0b6f43 100644
--- a/plugins/login-resources/src/components/AdminWorkspaces.svelte
+++ b/plugins/login-resources/src/components/AdminWorkspaces.svelte
@@ -60,7 +60,8 @@
       (it) =>
         (it.workspaceName?.includes(search) ?? false) ||
         (it.workspaceUrl?.includes(search) ?? false) ||
-        it.workspace?.includes(search)
+        it.workspace?.includes(search) ||
+        it.createdBy?.includes(search)
     ),
     (it) => {
       const lastUsageDays = Math.round((now - it.lastVisit) / (1000 * 3600 * 24))
@@ -169,6 +170,9 @@
                           />
                         </div>
                       </span>
+                      <div class="ml-1" style:width={'12rem'}>
+                        {workspace.createdBy}
+                      </div>
                       <span class="label overflow-label" style:width={'8rem'}>
                         {workspace.region ?? ''}
                       </span>
diff --git a/plugins/login-resources/src/components/SelectWorkspace.svelte b/plugins/login-resources/src/components/SelectWorkspace.svelte
index 13bc31f952..099da5239c 100644
--- a/plugins/login-resources/src/components/SelectWorkspace.svelte
+++ b/plugins/login-resources/src/components/SelectWorkspace.svelte
@@ -14,24 +14,26 @@
 // limitations under the License.
 -->
 <script lang="ts">
+  import { isArchivingMode } from '@hcengineering/core'
   import { LoginInfo, Workspace } from '@hcengineering/login'
   import { OK, Severity, Status } from '@hcengineering/platform'
   import presentation, { NavLink, isAdminUser, reduceCalls } from '@hcengineering/presentation'
+  import MessageBox from '@hcengineering/presentation/src/components/MessageBox.svelte'
   import {
     Button,
     Label,
-    Spinner,
     Scroller,
     SearchEdit,
+    Spinner,
     deviceOptionsStore as deviceInfo,
     setMetadataLocalStorage,
+    showPopup,
     ticker
   } from '@hcengineering/ui'
   import { onMount } from 'svelte'
   import login from '../plugin'
   import { getAccount, getHref, getWorkspaces, goTo, navigateToWorkspace, selectWorkspace } from '../utils'
   import StatusControl from './StatusControl.svelte'
-  import { isArchivingMode } from '@hcengineering/core'
 
   export let navigateUrl: string | undefined = undefined
   let workspaces: Workspace[] = []
@@ -67,6 +69,17 @@
     status = new Status(Severity.INFO, login.status.ConnectingToServer, {})
 
     const [loginStatus, result] = await selectWorkspace(workspace)
+    if (isArchivingMode(result?.mode)) {
+      showPopup(MessageBox, {
+        label: login.string.SelectWorkspace,
+        message: login.string.WorkspaceArchivedDesc,
+        canSubmit: false,
+        params: {},
+        action: async () => {}
+      })
+      status = loginStatus
+      return
+    }
     status = loginStatus
 
     navigateToWorkspace(workspace, result, navigateUrl)
@@ -139,17 +152,19 @@
                 {#if isArchivingMode(workspace.mode)}
                   - <Label label={presentation.string.Archived} />
                 {/if}
-                {#if workspace.mode !== 'active'}
+                {#if workspace.mode !== 'active' && workspace.mode !== 'archived'}
                   ({workspace.progress}%)
                 {/if}
               </span>
-              {#if isAdmin}
-                <span class="text-xs flex-row-center flex-center">
+              <span class="text-xs flex-row-center flex-center">
+                {#if isAdmin}
                   {workspace.workspace}
                   {#if workspace.region !== undefined}
                     at ({workspace.region})
                   {/if}
-                  <div class="text-sm">
+                {/if}
+                <div class="text-sm">
+                  {#if isAdmin}
                     {#if workspace.backupInfo != null}
                       {@const sz = workspace.backupInfo.dataSize + workspace.backupInfo.blobsSize}
                       {@const szGb = Math.round((sz * 100) / 1024) / 100}
@@ -159,10 +174,10 @@
                         - {Math.round(sz)}Mb -
                       {/if}
                     {/if}
-                    ({lastUsageDays} days)
-                  </div>
-                </span>
-              {/if}
+                  {/if}
+                  ({lastUsageDays} days)
+                </div>
+              </span>
             </div>
           </div>
         {/each}
diff --git a/plugins/login/src/index.ts b/plugins/login/src/index.ts
index 3c79562abb..65b9464394 100644
--- a/plugins/login/src/index.ts
+++ b/plugins/login/src/index.ts
@@ -85,7 +85,9 @@ export default plugin(loginId, {
     LinkValidHours: '' as IntlString,
     EmailMask: '' as IntlString,
     NoLimit: '' as IntlString,
-    InviteLimit: '' as IntlString
+    InviteLimit: '' as IntlString,
+    WorkspaceArchived: '' as IntlString,
+    WorkspaceArchivedDesc: '' as IntlString
   },
   function: {
     SendInvite: '' as Resource<(email: string, personId?: Ref<Doc>, role?: AccountRole) => Promise<void>>,
diff --git a/server/account/src/operations.ts b/server/account/src/operations.ts
index c9d768620e..52c230fb29 100644
--- a/server/account/src/operations.ts
+++ b/server/account/src/operations.ts
@@ -504,7 +504,7 @@ export async function selectWorkspace (
       const result: WorkspaceLoginInfo = {
         endpoint: '',
         email,
-        token: '',
+        token: generateToken(email, getWorkspaceId(workspaceInfo.workspace), getExtra(accountInfo)),
         workspace: workspaceUrl,
         workspaceId: workspaceInfo.workspace,
         mode: workspaceInfo.mode,

From 2613e625c98b71f8955aa96a047c29f3ea789a96 Mon Sep 17 00:00:00 2001
From: Alexander Onnikov <aonnikov@hardcoreeng.com>
Date: Mon, 20 Jan 2025 15:24:39 +0700
Subject: [PATCH 03/21] UBERF-9173 Fix links navigation (#7715)

Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com>
---
 .../presentation/src/components/NavLink.svelte   | 16 +++++++++++-----
 .../src/components/markup/Mark.svelte            | 13 ++++++++++---
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/packages/presentation/src/components/NavLink.svelte b/packages/presentation/src/components/NavLink.svelte
index bd944efce2..c5b7c8b145 100644
--- a/packages/presentation/src/components/NavLink.svelte
+++ b/packages/presentation/src/components/NavLink.svelte
@@ -13,7 +13,8 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { closePopup, closeTooltip, navigate, parseLocation } from '@hcengineering/ui'
+  import { getMetadata } from '@hcengineering/platform'
+  import uiPlugin, { closePopup, closeTooltip, navigate, parseLocation } from '@hcengineering/ui'
 
   export let href: string | undefined
   export let disabled = false
@@ -43,11 +44,16 @@
       closeTooltip()
       try {
         const url = new URL(href)
-
         if (url.origin === window.location.origin) {
-          e.preventDefault()
-          e.stopPropagation()
-          navigate(parseLocation(url))
+          const loc = parseLocation(url)
+          const routes = getMetadata(uiPlugin.metadata.Routes)
+          const app = routes?.get(loc.path[0])
+
+          if (app !== undefined) {
+            e.preventDefault()
+            e.stopPropagation()
+            navigate(loc)
+          }
         }
       } catch {}
     }
diff --git a/packages/presentation/src/components/markup/Mark.svelte b/packages/presentation/src/components/markup/Mark.svelte
index 1e84d8ef18..e2f47d1c25 100644
--- a/packages/presentation/src/components/markup/Mark.svelte
+++ b/packages/presentation/src/components/markup/Mark.svelte
@@ -15,7 +15,7 @@
 <script lang="ts">
   import { getMetadata } from '@hcengineering/platform'
   import { MarkupMark, MarkupMarkType } from '@hcengineering/text'
-  import { navigate, parseLocation } from '@hcengineering/ui'
+  import uiPlugin, { navigate, parseLocation } from '@hcengineering/ui'
 
   import presentation from '../../plugin'
 
@@ -29,8 +29,15 @@
         const frontUrl = getMetadata(presentation.metadata.FrontUrl) ?? window.location.origin
 
         if (url.origin === frontUrl) {
-          e.preventDefault()
-          navigate(parseLocation(url))
+          const loc = parseLocation(url)
+          const routes = getMetadata(uiPlugin.metadata.Routes)
+          const app = routes?.get(loc.path[0])
+
+          if (app !== undefined) {
+            e.preventDefault()
+            e.stopPropagation()
+            navigate(loc)
+          }
         }
       }
     } catch (err) {

From 599b7b3375715b1c419ee04fb6dfb312849491c7 Mon Sep 17 00:00:00 2001
From: Andrey Sobolev <haiodo@users.noreply.github.com>
Date: Mon, 20 Jan 2025 16:25:56 +0700
Subject: [PATCH 04/21] QFIX: undefined exception (#7716)

---
 .../src/components/list/ListCategories.svelte | 50 ++++++++++++-------
 1 file changed, 31 insertions(+), 19 deletions(-)

diff --git a/plugins/view-resources/src/components/list/ListCategories.svelte b/plugins/view-resources/src/components/list/ListCategories.svelte
index ab7af4db69..3ac7e29e31 100644
--- a/plugins/view-resources/src/components/list/ListCategories.svelte
+++ b/plugins/view-resources/src/components/list/ListCategories.svelte
@@ -228,18 +228,22 @@
           if (listListCategory?.[0] == null) {
             return
           }
-          const obj = listListCategory[0].getLimited()[0]
-          listListCategory[0].expand()
-          select(0, obj)
+          const obj = listListCategory[0]?.getLimited()?.[0]
+          if (obj !== undefined) {
+            listListCategory[0]?.expand()
+            select(0, obj)
+          }
           return
         } else {
           if (listListCategory?.[0] == null) {
             return
           }
-          const g = listListCategory[categories.length - 1].getLimited()
-          listListCategory[categories.length - 1].expand()
-          const obj = g[g.length - 1]
-          select(0, obj)
+          const g = listListCategory[categories.length - 1]?.getLimited() ?? []
+          if (g.length > 0) {
+            listListCategory[categories.length - 1].expand()
+            const obj = g[g.length - 1]
+            select(0, obj)
+          }
           return
         }
       } else {
@@ -297,17 +301,21 @@
         if (dir === undefined || dir === 'vertical') {
           if (statePos - 1 < 0 && objState >= 0) {
             if (objState !== 0) {
-              const pstateObjs = listListCategory[objState - 1].getLimited()
-              dispatch('select', pstateObjs[pstateObjs.length - 1])
+              const pstateObjs = listListCategory[objState - 1]?.getLimited()
+              if (pstateObjs !== undefined) {
+                dispatch('select', pstateObjs[pstateObjs.length - 1])
+              }
             } else {
               dispatch('select-prev', stateObjs[statePos])
             }
           } else {
             const obj = stateObjs[statePos - 1]
             if (obj !== undefined) {
-              const focusDoc = listListCategory[objState]?.getLimited().find((it) => it._id === obj._id) ?? obj
-              if (!noScroll) scrollInto(objState, focusDoc)
-              dispatch('row-focus', focusDoc)
+              const focusDoc = listListCategory[objState]?.getLimited()?.find((it) => it._id === obj._id) ?? obj
+              if (focusDoc !== undefined) {
+                if (!noScroll) scrollInto(objState, focusDoc)
+                dispatch('row-focus', focusDoc)
+              }
             }
           }
           return
@@ -315,7 +323,7 @@
       }
       if (offset === 1) {
         if (dir === undefined || dir === 'vertical') {
-          const limited = listListCategory[objState].getLimited()
+          const limited = listListCategory[objState]?.getLimited() ?? []
           if (statePos + 1 >= limited.length && objState < categories.length) {
             if (objState + 1 !== categories.length) {
               const pstateObjs = getGroupByValues(groupByDocs, categories[objState + 1])
@@ -326,18 +334,22 @@
           } else {
             const obj = stateObjs[statePos + 1]
             if (obj !== undefined) {
-              const focusDoc = listListCategory[objState]?.getLimited().find((it) => it._id === obj._id) ?? obj
-              if (!noScroll) scrollInto(objState, focusDoc)
-              dispatch('row-focus', focusDoc)
+              const focusDoc = listListCategory[objState]?.getLimited()?.find((it) => it._id === obj._id) ?? obj
+              if (focusDoc !== undefined) {
+                if (!noScroll) scrollInto(objState, focusDoc)
+                dispatch('row-focus', focusDoc)
+              }
             }
           }
           return
         }
       }
       if (offset === 0) {
-        const focusDoc = listListCategory[objState]?.getLimited().find((it) => it._id === obj._id) ?? obj
-        if (!noScroll) scrollInto(objState, focusDoc)
-        dispatch('row-focus', focusDoc)
+        const focusDoc = listListCategory[objState]?.getLimited()?.find((it) => it._id === obj._id) ?? obj
+        if (focusDoc !== undefined) {
+          if (!noScroll) scrollInto(objState, focusDoc)
+          dispatch('row-focus', focusDoc)
+        }
       }
     } else {
       listCategory[objState]?.select(offset, of, dir, noScroll)

From 1840dc5edc870eb515dab2bd53205892ea28a8c4 Mon Sep 17 00:00:00 2001
From: Andrey Sobolev <haiodo@users.noreply.github.com>
Date: Mon, 20 Jan 2025 16:28:23 +0700
Subject: [PATCH 05/21] UBERF-9172: Fix $lookup order by (#7714)

---
 pods/server/src/server.ts            |   9 +-
 server/core/src/dbAdapterManager.ts  |   4 +-
 server/postgres/src/index.ts         |   2 +-
 server/postgres/src/storage.ts       | 122 ++++++++++++++-------------
 server/postgres/src/utils.ts         |  65 +++++++-------
 workers/transactor/package.json      |   2 +-
 workers/transactor/src/transactor.ts |  44 +++++-----
 workers/transactor/wrangler.toml     |   4 +-
 8 files changed, 128 insertions(+), 124 deletions(-)

diff --git a/pods/server/src/server.ts b/pods/server/src/server.ts
index 3a45c340fc..8850484962 100644
--- a/pods/server/src/server.ts
+++ b/pods/server/src/server.ts
@@ -41,7 +41,7 @@ import {
   createPostgreeDestroyAdapter,
   createPostgresAdapter,
   createPostgresTxAdapter,
-  setDbUnsafePrepareOptions
+  setDBExtraOptions
 } from '@hcengineering/postgres'
 import { readFileSync } from 'node:fs'
 const model = JSON.parse(readFileSync(process.env.MODEL_JSON ?? 'model.json').toString()) as Tx[]
@@ -83,11 +83,8 @@ export function start (
 
   const usePrepare = process.env.DB_PREPARE === 'true'
 
-  setDbUnsafePrepareOptions({
-    find: usePrepare,
-    model: false,
-    update: usePrepare,
-    upload: usePrepare
+  setDBExtraOptions({
+    prepare: usePrepare // We override defaults
   })
 
   registerServerPlugins()
diff --git a/server/core/src/dbAdapterManager.ts b/server/core/src/dbAdapterManager.ts
index 6119fe0e3e..0bb863ea52 100644
--- a/server/core/src/dbAdapterManager.ts
+++ b/server/core/src/dbAdapterManager.ts
@@ -109,7 +109,7 @@ export class DbAdapterManagerImpl implements DBAdapterManager {
     }
   }
 
-  async initAdapters (): Promise<void> {
+  async initAdapters (ctx: MeasureContext): Promise<void> {
     for (const [key, adapter] of this.adapters) {
       // already initialized
       if (key !== this.conf.domains[DOMAIN_TX] && adapter.init !== undefined) {
@@ -130,7 +130,7 @@ export class DbAdapterManagerImpl implements DBAdapterManager {
             }
           }
         }
-        await adapter?.init?.(this.metrics, domains, excludeDomains)
+        await ctx.with(`init adapter ${key}`, {}, (ctx) => adapter?.init?.(ctx, domains, excludeDomains))
       }
     }
   }
diff --git a/server/postgres/src/index.ts b/server/postgres/src/index.ts
index 995a03a45c..7d339eb9ce 100644
--- a/server/postgres/src/index.ts
+++ b/server/postgres/src/index.ts
@@ -19,7 +19,7 @@ import { getDBClient, retryTxn } from './utils'
 
 export { getDocFieldsByDomains, translateDomain } from './schemas'
 export * from './storage'
-export { convertDoc, createTables, getDBClient, retryTxn, setDBExtraOptions, setDbUnsafePrepareOptions } from './utils'
+export { convertDoc, createTables, getDBClient, retryTxn, setDBExtraOptions, setExtraOptions } from './utils'
 
 export function createPostgreeDestroyAdapter (url: string): WorkspaceDestroyAdapter {
   return {
diff --git a/server/postgres/src/storage.ts b/server/postgres/src/storage.ts
index 3fdb7d997d..2af395a2bd 100644
--- a/server/postgres/src/storage.ts
+++ b/server/postgres/src/storage.ts
@@ -80,8 +80,8 @@ import {
   createTables,
   DBCollectionHelper,
   type DBDoc,
-  dbUnsafePrepareOptions,
   getDBClient,
+  getPrepare,
   inferType,
   isDataField,
   isOwner,
@@ -325,14 +325,15 @@ class ValuesVariables {
 
   add (value: any, type: string = ''): string {
     // Compact value if string and same
-    if (typeof value === 'string') {
-      const v = this.valueHashes.get(value + ':' + type)
+    if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
+      const vkey = `${value}:${type}`
+      const v = this.valueHashes.get(vkey)
       if (v !== undefined) {
         return v
       }
       this.values.push(value)
       const idx = type !== '' ? `$${this.index++}${type}` : `$${this.index++}`
-      this.valueHashes.set(value + ':' + type, idx)
+      this.valueHashes.set(vkey, idx)
       return idx
     } else {
       this.values.push(value)
@@ -359,6 +360,33 @@ class ValuesVariables {
     })
     return vv
   }
+
+  injectVars (sql: string): string {
+    const escQuote = (d: any | any[]): string => {
+      if (d == null) {
+        return 'NULL'
+      }
+      if (Array.isArray(d)) {
+        return 'ARRAY[' + d.map(escQuote).join(',') + ']'
+      }
+      switch (typeof d) {
+        case 'number':
+          if (isNaN(d) || !isFinite(d)) {
+            throw new Error('Invalid number value')
+          }
+          return d.toString()
+        case 'boolean':
+          return d ? 'TRUE' : 'FALSE'
+        case 'string':
+          return `'${d.replace(/'/g, "''")}'`
+        default:
+          throw new Error(`Unsupported value type: ${typeof d}`)
+      }
+    }
+    return sql.replaceAll(/(\$\d+)/g, (_, v) => {
+      return escQuote(this.getValues()[parseInt(v.substring(1)) - 1] ?? v)
+    })
+  }
 }
 
 abstract class PostgresAdapterBase implements DbAdapter {
@@ -457,9 +485,7 @@ abstract class PostgresAdapterBase implements DbAdapter {
     }
     const finalSql: string = [select, ...sqlChunks].join(' ')
     const result: DBDoc[] = await this.mgr.retry(undefined, (client) =>
-      client.unsafe(finalSql, vars.getValues(), {
-        prepare: dbUnsafePrepareOptions.find
-      })
+      client.unsafe(finalSql, vars.getValues(), getPrepare())
     )
     return result.map((p) => parseDocWithProjection(p, domain, options?.projection))
   }
@@ -519,9 +545,7 @@ abstract class PostgresAdapterBase implements DbAdapter {
         const res = await client.unsafe(
           `SELECT * FROM ${translateDomain(domain)} WHERE ${translatedQuery} FOR UPDATE`,
           vars.getValues(),
-          {
-            prepare: dbUnsafePrepareOptions.find
-          }
+          getPrepare()
         )
         const docs = res.map((p) => parseDoc(p as any, schemaFields.schema))
         for (const doc of docs) {
@@ -553,9 +577,7 @@ abstract class PostgresAdapterBase implements DbAdapter {
                     WHERE "workspaceId" = ${params.add(this.workspaceId.name, '::uuid')} 
                       AND _id = ${params.add(doc._id, '::text')}`,
             params.getValues(),
-            {
-              prepare: dbUnsafePrepareOptions.update
-            }
+            getPrepare()
           )
         }
       })
@@ -593,9 +615,7 @@ abstract class PostgresAdapterBase implements DbAdapter {
       await client.unsafe(
         `UPDATE ${translateDomain(domain)} SET ${updates.join(', ')} WHERE ${translatedQuery};`,
         vars.getValues(),
-        {
-          prepare: dbUnsafePrepareOptions.find
-        }
+        getPrepare()
       )
     })
   }
@@ -604,9 +624,11 @@ abstract class PostgresAdapterBase implements DbAdapter {
     const vars = new ValuesVariables()
     const translatedQuery = this.buildRawQuery(vars, domain, query)
     await this.mgr.retry(undefined, async (client) => {
-      await client.unsafe(`DELETE FROM ${translateDomain(domain)} WHERE ${translatedQuery}`, vars.getValues(), {
-        prepare: dbUnsafePrepareOptions.update
-      })
+      await client.unsafe(
+        `DELETE FROM ${translateDomain(domain)} WHERE ${translatedQuery}`,
+        vars.getValues(),
+        getPrepare()
+      )
     })
   }
 
@@ -670,18 +692,15 @@ abstract class PostgresAdapterBase implements DbAdapter {
             if (options?.total === true) {
               const totalReq = `SELECT COUNT(${domain}._id) as count FROM ${domain}`
               const totalSql = [totalReq, ...totalSqlChunks].join(' ')
-              const totalResult = await connection.unsafe(totalSql, vars.getValues(), {
-                prepare: dbUnsafePrepareOptions.find
-              })
+              const totalResult = await connection.unsafe(totalSql, vars.getValues(), getPrepare())
               const parsed = Number.parseInt(totalResult[0].count)
               total = Number.isNaN(parsed) ? 0 : parsed
             }
 
             const finalSql: string = [select, ...sqlChunks].join(' ')
             fquery = finalSql
-            const result = await connection.unsafe(finalSql, vars.getValues(), {
-              prepare: dbUnsafePrepareOptions.find
-            })
+
+            const result = await connection.unsafe(finalSql, vars.getValues(), getPrepare())
             if (
               options?.lookup === undefined &&
               options?.domainLookup === undefined &&
@@ -697,7 +716,7 @@ abstract class PostgresAdapterBase implements DbAdapter {
             }
           })) as FindResult<T>
         } catch (err) {
-          ctx.error('Error in findAll', { err })
+          ctx.error('Error in findAll', { err, sql: vars.injectVars(fquery) })
           throw err
         }
       },
@@ -1170,8 +1189,13 @@ abstract class PostgresAdapterBase implements DbAdapter {
     if (join.isReverse) {
       return `${join.toAlias}->'${tKey}'`
     }
-    const res = isDataField(domain, tKey) ? (isDataArray ? `data->'${tKey}'` : `data#>>'{${tKey}}'`) : key
-    return `${join.toAlias}.${res}`
+    if (isDataField(domain, tKey)) {
+      if (isDataArray) {
+        return `${join.toAlias}."data"->'${tKey}'`
+      }
+      return `${join.toAlias}."data"#>>'{${tKey}}'`
+    }
+    return `${join.toAlias}."${tKey}"`
   }
 
   private transformKey<T extends Doc>(
@@ -1505,9 +1529,7 @@ abstract class PostgresAdapterBase implements DbAdapter {
           `SELECT * FROM ${translateDomain(domain)} 
                     WHERE  "workspaceId" = $1::uuid AND _id = ANY($2::text[])`,
           [this.workspaceId.name, docs],
-          {
-            prepare: dbUnsafePrepareOptions.find
-          }
+          getPrepare()
         )
         return res.map((p) => parseDocWithProjection(p as any, domain))
       })
@@ -1562,9 +1584,7 @@ abstract class PostgresAdapterBase implements DbAdapter {
                   `INSERT INTO ${tdomain} ("workspaceId", ${insertStr}) VALUES ${vals} 
                             ON CONFLICT ("workspaceId", _id) DO UPDATE SET ${onConflictStr};`,
                   values.getValues(),
-                  {
-                    prepare: dbUnsafePrepareOptions.upload
-                  }
+                  getPrepare()
                 )
             )
           } else {
@@ -1574,9 +1594,7 @@ abstract class PostgresAdapterBase implements DbAdapter {
                 await client.unsafe(
                   `INSERT INTO ${tdomain} ("workspaceId", ${insertStr}) VALUES ${vals};`,
                   values.getValues(),
-                  {
-                    prepare: dbUnsafePrepareOptions.upload
-                  }
+                  getPrepare()
                 )
             )
           }
@@ -1598,9 +1616,7 @@ abstract class PostgresAdapterBase implements DbAdapter {
           client.unsafe(
             `DELETE FROM ${tdomain} WHERE "workspaceId" = $1 AND _id = ANY($2::text[])`,
             [this.workspaceId.name, part],
-            {
-              prepare: dbUnsafePrepareOptions.upload
-            }
+            getPrepare()
           )
         )
       })
@@ -1619,9 +1635,7 @@ abstract class PostgresAdapterBase implements DbAdapter {
         const vars = new ValuesVariables()
         const finalSql = `SELECT DISTINCT ${key} as ${field}, Count(*) AS count FROM ${translateDomain(domain)} WHERE ${this.buildRawQuery(vars, domain, query ?? {})} GROUP BY ${key}`
         return await this.mgr.retry(ctx.id, async (connection) => {
-          const result = await connection.unsafe(finalSql, vars.getValues(), {
-            prepare: dbUnsafePrepareOptions.find
-          })
+          const result = await connection.unsafe(finalSql, vars.getValues(), getPrepare())
           return new Map(result.map((r) => [r[field.toLocaleLowerCase()], parseInt(r.count)]))
         })
       } catch (err) {
@@ -1722,9 +1736,7 @@ class PostgresAdapter extends PostgresAdapterBase {
           SET ${updates.join(', ')}  
           WHERE "workspaceId" = ${wsId} AND _id = ${oId}`,
           params.getValues(),
-          {
-            prepare: dbUnsafePrepareOptions.update
-          }
+          getPrepare()
         )
       })
     })
@@ -1837,9 +1849,7 @@ class PostgresAdapter extends PostgresAdapterBase {
               WHERE "workspaceId" = ${wsId} 
                 AND _id = ${oId}`,
               params.getValues(),
-              {
-                prepare: dbUnsafePrepareOptions.update
-              }
+              getPrepare()
             )
           })
           if (tx.retrieve === true && doc !== undefined) {
@@ -1928,11 +1938,7 @@ class PostgresAdapter extends PostgresAdapterBase {
             WHERE "workspaceId" = $1::uuid AND "_id" = update_data.__id`
 
             await this.mgr.retry(ctx.id, (client) =>
-              ctx.with('bulk-update', {}, () =>
-                client.unsafe(op, data, {
-                  prepare: dbUnsafePrepareOptions.update
-                })
-              )
+              ctx.with('bulk-update', {}, () => client.unsafe(op, data, getPrepare()))
             )
           }
         }
@@ -1966,9 +1972,7 @@ class PostgresAdapter extends PostgresAdapterBase {
           forUpdate ? ' FOR UPDATE' : ''
         }`,
         [this.workspaceId.name, _id],
-        {
-          prepare: dbUnsafePrepareOptions.find
-        }
+        getPrepare()
       )
       const dbDoc = res[0] as any
       return dbDoc !== undefined ? parseDoc(dbDoc, getSchema(domain)) : undefined
@@ -2015,9 +2019,7 @@ class PostgresTxAdapter extends PostgresAdapterBase implements TxAdapter {
   async getModel (ctx: MeasureContext): Promise<Tx[]> {
     const res: DBDoc[] = await this.mgr.retry(undefined, (client) => {
       return client.unsafe(
-        `SELECT * FROM "${translateDomain(DOMAIN_MODEL_TX)}" WHERE "workspaceId" = $1::uuid ORDER BY _id::text ASC, "modifiedOn"::bigint ASC`,
-        [this.workspaceId.name],
-        { prepare: dbUnsafePrepareOptions.model }
+        `SELECT * FROM "${translateDomain(DOMAIN_MODEL_TX)}" WHERE "workspaceId" = '${this.workspaceId.name}'::uuid ORDER BY _id::text ASC, "modifiedOn"::bigint ASC`
       )
     })
 
diff --git a/server/postgres/src/utils.ts b/server/postgres/src/utils.ts
index 0b24125c06..2938070b22 100644
--- a/server/postgres/src/utils.ts
+++ b/server/postgres/src/utils.ts
@@ -55,6 +55,8 @@ process.on('exit', () => {
 const clientRefs = new Map<string, ClientRef>()
 const loadedDomains = new Set<string>()
 
+let loadedTables = new Set<string>()
+
 export async function retryTxn (
   pool: postgres.Sql,
   operation: (client: postgres.TransactionSql) => Promise<any>
@@ -83,26 +85,30 @@ export async function createTables (
     return
   }
   const mapped = filtered.map((p) => translateDomain(p))
-  const tables = await ctx.with('load-table', {}, () =>
-    client.unsafe(
-      `
+  const t = Date.now()
+  loadedTables =
+    loadedTables.size === 0
+      ? new Set(
+        (
+          await ctx.with('load-table', {}, () =>
+            client.unsafe(`
     SELECT table_name 
     FROM information_schema.tables
-    WHERE table_name = ANY( $1::text[] )
-  `,
-      [mapped]
-    )
-  )
-
-  const exists = new Set(tables.map((it) => it.table_name))
-
-  const domainsToLoad = mapped.filter((it) => exists.has(it))
+    WHERE table_schema NOT IN ('pg_catalog', 'information_schema')
+    AND table_name NOT LIKE 'pg_%'`)
+          )
+        ).map((it) => it.table_name)
+      )
+      : loadedTables
+  console.log('load-table', Date.now() - t)
+
+  const domainsToLoad = mapped.filter((it) => loadedTables.has(it))
   if (domainsToLoad.length > 0) {
     await ctx.with('load-schemas', {}, () => getTableSchema(client, domainsToLoad))
   }
   const domainsToCreate: string[] = []
   for (const domain of mapped) {
-    if (!exists.has(domain)) {
+    if (!loadedTables.has(domain)) {
       domainsToCreate.push(domain)
     } else {
       loadedDomains.add(url + domain)
@@ -120,13 +126,10 @@ export async function createTables (
 }
 
 async function getTableSchema (client: postgres.Sql, domains: string[]): Promise<void> {
-  const res = await client.unsafe(
-    `SELECT column_name::name, data_type::text, is_nullable::text, table_name::name
+  const res = await client.unsafe(`SELECT column_name::name, data_type::text, is_nullable::text, table_name::name
             FROM information_schema.columns
-            WHERE table_name = ANY($1::text[]) and table_schema = 'public'::name 
-            ORDER BY table_name::name, ordinal_position::int ASC;`,
-    [domains]
-  )
+            WHERE table_name IN (${domains.map((it) => `'${it}'`).join(', ')}) and table_schema = 'public'::name  
+            ORDER BY table_name::name, ordinal_position::int ASC;`)
 
   const schemas: Record<string, Schema> = {}
   for (const column of res) {
@@ -277,27 +280,25 @@ export class ClientRef implements PostgresClientReference {
   }
 }
 
-let dbExtraOptions: Partial<Options<any>> = {}
+export let dbExtraOptions: Partial<Options<any>> = {}
 export function setDBExtraOptions (options: Partial<Options<any>>): void {
   dbExtraOptions = options
 }
 
-export interface DbUnsafePrepareOptions {
-  upload: boolean
-  find: boolean
-  update: boolean
-  model: boolean
+export function getPrepare (): { prepare: boolean } {
+  return { prepare: dbExtraOptions.prepare ?? false }
+}
+
+export interface DBExtraOptions {
+  useCF: boolean
 }
 
-export let dbUnsafePrepareOptions: DbUnsafePrepareOptions = {
-  upload: true,
-  find: true,
-  update: true,
-  model: true
+export let dbExtra: DBExtraOptions = {
+  useCF: false
 }
 
-export function setDbUnsafePrepareOptions (options: DbUnsafePrepareOptions): void {
-  dbUnsafePrepareOptions = options
+export function setExtraOptions (options: DBExtraOptions): void {
+  dbExtra = options
 }
 
 /**
diff --git a/workers/transactor/package.json b/workers/transactor/package.json
index 74c45a6b9a..2d4fc98185 100644
--- a/workers/transactor/package.json
+++ b/workers/transactor/package.json
@@ -5,7 +5,7 @@
   "template": "cloud",
   "scripts": {
     "deploy": "wrangler deploy",
-    "dev": "wrangler dev --port 3335",
+    "dev": "wrangler dev --port 3335 --remote",
     "dev-local": "wrangler dev --port 3335 --local --upstream-protocol=http",
     "start": "wrangler dev --port 3335",
     "logs": "npx wrangler tail --format pretty", 
diff --git a/workers/transactor/src/transactor.ts b/workers/transactor/src/transactor.ts
index 5b0a30ece7..a1f64bd565 100644
--- a/workers/transactor/src/transactor.ts
+++ b/workers/transactor/src/transactor.ts
@@ -38,8 +38,9 @@ import {
   createPostgreeDestroyAdapter,
   createPostgresAdapter,
   createPostgresTxAdapter,
+  getDBClient,
   setDBExtraOptions,
-  setDbUnsafePrepareOptions
+  setExtraOptions
 } from '@hcengineering/postgres'
 import {
   createServerPipeline,
@@ -75,13 +76,11 @@ export class Transactor extends DurableObject<Env> {
       ssl: false,
       connection: {
         application_name: 'cloud-transactor'
-      }
+      },
+      prepare: false
     })
-    setDbUnsafePrepareOptions({
-      upload: false,
-      find: false,
-      update: false,
-      model: false
+    setExtraOptions({
+      useCF: true
     })
     registerTxAdapterFactory('postgresql', createPostgresTxAdapter, true)
     registerAdapterFactory('postgresql', createPostgresAdapter, true)
@@ -105,23 +104,28 @@ export class Transactor extends DurableObject<Env> {
     console.log({ message: 'use stats', url: this.env.STATS_URL })
     console.log({ message: 'use fulltext', url: this.env.FULLTEXT_URL })
 
+    const dbUrl = env.DB_MODE === 'direct' ? env.DB_URL ?? '' : env.HYPERDRIVE.connectionString
+
     // TODO:
     const storage = createDummyStorageAdapter()
 
     this.pipelineFactory = async (ctx, ws, upgrade, broadcast, branding) => {
-      const pipeline = createServerPipeline(
-        this.measureCtx,
-        env.DB_MODE === 'direct' ? env.DB_URL ?? '' : env.HYPERDRIVE.connectionString,
-        model,
-        {
-          externalStorage: storage,
-          adapterSecurity: false,
-          disableTriggers: false,
-          fulltextUrl: env.FULLTEXT_URL,
-          extraLogging: true
-        }
-      )
-      return await pipeline(ctx, ws, upgrade, broadcast, branding)
+      const pipeline = createServerPipeline(this.measureCtx, dbUrl, model, {
+        externalStorage: storage,
+        adapterSecurity: false,
+        disableTriggers: false,
+        fulltextUrl: env.FULLTEXT_URL,
+        extraLogging: true
+      })
+      const result = await pipeline(ctx, ws, upgrade, broadcast, branding)
+
+      const client = getDBClient(dbUrl)
+      const connection = await client.getClient()
+      const t1 = Date.now()
+      await connection`select now()`
+      console.log('DB query time', Date.now() - t1)
+      client.close()
+      return result
     }
 
     void this.ctx
diff --git a/workers/transactor/wrangler.toml b/workers/transactor/wrangler.toml
index fc91897988..92cad4fa3d 100644
--- a/workers/transactor/wrangler.toml
+++ b/workers/transactor/wrangler.toml
@@ -13,8 +13,8 @@ head_sampling_rate = 1 # optional. default = 1.
 # If you are running back-end logic in a Worker, running it closer to your back-end infrastructure
 # rather than the end user may result in better performance.
 # Docs: https://developers.cloudflare.com/workers/configuration/smart-placement/#smart-placement
-# [placement]
-# mode = "smart"
+[placement]
+mode = "smart"
 
 # Variable bindings. These are arbitrary, plaintext strings (similar to environment variables)
 # Docs:

From 60b8a8cba3ea35c4b59f6cdae598165f572f0ffc Mon Sep 17 00:00:00 2001
From: Alexander Onnikov <aonnikov@hardcoreeng.com>
Date: Mon, 20 Jan 2025 18:08:31 +0700
Subject: [PATCH 06/21] tool: add qms ranks (#7713)

---
 dev/tool/src/index.ts | 50 +++++++++++++++++++++++++++++++++++++++
 dev/tool/src/qms.ts   | 55 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 105 insertions(+)
 create mode 100644 dev/tool/src/qms.ts

diff --git a/dev/tool/src/index.ts b/dev/tool/src/index.ts
index 0ac46cfe95..97b17e971b 100644
--- a/dev/tool/src/index.ts
+++ b/dev/tool/src/index.ts
@@ -75,6 +75,7 @@ import path from 'path'
 
 import { buildStorageFromConfig, createStorageFromConfig, storageConfigFromEnv } from '@hcengineering/server-storage'
 import { program, type Command } from 'commander'
+import { addControlledDocumentRank } from './qms'
 import { clearTelegramHistory } from './telegram'
 import { diffWorkspace, recreateElastic, updateField } from './workspace'
 
@@ -2101,6 +2102,55 @@ export function devTool (
       })
     })
 
+  program
+    .command('add-controlled-doc-rank-mongo')
+    .description('add rank to controlled documents')
+    .option('-w, --workspace <workspace>', 'Selected workspace only', '')
+    .action(async (cmd: { workspace: string }) => {
+      const { version } = prepareTools()
+
+      let workspaces: Workspace[] = []
+      await withAccountDatabase(async (db) => {
+        workspaces = await listWorkspacesPure(db)
+        workspaces = workspaces
+          .filter((p) => isActiveMode(p.mode))
+          .filter((p) => cmd.workspace === '' || p.workspace === cmd.workspace)
+          .sort((a, b) => b.lastVisit - a.lastVisit)
+      })
+
+      console.log('found workspaces', workspaces.length)
+
+      const mongodbUri = getMongoDBUrl()
+      const client = getMongoClient(mongodbUri)
+      const _client = await client.getClient()
+
+      try {
+        const count = workspaces.length
+        let index = 0
+        for (const workspace of workspaces) {
+          index++
+
+          toolCtx.info('processing workspace', {
+            workspace: workspace.workspace,
+            version: workspace.version,
+            index,
+            count
+          })
+
+          if (workspace.version === undefined || !deepEqual(workspace.version, version)) {
+            console.log(`upgrade to ${versionToString(version)} is required`)
+            continue
+          }
+          const workspaceId = getWorkspaceId(workspace.workspace)
+          const wsDb = getWorkspaceMongoDB(_client, { name: workspace.workspace })
+
+          await addControlledDocumentRank(toolCtx, wsDb, workspaceId)
+        }
+      } finally {
+        client.close()
+      }
+    })
+
   extendProgram?.(program)
 
   program.parse(process.argv)
diff --git a/dev/tool/src/qms.ts b/dev/tool/src/qms.ts
new file mode 100644
index 0000000000..43f26b2a3e
--- /dev/null
+++ b/dev/tool/src/qms.ts
@@ -0,0 +1,55 @@
+//
+// Copyright © 2024 Hardcore Engineering Inc.
+//
+// Licensed under the Eclipse Public License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License. You may
+// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import { type MeasureContext, type Ref, type WorkspaceId } from '@hcengineering/core'
+import documents, { type DocumentMeta, type ProjectMeta } from '@hcengineering/controlled-documents'
+import { DOMAIN_DOCUMENTS } from '@hcengineering/model-controlled-documents'
+import { type Db } from 'mongodb'
+import { makeRank } from '@hcengineering/task'
+
+export async function addControlledDocumentRank (ctx: MeasureContext, db: Db, workspaceId: WorkspaceId): Promise<void> {
+  const collections = await db.listCollections().toArray()
+  if (collections.find((it) => it.name === DOMAIN_DOCUMENTS) === undefined) {
+    ctx.error('skipping migration, no collection found', { workspace: workspaceId.name })
+    return
+  }
+
+  const prjMeta = await db
+    .collection<ProjectMeta>(DOMAIN_DOCUMENTS)
+    .find({ _class: documents.class.ProjectMeta })
+    .toArray()
+
+  const docMeta = await db
+    .collection<DocumentMeta>(DOMAIN_DOCUMENTS)
+    .find({ _class: documents.class.DocumentMeta })
+    .toArray()
+
+  const docMetaById = new Map<Ref<DocumentMeta>, DocumentMeta>()
+  for (const doc of docMeta) {
+    docMetaById.set(doc._id, doc)
+  }
+
+  prjMeta.sort((a, b) => {
+    const titleA = docMetaById.get(a.meta)?.title ?? ''
+    const titleB = docMetaById.get(b.meta)?.title ?? ''
+    return titleA.localeCompare(titleB, undefined, { numeric: true })
+  })
+
+  let rank = makeRank(undefined, undefined)
+  for (const doc of prjMeta) {
+    await db.collection(DOMAIN_DOCUMENTS).updateOne({ _id: doc._id }, { $set: { rank } })
+    rank = makeRank(rank, undefined)
+  }
+}

From 7b58315863368c67cec1cf2d6e02b59748aec530 Mon Sep 17 00:00:00 2001
From: Alexander Onnikov <aonnikov@hardcoreeng.com>
Date: Mon, 20 Jan 2025 21:43:56 +0700
Subject: [PATCH 07/21] EQMS-1410 Fix survey location resolver (#7736)

---
 plugins/survey-resources/src/utils.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/survey-resources/src/utils.ts b/plugins/survey-resources/src/utils.ts
index d3392c5d0f..b95a282fad 100644
--- a/plugins/survey-resources/src/utils.ts
+++ b/plugins/survey-resources/src/utils.ts
@@ -100,6 +100,10 @@ export async function resolveLocation (loc: Location): Promise<ResolvedLocation
     return undefined
   }
 
+  if (loc.path[3] === undefined) {
+    return undefined
+  }
+
   if (loc.path[3] === 'surveys') {
     return undefined
   }

From 3e9442208f0866f835a8e5a1118a5ec76afd8376 Mon Sep 17 00:00:00 2001
From: Kristina <kristin.fefelova@gmail.com>
Date: Mon, 20 Jan 2025 21:38:36 +0400
Subject: [PATCH 08/21] Do not send unavailable notifications (#7737)

Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com>
---
 packages/core/src/utils.ts                    |  15 ++
 .../activity-resources/src/index.ts           |   1 +
 .../activity-resources/src/utils.ts           |  13 +-
 server-plugins/chunter-resources/src/index.ts |  13 +-
 server-plugins/love-resources/src/index.ts    |  13 +-
 .../notification-resources/src/index.ts       | 173 +++++++++++++++---
 .../notification-resources/src/utils.ts       |   7 +
 7 files changed, 175 insertions(+), 60 deletions(-)

diff --git a/packages/core/src/utils.ts b/packages/core/src/utils.ts
index 61289073fc..45e5a8b943 100644
--- a/packages/core/src/utils.ts
+++ b/packages/core/src/utils.ts
@@ -904,3 +904,18 @@ export class TimeRateLimiter {
     }
   }
 }
+
+export function combineAttributes (
+  attributes: any[],
+  key: string,
+  operator: '$push' | '$pull',
+  arrayKey: '$each' | '$in'
+): any[] {
+  return Array.from(
+    new Set(
+      attributes.flatMap((attr) =>
+        Array.isArray(attr[operator]?.[key]?.[arrayKey]) ? attr[operator]?.[key]?.[arrayKey] : attr[operator]?.[key]
+      )
+    )
+  ).filter((v) => v != null)
+}
diff --git a/server-plugins/activity-resources/src/index.ts b/server-plugins/activity-resources/src/index.ts
index 71454aac57..4a59ffd799 100644
--- a/server-plugins/activity-resources/src/index.ts
+++ b/server-plugins/activity-resources/src/index.ts
@@ -141,6 +141,7 @@ export async function createReactionNotifications (tx: TxCUD<Reaction>, control:
   res = res.concat(
     await createCollabDocInfo(
       control.ctx,
+      res,
       [user] as Ref<PersonAccount>[],
       control,
       tx,
diff --git a/server-plugins/activity-resources/src/utils.ts b/server-plugins/activity-resources/src/utils.ts
index e2d020ba96..966c633eca 100644
--- a/server-plugins/activity-resources/src/utils.ts
+++ b/server-plugins/activity-resources/src/utils.ts
@@ -15,7 +15,8 @@ import {
   TxCUD,
   TxMixin,
   TxProcessor,
-  TxUpdateDoc
+  TxUpdateDoc,
+  combineAttributes
 } from '@hcengineering/core'
 import core from '@hcengineering/core/src/component'
 import notification from '@hcengineering/notification'
@@ -76,16 +77,6 @@ function getModifiedAttributes (tx: TxCUD<Doc>, hierarchy: Hierarchy): Record<st
   return {}
 }
 
-function combineAttributes (attributes: any[], key: string, operator: string, arrayKey: string): any[] {
-  return Array.from(
-    new Set(
-      attributes.flatMap((attr) =>
-        Array.isArray(attr[operator]?.[key]?.[arrayKey]) ? attr[operator]?.[key]?.[arrayKey] : attr[operator]?.[key]
-      )
-    )
-  ).filter((v) => v != null)
-}
-
 export function getDocUpdateAction (control: ActivityControl, tx: TxCUD<Doc>): DocUpdateAction {
   const hierarchy = control.hierarchy
 
diff --git a/server-plugins/chunter-resources/src/index.ts b/server-plugins/chunter-resources/src/index.ts
index 7a0ff58d9c..bfff959b81 100644
--- a/server-plugins/chunter-resources/src/index.ts
+++ b/server-plugins/chunter-resources/src/index.ts
@@ -34,7 +34,8 @@ import core, {
   TxRemoveDoc,
   TxUpdateDoc,
   UserStatus,
-  type MeasureContext
+  type MeasureContext,
+  combineAttributes
 } from '@hcengineering/core'
 import notification, { DocNotifyContext, NotificationContent } from '@hcengineering/notification'
 import { getMetadata, IntlString, translate } from '@hcengineering/platform'
@@ -359,16 +360,6 @@ async function OnChatMessageRemoved (txes: TxCUD<ChatMessage>[], control: Trigge
   return res
 }
 
-function combineAttributes (attributes: any[], key: string, operator: string, arrayKey: string): any[] {
-  return Array.from(
-    new Set(
-      attributes.flatMap((attr) =>
-        Array.isArray(attr[operator]?.[key]?.[arrayKey]) ? attr[operator]?.[key]?.[arrayKey] : attr[operator]?.[key]
-      )
-    )
-  ).filter((v) => v != null)
-}
-
 function getDirectsToHide (directs: DocNotifyContext[], date: Timestamp): DocNotifyContext[] {
   const minVisibleDirects = 10
 
diff --git a/server-plugins/love-resources/src/index.ts b/server-plugins/love-resources/src/index.ts
index d554834b64..a5677b9774 100644
--- a/server-plugins/love-resources/src/index.ts
+++ b/server-plugins/love-resources/src/index.ts
@@ -26,7 +26,8 @@ import core, {
   TxMixin,
   TxProcessor,
   TxUpdateDoc,
-  UserStatus
+  UserStatus,
+  combineAttributes
 } from '@hcengineering/core'
 import love, {
   Invite,
@@ -431,16 +432,6 @@ async function isRoomEmpty (
   return false
 }
 
-function combineAttributes (attributes: any[], key: string, operator: string, arrayKey: string): any[] {
-  return Array.from(
-    new Set(
-      attributes.flatMap((attr) =>
-        Array.isArray(attr[operator]?.[key]?.[arrayKey]) ? attr[operator]?.[key]?.[arrayKey] : attr[operator]?.[key]
-      )
-    )
-  ).filter((v) => v != null)
-}
-
 async function OnRoomInfo (txes: TxCUD<RoomInfo>[], control: TriggerControl): Promise<Tx[]> {
   const result: Tx[] = []
   const personsByRoom = new Map<Ref<RoomInfo>, Ref<Person>[]>()
diff --git a/server-plugins/notification-resources/src/index.ts b/server-plugins/notification-resources/src/index.ts
index b93d851295..2824c4ff12 100644
--- a/server-plugins/notification-resources/src/index.ts
+++ b/server-plugins/notification-resources/src/index.ts
@@ -31,6 +31,7 @@ import core, {
   AttachedDoc,
   Class,
   Collection,
+  combineAttributes,
   concatLink,
   Data,
   Doc,
@@ -82,6 +83,7 @@ import { markupToText, stripTags } from '@hcengineering/text'
 import { encodeObjectURI } from '@hcengineering/view'
 import { workbenchId } from '@hcengineering/workbench'
 import webpush, { WebPushError } from 'web-push'
+import { Analytics } from '@hcengineering/analytics'
 
 import { Content, ContextsCache, ContextsCacheKey, NotifyParams, NotifyResult } from './types'
 import {
@@ -102,7 +104,8 @@ import {
   replaceAll,
   toReceiverInfo,
   updateNotifyContextsSpace,
-  type NotificationProviderControl
+  type NotificationProviderControl,
+  getObjectSpace
 } from './utils'
 
 export function getPushCollaboratorTx (
@@ -933,16 +936,16 @@ async function removeContexts (
 
 export async function createCollabDocInfo (
   ctx: MeasureContext,
+  res: Tx[],
   collaborators: Ref<PersonAccount>[],
   control: TriggerControl,
   tx: TxCUD<Doc>,
   object: Doc,
   activityMessages: ActivityMessage[],
   params: NotifyParams,
-  unsubscribe: Ref<PersonAccount>[] = []
+  unsubscribe: Ref<PersonAccount>[] = [],
+  cache = new Map<Ref<Doc>, Doc>()
 ): Promise<Tx[]> {
-  let res: Tx[] = []
-
   if (tx.space === core.space.DerivedTx) {
     return res
   }
@@ -973,7 +976,35 @@ export async function createCollabDocInfo (
     await removeContexts(ctx, notifyContexts, unsubscribe, control)
   }
 
-  const targets = new Set(collaborators)
+  const space = await getObjectSpace(control, object, cache)
+
+  if (space === undefined) {
+    control.ctx.error('Cannot find space for object', object)
+    Analytics.handleError(
+      new Error(`Cannot find space ${object.space} for objectId ${object._id}, objectClass ${object._class}`)
+    )
+    return res
+  }
+
+  cache.set(space._id, space)
+
+  const filteredCollaborators = control.hierarchy.isDerived(object._class, core.class.SystemSpace)
+    ? collaborators
+    : collaborators.filter(
+      (it) =>
+        space.members.includes(it) ||
+          res.some((tx) => {
+            if (tx._class === core.class.TxUpdateDoc) {
+              const updateTx = tx as TxUpdateDoc<Space>
+              if (updateTx.objectId === space._id) {
+                const added = combineAttributes([updateTx.operations], 'members', '$push', '$each')
+                return added.includes(it)
+              }
+            }
+            return false
+          })
+    )
+  const targets = new Set(filteredCollaborators)
 
   // user is not collaborator of himself, but we should notify user of changes related to users account (mentions, comments etc)
   if (control.hierarchy.isDerived(object._class, contact.class.Person)) {
@@ -1106,8 +1137,7 @@ async function getSpaceCollabTxes (
     return []
   }
 
-  const space =
-    cache.get(doc.space) ?? (await control.findAll(ctx, core.class.Space, { _id: doc.space }, { limit: 1 }))[0]
+  const space = await getObjectSpace(control, doc, cache)
   if (space === undefined) return []
 
   cache.set(space._id, space)
@@ -1121,18 +1151,45 @@ async function getSpaceCollabTxes (
     if (collabs.collaborators !== undefined) {
       return await createCollabDocInfo(
         ctx,
+        [],
         collabs.collaborators as Ref<PersonAccount>[],
         control,
         tx,
         doc,
         activityMessages,
-        { isSpace: true, isOwn: false, shouldUpdateTimestamp: true }
+        { isSpace: true, isOwn: false, shouldUpdateTimestamp: true },
+        [],
+        cache
       )
     }
   }
   return []
 }
 
+async function pushCollaboratorsToPublicSpace (
+  control: TriggerControl,
+  doc: Doc,
+  collaborators: Ref<Account>[],
+  cache: Map<Ref<Doc>, Doc>
+): Promise<Tx[]> {
+  const space = await getObjectSpace(control, doc, cache)
+  if (space === undefined) return []
+
+  cache.set(space._id, space)
+
+  if (control.hierarchy.isDerived(space._class, core.class.SystemSpace)) {
+    return []
+  }
+
+  if (space.private) {
+    return []
+  }
+
+  return collaborators
+    .filter((it) => !space.members.includes(it))
+    .map((it) => control.txFactory.createTxUpdateDoc(space._class, space.space, space._id, { $push: { members: it } }))
+}
+
 async function createCollaboratorDoc (
   ctx: MeasureContext,
   tx: TxCreateDoc<Doc>,
@@ -1152,15 +1209,7 @@ async function createCollaboratorDoc (
   const collaborators = await ctx.with('get-collaborators', {}, (ctx) => getDocCollaborators(ctx, doc, mixin, control))
   const mixinTx = getMixinTx(tx, control, collaborators)
 
-  const notificationTxes = await ctx.with('create-collabdocinfo', {}, (ctx) =>
-    createCollabDocInfo(ctx, collaborators as Ref<PersonAccount>[], control, tx, doc, activityMessage, {
-      isOwn: true,
-      isSpace: false,
-      shouldUpdateTimestamp: true
-    })
-  )
   res.push(mixinTx)
-  res.push(...notificationTxes)
 
   res.push(
     ...(await ctx.with('get-space-collabtxes', {}, (ctx) =>
@@ -1168,6 +1217,29 @@ async function createCollaboratorDoc (
     ))
   )
 
+  res.push(...(await pushCollaboratorsToPublicSpace(control, doc, collaborators, cache)))
+
+  const notificationTxes = await ctx.with('create-collabdocinfo', {}, (ctx) =>
+    createCollabDocInfo(
+      ctx,
+      res,
+      collaborators as Ref<PersonAccount>[],
+      control,
+      tx,
+      doc,
+      activityMessage,
+      {
+        isOwn: true,
+        isSpace: false,
+        shouldUpdateTimestamp: true
+      },
+      [],
+      cache
+    )
+  )
+
+  res.push(...notificationTxes)
+
   return res
 }
 
@@ -1176,7 +1248,8 @@ async function updateCollaboratorsMixin (
   tx: TxMixin<Doc, Collaborators>,
   control: TriggerControl,
   activityMessages: ActivityMessage[],
-  originTx: TxCUD<Doc>
+  originTx: TxCUD<Doc>,
+  cache: Map<Ref<Doc>, Doc>
 ): Promise<Tx[]> {
   const { hierarchy } = control
 
@@ -1232,6 +1305,13 @@ async function updateCollaboratorsMixin (
     }
 
     if (newCollabs.length > 0) {
+      const object = cache.get(tx.objectId) ?? (await control.findAll(ctx, tx.objectClass, { _id: tx.objectId }))[0]
+      if (object === undefined) return res
+      const space = await getObjectSpace(control, object, cache)
+
+      cache.set(object._id, object)
+      cache.set(space._id, space)
+
       const docNotifyContexts = await control.findAll(ctx, notification.class.DocNotifyContext, {
         user: { $in: newCollabs },
         objectId: tx.objectId
@@ -1245,6 +1325,15 @@ async function updateCollaboratorsMixin (
       for (const collab of newCollabs) {
         const target = toReceiverInfo(hierarchy, infos.get(collab))
         if (target === undefined) continue
+        if (space.private && !space.members.includes(target.account._id)) continue
+
+        if (!hierarchy.isDerived(space._class, core.class.SystemSpace) && !space.members.includes(target.account._id)) {
+          res.push(
+            control.txFactory.createTxUpdateDoc(space._class, space.space, space._id, {
+              $push: { members: target.account._id }
+            })
+          )
+        }
 
         for (const message of activityMessages) {
           await pushActivityInboxNotifications(
@@ -1309,11 +1398,22 @@ async function collectionCollabDoc (
 
   res = res.concat(
     await ctx.with('create-collab-doc-info', {}, (ctx) =>
-      createCollabDocInfo(ctx, collaborators as Ref<PersonAccount>[], control, tx, doc, activityMessages, {
-        isOwn: false,
-        isSpace: false,
-        shouldUpdateTimestamp: true
-      })
+      createCollabDocInfo(
+        ctx,
+        res,
+        collaborators as Ref<PersonAccount>[],
+        control,
+        tx,
+        doc,
+        activityMessages,
+        {
+          isOwn: false,
+          isSpace: false,
+          shouldUpdateTimestamp: true
+        },
+        [],
+        cache
+      )
     )
   )
 
@@ -1446,7 +1546,6 @@ async function updateCollaboratorDoc (
   ctx: MeasureContext,
   tx: TxUpdateDoc<Doc> | TxMixin<Doc, Doc>,
   control: TriggerControl,
-  originTx: TxCUD<Doc>,
   activityMessages: ActivityMessage[],
   cache: Map<Ref<Doc>, Doc>
 ): Promise<Tx[]> {
@@ -1479,13 +1578,15 @@ async function updateCollaboratorDoc (
       await ctx.with('create-collab-docinfo', {}, (ctx) =>
         createCollabDocInfo(
           ctx,
+          res,
           collabsInfo.result as Ref<PersonAccount>[],
           control,
           tx,
           doc,
           activityMessages,
           params,
-          collabsInfo.removed as Ref<PersonAccount>[]
+          collabsInfo.removed as Ref<PersonAccount>[],
+          cache
         )
       )
     )
@@ -1495,7 +1596,18 @@ async function updateCollaboratorDoc (
     )
     res.push(getMixinTx(tx, control, collaborators))
     res = res.concat(
-      await createCollabDocInfo(ctx, collaborators as Ref<PersonAccount>[], control, tx, doc, activityMessages, params)
+      await createCollabDocInfo(
+        ctx,
+        res,
+        collaborators as Ref<PersonAccount>[],
+        control,
+        tx,
+        doc,
+        activityMessages,
+        params,
+        [],
+        cache
+      )
     )
   }
 
@@ -1737,11 +1849,18 @@ export async function createCollaboratorNotifications (
     case core.class.TxUpdateDoc:
     case core.class.TxMixin: {
       let res = await ctx.with('updateCollaboratorDoc', {}, (ctx) =>
-        updateCollaboratorDoc(ctx, tx as TxUpdateDoc<Doc>, control, originTx ?? tx, activityMessages, cache)
+        updateCollaboratorDoc(ctx, tx as TxUpdateDoc<Doc>, control, activityMessages, cache)
       )
       res = res.concat(
         await ctx.with('updateCollaboratorMixin', {}, (ctx) =>
-          updateCollaboratorsMixin(ctx, tx as TxMixin<Doc, Collaborators>, control, activityMessages, originTx ?? tx)
+          updateCollaboratorsMixin(
+            ctx,
+            tx as TxMixin<Doc, Collaborators>,
+            control,
+            activityMessages,
+            originTx ?? tx,
+            cache
+          )
         )
       )
       return await applyUserTxes(ctx, control, res)
diff --git a/server-plugins/notification-resources/src/utils.ts b/server-plugins/notification-resources/src/utils.ts
index e95a5733a0..271692f478 100644
--- a/server-plugins/notification-resources/src/utils.ts
+++ b/server-plugins/notification-resources/src/utils.ts
@@ -654,3 +654,10 @@ export async function getNotificationProviderControl (
   }
   return new NotificationProviderControl(providersSettings, typesSettings)
 }
+
+export async function getObjectSpace (control: TriggerControl, doc: Doc, cache: Map<Ref<Doc>, Doc>): Promise<Space> {
+  return control.hierarchy.isDerived(doc._class, core.class.Space)
+    ? (doc as Space)
+    : (cache.get(doc.space) as Space) ??
+        (await control.findAll<Space>(control.ctx, core.class.Space, { _id: doc.space }, { limit: 1 }))[0]
+}

From 1fceb1822a2a16f55405f10ef15459b71a9e4ca6 Mon Sep 17 00:00:00 2001
From: Alexander Platov <alexander.platov@hardcoreeng.com>
Date: Tue, 21 Jan 2025 03:34:29 +0300
Subject: [PATCH 09/21] Changed the file type to save for Cropper (#7738)

---
 plugins/image-cropper-resources/src/components/Cropper.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/image-cropper-resources/src/components/Cropper.svelte b/plugins/image-cropper-resources/src/components/Cropper.svelte
index 5391914eeb..f673bb66e1 100644
--- a/plugins/image-cropper-resources/src/components/Cropper.svelte
+++ b/plugins/image-cropper-resources/src/components/Cropper.svelte
@@ -37,7 +37,7 @@
 
     ctx.drawImage(bitmap, 0, 0)
 
-    imgRef.src = canvas.toDataURL('image/jpeg', 1.0)
+    imgRef.src = canvas.toDataURL('image/png', 1.0)
     imgRef.width = bitmap.width
     imgRef.height = bitmap.height
 
@@ -80,7 +80,7 @@
         (blob) => {
           resolve(blob)
         },
-        'image/jpeg',
+        'image/png',
         0.95
       )
     })

From b08af3d9959068e2658f62c60ee753889f147044 Mon Sep 17 00:00:00 2001
From: Alexander Onnikov <aonnikov@hardcoreeng.com>
Date: Tue, 21 Jan 2025 14:04:55 +0700
Subject: [PATCH 10/21] EQMS-1414 Fix pod print issues (#7739)

Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com>
---
 dev/base-image/print.Dockerfile                          | 4 ++++
 packages/presentation/src/components/PDFViewer.svelte    | 2 +-
 plugins/print-resources/package.json                     | 1 +
 plugins/print-resources/src/components/PrintToPDF.svelte | 3 +++
 services/print/pod-print/Dockerfile                      | 4 ++++
 5 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/dev/base-image/print.Dockerfile b/dev/base-image/print.Dockerfile
index d077652b13..95deef3851 100644
--- a/dev/base-image/print.Dockerfile
+++ b/dev/base-image/print.Dockerfile
@@ -1,5 +1,9 @@
 FROM hardcoreeng/base
 
+# Chromium hangs when usging LD_PRELOAD and MALLOC_CONF
+ENV LD_PRELOAD=
+ENV MALLOC_CONF=
+
 # We don't need the standalone Chromium
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
 # Set executable path for puppeteer
diff --git a/packages/presentation/src/components/PDFViewer.svelte b/packages/presentation/src/components/PDFViewer.svelte
index fcfe753c57..450ae4ae0b 100644
--- a/packages/presentation/src/components/PDFViewer.svelte
+++ b/packages/presentation/src/components/PDFViewer.svelte
@@ -103,7 +103,7 @@
 
   {#await srcRef then src}
     {#if !isLoading}
-      {#if src === ''}
+      {#if src === '' || src === undefined}
         <div class="centered">
           <Label label={presentation.string.FailedToPreview} />
         </div>
diff --git a/plugins/print-resources/package.json b/plugins/print-resources/package.json
index b126ffffbe..80d3f8af39 100644
--- a/plugins/print-resources/package.json
+++ b/plugins/print-resources/package.json
@@ -38,6 +38,7 @@
   },
   "dependencies": {
     "svelte": "^4.2.19",
+    "@hcengineering/analytics": "^0.6.0",
     "@hcengineering/platform": "^0.6.11",
     "@hcengineering/core": "^0.6.32",
     "@hcengineering/presentation": "^0.6.3",
diff --git a/plugins/print-resources/src/components/PrintToPDF.svelte b/plugins/print-resources/src/components/PrintToPDF.svelte
index 1fb710b552..ff4b331557 100644
--- a/plugins/print-resources/src/components/PrintToPDF.svelte
+++ b/plugins/print-resources/src/components/PrintToPDF.svelte
@@ -4,6 +4,7 @@
 -->
 
 <script lang="ts">
+  import { Analytics } from '@hcengineering/analytics'
   import { Doc, type Blob, type Ref } from '@hcengineering/core'
   import presentation, { PDFViewer, createQuery, getClient } from '@hcengineering/presentation'
   import guest, { PublicLink, createPublicLink } from '@hcengineering/guest'
@@ -55,6 +56,7 @@
               isLoading = false
             },
             (err) => {
+              Analytics.handleError(err)
               console.error(err)
               isLoading = false
             }
@@ -65,6 +67,7 @@
         }
       },
       (err) => {
+        Analytics.handleError(err)
         console.error(err)
         isLoading = false
       }
diff --git a/services/print/pod-print/Dockerfile b/services/print/pod-print/Dockerfile
index 47adea67a1..716908ea3b 100644
--- a/services/print/pod-print/Dockerfile
+++ b/services/print/pod-print/Dockerfile
@@ -3,4 +3,8 @@ FROM hardcoreeng/print-base:v20250113a
 WORKDIR /usr/src/app
 COPY bundle/bundle.js ./
 
+# Chromium hangs when usging LD_PRELOAD and MALLOC_CONF
+ENV LD_PRELOAD=
+ENV MALLOC_CONF=
+
 CMD [ "dumb-init", "node", "bundle.js" ]

From f91c0a4097bebeb1927e7fd78d9f42628d8d3115 Mon Sep 17 00:00:00 2001
From: Alexander Onnikov <aonnikov@hardcoreeng.com>
Date: Tue, 21 Jan 2025 16:49:31 +0700
Subject: [PATCH 11/21] fix: increase collaborator body parser limit (#7744)

Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com>
---
 server/collaborator/src/server.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/collaborator/src/server.ts b/server/collaborator/src/server.ts
index e3afeefbc2..de896a2e91 100644
--- a/server/collaborator/src/server.ts
+++ b/server/collaborator/src/server.ts
@@ -48,7 +48,8 @@ export async function start (ctx: MeasureContext, config: Config, storageAdapter
 
   const app = express()
   app.use(cors())
-  app.use(bp.json())
+  app.use(express.json({ limit: '10mb' }))
+  app.use(bp.json({ limit: '10mb' }))
 
   const extensionsCtx = ctx.newChild('extensions', {})
   const transformer = new MarkupTransformer()

From 9ea18b0c50f9143dfd8244d5dd31fc001a4d9654 Mon Sep 17 00:00:00 2001
From: Alexander Onnikov <aonnikov@hardcoreeng.com>
Date: Tue, 21 Jan 2025 16:49:57 +0700
Subject: [PATCH 12/21] UBERF-9204 Fix wiki documents links resolving (#7743)

Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com>
---
 plugins/document-resources/src/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/document-resources/src/utils.ts b/plugins/document-resources/src/utils.ts
index a9071f2a1b..293f904c90 100644
--- a/plugins/document-resources/src/utils.ts
+++ b/plugins/document-resources/src/utils.ts
@@ -126,7 +126,7 @@ export async function generateLocation (loc: Location, id: Ref<Document>): Promi
       fragment: getPanelURI(document.component.EditDoc, doc._id, doc._class, 'content')
     },
     defaultLocation: {
-      path: [appComponent, workspace],
+      path: [appComponent, workspace, documentId],
       fragment: getPanelURI(document.component.EditDoc, doc._id, doc._class, 'content')
     }
   }

From f4c3eef699431f9bee8058ba183e7f1d73265a05 Mon Sep 17 00:00:00 2001
From: Andrey Sobolev <haiodo@users.noreply.github.com>
Date: Tue, 21 Jan 2025 18:54:17 +0700
Subject: [PATCH 13/21] UBERF-9212: Fix for Array variable handling (#7745)

---
 server/postgres/src/storage.ts | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/server/postgres/src/storage.ts b/server/postgres/src/storage.ts
index 2af395a2bd..09f3915608 100644
--- a/server/postgres/src/storage.ts
+++ b/server/postgres/src/storage.ts
@@ -352,13 +352,12 @@ class ValuesVariables {
     )
   }
 
-  addArrayI (value: any[], type: string = ''): string[] {
+  addArrayI (value: any[], type: string = ''): string {
     const vals = value.filter((it) => it != null)
-    const vv: string[] = []
-    vals.forEach((it) => {
-      vv.push(this.add(it, type))
-    })
-    return vv
+    if (vals.length === 0) {
+      return "array['NULL']"
+    }
+    return this.add(vals, type)
   }
 
   injectVars (sql: string): string {
@@ -716,11 +715,11 @@ abstract class PostgresAdapterBase implements DbAdapter {
             }
           })) as FindResult<T>
         } catch (err) {
-          ctx.error('Error in findAll', { err, sql: vars.injectVars(fquery) })
+          ctx.error('Error in findAll', { err, sql: fquery, sqlFull: vars.injectVars(fquery) })
           throw err
         }
       },
-      () => ({ fquery, vars: vars.getValues() })
+      () => ({ query, psql: fquery, sql: vars.injectVars(fquery) })
     )
   }
 
@@ -1303,14 +1302,14 @@ abstract class PostgresAdapterBase implements DbAdapter {
                 break
               case 'array':
                 {
-                  const vv = vars.addArrayI(val)
-                  res.push(`${tkey} && array[${vv.length > 0 ? vv.join(', ') : 'NULL'}]`)
+                  const vv = vars.addArrayI(val, inferType(val))
+                  res.push(`${tkey} && ${vv}`)
                 }
                 break
               case 'dataArray':
                 {
-                  const vv = vars.addArrayI(val)
-                  res.push(`${tkey} ?| array[${vv.length > 0 ? vv.join(', ') : 'NULL'}]`)
+                  const vv = vars.addArrayI(val, inferType(val))
+                  res.push(`${tkey} ?| ${vv}`)
                 }
                 break
             }

From 0534c2b90e04dfec1f2979710ae91430a1374623 Mon Sep 17 00:00:00 2001
From: Alexander Onnikov <aonnikov@hardcoreeng.com>
Date: Tue, 21 Jan 2025 20:45:07 +0700
Subject: [PATCH 14/21] fix: properly handle stream errors in datalake
 migration tool (#7747)

---
 dev/tool/src/index.ts         |  9 +++++-
 dev/tool/src/storage.ts       | 55 +++++++++++++++++++++++++++++++----
 server/datalake/src/client.ts |  4 +--
 3 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/dev/tool/src/index.ts b/dev/tool/src/index.ts
index 97b17e971b..4095fac8cd 100644
--- a/dev/tool/src/index.ts
+++ b/dev/tool/src/index.ts
@@ -1197,12 +1197,14 @@ export function devTool (
     .description('copy files from s3 to datalake')
     .option('-w, --workspace <workspace>', 'Selected workspace only', '')
     .option('-c, --concurrency <concurrency>', 'Number of files being processed concurrently', '10')
+    .option('-s, --skip <number>', 'Number of workspaces to skip', '0')
     .option('-e, --existing', 'Copy existing blobs', false)
-    .action(async (cmd: { workspace: string, concurrency: string, existing: boolean }) => {
+    .action(async (cmd: { workspace: string, concurrency: string, existing: boolean, skip: string }) => {
       const params = {
         concurrency: parseInt(cmd.concurrency),
         existing: cmd.existing
       }
+      const skip = parseInt(cmd.skip)
 
       const storageConfig = storageConfigFromEnv(process.env.STORAGE)
 
@@ -1245,6 +1247,11 @@ export function devTool (
       let index = 0
       for (const workspace of workspaces) {
         index++
+        if (index <= skip) {
+          toolCtx.info('processing workspace', { workspace: workspace.workspace, index, count })
+          continue
+        }
+
         toolCtx.info('processing workspace', {
           workspace: workspace.workspace,
           index,
diff --git a/dev/tool/src/storage.ts b/dev/tool/src/storage.ts
index e4afd9bb51..9d550abdbc 100644
--- a/dev/tool/src/storage.ts
+++ b/dev/tool/src/storage.ts
@@ -23,6 +23,7 @@ import {
   RateLimiter
 } from '@hcengineering/core'
 import { type DatalakeClient } from '@hcengineering/datalake'
+import { type UploadObjectParams } from '@hcengineering/datalake/types/client'
 import { DOMAIN_ATTACHMENT } from '@hcengineering/model-attachment'
 import { type S3Config, type S3Service } from '@hcengineering/s3'
 import {
@@ -32,7 +33,7 @@ import {
   type UploadedObjectInfo
 } from '@hcengineering/server-core'
 import { type Db } from 'mongodb'
-import { PassThrough } from 'stream'
+import { PassThrough, type Readable } from 'stream'
 
 export interface MoveFilesParams {
   concurrency: number
@@ -400,14 +401,11 @@ export async function copyBlobToDatalake (
         type: stat.contentType,
         size: stat.size
       }
+
       const readable = await adapter.get(ctx, workspaceId, objectName)
       try {
-        readable.on('end', () => {
-          readable.destroy()
-        })
         console.log('uploading huge blob', objectName, Math.round(stat.size / 1024 / 1024), 'MB')
-        const stream = readable.pipe(new PassThrough())
-        await datalake.uploadMultipart(ctx, workspaceId, objectName, stream, metadata)
+        await uploadMultipart(ctx, datalake, workspaceId, objectName, readable, metadata)
         console.log('done', objectName)
       } finally {
         readable.destroy()
@@ -416,6 +414,51 @@ export async function copyBlobToDatalake (
   }
 }
 
+function uploadMultipart (
+  ctx: MeasureContext,
+  datalake: DatalakeClient,
+  workspaceId: WorkspaceId,
+  objectName: string,
+  stream: Readable,
+  metadata: UploadObjectParams
+): Promise<void> {
+  return new Promise<void>((resolve, reject) => {
+    const passthrough = new PassThrough()
+
+    const cleanup = (): void => {
+      stream.removeAllListeners()
+      passthrough.removeAllListeners()
+      stream.destroy()
+      passthrough.destroy()
+    }
+
+    stream.on('error', (err) => {
+      ctx.error('error reading blob', { err })
+      cleanup()
+      reject(err)
+    })
+    passthrough.on('error', (err) => {
+      ctx.error('error reading blob', { err })
+      cleanup()
+      reject(err)
+    })
+
+    stream.pipe(passthrough)
+
+    datalake
+      .uploadMultipart(ctx, workspaceId, objectName, passthrough, metadata)
+      .then(() => {
+        cleanup()
+        resolve()
+      })
+      .catch((err) => {
+        ctx.error('failed to upload blob', { err })
+        cleanup()
+        reject(err)
+      })
+  })
+}
+
 export function formatSize (size: number): string {
   const units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']
   const pow = size === 0 ? 0 : Math.floor(Math.log(size) / Math.log(1024))
diff --git a/server/datalake/src/client.ts b/server/datalake/src/client.ts
index 553aaaeeb6..8a27e6eb66 100644
--- a/server/datalake/src/client.ts
+++ b/server/datalake/src/client.ts
@@ -466,8 +466,8 @@ export class DatalakeClient {
       const response = await fetchSafe(ctx, url, { method: 'POST', body })
       return (await response.json()) as MultipartUploadPart
     } catch (err: any) {
-      ctx.error('failed to abort multipart upload', { workspace, objectName, err })
-      throw new DatalakeError('Failed to abort multipart upload')
+      ctx.error('failed to upload multipart part', { workspace, objectName, err })
+      throw new DatalakeError('Failed to upload multipart part')
     }
   }
 

From 4ec92d94b784d67d6b577049f0618e3cfa80699e Mon Sep 17 00:00:00 2001
From: Andrey Sobolev <haiodo@users.noreply.github.com>
Date: Tue, 21 Jan 2025 23:49:45 +0700
Subject: [PATCH 15/21] UBERF-8968: Get rid of prosemirror in transactor
 (#7746)

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
---
 common/config/rush/pnpm-lock.yaml             | 210 +++++----
 packages/platform/package.json                |   2 +-
 packages/text-core/.eslintrc.js               |   7 +
 packages/text-core/config/rig.json            |   4 +
 packages/text-core/jest.config.js             |   7 +
 packages/text-core/package.json               |  49 +++
 packages/text-core/src/index.ts               |  20 +
 .../src/markup/__tests__/traverse.test.ts     |   0
 .../{text => text-core}/src/markup/dsl.ts     |   0
 .../{text => text-core}/src/markup/model.ts   |   0
 .../src/markup/reference.ts                   |   0
 .../src/markup/traverse.ts                    |   0
 packages/text-core/src/markup/utils.ts        | 402 ++++++++++++++++++
 packages/text-core/tsconfig.json              |  10 +
 packages/text/package.json                    |   1 +
 packages/text/src/index.ts                    |   8 +-
 packages/text/src/markdown/index.ts           |   3 +-
 packages/text/src/markdown/marks.ts           |   2 +-
 packages/text/src/markdown/node.ts            |   2 +-
 packages/text/src/markdown/parser.ts          |   4 +-
 packages/text/src/markdown/serializer.ts      |   4 +-
 .../text/src/markup/__tests__/dsl.test.ts     |  12 +-
 .../text/src/markup/__tests__/utils.test.ts   |  24 +-
 packages/text/src/markup/utils.ts             | 174 +-------
 plugins/contact-resources/package.json        |   6 +-
 .../src/components/SelectAvatarPopup.svelte   |   8 +-
 plugins/contact/package.json                  |   4 +-
 plugins/contact/src/utils.ts                  |   8 -
 pods/server/src/__start.ts                    |   6 +-
 rush.json                                     |   5 +
 .../activity-resources/package.json           |   2 +-
 .../src/__tests__/references.test.ts          |   2 +-
 .../activity-resources/src/references.ts      |   2 +-
 server-plugins/chunter-resources/package.json |   2 +-
 server-plugins/chunter-resources/src/index.ts |   2 +-
 .../package.json                              |   1 -
 server-plugins/gmail-resources/package.json   |   3 +-
 server-plugins/gmail-resources/src/index.ts   |   4 +-
 .../notification-resources/package.json       |   8 +-
 .../notification-resources/src/index.ts       |  45 +-
 server-plugins/notification/src/index.ts      |   3 +-
 .../telegram-resources/package.json           |   2 +-
 .../telegram-resources/src/index.ts           |   2 +-
 server-plugins/time-resources/package.json    |   2 +-
 server-plugins/time-resources/src/index.ts    |   2 +-
 server-plugins/tracker-resources/package.json |   2 +-
 server-plugins/tracker-resources/src/index.ts |   2 +-
 server/account/package.json                   |   6 +-
 server/account/src/operations.ts              |   5 +-
 server/server/src/starter.ts                  |  12 +-
 services/ses/pod-ses/package.json             |   6 +-
 services/ses/pod-ses/src/config.ts            |  18 +-
 services/ses/pod-ses/src/main.ts              |  59 +++
 workers/transactor/calc.sh                    |   4 +-
 workers/transactor/package.json               |   5 +
 workers/transactor/src/transactor.ts          |  22 +-
 workers/transactor/worker-configuration.d.ts  |  12 +
 workers/transactor/wrangler.toml              |  12 +
 58 files changed, 891 insertions(+), 338 deletions(-)
 create mode 100644 packages/text-core/.eslintrc.js
 create mode 100644 packages/text-core/config/rig.json
 create mode 100644 packages/text-core/jest.config.js
 create mode 100644 packages/text-core/package.json
 create mode 100644 packages/text-core/src/index.ts
 rename packages/{text => text-core}/src/markup/__tests__/traverse.test.ts (100%)
 rename packages/{text => text-core}/src/markup/dsl.ts (100%)
 rename packages/{text => text-core}/src/markup/model.ts (100%)
 rename packages/{text => text-core}/src/markup/reference.ts (100%)
 rename packages/{text => text-core}/src/markup/traverse.ts (100%)
 create mode 100644 packages/text-core/src/markup/utils.ts
 create mode 100644 packages/text-core/tsconfig.json

diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index 850616003e..783ed45606 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -1069,6 +1069,9 @@ importers:
       '@rush-temp/text':
         specifier: file:./projects/text.tgz
         version: file:projects/text.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@types/node@20.11.19)(babel-jest@29.7.0(@babel/core@7.23.9))(bufferutil@4.0.8)(esbuild@0.24.2)(prosemirror-inputrules@1.4.0)(prosemirror-model@1.22.3)(prosemirror-state@1.4.3)(prosemirror-view@1.34.2)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3))(utf-8-validate@6.0.4)
+      '@rush-temp/text-core':
+        specifier: file:./projects/text-core.tgz
+        version: file:projects/text-core.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@types/node@20.11.19)(babel-jest@29.7.0(@babel/core@7.23.9))(bufferutil@4.0.8)(esbuild@0.24.2)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3))(utf-8-validate@6.0.4)
       '@rush-temp/text-editor':
         specifier: file:./projects/text-editor.tgz
         version: file:projects/text-editor.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@types/node@20.11.19)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3))
@@ -1273,9 +1276,6 @@ importers:
       '@types/cors':
         specifier: ^2.8.12
         version: 2.8.17
-      '@types/crypto-js':
-        specifier: ^4.1.1
-        version: 4.2.2
       '@types/csvtojson':
         specifier: ^2.0.0
         version: 2.0.3
@@ -1394,8 +1394,8 @@ importers:
         specifier: ^8.3.1
         version: 8.3.4
       '@types/web-push':
-        specifier: ~3.6.3
-        version: 3.6.3
+        specifier: ^3.6.4
+        version: 3.6.4
       '@types/ws':
         specifier: ^8.5.11
         version: 8.5.11
@@ -1490,7 +1490,7 @@ importers:
         specifier: ^3.1.5
         version: 3.1.8(encoding@0.1.13)
       crypto-js:
-        specifier: ^4.1.1
+        specifier: ^4.2.0
         version: 4.2.0
       css-loader:
         specifier: ^5.2.1
@@ -1667,8 +1667,8 @@ importers:
         specifier: ^1.1.1
         version: 1.1.1
       intl-messageformat:
-        specifier: ^9.7.1
-        version: 9.13.0
+        specifier: ^10.7.14
+        version: 10.7.14
       itty-router:
         specifier: ^5.0.18
         version: 5.0.18
@@ -1729,6 +1729,9 @@ importers:
       markdown-it:
         specifier: ^14.0.0
         version: 14.0.0
+      md5.js:
+        specifier: ^1.3.5
+        version: 1.3.5
       mermaid:
         specifier: ~11.4.1
         version: 11.4.1
@@ -1928,7 +1931,7 @@ importers:
         specifier: ^8.3.2
         version: 8.3.2
       web-push:
-        specifier: ~3.6.7
+        specifier: ^3.6.7
         version: 3.6.7
       webpack:
         specifier: ^5.97.1
@@ -2928,20 +2931,20 @@ packages:
     resolution: {integrity: sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==}
     engines: {node: '>=14'}
 
-  '@formatjs/ecma402-abstract@1.11.4':
-    resolution: {integrity: sha512-EBikYFp2JCdIfGEb5G9dyCkTGDmC57KSHhRQOC3aYxoPWVZvfWCDjZwkGYHN7Lis/fmuWl906bnNTJifDQ3sXw==}
+  '@formatjs/ecma402-abstract@2.3.2':
+    resolution: {integrity: sha512-6sE5nyvDloULiyOMbOTJEEgWL32w+VHkZQs8S02Lnn8Y/O5aQhjOEXwWzvR7SsBE/exxlSpY2EsWZgqHbtLatg==}
 
-  '@formatjs/fast-memoize@1.2.1':
-    resolution: {integrity: sha512-Rg0e76nomkz3vF9IPlKeV+Qynok0r7YZjL6syLz4/urSg0IbjPZCB/iYUMNsYA643gh4mgrX3T7KEIFIxJBQeg==}
+  '@formatjs/fast-memoize@2.2.6':
+    resolution: {integrity: sha512-luIXeE2LJbQnnzotY1f2U2m7xuQNj2DA8Vq4ce1BY9ebRZaoPB1+8eZ6nXpLzsxuW5spQxr7LdCg+CApZwkqkw==}
 
-  '@formatjs/icu-messageformat-parser@2.1.0':
-    resolution: {integrity: sha512-Qxv/lmCN6hKpBSss2uQ8IROVnta2r9jd3ymUEIjm2UyIkUCHVcbUVRGL/KS/wv7876edvsPe+hjHVJ4z8YuVaw==}
+  '@formatjs/icu-messageformat-parser@2.11.0':
+    resolution: {integrity: sha512-Hp81uTjjdTk3FLh/dggU5NK7EIsVWc5/ZDWrIldmf2rBuPejuZ13CZ/wpVE2SToyi4EiroPTQ1XJcJuZFIxTtw==}
 
-  '@formatjs/icu-skeleton-parser@1.3.6':
-    resolution: {integrity: sha512-I96mOxvml/YLrwU2Txnd4klA7V8fRhb6JG/4hm3VMNmeJo1F03IpV2L3wWt7EweqNLES59SZ4d6hVOPCSf80Bg==}
+  '@formatjs/icu-skeleton-parser@1.8.12':
+    resolution: {integrity: sha512-QRAY2jC1BomFQHYDMcZtClqHR55EEnB96V7Xbk/UiBodsuFc5kujybzt87+qj1KqmJozFhk6n4KiT1HKwAkcfg==}
 
-  '@formatjs/intl-localematcher@0.2.25':
-    resolution: {integrity: sha512-YmLcX70BxoSopLFdLr1Ds99NdlTI2oWoLbaUW2M406lxOIPzE1KQhRz2fPUkq34xVZQaihCoU29h0KK7An3bhA==}
+  '@formatjs/intl-localematcher@0.5.10':
+    resolution: {integrity: sha512-af3qATX+m4Rnd9+wHcjJ4w2ijq+rAVP3CCinJQvFv1kgSu1W6jypUmvleJxcewdxmutM8dmIRZFxO/IQBZmP2Q==}
 
   '@gar/promisify@1.1.3':
     resolution: {integrity: sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==}
@@ -3808,7 +3811,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/account@file:projects/account.tgz':
-    resolution: {integrity: sha512-aFUxA1twR0m+7sDVFXyKoeVQtVLMrr973LpLK6LHrRa+PD010X6+AyoOkkyVJKFN0Q6zu2Oqz88PsEt50Z2Mjg==, tarball: file:projects/account.tgz}
+    resolution: {integrity: sha512-xWdmeIZiSKL5eyvVHNUEnn/GXGsaNkayjxoDW+ydFB1GwUWExvSTA7OOs9mfG+IwLNU08GNKNGBYGM3XKZ2PsA==, tarball: file:projects/account.tgz}
     version: 0.0.0
 
   '@rush-temp/activity-assets@file:projects/activity-assets.tgz':
@@ -3936,7 +3939,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/cloud-transactor@file:projects/cloud-transactor.tgz':
-    resolution: {integrity: sha512-sz4uAEfFOZfE7TOae+sv+RWlxunC4WlsQ7GTOX+kE+KDTNJK/r3d7+yIR/O3iDd4nsbLO/Al/9Z+wMZDXsmJcw==, tarball: file:projects/cloud-transactor.tgz}
+    resolution: {integrity: sha512-RmuejZDmaNRcHOCurZBKIHOgqyfTwUNtJdhzJEANVw3XAbuapCjlaCwmtK5bad2D6S1+VrHrXoF4vw4FamxZkw==, tarball: file:projects/cloud-transactor.tgz}
     version: 0.0.0
 
   '@rush-temp/collaboration@file:projects/collaboration.tgz':
@@ -3956,11 +3959,11 @@ packages:
     version: 0.0.0
 
   '@rush-temp/contact-resources@file:projects/contact-resources.tgz':
-    resolution: {integrity: sha512-NwGEZHpomoqLYe2i/Z3Wm9xLB1Cl7okFToLBn51JWhFebje+20w47PFde2tUX77f5bfYuLJ0ykZbKnfDbFz9TA==, tarball: file:projects/contact-resources.tgz}
+    resolution: {integrity: sha512-sOoou1UaCHSN/qYHhEiWyiPICxmqP2p+ACDAeVzhU8fuUa5tejlzuANOdiEYqz4c8+u/NhlCQHd7G7G5WjMPpg==, tarball: file:projects/contact-resources.tgz}
     version: 0.0.0
 
   '@rush-temp/contact@file:projects/contact.tgz':
-    resolution: {integrity: sha512-sjRtgKszoagGm79PFQKes/sfRMcddH1qEMG3/xKuRLKlVcVJJ56twJaCCUeXP+7MsXMH5eEcS3sNCIdtznuASg==, tarball: file:projects/contact.tgz}
+    resolution: {integrity: sha512-59CabCDtmhSMmziQMA8E7sB/xLjRibcfTjx/EuYh4trtpfOawQ6lVZSljJ3Fr3huHHg4A8A14L71MC4PgPSepQ==, tarball: file:projects/contact.tgz}
     version: 0.0.0
 
   '@rush-temp/controlled-documents-assets@file:projects/controlled-documents-assets.tgz':
@@ -4536,7 +4539,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/platform@file:projects/platform.tgz':
-    resolution: {integrity: sha512-GyVd1NUl00O73Bwq0b/KFXhAfrko5BnqcN9ak+WWmDjHqi4CsWUfYm6ol5B7rbC38dqXXD4yBad/iEgywLliXA==, tarball: file:projects/platform.tgz}
+    resolution: {integrity: sha512-BlslXnvEEebr3t7GEdTHD5HcoOTdez1j6Fb8Q6KctCunFjTeRtN5vtsutv2ZR+ChIGgZ5seZ6DOUFNM1MJf4ew==, tarball: file:projects/platform.tgz}
     version: 0.0.0
 
   '@rush-temp/pod-account@file:projects/pod-account.tgz':
@@ -4592,7 +4595,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/pod-ses@file:projects/pod-ses.tgz':
-    resolution: {integrity: sha512-P+HVwQR4SO6F4EXl5ReGR6hbng8CKsl4IK6Ww6u7yhNh1x7YGKzmV7UMRjSUc7qsNu4CzOhF7AYatCB602ANjA==, tarball: file:projects/pod-ses.tgz}
+    resolution: {integrity: sha512-gVCpGeUc+IsGfdCD84Sp+PcY21yRBkUhwfMUUC8VXcjf5MiayypLcc8pIGD2ufGGRJRAI3+clxIfiVc29ofBxw==, tarball: file:projects/pod-ses.tgz}
     version: 0.0.0
 
   '@rush-temp/pod-sign@file:projects/pod-sign.tgz':
@@ -4740,7 +4743,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/server-activity-resources@file:projects/server-activity-resources.tgz':
-    resolution: {integrity: sha512-+UU7f65uCYtxuk56pj1bJ2ZaE6YHxVubtTfbsrLa8ZAGUOvWjrxY37B8j8GfcgGioL6PESsB12uEZIvghnNNaQ==, tarball: file:projects/server-activity-resources.tgz}
+    resolution: {integrity: sha512-pzbXI3TbbMXYv/qVmx97uHJD8IOrI7glY8HsD1Np0PAGqzGpWBOm1j6oHKjO/WvfXPCvbmBRBvir22/+IdeXKA==, tarball: file:projects/server-activity-resources.tgz}
     version: 0.0.0
 
   '@rush-temp/server-activity@file:projects/server-activity.tgz':
@@ -4784,7 +4787,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/server-chunter-resources@file:projects/server-chunter-resources.tgz':
-    resolution: {integrity: sha512-Kpp8RTEJ+z5d8Rq7HbOhui8ZyV8OvKEXVkAXT80Ju/qhVnZ5Mnw/jk33dgwur1NPVjCWOK2SPECHf+eqzwXpBg==, tarball: file:projects/server-chunter-resources.tgz}
+    resolution: {integrity: sha512-anzs0C7AXicSpf9F+jjqdokc3cZunw5O8gC0095fQmEoOW94OmvTyboGrx8iK3i+iYam4Z6Bkt60rXRo3JvXZQ==, tarball: file:projects/server-chunter-resources.tgz}
     version: 0.0.0
 
   '@rush-temp/server-chunter@file:projects/server-chunter.tgz':
@@ -4812,7 +4815,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/server-controlled-documents-resources@file:projects/server-controlled-documents-resources.tgz':
-    resolution: {integrity: sha512-g27+rhbyGhRdYikNstWia5wPng1EUiDp4DoEu51KVFrE4MOeaEXvB85Zb/4Jxg1RL4H7P6o7VRABeVqv6fkqsg==, tarball: file:projects/server-controlled-documents-resources.tgz}
+    resolution: {integrity: sha512-mYK9xbNtII74MyRDJjutIBvUvdXfVeGwaixq9uRTVlqQsmb8oYvqVsTLLfmjL/e/eb1nmUPtnWh7sogkGYU/yA==, tarball: file:projects/server-controlled-documents-resources.tgz}
     version: 0.0.0
 
   '@rush-temp/server-controlled-documents@file:projects/server-controlled-documents.tgz':
@@ -4860,7 +4863,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/server-gmail-resources@file:projects/server-gmail-resources.tgz':
-    resolution: {integrity: sha512-V9M3+rquV4MPbPtmwWPdekguzA5WKJRDvU7xtpYKQSJ7J7hkLPKNah4GtSjin0opg6lTgtoAJUQaYLKheeCCbA==, tarball: file:projects/server-gmail-resources.tgz}
+    resolution: {integrity: sha512-B+iAjGb/dbs1BhVc2MmYZxv2LrHQk/IH3UazglCC7v3Nu5x6ny4oMPCHXqv7W7MMVjIzqt60Wsw7spkvyS1CSA==, tarball: file:projects/server-gmail-resources.tgz}
     version: 0.0.0
 
   '@rush-temp/server-gmail@file:projects/server-gmail.tgz':
@@ -4912,7 +4915,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/server-notification-resources@file:projects/server-notification-resources.tgz':
-    resolution: {integrity: sha512-DhxiRHwKgwqkX4WP2ZmqGL7fHs0Ev3rtxHT/uylk5SPCPbKmBe20xyEzheSahP0Vm6kIS9XerGQuxGrI31eVBw==, tarball: file:projects/server-notification-resources.tgz}
+    resolution: {integrity: sha512-sLf+6eAqeGkx+28mefySh7RB9mMnEh5Cuw/Q036PALbzj/1tihPIIxlst9kMZAYgGr7WRaZGDGK4Pq2yxfCrPQ==, tarball: file:projects/server-notification-resources.tgz}
     version: 0.0.0
 
   '@rush-temp/server-notification@file:projects/server-notification.tgz':
@@ -4972,7 +4975,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/server-telegram-resources@file:projects/server-telegram-resources.tgz':
-    resolution: {integrity: sha512-VsEVxoPM/hyelQa9/rQFzo+vbS8ixxU4RvVWdM0ae9HJuaEyszX4y9GheG/SDMa0NzCtyOOLf9KqL3ohGpkWRg==, tarball: file:projects/server-telegram-resources.tgz}
+    resolution: {integrity: sha512-2zGK/gI0mG8ZvEUYDK0lt8m525blawYUmk64vMfYF0K7hkOmKaE+aSECh6UJozxuxURpyNNzi/9R0SNnMyfXKw==, tarball: file:projects/server-telegram-resources.tgz}
     version: 0.0.0
 
   '@rush-temp/server-telegram@file:projects/server-telegram.tgz':
@@ -4984,7 +4987,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/server-time-resources@file:projects/server-time-resources.tgz':
-    resolution: {integrity: sha512-WePYLAz/QHfFL+jMa/ZE6JQIvNYK4tGBs4ur6UBG3inJigtt9p7AR4PO+nr7dtGZqG8RT0T0TrGREcdV7pX5Gw==, tarball: file:projects/server-time-resources.tgz}
+    resolution: {integrity: sha512-N9YLO1krTVoyAYV78E8sW2mDjSuJ/wHD9EHPAZO6AHxtoFmzlMPJaLprjGf7bWIemiGyAZKcAFhmpu0RSlaYGA==, tarball: file:projects/server-time-resources.tgz}
     version: 0.0.0
 
   '@rush-temp/server-time@file:projects/server-time.tgz':
@@ -5000,7 +5003,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/server-tracker-resources@file:projects/server-tracker-resources.tgz':
-    resolution: {integrity: sha512-VmLhXIzNRo1VeABIkcyYrRK7P2+OtDpXpYCrutGgmUqT+ioPHxaefntsS+wzItpblY78u4DJYSIkfOhtQXCTtg==, tarball: file:projects/server-tracker-resources.tgz}
+    resolution: {integrity: sha512-Npz6QfpPLP18rNxIGzNvjKf4QEhT8ywVdlYNt7e4QGvA1zetFDava2Cg0QpN31LZue8pTDCC3T94kBQMUiUfqg==, tarball: file:projects/server-tracker-resources.tgz}
     version: 0.0.0
 
   '@rush-temp/server-tracker@file:projects/server-tracker.tgz':
@@ -5139,6 +5142,10 @@ packages:
     resolution: {integrity: sha512-noV3nlBP0OvM6i4C5YUevkhltHxG/2bct4pusP3O3AEQ7Za+A4qwzpsE08pHfA9f9pedEG677GE4EmG9x61rVQ==, tarball: file:projects/tests-sanity.tgz}
     version: 0.0.0
 
+  '@rush-temp/text-core@file:projects/text-core.tgz':
+    resolution: {integrity: sha512-piWZZp7T/zx+IKTP7fQGdY2schRbTEF2k0YuwXHkipp5MCA3BQLfy9VaZxAo5D4jhg0xySc1grVUfAqoOJIv8g==, tarball: file:projects/text-core.tgz}
+    version: 0.0.0
+
   '@rush-temp/text-editor-assets@file:projects/text-editor-assets.tgz':
     resolution: {integrity: sha512-HrJXNpWkSNwguy4rSL6Cihc3/1eTmi0KQAmyLix1ci88uOK/9kKga7lMnKAsuobrB9DjbuLgPpcEMNpavMi13w==, tarball: file:projects/text-editor-assets.tgz}
     version: 0.0.0
@@ -5156,7 +5163,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/text@file:projects/text.tgz':
-    resolution: {integrity: sha512-p2TRL6FgtqVBooDf+E5A4HB+45VS03IvNxudhC9gCotewS726ZLOxl2XdfeuYB2rHYbzdmmiG2zb8GbPwqTkOw==, tarball: file:projects/text.tgz}
+    resolution: {integrity: sha512-3aISTkQPGhn/Af7odByrglZazlbus1nu5kHvq77BZ0LJZ2lVZDZ5eTf0/EH6IpvGkmSvkEmkVJUl/bG/5Z7urA==, tarball: file:projects/text.tgz}
     version: 0.0.0
 
   '@rush-temp/theme@file:projects/theme.tgz':
@@ -6254,8 +6261,8 @@ packages:
   '@types/verror@1.10.10':
     resolution: {integrity: sha512-l4MM0Jppn18hb9xmM6wwD1uTdShpf9Pn80aXTStnK1C94gtPvJcV2FrDmbOQUAQfJ1cKZHktkQUDwEqaAKXMMg==}
 
-  '@types/web-push@3.6.3':
-    resolution: {integrity: sha512-v3oT4mMJsHeJ/rraliZ+7TbZtr5bQQuxcgD7C3/1q/zkAj29c8RE0F9lVZVu3hiQe5Z9fYcBreV7TLnfKR+4mg==}
+  '@types/web-push@3.6.4':
+    resolution: {integrity: sha512-GnJmSr40H3RAnj0s34FNTcJi1hmWFV5KXugE0mYWnYhgTAHLJ/dJKAwDmvPJYMke0RplY2XE9LnM4hqSqKIjhQ==}
 
   '@types/webidl-conversions@7.0.3':
     resolution: {integrity: sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==}
@@ -9137,6 +9144,10 @@ packages:
   has-unicode@2.0.1:
     resolution: {integrity: sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==}
 
+  hash-base@3.1.0:
+    resolution: {integrity: sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==}
+    engines: {node: '>=4'}
+
   hasown@2.0.1:
     resolution: {integrity: sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==}
     engines: {node: '>= 0.4'}
@@ -9283,10 +9294,6 @@ packages:
     resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
     engines: {node: '>= 6'}
 
-  https-proxy-agent@7.0.4:
-    resolution: {integrity: sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==}
-    engines: {node: '>= 14'}
-
   https-proxy-agent@7.0.5:
     resolution: {integrity: sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==}
     engines: {node: '>= 14'}
@@ -9398,8 +9405,8 @@ packages:
     resolution: {integrity: sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==}
     engines: {node: '>=10.13.0'}
 
-  intl-messageformat@9.13.0:
-    resolution: {integrity: sha512-7sGC7QnSQGa5LZP7bXLDhVDtQOeKGeBFGHF2Y8LVBwYZoQZCgWeKoPGTa5GMG8g/TzDgeXuYJQis7Ggiw2xTOw==}
+  intl-messageformat@10.7.14:
+    resolution: {integrity: sha512-mMGnE4E1otdEutV5vLUdCxRJygHB5ozUBxsPB5qhitewssrS/qGruq9bmvIRkkGsNeK5ZWLfYRld18UHGTIifQ==}
 
   invert-kv@2.0.0:
     resolution: {integrity: sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==}
@@ -10351,6 +10358,9 @@ packages:
     resolution: {integrity: sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==}
     engines: {node: '>=10'}
 
+  md5.js@1.3.5:
+    resolution: {integrity: sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==}
+
   md5@2.3.0:
     resolution: {integrity: sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==}
 
@@ -13590,7 +13600,7 @@ snapshots:
       '@smithy/util-middleware': 3.0.0
       '@smithy/util-retry': 3.0.0
       '@smithy/util-utf8': 3.0.0
-      tslib: 2.6.2
+      tslib: 2.7.0
     transitivePeerDependencies:
       - aws-crt
 
@@ -13891,7 +13901,7 @@ snapshots:
       '@smithy/property-provider': 3.0.0
       '@smithy/shared-ini-file-loader': 3.0.0
       '@smithy/types': 3.0.0
-      tslib: 2.6.2
+      tslib: 2.7.0
 
   '@aws-sdk/types@3.577.0':
     dependencies:
@@ -14541,29 +14551,31 @@ snapshots:
 
   '@fastify/busboy@2.1.1': {}
 
-  '@formatjs/ecma402-abstract@1.11.4':
+  '@formatjs/ecma402-abstract@2.3.2':
     dependencies:
-      '@formatjs/intl-localematcher': 0.2.25
-      tslib: 2.6.2
+      '@formatjs/fast-memoize': 2.2.6
+      '@formatjs/intl-localematcher': 0.5.10
+      decimal.js: 10.4.3
+      tslib: 2.7.0
 
-  '@formatjs/fast-memoize@1.2.1':
+  '@formatjs/fast-memoize@2.2.6':
     dependencies:
-      tslib: 2.6.2
+      tslib: 2.7.0
 
-  '@formatjs/icu-messageformat-parser@2.1.0':
+  '@formatjs/icu-messageformat-parser@2.11.0':
     dependencies:
-      '@formatjs/ecma402-abstract': 1.11.4
-      '@formatjs/icu-skeleton-parser': 1.3.6
-      tslib: 2.6.2
+      '@formatjs/ecma402-abstract': 2.3.2
+      '@formatjs/icu-skeleton-parser': 1.8.12
+      tslib: 2.7.0
 
-  '@formatjs/icu-skeleton-parser@1.3.6':
+  '@formatjs/icu-skeleton-parser@1.8.12':
     dependencies:
-      '@formatjs/ecma402-abstract': 1.11.4
-      tslib: 2.6.2
+      '@formatjs/ecma402-abstract': 2.3.2
+      tslib: 2.7.0
 
-  '@formatjs/intl-localematcher@0.2.25':
+  '@formatjs/intl-localematcher@0.5.10':
     dependencies:
-      tslib: 2.6.2
+      tslib: 2.7.0
 
   '@gar/promisify@1.1.3': {}
 
@@ -15760,10 +15772,12 @@ snapshots:
 
   '@rush-temp/account@file:projects/account.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@types/node@20.11.19)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(gcp-metadata@5.3.0(encoding@0.1.13))(snappy@7.2.2)(socks@2.8.3)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3))':
     dependencies:
+      '@types/crypto-js': 4.2.2
       '@types/jest': 29.5.12
       '@types/otp-generator': 4.0.2
       '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.3.3)
       '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.3.3)
+      crypto-js: 4.2.0
       eslint: 8.56.0
       eslint-config-standard-with-typescript: 40.0.0(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.3.3))(eslint-plugin-import@2.29.1(eslint@8.56.0))(eslint-plugin-n@15.7.0(eslint@8.56.0))(eslint-plugin-promise@6.1.1(eslint@8.56.0))(eslint@8.56.0)(typescript@5.3.3)
       eslint-plugin-import: 2.29.1(eslint@8.56.0)
@@ -16925,9 +16939,11 @@ snapshots:
 
   '@rush-temp/contact-resources@file:projects/contact-resources.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@types/node@20.11.19)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(postcss-load-config@4.0.2(postcss@8.4.35)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)))(postcss@8.4.35)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3))':
     dependencies:
+      '@types/crypto-js': 4.2.2
       '@types/jest': 29.5.12
       '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.3.3)
       '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.3.3)
+      crypto-js: 4.2.0
       eslint: 8.56.0
       eslint-config-standard-with-typescript: 40.0.0(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.3.3))(eslint-plugin-import@2.29.1(eslint@8.56.0))(eslint-plugin-n@15.7.0(eslint@8.56.0))(eslint-plugin-promise@6.1.1(eslint@8.56.0))(eslint@8.56.0)(typescript@5.3.3)
       eslint-plugin-import: 2.29.1(eslint@8.56.0)
@@ -16969,13 +16985,13 @@ snapshots:
       '@types/jest': 29.5.12
       '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.3.3)
       '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.3.3)
-      crypto-js: 4.2.0
       eslint: 8.56.0
       eslint-config-standard-with-typescript: 40.0.0(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.3.3))(eslint-plugin-import@2.29.1(eslint@8.56.0))(eslint-plugin-n@15.7.0(eslint@8.56.0))(eslint-plugin-promise@6.1.1(eslint@8.56.0))(eslint@8.56.0)(typescript@5.3.3)
       eslint-plugin-import: 2.29.1(eslint@8.56.0)
       eslint-plugin-n: 15.7.0(eslint@8.56.0)
       eslint-plugin-promise: 6.1.1(eslint@8.56.0)
       jest: 29.7.0(@types/node@20.11.19)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3))
+      md5.js: 1.3.5
       prettier: 3.2.5
       ts-jest: 29.1.2(@babel/core@7.23.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(jest@29.7.0(@types/node@20.11.19)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)))(typescript@5.3.3)
       typescript: 5.3.3
@@ -20207,7 +20223,7 @@ snapshots:
       eslint-plugin-import: 2.29.1(eslint@8.56.0)
       eslint-plugin-n: 15.7.0(eslint@8.56.0)
       eslint-plugin-promise: 6.1.1(eslint@8.56.0)
-      intl-messageformat: 9.13.0
+      intl-messageformat: 10.7.14
       jest: 29.7.0(@types/node@20.11.19)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3))
       prettier: 3.2.5
       ts-jest: 29.1.2(@babel/core@7.23.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(jest@29.7.0(@types/node@20.11.19)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)))(typescript@5.3.3)
@@ -20816,6 +20832,7 @@ snapshots:
       '@types/express': 4.17.21
       '@types/jest': 29.5.12
       '@types/node': 20.11.19
+      '@types/web-push': 3.6.4
       '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.3.3)
       '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.3.3)
       aws-sdk: 2.1664.0
@@ -20835,6 +20852,7 @@ snapshots:
       ts-jest: 29.1.2(@babel/core@7.23.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(jest@29.7.0(@types/node@20.11.19)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)))(typescript@5.3.3)
       ts-node: 10.9.2(@types/node@20.11.19)(typescript@5.3.3)
       typescript: 5.3.3
+      web-push: 3.6.7
     transitivePeerDependencies:
       - '@babel/core'
       - '@jest/types'
@@ -23122,7 +23140,6 @@ snapshots:
   '@rush-temp/server-notification-resources@file:projects/server-notification-resources.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@types/node@20.11.19)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3))':
     dependencies:
       '@types/jest': 29.5.12
-      '@types/web-push': 3.6.3
       '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.3.3)
       '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.3.3)
       eslint: 8.56.0
@@ -23134,7 +23151,6 @@ snapshots:
       prettier: 3.2.5
       ts-jest: 29.1.2(@babel/core@7.23.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(jest@29.7.0(@types/node@20.11.19)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)))(typescript@5.3.3)
       typescript: 5.3.3
-      web-push: 3.6.7
     transitivePeerDependencies:
       - '@babel/core'
       - '@jest/types'
@@ -24705,6 +24721,37 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@rush-temp/text-core@file:projects/text-core.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@types/node@20.11.19)(babel-jest@29.7.0(@babel/core@7.23.9))(bufferutil@4.0.8)(esbuild@0.24.2)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3))(utf-8-validate@6.0.4)':
+    dependencies:
+      '@types/jest': 29.5.12
+      '@types/markdown-it': 13.0.8
+      '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.6.2)
+      '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.6.2)
+      eslint: 8.56.0
+      eslint-config-standard-with-typescript: 40.0.0(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.3.3))(eslint@8.56.0)(typescript@5.3.3))(eslint-plugin-import@2.29.1(eslint@8.56.0))(eslint-plugin-n@15.7.0(eslint@8.56.0))(eslint-plugin-promise@6.1.1(eslint@8.56.0))(eslint@8.56.0)(typescript@5.6.2)
+      eslint-plugin-import: 2.29.1(eslint@8.56.0)
+      eslint-plugin-n: 15.7.0(eslint@8.56.0)
+      eslint-plugin-promise: 6.1.1(eslint@8.56.0)
+      fast-equals: 5.0.1
+      jest: 29.7.0(@types/node@20.11.19)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3))
+      jest-environment-jsdom: 29.7.0(bufferutil@4.0.8)(utf-8-validate@6.0.4)
+      prettier: 3.2.5
+      ts-jest: 29.1.2(@babel/core@7.23.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(jest@29.7.0(@types/node@20.11.19)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3)))(typescript@5.6.2)
+      typescript: 5.6.2
+    transitivePeerDependencies:
+      - '@babel/core'
+      - '@jest/types'
+      - '@types/node'
+      - babel-jest
+      - babel-plugin-macros
+      - bufferutil
+      - canvas
+      - esbuild
+      - node-notifier
+      - supports-color
+      - ts-node
+      - utf-8-validate
+
   '@rush-temp/text-editor-assets@file:projects/text-editor-assets.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.24.2)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3))':
     dependencies:
       '@types/jest': 29.5.12
@@ -25866,7 +25913,7 @@ snapshots:
       '@aws-crypto/crc32': 3.0.0
       '@smithy/types': 3.0.0
       '@smithy/util-hex-encoding': 3.0.0
-      tslib: 2.6.2
+      tslib: 2.7.0
 
   '@smithy/eventstream-serde-browser@3.0.0':
     dependencies:
@@ -26952,7 +26999,7 @@ snapshots:
   '@types/verror@1.10.10':
     optional: true
 
-  '@types/web-push@3.6.3':
+  '@types/web-push@3.6.4':
     dependencies:
       '@types/node': 20.11.19
 
@@ -29182,7 +29229,7 @@ snapshots:
   dot-case@3.0.4:
     dependencies:
       no-case: 3.0.4
-      tslib: 2.6.2
+      tslib: 2.7.0
 
   dot-prop@6.0.1:
     dependencies:
@@ -30656,6 +30703,12 @@ snapshots:
 
   has-unicode@2.0.1: {}
 
+  hash-base@3.1.0:
+    dependencies:
+      inherits: 2.0.4
+      readable-stream: 3.6.2
+      safe-buffer: 5.2.1
+
   hasown@2.0.1:
     dependencies:
       function-bind: 1.1.2
@@ -30849,13 +30902,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  https-proxy-agent@7.0.4:
-    dependencies:
-      agent-base: 7.1.1
-      debug: 4.3.5
-    transitivePeerDependencies:
-      - supports-color
-
   https-proxy-agent@7.0.5:
     dependencies:
       agent-base: 7.1.1
@@ -30956,12 +31002,12 @@ snapshots:
 
   interpret@3.1.1: {}
 
-  intl-messageformat@9.13.0:
+  intl-messageformat@10.7.14:
     dependencies:
-      '@formatjs/ecma402-abstract': 1.11.4
-      '@formatjs/fast-memoize': 1.2.1
-      '@formatjs/icu-messageformat-parser': 2.1.0
-      tslib: 2.6.2
+      '@formatjs/ecma402-abstract': 2.3.2
+      '@formatjs/fast-memoize': 2.2.6
+      '@formatjs/icu-messageformat-parser': 2.11.0
+      tslib: 2.7.0
 
   invert-kv@2.0.0: {}
 
@@ -32189,6 +32235,12 @@ snapshots:
       escape-string-regexp: 4.0.0
     optional: true
 
+  md5.js@1.3.5:
+    dependencies:
+      hash-base: 3.1.0
+      inherits: 2.0.4
+      safe-buffer: 5.2.1
+
   md5@2.3.0:
     dependencies:
       charenc: 0.0.2
@@ -32911,7 +32963,7 @@ snapshots:
   pascal-case@3.1.2:
     dependencies:
       no-case: 3.0.4
-      tslib: 2.6.2
+      tslib: 2.7.0
 
   passport-custom@1.1.1:
     dependencies:
@@ -35104,7 +35156,7 @@ snapshots:
     dependencies:
       asn1.js: 5.4.1
       http_ece: 1.2.0
-      https-proxy-agent: 7.0.4
+      https-proxy-agent: 7.0.5
       jws: 4.0.0
       minimist: 1.2.8
     transitivePeerDependencies:
diff --git a/packages/platform/package.json b/packages/platform/package.json
index 16dd58da9a..481b31dc5e 100644
--- a/packages/platform/package.json
+++ b/packages/platform/package.json
@@ -37,7 +37,7 @@
     "typescript": "^5.3.3"
   },
   "dependencies": {
-    "intl-messageformat": "^9.7.1"
+    "intl-messageformat": "^10.7.14"
   },
   "repository": "https://github.com/hcengineering/platform",
   "publishConfig": {
diff --git a/packages/text-core/.eslintrc.js b/packages/text-core/.eslintrc.js
new file mode 100644
index 0000000000..72235dc283
--- /dev/null
+++ b/packages/text-core/.eslintrc.js
@@ -0,0 +1,7 @@
+module.exports = {
+  extends: ['./node_modules/@hcengineering/platform-rig/profiles/default/eslint.config.json'],
+  parserOptions: {
+    tsconfigRootDir: __dirname,
+    project: './tsconfig.json'
+  }
+}
diff --git a/packages/text-core/config/rig.json b/packages/text-core/config/rig.json
new file mode 100644
index 0000000000..0110930f55
--- /dev/null
+++ b/packages/text-core/config/rig.json
@@ -0,0 +1,4 @@
+{  
+  "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json",
+  "rigPackageName": "@hcengineering/platform-rig"
+}
diff --git a/packages/text-core/jest.config.js b/packages/text-core/jest.config.js
new file mode 100644
index 0000000000..2cfd408b67
--- /dev/null
+++ b/packages/text-core/jest.config.js
@@ -0,0 +1,7 @@
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  testMatch: ['**/?(*.)+(spec|test).[jt]s?(x)'],
+  roots: ["./src"],
+  coverageReporters: ["text-summary", "html"]
+}
diff --git a/packages/text-core/package.json b/packages/text-core/package.json
new file mode 100644
index 0000000000..f35b981066
--- /dev/null
+++ b/packages/text-core/package.json
@@ -0,0 +1,49 @@
+{
+  "name": "@hcengineering/text-core",
+  "version": "0.6.0",
+  "main": "lib/index.js",
+  "svelte": "src/index.ts",
+  "types": "types/index.d.ts",
+  "files": [
+    "lib/**/*",
+    "types/**/*",
+    "tsconfig.json"
+  ],
+  "author": "Anticrm Platform Contributors",
+  "license": "EPL-2.0",
+  "scripts": {
+    "build": "compile",
+    "test": "jest --passWithNoTests --silent",
+    "build:watch": "compile",
+    "format": "format src",
+    "_phase:build": "compile transpile src",
+    "_phase:test": "jest --passWithNoTests --silent",
+    "_phase:format": "format src",
+    "_phase:validate": "compile validate"
+  },
+  "devDependencies": {
+    "@hcengineering/platform-rig": "^0.6.0",
+    "@typescript-eslint/eslint-plugin": "^6.11.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-promise": "^6.1.1",
+    "eslint-plugin-n": "^15.4.0",
+    "eslint": "^8.54.0",
+    "@typescript-eslint/parser": "^6.11.0",
+    "eslint-config-standard-with-typescript": "^40.0.0",
+    "prettier": "^3.1.0",
+    "typescript": "^5.3.3",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.1.1",
+    "@types/jest": "^29.5.5",
+    "@types/markdown-it": "~13.0.0",
+    "jest-environment-jsdom": "^29.7.0"
+  },
+  "dependencies": {
+    "@hcengineering/core": "^0.6.32",
+    "fast-equals": "^5.0.1"
+  },
+  "repository": "https://github.com/hcengineering/platform",
+  "publishConfig": {
+    "registry": "https://npm.pkg.github.com"
+  }
+}
diff --git a/packages/text-core/src/index.ts b/packages/text-core/src/index.ts
new file mode 100644
index 0000000000..5e2540fdb2
--- /dev/null
+++ b/packages/text-core/src/index.ts
@@ -0,0 +1,20 @@
+//
+// Copyright © 2023 Hardcore Engineering Inc.
+//
+// Licensed under the Eclipse Public License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License. You may
+// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+export * from './markup/dsl'
+export * from './markup/model'
+export * from './markup/reference'
+export * from './markup/traverse'
+export * from './markup/utils'
diff --git a/packages/text/src/markup/__tests__/traverse.test.ts b/packages/text-core/src/markup/__tests__/traverse.test.ts
similarity index 100%
rename from packages/text/src/markup/__tests__/traverse.test.ts
rename to packages/text-core/src/markup/__tests__/traverse.test.ts
diff --git a/packages/text/src/markup/dsl.ts b/packages/text-core/src/markup/dsl.ts
similarity index 100%
rename from packages/text/src/markup/dsl.ts
rename to packages/text-core/src/markup/dsl.ts
diff --git a/packages/text/src/markup/model.ts b/packages/text-core/src/markup/model.ts
similarity index 100%
rename from packages/text/src/markup/model.ts
rename to packages/text-core/src/markup/model.ts
diff --git a/packages/text/src/markup/reference.ts b/packages/text-core/src/markup/reference.ts
similarity index 100%
rename from packages/text/src/markup/reference.ts
rename to packages/text-core/src/markup/reference.ts
diff --git a/packages/text/src/markup/traverse.ts b/packages/text-core/src/markup/traverse.ts
similarity index 100%
rename from packages/text/src/markup/traverse.ts
rename to packages/text-core/src/markup/traverse.ts
diff --git a/packages/text-core/src/markup/utils.ts b/packages/text-core/src/markup/utils.ts
new file mode 100644
index 0000000000..37d25af4ed
--- /dev/null
+++ b/packages/text-core/src/markup/utils.ts
@@ -0,0 +1,402 @@
+//
+// Copyright © 2024 Hardcore Engineering Inc.
+//
+// Licensed under the Eclipse Public License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License. You may
+// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import { Markup } from '@hcengineering/core'
+
+import { deepEqual } from 'fast-equals'
+import { nodeDoc, nodeParagraph, nodeText } from './dsl'
+import { MarkupMark, MarkupMarkType, MarkupNode, MarkupNodeType, emptyMarkupNode, type AttrValue } from './model'
+import { traverseNode } from './traverse'
+
+/** @public */
+export const EmptyMarkup: Markup = jsonToMarkup(emptyMarkupNode())
+
+/** @public */
+export function isEmptyMarkup (markup: Markup | undefined): boolean {
+  if (markup === undefined || markup === null || markup === '') {
+    return true
+  }
+  return isEmptyNode(markupToJSON(markup))
+}
+
+/** @public */
+export function areEqualMarkups (markup1: Markup, markup2: Markup): boolean {
+  if (markup1 === markup2) {
+    return true
+  }
+
+  const node1 = markupToJSON(markup1)
+  const node2 = markupToJSON(markup2)
+
+  if (isEmptyNode(node1) && isEmptyNode(node2)) {
+    return true
+  }
+
+  return equalNodes(node1, node2)
+}
+
+/** @public */
+export function areEqualJson (json1: MarkupNode, json2: MarkupNode): boolean {
+  return equalNodes(json1, json2)
+}
+
+function equalNodes (node1: MarkupNode, node2: MarkupNode): boolean {
+  if (node1.type !== node2.type) return false
+
+  const text1 = node1.text ?? ''
+  const text2 = node2.text ?? ''
+  if (text1 !== text2) return false
+
+  if (!equalArrays(node1.content, node2.content, equalNodes)) return false
+  if (!equalArrays(node1.marks, node2.marks, equalMarks)) return false
+  if (!equalRecords(node1.attrs, node2.attrs)) return false
+
+  return true
+}
+
+function equalArrays<T> (a: T[] | undefined, b: T[] | undefined, equal: (a: T, b: T) => boolean): boolean {
+  if (a === b) return true
+  const arr1 = a ?? []
+  const arr2 = b ?? []
+  if (arr1.length !== arr2.length) return false
+  return arr1.every((item1, i) => equal(item1, arr2[i]))
+}
+
+function equalRecords (a: Record<string, any> | undefined, b: Record<string, any> | undefined): boolean {
+  if (a === b) return true
+  a = Object.fromEntries(Object.entries(a ?? {}).filter(([_, v]) => v != null))
+  b = Object.fromEntries(Object.entries(b ?? {}).filter(([_, v]) => v != null))
+  return deepEqual(a, b)
+}
+
+export function equalMarks (a: MarkupMark, b: MarkupMark): boolean {
+  return a.type === b.type && equalRecords(a.attrs, b.attrs)
+}
+
+const emptyNodes = [MarkupNodeType.hard_break]
+
+const nonEmptyNodes = [
+  MarkupNodeType.horizontal_rule,
+  MarkupNodeType.image,
+  MarkupNodeType.reference,
+  MarkupNodeType.subLink,
+  MarkupNodeType.table
+]
+
+/** @public */
+export function isEmptyNode (node: MarkupNode): boolean {
+  if (emptyNodes.includes(node.type)) return true
+  if (nonEmptyNodes.includes(node.type)) return false
+  if (node.text !== undefined && node.text?.trim().length > 0) return false
+
+  const content = node.content ?? []
+  return content.every(isEmptyNode)
+}
+
+// Markup
+
+/** @public */
+export function jsonToMarkup (json: MarkupNode): Markup {
+  return JSON.stringify(json)
+}
+
+/** @public */
+export function markupToJSON (markup: Markup): MarkupNode {
+  if (markup == null || markup === '') {
+    return emptyMarkupNode()
+  }
+
+  try {
+    // Ideally Markup should contain only serialized JSON
+    // But there seem to be some cases when it contains HTML or plain text
+    // So we need to handle those cases and produce valid MarkupNode
+    if (markup.startsWith('{')) {
+      return JSON.parse(markup) as MarkupNode
+    } else {
+      return nodeDoc(nodeParagraph(nodeText(markup)))
+    }
+  } catch (error) {
+    return emptyMarkupNode()
+  }
+}
+
+// UTILS
+
+const ELLIPSIS_CHAR = '…'
+const WHITESPACE = ' '
+
+/** @public */
+export function stripTags (markup: Markup, textLimit = 0): string {
+  const parsed = markupToJSON(markup)
+
+  const textParts: string[] = []
+  let charCount = 0
+  let isHardStop = false
+
+  const pushText = (text: string): void => {
+    if (textLimit > 0 && charCount + text.length > textLimit) {
+      const toAddCount = textLimit - charCount
+      const textPart = text.substring(0, toAddCount)
+      textParts.push(textPart)
+      textParts.push(ELLIPSIS_CHAR)
+      isHardStop = true
+    } else {
+      textParts.push(text)
+      charCount += text.length
+    }
+  }
+
+  traverseNode(parsed, (node, parent): boolean => {
+    if (isHardStop) {
+      return false
+    }
+
+    if (node.type === MarkupNodeType.text) {
+      const text = node.text ?? ''
+      pushText(text)
+      return false
+    } else if (
+      node.type === MarkupNodeType.paragraph ||
+      node.type === MarkupNodeType.table ||
+      node.type === MarkupNodeType.doc ||
+      node.type === MarkupNodeType.blockquote
+    ) {
+      if (textParts.length > 0 && textParts[textParts.length - 1] !== WHITESPACE) {
+        textParts.push(WHITESPACE)
+        charCount++
+      }
+    } else if (node.type === MarkupNodeType.reference) {
+      const label = `${node.attrs?.label ?? ''}`
+      pushText(label.length > 0 ? `@${label}` : '')
+    }
+    return true
+  })
+
+  const result = textParts.join('')
+  return result
+}
+
+class NodeBuilder {
+  textParts: string[] = []
+
+  constructor (private readonly addTags: boolean) {}
+
+  addText (text: string): void {
+    this.textParts.push(text)
+  }
+
+  addTag (text: string, newLine: boolean = false): void {
+    if (this.addTags) {
+      this.textParts.push(text)
+    }
+    if (!this.addTags && newLine) {
+      this.textParts.push('\n')
+    }
+  }
+
+  toText (): string {
+    return this.textParts.join('')
+  }
+}
+
+function addMark (builder: NodeBuilder, mark?: MarkupMark, next?: () => void): void {
+  if (mark != null) {
+    const attrs = mark.attrs ?? {}
+
+    if (mark.type === MarkupMarkType.bold) {
+      builder.addTag('<strong>')
+      next?.()
+      builder.addTag('</strong>')
+    } else if (mark.type === MarkupMarkType.code) {
+      builder.addTag('<code class="proseCode">')
+      next?.()
+      builder.addTag('</code>')
+    } else if (mark.type === MarkupMarkType.em) {
+      builder.addTag('<em>')
+      next?.()
+      builder.addTag('</em>')
+    } else if (mark.type === MarkupMarkType.link) {
+      builder.addTag(`<a href=${attrs.href} target=${attrs.target}>`)
+      next?.()
+      builder.addTag('</a>')
+    } else if (mark.type === MarkupMarkType.strike) {
+      builder.addTag('<s>')
+      next?.()
+      builder.addTag('</s>')
+    } else if (mark.type === MarkupMarkType.underline) {
+      builder.addTag('<u>')
+      next?.()
+      builder.addTag('</u>')
+    } else {
+      builder.addTag(`unknown mark: "${mark.type as string}"`, false)
+      next?.()
+    }
+  }
+}
+
+function addMarks (builder: NodeBuilder, marks: MarkupMark[], next?: () => void): void {
+  if (marks.length > 0) {
+    const mark = marks[0]
+    const others = marks.slice(1)
+
+    if (others.length > 0) {
+      addMark(builder, mark, () => {
+        addMarks(builder, others, next)
+      })
+    }
+  }
+}
+
+function addNodeContent (builder: NodeBuilder, node?: MarkupNode): void {
+  if (node == null) return
+
+  const attrs = node.attrs ?? {}
+  const nodes = node.content ?? []
+
+  if (node.type === MarkupNodeType.doc) {
+    nodes.forEach((childNode) => {
+      addNode(builder, childNode)
+    })
+  } else if (node.type === MarkupNodeType.text) {
+    builder.addText(node.text ?? '')
+  } else if (node.type === MarkupNodeType.paragraph) {
+    builder.addTag('<p>')
+    nodes.forEach((childNode) => {
+      addNode(builder, childNode)
+    })
+    builder.addTag('</p>')
+  } else if (node.type === MarkupNodeType.blockquote) {
+    builder.addTag('<blockquote>')
+    nodes.forEach((childNode) => {
+      addNode(builder, childNode)
+    })
+    builder.addTag('</blockquote>')
+  } else if (node.type === MarkupNodeType.horizontal_rule) {
+    builder.addTag('<hr/>')
+  } else if (node.type === MarkupNodeType.heading) {
+    const level = toNumber(node.attrs?.level) ?? 1
+    builder.addTag(`<h${level}>`)
+    nodes.forEach((childNode) => {
+      addNode(builder, childNode)
+    })
+    builder.addTag(`</h${level}>`)
+  } else if (node.type === MarkupNodeType.code_block) {
+    builder.addTag('<pre><code>')
+    nodes.forEach((childNode) => {
+      addNode(builder, childNode)
+    })
+    builder.addTag('</code></pre>')
+  } else if (node.type === MarkupNodeType.image) {
+    const src = toString(attrs.src)
+    const alt = toString(attrs.alt)
+    builder.addText(`<img src="${src}" alt="${alt}"/>`)
+  } else if (node.type === MarkupNodeType.reference) {
+    const label = toString(attrs.label)
+    builder.addText(label !== undefined ? `@${label}` : '')
+  } else if (node.type === MarkupNodeType.hard_break) {
+    builder.addTag('<br/>')
+  } else if (node.type === MarkupNodeType.ordered_list) {
+    builder.addTag('<ol>')
+    nodes.forEach((childNode) => {
+      addNode(builder, childNode)
+    })
+    builder.addTag('</ol>')
+  } else if (node.type === MarkupNodeType.bullet_list) {
+    builder.addTag('<ul>')
+    nodes.forEach((childNode) => {
+      addNode(builder, childNode)
+    })
+    builder.addTag('</ul>')
+  } else if (node.type === MarkupNodeType.list_item) {
+    builder.addTag('<li>')
+    nodes.forEach((childNode) => {
+      addNode(builder, childNode)
+    })
+    builder.addTag('</li>')
+  } else if (node.type === MarkupNodeType.subLink) {
+    builder.addTag('<sub>')
+    nodes.forEach((childNode) => {
+      addNode(builder, childNode)
+    })
+    builder.addTag('</sub>')
+  } else if (node.type === MarkupNodeType.table) {
+    builder.addTag('<table><tbody>')
+    nodes.forEach((childNode) => {
+      addNode(builder, childNode)
+    })
+    builder.addTag('</tbody></table>')
+  } else if (node.type === MarkupNodeType.table_row) {
+    builder.addTag('<tr>')
+    nodes.forEach((childNode) => {
+      addNode(builder, childNode)
+    })
+    builder.addTag('</tr>')
+  } else if (node.type === MarkupNodeType.table_cell) {
+    builder.addTag('<td>')
+    nodes.forEach((childNode) => {
+      addNode(builder, childNode)
+    })
+    builder.addTag('</td>')
+  } else if (node.type === MarkupNodeType.table_header) {
+    builder.addTag('<th>')
+    nodes.forEach((childNode) => {
+      addNode(builder, childNode)
+    })
+    builder.addTag('</th>')
+  } else {
+    builder.addText(`unknown node: "${node.type}"`)
+    nodes.forEach((childNode) => {
+      addNode(builder, childNode)
+    })
+  }
+}
+
+function addNode (builder: NodeBuilder, node: MarkupNode): void {
+  const marks = node.marks ?? []
+
+  if (marks.length > 0) {
+    addMarks(builder, marks, () => {
+      addNodeContent(builder, node)
+    })
+  } else {
+    addNodeContent(builder, node)
+  }
+}
+
+function toString (value: AttrValue | undefined): string | undefined {
+  return value !== undefined ? `${value}` : undefined
+}
+
+function toNumber (value: AttrValue | undefined): number | undefined {
+  if (typeof value === 'boolean') {
+    return value ? 1 : 0
+  }
+
+  return value !== undefined ? (typeof value === 'string' ? parseInt(value) : value) : undefined
+}
+
+export function markupToHTML (markup: Markup): string {
+  const jsonModel = markupToJSON(markup)
+  const builder = new NodeBuilder(true)
+  addNode(builder, jsonModel)
+  return builder.toText()
+}
+
+export function markupToText (markup: Markup): string {
+  const jsonModel = markupToJSON(markup)
+  const builder = new NodeBuilder(false)
+  addNode(builder, jsonModel)
+  return builder.toText()
+}
diff --git a/packages/text-core/tsconfig.json b/packages/text-core/tsconfig.json
new file mode 100644
index 0000000000..59e4fd4297
--- /dev/null
+++ b/packages/text-core/tsconfig.json
@@ -0,0 +1,10 @@
+{
+  "extends": "./node_modules/@hcengineering/platform-rig/profiles/default/tsconfig.json",
+
+  "compilerOptions": {
+    "rootDir": "./src",
+    "outDir": "./lib",
+    "declarationDir": "./types",
+    "tsBuildInfoFile": ".build/build.tsbuildinfo"
+  }
+}
\ No newline at end of file
diff --git a/packages/text/package.json b/packages/text/package.json
index 0147c859eb..1052dffa53 100644
--- a/packages/text/package.json
+++ b/packages/text/package.json
@@ -40,6 +40,7 @@
   },
   "dependencies": {
     "@hcengineering/core": "^0.6.32",
+    "@hcengineering/text-core": "^0.6.0",
     "@tiptap/core": "^2.6.6",
     "@tiptap/html": "^2.6.6",
     "@tiptap/pm": "^2.6.6",
diff --git a/packages/text/src/index.ts b/packages/text/src/index.ts
index b3601a4b99..00756c4f12 100644
--- a/packages/text/src/index.ts
+++ b/packages/text/src/index.ts
@@ -14,13 +14,9 @@
 //
 
 export * from './extensions'
-export * from './markup/dsl'
-export * from './markup/model'
-export * from './markup/reference'
-export * from './markup/traverse'
-export * from './markup/utils'
+export * from '@hcengineering/text-core'
 export * from './nodes'
-// export * from './ydoc'
+export * from './markup/utils'
 export * from './marks/code'
 export * from './marks/colors'
 export * from './marks/noteBase'
diff --git a/packages/text/src/markdown/index.ts b/packages/text/src/markdown/index.ts
index 8a6b2c053c..37fcca8bbd 100644
--- a/packages/text/src/markdown/index.ts
+++ b/packages/text/src/markdown/index.ts
@@ -1,9 +1,8 @@
+import { MarkupNode, markupToJSON } from '@hcengineering/text-core'
 import { Extensions } from '@tiptap/core'
 import { defaultExtensions } from '../extensions'
 import { MarkdownParser } from './parser'
 import { MarkdownState, storeMarks, storeNodes } from './serializer'
-import { MarkupNode } from '../markup/model'
-import { markupToJSON } from '../markup/utils'
 
 /**
  * @public
diff --git a/packages/text/src/markdown/marks.ts b/packages/text/src/markdown/marks.ts
index e0577ed6e1..4d7535f76b 100644
--- a/packages/text/src/markdown/marks.ts
+++ b/packages/text/src/markdown/marks.ts
@@ -1,5 +1,5 @@
 import { deepEqual } from 'fast-equals'
-import { MarkupMark, MarkupMarkType, MarkupNode } from '../markup/model'
+import { MarkupMark, MarkupMarkType, MarkupNode } from '@hcengineering/text-core'
 
 export function traverseMarks (node: MarkupNode, f: (el: MarkupMark) => void): void {
   node.marks?.forEach(f)
diff --git a/packages/text/src/markdown/node.ts b/packages/text/src/markdown/node.ts
index 0c3b5131ac..3efe06c967 100644
--- a/packages/text/src/markdown/node.ts
+++ b/packages/text/src/markdown/node.ts
@@ -1,4 +1,4 @@
-import { Attrs, MarkupNode } from '../markup/model'
+import { Attrs, MarkupNode } from '@hcengineering/text-core'
 
 export function traverseMarkupNode (node: MarkupNode, f: (el: MarkupNode) => void): void {
   f(node)
diff --git a/packages/text/src/markdown/parser.ts b/packages/text/src/markdown/parser.ts
index 2e187e61e1..e517a82d7d 100644
--- a/packages/text/src/markdown/parser.ts
+++ b/packages/text/src/markdown/parser.ts
@@ -3,10 +3,10 @@ import MarkdownIt, { type Token } from 'markdown-it'
 import type { RuleCore } from 'markdown-it/lib/parser_core'
 import type StateCore from 'markdown-it/lib/rules_core/state_core'
 
+import { Attrs, AttrValue, MarkupMark, MarkupMarkType, MarkupNode, MarkupNodeType } from '@hcengineering/text-core'
+import { htmlToJSON } from '../markup/utils'
 import { addToSet, removeFromSet, sameSet } from './marks'
 import { messageContent } from './node'
-import { Attrs, AttrValue, MarkupMark, MarkupMarkType, MarkupNode, MarkupNodeType } from '../markup/model'
-import { htmlToJSON } from '../markup/utils'
 
 interface ParsingBlockRule {
   block: MarkupNodeType
diff --git a/packages/text/src/markdown/serializer.ts b/packages/text/src/markdown/serializer.ts
index f3d8fa58fc..b3c7b9695c 100644
--- a/packages/text/src/markdown/serializer.ts
+++ b/packages/text/src/markdown/serializer.ts
@@ -1,8 +1,8 @@
+import { MarkupMark, MarkupNode, MarkupNodeType } from '@hcengineering/text-core'
 import { generateHTML } from '@tiptap/html'
+import { defaultExtensions } from '../extensions'
 import { isInSet, markEq } from './marks'
 import { messageContent, nodeAttrs } from './node'
-import { MarkupMark, MarkupNode, MarkupNodeType } from '../markup/model'
-import { defaultExtensions } from '../extensions'
 
 type FirstDelim = (i: number, attrs?: Record<string, any>, parentAttrs?: Record<string, any>) => string
 interface IState {
diff --git a/packages/text/src/markup/__tests__/dsl.test.ts b/packages/text/src/markup/__tests__/dsl.test.ts
index e4b63d595c..2458a48b36 100644
--- a/packages/text/src/markup/__tests__/dsl.test.ts
+++ b/packages/text/src/markup/__tests__/dsl.test.ts
@@ -1,5 +1,13 @@
-import { nodeDoc, nodeImage, nodeParagraph, nodeReference, nodeText, markLink, markUnderline } from '../dsl'
-import { MarkupNodeType } from '../model'
+import {
+  markLink,
+  markUnderline,
+  MarkupNodeType,
+  nodeDoc,
+  nodeImage,
+  nodeParagraph,
+  nodeReference,
+  nodeText
+} from '@hcengineering/text-core'
 import { jsonToHTML } from '../utils'
 
 describe('dsl', () => {
diff --git a/packages/text/src/markup/__tests__/utils.test.ts b/packages/text/src/markup/__tests__/utils.test.ts
index fe9ee6f9e5..e115620b39 100644
--- a/packages/text/src/markup/__tests__/utils.test.ts
+++ b/packages/text/src/markup/__tests__/utils.test.ts
@@ -17,28 +17,34 @@
 // limitations under the License.
 //
 
-import { Editor, getSchema } from '@tiptap/core'
-import { MarkupMarkType, MarkupNode, MarkupNodeType } from '../model'
 import {
   areEqualMarkups,
+  isEmptyMarkup,
+  isEmptyNode,
+  jsonToMarkup,
+  MarkupMarkType,
+  MarkupNode,
+  MarkupNodeType,
+  markupToJSON,
+  nodeDoc,
+  nodeParagraph,
+  nodeText,
+  markupToHTML
+} from '@hcengineering/text-core'
+import { Editor, getSchema } from '@tiptap/core'
+import { ServerKit } from '../../kits/server-kit'
+import {
   getMarkup,
   htmlToJSON,
   htmlToMarkup,
   htmlToPmNode,
-  isEmptyMarkup,
-  isEmptyNode,
   jsonToHTML,
-  jsonToMarkup,
   jsonToText,
-  markupToHTML,
-  markupToJSON,
   markupToPmNode,
   pmNodeToHTML,
   pmNodeToJSON,
   pmNodeToMarkup
 } from '../utils'
-import { ServerKit } from '../../kits/server-kit'
-import { nodeDoc, nodeParagraph, nodeText } from '../dsl'
 
 // mock tiptap functions
 jest.mock('@tiptap/html', () => ({
diff --git a/packages/text/src/markup/utils.ts b/packages/text/src/markup/utils.ts
index 016a4c64ee..e8e93cb773 100644
--- a/packages/text/src/markup/utils.ts
+++ b/packages/text/src/markup/utils.ts
@@ -18,13 +18,18 @@ import { Editor, Extensions, getSchema } from '@tiptap/core'
 import { generateHTML, generateJSON } from '@tiptap/html'
 import { Node as ProseMirrorNode, Schema } from '@tiptap/pm/model'
 
-import { deepEqual } from 'fast-equals'
+import {
+  MarkupNode,
+  emptyMarkupNode,
+  jsonToMarkup,
+  markupToJSON,
+  nodeDoc,
+  nodeParagraph,
+  nodeText
+} from '@hcengineering/text-core'
 import { defaultExtensions } from '../extensions'
-import { nodeDoc, nodeParagraph, nodeText } from './dsl'
-import { MarkupMark, MarkupNode, MarkupNodeType, emptyMarkupNode } from './model'
 
 /** @public */
-export const EmptyMarkup: Markup = jsonToMarkup(emptyMarkupNode())
 const defaultSchema = getSchema(defaultExtensions)
 
 /** @public */
@@ -32,88 +37,6 @@ export function getMarkup (editor?: Editor): Markup {
   return jsonToMarkup(editor?.getJSON() as MarkupNode)
 }
 
-/** @public */
-export function isEmptyMarkup (markup: Markup | undefined): boolean {
-  if (markup === undefined || markup === null || markup === '') {
-    return true
-  }
-  return isEmptyNode(markupToJSON(markup))
-}
-
-/** @public */
-export function areEqualMarkups (markup1: Markup, markup2: Markup): boolean {
-  if (markup1 === markup2) {
-    return true
-  }
-
-  const node1 = markupToJSON(markup1)
-  const node2 = markupToJSON(markup2)
-
-  if (isEmptyNode(node1) && isEmptyNode(node2)) {
-    return true
-  }
-
-  return equalNodes(node1, node2)
-}
-
-/** @public */
-export function areEqualJson (json1: MarkupNode, json2: MarkupNode): boolean {
-  return equalNodes(json1, json2)
-}
-
-function equalNodes (node1: MarkupNode, node2: MarkupNode): boolean {
-  if (node1.type !== node2.type) return false
-
-  const text1 = node1.text ?? ''
-  const text2 = node2.text ?? ''
-  if (text1 !== text2) return false
-
-  if (!equalArrays(node1.content, node2.content, equalNodes)) return false
-  if (!equalArrays(node1.marks, node2.marks, equalMarks)) return false
-  if (!equalRecords(node1.attrs, node2.attrs)) return false
-
-  return true
-}
-
-function equalArrays<T> (a: T[] | undefined, b: T[] | undefined, equal: (a: T, b: T) => boolean): boolean {
-  if (a === b) return true
-  const arr1 = a ?? []
-  const arr2 = b ?? []
-  if (arr1.length !== arr2.length) return false
-  return arr1.every((item1, i) => equal(item1, arr2[i]))
-}
-
-function equalRecords (a: Record<string, any> | undefined, b: Record<string, any> | undefined): boolean {
-  if (a === b) return true
-  a = Object.fromEntries(Object.entries(a ?? {}).filter(([_, v]) => v != null))
-  b = Object.fromEntries(Object.entries(b ?? {}).filter(([_, v]) => v != null))
-  return deepEqual(a, b)
-}
-
-function equalMarks (a: MarkupMark, b: MarkupMark): boolean {
-  return a.type === b.type && equalRecords(a.attrs, b.attrs)
-}
-
-const emptyNodes = [MarkupNodeType.hard_break]
-
-const nonEmptyNodes = [
-  MarkupNodeType.horizontal_rule,
-  MarkupNodeType.image,
-  MarkupNodeType.reference,
-  MarkupNodeType.subLink,
-  MarkupNodeType.table
-]
-
-/** @public */
-export function isEmptyNode (node: MarkupNode): boolean {
-  if (emptyNodes.includes(node.type)) return true
-  if (nonEmptyNodes.includes(node.type)) return false
-  if (node.text !== undefined && node.text?.trim().length > 0) return false
-
-  const content = node.content ?? []
-  return content.every(isEmptyNode)
-}
-
 // Markup
 
 /** @public */
@@ -127,15 +50,8 @@ export function markupToPmNode (markup: Markup, schema?: Schema, extensions?: Ex
   return jsonToPmNode(json, schema, extensions)
 }
 
-// JSON
-
-/** @public */
-export function jsonToMarkup (json: MarkupNode): Markup {
-  return JSON.stringify(json)
-}
-
 /** @public */
-export function markupToJSON (markup: Markup): MarkupNode {
+export function markupHtmlToJSON (markup: Markup): MarkupNode {
   if (markup == null || markup === '') {
     return emptyMarkupNode()
   }
@@ -178,10 +94,10 @@ export function pmNodeToText (node: ProseMirrorNode): string {
   return jsonToText(node.toJSON())
 }
 
-export function markupToText (markup: Markup, schema?: Schema, extensions?: Extensions): string {
-  const pmNode = markupToPmNode(markup, schema, extensions)
-  return pmNode.textBetween(0, pmNode.content.size, '\n', '')
-}
+// export function markupToText (markup: Markup, schema?: Schema, extensions?: Extensions): string {
+//   const pmNode = markupToPmNode(markup, schema, extensions)
+//   return pmNode.textBetween(0, pmNode.content.size, '\n', '')
+// }
 
 // HTML
 
@@ -191,11 +107,11 @@ export function htmlToMarkup (html: string, extensions?: Extensions): Markup {
   return jsonToMarkup(json)
 }
 
-/** @public */
-export function markupToHTML (markup: Markup, extensions?: Extensions): string {
-  const json = markupToJSON(markup)
-  return jsonToHTML(json, extensions)
-}
+// /** @public */
+// export function markupToHTML (markup: Markup, extensions?: Extensions): string {
+//   const json = markupToJSON(markup)
+//   return jsonToHTML(json, extensions)
+// }
 
 /** @public */
 export function htmlToJSON (html: string, extensions?: Extensions): MarkupNode {
@@ -221,55 +137,3 @@ export function pmNodeToHTML (node: ProseMirrorNode, extensions?: Extensions): s
   extensions ??= defaultExtensions
   return generateHTML(node.toJSON(), extensions)
 }
-
-// UTILS
-
-const ELLIPSIS_CHAR = '…'
-const WHITESPACE = ' '
-
-/** @public */
-export function stripTags (markup: Markup, textLimit = 0, extensions: Extensions | undefined = undefined): string {
-  const schema = extensions === undefined ? defaultSchema : getSchema(extensions)
-  const parsed = markupToPmNode(markup, schema)
-
-  const textParts: string[] = []
-  let charCount = 0
-  let isHardStop = false
-
-  const pushText = (text: string): void => {
-    if (textLimit > 0 && charCount + text.length > textLimit) {
-      const toAddCount = textLimit - charCount
-      const textPart = text.substring(0, toAddCount)
-      textParts.push(textPart)
-      textParts.push(ELLIPSIS_CHAR)
-      isHardStop = true
-    } else {
-      textParts.push(text)
-      charCount += text.length
-    }
-  }
-
-  parsed.descendants((node, _pos, parent): boolean => {
-    if (isHardStop) {
-      return false
-    }
-
-    if (node.type.isText) {
-      const text = node.text ?? ''
-      pushText(text)
-      return false
-    } else if (node.type.isBlock) {
-      if (textParts.length > 0 && textParts[textParts.length - 1] !== WHITESPACE) {
-        textParts.push(WHITESPACE)
-        charCount++
-      }
-    } else if (node.type.name === 'reference') {
-      const label = node.attrs.label ?? ''
-      pushText(label.length > 0 ? `@${label}` : '')
-    }
-    return true
-  })
-
-  const result = textParts.join('')
-  return result
-}
diff --git a/plugins/contact-resources/package.json b/plugins/contact-resources/package.json
index 1a512f0d18..76cde76241 100644
--- a/plugins/contact-resources/package.json
+++ b/plugins/contact-resources/package.json
@@ -35,7 +35,8 @@
     "jest": "^29.7.0",
     "ts-jest": "^29.1.1",
     "@types/jest": "^29.5.5",
-    "svelte-eslint-parser": "^0.33.1"
+    "svelte-eslint-parser": "^0.33.1",
+    "@types/crypto-js": "^4.2.2"
   },
   "dependencies": {
     "@hcengineering/activity": "^0.6.0",
@@ -60,6 +61,7 @@
     "@hcengineering/view": "^0.6.13",
     "@hcengineering/view-resources": "^0.6.0",
     "@hcengineering/workbench": "^0.6.16",
-    "svelte": "^4.2.19"
+    "svelte": "^4.2.19",
+    "crypto-js": "^4.2.0"
   }
 }
diff --git a/plugins/contact-resources/src/components/SelectAvatarPopup.svelte b/plugins/contact-resources/src/components/SelectAvatarPopup.svelte
index cbd6dec1a4..6c86063c76 100644
--- a/plugins/contact-resources/src/components/SelectAvatarPopup.svelte
+++ b/plugins/contact-resources/src/components/SelectAvatarPopup.svelte
@@ -15,7 +15,9 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte'
 
-  import { AvatarType, buildGravatarId, checkHasGravatar, type AvatarInfo } from '@hcengineering/contact'
+  import MD5 from 'crypto-js/md5'
+
+  import { AvatarType, checkHasGravatar, type AvatarInfo } from '@hcengineering/contact'
   import type { Ref } from '@hcengineering/core'
   import { Blob as PlatformBlob } from '@hcengineering/core'
   import { Asset } from '@hcengineering/platform'
@@ -38,6 +40,10 @@
   import AvatarComponent from './Avatar.svelte'
   import EditAvatarPopup from './EditAvatarPopup.svelte'
 
+  function buildGravatarId (email: string): string {
+    return MD5(email.trim().toLowerCase()).toString()
+  }
+
   export let selectedAvatarType: AvatarType
   export let selectedAvatar: AvatarInfo['avatar']
   export let selectedAvatarProps: AvatarInfo['avatarProps']
diff --git a/plugins/contact/package.json b/plugins/contact/package.json
index 5d09353696..816d897d2e 100644
--- a/plugins/contact/package.json
+++ b/plugins/contact/package.json
@@ -23,7 +23,6 @@
   },
   "devDependencies": {
     "@hcengineering/platform-rig": "^0.6.0",
-    "@types/crypto-js": "^4.1.1",
     "@typescript-eslint/eslint-plugin": "^6.11.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-promise": "^6.1.1",
@@ -42,8 +41,7 @@
     "@hcengineering/ui": "^0.6.15",
     "@hcengineering/core": "^0.6.32",
     "@hcengineering/templates": "^0.6.11",
-    "@hcengineering/view": "^0.6.13",
-    "crypto-js": "^4.1.1"
+    "@hcengineering/view": "^0.6.13"
   },
   "repository": "https://github.com/hcengineering/platform",
   "publishConfig": {
diff --git a/plugins/contact/src/utils.ts b/plugins/contact/src/utils.ts
index 3879d77cee..9a74ef0176 100644
--- a/plugins/contact/src/utils.ts
+++ b/plugins/contact/src/utils.ts
@@ -16,7 +16,6 @@
 import { AttachedData, Class, Client, Doc, FindResult, Hierarchy, Ref } from '@hcengineering/core'
 import { getMetadata } from '@hcengineering/platform'
 import { ColorDefinition } from '@hcengineering/ui'
-import MD5 from 'crypto-js/md5'
 import { AvatarProvider, AvatarType, Channel, Contact, Person, contactPlugin } from '.'
 import { AVATAR_COLORS, GravatarPlaceholderType } from './types'
 
@@ -48,13 +47,6 @@ export function getAvatarColorName (color: string): string {
   return AVATAR_COLORS.find((col) => col.color === color)?.name ?? AVATAR_COLORS[0].name
 }
 
-/**
- * @public
- */
-export function buildGravatarId (email: string): string {
-  return MD5(email.trim().toLowerCase()).toString()
-}
-
 /**
  * @public
  */
diff --git a/pods/server/src/__start.ts b/pods/server/src/__start.ts
index b4903c9e47..955fb897ad 100644
--- a/pods/server/src/__start.ts
+++ b/pods/server/src/__start.ts
@@ -7,7 +7,6 @@ import { Analytics } from '@hcengineering/analytics'
 import { SplitLogger, configureAnalytics } from '@hcengineering/analytics-service'
 import contactPlugin from '@hcengineering/contact'
 import { MeasureMetricsContext, newMetrics, setOperationLogProfiling } from '@hcengineering/core'
-import notification from '@hcengineering/notification'
 import { setMetadata } from '@hcengineering/platform'
 import { serverConfigFromEnv } from '@hcengineering/server'
 import serverAiBot from '@hcengineering/server-ai-bot'
@@ -65,10 +64,7 @@ setMetadata(serverCore.metadata.FrontUrl, config.frontUrl)
 setMetadata(serverCore.metadata.FilesUrl, config.filesUrl)
 setMetadata(serverToken.metadata.Secret, config.serverSecret)
 setMetadata(serverNotification.metadata.SesUrl, config.sesUrl ?? '')
-setMetadata(notification.metadata.PushPublicKey, config.pushPublicKey)
-setMetadata(serverNotification.metadata.PushPrivateKey, config.pushPrivateKey)
-setMetadata(serverNotification.metadata.PushSubject, config.pushSubject)
-setMetadata(serverCore.metadata.ElasticIndexVersion, 'v1')
+setMetadata(serverNotification.metadata.SesAuthToken, config.sesAuthToken)
 setMetadata(serverTelegram.metadata.BotUrl, process.env.TELEGRAM_BOT_URL)
 setMetadata(serverAiBot.metadata.SupportWorkspaceId, process.env.SUPPORT_WORKSPACE)
 setMetadata(serverAiBot.metadata.EndpointURL, process.env.AI_BOT_URL)
diff --git a/rush.json b/rush.json
index 14700680ff..33c717934b 100644
--- a/rush.json
+++ b/rush.json
@@ -475,6 +475,11 @@
       "projectFolder": "packages/theme",
       "shouldPublish": true
     },
+    {
+      "packageName": "@hcengineering/text-core",
+      "projectFolder": "packages/text-core",
+      "shouldPublish": true
+    },
     {
       "packageName": "@hcengineering/text",
       "projectFolder": "packages/text",
diff --git a/server-plugins/activity-resources/package.json b/server-plugins/activity-resources/package.json
index ccd197abd5..43c4b8c1bf 100644
--- a/server-plugins/activity-resources/package.json
+++ b/server-plugins/activity-resources/package.json
@@ -44,7 +44,7 @@
     "@hcengineering/server-activity": "^0.6.0",
     "@hcengineering/server-core": "^0.6.1",
     "@hcengineering/server-notification-resources": "^0.6.0",
-    "@hcengineering/text": "^0.6.5",
+    "@hcengineering/text-core": "^0.6.0",
     "@hcengineering/contact": "^0.6.24"
   }
 }
diff --git a/server-plugins/activity-resources/src/__tests__/references.test.ts b/server-plugins/activity-resources/src/__tests__/references.test.ts
index 0ce0f2895d..287df1df28 100644
--- a/server-plugins/activity-resources/src/__tests__/references.test.ts
+++ b/server-plugins/activity-resources/src/__tests__/references.test.ts
@@ -14,7 +14,7 @@
 //
 
 import { Class, Doc, Ref } from '@hcengineering/core'
-import { EmptyMarkup, MarkupNodeType, jsonToMarkup } from '@hcengineering/text'
+import { EmptyMarkup, MarkupNodeType, jsonToMarkup } from '@hcengineering/text-core'
 
 import { getReferencesData } from '../references'
 
diff --git a/server-plugins/activity-resources/src/references.ts b/server-plugins/activity-resources/src/references.ts
index 2b455591e9..1021de0469 100644
--- a/server-plugins/activity-resources/src/references.ts
+++ b/server-plugins/activity-resources/src/references.ts
@@ -51,7 +51,7 @@ import {
   toReceiverInfo,
   type NotificationProviderControl
 } from '@hcengineering/server-notification-resources'
-import { areEqualJson, extractReferences, jsonToMarkup, markupToJSON } from '@hcengineering/text'
+import { areEqualJson, extractReferences, jsonToMarkup, markupToJSON } from '@hcengineering/text-core'
 
 export function isDocMentioned (doc: Ref<Doc>, content: string): boolean {
   const references = []
diff --git a/server-plugins/chunter-resources/package.json b/server-plugins/chunter-resources/package.json
index 7b37200614..b83a76c09d 100644
--- a/server-plugins/chunter-resources/package.json
+++ b/server-plugins/chunter-resources/package.json
@@ -50,6 +50,6 @@
     "@hcengineering/server-notification": "^0.6.1",
     "@hcengineering/server-notification-resources": "^0.6.0",
     "@hcengineering/server": "^0.6.4",
-    "@hcengineering/text": "^0.6.5"
+    "@hcengineering/text-core": "^0.6.0"
   }
 }
diff --git a/server-plugins/chunter-resources/src/index.ts b/server-plugins/chunter-resources/src/index.ts
index bfff959b81..3a2cf0650b 100644
--- a/server-plugins/chunter-resources/src/index.ts
+++ b/server-plugins/chunter-resources/src/index.ts
@@ -45,7 +45,7 @@ import {
   getDocCollaborators,
   getMixinTx
 } from '@hcengineering/server-notification-resources'
-import { markupToHTML, markupToText, stripTags } from '@hcengineering/text'
+import { markupToHTML, markupToText, stripTags } from '@hcengineering/text-core'
 import { workbenchId } from '@hcengineering/workbench'
 
 import { getPersonAccountById, NOTIFICATION_BODY_SIZE } from '@hcengineering/server-notification'
diff --git a/server-plugins/controlled-documents-resources/package.json b/server-plugins/controlled-documents-resources/package.json
index 504dcc3b8d..e2281172d7 100644
--- a/server-plugins/controlled-documents-resources/package.json
+++ b/server-plugins/controlled-documents-resources/package.json
@@ -45,7 +45,6 @@
     "@hcengineering/server-token": "^0.6.11",
     "@hcengineering/chunter": "^0.6.20",
     "@hcengineering/server-chunter-resources": "^0.6.0",
-    "@hcengineering/text": "^0.6.5",
     "@hcengineering/request": "^0.6.14",
     "@hcengineering/controlled-documents": "^0.1.0",
     "@hcengineering/training": "^0.1.0"
diff --git a/server-plugins/gmail-resources/package.json b/server-plugins/gmail-resources/package.json
index 888a13c03c..eefd78bced 100644
--- a/server-plugins/gmail-resources/package.json
+++ b/server-plugins/gmail-resources/package.json
@@ -45,7 +45,6 @@
     "@hcengineering/platform": "^0.6.11",
     "@hcengineering/server-core": "^0.6.1",
     "@hcengineering/server-notification": "^0.6.1",
-    "@hcengineering/server-notification-resources": "^0.6.0",
-    "@hcengineering/text": "^0.6.5"
+    "@hcengineering/server-notification-resources": "^0.6.0"
   }
 }
diff --git a/server-plugins/gmail-resources/src/index.ts b/server-plugins/gmail-resources/src/index.ts
index 8919671faa..5e76c20003 100644
--- a/server-plugins/gmail-resources/src/index.ts
+++ b/server-plugins/gmail-resources/src/index.ts
@@ -115,10 +115,12 @@ export async function sendEmailNotification (
       ctx.error('Please provide email service url to enable email notifications.')
       return
     }
+    const sesAuth: string | undefined = getMetadata(serverNotification.metadata.SesAuthToken)
     await fetch(concatLink(sesURL, '/send'), {
       method: 'post',
       headers: {
-        'Content-Type': 'application/json'
+        'Content-Type': 'application/json',
+        ...(sesAuth != null ? { Authorization: `Bearer ${sesAuth}` } : {})
       },
       body: JSON.stringify({
         text,
diff --git a/server-plugins/notification-resources/package.json b/server-plugins/notification-resources/package.json
index 9e2dd97a8b..43f2d57880 100644
--- a/server-plugins/notification-resources/package.json
+++ b/server-plugins/notification-resources/package.json
@@ -34,8 +34,7 @@
     "typescript": "^5.3.3",
     "jest": "^29.7.0",
     "ts-jest": "^29.1.1",
-    "@types/jest": "^29.5.5",
-    "@types/web-push": "~3.6.3"
+    "@types/jest": "^29.5.5"
   },
   "dependencies": {
     "@hcengineering/activity": "^0.6.0",
@@ -48,9 +47,8 @@
     "@hcengineering/workbench": "^0.6.16",
     "@hcengineering/chunter": "^0.6.20",
     "@hcengineering/view": "^0.6.13",
-    "@hcengineering/text": "^0.6.5",
+    "@hcengineering/text-core": "^0.6.0",
     "@hcengineering/contact": "^0.6.24",
-    "@hcengineering/server-view": "^0.6.0",
-    "web-push": "~3.6.7"
+    "@hcengineering/server-view": "^0.6.0"
   }
 }
diff --git a/server-plugins/notification-resources/src/index.ts b/server-plugins/notification-resources/src/index.ts
index 2824c4ff12..622ee07482 100644
--- a/server-plugins/notification-resources/src/index.ts
+++ b/server-plugins/notification-resources/src/index.ts
@@ -79,10 +79,9 @@ import serverNotification, {
   SenderInfo
 } from '@hcengineering/server-notification'
 import serverView from '@hcengineering/server-view'
-import { markupToText, stripTags } from '@hcengineering/text'
+import { markupToText, stripTags } from '@hcengineering/text-core'
 import { encodeObjectURI } from '@hcengineering/view'
 import { workbenchId } from '@hcengineering/workbench'
-import webpush, { WebPushError } from 'web-push'
 import { Analytics } from '@hcengineering/analytics'
 
 import { Content, ContextsCache, ContextsCacheKey, NotifyParams, NotifyResult } from './types'
@@ -574,10 +573,9 @@ export async function createPushNotification (
   senderAvatar?: Data<AvatarInfo>,
   path?: string[]
 ): Promise<void> {
-  const publicKey = getMetadata(notification.metadata.PushPublicKey)
-  const privateKey = getMetadata(serverNotification.metadata.PushPrivateKey)
-  const subject = getMetadata(serverNotification.metadata.PushSubject) ?? 'mailto:hey@huly.io'
-  if (privateKey === undefined || publicKey === undefined) return
+  const sesURL: string | undefined = getMetadata(serverNotification.metadata.SesUrl)
+  const sesAuth: string | undefined = getMetadata(serverNotification.metadata.SesAuthToken)
+  if (sesURL === undefined || sesURL === '') return
   const userSubscriptions = subscriptions.filter((it) => it.user === target)
   const data: PushData = {
     title,
@@ -604,34 +602,45 @@ export async function createPushNotification (
     }
   }
 
-  webpush.setVapidDetails(subject, publicKey, privateKey)
   const limiter = new RateLimiter(5)
-
   for (const subscription of userSubscriptions) {
     await limiter.add(async () => {
-      await sendPushToSubscription(control, target, subscription, data)
+      await sendPushToSubscription(sesURL, sesAuth, control, target, subscription, data)
     })
   }
+  await limiter.waitProcessing()
 }
 
-const errorMessages = ['expired', 'Unregistered', 'No such subscription']
-
 async function sendPushToSubscription (
+  sesURL: string,
+  sesAuth: string | undefined,
   control: TriggerControl,
   targetUser: Ref<Account>,
   subscription: PushSubscription,
   data: PushData
 ): Promise<void> {
   try {
-    await webpush.sendNotification(subscription, JSON.stringify(data))
+    const result: 'ok' | 'clear-push' = (
+      await (
+        await fetch(concatLink(sesURL, '/web-push'), {
+          method: 'post',
+          headers: {
+            'Content-Type': 'application/json',
+            ...(sesAuth != null ? { Authorization: `Bearer ${sesAuth}` } : {})
+          },
+          body: JSON.stringify({
+            subscription,
+            data
+          })
+        })
+      ).json()
+    ).result
+    if (result === 'clear-push') {
+      const tx = control.txFactory.createTxRemoveDoc(subscription._class, subscription.space, subscription._id)
+      await control.apply(control.ctx, [tx])
+    }
   } catch (err) {
     control.ctx.info('Cannot send push notification to', { user: targetUser, err })
-    if (err instanceof WebPushError) {
-      if (errorMessages.some((p) => JSON.stringify((err as WebPushError).body).includes(p))) {
-        const tx = control.txFactory.createTxRemoveDoc(subscription._class, subscription.space, subscription._id)
-        await control.apply(control.ctx, [tx])
-      }
-    }
   }
 }
 
diff --git a/server-plugins/notification/src/index.ts b/server-plugins/notification/src/index.ts
index c4fa751dda..1382bb3c72 100644
--- a/server-plugins/notification/src/index.ts
+++ b/server-plugins/notification/src/index.ts
@@ -151,8 +151,7 @@ export const PUSH_NOTIFICATION_TITLE_SIZE = 80
 export default plugin(serverNotificationId, {
   metadata: {
     SesUrl: '' as Metadata<string>,
-    PushPrivateKey: '' as Metadata<string>,
-    PushSubject: '' as Metadata<string>,
+    SesAuthToken: '' as Metadata<string>,
     InboxOnlyNotifications: '' as Metadata<boolean>
   },
   class: {
diff --git a/server-plugins/telegram-resources/package.json b/server-plugins/telegram-resources/package.json
index 8bbf4d734d..bae15acf6c 100644
--- a/server-plugins/telegram-resources/package.json
+++ b/server-plugins/telegram-resources/package.json
@@ -50,6 +50,6 @@
     "@hcengineering/server-token": "^0.6.11",
     "@hcengineering/setting": "^0.6.17",
     "@hcengineering/telegram": "^0.6.21",
-    "@hcengineering/text": "^0.6.5"
+    "@hcengineering/text-core": "^0.6.0"
   }
 }
diff --git a/server-plugins/telegram-resources/src/index.ts b/server-plugins/telegram-resources/src/index.ts
index 7179cd2ca0..2a02e17865 100644
--- a/server-plugins/telegram-resources/src/index.ts
+++ b/server-plugins/telegram-resources/src/index.ts
@@ -49,7 +49,7 @@ import serverTelegram from '@hcengineering/server-telegram'
 import { generateToken } from '@hcengineering/server-token'
 import setting, { Integration } from '@hcengineering/setting'
 import telegram, { TelegramMessage, TelegramNotificationRequest } from '@hcengineering/telegram'
-import { markupToHTML } from '@hcengineering/text'
+import { markupToHTML } from '@hcengineering/text-core'
 
 /**
  * @public
diff --git a/server-plugins/time-resources/package.json b/server-plugins/time-resources/package.json
index b08270740c..60560cd955 100644
--- a/server-plugins/time-resources/package.json
+++ b/server-plugins/time-resources/package.json
@@ -47,7 +47,7 @@
     "@hcengineering/task": "^0.6.20",
     "@hcengineering/tracker": "^0.6.24",
     "@hcengineering/server-time": "^0.6.0",
-    "@hcengineering/text": "^0.6.5",
+    "@hcengineering/text-core": "^0.6.0",
     "@hcengineering/time": "^0.6.0"
   }
 }
diff --git a/server-plugins/time-resources/src/index.ts b/server-plugins/time-resources/src/index.ts
index 69048df8c7..95f20bb39d 100644
--- a/server-plugins/time-resources/src/index.ts
+++ b/server-plugins/time-resources/src/index.ts
@@ -43,7 +43,7 @@ import {
 } from '@hcengineering/server-notification-resources'
 import serverTime, { OnToDo, ToDoFactory } from '@hcengineering/server-time'
 import task, { makeRank } from '@hcengineering/task'
-import { jsonToMarkup, nodeDoc, nodeParagraph, nodeText } from '@hcengineering/text'
+import { jsonToMarkup, nodeDoc, nodeParagraph, nodeText } from '@hcengineering/text-core'
 import time, { ProjectToDo, ToDo, ToDoPriority, TodoAutomationHelper, WorkSlot } from '@hcengineering/time'
 import tracker, { Issue, IssueStatus, Project, TimeSpendReport } from '@hcengineering/tracker'
 
diff --git a/server-plugins/tracker-resources/package.json b/server-plugins/tracker-resources/package.json
index 00fdaad6b7..e3cd0018a4 100644
--- a/server-plugins/tracker-resources/package.json
+++ b/server-plugins/tracker-resources/package.json
@@ -47,7 +47,7 @@
     "@hcengineering/server-notification": "^0.6.1",
     "@hcengineering/server-task-resources": "^0.6.0",
     "@hcengineering/task": "^0.6.20",
-    "@hcengineering/text": "^0.6.5",
+    "@hcengineering/text-core": "^0.6.0",
     "@hcengineering/tracker": "^0.6.24",
     "@hcengineering/view": "^0.6.13",
     "@hcengineering/workbench": "^0.6.16"
diff --git a/server-plugins/tracker-resources/src/index.ts b/server-plugins/tracker-resources/src/index.ts
index f96db94b34..588b4f2e45 100644
--- a/server-plugins/tracker-resources/src/index.ts
+++ b/server-plugins/tracker-resources/src/index.ts
@@ -35,7 +35,7 @@ import { NotificationContent } from '@hcengineering/notification'
 import { getMetadata, IntlString } from '@hcengineering/platform'
 import serverCore, { TriggerControl } from '@hcengineering/server-core'
 import { NOTIFICATION_BODY_SIZE } from '@hcengineering/server-notification'
-import { stripTags } from '@hcengineering/text'
+import { stripTags } from '@hcengineering/text-core'
 import tracker, { Component, Issue, IssueParentInfo, TimeSpendReport, trackerId } from '@hcengineering/tracker'
 import { workbenchId } from '@hcengineering/workbench'
 
diff --git a/server/account/package.json b/server/account/package.json
index 1911805861..e700f8986d 100644
--- a/server/account/package.json
+++ b/server/account/package.json
@@ -35,7 +35,8 @@
     "jest": "^29.7.0",
     "ts-jest": "^29.1.1",
     "@types/jest": "^29.5.5",
-    "@types/otp-generator": "^4.0.2"
+    "@types/otp-generator": "^4.0.2",
+    "@types/crypto-js": "^4.2.2"
   },
   "dependencies": {
     "@hcengineering/mongo": "^0.6.1",
@@ -55,6 +56,7 @@
     "@hcengineering/analytics": "^0.6.0",
     "@hcengineering/server-storage": "^0.6.0",
     "@hcengineering/server-core": "^0.6.1",
-    "@hcengineering/server-pipeline": "^0.6.0"
+    "@hcengineering/server-pipeline": "^0.6.0",
+    "crypto-js": "^4.2.0"
   }
 }
diff --git a/server/account/src/operations.ts b/server/account/src/operations.ts
index 52c230fb29..810a594122 100644
--- a/server/account/src/operations.ts
+++ b/server/account/src/operations.ts
@@ -16,7 +16,6 @@
 import { Analytics } from '@hcengineering/analytics'
 import contact, {
   AvatarType,
-  buildGravatarId,
   checkHasGravatar,
   combineName,
   Employee,
@@ -95,6 +94,10 @@ import {
 } from './utils'
 import { getWorkspaceDestroyAdapter } from '@hcengineering/server-pipeline'
 
+import MD5 from 'crypto-js/md5'
+function buildGravatarId (email: string): string {
+  return MD5(email.trim().toLowerCase()).toString()
+}
 /**
  * @public
  */
diff --git a/server/server/src/starter.ts b/server/server/src/starter.ts
index 242fbec366..1a8fef9921 100644
--- a/server/server/src/starter.ts
+++ b/server/server/src/starter.ts
@@ -6,12 +6,10 @@ export interface ServerEnv {
   frontUrl: string
   filesUrl: string | undefined
   sesUrl: string | undefined
+  sesAuthToken: string | undefined
   accountsUrl: string
   serverPort: number
   enableCompression: boolean
-  pushPublicKey: string | undefined
-  pushPrivateKey: string | undefined
-  pushSubject: string | undefined
   brandingPath: string | undefined
 }
 
@@ -47,6 +45,7 @@ export function serverConfigFromEnv (): ServerEnv {
 
   const filesUrl = process.env.FILES_URL
   const sesUrl = process.env.SES_URL
+  const sesAuthToken = process.env.SES_AUTH_TOKEN
 
   const accountsUrl = process.env.ACCOUNTS_URL
   if (accountsUrl === undefined) {
@@ -54,9 +53,6 @@ export function serverConfigFromEnv (): ServerEnv {
     process.exit(1)
   }
 
-  const pushPublicKey = process.env.PUSH_PUBLIC_KEY
-  const pushPrivateKey = process.env.PUSH_PRIVATE_KEY
-  const pushSubject = process.env.PUSH_SUBJECT
   const brandingPath = process.env.BRANDING_PATH
 
   return {
@@ -67,12 +63,10 @@ export function serverConfigFromEnv (): ServerEnv {
     frontUrl,
     filesUrl,
     sesUrl,
+    sesAuthToken,
     accountsUrl,
     serverPort,
     enableCompression,
-    pushPublicKey,
-    pushPrivateKey,
-    pushSubject,
     brandingPath
   }
 }
diff --git a/services/ses/pod-ses/package.json b/services/ses/pod-ses/package.json
index cc22a6712a..8693fe15ee 100644
--- a/services/ses/pod-ses/package.json
+++ b/services/ses/pod-ses/package.json
@@ -50,7 +50,8 @@
     "@tsconfig/node16": "^1.0.4",
     "@types/cors": "^2.8.12",
     "@types/express": "^4.17.13",
-    "eslint-plugin-node": "^11.1.0"
+    "eslint-plugin-node": "^11.1.0",
+    "@types/web-push": "^3.6.4"
   },
   "dependencies": {
     "@hcengineering/client": "^0.6.18",
@@ -62,6 +63,7 @@
     "aws-sdk": "^2.1423.0",
     "cors": "^2.8.5",
     "dotenv": "~16.0.0",
-    "express": "^4.21.2"
+    "express": "^4.21.2",
+    "web-push": "^3.6.7"
   }
 }
diff --git a/services/ses/pod-ses/src/config.ts b/services/ses/pod-ses/src/config.ts
index 1a227a82e9..302abfd474 100644
--- a/services/ses/pod-ses/src/config.ts
+++ b/services/ses/pod-ses/src/config.ts
@@ -19,14 +19,22 @@ interface Config {
   AccessKey: string
   SecretKey: string
   Region: string
+  AuthToken?: string
+  PushSubject?: string
+  PushPublicKey?: string
+  PushPrivateKey?: string
 }
 
-const envMap: { [key in keyof Config]: string } = {
+const envMap: { [key in keyof Required<Config>]: string } = {
   Port: 'PORT',
   Source: 'SOURCE',
   AccessKey: 'ACCESS_KEY',
   SecretKey: 'SECRET_KEY',
-  Region: 'REGION'
+  Region: 'REGION',
+  AuthToken: 'AUTH_TOKEN',
+  PushPublicKey: 'PUSH_PUBLIC_KEY',
+  PushPrivateKey: 'PUSH_PRIVATE_KEY',
+  PushSubject: 'PUSH_SUBJECT'
 }
 
 const parseNumber = (str: string | undefined): number | undefined => (str !== undefined ? Number(str) : undefined)
@@ -37,7 +45,11 @@ const config: Config = (() => {
     Source: process.env[envMap.Source],
     AccessKey: process.env[envMap.AccessKey],
     SecretKey: process.env[envMap.SecretKey],
-    Region: process.env[envMap.Region] ?? 'us-east-1'
+    Region: process.env[envMap.Region] ?? 'us-east-1',
+    AuthToken: process.env[envMap.AuthToken],
+    PushPublicKey: process.env[envMap.PushPublicKey],
+    PushPrivateKey: process.env[envMap.PushPrivateKey],
+    PushSubject: process.env[envMap.PushSubject]
   }
 
   const required: Array<keyof Config> = ['Port', 'Source', 'AccessKey', 'SecretKey', 'Region']
diff --git a/services/ses/pod-ses/src/main.ts b/services/ses/pod-ses/src/main.ts
index 4f27c79901..6e91af0cc2 100644
--- a/services/ses/pod-ses/src/main.ts
+++ b/services/ses/pod-ses/src/main.ts
@@ -13,20 +13,57 @@
 // limitations under the License.
 //
 
+import { PushSubscription, type PushData } from '@hcengineering/notification'
+import type { Request, Response } from 'express'
+import webpush, { WebPushError } from 'web-push'
 import config from './config'
 import { createServer, listen } from './server'
 import { SES } from './ses'
 import { Endpoint } from './types'
 
+const errorMessages = ['expired', 'Unregistered', 'No such subscription']
+async function sendPushToSubscription (subscription: PushSubscription, data: PushData): Promise<'ok' | 'clear-push'> {
+  try {
+    await webpush.sendNotification(subscription, JSON.stringify(data))
+  } catch (err: any) {
+    if (err instanceof WebPushError) {
+      if (errorMessages.some((p) => JSON.stringify((err as WebPushError).body).includes(p))) {
+        return 'clear-push'
+      }
+    }
+  }
+  return 'ok'
+}
+
 export const main = async (): Promise<void> => {
   const ses = new SES()
   console.log('SES service has been started')
 
+  if (config.PushPublicKey !== undefined && config.PushPrivateKey !== undefined) {
+    webpush.setVapidDetails(config.PushSubject ?? 'mailto:hey@huly.io', config.PushPublicKey, config.PushPublicKey)
+  }
+
+  const checkAuth = (req: Request<any>, res: Response<any>): boolean => {
+    if (config.AuthToken !== undefined) {
+      // We need to verify authorization
+      const authorization = req.headers.authorization ?? ''
+      const token = authorization.replace('Bearer ', '')
+      if (token !== config.AuthToken) {
+        res.status(401).send({ err: 'Invalid auth token' })
+        return false
+      }
+    }
+    return true
+  }
+
   const endpoints: Endpoint[] = [
     {
       endpoint: '/send',
       type: 'post',
       handler: async (req, res) => {
+        if (!checkAuth(req, res)) {
+          return
+        }
         const text = req.body?.text
         if (text === undefined) {
           res.status(400).send({ err: "'text' is missing" })
@@ -54,6 +91,28 @@ export const main = async (): Promise<void> => {
 
         res.send()
       }
+    },
+    {
+      endpoint: '/web-push',
+      type: 'post',
+      handler: async (req, res) => {
+        if (!checkAuth(req, res)) {
+          return
+        }
+        const data: PushData | undefined = req.body?.data
+        if (data === undefined) {
+          res.status(400).send({ err: "'data' is missing" })
+          return
+        }
+        const subscription: PushSubscription | undefined = req.body?.subscription
+        if (subscription === undefined) {
+          res.status(400).send({ err: "'subscription' is missing" })
+          return
+        }
+
+        const result = await sendPushToSubscription(subscription, data)
+        res.json({ result })
+      }
     }
   ]
 
diff --git a/workers/transactor/calc.sh b/workers/transactor/calc.sh
index 2297ddf15a..164e22cf5e 100755
--- a/workers/transactor/calc.sh
+++ b/workers/transactor/calc.sh
@@ -17,5 +17,7 @@ done <<< "$files"
 
 # Sort the array by size (numerically, in descending order) and print
 printf '%s\n' "${file_info[@]}" | sort -t: -k1,1nr | while IFS=: read -r size path; do
-    echo "Size: $(($size/1024)) KB - $path"
+    if [ $(($size/1024)) -ne 0 ]; then
+        echo "Size: $(($size/1024)) KB - $path"
+    fi
 done
\ No newline at end of file
diff --git a/workers/transactor/package.json b/workers/transactor/package.json
index 2d4fc98185..be914e0be5 100644
--- a/workers/transactor/package.json
+++ b/workers/transactor/package.json
@@ -54,7 +54,12 @@
     "@hcengineering/server-client": "^0.6.0",
     "@hcengineering/server-pipeline": "^0.6.0",
     "@hcengineering/server-token": "^0.6.11",
+    "@hcengineering/contact": "^0.6.24",
     "@hcengineering/storage": "^0.6.0",
+    "@hcengineering/server-notification": "^0.6.1",
+    "@hcengineering/notification": "^0.6.23",
+    "@hcengineering/server-ai-bot": "^0.6.0",
+    "@hcengineering/server-telegram": "^0.6.0",
     "itty-router": "^5.0.18",
     "snappyjs": "^0.7.0"
   }
diff --git a/workers/transactor/src/transactor.ts b/workers/transactor/src/transactor.ts
index a1f64bd565..d587208917 100644
--- a/workers/transactor/src/transactor.ts
+++ b/workers/transactor/src/transactor.ts
@@ -16,7 +16,7 @@ import { setMetadata } from '@hcengineering/platform'
 import { RPCHandler } from '@hcengineering/rpc'
 import { ClientSession, createSessionManager, doSessionOp, type WebsocketData } from '@hcengineering/server'
 import serverClient from '@hcengineering/server-client'
-import {
+import serverCore, {
   createDummyStorageAdapter,
   initStatisticsContext,
   loadBrandingMap,
@@ -52,6 +52,12 @@ import {
 } from '@hcengineering/server-pipeline'
 import { CloudFlareLogger } from './logger'
 import model from './model.json'
+// import { configureAnalytics } from '@hcengineering/analytics-service'
+// import { Analytics } from '@hcengineering/analytics'
+import serverAiBot from '@hcengineering/server-ai-bot'
+import serverNotification from '@hcengineering/server-notification'
+import serverTelegram from '@hcengineering/server-telegram'
+import contactPlugin from '@hcengineering/contact'
 
 export const PREFERRED_SAVE_SIZE = 500
 export const PREFERRED_SAVE_INTERVAL = 30 * 1000
@@ -82,6 +88,20 @@ export class Transactor extends DurableObject<Env> {
     setExtraOptions({
       useCF: true
     })
+
+    // configureAnalytics(env.SENTRY_DSN, {})
+    // Analytics.setTag('application', 'transactor')
+
+    const lastNameFirst = process.env.LAST_NAME_FIRST === 'true'
+    setMetadata(contactPlugin.metadata.LastNameFirst, lastNameFirst)
+    setMetadata(serverCore.metadata.FrontUrl, env.FRONT_URL)
+    setMetadata(serverCore.metadata.FilesUrl, env.FILES_URL)
+    setMetadata(serverNotification.metadata.SesUrl, env.SES_URL ?? '')
+    setMetadata(serverNotification.metadata.SesAuthToken, env.SES_AUTH_TOKEN)
+    setMetadata(serverTelegram.metadata.BotUrl, process.env.TELEGRAM_BOT_URL)
+    setMetadata(serverAiBot.metadata.SupportWorkspaceId, process.env.SUPPORT_WORKSPACE)
+    setMetadata(serverAiBot.metadata.EndpointURL, process.env.AI_BOT_URL)
+
     registerTxAdapterFactory('postgresql', createPostgresTxAdapter, true)
     registerAdapterFactory('postgresql', createPostgresAdapter, true)
     registerDestroyFactory('postgresql', createPostgreeDestroyAdapter, true)
diff --git a/workers/transactor/worker-configuration.d.ts b/workers/transactor/worker-configuration.d.ts
index b911f3c36f..caa7a739f2 100644
--- a/workers/transactor/worker-configuration.d.ts
+++ b/workers/transactor/worker-configuration.d.ts
@@ -18,4 +18,16 @@ interface Env {
   FULLTEXT_URL: string | undefined
 
   DB_MODE: 'hyperdrive' | 'direct' | undefined
+
+  FRONT_URL: string
+
+  FILES_URL?: string
+
+  SES_URL?: string
+  SES_AUTH_TOKEN?: string
+  SUPPORT_WORKSPACE?: string
+  TELEGRAM_BOT_URL: string
+  AI_BOT_URL?: string
+  LAST_NAME_FIRST?: string
+
 }
diff --git a/workers/transactor/wrangler.toml b/workers/transactor/wrangler.toml
index 92cad4fa3d..53a876fe57 100644
--- a/workers/transactor/wrangler.toml
+++ b/workers/transactor/wrangler.toml
@@ -25,6 +25,18 @@ mode = "smart"
 # ACCOUNTS_URL = "http://127.0.0.1:3000"
 # SERVER_SECRET = "secret"
 DB_MODE='hyperdrive'
+# FRONT_URL
+ENABLE_COMPRESSION=true
+# ACCOUNTS_URL
+# FULLTEXT_URL
+# STATS_URL
+# PUSH_PUBLIC_KEY
+# PUSH_PRIVATE_KEY
+# SENTRY_DSN
+# SUPPORT_WORKSPACE
+# TELEGRAM_BOT_URL
+# AI_BOT_URL
+# LAST_NAME_FIRST
 
 # Bind the Workers AI model catalog. Run machine learning models, powered by serverless GPUs, on Cloudflare’s global network
 # Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#workers-ai

From 5ace5b744b04ac76db81812e4545b15ace92f9a8 Mon Sep 17 00:00:00 2001
From: Alexander Onnikov <aonnikov@hardcoreeng.com>
Date: Wed, 22 Jan 2025 18:30:53 +0700
Subject: [PATCH 16/21] UBERF-9226 Workspace reindex tool (#7756)

Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com>
---
 dev/tool/src/fulltext.ts              | 33 ++++++++++++++++++++++++
 dev/tool/src/index.ts                 | 37 +++++++++++++++++++--------
 dev/tool/src/workspace.ts             | 14 ----------
 pods/fulltext/src/server.ts           | 32 +++++++++++++++++++++++
 server/indexer/src/indexer/indexer.ts | 14 ++++++++++
 5 files changed, 106 insertions(+), 24 deletions(-)
 create mode 100644 dev/tool/src/fulltext.ts

diff --git a/dev/tool/src/fulltext.ts b/dev/tool/src/fulltext.ts
new file mode 100644
index 0000000000..fc31673916
--- /dev/null
+++ b/dev/tool/src/fulltext.ts
@@ -0,0 +1,33 @@
+//
+// Copyright © 2025 Hardcore Engineering Inc.
+//
+// Licensed under the Eclipse Public License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License. You may
+// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import { type MeasureContext } from '@hcengineering/core'
+
+export async function reindexWorkspace (ctx: MeasureContext, fulltextUrl: string, token: string): Promise<void> {
+  try {
+    const res = await fetch(fulltextUrl + '/api/v1/reindex', {
+      method: 'PUT',
+      headers: {
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify({ token })
+    })
+    if (!res.ok) {
+      throw new Error(`HTTP Error ${res.status} ${res.statusText}`)
+    }
+  } catch (err: any) {
+    ctx.error('failed to reset index', { err })
+  }
+}
diff --git a/dev/tool/src/index.ts b/dev/tool/src/index.ts
index 4095fac8cd..a6dac6c52b 100644
--- a/dev/tool/src/index.ts
+++ b/dev/tool/src/index.ts
@@ -77,7 +77,7 @@ import { buildStorageFromConfig, createStorageFromConfig, storageConfigFromEnv }
 import { program, type Command } from 'commander'
 import { addControlledDocumentRank } from './qms'
 import { clearTelegramHistory } from './telegram'
-import { diffWorkspace, recreateElastic, updateField } from './workspace'
+import { diffWorkspace, updateField } from './workspace'
 
 import core, {
   AccountRole,
@@ -149,6 +149,7 @@ import { fixMixinForeignAttributes, showMixinForeignAttributes } from './mixin'
 import { fixAccountEmails, renameAccount } from './renameAccount'
 import { copyToDatalake, moveFiles, showLostFiles } from './storage'
 import { createPostgresTxAdapter, createPostgresAdapter, createPostgreeDestroyAdapter } from '@hcengineering/postgres'
+import { reindexWorkspace } from './fulltext'
 
 const colorConstants = {
   colorRed: '\u001b[31m',
@@ -1925,27 +1926,43 @@ export function devTool (
     )
 
   program
-    .command('recreate-elastic-indexes-mongo <workspace>')
-    .description('reindex workspace to elastic')
+    .command('fulltext-reindex <workspace>')
+    .description('reindex workspace')
     .action(async (workspace: string) => {
-      const mongodbUri = getMongoDBUrl()
+      const fulltextUrl = process.env.FULLTEXT_URL
+      if (fulltextUrl === undefined) {
+        console.error('please provide FULLTEXT_URL')
+        process.exit(1)
+      }
+
       const wsid = getWorkspaceId(workspace)
-      await recreateElastic(mongodbUri, wsid)
+      const token = generateToken(systemAccountEmail, wsid)
+
+      console.log('reindex workspace', workspace)
+      await reindexWorkspace(toolCtx, fulltextUrl, token)
+      console.log('done', workspace)
     })
 
   program
-    .command('recreate-all-elastic-indexes-mongo')
-    .description('reindex elastic')
+    .command('fulltext-reindex-all')
+    .description('reindex workspaces')
     .action(async () => {
-      const { dbUrl } = prepareTools()
-      const mongodbUri = getMongoDBUrl()
+      const fulltextUrl = process.env.FULLTEXT_URL
+      if (fulltextUrl === undefined) {
+        console.error('please provide FULLTEXT_URL')
+        process.exit(1)
+      }
 
       await withAccountDatabase(async (db) => {
         const workspaces = await listWorkspacesRaw(db)
         workspaces.sort((a, b) => b.lastVisit - a.lastVisit)
         for (const workspace of workspaces) {
           const wsid = getWorkspaceId(workspace.workspace)
-          await recreateElastic(mongodbUri ?? dbUrl, wsid)
+          const token = generateToken(systemAccountEmail, wsid)
+
+          console.log('reindex workspace', workspace)
+          await reindexWorkspace(toolCtx, fulltextUrl, token)
+          console.log('done', workspace)
         }
       })
     })
diff --git a/dev/tool/src/workspace.ts b/dev/tool/src/workspace.ts
index 9852311668..d704a8d309 100644
--- a/dev/tool/src/workspace.ts
+++ b/dev/tool/src/workspace.ts
@@ -20,7 +20,6 @@ import core, {
   type Class,
   type Client as CoreClient,
   type Doc,
-  DOMAIN_DOC_INDEX_STATE,
   DOMAIN_TX,
   type Ref,
   type Tx,
@@ -96,16 +95,3 @@ export async function updateField (
     await connection.close()
   }
 }
-
-export async function recreateElastic (mongoUrl: string, workspaceId: WorkspaceId): Promise<void> {
-  const client = getMongoClient(mongoUrl)
-  const _client = await client.getClient()
-  try {
-    const db = getWorkspaceMongoDB(_client, workspaceId)
-    await db
-      .collection(DOMAIN_DOC_INDEX_STATE)
-      .updateMany({ _class: core.class.DocIndexState }, { $set: { needIndex: true } })
-  } finally {
-    client.close()
-  }
-}
diff --git a/pods/fulltext/src/server.ts b/pods/fulltext/src/server.ts
index 93fc5e6d31..605a28c37e 100644
--- a/pods/fulltext/src/server.ts
+++ b/pods/fulltext/src/server.ts
@@ -161,6 +161,14 @@ class WorkspaceIndexer {
     return result
   }
 
+  async reindex (): Promise<void> {
+    await this.fulltext.cancel()
+    await this.fulltext.clearIndex()
+    await this.fulltext.startIndexing(() => {
+      this.lastUpdate = Date.now()
+    })
+  }
+
   async close (): Promise<void> {
     await this.fulltext.cancel()
     await this.pipeline.close()
@@ -188,6 +196,10 @@ interface Search {
   fullTextLimit: number
 }
 
+interface Reindex {
+  token: string
+}
+
 export async function startIndexer (
   ctx: MeasureContext,
   opt: {
@@ -391,6 +403,26 @@ export async function startIndexer (
     }
   })
 
+  router.put('/api/v1/reindex', async (req, res) => {
+    try {
+      const request = req.request.body as Reindex
+      const decoded = decodeToken(request.token) // Just to be safe
+      req.body = {}
+
+      ctx.info('reindex', { workspace: decoded.workspace })
+      const indexer = await getIndexer(ctx, decoded.workspace, request.token, true)
+      if (indexer !== undefined) {
+        indexer.lastUpdate = Date.now()
+        await indexer.reindex()
+      }
+    } catch (err: any) {
+      Analytics.handleError(err)
+      console.error(err)
+      req.res.writeHead(404, {})
+      req.res.end()
+    }
+  })
+
   app.use(router.routes()).use(router.allowedMethods())
 
   const server = app.listen(opt.port, () => {
diff --git a/server/indexer/src/indexer/indexer.ts b/server/indexer/src/indexer/indexer.ts
index 0777e7445c..60fca5e5d7 100644
--- a/server/indexer/src/indexer/indexer.ts
+++ b/server/indexer/src/indexer/indexer.ts
@@ -165,6 +165,7 @@ export class FullTextIndexPipeline implements FullTextPipeline {
   triggerIndexing = (): void => {}
 
   async startIndexing (indexing: () => void): Promise<void> {
+    this.cancelling = false
     this.verify = this.verifyWorkspace(this.metrics, indexing)
     void this.verify.then(() => {
       this.indexing = this.doIndexing(indexing)
@@ -282,6 +283,19 @@ export class FullTextIndexPipeline implements FullTextPipeline {
     }
   }
 
+  async clearIndex (): Promise<void> {
+    const ctx = this.metrics
+    const migrations = await this.storage.findAll<MigrationState>(ctx, core.class.MigrationState, {
+      plugin: coreId,
+      state: {
+        $in: ['verify-indexes-v2', 'full-text-indexer-v4', 'full-text-structure-v4']
+      }
+    })
+
+    const refs = migrations.map((it) => it._id)
+    await this.storage.clean(ctx, DOMAIN_MIGRATION, refs)
+  }
+
   broadcastClasses = new Set<Ref<Class<Doc>>>()
   broadcasts: number = 0
 

From 82a92040763120ff021662e197c39706418b0bdb Mon Sep 17 00:00:00 2001
From: Andrey Sobolev <haiodo@users.noreply.github.com>
Date: Wed, 22 Jan 2025 19:22:50 +0700
Subject: [PATCH 17/21] QFIX: PG query (#7758)

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
---
 server/postgres/src/storage.ts | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/server/postgres/src/storage.ts b/server/postgres/src/storage.ts
index 09f3915608..e8b3c4fe79 100644
--- a/server/postgres/src/storage.ts
+++ b/server/postgres/src/storage.ts
@@ -80,6 +80,7 @@ import {
   createTables,
   DBCollectionHelper,
   type DBDoc,
+  dbExtra,
   getDBClient,
   getPrepare,
   inferType,
@@ -673,7 +674,7 @@ abstract class PostgresAdapterBase implements DbAdapter {
             sqlChunks.push(secJoin)
           }
           if (joins.length > 0) {
-            sqlChunks.push(this.buildJoinString(joins))
+            sqlChunks.push(this.buildJoinString(vars, joins))
           }
           sqlChunks.push(`WHERE ${this.buildQuery(vars, _class, domain, query, joins, options)}`)
 
@@ -699,7 +700,9 @@ abstract class PostgresAdapterBase implements DbAdapter {
             const finalSql: string = [select, ...sqlChunks].join(' ')
             fquery = finalSql
 
-            const result = await connection.unsafe(finalSql, vars.getValues(), getPrepare())
+            const result = dbExtra?.useCF
+              ? await connection.unsafe(vars.injectVars(finalSql), undefined, { prepare: false })
+              : await connection.unsafe(finalSql, vars.getValues(), getPrepare())
             if (
               options?.lookup === undefined &&
               options?.domainLookup === undefined &&
@@ -934,19 +937,19 @@ abstract class PostgresAdapterBase implements DbAdapter {
     }
   }
 
-  private buildJoinString (value: JoinProps[]): string {
+  private buildJoinString (vars: ValuesVariables, value: JoinProps[]): string {
     const res: string[] = []
     for (const val of value) {
       if (val.isReverse) continue
       if (val.table === DOMAIN_MODEL) continue
       res.push(
-        `LEFT JOIN ${val.table} AS ${val.toAlias} ON ${val.fromAlias}.${val.fromField} = ${val.toAlias}."${val.toField}" AND ${val.toAlias}."workspaceId" = '${this.workspaceId.name}'`
+        `LEFT JOIN ${val.table} AS ${val.toAlias} ON ${val.fromAlias}.${val.fromField} = ${val.toAlias}."${val.toField}" AND ${val.toAlias}."workspaceId" = ${vars.add(this.workspaceId.name, '::uuid')}`
       )
       if (val.classes !== undefined) {
         if (val.classes.length === 1) {
-          res.push(`AND ${val.toAlias}._class = '${val.classes[0]}'`)
+          res.push(`AND ${val.toAlias}._class = ${vars.add(val.classes[0], '::text')}`)
         } else {
-          res.push(`AND ${val.toAlias}._class IN (${val.classes.map((c) => `'${c}'`).join(', ')})`)
+          res.push(`AND ${val.toAlias}._class = ANY (${vars.addArray(val.classes, '::text[]')})`)
         }
       }
     }
@@ -1251,7 +1254,7 @@ abstract class PostgresAdapterBase implements DbAdapter {
   }
 
   private translateQueryValue (vars: ValuesVariables, tkey: string, value: any, type: ValueType): string | undefined {
-    const tkeyData = tkey.includes('data->') || tkey.includes('data#>>')
+    const tkeyData = tkey.includes('data') && (tkey.includes('->') || tkey.includes('#>>'))
     if (tkeyData && (Array.isArray(value) || (typeof value !== 'object' && typeof value !== 'string'))) {
       value = Array.isArray(value) ? value.map((it) => (it == null ? null : `${it}`)) : `${value}`
     }

From 90e8ca4e976730694b3d1b299ebc831e28eafa47 Mon Sep 17 00:00:00 2001
From: Andrey Sobolev <haiodo@users.noreply.github.com>
Date: Wed, 22 Jan 2025 19:25:49 +0700
Subject: [PATCH 18/21] UBERF-9230: Fix ses webpush (#7760)

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
---
 .../notification-resources/src/index.ts       | 29 +++++-------
 services/ses/pod-ses/src/index.ts             |  6 ++-
 services/ses/pod-ses/src/main.ts              | 47 +++++++++++++------
 3 files changed, 50 insertions(+), 32 deletions(-)

diff --git a/server-plugins/notification-resources/src/index.ts b/server-plugins/notification-resources/src/index.ts
index 622ee07482..9f5994e4e2 100644
--- a/server-plugins/notification-resources/src/index.ts
+++ b/server-plugins/notification-resources/src/index.ts
@@ -15,6 +15,7 @@
 //
 
 import activity, { ActivityMessage, DocUpdateMessage } from '@hcengineering/activity'
+import { Analytics } from '@hcengineering/analytics'
 import chunter, { ChatMessage } from '@hcengineering/chunter'
 import contact, {
   Employee,
@@ -39,7 +40,6 @@ import core, {
   generateId,
   MeasureContext,
   MixinUpdate,
-  RateLimiter,
   Ref,
   RefTo,
   SortingOrder,
@@ -82,7 +82,6 @@ import serverView from '@hcengineering/server-view'
 import { markupToText, stripTags } from '@hcengineering/text-core'
 import { encodeObjectURI } from '@hcengineering/view'
 import { workbenchId } from '@hcengineering/workbench'
-import { Analytics } from '@hcengineering/analytics'
 
 import { Content, ContextsCache, ContextsCacheKey, NotifyParams, NotifyResult } from './types'
 import {
@@ -92,6 +91,7 @@ import {
   getNotificationContent,
   getNotificationLink,
   getNotificationProviderControl,
+  getObjectSpace,
   getTextPresenter,
   getUsersInfo,
   isAllowed,
@@ -103,8 +103,7 @@ import {
   replaceAll,
   toReceiverInfo,
   updateNotifyContextsSpace,
-  type NotificationProviderControl,
-  getObjectSpace
+  type NotificationProviderControl
 } from './utils'
 
 export function getPushCollaboratorTx (
@@ -602,13 +601,7 @@ export async function createPushNotification (
     }
   }
 
-  const limiter = new RateLimiter(5)
-  for (const subscription of userSubscriptions) {
-    await limiter.add(async () => {
-      await sendPushToSubscription(sesURL, sesAuth, control, target, subscription, data)
-    })
-  }
-  await limiter.waitProcessing()
+  void sendPushToSubscription(sesURL, sesAuth, control, target, userSubscriptions, data)
 }
 
 async function sendPushToSubscription (
@@ -616,11 +609,11 @@ async function sendPushToSubscription (
   sesAuth: string | undefined,
   control: TriggerControl,
   targetUser: Ref<Account>,
-  subscription: PushSubscription,
+  subscriptions: PushSubscription[],
   data: PushData
 ): Promise<void> {
   try {
-    const result: 'ok' | 'clear-push' = (
+    const result: Ref<PushSubscription>[] = (
       await (
         await fetch(concatLink(sesURL, '/web-push'), {
           method: 'post',
@@ -629,15 +622,17 @@ async function sendPushToSubscription (
             ...(sesAuth != null ? { Authorization: `Bearer ${sesAuth}` } : {})
           },
           body: JSON.stringify({
-            subscription,
+            subscriptions,
             data
           })
         })
       ).json()
     ).result
-    if (result === 'clear-push') {
-      const tx = control.txFactory.createTxRemoveDoc(subscription._class, subscription.space, subscription._id)
-      await control.apply(control.ctx, [tx])
+    if (result.length > 0) {
+      const domain = control.hierarchy.findDomain(notification.class.PushSubscription)
+      if (domain !== undefined) {
+        await control.lowLevel.clean(control.ctx, domain, result)
+      }
     }
   } catch (err) {
     control.ctx.info('Cannot send push notification to', { user: targetUser, err })
diff --git a/services/ses/pod-ses/src/index.ts b/services/ses/pod-ses/src/index.ts
index 22b45ddd13..c225f89a0f 100644
--- a/services/ses/pod-ses/src/index.ts
+++ b/services/ses/pod-ses/src/index.ts
@@ -15,4 +15,8 @@
 
 import { main } from './main'
 
-void main()
+void main().catch((err) => {
+  if (err != null) {
+    console.error(err)
+  }
+})
diff --git a/services/ses/pod-ses/src/main.ts b/services/ses/pod-ses/src/main.ts
index 6e91af0cc2..3dd3ae0227 100644
--- a/services/ses/pod-ses/src/main.ts
+++ b/services/ses/pod-ses/src/main.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 //
 
+import type { Ref } from '@hcengineering/core'
 import { PushSubscription, type PushData } from '@hcengineering/notification'
 import type { Request, Response } from 'express'
 import webpush, { WebPushError } from 'web-push'
@@ -22,25 +23,39 @@ import { SES } from './ses'
 import { Endpoint } from './types'
 
 const errorMessages = ['expired', 'Unregistered', 'No such subscription']
-async function sendPushToSubscription (subscription: PushSubscription, data: PushData): Promise<'ok' | 'clear-push'> {
-  try {
-    await webpush.sendNotification(subscription, JSON.stringify(data))
-  } catch (err: any) {
-    if (err instanceof WebPushError) {
-      if (errorMessages.some((p) => JSON.stringify((err as WebPushError).body).includes(p))) {
-        return 'clear-push'
+async function sendPushToSubscription (
+  subscriptions: PushSubscription[],
+  data: PushData
+): Promise<Ref<PushSubscription>[]> {
+  const result: Ref<PushSubscription>[] = []
+  for (const subscription of subscriptions) {
+    try {
+      await webpush.sendNotification(subscription, JSON.stringify(data))
+    } catch (err: any) {
+      if (err instanceof WebPushError) {
+        if (errorMessages.some((p) => JSON.stringify((err as WebPushError).body).includes(p))) {
+          result.push(subscription._id)
+        }
       }
     }
   }
-  return 'ok'
+  return result
 }
 
 export const main = async (): Promise<void> => {
   const ses = new SES()
   console.log('SES service has been started')
+  let webpushInitDone = false
 
   if (config.PushPublicKey !== undefined && config.PushPrivateKey !== undefined) {
-    webpush.setVapidDetails(config.PushSubject ?? 'mailto:hey@huly.io', config.PushPublicKey, config.PushPublicKey)
+    try {
+      const subj = config.PushSubject ?? 'mailto:hey@huly.io'
+      console.log('Setting VAPID details', subj, config.PushPublicKey.length, config.PushPrivateKey.length)
+      webpush.setVapidDetails(config.PushSubject ?? 'mailto:hey@huly.io', config.PushPublicKey, config.PushPrivateKey)
+      webpushInitDone = true
+    } catch (err: any) {
+      console.error(err)
+    }
   }
 
   const checkAuth = (req: Request<any>, res: Response<any>): boolean => {
@@ -104,14 +119,18 @@ export const main = async (): Promise<void> => {
           res.status(400).send({ err: "'data' is missing" })
           return
         }
-        const subscription: PushSubscription | undefined = req.body?.subscription
-        if (subscription === undefined) {
-          res.status(400).send({ err: "'subscription' is missing" })
+        const subscriptions: PushSubscription[] | undefined = req.body?.subscriptions
+        if (subscriptions === undefined) {
+          res.status(400).send({ err: "'subscriptions' is missing" })
+          return
+        }
+        if (!webpushInitDone) {
+          res.json({ result: [] }).end()
           return
         }
 
-        const result = await sendPushToSubscription(subscription, data)
-        res.json({ result })
+        const result = await sendPushToSubscription(subscriptions, data)
+        res.json({ result }).end()
       }
     }
   ]

From 63c6a30ef70892e72f0e6b3c10a2632fa30fadb8 Mon Sep 17 00:00:00 2001
From: Andrey Sobolev <haiodo@users.noreply.github.com>
Date: Wed, 22 Jan 2025 19:37:00 +0700
Subject: [PATCH 19/21] Remove redundant map (#7763)

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
---
 packages/core/src/__tests__/limits.test.ts |  8 ++++----
 packages/core/src/utils.ts                 | 14 ++++++--------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/packages/core/src/__tests__/limits.test.ts b/packages/core/src/__tests__/limits.test.ts
index 5a7c15d63e..2fc323d9f2 100644
--- a/packages/core/src/__tests__/limits.test.ts
+++ b/packages/core/src/__tests__/limits.test.ts
@@ -72,7 +72,7 @@ describe('TimeRateLimiter', () => {
     const operations = Promise.all([limiter.exec(mockFn), limiter.exec(mockFn), limiter.exec(mockFn)])
 
     expect(mockFn).toHaveBeenCalledTimes(2)
-    expect(limiter.processingQueue.size).toBe(2)
+    expect(limiter.active).toBe(2)
 
     jest.advanceTimersByTime(500)
     await Promise.resolve()
@@ -84,7 +84,7 @@ describe('TimeRateLimiter', () => {
     await Promise.resolve()
     await Promise.resolve()
 
-    expect(limiter.processingQueue.size).toBe(0)
+    expect(limiter.active).toBe(0)
 
     expect(mockFn).toHaveBeenCalledTimes(3)
 
@@ -104,7 +104,7 @@ describe('TimeRateLimiter', () => {
       console.log('wait complete')
     })
 
-    expect(limiter.processingQueue.size).toBe(1)
+    expect(limiter.active).toBe(1)
 
     jest.advanceTimersByTime(1001)
     await Promise.resolve()
@@ -113,6 +113,6 @@ describe('TimeRateLimiter', () => {
 
     await waitPromise
     await operation
-    expect(limiter.processingQueue.size).toBe(0)
+    expect(limiter.active).toBe(0)
   })
 })
diff --git a/packages/core/src/utils.ts b/packages/core/src/utils.ts
index 45e5a8b943..022aefd8fb 100644
--- a/packages/core/src/utils.ts
+++ b/packages/core/src/utils.ts
@@ -846,7 +846,7 @@ export function pluginFilterTx (
 
 export class TimeRateLimiter {
   idCounter: number = 0
-  processingQueue = new Map<number, Promise<void>>()
+  active: number = 0
   last: number = 0
   rate: number
   period: number
@@ -866,9 +866,7 @@ export class TimeRateLimiter {
   }
 
   async exec<T, B extends Record<string, any> = any>(op: (args?: B) => Promise<T>, args?: B): Promise<T> {
-    const processingId = this.idCounter++
-
-    while (this.processingQueue.size >= this.rate || this.executions.length >= this.rate) {
+    while (this.active >= this.rate || this.executions.length >= this.rate) {
       this.cleanupExecutions()
       if (this.executions.length < this.rate) {
         break
@@ -882,11 +880,11 @@ export class TimeRateLimiter {
     try {
       this.executions.push(v)
       const p = op(args)
-      this.processingQueue.set(processingId, p as Promise<void>)
+      this.active++
       return await p
     } finally {
       v.running = false
-      this.processingQueue.delete(processingId)
+      this.active--
       this.cleanupExecutions()
       const n = this.notify.shift()
       if (n !== undefined) {
@@ -896,8 +894,8 @@ export class TimeRateLimiter {
   }
 
   async waitProcessing (): Promise<void> {
-    while (this.processingQueue.size > 0) {
-      console.log('wait', this.processingQueue.size)
+    while (this.active > 0) {
+      console.log('wait', this.active)
       await new Promise<void>((resolve) => {
         this.notify.push(resolve)
       })

From d132d6a6793417c141893219898020fd2c7a0520 Mon Sep 17 00:00:00 2001
From: Alexey Zinoviev <alexey.zinoviev@xored.com>
Date: Wed, 22 Jan 2025 19:29:43 +0400
Subject: [PATCH 20/21] UBERF-9236: Fetch GH usernames (#7766)

Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com>
---
 dev/tool/src/account.ts                    | 202 +++++++++++++++++++++
 dev/tool/src/index.ts                      |  12 +-
 dev/tool/src/renameAccount.ts              |  99 ----------
 pods/authProviders/src/github.ts           |  11 +-
 server/account/src/collections/postgres.ts |   6 +
 server/account/src/operations.ts           |  18 +-
 server/account/src/types.ts                |   2 +
 7 files changed, 244 insertions(+), 106 deletions(-)
 create mode 100644 dev/tool/src/account.ts
 delete mode 100644 dev/tool/src/renameAccount.ts

diff --git a/dev/tool/src/account.ts b/dev/tool/src/account.ts
new file mode 100644
index 0000000000..24c2228876
--- /dev/null
+++ b/dev/tool/src/account.ts
@@ -0,0 +1,202 @@
+import {
+  type Account,
+  type AccountDB,
+  changeEmail,
+  getAccount,
+  listWorkspacesPure,
+  type Workspace
+} from '@hcengineering/account'
+import core, { getWorkspaceId, type MeasureContext, systemAccountEmail, TxOperations } from '@hcengineering/core'
+import contact from '@hcengineering/model-contact'
+import { getTransactorEndpoint } from '@hcengineering/server-client'
+import { generateToken } from '@hcengineering/server-token'
+import { connect } from '@hcengineering/server-tool'
+
+export async function renameAccount (
+  ctx: MeasureContext,
+  db: AccountDB,
+  accountsUrl: string,
+  oldEmail: string,
+  newEmail: string
+): Promise<void> {
+  const account = await getAccount(db, oldEmail)
+  if (account == null) {
+    throw new Error("Account does'n exists")
+  }
+
+  const newAccount = await getAccount(db, newEmail)
+  if (newAccount != null) {
+    throw new Error('New Account email already exists:' + newAccount?.email + ' ' + newAccount?._id?.toString())
+  }
+
+  await changeEmail(ctx, db, account, newEmail)
+
+  await fixWorkspaceEmails(account, db, accountsUrl, oldEmail, newEmail)
+}
+
+export async function fixAccountEmails (
+  ctx: MeasureContext,
+  db: AccountDB,
+  transactorUrl: string,
+  oldEmail: string,
+  newEmail: string
+): Promise<void> {
+  const account = await getAccount(db, newEmail)
+  if (account == null) {
+    throw new Error("Account does'n exists")
+  }
+
+  await fixWorkspaceEmails(account, db, transactorUrl, oldEmail, newEmail)
+}
+async function fixWorkspaceEmails (
+  account: Account,
+  db: AccountDB,
+  accountsUrl: string,
+  oldEmail: string,
+  newEmail: string
+): Promise<void> {
+  const accountWorkspaces = account.workspaces.map((it) => it.toString())
+  // We need to update all workspaces
+  const workspaces = await listWorkspacesPure(db)
+  for (const ws of workspaces) {
+    if (!accountWorkspaces.includes(ws._id.toString())) {
+      continue
+    }
+    console.log('checking workspace', ws.workspaceName, ws.workspace)
+
+    const wsid = getWorkspaceId(ws.workspace)
+    const endpoint = await getTransactorEndpoint(generateToken(systemAccountEmail, wsid))
+
+    // Let's connect and update account information.
+    await fixEmailInWorkspace(endpoint, ws, oldEmail, newEmail)
+  }
+}
+
+async function fixEmailInWorkspace (
+  transactorUrl: string,
+  ws: Workspace,
+  oldEmail: string,
+  newEmail: string
+): Promise<void> {
+  const connection = await connect(transactorUrl, { name: ws.workspace }, undefined, {
+    mode: 'backup',
+    model: 'upgrade', // Required for force all clients reload after operation will be complete.
+    admin: 'true'
+  })
+  try {
+    const personAccount = await connection.findOne(contact.class.PersonAccount, { email: oldEmail })
+
+    if (personAccount !== undefined) {
+      console.log('update account in ', ws.workspace)
+      const ops = new TxOperations(connection, core.account.ConfigUser)
+      await ops.update(personAccount, { email: newEmail })
+    }
+  } catch (err: any) {
+    console.error(err)
+  } finally {
+    await connection.close()
+  }
+}
+
+interface GithubUserResult {
+  login: string | null
+  code: number
+  rateLimitReset?: number | null
+}
+
+async function getGithubUser (githubId: string, ghToken?: string): Promise<GithubUserResult> {
+  const options =
+    ghToken !== undefined
+      ? {
+          headers: {
+            Authorization: `Bearer ${ghToken}`,
+            Accept: 'application/vnd.github.v3+json'
+          }
+        }
+      : undefined
+  const res = await fetch(`https://api.github.com/user/${githubId}`, options)
+
+  if (res.status === 200) {
+    return {
+      login: (await res.json()).login,
+      code: 200
+    }
+  }
+
+  if (res.status === 403) {
+    const rateLimitReset = res.headers.get('X-RateLimit-Reset')
+    return {
+      login: null,
+      code: res.status,
+      rateLimitReset: rateLimitReset != null ? parseInt(rateLimitReset) * 1000 : null
+    }
+  }
+
+  return {
+    login: null,
+    code: res.status
+  }
+}
+
+export async function fillGithubUsers (ctx: MeasureContext, db: AccountDB, ghToken?: string): Promise<void> {
+  const githubAccounts = await db.account.find({ githubId: { $ne: null } })
+  if (githubAccounts.length === 0) {
+    ctx.info('no github accounts found')
+    return
+  }
+
+  const accountsToProcess = githubAccounts.filter(({ githubId, githubUser }) => githubUser == null && githubId != null)
+  if (accountsToProcess.length === 0) {
+    ctx.info('no github accounts left to fill')
+    return
+  }
+
+  ctx.info('processing github accounts', { total: accountsToProcess.length })
+  const defaultRetryTimeout = 1000 * 60 * 5 // 5 minutes
+  let processed = 0
+  for (const account of accountsToProcess) {
+    while (true) {
+      try {
+        if (account.githubId == null) break
+        let username: string | undefined
+        if (account.email.startsWith('github:')) {
+          username = account.email.slice(7)
+        } else {
+          const githubUserRes = await getGithubUser(account.githubId, ghToken)
+          if (githubUserRes.code === 200 && githubUserRes.login != null) {
+            username = githubUserRes.login
+          } else if (githubUserRes.code === 404) {
+            ctx.info('github user not found', { githubId: account.githubId })
+            break
+          } else if (githubUserRes.code === 403) {
+            const timeout =
+              githubUserRes.rateLimitReset != null
+                ? githubUserRes.rateLimitReset - Date.now() + 1000
+                : defaultRetryTimeout
+            ctx.info('rate limit exceeded. Retrying in ', {
+              githubId: account.githubId,
+              retryTimeoutMin: Math.ceil(timeout / (1000 * 60))
+            })
+            await new Promise((resolve) => setTimeout(resolve, timeout))
+          } else {
+            ctx.error('failed to get github user', { githubId: account.githubId, ...githubUserRes })
+            break
+          }
+        }
+        if (username != null) {
+          await db.account.updateOne({ _id: account._id }, { githubUser: username.toLowerCase() })
+          ctx.info('github user added', { githubId: account.githubId, githubUser: username.toLowerCase() })
+          break
+        }
+      } catch (err: any) {
+        ctx.error('failed to fill github user', { githubId: account.githubId, err })
+        break
+      }
+    }
+    processed++
+    if (processed % 100 === 0) {
+      ctx.info('processing accounts:', { processed, of: accountsToProcess.length })
+    }
+  }
+  ctx.info('finished processing accounts:', { processed, of: accountsToProcess.length })
+}
diff --git a/dev/tool/src/index.ts b/dev/tool/src/index.ts
index a6dac6c52b..4e7067d27b 100644
--- a/dev/tool/src/index.ts
+++ b/dev/tool/src/index.ts
@@ -146,7 +146,7 @@ import {
 } from './db'
 import { restoreControlledDocContentMongo, restoreWikiContentMongo, restoreMarkupRefsMongo } from './markup'
 import { fixMixinForeignAttributes, showMixinForeignAttributes } from './mixin'
-import { fixAccountEmails, renameAccount } from './renameAccount'
+import { fixAccountEmails, renameAccount, fillGithubUsers } from './account'
 import { copyToDatalake, moveFiles, showLostFiles } from './storage'
 import { createPostgresTxAdapter, createPostgresAdapter, createPostgreeDestroyAdapter } from '@hcengineering/postgres'
 import { reindexWorkspace } from './fulltext'
@@ -2175,6 +2175,16 @@ export function devTool (
       }
     })
 
+  program
+    .command('fill-github-users')
+    .option('-t, --token <token>', 'Github token to increase the limit of requests to GitHub')
+    .description('adds github username info to all accounts')
+    .action(async (cmd: { token?: string }) => {
+      await withAccountDatabase(async (db) => {
+        await fillGithubUsers(toolCtx, db, cmd.token)
+      })
+    })
+
   extendProgram?.(program)
 
   program.parse(process.argv)
diff --git a/dev/tool/src/renameAccount.ts b/dev/tool/src/renameAccount.ts
deleted file mode 100644
index 40e0a4072e..0000000000
--- a/dev/tool/src/renameAccount.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import {
-  type Account,
-  type AccountDB,
-  changeEmail,
-  getAccount,
-  listWorkspacesPure,
-  type Workspace
-} from '@hcengineering/account'
-import core, { getWorkspaceId, type MeasureContext, systemAccountEmail, TxOperations } from '@hcengineering/core'
-import contact from '@hcengineering/model-contact'
-import { getTransactorEndpoint } from '@hcengineering/server-client'
-import { generateToken } from '@hcengineering/server-token'
-import { connect } from '@hcengineering/server-tool'
-
-export async function renameAccount (
-  ctx: MeasureContext,
-  db: AccountDB,
-  accountsUrl: string,
-  oldEmail: string,
-  newEmail: string
-): Promise<void> {
-  const account = await getAccount(db, oldEmail)
-  if (account == null) {
-    throw new Error("Account does'n exists")
-  }
-
-  const newAccount = await getAccount(db, newEmail)
-  if (newAccount != null) {
-    throw new Error('New Account email already exists:' + newAccount?.email + ' ' + newAccount?._id?.toString())
-  }
-
-  await changeEmail(ctx, db, account, newEmail)
-
-  await fixWorkspaceEmails(account, db, accountsUrl, oldEmail, newEmail)
-}
-
-export async function fixAccountEmails (
-  ctx: MeasureContext,
-  db: AccountDB,
-  transactorUrl: string,
-  oldEmail: string,
-  newEmail: string
-): Promise<void> {
-  const account = await getAccount(db, newEmail)
-  if (account == null) {
-    throw new Error("Account does'n exists")
-  }
-
-  await fixWorkspaceEmails(account, db, transactorUrl, oldEmail, newEmail)
-}
-async function fixWorkspaceEmails (
-  account: Account,
-  db: AccountDB,
-  accountsUrl: string,
-  oldEmail: string,
-  newEmail: string
-): Promise<void> {
-  const accountWorkspaces = account.workspaces.map((it) => it.toString())
-  // We need to update all workspaces
-  const workspaces = await listWorkspacesPure(db)
-  for (const ws of workspaces) {
-    if (!accountWorkspaces.includes(ws._id.toString())) {
-      continue
-    }
-    console.log('checking workspace', ws.workspaceName, ws.workspace)
-
-    const wsid = getWorkspaceId(ws.workspace)
-    const endpoint = await getTransactorEndpoint(generateToken(systemAccountEmail, wsid))
-
-    // Let's connect and update account information.
-    await fixEmailInWorkspace(endpoint, ws, oldEmail, newEmail)
-  }
-}
-
-async function fixEmailInWorkspace (
-  transactorUrl: string,
-  ws: Workspace,
-  oldEmail: string,
-  newEmail: string
-): Promise<void> {
-  const connection = await connect(transactorUrl, { name: ws.workspace }, undefined, {
-    mode: 'backup',
-    model: 'upgrade', // Required for force all clients reload after operation will be complete.
-    admin: 'true'
-  })
-  try {
-    const personAccount = await connection.findOne(contact.class.PersonAccount, { email: oldEmail })
-
-    if (personAccount !== undefined) {
-      console.log('update account in ', ws.workspace)
-      const ops = new TxOperations(connection, core.account.ConfigUser)
-      await ops.update(personAccount, { email: newEmail })
-    }
-  } catch (err: any) {
-    console.error(err)
-  } finally {
-    await connection.close()
-  }
-}
diff --git a/pods/authProviders/src/github.ts b/pods/authProviders/src/github.ts
index 0feed30ece..7c3332cbbd 100644
--- a/pods/authProviders/src/github.ts
+++ b/pods/authProviders/src/github.ts
@@ -63,11 +63,12 @@ export function registerGithub (
     async (ctx, next) => {
       try {
         let email = ctx.state.user.emails?.[0]?.value
+        const username = ctx.state.user.username.toLowerCase()
         if (email == null || email === '') {
-          email = `github:${ctx.state.user.username}`
+          email = `github:${username}`
         }
 
-        const [first, last] = ctx.state.user.displayName?.split(' ') ?? [ctx.state.user.username, '']
+        const [first, last] = ctx.state.user.displayName?.split(' ') ?? [username, '']
         measureCtx.info('Provider auth handler', { email, type: 'github' })
         if (email !== undefined) {
           let loginInfo: LoginInfo | null
@@ -76,7 +77,8 @@ export function registerGithub (
           const db = await dbPromise
           if (state.inviteId != null && state.inviteId !== '') {
             loginInfo = await joinWithProvider(measureCtx, db, null, email, first, last, state.inviteId as any, {
-              githubId: ctx.state.user.id
+              githubId: ctx.state.user.id,
+              githubUser: username
             })
           } else {
             loginInfo = await loginWithProvider(
@@ -87,7 +89,8 @@ export function registerGithub (
               first,
               last,
               {
-                githubId: ctx.state.user.id
+                githubId: ctx.state.user.id,
+                githubUser: username
               },
               signUpDisabled
             )
diff --git a/server/account/src/collections/postgres.ts b/server/account/src/collections/postgres.ts
index dc872aa2a8..779876f10a 100644
--- a/server/account/src/collections/postgres.ts
+++ b/server/account/src/collections/postgres.ts
@@ -89,6 +89,12 @@ export class PostgresDbCollection<T extends Record<string, any>> implements DbCo
           values.push(Object.values(qKey as object)[0])
           break
         }
+        case '$ne': {
+          currIdx++
+          whereChunks.push(`"${key}" != $${currIdx}`)
+          values.push(Object.values(qKey as object)[0])
+          break
+        }
         default: {
           currIdx++
           whereChunks.push(`"${key}" = $${currIdx}`)
diff --git a/server/account/src/operations.ts b/server/account/src/operations.ts
index 810a594122..2ee99fd63b 100644
--- a/server/account/src/operations.ts
+++ b/server/account/src/operations.ts
@@ -2678,7 +2678,14 @@ export async function joinWithProvider (
     }
     let account = await getAccount(db, email)
     if (account == null && extra !== undefined) {
-      account = await getAccountByQuery(db, extra)
+      // Temporary: we don't want to use githubUser to search yet
+      // but we want to save it in the account
+      const extraSearch = {
+        ...extra
+      }
+      delete extraSearch.githubUser
+
+      account = await getAccountByQuery(db, extraSearch)
     }
     if (account !== null) {
       // we should clean password if account is not confirmed
@@ -2760,7 +2767,14 @@ export async function loginWithProvider (
     }
     let account = await getAccount(db, email)
     if (account == null && extra !== undefined) {
-      account = await getAccountByQuery(db, extra)
+      // Temporary: we don't want to use githubUser to search yet
+      // but we want to save it in the account
+      const extraSearch = {
+        ...extra
+      }
+      delete extraSearch.githubUser
+
+      account = await getAccountByQuery(db, extraSearch)
     }
     if (account !== null) {
       // we should clean password if account is not confirmed
diff --git a/server/account/src/types.ts b/server/account/src/types.ts
index 512504df2c..73dbe634dc 100644
--- a/server/account/src/types.ts
+++ b/server/account/src/types.ts
@@ -46,6 +46,7 @@ export interface Account {
   createdOn: number
   lastVisit: number
   githubId?: string
+  githubUser?: string
   openId?: string
 }
 
@@ -146,6 +147,7 @@ export interface UpgradeStatistic {
 
 interface Operator<T, P extends keyof T> {
   $in?: T[P][]
+  $ne?: T[P] | null
   $lt?: T[P]
   $lte?: T[P]
   $gt?: T[P]

From 86da890c13824db8668a7a11cbc8711834736c56 Mon Sep 17 00:00:00 2001
From: Denis Bykhov <bykhov.denis@gmail.com>
Date: Wed, 22 Jan 2025 21:04:36 +0500
Subject: [PATCH 21/21] Share video with audio (#7768)

Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
---
 plugins/love-assets/lang/cs.json              |  4 +-
 plugins/love-assets/lang/de.json              |  4 +-
 plugins/love-assets/lang/en.json              |  4 +-
 plugins/love-assets/lang/es.json              |  4 +-
 plugins/love-assets/lang/fr.json              |  4 +-
 plugins/love-assets/lang/it.json              |  4 +-
 plugins/love-assets/lang/pt.json              |  4 +-
 plugins/love-assets/lang/ru.json              |  4 +-
 plugins/love-assets/lang/zh.json              |  4 +-
 .../src/components/ControlBar.svelte          | 46 ++++++++-----
 .../src/components/RoomPopup.svelte           | 67 +++++++++++--------
 .../src/components/ShareSettingPopup.svelte   | 30 +++++++++
 .../src/components/VideoPopup.svelte          | 17 +++--
 plugins/love-resources/src/plugin.ts          |  4 +-
 plugins/love-resources/src/utils.ts           | 10 ++-
 15 files changed, 146 insertions(+), 64 deletions(-)
 create mode 100644 plugins/love-resources/src/components/ShareSettingPopup.svelte

diff --git a/plugins/love-assets/lang/cs.json b/plugins/love-assets/lang/cs.json
index 9b9c1f33c6..eb20c8a456 100644
--- a/plugins/love-assets/lang/cs.json
+++ b/plugins/love-assets/lang/cs.json
@@ -81,6 +81,8 @@
     "Finished": "Dokončeno",
     "StartWithRecording": "Začít s nahráváním",
     "Language": "Jazyk",
-    "Kick": "Vyhodit"
+    "Kick": "Vyhodit",
+    "WithAudio": "S audio",
+    "ShareWithAudioTooltip": "Sdílet s audio, musíte znovu sdílet pro aplikování změn"
   }
 }
\ No newline at end of file
diff --git a/plugins/love-assets/lang/de.json b/plugins/love-assets/lang/de.json
index 15cd40bcc8..961199c492 100644
--- a/plugins/love-assets/lang/de.json
+++ b/plugins/love-assets/lang/de.json
@@ -79,6 +79,8 @@
     "Active": "Aktiv",
     "Finished": "Beendet",
     "StartWithRecording": "Mit Aufnahme starten",
-    "Language": "Sprache"
+    "Language": "Sprache",
+    "WithAudio": "Mit Audio",
+    "ShareWithAudioTooltip": "Mit Audio teilen, Sie müssen erneut teilen, um die Änderungen zu übernehmen"
   }
 }
diff --git a/plugins/love-assets/lang/en.json b/plugins/love-assets/lang/en.json
index d86279790c..1cc4f66d73 100644
--- a/plugins/love-assets/lang/en.json
+++ b/plugins/love-assets/lang/en.json
@@ -81,6 +81,8 @@
     "Finished": "Finished",
     "StartWithRecording": "Start with recording",
     "Language": "Language",
-    "Kick": "Kick"
+    "Kick": "Kick",
+    "WithAudio": "With audio",
+    "ShareWithAudioTooltip": "Share with audio, you should reshare for apply changes"
   }
 }
diff --git a/plugins/love-assets/lang/es.json b/plugins/love-assets/lang/es.json
index d51bb0d0da..0f01144369 100644
--- a/plugins/love-assets/lang/es.json
+++ b/plugins/love-assets/lang/es.json
@@ -81,6 +81,8 @@
     "Finished": "Terminado",
     "StartWithRecording": "Iniciar con grabación",
     "Language": "Idioma",
-    "Kick": "Expulsar"
+    "Kick": "Expulsar",
+    "WithAudio": "Con audio",
+    "ShareWithAudioTooltip": "Compartir con audio, debes compartir de nuevo para aplicar los cambios"
   }
 }
diff --git a/plugins/love-assets/lang/fr.json b/plugins/love-assets/lang/fr.json
index 3f602a4675..90d7a0c49e 100644
--- a/plugins/love-assets/lang/fr.json
+++ b/plugins/love-assets/lang/fr.json
@@ -81,6 +81,8 @@
     "Finished": "Terminé",
     "StartWithRecording": "Démarrer avec l'enregistrement",
     "Language": "Langue",
-    "Kick": "Expulser"
+    "Kick": "Expulser",
+    "WithAudio": "Avec audio",
+    "ShareWithAudioTooltip": "Partager avec audio, vous devez partager à nouveau pour appliquer les modifications"
   }
 }
\ No newline at end of file
diff --git a/plugins/love-assets/lang/it.json b/plugins/love-assets/lang/it.json
index 1a2bf3700a..105430eb73 100644
--- a/plugins/love-assets/lang/it.json
+++ b/plugins/love-assets/lang/it.json
@@ -81,6 +81,8 @@
     "Finished": "Finito",
     "StartWithRecording": "Inizia con la registrazione",
     "Language": "Lingua",
-    "Kick": "Espellere"
+    "Kick": "Espellere",
+    "WithAudio": "Con audio",
+    "ShareWithAudioTooltip": "Condividi con audio, devi condividere nuovamente per applicare le modifiche"
   }
 }
diff --git a/plugins/love-assets/lang/pt.json b/plugins/love-assets/lang/pt.json
index 6547a98695..b5dc1c8139 100644
--- a/plugins/love-assets/lang/pt.json
+++ b/plugins/love-assets/lang/pt.json
@@ -81,6 +81,8 @@
     "Finished": "Finalizado",
     "StartWithRecording": "Começar com gravação",
     "Language": "Idioma",
-    "Kick": "Expulsar"
+    "Kick": "Expulsar",
+    "WithAudio": "Com áudio",
+    "ShareWithAudioTooltip": "Compartilhar com áudio, você deve compartilhar novamente para aplicar as alterações"
   }
 }
diff --git a/plugins/love-assets/lang/ru.json b/plugins/love-assets/lang/ru.json
index c430ccfb9b..999b1e1479 100644
--- a/plugins/love-assets/lang/ru.json
+++ b/plugins/love-assets/lang/ru.json
@@ -81,6 +81,8 @@
     "Finished": "Завершено",
     "StartWithRecording": "Начинать с записью",
     "Language": "Язык",
-    "Kick": "Выгнать"
+    "Kick": "Выгнать",
+    "WithAudio": "С аудио",
+    "ShareWithAudioTooltip": "Поделиться с аудио, вам нужно поделиться снова, чтобы применить изменения"
   }
 }
diff --git a/plugins/love-assets/lang/zh.json b/plugins/love-assets/lang/zh.json
index 8c7415331e..951433dd29 100644
--- a/plugins/love-assets/lang/zh.json
+++ b/plugins/love-assets/lang/zh.json
@@ -81,6 +81,8 @@
     "Finished": "已完成",
     "StartWithRecording": "开始录制",
     "Language": "语言",
-    "Kick": "踢出"
+    "Kick": "踢出",
+    "WithAudio": "带音频",
+    "ShareWithAudioTooltip": "共享音频，您应重新共享以应用更改"
   }
 }
diff --git a/plugins/love-resources/src/components/ControlBar.svelte b/plugins/love-resources/src/components/ControlBar.svelte
index fd50fa8439..b5141a8e01 100644
--- a/plugins/love-resources/src/components/ControlBar.svelte
+++ b/plugins/love-resources/src/components/ControlBar.svelte
@@ -19,6 +19,10 @@
   import { getResource } from '@hcengineering/platform'
   import { getClient } from '@hcengineering/presentation'
   import {
+    ButtonMenu,
+    DropdownIntlItem,
+    IconMaximize,
+    IconMoreV,
     IconUpOutline,
     ModernButton,
     PopupInstance,
@@ -26,11 +30,7 @@
     eventToHTMLElement,
     showPopup,
     type AnySvelteComponent,
-    type CompAndProps,
-    IconMoreV,
-    ButtonMenu,
-    DropdownIntlItem,
-    IconMaximize
+    type CompAndProps
   } from '@hcengineering/ui'
   import view, { Action } from '@hcengineering/view'
   import { getActions } from '@hcengineering/view-resources'
@@ -38,30 +38,32 @@
   import love from '../plugin'
   import { currentRoom, myInfo, myOffice } from '../stores'
   import {
-    isTranscriptionAllowed,
     isCameraEnabled,
     isConnected,
     isFullScreen,
     isMicEnabled,
     isRecording,
-    isTranscription,
     isRecordingAvailable,
+    isShareWithSound,
     isSharingEnabled,
+    isTranscription,
+    isTranscriptionAllowed,
     leaveRoom,
     record,
     screenSharing,
     setCam,
     setMic,
     setShare,
-    stopTranscription,
-    startTranscription
+    startTranscription,
+    stopTranscription
   } from '../utils'
   import CamSettingPopup from './CamSettingPopup.svelte'
+  import ControlBarContainer from './ControlBarContainer.svelte'
   import MicSettingPopup from './MicSettingPopup.svelte'
   import RoomAccessPopup from './RoomAccessPopup.svelte'
   import RoomLanguageSelector from './RoomLanguageSelector.svelte'
-  import ControlBarContainer from './ControlBarContainer.svelte'
   import RoomModal from './RoomModal.svelte'
+  import ShareSettingPopup from './ShareSettingPopup.svelte'
 
   export let room: Room
   export let canMaximize: boolean = true
@@ -86,7 +88,9 @@
   }
 
   async function changeShare (): Promise<void> {
-    await setShare(!$isSharingEnabled)
+    const newValue = !$isSharingEnabled
+    const audio = newValue && $isShareWithSound
+    await setShare(newValue, audio)
   }
 
   async function leave (): Promise<void> {
@@ -122,6 +126,14 @@
     }
   }
 
+  function shareSettings (e: MouseEvent): void {
+    if (fullScreen) {
+      popup = getPopup(ShareSettingPopup, e)
+    } else {
+      showPopup(ShareSettingPopup, {}, eventToHTMLElement(e))
+    }
+  }
+
   function setAccess (e: MouseEvent): void {
     if (isOffice(room) && room.person !== me) return
     if (fullScreen) {
@@ -208,13 +220,15 @@
         />
       {/if}
       {#if allowShare}
-        <ModernButton
+        <SplitButton
+          size={'large'}
           icon={$isSharingEnabled ? love.icon.SharingEnabled : love.icon.SharingDisabled}
-          tooltip={{ label: $isSharingEnabled ? love.string.StopShare : love.string.Share }}
+          showTooltip={{ label: $isSharingEnabled ? love.string.StopShare : love.string.Share }}
           disabled={($screenSharing && !$isSharingEnabled) || !$isConnected}
-          kind={'secondary'}
-          size={'large'}
-          on:click={changeShare}
+          action={changeShare}
+          secondIcon={IconUpOutline}
+          secondAction={shareSettings}
+          separate
         />
       {/if}
       {#if hasAccountRole(getCurrentAccount(), AccountRole.User) && $isRecordingAvailable}
diff --git a/plugins/love-resources/src/components/RoomPopup.svelte b/plugins/love-resources/src/components/RoomPopup.svelte
index 4550079c1f..a13bcd06ed 100644
--- a/plugins/love-resources/src/components/RoomPopup.svelte
+++ b/plugins/love-resources/src/components/RoomPopup.svelte
@@ -14,43 +14,45 @@
 -->
 <script lang="ts">
   import { Person, PersonAccount } from '@hcengineering/contact'
-  import { personByIdStore, UserInfo } from '@hcengineering/contact-resources'
-  import { IdMap, getCurrentAccount, Ref, Class, Doc } from '@hcengineering/core'
-  import {
-    ModernButton,
-    SplitButton,
-    IconArrowLeft,
-    IconUpOutline,
-    Label,
-    eventToHTMLElement,
-    Location,
-    location,
-    navigate,
-    showPopup,
-    Scroller,
-    panelstore
-  } from '@hcengineering/ui'
+  import { UserInfo, personByIdStore } from '@hcengineering/contact-resources'
+  import { Class, Doc, IdMap, Ref, getCurrentAccount } from '@hcengineering/core'
   import {
+    MeetingMinutes,
     ParticipantInfo,
     Room,
     RoomType,
     isOffice,
     loveId,
     roomAccessIcon,
-    roomAccessLabel,
-    MeetingMinutes
+    roomAccessLabel
   } from '@hcengineering/love'
-  import { createEventDispatcher } from 'svelte'
-  import { getObjectLinkFragment } from '@hcengineering/view-resources'
   import { getClient } from '@hcengineering/presentation'
+  import {
+    IconArrowLeft,
+    IconUpOutline,
+    Label,
+    Location,
+    ModernButton,
+    Scroller,
+    SplitButton,
+    eventToHTMLElement,
+    location,
+    navigate,
+    panelstore,
+    showPopup
+  } from '@hcengineering/ui'
+  import view from '@hcengineering/view'
+  import { getObjectLinkFragment } from '@hcengineering/view-resources'
+  import { createEventDispatcher } from 'svelte'
   import love from '../plugin'
-  import { currentRoom, infos, invites, myInfo, myOffice, myRequests, currentMeetingMinutes, rooms } from '../stores'
+  import { currentMeetingMinutes, currentRoom, infos, invites, myInfo, myOffice, myRequests, rooms } from '../stores'
   import {
     endMeeting,
     getRoomName,
     isCameraEnabled,
     isConnected,
     isMicEnabled,
+    isShareWithSound,
     isSharingEnabled,
     leaveRoom,
     screenSharing,
@@ -62,7 +64,7 @@
   import CamSettingPopup from './CamSettingPopup.svelte'
   import MicSettingPopup from './MicSettingPopup.svelte'
   import RoomAccessPopup from './RoomAccessPopup.svelte'
-  import view from '@hcengineering/view'
+  import ShareSettingPopup from './ShareSettingPopup.svelte'
 
   export let room: Room
 
@@ -99,7 +101,9 @@
   }
 
   async function changeShare (): Promise<void> {
-    await setShare(!$isSharingEnabled)
+    const newValue = !$isSharingEnabled
+    const audio = newValue && $isShareWithSound
+    await setShare(newValue, audio)
   }
 
   async function leave (): Promise<void> {
@@ -114,6 +118,10 @@
     dispatch('close')
   }
 
+  function shareSettings (e: MouseEvent): void {
+    showPopup(ShareSettingPopup, {}, eventToHTMLElement(e))
+  }
+
   async function connect (): Promise<void> {
     await tryConnect($personByIdStore, $myInfo, room, info, $myRequests, $invites)
     dispatch('close')
@@ -207,14 +215,15 @@
         />
       {/if}
       {#if allowShare}
-        <ModernButton
+        <SplitButton
+          size={'large'}
           icon={$isSharingEnabled ? love.icon.SharingEnabled : love.icon.SharingDisabled}
-          label={$isSharingEnabled ? love.string.StopShare : love.string.Share}
-          tooltip={{ label: $isSharingEnabled ? love.string.StopShare : love.string.Share }}
+          showTooltip={{ label: $isSharingEnabled ? love.string.StopShare : love.string.Share }}
           disabled={($screenSharing && !$isSharingEnabled) || !$isConnected}
-          kind={'secondary'}
-          size={'large'}
-          on:click={changeShare}
+          action={changeShare}
+          secondIcon={IconUpOutline}
+          secondAction={shareSettings}
+          separate
         />
       {/if}
       <ModernButton
diff --git a/plugins/love-resources/src/components/ShareSettingPopup.svelte b/plugins/love-resources/src/components/ShareSettingPopup.svelte
new file mode 100644
index 0000000000..0027c67f99
--- /dev/null
+++ b/plugins/love-resources/src/components/ShareSettingPopup.svelte
@@ -0,0 +1,30 @@
+<script lang="ts">
+  import { Label, Toggle } from '@hcengineering/ui'
+  import love from '../plugin'
+  import { setShare, isShareWithSound, isSharingEnabled } from '../utils'
+</script>
+
+<div class="antiPopup p-4 grid">
+  <Label label={love.string.WithAudio} />
+  {$isShareWithSound}
+  <Toggle
+    showTooltip={{ label: love.string.ShareWithAudioTooltip }}
+    on={$isShareWithSound}
+    on:change={(e) => {
+      $isShareWithSound = e.detail
+      if ($isSharingEnabled) {
+        setShare($isSharingEnabled, e.detail)
+      }
+    }}
+  />
+</div>
+
+<style lang="scss">
+  .grid {
+    display: grid;
+    grid-template-columns: 1fr auto;
+    row-gap: 1rem;
+    column-gap: 1rem;
+    align-items: center;
+  }
+</style>
diff --git a/plugins/love-resources/src/components/VideoPopup.svelte b/plugins/love-resources/src/components/VideoPopup.svelte
index d162084bc5..361c423bb1 100644
--- a/plugins/love-resources/src/components/VideoPopup.svelte
+++ b/plugins/love-resources/src/components/VideoPopup.svelte
@@ -13,9 +13,14 @@
 // limitations under the License.
 -->
 <script lang="ts">
+  import aiBot from '@hcengineering/ai-bot'
+  import { Person, PersonAccount } from '@hcengineering/contact'
+  import { personIdByAccountId } from '@hcengineering/contact-resources'
+  import { Ref } from '@hcengineering/core'
+  import { RoomType, Room as TypeRoom } from '@hcengineering/love'
+  import { MessageBox } from '@hcengineering/presentation'
   import { ActionIcon, Scroller, showPopup } from '@hcengineering/ui'
   import view from '@hcengineering/view'
-  import { RoomType, Room as TypeRoom } from '@hcengineering/love'
   import {
     LocalParticipant,
     LocalTrackPublication,
@@ -28,11 +33,6 @@
     TrackPublication
   } from 'livekit-client'
   import { createEventDispatcher, onDestroy, onMount, tick } from 'svelte'
-  import { Ref } from '@hcengineering/core'
-  import { MessageBox } from '@hcengineering/presentation'
-  import { Person, PersonAccount } from '@hcengineering/contact'
-  import aiBot from '@hcengineering/ai-bot'
-  import { personIdByAccountId } from '@hcengineering/contact-resources'
 
   import love from '../plugin'
   import { currentRoom, infos, myInfo, myOffice } from '../stores'
@@ -41,6 +41,7 @@
     isCameraEnabled,
     isConnected,
     isMicEnabled,
+    isShareWithSound,
     isSharingEnabled,
     leaveRoom,
     lk,
@@ -289,7 +290,9 @@
 
   async function changeShare (): Promise<void> {
     if (!$isConnected) return
-    await setShare(!$isSharingEnabled)
+    const newValue = !$isSharingEnabled
+    const audio = newValue && $isShareWithSound
+    await setShare(newValue, audio)
   }
 
   $: dispatchFit($isSharingEnabled)
diff --git a/plugins/love-resources/src/plugin.ts b/plugins/love-resources/src/plugin.ts
index 90cd754245..68629ce0e2 100644
--- a/plugins/love-resources/src/plugin.ts
+++ b/plugins/love-resources/src/plugin.ts
@@ -95,6 +95,8 @@ export default mergeIds(loveId, love, {
     Select: '' as IntlString,
     ChooseShare: '' as IntlString,
     MoreOptions: '' as IntlString,
-    Language: '' as IntlString
+    Language: '' as IntlString,
+    WithAudio: '' as IntlString,
+    ShareWithAudioTooltip: '' as IntlString
   }
 })
diff --git a/plugins/love-resources/src/utils.ts b/plugins/love-resources/src/utils.ts
index 3dc80d9e00..18a0fd05d2 100644
--- a/plugins/love-resources/src/utils.ts
+++ b/plugins/love-resources/src/utils.ts
@@ -77,6 +77,7 @@ import {
   type RemoteTrack,
   type RemoteTrackPublication,
   RoomEvent,
+  type ScreenShareCaptureOptions,
   Track,
   type VideoCaptureOptions
 } from 'livekit-client'
@@ -174,6 +175,7 @@ export const isMicEnabled = writable<boolean>(false)
 export const isCameraEnabled = writable<boolean>(false)
 export const isSharingEnabled = writable<boolean>(false)
 export const isFullScreen = writable<boolean>(false)
+export const isShareWithSound = writable<boolean>(false)
 
 function handleTrackSubscribed (
   track: RemoteTrack,
@@ -586,10 +588,14 @@ export async function setMic (value: boolean): Promise<void> {
   }
 }
 
-export async function setShare (value: boolean): Promise<void> {
+export async function setShare (value: boolean, withAudio: boolean = false): Promise<void> {
   if ($isCurrentInstanceConnected) {
     try {
-      await lk.localParticipant.setScreenShareEnabled(value)
+      const options: ScreenShareCaptureOptions = {}
+      if (withAudio) {
+        options.audio = true
+      }
+      await lk.localParticipant.setScreenShareEnabled(value, options)
     } catch (err) {
       console.error(err)
     }