d19038e76b
Conflicts, three, resolved: - scripts/desktop-update.ps1: upstream's side taken whole. Upstream moved the hand-off to scripts/desktop-update/windows.ps1 (this file is now a one-line compat forwarder) and the new implementation already drains both pipes asynchronously with bounded abandonment, which supersedes this branch's stderr-drain fix for the same deadlock. - apps/desktop/e2e/fixtures.ts: kept upstream's resolveElectronBinary import alongside this branch's consolidated mock-server path. - tests-js/scripts/mock-server.ts: kept upstream's task-panel trigger addition inside the consolidated file; rewired the five upstream specs still importing './mock-server' to the consolidated path (export sets verified identical) and dropped the superseded apps/desktop/e2e copy.