supportfileattachment follow ups (#7795)

* supportfileattachment follow ups

* update other tests

Author: joshspicer

src/extension.ts

@@ -417,7 +417,7 @@ async function deferredActivate(context: vscode.ExtensionContext, showPRControll
 
 	Logger.debug('Creating tree view.', 'Activation');
 
-	const copilotRemoteAgentManager = new CopilotRemoteAgentManager(credentialStore, reposManager, telemetry, context);
+	const copilotRemoteAgentManager = new CopilotRemoteAgentManager(credentialStore, reposManager, telemetry, context, apiImpl);
 	context.subscriptions.push(copilotRemoteAgentManager);
 	if (vscode.chat?.registerChatSessionItemProvider) {
 		const provider = new class implements vscode.ChatSessionContentProvider, vscode.ChatSessionItemProvider {

src/github/copilotRemoteAgent.ts

@@ -7,6 +7,7 @@ import * as pathLib from 'path';
 import * as marked from 'marked';
 import vscode, { ChatPromptReference } from 'vscode';
 import { parseSessionLogs, parseToolCallDetails, StrReplaceEditorToolData } from '../../common/sessionParsing';
+import { GitApiImpl } from '../api/api1';
 import { COPILOT_ACCOUNTS } from '../common/comment';
 import { CopilotRemoteAgentConfig } from '../common/config';
 import { COPILOT_LOGINS, COPILOT_SWE_AGENT, copilotEventToStatus, CopilotPRStatus, mostRecentCopilotEvent } from '../common/copilot';
@@ -30,6 +31,7 @@ import { issueMarkdown, PlainTextRenderer } from './markdownUtils';
 import { PullRequestModel } from './pullRequestModel';
 import { chooseItem } from './quickPicks';
 import { RepositoriesManager } from './repositoriesManager';
+import { getRepositoryForFile } from './utils';
 
 const LEARN_MORE = vscode.l10n.t('Learn about coding agent');
 // Without Pending Changes
@@ -87,7 +89,13 @@ export class CopilotRemoteAgentManager extends Disposable {
 		status: CopilotPRStatus;
 	}[]> | undefined;
 
-	constructor(private credentialStore: CredentialStore, public repositoriesManager: RepositoriesManager, private telemetry: ITelemetry, private context: vscode.ExtensionContext) {
+	constructor(
+		private credentialStore: CredentialStore,
+		public repositoriesManager: RepositoriesManager,
+		private telemetry: ITelemetry,
+		private context: vscode.ExtensionContext,
+		private gitAPI: GitApiImpl,
+	) {
 		super();
 		this.gitOperationsManager = new GitOperationsManager(CopilotRemoteAgentManager.ID);
 		this._register(this.credentialStore.onDidChangeSessions((e: vscode.AuthenticationSessionsChangeEvent) => {
@@ -773,17 +781,17 @@ export class CopilotRemoteAgentManager extends Disposable {
 		return fullText;
 	}
 
-	extractFileReferences(references: readonly ChatPromptReference[] | undefined): string | undefined {
+	private extractFileReferences(references: readonly ChatPromptReference[] | undefined): string | undefined {
 		if (!references || references.length === 0) {
 			return;
 		}
 		// 'file:///Users/jospicer/dev/joshbot/.github/workflows/build-vsix.yml'  -> '.github/workflows/build-vsix.yml'
 		const parts: string[] = [];
 		for (const ref of references) {
 			if (ref.value instanceof vscode.Uri && ref.value.scheme === 'file') { // TODO: Add support for more kinds of references
-				const workspaceFolder = vscode.workspace.getWorkspaceFolder(ref.value);
-				if (workspaceFolder) {
-					const relativePath = pathLib.relative(workspaceFolder.uri.fsPath, ref.value.fsPath);
+				const repositoryForFile = getRepositoryForFile(this.gitAPI, ref.value);
+				if (repositoryForFile) {
+					const relativePath = pathLib.relative(repositoryForFile.rootUri.fsPath, ref.value.fsPath);
 					parts.push(` - ${relativePath}`);
 				}
 			}

src/test/github/copilotRemoteAgent.test.ts

@@ -20,6 +20,7 @@ import { Protocol } from '../../common/protocol';
 import { GitHubServerType } from '../../common/authentication';
 import { ReposManagerState } from '../../github/folderRepositoryManager';
 import { CopilotPRStatus } from '../../common/copilot';
+import { GitApiImpl } from '../../api/api1';
 
 const telemetry = new MockTelemetry();
 const protocol = new Protocol('https://github.com/github/test.git');
@@ -32,6 +33,7 @@ describe('CopilotRemoteAgentManager', function () {
 	let reposManager: RepositoriesManager;
 	let context: MockExtensionContext;
 	let mockRepo: MockGitHubRepository;
+	let gitAPIImp: GitApiImpl;
 
 	beforeEach(function () {
 		sinon = createSandbox();
@@ -62,7 +64,9 @@ describe('CopilotRemoteAgentManager', function () {
 
 		mockRepo = new MockGitHubRepository(remote, credentialStore, telemetry, sinon);
 
-		manager = new CopilotRemoteAgentManager(credentialStore, reposManager, telemetry, context);
+		gitAPIImp = new GitApiImpl(reposManager);
+
+		manager = new CopilotRemoteAgentManager(credentialStore, reposManager, telemetry, context, gitAPIImp);
 		Resource.initialize(context);
 	});
 

src/test/view/prsTree.test.ts

@@ -44,6 +44,7 @@ describe('GitHub Pull Requests view', function () {
 	let createPrHelper: CreatePullRequestHelper;
 	let copilotManager: CopilotRemoteAgentManager;
 	let mockThemeWatcher: MockThemeWatcher;
+	let gitAPI: GitApiImpl;
 
 	beforeEach(function () {
 		sinon = createSandbox();
@@ -58,7 +59,8 @@ describe('GitHub Pull Requests view', function () {
 			telemetry,
 		);
 		credentialStore = new CredentialStore(telemetry, context);
-		copilotManager = new CopilotRemoteAgentManager(credentialStore, reposManager, telemetry, context);
+		gitAPI = new GitApiImpl(reposManager);
+		copilotManager = new CopilotRemoteAgentManager(credentialStore, reposManager, telemetry, context, gitAPI);
 		provider = new PullRequestsTreeDataProvider(telemetry, context, reposManager, copilotManager);
 		createPrHelper = new CreatePullRequestHelper();
 

src/test/view/reviewCommentController.test.ts

@@ -78,12 +78,12 @@ describe('ReviewCommentController', function () {
 		repository = new MockRepository();
 		repository.addRemote('origin', 'git@github.com:aaa/bbb');
 		reposManager = new RepositoriesManager(credentialStore, telemetry);
-		copilotManager = new CopilotRemoteAgentManager(credentialStore, reposManager, telemetry, context);
+		gitApiImpl = new GitApiImpl(reposManager);
+		copilotManager = new CopilotRemoteAgentManager(credentialStore, reposManager, telemetry, context, gitApiImpl);
 		provider = new PullRequestsTreeDataProvider(telemetry, context, reposManager, copilotManager);
 		const activePrViewCoordinator = new WebviewViewCoordinator(context);
 		const createPrHelper = new CreatePullRequestHelper();
 		Resource.initialize(context);
-		gitApiImpl = new GitApiImpl(reposManager);
 		manager = new FolderRepositoryManager(0, context, repository, telemetry, gitApiImpl, credentialStore, createPrHelper, mockThemeWatcher);
 		reposManager.insertFolderManager(manager);
 		const tree = new PullRequestChangesTreeDataProvider(gitApiImpl, reposManager);