git-cai-cli 0.15.4__tar.gz → 0.15.5__tar.gz

{git_cai_cli-0.15.4 → git_cai_cli-0.15.5}/PKG-INFO

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

{git_cai_cli-0.15.4 → git_cai_cli-0.15.5}/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.15.4'
-__version_tuple__ = version_tuple = (0, 15, 4)
+__version__ = version = '0.15.5'
+__version_tuple__ = version_tuple = (0, 15, 5)
 
-__commit_id__ = commit_id = 'gb94513fc4'
+__commit_id__ = commit_id = 'g717dd683a'

{git_cai_cli-0.15.4 → git_cai_cli-0.15.5}/src/git_cai_cli/core/config.py

@@ -37,7 +37,8 @@ DEFAULT_CONFIG: dict[str, Any] = {
     "anthropic": {
         "model": "claude-haiku-4-5",
         "temperature": 0,
-        "max_tokens": 32768,
+        # ``max_tokens`` is still read as a legacy alias (see llm.py)
+        "max_output_tokens": 32768,
     },
     "openai": {"model": "gpt-5.4-mini"},
     "deepseek": {"model": "deepseek-chat", "temperature": 0},
@@ -45,7 +46,12 @@ DEFAULT_CONFIG: dict[str, Any] = {
     "groq": {"model": "openai/gpt-oss-20b", "temperature": 0},
     "xai": {"model": "grok-4.3", "temperature": 0},
     "mistral": {"model": "codestral-2508", "temperature": 0},
-    "ollama": {"model": "llama3.1", "temperature": 0, "timeout": 300},
+    "ollama": {
+        "model": "llama3.1",
+        "temperature": 0,
+        "timeout": 300,
+        "startup_timeout": 8,
+    },
     "language": "en",
     "default": "groq",
     "style": "professional",
@@ -65,6 +71,7 @@ DEFAULT_CONFIG: dict[str, Any] = {
     "pr_file_name": "PR_DESCRIPTION.md",
     "pr_prompt_file": "",
     "stats": False,
+    "stats_db_path": "",  # empty → XDG default (see stats.resolve_db_path)
     "signoff": False,
     "secret_scan": True,
     "secret_scan_exclude": [],
@@ -139,7 +146,8 @@ def _load_home_stats(home_config_file: Path) -> dict[str, Any] | None:
     out: dict[str, Any] = {}
     if "stats" in data:
         out["stats"] = data["stats"]
-    if "stats_db_path" in data:
+    # An empty stats_db_path means "no override" — don't propagate it.
+    if data.get("stats_db_path"):
         out["stats_db_path"] = data["stats_db_path"]
     return out or None
 
@@ -445,6 +453,11 @@ def ordered_default_config(
 ) -> dict[str, Any]:
     """
     Return DEFAULT_CONFIG ordered for human-readable YAML output.
+
+    Global keys come first (the curated order below, then any remaining
+    ones alphabetically), provider blocks last. Keeping the provider
+    blocks strictly at the end means a newly added global key can never
+    get buried between them.
     """
     if default_config is None:
         default_config = DEFAULT_CONFIG
@@ -471,6 +484,8 @@ def ordered_default_config(
         "stats",
         "stats_db_path",
         "signoff",
+        "secret_scan",
+        "secret_scan_exclude",
     ]
 
     ordered: dict[str, Any] = {}
@@ -479,7 +494,10 @@ def ordered_default_config(
         if key in default_config:
             ordered[key] = default_config[key]
 
-    for key in sorted(k for k in default_config if k not in priority_keys):
+    remaining = [k for k in default_config if k not in ordered]
+    for key in sorted(k for k in remaining if k not in KNOWN_PROVIDERS):
+        ordered[key] = default_config[key]
+    for key in sorted(k for k in remaining if k in KNOWN_PROVIDERS):
         ordered[key] = default_config[key]
 
     return ordered

{git_cai_cli-0.15.4 → git_cai_cli-0.15.5}/src/git_cai_cli/core/init.py

@@ -22,6 +22,8 @@ from git_cai_cli.core.config import (
     KNOWN_PROVIDERS,
     TOKENLESS_PROVIDERS,
     TOKENS_FILE,
+    _serialize_config,
+    ordered_default_config,
 )
 from git_cai_cli.core.languages import LANGUAGE_MAP
 
@@ -146,17 +148,19 @@ def _write_config_file(
     style: str,
     emoji: bool,
 ) -> None:
-    block = DEFAULT_CONFIG.get(provider, {})
-    provider_block = dict(block) if isinstance(block, dict) else {}
-
-    config: dict[str, Any] = {
-        "default": provider,
-        "language": language,
-        "style": style,
-        "emoji": emoji,
-        "load_tokens_from": str(TOKENS_FILE),
-        provider: provider_block,
-    }
+    # Same full surface as `git cai -g`: every setting is written out with
+    # its default, so users can see and edit what exists. The wizard's
+    # answers override the four keys it asked about.
+    config: dict[str, Any] = _serialize_config(ordered_default_config())
+    config.update(
+        {
+            "default": provider,
+            "language": language,
+            "style": style,
+            "emoji": emoji,
+            "load_tokens_from": str(TOKENS_FILE),
+        }
+    )
 
     config_path.parent.mkdir(parents=True, exist_ok=True)
     with config_path.open("w", encoding="utf-8") as f:

{git_cai_cli-0.15.4 → git_cai_cli-0.15.5}/src/git_cai_cli/core/validate.py

@@ -13,6 +13,37 @@ log = logging.getLogger(__name__)
 _AUTH_STATUS_CODES = frozenset({401, 403})
 _RATE_LIMIT_STATUS_CODES = frozenset({429})
 
+# Every top-level (non-provider) config key git-cai understands. Anything
+# here must also exist in ``DEFAULT_CONFIG`` so that ``git cai -g`` writes
+# it out; ``test_config.py`` asserts the two stay in sync.
+ALLOWED_GLOBAL_KEYS = frozenset(
+    {
+        "branch_context",
+        "conventional",
+        "language",
+        "default",
+        "style",
+        "emoji",
+        "load_tokens_from",
+        "prompt_file",
+        "squash_prompt_file",
+        "full_files_prompt_file",
+        "token_logging",
+        "measure_time",
+        "timeout",
+        "full_files",
+        "max_diff_bytes",
+        "pr_to_file",
+        "pr_file_name",
+        "pr_prompt_file",
+        "stats",
+        "stats_db_path",
+        "signoff",
+        "secret_scan",
+        "secret_scan_exclude",
+    }
+)
+
 
 def _extract_api_error_message(response: requests.Response | None) -> str:
     """Best-effort extraction of an upstream API error body's human message.
@@ -50,31 +81,7 @@ def _validate_config_keys(config: dict[str, Any], reference: dict[str, Any]) ->
     """
     log.debug("Validating configuration keys")
 
-    allowed_global_keys = {
-        "branch_context",
-        "conventional",
-        "language",
-        "default",
-        "style",
-        "emoji",
-        "load_tokens_from",
-        "prompt_file",
-        "squash_prompt_file",
-        "full_files_prompt_file",
-        "token_logging",
-        "measure_time",
-        "timeout",
-        "full_files",
-        "max_diff_bytes",
-        "pr_to_file",
-        "pr_file_name",
-        "pr_prompt_file",
-        "stats",
-        "stats_db_path",
-        "signoff",
-        "secret_scan",
-        "secret_scan_exclude",
-    }
+    allowed_global_keys = set(ALLOWED_GLOBAL_KEYS)
     # Internal escape-hatch keys: accepted if a user sets them, but never
     # reported as "missing" — they aren't part of the documented surface.
     internal_only_keys = {"stats_db_path", "secret_scan_exclude"}

{git_cai_cli-0.15.4 → git_cai_cli-0.15.5}/src/git_cai_cli.egg-info/PKG-INFO

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

git_cai_cli-0.15.5/src/git_cai_cli.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "0.15.5",
+  "distance": 0,
+  "node": "g717dd683ac826d23864fc37782ddc4dd4e3fd57e",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-07-11"
+}

{git_cai_cli-0.15.4 → git_cai_cli-0.15.5}/tests/unit/test_config.py

@@ -5,13 +5,16 @@ from unittest.mock import patch
 import yaml
 from git_cai_cli.core.config import (
     DEFAULT_CONFIG,
+    KNOWN_PROVIDERS,
     TOKEN_TEMPLATE,
     _serialize_config,
     apply_cli_overrides,
     load_config,
     load_token,
+    ordered_default_config,
     set_config_value,
 )
+from git_cai_cli.core.validate import ALLOWED_GLOBAL_KEYS
 
 
 def test_load_config_creates_fallback(tmp_path, monkeypatch):
@@ -278,8 +281,27 @@ def test_default_config_contains_timeout_and_full_files():
 
 
 def test_default_config_anthropic_max_tokens():
-    """Anthropic block must default max_tokens to 32768."""
-    assert DEFAULT_CONFIG["anthropic"]["max_tokens"] == 32768
+    """Anthropic block must default max_output_tokens to 32768."""
+    assert DEFAULT_CONFIG["anthropic"]["max_output_tokens"] == 32768
+
+
+def test_generated_config_contains_every_global_key():
+    """`git cai -g` must write out every global key the code understands.
+
+    Guards against a new setting (secret_scan, stats_db_path, …) being
+    added to the reader but forgotten in the generated file.
+    """
+    generated = ordered_default_config()
+    missing = ALLOWED_GLOBAL_KEYS - generated.keys()
+    assert not missing, f"missing from generated config: {sorted(missing)}"
+
+
+def test_generated_config_lists_provider_blocks_last():
+    """Global keys come before provider blocks, so none get buried."""
+    keys = list(ordered_default_config())
+    first_provider = min(keys.index(p) for p in KNOWN_PROVIDERS)
+    globals_after = [k for k in keys[first_provider:] if k not in KNOWN_PROVIDERS]
+    assert not globals_after
 
 
 def test_default_config_ollama_timeout():
@@ -303,7 +325,7 @@ def test_fresh_config_contains_timeout_and_full_files(tmp_path, monkeypatch):
     data = yaml.safe_load(fallback.read_text())
     assert data["timeout"] == 30
     assert data["full_files"] is False
-    assert data["anthropic"]["max_tokens"] == 32768
+    assert data["anthropic"]["max_output_tokens"] == 32768
     assert data["ollama"]["timeout"] == 300
 
 

{git_cai_cli-0.15.4 → git_cai_cli-0.15.5}/tests/unit/test_init.py

@@ -11,6 +11,8 @@ import stat
 
 import yaml
 from git_cai_cli.core import init as init_module
+from git_cai_cli.core.config import DEFAULT_CONFIG, KNOWN_PROVIDERS
+from git_cai_cli.core.validate import ALLOWED_GLOBAL_KEYS, _validate_config_keys
 
 
 class _InputDriver:
@@ -80,6 +82,40 @@ def test_wizard_writes_config_and_tokens_for_provider_requiring_key(
     assert mode == 0o600
 
 
+def test_wizard_writes_every_global_key(tmp_path, monkeypatch):
+    """The wizard writes the full setting surface, not just what it asked."""
+    config_path = tmp_path / "cai_config.yml"
+    tokens_path = tmp_path / "tokens.yml"
+
+    driver = _InputDriver(
+        prompts=["ollama", "de", "funny"],
+        confirms=[False],
+        passwords=[],
+    )
+    _install(monkeypatch, driver)
+
+    assert (
+        init_module.run_init_wizard(config_path=config_path, tokens_path=tokens_path)
+        == 0
+    )
+
+    config = yaml.safe_load(config_path.read_text())
+    missing = ALLOWED_GLOBAL_KEYS - config.keys()
+    assert not missing, f"wizard did not write: {sorted(missing)}"
+
+    # Wizard answers still win over the defaults.
+    assert config["default"] == "ollama"
+    assert config["language"] == "de"
+    assert config["style"] == "funny"
+    assert config["emoji"] is False
+
+    # Every provider block is present, so `--provider x` works without edits.
+    assert KNOWN_PROVIDERS <= config.keys()
+
+    # And the result is a config git-cai accepts.
+    _validate_config_keys(config, DEFAULT_CONFIG)
+
+
 def test_wizard_skips_token_prompt_for_ollama(tmp_path, monkeypatch):
     config_path = tmp_path / "cai_config.yml"
     tokens_path = tmp_path / "tokens.yml"

git_cai_cli-0.15.4/src/git_cai_cli.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "0.15.4",
-  "distance": 0,
-  "node": "gb94513fc4b1c16786ba4fadfd86b22120a49c041",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-07-05"
-}