ace-git-copilot 0.3.0__tar.gz → 0.3.2__tar.gz

{ace_git_copilot-0.3.0 → ace_git_copilot-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ace-git-copilot
-Version: 0.3.0
+Version: 0.3.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
@@ -193,3 +193,32 @@ The dashboard features:
 ## License
 
 Distributed under the MIT License. See [LICENSE](LICENSE) for more details.
+
+---
+
+## Changelog
+
+### v0.3.1 — Patch (2026-06-30)
+*   Fixed invisible key labels (`[c]`, `[r]`, etc.) in the dashboard and search menus caused by Rich markup tag conflicts.
+*   Fixed `[Y/n]` confirmation prompt rendering invisibly.
+
+### v0.3.0 — UI Polish (2026-06-30)
+*   Rewrote all UI output modules (`display.py`, `prompts.py`, `dashboard.py`, `themes.py`) for a polished, professional look.
+*   Removed all unprofessional emojis; replaced with clean ASCII status symbols (`>>`, `**`, `!!`, `EE`).
+*   Dashboard panels now use consistent `ROUNDED` borders, colour-coded file lists (`+` staged, `~` unstaged, `?` untracked), and a styled commit history table.
+*   Execution plan table uses `SIMPLE_HEAD` style with colour-highlighted `git` and `ace` command prefixes.
+*   Commit message panel shows character count badge coloured green/amber/red relative to the 72-char limit.
+*   AI code review score rendered as a styled badge based on score range.
+*   Added `[tool.ruff]` configuration to exclude `.agents/` scratch folder from lint checks.
+
+### v0.2.9 — Metadata & Build Fix (2026-06-30)
+*   Fixed broken `pyproject.toml` TOML syntax (invalid inline `urls` table).
+*   Added full `authors` and `[project.urls]` metadata visible on PyPI.
+
+### v0.2.6 — Startup Optimisation (2026-06-21)
+*   Implemented lazy-loading for all heavy LangChain imports — CLI startup under 200 ms.
+*   Added `ace switch` command for switching between sibling repositories from the dashboard.
+
+### v0.2.3 — Feature Expansion (2026-06-09)
+*   Added `ace doctor`, `ace hook`, and `ace squash` commands.
+*   Comprehensive E2E test suite added under `tests/e2e/`.

{ace_git_copilot-0.3.0 → ace_git_copilot-0.3.2}/README.md

@@ -160,3 +160,32 @@ The dashboard features:
 ## License
 
 Distributed under the MIT License. See [LICENSE](LICENSE) for more details.
+
+---
+
+## Changelog
+
+### v0.3.1 — Patch (2026-06-30)
+*   Fixed invisible key labels (`[c]`, `[r]`, etc.) in the dashboard and search menus caused by Rich markup tag conflicts.
+*   Fixed `[Y/n]` confirmation prompt rendering invisibly.
+
+### v0.3.0 — UI Polish (2026-06-30)
+*   Rewrote all UI output modules (`display.py`, `prompts.py`, `dashboard.py`, `themes.py`) for a polished, professional look.
+*   Removed all unprofessional emojis; replaced with clean ASCII status symbols (`>>`, `**`, `!!`, `EE`).
+*   Dashboard panels now use consistent `ROUNDED` borders, colour-coded file lists (`+` staged, `~` unstaged, `?` untracked), and a styled commit history table.
+*   Execution plan table uses `SIMPLE_HEAD` style with colour-highlighted `git` and `ace` command prefixes.
+*   Commit message panel shows character count badge coloured green/amber/red relative to the 72-char limit.
+*   AI code review score rendered as a styled badge based on score range.
+*   Added `[tool.ruff]` configuration to exclude `.agents/` scratch folder from lint checks.
+
+### v0.2.9 — Metadata & Build Fix (2026-06-30)
+*   Fixed broken `pyproject.toml` TOML syntax (invalid inline `urls` table).
+*   Added full `authors` and `[project.urls]` metadata visible on PyPI.
+
+### v0.2.6 — Startup Optimisation (2026-06-21)
+*   Implemented lazy-loading for all heavy LangChain imports — CLI startup under 200 ms.
+*   Added `ace switch` command for switching between sibling repositories from the dashboard.
+
+### v0.2.3 — Feature Expansion (2026-06-09)
+*   Added `ace doctor`, `ace hook`, and `ace squash` commands.
+*   Comprehensive E2E test suite added under `tests/e2e/`.

ace_git_copilot-0.3.2/ace/__init__.py

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

{ace_git_copilot-0.3.0 → ace_git_copilot-0.3.2}/ace/ai/changelog_generator.py

@@ -18,6 +18,24 @@ class ChangelogGenerator:
         If from_ref is None, attempts to find the latest tag.
         If no latest tag exists, falls back to the last 30 commits.
         """
+        if from_ref:
+            try:
+                self.git_ops.execute(f"rev-parse --verify {from_ref}")
+            except Exception:
+                raise ChangelogGeneratorError(f"Invalid starting revision: {from_ref}")
+
+        if to_ref:
+            try:
+                self.git_ops.execute(f"rev-parse --verify {to_ref}")
+            except Exception:
+                raise ChangelogGeneratorError(f"Invalid ending revision: {to_ref}")
+
+        # Check if HEAD exists first
+        try:
+            self.git_ops.execute("rev-parse --verify HEAD")
+        except Exception:
+            return ""
+
         to_revision = to_ref or "HEAD"
         from_revision = from_ref
         

{ace_git_copilot-0.3.0 → ace_git_copilot-0.3.2}/ace/ai/commit_generator.py

@@ -29,8 +29,13 @@ class CommitGenerator:
             raise NoStagedChangesError("No changes are staged for commit. Stage files first using 'git add'.")
 
         staged_diff = self.git_ops.get_staged_diff()
-        if not staged_diff.strip():
-            # Sometimes status has staged but diff is empty (e.g. only file permissions or empty files)
+        has_content_changes = False
+        for line in staged_diff.splitlines():
+            if (line.startswith("+") and not line.startswith("+++")) or (line.startswith("-") and not line.startswith("---")):
+                has_content_changes = True
+                break
+
+        if not has_content_changes:
             raise NoStagedChangesError("Staged diff is empty. Cannot generate commit message.")
 
         # Format context

{ace_git_copilot-0.3.0 → ace_git_copilot-0.3.2}/ace/ai/llm_factory.py

@@ -43,10 +43,11 @@ def ensure_ollama_model(base_url: str, model_name: str) -> None:
         return
 
     # 2. Prompt user and pull model
-    from ace.ui.display import console, spinner
+    from ace.ui.display import console, spinner, print_warning, print_success, print_error, print_info
     from ace.ui.prompts import confirm
     
-    console.print(f"\n[warning]⚠️  Ollama model [bold]{model_name}[/bold] is not downloaded locally.[/warning]")
+    console.print()
+    print_warning(f"Ollama model '{model_name}' is not downloaded locally.")
     if confirm(f"Would you like Ace to automatically pull '{model_name}' from the Ollama registry?", default=True):
         try:
             url = f"{base_url.rstrip('/')}/api/pull"
@@ -58,12 +59,12 @@ def ensure_ollama_model(base_url: str, model_name: str) -> None:
                 with urllib.request.urlopen(req) as response:
                     res_data = json.loads(response.read().decode("utf-8"))
                     if res_data.get("status") == "success" or "success" in str(res_data):
-                        console.print(f"[success]✅ Successfully downloaded '{model_name}'![/success]\n")
+                        print_success(f"Successfully downloaded '{model_name}'!\n")
                     else:
-                        console.print(f"[info]Ollama response: {res_data}[/info]\n")
+                        print_info(f"Ollama response: {res_data}\n")
         except Exception as e:
-            console.print(f"[error]❌ Failed to pull model: {e}[/error]")
-            console.print(f"[info]Please run 'ollama pull {model_name}' manually in your shell.[/info]\n")
+            print_error(f"Failed to pull model: {e}")
+            print_info(f"Please run 'ollama pull {model_name}' manually in your shell.\n")
 
 def get_llm(offline_override: bool = False) -> BaseChatModel:
     """

{ace_git_copilot-0.3.0 → ace_git_copilot-0.3.2}/ace/cli.py

@@ -138,9 +138,9 @@ def main(
         r_level, r_desc, alt = SafetyChecker.analyze_command(cmd)
         if r_level == "destructive":
             highest_risk = "destructive"
-            risk_details.append(f"[bold red]Command:[/bold] {cmd}\n[bold red]Risk:[/bold] {r_desc}")
+            risk_details.append(f"[bold red]Command:[/] {cmd}\n[bold red]Risk:[/] {r_desc}")
             if alt:
-                safer_alts.append(f"[bold green]Safer Alternative:[/bold] {alt}")
+                safer_alts.append(f"[bold green]Safer Alternative:[/] {alt}")
         elif r_level == "moderate" and highest_risk != "destructive":
             highest_risk = "moderate"
 
@@ -191,8 +191,19 @@ def main(
                     raise typer.Exit(code=1)
             else:
                 try:
-                    res = git_ops.execute(cmd)
-                    outputs.append(res)
+                    import subprocess
+                    import sys
+                    args = cmd.split()[1:]
+                    res_proc = subprocess.run(
+                        [sys.executable, "-c", "from ace.cli import app; app()"] + args,
+                        stdout=subprocess.PIPE,
+                        stderr=subprocess.PIPE,
+                        text=True,
+                        encoding="utf-8"
+                    )
+                    if res_proc.returncode != 0:
+                        raise Exception(res_proc.stderr or res_proc.stdout)
+                    outputs.append(res_proc.stdout)
                 except Exception as e:
                     show_error_panel(f"Failed to execute command '{cmd}': {e}", "Execution Error")
                     raise typer.Exit(code=1)
@@ -207,7 +218,7 @@ def main(
 
     # Summarization flow for read-only history queries
     combined_output = "\n".join(outputs)
-    if highest_risk == "safe" and combined_output.strip():
+    if highest_risk == "safe" and combined_output.strip() and not any(c.startswith("ace ") for c in commands):
         from ace.ai.history_analyzer import HistoryAnalyzer
         from rich.markdown import Markdown
         analyzer = HistoryAnalyzer(git_ops)
@@ -270,6 +281,8 @@ def commit_cmd(
             with open(prepare, "w", encoding="utf-8") as f:
                 f.write(msg)
             raise typer.Exit(code=0)
+        except (typer.Exit, typer.Abort):
+            raise
         except NoStagedChangesError:
             raise typer.Exit(code=0)
         except Exception as e:
@@ -785,7 +798,8 @@ def changelog_cmd(
         show_error_panel(f"{str(e)}\n\nRun [bold]ace setup[/bold] to configure your AI credentials.", "Configuration Error")
         raise typer.Exit(code=1)
     except Exception as e:
-        show_error_panel(f"Failed to generate changelog: {e}", "AI Error")
+        title = "Git Error" if "ChangelogGeneratorError" in str(type(e)) or "Cmd('git')" in str(e) or "Invalid starting revision" in str(e) or "Invalid ending revision" in str(e) else "AI Error"
+        show_error_panel(f"Failed to generate changelog: {e}", title)
         raise typer.Exit(code=1)
 
     # Show or write to file
@@ -1154,9 +1168,9 @@ def undo_cmd(
         r_level, r_desc, alt = SafetyChecker.analyze_command(cmd)
         if r_level == "destructive":
             highest_risk = "destructive"
-            risk_details.append(f"[bold red]Command:[/bold] {cmd}\n[bold red]Risk:[/bold] {r_desc}")
+            risk_details.append(f"[bold red]Command:[/] {cmd}\n[bold red]Risk:[/] {r_desc}")
             if alt:
-                safer_alts.append(f"[bold green]Safer Alternative:[/bold] {alt}")
+                safer_alts.append(f"[bold green]Safer Alternative:[/] {alt}")
         elif r_level == "moderate" and highest_risk != "destructive":
             highest_risk = "moderate"
 
@@ -1251,7 +1265,8 @@ def pr_cmd(
         with spinner(f"Generating PR description against base branch '{base}'..."):
             pr_data = drafter.draft_pr(base, offline=offline)
     except Exception as e:
-        show_error_panel(f"Failed to generate PR description: {e}", "AI Error")
+        title = "Git Error" if "Cmd('git')" in str(e) or "git log" in str(e) or "exit code" in str(e) else "AI Error"
+        show_error_panel(f"Failed to generate PR description: {e}", title)
         raise typer.Exit(code=1)
 
     title = pr_data.get("title", "Pull Request")
@@ -1335,10 +1350,16 @@ def search_cmd(
             
             # Show options
             console.print("\n[bold]Select action:[/bold]")
-            console.print("  [bold cyan][d][/bold cyan] -> View diff of this commit")
-            console.print("  [bold cyan][c][/bold cyan] -> Checkout this commit (detached HEAD)")
-            console.print("  [bold cyan][b][/bold cyan] -> Create and switch to new branch at this commit")
-            console.print("  [bold cyan][s][/bold cyan] -> Skip/Quit")
+            def _key(k: str, desc: str) -> None:
+                from rich.text import Text
+                console.print(Text.assemble(
+                    ("  ", ""), (f"[{k}]", "bold #00D5FF"), (f"  {desc}", "#BDBDBD")
+                ))
+            _key("d", "View diff of this commit")
+            _key("c", "Checkout this commit (detached HEAD)")
+            _key("b", "Create and switch to a new branch here")
+            _key("s", "Skip / Quit")
+
             
             action = click.getchar().lower().strip()
             console.print(action)

{ace_git_copilot-0.3.0 → ace_git_copilot-0.3.2}/ace/ui/dashboard.py

@@ -199,16 +199,18 @@ def show_dashboard(git_ops: GitOps, offline: bool = False):
         console.print()
 
         # ── Action menu ─────────────────────────────────────────────────────
-        menu = Table(show_header=False, box=None, padding=(0, 3), expand=False)
-        menu.add_column(style="bold #00D5FF", justify="right", width=4)
-        menu.add_column(style="#BDBDBD", width=20)
-        menu.add_column(style="bold #00D5FF", justify="right", width=4)
-        menu.add_column(style="#BDBDBD")
-
-        menu.add_row("[c]", "AI Commit",          "[r]", "AI Code Review")
-        menu.add_row("[u]", "Smart Undo",          "[p]", "Plan Command (AI)")
-        menu.add_row("[s]", "Repo Stats",          "[w]", "Switch Repo")
-        menu.add_row("[q]", "Quit",                "",    "")
+        menu = Table(show_header=False, box=None, padding=(0, 4), expand=False)
+        menu.add_column(min_width=22)
+        menu.add_column(min_width=22)
+
+
+        def _row(key: str, label: str) -> Text:
+            return Text.assemble((f"[{key}]", "bold #00D5FF"), (f"  {label}", "#BDBDBD"))
+
+        menu.add_row(_row("c", "AI Commit"),    _row("r", "AI Code Review"))
+        menu.add_row(_row("u", "Smart Undo"),   _row("p", "Plan Command (AI)"))
+        menu.add_row(_row("s", "Repo Stats"),   _row("w", "Switch Repo"))
+        menu.add_row(_row("q", "Quit"),         Text(""))
 
         console.print(
             Panel(menu, title="[bold white]Actions[/bold white]",

{ace_git_copilot-0.3.0 → ace_git_copilot-0.3.2}/ace/ui/display.py

@@ -30,9 +30,65 @@ def print_warning(message: str) -> None:
     """Print a warning message."""
     console.print(f" [warning]{_SYM_WARNING}[/warning]  [warning]{message}[/warning]")
 
+def clean_error_message(message: str) -> str:
+    """Clean up common LLM API response dumps and traceback details into human-readable text."""
+    from rich.markup import escape
+
+    # Normalize/clean raw message string
+    msg_str = str(message).strip()
+
+    # Check for NVIDIA/OpenAI 504 gateway timeout
+    if "504" in msg_str or "Gateway Timeout" in msg_str:
+        return (
+            "API Server Error: [bold #FF1744]Gateway Timeout (504)[/bold #FF1744]\n\n"
+            "The cloud AI provider servers took too long to respond. This is a temporary server "
+            "overload. Please try again in a few moments, or run [bold]ace setup[/bold] to switch "
+            "to a local model (Ollama) or another provider."
+        )
+
+    # Check for authentication errors
+    if "AuthenticationError" in msg_str or "invalid api key" in msg_str.lower() or "401" in msg_str:
+        return (
+            "API Authentication Error: [bold #FF1744]Invalid API Key[/bold #FF1744]\n\n"
+            "Please check that your API key is correct and active. Run [bold]ace setup[/bold] to reconfigure."
+        )
+
+    # Check for rate limits
+    if "RateLimitError" in msg_str or "429" in msg_str or "rate limit exceeded" in msg_str.lower():
+        return (
+            "API Rate Limit Error: [bold #FF1744]Too Many Requests[/bold #FF1744]\n\n"
+            "You have hit the rate limit for this API provider. Please wait a moment before trying again."
+        )
+
+    # General Connection errors
+    if "ConnectionError" in msg_str or "Failed to establish a new connection" in msg_str or "timeout" in msg_str.lower():
+        return (
+            "API Connection Error: [bold #FF1744]Network Timeout[/bold #FF1744]\n\n"
+            "Could not connect to the AI API endpoint. Please check your internet connection and try again."
+        )
+
+    # If it's a raw dictionary dump of a response (like in NVIDIA / OpenAI SDK exception strings)
+    if "{'_content':" in msg_str or "'status_code':" in msg_str or "'_content_consumed':" in msg_str:
+        lines = msg_str.splitlines()
+        first_line = lines[0] if lines else ""
+        if "APIStatusError" in first_line:
+            first_line = first_line.split("APIStatusError:")[-1].strip()
+            
+        import re
+        status_match = re.search(r"'status_code':\s*(\d+)", msg_str)
+        reason_match = re.search(r"'reason':\s*'([^']+)'", msg_str)
+        if status_match and reason_match:
+            return f"API Error: [bold #FF1744]{escape(reason_match.group(1))} ({status_match.group(1)})[/bold #FF1744]"
+        elif status_match:
+            return f"API Error: [bold #FF1744]Status Code {status_match.group(1)}[/bold #FF1744]"
+        return escape(first_line) if first_line else "An unexpected API error occurred."
+
+    # If it's a generic exception or string, escape it to prevent Rich markup parsing errors
+    return escape(msg_str)
+
 def print_error(message: str) -> None:
     """Print an error message."""
-    err_console.print(f" [error]{_SYM_ERROR}[/error]  [error]{message}[/error]")
+    err_console.print(f" [error]{_SYM_ERROR}[/error]  [error]{clean_error_message(message)}[/error]")
 
 
 # ─── Panels ──────────────────────────────────────────────────────────────────
@@ -57,8 +113,11 @@ def show_error_panel(message: str, title: str = "Error") -> None:
     """Show a styled red error panel."""
     from rich.panel import Panel
     from rich import box
+    
+    cleaned_message = clean_error_message(message)
+    
     panel = Panel(
-        Text.from_markup(message),
+        Text.from_markup(cleaned_message),
         title=f"[bold #FF1744] {_SYM_ERROR} {title}[/bold #FF1744]",
         border_style="#FF1744",
         box=box.ROUNDED,

{ace_git_copilot-0.3.0 → ace_git_copilot-0.3.2}/ace/ui/prompts.py

@@ -13,7 +13,7 @@ def confirm(question: str, default: bool = True) -> bool:
     hint = "[Y/n]" if default else "[y/N]"
     console.print(
         Text.assemble(
-            ("  › ", "bold #00D5FF"),
+            ("  >> ", "bold #00D5FF"),
             (question + "  ", "bold white"),
             (hint, "bold #666666"),
             ("  ", ""),
@@ -30,7 +30,8 @@ def confirm(question: str, default: bool = True) -> bool:
         return False
     if val in ("\r", "\n", ""):
         return default
-    return default
+    # Default to False for safety on unrecognized inputs
+    return False
 
 
 def prompt_action(options: Dict[str, Tuple[str, str]], default_key: str = "\r") -> str:

{ace_git_copilot-0.3.0 → ace_git_copilot-0.3.2}/pyproject.toml

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

{ace_git_copilot-0.3.0 → ace_git_copilot-0.3.2}/tests/e2e/conftest.py

@@ -13,8 +13,19 @@ class MockLLMHandler(BaseHTTPRequestHandler):
         # Suppress request logging to keep output clean
         pass
 
+    def do_GET(self):
+        if self.path == "/api/tags":
+            self.send_response(200)
+            self.send_header("Content-Type", "application/json")
+            self.end_headers()
+            self.wfile.write(json.dumps({"models": [{"name": "qwen2.5-coder:7b"}]}).encode('utf-8'))
+        else:
+            self.send_response(404)
+            self.end_headers()
+
     def do_POST(self):
-        if self.path == "/v1/chat/completions":
+        is_ollama = (self.path == "/api/chat")
+        if self.path == "/v1/chat/completions" or is_ollama:
             content_length = int(self.headers['Content-Length'])
             post_data = self.rfile.read(content_length)
             payload = json.loads(post_data.decode('utf-8'))
@@ -69,7 +80,14 @@ class MockLLMHandler(BaseHTTPRequestHandler):
                         "risk_level": "destructive",
                         "alternatives": "git stash"
                     })
-                elif "invalid" in query_val or "unrelated" in query_val:
+                elif "config" in query_val:
+                    response_content = json.dumps({
+                        "commands": ["ace config"],
+                        "explanation": "Show active configuration.",
+                        "risk_level": "safe",
+                        "alternatives": None
+                    })
+                elif "invalid" in query_val or "unrelated" in query_val or "coffee" in query_val or "make me" in query_val:
                     response_content = json.dumps({
                         "commands": [],
                         "explanation": "I cannot parse this command.",
@@ -109,6 +127,10 @@ class MockLLMHandler(BaseHTTPRequestHandler):
                         "alternatives": None
                     })
             
+            # 3. Changelog Generator
+            elif "release coordinator and technical writer" in full_text or "Markdown changelog from the provided Git commit log" in full_text or "changelog" in full_text.lower():
+                response_content = "# Changelog\n\n## [1.0.0]\n\n### ✨ Features\n- Add mock feature\n\n### 🐛 Bug Fixes\n- Fix mock bug"
+            
             # 2. Commit Message Generator
             elif "Conventional Commits" in full_text or "commit message" in full_text or "Staged Diff" in full_text:
                 if "one-line commit message" in full_text or "SIMPLE_COMMIT_SYSTEM_PROMPT" in full_text:
@@ -118,10 +140,6 @@ class MockLLMHandler(BaseHTTPRequestHandler):
                 else:
                     response_content = "feat(mock): add mock feature\n\n- Implement mock feature details\n- Add mock feature tests"
             
-            # 3. Changelog Generator
-            elif "release coordinator and technical writer" in full_text or "Markdown changelog from the provided Git commit log" in full_text:
-                response_content = "# Changelog\n\n## [1.0.0]\n\n### ✨ Features\n- Add mock feature\n\n### 🐛 Bug Fixes\n- Fix mock bug"
-            
             # 4. PR Drafter
             elif "PR_SYSTEM_PROMPT" in full_text or "Pull Request (PR) description" in full_text:
                 response_content = json.dumps({
@@ -134,54 +152,64 @@ class MockLLMHandler(BaseHTTPRequestHandler):
                 response_content = "🩺 **Diagnostics Assessment**\n\nFound some issues.\n\n📋 **Recovery Plan**\n\n- Run git clean\n- Run git restore\n\n💡 **Prevention Tip**\n\nCommit more often."
             
             # 6. Smart Undo
-            elif "UNDO_SYSTEM_PROMPT" in full_text or "reflog_entries" in full_text:
-                if "test_staged.txt" in full_text or "staged_files" in full_text and "None" not in full_text:
-                    response_content = json.dumps({
-                        "commands": ["git restore --staged ."],
-                        "explanation": "Unstage changes.",
-                        "risk_level": "moderate",
-                        "alternatives": None
-                    })
-                elif "destructive" in full_text or "hard" in full_text:
-                    response_content = json.dumps({
-                        "commands": ["git reset --hard ORIG_HEAD"],
-                        "explanation": "Destructively undo merge.",
-                        "risk_level": "destructive",
-                        "alternatives": "git stash"
-                    })
-                elif "nothing" in full_text or "clean" in full_text:
+            elif "Active Operations:" in full_text or "recent Git reflog" in full_text:
+                if "No reflog available" in full_text or ("Staged Changes:\nNone" in full_text and "Unstaged Changes:\nNone" in full_text):
                     response_content = json.dumps({
                         "commands": [],
                         "explanation": "Nothing to undo.",
                         "risk_level": "safe",
                         "alternatives": None
                     })
-                else:
+                elif "test_staged.txt" in full_text or "test.txt" in full_text:
+                    response_content = json.dumps({
+                        "commands": ["git restore --staged ."],
+                        "explanation": "Unstage changes.",
+                        "risk_level": "moderate",
+                        "alternatives": None
+                    })
+                elif "update commit" in full_text:
                     response_content = json.dumps({
                         "commands": ["git reset --soft HEAD~1"],
                         "explanation": "Undo last commit.",
                         "risk_level": "moderate",
                         "alternatives": None
                     })
+                else:
+                    response_content = json.dumps({
+                        "commands": ["git reset --hard ORIG_HEAD"],
+                        "explanation": "Destructively undo merge.",
+                        "risk_level": "destructive",
+                        "alternatives": "git stash"
+                    })
             
             self.send_response(200)
             self.send_header("Content-Type", "application/json")
             self.end_headers()
             
-            response_payload = {
-                "id": "chatcmpl-mock",
-                "object": "chat.completion",
-                "created": 1677652288,
-                "model": "mock-model",
-                "choices": [{
-                    "index": 0,
+            if is_ollama:
+                response_payload = {
+                    "model": "qwen2.5-coder:7b",
                     "message": {
                         "role": "assistant",
                         "content": response_content
                     },
-                    "finish_reason": "stop"
-                }]
-            }
+                    "done": True
+                }
+            else:
+                response_payload = {
+                    "id": "chatcmpl-mock",
+                    "object": "chat.completion",
+                    "created": 1677652288,
+                    "model": "mock-model",
+                    "choices": [{
+                        "index": 0,
+                        "message": {
+                            "role": "assistant",
+                            "content": response_content
+                        },
+                        "finish_reason": "stop"
+                    }]
+                }
             self.wfile.write(json.dumps(response_payload).encode('utf-8'))
         else:
             self.send_response(404)
@@ -232,13 +260,14 @@ def git_workspace(tmp_path, mock_llm_port):
             cmd = [
                 sys.executable,
                 "-c",
-                "import sys, click; click.getchar = lambda: sys.stdin.read(1); from ace.cli import app; app()",
+                "import sys, click, getpass; click.getchar = lambda: sys.stdin.read(1); getpass.getpass = lambda prompt='', stream=None: sys.stdin.readline().rstrip('\\r\\n'); from ace.cli import app; app()",
             ] + args
             env = os.environ.copy()
             env["ACE_PROVIDER"] = "custom"
             env["CUSTOM_API_BASE"] = f"http://127.0.0.1:{self.port}/v1"
             env["CUSTOM_API_KEY"] = "mock-key"
             env["CUSTOM_MODEL"] = "mock-model"
+            env["OLLAMA_URL"] = f"http://127.0.0.1:{self.port}"
             env["HOME"] = str(self.home)
             env["USERPROFILE"] = str(self.home)
             

{ace_git_copilot-0.3.0 → ace_git_copilot-0.3.2}/tests/e2e/test_tier1_features.py

@@ -165,8 +165,8 @@ def test_changelog_display(git_workspace):
     
     res = git_workspace.run(["changelog"])
     assert res.returncode == 0
-    assert "## [1.0.0]" in res.stdout
-    assert "### ✨ Features" in res.stdout
+    assert "[1.0.0]" in res.stdout
+    assert "Features" in res.stdout
 
 def test_changelog_output_file(git_workspace):
     test_file = git_workspace.workspace / "test.txt"
@@ -178,9 +178,15 @@ def test_changelog_output_file(git_workspace):
     res = git_workspace.run(["changelog", "-o", str(out_file)])
     assert res.returncode == 0
     assert out_file.exists()
-    assert "## [1.0.0]" in out_file.read_text()
+    assert "## [1.0.0]" in out_file.read_text(encoding="utf-8")
 
 def test_changelog_range(git_workspace):
+    # Create initial commit so HEAD~1 exists
+    dummy_file = git_workspace.workspace / "dummy.txt"
+    dummy_file.write_text("dummy")
+    git_workspace.repo.index.add([str(dummy_file)])
+    git_workspace.repo.index.commit("initial")
+
     test_file = git_workspace.workspace / "test.txt"
     test_file.write_text("changelog content 3")
     git_workspace.repo.index.add([str(test_file)])
@@ -188,7 +194,7 @@ def test_changelog_range(git_workspace):
     
     res = git_workspace.run(["changelog", "--from", "HEAD~1", "--to", "HEAD"])
     assert res.returncode == 0
-    assert "## [1.0.0]" in res.stdout
+    assert "[1.0.0]" in res.stdout
 
 def test_changelog_offline(git_workspace):
     test_file = git_workspace.workspace / "test.txt"
@@ -198,7 +204,7 @@ def test_changelog_offline(git_workspace):
     
     res = git_workspace.run(["changelog", "--offline"])
     assert res.returncode == 0
-    assert "## [1.0.0]" in res.stdout
+    assert "[1.0.0]" in res.stdout
 
 def test_changelog_empty(git_workspace):
     # Fresh repository with no commits
@@ -340,9 +346,15 @@ def test_undo_commit(git_workspace):
     
     # Commit should be undone, leaving 1 commit and changes staged
     assert len(list(git_workspace.repo.iter_commits())) == 1
-    assert "test.txt" in git_workspace.repo.index.diff("HEAD")
+    assert "test.txt" in [diff.a_path for diff in git_workspace.repo.index.diff("HEAD")]
 
 def test_undo_staged(git_workspace):
+    # Create initial commit so HEAD exists
+    dummy_file = git_workspace.workspace / "dummy.txt"
+    dummy_file.write_text("dummy")
+    git_workspace.repo.index.add([str(dummy_file)])
+    git_workspace.repo.index.commit("initial")
+
     test_file = git_workspace.workspace / "test_staged.txt"
     test_file.write_text("staged content")
     git_workspace.repo.index.add([str(test_file)])