Improves prompts

(#4395, #4430)

Author: sergeibbb

src/plus/ai/aiProviderService.ts

@@ -1264,6 +1264,7 @@ export class AIProviderService implements Disposable {
 			const errorMessage = `Unable to parse ${options?.generateCommits ? 'commits' : 'rebase'} result`;
 			const retryPrompt = dedent(`
 					Your previous response could not be parsed as valid JSON. Please ensure your response is a valid JSON array of commits with the correct structure.
+					Don't include any preceeding or succeeding text or markup, such as "Here are the commits:" or "Here is a valid JSON array of commits:".
 
 					Here was your previous response:
 					${rq.content}
@@ -1334,7 +1335,8 @@ export class AIProviderService implements Disposable {
 						Here was your previous response:
 						${rq.content}
 
-						Please provide the corrected JSON array of commits:
+						Please provide the corrected JSON array of commits.
+						Don't include any preceeding or succeeding text or markup, such as "Here are the commits:" or "Here is a valid JSON array of commits:".
 					`);
 
 				return {

src/plus/ai/prompts.ts

@@ -394,10 +394,11 @@ Your task is to group the hunks in unified_diff into a set of commits, ordered i
 
 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.
+3. Use each hunk only once. Use all hunks.
+4. Ensure each commit is self-contained and only depends on commits that come before it in the new history.
+5. Write meaningful commit messages that accurately describe the changes in each commit.
+6. Provide a detailed explanation of the changes in each commit.
+7. 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.
@@ -428,5 +429,7 @@ Remember to base your organization of commits solely on the provided unified_dif
 
 \${instructions}
 
-Now, proceed with your analysis and organization of the commits. Output only the JSON array containing the commits, and nothing else.`,
+Now, proceed with your analysis and organization of the commits. Output only the JSON array containing the commits, and nothing else.
+Do not include any preceeding or succeeding text or markup, such as "Here are the commits:" or "Here is a valid JSON array of commits:".
+`,
 };