Merge pull request aws#6988 from jguoamz/jsonParse

fix(chat): handle JSON.parse error gracefully

Author: mr-lee

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

@@ -261,12 +261,11 @@ export class Messenger {
                     }
 
                     if (cwChatEvent.toolUseEvent?.stop) {
-                        toolUse.input = JSON.parse(toolUseInput)
-                        toolUse.toolUseId = cwChatEvent.toolUseEvent.toolUseId ?? ''
-                        toolUse.name = cwChatEvent.toolUseEvent.name ?? ''
-
                         let toolError = undefined
                         try {
+                            toolUse.toolUseId = cwChatEvent.toolUseEvent.toolUseId ?? ''
+                            toolUse.name = cwChatEvent.toolUseEvent.name ?? ''
+                            toolUse.input = JSON.parse(toolUseInput)
                             const availableToolsNames = (session.pairProgrammingModeOn ? tools : noWriteTools).map(
                                 (item) => item.toolSpecification?.name
                             )