ace-git-copilot 0.3.4__tar.gz → 0.3.6__tar.gz

{ace_git_copilot-0.3.4 → ace_git_copilot-0.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ace-git-copilot
-Version: 0.3.4
+Version: 0.3.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
@@ -199,6 +199,13 @@ Distributed under the MIT License. See [LICENSE](LICENSE) for more details.
 
 ## Changelog
 
+### v0.3.6 — Merge/Rebase Conflict Planning Fix (2026-07-12)
+*   Enhanced repository context builder to check for active unmerged files in the index, distinguishing between resolved and unresolved conflict states.
+*   Updated AI intent guidelines to prevent the planner from incorrectly suggesting `git merge --abort` when conflicts are already resolved and ready to be finalized.
+
+### 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.

{ace_git_copilot-0.3.4 → ace_git_copilot-0.3.6}/README.md

@@ -166,6 +166,13 @@ Distributed under the MIT License. See [LICENSE](LICENSE) for more details.
 
 ## Changelog
 
+### v0.3.6 — Merge/Rebase Conflict Planning Fix (2026-07-12)
+*   Enhanced repository context builder to check for active unmerged files in the index, distinguishing between resolved and unresolved conflict states.
+*   Updated AI intent guidelines to prevent the planner from incorrectly suggesting `git merge --abort` when conflicts are already resolved and ready to be finalized.
+
+### 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.

ace_git_copilot-0.3.6/ace/__init__.py

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

{ace_git_copilot-0.3.4 → ace_git_copilot-0.3.6}/ace/ai/prompts/intent.py

@@ -26,6 +26,9 @@ You MUST return a JSON response containing exactly the following keys, and nothi
    - **moderate**: Standard modifications (commit, standard push, branch creation, switching branches, merge, rebase, stashing, soft/mixed reset).
    - **destructive**: Irreversible changes (hard reset, force push, git clean, force branch deletion).
 6. Always provide a safer alternative in `alternatives` if `risk_level` is moderate or destructive.
+7. If a merge, rebase, cherry-pick, or revert is in progress and the context indicates that conflicts are resolved (e.g., "Merge conflicts resolved. Ready to finalize merge."), do NOT abort the operation unless the user explicitly requests to abort. Instead, finalize/continue the operation:
+   - For a resolved merge, cherry-pick, or revert, use `git commit` or `ace commit` to finalize.
+   - For a resolved rebase, use `git rebase --continue` to continue.
 
 ### Examples:
 

{ace_git_copilot-0.3.4 → ace_git_copilot-0.3.6}/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")

{ace_git_copilot-0.3.4 → ace_git_copilot-0.3.6}/ace/core/context.py

@@ -75,22 +75,43 @@ class RepoContext:
         if not git_dir.exists():
             return state
 
+        # Check if index has unmerged (conflicted) files
+        has_conflicts = False
+        try:
+            unmerged = self.git_ops.repo.index.unmerged_files()
+            if unmerged:
+                has_conflicts = True
+        except Exception:
+            pass
+
         if (git_dir / "MERGE_HEAD").exists():
             state["in_progress"] = True
             state["type"] = "merge"
-            state["detail"] = "Merge conflict/resolution in progress."
+            if has_conflicts:
+                state["detail"] = "Merge conflicts exist. Need resolution."
+            else:
+                state["detail"] = "Merge conflicts resolved. Ready to finalize merge."
         elif (git_dir / "rebase-merge").exists() or (git_dir / "rebase-apply").exists():
             state["in_progress"] = True
             state["type"] = "rebase"
-            state["detail"] = "Rebase operation in progress."
+            if has_conflicts:
+                state["detail"] = "Rebase conflicts exist. Need resolution."
+            else:
+                state["detail"] = "Rebase conflicts resolved. Ready to continue rebase."
         elif (git_dir / "CHERRY_PICK_HEAD").exists():
             state["in_progress"] = True
             state["type"] = "cherry-pick"
-            state["detail"] = "Cherry-pick operation in progress."
+            if has_conflicts:
+                state["detail"] = "Cherry-pick conflicts exist. Need resolution."
+            else:
+                state["detail"] = "Cherry-pick conflicts resolved. Ready to finalize cherry-pick."
         elif (git_dir / "REVERT_HEAD").exists():
             state["in_progress"] = True
             state["type"] = "revert"
-            state["detail"] = "Revert operation in progress."
+            if has_conflicts:
+                state["detail"] = "Revert conflicts exist. Need resolution."
+            else:
+                state["detail"] = "Revert conflicts resolved. Ready to finalize revert."
 
         return state
 

{ace_git_copilot-0.3.4 → ace_git_copilot-0.3.6}/pyproject.toml

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

ace_git_copilot-0.3.6/tests/test_merge_state.py

@@ -0,0 +1,84 @@
+import pytest
+from unittest.mock import patch, MagicMock
+from pathlib import Path
+from ace.core.context import RepoContext
+from ace.core.git_ops import GitOps
+
+@pytest.fixture
+def mock_git_ops():
+    git_ops = MagicMock(spec=GitOps)
+    git_ops.working_dir = "/mock/repo"
+    mock_repo = MagicMock()
+    mock_repo.git_dir = "/mock/repo/.git"
+    git_ops.repo = mock_repo
+    return git_ops
+
+@patch("pathlib.Path.exists", autospec=True)
+def test_no_active_operation(mock_exists, mock_git_ops):
+    mock_exists.return_value = False
+    context = RepoContext(mock_git_ops)
+    state = context.check_merge_rebase_state()
+    
+    assert state["in_progress"] is False
+    assert state["type"] is None
+    assert state["detail"] == ""
+
+@patch("pathlib.Path.exists", autospec=True)
+def test_merge_active_unresolved(mock_exists, mock_git_ops):
+    mock_exists.return_value = True
+    mock_git_ops.repo.index.unmerged_files.return_value = {"file1.txt": [None]}
+    
+    context = RepoContext(mock_git_ops)
+    state = context.check_merge_rebase_state()
+    
+    assert state["in_progress"] is True
+    assert state["type"] == "merge"
+    assert "Need resolution" in state["detail"]
+
+@patch("pathlib.Path.exists", autospec=True)
+def test_merge_active_resolved(mock_exists, mock_git_ops):
+    mock_exists.return_value = True
+    mock_git_ops.repo.index.unmerged_files.return_value = {}
+    
+    context = RepoContext(mock_git_ops)
+    state = context.check_merge_rebase_state()
+    
+    assert state["in_progress"] is True
+    assert state["type"] == "merge"
+    assert "resolved" in state["detail"]
+    assert "finalize merge" in state["detail"]
+
+@patch("pathlib.Path.exists", autospec=True)
+def test_rebase_active_unresolved(mock_exists, mock_git_ops):
+    def exists_check(path_obj):
+        if path_obj.name == "MERGE_HEAD":
+            return False
+        return True
+        
+    mock_exists.side_effect = exists_check
+    mock_git_ops.repo.index.unmerged_files.return_value = {"file2.txt": [None]}
+    
+    context = RepoContext(mock_git_ops)
+    state = context.check_merge_rebase_state()
+    
+    assert state["in_progress"] is True
+    assert state["type"] == "rebase"
+    assert "Need resolution" in state["detail"]
+
+@patch("pathlib.Path.exists", autospec=True)
+def test_rebase_active_resolved(mock_exists, mock_git_ops):
+    def exists_check(path_obj):
+        if path_obj.name == "MERGE_HEAD":
+            return False
+        return True
+        
+    mock_exists.side_effect = exists_check
+    mock_git_ops.repo.index.unmerged_files.return_value = {}
+    
+    context = RepoContext(mock_git_ops)
+    state = context.check_merge_rebase_state()
+    
+    assert state["in_progress"] is True
+    assert state["type"] == "rebase"
+    assert "resolved" in state["detail"]
+    assert "continue rebase" in state["detail"]

ace_git_copilot-0.3.4/ace/__init__.py

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