Adopt copilot chat setup command (#7625)

* Adopt copilot chat setup command
Part of #7614

* Use additional scopes

Author: alexr00

src/common/executeCommands.ts

@@ -24,6 +24,7 @@ export namespace contexts {
 
 export namespace commands {
 	export const OPEN_CHAT = 'workbench.action.chat.open';
+	export const CHAT_SETUP_ACTION_ID = 'workbench.action.chat.triggerSetup';
 
 	export const QUICK_CHAT_OPEN = 'workbench.action.quickchat.toggle';
 

src/github/copilotRemoteAgent.ts

@@ -263,23 +263,9 @@ export class CopilotRemoteAgentManager extends Disposable {
 		}
 	}
 
-	async tryAcquireAuth(): Promise<FolderRepositoryManager | undefined> {
-		if (this.credentialStore.isAnyAuthenticated()) {
-			return this.chooseFolderManager();
-		}
-
-		const result = await this.credentialStore.create({ createIfNone: { detail: vscode.l10n.t('Sign in to start delegating tasks to the GitHub coding agent.') } });
-
-		/* __GDPR__
-			"remoteAgent.command.auth" : {
-				"succeeded" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-			}
-		*/
-		this.telemetry.sendTelemetryEvent('remoteAgent.command.auth', {
-			succeeded: result.canceled ? 'false' : 'true'
-		});
-
-		if (result.canceled) {
+	async tryPromptForAuthAndRepo(): Promise<FolderRepositoryManager | undefined> {
+		const authResult = await this.credentialStore.tryPromptForCopilotAuth();
+		if (!authResult) {
 			return undefined;
 		}
 		// Wait for repos to update
@@ -293,7 +279,7 @@ export class CopilotRemoteAgentManager extends Disposable {
 			return;
 		}
 		const { userPrompt, summary, source, followup, _version } = args;
-		const fm = await this.tryAcquireAuth();
+		const fm = await this.tryPromptForAuthAndRepo();
 		if (!fm) {
 			return;
 		}

src/github/credentials.ts

@@ -10,6 +10,7 @@ import { createHttpLink } from 'apollo-link-http';
 import fetch from 'cross-fetch';
 import * as vscode from 'vscode';
 import { AuthProvider } from '../common/authentication';
+import { commands } from '../common/executeCommands';
 import { Disposable } from '../common/lifecycle';
 import Logger from '../common/logger';
 import * as PersistentState from '../common/persistentState';
@@ -121,6 +122,10 @@ export class CredentialStore extends Disposable {
 		this._scopesEnterprise = this.context.globalState.get(LAST_USED_SCOPES_ENTERPRISE_KEY, SCOPES_OLD);
 	}
 
+	get scopes() {
+		return this._scopes;
+	}
+
 	private async saveScopesInState() {
 		await this.context.globalState.update(LAST_USED_SCOPES_GITHUB_KEY, this._scopes);
 		await this.context.globalState.update(LAST_USED_SCOPES_ENTERPRISE_KEY, this._scopesEnterprise);
@@ -287,6 +292,33 @@ export class CredentialStore extends Disposable {
 		return !this.allScopesIncluded(this._scopesEnterprise, SCOPES_OLD);
 	}
 
+	async tryPromptForCopilotAuth(): Promise<boolean> {
+		if (this.isAnyAuthenticated()) {
+			return true;
+		}
+
+		const chatSetupResult = await commands.executeCommand(commands.CHAT_SETUP_ACTION_ID, 'agent', { additionalScopes: this.scopes });
+		if (!chatSetupResult) {
+			return false;
+		}
+
+		const result = await this.create({ createIfNone: { detail: vscode.l10n.t('Sign in to start delegating tasks to the GitHub coding agent.') } });
+
+		/* __GDPR__
+			"remoteAgent.command.auth" : {
+				"succeeded" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
+		this._telemetry.sendTelemetryEvent('remoteAgent.command.auth', {
+			succeeded: result.canceled ? 'false' : 'true'
+		});
+
+		if (result.canceled) {
+			return false;
+		}
+		return true;
+	}
+
 	public areScopesExtra(authProviderId: AuthProvider): boolean {
 		if (!isEnterprise(authProviderId)) {
 			return this.allScopesIncluded(this._scopes, SCOPES_WITH_ADDITIONAL);

src/lm/tools/copilotRemoteAgentTool.ts

@@ -30,7 +30,7 @@ export class CopilotRemoteAgentTool implements vscode.LanguageModelTool<CopilotR
 
 	async prepareInvocation(options: vscode.LanguageModelToolInvocationPrepareOptions<CopilotRemoteAgentToolParameters>): Promise<vscode.PreparedToolInvocation> {
 		const { title, existingPullRequest } = options.input;
-		const folderManager = existingPullRequest ? undefined : await this.manager.tryAcquireAuth();
+		const folderManager = existingPullRequest ? undefined : await this.manager.tryPromptForAuthAndRepo();
 
 		// Check if the coding agent is available (enabled and assignable)
 		const isAvailable = await this.manager.isAvailable();
@@ -68,7 +68,7 @@ export class CopilotRemoteAgentTool implements vscode.LanguageModelTool<CopilotR
 		const title = options.input.title;
 		const body = options.input.body || '';
 		const existingPullRequest = options.input.existingPullRequest || '';
-		const folderManager = existingPullRequest ? undefined : await this.manager.tryAcquireAuth();
+		const folderManager = existingPullRequest ? undefined : await this.manager.tryPromptForAuthAndRepo();
 
 		const targetRepo = await this.manager.repoInfo(folderManager);
 		if (!targetRepo) {