Ground explicit file edits in real file contents #34
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
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,165 @@ | ||
| package engine | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
| "os" | ||
| "path/filepath" | ||
| "regexp" | ||
| "slices" | ||
| "strings" | ||
|
|
||
| "github.com/CoreyRDean/intent/internal/model" | ||
| ) | ||
|
|
||
| type toolCallRecord struct { | ||
| Name string | ||
| Arguments json.RawMessage | ||
| } | ||
|
|
||
| var ( | ||
| fileEditVerbPattern = regexp.MustCompile(`(?i)\b(modify|edit|update|rewrite|replace|append|prepend|insert|remove|delete|change)\b`) | ||
| pathTokenPattern = regexp.MustCompile(`(?:^|[\s"'` + "`" + `])((?:~|\.{1,2}|/)[^\s"'` + "`" + `,;:()]+|(?:\.[A-Za-z0-9_-]+)|(?:[A-Za-z0-9._-]+\.[A-Za-z0-9._-]+))`) | ||
| ) | ||
|
|
||
| func needsFileGrounding(prompt string, resp *model.Response, calls []toolCallRecord, cwd string) ([]string, bool) { | ||
| if resp == nil { | ||
| return nil, false | ||
| } | ||
| if resp.Approach != model.ApproachCommand && resp.Approach != model.ApproachScript { | ||
| return nil, false | ||
| } | ||
| targets := explicitEditTargets(prompt) | ||
| if len(targets) == 0 { | ||
| return nil, false | ||
| } | ||
| grounded := groundedTargets(calls, targets, cwd) | ||
| missing := make([]string, 0, len(targets)) | ||
| for _, target := range targets { | ||
| if !grounded[target] { | ||
| missing = append(missing, target) | ||
| } | ||
| } | ||
| return missing, len(missing) > 0 | ||
| } | ||
|
|
||
| func explicitEditTargets(prompt string) []string { | ||
| if !fileEditVerbPattern.MatchString(prompt) { | ||
| return nil | ||
| } | ||
| matches := pathTokenPattern.FindAllStringSubmatch(prompt, -1) | ||
| if len(matches) == 0 { | ||
| return nil | ||
| } | ||
| seen := map[string]struct{}{} | ||
| out := make([]string, 0, len(matches)) | ||
| for _, match := range matches { | ||
| if len(match) < 2 { | ||
| continue | ||
| } | ||
| token := cleanPathToken(match[1]) | ||
| if token == "" || looksLikeNonPathToken(token) { | ||
| continue | ||
| } | ||
| if _, ok := seen[token]; ok { | ||
| continue | ||
| } | ||
| seen[token] = struct{}{} | ||
| out = append(out, token) | ||
| } | ||
| return out | ||
| } | ||
|
|
||
| func groundedTargets(calls []toolCallRecord, targets []string, cwd string) map[string]bool { | ||
| grounded := make(map[string]bool, len(targets)) | ||
| home, _ := os.UserHomeDir() | ||
| for _, call := range calls { | ||
| if call.Name != "read_file" { | ||
| continue | ||
| } | ||
| var args struct { | ||
| Path string `json:"path"` | ||
| } | ||
| if err := json.Unmarshal(call.Arguments, &args); err != nil || strings.TrimSpace(args.Path) == "" { | ||
| continue | ||
| } | ||
| for _, target := range targets { | ||
| if targetMatchesReadPath(target, args.Path, cwd, home) { | ||
|
Comment on lines
+83
to
+87
There was a problem hiding this comment.
A target is considered grounded solely from Useful? React with 👍 / 👎. |
||
| grounded[target] = true | ||
| } | ||
| } | ||
| } | ||
| return grounded | ||
| } | ||
|
|
||
| func targetMatchesReadPath(target string, readPath string, cwd string, home string) bool { | ||
| target = cleanPathToken(target) | ||
| readPath = cleanPathToken(readPath) | ||
| if target == "" || readPath == "" { | ||
| return false | ||
| } | ||
| normTarget := normalizePathForMatch(target, cwd, home) | ||
| normRead := normalizePathForMatch(readPath, cwd, home) | ||
| if normTarget != "" && normRead != "" && normTarget == normRead { | ||
| return true | ||
| } | ||
| // Bare filenames and dotfiles are ambiguous about cwd vs home, so fall | ||
| // back to basename equality when the user named a single file token. | ||
| if !strings.Contains(target, "/") { | ||
| return filepath.Base(readPath) == target | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| func normalizePathForMatch(p string, cwd string, home string) string { | ||
| switch { | ||
| case p == "": | ||
| return "" | ||
| case strings.HasPrefix(p, "~/"): | ||
| if home == "" { | ||
| return filepath.Clean(p) | ||
| } | ||
| return filepath.Clean(filepath.Join(home, strings.TrimPrefix(p, "~/"))) | ||
| case filepath.IsAbs(p): | ||
| return filepath.Clean(p) | ||
| case strings.HasPrefix(p, "./"), strings.HasPrefix(p, "../"): | ||
| if cwd == "" { | ||
| return filepath.Clean(p) | ||
| } | ||
| return filepath.Clean(filepath.Join(cwd, p)) | ||
| default: | ||
| return filepath.Clean(p) | ||
| } | ||
| } | ||
|
|
||
| func buildFileGroundingRepairMessage(targets []string) string { | ||
| list := strings.Join(targets, ", ") | ||
| return fmt.Sprintf( | ||
| "You returned a command or script for a file-edit request without first reading the target file(s): %s. This is invalid. Your next response MUST be approach=tool_call with read_file on each missing target (resolve ~ or env vars first if needed), or approach=clarify/refuse if the file cannot be read. Do not emit pseudocode or a non-mutating snippet.", | ||
| list, | ||
| ) | ||
| } | ||
|
|
||
| func buildFileGroundingRefusal(targets []string) *model.Response { | ||
| list := strings.Join(targets, ", ") | ||
| return &model.Response{ | ||
| IntentSummary: "Refused: file edit was not grounded in the target file contents.", | ||
| Approach: model.ApproachRefuse, | ||
| RefusalReason: fmt.Sprintf("intent could not ground the requested edit in the current contents of %s; rerun with a readable path or narrower request", list), | ||
| } | ||
| } | ||
|
|
||
| func cleanPathToken(token string) string { | ||
| token = strings.TrimSpace(token) | ||
| token = strings.Trim(token, `"'`+"`") | ||
| token = strings.TrimRight(token, ".,;:!?)]}") | ||
| token = strings.TrimLeft(token, "([{") | ||
| return token | ||
| } | ||
|
|
||
| func looksLikeNonPathToken(token string) bool { | ||
| if token == "" || strings.HasPrefix(token, "--") || strings.Contains(token, "://") { | ||
| return true | ||
| } | ||
| return slices.Contains([]string{"safe", "network", "mutates", "destructive", "sudo"}, strings.ToLower(token)) | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
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.
The file-target regex treats any dotted token as a path, so prompts like “update Node to 20.11.1” or “update to v1.2” will be classified as explicit file edits and trigger
read_filerepair/refusal even when no file path was requested. BecauseneedsFileGroundingruns on every command/script response, this can block valid non-file workflows that include common version strings.Useful? React with 👍 / 👎.