Skip to content

fix: preserve file permissions in ConflictResolver atomic write #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
naheel0 merged 2 commits into from
Mar 3, 2026
Merged

fix: preserve file permissions in ConflictResolver atomic write #12

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70a25c2
Initial plan
Copilot Mar 3, 2026
d177c5f
fix: preserve file mode in ConflictResolver atomic write
Copilot Mar 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion git-ai/src/services/ConflictResolver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,14 @@ export class ConflictResolver {
// Atomic write: write to a temp file, fsync, then rename into place.
const tempPath = path.join(targetParent, `.tmp-${process.pid}-${randomBytes(8).toString('hex')}`);
const buffer = Buffer.from(resolvedContent, 'utf-8');
const tempHandle = await fs.open(tempPath, fs.constants.O_CREAT | fs.constants.O_EXCL | fs.constants.O_WRONLY | fs.constants.O_NOFOLLOW, 0o644);
let fileMode = 0o644;
try {
const stat = await fs.lstat(targetPath);
fileMode = stat.mode & 0o777;
} catch {
// Target does not exist; use default mode 0o644
}
const tempHandle = await fs.open(tempPath, fs.constants.O_CREAT | fs.constants.O_EXCL | fs.constants.O_WRONLY | fs.constants.O_NOFOLLOW, fileMode);
try {
await tempHandle.writeFile(buffer);
await tempHandle.sync();
Expand Down