mirror of
https://github.com/Twigpine/zero.git
synced 2026-11-10 13:11:31 -10:00
* feat(tools): retain bounded structured file diffs * feat(acp): emit structured file changes in tool updates * fix(acp): harden structured file diff transport * fix(tools): reject unsafe rich diff previews * fix(acp): preserve safe rich diff semantics * fix(tools): bind structured diffs to committed changes * fix(acp): preserve structured diff identity * fix(tools): close rich diff race gaps * fix(tools): report partial patch paths from workspace * fix(tools): finalize structured diff evidence * fix(tools): separate unverified patch writes * test(tools): cover failed formatter recovery * fix(acp): serialize file deletions as nullable diffs * fix(tools): recreate files after formatter failure * test(acp): require nullable diff fields on wire
280 lines
12 KiB
Go
280 lines
12 KiB
Go
package tools
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"os"
|
|
"strings"
|
|
)
|
|
|
|
type editFileTool struct {
|
|
baseTool
|
|
workspaceRoot string
|
|
scope PathScope
|
|
}
|
|
|
|
func NewScopedEditFileTool(workspaceRoot string, scope PathScope) Tool {
|
|
return editFileTool{
|
|
baseTool: baseTool{
|
|
name: "edit_file",
|
|
description: "Replace an exact string in an existing file with uniqueness protection by default.",
|
|
parameters: Schema{
|
|
Type: "object",
|
|
Properties: map[string]PropertySchema{
|
|
"path": {Type: "string", Description: "Path of the file to edit."},
|
|
"old_string": {Type: "string", Description: "Exact string to replace. Must match byte-for-byte."},
|
|
"new_string": {Type: "string", Description: "Replacement string. May be empty."},
|
|
"replace_all": {Type: "boolean", Description: "Replace every occurrence instead of requiring uniqueness.", Default: false},
|
|
},
|
|
Required: []string{"path", "old_string", "new_string"},
|
|
AdditionalProperties: false,
|
|
},
|
|
safety: promptSafety(SideEffectWrite, "Edits files in place."),
|
|
capabilities: ToolCapabilities{Effect: EffectWorkspaceWrite, ThreadSafe: false, ResourceKeys: fileResourceKeys},
|
|
},
|
|
workspaceRoot: normalizeWorkspaceRoot(workspaceRoot),
|
|
scope: scope,
|
|
}
|
|
}
|
|
|
|
func (tool editFileTool) Run(ctx context.Context, args map[string]any) Result {
|
|
return tool.RunWithOptions(ctx, args, RunOptions{})
|
|
}
|
|
|
|
func (tool editFileTool) RunWithOptions(ctx context.Context, args map[string]any, options RunOptions) Result {
|
|
requestedPath, err := aliasedStringArg(args, []string{"path", "file", "file_path", "filename"}, "", true, false)
|
|
if err != nil {
|
|
return errorResult("Error: Invalid arguments for edit_file: " + err.Error())
|
|
}
|
|
oldString, err := aliasedStringArg(args, []string{"old_string", "old", "search", "find", "old_str"}, "", true, false)
|
|
if err != nil {
|
|
return errorResult("Error: Invalid arguments for edit_file: " + err.Error())
|
|
}
|
|
newString, err := aliasedStringArg(args, []string{"new_string", "new", "replace", "replacement", "new_str"}, "", true, true)
|
|
if err != nil {
|
|
return errorResult("Error: Invalid arguments for edit_file: " + err.Error())
|
|
}
|
|
replaceAll, err := boolArg(args, "replace_all", false)
|
|
if err != nil {
|
|
return errorResult("Error: Invalid arguments for edit_file: " + err.Error())
|
|
}
|
|
|
|
absolutePath, relativePath, err := resolveScopedPath(tool.workspaceRoot, tool.scope, requestedPath)
|
|
if err != nil {
|
|
return errorResult("Error reading " + requestedPath + ": " + err.Error())
|
|
}
|
|
contentBytes, err := os.ReadFile(absolutePath)
|
|
if err != nil {
|
|
return errorResult("Error reading " + relativePath + ": " + err.Error())
|
|
}
|
|
// Refuse to edit a file that changed on disk outside Zero since it was last
|
|
// read: the model's old_string was formed against a stale view, so applying it
|
|
// now could silently corrupt the newer content.
|
|
if cerr := options.FileTracker.CheckConflict(absolutePath, contentBytes); cerr != nil {
|
|
return errorResult(fileConflictMessage(relativePath))
|
|
}
|
|
if options.FileTracker != nil {
|
|
if _, tracked := options.FileTracker.Version(absolutePath); !tracked {
|
|
return errorResult(fileUnseenMessage(relativePath))
|
|
}
|
|
}
|
|
content := string(contentBytes)
|
|
priorInfo, err := os.Stat(absolutePath)
|
|
if err != nil {
|
|
return errorResult("Error reading " + relativePath + ": " + err.Error())
|
|
}
|
|
occurrences := strings.Count(content, oldString)
|
|
|
|
// CRLF fallback: read_file normalizes \r\n → \n before presenting content to
|
|
// the model, so the model's old_string will use \n line endings. When the raw
|
|
// file uses \r\n (common on Windows), the \n-based old_string won't match.
|
|
// Detect this and transparently normalize: if the direct match fails, translate
|
|
// old_string's line endings to \r\n and search again. If found, use the CRLF-translated
|
|
// old_string and new_string for the replacement to preserve the file's existing EOL style
|
|
// without rewriting EOLs in unrelated parts of the file.
|
|
if occurrences == 0 && strings.Contains(content, "\r\n") && !strings.Contains(oldString, "\r\n") {
|
|
crlfOldString := strings.ReplaceAll(oldString, "\n", "\r\n")
|
|
normalizedOccurrences := strings.Count(content, crlfOldString)
|
|
if normalizedOccurrences > 0 {
|
|
occurrences = normalizedOccurrences
|
|
oldString = crlfOldString
|
|
if !strings.Contains(newString, "\r\n") {
|
|
newString = strings.ReplaceAll(newString, "\n", "\r\n")
|
|
}
|
|
}
|
|
}
|
|
|
|
// Fuzzy fallback: when the exact string (and its CRLF translation) is absent,
|
|
// run a cascade of tolerant matchers (trimmed lines, collapsed whitespace,
|
|
// indentation drift, escape normalization) to locate the span the model
|
|
// intended. These transformations must preserve non-whitespace content; a
|
|
// merely similar interior is not safe to replace.
|
|
if occurrences == 0 {
|
|
findOld, findNew := oldString, newString
|
|
if strings.Contains(content, "\r\n") && !strings.Contains(findOld, "\r\n") {
|
|
findOld = strings.ReplaceAll(findOld, "\n", "\r\n")
|
|
findNew = strings.ReplaceAll(findNew, "\n", "\r\n")
|
|
}
|
|
search, ferr := fuzzyEditMatch(content, findOld, replaceAll)
|
|
switch {
|
|
case ferr == nil:
|
|
oldString = search
|
|
// The model's new_string was written at old_string's (mismatched)
|
|
// indentation; re-shape it to the span actually being replaced so a
|
|
// tolerant match never strips indentation or a trailing CR.
|
|
newString = adaptReplacementToSpan(search, findOld, findNew)
|
|
occurrences = strings.Count(content, search)
|
|
case errors.Is(ferr, errEditFuzzyAmbiguous):
|
|
return errorResult("Error: old_string matches multiple locations in " + relativePath + " even after fuzzy matching. Provide more surrounding context to make the match unique, or pass replace_all: true.")
|
|
case errors.Is(ferr, errEditFuzzyNotFound):
|
|
// Fall through to the exact-match error below.
|
|
default:
|
|
return errorResult("Error editing " + relativePath + ": " + ferr.Error())
|
|
}
|
|
}
|
|
|
|
if occurrences == 0 {
|
|
return errorResult("Error: Could not find the exact string to replace in " + relativePath + ". The old_string must match the file byte-for-byte.")
|
|
}
|
|
if !replaceAll && occurrences > 1 {
|
|
return errorResult(fmt.Sprintf("Error: old_string matches %d locations in %s. Either make old_string more specific, or pass replace_all: true to replace every occurrence.", occurrences, relativePath))
|
|
}
|
|
if options.FileTracker != nil && !allOccurrencesSeen(options.FileTracker, absolutePath, content, oldString, replaceAll) {
|
|
return errorResult(fileUnseenMessage(relativePath))
|
|
}
|
|
|
|
updated := strings.Replace(content, oldString, newString, 1)
|
|
replacedCount := 1
|
|
if replaceAll {
|
|
updated = strings.ReplaceAll(content, oldString, newString)
|
|
replacedCount = occurrences
|
|
}
|
|
if updated == content {
|
|
return okResult("No changes: new_string is identical to old_string.")
|
|
}
|
|
editedSpans := replacementByteSpans(content, oldString, newString, replaceAll)
|
|
if err := recheckScopedWriteTarget(tool.workspaceRoot, tool.scope, requestedPath); err != nil {
|
|
return errorResult("Error writing " + relativePath + ": " + err.Error())
|
|
}
|
|
if err := commitFileContents(absolutePath, priorInfo, &content, updated); err != nil {
|
|
return errorResult("Error writing " + relativePath + ": " + err.Error())
|
|
}
|
|
modelKnownContent := updated
|
|
// Optional format-on-write (ZERO_FORMAT_ON_WRITE). Must run BEFORE the
|
|
// FileTracker re-baseline: recording pre-format content would make the very
|
|
// next edit look like an external modification and trip the conflict guard.
|
|
formatting := maybeFormatWrittenFileScoped(ctx, tool.workspaceRoot, tool.scope, absolutePath, updated, priorInfo.Mode().Perm())
|
|
updated = formatting.Content
|
|
finalContentKnown := formatting.ContentKnown
|
|
// Re-baseline to the content we just wrote so subsequent edits in this session
|
|
// compare against the current on-disk state, not the pre-edit version.
|
|
newInfo := formatting.Info
|
|
if newInfo == nil {
|
|
newInfo, _ = os.Stat(absolutePath)
|
|
}
|
|
if !finalContentKnown {
|
|
options.FileTracker.Forget(absolutePath)
|
|
} else if updated == modelKnownContent {
|
|
// OUR edit, so we know precisely which lines moved: RecordEdit carries
|
|
// across the reads this edit did not disturb instead of dropping them.
|
|
//
|
|
// Record would drop all of them, and did — a file read in three pieces
|
|
// lost every piece to a single two-line edit, and the next six edits into
|
|
// regions that had been read were refused as unseen. See RecordEdit.
|
|
//
|
|
// This SUBSUMES the previouslySeenWhole special-case #956 added here.
|
|
// That branch re-recorded 1..total when the file had been read whole;
|
|
// RecordEdit does the same thing one level down (its seenWhole arm
|
|
// re-baselines as a single covering observation) and additionally keeps
|
|
// the partial reads the old else-branch discarded. Two copies of the
|
|
// rule would drift, and only one of them sees the pre-edit observation.
|
|
options.FileTracker.RecordEdit(absolutePath, []byte(content), []byte(updated), newInfo)
|
|
for _, span := range editedSpans {
|
|
options.FileTracker.RecordSeenBytes(absolutePath, span.start, span.end, len(updated))
|
|
}
|
|
} else {
|
|
// A formatter rewrote the file after us. We no longer know which line
|
|
// holds what was read, so the conservative drop is the right answer here.
|
|
options.FileTracker.Record(absolutePath, []byte(updated), newInfo)
|
|
}
|
|
|
|
suffix := ""
|
|
if replacedCount != 1 {
|
|
suffix = "s"
|
|
}
|
|
summary := fmt.Sprintf("Successfully edited %s (replaced %d occurrence%s).", relativePath, replacedCount, suffix)
|
|
summary += formatting.notice(relativePath)
|
|
if finalContentKnown {
|
|
summary += inlineDiagnostics(ctx, options, absolutePath, relativePath)
|
|
}
|
|
result := okResult(summary)
|
|
result.ChangedFiles = []string{relativePath}
|
|
if finalContentKnown {
|
|
if diff, ok := boundedFileDiff(absolutePath, content, updated, true, true); ok {
|
|
result.FileDiffs = []FileDiff{diff}
|
|
} else if diffTextRevealsObfuscatedSecret(content) || diffTextRevealsObfuscatedSecret(updated) {
|
|
result.Redacted = true
|
|
}
|
|
}
|
|
// Card-only preview (Display.Preview): the model's Output stays the one-line
|
|
// summary, so the red/green diff costs zero model tokens.
|
|
preview := ""
|
|
if finalContentKnown {
|
|
preview = boundedUnifiedDiff(relativePath, content, updated)
|
|
}
|
|
result.Display = Display{Summary: fmt.Sprintf("Edited %s", relativePath), Kind: "diff", Preview: preview}
|
|
return result
|
|
}
|
|
|
|
// replacementByteSpans returns every half-open post-edit byte range whose exact
|
|
// contents came from newString. Offsets are translated from the original with a
|
|
// cumulative delta so replace_all remains correct after earlier replacements.
|
|
func replacementByteSpans(content, oldString, newString string, replaceAll bool) []lineRange {
|
|
spans := make([]lineRange, 0, 1)
|
|
offset := 0
|
|
delta := 0
|
|
for {
|
|
index := strings.Index(content[offset:], oldString)
|
|
if index < 0 {
|
|
return spans
|
|
}
|
|
index += offset
|
|
start := index + delta
|
|
spans = append(spans, lineRange{start: start, end: start + len(newString)})
|
|
if !replaceAll {
|
|
return spans
|
|
}
|
|
offset = index + len(oldString)
|
|
delta += len(newString) - len(oldString)
|
|
}
|
|
}
|
|
|
|
func allOccurrencesSeen(tracker *FileTracker, path, content, oldString string, replaceAll bool) bool {
|
|
offset := 0
|
|
for {
|
|
index := strings.Index(content[offset:], oldString)
|
|
if index < 0 {
|
|
return true
|
|
}
|
|
index += offset
|
|
start, end := lineSpanForOffset(content, index, len(oldString))
|
|
if !tracker.SeenBytes(path, index, index+len(oldString)) && !tracker.SeenRange(path, start, end) {
|
|
return false
|
|
}
|
|
if !replaceAll {
|
|
return true
|
|
}
|
|
offset = index + len(oldString)
|
|
}
|
|
}
|
|
|
|
func lineSpanForOffset(content string, offset, length int) (int, int) {
|
|
if offset < 0 {
|
|
return 1, 1
|
|
}
|
|
start := strings.Count(content[:offset], "\n") + 1
|
|
end := start + strings.Count(content[offset:min(len(content), offset+length)], "\n")
|
|
return start, end
|
|
}
|