feat: add Claude Code provider for local CLI integration (RooCodeInc#4864)

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

Author: 4 people

packages/types/src/providers/claude-code.ts

@@ -5,6 +5,7 @@ import { anthropicModels } from "./anthropic.js"
 export type ClaudeCodeModelId = keyof typeof claudeCodeModels
 export const claudeCodeDefaultModelId: ClaudeCodeModelId = "claude-sonnet-4-20250514"
 export const claudeCodeModels = {
+<<<<<<< HEAD
 	"claude-sonnet-4-20250514": {
 		...anthropicModels["claude-sonnet-4-20250514"],
 		supportsImages: false,
@@ -45,4 +46,11 @@ export const claudeCodeModels = {
 		supportsReasoningBudget: false,
 		requiredReasoningBudget: false,
 	},
+=======
+	"claude-sonnet-4-20250514": anthropicModels["claude-sonnet-4-20250514"],
+	"claude-opus-4-20250514": anthropicModels["claude-opus-4-20250514"],
+	"claude-3-7-sonnet-20250219": anthropicModels["claude-3-7-sonnet-20250219"],
+	"claude-3-5-sonnet-20241022": anthropicModels["claude-3-5-sonnet-20241022"],
+	"claude-3-5-haiku-20241022": anthropicModels["claude-3-5-haiku-20241022"],
+>>>>>>> 4fa735de3 (feat: add Claude Code provider for local CLI integration (#4864))
 } as const satisfies Record<string, ModelInfo>

src/api/providers/claude-code.ts

@@ -3,7 +3,11 @@ 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"
@@ -17,16 +21,51 @@ 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 = {
@@ -37,27 +76,62 @@ 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
 
@@ -105,6 +179,28 @@ 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))
 					}
 				}
 
@@ -118,10 +214,23 @@ 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))
 		}
 	}
 
@@ -138,10 +247,19 @@ 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/i18n/locales/ca/common.json

@@ -120,6 +120,7 @@
 				"description": "Ruta opcional a la teva CLI de Claude Code. Per defecte 'claude' si no s'estableix.",
 				"placeholder": "Per defecte: claude"
 			}
+<<<<<<< HEAD
 		}
 	},
 	"customModes": {
@@ -132,6 +133,8 @@
 			"resetFailed": "Error en restablir els modes personalitzats: {{error}}",
 			"modeNotFound": "Error d'escriptura: Mode no trobat",
 			"noWorkspaceForProject": "No s'ha trobat cap carpeta d'espai de treball per al mode específic del projecte"
+=======
+>>>>>>> 4fa735de3 (feat: add Claude Code provider for local CLI integration (#4864))
 		}
 	},
 	"mdm": {

src/i18n/locales/de/common.json

@@ -120,6 +120,7 @@
 				"description": "Optionaler Pfad zu deiner Claude Code CLI. Standardmäßig 'claude', falls nicht festgelegt.",
 				"placeholder": "Standard: claude"
 			}
+<<<<<<< HEAD
 		}
 	},
 	"customModes": {
@@ -132,6 +133,8 @@
 			"resetFailed": "Fehler beim Zurücksetzen der benutzerdefinierten Modi: {{error}}",
 			"modeNotFound": "Schreibfehler: Modus nicht gefunden",
 			"noWorkspaceForProject": "Kein Arbeitsbereich-Ordner für projektspezifischen Modus gefunden"
+=======
+>>>>>>> 4fa735de3 (feat: add Claude Code provider for local CLI integration (#4864))
 		}
 	},
 	"mdm": {

src/i18n/locales/es/common.json

@@ -120,6 +120,7 @@
 				"description": "Ruta opcional a tu CLI de Claude Code. Por defecto 'claude' si no se establece.",
 				"placeholder": "Por defecto: claude"
 			}
+<<<<<<< HEAD
 		}
 	},
 	"customModes": {
@@ -132,6 +133,8 @@
 			"resetFailed": "Error al restablecer modos personalizados: {{error}}",
 			"modeNotFound": "Error de escritura: Modo no encontrado",
 			"noWorkspaceForProject": "No se encontró carpeta de espacio de trabajo para modo específico del proyecto"
+=======
+>>>>>>> 4fa735de3 (feat: add Claude Code provider for local CLI integration (#4864))
 		}
 	},
 	"mdm": {

src/i18n/locales/fr/common.json

@@ -120,6 +120,7 @@
 				"description": "Chemin optionnel vers votre CLI Claude Code. Par défaut 'claude' si non défini.",
 				"placeholder": "Par défaut : claude"
 			}
+<<<<<<< HEAD
 		}
 	},
 	"customModes": {
@@ -132,6 +133,8 @@
 			"resetFailed": "Échec de la réinitialisation des modes personnalisés : {{error}}",
 			"modeNotFound": "Erreur d'écriture : Mode non trouvé",
 			"noWorkspaceForProject": "Aucun dossier d'espace de travail trouvé pour le mode spécifique au projet"
+=======
+>>>>>>> 4fa735de3 (feat: add Claude Code provider for local CLI integration (#4864))
 		}
 	},
 	"mdm": {

src/i18n/locales/hi/common.json

@@ -120,6 +120,7 @@
 				"description": "आपके क्लाउड कोड CLI का वैकल्पिक पाथ। सेट न होने पर डिफ़ॉल्ट रूप से 'claude'。",
 				"placeholder": "डिफ़ॉल्ट: claude"
 			}
+<<<<<<< HEAD
 		}
 	},
 	"customModes": {
@@ -132,6 +133,8 @@
 			"resetFailed": "कस्टम मोड रीसेट विफल: {{error}}",
 			"modeNotFound": "लेखन त्रुटि: मोड नहीं मिला",
 			"noWorkspaceForProject": "प्रोजेक्ट-विशिष्ट मोड के लिए वर्कस्पेस फ़ोल्डर नहीं मिला"
+=======
+>>>>>>> 4fa735de3 (feat: add Claude Code provider for local CLI integration (#4864))
 		}
 	},
 	"mdm": {

src/i18n/locales/id/common.json

@@ -122,6 +122,7 @@
 			}
 		}
 	},
+<<<<<<< HEAD
 	"customModes": {
 		"errors": {
 			"yamlParseError": "YAML tidak valid dalam file .roomodes pada baris {{line}}. Silakan periksa:\n• Indentasi yang benar (gunakan spasi, bukan tab)\n• Tanda kutip dan kurung yang cocok\n• Sintaks YAML yang valid",
@@ -134,6 +135,8 @@
 			"noWorkspaceForProject": "Tidak ditemukan folder workspace untuk mode khusus proyek"
 		}
 	},
+=======
+>>>>>>> 4fa735de3 (feat: add Claude Code provider for local CLI integration (#4864))
 	"mdm": {
 		"errors": {
 			"cloud_auth_required": "Organisasi kamu memerlukan autentikasi Roo Code Cloud. Silakan masuk untuk melanjutkan.",

src/i18n/locales/it/common.json

@@ -120,6 +120,7 @@
 				"description": "Percorso opzionale alla tua CLI Claude Code. Predefinito 'claude' se non impostato.",
 				"placeholder": "Predefinito: claude"
 			}
+<<<<<<< HEAD
 		}
 	},
 	"customModes": {
@@ -132,6 +133,8 @@
 			"resetFailed": "Reset modalità personalizzate fallito: {{error}}",
 			"modeNotFound": "Errore di scrittura: Modalità non trovata",
 			"noWorkspaceForProject": "Nessuna cartella workspace trovata per la modalità specifica del progetto"
+=======
+>>>>>>> 4fa735de3 (feat: add Claude Code provider for local CLI integration (#4864))
 		}
 	},
 	"mdm": {

src/i18n/locales/ja/common.json

@@ -120,6 +120,7 @@
 				"description": "Claude Code CLI へのオプションのパス。設定されていない場合は、デフォルトで「claude」になります。",
 				"placeholder": "デフォルト: claude"
 			}
+<<<<<<< HEAD
 		}
 	},
 	"customModes": {
@@ -132,6 +133,8 @@
 			"resetFailed": "カスタムモードのリセットに失敗しました：{{error}}",
 			"modeNotFound": "書き込みエラー：モードが見つかりません",
 			"noWorkspaceForProject": "プロジェクト固有モード用のワークスペースフォルダーが見つかりません"
+=======
+>>>>>>> 4fa735de3 (feat: add Claude Code provider for local CLI integration (#4864))
 		}
 	},
 	"mdm": {