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

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,29 @@ def generate_commit_message_for_prompt(
     )
 
 
+def should_fallback_to_status_only(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",
+    )
+    return any(indicator in haystack for indicator in indicators)
+
+
 def generate_commit_message_for_status(
     status: GitStatus,
     model: str | None = None,
@@ -337,9 +371,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_fallback_to_status_only(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,
     )

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/prompts/split-commit-planner-prompt.md

@@ -7,7 +7,6 @@ small number of coherent commits.
 
 - Produce commit groupings that keep related changes together.
 - Separate clearly unrelated changes when the staged units support it.
-- Prefer fewer commits when the relationship is ambiguous.
 
 ## Rules
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-copilot-commit
-Version: 0.5.1
+Version: 0.5.3
 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.1.dist-info → git_copilot_commit-0.5.3.dist-info}/RECORD

@@ -1,15 +1,15 @@
 git_copilot_commit/__init__.py,sha256=v3x5oBkxwKJEZLv62QqSmP3iqNKLtZgrWZfH8eFzlQg,60
-git_copilot_commit/cli.py,sha256=CyiGMEehjLc-J3OveVxXUK7mzPWpiwQgkSSB3IhSzoc,29910
+git_copilot_commit/cli.py,sha256=CIwT5T-Y5j5DpDRi-tHMiB-bACntCWRjqxx8zQSY3AM,31373
 git_copilot_commit/git.py,sha256=vNuh2j8TGmocLio4XgPpbXIktlgczNdEt2Fg1c40wuk,14962
-git_copilot_commit/github_copilot.py,sha256=0CF8bnawxW6Bn5g7R7mbceFG4SCcMiueMOp4x8Vtqs8,49657
+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/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=YS9XgXoHs-utyGvvpHxnTAReCRAlOyRHkYxtpDw88pY,1147
-git_copilot_commit-0.5.1.dist-info/METADATA,sha256=8uvKBiGZG6kNe3mJz1bO_zTzhDJtX24F2kbWqfjDTJg,6649
-git_copilot_commit-0.5.1.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-git_copilot_commit-0.5.1.dist-info/entry_points.txt,sha256=-D4bQqiuSPwQJG2zx--vJbZD1iqB5coUfoJ_gmC3rSg,66
-git_copilot_commit-0.5.1.dist-info/licenses/LICENSE,sha256=14lNZAoKJPI1U7eGpletjN_PFm1JwP1vT_0jFKY6eWg,1065
-git_copilot_commit-0.5.1.dist-info/RECORD,,
+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,,