refactor: consolidate code action and enhance prompts into unified support prompts system

- Rename codeActionPrompt to supportPrompt for better clarity
- Move enhance prompt functionality into support prompts system
- Add ENHANCE tab alongside other support prompt types
- Update UI to show enhancement configuration in ENHANCE tab
- Update tests to reflect new unified structure

This change simplifies the prompt system by treating enhancement as another type of support prompt rather than a separate system.

Author: samhvw8

src/core/webview/ClineProvider.ts

@@ -40,7 +40,7 @@ import { enhancePrompt } from "../../utils/enhance-prompt"
 import { getCommitInfo, searchCommits, getWorkingState } from "../../utils/git"
 import { ConfigManager } from "../config/ConfigManager"
 import { CustomModesManager } from "../config/CustomModesManager"
-import { enhance, codeActionPrompt } from "../../shared/support-prompt"
+import { supportPrompt } from "../../shared/support-prompt"
 
 import { ACTION_NAMES } from "../CodeActionProvider"
 
@@ -205,7 +205,7 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 
 		const { customPrompts } = await visibleProvider.getState()
 
-		const prompt = codeActionPrompt.create(promptType, params, customPrompts)
+		const prompt = supportPrompt.create(promptType, params, customPrompts)
 
 		await visibleProvider.initClineWithTask(prompt)
 	}
@@ -996,16 +996,10 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 									}
 								}
 
-								const getEnhancePrompt = (value: string | PromptComponent | undefined): string => {
-									if (typeof value === "string") {
-										return value
-									}
-									return enhance.prompt // Use the constant from modes.ts which we know is a string
-								}
 								const enhancedPrompt = await enhancePrompt(
 									configToUse,
 									message.text,
-									getEnhancePrompt(customPrompts?.enhance),
+									supportPrompt.get(customPrompts, "ENHANCE"),
 								)
 								await this.postMessageToWebview({
 									type: "enhancedPrompt",

src/shared/__tests__/support-prompts.test.ts

@@ -1,12 +1,12 @@
-import { codeActionPrompt, type CodeActionType } from "../support-prompt"
+import { supportPrompt } from "../support-prompt"
 
 describe("Code Action Prompts", () => {
 	const testFilePath = "test/file.ts"
 	const testCode = "function test() { return true; }"
 
 	describe("EXPLAIN action", () => {
 		it("should format explain prompt correctly", () => {
-			const prompt = codeActionPrompt.create("EXPLAIN", {
+			const prompt = supportPrompt.create("EXPLAIN", {
 				filePath: testFilePath,
 				selectedText: testCode,
 			})
@@ -21,7 +21,7 @@ describe("Code Action Prompts", () => {
 
 	describe("FIX action", () => {
 		it("should format fix prompt without diagnostics", () => {
-			const prompt = codeActionPrompt.create("FIX", {
+			const prompt = supportPrompt.create("FIX", {
 				filePath: testFilePath,
 				selectedText: testCode,
 			})
@@ -45,7 +45,7 @@ describe("Code Action Prompts", () => {
 				},
 			]
 
-			const prompt = codeActionPrompt.create("FIX", {
+			const prompt = supportPrompt.create("FIX", {
 				filePath: testFilePath,
 				selectedText: testCode,
 				diagnostics,
@@ -60,7 +60,7 @@ describe("Code Action Prompts", () => {
 
 	describe("IMPROVE action", () => {
 		it("should format improve prompt correctly", () => {
-			const prompt = codeActionPrompt.create("IMPROVE", {
+			const prompt = supportPrompt.create("IMPROVE", {
 				filePath: testFilePath,
 				selectedText: testCode,
 			})
@@ -74,27 +74,43 @@ describe("Code Action Prompts", () => {
 		})
 	})
 
+	describe("ENHANCE action", () => {
+		it("should format enhance prompt correctly", () => {
+			const prompt = supportPrompt.create("ENHANCE", {
+				filePath: testFilePath,
+				selectedText: testCode,
+			})
+
+			expect(prompt).toBe(
+				"Generate an enhanced version of this prompt (reply with only the enhanced prompt - no conversation, explanations, lead-in, bullet points, placeholders, or surrounding quotes):",
+			)
+			// Verify it ignores parameters since ENHANCE template doesn't use any
+			expect(prompt).not.toContain(testFilePath)
+			expect(prompt).not.toContain(testCode)
+		})
+	})
+
 	describe("get template", () => {
 		it("should return default template when no custom prompts provided", () => {
-			const template = codeActionPrompt.get(undefined, "EXPLAIN")
-			expect(template).toBe(codeActionPrompt.default.EXPLAIN)
+			const template = supportPrompt.get(undefined, "EXPLAIN")
+			expect(template).toBe(supportPrompt.default.EXPLAIN)
 		})
 
 		it("should return custom template when provided", () => {
 			const customTemplate = "Custom template for explaining code"
 			const customPrompts = {
 				EXPLAIN: customTemplate,
 			}
-			const template = codeActionPrompt.get(customPrompts, "EXPLAIN")
+			const template = supportPrompt.get(customPrompts, "EXPLAIN")
 			expect(template).toBe(customTemplate)
 		})
 
 		it("should return default template when custom prompts does not include type", () => {
 			const customPrompts = {
 				SOMETHING_ELSE: "Other template",
 			}
-			const template = codeActionPrompt.get(customPrompts, "EXPLAIN")
-			expect(template).toBe(codeActionPrompt.default.EXPLAIN)
+			const template = supportPrompt.get(customPrompts, "EXPLAIN")
+			expect(template).toBe(supportPrompt.default.EXPLAIN)
 		})
 	})
 
@@ -105,7 +121,7 @@ describe("Code Action Prompts", () => {
 				EXPLAIN: customTemplate,
 			}
 
-			const prompt = codeActionPrompt.create(
+			const prompt = supportPrompt.create(
 				"EXPLAIN",
 				{
 					filePath: testFilePath,
@@ -123,7 +139,7 @@ describe("Code Action Prompts", () => {
 				EXPLAIN: "Other template",
 			}
 
-			const prompt = codeActionPrompt.create(
+			const prompt = supportPrompt.create(
 				"EXPLAIN",
 				{
 					filePath: testFilePath,

src/shared/support-prompt.ts

@@ -1,21 +1,4 @@
-// Separate enhance prompt type and definition
-export type EnhanceConfig = {
-	prompt: string
-}
-
-export const enhance: EnhanceConfig = {
-	prompt: "Generate an enhanced version of this prompt (reply with only the enhanced prompt - no conversation, explanations, lead-in, bullet points, placeholders, or surrounding quotes):",
-} as const
-
-// Completely separate enhance prompt handling
-export const enhancePrompt = {
-	default: enhance.prompt,
-	get: (customPrompts: Record<string, any> | undefined): string => {
-		return customPrompts?.enhance ?? enhance.prompt
-	},
-} as const
-
-// Code action prompts
+// Support prompts
 type PromptParams = Record<string, string | any[]>
 
 const generateDiagnosticText = (diagnostics?: any[]) => {
@@ -41,8 +24,7 @@ export const createPrompt = (template: string, params: PromptParams): string =>
 	return result
 }
 
-const EXPLAIN_TEMPLATE = `
-Explain the following code from file path @/\${filePath}:
+const EXPLAIN_TEMPLATE = `Explain the following code from file path @/\${filePath}:
 \${userInput}
 
 \`\`\`
@@ -55,8 +37,7 @@ Please provide a clear and concise explanation of what this code does, including
 3. Important patterns or techniques used
 `
 
-const FIX_TEMPLATE = `
-Fix any issues in the following code from file path @/\${filePath}
+const FIX_TEMPLATE = `Fix any issues in the following code from file path @/\${filePath}
 \${diagnosticText}
 \${userInput}
 
@@ -71,8 +52,7 @@ Please:
 4. Explain what was fixed and why
 `
 
-const IMPROVE_TEMPLATE = `
-Improve the following code from file path @/\${filePath}:
+const IMPROVE_TEMPLATE = `Improve the following code from file path @/\${filePath}:
 \${userInput}
 
 \`\`\`
@@ -88,31 +68,36 @@ Please suggest improvements for:
 Provide the improved code along with explanations for each enhancement.
 `
 
+const ENHANCE_TEMPLATE =
+	"Generate an enhanced version of this prompt (reply with only the enhanced prompt - no conversation, explanations, lead-in, bullet points, placeholders, or surrounding quotes):"
+
 // Get template based on prompt type
 const defaultTemplates = {
 	EXPLAIN: EXPLAIN_TEMPLATE,
 	FIX: FIX_TEMPLATE,
 	IMPROVE: IMPROVE_TEMPLATE,
+	ENHANCE: ENHANCE_TEMPLATE,
 } as const
 
-type CodeActionType = keyof typeof defaultTemplates
+type SupportPromptType = keyof typeof defaultTemplates
 
-export const codeActionPrompt = {
+export const supportPrompt = {
 	default: defaultTemplates,
-	get: (customPrompts: Record<string, any> | undefined, type: CodeActionType): string => {
+	get: (customPrompts: Record<string, any> | undefined, type: SupportPromptType): string => {
 		return customPrompts?.[type] ?? defaultTemplates[type]
 	},
-	create: (type: CodeActionType, params: PromptParams, customPrompts?: Record<string, any>): string => {
-		const template = codeActionPrompt.get(customPrompts, type)
+	create: (type: SupportPromptType, params: PromptParams, customPrompts?: Record<string, any>): string => {
+		const template = supportPrompt.get(customPrompts, type)
 		return createPrompt(template, params)
 	},
 } as const
 
-export type { CodeActionType }
+export type { SupportPromptType }
 
-// User-friendly labels for code action types
-export const codeActionLabels: Record<CodeActionType, string> = {
+// User-friendly labels for support prompt types
+export const supportPromptLabels: Record<SupportPromptType, string> = {
 	FIX: "Fix Issues",
 	EXPLAIN: "Explain Code",
 	IMPROVE: "Improve Code",
+	ENHANCE: "Enhance Prompt",
 } as const