ace-git-copilot 0.3.3__tar.gz → 0.3.5__tar.gz

{ace_git_copilot-0.3.3 → ace_git_copilot-0.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ace-git-copilot
-Version: 0.3.3
+Version: 0.3.5
 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
@@ -170,6 +170,7 @@ Ace has dedicated subcommands for specific tasks. Here is the complete command l
 | `ace squash` | — | Automatically analyze commit history and run AI-guided interactive rebases. |
 | `ace ignore <rule>` | — | Generate and append standard templates to `.gitignore`. |
 | `ace undo` | — | Safely revert the last action after checking repository status. |
+| `ace workspace` | `ace ws` | Monitor status of multiple repositories and navigate between them. |
 | `ace dash` | — | Launch the interactive repository management console (TUI). |
 | `ace config` | — | Print out active configuration settings. |
 | `ace help` | — | Show user guide and help information on how to use Ace. |
@@ -198,6 +199,14 @@ Distributed under the MIT License. See [LICENSE](LICENSE) for more details.
 
 ## Changelog
 
+### v0.3.5 — Empty Diff Handling (2026-07-11)
+*   Improved warning panel message and title when committing empty files or mode changes to prevent confusing users when files are already staged.
+
+### v0.3.4 — Workspace Management (2026-07-11)
+*   Added new `workspace` command (alias `ws`) to scan, monitor, and navigate multiple repositories.
+*   Shows active branch, staged/unstaged/untracked file counts, and local upstream sync offsets in a Rich Table.
+*   Supports interactive actions to open the TUI dashboard, spawn a nested shell, or run copy-paste commands inside any chosen repository.
+
 ### v0.3.3 — Stability & Resilience (2026-07-04)
 *   Implemented streaming progress and download percentages for Ollama model pulls to prevent thread hangs.
 *   Added atomic file saves and rollback backups for merge conflict resolutions and config modifications to prevent data corruption.

{ace_git_copilot-0.3.3 → ace_git_copilot-0.3.5}/README.md

@@ -137,6 +137,7 @@ Ace has dedicated subcommands for specific tasks. Here is the complete command l
 | `ace squash` | — | Automatically analyze commit history and run AI-guided interactive rebases. |
 | `ace ignore <rule>` | — | Generate and append standard templates to `.gitignore`. |
 | `ace undo` | — | Safely revert the last action after checking repository status. |
+| `ace workspace` | `ace ws` | Monitor status of multiple repositories and navigate between them. |
 | `ace dash` | — | Launch the interactive repository management console (TUI). |
 | `ace config` | — | Print out active configuration settings. |
 | `ace help` | — | Show user guide and help information on how to use Ace. |
@@ -165,6 +166,14 @@ Distributed under the MIT License. See [LICENSE](LICENSE) for more details.
 
 ## Changelog
 
+### v0.3.5 — Empty Diff Handling (2026-07-11)
+*   Improved warning panel message and title when committing empty files or mode changes to prevent confusing users when files are already staged.
+
+### v0.3.4 — Workspace Management (2026-07-11)
+*   Added new `workspace` command (alias `ws`) to scan, monitor, and navigate multiple repositories.
+*   Shows active branch, staged/unstaged/untracked file counts, and local upstream sync offsets in a Rich Table.
+*   Supports interactive actions to open the TUI dashboard, spawn a nested shell, or run copy-paste commands inside any chosen repository.
+
 ### v0.3.3 — Stability & Resilience (2026-07-04)
 *   Implemented streaming progress and download percentages for Ollama model pulls to prevent thread hangs.
 *   Added atomic file saves and rollback backups for merge conflict resolutions and config modifications to prevent data corruption.

ace_git_copilot-0.3.5/ace/__init__.py

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

{ace_git_copilot-0.3.3 → ace_git_copilot-0.3.5}/ace/cli.py

@@ -299,10 +299,22 @@ def commit_cmd(
                 with spinner("Analyzing changes and generating commit message..."):
                     msg = generator.generate_message(format_type=format_type, offline=offline)
             except NoStagedChangesError as e:
-                show_warning_panel(
-                    f"{str(e)}\n\n[bold]Tip:[/bold] Stage your files first: [command]git add <files>[/command]",
-                    "No Staged Changes"
-                )
+                staged_files = []
+                try:
+                    staged_files = git_ops.get_status().get("staged", [])
+                except Exception:
+                    pass
+
+                if staged_files:
+                    show_warning_panel(
+                        f"{str(e)}\n\n[bold]Tip:[/bold] Use [command]git commit -m \"message\"[/command] to commit these changes manually, or add content to the files.",
+                        "Empty Staged Diff"
+                    )
+                else:
+                    show_warning_panel(
+                        f"{str(e)}\n\n[bold]Tip:[/bold] Stage your files first: [command]git add <files>[/command]",
+                        "No Staged Changes"
+                    )
                 raise typer.Exit(code=0)
             except LLMConfigurationError as e:
                 show_error_panel(f"{str(e)}\n\nRun [bold]ace setup[/bold] to configure your AI credentials.", "Configuration Error")
@@ -1686,6 +1698,195 @@ def hook_cmd(
         show_error_panel("Invalid action. Use 'install' or 'uninstall'.", "Usage Error")
         raise typer.Exit(code=1)
 
+@app.command(name="workspace", help="Monitor status of multiple repositories and navigate between them.")
+def workspace_cmd(
+    path: Optional[str] = typer.Argument(
+        None, help="Custom directory to scan (defaults to sibling projects scan)"
+    ),
+):
+    from pathlib import Path
+    import os
+    import sys
+    import subprocess
+    from rich.table import Table
+    from ace.core.git_ops import GitOps, NotAGitRepositoryError
+    from ace.ui.display import console, print_info, print_success, print_warning, print_error
+    from ace.ui.prompts import prompt_select, prompt_action
+
+    # 1. Determine target directory to scan
+    if path:
+        scan_dir = Path(path).resolve()
+    else:
+        # Smart default
+        cwd = Path(os.getcwd()).resolve()
+        if (cwd / ".git").exists():
+            scan_dir = cwd.parent
+        else:
+            scan_dir = cwd
+
+    if not scan_dir.exists() or not scan_dir.is_dir():
+        print_error(f"Directory not found: {scan_dir}")
+        raise typer.Exit(code=1)
+
+    print_info(f"Scanning workspace directory: [bold]{scan_dir}[/bold]")
+
+    # 2. Find git repositories
+    repos_found = []
+    try:
+        for child in sorted(scan_dir.iterdir()):
+            if not child.is_dir():
+                continue
+            # Basic validation that it's a git repo
+            if (child / ".git").exists() or (child / "gitdir").exists() or child.name.endswith(".git"):
+                try:
+                    git_ops = GitOps(str(child))
+                    repos_found.append((child, git_ops))
+                except Exception:
+                    pass
+    except Exception as e:
+        print_error(f"Failed to scan directory: {e}")
+        raise typer.Exit(code=1)
+
+    if not repos_found:
+        print_warning(f"No active Git repositories found in: {scan_dir}")
+        return
+
+    # 3. Build Status Table
+    table = Table(
+        title=f"[bold white]Workspace Summary: {scan_dir.name}[/bold white]",
+        title_style="bold",
+        border_style="#FF6D00",
+        expand=True,
+    )
+    table.add_column("[bold #00D5FF]#[/bold #00D5FF]", justify="right", width=4)
+    table.add_column("Repository", style="bold white")
+    table.add_column("Branch", style="bold cyan")
+    table.add_column("Status", justify="center")
+    table.add_column("Sync", justify="center")
+
+    display_options = []
+    for idx, (repo_path, git_ops) in enumerate(repos_found, 1):
+        repo_name = repo_path.name
+        
+        # Branch
+        branch_name = git_ops.get_current_branch() or "Detached HEAD"
+        
+        # Status counts
+        status = git_ops.get_status()
+        staged = len(status.get("staged", []))
+        unstaged = len(status.get("unstaged", []))
+        untracked = len(status.get("untracked", []))
+        
+        if staged == 0 and unstaged == 0 and untracked == 0:
+            status_desc = "[success]Clean[/success]"
+        else:
+            parts = []
+            if staged > 0:
+                parts.append(f"[bold #00E676]+{staged}[/bold #00E676]")
+            if unstaged > 0:
+                parts.append(f"[bold #FFD600]~{unstaged}[/bold #FFD600]")
+            if untracked > 0:
+                parts.append(f"[bold #FF1744]?{untracked}[/bold #FF1744]")
+            status_desc = " ".join(parts)
+
+        # Sync offsets
+        ab = git_ops.get_ahead_behind()
+        ahead = ab.get("ahead", 0)
+        behind = ab.get("behind", 0)
+        tracking = git_ops.get_upstream_tracking()
+        
+        if not tracking:
+            sync_desc = "[#666666]No Upstream[/#666666]"
+        elif ahead == 0 and behind == 0:
+            sync_desc = "[success]Up-to-date[/success]"
+        elif ahead > 0 and behind == 0:
+            sync_desc = f"[bold #00D5FF]Ahead {ahead}[/bold #00D5FF]"
+        elif behind > 0 and ahead == 0:
+            sync_desc = f"[bold #FFD600]Behind {behind}[/bold #FFD600]"
+        else:
+            sync_desc = f"[bold #FF1744]Diverged (A{ahead}, B{behind})[/bold #FF1744]"
+
+        table.add_row(
+            str(idx),
+            repo_name,
+            branch_name,
+            status_desc,
+            sync_desc
+        )
+        display_options.append(repo_name)
+
+    console.print()
+    console.print(table)
+    console.print()
+
+    # 4. Prompt selection
+    selected_idx = prompt_select(
+        display_options,
+        prompt_text="  Select repository number to manage (or 'q' to quit)",
+        default="q"
+    )
+    
+    if selected_idx < 0:
+        print_info("Exit workspace monitor.")
+        return
+
+    selected_path, _ = repos_found[selected_idx]
+
+    # 5. Prompt action choice
+    console.print(f"\n[bold white]  Choose action for [bold cyan]{selected_path.name}[/bold cyan]:[/bold white]")
+    action_options = {
+        "d": ("Dashboard", "Open interactive TUI dashboard"),
+        "s": ("Shell", "Spawn an interactive shell in project directory"),
+        "c": ("Command", "Execute an ace natural-language command"),
+        "q": ("Quit", "Cancel action and exit")
+    }
+    
+    action = prompt_action(action_options, default_key="d")
+    
+    if action == "d":
+        print_success(f"Launching dashboard in {selected_path.name}...")
+        console.print()
+        try:
+            subprocess.run([sys.executable, "-m", "ace", "dash"], cwd=str(selected_path))
+        except Exception as e:
+            print_error(f"Failed to launch dashboard: {e}")
+            
+    elif action == "s":
+        shell = os.environ.get("SHELL")
+        if not shell:
+            if sys.platform == "win32":
+                shell = "powershell.exe"
+            else:
+                shell = "/bin/bash"
+                
+        print_success(f"Opening interactive shell in {selected_path.name}...")
+        print_info("Type 'exit' to return to Ace workspace monitor.")
+        console.print()
+        
+        try:
+            subprocess.run([shell], cwd=str(selected_path))
+            print_success("Returned to Ace workspace.")
+        except Exception as e:
+            print_error(f"Failed to open shell: {e}")
+            
+    elif action == "c":
+        query = typer.prompt("  Enter command for this repo")
+        if query.strip():
+            print_success(f"Running command: {query}")
+            console.print()
+            try:
+                subprocess.run([sys.executable, "-m", "ace", query], cwd=str(selected_path))
+            except Exception as e:
+                print_error(f"Failed to run command: {e}")
+
+@app.command(name="ws", help="Alias for 'workspace' command.")
+def ws_cmd(
+    path: Optional[str] = typer.Argument(
+        None, help="Custom directory to scan"
+    ),
+):
+    workspace_cmd(path)
+
 if __name__ == "__main__":
     app()
 

{ace_git_copilot-0.3.3 → ace_git_copilot-0.3.5}/pyproject.toml

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

ace_git_copilot-0.3.5/tests/test_workspace.py

@@ -0,0 +1,89 @@
+import pytest
+from unittest.mock import patch, MagicMock
+from pathlib import Path
+from ace.cli import workspace_cmd
+
+@patch("ace.core.git_ops.GitOps")
+@patch("pathlib.Path.iterdir")
+@patch("pathlib.Path.is_dir")
+@patch("pathlib.Path.exists")
+@patch("ace.ui.prompts.prompt_select")
+@patch("ace.ui.prompts.prompt_action")
+@patch("subprocess.run")
+def test_workspace_cmd_select_dashboard(
+    mock_sub_run,
+    mock_action,
+    mock_select,
+    mock_exists,
+    mock_is_dir,
+    mock_iterdir,
+    mock_gitops
+):
+    # Setup directories
+    repo_path = MagicMock(spec=Path)
+    repo_path.name = "my-test-project"
+    repo_path.__str__.return_value = "/mock/workspace/my-test-project"
+    
+    # Mock checks
+    mock_is_dir.return_value = True
+    # mock exists to simulate that (child / ".git") exists
+    mock_exists.side_effect = lambda: True
+    mock_iterdir.return_value = [repo_path]
+    
+    # Mock GitOps response
+    mock_git = MagicMock()
+    mock_git.get_current_branch.return_value = "main"
+    mock_git.get_status.return_value = {"staged": ["file1.txt"], "unstaged": [], "untracked": []}
+    mock_git.get_ahead_behind.return_value = {"ahead": 2, "behind": 0}
+    mock_git.get_upstream_tracking.return_value = "origin/main"
+    mock_gitops.return_value = mock_git
+    
+    # Selection: idx 0 (my-test-project)
+    mock_select.return_value = 0
+    # Action: 'd' (Dashboard)
+    mock_action.return_value = "d"
+    
+    # Run
+    workspace_cmd("/mock/workspace")
+    
+    # Assert dashboard was spawned in the subdirectory via subprocess
+    mock_sub_run.assert_called_once()
+    args, kwargs = mock_sub_run.call_args
+    assert "dash" in args[0]
+    assert kwargs["cwd"] == "/mock/workspace/my-test-project"
+
+@patch("ace.core.git_ops.GitOps")
+@patch("pathlib.Path.iterdir")
+@patch("pathlib.Path.is_dir")
+@patch("pathlib.Path.exists")
+@patch("ace.ui.prompts.prompt_select")
+def test_workspace_cmd_quit_early(
+    mock_select,
+    mock_exists,
+    mock_is_dir,
+    mock_iterdir,
+    mock_gitops
+):
+    repo_path = MagicMock(spec=Path)
+    repo_path.name = "my-test-project"
+    repo_path.__str__.return_value = "/mock/workspace/my-test-project"
+    
+    mock_is_dir.return_value = True
+    mock_exists.side_effect = lambda: True
+    mock_iterdir.return_value = [repo_path]
+    
+    mock_git = MagicMock()
+    mock_git.get_current_branch.return_value = "main"
+    mock_git.get_status.return_value = {"staged": [], "unstaged": [], "untracked": []}
+    mock_git.get_ahead_behind.return_value = {"ahead": 0, "behind": 0}
+    mock_git.get_upstream_tracking.return_value = "origin/main"
+    mock_gitops.return_value = mock_git
+    
+    # Selection: -1 (Quit/Skip)
+    mock_select.return_value = -1
+    
+    # Run
+    workspace_cmd("/mock/workspace")
+    
+    # Verify no action prompt or subprocess was triggered
+    mock_select.assert_called_once()

ace_git_copilot-0.3.3/ace/__init__.py

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