diff --git a/CHANGELOG.md b/CHANGELOG.md index 43e74d4..66e2d61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Roo Cline Changelog +## [2.1.12] + +- Incorporate JoziGila's [PR](https://github.com/cline/cline/pull/158) to add support for editing through diffs + ## [2.1.11] - Incorporate lloydchang's [PR](https://github.com/RooVetGit/Roo-Cline/pull/42) to add support for OpenRouter compression diff --git a/package-lock.json b/package-lock.json index ef69d5c..616c474 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "roo-cline", - "version": "2.1.11", + "version": "2.1.12", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "roo-cline", - "version": "2.1.11", + "version": "2.1.12", "dependencies": { "@anthropic-ai/bedrock-sdk": "^0.10.2", "@anthropic-ai/sdk": "^0.26.0", diff --git a/package.json b/package.json index 36474fd..d0346eb 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "displayName": "Roo Cline", "description": "A fork of Cline, an autonomous coding agent, with some added experimental configuration and automation features.", "publisher": "RooVeterinaryInc", - "version": "2.1.11", + "version": "2.1.12", "icon": "assets/icons/rocket.png", "galleryBanner": { "color": "#617A91", diff --git a/src/core/Cline.ts b/src/core/Cline.ts index 886f835..bf45f7f 100644 --- a/src/core/Cline.ts +++ b/src/core/Cline.ts @@ -1,4 +1,5 @@ import { Anthropic } from "@anthropic-ai/sdk" +import * as diff from "diff" import cloneDeep from "clone-deep" import delay from "delay" import fs from "fs/promises" @@ -64,6 +65,7 @@ export class Cline { private browserSession: BrowserSession private didEditFile: boolean = false customInstructions?: string + diffEnabled?: boolean apiConversationHistory: Anthropic.MessageParam[] = [] clineMessages: ClineMessage[] = [] @@ -93,6 +95,7 @@ export class Cline { provider: ClineProvider, apiConfiguration: ApiConfiguration, customInstructions?: string, + diffEnabled?: boolean, task?: string, images?: string[], historyItem?: HistoryItem, @@ -104,7 +107,7 @@ export class Cline { this.browserSession = new BrowserSession(provider.context) this.diffViewProvider = new DiffViewProvider(cwd) this.customInstructions = customInstructions - + this.diffEnabled = diffEnabled if (historyItem) { this.taskId = historyItem.id this.resumeTaskFromHistory() @@ -749,7 +752,7 @@ export class Cline { } async *attemptApiRequest(previousApiReqIndex: number): ApiStream { - const systemPrompt = await SYSTEM_PROMPT(cwd, this.api.getModel().info.supportsComputerUse ?? false) + await addCustomInstructions(this.customInstructions ?? '', cwd) + const systemPrompt = await SYSTEM_PROMPT(cwd, this.api.getModel().info.supportsComputerUse ?? false, !!this.diffEnabled) + await addCustomInstructions(this.customInstructions ?? '', cwd) // If the previous API request's total token usage is close to the context window, truncate the conversation history to free up space for the new request if (previousApiReqIndex >= 0) { @@ -876,6 +879,8 @@ export class Cline { return `[${block.name} for '${block.params.path}']` case "write_to_file": return `[${block.name} for '${block.params.path}']` + case "apply_diff": + return `[${block.name} for '${block.params.path}']` case "search_files": return `[${block.name} for '${block.params.regex}'${ block.params.file_pattern ? ` in '${block.params.file_pattern}'` : "" @@ -1150,6 +1155,95 @@ export class Cline { break } } + case "apply_diff": { + const relPath: string | undefined = block.params.path + const diffContent: string | undefined = block.params.diff + + const sharedMessageProps: ClineSayTool = { + tool: "appliedDiff", + path: getReadablePath(cwd, removeClosingTag("path", relPath)), + } + + try { + if (block.partial) { + // update gui message + const partialMessage = JSON.stringify(sharedMessageProps) + await this.ask("tool", partialMessage, block.partial).catch(() => {}) + break + } else { + if (!relPath) { + this.consecutiveMistakeCount++ + pushToolResult(await this.sayAndCreateMissingParamError("apply_diff", "path")) + break + } + if (!diffContent) { + this.consecutiveMistakeCount++ + pushToolResult(await this.sayAndCreateMissingParamError("apply_diff", "diff")) + break + } + this.consecutiveMistakeCount = 0 + + const absolutePath = path.resolve(cwd, relPath) + const fileExists = await fileExistsAtPath(absolutePath) + + if (!fileExists) { + await this.say("error", `File does not exist at path: ${absolutePath}`) + pushToolResult(`Error: File does not exist at path: ${absolutePath}`) + break + } + + const originalContent = await fs.readFile(absolutePath, "utf-8") + + // Apply the diff to the original content + let newContent = diff.applyPatch(originalContent, diffContent) as string | false + if (newContent === false) { + await this.say("error", `Error applying diff to file: ${absolutePath}`) + pushToolResult(`Error applying diff to file: ${absolutePath}`) + break + } + + // Create a diff for display purposes + const diffRepresentation = diff + .diffLines(originalContent, newContent) + .map((part) => { + const prefix = part.added ? "+" : part.removed ? "-" : " " + return (part.value || "") + .split("\n") + .map((line) => (line ? prefix + line : "")) + .join("\n") + }) + .join("") + + // Show diff view before asking for approval + this.diffViewProvider.editType = "modify" + await this.diffViewProvider.open(relPath); + await this.diffViewProvider.update(newContent, true); + await this.diffViewProvider.scrollToFirstDiff(); + + const completeMessage = JSON.stringify({ + ...sharedMessageProps, + diff: diffRepresentation, + } satisfies ClineSayTool) + + const didApprove = await askApproval("tool", completeMessage) + if (!didApprove) { + await this.diffViewProvider.revertChanges() // This likely handles closing the diff view + break + } + + await fs.writeFile(absolutePath, newContent) + await vscode.window.showTextDocument(vscode.Uri.file(absolutePath), { preview: false }) + await this.diffViewProvider.reset() + + pushToolResult(`Changes successfully applied to ${relPath.toPosix()}:\n\n${diffRepresentation}`) + break + } + } catch (error) { + await handleError("applying diff", error) + await this.diffViewProvider.reset() + break + } + } case "read_file": { const relPath: string | undefined = block.params.path const sharedMessageProps: ClineSayTool = { diff --git a/src/core/__tests__/Cline.test.ts b/src/core/__tests__/Cline.test.ts index 65e595c..e7e2fe6 100644 --- a/src/core/__tests__/Cline.test.ts +++ b/src/core/__tests__/Cline.test.ts @@ -236,6 +236,7 @@ describe('Cline', () => { mockProvider, mockApiConfig, 'custom instructions', + false, 'test task' ); diff --git a/src/core/assistant-message/index.ts b/src/core/assistant-message/index.ts index 32c50ae..de311a2 100644 --- a/src/core/assistant-message/index.ts +++ b/src/core/assistant-message/index.ts @@ -12,6 +12,7 @@ export const toolUseNames = [ "execute_command", "read_file", "write_to_file", + "apply_diff", "search_files", "list_files", "list_code_definition_names", @@ -36,6 +37,7 @@ export const toolParamNames = [ "text", "question", "result", + "diff", ] as const export type ToolParamName = (typeof toolParamNames)[number] diff --git a/src/core/prompts/system.ts b/src/core/prompts/system.ts index 5f57142..2d07d79 100644 --- a/src/core/prompts/system.ts +++ b/src/core/prompts/system.ts @@ -7,6 +7,7 @@ import path from 'path' export const SYSTEM_PROMPT = async ( cwd: string, supportsComputerUse: boolean, + diffEnabled: boolean ) => `You are Cline, a highly skilled software engineer with extensive knowledge in many programming languages, frameworks, design patterns, and best practices. ==== @@ -54,7 +55,7 @@ Usage: ## write_to_file -Description: Request to write content to a file at the specified path. If the file exists, it will be overwritten with the provided content. If the file doesn't exist, it will be created. This tool will automatically create any directories needed to write the file. +Description: Request to write full content to a file at the specified path. If the file exists, it will be overwritten with the provided content. If the file doesn't exist, it will be created. This tool will automatically create any directories needed to write the file. Parameters: - path: (required) The path of the file to write to (relative to the current working directory ${cwd.toPosix()}) - content: (required) The content to write to the file. ALWAYS provide the COMPLETE intended content of the file, without any truncation or omissions. You MUST include ALL parts of the file, even if they haven't been modified. @@ -66,6 +67,22 @@ Your file content here +${diffEnabled ? ` +## apply_diff +Description: Apply a diff to a file at the specified path. The diff should be in unified format (diff -u) and can be used to apply changes to a file. This tool is useful when you need to make specific modifications to a file based on a set of changes provided in a diff. +Parameters: +- path: (required) The path of the file to apply the diff to (relative to the current working directory ${cwd.toPosix()}) +- diff: (required) The diff in unified format (diff -u) to apply to the file. +Usage: + +File path here + +Your diff here + +` + : "" +} + ## search_files Description: Request to perform a regex search across files in a specified directory, providing context-rich results. This tool searches for patterns or specific content across multiple files, displaying each match with encapsulating context. Parameters: @@ -221,7 +238,7 @@ CAPABILITIES - When the user initially gives you a task, a recursive list of all filepaths in the current working directory ('${cwd.toPosix()}') will be included in environment_details. This provides an overview of the project's file structure, offering key insights into the project from directory/file names (how developers conceptualize and organize their code) and file extensions (the language used). This can also guide decision-making on which files to explore further. If you need to further explore directories such as outside the current working directory, you can use the list_files tool. If you pass 'true' for the recursive parameter, it will list files recursively. Otherwise, it will list files at the top level, which is better suited for generic directories where you don't necessarily need the nested structure, like the Desktop. - You can use search_files to perform regex searches across files in a specified directory, outputting context-rich results that include surrounding lines. This is particularly useful for understanding code patterns, finding specific implementations, or identifying areas that need refactoring. - You can use the list_code_definition_names tool to get an overview of source code definitions for all files at the top level of a specified directory. This can be particularly useful when you need to understand the broader context and relationships between certain parts of the code. You may need to call this tool multiple times to understand various parts of the codebase related to the task. - - For example, when asked to make edits or improvements you might analyze the file structure in the initial environment_details to get an overview of the project, then use list_code_definition_names to get further insight using source code definitions for files located in relevant directories, then read_file to examine the contents of relevant files, analyze the code and suggest improvements or make necessary edits, then use the write_to_file tool to implement changes. If you refactored code that could affect other parts of the codebase, you could use search_files to ensure you update other files as needed. + - For example, when asked to make edits or improvements you might analyze the file structure in the initial environment_details to get an overview of the project, then use list_code_definition_names to get further insight using source code definitions for files located in relevant directories, then read_file to examine the contents of relevant files, analyze the code and suggest improvements or make necessary edits, then use the write_to_file ${diffEnabled ? "or apply_diff " : ""}tool to apply the changes. If you refactored code that could affect other parts of the codebase, you could use search_files to ensure you update other files as needed. - You can use the execute_command tool to run commands on the user's computer whenever you feel it can help accomplish the user's task. When you need to execute a CLI command, you must provide a clear explanation of what the command does. Prefer to execute complex CLI commands over creating executable scripts, since they are more flexible and easier to run. Interactive and long-running commands are allowed, since the commands are run in the user's VSCode terminal. The user may keep commands running in the background and you will be kept updated on their status along the way. Each command you execute is run in a new terminal instance.${ supportsComputerUse ? "\n- You can use the browser_action tool to interact with websites (including html files and locally running development servers) through a Puppeteer-controlled browser when you feel it is necessary in accomplishing the user's task. This tool is particularly useful for web development tasks as it allows you to launch a browser, navigate to pages, interact with elements through clicks and keyboard input, and capture the results through screenshots and console logs. This tool may be useful at key stages of web development tasks-such as after implementing new features, making substantial changes, when troubleshooting issues, or to verify the result of your work. You can analyze the provided screenshots to ensure correct rendering or identify errors, and review console logs for runtime issues.\n - For example, if asked to add a component to a react website, you might create the necessary files, use execute_command to run the site locally, then use browser_action to launch the browser, navigate to the local server, and verify the component renders & functions correctly before closing the browser." @@ -238,6 +255,7 @@ RULES - Before using the execute_command tool, you must first think about the SYSTEM INFORMATION context provided to understand the user's environment and tailor your commands to ensure they are compatible with their system. You must also consider if the command you need to run should be executed in a specific directory outside of the current working directory '${cwd.toPosix()}', and if so prepend with \`cd\`'ing into that directory && then executing the command (as one command since you are stuck operating from '${cwd.toPosix()}'). For example, if you needed to run \`npm install\` in a project outside of '${cwd.toPosix()}', you would need to prepend with a \`cd\` i.e. pseudocode for this would be \`cd (path to project) && (command, in this case npm install)\`. - When using the search_files tool, craft your regex patterns carefully to balance specificity and flexibility. Based on the user's task you may use it to find code patterns, TODO comments, function definitions, or any text-based information across the project. The results include context, so analyze the surrounding code to better understand the matches. Leverage the search_files tool in combination with other tools for more comprehensive analysis. For example, use it to find specific code patterns, then use read_file to examine the full context of interesting matches before using write_to_file to make informed changes. - When creating a new project (such as an app, website, or any software project), organize all new files within a dedicated project directory unless the user specifies otherwise. Use appropriate file paths when writing files, as the write_to_file tool will automatically create any necessary directories. Structure the project logically, adhering to best practices for the specific type of project being created. Unless otherwise specified, new projects should be easily run without additional setup, for example most projects can be built in HTML, CSS, and JavaScript - which you can open in a browser. +${diffEnabled ? "- Prefer to use apply_diff over write_to_file when making changes to existing files, particularly when editing files more than 200 lines of code, as it allows you to apply specific modifications based on a set of changes provided in a diff. This is particularly useful when you need to make targeted edits or updates to a file without overwriting the entire content." : ""} - Be sure to consider the type of project (e.g. Python, JavaScript, web application) when determining the appropriate structure and files to include. Also consider what files may be most relevant to accomplishing the task, for example looking at a project's manifest file would help you understand the project's dependencies, which you could incorporate into any code you write. - When making changes to code, always consider the context in which the code is being used. Ensure that your changes are compatible with the existing codebase and that they follow the project's coding standards and best practices. - When you want to modify a file, use the write_to_file tool directly with the desired content. You do not need to display the content before using the tool. diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts index ca730bb..f846479 100644 --- a/src/core/webview/ClineProvider.ts +++ b/src/core/webview/ClineProvider.ts @@ -64,6 +64,7 @@ type GlobalStateKey = | "openRouterUseMiddleOutTransform" | "allowedCommands" | "soundEnabled" + | "diffEnabled" export const GlobalFileNames = { apiConversationHistory: "api_conversation_history.json", @@ -201,12 +202,14 @@ export class ClineProvider implements vscode.WebviewViewProvider { const { apiConfiguration, customInstructions, + diffEnabled, } = await this.getState() this.cline = new Cline( this, apiConfiguration, customInstructions, + diffEnabled, task, images ) @@ -217,12 +220,14 @@ export class ClineProvider implements vscode.WebviewViewProvider { const { apiConfiguration, customInstructions, + diffEnabled, } = await this.getState() this.cline = new Cline( this, apiConfiguration, customInstructions, + diffEnabled, undefined, undefined, historyItem, @@ -532,9 +537,13 @@ export class ClineProvider implements vscode.WebviewViewProvider { } break case "soundEnabled": - const enabled = message.bool ?? true - await this.updateGlobalState("soundEnabled", enabled) - setSoundEnabled(enabled) + const soundEnabled = message.bool ?? true + await this.updateGlobalState("soundEnabled", soundEnabled) + await this.postStateToWebview() + break + case "diffEnabled": + const diffEnabled = message.bool ?? true + await this.updateGlobalState("diffEnabled", diffEnabled) await this.postStateToWebview() break } @@ -843,6 +852,7 @@ export class ClineProvider implements vscode.WebviewViewProvider { alwaysAllowExecute, alwaysAllowBrowser, soundEnabled, + diffEnabled, taskHistory, } = await this.getState() @@ -863,7 +873,8 @@ export class ClineProvider implements vscode.WebviewViewProvider { taskHistory: (taskHistory || []) .filter((item) => item.ts && item.task) .sort((a, b) => b.ts - a.ts), - soundEnabled: soundEnabled ?? true, + soundEnabled: soundEnabled ?? false, + diffEnabled: diffEnabled ?? false, shouldShowAnnouncement: lastShownAnnouncementId !== this.latestAnnouncementId, allowedCommands, } @@ -956,6 +967,7 @@ export class ClineProvider implements vscode.WebviewViewProvider { taskHistory, allowedCommands, soundEnabled, + diffEnabled, ] = await Promise.all([ this.getGlobalState("apiProvider") as Promise, this.getGlobalState("apiModelId") as Promise, @@ -991,6 +1003,7 @@ export class ClineProvider implements vscode.WebviewViewProvider { this.getGlobalState("taskHistory") as Promise, this.getGlobalState("allowedCommands") as Promise, this.getGlobalState("soundEnabled") as Promise, + this.getGlobalState("diffEnabled") as Promise, ]) let apiProvider: ApiProvider @@ -1044,6 +1057,7 @@ export class ClineProvider implements vscode.WebviewViewProvider { taskHistory, allowedCommands, soundEnabled, + diffEnabled, } } diff --git a/src/core/webview/__tests__/ClineProvider.test.ts b/src/core/webview/__tests__/ClineProvider.test.ts index 80af419..240cf0c 100644 --- a/src/core/webview/__tests__/ClineProvider.test.ts +++ b/src/core/webview/__tests__/ClineProvider.test.ts @@ -181,7 +181,8 @@ describe('ClineProvider', () => { alwaysAllowExecute: false, alwaysAllowBrowser: false, uriScheme: 'vscode', - soundEnabled: true + soundEnabled: false, + diffEnabled: false } const message: ExtensionMessage = { @@ -230,5 +231,6 @@ describe('ClineProvider', () => { expect(state).toHaveProperty('alwaysAllowBrowser') expect(state).toHaveProperty('taskHistory') expect(state).toHaveProperty('soundEnabled') + expect(state).toHaveProperty('diffEnabled') }) }) diff --git a/src/shared/ExtensionMessage.ts b/src/shared/ExtensionMessage.ts index 962be26..f993728 100644 --- a/src/shared/ExtensionMessage.ts +++ b/src/shared/ExtensionMessage.ts @@ -42,6 +42,7 @@ export interface ExtensionState { uriScheme?: string allowedCommands?: string[] soundEnabled?: boolean + diffEnabled?: boolean } export interface ClineMessage { @@ -86,6 +87,7 @@ export type ClineSay = export interface ClineSayTool { tool: | "editedExistingFile" + | "appliedDiff" | "newFileCreated" | "readFile" | "listFilesTopLevel" diff --git a/src/shared/WebviewMessage.ts b/src/shared/WebviewMessage.ts index 69f1c17..31b40fc 100644 --- a/src/shared/WebviewMessage.ts +++ b/src/shared/WebviewMessage.ts @@ -31,6 +31,7 @@ export interface WebviewMessage { | "alwaysAllowBrowser" | "playSound" | "soundEnabled" + | "diffEnabled" text?: string askResponse?: ClineAskResponse apiConfiguration?: ApiConfiguration diff --git a/webview-ui/src/components/chat/ChatRow.tsx b/webview-ui/src/components/chat/ChatRow.tsx index 9d0063f..1314b8e 100644 --- a/webview-ui/src/components/chat/ChatRow.tsx +++ b/webview-ui/src/components/chat/ChatRow.tsx @@ -213,10 +213,11 @@ export const ChatRowContent = ({ switch (tool.tool) { case "editedExistingFile": + case "appliedDiff": return ( <>
- {toolIcon("edit")} + {toolIcon(tool.tool === "appliedDiff" ? "diff" : "edit")} Cline wants to edit this file:
{ setAlwaysAllowBrowser, soundEnabled, setSoundEnabled, + diffEnabled, + setDiffEnabled, openRouterModels, setAllowedCommands, allowedCommands, @@ -50,6 +52,7 @@ const SettingsView = ({ onDone }: SettingsViewProps) => { vscode.postMessage({ type: "alwaysAllowBrowser", bool: alwaysAllowBrowser }) vscode.postMessage({ type: "allowedCommands", commands: allowedCommands ?? [] }) vscode.postMessage({ type: "soundEnabled", bool: soundEnabled }) + vscode.postMessage({ type: "diffEnabled", bool: diffEnabled }) onDone() } } @@ -288,6 +291,20 @@ const SettingsView = ({ onDone }: SettingsViewProps) => { )} +
+ setDiffEnabled(e.target.checked)}> + Enable editing through diffs + +

+ When enabled, Cline will be able to apply diffs to make changes to files. +

+
+
setSoundEnabled(e.target.checked)}> Enable sound effects diff --git a/webview-ui/src/context/ExtensionStateContext.tsx b/webview-ui/src/context/ExtensionStateContext.tsx index 0a35d7a..7843963 100644 --- a/webview-ui/src/context/ExtensionStateContext.tsx +++ b/webview-ui/src/context/ExtensionStateContext.tsx @@ -26,6 +26,7 @@ export interface ExtensionStateContextType extends ExtensionState { setShowAnnouncement: (value: boolean) => void setAllowedCommands: (value: string[]) => void setSoundEnabled: (value: boolean) => void + setDiffEnabled: (value: boolean) => void } const ExtensionStateContext = createContext(undefined) @@ -38,6 +39,7 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode shouldShowAnnouncement: false, allowedCommands: [], soundEnabled: false, + diffEnabled: false, }) const [didHydrateState, setDidHydrateState] = useState(false) const [showWelcome, setShowWelcome] = useState(false) @@ -127,6 +129,7 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode setShowAnnouncement: (value) => setState((prevState) => ({ ...prevState, shouldShowAnnouncement: value })), setAllowedCommands: (value) => setState((prevState) => ({ ...prevState, allowedCommands: value })), setSoundEnabled: (value) => setState((prevState) => ({ ...prevState, soundEnabled: value })), + setDiffEnabled: (value) => setState((prevState) => ({ ...prevState, diffEnabled: value })), } return {children}