Add createFromTemplate setting with none, first, and prompt options

Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>

Author: Copilot

package.json

@@ -158,6 +158,21 @@
 					"default": "template",
 					"description": "%githubPullRequests.pullRequestDescription.description%"
 				},
+				"githubPullRequests.createFromTemplate": {
+					"type": "string",
+					"enum": [
+						"none",
+						"first",
+						"prompt"
+					],
+					"enumDescriptions": [
+						"%githubPullRequests.createFromTemplate.none%",
+						"%githubPullRequests.createFromTemplate.first%",
+						"%githubPullRequests.createFromTemplate.prompt%"
+					],
+					"default": "first",
+					"description": "%githubPullRequests.createFromTemplate.description%"
+				},
 				"githubPullRequests.defaultCreateOption": {
 					"type": "string",
 					"enum": [

package.nls.json

@@ -6,6 +6,10 @@
 	"githubPullRequests.pullRequestDescription.commit": "Use the latest commit message only",
 	"githubPullRequests.pullRequestDescription.none": "Do not have a default description",
 	"githubPullRequests.pullRequestDescription.copilot": "Generate a pull request title and description from GitHub Copilot. Requires that the GitHub Copilot extension is installed and authenticated. Will fall back to `commit` if Copilot is not set up.",
+	"githubPullRequests.createFromTemplate.description": "When multiple pull request templates are available, choose which template to use.",
+	"githubPullRequests.createFromTemplate.none": "Do not use any template",
+	"githubPullRequests.createFromTemplate.first": "Use the first template found",
+	"githubPullRequests.createFromTemplate.prompt": "Prompt to choose which template to use",
 	"githubPullRequests.defaultCreateOption.description": "The create option that the \"Create\" button will default to when creating a pull request.",
 	"githubPullRequests.defaultCreateOption.lastUsed": "The most recently used create option.",
 	"githubPullRequests.defaultCreateOption.create": "The pull request will be created.",

src/common/settingKeys.ts

@@ -18,6 +18,7 @@ export const NEVER_IGNORE_DEFAULT_BRANCH = 'neverIgnoreDefaultBranch';
 export const OVERRIDE_DEFAULT_BRANCH = 'overrideDefaultBranch';
 export const PULL_BRANCH = 'pullBranch';
 export const PULL_REQUEST_DESCRIPTION = 'pullRequestDescription';
+export const CREATE_FROM_TEMPLATE = 'createFromTemplate';
 export const NOTIFICATION_SETTING = 'notifications';
 export type NotificationVariants = 'off' | 'pullRequests';
 export const POST_CREATE = 'postCreate';

src/github/createPRViewProvider.ts

@@ -757,7 +757,41 @@ export class CreatePullRequestViewProvider extends BaseCreatePullRequestViewProv
 	}
 
 	private async getPullRequestTemplate(): Promise<string | undefined> {
-		return this._folderRepositoryManager.getPullRequestTemplateBody(this.model.baseOwner);
+		const createFromTemplate = vscode.workspace.getConfiguration(PR_SETTINGS_NAMESPACE).get<'none' | 'first' | 'prompt'>('createFromTemplate', 'first');
+
+		if (createFromTemplate === 'none') {
+			return undefined;
+		}
+
+		const templates = await this._folderRepositoryManager.getAllPullRequestTemplates(this.model.baseOwner);
+
+		if (!templates || templates.length === 0) {
+			return undefined;
+		}
+
+		if (templates.length === 1 || createFromTemplate === 'first') {
+			return templates[0];
+		}
+
+		// createFromTemplate === 'prompt' and multiple templates exist
+		const selectedTemplate = await vscode.window.showQuickPick(
+			templates.map((template, index) => {
+				// Try to extract a meaningful name from the template (first line or first few chars)
+				const firstLine = template.split('\n')[0].trim();
+				const label = firstLine || `Template ${index + 1}`;
+				return {
+					label: label.substring(0, 50) + (label.length > 50 ? '...' : ''),
+					description: `${template.length} characters`,
+					template: template
+				};
+			}),
+			{
+				placeHolder: vscode.l10n.t('Select a pull request template'),
+				ignoreFocusOut: true
+			}
+		);
+
+		return selectedTemplate?.template;
 	}
 
 	protected async detectBaseMetadata(defaultCompareBranch: Branch): Promise<BaseBranchMetadata | undefined> {

src/github/folderRepositoryManager.ts

@@ -1366,6 +1366,29 @@ export class FolderRepositoryManager extends Disposable {
 		}
 	}
 
+	async getAllPullRequestTemplates(owner: string): Promise<string[] | undefined> {
+		try {
+			const repository = this.gitHubRepositories.find(repo => repo.remote.owner === owner);
+			if (!repository) {
+				return undefined;
+			}
+			const templates = await repository.getPullRequestTemplates();
+			if (templates && templates.length > 0) {
+				return templates;
+			}
+
+			// If there's no local template, look for owner-wide templates
+			const githubRepository = await this.createGitHubRepositoryFromOwnerName(owner, '.github');
+			if (!githubRepository) {
+				return undefined;
+			}
+			return githubRepository.getPullRequestTemplates();
+		} catch (e) {
+			Logger.error(`Error fetching pull request templates for ${owner}: ${e instanceof Error ? e.message : e}`, this.id);
+			return undefined;
+		}
+	}
+
 	private async getPullRequestTemplateWithCache(owner: string): Promise<string | undefined> {
 		const cacheLocation = `${CACHED_TEMPLATE_BODY}+${this.repository.rootUri.toString()}`;