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

Move search_files to a tool file (#2098)

Browse source
This commit is contained in:
Matt Rubens 2025-03-30 01:28:58 -04:00 • committed by GitHub
parent da2af71106
commit 9be36ddcf3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 72 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/core/Cline.ts
View file

@ -90,6 +90,7 @@ import { applyDiffTool } from "./tools/applyDiffTool"
import { insertContentTool } from "./tools/insertContentTool"
import { searchAndReplaceTool } from "./tools/searchAndReplaceTool"
import { listCodeDefinitionNamesTool } from "./tools/listCodeDefinitionNamesTool"
import { searchFilesTool } from "./tools/searchFilesTool"
export type ToolResponse = string | Array<Anthropic.TextBlockParam | Anthropic.ImageBlockParam>
type UserContent = Array<Anthropic.Messages.ContentBlockParam>
@ -1608,58 +1609,8 @@ export class Cline extends EventEmitter<ClineEvents> {
)
break
case "search_files": {
const relDirPath: string | undefined = block.params.path
const regex: string | undefined = block.params.regex
const filePattern: string | undefined = block.params.file_pattern
const sharedMessageProps: ClineSayTool = {
tool: "searchFiles",
path: getReadablePath(this.cwd, removeClosingTag("path", relDirPath)),
regex: removeClosingTag("regex", regex),
filePattern: removeClosingTag("file_pattern", filePattern),
}
try {
if (block.partial) {
const partialMessage = JSON.stringify({
...sharedMessageProps,
content: "",
} satisfies ClineSayTool)
await this.ask("tool", partialMessage, block.partial).catch(() => {})
break
} else {
if (!relDirPath) {
this.consecutiveMistakeCount++
pushToolResult(await this.sayAndCreateMissingParamError("search_files", "path"))
break
}
if (!regex) {
this.consecutiveMistakeCount++
pushToolResult(await this.sayAndCreateMissingParamError("search_files", "regex"))
break
}
this.consecutiveMistakeCount = 0
const absolutePath = path.resolve(this.cwd, relDirPath)
const results = await regexSearchFiles(
this.cwd,
absolutePath,
regex,
filePattern,
this.rooIgnoreController,
)
const completeMessage = JSON.stringify({
...sharedMessageProps,
content: results,
} satisfies ClineSayTool)
const didApprove = await askApproval("tool", completeMessage)
if (!didApprove) {
break
}
pushToolResult(results)
break
}
} catch (error) {
await handleError("searching files", error)
break
}
await searchFilesTool(this, block, askApproval, handleError, pushToolResult, removeClosingTag)
break
}
case "browser_action": {
const action: BrowserAction | undefined = block.params.action as BrowserAction

69
src/core/tools/searchFilesTool.ts Normal file
View file

@ -0,0 +1,69 @@
import { Cline } from "../Cline"
import { ToolUse } from "../assistant-message"
import { AskApproval, HandleError, PushToolResult, RemoveClosingTag } from "./types"
import { ClineSayTool } from "../../shared/ExtensionMessage"
import { getReadablePath } from "../../utils/path"
import path from "path"
import { regexSearchFiles } from "../../services/ripgrep"
export async function searchFilesTool(
cline: Cline,
block: ToolUse,
askApproval: AskApproval,
handleError: HandleError,
pushToolResult: PushToolResult,
removeClosingTag: RemoveClosingTag,
) {
const relDirPath: string | undefined = block.params.path
const regex: string | undefined = block.params.regex
const filePattern: string | undefined = block.params.file_pattern
const sharedMessageProps: ClineSayTool = {
tool: "searchFiles",
path: getReadablePath(cline.cwd, removeClosingTag("path", relDirPath)),
regex: removeClosingTag("regex", regex),
filePattern: removeClosingTag("file_pattern", filePattern),
}
try {
if (block.partial) {
const partialMessage = JSON.stringify({
...sharedMessageProps,
content: "",
} satisfies ClineSayTool)
await cline.ask("tool", partialMessage, block.partial).catch(() => {})
return
} else {
if (!relDirPath) {
cline.consecutiveMistakeCount++
pushToolResult(await cline.sayAndCreateMissingParamError("search_files", "path"))
return
}
if (!regex) {
cline.consecutiveMistakeCount++
pushToolResult(await cline.sayAndCreateMissingParamError("search_files", "regex"))
return
}
cline.consecutiveMistakeCount = 0
const absolutePath = path.resolve(cline.cwd, relDirPath)
const results = await regexSearchFiles(
cline.cwd,
absolutePath,
regex,
filePattern,
cline.rooIgnoreController,
)
const completeMessage = JSON.stringify({
...sharedMessageProps,
content: results,
} satisfies ClineSayTool)
const didApprove = await askApproval("tool", completeMessage)
if (!didApprove) {
return
}
pushToolResult(results)
return
}
} catch (error) {
await handleError("searching files", error)
return
}
}