@realtimexsco/live-chat 1.4.8 → 1.4.10

package/dist/index.cjs

@@ -16,7 +16,7 @@ var lucideReact = require('lucide-react');
 var classVarianceAuthority = require('class-variance-authority');
 var EmojiPicker = require('emoji-picker-react');
 var reactDayPicker = require('react-day-picker');
-var toast2 = require('react-hot-toast');
+var toast = require('react-hot-toast');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -41,7 +41,7 @@ function _interopNamespace(e) {
 var axios__default = /*#__PURE__*/_interopDefault(axios);
 var React2__namespace = /*#__PURE__*/_interopNamespace(React2);
 var EmojiPicker__default = /*#__PURE__*/_interopDefault(EmojiPicker);
-var toast2__default = /*#__PURE__*/_interopDefault(toast2);
+var toast__default = /*#__PURE__*/_interopDefault(toast);
 
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -4659,46 +4659,114 @@ init_store_helpers();
 init_store_helpers();
 var OPEN_CONVERSATION_EVENT = "realtimex:open-conversation";
 var NOTIFICATION_CLICK_SW_TYPE = "realtimex:notification-click";
+var PUSH_BROADCAST_CHANNEL = "realtimex-push";
+var PUSH_DATA_CACHE_NAME = "realtimex-push-data-v1";
 var PENDING_STORAGE_KEY = "realtimex:pending-open-conversation";
+var PENDING_OPEN_CACHE_PATH = "pending-open";
 var resolveConversationIdFromPushData = (data) => {
   if (!data || typeof data !== "object") return "";
-  const nested = data.FCM_MSG && typeof data.FCM_MSG === "object" ? data.FCM_MSG.data : void 0;
+  let fcmMsg = data.FCM_MSG;
+  if (typeof fcmMsg === "string") {
+    try {
+      fcmMsg = JSON.parse(fcmMsg);
+    } catch {
+      fcmMsg = void 0;
+    }
+  }
+  const nested = fcmMsg && typeof fcmMsg === "object" ? fcmMsg.data : void 0;
   const source = { ...nested || {}, ...data };
   return String(
     source.conversationId || source.conversation_id || source.conversationID || ""
-  );
+  ).trim();
+};
+var normalizePushMeta = (meta) => {
+  if (!meta || typeof meta !== "object") return {};
+  return {
+    senderId: String(
+      meta.senderId || meta.sender_id || ""
+    ).trim() || void 0,
+    kind: String(meta.kind || "").trim() || void 0,
+    messageId: String(
+      meta.messageId || meta.message_id || ""
+    ).trim() || void 0,
+    title: String(meta.title || "").trim() || void 0
+  };
+};
+var parsePendingRaw = (raw) => {
+  if (!raw) return null;
+  try {
+    const parsed = JSON.parse(raw);
+    if (parsed?.conversationId) {
+      return {
+        conversationId: String(parsed.conversationId).trim(),
+        ...normalizePushMeta(parsed)
+      };
+    }
+  } catch {
+  }
+  const id = String(raw).trim();
+  return id ? { conversationId: id } : null;
 };
-var peekPendingOpenConversation = () => {
+var peekPendingOpenConversation = () => peekPendingOpenRequest()?.conversationId ?? null;
+var peekPendingOpenRequest = () => {
   try {
-    return sessionStorage.getItem(PENDING_STORAGE_KEY);
+    return parsePendingRaw(sessionStorage.getItem(PENDING_STORAGE_KEY));
   } catch {
     return null;
   }
 };
-var consumePendingOpenConversation = () => {
-  const id = peekPendingOpenConversation();
+var consumePendingOpenConversation = () => consumePendingOpenRequest()?.conversationId ?? null;
+var consumePendingOpenRequest = () => {
+  const request = peekPendingOpenRequest();
   try {
     sessionStorage.removeItem(PENDING_STORAGE_KEY);
   } catch {
   }
-  return id;
+  return request;
 };
-var requestOpenConversation = (conversationId) => {
+var requestOpenConversation = (conversationId, meta) => {
   const id = String(conversationId || "").trim();
   if (!id) return;
+  const request = {
+    conversationId: id,
+    ...normalizePushMeta(meta)
+  };
+  console.log("[realtimex-push] requestOpenConversation:", request);
   try {
-    sessionStorage.setItem(PENDING_STORAGE_KEY, id);
+    sessionStorage.setItem(PENDING_STORAGE_KEY, JSON.stringify(request));
   } catch {
   }
   try {
     window.dispatchEvent(
-      new CustomEvent(OPEN_CONVERSATION_EVENT, {
-        detail: { conversationId: id }
-      })
+      new CustomEvent(OPEN_CONVERSATION_EVENT, { detail: request })
     );
   } catch {
   }
 };
+var buildChannelFromPushRequest = (request, loggedUserId, allUsers) => {
+  const conversationId = request.conversationId;
+  const isGroup = request.kind === "group";
+  const senderId = String(request.senderId || "").trim();
+  if (isGroup) {
+    const rawName2 = request.title || "Group Chat";
+    return {
+      id: conversationId,
+      conversationId,
+      name: rawName2.charAt(0).toUpperCase() + rawName2.slice(1),
+      isGroup: true
+    };
+  }
+  const senderUser = senderId ? (allUsers || []).find((user) => String(user._id) === senderId) : null;
+  const rawName = senderUser?.name || request.title || "New message";
+  return {
+    id: senderId || conversationId,
+    conversationId,
+    name: rawName.charAt(0).toUpperCase() + rawName.slice(1),
+    image: senderUser?.image || void 0,
+    email: senderUser?.email,
+    isGroup: false
+  };
+};
 var mapConversationToChannel = (conversation, loggedUserId, allUsers) => {
   const conversationId = String(conversation?._id || conversation?.id || "");
   const isGroup = isGroupConversation(conversation);
@@ -4735,6 +4803,37 @@ var mapConversationToChannel = (conversation, loggedUserId, allUsers) => {
     starredCount: conversation.starredCount
   };
 };
+var stripConversationIdFromUrl = () => {
+  if (typeof window === "undefined") return;
+  try {
+    const url = new URL(window.location.href);
+    if (!url.searchParams.has("conversationId")) return;
+    url.searchParams.delete("conversationId");
+    const next = `${url.pathname}${url.search}${url.hash}`;
+    window.history.replaceState(window.history.state, "", next);
+  } catch {
+  }
+};
+var cacheRequestForPath = (path) => new Request(new URL(path, window.location.origin).toString());
+var consumePendingOpenFromPushCache = async () => {
+  if (typeof caches === "undefined") return null;
+  try {
+    const cache = await caches.open(PUSH_DATA_CACHE_NAME);
+    const req = cacheRequestForPath(PENDING_OPEN_CACHE_PATH);
+    const res = await cache.match(req);
+    if (!res) return null;
+    await cache.delete(req);
+    const data = await res.json();
+    const conversationId = resolveConversationIdFromPushData(data);
+    if (!conversationId) return null;
+    return {
+      conversationId,
+      ...normalizePushMeta(data)
+    };
+  } catch {
+    return null;
+  }
+};
 var readConversationIdFromLocation = () => {
   try {
     return new URLSearchParams(window.location.search).get("conversationId") || "";
@@ -4743,34 +4842,73 @@ var readConversationIdFromLocation = () => {
   }
 };
 var consumedUrlConversationIds = /* @__PURE__ */ new Set();
+var lastHandledOpenId = "";
+var lastHandledOpenAt = 0;
+var shouldHandleOpen = (conversationId) => {
+  const id = String(conversationId || "").trim();
+  if (!id) return false;
+  const now = Date.now();
+  if (lastHandledOpenId === id && now - lastHandledOpenAt < 2500) {
+    return false;
+  }
+  lastHandledOpenId = id;
+  lastHandledOpenAt = now;
+  return true;
+};
+var handleNotificationOpen = (conversationId, pushData, options) => {
+  const id = String(conversationId || "").trim();
+  if (!id) {
+    console.warn("[realtimex-push] notification open ignored \u2014 no conversationId", pushData);
+    return;
+  }
+  if (!shouldHandleOpen(id)) {
+    stripConversationIdFromUrl();
+    return;
+  }
+  requestOpenConversation(id, pushData);
+  const chatPath = options.chatPath || "/chat";
+  stripConversationIdFromUrl();
+  options.onNavigate?.(id, chatPath);
+};
 var installNotificationClickBridge = (options = {}) => {
   if (typeof window === "undefined") return () => void 0;
-  const chatPath = options.chatPath || "/chat";
-  const handleOpen = (conversationId) => {
-    const id = String(conversationId || "").trim();
-    if (!id) return;
-    requestOpenConversation(id);
-    const pathWithQuery = `${chatPath}?conversationId=${encodeURIComponent(id)}`;
-    options.onNavigate?.(id, pathWithQuery);
-  };
   const onSwMessage = (event) => {
     const data = event.data;
     console.log("[realtimex-push] SW \u2192 page message:", data);
     if (!data || data.type !== NOTIFICATION_CLICK_SW_TYPE) return;
-    console.log(
-      "[realtimex-push] notification click conversationId:",
-      data.conversationId
-    );
-    handleOpen(String(data.conversationId || ""));
+    const pushData = data.data && typeof data.data === "object" ? data.data : void 0;
+    const conversationId = String(data.conversationId || "") || resolveConversationIdFromPushData(pushData);
+    console.log("[realtimex-push] notification click \u2192 open:", {
+      conversationId,
+      pushData
+    });
+    handleNotificationOpen(conversationId, pushData, options);
   };
   navigator.serviceWorker?.addEventListener("message", onSwMessage);
+  let broadcast = null;
+  try {
+    broadcast = new BroadcastChannel(PUSH_BROADCAST_CHANNEL);
+    broadcast.onmessage = onSwMessage;
+  } catch {
+  }
   const fromUrl = readConversationIdFromLocation();
   if (fromUrl && !consumedUrlConversationIds.has(fromUrl)) {
     consumedUrlConversationIds.add(fromUrl);
-    handleOpen(fromUrl);
+    handleNotificationOpen(fromUrl, void 0, options);
+  } else {
+    stripConversationIdFromUrl();
   }
+  void consumePendingOpenFromPushCache().then((request) => {
+    if (!request?.conversationId) return;
+    handleNotificationOpen(
+      request.conversationId,
+      request,
+      options
+    );
+  });
   return () => {
     navigator.serviceWorker?.removeEventListener("message", onSwMessage);
+    broadcast?.close();
   };
 };
 
@@ -4850,7 +4988,7 @@ var useChatController = () => {
   const allUsers = exports.useChatStore((s) => s.allUsers);
   const isFetchingConversations = exports.useChatStore((s) => s.isFetchingConversations);
   const conversations = exports.useChatStore((s) => s.conversations);
-  const [pendingOpenConversationId, setPendingOpenConversationId] = React2.useState(() => peekPendingOpenConversation());
+  const [pendingOpenRequest, setPendingOpenRequest] = React2.useState(() => peekPendingOpenRequest());
   const conversationsLength = exports.useChatStore(
     (s) => state.activeChannel?.conversationId ? 0 : s.conversations.length
   );
@@ -4881,32 +5019,42 @@ var useChatController = () => {
   });
   React2.useEffect(() => {
     const onOpen = (event) => {
-      const id = String(
-        event.detail?.conversationId || ""
-      ).trim();
-      if (id) setPendingOpenConversationId(id);
+      const detail = event.detail;
+      if (detail?.conversationId) {
+        console.log("[realtimex-push] OPEN_CONVERSATION_EVENT:", detail);
+        setPendingOpenRequest({
+          conversationId: String(detail.conversationId),
+          senderId: detail.senderId,
+          kind: detail.kind,
+          messageId: detail.messageId,
+          title: detail.title
+        });
+      }
     };
     window.addEventListener(OPEN_CONVERSATION_EVENT, onOpen);
     return () => window.removeEventListener(OPEN_CONVERSATION_EVENT, onOpen);
   }, []);
   React2.useEffect(() => {
-    if (!pendingOpenConversationId || !loggedUserDetails) return;
+    if (!pendingOpenRequest?.conversationId || !loggedUserDetails) return;
     let cancelled = false;
     const openPending = async () => {
-      const targetId = String(pendingOpenConversationId);
+      const targetId = String(pendingOpenRequest.conversationId);
+      console.log("[realtimex-push] opening conversation:", pendingOpenRequest);
       let conversation = conversations.find(
         (c) => String(c._id || c.id) === targetId
       ) || null;
       if (!conversation) {
-        const fromInfo = conversationInfos[targetId];
-        if (fromInfo) conversation = fromInfo;
+        conversation = conversationInfos[targetId] || null;
       }
       if (!conversation) {
-        if (isFetchingConversations) return;
+        if (isFetchingConversations) {
+          console.log("[realtimex-push] waiting for conversations list\u2026");
+          return;
+        }
         try {
           await fetchConversationInfo2(targetId);
-        } catch {
-          return;
+        } catch (error) {
+          console.warn("[realtimex-push] fetchConversationInfo failed:", error);
         }
         if (cancelled) return;
         const stateNow = exports.useChatStore.getState();
@@ -4914,12 +5062,17 @@ var useChatController = () => {
           (c) => String(c._id || c.id) === targetId
         ) || stateNow.conversationInfos[targetId] || null;
       }
-      if (!conversation || cancelled) return;
-      const channel = mapConversationToChannel(
+      const channel = conversation ? mapConversationToChannel(
         conversation,
         loggedUserDetails._id,
         allUsers
+      ) : buildChannelFromPushRequest(
+        pendingOpenRequest,
+        loggedUserDetails._id,
+        allUsers
       );
+      console.log("[realtimex-push] selected channel:", channel);
+      if (cancelled) return;
       setState((prev) => {
         if (prev.activeChannel?.conversationId && String(prev.activeChannel.conversationId) === targetId) {
           return prev;
@@ -4930,15 +5083,16 @@ var useChatController = () => {
           activeConversationId: targetId
         };
       });
-      consumePendingOpenConversation();
-      setPendingOpenConversationId(null);
+      exports.useChatStore.getState().setActiveConversationId(targetId);
+      consumePendingOpenRequest();
+      setPendingOpenRequest(null);
     };
     void openPending();
     return () => {
       cancelled = true;
     };
   }, [
-    pendingOpenConversationId,
+    pendingOpenRequest,
     loggedUserDetails,
     conversations,
     conversationInfos,
@@ -6389,184 +6543,562 @@ var CreateChatDialog = (props) => {
   );
 };
 var CreateChatDialog_default = CreateChatDialog;
-var LoggedUserDetails = ({
-  loggedUserDetails,
-  onUserSelect,
-  isCreateModalOpen = false,
-  setIsCreateModalOpen,
-  searchQuery = "",
-  setSearchQuery
-}) => {
-  const { showColorModeToggle } = useChatTheme();
-  const user = {
-    _id: loggedUserDetails?._id || "1",
-    name: formatLoggedUserName(loggedUserDetails?.name),
-    email: loggedUserDetails?.email || "user@example.com",
-    role: loggedUserDetails?.role || "user",
-    isActive: loggedUserDetails?.isActive ?? true,
-    createdAt: loggedUserDetails?.createdAt ? new Date(loggedUserDetails.createdAt) : /* @__PURE__ */ new Date(),
-    updatedAt: loggedUserDetails?.updatedAt ? new Date(loggedUserDetails.updatedAt) : /* @__PURE__ */ new Date(),
-    image: loggedUserDetails?.image || void 0
-  };
-  return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "shrink-0 border-b border-(--chat-border) bg-(--chat-surface) px-3 pb-3 pt-3", children: [
-    /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex min-w-0 items-center gap-2.5", children: [
-      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "relative shrink-0", children: [
-        /* @__PURE__ */ jsxRuntime.jsxs(Avatar, { className: "size-8 ring-1 ring-(--chat-surface)", children: [
-          user.image ? /* @__PURE__ */ jsxRuntime.jsx(AvatarImage, { src: user.image, alt: user.name }) : null,
-          /* @__PURE__ */ jsxRuntime.jsx(AvatarFallback, { className: "bg-(--chat-theme-10) text-[10px] font-medium text-(--chat-theme)", children: (user.name || "?").charAt(0).toUpperCase() })
-        ] }),
-        /* @__PURE__ */ jsxRuntime.jsx("span", { className: "absolute -bottom-0.5 -right-0.5 size-2 rounded-full border-2 border-(--chat-surface) bg-(--chat-online)" })
-      ] }),
-      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "min-w-0 flex-1", children: [
-        /* @__PURE__ */ jsxRuntime.jsx("h2", { className: "truncate text-xs font-medium leading-tight text-(--chat-text)", children: user.name }),
-        /* @__PURE__ */ jsxRuntime.jsx("p", { className: "truncate text-[10px] text-(--chat-muted)", children: user.email })
-      ] }),
-      showColorModeToggle ? /* @__PURE__ */ jsxRuntime.jsx(ChatThemeToggle_default, {}) : null
-    ] }),
-    /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "mt-3 flex items-center gap-1.5", children: [
-      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: chatSidebarSearchShellClass, children: [
-        /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Search, { className: "pointer-events-none size-3.5 shrink-0 text-(--chat-muted)" }),
-        /* @__PURE__ */ jsxRuntime.jsx(
-          "input",
-          {
-            type: "text",
-            inputMode: "search",
-            enterKeyHint: "search",
-            placeholder: "Search conversations...",
-            value: searchQuery,
-            onChange: (e) => setSearchQuery?.(e.target.value),
-            className: chatSidebarSearchInputClass
-          }
-        ),
-        searchQuery ? /* @__PURE__ */ jsxRuntime.jsx(
-          "button",
-          {
-            type: "button",
-            onClick: () => setSearchQuery?.(""),
-            className: "flex size-6 shrink-0 items-center justify-center rounded-md text-(--chat-muted) transition-colors hover:bg-(--chat-hover) hover:text-(--chat-text)",
-            "aria-label": "Clear search",
-            children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.X, { size: 12 })
-          }
-        ) : null
-      ] }),
-      /* @__PURE__ */ jsxRuntime.jsx(
-        CreateChatDialog_default,
-        {
-          loggedUserDetails,
-          onUserSelect,
-          isCreateModalOpen,
-          setIsCreateModalOpen
-        }
-      )
-    ] })
-  ] });
-};
-var LoggedUserDetails_default = LoggedUserDetails;
-function ScrollArea({
-  className,
-  children,
-  ...props
-}) {
-  return /* @__PURE__ */ jsxRuntime.jsxs(
-    radixUi.ScrollArea.Root,
-    {
-      "data-slot": "scroll-area",
-      className: cn("relative", className),
-      ...props,
-      children: [
-        /* @__PURE__ */ jsxRuntime.jsx(
-          radixUi.ScrollArea.Viewport,
-          {
-            "data-slot": "scroll-area-viewport",
-            className: "focus-visible:ring-ring/50 size-full rounded-[inherit] transition-[color,box-shadow] outline-none focus-visible:ring-[3px] focus-visible:outline-1",
-            children
-          }
-        ),
-        /* @__PURE__ */ jsxRuntime.jsx(ScrollBar, {}),
-        /* @__PURE__ */ jsxRuntime.jsx(radixUi.ScrollArea.Corner, {})
-      ]
-    }
-  );
-}
-function ScrollBar({
+function Switch({
   className,
-  orientation = "vertical",
+  size = "default",
   ...props
 }) {
   return /* @__PURE__ */ jsxRuntime.jsx(
-    radixUi.ScrollArea.ScrollAreaScrollbar,
+    radixUi.Switch.Root,
     {
-      "data-slot": "scroll-area-scrollbar",
-      orientation,
+      "data-slot": "switch",
+      "data-size": size,
       className: cn(
-        "flex touch-none p-px transition-colors select-none",
-        orientation === "vertical" && "h-full w-2.5 border-l border-l-transparent",
-        orientation === "horizontal" && "h-2.5 flex-col border-t border-t-transparent",
+        "peer group/switch inline-flex shrink-0 items-center rounded-full border border-transparent shadow-xs transition-all outline-none focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:cursor-not-allowed disabled:opacity-50 data-[size=default]:h-[1.15rem] data-[size=default]:w-8 data-[size=sm]:h-3.5 data-[size=sm]:w-6 data-[state=checked]:bg-primary data-[state=unchecked]:bg-input dark:data-[state=unchecked]:bg-input/80",
         className
       ),
       ...props,
       children: /* @__PURE__ */ jsxRuntime.jsx(
-        radixUi.ScrollArea.ScrollAreaThumb,
+        radixUi.Switch.Thumb,
         {
-          "data-slot": "scroll-area-thumb",
-          className: "bg-border relative flex-1 rounded-full"
+          "data-slot": "switch-thumb",
+          className: cn(
+            "pointer-events-none block rounded-full bg-background ring-0 transition-transform group-data-[size=default]/switch:size-4 group-data-[size=sm]/switch:size-3 data-[state=checked]:translate-x-[calc(100%-2px)] data-[state=unchecked]:translate-x-0 dark:data-[state=checked]:bg-primary-foreground dark:data-[state=unchecked]:bg-foreground"
+          )
         }
       )
     }
   );
 }
 
-// src/chat/channel-list/useChannelList.ts
-init_useStore();
-init_store_helpers();
-var conversationDrafts = /* @__PURE__ */ new Map();
-var DRAFT_PREVIEW_MAX_LENGTH = 50;
-var emptyDraft = () => ({
-  messageInput: "",
-  attachments: []
-});
-var draftRevision = 0;
-var draftListeners = /* @__PURE__ */ new Set();
-function notifyDraftChange() {
-  draftRevision += 1;
-  draftListeners.forEach((listener) => listener());
-}
-function subscribeToDrafts(listener) {
-  draftListeners.add(listener);
-  return () => {
-    draftListeners.delete(listener);
-  };
-}
-function getDraftRevision() {
-  return draftRevision;
-}
-function useDraftRevision() {
-  return React2.useSyncExternalStore(subscribeToDrafts, getDraftRevision, getDraftRevision);
-}
-function getConversationDraft(conversationId) {
-  if (!conversationId) return emptyDraft();
-  return conversationDrafts.get(conversationId) ?? emptyDraft();
-}
-function updateConversationDraft(conversationId, draft) {
-  if (!conversationId) return;
-  if (draft.messageInput.trim() || draft.attachments.length > 0) {
-    conversationDrafts.set(conversationId, {
-      messageInput: draft.messageInput,
-      attachments: draft.attachments
-    });
-  } else {
-    conversationDrafts.delete(conversationId);
+// src/notifications/push.service.ts
+init_client();
+var PUSH_TOKEN_STORAGE_KEY = "realtimex-push-token";
+var SERVICE_WORKER_PATH = "/firebase-messaging-sw.js";
+var PUSH_CHANGED_EVENT = "realtimex:push-changed";
+var emitPushChanged = (enabled) => {
+  try {
+    window.dispatchEvent(
+      new CustomEvent(PUSH_CHANGED_EVENT, { detail: { enabled } })
+    );
+  } catch {
   }
-  notifyDraftChange();
-}
-function clearConversationDraft(conversationId) {
-  if (!conversationId) return;
-  if (!conversationDrafts.has(conversationId)) return;
-  conversationDrafts.delete(conversationId);
-  notifyDraftChange();
-}
-function getConversationDraftPreview(conversationId) {
-  if (!conversationId) return null;
+};
+var v2Url = "https://realtimex.softwareco.com/api/v2";
+var apiGetPushConfig = async () => {
+  const { data } = await apiClient.get(`${v2Url}/notifications/push/config`);
+  return data?.data;
+};
+var apiRegisterPushToken = async (token, deviceLabel) => {
+  const { data } = await apiClient.post(`${v2Url}/notifications/push/token`, {
+    token,
+    deviceLabel
+  });
+  return data?.data;
+};
+var apiRemovePushToken = async (token) => {
+  const { data } = await apiClient.delete(`${v2Url}/notifications/push/token`, {
+    data: { token }
+  });
+  return data;
+};
+var apiGetPushPreference = async () => {
+  const { data } = await apiClient.get(
+    `${v2Url}/notifications/push/preference`
+  );
+  return data?.data;
+};
+var apiUpdatePushPreference = async (enabled) => {
+  const { data } = await apiClient.patch(
+    `${v2Url}/notifications/push/preference`,
+    { enabled }
+  );
+  return data?.data;
+};
+var isPushSupported = () => typeof window !== "undefined" && "Notification" in window && "serviceWorker" in navigator && "PushManager" in window;
+var getStoredPushToken = () => {
+  try {
+    return localStorage.getItem(PUSH_TOKEN_STORAGE_KEY);
+  } catch {
+    return null;
+  }
+};
+var storePushToken = (token) => {
+  try {
+    if (token) localStorage.setItem(PUSH_TOKEN_STORAGE_KEY, token);
+    else localStorage.removeItem(PUSH_TOKEN_STORAGE_KEY);
+  } catch {
+  }
+};
+var defaultDeviceLabel = () => {
+  const ua = navigator.userAgent;
+  const browser = /edg\//i.test(ua) ? "Edge" : /chrome/i.test(ua) ? "Chrome" : /safari/i.test(ua) ? "Safari" : /firefox/i.test(ua) ? "Firefox" : "Browser";
+  const os = /mac/i.test(ua) ? "macOS" : /windows/i.test(ua) ? "Windows" : /android/i.test(ua) ? "Android" : /iphone|ipad/i.test(ua) ? "iOS" : /linux/i.test(ua) ? "Linux" : "Unknown OS";
+  return `${browser} on ${os}`;
+};
+var loadFirebaseMessaging = async () => {
+  try {
+    const [{ initializeApp, getApps }, messagingModule] = await Promise.all([
+      import('firebase/app'),
+      import('firebase/messaging')
+    ]);
+    return { initializeApp, getApps, ...messagingModule };
+  } catch {
+    throw new Error(
+      'Push notifications need the "firebase" package \u2014 run: npm install firebase'
+    );
+  }
+};
+var getFirebaseMessaging = async (firebaseConfig) => {
+  const fb = await loadFirebaseMessaging();
+  const app = fb.getApps().length ? fb.getApps()[0] : fb.initializeApp(firebaseConfig);
+  return { fb, messaging: fb.getMessaging(app) };
+};
+var enablePushOnThisDevice = async () => {
+  if (!isPushSupported()) {
+    throw new Error("Push notifications are not supported in this browser");
+  }
+  const config = await apiGetPushConfig();
+  if (!config?.enabled) {
+    throw new Error("Push notifications are disabled for this workspace");
+  }
+  if (!config.configured || !config.firebaseConfig || !config.vapidKey) {
+    throw new Error(
+      "Push notifications are not configured on the server yet"
+    );
+  }
+  const permission = await Notification.requestPermission();
+  if (permission !== "granted") {
+    throw new Error("Notification permission was not granted");
+  }
+  let registration;
+  try {
+    registration = await navigator.serviceWorker.register(
+      `${SERVICE_WORKER_PATH}?config=${encodeURIComponent(
+        JSON.stringify(config.firebaseConfig)
+      )}`
+    );
+  } catch {
+    throw new Error(
+      `Could not register ${SERVICE_WORKER_PATH} \u2014 copy it from node_modules/@realtimexsco/live-chat/dist/firebase-messaging-sw.js into your app's public folder`
+    );
+  }
+  const { fb, messaging } = await getFirebaseMessaging(config.firebaseConfig);
+  const token = await fb.getToken(messaging, {
+    vapidKey: config.vapidKey,
+    serviceWorkerRegistration: registration
+  });
+  if (!token) {
+    throw new Error("Could not obtain a push token from Firebase");
+  }
+  await apiRegisterPushToken(token, defaultDeviceLabel());
+  storePushToken(token);
+  emitPushChanged(true);
+  return token;
+};
+var disablePushOnThisDevice = async () => {
+  const token = getStoredPushToken();
+  if (!token) return;
+  try {
+    const config = await apiGetPushConfig();
+    if (config?.firebaseConfig) {
+      const { fb, messaging } = await getFirebaseMessaging(
+        config.firebaseConfig
+      );
+      await fb.deleteToken(messaging).catch(() => void 0);
+    }
+  } catch {
+  }
+  await apiRemovePushToken(token).catch(() => void 0);
+  storePushToken(null);
+  emitPushChanged(false);
+};
+var onForegroundPush = async (callback) => {
+  const config = await apiGetPushConfig();
+  if (!config?.configured || !config.firebaseConfig) {
+    throw new Error("Push config unavailable (not configured or API not ready)");
+  }
+  const { fb, messaging } = await getFirebaseMessaging(config.firebaseConfig);
+  return fb.onMessage(messaging, (payload) => {
+    console.log("[realtimex-push] FCM foreground payload (raw):", payload);
+    console.log("[realtimex-push] FCM foreground data:", payload?.data);
+    console.log("[realtimex-push] FCM foreground notification:", payload?.notification);
+    callback({
+      title: payload?.notification?.title,
+      body: payload?.notification?.body,
+      data: payload?.data
+    });
+  });
+};
+
+// src/notifications/usePushNotifications.ts
+var usePushNotifications = () => {
+  const [state, setState] = React2.useState({
+    supported: false,
+    allowedByWorkspace: false,
+    configured: false,
+    permission: "unsupported",
+    userEnabled: true,
+    deviceEnabled: false,
+    loading: true,
+    error: null
+  });
+  const refresh = React2.useCallback(async () => {
+    if (!isPushSupported()) {
+      setState((prev) => ({
+        ...prev,
+        supported: false,
+        loading: false
+      }));
+      return;
+    }
+    try {
+      const [config, preference] = await Promise.all([
+        apiGetPushConfig(),
+        apiGetPushPreference().catch(() => null)
+      ]);
+      setState({
+        supported: true,
+        allowedByWorkspace: Boolean(config?.enabled),
+        configured: Boolean(config?.configured),
+        permission: Notification.permission,
+        userEnabled: preference?.enabled ?? true,
+        deviceEnabled: Notification.permission === "granted" && Boolean(getStoredPushToken()),
+        loading: false,
+        error: null
+      });
+    } catch (error) {
+      setState((prev) => ({
+        ...prev,
+        supported: true,
+        loading: false,
+        error: error instanceof Error ? error.message : "Could not load push settings"
+      }));
+    }
+  }, []);
+  React2.useEffect(() => {
+    void refresh();
+  }, [refresh]);
+  const enable = React2.useCallback(async () => {
+    setState((prev) => ({ ...prev, loading: true, error: null }));
+    try {
+      await enablePushOnThisDevice();
+      await refresh();
+      return true;
+    } catch (error) {
+      setState((prev) => ({
+        ...prev,
+        loading: false,
+        permission: isPushSupported() ? Notification.permission : "unsupported",
+        error: error instanceof Error ? error.message : "Could not enable push notifications"
+      }));
+      return false;
+    }
+  }, [refresh]);
+  const disable = React2.useCallback(async () => {
+    setState((prev) => ({ ...prev, loading: true, error: null }));
+    try {
+      await disablePushOnThisDevice();
+    } finally {
+      await refresh();
+    }
+  }, [refresh]);
+  const setUserEnabled = React2.useCallback(
+    async (enabled) => {
+      setState((prev) => ({ ...prev, userEnabled: enabled }));
+      try {
+        await apiUpdatePushPreference(enabled);
+      } catch (error) {
+        setState((prev) => ({
+          ...prev,
+          userEnabled: !enabled,
+          error: error instanceof Error ? error.message : "Could not update push preference"
+        }));
+      }
+    },
+    []
+  );
+  return { ...state, enable, disable, setUserEnabled, refresh };
+};
+var PushNotificationToggle = ({
+  className,
+  label = "Push notifications",
+  description = "Get notified about new messages on this device"
+}) => {
+  const push = usePushNotifications();
+  if (!push.supported || !push.allowedByWorkspace || !push.configured) {
+    return null;
+  }
+  const isOn = push.deviceEnabled && push.userEnabled;
+  const permissionBlocked = push.permission === "denied";
+  const handleChange = async (checked) => {
+    if (checked) {
+      if (!push.userEnabled) await push.setUserEnabled(true);
+      if (!push.deviceEnabled) await push.enable();
+    } else {
+      await push.disable();
+    }
+  };
+  return /* @__PURE__ */ jsxRuntime.jsxs(
+    "div",
+    {
+      className: className ?? "flex items-center justify-between gap-4 rounded-xl border border-(--chat-border) bg-(--chat-surface) px-4 py-3",
+      children: [
+        /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-0.5", children: [
+          /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-sm font-medium text-(--chat-text)", children: label }),
+          /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-xs text-(--chat-muted)", children: permissionBlocked ? "Notifications are blocked in your browser settings" : push.error ?? description })
+        ] }),
+        /* @__PURE__ */ jsxRuntime.jsx(
+          Switch,
+          {
+            checked: isOn,
+            disabled: push.loading || permissionBlocked,
+            onCheckedChange: (checked) => void handleChange(checked),
+            "aria-label": `Toggle ${label}`
+          }
+        )
+      ]
+    }
+  );
+};
+var LoggedUserSettingsDialog = ({
+  loggedUserDetails
+}) => {
+  const [open, setOpen] = React2.useState(false);
+  const user = {
+    _id: loggedUserDetails?._id || "1",
+    name: formatLoggedUserName(loggedUserDetails?.name),
+    email: loggedUserDetails?.email || "user@example.com",
+    role: loggedUserDetails?.role || "user",
+    isActive: loggedUserDetails?.isActive ?? true,
+    createdAt: loggedUserDetails?.createdAt ? new Date(loggedUserDetails.createdAt) : /* @__PURE__ */ new Date(),
+    updatedAt: loggedUserDetails?.updatedAt ? new Date(loggedUserDetails.updatedAt) : /* @__PURE__ */ new Date(),
+    image: loggedUserDetails?.image || void 0
+  };
+  return /* @__PURE__ */ jsxRuntime.jsxs(Dialog, { open, onOpenChange: setOpen, children: [
+    /* @__PURE__ */ jsxRuntime.jsxs(Tooltip, { children: [
+      /* @__PURE__ */ jsxRuntime.jsx(TooltipTrigger, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(
+        Button,
+        {
+          type: "button",
+          variant: "ghost",
+          size: "icon",
+          className: sidebarActionBtnClass,
+          "aria-label": "Account settings",
+          onClick: () => setOpen(true),
+          children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Settings, { className: "size-3.5", strokeWidth: 2 })
+        }
+      ) }),
+      /* @__PURE__ */ jsxRuntime.jsx(TooltipContent, { side: "bottom", children: "Settings" })
+    ] }),
+    /* @__PURE__ */ jsxRuntime.jsxs(ChatDialogContent, { className: "gap-0 overflow-hidden p-0 sm:max-w-[380px]", children: [
+      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "border-b border-(--chat-border) px-5 py-4", children: /* @__PURE__ */ jsxRuntime.jsx(DialogTitle, { className: "text-left text-base font-semibold text-(--chat-text)", children: "Account settings" }) }),
+      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-5 px-5 py-5", children: [
+        /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col items-center text-center", children: [
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "relative", children: [
+            /* @__PURE__ */ jsxRuntime.jsxs(Avatar, { className: "size-16 ring-2 ring-(--chat-theme-20)", children: [
+              user.image ? /* @__PURE__ */ jsxRuntime.jsx(AvatarImage, { src: user.image, alt: user.name }) : null,
+              /* @__PURE__ */ jsxRuntime.jsx(AvatarFallback, { className: "bg-(--chat-theme-10) text-lg font-medium text-(--chat-theme)", children: (user.name || "?").charAt(0).toUpperCase() })
+            ] }),
+            /* @__PURE__ */ jsxRuntime.jsx("span", { className: "absolute bottom-0.5 right-0.5 size-3 rounded-full border-2 border-(--chat-surface) bg-(--chat-online)" })
+          ] }),
+          /* @__PURE__ */ jsxRuntime.jsx("h3", { className: "mt-3 text-base font-semibold text-(--chat-text)", children: user.name }),
+          /* @__PURE__ */ jsxRuntime.jsx("p", { className: "mt-0.5 text-sm text-(--chat-muted)", children: user.email }),
+          /* @__PURE__ */ jsxRuntime.jsxs("p", { className: "mt-2 inline-flex items-center gap-1.5 rounded-full bg-(--chat-theme-10) px-2.5 py-0.5 text-xs font-medium text-(--chat-theme)", children: [
+            /* @__PURE__ */ jsxRuntime.jsx("span", { className: "size-1.5 rounded-full bg-(--chat-online)" }),
+            "Online"
+          ] })
+        ] }),
+        /* @__PURE__ */ jsxRuntime.jsx("div", { className: "border-t border-(--chat-border) pt-4", children: /* @__PURE__ */ jsxRuntime.jsx(PushNotificationToggle, { className: "flex items-center justify-between gap-4 rounded-xl border border-(--chat-border) bg-(--chat-theme-10) px-4 py-3" }) })
+      ] })
+    ] })
+  ] });
+};
+var LoggedUserSettingsDialog_default = LoggedUserSettingsDialog;
+var LoggedUserDetails = ({
+  loggedUserDetails,
+  onUserSelect,
+  isCreateModalOpen = false,
+  setIsCreateModalOpen,
+  searchQuery = "",
+  setSearchQuery
+}) => {
+  const { showColorModeToggle } = useChatTheme();
+  const user = {
+    _id: loggedUserDetails?._id || "1",
+    name: formatLoggedUserName(loggedUserDetails?.name),
+    email: loggedUserDetails?.email || "user@example.com",
+    role: loggedUserDetails?.role || "user",
+    isActive: loggedUserDetails?.isActive ?? true,
+    createdAt: loggedUserDetails?.createdAt ? new Date(loggedUserDetails.createdAt) : /* @__PURE__ */ new Date(),
+    updatedAt: loggedUserDetails?.updatedAt ? new Date(loggedUserDetails.updatedAt) : /* @__PURE__ */ new Date(),
+    image: loggedUserDetails?.image || void 0
+  };
+  return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "shrink-0 border-b border-(--chat-border) bg-(--chat-surface) px-3 pb-3 pt-3", children: [
+    /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex min-w-0 items-center gap-2.5", children: [
+      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "relative shrink-0", children: [
+        /* @__PURE__ */ jsxRuntime.jsxs(Avatar, { className: "size-8 ring-1 ring-(--chat-surface)", children: [
+          user.image ? /* @__PURE__ */ jsxRuntime.jsx(AvatarImage, { src: user.image, alt: user.name }) : null,
+          /* @__PURE__ */ jsxRuntime.jsx(AvatarFallback, { className: "bg-(--chat-theme-10) text-[10px] font-medium text-(--chat-theme)", children: (user.name || "?").charAt(0).toUpperCase() })
+        ] }),
+        /* @__PURE__ */ jsxRuntime.jsx("span", { className: "absolute -bottom-0.5 -right-0.5 size-2 rounded-full border-2 border-(--chat-surface) bg-(--chat-online)" })
+      ] }),
+      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "min-w-0 flex-1", children: [
+        /* @__PURE__ */ jsxRuntime.jsxs("h2", { className: "truncate text-xs font-medium leading-tight text-(--chat-text)", children: [
+          user.name,
+          "123"
+        ] }),
+        /* @__PURE__ */ jsxRuntime.jsx("p", { className: "truncate text-[10px] text-(--chat-muted)", children: user.email })
+      ] }),
+      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex shrink-0 items-center gap-0.5", children: [
+        /* @__PURE__ */ jsxRuntime.jsx(LoggedUserSettingsDialog_default, { loggedUserDetails }),
+        showColorModeToggle ? /* @__PURE__ */ jsxRuntime.jsx(ChatThemeToggle_default, {}) : null
+      ] })
+    ] }),
+    /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "mt-3 flex items-center gap-1.5", children: [
+      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: chatSidebarSearchShellClass, children: [
+        /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Search, { className: "pointer-events-none size-3.5 shrink-0 text-(--chat-muted)" }),
+        /* @__PURE__ */ jsxRuntime.jsx(
+          "input",
+          {
+            type: "text",
+            inputMode: "search",
+            enterKeyHint: "search",
+            placeholder: "Search conversations...",
+            value: searchQuery,
+            onChange: (e) => setSearchQuery?.(e.target.value),
+            className: chatSidebarSearchInputClass
+          }
+        ),
+        searchQuery ? /* @__PURE__ */ jsxRuntime.jsx(
+          "button",
+          {
+            type: "button",
+            onClick: () => setSearchQuery?.(""),
+            className: "flex size-6 shrink-0 items-center justify-center rounded-md text-(--chat-muted) transition-colors hover:bg-(--chat-hover) hover:text-(--chat-text)",
+            "aria-label": "Clear search",
+            children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.X, { size: 12 })
+          }
+        ) : null
+      ] }),
+      /* @__PURE__ */ jsxRuntime.jsx(
+        CreateChatDialog_default,
+        {
+          loggedUserDetails,
+          onUserSelect,
+          isCreateModalOpen,
+          setIsCreateModalOpen
+        }
+      )
+    ] })
+  ] });
+};
+var LoggedUserDetails_default = LoggedUserDetails;
+function ScrollArea({
+  className,
+  children,
+  ...props
+}) {
+  return /* @__PURE__ */ jsxRuntime.jsxs(
+    radixUi.ScrollArea.Root,
+    {
+      "data-slot": "scroll-area",
+      className: cn("relative", className),
+      ...props,
+      children: [
+        /* @__PURE__ */ jsxRuntime.jsx(
+          radixUi.ScrollArea.Viewport,
+          {
+            "data-slot": "scroll-area-viewport",
+            className: "focus-visible:ring-ring/50 size-full rounded-[inherit] transition-[color,box-shadow] outline-none focus-visible:ring-[3px] focus-visible:outline-1",
+            children
+          }
+        ),
+        /* @__PURE__ */ jsxRuntime.jsx(ScrollBar, {}),
+        /* @__PURE__ */ jsxRuntime.jsx(radixUi.ScrollArea.Corner, {})
+      ]
+    }
+  );
+}
+function ScrollBar({
+  className,
+  orientation = "vertical",
+  ...props
+}) {
+  return /* @__PURE__ */ jsxRuntime.jsx(
+    radixUi.ScrollArea.ScrollAreaScrollbar,
+    {
+      "data-slot": "scroll-area-scrollbar",
+      orientation,
+      className: cn(
+        "flex touch-none p-px transition-colors select-none",
+        orientation === "vertical" && "h-full w-2.5 border-l border-l-transparent",
+        orientation === "horizontal" && "h-2.5 flex-col border-t border-t-transparent",
+        className
+      ),
+      ...props,
+      children: /* @__PURE__ */ jsxRuntime.jsx(
+        radixUi.ScrollArea.ScrollAreaThumb,
+        {
+          "data-slot": "scroll-area-thumb",
+          className: "bg-border relative flex-1 rounded-full"
+        }
+      )
+    }
+  );
+}
+
+// src/chat/channel-list/useChannelList.ts
+init_useStore();
+init_store_helpers();
+var conversationDrafts = /* @__PURE__ */ new Map();
+var DRAFT_PREVIEW_MAX_LENGTH = 50;
+var emptyDraft = () => ({
+  messageInput: "",
+  attachments: []
+});
+var draftRevision = 0;
+var draftListeners = /* @__PURE__ */ new Set();
+function notifyDraftChange() {
+  draftRevision += 1;
+  draftListeners.forEach((listener) => listener());
+}
+function subscribeToDrafts(listener) {
+  draftListeners.add(listener);
+  return () => {
+    draftListeners.delete(listener);
+  };
+}
+function getDraftRevision() {
+  return draftRevision;
+}
+function useDraftRevision() {
+  return React2.useSyncExternalStore(subscribeToDrafts, getDraftRevision, getDraftRevision);
+}
+function getConversationDraft(conversationId) {
+  if (!conversationId) return emptyDraft();
+  return conversationDrafts.get(conversationId) ?? emptyDraft();
+}
+function updateConversationDraft(conversationId, draft) {
+  if (!conversationId) return;
+  if (draft.messageInput.trim() || draft.attachments.length > 0) {
+    conversationDrafts.set(conversationId, {
+      messageInput: draft.messageInput,
+      attachments: draft.attachments
+    });
+  } else {
+    conversationDrafts.delete(conversationId);
+  }
+  notifyDraftChange();
+}
+function clearConversationDraft(conversationId) {
+  if (!conversationId) return;
+  if (!conversationDrafts.has(conversationId)) return;
+  conversationDrafts.delete(conversationId);
+  notifyDraftChange();
+}
+function getConversationDraftPreview(conversationId) {
+  if (!conversationId) return null;
   const draft = conversationDrafts.get(conversationId);
   if (!draft) return null;
   const text = draft.messageInput.trim();
@@ -12131,52 +12663,23 @@ var ChannelDetailsDrawer = (props) => {
             participantCount > 0 && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex flex-wrap gap-1.5 pb-1", children: participants.map((p, index) => {
               const pId = typeof p === "string" ? p : p._id;
               const pName = typeof p === "string" ? "Unknown" : p.name;
-              if (!pId) return null;
-              return /* @__PURE__ */ jsxRuntime.jsx(
-                "span",
-                {
-                  className: "rounded-md border border-(--chat-border) bg-(--chat-input-bg)/50 px-2 py-0.5 text-[10px] font-medium text-(--chat-text-secondary)",
-                  children: pName
-                },
-                `${pId}-${index}`
-              );
-            }) })
-          ] })
-        ] })
-      ] })
-    ] })
-  ] }) });
-};
-var ChannelDetailsDrawer_default = ChannelDetailsDrawer;
-function Switch({
-  className,
-  size = "default",
-  ...props
-}) {
-  return /* @__PURE__ */ jsxRuntime.jsx(
-    radixUi.Switch.Root,
-    {
-      "data-slot": "switch",
-      "data-size": size,
-      className: cn(
-        "peer group/switch inline-flex shrink-0 items-center rounded-full border border-transparent shadow-xs transition-all outline-none focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:cursor-not-allowed disabled:opacity-50 data-[size=default]:h-[1.15rem] data-[size=default]:w-8 data-[size=sm]:h-3.5 data-[size=sm]:w-6 data-[state=checked]:bg-primary data-[state=unchecked]:bg-input dark:data-[state=unchecked]:bg-input/80",
-        className
-      ),
-      ...props,
-      children: /* @__PURE__ */ jsxRuntime.jsx(
-        radixUi.Switch.Thumb,
-        {
-          "data-slot": "switch-thumb",
-          className: cn(
-            "pointer-events-none block rounded-full bg-background ring-0 transition-transform group-data-[size=default]/switch:size-4 group-data-[size=sm]/switch:size-3 data-[state=checked]:translate-x-[calc(100%-2px)] data-[state=unchecked]:translate-x-0 dark:data-[state=checked]:bg-primary-foreground dark:data-[state=unchecked]:bg-foreground"
-          )
-        }
-      )
-    }
-  );
-}
-
-// src/chat/header/PermissionDrawer.tsx
+              if (!pId) return null;
+              return /* @__PURE__ */ jsxRuntime.jsx(
+                "span",
+                {
+                  className: "rounded-md border border-(--chat-border) bg-(--chat-input-bg)/50 px-2 py-0.5 text-[10px] font-medium text-(--chat-text-secondary)",
+                  children: pName
+                },
+                `${pId}-${index}`
+              );
+            }) })
+          ] })
+        ] })
+      ] })
+    ] })
+  ] }) });
+};
+var ChannelDetailsDrawer_default = ChannelDetailsDrawer;
 init_useStore();
 var PermissionDrawer = ({ isOpen, onOpenChange, conversationId, conversationInfo }) => {
   const updateGroupPermissions = exports.useChatStore((s) => s.updateGroupPermissions);
@@ -17568,251 +18071,15 @@ function ChatViewport({
         "chat-package-viewport flex min-h-0 w-full flex-col overflow-hidden",
         resolved.className,
         className
-      ),
-      style: { ...resolved.style, ...style },
-      children
-    }
-  );
-}
-var ChatViewport_default = ChatViewport;
-var showNotification = (message, type = "info", icon, duration) => {
-  const options = {
-    icon,
-    duration
-  };
-  switch (type) {
-    case "success":
-      toast2.toast.success(message, options);
-      break;
-    case "error":
-      toast2.toast.error(message, options);
-      break;
-    case "info":
-      toast2.toast(message, options);
-      break;
-    case "warning":
-      toast2.toast(message, { ...options, icon: "\u26A0\uFE0F" });
-      break;
-    default:
-      toast2.toast(message, options);
-  }
-};
-var downloadFile = async (src, name) => {
-  try {
-    const link = document.createElement("a");
-    link.href = src;
-    link.setAttribute("download", name);
-    link.setAttribute("rel", "noopener noreferrer");
-    link.click();
-    showNotification("File Downloaded Successfully", "success");
-  } catch (err) {
-    console.error("File download failed:", err);
-    showNotification("Failed to download file", "error");
-  }
-};
-var getResponsiveWidth = (width) => {
-  const screenWidth = window.innerWidth;
-  if (width) {
-    return width;
-  } else if (screenWidth < 640) {
-    return 350;
-  } else if (screenWidth >= 640 && screenWidth < 1024) {
-    return 600;
-  } else if (screenWidth >= 1024 && screenWidth < 1280) {
-    return 800;
-  } else {
-    return 1e3;
-  }
-};
-var isEmpty = (value) => {
-  if (value === null || value === void 0) return true;
-  if (typeof value === "string") return value.trim().length === 0;
-  if (Array.isArray(value)) {
-    return value.length === 0 || value.every((item) => isEmpty(item));
-  }
-  if (typeof value === "object") {
-    return Object.keys(value).length === 0;
-  }
-  return false;
-};
-function uniqueList(list, key) {
-  const seen = /* @__PURE__ */ new Set();
-  return list.filter((item) => {
-    const value = item[key];
-    if (seen.has(value)) return false;
-    seen.add(value);
-    return true;
-  });
-}
-var capitalizeFirst = (str) => str.charAt(0).toUpperCase() + str.slice(1);
-var getFirstAndLastNameOneCharacter = (name) => {
-  const names = name.split(" ");
-  return names.map((name2) => name2.charAt(0).toUpperCase()).join("");
-};
-
-// src/notifications/ForegroundPushBridge.tsx
-init_normalize_helpers();
-init_useStore();
-
-// src/notifications/push.service.ts
-init_client();
-var PUSH_TOKEN_STORAGE_KEY = "realtimex-push-token";
-var SERVICE_WORKER_PATH = "/firebase-messaging-sw.js";
-var PUSH_CHANGED_EVENT = "realtimex:push-changed";
-var emitPushChanged = (enabled) => {
-  try {
-    window.dispatchEvent(
-      new CustomEvent(PUSH_CHANGED_EVENT, { detail: { enabled } })
-    );
-  } catch {
-  }
-};
-var v2Url = "https://realtimex.softwareco.com/api/v2";
-var apiGetPushConfig = async () => {
-  const { data } = await apiClient.get(`${v2Url}/notifications/push/config`);
-  return data?.data;
-};
-var apiRegisterPushToken = async (token, deviceLabel) => {
-  const { data } = await apiClient.post(`${v2Url}/notifications/push/token`, {
-    token,
-    deviceLabel
-  });
-  return data?.data;
-};
-var apiRemovePushToken = async (token) => {
-  const { data } = await apiClient.delete(`${v2Url}/notifications/push/token`, {
-    data: { token }
-  });
-  return data;
-};
-var apiGetPushPreference = async () => {
-  const { data } = await apiClient.get(
-    `${v2Url}/notifications/push/preference`
-  );
-  return data?.data;
-};
-var apiUpdatePushPreference = async (enabled) => {
-  const { data } = await apiClient.patch(
-    `${v2Url}/notifications/push/preference`,
-    { enabled }
-  );
-  return data?.data;
-};
-var isPushSupported = () => typeof window !== "undefined" && "Notification" in window && "serviceWorker" in navigator && "PushManager" in window;
-var getStoredPushToken = () => {
-  try {
-    return localStorage.getItem(PUSH_TOKEN_STORAGE_KEY);
-  } catch {
-    return null;
-  }
-};
-var storePushToken = (token) => {
-  try {
-    if (token) localStorage.setItem(PUSH_TOKEN_STORAGE_KEY, token);
-    else localStorage.removeItem(PUSH_TOKEN_STORAGE_KEY);
-  } catch {
-  }
-};
-var defaultDeviceLabel = () => {
-  const ua = navigator.userAgent;
-  const browser = /edg\//i.test(ua) ? "Edge" : /chrome/i.test(ua) ? "Chrome" : /safari/i.test(ua) ? "Safari" : /firefox/i.test(ua) ? "Firefox" : "Browser";
-  const os = /mac/i.test(ua) ? "macOS" : /windows/i.test(ua) ? "Windows" : /android/i.test(ua) ? "Android" : /iphone|ipad/i.test(ua) ? "iOS" : /linux/i.test(ua) ? "Linux" : "Unknown OS";
-  return `${browser} on ${os}`;
-};
-var loadFirebaseMessaging = async () => {
-  try {
-    const [{ initializeApp, getApps }, messagingModule] = await Promise.all([
-      import('firebase/app'),
-      import('firebase/messaging')
-    ]);
-    return { initializeApp, getApps, ...messagingModule };
-  } catch {
-    throw new Error(
-      'Push notifications need the "firebase" package \u2014 run: npm install firebase'
-    );
-  }
-};
-var getFirebaseMessaging = async (firebaseConfig) => {
-  const fb = await loadFirebaseMessaging();
-  const app = fb.getApps().length ? fb.getApps()[0] : fb.initializeApp(firebaseConfig);
-  return { fb, messaging: fb.getMessaging(app) };
-};
-var enablePushOnThisDevice = async () => {
-  if (!isPushSupported()) {
-    throw new Error("Push notifications are not supported in this browser");
-  }
-  const config = await apiGetPushConfig();
-  if (!config?.enabled) {
-    throw new Error("Push notifications are disabled for this workspace");
-  }
-  if (!config.configured || !config.firebaseConfig || !config.vapidKey) {
-    throw new Error(
-      "Push notifications are not configured on the server yet"
-    );
-  }
-  const permission = await Notification.requestPermission();
-  if (permission !== "granted") {
-    throw new Error("Notification permission was not granted");
-  }
-  let registration;
-  try {
-    registration = await navigator.serviceWorker.register(
-      `${SERVICE_WORKER_PATH}?config=${encodeURIComponent(
-        JSON.stringify(config.firebaseConfig)
-      )}`
-    );
-  } catch {
-    throw new Error(
-      `Could not register ${SERVICE_WORKER_PATH} \u2014 copy it from node_modules/@realtimexsco/live-chat/dist/firebase-messaging-sw.js into your app's public folder`
-    );
-  }
-  const { fb, messaging } = await getFirebaseMessaging(config.firebaseConfig);
-  const token = await fb.getToken(messaging, {
-    vapidKey: config.vapidKey,
-    serviceWorkerRegistration: registration
-  });
-  if (!token) {
-    throw new Error("Could not obtain a push token from Firebase");
-  }
-  await apiRegisterPushToken(token, defaultDeviceLabel());
-  storePushToken(token);
-  emitPushChanged(true);
-  return token;
-};
-var disablePushOnThisDevice = async () => {
-  const token = getStoredPushToken();
-  if (!token) return;
-  try {
-    const config = await apiGetPushConfig();
-    if (config?.firebaseConfig) {
-      const { fb, messaging } = await getFirebaseMessaging(
-        config.firebaseConfig
-      );
-      await fb.deleteToken(messaging).catch(() => void 0);
-    }
-  } catch {
-  }
-  await apiRemovePushToken(token).catch(() => void 0);
-  storePushToken(null);
-  emitPushChanged(false);
-};
-var onForegroundPush = async (callback) => {
-  const config = await apiGetPushConfig();
-  if (!config?.configured || !config.firebaseConfig) {
-    throw new Error("Push config unavailable (not configured or API not ready)");
-  }
-  const { fb, messaging } = await getFirebaseMessaging(config.firebaseConfig);
-  return fb.onMessage(messaging, (payload) => {
-    console.log("[realtimex-push] FCM foreground payload (raw):", payload);
-    console.log("[realtimex-push] FCM foreground data:", payload?.data);
-    console.log("[realtimex-push] FCM foreground notification:", payload?.notification);
-    callback({
-      title: payload?.notification?.title,
-      body: payload?.notification?.body,
-      data: payload?.data
-    });
-  });
-};
+      ),
+      style: { ...resolved.style, ...style },
+      children
+    }
+  );
+}
+var ChatViewport_default = ChatViewport;
+init_normalize_helpers();
+init_useStore();
 var RETRY_DELAYS_MS = [1e3, 3e3, 8e3, 2e4];
 var recentToastIds = /* @__PURE__ */ new Set();
 var rememberToastId = (id) => {
@@ -17826,48 +18093,95 @@ var rememberToastId = (id) => {
   }
   return true;
 };
-var resolveToastText = (title, body) => {
-  if (title && body) return `${title}: ${body}`;
-  return title || body || "";
+var truncate = (value, max) => value.length > max ? `${value.slice(0, max - 1)}\u2026` : value;
+var PushMessageToast = ({
+  t,
+  title,
+  body,
+  onOpen
+}) => {
+  const dismiss = () => toast__default.default.dismiss(t.id);
+  const handleDismiss = (event) => {
+    event.stopPropagation();
+    dismiss();
+  };
+  const handleOpen = () => {
+    dismiss();
+    onOpen?.();
+  };
+  return /* @__PURE__ */ jsxRuntime.jsxs(
+    "div",
+    {
+      role: "alert",
+      "aria-live": "polite",
+      onClick: onOpen ? handleOpen : void 0,
+      onKeyDown: onOpen ? (event) => {
+        if (event.key === "Enter" || event.key === " ") {
+          event.preventDefault();
+          handleOpen();
+        }
+      } : void 0,
+      tabIndex: onOpen ? 0 : void 0,
+      className: cn(
+        "pointer-events-auto flex w-[min(320px,calc(100vw-24px))] items-start gap-3 rounded-xl border border-(--chat-border) bg-(--chat-surface) p-3 shadow-[0_8px_24px_rgba(15,23,42,0.12)] transition-[opacity,transform] duration-200 ease-out",
+        onOpen && "cursor-pointer hover:border-(--chat-theme-20) hover:shadow-[0_10px_28px_rgba(15,23,42,0.16)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-(--chat-theme-30)",
+        t.visible ? "translate-y-0 opacity-100" : "-translate-y-1 opacity-0"
+      ),
+      children: [
+        /* @__PURE__ */ jsxRuntime.jsx(
+          "div",
+          {
+            "aria-hidden": true,
+            className: "flex size-9 shrink-0 items-center justify-center rounded-lg bg-(--chat-theme-10) text-(--chat-theme)",
+            children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.MessageSquare, { className: "size-4", strokeWidth: 2.25 })
+          }
+        ),
+        /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "min-w-0 flex-1 pt-0.5", children: [
+          /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-[11px] font-semibold uppercase tracking-wide text-(--chat-muted)", children: "New message" }),
+          /* @__PURE__ */ jsxRuntime.jsx("p", { className: "mt-0.5 truncate text-sm font-semibold leading-snug text-(--chat-text)", children: truncate(title, 40) }),
+          body ? /* @__PURE__ */ jsxRuntime.jsx("p", { className: "mt-0.5 line-clamp-2 text-xs leading-relaxed text-(--chat-muted)", children: truncate(body, 72) }) : null
+        ] }),
+        /* @__PURE__ */ jsxRuntime.jsx(
+          "button",
+          {
+            type: "button",
+            "aria-label": "Dismiss notification",
+            onClick: handleDismiss,
+            className: "shrink-0 rounded-md p-1 text-(--chat-muted) transition-colors hover:bg-(--chat-hover) hover:text-(--chat-text) focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-(--chat-theme-30)",
+            children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.X, { className: "size-4", strokeWidth: 2 })
+          }
+        )
+      ]
+    }
+  );
 };
 var emitToast = (payload, onPush) => {
   if (onPush && onPush(payload) !== false) return;
-  const title = payload.title || payload.data?.title;
-  const body = payload.body || payload.data?.body || payload.data?.message;
-  const text = resolveToastText(title, body);
+  const title = payload.title || payload.data?.title || "New message";
+  const body = payload.body || payload.data?.body || payload.data?.message || "";
   const conversationId = resolveConversationIdFromPushData(payload.data);
-  if (!text) return;
-  if (conversationId) {
-    toast2__default.default.custom(
-      (t) => /* @__PURE__ */ jsxRuntime.jsx(
-        "button",
-        {
-          type: "button",
-          onClick: () => {
-            toast2__default.default.dismiss(t.id);
-            requestOpenConversation(conversationId);
-          },
-          style: {
-            display: "block",
-            width: "100%",
-            textAlign: "left",
-            cursor: "pointer",
-            background: "var(--background, #fff)",
-            color: "var(--foreground, #111)",
-            border: "1px solid rgba(0,0,0,0.08)",
-            borderRadius: 8,
-            padding: "10px 14px",
-            boxShadow: "0 4px 12px rgba(0,0,0,0.12)",
-            font: "inherit"
-          },
-          children: text
-        }
-      ),
-      { duration: 5e3 }
-    );
-    return;
-  }
-  showNotification(text, "info");
+  const messageId2 = String(
+    payload.data?.messageId || payload.data?.message_id || payload.data?.messageID || ""
+  );
+  if (!title && !body) return;
+  toast__default.default.custom(
+    (t) => /* @__PURE__ */ jsxRuntime.jsx(
+      PushMessageToast,
+      {
+        t,
+        title,
+        body: body || void 0,
+        onOpen: conversationId ? () => requestOpenConversation(
+          conversationId,
+          payload.data
+        ) : void 0
+      }
+    ),
+    {
+      duration: 5e3,
+      id: messageId2 || void 0
+    }
+  );
 };
 var ForegroundPushBridge = ({ onPush }) => {
   const lastDM = exports.useChatStore((s) => s.lastDM);
@@ -18002,11 +18316,31 @@ var ForegroundPushBridge = ({ onPush }) => {
     return () => window.removeEventListener(OPEN_CONVERSATION_EVENT, onOpen);
   }, []);
   return /* @__PURE__ */ jsxRuntime.jsx(
-    toast2.Toaster,
+    toast.Toaster,
     {
       position: "top-right",
-      toastOptions: { duration: 4e3 },
-      containerStyle: { zIndex: 99999 }
+      gutter: 12,
+      containerClassName: "realtimex-push-toaster",
+      containerStyle: {
+        zIndex: 99999,
+        top: 16,
+        right: 16,
+        width: "auto",
+        maxWidth: "none"
+      },
+      toastOptions: {
+        duration: 5e3,
+        className: "!w-auto !max-w-none",
+        style: {
+          padding: 0,
+          margin: 0,
+          background: "transparent",
+          boxShadow: "none",
+          border: "none",
+          width: "auto",
+          maxWidth: "none"
+        }
+      }
     }
   );
 };
@@ -18163,6 +18497,80 @@ var getSocketConfig = (accessToken, tenantId, options) => {
     }
   };
 };
+var showNotification = (message, type = "info", icon, duration) => {
+  const options = {
+    icon,
+    duration
+  };
+  switch (type) {
+    case "success":
+      toast.toast.success(message, options);
+      break;
+    case "error":
+      toast.toast.error(message, options);
+      break;
+    case "info":
+      toast.toast(message, options);
+      break;
+    case "warning":
+      toast.toast(message, { ...options, icon: "\u26A0\uFE0F" });
+      break;
+    default:
+      toast.toast(message, options);
+  }
+};
+var downloadFile = async (src, name) => {
+  try {
+    const link = document.createElement("a");
+    link.href = src;
+    link.setAttribute("download", name);
+    link.setAttribute("rel", "noopener noreferrer");
+    link.click();
+    showNotification("File Downloaded Successfully", "success");
+  } catch (err) {
+    console.error("File download failed:", err);
+    showNotification("Failed to download file", "error");
+  }
+};
+var getResponsiveWidth = (width) => {
+  const screenWidth = window.innerWidth;
+  if (width) {
+    return width;
+  } else if (screenWidth < 640) {
+    return 350;
+  } else if (screenWidth >= 640 && screenWidth < 1024) {
+    return 600;
+  } else if (screenWidth >= 1024 && screenWidth < 1280) {
+    return 800;
+  } else {
+    return 1e3;
+  }
+};
+var isEmpty = (value) => {
+  if (value === null || value === void 0) return true;
+  if (typeof value === "string") return value.trim().length === 0;
+  if (Array.isArray(value)) {
+    return value.length === 0 || value.every((item) => isEmpty(item));
+  }
+  if (typeof value === "object") {
+    return Object.keys(value).length === 0;
+  }
+  return false;
+};
+function uniqueList(list, key) {
+  const seen = /* @__PURE__ */ new Set();
+  return list.filter((item) => {
+    const value = item[key];
+    if (seen.has(value)) return false;
+    seen.add(value);
+    return true;
+  });
+}
+var capitalizeFirst = (str) => str.charAt(0).toUpperCase() + str.slice(1);
+var getFirstAndLastNameOneCharacter = (name) => {
+  const names = name.split(" ");
+  return names.map((name2) => name2.charAt(0).toUpperCase()).join("");
+};
 var SIZE_MAP = {
   xs: "size-6",
   sm: "size-8",
@@ -18336,135 +18744,6 @@ var packageDefaultComponents = {
   ChatDateTimeSettings: ChatDateTimeSettings_default,
   ChatSocketStatus: ChatSocketStatus_default
 };
-var usePushNotifications = () => {
-  const [state, setState] = React2.useState({
-    supported: false,
-    allowedByWorkspace: false,
-    configured: false,
-    permission: "unsupported",
-    userEnabled: true,
-    deviceEnabled: false,
-    loading: true,
-    error: null
-  });
-  const refresh = React2.useCallback(async () => {
-    if (!isPushSupported()) {
-      setState((prev) => ({
-        ...prev,
-        supported: false,
-        loading: false
-      }));
-      return;
-    }
-    try {
-      const [config, preference] = await Promise.all([
-        apiGetPushConfig(),
-        apiGetPushPreference().catch(() => null)
-      ]);
-      setState({
-        supported: true,
-        allowedByWorkspace: Boolean(config?.enabled),
-        configured: Boolean(config?.configured),
-        permission: Notification.permission,
-        userEnabled: preference?.enabled ?? true,
-        deviceEnabled: Notification.permission === "granted" && Boolean(getStoredPushToken()),
-        loading: false,
-        error: null
-      });
-    } catch (error) {
-      setState((prev) => ({
-        ...prev,
-        supported: true,
-        loading: false,
-        error: error instanceof Error ? error.message : "Could not load push settings"
-      }));
-    }
-  }, []);
-  React2.useEffect(() => {
-    void refresh();
-  }, [refresh]);
-  const enable = React2.useCallback(async () => {
-    setState((prev) => ({ ...prev, loading: true, error: null }));
-    try {
-      await enablePushOnThisDevice();
-      await refresh();
-      return true;
-    } catch (error) {
-      setState((prev) => ({
-        ...prev,
-        loading: false,
-        permission: isPushSupported() ? Notification.permission : "unsupported",
-        error: error instanceof Error ? error.message : "Could not enable push notifications"
-      }));
-      return false;
-    }
-  }, [refresh]);
-  const disable = React2.useCallback(async () => {
-    setState((prev) => ({ ...prev, loading: true, error: null }));
-    try {
-      await disablePushOnThisDevice();
-    } finally {
-      await refresh();
-    }
-  }, [refresh]);
-  const setUserEnabled = React2.useCallback(
-    async (enabled) => {
-      setState((prev) => ({ ...prev, userEnabled: enabled }));
-      try {
-        await apiUpdatePushPreference(enabled);
-      } catch (error) {
-        setState((prev) => ({
-          ...prev,
-          userEnabled: !enabled,
-          error: error instanceof Error ? error.message : "Could not update push preference"
-        }));
-      }
-    },
-    []
-  );
-  return { ...state, enable, disable, setUserEnabled, refresh };
-};
-var PushNotificationToggle = ({
-  className,
-  label = "Push notifications",
-  description = "Get notified about new messages on this device"
-}) => {
-  const push = usePushNotifications();
-  if (!push.supported || !push.allowedByWorkspace || !push.configured) {
-    return null;
-  }
-  const isOn = push.deviceEnabled && push.userEnabled;
-  const permissionBlocked = push.permission === "denied";
-  const handleChange = async (checked) => {
-    if (checked) {
-      if (!push.userEnabled) await push.setUserEnabled(true);
-      if (!push.deviceEnabled) await push.enable();
-    } else {
-      await push.disable();
-    }
-  };
-  return /* @__PURE__ */ jsxRuntime.jsxs(
-    "div",
-    {
-      className: className ?? "flex items-center justify-between gap-4 rounded-xl border border-border bg-background px-4 py-3",
-      children: [
-        /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-0.5", children: [
-          /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-sm font-medium text-foreground", children: label }),
-          /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-xs text-muted-foreground", children: permissionBlocked ? "Notifications are blocked in your browser settings" : push.error ?? description })
-        ] }),
-        /* @__PURE__ */ jsxRuntime.jsx(
-          Switch,
-          {
-            checked: isOn,
-            disabled: push.loading || permissionBlocked,
-            onCheckedChange: (checked) => void handleChange(checked),
-            "aria-label": `Toggle ${label}`
-          }
-        )
-      ]
-    }
-  );
-};
 
 // src/index.ts
 var index_default = ChatMain_default;
@@ -18497,16 +18776,21 @@ exports.MessageItem = MessageItemView;
 exports.MessageList = ActiveChannelMessagesView_default;
 exports.NOTIFICATION_CLICK_SW_TYPE = NOTIFICATION_CLICK_SW_TYPE;
 exports.OPEN_CONVERSATION_EVENT = OPEN_CONVERSATION_EVENT;
+exports.PUSH_BROADCAST_CHANNEL = PUSH_BROADCAST_CHANNEL;
 exports.PUSH_CHANGED_EVENT = PUSH_CHANGED_EVENT;
+exports.PUSH_DATA_CACHE_NAME = PUSH_DATA_CACHE_NAME;
 exports.PushNotificationToggle = PushNotificationToggle;
 exports.apiGetPushConfig = apiGetPushConfig;
 exports.apiGetPushPreference = apiGetPushPreference;
 exports.apiRegisterPushToken = apiRegisterPushToken;
 exports.apiRemovePushToken = apiRemovePushToken;
 exports.apiUpdatePushPreference = apiUpdatePushPreference;
+exports.buildChannelFromPushRequest = buildChannelFromPushRequest;
 exports.capitalizeFirst = capitalizeFirst;
 exports.clampJumpDate = clampJumpDate;
 exports.consumePendingOpenConversation = consumePendingOpenConversation;
+exports.consumePendingOpenFromPushCache = consumePendingOpenFromPushCache;
+exports.consumePendingOpenRequest = consumePendingOpenRequest;
 exports.default = index_default;
 exports.defaultChatClassNames = defaultChatClassNames;
 exports.defaultChatComponents = defaultChatComponents;
@@ -18527,6 +18811,7 @@ exports.mergeChatLayoutConfig = mergeChatLayoutConfig;
 exports.onForegroundPush = onForegroundPush;
 exports.packageDefaultComponents = packageDefaultComponents;
 exports.peekPendingOpenConversation = peekPendingOpenConversation;
+exports.peekPendingOpenRequest = peekPendingOpenRequest;
 exports.requestOpenConversation = requestOpenConversation;
 exports.resolveApiUrl = resolveApiUrl;
 exports.resolveChatApiKey = resolveChatApiKey;