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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-copilot-commit
-Version: 0.5.2
+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.2 → git_copilot_commit-0.5.4}/src/git_copilot_commit/cli.py

@@ -268,7 +268,12 @@ def display_selected_model(model: github_copilot.CopilotModel) -> None:
     console.print(f"[green]Using model:[/green] {model.id} ({', '.join(details)})")
 
 
-def build_commit_message_prompt(status: GitStatus, context: str = "") -> str:
+def build_commit_message_prompt(
+    status: GitStatus,
+    context: str = "",
+    *,
+    include_diff: bool = True,
+) -> str:
     """Build the prompt used to generate a commit message."""
     if not status.has_staged_changes:
         console.print("[red]No staged changes to commit.[/red]")
@@ -277,10 +282,16 @@ def build_commit_message_prompt(status: GitStatus, context: str = "") -> str:
     prompt_parts = [
         "`git status`:\n",
         f"```\n{status.get_porcelain_output()}\n```",
-        "\n\n`git diff --staged`:\n",
-        f"```\n{status.staged_diff}\n```",
     ]
 
+    if include_diff:
+        prompt_parts.extend(
+            [
+                "\n\n`git diff --staged`:\n",
+                f"```\n{status.staged_diff}\n```",
+            ]
+        )
+
     if context.strip():
         prompt_parts.insert(0, f"User-provided context:\n\n{context.strip()}\n\n")
 
@@ -330,6 +341,30 @@ def generate_commit_message_for_prompt(
     )
 
 
+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)
+
+    haystack = " ".join(part.strip() for part in message_parts if part).lower()
+    indicators = (
+        "maximum context length",
+        "context_length_exceeded",
+        "context window",
+        "prompt is too long",
+        "input is too long",
+        "request is too large",
+        "too many tokens",
+        "token limit",
+        "max_prompt_tokens",
+        "max prompt tokens",
+        "input tokens",
+        "prompt tokens",
+        "prompt token count",
+    )
+    return any(indicator in haystack for indicator in indicators)
+
+
 def generate_commit_message_for_status(
     status: GitStatus,
     model: str | None = None,
@@ -337,9 +372,27 @@ def generate_commit_message_for_status(
     http_client_config: github_copilot.HttpClientConfig | None = None,
 ) -> str:
     """Generate a commit message for a staged status snapshot."""
-    prompt = build_commit_message_prompt(status, context=context)
+    full_prompt = build_commit_message_prompt(status, context=context)
+    try:
+        return generate_commit_message_for_prompt(
+            full_prompt,
+            model=model,
+            http_client_config=http_client_config,
+        )
+    except github_copilot.CopilotError as exc:
+        if not should_retry_with_compact_prompt(exc):
+            raise
+
+    console.print(
+        "[yellow]Staged diff exceeded the model context window; retrying with [bold]`git status`[/] only.[/yellow]"
+    )
+    fallback_prompt = build_commit_message_prompt(
+        status,
+        context=context,
+        include_diff=False,
+    )
     return generate_commit_message_for_prompt(
-        prompt,
+        fallback_prompt,
         model=model,
         http_client_config=http_client_config,
     )
@@ -455,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.2 → git_copilot_commit-0.5.4}/src/git_copilot_commit/github_copilot.py

@@ -162,6 +162,7 @@ class CopilotModel:
     name: str
     vendor: str | None = None
     family: str | None = None
+    max_context_window_tokens: int | None = None
     supported_endpoints: tuple[str, ...] = ()
 
     @classmethod
@@ -173,11 +174,18 @@ class CopilotModel:
         supported_endpoints = payload.get("supported_endpoints")
 
         family: str | None = None
+        max_context_window_tokens: int | None = None
         if isinstance(capabilities, dict):
             raw_family = capabilities.get("family")
             if isinstance(raw_family, str) and raw_family:
                 family = raw_family
 
+            limits = capabilities.get("limits")
+            if isinstance(limits, dict):
+                raw_context_window = limits.get("max_context_window_tokens")
+                if isinstance(raw_context_window, int) and raw_context_window > 0:
+                    max_context_window_tokens = raw_context_window
+
         endpoints: list[str] = []
         if isinstance(supported_endpoints, list):
             for entry in supported_endpoints:
@@ -192,6 +200,7 @@ class CopilotModel:
             name=name if isinstance(name, str) and name else model_id,
             vendor=vendor if isinstance(vendor, str) and vendor else None,
             family=family,
+            max_context_window_tokens=max_context_window_tokens,
             supported_endpoints=tuple(endpoints),
         )
 
@@ -891,6 +900,12 @@ def format_supported_endpoints(model: CopilotModel) -> str:
     return "default"
 
 
+def format_context_window(model: CopilotModel) -> str:
+    if model.max_context_window_tokens is None:
+        return "?"
+    return f"{model.max_context_window_tokens:,}"
+
+
 def normalize_vendor_filter(value: str | None) -> str | None:
     if value is None:
         return None
@@ -1226,6 +1241,7 @@ def print_model_table(models: list[CopilotModel]) -> None:
     table.add_column("#", justify="right", style="cyan")
     table.add_column("Model", style="green")
     table.add_column("Vendor", style="blue")
+    table.add_column("Context", justify="right", style="bright_cyan")
     table.add_column("Route", style="yellow")
     table.add_column("Endpoints", style="magenta")
     for index, model in enumerate(models, start=1):
@@ -1233,6 +1249,7 @@ def print_model_table(models: list[CopilotModel]) -> None:
             str(index),
             model.id,
             model.vendor or "?",
+            format_context_window(model),
             infer_api_surface(model),
             format_supported_endpoints(model),
         )

{git_copilot_commit-0.5.2 → 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.2 → git_copilot_commit-0.5.4}/tests/test_cli.py

@@ -62,6 +62,19 @@ def test_build_commit_message_prompt_includes_context_status_and_diff() -> None:
     assert "+print('hi')" in prompt
 
 
+def test_build_commit_message_prompt_can_omit_diff() -> None:
+    status = make_status(
+        staged_diff="diff --git a/src/example.py b/src/example.py\n+print('hi')\n"
+    )
+
+    prompt = build_commit_message_prompt(status, include_diff=False)
+
+    assert "`git status`" in prompt
+    assert "M  src/example.py" in prompt
+    assert "`git diff --staged`" not in prompt
+    assert "+print('hi')" not in prompt
+
+
 def test_build_commit_message_prompt_requires_staged_changes() -> None:
     status = make_status(staged_diff="   \n")
 
@@ -94,6 +107,105 @@ def test_generate_commit_message_for_status_normalizes_model_prefix(
     assert "diff --git a/src/example.py b/src/example.py" in rendered_prompt
 
 
+def test_generate_commit_message_for_status_retries_without_diff_on_context_overflow(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    status = make_status(
+        staged_diff="diff --git a/src/example.py b/src/example.py\n+print('hi')\n"
+    )
+    mock_print = Mock()
+    mock_ask = Mock(
+        side_effect=[
+            github_copilot.CopilotHttpError(
+                400,
+                "Bad Request",
+                "This model's maximum context length was exceeded.",
+            ),
+            "feat: add example",
+        ]
+    )
+    monkeypatch.setattr(cli.console, "print", mock_print)
+    monkeypatch.setattr(cli, "load_system_prompt", Mock(return_value="system prompt"))
+    monkeypatch.setattr(cli.github_copilot, "ask", mock_ask)
+
+    message = generate_commit_message_for_status(status)
+
+    assert message == "feat: add example"
+    assert mock_ask.call_count == 2
+    first_prompt = mock_ask.call_args_list[0].args[0]
+    second_prompt = mock_ask.call_args_list[1].args[0]
+    assert "`git diff --staged`" in first_prompt
+    assert "diff --git a/src/example.py b/src/example.py" in first_prompt
+    assert "`git diff --staged`" not in second_prompt
+    assert "diff --git a/src/example.py b/src/example.py" not in second_prompt
+    assert "M  src/example.py" in second_prompt
+    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.2 → git_copilot_commit-0.5.4}/tests/test_github_copilot_utils.py

@@ -15,6 +15,7 @@ def make_model(
     *,
     vendor: str | None = None,
     family: str | None = None,
+    context_window_tokens: int | None = None,
     endpoints: tuple[str, ...] = (),
 ) -> github_copilot.CopilotModel:
     return github_copilot.CopilotModel(
@@ -22,6 +23,7 @@ def make_model(
         name=model_id,
         vendor=vendor,
         family=family,
+        max_context_window_tokens=context_window_tokens,
         supported_endpoints=endpoints,
     )
 
@@ -136,11 +138,15 @@ def test_credentials_and_payload_parsers(monkeypatch: pytest.MonkeyPatch) -> Non
             "id": "gpt-5.4",
             "name": "GPT-5.4",
             "vendor": "openai",
-            "capabilities": {"family": "gpt-5"},
+            "capabilities": {
+                "family": "gpt-5",
+                "limits": {"max_context_window_tokens": 272000},
+            },
             "supported_endpoints": ["/responses", "", 123],
         }
     )
     assert model.family == "gpt-5"
+    assert model.max_context_window_tokens == 272000
     assert model.supported_endpoints == ("/responses",)
 
     with pytest.raises(github_copilot.CopilotError):
@@ -233,6 +239,7 @@ def test_infer_api_surface_and_vendor_filtering() -> None:
     assert github_copilot.infer_api_surface(google_model) == "chat_completions"
     assert github_copilot.format_supported_endpoints(chat_model) == "/chat/completions"
     assert github_copilot.format_supported_endpoints(google_model) == "default"
+    assert github_copilot.format_context_window(gpt5_model) == "?"
 
     assert github_copilot.normalize_vendor_filter(" Gemini ") == "google"
     assert github_copilot.normalize_vendor_filter("claude") == "anthropic"
@@ -483,3 +490,26 @@ def test_render_model_selection_error_and_time_formatting(
     assert github_copilot.format_relative_duration(-59) == "59s ago"
     assert github_copilot.format_unix_timestamp(1_700_000_061).endswith("(in 1m 1s)")
     assert github_copilot.format_unix_timestamp(10**20) == str(10**20)
+
+
+def test_print_model_table_shows_context_window(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    table_console = Console(record=True, width=140)
+    monkeypatch.setattr(github_copilot, "console", table_console)
+
+    github_copilot.print_model_table(
+        [
+            make_model(
+                "gpt-5.4",
+                vendor="openai",
+                context_window_tokens=272000,
+                endpoints=("/responses",),
+            )
+        ]
+    )
+
+    rendered = table_console.export_text()
+
+    assert "Context" in rendered
+    assert "272,000" in rendered

{git_copilot_commit-0.5.2 → 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)