From 567989dac5365958bb1a92d78d9909e39eee6cc1 Mon Sep 17 00:00:00 2001
From: Alexander Onnikov <aonnikov@hardcoreeng.com>
Date: Mon, 17 Feb 2025 12:32:42 +0700
Subject: [PATCH 01/13] fix: handle token decode errors (#8018)

Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com>
---
 server/account/src/utils.ts |  4 ++--
 server/front/src/index.ts   |  9 ++++++---
 server/token/src/token.ts   | 12 +++++++++++-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/server/account/src/utils.ts b/server/account/src/utils.ts
index feebb45a2c..7eca625b92 100644
--- a/server/account/src/utils.ts
+++ b/server/account/src/utils.ts
@@ -56,7 +56,7 @@ import {
   AccountEventType
 } from './types'
 import { Analytics } from '@hcengineering/analytics'
-import { decodeTokenVerbose, generateToken } from '@hcengineering/server-token'
+import { TokenError, decodeTokenVerbose, generateToken } from '@hcengineering/server-token'
 
 export const GUEST_ACCOUNT = 'b6996120-416f-49cd-841e-e4a5d2e49c9b'
 
@@ -127,7 +127,7 @@ export function wrap (
             ? err.status
             : new Status(Severity.ERROR, platform.status.InternalServerError, {})
 
-        if (((err.message as string) ?? '') === 'Signature verification failed') {
+        if (err instanceof TokenError) {
           // Let's send un authorized
           return {
             error: new Status(Severity.ERROR, platform.status.Unauthorized, {})
diff --git a/server/front/src/index.ts b/server/front/src/index.ts
index 64570ef079..f6838b16a1 100644
--- a/server/front/src/index.ts
+++ b/server/front/src/index.ts
@@ -23,7 +23,7 @@ import {
   metricsAggregate,
   type Ref
 } from '@hcengineering/core'
-import { decodeToken } from '@hcengineering/server-token'
+import { TokenError, decodeToken } from '@hcengineering/server-token'
 import { StorageAdapter } from '@hcengineering/storage'
 import bp from 'body-parser'
 import cors from 'cors'
@@ -376,10 +376,13 @@ export function start (
       })
       res.end(json)
     } catch (err: any) {
+      if (err instanceof TokenError) {
+        res.status(401).send()
+        return
+      }
       ctx.error('statistics error', { err })
       Analytics.handleError(err)
-      res.writeHead(404, {})
-      res.end()
+      res.status(404).send()
     }
   })
 
diff --git a/server/token/src/token.ts b/server/token/src/token.ts
index 77e2922742..13599e6450 100644
--- a/server/token/src/token.ts
+++ b/server/token/src/token.ts
@@ -12,6 +12,16 @@ export interface Token {
   extra?: Record<string, any>
 }
 
+/**
+ * @public
+ */
+export class TokenError extends Error {
+  constructor (message: string) {
+    super(message)
+    this.name = 'TokenError'
+  }
+}
+
 const getSecret = (): string => {
   return getMetadata(serverPlugin.metadata.Secret) ?? 'secret'
 }
@@ -50,6 +60,6 @@ export function decodeTokenVerbose (ctx: MeasureContext, token: string): Token {
     } catch (err2: any) {
       // Nothing to do
     }
-    throw err
+    throw new TokenError(err.message)
   }
 }

From 207e60a76e691261cad6a0d2c633508bdb40703d Mon Sep 17 00:00:00 2001
From: Andrey Sobolev <haiodo@users.noreply.github.com>
Date: Mon, 17 Feb 2025 13:10:46 +0700
Subject: [PATCH 02/13] Minor import fixes (#8017)

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
---
 models/activity/src/plugin.ts                            | 2 +-
 models/card/src/index.ts                                 | 2 +-
 models/card/src/plugin.ts                                | 2 +-
 models/chunter/src/types.ts                              | 2 +-
 models/controlled-documents/src/plugin.ts                | 2 +-
 models/document/src/plugin.ts                            | 2 +-
 models/drive/src/plugin.ts                               | 2 +-
 models/guest/src/index.ts                                | 2 +-
 models/guest/src/plugin.ts                               | 2 +-
 models/love/src/plugin.ts                                | 2 +-
 models/presence/src/plugin.ts                            | 2 +-
 models/print/src/plugin.ts                               | 2 +-
 models/task/src/index.ts                                 | 2 +-
 models/text-editor/src/index.ts                          | 2 +-
 models/time/src/index.ts                                 | 2 +-
 models/time/src/plugin.ts                                | 2 +-
 models/training/src/plugin.ts                            | 2 +-
 models/uploader/src/plugin.ts                            | 2 +-
 models/view/src/utils.ts                                 | 2 +-
 models/workbench/src/index.ts                            | 2 +-
 packages/platform-rig/profiles/assets/tsconfig.json      | 4 +++-
 packages/platform-rig/profiles/default/tsconfig.json     | 3 ++-
 packages/platform-rig/profiles/model/tsconfig.json       | 3 ++-
 packages/platform-rig/profiles/node/tsconfig.json        | 3 ++-
 packages/platform-rig/profiles/package/tsconfig.json     | 3 ++-
 packages/platform-rig/profiles/ui/tsconfig.json          | 3 ++-
 .../presentation/src/components/breadcrumbs/types.ts     | 2 +-
 packages/presentation/src/plugin.ts                      | 2 +-
 packages/presentation/src/types.ts                       | 2 +-
 .../src/components/AttachmentRefInput.svelte             | 9 ++++-----
 plugins/bitrix-resources/src/plugin.ts                   | 2 +-
 plugins/board-resources/src/plugin.ts                    | 2 +-
 plugins/card-resources/src/plugin.ts                     | 2 +-
 plugins/chunter-resources/src/plugin.ts                  | 2 +-
 plugins/contact-resources/src/plugin.ts                  | 2 +-
 plugins/controlled-documents-resources/src/plugin.ts     | 2 +-
 plugins/controlled-documents/src/plugin.ts               | 2 +-
 plugins/document-resources/src/plugin.ts                 | 2 +-
 plugins/document/src/plugin.ts                           | 2 +-
 plugins/drive/src/plugin.ts                              | 2 +-
 plugins/lead-resources/src/plugin.ts                     | 2 +-
 plugins/love-resources/src/plugin.ts                     | 4 ++--
 plugins/presence/src/plugin.ts                           | 2 +-
 plugins/print/src/plugin.ts                              | 2 +-
 plugins/products-resources/src/plugin.ts                 | 4 ++--
 plugins/products/src/plugin.ts                           | 2 +-
 .../src/components/CreateCandidate.svelte                | 1 -
 plugins/recruit-resources/src/plugin.ts                  | 4 ++--
 plugins/setting-resources/src/plugin.ts                  | 2 +-
 plugins/survey-resources/src/plugin.ts                   | 2 +-
 plugins/tags-resources/src/plugin.ts                     | 2 +-
 plugins/telegram-resources/src/plugin.ts                 | 2 +-
 plugins/templates-resources/src/plugin.ts                | 2 +-
 plugins/templates/src/index.ts                           | 6 +++---
 plugins/test-management/src/plugin.ts                    | 2 +-
 plugins/tracker-resources/src/plugin.ts                  | 4 ++--
 plugins/uploader-resources/src/plugin.ts                 | 2 +-
 plugins/uploader/src/plugin.ts                           | 2 +-
 plugins/view-resources/src/plugin.ts                     | 4 ++--
 plugins/view/src/index.ts                                | 2 +-
 .../workbench-resources/src/components/Navigator.svelte  | 2 +-
 plugins/workbench-resources/src/plugin.ts                | 2 +-
 plugins/workbench-resources/src/utils.ts                 | 7 +++----
 rush.json                                                | 4 ++--
 server/account/src/operations.ts                         | 1 +
 services/github/github-resources/src/plugin.ts           | 2 +-
 services/github/model-github/src/plugin.ts               | 2 +-
 67 files changed, 86 insertions(+), 81 deletions(-)

diff --git a/models/activity/src/plugin.ts b/models/activity/src/plugin.ts
index 210ab46c36..f820672389 100644
--- a/models/activity/src/plugin.ts
+++ b/models/activity/src/plugin.ts
@@ -16,7 +16,7 @@ import { activityId, type ActivityMessage, type DocUpdateMessageViewlet } from '
 import activity from '@hcengineering/activity-resources/src/plugin'
 import { type IntlString, mergeIds, type Resource } from '@hcengineering/platform'
 import { type Doc, type Ref } from '@hcengineering/core'
-import type { Location } from '@hcengineering/ui'
+import type { Location } from '@hcengineering/ui/src/types'
 import {
   type Action,
   type ActionCategory,
diff --git a/models/card/src/index.ts b/models/card/src/index.ts
index e36e4f342d..6d41c44afb 100644
--- a/models/card/src/index.ts
+++ b/models/card/src/index.ts
@@ -43,7 +43,7 @@ import view, { createAction } from '@hcengineering/model-view'
 import workbench from '@hcengineering/model-workbench'
 import { getEmbeddedLabel, type IntlString } from '@hcengineering/platform'
 import time, { type ToDo } from '@hcengineering/time'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import card from './plugin'
 
 export { cardId } from '@hcengineering/card'
diff --git a/models/card/src/plugin.ts b/models/card/src/plugin.ts
index ef1ce2aa73..f8fc7524d4 100644
--- a/models/card/src/plugin.ts
+++ b/models/card/src/plugin.ts
@@ -19,7 +19,7 @@ import type { Client, Doc, Ref } from '@hcengineering/core'
 import {} from '@hcengineering/core'
 import { mergeIds, type Resource } from '@hcengineering/platform'
 import { type ObjectSearchCategory, type ObjectSearchFactory } from '@hcengineering/model-presentation'
-import { type Location, type ResolvedLocation } from '@hcengineering/ui'
+import { type Location, type ResolvedLocation } from '@hcengineering/ui/src/types'
 import { type LocationData } from '@hcengineering/workbench'
 import { type Action, type ViewAction } from '@hcengineering/view'
 
diff --git a/models/chunter/src/types.ts b/models/chunter/src/types.ts
index 73c7213eec..f4205e5dc3 100644
--- a/models/chunter/src/types.ts
+++ b/models/chunter/src/types.ts
@@ -58,7 +58,7 @@ import type { IntlString, Resource } from '@hcengineering/platform'
 import type { DocNotifyContext } from '@hcengineering/notification'
 
 import chunter from './plugin'
-import type { AnyComponent } from '@hcengineering/ui'
+import type { AnyComponent } from '@hcengineering/ui/src/types'
 
 export const DOMAIN_CHUNTER = 'chunter' as Domain
 
diff --git a/models/controlled-documents/src/plugin.ts b/models/controlled-documents/src/plugin.ts
index 8d9c54b779..fdde0039ed 100644
--- a/models/controlled-documents/src/plugin.ts
+++ b/models/controlled-documents/src/plugin.ts
@@ -19,7 +19,7 @@ import type { Client, Doc, Ref } from '@hcengineering/core'
 import { type ObjectSearchCategory, type ObjectSearchFactory } from '@hcengineering/model-presentation'
 import { mergeIds, type Resource } from '@hcengineering/platform'
 import { type TagCategory } from '@hcengineering/tags'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import { type ActionCategory, type ViewAction } from '@hcengineering/view'
 import { type NotificationType, type NotificationGroup } from '@hcengineering/notification'
 import { type TextActionVisibleFunction, type TextActionFunction } from '@hcengineering/text-editor'
diff --git a/models/document/src/plugin.ts b/models/document/src/plugin.ts
index e83a4ff7c7..78b3ce3f2d 100644
--- a/models/document/src/plugin.ts
+++ b/models/document/src/plugin.ts
@@ -20,7 +20,7 @@ import document from '@hcengineering/document-resources/src/plugin'
 import { type ObjectSearchCategory, type ObjectSearchFactory } from '@hcengineering/model-presentation'
 import { type IntlString, mergeIds, type Resource } from '@hcengineering/platform'
 import { type TagCategory } from '@hcengineering/tags'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import type { Action, ActionCategory, ViewAction, Viewlet } from '@hcengineering/view'
 
 export default mergeIds(documentId, document, {
diff --git a/models/drive/src/plugin.ts b/models/drive/src/plugin.ts
index dc05a8f62e..3f351771c0 100644
--- a/models/drive/src/plugin.ts
+++ b/models/drive/src/plugin.ts
@@ -19,7 +19,7 @@ import { driveId } from '@hcengineering/drive'
 import drive from '@hcengineering/drive-resources/src/plugin'
 import { type ObjectSearchCategory, type ObjectSearchFactory } from '@hcengineering/model-presentation'
 import { type IntlString, type Resource, mergeIds } from '@hcengineering/platform'
-import { type AnyComponent, type Location } from '@hcengineering/ui'
+import { type AnyComponent, type Location } from '@hcengineering/ui/src/types'
 import {
   type Action,
   type ActionCategory,
diff --git a/models/guest/src/index.ts b/models/guest/src/index.ts
index bf9fe3e495..b0f26b103f 100644
--- a/models/guest/src/index.ts
+++ b/models/guest/src/index.ts
@@ -9,7 +9,7 @@ import {
 import { type PublicLink, type Restrictions, guestAccountEmail } from '@hcengineering/guest'
 import { type Builder, Model } from '@hcengineering/model'
 import core, { TDoc } from '@hcengineering/model-core'
-import { type Location } from '@hcengineering/ui'
+import { type Location } from '@hcengineering/ui/src/types'
 import guest from './plugin'
 
 export const GUEST_DOMAIN = 'guest' as Domain
diff --git a/models/guest/src/plugin.ts b/models/guest/src/plugin.ts
index deff851c67..d1c97d3099 100644
--- a/models/guest/src/plugin.ts
+++ b/models/guest/src/plugin.ts
@@ -2,7 +2,7 @@ import { type Account, type Doc, type Ref } from '@hcengineering/core'
 import { guestId } from '@hcengineering/guest'
 import guest from '@hcengineering/guest-resources/src/plugin'
 import { mergeIds } from '@hcengineering/platform'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import { type Action, type ActionCategory } from '@hcengineering/view'
 
 export default mergeIds(guestId, guest, {
diff --git a/models/love/src/plugin.ts b/models/love/src/plugin.ts
index 1829a21dfd..f8819f6ed0 100644
--- a/models/love/src/plugin.ts
+++ b/models/love/src/plugin.ts
@@ -16,7 +16,7 @@
 import { type Client, type Doc, type Ref } from '@hcengineering/core'
 import { type NotificationType, type NotificationGroup } from '@hcengineering/notification'
 import { type Resource, mergeIds } from '@hcengineering/platform'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import { type ActionCategory, type ViewAction } from '@hcengineering/view'
 import { loveId } from '@hcengineering/love'
 import love from '@hcengineering/love-resources/src/plugin'
diff --git a/models/presence/src/plugin.ts b/models/presence/src/plugin.ts
index 1cb9b1449d..3c7bd4c46d 100644
--- a/models/presence/src/plugin.ts
+++ b/models/presence/src/plugin.ts
@@ -14,7 +14,7 @@
 //
 
 import { mergeIds } from '@hcengineering/platform'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import { presenceId } from '@hcengineering/presence'
 import presence from '@hcengineering/presence-resources/src/plugin'
 
diff --git a/models/print/src/plugin.ts b/models/print/src/plugin.ts
index 154799ed6d..ae258440d3 100644
--- a/models/print/src/plugin.ts
+++ b/models/print/src/plugin.ts
@@ -16,7 +16,7 @@
 import { type Doc, type Ref } from '@hcengineering/core'
 import { mergeIds } from '@hcengineering/platform'
 import { type ViewAction, type Action } from '@hcengineering/view'
-import { type FilePreviewExtension } from '@hcengineering/presentation'
+import { type FilePreviewExtension } from '@hcengineering/presentation/src/types'
 import { printId } from '@hcengineering/print'
 // This import is needed because of similar import in print plugin
 // Otherwise, TS complains about missing types for resulting merge
diff --git a/models/task/src/index.ts b/models/task/src/index.ts
index 2574086d00..f1cf9eb6f9 100644
--- a/models/task/src/index.ts
+++ b/models/task/src/index.ts
@@ -76,8 +76,8 @@ import {
   type TaskTypeDescriptor,
   type TaskTypeKind
 } from '@hcengineering/task'
-import type { AnyComponent } from '@hcengineering/ui'
 import { PaletteColorIndexes } from '@hcengineering/ui/src/colors'
+import type { AnyComponent } from '@hcengineering/ui/src/types'
 
 import task from './plugin'
 
diff --git a/models/text-editor/src/index.ts b/models/text-editor/src/index.ts
index 82557e4dfb..0576c24f58 100644
--- a/models/text-editor/src/index.ts
+++ b/models/text-editor/src/index.ts
@@ -31,7 +31,7 @@ import {
   type TextEditorActionKind
 } from '@hcengineering/text-editor'
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-import type { EditorKitOptions } from '@hcengineering/text-editor-resources'
+import type { EditorKitOptions } from '@hcengineering/text-editor-resources/src/kits/editor-kit'
 import textEditor from './plugin'
 
 export { textEditorOperation } from './migration'
diff --git a/models/time/src/index.ts b/models/time/src/index.ts
index 77ad3f89fa..09ed08557b 100644
--- a/models/time/src/index.ts
+++ b/models/time/src/index.ts
@@ -53,7 +53,7 @@ import workbench from '@hcengineering/model-workbench'
 import notification from '@hcengineering/notification'
 import recruit from '@hcengineering/recruit'
 import tags from '@hcengineering/tags'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import {
   type TodoDoneTester,
   timeId,
diff --git a/models/time/src/plugin.ts b/models/time/src/plugin.ts
index 19b134da99..5e799286fc 100644
--- a/models/time/src/plugin.ts
+++ b/models/time/src/plugin.ts
@@ -16,7 +16,7 @@
 import { type Client, type Doc, type Ref } from '@hcengineering/core'
 import { type Application } from '@hcengineering/model-workbench'
 import { type IntlString, mergeIds, type Resource } from '@hcengineering/platform'
-import type { AnyComponent } from '@hcengineering/ui'
+import type { AnyComponent } from '@hcengineering/ui/src/types'
 import { type Action, type ActionCategory } from '@hcengineering/view'
 import { timeId } from '@hcengineering/time'
 import time from '@hcengineering/time-resources/src/plugin'
diff --git a/models/training/src/plugin.ts b/models/training/src/plugin.ts
index 2f78c449d9..b75a6c85e6 100644
--- a/models/training/src/plugin.ts
+++ b/models/training/src/plugin.ts
@@ -18,7 +18,7 @@ import { trainingId } from '@hcengineering/training'
 import training from '@hcengineering/training-resources/src/plugin'
 import { mergeIds, type Resource } from '@hcengineering/platform'
 import { type Doc, type Ref } from '@hcengineering/core'
-import { type Location, type ResolvedLocation } from '@hcengineering/ui'
+import { type Location, type ResolvedLocation } from '@hcengineering/ui/src/types'
 import { type Application } from '@hcengineering/workbench'
 import { type ActionCategory } from '@hcengineering/view'
 
diff --git a/models/uploader/src/plugin.ts b/models/uploader/src/plugin.ts
index b9ca3910b3..1f9566018b 100644
--- a/models/uploader/src/plugin.ts
+++ b/models/uploader/src/plugin.ts
@@ -14,7 +14,7 @@
 //
 
 import { mergeIds } from '@hcengineering/platform'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import { uploaderId } from '@hcengineering/uploader'
 import uploader from '@hcengineering/uploader-resources/src/plugin'
 
diff --git a/models/view/src/utils.ts b/models/view/src/utils.ts
index f0c2f599b7..db2a45edbc 100644
--- a/models/view/src/utils.ts
+++ b/models/view/src/utils.ts
@@ -16,7 +16,7 @@
 import { type Class, type Data, type Doc, type Ref } from '@hcengineering/core'
 import { type Builder } from '@hcengineering/model'
 import core from '@hcengineering/model-core'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import { type Action, type AttributeCategory } from '@hcengineering/view'
 import view from '.'
 
diff --git a/models/workbench/src/index.ts b/models/workbench/src/index.ts
index 96dae1a6f1..880d2547ef 100644
--- a/models/workbench/src/index.ts
+++ b/models/workbench/src/index.ts
@@ -33,7 +33,7 @@ import type {
   SidebarEvent,
   WorkbenchTab
 } from '@hcengineering/workbench'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import core, { TClass, TDoc, TTx } from '@hcengineering/model-core'
 import presentation from '@hcengineering/model-presentation'
 
diff --git a/packages/platform-rig/profiles/assets/tsconfig.json b/packages/platform-rig/profiles/assets/tsconfig.json
index 8e578db9f7..94a2d03e17 100644
--- a/packages/platform-rig/profiles/assets/tsconfig.json
+++ b/packages/platform-rig/profiles/assets/tsconfig.json
@@ -16,6 +16,8 @@
       "dom"
     ],
     "types": ["node", "jest"],
-    "incremental": true
+    "incremental": true,
+    "isolatedModules": true,
+    
   }
 }
\ No newline at end of file
diff --git a/packages/platform-rig/profiles/default/tsconfig.json b/packages/platform-rig/profiles/default/tsconfig.json
index c434de43a6..f6ccee4ce9 100644
--- a/packages/platform-rig/profiles/default/tsconfig.json
+++ b/packages/platform-rig/profiles/default/tsconfig.json
@@ -17,6 +17,7 @@
     "rootDir": "./src",
     "outDir": "./lib",
     "incremental": true,
-    "isolatedModules": true
+    "isolatedModules": true,
+    
   }
 }
\ No newline at end of file
diff --git a/packages/platform-rig/profiles/model/tsconfig.json b/packages/platform-rig/profiles/model/tsconfig.json
index 3a7ae70f1b..1a954bd001 100644
--- a/packages/platform-rig/profiles/model/tsconfig.json
+++ b/packages/platform-rig/profiles/model/tsconfig.json
@@ -13,6 +13,7 @@
     "esModuleInterop": true,
     "incremental": true,
     "types" : [],
-    "isolatedModules": true
+    "isolatedModules": true,
+    
   }
 }
\ No newline at end of file
diff --git a/packages/platform-rig/profiles/node/tsconfig.json b/packages/platform-rig/profiles/node/tsconfig.json
index be325351a1..5430cf1c5a 100644
--- a/packages/platform-rig/profiles/node/tsconfig.json
+++ b/packages/platform-rig/profiles/node/tsconfig.json
@@ -15,6 +15,7 @@
     "rootDir": "./src",
     "outDir": "./lib",
     "incremental": true,
-    "isolatedModules": true
+    "isolatedModules": true,
+    
   }
 }
diff --git a/packages/platform-rig/profiles/package/tsconfig.json b/packages/platform-rig/profiles/package/tsconfig.json
index 6c389326f9..be76b62921 100644
--- a/packages/platform-rig/profiles/package/tsconfig.json
+++ b/packages/platform-rig/profiles/package/tsconfig.json
@@ -15,6 +15,7 @@
     "rootDir": "./src",
     "outDir": "./lib",
     "incremental": true,
-    "isolatedModules": true
+    "isolatedModules": true,
+    
   }
 }
\ No newline at end of file
diff --git a/packages/platform-rig/profiles/ui/tsconfig.json b/packages/platform-rig/profiles/ui/tsconfig.json
index e095e09e86..cea4847109 100644
--- a/packages/platform-rig/profiles/ui/tsconfig.json
+++ b/packages/platform-rig/profiles/ui/tsconfig.json
@@ -18,6 +18,7 @@
     ],
     "incremental": true,
     "types": ["jest"],
-    "isolatedModules": true
+    "isolatedModules": true,
+    
   }
 }
\ No newline at end of file
diff --git a/packages/presentation/src/components/breadcrumbs/types.ts b/packages/presentation/src/components/breadcrumbs/types.ts
index d26b8ff2c5..d3dc40a1c3 100644
--- a/packages/presentation/src/components/breadcrumbs/types.ts
+++ b/packages/presentation/src/components/breadcrumbs/types.ts
@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { type AnyComponent, type AnySvelteComponent } from '@hcengineering/ui'
+import { type AnyComponent, type AnySvelteComponent } from '@hcengineering/ui/src/types'
 
 interface BreadcrumbsProps {
   readonly color?: number | undefined
diff --git a/packages/presentation/src/plugin.ts b/packages/presentation/src/plugin.ts
index 7737e4a664..e5ec64fb44 100644
--- a/packages/presentation/src/plugin.ts
+++ b/packages/presentation/src/plugin.ts
@@ -32,7 +32,7 @@ import {
 } from '@hcengineering/core'
 import type { Asset, IntlString, Metadata, Plugin, StatusCode } from '@hcengineering/platform'
 import { plugin } from '@hcengineering/platform'
-import { type ComponentExtensionId } from '@hcengineering/ui'
+import { type ComponentExtensionId } from '@hcengineering/ui/src/types'
 import { type PresentationMiddlewareFactory } from './pipeline'
 import type { PreviewConfig } from './preview'
 import {
diff --git a/packages/presentation/src/types.ts b/packages/presentation/src/types.ts
index 0dbcd69ac3..a85e6c9afd 100644
--- a/packages/presentation/src/types.ts
+++ b/packages/presentation/src/types.ts
@@ -13,7 +13,7 @@ import {
   type TxOperations
 } from '@hcengineering/core'
 import { type Asset, type IntlString, type Resource } from '@hcengineering/platform'
-import { type AnyComponent, type AnySvelteComponent, type ComponentExtensionId } from '@hcengineering/ui'
+import { type AnyComponent, type AnySvelteComponent, type ComponentExtensionId } from '@hcengineering/ui/src/types'
 
 export * from './components/breadcrumbs/types'
 
diff --git a/plugins/attachment-resources/src/components/AttachmentRefInput.svelte b/plugins/attachment-resources/src/components/AttachmentRefInput.svelte
index f6b2ebf556..72c4c39705 100644
--- a/plugins/attachment-resources/src/components/AttachmentRefInput.svelte
+++ b/plugins/attachment-resources/src/components/AttachmentRefInput.svelte
@@ -18,15 +18,15 @@
   import { Asset, IntlString, setPlatformStatus, unknownError } from '@hcengineering/platform'
   import {
     DraftController,
+    canDisplayLinkPreview,
     createQuery,
     deleteFile,
     draftsStore,
+    fetchLinkPreviewDetails,
     getClient,
     getFileMetadata,
-    uploadFile,
-    fetchLinkPreviewDetails,
-    canDisplayLinkPreview,
-    isLinkPreviewEnabled
+    isLinkPreviewEnabled,
+    uploadFile
   } from '@hcengineering/presentation'
   import { EmptyMarkup } from '@hcengineering/text'
   import textEditor, { type RefAction } from '@hcengineering/text-editor'
@@ -35,7 +35,6 @@
   import { createEventDispatcher, onDestroy, tick } from 'svelte'
   import attachment from '../plugin'
   import AttachmentPresenter from './AttachmentPresenter.svelte'
-  import { rmSync } from 'fs'
 
   export let objectId: Ref<Doc>
   export let space: Ref<Space>
diff --git a/plugins/bitrix-resources/src/plugin.ts b/plugins/bitrix-resources/src/plugin.ts
index 35eac13619..e9d48e46e1 100644
--- a/plugins/bitrix-resources/src/plugin.ts
+++ b/plugins/bitrix-resources/src/plugin.ts
@@ -18,7 +18,7 @@ import { type IntlString, mergeIds } from '@hcengineering/platform'
 import bitrix, { bitrixId } from '@hcengineering/bitrix'
 import { type Ref } from '@hcengineering/core'
 import { type Handler, type IntegrationType } from '@hcengineering/setting'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 
 export default mergeIds(bitrixId, bitrix, {
   string: {
diff --git a/plugins/board-resources/src/plugin.ts b/plugins/board-resources/src/plugin.ts
index 40fa6ec7f6..7937afe3b5 100644
--- a/plugins/board-resources/src/plugin.ts
+++ b/plugins/board-resources/src/plugin.ts
@@ -16,7 +16,7 @@
 import board, { boardId } from '@hcengineering/board'
 import { type Ref, type StatusCategory } from '@hcengineering/core'
 import { type IntlString, mergeIds } from '@hcengineering/platform'
-import type { AnyComponent } from '@hcengineering/ui'
+import type { AnyComponent } from '@hcengineering/ui/src/types'
 
 export default mergeIds(boardId, board, {
   string: {
diff --git a/plugins/card-resources/src/plugin.ts b/plugins/card-resources/src/plugin.ts
index b1134284c1..8de66b1f4a 100644
--- a/plugins/card-resources/src/plugin.ts
+++ b/plugins/card-resources/src/plugin.ts
@@ -16,7 +16,7 @@
 import card, { cardId } from '@hcengineering/card'
 import { type Ref } from '@hcengineering/core'
 import { type IntlString, mergeIds } from '@hcengineering/platform'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import { type Viewlet } from '@hcengineering/view'
 
 export default mergeIds(cardId, card, {
diff --git a/plugins/chunter-resources/src/plugin.ts b/plugins/chunter-resources/src/plugin.ts
index 5e70cb1c77..d2f93c3bdd 100644
--- a/plugins/chunter-resources/src/plugin.ts
+++ b/plugins/chunter-resources/src/plugin.ts
@@ -17,7 +17,7 @@ import chunter, { chunterId } from '@hcengineering/chunter'
 import type { Client, Doc, Ref, Space } from '@hcengineering/core'
 import type { IntlString, Resource } from '@hcengineering/platform'
 import { mergeIds } from '@hcengineering/platform'
-import type { AnyComponent } from '@hcengineering/ui'
+import type { AnyComponent } from '@hcengineering/ui/src/types'
 import { type ViewAction } from '@hcengineering/view'
 import { type DocNotifyContext, type InboxNotification } from '@hcengineering/notification'
 
diff --git a/plugins/contact-resources/src/plugin.ts b/plugins/contact-resources/src/plugin.ts
index b3c630f321..fe38707508 100644
--- a/plugins/contact-resources/src/plugin.ts
+++ b/plugins/contact-resources/src/plugin.ts
@@ -17,7 +17,7 @@
 import contact, { contactId } from '@hcengineering/contact'
 import { type Client, type Doc } from '@hcengineering/core'
 import { type IntlString, mergeIds, type Resource } from '@hcengineering/platform'
-import { type LabelAndProps, type Location } from '@hcengineering/ui'
+import { type LabelAndProps, type Location } from '@hcengineering/ui/src/types'
 import {
   type CreateAggregationManagerFunc,
   type GrouppingManagerResource,
diff --git a/plugins/controlled-documents-resources/src/plugin.ts b/plugins/controlled-documents-resources/src/plugin.ts
index 9e14aaa0cb..85a569dad6 100644
--- a/plugins/controlled-documents-resources/src/plugin.ts
+++ b/plugins/controlled-documents-resources/src/plugin.ts
@@ -20,7 +20,7 @@ import documents, {
 } from '@hcengineering/controlled-documents'
 import { type Client, type Doc, type Ref, type Space } from '@hcengineering/core'
 import { type IntlString, mergeIds, type Resource } from '@hcengineering/platform'
-import { type AnyComponent, type Location } from '@hcengineering/ui'
+import { type AnyComponent, type Location } from '@hcengineering/ui/src/types'
 import type { KeyFilter, SortFunc, ViewActionAvailabilityFunction } from '@hcengineering/view'
 
 export default mergeIds(documentsId, documents, {
diff --git a/plugins/controlled-documents/src/plugin.ts b/plugins/controlled-documents/src/plugin.ts
index 28bca7c96d..d4262a15df 100644
--- a/plugins/controlled-documents/src/plugin.ts
+++ b/plugins/controlled-documents/src/plugin.ts
@@ -12,7 +12,7 @@ import {
 } from '@hcengineering/core'
 import type { Asset, Plugin, Resource } from '@hcengineering/platform'
 import { IntlString, plugin } from '@hcengineering/platform'
-import type { AnyComponent, ResolvedLocation, Location } from '@hcengineering/ui'
+import type { AnyComponent, ResolvedLocation, Location } from '@hcengineering/ui/src/types'
 import { Action } from '@hcengineering/view'
 
 import type {
diff --git a/plugins/document-resources/src/plugin.ts b/plugins/document-resources/src/plugin.ts
index 52e193a833..957500ec3a 100644
--- a/plugins/document-resources/src/plugin.ts
+++ b/plugins/document-resources/src/plugin.ts
@@ -16,7 +16,7 @@
 import { type Client, type Doc, type Ref } from '@hcengineering/core'
 import document, { type Document, documentId } from '@hcengineering/document'
 import { mergeIds, type IntlString, type Resource } from '@hcengineering/platform'
-import { type AnyComponent, type Location } from '@hcengineering/ui'
+import { type AnyComponent, type Location } from '@hcengineering/ui/src/types'
 
 export default mergeIds(documentId, document, {
   component: {
diff --git a/plugins/document/src/plugin.ts b/plugins/document/src/plugin.ts
index 2c8fabcb29..7613d355f7 100644
--- a/plugins/document/src/plugin.ts
+++ b/plugins/document/src/plugin.ts
@@ -17,7 +17,7 @@ import type { Class, Doc, Mixin, Ref, SpaceType, SpaceTypeDescriptor } from '@hc
 import { NotificationGroup, NotificationType } from '@hcengineering/notification'
 import type { Asset, Plugin, Resource } from '@hcengineering/platform'
 import { IntlString, plugin } from '@hcengineering/platform'
-import type { AnyComponent, Location, ResolvedLocation } from '@hcengineering/ui'
+import type { AnyComponent, Location, ResolvedLocation } from '@hcengineering/ui/src/types'
 import { Action } from '@hcengineering/view'
 import { Document, DocumentSnapshot, SavedDocument, Teamspace } from './types'
 
diff --git a/plugins/drive/src/plugin.ts b/plugins/drive/src/plugin.ts
index 11c7d89a8b..4d52c95798 100644
--- a/plugins/drive/src/plugin.ts
+++ b/plugins/drive/src/plugin.ts
@@ -16,7 +16,7 @@
 import type { Class, Doc, Mixin, Ref, SpaceType, SpaceTypeDescriptor, Type } from '@hcengineering/core'
 import type { Asset, IntlString, Plugin, Resource as PlatformResource } from '@hcengineering/platform'
 import { plugin } from '@hcengineering/platform'
-import type { Location, ResolvedLocation } from '@hcengineering/ui'
+import type { Location, ResolvedLocation } from '@hcengineering/ui/src/types'
 import { Drive, File, FileVersion, Folder, Resource } from './types'
 
 export * from './types'
diff --git a/plugins/lead-resources/src/plugin.ts b/plugins/lead-resources/src/plugin.ts
index 1a2a1c354b..c8f5f879bc 100644
--- a/plugins/lead-resources/src/plugin.ts
+++ b/plugins/lead-resources/src/plugin.ts
@@ -16,7 +16,7 @@
 import lead, { leadId } from '@hcengineering/lead'
 import { type IntlString, mergeIds, type Resource } from '@hcengineering/platform'
 import { type Client, type Doc, type Ref } from '@hcengineering/core'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 
 export default mergeIds(leadId, lead, {
   string: {
diff --git a/plugins/love-resources/src/plugin.ts b/plugins/love-resources/src/plugin.ts
index e2fef3a06c..699e784653 100644
--- a/plugins/love-resources/src/plugin.ts
+++ b/plugins/love-resources/src/plugin.ts
@@ -15,8 +15,8 @@
 
 import love, { loveId } from '@hcengineering/love'
 import { mergeIds, type IntlString, type Resource } from '@hcengineering/platform'
-import { type DocCreateFunction } from '@hcengineering/presentation'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type DocCreateFunction } from '@hcengineering/presentation/src/types'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import { type ViewActionAvailabilityFunction } from '@hcengineering/view'
 
 export default mergeIds(loveId, love, {
diff --git a/plugins/presence/src/plugin.ts b/plugins/presence/src/plugin.ts
index 7f50ca851a..c6cb101e4a 100644
--- a/plugins/presence/src/plugin.ts
+++ b/plugins/presence/src/plugin.ts
@@ -15,7 +15,7 @@
 
 import type { Metadata, Plugin } from '@hcengineering/platform'
 import { plugin } from '@hcengineering/platform'
-import { AnyComponent } from '@hcengineering/ui'
+import { AnyComponent } from '@hcengineering/ui/src/types'
 
 /** @public */
 export const presenceId = 'presence' as Plugin
diff --git a/plugins/print/src/plugin.ts b/plugins/print/src/plugin.ts
index 967bb31660..24b758bb8c 100644
--- a/plugins/print/src/plugin.ts
+++ b/plugins/print/src/plugin.ts
@@ -4,7 +4,7 @@
 
 import { type Doc } from '@hcengineering/core'
 import { type IntlString, type Metadata, type Plugin, plugin, type Asset, type Resource } from '@hcengineering/platform'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 
 export const printId = 'print' as Plugin
 
diff --git a/plugins/products-resources/src/plugin.ts b/plugins/products-resources/src/plugin.ts
index 285cd9ae10..b36cc84d16 100644
--- a/plugins/products-resources/src/plugin.ts
+++ b/plugins/products-resources/src/plugin.ts
@@ -16,8 +16,8 @@
 import products, { productsId } from '@hcengineering/products'
 import { type Ref, type Space } from '@hcengineering/core'
 import { type IntlString, type Resource, mergeIds } from '@hcengineering/platform'
-import { type ObjectSearchCategory, type ObjectSearchFactory } from '@hcengineering/presentation'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type ObjectSearchCategory, type ObjectSearchFactory } from '@hcengineering/presentation/src/types'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import { type KeyFilter } from '@hcengineering/view'
 
 export default mergeIds(productsId, products, {
diff --git a/plugins/products/src/plugin.ts b/plugins/products/src/plugin.ts
index 078115f123..d92d8110fa 100644
--- a/plugins/products/src/plugin.ts
+++ b/plugins/products/src/plugin.ts
@@ -17,7 +17,7 @@ import { Mixin, Type, type Class, type Doc, type Ref } from '@hcengineering/core
 import type { Asset, IntlString, Plugin } from '@hcengineering/platform'
 
 import { plugin } from '@hcengineering/platform'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import { ActionCategory, Viewlet } from '@hcengineering/view'
 import type { DocumentSpaceType, DocumentSpaceTypeDescriptor } from '@hcengineering/controlled-documents'
 import { Product, ProductVersion, ProductVersionState } from './types'
diff --git a/plugins/recruit-resources/src/components/CreateCandidate.svelte b/plugins/recruit-resources/src/components/CreateCandidate.svelte
index 9767c92bf5..0c63a0fde8 100644
--- a/plugins/recruit-resources/src/components/CreateCandidate.svelte
+++ b/plugins/recruit-resources/src/components/CreateCandidate.svelte
@@ -74,7 +74,6 @@
   import recruit from '../plugin'
   import { getCandidateIdentifier } from '../utils'
   import YesNo from './YesNo.svelte'
-  import IconSwitch from './icons/Switch.svelte'
   import IconShuffle from './icons/Shuffle.svelte'
 
   export let shouldSaveDraft: boolean = true
diff --git a/plugins/recruit-resources/src/plugin.ts b/plugins/recruit-resources/src/plugin.ts
index a22e2b7c0d..f5a771c283 100644
--- a/plugins/recruit-resources/src/plugin.ts
+++ b/plugins/recruit-resources/src/plugin.ts
@@ -16,10 +16,10 @@
 import { type Client, type Doc, type Ref } from '@hcengineering/core'
 import type { IntlString, Resource, StatusCode } from '@hcengineering/platform'
 import { mergeIds } from '@hcengineering/platform'
-import { type ObjectSearchCategory, type ObjectSearchFactory } from '@hcengineering/presentation'
+import { type ObjectSearchCategory, type ObjectSearchFactory } from '@hcengineering/presentation/src/types'
 import recruit, { recruitId } from '@hcengineering/recruit'
 import { type TagCategory } from '@hcengineering/tags'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import { type FilterFunction, type FilterMode, type Viewlet } from '@hcengineering/view'
 
 export default mergeIds(recruitId, recruit, {
diff --git a/plugins/setting-resources/src/plugin.ts b/plugins/setting-resources/src/plugin.ts
index 03b12565d7..10e523c4c4 100644
--- a/plugins/setting-resources/src/plugin.ts
+++ b/plugins/setting-resources/src/plugin.ts
@@ -17,7 +17,7 @@ import { type Ref } from '@hcengineering/core'
 import type { IntlString } from '@hcengineering/platform'
 import { mergeIds } from '@hcengineering/platform'
 import setting, { settingId } from '@hcengineering/setting'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import { type Widget } from '@hcengineering/workbench'
 
 export default mergeIds(settingId, setting, {
diff --git a/plugins/survey-resources/src/plugin.ts b/plugins/survey-resources/src/plugin.ts
index 163ecbac44..5ce97071b8 100644
--- a/plugins/survey-resources/src/plugin.ts
+++ b/plugins/survey-resources/src/plugin.ts
@@ -16,7 +16,7 @@
 import type { Client, Doc, Ref } from '@hcengineering/core'
 import { type Resource, mergeIds } from '@hcengineering/platform'
 import survey, { surveyId } from '@hcengineering/survey'
-import type { Location, ResolvedLocation } from '@hcengineering/ui'
+import type { Location, ResolvedLocation } from '@hcengineering/ui/src/types'
 import type { Action, ActionCategory, ViewAction } from '@hcengineering/view'
 
 export default mergeIds(surveyId, survey, {
diff --git a/plugins/tags-resources/src/plugin.ts b/plugins/tags-resources/src/plugin.ts
index dbcfccf147..6db1a5bda9 100644
--- a/plugins/tags-resources/src/plugin.ts
+++ b/plugins/tags-resources/src/plugin.ts
@@ -13,7 +13,7 @@
 
 import { type IntlString, mergeIds, type Resource } from '@hcengineering/platform'
 import tags, { tagsId } from '@hcengineering/tags'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import { type FilterFunction } from '@hcengineering/view'
 
 export default mergeIds(tagsId, tags, {
diff --git a/plugins/telegram-resources/src/plugin.ts b/plugins/telegram-resources/src/plugin.ts
index 1765a3cd1b..4d753f46d2 100644
--- a/plugins/telegram-resources/src/plugin.ts
+++ b/plugins/telegram-resources/src/plugin.ts
@@ -17,7 +17,7 @@
 import { type IntlString, mergeIds } from '@hcengineering/platform'
 
 import telegram, { telegramId } from '@hcengineering/telegram'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 
 export default mergeIds(telegramId, telegram, {
   string: {
diff --git a/plugins/templates-resources/src/plugin.ts b/plugins/templates-resources/src/plugin.ts
index 9c6c238642..504ff63eab 100644
--- a/plugins/templates-resources/src/plugin.ts
+++ b/plugins/templates-resources/src/plugin.ts
@@ -15,7 +15,7 @@
 //
 
 import { type IntlString, mergeIds } from '@hcengineering/platform'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import templates, { templatesId } from '@hcengineering/templates'
 
 export default mergeIds(templatesId, templates, {
diff --git a/plugins/templates/src/index.ts b/plugins/templates/src/index.ts
index c3c22c8dd5..4a2e751177 100644
--- a/plugins/templates/src/index.ts
+++ b/plugins/templates/src/index.ts
@@ -14,9 +14,9 @@
 //
 
 import type { Class, Doc, Markup, Ref, Space } from '@hcengineering/core'
-import type { IntlString, Plugin, Resource } from '@hcengineering/platform'
-import { Asset, plugin } from '@hcengineering/platform'
-import { AnyComponent } from '@hcengineering/ui'
+import type { IntlString, Plugin, Resource, Asset } from '@hcengineering/platform'
+import { plugin } from '@hcengineering/platform'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 
 /**
  * @public
diff --git a/plugins/test-management/src/plugin.ts b/plugins/test-management/src/plugin.ts
index 0074c5fe76..d306c4279e 100644
--- a/plugins/test-management/src/plugin.ts
+++ b/plugins/test-management/src/plugin.ts
@@ -26,7 +26,7 @@ import {
 import type { Asset, IntlString, Plugin, Resource } from '@hcengineering/platform'
 
 import { plugin } from '@hcengineering/platform'
-import { type AnyComponent, type Location, type ResolvedLocation } from '@hcengineering/ui'
+import { type AnyComponent, type Location, type ResolvedLocation } from '@hcengineering/ui/src/types'
 
 import { Action, ActionCategory, ViewAction, Viewlet } from '@hcengineering/view'
 import {
diff --git a/plugins/tracker-resources/src/plugin.ts b/plugins/tracker-resources/src/plugin.ts
index 35c2619bde..6768e87652 100644
--- a/plugins/tracker-resources/src/plugin.ts
+++ b/plugins/tracker-resources/src/plugin.ts
@@ -15,10 +15,10 @@
 import { type StatusCategory, type Client, type Doc, type Ref, type Space } from '@hcengineering/core'
 import type { Asset, IntlString, Metadata, Resource } from '@hcengineering/platform'
 import { mergeIds } from '@hcengineering/platform'
-import type { ObjectSearchCategory, ObjectSearchFactory } from '@hcengineering/presentation'
+import type { ObjectSearchCategory, ObjectSearchFactory } from '@hcengineering/presentation/src/types'
 import { type ProjectType, type TaskType } from '@hcengineering/task'
 import tracker, { trackerId, type IssueDraft, type Issue } from '@hcengineering/tracker'
-import { type AnyComponent, type Location } from '@hcengineering/ui'
+import { type AnyComponent, type Location } from '@hcengineering/ui/src/types'
 import {
   type CreateAggregationManagerFunc,
   type GetAllValuesFunc,
diff --git a/plugins/uploader-resources/src/plugin.ts b/plugins/uploader-resources/src/plugin.ts
index efbb5f2684..eedc77772c 100644
--- a/plugins/uploader-resources/src/plugin.ts
+++ b/plugins/uploader-resources/src/plugin.ts
@@ -14,7 +14,7 @@
 //
 
 import { type IntlString, mergeIds } from '@hcengineering/platform'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import uploader, { uploaderId } from '@hcengineering/uploader'
 
 export default mergeIds(uploaderId, uploader, {
diff --git a/plugins/uploader/src/plugin.ts b/plugins/uploader/src/plugin.ts
index 1ce8991cbe..6c6c4cfcfc 100644
--- a/plugins/uploader/src/plugin.ts
+++ b/plugins/uploader/src/plugin.ts
@@ -15,7 +15,7 @@
 
 import type { IntlString, Plugin, Resource } from '@hcengineering/platform'
 import { plugin } from '@hcengineering/platform'
-import type { AnyComponent } from '@hcengineering/ui'
+import type { AnyComponent } from '@hcengineering/ui/src/types'
 
 import type { UploadFilesFn, UploadFilesPopupFn } from './types'
 
diff --git a/plugins/view-resources/src/plugin.ts b/plugins/view-resources/src/plugin.ts
index 8e33a660d6..bdac738f4a 100644
--- a/plugins/view-resources/src/plugin.ts
+++ b/plugins/view-resources/src/plugin.ts
@@ -15,8 +15,8 @@
 //
 
 import { type IntlString, type Resource, mergeIds } from '@hcengineering/platform'
-import { type PresentationMiddlewareCreator } from '@hcengineering/presentation'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type PresentationMiddlewareCreator } from '@hcengineering/presentation/src/pipeline'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import view, { viewId } from '@hcengineering/view'
 
 export default mergeIds(viewId, view, {
diff --git a/plugins/view/src/index.ts b/plugins/view/src/index.ts
index 7a163484a9..5cee522138 100644
--- a/plugins/view/src/index.ts
+++ b/plugins/view/src/index.ts
@@ -16,7 +16,7 @@
 
 import { Class, Doc, DocumentQuery, FindOptions, Mixin, Ref } from '@hcengineering/core'
 import { Asset, IntlString, Plugin, Resource, plugin } from '@hcengineering/platform'
-import { AnyComponent, PopupAlignment, PopupPosAlignment } from '@hcengineering/ui'
+import { AnyComponent, PopupAlignment, PopupPosAlignment } from '@hcengineering/ui/src/types'
 import {
   Action,
   ActionCategory,
diff --git a/plugins/workbench-resources/src/components/Navigator.svelte b/plugins/workbench-resources/src/components/Navigator.svelte
index 0dbeadb02b..e121facb86 100644
--- a/plugins/workbench-resources/src/components/Navigator.svelte
+++ b/plugins/workbench-resources/src/components/Navigator.svelte
@@ -47,7 +47,7 @@
       (it) => !hierarchy.isMixin(it)
     )
     if (classes.length > 0) {
-      query.query(
+      query.query<Space>(
         classes.length === 1 ? classes[0] : core.class.Space,
         !adminUser
           ? {
diff --git a/plugins/workbench-resources/src/plugin.ts b/plugins/workbench-resources/src/plugin.ts
index 6e7593a338..2024032f0c 100644
--- a/plugins/workbench-resources/src/plugin.ts
+++ b/plugins/workbench-resources/src/plugin.ts
@@ -17,7 +17,7 @@ import { mergeIds } from '@hcengineering/platform'
 import type { IntlString, Metadata } from '@hcengineering/platform'
 
 import workbench, { workbenchId } from '@hcengineering/workbench'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 
 export default mergeIds(workbenchId, workbench, {
   string: {
diff --git a/plugins/workbench-resources/src/utils.ts b/plugins/workbench-resources/src/utils.ts
index c36a0d9dc1..b95905cba7 100644
--- a/plugins/workbench-resources/src/utils.ts
+++ b/plugins/workbench-resources/src/utils.ts
@@ -19,16 +19,15 @@ import core, { hasAccountRole } from '@hcengineering/core'
 import type { Workspace } from '@hcengineering/login'
 import login, { loginId } from '@hcengineering/login'
 import { getResource, setMetadata } from '@hcengineering/platform'
-import { closeClient, getClient } from '@hcengineering/presentation'
-import presentation from '@hcengineering/presentation/src/plugin'
+import presentation, { closeClient, getClient } from '@hcengineering/presentation'
 import {
   closePanel,
   fetchMetadataLocalStorage,
   getCurrentLocation,
   type Location,
+  location,
   navigate,
-  setMetadataLocalStorage,
-  location
+  setMetadataLocalStorage
 } from '@hcengineering/ui'
 import view from '@hcengineering/view'
 import workbench, { type Application, type NavigatorModel } from '@hcengineering/workbench'
diff --git a/rush.json b/rush.json
index f8bebe78d7..0b771f87ab 100644
--- a/rush.json
+++ b/rush.json
@@ -16,7 +16,7 @@
    * path segment in the "$schema" field for all your Rush config files.  This will ensure
    * correct error-underlining and tab-completion for editors such as VS Code.
    */
-  "rushVersion": "5.148.0",
+  "rushVersion": "5.149.0",
 
   /**
    * The next field selects which package manager should be installed and determines its version.
@@ -124,7 +124,7 @@
    * LTS schedule: https://nodejs.org/en/about/releases/
    * LTS versions: https://nodejs.org/en/download/releases/
    */
-  "nodeSupportedVersionRange": ">=12.13.0 <13.0.0 || >=14.15.0 <15.0.0 || >=16.0.0",
+  "nodeSupportedVersionRange": ">=20.0.0 <23.0.0",
 
   /**
    * Odd-numbered major versions of Node.js are experimental.  Even-numbered releases
diff --git a/server/account/src/operations.ts b/server/account/src/operations.ts
index 5c36039320..c265fac33f 100644
--- a/server/account/src/operations.ts
+++ b/server/account/src/operations.ts
@@ -1237,6 +1237,7 @@ export async function updateWorkspaceInfo (
     case 'restore-done':
       update.mode = 'active'
       update.progress = 100
+      update.lastProcessingTime = Date.now() - processingTimeoutMs // To not wait for next step
       break
 
     case 'archiving-backup-started':
diff --git a/services/github/github-resources/src/plugin.ts b/services/github/github-resources/src/plugin.ts
index d146ffdc40..c14e5ccefd 100644
--- a/services/github/github-resources/src/plugin.ts
+++ b/services/github/github-resources/src/plugin.ts
@@ -7,7 +7,7 @@ import { type IntlString, mergeIds } from '@hcengineering/platform'
 import github, { githubId } from '@hcengineering/github'
 import { type Ref } from '@hcengineering/core'
 import { type Handler, type IntegrationType } from '@hcengineering/setting'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 
 export default mergeIds(githubId, github, {
   string: {
diff --git a/services/github/model-github/src/plugin.ts b/services/github/model-github/src/plugin.ts
index 40768235b5..985a758441 100644
--- a/services/github/model-github/src/plugin.ts
+++ b/services/github/model-github/src/plugin.ts
@@ -14,7 +14,7 @@ import {
   type DocCreateAnalyticsPropsFunction
 } from '@hcengineering/model-presentation'
 import { type NotificationGroup } from '@hcengineering/notification'
-import type { AnyComponent } from '@hcengineering/ui'
+import type { AnyComponent } from '@hcengineering/ui/src/types'
 import { type ActionCategory, type Viewlet } from '@hcengineering/view'
 
 export default mergeIds(githubId, github, {

From f0f63391ffa8b896d5984179a5eca4c59409d89a Mon Sep 17 00:00:00 2001
From: Alexander Onnikov <aonnikov@hardcoreeng.com>
Date: Mon, 17 Feb 2025 14:35:03 +0700
Subject: [PATCH 03/13] fix: use workspace uuid in image and blob links (#8019)

Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com>
---
 packages/presentation/src/file.ts                 | 15 ++++++---------
 packages/presentation/src/preview.ts              |  8 ++++----
 plugins/guest-resources/src/connect.ts            |  4 +---
 .../src/components/Backup.svelte                  |  3 +--
 plugins/workbench-resources/src/connect.ts        |  4 +---
 5 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/packages/presentation/src/file.ts b/packages/presentation/src/file.ts
index 4b0e6860e8..a3405427f6 100644
--- a/packages/presentation/src/file.ts
+++ b/packages/presentation/src/file.ts
@@ -99,12 +99,9 @@ function getFilesUrl (): string {
   return filesUrl.includes('://') ? filesUrl : concatLink(frontUrl, filesUrl)
 }
 
-export function getCurrentWorkspaceId (): WorkspaceDataId {
-  return (
-    getMetadata(plugin.metadata.WorkspaceDataId) ??
-    (getMetadata(plugin.metadata.WorkspaceUuid) as unknown as WorkspaceDataId) ??
-    ('' as WorkspaceDataId)
-  )
+export function getCurrentWorkspaceUuid (): WorkspaceDataId {
+  const workspaceUuid = getMetadata(plugin.metadata.WorkspaceUuid) ?? ''
+  return workspaceUuid as WorkspaceDataId
 }
 
 /**
@@ -120,7 +117,7 @@ export function generateFileId (): string {
 export function getUploadUrl (): string {
   const template = getMetadata(plugin.metadata.UploadURL) ?? defaultUploadUrl
 
-  return template.replaceAll(':workspace', encodeURIComponent(getCurrentWorkspaceId()))
+  return template.replaceAll(':workspace', encodeURIComponent(getCurrentWorkspaceUuid()))
 }
 
 function getUploadConfig (): UploadConfig {
@@ -142,7 +139,7 @@ function getFileUploadMethod (blob: Blob): { method: FileUploadMethod, url: stri
  * @public
  */
 export function getFileUploadParams (blobId: string, blob: Blob): FileUploadParams {
-  const workspaceId = encodeURIComponent(getCurrentWorkspaceId())
+  const workspaceId = encodeURIComponent(getCurrentWorkspaceUuid())
   const fileId = encodeURIComponent(blobId)
 
   const { method, url: urlTemplate } = getFileUploadMethod(blob)
@@ -170,7 +167,7 @@ export function getFileUrl (file: string, filename?: string): string {
   const template = getFilesUrl()
   return template
     .replaceAll(':filename', encodeURIComponent(filename ?? file))
-    .replaceAll(':workspace', encodeURIComponent(getCurrentWorkspaceId()))
+    .replaceAll(':workspace', encodeURIComponent(getCurrentWorkspaceUuid()))
     .replaceAll(':blobId', encodeURIComponent(file))
 }
 
diff --git a/packages/presentation/src/preview.ts b/packages/presentation/src/preview.ts
index 256a9cd1c1..b91827c2bc 100644
--- a/packages/presentation/src/preview.ts
+++ b/packages/presentation/src/preview.ts
@@ -2,7 +2,7 @@ import type { Blob, Ref } from '@hcengineering/core'
 import { concatLink } from '@hcengineering/core'
 import { getMetadata } from '@hcengineering/platform'
 
-import { getFileUrl, getCurrentWorkspaceId } from './file'
+import { getFileUrl, getCurrentWorkspaceUuid } from './file'
 import presentation from './plugin'
 
 export interface PreviewConfig {
@@ -16,7 +16,7 @@ export interface VideoMeta {
   hls: string
 }
 
-const defaultImagePreview = (): string => `/files/${getCurrentWorkspaceId()}?file=:blobId&size=:size`
+const defaultImagePreview = (): string => `/files/${getCurrentWorkspaceUuid()}?file=:blobId&size=:size`
 
 /**
  *
@@ -93,7 +93,7 @@ function blobToSrcSet (
     return ''
   }
 
-  let url = cfg.image.replaceAll(':workspace', encodeURIComponent(getCurrentWorkspaceId()))
+  let url = cfg.image.replaceAll(':workspace', encodeURIComponent(getCurrentWorkspaceUuid()))
   const downloadUrl = getFileUrl(blob)
 
   const frontUrl = getMetadata(presentation.metadata.FrontUrl) ?? window.location.origin
@@ -139,7 +139,7 @@ export async function getVideoMeta (file: string, filename?: string): Promise<Vi
   const cfg = getPreviewConfig()
 
   let url = cfg.video
-    .replaceAll(':workspace', encodeURIComponent(getCurrentWorkspaceId()))
+    .replaceAll(':workspace', encodeURIComponent(getCurrentWorkspaceUuid()))
     .replaceAll(':blobId', encodeURIComponent(file))
 
   if (url === '') {
diff --git a/plugins/guest-resources/src/connect.ts b/plugins/guest-resources/src/connect.ts
index d146e5b803..a93555b990 100644
--- a/plugins/guest-resources/src/connect.ts
+++ b/plugins/guest-resources/src/connect.ts
@@ -253,9 +253,7 @@ function clearMetadata (ws: string): void {
     delete tokens[loc.path[1]]
     setMetadataLocalStorage(login.metadata.LoginTokens, tokens)
   }
-  const currentWorkspace =
-    getMetadata(presentation.metadata.WorkspaceDataId) ??
-    (getMetadata(presentation.metadata.WorkspaceUuid) as unknown as WorkspaceDataId)
+  const currentWorkspace = getMetadata(presentation.metadata.WorkspaceUuid) as unknown as WorkspaceDataId
   if (currentWorkspace !== undefined) {
     setPresentationCookie('', currentWorkspace)
   }
diff --git a/plugins/setting-resources/src/components/Backup.svelte b/plugins/setting-resources/src/components/Backup.svelte
index 9d1e0a64a3..58ff9685ac 100644
--- a/plugins/setting-resources/src/components/Backup.svelte
+++ b/plugins/setting-resources/src/components/Backup.svelte
@@ -16,13 +16,12 @@
   import { AccountRole, getCurrentAccount, hasAccountRole } from '@hcengineering/core'
   import { getMetadata } from '@hcengineering/platform'
   import presentation from '@hcengineering/presentation'
-  import { Breadcrumb, Button, Expandable, Header, Label, Link, Loading } from '@hcengineering/ui'
+  import { Breadcrumb, Button, Expandable, Header, Label, Loading } from '@hcengineering/ui'
   import Scroller from '@hcengineering/ui/src/components/Scroller.svelte'
   import view from '@hcengineering/view'
   import { onMount } from 'svelte'
   import setting from '../plugin'
   import { BackupInfo, BackupSnapshot } from '../types'
-  import Expand from '@hcengineering/ui/src/components/icons/Expand.svelte'
 
   let loading = true
 
diff --git a/plugins/workbench-resources/src/connect.ts b/plugins/workbench-resources/src/connect.ts
index 970cbf2781..4093ae8dde 100644
--- a/plugins/workbench-resources/src/connect.ts
+++ b/plugins/workbench-resources/src/connect.ts
@@ -445,9 +445,7 @@ export function clearMetadata (ws: string): void {
     delete tokens[loc.path[1]]
     setMetadataLocalStorage(login.metadata.LoginTokens, tokens)
   }
-  const currentWorkspace =
-    getMetadata(presentation.metadata.WorkspaceDataId) ??
-    (getMetadata(presentation.metadata.WorkspaceUuid) as unknown as WorkspaceDataId)
+  const currentWorkspace = getMetadata(presentation.metadata.WorkspaceUuid) as unknown as WorkspaceDataId
   if (currentWorkspace !== undefined) {
     setPresentationCookie('', currentWorkspace)
   }

From 4a335af81a2d8b2166ed1695f7e9f856fdf948b2 Mon Sep 17 00:00:00 2001
From: Alexander Onnikov <aonnikov@hardcoreeng.com>
Date: Mon, 17 Feb 2025 14:36:22 +0700
Subject: [PATCH 04/13] fix: do not display empty link preview in case of file
 error (#8020)

Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com>
---
 packages/presentation/src/file.ts             |  6 +-
 .../src/components/AttachmentPresenter.svelte | 78 ++++++++++---------
 .../components/LinkPreviewPresenter.svelte    |  7 +-
 3 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/packages/presentation/src/file.ts b/packages/presentation/src/file.ts
index a3405427f6..4eb95050de 100644
--- a/packages/presentation/src/file.ts
+++ b/packages/presentation/src/file.ts
@@ -286,12 +286,12 @@ async function uploadFileWithSignedUrl (file: File, uuid: string, uploadUrl: str
   }
 }
 
-export async function getJsonOrEmpty (file: string, name: string): Promise<any> {
+export async function getJsonOrEmpty<T = any> (file: string, name: string): Promise<T | undefined> {
   try {
     const fileUrl = getFileUrl(file, name)
     const resp = await fetch(fileUrl)
-    return await resp.json()
+    return (await resp.json()) as T
   } catch {
-    return {}
+    return undefined
   }
 }
diff --git a/plugins/attachment-resources/src/components/AttachmentPresenter.svelte b/plugins/attachment-resources/src/components/AttachmentPresenter.svelte
index 2d1a904afd..d6c1cf2f00 100644
--- a/plugins/attachment-resources/src/components/AttachmentPresenter.svelte
+++ b/plugins/attachment-resources/src/components/AttachmentPresenter.svelte
@@ -123,45 +123,49 @@
         {#await getJsonOrEmpty(value.file, value.name)}
           <Spinner size="small" />
         {:then linkPreviewDetails}
-          <div class="flex-center icon image">
-            {#if linkPreviewDetails.icon !== undefined && !useDefaultIcon}
-              <img
-                src={linkPreviewDetails.icon}
-                class="link-preview-icon"
-                alt="link-preview"
-                on:error={() => {
-                  useDefaultIcon = true
-                }}
-              />
-            {:else}
-              <WebIcon size="medium" />
-            {/if}
-          </div>
-          <div class="flex-col info-container">
-            <div class="name">
-              <a target="_blank" class="no-line" style:flex-shrink={0} href={linkPreviewDetails.url}
-                >{trimFilename(linkPreviewDetails?.title ?? value.name)}</a
-              >
-            </div>
-            <div class="info-content flex-row-center">
-              <span class="actions inline-flex clear-mins gap-1">
-                {#if linkPreviewDetails.description}
-                  {trimFilename(linkPreviewDetails.description)}
-                  <span>•</span>
-                {/if}
-                <span
-                  class="remove-link"
-                  on:click={(ev) => {
-                    ev.stopPropagation()
-                    ev.preventDefault()
-                    dispatch('remove', value)
+          {#if linkPreviewDetails !== undefined}
+            <div class="flex-center icon image">
+              {#if linkPreviewDetails.icon !== undefined && !useDefaultIcon}
+                <img
+                  src={linkPreviewDetails.icon}
+                  class="link-preview-icon"
+                  alt="link-preview"
+                  on:error={() => {
+                    useDefaultIcon = true
                   }}
-                >
-                  <Label label={presentation.string.Delete} />
-                </span>
-              </span>
+                />
+              {:else}
+                <WebIcon size="medium" />
+              {/if}
             </div>
-          </div>
+            <div class="flex-col info-container">
+              <div class="name">
+                <a target="_blank" class="no-line" style:flex-shrink={0} href={linkPreviewDetails.url}
+                  >{trimFilename(linkPreviewDetails?.title ?? value.name)}</a
+                >
+              </div>
+              <div class="info-content flex-row-center">
+                <span class="actions inline-flex clear-mins gap-1">
+                  {#if linkPreviewDetails.description}
+                    {trimFilename(linkPreviewDetails.description)}
+                    <span>•</span>
+                  {/if}
+                  <!-- svelte-ignore a11y-click-events-have-key-events -->
+                  <!-- svelte-ignore a11y-no-static-element-interactions -->
+                  <span
+                    class="remove-link"
+                    on:click={(ev) => {
+                      ev.stopPropagation()
+                      ev.preventDefault()
+                      dispatch('remove', value)
+                    }}
+                  >
+                    <Label label={presentation.string.Delete} />
+                  </span>
+                </span>
+              </div>
+            </div>
+          {/if}
         {/await}
       {:else}
         {#await getBlobRef(value.file, value.name, sizeToWidth('large')) then valueRef}
diff --git a/plugins/attachment-resources/src/components/LinkPreviewPresenter.svelte b/plugins/attachment-resources/src/components/LinkPreviewPresenter.svelte
index ff72a3994a..6218c23ad9 100644
--- a/plugins/attachment-resources/src/components/LinkPreviewPresenter.svelte
+++ b/plugins/attachment-resources/src/components/LinkPreviewPresenter.svelte
@@ -26,7 +26,7 @@
 
   let useDefaultIcon = false
   let retryCount = 0
-  let viewModel: LinkPreviewDetails
+  let viewModel: LinkPreviewDetails | undefined
   let previewImageSrc: string | undefined
 
   function refreshPreviewImage (): void {
@@ -53,12 +53,13 @@
     )
   }
   onMount(() => {
-    void getJsonOrEmpty(attachment.file, attachment.name)
+    void getJsonOrEmpty<LinkPreviewDetails>(attachment.file, attachment.name)
       .then((res) => {
-        viewModel = res as LinkPreviewDetails
+        viewModel = res
         refreshPreviewImage()
       })
       .catch((err) => {
+        viewModel = undefined
         console.error(err)
       })
   })

From fbd1ac5b33d581e5927ade6bf011d60a1902eb4c Mon Sep 17 00:00:00 2001
From: Andrey Sobolev <haiodo@users.noreply.github.com>
Date: Mon, 17 Feb 2025 14:58:50 +0700
Subject: [PATCH 05/13] UBERF-9484: Fix findAll for PG driver (#8022)

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
---
 server/middleware/src/spaceSecurity.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/middleware/src/spaceSecurity.ts b/server/middleware/src/spaceSecurity.ts
index 9b5f9512f1..b8e94917d5 100644
--- a/server/middleware/src/spaceSecurity.ts
+++ b/server/middleware/src/spaceSecurity.ts
@@ -539,14 +539,14 @@ export class SpaceSecurityMiddleware extends BaseMiddleware implements Middlewar
     const account = ctx.contextData.account
     const isSpace = this.context.hierarchy.isDerived(_class, core.class.Space)
     const field = this.getKey(domain)
-    const showArchived: boolean = shouldShowArchived(query, options)
+    const showArchived: boolean = shouldShowArchived(newQuery, options)
 
     let clientFilterSpaces: Set<Ref<Space>> | undefined
 
     if (!isSystem(account, ctx) && account.role !== AccountRole.DocGuest && domain !== DOMAIN_MODEL) {
       if (!isOwner(account, ctx) || !isSpace || !showArchived) {
-        if (query[field] !== undefined) {
-          const res = await this.mergeQuery(ctx, account, query[field], domain, isSpace, showArchived)
+        if (newQuery[field] !== undefined) {
+          const res = await this.mergeQuery(ctx, account, newQuery[field], domain, isSpace, showArchived)
           if (res === undefined) {
             // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
             delete newQuery[field]
@@ -575,7 +575,7 @@ export class SpaceSecurityMiddleware extends BaseMiddleware implements Middlewar
               options = { allowedSpaces: Array.from(spaces.result) }
             }
           } else {
-            // Check if spaces > 85% of all domain spaces, in this case return all and filter on client.
+            // Check if spaces are greater than 85% of all domain spaces. In this case, return all and filter on the client.
             if (spaces.result.size / spaces.domainSpaces.size > 0.85 && options?.limit === undefined) {
               clientFilterSpaces = spaces.result
               delete newQuery.space

From 2f27d09a057116506a506446697fad80efe0465d Mon Sep 17 00:00:00 2001
From: Andrey Sobolev <haiodo@users.noreply.github.com>
Date: Mon, 17 Feb 2025 16:23:29 +0700
Subject: [PATCH 06/13] Reset attempts from UI (#8023)

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
---
 dev/docker-compose.yaml                       |   1 +
 dev/prod/public/config-worker.json            |   2 +-
 packages/account-client/src/client.ts         |   7 +-
 packages/core/src/classes.ts                  |   2 +
 .../src/components/AdminWorkspaces.svelte     | 291 +++++++++---------
 plugins/login-resources/src/utils.ts          |   5 +-
 server/account/src/operations.ts              |   6 +-
 7 files changed, 168 insertions(+), 146 deletions(-)

diff --git a/dev/docker-compose.yaml b/dev/docker-compose.yaml
index bb7e47299e..99a9ceab8e 100644
--- a/dev/docker-compose.yaml
+++ b/dev/docker-compose.yaml
@@ -73,6 +73,7 @@ services:
     environment:
       - ACCOUNT_PORT=3000
       - SERVER_SECRET=secret
+      - ADMIN_EMAILS=admin
       - STATS_URL=http://host.docker.internal:4900
       # - DB_URL=postgresql://root@host.docker.internal:26257/defaultdb?sslmode=disable
       - DB_URL=${MONGO_URL}
diff --git a/dev/prod/public/config-worker.json b/dev/prod/public/config-worker.json
index a8056e3d04..3fd5bb9b6c 100644
--- a/dev/prod/public/config-worker.json
+++ b/dev/prod/public/config-worker.json
@@ -26,5 +26,5 @@
   "TELEGRAM_URL": "https://telegram.hc.engineering",
   "UPLOAD_CONFIG": "",
   "UPLOAD_URL": "https://dl.hc.engineering/upload/form-data/:workspace",
-  "TRANSACTOR_OVERRIDE": "wss://transactor00.hc.engineering"
+  "TRANSACTOR_OVERRIDE": "ws://localhost:3335"
 }
\ No newline at end of file
diff --git a/packages/account-client/src/client.ts b/packages/account-client/src/client.ts
index 7595b7c74a..0958eeb884 100644
--- a/packages/account-client/src/client.ts
+++ b/packages/account-client/src/client.ts
@@ -24,7 +24,8 @@ import {
   type WorkspaceInfoWithStatus,
   type WorkspaceMemberInfo,
   WorkspaceMode,
-  concatLink
+  concatLink,
+  type WorkspaceUserOperation
 } from '@hcengineering/core'
 import platform, { PlatformError, Severity, Status } from '@hcengineering/platform'
 import type { LoginInfo, OtpInfo, WorkspaceLoginInfo, RegionInfo, WorkspaceOperation } from './types'
@@ -99,7 +100,7 @@ export interface AccountClient {
   listWorkspaces: (region?: string | null, mode?: WorkspaceMode | null) => Promise<WorkspaceInfoWithStatus[]>
   performWorkspaceOperation: (
     workspaceId: string | string[],
-    event: 'archive' | 'migrate-to' | 'unarchive' | 'delete',
+    event: WorkspaceUserOperation,
     ...params: any
   ) => Promise<boolean>
   assignWorkspace: (email: string, workspaceUuid: string, role: AccountRole) => Promise<void>
@@ -517,7 +518,7 @@ class AccountClientImpl implements AccountClient {
 
   async performWorkspaceOperation (
     workspaceId: string | string[],
-    event: 'archive' | 'migrate-to' | 'unarchive' | 'delete',
+    event: WorkspaceUserOperation,
     ...params: any
   ): Promise<boolean> {
     const request = {
diff --git a/packages/core/src/classes.ts b/packages/core/src/classes.ts
index 08ad008ad6..346abc96f3 100644
--- a/packages/core/src/classes.ts
+++ b/packages/core/src/classes.ts
@@ -737,6 +737,8 @@ export type WorkspaceMode =
   | 'pending-restore' // -> 'restoring'
   | 'restoring' // -> 'active'
 
+export type WorkspaceUserOperation = 'archive' | 'migrate-to' | 'unarchive' | 'delete' | 'reset-attempts'
+
 export function isActiveMode (mode?: WorkspaceMode): boolean {
   return mode === 'active'
 }
diff --git a/plugins/login-resources/src/components/AdminWorkspaces.svelte b/plugins/login-resources/src/components/AdminWorkspaces.svelte
index 2093540748..6a94db4424 100644
--- a/plugins/login-resources/src/components/AdminWorkspaces.svelte
+++ b/plugins/login-resources/src/components/AdminWorkspaces.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import { RegionInfo } from '@hcengineering/account-client'
   import {
     groupByArray,
     isActiveMode,
@@ -19,6 +20,7 @@
     CheckBox,
     Expandable,
     IconArrowRight,
+    IconDownOutline,
     IconOpen,
     IconStart,
     IconStop,
@@ -27,13 +29,10 @@
     Scroller,
     SearchEdit,
     showPopup,
-    ticker,
-    Grid
+    ticker
   } from '@hcengineering/ui'
   import { workbenchId } from '@hcengineering/workbench'
   import { getAllWorkspaces, getRegionInfo, performWorkspaceOperation } from '../utils'
-  import { RegionInfo } from '@hcengineering/account-client'
-  import ColStar from '@hcengineering/ui/src/components/icons/ColStar.svelte'
 
   $: now = $ticker
 
@@ -73,6 +72,14 @@
 
   $: void updateWorkspaces($ticker)
 
+  // Individual filters
+
+  let showActive: boolean = true
+  let showArchived: boolean = false
+  let showDeleted: boolean = false
+  let showOther: boolean = true
+  let showGrAttempts: boolean = true
+
   $: sortedWorkspaces = workspaces
     .filter(
       (it) =>
@@ -83,7 +90,8 @@
         ((showActive && isActiveMode(it.mode)) ||
           (showArchived && isArchivingMode(it.mode)) ||
           (showDeleted && isDeletingMode(it.mode)) ||
-          (showOther && (isMigrationMode(it.mode) || isRestoringMode(it.mode) || isUpgradingMode(it.mode))))
+          (showOther && (isMigrationMode(it.mode) || isRestoringMode(it.mode) || isUpgradingMode(it.mode))) ||
+          (showGrAttempts && it.processingAttempts > 0))
     )
     .sort((a, b) => {
       switch (sortingRule) {
@@ -179,13 +187,6 @@
 
   let limit = 50
 
-  // Individual filters
-
-  let showActive: boolean = true
-  let showArchived: boolean = false
-  let showDeleted: boolean = false
-  let showOther: boolean = true
-
   $: groupped = groupByArray(sortedWorkspaces, (it) => {
     const lastUsageDays = Math.round((now - (it.lastVisit ?? 0)) / (1000 * 3600 * 24))
     return Object.entries(dayRanges).find(([_k, v]) => lastUsageDays <= v)?.[0] ?? 'Other'
@@ -266,6 +267,10 @@
         <span class="mr-2">Show other workspaces:</span>
         <CheckBox bind:checked={showOther} />
       </div>
+      <div class="flex-row-center">
+        <span class="mr-2">Show attempts >=0 workspaces:</span>
+        <CheckBox bind:checked={showGrAttempts} />
+      </div>
     </div>
 
     <div class="fs-title p-3 flex-row-center">
@@ -383,139 +388,147 @@
                   {@const bIdx = backupIdx.get(workspace.uuid)}
                   <!-- svelte-ignore a11y-click-events-have-key-events -->
                   <!-- svelte-ignore a11y-no-static-element-interactions -->
-                  <div class="flex fs-title cursor-pointer focused-button bordered" id={`${workspace.uuid}`}>
-                    <Grid column={10} equalHeight={false} columnGap={0}>
-                      <span class="label overflow-label flex-row-center flex-grow flex-shrink">
-                        {wsName}
-                        <div class="ml-1">
-                          <Button icon={IconOpen} size={'small'} on:click={() => select(workspace.url)} />
-                        </div>
-                      </span>
-                      <div class="ml-1">
-                        <!-- Retrieve created by-->
-                        <!-- {workspace.createdBy} -->
+                  <tr class="flex fs-title cursor-pointer focused-button bordered" id={`${workspace.uuid}`}>
+                    <div class="label overflow-label p-1 flex flex-row-center" style:width={'15rem'}>
+                      {wsName}
+                      <div class="ml-1 flex flex-row-center">
+                        <Button icon={IconOpen} size={'small'} on:click={() => select(workspace.url)} />
                       </div>
-                      <span class="label overflow-label flex-shrink p-1">
-                        {workspace.region ?? ''}
-                      </span>
-                      <span class="label overflow-label flex-shrink p-1">
-                        {lastUsageDays} days
-                      </span>
-                      <span class="label overflow-label p-1">
-                        {workspace.mode ?? '-'}
-                      </span>
-                      <span class="label overflow-label flex-shrink">
-                        {workspace.processingAttempts}
-                      </span>
-                      <span class="flex flex-shrink">
-                        {#if workspace.processingProgress !== 100 && workspace.processingProgress !== 0}
-                          ({workspace.processingProgress}%)
+                    </div>
+                    <div class="label overflow-label p-1 flex flex-row-center" style:width={'5rem'}>
+                      {workspace.region ?? ''}
+                    </div>
+                    <div class="label overflow-label p-1 flex flex-row-center" style:width={'5rem'}>
+                      {lastUsageDays} days
+                    </div>
+                    <div class="label overflow-label p-1 flex flex-row-center" style:width={'10rem'}>
+                      {workspace.mode ?? '-'}
+                    </div>
+                    <div class="label overflow-label flex flex-row-center" style:width={'5rem'}>
+                      {workspace.processingAttempts}
+                      {#if workspace.processingAttempts > 0}
+                        <Button
+                          on:click={() => {
+                            showPopup(MessageBox, {
+                              label: getEmbeddedLabel(`Reset attempts ${workspace.url}`),
+                              message: getEmbeddedLabel('Please confirm'),
+                              action: async () => {
+                                await performWorkspaceOperation(workspace.uuid, 'reset-attempts')
+                              }
+                            })
+                          }}
+                          icon={IconDownOutline}
+                          size={'small'}
+                          kind={'ghost'}
+                        />
+                      {/if}
+                    </div>
+                    <div class="flex flex-row-center" style:width={'5rem'}>
+                      {#if workspace.processingProgress !== 100 && workspace.processingProgress !== 0}
+                        ({workspace.processingProgress}%)
+                      {/if}
+                    </div>
+                    <div class="flex flex-row-center" style:width={'15rem'}>
+                      {#if workspace.backupInfo != null}
+                        {@const sz = Math.max(
+                          workspace.backupInfo.backupSize,
+                          workspace.backupInfo.dataSize + workspace.backupInfo.blobsSize
+                        )}
+                        {@const szGb = Math.round((sz * 100) / 1024) / 100}
+                        {#if szGb > 0}
+                          {Math.round((sz * 100) / 1024) / 100}Gb
+                        {:else}
+                          {Math.round(sz * 100) / 100}Mb
                         {/if}
-                      </span>
-                      <span class="flex flex-shrink">
-                        {#if workspace.backupInfo != null}
-                          {@const sz = Math.max(
-                            workspace.backupInfo.backupSize,
-                            workspace.backupInfo.dataSize + workspace.backupInfo.blobsSize
-                          )}
-                          {@const szGb = Math.round((sz * 100) / 1024) / 100}
-                          {#if szGb > 0}
-                            {Math.round((sz * 100) / 1024) / 100}Gb
-                          {:else}
-                            {Math.round(sz * 100) / 100}Mb
-                          {/if}
-                        {/if}
-                        {#if bIdx != null}
-                          [#{bIdx}]
-                        {/if}
-                      </span>
-                      <span class="flex flex-shrink">
-                        {#if workspace.backupInfo != null}
-                          {@const hours = Math.round((now - workspace.backupInfo.lastBackup) / (1000 * 3600))}
+                      {/if}
+                      {#if bIdx != null}
+                        [#{bIdx}]
+                      {/if}
+                    </div>
+                    <div class="flex flex-row-center" style:width={'15rem'}>
+                      {#if workspace.backupInfo != null}
+                        {@const hours = Math.round((now - workspace.backupInfo.lastBackup) / (1000 * 3600))}
 
-                          {#if hours > 24}
-                            {Math.round(hours / 24)} days
-                          {:else}
-                            {hours} hours
-                          {/if}
+                        {#if hours > 24}
+                          {Math.round(hours / 24)} days
+                        {:else}
+                          {hours} hours
                         {/if}
-                      </span>
-                      <div class="flex flex-grow gap-1-5 flex-shrink">
-                        <div class="flex flex-row-center gap-1-5">
-                          {#if workspace.mode === 'active'}
-                            <Button
-                              icon={IconStop}
-                              size={'small'}
-                              label={getEmbeddedLabel('Archive')}
-                              kind={'ghost'}
-                              on:click={() => {
-                                showPopup(MessageBox, {
-                                  label: getEmbeddedLabel(`Archive ${workspace.url}`),
-                                  message: getEmbeddedLabel('Please confirm'),
-                                  action: async () => {
-                                    await performWorkspaceOperation(workspace.uuid, 'archive')
-                                  }
-                                })
-                              }}
-                            />
-                          {/if}
+                      {/if}
+                    </div>
+                    <div class="flex flex-row-center p-1">
+                      {#if workspace.mode === 'active'}
+                        <Button
+                          icon={IconStop}
+                          size={'small'}
+                          label={getEmbeddedLabel('Archive')}
+                          kind={'ghost'}
+                          on:click={() => {
+                            showPopup(MessageBox, {
+                              label: getEmbeddedLabel(`Archive ${workspace.url}`),
+                              message: getEmbeddedLabel('Please confirm'),
+                              action: async () => {
+                                await performWorkspaceOperation(workspace.uuid, 'archive')
+                              }
+                            })
+                          }}
+                        />
+                      {/if}
 
-                          {#if workspace.mode === 'archived'}
-                            <Button
-                              icon={IconStart}
-                              size={'small'}
-                              kind={'ghost'}
-                              label={getEmbeddedLabel('Unarchive')}
-                              on:click={() => {
-                                showPopup(MessageBox, {
-                                  label: getEmbeddedLabel(`Unarchive ${workspace.url}`),
-                                  message: getEmbeddedLabel('Please confirm'),
-                                  action: async () => {
-                                    await performWorkspaceOperation(workspace.uuid, 'unarchive')
-                                  }
-                                })
-                              }}
-                            />
-                          {/if}
-                          {#if regionInfo.length > 0 && workspace.mode === 'active' && (workspace.region ?? '') !== selectedRegionId}
-                            <Button
-                              icon={IconArrowRight}
-                              size={'small'}
-                              kind={'positive'}
-                              label={getEmbeddedLabel('Migrate')}
-                              on:click={() => {
-                                showPopup(MessageBox, {
-                                  label: getEmbeddedLabel(`Migrate ${workspace.url}`),
-                                  message: getEmbeddedLabel('Please confirm'),
-                                  action: async () => {
-                                    await performWorkspaceOperation(workspace.uuid, 'migrate-to', selectedRegionId)
-                                  }
-                                })
-                              }}
-                            />
-                          {/if}
+                      {#if workspace.mode === 'archived'}
+                        <Button
+                          icon={IconStart}
+                          size={'small'}
+                          kind={'ghost'}
+                          label={getEmbeddedLabel('Unarchive')}
+                          on:click={() => {
+                            showPopup(MessageBox, {
+                              label: getEmbeddedLabel(`Unarchive ${workspace.url}`),
+                              message: getEmbeddedLabel('Please confirm'),
+                              action: async () => {
+                                await performWorkspaceOperation(workspace.uuid, 'unarchive')
+                              }
+                            })
+                          }}
+                        />
+                      {/if}
+                      {#if regionInfo.length > 0 && workspace.mode === 'active' && (workspace.region ?? '') !== selectedRegionId}
+                        <Button
+                          icon={IconArrowRight}
+                          size={'small'}
+                          kind={'positive'}
+                          label={getEmbeddedLabel('Migrate')}
+                          on:click={() => {
+                            showPopup(MessageBox, {
+                              label: getEmbeddedLabel(`Migrate ${workspace.url}`),
+                              message: getEmbeddedLabel('Please confirm'),
+                              action: async () => {
+                                await performWorkspaceOperation(workspace.uuid, 'migrate-to', selectedRegionId)
+                              }
+                            })
+                          }}
+                        />
+                      {/if}
 
-                          {#if superAdminMode && !isDeletingMode(workspace.mode) && !isArchivingMode(workspace.mode)}
-                            <Button
-                              icon={IconStop}
-                              size={'small'}
-                              kind={'dangerous'}
-                              label={getEmbeddedLabel('Delete')}
-                              on:click={() => {
-                                showPopup(MessageBox, {
-                                  label: getEmbeddedLabel(`Delete ${workspace.url}`),
-                                  message: getEmbeddedLabel('Please confirm'),
-                                  action: async () => {
-                                    await performWorkspaceOperation(workspace.uuid, 'delete')
-                                  }
-                                })
-                              }}
-                            />
-                          {/if}
-                        </div>
-                      </div>
-                    </Grid>
-                  </div>
+                      {#if superAdminMode && !isDeletingMode(workspace.mode) && !isArchivingMode(workspace.mode)}
+                        <Button
+                          icon={IconStop}
+                          size={'small'}
+                          kind={'dangerous'}
+                          label={getEmbeddedLabel('Delete')}
+                          on:click={() => {
+                            showPopup(MessageBox, {
+                              label: getEmbeddedLabel(`Delete ${workspace.url}`),
+                              message: getEmbeddedLabel('Please confirm'),
+                              action: async () => {
+                                await performWorkspaceOperation(workspace.uuid, 'delete')
+                              }
+                            })
+                          }}
+                        />
+                      {/if}
+                    </div>
+                  </tr>
                 {/each}
               </Expandable>
             {/if}
diff --git a/plugins/login-resources/src/utils.ts b/plugins/login-resources/src/utils.ts
index 99d478cc86..7c6ec4fccc 100644
--- a/plugins/login-resources/src/utils.ts
+++ b/plugins/login-resources/src/utils.ts
@@ -20,7 +20,8 @@ import {
   type Person,
   type Doc,
   type Ref,
-  type WorkspaceInfoWithStatus
+  type WorkspaceInfoWithStatus,
+  type WorkspaceUserOperation
 } from '@hcengineering/core'
 import type { LoginInfo, OtpInfo, WorkspaceLoginInfo, AccountClient, RegionInfo } from '@hcengineering/account-client'
 import { getClient as getAccountClientRaw } from '@hcengineering/account-client'
@@ -217,7 +218,7 @@ export async function getWorkspaces (): Promise<WorkspaceInfoWithStatus[]> {
 
 export async function performWorkspaceOperation (
   workspace: string | string[],
-  operation: 'archive' | 'migrate-to' | 'unarchive' | 'delete',
+  operation: WorkspaceUserOperation,
   ...params: any[]
 ): Promise<boolean> {
   // TODO: this method requires a special admin token
diff --git a/server/account/src/operations.ts b/server/account/src/operations.ts
index 21318dfc57..cc12e367ff 100644
--- a/server/account/src/operations.ts
+++ b/server/account/src/operations.ts
@@ -854,7 +854,7 @@ export async function performWorkspaceOperation (
   branding: Branding | null,
   token: string,
   workspaceId: WorkspaceUuid | WorkspaceUuid[],
-  event: 'archive' | 'migrate-to' | 'unarchive' | 'delete',
+  event: 'archive' | 'migrate-to' | 'unarchive' | 'delete' | 'reset-attempts',
   ...params: any
 ): Promise<boolean> {
   const { extra } = decodeTokenVerbose(ctx, token)
@@ -874,6 +874,10 @@ export async function performWorkspaceOperation (
   for (const workspace of workspaces) {
     const update: Partial<WorkspaceStatus> = {}
     switch (event) {
+      case 'reset-attempts':
+        update.processingAttempts = 0
+        update.lastProcessingTime = Date.now() - processingTimeoutMs // To not wait for next step
+        break
       case 'delete':
         if (workspace.status.mode !== 'active') {
           throw new PlatformError(unknownError('Delete allowed only for active workspaces'))

From 8d3015bd47194acb3c2935e113041472da1641d8 Mon Sep 17 00:00:00 2001
From: Alexander Onnikov <aonnikov@hardcoreeng.com>
Date: Mon, 17 Feb 2025 16:46:13 +0700
Subject: [PATCH 07/13] fix: use workspace uuid in front service (#8024)

Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com>
---
 packages/presentation/src/file.ts          |  6 +++---
 packages/presentation/src/utils.ts         |  4 ++--
 plugins/guest-resources/src/connect.ts     |  8 ++------
 plugins/workbench-resources/src/connect.ts |  8 ++------
 server/front/src/index.ts                  | 21 +++++++--------------
 5 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/packages/presentation/src/file.ts b/packages/presentation/src/file.ts
index 4eb95050de..2e3b615c53 100644
--- a/packages/presentation/src/file.ts
+++ b/packages/presentation/src/file.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 //
 
-import { concatLink, type WorkspaceDataId, type Blob as PlatformBlob, type Ref } from '@hcengineering/core'
+import { concatLink, type Blob as PlatformBlob, type Ref, type WorkspaceUuid } from '@hcengineering/core'
 import { PlatformError, Severity, Status, getMetadata } from '@hcengineering/platform'
 import { v4 as uuid } from 'uuid'
 
@@ -99,9 +99,9 @@ function getFilesUrl (): string {
   return filesUrl.includes('://') ? filesUrl : concatLink(frontUrl, filesUrl)
 }
 
-export function getCurrentWorkspaceUuid (): WorkspaceDataId {
+export function getCurrentWorkspaceUuid (): WorkspaceUuid {
   const workspaceUuid = getMetadata(plugin.metadata.WorkspaceUuid) ?? ''
-  return workspaceUuid as WorkspaceDataId
+  return workspaceUuid as WorkspaceUuid
 }
 
 /**
diff --git a/packages/presentation/src/utils.ts b/packages/presentation/src/utils.ts
index 64308238b6..19b531f670 100644
--- a/packages/presentation/src/utils.ts
+++ b/packages/presentation/src/utils.ts
@@ -47,7 +47,7 @@ import core, {
   type TxResult,
   type TypeAny,
   type WithLookup,
-  type WorkspaceDataId
+  type WorkspaceUuid
 } from '@hcengineering/core'
 import { getMetadata, getResource } from '@hcengineering/platform'
 import { LiveQuery as LQ } from '@hcengineering/query'
@@ -763,7 +763,7 @@ export function isSpaceClass (_class: Ref<Class<Doc>>): boolean {
   return client.getHierarchy().isDerived(_class, core.class.Space)
 }
 
-export function setPresentationCookie (token: string, workspaceUuid: WorkspaceDataId): void {
+export function setPresentationCookie (token: string, workspaceUuid: WorkspaceUuid): void {
   function setToken (path: string): void {
     const res =
       encodeURIComponent(plugin.metadata.Token.replaceAll(':', '-')) +
diff --git a/plugins/guest-resources/src/connect.ts b/plugins/guest-resources/src/connect.ts
index a93555b990..2d6178c3a6 100644
--- a/plugins/guest-resources/src/connect.ts
+++ b/plugins/guest-resources/src/connect.ts
@@ -9,7 +9,6 @@ import core, {
   type Client,
   type Version,
   type Ref,
-  type WorkspaceDataId,
   type PersonId
 } from '@hcengineering/core'
 import { setCurrentEmployee, type Employee } from '@hcengineering/contact'
@@ -65,10 +64,7 @@ export async function connect (title: string): Promise<Client | undefined> {
     return
   }
 
-  setPresentationCookie(
-    token,
-    workspaceLoginInfo.workspaceDataId ?? (workspaceLoginInfo.workspace as unknown as WorkspaceDataId)
-  )
+  setPresentationCookie(token, workspaceLoginInfo.workspace)
 
   setMetadata(presentation.metadata.Token, token)
   setMetadata(presentation.metadata.WorkspaceUuid, workspaceLoginInfo.workspace)
@@ -253,7 +249,7 @@ function clearMetadata (ws: string): void {
     delete tokens[loc.path[1]]
     setMetadataLocalStorage(login.metadata.LoginTokens, tokens)
   }
-  const currentWorkspace = getMetadata(presentation.metadata.WorkspaceUuid) as unknown as WorkspaceDataId
+  const currentWorkspace = getMetadata(presentation.metadata.WorkspaceUuid)
   if (currentWorkspace !== undefined) {
     setPresentationCookie('', currentWorkspace)
   }
diff --git a/plugins/workbench-resources/src/connect.ts b/plugins/workbench-resources/src/connect.ts
index 4093ae8dde..2d019951d2 100644
--- a/plugins/workbench-resources/src/connect.ts
+++ b/plugins/workbench-resources/src/connect.ts
@@ -13,7 +13,6 @@ import core, {
   type MeasureMetricsContext,
   type Version,
   pickPrimarySocialId,
-  type WorkspaceDataId,
   type Person as GlobalPerson
 } from '@hcengineering/core'
 import { setCurrentEmployee, ensureEmployee } from '@hcengineering/contact'
@@ -148,10 +147,7 @@ export async function connect (title: string): Promise<Client | undefined> {
     }
   }
 
-  setPresentationCookie(
-    token,
-    workspaceLoginInfo.workspaceDataId ?? (workspaceLoginInfo.workspace as unknown as WorkspaceDataId)
-  )
+  setPresentationCookie(token, workspaceLoginInfo.workspace)
   setMetadataLocalStorage(login.metadata.LoginEndpoint, workspaceLoginInfo?.endpoint)
 
   const endpoint = getMetadata(login.metadata.TransactorOverride) ?? workspaceLoginInfo?.endpoint
@@ -445,7 +441,7 @@ export function clearMetadata (ws: string): void {
     delete tokens[loc.path[1]]
     setMetadataLocalStorage(login.metadata.LoginTokens, tokens)
   }
-  const currentWorkspace = getMetadata(presentation.metadata.WorkspaceUuid) as unknown as WorkspaceDataId
+  const currentWorkspace = getMetadata(presentation.metadata.WorkspaceUuid)
   if (currentWorkspace !== undefined) {
     setPresentationCookie('', currentWorkspace)
   }
diff --git a/server/front/src/index.ts b/server/front/src/index.ts
index f6838b16a1..426a290f56 100644
--- a/server/front/src/index.ts
+++ b/server/front/src/index.ts
@@ -15,14 +15,7 @@
 //
 
 import { Analytics } from '@hcengineering/analytics'
-import {
-  MeasureContext,
-  Blob as PlatformBlob,
-  WorkspaceDataId,
-  WorkspaceIds,
-  metricsAggregate,
-  type Ref
-} from '@hcengineering/core'
+import { MeasureContext, Blob as PlatformBlob, WorkspaceIds, metricsAggregate, type Ref } from '@hcengineering/core'
 import { TokenError, decodeToken } from '@hcengineering/server-token'
 import { StorageAdapter } from '@hcengineering/storage'
 import bp from 'body-parser'
@@ -429,16 +422,16 @@ export function start (
       dataId: workspaceInfo.dataId,
       url: workspaceInfo.url
     }
-    const actualDataId = workspaceInfo.dataId ?? (workspaceInfo.uuid as unknown as WorkspaceDataId)
     if (path === undefined) {
       return wsIds
     }
 
-    const expectedDataId = path.split('/')[2]
-    if (expectedDataId !== undefined && actualDataId !== expectedDataId) {
-      ctx.error('Cannot validate dataId', {
-        expectedDataId,
-        actualDataId,
+    const actualUuid = workspaceInfo.uuid
+    const expectedUuid = path.split('/')[2]
+    if (expectedUuid !== undefined && actualUuid !== expectedUuid) {
+      ctx.error('Cannot validate uuid', {
+        expectedUuid,
+        actualUuid,
         path,
         workspaceUuid: workspaceInfo.uuid,
         workspaceDataId: workspaceInfo.dataId

From 9faf36311259b8a6dc32d667de6242fd81357dc2 Mon Sep 17 00:00:00 2001
From: Andrey Sobolev <haiodo@users.noreply.github.com>
Date: Mon, 17 Feb 2025 17:36:54 +0700
Subject: [PATCH 08/13] QFIX: Allow to copy workspace uuid from admin (#8025)

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
---
 .../src/components/AdminWorkspaces.svelte        | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/plugins/login-resources/src/components/AdminWorkspaces.svelte b/plugins/login-resources/src/components/AdminWorkspaces.svelte
index 6a94db4424..f7843ceec9 100644
--- a/plugins/login-resources/src/components/AdminWorkspaces.svelte
+++ b/plugins/login-resources/src/components/AdminWorkspaces.svelte
@@ -13,13 +13,14 @@
     type WorkspaceInfoWithStatus
   } from '@hcengineering/core'
   import { getEmbeddedLabel } from '@hcengineering/platform'
-  import { isAdminUser, MessageBox } from '@hcengineering/presentation'
+  import { copyTextToClipboard, isAdminUser, MessageBox } from '@hcengineering/presentation'
   import {
     Button,
     ButtonMenu,
     CheckBox,
     Expandable,
     IconArrowRight,
+    IconCopy,
     IconDownOutline,
     IconOpen,
     IconStart,
@@ -392,7 +393,18 @@
                     <div class="label overflow-label p-1 flex flex-row-center" style:width={'15rem'}>
                       {wsName}
                       <div class="ml-1 flex flex-row-center">
-                        <Button icon={IconOpen} size={'small'} on:click={() => select(workspace.url)} />
+                        <Button
+                          icon={IconOpen}
+                          size={'small'}
+                          on:click={() => select(workspace.url)}
+                          showTooltip={{ label: getEmbeddedLabel('Open Workspace URL') }}
+                        />
+                        <Button
+                          icon={IconCopy}
+                          size={'small'}
+                          on:click={() => copyTextToClipboard(workspace.uuid)}
+                          showTooltip={{ label: getEmbeddedLabel('Copy UUID') }}
+                        />
                       </div>
                     </div>
                     <div class="label overflow-label p-1 flex flex-row-center" style:width={'5rem'}>

From b3014383edfdf26d237d445a9da4b26e902e9b30 Mon Sep 17 00:00:00 2001
From: Artyom Savchenko <armisav@gmail.com>
Date: Mon, 17 Feb 2025 17:50:49 +0700
Subject: [PATCH 09/13] UBERF-9297/Initial personal browser and mail (#8021)

Signed-off-by: Artem Savchenko <armisav@gmail.com>
---
 common/config/rush/pnpm-lock.yaml             | 265 ++++++++++++++++++
 desktop/package.json                          |   6 +
 desktop/src/ui/platform.ts                    |   6 +
 dev/prod/package.json                         |   6 +
 dev/prod/src/platform.ts                      |   7 +
 models/all/package.json                       |   4 +-
 models/all/src/index.ts                       |  14 +
 models/mail/.eslintrc.js                      |   7 +
 models/mail/.npmignore                        |   4 +
 models/mail/config/rig.json                   |   5 +
 models/mail/package.json                      |  41 +++
 models/mail/src/index.ts                      |  68 +++++
 models/mail/src/plugin.ts                     |  15 +
 models/mail/tsconfig.json                     |  10 +
 models/my-space/.eslintrc.js                  |   7 +
 models/my-space/.npmignore                    |   4 +
 models/my-space/config/rig.json               |   5 +
 models/my-space/package.json                  |  43 +++
 models/my-space/src/index.ts                  |  81 ++++++
 models/my-space/src/plugin.ts                 |  22 ++
 models/my-space/tsconfig.json                 |  10 +
 plugins/mail-assets/.eslintrc.js              |   7 +
 plugins/mail-assets/assets/icons.svg          |  16 ++
 plugins/mail-assets/config/rig.json           |   5 +
 plugins/mail-assets/jest.config.js            |   7 +
 plugins/mail-assets/lang/cs.json              |  11 +
 plugins/mail-assets/lang/de.json              |  11 +
 plugins/mail-assets/lang/en.json              |  11 +
 plugins/mail-assets/lang/es.json              |  11 +
 plugins/mail-assets/lang/fr.json              |  11 +
 plugins/mail-assets/lang/it.json              |  11 +
 plugins/mail-assets/lang/pt.json              |  11 +
 plugins/mail-assets/lang/ru.json              |  11 +
 plugins/mail-assets/lang/zh.json              |  11 +
 plugins/mail-assets/package.json              |  39 +++
 .../mail-assets/src/__tests__/lang.test.ts    |   6 +
 plugins/mail-assets/src/index.ts              |  25 ++
 plugins/mail-assets/tsconfig.json             |  11 +
 plugins/mail-resources/.eslintrc.js           |   4 +
 plugins/mail-resources/.prettierrc            |  22 ++
 plugins/mail-resources/config/rig.json        |   5 +
 plugins/mail-resources/jest.config.js         |   5 +
 plugins/mail-resources/package.json           |  54 ++++
 plugins/mail-resources/postcss.config.js      |   5 +
 .../src/components/CreateMail.svelte          | 137 +++++++++
 .../src/components/MailThread.svelte          | 120 ++++++++
 .../src/components/MailThreadPresenter.svelte |  62 ++++
 plugins/mail-resources/src/index.ts           |  27 ++
 plugins/mail-resources/src/messageUtils.ts    | 109 +++++++
 plugins/mail-resources/src/plugin.ts          |  22 ++
 plugins/mail-resources/svelte.config.js       |   5 +
 plugins/mail-resources/tsconfig.json          |   9 +
 plugins/mail/.eslintrc.js                     |   7 +
 plugins/mail/.npmignore                       |   4 +
 plugins/mail/config/rig.json                  |   4 +
 plugins/mail/jest.config.js                   |   7 +
 plugins/mail/package.json                     |  49 ++++
 plugins/mail/src/index.ts                     |  60 ++++
 plugins/mail/tsconfig.json                    |  10 +
 plugins/my-space-assets/.eslintrc.js          |   7 +
 plugins/my-space-assets/assets/icons.svg      |   9 +
 plugins/my-space-assets/config/rig.json       |   5 +
 plugins/my-space-assets/jest.config.js        |   7 +
 plugins/my-space-assets/lang/cs.json          |   8 +
 plugins/my-space-assets/lang/de.json          |   8 +
 plugins/my-space-assets/lang/en.json          |   8 +
 plugins/my-space-assets/lang/fr.json          |   8 +
 plugins/my-space-assets/lang/it.json          |   8 +
 plugins/my-space-assets/lang/ru.json          |   8 +
 plugins/my-space-assets/lang/zh.json          |   8 +
 plugins/my-space-assets/package.json          |  39 +++
 .../src/__tests__/lang.test.ts                |   6 +
 plugins/my-space-assets/src/index.ts          |  23 ++
 plugins/my-space-assets/tsconfig.json         |  11 +
 plugins/my-space-resources/.eslintrc.js       |   4 +
 plugins/my-space-resources/.prettierrc        |  22 ++
 plugins/my-space-resources/config/rig.json    |   5 +
 plugins/my-space-resources/jest.config.js     |   5 +
 plugins/my-space-resources/package.json       |  55 ++++
 plugins/my-space-resources/postcss.config.js  |   5 +
 plugins/my-space-resources/src/index.ts       |  26 ++
 plugins/my-space-resources/src/navigation.ts  |  87 ++++++
 plugins/my-space-resources/src/plugin.ts      |  25 ++
 plugins/my-space-resources/svelte.config.js   |   5 +
 plugins/my-space-resources/tsconfig.json      |   9 +
 plugins/my-space/.eslintrc.js                 |   7 +
 plugins/my-space/.npmignore                   |   4 +
 plugins/my-space/config/rig.json              |   4 +
 plugins/my-space/jest.config.js               |   7 +
 plugins/my-space/package.json                 |  48 ++++
 plugins/my-space/src/index.ts                 |  20 ++
 plugins/my-space/src/plugin.ts                |  52 ++++
 plugins/my-space/tsconfig.json                |  10 +
 rush.json                                     |  40 +++
 94 files changed, 2174 insertions(+), 1 deletion(-)
 create mode 100644 models/mail/.eslintrc.js
 create mode 100644 models/mail/.npmignore
 create mode 100644 models/mail/config/rig.json
 create mode 100644 models/mail/package.json
 create mode 100644 models/mail/src/index.ts
 create mode 100644 models/mail/src/plugin.ts
 create mode 100644 models/mail/tsconfig.json
 create mode 100644 models/my-space/.eslintrc.js
 create mode 100644 models/my-space/.npmignore
 create mode 100644 models/my-space/config/rig.json
 create mode 100644 models/my-space/package.json
 create mode 100644 models/my-space/src/index.ts
 create mode 100644 models/my-space/src/plugin.ts
 create mode 100644 models/my-space/tsconfig.json
 create mode 100644 plugins/mail-assets/.eslintrc.js
 create mode 100644 plugins/mail-assets/assets/icons.svg
 create mode 100644 plugins/mail-assets/config/rig.json
 create mode 100644 plugins/mail-assets/jest.config.js
 create mode 100644 plugins/mail-assets/lang/cs.json
 create mode 100644 plugins/mail-assets/lang/de.json
 create mode 100644 plugins/mail-assets/lang/en.json
 create mode 100644 plugins/mail-assets/lang/es.json
 create mode 100644 plugins/mail-assets/lang/fr.json
 create mode 100644 plugins/mail-assets/lang/it.json
 create mode 100644 plugins/mail-assets/lang/pt.json
 create mode 100644 plugins/mail-assets/lang/ru.json
 create mode 100644 plugins/mail-assets/lang/zh.json
 create mode 100644 plugins/mail-assets/package.json
 create mode 100644 plugins/mail-assets/src/__tests__/lang.test.ts
 create mode 100644 plugins/mail-assets/src/index.ts
 create mode 100644 plugins/mail-assets/tsconfig.json
 create mode 100644 plugins/mail-resources/.eslintrc.js
 create mode 100644 plugins/mail-resources/.prettierrc
 create mode 100644 plugins/mail-resources/config/rig.json
 create mode 100644 plugins/mail-resources/jest.config.js
 create mode 100644 plugins/mail-resources/package.json
 create mode 100644 plugins/mail-resources/postcss.config.js
 create mode 100644 plugins/mail-resources/src/components/CreateMail.svelte
 create mode 100644 plugins/mail-resources/src/components/MailThread.svelte
 create mode 100644 plugins/mail-resources/src/components/MailThreadPresenter.svelte
 create mode 100644 plugins/mail-resources/src/index.ts
 create mode 100644 plugins/mail-resources/src/messageUtils.ts
 create mode 100644 plugins/mail-resources/src/plugin.ts
 create mode 100644 plugins/mail-resources/svelte.config.js
 create mode 100644 plugins/mail-resources/tsconfig.json
 create mode 100644 plugins/mail/.eslintrc.js
 create mode 100644 plugins/mail/.npmignore
 create mode 100644 plugins/mail/config/rig.json
 create mode 100644 plugins/mail/jest.config.js
 create mode 100644 plugins/mail/package.json
 create mode 100644 plugins/mail/src/index.ts
 create mode 100644 plugins/mail/tsconfig.json
 create mode 100644 plugins/my-space-assets/.eslintrc.js
 create mode 100644 plugins/my-space-assets/assets/icons.svg
 create mode 100644 plugins/my-space-assets/config/rig.json
 create mode 100644 plugins/my-space-assets/jest.config.js
 create mode 100644 plugins/my-space-assets/lang/cs.json
 create mode 100644 plugins/my-space-assets/lang/de.json
 create mode 100644 plugins/my-space-assets/lang/en.json
 create mode 100644 plugins/my-space-assets/lang/fr.json
 create mode 100644 plugins/my-space-assets/lang/it.json
 create mode 100644 plugins/my-space-assets/lang/ru.json
 create mode 100644 plugins/my-space-assets/lang/zh.json
 create mode 100644 plugins/my-space-assets/package.json
 create mode 100644 plugins/my-space-assets/src/__tests__/lang.test.ts
 create mode 100644 plugins/my-space-assets/src/index.ts
 create mode 100644 plugins/my-space-assets/tsconfig.json
 create mode 100644 plugins/my-space-resources/.eslintrc.js
 create mode 100644 plugins/my-space-resources/.prettierrc
 create mode 100644 plugins/my-space-resources/config/rig.json
 create mode 100644 plugins/my-space-resources/jest.config.js
 create mode 100644 plugins/my-space-resources/package.json
 create mode 100644 plugins/my-space-resources/postcss.config.js
 create mode 100644 plugins/my-space-resources/src/index.ts
 create mode 100644 plugins/my-space-resources/src/navigation.ts
 create mode 100644 plugins/my-space-resources/src/plugin.ts
 create mode 100644 plugins/my-space-resources/svelte.config.js
 create mode 100644 plugins/my-space-resources/tsconfig.json
 create mode 100644 plugins/my-space/.eslintrc.js
 create mode 100644 plugins/my-space/.npmignore
 create mode 100644 plugins/my-space/config/rig.json
 create mode 100644 plugins/my-space/jest.config.js
 create mode 100644 plugins/my-space/package.json
 create mode 100644 plugins/my-space/src/index.ts
 create mode 100644 plugins/my-space/src/plugin.ts
 create mode 100644 plugins/my-space/tsconfig.json

diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index f534b77f1f..a8e5fd4c4d 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -361,6 +361,15 @@ importers:
       '@rush-temp/love-resources':
         specifier: file:./projects/love-resources.tgz
         version: file:projects/love-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))
+      '@rush-temp/mail':
+        specifier: file:./projects/mail.tgz
+        version: file:projects/mail.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))
+      '@rush-temp/mail-assets':
+        specifier: file:./projects/mail-assets.tgz
+        version: file:projects/mail-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))
+      '@rush-temp/mail-resources':
+        specifier: file:./projects/mail-resources.tgz
+        version: file:projects/mail-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))
       '@rush-temp/middleware':
         specifier: file:./projects/middleware.tgz
         version: file:projects/middleware.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))
@@ -439,9 +448,15 @@ importers:
       '@rush-temp/model-love':
         specifier: file:./projects/model-love.tgz
         version: file:projects/model-love.tgz
+      '@rush-temp/model-mail':
+        specifier: file:./projects/model-mail.tgz
+        version: file:projects/model-mail.tgz
       '@rush-temp/model-notification':
         specifier: file:./projects/model-notification.tgz
         version: file:projects/model-notification.tgz
+      '@rush-temp/model-my-space':
+        specifier: file:./projects/model-my-space.tgz
+        version: file:projects/model-my-space.tgz
       '@rush-temp/model-preference':
         specifier: file:./projects/model-preference.tgz
         version: file:projects/model-preference.tgz
@@ -634,6 +649,15 @@ importers:
       '@rush-temp/panel':
         specifier: file:./projects/panel.tgz
         version: file:projects/panel.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))
+      '@rush-temp/my-space':
+        specifier: file:./projects/my-space.tgz
+        version: file:projects/my-space.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))
+      '@rush-temp/my-space-assets':
+        specifier: file:./projects/my-space-assets.tgz
+        version: file:projects/my-space-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))
+      '@rush-temp/my-space-resources':
+        specifier: file:./projects/my-space-resources.tgz
+        version: file:projects/my-space-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))
       '@rush-temp/platform':
         specifier: file:./projects/platform.tgz
         version: file:projects/platform.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))
@@ -4318,6 +4342,18 @@ packages:
     resolution: {integrity: sha512-D9QBf+/PREVaj/zqju1EnET+45ImzmEpqYThK+I2fbGxZ2t128DbfspBi3Lf2pUure8yF2PSTlTJSzKmUtgvpA==, tarball: file:projects/love.tgz}
     version: 0.0.0
 
+  '@rush-temp/mail-assets@file:projects/mail-assets.tgz':
+    resolution: {integrity: sha512-Lp1APt1DRMNrH2DhlOTTJjjIPhThHuc1+3Jj1fJU1ryH4FcJwCDFRw9InLEhjphf9cGC6z06EpgL3+3FtHOmJg==, tarball: file:projects/mail-assets.tgz}
+    version: 0.0.0
+
+  '@rush-temp/mail-resources@file:projects/mail-resources.tgz':
+    resolution: {integrity: sha512-8PtetoobhgQAiaGjqRf2aOgVY3Xh0KkyWTVLA2GIKaWY0lD0Vt69jDk1jptyXJOfkQLXRTSk7JxTs9lH96q8UQ==, tarball: file:projects/mail-resources.tgz}
+    version: 0.0.0
+
+  '@rush-temp/mail@file:projects/mail.tgz':
+    resolution: {integrity: sha512-khCqnHqt/MDtJv8eTx08ov9GkvC00wPeb1Q+QE5zk7xqbjK/QYJWPmdMRkvOJobCHLh2/g6ST2lgNbV938hrJA==, tarball: file:projects/mail.tgz}
+    version: 0.0.0
+
   '@rush-temp/middleware@file:projects/middleware.tgz':
     resolution: {integrity: sha512-d3bnkZYGycgZKQg4veVLwKczJdPhg65urbHhl9FJI3MV2izx8zCRu01frLW6zn61nYGW1fffugXfGoWBv4xxcA==, tarball: file:projects/middleware.tgz}
     version: 0.0.0
@@ -4418,10 +4454,18 @@ packages:
     resolution: {integrity: sha512-7bncZHfFYZKaCX+Wv+mcOHFU328pUC8qmqDw2V/o4Ee+fZAMCpudJuevAwtjf9uIu3fuyf1E+SLCgz8YXjyQBQ==, tarball: file:projects/model-love.tgz}
     version: 0.0.0
 
+  '@rush-temp/model-mail@file:projects/model-mail.tgz':
+    resolution: {integrity: sha512-Z2WZ+9IF0119TDZDyODrcI3ptuQLQ/h7WaxvbPIFsUQm+MI5VPV6hCNUBNp8if2XQLmSn0YByejtW1bSBz/WAg==, tarball: file:projects/model-mail.tgz}
+    version: 0.0.0
+
   '@rush-temp/model-notification@file:projects/model-notification.tgz':
     resolution: {integrity: sha512-k7valecajKQwOhAeROASPm+RO2/D3xZSkan8Z09kmy+9dNLYBxQT/mr7k+HBdlzU4JD3fDQRP6EStyJBkLFZsQ==, tarball: file:projects/model-notification.tgz}
     version: 0.0.0
 
+  '@rush-temp/model-my-space@file:projects/model-my-space.tgz':
+    resolution: {integrity: sha512-OxBDKFosN/3hsy9Ot0fDJTpzqFJvNLWxgJXtmculo1ksyKacMGZc4+9Ouxj49NFQ4JPl1UpBLZjaWPQ7xuyo3w==, tarball: file:projects/model-my-space.tgz}
+    version: 0.0.0
+
   '@rush-temp/model-preference@file:projects/model-preference.tgz':
     resolution: {integrity: sha512-r2RLrTIRHQ4txZegXOqXQfcPMJmA6HQz5i9EOi8RH7mGB+f6lqnBoYCf+mihfazPXLyF8NXbhPuNX1XHXMqvyg==, tarball: file:projects/model-preference.tgz}
     version: 0.0.0
@@ -4682,6 +4726,18 @@ packages:
     resolution: {integrity: sha512-cjwk9I0RxeNJQTgtbbcQlwiurbp+/T5MbiRnYTLWvxsMBVWnnxD5nToECUt1QdW/CjSSbPsaYP8hoMgt/AufCw==, tarball: file:projects/panel.tgz}
     version: 0.0.0
 
+  '@rush-temp/my-space-assets@file:projects/my-space-assets.tgz':
+    resolution: {integrity: sha512-yGiP0aFiYA6RZiY4Ufqhk2egfhWvjEi3GOjcmLZ3eAl3samu/g4b3BcAKzo6SimMwKM2GQF+9oKHn1F/5LmSjA==, tarball: file:projects/my-space-assets.tgz}
+    version: 0.0.0
+
+  '@rush-temp/my-space-resources@file:projects/my-space-resources.tgz':
+    resolution: {integrity: sha512-dE2Jeu1rsu0l18l6oKj0Z+D99sS8fkuAcqoqh9alzavqquUvgGSXtTUB24l6Y6A0tbpshtAMLhmFSFgwPtSGHw==, tarball: file:projects/my-space-resources.tgz}
+    version: 0.0.0
+
+  '@rush-temp/my-space@file:projects/my-space.tgz':
+    resolution: {integrity: sha512-dBx6We9vl3uuETflughn1Q1jmxjzQdxZ0rf+OiZZ6lRM0u304BhlM7459AMcaZ76oxkqZ6ulRYVVxr8k7ZGHaA==, tarball: file:projects/my-space.tgz}
+    version: 0.0.0
+
   '@rush-temp/platform-rig@file:projects/platform-rig.tgz':
     resolution: {integrity: sha512-Ex4y6Gru0FdNgfJ8Q/TOIOZLrvmk+4eDiepGH95XOsHgcTQTfhHPfNwYBgC5yOqQrY9O8GDqWUZtV+KySEAQjg==, tarball: file:projects/platform-rig.tgz}
     version: 0.0.0
@@ -19105,6 +19161,96 @@ snapshots:
       - svelte
       - ts-node
 
+  '@rush-temp/mail-assets@file:projects/mail-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
+      '@types/node': 20.11.19
+      '@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)
+      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.6.2)
+      typescript: 5.6.2
+    transitivePeerDependencies:
+      - '@babel/core'
+      - '@jest/types'
+      - babel-jest
+      - babel-plugin-macros
+      - esbuild
+      - node-notifier
+      - supports-color
+      - ts-node
+
+  '@rush-temp/mail-resources@file:projects/mail-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/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.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)
+      eslint-plugin-svelte: 2.35.1(eslint@8.56.0)(svelte@4.2.19)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3))
+      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
+      prettier-plugin-svelte: 3.2.2(prettier@3.2.5)(svelte@4.2.19)
+      sass: 1.71.1
+      svelte: 4.2.19
+      svelte-check: 3.6.9(@babel/core@7.23.9)(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)(sass@1.71.1)(svelte@4.2.19)
+      svelte-eslint-parser: 0.33.1(svelte@4.2.19)
+      svelte-loader: 3.2.0(svelte@4.2.19)
+      svelte-preprocess: 5.1.3(@babel/core@7.23.9)(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)(sass@1.71.1)(svelte@4.2.19)(typescript@5.6.2)
+      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
+      - coffeescript
+      - esbuild
+      - less
+      - node-notifier
+      - postcss
+      - postcss-load-config
+      - pug
+      - stylus
+      - sugarss
+      - supports-color
+      - ts-node
+
+  '@rush-temp/mail@file:projects/mail.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
+      '@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)
+      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.6.2)
+      typescript: 5.6.2
+    transitivePeerDependencies:
+      - '@babel/core'
+      - '@jest/types'
+      - '@types/node'
+      - babel-jest
+      - babel-plugin-macros
+      - esbuild
+      - node-notifier
+      - supports-color
+      - ts-node
+
   '@rush-temp/middleware@file:projects/middleware.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
@@ -19488,6 +19634,20 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@rush-temp/model-mail@file:projects/model-mail.tgz':
+    dependencies:
+      '@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)
+      prettier: 3.2.5
+      typescript: 5.6.2
+    transitivePeerDependencies:
+      - supports-color
+
   '@rush-temp/model-notification@file:projects/model-notification.tgz':
     dependencies:
       '@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)
@@ -19502,6 +19662,20 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@rush-temp/model-my-space@file:projects/model-my-space.tgz':
+    dependencies:
+      '@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)
+      prettier: 3.2.5
+      typescript: 5.6.2
+    transitivePeerDependencies:
+      - supports-color
+
   '@rush-temp/model-preference@file:projects/model-preference.tgz':
     dependencies:
       '@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)
@@ -20621,6 +20795,97 @@ snapshots:
       - supports-color
       - ts-node
 
+  '@rush-temp/my-space-assets@file:projects/my-space-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
+      '@types/node': 20.11.19
+      '@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)
+      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.6.2)
+      typescript: 5.6.2
+    transitivePeerDependencies:
+      - '@babel/core'
+      - '@jest/types'
+      - babel-jest
+      - babel-plugin-macros
+      - esbuild
+      - node-notifier
+      - supports-color
+      - ts-node
+
+  '@rush-temp/my-space-resources@file:projects/my-space-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/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.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)
+      eslint-plugin-svelte: 2.35.1(eslint@8.56.0)(svelte@4.2.19)(ts-node@10.9.2(@types/node@20.11.19)(typescript@5.3.3))
+      fast-equals: 5.2.2
+      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
+      prettier-plugin-svelte: 3.2.2(prettier@3.2.5)(svelte@4.2.19)
+      sass: 1.71.1
+      svelte: 4.2.19
+      svelte-check: 3.6.9(@babel/core@7.23.9)(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)(sass@1.71.1)(svelte@4.2.19)
+      svelte-eslint-parser: 0.33.1(svelte@4.2.19)
+      svelte-loader: 3.2.0(svelte@4.2.19)
+      svelte-preprocess: 5.1.3(@babel/core@7.23.9)(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)(sass@1.71.1)(svelte@4.2.19)(typescript@5.6.2)
+      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
+      - coffeescript
+      - esbuild
+      - less
+      - node-notifier
+      - postcss
+      - postcss-load-config
+      - pug
+      - stylus
+      - sugarss
+      - supports-color
+      - ts-node
+
+  '@rush-temp/my-space@file:projects/my-space.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
+      '@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)
+      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.6.2)
+      typescript: 5.6.2
+    transitivePeerDependencies:
+      - '@babel/core'
+      - '@jest/types'
+      - '@types/node'
+      - babel-jest
+      - babel-plugin-macros
+      - esbuild
+      - node-notifier
+      - supports-color
+      - ts-node
+
   '@rush-temp/platform-rig@file:projects/platform-rig.tgz(@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))(svelte@4.2.19)':
     dependencies:
       '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.3.3)
diff --git a/desktop/package.json b/desktop/package.json
index 37c083bd9f..e1a7f9531f 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -215,6 +215,12 @@
     "@hcengineering/card": "^0.6.0",
     "@hcengineering/card-assets": "^0.6.0",
     "@hcengineering/card-resources": "^0.6.0",
+    "@hcengineering/my-space": "^0.6.0",
+    "@hcengineering/my-space-assets": "^0.6.0",
+    "@hcengineering/my-space-resources": "^0.6.0",
+    "@hcengineering/mail": "^0.6.0",
+    "@hcengineering/mail-assets": "^0.6.0",
+    "@hcengineering/mail-resources": "^0.6.0",
     "electron-squirrel-startup": "~1.0.0",
     "dotenv": "~16.0.0",
     "electron-context-menu": "^4.0.4",
diff --git a/desktop/src/ui/platform.ts b/desktop/src/ui/platform.ts
index 5cb0b7a5cf..30fe696568 100644
--- a/desktop/src/ui/platform.ts
+++ b/desktop/src/ui/platform.ts
@@ -57,6 +57,8 @@ import { documentsId } from '@hcengineering/controlled-documents'
 import aiBot, { aiBotId } from '@hcengineering/ai-bot'
 import { testManagementId } from '@hcengineering/test-management'
 import { surveyId } from '@hcengineering/survey'
+import { mySpaceId } from '@hcengineering/my-space'
+import { mailId } from '@hcengineering/mail'
 
 import '@hcengineering/activity-assets'
 import '@hcengineering/attachment-assets'
@@ -101,6 +103,7 @@ import '@hcengineering/text-editor-assets'
 import '@hcengineering/test-management-assets'
 import '@hcengineering/survey-assets'
 import '@hcengineering/card-assets'
+import '@hcengineering/mail-assets'
 
 import { coreId } from '@hcengineering/core'
 import presentation, { parsePreviewConfig, parseUploadConfig, presentationId } from '@hcengineering/presentation'
@@ -195,6 +198,8 @@ function configureI18n (): void {
   addStringsLoader(testManagementId, async (lang: string) => await import(`@hcengineering/test-management-assets/lang/${lang}.json`))
   addStringsLoader(surveyId, async (lang: string) => await import(`@hcengineering/survey-assets/lang/${lang}.json`))
   addStringsLoader(cardId, async (lang: string) => await import(`@hcengineering/card-assets/lang/${lang}.json`))
+  addStringsLoader(mySpaceId, async (lang: string) => await import(`@hcengineering/my-space-assets/lang/${lang}.json`))
+  addStringsLoader(mailId, async (lang: string) => await import(`@hcengineering/mail-assets/lang/${lang}.json`))
 }
 
 export async function configurePlatform (): Promise<void> {
@@ -322,6 +327,7 @@ export async function configurePlatform (): Promise<void> {
   addLocation(testManagementId, () => import(/* webpackChunkName: "test-management" */ '@hcengineering/test-management-resources'))
   addLocation(surveyId, () => import(/* webpackChunkName: "survey" */ '@hcengineering/survey-resources'))
   addLocation(cardId, () => import(/* webpackChunkName: "card" */ '@hcengineering/card-resources'))
+  addLocation(mySpaceId, () => import(/* webpackChunkName: "card" */ '@hcengineering/my-space-resources'))
 
   setMetadata(client.metadata.FilterModel, 'ui')
   setMetadata(client.metadata.ExtraPlugins, ['preference' as Plugin])
diff --git a/dev/prod/package.json b/dev/prod/package.json
index aa685c2f8a..d08fe1f598 100644
--- a/dev/prod/package.json
+++ b/dev/prod/package.json
@@ -209,6 +209,12 @@
     "@hcengineering/card": "^0.6.0",
     "@hcengineering/card-assets": "^0.6.0",
     "@hcengineering/card-resources": "^0.6.0",
+    "@hcengineering/my-space": "^0.6.0",
+    "@hcengineering/my-space-assets": "^0.6.0",
+    "@hcengineering/my-space-resources": "^0.6.0",
+    "@hcengineering/mail": "^0.6.0",
+    "@hcengineering/mail-assets": "^0.6.0",
+    "@hcengineering/mail-resources": "^0.6.0",
     "@sentry/svelte": "^8.52.1",
     "posthog-js": "~1.122.0"
   }
diff --git a/dev/prod/src/platform.ts b/dev/prod/src/platform.ts
index c1739b7c04..ecf8d83a74 100644
--- a/dev/prod/src/platform.ts
+++ b/dev/prod/src/platform.ts
@@ -40,6 +40,7 @@ import login, { loginId } from '@hcengineering/login'
 import love, { loveId } from '@hcengineering/love'
 import notification, { notificationId } from '@hcengineering/notification'
 import onboard, { onboardId } from '@hcengineering/onboard'
+import { mySpaceId } from '@hcengineering/my-space'
 import presence, { presenceId } from '@hcengineering/presence'
 import print, { printId } from '@hcengineering/print'
 import { productsId } from '@hcengineering/products'
@@ -64,6 +65,7 @@ import uiPlugin from '@hcengineering/ui'
 import { uploaderId } from '@hcengineering/uploader'
 import { viewId } from '@hcengineering/view'
 import workbench, { workbenchId } from '@hcengineering/workbench'
+import { mailId } from '@hcengineering/mail'
 
 import { bitrixId } from '@hcengineering/bitrix'
 
@@ -89,6 +91,7 @@ import '@hcengineering/lead-assets'
 import '@hcengineering/login-assets'
 import '@hcengineering/love-assets'
 import '@hcengineering/notification-assets'
+import '@hcengineering/my-space-assets'
 import '@hcengineering/preference-assets'
 import '@hcengineering/print-assets'
 import '@hcengineering/products-assets'
@@ -323,6 +326,8 @@ function configureI18n(): void {
   )
   addStringsLoader(surveyId, async (lang: string) => await import(`@hcengineering/survey-assets/lang/${lang}.json`))
   addStringsLoader(cardId, async (lang: string) => await import(`@hcengineering/card-assets/lang/${lang}.json`))
+  addStringsLoader(mySpaceId, async (lang: string) => await import(`@hcengineering/my-space-assets/lang/${lang}.json`))
+  addStringsLoader(mailId, async (lang: string) => await import(`@hcengineering/mail-assets/lang/${lang}.json`))
 }
 
 export async function configurePlatform() {
@@ -511,6 +516,8 @@ export async function configurePlatform() {
   addLocation(surveyId, () => import(/* webpackChunkName: "survey" */ '@hcengineering/survey-resources'))
   addLocation(presenceId, () => import(/* webpackChunkName: "presence" */ '@hcengineering/presence-resources'))
   addLocation(cardId, () => import(/* webpackChunkName: "card" */ '@hcengineering/card-resources'))
+  addLocation(mySpaceId, () => import(/* webpackChunkName: "card" */ '@hcengineering/my-space-resources'))
+  addLocation(mailId, () => import(/* webpackChunkName: "card" */ '@hcengineering/mail-resources'))
 
   setMetadata(client.metadata.FilterModel, 'ui')
   setMetadata(client.metadata.ExtraPlugins, ['preference' as Plugin])
diff --git a/models/all/package.json b/models/all/package.json
index 9069c256d1..f69ddf04b5 100644
--- a/models/all/package.json
+++ b/models/all/package.json
@@ -115,6 +115,8 @@
     "@hcengineering/model-test-management": "^0.6.0",
     "@hcengineering/model-survey": "^0.6.0",
     "@hcengineering/model-presence": "^0.6.0",
-    "@hcengineering/model-card": "^0.6.0"
+    "@hcengineering/model-card": "^0.6.0",
+    "@hcengineering/model-mail": "^0.6.0",
+    "@hcengineering/model-my-space": "^0.6.0"
   }
 }
diff --git a/models/all/src/index.ts b/models/all/src/index.ts
index e80c6707d2..ca532e1ddf 100644
--- a/models/all/src/index.ts
+++ b/models/all/src/index.ts
@@ -101,6 +101,8 @@ import testManagement, {
   testManagementId,
   createModel as testManagementModel
 } from '@hcengineering/model-test-management'
+import mySpace, { mySpaceId, createModel as mySpaceModel } from '@hcengineering/model-my-space'
+import { mailId, createModel as mailModel } from '@hcengineering/model-mail'
 
 import {
   serverDocumentsId,
@@ -430,6 +432,18 @@ export default function buildModel (enabled: string[] = ['*'], disabled: string[
     ],
     [surveyModel, surveyId],
     [presenceModel, presenceId],
+    [
+      mySpaceModel,
+      mySpaceId,
+      {
+        label: mySpace.string.ConfigLabel,
+        description: mySpace.string.ConfigDescription,
+        enabled: true,
+        beta: true,
+        classFilter: defaultFilter
+      }
+    ],
+    [mailModel, mailId],
 
     [serverCoreModel, serverCoreId],
     [serverAttachmentModel, serverAttachmentId],
diff --git a/models/mail/.eslintrc.js b/models/mail/.eslintrc.js
new file mode 100644
index 0000000000..c1cf82cba0
--- /dev/null
+++ b/models/mail/.eslintrc.js
@@ -0,0 +1,7 @@
+module.exports = {
+  extends: ['./node_modules/@hcengineering/platform-rig/profiles/model/eslint.config.json'],
+  parserOptions: {
+    tsconfigRootDir: __dirname,
+    project: './tsconfig.json'
+  }
+}
diff --git a/models/mail/.npmignore b/models/mail/.npmignore
new file mode 100644
index 0000000000..e3ec093c38
--- /dev/null
+++ b/models/mail/.npmignore
@@ -0,0 +1,4 @@
+*
+!/lib/**
+!CHANGELOG.md
+/lib/**/__tests__/
diff --git a/models/mail/config/rig.json b/models/mail/config/rig.json
new file mode 100644
index 0000000000..2f6be36605
--- /dev/null
+++ b/models/mail/config/rig.json
@@ -0,0 +1,5 @@
+{  
+  "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json",
+  "rigPackageName": "@hcengineering/platform-rig",
+  "rigProfile": "model"
+}
diff --git a/models/mail/package.json b/models/mail/package.json
new file mode 100644
index 0000000000..237d860888
--- /dev/null
+++ b/models/mail/package.json
@@ -0,0 +1,41 @@
+{
+  "name": "@hcengineering/model-mail",
+  "version": "0.6.0",
+  "main": "lib/index.js",
+  "svelte": "src/index.ts",
+  "types": "types/index.d.ts",
+  "author": "Anticrm Platform Contributors",
+  "template": "@hcengineering/model-package",
+  "license": "EPL-2.0",
+  "scripts": {
+    "build": "compile",
+    "build:watch": "compile",
+    "format": "format src",
+    "_phase:build": "compile transpile src",
+    "_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"
+  },
+  "dependencies": {
+    "@hcengineering/activity": "^0.6.0",
+    "@hcengineering/chunter": "^0.6.20",
+    "@hcengineering/model": "^0.6.11",
+    "@hcengineering/model-contact": "^0.6.1",
+    "@hcengineering/model-chunter": "^0.6.0",
+    "@hcengineering/core": "^0.6.32",
+    "@hcengineering/platform": "^0.6.11",
+    "@hcengineering/model-view": "^0.6.0",
+    "@hcengineering/mail": "^0.6.0"
+  }
+}
diff --git a/models/mail/src/index.ts b/models/mail/src/index.ts
new file mode 100644
index 0000000000..f9c0a5f5e5
--- /dev/null
+++ b/models/mail/src/index.ts
@@ -0,0 +1,68 @@
+//
+// 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 activity from '@hcengineering/activity'
+import core, { IndexKind } from '@hcengineering/core'
+import { type Builder, Index, Model, Prop, TypeString, UX } from '@hcengineering/model'
+import contact from '@hcengineering/model-contact'
+import view from '@hcengineering/model-view'
+import { TChunterSpace } from '@hcengineering/model-chunter'
+
+import chunter from '@hcengineering/chunter'
+import mail, { type MailThread } from '@hcengineering/mail'
+
+export { mailId } from '@hcengineering/mail'
+export { default } from './plugin'
+
+@Model(mail.class.MailThread, chunter.class.ChunterSpace)
+@UX(mail.string.MailThread, contact.icon.Person, undefined, undefined, undefined, mail.string.MailThread)
+export class TMailThread extends TChunterSpace implements MailThread {
+  @Prop(TypeString(), mail.string.Subject)
+  @Index(IndexKind.FullText)
+    subject!: string
+
+  @Prop(TypeString(), mail.string.MailThreadId)
+  @Index(IndexKind.Indexed)
+    mailThreadId!: string
+
+  @Prop(TypeString(), mail.string.From)
+  @Index(IndexKind.FullText)
+    from!: string
+
+  @Prop(TypeString(), mail.string.To)
+  @Index(IndexKind.FullText)
+    to!: string
+
+  @Prop(TypeString(), mail.string.MailPreview)
+    preview!: string
+}
+
+export function createModel (builder: Builder): void {
+  builder.createModel(TMailThread)
+
+  builder.mixin(mail.class.MailThread, core.class.Class, activity.mixin.ActivityDoc, {})
+
+  builder.mixin(mail.class.MailThread, core.class.Class, view.mixin.ObjectPresenter, {
+    presenter: mail.component.MailThreadPresenter
+  })
+
+  builder.mixin(mail.class.MailThread, core.class.Class, view.mixin.ObjectEditor, {
+    editor: mail.component.MailThread
+  })
+
+  builder.mixin(mail.class.MailThread, core.class.Class, view.mixin.ObjectPanel, {
+    component: mail.component.MailThread
+  })
+}
diff --git a/models/mail/src/plugin.ts b/models/mail/src/plugin.ts
new file mode 100644
index 0000000000..e83fc27360
--- /dev/null
+++ b/models/mail/src/plugin.ts
@@ -0,0 +1,15 @@
+//
+// 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.
+//
+export { default } from '@hcengineering/mail'
diff --git a/models/mail/tsconfig.json b/models/mail/tsconfig.json
new file mode 100644
index 0000000000..9765b6086d
--- /dev/null
+++ b/models/mail/tsconfig.json
@@ -0,0 +1,10 @@
+{
+  "extends": "./node_modules/@hcengineering/platform-rig/profiles/model/tsconfig.json",
+
+  "compilerOptions": {
+    "rootDir": "./src",
+    "outDir": "./lib",
+    "declarationDir": "./types",
+    "tsBuildInfoFile": ".build/build.tsbuildinfo"
+  }
+}
\ No newline at end of file
diff --git a/models/my-space/.eslintrc.js b/models/my-space/.eslintrc.js
new file mode 100644
index 0000000000..c1cf82cba0
--- /dev/null
+++ b/models/my-space/.eslintrc.js
@@ -0,0 +1,7 @@
+module.exports = {
+  extends: ['./node_modules/@hcengineering/platform-rig/profiles/model/eslint.config.json'],
+  parserOptions: {
+    tsconfigRootDir: __dirname,
+    project: './tsconfig.json'
+  }
+}
diff --git a/models/my-space/.npmignore b/models/my-space/.npmignore
new file mode 100644
index 0000000000..e3ec093c38
--- /dev/null
+++ b/models/my-space/.npmignore
@@ -0,0 +1,4 @@
+*
+!/lib/**
+!CHANGELOG.md
+/lib/**/__tests__/
diff --git a/models/my-space/config/rig.json b/models/my-space/config/rig.json
new file mode 100644
index 0000000000..2f6be36605
--- /dev/null
+++ b/models/my-space/config/rig.json
@@ -0,0 +1,5 @@
+{  
+  "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json",
+  "rigPackageName": "@hcengineering/platform-rig",
+  "rigProfile": "model"
+}
diff --git a/models/my-space/package.json b/models/my-space/package.json
new file mode 100644
index 0000000000..3d2512a7ce
--- /dev/null
+++ b/models/my-space/package.json
@@ -0,0 +1,43 @@
+{
+  "name": "@hcengineering/model-my-space",
+  "version": "0.6.0",
+  "main": "lib/index.js",
+  "svelte": "src/index.ts",
+  "types": "types/index.d.ts",
+  "author": "Hardcore Engineering Inc.",
+  "template": "@hcengineering/model-package",
+  "license": "EPL-2.0",
+  "scripts": {
+    "build": "compile",
+    "build:watch": "compile",
+    "format": "format src",
+    "_phase:build": "compile transpile src",
+    "_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"
+  },
+  "dependencies": {
+    "@hcengineering/core": "^0.6.32",
+    "@hcengineering/mail": "^0.6.0",
+    "@hcengineering/model": "^0.6.11",
+    "@hcengineering/model-core": "^0.6.0",
+    "@hcengineering/model-presentation": "^0.6.0",
+    "@hcengineering/model-workbench": "^0.6.1",
+    "@hcengineering/model-view": "^0.6.0",
+    "@hcengineering/platform": "^0.6.11",
+    "@hcengineering/ui": "^0.6.15",
+    "@hcengineering/my-space": "^0.6.0",
+    "@hcengineering/my-space-resources": "^0.6.0"
+  }
+}
diff --git a/models/my-space/src/index.ts b/models/my-space/src/index.ts
new file mode 100644
index 0000000000..4cb8f3de63
--- /dev/null
+++ b/models/my-space/src/index.ts
@@ -0,0 +1,81 @@
+//
+// 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 { AccountRole } from '@hcengineering/core'
+import { type Builder } from '@hcengineering/model'
+import core from '@hcengineering/model-core'
+import view, { type Viewlet } from '@hcengineering/model-view'
+import workbench from '@hcengineering/model-workbench'
+import mail from '@hcengineering/mail'
+import { mySpaceId } from '@hcengineering/my-space'
+
+import mySpace from './plugin'
+
+export { mySpaceId } from '@hcengineering/my-space'
+
+export { mySpace as default }
+
+export function createModel (builder: Builder): void {
+  builder.createDoc(
+    workbench.class.Application,
+    core.space.Model,
+    {
+      label: mySpace.string.MySpace,
+      icon: mySpace.icon.MySpace,
+      alias: mySpaceId,
+      accessLevel: AccountRole.User,
+      hidden: false,
+      locationResolver: mySpace.resolver.Location,
+      navigatorModel: {
+        spaces: [],
+        specials: [
+          {
+            id: 'mail',
+            label: mySpace.string.Mail,
+            icon: mySpace.icon.Mail,
+            component: workbench.component.SpecialView,
+            componentProps: {
+              _class: mail.class.MailThread,
+              icon: mySpace.icon.Mail,
+              label: mySpace.string.Mail,
+              createLabel: mail.string.CreateMail,
+              createComponent: mail.component.CreateMail
+            }
+          }
+        ]
+      }
+    },
+    mySpace.app.MySpace
+  )
+
+  builder.createDoc<Viewlet>(
+    view.class.Viewlet,
+    core.space.Model,
+    {
+      attachTo: mail.class.MailThread,
+      descriptor: view.viewlet.Table,
+      config: [
+        { key: 'createdBy', label: mail.string.From, displayProps: { fixed: 'left', key: 'app' } },
+        '',
+        { key: 'modifiedOn', label: mail.string.Date, displayProps: { key: 'modified', fixed: 'right' } }
+      ],
+      configOptions: {
+        hiddenKeys: ['name'],
+        sortable: true
+      }
+    },
+    mySpace.viewlet.TableMail
+  )
+}
diff --git a/models/my-space/src/plugin.ts b/models/my-space/src/plugin.ts
new file mode 100644
index 0000000000..629b4a354b
--- /dev/null
+++ b/models/my-space/src/plugin.ts
@@ -0,0 +1,22 @@
+//
+// 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 { mergeIds } from '@hcengineering/platform'
+import { mySpaceId } from '@hcengineering/my-space'
+import mySpace from '@hcengineering/my-space-resources/src/plugin'
+
+export default mergeIds(mySpaceId, mySpace, {
+  component: {}
+})
diff --git a/models/my-space/tsconfig.json b/models/my-space/tsconfig.json
new file mode 100644
index 0000000000..9765b6086d
--- /dev/null
+++ b/models/my-space/tsconfig.json
@@ -0,0 +1,10 @@
+{
+  "extends": "./node_modules/@hcengineering/platform-rig/profiles/model/tsconfig.json",
+
+  "compilerOptions": {
+    "rootDir": "./src",
+    "outDir": "./lib",
+    "declarationDir": "./types",
+    "tsBuildInfoFile": ".build/build.tsbuildinfo"
+  }
+}
\ No newline at end of file
diff --git a/plugins/mail-assets/.eslintrc.js b/plugins/mail-assets/.eslintrc.js
new file mode 100644
index 0000000000..e73094bc7e
--- /dev/null
+++ b/plugins/mail-assets/.eslintrc.js
@@ -0,0 +1,7 @@
+module.exports = {
+  extends: ['./node_modules/@hcengineering/platform-rig/profiles/assets/eslint.config.json'],
+  parserOptions: {
+    tsconfigRootDir: __dirname,
+    project: './tsconfig.json'
+  }
+}
diff --git a/plugins/mail-assets/assets/icons.svg b/plugins/mail-assets/assets/icons.svg
new file mode 100644
index 0000000000..0737d495c3
--- /dev/null
+++ b/plugins/mail-assets/assets/icons.svg
@@ -0,0 +1,16 @@
+<svg xmlns="http://www.w3.org/2000/svg" style="display: none;">
+  <symbol id="inbox" viewBox="0 0 32 32">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M9.2 8.39976C9.38885 8.14795 9.68524 7.99976 10 7.99976H22C22.3148 7.99976 22.6111 8.14795 22.8 8.39976L27 13.9998H19C18.4477 13.9998 18 14.4475 18 14.9998C18 15.2624 17.9483 15.5225 17.8478 15.7651C17.7472 16.0078 17.5999 16.2283 17.4142 16.414C17.2285 16.5997 17.008 16.747 16.7654 16.8475C16.5227 16.948 16.2626 16.9998 16 16.9998C15.7374 16.9998 15.4773 16.948 15.2346 16.8475C14.992 16.747 14.7715 16.5997 14.5858 16.414C14.4001 16.2283 14.2528 16.0078 14.1522 15.7651C14.0517 15.5225 14 15.2624 14 14.9998C14 14.4475 13.5523 13.9998 13 13.9998H5L9.2 8.39976ZM12.127 15.9998H4V21.9998C4 23.1043 4.89543 23.9998 6 23.9998H26C27.1046 23.9998 28 23.1043 28 21.9998V15.9998H19.873C19.8264 16.1802 19.7672 16.3576 19.6955 16.5305C19.4945 17.0158 19.1999 17.4567 18.8284 17.8282C18.457 18.1996 18.016 18.4943 17.5307 18.6953C17.0454 18.8963 16.5253 18.9998 16 18.9998C15.4747 18.9998 14.9546 18.8963 14.4693 18.6953C13.984 18.4943 13.543 18.1996 13.1716 17.8282C12.8001 17.4567 12.5055 17.0158 12.3045 16.5305C12.2329 16.3576 12.1736 16.1802 12.127 15.9998ZM10 5.99976C9.05573 5.99976 8.16656 6.44434 7.6 7.19976L2.2 14.3998C2.07018 14.5729 2 14.7834 2 14.9998V21.9998C2 24.2089 3.79086 25.9998 6 25.9998H26C28.2091 25.9998 30 24.2089 30 21.9998V14.9998C30 14.7834 29.9298 14.5729 29.8 14.3998L24.4 7.19976C23.8334 6.44434 22.9443 5.99976 22 5.99976H10Z" />
+  </symbol>
+  <symbol id="new-mail" viewBox="0 0 24 24">
+    <path d="M22,12.2c-0.4,0-0.8,0.3-0.8,0.8v2c0,4.6-1.6,6.2-6.2,6.2H9c-4.6,0-6.2-1.6-6.2-6.2V9c0-4.6,1.6-6.2,6.2-6.2h2 c0.4,0,0.8-0.3,0.8-0.8S11.4,1.2,11,1.2H9C3.6,1.2,1.2,3.6,1.2,9v6c0,5.4,2.3,7.8,7.8,7.8h6c5.4,0,7.8-2.3,7.8-7.8v-2 C22.8,12.6,22.4,12.2,22,12.2z" />
+    <path d="M14.4,3.6l-6.8,6.8c-0.4,0.4-0.8,1.2-0.9,1.7l-0.4,3c-0.1,0.8,0.1,1.5,0.6,2c0.4,0.4,1,0.6,1.6,0.6c0.1,0,0.2,0,0.4,0 l3-0.4c0.6-0.1,1.3-0.5,1.7-0.9l7.9-7.9c0.9-0.9,1.4-1.8,1.5-2.7c0.1-1.1-0.4-2.2-1.5-3.3c-2-2-4-2-6,0L14.4,3.6 C14.4,3.6,14.4,3.6,14.4,3.6z M12.6,15.3c-0.2,0.2-0.6,0.4-0.9,0.5l-3,0.4c-0.3,0-0.5,0-0.7-0.2c-0.2-0.1-0.2-0.4-0.2-0.7l0.4-3 c0-0.3,0.3-0.7,0.4-0.9l5.9-5.9c0.8,1.7,2.2,3.1,3.9,3.9L12.6,15.3z M20.4,3.5c0.8,0.8,1.1,1.5,1,2.1c0,0.5-0.4,1.1-1,1.8l-0.8,0.8 c-1.8-0.6-3.2-2.1-3.9-3.9l0.8-0.8C17.7,2.4,18.8,1.9,20.4,3.5z" />
+  </symbol>
+  <symbol id="done" viewBox="0 0 20 20" fill="none">
+    <path d="M10 1.24988C8.26942 1.24988 6.57769 1.76306 5.13876 2.72452C3.69983 3.68598 2.57832 5.05254 1.91606 6.6514C1.25379 8.25025 1.08051 10.0096 1.41813 11.7069C1.75575 13.4043 2.58911 14.9634 3.81282 16.1871C5.03653 17.4108 6.59563 18.2441 8.29296 18.5817C9.9903 18.9194 11.7496 18.7461 13.3485 18.0838C14.9473 17.4216 16.3139 16.3 17.2754 14.8611C18.2368 13.4222 18.75 11.7305 18.75 9.99988C18.75 7.67923 17.8281 5.45364 16.1872 3.81269C14.5462 2.17175 12.3206 1.24988 10 1.24988ZM10 17.4999C8.51664 17.4999 7.0666 17.06 5.83323 16.2359C4.59986 15.4118 3.63856 14.2404 3.07091 12.87C2.50325 11.4996 2.35473 9.99156 2.64411 8.5367C2.9335 7.08184 3.64781 5.74547 4.6967 4.69658C5.7456 3.64768 7.08197 2.93338 8.53683 2.64399C9.99168 2.3546 11.4997 2.50312 12.8701 3.07078C14.2406 3.63844 15.4119 4.59973 16.236 5.8331C17.0601 7.06647 17.5 8.51652 17.5 9.99988C17.5 11.989 16.7098 13.8967 15.3033 15.3032C13.8968 16.7097 11.9891 17.4999 10 17.4999Z" fill="currentColor"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M14.1919 7.05809C14.436 7.30217 14.436 7.6979 14.1919 7.94197L9.19194 12.942C8.94786 13.1861 8.55214 13.1861 8.30806 12.942L5.80806 10.442C5.56398 10.1979 5.56398 9.80217 5.80806 9.55809C6.05214 9.31401 6.44786 9.31401 6.69194 9.55809L8.75 11.6161L13.3081 7.05809C13.5521 6.81401 13.9479 6.81401 14.1919 7.05809Z" fill="currentColor"/>
+  </symbol>
+  <symbol id="sent" viewBox="0 0 12 12">
+    <path d="M10.1,2.9c0.1-0.4-0.3-0.8-0.7-0.6L1.7,5.6c-0.3,0.1-0.3,0.5,0,0.6l1.6,0.5c0.3,0.1,0.6,0,0.9-0.1l3.6-2.5 C7.9,4.1,8,4.3,7.9,4.4L5.3,7C5.1,7.3,5.1,7.7,5.4,7.9l2.9,1.8c0.3,0.2,0.7,0,0.8-0.4L10.1,2.9z"/>
+  </symbol>
+</svg>
diff --git a/plugins/mail-assets/config/rig.json b/plugins/mail-assets/config/rig.json
new file mode 100644
index 0000000000..b75800b9b7
--- /dev/null
+++ b/plugins/mail-assets/config/rig.json
@@ -0,0 +1,5 @@
+{  
+  "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json",
+  "rigPackageName": "@hcengineering/platform-rig",
+  "rigProfile": "assets"
+}
diff --git a/plugins/mail-assets/jest.config.js b/plugins/mail-assets/jest.config.js
new file mode 100644
index 0000000000..2cfd408b67
--- /dev/null
+++ b/plugins/mail-assets/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/plugins/mail-assets/lang/cs.json b/plugins/mail-assets/lang/cs.json
new file mode 100644
index 0000000000..c7ce8a9f2e
--- /dev/null
+++ b/plugins/mail-assets/lang/cs.json
@@ -0,0 +1,11 @@
+{
+  "string": {
+    "Subject": "Téma",
+    "From": "Od",
+    "To": "Komu",
+    "CreateMail": "Nová zpráva",
+    "MailThread": "Zpráva",
+    "Reply": "Odpovědět",
+    "Date": "Datum"
+  }
+}
\ No newline at end of file
diff --git a/plugins/mail-assets/lang/de.json b/plugins/mail-assets/lang/de.json
new file mode 100644
index 0000000000..70685590c3
--- /dev/null
+++ b/plugins/mail-assets/lang/de.json
@@ -0,0 +1,11 @@
+{
+  "string": {
+    "Subject": "Betreff",
+    "From": "Von",
+    "To": "An",
+    "CreateMail": "Neue Nachricht",
+    "MailThread": "Nachricht",
+    "Reply": "Antworten",
+    "Date": "Datum"
+  }
+}
\ No newline at end of file
diff --git a/plugins/mail-assets/lang/en.json b/plugins/mail-assets/lang/en.json
new file mode 100644
index 0000000000..f5dbdee65e
--- /dev/null
+++ b/plugins/mail-assets/lang/en.json
@@ -0,0 +1,11 @@
+{
+  "string": {
+    "Subject": "Subject",
+    "From": "From",
+    "To": "To",
+    "CreateMail": "New Mail",
+    "MailThread": "Mail",
+    "Reply": "Reply",
+    "Date": "Date"
+  }
+}
\ No newline at end of file
diff --git a/plugins/mail-assets/lang/es.json b/plugins/mail-assets/lang/es.json
new file mode 100644
index 0000000000..3b3156503c
--- /dev/null
+++ b/plugins/mail-assets/lang/es.json
@@ -0,0 +1,11 @@
+{
+  "string": {
+    "Subject": "Asunto",
+    "From": "De",
+    "To": "Para",
+    "CreateMail": "Nuevo mensaje",
+    "MailThread": "Mensaje",
+    "Reply": "Responder",
+    "Date": "Fecha"
+  }
+}
\ No newline at end of file
diff --git a/plugins/mail-assets/lang/fr.json b/plugins/mail-assets/lang/fr.json
new file mode 100644
index 0000000000..eb4b232381
--- /dev/null
+++ b/plugins/mail-assets/lang/fr.json
@@ -0,0 +1,11 @@
+{
+  "string": {
+    "Subject": "Sujet",
+    "From": "De",
+    "To": "À",
+    "CreateMail": "Nouveau message",
+    "MailThread": "Message",
+    "Reply": "Répondre",
+    "Date": "Date"
+  }
+}
\ No newline at end of file
diff --git a/plugins/mail-assets/lang/it.json b/plugins/mail-assets/lang/it.json
new file mode 100644
index 0000000000..0d2bd8e7fc
--- /dev/null
+++ b/plugins/mail-assets/lang/it.json
@@ -0,0 +1,11 @@
+{
+  "string": {
+    "Subject": "Oggetto",
+    "From": "Da",
+    "To": "A",
+    "CreateMail": "Nuovo messaggio",
+    "MailThread": "Messaggio",
+    "Reply": "Rispondi",
+    "Date": "Data"
+  }
+}
\ No newline at end of file
diff --git a/plugins/mail-assets/lang/pt.json b/plugins/mail-assets/lang/pt.json
new file mode 100644
index 0000000000..d0590894a9
--- /dev/null
+++ b/plugins/mail-assets/lang/pt.json
@@ -0,0 +1,11 @@
+{
+  "string": {
+    "Subject": "Assunto",
+    "From": "De",
+    "To": "Para",
+    "CreateMail": "Nova mensagem",
+    "MailThread": "Mensagem",
+    "Reply": "Responder",
+    "Date": "Data"
+  }
+}
\ No newline at end of file
diff --git a/plugins/mail-assets/lang/ru.json b/plugins/mail-assets/lang/ru.json
new file mode 100644
index 0000000000..ad68699599
--- /dev/null
+++ b/plugins/mail-assets/lang/ru.json
@@ -0,0 +1,11 @@
+{
+  "string": {
+    "Subject": "Тема",
+    "From": "От кого",
+    "To": "Кому",
+    "CreateMail": "Новое сообщение",
+    "MailThread": "Сообщение",
+    "Reply": "Ответить",
+    "Date": "Дата"
+  }
+}
\ No newline at end of file
diff --git a/plugins/mail-assets/lang/zh.json b/plugins/mail-assets/lang/zh.json
new file mode 100644
index 0000000000..c158f8caee
--- /dev/null
+++ b/plugins/mail-assets/lang/zh.json
@@ -0,0 +1,11 @@
+{
+  "string": {
+    "Subject": "主题",
+    "From": "从",
+    "To": "到",
+    "CreateMail": "新邮件",
+    "MailThread": "邮件",
+    "Reply": "回复",
+    "Date": "日期"
+  }
+}
\ No newline at end of file
diff --git a/plugins/mail-assets/package.json b/plugins/mail-assets/package.json
new file mode 100644
index 0000000000..a45f66930f
--- /dev/null
+++ b/plugins/mail-assets/package.json
@@ -0,0 +1,39 @@
+{
+  "name": "@hcengineering/mail-assets",
+  "version": "0.6.0",
+  "main": "src/index.ts",
+  "author": "Anticrm Platform Contributors",
+  "template": "@hcengineering/assets-package",
+  "license": "EPL-2.0",
+  "scripts": {
+    "build": "compile",
+    "test": "jest --passWithNoTests --silent",
+    "format": "format src",
+    "build:watch": "compile",
+    "build:docs": "",
+    "_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",
+    "@typescript-eslint/parser": "^6.11.0",
+    "eslint-config-standard-with-typescript": "^40.0.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-n": "^15.4.0",
+    "eslint-plugin-promise": "^6.1.1",
+    "eslint": "^8.54.0",
+    "prettier": "^3.1.0",
+    "typescript": "^5.3.3",
+    "@types/node": "~20.11.16",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.1.1",
+    "@types/jest": "^29.5.5"
+  },
+  "dependencies": {
+    "@hcengineering/platform": "^0.6.11",
+    "@hcengineering/mail": "^0.6.0"
+  }
+}
diff --git a/plugins/mail-assets/src/__tests__/lang.test.ts b/plugins/mail-assets/src/__tests__/lang.test.ts
new file mode 100644
index 0000000000..cf96c6dcf7
--- /dev/null
+++ b/plugins/mail-assets/src/__tests__/lang.test.ts
@@ -0,0 +1,6 @@
+import { makeLocalesTest } from '@hcengineering/platform'
+
+it(
+  'Locales are equale',
+  makeLocalesTest((lang) => import(`../../lang/${lang}.json`))
+)
diff --git a/plugins/mail-assets/src/index.ts b/plugins/mail-assets/src/index.ts
new file mode 100644
index 0000000000..29cc7e20ac
--- /dev/null
+++ b/plugins/mail-assets/src/index.ts
@@ -0,0 +1,25 @@
+//
+// 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 { loadMetadata } from '@hcengineering/platform'
+import mail from '@hcengineering/mail'
+
+const icons = require('../assets/icons.svg') as string // eslint-disable-line
+loadMetadata(mail.icon, {
+  NewMail: `${icons}#new-mail`,
+  Inbox: `${icons}#inbox`,
+  Done: `${icons}#done`,
+  Sent: `${icons}#sent`
+})
diff --git a/plugins/mail-assets/tsconfig.json b/plugins/mail-assets/tsconfig.json
new file mode 100644
index 0000000000..4449c73536
--- /dev/null
+++ b/plugins/mail-assets/tsconfig.json
@@ -0,0 +1,11 @@
+{
+  "extends": "./node_modules/@hcengineering/platform-rig/profiles/assets/tsconfig.json",
+
+  "compilerOptions": {
+    "rootDir": "./src",
+    "outDir": "./lib",
+    "declarationDir": "./types",
+    "types": ["node", "jest"],
+    "tsBuildInfoFile": ".build/build.tsbuildinfo"
+  }
+}
\ No newline at end of file
diff --git a/plugins/mail-resources/.eslintrc.js b/plugins/mail-resources/.eslintrc.js
new file mode 100644
index 0000000000..bb8fd7450d
--- /dev/null
+++ b/plugins/mail-resources/.eslintrc.js
@@ -0,0 +1,4 @@
+module.exports = {
+  extends: ['./node_modules/@hcengineering/platform-rig/profiles/ui/eslint.config.json'],
+  parserOptions: { tsconfigRootDir: __dirname }
+}
diff --git a/plugins/mail-resources/.prettierrc b/plugins/mail-resources/.prettierrc
new file mode 100644
index 0000000000..792942803a
--- /dev/null
+++ b/plugins/mail-resources/.prettierrc
@@ -0,0 +1,22 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "trailingComma": "none",
+  "tabWidth": 2,
+  "semi": false,
+  "singleQuote": true,
+  "printWidth": 120,
+  "useTabs": false,
+  "bracketSpacing": true,
+  "proseWrap": "preserve",
+  "plugins": [
+      "prettier-plugin-svelte"
+  ],
+  "overrides": [
+      {
+          "files": "*.svelte",
+          "options": {
+              "parser": "svelte"
+          }
+      }
+  ]
+}
\ No newline at end of file
diff --git a/plugins/mail-resources/config/rig.json b/plugins/mail-resources/config/rig.json
new file mode 100644
index 0000000000..bcad6f7c33
--- /dev/null
+++ b/plugins/mail-resources/config/rig.json
@@ -0,0 +1,5 @@
+{  
+  "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json",
+  "rigPackageName": "@hcengineering/platform-rig",
+  "rigProfile": "ui"
+}
diff --git a/plugins/mail-resources/jest.config.js b/plugins/mail-resources/jest.config.js
new file mode 100644
index 0000000000..3656e284d3
--- /dev/null
+++ b/plugins/mail-resources/jest.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  testMatch: ['**/?(*.)+(spec|test).[jt]s?(x)']
+}
diff --git a/plugins/mail-resources/package.json b/plugins/mail-resources/package.json
new file mode 100644
index 0000000000..705b98518d
--- /dev/null
+++ b/plugins/mail-resources/package.json
@@ -0,0 +1,54 @@
+{
+  "name": "@hcengineering/mail-resources",
+  "version": "0.6.0",
+  "main": "src/index.ts",
+  "author": "Anticrm Platform Contributors",
+  "license": "EPL-2.0",
+  "scripts": {
+    "build": "compile ui",
+    "build:docs": "api-extractor run --local",
+    "format": "format src",
+    "svelte-check": "do-svelte-check",
+    "_phase:svelte-check": "do-svelte-check",
+    "build:watch": "compile ui",
+    "_phase:build": "compile ui",
+    "_phase:format": "format src",
+    "_phase:validate": "compile validate"
+  },
+  "devDependencies": {
+    "@hcengineering/platform-rig": "^0.6.0",
+    "svelte-loader": "^3.2.0",
+    "sass": "^1.53.0",
+    "svelte-preprocess": "^5.1.3",
+    "@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",
+    "eslint-plugin-svelte": "^2.35.1",
+    "prettier-plugin-svelte": "^3.2.2",
+    "prettier": "^3.1.0",
+    "svelte-check": "^3.6.9",
+    "typescript": "^5.3.3",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.1.1",
+    "@types/jest": "^29.5.5",
+    "svelte-eslint-parser": "^0.33.1"
+  },
+  "dependencies": {
+    "@hcengineering/platform": "^0.6.11",
+    "svelte": "^4.2.19",
+    "@hcengineering/mail": "^0.6.0",
+    "@hcengineering/ui": "^0.6.15",
+    "@hcengineering/presentation": "^0.6.3",
+    "@hcengineering/core": "^0.6.32",
+    "@hcengineering/contact": "^0.6.24",
+    "@hcengineering/contact-resources": "^0.6.0",
+    "@hcengineering/chunter": "^0.6.20",
+    "@hcengineering/panel": "^0.6.23",
+    "@hcengineering/view": "^0.6.13",
+    "@hcengineering/view-resources": "^0.6.0"
+  }
+}
diff --git a/plugins/mail-resources/postcss.config.js b/plugins/mail-resources/postcss.config.js
new file mode 100644
index 0000000000..88752c6cb0
--- /dev/null
+++ b/plugins/mail-resources/postcss.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+  plugins: [
+    require('autoprefixer')
+  ]
+}
diff --git a/plugins/mail-resources/src/components/CreateMail.svelte b/plugins/mail-resources/src/components/CreateMail.svelte
new file mode 100644
index 0000000000..426979dc43
--- /dev/null
+++ b/plugins/mail-resources/src/components/CreateMail.svelte
@@ -0,0 +1,137 @@
+<!--
+//
+// 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.
+//
+-->
+<script lang="ts">
+  import core, { Data, Doc, generateId, getCurrentAccount, Ref, Space } from '@hcengineering/core'
+  import chunter, { type ChatMessage } from '@hcengineering/chunter'
+  import { Card, getClient, isSpace } from '@hcengineering/presentation'
+  import { MailThread } from '@hcengineering/mail'
+  import { createFocusManager, EditBox, FocusHandler } from '@hcengineering/ui'
+  import { createEventDispatcher } from 'svelte'
+
+  import mail from '../plugin'
+  import { isValidEmail } from '../messageUtils'
+
+  const manager = createFocusManager()
+  const dispatch = createEventDispatcher()
+  const client = getClient()
+  const account = getCurrentAccount()
+
+  export let mailThreadId: Ref<MailThread> | undefined = undefined
+
+  export let to = ''
+  export let from = getEmail()
+  export let subject = ''
+  let message = ''
+
+  export function canClose (): boolean {
+    return to === '' && from === '' && subject === ''
+  }
+
+  export function getEmail (): string {
+    // TODO: use email from account
+    return 'test@huly.me'
+  }
+
+  async function createMail (): Promise<void> {
+    const mailThread = await getOrCreateMailThread()
+    if (mailThread === undefined) {
+      throw new Error('Failed to create mail thread')
+    }
+
+    const messageId: Ref<ChatMessage> = await client.addCollection<Doc, ChatMessage>(
+      chunter.class.ChatMessage,
+      getSpace(mailThread),
+      mailThread._id,
+      mail.class.MailThread,
+      'messages',
+      { message: message ?? '' }
+    )
+
+    dispatch('close', messageId)
+  }
+
+  async function getOrCreateMailThread (): Promise<MailThread | undefined> {
+    if (mailThreadId !== undefined) {
+      const mailThread = await client.findOne(mail.class.MailThread, { mailThreadId: mailThreadId as any })
+      if (mailThread !== undefined) {
+        return mailThread
+      }
+    }
+    const data: Data<MailThread> = {
+      mailThreadId: generateId(),
+      from,
+      to,
+      subject,
+      name: subject,
+      description: '',
+      private: true,
+      members: [account.primarySocialId],
+      archived: false,
+      preview: getMessagePreview(message)
+    }
+
+    const threadId = await client.createDoc(mail.class.MailThread, core.space.Space, data)
+    return await client.findOne(mail.class.MailThread, { _id: threadId as any })
+  }
+
+  function getMessagePreview (message: string): string {
+    const maxLength = 80
+    return message.length > maxLength ? message.substring(0, maxLength) + '...' : message
+  }
+
+  function getSpace (doc: Doc): Ref<Space> {
+    return isSpace(doc) ? doc._id : doc.space
+  }
+</script>
+
+<FocusHandler {manager} />
+
+<Card
+  label={mail.string.CreateMail}
+  okAction={createMail}
+  canSave={to.trim().length > 0 && isValidEmail(to)}
+  on:close={() => {
+    dispatch('close')
+  }}
+  on:changeContent
+>
+  <svelte:fragment slot="header">
+    <div class="flex-row-center">
+      <div class="flex-grow flex-col">
+        <EditBox placeholder={mail.string.From} bind:value={from} />
+      </div>
+    </div>
+  </svelte:fragment>
+
+  <div class="flex-row-center pb-0-5">
+    <div class="flex-grow flex-col">
+      <EditBox placeholder={mail.string.To} bind:value={to} autoFocus focusIndex={1} />
+    </div>
+  </div>
+
+  <div class="flex-row-center pb-0-5">
+    <div class="flex-grow flex-col">
+      <EditBox placeholder={mail.string.Subject} bind:value={subject} focusIndex={2} />
+    </div>
+  </div>
+
+  <div class="flex-row-center py-2">
+    <div class="flex-grow flex-col">
+      <EditBox bind:value={message} focusIndex={3} />
+    </div>
+  </div>
+</Card>
diff --git a/plugins/mail-resources/src/components/MailThread.svelte b/plugins/mail-resources/src/components/MailThread.svelte
new file mode 100644
index 0000000000..edfc34f958
--- /dev/null
+++ b/plugins/mail-resources/src/components/MailThread.svelte
@@ -0,0 +1,120 @@
+<!--
+//
+// 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.
+//
+-->
+
+<script lang="ts">
+  import { createEventDispatcher, onMount } from 'svelte'
+
+  import { getResource } from '@hcengineering/platform'
+  import { ActionContext, getClient } from '@hcengineering/presentation'
+  import { type Class, type Ref } from '@hcengineering/core'
+  import mail, { MailThread } from '@hcengineering/mail'
+  import { Panel } from '@hcengineering/panel'
+  import { type AnySvelteComponent, Button, Component, Loading, showPopup } from '@hcengineering/ui'
+  import chunter, { type ChatMessage } from '@hcengineering/chunter'
+  import view, { type ObjectPresenter } from '@hcengineering/view'
+
+  import { getReplySubject } from '../messageUtils'
+
+  export let _id: Ref<MailThread>
+  export let _class: Ref<Class<MailThread>>
+
+  const messageClass = chunter.class.ChatMessage
+  let messages: ChatMessage[] = []
+  let isLoading = true
+
+  let object: MailThread | undefined
+
+  const dispatch = createEventDispatcher()
+
+  const client = getClient()
+
+  let messagePresenter: AnySvelteComponent | undefined = undefined
+
+  $: if (_id !== undefined && _class !== undefined) {
+    void load()
+  }
+
+  async function load (): Promise<void> {
+    isLoading = true
+    try {
+      await Promise.all([findThread(), findMessages(), findMessagePresenter()])
+    } catch (err) {
+      console.error(err)
+    } finally {
+      isLoading = false
+    }
+  }
+
+  async function findMessagePresenter (): Promise<void> {
+    const presenterMixin: ObjectPresenter | undefined = getClient()
+      .getHierarchy()
+      .classHierarchyMixin(messageClass, view.mixin.ObjectPresenter) as any
+    if (presenterMixin?.presenter !== undefined) {
+      messagePresenter = await getResource(presenterMixin.presenter)
+    }
+  }
+
+  async function findMessages (): Promise<void> {
+    const result = await client.findAll(messageClass, { attachedTo: _id })
+    if (Array.isArray(result)) {
+      messages = result
+    } else {
+      console.warn('Failed to find messages for thread', result)
+    }
+  }
+
+  async function findThread (): Promise<void> {
+    object = await client.findOne(_class, { _id })
+  }
+
+  async function reply (): Promise<void> {
+    showPopup(mail.component.CreateMail, {
+      to: object?.from,
+      from: object?.to,
+      subject: getReplySubject(object?.subject ?? ''),
+      mailThreadId: object?.mailThreadId
+    })
+  }
+
+  onMount(() => dispatch('open', { ignoreKeys: [] }))
+</script>
+
+{#if object !== undefined}
+  <ActionContext context={{ mode: 'editor' }} />
+  <Panel
+    {object}
+    title={object.subject}
+    isHeader={false}
+    isAside={false}
+    isSub={false}
+    adaptive={'disabled'}
+    withoutActivity
+    on:open
+    on:close={() => dispatch('close')}
+  >
+    <svelte:fragment slot="utils">
+      <Button disabled={isLoading} label={mail.string.Reply} kind={'primary'} on:click={reply} />
+    </svelte:fragment>
+    {#if isLoading}
+      <Loading />
+    {:else if messagePresenter !== undefined}
+      {#each messages as message}
+        <Component is={messagePresenter} props={{ value: message, readonly: true }} />
+      {/each}
+    {/if}
+  </Panel>
+{/if}
diff --git a/plugins/mail-resources/src/components/MailThreadPresenter.svelte b/plugins/mail-resources/src/components/MailThreadPresenter.svelte
new file mode 100644
index 0000000000..831a3ad405
--- /dev/null
+++ b/plugins/mail-resources/src/components/MailThreadPresenter.svelte
@@ -0,0 +1,62 @@
+<!--
+//
+// 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.
+//
+-->
+
+<script lang="ts">
+  import { MailThread } from '@hcengineering/mail'
+  import { getEmbeddedLabel } from '@hcengineering/platform'
+  import { tooltip } from '@hcengineering/ui'
+  import { DocNavLink, ObjectMention } from '@hcengineering/view-resources'
+
+  export let value: MailThread | undefined
+  export let inline: boolean = false
+  export let disabled: boolean = false
+  export let accent: boolean = false
+  export let noUnderline: boolean = false
+  export let onClick: ((event: MouseEvent) => void) | undefined = undefined
+
+  const delimiter = ' — '
+
+  function isNotEmpty (str: string): boolean {
+    return str !== undefined && str !== null && str.trim().length > 0
+  }
+</script>
+
+{#if value}
+  {#if inline}
+    <ObjectMention title={value?.subject} object={value} {disabled} {accent} {noUnderline} />
+  {:else}
+    <DocNavLink object={value} {disabled} {accent} {noUnderline} {onClick}>
+      <div class="flex-presenter" use:tooltip={{ label: getEmbeddedLabel(value.subject) }}>
+        <span class="label nowrap" class:no-underline={noUnderline || disabled} class:fs-bold={accent}>
+          {value.subject ?? value.preview}
+        </span>
+        {#if isNotEmpty(value.subject) && isNotEmpty(value.preview)}
+          <span class="delimiter">{delimiter}</span>
+          <span class="secondary-textColor overflow-label">
+            {value.preview}
+          </span>
+        {/if}
+      </div>
+    </DocNavLink>
+  {/if}
+{/if}
+
+<style lang="scss">
+  .delimiter {
+    white-space: pre;
+  }
+</style>
diff --git a/plugins/mail-resources/src/index.ts b/plugins/mail-resources/src/index.ts
new file mode 100644
index 0000000000..070694cd52
--- /dev/null
+++ b/plugins/mail-resources/src/index.ts
@@ -0,0 +1,27 @@
+//
+// 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 Resources } from '@hcengineering/platform'
+import CreateMail from './components/CreateMail.svelte'
+import MailThreadPresenter from './components/MailThreadPresenter.svelte'
+import MailThread from './components/MailThread.svelte'
+
+export default async (): Promise<Resources> => ({
+  component: {
+    CreateMail,
+    MailThreadPresenter,
+    MailThread
+  },
+  activity: {}
+})
diff --git a/plugins/mail-resources/src/messageUtils.ts b/plugins/mail-resources/src/messageUtils.ts
new file mode 100644
index 0000000000..a0b44f1403
--- /dev/null
+++ b/plugins/mail-resources/src/messageUtils.ts
@@ -0,0 +1,109 @@
+//
+// 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 Client,
+  type Data,
+  type Doc,
+  type Ref,
+  type Space,
+  type TxOperations,
+  generateId,
+  getCurrentAccount
+} from '@hcengineering/core'
+import chunter, { type ChatMessage } from '@hcengineering/chunter'
+import contact, { getCurrentEmployee } from '@hcengineering/contact'
+import { isSpace } from '@hcengineering/presentation'
+import type { MailThread } from '@hcengineering/mail'
+
+import mail from './plugin'
+
+interface MessageData {
+  id: Ref<ChatMessage>
+  from: string
+  to: string
+  subject: string
+  text: string
+}
+
+export async function createMailMessage (
+  client: TxOperations & Client,
+  mailThreadId: Ref<MailThread> | undefined,
+  data: MessageData
+): Promise<Ref<ChatMessage>> {
+  const mailThread = await getOrCreateMailThread(client, mailThreadId, data)
+
+  if (mailThread === undefined) {
+    throw new Error('Failed to create mail thread')
+  }
+
+  return await client.addCollection<Doc, ChatMessage>(
+    chunter.class.ChatMessage,
+    getSpace(mailThread),
+    mailThread._id,
+    mail.class.MailThread,
+    'messages',
+    { message: data?.text ?? '' },
+    data.id
+  )
+}
+
+async function getOrCreateMailThread (
+  client: TxOperations & Client,
+  mailThreadId: Ref<MailThread> | undefined,
+  data: MessageData
+): Promise<MailThread | undefined> {
+  const threadId = mailThreadId ?? (await createMailThread(client, data))
+
+  return await client.findOne(mail.class.MailThread, { _id: threadId })
+}
+
+async function createMailThread (client: TxOperations & Client, messageData: MessageData): Promise<Ref<MailThread>> {
+  const account = getCurrentAccount()
+  const employee = getCurrentEmployee()
+  const space = await client.findOne(contact.class.PersonSpace, { person: employee }, { projection: { _id: 1 } })
+  if (space === undefined) {
+    throw new Error('No space found')
+  }
+
+  const data: Data<MailThread> = {
+    ...messageData,
+    mailThreadId: generateId(),
+    name: messageData.subject,
+    description: '',
+    private: true,
+    members: [account.primarySocialId],
+    archived: false,
+    preview: getMessagePreview(messageData.text)
+  }
+
+  return await client.createDoc(mail.class.MailThread, space._id, data)
+}
+
+function getMessagePreview (message: string): string {
+  return message.length > 300 ? message.substring(0, 300) + '...' : message
+}
+
+function getSpace (doc: Doc): Ref<Space> {
+  return isSpace(doc) ? doc._id : doc.space
+}
+
+export function isValidEmail (email: string): boolean {
+  const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
+  return emailRegex.test(email)
+}
+
+export function getReplySubject (subject: string): string {
+  return subject.startsWith('Re:') ? subject : `Re: ${subject}`
+}
diff --git a/plugins/mail-resources/src/plugin.ts b/plugins/mail-resources/src/plugin.ts
new file mode 100644
index 0000000000..fa7bc95f19
--- /dev/null
+++ b/plugins/mail-resources/src/plugin.ts
@@ -0,0 +1,22 @@
+//
+// 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 { mergeIds } from '@hcengineering/platform'
+
+import mail, { mailId } from '@hcengineering/mail'
+
+export default mergeIds(mailId, mail, {
+  string: {}
+})
diff --git a/plugins/mail-resources/svelte.config.js b/plugins/mail-resources/svelte.config.js
new file mode 100644
index 0000000000..944a06f73e
--- /dev/null
+++ b/plugins/mail-resources/svelte.config.js
@@ -0,0 +1,5 @@
+const sveltePreprocess = require('svelte-preprocess')
+
+module.exports = {
+    preprocess: sveltePreprocess()
+};
\ No newline at end of file
diff --git a/plugins/mail-resources/tsconfig.json b/plugins/mail-resources/tsconfig.json
new file mode 100644
index 0000000000..fb6ccb2d18
--- /dev/null
+++ b/plugins/mail-resources/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "./node_modules/@hcengineering/platform-rig/profiles/ui/tsconfig.json",
+
+  "compilerOptions": {
+    "rootDir": "./src",
+    "outDir": "./lib",
+    "declarationDir": "./types"
+  }
+}
\ No newline at end of file
diff --git a/plugins/mail/.eslintrc.js b/plugins/mail/.eslintrc.js
new file mode 100644
index 0000000000..72235dc283
--- /dev/null
+++ b/plugins/mail/.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/plugins/mail/.npmignore b/plugins/mail/.npmignore
new file mode 100644
index 0000000000..e3ec093c38
--- /dev/null
+++ b/plugins/mail/.npmignore
@@ -0,0 +1,4 @@
+*
+!/lib/**
+!CHANGELOG.md
+/lib/**/__tests__/
diff --git a/plugins/mail/config/rig.json b/plugins/mail/config/rig.json
new file mode 100644
index 0000000000..0110930f55
--- /dev/null
+++ b/plugins/mail/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/plugins/mail/jest.config.js b/plugins/mail/jest.config.js
new file mode 100644
index 0000000000..2cfd408b67
--- /dev/null
+++ b/plugins/mail/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/plugins/mail/package.json b/plugins/mail/package.json
new file mode 100644
index 0000000000..85b45c804f
--- /dev/null
+++ b/plugins/mail/package.json
@@ -0,0 +1,49 @@
+{
+  "name": "@hcengineering/mail",
+  "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",
+    "build:watch": "compile",
+    "format": "format src",
+    "test": "jest --passWithNoTests --silent",
+    "_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"
+  },
+  "dependencies": {
+    "@hcengineering/platform": "^0.6.11",
+    "@hcengineering/core": "^0.6.32",
+    "@hcengineering/chunter": "^0.6.20",
+    "@hcengineering/ui": "^0.6.15"
+  },
+  "repository": "https://github.com/hcengineering/platform",
+  "publishConfig": {
+    "registry": "https://npm.pkg.github.com"
+  }
+}
diff --git a/plugins/mail/src/index.ts b/plugins/mail/src/index.ts
new file mode 100644
index 0000000000..d89e8195a9
--- /dev/null
+++ b/plugins/mail/src/index.ts
@@ -0,0 +1,60 @@
+//
+// 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 { Class, Ref } from '@hcengineering/core'
+import { Asset, IntlString, type Plugin, plugin } from '@hcengineering/platform'
+import type { ChunterSpace } from '@hcengineering/chunter'
+import type { AnyComponent } from '@hcengineering/ui'
+
+export interface MailThread extends ChunterSpace {
+  subject: string
+  mailThreadId: string
+  from: string
+  to: string
+  preview: string
+}
+
+/**
+ * @public
+ */
+export const mailId = 'mail' as Plugin
+
+export default plugin(mailId, {
+  class: {
+    MailThread: '' as Ref<Class<MailThread>>
+  },
+  component: {
+    CreateMail: '' as AnyComponent,
+    MailThreadPresenter: '' as AnyComponent,
+    MailThread: '' as AnyComponent
+  },
+  string: {
+    MailThread: '' as IntlString,
+    MailThreadId: '' as IntlString,
+    MailPreview: '' as IntlString,
+    Subject: '' as IntlString,
+    To: '' as IntlString,
+    From: '' as IntlString,
+    CreateMail: '' as IntlString,
+    Reply: '' as IntlString,
+    Date: '' as IntlString
+  },
+  icon: {
+    NewMail: '' as Asset,
+    Inbox: '' as Asset,
+    Done: '' as Asset,
+    Sent: '' as Asset
+  }
+})
diff --git a/plugins/mail/tsconfig.json b/plugins/mail/tsconfig.json
new file mode 100644
index 0000000000..59e4fd4297
--- /dev/null
+++ b/plugins/mail/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/plugins/my-space-assets/.eslintrc.js b/plugins/my-space-assets/.eslintrc.js
new file mode 100644
index 0000000000..e73094bc7e
--- /dev/null
+++ b/plugins/my-space-assets/.eslintrc.js
@@ -0,0 +1,7 @@
+module.exports = {
+  extends: ['./node_modules/@hcengineering/platform-rig/profiles/assets/eslint.config.json'],
+  parserOptions: {
+    tsconfigRootDir: __dirname,
+    project: './tsconfig.json'
+  }
+}
diff --git a/plugins/my-space-assets/assets/icons.svg b/plugins/my-space-assets/assets/icons.svg
new file mode 100644
index 0000000000..58a2f21486
--- /dev/null
+++ b/plugins/my-space-assets/assets/icons.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" style="display: none;">
+  <symbol id="browser" viewBox="0 0 32 32">
+    <path d="M16,2C9.8,2,3.4,3.8,3.4,7.3V16v8.7C3.4,28.2,9.8,30,16,30c0.6,0,1-0.4,1-1s-0.4-1-1-1c-6.4,0-10.6-2-10.6-3.3V19c2.4,1.5,6.5,2.3,10.6,2.3c0.6,0,1-0.4,1-1s-0.4-1-1-1c-6.4,0-10.6-2-10.6-3.3v-5.7c2.4,1.5,6.5,2.3,10.6,2.3s8.2-0.8,10.6-2.3v4.9c0,0.6,0.4,1,1,1s1-0.4,1-1V7.3C28.6,3.8,22.2,2,16,2z M16,10.7c-6.4,0-10.6-2-10.6-3.3S9.6,4,16,4c6.4,0,10.6,2,10.6,3.3S22.4,10.7,16,10.7z" />
+    <path d="M29.7,28.3l-2-2c0.6-0.8,0.9-1.9,0.9-3c0-2.9-2.4-5.3-5.3-5.3c-2.9,0-5.3,2.4-5.3,5.3c0,2.9,2.4,5.3,5.3,5.3c1.1,0,2.1-0.3,3-0.9l2,2c0.2,0.2,0.5,0.3,0.7,0.3s0.5-0.1,0.7-0.3C30.1,29.3,30.1,28.7,29.7,28.3z M20,23.3c0-1.8,1.5-3.3,3.3-3.3s3.3,1.5,3.3,3.3s-1.5,3.3-3.3,3.3S20,25.1,20,23.3z" />
+  </symbol>
+  <symbol id="email" viewBox="0 0 12 12" style="fill-rule:evenodd;clip-rule:evenodd;">
+    <path d="M2.2,3.1C1.9,3.4,1.9,3.9,1.9,4.8v2.4c0,0.9,0,1.4,0.3,1.7c0.3,0.3,0.8,0.3,1.7,0.3h4.2c0.9,0,1.4,0,1.7-0.3 c0.3-0.3,0.3-0.8,0.3-1.7V4.8c0-0.9,0-1.4-0.3-1.7C9.5,2.8,9.1,2.8,8.1,2.8H3.9C2.9,2.8,2.5,2.8,2.2,3.1z M3.5,4.3 C3.3,4.1,3,4.2,2.8,4.4C2.7,4.6,2.7,4.9,3,5.1l2.2,1.5c0.5,0.3,1.2,0.3,1.7,0L9,5.1c0.2-0.2,0.3-0.5,0.1-0.7C9,4.2,8.7,4.1,8.5,4.3 L6.3,5.7c-0.2,0.1-0.4,0.1-0.6,0L3.5,4.3z"/>
+  </symbol>
+</svg>
diff --git a/plugins/my-space-assets/config/rig.json b/plugins/my-space-assets/config/rig.json
new file mode 100644
index 0000000000..b75800b9b7
--- /dev/null
+++ b/plugins/my-space-assets/config/rig.json
@@ -0,0 +1,5 @@
+{  
+  "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json",
+  "rigPackageName": "@hcengineering/platform-rig",
+  "rigProfile": "assets"
+}
diff --git a/plugins/my-space-assets/jest.config.js b/plugins/my-space-assets/jest.config.js
new file mode 100644
index 0000000000..2cfd408b67
--- /dev/null
+++ b/plugins/my-space-assets/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/plugins/my-space-assets/lang/cs.json b/plugins/my-space-assets/lang/cs.json
new file mode 100644
index 0000000000..606f407936
--- /dev/null
+++ b/plugins/my-space-assets/lang/cs.json
@@ -0,0 +1,8 @@
+{
+  "string": {
+    "ConfigLabel": "Osobní prohlížeč",
+    "ConfigDescription": "Osobní prohlížeč",
+    "MySpace": "Osobní prohlížeč",
+    "Mail": "Pošta"
+  }
+}
\ No newline at end of file
diff --git a/plugins/my-space-assets/lang/de.json b/plugins/my-space-assets/lang/de.json
new file mode 100644
index 0000000000..f5b7668104
--- /dev/null
+++ b/plugins/my-space-assets/lang/de.json
@@ -0,0 +1,8 @@
+{
+  "string": {
+    "ConfigLabel": "Persönlicher Browser",
+    "ConfigDescription": "Persönlicher Browser",
+    "MySpace": "Persönlicher Browser",
+    "Mail": "E-Mail"
+  }
+}
diff --git a/plugins/my-space-assets/lang/en.json b/plugins/my-space-assets/lang/en.json
new file mode 100644
index 0000000000..5aa2b87eb5
--- /dev/null
+++ b/plugins/my-space-assets/lang/en.json
@@ -0,0 +1,8 @@
+{
+  "string": {
+    "ConfigLabel": "My Space",
+    "ConfigDescription": "My Space",
+    "MySpace": "My Space",
+    "Mail": "Mail"
+  }
+}
diff --git a/plugins/my-space-assets/lang/fr.json b/plugins/my-space-assets/lang/fr.json
new file mode 100644
index 0000000000..c9cd51eb5f
--- /dev/null
+++ b/plugins/my-space-assets/lang/fr.json
@@ -0,0 +1,8 @@
+{
+  "string": {
+    "ConfigLabel": "Navigateur Personnel",
+    "ConfigDescription": "Navigateur Personnel",
+    "MySpace": "Navigateur Personnel",
+    "Mail": "Courrier"
+  }
+}
\ No newline at end of file
diff --git a/plugins/my-space-assets/lang/it.json b/plugins/my-space-assets/lang/it.json
new file mode 100644
index 0000000000..d4801fdbc7
--- /dev/null
+++ b/plugins/my-space-assets/lang/it.json
@@ -0,0 +1,8 @@
+{
+  "string": {
+    "ConfigLabel": "Browser Personale",
+    "ConfigDescription": "Browser Personale",
+    "MySpace": "Browser Personale",
+    "Mail": "Posta"
+  }
+}
diff --git a/plugins/my-space-assets/lang/ru.json b/plugins/my-space-assets/lang/ru.json
new file mode 100644
index 0000000000..ddc4cb1840
--- /dev/null
+++ b/plugins/my-space-assets/lang/ru.json
@@ -0,0 +1,8 @@
+{
+  "string": {
+    "ConfigLabel": "Персональный браузер",
+    "ConfigDescription": "Персональный браузер",
+    "MySpace": "Персональный браузер",
+    "Mail": "Почта"
+  }
+}
diff --git a/plugins/my-space-assets/lang/zh.json b/plugins/my-space-assets/lang/zh.json
new file mode 100644
index 0000000000..f0f87f86ba
--- /dev/null
+++ b/plugins/my-space-assets/lang/zh.json
@@ -0,0 +1,8 @@
+{
+  "string": {
+    "ConfigLabel": "个人浏览器",
+    "ConfigDescription": "个人浏览器",
+    "MySpace": "个人浏览器",
+    "Mail": "邮件"
+  }
+}
diff --git a/plugins/my-space-assets/package.json b/plugins/my-space-assets/package.json
new file mode 100644
index 0000000000..6de2845803
--- /dev/null
+++ b/plugins/my-space-assets/package.json
@@ -0,0 +1,39 @@
+{
+  "name": "@hcengineering/my-space-assets",
+  "version": "0.6.0",
+  "main": "src/index.ts",
+  "author": "Hardcore Engineering Inc",
+  "template": "@hcengineering/assets-package",
+  "scripts": {
+    "build": "compile",
+    "build:watch": "compile",
+    "build:docs": "",
+    "test": "jest --passWithNoTests --silent",
+    "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",
+    "@typescript-eslint/parser": "^6.11.0",
+    "eslint-config-standard-with-typescript": "^40.0.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-n": "^15.4.0",
+    "eslint-plugin-promise": "^6.1.1",
+    "eslint": "^8.54.0",
+    "prettier": "^3.1.0",
+    "@types/node": "~20.11.16",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.1.1",
+    "@types/jest": "^29.5.5",
+    "typescript": "^5.3.3"
+  },
+  "dependencies": {
+    "@hcengineering/questions": "^0.1.0",
+    "@hcengineering/platform": "^0.6.11",
+    "@hcengineering/my-space": "^0.6.0"
+  }
+}
diff --git a/plugins/my-space-assets/src/__tests__/lang.test.ts b/plugins/my-space-assets/src/__tests__/lang.test.ts
new file mode 100644
index 0000000000..cf96c6dcf7
--- /dev/null
+++ b/plugins/my-space-assets/src/__tests__/lang.test.ts
@@ -0,0 +1,6 @@
+import { makeLocalesTest } from '@hcengineering/platform'
+
+it(
+  'Locales are equale',
+  makeLocalesTest((lang) => import(`../../lang/${lang}.json`))
+)
diff --git a/plugins/my-space-assets/src/index.ts b/plugins/my-space-assets/src/index.ts
new file mode 100644
index 0000000000..a6dfd41703
--- /dev/null
+++ b/plugins/my-space-assets/src/index.ts
@@ -0,0 +1,23 @@
+//
+// 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 { loadMetadata } from '@hcengineering/platform'
+import mySpace from '@hcengineering/my-space'
+
+const icons = require('../assets/icons.svg') as string // eslint-disable-line
+loadMetadata(mySpace.icon, {
+  MySpace: `${icons}#browser`,
+  Mail: `${icons}#email`
+})
diff --git a/plugins/my-space-assets/tsconfig.json b/plugins/my-space-assets/tsconfig.json
new file mode 100644
index 0000000000..4449c73536
--- /dev/null
+++ b/plugins/my-space-assets/tsconfig.json
@@ -0,0 +1,11 @@
+{
+  "extends": "./node_modules/@hcengineering/platform-rig/profiles/assets/tsconfig.json",
+
+  "compilerOptions": {
+    "rootDir": "./src",
+    "outDir": "./lib",
+    "declarationDir": "./types",
+    "types": ["node", "jest"],
+    "tsBuildInfoFile": ".build/build.tsbuildinfo"
+  }
+}
\ No newline at end of file
diff --git a/plugins/my-space-resources/.eslintrc.js b/plugins/my-space-resources/.eslintrc.js
new file mode 100644
index 0000000000..bb8fd7450d
--- /dev/null
+++ b/plugins/my-space-resources/.eslintrc.js
@@ -0,0 +1,4 @@
+module.exports = {
+  extends: ['./node_modules/@hcengineering/platform-rig/profiles/ui/eslint.config.json'],
+  parserOptions: { tsconfigRootDir: __dirname }
+}
diff --git a/plugins/my-space-resources/.prettierrc b/plugins/my-space-resources/.prettierrc
new file mode 100644
index 0000000000..792942803a
--- /dev/null
+++ b/plugins/my-space-resources/.prettierrc
@@ -0,0 +1,22 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "trailingComma": "none",
+  "tabWidth": 2,
+  "semi": false,
+  "singleQuote": true,
+  "printWidth": 120,
+  "useTabs": false,
+  "bracketSpacing": true,
+  "proseWrap": "preserve",
+  "plugins": [
+      "prettier-plugin-svelte"
+  ],
+  "overrides": [
+      {
+          "files": "*.svelte",
+          "options": {
+              "parser": "svelte"
+          }
+      }
+  ]
+}
\ No newline at end of file
diff --git a/plugins/my-space-resources/config/rig.json b/plugins/my-space-resources/config/rig.json
new file mode 100644
index 0000000000..bcad6f7c33
--- /dev/null
+++ b/plugins/my-space-resources/config/rig.json
@@ -0,0 +1,5 @@
+{  
+  "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json",
+  "rigPackageName": "@hcengineering/platform-rig",
+  "rigProfile": "ui"
+}
diff --git a/plugins/my-space-resources/jest.config.js b/plugins/my-space-resources/jest.config.js
new file mode 100644
index 0000000000..3656e284d3
--- /dev/null
+++ b/plugins/my-space-resources/jest.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  testMatch: ['**/?(*.)+(spec|test).[jt]s?(x)']
+}
diff --git a/plugins/my-space-resources/package.json b/plugins/my-space-resources/package.json
new file mode 100644
index 0000000000..310c1b0e13
--- /dev/null
+++ b/plugins/my-space-resources/package.json
@@ -0,0 +1,55 @@
+{
+  "name": "@hcengineering/my-space-resources",
+  "version": "0.6.0",
+  "main": "src/index.ts",
+  "author": "Hardcore Engineering Inc.",
+  "license": "EPL-2.0",
+  "scripts": {
+    "build": "compile ui",
+    "build:docs": "api-extractor run --local",
+    "format": "format src",
+    "svelte-check": "do-svelte-check",
+    "_phase:svelte-check": "do-svelte-check",
+    "build:watch": "compile ui",
+    "_phase:build": "compile ui",
+    "_phase:format": "format src",
+    "_phase:validate": "compile validate"
+  },
+  "devDependencies": {
+    "svelte-loader": "^3.2.0",
+    "sass": "^1.53.0",
+    "svelte-preprocess": "^5.1.3",
+    "@hcengineering/platform-rig": "^0.6.0",
+    "@typescript-eslint/eslint-plugin": "^6.11.0",
+    "@typescript-eslint/parser": "^6.11.0",
+    "eslint-config-standard-with-typescript": "^40.0.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-n": "^15.4.0",
+    "eslint-plugin-promise": "^6.1.1",
+    "eslint-plugin-svelte": "^2.35.1",
+    "prettier-plugin-svelte": "^3.2.2",
+    "eslint": "^8.54.0",
+    "prettier": "^3.1.0",
+    "svelte-check": "^3.6.9",
+    "typescript": "^5.3.3",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.1.1",
+    "@types/jest": "^29.5.5",
+    "svelte-eslint-parser": "^0.33.1"
+  },
+  "dependencies": {
+    "@hcengineering/platform": "^0.6.11",
+    "@hcengineering/core": "^0.6.32",
+    "@hcengineering/mail": "^0.6.0",
+    "@hcengineering/presentation": "^0.6.3",
+    "@hcengineering/theme": "^0.6.5",
+    "@hcengineering/ui": "^0.6.15",
+    "@hcengineering/view": "^0.6.13",
+    "@hcengineering/view-resources": "^0.6.0",
+    "@hcengineering/contact": "^0.6.24",
+    "@hcengineering/contact-resources": "^0.6.0",
+    "@hcengineering/my-space": "^0.6.0",
+    "svelte": "^4.2.19",
+    "fast-equals": "^5.2.2"
+  }
+}
diff --git a/plugins/my-space-resources/postcss.config.js b/plugins/my-space-resources/postcss.config.js
new file mode 100644
index 0000000000..88752c6cb0
--- /dev/null
+++ b/plugins/my-space-resources/postcss.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+  plugins: [
+    require('autoprefixer')
+  ]
+}
diff --git a/plugins/my-space-resources/src/index.ts b/plugins/my-space-resources/src/index.ts
new file mode 100644
index 0000000000..3726348e2b
--- /dev/null
+++ b/plugins/my-space-resources/src/index.ts
@@ -0,0 +1,26 @@
+//
+// 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 Resources } from '@hcengineering/platform'
+import { resolveLocation } from './navigation'
+
+export { default as plugin } from './plugin'
+
+export default async (): Promise<Resources> => ({
+  component: {},
+  resolver: {
+    Location: resolveLocation
+  }
+})
diff --git a/plugins/my-space-resources/src/navigation.ts b/plugins/my-space-resources/src/navigation.ts
new file mode 100644
index 0000000000..6c3e1aab71
--- /dev/null
+++ b/plugins/my-space-resources/src/navigation.ts
@@ -0,0 +1,87 @@
+//
+// 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 { Client, Doc, Ref, Space, TxOperations } from '@hcengineering/core'
+import { getClient } from '@hcengineering/presentation'
+import { getPanelURI, type Location, type ResolvedLocation } from '@hcengineering/ui'
+import view, { type ObjectPanel } from '@hcengineering/view'
+import { accessDeniedStore } from '@hcengineering/view-resources'
+import contact, { type Employee, getCurrentEmployee } from '@hcengineering/contact'
+import mail, { type MailThread } from '@hcengineering/mail'
+import { mySpaceId } from '@hcengineering/my-space'
+
+export async function resolveLocation (loc: Location): Promise<ResolvedLocation | undefined> {
+  if (loc.path[2] !== mySpaceId) {
+    return undefined
+  }
+
+  if (loc.path[3] === 'mail') {
+    const threadId = loc.path[5] as Ref<MailThread>
+    return await generateMailLocation(loc, threadId)
+  }
+
+  return undefined
+}
+
+function getPanelFragment<T extends Doc> (object: Pick<T, '_class' | '_id'>): string {
+  const hierarchy = getClient().getHierarchy()
+  const objectPanelMixin = hierarchy.classHierarchyMixin<Doc, ObjectPanel>(object._class, view.mixin.ObjectPanel)
+  const component = objectPanelMixin?.component ?? view.component.EditDoc
+  return getPanelURI(component, object._id, object._class, 'content')
+}
+
+async function generateMailLocation (loc: Location, id: Ref<MailThread>): Promise<ResolvedLocation | undefined> {
+  const client = getClient()
+
+  const employee = getCurrentEmployee()
+  const personSpace = await getPersonSpace(client, employee)
+  if (personSpace === undefined) {
+    console.error(`Could not find person space for employee ${employee}.`)
+    return undefined
+  }
+
+  let doc: Doc | undefined
+  if (id !== undefined) {
+    doc = await client.findOne(mail.class.MailThread, { _id: id, space: personSpace })
+    if (doc === undefined) {
+      accessDeniedStore.set(true)
+      console.error(`Could not find mail ${id}.`)
+      return undefined
+    }
+  }
+
+  const appComponent = loc.path[0] ?? ''
+  const workspace = loc.path[1] ?? ''
+
+  const fragment = doc !== undefined ? getPanelFragment(doc) : loc.fragment
+  return {
+    loc: {
+      path: [appComponent, workspace, mySpaceId, personSpace, 'mail'],
+      fragment
+    },
+    defaultLocation: {
+      path: [appComponent, workspace, mySpaceId, personSpace, 'mail'],
+      fragment
+    }
+  }
+}
+
+async function getPersonSpace (client: TxOperations & Client, employee: Ref<Employee>): Promise<Ref<Space> | undefined> {
+  if (employee === undefined) {
+    return undefined
+  }
+  const space = await client.findOne(contact.class.PersonSpace, { person: employee }, { projection: { _id: 1 } })
+  return space?._id
+}
diff --git a/plugins/my-space-resources/src/plugin.ts b/plugins/my-space-resources/src/plugin.ts
new file mode 100644
index 0000000000..510b4d14cb
--- /dev/null
+++ b/plugins/my-space-resources/src/plugin.ts
@@ -0,0 +1,25 @@
+//
+// 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 { Ref } from '@hcengineering/core'
+import { mergeIds } from '@hcengineering/platform'
+import mySpace, { mySpaceId } from '@hcengineering/my-space'
+import type { Viewlet } from '@hcengineering/view'
+
+export default mergeIds(mySpaceId, mySpace, {
+  viewlet: {
+    TableMail: '' as Ref<Viewlet>
+  }
+})
diff --git a/plugins/my-space-resources/svelte.config.js b/plugins/my-space-resources/svelte.config.js
new file mode 100644
index 0000000000..944a06f73e
--- /dev/null
+++ b/plugins/my-space-resources/svelte.config.js
@@ -0,0 +1,5 @@
+const sveltePreprocess = require('svelte-preprocess')
+
+module.exports = {
+    preprocess: sveltePreprocess()
+};
\ No newline at end of file
diff --git a/plugins/my-space-resources/tsconfig.json b/plugins/my-space-resources/tsconfig.json
new file mode 100644
index 0000000000..fb6ccb2d18
--- /dev/null
+++ b/plugins/my-space-resources/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "./node_modules/@hcengineering/platform-rig/profiles/ui/tsconfig.json",
+
+  "compilerOptions": {
+    "rootDir": "./src",
+    "outDir": "./lib",
+    "declarationDir": "./types"
+  }
+}
\ No newline at end of file
diff --git a/plugins/my-space/.eslintrc.js b/plugins/my-space/.eslintrc.js
new file mode 100644
index 0000000000..72235dc283
--- /dev/null
+++ b/plugins/my-space/.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/plugins/my-space/.npmignore b/plugins/my-space/.npmignore
new file mode 100644
index 0000000000..e3ec093c38
--- /dev/null
+++ b/plugins/my-space/.npmignore
@@ -0,0 +1,4 @@
+*
+!/lib/**
+!CHANGELOG.md
+/lib/**/__tests__/
diff --git a/plugins/my-space/config/rig.json b/plugins/my-space/config/rig.json
new file mode 100644
index 0000000000..0110930f55
--- /dev/null
+++ b/plugins/my-space/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/plugins/my-space/jest.config.js b/plugins/my-space/jest.config.js
new file mode 100644
index 0000000000..2cfd408b67
--- /dev/null
+++ b/plugins/my-space/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/plugins/my-space/package.json b/plugins/my-space/package.json
new file mode 100644
index 0000000000..91b418a105
--- /dev/null
+++ b/plugins/my-space/package.json
@@ -0,0 +1,48 @@
+{
+  "name": "@hcengineering/my-space",
+  "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",
+    "build:watch": "compile",
+    "format": "format src",
+    "test": "jest --passWithNoTests --silent",
+    "_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"
+  },
+  "dependencies": {
+    "@hcengineering/core": "^0.6.32",
+    "@hcengineering/platform": "^0.6.11",
+    "@hcengineering/ui": "^0.6.15"
+  },
+  "repository": "https://github.com/hcengineering/platform",
+  "publishConfig": {
+    "registry": "https://npm.pkg.github.com"
+  }
+}
diff --git a/plugins/my-space/src/index.ts b/plugins/my-space/src/index.ts
new file mode 100644
index 0000000000..27fd93fb86
--- /dev/null
+++ b/plugins/my-space/src/index.ts
@@ -0,0 +1,20 @@
+//
+// 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 { mySpaceId, mySpacePlugin } from './plugin'
+
+export { mySpaceId }
+
+export default mySpacePlugin
diff --git a/plugins/my-space/src/plugin.ts b/plugins/my-space/src/plugin.ts
new file mode 100644
index 0000000000..05e3792ba9
--- /dev/null
+++ b/plugins/my-space/src/plugin.ts
@@ -0,0 +1,52 @@
+//
+// 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 Doc, type Ref, type SpaceTypeDescriptor } from '@hcengineering/core'
+import type { Asset, IntlString, Plugin, Resource } from '@hcengineering/platform'
+import { type Location, type ResolvedLocation } from '@hcengineering/ui'
+
+import { plugin } from '@hcengineering/platform'
+
+/** @public */
+export const mySpaceId = 'mySpace' as Plugin
+
+/** @public */
+export const mySpacePlugin = plugin(mySpaceId, {
+  app: {
+    MySpace: '' as Ref<Doc>
+  },
+  icon: {
+    MySpace: '' as Asset,
+    Mail: '' as Asset
+  },
+  class: {},
+  descriptors: {
+    ProjectType: '' as Ref<SpaceTypeDescriptor>
+  },
+  string: {
+    MySpace: '' as IntlString,
+    ConfigLabel: '' as IntlString,
+    ConfigDescription: '' as IntlString,
+    Mail: '' as IntlString
+  },
+  resolver: {
+    Location: '' as Resource<(loc: Location) => Promise<ResolvedLocation | undefined>>
+  }
+})
+
+/**
+ * @public
+ */
+export default mySpacePlugin
diff --git a/plugins/my-space/tsconfig.json b/plugins/my-space/tsconfig.json
new file mode 100644
index 0000000000..59e4fd4297
--- /dev/null
+++ b/plugins/my-space/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/rush.json b/rush.json
index f41127ef8c..9c56805944 100644
--- a/rush.json
+++ b/rush.json
@@ -2280,6 +2280,46 @@
       "packageName": "@hcengineering/model-server-card",
       "projectFolder": "models/server-card",
       "shouldPublish": false
+    },
+    {
+      "packageName": "@hcengineering/mail",
+      "projectFolder": "plugins/mail",
+      "shouldPublish": false
+    },
+    {
+      "packageName": "@hcengineering/model-mail",
+      "projectFolder": "models/mail",
+      "shouldPublish": false
+    },
+    {
+      "packageName": "@hcengineering/mail-assets",
+      "projectFolder": "plugins/mail-assets",
+      "shouldPublish": false
+    },
+    {
+      "packageName": "@hcengineering/mail-resources",
+      "projectFolder": "plugins/mail-resources",
+      "shouldPublish": false
+    },
+    {
+      "packageName": "@hcengineering/my-space",
+      "projectFolder": "plugins/my-space",
+      "shouldPublish": false
+    },
+    {
+      "packageName": "@hcengineering/my-space-assets",
+      "projectFolder": "plugins/my-space-assets",
+      "shouldPublish": false
+    },
+    {
+      "packageName": "@hcengineering/my-space-resources",
+      "projectFolder": "plugins/my-space-resources",
+      "shouldPublish": false
+    },
+    {
+      "packageName": "@hcengineering/model-my-space",
+      "projectFolder": "models/my-space",
+      "shouldPublish": false
     }
   ]
 }

From b487cb949b5198b32ef710880cce6e918345dd01 Mon Sep 17 00:00:00 2001
From: Andrey Sobolev <haiodo@users.noreply.github.com>
Date: Mon, 17 Feb 2025 17:51:40 +0700
Subject: [PATCH 10/13] QFIX: Fix missing SES_AUTH_TOKEN (#8026)

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
---
 server/account-service/src/index.ts |  4 ++++
 server/account/src/operations.ts    | 10 ++++++----
 server/account/src/plugin.ts        |  1 +
 server/account/src/utils.ts         | 14 ++++++++++----
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/server/account-service/src/index.ts b/server/account-service/src/index.ts
index 6e19aeb05d..268b663bc3 100644
--- a/server/account-service/src/index.ts
+++ b/server/account-service/src/index.ts
@@ -64,6 +64,8 @@ export function serveAccount (measureCtx: MeasureContext, brandings: BrandingMap
   })
 
   const ses = process.env.SES_URL
+  const sesAuthToken = process.env.SES_AUTH_TOKEN
+
   const frontURL = process.env.FRONT_URL
   const productName = process.env.PRODUCT_NAME
   const lang = process.env.LANGUAGE ?? 'en'
@@ -85,6 +87,8 @@ export function serveAccount (measureCtx: MeasureContext, brandings: BrandingMap
   setMetadata(account.metadata.OtpTimeToLiveSec, parseInt(process.env.OTP_TIME_TO_LIVE ?? '60'))
   setMetadata(account.metadata.OtpRetryDelaySec, parseInt(process.env.OTP_RETRY_DELAY ?? '60'))
   setMetadata(account.metadata.SES_URL, ses)
+  setMetadata(account.metadata.SES_AUTH_TOKEN, sesAuthToken)
+
   setMetadata(account.metadata.FrontURL, frontURL)
   setMetadata(account.metadata.WsLivenessDays, wsLivenessDays)
 
diff --git a/server/account/src/operations.ts b/server/account/src/operations.ts
index cc12e367ff..c842d76fc5 100644
--- a/server/account/src/operations.ts
+++ b/server/account/src/operations.ts
@@ -371,7 +371,7 @@ export async function sendInvite (
     throw new PlatformError(new Status(Severity.ERROR, platform.status.WorkspaceNotFound, { workspaceUuid }))
   }
 
-  const sesURL = getSesUrl()
+  const { sesURL, sesAuth } = getSesUrl()
   const front = getFrontUrl(branding)
   const expHours = 48
   const exp = expHours * 60 * 60 * 1000
@@ -389,7 +389,8 @@ export async function sendInvite (
   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,
@@ -599,7 +600,7 @@ export async function requestPasswordReset (
     )
   }
 
-  const sesURL = getSesUrl()
+  const { sesURL, sesAuth } = getSesUrl()
   const front = getFrontUrl(branding)
 
   const token = generateToken(account.uuid, undefined, {
@@ -615,7 +616,8 @@ export async function requestPasswordReset (
   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/account/src/plugin.ts b/server/account/src/plugin.ts
index 311dbfb451..967971db04 100644
--- a/server/account/src/plugin.ts
+++ b/server/account/src/plugin.ts
@@ -12,6 +12,7 @@ export const accountPlugin = plugin(accountId, {
   metadata: {
     FrontURL: '' as Metadata<string>,
     SES_URL: '' as Metadata<string>,
+    SES_AUTH_TOKEN: '' as Metadata<string>,
     ProductName: '' as Metadata<string>,
     Transactors: '' as Metadata<string>,
     OtpTimeToLiveSec: '' as Metadata<number>,
diff --git a/server/account/src/utils.ts b/server/account/src/utils.ts
index 7eca625b92..ceb08465d7 100644
--- a/server/account/src/utils.ts
+++ b/server/account/src/utils.ts
@@ -378,6 +378,7 @@ export async function sendOtpEmail (
     ctx.error('Please provide email service url to enable email otp')
     return
   }
+  const sesAuth = getMetadata(accountPlugin.metadata.SES_AUTH_TOKEN)
 
   const lang = branding?.language
   const app = branding?.title ?? getMetadata(accountPlugin.metadata.ProductName)
@@ -390,7 +391,8 @@ export async function sendOtpEmail (
   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,
@@ -735,6 +737,8 @@ export async function sendEmailConfirmation (
     throw new PlatformError(new Status(Severity.ERROR, platform.status.InternalServerError, {}))
   }
 
+  const sesAuth = getMetadata(accountPlugin.metadata.SES_AUTH_TOKEN)
+
   const front = branding?.front ?? getMetadata(accountPlugin.metadata.FrontURL)
   if (front === undefined || front === '') {
     ctx.error('Please provide front url via branding configuration or FRONT_URL variable')
@@ -756,7 +760,8 @@ export async function sendEmailConfirmation (
   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,
@@ -863,14 +868,15 @@ export async function getEmailSocialId (db: AccountDB, email: string): Promise<S
   return await db.socialId.findOne({ type: SocialIdType.EMAIL, value: email })
 }
 
-export function getSesUrl (): string {
+export function getSesUrl (): { sesURL: string, sesAuth: string | undefined } {
   const sesURL = getMetadata(accountPlugin.metadata.SES_URL)
 
   if (sesURL === undefined || sesURL === '') {
     throw new Error('Please provide email service url')
   }
+  const sesAuth = getMetadata(accountPlugin.metadata.SES_AUTH_TOKEN)
 
-  return sesURL
+  return { sesURL, sesAuth }
 }
 
 export function getFrontUrl (branding: Branding | null): string {

From 5165ae71f776c91edfbe590efdcebec112f1eba4 Mon Sep 17 00:00:00 2001
From: Alexey Zinoviev <alexey.zinoviev@xored.com>
Date: Mon, 17 Feb 2025 15:42:01 +0400
Subject: [PATCH 11/13] UBERF-9400: Show name on login screen (#8013)

Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com>
---
 packages/account-client/src/types.ts          | 11 ++-
 .../src/components/CreateWorkspaceForm.svelte | 12 ++-
 .../src/components/SelectWorkspace.svelte     |  7 +-
 plugins/login-resources/src/utils.ts          | 20 ++++-
 server/account/src/operations.ts              | 77 +++++++++++++++++--
 server/account/src/types.ts                   |  2 +
 server/account/src/utils.ts                   | 22 +++++-
 7 files changed, 137 insertions(+), 14 deletions(-)

diff --git a/packages/account-client/src/types.ts b/packages/account-client/src/types.ts
index 4dd45b92ad..e403cf5890 100644
--- a/packages/account-client/src/types.ts
+++ b/packages/account-client/src/types.ts
@@ -1,7 +1,16 @@
-import { WorkspaceDataId, WorkspaceUuid, type AccountRole, type PersonUuid, type Timestamp } from '@hcengineering/core'
+import {
+  PersonId,
+  WorkspaceDataId,
+  WorkspaceUuid,
+  type AccountRole,
+  type PersonUuid,
+  type Timestamp
+} from '@hcengineering/core'
 
 export interface LoginInfo {
   account: PersonUuid
+  name?: string
+  socialId?: PersonId
   token?: string
 }
 
diff --git a/plugins/login-resources/src/components/CreateWorkspaceForm.svelte b/plugins/login-resources/src/components/CreateWorkspaceForm.svelte
index 5a3f9046fc..ff445952b3 100644
--- a/plugins/login-resources/src/components/CreateWorkspaceForm.svelte
+++ b/plugins/login-resources/src/components/CreateWorkspaceForm.svelte
@@ -20,7 +20,15 @@
   import { workbenchId } from '@hcengineering/workbench'
   import { onMount } from 'svelte'
   import login from '../plugin'
-  import { createWorkspace, getAccount, getRegionInfo, goTo, setLoginInfo, type RegionInfo } from '../utils'
+  import {
+    createWorkspace,
+    getAccount,
+    getRegionInfo,
+    goTo,
+    setLoginInfo,
+    getAccountDisplayName,
+    type RegionInfo
+  } from '../utils'
   import Form from './Form.svelte'
 
   const fields = [
@@ -77,7 +85,7 @@
   {fields}
   {object}
   {action}
-  subtitle={loginInfo?.account}
+  subtitle={getAccountDisplayName(loginInfo)}
   bottomActions={[
     {
       caption: login.string.HaveWorkspace,
diff --git a/plugins/login-resources/src/components/SelectWorkspace.svelte b/plugins/login-resources/src/components/SelectWorkspace.svelte
index 7eb549204c..60c6ed421e 100644
--- a/plugins/login-resources/src/components/SelectWorkspace.svelte
+++ b/plugins/login-resources/src/components/SelectWorkspace.svelte
@@ -40,7 +40,8 @@
     getWorkspaces,
     goTo,
     navigateToWorkspace,
-    selectWorkspace
+    selectWorkspace,
+    getAccountDisplayName
   } from '../utils'
   import StatusControl from './StatusControl.svelte'
 
@@ -129,8 +130,8 @@
 <form class="container" style:padding={$deviceInfo.docWidth <= 480 ? '1.25rem' : '5rem'}>
   <div class="grow-separator" />
   <div class="fs-title">
-    {#if account?.account}
-      {account.account}
+    {#if account != null}
+      {getAccountDisplayName(account)}
     {:else}
       <Label label={login.string.LoadingAccount} />
     {/if}
diff --git a/plugins/login-resources/src/utils.ts b/plugins/login-resources/src/utils.ts
index 7c6ec4fccc..ae2eb9f288 100644
--- a/plugins/login-resources/src/utils.ts
+++ b/plugins/login-resources/src/utils.ts
@@ -21,7 +21,8 @@ import {
   type Doc,
   type Ref,
   type WorkspaceInfoWithStatus,
-  type WorkspaceUserOperation
+  type WorkspaceUserOperation,
+  parseSocialIdString
 } from '@hcengineering/core'
 import type { LoginInfo, OtpInfo, WorkspaceLoginInfo, AccountClient, RegionInfo } from '@hcengineering/account-client'
 import { getClient as getAccountClientRaw } from '@hcengineering/account-client'
@@ -900,3 +901,20 @@ export async function doLoginNavigate (
 export function isWorkspaceLoginInfo (info: WorkspaceLoginInfo | LoginInfo | null): info is WorkspaceLoginInfo {
   return (info as any)?.workspace !== undefined
 }
+
+export function getAccountDisplayName (loginInfo: LoginInfo | null): string {
+  if (loginInfo == null) {
+    return ''
+  }
+
+  if (loginInfo.name != null) {
+    return loginInfo.name
+  }
+
+  if (loginInfo.socialId != null) {
+    const { value } = parseSocialIdString(loginInfo.socialId)
+    return value
+  }
+
+  return loginInfo.account
+}
diff --git a/server/account/src/operations.ts b/server/account/src/operations.ts
index c842d76fc5..955a3e2a1b 100644
--- a/server/account/src/operations.ts
+++ b/server/account/src/operations.ts
@@ -32,7 +32,8 @@ import {
   type WorkspaceMemberInfo,
   type WorkspaceMode,
   type WorkspaceUuid,
-  type PersonId
+  type PersonId,
+  buildSocialIdString
 } from '@hcengineering/core'
 import platform, {
   getMetadata,
@@ -89,7 +90,8 @@ import {
   signUpByEmail,
   verifyPassword,
   wrap,
-  verifyAllowedServices
+  verifyAllowedServices,
+  getPersonName
 } from './utils'
 import { isAdminEmail } from './admin'
 
@@ -125,6 +127,11 @@ export async function login (
       throw new PlatformError(new Status(Severity.ERROR, platform.status.AccountNotFound, {}))
     }
 
+    const person = await db.person.findOne({ uuid: emailSocialId.personUuid })
+    if (person == null) {
+      throw new PlatformError(new Status(Severity.ERROR, platform.status.InternalServerError, {}))
+    }
+
     if (!verifyPassword(password, existingAccount.hash, existingAccount.salt)) {
       throw new PlatformError(new Status(Severity.ERROR, platform.status.AccountNotFound, {}))
     }
@@ -136,7 +143,9 @@ export async function login (
 
     return {
       account: existingAccount.uuid,
-      token: isConfirmed ? generateToken(existingAccount.uuid, undefined, extraToken) : undefined
+      token: isConfirmed ? generateToken(existingAccount.uuid, undefined, extraToken) : undefined,
+      name: getPersonName(person),
+      socialId: emailSocialId.key
     }
   } catch (err: any) {
     Analytics.handleError(err)
@@ -185,6 +194,10 @@ export async function signUp (
   lastName: string
 ): Promise<LoginInfo> {
   const account = await signUpByEmail(ctx, db, branding, email, password, firstName, lastName)
+  const person = await db.person.findOne({ uuid: account })
+  if (person == null) {
+    throw new PlatformError(new Status(Severity.ERROR, platform.status.InternalServerError, {}))
+  }
 
   const sesURL = getMetadata(accountPlugin.metadata.SES_URL)
   const forceConfirmation = sesURL !== undefined && sesURL !== ''
@@ -199,6 +212,8 @@ export async function signUp (
 
   return {
     account,
+    name: getPersonName(person),
+    socialId: buildSocialIdString({ type: SocialIdType.EMAIL, value: email }),
     token: !forceConfirmation ? generateToken(account) : undefined
   }
 }
@@ -277,8 +292,15 @@ export async function validateOtp (
     ctx.info('OTP login success', emailSocialId)
   }
 
+  const person = await db.person.findOne({ uuid: emailSocialId.personUuid })
+  if (person == null) {
+    throw new PlatformError(new Status(Severity.ERROR, platform.status.InternalServerError, {}))
+  }
+
   return {
     account: emailSocialId.personUuid,
+    name: getPersonName(person),
+    socialId: emailSocialId.key,
     token: generateToken(emailSocialId.personUuid)
   }
 }
@@ -308,8 +330,15 @@ export async function createWorkspace (
 
   ctx.info('Creating workspace record done', { workspaceName, region, account: socialId.personUuid })
 
+  const person = await db.person.findOne({ uuid: socialId.personUuid })
+  if (person == null) {
+    throw new PlatformError(new Status(Severity.ERROR, platform.status.InternalServerError, {}))
+  }
+
   return {
     account,
+    socialId: socialId.key,
+    name: getPersonName(person),
     token: generateToken(account, workspaceUuid),
     endpoint: getEndpoint(ctx, workspaceUuid, region, EndpointKind.External),
     workspace: workspaceUuid,
@@ -535,8 +564,15 @@ export async function confirm (
 
   await confirmEmail(ctx, db, account, email)
 
+  const person = await db.person.findOne({ uuid: account })
+  if (person == null) {
+    throw new PlatformError(new Status(Severity.ERROR, platform.status.InternalServerError, {}))
+  }
+
   const result = {
     account,
+    name: getPersonName(person),
+    socialId: buildSocialIdString({ type: SocialIdType.EMAIL, value: email }),
     token: generateToken(account)
   }
 
@@ -696,8 +732,14 @@ export async function leaveWorkspace (
   ctx.info('Account removed from workspace', { targetAccount, workspace })
 
   if (account === targetAccount) {
+    const person = await db.person.findOne({ uuid: account })
+    if (person == null) {
+      throw new PlatformError(new Status(Severity.ERROR, platform.status.InternalServerError, {}))
+    }
+
     return {
       account,
+      name: getPersonName(person),
       token: generateToken(account, undefined)
     }
   }
@@ -973,11 +1015,11 @@ export async function getLoginInfoByToken (
 
   const isDocGuest = accountUuid === GUEST_ACCOUNT && extra?.guest === 'true'
   const isSystem = accountUuid === systemAccountUuid
+  let socialId: SocialId | null = null
 
   if (!isDocGuest && !isSystem) {
     // Any confirmed social ID will do
-    const socialId = await db.socialId.findOne({ personUuid: accountUuid, verifiedOn: { $gt: 0 } })
-
+    socialId = await db.socialId.findOne({ personUuid: accountUuid, verifiedOn: { $gt: 0 } })
     if (socialId == null) {
       return {
         account: accountUuid
@@ -985,8 +1027,31 @@ export async function getLoginInfoByToken (
     }
   }
 
+  let person: Person | null
+  if (isDocGuest) {
+    person = {
+      uuid: accountUuid,
+      firstName: 'Guest',
+      lastName: 'User'
+    }
+  } else if (isSystem) {
+    person = {
+      uuid: accountUuid,
+      firstName: 'System',
+      lastName: 'User'
+    }
+  } else {
+    person = await db.person.findOne({ uuid: accountUuid })
+  }
+
+  if (person == null) {
+    throw new PlatformError(new Status(Severity.ERROR, platform.status.InternalServerError, {}))
+  }
+
   const loginInfo = {
     account: accountUuid,
+    name: getPersonName(person),
+    socialId: socialId?.key,
     token
   }
 
@@ -1080,7 +1145,7 @@ export async function getPersonInfo (
 
   return {
     personUuid: account,
-    name: `${person?.firstName} ${person?.lastName}`, // Should we control the order by config?
+    name: getPersonName(person),
     socialIds: verifiedSocialIds.map((it) => it.key)
   }
 }
diff --git a/server/account/src/types.ts b/server/account/src/types.ts
index 53692facd7..65b284b8c0 100644
--- a/server/account/src/types.ts
+++ b/server/account/src/types.ts
@@ -227,6 +227,8 @@ export type WorkspaceEvent =
 export type WorkspaceOperation = 'create' | 'upgrade' | 'all' | 'all+backup'
 export interface LoginInfo {
   account: PersonUuid
+  name?: string
+  socialId?: PersonId
   token?: string
 }
 
diff --git a/server/account/src/utils.ts b/server/account/src/utils.ts
index ceb08465d7..7b098f5d01 100644
--- a/server/account/src/utils.ts
+++ b/server/account/src/utils.ts
@@ -28,7 +28,9 @@ import {
   type WorkspaceInfoWithStatus as WorkspaceInfoWithStatusCore,
   isActiveMode,
   type PersonUuid,
-  type PersonId
+  type PersonId,
+  type Person,
+  buildSocialIdString
 } from '@hcengineering/core'
 import { getMongoClient } from '@hcengineering/mongo' // TODO: get rid of this import later
 import platform, { getMetadata, PlatformError, Severity, Status, translate } from '@hcengineering/platform'
@@ -563,6 +565,11 @@ export async function selectWorkspace (
     }
   }
 
+  const person = await db.person.findOne({ uuid: accountUuid })
+  if (person == null) {
+    throw new PlatformError(new Status(Severity.ERROR, platform.status.InternalServerError, {}))
+  }
+
   return {
     account: accountUuid,
     token: generateToken(accountUuid, workspace.uuid, extra),
@@ -970,6 +977,12 @@ export async function loginOrSignUpWithProvider (
     throw new PlatformError(new Status(Severity.ERROR, platform.status.InternalServerError, {}))
   }
 
+  const person = await db.person.findOne({ uuid: personUuid })
+
+  if (person == null) {
+    throw new PlatformError(new Status(Severity.ERROR, platform.status.InternalServerError, {}))
+  }
+
   const account = await db.account.findOne({ uuid: personUuid })
 
   if (account == null) {
@@ -1011,6 +1024,8 @@ export async function loginOrSignUpWithProvider (
 
   return {
     account: personUuid,
+    socialId: buildSocialIdString(socialId),
+    name: getPersonName(person),
     token: generateToken(personUuid)
   }
 }
@@ -1119,3 +1134,8 @@ export function verifyAllowedServices (services: string[], extra: any): void {
     throw new PlatformError(new Status(Severity.ERROR, platform.status.Forbidden, {}))
   }
 }
+
+export function getPersonName (person: Person): string {
+  // Should we control the order by config?
+  return `${person.firstName} ${person.lastName}`
+}

From a1bf0769774b335af1df94e05a01f3c905fdcd07 Mon Sep 17 00:00:00 2001
From: Alexey Zinoviev <alexey.zinoviev@xored.com>
Date: Mon, 17 Feb 2025 17:44:23 +0400
Subject: [PATCH 12/13] uberf-9428: migrate accounts with multiple active
 services (#8027)

Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com>
---
 server/account-service/src/index.ts           |  1 +
 .../src/migration/migration.ts                | 32 +++++++++++++++++--
 server/account-service/src/migration/types.ts |  1 +
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/server/account-service/src/index.ts b/server/account-service/src/index.ts
index 268b663bc3..c5aa2c79f8 100644
--- a/server/account-service/src/index.ts
+++ b/server/account-service/src/index.ts
@@ -102,6 +102,7 @@ export function serveAccount (measureCtx: MeasureContext, brandings: BrandingMap
   const migrations = accountsDb.then(async ([db]) => {
     if (oldAccsUrl !== undefined) {
       await migrateFromOldAccounts(oldAccsUrl, db)
+      console.log('Migrations verified/done')
     }
   })
 
diff --git a/server/account-service/src/migration/migration.ts b/server/account-service/src/migration/migration.ts
index d29c515d6c..c1110fde82 100644
--- a/server/account-service/src/migration/migration.ts
+++ b/server/account-service/src/migration/migration.ts
@@ -23,18 +23,41 @@ import {
 import { type AccountDB, createAccount } from '@hcengineering/account'
 import { getMongoAccountDB } from './utils'
 import { type Account as OldAccount, type Workspace as OldWorkspace } from './types'
+import { type MongoAccountDB } from './collections/mongo'
+
+async function shouldMigrate (oldAccountDb: MongoAccountDB, migrationKey: string): Promise<boolean> {
+  while (true) {
+    const migration = await oldAccountDb.migration.findOne({ key: migrationKey })
+    if (migration?.completed === true) {
+      return false
+    }
+
+    if (migration?.lastProcessedTime === undefined || Date.now() - migration.lastProcessedTime > 1000 * 15) {
+      return true
+    }
+
+    console.log('Migration of accounts database from old accounts is still in progress, waiting...')
+    await new Promise((resolve) => setTimeout(resolve, 5000))
+  }
+}
 
 export async function migrateFromOldAccounts (oldAccsUrl: string, accountDB: AccountDB): Promise<void> {
   const migrationKey = 'migrate-from-old-accounts'
   // Check if old accounts exist
   const [oldAccountDb, closeOldDb] = await getMongoAccountDB(oldAccsUrl)
+  let processingHandle
 
   try {
-    const migration = await oldAccountDb.migration.findOne({ key: migrationKey })
-    if (migration?.completed === true) {
+    if (!(await shouldMigrate(oldAccountDb, migrationKey))) {
       return
     }
 
+    await oldAccountDb.migration.insertOne({ key: migrationKey, completed: false, lastProcessedTime: Date.now() })
+
+    processingHandle = setInterval(() => {
+      void oldAccountDb.migration.updateOne({ key: migrationKey }, { lastProcessedTime: Date.now() })
+    }, 1000 * 5)
+
     // Mapping between <ObjectId, UUID>
     const accountsIdToUuid: Record<string, PersonUuid> = {}
     // Mapping between <email, UUID>
@@ -131,9 +154,12 @@ export async function migrateFromOldAccounts (oldAccsUrl: string, accountDB: Acc
     }
 
     console.log('Total invites processed:', invitesProcessed)
-    await oldAccountDb.migration.insertOne({ key: migrationKey, completed: true })
+    await oldAccountDb.migration.updateOne({ key: migrationKey }, { completed: true })
     console.log('Migration of accounts database from old accounts COMPLETED')
   } finally {
+    if (processingHandle !== undefined) {
+      clearTimeout(processingHandle)
+    }
     closeOldDb()
   }
 }
diff --git a/server/account-service/src/migration/types.ts b/server/account-service/src/migration/types.ts
index 86200c47e4..c1e99792de 100644
--- a/server/account-service/src/migration/types.ts
+++ b/server/account-service/src/migration/types.ts
@@ -174,6 +174,7 @@ export interface UpgradeStatistic {
 export interface Migration {
   key: string
   completed: boolean
+  lastProcessedTime: number
 }
 
 interface Operator<T, P extends keyof T> {

From 8022d642b415e38430f202817bb7d9add1a6326e Mon Sep 17 00:00:00 2001
From: Alexey Zinoviev <alexey.zinoviev@xored.com>
Date: Mon, 17 Feb 2025 18:13:38 +0400
Subject: [PATCH 13/13] uberf-9451: drop old tokens from local storage (#8028)

Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com>
---
 desktop/src/ui/index.ts                                  | 4 ++--
 plugins/guest-resources/src/connect.ts                   | 4 ++--
 plugins/guest-resources/src/utils.ts                     | 2 +-
 plugins/login-resources/src/components/LoginApp.svelte   | 2 +-
 plugins/login-resources/src/utils.ts                     | 6 +++---
 plugins/login/src/index.ts                               | 2 +-
 plugins/setting-resources/src/components/Settings.svelte | 4 ++--
 plugins/workbench-resources/src/connect.ts               | 8 ++++----
 plugins/workbench-resources/src/utils.ts                 | 4 ++--
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/desktop/src/ui/index.ts b/desktop/src/ui/index.ts
index ecb4675626..2658d01ea9 100644
--- a/desktop/src/ui/index.ts
+++ b/desktop/src/ui/index.ts
@@ -58,12 +58,12 @@ window.addEventListener('DOMContentLoaded', () => {
   })
 
   ipcMain.on('logout', () => {
-    const tokens = fetchMetadataLocalStorage(login.metadata.LoginTokens)
+    const tokens = fetchMetadataLocalStorage(login.metadata.LoginTokensV2)
     if (tokens !== null) {
       const loc = getCurrentLocation()
       // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
       delete tokens[loc.path[1]]
-      setMetadataLocalStorage(login.metadata.LoginTokens, tokens)
+      setMetadataLocalStorage(login.metadata.LoginTokensV2, tokens)
     }
     setMetadata(presentation.metadata.Token, null)
     setMetadataLocalStorage(login.metadata.LastToken, null)
diff --git a/plugins/guest-resources/src/connect.ts b/plugins/guest-resources/src/connect.ts
index 2d6178c3a6..a6a099f126 100644
--- a/plugins/guest-resources/src/connect.ts
+++ b/plugins/guest-resources/src/connect.ts
@@ -242,12 +242,12 @@ export async function connect (title: string): Promise<Client | undefined> {
 }
 
 function clearMetadata (ws: string): void {
-  const tokens = fetchMetadataLocalStorage(login.metadata.LoginTokens)
+  const tokens = fetchMetadataLocalStorage(login.metadata.LoginTokensV2)
   if (tokens !== null) {
     const loc = getCurrentLocation()
     // eslint-disable-next-line
     delete tokens[loc.path[1]]
-    setMetadataLocalStorage(login.metadata.LoginTokens, tokens)
+    setMetadataLocalStorage(login.metadata.LoginTokensV2, tokens)
   }
   const currentWorkspace = getMetadata(presentation.metadata.WorkspaceUuid)
   if (currentWorkspace !== undefined) {
diff --git a/plugins/guest-resources/src/utils.ts b/plugins/guest-resources/src/utils.ts
index ece1ad820b..7c98303d1c 100644
--- a/plugins/guest-resources/src/utils.ts
+++ b/plugins/guest-resources/src/utils.ts
@@ -11,7 +11,7 @@ import { workbenchId } from '@hcengineering/workbench'
 export async function checkAccess (doc: Doc): Promise<void> {
   const loc = getCurrentLocation()
   const ws = loc.path[1]
-  const tokens: Record<string, string> = fetchMetadataLocalStorage(login.metadata.LoginTokens) ?? {}
+  const tokens: Record<string, string> = fetchMetadataLocalStorage(login.metadata.LoginTokensV2) ?? {}
   const token = tokens[ws]
   const endpoint = getMetadata(presentation.metadata.Endpoint)
   if (token === undefined || endpoint === undefined) return
diff --git a/plugins/login-resources/src/components/LoginApp.svelte b/plugins/login-resources/src/components/LoginApp.svelte
index 8ce2dc2d9b..442012091c 100644
--- a/plugins/login-resources/src/components/LoginApp.svelte
+++ b/plugins/login-resources/src/components/LoginApp.svelte
@@ -72,7 +72,7 @@
       'auth'
     ]
     if (token === undefined ? !allowedUnauthPages.includes(page) : !pages.includes(page)) {
-      const tokens = fetchMetadataLocalStorage(login.metadata.LoginTokens)
+      const tokens = fetchMetadataLocalStorage(login.metadata.LoginTokensV2)
       page = tokens != null ? 'login' : 'signup'
     }
 
diff --git a/plugins/login-resources/src/utils.ts b/plugins/login-resources/src/utils.ts
index ae2eb9f288..0096b66925 100644
--- a/plugins/login-resources/src/utils.ts
+++ b/plugins/login-resources/src/utils.ts
@@ -425,12 +425,12 @@ export async function getPerson (): Promise<[Status, Person | null]> {
 }
 
 export function setLoginInfo (loginInfo: WorkspaceLoginInfo): void {
-  const tokens: Record<string, string> = fetchMetadataLocalStorage(login.metadata.LoginTokens) ?? {}
+  const tokens: Record<string, string> = fetchMetadataLocalStorage(login.metadata.LoginTokensV2) ?? {}
   tokens[loginInfo.workspaceUrl] = loginInfo.token
 
   setMetadata(presentation.metadata.Token, loginInfo.token)
   setMetadataLocalStorage(login.metadata.LastToken, loginInfo.token)
-  setMetadataLocalStorage(login.metadata.LoginTokens, tokens)
+  setMetadataLocalStorage(login.metadata.LoginTokensV2, tokens)
   setMetadataLocalStorage(login.metadata.LoginEndpoint, loginInfo.endpoint)
   setMetadataLocalStorage(login.metadata.LoginAccount, loginInfo.account)
 }
@@ -473,7 +473,7 @@ export async function checkJoined (inviteId: string): Promise<[Status, Workspace
   let token = getMetadata(presentation.metadata.Token)
 
   if (token == null) {
-    const tokens: Record<string, string> = fetchMetadataLocalStorage(login.metadata.LoginTokens) ?? {}
+    const tokens: Record<string, string> = fetchMetadataLocalStorage(login.metadata.LoginTokensV2) ?? {}
     token = Object.values(tokens)[0]
     if (token == null) {
       return [unknownStatus('Please login'), null]
diff --git a/plugins/login/src/index.ts b/plugins/login/src/index.ts
index 9e534316be..70fec87e28 100644
--- a/plugins/login/src/index.ts
+++ b/plugins/login/src/index.ts
@@ -29,7 +29,7 @@ export const loginId = 'login' as Plugin
 export default plugin(loginId, {
   metadata: {
     AccountsUrl: '' as Asset,
-    LoginTokens: '' as Metadata<Record<string, string>>,
+    LoginTokensV2: '' as Metadata<Record<string, string>>,
     LastToken: '' as Metadata<string>,
     LoginEndpoint: '' as Metadata<string>,
     LoginAccount: '' as Metadata<string>,
diff --git a/plugins/setting-resources/src/components/Settings.svelte b/plugins/setting-resources/src/components/Settings.svelte
index dcfc7d48f5..94e6b2c348 100644
--- a/plugins/setting-resources/src/components/Settings.svelte
+++ b/plugins/setting-resources/src/components/Settings.svelte
@@ -99,12 +99,12 @@
     navigate(loc)
   }
   function signOut (): void {
-    const tokens = fetchMetadataLocalStorage(login.metadata.LoginTokens)
+    const tokens = fetchMetadataLocalStorage(login.metadata.LoginTokensV2)
     if (tokens !== null) {
       const loc = getCurrentResolvedLocation()
       // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
       delete tokens[loc.path[1]]
-      setMetadataLocalStorage(login.metadata.LoginTokens, tokens)
+      setMetadataLocalStorage(login.metadata.LoginTokensV2, tokens)
     }
     setMetadata(presentation.metadata.Token, null)
     setMetadataLocalStorage(login.metadata.LastToken, null)
diff --git a/plugins/workbench-resources/src/connect.ts b/plugins/workbench-resources/src/connect.ts
index 2d019951d2..60f6e3bb39 100644
--- a/plugins/workbench-resources/src/connect.ts
+++ b/plugins/workbench-resources/src/connect.ts
@@ -77,7 +77,7 @@ export async function connect (title: string): Promise<Client | undefined> {
       return
     }
   }
-  const tokens: Record<string, string> = fetchMetadataLocalStorage(login.metadata.LoginTokens) ?? {}
+  const tokens: Record<string, string> = fetchMetadataLocalStorage(login.metadata.LoginTokensV2) ?? {}
   let token = tokens[wsUrl]
 
   const selectWorkspace = await getResource(login.function.SelectWorkspace)
@@ -101,7 +101,7 @@ export async function connect (title: string): Promise<Client | undefined> {
 
   tokens[wsUrl] = workspaceLoginInfo.token
   token = workspaceLoginInfo.token
-  setMetadataLocalStorage(login.metadata.LoginTokens, tokens)
+  setMetadataLocalStorage(login.metadata.LoginTokensV2, tokens)
   setMetadata(presentation.metadata.WorkspaceUuid, workspaceLoginInfo.workspace)
   setMetadata(presentation.metadata.WorkspaceDataId, workspaceLoginInfo.workspaceDataId)
   setMetadata(presentation.metadata.Endpoint, workspaceLoginInfo.endpoint)
@@ -434,12 +434,12 @@ async function getGlobalPerson (): Promise<GlobalPerson | undefined> {
 }
 
 export function clearMetadata (ws: string): void {
-  const tokens = fetchMetadataLocalStorage(login.metadata.LoginTokens)
+  const tokens = fetchMetadataLocalStorage(login.metadata.LoginTokensV2)
   if (tokens !== null) {
     const loc = getCurrentLocation()
     // eslint-disable-next-line
     delete tokens[loc.path[1]]
-    setMetadataLocalStorage(login.metadata.LoginTokens, tokens)
+    setMetadataLocalStorage(login.metadata.LoginTokensV2, tokens)
   }
   const currentWorkspace = getMetadata(presentation.metadata.WorkspaceUuid)
   if (currentWorkspace !== undefined) {
diff --git a/plugins/workbench-resources/src/utils.ts b/plugins/workbench-resources/src/utils.ts
index 2260c94a2d..9d2c774d0b 100644
--- a/plugins/workbench-resources/src/utils.ts
+++ b/plugins/workbench-resources/src/utils.ts
@@ -207,13 +207,13 @@ export async function buildNavModel (
 }
 
 export function signOut (): void {
-  const tokens = fetchMetadataLocalStorage(login.metadata.LoginTokens)
+  const tokens = fetchMetadataLocalStorage(login.metadata.LoginTokensV2)
   if (tokens !== null) {
     const loc = getCurrentLocation()
     const l = loc.path[1]
     // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
     delete tokens[l]
-    setMetadataLocalStorage(login.metadata.LoginTokens, tokens)
+    setMetadataLocalStorage(login.metadata.LoginTokensV2, tokens)
   }
   setMetadata(presentation.metadata.Token, null)
   setMetadataLocalStorage(login.metadata.LastToken, null)