Removes system prompts

Some newer models don't support them and for those that do it doesn't help much

Author: eamodio

src/ai/anthropicProvider.ts

@@ -1,7 +1,7 @@
 import type { CancellationToken } from 'vscode';
 import type { AIModel } from './aiProviderService';
 import { getMaxCharacters } from './aiProviderService';
-import type { ChatMessage, SystemMessage } from './openAICompatibleProvider';
+import type { ChatMessage } from './openAICompatibleProvider';
 import { OpenAICompatibleProvider } from './openAICompatibleProvider';
 
 const provider = { id: 'anthropic', name: 'Anthropic' } as const;
@@ -102,7 +102,7 @@ export class AnthropicProvider extends OpenAICompatibleProvider<typeof provider.
 	override async fetch(
 		model: AIModel<typeof provider.id>,
 		apiKey: string,
-		messages: (maxCodeCharacters: number, retries: number) => [SystemMessage, ...ChatMessage[]],
+		messages: (maxCodeCharacters: number, retries: number) => ChatMessage[],
 		outputTokens: number,
 		cancellation: CancellationToken | undefined,
 	): Promise<[result: string, maxCodeCharacters: number]> {

src/ai/openAICompatibleProvider.ts

@@ -10,13 +10,9 @@ import { interpolate } from '../system/string';
 import type { AIModel, AIProvider } from './aiProviderService';
 import { getMaxCharacters, getOrPromptApiKey, showDiffTruncationWarning } from './aiProviderService';
 import {
-	explainChangesSystemPrompt,
 	explainChangesUserPrompt,
-	generateCloudPatchMessageSystemPrompt,
 	generateCloudPatchMessageUserPrompt,
-	generateCodeSuggestMessageSystemPrompt,
 	generateCodeSuggestMessageUserPrompt,
-	generateCommitMessageSystemPrompt,
 	generateCommitMessageUserPrompt,
 } from './prompts';
 
@@ -63,7 +59,6 @@ export abstract class OpenAICompatibleProvider<T extends AIProviders> implements
 		reporting: TelemetryEvents['ai/generate'],
 		promptConfig: {
 			type: 'commit' | 'cloud-patch' | 'code-suggestion';
-			systemPrompt: string;
 			userPrompt: string;
 			customInstructions?: string;
 		},
@@ -76,11 +71,7 @@ export abstract class OpenAICompatibleProvider<T extends AIProviders> implements
 			const [result, maxCodeCharacters] = await this.fetch(
 				model,
 				apiKey,
-				(max, retries): [SystemMessage, ...ChatMessage[]] => {
-					const system: SystemMessage = {
-						role: 'system',
-						content: promptConfig.systemPrompt,
-					};
+				(max, retries): ChatMessage[] => {
 					const messages: ChatMessage[] = [
 						{
 							role: 'user',
@@ -93,10 +84,9 @@ export abstract class OpenAICompatibleProvider<T extends AIProviders> implements
 					];
 
 					reporting['retry.count'] = retries;
-					reporting['input.length'] =
-						(reporting['input.length'] ?? 0) + sum([system, ...messages], m => m.content.length);
+					reporting['input.length'] = (reporting['input.length'] ?? 0) + sum(messages, m => m.content.length);
 
-					return [system, ...messages];
+					return messages;
 				},
 				4096,
 				options?.cancellation,
@@ -134,13 +124,11 @@ export abstract class OpenAICompatibleProvider<T extends AIProviders> implements
 			codeSuggestion
 				? {
 						type: 'code-suggestion',
-						systemPrompt: generateCodeSuggestMessageSystemPrompt,
 						userPrompt: generateCodeSuggestMessageUserPrompt,
 						customInstructions: configuration.get('ai.generateCodeSuggestMessage.customInstructions'),
 				  }
 				: {
 						type: 'cloud-patch',
-						systemPrompt: generateCloudPatchMessageSystemPrompt,
 						userPrompt: generateCloudPatchMessageUserPrompt,
 						customInstructions: configuration.get('ai.generateCloudPatchMessage.customInstructions'),
 				  },
@@ -160,7 +148,6 @@ export abstract class OpenAICompatibleProvider<T extends AIProviders> implements
 			reporting,
 			{
 				type: 'commit',
-				systemPrompt: generateCommitMessageSystemPrompt,
 				userPrompt: generateCommitMessageUserPrompt,
 				customInstructions: configuration.get('ai.generateCommitMessage.customInstructions'),
 			},
@@ -182,11 +169,7 @@ export abstract class OpenAICompatibleProvider<T extends AIProviders> implements
 			const [result, maxCodeCharacters] = await this.fetch(
 				model,
 				apiKey,
-				(max, retries): [SystemMessage, ...ChatMessage[]] => {
-					const system: SystemMessage = {
-						role: 'system',
-						content: explainChangesSystemPrompt,
-					};
+				(max, retries): ChatMessage[] => {
 					const messages: ChatMessage[] = [
 						{
 							role: 'user',
@@ -199,10 +182,9 @@ export abstract class OpenAICompatibleProvider<T extends AIProviders> implements
 					];
 
 					reporting['retry.count'] = retries;
-					reporting['input.length'] =
-						(reporting['input.length'] ?? 0) + sum([system, ...messages], m => m.content.length);
+					reporting['input.length'] = (reporting['input.length'] ?? 0) + sum(messages, m => m.content.length);
 
-					return [system, ...messages];
+					return messages;
 				},
 				4096,
 				options?.cancellation,
@@ -221,7 +203,7 @@ export abstract class OpenAICompatibleProvider<T extends AIProviders> implements
 	protected async fetch(
 		model: AIModel<T>,
 		apiKey: string,
-		messages: (maxCodeCharacters: number, retries: number) => [SystemMessage, ...ChatMessage[]],
+		messages: (maxCodeCharacters: number, retries: number) => ChatMessage[],
 		outputTokens: number,
 		cancellation: CancellationToken | undefined,
 	): Promise<[result: string, maxCodeCharacters: number]> {

src/ai/prompts.ts

@@ -1,5 +1,4 @@
-export const generateCommitMessageSystemPrompt = `You are an advanced AI programming assistant`;
-export const generateCommitMessageUserPrompt = `You are tasked with summarizing code changes into a concise but meaningful commit message. You will be provided with a code diff and optional additional context. Your goal is to analyze the changes and create a clear, informative commit message that accurately represents the modifications made to the code.
+export const generateCommitMessageUserPrompt = `You are an advanced AI programming assistant and are tasked with summarizing code changes into a concise but meaningful commit message. You will be provided with a code diff and optional additional context. Your goal is to analyze the changes and create a clear, informative commit message that accurately represents the modifications made to the code.
 
 First, examine the following code changes provided in Git diff format:
 <~~diff~~>
@@ -51,8 +50,7 @@ Fixes #789
 
 Now, based on the provided code diff and any additional context, create a concise but meaningful commit message following the instructions above.`;
 
-export const generateCloudPatchMessageSystemPrompt = `You are an advanced AI programming assistant`;
-export const generateCloudPatchMessageUserPrompt = `You are tasked with summarizing code changes into a concise and meaningful title and description. You will be provided with a code diff and optional additional context. Your goal is to analyze the changes and create a clear, informative title and description that accurately represents the modifications made to the code.
+export const generateCloudPatchMessageUserPrompt = `You are an advanced AI programming assistant and are tasked with summarizing code changes into a concise and meaningful title and description. You will be provided with a code diff and optional additional context. Your goal is to analyze the changes and create a clear, informative title and description that accurately represents the modifications made to the code.
 
 First, examine the following code changes provided in Git diff format:
 <~~diff~~>
@@ -99,8 +97,7 @@ Integrates JWT for secure token generation
 
 Now, based on the provided code diff and any additional context, create a concise but meaningful title and description following the instructions above.`;
 
-export const generateCodeSuggestMessageSystemPrompt = `You are an advanced AI programming assistant`;
-export const generateCodeSuggestMessageUserPrompt = `You are tasked with summarizing code changes into a concise and meaningful code review title and description. You will be provided with a code diff and optional additional context. Your goal is to analyze the changes and create a clear, informative code review title and description that accurately represents the modifications made to the code.
+export const generateCodeSuggestMessageUserPrompt = `You are an advanced AI programming assistant and are tasked with summarizing code changes into a concise and meaningful code review title and description. You will be provided with a code diff and optional additional context. Your goal is to analyze the changes and create a clear, informative code review title and description that accurately represents the modifications made to the code.
 
 First, examine the following code changes provided in Git diff format:
 <~~diff~~>
@@ -147,8 +144,7 @@ Integrates JWT for secure token generation
 
 Now, based on the provided code diff and any additional context, create a concise but meaningful code review title and description following the instructions above.`;
 
-export const explainChangesSystemPrompt = `You are an advanced AI programming assistant`;
-export const explainChangesUserPrompt = `You are tasked with creating clear, technical summaries of code changes that help reviewers understand the modifications and their implications. You will analyze a code diff and the author-provided message to produce a structured summary that captures the essential aspects of the changes.
+export const explainChangesUserPrompt = `You are an advanced AI programming assistant and are tasked with creating clear, technical summaries of code changes that help reviewers understand the modifications and their implications. You will analyze a code diff and the author-provided message to produce a structured summary that captures the essential aspects of the changes.
 
 First, examine the following code changes provided in Git diff format:
 <~~diff~~>

src/ai/vscodeProvider.ts

@@ -8,13 +8,9 @@ import { capitalize, getPossessiveForm, interpolate } from '../system/string';
 import type { AIModel, AIProvider } from './aiProviderService';
 import { getMaxCharacters, showDiffTruncationWarning } from './aiProviderService';
 import {
-	explainChangesSystemPrompt,
 	explainChangesUserPrompt,
-	generateCloudPatchMessageSystemPrompt,
 	generateCloudPatchMessageUserPrompt,
-	generateCodeSuggestMessageSystemPrompt,
 	generateCodeSuggestMessageUserPrompt,
-	generateCommitMessageSystemPrompt,
 	generateCommitMessageUserPrompt,
 } from './prompts';
 
@@ -53,7 +49,6 @@ export class VSCodeAIProvider implements AIProvider<typeof provider.id> {
 		reporting: TelemetryEvents['ai/generate'],
 		promptConfig: {
 			type: 'commit' | 'cloud-patch' | 'code-suggestion';
-			systemPrompt: string;
 			userPrompt: string;
 			customInstructions?: string;
 		},
@@ -77,7 +72,6 @@ export class VSCodeAIProvider implements AIProvider<typeof provider.id> {
 		try {
 			while (true) {
 				const messages: LanguageModelChatMessage[] = [
-					LanguageModelChatMessage.User(promptConfig.systemPrompt),
 					LanguageModelChatMessage.User(
 						interpolate(promptConfig.userPrompt, {
 							diff: diff.substring(0, maxCodeCharacters),
@@ -151,13 +145,11 @@ export class VSCodeAIProvider implements AIProvider<typeof provider.id> {
 			codeSuggestion
 				? {
 						type: 'code-suggestion',
-						systemPrompt: generateCodeSuggestMessageSystemPrompt,
 						userPrompt: generateCodeSuggestMessageUserPrompt,
 						customInstructions: configuration.get('ai.generateCodeSuggestMessage.customInstructions'),
 				  }
 				: {
 						type: 'cloud-patch',
-						systemPrompt: generateCloudPatchMessageSystemPrompt,
 						userPrompt: generateCloudPatchMessageUserPrompt,
 						customInstructions: configuration.get('ai.generateCloudPatchMessage.customInstructions'),
 				  },
@@ -180,7 +172,6 @@ export class VSCodeAIProvider implements AIProvider<typeof provider.id> {
 			reporting,
 			{
 				type: 'commit',
-				systemPrompt: generateCommitMessageSystemPrompt,
 				userPrompt: generateCommitMessageUserPrompt,
 				customInstructions: configuration.get('ai.generateCommitMessage.customInstructions'),
 			},
@@ -216,11 +207,11 @@ export class VSCodeAIProvider implements AIProvider<typeof provider.id> {
 
 				const messages: LanguageModelChatMessage[] = [
 					LanguageModelChatMessage.User(
-						`${explainChangesSystemPrompt}.\n\n${interpolate(explainChangesUserPrompt, {
+						interpolate(explainChangesUserPrompt, {
 							diff: code,
 							message: message,
 							instructions: configuration.get('ai.explainChanges.customInstructions') ?? '',
-						})}`,
+						}),
 					),
 				];