diff --git a/Update.json b/Update.json
index 1c7bd178..ac65ef40 100644
--- a/Update.json
+++ b/Update.json
@@ -3288,6 +3288,17 @@
                 }
             ],
             "Notes": "No release notes were provided for this release."
+        },
+        "2.7.3": {
+            "UpdateDate": 1770816092957,
+            "Prerelease": true,
+            "UpdateContents": [
+                {
+                    "PR": 905,
+                    "Description": "Add WebSocket notification system for real-time BBS and mail mentions"
+                }
+            ],
+            "Notes": "Adds WebSocket-based real-time notification system for BBS mentions and mail notifications. Notifications now arrive within 1-2 seconds instead of requiring page focus. Includes automatic reconnection with exponential backoff and fallback to polling when WebSocket is unavailable."
         }
     }
 }
\ No newline at end of file
diff --git a/Update/UpdateVersion.js b/Update/UpdateVersion.js
index 840ec2b8..cd744cd8 100644
--- a/Update/UpdateVersion.js
+++ b/Update/UpdateVersion.js
@@ -7,6 +7,14 @@ process.env.GITHUB_TOKEN = GithubToken;
 execSync("gh pr checkout " + PRNumber);
 console.info("PR #" + PRNumber + " has been checked out.");
 
+// Check if the last commit was made by github-actions[bot]
+const lastCommitAuthor = execSync("git log -1 --pretty=format:'%an'").toString().trim();
+console.log("Last commit author: " + lastCommitAuthor);
+if (lastCommitAuthor === "github-actions[bot]") {
+    console.log("Last commit was made by github-actions[bot]. Skipping to prevent infinite loop.");
+    process.exit(0);
+}
+
 const JSONFileName = "./Update.json";
 const JSFileName = "./XMOJ.user.js";
 var JSONFileContent = readFileSync(JSONFileName, "utf8");
diff --git a/XMOJ.user.js b/XMOJ.user.js
index 035aa0e0..0b3066fd 100644
--- a/XMOJ.user.js
+++ b/XMOJ.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         XMOJ
-// @version      2.7.2
+// @version      2.7.3
 // @description  XMOJ增强脚本
 // @author       @XMOJ-Script-dev, @langningchen and the community
 // @namespace    https://github/langningchen
@@ -533,6 +533,287 @@ let RequestAPI = (Action, Data, CallBack) => {
     }
 };
 
+// WebSocket Notification System
+let NotificationSocket = null;
+let NotificationSocketReconnectAttempts = 0;
+let NotificationSocketReconnectDelay = 1000;
+let NotificationSocketPingInterval = null;
+let NotificationSocketReconnectTimer = null;
+
+function GetPHPSESSID() {
+    let Session = "";
+    let Temp = document.cookie.split(";");
+    for (let i = 0; i < Temp.length; i++) {
+        if (Temp[i].includes("PHPSESSID")) {
+            Session = Temp[i].split("=")[1];
+            break;
+        }
+    }
+    return Session;
+}
+
+function ConnectNotificationSocket() {
+    try {
+        // Clear any pending reconnection timer to prevent duplicate connections
+        if (NotificationSocketReconnectTimer) {
+            clearTimeout(NotificationSocketReconnectTimer);
+            NotificationSocketReconnectTimer = null;
+        }
+
+        let Session = GetPHPSESSID();
+        if (Session === "") {
+            if (UtilityEnabled("DebugMode")) {
+                console.log("WebSocket: PHPSESSID not available, skipping connection");
+            }
+            return;
+        }
+
+        let wsUrl = (UtilityEnabled("SuperDebug") ? "ws://127.0.0.1:8787" : "wss://api.xmoj-bbs.me") + "/ws/notifications?SessionID=" + Session;
+
+        if (UtilityEnabled("DebugMode")) {
+            console.log("WebSocket: Connecting to", wsUrl);
+        }
+
+        NotificationSocket = new WebSocket(wsUrl);
+
+        NotificationSocket.onopen = () => {
+            if (UtilityEnabled("DebugMode")) {
+                console.log("WebSocket: Connected successfully");
+            }
+            NotificationSocketReconnectAttempts = 0;
+            NotificationSocketReconnectDelay = 1000;
+
+            // Start ping keepalive
+            if (NotificationSocketPingInterval) {
+                clearInterval(NotificationSocketPingInterval);
+            }
+            NotificationSocketPingInterval = setInterval(() => {
+                if (NotificationSocket && NotificationSocket.readyState === WebSocket.OPEN) {
+                    NotificationSocket.send(JSON.stringify({ type: 'ping' }));
+                    if (UtilityEnabled("DebugMode")) {
+                        console.log("WebSocket: Sent ping");
+                    }
+                } else {
+                    clearInterval(NotificationSocketPingInterval);
+                }
+            }, 30000);
+        };
+
+        NotificationSocket.onmessage = (event) => {
+            HandleNotificationMessage(event);
+        };
+
+        NotificationSocket.onerror = (error) => {
+            if (UtilityEnabled("DebugMode")) {
+                console.error("WebSocket: Error", error);
+            }
+        };
+
+        NotificationSocket.onclose = (event) => {
+            if (UtilityEnabled("DebugMode")) {
+                console.log("WebSocket: Connection closed", event.code, event.reason);
+            }
+            if (NotificationSocketPingInterval) {
+                clearInterval(NotificationSocketPingInterval);
+            }
+            ReconnectNotificationSocket();
+        };
+    } catch (e) {
+        console.error("WebSocket: Failed to connect", e);
+        ReconnectNotificationSocket();
+    }
+}
+
+function ReconnectNotificationSocket() {
+    const delay = Math.min(NotificationSocketReconnectDelay * Math.pow(2, NotificationSocketReconnectAttempts), 30000);
+    NotificationSocketReconnectAttempts++;
+
+    if (UtilityEnabled("DebugMode")) {
+        console.log(`WebSocket: Reconnecting in ${delay}ms (attempt ${NotificationSocketReconnectAttempts})`);
+    }
+
+    NotificationSocketReconnectTimer = setTimeout(() => {
+        ConnectNotificationSocket();
+    }, delay);
+}
+
+function HandleNotificationMessage(event) {
+    try {
+        const notification = JSON.parse(event.data);
+
+        if (UtilityEnabled("DebugMode")) {
+            console.log("WebSocket: Received message", notification);
+        }
+
+        if (notification.type === 'connected') {
+            if (UtilityEnabled("DebugMode")) {
+                console.log("WebSocket: Server confirmed connection at timestamp", notification.timestamp);
+            }
+        } else if (notification.type === 'bbs_mention') {
+            // Backend now provides all data needed for immediate display
+            CreateAndShowBBSMentionToast(notification.data);
+        } else if (notification.type === 'mail_mention') {
+            // Backend now provides all data needed for immediate display
+            CreateAndShowMailMentionToast(notification.data);
+        } else if (notification.type === 'pong') {
+            if (UtilityEnabled("DebugMode")) {
+                console.log("WebSocket: Received pong");
+            }
+        }
+    } catch (e) {
+        console.error("WebSocket: Failed to handle message", e);
+    }
+}
+
+function CreateAndShowBBSMentionToast(mention) {
+    let ToastContainer = document.querySelector(".toast-container");
+    if (!ToastContainer) return;
+
+    let Toast = document.createElement("div");
+    Toast.classList.add("toast");
+    Toast.setAttribute("role", "alert");
+    let ToastHeader = document.createElement("div");
+    ToastHeader.classList.add("toast-header");
+    let ToastTitle = document.createElement("strong");
+    ToastTitle.classList.add("me-auto");
+    ToastTitle.innerHTML = "提醒：有人@你";
+    ToastHeader.appendChild(ToastTitle);
+    let ToastTime = document.createElement("small");
+    ToastTime.classList.add("text-body-secondary");
+    ToastTime.innerHTML = GetRelativeTime(mention.MentionTime);
+    ToastHeader.appendChild(ToastTime);
+    let ToastCloseButton = document.createElement("button");
+    ToastCloseButton.type = "button";
+    ToastCloseButton.classList.add("btn-close");
+    ToastCloseButton.setAttribute("data-bs-dismiss", "toast");
+    ToastHeader.appendChild(ToastCloseButton);
+    Toast.appendChild(ToastHeader);
+    let ToastBody = document.createElement("div");
+    ToastBody.classList.add("toast-body");
+    ToastBody.innerHTML = "讨论" + escapeHTML(mention.PostTitle) + "有新回复";
+    let ToastFooter = document.createElement("div");
+    ToastFooter.classList.add("mt-2", "pt-2", "border-top");
+    let ToastDismissButton = document.createElement("button");
+    ToastDismissButton.type = "button";
+    ToastDismissButton.classList.add("btn", "btn-secondary", "btn-sm", "me-2");
+    ToastDismissButton.innerText = "忽略";
+    ToastDismissButton.addEventListener("click", () => {
+        RequestAPI("ReadBBSMention", {
+            "MentionID": Number(mention.MentionID)
+        }, () => {
+        });
+        Toast.remove();
+    });
+    ToastFooter.appendChild(ToastDismissButton);
+    let ToastViewButton = document.createElement("button");
+    ToastViewButton.type = "button";
+    ToastViewButton.classList.add("btn", "btn-primary", "btn-sm");
+    ToastViewButton.innerText = "查看";
+    ToastViewButton.addEventListener("click", () => {
+        open("https://www.xmoj.tech/discuss3/thread.php?tid=" + mention.PostID + '&page=' + mention.PageNumber, "_blank");
+        RequestAPI("ReadBBSMention", {
+            "MentionID": Number(mention.MentionID)
+        }, () => {
+        });
+    });
+    ToastFooter.appendChild(ToastViewButton);
+    ToastBody.appendChild(ToastFooter);
+    Toast.appendChild(ToastBody);
+    ToastContainer.appendChild(Toast);
+    new bootstrap.Toast(Toast).show();
+}
+
+function CreateAndShowMailMentionToast(mention) {
+    let ToastContainer = document.querySelector(".toast-container");
+    if (!ToastContainer) return;
+
+    let Toast = document.createElement("div");
+    Toast.classList.add("toast");
+    Toast.setAttribute("role", "alert");
+    let ToastHeader = document.createElement("div");
+    ToastHeader.classList.add("toast-header");
+    let ToastTitle = document.createElement("strong");
+    ToastTitle.classList.add("me-auto");
+    ToastTitle.innerHTML = "提醒：有新消息";
+    ToastHeader.appendChild(ToastTitle);
+    let ToastTime = document.createElement("small");
+    ToastTime.classList.add("text-body-secondary");
+    ToastTime.innerHTML = GetRelativeTime(mention.MentionTime);
+    ToastHeader.appendChild(ToastTime);
+    let ToastCloseButton = document.createElement("button");
+    ToastCloseButton.type = "button";
+    ToastCloseButton.classList.add("btn-close");
+    ToastCloseButton.setAttribute("data-bs-dismiss", "toast");
+    ToastHeader.appendChild(ToastCloseButton);
+    Toast.appendChild(ToastHeader);
+    let ToastBody = document.createElement("div");
+    ToastBody.classList.add("toast-body");
+    let ToastUser = document.createElement("span");
+    GetUsernameHTML(ToastUser, mention.FromUserID);
+    ToastBody.appendChild(ToastUser);
+    ToastBody.appendChild(document.createTextNode("  给你发了一封短消息"));
+    let ToastFooter = document.createElement("div");
+    ToastFooter.classList.add("mt-2", "pt-2", "border-top");
+    let ToastDismissButton = document.createElement("button");
+    ToastDismissButton.type = "button";
+    ToastDismissButton.classList.add("btn", "btn-secondary", "btn-sm", "me-2");
+    ToastDismissButton.setAttribute("data-bs-dismiss", "toast");
+    ToastDismissButton.innerText = "忽略";
+    ToastDismissButton.addEventListener("click", () => {
+        RequestAPI("ReadMailMention", {
+            "MentionID": Number(mention.MentionID)
+        }, () => {
+        });
+    });
+    ToastFooter.appendChild(ToastDismissButton);
+    let ToastViewButton = document.createElement("button");
+    ToastViewButton.type = "button";
+    ToastViewButton.classList.add("btn", "btn-primary", "btn-sm");
+    ToastViewButton.innerText = "查看";
+    ToastViewButton.addEventListener("click", () => {
+        open("https://www.xmoj.tech/mail.php?to_user=" + mention.FromUserID, "_blank");
+        RequestAPI("ReadMailMention", {
+            "MentionID": Number(mention.MentionID)
+        }, () => {
+        });
+    });
+    ToastFooter.appendChild(ToastViewButton);
+    ToastBody.appendChild(ToastFooter);
+    Toast.appendChild(ToastBody);
+    ToastContainer.appendChild(Toast);
+    new bootstrap.Toast(Toast).show();
+}
+
+function PollNotifications() {
+    // Clear toast container once before fetching to prevent race condition
+    if (UtilityEnabled("BBSPopup") || UtilityEnabled("MessagePopup")) {
+        let ToastContainer = document.querySelector(".toast-container");
+        if (ToastContainer) {
+            ToastContainer.innerHTML = "";
+        }
+    }
+    if (UtilityEnabled("BBSPopup")) {
+        RequestAPI("GetBBSMentionList", {}, (Response) => {
+            if (Response.Success) {
+                let MentionList = Response.Data.MentionList;
+                for (let i = 0; i < MentionList.length; i++) {
+                    CreateAndShowBBSMentionToast(MentionList[i]);
+                }
+            }
+        });
+    }
+    if (UtilityEnabled("MessagePopup")) {
+        RequestAPI("GetMailMentionList", {}, (Response) => {
+            if (Response.Success) {
+                let MentionList = Response.Data.MentionList;
+                for (let i = 0; i < MentionList.length; i++) {
+                    CreateAndShowMailMentionToast(MentionList[i]);
+                }
+            }
+        });
+    }
+}
+
 GM_registerMenuCommand("清除缓存", () => {
     let Temp = [];
     for (let i = 0; i < localStorage.length; i++) {
@@ -1232,135 +1513,31 @@ async function main() {
                 let ToastContainer = document.createElement("div");
                 ToastContainer.classList.add("toast-container", "position-fixed", "bottom-0", "end-0", "p-3");
                 document.body.appendChild(ToastContainer);
+                // Initialize WebSocket notification system
+                if (CurrentUsername && (UtilityEnabled("BBSPopup") || UtilityEnabled("MessagePopup"))) {
+                    ConnectNotificationSocket();
+                }
+
+                // Fallback polling when WebSocket is not connected
                 addEventListener("focus", () => {
-                    if (UtilityEnabled("BBSPopup")) {
-                        RequestAPI("GetBBSMentionList", {}, (Response) => {
-                            if (Response.Success) {
-                                ToastContainer.innerHTML = "";
-                                let MentionList = Response.Data.MentionList;
-                                for (let i = 0; i < MentionList.length; i++) {
-                                    let Toast = document.createElement("div");
-                                    Toast.classList.add("toast");
-                                    Toast.setAttribute("role", "alert");
-                                    let ToastHeader = document.createElement("div");
-                                    ToastHeader.classList.add("toast-header");
-                                    let ToastTitle = document.createElement("strong");
-                                    ToastTitle.classList.add("me-auto");
-                                    ToastTitle.innerHTML = "提醒：有人@你";
-                                    ToastHeader.appendChild(ToastTitle);
-                                    let ToastTime = document.createElement("small");
-                                    ToastTime.classList.add("text-body-secondary");
-                                    ToastTime.innerHTML = GetRelativeTime(MentionList[i].MentionTime);
-                                    ToastHeader.appendChild(ToastTime);
-                                    let ToastCloseButton = document.createElement("button");
-                                    ToastCloseButton.type = "button";
-                                    ToastCloseButton.classList.add("btn-close");
-                                    ToastCloseButton.setAttribute("data-bs-dismiss", "toast");
-                                    ToastHeader.appendChild(ToastCloseButton);
-                                    Toast.appendChild(ToastHeader);
-                                    let ToastBody = document.createElement("div");
-                                    ToastBody.classList.add("toast-body");
-                                    ToastBody.innerHTML = "讨论" + MentionList[i].PostTitle + "有新回复";
-                                    let ToastFooter = document.createElement("div");
-                                    ToastFooter.classList.add("mt-2", "pt-2", "border-top");
-                                    let ToastDismissButton = document.createElement("button");
-                                    ToastDismissButton.type = "button";
-                                    ToastDismissButton.classList.add("btn", "btn-secondary", "btn-sm", "me-2");
-                                    ToastDismissButton.innerText = "忽略";
-                                    ToastDismissButton.addEventListener("click", () => {
-                                        RequestAPI("ReadBBSMention", {
-                                            "MentionID": Number(MentionList[i].MentionID)
-                                        }, () => {
-                                        });
-                                        Toast.remove();
-                                    });
-                                    ToastFooter.appendChild(ToastDismissButton);
-                                    let ToastViewButton = document.createElement("button");
-                                    ToastViewButton.type = "button";
-                                    ToastViewButton.classList.add("btn", "btn-primary", "btn-sm");
-                                    ToastViewButton.innerText = "查看";
-                                    ToastViewButton.addEventListener("click", () => {
-                                        open("https://www.xmoj.tech/discuss3/thread.php?tid=" + MentionList[i].PostID + '&page=' + MentionList[i].PageNumber, "_blank");
-                                        RequestAPI("ReadBBSMention", {
-                                            "MentionID": Number(MentionList[i].MentionID)
-                                        }, () => {
-                                        });
-                                    });
-                                    ToastFooter.appendChild(ToastViewButton);
-                                    ToastBody.appendChild(ToastFooter);
-                                    Toast.appendChild(ToastBody);
-                                    ToastContainer.appendChild(Toast);
-                                    new bootstrap.Toast(Toast).show();
-                                }
-                            }
-                        });
+                    if (!NotificationSocket || NotificationSocket.readyState !== WebSocket.OPEN) {
+                        PollNotifications();
                     }
-                    if (UtilityEnabled("MessagePopup")) {
-                        RequestAPI("GetMailMentionList", {}, async (Response) => {
-                            if (Response.Success) {
-                                if (!UtilityEnabled("BBSPopup")) {
-                                    ToastContainer.innerHTML = "";
-                                }
-                                let MentionList = Response.Data.MentionList;
-                                for (let i = 0; i < MentionList.length; i++) {
-                                    let Toast = document.createElement("div");
-                                    Toast.classList.add("toast");
-                                    Toast.setAttribute("role", "alert");
-                                    let ToastHeader = document.createElement("div");
-                                    ToastHeader.classList.add("toast-header");
-                                    let ToastTitle = document.createElement("strong");
-                                    ToastTitle.classList.add("me-auto");
-                                    ToastTitle.innerHTML = "提醒：有新消息";
-                                    ToastHeader.appendChild(ToastTitle);
-                                    let ToastTime = document.createElement("small");
-                                    ToastTime.classList.add("text-body-secondary");
-                                    ToastTime.innerHTML = GetRelativeTime(MentionList[i].MentionTime);
-                                    ToastHeader.appendChild(ToastTime);
-                                    let ToastCloseButton = document.createElement("button");
-                                    ToastCloseButton.type = "button";
-                                    ToastCloseButton.classList.add("btn-close");
-                                    ToastCloseButton.setAttribute("data-bs-dismiss", "toast");
-                                    ToastHeader.appendChild(ToastCloseButton);
-                                    Toast.appendChild(ToastHeader);
-                                    let ToastBody = document.createElement("div");
-                                    ToastBody.classList.add("toast-body");
-                                    let ToastUser = document.createElement("span");
-                                    GetUsernameHTML(ToastUser, MentionList[i].FromUserID);
-                                    ToastBody.appendChild(ToastUser);
-                                    ToastBody.innerHTML += "  给你发了一封短消息";
-                                    let ToastFooter = document.createElement("div");
-                                    ToastFooter.classList.add("mt-2", "pt-2", "border-top");
-                                    let ToastDismissButton = document.createElement("button");
-                                    ToastDismissButton.type = "button";
-                                    ToastDismissButton.classList.add("btn", "btn-secondary", "btn-sm", "me-2");
-                                    ToastDismissButton.setAttribute("data-bs-dismiss", "toast");
-                                    ToastDismissButton.innerText = "忽略";
-                                    ToastDismissButton.addEventListener("click", () => {
-                                        RequestAPI("ReadMailMention", {
-                                            "MentionID": Number(MentionList[i].MentionID)
-                                        }, () => {
-                                        });
-                                    });
-                                    ToastFooter.appendChild(ToastDismissButton);
-                                    let ToastViewButton = document.createElement("button");
-                                    ToastViewButton.type = "button";
-                                    ToastViewButton.classList.add("btn", "btn-primary", "btn-sm");
-                                    ToastViewButton.innerText = "查看";
-                                    ToastViewButton.addEventListener("click", () => {
-                                        open("https://www.xmoj.tech/mail.php?to_user=" + MentionList[i].FromUserID, "_blank");
-                                        RequestAPI("ReadMailMention", {
-                                            "MentionID": Number(MentionList[i].MentionID)
-                                        }, () => {
-                                        });
-                                    });
-                                    ToastFooter.appendChild(ToastViewButton);
-                                    ToastBody.appendChild(ToastFooter);
-                                    Toast.appendChild(ToastBody);
-                                    ToastContainer.appendChild(Toast);
-                                    new bootstrap.Toast(Toast).show();
-                                }
-                            }
-                        });
+                });
+
+                // Periodic fallback polling every 60 seconds when WebSocket is down
+                setInterval(() => {
+                    if (!NotificationSocket || NotificationSocket.readyState !== WebSocket.OPEN) {
+                        PollNotifications();
+                    }
+                }, 60000);
+
+                // Handle tab visibility changes - reconnect if connection dropped
+                document.addEventListener('visibilitychange', () => {
+                    if (!document.hidden && NotificationSocket &&
+                        NotificationSocket.readyState !== WebSocket.OPEN &&
+                        NotificationSocket.readyState !== WebSocket.CONNECTING) {
+                        ConnectNotificationSocket();
                     }
                 });
                 dispatchEvent(new Event("focus"));
diff --git a/package.json b/package.json
index d558b7ac..3c315c9f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "xmoj-script",
-  "version": "2.7.2",
+  "version": "2.7.3",
   "description": "an improvement script for xmoj.tech",
   "main": "AddonScript.js",
   "scripts": {