You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Devin logins on Windows could fail with "Failed to read OAuth callback" even after the callback arrived. This backports the fix from upstream PR router-for-me#7482 so the fork has it before upstream merges.
The callback handler writes a temp file and renames it into place. On Windows, a read of that path during the rename fails with a sharing violation. waitDevinOAuthCallback treated every read error except not-exist as fatal and ended the login. It now retries on the next 500ms tick, as the Claude, Codex and Antigravity flows already do. The context deadline and the session state still end the wait.
TestWaitDevinOAuthCallbackRetriesTransientReadError covers the fix and fails on the old code. TestDevinRemoteOAuthFlow now prints the session status when the token exchange does not start, and its 5s failure bounds are 15s.
The two files match the upstream PR head exactly, so the next upstream sync merges cleanly. #12 had its own 5s to 15s bump in the same test. I dropped it there, and the two PRs merge cleanly in either order.
go build, go vet and the management package tests pass on Windows. The Devin tests passed 20/20 in a loop.
Summary by CodeRabbit
Bug Fixes
Devin sign-in now retries when a temporary issue prevents reading the OAuth callback, helping the login flow continue when the callback becomes available.
OAuth callback handling still reports invalid callback data, and the wait for a callback remains limited by the session state and timeout.
waitDevinOAuthCallback ended the login with "Failed to read OAuth callback"
on any read error other than not-exist. On Windows a read that lands while the
callback handler renames the file into place fails with a sharing violation,
so a login could fail although the callback arrived. Retry on the next tick,
as the other OAuth flows already do. The context deadline and session state
still bound the wait.
This was the cause of the intermittent "token exchange did not start" in
TestDevinRemoteOAuthFlow. The test now reports the session status on that
failure, and its 5s failure bounds are 15s.
Backport of upstream router-for-me#7482 (a50f54e), with the Devin
test bound change from 97b8a03 that the regression test depends on.
No actionable comments were generated in the recent review.
Walkthrough
The Devin OAuth callback wait now retries file-read errors. Tests cover a transient read error and use longer bounds for token-exchange and login-completion waits.
The callback file reader is now overridable. The wait retries file-read errors and continues to decode successful reads, while invalid JSON still returns "Invalid OAuth callback".
Test retries and OAuth wait bounds internal/api/handlers/management/auth_files_devin_oauth_test.go
Tests verify success after one transient read error and use 15-second bounds for token exchange and login completion. The token-exchange timeout reports the OAuth session status.
jiroamato/CLIProxyAPI#12: Changes the token-exchange and login-completion waits in the same test from 5 seconds to 15 seconds.
Suggested reviewers:ltbinglingfeng, luispater
Merge Risk: Minimal · up to 1088c
The change makes Devin OAuth login more tolerant of transient callback-file read errors, such as those caused by a rename on Windows. The wait remains bounded by the existing deadline. No merge-blocking risk was identified.
Pre-merge checks: 4
Check name
Status
Explanation
Description Check
Check skipped - CodeRabbit’s high-level summary is enabled.
Title check
The title names the main change: waitDevinOAuthCallback now retries transient callback-file read errors instead of failing the login. It also carries the conventional fix(management) scope. The change…
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.
Full details: Title check
Explanation
The title names the main change: waitDevinOAuthCallback now retries transient callback-file read errors instead of failing the login. It also carries the conventional fix(management) scope. The changeset matches this: the read-error path in auth_files_devin_oauth.go now retries, and a new test covers the retry after a transient read error.
Finishing Touches
Generate unit tests (beta)
Commit to this branch
Create a new PR
Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts
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.
Included review availability: This review used your included allowance. Your plan provides up to 1 included review per hour; 0 remain after this review.
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
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.
Devin logins on Windows could fail with "Failed to read OAuth callback" even after the callback arrived. This backports the fix from upstream PR router-for-me#7482 so the fork has it before upstream merges.
The callback handler writes a temp file and renames it into place. On Windows, a read of that path during the rename fails with a sharing violation.
waitDevinOAuthCallbacktreated every read error except not-exist as fatal and ended the login. It now retries on the next 500ms tick, as the Claude, Codex and Antigravity flows already do. The context deadline and the session state still end the wait.TestWaitDevinOAuthCallbackRetriesTransientReadErrorcovers the fix and fails on the old code.TestDevinRemoteOAuthFlownow prints the session status when the token exchange does not start, and its 5s failure bounds are 15s.The two files match the upstream PR head exactly, so the next upstream sync merges cleanly. #12 had its own 5s to 15s bump in the same test. I dropped it there, and the two PRs merge cleanly in either order.
go build,go vetand themanagementpackage tests pass on Windows. The Devin tests passed 20/20 in a loop.Summary by CodeRabbit