fix: bugs found in checkpoint bugbash #3016
Open
+60
−25
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
Updates: - Only works if the user has git installed - Supports auto initialization if the user is in a git repo, manual if not - UI ported over from dedicated file tools implementation
Updates: - The clean subcommand will delete the shadow repo - The description for turn-level checkpoints is a truncated version of the user's last message
Updates: - Running the clean subcommand now properly deletes the entire shadow repo for both automatic and manual modes
Updates: - Users can now view diffs between checkpoints - Fixed tool-level checkpoint display handling
Updates: - Checkpoints now (hopefully) correctly display the correct turn-specific user message - Added slash command auto completion
…an-garre/git-checkpoints
|
CI failure is unrelated to this PR |
kensave
approved these changes
Sep 29, 2025
|
I think this branch needs a rebase. |
Can we fix the formatting? |
kkashilk
reviewed
Sep 29, 2025
Comment on lines
+417
to
+423
| if !output.stderr.is_empty() { | ||
| bail!("Git command failed: {}", String::from_utf8_lossy(&output.stderr)); | ||
| } else { | ||
| bail!( | ||
| "Git command failed with no error output. Command: git {}", | ||
| args.join(" ") | ||
| ); |
There was a problem hiding this comment.
Does the user care about which git command failed? IOW, the error message we show to users should be something related to checkpoint feature, rather than git-commands
kkashilk
reviewed
Sep 29, 2025
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.
Issue #, if available:
Description of changes:
Updated git command handling: now correctly use the current working directory as work tree, fixing potential path issues and avoiding potential inconsistencies.
Added explicit error handling for cases where
git add -Afails.Always unlock
message_lockedat the end of a turn (with or without tools). This ensures we reliably capture the first natural-language message of each turn and release the lock consistently.Improved CLI help text for checkpoint commands.
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.