Add internal apply_patch command with whitespace-aware matching #48
Conversation
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| func writeFileState(state *fileState) error { | ||
| if state == nil { | ||
| return nil | ||
| } | ||
| content := strings.Join(state.lines, "\n") | ||
| if state.originalEndsWithNew != nil { | ||
| if *state.originalEndsWithNew && !strings.HasSuffix(content, "\n") { | ||
| content += "\n" | ||
| } else if !*state.originalEndsWithNew && strings.HasSuffix(content, "\n") { | ||
| content = strings.TrimSuffix(content, "\n") | ||
| } | ||
| } | ||
| if err := os.MkdirAll(filepath.Dir(state.path), 0o755); err != nil { | ||
| return fmt.Errorf("apply_patch: failed to create parent directory for %s: %v", state.relativePath, err) | ||
| } | ||
| if err := os.WriteFile(state.path, []byte(content), 0o666); err != nil { | ||
| return fmt.Errorf("apply_patch: failed to write %s: %v", state.relativePath, err) | ||
| } |
There was a problem hiding this comment.
The command writes every modified file with os.WriteFile(..., 0o666) without remembering the original mode. If the patch touches an executable or otherwise permissioned file, the execute bits are dropped and the file becomes non-executable after the patch. Standard patch tools preserve existing permissions. Consider recording the source file’s mode in ensureFileState and reusing it (or reapplying it with os.Chmod) when saving the updated content.
Useful? React with 👍 / 👎.
Summary
apply_patchinternal command that parses headless diff blocks, applies hunks with optional whitespace-insensitive matching, and formats rich error outputTesting
https://chatgpt.com/codex/tasks/task_e_68fddddefdd08328b65ac9552f88460c