fix(review-feedback-1256): address latest review comments

Author: ZhuLinsen

apps/dsa-desktop/main.js

@@ -476,21 +476,26 @@ function backupPackagedRuntimeState() {
 }
 
 function restorePackagedRuntimeStateFromBackup() {
+  const result = {
+    backupRoot: null,
+    restored: [],
+    failed: [],
+  };
+
   if (!isWindowsNsisInstalledApp()) {
-    return;
+    return result;
   }
 
   const manifest = readUpdateBackupManifest();
   if (!manifest) {
-    return;
+    return result;
   }
 
   const appDir = resolveAppDir();
   const backupRoot = resolveUpdateBackupRoot();
+  result.backupRoot = backupRoot;
   const runtimeEntries = resolveRuntimeFileEntries(appDir);
   const relativeFiles = normalizeBackupFileList(manifest);
-  const restored = [];
-  const failed = [];
 
   try {
     relativeFiles.forEach((relativePath) => {
@@ -503,22 +508,26 @@ function restorePackagedRuntimeStateFromBackup() {
         }
         ensureDirectory(path.dirname(target));
         fs.copyFileSync(source, target);
-        restored.push(relativePath);
+        result.restored.push(relativePath);
       } catch (error) {
         const message = error instanceof Error ? error.message : String(error);
-        failed.push(`${relativePath} (${message})`);
+        result.failed.push(`${relativePath} (${message})`);
       }
     });
   } finally {
-    cleanupUpdateBackupRoot();
+    if (!result.failed.length) {
+      cleanupUpdateBackupRoot();
+    }
   }
 
-  if (restored.length) {
-    console.log(`[update] restored runtime files from backup: ${restored.join(', ')}`);
+  if (result.restored.length) {
+    console.log(`[update] restored runtime files from backup: ${result.restored.join(', ')}`);
   }
-  if (failed.length) {
-    logLine(`[update] skipped runtime restore files after copy failure: ${failed.join(', ')}`);
+  if (result.failed.length) {
+    logLine(`[update] skipped runtime restore files after copy failure: ${result.failed.join(', ')}`);
   }
+
+  return result;
 }
 
 function resolveBackendPath() {
@@ -1331,14 +1340,17 @@ ipcMain.handle('desktop:open-release-page', async (_event, releaseUrl) => {
 });
 
 async function createWindow() {
-  if (isWindowsNsisInstalledApp()) {
-    restorePackagedRuntimeStateFromBackup();
-  }
+  const restoreResult = isWindowsNsisInstalledApp() ? restorePackagedRuntimeStateFromBackup() : null;
   initLogging();
+  const restoreFailed = Boolean(restoreResult && restoreResult.failed.length);
+  const restoreErrorMessage = restoreFailed
+    ? `上次更新安装后恢复运行时文件失败，已保留备份目录 ${restoreResult.backupRoot}，请确认后手动恢复并重启应用。失败明细：${restoreResult.failed.join('；')}`
+    : '';
   setDesktopUpdateState({
-    status: UPDATE_STATUS.IDLE,
+    status: restoreFailed ? UPDATE_STATUS.ERROR : UPDATE_STATUS.IDLE,
     currentVersion: resolveDesktopVersion(),
-    message: '',
+    updateMode: restoreFailed ? UPDATE_MODE.MANUAL : UPDATE_MODE.AUTO,
+    message: restoreErrorMessage,
   });
   const startupStartedAt = Date.now();
   const logStartup = (message) => {
@@ -1496,7 +1508,9 @@ async function createWindow() {
     await mainWindow.loadURL(`http://127.0.0.1:${port}/`);
     logStartup(`Main page loadURL resolved in ${Date.now() - mainPageStartedAt}ms`);
     logStartup(`Main UI loaded in ${Date.now() - startupStartedAt}ms`);
-    void performDesktopUpdateCheck({ notify: true });
+    if (!restoreFailed) {
+      void performDesktopUpdateCheck({ notify: true });
+    }
   } catch (error) {
     logStartup(`Startup failed while waiting for health: ${String(error)}`);
     const errorUrl = `file://${loadingPath}?error=${encodeURIComponent(String(error))}`;

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

@@ -231,7 +231,7 @@ test('desktop update backup list includes WAL and SHM artifacts', (t) => {
   assert.ok(files.includes(path.join('logs', 'desktop.log')));
 });
 
-test('restorePackagedRuntimeStateFromBackup skips failed copies and clears backup', (t) => {
+test('restorePackagedRuntimeStateFromBackup keeps backup when copy fails', (t) => {
   const tempRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'dsa-desktop-restore-'));
   const appDir = path.join(tempRoot, 'app');
   const userDataDir = path.join(tempRoot, 'userData');
@@ -275,11 +275,13 @@ test('restorePackagedRuntimeStateFromBackup skips failed copies and clears backu
     fs.rmSync(tempRoot, { recursive: true, force: true });
   });
 
-  assert.doesNotThrow(() => {
-    mainModule.restorePackagedRuntimeStateFromBackup();
-  });
+  const restoreResult = mainModule.restorePackagedRuntimeStateFromBackup();
   assert.equal(failedCopyAttempted, true);
-  assert.equal(fs.existsSync(backupRoot), false);
+  assert.equal(Array.isArray(restoreResult.failed), true);
+  assert.equal(restoreResult.failed.length > 0, true);
+  assert.equal(fs.existsSync(backupRoot), true);
+  assert.equal(fs.existsSync(path.join(backupRoot, 'runtime-state.json')), true);
+  assert.equal(restoreResult.failed[0].includes('target locked'), true);
 });
 
 test('stopBackend waits for backend process exit', async (t) => {