Fixes prompt/action name and settings

Author: eamodio

package.json

@@ -4152,7 +4152,7 @@
 							"preview"
 						]
 					},
-					"gitlens.ai.generateCloudPatchMessage.customInstructions": {
+					"gitlens.ai.generateCreateCloudPatch.customInstructions": {
 						"type": "string",
 						"default": null,
 						"markdownDescription": "Specifies custom instructions to provide to the AI provider when generating a cloud patch title and description",
@@ -4162,7 +4162,7 @@
 							"preview"
 						]
 					},
-					"gitlens.ai.generateCodeSuggestMessage.customInstructions": {
+					"gitlens.ai.generateCreateCodeSuggest.customInstructions": {
 						"type": "string",
 						"default": null,
 						"markdownDescription": "Specifies custom instructions to provide to the AI provider when generating a code suggest title and description",
@@ -4171,6 +4171,16 @@
 						"tags": [
 							"preview"
 						]
+					},
+					"gitlens.ai.generateCreatePullRequest.customInstructions": {
+						"type": "string",
+						"default": null,
+						"markdownDescription": "Specifies custom instructions to provide to the AI provider when generating a pull request title and description",
+						"scope": "window",
+						"order": 500,
+						"tags": [
+							"preview"
+						]
 					}
 				}
 			},

src/commands/createPullRequestOnRemote.ts

@@ -98,7 +98,7 @@ export class CreatePullRequestOnRemoteCommand extends GlCommandBase {
 							);
 							return result?.parsed;
 						} catch (e) {
-							void window.showErrorMessage(`Unable to generate pull request message: ${e}`);
+							void window.showErrorMessage(`Unable to generate pull request details: ${e}`);
 							return undefined;
 						}
 				  },

src/config.ts

@@ -223,10 +223,13 @@ interface AIConfig {
 	readonly generateStashMessage: {
 		readonly customInstructions: string;
 	};
-	readonly generateCloudPatchMessage: {
+	readonly generateCreateCloudPatch: {
 		readonly customInstructions: string;
 	};
-	readonly generateCodeSuggestMessage: {
+	readonly generateCreateCodeSuggest: {
+		readonly customInstructions: string;
+	};
+	readonly generateCreatePullRequest: {
 		readonly customInstructions: string;
 	};
 	readonly gitkraken: {

src/features.ts

@@ -40,16 +40,17 @@ export type ProFeatures =
 	| 'startWork'
 	| 'associateIssueWithBranch'
 	| ProAIFeatures;
-export type ProAIFeatures = 'generateStashMessage' | 'explainCommit' | 'cloudPatchGenerateTitleAndDescription';
+export type ProAIFeatures = 'explainCommit' | 'generateCreateDraft' | 'generateStashMessage';
 
 export type AdvancedFeatures = AdvancedAIFeatures;
-export type AdvancedAIFeatures = 'generateChangelog';
+export type AdvancedAIFeatures = 'generateChangelog' | 'generateCreatePullRequest';
 
 export type AIFeatures = ProAIFeatures | AdvancedAIFeatures;
 
 export function isAdvancedFeature(feature: PlusFeatures): feature is AdvancedFeatures {
 	switch (feature) {
 		case 'generateChangelog':
+		case 'generateCreatePullRequest':
 			return true;
 		default:
 			return false;

src/git/gitProviderService.ts

@@ -779,10 +779,11 @@ export class GitProviderService implements Disposable {
 			feature === 'launchpad' ||
 			feature === 'startWork' ||
 			feature === 'associateIssueWithBranch' ||
-			feature === 'generateStashMessage' ||
 			feature === 'explainCommit' ||
-			feature === 'cloudPatchGenerateTitleAndDescription' ||
-			feature === 'generateChangelog'
+			feature === 'generateChangelog' ||
+			feature === 'generateCreateDraft' ||
+			feature === 'generateCreatePullRequest' ||
+			feature === 'generateStashMessage'
 		) {
 			return { allowed: false, subscription: { current: subscription, required: SubscriptionPlanId.Pro } };
 		}

src/plus/ai/aiProviderService.ts

@@ -530,7 +530,7 @@ export class AIProviderService implements Disposable {
 			progress?: ProgressOptions;
 		},
 	): Promise<AISummarizeResult | undefined> {
-		if (!(await this.ensureFeatureAccess('generateChangelog', source))) {
+		if (!(await this.ensureFeatureAccess('generateCreatePullRequest', source))) {
 			return undefined;
 		}
 
@@ -547,12 +547,12 @@ export class AIProviderService implements Disposable {
 		}
 
 		const result = await this.sendRequest(
-			'generate-pullRequestMessage',
+			'generate-create-pullRequest',
 			() => ({
 				diff: diff?.contents ?? '',
 				data: commits.sort((a, b) => a[1] - b[1]).map(c => c[0]),
 				context: options?.context ?? '',
-				instructions: configuration.get('ai.generatePullRequestMessage.customInstructions') ?? '',
+				instructions: configuration.get('ai.generateCreatePullRequest.customInstructions') ?? '',
 			}),
 			m => `Generating pull request details with ${m.name}...`,
 			source,
@@ -582,7 +582,7 @@ export class AIProviderService implements Disposable {
 			codeSuggestion?: boolean;
 		},
 	): Promise<AISummarizeResult | undefined> {
-		if (!(await this.ensureFeatureAccess('cloudPatchGenerateTitleAndDescription', sourceContext))) {
+		if (!(await this.ensureFeatureAccess('generateCreateDraft', sourceContext))) {
 			return undefined;
 		}
 
@@ -598,8 +598,8 @@ export class AIProviderService implements Disposable {
 				context: options?.context ?? '',
 				instructions:
 					(options?.codeSuggestion
-						? configuration.get('ai.generateCodeSuggestMessage.customInstructions')
-						: configuration.get('ai.generateCloudPatchMessage.customInstructions')) ?? '',
+						? configuration.get('ai.generateCreateCodeSuggest.customInstructions')
+						: configuration.get('ai.generateCreateCloudPatch.customInstructions')) ?? '',
 			}),
 			m =>
 				`Generating ${options?.codeSuggestion ? 'code suggestion' : 'cloud patch'} description with ${

src/plus/ai/models/model.ts

@@ -26,7 +26,6 @@ export interface AIModelDescriptor<Provider extends AIProviders = AIProviders, M
 
 export type AIActionType =
 	| 'generate-commitMessage'
-	| 'generate-pullRequestMessage'
 	| 'generate-stashMessage'
 	| 'generate-changelog'
 	| `generate-create-${'cloudPatch' | 'codeSuggestion' | 'pullRequest'}`

src/plus/ai/models/promptTemplates.ts

@@ -9,7 +9,6 @@ export interface PromptTemplate {
 
 export type PromptTemplateContext<T extends AIActionType> = T extends
 	| 'generate-commitMessage'
-	| 'generate-pullRequestMessage'
 	| 'generate-stashMessage'
 	| 'generate-create-cloudPatch'
 	| 'generate-create-codeSuggestion'

src/plus/ai/utils/-webview/ai.utils.ts

@@ -25,16 +25,16 @@ export function getActionName(action: AIActionType): string {
 	switch (action) {
 		case 'generate-commitMessage':
 			return 'Generate Commit Message';
-		case 'generate-pullRequestMessage':
-			return 'Generate Pull Request Details (Preview)';
 		case 'generate-stashMessage':
 			return 'Generate Stash Message';
 		case 'generate-changelog':
-			return 'Generate Changelog';
+			return 'Generate Changelog (Preview)';
 		case 'generate-create-cloudPatch':
 			return 'Create Cloud Patch Details';
 		case 'generate-create-codeSuggestion':
 			return 'Create Code Suggestion Details';
+		case 'generate-create-pullRequest':
+			return 'Create Pull Request Details (Preview)';
 		case 'explain-changes':
 			return 'Explain Changes';
 		default:

src/plus/ai/utils/-webview/prompt.utils.ts

@@ -20,12 +20,6 @@ export function getLocalPromptTemplate<T extends AIActionType>(action: T, _model
 				template: generateCommitMessageUserPrompt,
 				variables: ['diff', 'context', 'instructions'],
 			};
-		case 'generate-pullRequestMessage':
-			return {
-				name: 'Generate Pull Request Details (Preview)',
-				template: generatePullRequestMessageUserPrompt,
-				variables: ['diff', 'data', 'context', 'instructions'],
-			};
 		case 'generate-stashMessage':
 			return {
 				name: 'Generate Stash Message',
@@ -34,7 +28,7 @@ export function getLocalPromptTemplate<T extends AIActionType>(action: T, _model
 			};
 		case 'generate-changelog':
 			return {
-				name: 'Generate Changelog',
+				name: 'Generate Changelog (Preview)',
 				template: generateChangelogUserPrompt,
 				variables: ['data', 'instructions'],
 			};
@@ -50,6 +44,12 @@ export function getLocalPromptTemplate<T extends AIActionType>(action: T, _model
 				template: generateCodeSuggestMessageUserPrompt,
 				variables: ['diff', 'context', 'instructions'],
 			};
+		case 'generate-create-pullRequest':
+			return {
+				name: 'Generate Pull Request Details (Preview)',
+				template: generatePullRequestMessageUserPrompt,
+				variables: ['diff', 'data', 'context', 'instructions'],
+			};
 		case 'explain-changes':
 			return {
 				name: 'Explain Changes',