git-commit-msg-ai 2.0.1__tar.gz → 2.1.0__tar.gz

{git_commit_msg_ai-2.0.1 → git_commit_msg_ai-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-commit-msg-ai
-Version: 2.0.1
+Version: 2.1.0
 Summary: AI-powered git commit message generator following Conventional Commits
 License-Expression: MIT
 Requires-Python: >=3.14
@@ -112,7 +112,50 @@ feat(api)!: remove deprecated endpoint
 BREAKING CHANGE: /v1/legacy is no longer available
 ```
 
-Supported types: `feat`, `fix`, `docs`, `style`, `refactor`, `test`, `chore`
+Supported types: `feat`, `fix`, `revert`, `build`, `ci`, `docs`, `perf`, `refactor`, `style`, `test` (configurable — see [Configuration](#configuration))
+
+`revert` commits always follow this format: the subject line begins with `revert: ` followed by the header of the reverted commit, and the body must contain `This reverts commit <hash>.`
+
+## Configuration
+
+The set of optional commit types the AI may use can be customised through a config file. `feat`, `fix`, and `revert` are always included regardless of any configuration.
+
+### Config file locations and precedence
+
+The tool checks the following locations in order, using the first one that defines a `types` list:
+
+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`
+
+### Config file formats
+
+Project-level (`pyproject.toml`):
+
+```toml
+[tool.git-commit-msg-ai]
+types = ["build", "ci", "docs", "perf", "refactor", "style", "test"]
+```
+
+User-level (`~/.git-commit-msg-ai.toml`):
+
+```toml
+types = ["build", "ci", "docs", "chore"]
+```
+
+Setting `types = []` restricts the AI to only the three mandatory types (`feat`, `fix`, `revert`).
+
+### Default optional types
+
+| Type | Purpose |
+|---|---|
+| `build` | Changes to the build system or external dependencies |
+| `ci` | Changes to CI configuration files and scripts |
+| `docs` | Documentation-only changes |
+| `perf` | A code change that improves performance |
+| `refactor` | A code change that neither fixes a bug nor adds a feature |
+| `style` | Changes that do not affect the meaning of the code (whitespace, formatting) |
+| `test` | Adding missing tests or correcting existing tests |
 
 ## CI/CD
 
@@ -140,7 +183,7 @@ git push origin v1.5.2
 
 ## Debugging
 
-By default the tool produces no diagnostic output. To enable logging, set the `GIT_COMMIT_AI_LOG_LEVEL` environment variable before running the command. Logs are written to **stderr** and do not interfere with the generated commit message on **stdout**.
+When a failure occurs (git error, API error, editor error), the tool always prints an error message to **stderr**. Diagnostic logs are disabled by default; to enable them, set the `GIT_COMMIT_AI_LOG_LEVEL` environment variable before running the command. Both error messages and logs are written to **stderr** and do not interfere with the generated commit message on **stdout**.
 
 Valid values: `DEBUG`, `INFO`, `WARNING`, `ERROR`, `CRITICAL`
 

{git_commit_msg_ai-2.0.1 → git_commit_msg_ai-2.1.0}/README.md

@@ -96,7 +96,50 @@ feat(api)!: remove deprecated endpoint
 BREAKING CHANGE: /v1/legacy is no longer available
 ```
 
-Supported types: `feat`, `fix`, `docs`, `style`, `refactor`, `test`, `chore`
+Supported types: `feat`, `fix`, `revert`, `build`, `ci`, `docs`, `perf`, `refactor`, `style`, `test` (configurable — see [Configuration](#configuration))
+
+`revert` commits always follow this format: the subject line begins with `revert: ` followed by the header of the reverted commit, and the body must contain `This reverts commit <hash>.`
+
+## Configuration
+
+The set of optional commit types the AI may use can be customised through a config file. `feat`, `fix`, and `revert` are always included regardless of any configuration.
+
+### Config file locations and precedence
+
+The tool checks the following locations in order, using the first one that defines a `types` list:
+
+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`
+
+### Config file formats
+
+Project-level (`pyproject.toml`):
+
+```toml
+[tool.git-commit-msg-ai]
+types = ["build", "ci", "docs", "perf", "refactor", "style", "test"]
+```
+
+User-level (`~/.git-commit-msg-ai.toml`):
+
+```toml
+types = ["build", "ci", "docs", "chore"]
+```
+
+Setting `types = []` restricts the AI to only the three mandatory types (`feat`, `fix`, `revert`).
+
+### Default optional types
+
+| Type | Purpose |
+|---|---|
+| `build` | Changes to the build system or external dependencies |
+| `ci` | Changes to CI configuration files and scripts |
+| `docs` | Documentation-only changes |
+| `perf` | A code change that improves performance |
+| `refactor` | A code change that neither fixes a bug nor adds a feature |
+| `style` | Changes that do not affect the meaning of the code (whitespace, formatting) |
+| `test` | Adding missing tests or correcting existing tests |
 
 ## CI/CD
 
@@ -124,7 +167,7 @@ git push origin v1.5.2
 
 ## Debugging
 
-By default the tool produces no diagnostic output. To enable logging, set the `GIT_COMMIT_AI_LOG_LEVEL` environment variable before running the command. Logs are written to **stderr** and do not interfere with the generated commit message on **stdout**.
+When a failure occurs (git error, API error, editor error), the tool always prints an error message to **stderr**. Diagnostic logs are disabled by default; to enable them, set the `GIT_COMMIT_AI_LOG_LEVEL` environment variable before running the command. Both error messages and logs are written to **stderr** and do not interfere with the generated commit message on **stdout**.
 
 Valid values: `DEBUG`, `INFO`, `WARNING`, `ERROR`, `CRITICAL`
 

{git_commit_msg_ai-2.0.1 → git_commit_msg_ai-2.1.0}/git_commit_msg_ai/ai_client.py

@@ -3,24 +3,31 @@ import textwrap
 from typing import Final
 
 import anthropic
+from anthropic.types import CacheControlEphemeralParam, TextBlockParam
 
 from git_commit_msg_ai.exceptions import AIError
 
 logger = logging.getLogger(__name__)
 
-SYSTEM_PROMPT: Final[str] = textwrap.dedent("""\
-    You are a Git commit message generator. Output only the commit message, nothing else. Follow the Conventional Commits specification:
-    - First line: <type>(<optional scope>)<!>: <short subject> (50 chars max); append ! before the colon if the commit introduces a breaking change
-    - Blank line
-    - Bullet-point body explaining WHY the changes were made, not what
-    - If there is a breaking change, add a blank line after the body followed by "BREAKING CHANGE: <description of what breaks and why>
-    Types: feat, fix, docs, style, refactor, test, chore""")
-
 MODEL: Final[str] = "claude-sonnet-4-6"
-MAX_TOKENS: Final[int] = 1024
+MAX_TOKENS: Final[int] = 1024  # generous ceiling for any Conventional Commit message; caps API cost and output length
+
+
+def _build_system_prompt(types: tuple[str, ...]) -> list[TextBlockParam]:
+    types_str = ", ".join(types)
+
+    text = textwrap.dedent(f"""\
+        You are a Git commit message generator. Output only the commit message, nothing else. Follow the Conventional Commits specification:
+        - First line: <type>(<optional scope>)<!>: <short subject> (50 chars max); append ! before the colon if the commit introduces a breaking change
+        - Blank line
+        - Bullet-point body explaining WHY the changes were made, not what
+        - If there is a breaking change, add a blank line after the body followed by "BREAKING CHANGE: <description of what breaks and why>
+        - For revert commits: begin the first line with "revert: " followed by the header of the reverted commit; the body must contain "This reverts commit <hash>." where <hash> is the SHA of the reverted commit
+        Types: {types_str}""")
+    return [TextBlockParam(type="text", text=text, cache_control=CacheControlEphemeralParam(type="ephemeral"))]
 
 
-def generate_commit_message(diff: str) -> str:
+def generate_commit_message(diff: str, types: tuple[str, ...]) -> str:
     try:
         anthropic_client = anthropic.Anthropic()
 
@@ -28,7 +35,7 @@ def generate_commit_message(diff: str) -> str:
         anthropic_api_response = anthropic_client.messages.create(
             model=MODEL,
             max_tokens=MAX_TOKENS,
-            system=SYSTEM_PROMPT,
+            system=_build_system_prompt(types),
             messages=[{"role": "user", "content": diff}],
         )
     except anthropic.AuthenticationError:

{git_commit_msg_ai-2.0.1 → git_commit_msg_ai-2.1.0}/git_commit_msg_ai/cli.py

@@ -3,19 +3,14 @@ import os
 import sys
 from typing import Final
 
-from git_commit_msg_ai import ai_client, editor, git_ops
+from git_commit_msg_ai import ai_client, config, editor, git_ops
 from git_commit_msg_ai.exceptions import GitCommitAIError
 
 LOG_LEVEL_ENVIRONMENT_VARIABLE: Final[str] = "GIT_COMMIT_AI_LOG_LEVEL"
 DEFAULT_LOG_LEVEL: Final[str] = "WARNING"
 LOG_FORMAT: Final[str] = "%(levelname)s:%(name)s:%(message)s"
-SELECTION_PROMPT: Final[str] = "[a]ccept / [e]dit / [r]eject: "
-SELECTION_ACCEPT: Final[str] = "a"
-SELECTION_EDIT: Final[str] = "e"
-SELECTION_REJECT: Final[str] = "r"
-REJECTED_MESSAGE: Final[str] = "User rejected the generated commit message. No commit made."
-INVALID_SELECTION_MESSAGE: Final[str] = "Invalid selection."
-ABORTED_MESSAGE: Final[str] = "Aborted."
+
+logger = logging.getLogger(__name__)
 
 
 def main() -> None:
@@ -29,29 +24,33 @@ 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)
+
     try:
         diff = git_ops.get_staged_diff()
-        commit_message = ai_client.generate_commit_message(diff)
+        commit_message = ai_client.generate_commit_message(diff, all_types)
         print(commit_message)
 
         print()
-        user_selection = input(SELECTION_PROMPT).strip().lower()
+        user_selection = input("[a]ccept / [e]dit / [r]eject: ").strip().lower()
 
-        if user_selection == SELECTION_ACCEPT:
+        if user_selection == "a":
             git_ops.commit(commit_message)
-        elif user_selection == SELECTION_EDIT:
+        elif user_selection == "e":
             updated_commit_message = editor.open_in_editor(commit_message)
             git_ops.commit(updated_commit_message)
-        elif user_selection == SELECTION_REJECT:
-            print(REJECTED_MESSAGE)
+        elif user_selection == "r":
+            print("User rejected the generated commit message. No commit made.")
         else:
-            print(INVALID_SELECTION_MESSAGE)
+            print("Invalid selection.")
             sys.exit(1)
     except GitCommitAIError as error:
-        logging.error(str(error))
+        logger.error(str(error))
+        print(f"Error: {error}", file=sys.stderr)
         sys.exit(1)
     except KeyboardInterrupt, EOFError:
-        print(ABORTED_MESSAGE)
+        print("Aborted.")
         sys.exit(1)
 
 

git_commit_msg_ai-2.1.0/git_commit_msg_ai/config.py

@@ -0,0 +1,80 @@
+import logging
+import tomllib
+from pathlib import Path
+from typing import Final
+
+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")
+
+
+def _find_pyproject_toml() -> Path | None:
+    for directory in [Path.cwd(), *Path.cwd().parents]:
+        candidate = directory / "pyproject.toml"
+        if candidate.is_file():
+            return candidate
+
+    return None
+
+
+def _parse_types_list(types_value: object, source: str) -> tuple[str, ...] | None:
+    if types_value is None:
+        return None
+    if not isinstance(types_value, list):
+        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())
+
+
+def _load_from_pyproject_toml(path: Path) -> tuple[str, ...] | None:
+    try:
+        with open(path, "rb") as toml_file:
+            data = tomllib.load(toml_file)
+    except tomllib.TOMLDecodeError:
+        logger.warning(f"Could not parse {path}, trying next config source")
+        return None
+
+    tool_section = data.get("tool")
+    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}")
+
+
+def _load_from_global_config() -> tuple[str, ...] | None:
+    global_config = Path.home() / ".git-commit-msg-ai.toml"
+    if not global_config.is_file():
+        return None
+
+    try:
+        with open(global_config, "rb") as toml_file:
+            data = tomllib.load(toml_file)
+    except tomllib.TOMLDecodeError:
+        logger.warning(f"Could not parse {global_config}, using default commit types")
+        return None
+
+    return _parse_types_list(data.get("types"), str(global_config))
+
+
+def load_optional_types() -> tuple[str, ...]:
+    pyproject_path = _find_pyproject_toml()
+    if pyproject_path is not None:
+        result = _load_from_pyproject_toml(pyproject_path)
+        if result is not None:
+            return result
+
+    result = _load_from_global_config()
+    if result is not None:
+        return result
+
+    return DEFAULT_OPTIONAL_TYPES
+
+
+def get_all_types(optional_types: tuple[str, ...]) -> tuple[str, ...]:
+    return tuple(dict.fromkeys(MANDATORY_TYPES + optional_types))

{git_commit_msg_ai-2.0.1 → git_commit_msg_ai-2.1.0}/git_commit_msg_ai.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-commit-msg-ai
-Version: 2.0.1
+Version: 2.1.0
 Summary: AI-powered git commit message generator following Conventional Commits
 License-Expression: MIT
 Requires-Python: >=3.14
@@ -112,7 +112,50 @@ feat(api)!: remove deprecated endpoint
 BREAKING CHANGE: /v1/legacy is no longer available
 ```
 
-Supported types: `feat`, `fix`, `docs`, `style`, `refactor`, `test`, `chore`
+Supported types: `feat`, `fix`, `revert`, `build`, `ci`, `docs`, `perf`, `refactor`, `style`, `test` (configurable — see [Configuration](#configuration))
+
+`revert` commits always follow this format: the subject line begins with `revert: ` followed by the header of the reverted commit, and the body must contain `This reverts commit <hash>.`
+
+## Configuration
+
+The set of optional commit types the AI may use can be customised through a config file. `feat`, `fix`, and `revert` are always included regardless of any configuration.
+
+### Config file locations and precedence
+
+The tool checks the following locations in order, using the first one that defines a `types` list:
+
+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`
+
+### Config file formats
+
+Project-level (`pyproject.toml`):
+
+```toml
+[tool.git-commit-msg-ai]
+types = ["build", "ci", "docs", "perf", "refactor", "style", "test"]
+```
+
+User-level (`~/.git-commit-msg-ai.toml`):
+
+```toml
+types = ["build", "ci", "docs", "chore"]
+```
+
+Setting `types = []` restricts the AI to only the three mandatory types (`feat`, `fix`, `revert`).
+
+### Default optional types
+
+| Type | Purpose |
+|---|---|
+| `build` | Changes to the build system or external dependencies |
+| `ci` | Changes to CI configuration files and scripts |
+| `docs` | Documentation-only changes |
+| `perf` | A code change that improves performance |
+| `refactor` | A code change that neither fixes a bug nor adds a feature |
+| `style` | Changes that do not affect the meaning of the code (whitespace, formatting) |
+| `test` | Adding missing tests or correcting existing tests |
 
 ## CI/CD
 
@@ -140,7 +183,7 @@ git push origin v1.5.2
 
 ## Debugging
 
-By default the tool produces no diagnostic output. To enable logging, set the `GIT_COMMIT_AI_LOG_LEVEL` environment variable before running the command. Logs are written to **stderr** and do not interfere with the generated commit message on **stdout**.
+When a failure occurs (git error, API error, editor error), the tool always prints an error message to **stderr**. Diagnostic logs are disabled by default; to enable them, set the `GIT_COMMIT_AI_LOG_LEVEL` environment variable before running the command. Both error messages and logs are written to **stderr** and do not interfere with the generated commit message on **stdout**.
 
 Valid values: `DEBUG`, `INFO`, `WARNING`, `ERROR`, `CRITICAL`
 

{git_commit_msg_ai-2.0.1 → git_commit_msg_ai-2.1.0}/git_commit_msg_ai.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ pyproject.toml
 git_commit_msg_ai/__init__.py
 git_commit_msg_ai/ai_client.py
 git_commit_msg_ai/cli.py
+git_commit_msg_ai/config.py
 git_commit_msg_ai/editor.py
 git_commit_msg_ai/exceptions.py
 git_commit_msg_ai/git_ops.py
@@ -14,6 +15,7 @@ git_commit_msg_ai.egg-info/requires.txt
 git_commit_msg_ai.egg-info/top_level.txt
 tests/test_ai_client.py
 tests/test_cli.py
+tests/test_config.py
 tests/test_editor.py
 tests/test_exceptions.py
 tests/test_generate_release_notes.py

{git_commit_msg_ai-2.0.1 → git_commit_msg_ai-2.1.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "git-commit-msg-ai"
-version = "2.0.1"
+version = "2.1.0"
 description = "AI-powered git commit message generator following Conventional Commits"
 readme = "README.md"
 license = "MIT"

{git_commit_msg_ai-2.0.1 → git_commit_msg_ai-2.1.0}/tests/test_ai_client.py

@@ -7,6 +7,8 @@ import pytest
 from git_commit_msg_ai.ai_client import generate_commit_message
 from git_commit_msg_ai.exceptions import AIError
 
+TYPES: tuple[str, ...] = ("feat", "fix", "docs")
+
 
 def _make_api_response(text: str) -> MagicMock:
     mock_text_block = MagicMock(spec=anthropic.types.TextBlock)
@@ -33,7 +35,7 @@ class TestGenerateCommitMessage:
             mock_client.messages.create.return_value = _make_api_response("  feat: add feature  ")
             mock_anthropic_class.return_value = mock_client
 
-            result = generate_commit_message("diff content")
+            result = generate_commit_message("diff content", TYPES)
 
         assert result == "feat: add feature"
 
@@ -45,7 +47,7 @@ class TestGenerateCommitMessage:
             mock_anthropic_class.return_value = mock_client
 
             with pytest.raises(AIError, match="ANTHROPIC_API_KEY"):
-                generate_commit_message("diff content")
+                generate_commit_message("diff content", TYPES)
 
     def test_generate_commit_message_raises_ai_error_on_rate_limit_error(self) -> None:
         with ExitStack() as stack:
@@ -55,7 +57,7 @@ class TestGenerateCommitMessage:
             mock_anthropic_class.return_value = mock_client
 
             with pytest.raises(AIError, match="rate limit"):
-                generate_commit_message("diff content")
+                generate_commit_message("diff content", TYPES)
 
     def test_generate_commit_message_raises_ai_error_on_api_connection_error(self) -> None:
         mock_request = MagicMock()
@@ -67,7 +69,7 @@ class TestGenerateCommitMessage:
             mock_anthropic_class.return_value = mock_client
 
             with pytest.raises(AIError, match="network"):
-                generate_commit_message("diff content")
+                generate_commit_message("diff content", TYPES)
 
     def test_generate_commit_message_raises_ai_error_on_api_status_error_with_status_code(self) -> None:
         with ExitStack() as stack:
@@ -77,7 +79,7 @@ class TestGenerateCommitMessage:
             mock_anthropic_class.return_value = mock_client
 
             with pytest.raises(AIError, match="500"):
-                generate_commit_message("diff content")
+                generate_commit_message("diff content", TYPES)
 
     def test_generate_commit_message_raises_ai_error_on_non_text_block_response(self) -> None:
         mock_non_text_block = MagicMock()  # no spec=TextBlock → isinstance check fails
@@ -92,4 +94,22 @@ class TestGenerateCommitMessage:
             mock_anthropic_class.return_value = mock_client
 
             with pytest.raises(AIError, match="Unexpected response format"):
-                generate_commit_message("diff content")
+                generate_commit_message("diff content", TYPES)
+
+    def test_generate_commit_message_includes_types_in_system_prompt(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", ("feat", "fix", "chore"))
+
+        system_param = mock_client.messages.create.call_args.kwargs["system"]
+
+        assert isinstance(system_param, list)
+        assert len(system_param) == 1
+        block = system_param[0]
+        assert block["type"] == "text"
+        assert block["cache_control"] == {"type": "ephemeral"}
+        assert "feat, fix, chore" in block["text"]

{git_commit_msg_ai-2.0.1 → git_commit_msg_ai-2.1.0}/tests/test_cli.py

@@ -6,12 +6,14 @@ from unittest.mock import MagicMock, patch
 import pytest
 
 from git_commit_msg_ai.cli import LOG_FORMAT, LOG_LEVEL_ENVIRONMENT_VARIABLE, main
+from git_commit_msg_ai.config import DEFAULT_OPTIONAL_TYPES, MANDATORY_TYPES
 from git_commit_msg_ai.exceptions import AIError, GitError
 
 COMMIT_MESSAGE = "feat: add feature"
 EDITED_COMMIT_MESSAGE = "edited commit message"
 STAGED_DIFF = "diff content"
 GENERIC_COMMIT_MESSAGE = "generic commit message"
+ALL_TYPES = MANDATORY_TYPES + DEFAULT_OPTIONAL_TYPES
 
 
 class TestMain:
@@ -26,9 +28,13 @@ class TestMain:
         mock_editor.open_in_editor.return_value = EDITED_COMMIT_MESSAGE
 
         with ExitStack() as stack:
+            mock_config = MagicMock()
+            mock_config.load_optional_types.return_value = DEFAULT_OPTIONAL_TYPES
+            mock_config.get_all_types.return_value = ALL_TYPES
             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", return_value=user_input))
             main()
 
@@ -68,12 +74,16 @@ class TestMain:
         mock_git_ops.get_staged_diff.return_value = STAGED_DIFF
         mock_ai_client = MagicMock()
         mock_ai_client.generate_commit_message.return_value = GENERIC_COMMIT_MESSAGE
+        mock_config = MagicMock()
+        mock_config.load_optional_types.return_value = DEFAULT_OPTIONAL_TYPES
+        mock_config.get_all_types.return_value = ALL_TYPES
 
         # Act
         with ExitStack() as stack:
             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"))
+            stack.enter_context(patch("git_commit_msg_ai.cli.config", mock_config))
             stack.enter_context(patch("builtins.input", return_value="x"))
             with pytest.raises(SystemExit) as exc_info:
                 main()
@@ -85,10 +95,14 @@ class TestMain:
         # Arrange
         mock_git_ops = MagicMock()
         mock_git_ops.get_staged_diff.side_effect = GitError("staged error")
+        mock_config = MagicMock()
+        mock_config.load_optional_types.return_value = DEFAULT_OPTIONAL_TYPES
+        mock_config.get_all_types.return_value = ALL_TYPES
 
         # Act
         with ExitStack() as stack:
             stack.enter_context(patch("git_commit_msg_ai.cli.git_ops", mock_git_ops))
+            stack.enter_context(patch("git_commit_msg_ai.cli.config", mock_config))
             with pytest.raises(SystemExit) as exc_info:
                 main()
 
@@ -99,27 +113,53 @@ class TestMain:
         # Arrange
         mock_git_ops = MagicMock()
         mock_git_ops.get_staged_diff.side_effect = GitError("staged error")
+        mock_config = MagicMock()
+        mock_config.load_optional_types.return_value = DEFAULT_OPTIONAL_TYPES
+        mock_config.get_all_types.return_value = ALL_TYPES
 
         # Act
         with ExitStack() as stack:
             stack.enter_context(patch("git_commit_msg_ai.cli.git_ops", mock_git_ops))
+            stack.enter_context(patch("git_commit_msg_ai.cli.config", mock_config))
             with pytest.raises(SystemExit):
                 main()
 
         # Assert
         assert "staged error" in caplog.text
 
+    def test_main_git_error_from_get_staged_diff_prints_error_to_stderr(self, capsys: pytest.CaptureFixture[str]) -> None:
+        # Arrange
+        mock_git_ops = MagicMock()
+        mock_git_ops.get_staged_diff.side_effect = GitError("staged error")
+        mock_config = MagicMock()
+        mock_config.load_optional_types.return_value = DEFAULT_OPTIONAL_TYPES
+        mock_config.get_all_types.return_value = ALL_TYPES
+
+        # Act
+        with ExitStack() as stack:
+            stack.enter_context(patch("git_commit_msg_ai.cli.git_ops", mock_git_ops))
+            stack.enter_context(patch("git_commit_msg_ai.cli.config", mock_config))
+            with pytest.raises(SystemExit):
+                main()
+
+        # Assert
+        assert "staged error" in capsys.readouterr().err
+
     def test_main_ai_error_exits_with_code_1(self) -> None:
         # Arrange
         mock_git_ops = MagicMock()
         mock_git_ops.get_staged_diff.return_value = STAGED_DIFF
         mock_ai_client = MagicMock()
         mock_ai_client.generate_commit_message.side_effect = AIError("ai error")
+        mock_config = MagicMock()
+        mock_config.load_optional_types.return_value = DEFAULT_OPTIONAL_TYPES
+        mock_config.get_all_types.return_value = ALL_TYPES
 
         # Act
         with ExitStack() as stack:
             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.config", mock_config))
             with pytest.raises(SystemExit) as exc_info:
                 main()
 
@@ -132,17 +172,42 @@ class TestMain:
         mock_git_ops.get_staged_diff.return_value = STAGED_DIFF
         mock_ai_client = MagicMock()
         mock_ai_client.generate_commit_message.side_effect = AIError("ai error")
+        mock_config = MagicMock()
+        mock_config.load_optional_types.return_value = DEFAULT_OPTIONAL_TYPES
+        mock_config.get_all_types.return_value = ALL_TYPES
 
         # Act
         with ExitStack() as stack:
             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.config", mock_config))
             with pytest.raises(SystemExit):
                 main()
 
         # Assert
         assert "ai error" in caplog.text
 
+    def test_main_ai_error_prints_error_to_stderr(self, capsys: pytest.CaptureFixture[str]) -> None:
+        # Arrange
+        mock_git_ops = MagicMock()
+        mock_git_ops.get_staged_diff.return_value = STAGED_DIFF
+        mock_ai_client = MagicMock()
+        mock_ai_client.generate_commit_message.side_effect = AIError("ai error")
+        mock_config = MagicMock()
+        mock_config.load_optional_types.return_value = DEFAULT_OPTIONAL_TYPES
+        mock_config.get_all_types.return_value = ALL_TYPES
+
+        # Act
+        with ExitStack() as stack:
+            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.config", mock_config))
+            with pytest.raises(SystemExit):
+                main()
+
+        # Assert
+        assert "ai error" in capsys.readouterr().err
+
     def test_main_git_error_from_commit_exits_with_code_1(self) -> None:
         # Arrange
         mock_git_ops = MagicMock()
@@ -150,12 +215,16 @@ class TestMain:
         mock_git_ops.commit.side_effect = GitError("commit error")
         mock_ai_client = MagicMock()
         mock_ai_client.generate_commit_message.return_value = GENERIC_COMMIT_MESSAGE
+        mock_config = MagicMock()
+        mock_config.load_optional_types.return_value = DEFAULT_OPTIONAL_TYPES
+        mock_config.get_all_types.return_value = ALL_TYPES
 
         # Act
         with ExitStack() as stack:
             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"))
+            stack.enter_context(patch("git_commit_msg_ai.cli.config", mock_config))
             stack.enter_context(patch("builtins.input", return_value="a"))
             with pytest.raises(SystemExit) as exc_info:
                 main()
@@ -170,12 +239,16 @@ class TestMain:
         mock_git_ops.commit.side_effect = GitError("commit error")
         mock_ai_client = MagicMock()
         mock_ai_client.generate_commit_message.return_value = GENERIC_COMMIT_MESSAGE
+        mock_config = MagicMock()
+        mock_config.load_optional_types.return_value = DEFAULT_OPTIONAL_TYPES
+        mock_config.get_all_types.return_value = ALL_TYPES
 
         # Act
         with ExitStack() as stack:
             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"))
+            stack.enter_context(patch("git_commit_msg_ai.cli.config", mock_config))
             stack.enter_context(patch("builtins.input", return_value="a"))
             with pytest.raises(SystemExit):
                 main()
@@ -183,6 +256,30 @@ class TestMain:
         # Assert
         assert "commit error" in caplog.text
 
+    def test_main_git_error_from_commit_prints_error_to_stderr(self, capsys: pytest.CaptureFixture[str]) -> None:
+        # Arrange
+        mock_git_ops = MagicMock()
+        mock_git_ops.get_staged_diff.return_value = STAGED_DIFF
+        mock_git_ops.commit.side_effect = GitError("commit error")
+        mock_ai_client = MagicMock()
+        mock_ai_client.generate_commit_message.return_value = GENERIC_COMMIT_MESSAGE
+        mock_config = MagicMock()
+        mock_config.load_optional_types.return_value = DEFAULT_OPTIONAL_TYPES
+        mock_config.get_all_types.return_value = ALL_TYPES
+
+        # Act
+        with ExitStack() as stack:
+            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"))
+            stack.enter_context(patch("git_commit_msg_ai.cli.config", mock_config))
+            stack.enter_context(patch("builtins.input", return_value="a"))
+            with pytest.raises(SystemExit):
+                main()
+
+        # Assert
+        assert "commit error" in capsys.readouterr().err
+
     @pytest.mark.parametrize("exception", [KeyboardInterrupt, EOFError])
     def test_main_interrupt_exits_with_code_1(self, exception: type[BaseException]) -> None:
         # Arrange
@@ -191,11 +288,16 @@ class TestMain:
         mock_ai_client = MagicMock()
         mock_ai_client.generate_commit_message.return_value = GENERIC_COMMIT_MESSAGE
 
+        mock_config = MagicMock()
+        mock_config.load_optional_types.return_value = DEFAULT_OPTIONAL_TYPES
+        mock_config.get_all_types.return_value = ALL_TYPES
+
         # Act
         with ExitStack() as stack:
             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"))
+            stack.enter_context(patch("git_commit_msg_ai.cli.config", mock_config))
             stack.enter_context(patch("builtins.input", side_effect=exception))
             with pytest.raises(SystemExit) as exc_info:
                 main()
@@ -211,11 +313,16 @@ class TestMain:
         mock_ai_client = MagicMock()
         mock_ai_client.generate_commit_message.return_value = GENERIC_COMMIT_MESSAGE
 
+        mock_config = MagicMock()
+        mock_config.load_optional_types.return_value = DEFAULT_OPTIONAL_TYPES
+        mock_config.get_all_types.return_value = ALL_TYPES
+
         # Act
         with ExitStack() as stack:
             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"))
+            stack.enter_context(patch("git_commit_msg_ai.cli.config", mock_config))
             stack.enter_context(patch("builtins.input", side_effect=exception))
             with pytest.raises(SystemExit):
                 main()
@@ -231,9 +338,13 @@ class TestMain:
         mock_ai_client.generate_commit_message.return_value = "feat: x"
 
         with ExitStack() as stack:
+            mock_config = MagicMock()
+            mock_config.load_optional_types.return_value = DEFAULT_OPTIONAL_TYPES
+            mock_config.get_all_types.return_value = ALL_TYPES
             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"))
+            stack.enter_context(patch("git_commit_msg_ai.cli.config", mock_config))
             stack.enter_context(patch("builtins.input", return_value="r"))
             main()
 

git_commit_msg_ai-2.1.0/tests/test_config.py

@@ -0,0 +1,308 @@
+from contextlib import ExitStack
+from pathlib import Path
+from unittest.mock import patch
+
+from git_commit_msg_ai.config import (
+    DEFAULT_OPTIONAL_TYPES,
+    MANDATORY_TYPES,
+    get_all_types,
+    load_optional_types,
+)
+
+
+class TestLoadOptionalTypes:
+    def test_no_pyproject_toml_and_no_global_config_returns_default_optional_types(self, tmp_path: Path) -> None:
+        home_dir = tmp_path / "home"
+        home_dir.mkdir()
+
+        with ExitStack() as stack:
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.cwd", return_value=tmp_path))
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.home", return_value=home_dir))
+            result = load_optional_types()
+
+        assert result == DEFAULT_OPTIONAL_TYPES
+
+    def test_pyproject_toml_without_tool_section_and_no_global_config_returns_default_optional_types(self, tmp_path: Path) -> None:
+        home_dir = tmp_path / "home"
+        home_dir.mkdir()
+        (tmp_path / "pyproject.toml").write_text("""\
+[project]
+name = "foo"
+""")
+
+        with ExitStack() as stack:
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.cwd", return_value=tmp_path))
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.home", return_value=home_dir))
+            result = load_optional_types()
+
+        assert result == DEFAULT_OPTIONAL_TYPES
+
+    def test_pyproject_toml_with_other_tool_section_and_no_global_config_returns_default_optional_types(self, tmp_path: Path) -> None:
+        home_dir = tmp_path / "home"
+        home_dir.mkdir()
+        (tmp_path / "pyproject.toml").write_text("""\
+[tool.other-tool]
+key = "value"
+""")
+
+        with ExitStack() as stack:
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.cwd", return_value=tmp_path))
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.home", return_value=home_dir))
+            result = load_optional_types()
+
+        assert result == DEFAULT_OPTIONAL_TYPES
+
+    def test_pyproject_toml_with_package_section_without_types_key_and_no_global_config_returns_default_optional_types(self, tmp_path: Path) -> None:
+        home_dir = tmp_path / "home"
+        home_dir.mkdir()
+        (tmp_path / "pyproject.toml").write_text("""\
+[tool.git-commit-msg-ai]
+other_key = "value"
+""")
+
+        with ExitStack() as stack:
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.cwd", return_value=tmp_path))
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.home", return_value=home_dir))
+            result = load_optional_types()
+
+        assert result == DEFAULT_OPTIONAL_TYPES
+
+    def test_pyproject_toml_with_valid_types_returns_configured_types(self, tmp_path: Path) -> None:
+        home_dir = tmp_path / "home"
+        home_dir.mkdir()
+        (tmp_path / "pyproject.toml").write_text("""\
+[tool.git-commit-msg-ai]
+types = ["build", "ci", "docs"]
+""")
+
+        with ExitStack() as stack:
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.cwd", return_value=tmp_path))
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.home", return_value=home_dir))
+            result = load_optional_types()
+
+        assert result == ("build", "ci", "docs")
+
+    def test_pyproject_toml_types_are_stripped_and_lowercased(self, tmp_path: Path) -> None:
+        home_dir = tmp_path / "home"
+        home_dir.mkdir()
+        (tmp_path / "pyproject.toml").write_text("""\
+[tool.git-commit-msg-ai]
+types = ["  Build  ", "CI"]
+""")
+
+        with ExitStack() as stack:
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.cwd", return_value=tmp_path))
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.home", return_value=home_dir))
+            result = load_optional_types()
+
+        assert result == ("build", "ci")
+
+    def test_pyproject_toml_empty_string_entries_are_filtered(self, tmp_path: Path) -> None:
+        home_dir = tmp_path / "home"
+        home_dir.mkdir()
+        (tmp_path / "pyproject.toml").write_text("""\
+[tool.git-commit-msg-ai]
+types = ["docs", "", "  ", "test"]
+""")
+
+        with ExitStack() as stack:
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.cwd", return_value=tmp_path))
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.home", return_value=home_dir))
+            result = load_optional_types()
+
+        assert result == ("docs", "test")
+
+    def test_pyproject_toml_non_string_entries_are_filtered(self, tmp_path: Path) -> None:
+        home_dir = tmp_path / "home"
+        home_dir.mkdir()
+        (tmp_path / "pyproject.toml").write_text("""\
+[tool.git-commit-msg-ai]
+types = [1, "docs", true, "test"]
+""")
+
+        with ExitStack() as stack:
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.cwd", return_value=tmp_path))
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.home", return_value=home_dir))
+            result = load_optional_types()
+
+        assert result == ("docs", "test")
+
+    def test_pyproject_toml_empty_types_list_returns_empty_tuple(self, tmp_path: Path) -> None:
+        home_dir = tmp_path / "home"
+        home_dir.mkdir()
+        (tmp_path / "pyproject.toml").write_text("""\
+[tool.git-commit-msg-ai]
+types = []
+""")
+
+        with ExitStack() as stack:
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.cwd", return_value=tmp_path))
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.home", return_value=home_dir))
+            result = load_optional_types()
+
+        assert result == ()
+
+    def test_pyproject_toml_invalid_toml_falls_through_and_returns_default_optional_types(self, tmp_path: Path) -> None:
+        home_dir = tmp_path / "home"
+        home_dir.mkdir()
+        (tmp_path / "pyproject.toml").write_text("""\
+this is not valid toml }{}
+""")
+
+        with ExitStack() as stack:
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.cwd", return_value=tmp_path))
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.home", return_value=home_dir))
+            result = load_optional_types()
+
+        assert result == DEFAULT_OPTIONAL_TYPES
+
+    def test_pyproject_toml_types_is_string_not_array_falls_through_and_returns_default_optional_types(self, tmp_path: Path) -> None:
+        home_dir = tmp_path / "home"
+        home_dir.mkdir()
+        (tmp_path / "pyproject.toml").write_text("""\
+[tool.git-commit-msg-ai]
+types = "docs"
+""")
+
+        with ExitStack() as stack:
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.cwd", return_value=tmp_path))
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.home", return_value=home_dir))
+            result = load_optional_types()
+
+        assert result == DEFAULT_OPTIONAL_TYPES
+
+    def test_pyproject_toml_discovered_by_walking_up_from_subdirectory(self, tmp_path: Path) -> None:
+        home_dir = tmp_path / "home"
+        home_dir.mkdir()
+        (tmp_path / "pyproject.toml").write_text("""\
+[tool.git-commit-msg-ai]
+types = ["build", "ci"]
+""")
+        subdir = tmp_path / "subdir"
+        subdir.mkdir()
+
+        with ExitStack() as stack:
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.cwd", return_value=subdir))
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.home", return_value=home_dir))
+            result = load_optional_types()
+
+        assert result == ("build", "ci")
+
+    def test_global_config_used_when_no_pyproject_toml_section(self, tmp_path: Path) -> None:
+        cwd_dir = tmp_path / "project"
+        cwd_dir.mkdir()
+        home_dir = tmp_path / "home"
+        home_dir.mkdir()
+        (home_dir / ".git-commit-msg-ai.toml").write_text("""\
+types = ["chore"]
+""")
+
+        with ExitStack() as stack:
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.cwd", return_value=cwd_dir))
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.home", return_value=home_dir))
+            result = load_optional_types()
+
+        assert result == ("chore",)
+
+    def test_global_config_empty_types_returns_empty_tuple(self, tmp_path: Path) -> None:
+        cwd_dir = tmp_path / "project"
+        cwd_dir.mkdir()
+        home_dir = tmp_path / "home"
+        home_dir.mkdir()
+        (home_dir / ".git-commit-msg-ai.toml").write_text("""\
+types = []
+""")
+
+        with ExitStack() as stack:
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.cwd", return_value=cwd_dir))
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.home", return_value=home_dir))
+            result = load_optional_types()
+
+        assert result == ()
+
+    def test_global_config_invalid_toml_returns_default_optional_types(self, tmp_path: Path) -> None:
+        cwd_dir = tmp_path / "project"
+        cwd_dir.mkdir()
+        home_dir = tmp_path / "home"
+        home_dir.mkdir()
+        (home_dir / ".git-commit-msg-ai.toml").write_text("""\
+this is not valid toml }{}
+""")
+
+        with ExitStack() as stack:
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.cwd", return_value=cwd_dir))
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.home", return_value=home_dir))
+            result = load_optional_types()
+
+        assert result == DEFAULT_OPTIONAL_TYPES
+
+    def test_global_config_without_types_key_returns_default_optional_types(self, tmp_path: Path) -> None:
+        cwd_dir = tmp_path / "project"
+        cwd_dir.mkdir()
+        home_dir = tmp_path / "home"
+        home_dir.mkdir()
+        (home_dir / ".git-commit-msg-ai.toml").write_text("""\
+other_key = "value"
+""")
+
+        with ExitStack() as stack:
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.cwd", return_value=cwd_dir))
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.home", return_value=home_dir))
+            result = load_optional_types()
+
+        assert result == DEFAULT_OPTIONAL_TYPES
+
+    def test_pyproject_toml_takes_precedence_over_global_config(self, tmp_path: Path) -> None:
+        home_dir = tmp_path / "home"
+        home_dir.mkdir()
+        (tmp_path / "pyproject.toml").write_text("""\
+[tool.git-commit-msg-ai]
+types = ["build"]
+""")
+        (home_dir / ".git-commit-msg-ai.toml").write_text("""\
+types = ["chore"]
+""")
+
+        with ExitStack() as stack:
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.cwd", return_value=tmp_path))
+            stack.enter_context(patch("git_commit_msg_ai.config.Path.home", return_value=home_dir))
+            result = load_optional_types()
+
+        assert result == ("build",)
+
+
+class TestGetAllTypes:
+    def test_get_all_types_with_default_optional_types(self) -> None:
+        result = get_all_types(DEFAULT_OPTIONAL_TYPES)
+
+        assert result == MANDATORY_TYPES + DEFAULT_OPTIONAL_TYPES
+
+    def test_get_all_types_with_empty_optional_types_returns_only_mandatory_types(self) -> None:
+        result = get_all_types(())
+
+        assert result == MANDATORY_TYPES
+
+    def test_get_all_types_deduplicates_feat_in_optional_types(self) -> None:
+        result = get_all_types(("feat", "docs"))
+
+        assert result.count("feat") == 1
+
+    def test_get_all_types_deduplicates_fix_in_optional_types(self) -> None:
+        result = get_all_types(("fix", "docs"))
+
+        assert result.count("fix") == 1
+
+    def test_get_all_types_deduplicates_revert_in_optional_types(self) -> None:
+        result = get_all_types(("revert", "docs"))
+
+        assert result.count("revert") == 1
+
+    def test_get_all_types_deduplicates_all_mandatory_types_in_optional_types(self) -> None:
+        result = get_all_types(("feat", "fix", "revert", "docs"))
+
+        assert result == ("feat", "fix", "revert", "docs")
+
+    def test_get_all_types_mandatory_types_always_come_first(self) -> None:
+        result = get_all_types(("docs", "build"))
+
+        assert result[:3] == MANDATORY_TYPES