From a5395bdaf9c39d42fe5d09253650bdd91b864076 Mon Sep 17 00:00:00 2001
From: Alexander Onnikov <Alexander.Onnikov@xored.com>
Date: Fri, 24 Oct 2025 17:01:02 +0700
Subject: [PATCH 1/4] fix: use proper method to fetch person by socialId

Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com>
---
 .../src/components/ChannelTypingInfo.svelte   | 28 +++++++++----------
 .../src/components/TypingPresenter.svelte     | 28 +++++++++----------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/plugins/chunter-resources/src/components/ChannelTypingInfo.svelte b/plugins/chunter-resources/src/components/ChannelTypingInfo.svelte
index 0353a40bd7d..1cbe484a3d5 100644
--- a/plugins/chunter-resources/src/components/ChannelTypingInfo.svelte
+++ b/plugins/chunter-resources/src/components/ChannelTypingInfo.svelte
@@ -15,8 +15,8 @@
 <script lang="ts">
   import chunter from '@hcengineering/chunter'
   import { type Doc, type PersonId, getCurrentAccount } from '@hcengineering/core'
-  import { getName, getPersonRefsBySocialIds } from '@hcengineering/contact'
-  import { getPersonsByPersonRefs } from '@hcengineering/contact-resources'
+  import { getName } from '@hcengineering/contact'
+  import { getPersonsByPersonIds } from '@hcengineering/contact-resources'
   import { IntlString } from '@hcengineering/platform'
   import { getClient } from '@hcengineering/presentation'
   import { Label } from '@hcengineering/ui'
@@ -26,7 +26,6 @@
 
   const maxTypingPersons = 3
   const acc = getCurrentAccount()
-  const client = getClient()
   const hierarchy = getClient().getHierarchy()
 
   interface TypingGroup {
@@ -58,21 +57,22 @@
     const groups: TypingGroup[] = []
 
     for (const [status, personIds] of groupedByStatus.entries()) {
-      const personRefs = await getPersonRefsBySocialIds(client, personIds)
-      const persons = await getPersonsByPersonRefs(Object.values(personRefs))
+      const persons = await getPersonsByPersonIds(personIds)
       const names = Array.from(persons.values())
         .map((person) => getName(hierarchy, person))
         .sort((name1, name2) => name1.localeCompare(name2))
 
-      const displayNames = names.slice(0, maxTypingPersons).join(', ')
-      const moreCount = Math.max(names.length - maxTypingPersons, 0)
-
-      groups.push({
-        status,
-        names: displayNames,
-        count: names.length,
-        moreCount
-      })
+      if (names.length > 0) {
+        const displayNames = names.slice(0, maxTypingPersons).join(', ')
+        const moreCount = Math.max(names.length - maxTypingPersons, 0)
+
+        groups.push({
+          status,
+          names: displayNames,
+          count: names.length,
+          moreCount
+        })
+      }
     }
 
     groups.sort((a, b) => a.status.localeCompare(b.status))
diff --git a/plugins/communication-resources/src/components/TypingPresenter.svelte b/plugins/communication-resources/src/components/TypingPresenter.svelte
index 3b62c922665..c770774eee0 100644
--- a/plugins/communication-resources/src/components/TypingPresenter.svelte
+++ b/plugins/communication-resources/src/components/TypingPresenter.svelte
@@ -14,8 +14,8 @@
 -->
 <script lang="ts">
   import { type PersonId, getCurrentAccount } from '@hcengineering/core'
-  import { getName, getPersonRefsBySocialIds } from '@hcengineering/contact'
-  import { getPersonsByPersonRefs } from '@hcengineering/contact-resources'
+  import { getName } from '@hcengineering/contact'
+  import { getPersonsByPersonIds } from '@hcengineering/contact-resources'
   import { IntlString } from '@hcengineering/platform'
   import { getClient } from '@hcengineering/presentation'
   import { Label } from '@hcengineering/ui'
@@ -28,7 +28,6 @@
 
   const maxTypingPersons = 3
   const acc = getCurrentAccount()
-  const client = getClient()
   const hierarchy = getClient().getHierarchy()
 
   interface TypingGroup {
@@ -60,21 +59,22 @@
     const groups: TypingGroup[] = []
 
     for (const [status, personIds] of groupedByStatus.entries()) {
-      const personRefs = await getPersonRefsBySocialIds(client, personIds)
-      const persons = await getPersonsByPersonRefs(Object.values(personRefs))
+      const persons = await getPersonsByPersonIds(personIds)
       const names = Array.from(persons.values())
         .map((person) => getName(hierarchy, person))
         .sort((name1, name2) => name1.localeCompare(name2))
 
-      const displayNames = names.slice(0, maxTypingPersons).join(', ')
-      const moreCount = Math.max(names.length - maxTypingPersons, 0)
-
-      groups.push({
-        status,
-        names: displayNames,
-        count: names.length,
-        moreCount
-      })
+      if (names.length > 0) {
+        const displayNames = names.slice(0, maxTypingPersons).join(', ')
+        const moreCount = Math.max(names.length - maxTypingPersons, 0)
+
+        groups.push({
+          status,
+          names: displayNames,
+          count: names.length,
+          moreCount
+        })
+      }
     }
 
     groups.sort((a, b) => a.status.localeCompare(b.status))

From e3dc6509d07c3924d5229b8c91ba64b96ba9d242 Mon Sep 17 00:00:00 2001
From: Alexander Onnikov <Alexander.Onnikov@xored.com>
Date: Fri, 24 Oct 2025 17:53:56 +0700
Subject: [PATCH 2/4] fix: connect pulse only once

Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com>
---
 packages/presentation/src/pulse.ts | 49 +++++++++++++++++++++++-------
 1 file changed, 38 insertions(+), 11 deletions(-)

diff --git a/packages/presentation/src/pulse.ts b/packages/presentation/src/pulse.ts
index 9dfc305900b..b9f637909fe 100644
--- a/packages/presentation/src/pulse.ts
+++ b/packages/presentation/src/pulse.ts
@@ -15,24 +15,51 @@ import { HulypulseClient } from '@hcengineering/hulypulse-client'
 import { getMetadata } from '@hcengineering/platform'
 import presentation from './plugin'
 
-let pulseClient: HulypulseClient | undefined
+let currentWorkspaceUuid: string | undefined
 let currentToken: string | undefined
+let promise: Promise<HulypulseClient | undefined> | undefined
 
 export async function createPulseClient (): Promise<HulypulseClient | undefined> {
-  const token = getMetadata(presentation.metadata.Token)
-  if (token !== currentToken) {
+  const pulseUrl = getMetadata(presentation.metadata.PulseUrl) ?? ''
+  const token = getMetadata(presentation.metadata.Token) ?? ''
+  const workspaceUuid = getMetadata(presentation.metadata.WorkspaceUuid) ?? ''
+
+  if (pulseUrl === '' || token === '' || workspaceUuid === '') {
+    return undefined
+  }
+
+  // Token or workspace changed, need to reconnect
+  if (token !== currentToken || workspaceUuid !== currentWorkspaceUuid) {
     closePulseClient()
   }
-  if (pulseClient === undefined) {
-    const wsPulseUrl = getMetadata(presentation.metadata.PulseUrl)
-    if (wsPulseUrl == null || wsPulseUrl.trim().length === 0) return undefined
-    pulseClient = await HulypulseClient.connect(`${wsPulseUrl}?token=${token}`)
-    currentToken = token
+
+  if (promise !== undefined) {
+    // eslint-disable-next-line @typescript-eslint/return-await
+    return promise
   }
-  return pulseClient
+
+  promise = new Promise((resolve) => {
+    HulypulseClient.connect(`${pulseUrl}?token=${token}`)
+      .catch(() => undefined)
+      .then(resolve)
+      .catch(() => {
+        resolve(undefined)
+      })
+  })
+  currentToken = token
+  currentWorkspaceUuid = workspaceUuid
+
+  // eslint-disable-next-line @typescript-eslint/return-await
+  return promise
 }
 
 export function closePulseClient (): void {
-  pulseClient?.close()
-  pulseClient = undefined
+  if (promise !== undefined) {
+    void promise.then((client) => {
+      client?.close()
+    })
+  }
+  promise = undefined
+  currentToken = undefined
+  currentWorkspaceUuid = undefined
 }

From 7fab3b963894b4aa3c78e0fa04406f96eba79097 Mon Sep 17 00:00:00 2001
From: Alexander Onnikov <Alexander.Onnikov@xored.com>
Date: Fri, 24 Oct 2025 17:54:19 +0700
Subject: [PATCH 3/4] fix: recreate root bar extensions on workspace change

Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com>
---
 .../internal/RootBarExtension.svelte          | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/packages/ui/src/components/internal/RootBarExtension.svelte b/packages/ui/src/components/internal/RootBarExtension.svelte
index baeb3b231dc..91c98a70536 100644
--- a/packages/ui/src/components/internal/RootBarExtension.svelte
+++ b/packages/ui/src/components/internal/RootBarExtension.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { location as locationStore } from '../../location'
+  import { location as locationStore, workspaceId } from '../../location'
   import { rootBarExtensions } from '../../utils'
   import Component from '../Component.svelte'
 
@@ -15,18 +15,20 @@
   $: sorted = $rootBarExtensions.sort((a, b) => a[1].order - b[1].order)
 </script>
 
-{#each sorted as ext (ext[1].id)}
-  {#if ext[0] === position}
-    <div id={ext[1].id} class="clear-mins">
-      <Component
-        is={ext[1].component}
-        props={ext[1].props}
-        on:close={() => {
-          rootBarExtensions.update((cur) => {
-            return cur.filter((it) => it[1].id !== ext[1].id)
-          })
-        }}
-      />
-    </div>
-  {/if}
-{/each}
+{#key $workspaceId}
+  {#each sorted as ext (ext[1].id)}
+    {#if ext[0] === position}
+      <div id={ext[1].id} class="clear-mins">
+        <Component
+          is={ext[1].component}
+          props={ext[1].props}
+          on:close={() => {
+            rootBarExtensions.update((cur) => {
+              return cur.filter((it) => it[1].id !== ext[1].id)
+            })
+          }}
+        />
+      </div>
+    {/if}
+  {/each}
+{/key}

From 914be2b73a87e25f88a1bbe9c895c289dd66f716 Mon Sep 17 00:00:00 2001
From: Alexander Onnikov <Alexander.Onnikov@xored.com>
Date: Fri, 24 Oct 2025 18:02:00 +0700
Subject: [PATCH 4/4] fix double catch

Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com>
---
 packages/presentation/src/pulse.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/presentation/src/pulse.ts b/packages/presentation/src/pulse.ts
index b9f637909fe..e0019da98fe 100644
--- a/packages/presentation/src/pulse.ts
+++ b/packages/presentation/src/pulse.ts
@@ -40,7 +40,6 @@ export async function createPulseClient (): Promise<HulypulseClient | undefined>
 
   promise = new Promise((resolve) => {
     HulypulseClient.connect(`${pulseUrl}?token=${token}`)
-      .catch(() => undefined)
       .then(resolve)
       .catch(() => {
         resolve(undefined)