fix(desktop): clear a cancelled update replacement so refreshes resume

Author: waleedlatif1

apps/desktop/src/main/updater.test.ts

@@ -640,6 +640,38 @@ describe('initUpdater state machine', () => {
     expect(autoUpdaterMock.downloadUpdate).not.toHaveBeenCalled()
   })
 
+  it('resumes refreshing after a replacement download is cancelled without an error event', async () => {
+    const { handle } = await createUpdater()
+    await stageUpdate(handle, '2.0.0')
+    await vi.advanceTimersByTimeAsync(10_000)
+    autoUpdaterMock.downloadUpdate.mockImplementationOnce(() =>
+      Promise.reject(new Error('cancelled'))
+    )
+    emit('update-available', { version: '2.1.0' })
+    await vi.advanceTimersByTimeAsync(0)
+
+    await vi.advanceTimersByTimeAsync(30 * 60 * 1000 - 10_000)
+    expect(autoUpdaterMock.checkForUpdates).toHaveBeenCalledTimes(3)
+    emit('update-available', { version: '2.1.0' })
+    expect(autoUpdaterMock.downloadUpdate).toHaveBeenCalledTimes(3)
+    expect(handle.getState()).toEqual({ status: 'ready', version: '2.0.0' })
+  })
+
+  it('follows the feed when a re-check rolls an offered release back', async () => {
+    const { handle } = await createUpdater({ autoDownload: false })
+    handle.check()
+    await vi.advanceTimersByTimeAsync(0)
+    emit('update-available', { version: '2.2.0' })
+
+    await vi.advanceTimersByTimeAsync(10_000)
+    emit('update-available', { version: '2.1.0' })
+    expect(handle.getState()).toEqual({ status: 'available', version: '2.1.0' })
+
+    handle.check()
+    emit('update-downloaded', { version: '2.1.0' })
+    expect(handle.getState()).toEqual({ status: 'ready', version: '2.1.0' })
+  })
+
   it('withdraws an offered update once a re-check stores a blocked candidate', async () => {
     const { handle } = await createUpdater({ autoDownload: false })
     handle.check()

apps/desktop/src/main/updater.ts

@@ -554,13 +554,21 @@ export function initUpdater(deps: UpdaterDeps): UpdaterHandle {
         }
         acceptedUpdateVersion = info.version
         deps.events.record('update_check', { available: info.version, replacing: stagedVersion })
+        const replacementVersion = info.version
+        // Cancellation rejects without an `error` event, so the promise owns
+        // clearing its replacement for every failure mode.
         void autoUpdater.downloadUpdate().catch((error) => {
+          if (acceptedUpdateVersion === replacementVersion) acceptedUpdateVersion = null
+          if (pendingReplacementVersion === replacementVersion) pendingReplacementVersion = null
           logger.warn('Replacement update download failed; keeping the staged update', {
             message: getErrorMessage(error, 'unknown'),
           })
         })
         return
       }
+      // An offer mirrors the feed's latest release, even after a rollback: the
+      // library only keeps this check's update info, so Update would download
+      // this version regardless of which one the offer displayed.
       if (state.status === 'available' && validCandidate && state.version === info.version) {
         return
       }