Merge pull request #2033 from Kilo-Org/christiaan/simple-read-tool-2

Simple read file tool

Author: chrarnoldus

.changeset/silent-plums-pay.md

@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Thanks @daniel-lxs! - Added a single-file read tool that works better with Sonic than the default multi-file read tool.

packages/types/src/index.ts

@@ -12,6 +12,7 @@ export * from "./message.js"
 export * from "./mode.js"
 export * from "./model.js"
 export * from "./provider-settings.js"
+export * from "./single-file-read-models.js"
 export * from "./task.js"
 export * from "./todo.js"
 export * from "./telemetry.js"

packages/types/src/single-file-read-models.ts

@@ -0,0 +1,34 @@
+/**
+ * Configuration for models that should use simplified single-file read_file tool
+ * These models will use the simpler <read_file><path>...</path></read_file> format
+ * instead of the more complex multi-file args format
+ */
+
+// List of model IDs (or patterns) that should use single file reads only
+export const SINGLE_FILE_READ_MODELS = new Set<string>([
+	"sonic", // kilocode_change
+])
+
+/**
+ * Check if a model should use single file read format
+ * @param modelId The model ID to check
+ * @returns true if the model should use single file reads
+ */
+export function shouldUseSingleFileRead(modelId: string): boolean {
+	// Direct match
+	if (SINGLE_FILE_READ_MODELS.has(modelId)) {
+		return true
+	}
+
+	// Pattern matching for model families
+	// Check if model ID starts with any configured pattern
+	// Using Array.from for compatibility with older TypeScript targets
+	const patterns = Array.from(SINGLE_FILE_READ_MODELS)
+	for (const pattern of patterns) {
+		if (pattern.endsWith("*") && modelId.startsWith(pattern.slice(0, -1))) {
+			return true
+		}
+	}
+
+	return false
+}

src/core/assistant-message/presentAssistantMessage.ts

@@ -10,6 +10,8 @@ import type { ToolParamName, ToolResponse } from "../../shared/tools"
 import { fetchInstructionsTool } from "../tools/fetchInstructionsTool"
 import { listFilesTool } from "../tools/listFilesTool"
 import { getReadFileToolDescription, readFileTool } from "../tools/readFileTool"
+import { getSimpleReadFileToolDescription, simpleReadFileTool } from "../tools/simpleReadFileTool"
+import { shouldUseSingleFileRead } from "@roo-code/types"
 import { writeToFileTool } from "../tools/writeToFileTool"
 import { applyDiffTool } from "../tools/multiApplyDiffTool"
 import { insertContentTool } from "../tools/insertContentTool"
@@ -162,7 +164,13 @@ export async function presentAssistantMessage(cline: Task, recursionDepth: numbe
 					case "execute_command":
 						return `[${block.name} for '${block.params.command}']`
 					case "read_file":
-						return getReadFileToolDescription(block.name, block.params)
+						// Check if this model should use the simplified description
+						const modelId = cline.api.getModel().id
+						if (shouldUseSingleFileRead(modelId)) {
+							return getSimpleReadFileToolDescription(block.name, block.params)
+						} else {
+							return getReadFileToolDescription(block.name, block.params)
+						}
 					case "fetch_instructions":
 						return `[${block.name} for '${block.params.task}']`
 					case "write_to_file":
@@ -478,8 +486,20 @@ export async function presentAssistantMessage(cline: Task, recursionDepth: numbe
 					break
 				// kilocode_change end
 				case "read_file":
-					await readFileTool(cline, block, askApproval, handleError, pushToolResult, removeClosingTag)
-
+					// Check if this model should use the simplified single-file read tool
+					const modelId = cline.api.getModel().id
+					if (shouldUseSingleFileRead(modelId)) {
+						await simpleReadFileTool(
+							cline,
+							block,
+							askApproval,
+							handleError,
+							pushToolResult,
+							removeClosingTag,
+						)
+					} else {
+						await readFileTool(cline, block, askApproval, handleError, pushToolResult, removeClosingTag)
+					}
 					break
 				case "fetch_instructions":
 					await fetchInstructionsTool(cline, block, askApproval, handleError, pushToolResult)

src/core/prompts/system.ts

@@ -68,6 +68,7 @@ async function generatePrompt(
 	partialReadsEnabled?: boolean,
 	settings?: SystemPromptSettings,
 	todoList?: TodoItem[],
+	modelId?: string,
 ): Promise<string> {
 	if (!context) {
 		throw new Error("Extension context is required for generating system prompt")
@@ -113,6 +114,7 @@ ${getToolDescriptionsForMode(
 	partialReadsEnabled,
 	settings,
 	enableMcpServerCreation,
+	modelId,
 )}
 
 ${getToolUseGuidelinesSection(codeIndexManager)}
@@ -159,6 +161,7 @@ export const SYSTEM_PROMPT = async (
 	partialReadsEnabled?: boolean,
 	settings?: SystemPromptSettings,
 	todoList?: TodoItem[],
+	modelId?: string,
 ): Promise<string> => {
 	if (!context) {
 		throw new Error("Extension context is required for generating system prompt")
@@ -233,5 +236,6 @@ ${getMorphInstructions(experiments) /* kilocode_change: Morph fast apply */}${cu
 		partialReadsEnabled,
 		settings,
 		todoList,
+		modelId,
 	)
 }

src/core/prompts/tools/index.ts

@@ -7,7 +7,9 @@ import { Mode, getModeConfig, isToolAllowedForMode, getGroupName } from "../../.
 import { ToolArgs } from "./types"
 import { getExecuteCommandDescription } from "./execute-command"
 import { getReadFileDescription } from "./read-file"
+import { getSimpleReadFileDescription } from "./simple-read-file"
 import { getFetchInstructionsDescription } from "./fetch-instructions"
+import { shouldUseSingleFileRead } from "@roo-code/types"
 import { getWriteToFileDescription } from "./write-to-file"
 import { getSearchFilesDescription } from "./search-files"
 import { getListFilesDescription } from "./list-files"
@@ -29,7 +31,14 @@ import { CodeIndexManager } from "../../../services/code-index/manager"
 // Map of tool names to their description functions
 const toolDescriptionMap: Record<string, (args: ToolArgs) => string | undefined> = {
 	execute_command: (args) => getExecuteCommandDescription(args),
-	read_file: (args) => getReadFileDescription(args),
+	read_file: (args) => {
+		// Check if the current model should use the simplified read_file tool
+		const modelId = args.settings?.modelId
+		if (modelId && shouldUseSingleFileRead(modelId)) {
+			return getSimpleReadFileDescription(args)
+		}
+		return getReadFileDescription(args)
+	},
 	fetch_instructions: (args) => getFetchInstructionsDescription(args.settings?.enableMcpServerCreation),
 	write_to_file: (args) => getWriteToFileDescription(args),
 	search_files: (args) => getSearchFilesDescription(args),
@@ -64,6 +73,7 @@ export function getToolDescriptionsForMode(
 	partialReadsEnabled?: boolean,
 	settings?: Record<string, any>,
 	enableMcpServerCreation?: boolean,
+	modelId?: string,
 ): string {
 	const config = getModeConfig(mode, customModes)
 	const args: ToolArgs = {
@@ -76,6 +86,7 @@ export function getToolDescriptionsForMode(
 		settings: {
 			...settings,
 			enableMcpServerCreation,
+			modelId,
 		},
 		experiments,
 	}
@@ -145,6 +156,7 @@ export function getToolDescriptionsForMode(
 export {
 	getExecuteCommandDescription,
 	getReadFileDescription,
+	getSimpleReadFileDescription,
 	getFetchInstructionsDescription,
 	getWriteToFileDescription,
 	getSearchFilesDescription,

src/core/prompts/tools/simple-read-file.ts

@@ -0,0 +1,35 @@
+import { ToolArgs } from "./types"
+
+/**
+ * Generate a simplified read_file tool description for models that only support single file reads
+ * Uses the simpler format: <read_file><path>file/path.ext</path></read_file>
+ */
+export function getSimpleReadFileDescription(args: ToolArgs): string {
+	return `## read_file
+Description: Request to read the contents of a file. The tool outputs line-numbered content (e.g. "1 | const x = 1") for easy reference when discussing code.
+
+Parameters:
+- path: (required) File path (relative to workspace directory ${args.cwd})
+
+Usage:
+<read_file>
+<path>path/to/file</path>
+</read_file>
+
+Examples:
+
+1. Reading a TypeScript file:
+<read_file>
+<path>src/app.ts</path>
+</read_file>
+
+2. Reading a configuration file:
+<read_file>
+<path>config.json</path>
+</read_file>
+
+3. Reading a markdown file:
+<read_file>
+<path>README.md</path>
+</read_file>`
+}

src/core/task/Task.ts

@@ -2274,6 +2274,8 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 					todoListEnabled: apiConfiguration?.todoListEnabled ?? true,
 					useAgentRules: vscode.workspace.getConfiguration("kilo-code").get<boolean>("useAgentRules") ?? true,
 				},
+				undefined, // todoList
+				this.api.getModel().id,
 			)
 		})()
 	}