ace-git-copilot 0.4.0__tar.gz → 0.4.2__tar.gz

{ace_git_copilot-0.4.0 → ace_git_copilot-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ace-git-copilot
-Version: 0.4.0
+Version: 0.4.2
 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.2/ace/__init__.py

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

{ace_git_copilot-0.4.0 → ace_git_copilot-0.4.2}/ace/ai/history_analyzer.py

@@ -196,7 +196,8 @@ class HistoryAnalyzer:
 
         commit_lines = []
         for c in commits:
-            commit_lines.append(f"- {c['hexsha'][:7]} - {c['summary']} (by {c['author']})")
+            repo_prefix = f"[{c['repo_name']}] " if "repo_name" in c else ""
+            commit_lines.append(f"- {repo_prefix}{c['hexsha'][:7]} - {c['summary']} (by {c['author']})")
         commit_list_text = "\n".join(commit_lines)
 
         from ace.ai.prompts.standup import STANDUP_SYSTEM_PROMPT, USER_PROMPT_TEMPLATE

{ace_git_copilot-0.4.0 → ace_git_copilot-0.4.2}/ace/cli.py

@@ -84,16 +84,38 @@ def main(
     from ace.core.safety import SafetyChecker
     from ace.ui.prompts import confirm
 
-    if ctx.invoked_subcommand is not None:
+    # 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"):
+        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("-"):
+                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"}
+            if any(arg.lower() in nl_indicators for arg in sub_args):
+                query_parts = []
+                for arg in sys.argv[1:]:
+                    if arg.startswith("-"):
+                        continue
+                    query_parts.append(arg)
+                intercepted_query = " ".join(query_parts)
+
+    if intercepted_query:
+        query = intercepted_query
+    elif ctx.invoked_subcommand is not None:
         # A subcommand was invoked, let it execute
         return
-        
-    if not ctx.args:
-        # No query and no subcommand, Typer will show help
-        console.print(ctx.get_help())
-        raise typer.Exit()
-
-    query = " ".join(ctx.args)
+    else:
+        if not ctx.args:
+            # No query and no subcommand, Typer will show help
+            console.print(ctx.get_help())
+            raise typer.Exit()
+        query = " ".join(ctx.args)
 
     # Initialize GitOps
     try:
@@ -1898,36 +1920,66 @@ def standup_cmd(
     from ace.ai.history_analyzer import HistoryAnalyzer
     from rich.markdown import Markdown
     from rich.panel import Panel
+    import pathlib
 
+    current_dir = pathlib.Path(".")
+    repos_found = []
+
+    # 1. Try active repository in current folder
     try:
         git_ops = GitOps()
-    except NotAGitRepositoryError as e:
-        show_error_panel(str(e), "Git Error")
-        raise typer.Exit(code=1)
-
-    # 1. Resolve author filter
-    author_name = None
-    if not all_authors:
+        repos_found.append((current_dir.resolve().name, git_ops))
+    except NotAGitRepositoryError:
+        # Fallback: scan immediate subdirectories for sibling repositories
         try:
-            author_name = git_ops.repo.git.config("user.name")
+            for child in sorted(current_dir.iterdir()):
+                if child.is_dir() and ((child / ".git").exists() or (child / "gitdir").exists() or child.name.endswith(".git")):
+                    try:
+                        repos_found.append((child.name, GitOps(str(child))))
+                    except Exception:
+                        pass
         except Exception:
             pass
 
-    # 2. Get recent commits
+    if not repos_found:
+        show_error_panel("Not a git repository (or any of the parent directories).", "Git Error")
+        raise typer.Exit(code=1)
+
+    # 2. Gather commits from all resolved repositories
+    all_commits = []
     since_arg = f"{days} days ago"
-    commits = git_ops.get_log(since=since_arg, author=author_name)
 
-    if not commits:
+    # We need a primary git_ops instance to initialize HistoryAnalyzer
+    primary_git_ops = repos_found[0][1]
+
+    for repo_name, git_ops in repos_found:
+        author_name = None
+        if not all_authors:
+            try:
+                author_name = git_ops.repo.git.config("user.name")
+            except Exception:
+                pass
+        
+        try:
+            repo_commits = git_ops.get_log(since=since_arg, author=author_name)
+            for c in repo_commits:
+                c["repo_name"] = repo_name
+                all_commits.append(c)
+        except Exception:
+            pass
+
+    if not all_commits:
         author_msg = "your" if not all_authors else "any"
-        print_warning(f"No recent commits found from {author_msg} author in the last {days} day(s).")
+        scope_msg = "this repository" if len(repos_found) == 1 else f"{len(repos_found)} repositories in this directory"
+        print_warning(f"No recent commits found from {author_msg} author in {scope_msg} in the last {days} day(s).")
         raise typer.Exit(code=0)
 
-    analyzer = HistoryAnalyzer(git_ops)
+    analyzer = HistoryAnalyzer(primary_git_ops)
 
     try:
         get_llm(offline_override=offline)
-        with spinner(f"Analyzing {len(commits)} commits and generating standup..."):
-            standup_report = analyzer.generate_standup(commits, offline=offline)
+        with spinner(f"Analyzing {len(all_commits)} commits across {len(repos_found)} repo(s) and generating standup..."):
+            standup_report = analyzer.generate_standup(all_commits, offline=offline)
     except Exception as e:
         show_error_panel(f"Failed to generate standup: {e}", "AI Error")
         raise typer.Exit(code=1)

{ace_git_copilot-0.4.0 → ace_git_copilot-0.4.2}/pyproject.toml

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

ace_git_copilot-0.4.2/tests/test_interceptor.py

@@ -0,0 +1,42 @@
+from unittest.mock import MagicMock, patch
+import sys
+from typer.testing import CliRunner
+from ace.cli import app
+
+runner = CliRunner()
+
+@patch("ace.core.git_ops.GitOps")
+@patch("ace.ai.llm_factory.get_llm")
+@patch("ace.ai.intent_parser.IntentParser")
+def test_subcommand_interceptor_nl(mock_parser_class, mock_get_llm, mock_git_ops_class):
+    # Setup mocks
+    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 matched"}
+    mock_parser_class.return_value = mock_parser
+
+    # We mock sys.argv to simulate running: ace add and commit
+    with patch.object(sys, "argv", ["ace", "add", "and", "commit"]):
+        # Run command without subcommand routing triggering
+        result = runner.invoke(app, ["add", "and", "commit"])
+        
+    assert result.exit_code == 0
+    # The IntentParser should have been called with the combined string
+    mock_parser.parse_intent.assert_called_once_with("add and commit", offline=False)
+
+@patch("ace.core.git_ops.GitOps")
+def test_subcommand_interceptor_normal_subcmd(mock_git_ops_class):
+    # Setup mock to fail staging of a non-existent file
+    mock_git_ops = MagicMock()
+    mock_git_ops.execute.side_effect = Exception("failed to stage")
+    mock_git_ops_class.return_value = mock_git_ops
+
+    # Simulate: ace add file1.txt (no NL indicators)
+    with patch.object(sys, "argv", ["ace", "add", "file1.txt"]):
+        result = runner.invoke(app, ["add", "file1.txt"])
+
+    # 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")

ace_git_copilot-0.4.0/ace/__init__.py

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