Undo command #287

Author: tcdent

agentstack/cli/__init__.py

@@ -1,4 +1,10 @@
-from .cli import configure_default_model, welcome_message, get_validated_input, parse_insertion_point
+from .cli import (
+    configure_default_model, 
+    welcome_message, 
+    get_validated_input, 
+    parse_insertion_point, 
+    undo, 
+)
 from .init import init_project
 from .wizard import run_wizard
 from .run import run_project

agentstack/cli/cli.py

@@ -7,6 +7,7 @@
 from agentstack.exceptions import ValidationError
 from agentstack.utils import validator_not_empty, is_snake_case
 from agentstack.generation import InsertionPoint
+from agentstack import repo
 
 
 PREFERRED_MODELS = [
@@ -34,6 +35,25 @@ def welcome_message():
     log.info(border)
 
 
+def undo() -> None:
+    """Undo the last committed changes."""
+    conf.assert_project()
+    
+    changed_files = repo.get_uncommitted_files()
+    if changed_files:
+        log.warning("There are uncommitted changes that may be overwritten.")
+        for changed in changed_files:
+            log.info(f" - {changed}")
+        should_continue = inquirer.confirm(
+            message="Do you want to continue?",
+            default=False,
+        )
+        if not should_continue:
+            return
+
+    repo.revert_last_commit(hard=True)
+
+
 def configure_default_model():
     """Set the default model"""
     agentstack_config = ConfigFile()

agentstack/main.py

@@ -13,6 +13,7 @@
     add_task,
     run_project,
     export_template,
+    undo, 
 )
 from agentstack.telemetry import track_cli_command, update_telemetry
 from agentstack.utils import get_version, term_color
@@ -154,7 +155,8 @@ def _main():
     )
     export_parser.add_argument('filename', help='The name of the file to export to')
 
-    update = subparsers.add_parser('update', aliases=['u'], help='Check for updates', parents=[global_parser])
+    undo_parser = subparsers.add_parser('undo', help='Undo the last change to your project', parents=[global_parser])
+    update_parser = subparsers.add_parser('update', aliases=['u'], help='Check for updates', parents=[global_parser])
 
     # Parse known args and store unknown args in extras; some commands use them later on
     args, extra_args = parser.parse_known_args()
@@ -228,6 +230,8 @@ def _main():
                 generate_parser.print_help()
         elif args.command in ['export', 'e']:
             export_template(args.filename)
+        elif args.command in ['undo']:
+            undo()
         else:
             parser.print_help()
 

agentstack/repo.py

@@ -190,3 +190,24 @@ def get_uncommitted_files() -> list[str]:
     untracked = repo.untracked_files
     modified = [item.a_path for item in repo.index.diff(None) if item.a_path]
     return untracked + modified
+
+
+def revert_last_commit(hard: bool = False) -> None:
+    """
+    Revert the last commit in the current project.
+    """
+    try:
+        repo = _get_repo()
+    except EnvironmentError as e:
+        return  # git is not installed or tracking is disabled
+
+    if len(repo.head.commit.parents) == 0:
+        log.error("No commits to revert.")
+        return
+
+    def _format_commit_message(commit):
+        return commit.message.split('\n')[0]
+
+    log.info(f"Reverting: {_format_commit_message(repo.head.commit)}")
+    repo.git.reset('HEAD~1', hard=hard)
+    log.info(f"Head is now at: {_format_commit_message(repo.head.commit)}")