CCR feedback

Author: alexr00

src/gitProviders/vslsguest.ts

@@ -6,7 +6,7 @@
 import * as vscode from 'vscode';
 
 import { LiveShare, SharedServiceProxy } from 'vsls/vscode.js';
-import { Branch, Change, Commit, Ref, Remote, RepositoryState, Submodule } from '../@types/git';
+import { Branch, Change, Commit, Ref, Remote, RepositoryState, Submodule, Worktree } from '../@types/git';
 import { IGit, Repository } from '../api/api';
 import { Disposable } from '../common/lifecycle';
 import {
@@ -138,6 +138,7 @@ class LiveShareRepositoryState implements RepositoryState {
 	HEAD: Branch | undefined;
 	remotes: Remote[];
 	submodules: Submodule[] = [];
+	worktrees: Worktree[] = [];
 	rebaseCommit: Commit | undefined;
 	mergeChanges: Change[] = [];
 	indexChanges: Change[] = [];

src/github/folderRepositoryManager.ts

@@ -46,13 +46,15 @@ import {
 	CHAT_SETTINGS_NAMESPACE,
 	CHECKOUT_DEFAULT_BRANCH,
 	CHECKOUT_PULL_REQUEST_BASE_BRANCH,
+	DEFAULT_DELETION_METHOD,
 	DISABLE_AI_FEATURES,
 	GIT,
 	POST_DONE,
 	PR_SETTINGS_NAMESPACE,
 	PULL_BEFORE_CHECKOUT,
 	PULL_BRANCH,
 	REMOTES,
+	SELECT_WORKTREE,
 	UPSTREAM_REMOTE,
 } from '../common/settingKeys';
 import { ITelemetry } from '../common/telemetry';
@@ -2193,14 +2195,20 @@ export class FolderRepositoryManager extends Disposable {
 					nonExistantBranches = new Set<string>();
 
 					// Find which selected branches have worktrees (must be deleted before the branch)
+					const preferredWorktreeDeletion = !!vscode.workspace
+						.getConfiguration(PR_SETTINGS_NAMESPACE)
+						.get<boolean>(`${DEFAULT_DELETION_METHOD}.${SELECT_WORKTREE}`);
 					const worktreeItems: (vscode.QuickPickItem & { worktreePath: string })[] = [];
 					for (const pick of branchPicks) {
 						const worktreeUri = this.getWorktreeForBranch(pick.label);
-						if (worktreeUri) {
+						if (worktreeUri && !vscode.workspace.workspaceFolders?.some(folder =>
+							folder.uri.fsPath === worktreeUri.fsPath ||
+							(process.platform === 'win32' && folder.uri.fsPath.toLowerCase() === worktreeUri.fsPath.toLowerCase())
+						)) {
 							worktreeItems.push({
 								label: pick.label,
 								description: worktreeUri.fsPath,
-								picked: true,
+								picked: preferredWorktreeDeletion,
 								worktreePath: worktreeUri.fsPath,
 							});
 						}