Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 10, 2025
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,16 @@ export class Messenger {
toolUse.toolUseId = cwChatEvent.toolUseEvent.toolUseId ?? ''
toolUse.name = cwChatEvent.toolUseEvent.name ?? ''
try {
toolUse.input = JSON.parse(toolUseInput)
try {
toolUse.input = JSON.parse(toolUseInput)
} catch (error: any) {
getLogger().error(`JSON parse error for toolUseInput: ${toolUseInput}`)
// set toolUse.input to the raw value
toolUse.input = toolUseInput
error.message = `Tool input has invalid JSON format: ${error.message}`
// throw it out to allow the error to be handled in the catch block
throw error
}
const availableToolsNames = (session.pairProgrammingModeOn ? tools : noWriteTools).map(
(item) => item.toolSpecification?.name
)
Expand Down