git-copilot-commit 0.5.3__py3-none-any.whl → 0.5.5__py3-none-any.whl

git_copilot_commit/cli.py

@@ -5,6 +5,7 @@ git-copilot-commit - AI-powered Git commit assistant
 from dataclasses import dataclass
 from pathlib import Path
 import os
+import re
 import sys
 from typing import Annotated, Sequence
 
@@ -94,6 +95,19 @@ class PreparedSplitCommit:
     patch_units: tuple[PatchUnit, ...]
 
 
+CORE_CHANGE_COMMIT_TYPES = frozenset({"feat", "fix", "perf", "refactor", "revert"})
+FOLLOW_UP_COMMIT_TYPE_PRIORITY = {
+    "test": 2,
+    "docs": 3,
+    "style": 4,
+    "chore": 4,
+}
+CONVENTIONAL_COMMIT_TYPE_PATTERN = re.compile(
+    r"^\s*([a-z]+)(?:\([^)\r\n]*\))?(?:!)?:",
+    re.IGNORECASE,
+)
+
+
 def preprocess_cli_args(args: Sequence[str]) -> list[str]:
     """Normalize CLI arguments before Click parses them."""
     processed_args: list[str] = []
@@ -142,6 +156,37 @@ def preprocess_cli_args(args: Sequence[str]) -> list[str]:
     return processed_args
 
 
+def extract_conventional_commit_type(message: str) -> str | None:
+    """Extract the Conventional Commit type from a generated title line."""
+    match = CONVENTIONAL_COMMIT_TYPE_PATTERN.match(message.strip())
+    if match is None:
+        return None
+
+    return match.group(1).lower()
+
+
+def order_prepared_split_commits(
+    prepared_commits: Sequence[PreparedSplitCommit],
+) -> list[PreparedSplitCommit]:
+    """Order planned commits in a developer-friendly execution sequence."""
+
+    def sort_key(item: tuple[int, PreparedSplitCommit]) -> tuple[int, int]:
+        index, prepared_commit = item
+        commit_type = extract_conventional_commit_type(prepared_commit.message)
+
+        if commit_type in CORE_CHANGE_COMMIT_TYPES:
+            priority = 0
+        elif commit_type is None:
+            priority = 1
+        else:
+            priority = FOLLOW_UP_COMMIT_TYPE_PRIORITY.get(commit_type, 1)
+
+        return priority, index
+
+    ordered_items = sorted(enumerate(prepared_commits), key=sort_key)
+    return [prepared_commit for _, prepared_commit in ordered_items]
+
+
 def run(args: Sequence[str] | None = None) -> None:
     """Run the CLI entrypoint with argument normalization."""
     raw_args = list(args) if args is not None else sys.argv[1:]
@@ -341,7 +386,7 @@ def generate_commit_message_for_prompt(
     )
 
 
-def should_fallback_to_status_only(exc: github_copilot.CopilotError) -> bool:
+def should_retry_with_compact_prompt(exc: github_copilot.CopilotError) -> bool:
     message_parts = [str(exc)]
     if isinstance(exc, github_copilot.CopilotHttpError) and exc.detail:
         message_parts.append(exc.detail)
@@ -360,6 +405,7 @@ def should_fallback_to_status_only(exc: github_copilot.CopilotError) -> bool:
         "max prompt tokens",
         "input tokens",
         "prompt tokens",
+        "prompt token count",
     )
     return any(indicator in haystack for indicator in indicators)
 
@@ -379,7 +425,7 @@ def generate_commit_message_for_status(
             http_client_config=http_client_config,
         )
     except github_copilot.CopilotError as exc:
-        if not should_fallback_to_status_only(exc):
+        if not should_retry_with_compact_prompt(exc):
             raise
 
     console.print(
@@ -507,31 +553,65 @@ def request_split_commit_plan(
     http_client_config: github_copilot.HttpClientConfig | None = None,
 ) -> SplitCommitPlan:
     """Request and validate a split-commit plan for the staged patch units."""
-    try:
-        planner_prompt = build_split_plan_prompt(
-            status,
-            patch_units,
-            preferred_commits=preferred_commits,
-            context=context,
-        )
+    planner_system_prompt = load_named_prompt(SPLIT_COMMIT_PLANNER_PROMPT_FILENAME)
+    planner_prompt = build_split_plan_prompt(
+        status,
+        patch_units,
+        preferred_commits=preferred_commits,
+        context=context,
+    )
 
+    try:
         with console.status(
             "[yellow]Planning split commits from [bold]staged hunks[/] ...[/yellow]"
         ):
             response = ask_copilot_with_system_prompt(
-                load_named_prompt(SPLIT_COMMIT_PLANNER_PROMPT_FILENAME),
+                planner_system_prompt,
                 planner_prompt,
                 model=model,
                 http_client_config=http_client_config,
             )
+    except github_copilot.CopilotError as exc:
+        if not should_retry_with_compact_prompt(exc):
+            print_copilot_error("Could not generate a split commit plan", exc)
+            raise typer.Exit(1)
+
+        console.print(
+            "[yellow]Staged patch units exceeded the model context window; retrying split planning with summaries only.[/yellow]"
+        )
+    else:
         return parse_split_plan_response(
             response,
             patch_units,
         )
+
+    compact_planner_prompt = build_split_plan_prompt(
+        status,
+        patch_units,
+        preferred_commits=preferred_commits,
+        context=context,
+        include_patches=False,
+    )
+
+    try:
+        with console.status(
+            "[yellow]Planning split commits from [bold]patch summaries[/] ...[/yellow]"
+        ):
+            response = ask_copilot_with_system_prompt(
+                planner_system_prompt,
+                compact_planner_prompt,
+                model=model,
+                http_client_config=http_client_config,
+            )
     except github_copilot.CopilotError as exc:
         print_copilot_error("Could not generate a split commit plan", exc)
         raise typer.Exit(1)
 
+    return parse_split_plan_response(
+        response,
+        patch_units,
+    )
+
 
 def request_split_commit_messages(
     plan: SplitCommitPlan,
@@ -827,6 +907,7 @@ def handle_split_commit_flow(
         context=context,
         http_client_config=http_client_config,
     )
+    prepared_commits = order_prepared_split_commits(prepared_commits)
 
     if len(prepared_commits) == 1:
         console.print(

git_copilot_commit/prompts/split-commit-planner-prompt.md

@@ -15,6 +15,11 @@ small number of coherent commits.
 - Do not split a patch unit further.
 - Preserve the natural order of work. If unit `u1` appears before `u4` in the
   diff, prefer to keep that order within a commit.
+- Order commits the way experienced software developers usually land them:
+  foundational product code first, then tests that validate that code, then
+  docs/examples, then style/chore follow-ups.
+- If a docs or test unit depends on a feat/fix/refactor/perf unit, place the
+  docs or test commit after the underlying code change.
 - If multiple units belong to the same logical change, keep them together.
 - If the staged changes are best represented as a single coherent commit, return
   one commit.

git_copilot_commit/split_commits.py

@@ -173,6 +173,7 @@ def build_split_plan_prompt(
     *,
     preferred_commits: int | None = None,
     context: str = "",
+    include_patches: bool = True,
 ) -> str:
     """Build the user prompt used to request a split-commit plan."""
     if not patch_units:
@@ -193,7 +194,7 @@ def build_split_plan_prompt(
             "`git status`:",
             f"```\n{status.get_porcelain_output()}\n```",
             "",
-            "Patch units:",
+            "Patch units:" if include_patches else "Patch units (summaries only):",
         ]
     )
 
@@ -204,10 +205,15 @@ def build_split_plan_prompt(
                 f"Path: {unit.path}",
                 f"Kind: {unit.kind}",
                 f"Summary: {unit.summary}",
-                "Patch:",
-                f"```diff\n{unit.patch}\n```",
             ]
         )
+        if include_patches:
+            prompt_parts.extend(
+                [
+                    "Patch:",
+                    f"```diff\n{unit.patch}\n```",
+                ]
+            )
 
     return "\n".join(prompt_parts)
 

{git_copilot_commit-0.5.3.dist-info → git_copilot_commit-0.5.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-copilot-commit
-Version: 0.5.3
+Version: 0.5.5
 Summary: Automatically generate and commit changes using GitHub Copilot
 Author-email: Dheepak Krishnamurthy <1813121+kdheepak@users.noreply.github.com>
 License-File: LICENSE

{git_copilot_commit-0.5.3.dist-info → git_copilot_commit-0.5.5.dist-info}/RECORD

@@ -1,15 +1,15 @@
 git_copilot_commit/__init__.py,sha256=v3x5oBkxwKJEZLv62QqSmP3iqNKLtZgrWZfH8eFzlQg,60
-git_copilot_commit/cli.py,sha256=CIwT5T-Y5j5DpDRi-tHMiB-bACntCWRjqxx8zQSY3AM,31373
+git_copilot_commit/cli.py,sha256=yN7fq43i3TFerhEOMm4ZHUy2rbiH0n70tIcwrxdWCdc,33929
 git_copilot_commit/git.py,sha256=vNuh2j8TGmocLio4XgPpbXIktlgczNdEt2Fg1c40wuk,14962
 git_copilot_commit/github_copilot.py,sha256=2SKVVFmQ2yETAySjSRYKQTujW-1vZEW4rFKSr--dtLs,50427
 git_copilot_commit/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 git_copilot_commit/settings.py,sha256=WrM10_J3F7QBfOVmPDWpNZrNHhmZSeN-9FqQZxgdWvQ,3730
-git_copilot_commit/split_commits.py,sha256=sGk5xfAvTeRcnW4XQvvyNVgYGsAFNntkk-JuVXb8Y6Y,14851
+git_copilot_commit/split_commits.py,sha256=rHyuVJggjmYjbva7BVqsM3aZRxUgOKkuZtxxvFRcu6Q,15060
 git_copilot_commit/version.py,sha256=AieHOUX52g6N67HL0iLWtDKrgOYyulxwHWViu26Jrd4,105
 git_copilot_commit/prompts/commit-message-generator-prompt.md,sha256=EHAS6w15vLQ-kgT1N7nPG2nWqdeTmlHje_kN9yZIoZQ,2378
-git_copilot_commit/prompts/split-commit-planner-prompt.md,sha256=ABKuVVyrkHsb3QV6qyS--W5yvKBoZhtq8xJEb3OZQvI,1088
-git_copilot_commit-0.5.3.dist-info/METADATA,sha256=8_PBEk8n1GS9xG8dpZnll5bNLB1PDVL5FZbSXzmCcqs,6649
-git_copilot_commit-0.5.3.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-git_copilot_commit-0.5.3.dist-info/entry_points.txt,sha256=-D4bQqiuSPwQJG2zx--vJbZD1iqB5coUfoJ_gmC3rSg,66
-git_copilot_commit-0.5.3.dist-info/licenses/LICENSE,sha256=14lNZAoKJPI1U7eGpletjN_PFm1JwP1vT_0jFKY6eWg,1065
-git_copilot_commit-0.5.3.dist-info/RECORD,,
+git_copilot_commit/prompts/split-commit-planner-prompt.md,sha256=JActWTKMbdR9eaJyCbQ6UwzyRu5jJi8Iec7H7qWAmAA,1418
+git_copilot_commit-0.5.5.dist-info/METADATA,sha256=8lx9m_ZB9r3MOmWAz-pb8XLHZH1cp2PC_IvWlqRp9yw,6649
+git_copilot_commit-0.5.5.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+git_copilot_commit-0.5.5.dist-info/entry_points.txt,sha256=-D4bQqiuSPwQJG2zx--vJbZD1iqB5coUfoJ_gmC3rSg,66
+git_copilot_commit-0.5.5.dist-info/licenses/LICENSE,sha256=14lNZAoKJPI1U7eGpletjN_PFm1JwP1vT_0jFKY6eWg,1065
+git_copilot_commit-0.5.5.dist-info/RECORD,,