feat: implement interactive smart restore negotiation#52
Merged
JacksonFergusonDev merged 6 commits intomainfrom Feb 24, 2026
Merged
feat: implement interactive smart restore negotiation#52JacksonFergusonDev merged 6 commits intomainfrom
JacksonFergusonDev merged 6 commits intomainfrom
Conversation
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
This PR addresses the "Smart Restore" item from the Phase 1 roadmap. Previously, running
git pulsar restoreon a dirty file would trigger a hard exit to protect uncommitted changes, forcing the user to blindly append--force.This updates the behavior to use an interactive state machine, giving the user the ability to safely inspect the delta before deciding to overwrite or cancel.
Changes
git_wrapper.py): Expandedrun_diffto accept an optionalfileargument, properly isolating the path with--to prevent refspec collisions.ops.py): Replaced thesys.exit(1)kill-switch inrestore_filewith arich.prompt.Promptloop ([O]verwrite / [V]iew Diff / [C]ancel).test_ops.py,test_git_wrapper.py):test_restore_dirty_fails.test_restore_dirty_cancels,test_restore_dirty_overwrites,test_restore_dirty_views_diff).Verification
lessand return cleanly to the prompt).pytestsuite passes with new mockedPromptsequences.