mirror of
https://github.com/RooVetGit/Roo-Code.git
synced 2026-09-19 00:01:19 +00:00
* fix: cancel backend auto-approval timeout when auto-approve is toggled off mid-countdown (#11439) Co-authored-by: Sannidhya <sann@Sannidhyas-MacBook-Pro.local> * fix: prevent chat history loss during cloud/settings navigation (#11371) (#11372) Co-authored-by: Sannidhya <sann@Sannidhyas-MacBook-Pro.local> * fix: preserve pasted images in chatbox during chat activity (#11375) Co-authored-by: Roo Code <roomote@roocode.com> * fix: resolve chat scroll anchoring and task-switch scroll race condit… (#11385) * fix: avoid zsh process-substitution false positives in assignments (#11365) * fix(editor): make tab close best-effort in DiffViewProvider.open (#11363) * fix(checkpoints): canonicalize core.worktree comparison to prevent Windows path mismatch failures (#11346) * fix: prevent double notification sound playback (#11283) * fix: prevent false unsaved changes prompt with OpenAI Compatible headers (#8230) (#11334) fix: prevent false unsaved changes prompt with OpenAI Compatible headers Mark automatic header syncs in ApiOptions and OpenAICompatible as non-user actions (isUserAction: false) and enhance SettingsView change detection to skip automatic syncs with semantically equal values. Root cause: two components (ApiOptions and OpenAICompatible) manage openAiHeaders state and automatically sync it back on mount/remount. These syncs were treated as user changes, triggering a false dirty state. Co-authored-by: Robert McIntyre <robertjmcintyre@users.noreply.github.com> * fix: remove noisy console.warn logs from NativeToolCallParser (#11264) Remove two console.warn messages that fire excessively when loading tasks from history: - 'Attempting to finalize unknown tool call' in finalizeStreamingToolCall() - 'Received chunk for unknown tool call' in processStreamingChunk() The defensive null-return behavior is preserved; only the log output is removed. * refactor: remove footgun prompting (file-based system prompt override) (#11387) * refactor: delete orphaned per-provider caching transform files (#11388) * feat: add disabledTools setting to globally disable native tools (#11277) * feat: add disabledTools setting to globally disable native tools Add a disabledTools field to GlobalSettings that allows disabling specific native tools by name. This enables cloud agents to be configured with restricted tool access. Schema: - Add disabledTools: z.array(toolNamesSchema).optional() to globalSettingsSchema - Add disabledTools to organizationDefaultSettingsSchema.pick() - Add disabledTools to ExtensionState Pick type Prompt generation (tool filtering): - Add disabledTools to BuildToolsOptions interface - Pass disabledTools through filterSettings to filterNativeToolsForMode() - Remove disabled tools from allowedToolNames set in filterNativeToolsForMode() Execution-time validation (safety net): - Extract disabledTools from state in presentAssistantMessage - Convert disabledTools to toolRequirements format for validateToolUse() Wiring: - Add disabledTools to ClineProvider getState() and getStateToPostToWebview() - Pass disabledTools to all buildNativeToolsArrayWithRestrictions() call sites EXT-778 * fix: check toolRequirements before ALWAYS_AVAILABLE_TOOLS Moves the toolRequirements check before the ALWAYS_AVAILABLE_TOOLS early-return in isToolAllowedForMode(). This ensures disabledTools can block always-available tools (switch_mode, new_task, etc.) at execution time, making the validation layer consistent with the filtering layer. * feat: add support for .agents/skills directory (#11181) * feat: add support for .agents/skills directory This change adds support for discovering skills from the .agents/skills directory, following the Agent Skills convention for sharing skills across different AI coding tools. Priority order (later entries override earlier ones): 1. Global ~/.agents/skills (shared across AI coding tools, lowest priority) 2. Project .agents/skills 3. Global ~/.roo/skills (Roo-specific) 4. Project .roo/skills (highest priority) Changes: - Add getGlobalAgentsDirectory() and getProjectAgentsDirectoryForCwd() functions to roo-config - Update SkillsManager.getSkillsDirectories() to include .agents/skills - Update SkillsManager.setupFileWatchers() to watch .agents/skills - Add tests for new functionality * fix: clarify skill priority comment to match actual behavior * fix: clarify skill priority comment to explain Map.set replacement mechanism --------- Co-authored-by: Roo Code <roomote@roocode.com> * feat(history): render nested subtasks as recursive tree (#11299) * feat(history): render nested subtasks as recursive tree * fix(lockfile): resolve missing ai-sdk provider entry * fix: address review feedback — dedupe countAll, increase SubtaskRow max-h - HistoryView: replace local countAll with imported countAllSubtasks from types.ts - SubtaskRow: increase nested children max-h from 500px to 2000px to match TaskGroupItem * perf(refactor): consolidate getState calls in resolveWebviewView (#11320) * perf(refactor): consolidate getState calls in resolveWebviewView Replace three separate this.getState().then() calls with a single await this.getState() and destructuring. This avoids running the full getState() method (CloudService calls, ContextProxy reads, etc.) three times during webview view resolution. * fix: keep getState consolidation non-blocking to avoid delaying webview render --------- Co-authored-by: daniel-lxs <ricciodaniel98@gmail.com> * fix: harden command auto-approval against inline JS false positives (#11382) * feat: rename search_and_replace tool to edit and unify edit-family UI (#11296) * Revert "refactor: delete orphaned per-provider caching transform files (#11388)" This reverts commit13a45b0361. * chore: regenerate built-in-skills.ts with updated formatting * fix: add missing maxReadFileLine property to test baseState The ExtensionState type now requires maxReadFileLine property (added in commit63e3f769a). Update the test to include this property with the default value of -1 (unlimited reading). Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com> * feat: add pnpm serve command for code-server development (#10964) Co-authored-by: Roo Code <roomote@roocode.com> * chore: remove Feature Request from issue template options (#11141) Co-authored-by: Roo Code <roomote@roocode.com> * refactor(docs-extractor): simplify mode to focus on raw fact extraction (#11129) * Add cli support for linux (#11167) * fix: replace heredocs with echo statements in cli-release workflow (#11168) Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com> * Drop MacOS-13 cli support (#11169) * fix(cli): correct example in install script (#11170) Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com> * feat: add Kimi K2.5 model to Fireworks provider (#11177) * feat(cli): improve dev experience and roo provider API key support (#11203) - Allow --api-key and ROO_API_KEY env var for the roo provider instead of requiring cloud auth token - Switch dev/start scripts to use tsx for running directly from source without building first - Fix path resolution (version.ts, extension.ts, extension-host.ts) to work from both source and bundled locations - Disable debug log file (~/.roo/cli-debug.log) unless --debug is passed - Update README with complete env var table and dev workflow docs Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com> * Roo Code CLI v0.0.50 (#11204) * Roo Code CLI v0.0.50 * docs(cli): add --exit-on-error to changelog --------- Co-authored-by: Roo Code <roomote@roocode.com> * feat(cli): update default model from Opus 4.5 to Opus 4.6 (#11273) Co-authored-by: Roo Code <roomote@roocode.com> * feat(web): replace Roomote Control with Linear Integration in cloud features grid (#11280) Co-authored-by: Roo Code <roomote@roocode.com> * Add linux-arm64 for the roo cli (#11314) * chore: clean up repo-facing mode rules (#11410) * Make CLI auto-approve by default with require-approval opt-in (#11424) Co-authored-by: Roo Code <roomote@roocode.com> * Add new code owners to CODEOWNERS file * Update next.js (#11108) * feat(web): Replace bespoke navigation menu with shadcn navigation menu (#11117) Co-authored-by: Roo Code <roomote@roocode.com> --------- Co-authored-by: SannidhyaSah <sah_sannidhya@outlook.com> Co-authored-by: Sannidhya <sann@Sannidhyas-MacBook-Pro.local> Co-authored-by: roomote[bot] <219738659+roomote[bot]@users.noreply.github.com> Co-authored-by: Roo Code <roomote@roocode.com> Co-authored-by: Hannes Rudolph <hrudolph@gmail.com> Co-authored-by: 0xMink <dennis@dennismink.com> Co-authored-by: Robert McIntyre <robertjmcintyre@users.noreply.github.com> Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com> Co-authored-by: Matt Rubens <mrubens@users.noreply.github.com> Co-authored-by: Chris Estreich <cestreich@gmail.com>
279 lines
9.2 KiB
TypeScript
279 lines
9.2 KiB
TypeScript
import fs from "fs/promises"
|
|
import path from "path"
|
|
|
|
import { type ClineSayTool, DEFAULT_WRITE_DELAY_MS } from "@roo-code/types"
|
|
|
|
import { getReadablePath } from "../../utils/path"
|
|
import { isPathOutsideWorkspace } from "../../utils/pathUtils"
|
|
import { Task } from "../task/Task"
|
|
import { formatResponse } from "../prompts/responses"
|
|
import { RecordSource } from "../context-tracking/FileContextTrackerTypes"
|
|
import { fileExistsAtPath } from "../../utils/fs"
|
|
import { EXPERIMENT_IDS, experiments } from "../../shared/experiments"
|
|
import { sanitizeUnifiedDiff, computeDiffStats } from "../diff/stats"
|
|
import type { ToolUse } from "../../shared/tools"
|
|
|
|
import { BaseTool, ToolCallbacks } from "./BaseTool"
|
|
|
|
interface EditParams {
|
|
file_path: string
|
|
old_string: string
|
|
new_string: string
|
|
replace_all?: boolean
|
|
}
|
|
|
|
export class EditTool extends BaseTool<"edit"> {
|
|
readonly name = "edit" as const
|
|
|
|
async execute(params: EditParams, task: Task, callbacks: ToolCallbacks): Promise<void> {
|
|
const { file_path: relPath, old_string: oldString, new_string: newString, replace_all: replaceAll } = params
|
|
const { askApproval, handleError, pushToolResult } = callbacks
|
|
|
|
try {
|
|
// Validate required parameters
|
|
if (!relPath) {
|
|
task.consecutiveMistakeCount++
|
|
task.recordToolError("edit")
|
|
pushToolResult(await task.sayAndCreateMissingParamError("edit", "file_path"))
|
|
return
|
|
}
|
|
|
|
if (!oldString) {
|
|
task.consecutiveMistakeCount++
|
|
task.recordToolError("edit")
|
|
pushToolResult(await task.sayAndCreateMissingParamError("edit", "old_string"))
|
|
return
|
|
}
|
|
|
|
if (newString === undefined) {
|
|
task.consecutiveMistakeCount++
|
|
task.recordToolError("edit")
|
|
pushToolResult(await task.sayAndCreateMissingParamError("edit", "new_string"))
|
|
return
|
|
}
|
|
|
|
// Check old_string !== new_string
|
|
if (oldString === newString) {
|
|
task.consecutiveMistakeCount++
|
|
task.recordToolError("edit")
|
|
pushToolResult(
|
|
formatResponse.toolError(
|
|
"'old_string' and 'new_string' are identical. No changes needed. If you want to make a change, ensure 'old_string' and 'new_string' are different.",
|
|
),
|
|
)
|
|
return
|
|
}
|
|
|
|
const accessAllowed = task.rooIgnoreController?.validateAccess(relPath)
|
|
|
|
if (!accessAllowed) {
|
|
await task.say("rooignore_error", relPath)
|
|
pushToolResult(formatResponse.rooIgnoreError(relPath))
|
|
return
|
|
}
|
|
|
|
// Check if file is write-protected
|
|
const isWriteProtected = task.rooProtectedController?.isWriteProtected(relPath) || false
|
|
|
|
const absolutePath = path.resolve(task.cwd, relPath)
|
|
|
|
const fileExists = await fileExistsAtPath(absolutePath)
|
|
if (!fileExists) {
|
|
task.consecutiveMistakeCount++
|
|
task.recordToolError("edit")
|
|
const errorMessage = `File not found: ${relPath}. Cannot perform edit on a non-existent file.`
|
|
await task.say("error", errorMessage)
|
|
pushToolResult(formatResponse.toolError(errorMessage))
|
|
return
|
|
}
|
|
|
|
let fileContent: string
|
|
try {
|
|
fileContent = await fs.readFile(absolutePath, "utf8")
|
|
// Normalize line endings to LF for consistent matching
|
|
fileContent = fileContent.replace(/\r\n/g, "\n")
|
|
} catch (error) {
|
|
task.consecutiveMistakeCount++
|
|
task.recordToolError("edit")
|
|
const errorMessage = `Failed to read file '${relPath}'. Please verify file permissions and try again.`
|
|
await task.say("error", errorMessage)
|
|
pushToolResult(formatResponse.toolError(errorMessage))
|
|
return
|
|
}
|
|
|
|
// Normalize line endings in old_string/new_string to match file content
|
|
const normalizedOld = oldString.replace(/\r\n/g, "\n")
|
|
const normalizedNew = newString.replace(/\r\n/g, "\n")
|
|
|
|
// Count occurrences of old_string in file content
|
|
const matchCount = fileContent.split(normalizedOld).length - 1
|
|
|
|
if (matchCount === 0) {
|
|
task.consecutiveMistakeCount++
|
|
task.recordToolError("edit", "no_match")
|
|
pushToolResult(
|
|
formatResponse.toolError(
|
|
`No match found for 'old_string' in ${relPath}. Make sure the text to find appears exactly in the file, including whitespace and indentation.`,
|
|
),
|
|
)
|
|
return
|
|
}
|
|
|
|
// Uniqueness check when replace_all is not enabled
|
|
if (!replaceAll && matchCount > 1) {
|
|
task.consecutiveMistakeCount++
|
|
task.recordToolError("edit")
|
|
pushToolResult(
|
|
formatResponse.toolError(
|
|
`Found ${matchCount} matches of 'old_string' in the file. Use 'replace_all: true' to replace all occurrences, or provide more context in 'old_string' to make it unique.`,
|
|
),
|
|
)
|
|
return
|
|
}
|
|
|
|
// Apply the replacement
|
|
let newContent: string
|
|
if (replaceAll) {
|
|
// Replace all occurrences
|
|
const searchPattern = new RegExp(escapeRegExp(normalizedOld), "g")
|
|
newContent = fileContent.replace(searchPattern, () => normalizedNew)
|
|
} else {
|
|
// Replace single occurrence (already verified uniqueness above)
|
|
newContent = fileContent.replace(normalizedOld, () => normalizedNew)
|
|
}
|
|
|
|
// Check if any changes were made
|
|
if (newContent === fileContent) {
|
|
pushToolResult(`No changes needed for '${relPath}'`)
|
|
return
|
|
}
|
|
|
|
task.consecutiveMistakeCount = 0
|
|
|
|
// Initialize diff view
|
|
task.diffViewProvider.editType = "modify"
|
|
task.diffViewProvider.originalContent = fileContent
|
|
|
|
// Generate and validate diff
|
|
const diff = formatResponse.createPrettyPatch(relPath, fileContent, newContent)
|
|
if (!diff) {
|
|
pushToolResult(`No changes needed for '${relPath}'`)
|
|
await task.diffViewProvider.reset()
|
|
return
|
|
}
|
|
|
|
// Check if preventFocusDisruption experiment is enabled
|
|
const provider = task.providerRef.deref()
|
|
const state = await provider?.getState()
|
|
const diagnosticsEnabled = state?.diagnosticsEnabled ?? true
|
|
const writeDelayMs = state?.writeDelayMs ?? DEFAULT_WRITE_DELAY_MS
|
|
const isPreventFocusDisruptionEnabled = experiments.isEnabled(
|
|
state?.experiments ?? {},
|
|
EXPERIMENT_IDS.PREVENT_FOCUS_DISRUPTION,
|
|
)
|
|
|
|
const sanitizedDiff = sanitizeUnifiedDiff(diff)
|
|
const diffStats = computeDiffStats(sanitizedDiff) || undefined
|
|
const isOutsideWorkspace = isPathOutsideWorkspace(absolutePath)
|
|
|
|
const sharedMessageProps: ClineSayTool = {
|
|
tool: "appliedDiff",
|
|
path: getReadablePath(task.cwd, relPath),
|
|
diff: sanitizedDiff,
|
|
isOutsideWorkspace,
|
|
}
|
|
|
|
const completeMessage = JSON.stringify({
|
|
...sharedMessageProps,
|
|
content: sanitizedDiff,
|
|
isProtected: isWriteProtected,
|
|
diffStats,
|
|
} satisfies ClineSayTool)
|
|
|
|
// Show diff view if focus disruption prevention is disabled
|
|
if (!isPreventFocusDisruptionEnabled) {
|
|
await task.diffViewProvider.open(relPath)
|
|
await task.diffViewProvider.update(newContent, true)
|
|
task.diffViewProvider.scrollToFirstDiff()
|
|
}
|
|
|
|
const didApprove = await askApproval("tool", completeMessage, undefined, isWriteProtected)
|
|
|
|
if (!didApprove) {
|
|
// Revert changes if diff view was shown
|
|
if (!isPreventFocusDisruptionEnabled) {
|
|
await task.diffViewProvider.revertChanges()
|
|
}
|
|
pushToolResult("Changes were rejected by the user.")
|
|
await task.diffViewProvider.reset()
|
|
return
|
|
}
|
|
|
|
// Save the changes
|
|
if (isPreventFocusDisruptionEnabled) {
|
|
// Direct file write without diff view or opening the file
|
|
await task.diffViewProvider.saveDirectly(relPath, newContent, false, diagnosticsEnabled, writeDelayMs)
|
|
} else {
|
|
// Call saveChanges to update the DiffViewProvider properties
|
|
await task.diffViewProvider.saveChanges(diagnosticsEnabled, writeDelayMs)
|
|
}
|
|
|
|
// Track file edit operation
|
|
if (relPath) {
|
|
await task.fileContextTracker.trackFileContext(relPath, "roo_edited" as RecordSource)
|
|
}
|
|
|
|
task.didEditFile = true
|
|
|
|
// Get the formatted response message
|
|
const message = await task.diffViewProvider.pushToolWriteResult(task, task.cwd, false)
|
|
pushToolResult(message)
|
|
|
|
// Record successful tool usage and cleanup
|
|
task.recordToolUsage("edit")
|
|
await task.diffViewProvider.reset()
|
|
this.resetPartialState()
|
|
|
|
// Process any queued messages after file edit completes
|
|
task.processQueuedMessages()
|
|
} catch (error) {
|
|
await handleError("edit", error as Error)
|
|
await task.diffViewProvider.reset()
|
|
this.resetPartialState()
|
|
}
|
|
}
|
|
|
|
override async handlePartial(task: Task, block: ToolUse<"edit">): Promise<void> {
|
|
const relPath: string | undefined = block.params.file_path
|
|
|
|
// Wait for path to stabilize before showing UI (prevents truncated paths)
|
|
if (!this.hasPathStabilized(relPath)) {
|
|
return
|
|
}
|
|
|
|
// relPath is guaranteed non-null after hasPathStabilized
|
|
const absolutePath = path.resolve(task.cwd, relPath!)
|
|
const isOutsideWorkspace = isPathOutsideWorkspace(absolutePath)
|
|
|
|
const sharedMessageProps: ClineSayTool = {
|
|
tool: "appliedDiff",
|
|
path: getReadablePath(task.cwd, relPath!),
|
|
diff: block.params.old_string ? "1 edit operation" : undefined,
|
|
isOutsideWorkspace,
|
|
}
|
|
|
|
await task.ask("tool", JSON.stringify(sharedMessageProps), block.partial).catch(() => {})
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Escapes special regex characters in a string
|
|
* @param input String to escape regex characters in
|
|
* @returns Escaped string safe for regex pattern matching
|
|
*/
|
|
function escapeRegExp(input: string): string {
|
|
return input.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")
|
|
}
|
|
|
|
export const editTool = new EditTool()
|
|
export const searchAndReplaceTool = editTool // alias for backward compat
|