git-cai-cli 0.17.1__tar.gz → 0.17.3__tar.gz

{git_cai_cli-0.17.1 → git_cai_cli-0.17.3}/.github/ci/cai_config.ci.yml

@@ -6,14 +6,13 @@ load_tokens_from: /home/runner/work/.config/cai/tokens.yml
 timeout: 30
 full_files: false
 anthropic:
-  model: claude-haiku-4-5
-  temperature: 0
+  model: claude-haiku-5-5
   max_tokens: 32768
 deepseek:
-  model: deepseek-chat
+  model: deepseek-flash
   temperature: 0
 gemini:
-  model: gemini-3.1-flash-lite
+  model: gemini-3.5-flash-lite
   temperature: 0
 groq:
   model: openai/gpt-oss-20b
@@ -22,11 +21,11 @@ mistral:
   model: codestral-2508
   temperature: 0
 ollama:
-  model: llama3.1
+  model: gemma4:e2b
   temperature: 0
   timeout: 300
 openai:
-  model: gpt-5.4-mini
+  model: gpt-6-luna
 xai:
   model: grok-4.3
   temperature: 0

{git_cai_cli-0.17.1 → git_cai_cli-0.17.3}/.github/workflows/python-tests.yml

@@ -99,7 +99,7 @@ jobs:
 
       # MegaLinter
       - name: MegaLinter
-        uses: oxsecurity/megalinter@15e5b45552097e318c93de385779ce3b1084052c # v10.0.0
+        uses: oxsecurity/megalinter@f2fe8c1cba37091848df3e524066c8c23ef353ed # v10.2.0
         id: ml
         env:
           VALIDATE_ALL_CODEBASE: false

{git_cai_cli-0.17.1 → git_cai_cli-0.17.3}/.mega-linter.yml

@@ -54,7 +54,7 @@ LINTER_RULES_PATH: .linters
 LOG_LEVEL: INFO
 MARKDOWN_DEFAULT_STYLE: markdownlint
 # Pins the Docker image for local runs to the version the CI workflow pins.
-MEGALINTER_VERSION: v10.0.0
+MEGALINTER_VERSION: v10.2.0
 PARALLEL: true
 PRINT_ALPACA: false
 PYTHON_BANDIT_RULES_PATH: .linters

{git_cai_cli-0.17.1 → git_cai_cli-0.17.3}/Makefile

@@ -1,10 +1,13 @@
 #!/usr/bin/make -f
 
-PIP := pipx
 UV := uv
 SHELL := /bin/bash
+MEGALINTER_VERSION := $(shell sed -n 's/^MEGALINTER_VERSION: *//p' .mega-linter.yml)
+MEGALINTER_IMAGE := ghcr.io/oxsecurity/megalinter:$(MEGALINTER_VERSION)
+# --platform: the image is amd64 only. z: relabels the mount on SELinux hosts, ignored elsewhere.
+MEGALINTER_RUN := docker run --rm --platform linux/amd64 -v "$(CURDIR):/tmp/lint:rw,z"
 
-.PHONY: help lint check-docker check-npx lint-fix add-lint-hook clean test
+.PHONY: help lint check-docker lint-fix add-lint-hook clean test
 
 help: ## Shows this help message
 	@echo "Available commands:"
@@ -27,25 +30,16 @@ check-docker: ## Checks if docker is installed
 		docker --version; \
 	fi
 
-check-npx: ## Checks if npx is installed
-	@if ! command -v npx &> /dev/null; then \
-		echo "npx is not installed. Please install it."; \
-		exit 1; \
-	else \
-		echo "npx version:"; \
-		npx --version; \
-	fi
-
 clean: ## Clean cache of uv and delete virtual environment
 	@$(UV) cache clean
 	@rm -rf .venv
 
-lint:
+lint: ## Checks the branch name and runs MegaLinter
 	@sh ./.linters/check_git_branch_name.sh
-	@npx mega-linter-runner@v10
+	@$(MEGALINTER_RUN) $(MEGALINTER_IMAGE)
 
-lint-fix: ## Lints the code using sqlfluff and fixes the issues
-	@npx mega-linter-runner@v10 --fix
+lint-fix: ## Runs MegaLinter and applies its fixes
+	@$(MEGALINTER_RUN) -e APPLY_FIXES=all $(MEGALINTER_IMAGE)
 
 test: ## Runs tests
 	@$(UV) run pytest

{git_cai_cli-0.17.1 → git_cai_cli-0.17.3}/PKG-INFO

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

{git_cai_cli-0.17.1 → git_cai_cli-0.17.3}/cai_config.yml

@@ -18,15 +18,15 @@ pr_prompt_file: "/home/thorsten/.config/cai/pr_prompt.md"
 stats: true
 signoff: true
 anthropic:
-  model: claude-haiku-4-5
-  temperature: 0
+  model: claude-haiku-5-5
   max_tokens: 32768
 deepseek:
-  model: deepseek-chat
+  model: deepseek-flash
   temperature: 0
 gemini:
-  model: gemini-3.1-flash-lite
+  model: gemini-3.5-flash-lite
   temperature: 0
+  timeout: 60
 groq:
   model: openai/gpt-oss-20b
   temperature: 0
@@ -34,11 +34,11 @@ mistral:
   model: codestral-2508
   temperature: 0
 ollama:
-  model: llama3.1
+  model: gemma4:e2b
   temperature: 0
   timeout: 300
 openai:
-  model: gpt-5.6-luna
+  model: gpt-6-luna
 xai:
   model: grok-4.3
   temperature: 0

{git_cai_cli-0.17.1 → git_cai_cli-0.17.3}/docs/git-cai.txt

@@ -360,7 +360,7 @@ provider keys.
 git cai -H language=de
 git cai -H default=anthropic
 git cai -H emoji=false
-git cai -H groq.model=llama-3.3-70b
+git cai -H groq.model=openai/gpt-oss-120b
 ----
 
 -h, --help::
@@ -455,7 +455,7 @@ identifier for that provider.
 +
 ----
 git cai -P openai -m gpt-4o
-git cai -P anthropic -m claude-haiku-4-5
+git cai -P anthropic -m claude-haiku-5-5
 git cai -P ollama -m mistral
 ----
 
@@ -528,7 +528,7 @@ both.
 +
 ----
 git cai -P anthropic
-git cai -P groq -m llama-3.3-70b
+git cai -P groq -m openai/gpt-oss-120b
 git cai -P openrouter
 ----
 
@@ -662,7 +662,7 @@ become integers or floats, everything else stays a string.
 ----
 git cai -S default=anthropic
 git cai -S emoji=false
-git cai -S groq.model=llama-3.3-70b
+git cai -S groq.model=openai/gpt-oss-120b
 git cai -S openai.temperature=0.7
 git cai -S conventional=true
 ----
@@ -695,9 +695,10 @@ git cai -s a1b2c3d
 
 -T, --timeout SECONDS::
 Override the HTTP timeout for the LLM call in this invocation. The default
-is 30 seconds for remote providers and 300 seconds for Ollama (since local
-generation can be significantly slower). The override applies uniformly to
-whichever provider is selected for this run.
+is 30 seconds for remote providers, 60 seconds for Gemini (Flash Lite can queue
+for up to 30 seconds) and 300 seconds for Ollama (since local generation can be
+significantly slower). The override applies uniformly to whichever provider is
+selected for this run, including those with their own `<provider>.timeout`.
 +
 To change the default permanently, set `timeout: <seconds>` in
 `cai_config.yml` or the home config:
@@ -707,11 +708,12 @@ git cai -H timeout=60
 git cai -S timeout=45
 ----
 +
-Ollama keeps its own timeout under `ollama.timeout` (default 300). Override
-it separately:
+Ollama and Gemini keep their own timeouts under `ollama.timeout` (default 300)
+and `gemini.timeout` (default 60). Override them separately:
 +
 ----
 git cai -H ollama.timeout=600
+git cai -H gemini.timeout=90
 ----
 +
 ----
@@ -938,13 +940,13 @@ Example output:
 ----
 Default models:
 
-  anthropic    → claude-haiku-4-5
-  deepseek     → deepseek-chat
-  gemini       → gemini-3.1-flash-lite
+  anthropic    → claude-haiku-5-5
+  deepseek     → deepseek-flash
+  gemini       → gemini-3.5-flash-lite
   groq         → openai/gpt-oss-20b
   mistral      → codestral-2508
-  ollama       → llama3.1
-  openai       → gpt-5.4-mini
+  ollama       → gemma4:e2b
+  openai       → gpt-6-luna
   xai          → grok-4.3
 ----
 
@@ -1003,13 +1005,13 @@ Example output:
 ----
 Supported providers:
 
-  anthropic    model: claude-haiku-4-5                    (token required)
-  deepseek     model: deepseek-chat                      (token required)
-  gemini       model: gemini-3.1-flash-lite              (token required)
+  anthropic    model: claude-haiku-5-5                   (token required)
+  deepseek     model: deepseek-flash                     (token required)
+  gemini       model: gemini-3.5-flash-lite              (token required)
   groq         model: openai/gpt-oss-20b                 (token required)
   mistral      model: codestral-2508                     (token required)
-  ollama       model: llama3.1                           (no token required)
-  openai       model: gpt-5.4-mini                       (token required)
+  ollama       model: gemma4:e2b                         (no token required)
+  openai       model: gpt-6-luna                         (token required)
   xai          model: grok-4.3                           (token required)
 
 Custom providers (OpenAI compatible, from config):
@@ -1141,7 +1143,8 @@ Available configuration keys:
   `anthropic` the default is `32768` (`max_tokens` is still read as a legacy
   alias). For OpenAI compatible providers it is only sent when set.
 - `<provider>.timeout` -- HTTP timeout in seconds for one provider,
-  overriding the global `timeout` (`ollama` defaults to `300`)
+  overriding the global `timeout` (`ollama` defaults to `300`, `gemini` to `60`).
+  The `--timeout` flag overrides both.
 - `stats` -- opt in to local-only usage analytics (`true`/`false`,
   default `false`). When enabled, every generation appends one row to
   `~/.local/share/git-cai/stats.db` capturing kind (`commit`, `amend`,
@@ -1315,7 +1318,7 @@ Change a value in the repo config:
 
 ----
 git cai -S default=anthropic
-git cai -S groq.model=llama-3.3-70b
+git cai -S groq.model=openai/gpt-oss-120b
 git cai -S emoji=false
 ----
 

{git_cai_cli-0.17.1 → git_cai_cli-0.17.3}/docs/man/git-cai.1

@@ -2,12 +2,12 @@
 .\"     Title: git-cai
 .\"    Author: Thorsten Foltz
 .\" Generator: Asciidoctor 2.0.26
-.\"      Date: 2026-10-11
+.\"      Date: 2026-11-04
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "GIT\-CAI" "1" "2026-10-11" "\ \&" "\ \&"
+.TH "GIT\-CAI" "1" "2026-11-04" "\ \&" "\ \&"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
@@ -656,7 +656,7 @@ provider keys.
 git cai \-H language=de
 git cai \-H default=anthropic
 git cai \-H emoji=false
-git cai \-H groq.model=llama\-3.3\-70b
+git cai \-H groq.model=openai/gpt\-oss\-120b
 .fam
 .fi
 .if n .RE
@@ -789,7 +789,7 @@ identifier for that provider.
 .nf
 .fam C
 git cai \-P openai \-m gpt\-4o
-git cai \-P anthropic \-m claude\-haiku\-4\-5
+git cai \-P anthropic \-m claude\-haiku\-5\-5
 git cai \-P ollama \-m mistral
 .fam
 .fi
@@ -890,7 +890,7 @@ both.
 .nf
 .fam C
 git cai \-P anthropic
-git cai \-P groq \-m llama\-3.3\-70b
+git cai \-P groq \-m openai/gpt\-oss\-120b
 git cai \-P openrouter
 .fam
 .fi
@@ -1066,7 +1066,7 @@ become integers or floats, everything else stays a string.
 .fam C
 git cai \-S default=anthropic
 git cai \-S emoji=false
-git cai \-S groq.model=llama\-3.3\-70b
+git cai \-S groq.model=openai/gpt\-oss\-120b
 git cai \-S openai.temperature=0.7
 git cai \-S conventional=true
 .fam
@@ -1109,9 +1109,10 @@ git cai \-s a1b2c3d
 \-T, \-\-timeout SECONDS
 .RS 4
 Override the HTTP timeout for the LLM call in this invocation. The default
-is 30 seconds for remote providers and 300 seconds for Ollama (since local
-generation can be significantly slower). The override applies uniformly to
-whichever provider is selected for this run.
+is 30 seconds for remote providers, 60 seconds for Gemini (Flash Lite can queue
+for up to 30 seconds) and 300 seconds for Ollama (since local generation can be
+significantly slower). The override applies uniformly to whichever provider is
+selected for this run, including those with their own \f(CR<provider>.timeout\fP.
 .sp
 To change the default permanently, set \f(CRtimeout: <seconds>\fP in
 \f(CRcai_config.yml\fP or the home config:
@@ -1125,13 +1126,14 @@ git cai \-S timeout=45
 .fi
 .if n .RE
 .sp
-Ollama keeps its own timeout under \f(CRollama.timeout\fP (default 300). Override
-it separately:
+Ollama and Gemini keep their own timeouts under \f(CRollama.timeout\fP (default 300)
+and \f(CRgemini.timeout\fP (default 60). Override them separately:
 .sp
 .if n .RS 4
 .nf
 .fam C
 git cai \-H ollama.timeout=600
+git cai \-H gemini.timeout=90
 .fam
 .fi
 .if n .RE
@@ -1441,13 +1443,13 @@ Example output:
 .fam C
 Default models:
 
-  anthropic\&    → claude\-haiku\-4\-5
-  deepseek\&     → deepseek\-chat
-  gemini\&       → gemini\-3.1\-flash\-lite
+  anthropic\&    → claude\-haiku\-5\-5
+  deepseek\&     → deepseek\-flash
+  gemini\&       → gemini\-3.5\-flash\-lite
   groq\&         → openai/gpt\-oss\-20b
   mistral\&      → codestral\-2508
-  ollama\&       → llama3.1
-  openai\&       → gpt\-5.4\-mini
+  ollama\&       → gemma4:e2b
+  openai\&       → gpt\-6\-luna
   xai\&          → grok\-4.3
 .fam
 .fi
@@ -1530,13 +1532,13 @@ Example output:
 .fam C
 Supported providers:
 
-  anthropic\&    model: claude\-haiku\-4\-5\&                    (token required)
-  deepseek\&     model: deepseek\-chat\&                      (token required)
-  gemini\&       model: gemini\-3.1\-flash\-lite\&              (token required)
+  anthropic\&    model: claude\-haiku\-5\-5\&                   (token required)
+  deepseek\&     model: deepseek\-flash\&                     (token required)
+  gemini\&       model: gemini\-3.5\-flash\-lite\&              (token required)
   groq\&         model: openai/gpt\-oss\-20b\&                 (token required)
   mistral\&      model: codestral\-2508\&                     (token required)
-  ollama\&       model: llama3.1\&                           (no token required)
-  openai\&       model: gpt\-5.4\-mini\&                       (token required)
+  ollama\&       model: gemma4:e2b\&                         (no token required)
+  openai\&       model: gpt\-6\-luna\&                         (token required)
   xai\&          model: grok\-4.3\&                           (token required)
 
 Custom providers (OpenAI compatible, from config):
@@ -2021,7 +2023,8 @@ alias). For OpenAI compatible providers it is only sent when set.
 .  IP \(bu 2.3
 .\}
 \f(CR<provider>.timeout\fP \(em HTTP timeout in seconds for one provider,
-overriding the global \f(CRtimeout\fP (\f(CRollama\fP defaults to \f(CR300\fP)
+overriding the global \f(CRtimeout\fP (\f(CRollama\fP defaults to \f(CR300\fP, \f(CRgemini\fP to \f(CR60\fP).
+The \f(CR\-\-timeout\fP flag overrides both.
 .RE
 .sp
 .RS 4
@@ -2310,7 +2313,7 @@ Change a value in the repo config:
 .nf
 .fam C
 git cai \-S default=anthropic
-git cai \-S groq.model=llama\-3.3\-70b
+git cai \-S groq.model=openai/gpt\-oss\-120b
 git cai \-S emoji=false
 .fam
 .fi

{git_cai_cli-0.17.1 → git_cai_cli-0.17.3}/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.17.1'
-__version_tuple__ = version_tuple = (0, 17, 1)
+__version__ = version = '0.17.3'
+__version_tuple__ = version_tuple = (0, 17, 3)
 
-__commit_id__ = commit_id = 'g1fd24936a'
+__commit_id__ = commit_id = 'g4c48b7f68'

{git_cai_cli-0.17.1 → git_cai_cli-0.17.3}/src/git_cai_cli/core/config.py

@@ -35,19 +35,26 @@ TOKENS_FILE = CONFIG_DIR / "tokens.yml"
 
 DEFAULT_CONFIG: dict[str, Any] = {
     "anthropic": {
-        "model": "claude-haiku-4-5",
-        "temperature": 0,
+        "model": "claude-haiku-5-5",
         # ``max_tokens`` is still read as a legacy alias (see llm.py)
         "max_output_tokens": 32768,
     },
-    "openai": {"model": "gpt-5.6-luna"},
-    "deepseek": {"model": "deepseek-chat", "temperature": 0},
-    "gemini": {"model": "gemini-3.1-flash-lite", "temperature": 0},
+    "openai": {"model": "gpt-6-luna"},
+    "deepseek": {"model": "deepseek-flash", "temperature": 0},
+    "gemini": {
+        "model": "gemini-3.5-flash-lite",
+        "temperature": 0,
+        # Flash Lite was measured taking up to 30 seconds server side, even for
+        # a single word reply, so the global 30 second timeout is too tight.
+        "timeout": 60,
+    },
     "groq": {"model": "openai/gpt-oss-20b", "temperature": 0},
     "xai": {"model": "grok-4.3", "temperature": 0},
+    # Not the cheapest on the list: ministral-3b wrapped messages in code
+    # fences and ministral-8b added a warning line, both unfit for a commit.
     "mistral": {"model": "codestral-2508", "temperature": 0},
     "ollama": {
-        "model": "llama3.1",
+        "model": "gemma4:e2b",
         "temperature": 0,
         "timeout": 300,
         "startup_timeout": 8,
@@ -733,6 +740,11 @@ def apply_cli_overrides(
         config["branch_context"] = branch_context
     if timeout_override is not None:
         config["timeout"] = timeout_override
+        # The flag outranks ``<provider>.timeout``, which is checked first when
+        # resolving. Rebuild instead of pop: blocks may be shared with DEFAULT_CONFIG.
+        for name, block in list(config.items()):
+            if isinstance(block, dict) and "timeout" in block:
+                config[name] = {k: v for k, v in block.items() if k != "timeout"}
     if full_files_override is not None:
         config["full_files"] = full_files_override
     if sql_override is not None:

{git_cai_cli-0.17.1 → git_cai_cli-0.17.3}/src/git_cai_cli/core/llm.py

@@ -41,10 +41,11 @@ log = logging.getLogger(__name__)
 # still handled — ``_http_post`` retries once without the field — so add
 # an entry only when a warning shows up in practice.
 _TEMPERATURE_UNSUPPORTED_PATTERNS = [
-    re.compile(r"^gpt-5", re.IGNORECASE),  # OpenAI GPT-5 family (incl. mini/nano)
+    re.compile(r"^gpt-[5-9]", re.IGNORECASE),  # OpenAI GPT-5+ (incl. mini/nano/luna)
     re.compile(r"^o[134](-|$)", re.IGNORECASE),  # OpenAI o1/o3/o4 reasoning series
     re.compile(r"opus-4-[7-9]", re.IGNORECASE),  # Anthropic Opus 4.7 / 4.8 / 4.9
     re.compile(r"opus-[5-9]", re.IGNORECASE),  # Anthropic Opus 5+
+    re.compile(r"haiku-[5-9]", re.IGNORECASE),  # Anthropic Haiku 5+
 ]
 
 

{git_cai_cli-0.17.1 → git_cai_cli-0.17.3}/src/git_cai_cli.egg-info/PKG-INFO

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

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

@@ -0,0 +1,8 @@
+{
+  "tag": "0.17.3",
+  "distance": 0,
+  "node": "g4c48b7f689e10205b1178c36224eeef398baccfe",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-11-04"
+}

{git_cai_cli-0.17.1 → git_cai_cli-0.17.3}/tests/unit/test_config.py

@@ -494,6 +494,18 @@ def test_apply_cli_overrides_timeout_none_preserves_existing():
     assert cfg["timeout"] == 45
 
 
+def test_apply_cli_overrides_timeout_beats_provider_timeout():
+    """--timeout must outrank <provider>.timeout without mutating shared blocks."""
+    from git_cai_cli.core.llm import CommitMessageGenerator
+
+    shared_block = {"model": "m", "timeout": 60}
+    cfg = {"timeout": 30, "gemini": shared_block}
+    apply_cli_overrides(cfg, timeout_override=7)
+    assert CommitMessageGenerator(None, cfg, "gemini")._timeout("gemini") == 7
+    assert cfg["gemini"]["model"] == "m"
+    assert shared_block["timeout"] == 60
+
+
 def test_apply_cli_overrides_full_files_true_sets_true():
     cfg = {"full_files": False}
     apply_cli_overrides(cfg, full_files_override=True)

{git_cai_cli-0.17.1 → git_cai_cli-0.17.3}/tests/unit/test_llm.py

@@ -1447,6 +1447,7 @@ def test_http_post_does_not_retry_on_unrelated_400():
 def test_model_rejects_temperature_openai_gpt5():
     assert _model_rejects_temperature("gpt-5.4-mini") is True
     assert _model_rejects_temperature("gpt-5.2") is True
+    assert _model_rejects_temperature("gpt-6-luna") is True
     assert _model_rejects_temperature("o3-mini") is True
 
 
@@ -1456,15 +1457,19 @@ def test_model_rejects_temperature_anthropic_opus_new():
     assert _model_rejects_temperature("claude-opus-5-1") is True
 
 
+def test_model_rejects_temperature_anthropic_haiku_new():
+    assert _model_rejects_temperature("claude-haiku-5-5") is True
+
+
 def test_model_accepts_temperature_kept_models():
     for m in (
         "claude-haiku-4-5",
         "openai/gpt-oss-20b",
-        "gemini-3.1-flash-lite",
+        "gemini-3.5-flash-lite",
         "grok-4.3",
-        "deepseek-chat",
+        "deepseek-flash",
         "codestral-2508",
-        "llama3.1",
+        "gemma4:e2b",
     ):
         assert _model_rejects_temperature(m) is False
 

{git_cai_cli-0.17.1 → git_cai_cli-0.17.3}/tests/unit/test_options.py

@@ -249,7 +249,7 @@ def test_list_providers_shows_default_models() -> None:
     """
     manager = CliManager()
     output = manager.list_providers()
-    assert "llama3.1" in output  # ollama default model
+    assert "gemma4:e2b" in output  # ollama default model
 
 
 def test_list_models_contains_all_providers() -> None: