@@ -134,6 +134,16 @@ const desktopUpdateCurrentVersion = ref("-");
 const desktopUpdateLatestVersion = ref("-");
 const desktopUpdateStatus = ref("");
 const desktopDownloadProgress = ref<AstrBotDesktopAppUpdateProgress | null>(null);
+const appHasNewVersion = computed(() =>
+  isDesktopReleaseMode.value
+    ? desktopUpdateHasNewVersion.value
+    : hasNewVersion.value,
+);
+const hasAvailableUpdate = computed(
+  () =>
+    appHasNewVersion.value ||
+    (!isDesktopReleaseMode.value && dashboardHasNewVersion.value),
+);
 const isChatPath = computed(
   () => route.path === "/chat" || route.path.startsWith("/chat/"),
 );
@@ -297,10 +307,11 @@ function cancelDesktopUpdate() {
   desktopUpdateDialog.value = false;
 }
 
-async function openDesktopUpdateDialog() {
+async function checkDesktopUpdate(showDialog = false) {
   if (desktopUpdateInstalling.value) return;
+  if (showDialog) desktopUpdateDialog.value = true;
+  if (desktopUpdateChecking.value) return;
   desktopDownloadProgress.value = null;
-  desktopUpdateDialog.value = true;
   desktopUpdateChecking.value = true;
   desktopUpdateInstalling.value = false;
   desktopUpdateHasNewVersion.value = false;
@@ -310,16 +321,29 @@ async function openDesktopUpdateDialog() {
 
   const bridge = getAppUpdaterBridge();
   if (!bridge) {
+    console.warn("[desktop-update] App updater bridge is unavailable.");
     desktopUpdateChecking.value = false;
     desktopUpdateStatus.value = t(
       "core.header.updateDialog.desktopApp.checkFailed",
     );
     return;
   }
 
+  let checkTimeout: ReturnType<typeof setTimeout> | undefined;
   try {
-    const result = await bridge.checkForAppUpdate();
+    const result = await Promise.race([
+      bridge.checkForAppUpdate(),
+      new Promise<never>((_, reject) => {
+        checkTimeout = setTimeout(() => {
+          reject(new Error("Desktop app update check timed out."));
+        }, 30_000);
+      }),
+    ]);
     if (!result?.ok) {
+      console.warn(
+        "[desktop-update] Failed to check for app updates.",
+        result?.reason || "Unknown error",
+      );
       desktopUpdateCurrentVersion.value = result?.currentVersion || "-";
       desktopUpdateLatestVersion.value =
         result?.latestVersion || result?.currentVersion || "-";
@@ -336,11 +360,12 @@ async function openDesktopUpdateDialog() {
       ? t("core.header.updateDialog.desktopApp.hasNewVersion")
       : t("core.header.updateDialog.desktopApp.isLatest");
   } catch (error) {
-    console.error(error);
+    console.error("[desktop-update] Failed to check for app updates.", error);
     desktopUpdateStatus.value = t(
       "core.header.updateDialog.desktopApp.checkFailed",
     );
   } finally {
+    if (checkTimeout !== undefined) clearTimeout(checkTimeout);
     desktopUpdateChecking.value = false;
   }
 }
@@ -391,7 +416,7 @@ async function confirmDesktopUpdate() {
 
 function handleUpdateClick() {
   if (isDesktopReleaseMode.value) {
-    void openDesktopUpdateDialog();
+    void checkDesktopUpdate(true);
     return;
   }
   checkUpdate();
@@ -1043,6 +1068,7 @@ onMounted(async () => {
   isDesktopReleaseMode.value = runtimeInfo.isDesktopRuntime;
   if (isDesktopReleaseMode.value) {
     dashboardHasNewVersion.value = false;
+    void checkDesktopUpdate();
   }
 
   // The toolbar band doubles as the window drag region on desktop (no native title bar).
@@ -1089,15 +1115,20 @@ onMounted(async () => {
 
     <v-spacer />
 
-    <!-- 版本提示信息 - 在手机上隐藏 -->
-    <div v-if="!isChatPath" class="mr-4 hidden-xs">
-      <small v-if="hasNewVersion">
+    <!-- Desktop keeps the update notice visible in both Bot and Chat modes. -->
+    <button
+      v-if="hasAvailableUpdate && (!isChatPath || isDesktopReleaseMode)"
+      type="button"
+      class="update-notice mr-4 hidden-xs text-no-wrap"
+      @click="handleUpdateClick"
+    >
+      <small v-if="appHasNewVersion">
         {{ t("core.header.version.hasNewVersion") }}
       </small>
       <small v-else-if="dashboardHasNewVersion && !isDesktopReleaseMode">
         {{ t("core.header.version.dashboardHasNewVersion") }}
       </small>
-    </div>
+    </button>
 
     <div class="header-actions" :class="{ 'chat-header-actions': isChatPath }">
       <v-btn
@@ -1155,7 +1186,9 @@ onMounted(async () => {
             icon
             :ripple="false"
           >
-            <v-icon>mdi-dots-vertical</v-icon>
+            <v-badge :model-value="hasAvailableUpdate" color="primary" dot floating>
+              <v-icon>mdi-dots-vertical</v-icon>
+            </v-badge>
             <span class="header-toolbar-label">{{ t("core.navigation.options") }}</span>
           </v-btn>
         </template>
@@ -1324,9 +1357,7 @@ onMounted(async () => {
         }}</v-list-item-title>
         <template
           v-slot:append
-          v-if="
-            hasNewVersion || (dashboardHasNewVersion && !isDesktopReleaseMode)
-          "
+          v-if="hasAvailableUpdate"
         >
           <v-chip size="x-small" color="primary" variant="tonal" class="ml-2"
             >!</v-chip
@@ -2499,6 +2530,14 @@ onMounted(async () => {
   user-select: none;
 }
 
+.top-header .update-notice {
+  cursor: pointer;
+}
+
+.top-header .update-notice:hover {
+  text-decoration: underline;
+}
+
 /* Mount point for page-contextual toolbar content (see the template note). */
 .app-header-context {
   display: flex;
 
@@ -26,6 +26,12 @@ Repository: [AstrBotDevs/AstrBot-desktop](https://github.com/AstrBotDevs/AstrBot
 2. Download the installer for your operating system (e.g. `.exe`, `.dmg`, `.rpm`, `.deb`).
 3. Launch the desktop client after installation and follow the setup wizard to complete initialization.
 
+## Check for Updates
+
+The desktop client automatically checks for app updates when the main interface loads. When an update is available, the header displays “AstrBot has a new version!” in both Bot and Chat modes. A dot also appears on the options menu in the top-right corner, and the update entry inside the menu is marked.
+
+Click “AstrBot has a new version!” in the header to open the desktop app update dialog. You can also open the options menu and select the update entry to check manually and confirm installation. Automatic checks do not download or install updates. If a check fails, use the same entry to retry.
+
 ## Difference from Launcher Deployment
 
 - Desktop client: focuses on an out-of-the-box GUI experience.
 
@@ -26,6 +26,12 @@
 2. 下载与你系统对应的安装包（如 `.exe`、`.dmg`、`.rpm`、`.deb`）。
 3. 安装完成后启动桌面客户端，按向导完成初始化。
 
+## 检查更新
+
+桌面客户端进入主界面后会自动检查客户端新版本。发现更新时，Bot 模式和聊天模式的顶部栏都会显示「AstrBot 有新版本！」文字提示。右上角的功能菜单也会显示提示圆点，菜单内的「更新」入口会显示标记。
+
+点击顶部的「AstrBot 有新版本！」文字，即可打开桌面客户端更新弹窗。也可以点击右上角功能菜单中的「更新」，手动检查版本并确认安装。自动检查不会直接下载或安装更新；检查失败时，也可以通过此入口重试。
+
 ## 与启动器部署的区别
 
 - 桌面客户端：更偏向开箱即用的 GUI 体验。