Repository navigation
chore: merge 4.18.1 into master - #3572
Merged
Merged
Conversation
* fix: recover a workspace that starts without a network (#3560) When the app starts before the network or a VPN is up, the server's service worker holds the first navigation open and never answers it. Electron then reports no failure, so the workspace stays gray and does not recover when the connection comes back. The main process now probes the server when a main-frame navigation has no response after 3 seconds. A network error shows the failure view at once. A navigation that is still held while the server answers loads again one time. After a network failure, the main process probes every 2 seconds and loads the page as soon as the server answers. A server that refuses connections gets a longer interval, up to 30 seconds, with jitter. The failure view also reloads on the OS online event, and main-frame load failures are now logged. (cherry picked from commit edb3d06) * chore: bump version to 4.18.1
Contributor
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info
📜 Recent review details
WalkthroughThe change adds stalled-navigation detection and server reachability probing for server views. It also retries failed server panes when the window comes online and updates the package and macOS bundle versions. ChangesServer view recovery
Release version metadata
Priority: ⬇️ Low Estimated code review effort: 4 (Complex) | ~45 minutes Change: Bug fix Sequence Diagram(s)sequenceDiagram
participant WebContents
participant watchStuckNavigation
participant probeServer
participant ServerView as serverView/index.ts
WebContents->>watchStuckNavigation: navigation and loading events
watchStuckNavigation->>probeServer: probe server reachability
probeServer->>WebContents: issue HEAD request through guest session
probeServer-->>watchStuckNavigation: return probe result
watchStuckNavigation->>ServerView: report stuck, held, or recovered navigation
ServerView->>WebContents: reload server URL when reachable
Suggested labels: Merge Risk: ⚪ Minimal · up to No actionable issue was established that would block this release merge. Refused-connection recovery remains unverified. Pre-merge checks |
 |
| Check name | Status | Explanation |
|---|---|---|
| Description Check |  |
Check skipped - CodeRabbit’s high-level summary is enabled. |
| Title check | |
The title clearly and concisely describes the primary change: merging release 4.18.1 into master. |
| Docstring Coverage | |
No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 8… |
| Linked Issues check | |
Check skipped because no linked issues were found for this pull request. |
| Out of Scope Changes check | |
Check skipped because no linked issues were found for this pull request. |
- Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts
Warning
Some tools did not complete. Review the errors below.
🔧 ESLint
-
If the error stems from missing dependencies, add them to the package.json file. For unrecoverable errors (e.g., due to private dependencies), disable the tool in the CodeRabbit configuration.
package.json
-
Parsing error: Missing semicolon. (2:11)
-
Warning
Errors were encountered while retrieving linked issues.
Errors (1)
-
- JIRA integration encountered authorization issues. Please disconnect and reconnect the integration in the CodeRabbit UI.
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.
Comment @coderabbitai help to get the list of available commands.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge the 4.18.1 patch release into
master, so thatmasterholds the latest stable release.This is the first merge under the rule in #3571.
release/4.18.xis 4.18.0 plus the 4.18.1 release commit (#3561), so the merge has no conflicts.Merge with a true merge commit (
gh pr merge --merge). Do not squash.Summary by CodeRabbit