@corva/chat-core 0.1.4 → 0.1.6

package/dist/index.d.ts

@@ -78,6 +78,7 @@ interface AskCorvaData {
     isTruncated?: boolean;
     assetId?: number;
     agentName?: string;
+    note?: string;
 }
 
 type ChatAssetType = 'rig' | 'frac_fleet' | 'intervention_unit';
@@ -165,6 +166,7 @@ interface AskCorvaWirePayload {
     trunc?: boolean;
     assetId?: number;
     agentName?: string;
+    n?: string;
 }
 /**
  * One attachment on the wire. Keys are single letters like every other field in these payloads:
@@ -580,6 +582,7 @@ interface User {
     roles?: string[];
     active?: boolean;
     isBot?: boolean;
+    nickname?: string;
     displayName?: string;
     displayAvatar?: string;
     email?: string;
@@ -764,7 +767,7 @@ interface ParsedCorvaMessage {
 /**
  * Builds the wire-format content string for an AskCorva response.
  */
-declare function buildAskCorvaMessageContent(requestId: string, answer: string, answerRef?: string, isTruncated?: boolean, assetId?: number, agentName?: string, companyId?: number): string;
+declare function buildAskCorvaMessageContent(requestId: string, answer: string, answerRef?: string, isTruncated?: boolean, assetId?: number, agentName?: string, companyId?: number, note?: string): string;
 /**
  * Builds the wire-format content string for a forwarded message.
  */
@@ -1170,6 +1173,8 @@ interface CorvaRevoltAuthResponse {
     revolt_user_id: string;
     revolt_company_server_id: string;
     revolt_channel_id: string;
+    revolt_channel_server_id?: string;
+    revolt_channel_company_id?: number;
     revolt_chat_channels?: AssetChatChannel[];
     chat_used?: boolean | null;
 }
@@ -1231,6 +1236,18 @@ declare function isValidPausePreset(value: unknown): value is PausePreset;
 
 declare function waitForNextPaint(): Promise<void>;
 
+/**
+ * Asset Chats API Module
+ *
+ * Fetches or creates a Revolt channel for a specific rig / frac fleet /
+ * intervention unit. The backend will return the associated revolt_channel_id.
+ */
+interface AssetChatSession {
+    channelId: string;
+    serverId: string | null;
+    companyId: number | null;
+}
+declare function getAssetChatSession(assetId: string, assetType: ChatAssetType): Promise<AssetChatSession>;
 declare function getAssetChatChannel(assetId: string, assetType: ChatAssetType): Promise<string>;
 
 type StoredCorvaUser = CorvaUser | CorvaAPIUser;
@@ -1280,9 +1297,14 @@ declare const sharedRefs: SharedRefs;
  */
 declare const initChat: () => void;
 
+interface ExternalChannel {
+    serverId: string;
+    companyId: number | null;
+}
 interface AuthStore {
     user: User | null;
     serverId: string | null;
+    externalChannels: Record<string, ExternalChannel>;
     isConnected: boolean;
     hasEverConnected: boolean;
     connectionGaveUp: boolean;
@@ -1292,6 +1314,7 @@ interface AuthStore {
     setConnected: (connected: boolean) => void;
     setHasEverConnected: (hasConnected: boolean) => void;
     addAssetChatChannel: (channel: AssetChatChannel) => void;
+    setChannelServer: (channelId: string, serverId: string | null, companyId: number | null) => void;
     markChatUsed: () => void;
     login: (credentials: LoginCredentials) => Promise<{
         success: boolean;
@@ -1310,6 +1333,8 @@ interface AuthStore {
 }
 declare function keepChatUsed(current: boolean | null, incoming: boolean | null | undefined): boolean | null;
 declare const authStore: zustand_vanilla.StoreApi<AuthStore>;
+declare const getExternalChannel: (roomId: string | null | undefined) => ExternalChannel | null;
+declare const isExternalServerChannel: (roomId: string | null | undefined) => boolean;
 /** @public */
 declare const resetAuthStore: () => void;
 
@@ -1697,4 +1722,4 @@ declare const createSocketEventHandlers: (config: SocketEventHandlersConfig) =>
 
 declare const installUnreadWatcher: () => void;
 
-export { ALERT_SEVERITY, ASSET_API_FIELDS, ASSET_CHAT_PREFIXES, ASSET_NOUN, type AckScheduler, type AlertData, type AlertSeverity, type AlertWirePayload, type AppCommentAttachment, type AppCommentData, type AppCommentWirePayload, type AppStateAdapter, type AskCorvaData, type AskCorvaWirePayload, type AssetChatChannel, type AssetStore, type Attachment, type AuthStore, CHANNEL_NAME_MAX_LENGTH, CHANNEL_TYPES, CORVA_MESSAGE_TYPES, CORVA_SYS_PREFIX, type ChannelAsset, type ChannelContentFilter, type ChannelContentFilterStore, type ChannelContentFilters, type ChannelNameValidation, type ChannelNotificationPreference, type ChannelNotificationSetting, type ChannelUnread, type ChatAsset, type ChatAssetIdentity, type ChatAssetType, type ChatDates, type ChatHost, type ChatNotifier, type ChatPlatform, type CorvaAPIUser, type CorvaApiAdapter, type CorvaRevoltAuthResponse, type CorvaSystemMessage, type CorvaUser, type CorvaUserService, DATE_SEPARATOR_LABELS, DEFAULT_CHANNEL_CONTENT_FILTER, DEFAULT_CHANNEL_CONTENT_FILTERS, DEFAULT_CHANNEL_PREFERENCE, DEFAULT_FAVORITE_ROOMS_SETTINGS, DEFAULT_HIDDEN_ROOMS_SETTINGS, DEFAULT_NOTIFICATION_PREFERENCES, DEFAULT_NOTIFICATION_SETTINGS, DEFAULT_ROOM_LIST_ORDER, DIRECT_MESSAGE_PLACEHOLDER, type FavoriteRoomsSettings, type FavoriteRoomsStore, type FeedItemData, type FeedWirePayload, type FileAttachment, type FilterEntityWindow, type ForwardWirePayload, type ForwardedFrom, GENERAL_CHAT_NAME, type HiddenRoomsSettings, type HttpClient, type HttpClientConfig, HttpError, type HttpRequestInit, type HttpResponseLike, type KeyValueStorage, type LocatorContext, type LoginCredentials, MAX_ATTACHMENT_SIZE_BYTES, MAX_ATTACHMENT_SIZE_MB, MAX_NAVIGATION_HISTORY, MENTION_REPLACE_PATTERN, MENTION_SPLIT_PATTERN, MUTE_PRESET_OPTIONS, type MemberStore, type Message, type MessageCache, type MessageFormData, type MessageStore, NOTIFICATION_DESTINATIONS, NOTIFICATION_SETTING_ALL, NOTIFICATION_SETTING_MENTIONS, NOTIFICATION_SETTING_NOTHING, type NavigationEntry, type NavigationHistoryStore, type NotificationDestination, type NotificationPreferences, type NotificationSettings, type NotificationStore, PAUSE_INDEFINITELY, PAUSE_PRESETS, PAUSE_PRESET_OPTIONS, type PausePreset, type PausePresetOption, REVOLT_SYSTEM_USER_ID, ROOM_LIST_ORDER, type ReadyChannelData, type RevoltAPIInstance, type RevoltChannel, type RevoltIncomingMessagePayload, type RevoltLoginResponse, type RevoltMessage, type RevoltMessageResponse, type RevoltSocketConfig, type RevoltSocketEventHandlers, type RevoltSocketInstance, type RevoltUploadResponse, type RevoltUserResponse, type Room, type RoomListOrder, type RoomStore, type RoomType, SESSION_STORAGE_KEY, SIDEBAR_SECTIONS, SIDEBAR_TABS, SOFT_DELETE_MARKER, SYSTEM_MESSAGE_TEXTS, type SaveSessionParams, type SelectableAssetType, type SessionData, SessionManager, type SharedFile, type SharedRefs, type SidebarSectionKey, type SidebarTabKey, type SocketCloseEventLike, type SocketEventHandlersConfig, type StoredChannelPreference, type Subscription, type TracesViewportRequest, type TypingManager, type UIStore, type UploadAndSendResult, type UploadFile, type UploadedFile, type User, type UserStatus, type ViewportDeepLink, type ViewportIndexCurve, type ViewportMode, WEBSOCKET_CONNECTING, WEBSOCKET_OPEN, type WebSocketLike, type WireSeverity, addMessage, addOrUpdateSubscription, alertMessageAsText, assetStore, authStore, buildAppCommentMessageContent, buildAskCorvaMessageContent, buildFinalMessage, buildForwardMessageContent, buildGroupChannelName, canDeleteMessage, canEditMessage, channelContentFilterStore, channelToAsset, chatToastStore, clearLastOpenedRoom, compareByActivity, compareByName, compareByRecencyDesc, configureChat, configureChatStorage, createAckScheduler, createCorvaUserService, createDMSubscription, createGroupSubscription, createHttpClient, createLatestWinsQueue, createMemoryStorage, createMessageCache, createRevoltAPI, createRevoltSocket, createRoomTaskQueue, createSocketEventHandlers, createSoftDeletedMessage, createTypingManager, deriveAllowedChatAsset, enrichWithCorvaData, ensureChatSession, extractTimestampFromULID, failOptimisticMessage, favoriteRoomsStore, findGeneralRoom, formatAssetChatName, getAppCommentAttachments, getAssetChatChannel, getAssetTypeFromDisplayName, getChatHost, getChatStorage, getCorvaUserFields, getLastOpenedRoom, getMessageTimestamp, getPauseUntil, getReactionCount, getRoomDisplayName, getSystemMessageWithCorvaNames, getUserDisplayName, getUserSecondaryText, handleUnauthorized, hasReactions, hasUserReacted, initChat, installUnreadWatcher, isAlertMessage, isAppCommentMessage, isAskCorvaMessage, isChannelMuted, isChatAssetTypeAllowed, isChatStorageConfigured, isCurrentRoomSelection, isDeepEqual, isDefaultChannelPreference, isDisallowedAssetChatRoom, isDmGroup, isForwardedMessage, isGeneralRoom, isNotificationsPaused, isPauseActive, isSoftDeletedMessage, isSystemMessage, isUnread, isUserOnline, isValidPausePreset, isVisibleUnread, keepChatUsed, loadUntilFound, memberStore, messageStore, navigationHistoryStore, notificationStore, onChatStorageConfigured, parseCorvaSystemMessage, prepareRoomSelection, removeMessageFromList, removeSubscription, resetAssetStore, resetAuthStore, resetChannelContentFilterStore, resetChatAssetPermissionsSnapshot, resetChatHost, resetFavoriteRoomsStore, resetMemberStore, resetMessageStore, resetNavigationHistoryStore, resetNotificationStore, resetRoomStore, resetUIStore, roomStore, saveLastChatActivity, saveLastOpenedRoom, searchMessages, searchRooms, searchUsers, selectCanGoBack, selectCanGoForward, setAllowedChatAssetTypes, settleOptimisticMessage, sharedRefs, sortChannels, sortDMs, sortMessagesByTime, sortUsersByStatus, stripPlatformMentions, uiStore, updateMessageInList, uploadAndSend, validateChannelName, waitForNextPaint, wasRecentlyActive, withChannelPreferenceDefaults };
+export { ALERT_SEVERITY, ASSET_API_FIELDS, ASSET_CHAT_PREFIXES, ASSET_NOUN, type AckScheduler, type AlertData, type AlertSeverity, type AlertWirePayload, type AppCommentAttachment, type AppCommentData, type AppCommentWirePayload, type AppStateAdapter, type AskCorvaData, type AskCorvaWirePayload, type AssetChatChannel, type AssetChatSession, type AssetStore, type Attachment, type AuthStore, CHANNEL_NAME_MAX_LENGTH, CHANNEL_TYPES, CORVA_MESSAGE_TYPES, CORVA_SYS_PREFIX, type ChannelAsset, type ChannelContentFilter, type ChannelContentFilterStore, type ChannelContentFilters, type ChannelNameValidation, type ChannelNotificationPreference, type ChannelNotificationSetting, type ChannelUnread, type ChatAsset, type ChatAssetIdentity, type ChatAssetType, type ChatDates, type ChatHost, type ChatNotifier, type ChatPlatform, type CorvaAPIUser, type CorvaApiAdapter, type CorvaRevoltAuthResponse, type CorvaSystemMessage, type CorvaUser, type CorvaUserService, DATE_SEPARATOR_LABELS, DEFAULT_CHANNEL_CONTENT_FILTER, DEFAULT_CHANNEL_CONTENT_FILTERS, DEFAULT_CHANNEL_PREFERENCE, DEFAULT_FAVORITE_ROOMS_SETTINGS, DEFAULT_HIDDEN_ROOMS_SETTINGS, DEFAULT_NOTIFICATION_PREFERENCES, DEFAULT_NOTIFICATION_SETTINGS, DEFAULT_ROOM_LIST_ORDER, DIRECT_MESSAGE_PLACEHOLDER, type ExternalChannel, type FavoriteRoomsSettings, type FavoriteRoomsStore, type FeedItemData, type FeedWirePayload, type FileAttachment, type FilterEntityWindow, type ForwardWirePayload, type ForwardedFrom, GENERAL_CHAT_NAME, type HiddenRoomsSettings, type HttpClient, type HttpClientConfig, HttpError, type HttpRequestInit, type HttpResponseLike, type KeyValueStorage, type LocatorContext, type LoginCredentials, MAX_ATTACHMENT_SIZE_BYTES, MAX_ATTACHMENT_SIZE_MB, MAX_NAVIGATION_HISTORY, MENTION_REPLACE_PATTERN, MENTION_SPLIT_PATTERN, MUTE_PRESET_OPTIONS, type MemberStore, type Message, type MessageCache, type MessageFormData, type MessageStore, NOTIFICATION_DESTINATIONS, NOTIFICATION_SETTING_ALL, NOTIFICATION_SETTING_MENTIONS, NOTIFICATION_SETTING_NOTHING, type NavigationEntry, type NavigationHistoryStore, type NotificationDestination, type NotificationPreferences, type NotificationSettings, type NotificationStore, PAUSE_INDEFINITELY, PAUSE_PRESETS, PAUSE_PRESET_OPTIONS, type PausePreset, type PausePresetOption, REVOLT_SYSTEM_USER_ID, ROOM_LIST_ORDER, type ReadyChannelData, type RevoltAPIInstance, type RevoltChannel, type RevoltIncomingMessagePayload, type RevoltLoginResponse, type RevoltMessage, type RevoltMessageResponse, type RevoltSocketConfig, type RevoltSocketEventHandlers, type RevoltSocketInstance, type RevoltUploadResponse, type RevoltUserResponse, type Room, type RoomListOrder, type RoomStore, type RoomType, SESSION_STORAGE_KEY, SIDEBAR_SECTIONS, SIDEBAR_TABS, SOFT_DELETE_MARKER, SYSTEM_MESSAGE_TEXTS, type SaveSessionParams, type SelectableAssetType, type SessionData, SessionManager, type SharedFile, type SharedRefs, type SidebarSectionKey, type SidebarTabKey, type SocketCloseEventLike, type SocketEventHandlersConfig, type StoredChannelPreference, type Subscription, type TracesViewportRequest, type TypingManager, type UIStore, type UploadAndSendResult, type UploadFile, type UploadedFile, type User, type UserStatus, type ViewportDeepLink, type ViewportIndexCurve, type ViewportMode, WEBSOCKET_CONNECTING, WEBSOCKET_OPEN, type WebSocketLike, type WireSeverity, addMessage, addOrUpdateSubscription, alertMessageAsText, assetStore, authStore, buildAppCommentMessageContent, buildAskCorvaMessageContent, buildFinalMessage, buildForwardMessageContent, buildGroupChannelName, canDeleteMessage, canEditMessage, channelContentFilterStore, channelToAsset, chatToastStore, clearLastOpenedRoom, compareByActivity, compareByName, compareByRecencyDesc, configureChat, configureChatStorage, createAckScheduler, createCorvaUserService, createDMSubscription, createGroupSubscription, createHttpClient, createLatestWinsQueue, createMemoryStorage, createMessageCache, createRevoltAPI, createRevoltSocket, createRoomTaskQueue, createSocketEventHandlers, createSoftDeletedMessage, createTypingManager, deriveAllowedChatAsset, enrichWithCorvaData, ensureChatSession, extractTimestampFromULID, failOptimisticMessage, favoriteRoomsStore, findGeneralRoom, formatAssetChatName, getAppCommentAttachments, getAssetChatChannel, getAssetChatSession, getAssetTypeFromDisplayName, getChatHost, getChatStorage, getCorvaUserFields, getExternalChannel, getLastOpenedRoom, getMessageTimestamp, getPauseUntil, getReactionCount, getRoomDisplayName, getSystemMessageWithCorvaNames, getUserDisplayName, getUserSecondaryText, handleUnauthorized, hasReactions, hasUserReacted, initChat, installUnreadWatcher, isAlertMessage, isAppCommentMessage, isAskCorvaMessage, isChannelMuted, isChatAssetTypeAllowed, isChatStorageConfigured, isCurrentRoomSelection, isDeepEqual, isDefaultChannelPreference, isDisallowedAssetChatRoom, isDmGroup, isExternalServerChannel, isForwardedMessage, isGeneralRoom, isNotificationsPaused, isPauseActive, isSoftDeletedMessage, isSystemMessage, isUnread, isUserOnline, isValidPausePreset, isVisibleUnread, keepChatUsed, loadUntilFound, memberStore, messageStore, navigationHistoryStore, notificationStore, onChatStorageConfigured, parseCorvaSystemMessage, prepareRoomSelection, removeMessageFromList, removeSubscription, resetAssetStore, resetAuthStore, resetChannelContentFilterStore, resetChatAssetPermissionsSnapshot, resetChatHost, resetFavoriteRoomsStore, resetMemberStore, resetMessageStore, resetNavigationHistoryStore, resetNotificationStore, resetRoomStore, resetUIStore, roomStore, saveLastChatActivity, saveLastOpenedRoom, searchMessages, searchRooms, searchUsers, selectCanGoBack, selectCanGoForward, setAllowedChatAssetTypes, settleOptimisticMessage, sharedRefs, sortChannels, sortDMs, sortMessagesByTime, sortUsersByStatus, stripPlatformMentions, uiStore, updateMessageInList, uploadAndSend, validateChannelName, waitForNextPaint, wasRecentlyActive, withChannelPreferenceDefaults };

package/dist/index.js

@@ -307,7 +307,7 @@ var getUserSecondaryText = (user) => {
   }
   if (email) return email;
   if (titleOrRole) return titleOrRole;
-  if (user.username) return `@${user.username}`;
+  if (user.username && !user.nickname) return `@${user.username}`;
   return void 0;
 };
 
@@ -419,7 +419,8 @@ function mapAskCorvaPayload(d) {
     companyId: d.cId,
     isTruncated: d.trunc,
     assetId: d.assetId,
-    agentName: d.agentName
+    agentName: d.agentName,
+    note: d.n || void 0
   };
 }
 function mapForwardPayload(d) {
@@ -450,7 +451,7 @@ function mapAppCommentPayload(d) {
     isTruncated: d.trunc
   };
 }
-function buildAskCorvaMessageContent(requestId, answer, answerRef, isTruncated, assetId, agentName, companyId) {
+function buildAskCorvaMessageContent(requestId, answer, answerRef, isTruncated, assetId, agentName, companyId, note) {
   const payload = {
     id: requestId,
     a: answerRef ? "" : answer,
@@ -458,7 +459,8 @@ function buildAskCorvaMessageContent(requestId, answer, answerRef, isTruncated,
     ...answerRef && companyId && { cId: companyId },
     ...isTruncated && { trunc: true },
     ...assetId && { assetId },
-    ...agentName && { agentName }
+    ...agentName && { agentName },
+    ...note?.trim() && { n: note.trim() }
   };
   return `${CORVA_SYS_PREFIX}${JSON.stringify({ t: CORVA_MESSAGE_TYPES.ASK_CORVA, v: 1, d: payload })}`;
 }
@@ -563,7 +565,7 @@ function enrichWithCorvaData(message) {
   if (!parsed) return message;
   return {
     ...message,
-    msg: parsed.forwardedFrom?.note || "",
+    msg: parsed.forwardedFrom?.note || parsed.askCorva?.note || "",
     t: parsed.messageType,
     alert: parsed.alert,
     feedItem: parsed.feedItem,
@@ -1647,11 +1649,15 @@ function createGroupsAPI(http) {
   async function getServerMembers(serverId) {
     try {
       const response = await http.request(`/servers/${serverId}/members`);
+      const nicknames = new Map(
+        (response?.members || []).map((m) => [m._id.user, m.nickname || void 0])
+      );
       const users = response?.users || [];
       return users.map((member) => ({
         _id: member._id,
         username: member.username,
         name: member.display_name || member.username,
+        nickname: nicknames.get(member._id),
         status: member.online ? "online" : "offline",
         isBot: !!member.bot
       }));
@@ -2982,7 +2988,7 @@ var ASSET_ID_PARAM = {
   frac_fleet: "frac_fleet_id",
   intervention_unit: "intervention_unit_id"
 };
-async function getAssetChatChannel(assetId, assetType) {
+async function getAssetChatSession(assetId, assetType) {
   if (!assetId || Number.isNaN(Number(assetId))) {
     throw new Error("Asset ID is required");
   }
@@ -2994,7 +3000,15 @@ async function getAssetChatChannel(assetId, assetType) {
   if (!response?.revolt_channel_id) {
     throw new Error("No revolt_channel_id returned from asset chat API");
   }
-  return response.revolt_channel_id;
+  return {
+    channelId: response.revolt_channel_id,
+    serverId: response.revolt_channel_server_id ?? null,
+    companyId: response.revolt_channel_company_id ?? null
+  };
+}
+async function getAssetChatChannel(assetId, assetType) {
+  const { channelId } = await getAssetChatSession(assetId, assetType);
+  return channelId;
 }
 
 // src/services/corvaUserService.ts
@@ -3026,6 +3040,9 @@ function createCorvaUserService() {
     enrichUser(user) {
       const corvaUser = revoltToCorva.get(user._id);
       if (!corvaUser) {
+        if (user.nickname) {
+          return { ...user, displayName: user.nickname, displayAvatar: void 0 };
+        }
         return {
           ...user,
           displayName: user.name || user.username || "Unknown User",
@@ -3276,6 +3293,8 @@ var invalidateVisibleUsers = () => {
   visibleUsersGeneration += 1;
   visibleUsersRequest = null;
 };
+var syncedExternalCompanies = /* @__PURE__ */ new Set();
+var ownCompanyId = null;
 var seedSocketUsers = (members) => {
   sharedRefs.socket?.seedUsers(members);
   sharedRefs.api?.seedUserCache(members);
@@ -3390,7 +3409,25 @@ var memberStore = createStore()((set, get) => ({
     const { api } = sharedRefs;
     if (!api) return;
     const { serverId } = authStore.getState();
+    const external = getExternalChannel(roomId);
     try {
+      if (external) {
+        const members2 = await api.getServerMembers(external.serverId);
+        get().setMembers(members2, roomId);
+        seedSocketUsers(members2.map((m) => ({ _id: m._id, username: m.username })));
+        const { companyId } = external;
+        if (companyId != null && !syncedExternalCompanies.has(companyId)) {
+          const colleagues = members2.filter((m) => m.nickname);
+          const customers = members2.filter((m) => !m.nickname);
+          const canMapColleagues = colleagues.length === 0 || ownCompanyId != null;
+          if (ownCompanyId != null && ownCompanyId !== companyId && colleagues.length > 0) {
+            await mapCorvaUsers(ownCompanyId, colleagues);
+          }
+          const synced = await mapCorvaUsers(companyId, customers);
+          if (synced && canMapColleagues) syncedExternalCompanies.add(companyId);
+        }
+        return;
+      }
       const useServerMembers = (isAssetChat || roomType === "c") && serverId;
       if (useServerMembers) {
         const { serverMembersCache, serverMembersLoaded } = get();
@@ -3400,9 +3437,10 @@ var memberStore = createStore()((set, get) => ({
           return;
         }
         const members2 = await api.getServerMembers(serverId);
+        set({ serverMembersLoaded: true, serverMembersCache: members2 });
+        if (getExternalChannel(roomId)) return;
         get().setMembers(members2, roomId);
         seedSocketUsers(members2.map((m) => ({ _id: m._id, username: m.username })));
-        set({ serverMembersLoaded: true, serverMembersCache: members2 });
         return;
       }
       const channel = await api.getChannel(roomId);
@@ -3428,12 +3466,20 @@ var memberStore = createStore()((set, get) => ({
   },
   searchUsers: async (query) => {
     try {
-      const allUsers = await get().getAllVisibleUsers();
+      const currentRoomId = roomStore.getState().currentRoom?._id;
+      const { members, membersRoomId } = get();
+      const external = getExternalChannel(currentRoomId);
+      let allUsers;
+      if (external) allUsers = membersRoomId === currentRoomId ? members : [];
+      else allUsers = await get().getAllVisibleUsers();
       const q = query.trim().toLowerCase();
       if (!q) return allUsers;
-      return allUsers.filter(
-        (u) => u.username?.toLowerCase().includes(q) || u.name?.toLowerCase().includes(q) || u.displayName?.toLowerCase().includes(q)
-      );
+      return allUsers.filter((u) => {
+        if (u.nickname && u.displayName === u.nickname) {
+          return u.nickname.toLowerCase().includes(q);
+        }
+        return u.username?.toLowerCase().includes(q) || u.name?.toLowerCase().includes(q) || u.displayName?.toLowerCase().includes(q);
+      });
     } catch (e) {
       console.error("Failed to search users:", e);
       return [];
@@ -3466,71 +3512,89 @@ var memberStore = createStore()((set, get) => ({
     return visibleUsersRequest;
   },
   syncCorvaUsers: async (companyId) => {
-    const { api } = sharedRefs;
-    if (!api) return false;
-    try {
-      const corvaUsersResponse = await getChatHost().corvaApi.get(
-        "/v2/users",
-        {
-          company_id: companyId ?? 1,
-          per_page: 500,
-          fields: [
-            "user.first_name",
-            "user.last_name",
-            "user.email",
-            "user.profile_photo",
-            "user.title",
-            "user.role",
-            "user.company"
-          ]
-        }
-      );
-      const corvaUsers = corvaUsersResponse?.data || [];
-      const allUsers = await get().getAllVisibleUsers();
-      const currentMembers = get().members;
-      const userMap = /* @__PURE__ */ new Map();
-      allUsers.forEach((u) => userMap.set(u._id, u));
-      currentMembers.forEach((u) => {
+    if (!sharedRefs.api) return false;
+    ownCompanyId = companyId ?? 1;
+    const allUsers = await get().getAllVisibleUsers();
+    const userMap = /* @__PURE__ */ new Map();
+    allUsers.forEach((u) => userMap.set(u._id, u));
+    const { members, membersRoomId } = get();
+    if (!getExternalChannel(membersRoomId)) {
+      members.forEach((u) => {
         if (!userMap.has(u._id)) userMap.set(u._id, u);
       });
-      const usersToSync = Array.from(userMap.values());
-      if (usersToSync.length === 0) return false;
-      const corvaUsersByUsername = /* @__PURE__ */ new Map();
-      corvaUsers.forEach((corvaUser) => {
-        const email = corvaUser.attributes?.email;
-        if (email) {
-          const username = email.split("@")[0].toLowerCase();
-          corvaUsersByUsername.set(username, corvaUser);
-        }
-      });
-      const mappings = [];
-      usersToSync.forEach((revoltUser) => {
-        if (!revoltUser.username) return;
-        const username = revoltUser.username.toLowerCase();
-        const corvaUser = corvaUsersByUsername.get(username);
-        if (corvaUser) {
-          mappings.push({ revoltUserId: revoltUser._id, corvaUser });
-        }
-      });
-      get().bulkSetCorvaUserMappings(mappings);
-      mappings.forEach(({ revoltUserId, corvaUser }) => {
-        sharedRefs.corvaUserService.setMapping(revoltUserId, corvaUser);
+    }
+    const usersToSync = Array.from(userMap.values());
+    if (usersToSync.length === 0) return false;
+    return mapCorvaUsers(ownCompanyId, usersToSync);
+  }
+}));
+var CORVA_USERS_PAGE_SIZE = 500;
+var CORVA_USERS_MAX_PAGES = 10;
+async function fetchCompanyCorvaUsers(companyId) {
+  const users = [];
+  for (let page = 1; page <= CORVA_USERS_MAX_PAGES; page += 1) {
+    const response = await getChatHost().corvaApi.get("/v2/users", {
+      company_id: companyId,
+      per_page: CORVA_USERS_PAGE_SIZE,
+      page,
+      fields: [
+        "user.first_name",
+        "user.last_name",
+        "user.email",
+        "user.profile_photo",
+        "user.title",
+        "user.role",
+        "user.company"
+      ]
+    });
+    const data = response?.data || [];
+    users.push(...data);
+    if (data.length < CORVA_USERS_PAGE_SIZE) break;
+  }
+  return users;
+}
+var revoltUsernamesForEmail = (email) => {
+  const username = email.split("@")[0].toLowerCase().slice(0, 32);
+  return [username, username.replace(/\+/g, ".")];
+};
+async function mapCorvaUsers(companyId, revoltUsers) {
+  try {
+    const corvaUsersByUsername = /* @__PURE__ */ new Map();
+    (await fetchCompanyCorvaUsers(companyId)).forEach((corvaUser) => {
+      const email = corvaUser.attributes?.email;
+      if (!email) return;
+      revoltUsernamesForEmail(email).forEach((username) => {
+        if (!corvaUsersByUsername.has(username)) corvaUsersByUsername.set(username, corvaUser);
       });
-      if (mappings.length > 0) {
-        const refreshedMembers = get().members;
-        const currentRoomId = roomStore.getState().currentRoom?._id;
-        get().setMembers(refreshedMembers, currentRoomId);
-        set({ allVisibleUsersCache: null });
-        invalidateVisibleUsers();
+    });
+    const mappings = [];
+    revoltUsers.forEach((revoltUser) => {
+      if (!revoltUser.username) return;
+      const corvaUser = corvaUsersByUsername.get(revoltUser.username.toLowerCase());
+      if (corvaUser) {
+        mappings.push({ revoltUserId: revoltUser._id, corvaUser });
       }
-      return true;
-    } catch (error) {
-      console.error("Failed to sync Corva users:", error);
-      return false;
+    });
+    const store = memberStore.getState();
+    store.bulkSetCorvaUserMappings(mappings);
+    mappings.forEach(({ revoltUserId, corvaUser }) => {
+      sharedRefs.corvaUserService.setMapping(revoltUserId, corvaUser);
+    });
+    if (mappings.length > 0) {
+      const currentRoomId = roomStore.getState().currentRoom?._id;
+      store.setMembers(memberStore.getState().members, currentRoomId);
+      memberStore.setState({ allVisibleUsersCache: null });
+      invalidateVisibleUsers();
     }
+    return true;
+  } catch (error) {
+    console.error("Failed to sync Corva users:", error);
+    return false;
   }
-}));
+}
 var resetMemberStore = () => {
+  syncedExternalCompanies.clear();
+  ownCompanyId = null;
   invalidateVisibleUsers();
   memberStore.setState(getInitialState());
 };
@@ -3544,6 +3608,15 @@ var registerAssetChatChannel = (channelId, assetId, assetType) => {
     intervention_unit_id: assetType === "intervention_unit" ? id : null
   });
 };
+var registerChannelServer = ({ channelId, serverId, companyId }) => {
+  const wasExternal = isExternalServerChannel(channelId);
+  authStore.getState().setChannelServer(channelId, serverId, companyId);
+  if (wasExternal === isExternalServerChannel(channelId)) return;
+  const room = roomStore.getState().currentRoom;
+  if (room?._id === channelId) {
+    memberStore.getState().loadRoomMembers(channelId, room.t, true).catch((e) => console.error("Failed to reload asset chat members:", e));
+  }
+};
 var openRoomLockedAsset = () => {
   const room = roomStore.getState().currentRoom;
   if (!room?._id) return null;
@@ -3589,8 +3662,10 @@ var assetStore = createStore()((set, get) => ({
     });
     const isStale = () => get().currentAssetId !== assetId;
     try {
-      const chatId = await getAssetChatChannel(assetId, assetType);
+      const session = await getAssetChatSession(assetId, assetType);
       if (isStale()) return;
+      const chatId = session.channelId;
+      registerChannelServer(session);
       registerAssetChatChannel(chatId, assetId, assetType);
       set({
         assetChatId: chatId,
@@ -3643,7 +3718,9 @@ var assetStore = createStore()((set, get) => ({
         let chatId = get().assetChatId;
         if (!chatId) {
           try {
-            chatId = await getAssetChatChannel(currentAssetId, currentAssetType);
+            const session = await getAssetChatSession(currentAssetId, currentAssetType);
+            chatId = session.channelId;
+            registerChannelServer(session);
             registerAssetChatChannel(chatId, currentAssetId, currentAssetType);
             set({
               assetChatId: chatId,
@@ -4478,6 +4555,7 @@ onChatStorageConfigured(() => uiStore.setState(loadAttentionBudget()));
 var getInitialState6 = () => ({
   user: null,
   serverId: null,
+  externalChannels: {},
   isConnected: false,
   hasEverConnected: false,
   connectionGaveUp: false,
@@ -4500,6 +4578,13 @@ var authStore = createStore()((set, get) => ({
       channel
     ]
   })),
+  setChannelServer: (channelId, serverId, companyId) => set((state) => {
+    const { [channelId]: previous, ...rest } = state.externalChannels;
+    const isExternal = !!serverId && !!state.serverId && serverId !== state.serverId;
+    if (!isExternal) return previous ? { externalChannels: rest } : state;
+    if (previous?.serverId === serverId && previous.companyId === companyId) return state;
+    return { externalChannels: { ...rest, [channelId]: { serverId, companyId } } };
+  }),
   markChatUsed: () => {
     if (get().chatUsed === true) return;
     set({ chatUsed: true });
@@ -4667,6 +4752,8 @@ var authStore = createStore()((set, get) => ({
   isAuthenticated: () => !!get().user,
   isSocketConnected: () => !!sharedRefs.socket?.isConnected()
 }));
+var getExternalChannel = (roomId) => roomId && authStore.getState().externalChannels[roomId] || null;
+var isExternalServerChannel = (roomId) => !!getExternalChannel(roomId);
 var resetAuthStore = () => authStore.setState(getInitialState6());
 
 // src/store/stores/messageStore.ts
@@ -5753,6 +5840,6 @@ function ensureChatSession(corvaUser) {
   return inFlight;
 }
 
-export { ALERT_SEVERITY, ASSET_API_FIELDS, ASSET_CHAT_PREFIXES, ASSET_NOUN, CHANNEL_NAME_MAX_LENGTH, CHANNEL_TYPES, CORVA_MESSAGE_TYPES, CORVA_SYS_PREFIX, DATE_SEPARATOR_LABELS, DEFAULT_CHANNEL_CONTENT_FILTER, DEFAULT_CHANNEL_CONTENT_FILTERS, DEFAULT_CHANNEL_PREFERENCE, DEFAULT_FAVORITE_ROOMS_SETTINGS, DEFAULT_HIDDEN_ROOMS_SETTINGS, DEFAULT_NOTIFICATION_PREFERENCES, DEFAULT_NOTIFICATION_SETTINGS, DEFAULT_ROOM_LIST_ORDER, DIRECT_MESSAGE_PLACEHOLDER, GENERAL_CHAT_NAME, HttpError, MAX_ATTACHMENT_SIZE_BYTES, MAX_ATTACHMENT_SIZE_MB, MAX_NAVIGATION_HISTORY, MENTION_REPLACE_PATTERN, MENTION_SPLIT_PATTERN, MUTE_PRESET_OPTIONS, NOTIFICATION_DESTINATIONS, NOTIFICATION_SETTING_ALL, NOTIFICATION_SETTING_MENTIONS, NOTIFICATION_SETTING_NOTHING, PAUSE_INDEFINITELY, PAUSE_PRESETS, PAUSE_PRESET_OPTIONS, REVOLT_SYSTEM_USER_ID, ROOM_LIST_ORDER, SESSION_STORAGE_KEY, SIDEBAR_SECTIONS, SIDEBAR_TABS, SOFT_DELETE_MARKER, SYSTEM_MESSAGE_TEXTS, SessionManager, WEBSOCKET_CONNECTING, WEBSOCKET_OPEN, addMessage, addOrUpdateSubscription, alertMessageAsText, assetStore, authStore, buildAppCommentMessageContent, buildAskCorvaMessageContent, buildFinalMessage, buildForwardMessageContent, buildGroupChannelName, canDeleteMessage, canEditMessage, channelContentFilterStore, channelToAsset, chatToastStore, clearLastOpenedRoom, compareByActivity, compareByName, compareByRecencyDesc, configureChat, configureChatStorage, createAckScheduler, createCorvaUserService, createDMSubscription, createGroupSubscription, createHttpClient, createLatestWinsQueue, createMemoryStorage, createMessageCache, createRevoltAPI, createRevoltSocket, createRoomTaskQueue, createSocketEventHandlers, createSoftDeletedMessage, createTypingManager, deriveAllowedChatAsset, enrichWithCorvaData, ensureChatSession, extractTimestampFromULID, failOptimisticMessage, favoriteRoomsStore, findGeneralRoom, formatAssetChatName, getAppCommentAttachments, getAssetChatChannel, getAssetTypeFromDisplayName, getChatHost, getChatStorage, getCorvaUserFields, getLastOpenedRoom, getMessageTimestamp, getPauseUntil, getReactionCount, getRoomDisplayName, getSystemMessageWithCorvaNames, getUserDisplayName, getUserSecondaryText, handleUnauthorized, hasReactions, hasUserReacted, initChat, installUnreadWatcher, isAlertMessage, isAppCommentMessage, isAskCorvaMessage, isChannelMuted, isChatAssetTypeAllowed, isChatStorageConfigured, isCurrentRoomSelection, isDeepEqual, isDefaultChannelPreference, isDisallowedAssetChatRoom, isDmGroup, isForwardedMessage, isGeneralRoom, isNotificationsPaused, isPauseActive, isSoftDeletedMessage, isSystemMessage, isUnread, isUserOnline, isValidPausePreset, isVisibleUnread, keepChatUsed, loadUntilFound, memberStore, messageStore, navigationHistoryStore, notificationStore, onChatStorageConfigured, parseCorvaSystemMessage, prepareRoomSelection, removeMessageFromList, removeSubscription, resetAssetStore, resetAuthStore, resetChannelContentFilterStore, resetChatAssetPermissionsSnapshot, resetChatHost, resetFavoriteRoomsStore, resetMemberStore, resetMessageStore, resetNavigationHistoryStore, resetNotificationStore, resetRoomStore, resetUIStore, roomStore, saveLastChatActivity, saveLastOpenedRoom, searchMessages, searchRooms, searchUsers, selectCanGoBack, selectCanGoForward, setAllowedChatAssetTypes, settleOptimisticMessage, sharedRefs, sortChannels, sortDMs, sortMessagesByTime, sortUsersByStatus, stripPlatformMentions, uiStore, updateMessageInList, uploadAndSend, validateChannelName, waitForNextPaint, wasRecentlyActive, withChannelPreferenceDefaults };
+export { ALERT_SEVERITY, ASSET_API_FIELDS, ASSET_CHAT_PREFIXES, ASSET_NOUN, CHANNEL_NAME_MAX_LENGTH, CHANNEL_TYPES, CORVA_MESSAGE_TYPES, CORVA_SYS_PREFIX, DATE_SEPARATOR_LABELS, DEFAULT_CHANNEL_CONTENT_FILTER, DEFAULT_CHANNEL_CONTENT_FILTERS, DEFAULT_CHANNEL_PREFERENCE, DEFAULT_FAVORITE_ROOMS_SETTINGS, DEFAULT_HIDDEN_ROOMS_SETTINGS, DEFAULT_NOTIFICATION_PREFERENCES, DEFAULT_NOTIFICATION_SETTINGS, DEFAULT_ROOM_LIST_ORDER, DIRECT_MESSAGE_PLACEHOLDER, GENERAL_CHAT_NAME, HttpError, MAX_ATTACHMENT_SIZE_BYTES, MAX_ATTACHMENT_SIZE_MB, MAX_NAVIGATION_HISTORY, MENTION_REPLACE_PATTERN, MENTION_SPLIT_PATTERN, MUTE_PRESET_OPTIONS, NOTIFICATION_DESTINATIONS, NOTIFICATION_SETTING_ALL, NOTIFICATION_SETTING_MENTIONS, NOTIFICATION_SETTING_NOTHING, PAUSE_INDEFINITELY, PAUSE_PRESETS, PAUSE_PRESET_OPTIONS, REVOLT_SYSTEM_USER_ID, ROOM_LIST_ORDER, SESSION_STORAGE_KEY, SIDEBAR_SECTIONS, SIDEBAR_TABS, SOFT_DELETE_MARKER, SYSTEM_MESSAGE_TEXTS, SessionManager, WEBSOCKET_CONNECTING, WEBSOCKET_OPEN, addMessage, addOrUpdateSubscription, alertMessageAsText, assetStore, authStore, buildAppCommentMessageContent, buildAskCorvaMessageContent, buildFinalMessage, buildForwardMessageContent, buildGroupChannelName, canDeleteMessage, canEditMessage, channelContentFilterStore, channelToAsset, chatToastStore, clearLastOpenedRoom, compareByActivity, compareByName, compareByRecencyDesc, configureChat, configureChatStorage, createAckScheduler, createCorvaUserService, createDMSubscription, createGroupSubscription, createHttpClient, createLatestWinsQueue, createMemoryStorage, createMessageCache, createRevoltAPI, createRevoltSocket, createRoomTaskQueue, createSocketEventHandlers, createSoftDeletedMessage, createTypingManager, deriveAllowedChatAsset, enrichWithCorvaData, ensureChatSession, extractTimestampFromULID, failOptimisticMessage, favoriteRoomsStore, findGeneralRoom, formatAssetChatName, getAppCommentAttachments, getAssetChatChannel, getAssetChatSession, getAssetTypeFromDisplayName, getChatHost, getChatStorage, getCorvaUserFields, getExternalChannel, getLastOpenedRoom, getMessageTimestamp, getPauseUntil, getReactionCount, getRoomDisplayName, getSystemMessageWithCorvaNames, getUserDisplayName, getUserSecondaryText, handleUnauthorized, hasReactions, hasUserReacted, initChat, installUnreadWatcher, isAlertMessage, isAppCommentMessage, isAskCorvaMessage, isChannelMuted, isChatAssetTypeAllowed, isChatStorageConfigured, isCurrentRoomSelection, isDeepEqual, isDefaultChannelPreference, isDisallowedAssetChatRoom, isDmGroup, isExternalServerChannel, isForwardedMessage, isGeneralRoom, isNotificationsPaused, isPauseActive, isSoftDeletedMessage, isSystemMessage, isUnread, isUserOnline, isValidPausePreset, isVisibleUnread, keepChatUsed, loadUntilFound, memberStore, messageStore, navigationHistoryStore, notificationStore, onChatStorageConfigured, parseCorvaSystemMessage, prepareRoomSelection, removeMessageFromList, removeSubscription, resetAssetStore, resetAuthStore, resetChannelContentFilterStore, resetChatAssetPermissionsSnapshot, resetChatHost, resetFavoriteRoomsStore, resetMemberStore, resetMessageStore, resetNavigationHistoryStore, resetNotificationStore, resetRoomStore, resetUIStore, roomStore, saveLastChatActivity, saveLastOpenedRoom, searchMessages, searchRooms, searchUsers, selectCanGoBack, selectCanGoForward, setAllowedChatAssetTypes, settleOptimisticMessage, sharedRefs, sortChannels, sortDMs, sortMessagesByTime, sortUsersByStatus, stripPlatformMentions, uiStore, updateMessageInList, uploadAndSend, validateChannelName, waitForNextPaint, wasRecentlyActive, withChannelPreferenceDefaults };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map