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>
478 lines
15 KiB
TypeScript
478 lines
15 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 { BaseTool, ToolCallbacks } from "./BaseTool"
|
|
import type { ToolUse } from "../../shared/tools"
|
|
import { parsePatch, ParseError, processAllHunks } from "./apply-patch"
|
|
import type { ApplyPatchFileChange } from "./apply-patch"
|
|
|
|
interface ApplyPatchParams {
|
|
patch: string
|
|
}
|
|
|
|
export class ApplyPatchTool extends BaseTool<"apply_patch"> {
|
|
readonly name = "apply_patch" as const
|
|
|
|
private static readonly FILE_HEADER_MARKERS = ["*** Add File: ", "*** Delete File: ", "*** Update File: "] as const
|
|
|
|
private extractFirstPathFromPatch(patch: string | undefined): string | undefined {
|
|
if (!patch) {
|
|
return undefined
|
|
}
|
|
|
|
const lines = patch.split("\n")
|
|
const hasTrailingNewline = patch.endsWith("\n")
|
|
const completeLines = hasTrailingNewline ? lines : lines.slice(0, -1)
|
|
|
|
for (const rawLine of completeLines) {
|
|
const line = rawLine.trim()
|
|
|
|
for (const marker of ApplyPatchTool.FILE_HEADER_MARKERS) {
|
|
if (!line.startsWith(marker)) {
|
|
continue
|
|
}
|
|
|
|
const candidatePath = line.substring(marker.length).trim()
|
|
if (candidatePath.length > 0) {
|
|
return candidatePath
|
|
}
|
|
}
|
|
}
|
|
|
|
return undefined
|
|
}
|
|
|
|
async execute(params: ApplyPatchParams, task: Task, callbacks: ToolCallbacks): Promise<void> {
|
|
const { patch } = params
|
|
const { askApproval, handleError, pushToolResult } = callbacks
|
|
|
|
try {
|
|
// Validate required parameters
|
|
if (!patch) {
|
|
task.consecutiveMistakeCount++
|
|
task.recordToolError("apply_patch")
|
|
pushToolResult(await task.sayAndCreateMissingParamError("apply_patch", "patch"))
|
|
return
|
|
}
|
|
|
|
// Parse the patch
|
|
let parsedPatch
|
|
try {
|
|
parsedPatch = parsePatch(patch)
|
|
} catch (error) {
|
|
task.consecutiveMistakeCount++
|
|
task.recordToolError("apply_patch")
|
|
const errorMessage =
|
|
error instanceof ParseError
|
|
? `Invalid patch format: ${error.message}`
|
|
: `Failed to parse patch: ${error instanceof Error ? error.message : String(error)}`
|
|
pushToolResult(formatResponse.toolError(errorMessage))
|
|
return
|
|
}
|
|
|
|
if (parsedPatch.hunks.length === 0) {
|
|
pushToolResult("No file operations found in patch.")
|
|
return
|
|
}
|
|
|
|
// Process each hunk
|
|
const readFile = async (filePath: string): Promise<string> => {
|
|
const absolutePath = path.resolve(task.cwd, filePath)
|
|
return await fs.readFile(absolutePath, "utf8")
|
|
}
|
|
|
|
let changes: ApplyPatchFileChange[]
|
|
try {
|
|
changes = await processAllHunks(parsedPatch.hunks, readFile)
|
|
} catch (error) {
|
|
task.consecutiveMistakeCount++
|
|
task.recordToolError("apply_patch")
|
|
const errorMessage = `Failed to process patch: ${error instanceof Error ? error.message : String(error)}`
|
|
pushToolResult(formatResponse.toolError(errorMessage))
|
|
return
|
|
}
|
|
|
|
// Process each file change
|
|
for (const change of changes) {
|
|
const relPath = change.path
|
|
const absolutePath = path.resolve(task.cwd, relPath)
|
|
|
|
// Check access permissions
|
|
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
|
|
|
|
if (change.type === "add") {
|
|
// Create new file
|
|
await this.handleAddFile(change, absolutePath, relPath, task, callbacks, isWriteProtected)
|
|
} else if (change.type === "delete") {
|
|
// Delete file
|
|
await this.handleDeleteFile(absolutePath, relPath, task, callbacks, isWriteProtected)
|
|
} else if (change.type === "update") {
|
|
// Update file
|
|
await this.handleUpdateFile(change, absolutePath, relPath, task, callbacks, isWriteProtected)
|
|
}
|
|
}
|
|
|
|
task.consecutiveMistakeCount = 0
|
|
task.recordToolUsage("apply_patch")
|
|
} catch (error) {
|
|
await handleError("apply patch", error as Error)
|
|
await task.diffViewProvider.reset()
|
|
}
|
|
}
|
|
|
|
private async handleAddFile(
|
|
change: ApplyPatchFileChange,
|
|
absolutePath: string,
|
|
relPath: string,
|
|
task: Task,
|
|
callbacks: ToolCallbacks,
|
|
isWriteProtected: boolean,
|
|
): Promise<void> {
|
|
const { askApproval, pushToolResult } = callbacks
|
|
|
|
// Check if file already exists
|
|
const fileExists = await fileExistsAtPath(absolutePath)
|
|
if (fileExists) {
|
|
task.consecutiveMistakeCount++
|
|
task.recordToolError("apply_patch")
|
|
const errorMessage = `File already exists: ${relPath}. Use Update File instead.`
|
|
await task.say("error", errorMessage)
|
|
pushToolResult(formatResponse.toolError(errorMessage))
|
|
return
|
|
}
|
|
|
|
const newContent = change.newContent || ""
|
|
const isOutsideWorkspace = isPathOutsideWorkspace(absolutePath)
|
|
|
|
// Initialize diff view for new file
|
|
task.diffViewProvider.editType = "create"
|
|
task.diffViewProvider.originalContent = undefined
|
|
|
|
const diff = formatResponse.createPrettyPatch(relPath, "", newContent)
|
|
|
|
// Check experiment settings
|
|
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 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) {
|
|
if (!isPreventFocusDisruptionEnabled) {
|
|
await task.diffViewProvider.revertChanges()
|
|
}
|
|
pushToolResult("Changes were rejected by the user.")
|
|
await task.diffViewProvider.reset()
|
|
return
|
|
}
|
|
|
|
// Save the changes
|
|
if (isPreventFocusDisruptionEnabled) {
|
|
await task.diffViewProvider.saveDirectly(relPath, newContent, true, diagnosticsEnabled, writeDelayMs)
|
|
} else {
|
|
await task.diffViewProvider.saveChanges(diagnosticsEnabled, writeDelayMs)
|
|
}
|
|
|
|
// Track file edit operation
|
|
await task.fileContextTracker.trackFileContext(relPath, "roo_edited" as RecordSource)
|
|
task.didEditFile = true
|
|
|
|
const message = await task.diffViewProvider.pushToolWriteResult(task, task.cwd, true)
|
|
pushToolResult(message)
|
|
await task.diffViewProvider.reset()
|
|
task.processQueuedMessages()
|
|
}
|
|
|
|
private async handleDeleteFile(
|
|
absolutePath: string,
|
|
relPath: string,
|
|
task: Task,
|
|
callbacks: ToolCallbacks,
|
|
isWriteProtected: boolean,
|
|
): Promise<void> {
|
|
const { askApproval, pushToolResult } = callbacks
|
|
|
|
// Check if file exists
|
|
const fileExists = await fileExistsAtPath(absolutePath)
|
|
if (!fileExists) {
|
|
task.consecutiveMistakeCount++
|
|
task.recordToolError("apply_patch")
|
|
const errorMessage = `File not found: ${relPath}. Cannot delete a non-existent file.`
|
|
await task.say("error", errorMessage)
|
|
pushToolResult(formatResponse.toolError(errorMessage))
|
|
return
|
|
}
|
|
|
|
const isOutsideWorkspace = isPathOutsideWorkspace(absolutePath)
|
|
|
|
const sharedMessageProps: ClineSayTool = {
|
|
tool: "appliedDiff",
|
|
path: getReadablePath(task.cwd, relPath),
|
|
diff: `File will be deleted: ${relPath}`,
|
|
isOutsideWorkspace,
|
|
}
|
|
|
|
const completeMessage = JSON.stringify({
|
|
...sharedMessageProps,
|
|
content: `Delete file: ${relPath}`,
|
|
isProtected: isWriteProtected,
|
|
} satisfies ClineSayTool)
|
|
|
|
const didApprove = await askApproval("tool", completeMessage, undefined, isWriteProtected)
|
|
|
|
if (!didApprove) {
|
|
pushToolResult("Delete operation was rejected by the user.")
|
|
return
|
|
}
|
|
|
|
// Delete the file
|
|
try {
|
|
await fs.unlink(absolutePath)
|
|
} catch (error) {
|
|
const errorMessage = `Failed to delete file '${relPath}': ${error instanceof Error ? error.message : String(error)}`
|
|
await task.say("error", errorMessage)
|
|
pushToolResult(formatResponse.toolError(errorMessage))
|
|
return
|
|
}
|
|
|
|
task.didEditFile = true
|
|
pushToolResult(`Successfully deleted ${relPath}`)
|
|
task.processQueuedMessages()
|
|
}
|
|
|
|
private async handleUpdateFile(
|
|
change: ApplyPatchFileChange,
|
|
absolutePath: string,
|
|
relPath: string,
|
|
task: Task,
|
|
callbacks: ToolCallbacks,
|
|
isWriteProtected: boolean,
|
|
): Promise<void> {
|
|
const { askApproval, pushToolResult } = callbacks
|
|
|
|
// Check if file exists
|
|
const fileExists = await fileExistsAtPath(absolutePath)
|
|
if (!fileExists) {
|
|
task.consecutiveMistakeCount++
|
|
task.recordToolError("apply_patch")
|
|
const errorMessage = `File not found: ${relPath}. Cannot update a non-existent file.`
|
|
await task.say("error", errorMessage)
|
|
pushToolResult(formatResponse.toolError(errorMessage))
|
|
return
|
|
}
|
|
|
|
const originalContent = change.originalContent || ""
|
|
const newContent = change.newContent || ""
|
|
const isOutsideWorkspace = isPathOutsideWorkspace(absolutePath)
|
|
|
|
// Initialize diff view
|
|
task.diffViewProvider.editType = "modify"
|
|
task.diffViewProvider.originalContent = originalContent
|
|
|
|
// Generate and validate diff
|
|
const diff = formatResponse.createPrettyPatch(relPath, originalContent, newContent)
|
|
if (!diff) {
|
|
pushToolResult(`No changes needed for '${relPath}'`)
|
|
await task.diffViewProvider.reset()
|
|
return
|
|
}
|
|
|
|
// Check experiment settings
|
|
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 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) {
|
|
if (!isPreventFocusDisruptionEnabled) {
|
|
await task.diffViewProvider.revertChanges()
|
|
}
|
|
pushToolResult("Changes were rejected by the user.")
|
|
await task.diffViewProvider.reset()
|
|
return
|
|
}
|
|
|
|
// Handle file move if specified
|
|
if (change.movePath) {
|
|
const moveAbsolutePath = path.resolve(task.cwd, change.movePath)
|
|
|
|
// Validate destination path access permissions
|
|
const moveAccessAllowed = task.rooIgnoreController?.validateAccess(change.movePath)
|
|
if (!moveAccessAllowed) {
|
|
await task.say("rooignore_error", change.movePath)
|
|
pushToolResult(formatResponse.rooIgnoreError(change.movePath))
|
|
await task.diffViewProvider.reset()
|
|
return
|
|
}
|
|
|
|
// Check if destination path is write-protected
|
|
const isMovePathWriteProtected = task.rooProtectedController?.isWriteProtected(change.movePath) || false
|
|
if (isMovePathWriteProtected) {
|
|
task.consecutiveMistakeCount++
|
|
task.recordToolError("apply_patch")
|
|
const errorMessage = `Cannot move file to write-protected path: ${change.movePath}`
|
|
await task.say("error", errorMessage)
|
|
pushToolResult(formatResponse.toolError(errorMessage))
|
|
await task.diffViewProvider.reset()
|
|
return
|
|
}
|
|
|
|
// Check if destination path is outside workspace
|
|
const isMoveOutsideWorkspace = isPathOutsideWorkspace(moveAbsolutePath)
|
|
if (isMoveOutsideWorkspace) {
|
|
task.consecutiveMistakeCount++
|
|
task.recordToolError("apply_patch")
|
|
const errorMessage = `Cannot move file to path outside workspace: ${change.movePath}`
|
|
await task.say("error", errorMessage)
|
|
pushToolResult(formatResponse.toolError(errorMessage))
|
|
await task.diffViewProvider.reset()
|
|
return
|
|
}
|
|
|
|
// Save new content to the new path
|
|
if (isPreventFocusDisruptionEnabled) {
|
|
await task.diffViewProvider.saveDirectly(
|
|
change.movePath,
|
|
newContent,
|
|
false,
|
|
diagnosticsEnabled,
|
|
writeDelayMs,
|
|
)
|
|
} else {
|
|
// Write to new path and delete old file
|
|
const parentDir = path.dirname(moveAbsolutePath)
|
|
await fs.mkdir(parentDir, { recursive: true })
|
|
await fs.writeFile(moveAbsolutePath, newContent, "utf8")
|
|
}
|
|
|
|
// Delete the original file
|
|
try {
|
|
await fs.unlink(absolutePath)
|
|
} catch (error) {
|
|
console.error(`Failed to delete original file after move: ${error}`)
|
|
}
|
|
|
|
await task.fileContextTracker.trackFileContext(change.movePath, "roo_edited" as RecordSource)
|
|
} else {
|
|
// Save changes to the same file
|
|
if (isPreventFocusDisruptionEnabled) {
|
|
await task.diffViewProvider.saveDirectly(relPath, newContent, false, diagnosticsEnabled, writeDelayMs)
|
|
} else {
|
|
await task.diffViewProvider.saveChanges(diagnosticsEnabled, writeDelayMs)
|
|
}
|
|
|
|
await task.fileContextTracker.trackFileContext(relPath, "roo_edited" as RecordSource)
|
|
}
|
|
|
|
task.didEditFile = true
|
|
|
|
const message = await task.diffViewProvider.pushToolWriteResult(task, task.cwd, false)
|
|
pushToolResult(message)
|
|
await task.diffViewProvider.reset()
|
|
task.processQueuedMessages()
|
|
}
|
|
|
|
override async handlePartial(task: Task, block: ToolUse<"apply_patch">): Promise<void> {
|
|
const patch: string | undefined = block.params.patch
|
|
const candidateRelPath = this.extractFirstPathFromPatch(patch)
|
|
const fallbackDisplayPath = path.basename(task.cwd) || "workspace"
|
|
const resolvedRelPath = candidateRelPath ?? ""
|
|
const absolutePath = path.resolve(task.cwd, resolvedRelPath)
|
|
const displayPath = candidateRelPath ? getReadablePath(task.cwd, candidateRelPath) : fallbackDisplayPath
|
|
|
|
let patchPreview: string | undefined
|
|
if (patch) {
|
|
// Show first few lines of the patch
|
|
const lines = patch.split("\n").slice(0, 5)
|
|
patchPreview = lines.join("\n") + (patch.split("\n").length > 5 ? "\n..." : "")
|
|
}
|
|
|
|
const sharedMessageProps: ClineSayTool = {
|
|
tool: "appliedDiff",
|
|
path: displayPath || path.basename(task.cwd) || "workspace",
|
|
diff: patchPreview || "Parsing patch...",
|
|
isOutsideWorkspace: isPathOutsideWorkspace(absolutePath),
|
|
}
|
|
|
|
await task.ask("tool", JSON.stringify(sharedMessageProps), block.partial).catch(() => {})
|
|
}
|
|
}
|
|
|
|
export const applyPatchTool = new ApplyPatchTool()
|