fix: resolve Claude Code provider JSON parsing and reasoning block display (RooCodeInc#5049)

Co-authored-by: Daniel Riccio <[email protected]>

Author: 2 people

src/api/providers/__tests__/claude-code.spec.ts

@@ -500,4 +500,4 @@ describe("ClaudeCodeHandler", () => {
 
 		consoleSpy.mockRestore()
 	})
-})
+})

src/api/providers/claude-code.ts

@@ -3,11 +3,7 @@ import { claudeCodeDefaultModelId, type ClaudeCodeModelId, claudeCodeModels } fr
 import { type ApiHandler } from ".."
 import { ApiStreamUsageChunk, type ApiStream } from "../transform/stream"
 import { runClaudeCode } from "../../integrations/claude-code/run"
-<<<<<<< HEAD
 import { filterMessagesForClaudeCode } from "../../integrations/claude-code/message-filter"
-=======
-import { ClaudeCodeMessage } from "../../integrations/claude-code/types"
->>>>>>> 4fa735de3 (feat: add Claude Code provider for local CLI integration (#4864))
 import { BaseProvider } from "./base-provider"
 import { t } from "../../i18n"
 import { ApiHandlerOptions } from "../../shared/api"
@@ -21,51 +17,16 @@ export class ClaudeCodeHandler extends BaseProvider implements ApiHandler {
 	}
 
 	override async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
-<<<<<<< HEAD
 		// Filter out image blocks since Claude Code doesn't support them
 		const filteredMessages = filterMessagesForClaudeCode(messages)
 
 		const claudeProcess = runClaudeCode({
 			systemPrompt,
 			messages: filteredMessages,
-=======
-		const claudeProcess = runClaudeCode({
-			systemPrompt,
-			messages,
->>>>>>> 4fa735de3 (feat: add Claude Code provider for local CLI integration (#4864))
 			path: this.options.claudeCodePath,
 			modelId: this.getModel().id,
 		})
 
-<<<<<<< HEAD
-=======
-		const dataQueue: string[] = []
-		let processError = null
-		let errorOutput = ""
-		let exitCode: number | null = null
-
-		claudeProcess.stdout.on("data", (data) => {
-			const output = data.toString()
-			const lines = output.split("\n").filter((line: string) => line.trim() !== "")
-
-			for (const line of lines) {
-				dataQueue.push(line)
-			}
-		})
-
-		claudeProcess.stderr.on("data", (data) => {
-			errorOutput += data.toString()
-		})
-
-		claudeProcess.on("close", (code) => {
-			exitCode = code
-		})
-
-		claudeProcess.on("error", (error) => {
-			processError = error
-		})
-
->>>>>>> 4fa735de3 (feat: add Claude Code provider for local CLI integration (#4864))
 		// Usage is included with assistant messages,
 		// but cost is included in the result chunk
 		let usage: ApiStreamUsageChunk = {
@@ -76,62 +37,27 @@ export class ClaudeCodeHandler extends BaseProvider implements ApiHandler {
 			cacheWriteTokens: 0,
 		}
 
-<<<<<<< HEAD
 		let isPaidUsage = true
 
 		for await (const chunk of claudeProcess) {
 			if (typeof chunk === "string") {
 				yield {
 					type: "text",
 					text: chunk,
-=======
-		while (exitCode !== 0 || dataQueue.length > 0) {
-			if (dataQueue.length === 0) {
-				await new Promise((resolve) => setImmediate(resolve))
-			}
-
-			if (exitCode !== null && exitCode !== 0) {
-				if (errorOutput) {
-					throw new Error(
-						t("common:errors.claudeCode.processExitedWithError", {
-							exitCode,
-							output: errorOutput.trim(),
-						}),
-					)
-				}
-				throw new Error(t("common:errors.claudeCode.processExited", { exitCode }))
-			}
-
-			const data = dataQueue.shift()
-			if (!data) {
-				continue
-			}
-
-			const chunk = this.attemptParseChunk(data)
-
-			if (!chunk) {
-				yield {
-					type: "text",
-					text: data || "",
->>>>>>> 4fa735de3 (feat: add Claude Code provider for local CLI integration (#4864))
 				}
 
 				continue
 			}
 
 			if (chunk.type === "system" && chunk.subtype === "init") {
-<<<<<<< HEAD
 				// Based on my tests, subscription usage sets the `apiKeySource` to "none"
 				isPaidUsage = chunk.apiKeySource !== "none"
-=======
->>>>>>> 4fa735de3 (feat: add Claude Code provider for local CLI integration (#4864))
 				continue
 			}
 
 			if (chunk.type === "assistant" && "message" in chunk) {
 				const message = chunk.message
 
-<<<<<<< HEAD
 				if (message.stop_reason !== null) {
 					const content = "text" in message.content[0] ? message.content[0] : undefined
 
@@ -179,28 +105,6 @@ export class ClaudeCodeHandler extends BaseProvider implements ApiHandler {
 						case "tool_use":
 							console.error(`tool_use is not supported yet. Received: ${JSON.stringify(content)}`)
 							break
-=======
-				if (message.stop_reason !== null && message.stop_reason !== "tool_use") {
-					const errorMessage =
-						message.content[0]?.text ||
-						t("common:errors.claudeCode.stoppedWithReason", { reason: message.stop_reason })
-
-					if (errorMessage.includes("Invalid model name")) {
-						throw new Error(errorMessage + `\n\n${t("common:errors.claudeCode.apiKeyModelPlanMismatch")}`)
-					}
-
-					throw new Error(errorMessage)
-				}
-
-				for (const content of message.content) {
-					if (content.type === "text") {
-						yield {
-							type: "text",
-							text: content.text,
-						}
-					} else {
-						console.warn("Unsupported content type:", content.type)
->>>>>>> 4fa735de3 (feat: add Claude Code provider for local CLI integration (#4864))
 					}
 				}
 
@@ -214,23 +118,10 @@ export class ClaudeCodeHandler extends BaseProvider implements ApiHandler {
 			}
 
 			if (chunk.type === "result" && "result" in chunk) {
-<<<<<<< HEAD
 				usage.totalCost = isPaidUsage ? chunk.total_cost_usd : 0
 
 				yield usage
 			}
-=======
-				// Only use the cost from the CLI if provided
-				// Don't calculate cost as it may be $0 for subscription users
-				usage.totalCost = chunk.cost_usd ?? 0
-
-				yield usage
-			}
-
-			if (processError) {
-				throw processError
-			}
->>>>>>> 4fa735de3 (feat: add Claude Code provider for local CLI integration (#4864))
 		}
 	}
 
@@ -247,20 +138,11 @@ export class ClaudeCodeHandler extends BaseProvider implements ApiHandler {
 		}
 	}
 
-<<<<<<< HEAD
 	private attemptParse(str: string) {
 		try {
 			return JSON.parse(str)
 		} catch (err) {
-=======
-	// TODO: Validate instead of parsing
-	private attemptParseChunk(data: string): ClaudeCodeMessage | null {
-		try {
-			return JSON.parse(data)
-		} catch (error) {
-			console.error("Error parsing chunk:", error)
->>>>>>> 4fa735de3 (feat: add Claude Code provider for local CLI integration (#4864))
 			return null
 		}
 	}
-}
+}

src/integrations/claude-code/types.ts

@@ -1,47 +1,17 @@
-<<<<<<< HEAD
 import type { Anthropic } from "@anthropic-ai/sdk"
 
-=======
->>>>>>> 4fa735de3 (feat: add Claude Code provider for local CLI integration (#4864))
 type InitMessage = {
 	type: "system"
 	subtype: "init"
 	session_id: string
 	tools: string[]
 	mcp_servers: string[]
-<<<<<<< HEAD
 	apiKeySource: "none" | "/login managed key" | string
-=======
-}
-
-type ClaudeCodeContent = {
-	type: "text"
-	text: string
->>>>>>> 4fa735de3 (feat: add Claude Code provider for local CLI integration (#4864))
 }
 
 type AssistantMessage = {
 	type: "assistant"
-<<<<<<< HEAD
 	message: Anthropic.Messages.Message
-=======
-	message: {
-		id: string
-		type: "message"
-		role: "assistant"
-		model: string
-		content: ClaudeCodeContent[]
-		stop_reason: string | null
-		stop_sequence: null
-		usage: {
-			input_tokens: number
-			cache_creation_input_tokens?: number
-			cache_read_input_tokens?: number
-			output_tokens: number
-			service_tier: "standard"
-		}
-	}
->>>>>>> 4fa735de3 (feat: add Claude Code provider for local CLI integration (#4864))
 	session_id: string
 }
 
@@ -52,21 +22,13 @@ type ErrorMessage = {
 type ResultMessage = {
 	type: "result"
 	subtype: "success"
-<<<<<<< HEAD
 	total_cost_usd: number
-=======
-	cost_usd: number
->>>>>>> 4fa735de3 (feat: add Claude Code provider for local CLI integration (#4864))
 	is_error: boolean
 	duration_ms: number
 	duration_api_ms: number
 	num_turns: number
 	result: string
-<<<<<<< HEAD
-=======
-	total_cost: number
->>>>>>> 4fa735de3 (feat: add Claude Code provider for local CLI integration (#4864))
 	session_id: string
 }
 
-export type ClaudeCodeMessage = InitMessage | AssistantMessage | ErrorMessage | ResultMessage
+export type ClaudeCodeMessage = InitMessage | AssistantMessage | ErrorMessage | ResultMessage