Skip to content

Fix background agent folder trust check #3291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DonJayamanne merged 2 commits into from
Jan 29, 2026
Merged

Fix background agent folder trust check #3291

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bc5bcc
Fix background agent folder trust check
DonJayamanne Jan 29, 2026
02eb402
Merge branch 'main' into don/adjacent-goldfish
DonJayamanne Jan 29, 2026
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
17 changes: 17 additions & 0 deletions src/extension/chatSessions/vscode-node/copilotCLIChatSessionsContribution.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,6 +822,14 @@ export class CopilotCLIChatSessionParticipant extends Disposable {
const cachedRepo = this._repositoryCacheInEmptyWorkspace.get(repoPath);
// If we have repo then it's trusted, let's get the latest information again by requesting the repo again.
if (cachedRepo) {
const trusted = await this.workspaceService.requestResourceTrust({ uri: repoPath, message: untrustedFolderMessage });
if (!trusted) {
// User didn't trust, we can't proceed.
const result = { repository: undefined, trusted: false };
this._repositoryCacheInEmptyWorkspace.set(repoPath, result);
return result;
}

const repository = await this.gitService.getRepository(repoPath, true);
return { repository, trusted: true };
}
Expand Down Expand Up @@ -1194,6 +1202,15 @@ export class CopilotCLIChatSessionParticipant extends Disposable {
}
}

// Verify trust for the working directory
if (!cancelled && workingDirectory) {
const trusted = await this.workspaceService.requestResourceTrust({ uri: workingDirectory, message: untrustedFolderMessage });
if (!trusted) {
stream.warning(l10n.t('The selected folder is not trusted.'));
cancelled = true;
}
}

// Migrate changes from active repository to worktree (only if we have a worktree, not for workspace folders without git)
if (worktreeProperties?.worktreePath && !isWorkspaceFolderWithoutRepo && (uncommittedChangesAction === 'move' || uncommittedChangesAction === 'copy')) {
await this.moveOrCopyChangesToWorkTree(Uri.file(worktreeProperties.repositoryPath), Uri.file(worktreeProperties.worktreePath), uncommittedChangesAction, stream, token);
Expand Down
Loading