feat(cli): introduce stash system for conflict management and backups#11
Merged
Conversation
- Added a comprehensive stash system inspired by Git, allowing users to manage file conflicts during installations and updates. - Implemented new CLI commands for stashing, including `stash list`, `stash show`, `stash apply`, `stash pop`, `stash remove`, `stash diff`, `stash save`, and `stash clear`. - Enhanced install and update commands with automatic conflict detection and interactive resolution options. - Introduced `HashCalculator`, `StashLogger`, `StashManager`, `ConflictDetector`, and `ConflictResolver` for managing stashes and conflicts. - Updated dependencies: `inquirer@^9.2.0`, `diff@^5.1.0`, `@types/inquirer@^9.0.0`, `@types/diff@^5.0.0`. - Version bumped to 1.0.0 to reflect major changes.
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
1 participant
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.
This pull request delivers the major 1.0.0 release for the
vibe-devtoolsCLI, introducing a comprehensive, git-inspired stash system for conflict management and file backups. The release includes a robust set of CLI commands for managing stashes, enhancements to install and update workflows with conflict detection and interactive resolution, and significant improvements in test coverage for the new components. Several new dependencies are added to support these features.Stash System Core Features:
HashCalculator), JSONL logging (StashLogger), a lifecycle manager (StashManager), automatic conflict detection, and interactive conflict resolution with diff viewing and editor integration. [1] [2] [3] [4]CLI Enhancements:
list,show,apply,pop,remove,diff,save, andclear, with interactive prompts and dry-run support. [1] [2]installandupdatecommands with automatic conflict detection, stash integration, and dry-run options. [1] [2]Testing and Reliability:
HashCalculatorandStashLoggerto ensure correctness of hashing, logging, and error handling. [1] [2]Dependency Updates:
inquirer,diff, and their type definitions to support CLI prompts and diff display; updatedpackage.jsonandpnpm-lock.yamlaccordingly. [1] [2] [3] [4]Documentation:
STASH-SYSTEM.md.These changes collectively deliver a powerful, user-friendly stash and conflict management experience for the CLI, with strong test coverage and clear documentation.