Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/fetch_codex_models/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ func ensureAccessToken(ctx context.Context, store *sdkauth.FileTokenStore, auth
}

svc := codexauth.NewCodexAuthWithProxyURL(nil, auth.ProxyURL)
tokenData, errRefresh := svc.RefreshTokensWithRetry(ctx, refreshToken, 3)
tokenData, errRefresh := svc.RefreshTokensWithRetry(ctx, refreshToken, 3, auth.ID)
if errRefresh != nil {
return "", false, errRefresh
}
Expand Down
6 changes: 3 additions & 3 deletions internal/auth/codex/openai_auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ func (o *CodexAuth) CreateTokenStorage(bundle *CodexAuthBundle) *CodexTokenStora
// RefreshTokensWithRetry refreshes tokens with a built-in retry mechanism.
// It attempts to refresh the tokens up to a specified maximum number of retries,
// with an exponential backoff strategy to handle transient network errors.
func (o *CodexAuth) RefreshTokensWithRetry(ctx context.Context, refreshToken string, maxRetries int) (*CodexTokenData, error) {
func (o *CodexAuth) RefreshTokensWithRetry(ctx context.Context, refreshToken string, maxRetries int, authID string) (*CodexTokenData, error) {
var lastErr error

for attempt := 0; attempt < maxRetries; attempt++ {
Expand All @@ -292,12 +292,12 @@ func (o *CodexAuth) RefreshTokensWithRetry(ctx context.Context, refreshToken str
return tokenData, nil
}
if isNonRetryableRefreshErr(err) {
log.Warnf("Token refresh attempt %d failed with non-retryable error: %v", attempt+1, err)
log.Warnf("Token refresh attempt %d for auth %s failed with non-retryable error: %v", attempt+1, authID, err)
return nil, err
}

lastErr = err
log.Warnf("Token refresh attempt %d failed: %v", attempt+1, err)
log.Warnf("Token refresh attempt %d for auth %s failed: %v", attempt+1, authID, err)
}

return nil, fmt.Errorf("token refresh failed after %d attempts: %w", maxRetries, lastErr)
Expand Down
2 changes: 1 addition & 1 deletion internal/auth/codex/openai_auth_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func TestRefreshTokensWithRetry_NonRetryableOnlyAttemptsOnce(t *testing.T) {
},
}

_, err := auth.RefreshTokensWithRetry(context.Background(), "dummy_refresh_token", 3)
_, err := auth.RefreshTokensWithRetry(context.Background(), "dummy_refresh_token", 3, "test-auth")
if err == nil {
t.Fatalf("expected error for non-retryable refresh failure")
}
Expand Down
2 changes: 1 addition & 1 deletion internal/runtime/executor/codex_executor.go
Original file line number Diff line number Diff line change
Expand Up @@ -1386,7 +1386,7 @@ func (e *CodexExecutor) Refresh(ctx context.Context, auth *cliproxyauth.Auth) (*
return auth, nil
}
svc := codexauth.NewCodexAuthWithProxyURL(e.cfg, auth.ProxyURL)
td, err := svc.RefreshTokensWithRetry(ctx, refreshToken, 3)
td, err := svc.RefreshTokensWithRetry(ctx, refreshToken, 3, auth.ID)
if err != nil {
return nil, err
}
Expand Down
Loading