fix: reconcile stale staged updates

server/app.ts

@@ -58,6 +58,7 @@ import { isNewerVersion } from "./update.js";
 import {
   ACTIVE_UPDATE_STATUSES,
   checkForUpdate,
+  currentReleaseVersion,
   publicCheckFromCache,
   publicUpdateJob,
   reconcileOrphanedUpdateJobs,
@@ -1016,7 +1017,8 @@ export async function buildApp(database: DatabaseContext, config: AppConfig) {
       // A package may have been downloaded before the host was upgraded by
       // another path. Never apply a staged archive that is no longer newer
       // than the release currently serving traffic.
-      if (!isNewerVersion(config.appVersion, staged.version)) {
+      const effectiveCurrentVersion = currentReleaseVersion(config) ?? config.appVersion;
+      if (!isNewerVersion(effectiveCurrentVersion, staged.version)) {
         const now = Date.now();
         database.sqlite.prepare("UPDATE update_jobs SET status='failed', error_message=?, completed_at=?, updated_at=? WHERE id=? AND status='staged'").run("暂存更新已过期，当前版本无需再次升级", now, now, stagedJobId);
         throw new AppError(409, "UPDATE_NOT_AVAILABLE", "暂存更新已过期，请重新检查更新");

server/update-service.ts

@@ -439,7 +439,7 @@ function recoveryStateJobId(filePath: string): string | null {
   }
 }
 
-function currentReleaseVersion(config: AppConfig): string | null {
+export function currentReleaseVersion(config: AppConfig): string | null {
   try {
     const target = realpathSync(config.currentLink);
     const releases = realpathSync(config.releasesDir);
@@ -498,7 +498,8 @@ export function reconcileOrphanedUpdateJobs(database: Database.Database, config:
     // completes the same release) before returning to this page. Treat the
     // archive as an expired terminal task so it cannot keep blocking the
     // queue or appear as an "apply" action for the current version.
-    if (row.status === "staged" && !isNewerVersion(config.appVersion, row.version) && !matchingFreshRequest && !matchingFreshState) {
+    const effectiveCurrentVersion = releaseVersion ?? config.appVersion;
+    if (row.status === "staged" && !isNewerVersion(effectiveCurrentVersion, row.version) && !matchingFreshRequest && !matchingFreshState) {
       const changed = database.transaction(() => {
         const result = database.prepare(`
           UPDATE update_jobs