gac 0.16.2__tar.gz → 0.17.1__tar.gz

{gac-0.16.2 → gac-0.17.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gac
-Version: 0.16.2
+Version: 0.17.1
 Summary: AI-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
@@ -66,7 +66,7 @@ Description-Content-Type: text/markdown
 - **Seamless Git Workflow:** Integrates smoothly into your existing Git routine as a simple drop-in replacement for `git commit`.
 - **Extensive Customization:** Tailor commit messages to your needs with a rich set of flags, including one-liners (`-o`), AI hints (`-h`), commit scope (`-s`), and specific model selection (`-m`).
 - **Streamlined Workflow Commands:** Boost your productivity with convenient options to stage all changes (`-a`), auto-confirm commits (`-y`), and push to your remote repository (`-p`) in a single step.
-- **Reroll Capability:** Not satisfied with the generated commit message? Simply type `r` or `reroll` at the confirmation prompt to generate a new message.
+- **Interactive Reroll with Feedback:** Not satisfied with the generated commit message? Use `r` for a simple regeneration, or `r <feedback>` to provide specific improvement suggestions (e.g., `r make it shorter`, `r focus on the bug fix`).
 - **Token Usage Tracking:** Display token consumption statistics (prompt, completion, and total tokens).
 
 ## How It Works

{gac-0.16.2 → gac-0.17.1}/README.md

@@ -18,7 +18,7 @@
 - **Seamless Git Workflow:** Integrates smoothly into your existing Git routine as a simple drop-in replacement for `git commit`.
 - **Extensive Customization:** Tailor commit messages to your needs with a rich set of flags, including one-liners (`-o`), AI hints (`-h`), commit scope (`-s`), and specific model selection (`-m`).
 - **Streamlined Workflow Commands:** Boost your productivity with convenient options to stage all changes (`-a`), auto-confirm commits (`-y`), and push to your remote repository (`-p`) in a single step.
-- **Reroll Capability:** Not satisfied with the generated commit message? Simply type `r` or `reroll` at the confirmation prompt to generate a new message.
+- **Interactive Reroll with Feedback:** Not satisfied with the generated commit message? Use `r` for a simple regeneration, or `r <feedback>` to provide specific improvement suggestions (e.g., `r make it shorter`, `r focus on the bug fix`).
 - **Token Usage Tracking:** Display token consumption statistics (prompt, completion, and total tokens).
 
 ## How It Works

{gac-0.16.2 → gac-0.17.1}/src/gac/__version__.py

@@ -1,3 +1,3 @@
 """Version information for gac package."""
 
-__version__ = "0.16.2"
+__version__ = "0.17.1"

{gac-0.16.2 → gac-0.17.1}/src/gac/cli.py

@@ -87,6 +87,12 @@ def cli(
             effective_log_level = "ERROR"
         setup_logging(effective_log_level)
         logger.info("Starting gac")
+
+        # Apply always_include_scope setting if no explicit scope provided
+        effective_scope = scope
+        if scope is None and config.get("always_include_scope", False):
+            effective_scope = ""  # Empty string triggers scope inference
+
         try:
             main(
                 stage_all=add_all,
@@ -94,7 +100,7 @@ def cli(
                 hint=hint,
                 one_liner=one_liner,
                 show_prompt=show_prompt,
-                scope=scope,
+                scope=effective_scope,
                 require_confirmation=not yes,
                 push=push,
                 quiet=quiet,

{gac-0.16.2 → gac-0.17.1}/src/gac/config.py

@@ -33,6 +33,8 @@ def load_config() -> dict[str, str | int | float | bool]:
         "max_retries": int(os.getenv("GAC_RETRIES", EnvDefaults.MAX_RETRIES)),
         "log_level": os.getenv("GAC_LOG_LEVEL", Logging.DEFAULT_LEVEL),
         "warning_limit_tokens": int(os.getenv("GAC_WARNING_LIMIT_TOKENS", EnvDefaults.WARNING_LIMIT_TOKENS)),
+        "always_include_scope": os.getenv("GAC_ALWAYS_INCLUDE_SCOPE", str(EnvDefaults.ALWAYS_INCLUDE_SCOPE)).lower()
+        in ("true", "1", "yes", "on"),
     }
 
     return config

{gac-0.16.2 → gac-0.17.1}/src/gac/constants.py

@@ -23,6 +23,7 @@ class EnvDefaults:
     TEMPERATURE: float = 1
     MAX_OUTPUT_TOKENS: int = 512
     WARNING_LIMIT_TOKENS: int = 16384
+    ALWAYS_INCLUDE_SCOPE: bool = False
 
 
 class Logging:
@@ -102,8 +103,8 @@ class FileTypeImportance:
         ".ini": 3.5,  # INI config
         ".env": 3.5,  # Environment variables
         # Documentation
-        ".md": 4.0,  # Markdown
-        ".rst": 3.8,  # reStructuredText
+        ".md": 2.5,  # Markdown (reduced to prioritize code changes)
+        ".rst": 2.5,  # reStructuredText (reduced to prioritize code changes)
         # Web
         ".html": 3.5,  # HTML
         ".css": 3.5,  # CSS

{gac-0.16.2 → gac-0.17.1}/src/gac/git.py

@@ -127,12 +127,25 @@ def run_pre_commit_hooks() -> bool:
 
         # Run pre-commit hooks on staged files
         logger.info("Running pre-commit hooks...")
-        try:
-            run_subprocess(["pre-commit", "run"], silent=False, raise_on_error=True)
-            # If we get here, all hooks passed
+        # Run pre-commit and capture both stdout and stderr
+        result = subprocess.run(["pre-commit", "run"], capture_output=True, text=True, check=False)
+
+        if result.returncode == 0:
+            # All hooks passed
             return True
-        except subprocess.CalledProcessError as e:
-            logger.error(f"Pre-commit hooks failed with exit code {e.returncode}")
+        else:
+            # Pre-commit hooks failed - show the output
+            output = result.stdout if result.stdout else ""
+            error = result.stderr if result.stderr else ""
+
+            # Combine outputs (pre-commit usually outputs to stdout)
+            full_output = output + ("\n" + error if error else "")
+
+            if full_output.strip():
+                # Show which hooks failed and why
+                logger.error(f"Pre-commit hooks failed:\n{full_output}")
+            else:
+                logger.error(f"Pre-commit hooks failed with exit code {result.returncode}")
             return False
     except Exception as e:
         logger.debug(f"Error running pre-commit: {e}")

{gac-0.16.2 → gac-0.17.1}/src/gac/main.py

@@ -121,7 +121,7 @@ def main(
         if warning_limit and prompt_tokens > warning_limit:
             console = Console()
             console.print(
-                f"[yellow]⚠️  Warning: Prompt contains {prompt_tokens} tokens, which exceeds the warning limit of "
+                f"[yellow]⚠️  WARNING: Prompt contains {prompt_tokens} tokens, which exceeds the warning limit of "
                 f"{warning_limit} tokens.[/yellow]"
             )
             if require_confirmation:
@@ -159,23 +159,58 @@ def main(
                 )
 
             if require_confirmation:
-                # Custom prompt that accepts y/n/r
+                # Custom prompt that accepts y/n/r or "r <feedback (optional)>"
                 while True:
-                    response = (
-                        click.prompt("Proceed with commit above? [y/n/r]", type=str, show_default=False).lower().strip()
-                    )
+                    response = click.prompt(
+                        "Proceed with commit above? [y/n/r <feedback>]", type=str, show_default=False
+                    ).strip()
 
-                    if response in ["y", "yes"]:
+                    if response.lower() in ["y", "yes"]:
                         break  # Exit both loops and proceed with commit
-                    elif response in ["n", "no"]:
+                    elif response.lower() in ["n", "no"]:
                         console.print("[yellow]Prompt not accepted. Exiting...[/yellow]")
                         sys.exit(0)
-                    elif response in ["r", "reroll"]:
-                        console.print("[cyan]Regenerating commit message...[/cyan]\n")
+                    elif response.lower() == "r" or response.lower().startswith("r ") or response.lower() == "reroll":
+                        # Parse the reroll command for optional feedback
+                        if response.lower() == "r" or response.lower() == "reroll":
+                            # Simple reroll without feedback
+                            reroll_feedback = ""
+                            console.print("[cyan]Regenerating commit message...[/cyan]")
+                        else:
+                            # Extract feedback from "r <feedback>"
+                            reroll_feedback = response[2:].strip()  # Remove "r " prefix
+                            console.print(f"[cyan]Regenerating commit message with feedback: {reroll_feedback}[/cyan]")
+
+                        # Combine hints if reroll feedback provided
+                        combined_hint = hint
+                        if reroll_feedback:
+                            # Create conversational prompt with previous attempt and feedback
+                            conversational_hint = f"Previous attempt: '{commit_message}'. User feedback: {reroll_feedback}. Please revise accordingly."
+
+                            if hint:
+                                combined_hint = f"{hint}. {conversational_hint}"
+                            else:
+                                combined_hint = conversational_hint
+
+                            # Regenerate prompt with conversational feedback
+                            reroll_prompt = build_prompt(
+                                status=status,
+                                processed_diff=processed_diff,
+                                diff_stat=diff_stat,
+                                one_liner=one_liner,
+                                hint=combined_hint,
+                                scope=scope,
+                            )
+                        else:
+                            # No hint given, just reroll with same prompt
+                            reroll_prompt = prompt
+
+                        console.print()  # Add blank line for readability
+
                         # Generate new message
                         commit_message = generate_commit_message(
                             model=model,
-                            prompt=prompt,
+                            prompt=reroll_prompt,
                             temperature=temperature,
                             max_tokens=max_output_tokens,
                             max_retries=max_retries,
@@ -184,10 +219,12 @@ def main(
                         commit_message = clean_commit_message(commit_message)
                         break  # Exit inner loop, continue outer loop
                     else:
-                        console.print("[red]Invalid response. Please enter y (yes), n (no), or r (reroll).[/red]")
+                        console.print(
+                            "[red]Invalid response. Please enter y (yes), n (no), r (reroll), or r <feedback>.[/red]"
+                        )
 
                 # If we got here with 'y', break the outer loop
-                if response in ["y", "yes"]:
+                if response.lower() in ["y", "yes"]:
                     break
             else:
                 # No confirmation required, exit loop

{gac-0.16.2 → gac-0.17.1}/src/gac/prompt.py

@@ -15,6 +15,22 @@ DEFAULT_TEMPLATE = """<role>
 You are an expert git commit message generator. Your task is to analyze code changes and create a concise, meaningful git commit message. You will receive git status and diff information. Your entire response will be used directly as a git commit message.
 </role>
 
+<focus>
+Your commit message must reflect the core purpose and impact of these changes.
+Prioritize the primary intent over implementation details.
+Consider what future developers need to understand about this change.
+Identify if this introduces new capabilities, fixes problems, or improves existing code.
+</focus>
+
+<mixed_changes>
+When changes span multiple areas:
+- Choose the commit type based on the PRIMARY purpose, not the largest file count
+- Feature additions with supporting tests/docs should use 'feat'
+- Bug fixes with added tests should use 'fix'
+- Refactoring that improves multiple components should use 'refactor'
+- Documentation updates are 'docs' only when that's the sole purpose
+</mixed_changes>
+
 <format>
   <one_liner>
   Create a single-line commit message (50-72 characters if possible).
@@ -31,10 +47,17 @@ You are an expert git commit message generator. Your task is to analyze code cha
 </format>
 
 <conventions_no_scope>
-You MUST start your commit message with the most appropriate conventional commit prefix:
+You MUST start your commit message with the most appropriate conventional commit prefix.
+
+IMPORTANT: Check file types FIRST when determining the commit type:
+- If changes are ONLY to documentation files (*.md, *.rst, *.txt in docs/, README*, CHANGELOG*, etc.), ALWAYS use 'docs:'
+- Use 'docs:' ONLY when ALL changes are documentation files - INCLUDING README updates, regardless of how significant the changes are
+- If changes include both documentation and code, use the prefix for the code changes, unless it is a documentation-only change
+
+Commit type prefixes:
 - feat: A new feature or functionality addition
 - fix: A bug fix or error correction
-- docs: Documentation changes only
+- docs: Documentation changes only (INCLUDING README updates, regardless of how significant)
 - style: Changes to code style/formatting without logic changes
 - refactor: Code restructuring without behavior changes
 - perf: Performance improvements
@@ -55,10 +78,14 @@ You MUST write a conventional commit message with EXACTLY ONE type and the REQUI
 
 FORMAT: type({scope}): description
 
+IMPORTANT: Check file types FIRST when determining the commit type:
+- If changes are ONLY to documentation files (*.md, *.rst, *.txt in docs/, README*, CHANGELOG*, etc.), ALWAYS use 'docs'
+- If changes include both documentation and code, use the prefix for the code changes, unless it is a documentation-only change
+
 Select ONE type from this list that best matches the primary purpose of the changes:
 - feat: A new feature or functionality addition
 - fix: A bug fix or error correction
-- docs: Documentation changes only
+- docs: Documentation changes only (INCLUDING README and CHANGELOG updates, regardless of how significant)
 - style: Changes to code style/formatting without logic changes
 - refactor: Code restructuring without behavior changes
 - perf: Performance improvements
@@ -87,10 +114,14 @@ You MUST write a conventional commit message with EXACTLY ONE type and an inferr
 
 FORMAT: type(scope): description
 
+IMPORTANT: Check file types FIRST when determining the commit type:
+- If changes are ONLY to documentation files (*.md, *.rst, *.txt in docs/, README*, CHANGELOG*, etc.), ALWAYS use 'docs'
+- If changes include both documentation and code, use the prefix for the code changes, unless it is a documentation-only change
+
 Select ONE type from this list that best matches the primary purpose of the changes:
 - feat: A new feature or functionality addition
 - fix: A bug fix or error correction
-- docs: Documentation changes only
+- docs: Documentation changes only (INCLUDING README and CHANGELOG updates, regardless of how significant)
 - style: Changes to code style/formatting without logic changes
 - refactor: Code restructuring without behavior changes
 - perf: Performance improvements
@@ -100,6 +131,16 @@ Select ONE type from this list that best matches the primary purpose of the chan
 - chore: Miscellaneous changes not affecting src/test files
 
 You MUST infer an appropriate scope from the changes. A good scope is concise (usually one word) and indicates the component or area that was changed.
+
+<scope_rules>
+For scope inference, select the most specific component affected:
+- Use module/component names from the codebase (auth, api, cli, core)
+- Use functional areas for cross-cutting changes (config, build, test)
+- Keep scopes consistent with existing commit history when possible
+- Prefer established patterns over creating new scope names
+- Use singular form (auth, not auths; test, not tests)
+</scope_rules>
+
 Examples of good scopes: api, auth, ui, core, docs, build, prompt, config
 
 CORRECT EXAMPLES (these formats are correct):
@@ -133,6 +174,44 @@ Additional context provided by the user: <hint_text></hint_text>
 <diff></diff>
 </git_diff>
 
+
+
+<examples_no_scope>
+Good commit messages (no scope):
+[OK] feat: add OAuth2 integration with Google and GitHub
+[OK] fix: resolve race condition in user session management
+[OK] docs: add troubleshooting section for common installation issues
+[OK] refactor: extract validation logic into reusable utilities
+[OK] test: add comprehensive unit tests for token validation
+[OK] build: upgrade to latest security patches
+
+Bad commit messages:
+[ERROR] fix stuff
+[ERROR] update code
+[ERROR] feat(auth): add login (scope included when not requested)
+[ERROR] WIP: still working on this
+[ERROR] Fixed bug
+[ERROR] Changes
+</examples_no_scope>
+
+<examples_with_scope>
+Good commit messages (with scope):
+[OK] feat(auth): add OAuth2 integration with Google and GitHub
+[OK] fix(api): resolve race condition in user session management
+[OK] docs(readme): add troubleshooting section for common installation issues
+[OK] refactor(core): extract validation logic into reusable utilities
+[OK] test(auth): add comprehensive unit tests for token validation
+[OK] build(deps): upgrade to latest security patches
+
+Bad commit messages:
+[ERROR] fix stuff
+[ERROR] update code
+[ERROR] feat: fix(auth): add login (double prefix)
+[ERROR] WIP: still working on this
+[ERROR] Fixed bug
+[ERROR] Changes
+</examples_with_scope>
+
 <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.
@@ -237,6 +316,18 @@ def build_prompt(
     else:
         template = re.sub(r"<one_liner>.*?</one_liner>", "", template, flags=re.DOTALL)
 
+    # Clean up examples sections based on scope settings
+    if scope is None:
+        # No scope - keep no_scope examples, remove scope examples
+        template = re.sub(r"<examples_with_scope>.*?</examples_with_scope>\n?", "", template, flags=re.DOTALL)
+        template = template.replace("<examples_no_scope>", "<examples>")
+        template = template.replace("</examples_no_scope>", "</examples>")
+    else:
+        # With scope (either provided or inferred) - keep scope examples, remove no_scope examples
+        template = re.sub(r"<examples_no_scope>.*?</examples_no_scope>\n?", "", template, flags=re.DOTALL)
+        template = template.replace("<examples_with_scope>", "<examples>")
+        template = template.replace("</examples_with_scope>", "</examples>")
+
     # Clean up extra whitespace, collapsing blank lines that may contain spaces
     template = re.sub(r"\n(?:[ \t]*\n){2,}", "\n\n", template)
 

{gac-0.16.2 → gac-0.17.1}/src/gac/utils.py

@@ -102,12 +102,12 @@ def run_subprocess(
             timeout=timeout,
         )
 
-        if result.returncode != 0 and (check or raise_on_error):
+        should_raise = result.returncode != 0 and (check or raise_on_error)
+
+        if should_raise:
             if not silent:
                 logger.debug(f"Command stderr: {result.stderr}")
-
-            error = subprocess.CalledProcessError(result.returncode, command, result.stdout, result.stderr)
-            raise error
+            raise subprocess.CalledProcessError(result.returncode, command, result.stdout, result.stderr)
 
         output = result.stdout
         if strip_output:
@@ -119,7 +119,7 @@ def run_subprocess(
         raise GacError(f"Command timed out: {' '.join(command)}") from e
     except subprocess.CalledProcessError as e:
         if not silent:
-            logger.error(f"Command failed: {e.stderr.strip() if hasattr(e, 'stderr') else str(e)}")
+            logger.error(f"Command failed: {e.stderr.strip() if e.stderr else str(e)}")
         if raise_on_error:
             raise
         return ""
@@ -128,6 +128,5 @@ def run_subprocess(
             logger.debug(f"Command error: {e}")
         if raise_on_error:
             # Convert generic exceptions to CalledProcessError for consistency
-            error = subprocess.CalledProcessError(1, command, "", str(e))
-            raise error from e
+            raise subprocess.CalledProcessError(1, command, "", str(e)) from e
         return ""