aline-ai 0.2.5__py3-none-any.whl → 0.3.0__py3-none-any.whl

realign/commands/push.py

@@ -1,290 +1,200 @@
-#!/usr/bin/env python3
-"""
-Push command - Interactive workflow for reviewing and pushing commits.
-
-This command provides an interactive workflow:
-1. Run aline review to show unpushed commits
-2. Ask user if they want to hide any commits
-3. If yes, allow interactive hiding
-4. Ask for final confirmation before pushing
-"""
-
-import subprocess
-import sys
+"""Push command - Push session commits to remote repository."""
+
+import os
 from pathlib import Path
 from typing import Optional
 
-from .review import review_command, get_unpushed_commits
-from .hide import hide_command, parse_commit_indices
+from ..tracker.git_tracker import ReAlignGitTracker
 from ..logging_config import setup_logger
 
 logger = setup_logger('realign.commands.push', 'push.log')
 
 
-def prompt_yes_no(question: str, default: bool = False) -> bool:
+def push_command(
+    force: bool = False,
+    repo_root: Optional[Path] = None
+) -> int:
     """
-    Prompt user for yes/no confirmation.
+    Push session commits to remote repository.
+
+    This command pushes your local session commits to the configured
+    remote repository, making them available to your team.
 
     Args:
-        question: Question to ask
-        default: Default answer if user just presses Enter
+        force: If True, force push (use with caution)
+        repo_root: Path to repository root (uses cwd if not provided)
 
     Returns:
-        True for yes, False for no
+        Exit code (0 for success, 1 for error)
     """
-    default_str = "Y/n" if default else "y/N"
-    prompt = f"{question} [{default_str}] "
+    # Get project root
+    if repo_root is None:
+        repo_root = Path(os.getcwd()).resolve()
+
+    # Initialize tracker
+    tracker = ReAlignGitTracker(repo_root)
 
-    while True:
-        response = input(prompt).strip().lower()
+    # Check if repository is initialized
+    if not tracker.is_initialized():
+        print("❌ Repository not initialized")
+        print("Run 'aline init' first")
+        return 1
+
+    # Check if remote is configured
+    if not tracker.has_remote():
+        print("❌ No remote configured")
+        print("\nTo set up sharing:")
+        print("  aline init --share          (browser-based setup)")
+        print("  aline share configure       (manual configuration)")
+        return 1
 
-        if not response:
-            return default
+    # Get unpushed commits
+    unpushed = tracker.get_unpushed_commits()
 
-        if response in ('y', 'yes'):
-            return True
-        elif response in ('n', 'no'):
-            return False
+    if not unpushed:
+        print("✓ All commits are already pushed")
+        print(f"\nRemote: {tracker.get_remote_url()}")
+        return 0
+
+    # Show review of unpushed commits
+    print(f"Found {len(unpushed)} unpushed commit(s)\n")
+
+    # Display commits summary
+    try:
+        display_commits_summary(tracker, unpushed)
+    except Exception as e:
+        logger.warning(f"Failed to display commit details: {e}")
+        # Just show hashes
+        for commit_hash in unpushed:
+            print(f"  {commit_hash[:8]}")
+
+    print()
+
+    # For non-interactive mode, just push
+    if force:
+        print("Force pushing...")
+        success = tracker.safe_push(force=True)
+        if success:
+            print(f"✓ Successfully force-pushed {len(unpushed)} commit(s)")
+            print(f"\nRemote: {tracker.get_remote_url()}")
+            return 0
         else:
-            print("Please answer 'y' or 'n'")
+            print("❌ Push failed")
+            return 1
 
+    # Interactive mode - prompt user
+    print("Push these commit(s)?")
+    print("  [Y] Push all")
+    print("  [n] Cancel")
+    print("  [h] Hide specific commits")
+    print()
 
-def push_command(
-    repo_root: Optional[Path] = None,
-    remote: str = "origin",
-    branch: Optional[str] = None,
-    force: bool = False,
-    dry_run: bool = False
-) -> int:
-    """
-    Interactive push workflow with review and hide options.
+    choice = input("Select [Y/n/h]: ").strip().lower()
 
-    Workflow:
-    1. Review unpushed commits
-    2. Ask if user wants to hide any commits
-    3. Interactive hiding loop (if requested)
-    4. Final confirmation
-    5. Execute git push
+    if choice == 'n':
+        print("Cancelled")
+        return 0
 
-    Args:
-        repo_root: Path to repository root (auto-detected if None)
-        remote: Git remote name (default: origin)
-        branch: Branch to push (default: current branch)
-        force: Skip all confirmation prompts
-        dry_run: Don't actually push, just show what would happen
+    if choice == 'h':
+        # Interactive hide mode
+        print("\nEnter commit indices to hide (comma-separated, e.g., 1,3):")
+        print("Commits are numbered from the list above")
 
-    Returns:
-        0 on success, 1 on error, 2 if cancelled by user
-    """
-    logger.info("======== Push command started ========")
+        indices_str = input("Indices: ").strip()
 
-    # Auto-detect repo root if not provided
-    if repo_root is None:
-        try:
-            result = subprocess.run(
-                ["git", "rev-parse", "--show-toplevel"],
-                capture_output=True,
-                text=True,
-                check=True
-            )
-            repo_root = Path(result.stdout.strip())
-            logger.debug(f"Detected repo root: {repo_root}")
-        except subprocess.CalledProcessError:
-            print("Error: Not in a git repository", file=sys.stderr)
-            logger.error("Not in a git repository")
-            return 1
+        if indices_str:
+            try:
+                # Parse indices
+                indices = [int(i.strip()) for i in indices_str.split(',')]
 
-    # Detect current branch if not provided
-    if branch is None:
-        try:
-            result = subprocess.run(
-                ["git", "rev-parse", "--abbrev-ref", "HEAD"],
-                cwd=repo_root,
-                capture_output=True,
-                text=True,
-                check=True
-            )
-            branch = result.stdout.strip()
-            logger.debug(f"Detected current branch: {branch}")
-        except subprocess.CalledProcessError:
-            print("Error: Failed to detect current branch", file=sys.stderr)
-            logger.error("Failed to detect current branch")
-            return 1
+                # Validate indices
+                valid_indices = [i for i in indices if 1 <= i <= len(unpushed)]
 
-    # Step 1: Review unpushed commits
-    print("\n" + "=" * 60)
-    print("STEP 1: Review unpushed commits")
-    print("=" * 60 + "\n")
+                if not valid_indices:
+                    print("No valid indices provided, cancelling")
+                    return 0
 
-    try:
-        commits = get_unpushed_commits(repo_root)
-    except Exception as e:
-        print(f"Error: Failed to get unpushed commits: {e}", file=sys.stderr)
-        logger.error(f"Failed to get unpushed commits: {e}", exc_info=True)
-        return 1
+                # Hide commits using the hide command
+                from .hide import hide_command
 
-    if not commits:
-        print("✓ No unpushed commits found. Nothing to push.\n")
-        logger.info("No unpushed commits found")
-        return 0
+                # Convert indices back to string format for hide command
+                indices_for_hide = ','.join(map(str, valid_indices))
 
-    # Run review command to display commits
-    exit_code = review_command(repo_root=repo_root, verbose=False, detect_secrets=False)
-    if exit_code != 0:
-        logger.error("Review command failed")
-        return 1
+                if hide_command(indices=indices_for_hide, repo_root=repo_root, force=True) == 0:
+                    print(f"\n✓ Hidden {len(valid_indices)} commit(s)")
 
-    # Step 2: Ask if user wants to hide any commits
-    if not force:
-        print("\n" + "=" * 60)
-        print("STEP 2: Hide sensitive commits (optional)")
-        print("=" * 60 + "\n")
+                    # Re-check unpushed commits
+                    unpushed = tracker.get_unpushed_commits()
 
-        want_to_hide = prompt_yes_no(
-            "Do you want to hide any commits before pushing?",
-            default=False
-        )
+                    if not unpushed:
+                        print("All commits have been hidden")
+                        return 0
 
-        if want_to_hide:
-            # Interactive hiding loop
-            while True:
-                print("\nEnter commit indices to hide (e.g., '1', '1,3,5', '2-4', or 'done'):")
-                print("  Type 'done' when finished hiding commits")
-                print("  Type 'review' to see the current list of commits")
-                print("  Type 'cancel' to abort the push operation")
-
-                user_input = input("\n> ").strip()
-
-                if not user_input:
-                    continue
-
-                if user_input.lower() == 'done':
-                    break
-                elif user_input.lower() == 'cancel':
-                    print("\n❌ Push cancelled by user.\n")
-                    logger.info("Push cancelled by user during hide phase")
-                    return 2
-                elif user_input.lower() == 'review':
-                    print("\n" + "-" * 60)
-                    review_command(repo_root=repo_root, verbose=False, detect_secrets=False)
-                    print("-" * 60)
-                    continue
-
-                # Try to parse and hide the commits
-                try:
-                    # Validate indices first
-                    indices_list = parse_commit_indices(user_input)
-
-                    # Refresh commit list
-                    commits = get_unpushed_commits(repo_root)
-                    if not commits:
-                        print("\n✓ No more unpushed commits to hide.\n")
-                        break
-
-                    max_index = len(commits)
-                    invalid_indices = [i for i in indices_list if i < 1 or i > max_index]
-                    if invalid_indices:
-                        print(f"❌ Invalid indices (out of range 1-{max_index}): {invalid_indices}")
-                        continue
-
-                    # Execute hide command
-                    print()
-                    exit_code = hide_command(
-                        indices=user_input,
-                        repo_root=repo_root,
-                        force=False  # Always ask for confirmation
-                    )
-
-                    if exit_code == 0:
-                        print("\n✅ Commits hidden successfully.\n")
-                        logger.info(f"Successfully hidden commits: {user_input}")
-
-                        # Refresh and show updated commit list
-                        commits = get_unpushed_commits(repo_root)
-                        if not commits:
-                            print("✓ No more unpushed commits.\n")
-                            logger.info("No commits left after hiding")
-                            return 0
-                        else:
-                            print("\n📋 Updated commit list:\n")
-                            review_command(repo_root=repo_root, verbose=False, detect_secrets=False)
-                    else:
-                        print(f"\n❌ Failed to hide commits.\n")
-                        logger.error(f"Hide command failed for indices: {user_input}")
-
-                        # Ask if user wants to continue
-                        if not prompt_yes_no("Continue with push workflow?", default=True):
-                            print("\n❌ Push cancelled.\n")
-                            return 2
-
-                except ValueError as e:
-                    print(f"❌ Invalid input: {e}")
-                    print("   Examples: '1', '1,3,5', '2-4'")
-                    continue
-                except Exception as e:
-                    print(f"❌ Error during hide: {e}", file=sys.stderr)
-                    logger.error(f"Error during hide: {e}", exc_info=True)
-
-                    # Ask if user wants to continue
-                    if not prompt_yes_no("Continue with push workflow?", default=True):
-                        print("\n❌ Push cancelled.\n")
-                        return 2
-
-    # Step 3: Final confirmation
-    if not force:
-        print("\n" + "=" * 60)
-        print("STEP 3: Final confirmation")
-        print("=" * 60 + "\n")
-
-        # Refresh commit list one more time
-        try:
-            commits = get_unpushed_commits(repo_root)
-        except Exception as e:
-            print(f"Error: Failed to refresh commits: {e}", file=sys.stderr)
-            return 1
+                    print(f"\nRemaining {len(unpushed)} commit(s) to push")
 
-        if not commits:
-            print("✓ No unpushed commits. Nothing to push.\n")
-            return 0
+                    confirm = input("Proceed with push? [Y/n]: ").strip().lower()
+                    if confirm == 'n':
+                        print("Cancelled")
+                        return 0
+                else:
+                    print("❌ Failed to hide commits")
+                    return 1
 
-        print(f"Ready to push {len(commits)} commit(s) to {remote}/{branch}\n")
+            except ValueError:
+                print("Invalid input format")
+                return 1
 
-        if not prompt_yes_no("Proceed with git push?", default=True):
-            print("\n❌ Push cancelled by user.\n")
-            logger.info("Push cancelled by user at final confirmation")
-            return 2
+    # Perform push
+    print("\nPushing to remote...")
 
-    # Step 4: Execute git push
-    print("\n" + "=" * 60)
-    print("STEP 4: Pushing to remote")
-    print("=" * 60 + "\n")
+    success = tracker.safe_push(force=force)
 
-    if dry_run:
-        print(f"🔍 DRY RUN: Would execute: git push {remote} {branch}\n")
-        logger.info(f"Dry run: would push to {remote}/{branch}")
+    if success:
+        print(f"✓ Successfully pushed {len(unpushed)} commit(s)")
+        print(f"\nRemote: {tracker.get_remote_url()}")
         return 0
+    else:
+        print("❌ Push failed")
+        print("\nTroubleshooting:")
+        print("  - Check network connection")
+        print("  - Verify remote repository access")
+        print("  - Check logs: .realign/logs/push.log")
+        return 1
 
-    try:
-        print(f"🚀 Pushing to {remote}/{branch}...")
 
+def display_commits_summary(tracker: ReAlignGitTracker, commit_hashes: list):
+    """
+    Display a summary of commits to be pushed.
+
+    Args:
+        tracker: ReAlignGitTracker instance
+        commit_hashes: List of commit hashes
+    """
+    import subprocess
+
+    for i, commit_hash in enumerate(commit_hashes, 1):
+        # Get commit message
         result = subprocess.run(
-            ["git", "push", remote, branch],
-            cwd=repo_root,
+            ["git", "log", "-1", "--format=%s", commit_hash],
+            cwd=tracker.realign_dir,
             capture_output=True,
-            text=True
+            text=True,
+            check=False
         )
 
-        if result.returncode == 0:
-            print("\n✅ Successfully pushed to remote!\n")
-            print(result.stdout)
-            logger.info(f"Successfully pushed to {remote}/{branch}")
-            return 0
-        else:
-            print(f"\n❌ Push failed:\n{result.stderr}\n", file=sys.stderr)
-            logger.error(f"Git push failed: {result.stderr}")
-            return 1
+        message = result.stdout.strip() if result.returncode == 0 else "Unknown"
 
-    except Exception as e:
-        print(f"\n❌ Error during push: {e}\n", file=sys.stderr)
-        logger.error(f"Error during push: {e}", exc_info=True)
-        return 1
+        # Get timestamp
+        result = subprocess.run(
+            ["git", "log", "-1", "--format=%ar", commit_hash],
+            cwd=tracker.realign_dir,
+            capture_output=True,
+            text=True,
+            check=False
+        )
+
+        timestamp = result.stdout.strip() if result.returncode == 0 else ""
+
+        print(f"[{i}] {commit_hash[:8]} - {message}")
+        if timestamp:
+            print(f"     {timestamp}")