git-commit-msg-ai 2.1.2__py3-none-any.whl → 2.3.0__py3-none-any.whl

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
 
@@ -27,16 +27,40 @@ def _build_system_prompt(types: tuple[str, ...]) -> list[TextBlockParam]:
     return [TextBlockParam(type="text", text=text, cache_control=CacheControlEphemeralParam(type="ephemeral"))]
 
 
-def generate_commit_message(diff: str, types: tuple[str, ...]) -> str:
+def _build_user_message(diff: str, recent_commits: list[str] | None, branch_name: str | None) -> str:
+    parts: list[str] = []
+    if branch_name:
+        parts.append(f"Branch: {branch_name}")
+    if recent_commits:
+        commit_lines = ["Recent commits (most recent first):"] + [f"- {commit}" for commit in recent_commits]
+        parts.append("\n".join(commit_lines))
+    if parts:
+        parts.append("\n".join(["Staged diff:", diff]))
+        return "\n\n".join(parts)
+    return diff
+
+
+def generate_commit_message(
+    diff: str,
+    types: tuple[str, ...],
+    *,
+    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": diff}],
+            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/cli.py

@@ -24,27 +24,46 @@ def main() -> None:
 
     logging.basicConfig(level=effective_log_level, format=LOG_FORMAT, stream=sys.stderr)
 
-    optional_types = config.load_optional_types()
-    all_types = config.get_all_types(optional_types)
+    app_config = config.load_config()
 
     try:
         diff = git_ops.get_staged_diff()
-        commit_message = ai_client.generate_commit_message(diff, all_types)
+        recent_commits = git_ops.get_recent_commit_messages(app_config.context_commits)
+        branch_name = git_ops.get_branch_name()
+        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/config.py

@@ -1,12 +1,20 @@
 import logging
 import tomllib
+from dataclasses import dataclass
 from pathlib import Path
-from typing import Final
+from typing import Any, Final, cast
 
 logger = logging.getLogger(__name__)
 
 MANDATORY_TYPES: Final[tuple[str, ...]] = ("feat", "fix", "revert")
 DEFAULT_OPTIONAL_TYPES: Final[tuple[str, ...]] = ("build", "ci", "docs", "perf", "refactor", "style", "test")
+CONTEXT_COMMITS_DEFAULT: Final[int] = 5
+
+
+@dataclass(frozen=True)
+class AppConfig:
+    types: tuple[str, ...]
+    context_commits: int
 
 
 def _find_pyproject_toml() -> Path | None:
@@ -25,10 +33,20 @@ def _parse_types_list(types_value: object, source: str) -> tuple[str, ...] | Non
         logger.warning(f"'types' in {source} must be a TOML array, skipping")
         return None
 
-    return tuple(entry.strip().lower() for entry in types_value if isinstance(entry, str) and entry.strip())
+    entries = cast(list[object], types_value)
+    return tuple(entry.strip().lower() for entry in entries if isinstance(entry, str) and entry.strip())
+
 
+def _parse_context_commits(value: object, source: str) -> int | None:
+    if value is None:
+        return None
+    if isinstance(value, bool) or not isinstance(value, int):
+        logger.warning(f"'context_commits' in {source} must be an integer, skipping")
+        return None
+    return max(0, value)
 
-def _load_from_pyproject_toml(path: Path) -> tuple[str, ...] | None:
+
+def _read_pkg_section_from_pyproject_toml(path: Path) -> dict[str, object] | None:
     try:
         with open(path, "rb") as toml_file:
             data = tomllib.load(toml_file)
@@ -40,41 +58,85 @@ def _load_from_pyproject_toml(path: Path) -> tuple[str, ...] | None:
     if not isinstance(tool_section, dict):
         return None
 
-    pkg_section = tool_section.get("git-commit-msg-ai")
-    if not isinstance(pkg_section, dict):
-        return None
-
-    return _parse_types_list(pkg_section.get("types"), f"[tool.git-commit-msg-ai] in {path}")
+    pkg_section = cast(dict[str, object], tool_section).get("git-commit-msg-ai")
+    return cast(dict[str, object], pkg_section) if isinstance(pkg_section, dict) else None
 
 
-def _load_from_global_config() -> tuple[str, ...] | None:
-    global_config = Path.home() / ".git-commit-msg-ai.toml"
-    if not global_config.is_file():
+def _read_global_config_data() -> dict[str, Any] | None:
+    path = Path.home() / ".git-commit-msg-ai.toml"
+    if not path.is_file():
         return None
 
     try:
-        with open(global_config, "rb") as toml_file:
-            data = tomllib.load(toml_file)
+        with open(path, "rb") as toml_file:
+            return tomllib.load(toml_file)
     except tomllib.TOMLDecodeError:
-        logger.warning(f"Could not parse {global_config}, using default commit types")
+        logger.warning(f"Could not parse {path}, using defaults")
+        return None
+
+
+def _load_types_from_pyproject_toml(path: Path) -> tuple[str, ...] | None:
+    section = _read_pkg_section_from_pyproject_toml(path)
+    if section is None:
         return None
+    return _parse_types_list(section.get("types"), f"[tool.git-commit-msg-ai] in {path}")
 
-    return _parse_types_list(data.get("types"), str(global_config))
+
+def _load_types_from_global_config() -> tuple[str, ...] | None:
+    data = _read_global_config_data()
+    if data is None:
+        return None
+    return _parse_types_list(data.get("types"), str(Path.home() / ".git-commit-msg-ai.toml"))
+
+
+def _load_context_commits_from_pyproject_toml(path: Path) -> int | None:
+    section = _read_pkg_section_from_pyproject_toml(path)
+    if section is None:
+        return None
+    return _parse_context_commits(section.get("context_commits"), f"[tool.git-commit-msg-ai] in {path}")
+
+
+def _load_context_commits_from_global_config() -> int | None:
+    data = _read_global_config_data()
+    if data is None:
+        return None
+    return _parse_context_commits(data.get("context_commits"), str(Path.home() / ".git-commit-msg-ai.toml"))
 
 
 def load_optional_types() -> tuple[str, ...]:
     pyproject_path = _find_pyproject_toml()
     if pyproject_path is not None:
-        result = _load_from_pyproject_toml(pyproject_path)
+        result = _load_types_from_pyproject_toml(pyproject_path)
         if result is not None:
             return result
 
-    result = _load_from_global_config()
+    result = _load_types_from_global_config()
     if result is not None:
         return result
 
     return DEFAULT_OPTIONAL_TYPES
 
 
+def load_context_commits() -> int:
+    pyproject_path = _find_pyproject_toml()
+    if pyproject_path is not None:
+        result = _load_context_commits_from_pyproject_toml(pyproject_path)
+        if result is not None:
+            return result
+
+    result = _load_context_commits_from_global_config()
+    if result is not None:
+        return result
+
+    return CONTEXT_COMMITS_DEFAULT
+
+
+def load_config() -> AppConfig:
+    return AppConfig(
+        types=get_all_types(load_optional_types()),
+        context_commits=load_context_commits(),
+    )
+
+
 def get_all_types(optional_types: tuple[str, ...]) -> tuple[str, ...]:
     return tuple(dict.fromkeys(MANDATORY_TYPES + optional_types))

git_commit_msg_ai/git_ops.py

@@ -1,18 +1,15 @@
 import logging
 import subprocess
-from typing import Final
 
 from git_commit_msg_ai.exceptions import GitError
 
-GIT_COMMAND: Final[str] = "git"
-
 logger = logging.getLogger(__name__)
 
 
 def get_staged_diff() -> str:
     try:
-        logger.debug(f"Running: {GIT_COMMAND} diff --cached")
-        raw_diff_bytes = subprocess.check_output([GIT_COMMAND, "diff", "--cached"])
+        logger.debug("Running: git diff --cached")
+        raw_diff_bytes = subprocess.check_output(["git", "diff", "--cached"])
         staged_diff = raw_diff_bytes.decode("utf-8")
     except FileNotFoundError:
         raise GitError("git is not installed or not on PATH.")
@@ -29,10 +26,34 @@ def get_staged_diff() -> str:
     return staged_diff
 
 
+def get_recent_commit_messages(n: int) -> list[str]:
+    if n <= 0:
+        return []
+    try:
+        logger.debug(f"Running: git log --format=%s -n {n}")
+        raw_git_log_bytes = subprocess.check_output(["git", "log", "--format=%s", f"-n{n}"])
+        commit_message_lines = raw_git_log_bytes.decode("utf-8").splitlines()
+        return [commit_message for commit_message in commit_message_lines if commit_message.strip()]
+    except Exception:
+        logger.debug("Could not retrieve recent commit messages; proceeding without context")
+        return []
+
+
+def get_branch_name() -> str | None:
+    try:
+        logger.debug("Running: git rev-parse --abbrev-ref HEAD")
+        raw_branch_name_bytes = subprocess.check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"])
+        branch_name = raw_branch_name_bytes.decode("utf-8").strip()
+        return branch_name if branch_name != "HEAD" else None
+    except Exception:
+        logger.debug("Could not retrieve branch name; proceeding without context")
+        return None
+
+
 def commit(message: str) -> None:
     try:
-        logger.debug(f"Running: {GIT_COMMAND} commit -m <message>")
-        subprocess.run([GIT_COMMAND, "commit", "-m", message], check=True)
+        logger.debug("Running: git commit -m <message>")
+        subprocess.run(["git", "commit", "-m", message], check=True)
     except FileNotFoundError:
         raise GitError("git is not installed or not on PATH.")
     except subprocess.CalledProcessError:

{git_commit_msg_ai-2.1.2.dist-info → git_commit_msg_ai-2.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-commit-msg-ai
-Version: 2.1.2
+Version: 2.3.0
 Summary: AI-powered git commit message generator following Conventional Commits
 License: MIT License
         
@@ -118,12 +118,15 @@ 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.
 
 ## Commit message format
 
@@ -156,11 +159,11 @@ The set of optional commit types the AI may use can be customised through a conf
 
 ### Config file locations and precedence
 
-The tool checks the following locations in order, using the first one that defines a `types` list:
+The tool checks the following locations in order, using the first one that defines a given setting:
 
 1. **Project-level** — `pyproject.toml` walked up from the current working directory, under `[tool.git-commit-msg-ai]`
 2. **User-level** — `~/.git-commit-msg-ai.toml` in your home directory
-3. **Built-in defaults** — used when neither config file is present or neither defines `types`
+3. **Built-in defaults** — used when neither config file is present or neither defines the setting
 
 ### Config file formats
 
@@ -169,16 +172,20 @@ Project-level (`pyproject.toml`):
 ```toml
 [tool.git-commit-msg-ai]
 types = ["build", "ci", "docs", "perf", "refactor", "style", "test"]
+context_commits = 10  # include last 10 commits for context (default: 5)
 ```
 
 User-level (`~/.git-commit-msg-ai.toml`):
 
 ```toml
 types = ["build", "ci", "docs", "chore"]
+context_commits = 0  # disable commit context
 ```
 
 Setting `types = []` restricts the AI to only the three mandatory types (`feat`, `fix`, `revert`).
 
+`context_commits` controls how many recent commit messages are sent to the AI as context. The default is `5`. Set it to `0` to disable context entirely.
+
 ### Default optional types
 
 | Type | Purpose |
@@ -208,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.3.0.dist-info/RECORD

@@ -0,0 +1,13 @@
+git_commit_msg_ai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+git_commit_msg_ai/ai_client.py,sha256=zgGrhVlLpTKkr4Z_7IbBvdJWIVObJvWCc8_DnUubiiY,3756
+git_commit_msg_ai/cli.py,sha256=9RkXcTmeVn686b9F7upCgq8QQCpzHg8nnmwl1WpaqVg,3060
+git_commit_msg_ai/config.py,sha256=5TqQR7VGzpev2_4a2tlsKD00tdFeOoJ1_XDIBhy_gDA,4513
+git_commit_msg_ai/editor.py,sha256=wW7TJ4zVvvN7ThLtrJthAf9FjdmIDTbBS7V5pIW490s,2143
+git_commit_msg_ai/exceptions.py,sha256=7Hwluf3zHMjs4lpGktWS-Lwgo8y_4Xbb1WqzPQHkkUA,352
+git_commit_msg_ai/git_ops.py,sha256=Ve4ngXj0B3sYI4fKjIm-jKKe982Ohr9nbv1ZhNRGWFk,2329
+git_commit_msg_ai-2.3.0.dist-info/licenses/LICENSE,sha256=BBR2CbV1SRenzTi4vvRx5wTIg32q898vdAyaLDN5wDc,1068
+git_commit_msg_ai-2.3.0.dist-info/METADATA,sha256=EMAfQQAYvBnhM5jheLvG4dxqhS0zORFCExr-8m3dExg,9094
+git_commit_msg_ai-2.3.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+git_commit_msg_ai-2.3.0.dist-info/entry_points.txt,sha256=KTu6wUhl0p3nf27k8L4vpSH_hpeRQpwzMPSmKv7K5Cs,65
+git_commit_msg_ai-2.3.0.dist-info/top_level.txt,sha256=XYQC2BXvrcREGKEG7sm9nbwO7ifqcUSVgU7SW8BTURs,18
+git_commit_msg_ai-2.3.0.dist-info/RECORD,,

git_commit_msg_ai-2.1.2.dist-info/RECORD

@@ -1,13 +0,0 @@
-git_commit_msg_ai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-git_commit_msg_ai/ai_client.py,sha256=7B4bBrh9ZSd-1uChccnK3KYPnk9tXs9gOez5ASC5P54,2836
-git_commit_msg_ai/cli.py,sha256=MzFQWHLAcheg7ldWwDQG05KcAQeIjlKtiEmcSKzvDUk,2049
-git_commit_msg_ai/config.py,sha256=auD_QRw-8ngRz2p1DT5L5G5riszegZItSasmczv5W2s,2523
-git_commit_msg_ai/editor.py,sha256=wW7TJ4zVvvN7ThLtrJthAf9FjdmIDTbBS7V5pIW490s,2143
-git_commit_msg_ai/exceptions.py,sha256=7Hwluf3zHMjs4lpGktWS-Lwgo8y_4Xbb1WqzPQHkkUA,352
-git_commit_msg_ai/git_ops.py,sha256=qZae4w3IEf3Lmf2T5oWItkgM0PrEYHCWr3TgBJLeecY,1387
-git_commit_msg_ai-2.1.2.dist-info/licenses/LICENSE,sha256=BBR2CbV1SRenzTi4vvRx5wTIg32q898vdAyaLDN5wDc,1068
-git_commit_msg_ai-2.1.2.dist-info/METADATA,sha256=ruzgyY3xmA2u6xkvbEZI2jbC0Jm7jXhqIGHjKkJCO2w,8310
-git_commit_msg_ai-2.1.2.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-git_commit_msg_ai-2.1.2.dist-info/entry_points.txt,sha256=KTu6wUhl0p3nf27k8L4vpSH_hpeRQpwzMPSmKv7K5Cs,65
-git_commit_msg_ai-2.1.2.dist-info/top_level.txt,sha256=XYQC2BXvrcREGKEG7sm9nbwO7ifqcUSVgU7SW8BTURs,18
-git_commit_msg_ai-2.1.2.dist-info/RECORD,,