git-commit-message 0.9.0__py3-none-any.whl → 0.9.2__py3-none-any.whl

git_commit_message/_cli.py

@@ -17,6 +17,8 @@ from typing import Final
 
 from ._git import (
     commit_with_message,
+    get_current_branch,
+    get_git_log,
     get_repo_root,
     get_staged_diff,
     has_head_commit,
@@ -47,6 +49,9 @@ class CliArgs(Namespace):
         "max_length",
         "chunk_tokens",
         "diff_context",
+        "no_branch",
+        "no_log",
+        "log_count",
         "host",
         "co_authors",
     )
@@ -68,6 +73,9 @@ class CliArgs(Namespace):
         self.max_length: int | None = None
         self.chunk_tokens: int | None = None
         self.diff_context: int | None = None
+        self.no_branch: bool = False
+        self.no_log: bool = False
+        self.log_count: int = 10
         self.host: str | None = None
         self.co_authors: list[str] | None = None
 
@@ -76,7 +84,10 @@ _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]] = {
+    "claude-code": "Claude <noreply@anthropic.com>",
+    "codex": "Codex <noreply@openai.com>",
     "copilot": "Copilot <copilot@github.com>",
+    "copilot-cli": "Copilot <223556219+Copilot@users.noreply.github.com>",
 }
 
 
@@ -304,6 +315,31 @@ def _build_parser() -> ArgumentParser:
         ),
     )
 
+    parser.add_argument(
+        "--no-branch",
+        dest="no_branch",
+        action="store_true",
+        help="Do not include the current branch name in the LLM context.",
+    )
+
+    parser.add_argument(
+        "--no-log",
+        dest="no_log",
+        action="store_true",
+        help="Do not include recent Git log entries in the LLM context.",
+    )
+
+    parser.add_argument(
+        "--log-count",
+        dest="log_count",
+        type=int,
+        default=10,
+        help=(
+            "Number of recent Git log entries to include in the LLM context "
+            "(default: 10). Ignored when --no-log is set."
+        ),
+    )
+
     parser.add_argument(
         "--host",
         dest="host",
@@ -370,6 +406,10 @@ def _run(
         print("--diff-context must be greater than or equal to 0.", file=stderr)
         return 2
 
+    if not args.no_log and args.log_count < 1:
+        print("--log-count must be greater than or equal to 1.", 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:
@@ -396,6 +436,9 @@ def _run(
 
         diff_text = get_staged_diff(repo_root, context_lines=diff_context)
 
+    branch: str | None = None if args.no_branch else get_current_branch(repo_root)
+    log: str | None = None if args.no_log else get_git_log(repo_root, count=args.log_count)
+
     hint: str | None = args.description if isinstance(args.description, str) else None
 
     normalized_co_authors: list[str] | None = None
@@ -420,6 +463,8 @@ def _run(
                 args.provider,
                 args.host,
                 args.conventional,
+                branch=branch,
+                log=log,
             )
             message = result.message
         else:
@@ -434,6 +479,8 @@ def _run(
                 args.provider,
                 args.host,
                 args.conventional,
+                branch=branch,
+                log=log,
             )
     except UnsupportedProviderError as exc:
         print(str(exc), file=stderr)

git_commit_message/_git.py

@@ -232,6 +232,80 @@ def get_staged_diff(
     return out.decode()
 
 
+def get_current_branch(
+    cwd: Path,
+    /,
+) -> str | None:
+    """Return the current branch name, or ``None`` if HEAD is detached.
+
+    Parameters
+    ----------
+    cwd
+        Repository directory in which to run Git.
+
+    Returns
+    -------
+    str | None
+        Branch name, or ``None`` when HEAD is detached or the command fails.
+    """
+
+    completed = run(
+        ["git", "branch", "--show-current"],
+        cwd=str(cwd),
+        check=False,
+        capture_output=True,
+    )
+    if completed.returncode != 0:
+        return None
+    name = completed.stdout.decode().strip()
+    return name or None
+
+
+def get_git_log(
+    cwd: Path,
+    /,
+    *,
+    count: int = 10,
+) -> str | None:
+    """Return recent Git log entries as formatted text.
+
+    Parameters
+    ----------
+    cwd
+        Repository directory in which to run Git.
+    count
+        Maximum number of commits to include.
+
+    Returns
+    -------
+    str | None
+        Formatted log text, or ``None`` if the repository has no commits
+        or if ``git log`` fails.
+    """
+
+    if count < 1:
+        raise ValueError(f"count must be >= 1, got {count}")
+
+    if not has_head_commit(cwd):
+        return None
+
+    try:
+        out: bytes = check_output(
+            [
+                "git",
+                "log",
+                f"-{count}",
+                "--format=%h %s%n%n%b%n---%n",
+            ],
+            cwd=str(cwd),
+        )
+    except CalledProcessError:
+        return None
+
+    text = out.decode().strip()
+    return text or None
+
+
 def commit_with_message(
     message: str,
     edit: bool,

git_commit_message/_llm.py

@@ -298,12 +298,19 @@ def _build_combined_prompt(
     hint: str | None,
     content_label: str = "Changes (diff)",
     /,
+    *,
+    branch: str | None = None,
+    log: str | None = None,
 ) -> str:
-    hint_content: str | None = (
-        f"# Auxiliary context (user-provided)\n{hint}" if hint else None
-    )
-    content: str = f"# {content_label}\n{diff}"
-    return "\n\n".join([part for part in (hint_content, content) if part is not None])
+    parts: list[str] = []
+    if hint:
+        parts.append(f"# Auxiliary context (user-provided)\n{hint}")
+    if branch:
+        parts.append(f"# Current branch\n{branch}")
+    if log:
+        parts.append(f"# Recent commits\n{log}")
+    parts.append(f"# {content_label}\n{diff}")
+    return "\n\n".join(parts)
 
 
 def _split_diff_into_hunks(
@@ -423,6 +430,9 @@ def _generate_commit_from_summaries(
     language: str,
     conventional: bool = False,
     /,
+    *,
+    branch: str | None = None,
+    log: str | None = None,
 ) -> LLMTextResult:
     instructions = _build_system_prompt(single_line, subject_max, language, conventional)
     sections: list[str] = []
@@ -430,6 +440,12 @@ def _generate_commit_from_summaries(
     if hint:
         sections.append(f"# Auxiliary context (user-provided)\n{hint}")
 
+    if branch:
+        sections.append(f"# Current branch\n{branch}")
+
+    if log:
+        sections.append(f"# Recent commits\n{log}")
+
     if summaries:
         numbered = [
             f"Summary {idx + 1}:\n{summary}" for idx, summary in enumerate(summaries)
@@ -490,6 +506,9 @@ def generate_commit_message(
     host: str | None = None,
     conventional: bool = False,
     /,
+    *,
+    branch: str | None = None,
+    log: str | None = None,
 ) -> str:
     chosen_provider = resolve_provider_name(provider)
     chosen_model = resolve_model_name(model, chosen_provider)
@@ -523,11 +542,13 @@ def generate_commit_message(
             subject_max,
             chosen_language,
             conventional,
+            branch=branch,
+            log=log,
         )
         text = (final.text or "").strip()
     else:
         instructions = _build_system_prompt(single_line, subject_max, chosen_language, conventional)
-        user_text = _build_combined_prompt(diff, hint)
+        user_text = _build_combined_prompt(diff, hint, branch=branch, log=log)
         final = llm.generate_text(
             model=chosen_model,
             instructions=instructions,
@@ -553,6 +574,9 @@ def generate_commit_message_with_info(
     host: str | None = None,
     conventional: bool = False,
     /,
+    *,
+    branch: str | None = None,
+    log: str | None = None,
 ) -> CommitMessageResult:
     chosen_provider = resolve_provider_name(provider)
     chosen_model = resolve_model_name(model, chosen_provider)
@@ -588,12 +612,16 @@ def generate_commit_message_with_info(
             subject_max,
             chosen_language,
             conventional,
+            branch=branch,
+            log=log,
         )
 
         combined_prompt = _build_combined_prompt(
             "\n".join(summary_texts),
             hint,
             "Combined summaries (English)",
+            branch=branch,
+            log=log,
         )
 
         prompt_tokens, completion_tokens, total_tokens = _sum_usage(
@@ -605,7 +633,7 @@ def generate_commit_message_with_info(
 
     else:
         instructions = _build_system_prompt(single_line, subject_max, chosen_language, conventional)
-        combined_prompt = _build_combined_prompt(diff, hint)
+        combined_prompt = _build_combined_prompt(diff, hint, branch=branch, log=log)
 
         final_result = llm.generate_text(
             model=chosen_model,

{git_commit_message-0.9.0.dist-info → git_commit_message-0.9.2.dist-info}/METADATA

@@ -1,37 +1,32 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.3
 Name: git-commit-message
-Version: 0.9.0
+Version: 0.9.2
 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.
-        
-        Anyone is free to copy, modify, publish, use, compile, sell, or
-        distribute this software, either in source code form or as a compiled
-        binary, for any purpose, commercial or non-commercial, and by any
-        means.
-        
-        In jurisdictions that recognize copyright laws, the author or authors
-        of this software dedicate any and all copyright interest in the
-        software to the public domain. We make this dedication for the benefit
-        of the public at large and to the detriment of our heirs and
-        successors. We intend this dedication to be an overt act of
-        relinquishment in perpetuity of all present and future rights to this
-        software under copyright law.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-        EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-        MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-        IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-        OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-        ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-        OTHER DEALINGS IN THE SOFTWARE.
-        
-        For more information, please refer to <https://unlicense.org/>
-        
-Project-URL: Homepage, https://github.com/minacle/git-commit-message
-Project-URL: Repository, https://github.com/minacle/git-commit-message
-Project-URL: Issues, https://github.com/minacle/git-commit-message/issues
-Classifier: Development Status :: 3 - Alpha
+         
+         Anyone is free to copy, modify, publish, use, compile, sell, or
+         distribute this software, either in source code form or as a compiled
+         binary, for any purpose, commercial or non-commercial, and by any
+         means.
+         
+         In jurisdictions that recognize copyright laws, the author or authors
+         of this software dedicate any and all copyright interest in the
+         software to the public domain. We make this dedication for the benefit
+         of the public at large and to the detriment of our heirs and
+         successors. We intend this dedication to be an overt act of
+         relinquishment in perpetuity of all present and future rights to this
+         software under copyright law.
+         
+         THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+         EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+         MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+         IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+         OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+         ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+         OTHER DEALINGS IN THE SOFTWARE.
+         
+         For more information, please refer to <https://unlicense.org/>
+Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: The Unlicense (Unlicense)
@@ -40,13 +35,19 @@ Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Version Control :: Git
+Requires-Dist: babel>=2.18.0
+Requires-Dist: google-genai>=1.73.1
+Requires-Dist: ollama>=0.6.1
+Requires-Dist: openai>=2.32.0
+Maintainer: Mina Her
+Maintainer-email: Mina Her <minacle@live.com>
 Requires-Python: >=3.13
+Project-URL: Homepage, https://github.com/minacle/git-commit-message
+Project-URL: Repository, https://github.com/minacle/git-commit-message
+Project-URL: Issues, https://github.com/minacle/git-commit-message/issues
 Description-Content-Type: text/markdown
-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
 
 # git-commit-message
 
@@ -293,7 +294,7 @@ git-commit-message --provider llamacpp --host http://192.168.1.100:8080
 - `--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 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).
+- `--co-author VALUE`: append `Co-authored-by:` trailer(s). Repeat to add multiple values. Accepted forms: `Name <email@example.com>` or an alias keyword (`claude-code`, `codex`, `copilot`, `copilot-cli`; case-insensitive).
 
 ## Environment variables
 

git_commit_message-0.9.2.dist-info/RECORD

@@ -0,0 +1,14 @@
+git_commit_message/__init__.py,sha256=bmUVTlV1SYJAnoSaIKcpDCPkJ5JW2BANfFGvKt_A22w,190
+git_commit_message/__main__.py,sha256=n5lvkLiCZ1Q4dwhEwonWntcKTeTaJL9qOJzdiLf0Gfk,99
+git_commit_message/_cli.py,sha256=QWVENNmjrwiakpkXXy5Czbndt_IgcaQHhvuX5KMZ1V8,16801
+git_commit_message/_config.py,sha256=-b0tDC7YvGVLWqz_ootOTvCAqDm_DK5ZjIX2BBOls6E,2089
+git_commit_message/_gemini.py,sha256=QBKWnFCgc62KqC8agPhfO6eIizNj3V0oPTj6rqbTKiY,3487
+git_commit_message/_git.py,sha256=7Hc4fl2Qp8UA9Xhk-yrNhKtEmVE8jOq7t_qCVQq8nbw,8146
+git_commit_message/_gpt.py,sha256=baXHnhAXkeljjvSQqgQcxHaenOj5jvN7VmwapSjWGsE,3181
+git_commit_message/_llamacpp.py,sha256=s5FeqexObi7qrOBYz1SLPxJi2xjBNH2-mOcMuKk0DkE,4294
+git_commit_message/_llm.py,sha256=DK85Yo9Md5uQe99IHQELTslUUQEt6nqPst2PeHkIwys,21341
+git_commit_message/_ollama.py,sha256=pj8rKE1-jETp91OCcVP7yui_1upWmZWeJpsYEc2H928,3024
+git_commit_message-0.9.2.dist-info/WHEEL,sha256=bEhYrD-rjlF0iRRHiAnfJ0mEjMsRwm29hhDD7yRgWCY,80
+git_commit_message-0.9.2.dist-info/entry_points.txt,sha256=T-3pK5LadeEm_vdS_3BZUv0VQXdgI0cwkfe5PnFPLD8,64
+git_commit_message-0.9.2.dist-info/METADATA,sha256=p_SECWbfTLPQs9NoQlJ6vsdpOLgZEXyfejkB4nvXgEI,10613
+git_commit_message-0.9.2.dist-info/RECORD,,

{git_commit_message-0.9.0.dist-info → git_commit_message-0.9.2.dist-info}/WHEEL

@@ -1,5 +1,4 @@
 Wheel-Version: 1.0
-Generator: setuptools (82.0.1)
+Generator: uv 0.11.3
 Root-Is-Purelib: true
 Tag: py3-none-any
-

{git_commit_message-0.9.0.dist-info → git_commit_message-0.9.2.dist-info}/entry_points.txt

@@ -1,2 +1,3 @@
 [console_scripts]
 git-commit-message = git_commit_message:main
+

git_commit_message-0.9.0.dist-info/RECORD

@@ -1,15 +0,0 @@
-git_commit_message/__init__.py,sha256=bmUVTlV1SYJAnoSaIKcpDCPkJ5JW2BANfFGvKt_A22w,190
-git_commit_message/__main__.py,sha256=n5lvkLiCZ1Q4dwhEwonWntcKTeTaJL9qOJzdiLf0Gfk,99
-git_commit_message/_cli.py,sha256=0fIKoPeXZzAz6n6qOwHK2K2-inausMp3EHR3Feh9wP4,15349
-git_commit_message/_config.py,sha256=-b0tDC7YvGVLWqz_ootOTvCAqDm_DK5ZjIX2BBOls6E,2089
-git_commit_message/_gemini.py,sha256=QBKWnFCgc62KqC8agPhfO6eIizNj3V0oPTj6rqbTKiY,3487
-git_commit_message/_git.py,sha256=CCpPYUiKeFIyPCxCM1rSPZA0DRrEreNJ5oazJZBrLbI,6612
-git_commit_message/_gpt.py,sha256=baXHnhAXkeljjvSQqgQcxHaenOj5jvN7VmwapSjWGsE,3181
-git_commit_message/_llamacpp.py,sha256=s5FeqexObi7qrOBYz1SLPxJi2xjBNH2-mOcMuKk0DkE,4294
-git_commit_message/_llm.py,sha256=kimyKUZq8-BnQ6IyuKwyL0dh38rT_1zjuNfahGkmVy0,20683
-git_commit_message/_ollama.py,sha256=pj8rKE1-jETp91OCcVP7yui_1upWmZWeJpsYEc2H928,3024
-git_commit_message-0.9.0.dist-info/METADATA,sha256=kARTFHKefUFFRzGM8yfWBuTvhEGMWj6zeCrQ2mmi2Qc,10477
-git_commit_message-0.9.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-git_commit_message-0.9.0.dist-info/entry_points.txt,sha256=e2cRvoyZnmP7yVItmFKwZofYG86WWKhm8KbzZSo2mf0,63
-git_commit_message-0.9.0.dist-info/top_level.txt,sha256=qeP45y7y44R4KrPEihvMdwdM8tXYDY_3nCvCD3I9EcI,19
-git_commit_message-0.9.0.dist-info/RECORD,,

git_commit_message-0.9.0.dist-info/top_level.txt

@@ -1 +0,0 @@
-git_commit_message