Merge pull request Kilo-Org#4137 from Kilo-Org/christiaan/claude-code

Attempt to make Opus work slightly better with Claude Code

Author: chrarnoldus

.changeset/orange-coins-smile.md

@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Slightly improved reliability of Opus with Claude Code

src/api/providers/claude-code.ts

@@ -95,6 +95,7 @@ export class ClaudeCodeHandler extends BaseProvider implements ApiHandler {
 					}
 				}
 
+				let toolReminder = false // kilocode_change
 				for (const content of message.content) {
 					switch (content.type) {
 						case "text":
@@ -117,6 +118,15 @@ export class ClaudeCodeHandler extends BaseProvider implements ApiHandler {
 							break
 						case "tool_use":
 							console.error(`tool_use is not supported yet. Received: ${JSON.stringify(content)}`)
+							// kilocode_change start
+							if (!toolReminder) {
+								yield {
+									type: "text",
+									text: "Preparing to use tools in XML format... ",
+								}
+								toolReminder = true
+							}
+							// kilocode_change end
 							break
 					}
 				}

src/integrations/claude-code/run.ts

@@ -157,6 +157,12 @@ export async function* runClaudeCode(
 // We want the model to use our custom tool format instead of built-in tools.
 // Disabling built-in tools prevents tool-only responses and ensures text output.
 const claudeCodeTools = [
+	// kilocode_change start
+	"AskUserQuestion",
+	"KillShell",
+	"Skill",
+	"SlashCommand",
+	// kilocode_change end
 	"Task",
 	"Bash",
 	"Glob",