fix(chat): Fix toolUse input is missing when parsing fails

jguoamz · jguoamz · commit 7d07c53a2fbc · 2025-04-10T11:27:30.000-07:00
diff --git a/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts b/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts
@@ -356,6 +356,11 @@ export class Messenger {
                                 throw new Error('Tool not found')
                             }
                         } catch (error: any) {
+                            if (error instanceof SyntaxError) {
+                                // set toolUse.input to the raw value
+                                toolUse.input = toolUseInput
+                                error.message = `Tool input has invalid JSON format: ${error.message}`
+                            }
                             getLogger().error(
                                 `toolUseId: ${toolUse.toolUseId}, toolUseName: ${toolUse.name}, error: ${error}`
                             )

Original file line number	Diff line number	Diff line change
`@@ -356,6 +356,11 @@ export class Messenger {`
`356`	`356`	`throw new Error('Tool not found')`
`357`	`357`	`}`
`358`	`358`	`} catch (error: any) {`
	`359`	`+ if (error instanceof SyntaxError) {`
	`360`	`+ // set toolUse.input to the raw value`
	`361`	`+ toolUse.input = toolUseInput`
	`362`	+ error.message = `Tool input has invalid JSON format: ${error.message}`
	`363`	`+ }`
`359`	`364`	`getLogger().error(`
`360`	`365`	`toolUseId: ${toolUse.toolUseId}, toolUseName: ${toolUse.name}, error: ${error}`
`361`	`366`	`)`