Simplify the message format

Author: MarcoWang3

packages/core/src/amazonq/autoDebug/autoDebugController.ts

@@ -285,42 +285,18 @@ export class AutoDebugController implements vscode.Disposable {
         totalErrors: number,
         errorsBeingSent: number
     ): string {
-        const parts = [
-            `Please help me fix the following code issues:`,
-            '',
-            `**File:** ${filePath}`,
-            `**Language:** ${languageId}`,
-            `**Errors being sent:** ${errorsBeingSent}`,
-            totalErrors > errorsBeingSent ? `**Total errors in file:** ${totalErrors}` : '',
-            '',
-            '**Code:**',
-            `\`\`\`${languageId}`,
-            selectedText,
-            '```',
-            '',
-            '**Issues to fix:**',
-        ]
+        const parts = [`Please help me fix the following errors in ${filePath}`]
 
         for (const problem of problems) {
-            parts.push(`- **ERROR**: ${problem.diagnostic.message}`)
+            const line = problem.diagnostic.range.start.line + 1
+            const column = problem.diagnostic.range.start.character + 1
+            const source = problem.source !== 'unknown' ? problem.source : 'Unknown'
             parts.push(
-                `  Location: Line ${problem.diagnostic.range.start.line + 1}, Column ${problem.diagnostic.range.start.character + 1}`
-            )
-            if (problem.source !== 'unknown') {
-                parts.push(`  Source: ${problem.source}`)
-            }
-        }
-
-        parts.push('')
-        parts.push('Please fix the error')
-
-        if (totalErrors > errorsBeingSent) {
-            parts.push(
-                `Note: This file has ${totalErrors} total errors, but I'm only sending ${errorsBeingSent} errors at a time to avoid overwhelming the system.`
+                `ERROR: ${problem.diagnostic.message} Location: Line ${line}, Column ${column} Source: ${source}`
             )
         }
 
-        return parts.filter(Boolean).join('\n')
+        return parts.join('\n')
     }
 
     /**

packages/core/src/amazonq/autoDebug/ide/codeActionsProvider.ts

@@ -97,13 +97,13 @@ export class AutoDebugCodeActionsProvider implements vscode.CodeActionProvider,
         diagnostics: vscode.Diagnostic[]
     ): vscode.CodeAction {
         const action = new vscode.CodeAction(
-            `Fix with Amazon Q (${diagnostics.length} issue${diagnostics.length !== 1 ? 's' : ''})`,
+            `Amazon Q: Fix Problem (${diagnostics.length} issue${diagnostics.length !== 1 ? 's' : ''})`,
             vscode.CodeActionKind.QuickFix
         )
 
         action.command = {
             command: 'amazonq.01.fixWithQ',
-            title: 'Fix with Amazon Q',
+            title: 'Amazon Q: Fix Problem',
             arguments: [range, diagnostics],
         }
 
@@ -114,11 +114,11 @@ export class AutoDebugCodeActionsProvider implements vscode.CodeActionProvider,
     }
 
     private createFixAllWithQAction(document: vscode.TextDocument): vscode.CodeAction {
-        const action = new vscode.CodeAction('Fix All with Amazon Q', vscode.CodeActionKind.QuickFix)
+        const action = new vscode.CodeAction('Amazon Q: Fix All Errors', vscode.CodeActionKind.QuickFix)
 
         action.command = {
             command: 'amazonq.02.fixAllWithQ',
-            title: 'Fix All with Amazon Q',
+            title: 'Amazon Q: Fix All Errors',
         }
 
         return action
@@ -129,11 +129,11 @@ export class AutoDebugCodeActionsProvider implements vscode.CodeActionProvider,
         range: vscode.Range,
         diagnostics: vscode.Diagnostic[]
     ): vscode.CodeAction {
-        const action = new vscode.CodeAction('Explain Problem with Amazon Q', vscode.CodeActionKind.QuickFix)
+        const action = new vscode.CodeAction('Amazon Q: Explain Problem', vscode.CodeActionKind.QuickFix)
 
         action.command = {
             command: 'amazonq.03.explainProblem',
-            title: 'Explain Problem with Amazon Q',
+            title: 'Amazon Q: Explain Problem',
             arguments: [range, diagnostics],
         }
 

packages/core/src/amazonq/autoDebug/ide/contextMenuProvider.ts

@@ -28,7 +28,7 @@ export class ContextMenuProvider implements vscode.Disposable {
             Commands.register(
                 {
                     id: 'amazonq.01.fixWithQ',
-                    name: 'Fix with Amazon Q',
+                    name: 'Amazon Q: Fix Problem',
                     telemetryName: 'amazonq_openChat',
                 },
                 async (range?: vscode.Range, diagnostics?: vscode.Diagnostic[]) => {
@@ -42,7 +42,7 @@ export class ContextMenuProvider implements vscode.Disposable {
             Commands.register(
                 {
                     id: 'amazonq.02.fixAllWithQ',
-                    name: 'Fix All with Amazon Q',
+                    name: 'Amazon Q: Fix All Errors',
                     telemetryName: 'amazonq_openChat',
                 },
                 async () => {
@@ -56,7 +56,7 @@ export class ContextMenuProvider implements vscode.Disposable {
             Commands.register(
                 {
                     id: 'amazonq.03.explainProblem',
-                    name: 'Explain Problem with Amazon Q',
+                    name: 'Amazon Q: Explain Problem',
                     telemetryName: 'amazonq_openChat',
                 },
                 async (range?: vscode.Range, diagnostics?: vscode.Diagnostic[]) => {
@@ -271,30 +271,15 @@ export class ContextMenuProvider implements vscode.Disposable {
     }
 
     private createFixMessage(selectedText: string, filePath: string, languageId: string, errorContexts: any[]): string {
-        const parts = [
-            'Please help me fix the following code issues:',
-            '',
-            `**File:** ${filePath}`,
-            `**Language:** ${languageId}`,
-            '',
-            '**Code:**',
-            `\`\`\`${languageId}`,
-            selectedText,
-            '```',
-            '',
-            '**Issues to fix:**',
-        ]
+        const parts = [`Please help me fix the following errors in ${filePath}`]
 
         for (const context of errorContexts) {
-            parts.push(`- **${context.severity.toUpperCase()}**: ${context.message}`)
-            if (context.location) {
-                parts.push(`  Location: Line ${context.location.line}, Column ${context.location.column}`)
-            }
+            const line = context.location ? context.location.line : 'Unknown'
+            const column = context.location ? context.location.column : 'Unknown'
+            const source = context.source || 'Unknown'
+            parts.push(`ERROR: ${context.message} Location: Line ${line}, Column ${column} Source: ${source}`)
         }
 
-        parts.push('')
-        parts.push('Please fix the error.')
-
         return parts.join('\n')
     }