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

{aline_ai-0.2.4.dist-info → aline_ai-0.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aline-ai
-Version: 0.2.4
+Version: 0.2.5
 Summary: Shared AI memory; everyone knows everything in teams
 Author: Sharemind
 License: MIT

{aline_ai-0.2.4.dist-info → aline_ai-0.2.5.dist-info}/RECORD

@@ -1,27 +1,28 @@
-aline_ai-0.2.4.dist-info/licenses/LICENSE,sha256=H8wTqV5IF1oHw_HbBtS1PSDU8G_q81yblEIL_JfV8Vo,1077
-realign/__init__.py,sha256=DWRnxKpLy7YmDatlK_Q7QaCcwo6p-FhjIz_gNyJ0o4o,68
+aline_ai-0.2.5.dist-info/licenses/LICENSE,sha256=H8wTqV5IF1oHw_HbBtS1PSDU8G_q81yblEIL_JfV8Vo,1077
+realign/__init__.py,sha256=zx1q8jbbAtSFt2eDYbUqaqss8LohQnvmI4gRY_HWVWY,68
 realign/claude_detector.py,sha256=NLxI0zJWcqNxNha9jAy9AslTMwHKakCc9yPGdkrbiFE,3028
-realign/cli.py,sha256=OC5KWJ__7_MXbFRlacVxE-rkylBcDIYxdhVbfwsDbY0,1936
+realign/cli.py,sha256=WSdT9zpHLswBeDPjb5M_U2cvhIm7yrgnXPDyb7vD-jg,2798
 realign/codex_detector.py,sha256=RI3JbZgebrhoqpRfTBMfclYCAISN7hZAHVW3bgftJpU,4428
 realign/config.py,sha256=jarinbr0mA6e5DmgY19b_VpMnxk6SOYTwyvB9luq0ww,7207
 realign/file_lock.py,sha256=-9c3tMdMj_ZxmasK5y6hV9Gfo6KDsSO3Q7PXiTBhsu4,3369
 realign/hooks.py,sha256=GzkEbW35-ifwAilYbVxDpNURZ_7XrF68DTqDSQ8v7fE,50670
 realign/logging_config.py,sha256=KvkKktF-bkUu031y9vgUoHpsbnOw7ud25jhpzliNZwA,4929
-realign/mcp_server.py,sha256=dntFatMpozI80K5hHrIiQ9sviC6ARKTP89goULhi1T4,16477
+realign/mcp_server.py,sha256=Q82nuEm6LF17eKUZfHHt6exQjzOWbbBmGXLYwNIGnoo,21002
 realign/mcp_watcher.py,sha256=ffYOXDLuf9T6Kab3CdGNAOY3DBlAbjZrVrSjM5RdYGU,26828
 realign/redactor.py,sha256=FizaGSdW-QTBAQl4h-gtmMpx2mFrfd2a5DoPEPyLfRg,9989
-realign/commands/__init__.py,sha256=m4bAl1uQoPN6QQV7JUCD0zaLBMXFAXP0Kd4-Vpq9i8g,199
+realign/commands/__init__.py,sha256=caHulsUeguKyy2ZIIa9hVwzGwNHfIbeHwZIC67C8gnI,213
 realign/commands/auto_commit.py,sha256=jgjAYZHqN34NmQkncZg3Vtwsl3MyAlsvucxEBwUj7ko,7450
 realign/commands/commit.py,sha256=mlwrv5nfTRY17WlcAdiJKKGh5uM7dGvT7sMxhdbsfkw,12605
 realign/commands/config.py,sha256=iiu7usqw00djKZja5bx0iDH8DB0vU2maUPMkXLdgXwI,6609
 realign/commands/hide.py,sha256=i_XLsmsB4duLKNIA-eRAUvniS4N6GdQUyfN92CGndEA,34138
 realign/commands/init.py,sha256=vOXSAveWgP8TWp0rgqZO8zNRKZMPiaxWsg4PeDZ9RVs,13586
+realign/commands/push.py,sha256=77GXeKggzzc-100JN1PSgDFcDhSaB4kv2jN24h5YM6I,10249
 realign/commands/review.py,sha256=3TY6F87RGNEbutxvUr_konr24-gCyj5fmD9usd3n4-U,15570
 realign/commands/search.py,sha256=xTWuX0lpjQPX8cen0ewl-BNF0FeWgjMwN06bdeesED8,18770
 realign/commands/session_utils.py,sha256=L1DwZIGCOBirp6tkAswACJEeDa6i9aAAfsialAs4rRY,864
 realign/commands/show.py,sha256=A9LvhOBcY6_HoI76irPB2rBOSgdftBuX2uZiO8IwNoU,16338
-aline_ai-0.2.4.dist-info/METADATA,sha256=Hgg_pnm9t39cmHHrFRMllNsfASfBgHWbdEc8AtY8GZ0,1437
-aline_ai-0.2.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aline_ai-0.2.4.dist-info/entry_points.txt,sha256=h-NocHDzSueXfsepHTIdRPNQzhNZQPAztJfldd-mQTE,202
-aline_ai-0.2.4.dist-info/top_level.txt,sha256=yIL3s2xv9nf1GwD5n71Aq_JEIV4AfzCIDNKBzewuRm4,8
-aline_ai-0.2.4.dist-info/RECORD,,
+aline_ai-0.2.5.dist-info/METADATA,sha256=Deqqt3Tjs66ZW_76UA7itCXB_YLnhcO-rGa6vN_6vys,1437
+aline_ai-0.2.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aline_ai-0.2.5.dist-info/entry_points.txt,sha256=h-NocHDzSueXfsepHTIdRPNQzhNZQPAztJfldd-mQTE,202
+aline_ai-0.2.5.dist-info/top_level.txt,sha256=yIL3s2xv9nf1GwD5n71Aq_JEIV4AfzCIDNKBzewuRm4,8
+aline_ai-0.2.5.dist-info/RECORD,,

realign/__init__.py

@@ -1,3 +1,3 @@
 """Aline - AI Agent Chat Session Tracker."""
 
-__version__ = "0.2.4"
+__version__ = "0.2.5"

realign/cli.py

@@ -7,7 +7,7 @@ from typing import Optional
 from rich.console import Console
 from rich.syntax import Syntax
 
-from .commands import init, search, show, config, commit, auto_commit, review, hide
+from .commands import init, search, show, config, commit, auto_commit, review, hide, push
 
 app = typer.Typer(
     name="realign",
@@ -48,6 +48,29 @@ def hide_cli(
     raise typer.Exit(code=exit_code)
 
 
+@app.command(name="push")
+def push_cli(
+    remote: str = typer.Option("origin", "--remote", "-r", help="Git remote name"),
+    branch: Optional[str] = typer.Option(None, "--branch", "-b", help="Branch to push (default: current branch)"),
+    force: bool = typer.Option(False, "--force", "-f", help="Skip all confirmation prompts"),
+    dry_run: bool = typer.Option(False, "--dry-run", help="Show what would be pushed without actually pushing"),
+):
+    """Interactive push workflow with review and hide options.
+
+    This command provides an interactive workflow:
+    1. Review unpushed commits
+    2. Optionally hide sensitive commits
+    3. Final confirmation before pushing
+    """
+    exit_code = push.push_command(
+        remote=remote,
+        branch=branch,
+        force=force,
+        dry_run=dry_run
+    )
+    raise typer.Exit(code=exit_code)
+
+
 @app.command()
 def version():
     """Show ReAlign version."""

realign/commands/__init__.py

@@ -1,5 +1,5 @@
 """ReAlign commands module."""
 
-from . import init, search, show, config, commit, auto_commit, review, hide
+from . import init, search, show, config, commit, auto_commit, review, hide, push
 
-__all__ = ["init", "search", "show", "config", "commit", "auto_commit", "review", "hide"]
+__all__ = ["init", "search", "show", "config", "commit", "auto_commit", "review", "hide", "push"]

realign/commands/push.py

@@ -0,0 +1,290 @@
+#!/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
+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 ..logging_config import setup_logger
+
+logger = setup_logger('realign.commands.push', 'push.log')
+
+
+def prompt_yes_no(question: str, default: bool = False) -> bool:
+    """
+    Prompt user for yes/no confirmation.
+
+    Args:
+        question: Question to ask
+        default: Default answer if user just presses Enter
+
+    Returns:
+        True for yes, False for no
+    """
+    default_str = "Y/n" if default else "y/N"
+    prompt = f"{question} [{default_str}] "
+
+    while True:
+        response = input(prompt).strip().lower()
+
+        if not response:
+            return default
+
+        if response in ('y', 'yes'):
+            return True
+        elif response in ('n', 'no'):
+            return False
+        else:
+            print("Please answer 'y' or 'n'")
+
+
+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.
+
+    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
+
+    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
+
+    Returns:
+        0 on success, 1 on error, 2 if cancelled by user
+    """
+    logger.info("======== Push command started ========")
+
+    # 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
+
+    # 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
+
+    # Step 1: Review unpushed commits
+    print("\n" + "=" * 60)
+    print("STEP 1: Review unpushed commits")
+    print("=" * 60 + "\n")
+
+    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
+
+    if not commits:
+        print("✓ No unpushed commits found. Nothing to push.\n")
+        logger.info("No unpushed commits found")
+        return 0
+
+    # 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
+
+    # 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")
+
+        want_to_hide = prompt_yes_no(
+            "Do you want to hide any commits before pushing?",
+            default=False
+        )
+
+        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
+
+        if not commits:
+            print("✓ No unpushed commits. Nothing to push.\n")
+            return 0
+
+        print(f"Ready to push {len(commits)} commit(s) to {remote}/{branch}\n")
+
+        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
+
+    # Step 4: Execute git push
+    print("\n" + "=" * 60)
+    print("STEP 4: Pushing to remote")
+    print("=" * 60 + "\n")
+
+    if dry_run:
+        print(f"🔍 DRY RUN: Would execute: git push {remote} {branch}\n")
+        logger.info(f"Dry run: would push to {remote}/{branch}")
+        return 0
+
+    try:
+        print(f"🚀 Pushing to {remote}/{branch}...")
+
+        result = subprocess.run(
+            ["git", "push", remote, branch],
+            cwd=repo_root,
+            capture_output=True,
+            text=True
+        )
+
+        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
+
+    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

realign/mcp_server.py

@@ -170,6 +170,63 @@ async def list_tools() -> list[Tool]:
                 "properties": {},
             },
         ),
+        Tool(
+            name="aline_review",
+            description=(
+                "Review unpushed commits before pushing. "
+                "Shows commit messages, LLM summaries, session files modified, and line counts. "
+                "Helps identify what content will be made public when you push."
+            ),
+            inputSchema={
+                "type": "object",
+                "properties": {
+                    "repo_path": {
+                        "type": "string",
+                        "description": "Path to repository root (default: current directory)",
+                    },
+                    "verbose": {
+                        "type": "boolean",
+                        "description": "Show detailed information",
+                        "default": False,
+                    },
+                    "detect_secrets": {
+                        "type": "boolean",
+                        "description": "Run sensitive content detection",
+                        "default": False,
+                    },
+                },
+            },
+        ),
+        Tool(
+            name="aline_hide",
+            description=(
+                "Hide (redact) specific unpushed commits by rewriting git history. "
+                "This redacts commit messages and session content. "
+                "WARNING: This rewrites git history. Use with caution."
+            ),
+            inputSchema={
+                "type": "object",
+                "properties": {
+                    "indices": {
+                        "type": "string",
+                        "description": (
+                            "Commit indices to hide (e.g., '1', '1,3,5', '2-4', or '--all'). "
+                            "Use aline_review first to see the commit indices."
+                        ),
+                    },
+                    "repo_path": {
+                        "type": "string",
+                        "description": "Path to repository root (default: current directory)",
+                    },
+                    "force": {
+                        "type": "boolean",
+                        "description": "Skip confirmation prompt",
+                        "default": False,
+                    },
+                },
+                "required": ["indices"],
+            },
+        ),
     ]
 
 
@@ -189,6 +246,10 @@ async def call_tool(name: str, arguments: Any) -> list[TextContent]:
             result = await handle_get_latest_session(arguments)
         elif name == "aline_version":
             result = await handle_version(arguments)
+        elif name == "aline_review":
+            result = await handle_review(arguments)
+        elif name == "aline_hide":
+            result = await handle_hide(arguments)
         else:
             return [TextContent(type="text", text=f"Unknown tool: {name}")]
 
@@ -395,6 +456,78 @@ async def handle_version(args: dict) -> list[TextContent]:
     )]
 
 
+async def handle_review(args: dict) -> list[TextContent]:
+    """Handle aline_review tool."""
+    from .commands.review import review_command
+    from io import StringIO
+    import sys
+
+    repo_path = args.get("repo_path")
+    verbose = args.get("verbose", False)
+    detect_secrets = args.get("detect_secrets", False)
+
+    # Convert repo_path to Path if provided
+    repo_root = Path(repo_path) if repo_path else None
+
+    # Capture stdout
+    old_stdout = sys.stdout
+    sys.stdout = captured_output = StringIO()
+
+    try:
+        # Call the review command
+        exit_code = review_command(
+            repo_root=repo_root,
+            verbose=verbose,
+            detect_secrets=detect_secrets
+        )
+
+        # Get the output
+        output = captured_output.getvalue()
+
+        if exit_code == 0:
+            return [TextContent(type="text", text=output or "No unpushed commits found.")]
+        else:
+            return [TextContent(type="text", text=f"Error: Review failed\n{output}")]
+    finally:
+        sys.stdout = old_stdout
+
+
+async def handle_hide(args: dict) -> list[TextContent]:
+    """Handle aline_hide tool."""
+    from .commands.hide import hide_command
+    from io import StringIO
+    import sys
+
+    indices = args["indices"]
+    repo_path = args.get("repo_path")
+    force = args.get("force", False)
+
+    # Convert repo_path to Path if provided
+    repo_root = Path(repo_path) if repo_path else None
+
+    # Capture stdout
+    old_stdout = sys.stdout
+    sys.stdout = captured_output = StringIO()
+
+    try:
+        # Call the hide command
+        exit_code = hide_command(
+            indices=indices,
+            repo_root=repo_root,
+            force=force
+        )
+
+        # Get the output
+        output = captured_output.getvalue()
+
+        if exit_code == 0:
+            return [TextContent(type="text", text=output or "Hide operation completed.")]
+        else:
+            return [TextContent(type="text", text=f"Error: Hide failed\n{output}")]
+    finally:
+        sys.stdout = old_stdout
+
+
 def _server_log(msg: str):
     """Log MCP server messages to both stderr and file."""
     from datetime import datetime