Revert "Move network layer off @MainActor isolation (#21695)"#21711
Merged
Conversation
This reverts commit dd23f7a.
Contributor
Author
🤖 Devin AI EngineerI'll be helping with this pull request! Here's what you should know: ✅ I will automatically:
⚙️ Control Options:
|
5 tasks
Merged
3 tasks
4 tasks
This was referenced Apr 16, 2026
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
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.
Summary
Reverts PR #21695 which removed
@MainActorfrom the network client layer. After merging to main, the app hangs immediately on launch. This revert restores the original@MainActorannotations to unblock development while the root cause is investigated.What this restores:
@MainActoronGatewayHTTPClient,HealthCheckClient,HostToolExecutorstatic methods, and ~40 network client protocols/structsTask { @MainActor ininBtwClient.sendMessage()(was changed toTask {)resolveConnection(),isConnectionManaged(),buildURL()(were madeasyncin the fix-up commit)handleAuthenticationFailure()inGatewayConnectionManagerandapprovalPath()inInteractionClientContext: The original PR also coincided with PR #21696 (SettingsStore/SigningIdentityManager changes). The hang could be from either PR or their interaction. This revert isolates #21695 to determine the cause.
Review & Testing Checklist for Human
GatewayHTTPClient.resolveConnection()is synchronous again — the async/await changes toresolveConnection(),isConnectionManaged(), andbuildURL()should all be reverted (these were in the second commit of Move network layer off @MainActor isolation #21695)Notes
git revertwith no merge conflicts despite intervening commits@MainActorremoval will be re-attempted in a future PR with more careful testing of the startup path and actor-hopping behavior, particularly the interaction betweenGatewayConnectionManager(MainActor) →resolveConnection()(nonisolated async) →AuthService.shared.baseURL(MainActor)Link to Devin session: https://app.devin.ai/sessions/e19a9c46f61546368efaba6020397e17
Requested by: @ashleeradka