git-copilot-commit 0.5.3__tar.gz → 0.5.4__tar.gz

{git_copilot_commit-0.5.3 → git_copilot_commit-0.5.4}/PKG-INFO

@@ -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 → git_copilot_commit-0.5.4}/src/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-0.5.3 → git_copilot_commit-0.5.4}/src/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 → git_copilot_commit-0.5.4}/tests/test_cli.py

@@ -142,6 +142,70 @@ def test_generate_commit_message_for_status_retries_without_diff_on_context_over
     mock_print.assert_called()
 
 
+def test_request_split_commit_plan_retries_without_patches_on_context_overflow(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    status = GitStatus(
+        files=[
+            GitFile(path="src/example.py", status=" ", staged_status="M"),
+            GitFile(path="README.md", status=" ", staged_status="A"),
+        ],
+        staged_diff=(
+            "diff --git a/src/example.py b/src/example.py\n+print('hi')\n"
+            "diff --git a/README.md b/README.md\n+# hi\n"
+        ),
+        unstaged_diff="",
+    )
+    patch_units = (
+        PatchUnit(
+            id="u1",
+            order=0,
+            path="src/example.py",
+            staged_status="M",
+            kind="hunk",
+            patch="diff --git a/src/example.py b/src/example.py\n+print('hi')\n",
+            summary="src/example.py hunk 1/1 @@ -1 +1 @@ (+1/-0)",
+        ),
+        PatchUnit(
+            id="u2",
+            order=1,
+            path="README.md",
+            staged_status="A",
+            kind="new_file",
+            patch="diff --git a/README.md b/README.md\n+# hi\n",
+            summary="add README.md (+1/-0)",
+        ),
+    )
+    mock_print = Mock()
+    mock_ask = Mock(
+        side_effect=[
+            github_copilot.CopilotHttpError(
+                400,
+                "Bad Request",
+                (
+                    '{"error":{"message":"prompt token count of 1719062 exceeds '
+                    'the limit of 128000","code":"model_max_prompt_tokens_exceeded"}}'
+                ),
+            ),
+            '{"commits":[{"unit_ids":["u1"]},{"unit_ids":["u2"]}]}',
+        ]
+    )
+    monkeypatch.setattr(cli.console, "print", mock_print)
+    monkeypatch.setattr(cli, "load_named_prompt", Mock(return_value="system prompt"))
+    monkeypatch.setattr(cli, "ask_copilot_with_system_prompt", mock_ask)
+
+    plan = cli.request_split_commit_plan(status, patch_units)
+
+    assert [commit.unit_ids for commit in plan.commits] == [("u1",), ("u2",)]
+    assert mock_ask.call_count == 2
+    first_prompt = mock_ask.call_args_list[0].args[1]
+    second_prompt = mock_ask.call_args_list[1].args[1]
+    assert "```diff" in first_prompt
+    assert "```diff" not in second_prompt
+    assert "Patch units (summaries only):" in second_prompt
+    mock_print.assert_called()
+
+
 def test_display_split_commit_plan_shows_files_not_hunk_summaries(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:

{git_copilot_commit-0.5.3 → git_copilot_commit-0.5.4}/tests/test_split_commits.py

@@ -99,6 +99,20 @@ def test_build_split_plan_prompt_includes_unit_details() -> None:
     assert "Kind: new_file" in prompt
 
 
+def test_build_split_plan_prompt_can_omit_raw_patches() -> None:
+    units = extract_patch_units(MULTI_FILE_DIFF)
+
+    prompt = build_split_plan_prompt(
+        make_status(),
+        units,
+        include_patches=False,
+    )
+
+    assert "Patch units (summaries only):" in prompt
+    assert "Summary: src/app.py hunk 1/2" in prompt
+    assert "```diff" not in prompt
+
+
 def test_build_split_plan_prompt_supports_preferred_commit_count() -> None:
     units = extract_patch_units(MULTI_FILE_DIFF)