git-cai-cli 0.11.0__tar.gz → 0.11.2__tar.gz

{git_cai_cli-0.11.0 → git_cai_cli-0.11.2}/.linters/.proselintrc

@@ -73,6 +73,6 @@
         , "typography.symbols": false
         , "uncomparables.misc": true
         , "weasel_words.misc": true
-        , "weasel_words.very": true
+        , "weasel_words.very": false
     }
 }

{git_cai_cli-0.11.0/src/git_cai_cli.egg-info → git_cai_cli-0.11.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-cai-cli
-Version: 0.11.0
+Version: 0.11.2
 Summary: Use LLM to create git commit messages
 Author-email: Thorsten Foltz <thorsten.foltz@live.com>
 License-Expression: MIT

git_cai_cli-0.11.2/cai_config.yml

@@ -0,0 +1,35 @@
+default: anthropic
+language: en
+style: professional
+emoji: true
+conventional: false
+branch_context: false
+load_tokens_from: /home/thorsten/.config/cai/tokens.yml
+prompt_file: ""
+squash_prompt_file: ""
+token_logging: true
+measure_time: true
+anthropic:
+  model: claude-opus-4-6
+  temperature: 0
+deepseek:
+  model: deepseek-chat
+  temperature: 0
+gemini:
+  model: gemini-2.5-flash
+  temperature: 0
+groq:
+  model: moonshotai/kimi-k2-instruct
+  temperature: 0
+mistral:
+  model: codestral-2508
+  temperature: 0
+ollama:
+  model: llama3.1
+  temperature: 0
+openai:
+  model: gpt-5.2
+  temperature: 0
+xai:
+  model: grok-4-1-fast-reasoning
+  temperature: 0

{git_cai_cli-0.11.0 → git_cai_cli-0.11.2}/src/git_cai_cli/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.11.0'
-__version_tuple__ = version_tuple = (0, 11, 0)
+__version__ = version = '0.11.2'
+__version_tuple__ = version_tuple = (0, 11, 2)
 
-__commit_id__ = commit_id = 'gb38a05ada'
+__commit_id__ = commit_id = 'g24b24b5ca'

{git_cai_cli-0.11.0 → git_cai_cli-0.11.2}/src/git_cai_cli/core/config.py

@@ -268,7 +268,15 @@ def load_config(
 
     try:
         with fallback_config_file.open("r", encoding="utf-8") as f:
-            config = cast(dict[str, Any], yaml.safe_load(f) or default_config)
+            raw = yaml.safe_load(f)
+        if not isinstance(raw, dict):
+            log.warning(
+                "Home config %s is not a YAML mapping, using defaults",
+                fallback_config_file,
+            )
+            config = default_config
+        else:
+            config = raw or default_config
         log.debug("Home config loaded successfully")
     except yaml.YAMLError:
         log.error("Failed to parse home config %s", fallback_config_file)

{git_cai_cli-0.11.0 → git_cai_cli-0.11.2}/src/git_cai_cli/core/llm.py

@@ -164,7 +164,10 @@ class CommitMessageGenerator:
 
         content = git_diff
         if context:
-            content = f"{git_diff}\n\nAdditional context:\n{context}"
+            content = (
+                f"{git_diff}\n\n"
+                f"--- Additional context from the author ---\n{context}"
+            )
 
         return self._dispatch_generate(content=content, system_prompt=prompt)
 
@@ -192,8 +195,8 @@ class CommitMessageGenerator:
 
         if emoji_value:
             emoji_instruction = (
-                "Use relevant emojis in the commit message where appropriate. "
-                "Emojis should enhance the clarity and tone of the message."
+                "Use relevant emojis at the start of the headline and in bullet points "
+                "where they add clarity. Keep emojis purposeful — one per bullet at most."
             )
             log.info("Emojis are enabled for commit messages.")
         else:
@@ -236,7 +239,7 @@ class CommitMessageGenerator:
             log.info("Style setting is 'none' — no style instruction added to prompt.")
             return ""
 
-        return f"Write the commit message in the following tone style: {style}."
+        return f"Write the commit message in the following tone style: {style}. Apply this tone to both the headline and the bullet points."
 
     def _conventional_instruction(self) -> str:
         """
@@ -248,12 +251,12 @@ class CommitMessageGenerator:
         log.info("Conventional Commits format enabled.")
         return (
             "Follow the Conventional Commits specification. "
-            "The commit message MUST be structured as: <type>(<optional scope>): <description>. "
+            "The headline MUST be structured as: <type>(<optional scope>): <description>. "
             "Allowed types: feat, fix, docs, style, refactor, perf, test, build, ci, chore, revert. "
             "The scope is optional and describes the section of the codebase affected. "
             "Use a '!' after the type/scope for breaking changes (e.g., 'feat!: ...' or 'feat(api)!: ...'). "
-            "The description must be a concise summary in imperative mood. "
-            "Additional details can follow as bullet points in the body."
+            "The description must be a concise summary in imperative mood, lowercase, no trailing period. "
+            "Additional details follow as bullet points in the body after a blank line."
         )
 
     def _branch_instruction(self) -> str:
@@ -270,8 +273,8 @@ class CommitMessageGenerator:
         log.info("Branch context enabled: '%s'.", branch_name)
         return (
             f"The current Git branch is '{branch_name}'. "
-            "Use the branch name as additional context to better understand "
-            "the intent and scope of the changes."
+            "Use the branch name as additional context to infer the intent "
+            "and scope of the changes — but do not include the branch name in the message."
         )
 
     def _config_instructions(self) -> str:
@@ -422,15 +425,12 @@ class CommitMessageGenerator:
 
         data = response.json()
 
-        try:
-            usage = data.get("usage", {})
-            self._log_token_usage(
-                "anthropic",
-                usage.get("input_tokens"),
-                usage.get("output_tokens"),
-            )
-        except (KeyError, TypeError, AttributeError):
-            self._log_token_usage("anthropic", None, None)
+        usage = data.get("usage") or {}
+        self._log_token_usage(
+            "anthropic",
+            usage.get("input_tokens"),
+            usage.get("output_tokens"),
+        )
 
         return data["content"][0]["text"].strip()
 
@@ -492,15 +492,12 @@ class CommitMessageGenerator:
 
         data = response.json()
 
-        try:
-            usage = data.get("usageMetadata", {})
-            self._log_token_usage(
-                "gemini",
-                usage.get("promptTokenCount"),
-                usage.get("candidatesTokenCount"),
-            )
-        except (KeyError, TypeError, AttributeError):
-            self._log_token_usage("gemini", None, None)
+        usage = data.get("usageMetadata") or {}
+        self._log_token_usage(
+            "gemini",
+            usage.get("promptTokenCount"),
+            usage.get("candidatesTokenCount"),
+        )
 
         return data["candidates"][0]["content"]["parts"][0]["text"].strip()
 
@@ -553,15 +550,12 @@ class CommitMessageGenerator:
 
         data = response.json()
 
-        try:
-            usage = data.get("usage", {})
-            self._log_token_usage(
-                "groq",
-                usage.get("prompt_tokens"),
-                usage.get("completion_tokens"),
-            )
-        except (KeyError, TypeError, AttributeError):
-            self._log_token_usage("groq", None, None)
+        usage = data.get("usage") or {}
+        self._log_token_usage(
+            "groq",
+            usage.get("prompt_tokens"),
+            usage.get("completion_tokens"),
+        )
 
         return data["choices"][0]["message"]["content"].strip()
 
@@ -612,15 +606,12 @@ class CommitMessageGenerator:
 
         data = response.json()
 
-        try:
-            usage = data.get("usage", {})
-            self._log_token_usage(
-                "mistral",
-                usage.get("prompt_tokens"),
-                usage.get("completion_tokens"),
-            )
-        except (KeyError, TypeError, AttributeError):
-            self._log_token_usage("mistral", None, None)
+        usage = data.get("usage") or {}
+        self._log_token_usage(
+            "mistral",
+            usage.get("prompt_tokens"),
+            usage.get("completion_tokens"),
+        )
 
         return data["choices"][0]["message"]["content"].strip()
 
@@ -780,14 +771,11 @@ class CommitMessageGenerator:
         data = response.json()
 
         # Extract token usage from Ollama response
-        try:
-            self._log_token_usage(
-                "ollama",
-                data.get("prompt_eval_count") if isinstance(data, dict) else None,
-                data.get("eval_count") if isinstance(data, dict) else None,
-            )
-        except (KeyError, TypeError, AttributeError):
-            self._log_token_usage("ollama", None, None)
+        self._log_token_usage(
+            "ollama",
+            data.get("prompt_eval_count") if isinstance(data, dict) else None,
+            data.get("eval_count") if isinstance(data, dict) else None,
+        )
 
         # /api/chat format
         if isinstance(data, dict) and isinstance(data.get("message"), dict):
@@ -847,15 +835,12 @@ class CommitMessageGenerator:
             stream=False,
         )
 
-        try:
-            usage = completion.usage
-            self._log_token_usage(
-                provider_name,
-                getattr(usage, "prompt_tokens", None),
-                getattr(usage, "completion_tokens", None),
-            )
-        except (KeyError, TypeError, AttributeError):
-            self._log_token_usage(provider_name, None, None)
+        usage = completion.usage
+        self._log_token_usage(
+            provider_name,
+            getattr(usage, "prompt_tokens", None),
+            getattr(usage, "completion_tokens", None),
+        )
 
         return completion.choices[0].message.content.strip()
 
@@ -905,15 +890,12 @@ class CommitMessageGenerator:
 
         data = response.json()
 
-        try:
-            usage = data.get("usage", {})
-            self._log_token_usage(
-                "xai",
-                usage.get("prompt_tokens"),
-                usage.get("completion_tokens"),
-            )
-        except (KeyError, TypeError, AttributeError):
-            self._log_token_usage("xai", None, None)
+        usage = data.get("usage") or {}
+        self._log_token_usage(
+            "xai",
+            usage.get("prompt_tokens"),
+            usage.get("completion_tokens"),
+        )
 
         return data["choices"][0]["message"]["content"].strip()
 

git_cai_cli-0.11.2/src/git_cai_cli/core/prompts_fallback.py

@@ -0,0 +1,36 @@
+"""
+Hardcoded fallback prompts used as a last resort when no prompt file is found.
+
+This module exists to break the circular dependency between config.py and llm.py.
+Both modules can safely import from here without creating import cycles.
+"""
+
+HARDCODED_COMMIT_PROMPT = (
+    "You are an expert software engineer assistant. "
+    "Your task is to generate a concise, professional git commit message "
+    "from the provided git diff.\n"
+    "\n"
+    "Rules:\n"
+    '- Write a single headline in imperative mood (e.g. "Add", "Fix", "Refactor"), max 50 characters.\n'
+    "- Below the headline, leave one blank line, then add a bullet-point list of the most important changes.\n"
+    "- Each bullet should explain *what* changed and *why*, not repeat filenames or obvious details.\n"
+    "- Group related changes into one bullet instead of listing every file separately.\n"
+    "- Keep the total message short — aim for clarity over completeness.\n"
+    "- Output only the raw commit message. No markdown fences, no quotes, no extra commentary.\n"
+    "- If you detect sensitive information (keys, tokens, passwords), "
+    "warn about it at the very top before the headline."
+)
+
+HARDCODED_SQUASH_PROMPT = (
+    "You are an expert software engineer assistant. "
+    "Your task is to summarize multiple existing commit messages "
+    "into a single, coherent git commit message that captures the overall intent.\n"
+    "\n"
+    "Rules:\n"
+    "- Do not list or echo each original commit. Synthesize them into a unified narrative.\n"
+    "- Write one clear headline in imperative mood (max 50 characters) that captures the main purpose.\n"
+    "- Below the headline, leave one blank line, then add a concise bullet list "
+    "describing the key themes of the work.\n"
+    "- Focus on *why* the changes were made, not just *what* was touched.\n"
+    "- Output only the raw commit message. No markdown fences, no quotes, no extra commentary."
+)

{git_cai_cli-0.11.0 → git_cai_cli-0.11.2}/src/git_cai_cli/core/squash.py

@@ -251,7 +251,10 @@ def squash_branch(
 
             result = commit_with_edit_template(msg)
             if result != 0:
-                log.info("Commit aborted — squash cancelled.")
+                log.info(
+                    "Commit aborted — squash cancelled. "
+                    "Note: staged changes were already committed."
+                )
                 return
 
         else:
@@ -314,35 +317,35 @@ def squash_branch(
             tf.flush()
             tf_name = Path(tf.name)
 
-        original_hash = sha256_of_file(tf_name)
-
-        editor = get_git_editor()
-        parts = shlex.split(editor)
-        if not shutil.which(parts[0]):
-            # This editor command requires shell interpretation
-            rc = subprocess.run(
-                f'{editor} "{tf_name}"',
-                shell=True,
-                check=False,  # nosemgrep
-            ).returncode  # nosec # nosemgrep
-        else:
-            rc = subprocess.run(parts + [str(tf_name)], check=False).returncode
+        try:
+            original_hash = sha256_of_file(tf_name)
+
+            editor = get_git_editor()
+            parts = shlex.split(editor)
+            if not shutil.which(parts[0]):
+                # This editor command requires shell interpretation
+                rc = subprocess.run(
+                    f'{editor} "{tf_name}"',
+                    shell=True,
+                    check=False,  # nosemgrep
+                ).returncode  # nosec # nosemgrep
+            else:
+                rc = subprocess.run(parts + [str(tf_name)], check=False).returncode
+
+            if rc != 0:
+                log.info("Editor exited non-zero — squash cancelled.")
+                return
 
-        if rc != 0:
-            log.info("Editor exited non-zero — squash cancelled.")
-            tf_name.unlink(missing_ok=True)
-            return
+            new_hash = sha256_of_file(tf_name)
 
-        new_hash = sha256_of_file(tf_name)
+            if new_hash == original_hash:
+                log.info("Squash cancelled (user did not save message).")
+                return
 
-        if new_hash == original_hash:
-            log.info("Squash cancelled (user did not save message).")
+            # User saved → read message into final_message
+            final_message = tf_name.read_text(encoding="utf-8").strip()
+        finally:
             tf_name.unlink(missing_ok=True)
-            return
-
-        # User saved → read message into final_message
-        final_message = tf_name.read_text(encoding="utf-8").strip()
-        tf_name.unlink(missing_ok=True)
 
         # 5) Perform squash
         subprocess.run(["git", "reset", "--soft", merge_base], check=True)

git_cai_cli-0.11.2/src/git_cai_cli/defaults/commit_prompt.md

@@ -0,0 +1,12 @@
+You are an expert software engineer assistant.
+Your task is to generate a concise, professional git commit message
+from the provided git diff.
+
+Rules:
+- Write a single headline in imperative mood (e.g. "Add", "Fix", "Refactor"), max 50 characters.
+- Below the headline, leave one blank line, then add a bullet-point list of the most important changes.
+- Each bullet should explain *what* changed and *why*, not repeat filenames or obvious details.
+- Group related changes into one bullet instead of listing every file separately.
+- Keep the total message short — aim for clarity over completeness.
+- Output only the raw commit message. No markdown fences, no quotes, no extra commentary.
+- If you detect sensitive information (keys, tokens, passwords), warn about it at the very top before the headline.

git_cai_cli-0.11.2/src/git_cai_cli/defaults/squash_prompt.md

@@ -0,0 +1,10 @@
+You are an expert software engineer assistant.
+Your task is to summarize multiple existing commit messages
+into a single, coherent git commit message that captures the overall intent.
+
+Rules:
+- Do not list or echo each original commit. Synthesize them into a unified narrative.
+- Write one clear headline in imperative mood (max 50 characters) that captures the main purpose.
+- Below the headline, leave one blank line, then add a concise bullet list describing the key themes of the work.
+- Focus on *why* the changes were made, not just *what* was touched.
+- Output only the raw commit message. No markdown fences, no quotes, no extra commentary.

{git_cai_cli-0.11.0 → git_cai_cli-0.11.2/src/git_cai_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-cai-cli
-Version: 0.11.0
+Version: 0.11.2
 Summary: Use LLM to create git commit messages
 Author-email: Thorsten Foltz <thorsten.foltz@live.com>
 License-Expression: MIT

{git_cai_cli-0.11.0 → git_cai_cli-0.11.2}/src/git_cai_cli.egg-info/SOURCES.txt

@@ -9,6 +9,7 @@ CLAUDE.md
 LICENSE
 Makefile
 README.md
+cai_config.yml
 pyproject.toml
 uv.lock
 .github/cd/.SRCINFO

{git_cai_cli-0.11.0 → git_cai_cli-0.11.2}/tests/unit/test_gitutils.py

@@ -219,7 +219,7 @@ def test_get_git_editor_falls_back_to_env():
     get_git_editor() should fall back to environment variables if git var fails.
     """
     with patch("subprocess.run", side_effect=subprocess.CalledProcessError(1, "cmd")):
-        with patch.dict(os.environ, {"EDITOR": "nano"}):
+        with patch.dict(os.environ, {"EDITOR": "nano"}, clear=True):
             assert get_git_editor() == "nano"
 
 

{git_cai_cli-0.11.0 → git_cai_cli-0.11.2}/tests/unit/test_llm.py

@@ -60,7 +60,8 @@ def test_emoji_enabled(generator):
     Test that the _emoji_instruction method returns the correct string when emojis are enabled
     """
     assert (
-        "Use relevant emojis in the commit message where appropriate. Emojis should enhance the clarity and tone of the message."
+        "Use relevant emojis at the start of the headline and in bullet points "
+        "where they add clarity. Keep emojis purposeful — one per bullet at most."
         in generator._emoji_instruction()
     )
 
@@ -937,7 +938,7 @@ def test_generate_appends_context_to_diff(generator):
     call_args = mock.call_args
     content = call_args[1]["content"] if "content" in call_args[1] else call_args[0][0]
     assert "diff output" in content
-    assert "Additional context:" in content
+    assert "Additional context from the author" in content
     assert "Fixes JIRA-1234" in content
 
 

{git_cai_cli-0.11.0 → git_cai_cli-0.11.2}/tests/unit/test_squash.py

@@ -84,6 +84,10 @@ def test_aborts_on_unstaged_changes(mock_repo_root) -> None:
                 "file.py",  # unstaged
             ],
         ),
+        patch(
+            "git_cai_cli.core.squash.load_config", return_value={"default": "openai"}
+        ),
+        patch("git_cai_cli.core.squash.load_token", return_value="token"),
     ):
         squash_branch()