Renames generate rebase prompt templates and removes unused code

Author: d13

src/commands/generateRebase.ts

@@ -166,7 +166,7 @@ export async function generateRebase(
 	options?: { cancellation?: CancellationToken; progress?: ProgressOptions },
 ): Promise<void> {
 	const repo = svc.getRepository()!;
-	const result = await container.ai.generateRebaseV2(repo, base.ref, head.ref, source, options);
+	const result = await container.ai.generateRebase(repo, base.ref, head.ref, source, options);
 	if (result == null) return;
 
 	try {

src/features.ts

@@ -86,12 +86,7 @@ export type ProAIFeatures =
 	| 'generate-stashMessage';
 
 export type AdvancedFeatures = AdvancedAIFeatures;
-export type AdvancedAIFeatures =
-	| 'generate-changelog'
-	| 'generate-create-pullRequest'
-	| 'generate-rebase'
-	| 'generate-rebase-multi-step1'
-	| 'generate-rebase-multi-step2';
+export type AdvancedAIFeatures = 'generate-changelog' | 'generate-create-pullRequest' | 'generate-rebase';
 
 export type AIFeatures = 'generate-commitMessage' | ProAIFeatures | AdvancedAIFeatures;
 

src/plus/ai/aiProviderService.ts

@@ -852,133 +852,7 @@ export class AIProviderService implements Disposable {
 		return result != null ? { ...result } : undefined;
 	}
 
-	// Step 1: Get a patch containing the combined diff of all the changes within the branch input
-	// Step 2: Prompt the AI agent to output an array with the reorganized commits and their commit messages.
-	// Accept as context:
-	// 1. The combined diff
-	// 2. Optional list of original commits and messages
-	// Take as output:
-	// An array of commit objects with the properties:
-	//   'message': The commit message as a string
-	//   'explanation': A more detailed explanation of the changes in the commit as a string
-	//   'changes': The changes of the commit as a formatted diff
-	// Step 3: Create a new branch at the same branching point as the input branch with name <originalbranch>-recomposed
-	// Step 4: Iteratively apply the diffs from the array as commits using the message and changes properties of each object
-	// Step 5: ???
-
-	async generateRebaseV1(
-		repo: Repository,
-		baseRef: string,
-		headRef: string,
-		source: Source,
-		options?: {
-			cancellation?: CancellationToken;
-			context?: string;
-			generating?: Deferred<AIModel>;
-			progress?: ProgressOptions;
-		},
-	): Promise<AIRebaseResult | undefined> {
-		const result: Mutable<AIRebaseResult> = {
-			diff: undefined!,
-			explanation: undefined!,
-			hunkMap: [],
-			commits: [],
-		} as unknown as AIRebaseResult;
-
-		const rq = await this.sendRequest(
-			'generate-rebase',
-			async (model, reporting, cancellation, maxInputTokens, retries) => {
-				const [diffResult, logResult] = await Promise.allSettled([
-					repo.git.diff.getDiff?.(headRef, baseRef, { notation: '...' }),
-					repo.git.commits.getLog(`${baseRef}..${headRef}`),
-				]);
-
-				const diff = getSettledValue(diffResult);
-				const log = getSettledValue(logResult);
-
-				if (!diff?.contents || !log?.commits?.size) {
-					throw new AINoRequestDataError('No changes found to generate a rebase from.');
-				}
-				if (cancellation.isCancellationRequested) throw new CancellationError();
-
-				result.diff = diff.contents;
-
-				const hunkMap: { index: number; hunkHeader: string }[] = [];
-				let counter = 0;
-				//const filesDiffs = await repo.git.diff().getDiffFiles!(diff.contents)!;
-				//for (const f of filesDiffs!.files)
-				//for (const hunk of parsedDiff.hunks) {
-				//	hunkMap.push({ index: ++counter, hunkHeader: hunk.contents.split('\n', 1)[0] });
-				//}
-
-				// let hunksByNumber= '';
-
-				for (const hunkHeader of diff.contents.matchAll(/@@ -\d+,\d+ \+\d+,\d+ @@(.*)$/gm)) {
-					hunkMap.push({ index: ++counter, hunkHeader: hunkHeader[0] });
-				}
-
-				result.hunkMap = hunkMap;
-				// 	const hunkNumber = `hunk-${counter++}`;
-				// 	hunksByNumber += `${hunkNumber}: ${hunk[0]}\n`;
-				// }
-
-				// const commits: { diff: string; message: string }[] = [];
-				// for (const commit of [...log.commits.values()].sort((a, b) => a.date.getTime() - b.date.getTime())) {
-				// 	const diff = await repo.git.diff().getDiff?.(commit.ref);
-				// 	commits.push({ message: commit.message ?? commit.summary, diff: diff?.contents ?? '' });
-
-				// 	if (cancellation.isCancellationRequested) throw new CancellationError();
-				// }
-
-				const { prompt } = await this.getPrompt(
-					'generate-rebase',
-					model,
-					{
-						diff: diff.contents,
-						// commits: JSON.stringify(commits),
-						data: JSON.stringify(hunkMap),
-						context: options?.context,
-						// instructions: configuration.get('ai.generateRebase.customInstructions'),
-					},
-					maxInputTokens,
-					retries,
-					reporting,
-				);
-				if (cancellation.isCancellationRequested) throw new CancellationError();
-
-				const messages: AIChatMessage[] = [{ role: 'user', content: prompt }];
-				return messages;
-			},
-			m => `Generating rebase with ${m.name}...`,
-			source,
-			m => ({
-				key: 'ai/generate',
-				data: {
-					type: 'rebase',
-					'model.id': m.id,
-					'model.provider.id': m.provider.id,
-					'model.provider.name': m.provider.name,
-					'retry.count': 0,
-				},
-			}),
-			options,
-		);
-
-		// if it is wrapped in markdown, we need to strip it
-		const content = rq!.content.replace(/^\s*```json\s*/, '').replace(/\s*```$/, '');
-
-		try {
-			// Parse the JSON content from the result
-			result.commits = JSON.parse(content) as AIRebaseResult['commits'];
-		} catch {
-			debugger;
-			throw new Error('Unable to parse rebase result');
-		}
-
-		return result;
-	}
-
-	async generateRebaseV2(
+	async generateRebase(
 		repo: Repository,
 		baseRef: string,
 		headRef: string,
@@ -1013,7 +887,7 @@ export class AIProviderService implements Disposable {
 				result.diff = diff.contents;
 
 				const { prompt } = await this.getPrompt(
-					'generate-rebase-multi-step1',
+					'generate-rebase-explanation',
 					model,
 					{
 						diff: diff.contents,
@@ -1055,43 +929,24 @@ export class AIProviderService implements Disposable {
 		const req2 = await this.sendRequest(
 			'generate-rebase',
 			async (model, reporting, cancellation, maxInputTokens, retries) => {
-				// const [diffResult, logResult] = await Promise.allSettled([
-				// 	repo.git.diff().getDiff?.(headRef, baseRef, { notation: '...' }),
-				// 	repo.git.commits().getLog(`${baseRef}..${headRef}`),
-				// ]);
-
-				// const diff = getSettledValue(diffResult);
-				// const log = getSettledValue(logResult);
-
 				const diff = await lazyDiff.value;
 				if (!diff?.contents) {
 					throw new AINoRequestDataError('No changes found to generate a rebase from.');
 				}
 				if (cancellation.isCancellationRequested) throw new CancellationError();
 
-				// result.diff = diff.contents;
-
 				const hunkMap: { index: number; hunkHeader: string }[] = [];
 				let counter = 0;
-				// const filesDiffs = parseGitDiff(diff.contents, true);
-				// for (const f of filesDiffs.files) {
-				// 	for (const hunk of f.hunks) {
-				// 		hunkMap.push({ index: ++counter, hunkHeader: hunk.contents.split('\n', 1)[0] });
-				// 	}
-				// }
-
 				for (const hunkHeader of diff.contents.matchAll(/@@ -\d+,\d+ \+\d+,\d+ @@(.*)$/gm)) {
 					hunkMap.push({ index: ++counter, hunkHeader: hunkHeader[0] });
 				}
 
 				result.hunkMap = hunkMap;
 
 				const { prompt } = await this.getPrompt(
-					'generate-rebase-multi-step2',
+					'generate-rebase-commits',
 					model,
 					{
-						// diff: diff.contents,
-						// commits: JSON.stringify(commits),
 						data: JSON.stringify(hunkMap),
 						context: options?.context,
 						// instructions: configuration.get('ai.generateRebase.customInstructions'),

src/plus/ai/models/promptTemplates.ts

@@ -28,22 +28,14 @@ interface CreatePullRequestPromptTemplateContext {
 	instructions?: string;
 }
 
-interface RebasePromptTemplateContext {
+interface RebaseExplanationPromptTemplateContext {
 	diff: string;
-	data?: string;
 	commits?: string;
 	context?: string;
 	instructions?: string;
 }
 
-interface RebaseMultiStep1PromptTemplateContext {
-	diff: string;
-	commits?: string;
-	context?: string;
-	instructions?: string;
-}
-
-interface RebaseMultiStep2PromptTemplateContext {
+interface RebaseCommitsPromptTemplateContext {
 	data: string;
 	context?: string;
 	instructions?: string;
@@ -66,9 +58,7 @@ export type PromptTemplateType =
 	| 'generate-stashMessage'
 	| 'generate-changelog'
 	| `generate-create-${'cloudPatch' | 'codeSuggestion' | 'pullRequest'}`
-	| 'generate-rebase'
-	| 'generate-rebase-multi-step1'
-	| 'generate-rebase-multi-step2'
+	| `generate-rebase-${'explanation' | 'commits'}`
 	| 'explain-changes';
 
 type PromptTemplateVersions = '' | '_v2';
@@ -86,12 +76,10 @@ export type PromptTemplateContext<T extends PromptTemplateType> = T extends 'gen
 	? CreatePullRequestPromptTemplateContext
 	: T extends 'generate-changelog'
 	? ChangelogPromptTemplateContext
-	: T extends 'generate-rebase'
-	? RebasePromptTemplateContext
-	: T extends 'generate-rebase-multi-step1'
-	? RebaseMultiStep1PromptTemplateContext
-	: T extends 'generate-rebase-multi-step2'
-	? RebaseMultiStep2PromptTemplateContext
+	: T extends 'generate-rebase-explanation'
+	? RebaseExplanationPromptTemplateContext
+	: T extends 'generate-rebase-commits'
+	? RebaseCommitsPromptTemplateContext
 	: T extends 'explain-changes'
 	? ExplainChangesPromptTemplateContext
 	: never;

src/plus/ai/prompts.ts

@@ -339,66 +339,8 @@ Example output structure:
 Based on the provided commit messages and associated issues, create a set of markdown changelog entries following the instructions above. Do not include any explanatory text or metadata`,
 };
 
-export const generateRebaseUserPromptV3: PromptTemplate<'generate-rebase'> = {
-	id: 'generate-rebase',
-	variables: ['diff', 'commits', 'data', 'context', 'instructions'],
-	template: `You are an advanced AI programming assistant tasked with organizing code changes into commits. Your goal is to create a new set of commits that are related, grouped logically, atomic, and easy to review. You will be working with code changes provided in a unified diff format.
-
-First, examine the following unified Git diff of code changes:
-
-<unified_diff>
-\${diff}
-</unified_diff>
-
-Next, examine the following JSON array which represents a mapping of index to hunk headers in the unified_diff to be used later when mapping hunks to commits:
-<hunk_map>
-\${data}
-</hunk_map>
-
-
-Your task is to group the hunks in unified_diff into a set of commits, ordered into a commit history as an array. Follow these guidelines:
-
-1. Only organize the hunks themselves, not individual lines within hunks.
-2. Group hunks into logical units that make sense together and can be applied atomically.
-3. Ensure each commit is self-contained and only depends on commits that come before it in the new history.
-4. Write meaningful commit messages that accurately describe the changes in each commit.
-5. Provide a detailed explanation of the changes in each commit.
-6. Make sure the new commit history is easy to review and understand.
-
-Output your new commit history as a JSON array. Each commit in the array should be an object representing a grouping of hunks forming that commit, with the following properties:
-- "message": A string containing the commit message.
-- "explanation": A string with a detailed explanation of the changes in the commit. Write the explanation as if you were explaining the changes to a reviewer who is familiar with the codebase but not the specific changes. Walk through the changes and make references to specific changes where needed, explaining how they achieve the objective of the commit.
-- "hunks": An array of objects, each representing a hunk in the commit. Each hunk object should have:
-  - "hunk": The hunk index (number) from the hunk_map, matching the equivalent hunk you chose from the unified_diff.
-
-Once you've completed your analysis, generate the JSON output following the specified format.
-
-Here's an example of the expected JSON structure (note that this is just a structural example and does not reflect the actual content you should produce):
-
-[
-  {
-    "message": "Example commit message",
-    "explanation": "Detailed explanation of the changes in this commit",
-    "hunks": [
-      {
-        "hunk": 2
-      },
-      {
-        "hunk": 7
-      }
-    ]
-  }
-]
-
-Remember to base your organization of commits solely on the provided unified_diff and hunk_map. Do not introduce any new changes or modify the content of the hunks. Your task is to organize the existing hunks in a logical and reviewable manner.
-
-\${instructions}
-
-Now, proceed with your analysis and organization of the commits. Output only the JSON array containing the commits, and nothing else.`,
-};
-
-export const generateRebaseMultiStep1UserPrompt: PromptTemplate<'generate-rebase-multi-step1'> = {
-	id: 'generate-rebase-multi-step1',
+export const generateRebaseExplanation: PromptTemplate<'generate-rebase-explanation'> = {
+	id: 'generate-rebase-explanation',
 	variables: ['diff', 'context', 'instructions'],
 	template: `You are an advanced AI programming assistant tasked with explaining code changes and how they would be best organized into commits. Your goal is to examine a unified diff of the code changes and explain the changes and how they should be grouped into a set of commits.
 
@@ -424,8 +366,8 @@ Remember to base your organization of commits solely on the provided unified_dif
 Now, proceed with your analysis and explanation. Output only the explanation you have generated, and nothing else.`,
 };
 
-export const generateRebaseMultiStep2UserPrompt: PromptTemplate<'generate-rebase-multi-step2'> = {
-	id: 'generate-rebase-multi-step2',
+export const generateRebaseCommits: PromptTemplate<'generate-rebase-commits'> = {
+	id: 'generate-rebase-commits',
 	variables: ['data', 'context', 'instructions'],
 	template: `Using the plan you provided in the previous step, your goal now is use it to create that new set of commits, ensuring that ALL the changes in the unified diff are included in the new set of commits.
 

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

@@ -13,9 +13,8 @@ import {
 	generateCreateCloudPatch,
 	generateCreateCodeSuggest,
 	generateCreatePullRequest,
-	generateRebaseMultiStep1UserPrompt,
-	generateRebaseMultiStep2UserPrompt,
-	generateRebaseUserPromptV3,
+	generateRebaseCommits,
+	generateRebaseExplanation,
 	generateStashMessage,
 } from '../../prompts';
 import { estimatedCharactersPerToken, showLargePromptWarning, showPromptTruncationWarning } from './ai.utils';
@@ -37,12 +36,10 @@ export function getLocalPromptTemplate<T extends PromptTemplateType>(
 			return generateCreateCodeSuggest as PromptTemplate<T>;
 		case 'generate-create-pullRequest':
 			return generateCreatePullRequest as PromptTemplate<T>;
-		case 'generate-rebase':
-			return generateRebaseUserPromptV3 as PromptTemplate<T>;
-		case 'generate-rebase-multi-step1':
-			return generateRebaseMultiStep1UserPrompt as PromptTemplate<T>;
-		case 'generate-rebase-multi-step2':
-			return generateRebaseMultiStep2UserPrompt as PromptTemplate<T>;
+		case 'generate-rebase-explanation':
+			return generateRebaseExplanation as PromptTemplate<T>;
+		case 'generate-rebase-commits':
+			return generateRebaseCommits as PromptTemplate<T>;
 		case 'explain-changes':
 			return explainChanges as PromptTemplate<T>;
 		default: