PR

Author: pwang347

src/common/settingKeys.ts

@@ -68,6 +68,8 @@ export const PULL_BEFORE_CHECKOUT = 'pullBeforeCheckout';
 export const OPEN_DIFF_ON_CLICK = 'openDiffOnClick';
 export const SHOW_INLINE_OPEN_FILE_ACTION = 'showInlineOpenFileAction';
 export const AUTO_STASH = 'autoStash';
+export const BRANCH_WHITESPACE_CHAR = 'branchWhitespaceChar';
+export const BRANCH_RANDOM_NAME_DICTIONARY = 'branchRandomName.dictionary';
 
 // GitHub Enterprise
 export const GITHUB_ENTERPRISE = 'github-enterprise';

src/github/copilotRemoteAgent/gitOperationsManager.ts

@@ -7,17 +7,15 @@ import { adjectives, animals, colors, NumberDictionary, uniqueNamesGenerator } f
 import vscode from 'vscode';
 import { Repository } from '../../api/api';
 import Logger from '../../common/logger';
+import { BRANCH_RANDOM_NAME_DICTIONARY, BRANCH_WHITESPACE_CHAR, GIT } from '../../common/settingKeys';
 import { RepoInfo } from '../common';
 
 export class GitOperationsManager {
 	constructor(private loggerID: string) { }
 
 	async commitAndPushChanges(repoInfo: RepoInfo) {
 		const { repository, remote, baseRef } = repoInfo;
-		const config = vscode.workspace.getConfiguration('git');
-		const branchWhitespaceChar = config.get<string>('branchWhitespaceChar')!;
-
-		const asyncBranch = await this.generateRandomBranchName(repository, 'copilot', branchWhitespaceChar);
+		const asyncBranch = await this.generateRandomBranchName(repository, 'copilot');
 
 		try {
 			await repository.createBranch(asyncBranch, true);
@@ -144,10 +142,17 @@ export class GitOperationsManager {
 	}
 
 	// Adapted from https://github.com/microsoft/vscode/blob/e35e3b4e057450ea3d90c724fae5e3e9619b96fe/extensions/git/src/commands.ts#L3007
-	private async generateRandomBranchName(repository: Repository, prefix: string, separator: string): Promise<string> {
-		const config = vscode.workspace.getConfiguration('git');
-		const branchRandomNameDictionary = config.get<string[]>('branchRandomName.dictionary')!;
+	private async generateRandomBranchName(repository: Repository, prefix: string): Promise<string> {
+		const config = vscode.workspace.getConfiguration(GIT);
+		const branchWhitespaceChar = config.get<string>(BRANCH_WHITESPACE_CHAR);
+		const branchRandomNameDictionary = config.get<string[]>(BRANCH_RANDOM_NAME_DICTIONARY);
+
+		// Default to legacy behaviour if config mismatches core
+		if (!branchWhitespaceChar || !branchRandomNameDictionary) {
+			return `copilot/vscode${Date.now()}`;
+		}
 
+		const separator = branchWhitespaceChar;
 		const dictionaries: string[][] = [];
 		for (const dictionary of branchRandomNameDictionary) {
 			if (dictionary.toLowerCase() === 'adjectives') {
@@ -170,11 +175,11 @@ export class GitOperationsManager {
 
 		// 5 attempts to generate a random branch name
 		for (let index = 0; index < 5; index++) {
-			const randomName = prefix + '/' + uniqueNamesGenerator({
+			const randomName = `${prefix}/${uniqueNamesGenerator({
 				dictionaries,
 				length: dictionaries.length,
 				separator
-			});
+			})}`;
 
 			// Check for local ref conflict
 			const refs = await repository.getRefs?.({ pattern: `refs/heads/${randomName}` });