git-commit-message 0.8.1__tar.gz → 0.9.0__tar.gz

{git_commit_message-0.8.1 → git_commit_message-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-commit-message
-Version: 0.8.1
+Version: 0.9.0
 Summary: Generate Git commit messages from staged changes using LLM
 Maintainer-email: Mina Her <minacle@live.com>
 License: This is free and unencumbered software released into the public domain.
@@ -47,11 +47,10 @@ Requires-Dist: babel>=2.17.0
 Requires-Dist: google-genai>=1.56.0
 Requires-Dist: ollama>=0.4.0
 Requires-Dist: openai>=2.6.1
-Requires-Dist: tiktoken>=0.12.0
 
 # git-commit-message
 
-Generate a commit message from your staged changes using OpenAI, Google Gemini, or Ollama.
+Generate a commit message from your staged changes using OpenAI, Google Gemini, Ollama, or llama.cpp.
 
 [![asciicast](https://asciinema.org/a/jk0phFqNnc5vaCiIZEYBwZOyN.svg)](https://asciinema.org/a/jk0phFqNnc5vaCiIZEYBwZOyN)
 
@@ -120,6 +119,23 @@ export GIT_COMMIT_MESSAGE_PROVIDER=ollama
 export OLLAMA_MODEL=mistral
 ```
 
+### llama.cpp (local models)
+
+1. Build and run llama.cpp server with your model:
+
+```sh
+llama-server -hf ggml-org/gpt-oss-20b-GGUF --host 0.0.0.0 --port 8080
+```
+
+2. The server runs on `http://localhost:8080` by default.
+
+Optional: set defaults:
+
+```sh
+export GIT_COMMIT_MESSAGE_PROVIDER=llamacpp
+export LLAMACPP_HOST=http://localhost:8080
+```
+
 Note (fish):
 
 ```fish
@@ -141,10 +157,25 @@ git add -A
 git-commit-message "optional extra context about the change"
 ```
 
-Generate a single-line subject only:
+Generate a single-line subject only (when no trailers are appended):
 
 ```sh
 git-commit-message --one-line "optional context"
+
+# with trailers, output is subject plus trailer lines
+git-commit-message --one-line --co-author 'John Doe <john.doe@example.com>'
+```
+
+Use Conventional Commits constraints for the subject/footer only (body format is preserved):
+
+```sh
+git-commit-message --conventional
+
+# can be combined with one-line mode
+git-commit-message --conventional --one-line
+
+# co-author trailers are appended after any existing footers
+git-commit-message --conventional --co-author copilot
 ```
 
 Select provider:
@@ -158,6 +189,9 @@ git-commit-message --provider google
 
 # Ollama
 git-commit-message --provider ollama
+
+# llama.cpp
+git-commit-message --provider llamacpp
 ```
 
 Commit immediately (optionally open editor):
@@ -165,6 +199,11 @@ Commit immediately (optionally open editor):
 ```sh
 git-commit-message --commit "refactor parser for speed"
 git-commit-message --commit --edit "refactor parser for speed"
+
+# add co-author trailers
+git-commit-message --commit --co-author 'John Doe <john.doe@example.com>'
+git-commit-message --commit --co-author 'John Doe <john.doe@example.com>' --co-author 'Jane Doe <jane.doe@example.com>'
+git-commit-message --commit --co-author copilot
 ```
 
 Amend the previous commit:
@@ -195,10 +234,24 @@ git-commit-message --chunk-tokens 0
 # chunk the diff into ~4000-token pieces before summarising
 git-commit-message --chunk-tokens 4000
 
+# note: for provider 'ollama', values >= 1 are not supported
+# use 0 (single summary pass) or -1 (legacy one-shot)
+git-commit-message --provider ollama --chunk-tokens 0
+
 # disable summarisation and use the legacy one-shot prompt
 git-commit-message --chunk-tokens -1
 ```
 
+Adjust unified diff context lines:
+
+```sh
+# use 5 context lines around each change hunk
+git-commit-message --diff-context 5
+
+# include only changed lines (no surrounding context)
+git-commit-message --diff-context 0
+```
+
 Select output language/locale (IETF language tag):
 
 ```sh
@@ -219,19 +272,28 @@ Configure Ollama host (if running on a different machine):
 git-commit-message --provider ollama --host http://192.168.1.100:11434
 ```
 
+Configure llama.cpp host:
+
+```sh
+git-commit-message --provider llamacpp --host http://192.168.1.100:8080
+```
+
 ## Options
 
-- `--provider {openai,google,ollama}`: provider to use (default: `openai`)
-- `--model MODEL`: model override (provider-specific)
+- `--provider {openai,google,ollama,llamacpp}`: provider to use (default: `openai`)
+- `--model MODEL`: model override (provider-specific; ignored for llama.cpp)
 - `--language TAG`: output language/locale (default: `en-GB`)
-- `--one-line`: output subject only
+- `--conventional`: apply Conventional Commits constraints to the subject and footer behavior. The body format is unchanged and still includes the translated `Rationale:` line. Breaking changes are expressed with `!` in the subject line, and `BREAKING CHANGE` footer lines are not generated.
+- `--one-line`: output subject only when no trailers are appended; with `--co-author`, output is a single-line subject plus `Co-authored-by:` trailer lines
 - `--max-length N`: max subject length (default: 72)
-- `--chunk-tokens N`: token budget per diff chunk (`0` = single summary pass, `-1` disables summarisation)
+- `--chunk-tokens N`: token budget per diff chunk (`0` = single summary pass, `-1` disables summarisation). For `ollama`, values `>= 1` are not supported.
+- `--diff-context N`: context lines in unified diff (`N >= 0`). If omitted, uses `GIT_COMMIT_MESSAGE_DIFF_CONTEXT` when set; otherwise uses Git default (usually `3`).
 - `--debug`: print request/response details
 - `--commit`: run `git commit -m <message>`
 - `--amend`: generate a message suitable for amending the previous commit (diff is from the amended commit's parent to the staged index; if nothing is staged, this effectively becomes the diff introduced by `HEAD`)
 - `--edit`: with `--commit`, open editor for final message
-- `--host URL`: host URL for providers like Ollama (default: `http://localhost:11434`)
+- `--host URL`: host URL for providers like Ollama or llama.cpp (default: `http://localhost:11434` for Ollama, `http://localhost:8080` for llama.cpp)
+- `--co-author VALUE`: append `Co-authored-by:` trailer(s). Repeat to add multiple values. Accepted forms: `Name <email@example.com>` or `copilot` (alias, case-insensitive).
 
 ## Environment variables
 
@@ -247,14 +309,17 @@ Optional:
 - `OPENAI_MODEL`: OpenAI-only model override (used if `--model`/`GIT_COMMIT_MESSAGE_MODEL` are not set)
 - `OLLAMA_MODEL`: Ollama-only model override (used if `--model`/`GIT_COMMIT_MESSAGE_MODEL` are not set)
 - `OLLAMA_HOST`: Ollama server URL (default: `http://localhost:11434`)
+- `LLAMACPP_HOST`: llama.cpp server URL (default: `http://localhost:8080`)
 - `GIT_COMMIT_MESSAGE_LANGUAGE`: default language/locale (default: `en-GB`)
-- `GIT_COMMIT_MESSAGE_CHUNK_TOKENS`: default chunk token budget (default: `0`)
+- `GIT_COMMIT_MESSAGE_CHUNK_TOKENS`: default chunk token budget (default: `0`; for `ollama`, values `>= 1` are not supported)
+- `GIT_COMMIT_MESSAGE_DIFF_CONTEXT`: default unified diff context lines (`0` or greater). If unset, Git default is used (usually `3`).
 
 Default models (if not overridden):
 
 - OpenAI: `gpt-5-mini`
 - Google: `gemini-2.5-flash`
 - Ollama: `gpt-oss:20b`
+- llama.cpp: uses pre-loaded model (model parameter is ignored)
 
 ## AI-generated code notice
 

{git_commit_message-0.8.1 → git_commit_message-0.9.0}/README.md

@@ -1,6 +1,6 @@
 # git-commit-message
 
-Generate a commit message from your staged changes using OpenAI, Google Gemini, or Ollama.
+Generate a commit message from your staged changes using OpenAI, Google Gemini, Ollama, or llama.cpp.
 
 [![asciicast](https://asciinema.org/a/jk0phFqNnc5vaCiIZEYBwZOyN.svg)](https://asciinema.org/a/jk0phFqNnc5vaCiIZEYBwZOyN)
 
@@ -69,6 +69,23 @@ export GIT_COMMIT_MESSAGE_PROVIDER=ollama
 export OLLAMA_MODEL=mistral
 ```
 
+### llama.cpp (local models)
+
+1. Build and run llama.cpp server with your model:
+
+```sh
+llama-server -hf ggml-org/gpt-oss-20b-GGUF --host 0.0.0.0 --port 8080
+```
+
+2. The server runs on `http://localhost:8080` by default.
+
+Optional: set defaults:
+
+```sh
+export GIT_COMMIT_MESSAGE_PROVIDER=llamacpp
+export LLAMACPP_HOST=http://localhost:8080
+```
+
 Note (fish):
 
 ```fish
@@ -90,10 +107,25 @@ git add -A
 git-commit-message "optional extra context about the change"
 ```
 
-Generate a single-line subject only:
+Generate a single-line subject only (when no trailers are appended):
 
 ```sh
 git-commit-message --one-line "optional context"
+
+# with trailers, output is subject plus trailer lines
+git-commit-message --one-line --co-author 'John Doe <john.doe@example.com>'
+```
+
+Use Conventional Commits constraints for the subject/footer only (body format is preserved):
+
+```sh
+git-commit-message --conventional
+
+# can be combined with one-line mode
+git-commit-message --conventional --one-line
+
+# co-author trailers are appended after any existing footers
+git-commit-message --conventional --co-author copilot
 ```
 
 Select provider:
@@ -107,6 +139,9 @@ git-commit-message --provider google
 
 # Ollama
 git-commit-message --provider ollama
+
+# llama.cpp
+git-commit-message --provider llamacpp
 ```
 
 Commit immediately (optionally open editor):
@@ -114,6 +149,11 @@ Commit immediately (optionally open editor):
 ```sh
 git-commit-message --commit "refactor parser for speed"
 git-commit-message --commit --edit "refactor parser for speed"
+
+# add co-author trailers
+git-commit-message --commit --co-author 'John Doe <john.doe@example.com>'
+git-commit-message --commit --co-author 'John Doe <john.doe@example.com>' --co-author 'Jane Doe <jane.doe@example.com>'
+git-commit-message --commit --co-author copilot
 ```
 
 Amend the previous commit:
@@ -144,10 +184,24 @@ git-commit-message --chunk-tokens 0
 # chunk the diff into ~4000-token pieces before summarising
 git-commit-message --chunk-tokens 4000
 
+# note: for provider 'ollama', values >= 1 are not supported
+# use 0 (single summary pass) or -1 (legacy one-shot)
+git-commit-message --provider ollama --chunk-tokens 0
+
 # disable summarisation and use the legacy one-shot prompt
 git-commit-message --chunk-tokens -1
 ```
 
+Adjust unified diff context lines:
+
+```sh
+# use 5 context lines around each change hunk
+git-commit-message --diff-context 5
+
+# include only changed lines (no surrounding context)
+git-commit-message --diff-context 0
+```
+
 Select output language/locale (IETF language tag):
 
 ```sh
@@ -168,19 +222,28 @@ Configure Ollama host (if running on a different machine):
 git-commit-message --provider ollama --host http://192.168.1.100:11434
 ```
 
+Configure llama.cpp host:
+
+```sh
+git-commit-message --provider llamacpp --host http://192.168.1.100:8080
+```
+
 ## Options
 
-- `--provider {openai,google,ollama}`: provider to use (default: `openai`)
-- `--model MODEL`: model override (provider-specific)
+- `--provider {openai,google,ollama,llamacpp}`: provider to use (default: `openai`)
+- `--model MODEL`: model override (provider-specific; ignored for llama.cpp)
 - `--language TAG`: output language/locale (default: `en-GB`)
-- `--one-line`: output subject only
+- `--conventional`: apply Conventional Commits constraints to the subject and footer behavior. The body format is unchanged and still includes the translated `Rationale:` line. Breaking changes are expressed with `!` in the subject line, and `BREAKING CHANGE` footer lines are not generated.
+- `--one-line`: output subject only when no trailers are appended; with `--co-author`, output is a single-line subject plus `Co-authored-by:` trailer lines
 - `--max-length N`: max subject length (default: 72)
-- `--chunk-tokens N`: token budget per diff chunk (`0` = single summary pass, `-1` disables summarisation)
+- `--chunk-tokens N`: token budget per diff chunk (`0` = single summary pass, `-1` disables summarisation). For `ollama`, values `>= 1` are not supported.
+- `--diff-context N`: context lines in unified diff (`N >= 0`). If omitted, uses `GIT_COMMIT_MESSAGE_DIFF_CONTEXT` when set; otherwise uses Git default (usually `3`).
 - `--debug`: print request/response details
 - `--commit`: run `git commit -m <message>`
 - `--amend`: generate a message suitable for amending the previous commit (diff is from the amended commit's parent to the staged index; if nothing is staged, this effectively becomes the diff introduced by `HEAD`)
 - `--edit`: with `--commit`, open editor for final message
-- `--host URL`: host URL for providers like Ollama (default: `http://localhost:11434`)
+- `--host URL`: host URL for providers like Ollama or llama.cpp (default: `http://localhost:11434` for Ollama, `http://localhost:8080` for llama.cpp)
+- `--co-author VALUE`: append `Co-authored-by:` trailer(s). Repeat to add multiple values. Accepted forms: `Name <email@example.com>` or `copilot` (alias, case-insensitive).
 
 ## Environment variables
 
@@ -196,14 +259,17 @@ Optional:
 - `OPENAI_MODEL`: OpenAI-only model override (used if `--model`/`GIT_COMMIT_MESSAGE_MODEL` are not set)
 - `OLLAMA_MODEL`: Ollama-only model override (used if `--model`/`GIT_COMMIT_MESSAGE_MODEL` are not set)
 - `OLLAMA_HOST`: Ollama server URL (default: `http://localhost:11434`)
+- `LLAMACPP_HOST`: llama.cpp server URL (default: `http://localhost:8080`)
 - `GIT_COMMIT_MESSAGE_LANGUAGE`: default language/locale (default: `en-GB`)
-- `GIT_COMMIT_MESSAGE_CHUNK_TOKENS`: default chunk token budget (default: `0`)
+- `GIT_COMMIT_MESSAGE_CHUNK_TOKENS`: default chunk token budget (default: `0`; for `ollama`, values `>= 1` are not supported)
+- `GIT_COMMIT_MESSAGE_DIFF_CONTEXT`: default unified diff context lines (`0` or greater). If unset, Git default is used (usually `3`).
 
 Default models (if not overridden):
 
 - OpenAI: `gpt-5-mini`
 - Google: `gemini-2.5-flash`
 - Ollama: `gpt-oss:20b`
+- llama.cpp: uses pre-loaded model (model parameter is ignored)
 
 ## AI-generated code notice
 

{git_commit_message-0.8.1 → git_commit_message-0.9.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "git-commit-message"
-version = "0.8.1"
+version = "0.9.0"
 description = "Generate Git commit messages from staged changes using LLM"
 readme = "README.md"
 requires-python = ">=3.13"
@@ -9,7 +9,6 @@ dependencies = [
 	"google-genai>=1.56.0",
 	"ollama>=0.4.0",
 	"openai>=2.6.1",
-	"tiktoken>=0.12.0",
 ]
 maintainers = [{ name = "Mina Her", email = "minacle@live.com" }]
 license = { file = "UNLICENSE" }

{git_commit_message-0.8.1 → git_commit_message-0.9.0}/src/git_commit_message/_cli.py

@@ -9,6 +9,8 @@ from __future__ import annotations
 from argparse import ArgumentParser, Namespace
 from os import environ
 from pathlib import Path
+import re
+from re import Pattern
 from sys import exit as sys_exit
 from sys import stderr
 from typing import Final
@@ -21,6 +23,7 @@ from ._git import (
     has_staged_changes,
     resolve_amend_base_ref,
 )
+from ._config import resolve_provider_name, validate_provider_chunk_tokens
 from ._llm import (
     CommitMessageResult,
     UnsupportedProviderError,
@@ -35,6 +38,7 @@ class CliArgs(Namespace):
         "commit",
         "amend",
         "edit",
+        "conventional",
         "provider",
         "model",
         "language",
@@ -42,7 +46,9 @@ class CliArgs(Namespace):
         "one_line",
         "max_length",
         "chunk_tokens",
+        "diff_context",
         "host",
+        "co_authors",
     )
 
     def __init__(
@@ -53,6 +59,7 @@ class CliArgs(Namespace):
         self.commit: bool = False
         self.amend: bool = False
         self.edit: bool = False
+        self.conventional: bool = False
         self.provider: str | None = None
         self.model: str | None = None
         self.language: str | None = None
@@ -60,7 +67,85 @@ class CliArgs(Namespace):
         self.one_line: bool = False
         self.max_length: int | None = None
         self.chunk_tokens: int | None = None
+        self.diff_context: int | None = None
         self.host: str | None = None
+        self.co_authors: list[str] | None = None
+
+
+_CO_AUTHOR_LINE_RE: Final[Pattern[str]] = re.compile(
+    r"^\s*([^<>\s\n][^<>\n]*?)\s*<([^<>\s\n]+@[^<>\s\n]+)>\s*$"
+)
+_CO_AUTHOR_ALIASES: Final[dict[str, str]] = {
+    "copilot": "Copilot <copilot@github.com>",
+}
+
+
+def _co_author_alias_keywords_text() -> str:
+    """Return a readable list of accepted co-author alias keywords."""
+
+    keywords: list[str] = sorted(_CO_AUTHOR_ALIASES.keys())
+    return ", ".join(f"'{keyword}'" for keyword in keywords)
+
+
+def _normalize_co_author(
+    raw: str,
+    /,
+) -> str:
+    """Normalize one co-author input into ``Name <email>`` form."""
+
+    value: str = raw.strip()
+    if not value:
+        raise ValueError("Co-author cannot be empty.")
+
+    alias: str | None = _CO_AUTHOR_ALIASES.get(value.lower())
+    if alias is not None:
+        return alias
+
+    match = _CO_AUTHOR_LINE_RE.match(value)
+    if match is None:
+        raise ValueError(
+            "Invalid co-author format: use 'Name <email@example.com>' "
+            f"or an alias keyword ({_co_author_alias_keywords_text()})."
+        )
+
+    name: str = match.group(1).strip()
+    email: str = match.group(2).strip()
+    return f"{name} <{email}>"
+
+
+def _append_co_author_footers(
+    message: str,
+    normalized_co_authors: list[str],
+    /,
+) -> str:
+    """Append Git co-author trailers to a commit message."""
+
+    if not normalized_co_authors:
+        return message
+
+    base: str = message.rstrip()
+    footer_lines: list[str] = [
+        f"Co-authored-by: {author}" for author in normalized_co_authors
+    ]
+    return f"{base}\n\n" + "\n".join(footer_lines)
+
+
+def _normalize_co_authors(
+    co_authors: list[str],
+    /,
+) -> list[str]:
+    """Normalize and deduplicate co-author values in insertion order."""
+
+    seen: set[str] = set()
+    normalized: list[str] = []
+    for raw in co_authors:
+        author = _normalize_co_author(raw)
+        key = author.lower()
+        if key in seen:
+            continue
+        seen.add(key)
+        normalized.append(author)
+    return normalized
 
 
 def _env_chunk_tokens_default() -> int | None:
@@ -75,6 +160,21 @@ def _env_chunk_tokens_default() -> int | None:
         return None
 
 
+def _env_diff_context_default() -> int | None:
+    """Return diff context default from env.
+
+    Raises
+    ------
+    ValueError
+        If the configured value is not an integer.
+    """
+
+    raw: str | None = environ.get("GIT_COMMIT_MESSAGE_DIFF_CONTEXT")
+    if raw is None:
+        return None
+    return int(raw)
+
+
 def _build_parser() -> ArgumentParser:
     """Create the CLI argument parser.
 
@@ -119,13 +219,23 @@ def _build_parser() -> ArgumentParser:
         help="Open an editor to amend the message before committing. Use with '--commit'.",
     )
 
+    parser.add_argument(
+        "--conventional",
+        action="store_true",
+        help=(
+            "Use Conventional Commits constraints for the subject line and footer. "
+            "The existing body format remains unchanged, including the translated Rationale line."
+        ),
+    )
+
     parser.add_argument(
         "--provider",
         default=None,
         help=(
             "LLM provider to use (default: openai). "
             "You may also set GIT_COMMIT_MESSAGE_PROVIDER. "
-            "The CLI flag overrides the environment variable."
+            "The CLI flag overrides the environment variable. "
+            "Supported providers: openai, google, ollama, llamacpp."
         ),
     )
 
@@ -133,7 +243,8 @@ def _build_parser() -> ArgumentParser:
         "--model",
         default=None,
         help=(
-            "Model name to use. If unspecified, uses GIT_COMMIT_MESSAGE_MODEL or a provider-specific default (openai: gpt-5-mini; google: gemini-2.5-flash; ollama: gpt-oss:20b)."
+            "Model name to use. If unspecified, uses GIT_COMMIT_MESSAGE_MODEL or a provider-specific default "
+            "(openai: gpt-5-mini; google: gemini-2.5-flash; ollama: gpt-oss:20b; llamacpp: default)."
         ),
     )
 
@@ -176,17 +287,46 @@ def _build_parser() -> ArgumentParser:
         help=(
             "Target token budget per diff chunk. "
             "0 forces a single chunk with summarisation; -1 disables summarisation (legacy one-shot). "
+            "For provider 'ollama', values >= 1 are not supported. "
             "If omitted, uses GIT_COMMIT_MESSAGE_CHUNK_TOKENS when set (default: 0)."
         ),
     )
 
+    parser.add_argument(
+        "--diff-context",
+        dest="diff_context",
+        type=int,
+        default=None,
+        help=(
+            "Number of context lines in unified diff output. "
+            "If omitted, uses GIT_COMMIT_MESSAGE_DIFF_CONTEXT when set "
+            "(default: Git default, usually 3)."
+        ),
+    )
+
     parser.add_argument(
         "--host",
         dest="host",
         default=None,
         help=(
-            "Host URL for API providers like Ollama (default: http://localhost:11434). "
-            "You may also set OLLAMA_HOST for Ollama."
+            "Host URL for API providers like Ollama or llama.cpp "
+            "(default: http://localhost:11434 for Ollama, http://localhost:8080 for llama.cpp). "
+            "You may also set OLLAMA_HOST for Ollama or LLAMACPP_HOST for llama.cpp."
+        ),
+    )
+
+    parser.add_argument(
+        "--co-author",
+        dest="co_authors",
+        action="append",
+        default=None,
+        help=(
+            "Add Co-authored-by trailer(s) to the generated message. "
+            "Repeat for multiple co-authors. "
+            "Use 'Name <email@example.com>' or an alias keyword "
+            f"({_co_author_alias_keywords_text()}). "
+            "When used with --one-line, the subject line remains single-line and these "
+            "trailers are appended on separate lines (i.e., the overall output is multi-line)."
         ),
     )
 
@@ -210,6 +350,32 @@ def _run(
         Process exit code. 0 indicates success; any other value indicates failure.
     """
 
+    chunk_tokens: int | None = args.chunk_tokens
+    if chunk_tokens is None:
+        chunk_tokens = _env_chunk_tokens_default()
+    if chunk_tokens is None:
+        chunk_tokens = 0
+
+    diff_context: int | None = args.diff_context
+    if diff_context is None:
+        try:
+            diff_context = _env_diff_context_default()
+        except ValueError:
+            print(
+                "GIT_COMMIT_MESSAGE_DIFF_CONTEXT must be an integer.",
+                file=stderr,
+            )
+            return 2
+    if diff_context is not None and diff_context < 0:
+        print("--diff-context must be greater than or equal to 0.", file=stderr)
+        return 2
+
+    provider_name: str = resolve_provider_name(args.provider)
+    provider_arg_error = validate_provider_chunk_tokens(provider_name, chunk_tokens)
+    if provider_arg_error is not None:
+        print(provider_arg_error, file=stderr)
+        return 2
+
     repo_root: Path = get_repo_root()
 
     if args.amend:
@@ -218,21 +384,27 @@ def _run(
             return 2
 
         base_ref = resolve_amend_base_ref(repo_root)
-        diff_text: str = get_staged_diff(repo_root, base_ref=base_ref)
+        diff_text: str = get_staged_diff(
+            repo_root,
+            base_ref=base_ref,
+            context_lines=diff_context,
+        )
     else:
         if not has_staged_changes(repo_root):
             print("No staged changes. Run 'git add' and try again.", file=stderr)
             return 2
 
-        diff_text = get_staged_diff(repo_root)
+        diff_text = get_staged_diff(repo_root, context_lines=diff_context)
 
     hint: str | None = args.description if isinstance(args.description, str) else None
 
-    chunk_tokens: int | None = args.chunk_tokens
-    if chunk_tokens is None:
-        chunk_tokens = _env_chunk_tokens_default()
-    if chunk_tokens is None:
-        chunk_tokens = 0
+    normalized_co_authors: list[str] | None = None
+    if args.co_authors:
+        try:
+            normalized_co_authors = _normalize_co_authors(args.co_authors)
+        except ValueError as exc:
+            print(str(exc), file=stderr)
+            return 2
 
     result: CommitMessageResult | None = None
     try:
@@ -247,6 +419,7 @@ def _run(
                 chunk_tokens,
                 args.provider,
                 args.host,
+                args.conventional,
             )
             message = result.message
         else:
@@ -260,6 +433,7 @@ def _run(
                 chunk_tokens,
                 args.provider,
                 args.host,
+                args.conventional,
             )
     except UnsupportedProviderError as exc:
         print(str(exc), file=stderr)
@@ -278,6 +452,14 @@ def _run(
         else:
             message = ""
 
+    # Defensive check: one-line normalization can result in an empty message.
+    if not message.strip():
+        print("Failed to generate commit message: generated message is empty.", file=stderr)
+        return 3
+
+    if normalized_co_authors:
+        message = _append_co_author_footers(message, normalized_co_authors)
+
     if not args.commit:
         if args.debug and result is not None:
             # Print debug information