Repository navigation
fix(desktop): retry a failed netstat before Windows recovery gives up (0.11.0 backport of #25792) - #26474
fix(desktop): retry a failed netstat before Windows recovery gives up (0.11.0 backport of #25792)#26474bolichen97 wants to merge 1 commit into
Conversation
UX Review (Opus 5.5) — ✅ PASSUX-level review of UX-Verdict: PASS Nothing to check. The diff only touches the Electron main process (the netstat retry and its log lines), so it adds or changes no control, label or string a user would see. [UX-REVIEWED] 83ec075 Description read[DESCRIPTION-READ] f596eee0cfd3f73134f9851317a49d68f8222c6dc03c9b51be36df8035642274 That sha256 names everything this verdict read: the PR description, plus the 3 evidence file(s) the workflow collected from it and handed this review. It covers that evidence because the media strip replaces every attachment URL with the same placeholder, so an edit swapping one attachment for another would leave the description's captured text identical while what this review judged changed. Recompute it with |
Design Review (Opus 5.5) — ✅ PASSDesign-level review of Design-Verdict: PASS Nothing blocks: this is a straight cherry-pick of #25792 that adds a bounded retry and keeps recovery failing closed. Notes
[DESIGN-REVIEWED] 83ec075 Description read[DESCRIPTION-READ] 5f2d3560ce423fdfb94ca9f88df0451c0715abb94b66f213cf5285d1c3892cf8 That sha256 names everything this verdict read: the PR description, plus the 1 evidence file(s) the workflow collected from it and handed this review. It covers that evidence because the media strip replaces every attachment URL with the same placeholder, so an edit swapping one attachment for another would leave the description's captured text identical while what this review judged changed. Recompute it with |
First Principles Review (Opus 5.5) — ✅ PASSPremise-level review of First-Principles-Verdict: PASS This cherry-picks #25792 unchanged and fixes the failure where it happens. The non-retrying Windows snapshot probe in the same file is left alone, and that belongs on Notes
What this change shipsInventory (4 items) — 3 justifiedIntent: on the 0.11.0 release line, keep Windows desktop recovery from getting stuck at "restart required" when netstat fails once. This is a FIX (backport).
[FIRST-PRINCIPLES-REVIEWED] 83ec075 Description read[DESCRIPTION-READ] 5056051d914ca0f616f744ea19f4bfec512d4c702aaff2df0bb0252b92b615bb That sha256 names the PR description this verdict read. Recompute it with |
GPT 6.1 Review — ✅ no blocking findingsGPT 6.1 completed its review of This comment is updated in place on each push. Review detailsNo findings. False positive or not applicable? A repository writer can comment: |
Opus 5.5 Review — ✅ no blocking findingsReviewed Verdict parsed from the review's SHA-scoped output markers for commit False positive or not applicable? A repository writer can comment: |
KiroCrewCaptain
left a comment
There was a problem hiding this comment.
Approved on behalf of the watch holder (bolichen). Design and First Principles pass on this head, UX skipped or pass, no conflict, no open change request.
Problem / Motivation
Goal: Ship #25792 on the 0.11.0 release line, so Windows recovery retries a failed netstat instead of giving up.
#25792 merged to
mainafterrelease/0.11.0was cut, so no 0.11.0 build has it.Why it matters
On Windows a single failed
netstatmade the desktop app's port recovery stop early and leave the gateway down. Users install the release line, so a fix only onmainreaches them one release late.Not a goal
main.What changed (motivation → approach → change)
One commit:
git cherry-pick -xof 043dd9f, the #25792 squash commit onmain. It applied with no conflict. The desktop port probe (website/electron/windows-port.js,website/electron/runtime/gateway/port-holders.js) lets wedge recovery check the port up to 3 times, 10 s each, half a second apart, before it stops at "restart required"; the last failure's log says whether netstat timed out or exited with a code.Backwards compatibility
Compatible: same change as #25792 on
main; only the recovery path changes, and a check that fails every try still stops at "restart required" as before.Removes nothing: same change as on
main; no API, key, row or path is removed.Tests
website/electron/test/windows-recovery-port-probe.test.js(from #25792), run on this branch as part of the gate below.npm --prefix website run test:electronon this branch: 2816 tests, 2781 passed, 30 failed, 5 skipped. A cleanrelease/0.11.0on the same host fails the same 30 (identical list): they are host-dependent, not this change.scripts/local-gate.py --base origin/release/0.11.0: the backend cross-surface set ran 26842 tests, 26783 passed; the 59 that failed (test_file_explorer_app.py,test_design_tweak_backend.pyand three others) fail the same on a cleanrelease/0.11.0on this host (it reads/local/homeas a sensitive path).Proof: not provable -- frontend test (prove.py runs Python only)
Determinism: the tests are the main PR's own, unchanged; their repeat and shuffled-order runs are recorded on #25792.
Manual verification
N/A - verified on #25792 itself; this is the same change on the release branch.
Screenshots / video
Why no screenshot: byte-identical cherry-pick of #25792; the visible change and its evidence are on that PR.
Related Issues
Part of #25790
Backport of #25792.
Sibling sweep
Siblings: none -- a backport of main fixes; the sibling sweep is on #25792
Pattern harvest
Not generalizable: backport of #25792; its harvest is recorded on that PR.
Checklist
feat|fix|docs|style|refactor|perf|test|chore|ci|build|revert: ...)Contribution License Agreement
Contributed under the project's Apache-2.0 license.