Replace createFromTemplate setting with templatePrompt option in pullRequestDescription

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

Author: Copilot

package.json

@@ -145,34 +145,21 @@
 					"type": "string",
 					"enum": [
 						"template",
+						"templatePrompt",
 						"commit",
 						"none",
 						"Copilot"
 					],
 					"enumDescriptions": [
 						"%githubPullRequests.pullRequestDescription.template%",
+						"%githubPullRequests.pullRequestDescription.templatePrompt%",
 						"%githubPullRequests.pullRequestDescription.commit%",
 						"%githubPullRequests.pullRequestDescription.none%",
 						"%githubPullRequests.pullRequestDescription.copilot%"
 					],
 					"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

@@ -3,13 +3,10 @@
 	"description": "Pull Request and Issue Provider for GitHub",
 	"githubPullRequests.pullRequestDescription.description": "The description used when creating pull requests.",
 	"githubPullRequests.pullRequestDescription.template": "Use a pull request template and commit description, or just use the commit description if no templates were found",
+	"githubPullRequests.pullRequestDescription.templatePrompt": "Prompt to select from available pull request templates when multiple templates exist, otherwise use the first template",
 	"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/github/createPRViewProvider.ts

@@ -682,7 +682,7 @@ export class CreatePullRequestViewProvider extends BaseCreatePullRequestViewProv
 	protected async getTitleAndDescription(compareBranch: Branch, baseBranch: string): Promise<{ title: string, description: string }> {
 		let title: string = '';
 		let description: string = '';
-		const descrptionSource = vscode.workspace.getConfiguration(PR_SETTINGS_NAMESPACE).get<'commit' | 'template' | 'none' | 'Copilot'>(PULL_REQUEST_DESCRIPTION);
+		const descrptionSource = vscode.workspace.getConfiguration(PR_SETTINGS_NAMESPACE).get<'commit' | 'template' | 'templatePrompt' | 'none' | 'Copilot'>(PULL_REQUEST_DESCRIPTION);
 		if (descrptionSource === 'none') {
 			return { title, description };
 		}
@@ -699,7 +699,7 @@ export class CreatePullRequestViewProvider extends BaseCreatePullRequestViewProv
 			const [totalCommits, lastCommit, pullRequestTemplate] = await Promise.all([
 				this.getTotalGitHubCommits(compareBranch, baseBranch),
 				name ? titleAndBodyFrom(promiseWithTimeout(this._folderRepositoryManager.getTipCommitMessage(name), 5000)) : undefined,
-				descrptionSource === 'template' ? this.getPullRequestTemplate() : undefined
+				descrptionSource === 'template' ? this._folderRepositoryManager.getPullRequestTemplateBody(this.model.baseOwner) : (descrptionSource === 'templatePrompt' ? this.getPullRequestTemplate() : undefined)
 			]);
 			const totalNonMergeCommits = totalCommits?.filter(commit => commit.parents.length < 2);
 
@@ -757,23 +757,17 @@ export class CreatePullRequestViewProvider extends BaseCreatePullRequestViewProv
 	}
 
 	private async getPullRequestTemplate(): Promise<string | undefined> {
-		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') {
+		if (templates.length === 1) {
 			return templates[0];
 		}
 
-		// createFromTemplate === 'prompt' and multiple templates exist
+		// Multiple templates exist - show quick pick
 		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)