ace-git-copilot 0.4.4__tar.gz → 0.4.6__tar.gz

{ace_git_copilot-0.4.4 → ace_git_copilot-0.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ace-git-copilot
-Version: 0.4.4
+Version: 0.4.6
 Summary: AI-powered Git copilot — talk to Git in plain English
 Project-URL: Homepage, https://github.com/jachinsamuel/Ace
 Project-URL: Documentation, https://github.com/jachinsamuel/Ace#readme

ace_git_copilot-0.4.6/ace/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.4.6"

ace_git_copilot-0.4.6/ace/ai/push_resolver.py

@@ -0,0 +1,172 @@
+from typing import Dict, Any, List, Optional
+from rich.panel import Panel
+from rich.text import Text
+from rich import box
+import typer
+
+from ace.core.git_ops import GitOps
+from ace.ui.display import console, spinner, print_success, print_warning, show_error_panel
+
+def categorize_push_error(error_msg: str) -> Dict[str, Any]:
+    """Categorize git push error into actionable problem types and remedies."""
+    err_lower = error_msg.lower()
+    
+    if any(pattern in err_lower for pattern in ["fetch first", "non-fast-forward", "behind", "rejected", "updates were rejected because the remote contains work"]):
+        return {
+            "type": "non_fast_forward",
+            "title": "Remote Branch Has New Commits (Non-Fast-Forward)",
+            "description": "The remote branch contains commits that you do not have locally. You must pull remote changes before pushing.",
+            "actions": [
+                {"key": "1", "label": "Pull & Rebase remote changes (git pull --rebase)", "cmd": "pull_rebase"},
+                {"key": "2", "label": "Pull & Merge remote changes (git pull)", "cmd": "pull_merge"},
+                {"key": "3", "label": "Force push safely with lease (git push --force-with-lease)", "cmd": "force_lease"},
+            ]
+        }
+    elif any(pattern in err_lower for pattern in ["no upstream", "has no upstream", "set-upstream"]):
+        return {
+            "type": "no_upstream",
+            "title": "Missing Upstream Tracking Branch",
+            "description": "Your local branch does not have an upstream tracking branch on the remote.",
+            "actions": [
+                {"key": "1", "label": "Set upstream and push (git push -u)", "cmd": "set_upstream"},
+            ]
+        }
+    elif any(pattern in err_lower for pattern in ["permission denied", "authentication failed", "could not read from remote", "publickey"]):
+        return {
+            "type": "permission_denied",
+            "title": "Authentication / Access Permission Denied",
+            "description": "Git could not authenticate with the remote repository. Check your SSH keys or HTTPS access token.",
+            "actions": [
+                {"key": "1", "label": "Show SSH / Token troubleshooting guide", "cmd": "help_auth"},
+            ]
+        }
+    else:
+        return {
+            "type": "unknown",
+            "title": "Git Push Error",
+            "description": error_msg.strip()[:200],
+            "actions": [
+                {"key": "1", "label": "Pull & Rebase remote changes (git pull --rebase)", "cmd": "pull_rebase"},
+                {"key": "2", "label": "Force push safely with lease (git push --force-with-lease)", "cmd": "force_lease"},
+            ]
+        }
+
+def handle_push_failure(git_ops: GitOps, error_msg: str, remote: str = "origin", branch: Optional[str] = None, offline: bool = False) -> bool:
+    """
+    Interactively diagnose a git push failure and prompt the user with recovery options.
+    Returns True if the push was resolved successfully, False otherwise.
+    """
+    curr_branch = branch or git_ops.get_current_branch() or "master"
+    category = categorize_push_error(error_msg)
+    
+    console.print()
+    diag_text = Text()
+    diag_text.append(f"Problem: {category['description']}\n", style="white")
+    diag_text.append(f"Target Branch: {remote}/{curr_branch}\n", style="dim #9E9E9E")
+    
+    console.print(Panel(
+        diag_text,
+        title=f"[bold #FF1744]✘ {category['title']}[/bold #FF1744]",
+        border_style="#FF1744",
+        padding=(1, 2)
+    ))
+    
+    console.print("[bold cyan]Choose resolution action:[/bold cyan]")
+    for act in category["actions"]:
+        console.print(f"  [{act['key']}] {act['label']}")
+    console.print("  [s] Skip / Cancel push")
+    
+    choice = typer.prompt("Select option", default="1").lower().strip()
+    
+    if choice == "s":
+        print_warning("Push resolution cancelled.")
+        return False
+        
+    selected_act = None
+    for act in category["actions"]:
+        if act["key"] == choice:
+            selected_act = act
+            break
+            
+    if not selected_act and category["actions"]:
+        selected_act = category["actions"][0]
+        
+    if not selected_act:
+        return False
+
+    cmd_type = selected_act["cmd"]
+
+    if cmd_type == "pull_rebase":
+        try:
+            with spinner(f"Pulling and rebasing from {remote}/{curr_branch}..."):
+                git_ops.execute(f"pull --rebase {remote} {curr_branch}")
+            print_success("Successfully pulled and rebased remote changes!")
+            
+            # Retry push
+            with spinner(f"Retrying push to {remote}/{curr_branch}..."):
+                push_res = git_ops.push(remote=remote, branch=curr_branch)
+            print_success("Pushed to remote successfully!")
+            if push_res.strip():
+                console.print(f"[dim]{push_res}[/dim]")
+            return True
+        except Exception as e:
+            show_error_panel(f"Failed during pull & rebase or retry push: {e}", "Resolution Error")
+            return False
+
+    elif cmd_type == "pull_merge":
+        try:
+            with spinner(f"Pulling and merging from {remote}/{curr_branch}..."):
+                git_ops.execute(f"pull {remote} {curr_branch}")
+            print_success("Successfully merged remote changes!")
+            
+            # Retry push
+            with spinner(f"Retrying push to {remote}/{curr_branch}..."):
+                push_res = git_ops.push(remote=remote, branch=curr_branch)
+            print_success("Pushed to remote successfully!")
+            if push_res.strip():
+                console.print(f"[dim]{push_res}[/dim]")
+            return True
+        except Exception as e:
+            show_error_panel(f"Failed during pull or retry push: {e}", "Resolution Error")
+            return False
+
+    elif cmd_type == "force_lease":
+        from ace.ui.prompts import confirm
+        if confirm("Force push with lease will overwrite remote commits if your local branch is out of sync. Continue?", default=False):
+            try:
+                with spinner(f"Force pushing (--force-with-lease) to {remote}/{curr_branch}..."):
+                    push_res = git_ops.execute(f"push --force-with-lease {remote} {curr_branch}")
+                print_success("Force pushed with lease successfully!")
+                if push_res.strip():
+                    console.print(f"[dim]{push_res}[/dim]")
+                return True
+            except Exception as e:
+                show_error_panel(f"Force push failed: {e}", "Resolution Error")
+                return False
+        else:
+            print_warning("Force push cancelled.")
+            return False
+
+    elif cmd_type == "set_upstream":
+        try:
+            with spinner(f"Setting upstream and pushing to {remote}/{curr_branch}..."):
+                push_res = git_ops.push(remote=remote, branch=curr_branch, set_upstream=True)
+            print_success("Set upstream and pushed successfully!")
+            if push_res.strip():
+                console.print(f"[dim]{push_res}[/dim]")
+            return True
+        except Exception as e:
+            show_error_panel(f"Push with set-upstream failed: {e}", "Resolution Error")
+            return False
+
+    elif cmd_type == "help_auth":
+        auth_guide = (
+            "Authentication Troubleshooting Guide:\n"
+            "1. SSH Key setup: Run 'ssh -T git@github.com' to verify key access.\n"
+            "2. HTTPS Token: Run 'git config --global credential.helper manager' to update saved passwords/tokens.\n"
+            "3. Remote URL: Verify remote URL with 'git remote -v'."
+        )
+        console.print(Panel(auth_guide, title="[bold cyan]Authentication Help[/bold cyan]", border_style="#00D5FF"))
+        return False
+
+    return False

{ace_git_copilot-0.4.4 → ace_git_copilot-0.4.6}/ace/cli.py

@@ -86,17 +86,25 @@ def main(
 
     # Intercept subcommand if the user typed an English sentence (e.g. 'ace add and commit')
     intercepted_query = None
-    if ctx.invoked_subcommand in ("add", "stage", "commit", "review", "explain", "resolve", "search"):
+    ALL_INTERCEPT_SUBCOMMANDS = (
+        "add", "stage", "commit", "review", "explain", "resolve", "search",
+        "undo", "workspace", "ws", "standup", "blame", "pr", "squash", "ignore", "doctor"
+    )
+    if ctx.invoked_subcommand in ALL_INTERCEPT_SUBCOMMANDS:
         import sys
         sub_cmd = ctx.invoked_subcommand
         sub_idx = -1
-        for idx, arg in enumerate(sys.argv):
-            if arg == sub_cmd and idx > 0 and not sys.argv[idx - 1].startswith("-"):
+        for idx, arg in enumerate(sys.argv[1:], start=1):
+            if arg == sub_cmd:
                 sub_idx = idx
                 break
         if sub_idx != -1:
             sub_args = sys.argv[sub_idx + 1:]
-            nl_indicators = {"and", "with", "to", "the", "a", "new", "my", "all", "but", "yesterday", "last", "from", "for", "changed", "everything"}
+            nl_indicators = {
+                "and", "with", "to", "the", "a", "an", "in", "on", "new", "my", "all",
+                "but", "yesterday", "last", "from", "for", "changed", "everything",
+                "changes", "repo", "repos", "commits", "files"
+            }
             if any(arg.lower() in nl_indicators for arg in sub_args):
                 query_parts = []
                 for arg in sys.argv[1:]:
@@ -105,6 +113,7 @@ def main(
                     query_parts.append(arg)
                 intercepted_query = " ".join(query_parts)
 
+
     if intercepted_query:
         query = intercepted_query
     elif ctx.invoked_subcommand is not None:
@@ -447,20 +456,22 @@ def commit_cmd(
                 print_success("Pushed and set upstream branch successfully!")
                 console.print(f"[dim]{push_res}[/dim]")
             except Exception as e:
-                show_error_panel(f"Push failed: {e}", "Git Push Error")
+                from ace.ai.push_resolver import handle_push_failure
+                handle_push_failure(git_ops, str(e), remote=selected_remote, branch=current_branch, offline=offline)
     else:
         # Upstream exists
         msg_push = f"Push to upstream branch '{upstream}'? (Your branch is {ahead} commit(s) ahead of remote)"
         if confirm(msg_push, default=True):
+            remote_name = upstream.split("/")[0] if "/" in upstream else "origin"
             try:
-                # Find the remote name from upstream (e.g. 'origin/main' -> 'origin')
-                remote_name = upstream.split("/")[0] if "/" in upstream else "origin"
                 with spinner(f"Pushing to {upstream}..."):
                     push_res = git_ops.push(remote=remote_name)
                 print_success("Pushed to remote successfully!")
                 console.print(f"[dim]{push_res}[/dim]")
             except Exception as e:
-                show_error_panel(f"Push failed: {e}", "Git Push Error")
+                from ace.ai.push_resolver import handle_push_failure
+                handle_push_failure(git_ops, str(e), remote=remote_name, branch=current_branch, offline=offline)
+
 
 @app.command(name="setup", help="Initial configuration wizard for Ace.")
 def setup_cmd():

{ace_git_copilot-0.4.4 → ace_git_copilot-0.4.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ace-git-copilot"
-version = "0.4.4"
+version = "0.4.6"
 description = "AI-powered Git copilot — talk to Git in plain English"
 readme = "README.md"
 requires-python = ">=3.11"

{ace_git_copilot-0.4.4 → ace_git_copilot-0.4.6}/tests/test_interceptor.py

@@ -40,3 +40,23 @@ def test_subcommand_interceptor_normal_subcmd(mock_git_ops_class):
     # Normal execution path: it routes to the add subcommand, tries to run git add, and fails
     assert result.exit_code == 1
     mock_git_ops.execute.assert_called_once_with("add file1.txt")
+
+
+@patch("ace.core.git_ops.GitOps")
+@patch("ace.ai.llm_factory.get_llm")
+@patch("ace.ai.intent_parser.IntentParser")
+def test_subcommand_interceptor_with_flags(mock_parser_class, mock_get_llm, mock_git_ops_class):
+    mock_git_ops = MagicMock()
+    mock_git_ops_class.return_value = mock_git_ops
+    
+    mock_parser = MagicMock()
+    mock_parser.parse_intent.return_value = {"commands": [], "explanation": "NL query with flag matched"}
+    mock_parser_class.return_value = mock_parser
+
+    # Simulate: ace -y add and commit
+    with patch.object(sys, "argv", ["ace", "-y", "add", "and", "commit"]):
+        result = runner.invoke(app, ["-y", "add", "and", "commit"])
+        
+    assert result.exit_code == 0
+    mock_parser.parse_intent.assert_called_once_with("add and commit", offline=False)
+

ace_git_copilot-0.4.6/tests/test_push_resolver.py

@@ -0,0 +1,32 @@
+from unittest.mock import MagicMock, patch
+from ace.ai.push_resolver import categorize_push_error, handle_push_failure
+
+def test_categorize_push_error_non_fast_forward():
+    err = "error: failed to push some refs to 'github.com:repo/app.git'\nhint: Updates were rejected because the remote contains work that you do not have locally."
+    cat = categorize_push_error(err)
+    assert cat["type"] == "non_fast_forward"
+    assert len(cat["actions"]) == 3
+
+def test_categorize_push_error_no_upstream():
+    err = "fatal: The current branch master has no upstream branch."
+    cat = categorize_push_error(err)
+    assert cat["type"] == "no_upstream"
+    assert cat["actions"][0]["cmd"] == "set_upstream"
+
+def test_categorize_push_error_permission_denied():
+    err = "Permission denied (publickey). fatal: Could not read from remote repository."
+    cat = categorize_push_error(err)
+    assert cat["type"] == "permission_denied"
+
+@patch("ace.ai.push_resolver.typer.prompt", return_value="1")
+def test_handle_push_failure_pull_rebase(mock_prompt):
+    mock_git_ops = MagicMock()
+    mock_git_ops.get_current_branch.return_value = "master"
+    mock_git_ops.push.return_value = "Everything up-to-date"
+    
+    err = "Updates were rejected because the remote contains work"
+    res = handle_push_failure(mock_git_ops, err, remote="origin", branch="master")
+    
+    assert res is True
+    mock_git_ops.execute.assert_called_once_with("pull --rebase origin master")
+    mock_git_ops.push.assert_called_once_with(remote="origin", branch="master")

ace_git_copilot-0.4.4/ace/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.4.4"