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

git_copilot_commit/cli.py

@@ -341,7 +341,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 +360,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 +380,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 +508,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,

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.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-copilot-commit
-Version: 0.5.3
+Version: 0.5.4
 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.4.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=k-HCs6skTLysyyHUN-lS9NjrsURvXcq7E2MgdClRnxc,32472
 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-0.5.4.dist-info/METADATA,sha256=gvVJMTP6Akuyws8U-z0O_ANqUAnq9fAJoEO982M25Q0,6649
+git_copilot_commit-0.5.4.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+git_copilot_commit-0.5.4.dist-info/entry_points.txt,sha256=-D4bQqiuSPwQJG2zx--vJbZD1iqB5coUfoJ_gmC3rSg,66
+git_copilot_commit-0.5.4.dist-info/licenses/LICENSE,sha256=14lNZAoKJPI1U7eGpletjN_PFm1JwP1vT_0jFKY6eWg,1065
+git_copilot_commit-0.5.4.dist-info/RECORD,,