Background - store base branch protection (#4364)

lszomoru · web-flow · commit 289eecda8c82 · 2026-03-11T20:28:41.000Z
diff --git a/src/extension/chatSessions/common/chatSessionWorktreeService.ts b/src/extension/chatSessions/common/chatSessionWorktreeService.ts
@@ -38,6 +38,7 @@ interface ChatSessionWorktreePropertiesV1 extends ChatSessionWorktreeBasePropert
 interface ChatSessionWorktreePropertiesV2 extends ChatSessionWorktreeBaseProperties {
 	readonly version: 2;
 	readonly baseBranchName: string;
+	readonly baseBranchProtected?: boolean;
 	readonly pullRequestUrl?: string;
 }
 
diff --git a/src/extension/chatSessions/vscode-node/chatSessionWorktreeServiceImpl.ts b/src/extension/chatSessions/vscode-node/chatSessionWorktreeServiceImpl.ts
@@ -71,6 +71,9 @@ export class ChatSessionWorktreeService extends Disposable implements IChatSessi
 			const worktreePath = await this.gitService.createWorktree(activeRepository.rootUri, { branch, commitish: baseBranch });
 
 			if (worktreePath && activeRepository.headCommitHash && activeRepository.headBranchName) {
+				const baseBranchName = baseBranch ?? activeRepository.headBranchName;
+				const baseBranchProtected = await this.gitService.isBranchProtected(activeRepository.rootUri, baseBranchName);
+
 				let baseCommit: string | undefined = undefined;
 				if (baseBranch) {
 					const refs = await this.gitService.getRefs(activeRepository.rootUri, { pattern: `refs/heads/${baseBranch}` });
@@ -80,7 +83,8 @@ export class ChatSessionWorktreeService extends Disposable implements IChatSessi
 				return {
 					branchName: branch,
 					baseCommit: baseCommit ?? activeRepository.headCommitHash,
-					baseBranchName: baseBranch ?? activeRepository.headBranchName,
+					baseBranchName,
+					baseBranchProtected,
 					repositoryPath: activeRepository.rootUri.fsPath,
 					worktreePath,
 					version: 2
diff --git a/src/extension/chatSessions/vscode-node/copilotCLIChatSessionsContribution.ts b/src/extension/chatSessions/vscode-node/copilotCLIChatSessionsContribution.ts
@@ -270,11 +270,16 @@ export class CopilotCLIChatSessionItemProvider extends Disposable implements vsc
 		const metadata = worktreeProperties
 			? {
 				baseCommit: worktreeProperties?.baseCommit,
+				baseBranchProtected: worktreeProperties.version === 2
+					? worktreeProperties.baseBranchProtected === true
+					: undefined,
 				branchName: worktreeProperties?.branchName,
 				isolationMode: 'worktree',
 				repositoryPath: worktreeProperties?.repositoryPath,
 				worktreePath: worktreeProperties?.worktreePath,
-				pullRequestUrl: worktreeProperties.version === 2 ? worktreeProperties.pullRequestUrl : undefined,
+				pullRequestUrl: worktreeProperties.version === 2
+					? worktreeProperties.pullRequestUrl
+					: undefined,
 			} satisfies { readonly [key: string]: unknown }
 			: {
 				isolationMode: 'workspace',
diff --git a/src/extension/prompt/node/test/repoInfoTelemetry.spec.ts b/src/extension/prompt/node/test/repoInfoTelemetry.spec.ts
@@ -102,6 +102,7 @@ suite('RepoInfoTelemetry', () => {
 			rebase: vi.fn(),
 			commit: vi.fn(),
 			getRefs: vi.fn(),
+			isBranchProtected: vi.fn(),
 			push: vi.fn(),
 			dispose: vi.fn()
 		};
diff --git a/src/platform/git/common/gitService.ts b/src/platform/git/common/gitService.ts
@@ -10,7 +10,7 @@ import { Event } from '../../../util/vs/base/common/event';
 import { IObservable } from '../../../util/vs/base/common/observableInternal';
 import { equalsIgnoreCase } from '../../../util/vs/base/common/strings';
 import { URI } from '../../../util/vs/base/common/uri';
-import { Change, Commit, CommitOptions, CommitShortStat, DiffChange, LogOptions, Ref, RefQuery, RepositoryAccessDetails, RepositoryKind, Worktree } from '../vscode/git';
+import { Branch, Change, Commit, CommitOptions, CommitShortStat, DiffChange, LogOptions, Ref, RefQuery, RepositoryAccessDetails, RepositoryKind, Worktree } from '../vscode/git';
 
 export interface RepoContext {
 	readonly rootUri: URI;
@@ -79,6 +79,7 @@ export interface IGitService extends IDisposable {
 	rebase(uri: URI, branch: string): Promise<void>;
 
 	getRefs(uri: URI, query: RefQuery, cancellationToken?: CancellationToken): Promise<Ref[]>;
+	isBranchProtected(uri: URI, branch?: string | Branch): Promise<boolean | undefined>;
 
 	generateRandomBranchName(uri: URI): Promise<string | undefined>;
 }
diff --git a/src/platform/git/vscode/git.d.ts b/src/platform/git/vscode/git.d.ts
@@ -317,6 +317,8 @@ export interface Repository {
 	migrateChanges(sourceRepositoryPath: string, options?: { confirmation?: boolean; deleteFromSource?: boolean; untracked?: boolean }): Promise<void>;
 
 	generateRandomBranchName(): Promise<string | undefined>;
+
+	isBranchProtected(branch?: Branch): boolean;
 }
 
 export interface RemoteSource {
diff --git a/src/platform/git/vscode/gitServiceImpl.ts b/src/platform/git/vscode/gitServiceImpl.ts
@@ -20,7 +20,7 @@ import { ILogService } from '../../log/common/logService';
 import { IGitExtensionService } from '../common/gitExtensionService';
 import { IGitService, RepoContext } from '../common/gitService';
 import { parseGitRemotes } from '../common/utils';
-import { API, APIState, Change, Commit, CommitOptions, CommitShortStat, DiffChange, LogOptions, Ref, RefQuery, Repository, RepositoryAccessDetails } from './git';
+import { API, APIState, Branch, Change, Commit, CommitOptions, CommitShortStat, DiffChange, LogOptions, Ref, RefQuery, Repository, RepositoryAccessDetails } from './git';
 
 export class GitServiceImpl extends Disposable implements IGitService {
 
@@ -326,6 +326,25 @@ export class GitServiceImpl extends Disposable implements IGitService {
 		return await repository?.getRefs(query, cancellationToken) ?? [];
 	}
 
+	async isBranchProtected(uri: URI, branch?: string | Branch): Promise<boolean | undefined> {
+		try {
+			const gitAPI = this.gitExtensionService.getExtensionApi();
+			const repository = gitAPI?.getRepository(uri);
+			if (!repository) {
+				return undefined;
+			}
+
+			const branchToCheck = typeof branch === 'string'
+				? await repository.getBranch(branch)
+				: branch;
+			return repository.isBranchProtected(branchToCheck);
+		} catch (error) {
+			const branchLabel = typeof branch === 'string' ? branch : branch?.name;
+			this.logService.error(`[GitServiceImpl][isBranchProtected] Failed to check branch protection for ${uri.toString()}${branchLabel ? ` (${branchLabel})` : ''}: ${error instanceof Error ? error.message : String(error)}`);
+			return undefined;
+		}
+	}
+
 	async generateRandomBranchName(uri: URI): Promise<string | undefined> {
 		try {
 			const gitAPI = this.gitExtensionService.getExtensionApi();
diff --git a/src/platform/ignore/node/test/mockGitService.ts b/src/platform/ignore/node/test/mockGitService.ts
@@ -10,7 +10,7 @@ import { IObservable } from '../../../../util/vs/base/common/observableInternal'
 import { observableValue } from '../../../../util/vs/base/common/observableInternal/observables/observableValue';
 import { URI } from '../../../../util/vs/base/common/uri';
 import { IGitService, RepoContext } from '../../../git/common/gitService';
-import { Change, Commit, CommitOptions, CommitShortStat, DiffChange, LogOptions, Ref, RefQuery, RepositoryAccessDetails } from '../../../git/vscode/git';
+import { Branch, Change, Commit, CommitOptions, CommitShortStat, DiffChange, LogOptions, Ref, RefQuery, RepositoryAccessDetails } from '../../../git/vscode/git';
 
 /**
  * A configurable mock implementation of IGitService for testing.
@@ -138,6 +138,10 @@ export class MockGitService implements IGitService {
 		return Promise.resolve([]);
 	}
 
+	isBranchProtected(_uri: URI, _branch?: string | Branch): Promise<boolean | undefined> {
+		return Promise.resolve(undefined);
+	}
+
 	generateRandomBranchName(_uri: URI): Promise<string | undefined> {
 		return Promise.resolve(undefined);
 	}
diff --git a/src/platform/test/node/simulationWorkspaceServices.ts b/src/platform/test/node/simulationWorkspaceServices.ts
@@ -29,7 +29,7 @@ import { IFileSystemService } from '../../filesystem/common/fileSystemService';
 import { FileType, RelativePattern } from '../../filesystem/common/fileTypes';
 import { NodeFileSystemService } from '../../filesystem/node/fileSystemServiceImpl';
 import { IGitService, RepoContext } from '../../git/common/gitService';
-import { Change, CommitOptions, CommitShortStat, DiffChange, Ref, RefQuery, RepositoryAccessDetails } from '../../git/vscode/git';
+import { Branch, Change, CommitOptions, CommitShortStat, DiffChange, Ref, RefQuery, RepositoryAccessDetails } from '../../git/vscode/git';
 import { AbstractLanguageDiagnosticsService } from '../../languages/common/languageDiagnosticsService';
 import { ILanguageFeaturesService } from '../../languages/common/languageFeaturesService';
 import { ILogService } from '../../log/common/logService';
@@ -818,6 +818,10 @@ export class TestingGitService implements IGitService {
 		return [];
 	}
 
+	async isBranchProtected(uri: URI, branch?: string | Branch): Promise<boolean | undefined> {
+		return undefined;
+	}
+
 	async generateRandomBranchName(_uri: URI): Promise<string | undefined> {
 		return undefined;
 	}

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ interface ChatSessionWorktreePropertiesV1 extends ChatSessionWorktreeBasePropert`
`38`	`38`	`interface ChatSessionWorktreePropertiesV2 extends ChatSessionWorktreeBaseProperties {`
`39`	`39`	`readonly version: 2;`
`40`	`40`	`readonly baseBranchName: string;`
	`41`	`+ readonly baseBranchProtected?: boolean;`
`41`	`42`	`readonly pullRequestUrl?: string;`
`42`	`43`	`}`
`43`	`44`
Original file line number	Diff line number	Diff line change
`@@ -317,6 +317,8 @@ export interface Repository {`
`317`	`317`	`migrateChanges(sourceRepositoryPath: string, options?: { confirmation?: boolean; deleteFromSource?: boolean; untracked?: boolean }): Promise<void>;`
`318`	`318`
`319`	`319`	`generateRandomBranchName(): Promise<string \| undefined>;`
	`320`	`+`
	`321`	`+ isBranchProtected(branch?: Branch): boolean;`
`320`	`322`	`}`
`321`	`323`
`322`	`324`	`export interface RemoteSource {`