Fix on Copilot side-s

Author: RomanNikitenko

.rebase/replace/code/extensions/copilot/src/platform/authentication/vscode-node/copilotTokenManager.ts.json

@@ -1,18 +1,6 @@
 [
-	{
-		"from": "import { env, window } from 'vscode';",
-		"by": "import { authentication, env, window } from 'vscode';"
-	},
-	{
-		"from": "import { getAnyAuthSession } from './session';",
-		"by": "import { authProviderId, GITHUB_SCOPE_ALIGNED } from '../common/authentication';\nimport { getAnyAuthSession } from './session';"
-	},
-	{
-		"from": "let shown401Message = false;",
-		"by": "let shown401Message = false;\nlet oauthRetryAttempted = false;"
-	},
 	{
 		"from": "\t\t\tif (tokenResult.kind === 'success') {\n\t\t\t\tthis._logService.info(`Got Copilot token for ${session.account.label}`);\n\t\t\t\tthis._logService.info(`Copilot Chat: ${this._envService.getVersion()}, VS Code: ${this._envService.vscodeVersion}`);\n\t\t\t}\n\t\t\treturn tokenResult;",
-		"by": "\t\t\tif (tokenResult.kind === 'success') {\n\t\t\t\tthis._logService.info(`Got Copilot token for ${session.account.label}`);\n\t\t\t\tthis._logService.info(`Copilot Chat: ${this._envService.getVersion()}, VS Code: ${this._envService.vscodeVersion}`);\n\t\t\t}\n\n\t\t\tif (tokenResult.kind === 'failure' && tokenResult.reason === 'NotAuthorized' && !tokenResult.notification_id && !oauthRetryAttempted) {\n\t\t\t\toauthRetryAttempted = true;\n\t\t\t\tthis._logService.info('Copilot token exchange failed with the current session token, requesting a new OAuth session');\n\t\t\t\ttry {\n\t\t\t\t\tconst providerId = authProviderId(this.configurationService);\n\t\t\t\t\tconst newSession = await authentication.getSession(providerId, GITHUB_SCOPE_ALIGNED, {\n\t\t\t\t\t\tforceNewSession: { detail: 'Copilot requires OAuth sign-in to function. Your current workspace token cannot be used for AI features.' }\n\t\t\t\t\t});\n\t\t\t\t\tif (newSession) {\n\t\t\t\t\t\tthis._logService.info(`Got new OAuth session for ${newSession.account.label}, retrying token exchange`);\n\t\t\t\t\t\tconst retryResult = await this.authFromGitHubToken(newSession.accessToken, newSession.account.label);\n\t\t\t\t\t\tif (retryResult.kind === 'success') {\n\t\t\t\t\t\t\tthis._logService.info(`Got Copilot token for ${newSession.account.label} on retry`);\n\t\t\t\t\t\t\tthis._logService.info(`Copilot Chat: ${this._envService.getVersion()}, VS Code: ${this._envService.vscodeVersion}`);\n\t\t\t\t\t\t}\n\t\t\t\t\t\treturn retryResult;\n\t\t\t\t\t}\n\t\t\t\t} catch (e) {\n\t\t\t\t\tthis._logService.info(`OAuth re-authentication was cancelled or failed: ${e}`);\n\t\t\t\t}\n\t\t\t}\n\n\t\t\treturn tokenResult;"
+		"by": "\t\t\tif (tokenResult.kind === 'success') {\n\t\t\t\tthis._logService.info(`Got Copilot token for ${session.account.label}`);\n\t\t\t\tthis._logService.info(`Copilot Chat: ${this._envService.getVersion()}, VS Code: ${this._envService.vscodeVersion}`);\n\t\t\t}\n\n\t\t\tif (tokenResult.kind === 'failure' && tokenResult.reason === 'NotAuthorized' && !tokenResult.notification_id) {\n\t\t\t\tthis._logService.info('Copilot token exchange failed (workspace token cannot be exchanged for Copilot token), triggering sign-in flow');\n\t\t\t\treturn { kind: 'failure', reason: 'GitHubLoginFailed' };\n\t\t\t}\n\n\t\t\treturn tokenResult;"
 	}
 ]

code/extensions/copilot/src/platform/authentication/vscode-node/copilotTokenManager.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { authentication, env, window } from 'vscode';
+import { env, window } from 'vscode';
 import { TaskSingler } from '../../../util/common/taskSingler';
 import { ConfigKey, IConfigurationService } from '../../configuration/common/configurationService';
 import { ICAPIClientService } from '../../endpoint/common/capiClient';
@@ -16,12 +16,10 @@ import { ITelemetryService } from '../../telemetry/common/telemetry';
 import { CopilotToken, ExtendedTokenInfo, TokenErrorNotificationId, TokenInfoOrError } from '../common/copilotToken';
 import { nowSeconds } from '../common/copilotTokenManager';
 import { BaseCopilotTokenManager } from '../node/copilotTokenManager';
-import { authProviderId, GITHUB_SCOPE_ALIGNED } from '../common/authentication';
 import { getAnyAuthSession } from './session';
 
 //Flag if we've shown message about broken oauth token.
 let shown401Message = false;
-let oauthRetryAttempted = false;
 
 export class NotSignedUpError extends Error { }
 export class SubscriptionExpiredError extends Error { }
@@ -88,26 +86,9 @@ export class VSCodeCopilotTokenManager extends BaseCopilotTokenManager {
 				this._logService.info(`Copilot Chat: ${this._envService.getVersion()}, VS Code: ${this._envService.vscodeVersion}`);
 			}
 
-			if (tokenResult.kind === 'failure' && tokenResult.reason === 'NotAuthorized' && !tokenResult.notification_id && !oauthRetryAttempted) {
-				oauthRetryAttempted = true;
-				this._logService.info('Copilot token exchange failed with the current session token, requesting a new OAuth session');
-				try {
-					const providerId = authProviderId(this.configurationService);
-					const newSession = await authentication.getSession(providerId, GITHUB_SCOPE_ALIGNED, {
-						forceNewSession: { detail: 'Copilot requires OAuth sign-in to function. Your current workspace token cannot be used for AI features.' }
-					});
-					if (newSession) {
-						this._logService.info(`Got new OAuth session for ${newSession.account.label}, retrying token exchange`);
-						const retryResult = await this.authFromGitHubToken(newSession.accessToken, newSession.account.label);
-						if (retryResult.kind === 'success') {
-							this._logService.info(`Got Copilot token for ${newSession.account.label} on retry`);
-							this._logService.info(`Copilot Chat: ${this._envService.getVersion()}, VS Code: ${this._envService.vscodeVersion}`);
-						}
-						return retryResult;
-					}
-				} catch (e) {
-					this._logService.info(`OAuth re-authentication was cancelled or failed: ${e}`);
-				}
+			if (tokenResult.kind === 'failure' && tokenResult.reason === 'NotAuthorized' && !tokenResult.notification_id) {
+				this._logService.info('Copilot token exchange failed (workspace token cannot be exchanged for Copilot token), triggering sign-in flow');
+				return { kind: 'failure', reason: 'GitHubLoginFailed' };
 			}
 
 			return tokenResult;