improve JSON parse error handling

Author: jguoamz

packages/core/src/codewhispererChat/controllers/chat/controller.ts

@@ -714,12 +714,17 @@ export class ChatController {
                 const toolUseError = toolUseWithError.error
                 const toolResults: ToolResult[] = []
 
+                let response = ''
                 if (toolUseError) {
                     toolResults.push({
                         content: [{ text: toolUseError.message }],
                         toolUseId: toolUse.toolUseId,
                         status: ToolResultStatus.ERROR,
                     })
+                    if (toolUseError instanceof SyntaxError) {
+                        response =
+                            "Your toolUse input isn't valid. Please check the syntax and make sure the input is complete. If the input is large, break it down into multiple tool uses with smaller input."
+                    }
                 } else {
                     const result = ToolUtils.tryFromToolUse(toolUse)
                     if ('type' in result) {
@@ -772,7 +777,7 @@ export class ChatController {
 
                 await this.generateResponse(
                     {
-                        message: '',
+                        message: response,
                         trigger: ChatTriggerType.ChatMessage,
                         query: undefined,
                         codeSelection: context?.focusAreaContext?.selectionInsideExtendedCodeBlock,

packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts

@@ -273,10 +273,12 @@ export class Messenger {
                             try {
                                 toolUse.input = JSON.parse(toolUseInput)
                             } catch (error: any) {
-                                getLogger().error(`JSON parse error for toolUseInput: ${toolUseInput}`)
+                                getLogger().error(
+                                    `JSON parse error: ${error.message} for toolUseInput: ${toolUseInput}`
+                                )
                                 // set toolUse.input to be empty valid json object
                                 toolUse.input = {}
-                                error.message = `Tool input has invalid JSON format: ${error.message}`
+                                error.message = `tooluse input is invalid: ${toolUseInput}`
                                 // throw it out to allow the error to be handled in the catch block
                                 throw error
                             }