fix: skip desktop restore when version is unchanged

Author: ZhuLinsen

apps/dsa-desktop/main.js

@@ -477,6 +477,7 @@ function restorePackagedRuntimeStateFromBackup() {
     backupRoot: null,
     restored: [],
     failed: [],
+    skipped: [],
   };
 
   if (!isWindowsNsisInstalledApp()) {
@@ -488,9 +489,26 @@ function restorePackagedRuntimeStateFromBackup() {
     return result;
   }
 
-  const appDir = resolveAppDir();
   const backupRoot = resolveUpdateBackupRoot();
   result.backupRoot = backupRoot;
+  const backupAppVersion = normalizeVersionString(manifest.appVersion);
+  const currentAppVersion = normalizeVersionString(resolveDesktopVersion());
+  const versionComparison = backupAppVersion && currentAppVersion
+    ? compareVersions(backupAppVersion, currentAppVersion)
+    : null;
+  const isSameAppVersion = Boolean(
+    backupAppVersion &&
+    currentAppVersion &&
+    (versionComparison === 0 || (versionComparison === null && backupAppVersion === currentAppVersion))
+  );
+  if (isSameAppVersion) {
+    const reason = `manifest (app version ${currentAppVersion} did not change after update attempt)`;
+    result.skipped.push(reason);
+    logLine(`[update] skipped runtime restore because app version did not change after update attempt: ${currentAppVersion}`);
+    return result;
+  }
+
+  const appDir = resolveAppDir();
   const runtimeEntries = resolveRuntimeFileEntries(appDir);
   const relativeFiles = normalizeBackupFileList(manifest);
   const failedRelativeFiles = [];
@@ -535,6 +553,9 @@ function restorePackagedRuntimeStateFromBackup() {
   if (result.failed.length) {
     logLine(`[update] skipped runtime restore files after copy failure: ${result.failed.join(', ')}`);
   }
+  if (result.skipped.length) {
+    logLine(`[update] skipped runtime restore: ${result.skipped.join(', ')}`);
+  }
 
   return result;
 }
@@ -1375,14 +1396,17 @@ ipcMain.handle('desktop:open-release-page', async (_event, releaseUrl) => {
 async function createWindow() {
   const restoreResult = isWindowsNsisInstalledApp() ? restorePackagedRuntimeStateFromBackup() : null;
   initLogging();
-  const restoreFailed = Boolean(restoreResult && restoreResult.failed.length);
-  const restoreErrorMessage = restoreFailed
-    ? `上次更新安装后恢复运行时文件失败，已保留备份目录 ${restoreResult.backupRoot}，请确认后手动恢复并重启应用。失败明细：${restoreResult.failed.join('；')}`
+  const restoreNeedsAttention = Boolean(restoreResult && (restoreResult.failed.length || restoreResult.skipped.length));
+  const restoreIssueDetails = restoreResult
+    ? restoreResult.failed.concat(restoreResult.skipped).join('；')
+    : '';
+  const restoreErrorMessage = restoreNeedsAttention
+    ? `上次更新安装未完成或恢复运行时文件失败，已保留备份目录 ${restoreResult.backupRoot}，请确认后手动恢复并重启应用。明细：${restoreIssueDetails}`
     : '';
   setDesktopUpdateState({
-    status: restoreFailed ? UPDATE_STATUS.ERROR : UPDATE_STATUS.IDLE,
+    status: restoreNeedsAttention ? UPDATE_STATUS.ERROR : UPDATE_STATUS.IDLE,
     currentVersion: resolveDesktopVersion(),
-    updateMode: restoreFailed ? UPDATE_MODE.MANUAL : UPDATE_MODE.AUTO,
+    updateMode: restoreNeedsAttention ? UPDATE_MODE.MANUAL : UPDATE_MODE.AUTO,
     message: restoreErrorMessage,
   });
   const startupStartedAt = Date.now();

apps/dsa-desktop/tests/main.test.js

@@ -437,6 +437,53 @@ test('restorePackagedRuntimeStateFromBackup removes restored files from pending
   assert.deepEqual(JSON.parse(fs.readFileSync(manifestPath, 'utf-8')).files, [dbRelativePath]);
 });
 
+test('restorePackagedRuntimeStateFromBackup skips backup when app version did not change', (t) => {
+  const tempRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'dsa-desktop-same-version-restore-'));
+  const appDir = path.join(tempRoot, 'app');
+  const userDataDir = path.join(tempRoot, 'userData');
+  const backupRoot = path.join(userDataDir, '.dsa-desktop-update-backup');
+  const backupEnvPath = path.join(backupRoot, '.env');
+  const targetEnvPath = path.join(appDir, '.env');
+  const manifestPath = path.join(backupRoot, 'runtime-state.json');
+
+  fs.mkdirSync(backupRoot, { recursive: true });
+  fs.mkdirSync(appDir, { recursive: true });
+  fs.writeFileSync(path.join(appDir, 'Uninstall Daily Stock Analysis.exe'), '');
+  fs.writeFileSync(backupEnvPath, 'pre-update-env\n', 'utf-8');
+  fs.writeFileSync(targetEnvPath, 'user-change-after-aborted-install\n', 'utf-8');
+  fs.writeFileSync(
+    manifestPath,
+    JSON.stringify({ appVersion: 'v3.12.0', files: ['.env'] }),
+    'utf-8'
+  );
+
+  const mainModule = loadMainModule(t, {
+    platform: 'win32',
+    app: {
+      isPackaged: true,
+      getPath: (name) => {
+        if (name === 'exe') {
+          return path.join(appDir, 'Daily Stock Analysis.exe');
+        }
+        return userDataDir;
+      },
+    },
+  });
+
+  t.after(() => {
+    fs.rmSync(tempRoot, { recursive: true, force: true });
+  });
+
+  const restoreResult = mainModule.restorePackagedRuntimeStateFromBackup();
+  assert.deepEqual(restoreResult.restored, []);
+  assert.deepEqual(restoreResult.failed, []);
+  assert.equal(restoreResult.skipped.length, 1);
+  assert.match(restoreResult.skipped[0], /version 3\.12\.0 did not change/);
+  assert.equal(fs.readFileSync(targetEnvPath, 'utf-8'), 'user-change-after-aborted-install\n');
+  assert.equal(fs.existsSync(backupRoot), true);
+  assert.deepEqual(JSON.parse(fs.readFileSync(manifestPath, 'utf-8')).files, ['.env']);
+});
+
 test('stopBackend waits for backend process exit', async (t) => {
   const mainModule = loadMainModule(t);
   const killSignals = [];

docs/CHANGELOG.md

@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 - [文档] 强化桌面打包文档：补充 `latest.yml` / `*.blockmap` 与 `desktop-release` tag/version 一致性核验清单，明确非 Windows 环境下需在平台限制里补充说明。
 - [修复] 为 Windows NSIS 安装版自动更新加入安装目录运行时文件（`.env`、`data/stock_analysis.db`、`data/stock_analysis.db-wal`、`data/stock_analysis.db-shm`、`logs/desktop.log`）备份与首次启动恢复链路，并在 `quitAndInstall` 前等待后端退出，降低升级时配置与数据库丢失风险。
 - [修复] Windows NSIS 自动更新在运行时文件部分恢复失败时只保留失败项待重试，避免已恢复成功的配置或数据库文件在后续启动时被旧备份重复覆盖。
+- [修复] Windows NSIS 自动更新在安装尝试未切换桌面端版本时跳过自动恢复，避免失败或取消安装后误回滚用户运行时数据。
 - [修复] 清理提交中的临时探测文件（`node_modules_exists.txt` 与 `node_modules_ls_check.txt`），避免污染桌面/前端改动范围。
 
 - [新功能] Web 系统设置页开放 `.env` 配置备份导入/导出，复用键级覆盖、配置版本冲突保护和重载链路；Web 端在 `ADMIN_AUTH_ENABLED=false` 时该入口为禁用状态。