git-commit-msg-ai 2.2.0__tar.gz → 2.3.0__tar.gz

{git_commit_msg_ai-2.2.0 → git_commit_msg_ai-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-commit-msg-ai
-Version: 2.2.0
+Version: 2.3.0
 Summary: AI-powered git commit message generator following Conventional Commits
 License: MIT License
         
@@ -118,12 +118,13 @@ The tool will:
 3. Print the message and prompt you to choose:
 
 ```
-[a]ccept / [e]dit / [r]eject:
+[a]ccept / [e]dit / [r]eject / [f]eedback:
 ```
 
 - **a** - commits immediately with the generated message
 - **e** - opens the message in your `$EDITOR` (defaults to `notepad` on Windows, `vi` on Linux/macOS), lets you modify it, then commits
 - **r** - exits without committing
+- **f** - prompts you for natural-language feedback, regenerates the message incorporating that feedback, and loops back so you can keep refining until satisfied
 
 The tool automatically reads the current branch name and recent commit history and includes them in the request to the AI. This helps the AI match the commit style already established in the project. No configuration is required to enable this; see [Configuration](#configuration) to control how many recent commits are included.
 
@@ -214,11 +215,11 @@ Pushing a version tag (e.g. `v1.5.2`) triggers the CD pipeline:
 # 1. Bump the version in pyproject.toml
 # 2. Commit and push
 git add pyproject.toml
-git commit -m "chore: bump version to 2.2.0"
+git commit -m "chore: bump version to 2.3.0"
 git push origin main
 # 3. Tag and push - this triggers the CD pipeline
-git tag v2.2.0
-git push origin v2.2.0
+git tag v2.3.0
+git push origin v2.3.0
 ```
 
 ## Debugging

{git_commit_msg_ai-2.2.0 → git_commit_msg_ai-2.3.0}/README.md

@@ -75,12 +75,13 @@ The tool will:
 3. Print the message and prompt you to choose:
 
 ```
-[a]ccept / [e]dit / [r]eject:
+[a]ccept / [e]dit / [r]eject / [f]eedback:
 ```
 
 - **a** - commits immediately with the generated message
 - **e** - opens the message in your `$EDITOR` (defaults to `notepad` on Windows, `vi` on Linux/macOS), lets you modify it, then commits
 - **r** - exits without committing
+- **f** - prompts you for natural-language feedback, regenerates the message incorporating that feedback, and loops back so you can keep refining until satisfied
 
 The tool automatically reads the current branch name and recent commit history and includes them in the request to the AI. This helps the AI match the commit style already established in the project. No configuration is required to enable this; see [Configuration](#configuration) to control how many recent commits are included.
 
@@ -171,11 +172,11 @@ Pushing a version tag (e.g. `v1.5.2`) triggers the CD pipeline:
 # 1. Bump the version in pyproject.toml
 # 2. Commit and push
 git add pyproject.toml
-git commit -m "chore: bump version to 2.2.0"
+git commit -m "chore: bump version to 2.3.0"
 git push origin main
 # 3. Tag and push - this triggers the CD pipeline
-git tag v2.2.0
-git push origin v2.2.0
+git tag v2.3.0
+git push origin v2.3.0
 ```
 
 ## Debugging

{git_commit_msg_ai-2.2.0 → git_commit_msg_ai-2.3.0}/git_commit_msg_ai/ai_client.py

@@ -1,9 +1,9 @@
 import logging
 import textwrap
-from typing import Final
+from typing import Final, cast
 
 import anthropic
-from anthropic.types import CacheControlEphemeralParam, TextBlockParam
+from anthropic.types import CacheControlEphemeralParam, MessageParam, TextBlockParam
 
 from git_commit_msg_ai.exceptions import AIError
 
@@ -46,17 +46,21 @@ def generate_commit_message(
     *,
     recent_commits: list[str] | None = None,
     branch_name: str | None = None,
+    conversation_history: list[dict[str, str]] | None = None,
 ) -> str:
     try:
         anthropic_client = anthropic.Anthropic()
 
         user_message = _build_user_message(diff, recent_commits, branch_name)
+        messages: list[MessageParam] = [{"role": "user", "content": user_message}]
+        if conversation_history:
+            messages.extend(cast(list[MessageParam], conversation_history))
         logger.debug(f"Calling Anthropic API: model={MODEL} max_tokens={MAX_TOKENS}")
         anthropic_api_response = anthropic_client.messages.create(
             model=MODEL,
             max_tokens=MAX_TOKENS,
             system=_build_system_prompt(types),
-            messages=[{"role": "user", "content": user_message}],
+            messages=messages,
         )
     except anthropic.AuthenticationError:
         raise AIError("Anthropic API key is missing or invalid. Set the ANTHROPIC_API_KEY environment variable.")

{git_commit_msg_ai-2.2.0 → git_commit_msg_ai-2.3.0}/git_commit_msg_ai/cli.py

@@ -33,19 +33,37 @@ def main() -> None:
         commit_message = ai_client.generate_commit_message(diff, app_config.types, recent_commits=recent_commits, branch_name=branch_name)
         print(commit_message)
 
-        print()
-        user_selection = input("[a]ccept / [e]dit / [r]eject: ").strip().lower()
-
-        if user_selection == "a":
-            git_ops.commit(commit_message)
-        elif user_selection == "e":
-            updated_commit_message = editor.open_in_editor(commit_message)
-            git_ops.commit(updated_commit_message)
-        elif user_selection == "r":
-            print("User rejected the generated commit message. No commit made.")
-        else:
-            print("Invalid selection.")
-            sys.exit(1)
+        conversation_history: list[dict[str, str]] = [{"role": "assistant", "content": commit_message}]
+
+        while True:
+            print()
+            user_selection = input("[a]ccept / [e]dit / [r]eject / [f]eedback: ").strip().lower()
+
+            if user_selection == "a":
+                git_ops.commit(commit_message)
+                break
+            elif user_selection == "e":
+                updated_commit_message = editor.open_in_editor(commit_message)
+                git_ops.commit(updated_commit_message)
+                break
+            elif user_selection == "r":
+                print("User rejected the generated commit message. No commit made.")
+                break
+            elif user_selection == "f":
+                feedback = input("Feedback: ").strip()
+                conversation_history.append({"role": "user", "content": feedback})
+                commit_message = ai_client.generate_commit_message(
+                    diff,
+                    app_config.types,
+                    recent_commits=recent_commits,
+                    branch_name=branch_name,
+                    conversation_history=list(conversation_history),
+                )
+                print(commit_message)
+                conversation_history.append({"role": "assistant", "content": commit_message})
+            else:
+                print("Invalid selection.")
+                sys.exit(1)
     except GitCommitAIError as error:
         logger.error(str(error))
         print(f"Error: {error}", file=sys.stderr)

{git_commit_msg_ai-2.2.0 → git_commit_msg_ai-2.3.0}/git_commit_msg_ai.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-commit-msg-ai
-Version: 2.2.0
+Version: 2.3.0
 Summary: AI-powered git commit message generator following Conventional Commits
 License: MIT License
         
@@ -118,12 +118,13 @@ The tool will:
 3. Print the message and prompt you to choose:
 
 ```
-[a]ccept / [e]dit / [r]eject:
+[a]ccept / [e]dit / [r]eject / [f]eedback:
 ```
 
 - **a** - commits immediately with the generated message
 - **e** - opens the message in your `$EDITOR` (defaults to `notepad` on Windows, `vi` on Linux/macOS), lets you modify it, then commits
 - **r** - exits without committing
+- **f** - prompts you for natural-language feedback, regenerates the message incorporating that feedback, and loops back so you can keep refining until satisfied
 
 The tool automatically reads the current branch name and recent commit history and includes them in the request to the AI. This helps the AI match the commit style already established in the project. No configuration is required to enable this; see [Configuration](#configuration) to control how many recent commits are included.
 
@@ -214,11 +215,11 @@ Pushing a version tag (e.g. `v1.5.2`) triggers the CD pipeline:
 # 1. Bump the version in pyproject.toml
 # 2. Commit and push
 git add pyproject.toml
-git commit -m "chore: bump version to 2.2.0"
+git commit -m "chore: bump version to 2.3.0"
 git push origin main
 # 3. Tag and push - this triggers the CD pipeline
-git tag v2.2.0
-git push origin v2.2.0
+git tag v2.3.0
+git push origin v2.3.0
 ```
 
 ## Debugging

{git_commit_msg_ai-2.2.0 → git_commit_msg_ai-2.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "git-commit-msg-ai"
-version = "2.2.0"
+version = "2.3.0"
 description = "AI-powered git commit message generator following Conventional Commits"
 readme = "README.md"
 license = {file = "LICENSE"}

{git_commit_msg_ai-2.2.0 → git_commit_msg_ai-2.3.0}/tests/test_ai_client.py

@@ -174,3 +174,64 @@ class TestGenerateCommitMessage:
         user_content = mock_client.messages.create.call_args.kwargs["messages"][0]["content"]
 
         assert user_content == "diff content"
+
+    def test_generate_commit_message_without_history_sends_single_message(self) -> None:
+        with ExitStack() as stack:
+            mock_anthropic_class = stack.enter_context(patch("git_commit_msg_ai.ai_client.anthropic.Anthropic"))
+            mock_client = MagicMock()
+            mock_client.messages.create.return_value = _make_api_response("feat: add feature")
+            mock_anthropic_class.return_value = mock_client
+
+            generate_commit_message("diff content", TYPES)
+
+        messages = mock_client.messages.create.call_args.kwargs["messages"]
+
+        assert len(messages) == 1
+        assert messages[0]["role"] == "user"
+
+    def test_generate_commit_message_with_none_history_sends_single_message(self) -> None:
+        with ExitStack() as stack:
+            mock_anthropic_class = stack.enter_context(patch("git_commit_msg_ai.ai_client.anthropic.Anthropic"))
+            mock_client = MagicMock()
+            mock_client.messages.create.return_value = _make_api_response("feat: add feature")
+            mock_anthropic_class.return_value = mock_client
+
+            generate_commit_message("diff content", TYPES, conversation_history=None)
+
+        messages = mock_client.messages.create.call_args.kwargs["messages"]
+
+        assert len(messages) == 1
+
+    def test_generate_commit_message_with_empty_history_sends_single_message(self) -> None:
+        with ExitStack() as stack:
+            mock_anthropic_class = stack.enter_context(patch("git_commit_msg_ai.ai_client.anthropic.Anthropic"))
+            mock_client = MagicMock()
+            mock_client.messages.create.return_value = _make_api_response("feat: add feature")
+            mock_anthropic_class.return_value = mock_client
+
+            generate_commit_message("diff content", TYPES, conversation_history=[])
+
+        messages = mock_client.messages.create.call_args.kwargs["messages"]
+
+        assert len(messages) == 1
+
+    def test_generate_commit_message_with_conversation_history_appends_to_messages(self) -> None:
+        history = [
+            {"role": "assistant", "content": "feat: first draft"},
+            {"role": "user", "content": "make it shorter"},
+        ]
+
+        with ExitStack() as stack:
+            mock_anthropic_class = stack.enter_context(patch("git_commit_msg_ai.ai_client.anthropic.Anthropic"))
+            mock_client = MagicMock()
+            mock_client.messages.create.return_value = _make_api_response("feat: shorter")
+            mock_anthropic_class.return_value = mock_client
+
+            generate_commit_message("diff content", TYPES, conversation_history=history)
+
+        messages = mock_client.messages.create.call_args.kwargs["messages"]
+
+        assert len(messages) == 3
+        assert messages[0]["role"] == "user"
+        assert messages[1] == {"role": "assistant", "content": "feat: first draft"}
+        assert messages[2] == {"role": "user", "content": "make it shorter"}

{git_commit_msg_ai-2.2.0 → git_commit_msg_ai-2.3.0}/tests/test_cli.py

@@ -10,6 +10,7 @@ from git_commit_msg_ai.config import CONTEXT_COMMITS_DEFAULT, DEFAULT_OPTIONAL_T
 from git_commit_msg_ai.exceptions import AIError, GitError
 
 COMMIT_MESSAGE = "feat: add feature"
+REFINED_COMMIT_MESSAGE = "feat: add concise feature"
 EDITED_COMMIT_MESSAGE = "edited commit message"
 STAGED_DIFF = "diff content"
 GENERIC_COMMIT_MESSAGE = "generic commit message"
@@ -316,6 +317,91 @@ class TestMain:
 
         assert "Aborted." in capsys.readouterr().out
 
+    def _run_with_inputs(
+        self,
+        user_inputs: list[str],
+        commit_messages: list[str] | None = None,
+    ) -> tuple[MagicMock, MagicMock, MagicMock]:
+        if commit_messages is None:
+            commit_messages = [COMMIT_MESSAGE, REFINED_COMMIT_MESSAGE]
+
+        mock_git_ops = MagicMock()
+        mock_git_ops.get_staged_diff.return_value = STAGED_DIFF
+        mock_git_ops.get_recent_commit_messages.return_value = RECENT_COMMITS
+        mock_git_ops.get_branch_name.return_value = BRANCH_NAME
+
+        mock_ai_client = MagicMock()
+        mock_ai_client.generate_commit_message.side_effect = commit_messages
+
+        mock_editor = MagicMock()
+        mock_editor.open_in_editor.return_value = EDITED_COMMIT_MESSAGE
+
+        with ExitStack() as stack:
+            mock_config = MagicMock()
+            mock_config.load_config.return_value = APP_CONFIG
+            stack.enter_context(patch("git_commit_msg_ai.cli.git_ops", mock_git_ops))
+            stack.enter_context(patch("git_commit_msg_ai.cli.ai_client", mock_ai_client))
+            stack.enter_context(patch("git_commit_msg_ai.cli.editor", mock_editor))
+            stack.enter_context(patch("git_commit_msg_ai.cli.config", mock_config))
+            stack.enter_context(patch("builtins.input", side_effect=user_inputs))
+            main()
+
+        return mock_git_ops, mock_ai_client, mock_editor
+
+    def test_main_feedback_then_accept_commits_refined_message(self) -> None:
+        mock_git_ops, _, _ = self._run_with_inputs(["f", "make it shorter", "a"])
+
+        mock_git_ops.commit.assert_called_once_with(REFINED_COMMIT_MESSAGE)
+
+    def test_main_feedback_then_reject_does_not_commit(self) -> None:
+        mock_git_ops, _, _ = self._run_with_inputs(["f", "make it shorter", "r"])
+
+        mock_git_ops.commit.assert_not_called()
+
+    def test_main_feedback_then_edit_opens_editor_with_refined_message(self) -> None:
+        _, _, mock_editor = self._run_with_inputs(["f", "make it shorter", "e"])
+
+        mock_editor.open_in_editor.assert_called_once_with(REFINED_COMMIT_MESSAGE)
+
+    def test_main_feedback_passes_conversation_history_to_refined_call(self) -> None:
+        _, mock_ai_client, _ = self._run_with_inputs(["f", "make it shorter", "a"])
+
+        calls = mock_ai_client.generate_commit_message.call_args_list
+        assert calls[1].kwargs["conversation_history"] == [
+            {"role": "assistant", "content": COMMIT_MESSAGE},
+            {"role": "user", "content": "make it shorter"},
+        ]
+
+    def test_main_first_call_has_no_conversation_history(self) -> None:
+        _, mock_ai_client, _ = self._run_with_inputs(["f", "make it shorter", "a"])
+
+        first_call_kwargs = mock_ai_client.generate_commit_message.call_args_list[0].kwargs
+        assert "conversation_history" not in first_call_kwargs
+
+    def test_main_multiple_feedback_rounds_grows_conversation_history(self) -> None:
+        second_refined = "feat: even shorter"
+        _, mock_ai_client, _ = self._run_with_inputs(
+            ["f", "feedback1", "f", "feedback2", "a"],
+            commit_messages=[COMMIT_MESSAGE, REFINED_COMMIT_MESSAGE, second_refined],
+        )
+
+        calls = mock_ai_client.generate_commit_message.call_args_list
+        assert calls[2].kwargs["conversation_history"] == [
+            {"role": "assistant", "content": COMMIT_MESSAGE},
+            {"role": "user", "content": "feedback1"},
+            {"role": "assistant", "content": REFINED_COMMIT_MESSAGE},
+            {"role": "user", "content": "feedback2"},
+        ]
+
+    def test_main_multiple_feedback_rounds_commits_last_refined_message(self) -> None:
+        second_refined = "feat: even shorter"
+        mock_git_ops, _, _ = self._run_with_inputs(
+            ["f", "feedback1", "f", "feedback2", "a"],
+            commit_messages=[COMMIT_MESSAGE, REFINED_COMMIT_MESSAGE, second_refined],
+        )
+
+        mock_git_ops.commit.assert_called_once_with(second_refined)
+
     def _run_main_rejecting(self) -> None:
         mock_git_ops = MagicMock()
         mock_git_ops.get_staged_diff.return_value = "diff"