scriptoriumadmin/Roo-Code
1
0
Fork 0
mirror of https://github.com/RooVetGit/Roo-Code.git synced 2026-09-05 08:10:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Safer tool call json parsing

Browse source
This commit is contained in:
Matt Rubens 2025-12-03 01:06:58 -05:00
parent 873a763ea7
commit 04d27da70d
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/core/assistant-message/NativeToolCallParser.ts
View file

@ -559,8 +559,9 @@ export class NativeToolCallParser {
}
try {
// Parse the arguments JSON string
const args = JSON.parse(toolCall.arguments)
// Parse the arguments JSON string using partial-json to handle malformed JSON
// (e.g., unescaped tab characters that strict JSON.parse would reject)
const args = parseJSON(toolCall.arguments)
// Build legacy params object for backward compatibility with XML protocol and UI.
// Native execution path uses nativeArgs instead, which has proper typing.
@ -805,8 +806,9 @@ export class NativeToolCallParser {
*/
public static parseDynamicMcpTool(toolCall: { id: string; name: string; arguments: string }): McpToolUse | null {
try {
// Parse the arguments - these are the actual tool arguments passed directly
const args = JSON.parse(toolCall.arguments || "{}")
// Parse the arguments using partial-json to handle malformed JSON
// (e.g., unescaped tab characters that strict JSON.parse would reject)
const args = parseJSON(toolCall.arguments || "{}")
// Extract server_name and tool_name from the tool name itself
// Format: mcp_serverName_toolName