gac 2.2.0__py3-none-any.whl → 2.3.0__py3-none-any.whl

gac/prompt.py

@@ -246,30 +246,30 @@ DEFAULT_USER_TEMPLATE = """<hint>
 Additional context provided by the user: <hint_text></hint_text>
 </hint>
 
-<git_status>
-<status></status>
-</git_status>
+<git_diff>
+<diff></diff>
+</git_diff>
 
 <git_diff_stat>
 <diff_stat></diff_stat>
 </git_diff_stat>
 
-<git_diff>
-<diff></diff>
-</git_diff>
+<git_status>
+<status></status>
+</git_status>
+
+<language_instructions>
+IMPORTANT: You MUST write the entire commit message in <language_name></language_name>.
+All text in the commit message, including the summary line and body, must be in <language_name></language_name>.
+<prefix_instruction></prefix_instruction>
+</language_instructions>
 
-<instructions>
+<format_instructions>
 IMMEDIATELY AFTER ANALYZING THE CHANGES, RESPOND WITH ONLY THE COMMIT MESSAGE.
 DO NOT include any preamble, reasoning, explanations or anything other than the commit message itself.
 DO NOT use markdown formatting, headers, or code blocks.
 The entire response will be passed directly to 'git commit -m'.
-
-<language>
-IMPORTANT: You MUST write the entire commit message in <language_name></language_name>.
-All text in the commit message, including the summary line and body, must be in <language_name></language_name>.
-<prefix_instruction></prefix_instruction>
-</language>
-</instructions>"""
+</format_instructions>"""
 
 
 # ============================================================================
@@ -518,7 +518,7 @@ The ENTIRE commit message, including the prefix, must be in {language}."""
 
         user_template = user_template.replace("<prefix_instruction></prefix_instruction>", prefix_instruction)
     else:
-        user_template = _remove_template_section(user_template, "language")
+        user_template = _remove_template_section(user_template, "language_instructions")
         logger.debug("Using default language (English)")
 
     user_template = re.sub(r"\n(?:[ \t]*\n){2,}", "\n\n", user_template)
@@ -526,6 +526,92 @@ The ENTIRE commit message, including the prefix, must be in {language}."""
     return system_template.strip(), user_template.strip()
 
 
+def build_group_prompt(
+    status: str,
+    processed_diff: str,
+    diff_stat: str,
+    one_liner: bool,
+    hint: str,
+    infer_scope: bool,
+    verbose: bool,
+    system_template_path: str | None,
+    language: str | None,
+    translate_prefixes: bool,
+) -> tuple[str, str]:
+    """Build prompt for grouped commit generation (JSON output with multiple commits)."""
+    system_prompt, user_prompt = build_prompt(
+        status=status,
+        processed_diff=processed_diff,
+        diff_stat=diff_stat,
+        one_liner=one_liner,
+        hint=hint,
+        infer_scope=infer_scope,
+        verbose=verbose,
+        system_template_path=system_template_path,
+        language=language,
+        translate_prefixes=translate_prefixes,
+    )
+
+    user_prompt = _remove_template_section(user_prompt, "format_instructions")
+
+    grouping_instructions = """
+<format_instructions>
+Your task is to split the changed files into separate, logical commits. Think of this like sorting files into different folders where each file belongs in exactly one folder.
+
+CRITICAL REQUIREMENT - Every File Used Exactly Once:
+You must assign EVERY file from the diff to exactly ONE commit.
+- NO file should be left out
+- NO file should appear in multiple commits
+- EVERY file must be used once and ONLY once
+
+Think of it like dealing cards: Once you've dealt a card to a player, that card cannot be dealt to another player.
+
+HOW TO SPLIT THE FILES:
+1. Review all changed files in the diff
+2. Group files by logical relationship (e.g., related features, bug fixes, documentation)
+3. Assign each file to exactly one commit based on what makes the most sense
+4. If a file could fit in multiple commits, pick the best fit and move on - do NOT duplicate it
+5. Continue until every single file has been assigned to a commit
+
+ORDERING:
+Order the commits in a logical sequence considering dependencies, natural progression, and overall workflow.
+
+YOUR RESPONSE FORMAT:
+Respond with valid JSON following this structure:
+```json
+{
+  "commits": [
+    {
+      "files": ["src/auth/login.ts", "src/auth/logout.ts"],
+      "message": "<commit_message_conforming_to_prescribed_structure_and_format>"
+    },
+    {
+      "files": ["src/db/schema.sql", "src/db/migrations/001.sql"],
+      "message": "<commit_message_conforming_to_prescribed_structure_and_format>"
+    },
+    {
+      "files": ["tests/auth.test.ts", "tests/db.test.ts", "README.md"],
+      "message": "<commit_message_conforming_to_prescribed_structure_and_format>"
+    }
+  ]
+}
+```
+
+☝️ Notice how EVERY file path in the example above appears exactly ONCE across all commits. "src/auth/login.ts" appears once. "tests/auth.test.ts" appears once. No file is repeated.
+
+VALIDATION CHECKLIST - Before responding, verify:
+□ Total files across all commits = Total files in the diff
+□ Each file appears in exactly 1 commit (no duplicates, no omissions)
+□ Every commit has at least one file
+□ If you list all files from all commits and count them, you get the same count as unique files in the diff
+</format_instructions>
+"""
+
+    user_prompt = user_prompt + grouping_instructions
+
+    return system_prompt, user_prompt
+
+
 # ============================================================================
 # Message Cleaning Helpers
 # ============================================================================

gac/security.py

@@ -54,7 +54,7 @@ class SecretPatterns:
     PRIVATE_KEY = re.compile(r"-----BEGIN (?:RSA |EC |OPENSSH )?PRIVATE KEY-----")
 
     # Bearer Tokens (require actual token with specific characteristics)
-    BEARER_TOKEN = re.compile(r"Bearer\s+[A-Za-z0-9]{20,}[/=]*\s", re.IGNORECASE)
+    BEARER_TOKEN = re.compile(r"Bearer\s+[A-Za-z0-9]{20,}[/=]*(?:\s|$)", re.IGNORECASE)
 
     # JWT Tokens
     JWT_TOKEN = re.compile(r"eyJ[A-Za-z0-9_-]+\.eyJ[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+")

gac/workflow_utils.py

@@ -0,0 +1,131 @@
+import logging
+import tempfile
+from pathlib import Path
+
+import click
+from rich.console import Console
+
+logger = logging.getLogger(__name__)
+console = Console()
+
+
+def handle_confirmation_loop(
+    commit_message: str,
+    conversation_messages: list[dict[str, str]],
+    quiet: bool,
+    model: str,
+) -> tuple[str, str, list[dict[str, str]]]:
+    from rich.panel import Panel
+
+    from gac.utils import edit_commit_message_inplace
+
+    while True:
+        response = click.prompt(
+            "Proceed with commit above? [y/n/r/e/<feedback>]",
+            type=str,
+            show_default=False,
+        ).strip()
+        response_lower = response.lower()
+
+        if response_lower in ["y", "yes"]:
+            return ("yes", commit_message, conversation_messages)
+        if response_lower in ["n", "no"]:
+            return ("no", commit_message, conversation_messages)
+        if response == "":
+            continue
+        if response_lower in ["e", "edit"]:
+            edited_message = edit_commit_message_inplace(commit_message)
+            if edited_message:
+                commit_message = edited_message
+                conversation_messages[-1] = {"role": "assistant", "content": commit_message}
+                logger.info("Commit message edited by user")
+                console.print("\n[bold green]Edited commit message:[/bold green]")
+                console.print(Panel(commit_message, title="Commit Message", border_style="cyan"))
+            else:
+                console.print("[yellow]Using previous message.[/yellow]")
+                console.print(Panel(commit_message, title="Commit Message", border_style="cyan"))
+            continue
+        if response_lower in ["r", "reroll"]:
+            msg = "Please provide an alternative commit message using the same repository context."
+            conversation_messages.append({"role": "user", "content": msg})
+            console.print("[cyan]Regenerating commit message...[/cyan]")
+            return ("regenerate", commit_message, conversation_messages)
+
+        msg = f"Please revise the commit message based on this feedback: {response}"
+        conversation_messages.append({"role": "user", "content": msg})
+        console.print(f"[cyan]Regenerating commit message with feedback: {response}[/cyan]")
+        return ("regenerate", commit_message, conversation_messages)
+
+
+def execute_commit(commit_message: str, no_verify: bool) -> None:
+    from gac.git import run_git_command
+
+    commit_args = ["commit", "-m", commit_message]
+    if no_verify:
+        commit_args.append("--no-verify")
+    run_git_command(commit_args)
+    logger.info("Commit created successfully")
+    console.print("[green]Commit created successfully[/green]")
+
+
+def check_token_warning(
+    prompt_tokens: int,
+    warning_limit: int,
+    require_confirmation: bool,
+) -> bool:
+    if warning_limit and prompt_tokens > warning_limit:
+        console.print(f"[yellow]⚠️  WARNING: Prompt has {prompt_tokens} tokens (limit: {warning_limit})[/yellow]")
+        if require_confirmation:
+            proceed = click.confirm("Do you want to continue anyway?", default=True)
+            if not proceed:
+                console.print("[yellow]Aborted due to token limit.[/yellow]")
+                return False
+    return True
+
+
+def display_commit_message(commit_message: str, prompt_tokens: int, model: str, quiet: bool) -> None:
+    from rich.panel import Panel
+
+    from gac.ai_utils import count_tokens
+
+    console.print("[bold green]Generated commit message:[/bold green]")
+    console.print(Panel(commit_message, title="Commit Message", border_style="cyan"))
+
+    if not quiet:
+        completion_tokens = count_tokens(commit_message, model)
+        total_tokens = prompt_tokens + completion_tokens
+        console.print(
+            f"[dim]Token usage: {prompt_tokens} prompt + {completion_tokens} completion = {total_tokens} total[/dim]"
+        )
+
+
+def restore_staging(staged_files: list[str], staged_diff: str | None = None) -> None:
+    """Restore the git staging area to a previous state.
+
+    Args:
+        staged_files: List of file paths that should be staged
+        staged_diff: Optional staged diff to reapply for partial staging
+    """
+    from gac.git import run_git_command
+
+    run_git_command(["reset", "HEAD"])
+
+    if staged_diff:
+        temp_path: Path | None = None
+        try:
+            with tempfile.NamedTemporaryFile("w", delete=False) as tmp:
+                tmp.write(staged_diff)
+                temp_path = Path(tmp.name)
+            run_git_command(["apply", "--cached", str(temp_path)])
+            return
+        except Exception as e:
+            logger.warning(f"Failed to reapply staged diff, falling back to file list: {e}")
+        finally:
+            if temp_path:
+                temp_path.unlink(missing_ok=True)
+
+    for file_path in staged_files:
+        try:
+            run_git_command(["add", file_path])
+        except Exception as e:
+            logger.warning(f"Failed to restore staging for {file_path}: {e}")

{gac-2.2.0.dist-info → gac-2.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gac
-Version: 2.2.0
+Version: 2.3.0
 Summary: LLM-powered Git commit message generator with multi-provider support
 Project-URL: Homepage, https://github.com/cellwebb/gac
 Project-URL: Documentation, https://github.com/cellwebb/gac#readme
@@ -108,6 +108,7 @@ uv tool upgrade gac
 - **Understands intent**: Analyzes code structure, logic, and patterns to understand the "why" behind your changes, not just what changed
 - **Semantic awareness**: Recognizes refactoring, bug fixes, features, and breaking changes to generate contextually appropriate messages
 - **Intelligent filtering**: Prioritizes meaningful changes while ignoring generated files, dependencies, and artifacts
+- **Intelligent commit grouping** - Automatically group related changes into multiple logical commits with `--group`
 
 ### 📝 **Multiple Message Formats**
 
@@ -175,6 +176,9 @@ gac -v -s
 # Quick one-liner for small changes
 gac -o
 
+# Group changes into logically related commits
+gac -ag
+
 # Debug what the LLM sees
 gac --show-prompt
 

{gac-2.2.0.dist-info → gac-2.3.0.dist-info}/RECORD

@@ -1,21 +1,22 @@
 gac/__init__.py,sha256=z9yGInqtycFIT3g1ca24r-A3699hKVaRqGUI79wsmMc,415
-gac/__version__.py,sha256=r4l_6jWyV87srDy0RVRKwXgzwJscJzmR4SM825CjGh0,66
-gac/ai.py,sha256=iBHeLsqe6iyFj86wbvEosyy4vkjAN1BlLQeqtb_rfmo,4303
-gac/ai_utils.py,sha256=094ujZVlbDnHM3HPxiBSCbGi_5MD6bOKCj2SjKVDDK0,7445
-gac/cli.py,sha256=SOrSfrlku99O7O8zev5hRVmADAmJ7AIkM7Z0dquuCbQ,5807
+gac/__version__.py,sha256=KHcXxHr9uQK6amU8n-h2x8FjOXkwzFkaiUL62tdw07w,66
+gac/ai.py,sha256=6SQK4axBE0uEbF3eKVTvQtGL9X1TbxoBOrY7NuYIfiM,5009
+gac/ai_utils.py,sha256=reJINfsKlX0HAg5HPlH4ImO6FvibzgRZ0ruG9u1cxa8,8312
+gac/cli.py,sha256=i4VEQeq5k2Rmy8DzqVuJCUyYxSq87x_wLTmH3VgOkyg,5986
 gac/config.py,sha256=O9n09-sFOqlkf47vieEP7fI5I7uhu1cXn9PUZ5yiYkw,1974
 gac/config_cli.py,sha256=v9nFHZO1RvK9fzHyuUS6SG-BCLHMsdOMDwWamBhVVh4,1608
-gac/constants.py,sha256=zgylsiKnpBunoNzVT6RpAVe9m8cgxZrZ55kRN6ZP_cM,9586
+gac/constants.py,sha256=yyvYycIfRJ9SZZIMIhwn1s6yohjcaNM-fGXl_R9w1dI,9586
 gac/diff_cli.py,sha256=wnVQ9OFGnM0d2Pj9WVjWbo0jxqIuRHVAwmb8wU9Pa3E,5676
 gac/errors.py,sha256=ysDIVRCd0YQVTOW3Q6YzdolxCdtkoQCAFf3_jrqbjUY,7916
-gac/git.py,sha256=g6tvph50zV-wrTWrxARYXEpl0NeI8-ffFwHoqhp3fSE,8033
-gac/init_cli.py,sha256=KvFOvjjyMpdJ3MhJFvXSuYjdfulPA6hCP11YXwjHrqw,8849
-gac/language_cli.py,sha256=J4xZNNrMvHamsjK4TCsOVj0lrjYDtLMuHlnTqN0-N_w,3024
-gac/main.py,sha256=fK48fGHeJ4qGsttbKDoMXs4Gj3NncFHz_F_cJZI70IQ,16159
+gac/git.py,sha256=m7EqMYYRNRfD68HbxZD3TUY3DZlzZSdqa38SeLSNb6A,9347
+gac/init_cli.py,sha256=3n6A9FX0atPpO8XMMDypxLTIPxXv-cg_YtRl4yAKUOc,14449
+gac/language_cli.py,sha256=Nl1WKR-o7APOKTg_7T5LoJmg4GaiXnGUzR5XFJayYwI,3050
+gac/main.py,sha256=r5zwAYBBn-qz9kix2Zn5yJ-ac3-42u6HaIoirybOaTQ,28784
 gac/preprocess.py,sha256=hk2p2X4-xVDvuy-T1VMzMa9k5fTUbhlWDyw89DCf81Q,15379
-gac/prompt.py,sha256=HLvsW3YQLdTfw2N9UgjZ0jWckUc1x76V7Kcqjcl8Fsk,28633
-gac/security.py,sha256=15Yp6YR8QC4eECJi1BUCkMteh_veZXUbLL6W8qGcDm4,9920
+gac/prompt.py,sha256=ofumb6DmxJceqZLUlUyLE9b7Mwx9BpIEHweKEV9eicw,31841
+gac/security.py,sha256=QT91mBEo2Y7la-aXvKuF2zhWuoOSXb6PWKLJ93kSy2k,9926
 gac/utils.py,sha256=owkUzwJBX8mi0VrP3HKxku5vJj_JlaShzTYwjjsHn-4,8126
+gac/workflow_utils.py,sha256=fc0yPRBeA-7P2WiVPFa7A_NjXTW68UlbUv6_AXVYAzA,5023
 gac/providers/__init__.py,sha256=pT1xcKoZkPm6BWaxcAQ299-Ca5zZ31kf4DeQYAim9Tw,1367
 gac/providers/anthropic.py,sha256=VK5d1s1PmBNDwh_x7illQ2CIZIHNIYU28btVfizwQPs,2036
 gac/providers/cerebras.py,sha256=Ik8lhlsliGJVkgDgqlThfpra9tqbdYQZkaC4eNxRd9w,1648
@@ -36,8 +37,8 @@ gac/providers/streamlake.py,sha256=KAA2ZnpuEI5imzvdWVWUhEBHSP0BMnprKXte6CbwBWY,2
 gac/providers/synthetic.py,sha256=sRMIJTS9LpcXd9A7qp_ZjZxdqtTKRn9fl1W4YwJZP4c,1855
 gac/providers/together.py,sha256=1bUIVHfYzcEDw4hQPE8qV6hjc2JNHPv_khVgpk2IJxI,1667
 gac/providers/zai.py,sha256=kywhhrCfPBu0rElZyb-iENxQxxpVGykvePuL4xrXlaU,2739
-gac-2.2.0.dist-info/METADATA,sha256=Z5Vv7oBzqWKVr7lDmk_HFjq3kF13DNnCkMnXKZDKRtA,9609
-gac-2.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-gac-2.2.0.dist-info/entry_points.txt,sha256=tdjN-XMmcWfL92swuRAjT62bFLOAwk9bTMRLGP5Z4aI,36
-gac-2.2.0.dist-info/licenses/LICENSE,sha256=vOab37NouL1PNs5BswnPayrMCqaN2sqLfMQfqPDrpZg,1103
-gac-2.2.0.dist-info/RECORD,,
+gac-2.3.0.dist-info/METADATA,sha256=5VIkxFRlLC4NPEGIuZyRUo253XYHdQYt_8uX3gbvjjg,9782
+gac-2.3.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+gac-2.3.0.dist-info/entry_points.txt,sha256=tdjN-XMmcWfL92swuRAjT62bFLOAwk9bTMRLGP5Z4aI,36
+gac-2.3.0.dist-info/licenses/LICENSE,sha256=vOab37NouL1PNs5BswnPayrMCqaN2sqLfMQfqPDrpZg,1103
+gac-2.3.0.dist-info/RECORD,,