Move insert_content to a tool file #2095
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,161 @@ | ||
| import { getReadablePath } from "../../utils/path" | ||
| import { Cline } from "../Cline" | ||
| import { ToolUse } from "../assistant-message" | ||
| import { AskApproval, HandleError, PushToolResult, RemoveClosingTag } from "./types" | ||
| import { formatResponse } from "../prompts/responses" | ||
| import { ClineSayTool } from "../../shared/ExtensionMessage" | ||
| import path from "path" | ||
| import { fileExistsAtPath } from "../../utils/fs" | ||
| import { insertGroups } from "../diff/insert-groups" | ||
| import delay from "delay" | ||
| import fs from "fs/promises" | ||
|
|
||
| export async function insertContentTool( | ||
| cline: Cline, | ||
| block: ToolUse, | ||
| askApproval: AskApproval, | ||
| handleError: HandleError, | ||
| pushToolResult: PushToolResult, | ||
| removeClosingTag: RemoveClosingTag, | ||
| ) { | ||
| const relPath: string | undefined = block.params.path | ||
| const operations: string | undefined = block.params.operations | ||
|
|
||
| const sharedMessageProps: ClineSayTool = { | ||
| tool: "appliedDiff", | ||
| path: getReadablePath(cline.cwd, removeClosingTag("path", relPath)), | ||
| } | ||
|
|
||
| try { | ||
| if (block.partial) { | ||
| const partialMessage = JSON.stringify(sharedMessageProps) | ||
| await cline.ask("tool", partialMessage, block.partial).catch(() => {}) | ||
| return | ||
| } | ||
|
|
||
| // Validate required parameters | ||
| if (!relPath) { | ||
| cline.consecutiveMistakeCount++ | ||
| pushToolResult(await cline.sayAndCreateMissingParamError("insert_content", "path")) | ||
| return | ||
| } | ||
|
|
||
| if (!operations) { | ||
| cline.consecutiveMistakeCount++ | ||
| pushToolResult(await cline.sayAndCreateMissingParamError("insert_content", "operations")) | ||
| return | ||
| } | ||
|
|
||
| const absolutePath = path.resolve(cline.cwd, relPath) | ||
| const fileExists = await fileExistsAtPath(absolutePath) | ||
|
|
||
| if (!fileExists) { | ||
| cline.consecutiveMistakeCount++ | ||
| const formattedError = `File does not exist at path: ${absolutePath}\n\n<error_details>\nThe specified file could not be found. Please verify the file path and try again.\n</error_details>` | ||
| await cline.say("error", formattedError) | ||
| pushToolResult(formattedError) | ||
| return | ||
| } | ||
|
|
||
| let parsedOperations: Array<{ | ||
| start_line: number | ||
| content: string | ||
| }> | ||
|
|
||
| try { | ||
| parsedOperations = JSON.parse(operations) | ||
| if (!Array.isArray(parsedOperations)) { | ||
| throw new Error("Operations must be an array") | ||
| } | ||
| } catch (error) { | ||
| cline.consecutiveMistakeCount++ | ||
| await cline.say("error", `Failed to parse operations JSON: ${error.message}`) | ||
| pushToolResult(formatResponse.toolError("Invalid operations JSON format")) | ||
| return | ||
| } | ||
|
|
||
| cline.consecutiveMistakeCount = 0 | ||
|
|
||
| // Read the file | ||
| const fileContent = await fs.readFile(absolutePath, "utf8") | ||
| cline.diffViewProvider.editType = "modify" | ||
| cline.diffViewProvider.originalContent = fileContent | ||
| const lines = fileContent.split("\n") | ||
|
|
||
| const updatedContent = insertGroups( | ||
| lines, | ||
| parsedOperations.map((elem) => { | ||
| return { | ||
| index: elem.start_line - 1, | ||
| elements: elem.content.split("\n"), | ||
| } | ||
| }), | ||
| ).join("\n") | ||
|
|
||
| // Show changes in diff view | ||
| if (!cline.diffViewProvider.isEditing) { | ||
| await cline.ask("tool", JSON.stringify(sharedMessageProps), true).catch(() => {}) | ||
| // First open with original content | ||
| await cline.diffViewProvider.open(relPath) | ||
| await cline.diffViewProvider.update(fileContent, false) | ||
| cline.diffViewProvider.scrollToFirstDiff() | ||
| await delay(200) | ||
| } | ||
|
|
||
| const diff = formatResponse.createPrettyPatch(relPath, fileContent, updatedContent) | ||
|
|
||
| if (!diff) { | ||
| pushToolResult(`No changes needed for '${relPath}'`) | ||
| return | ||
| } | ||
|
|
||
| await cline.diffViewProvider.update(updatedContent, true) | ||
|
|
||
| const completeMessage = JSON.stringify({ | ||
| ...sharedMessageProps, | ||
| diff, | ||
| } satisfies ClineSayTool) | ||
|
|
||
| const didApprove = await cline | ||
| .ask("tool", completeMessage, false) | ||
| .then((response) => response.response === "yesButtonClicked") | ||
|
|
||
| if (!didApprove) { | ||
| await cline.diffViewProvider.revertChanges() | ||
| pushToolResult("Changes were rejected by the user.") | ||
| return | ||
| } | ||
|
|
||
| const { newProblemsMessage, userEdits, finalContent } = await cline.diffViewProvider.saveChanges() | ||
| cline.didEditFile = true | ||
|
|
||
| if (!userEdits) { | ||
| pushToolResult(`The content was successfully inserted in ${relPath.toPosix()}.${newProblemsMessage}`) | ||
|
Contributor
There was a problem hiding this comment. It looks like you are calling |
||
| await cline.diffViewProvider.reset() | ||
| return | ||
| } | ||
|
|
||
| const userFeedbackDiff = JSON.stringify({ | ||
| tool: "appliedDiff", | ||
| path: getReadablePath(cline.cwd, relPath), | ||
| diff: userEdits, | ||
| } satisfies ClineSayTool) | ||
|
|
||
| console.debug("[DEBUG] User made edits, sending feedback diff:", userFeedbackDiff) | ||
| await cline.say("user_feedback_diff", userFeedbackDiff) | ||
| pushToolResult( | ||
| `The user made the following updates to your content:\n\n${userEdits}\n\n` + | ||
| `The updated content, which includes both your original modifications and the user's edits, has been successfully saved to ${relPath.toPosix()}. Here is the full, updated content of the file:\n\n` + | ||
| `<final_file_content path="${relPath.toPosix()}">\n${finalContent}\n</final_file_content>\n\n` + | ||
| `Please note:\n` + | ||
| `1. You do not need to re-write the file with these changes, as they have already been applied.\n` + | ||
| `2. Proceed with the task using cline updated file content as the new baseline.\n` + | ||
| `3. If the user's edits have addressed part of the task or changed the requirements, adjust your approach accordingly.` + | ||
| `${newProblemsMessage}`, | ||
| ) | ||
| await cline.diffViewProvider.reset() | ||
| } catch (error) { | ||
| handleError("insert content", error) | ||
| await cline.diffViewProvider.reset() | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Consider validating each parsed operation's
start_lineto ensure it is a positive integer. Subtracting 1 without validation might lead to negative indices if an unexpected value is provided.