From a7d74776a8e47ca377025cee181c042d081e7043 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 3 Mar 2026 17:18:59 +0000 Subject: [PATCH 1/2] Initial plan From 0a9918a302bd3a6c1d5f8710c56b5697c5c29e0d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 3 Mar 2026 17:21:21 +0000 Subject: [PATCH 2/2] fix: install deps and replace short-write with writeFile in ConflictResolver Co-authored-by: jaseel0 <225665919+jaseel0@users.noreply.github.com> --- git-ai/package-lock.json | 6 ------ git-ai/src/services/ConflictResolver.ts | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/git-ai/package-lock.json b/git-ai/package-lock.json index 3b1ca6f..2d8886b 100644 --- a/git-ai/package-lock.json +++ b/git-ai/package-lock.json @@ -907,12 +907,6 @@ } } }, - "node_modules/deprecation": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz", - "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==", - "license": "ISC" - }, "node_modules/emoji-regex": { "version": "10.6.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", diff --git a/git-ai/src/services/ConflictResolver.ts b/git-ai/src/services/ConflictResolver.ts index 85782c2..460ad5b 100644 --- a/git-ai/src/services/ConflictResolver.ts +++ b/git-ai/src/services/ConflictResolver.ts @@ -175,7 +175,7 @@ export class ConflictResolver { 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); try { - await tempHandle.write(buffer, 0, buffer.length); + await tempHandle.writeFile(buffer); await tempHandle.sync(); await tempHandle.close(); } catch (error) {