fix: install @google/generative-ai and use writeFile for atomic writes in ConflictResolver#11
Merged
fix: install @google/generative-ai and use writeFile for atomic writes in ConflictResolver#11
Conversation
Merged
…esolver Co-authored-by: jaseel0 <225665919+jaseel0@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Add foundational features for AI-powered Git CLI tool
fix: install @google/generative-ai and use writeFile for atomic writes in ConflictResolver
Mar 3, 2026
naheel0
approved these changes
Mar 3, 2026
jaseel0
approved these changes
Mar 3, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Two correctness fixes: ensures the
@google/generative-aipackage is fully installed soAIService.tscan resolve its import, and replaces a potentially partialwrite()call inConflictResolverwithwriteFile()to guarantee full-buffer writes beforefsync+rename.Dependency resolution
@google/generative-aiwas already declared inpackage.jsonandpackage-lock.jsonbut absent fromnode_modules; rannpm installto populate it, unblocking TypeScript compilation.Atomic write correctness in
ConflictResolver.applyResolutionFileHandle.write(buffer, 0, buffer.length)does not guarantee all bytes are written in a single call — a short write silently truncates the resolved file beforerename()completes.FileHandle.writeFile(buffer), which loops internally until the entire buffer is flushed, preserving the atomic-replace guarantee.Related Issue
Closes #
Type of Change
Checklist
How Has This Been Tested?
npm run lint(tsc --noEmit) passes with zero errors after installing the dependency. CodeQL analysis returned 0 alerts.Screenshots (if applicable)
N/A
Additional Notes
node_modules/remains gitignored; onlypackage-lock.jsonchanges (if any) are committed.💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.